diff --git a/buildSrc/src/main/kotlin/Dependencies.kt b/buildSrc/src/main/kotlin/Dependencies.kt index cdb59a98bd..3cb21a67f1 100644 --- a/buildSrc/src/main/kotlin/Dependencies.kt +++ b/buildSrc/src/main/kotlin/Dependencies.kt @@ -25,11 +25,11 @@ object ProjectVersions { const val launcherVersion = "2.2.0" - const val rlVersion = "1.7.9" + const val rlVersion = "1.7.10" - const val openosrsVersion = "4.7.1" + const val openosrsVersion = "4.8.0" - const val rsversion = 196 + const val rsversion = 196.2 const val cacheversion = 165 const val lombokVersion = "1.18.20" 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 f7882e629a..7146c8a74d 100644 --- a/cache/src/main/java/net/runelite/cache/script/Instructions.java +++ b/cache/src/main/java/net/runelite/cache/script/Instructions.java @@ -69,6 +69,8 @@ public class Instructions add(GET_VARC_STRING, "get_varc_string"); add(SET_VARC_STRING, "set_varc_string"); add(SWITCH, "switch"); + add(GET_VARCLANSETTING, "get_varclansetting"); + add(GET_VARCLAN, "get_varclan"); add(CC_CREATE, "cc_create"); add(CC_DELETE, "cc_delete"); add(CC_DELETEALL, "cc_deleteall"); @@ -149,6 +151,8 @@ public class Instructions add(CC_SETONSUBCHANGE, "cc_setonsubchange"); add(CC_SETONSTOCKTRANSMIT, "cc_setonstocktransmit"); add(CC_SETONRESIZE, "cc_setonresize"); + add(CC_SETONCLANSETTINGSTRANSMIT, "cc_setonclansettingstransmit"); + add(CC_SETONCLANCHANNELTRANSMIT, "cc_setonclanchanneltransmit"); add(CC_GETX, "cc_getx"); add(CC_GETY, "cc_gety"); add(CC_GETWIDTH, "cc_getwidth"); @@ -175,10 +179,12 @@ public class Instructions add(CC_GETOP, "cc_getop"); add(CC_GETOPBASE, "cc_getopbase"); add(CC_CALLONRESIZE, "cc_callonresize"); + add(CC_TRIGGEROP, "cc_triggerop"); add(IF_SETPOSITION, "if_setposition"); add(IF_SETSIZE, "if_setsize"); add(IF_SETHIDE, "if_sethide"); add(IF_SETNOCLICKTHROUGH, "if_setnoclickthrough"); + add(IF_SETNOSCROLLTHROUGH, "if_setnoscrollthrough"); add(IF_SETSCROLLPOS, "if_setscrollpos"); add(IF_SETCOLOUR, "if_setcolour"); add(IF_SETFILL, "if_setfill"); @@ -249,6 +255,8 @@ public class Instructions add(IF_SETONSUBCHANGE, "if_setonsubchange"); add(IF_SETONSTOCKTRANSMIT, "if_setonstocktransmit"); add(IF_SETONRESIZE, "if_setonresize"); + add(IF_SETONCLANSETTINGSTRANSMIT, "if_setonclansettingstransmit"); + add(IF_SETONCLANCHANNELTRANSMIT, "if_setonclanchanneltransmit"); add(IF_GETX, "if_getx"); add(IF_GETY, "if_gety"); add(IF_GETWIDTH, "if_getwidth"); @@ -276,6 +284,7 @@ public class Instructions add(IF_GETOP, "if_getop"); add(IF_GETOPBASE, "if_getopbase"); add(IF_CALLONRESIZE, "if_callonresize"); + add(IF_TRIGGEROP, "if_triggerop"); add(MES, "mes"); add(ANIM, "anim"); add(IF_CLOSE, "if_close"); @@ -298,7 +307,6 @@ public class Instructions add(SETSHOWLOADINGMESSAGES, "setshowloadingmessages"); add(SETTAPTODROP, "settaptodrop"); add(GETTAPTODROP, "gettaptodrop"); - add(SETOCULUSORBSPEED, "setoculusorbspeed"); add(GETCANVASSIZE, "getcanvassize"); add(MOBILE_SETFPS, "mobile_setfps"); add(MOBILE_OPENSTORE, "mobile_openstore"); @@ -307,8 +315,7 @@ public class Instructions add(GETHIDEUSERNAME, "gethideusername"); add(SETREMEMBERUSERNAME, "setrememberusername"); add(GETREMEMBERUSERNAME, "getrememberusername"); - add(SETTITLEMUSICENABLED, "settitlemusicenabled"); - add(GETTITLEMUSICENABLED, "gettitlemusicenabled"); + add(SHOW_IOS_REVIEW, "show_ios_review"); add(SOUND_SYNTH, "sound_synth"); add(SOUND_SONG, "sound_song"); add(SOUND_JINGLE, "sound_jingle"); @@ -366,6 +373,41 @@ public class Instructions add(CLAN_GETCHATOWNERNAME, "clan_getchatownername"); add(CLAN_ISFRIEND, "clan_isfriend"); add(CLAN_ISIGNORE, "clan_isignore"); + add(ACTIVECLANSETTINGS_FIND_LISTENED, "activeclansettings_find_listened"); + add(ACTIVECLANSETTINGS_FIND_AFFINED, "activeclansettings_find_affined"); + add(ACTIVECLANSETTINGS_GETCLANNAME, "activeclansettings_getclanname"); + add(ACTIVECLANSETTINGS_GETALLOWUNAFFINED, "activeclansettings_getallowunaffined"); + add(ACTIVECLANSETTINGS_GETRANKTALK, "activeclansettings_getranktalk"); + add(ACTIVECLANSETTINGS_GETRANKKICK, "activeclansettings_getrankkick"); + add(ACTIVECLANSETTINGS_GETRANKLOOTSHARE, "activeclansettings_getranklootshare"); + add(ACTIVECLANSETTINGS_GETCOINSHARE, "activeclansettings_getcoinshare"); + add(ACTIVECLANSETTINGS_GETAFFINEDCOUNT, "activeclansettings_getaffinedcount"); + add(ACTIVECLANSETTINGS_GETAFFINEDDISPLAYNAME, "activeclansettings_getaffineddisplayname"); + add(ACTIVECLANSETTINGS_GETAFFINEDRANK, "activeclansettings_getaffinedrank"); + add(ACTIVECLANSETTINGS_GETBANNEDCOUNT, "activeclansettings_getbannedcount"); + add(ACTIVECLANSETTINGS_GETBANNEDDISPLAYNAME, "activeclansettings_getbanneddisplayname"); + add(ACTIVECLANSETTINGS_GETAFFINEDEXTRAINFO, "activeclansettings_getaffinedextrainfo"); + add(ACTIVECLANSETTINGS_GETCURRENTOWNER_SLOT, "activeclansettings_getcurrentowner_slot"); + add(ACTIVECLANSETTINGS_GETREPLACEMENTOWNER_SLOT, "activeclansettings_getreplacementowner_slot"); + add(ACTIVECLANSETTINGS_GETAFFINEDSLOT, "activeclansettings_getaffinedslot"); + add(ACTIVECLANSETTINGS_GETSORTEDAFFINEDSLOT, "activeclansettings_getsortedaffinedslot"); + add(AFFINEDCLANSETTINGS_ADDBANNED_FROMCHANNEL, "affinedclansettings_addbanned_fromchannel"); + add(ACTIVECLANSETTINGS_GETAFFINEDJOINRUNEDAY, "activeclansettings_getaffinedjoinruneday"); + add(AFFINEDCLANSETTINGS_SETMUTED_FROMCHANNEL, "affinedclansettings_setmuted_fromchannel"); + add(ACTIVECLANSETTINGS_GETAFFINEDMUTED, "activeclansettings_getaffinedmuted"); + add(ACTIVECLANCHANNEL_FIND_LISTENED, "activeclanchannel_find_listened"); + add(ACTIVECLANCHANNEL_FIND_AFFINED, "activeclanchannel_find_affined"); + add(ACTIVECLANCHANNEL_GETCLANNAME, "activeclanchannel_getclanname"); + add(ACTIVECLANCHANNEL_GETRANKKICK, "activeclanchannel_getrankkick"); + add(ACTIVECLANCHANNEL_GETRANKTALK, "activeclanchannel_getranktalk"); + add(ACTIVECLANCHANNEL_GETUSERCOUNT, "activeclanchannel_getusercount"); + add(ACTIVECLANCHANNEL_GETUSERDISPLAYNAME, "activeclanchannel_getuserdisplayname"); + add(ACTIVECLANCHANNEL_GETUSERRANK, "activeclanchannel_getuserrank"); + add(ACTIVECLANCHANNEL_GETUSERWORLD, "activeclanchannel_getuserworld"); + add(ACTIVECLANCHANNEL_KICKUSER, "activeclanchannel_kickuser"); + add(ACTIVECLANCHANNEL_GETUSERSLOT, "activeclanchannel_getuserslot"); + add(ACTIVECLANCHANNEL_GETSORTEDUSERSLOT, "activeclanchannel_getsorteduserslot"); + add(CLANPROFILE_FIND, "clanprofile_find"); add(STOCKMARKET_GETOFFERTYPE, "stockmarket_getoffertype"); add(STOCKMARKET_GETOFFERITEM, "stockmarket_getofferitem"); add(STOCKMARKET_GETOFFERPRICE, "stockmarket_getofferprice"); @@ -406,6 +448,11 @@ public class Instructions add(AND, "and"); add(OR, "or"); add(SCALE, "scale"); + add(BITCOUNT, "bitcount"); + add(TOGGLEBIT, "togglebit"); + add(SETBIT_RANGE, "setbit_range"); + add(CLEARBIT_RANGE, "clearbit_range"); + add(GETBIT_RANGE, "getbit_range"); add(APPEND_NUM, "append_num"); add(APPEND, "append"); add(APPEND_SIGNNUM, "append_signnum"); @@ -428,7 +475,6 @@ 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"); @@ -450,6 +496,7 @@ public class Instructions add(CHAT_GETFILTER_PRIVATE, "chat_getfilter_private"); add(CHAT_SENDPUBLIC, "chat_sendpublic"); add(CHAT_SENDPRIVATE, "chat_sendprivate"); + add(CHAT_SENDCLAN, "chat_sendclan"); add(CHAT_PLAYERNAME, "chat_playername"); add(CHAT_GETFILTER_TRADE, "chat_getfilter_trade"); add(CHAT_GETHISTORYLENGTH, "chat_gethistorylength"); @@ -458,7 +505,7 @@ public class Instructions add(DOCHEAT, "docheat"); add(CHAT_SETMESSAGEFILTER, "chat_setmessagefilter"); add(CHAT_GETMESSAGEFILTER, "chat_getmessagefilter"); - add(DEBUGMES, "debugmes"); + add(WRITECONSOLE, "writeconsole"); add(GETWINDOWMODE, "getwindowmode"); add(SETWINDOWMODE, "setwindowmode"); add(GETDEFAULTWINDOWMODE, "getdefaultwindowmode"); @@ -480,7 +527,6 @@ 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"); @@ -489,9 +535,9 @@ public class Instructions add(ON_MOBILE, "on_mobile"); add(CLIENTTYPE, "clienttype"); add(MOBILE_KEYBOARDHIDE, "mobile_keyboardhide"); - add(BATTERYLEVEL, "batterylevel"); - add(BATTERYCHARGING, "batterycharging"); - add(WIFIAVAILABLE, "wifiavailable"); + add(MOBILE_BATTERYLEVEL, "mobile_batterylevel"); + add(MOBILE_BATTERYCHARGING, "mobile_batterycharging"); + add(MOBILE_WIFIAVAILABLE, "mobile_wifiavailable"); add(WORLDMAP_GETMAPNAME, "worldmap_getmapname"); add(WORLDMAP_SETMAP, "worldmap_setmap"); add(WORLDMAP_GETZOOM, "worldmap_getzoom"); 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 95dd243aab..bb5df7ed1f 100644 --- a/cache/src/main/java/net/runelite/cache/script/Opcodes.java +++ b/cache/src/main/java/net/runelite/cache/script/Opcodes.java @@ -60,6 +60,8 @@ public class Opcodes 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 GET_VARCLANSETTING = 74;; + public static final int GET_VARCLAN = 76;; public static final int CC_CREATE = 100; public static final int CC_DELETE = 101; public static final int CC_DELETEALL = 102; @@ -140,6 +142,8 @@ public class Opcodes 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_SETONCLANSETTINGSTRANSMIT = 1428;; + public static final int CC_SETONCLANCHANNELTRANSMIT = 1429;; public static final int CC_GETX = 1500; public static final int CC_GETY = 1501; public static final int CC_GETWIDTH = 1502; @@ -166,10 +170,12 @@ public class Opcodes 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 CC_TRIGGEROP = 1928; 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_SETNOSCROLLTHROUGH = 2006; public static final int IF_SETSCROLLPOS = 2100; public static final int IF_SETCOLOUR = 2101; public static final int IF_SETFILL = 2102; @@ -240,6 +246,8 @@ public class Opcodes 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_SETONCLANSETTINGSTRANSMIT = 2428;; + public static final int IF_SETONCLANCHANNELTRANSMIT = 2429;; public static final int IF_GETX = 2500; public static final int IF_GETY = 2501; public static final int IF_GETWIDTH = 2502; @@ -267,6 +275,7 @@ public class Opcodes 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 IF_TRIGGEROP = 2928; public static final int MES = 3100; public static final int ANIM = 3101; public static final int IF_CLOSE = 3103; @@ -289,7 +298,6 @@ 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 MOBILE_SETFPS = 3133; public static final int MOBILE_OPENSTORE = 3134; @@ -298,8 +306,7 @@ public class Opcodes 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 SHOW_IOS_REVIEW = 3145; public static final int SOUND_SYNTH = 3200; public static final int SOUND_SONG = 3201; public static final int SOUND_JINGLE = 3202; @@ -357,6 +364,41 @@ public class Opcodes 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 ACTIVECLANSETTINGS_FIND_LISTENED = 3800; + public static final int ACTIVECLANSETTINGS_FIND_AFFINED = 3801; + public static final int ACTIVECLANSETTINGS_GETCLANNAME = 3802; + public static final int ACTIVECLANSETTINGS_GETALLOWUNAFFINED = 3803; + public static final int ACTIVECLANSETTINGS_GETRANKTALK = 3804; + public static final int ACTIVECLANSETTINGS_GETRANKKICK = 3805; + public static final int ACTIVECLANSETTINGS_GETRANKLOOTSHARE = 3806; + public static final int ACTIVECLANSETTINGS_GETCOINSHARE = 3807; + public static final int ACTIVECLANSETTINGS_GETAFFINEDCOUNT = 3809; + public static final int ACTIVECLANSETTINGS_GETAFFINEDDISPLAYNAME = 3810; + public static final int ACTIVECLANSETTINGS_GETAFFINEDRANK = 3811; + public static final int ACTIVECLANSETTINGS_GETBANNEDCOUNT = 3812; + public static final int ACTIVECLANSETTINGS_GETBANNEDDISPLAYNAME = 3813; + public static final int ACTIVECLANSETTINGS_GETAFFINEDEXTRAINFO = 3814; + public static final int ACTIVECLANSETTINGS_GETCURRENTOWNER_SLOT = 3815; + public static final int ACTIVECLANSETTINGS_GETREPLACEMENTOWNER_SLOT = 3816; + public static final int ACTIVECLANSETTINGS_GETAFFINEDSLOT = 3817; + public static final int ACTIVECLANSETTINGS_GETSORTEDAFFINEDSLOT = 3818; + public static final int AFFINEDCLANSETTINGS_ADDBANNED_FROMCHANNEL = 3819; + public static final int ACTIVECLANSETTINGS_GETAFFINEDJOINRUNEDAY = 3820; + public static final int AFFINEDCLANSETTINGS_SETMUTED_FROMCHANNEL = 3821; + public static final int ACTIVECLANSETTINGS_GETAFFINEDMUTED = 3822; + public static final int ACTIVECLANCHANNEL_FIND_LISTENED = 3850; + public static final int ACTIVECLANCHANNEL_FIND_AFFINED = 3851; + public static final int ACTIVECLANCHANNEL_GETCLANNAME = 3852; + public static final int ACTIVECLANCHANNEL_GETRANKKICK = 3853; + public static final int ACTIVECLANCHANNEL_GETRANKTALK = 3854; + public static final int ACTIVECLANCHANNEL_GETUSERCOUNT = 3855; + public static final int ACTIVECLANCHANNEL_GETUSERDISPLAYNAME = 3856; + public static final int ACTIVECLANCHANNEL_GETUSERRANK = 3857; + public static final int ACTIVECLANCHANNEL_GETUSERWORLD = 3858; + public static final int ACTIVECLANCHANNEL_KICKUSER = 3859; + public static final int ACTIVECLANCHANNEL_GETUSERSLOT = 3860; + public static final int ACTIVECLANCHANNEL_GETSORTEDUSERSLOT = 3861; + public static final int CLANPROFILE_FIND = 3890; public static final int STOCKMARKET_GETOFFERTYPE = 3903; public static final int STOCKMARKET_GETOFFERITEM = 3904; public static final int STOCKMARKET_GETOFFERPRICE = 3905; @@ -397,6 +439,11 @@ public class Opcodes public static final int AND = 4014; public static final int OR = 4015; public static final int SCALE = 4018; + public static final int BITCOUNT = 4025; + public static final int TOGGLEBIT = 4026; + public static final int SETBIT_RANGE = 4027; + public static final int CLEARBIT_RANGE = 4028; + public static final int GETBIT_RANGE = 4029; public static final int APPEND_NUM = 4100; public static final int APPEND = 4101; public static final int APPEND_SIGNNUM = 4102; @@ -419,7 +466,6 @@ 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; @@ -441,6 +487,7 @@ public class Opcodes 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_SENDCLAN = 5010; public static final int CHAT_PLAYERNAME = 5015; public static final int CHAT_GETFILTER_TRADE = 5016; public static final int CHAT_GETHISTORYLENGTH = 5017; @@ -449,7 +496,7 @@ public class Opcodes public static final int DOCHEAT = 5020; public static final int CHAT_SETMESSAGEFILTER = 5021; public static final int CHAT_GETMESSAGEFILTER = 5022; - public static final int DEBUGMES = 5023; + public static final int WRITECONSOLE = 5023; public static final int GETWINDOWMODE = 5306; public static final int SETWINDOWMODE = 5307; public static final int GETDEFAULTWINDOWMODE = 5308; @@ -471,7 +518,6 @@ 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; @@ -480,9 +526,9 @@ public class Opcodes public static final int ON_MOBILE = 6518; public static final int CLIENTTYPE = 6519; public static final int MOBILE_KEYBOARDHIDE = 6521; - public static final int BATTERYLEVEL = 6524; - public static final int BATTERYCHARGING = 6525; - public static final int WIFIAVAILABLE = 6526; + public static final int MOBILE_BATTERYLEVEL = 6524; + public static final int MOBILE_BATTERYCHARGING = 6525; + public static final int MOBILE_WIFIAVAILABLE = 6526; public static final int WORLDMAP_GETMAPNAME = 6601; public static final int WORLDMAP_SETMAP = 6602; public static final int WORLDMAP_GETZOOM = 6603; diff --git a/cache/src/test/java/net/runelite/cache/CacheProperties.java b/cache/src/test/java/net/runelite/cache/CacheProperties.java index 5614563f72..2af3c78a5b 100644 --- a/cache/src/test/java/net/runelite/cache/CacheProperties.java +++ b/cache/src/test/java/net/runelite/cache/CacheProperties.java @@ -40,7 +40,7 @@ public class CacheProperties public static int getRsVersion() throws IOException { - return Integer.parseInt(getProperties().getProperty("rs.version")); + return (int) Double.parseDouble(getProperties().getProperty("rs.version")); } public static int getCacheVersion() throws IOException diff --git a/deobfuscator/src/test/java/net/runelite/deob/DeobTestProperties.java b/deobfuscator/src/test/java/net/runelite/deob/DeobTestProperties.java index b5fd9370d1..f04e7b8816 100644 --- a/deobfuscator/src/test/java/net/runelite/deob/DeobTestProperties.java +++ b/deobfuscator/src/test/java/net/runelite/deob/DeobTestProperties.java @@ -31,7 +31,7 @@ import org.junit.rules.ExternalResource; public class DeobTestProperties extends ExternalResource { private String rsClient; - private int rsVersion; + private double rsVersion; private String vanillaClient; @Override @@ -42,7 +42,7 @@ public class DeobTestProperties extends ExternalResource properties.load(resourceAsStream); rsClient = (String) properties.get("rs.client"); - rsVersion = Integer.parseInt((String) properties.get("rs.version")); + rsVersion = Double.parseDouble((String) properties.get("rs.version")); vanillaClient = (String) properties.get("vanilla.client"); } @@ -51,7 +51,7 @@ public class DeobTestProperties extends ExternalResource return rsClient; } - public int getRsVersion() + public double getRsVersion() { return rsVersion; } diff --git a/deobfuscator/src/test/java/net/runelite/deob/clientver/ClientVersionTest.java b/deobfuscator/src/test/java/net/runelite/deob/clientver/ClientVersionTest.java index 45d42f669b..f3ea5eac8e 100644 --- a/deobfuscator/src/test/java/net/runelite/deob/clientver/ClientVersionTest.java +++ b/deobfuscator/src/test/java/net/runelite/deob/clientver/ClientVersionTest.java @@ -40,7 +40,7 @@ public class ClientVersionTest public void test() throws IOException { ClientVersion ver = new ClientVersion(new File(properties.getVanillaClient())); - Assert.assertEquals(properties.getRsVersion(), ver.getVersion()); + Assert.assertEquals((int) Math.floor(properties.getRsVersion()), ver.getVersion()); } } diff --git a/http-api/src/main/java/net/runelite/http/api/RuneLiteAPI.java b/http-api/src/main/java/net/runelite/http/api/RuneLiteAPI.java index b09bd870dc..745474880a 100644 --- a/http-api/src/main/java/net/runelite/http/api/RuneLiteAPI.java +++ b/http-api/src/main/java/net/runelite/http/api/RuneLiteAPI.java @@ -65,7 +65,6 @@ public class RuneLiteAPI private static final Properties properties = new Properties(); private static String version; - private static int rsVersion; static { @@ -75,7 +74,6 @@ public class RuneLiteAPI properties.load(in); version = properties.getProperty("runelite.version"); - rsVersion = Integer.parseInt(properties.getProperty("rs.version")); String commit = properties.getProperty("runelite.commit"); boolean dirty = Boolean.parseBoolean(properties.getProperty("runelite.dirty")); @@ -181,9 +179,4 @@ public class RuneLiteAPI RuneLiteAPI.version = version; } - public static int getRsVersion() - { - return rsVersion; - } - } diff --git a/http-api/src/main/resources/runelite.properties b/http-api/src/main/resources/runelite.properties index 9464b52906..5300422637 100644 --- a/http-api/src/main/resources/runelite.properties +++ b/http-api/src/main/resources/runelite.properties @@ -1,3 +1,2 @@ runelite.version=@projectver@ -rs.version=@rsver@ runelite.commit=@gitcommit@ \ No newline at end of file diff --git a/runelite-api/src/main/java/net/runelite/api/Client.java b/runelite-api/src/main/java/net/runelite/api/Client.java index eb356d2069..05ed7dcada 100644 --- a/runelite-api/src/main/java/net/runelite/api/Client.java +++ b/runelite-api/src/main/java/net/runelite/api/Client.java @@ -34,6 +34,8 @@ import java.util.Set; import javax.annotation.Nonnull; import javax.annotation.Nullable; import net.runelite.api.annotations.VisibleForExternalPlugins; +import net.runelite.api.clan.ClanChannel; +import net.runelite.api.clan.ClanSettings; import net.runelite.api.coords.LocalPoint; import net.runelite.api.coords.WorldPoint; import net.runelite.api.events.PlayerChanged; @@ -2194,4 +2196,32 @@ public interface Client extends GameEngine * @return */ int getCrossWorldMessageIdsIndex(); + + /** + * Get the primary clan channel the player is in. + * @return + */ + @Nullable + ClanChannel getClanChannel(); + + /** + * Get the guest clan channel the player is in. + * @return + */ + @Nullable + ClanChannel getGuestClanChannel(); + + /** + * Get clan settings for the clan the user is in. + * @return + */ + @Nullable + ClanSettings getClanSettings(); + + /** + * Get the guest clan's settings. + * @return + */ + @Nullable + ClanSettings getGuestClanSettings(); } diff --git a/runelite-api/src/main/java/net/runelite/api/EnumID.java b/runelite-api/src/main/java/net/runelite/api/EnumID.java index a5ce747f77..42cdd7c372 100644 --- a/runelite-api/src/main/java/net/runelite/api/EnumID.java +++ b/runelite-api/src/main/java/net/runelite/api/EnumID.java @@ -49,4 +49,6 @@ public final class EnumID public static final int ARCEUUS_SPELLBOOK = 1985; public static final int FRIENDS_CHAT_RANK_ICONS = 1543; + public static final int CLAN_RANK_NAME = 3797; + public static final int CLAN_RANK_GRAPHIC = 3798; } diff --git a/runelite-api/src/main/java/net/runelite/api/Player.java b/runelite-api/src/main/java/net/runelite/api/Player.java index 699c317027..227f7928b3 100644 --- a/runelite-api/src/main/java/net/runelite/api/Player.java +++ b/runelite-api/src/main/java/net/runelite/api/Player.java @@ -74,6 +74,13 @@ public interface Player extends Actor */ boolean isFriend(); + /** + * Checks whether the player is a member of the same clan as the local player. + * + * @return + */ + boolean isClanMember(); + /** * Gets the displayed overhead icon of the player. * 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 4d8e546ec9..b6929bb2d6 100644 --- a/runelite-api/src/main/java/net/runelite/api/ScriptID.java +++ b/runelite-api/src/main/java/net/runelite/api/ScriptID.java @@ -376,4 +376,23 @@ public final class ScriptID */ @ScriptArguments(integer = 4) public static final int WIKI_ICON_UPDATE = 3306; + + /** + * Builds a line in the chatbox when there is no username: prefix, such as + * a game or system message + */ + @ScriptArguments(integer = 11, string = 1) + public static final int CHATBOX_BUILD_LINE_WITHOUT_USER = 199; + + /** + * Builds a line in the chatbox when there is a username: prefix + */ + @ScriptArguments(integer = 11, string = 2) + public static final int CHATBOX_BUILD_LINE_WITH_USER = 203; + + /** + * Builds a line in the chatbox when it from a clan + */ + @ScriptArguments(integer = 14, string = 3) + public static final int CHATBOX_BUILD_LINE_WITH_CLAN = 4483; } \ No newline at end of file diff --git a/runelite-api/src/main/java/net/runelite/api/clan/ClanChannel.java b/runelite-api/src/main/java/net/runelite/api/clan/ClanChannel.java new file mode 100644 index 0000000000..7f2bba0d28 --- /dev/null +++ b/runelite-api/src/main/java/net/runelite/api/clan/ClanChannel.java @@ -0,0 +1,54 @@ +/* + * Copyright (c) 2021, 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.clan; + +import java.util.List; +import javax.annotation.Nullable; + +/** + * A clan channel. + */ +public interface ClanChannel +{ + /** + * The name of the channel + * @return + */ + String getName(); + + /** + * The members currently online in the channel. + * @return + */ + List getMembers(); + + /** + * Find a clan member by name + * @param name + * @return + */ + @Nullable + ClanChannelMember findMember(String name); +} diff --git a/runelite-api/src/main/java/net/runelite/api/clan/ClanChannelMember.java b/runelite-api/src/main/java/net/runelite/api/clan/ClanChannelMember.java new file mode 100644 index 0000000000..be01248f76 --- /dev/null +++ b/runelite-api/src/main/java/net/runelite/api/clan/ClanChannelMember.java @@ -0,0 +1,54 @@ +/* + * Copyright (c) 2021, 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.clan; + +import net.runelite.api.ChatPlayer; + +/** + * A member of a clan channel + */ +public interface ClanChannelMember extends ChatPlayer +{ + /** + * The member name + * @return + */ + String getName(); + + /** + * The member's rank relative to the other members. To get the member title, + * see ClanSettings. + * @see ClanRank + * @see ClanSettings#titleForRank(ClanRank) + * @return + */ + ClanRank getRank(); + + /** + * The world the member is on + * @return + */ + int getWorld(); +} diff --git a/runelite-api/src/main/java/net/runelite/api/clan/ClanMember.java b/runelite-api/src/main/java/net/runelite/api/clan/ClanMember.java new file mode 100644 index 0000000000..896939a505 --- /dev/null +++ b/runelite-api/src/main/java/net/runelite/api/clan/ClanMember.java @@ -0,0 +1,44 @@ +/* + * Copyright (c) 2021, 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.clan; + +import lombok.Value; + +/** + * A member of a clan. + */ +@Value +public class ClanMember +{ + /** + * The clan member's name + */ + String name; + + /** + * The clan member's rank + */ + ClanRank rank; +} diff --git a/runelite-api/src/main/java/net/runelite/api/clan/ClanRank.java b/runelite-api/src/main/java/net/runelite/api/clan/ClanRank.java new file mode 100644 index 0000000000..05175059fa --- /dev/null +++ b/runelite-api/src/main/java/net/runelite/api/clan/ClanRank.java @@ -0,0 +1,52 @@ +/* + * Copyright (c) 2021, 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.clan; + +/** + * The ranks in a clan. Clan ranks 1-14 are mapped to corresponding titles via + * the clan settings. + */ +public enum ClanRank +{ + GUEST, + CLAN_RANK_1, + CLAN_RANK_2, + CLAN_RANK_3, + CLAN_RANK_4, + CLAN_RANK_5, + CLAN_RANK_6, + CLAN_RANK_7, + CLAN_RANK_8, + CLAN_RANK_9, + CLAN_RANK_10, + ADMINISTRATOR, + CLAN_RANK_11, + CLAN_RANK_12, + CLAN_RANK_13, + CLAN_RANK_14, + DEPUTY_OWNER, + OWNER, + JMOD; +} diff --git a/runelite-api/src/main/java/net/runelite/api/clan/ClanSettings.java b/runelite-api/src/main/java/net/runelite/api/clan/ClanSettings.java new file mode 100644 index 0000000000..5594f88700 --- /dev/null +++ b/runelite-api/src/main/java/net/runelite/api/clan/ClanSettings.java @@ -0,0 +1,63 @@ +/* + * Copyright (c) 2021, 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.clan; + +import java.util.List; +import javax.annotation.Nullable; + +/** + * A clan's settings. + */ +public interface ClanSettings +{ + /** + * The clan name + * @return + */ + String getName(); + + /** + * The members of the clan. This includes all members, whether online or offline. + * @return + */ + List getMembers(); + + /** + * Find a member of the clan. + * @param name + * @return + */ + @Nullable + ClanMember findMember(String name); + + /** + * Get the clan title for a clan rank. + * @param clanRank the rank + * @see ClanRank + * @return + */ + @Nullable + ClanTitle titleForRank(ClanRank clanRank); +} diff --git a/runelite-api/src/main/java/net/runelite/api/clan/ClanTitle.java b/runelite-api/src/main/java/net/runelite/api/clan/ClanTitle.java new file mode 100644 index 0000000000..3c6daee6d7 --- /dev/null +++ b/runelite-api/src/main/java/net/runelite/api/clan/ClanTitle.java @@ -0,0 +1,43 @@ +/* + * Copyright (c) 2021, 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.clan; + +import lombok.Value; + +/** + * A clan title, such as Owner, Administrator, Anchor, etc. + */ +@Value +public class ClanTitle +{ + /** + * The id of the title + */ + int id; + /** + * The name of the title + */ + String name; +} diff --git a/runelite-api/src/main/java/net/runelite/api/events/ClanMemberJoined.java b/runelite-api/src/main/java/net/runelite/api/events/ClanMemberJoined.java new file mode 100644 index 0000000000..bc90c354a9 --- /dev/null +++ b/runelite-api/src/main/java/net/runelite/api/events/ClanMemberJoined.java @@ -0,0 +1,39 @@ +/* + * Copyright (c) 2021, 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.events; + +import lombok.Value; +import net.runelite.api.clan.ClanChannel; +import net.runelite.api.clan.ClanChannelMember; + +/** + * An event when a clan member joins a clan channel. + */ +@Value +public class ClanMemberJoined +{ + private final ClanChannel clanChannel; + private final ClanChannelMember clanMember; +} diff --git a/runelite-api/src/main/java/net/runelite/api/events/ClanMemberLeft.java b/runelite-api/src/main/java/net/runelite/api/events/ClanMemberLeft.java new file mode 100644 index 0000000000..c4e339408f --- /dev/null +++ b/runelite-api/src/main/java/net/runelite/api/events/ClanMemberLeft.java @@ -0,0 +1,39 @@ +/* + * Copyright (c) 2021, 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.events; + +import lombok.Value; +import net.runelite.api.clan.ClanChannel; +import net.runelite.api.clan.ClanChannelMember; + +/** + * An event when a clan member leaves a channel. + */ +@Value +public class ClanMemberLeft +{ + private final ClanChannel clanChannel; + private final ClanChannelMember clanMember; +} diff --git a/runelite-api/src/main/java/net/runelite/api/widgets/WidgetID.java b/runelite-api/src/main/java/net/runelite/api/widgets/WidgetID.java index b45d221d20..aff73a0af8 100644 --- a/runelite-api/src/main/java/net/runelite/api/widgets/WidgetID.java +++ b/runelite-api/src/main/java/net/runelite/api/widgets/WidgetID.java @@ -179,6 +179,8 @@ public class WidgetID public static final int DIALOG_SPRITE2_ID = 11; public static final int MULTISKILL_MENU_GROUP_ID = 270; public static final int TEMPOROSS_GROUP_ID = 437; + public static final int CLAN_GROUP_ID = 701; + public static final int CLAN_GUEST_GROUP_ID = 702; static class WorldMap { @@ -1412,4 +1414,14 @@ public class WidgetID { static final int CONTAINER = 4; } + + static class Clan + { + static final int MEMBERS = 8; + } + + static class ClanGuest + { + static final int MEMBERS = 8; + } } diff --git a/runelite-api/src/main/java/net/runelite/api/widgets/WidgetInfo.java b/runelite-api/src/main/java/net/runelite/api/widgets/WidgetInfo.java index ad21181f24..3e659143b7 100644 --- a/runelite-api/src/main/java/net/runelite/api/widgets/WidgetInfo.java +++ b/runelite-api/src/main/java/net/runelite/api/widgets/WidgetInfo.java @@ -546,6 +546,9 @@ public enum WidgetInfo TEMPOROSS_STATUS_INDICATOR(WidgetID.TEMPOROSS_GROUP_ID, WidgetID.TemporossStatus.STATUS_INDICATOR), + CLAN_MEMBER_LIST(WidgetID.CLAN_GROUP_ID, WidgetID.Clan.MEMBERS), + CLAN_GUEST_MEMBER_LIST(WidgetID.CLAN_GUEST_GROUP_ID, WidgetID.ClanGuest.MEMBERS), + //OpenOSRS WORLD_MAP_BUTTON_BORDER(WidgetID.MINIMAP_GROUP_ID, WidgetID.Minimap.WORLDMAP_ORB), diff --git a/runelite-client/src/main/java/net/runelite/client/chat/ChatCommandManager.java b/runelite-client/src/main/java/net/runelite/client/chat/ChatCommandManager.java index 0c3a0bfcbc..ff4d8481d9 100644 --- a/runelite-client/src/main/java/net/runelite/client/chat/ChatCommandManager.java +++ b/runelite-client/src/main/java/net/runelite/client/chat/ChatCommandManager.java @@ -98,6 +98,8 @@ public class ChatCommandManager implements ChatboxInputListener case PRIVATECHAT: case MODPRIVATECHAT: case PRIVATECHATOUT: + case CLAN_CHAT: + case CLAN_GUEST_CHAT: break; default: return; diff --git a/runelite-client/src/main/java/net/runelite/client/chat/ChatMessageManager.java b/runelite-client/src/main/java/net/runelite/client/chat/ChatMessageManager.java index 76038ce8b8..17502740ed 100644 --- a/runelite-client/src/main/java/net/runelite/client/chat/ChatMessageManager.java +++ b/runelite-client/src/main/java/net/runelite/client/chat/ChatMessageManager.java @@ -119,7 +119,7 @@ public class ChatMessageManager boolean isChatboxTransparent = client.isResized() && client.getVar(Varbits.TRANSPARENT_CHATBOX) == 1; Color usernameColor = null; - Color senderColor; + Color senderColor = null; switch (chatMessageType) { @@ -147,12 +147,22 @@ public class ChatMessageManager break; } case FRIENDSCHAT: + case FRIENDSCHATNOTIFICATION: usernameColor = isChatboxTransparent ? chatColorConfig.transparentFriendsChatUsernames() : chatColorConfig.opaqueFriendsChatUsernames(); + senderColor = isChatboxTransparent ? chatColorConfig.transparentFriendsChatChannelName() : chatColorConfig.opaqueFriendsChatChannelName(); + break; + case CLAN_CHAT: + case CLAN_MESSAGE: + usernameColor = isChatboxTransparent ? chatColorConfig.transparentClanChatUsernames() : chatColorConfig.opaqueClanChatUsernames(); + senderColor = isChatboxTransparent ? chatColorConfig.transparentClanChannelName() : chatColorConfig.opaqueClanChannelName(); + break; + case CLAN_GUEST_CHAT: + case CLAN_GUEST_MESSAGE: + usernameColor = isChatboxTransparent ? chatColorConfig.transparentClanChatGuestUsernames() : chatColorConfig.opaqueClanChatGuestUsernames(); + senderColor = isChatboxTransparent ? chatColorConfig.transparentClanChannelGuestName() : chatColorConfig.opaqueClanGuestChatChannelName(); break; } - senderColor = isChatboxTransparent ? chatColorConfig.transparentFriendsChatChannelName() : chatColorConfig.opaqueFriendsChatChannelName(); - if (usernameColor != null) { messageNode.setName(ColorUtil.wrapWithColorTag(messageNode.getName(), usernameColor)); @@ -186,12 +196,14 @@ public class ChatMessageManager { final String eventName = scriptCallbackEvent.getEventName(); + boolean wrap; switch (eventName) { - case "privateChatFrom": - case "privateChatTo": - case "privateChatSplitFrom": - case "privateChatSplitTo": + case "splitPrivChatUsernameColor": + wrap = false; + break; + case "privChatUsername": + wrap = true; break; default: return; @@ -206,10 +218,17 @@ public class ChatMessageManager final String[] stringStack = client.getStringStack(); final int stringStackSize = client.getStringStackSize(); - - // Stack is: To/From playername : - String toFrom = stringStack[stringStackSize - 3]; - stringStack[stringStackSize - 3] = ColorUtil.prependColorTag(toFrom, usernameColor); + + String fromToUsername = stringStack[stringStackSize - 1]; + if (wrap) + { + fromToUsername = ColorUtil.wrapWithColorTag(fromToUsername, usernameColor); + } + else + { + fromToUsername = ColorUtil.colorTag(usernameColor); + } + stringStack[stringStackSize - 1] = fromToUsername; } private static Color getDefaultColor(ChatMessageType type, boolean transparent) @@ -226,12 +245,16 @@ public class ChatMessageManager case PRIVATECHAT: return JagexColors.CHAT_PRIVATE_MESSAGE_TEXT_OPAQUE_BACKGROUND; case FRIENDSCHAT: + case CLAN_CHAT: + case CLAN_GUEST_CHAT: return JagexColors.CHAT_FC_TEXT_OPAQUE_BACKGROUND; case ITEM_EXAMINE: case OBJECT_EXAMINE: case NPC_EXAMINE: case CONSOLE: case FRIENDSCHATNOTIFICATION: + case CLAN_MESSAGE: + case CLAN_GUEST_MESSAGE: return JagexColors.CHAT_GAME_EXAMINE_TEXT_OPAQUE_BACKGROUND; } } @@ -247,12 +270,16 @@ public class ChatMessageManager case PRIVATECHAT: return JagexColors.CHAT_PRIVATE_MESSAGE_TEXT_TRANSPARENT_BACKGROUND; case FRIENDSCHAT: + case CLAN_CHAT: + case CLAN_GUEST_CHAT: return JagexColors.CHAT_FC_TEXT_TRANSPARENT_BACKGROUND; case ITEM_EXAMINE: case OBJECT_EXAMINE: case NPC_EXAMINE: case CONSOLE: case FRIENDSCHATNOTIFICATION: + case CLAN_MESSAGE: + case CLAN_GUEST_MESSAGE: return JagexColors.CHAT_GAME_EXAMINE_TEXT_TRANSPARENT_BACKGROUND; } } @@ -341,6 +368,49 @@ public class ChatMessageManager cacheColor(new ChatColor(ChatColorType.HIGHLIGHT, chatColorConfig.opaqueFriendsChatMessageHighlight(), false), ChatMessageType.FRIENDSCHAT); } + //region opaque clanchat + if (chatColorConfig.opaqueClanChatInfo() != null) + { + cacheColor(new ChatColor(ChatColorType.NORMAL, chatColorConfig.opaqueClanChatInfo(), false), + ChatMessageType.CLAN_MESSAGE); + } + if (chatColorConfig.opaqueClanChatInfoHighlight() != null) + { + cacheColor(new ChatColor(ChatColorType.HIGHLIGHT, chatColorConfig.opaqueClanChatInfoHighlight(), false), + ChatMessageType.CLAN_MESSAGE); + } + if (chatColorConfig.opaqueClanChatMessage() != null) + { + cacheColor(new ChatColor(ChatColorType.NORMAL, chatColorConfig.opaqueClanChatMessage(), false), + ChatMessageType.CLAN_CHAT); + } + if (chatColorConfig.opaqueClanChatMessageHighlight() != null) + { + cacheColor(new ChatColor(ChatColorType.HIGHLIGHT, chatColorConfig.opaqueClanChatMessageHighlight(), false), + ChatMessageType.CLAN_CHAT); + } + + if (chatColorConfig.opaqueClanChatGuestInfo() != null) + { + cacheColor(new ChatColor(ChatColorType.NORMAL, chatColorConfig.opaqueClanChatGuestInfo(), false), + ChatMessageType.CLAN_GUEST_MESSAGE); + } + if (chatColorConfig.opaqueClanChatGuestInfoHighlight() != null) + { + cacheColor(new ChatColor(ChatColorType.HIGHLIGHT, chatColorConfig.opaqueClanChatGuestInfoHighlight(), false), + ChatMessageType.CLAN_GUEST_MESSAGE); + } + if (chatColorConfig.opaqueClanChatGuestMessage() != null) + { + cacheColor(new ChatColor(ChatColorType.NORMAL, chatColorConfig.opaqueClanChatGuestMessage(), false), + ChatMessageType.CLAN_GUEST_CHAT); + } + if (chatColorConfig.opaqueClanChatGuestMessageHighlight() != null) + { + cacheColor(new ChatColor(ChatColorType.HIGHLIGHT, chatColorConfig.opaqueClanChatGuestMessageHighlight(), false), + ChatMessageType.CLAN_GUEST_CHAT); + } + //endregion if (chatColorConfig.opaqueAutochatMessage() != null) { cacheColor(new ChatColor(ChatColorType.NORMAL, chatColorConfig.opaqueAutochatMessage(), false), @@ -454,6 +524,7 @@ public class ChatMessageManager cacheColor(new ChatColor(ChatColorType.HIGHLIGHT, chatColorConfig.transparentPrivateMessageReceivedHighlight(), true), ChatMessageType.MODPRIVATECHAT); } + //region transpaprent friends chat if (chatColorConfig.transparentFriendsChatInfo() != null) { cacheColor(new ChatColor(ChatColorType.NORMAL, chatColorConfig.transparentFriendsChatInfo(), true), @@ -474,6 +545,50 @@ public class ChatMessageManager cacheColor(new ChatColor(ChatColorType.HIGHLIGHT, chatColorConfig.transparentFriendsChatMessageHighlight(), true), ChatMessageType.FRIENDSCHAT); } + //endregion + //region transparent clanchat + if (chatColorConfig.transparentClanChatInfo() != null) + { + cacheColor(new ChatColor(ChatColorType.NORMAL, chatColorConfig.transparentClanChatInfo(), true), + ChatMessageType.CLAN_MESSAGE); + } + if (chatColorConfig.transparentClanChatInfoHighlight() != null) + { + cacheColor(new ChatColor(ChatColorType.HIGHLIGHT, chatColorConfig.transparentClanChatInfoHighlight(), true), + ChatMessageType.CLAN_MESSAGE); + } + if (chatColorConfig.transparentClanChatMessage() != null) + { + cacheColor(new ChatColor(ChatColorType.NORMAL, chatColorConfig.transparentClanChatMessage(), true), + ChatMessageType.CLAN_CHAT); + } + if (chatColorConfig.transparentClanChatMessageHighlight() != null) + { + cacheColor(new ChatColor(ChatColorType.HIGHLIGHT, chatColorConfig.transparentClanChatMessageHighlight(), true), + ChatMessageType.CLAN_CHAT); + } + + if (chatColorConfig.transparentClanChatGuestInfo() != null) + { + cacheColor(new ChatColor(ChatColorType.NORMAL, chatColorConfig.transparentClanChatGuestInfo(), true), + ChatMessageType.CLAN_GUEST_MESSAGE); + } + if (chatColorConfig.transparentClanChatGuestInfoHighlight() != null) + { + cacheColor(new ChatColor(ChatColorType.HIGHLIGHT, chatColorConfig.transparentClanChatGuestInfoHighlight(), true), + ChatMessageType.CLAN_GUEST_MESSAGE); + } + if (chatColorConfig.transparentClanChatGuestMessage() != null) + { + cacheColor(new ChatColor(ChatColorType.NORMAL, chatColorConfig.transparentClanChatGuestMessage(), true), + ChatMessageType.CLAN_GUEST_CHAT); + } + if (chatColorConfig.transparentClanChatGuestMessageHighlight() != null) + { + cacheColor(new ChatColor(ChatColorType.HIGHLIGHT, chatColorConfig.transparentClanChatGuestMessageHighlight(), true), + ChatMessageType.CLAN_GUEST_CHAT); + } + //endregion if (chatColorConfig.transparentAutochatMessage() != null) { cacheColor(new ChatColor(ChatColorType.NORMAL, chatColorConfig.transparentAutochatMessage(), true), diff --git a/runelite-client/src/main/java/net/runelite/client/config/ChatColorConfig.java b/runelite-client/src/main/java/net/runelite/client/config/ChatColorConfig.java index d24d952435..90fc5adbe0 100644 --- a/runelite-client/src/main/java/net/runelite/client/config/ChatColorConfig.java +++ b/runelite-client/src/main/java/net/runelite/client/config/ChatColorConfig.java @@ -108,6 +108,7 @@ public interface ChatColorConfig extends Config return Color.decode("#002783"); } + //region opaque friends chat @ConfigItem( position = 7, keyName = "opaqueFriendsChatInfo", @@ -149,9 +150,96 @@ public interface ChatColorConfig extends Config { return Color.decode("#000000"); } + //endregion + //region opaque clan chat @ConfigItem( position = 11, + keyName = "opaqueClanInfo", + name = "Clan chat info", + description = "Clan Chat Information (eg. when joining a channel)", + section = opaqueSection + ) + Color opaqueClanChatInfo(); + + @ConfigItem( + position = 12, + keyName = "opaqueClanInfoHighlight", + name = "Clan chat info highlight", + description = "Clan Chat Information highlight", + section = opaqueSection + ) + default Color opaqueClanChatInfoHighlight() + { + return Color.RED; + } + + @ConfigItem( + position = 13, + keyName = "opaqueClanMessage", + name = "Clan chat message", + description = "Color of Clan chat messages", + section = opaqueSection + ) + Color opaqueClanChatMessage(); + + @ConfigItem( + position = 14, + keyName = "opaqueClanChatMessageHighlight", + name = "Clan chat message highlight", + description = "Color of highlights in Clan Chat messages", + section = opaqueSection + ) + default Color opaqueClanChatMessageHighlight() + { + return Color.decode("#000000"); + } + + @ConfigItem( + position = 15, + keyName = "opaqueClanGuestInfo", + name = "Guest Clan chat info", + description = "Guest Clan Chat Information (eg. when joining a channel)", + section = opaqueSection + ) + Color opaqueClanChatGuestInfo(); + + @ConfigItem( + position = 16, + keyName = "opaqueClanGuestInfoHighlight", + name = "Guest Clan chat info highlight", + description = "Guest Clan Chat Information highlight", + section = opaqueSection + ) + default Color opaqueClanChatGuestInfoHighlight() + { + return Color.RED; + } + + @ConfigItem( + position = 17, + keyName = "opaqueClanGuestMessage", + name = "Guest Clan chat message", + description = "Color of Guest Clan chat messages", + section = opaqueSection + ) + Color opaqueClanChatGuestMessage(); + + @ConfigItem( + position = 18, + keyName = "opaqueClanChatGuestMessageHighlight", + name = "Guest Clan chat message highlight", + description = "Color of highlights in Guest Clan Chat messages", + section = opaqueSection + ) + default Color opaqueClanChatGuestMessageHighlight() + { + return Color.decode("#000000"); + } + //endregion + + @ConfigItem( + position = 19, keyName = "opaqueAutochatMessage", name = "Autochat", description = "Color of Autochat messages", @@ -160,7 +248,7 @@ public interface ChatColorConfig extends Config Color opaqueAutochatMessage(); @ConfigItem( - position = 12, + position = 20, keyName = "opaqueAutochatMessageHighlight", name = "Autochat highlight", description = "Color of highlights in Autochat messages", @@ -169,7 +257,7 @@ public interface ChatColorConfig extends Config Color opaqueAutochatMessageHighlight(); @ConfigItem( - position = 13, + position = 21, keyName = "opaqueTradeChatMessage", name = "Trade chat", description = "Color of Trade Chat Messages", @@ -178,7 +266,7 @@ public interface ChatColorConfig extends Config Color opaqueTradeChatMessage(); @ConfigItem( - position = 14, + position = 22, keyName = "opaqueTradeChatMessageHighlight", name = "Trade chat highlight", description = "Color of highlights in Trade Chat Messages", @@ -187,7 +275,7 @@ public interface ChatColorConfig extends Config Color opaqueTradeChatMessageHighlight(); @ConfigItem( - position = 15, + position = 23, keyName = "opaqueServerMessage", name = "Server message", description = "Color of Server Messages (eg. 'Welcome to RuneScape')", @@ -196,7 +284,7 @@ public interface ChatColorConfig extends Config Color opaqueServerMessage(); @ConfigItem( - position = 16, + position = 24, keyName = "opaqueServerMessageHighlight", name = "Server message highlight", description = "Color of highlights in Server Messages", @@ -205,7 +293,7 @@ public interface ChatColorConfig extends Config Color opaqueServerMessageHighlight(); @ConfigItem( - position = 17, + position = 25, keyName = "opaqueGameMessage", name = "Game message", description = "Color of Game Messages", @@ -214,7 +302,7 @@ public interface ChatColorConfig extends Config Color opaqueGameMessage(); @ConfigItem( - position = 18, + position = 26, keyName = "opaqueGameMessageHighlight", name = "Game message highlight", description = "Color of highlights in Game Messages", @@ -226,7 +314,7 @@ public interface ChatColorConfig extends Config } @ConfigItem( - position = 19, + position = 27, keyName = "opaqueExamine", name = "Examine", description = "Color of Examine Text", @@ -235,7 +323,7 @@ public interface ChatColorConfig extends Config Color opaqueExamine(); @ConfigItem( - position = 20, + position = 28, keyName = "opaqueExamineHighlight", name = "Examine highlight", description = "Color of highlights in Examine Text", @@ -247,7 +335,7 @@ public interface ChatColorConfig extends Config } @ConfigItem( - position = 21, + position = 29, keyName = "opaqueFiltered", name = "Filtered", description = "Color of Filtered Text (messages that aren't shown when Game messages are filtered)", @@ -256,7 +344,7 @@ public interface ChatColorConfig extends Config Color opaqueFiltered(); @ConfigItem( - position = 22, + position = 30, keyName = "opaqueFilteredHighlight", name = "Filtered highlight", description = "Color of highlights in Filtered Text", @@ -265,7 +353,7 @@ public interface ChatColorConfig extends Config Color opaqueFilteredHighlight(); @ConfigItem( - position = 23, + position = 31, keyName = "opaqueUsername", name = "Usernames", description = "Color of Usernames", @@ -274,7 +362,7 @@ public interface ChatColorConfig extends Config Color opaqueUsername(); @ConfigItem( - position = 24, + position = 32, keyName = "opaquePrivateUsernames", name = "Private chat usernames", description = "Color of Usernames in Private Chat", @@ -283,16 +371,34 @@ public interface ChatColorConfig extends Config Color opaquePrivateUsernames(); @ConfigItem( - position = 25, + position = 33, keyName = "opaqueClanChannelName", - name = "Friends chat channel name", + name = "Friends Chat channel name", description = "Color of Friends chat channel name", section = opaqueSection ) Color opaqueFriendsChatChannelName(); @ConfigItem( - position = 26, + position = 34, + keyName = "opaqueClanChatChannelName", + name = "Clan Chat channel name", + description = "Color of Clan chat channel name", + section = opaqueSection + ) + Color opaqueClanChannelName(); + + @ConfigItem( + position = 35, + keyName = "opaqueClanChatGuestChannelName", + name = "Guest Clan Chat channel name", + description = "Color of Guest clan chat channel name", + section = opaqueSection + ) + Color opaqueClanGuestChatChannelName(); + + @ConfigItem( + position = 36, keyName = "opaqueClanUsernames", name = "Friends chat usernames", description = "Color of usernames in Friends chat", @@ -301,7 +407,25 @@ public interface ChatColorConfig extends Config Color opaqueFriendsChatUsernames(); @ConfigItem( - position = 27, + position = 37, + keyName = "opaqueClanChatUsernames", + name = "Clan chat usernames", + description = "Color of usernames in Clan chat", + section = opaqueSection + ) + Color opaqueClanChatUsernames(); + + @ConfigItem( + position = 38, + keyName = "opaqueClanChatGuestUsernames", + name = "Guest Clan chat usernames", + description = "Color of usernames in Guest Clan chat", + section = opaqueSection + ) + Color opaqueClanChatGuestUsernames(); + + @ConfigItem( + position = 39, keyName = "opaquePublicFriendUsernames", name = "Public friend usernames", description = "Color of Friend Usernames in Public Chat", @@ -310,7 +434,7 @@ public interface ChatColorConfig extends Config Color opaquePublicFriendUsernames(); @ConfigItem( - position = 28, + position = 40, keyName = "opaquePlayerUsername", name = "Your username", description = "Color of your username", @@ -381,6 +505,7 @@ public interface ChatColorConfig extends Config return Color.decode("#FFFFFF"); } + //region transparent friends chat @ConfigItem( position = 57, keyName = "transparentFriendsChatInfo", @@ -422,9 +547,96 @@ public interface ChatColorConfig extends Config { return Color.decode("#FFFFFF"); } + //endregion + //region transparent clan chat @ConfigItem( position = 61, + keyName = "transparentClanInfo", + name = "Clan chat info (transparent)", + description = "Clan Chat Information (eg. when joining a channel) (transparent)", + section = transparentSection + ) + Color transparentClanChatInfo(); + + @ConfigItem( + position = 62, + keyName = "transparentClanInfoHighlight", + name = "Clan chat info highlight (transparent)", + description = "Clan Chat Information highlight (transparent)", + section = transparentSection + ) + default Color transparentClanChatInfoHighlight() + { + return Color.RED; + } + + @ConfigItem( + position = 63, + keyName = "transparentClanMessage", + name = "Clan chat message (transparent)", + description = "Color of Clan chat messages (transparent)", + section = transparentSection + ) + Color transparentClanChatMessage(); + + @ConfigItem( + position = 64, + keyName = "transparentClanChatMessageHighlight", + name = "Clan chat message highlight (transparent)", + description = "Color of highlights in Clan Chat messages (transparent)", + section = transparentSection + ) + default Color transparentClanChatMessageHighlight() + { + return Color.decode("#FFFFFF"); + } + + @ConfigItem( + position = 65, + keyName = "transparentClanGuestInfo", + name = "Guest Clan chat info (transparent)", + description = "Guest Clan Chat Information (eg. when joining a channel) (transparent)", + section = transparentSection + ) + Color transparentClanChatGuestInfo(); + + @ConfigItem( + position = 66, + keyName = "transparentClanGuestInfoHighlight", + name = "Guest Clan chat info highlight (transparent)", + description = "Guest Clan Chat Information highlight (transparent)", + section = transparentSection + ) + default Color transparentClanChatGuestInfoHighlight() + { + return Color.RED; + } + + @ConfigItem( + position = 67, + keyName = "transparentClanGuestMessage", + name = "Guest Clan chat message (transparent)", + description = "Color of Guest Clan chat messages (transparent)", + section = transparentSection + ) + Color transparentClanChatGuestMessage(); + + @ConfigItem( + position = 68, + keyName = "transparentClanChatGuestMessageHighlight", + name = "Guest Clan chat message highlight (transparent)", + description = "Color of highlights in Guest Clan Chat messages (transparent)", + section = transparentSection + ) + default Color transparentClanChatGuestMessageHighlight() + { + return Color.decode("#FFFFFF"); + } + //endregion + + @ConfigItem( + position = 69, keyName = "transparentAutochatMessage", name = "Autochat (transparent)", description = "Color of Autochat messages (transparent)", @@ -433,7 +645,7 @@ public interface ChatColorConfig extends Config Color transparentAutochatMessage(); @ConfigItem( - position = 62, + position = 70, keyName = "transparentAutochatMessageHighlight", name = "Autochat highlight (transparent)", description = "Color of highlights in Autochat messages (transparent)", @@ -442,7 +654,7 @@ public interface ChatColorConfig extends Config Color transparentAutochatMessageHighlight(); @ConfigItem( - position = 63, + position = 71, keyName = "transparentTradeChatMessage", name = "Trade chat (transparent)", description = "Color of Trade Chat Messages (transparent)", @@ -451,7 +663,7 @@ public interface ChatColorConfig extends Config Color transparentTradeChatMessage(); @ConfigItem( - position = 64, + position = 72, keyName = "transparentTradeChatMessageHighlight", name = "Trade chat highlight (transparent)", description = "Color of highlights in Trade Chat Messages (transparent)", @@ -460,7 +672,7 @@ public interface ChatColorConfig extends Config Color transparentTradeChatMessageHighlight(); @ConfigItem( - position = 65, + position = 73, keyName = "transparentServerMessage", name = "Server message (transparent)", description = "Color of Server Messages (eg. 'Welcome to RuneScape') (transparent)", @@ -469,7 +681,7 @@ public interface ChatColorConfig extends Config Color transparentServerMessage(); @ConfigItem( - position = 66, + position = 74, keyName = "transparentServerMessageHighlight", name = "Server message highlight (transparent)", description = "Color of highlights in Server Messages (transparent)", @@ -478,7 +690,7 @@ public interface ChatColorConfig extends Config Color transparentServerMessageHighlight(); @ConfigItem( - position = 67, + position = 75, keyName = "transparentGameMessage", name = "Game message (transparent)", description = "Color of Game Messages (transparent)", @@ -487,7 +699,7 @@ public interface ChatColorConfig extends Config Color transparentGameMessage(); @ConfigItem( - position = 68, + position = 76, keyName = "transparentGameMessageHighlight", name = "Game message highlight (transparent)", description = "Color of highlights in Game Messages (transparent)", @@ -499,7 +711,7 @@ public interface ChatColorConfig extends Config } @ConfigItem( - position = 69, + position = 77, keyName = "transparentExamine", name = "Examine (transparent)", description = "Color of Examine Text (transparent)", @@ -508,7 +720,7 @@ public interface ChatColorConfig extends Config Color transparentExamine(); @ConfigItem( - position = 70, + position = 78, keyName = "transparentExamineHighlight", name = "Examine highlight (transparent)", description = "Color of highlights in Examine Text (transparent)", @@ -520,7 +732,7 @@ public interface ChatColorConfig extends Config } @ConfigItem( - position = 71, + position = 79, keyName = "transparentFiltered", name = "Filtered (transparent)", description = "Color of Filtered Text (messages that aren't shown when Game messages are filtered) (transparent)", @@ -529,7 +741,7 @@ public interface ChatColorConfig extends Config Color transparentFiltered(); @ConfigItem( - position = 72, + position = 80, keyName = "transparentFilteredHighlight", name = "Filtered highlight (transparent)", description = "Color of highlights in Filtered Text (transparent)", @@ -538,7 +750,7 @@ public interface ChatColorConfig extends Config Color transparentFilteredHighlight(); @ConfigItem( - position = 73, + position = 81, keyName = "transparentUsername", name = "Usernames (transparent)", description = "Color of Usernames (transparent)", @@ -547,7 +759,7 @@ public interface ChatColorConfig extends Config Color transparentUsername(); @ConfigItem( - position = 74, + position = 82, keyName = "transparentPrivateUsernames", name = "Private chat usernames (transparent)", description = "Color of Usernames in Private Chat (transparent)", @@ -556,16 +768,34 @@ public interface ChatColorConfig extends Config Color transparentPrivateUsernames(); @ConfigItem( - position = 75, + position = 83, keyName = "transparentClanChannelName", - name = "Friends chat channel name (transparent)", + name = "Friends Chat channel name (transparent)", description = "Color of Friends chat channel name (transparent)", section = transparentSection ) Color transparentFriendsChatChannelName(); @ConfigItem( - position = 76, + position = 84, + keyName = "transparentClanChatChannelName", + name = "Clan Chat channel name (transparent)", + description = "Color of Clan chat channel name (transparent)", + section = transparentSection + ) + Color transparentClanChannelName(); + + @ConfigItem( + position = 85, + keyName = "transparentClanChatGuestChannelName", + name = "Guest Clan Chat channel name (transparent)", + description = "Color of Guest clan chat channel name (transparent)", + section = transparentSection + ) + Color transparentClanChannelGuestName(); + + @ConfigItem( + position = 86, keyName = "transparentClanUsernames", name = "Friends chat usernames (transparent)", description = "Color of usernames in Friends chat (transparent)", @@ -574,7 +804,25 @@ public interface ChatColorConfig extends Config Color transparentFriendsChatUsernames(); @ConfigItem( - position = 77, + position = 87, + keyName = "transparentClanClanUsernames", + name = "Clan chat usernames (transparent)", + description = "Color of usernames in Clan chat (transparent)", + section = transparentSection + ) + Color transparentClanChatUsernames(); + + @ConfigItem( + position = 88, + keyName = "transparentClanClanGuestUsernames", + name = "Guest Clan chat usernames (transparent)", + description = "Color of usernames in Guest Clan chat (transparent)", + section = transparentSection + ) + Color transparentClanChatGuestUsernames(); + + @ConfigItem( + position = 89, keyName = "transparentPublicFriendUsernames", name = "Public friend usernames (transparent)", description = "Color of Friend Usernames in Public Chat (transparent)", @@ -583,7 +831,7 @@ public interface ChatColorConfig extends Config Color transparentPublicFriendUsernames(); @ConfigItem( - position = 78, + position = 90, keyName = "transparentPlayerUsername", name = "Your username (transparent)", description = "Color of your username (transparent)", diff --git a/runelite-client/src/main/java/net/runelite/client/game/ChatIconManager.java b/runelite-client/src/main/java/net/runelite/client/game/ChatIconManager.java index 6e80237e96..58f334ca96 100644 --- a/runelite-client/src/main/java/net/runelite/client/game/ChatIconManager.java +++ b/runelite-client/src/main/java/net/runelite/client/game/ChatIconManager.java @@ -37,6 +37,7 @@ import net.runelite.api.EnumID; import net.runelite.api.FriendsChatRank; import net.runelite.api.GameState; import net.runelite.api.IndexedSprite; +import net.runelite.api.clan.ClanTitle; import net.runelite.api.events.GameStateChanged; import net.runelite.client.eventbus.EventBus; import net.runelite.client.eventbus.Subscribe; @@ -52,8 +53,10 @@ public class ChatIconManager private final SpriteManager spriteManager; private BufferedImage[] friendsChatRankImages; + private BufferedImage[] clanRankImages; private int friendsChatOffset; + private int clanOffset; @Inject private ChatIconManager(Client client, SpriteManager spriteManager, EventBus eventBus) @@ -74,11 +77,25 @@ public class ChatIconManager return friendsChatRankImages[friendsChatRank.ordinal() - 1]; } + @Nullable + public BufferedImage getRankImage(final ClanTitle clanTitle) + { + int rank = clanTitle.getId(); + int idx = clanRankToIdx(rank); + return clanRankImages[idx]; + } + public int getIconNumber(final FriendsChatRank friendsChatRank) { return friendsChatOffset + friendsChatRank.ordinal() - 1; } + public int getIconNumber(final ClanTitle clanTitle) + { + int rank = clanTitle.getId(); + return clanOffset + clanRankToIdx(rank); + } + @Subscribe public void onGameStateChanged(GameStateChanged gameStateChanged) { @@ -91,22 +108,25 @@ public class ChatIconManager private void loadRankIcons() { final EnumComposition friendsChatIcons = client.getEnum(EnumID.FRIENDS_CHAT_RANK_ICONS); + final EnumComposition clanIcons = client.getEnum(EnumID.CLAN_RANK_GRAPHIC); { IndexedSprite[] modIcons = client.getModIcons(); friendsChatOffset = modIcons.length; + clanOffset = friendsChatOffset + friendsChatIcons.size(); IndexedSprite blank = ImageUtil.getImageIndexedSprite( new BufferedImage(modIcons[0].getWidth(), modIcons[0].getHeight(), BufferedImage.TYPE_INT_ARGB), client); - modIcons = Arrays.copyOf(modIcons, friendsChatOffset + friendsChatIcons.size()); + modIcons = Arrays.copyOf(modIcons, friendsChatOffset + friendsChatIcons.size() + clanIcons.size()); Arrays.fill(modIcons, friendsChatOffset, modIcons.length, blank); client.setModIcons(modIcons); } friendsChatRankImages = new BufferedImage[friendsChatIcons.size()]; + clanRankImages = new BufferedImage[clanIcons.size()]; final IndexedSprite[] modIcons = client.getModIcons(); @@ -120,6 +140,21 @@ public class ChatIconManager modIcons[friendsChatOffset + fi] = ImageUtil.getImageIndexedSprite(friendsChatRankImages[fi], client); }); } + + for (int i = 0; i < clanIcons.size(); i++) + { + final int key = clanIcons.getKeys()[i]; + final int idx = clanRankToIdx(key); + + assert idx >= 0 && idx < clanIcons.size(); + + spriteManager.getSpriteAsync(clanIcons.getIntValue(key), 0, sprite -> + { + final BufferedImage img = ImageUtil.resizeCanvas(sprite, IMAGE_DIMENSION.width, IMAGE_DIMENSION.height); + clanRankImages[idx] = img; + modIcons[clanOffset + idx] = ImageUtil.getImageIndexedSprite(img, client); + }); + } } private static BufferedImage friendsChatImageFromSprite(final BufferedImage sprite) @@ -127,4 +162,10 @@ public class ChatIconManager final BufferedImage canvas = ImageUtil.resizeCanvas(sprite, IMAGE_DIMENSION.width, IMAGE_DIMENSION.height); return ImageUtil.outlineImage(canvas, IMAGE_OUTLINE_COLOR); } + + private static int clanRankToIdx(int key) + { + // keys are -5 to 264, with no 0 + return key < 0 ? ~key : (key + 4); + } } diff --git a/runelite-client/src/main/java/net/runelite/client/game/chatbox/ChatboxPanelManager.java b/runelite-client/src/main/java/net/runelite/client/game/chatbox/ChatboxPanelManager.java index 9fb70abd9e..dee0846aac 100644 --- a/runelite-client/src/main/java/net/runelite/client/game/chatbox/ChatboxPanelManager.java +++ b/runelite-client/src/main/java/net/runelite/client/game/chatbox/ChatboxPanelManager.java @@ -34,7 +34,7 @@ import net.runelite.api.GameState; import net.runelite.api.ScriptID; import net.runelite.api.VarClientInt; import net.runelite.api.events.GameStateChanged; -import net.runelite.api.events.ScriptCallbackEvent; +import net.runelite.api.events.ScriptPreFired; import net.runelite.api.vars.InputType; import net.runelite.api.widgets.JavaScriptCallback; import net.runelite.api.widgets.Widget; @@ -153,9 +153,9 @@ public class ChatboxPanelManager } @Subscribe - public void onScriptCallbackEvent(ScriptCallbackEvent ev) + public void onScriptPreFired(ScriptPreFired ev) { - if (currentInput != null && "resetChatboxInput".equals(ev.getEventName())) + if (currentInput != null && ev.getScriptId() == ScriptID.MESSAGE_LAYER_CLOSE) { killCurrentPanel(); } diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/friendschat/ActivityType.java b/runelite-client/src/main/java/net/runelite/client/plugins/chatchannel/ActivityType.java similarity index 96% rename from runelite-client/src/main/java/net/runelite/client/plugins/friendschat/ActivityType.java rename to runelite-client/src/main/java/net/runelite/client/plugins/chatchannel/ActivityType.java index 242090392f..9e0a2ca204 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/friendschat/ActivityType.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/chatchannel/ActivityType.java @@ -22,7 +22,7 @@ * (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.friendschat; +package net.runelite.client.plugins.chatchannel; enum ActivityType { diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/friendschat/FriendsChatConfig.java b/runelite-client/src/main/java/net/runelite/client/plugins/chatchannel/ChatChannelConfig.java similarity index 70% rename from runelite-client/src/main/java/net/runelite/client/plugins/friendschat/FriendsChatConfig.java rename to runelite-client/src/main/java/net/runelite/client/plugins/chatchannel/ChatChannelConfig.java index 0ff8362664..d8b4fede63 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/friendschat/FriendsChatConfig.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/chatchannel/ChatChannelConfig.java @@ -22,22 +22,58 @@ * (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.friendschat; +package net.runelite.client.plugins.chatchannel; import java.awt.Color; import net.runelite.api.FriendsChatRank; import net.runelite.client.config.Config; import net.runelite.client.config.ConfigGroup; import net.runelite.client.config.ConfigItem; +import net.runelite.client.config.ConfigSection; -@ConfigGroup("clanchat") // group name from the old plugin -public interface FriendsChatConfig extends Config +@ConfigGroup(ChatChannelConfig.GROUP) +public interface ChatChannelConfig extends Config { + String GROUP = "clanchat"; // group name from the old plugin + + @ConfigSection( + name = "Friends Chat", + description = "Configuration for friends chat", + position = 10 + ) + String friendsChatSection = "friendsChat"; + + @ConfigSection( + name = "Clan Chat", + description = "Configuration for clan chat", + position = 20 + ) + String clanChatSection = "clanChat"; + + @ConfigSection( + name = "Guest Clan Chat", + description = "Configuration for guest clan chat", + position = 30 + ) + String guestClanChatSection = "guestClanChat"; + + @ConfigItem( + keyName = "joinLeaveTimeout", + name = "Join/Leave timeout", + description = "Set the timeout duration of join/leave messages. A value of 0 will make the messages permanent.", + position = 0 + ) + default int joinLeaveTimeout() + { + return 20; + } + @ConfigItem( keyName = "clanChatIcons", name = "Chat Icons", description = "Show rank icons next to friends chat members.", - position = 1 + position = 1, + section = friendsChatSection ) default boolean chatIcons() { @@ -48,7 +84,8 @@ public interface FriendsChatConfig extends Config keyName = "recentChats", name = "Recent Chats", description = "Show recent friends chats.", - position = 2 + position = 2, + section = friendsChatSection ) default boolean recentChats() { @@ -59,7 +96,8 @@ public interface FriendsChatConfig extends Config keyName = "clanCounter", name = "Members Counter", description = "Show the amount of friends chat members near you.", - position = 3 + position = 3, + section = friendsChatSection ) default boolean showCounter() { @@ -88,7 +126,8 @@ public interface FriendsChatConfig extends Config keyName = "showJoinLeave", name = "Show Join/Leave", description = "Adds a temporary message notifying when a member joins or leaves.", - position = 4 + position = 4, + section = friendsChatSection ) default boolean showJoinLeave() { @@ -99,29 +138,20 @@ public interface FriendsChatConfig extends Config keyName = "joinLeaveRank", name = "Join/Leave rank", description = "Only show join/leave messages for members at or above this rank.", - position = 5 + position = 5, + section = friendsChatSection ) default FriendsChatRank joinLeaveRank() { return FriendsChatRank.UNRANKED; } - @ConfigItem( - keyName = "joinLeaveTimeout", - name = "Join/Leave timeout", - description = "Set the timeout duration of join/leave messages. A value of 0 will make the messages permanent.", - position = 6 - ) - default int joinLeaveTimeout() - { - return 20; - } - @ConfigItem( keyName = "privateMessageIcons", name = "Private Message Icons", description = "Add rank icons to private messages received from members.", - position = 7 + position = 7, + section = friendsChatSection ) default boolean privateMessageIcons() { @@ -132,7 +162,8 @@ public interface FriendsChatConfig extends Config keyName = "publicChatIcons", name = "Public Chat Icons", description = "Add rank icons to public chat messages from members.", - position = 8 + position = 8, + section = friendsChatSection ) default boolean publicChatIcons() { @@ -143,7 +174,8 @@ public interface FriendsChatConfig extends Config keyName = "confirmKicks", name = "Confirm Kicks", description = "Shows a chat prompt to confirm kicks", - position = 10 + position = 10, + section = friendsChatSection ) default boolean confirmKicks() { @@ -154,7 +186,8 @@ public interface FriendsChatConfig extends Config keyName = "showIgnores", name = "Recolor ignored players", description = "Recolor members who are on your ignore list", - position = 11 + position = 11, + section = friendsChatSection ) default boolean showIgnores() { @@ -165,10 +198,35 @@ public interface FriendsChatConfig extends Config keyName = "showIgnoresColor", name = "Ignored color", description = "Allows you to change the color of the ignored players in your friends chat", - position = 12 + position = 12, + section = friendsChatSection ) default Color showIgnoresColor() { return Color.RED; } + + @ConfigItem( + keyName = "clanChatShowJoinLeave", + name = "Show Join/Leave", + description = "Adds a temporary message notifying when a member joins or leaves.", + position = 0, + section = clanChatSection + ) + default boolean clanChatShowJoinLeave() + { + return false; + } + + @ConfigItem( + keyName = "guestClanChatShowJoinLeave", + name = "Show Join/Leave", + description = "Adds a temporary message notifying when a member joins or leaves.", + position = 0, + section = guestClanChatSection + ) + default boolean guestClanChatShowJoinLeave() + { + return false; + } } diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/friendschat/FriendsChatPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/chatchannel/ChatChannelPlugin.java similarity index 70% rename from runelite-client/src/main/java/net/runelite/client/plugins/friendschat/FriendsChatPlugin.java rename to runelite-client/src/main/java/net/runelite/client/plugins/chatchannel/ChatChannelPlugin.java index c7dc727b33..ed9613da66 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/friendschat/FriendsChatPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/chatchannel/ChatChannelPlugin.java @@ -24,7 +24,7 @@ * (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.friendschat; +package net.runelite.client.plugins.chatchannel; import com.google.common.base.MoreObjects; import com.google.common.base.Strings; @@ -36,13 +36,15 @@ import java.awt.image.BufferedImage; import java.util.ArrayDeque; import java.util.ArrayList; import java.util.Deque; -import java.util.HashMap; import java.util.Iterator; +import java.util.LinkedHashMap; import java.util.List; import java.util.Map; import javax.inject.Inject; +import lombok.AllArgsConstructor; import net.runelite.api.ChatLineBuffer; import net.runelite.api.ChatMessageType; +import net.runelite.api.ChatPlayer; import net.runelite.api.Client; import net.runelite.api.FriendsChatManager; import net.runelite.api.FriendsChatMember; @@ -56,7 +58,14 @@ import net.runelite.api.ScriptID; import net.runelite.api.SpriteID; import net.runelite.api.VarClientStr; import net.runelite.api.Varbits; +import net.runelite.api.clan.ClanChannel; +import net.runelite.api.clan.ClanChannelMember; +import net.runelite.api.clan.ClanRank; +import net.runelite.api.clan.ClanSettings; +import net.runelite.api.clan.ClanTitle; import net.runelite.api.events.ChatMessage; +import net.runelite.api.events.ClanMemberJoined; +import net.runelite.api.events.ClanMemberLeft; import net.runelite.api.events.FriendsChatChanged; import net.runelite.api.events.FriendsChatMemberJoined; import net.runelite.api.events.FriendsChatMemberLeft; @@ -72,6 +81,8 @@ import net.runelite.api.widgets.WidgetInfo; import net.runelite.api.widgets.WidgetType; import net.runelite.client.callback.ClientThread; import net.runelite.client.chat.ChatMessageBuilder; +import net.runelite.client.chat.ChatMessageManager; +import net.runelite.client.chat.QueuedMessage; import net.runelite.client.config.ChatColorConfig; import net.runelite.client.config.ConfigManager; import net.runelite.client.eventbus.Subscribe; @@ -89,11 +100,11 @@ import net.runelite.client.ui.overlay.infobox.InfoBoxManager; import net.runelite.client.util.Text; @PluginDescriptor( - name = "Friends Chat", - description = "Add rank icons to users talking in friends chat", - tags = {"icons", "rank", "recent", "clan"} + name = "Chat Channels", + description = "Improvements for friends chat and clan chat.", + tags = {"icons", "rank", "recent", "clan", "friend", "channel"} ) -public class FriendsChatPlugin extends Plugin +public class ChatChannelPlugin extends Plugin { private static final int MAX_CHATS = 10; private static final String RECENT_TITLE = "Recent FCs"; @@ -106,7 +117,7 @@ public class FriendsChatPlugin extends Plugin private ChatIconManager chatIconManager; @Inject - private FriendsChatConfig config; + private ChatChannelConfig config; @Inject private InfoBoxManager infoBoxManager; @@ -123,22 +134,40 @@ public class FriendsChatPlugin extends Plugin @Inject private ChatColorConfig chatColorConfig; - private List chats = new ArrayList<>(); + @Inject + private ChatMessageManager chatMessageManager; + + private List chats; private final List members = new ArrayList<>(); private MembersIndicator membersIndicator; /** * queue of temporary messages added to the client */ private final Deque joinMessages = new ArrayDeque<>(); - private final Map activityBuffer = new HashMap<>(); + private final Map activityBuffer = new LinkedHashMap<>(); private int joinedTick; private boolean kickConfirmed = false; - @Provides - FriendsChatConfig getConfig(ConfigManager configManager) + private boolean inputWarning; + + @AllArgsConstructor + private enum InputMode { - return configManager.getConfig(FriendsChatConfig.class); + FRIEND("Friends Chat", ChatMessageType.FRIENDSCHAT), + CLAN("Clan Chat", ChatMessageType.CLAN_CHAT), + GUEST("Guest Clan Chat", ChatMessageType.CLAN_GUEST_CHAT); + + private final String prompt; + private final ChatMessageType chatMessageType; + } + + private InputMode inputMode; + + @Provides + ChatChannelConfig getConfig(ConfigManager configManager) + { + return configManager.getConfig(ChatChannelConfig.class); } @Override @@ -155,16 +184,18 @@ public class FriendsChatPlugin extends Plugin @Override public void shutDown() { + chats = null; clientThread.invoke(() -> colorIgnoredPlayers(Color.WHITE)); members.clear(); resetCounter(); rebuildFriendsChat(); + inputMode = null; } @Subscribe public void onConfigChanged(ConfigChanged configChanged) { - if (configChanged.getGroup().equals("clanchat")) + if (configChanged.getGroup().equals(ChatChannelConfig.GROUP)) { if (!config.recentChats()) { @@ -219,16 +250,7 @@ public class FriendsChatPlugin extends Plugin } // attempt to filter out world hopping joins - if (!activityBuffer.containsKey(member.getName())) - { - MemberActivity joinActivity = new MemberActivity(ActivityType.JOINED, - member, client.getTickCount()); - activityBuffer.put(member.getName(), joinActivity); - } - else - { - activityBuffer.remove(member.getName()); - } + queueJoin(member, MemberActivity.ChatType.FRIENDS_CHAT); } @Subscribe @@ -263,15 +285,75 @@ public class FriendsChatPlugin extends Plugin return; } - if (!activityBuffer.containsKey(member.getName())) + queueLeave(member, MemberActivity.ChatType.FRIENDS_CHAT); + } + + @Subscribe + public void onClanMemberJoined(ClanMemberJoined clanMemberJoined) + { + MemberActivity.ChatType chatType = clanChannelToChatType(clanMemberJoined.getClanChannel()); + if (chatType != null && clanChannelJoinLeaveEnabled(chatType)) { - MemberActivity leaveActivity = new MemberActivity(ActivityType.LEFT, + queueJoin(clanMemberJoined.getClanMember(), chatType); + } + } + + @Subscribe + public void onClanMemberLeft(ClanMemberLeft clanMemberLeft) + { + MemberActivity.ChatType chatType = clanChannelToChatType(clanMemberLeft.getClanChannel()); + if (chatType != null && clanChannelJoinLeaveEnabled(chatType)) + { + queueLeave(clanMemberLeft.getClanMember(), chatType); + } + } + + private MemberActivity.ChatType clanChannelToChatType(ClanChannel clanChannel) + { + return clanChannel == client.getClanChannel() ? MemberActivity.ChatType.CLAN_CHAT : + clanChannel == client.getGuestClanChannel() ? MemberActivity.ChatType.GUEST_CHAT : + null; + } + + private boolean clanChannelJoinLeaveEnabled(MemberActivity.ChatType chatType) + { + switch (chatType) + { + case CLAN_CHAT: + return config.clanChatShowJoinLeave(); + case GUEST_CHAT: + return config.guestClanChatShowJoinLeave(); + default: + return false; + } + } + + private void queueJoin(ChatPlayer member, MemberActivity.ChatType chatType) + { + // attempt to filter out world hopping joins + if (!activityBuffer.containsKey(member)) + { + MemberActivity joinActivity = new MemberActivity(ActivityType.JOINED, chatType, member, client.getTickCount()); - activityBuffer.put(member.getName(), leaveActivity); + activityBuffer.put(member, joinActivity); } else { - activityBuffer.remove(member.getName()); + activityBuffer.remove(member); + } + } + + private void queueLeave(ChatPlayer member, MemberActivity.ChatType chatType) + { + if (!activityBuffer.containsKey(member)) + { + MemberActivity leaveActivity = new MemberActivity(ActivityType.LEFT, chatType, + member, client.getTickCount()); + activityBuffer.put(member, leaveActivity); + } + else + { + activityBuffer.remove(member); } } @@ -334,7 +416,7 @@ public class FriendsChatPlugin extends Plugin // If this message has been reused since, it will get a different id if (joinMessage.getGetMessageId() == messageNode.getId()) { - ChatLineBuffer ccInfoBuffer = client.getChatLineMap().get(ChatMessageType.FRIENDSCHATNOTIFICATION.getType()); + ChatLineBuffer ccInfoBuffer = client.getChatLineMap().get(messageNode.getType().getType()); if (ccInfoBuffer != null) { ccInfoBuffer.removeMessageNode(messageNode); @@ -357,8 +439,7 @@ public class FriendsChatPlugin extends Plugin private void addActivityMessages() { - FriendsChatManager friendsChatManager = client.getFriendsChatManager(); - if (friendsChatManager == null || activityBuffer.isEmpty()) + if (activityBuffer.isEmpty()) { return; } @@ -372,13 +453,28 @@ public class FriendsChatPlugin extends Plugin if (activity.getTick() < client.getTickCount() - MESSAGE_DELAY) { activityIt.remove(); - addActivityMessage(friendsChatManager, activity.getMember(), activity.getActivityType()); + switch (activity.getChatType()) + { + case FRIENDS_CHAT: + addActivityMessage((FriendsChatMember) activity.getMember(), activity.getActivityType()); + break; + case CLAN_CHAT: + case GUEST_CHAT: + addClanActivityMessage((ClanChannelMember) activity.getMember(), activity.getActivityType(), activity.getChatType()); + break; + } } } } - private void addActivityMessage(FriendsChatManager friendsChatManager, FriendsChatMember member, ActivityType activityType) + private void addActivityMessage(FriendsChatMember member, ActivityType activityType) { + final FriendsChatManager friendsChatManager = client.getFriendsChatManager(); + if (friendsChatManager == null) + { + return; + } + final String activityMessage = activityType == ActivityType.JOINED ? " has joined." : " has left."; final FriendsChatRank rank = member.getRank(); final Color textColor, channelColor; @@ -421,6 +517,55 @@ public class FriendsChatPlugin extends Plugin joinMessages.addLast(joinMessage); } + private void addClanActivityMessage(ClanChannelMember member, ActivityType activityType, MemberActivity.ChatType chatType) + { + ClanSettings clanSettings = chatType == MemberActivity.ChatType.CLAN_CHAT ? client.getClanSettings() : client.getGuestClanSettings(); + ClanRank rank = member.getRank(); + + if (rank == null || clanSettings == null) + { + return; + } + + ClanTitle clanTitle = clanSettings.titleForRank(rank); + int rankIcon = -1; + if (clanTitle != null) + { + // Clan ranks are always included in chat messages, so we'll just always include it in join messages. + rankIcon = chatIconManager.getIconNumber(clanTitle); + } + + final Color textColor; + // Use configured clan chat info colors if set, otherwise default to the jagex text and fc name colors + if (client.isResized() && client.getVar(Varbits.TRANSPARENT_CHATBOX) == 1) + { + textColor = MoreObjects.firstNonNull( + chatType == MemberActivity.ChatType.CLAN_CHAT ? chatColorConfig.transparentClanChatInfo() : chatColorConfig.transparentClanChatGuestInfo(), + CHAT_FC_TEXT_TRANSPARENT_BACKGROUND); + } + else + { + textColor = MoreObjects.firstNonNull( + chatType == MemberActivity.ChatType.CLAN_CHAT ? chatColorConfig.opaqueClanChatInfo() : chatColorConfig.opaqueClanChatGuestInfo(), + CHAT_FC_TEXT_OPAQUE_BACKGROUND); + } + + ChatMessageBuilder message = new ChatMessageBuilder(); + if (rankIcon > -1) + { + message.img(rankIcon); + } + message.append(textColor, member.getName() + (activityType == ActivityType.JOINED ? " has joined." : " has left.")); + + final String messageString = message.build(); + final MessageNode line = client.addChatMessage( + chatType == MemberActivity.ChatType.CLAN_CHAT ? ChatMessageType.CLAN_MESSAGE : ChatMessageType.CLAN_GUEST_MESSAGE, + "", messageString, ""); + + MemberJoinMessage joinMessage = new MemberJoinMessage(line, line.getId(), client.getTickCount()); + joinMessages.addLast(joinMessage); + } + @Subscribe public void onVarClientStrChanged(VarClientStrChanged strChanged) { @@ -551,6 +696,67 @@ public class FriendsChatPlugin extends Plugin clientThread.invokeLater(() -> confirmKickPlayer(kickPlayerName)); break; } + case "preChatSendpublic": + { + final String chatboxInput = client.getVar(VarClientStr.CHATBOX_TYPED_TEXT); + switch (chatboxInput) + { + case "/p": + switchTypingMode(null); + break; + case "/f": + switchTypingMode(InputMode.FRIEND); + break; + case "/c": + switchTypingMode(InputMode.CLAN); + break; + case "/g": + switchTypingMode(InputMode.GUEST); + break; + default: + if (inputMode != null) + { + final int[] intStack = client.getIntStack(); + final int intStackSize = client.getIntStackSize(); + intStack[intStackSize - 1] = inputMode.chatMessageType.getType(); // chat message type + intStack[intStackSize - 2] = 0; // prefix length + } + break; + } + break; + } + case "setChatboxInput": + { + Widget chatboxInput = client.getWidget(WidgetInfo.CHATBOX_INPUT); + if (chatboxInput != null && inputMode != null) + { + String text = chatboxInput.getText(); + int idx = text.indexOf(": "); + if (idx != -1) + { + String newText = inputMode.prompt + ": " + text.substring(idx + 2); + chatboxInput.setText(newText); + } + } + break; + } + } + } + + private void switchTypingMode(InputMode mode) + { + inputMode = mode; + client.setVar(VarClientStr.CHATBOX_TYPED_TEXT, ""); + + if (mode != null && !inputWarning) + { + inputWarning = true; + + chatMessageManager.queue(QueuedMessage.builder() + .type(ChatMessageType.CONSOLE) + .runeLiteFormattedMessage("You've entered " + inputMode.prompt + " typing mode. All typed messages will be sent to your " + + inputMode.prompt.toLowerCase() + ". Use /p to reset to public chat.") + .build()); } } diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/friendschat/MemberActivity.java b/runelite-client/src/main/java/net/runelite/client/plugins/chatchannel/MemberActivity.java similarity index 88% rename from runelite-client/src/main/java/net/runelite/client/plugins/friendschat/MemberActivity.java rename to runelite-client/src/main/java/net/runelite/client/plugins/chatchannel/MemberActivity.java index 8e3135b99d..c71dce99f3 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/friendschat/MemberActivity.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/chatchannel/MemberActivity.java @@ -22,17 +22,25 @@ * (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.friendschat; +package net.runelite.client.plugins.chatchannel; import lombok.AllArgsConstructor; import lombok.Value; -import net.runelite.api.FriendsChatMember; +import net.runelite.api.ChatPlayer; @Value @AllArgsConstructor class MemberActivity { + enum ChatType + { + FRIENDS_CHAT, + CLAN_CHAT, + GUEST_CHAT + } + private ActivityType activityType; - private FriendsChatMember member; + private ChatType chatType; + private ChatPlayer member; private Integer tick; } diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/friendschat/MemberJoinMessage.java b/runelite-client/src/main/java/net/runelite/client/plugins/chatchannel/MemberJoinMessage.java similarity index 96% rename from runelite-client/src/main/java/net/runelite/client/plugins/friendschat/MemberJoinMessage.java rename to runelite-client/src/main/java/net/runelite/client/plugins/chatchannel/MemberJoinMessage.java index e90905d15c..adb7849593 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/friendschat/MemberJoinMessage.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/chatchannel/MemberJoinMessage.java @@ -22,7 +22,7 @@ * (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.friendschat; +package net.runelite.client.plugins.chatchannel; import lombok.Value; import net.runelite.api.MessageNode; diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/friendschat/MembersIndicator.java b/runelite-client/src/main/java/net/runelite/client/plugins/chatchannel/MembersIndicator.java similarity index 92% rename from runelite-client/src/main/java/net/runelite/client/plugins/friendschat/MembersIndicator.java rename to runelite-client/src/main/java/net/runelite/client/plugins/chatchannel/MembersIndicator.java index 99b488fd90..a8d2b87775 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/friendschat/MembersIndicator.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/chatchannel/MembersIndicator.java @@ -22,7 +22,7 @@ * (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.friendschat; +package net.runelite.client.plugins.chatchannel; import java.awt.Color; import java.awt.image.BufferedImage; @@ -30,9 +30,9 @@ import net.runelite.client.ui.overlay.infobox.Counter; class MembersIndicator extends Counter { - private final FriendsChatPlugin plugin; + private final ChatChannelPlugin plugin; - MembersIndicator(BufferedImage image, FriendsChatPlugin plugin) + MembersIndicator(BufferedImage image, ChatChannelPlugin plugin) { super(image, plugin, plugin.getMembersSize()); this.plugin = plugin; diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/chatfilter/ChatFilterConfig.java b/runelite-client/src/main/java/net/runelite/client/plugins/chatfilter/ChatFilterConfig.java index 0ad1071f9d..326e8652d0 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/chatfilter/ChatFilterConfig.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/chatfilter/ChatFilterConfig.java @@ -110,11 +110,22 @@ public interface ChatFilterConfig extends Config return false; } + @ConfigItem( + keyName = "filterClanChat", + name = "Filter clan Chat Members", + description = "Filter your clan chat members' messages", + position = 7 + ) + default boolean filterClanChat() + { + return false; + } + @ConfigItem( keyName = "filterLogin", name = "Filter Logged In/Out Messages", description = "Filter your private chat to remove logged in/out messages", - position = 7 + position = 8 ) default boolean filterLogin() { @@ -125,7 +136,7 @@ public interface ChatFilterConfig extends Config keyName = "filterGameChat", name = "Filter Game Chat", description = "Filter your game chat messages", - position = 8 + position = 9 ) default boolean filterGameChat() { @@ -136,7 +147,7 @@ public interface ChatFilterConfig extends Config keyName = "collapseGameChat", name = "Collapse Game Chat", description = "Collapse duplicate game chat messages into a single line", - position = 9 + position = 10 ) default boolean collapseGameChat() { @@ -147,7 +158,7 @@ public interface ChatFilterConfig extends Config keyName = "collapsePlayerChat", name = "Collapse Player Chat", description = "Collapse duplicate player chat messages into a single line", - position = 10 + position = 11 ) default boolean collapsePlayerChat() { @@ -158,7 +169,7 @@ public interface ChatFilterConfig extends Config keyName = "maxRepeatedPublicChats", name = "Repeat filter", description = "Block player chat message if repeated this many times. 0 is off", - position = 11 + position = 12 ) default int maxRepeatedPublicChats() { diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/chatfilter/ChatFilterPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/chatfilter/ChatFilterPlugin.java index c7252a46b3..4cdcc62404 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/chatfilter/ChatFilterPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/chatfilter/ChatFilterPlugin.java @@ -53,6 +53,7 @@ import net.runelite.api.Client; import net.runelite.api.FriendsChatManager; import net.runelite.api.MessageNode; import net.runelite.api.Player; +import net.runelite.api.clan.ClanChannel; import net.runelite.api.events.ChatMessage; import net.runelite.api.events.OverheadTextChanged; import net.runelite.api.events.ScriptCallbackEvent; @@ -170,6 +171,8 @@ public class ChatFilterPlugin extends Plugin case PRIVATECHAT: case MODPRIVATECHAT: case FRIENDSCHAT: + case CLAN_CHAT: + case CLAN_GUEST_CHAT: if (shouldFilterPlayerMessage(Text.removeTags(name))) { message = censorMessage(name, message); @@ -271,7 +274,8 @@ public class ChatFilterPlugin extends Plugin boolean isMessageFromSelf = playerName.equals(client.getLocalPlayer().getName()); return !isMessageFromSelf && (config.filterFriends() || !client.isFriended(playerName, false)) && - (config.filterFriendsChat() || !isFriendsChatMember(playerName)); + (config.filterFriendsChat() || !isFriendsChatMember(playerName)) && + (config.filterClanChat() || !isClanChatMember(playerName)); } private boolean isFriendsChatMember(String name) @@ -280,6 +284,23 @@ public class ChatFilterPlugin extends Plugin return friendsChatManager != null && friendsChatManager.findByName(name) != null; } + private boolean isClanChatMember(String name) + { + ClanChannel clanChannel = client.getClanChannel(); + if (clanChannel != null && clanChannel.findMember(name) != null) + { + return true; + } + + clanChannel = client.getGuestClanChannel(); + if (clanChannel != null && clanChannel.findMember(name) != null) + { + return true; + } + + return false; + } + String censorMessage(final String username, final String message) { String strippedMessage = jagexPrintableCharMatcher.retainFrom(message) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/chatnotifications/ChatNotificationsPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/chatnotifications/ChatNotificationsPlugin.java index 9c29b4798c..c13e87c38b 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/chatnotifications/ChatNotificationsPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/chatnotifications/ChatNotificationsPlugin.java @@ -209,6 +209,8 @@ public class ChatNotificationsPlugin extends Plugin case MODCHAT: case PUBLICCHAT: case FRIENDSCHAT: + case CLAN_CHAT: + case CLAN_GUEST_CHAT: case AUTOTYPER: case MODAUTOTYPER: if (client.getLocalPlayer() != null && Text.toJagexName(Text.removeTags(chatMessage.getName())).equals(client.getLocalPlayer().getName())) @@ -250,7 +252,9 @@ public class ChatNotificationsPlugin extends Plugin || chatMessage.getType() == ChatMessageType.PRIVATECHAT || chatMessage.getType() == ChatMessageType.FRIENDSCHAT || chatMessage.getType() == ChatMessageType.MODCHAT - || chatMessage.getType() == ChatMessageType.MODPRIVATECHAT)) + || chatMessage.getType() == ChatMessageType.MODPRIVATECHAT + || chatMessage.getType() == ChatMessageType.CLAN_CHAT + || chatMessage.getType() == ChatMessageType.CLAN_GUEST_CHAT)) { sendNotification(chatMessage); } diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/emojis/EmojiPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/emojis/EmojiPlugin.java index 9fc33d8647..03866ee5c3 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/emojis/EmojiPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/emojis/EmojiPlugin.java @@ -124,6 +124,8 @@ public class EmojiPlugin extends Plugin case PUBLICCHAT: case MODCHAT: case FRIENDSCHAT: + case CLAN_CHAT: + case CLAN_GUEST_CHAT: case PRIVATECHAT: case PRIVATECHATOUT: case MODPRIVATECHAT: diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/friendnotes/FriendNotesPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/friendnotes/FriendNotesPlugin.java index 55183e9dff..1a274d664c 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/friendnotes/FriendNotesPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/friendnotes/FriendNotesPlugin.java @@ -342,8 +342,7 @@ public class FriendNotesPlugin extends Plugin switch (event.getEventName()) { - case "friend_cc_settext": - case "ignore_cc_settext": + case "friendsChatSetText": String[] stringStack = client.getStringStack(); int stringStackSize = client.getStringStackSize(); final String rsn = stringStack[stringStackSize - 1]; @@ -354,8 +353,7 @@ public class FriendNotesPlugin extends Plugin stringStack[stringStackSize - 1] = rsn + " "; } break; - case "friend_cc_setposition": - case "ignore_cc_setposition": + case "friendsChatSetPosition": if (currentlyLayouting == null || getFriendNote(currentlyLayouting) == null) { return; diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/playerindicators/PlayerIndicatorsConfig.java b/runelite-client/src/main/java/net/runelite/client/plugins/playerindicators/PlayerIndicatorsConfig.java index 5daffe8ef0..2fb48231cf 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/playerindicators/PlayerIndicatorsConfig.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/playerindicators/PlayerIndicatorsConfig.java @@ -95,7 +95,7 @@ public interface PlayerIndicatorsConfig extends Config description = "Configures if friends chat members should be highlighted", section = highlightSection ) - default boolean drawFriendsChatMemberNames() + default boolean highlightFriendsChat() { return true; } @@ -138,6 +138,30 @@ public interface PlayerIndicatorsConfig extends Config @ConfigItem( position = 8, + keyName = "drawClanChatMemberNames", + name = "Highlight clan members", + description = "Configures whether or not clan members should be highlighted", + section = highlightSection + ) + default boolean highlightClanMembers() + { + return true; + } + + @ConfigItem( + position = 9, + keyName = "clanChatMemberColor", + name = "Clan member", + description = "Color of clan members", + section = highlightSection + ) + default Color getClanMemberColor() + { + return new Color(36, 15, 171); + } + + @ConfigItem( + position = 10, keyName = "drawNonClanMemberNames", name = "Highlight others", description = "Configures whether or not other players should be highlighted", @@ -149,7 +173,7 @@ public interface PlayerIndicatorsConfig extends Config } @ConfigItem( - position = 9, + position = 11, keyName = "nonClanMemberColor", name = "Others", description = "Color of other players names", @@ -214,4 +238,15 @@ public interface PlayerIndicatorsConfig extends Config { return true; } + + @ConfigItem( + position = 15, + keyName = "clanchatMenuIcons", + name = "Show clan chat ranks", + description = "Add clan chat rank to right click menu and next to player names" + ) + default boolean showClanChatRanks() + { + return true; + } } diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/playerindicators/PlayerIndicatorsOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/playerindicators/PlayerIndicatorsOverlay.java index 063a3cd488..fb16f64754 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/playerindicators/PlayerIndicatorsOverlay.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/playerindicators/PlayerIndicatorsOverlay.java @@ -34,6 +34,7 @@ import javax.inject.Singleton; import net.runelite.api.FriendsChatRank; import net.runelite.api.Player; import net.runelite.api.Point; +import net.runelite.api.clan.ClanTitle; import net.runelite.client.game.ChatIconManager; import net.runelite.client.ui.overlay.Overlay; import net.runelite.client.ui.overlay.OverlayPosition; @@ -108,40 +109,49 @@ public class PlayerIndicatorsOverlay extends Overlay return; } - if (actor.isFriendsChatMember() && config.showFriendsChatRanks()) + BufferedImage rankImage = null; + if (actor.isFriendsChatMember() && config.highlightFriendsChat() && config.showFriendsChatRanks()) { final FriendsChatRank rank = playerIndicatorsService.getFriendsChatRank(actor); if (rank != FriendsChatRank.UNRANKED) { - final BufferedImage rankImage = chatIconManager.getRankImage(rank); - - if (rankImage != null) - { - final int imageWidth = rankImage.getWidth(); - final int imageTextMargin; - final int imageNegativeMargin; - - if (drawPlayerNamesConfig == PlayerNameLocation.MODEL_RIGHT) - { - imageTextMargin = imageWidth; - imageNegativeMargin = 0; - } - else - { - imageTextMargin = imageWidth / 2; - imageNegativeMargin = imageWidth / 2; - } - - final int textHeight = graphics.getFontMetrics().getHeight() - graphics.getFontMetrics().getMaxDescent(); - final Point imageLocation = new Point(textLocation.getX() - imageNegativeMargin - 1, textLocation.getY() - textHeight / 2 - rankImage.getHeight() / 2); - OverlayUtil.renderImageLocation(graphics, imageLocation, rankImage); - - // move text - textLocation = new Point(textLocation.getX() + imageTextMargin, textLocation.getY()); - } + rankImage = chatIconManager.getRankImage(rank); } } + else if (actor.isClanMember() && config.highlightClanMembers() && config.showClanChatRanks()) + { + ClanTitle clanTitle = playerIndicatorsService.getClanTitle(actor); + if (clanTitle != null) + { + rankImage = chatIconManager.getRankImage(clanTitle); + } + } + + if (rankImage != null) + { + final int imageWidth = rankImage.getWidth(); + final int imageTextMargin; + final int imageNegativeMargin; + + if (drawPlayerNamesConfig == PlayerNameLocation.MODEL_RIGHT) + { + imageTextMargin = imageWidth; + imageNegativeMargin = 0; + } + else + { + imageTextMargin = imageWidth / 2; + imageNegativeMargin = imageWidth / 2; + } + + final int textHeight = graphics.getFontMetrics().getHeight() - graphics.getFontMetrics().getMaxDescent(); + final Point imageLocation = new Point(textLocation.getX() - imageNegativeMargin - 1, textLocation.getY() - textHeight / 2 - rankImage.getHeight() / 2); + OverlayUtil.renderImageLocation(graphics, imageLocation, rankImage); + + // move text + textLocation = new Point(textLocation.getX() + imageTextMargin, textLocation.getY()); + } OverlayUtil.renderTextLocation(graphics, textLocation, name, color); } diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/playerindicators/PlayerIndicatorsPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/playerindicators/PlayerIndicatorsPlugin.java index b7c5d28471..df72925bb8 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/playerindicators/PlayerIndicatorsPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/playerindicators/PlayerIndicatorsPlugin.java @@ -46,6 +46,7 @@ import static net.runelite.api.MenuAction.SPELL_CAST_ON_PLAYER; import static net.runelite.api.MenuAction.WALK; import net.runelite.api.MenuEntry; import net.runelite.api.Player; +import net.runelite.api.clan.ClanTitle; import net.runelite.api.events.ClientTick; import net.runelite.client.config.ConfigManager; import net.runelite.client.eventbus.Subscribe; @@ -189,11 +190,11 @@ public class PlayerIndicatorsPlugin extends Plugin int image = -1; Color color = null; - if (config.highlightFriends() && player.isFriend()) + if (player.isFriend() && config.highlightFriends()) { color = config.getFriendColor(); } - else if (config.drawFriendsChatMemberNames() && player.isFriendsChatMember()) + else if (player.isFriendsChatMember() && config.highlightFriendsChat()) { color = config.getFriendsChatMemberColor(); @@ -206,12 +207,24 @@ public class PlayerIndicatorsPlugin extends Plugin } } } - else if (config.highlightTeamMembers() - && player.getTeam() > 0 && client.getLocalPlayer().getTeam() == player.getTeam()) + else if (player.getTeam() > 0 && client.getLocalPlayer().getTeam() == player.getTeam() && config.highlightTeamMembers()) { color = config.getTeamMemberColor(); } - else if (config.highlightOthers() && !player.isFriendsChatMember()) + else if (player.isClanMember() && config.highlightClanMembers()) + { + color = config.getClanMemberColor(); + + if (config.showClanChatRanks()) + { + ClanTitle clanTitle = playerIndicatorsService.getClanTitle(player); + if (clanTitle != null) + { + image = chatIconManager.getIconNumber(clanTitle); + } + } + } + else if (!player.isFriendsChatMember() && !player.isClanMember() && config.highlightOthers()) { color = config.getOthersColor(); } diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/playerindicators/PlayerIndicatorsService.java b/runelite-client/src/main/java/net/runelite/client/plugins/playerindicators/PlayerIndicatorsService.java index c0af49d7cb..e39e4bd79d 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/playerindicators/PlayerIndicatorsService.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/playerindicators/PlayerIndicatorsService.java @@ -33,6 +33,11 @@ import net.runelite.api.FriendsChatManager; import net.runelite.api.FriendsChatMember; import net.runelite.api.FriendsChatRank; import net.runelite.api.Player; +import net.runelite.api.clan.ClanChannel; +import net.runelite.api.clan.ClanChannelMember; +import net.runelite.api.clan.ClanRank; +import net.runelite.api.clan.ClanSettings; +import net.runelite.api.clan.ClanTitle; @Singleton public class PlayerIndicatorsService @@ -49,8 +54,9 @@ public class PlayerIndicatorsService public void forEachPlayer(final BiConsumer consumer) { - if (!config.highlightOwnPlayer() && !config.drawFriendsChatMemberNames() - && !config.highlightFriends() && !config.highlightOthers()) + if (!config.highlightOwnPlayer() && !config.highlightFriendsChat() + && !config.highlightFriends() && !config.highlightOthers() + && !config.highlightClanMembers()) { return; } @@ -65,6 +71,7 @@ public class PlayerIndicatorsService } boolean isFriendsChatMember = player.isFriendsChatMember(); + boolean isClanMember = player.isClanMember(); if (player == localPlayer) { @@ -77,7 +84,7 @@ public class PlayerIndicatorsService { consumer.accept(player, config.getFriendColor()); } - else if (config.drawFriendsChatMemberNames() && isFriendsChatMember) + else if (config.highlightFriendsChat() && isFriendsChatMember) { consumer.accept(player, config.getFriendsChatMemberColor()); } @@ -85,13 +92,36 @@ public class PlayerIndicatorsService { consumer.accept(player, config.getTeamMemberColor()); } - else if (config.highlightOthers() && !isFriendsChatMember) + else if (config.highlightClanMembers() && isClanMember) + { + consumer.accept(player, config.getClanMemberColor()); + } + else if (config.highlightOthers() && !isFriendsChatMember && !isClanMember) { consumer.accept(player, config.getOthersColor()); } } } + ClanTitle getClanTitle(Player player) + { + ClanChannel clanChannel = client.getClanChannel(); + ClanSettings clanSettings = client.getClanSettings(); + if (clanChannel == null || clanSettings == null) + { + return null; + } + + ClanChannelMember member = clanChannel.findMember(player.getName()); + if (member == null) + { + return null; + } + + ClanRank rank = member.getRank(); + return clanSettings.titleForRank(rank); + } + FriendsChatRank getFriendsChatRank(Player player) { final FriendsChatManager friendsChatManager = client.getFriendsChatManager(); diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/timestamp/TimestampPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/timestamp/TimestampPlugin.java index f49a4be15f..1ab3510d7e 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/timestamp/TimestampPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/timestamp/TimestampPlugin.java @@ -36,7 +36,9 @@ import javax.inject.Inject; import lombok.Getter; import net.runelite.api.Client; import net.runelite.api.MessageNode; +import net.runelite.api.ScriptID; import net.runelite.api.Varbits; +import net.runelite.api.events.ScriptPreFired; import net.runelite.client.events.ConfigChanged; import net.runelite.api.events.ScriptCallbackEvent; import net.runelite.client.config.ConfigManager; @@ -62,6 +64,8 @@ public class TimestampPlugin extends Plugin @Getter private SimpleDateFormat formatter; + private MessageNode currentlyBuildingMessage = null; + @Provides public TimestampConfig provideConfig(final ConfigManager configManager) { @@ -90,32 +94,59 @@ public class TimestampPlugin extends Plugin } @Subscribe - public void onScriptCallbackEvent(ScriptCallbackEvent event) + private void onScriptCallbackEvent(ScriptCallbackEvent event) { - if (!event.getEventName().equals("addTimestamp")) + if (!"chatMessageBuilding".equals(event.getEventName())) { return; } - int[] intStack = client.getIntStack(); - int intStackSize = client.getIntStackSize(); + int uid = client.getIntStack()[client.getIntStackSize() - 1]; + currentlyBuildingMessage = client.getMessages().get(uid); + } + + @Subscribe + private void onScriptPreFired(ScriptPreFired ev) + { + int numStringArgs; + int messagePrefixArg = 0; + switch (ev.getScriptId()) + { + case ScriptID.CHATBOX_BUILD_LINE_WITHOUT_USER: + numStringArgs = 1; + break; + case ScriptID.CHATBOX_BUILD_LINE_WITH_USER: + numStringArgs = 2; + break; + case ScriptID.CHATBOX_BUILD_LINE_WITH_CLAN: + numStringArgs = 3; + break; + default: + return; + } + + if (currentlyBuildingMessage == null) + { + return; + } + + MessageNode messageNode = currentlyBuildingMessage; + currentlyBuildingMessage = null; String[] stringStack = client.getStringStack(); - int stringStackSize = client.getStringStackSize(); - - int messageId = intStack[intStackSize - 1]; - - MessageNode messageNode = client.getMessages().get(messageId); + int stringArgStart = client.getStringStackSize() - numStringArgs; String timestamp = generateTimestamp(messageNode.getTimestamp(), ZoneId.systemDefault()) + " "; - + Color timestampColour = getTimestampColour(); if (timestampColour != null) { timestamp = ColorUtil.wrapWithColorTag(timestamp, timestampColour); } - - stringStack[stringStackSize - 1] = timestamp; + + String segment = stringStack[stringArgStart + messagePrefixArg]; + segment = timestamp + segment; + stringStack[stringArgStart + messagePrefixArg] = segment; } private Color getTimestampColour() diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/worldhopper/WorldHopperPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/worldhopper/WorldHopperPlugin.java index 6fbd1a4c09..52c1e6d231 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/worldhopper/WorldHopperPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/worldhopper/WorldHopperPlugin.java @@ -56,6 +56,8 @@ import net.runelite.api.MenuAction; import net.runelite.api.MenuEntry; import net.runelite.api.NameableContainer; import net.runelite.api.Varbits; +import net.runelite.api.clan.ClanChannel; +import net.runelite.api.clan.ClanChannelMember; import net.runelite.api.events.ChatMessage; import net.runelite.api.events.GameStateChanged; import net.runelite.api.events.GameTick; @@ -353,10 +355,12 @@ public class WorldHopperPlugin extends Plugin return; } - int groupId = WidgetInfo.TO_GROUP(event.getActionParam1()); + final int componentId = event.getActionParam1(); + int groupId = WidgetInfo.TO_GROUP(componentId); String option = event.getOption(); - if (groupId == WidgetInfo.FRIENDS_LIST.getGroupId() || groupId == WidgetInfo.FRIENDS_CHAT.getGroupId()) + if (groupId == WidgetInfo.FRIENDS_LIST.getGroupId() || groupId == WidgetInfo.FRIENDS_CHAT.getGroupId() + || componentId == WidgetInfo.CLAN_MEMBER_LIST.getId() || componentId == WidgetInfo.CLAN_GUEST_MEMBER_LIST.getId()) { boolean after; @@ -744,6 +748,26 @@ public class WorldHopperPlugin extends Plugin } } + ClanChannel clanChannel = client.getClanChannel(); + if (clanChannel != null) + { + ClanChannelMember member = clanChannel.findMember(cleanName); + if (member != null) + { + return member; + } + } + + clanChannel = client.getGuestClanChannel(); + if (clanChannel != null) + { + ClanChannelMember member = clanChannel.findMember(cleanName); + if (member != null) + { + return member; + } + } + NameableContainer friendContainer = client.getFriendContainer(); if (friendContainer != null) { diff --git a/runelite-client/src/main/resources/net/runelite/client/plugins/skybox/skybox.txt b/runelite-client/src/main/resources/net/runelite/client/plugins/skybox/skybox.txt index 8312e96beb..e756861411 100644 --- a/runelite-client/src/main/resources/net/runelite/client/plugins/skybox/skybox.txt +++ b/runelite-client/src/main/resources/net/runelite/client/plugins/skybox/skybox.txt @@ -990,6 +990,8 @@ R 49 193 51 194 // Braindeath Island #8AD2DF R 33 79 33 80 +// Clan Hall +r 27 85 // Nightmare dungeon (Morytania underground) #0a0a0a diff --git a/runelite-client/src/main/scripts/BankSearchLayout.rs2asm b/runelite-client/src/main/scripts/BankSearchLayout.rs2asm index 70ed2a945d..d68db90bae 100644 --- a/runelite-client/src/main/scripts/BankSearchLayout.rs2asm +++ b/runelite-client/src/main/scripts/BankSearchLayout.rs2asm @@ -765,7 +765,7 @@ LABEL681: jump LABEL726 LABEL685: get_varc_string 359 ; Skip truncating of varcstr 22 by not calling 280 - lowercase ; instead get the var directly and lowercase it + lowercase ; instead get the var directly and lowercase it sstore 0 sload 0 string_length diff --git a/runelite-client/src/main/scripts/BankpinButtonSetup.rs2asm b/runelite-client/src/main/scripts/BankpinButtonSetup.rs2asm index 4f783cfe53..f245aa98df 100644 --- a/runelite-client/src/main/scripts/BankpinButtonSetup.rs2asm +++ b/runelite-client/src/main/scripts/BankpinButtonSetup.rs2asm @@ -111,11 +111,11 @@ iload 19 iload 20 sconst "iiiIIIIIIIIIIIIIIIII" - cc_setonop - iload 0 ; button component id - iload 1 ; 0-9 + cc_setonop + iload 0 ; button component id + iload 1 ; 0-9 sconst "bankpinButtonSetup" - runelite_callback + runelite_callback pop_int ; 0-9 pop_int ; button component id return diff --git a/runelite-client/src/main/scripts/ChatBuilder.rs2asm b/runelite-client/src/main/scripts/ChatBuilder.rs2asm index 9f8b32d874..e2c2c23fd3 100644 --- a/runelite-client/src/main/scripts/ChatBuilder.rs2asm +++ b/runelite-client/src/main/scripts/ChatBuilder.rs2asm @@ -208,19 +208,19 @@ LABEL165: iconst 126 istore 20 iconst 0 - 3801 + activeclansettings_find_affined iconst 1 if_icmpeq LABEL202 jump LABEL222 LABEL202: iconst 0 - 3851 + activeclanchannel_find_affined iconst 1 if_icmpeq LABEL207 jump LABEL222 LABEL207: sload 0 - 3860 + activeclanchannel_getuserslot istore 17 iload 17 iconst -1 @@ -228,10 +228,10 @@ LABEL207: jump LABEL217 LABEL214: iload 17 - 3857 + activeclanchannel_getuserrank istore 18 LABEL217: - 3853 + activeclanchannel_getrankkick iconst 2956 invoke 4456 istore 20 @@ -288,6 +288,10 @@ LABEL245: if_icmpeq LABEL256 jump LABEL1266 LABEL256: + iload 10 ; message uid + sconst "chatMessageBuilding" + runelite_callback + pop_int ; pop uid iload 11 switch 1: LABEL259 @@ -312,14 +316,9 @@ LABEL256: 91: LABEL280 jump LABEL928 LABEL259: - iload 10 ; The id of the messageNode of the message being built - sconst "" - sconst "addTimestamp" - runelite_callback - pop_int ; pop message id sload 12 sconst ":" - join_string 3 ; + 1 for timestamp + join_string 2 sload 1 sload 14 sconst "" @@ -339,14 +338,9 @@ LABEL259: istore 7 jump LABEL942 LABEL280: - iload 10 ; The id of the messageNode of the message being built - sconst "" - sconst "addTimestamp" - runelite_callback - pop_int ; pop message id sload 12 sconst ":" - join_string 3 ; + 1 for timestamp + join_string 2 sload 3 sload 14 sconst "" @@ -366,17 +360,12 @@ LABEL280: istore 7 jump LABEL942 LABEL301: - iload 10 ; The id of the messageNode of the message being built - sconst "" - sconst "addTimestamp" - runelite_callback - pop_int ; pop message id sconst "From " sload 12 sconst ":" - sconst "privateChatFrom" - runelite_callback ; for prepending color tags - join_string 4 ; + 1 for timestamp + join_string 3 + sconst "privChatUsername" + runelite_callback sload 2 sload 14 sconst "" @@ -396,15 +385,10 @@ LABEL301: istore 7 jump LABEL942 LABEL323: - iload 10 ; The id of the messageNode of the message being built - sconst "" - sconst "addTimestamp" - runelite_callback - pop_int ; pop message id sload 9 sload 14 sconst "" - join_string 4 ; + 1 for timestamp + join_string 3 iload 8 iload 9 iconst 10616888 @@ -420,15 +404,10 @@ LABEL323: istore 7 jump LABEL942 LABEL341: - iload 10 ; The id of the messageNode of the message being built - sconst "" - sconst "addTimestamp" - runelite_callback - pop_int ; pop message id sload 2 sload 14 sconst "" - join_string 4 ; + 1 for timestamp + join_string 3 iload 8 iload 9 iconst 10616888 @@ -461,17 +440,12 @@ LABEL362: LABEL373: jump LABEL942 LABEL374: - iload 10 ; The id of the messageNode of the message being built - sconst "" - sconst "addTimestamp" - runelite_callback - pop_int ; pop message id sconst "To " sload 12 sconst ":" - sconst "privateChatTo" - runelite_callback ; for chat recolors - join_string 4 ; + 1 for timestamp + join_string 3 + sconst "privChatUsername" + runelite_callback sload 2 sload 14 sconst "" @@ -529,11 +503,6 @@ LABEL414: istore 7 jump LABEL942 LABEL432: - iload 10 ; The id of the messageNode of the message being built - sconst "" - sconst "addTimestamp" - runelite_callback - pop_int ; pop message id sconst "[" sload 5 sload 13 @@ -541,7 +510,7 @@ LABEL432: sconst "] " sload 12 sconst ":" - join_string 8 ; + 1 for time stamp + join_string 7 sload 6 sload 14 sconst "" @@ -562,20 +531,20 @@ LABEL432: jump LABEL942 LABEL458: iconst 0 - 3801 + activeclansettings_find_affined iconst 1 if_icmpeq LABEL463 jump LABEL583 LABEL463: iconst 0 - 3851 + activeclanchannel_find_affined iconst 1 if_icmpeq LABEL468 jump LABEL583 LABEL468: sload 12 removetags - 3860 + activeclanchannel_getuserslot istore 17 iload 17 iconst -1 @@ -583,7 +552,7 @@ LABEL468: jump LABEL549 LABEL476: iload 17 - 3857 + activeclanchannel_getuserrank invoke 4302 istore 16 sstore 16 @@ -623,17 +592,12 @@ LABEL485: istore 7 jump LABEL548 LABEL515: - iload 10 ; The id of the messageNode of the message being built - sconst "" - sconst "addTimestamp" - runelite_callback - pop_int ; pop message id sconst "[" sload 7 sload 13 sconst "" sconst "]" - join_string 6 ; + 1 for timestamp + join_string 5 iconst -1 iconst 0 iconst 0 @@ -732,19 +696,19 @@ LABEL583: LABEL612: jump LABEL942 LABEL613: - 3800 + activeclansettings_find_listened iconst 1 if_icmpeq LABEL617 jump LABEL736 LABEL617: - 3850 + activeclanchannel_find_listened iconst 1 if_icmpeq LABEL621 jump LABEL736 LABEL621: sload 12 removetags - 3860 + activeclanchannel_getuserslot istore 17 iload 17 iconst -1 @@ -752,7 +716,7 @@ LABEL621: jump LABEL702 LABEL629: iload 17 - 3857 + activeclanchannel_getuserrank invoke 4302 istore 16 sstore 16 @@ -897,14 +861,14 @@ LABEL765: jump LABEL942 LABEL766: iconst 0 - 3851 + activeclanchannel_find_affined iconst 1 if_icmpeq LABEL771 jump LABEL796 LABEL771: sconst "[" sload 7 - 3852 + activeclanchannel_getclanname sconst "" sconst "]" join_string 5 @@ -950,14 +914,14 @@ LABEL796: LABEL815: jump LABEL942 LABEL816: - 3850 + activeclanchannel_find_listened iconst 1 if_icmpeq LABEL820 jump LABEL845 LABEL820: sconst "[" sload 7 - 3852 + activeclanchannel_getclanname sconst "" sconst "]" join_string 5 @@ -1003,13 +967,7 @@ LABEL845: LABEL864: jump LABEL942 LABEL865: - iload 10 ; The id of the messageNode of the message being built - sconst "" - sconst "addTimestamp" - runelite_callback - pop_int ; pop message id sload 14 - join_string 2 invoke 2066 istore 13 sstore 15 @@ -1077,13 +1035,7 @@ LABEL913: LABEL927: jump LABEL942 LABEL928: - iload 10 ; The id of the messageNode of the message being built - sconst "" - sconst "addTimestamp" - runelite_callback - pop_int ; pop message id sload 14 - join_string 2 ; prepend the timestamp iload 8 iload 9 iconst 10616888 @@ -1207,20 +1159,20 @@ LABEL1017: jump LABEL1050 LABEL1021: iconst 0 - 3851 + activeclanchannel_find_affined iconst 1 if_icmpeq LABEL1026 jump LABEL1050 LABEL1026: sload 12 removetags - 3860 + activeclanchannel_getuserslot istore 17 iload 17 iconst -1 if_icmpeq LABEL1038 iload 17 - 3857 + activeclanchannel_getuserrank iconst -1 if_icmple LABEL1038 jump LABEL1050 diff --git a/runelite-client/src/main/scripts/ChatSplitBuilder.rs2asm b/runelite-client/src/main/scripts/ChatSplitBuilder.rs2asm index 96519f314c..6a13c2d8af 100644 --- a/runelite-client/src/main/scripts/ChatSplitBuilder.rs2asm +++ b/runelite-client/src/main/scripts/ChatSplitBuilder.rs2asm @@ -400,6 +400,10 @@ CHAT_FILTER: if_icmpeq LABEL356 ; Check if we are building this message jump LABEL530 LABEL356: + iload 12 ; message uid + sconst "chatMessageBuilding" + runelite_callback + pop_int iload 17 switch 3: LABEL359 @@ -409,19 +413,14 @@ LABEL356: jump LABEL446 LABEL359: iload 7 - iload 12 ; Load the id of the messageNode - sconst "" ; Push a container for the timestamp - sconst "addTimestamp" ; Push event name - runelite_callback ; Invoke callback - pop_int ; Pop the id of the messageNode sload 4 + sconst "splitPrivChatUsernameColor" + runelite_callback sconst "From " sload 1 sconst ":" - sconst "privateChatSplitFrom" - runelite_callback sconst "" - join_string 6 ; Add the timestamp to the message + join_string 5 sload 4 sload 0 sconst "" @@ -443,19 +442,14 @@ LABEL359: jump LABEL462 LABEL385: iload 7 - iload 12 ; Load the id of the messageNode - sconst "" ; Push container for the timestamp - sconst "addTimestamp" ; Push event name - runelite_callback ; Invoke callback - pop_int ; Pop the id of the messageNode sload 4 + sconst "splitPrivChatUsernameColor" + runelite_callback sconst "To " sload 1 sconst ":" - sconst "privateChatSplitTo" - runelite_callback sconst "" - join_string 6 ; Add the timestamp to the message + join_string 5 sload 4 sload 0 sconst "" @@ -477,15 +471,10 @@ LABEL385: jump LABEL462 LABEL411: iload 7 - iload 12 ; Load the id of the messageNode - sconst "" ; Push a container for the timestamp - sconst "addTimestamp" ; Push event name - runelite_callback ; Invoke callback - pop_int ; Pop the id of the messageNode - sload 4 ; Load the log in/out message + sload 4 sload 0 sconst "" - join_string 4 + join_string 3 iload 9 iload 10 iconst 10682368 diff --git a/runelite-client/src/main/scripts/ChatboxInput.rs2asm b/runelite-client/src/main/scripts/ChatboxInput.rs2asm index f2321db0ac..293cb8d4ad 100644 --- a/runelite-client/src/main/scripts/ChatboxInput.rs2asm +++ b/runelite-client/src/main/scripts/ChatboxInput.rs2asm @@ -10,9 +10,9 @@ pop_int ; pop chat type string_length ; get string length of chat message iconst 0 ; load 0 - if_icmpne LABEL100 ; if length is not 0, continue + if_icmpne CONTINUE ; if length is not 0, continue return -LABEL100: +CONTINUE: get_varbit 4394 iconst 1 if_icmpeq LABEL4 @@ -53,7 +53,7 @@ LABEL31: sload 0 iload 0 iconst 0 - 5010 + chat_sendclan jump LABEL39 LABEL36: sload 0 diff --git a/runelite-client/src/main/scripts/CommandScript.rs2asm b/runelite-client/src/main/scripts/CommandScript.rs2asm index 010bb90d02..cb21384884 100644 --- a/runelite-client/src/main/scripts/CommandScript.rs2asm +++ b/runelite-client/src/main/scripts/CommandScript.rs2asm @@ -270,17 +270,27 @@ LABEL222: istore 5 istore 6 LABEL226: + iload 6 ; prefix length + iload 5 ; chat type + sconst "preChatSendpublic" + runelite_callback + istore 5 ; chat type + istore 6 ; prefix length + get_varc_string 335 ; load input string + string_length ; get length + iconst 0 ; load 0 + if_icmpeq LABEL420 ; if (%varcstring355 == 0) jump to script223 call iload 5 iconst 44 if_icmpeq LABEL230 jump LABEL260 LABEL230: - 3800 + activeclansettings_find_listened iconst 1 if_icmpeq LABEL234 jump LABEL257 LABEL234: - 3850 + activeclanchannel_find_listened iconst 1 if_icmpeq LABEL238 jump LABEL257 @@ -292,7 +302,7 @@ LABEL238: LABEL242: return LABEL243: - 3803 + activeclansettings_getallowunaffined iconst 1 if_icmpeq LABEL247 jump LABEL254 @@ -321,7 +331,7 @@ LABEL260: jump LABEL307 LABEL264: iconst 0 - 3851 + activeclanchannel_find_affined iconst 1 if_icmpeq LABEL269 jump LABEL304 @@ -340,7 +350,7 @@ LABEL277: LABEL278: chat_playername removetags - 3860 + activeclanchannel_getuserslot istore 7 iload 7 iconst -1 @@ -348,8 +358,8 @@ LABEL278: jump LABEL298 LABEL286: iload 7 - 3857 - 3854 + activeclanchannel_getuserrank + activeclanchannel_getranktalk if_icmpge LABEL291 jump LABEL298 LABEL291: diff --git a/runelite-client/src/main/scripts/DestroyOnOpKey.rs2asm b/runelite-client/src/main/scripts/DestroyOnOpKey.rs2asm index 854c1c8c69..077437137c 100644 --- a/runelite-client/src/main/scripts/DestroyOnOpKey.rs2asm +++ b/runelite-client/src/main/scripts/DestroyOnOpKey.rs2asm @@ -35,7 +35,7 @@ LABEL24: iload 3 sconst "destroyOnOpKey" ; load event name runelite_callback ; invoke callback - pop_int + pop_int iconst 2266 iconst 1 iconst 0 diff --git a/runelite-client/src/main/scripts/FriendUpdate.rs2asm b/runelite-client/src/main/scripts/FriendUpdate.rs2asm index f2c0c75634..d9a5ac3180 100644 --- a/runelite-client/src/main/scripts/FriendUpdate.rs2asm +++ b/runelite-client/src/main/scripts/FriendUpdate.rs2asm @@ -3,10 +3,10 @@ .string_stack_count 0 .int_var_count 16 .string_var_count 2 -; callback "friend_cc_settext" +; callback "friendsChatSetText" ; Fired just before the client pops the name off the stack ; Modified by the friendnotes plugin to show the icon -; callback "friend_cc_setposition" +; callback "friendsChatSetPosition" ; Fired just before the client sets the position of "friend changed their name" icon ; Modified by the friendnotes plugin to offset the name changed icon iload 1 @@ -300,7 +300,7 @@ LABEL234: add istore 10 sload 0 - sconst "friend_cc_settext" + sconst "friendsChatSetText" runelite_callback cc_settext iconst 0 @@ -382,7 +382,7 @@ LABEL293: add iconst 0 iconst 0 - sconst "friend_cc_setposition" + sconst "friendsChatSetPosition" runelite_callback cc_setposition 1 iconst 1093 diff --git a/runelite-client/src/main/scripts/FriendsChatSendKick.rs2asm b/runelite-client/src/main/scripts/FriendsChatSendKick.rs2asm index c0b56b46a4..cffc56f643 100644 --- a/runelite-client/src/main/scripts/FriendsChatSendKick.rs2asm +++ b/runelite-client/src/main/scripts/FriendsChatSendKick.rs2asm @@ -10,6 +10,7 @@ iconst 1 if_icmpeq LABEL4 jump CONFIRM_KICK ; Jump to our new label instead + jump LABEL7 LABEL4: sconst "You can't kick players from your team during Wilderness Wars." mes @@ -20,8 +21,7 @@ LABEL7: invoke 96 sload 0 clan_kickuser - jump LABEL73 -LABEL73: +RETURN: return CONFIRM_KICK: sload 0 ; Username we are trying to kick @@ -30,5 +30,5 @@ CONFIRM_KICK: runelite_callback pop_string ; Pop username iconst 0 ; Compare against zero - if_icmpgt LABEL73 ; Early return for chatbox panel confirmation + if_icmpgt RETURN ; Early return for chatbox panel confirmation jump LABEL7 diff --git a/runelite-client/src/main/scripts/GELayout.rs2asm b/runelite-client/src/main/scripts/GELayout.rs2asm index 5a75b20ffc..b60bb6537b 100644 --- a/runelite-client/src/main/scripts/GELayout.rs2asm +++ b/runelite-client/src/main/scripts/GELayout.rs2asm @@ -7,13 +7,13 @@ invoke 41 get_varbit 4439 iconst 1 - sub + sub istore 7 iconst 105 iconst 118 iconst 150 iload 7 - enum + enum istore 8 iload 8 iconst -1 @@ -22,19 +22,19 @@ LABEL16: iconst 1 iload 2 - if_sethide + if_sethide iconst 0 iload 3 - if_sethide + if_sethide iconst 1 iload 4 - if_sethide + if_sethide iconst 1 iload 5 - if_sethide + if_sethide iload 0 iload 1 - cc_find + cc_find iconst 1 if_icmpeq LABEL34 jump LABEL36 @@ -42,16 +42,16 @@ LABEL34: sconst "Grand Exchange" sconst "setGETitle" ; runelite_callback ; - cc_settext + cc_settext LABEL36: - return + return LABEL37: iconst 0 iload 2 - if_sethide + if_sethide iconst 0 iload 2 - if_settrans + if_settrans iload 7 stockmarket_isofferempty iconst 1 @@ -60,42 +60,42 @@ LABEL37: LABEL48: iconst 1 iload 3 - if_sethide + if_sethide iconst 1 iload 4 - if_sethide + if_sethide iconst 0 iload 5 - if_sethide + if_sethide iload 0 iload 1 - cc_find + cc_find iconst 1 if_icmpeq LABEL63 jump LABEL65 LABEL63: sconst "Grand Exchange: Set up offer" - cc_settext + cc_settext LABEL65: - return + return LABEL66: iconst 1 iload 3 - if_sethide + if_sethide iconst 0 iload 4 - if_sethide + if_sethide iconst 1 iload 5 - if_sethide + if_sethide iload 0 iload 1 - cc_find + cc_find iconst 1 if_icmpeq LABEL81 jump LABEL83 LABEL81: sconst "Grand Exchange: Offer status" - cc_settext + cc_settext LABEL83: - return + return diff --git a/runelite-client/src/main/scripts/IgnoreUpdate.rs2asm b/runelite-client/src/main/scripts/IgnoreUpdate.rs2asm index ddb5ed62f7..b6ad617f29 100644 --- a/runelite-client/src/main/scripts/IgnoreUpdate.rs2asm +++ b/runelite-client/src/main/scripts/IgnoreUpdate.rs2asm @@ -3,10 +3,10 @@ .string_stack_count 0 .int_var_count 13 .string_var_count 2 -; callback "ignore_cc_settext" +; callback "friendsChatSetText" ; Fired just before the client pops the name off the stack ; Modified by the friendnotes plugin to show the icon -; callback "ignore_cc_setposition" +; callback "friendsChatSetPosition" ; Fired just before the client sets the position of "ignored person changed their name" icon ; Modified by the friendnotes plugin to offset the name changed icon iload 1 @@ -157,7 +157,7 @@ LABEL117: add istore 8 sload 0 - sconst "ignore_cc_settext" + sconst "friendsChatSetText" runelite_callback cc_settext iconst 0 @@ -216,7 +216,7 @@ LABEL117: add iconst 0 iconst 0 - sconst "ignore_cc_setposition" + sconst "friendsChatSetPosition" runelite_callback cc_setposition 1 iconst 1093 diff --git a/runelite-client/src/main/scripts/LayoutResizableStones.rs2asm b/runelite-client/src/main/scripts/LayoutResizableStones.rs2asm index f3cb81e957..e9368bc8d8 100644 --- a/runelite-client/src/main/scripts/LayoutResizableStones.rs2asm +++ b/runelite-client/src/main/scripts/LayoutResizableStones.rs2asm @@ -43,7 +43,8 @@ LABEL9: sconst "forceStackStones" ; push event name runelite_callback ; invoke callback iconst 0 ; if 0 is returned, continue normal layout - if_icmpeq LABEL49 + if_icmpne LABEL29 + jump LABEL49 LABEL29: iconst 0 iload 3 diff --git a/runelite-client/src/main/scripts/NewOptionsPanelZoomSlider.rs2asm b/runelite-client/src/main/scripts/NewOptionsPanelZoomSlider.rs2asm index 84406d0edc..4b82899ab4 100644 --- a/runelite-client/src/main/scripts/NewOptionsPanelZoomSlider.rs2asm +++ b/runelite-client/src/main/scripts/NewOptionsPanelZoomSlider.rs2asm @@ -5,7 +5,7 @@ .string_var_count 0 iconst 896 sconst "innerZoomLimit" - runelite_callback + runelite_callback iconst 128 sconst "outerZoomLimit" runelite_callback @@ -13,7 +13,7 @@ istore 5 iconst 896 sconst "innerZoomLimit" - runelite_callback + runelite_callback iconst 128 sconst "outerZoomLimit" runelite_callback @@ -40,7 +40,7 @@ LABEL25: get_varc_int 74 iconst 128 sconst "outerZoomLimit" - runelite_callback + runelite_callback sub iload 7 multiply @@ -52,7 +52,7 @@ LABEL34: get_varc_int 73 iconst 128 sconst "outerZoomLimit" - runelite_callback + runelite_callback sub iload 7 multiply diff --git a/runelite-client/src/main/scripts/ResetChatboxInput.hash b/runelite-client/src/main/scripts/ResetChatboxInput.hash deleted file mode 100644 index 88a7f5569b..0000000000 --- a/runelite-client/src/main/scripts/ResetChatboxInput.hash +++ /dev/null @@ -1 +0,0 @@ -FDFF71BAC7D5E10C1E88F445D60100552D0C5B14A66F8648FFEC39573ECFBE8E \ No newline at end of file diff --git a/runelite-client/src/main/scripts/ResetChatboxInput.rs2asm b/runelite-client/src/main/scripts/ResetChatboxInput.rs2asm deleted file mode 100644 index 1455a92161..0000000000 --- a/runelite-client/src/main/scripts/ResetChatboxInput.rs2asm +++ /dev/null @@ -1,269 +0,0 @@ -.id 299 -.int_stack_count 2 -.string_stack_count 0 -.int_var_count 3 -.string_var_count 0 - sconst "resetChatboxInput" - runelite_callback - iconst 1 - iconst 10616869 - if_sethide - iconst 0 - iconst 10616885 - if_sethide - invoke 923 - iconst 0 - istore 2 - iload 1 - iconst 1 - if_icmpeq LABEL13 - jump LABEL27 -LABEL13: - invoke 553 - istore 2 - iload 2 - invoke 84 - iload 2 - invoke 89 - invoke 223 - iconst 1 - invoke 927 - invoke 1972 - iconst 1 - if_icmpeq LABEL26 - jump LABEL27 -LABEL26: - invoke 1984 -LABEL27: - invoke 1972 - iconst 1 - if_icmpeq LABEL31 - jump LABEL32 -LABEL31: - invoke 2581 -LABEL32: - get_varc_int 5 - switch - 19: LABEL35 - 20: LABEL41 - 21: LABEL41 - 7: LABEL35 - 8: LABEL38 - 9: LABEL41 - 15: LABEL41 - jump LABEL43 -LABEL35: - sconst "0" - resume_countdialog - jump LABEL43 -LABEL38: - sconst "" - resume_namedialog - jump LABEL43 -LABEL41: - sconst "" - resume_stringdialog -LABEL43: - iconst 0 - set_varc_int 5 - iload 0 - iconst 1 - if_icmpeq LABEL49 - jump LABEL51 -LABEL49: - sconst "" - set_varc_string 359 -LABEL51: - iconst 0 - iconst -8 - iconst 1 - iconst 1 - iconst 10616873 - if_setposition - iconst 0 - iconst 40 - iconst 1 - iconst 0 - iconst 10616873 - if_setsize - iconst 0 - iconst 22 - iconst 1 - iconst 1 - iconst 10616874 - if_setposition - iconst 0 - iconst 20 - iconst 1 - iconst 0 - iconst 10616874 - if_setsize - iconst 0 - iconst 10616873 - if_sethide - iconst 0 - iconst 10616874 - if_sethide - iconst 1 - iconst 10616878 - if_sethide - iconst 1 - iconst 10616884 - if_sethide - iconst 0 - iconst 0 - iconst 10616882 - if_setscrollpos - iconst 10616882 - cc_deleteall - iconst 10616883 - cc_deleteall - iconst 0 - iconst -8 - iconst 1 - iconst 1 - iconst 10616873 - if_setposition - iconst 0 - iconst 40 - iconst 1 - iconst 0 - iconst 10616873 - if_setsize - iconst 1 - iconst 1 - iconst 0 - iconst 10616873 - if_settextalign - iconst 496 - iconst 10616873 - if_settextfont - iconst 496 - iconst 10616874 - if_settextfont - iconst 128 - iconst 10616874 - if_setcolour - iconst -1 - sconst "" - iconst 10616874 - if_setonmouseover - iconst -1 - sconst "" - iconst 10616874 - if_setonmouseleave - sconst "" - iconst 10616874 - if_settext - iconst 0 - iconst 22 - iconst 1 - iconst 1 - iconst 10616874 - if_setposition - iconst -1 - sconst "" - iconst 10616869 - if_setonclick - iconst -1 - sconst "" - iconst 10616874 - if_setonclick - iconst -1 - sconst "" - iconst 10616874 - if_setonkey - iconst 1 - iconst 10616871 - if_sethide - iconst -1 - sconst "" - iconst 10616869 - if_setonclick - iconst -1 - sconst "" - iconst 10616869 - if_setontimer - iconst 10616869 - cc_deleteall - iconst 10616875 - cc_deleteall - iconst 10616876 - cc_deleteall - iconst 10616877 - cc_deleteall - iconst 1 - iconst 10616875 - if_sethide - iconst 1 - iconst 10616876 - if_sethide - iconst 1 - iconst 10616877 - if_sethide - iconst -1 - sconst "" - iconst 10616875 - if_setonmouserepeat - iconst -1 - sconst "" - iconst 10616876 - if_setonmouserepeat - iconst -1 - sconst "" - iconst 10616877 - if_setonmouserepeat - iconst -1 - sconst "" - iconst 10616875 - if_setonmouseleave - iconst -1 - sconst "" - iconst 10616876 - if_setonmouseleave - iconst -1 - sconst "" - iconst 10616877 - if_setonmouseleave - iconst -1 - sconst "" - iconst 10616875 - if_setontimer - iconst -1 - sconst "" - iconst 10616876 - if_setontimer - iconst -1 - sconst "" - iconst 10616877 - if_setontimer - iconst -1 - sconst "" - iconst 10616875 - if_setonclick - iconst -1 - sconst "" - iconst 10616876 - if_setonclick - iconst -1 - sconst "" - iconst 10616877 - if_setonclick - get_varc_int 41 - iconst 1337 - if_icmpeq LABEL230 - jump LABEL234 -LABEL230: - invoke 2526 - pop_int - clientclock - set_varc_int 384 -LABEL234: - invoke 1972 - iconst 1 - if_icmpeq LABEL238 - jump LABEL239 -LABEL238: - invoke 2581 -LABEL239: - return diff --git a/runelite-client/src/main/scripts/ScrollWheelZoomHandler.rs2asm b/runelite-client/src/main/scripts/ScrollWheelZoomHandler.rs2asm index 618f50abf9..b4cb3c20c9 100644 --- a/runelite-client/src/main/scripts/ScrollWheelZoomHandler.rs2asm +++ b/runelite-client/src/main/scripts/ScrollWheelZoomHandler.rs2asm @@ -11,8 +11,8 @@ iconst 0 iload 0 iconst 25 - sconst "scrollWheelZoomIncrement" - runelite_callback + sconst "scrollWheelZoomIncrement" + runelite_callback multiply sub istore 1 diff --git a/runelite-client/src/main/scripts/SkillTabBuilder.rs2asm b/runelite-client/src/main/scripts/SkillTabBuilder.rs2asm index a9529b3efb..87d1f1fa64 100644 --- a/runelite-client/src/main/scripts/SkillTabBuilder.rs2asm +++ b/runelite-client/src/main/scripts/SkillTabBuilder.rs2asm @@ -21,6 +21,7 @@ sconst "skillTabBaseLevel" ; push event name runelite_callback ; invoke callback istore 4 ; store the (possibly) edited real skill level + pop_int ; pop the skill id we pushed iload 4 tostring cc_settext 1 diff --git a/runelite-client/src/main/scripts/ToplevelChatboxBackground.rs2asm b/runelite-client/src/main/scripts/ToplevelChatboxBackground.rs2asm index c2c74f11c5..9b5c1d580a 100644 --- a/runelite-client/src/main/scripts/ToplevelChatboxBackground.rs2asm +++ b/runelite-client/src/main/scripts/ToplevelChatboxBackground.rs2asm @@ -212,7 +212,7 @@ LABEL177: if_setnoclickthrough iconst 1 iconst 10616867 - 2006 + if_setnoscrollthrough LABEL183: iconst 0 istore 4 diff --git a/runelite-client/src/main/scripts/ToplevelCompassOp.rs2asm b/runelite-client/src/main/scripts/ToplevelCompassOp.rs2asm index cd3eabe7f1..630b1bfdbc 100644 --- a/runelite-client/src/main/scripts/ToplevelCompassOp.rs2asm +++ b/runelite-client/src/main/scripts/ToplevelCompassOp.rs2asm @@ -18,13 +18,13 @@ LABEL10: return LABEL11: ; switch on op index - iload 0 - switch + iload 0 + switch 1: LOOK_NORTH 2: LOOK_SOUTH 3: LOOK_EAST 4: LOOK_WEST - jump LABEL10 + jump LABEL10 LOOK_NORTH: iconst 0 istore 1 @@ -48,10 +48,10 @@ LOOK: sound_synth iconst 225 sconst "lookPreservePitch" - runelite_callback + runelite_callback iconst 5 randominc - add + add iload 1 ; load target angle - cam_forceangle + cam_forceangle return diff --git a/runelite-client/src/main/scripts/TriggerBankLayout.rs2asm b/runelite-client/src/main/scripts/TriggerBankLayout.rs2asm index 8fa0ed58a8..e72a736b69 100644 --- a/runelite-client/src/main/scripts/TriggerBankLayout.rs2asm +++ b/runelite-client/src/main/scripts/TriggerBankLayout.rs2asm @@ -9,12 +9,12 @@ iconst 0 ; load active boolean sconst "getSearchingTagTab" ; push event name runelite_callback ; invoke callback - if_icmpne LABEL2 + if_icmpne RELAYOUT ; Let layout continue if current bank tab is 0 get_varbit 4150 iconst 0 - if_icmpeq LABEL2 + if_icmpeq RELAYOUT ; Reset the current bank tab to 0 otherwise iconst 0 @@ -24,7 +24,7 @@ sconst "debug" runelite_callback -LABEL2: +RELAYOUT: iload 0 iload 1 iload 2 diff --git a/runelite-mixins/src/main/java/net/runelite/mixins/RSClanChannelMemberMixin.java b/runelite-mixins/src/main/java/net/runelite/mixins/RSClanChannelMemberMixin.java new file mode 100644 index 0000000000..dd51bb86f9 --- /dev/null +++ b/runelite-mixins/src/main/java/net/runelite/mixins/RSClanChannelMemberMixin.java @@ -0,0 +1,61 @@ +/* + * Copyright (c) 2021, ThatGamerBlue + * 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.mixins; + +import net.runelite.api.clan.ClanRank; +import net.runelite.api.mixins.Inject; +import net.runelite.api.mixins.Mixin; +import net.runelite.api.mixins.Shadow; +import net.runelite.rs.api.RSClanChannelMember; +import net.runelite.rs.api.RSClient; + +@Mixin(RSClanChannelMember.class) +public abstract class RSClanChannelMemberMixin implements RSClanChannelMember +{ + @Shadow("client") + private static RSClient client; + + @Inject + @Override + public int compareTo(Object other) + { + return getName().compareTo(((RSClanChannelMember) other).getName()); + } + + @Inject + @Override + public String getPrevName() + { + return null; + } + + @Inject + + @Override + public ClanRank getRank() + { + return client.getClanRankFromRs(getRSRank()); + } +} diff --git a/runelite-mixins/src/main/java/net/runelite/mixins/RSClanChannelMixin.java b/runelite-mixins/src/main/java/net/runelite/mixins/RSClanChannelMixin.java new file mode 100644 index 0000000000..453dacf47b --- /dev/null +++ b/runelite-mixins/src/main/java/net/runelite/mixins/RSClanChannelMixin.java @@ -0,0 +1,92 @@ +/* + * Copyright (c) 2021, ThatGamerBlue + * 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.mixins; + +import java.util.List; +import net.runelite.api.clan.ClanChannelMember; +import net.runelite.api.events.ClanMemberJoined; +import net.runelite.api.events.ClanMemberLeft; +import net.runelite.api.mixins.Inject; +import net.runelite.api.mixins.MethodHook; +import net.runelite.api.mixins.Mixin; +import net.runelite.api.mixins.Shadow; +import net.runelite.rs.api.RSClanChannel; +import net.runelite.rs.api.RSClanChannelMember; +import net.runelite.rs.api.RSClient; + +@Mixin(RSClanChannel.class) +public abstract class RSClanChannelMixin implements RSClanChannel +{ + @Shadow("client") + private static RSClient client; + + @Inject + @Override + public ClanChannelMember findMember(String name) + { + name = name.replace(" ", "\u00A0"); + List members = getMembers(); + int[] sorted = getSortedMembers(); + + int i = 0; + int len = sorted.length - 1; + while (i <= len) + { + int tag = (i + len) >>> 1; + int memberIndex = sorted[tag]; + RSClanChannelMember member = (RSClanChannelMember) members.get(memberIndex); + int compare = member.getName().compareTo(name); + if (compare < 0) + { + i = tag + 1; + } + else + { + if (compare <= 0) + { + return member; + } + + len = tag - 1; + } + } + + return null; + } + + @Inject + @MethodHook("removeMember") + public void onMemberRemoved(int index) + { + client.getCallbacks().post(new ClanMemberLeft(this, getMembers().get(index))); + } + + @Inject + @MethodHook(value = "addMember", end = true) + public void onMemberAdded(RSClanChannelMember member) + { + client.getCallbacks().post(new ClanMemberJoined(this, member)); + } +} diff --git a/runelite-mixins/src/main/java/net/runelite/mixins/RSClanSettingsMixin.java b/runelite-mixins/src/main/java/net/runelite/mixins/RSClanSettingsMixin.java new file mode 100644 index 0000000000..c75d7dc22d --- /dev/null +++ b/runelite-mixins/src/main/java/net/runelite/mixins/RSClanSettingsMixin.java @@ -0,0 +1,208 @@ +/* + * Copyright (c) 2021, ThatGamerBlue + * 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.mixins; + +import java.util.ArrayList; +import java.util.List; +import net.runelite.api.EnumComposition; +import net.runelite.api.clan.ClanMember; +import net.runelite.api.clan.ClanRank; +import net.runelite.api.clan.ClanTitle; +import net.runelite.api.mixins.Inject; +import net.runelite.api.mixins.Mixin; +import net.runelite.api.mixins.Shadow; +import net.runelite.rs.api.RSClanSettings; +import net.runelite.rs.api.RSClient; + +@Mixin(RSClanSettings.class) +public abstract class RSClanSettingsMixin implements RSClanSettings +{ + @Shadow("client") + private static RSClient client; + + @Inject + @Override + public List getMembers() + { + int memberCount = getMemberCount(); + String[] memberNames = getMemberNames(); + byte[] memberRanks = getMemberRanks(); + List memberList = new ArrayList<>(memberCount); + + for (int i = 0; i < memberCount; i++) + { + memberList.add(new ClanMember(memberNames[i], client.getClanRankFromRs(memberRanks[i]))); + } + + return memberList; + } + + @Inject + @Override + public ClanMember findMember(String name) + { + name = name.replace(" ", "\u00A0").toLowerCase(); + String[] memberNames = getMemberNames(); + byte[] memberRanks = getMemberRanks(); + int[] sorted = getSortedMembers(); + + int i = 0; + int len = sorted.length - 1; + while (i <= len) + { + int tag = (i + len) >>> 1; + int memberIndex = sorted[tag]; + String memberName = memberNames[memberIndex]; + int compare = memberName.toLowerCase().compareTo(name); + if (compare < 0) + { + i = tag + 1; + } + else if (compare == 0) + { + return new ClanMember(memberName, client.getClanRankFromRs(memberRanks[tag])); + } + else + { + len = tag - 1; + } + } + + return null; + } + + @Inject + @Override + public ClanTitle titleForRank(ClanRank clanRank) + { + assert client.isClientThread() : "titleForRank must be called on client thread"; + + int title; + if (clanRank == ClanRank.JMOD) + { + title = -5; + } + else if (clanRank == ClanRank.OWNER) + { + title = -4; + } + else if (clanRank == ClanRank.DEPUTY_OWNER) + { + title = -3; + } + else if (clanRank == ClanRank.ADMINISTRATOR) + { + title = -2; + } + else if (clanRank == ClanRank.GUEST) + { + title = -1; + } + else if (clanRank == ClanRank.CLAN_RANK_1) + { + title = getTitle(1, 0, 9); + } + else if (clanRank == ClanRank.CLAN_RANK_2) + { + title = getTitle(1, 10, 19); + } + else if (clanRank == ClanRank.CLAN_RANK_3) + { + title = getTitle(1, 20, 29); + } + else if (clanRank == ClanRank.CLAN_RANK_4) + { + title = getTitle(2, 0, 9); + } + else if (clanRank == ClanRank.CLAN_RANK_5) + { + title = getTitle(2, 10, 19); + } + else if (clanRank == ClanRank.CLAN_RANK_6) + { + title = getTitle(2, 20, 29); + } + else if (clanRank == ClanRank.CLAN_RANK_7) + { + title = getTitle(3, 0, 9); + } + else if (clanRank == ClanRank.CLAN_RANK_8) + { + title = getTitle(3, 10, 19); + } + else if (clanRank == ClanRank.CLAN_RANK_9) + { + title = getTitle(3, 20, 29); + } + else if (clanRank == ClanRank.CLAN_RANK_10) + { + title = getTitle(4, 0, 9); + } + else if (clanRank == ClanRank.CLAN_RANK_11) + { + title = getTitle(4, 10, 19); + } + else if (clanRank == ClanRank.CLAN_RANK_12) + { + title = getTitle(4, 20, 29); + } + else if (clanRank == ClanRank.CLAN_RANK_13) + { + title = getTitle(5, 0, 9); + } + else if (clanRank == ClanRank.CLAN_RANK_14) + { + title = getTitle(5, 10, 19); + } + else + { + throw new IllegalStateException("Unexpected value: " + clanRank); + } + + if (title == 1023) + { + return null; + } + + EnumComposition rsEnum = client.getEnum(3797); + String titleName = rsEnum.getStringValue(title); + + if (titleName.isEmpty()) + { + return null; + } + + return new ClanTitle(title, titleName); + } + + @Inject + private int getTitle(int group, int sub1, int sub2) + { + Integer oParam = getTitleGroupValue(group); + int param = oParam == null ? -1 : oParam; + int offset = 31 - sub2; + return (param << offset) >>> (sub1 + offset); + } +} 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 2ceef525ae..e334c94d32 100644 --- a/runelite-mixins/src/main/java/net/runelite/mixins/RSClientMixin.java +++ b/runelite-mixins/src/main/java/net/runelite/mixins/RSClientMixin.java @@ -75,6 +75,9 @@ import net.runelite.api.VarPlayer; import net.runelite.api.Varbits; import net.runelite.api.WidgetNode; import net.runelite.api.WorldType; +import net.runelite.api.clan.ClanChannel; +import net.runelite.api.clan.ClanRank; +import net.runelite.api.clan.ClanSettings; import net.runelite.api.coords.LocalPoint; import net.runelite.api.coords.WorldPoint; import net.runelite.api.events.CanvasSizeChanged; @@ -1242,7 +1245,7 @@ public abstract class RSClientMixin implements RSClient } } - @FieldHook("clanChat") + @FieldHook("friendsChat") @Inject public static void clanMemberManagerChanged(int idx) { @@ -2200,5 +2203,66 @@ public abstract class RSClientMixin implements RSClient { client.getCallbacks().post(new WidgetClosed(iface.getId(), iface.getModalMode(), willUnload)); } + + @Inject + @Override + public ClanChannel getClanChannel() + { + return getCurrentClanChannels()[0]; + } + + @Inject + @Override + public ClanSettings getClanSettings() + { + return getCurrentClanSettingsAry()[0]; + } + + @Inject + @Override + public ClanRank getClanRankFromRs(int rank) + { + switch (rank) + { + case -1: + return ClanRank.GUEST; + case 10: + return ClanRank.CLAN_RANK_2; + case 20: + return ClanRank.CLAN_RANK_3; + case 30: + return ClanRank.CLAN_RANK_4; + case 40: + return ClanRank.CLAN_RANK_5; + case 50: + return ClanRank.CLAN_RANK_6; + case 60: + return ClanRank.CLAN_RANK_7; + case 70: + return ClanRank.CLAN_RANK_8; + case 80: + return ClanRank.CLAN_RANK_9; + case 90: + return ClanRank.CLAN_RANK_10; + case 100: + return ClanRank.ADMINISTRATOR; + case 105: + return ClanRank.CLAN_RANK_11; + case 110: + return ClanRank.CLAN_RANK_12; + case 115: + return ClanRank.CLAN_RANK_13; + case 120: + return ClanRank.CLAN_RANK_14; + case 125: + return ClanRank.DEPUTY_OWNER; + case 126: + return ClanRank.OWNER; + case 127: + return ClanRank.JMOD; + default: + return ClanRank.CLAN_RANK_1; + } + } } diff --git a/runelite-mixins/src/main/java/net/runelite/mixins/RSClanChatMixin.java b/runelite-mixins/src/main/java/net/runelite/mixins/RSFriendsChatMixin.java similarity index 88% rename from runelite-mixins/src/main/java/net/runelite/mixins/RSClanChatMixin.java rename to runelite-mixins/src/main/java/net/runelite/mixins/RSFriendsChatMixin.java index 27002f18cb..0eb0808c39 100644 --- a/runelite-mixins/src/main/java/net/runelite/mixins/RSClanChatMixin.java +++ b/runelite-mixins/src/main/java/net/runelite/mixins/RSFriendsChatMixin.java @@ -6,13 +6,13 @@ import net.runelite.api.events.FriendsChatMemberLeft; import net.runelite.api.mixins.Inject; import net.runelite.api.mixins.Mixin; import net.runelite.api.mixins.Shadow; -import net.runelite.rs.api.RSClanChat; +import net.runelite.rs.api.RSFriendsChat; import net.runelite.rs.api.RSClient; import net.runelite.rs.api.RSUser; import net.runelite.rs.api.RSUsername; -@Mixin(RSClanChat.class) -public abstract class RSClanChatMixin implements RSClanChat +@Mixin(RSFriendsChat.class) +public abstract class RSFriendsChatMixin implements RSFriendsChat { @Shadow("client") private static RSClient client; diff --git a/runelite-mixins/src/main/java/net/runelite/mixins/RSMessageMixin.java b/runelite-mixins/src/main/java/net/runelite/mixins/RSMessageMixin.java index 5cbbc043be..3292e0c447 100644 --- a/runelite-mixins/src/main/java/net/runelite/mixins/RSMessageMixin.java +++ b/runelite-mixins/src/main/java/net/runelite/mixins/RSMessageMixin.java @@ -5,7 +5,7 @@ import net.runelite.api.mixins.Inject; import net.runelite.api.mixins.MethodHook; import net.runelite.api.mixins.Mixin; import net.runelite.api.mixins.Shadow; -import net.runelite.rs.api.RSClanChat; +import net.runelite.rs.api.RSFriendsChat; import net.runelite.rs.api.RSClient; import net.runelite.rs.api.RSMessage; @@ -76,7 +76,7 @@ public abstract class RSMessageMixin implements RSMessage @Override public boolean isFromClanMate() { - RSClanChat cc = client.getFriendsChatManager(); + RSFriendsChat cc = client.getFriendsChatManager(); return cc != null && cc.findByName(this.getSenderUsername()) != null; } diff --git a/runescape-api/src/main/java/net/runelite/rs/api/RSClanChannel.java b/runescape-api/src/main/java/net/runelite/rs/api/RSClanChannel.java new file mode 100644 index 0000000000..b53c39a7fd --- /dev/null +++ b/runescape-api/src/main/java/net/runelite/rs/api/RSClanChannel.java @@ -0,0 +1,44 @@ +/* + * Copyright (c) 2021, ThatGamerBlue + * 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.rs.api; + +import java.util.List; +import net.runelite.api.clan.ClanChannel; +import net.runelite.api.clan.ClanChannelMember; +import net.runelite.mapping.Import; + +public interface RSClanChannel extends ClanChannel +{ + @Import("name") + @Override + String getName(); + + @Import("members") + @Override + List getMembers(); + + @Import("getSortedMembers") + int[] getSortedMembers(); +} diff --git a/runescape-api/src/main/java/net/runelite/rs/api/RSClanChannelMember.java b/runescape-api/src/main/java/net/runelite/rs/api/RSClanChannelMember.java new file mode 100644 index 0000000000..4e34ed6f5c --- /dev/null +++ b/runescape-api/src/main/java/net/runelite/rs/api/RSClanChannelMember.java @@ -0,0 +1,42 @@ +/* + * Copyright (c) 2021, ThatGamerBlue + * 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.rs.api; + +import net.runelite.api.clan.ClanChannelMember; +import net.runelite.mapping.Import; + +public interface RSClanChannelMember extends ClanChannelMember +{ + @Import("rank") + byte getRSRank(); + + @Import("world") + @Override + int getWorld(); + + @Import("name") + @Override + String getName(); +} diff --git a/runescape-api/src/main/java/net/runelite/rs/api/RSClanSettings.java b/runescape-api/src/main/java/net/runelite/rs/api/RSClanSettings.java new file mode 100644 index 0000000000..a602d34557 --- /dev/null +++ b/runescape-api/src/main/java/net/runelite/rs/api/RSClanSettings.java @@ -0,0 +1,50 @@ +/* + * Copyright (c) 2021, ThatGamerBlue + * 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.rs.api; + +import net.runelite.api.clan.ClanSettings; +import net.runelite.mapping.Import; + +public interface RSClanSettings extends ClanSettings +{ + @Import("name") + @Override + String getName(); + + @Import("memberCount") + int getMemberCount(); + + @Import("memberNames") + String[] getMemberNames(); + + @Import("memberRanks") + byte[] getMemberRanks(); + + @Import("getSortedMembers") + int[] getSortedMembers(); + + @Import("getTitleGroupValue") + Integer getTitleGroupValue(int group); +} 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 d399da781c..317515d053 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 @@ -29,6 +29,7 @@ import java.util.Map; import net.runelite.api.Client; import net.runelite.api.SpritePixels; import net.runelite.api.World; +import net.runelite.api.clan.ClanRank; import net.runelite.api.widgets.Widget; import net.runelite.mapping.Construct; import net.runelite.mapping.Import; @@ -676,8 +677,8 @@ public interface RSClient extends RSGameEngine, Client @Import("friendSystem") RSFriendSystem getFriendManager(); - @Import("clanChat") - RSClanChat getFriendsChatManager(); + @Import("friendsChat") + RSFriendsChat getFriendsChatManager(); @Import("loginType") RSLoginType getLoginType(); @@ -1412,4 +1413,20 @@ public interface RSClient extends RSGameEngine, Client @Import("crossWorldMessageIdsIndex") int getCrossWorldMessageIdsIndex(); + + @Import("currentClanChannels") + RSClanChannel[] getCurrentClanChannels(); + + @Import("currentClanSettings") + RSClanSettings[] getCurrentClanSettingsAry(); + + @Import("guestClanChannel") + @Override + RSClanChannel getGuestClanChannel(); + + @Import("guestClanSettings") + @Override + RSClanSettings getGuestClanSettings(); + + ClanRank getClanRankFromRs(int rank); } diff --git a/runescape-api/src/main/java/net/runelite/rs/api/RSClanChat.java b/runescape-api/src/main/java/net/runelite/rs/api/RSFriendsChat.java similarity index 72% rename from runescape-api/src/main/java/net/runelite/rs/api/RSClanChat.java rename to runescape-api/src/main/java/net/runelite/rs/api/RSFriendsChat.java index f806d85618..e7ec57dc48 100644 --- a/runescape-api/src/main/java/net/runelite/rs/api/RSClanChat.java +++ b/runescape-api/src/main/java/net/runelite/rs/api/RSFriendsChat.java @@ -4,7 +4,7 @@ import net.runelite.api.FriendsChatManager; import net.runelite.api.FriendsChatMember; import net.runelite.mapping.Import; -public interface RSClanChat extends RSUserList, FriendsChatManager +public interface RSFriendsChat extends RSUserList, FriendsChatManager { @Import("owner") String getOwner(); diff --git a/runescape-api/src/main/java/net/runelite/rs/api/RSPlayer.java b/runescape-api/src/main/java/net/runelite/rs/api/RSPlayer.java index 5a6454c586..65abe95988 100644 --- a/runescape-api/src/main/java/net/runelite/rs/api/RSPlayer.java +++ b/runescape-api/src/main/java/net/runelite/rs/api/RSPlayer.java @@ -50,10 +50,14 @@ public interface RSPlayer extends RSActor, Player @Override int getTeam(); - @Import("isClanMember") + @Import("isFriendsChatMember") @Override boolean isFriendsChatMember(); + @Import("isClanMember") + @Override + boolean isClanMember(); + @Import("isFriend") @Override boolean isFriend(); diff --git a/runescape-client/src/main/java/AbstractArchive.java b/runescape-client/src/main/java/AbstractArchive.java index aad931f23b..77f221e7a7 100644 --- a/runescape-client/src/main/java/AbstractArchive.java +++ b/runescape-client/src/main/java/AbstractArchive.java @@ -4,87 +4,81 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("jp") +@ObfuscatedName("jv") @Implements("AbstractArchive") public abstract class AbstractArchive { - @ObfuscatedName("pd") + @ObfuscatedName("i") @ObfuscatedSignature( - descriptor = "Lll;" - ) - @Export("privateChatMode") - static PrivateChatMode privateChatMode; - @ObfuscatedName("n") - @ObfuscatedSignature( - descriptor = "Lok;" + descriptor = "Log;" ) @Export("gzipDecompressor") static GZipDecompressor gzipDecompressor; - @ObfuscatedName("aj") + @ObfuscatedName("al") @ObfuscatedGetter( - intValue = 949924661 + intValue = 269464329 ) - static int field3611; - @ObfuscatedName("r") + static int field3589; + @ObfuscatedName("c") @ObfuscatedGetter( - intValue = -1464108129 + intValue = 15338207 ) @Export("groupCount") int groupCount; - @ObfuscatedName("p") + @ObfuscatedName("e") @Export("groupIds") int[] groupIds; - @ObfuscatedName("a") + @ObfuscatedName("g") @Export("groupNameHashes") int[] groupNameHashes; - @ObfuscatedName("e") + @ObfuscatedName("a") @ObfuscatedSignature( - descriptor = "Loo;" + descriptor = "Lou;" ) @Export("groupNameHashTable") IntHashTable groupNameHashTable; - @ObfuscatedName("d") + @ObfuscatedName("k") @Export("groupCrcs") int[] groupCrcs; - @ObfuscatedName("u") + @ObfuscatedName("m") @Export("groupVersions") int[] groupVersions; - @ObfuscatedName("m") + @ObfuscatedName("x") @Export("fileCounts") int[] fileCounts; - @ObfuscatedName("j") + @ObfuscatedName("z") @Export("fileIds") int[][] fileIds; - @ObfuscatedName("f") + @ObfuscatedName("w") @Export("fileNameHashes") int[][] fileNameHashes; - @ObfuscatedName("s") + @ObfuscatedName("t") @ObfuscatedSignature( - descriptor = "[Loo;" + descriptor = "[Lou;" ) @Export("fileNameHashTables") IntHashTable[] fileNameHashTables; - @ObfuscatedName("y") + @ObfuscatedName("h") @Export("groups") Object[] groups; - @ObfuscatedName("w") + @ObfuscatedName("q") @Export("files") Object[][] files; - @ObfuscatedName("ag") + @ObfuscatedName("ae") @ObfuscatedGetter( - intValue = 999784979 + intValue = 2055325169 ) @Export("hash") public int hash; - @ObfuscatedName("ae") + @ObfuscatedName("ap") @Export("releaseGroups") boolean releaseGroups; - @ObfuscatedName("ao") + @ObfuscatedName("ab") @Export("shallowFiles") boolean shallowFiles; static { gzipDecompressor = new GZipDecompressor(); // L: 23 - field3611 = 0; // L: 27 + field3589 = 0; // L: 27 } AbstractArchive(boolean var1, boolean var2) { @@ -92,45 +86,45 @@ public abstract class AbstractArchive { this.shallowFiles = var2; // L: 33 } // L: 34 - @ObfuscatedName("o") + @ObfuscatedName("f") @ObfuscatedSignature( - descriptor = "(II)V", - garbageValue = "-1103942204" + descriptor = "(IB)V", + garbageValue = "108" ) @Export("loadRegionFromGroup") void loadRegionFromGroup(int var1) { } // L: 123 - @ObfuscatedName("g") + @ObfuscatedName("y") @ObfuscatedSignature( - descriptor = "(II)V", - garbageValue = "1184960922" + descriptor = "(IB)V", + garbageValue = "0" ) @Export("loadGroup") void loadGroup(int var1) { } // L: 209 - @ObfuscatedName("b") + @ObfuscatedName("d") @ObfuscatedSignature( descriptor = "(II)I", - garbageValue = "-1290183138" + garbageValue = "-1767586109" ) @Export("groupLoadPercent") int groupLoadPercent(int var1) { return this.groups[var1] != null ? 100 : 0; // L: 179 180 } - @ObfuscatedName("as") + @ObfuscatedName("aq") @ObfuscatedSignature( descriptor = "([BI)V", - garbageValue = "1699795783" + garbageValue = "994270424" ) @Export("decodeIndex") void decodeIndex(byte[] var1) { int var3 = var1.length; // L: 38 - int var2 = GrandExchangeOffer.method5017(var1, 0, var3); // L: 40 + int var2 = GrandExchangeOfferOwnWorldComparator.method1176(var1, 0, var3); // L: 40 this.hash = var2; // L: 42 - Buffer var4 = new Buffer(ObjectSound.decompressBytes(var1)); // L: 43 + Buffer var4 = new Buffer(UserComparator6.decompressBytes(var1)); // L: 43 int var5 = var4.readUnsignedByte(); // L: 44 if (var5 >= 5 && var5 <= 7) { // L: 45 if (var5 >= 6) { // L: 46 @@ -139,7 +133,7 @@ public abstract class AbstractArchive { int var6 = var4.readUnsignedByte(); // L: 50 if (var5 >= 7) { // L: 51 - this.groupCount = var4.method6463(); + this.groupCount = var4.method6569(); } else { this.groupCount = var4.readUnsignedShort(); // L: 52 } @@ -150,7 +144,7 @@ public abstract class AbstractArchive { int var9; if (var5 >= 7) { // L: 56 for (var9 = 0; var9 < this.groupCount; ++var9) { // L: 57 - this.groupIds[var9] = var7 += var4.method6463(); // L: 58 + this.groupIds[var9] = var7 += var4.method6569(); // L: 58 if (this.groupIds[var9] > var8) { // L: 59 var8 = this.groupIds[var9]; } @@ -200,31 +194,31 @@ public abstract class AbstractArchive { if (var5 >= 7) { // L: 82 for (var9 = 0; var9 < this.groupCount; ++var9) { // L: 83 var10 = this.groupIds[var9]; // L: 84 - var11 = this.fileCounts[var10]; // L: 85 - var7 = 0; // L: 86 - var12 = -1; // L: 87 + var11 = this.fileCounts[var10]; + var7 = 0; + var12 = -1; this.fileIds[var10] = new int[var11]; // L: 88 for (var13 = 0; var13 < var11; ++var13) { // L: 89 - var14 = this.fileIds[var10][var13] = var7 += var4.method6463(); // L: 90 - if (var14 > var12) { // L: 91 + var14 = this.fileIds[var10][var13] = var7 += var4.method6569(); + if (var14 > var12) { var12 = var14; } } - this.files[var10] = new Object[var12 + 1]; // L: 93 + this.files[var10] = new Object[var12 + 1]; } } else { - for (var9 = 0; var9 < this.groupCount; ++var9) { // L: 97 - var10 = this.groupIds[var9]; // L: 98 + for (var9 = 0; var9 < this.groupCount; ++var9) { + var10 = this.groupIds[var9]; var11 = this.fileCounts[var10]; // L: 99 var7 = 0; // L: 100 - var12 = -1; // L: 101 - this.fileIds[var10] = new int[var11]; // L: 102 + var12 = -1; + this.fileIds[var10] = new int[var11]; - for (var13 = 0; var13 < var11; ++var13) { // L: 103 + for (var13 = 0; var13 < var11; ++var13) { var14 = this.fileIds[var10][var13] = var7 += var4.readUnsignedShort(); // L: 104 - if (var14 > var12) { // L: 105 + if (var14 > var12) { var12 = var14; } } @@ -255,20 +249,20 @@ public abstract class AbstractArchive { } } // L: 121 - @ObfuscatedName("ad") + @ObfuscatedName("aw") @ObfuscatedSignature( descriptor = "(III)[B", - garbageValue = "107859165" + garbageValue = "-26460885" ) @Export("takeFile") public byte[] takeFile(int var1, int var2) { return this.takeFileEncrypted(var1, var2, (int[])null); // L: 126 } - @ObfuscatedName("ac") + @ObfuscatedName("af") @ObfuscatedSignature( descriptor = "(II[II)[B", - garbageValue = "-118245889" + garbageValue = "744457350" ) @Export("takeFileEncrypted") public byte[] takeFileEncrypted(int var1, int var2, int[] var3) { @@ -284,7 +278,7 @@ public abstract class AbstractArchive { } } - byte[] var5 = Renderable.method4079(this.files[var1][var2], false); // L: 139 + byte[] var5 = ByteArrayPool.method5573(this.files[var1][var2], false); // L: 139 if (this.shallowFiles) { this.files[var1][var2] = null; // L: 140 } @@ -295,10 +289,10 @@ public abstract class AbstractArchive { } } - @ObfuscatedName("az") + @ObfuscatedName("ak") @ObfuscatedSignature( - descriptor = "(III)Z", - garbageValue = "-588879952" + descriptor = "(IIB)Z", + garbageValue = "57" ) @Export("tryLoadFile") public boolean tryLoadFile(int var1, int var2) { @@ -316,12 +310,12 @@ public abstract class AbstractArchive { } } - @ObfuscatedName("aq") + @ObfuscatedName("ay") @ObfuscatedSignature( - descriptor = "(II)Z", - garbageValue = "-755166419" + descriptor = "(IB)Z", + garbageValue = "0" ) - public boolean method4953(int var1) { + public boolean method4963(int var1) { if (this.files.length == 1) { // L: 154 return this.tryLoadFile(0, var1); } else if (this.files[var1].length == 1) { @@ -331,10 +325,10 @@ public abstract class AbstractArchive { } } - @ObfuscatedName("ab") + @ObfuscatedName("aa") @ObfuscatedSignature( - descriptor = "(II)Z", - garbageValue = "-1545749528" + descriptor = "(IB)Z", + garbageValue = "112" ) @Export("tryLoadGroup") public boolean tryLoadGroup(int var1) { @@ -346,10 +340,10 @@ public abstract class AbstractArchive { } } - @ObfuscatedName("ar") + @ObfuscatedName("au") @ObfuscatedSignature( descriptor = "(I)Z", - garbageValue = "1388179723" + garbageValue = "2118992751" ) @Export("isFullyLoaded") public boolean isFullyLoaded() { @@ -368,10 +362,10 @@ public abstract class AbstractArchive { return var1; // L: 175 } - @ObfuscatedName("ah") + @ObfuscatedName("an") @ObfuscatedSignature( - descriptor = "(II)[B", - garbageValue = "1253111810" + descriptor = "(IB)[B", + garbageValue = "-116" ) @Export("takeFileFlat") public byte[] takeFileFlat(int var1) { @@ -384,10 +378,10 @@ public abstract class AbstractArchive { } } - @ObfuscatedName("af") + @ObfuscatedName("bd") @ObfuscatedSignature( descriptor = "(III)[B", - garbageValue = "-1200970421" + garbageValue = "791709889" ) @Export("getFile") public byte[] getFile(int var1, int var2) { @@ -403,17 +397,17 @@ public abstract class AbstractArchive { } } - byte[] var4 = Renderable.method4079(this.files[var1][var2], false); // L: 199 + byte[] var4 = ByteArrayPool.method5573(this.files[var1][var2], false); // L: 199 return var4; // L: 200 } else { return null; } } - @ObfuscatedName("an") + @ObfuscatedName("bt") @ObfuscatedSignature( - descriptor = "(IS)[B", - garbageValue = "22661" + descriptor = "(II)[B", + garbageValue = "444746714" ) @Export("getFileFlat") public byte[] getFileFlat(int var1) { @@ -426,40 +420,40 @@ public abstract class AbstractArchive { } } - @ObfuscatedName("bd") + @ObfuscatedName("bq") @ObfuscatedSignature( - descriptor = "(II)[I", - garbageValue = "-1054045445" + descriptor = "(IB)[I", + garbageValue = "8" ) @Export("getGroupFileIds") public int[] getGroupFileIds(int var1) { return var1 >= 0 && var1 < this.fileIds.length ? this.fileIds[var1] : null; // L: 212 213 215 } - @ObfuscatedName("bw") + @ObfuscatedName("bu") @ObfuscatedSignature( - descriptor = "(IB)I", - garbageValue = "73" + descriptor = "(II)I", + garbageValue = "997984533" ) @Export("getGroupFileCount") public int getGroupFileCount(int var1) { return this.files[var1].length; // L: 219 } - @ObfuscatedName("bf") + @ObfuscatedName("bl") @ObfuscatedSignature( - descriptor = "(B)I", - garbageValue = "40" + descriptor = "(I)I", + garbageValue = "756558186" ) @Export("getGroupCount") public int getGroupCount() { return this.files.length; // L: 223 } - @ObfuscatedName("bu") + @ObfuscatedName("bv") @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "-719387279" + descriptor = "(B)V", + garbageValue = "2" ) @Export("clearGroups") public void clearGroups() { @@ -469,10 +463,10 @@ public abstract class AbstractArchive { } // L: 228 - @ObfuscatedName("bb") + @ObfuscatedName("bm") @ObfuscatedSignature( descriptor = "(II)V", - garbageValue = "2134531834" + garbageValue = "-1987732503" ) @Export("clearFilesGroup") public void clearFilesGroup(int var1) { @@ -482,10 +476,10 @@ public abstract class AbstractArchive { } // L: 232 - @ObfuscatedName("bk") + @ObfuscatedName("bz") @ObfuscatedSignature( descriptor = "(B)V", - garbageValue = "42" + garbageValue = "94" ) @Export("clearFiles") public void clearFiles() { @@ -499,10 +493,10 @@ public abstract class AbstractArchive { } // L: 240 - @ObfuscatedName("bt") + @ObfuscatedName("bh") @ObfuscatedSignature( descriptor = "(I[II)Z", - garbageValue = "-421186683" + garbageValue = "1746231171" ) @Export("buildFiles") boolean buildFiles(int var1, int[] var2) { @@ -525,15 +519,15 @@ public abstract class AbstractArchive { return true; } else { byte[] var18; - if (var2 == null || var2[0] == 0 && var2[1] == 0 && var2[2] == 0 && var2[3] == 0) { // L: 256 - var18 = Renderable.method4079(this.groups[var1], false); // L: 261 - } else { - var18 = Renderable.method4079(this.groups[var1], true); // L: 257 + if (var2 != null && (var2[0] != 0 || var2[1] != 0 || var2[2] != 0 || var2[3] != 0)) { // L: 256 + var18 = ByteArrayPool.method5573(this.groups[var1], true); // L: 257 Buffer var8 = new Buffer(var18); // L: 258 var8.xteaDecrypt(var2, 5, var8.array.length); // L: 259 + } else { + var18 = ByteArrayPool.method5573(this.groups[var1], false); // L: 261 } - byte[] var20 = ObjectSound.decompressBytes(var18); // L: 264 + byte[] var20 = UserComparator6.decompressBytes(var18); // L: 264 if (this.releaseGroups) { // L: 282 this.groups[var1] = null; } @@ -581,13 +575,13 @@ public abstract class AbstractArchive { for (var15 = 0; var15 < var3; ++var15) { // L: 313 if (!this.shallowFiles) { // L: 314 - var5[var4[var15]] = class34.method388(var19[var15], false); + var5[var4[var15]] = GrandExchangeOfferWorldComparator.method5079(var19[var15], false); } else { var5[var4[var15]] = var19[var15]; // L: 315 } } } else if (!this.shallowFiles) { // L: 319 - var5[var4[0]] = class34.method388(var20, false); + var5[var4[0]] = GrandExchangeOfferWorldComparator.method5079(var20, false); } else { var5[var4[0]] = var20; // L: 320 } @@ -597,109 +591,141 @@ public abstract class AbstractArchive { } } - @ObfuscatedName("by") + @ObfuscatedName("bs") @ObfuscatedSignature( - descriptor = "(Ljava/lang/String;B)I", - garbageValue = "91" + descriptor = "(Ljava/lang/String;I)I", + garbageValue = "-1575580840" ) @Export("getGroupId") public int getGroupId(String var1) { var1 = var1.toLowerCase(); // L: 326 - return this.groupNameHashTable.get(class258.hashString(var1)); // L: 327 - } - - @ObfuscatedName("bz") - @ObfuscatedSignature( - descriptor = "(ILjava/lang/String;B)I", - garbageValue = "0" - ) - @Export("getFileId") - public int getFileId(int var1, String var2) { - var2 = var2.toLowerCase(); // L: 331 - return this.fileNameHashTables[var1].get(class258.hashString(var2)); // L: 332 + return this.groupNameHashTable.get(GraphicsObject.hashString(var1)); // L: 327 } @ObfuscatedName("br") @ObfuscatedSignature( - descriptor = "(Ljava/lang/String;Ljava/lang/String;I)Z", - garbageValue = "327939117" + descriptor = "(ILjava/lang/String;I)I", + garbageValue = "1997157248" + ) + @Export("getFileId") + public int getFileId(int var1, String var2) { + var2 = var2.toLowerCase(); // L: 331 + return this.fileNameHashTables[var1].get(GraphicsObject.hashString(var2)); // L: 332 + } + + @ObfuscatedName("bf") + @ObfuscatedSignature( + descriptor = "(Ljava/lang/String;Ljava/lang/String;B)Z", + garbageValue = "0" ) @Export("isValidFileName") public boolean isValidFileName(String var1, String var2) { var1 = var1.toLowerCase(); // L: 336 var2 = var2.toLowerCase(); // L: 337 - int var3 = this.groupNameHashTable.get(class258.hashString(var1)); // L: 338 + int var3 = this.groupNameHashTable.get(GraphicsObject.hashString(var1)); // L: 338 if (var3 < 0) { // L: 339 return false; } else { - int var4 = this.fileNameHashTables[var3].get(class258.hashString(var2)); // L: 340 + int var4 = this.fileNameHashTables[var3].get(GraphicsObject.hashString(var2)); // L: 340 return var4 >= 0; // L: 341 } } - @ObfuscatedName("bm") + @ObfuscatedName("ba") @ObfuscatedSignature( descriptor = "(Ljava/lang/String;Ljava/lang/String;I)[B", - garbageValue = "-1956391174" + garbageValue = "-2113660686" ) @Export("takeFileByNames") public byte[] takeFileByNames(String var1, String var2) { var1 = var1.toLowerCase(); // L: 346 var2 = var2.toLowerCase(); // L: 347 - int var3 = this.groupNameHashTable.get(class258.hashString(var1)); // L: 348 - int var4 = this.fileNameHashTables[var3].get(class258.hashString(var2)); // L: 349 + int var3 = this.groupNameHashTable.get(GraphicsObject.hashString(var1)); // L: 348 + int var4 = this.fileNameHashTables[var3].get(GraphicsObject.hashString(var2)); // L: 349 return this.takeFile(var3, var4); // L: 350 } - @ObfuscatedName("bn") + @ObfuscatedName("be") @ObfuscatedSignature( descriptor = "(Ljava/lang/String;Ljava/lang/String;I)Z", - garbageValue = "331828687" + garbageValue = "-1619143397" ) @Export("tryLoadFileByNames") public boolean tryLoadFileByNames(String var1, String var2) { var1 = var1.toLowerCase(); // L: 354 var2 = var2.toLowerCase(); // L: 355 - int var3 = this.groupNameHashTable.get(class258.hashString(var1)); // L: 356 - int var4 = this.fileNameHashTables[var3].get(class258.hashString(var2)); // L: 357 + int var3 = this.groupNameHashTable.get(GraphicsObject.hashString(var1)); // L: 356 + int var4 = this.fileNameHashTables[var3].get(GraphicsObject.hashString(var2)); // L: 357 return this.tryLoadFile(var3, var4); // L: 358 } - @ObfuscatedName("ba") + @ObfuscatedName("bj") @ObfuscatedSignature( - descriptor = "(Ljava/lang/String;B)Z", - garbageValue = "86" + descriptor = "(Ljava/lang/String;I)Z", + garbageValue = "1308287337" ) @Export("tryLoadGroupByName") public boolean tryLoadGroupByName(String var1) { var1 = var1.toLowerCase(); // L: 362 - int var2 = this.groupNameHashTable.get(class258.hashString(var1)); // L: 363 + int var2 = this.groupNameHashTable.get(GraphicsObject.hashString(var1)); // L: 363 return this.tryLoadGroup(var2); // L: 364 } - @ObfuscatedName("bg") + @ObfuscatedName("bx") @ObfuscatedSignature( - descriptor = "(Ljava/lang/String;I)V", - garbageValue = "90954546" + descriptor = "(Ljava/lang/String;B)V", + garbageValue = "-13" ) @Export("loadRegionFromName") public void loadRegionFromName(String var1) { var1 = var1.toLowerCase(); // L: 368 - int var2 = this.groupNameHashTable.get(class258.hashString(var1)); // L: 369 + int var2 = this.groupNameHashTable.get(GraphicsObject.hashString(var1)); // L: 369 if (var2 >= 0) { // L: 370 this.loadRegionFromGroup(var2); // L: 371 } } // L: 372 - @ObfuscatedName("bi") + @ObfuscatedName("bp") @ObfuscatedSignature( descriptor = "(Ljava/lang/String;I)I", - garbageValue = "1634079173" + garbageValue = "-469747920" ) @Export("groupLoadPercentByName") public int groupLoadPercentByName(String var1) { var1 = var1.toLowerCase(); // L: 375 - int var2 = this.groupNameHashTable.get(class258.hashString(var1)); // L: 376 + int var2 = this.groupNameHashTable.get(GraphicsObject.hashString(var1)); // L: 376 return this.groupLoadPercent(var2); // L: 377 } + + @ObfuscatedName("p") + @ObfuscatedSignature( + descriptor = "(Ljv;Ljv;IIB)Lkt;", + garbageValue = "7" + ) + public static Font method5018(AbstractArchive var0, AbstractArchive var1, int var2, int var3) { + byte[] var5 = var0.takeFile(var2, var3); // L: 85 + boolean var4; + if (var5 == null) { // L: 86 + var4 = false; // L: 87 + } else { + ItemLayer.SpriteBuffer_decode(var5); // L: 90 + var4 = true; // L: 91 + } + + if (!var4) { // L: 93 + return null; + } else { + byte[] var6 = var1.takeFile(var2, var3); // L: 95 + Font var8; + if (var6 == null) { // L: 97 + var8 = null; // L: 98 + } else { + Font var7 = new Font(var6, WorldMapDecoration.SpriteBuffer_xOffsets, Calendar.SpriteBuffer_yOffsets, class396.SpriteBuffer_spriteWidths, class302.SpriteBuffer_spriteHeights, MilliClock.SpriteBuffer_spritePalette, class396.SpriteBuffer_pixels); // L: 101 + MilliClock.method2587(); // L: 102 + var8 = var7; // L: 103 + } + + return var8; // L: 105 + } + } } diff --git a/runescape-client/src/main/java/AbstractByteArrayCopier.java b/runescape-client/src/main/java/AbstractByteArrayCopier.java index 048a561a90..6b2499328f 100644 --- a/runescape-client/src/main/java/AbstractByteArrayCopier.java +++ b/runescape-client/src/main/java/AbstractByteArrayCopier.java @@ -4,66 +4,54 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("iw") +@ObfuscatedName("im") @Implements("AbstractByteArrayCopier") public abstract class AbstractByteArrayCopier { - @ObfuscatedName("r") - static int[] field3115; - @ObfuscatedName("lt") + @ObfuscatedName("ry") @ObfuscatedGetter( - intValue = -1508140937 + intValue = -941868037 ) - @Export("menuX") - static int menuX; + static int field3119; AbstractByteArrayCopier() { } // L: 4 - @ObfuscatedName("g") + @ObfuscatedName("f") @ObfuscatedSignature( - descriptor = "(I)[B", - garbageValue = "-1778746914" + descriptor = "(B)[B", + garbageValue = "74" ) @Export("get") abstract byte[] get(); - @ObfuscatedName("l") + @ObfuscatedName("y") @ObfuscatedSignature( - descriptor = "([BI)V", - garbageValue = "973811650" + descriptor = "([BB)V", + garbageValue = "43" ) @Export("set") abstract void set(byte[] var1); - @ObfuscatedName("h") + @ObfuscatedName("n") @ObfuscatedSignature( - descriptor = "(Ljp;I)V", - garbageValue = "-1461595719" + descriptor = "(Ljv;III)Lop;", + garbageValue = "1690865732" ) - public static void method4756(AbstractArchive var0) { - VarcInt.VarcInt_archive = var0; // L: 17 - } // L: 18 - - @ObfuscatedName("v") - @ObfuscatedSignature( - descriptor = "(III)I", - garbageValue = "583032704" - ) - static final int method4754(int var0, int var1) { - int var2 = var0 + var1 * 57; // L: 485 - var2 ^= var2 << 13; // L: 486 - int var3 = (var2 * var2 * 15731 + 789221) * var2 + 1376312589 & Integer.MAX_VALUE; // L: 487 - return var3 >> 19 & 255; // L: 488 + static IndexedSprite method4802(AbstractArchive var0, int var1, int var2) { + if (!class339.method6015(var0, var1, var2)) { // L: 28 + return null; + } else { + IndexedSprite var4 = new IndexedSprite(); // L: 31 + var4.width = class396.SpriteBuffer_spriteWidth; // L: 32 + var4.height = UserComparator2.SpriteBuffer_spriteHeight; // L: 33 + var4.xOffset = WorldMapDecoration.SpriteBuffer_xOffsets[0]; // L: 34 + var4.yOffset = Calendar.SpriteBuffer_yOffsets[0]; // L: 35 + var4.subWidth = class396.SpriteBuffer_spriteWidths[0]; // L: 36 + var4.subHeight = class302.SpriteBuffer_spriteHeights[0]; // L: 37 + var4.palette = MilliClock.SpriteBuffer_spritePalette; // L: 38 + var4.pixels = class396.SpriteBuffer_pixels[0]; // L: 39 + MilliClock.method2587(); // L: 40 + return var4; // L: 43 + } } - - @ObfuscatedName("b") - @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "-331498963" - ) - static final void method4738() { - Object var10000 = null; // L: 128 - String var0 = "Your friend list is full. Max of 200 for free users, and 400 for members"; - WorldMapScaleHandler.addGameMessage(30, "", var0); // L: 130 - } // L: 132 } diff --git a/runescape-client/src/main/java/AbstractFont.java b/runescape-client/src/main/java/AbstractFont.java index a8ca81a140..71648e5639 100644 --- a/runescape-client/src/main/java/AbstractFont.java +++ b/runescape-client/src/main/java/AbstractFont.java @@ -4,76 +4,76 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("kx") +@ObfuscatedName("kc") @Implements("AbstractFont") public abstract class AbstractFont extends Rasterizer2D { - @ObfuscatedName("q") + @ObfuscatedName("s") @ObfuscatedSignature( - descriptor = "[Lof;" + descriptor = "[Lop;" ) @Export("AbstractFont_modIconSprites") public static IndexedSprite[] AbstractFont_modIconSprites; - @ObfuscatedName("x") + @ObfuscatedName("l") @Export("AbstractFont_strike") static int AbstractFont_strike; - @ObfuscatedName("k") + @ObfuscatedName("o") @Export("AbstractFont_underline") static int AbstractFont_underline; - @ObfuscatedName("r") + @ObfuscatedName("c") @Export("AbstractFont_previousShadow") static int AbstractFont_previousShadow; - @ObfuscatedName("p") + @ObfuscatedName("e") @Export("AbstractFont_shadow") static int AbstractFont_shadow; - @ObfuscatedName("a") + @ObfuscatedName("g") @Export("AbstractFont_previousColor") static int AbstractFont_previousColor; - @ObfuscatedName("e") + @ObfuscatedName("a") @Export("AbstractFont_color") static int AbstractFont_color; - @ObfuscatedName("d") + @ObfuscatedName("k") @Export("AbstractFont_alpha") static int AbstractFont_alpha; - @ObfuscatedName("u") + @ObfuscatedName("m") @Export("AbstractFont_justificationTotal") static int AbstractFont_justificationTotal; - @ObfuscatedName("m") + @ObfuscatedName("x") @Export("AbstractFont_justificationCurrent") static int AbstractFont_justificationCurrent; - @ObfuscatedName("j") + @ObfuscatedName("z") @Export("AbstractFont_random") static Random AbstractFont_random; - @ObfuscatedName("f") + @ObfuscatedName("w") @Export("AbstractFont_lines") static String[] AbstractFont_lines; - @ObfuscatedName("h") + @ObfuscatedName("v") @Export("pixels") byte[][] pixels; - @ObfuscatedName("c") + @ObfuscatedName("n") @Export("advances") int[] advances; - @ObfuscatedName("o") + @ObfuscatedName("f") @Export("widths") int[] widths; - @ObfuscatedName("g") + @ObfuscatedName("y") @Export("heights") int[] heights; - @ObfuscatedName("l") + @ObfuscatedName("p") @Export("leftBearings") int[] leftBearings; - @ObfuscatedName("z") + @ObfuscatedName("j") @Export("topBearings") int[] topBearings; - @ObfuscatedName("t") + @ObfuscatedName("r") @Export("ascent") public int ascent; - @ObfuscatedName("v") + @ObfuscatedName("b") @Export("maxAscent") public int maxAscent; - @ObfuscatedName("b") + @ObfuscatedName("d") @Export("maxDescent") public int maxDescent; - @ObfuscatedName("i") + @ObfuscatedName("u") @Export("kerning") byte[] kerning; @@ -123,15 +123,15 @@ public abstract class AbstractFont extends Rasterizer2D { this.maxDescent = var9 - this.ascent; // L: 49 } // L: 50 - @ObfuscatedName("h") + @ObfuscatedName("v") @Export("drawGlyph") abstract void drawGlyph(byte[] var1, int var2, int var3, int var4, int var5, int var6); - @ObfuscatedName("c") + @ObfuscatedName("n") @Export("drawGlyphAlpha") abstract void drawGlyphAlpha(byte[] var1, int var2, int var3, int var4, int var5, int var6, int var7); - @ObfuscatedName("v") + @ObfuscatedName("d") @Export("readMetrics") void readMetrics(byte[] var1) { this.advances = new int[256]; // L: 57 @@ -193,7 +193,7 @@ public abstract class AbstractFont extends Rasterizer2D { if (var13 != 32 && var13 != 160) { // L: 89 for (var8 = 0; var8 < 256; ++var8) { // L: 90 if (var8 != 32 && var8 != 160) { // L: 91 - this.kerning[var8 + (var13 << 8)] = (byte)method5269(var11, var12, var4, this.advances, var10, var13, var8); // L: 92 + this.kerning[var8 + (var13 << 8)] = (byte)method5350(var11, var12, var4, this.advances, var10, var13, var8); // L: 92 } } } @@ -204,17 +204,17 @@ public abstract class AbstractFont extends Rasterizer2D { } // L: 97 - @ObfuscatedName("q") + @ObfuscatedName("u") @Export("charWidth") int charWidth(char var1) { if (var1 == 160) { // L: 122 var1 = ' '; } - return this.advances[DirectByteArrayCopier.charToByteCp1252(var1) & 255]; // L: 123 + return this.advances[ServerPacket.charToByteCp1252(var1) & 255]; // L: 123 } - @ObfuscatedName("i") + @ObfuscatedName("l") @Export("stringWidth") public int stringWidth(String var1) { if (var1 == null) { // L: 127 @@ -238,7 +238,7 @@ public abstract class AbstractFont extends Rasterizer2D { if (!var7.equals("gt")) { // L: 141 if (var7.startsWith("img=")) { // L: 142 try { - int var8 = FontName.method6162(var7.substring(4)); // L: 144 + int var8 = class82.method1908(var7.substring(4)); // L: 144 var4 += AbstractFont_modIconSprites[var8].width; // L: 145 var3 = -1; // L: 146 } catch (Exception var10) { // L: 148 @@ -256,7 +256,7 @@ public abstract class AbstractFont extends Rasterizer2D { } if (var2 == -1) { // L: 154 - var4 += this.advances[(char)(DirectByteArrayCopier.charToByteCp1252(var6) & 255)]; // L: 155 + var4 += this.advances[(char)(ServerPacket.charToByteCp1252(var6) & 255)]; // L: 155 if (this.kerning != null && var3 != -1) { // L: 156 var4 += this.kerning[var6 + (var3 << 8)]; } @@ -270,7 +270,7 @@ public abstract class AbstractFont extends Rasterizer2D { } } - @ObfuscatedName("x") + @ObfuscatedName("o") @Export("breakLines") public int breakLines(String var1, int[] var2, String[] var3) { if (var1 == null) { // L: 164 @@ -321,7 +321,7 @@ public abstract class AbstractFont extends Rasterizer2D { var11 = '>'; // L: 203 } else if (var16.startsWith("img=")) { // L: 205 try { - int var17 = FontName.method6162(var16.substring(4)); // L: 207 + int var17 = class82.method1908(var16.substring(4)); // L: 207 var4 += AbstractFont_modIconSprites[var17].width; // L: 208 var11 = 0; // L: 209 } catch (Exception var20) { // L: 211 @@ -375,7 +375,7 @@ public abstract class AbstractFont extends Rasterizer2D { } } - @ObfuscatedName("k") + @ObfuscatedName("c") @Export("lineWidth") public int lineWidth(String var1, int var2) { int var3 = this.breakLines(var1, new int[]{var2}, AbstractFont_lines); // L: 248 @@ -391,7 +391,7 @@ public abstract class AbstractFont extends Rasterizer2D { return var4; // L: 254 } - @ObfuscatedName("r") + @ObfuscatedName("e") @Export("lineCount") public int lineCount(String var1, int var2) { return this.breakLines(var1, new int[]{var2}, AbstractFont_lines); // L: 258 @@ -406,7 +406,7 @@ public abstract class AbstractFont extends Rasterizer2D { } } // L: 282 - @ObfuscatedName("e") + @ObfuscatedName("k") @Export("drawAlpha") public void drawAlpha(String var1, int var2, int var3, int var4, int var5, int var6) { if (var1 != null) { // L: 285 @@ -416,7 +416,7 @@ public abstract class AbstractFont extends Rasterizer2D { } } // L: 289 - @ObfuscatedName("d") + @ObfuscatedName("m") @Export("drawRightAligned") public void drawRightAligned(String var1, int var2, int var3, int var4, int var5) { if (var1 != null) { // L: 292 @@ -425,7 +425,7 @@ public abstract class AbstractFont extends Rasterizer2D { } } // L: 295 - @ObfuscatedName("u") + @ObfuscatedName("x") @Export("drawCentered") public void drawCentered(String var1, int var2, int var3, int var4, int var5) { if (var1 != null) { // L: 298 @@ -434,7 +434,7 @@ public abstract class AbstractFont extends Rasterizer2D { } } // L: 301 - @ObfuscatedName("m") + @ObfuscatedName("z") @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) { if (var1 == null) { // L: 304 @@ -495,7 +495,7 @@ public abstract class AbstractFont extends Rasterizer2D { } } - @ObfuscatedName("j") + @ObfuscatedName("w") @Export("drawCenteredWave") public void drawCenteredWave(String var1, int var2, int var3, int var4, int var5, int var6) { if (var1 != null) { // L: 339 @@ -510,7 +510,7 @@ public abstract class AbstractFont extends Rasterizer2D { } } // L: 344 - @ObfuscatedName("f") + @ObfuscatedName("t") @Export("drawCenteredWave2") public void drawCenteredWave2(String var1, int var2, int var3, int var4, int var5, int var6) { if (var1 != null) { // L: 347 @@ -527,7 +527,7 @@ public abstract class AbstractFont extends Rasterizer2D { } } // L: 356 - @ObfuscatedName("s") + @ObfuscatedName("h") @Export("drawCenteredShake") public void drawCenteredShake(String var1, int var2, int var3, int var4, int var5, int var6, int var7) { if (var1 != null) { // L: 359 @@ -547,7 +547,7 @@ public abstract class AbstractFont extends Rasterizer2D { } } // L: 366 - @ObfuscatedName("y") + @ObfuscatedName("q") @Export("drawRandomAlphaAndSpacing") public void drawRandomAlphaAndSpacing(String var1, int var2, int var3, int var4, int var5, int var6) { if (var1 != null) { // L: 369 @@ -568,7 +568,7 @@ public abstract class AbstractFont extends Rasterizer2D { } } // L: 380 - @ObfuscatedName("w") + @ObfuscatedName("i") @Export("reset") void reset(int var1, int var2) { AbstractFont_strike = -1; // L: 383 @@ -582,95 +582,105 @@ public abstract class AbstractFont extends Rasterizer2D { AbstractFont_justificationCurrent = 0; // L: 389 } // L: 390 - @ObfuscatedName("n") + @ObfuscatedName("ae") @Export("decodeTag") void decodeTag(String var1) { try { + int var2; + String var3; if (var1.startsWith("col=")) { // L: 394 - AbstractFont_color = UserComparator8.method2440(var1.substring(4), 16); - } else if (var1.equals("/col")) { // L: 395 + var3 = var1.substring(4); // L: 396 + var2 = class24.method260(var3, 16, true); // L: 398 + AbstractFont_color = var2; // L: 400 + } else if (var1.equals("/col")) { // L: 402 AbstractFont_color = AbstractFont_previousColor; - } else if (var1.startsWith("str=")) { // L: 396 - AbstractFont_strike = UserComparator8.method2440(var1.substring(4), 16); - } else if (var1.equals("str")) { // L: 397 + } else if (var1.startsWith("str=")) { // L: 403 + var3 = var1.substring(4); // L: 405 + var2 = class24.method260(var3, 16, true); // L: 407 + AbstractFont_strike = var2; // L: 409 + } else if (var1.equals("str")) { // L: 411 AbstractFont_strike = 8388608; - } else if (var1.equals("/str")) { // L: 398 + } else if (var1.equals("/str")) { // L: 412 AbstractFont_strike = -1; - } else if (var1.startsWith("u=")) { // L: 399 - AbstractFont_underline = UserComparator8.method2440(var1.substring(2), 16); - } else if (var1.equals("u")) { // L: 400 + } else if (var1.startsWith("u=")) { // L: 413 + var3 = var1.substring(2); // L: 415 + var2 = class24.method260(var3, 16, true); // L: 417 + AbstractFont_underline = var2; // L: 419 + } else if (var1.equals("u")) { // L: 421 AbstractFont_underline = 0; - } else if (var1.equals("/u")) { // L: 401 + } else if (var1.equals("/u")) { // L: 422 AbstractFont_underline = -1; - } else if (var1.startsWith("shad=")) { // L: 402 - AbstractFont_shadow = UserComparator8.method2440(var1.substring(5), 16); - } else if (var1.equals("shad")) { // L: 403 + } else if (var1.startsWith("shad=")) { // L: 423 + var3 = var1.substring(5); // L: 425 + var2 = class24.method260(var3, 16, true); // L: 427 + AbstractFont_shadow = var2; // L: 429 + } else if (var1.equals("shad")) { // L: 431 AbstractFont_shadow = 0; - } else if (var1.equals("/shad")) { // L: 404 + } else if (var1.equals("/shad")) { // L: 432 AbstractFont_shadow = AbstractFont_previousShadow; - } else if (var1.equals("br")) { // L: 405 - this.reset(AbstractFont_previousColor, AbstractFont_previousShadow); + } else if (var1.equals("br")) { + this.reset(AbstractFont_previousColor, AbstractFont_previousShadow); // L: 433 } - } catch (Exception var3) { // L: 407 + } catch (Exception var5) { // L: 435 } - } // L: 408 + } // L: 436 - @ObfuscatedName("ag") + @ObfuscatedName("ap") @Export("calculateLineJustification") void calculateLineJustification(String var1, int var2) { - int var3 = 0; // L: 411 - boolean var4 = false; // L: 412 + int var3 = 0; // L: 439 + boolean var4 = false; // L: 440 - for (int var5 = 0; var5 < var1.length(); ++var5) { // L: 413 - char var6 = var1.charAt(var5); // L: 414 - if (var6 == '<') { // L: 415 + for (int var5 = 0; var5 < var1.length(); ++var5) { // L: 441 + char var6 = var1.charAt(var5); // L: 442 + if (var6 == '<') { // L: 443 var4 = true; - } else if (var6 == '>') { // L: 416 + } else if (var6 == '>') { // L: 444 var4 = false; - } else if (!var4 && var6 == ' ') { // L: 417 + } else if (!var4 && var6 == ' ') { // L: 445 ++var3; } } - if (var3 > 0) { // L: 419 + if (var3 > 0) { // L: 447 AbstractFont_justificationTotal = (var2 - this.stringWidth(var1) << 8) / var3; } - } // L: 420 + } // L: 448 - @ObfuscatedName("ae") + @ObfuscatedName("ab") @Export("draw0") void draw0(String var1, int var2, int var3) { - var3 -= this.ascent; // L: 423 - int var4 = -1; // L: 424 - int var5 = -1; // L: 425 + var3 -= this.ascent; // L: 451 + int var4 = -1; // L: 452 + int var5 = -1; // L: 453 - for (int var6 = 0; var6 < var1.length(); ++var6) { // L: 426 - if (var1.charAt(var6) != 0) { // L: 427 - char var7 = (char)(DirectByteArrayCopier.charToByteCp1252(var1.charAt(var6)) & 255); // L: 428 - if (var7 == '<') { // L: 429 - var4 = var6; // L: 430 + for (int var6 = 0; var6 < var1.length(); ++var6) { // L: 454 + if (var1.charAt(var6) != 0) { // L: 455 + char var7 = (char)(ServerPacket.charToByteCp1252(var1.charAt(var6)) & 255); // L: 456 + if (var7 == '<') { // L: 457 + var4 = var6; // L: 458 } else { int var9; - if (var7 == '>' && var4 != -1) { // L: 433 - String var8 = var1.substring(var4 + 1, var6); // L: 434 - var4 = -1; // L: 435 - if (var8.equals("lt")) { // L: 436 + if (var7 == '>' && var4 != -1) { // L: 461 + String var8 = var1.substring(var4 + 1, var6); // L: 462 + var4 = -1; // L: 463 + if (var8.equals("lt")) { // L: 464 var7 = '<'; } else { - if (!var8.equals("gt")) { // L: 437 - if (var8.startsWith("img=")) { // L: 438 + if (!var8.equals("gt")) { // L: 465 + if (var8.startsWith("img=")) { // L: 466 try { - var9 = FontName.method6162(var8.substring(4)); // L: 440 - IndexedSprite var10 = AbstractFont_modIconSprites[var9]; // L: 441 - var10.drawAt(var2, var3 + this.ascent - var10.height); // L: 442 - var2 += var10.width; // L: 443 - var5 = -1; // L: 444 - } catch (Exception var14) { // L: 446 + var9 = class82.method1908(var8.substring(4)); // L: 468 + IndexedSprite var10 = AbstractFont_modIconSprites[var9]; // L: 469 + var10.drawAt(var2, var3 + this.ascent - var10.height); // L: 470 + var2 += var10.width; // L: 471 + var5 = -1; // L: 472 + } catch (Exception var14) { // L: 474 } } else { - this.decodeTag(var8); // L: 450 + this.decodeTag(var8); // L: 478 } continue; } @@ -679,103 +689,103 @@ public abstract class AbstractFont extends Rasterizer2D { } } - if (var7 == 160) { // L: 454 + if (var7 == 160) { // L: 482 var7 = ' '; } - if (var4 == -1) { // L: 455 - if (this.kerning != null && var5 != -1) { // L: 456 + if (var4 == -1) { // L: 483 + if (this.kerning != null && var5 != -1) { // L: 484 var2 += this.kerning[var7 + (var5 << 8)]; } - int var12 = this.widths[var7]; // L: 457 - var9 = this.heights[var7]; // L: 458 - if (var7 != ' ') { // L: 459 - if (AbstractFont_alpha == 256) { // L: 460 - if (AbstractFont_shadow != -1) { // L: 461 + int var12 = this.widths[var7]; // L: 485 + var9 = this.heights[var7]; // L: 486 + if (var7 != ' ') { // L: 487 + if (AbstractFont_alpha == 256) { // L: 488 + if (AbstractFont_shadow != -1) { // L: 489 AbstractFont_drawGlyph(this.pixels[var7], var2 + this.leftBearings[var7] + 1, var3 + this.topBearings[var7] + 1, var12, var9, AbstractFont_shadow); } - this.drawGlyph(this.pixels[var7], var2 + this.leftBearings[var7], var3 + this.topBearings[var7], var12, var9, AbstractFont_color); // L: 462 + this.drawGlyph(this.pixels[var7], var2 + this.leftBearings[var7], var3 + this.topBearings[var7], var12, var9, AbstractFont_color); // L: 490 } else { - if (AbstractFont_shadow != -1) { // L: 465 + if (AbstractFont_shadow != -1) { // L: 493 AbstractFont_drawGlyphAlpha(this.pixels[var7], var2 + this.leftBearings[var7] + 1, var3 + this.topBearings[var7] + 1, var12, var9, AbstractFont_shadow, AbstractFont_alpha); } - this.drawGlyphAlpha(this.pixels[var7], var2 + this.leftBearings[var7], var3 + this.topBearings[var7], var12, var9, AbstractFont_color, AbstractFont_alpha); // L: 466 + this.drawGlyphAlpha(this.pixels[var7], var2 + this.leftBearings[var7], var3 + this.topBearings[var7], var12, var9, AbstractFont_color, AbstractFont_alpha); // L: 494 } - } else if (AbstractFont_justificationTotal > 0) { // L: 470 - AbstractFont_justificationCurrent += AbstractFont_justificationTotal; // L: 471 - var2 += AbstractFont_justificationCurrent >> 8; // L: 472 - AbstractFont_justificationCurrent &= 255; // L: 473 + } else if (AbstractFont_justificationTotal > 0) { // L: 498 + AbstractFont_justificationCurrent += AbstractFont_justificationTotal; // L: 499 + var2 += AbstractFont_justificationCurrent >> 8; // L: 500 + AbstractFont_justificationCurrent &= 255; // L: 501 } - int var13 = this.advances[var7]; // L: 476 - if (AbstractFont_strike != -1) { // L: 477 + int var13 = this.advances[var7]; // L: 504 + if (AbstractFont_strike != -1) { // L: 505 Rasterizer2D.Rasterizer2D_drawHorizontalLine(var2, var3 + (int)((double)this.ascent * 0.7D), var13, AbstractFont_strike); } - if (AbstractFont_underline != -1) { // L: 478 + if (AbstractFont_underline != -1) { // L: 506 Rasterizer2D.Rasterizer2D_drawHorizontalLine(var2, var3 + this.ascent + 1, var13, AbstractFont_underline); } - var2 += var13; // L: 479 - var5 = var7; // L: 480 + var2 += var13; // L: 507 + var5 = var7; // L: 508 } } } } - } // L: 483 + } // L: 511 - @ObfuscatedName("ao") + @ObfuscatedName("al") @Export("drawWithOffsets0") void drawWithOffsets0(String var1, int var2, int var3, int[] var4, int[] var5) { - var3 -= this.ascent; // L: 486 - int var6 = -1; // L: 487 - int var7 = -1; // L: 488 - int var8 = 0; // L: 489 + var3 -= this.ascent; // L: 514 + int var6 = -1; // L: 515 + int var7 = -1; // L: 516 + int var8 = 0; // L: 517 - for (int var9 = 0; var9 < var1.length(); ++var9) { // L: 490 - if (var1.charAt(var9) != 0) { // L: 491 - char var10 = (char)(DirectByteArrayCopier.charToByteCp1252(var1.charAt(var9)) & 255); // L: 492 - if (var10 == '<') { // L: 493 - var6 = var9; // L: 494 + for (int var9 = 0; var9 < var1.length(); ++var9) { // L: 518 + if (var1.charAt(var9) != 0) { // L: 519 + char var10 = (char)(ServerPacket.charToByteCp1252(var1.charAt(var9)) & 255); // L: 520 + if (var10 == '<') { // L: 521 + var6 = var9; // L: 522 } else { int var12; int var13; int var14; - if (var10 == '>' && var6 != -1) { // L: 497 - String var11 = var1.substring(var6 + 1, var9); // L: 498 - var6 = -1; // L: 499 - if (var11.equals("lt")) { // L: 500 + if (var10 == '>' && var6 != -1) { // L: 525 + String var11 = var1.substring(var6 + 1, var9); // L: 526 + var6 = -1; // L: 527 + if (var11.equals("lt")) { // L: 528 var10 = '<'; } else { - if (!var11.equals("gt")) { // L: 501 - if (var11.startsWith("img=")) { // L: 502 + if (!var11.equals("gt")) { // L: 529 + if (var11.startsWith("img=")) { // L: 530 try { - if (var4 != null) { // L: 505 + if (var4 != null) { // L: 533 var12 = var4[var8]; } else { - var12 = 0; // L: 506 + var12 = 0; // L: 534 } - if (var5 != null) { // L: 508 + if (var5 != null) { // L: 536 var13 = var5[var8]; } else { - var13 = 0; // L: 509 + var13 = 0; // L: 537 } - ++var8; // L: 510 - var14 = FontName.method6162(var11.substring(4)); // L: 511 - IndexedSprite var15 = AbstractFont_modIconSprites[var14]; // L: 512 - var15.drawAt(var12 + var2, var13 + (var3 + this.ascent - var15.height)); // L: 513 - var2 += var15.width; // L: 514 - var7 = -1; // L: 515 - } catch (Exception var19) { // L: 517 + ++var8; // L: 538 + var14 = class82.method1908(var11.substring(4)); // L: 539 + IndexedSprite var15 = AbstractFont_modIconSprites[var14]; // L: 540 + var15.drawAt(var12 + var2, var13 + (var3 + this.ascent - var15.height)); // L: 541 + var2 += var15.width; // L: 542 + var7 = -1; // L: 543 + } catch (Exception var19) { // L: 545 } } else { - this.decodeTag(var11); // L: 521 + this.decodeTag(var11); // L: 549 } continue; } @@ -784,70 +794,70 @@ public abstract class AbstractFont extends Rasterizer2D { } } - if (var10 == 160) { // L: 525 + if (var10 == 160) { // L: 553 var10 = ' '; } - if (var6 == -1) { // L: 526 - if (this.kerning != null && var7 != -1) { // L: 527 + if (var6 == -1) { // L: 554 + if (this.kerning != null && var7 != -1) { // L: 555 var2 += this.kerning[var10 + (var7 << 8)]; } - int var17 = this.widths[var10]; // L: 528 - var12 = this.heights[var10]; // L: 529 - if (var4 != null) { // L: 531 + int var17 = this.widths[var10]; // L: 556 + var12 = this.heights[var10]; // L: 557 + if (var4 != null) { // L: 559 var13 = var4[var8]; } else { - var13 = 0; // L: 532 + var13 = 0; // L: 560 } - if (var5 != null) { // L: 534 + if (var5 != null) { // L: 562 var14 = var5[var8]; } else { - var14 = 0; // L: 535 + var14 = 0; // L: 563 } - ++var8; // L: 536 - if (var10 != ' ') { // L: 537 - if (AbstractFont_alpha == 256) { // L: 538 - if (AbstractFont_shadow != -1) { // L: 539 + ++var8; // L: 564 + if (var10 != ' ') { // L: 565 + if (AbstractFont_alpha == 256) { // L: 566 + if (AbstractFont_shadow != -1) { // L: 567 AbstractFont_drawGlyph(this.pixels[var10], var13 + var2 + this.leftBearings[var10] + 1, var3 + var14 + this.topBearings[var10] + 1, var17, var12, AbstractFont_shadow); } - this.drawGlyph(this.pixels[var10], var13 + var2 + this.leftBearings[var10], var3 + var14 + this.topBearings[var10], var17, var12, AbstractFont_color); // L: 540 + this.drawGlyph(this.pixels[var10], var13 + var2 + this.leftBearings[var10], var3 + var14 + this.topBearings[var10], var17, var12, AbstractFont_color); // L: 568 } else { - if (AbstractFont_shadow != -1) { // L: 543 + if (AbstractFont_shadow != -1) { // L: 571 AbstractFont_drawGlyphAlpha(this.pixels[var10], var13 + var2 + this.leftBearings[var10] + 1, var3 + var14 + this.topBearings[var10] + 1, var17, var12, AbstractFont_shadow, AbstractFont_alpha); } - this.drawGlyphAlpha(this.pixels[var10], var13 + var2 + this.leftBearings[var10], var3 + var14 + this.topBearings[var10], var17, var12, AbstractFont_color, AbstractFont_alpha); // L: 544 + this.drawGlyphAlpha(this.pixels[var10], var13 + var2 + this.leftBearings[var10], var3 + var14 + this.topBearings[var10], var17, var12, AbstractFont_color, AbstractFont_alpha); // L: 572 } - } else if (AbstractFont_justificationTotal > 0) { // L: 548 - AbstractFont_justificationCurrent += AbstractFont_justificationTotal; // L: 549 - var2 += AbstractFont_justificationCurrent >> 8; // L: 550 - AbstractFont_justificationCurrent &= 255; // L: 551 + } else if (AbstractFont_justificationTotal > 0) { // L: 576 + AbstractFont_justificationCurrent += AbstractFont_justificationTotal; // L: 577 + var2 += AbstractFont_justificationCurrent >> 8; // L: 578 + AbstractFont_justificationCurrent &= 255; // L: 579 } - int var18 = this.advances[var10]; // L: 554 - if (AbstractFont_strike != -1) { // L: 555 + int var18 = this.advances[var10]; // L: 582 + if (AbstractFont_strike != -1) { // L: 583 Rasterizer2D.Rasterizer2D_drawHorizontalLine(var2, var3 + (int)((double)this.ascent * 0.7D), var18, AbstractFont_strike); } - if (AbstractFont_underline != -1) { // L: 556 + if (AbstractFont_underline != -1) { // L: 584 Rasterizer2D.Rasterizer2D_drawHorizontalLine(var2, var3 + this.ascent, var18, AbstractFont_underline); } - var2 += var18; // L: 557 - var7 = var10; // L: 558 + var2 += var18; // L: 585 + var7 = var10; // L: 586 } } } } - } // L: 561 + } // L: 589 - @ObfuscatedName("b") - static int method5269(byte[][] var0, byte[][] var1, int[] var2, int[] var3, int[] var4, int var5, int var6) { + @ObfuscatedName("s") + static int method5350(byte[][] var0, byte[][] var1, int[] var2, int[] var3, int[] var4, int var5, int var6) { int var7 = var2[var5]; // L: 100 int var8 = var7 + var4[var5]; // L: 101 int var9 = var2[var6]; // L: 102 @@ -882,7 +892,7 @@ public abstract class AbstractFont extends Rasterizer2D { return -var13; // L: 118 } - @ObfuscatedName("p") + @ObfuscatedName("g") @Export("escapeBrackets") public static String escapeBrackets(String var0) { int var1 = var0.length(); // L: 262 @@ -911,157 +921,157 @@ public abstract class AbstractFont extends Rasterizer2D { return var6.toString(); // L: 275 } - @ObfuscatedName("aj") + @ObfuscatedName("ad") @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; // L: 567 - int var7 = Rasterizer2D.Rasterizer2D_width - var3; // L: 568 - int var8 = 0; // L: 569 - int var9 = 0; // L: 570 + int var6 = var1 + var2 * Rasterizer2D.Rasterizer2D_width; // L: 595 + int var7 = Rasterizer2D.Rasterizer2D_width - var3; // L: 596 + int var8 = 0; // L: 597 + int var9 = 0; // L: 598 int var10; - if (var2 < Rasterizer2D.Rasterizer2D_yClipStart) { // L: 571 - var10 = Rasterizer2D.Rasterizer2D_yClipStart - var2; // L: 572 - var4 -= var10; // L: 573 - var2 = Rasterizer2D.Rasterizer2D_yClipStart; // L: 574 - var9 += var3 * var10; // L: 575 - var6 += var10 * Rasterizer2D.Rasterizer2D_width; // L: 576 + if (var2 < Rasterizer2D.Rasterizer2D_yClipStart) { // L: 599 + var10 = Rasterizer2D.Rasterizer2D_yClipStart - var2; // L: 600 + var4 -= var10; // L: 601 + var2 = Rasterizer2D.Rasterizer2D_yClipStart; // L: 602 + var9 += var3 * var10; // L: 603 + var6 += var10 * Rasterizer2D.Rasterizer2D_width; // L: 604 } - if (var2 + var4 > Rasterizer2D.Rasterizer2D_yClipEnd) { // L: 578 + if (var2 + var4 > Rasterizer2D.Rasterizer2D_yClipEnd) { // L: 606 var4 -= var2 + var4 - Rasterizer2D.Rasterizer2D_yClipEnd; } - if (var1 < Rasterizer2D.Rasterizer2D_xClipStart) { // L: 579 - var10 = Rasterizer2D.Rasterizer2D_xClipStart - var1; // L: 580 - var3 -= var10; // L: 581 - var1 = Rasterizer2D.Rasterizer2D_xClipStart; // L: 582 - var9 += var10; // L: 583 - var6 += var10; // L: 584 - var8 += var10; // L: 585 - var7 += var10; // L: 586 + if (var1 < Rasterizer2D.Rasterizer2D_xClipStart) { // L: 607 + var10 = Rasterizer2D.Rasterizer2D_xClipStart - var1; // L: 608 + var3 -= var10; // L: 609 + var1 = Rasterizer2D.Rasterizer2D_xClipStart; // L: 610 + var9 += var10; // L: 611 + var6 += var10; // L: 612 + var8 += var10; // L: 613 + var7 += var10; // L: 614 } - if (var3 + var1 > Rasterizer2D.Rasterizer2D_xClipEnd) { // L: 588 - var10 = var3 + var1 - Rasterizer2D.Rasterizer2D_xClipEnd; // L: 589 - var3 -= var10; // L: 590 - var8 += var10; // L: 591 - var7 += var10; // L: 592 + if (var3 + var1 > Rasterizer2D.Rasterizer2D_xClipEnd) { // L: 616 + var10 = var3 + var1 - Rasterizer2D.Rasterizer2D_xClipEnd; // L: 617 + var3 -= var10; // L: 618 + var8 += var10; // L: 619 + var7 += var10; // L: 620 } - if (var3 > 0 && var4 > 0) { // L: 594 - AbstractFont_placeGlyph(Rasterizer2D.Rasterizer2D_pixels, var0, var5, var9, var6, var3, var4, var7, var8); // L: 595 + if (var3 > 0 && var4 > 0) { // L: 622 + AbstractFont_placeGlyph(Rasterizer2D.Rasterizer2D_pixels, var0, var5, var9, var6, var3, var4, var7, var8); // L: 623 } - } // L: 596 + } // L: 624 - @ObfuscatedName("aw") + @ObfuscatedName("ai") @Export("AbstractFont_placeGlyph") static void AbstractFont_placeGlyph(int[] var0, byte[] var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8) { - int var9 = -(var5 >> 2); // L: 599 - var5 = -(var5 & 3); // L: 600 + int var9 = -(var5 >> 2); // L: 627 + var5 = -(var5 & 3); // L: 628 - for (int var10 = -var6; var10 < 0; ++var10) { // L: 601 + for (int var10 = -var6; var10 < 0; ++var10) { // L: 629 int var11; - for (var11 = var9; var11 < 0; ++var11) { // L: 602 - if (var1[var3++] != 0) { // L: 603 + for (var11 = var9; var11 < 0; ++var11) { // L: 630 + if (var1[var3++] != 0) { // L: 631 var0[var4++] = var2; } else { - ++var4; // L: 604 + ++var4; // L: 632 } - if (var1[var3++] != 0) { // L: 605 + if (var1[var3++] != 0) { // L: 633 var0[var4++] = var2; } else { - ++var4; // L: 606 + ++var4; // L: 634 } - if (var1[var3++] != 0) { // L: 607 + if (var1[var3++] != 0) { // L: 635 var0[var4++] = var2; } else { - ++var4; // L: 608 + ++var4; // L: 636 } - if (var1[var3++] != 0) { // L: 609 + if (var1[var3++] != 0) { // L: 637 var0[var4++] = var2; } else { - ++var4; // L: 610 + ++var4; // L: 638 } } - for (var11 = var5; var11 < 0; ++var11) { // L: 612 - if (var1[var3++] != 0) { // L: 613 + for (var11 = var5; var11 < 0; ++var11) { // L: 640 + if (var1[var3++] != 0) { // L: 641 var0[var4++] = var2; } else { - ++var4; // L: 614 + ++var4; // L: 642 } } - var4 += var7; // L: 616 - var3 += var8; // L: 617 + var4 += var7; // L: 644 + var3 += var8; // L: 645 } - } // L: 619 + } // L: 647 - @ObfuscatedName("at") + @ObfuscatedName("ar") @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; // L: 622 - int var8 = Rasterizer2D.Rasterizer2D_width - var3; // L: 623 - int var9 = 0; // L: 624 - int var10 = 0; // L: 625 + int var7 = var1 + var2 * Rasterizer2D.Rasterizer2D_width; // L: 650 + int var8 = Rasterizer2D.Rasterizer2D_width - var3; // L: 651 + int var9 = 0; // L: 652 + int var10 = 0; // L: 653 int var11; - if (var2 < Rasterizer2D.Rasterizer2D_yClipStart) { // L: 626 - var11 = Rasterizer2D.Rasterizer2D_yClipStart - var2; // L: 627 - var4 -= var11; // L: 628 - var2 = Rasterizer2D.Rasterizer2D_yClipStart; // L: 629 - var10 += var3 * var11; // L: 630 - var7 += var11 * Rasterizer2D.Rasterizer2D_width; // L: 631 + if (var2 < Rasterizer2D.Rasterizer2D_yClipStart) { // L: 654 + var11 = Rasterizer2D.Rasterizer2D_yClipStart - var2; // L: 655 + var4 -= var11; // L: 656 + var2 = Rasterizer2D.Rasterizer2D_yClipStart; // L: 657 + var10 += var3 * var11; // L: 658 + var7 += var11 * Rasterizer2D.Rasterizer2D_width; // L: 659 } - if (var2 + var4 > Rasterizer2D.Rasterizer2D_yClipEnd) { // L: 633 + if (var2 + var4 > Rasterizer2D.Rasterizer2D_yClipEnd) { // L: 661 var4 -= var2 + var4 - Rasterizer2D.Rasterizer2D_yClipEnd; } - if (var1 < Rasterizer2D.Rasterizer2D_xClipStart) { // L: 634 - var11 = Rasterizer2D.Rasterizer2D_xClipStart - var1; // L: 635 - var3 -= var11; // L: 636 - var1 = Rasterizer2D.Rasterizer2D_xClipStart; // L: 637 - var10 += var11; // L: 638 - var7 += var11; // L: 639 - var9 += var11; // L: 640 - var8 += var11; // L: 641 + if (var1 < Rasterizer2D.Rasterizer2D_xClipStart) { // L: 662 + var11 = Rasterizer2D.Rasterizer2D_xClipStart - var1; // L: 663 + var3 -= var11; // L: 664 + var1 = Rasterizer2D.Rasterizer2D_xClipStart; // L: 665 + var10 += var11; // L: 666 + var7 += var11; // L: 667 + var9 += var11; // L: 668 + var8 += var11; // L: 669 } - if (var3 + var1 > Rasterizer2D.Rasterizer2D_xClipEnd) { // L: 643 - var11 = var3 + var1 - Rasterizer2D.Rasterizer2D_xClipEnd; // L: 644 - var3 -= var11; // L: 645 - var9 += var11; // L: 646 - var8 += var11; // L: 647 + if (var3 + var1 > Rasterizer2D.Rasterizer2D_xClipEnd) { // L: 671 + var11 = var3 + var1 - Rasterizer2D.Rasterizer2D_xClipEnd; // L: 672 + var3 -= var11; // L: 673 + var9 += var11; // L: 674 + var8 += var11; // L: 675 } - if (var3 > 0 && var4 > 0) { // L: 649 - AbstractFont_placeGlyphAlpha(Rasterizer2D.Rasterizer2D_pixels, var0, var5, var10, var7, var3, var4, var8, var9, var6); // L: 650 + if (var3 > 0 && var4 > 0) { // L: 677 + AbstractFont_placeGlyphAlpha(Rasterizer2D.Rasterizer2D_pixels, var0, var5, var10, var7, var3, var4, var8, var9, var6); // L: 678 } - } // L: 651 + } // L: 679 - @ObfuscatedName("av") + @ObfuscatedName("ag") @Export("AbstractFont_placeGlyphAlpha") static void AbstractFont_placeGlyphAlpha(int[] var0, byte[] var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8, int var9) { - var2 = ((var2 & 65280) * var9 & 16711680) + (var9 * (var2 & 16711935) & -16711936) >> 8; // L: 654 - var9 = 256 - var9; // L: 655 + var2 = ((var2 & 65280) * var9 & 16711680) + (var9 * (var2 & 16711935) & -16711936) >> 8; // L: 682 + var9 = 256 - var9; // L: 683 - for (int var10 = -var6; var10 < 0; ++var10) { // L: 656 - for (int var11 = -var5; var11 < 0; ++var11) { // L: 657 - if (var1[var3++] != 0) { // L: 658 - int var12 = var0[var4]; // L: 659 - var0[var4++] = (((var12 & 65280) * var9 & 16711680) + ((var12 & 16711935) * var9 & -16711936) >> 8) + var2; // L: 660 + for (int var10 = -var6; var10 < 0; ++var10) { // L: 684 + for (int var11 = -var5; var11 < 0; ++var11) { // L: 685 + if (var1[var3++] != 0) { // L: 686 + int var12 = var0[var4]; // L: 687 + var0[var4++] = (((var12 & 65280) * var9 & 16711680) + ((var12 & 16711935) * var9 & -16711936) >> 8) + var2; // L: 688 } else { - ++var4; // L: 662 + ++var4; // L: 690 } } - var4 += var7; // L: 664 - var3 += var8; // L: 665 + var4 += var7; // L: 692 + var3 += var8; // L: 693 } - } // L: 667 + } // L: 695 } diff --git a/runescape-client/src/main/java/AbstractRasterProvider.java b/runescape-client/src/main/java/AbstractRasterProvider.java index 74e97b86b0..2dc0467c46 100644 --- a/runescape-client/src/main/java/AbstractRasterProvider.java +++ b/runescape-client/src/main/java/AbstractRasterProvider.java @@ -4,21 +4,21 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("oa") +@ObfuscatedName("oe") @Implements("AbstractRasterProvider") public abstract class AbstractRasterProvider { - @ObfuscatedName("o") + @ObfuscatedName("f") @Export("pixels") public int[] pixels; - @ObfuscatedName("g") + @ObfuscatedName("y") @ObfuscatedGetter( - intValue = -28982631 + intValue = -740510445 ) @Export("width") public int width; - @ObfuscatedName("l") + @ObfuscatedName("p") @ObfuscatedGetter( - intValue = -1578915527 + intValue = 460788765 ) @Export("height") public int height; @@ -26,26 +26,26 @@ public abstract class AbstractRasterProvider { protected AbstractRasterProvider() { } // L: 8 - @ObfuscatedName("c") + @ObfuscatedName("n") @ObfuscatedSignature( descriptor = "(III)V", - garbageValue = "946927197" + garbageValue = "-974946505" ) @Export("drawFull") public abstract void drawFull(int var1, int var2); - @ObfuscatedName("o") + @ObfuscatedName("f") @ObfuscatedSignature( descriptor = "(IIIII)V", - garbageValue = "-1873522448" + garbageValue = "331056379" ) @Export("draw") public abstract void draw(int var1, int var2, int var3, int var4); - @ObfuscatedName("m") + @ObfuscatedName("x") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "697339272" + garbageValue = "872029974" ) @Export("apply") public final void apply() { diff --git a/runescape-client/src/main/java/AbstractSocket.java b/runescape-client/src/main/java/AbstractSocket.java index 75ffafccf1..82c39ac6c0 100644 --- a/runescape-client/src/main/java/AbstractSocket.java +++ b/runescape-client/src/main/java/AbstractSocket.java @@ -4,69 +4,84 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("lc") +@ObfuscatedName("ls") @Implements("AbstractSocket") public abstract class AbstractSocket { + @ObfuscatedName("gt") + @ObfuscatedSignature( + descriptor = "Lgt;" + ) + @Export("scene") + static Scene scene; + protected AbstractSocket() { } // L: 7 - @ObfuscatedName("h") + @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "(B)V", - garbageValue = "-36" + descriptor = "(I)V", + garbageValue = "1654713390" ) @Export("close") public abstract void close(); - @ObfuscatedName("c") + @ObfuscatedName("n") @ObfuscatedSignature( descriptor = "(I)I", - garbageValue = "-2027143758" + garbageValue = "479468921" ) @Export("readUnsignedByte") public abstract int readUnsignedByte() throws IOException; - @ObfuscatedName("o") + @ObfuscatedName("f") @ObfuscatedSignature( descriptor = "(I)I", - garbageValue = "-640327653" + garbageValue = "1659206769" ) @Export("available") public abstract int available() throws IOException; - @ObfuscatedName("g") + @ObfuscatedName("y") @ObfuscatedSignature( descriptor = "(II)Z", - garbageValue = "-1880004365" + garbageValue = "-211935081" ) @Export("isAvailable") public abstract boolean isAvailable(int var1) throws IOException; - @ObfuscatedName("l") + @ObfuscatedName("p") @ObfuscatedSignature( descriptor = "([BIII)I", - garbageValue = "-1936066161" + garbageValue = "-2041736219" ) @Export("read") public abstract int read(byte[] var1, int var2, int var3) throws IOException; - @ObfuscatedName("t") + @ObfuscatedName("r") @ObfuscatedSignature( descriptor = "([BIII)V", - garbageValue = "1752522959" + garbageValue = "263213011" ) @Export("write") public abstract void write(byte[] var1, int var2, int var3) throws IOException; - @ObfuscatedName("lj") + @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "(B)V", - garbageValue = "8" + descriptor = "(I)I", + garbageValue = "-1943221493" ) - @Export("Clan_leaveChat") - static final void Clan_leaveChat() { - PacketBufferNode var0 = HealthBarDefinition.getPacketBufferNode(ClientPacket.field2658, Client.packetWriter.isaacCipher); // L: 11545 - var0.packetBuffer.writeByte(0); // L: 11546 - Client.packetWriter.addNode(var0); // L: 11547 - } // L: 11548 + static int method5901() { + return 12; + } + + @ObfuscatedName("b") + @ObfuscatedSignature( + descriptor = "(Ljv;Ljv;Ljava/lang/String;Ljava/lang/String;B)Lkt;", + garbageValue = "88" + ) + public static Font method5900(AbstractArchive var0, AbstractArchive var1, String var2, String var3) { + int var4 = var0.getGroupId(var2); // L: 121 + int var5 = var0.getFileId(var4, var3); // L: 122 + return AbstractArchive.method5018(var0, var1, var4, var5); // L: 123 + } } diff --git a/runescape-client/src/main/java/AbstractSound.java b/runescape-client/src/main/java/AbstractSound.java index 7facfe0396..a16b107a26 100644 --- a/runescape-client/src/main/java/AbstractSound.java +++ b/runescape-client/src/main/java/AbstractSound.java @@ -2,10 +2,10 @@ import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; -@ObfuscatedName("bj") +@ObfuscatedName("bp") @Implements("AbstractSound") public abstract class AbstractSound extends Node { - @ObfuscatedName("z") + @ObfuscatedName("j") @Export("position") int position; diff --git a/runescape-client/src/main/java/AbstractUserComparator.java b/runescape-client/src/main/java/AbstractUserComparator.java index 9a479c5e80..24d4e1bdf2 100644 --- a/runescape-client/src/main/java/AbstractUserComparator.java +++ b/runescape-client/src/main/java/AbstractUserComparator.java @@ -4,20 +4,20 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("lr") +@ObfuscatedName("ln") @Implements("AbstractUserComparator") public abstract class AbstractUserComparator implements Comparator { - @ObfuscatedName("c") + @ObfuscatedName("n") @Export("nextComparator") Comparator nextComparator; protected AbstractUserComparator() { } // L: 8 - @ObfuscatedName("v") + @ObfuscatedName("d") @ObfuscatedSignature( descriptor = "(Ljava/util/Comparator;I)V", - garbageValue = "-1938939594" + garbageValue = "-82971499" ) @Export("addComparator") final void addComparator(Comparator var1) { @@ -29,10 +29,10 @@ public abstract class AbstractUserComparator implements Comparator { } // L: 17 - @ObfuscatedName("b") + @ObfuscatedName("s") @ObfuscatedSignature( - descriptor = "(Llm;Llm;B)I", - garbageValue = "-41" + descriptor = "(Llx;Llx;B)I", + garbageValue = "0" ) @Export("compareUser") protected final int compareUser(User var1, User var2) { @@ -42,33 +42,4 @@ public abstract class AbstractUserComparator implements Comparator { public boolean equals(Object var1) { return super.equals(var1); // L: 25 } - - @ObfuscatedName("c") - @ObfuscatedSignature( - descriptor = "(III)I", - garbageValue = "-246385012" - ) - static int method5592(int var0, int var1) { - if (var0 == -2) { // L: 37 - return 12345678; - } else if (var0 == -1) { // L: 38 - if (var1 < 0) { // L: 39 - var1 = 0; // L: 40 - } else if (var1 > 127) { // L: 42 - var1 = 127; // L: 43 - } - - var1 = 127 - var1; // L: 45 - return var1; // L: 46 - } else { - var1 = (var0 & 127) * var1 / 128; // L: 48 - if (var1 < 2) { // L: 49 - var1 = 2; - } else if (var1 > 126) { // L: 50 - var1 = 126; - } - - return (var0 & 65408) + var1; // L: 51 - } - } } diff --git a/runescape-client/src/main/java/AbstractWorldMapData.java b/runescape-client/src/main/java/AbstractWorldMapData.java index ebf657e255..911f8f25d6 100644 --- a/runescape-client/src/main/java/AbstractWorldMapData.java +++ b/runescape-client/src/main/java/AbstractWorldMapData.java @@ -5,108 +5,108 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("fw") +@ObfuscatedName("fm") @Implements("AbstractWorldMapData") public abstract class AbstractWorldMapData { - @ObfuscatedName("l") + @ObfuscatedName("p") @ObfuscatedGetter( - intValue = -1996552339 + intValue = -1347091631 ) @Export("regionXLow") int regionXLow; - @ObfuscatedName("z") + @ObfuscatedName("j") @ObfuscatedGetter( - intValue = -2059198725 + intValue = -868813013 ) @Export("regionYLow") int regionYLow; - @ObfuscatedName("t") + @ObfuscatedName("r") @ObfuscatedGetter( - intValue = 2081682071 + intValue = 1253594293 ) @Export("regionX") int regionX; - @ObfuscatedName("v") + @ObfuscatedName("b") @ObfuscatedGetter( - intValue = 1016035147 + intValue = 174092143 ) @Export("regionY") int regionY; - @ObfuscatedName("b") + @ObfuscatedName("d") @ObfuscatedGetter( - intValue = 639511485 + intValue = -1260242687 ) @Export("minPlane") int minPlane; - @ObfuscatedName("q") + @ObfuscatedName("s") @ObfuscatedGetter( - intValue = 441540085 + intValue = -1482547443 ) @Export("planes") int planes; - @ObfuscatedName("i") + @ObfuscatedName("u") @ObfuscatedGetter( - intValue = 1726818165 + intValue = -630921225 ) @Export("groupId") int groupId; - @ObfuscatedName("x") + @ObfuscatedName("l") @ObfuscatedGetter( - intValue = 1111164981 + intValue = -373998791 ) @Export("fileId") int fileId; - @ObfuscatedName("k") + @ObfuscatedName("o") @Export("floorUnderlayIds") short[][][] floorUnderlayIds; - @ObfuscatedName("r") + @ObfuscatedName("c") @Export("floorOverlayIds") short[][][] floorOverlayIds; - @ObfuscatedName("p") - byte[][][] field2063; - @ObfuscatedName("a") - byte[][][] field2064; @ObfuscatedName("e") + byte[][][] field2067; + @ObfuscatedName("g") + byte[][][] field2065; + @ObfuscatedName("a") @ObfuscatedSignature( - descriptor = "[[[[Lfg;" + descriptor = "[[[[Lfh;" ) @Export("decorations") WorldMapDecoration[][][][] decorations; - @ObfuscatedName("d") - boolean field2066; - @ObfuscatedName("u") - boolean field2067; + @ObfuscatedName("k") + boolean field2068; + @ObfuscatedName("m") + boolean field2069; AbstractWorldMapData() { this.groupId = -1; // L: 14 this.fileId = -1; // L: 15 new LinkedList(); - this.field2066 = false; // L: 26 - this.field2067 = false; // L: 27 + this.field2068 = false; // L: 26 + this.field2069 = false; // L: 27 } // L: 29 - @ObfuscatedName("c") + @ObfuscatedName("n") @ObfuscatedSignature( - descriptor = "(Lnk;I)V", - garbageValue = "1915938242" + descriptor = "(Lnd;I)V", + garbageValue = "1223315238" ) @Export("readGeography") abstract void readGeography(Buffer var1); - @ObfuscatedName("y") + @ObfuscatedName("ae") @ObfuscatedSignature( - descriptor = "(I)Z", - garbageValue = "-2052268063" + descriptor = "(B)Z", + garbageValue = "25" ) @Export("isFullyLoaded") boolean isFullyLoaded() { - return this.field2066 && this.field2067; // L: 32 + return this.field2068 && this.field2069; // L: 32 } - @ObfuscatedName("w") + @ObfuscatedName("ap") @ObfuscatedSignature( - descriptor = "(Ljp;B)V", - garbageValue = "56" + descriptor = "(Ljv;I)V", + garbageValue = "-1881595992" ) @Export("loadGeography") void loadGeography(AbstractArchive var1) { @@ -114,53 +114,53 @@ public abstract class AbstractWorldMapData { byte[] var2 = var1.takeFile(this.groupId, this.fileId); // L: 37 if (var2 != null) { // L: 38 this.readGeography(new Buffer(var2)); // L: 39 - this.field2066 = true; // L: 40 - this.field2067 = true; // L: 41 + this.field2068 = true; // L: 40 + this.field2069 = true; // L: 41 } } } // L: 43 - @ObfuscatedName("n") + @ObfuscatedName("ab") @ObfuscatedSignature( - descriptor = "(B)V", - garbageValue = "-39" + descriptor = "(I)V", + garbageValue = "244458309" ) @Export("reset") void reset() { this.floorUnderlayIds = null; // L: 46 this.floorOverlayIds = null; // L: 47 - this.field2063 = null; // L: 48 - this.field2064 = null; // L: 49 + this.field2067 = null; // L: 48 + this.field2065 = null; // L: 49 this.decorations = null; // L: 50 - this.field2066 = false; // L: 51 - this.field2067 = false; // L: 52 + this.field2068 = false; // L: 51 + this.field2069 = false; // L: 52 } // L: 53 - @ObfuscatedName("ag") + @ObfuscatedName("al") @ObfuscatedSignature( - descriptor = "(IILnk;I)V", - garbageValue = "-1976219247" + descriptor = "(IILnd;I)V", + garbageValue = "-570193983" ) @Export("readTile") void readTile(int var1, int var2, Buffer var3) { int var4 = var3.readUnsignedByte(); // L: 56 if (var4 != 0) { // L: 57 if ((var4 & 1) != 0) { // L: 60 - this.method3546(var1, var2, var3, var4); // L: 61 + this.method3602(var1, var2, var3, var4); // L: 61 } else { - this.method3547(var1, var2, var3, var4); // L: 64 + this.method3622(var1, var2, var3, var4); // L: 64 } } } // L: 58 66 - @ObfuscatedName("ae") + @ObfuscatedName("ad") @ObfuscatedSignature( - descriptor = "(IILnk;IB)V", - garbageValue = "13" + descriptor = "(IILnd;II)V", + garbageValue = "-300212411" ) - void method3546(int var1, int var2, Buffer var3, int var4) { + void method3602(int var1, int var2, Buffer var3, int var4) { boolean var5 = (var4 & 2) != 0; // L: 69 if (var5) { // L: 70 this.floorOverlayIds[0][var1][var2] = (short)var3.readUnsignedByte(); // L: 71 @@ -169,12 +169,12 @@ public abstract class AbstractWorldMapData { this.floorUnderlayIds[0][var1][var2] = (short)var3.readUnsignedByte(); // L: 73 } // L: 74 - @ObfuscatedName("ao") + @ObfuscatedName("ai") @ObfuscatedSignature( - descriptor = "(IILnk;II)V", - garbageValue = "158678327" + descriptor = "(IILnd;II)V", + garbageValue = "-2123814102" ) - void method3547(int var1, int var2, Buffer var3, int var4) { + void method3622(int var1, int var2, Buffer var3, int var4) { int var5 = ((var4 & 24) >> 3) + 1; // L: 77 boolean var6 = (var4 & 2) != 0; // L: 78 boolean var7 = (var4 & 4) != 0; // L: 79 @@ -190,8 +190,8 @@ public abstract class AbstractWorldMapData { if (var14 != 0) { // L: 85 this.floorOverlayIds[var9][var1][var2] = (short)var14; // L: 86 var11 = var3.readUnsignedByte(); // L: 87 - this.field2063[var9][var1][var2] = (byte)(var11 >> 2); // L: 88 - this.field2064[var9][var1][var2] = (byte)(var11 & 3); // L: 89 + this.field2067[var9][var1][var2] = (byte)(var11 >> 2); // L: 88 + this.field2065[var9][var1][var2] = (byte)(var11 & 3); // L: 89 } } } @@ -203,7 +203,7 @@ public abstract class AbstractWorldMapData { WorldMapDecoration[] var10 = this.decorations[var8][var1][var2] = new WorldMapDecoration[var9]; // L: 99 for (var11 = 0; var11 < var9; ++var11) { // L: 100 - int var12 = var3.method6464(); // L: 101 + int var12 = var3.method6583(); // L: 101 int var13 = var3.readUnsignedByte(); // L: 102 var10[var11] = new WorldMapDecoration(var12, var13 >> 2, var13 & 3); // L: 103 } @@ -213,100 +213,23 @@ public abstract class AbstractWorldMapData { } // L: 107 - @ObfuscatedName("aj") + @ObfuscatedName("ar") @ObfuscatedSignature( descriptor = "(I)I", - garbageValue = "1248548419" + garbageValue = "-802989109" ) @Export("getRegionX") int getRegionX() { return this.regionX; // L: 112 } - @ObfuscatedName("aw") + @ObfuscatedName("ag") @ObfuscatedSignature( - descriptor = "(I)I", - garbageValue = "1357886281" + descriptor = "(B)I", + garbageValue = "-49" ) @Export("getRegionY") int getRegionY() { return this.regionY; // L: 116 } - - @ObfuscatedName("g") - @ObfuscatedSignature( - descriptor = "(Lnk;IIIIIII)V", - garbageValue = "-186517338" - ) - @Export("loadTerrain") - static final void loadTerrain(Buffer var0, int var1, int var2, int var3, int var4, int var5, int var6) { - int var7; - if (var2 >= 0 && var2 < 104 && var3 >= 0 && var3 < 104) { // L: 119 - Tiles.Tiles_renderFlags[var1][var2][var3] = 0; // L: 120 - - while (true) { - var7 = var0.readUnsignedByte(); // L: 122 - if (var7 == 0) { // L: 123 - if (var1 == 0) { // L: 124 - int[] var14 = Tiles.Tiles_heights[0][var2]; // L: 125 - int var11 = var2 + var4 + 932731; // L: 128 - int var12 = var3 + var5 + 556238; // L: 129 - int var13 = FontName.method6160(var11 + 45365, 91923 + var12, 4) - 128 + (FontName.method6160(var11 + 10294, 37821 + var12, 2) - 128 >> 1) + (FontName.method6160(var11, var12, 1) - 128 >> 2); // L: 131 - var13 = (int)((double)var13 * 0.3D) + 35; // L: 132 - if (var13 < 10) { // L: 133 - var13 = 10; - } else if (var13 > 60) { // L: 134 - var13 = 60; - } - - var14[var3] = -var13 * 8; // L: 137 - } else { - Tiles.Tiles_heights[var1][var2][var3] = Tiles.Tiles_heights[var1 - 1][var2][var3] - 240; // L: 139 - } - break; - } - - if (var7 == 1) { // L: 142 - int var8 = var0.readUnsignedByte(); // L: 143 - if (var8 == 1) { // L: 144 - var8 = 0; - } - - if (var1 == 0) { // L: 145 - Tiles.Tiles_heights[0][var2][var3] = -var8 * 8; - } else { - Tiles.Tiles_heights[var1][var2][var3] = Tiles.Tiles_heights[var1 - 1][var2][var3] - var8 * 8; // L: 146 - } - break; - } - - if (var7 <= 49) { // L: 149 - class9.field71[var1][var2][var3] = var0.readByte(); // L: 150 - Tiles.field1088[var1][var2][var3] = (byte)((var7 - 2) / 4); // L: 151 - Tiles.field1086[var1][var2][var3] = (byte)(var7 - 2 + var6 & 3); // L: 152 - } else if (var7 <= 81) { // L: 155 - Tiles.Tiles_renderFlags[var1][var2][var3] = (byte)(var7 - 49); // L: 156 - } else { - Tiles.field1097[var1][var2][var3] = (byte)(var7 - 81); // L: 159 - } - } - } else { - while (true) { - var7 = var0.readUnsignedByte(); // L: 164 - if (var7 == 0) { // L: 165 - break; - } - - if (var7 == 1) { // L: 166 - var0.readUnsignedByte(); // L: 167 - break; - } - - if (var7 <= 49) { // L: 170 - var0.readUnsignedByte(); - } - } - } - - } // L: 173 } diff --git a/runescape-client/src/main/java/AbstractWorldMapIcon.java b/runescape-client/src/main/java/AbstractWorldMapIcon.java index 4abfb89ecb..401d076cb3 100644 --- a/runescape-client/src/main/java/AbstractWorldMapIcon.java +++ b/runescape-client/src/main/java/AbstractWorldMapIcon.java @@ -4,84 +4,78 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("gw") +@ObfuscatedName("gq") @Implements("AbstractWorldMapIcon") public abstract class AbstractWorldMapIcon { - @ObfuscatedName("bm") + @ObfuscatedName("r") @ObfuscatedSignature( - descriptor = "[Lof;" - ) - @Export("worldSelectStars") - static IndexedSprite[] worldSelectStars; - @ObfuscatedName("t") - @ObfuscatedSignature( - descriptor = "Lia;" + descriptor = "Lii;" ) @Export("coord2") public final Coord coord2; - @ObfuscatedName("v") + @ObfuscatedName("b") @ObfuscatedSignature( - descriptor = "Lia;" + descriptor = "Lii;" ) @Export("coord1") public final Coord coord1; - @ObfuscatedName("b") + @ObfuscatedName("d") @ObfuscatedGetter( - intValue = 1703972791 + intValue = 1619813951 ) @Export("screenX") int screenX; - @ObfuscatedName("q") + @ObfuscatedName("s") @ObfuscatedGetter( - intValue = 278032625 + intValue = 1123629873 ) @Export("screenY") int screenY; @ObfuscatedSignature( - descriptor = "(Lia;Lia;)V" + descriptor = "(Lii;Lii;)V" ) AbstractWorldMapIcon(Coord var1, Coord var2) { this.coord1 = var1; // L: 13 this.coord2 = var2; // L: 14 } // L: 15 - @ObfuscatedName("c") + @ObfuscatedName("n") @ObfuscatedSignature( - descriptor = "(B)I", - garbageValue = "14" + descriptor = "(I)I", + garbageValue = "2145882550" ) @Export("getElement") public abstract int getElement(); - @ObfuscatedName("o") + @ObfuscatedName("f") @ObfuscatedSignature( - descriptor = "(S)Lfl;", - garbageValue = "-7317" + descriptor = "(I)Lfv;", + garbageValue = "39460369" ) @Export("getLabel") abstract WorldMapLabel getLabel(); - @ObfuscatedName("g") + @ObfuscatedName("y") @ObfuscatedSignature( - descriptor = "(B)I", - garbageValue = "-1" + descriptor = "(I)I", + garbageValue = "-1949510660" ) @Export("getSubWidth") abstract int getSubWidth(); - @ObfuscatedName("l") + @ObfuscatedName("p") @ObfuscatedSignature( descriptor = "(B)I", - garbageValue = "1" + garbageValue = "-85" ) @Export("getSubHeight") abstract int getSubHeight(); - @ObfuscatedName("a") + @ObfuscatedName("e") @ObfuscatedSignature( - descriptor = "(III)Z", - garbageValue = "1893915504" + descriptor = "(IIS)Z", + garbageValue = "3474" ) @Export("fitsScreen") boolean fitsScreen(int var1, int var2) { @@ -92,38 +86,38 @@ public abstract class AbstractWorldMapIcon { } } - @ObfuscatedName("e") + @ObfuscatedName("g") @ObfuscatedSignature( descriptor = "(I)Z", - garbageValue = "1578289543" + garbageValue = "-143687139" ) @Export("hasValidElement") boolean hasValidElement() { return this.getElement() >= 0; // L: 33 } - @ObfuscatedName("d") + @ObfuscatedName("a") @ObfuscatedSignature( descriptor = "(III)Z", - garbageValue = "-2139268059" + garbageValue = "561352542" ) @Export("elementFitsScreen") boolean elementFitsScreen(int var1, int var2) { if (!this.hasValidElement()) { // L: 37 return false; } else { - WorldMapElement var3 = WorldMapAreaData.WorldMapElement_get(this.getElement()); // L: 38 + WorldMapElement var3 = class6.WorldMapElement_get(this.getElement()); // L: 38 int var4 = this.getSubWidth(); // L: 39 int var5 = this.getSubHeight(); // L: 40 switch(var3.horizontalAlignment.value) { // L: 41 case 0: - if (var1 > this.screenX - var4 && var1 <= this.screenX) { // L: 54 + if (var1 >= this.screenX - var4 / 2 && var1 <= var4 / 2 + this.screenX) { // L: 54 break; } return false; case 1: - if (var1 < this.screenX - var4 / 2 || var1 > var4 / 2 + this.screenX) { // L: 44 + if (var1 <= this.screenX - var4 || var1 > this.screenX) { // L: 44 return false; } break; @@ -135,13 +129,13 @@ public abstract class AbstractWorldMapIcon { switch(var3.verticalAlignment.value) { // L: 58 case 0: - if (var2 >= this.screenY - var5 / 2 && var2 <= var5 / 2 + this.screenY) { // L: 61 + if (var2 > this.screenY - var5 && var2 <= this.screenY) { // L: 66 break; } return false; case 1: - if (var2 > this.screenY - var5 && var2 <= this.screenY) { // L: 66 + if (var2 >= this.screenY - var5 / 2 && var2 <= var5 / 2 + this.screenY) { // L: 61 break; } @@ -156,738 +150,20 @@ public abstract class AbstractWorldMapIcon { } } - @ObfuscatedName("u") + @ObfuscatedName("k") @ObfuscatedSignature( descriptor = "(III)Z", - garbageValue = "-1722248862" + garbageValue = "280751135" ) @Export("labelFitsScreen") boolean labelFitsScreen(int var1, int var2) { WorldMapLabel var3 = this.getLabel(); // L: 79 if (var3 == null) { // L: 80 return false; // L: 81 - } else if (var1 >= this.screenX - var3.width / 2 && var1 <= var3.width / 2 + this.screenX) { - return var2 >= this.screenY && var2 <= this.screenY + var3.height; + } else if (var1 >= this.screenX - var3.width / 2 && var1 <= var3.width / 2 + this.screenX) { // L: 83 + return var2 >= this.screenY && var2 <= var3.height + this.screenY; // L: 84 } else { - return false; + return false; // L: 85 } } - - @ObfuscatedName("o") - @ObfuscatedSignature( - descriptor = "(Ljava/lang/CharSequence;II[BIB)I", - garbageValue = "-104" - ) - @Export("encodeStringCp1252") - public static int encodeStringCp1252(CharSequence var0, int var1, int var2, byte[] var3, int var4) { - int var5 = var2 - var1; // L: 83 - - for (int var6 = 0; var6 < var5; ++var6) { // L: 84 - char var7 = var0.charAt(var6 + var1); // L: 85 - if (var7 > 0 && var7 < 128 || var7 >= 160 && var7 <= 255) { // L: 86 - var3[var6 + var4] = (byte)var7; - } else if (var7 == 8364) { // L: 87 - var3[var6 + var4] = -128; - } else if (var7 == 8218) { // L: 88 - var3[var6 + var4] = -126; - } else if (var7 == 402) { // L: 89 - var3[var6 + var4] = -125; - } else if (var7 == 8222) { // L: 90 - var3[var6 + var4] = -124; - } else if (var7 == 8230) { // L: 91 - var3[var6 + var4] = -123; - } else if (var7 == 8224) { // L: 92 - var3[var6 + var4] = -122; - } else if (var7 == 8225) { // L: 93 - var3[var6 + var4] = -121; - } else if (var7 == 710) { - var3[var6 + var4] = -120; // L: 94 - } else if (var7 == 8240) { // L: 95 - var3[var6 + var4] = -119; - } else if (var7 == 352) { // L: 96 - var3[var6 + var4] = -118; - } else if (var7 == 8249) { // L: 97 - var3[var6 + var4] = -117; - } else if (var7 == 338) { // L: 98 - var3[var6 + var4] = -116; - } else if (var7 == 381) { // L: 99 - var3[var6 + var4] = -114; - } else if (var7 == 8216) { // L: 100 - var3[var6 + var4] = -111; - } else if (var7 == 8217) { // L: 101 - var3[var6 + var4] = -110; - } else if (var7 == 8220) { // L: 102 - var3[var6 + var4] = -109; - } else if (var7 == 8221) { // L: 103 - var3[var6 + var4] = -108; - } else if (var7 == 8226) { // L: 104 - var3[var6 + var4] = -107; - } else if (var7 == 8211) { - var3[var6 + var4] = -106; // L: 105 - } else if (var7 == 8212) { // L: 106 - var3[var6 + var4] = -105; - } else if (var7 == 732) { // L: 107 - var3[var6 + var4] = -104; - } else if (var7 == 8482) { // L: 108 - var3[var6 + var4] = -103; - } else if (var7 == 353) { // L: 109 - var3[var6 + var4] = -102; - } else if (var7 == 8250) { // L: 110 - var3[var6 + var4] = -101; - } else if (var7 == 339) { // L: 111 - var3[var6 + var4] = -100; - } else if (var7 == 382) { // L: 112 - var3[var6 + var4] = -98; - } else if (var7 == 376) { // L: 113 - var3[var6 + var4] = -97; - } else { - var3[var6 + var4] = 63; // L: 114 - } - } - - return var5; // L: 116 - } - - @ObfuscatedName("hn") - @ObfuscatedSignature( - descriptor = "(Lcj;IIIIIB)V", - 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()) { // L: 4842 - if (var0 instanceof NPC) { // L: 4843 - NPCComposition var6 = ((NPC)var0).definition; // L: 4844 - if (var6.transforms != null) { // L: 4845 - var6 = var6.transform(); - } - - if (var6 == null) { // L: 4846 - return; - } - } - - int var75 = Players.Players_count; // L: 4848 - int[] var7 = Players.Players_indices; // L: 4849 - byte var8 = 0; // L: 4850 - Player var10; - if (var1 < var75 && var0.playerCycle == Client.cycle) { // L: 4851 - var10 = (Player)var0; // L: 4853 - boolean var9; - if (Client.drawPlayerNames == 0) { // L: 4855 - var9 = false; // L: 4856 - } else if (var10 == class35.localPlayer) { // L: 4859 - boolean var11 = (Client.drawPlayerNames & 8) != 0; // L: 4865 - var9 = var11; // L: 4867 - } else { - var9 = Canvas.method469() || FloorDecoration.method3799() && var10.isFriend() || class14.method223() && var10.isClanMember(); // L: 4860 - } - - if (var9) { // L: 4870 - Player var76 = (Player)var0; // L: 4871 - if (var1 < var75) { // L: 4872 - GrandExchangeOfferTotalQuantityComparator.method4972(var0, var0.defaultHeight + 15); // L: 4873 - AbstractFont var12 = (AbstractFont)Client.fontsMap.get(FontName.FontName_plain12); // L: 4874 - byte var13 = 9; // L: 4875 - var12.drawCentered(var76.username.getName(), var2 + Client.viewportTempX, var3 + Client.viewportTempY - var13, 16777215, 0); // L: 4876 - var8 = 18; // L: 4877 - } - } - } - - int var89 = -2; // L: 4881 - int var16; - int var22; - int var23; - int var80; - if (!var0.healthBars.method5149()) { // L: 4882 - GrandExchangeOfferTotalQuantityComparator.method4972(var0, var0.defaultHeight + 15); // L: 4883 - - for (HealthBar var90 = (HealthBar)var0.healthBars.last(); var90 != null; var90 = (HealthBar)var0.healthBars.previous()) { // L: 4884 - HealthBarUpdate var98 = var90.get(Client.cycle); // L: 4885 - if (var98 == null) { // L: 4886 - if (var90.isEmpty()) { // L: 4944 - var90.remove(); - } - } else { - HealthBarDefinition var93 = var90.definition; // L: 4887 - SpritePixels var79 = var93.getBackSprite(); // L: 4888 - SpritePixels var83 = var93.getFrontSprite(); // L: 4889 - var16 = 0; // L: 4891 - if (var79 != null && var83 != null) { // L: 4892 - if (var93.widthPadding * 2 < var83.subWidth) { // L: 4893 - var16 = var93.widthPadding; - } - - var80 = var83.subWidth - var16 * 2; // L: 4894 - } else { - var80 = var93.width; // L: 4896 - } - - int var84 = 255; // L: 4897 - boolean var85 = true; // L: 4898 - int var86 = Client.cycle - var98.cycle; // L: 4899 - int var87 = var80 * var98.health2 / var93.width; // L: 4900 - int var88; - int var100; - if (var98.cycleOffset > var86) { // L: 4901 - var88 = var93.field1593 == 0 ? 0 : var93.field1593 * (var86 / var93.field1593); // L: 4902 - var22 = var80 * var98.health / var93.width; // L: 4903 - var100 = var88 * (var87 - var22) / var98.cycleOffset + var22; // L: 4904 - } else { - var100 = var87; // L: 4907 - var88 = var98.cycleOffset + var93.int5 - var86; // L: 4908 - if (var93.int3 >= 0) { // L: 4909 - var84 = (var88 << 8) / (var93.int5 - var93.int3); - } - } - - if (var98.health2 > 0 && var100 < 1) { // L: 4911 - var100 = 1; - } - - if (var79 != null && var83 != null) { // L: 4912 - if (var100 == var80) { // L: 4913 - var100 += var16 * 2; - } else { - var100 += var16; // L: 4914 - } - - var88 = var79.subHeight; // L: 4915 - var89 += var88; // L: 4916 - var22 = var2 + Client.viewportTempX - (var80 >> 1); // L: 4917 - var23 = var3 + Client.viewportTempY - var89; // L: 4918 - var22 -= var16; // L: 4919 - if (var84 >= 0 && var84 < 255) { // L: 4920 - var79.drawTransAt(var22, var23, var84); // L: 4921 - Rasterizer2D.Rasterizer2D_expandClip(var22, var23, var100 + var22, var88 + var23); // L: 4922 - var83.drawTransAt(var22, var23, var84); // L: 4923 - } else { - var79.drawTransBgAt(var22, var23); // L: 4926 - Rasterizer2D.Rasterizer2D_expandClip(var22, var23, var22 + var100, var23 + var88); // L: 4927 - var83.drawTransBgAt(var22, var23); // L: 4928 - } - - Rasterizer2D.Rasterizer2D_setClip(var2, var3, var2 + var4, var3 + var5); // L: 4930 - var89 += 2; // L: 4931 - } else { - var89 += 5; // L: 4934 - if (Client.viewportTempX > -1) { // L: 4935 - var88 = var2 + Client.viewportTempX - (var80 >> 1); // L: 4936 - var22 = var3 + Client.viewportTempY - var89; // L: 4937 - Rasterizer2D.Rasterizer2D_fillRectangle(var88, var22, var100, 5, 65280); // L: 4938 - Rasterizer2D.Rasterizer2D_fillRectangle(var100 + var88, var22, var80 - var100, 5, 16711680); // L: 4939 - } - - var89 += 2; // L: 4941 - } - } - } - } - - if (var89 == -2) { // L: 4947 - var89 += 7; - } - - var89 += var8; // L: 4948 - if (var1 < var75) { // L: 4949 - var10 = (Player)var0; // L: 4950 - if (var10.isHidden) { // L: 4951 - return; - } - - if (var10.headIconPk != -1 || var10.headIconPrayer != -1) { // L: 4952 - GrandExchangeOfferTotalQuantityComparator.method4972(var0, var0.defaultHeight + 15); // L: 4953 - if (Client.viewportTempX > -1) { // L: 4954 - if (var10.headIconPk != -1) { // L: 4955 - var89 += 25; // L: 4956 - class14.headIconPkSprites[var10.headIconPk].drawTransBgAt(var2 + Client.viewportTempX - 12, var3 + Client.viewportTempY - var89); // L: 4957 - } - - if (var10.headIconPrayer != -1) { // L: 4959 - var89 += 25; // L: 4960 - Varcs.headIconPrayerSprites[var10.headIconPrayer].drawTransBgAt(var2 + Client.viewportTempX - 12, var3 + Client.viewportTempY - var89); // L: 4961 - } - } - } - - if (var1 >= 0 && Client.hintArrowType == 10 && var7[var1] == Client.hintArrowPlayerIndex) { // L: 4965 - GrandExchangeOfferTotalQuantityComparator.method4972(var0, var0.defaultHeight + 15); // L: 4966 - if (Client.viewportTempX > -1) { // L: 4967 - var89 += class375.headIconHintSprites[1].subHeight; // L: 4968 - class375.headIconHintSprites[1].drawTransBgAt(var2 + Client.viewportTempX - 12, var3 + Client.viewportTempY - var89); // L: 4969 - } - } - } else { - NPCComposition var91 = ((NPC)var0).definition; // L: 4974 - if (var91.transforms != null) { // L: 4975 - var91 = var91.transform(); - } - - if (var91.headIconPrayer >= 0 && var91.headIconPrayer < Varcs.headIconPrayerSprites.length) { // L: 4976 - GrandExchangeOfferTotalQuantityComparator.method4972(var0, var0.defaultHeight + 15); // L: 4977 - if (Client.viewportTempX > -1) { // L: 4978 - Varcs.headIconPrayerSprites[var91.headIconPrayer].drawTransBgAt(var2 + Client.viewportTempX - 12, var3 + Client.viewportTempY - 30); // L: 4979 - } - } - - if (Client.hintArrowType == 1 && Client.npcIndices[var1 - var75] == Client.hintArrowNpcIndex && Client.cycle % 20 < 10) { // L: 4982 - GrandExchangeOfferTotalQuantityComparator.method4972(var0, var0.defaultHeight + 15); // L: 4983 - if (Client.viewportTempX > -1) { // L: 4984 - class375.headIconHintSprites[0].drawTransBgAt(var2 + Client.viewportTempX - 12, var3 + Client.viewportTempY - 28); - } - } - } - - if (var0.overheadText != null && (var1 >= var75 || !var0.field1223 && (Client.publicChatMode == 4 || !var0.isAutoChatting && (Client.publicChatMode == 0 || Client.publicChatMode == 3 || Client.publicChatMode == 1 && ((Player)var0).isFriend())))) { // L: 4987 4988 - GrandExchangeOfferTotalQuantityComparator.method4972(var0, var0.defaultHeight); // L: 4989 - if (Client.viewportTempX > -1 && Client.overheadTextCount < Client.overheadTextLimit) { // L: 4990 - Client.overheadTextXOffsets[Client.overheadTextCount] = WorldMapArea.fontBold12.stringWidth(var0.overheadText) / 2; // L: 4991 - Client.overheadTextAscents[Client.overheadTextCount] = WorldMapArea.fontBold12.ascent; // L: 4992 - Client.overheadTextXs[Client.overheadTextCount] = Client.viewportTempX; // L: 4993 - Client.overheadTextYs[Client.overheadTextCount] = Client.viewportTempY; // L: 4994 - Client.overheadTextColors[Client.overheadTextCount] = var0.overheadTextColor; // L: 4995 - Client.overheadTextEffects[Client.overheadTextCount] = var0.overheadTextEffect; // L: 4996 - Client.overheadTextCyclesRemaining[Client.overheadTextCount] = var0.overheadTextCyclesRemaining; // L: 4997 - Client.overheadText[Client.overheadTextCount] = var0.overheadText; // L: 4998 - ++Client.overheadTextCount; // L: 4999 - } - } - - for (int var77 = 0; var77 < 4; ++var77) { // L: 5003 - int var92 = var0.hitSplatCycles[var77]; // L: 5004 - int var78 = var0.hitSplatTypes[var77]; // L: 5005 - HitSplatDefinition var99 = null; // L: 5006 - int var14 = 0; // L: 5007 - HitSplatDefinition var17; - if (var78 >= 0) { // L: 5008 - if (var92 <= Client.cycle) { // L: 5009 - continue; - } - - var16 = var0.hitSplatTypes[var77]; // L: 5011 - var17 = (HitSplatDefinition)HitSplatDefinition.HitSplatDefinition_cached.get((long)var16); // L: 5013 - HitSplatDefinition var15; - if (var17 != null) { // L: 5014 - var15 = var17; // L: 5015 - } else { - byte[] var18 = HitSplatDefinition.HitSplatDefinition_archive.takeFile(32, var16); // L: 5018 - var17 = new HitSplatDefinition(); // L: 5019 - if (var18 != null) { // L: 5020 - var17.decode(new Buffer(var18)); - } - - HitSplatDefinition.HitSplatDefinition_cached.put(var17, (long)var16); // L: 5021 - var15 = var17; // L: 5022 - } - - var99 = var15; // L: 5024 - var14 = var15.field1735; // L: 5025 - if (var15 != null && var15.transforms != null) { // L: 5026 - var99 = var15.transform(); // L: 5027 - if (var99 == null) { // L: 5028 - var0.hitSplatCycles[var77] = -1; // L: 5029 - continue; // L: 5030 - } - } - } else if (var92 < 0) { // L: 5034 - continue; - } - - var80 = var0.hitSplatTypes2[var77]; // L: 5035 - HitSplatDefinition var81 = null; // L: 5036 - HitSplatDefinition var94; - if (var80 >= 0) { // L: 5037 - var94 = (HitSplatDefinition)HitSplatDefinition.HitSplatDefinition_cached.get((long)var80); // L: 5040 - if (var94 != null) { // L: 5041 - var17 = var94; // L: 5042 - } else { - byte[] var19 = HitSplatDefinition.HitSplatDefinition_archive.takeFile(32, var80); // L: 5045 - var94 = new HitSplatDefinition(); // L: 5046 - if (var19 != null) { // L: 5047 - var94.decode(new Buffer(var19)); - } - - HitSplatDefinition.HitSplatDefinition_cached.put(var94, (long)var80); // L: 5048 - var17 = var94; // L: 5049 - } - - var81 = var17; // L: 5051 - if (var17 != null && var17.transforms != null) { // L: 5052 - var81 = var17.transform(); - } - } - - if (var92 - var14 <= Client.cycle) { // L: 5054 - if (var99 == null) { // L: 5055 - var0.hitSplatCycles[var77] = -1; // L: 5056 - } else { - GrandExchangeOfferTotalQuantityComparator.method4972(var0, var0.defaultHeight / 2); // L: 5059 - if (Client.viewportTempX > -1) { // L: 5060 - if (var77 == 1) { // L: 5062 - Client.viewportTempY -= 20; // L: 5063 - } - - if (var77 == 2) { // L: 5065 - Client.viewportTempX -= 15; // L: 5066 - Client.viewportTempY -= 10; // L: 5067 - } - - if (var77 == 3) { // L: 5069 - Client.viewportTempX += 15; // L: 5070 - Client.viewportTempY -= 10; // L: 5071 - } - - var94 = null; // L: 5073 - SpritePixels var95 = null; // L: 5074 - SpritePixels var20 = null; // L: 5075 - SpritePixels var21 = null; // L: 5076 - var22 = 0; // L: 5077 - var23 = 0; // L: 5078 - int var24 = 0; // L: 5079 - int var25 = 0; // L: 5080 - int var26 = 0; // L: 5081 - int var27 = 0; // L: 5082 - int var28 = 0; // L: 5083 - int var29 = 0; // L: 5084 - SpritePixels var30 = null; // L: 5085 - SpritePixels var31 = null; // L: 5086 - SpritePixels var32 = null; // L: 5087 - SpritePixels var33 = null; // L: 5088 - int var34 = 0; // L: 5089 - int var35 = 0; // L: 5090 - int var36 = 0; // L: 5091 - int var37 = 0; // L: 5092 - int var38 = 0; // L: 5093 - int var39 = 0; // L: 5094 - int var40 = 0; // L: 5095 - int var41 = 0; // L: 5096 - int var42 = 0; // L: 5097 - SpritePixels var96 = var99.method2890(); // L: 5098 - int var43; - if (var96 != null) { // L: 5099 - var22 = var96.subWidth; // L: 5100 - var43 = var96.subHeight; // L: 5101 - if (var43 > var42) { // L: 5102 - var42 = var43; - } - - var26 = var96.xOffset; // L: 5103 - } - - var95 = var99.method2893(); // L: 5105 - if (var95 != null) { // L: 5106 - var23 = var95.subWidth; // L: 5107 - var43 = var95.subHeight; // L: 5108 - if (var43 > var42) { // L: 5109 - var42 = var43; - } - - var27 = var95.xOffset; // L: 5110 - } - - var20 = var99.method2871(); // L: 5112 - if (var20 != null) { // L: 5113 - var24 = var20.subWidth; // L: 5114 - var43 = var20.subHeight; // L: 5115 - if (var43 > var42) { // L: 5116 - var42 = var43; - } - - var28 = var20.xOffset; // L: 5117 - } - - var21 = var99.method2872(); // L: 5119 - if (var21 != null) { // L: 5120 - var25 = var21.subWidth; // L: 5121 - var43 = var21.subHeight; // L: 5122 - if (var43 > var42) { // L: 5123 - var42 = var43; - } - - var29 = var21.xOffset; // L: 5124 - } - - if (var81 != null) { // L: 5126 - var30 = var81.method2890(); // L: 5127 - if (var30 != null) { // L: 5128 - var34 = var30.subWidth; // L: 5129 - var43 = var30.subHeight; // L: 5130 - if (var43 > var42) { // L: 5131 - var42 = var43; - } - - var38 = var30.xOffset; // L: 5132 - } - - var31 = var81.method2893(); // L: 5134 - if (var31 != null) { // L: 5135 - var35 = var31.subWidth; // L: 5136 - var43 = var31.subHeight; // L: 5137 - if (var43 > var42) { // L: 5138 - var42 = var43; - } - - var39 = var31.xOffset; // L: 5139 - } - - var32 = var81.method2871(); // L: 5141 - if (var32 != null) { // L: 5142 - var36 = var32.subWidth; // L: 5143 - var43 = var32.subHeight; // L: 5144 - if (var43 > var42) { // L: 5145 - var42 = var43; - } - - var40 = var32.xOffset; // L: 5146 - } - - var33 = var81.method2872(); // L: 5148 - if (var33 != null) { // L: 5149 - var37 = var33.subWidth; // L: 5150 - var43 = var33.subHeight; // L: 5151 - if (var43 > var42) { // L: 5152 - var42 = var43; - } - - var41 = var33.xOffset; // L: 5153 - } - } - - Font var82 = var99.getFont(); // L: 5158 - if (var82 == null) { // L: 5159 - var82 = class11.fontPlain11; - } - - Font var44; - if (var81 != null) { // L: 5160 - var44 = var81.getFont(); // L: 5161 - if (var44 == null) { // L: 5162 - var44 = class11.fontPlain11; - } - } else { - var44 = class11.fontPlain11; // L: 5164 - } - - String var45 = null; // L: 5165 - String var46 = null; // L: 5166 - boolean var47 = false; // L: 5167 - int var48 = 0; // L: 5168 - var45 = var99.getString(var0.hitSplatValues[var77]); // L: 5169 - int var97 = var82.stringWidth(var45); // L: 5170 - if (var81 != null) { // L: 5171 - var46 = var81.getString(var0.hitSplatValues2[var77]); // L: 5172 - var48 = var44.stringWidth(var46); // L: 5173 - } - - int var49 = 0; // L: 5175 - int var50 = 0; // L: 5176 - if (var23 > 0) { // L: 5177 - if (var20 == null && var21 == null) { // L: 5178 - var49 = 1; // L: 5179 - } else { - var49 = var97 / var23 + 1; - } - } - - if (var81 != null && var35 > 0) { // L: 5181 5182 - if (var32 == null && var33 == null) { // L: 5183 - var50 = 1; // L: 5184 - } else { - var50 = var48 / var35 + 1; - } - } - - int var51 = 0; // L: 5187 - int var52 = var51; // L: 5188 - if (var22 > 0) { // L: 5189 - var51 += var22; - } - - var51 += 2; // L: 5190 - int var53 = var51; // L: 5191 - if (var24 > 0) { // L: 5192 - var51 += var24; - } - - int var54 = var51; // L: 5193 - int var55 = var51; // L: 5194 - int var56; - if (var23 > 0) { // L: 5195 - var56 = var49 * var23; // L: 5196 - var51 += var56; // L: 5197 - var55 += (var56 - var97) / 2; // L: 5198 - } else { - var51 += var97; // L: 5201 - } - - var56 = var51; // L: 5203 - if (var25 > 0) { // L: 5204 - var51 += var25; - } - - int var57 = 0; // L: 5205 - int var58 = 0; // L: 5206 - int var59 = 0; // L: 5207 - int var60 = 0; // L: 5208 - int var61 = 0; // L: 5209 - int var62; - if (var81 != null) { // L: 5210 - var51 += 2; // L: 5211 - var57 = var51; // L: 5212 - if (var34 > 0) { // L: 5213 - var51 += var34; - } - - var51 += 2; // L: 5214 - var58 = var51; // L: 5215 - if (var36 > 0) { // L: 5216 - var51 += var36; - } - - var59 = var51; // L: 5217 - var61 = var51; // L: 5218 - if (var35 > 0) { // L: 5219 - var62 = var35 * var50; // L: 5220 - var51 += var62; // L: 5221 - var61 += (var62 - var48) / 2; // L: 5222 - } else { - var51 += var48; // L: 5225 - } - - var60 = var51; // L: 5227 - if (var37 > 0) { // L: 5228 - var51 += var37; - } - } - - var62 = var0.hitSplatCycles[var77] - Client.cycle; // L: 5230 - int var63 = var99.field1748 - var62 * var99.field1748 / var99.field1735; // L: 5231 - int var64 = var62 * var99.field1749 / var99.field1735 + -var99.field1749; // L: 5232 - int var65 = var63 + (var2 + Client.viewportTempX - (var51 >> 1)); // L: 5233 - int var66 = var64 + (var3 + Client.viewportTempY - 12); // L: 5234 - int var67 = var66; // L: 5235 - int var68 = var42 + var66; // L: 5236 - int var69 = var66 + var99.field1753 + 15; // L: 5237 - int var70 = var69 - var82.maxAscent; // L: 5238 - int var71 = var69 + var82.maxDescent; // L: 5239 - if (var70 < var66) { // L: 5240 - var67 = var70; - } - - if (var71 > var68) { // L: 5241 - var68 = var71; - } - - int var72 = 0; // L: 5242 - int var73; - int var74; - if (var81 != null) { // L: 5243 - var72 = var66 + var81.field1753 + 15; // L: 5244 - var73 = var72 - var44.maxAscent; // L: 5245 - var74 = var72 + var44.maxDescent; // L: 5246 - if (var73 < var67) { // L: 5247 - ; - } - - if (var74 > var68) { // L: 5248 - ; - } - } - - var73 = 255; // L: 5250 - if (var99.field1743 >= 0) { // L: 5251 - var73 = (var62 << 8) / (var99.field1735 - var99.field1743); - } - - if (var73 >= 0 && var73 < 255) { // L: 5252 - if (var96 != null) { // L: 5253 - var96.drawTransAt(var52 + var65 - var26, var66, var73); - } - - if (var20 != null) { // L: 5254 - var20.drawTransAt(var65 + var53 - var28, var66, var73); - } - - if (var95 != null) { // L: 5255 - for (var74 = 0; var74 < var49; ++var74) { // L: 5256 - var95.drawTransAt(var74 * var23 + (var54 + var65 - var27), var66, var73); // L: 5257 - } - } - - if (var21 != null) { // L: 5260 - var21.drawTransAt(var65 + var56 - var29, var66, var73); - } - - var82.drawAlpha(var45, var55 + var65, var69, var99.textColor, 0, var73); // L: 5261 - if (var81 != null) { // L: 5262 - if (var30 != null) { // L: 5263 - var30.drawTransAt(var65 + var57 - var38, var66, var73); - } - - if (var32 != null) { // L: 5264 - var32.drawTransAt(var58 + var65 - var40, var66, var73); - } - - if (var31 != null) { // L: 5265 - for (var74 = 0; var74 < var50; ++var74) { // L: 5266 - var31.drawTransAt(var74 * var35 + (var65 + var59 - var39), var66, var73); // L: 5267 - } - } - - if (var33 != null) { // L: 5270 - var33.drawTransAt(var65 + var60 - var41, var66, var73); - } - - var44.drawAlpha(var46, var61 + var65, var72, var81.textColor, 0, var73); // L: 5271 - } - } else { - if (var96 != null) { // L: 5275 - var96.drawTransBgAt(var52 + var65 - var26, var66); - } - - if (var20 != null) { // L: 5276 - var20.drawTransBgAt(var65 + var53 - var28, var66); - } - - if (var95 != null) { // L: 5277 - for (var74 = 0; var74 < var49; ++var74) { // L: 5278 - var95.drawTransBgAt(var74 * var23 + (var54 + var65 - var27), var66); // L: 5279 - } - } - - if (var21 != null) { // L: 5282 - var21.drawTransBgAt(var56 + var65 - var29, var66); - } - - var82.draw(var45, var55 + var65, var69, var99.textColor | -16777216, 0); // L: 5283 - if (var81 != null) { // L: 5284 - if (var30 != null) { // L: 5285 - var30.drawTransBgAt(var57 + var65 - var38, var66); - } - - if (var32 != null) { // L: 5286 - var32.drawTransBgAt(var58 + var65 - var40, var66); - } - - if (var31 != null) { // L: 5287 - for (var74 = 0; var74 < var50; ++var74) { // L: 5288 - var31.drawTransBgAt(var35 * var74 + (var65 + var59 - var39), var66); // L: 5289 - } - } - - if (var33 != null) { // L: 5292 - var33.drawTransBgAt(var60 + var65 - var41, var66); - } - - var44.draw(var46, var61 + var65, var72, var81.textColor | -16777216, 0); // L: 5293 - } - } - } - } - } - } - - } - } // L: 5298 } diff --git a/runescape-client/src/main/java/AccessFile.java b/runescape-client/src/main/java/AccessFile.java index a3e111013f..5dde8f0183 100644 --- a/runescape-client/src/main/java/AccessFile.java +++ b/runescape-client/src/main/java/AccessFile.java @@ -9,33 +9,27 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ng") +@ObfuscatedName("nm") @Implements("AccessFile") public final class AccessFile { @ObfuscatedName("v") - @Export("SpriteBuffer_spritePalette") - public static int[] SpriteBuffer_spritePalette; - @ObfuscatedName("s") - @Export("userHomeDirectory") - static String userHomeDirectory; - @ObfuscatedName("h") @Export("file") RandomAccessFile file; - @ObfuscatedName("c") + @ObfuscatedName("n") @ObfuscatedGetter( - longValue = -6951669664321612267L + longValue = 5188253846465837923L ) @Export("maxSize") final long maxSize; - @ObfuscatedName("o") + @ObfuscatedName("f") @ObfuscatedGetter( - longValue = 976098540501799607L + longValue = 8167831269062289551L ) @Export("offset") long offset; public AccessFile(File var1, String var2, long var3) throws IOException { - if (-1L == var3) { // L: 11 + if (var3 == -1L) { // L: 11 var3 = Long.MAX_VALUE; } @@ -55,17 +49,17 @@ public final class AccessFile { this.file.seek(0L); // L: 23 } // L: 24 - @ObfuscatedName("h") + @ObfuscatedName("v") @Export("seek") final void seek(long var1) throws IOException { this.file.seek(var1); // L: 27 this.offset = var1; // L: 28 } // L: 29 - @ObfuscatedName("c") + @ObfuscatedName("n") @ObfuscatedSignature( - descriptor = "([BIII)V", - garbageValue = "-1544506184" + descriptor = "([BIIB)V", + garbageValue = "29" ) @Export("write") public final void write(byte[] var1, int var2, int var3) throws IOException { @@ -79,20 +73,20 @@ public final class AccessFile { } } // L: 39 - @ObfuscatedName("o") + @ObfuscatedName("f") @ObfuscatedSignature( - descriptor = "(B)V", - garbageValue = "68" + descriptor = "(I)V", + garbageValue = "-520775983" ) @Export("close") public final void close() throws IOException { this.closeSync(false); // L: 42 } // L: 43 - @ObfuscatedName("g") + @ObfuscatedName("y") @ObfuscatedSignature( - descriptor = "(ZS)V", - garbageValue = "295" + descriptor = "(ZI)V", + garbageValue = "-891531898" ) @Export("closeSync") public final void closeSync(boolean var1) throws IOException { @@ -110,20 +104,20 @@ public final class AccessFile { } // L: 56 - @ObfuscatedName("l") + @ObfuscatedName("p") @ObfuscatedSignature( descriptor = "(I)J", - garbageValue = "-1034631213" + garbageValue = "1700064140" ) @Export("length") public final long length() throws IOException { return this.file.length(); // L: 59 } - @ObfuscatedName("z") + @ObfuscatedName("j") @ObfuscatedSignature( descriptor = "([BIIB)I", - garbageValue = "45" + garbageValue = "-59" ) @Export("read") public final int read(byte[] var1, int var2, int var3) throws IOException { diff --git a/runescape-client/src/main/java/Actor.java b/runescape-client/src/main/java/Actor.java index 8c74cde9fb..9aa022f098 100644 --- a/runescape-client/src/main/java/Actor.java +++ b/runescape-client/src/main/java/Actor.java @@ -4,118 +4,124 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("cj") +@ObfuscatedName("cy") @Implements("Actor") public abstract class Actor extends Renderable { - @ObfuscatedName("ea") + @ObfuscatedName("fh") @ObfuscatedSignature( - descriptor = "Lji;" + descriptor = "Lkt;" ) - @Export("archive17") - static Archive archive17; - @ObfuscatedName("aw") + @Export("fontPlain11") + static Font fontPlain11; + @ObfuscatedName("nr") @ObfuscatedGetter( - intValue = -60079109 + intValue = -371192105 + ) + @Export("widgetDragDuration") + static int widgetDragDuration; + @ObfuscatedName("ad") + @ObfuscatedGetter( + intValue = -130212619 ) @Export("x") int x; - @ObfuscatedName("at") + @ObfuscatedName("ai") @ObfuscatedGetter( - intValue = -1766175129 + intValue = 1248597615 ) @Export("y") int y; - @ObfuscatedName("av") + @ObfuscatedName("ar") @ObfuscatedGetter( - intValue = 309307455 + intValue = -1073291133 ) @Export("rotation") int rotation; - @ObfuscatedName("al") + @ObfuscatedName("ag") @Export("isWalking") boolean isWalking; - @ObfuscatedName("ap") + @ObfuscatedName("ax") @ObfuscatedGetter( - intValue = -508330989 + intValue = 1868694145 ) - int field1211; - @ObfuscatedName("am") + int field1239; + @ObfuscatedName("as") @ObfuscatedGetter( - intValue = -1856466777 + intValue = -1698768263 ) @Export("playerCycle") int playerCycle; - @ObfuscatedName("ax") + @ObfuscatedName("aj") @ObfuscatedGetter( - intValue = 1523832987 + intValue = -932232515 ) @Export("idleSequence") int idleSequence; - @ObfuscatedName("ak") + @ObfuscatedName("am") @ObfuscatedGetter( - intValue = -1651347451 + intValue = 2010968993 ) @Export("turnLeftSequence") int turnLeftSequence; - @ObfuscatedName("ay") + @ObfuscatedName("az") @ObfuscatedGetter( - intValue = -894700151 + intValue = -144191447 ) @Export("turnRightSequence") int turnRightSequence; - @ObfuscatedName("ai") + @ObfuscatedName("av") @ObfuscatedGetter( - intValue = -644124853 + intValue = -152072953 ) @Export("walkSequence") int walkSequence; - @ObfuscatedName("aa") + @ObfuscatedName("ac") @ObfuscatedGetter( - intValue = -260839917 + intValue = -1808202573 ) @Export("walkBackSequence") int walkBackSequence; - @ObfuscatedName("au") + @ObfuscatedName("at") @ObfuscatedGetter( - intValue = -1673254867 + intValue = 1341114765 ) @Export("walkLeftSequence") int walkLeftSequence; - @ObfuscatedName("as") + @ObfuscatedName("ah") @ObfuscatedGetter( - intValue = -1777299595 + intValue = -1993879825 ) @Export("walkRightSequence") int walkRightSequence; - @ObfuscatedName("ad") + @ObfuscatedName("ao") @ObfuscatedGetter( - intValue = 258726619 + intValue = -1401897961 ) @Export("runSequence") int runSequence; - @ObfuscatedName("ac") + @ObfuscatedName("aq") @Export("overheadText") String overheadText; - @ObfuscatedName("az") + @ObfuscatedName("aw") @Export("isAutoChatting") boolean isAutoChatting; - @ObfuscatedName("aq") - boolean field1223; - @ObfuscatedName("ab") + @ObfuscatedName("af") + boolean field1248; + @ObfuscatedName("ak") @ObfuscatedGetter( - intValue = 441130155 + intValue = -1654949393 ) @Export("overheadTextCyclesRemaining") int overheadTextCyclesRemaining; - @ObfuscatedName("ar") + @ObfuscatedName("ay") @ObfuscatedGetter( - intValue = -506528051 + intValue = -275691641 ) @Export("overheadTextColor") int overheadTextColor; - @ObfuscatedName("ah") + @ObfuscatedName("aa") @ObfuscatedGetter( - intValue = -1268134939 + intValue = 1592365515 ) @Export("overheadTextEffect") int overheadTextEffect; @@ -125,205 +131,205 @@ public abstract class Actor extends Renderable { @ObfuscatedName("bd") @Export("hitSplatTypes") int[] hitSplatTypes; - @ObfuscatedName("bw") + @ObfuscatedName("bt") @Export("hitSplatValues") int[] hitSplatValues; - @ObfuscatedName("bf") + @ObfuscatedName("bq") @Export("hitSplatCycles") int[] hitSplatCycles; @ObfuscatedName("bu") @Export("hitSplatTypes2") int[] hitSplatTypes2; - @ObfuscatedName("bb") + @ObfuscatedName("bl") @Export("hitSplatValues2") int[] hitSplatValues2; - @ObfuscatedName("bk") + @ObfuscatedName("bv") @ObfuscatedSignature( - descriptor = "Lko;" + descriptor = "Lki;" ) @Export("healthBars") IterableNodeDeque healthBars; - @ObfuscatedName("bt") + @ObfuscatedName("bm") @ObfuscatedGetter( - intValue = -2001939337 + intValue = 637535539 ) @Export("targetIndex") int targetIndex; - @ObfuscatedName("by") + @ObfuscatedName("bz") @Export("false0") boolean false0; - @ObfuscatedName("bz") + @ObfuscatedName("bh") @ObfuscatedGetter( - intValue = 713159597 + intValue = 800070667 ) - int field1247; - @ObfuscatedName("br") + int field1264; + @ObfuscatedName("bs") @ObfuscatedGetter( - intValue = 1142077753 + intValue = -330797761 ) @Export("movementSequence") int movementSequence; - @ObfuscatedName("bm") + @ObfuscatedName("br") @ObfuscatedGetter( - intValue = 1571862761 + intValue = 1832573289 ) @Export("movementFrame") int movementFrame; - @ObfuscatedName("bn") + @ObfuscatedName("bf") @ObfuscatedGetter( - intValue = 894074389 + intValue = 572579455 ) @Export("movementFrameCycle") int movementFrameCycle; @ObfuscatedName("ba") @ObfuscatedGetter( - intValue = -128111571 + intValue = -1762760413 ) @Export("sequence") int sequence; - @ObfuscatedName("bg") + @ObfuscatedName("be") @ObfuscatedGetter( - intValue = -1558553463 + intValue = 2078717111 ) @Export("sequenceFrame") int sequenceFrame; - @ObfuscatedName("bi") + @ObfuscatedName("bj") @ObfuscatedGetter( - intValue = 1657374705 + intValue = 643131463 ) @Export("sequenceFrameCycle") int sequenceFrameCycle; - @ObfuscatedName("bp") + @ObfuscatedName("bx") @ObfuscatedGetter( - intValue = -1057732107 + intValue = -1848146093 ) @Export("sequenceDelay") int sequenceDelay; - @ObfuscatedName("bj") + @ObfuscatedName("bp") @ObfuscatedGetter( - intValue = -1401992799 + intValue = 272217185 ) - int field1244; - @ObfuscatedName("be") + int field1245; + @ObfuscatedName("bn") @ObfuscatedGetter( - intValue = -1781887565 + intValue = -1915525677 ) @Export("spotAnimation") int spotAnimation; - @ObfuscatedName("bs") + @ObfuscatedName("bo") @ObfuscatedGetter( - intValue = -1474223197 + intValue = 479634489 ) @Export("spotAnimationFrame") int spotAnimationFrame; - @ObfuscatedName("bx") + @ObfuscatedName("bw") @ObfuscatedGetter( - intValue = -481375045 + intValue = -1084268575 ) @Export("spotAnimationFrameCycle") int spotAnimationFrameCycle; - @ObfuscatedName("bv") + @ObfuscatedName("bi") @ObfuscatedGetter( - intValue = 895533867 + intValue = 58747199 ) - int field1243; - @ObfuscatedName("bh") + int field1287; + @ObfuscatedName("bb") @ObfuscatedGetter( - intValue = 724261779 + intValue = -1377519793 ) - int field1224; - @ObfuscatedName("bl") + int field1277; + @ObfuscatedName("bk") @ObfuscatedGetter( - intValue = -1356856001 + intValue = 721291573 ) - int field1236; + int field1278; + @ObfuscatedName("bg") + @ObfuscatedGetter( + intValue = 1049471373 + ) + int field1269; + @ObfuscatedName("by") + @ObfuscatedGetter( + intValue = 690610019 + ) + int field1280; @ObfuscatedName("bc") @ObfuscatedGetter( - intValue = 357124569 + intValue = -1504119385 ) - int field1251; - @ObfuscatedName("bo") + int field1238; + @ObfuscatedName("cd") @ObfuscatedGetter( - intValue = 837192135 + intValue = -611848265 ) - int field1252; - @ObfuscatedName("bq") - @ObfuscatedGetter( - intValue = -832167709 - ) - int field1253; + int field1265; @ObfuscatedName("cm") @ObfuscatedGetter( - intValue = 1244121347 + intValue = -61946015 ) - int field1254; - @ObfuscatedName("ch") + int field1283; + @ObfuscatedName("cv") @ObfuscatedGetter( - intValue = -1639074179 + intValue = 165021719 ) - int field1237; - @ObfuscatedName("cu") + int field1284; + @ObfuscatedName("cp") @ObfuscatedGetter( - intValue = 1718337881 - ) - int field1256; - @ObfuscatedName("ce") - @ObfuscatedGetter( - intValue = 1061708383 + intValue = 1280286129 ) @Export("npcCycle") int npcCycle; - @ObfuscatedName("cn") + @ObfuscatedName("ci") @ObfuscatedGetter( - intValue = 1167885103 + intValue = -881485665 ) @Export("defaultHeight") int defaultHeight; - @ObfuscatedName("cc") + @ObfuscatedName("ct") @ObfuscatedGetter( - intValue = 108366915 + intValue = -1173912475 ) @Export("orientation") int orientation; - @ObfuscatedName("ck") + @ObfuscatedName("cq") @ObfuscatedGetter( - intValue = 1846500997 + intValue = -906983361 ) - int field1248; - @ObfuscatedName("cx") + int field1282; + @ObfuscatedName("cr") @ObfuscatedGetter( - intValue = -2042152507 + intValue = -1889632377 ) - int field1261; - @ObfuscatedName("ci") + int field1289; + @ObfuscatedName("cf") @ObfuscatedGetter( - intValue = -1984582191 + intValue = -664818219 ) @Export("pathLength") int pathLength; - @ObfuscatedName("cf") + @ObfuscatedName("cn") @Export("pathX") int[] pathX; - @ObfuscatedName("cq") + @ObfuscatedName("cs") @Export("pathY") int[] pathY; - @ObfuscatedName("cs") + @ObfuscatedName("cg") @Export("pathTraversed") byte[] pathTraversed; - @ObfuscatedName("cd") + @ObfuscatedName("co") @ObfuscatedGetter( - intValue = -2122964403 + intValue = 110165637 ) - int field1250; - @ObfuscatedName("ct") + int field1294; + @ObfuscatedName("ck") @ObfuscatedGetter( - intValue = -681332491 + intValue = 313310131 ) - int field1215; + int field1274; Actor() { this.isWalking = false; // L: 13 - this.field1211 = 1; // L: 14 + this.field1239 = 1; // L: 14 this.idleSequence = -1; // L: 16 this.turnLeftSequence = -1; // L: 17 this.turnRightSequence = -1; // L: 18 @@ -333,7 +339,7 @@ public abstract class Actor extends Renderable { this.walkRightSequence = -1; // L: 22 this.runSequence = -1; // L: 23 this.overheadText = null; // L: 24 - this.field1223 = false; // L: 26 + this.field1248 = false; // L: 26 this.overheadTextCyclesRemaining = 100; // L: 27 this.overheadTextColor = 0; // L: 28 this.overheadTextEffect = 0; // L: 29 @@ -346,7 +352,7 @@ public abstract class Actor extends Renderable { this.healthBars = new IterableNodeDeque(); // L: 37 this.targetIndex = -1; // L: 38 this.false0 = false; // L: 39 - this.field1247 = -1; // L: 40 + this.field1264 = -1; // L: 40 this.movementSequence = -1; // L: 41 this.movementFrame = 0; // L: 42 this.movementFrameCycle = 0; // L: 43 @@ -354,46 +360,46 @@ public abstract class Actor extends Renderable { this.sequenceFrame = 0; // L: 45 this.sequenceFrameCycle = 0; // L: 46 this.sequenceDelay = 0; // L: 47 - this.field1244 = 0; // L: 48 + this.field1245 = 0; // L: 48 this.spotAnimation = -1; // L: 49 this.spotAnimationFrame = 0; // L: 50 this.spotAnimationFrameCycle = 0; // L: 51 this.npcCycle = 0; // L: 61 this.defaultHeight = 200; // L: 62 - this.field1248 = 0; // L: 64 - this.field1261 = 32; // L: 65 + this.field1282 = 0; // L: 64 + this.field1289 = 32; // L: 65 this.pathLength = 0; // L: 66 this.pathX = new int[10]; // L: 67 this.pathY = new int[10]; // L: 68 this.pathTraversed = new byte[10]; // L: 69 - this.field1250 = 0; // L: 70 - this.field1215 = 0; // L: 71 + this.field1294 = 0; // L: 70 + this.field1274 = 0; // L: 71 } // L: 73 - @ObfuscatedName("d") + @ObfuscatedName("m") @ObfuscatedSignature( - descriptor = "(I)Z", - garbageValue = "-1701330496" + descriptor = "(B)Z", + garbageValue = "-6" ) @Export("isVisible") boolean isVisible() { return false; // L: 81 } - @ObfuscatedName("an") + @ObfuscatedName("be") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "580510883" + garbageValue = "-1557316570" ) - final void method2194() { + final void method2171() { this.pathLength = 0; // L: 76 - this.field1215 = 0; // L: 77 + this.field1274 = 0; // L: 77 } // L: 78 - @ObfuscatedName("bd") + @ObfuscatedName("bj") @ObfuscatedSignature( descriptor = "(IIIIIIB)V", - garbageValue = "0" + garbageValue = "31" ) @Export("addHitSplat") final void addHitSplat(int var1, int var2, int var3, int var4, int var5, int var6) { @@ -413,287 +419,179 @@ public abstract class Actor extends Renderable { int var10 = -1; // L: 92 int var11 = 0; // L: 93 if (var1 >= 0) { // L: 94 - HitSplatDefinition var13 = (HitSplatDefinition)HitSplatDefinition.HitSplatDefinition_cached.get((long)var1); // L: 97 - HitSplatDefinition var12; - if (var13 != null) { // L: 98 - var12 = var13; // L: 99 - } else { - byte[] var14 = HitSplatDefinition.HitSplatDefinition_archive.takeFile(32, var1); // L: 102 - var13 = new HitSplatDefinition(); // L: 103 - if (var14 != null) { // L: 104 - var13.decode(new Buffer(var14)); - } - - HitSplatDefinition.HitSplatDefinition_cached.put(var13, (long)var1); // L: 105 - var12 = var13; // L: 106 - } - - var10 = var12.field1752; // L: 109 - var11 = var12.field1735; // L: 110 + HitSplatDefinition var12 = Projectile.method1966(var1); // L: 95 + var10 = var12.field1743; // L: 96 + var11 = var12.field1731; // L: 97 } - int var15; - if (var8) { // L: 112 - if (var10 == -1) { // L: 113 + int var14; + if (var8) { // L: 99 + if (var10 == -1) { // L: 100 return; } - var9 = 0; // L: 114 - var15 = 0; // L: 115 - if (var10 == 0) { // L: 116 - var15 = this.hitSplatCycles[0]; - } else if (var10 == 1) { - var15 = this.hitSplatValues[0]; // L: 117 + var9 = 0; // L: 101 + var14 = 0; // L: 102 + if (var10 == 0) { // L: 103 + var14 = this.hitSplatCycles[0]; + } else if (var10 == 1) { // L: 104 + var14 = this.hitSplatValues[0]; } - for (int var16 = 1; var16 < 4; ++var16) { // L: 118 - if (var10 == 0) { // L: 119 - if (this.hitSplatCycles[var16] < var15) { // L: 120 - var9 = var16; // L: 121 - var15 = this.hitSplatCycles[var16]; // L: 122 + for (int var13 = 1; var13 < 4; ++var13) { // L: 105 + if (var10 == 0) { // L: 106 + if (this.hitSplatCycles[var13] < var14) { // L: 107 + var9 = var13; + var14 = this.hitSplatCycles[var13]; } - } else if (var10 == 1 && this.hitSplatValues[var16] < var15) { // L: 125 126 - var9 = var16; // L: 127 - var15 = this.hitSplatValues[var16]; // L: 128 + } else if (var10 == 1 && this.hitSplatValues[var13] < var14) { // L: 112 113 + var9 = var13; // L: 114 + var14 = this.hitSplatValues[var13]; // L: 115 } } - if (var10 == 1 && var15 >= var2) { // L: 132 + if (var10 == 1 && var14 >= var2) { // L: 119 return; } } else { - if (var7) { // L: 135 + if (var7) { // L: 122 this.hitSplatCount = 0; } - for (var15 = 0; var15 < 4; ++var15) { // L: 136 - byte var17 = this.hitSplatCount; // L: 137 - this.hitSplatCount = (byte)((this.hitSplatCount + 1) % 4); // L: 138 - if (this.hitSplatCycles[var17] <= var5) { // L: 139 - var9 = var17; // L: 140 - break; // L: 141 + for (var14 = 0; var14 < 4; ++var14) { // L: 123 + byte var15 = this.hitSplatCount; // L: 124 + this.hitSplatCount = (byte)((this.hitSplatCount + 1) % 4); // L: 125 + if (this.hitSplatCycles[var15] <= var5) { // L: 126 + var9 = var15; // L: 127 + break; // L: 128 } } } - if (var9 >= 0) { // L: 145 - this.hitSplatTypes[var9] = var1; // L: 146 - this.hitSplatValues[var9] = var2; // L: 147 - this.hitSplatTypes2[var9] = var3; // L: 148 - this.hitSplatValues2[var9] = var4; // L: 149 - this.hitSplatCycles[var9] = var5 + var11 + var6; // L: 150 + if (var9 >= 0) { // L: 132 + this.hitSplatTypes[var9] = var1; // L: 133 + this.hitSplatValues[var9] = var2; // L: 134 + this.hitSplatTypes2[var9] = var3; // L: 135 + this.hitSplatValues2[var9] = var4; // L: 136 + this.hitSplatCycles[var9] = var5 + var11 + var6; // L: 137 } - } // L: 151 + } // L: 138 - @ObfuscatedName("bw") + @ObfuscatedName("bx") @ObfuscatedSignature( - descriptor = "(IIIIIII)V", - garbageValue = "-1818079351" + descriptor = "(IIIIIIB)V", + garbageValue = "-127" ) @Export("addHealthBar") final void addHealthBar(int var1, int var2, int var3, int var4, int var5, int var6) { - HealthBarDefinition var8 = (HealthBarDefinition)HealthBarDefinition.HealthBarDefinition_cached.get((long)var1); // L: 156 - HealthBarDefinition var7; - if (var8 != null) { // L: 157 - var7 = var8; // L: 158 - } else { - byte[] var9 = HealthBarDefinition.HealthBarDefinition_archive.takeFile(33, var1); // L: 161 - var8 = new HealthBarDefinition(); // L: 162 - if (var9 != null) { // L: 163 - var8.decode(new Buffer(var9)); + HealthBarDefinition var7 = UserComparator6.method2492(var1); // L: 141 + HealthBar var8 = null; // L: 142 + HealthBar var9 = null; // L: 143 + int var10 = var7.int2; // L: 144 + int var11 = 0; // L: 145 + + HealthBar var12; + for (var12 = (HealthBar)this.healthBars.last(); var12 != null; var12 = (HealthBar)this.healthBars.previous()) { // L: 146 + ++var11; // L: 147 + if (var12.definition.field1596 == var7.field1596) { // L: 148 + var12.put(var2 + var4, var5, var6, var3); // L: 149 + return; // L: 150 } - HealthBarDefinition.HealthBarDefinition_cached.put(var8, (long)var1); // L: 164 - var7 = var8; // L: 165 - } - - var8 = var7; // L: 167 - HealthBar var14 = null; // L: 168 - HealthBar var10 = null; // L: 169 - int var11 = var7.int2; // L: 170 - int var12 = 0; // L: 171 - - HealthBar var13; - for (var13 = (HealthBar)this.healthBars.last(); var13 != null; var13 = (HealthBar)this.healthBars.previous()) { // L: 172 - ++var12; // L: 173 - if (var13.definition.field1597 == var8.field1597) { // L: 174 - var13.put(var2 + var4, var5, var6, var3); // L: 175 - return; // L: 176 + if (var12.definition.int1 <= var7.int1) { // L: 152 + var8 = var12; } - if (var13.definition.int1 <= var8.int1) { // L: 178 - var14 = var13; - } - - if (var13.definition.int2 > var11) { // L: 179 - var10 = var13; // L: 180 - var11 = var13.definition.int2; // L: 181 + if (var12.definition.int2 > var10) { // L: 153 + var9 = var12; // L: 154 + var10 = var12.definition.int2; // L: 155 } } - if (var10 != null || var12 < 4) { // L: 184 - var13 = new HealthBar(var8); // L: 185 - if (var14 == null) { // L: 186 - this.healthBars.addLast(var13); + if (var9 != null || var11 < 4) { // L: 158 + var12 = new HealthBar(var7); // L: 159 + if (var8 == null) { // L: 160 + this.healthBars.addLast(var12); } else { - IterableNodeDeque.IterableNodeDeque_addBefore(var13, var14); // L: 187 + IterableNodeDeque.IterableNodeDeque_addBefore(var12, var8); // L: 161 } - var13.put(var2 + var4, var5, var6, var3); // L: 188 - if (var12 >= 4) { // L: 189 - var10.remove(); + var12.put(var2 + var4, var5, var6, var3); // L: 162 + if (var11 >= 4) { // L: 163 + var9.remove(); } } - } // L: 190 + } // L: 164 - @ObfuscatedName("bf") + @ObfuscatedName("bp") @ObfuscatedSignature( - descriptor = "(II)V", - garbageValue = "-1438107880" + descriptor = "(IB)V", + garbageValue = "-36" ) @Export("removeHealthBar") final void removeHealthBar(int var1) { - HealthBarDefinition var3 = (HealthBarDefinition)HealthBarDefinition.HealthBarDefinition_cached.get((long)var1); // L: 195 - HealthBarDefinition var2; - if (var3 != null) { // L: 196 - var2 = var3; // L: 197 - } else { - byte[] var4 = HealthBarDefinition.HealthBarDefinition_archive.takeFile(33, var1); // L: 200 - var3 = new HealthBarDefinition(); // L: 201 - if (var4 != null) { // L: 202 - var3.decode(new Buffer(var4)); - } + HealthBarDefinition var2 = UserComparator6.method2492(var1); // L: 167 - HealthBarDefinition.HealthBarDefinition_cached.put(var3, (long)var1); // L: 203 - var2 = var3; // L: 204 - } - - var3 = var2; // L: 206 - - for (HealthBar var5 = (HealthBar)this.healthBars.last(); var5 != null; var5 = (HealthBar)this.healthBars.previous()) { // L: 207 - if (var3 == var5.definition) { // L: 208 - var5.remove(); // L: 209 - return; // L: 210 + for (HealthBar var3 = (HealthBar)this.healthBars.last(); var3 != null; var3 = (HealthBar)this.healthBars.previous()) { // L: 168 + if (var2 == var3.definition) { // L: 169 + var3.remove(); // L: 170 + return; // L: 171 } } - } // L: 213 + } // L: 174 - @ObfuscatedName("hg") + @ObfuscatedName("o") + static final void method2191(long var0) { + ViewportMouse.ViewportMouse_entityTags[++ViewportMouse.ViewportMouse_entityCount - 1] = var0; // L: 108 + } // L: 109 + + @ObfuscatedName("iz") @ObfuscatedSignature( - descriptor = "(IIZI)V", - garbageValue = "-1704817926" + descriptor = "(ILjava/lang/String;I)V", + garbageValue = "325868949" ) - static final void method2199(int var0, int var1, boolean var2) { - if (!var2 || var0 != MusicPatchNode2.field2827 || class11.field112 != var1) { // L: 5558 - MusicPatchNode2.field2827 = var0; // L: 5561 - class11.field112 = var1; // L: 5562 - Client.updateGameState(25); // L: 5563 - class7.drawLoadingMessage("Loading - please wait.", true); // L: 5564 - int var3 = JagexCache.baseX; // L: 5565 - int var4 = Messages.baseY; // L: 5566 - JagexCache.baseX = (var0 - 6) * 8; // L: 5567 - Messages.baseY = (var1 - 6) * 8; // L: 5568 - int var5 = JagexCache.baseX - var3; // L: 5569 - int var6 = Messages.baseY - var4; // L: 5570 - var3 = JagexCache.baseX; // L: 5571 - var4 = Messages.baseY; // L: 5572 + static void method2192(int var0, String var1) { + int var2 = Players.Players_count; // L: 8588 + int[] var3 = Players.Players_indices; // L: 8589 + boolean var4 = false; // L: 8590 + Username var5 = new Username(var1, WorldMapSection0.loginType); // L: 8591 - int var7; - int var9; - int[] var10000; - for (var7 = 0; var7 < 32768; ++var7) { // L: 5573 - NPC var19 = Client.npcs[var7]; // L: 5574 - if (var19 != null) { // L: 5575 - for (var9 = 0; var9 < 10; ++var9) { // L: 5576 - var10000 = var19.pathX; // L: 5577 - var10000[var9] -= var5; - var10000 = var19.pathY; // L: 5578 - var10000[var9] -= var6; - } - - var19.x -= var5 * 128; // L: 5580 - var19.y -= var6 * 128; // L: 5581 + for (int var6 = 0; var6 < var2; ++var6) { // L: 8592 + Player var7 = Client.players[var3[var6]]; // L: 8593 + if (var7 != null && var7 != class93.localPlayer && var7.username != null && var7.username.equals(var5)) { // L: 8594 + PacketBufferNode var8; + if (var0 == 1) { // L: 8595 + var8 = class21.getPacketBufferNode(ClientPacket.field2597, Client.packetWriter.isaacCipher); // L: 8597 + var8.packetBuffer.method6619(var3[var6]); // L: 8598 + var8.packetBuffer.method6584(0); // L: 8599 + Client.packetWriter.addNode(var8); // L: 8600 + } else if (var0 == 4) { // L: 8602 + var8 = class21.getPacketBufferNode(ClientPacket.field2605, Client.packetWriter.isaacCipher); // L: 8604 + var8.packetBuffer.method6619(var3[var6]); // L: 8605 + var8.packetBuffer.method6584(0); // L: 8606 + Client.packetWriter.addNode(var8); // L: 8607 + } else if (var0 == 6) { // L: 8609 + var8 = class21.getPacketBufferNode(ClientPacket.field2636, Client.packetWriter.isaacCipher); // L: 8611 + var8.packetBuffer.method6581(0); // L: 8612 + var8.packetBuffer.method6602(var3[var6]); // L: 8613 + Client.packetWriter.addNode(var8); // L: 8614 + } else if (var0 == 7) { // L: 8616 + var8 = class21.getPacketBufferNode(ClientPacket.field2620, Client.packetWriter.isaacCipher); // L: 8618 + var8.packetBuffer.writeByte(0); // L: 8619 + var8.packetBuffer.method6602(var3[var6]); // L: 8620 + Client.packetWriter.addNode(var8); // L: 8621 } + + var4 = true; // L: 8623 + break; } - - for (var7 = 0; var7 < 2048; ++var7) { // L: 5584 - Player var22 = Client.players[var7]; // L: 5585 - if (var22 != null) { // L: 5586 - for (var9 = 0; var9 < 10; ++var9) { // L: 5587 - var10000 = var22.pathX; // L: 5588 - var10000[var9] -= var5; - var10000 = var22.pathY; // L: 5589 - var10000[var9] -= var6; - } - - var22.x -= var5 * 128; // L: 5591 - var22.y -= var6 * 128; // L: 5592 - } - } - - byte var20 = 0; // L: 5595 - byte var8 = 104; // L: 5596 - byte var21 = 1; // L: 5597 - if (var5 < 0) { // L: 5598 - var20 = 103; // L: 5599 - var8 = -1; // L: 5600 - var21 = -1; // L: 5601 - } - - byte var10 = 0; // L: 5603 - byte var11 = 104; // L: 5604 - byte var12 = 1; // L: 5605 - if (var6 < 0) { // L: 5606 - var10 = 103; // L: 5607 - var11 = -1; // L: 5608 - var12 = -1; // L: 5609 - } - - int var14; - for (int var13 = var20; var13 != var8; var13 += var21) { // L: 5611 - for (var14 = var10; var11 != var14; var14 += var12) { // L: 5612 - int var15 = var13 + var5; // L: 5613 - int var16 = var6 + var14; // L: 5614 - - for (int var17 = 0; var17 < 4; ++var17) { // L: 5615 - if (var15 >= 0 && var16 >= 0 && var15 < 104 && var16 < 104) { - Client.groundItems[var17][var13][var14] = Client.groundItems[var17][var15][var16]; // L: 5616 - } else { - Client.groundItems[var17][var13][var14] = null; // L: 5617 - } - } - } - } - - for (PendingSpawn var18 = (PendingSpawn)Client.pendingSpawns.last(); var18 != null; var18 = (PendingSpawn)Client.pendingSpawns.previous()) { // L: 5621 5622 5626 - var18.x -= var5; // L: 5623 - var18.y -= var6; // L: 5624 - if (var18.x < 0 || var18.y < 0 || var18.x >= 104 || var18.y >= 104) { // L: 5625 - var18.remove(); - } - } - - if (Client.destinationX != 0) { // L: 5628 - Client.destinationX -= var5; // L: 5629 - Client.destinationY -= var6; // L: 5630 - } - - Client.soundEffectCount = 0; // L: 5632 - Client.isCameraLocked = false; // L: 5633 - class20.cameraX -= var5 << 7; // L: 5634 - WorldMapDecoration.cameraZ -= var6 << 7; // L: 5635 - HorizontalAlignment.oculusOrbFocalPointX -= var5 << 7; // L: 5636 - class280.oculusOrbFocalPointY -= var6 << 7; // L: 5637 - Client.field848 = -1; // L: 5638 - Client.graphicsObjects.clear(); // L: 5639 - Client.projectiles.clear(); // L: 5640 - - for (var14 = 0; var14 < 4; ++var14) { // L: 5641 - Client.collisionMaps[var14].clear(); - } - } - } // L: 5559 5642 + + if (!var4) { // L: 8627 + World.addGameMessage(4, "", "Unable to find " + var1); + } + + } // L: 8628 } diff --git a/runescape-client/src/main/java/Animation.java b/runescape-client/src/main/java/Animation.java index 04bb743480..d0505ca9f9 100644 --- a/runescape-client/src/main/java/Animation.java +++ b/runescape-client/src/main/java/Animation.java @@ -3,51 +3,51 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("gx") +@ObfuscatedName("gu") @Implements("Animation") public class Animation { - @ObfuscatedName("h") - static int[] field2217; - @ObfuscatedName("c") - static int[] field2222; - @ObfuscatedName("o") - static int[] field2223; - @ObfuscatedName("g") - static int[] field2219; - @ObfuscatedName("l") + @ObfuscatedName("v") + static int[] field2229; + @ObfuscatedName("n") + static int[] field2225; + @ObfuscatedName("f") + static int[] field2226; + @ObfuscatedName("y") + static int[] field2224; + @ObfuscatedName("p") @ObfuscatedSignature( - descriptor = "Lgn;" + descriptor = "Lge;" ) @Export("skeleton") Skeleton skeleton; - @ObfuscatedName("z") + @ObfuscatedName("j") @Export("transformCount") int transformCount; - @ObfuscatedName("t") + @ObfuscatedName("r") @Export("transformSkeletonLabels") int[] transformSkeletonLabels; - @ObfuscatedName("v") + @ObfuscatedName("b") @Export("transformXs") int[] transformXs; - @ObfuscatedName("b") + @ObfuscatedName("d") @Export("transformYs") int[] transformYs; - @ObfuscatedName("q") + @ObfuscatedName("s") @Export("transformZs") int[] transformZs; - @ObfuscatedName("i") + @ObfuscatedName("u") @Export("hasAlphaTransform") boolean hasAlphaTransform; static { - field2217 = new int[500]; // L: 8 - field2222 = new int[500]; // L: 9 - field2223 = new int[500]; // L: 10 - field2219 = new int[500]; // L: 11 + field2229 = new int[500]; // L: 8 + field2225 = new int[500]; // L: 9 + field2226 = new int[500]; // L: 10 + field2224 = new int[500]; // L: 11 } @ObfuscatedSignature( - descriptor = "([BLgn;)V" + descriptor = "([BLge;)V" ) Animation(byte[] var1, Skeleton var2) { this.skeleton = null; // L: 12 @@ -69,38 +69,38 @@ public class Animation { if (this.skeleton.transformTypes[var8] != 0) { // L: 32 for (int var10 = var8 - 1; var10 > var6; --var10) { // L: 33 if (this.skeleton.transformTypes[var10] == 0) { // L: 34 - field2217[var7] = var10; // L: 35 - field2222[var7] = 0; // L: 36 - field2223[var7] = 0; // L: 37 - field2219[var7] = 0; // L: 38 + field2229[var7] = var10; // L: 35 + field2225[var7] = 0; // L: 36 + field2226[var7] = 0; // L: 37 + field2224[var7] = 0; // L: 38 ++var7; // L: 39 break; } } } - field2217[var7] = var8; // L: 44 + field2229[var7] = var8; // L: 44 short var11 = 0; // L: 45 if (this.skeleton.transformTypes[var8] == 3) { // L: 46 var11 = 128; } if ((var9 & 1) != 0) { // L: 47 - field2222[var7] = var4.readShortSmart(); + field2225[var7] = var4.readShortSmart(); } else { - field2222[var7] = var11; // L: 48 + field2225[var7] = var11; // L: 48 } if ((var9 & 2) != 0) { // L: 49 - field2223[var7] = var4.readShortSmart(); + field2226[var7] = var4.readShortSmart(); } else { - field2223[var7] = var11; // L: 50 + field2226[var7] = var11; // L: 50 } if ((var9 & 4) != 0) { // L: 51 - field2219[var7] = var4.readShortSmart(); + field2224[var7] = var4.readShortSmart(); } else { - field2219[var7] = var11; // L: 52 + field2224[var7] = var11; // L: 52 } var6 = var8; // L: 53 @@ -121,10 +121,10 @@ public class Animation { this.transformZs = new int[var7]; // L: 65 for (var8 = 0; var8 < var7; ++var8) { // L: 66 - this.transformSkeletonLabels[var8] = field2217[var8]; // L: 67 - this.transformXs[var8] = field2222[var8]; // L: 68 - this.transformYs[var8] = field2223[var8]; // L: 69 - this.transformZs[var8] = field2219[var8]; // L: 70 + this.transformSkeletonLabels[var8] = field2229[var8]; // L: 67 + this.transformXs[var8] = field2225[var8]; // L: 68 + this.transformYs[var8] = field2226[var8]; // L: 69 + this.transformZs[var8] = field2224[var8]; // L: 70 } } diff --git a/runescape-client/src/main/java/ApproximateRouteStrategy.java b/runescape-client/src/main/java/ApproximateRouteStrategy.java index 6cbc7465ed..3e31bede62 100644 --- a/runescape-client/src/main/java/ApproximateRouteStrategy.java +++ b/runescape-client/src/main/java/ApproximateRouteStrategy.java @@ -1,127 +1,196 @@ 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("bh") +@ObfuscatedName("bb") @Implements("ApproximateRouteStrategy") public class ApproximateRouteStrategy extends RouteStrategy { - @ObfuscatedName("z") - @Export("PcmPlayer_stereo") - protected static boolean PcmPlayer_stereo; + @ObfuscatedName("qx") + @ObfuscatedSignature( + descriptor = "Ly;" + ) + @Export("guestClanChannel") + static ClanChannel guestClanChannel; + @ObfuscatedName("o") + @ObfuscatedGetter( + intValue = -344685783 + ) + static int field629; ApproximateRouteStrategy() { - } // L: 11841 + } // L: 11604 - @ObfuscatedName("h") + @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "(IIILfa;B)Z", - garbageValue = "2" + descriptor = "(IIILfz;I)Z", + garbageValue = "496202097" ) @Export("hasArrived") - public boolean hasArrived(int var1, int var2, int var3, CollisionMap var4) { - return var2 == super.approxDestinationX && var3 == super.approxDestinationY; // L: 11844 + protected boolean hasArrived(int var1, int var2, int var3, CollisionMap var4) { + return var2 == super.approxDestinationX && var3 == super.approxDestinationY; // L: 11607 } - @ObfuscatedName("h") + @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "(Ljp;I)V", - garbageValue = "450286187" + descriptor = "(II)Lcf;", + garbageValue = "-26460885" ) - public static void method1203(AbstractArchive var0) { - ParamComposition.ParamDefinition_archive = var0; // L: 21 - } // L: 22 - - @ObfuscatedName("t") - @ObfuscatedSignature( - descriptor = "(Lbc;Lbc;IZI)I", - garbageValue = "-205185455" - ) - @Export("compareWorlds") - static int compareWorlds(World var0, World var1, int var2, boolean var3) { - if (var2 == 1) { // L: 211 - int var4 = var0.population; // L: 212 - int var5 = var1.population; // L: 213 - if (!var3) { // L: 214 - if (var4 == -1) { // L: 215 - var4 = 2001; - } - - if (var5 == -1) { // L: 216 - var5 = 2001; - } - } - - return var4 - var5; // L: 218 - } else if (var2 == 2) { // L: 220 - return var0.location - var1.location; - } else if (var2 == 3) { // L: 221 - if (var0.activity.equals("-")) { // L: 222 - if (var1.activity.equals("-")) { // L: 223 - return 0; - } else { - return var3 ? -1 : 1; // L: 224 - } - } else if (var1.activity.equals("-")) { // L: 226 - return var3 ? 1 : -1; - } else { - return var0.activity.compareTo(var1.activity); // L: 227 - } - } else if (var2 == 4) { // L: 229 - return var0.method1686() ? (var1.method1686() ? 0 : 1) : (var1.method1686() ? -1 : 0); - } else if (var2 == 5) { // L: 230 - return var0.method1722() ? (var1.method1722() ? 0 : 1) : (var1.method1722() ? -1 : 0); - } else if (var2 == 6) { // L: 231 - return var0.isPvp() ? (var1.isPvp() ? 0 : 1) : (var1.isPvp() ? -1 : 0); - } else if (var2 == 7) { // L: 232 - return var0.isMembersOnly() ? (var1.isMembersOnly() ? 0 : 1) : (var1.isMembersOnly() ? -1 : 0); + @Export("getScript") + static Script getScript(int var0) { + Script var1 = (Script)Script.Script_cached.get((long)var0); // L: 26 + if (var1 != null) { // L: 27 + return var1; } else { - return var0.id - var1.id; // L: 233 + byte[] var2 = UserComparator5.archive12.takeFile(var0, 0); // L: 28 + if (var2 == null) { // L: 29 + return null; // L: 30 + } else { + var1 = UserList.newScript(var2); // L: 32 + Script.Script_cached.put(var1, (long)var0); // L: 33 + return var1; // L: 34 + } } } - @ObfuscatedName("jb") - @ObfuscatedSignature( - descriptor = "([Liv;Liv;ZI)V", - garbageValue = "1379988095" - ) - @Export("revalidateWidgetScroll") - static void revalidateWidgetScroll(Widget[] var0, Widget var1, boolean var2) { - int var3 = var1.scrollWidth != 0 ? var1.scrollWidth * -734718787 * 1765836437 : var1.width * 1953969927 * -1078557001; // L: 10041 - int var4 = var1.scrollHeight != 0 ? var1.scrollHeight * -58177491 * -1965471835 : var1.height * 962798585 * 761540169; // L: 10042 - Login.resizeInterface(var0, var1.id, var3, var4, var2); // L: 10043 - if (var1.children != null) { // L: 10044 - Login.resizeInterface(var1.children, var1.id, var3, var4, var2); - } - - InterfaceParent var5 = (InterfaceParent)Client.interfaceParents.get((long)var1.id); // L: 10045 - if (var5 != null) { - Strings.method4801(var5.group, var3, var4, var2); // L: 10046 - } - - if (var1.contentType == 1337) { // L: 10047 - } - - } // L: 10048 - - @ObfuscatedName("kz") + @ObfuscatedName("kk") @ObfuscatedSignature( descriptor = "(II)V", - garbageValue = "436780499" + garbageValue = "-1598600139" ) - @Export("Widget_resetModelFrames") - static final void Widget_resetModelFrames(int var0) { - if (UserComparator8.loadInterface(var0)) { // L: 11110 - Widget[] var1 = Widget.Widget_interfaceComponents[var0]; // L: 11111 + @Export("changeGameOptions") + static final void changeGameOptions(int var0) { + class170.method3554(); // L: 10932 + ClientPacket.method4354(); // L: 10933 + int var1 = ClanSettings.VarpDefinition_get(var0).type; // L: 10934 + if (var1 != 0) { // L: 10935 + int var2 = Varps.Varps_main[var0]; // L: 10936 + if (var1 == 1) { // L: 10937 + if (var2 == 1) { // L: 10938 + InterfaceParent.method2082(0.9D); + } - for (int var2 = 0; var2 < var1.length; ++var2) { // L: 11112 - Widget var3 = var1[var2]; // L: 11113 - if (var3 != null) { // L: 11114 - var3.modelFrame = 0; // L: 11115 - var3.modelFrameCycle = 0; // L: 11116 + if (var2 == 2) { // L: 10939 + InterfaceParent.method2082(0.8D); + } + + if (var2 == 3) { // L: 10940 + InterfaceParent.method2082(0.7D); + } + + if (var2 == 4) { // L: 10941 + InterfaceParent.method2082(0.6D); + } + } + + if (var1 == 3) { // L: 10943 + if (var2 == 0) { // L: 10944 + PacketWriter.method2402(255); + } + + if (var2 == 1) { // L: 10945 + PacketWriter.method2402(192); + } + + if (var2 == 2) { // L: 10946 + PacketWriter.method2402(128); + } + + if (var2 == 3) { // L: 10947 + PacketWriter.method2402(64); + } + + if (var2 == 4) { // L: 10948 + PacketWriter.method2402(0); + } + } + + if (var1 == 4) { // L: 10950 + if (var2 == 0) { // L: 10951 + WorldMapLabelSize.updateSoundEffectVolume(127); + } + + if (var2 == 1) { // L: 10952 + WorldMapLabelSize.updateSoundEffectVolume(96); + } + + if (var2 == 2) { // L: 10953 + WorldMapLabelSize.updateSoundEffectVolume(64); + } + + if (var2 == 3) { // L: 10954 + WorldMapLabelSize.updateSoundEffectVolume(32); + } + + if (var2 == 4) { // L: 10955 + WorldMapLabelSize.updateSoundEffectVolume(0); + } + } + + if (var1 == 5) { // L: 10957 + Client.leftClickOpensMenu = var2; + } + + if (var1 == 6) { // L: 10958 + Client.chatEffects = var2; + } + + if (var1 == 9) { // L: 10959 + Client.field912 = var2; + } + + if (var1 == 10) { // L: 10960 + if (var2 == 0) { // L: 10961 + LoginPacket.method4373(127); + } + + if (var2 == 1) { // L: 10962 + LoginPacket.method4373(96); + } + + if (var2 == 2) { // L: 10963 + LoginPacket.method4373(64); + } + + if (var2 == 3) { // L: 10964 + LoginPacket.method4373(32); + } + + if (var2 == 4) { // L: 10965 + LoginPacket.method4373(0); + } + } + + if (var1 == 17) { // L: 10967 + Client.followerIndex = var2 & 65535; // L: 10968 + } + + AttackOption[] var3; + if (var1 == 18) { // L: 10970 + var3 = new AttackOption[]{AttackOption.AttackOption_leftClickWhereAvailable, AttackOption.AttackOption_alwaysRightClick, AttackOption.AttackOption_dependsOnCombatLevels, AttackOption.AttackOption_hidden}; // L: 10973 + Client.playerAttackOption = (AttackOption)Messages.findEnumerated(var3, var2); // L: 10975 + if (Client.playerAttackOption == null) { // L: 10976 + Client.playerAttackOption = AttackOption.AttackOption_dependsOnCombatLevels; + } + } + + if (var1 == 19) { // L: 10978 + if (var2 == -1) { // L: 10979 + Client.combatTargetPlayerIndex = -1; + } else { + Client.combatTargetPlayerIndex = var2 & 2047; // L: 10980 + } + } + + if (var1 == 22) { // L: 10982 + var3 = new AttackOption[]{AttackOption.AttackOption_leftClickWhereAvailable, AttackOption.AttackOption_alwaysRightClick, AttackOption.AttackOption_dependsOnCombatLevels, AttackOption.AttackOption_hidden}; // L: 10985 + Client.npcAttackOption = (AttackOption)Messages.findEnumerated(var3, var2); // L: 10987 + if (Client.npcAttackOption == null) { // L: 10988 + Client.npcAttackOption = AttackOption.AttackOption_dependsOnCombatLevels; } } } - } // L: 11118 + } // L: 10990 } diff --git a/runescape-client/src/main/java/Archive.java b/runescape-client/src/main/java/Archive.java index a1805d96f8..0e2f08ee4e 100644 --- a/runescape-client/src/main/java/Archive.java +++ b/runescape-client/src/main/java/Archive.java @@ -5,458 +5,432 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ji") +@ObfuscatedName("jp") @Implements("Archive") public class Archive extends AbstractArchive { - @ObfuscatedName("b") + @ObfuscatedName("d") @Export("Archive_crc") static CRC32 Archive_crc; - @ObfuscatedName("fs") + @ObfuscatedName("f") @ObfuscatedSignature( - descriptor = "Lek;" - ) - @Export("socketTask") - static Task socketTask; - @ObfuscatedName("o") - @ObfuscatedSignature( - descriptor = "Llw;" + descriptor = "Llh;" ) @Export("archiveDisk") ArchiveDisk archiveDisk; - @ObfuscatedName("g") + @ObfuscatedName("y") @ObfuscatedSignature( - descriptor = "Llw;" + descriptor = "Llh;" ) @Export("masterDisk") ArchiveDisk masterDisk; - @ObfuscatedName("l") + @ObfuscatedName("p") @ObfuscatedGetter( - intValue = 549068495 + intValue = 1695957245 ) @Export("index") int index; - @ObfuscatedName("z") - volatile boolean field3586; - @ObfuscatedName("t") - boolean field3583; - @ObfuscatedName("v") + @ObfuscatedName("j") + volatile boolean field3571; + @ObfuscatedName("r") + boolean field3572; + @ObfuscatedName("b") @Export("validGroups") volatile boolean[] validGroups; - @ObfuscatedName("q") + @ObfuscatedName("s") @ObfuscatedGetter( - intValue = -780107283 + intValue = -1472783963 ) @Export("indexCrc") int indexCrc; - @ObfuscatedName("i") + @ObfuscatedName("u") @ObfuscatedGetter( - intValue = 519027849 + intValue = -2140198139 ) @Export("indexVersion") int indexVersion; - @ObfuscatedName("x") + @ObfuscatedName("l") @ObfuscatedGetter( - intValue = -228949089 + intValue = 1353605799 ) - int field3588; + int field3566; static { Archive_crc = new CRC32(); // L: 17 } @ObfuscatedSignature( - descriptor = "(Llw;Llw;IZZZ)V" + descriptor = "(Llh;Llh;IZZZ)V" ) public Archive(ArchiveDisk var1, ArchiveDisk var2, int var3, boolean var4, boolean var5, boolean var6) { super(var4, var5); // L: 23 - this.field3586 = false; - this.field3583 = false; - this.field3588 = -1; // L: 20 + this.field3571 = false; // L: 14 + this.field3572 = false; // L: 15 + this.field3566 = -1; // L: 20 this.archiveDisk = var1; // L: 24 this.masterDisk = var2; // L: 25 this.index = var3; // L: 26 - this.field3583 = var6; // L: 27 - int var8 = this.index; // L: 29 - if (SecureRandomCallable.NetCache_reference != null) { // L: 31 - SecureRandomCallable.NetCache_reference.offset = var8 * 8 + 5; // L: 32 - int var9 = SecureRandomCallable.NetCache_reference.readInt(); // L: 33 - int var10 = SecureRandomCallable.NetCache_reference.readInt(); // L: 34 - this.loadIndex(var9, var10); // L: 35 - } else { - class25.requestNetFile((Archive)null, 255, 255, 0, (byte)0, true); // L: 38 - NetCache.NetCache_archives[var8] = this; // L: 39 - } + this.field3572 = var6; // L: 27 + class179.method3633(this, this.index); // L: 28 + } // L: 29 - } // L: 41 - - @ObfuscatedName("h") + @ObfuscatedName("v") @ObfuscatedSignature( descriptor = "(I)Z", - garbageValue = "1381527767" + garbageValue = "212573310" ) - public boolean method4822() { - return this.field3586; // L: 44 + public boolean method4869() { + return this.field3571; // L: 32 } - @ObfuscatedName("c") + @ObfuscatedName("n") @ObfuscatedSignature( - descriptor = "(I)I", - garbageValue = "475592211" + descriptor = "(B)I", + garbageValue = "53" ) @Export("percentage") public int percentage() { - if (this.field3586) { // L: 48 + if (this.field3571) { // L: 36 return 100; - } else if (super.groups != null) { // L: 49 + } else if (super.groups != null) { // L: 37 return 99; } else { - int var2 = this.index; // L: 51 - long var3 = (long)(var2 + 16711680); // L: 53 - int var1; - if (class7.NetCache_currentResponse != null && var3 == class7.NetCache_currentResponse.key) { // L: 54 - var1 = NetCache.NetCache_responseArchiveBuffer.offset * 99 / (NetCache.NetCache_responseArchiveBuffer.array.length - class7.NetCache_currentResponse.padding) + 1; // L: 58 - } else { - var1 = 0; // L: 55 + int var1 = class125.method2502(255, this.index); // L: 38 + if (var1 >= 100) { // L: 39 + var1 = 99; } - int var5 = var1; // L: 60 - if (var1 >= 100) { // L: 61 - var5 = 99; - } - - return var5; // L: 62 + return var1; // L: 40 } } - @ObfuscatedName("o") + @ObfuscatedName("f") @ObfuscatedSignature( - descriptor = "(II)V", - garbageValue = "-1103942204" + descriptor = "(IB)V", + garbageValue = "108" ) @Export("loadRegionFromGroup") void loadRegionFromGroup(int var1) { - int var2 = this.index; // L: 66 - long var3 = (long)((var2 << 16) + var1); // L: 68 - NetFileRequest var5 = (NetFileRequest)NetCache.NetCache_pendingWrites.get(var3); // L: 69 - if (var5 != null) { // L: 70 - NetCache.NetCache_pendingWritesQueue.addLast(var5); // L: 71 - } + class280.method5071(this.index, var1); // L: 44 + } // L: 45 - } // L: 73 - - @ObfuscatedName("g") + @ObfuscatedName("y") @ObfuscatedSignature( - descriptor = "(II)V", - garbageValue = "1184960922" + descriptor = "(IB)V", + garbageValue = "0" ) @Export("loadGroup") void loadGroup(int var1) { - if (this.archiveDisk != null && this.validGroups != null && this.validGroups[var1]) { // L: 76 - ArchiveDisk var2 = this.archiveDisk; // L: 77 - byte[] var4 = null; // L: 80 + if (this.archiveDisk != null && this.validGroups != null && this.validGroups[var1]) { // L: 48 + ArchiveDisk var2 = this.archiveDisk; // L: 49 + byte[] var4 = null; // L: 52 + synchronized(ArchiveDiskActionHandler.ArchiveDiskActionHandler_requestQueue) { // L: 53 + for (ArchiveDiskAction var6 = (ArchiveDiskAction)ArchiveDiskActionHandler.ArchiveDiskActionHandler_requestQueue.last(); var6 != null; var6 = (ArchiveDiskAction)ArchiveDiskActionHandler.ArchiveDiskActionHandler_requestQueue.previous()) { // L: 54 + if (var6.key == (long)var1 && var2 == var6.archiveDisk && var6.type == 0) { // L: 55 + var4 = var6.data; // L: 56 + break; // L: 57 + } + } + } + + if (var4 != null) { // L: 61 + this.load(var2, var1, var4, true); // L: 62 + } else { + byte[] var5 = var2.read(var1); // L: 65 + this.load(var2, var1, var5, true); // L: 66 + } + } else { + DirectByteArrayCopier.requestNetFile(this, this.index, var1, super.groupCrcs[var1], (byte)2, true); // L: 69 + } + + } // L: 70 + + @ObfuscatedName("p") + @ObfuscatedSignature( + descriptor = "(III)V", + garbageValue = "-887756709" + ) + @Export("loadIndex") + public void loadIndex(int var1, int var2) { + this.indexCrc = var1; // L: 73 + this.indexVersion = var2; // L: 74 + if (this.masterDisk != null) { // L: 75 + int var3 = this.index; // L: 76 + ArchiveDisk var4 = this.masterDisk; // L: 77 + byte[] var6 = null; // L: 80 synchronized(ArchiveDiskActionHandler.ArchiveDiskActionHandler_requestQueue) { // L: 81 - for (ArchiveDiskAction var6 = (ArchiveDiskAction)ArchiveDiskActionHandler.ArchiveDiskActionHandler_requestQueue.last(); var6 != null; var6 = (ArchiveDiskAction)ArchiveDiskActionHandler.ArchiveDiskActionHandler_requestQueue.previous()) { // L: 82 - if (var6.key == (long)var1 && var2 == var6.archiveDisk && var6.type == 0) { // L: 83 - var4 = var6.data; // L: 84 + for (ArchiveDiskAction var8 = (ArchiveDiskAction)ArchiveDiskActionHandler.ArchiveDiskActionHandler_requestQueue.last(); var8 != null; var8 = (ArchiveDiskAction)ArchiveDiskActionHandler.ArchiveDiskActionHandler_requestQueue.previous()) { // L: 82 + if ((long)var3 == var8.key && var4 == var8.archiveDisk && var8.type == 0) { // L: 83 + var6 = var8.data; // L: 84 break; // L: 85 } } } - if (var4 != null) { // L: 89 - this.load(var2, var1, var4, true); // L: 90 + if (var6 != null) { // L: 89 + this.load(var4, var3, var6, true); // L: 90 } else { - byte[] var5 = var2.read(var1); // L: 93 - this.load(var2, var1, var5, true); // L: 94 + byte[] var7 = var4.read(var3); // L: 93 + this.load(var4, var3, var7, true); // L: 94 } } else { - class25.requestNetFile(this, this.index, var1, super.groupCrcs[var1], (byte)2, true); // L: 97 + DirectByteArrayCopier.requestNetFile(this, 255, this.index, this.indexCrc, (byte)0, true); // L: 97 } } // L: 98 - @ObfuscatedName("l") + @ObfuscatedName("j") @ObfuscatedSignature( - descriptor = "(IIB)V", - garbageValue = "-29" + descriptor = "(I[BZZI)V", + garbageValue = "525734565" ) - @Export("loadIndex") - void loadIndex(int var1, int var2) { - this.indexCrc = var1; // L: 101 - this.indexVersion = var2; // L: 102 - if (this.masterDisk != null) { // L: 103 - int var3 = this.index; // L: 104 - ArchiveDisk var4 = this.masterDisk; // L: 105 - byte[] var6 = null; // L: 108 - synchronized(ArchiveDiskActionHandler.ArchiveDiskActionHandler_requestQueue) { // L: 109 - for (ArchiveDiskAction var8 = (ArchiveDiskAction)ArchiveDiskActionHandler.ArchiveDiskActionHandler_requestQueue.last(); var8 != null; var8 = (ArchiveDiskAction)ArchiveDiskActionHandler.ArchiveDiskActionHandler_requestQueue.previous()) { // L: 110 - if ((long)var3 == var8.key && var4 == var8.archiveDisk && var8.type == 0) { // L: 111 - var6 = var8.data; // L: 112 - break; // L: 113 + @Export("write") + public void write(int var1, byte[] var2, boolean var3, boolean var4) { + if (var3) { // L: 101 + if (this.field3571) { // L: 102 + throw new RuntimeException(); // L: 103 + } + + if (this.masterDisk != null) { // L: 105 + int var5 = this.index; // L: 106 + ArchiveDisk var6 = this.masterDisk; // L: 107 + ArchiveDiskAction var7 = new ArchiveDiskAction(); // L: 109 + var7.type = 0; // L: 110 + var7.key = (long)var5; // L: 111 + var7.data = var2; // L: 112 + var7.archiveDisk = var6; // L: 113 + synchronized(ArchiveDiskActionHandler.ArchiveDiskActionHandler_requestQueue) { // L: 114 + ArchiveDiskActionHandler.ArchiveDiskActionHandler_requestQueue.addFirst(var7); // L: 115 + } // L: 116 + + synchronized(ArchiveDiskActionHandler.ArchiveDiskActionHandler_lock) { // L: 118 + if (ArchiveDiskActionHandler.field3562 == 0) { // L: 119 + ArchiveDiskActionHandler.ArchiveDiskActionHandler_thread = new Thread(new ArchiveDiskActionHandler()); // L: 120 + ArchiveDiskActionHandler.ArchiveDiskActionHandler_thread.setDaemon(true); // L: 121 + ArchiveDiskActionHandler.ArchiveDiskActionHandler_thread.start(); // L: 122 + ArchiveDiskActionHandler.ArchiveDiskActionHandler_thread.setPriority(5); // L: 123 + } + + ArchiveDiskActionHandler.field3562 = 600; // L: 125 + } + } + + this.decodeIndex(var2); // L: 130 + this.loadAllLocal(); // L: 131 + } else { + var2[var2.length - 2] = (byte)(super.groupVersions[var1] >> 8); // L: 134 + var2[var2.length - 1] = (byte)super.groupVersions[var1]; // L: 135 + if (this.archiveDisk != null) { // L: 136 + ArchiveDisk var13 = this.archiveDisk; // L: 137 + ArchiveDiskAction var18 = new ArchiveDiskAction(); // L: 139 + var18.type = 0; // L: 140 + var18.key = (long)var1; // L: 141 + var18.data = var2; // L: 142 + var18.archiveDisk = var13; // L: 143 + synchronized(ArchiveDiskActionHandler.ArchiveDiskActionHandler_requestQueue) { // L: 144 + ArchiveDiskActionHandler.ArchiveDiskActionHandler_requestQueue.addFirst(var18); // L: 145 + } // L: 146 + + synchronized(ArchiveDiskActionHandler.ArchiveDiskActionHandler_lock) { // L: 148 + if (ArchiveDiskActionHandler.field3562 == 0) { // L: 149 + ArchiveDiskActionHandler.ArchiveDiskActionHandler_thread = new Thread(new ArchiveDiskActionHandler()); // L: 150 + ArchiveDiskActionHandler.ArchiveDiskActionHandler_thread.setDaemon(true); // L: 151 + ArchiveDiskActionHandler.ArchiveDiskActionHandler_thread.start(); // L: 152 + ArchiveDiskActionHandler.ArchiveDiskActionHandler_thread.setPriority(5); // L: 153 + } + + ArchiveDiskActionHandler.field3562 = 600; // L: 155 + } + + this.validGroups[var1] = true; // L: 159 + } + + if (var4) { // L: 161 + super.groups[var1] = GrandExchangeOfferWorldComparator.method5079(var2, false); + } + } + + } // L: 163 + + @ObfuscatedName("r") + @ObfuscatedSignature( + descriptor = "(Llh;I[BZB)V", + garbageValue = "-59" + ) + @Export("load") + public void load(ArchiveDisk var1, int var2, byte[] var3, boolean var4) { + int var5; + if (var1 == this.masterDisk) { // L: 166 + if (this.field3571) { // L: 167 + throw new RuntimeException(); // L: 168 + } else if (var3 == null) { // L: 170 + DirectByteArrayCopier.requestNetFile(this, 255, this.index, this.indexCrc, (byte)0, true); // L: 171 + } else { + Archive_crc.reset(); // L: 174 + Archive_crc.update(var3, 0, var3.length); // L: 175 + var5 = (int)Archive_crc.getValue(); // L: 176 + if (var5 != this.indexCrc) { // L: 177 + DirectByteArrayCopier.requestNetFile(this, 255, this.index, this.indexCrc, (byte)0, true); // L: 178 + } else { + Buffer var9 = new Buffer(UserComparator6.decompressBytes(var3)); // L: 181 + int var7 = var9.readUnsignedByte(); // L: 182 + if (var7 != 5 && var7 != 6) { // L: 183 + throw new RuntimeException(var7 + "," + this.index + "," + var2); + } else { + int var8 = 0; // L: 184 + if (var7 >= 6) { // L: 185 + var8 = var9.readInt(); + } + + if (var8 != this.indexVersion) { // L: 186 + DirectByteArrayCopier.requestNetFile(this, 255, this.index, this.indexCrc, (byte)0, true); // L: 187 + } else { + this.decodeIndex(var3); // L: 190 + this.loadAllLocal(); // L: 191 + } } } } + } else { + if (!var4 && var2 == this.field3566) { // L: 194 + this.field3571 = true; // L: 195 + } - if (var6 != null) { // L: 117 - this.load(var4, var3, var6, true); // L: 118 + if (var3 != null && var3.length > 2) { // L: 197 + Archive_crc.reset(); // L: 202 + Archive_crc.update(var3, 0, var3.length - 2); // L: 203 + var5 = (int)Archive_crc.getValue(); // L: 204 + int var6 = ((var3[var3.length - 2] & 255) << 8) + (var3[var3.length - 1] & 255); // L: 205 + if (var5 == super.groupCrcs[var2] && var6 == super.groupVersions[var2]) { // L: 206 + this.validGroups[var2] = true; // L: 211 + if (var4) { // L: 212 + super.groups[var2] = GrandExchangeOfferWorldComparator.method5079(var3, false); + } + + } else { + this.validGroups[var2] = false; // L: 207 + if (this.field3572 || var4) { // L: 208 + DirectByteArrayCopier.requestNetFile(this, this.index, var2, super.groupCrcs[var2], (byte)2, var4); + } + + } } else { - byte[] var7 = var4.read(var3); // L: 121 - this.load(var4, var3, var7, true); // L: 122 - } - } else { - class25.requestNetFile(this, 255, this.index, this.indexCrc, (byte)0, true); // L: 125 - } - - } // L: 126 - - @ObfuscatedName("z") - @ObfuscatedSignature( - descriptor = "(I[BZZS)V", - garbageValue = "-32096" - ) - @Export("write") - void write(int var1, byte[] var2, boolean var3, boolean var4) { - if (var3) { // L: 129 - if (this.field3586) { // L: 130 - throw new RuntimeException(); // L: 131 - } - - if (this.masterDisk != null) { // L: 133 - int var5 = this.index; // L: 134 - ArchiveDisk var6 = this.masterDisk; // L: 135 - ArchiveDiskAction var7 = new ArchiveDiskAction(); // L: 137 - var7.type = 0; // L: 138 - var7.key = (long)var5; // L: 139 - var7.data = var2; // L: 140 - var7.archiveDisk = var6; // L: 141 - synchronized(ArchiveDiskActionHandler.ArchiveDiskActionHandler_requestQueue) { // L: 142 - ArchiveDiskActionHandler.ArchiveDiskActionHandler_requestQueue.addFirst(var7); // L: 143 - } // L: 144 - - class43.method486(); // L: 145 - } - - this.decodeIndex(var2); // L: 148 - this.loadAllLocal(); // L: 149 - } else { - var2[var2.length - 2] = (byte)(super.groupVersions[var1] >> 8); // L: 152 - var2[var2.length - 1] = (byte)super.groupVersions[var1]; // L: 153 - if (this.archiveDisk != null) { // L: 154 - ArchiveDisk var11 = this.archiveDisk; // L: 155 - ArchiveDiskAction var14 = new ArchiveDiskAction(); // L: 157 - var14.type = 0; // L: 158 - var14.key = (long)var1; // L: 159 - var14.data = var2; // L: 160 - var14.archiveDisk = var11; // L: 161 - synchronized(ArchiveDiskActionHandler.ArchiveDiskActionHandler_requestQueue) { // L: 162 - ArchiveDiskActionHandler.ArchiveDiskActionHandler_requestQueue.addFirst(var14); // L: 163 - } // L: 164 - - class43.method486(); // L: 165 - this.validGroups[var1] = true; // L: 167 - } - - if (var4) { - super.groups[var1] = class34.method388(var2, false); // L: 169 - } - } - - } // L: 171 - - @ObfuscatedName("t") - @ObfuscatedSignature( - descriptor = "(Llw;I[BZI)V", - garbageValue = "-1720270185" - ) - @Export("load") - void load(ArchiveDisk var1, int var2, byte[] var3, boolean var4) { - int var5; - if (var1 == this.masterDisk) { // L: 174 - if (this.field3586) { // L: 175 - throw new RuntimeException(); // L: 176 - } - - if (var3 == null) { // L: 178 - class25.requestNetFile(this, 255, this.index, this.indexCrc, (byte)0, true); // L: 179 - return; // L: 180 - } - - Archive_crc.reset(); // L: 182 - Archive_crc.update(var3, 0, var3.length); // L: 183 - var5 = (int)Archive_crc.getValue(); // L: 184 - if (var5 != this.indexCrc) { // L: 185 - class25.requestNetFile(this, 255, this.index, this.indexCrc, (byte)0, true); // L: 186 - return; // L: 187 - } - - Buffer var9 = new Buffer(ObjectSound.decompressBytes(var3)); // L: 189 - int var7 = var9.readUnsignedByte(); // L: 190 - if (var7 != 5 && var7 != 6) { // L: 191 - throw new RuntimeException(var7 + "," + this.index + "," + var2); - } - - int var8 = 0; // L: 192 - if (var7 >= 6) { // L: 193 - var8 = var9.readInt(); - } - - if (var8 != this.indexVersion) { // L: 194 - class25.requestNetFile(this, 255, this.index, this.indexCrc, (byte)0, true); // L: 195 - return; // L: 196 - } - - this.decodeIndex(var3); // L: 198 - this.loadAllLocal(); // L: 199 - } else { - if (!var4 && var2 == this.field3588) { // L: 202 - this.field3586 = true; // L: 203 - } - - if (var3 == null || var3.length <= 2) { // L: 205 - this.validGroups[var2] = false; // L: 206 - if (this.field3583 || var4) { // L: 207 - class25.requestNetFile(this, this.index, var2, super.groupCrcs[var2], (byte)2, var4); + this.validGroups[var2] = false; // L: 198 + if (this.field3572 || var4) { // L: 199 + DirectByteArrayCopier.requestNetFile(this, this.index, var2, super.groupCrcs[var2], (byte)2, var4); } - return; // L: 208 - } - - Archive_crc.reset(); // L: 210 - Archive_crc.update(var3, 0, var3.length - 2); // L: 211 - var5 = (int)Archive_crc.getValue(); // L: 212 - int var6 = ((var3[var3.length - 2] & 255) << 8) + (var3[var3.length - 1] & 255); // L: 213 - if (var5 != super.groupCrcs[var2] || var6 != super.groupVersions[var2]) { // L: 214 - this.validGroups[var2] = false; // L: 215 - if (this.field3583 || var4) { // L: 216 - class25.requestNetFile(this, this.index, var2, super.groupCrcs[var2], (byte)2, var4); - } - - return; // L: 217 - } - - this.validGroups[var2] = true; // L: 219 - if (var4) { // L: 220 - super.groups[var2] = class34.method388(var3, false); } } - - } // L: 222 - - @ObfuscatedName("v") - @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "-117239087" - ) - @Export("loadAllLocal") - void loadAllLocal() { - this.validGroups = new boolean[super.groups.length]; // L: 225 - - int var1; - for (var1 = 0; var1 < this.validGroups.length; ++var1) { // L: 226 - this.validGroups[var1] = false; - } - - if (this.archiveDisk == null) { // L: 227 - this.field3586 = true; // L: 228 - } else { - this.field3588 = -1; // L: 231 - - for (var1 = 0; var1 < this.validGroups.length; ++var1) { // L: 232 - if (super.fileCounts[var1] > 0) { // L: 233 - GrandExchangeOfferNameComparator.method4987(var1, this.archiveDisk, this); // L: 234 - this.field3588 = var1; // L: 235 - } - } - - if (this.field3588 == -1) { // L: 238 - this.field3586 = true; - } - - } - } // L: 229 239 + } // L: 172 179 188 200 209 214 @ObfuscatedName("b") + @ObfuscatedSignature( + descriptor = "(I)V", + garbageValue = "-2113858228" + ) + @Export("loadAllLocal") + void loadAllLocal() { + this.validGroups = new boolean[super.groups.length]; // L: 217 + + int var1; + for (var1 = 0; var1 < this.validGroups.length; ++var1) { // L: 218 + this.validGroups[var1] = false; + } + + if (this.archiveDisk == null) { // L: 219 + this.field3571 = true; // L: 220 + } else { + this.field3566 = -1; // L: 223 + + for (var1 = 0; var1 < this.validGroups.length; ++var1) { // L: 224 + if (super.fileCounts[var1] > 0) { // L: 225 + ArchiveDisk var2 = this.archiveDisk; // L: 226 + ArchiveDiskAction var4 = new ArchiveDiskAction(); // L: 229 + var4.type = 1; // L: 230 + var4.key = (long)var1; // L: 231 + var4.archiveDisk = var2; // L: 232 + var4.archive = this; // L: 233 + synchronized(ArchiveDiskActionHandler.ArchiveDiskActionHandler_requestQueue) { // L: 234 + ArchiveDiskActionHandler.ArchiveDiskActionHandler_requestQueue.addFirst(var4); // L: 235 + } // L: 236 + + synchronized(ArchiveDiskActionHandler.ArchiveDiskActionHandler_lock) { // L: 238 + if (ArchiveDiskActionHandler.field3562 == 0) { // L: 239 + ArchiveDiskActionHandler.ArchiveDiskActionHandler_thread = new Thread(new ArchiveDiskActionHandler()); // L: 240 + ArchiveDiskActionHandler.ArchiveDiskActionHandler_thread.setDaemon(true); // L: 241 + ArchiveDiskActionHandler.ArchiveDiskActionHandler_thread.start(); // L: 242 + ArchiveDiskActionHandler.ArchiveDiskActionHandler_thread.setPriority(5); // L: 243 + } + + ArchiveDiskActionHandler.field3562 = 600; // L: 245 + } + + this.field3566 = var1; // L: 249 + } + } + + if (this.field3566 == -1) { // L: 252 + this.field3571 = true; + } + + } + } // L: 221 253 + + @ObfuscatedName("d") @ObfuscatedSignature( descriptor = "(II)I", - garbageValue = "-1290183138" + garbageValue = "-1767586109" ) @Export("groupLoadPercent") int groupLoadPercent(int var1) { - if (super.groups[var1] != null) { // L: 242 - return 100; - } else if (this.validGroups[var1]) { // L: 243 + if (super.groups[var1] != null) { // L: 256 return 100; } else { - int var3 = this.index; // L: 245 - long var4 = (long)((var3 << 16) + var1); // L: 247 - int var2; - if (class7.NetCache_currentResponse != null && var4 == class7.NetCache_currentResponse.key) { // L: 248 - var2 = NetCache.NetCache_responseArchiveBuffer.offset * 99 / (NetCache.NetCache_responseArchiveBuffer.array.length - class7.NetCache_currentResponse.padding) + 1; // L: 252 - } else { - var2 = 0; // L: 249 - } - - return var2; // L: 254 + return this.validGroups[var1] ? 100 : class125.method2502(this.index, var1); // L: 257 258 } } - @ObfuscatedName("q") + @ObfuscatedName("s") @ObfuscatedSignature( descriptor = "(II)Z", - garbageValue = "1085562127" + garbageValue = "510058915" ) - public boolean method4831(int var1) { - return this.validGroups[var1]; // L: 258 + public boolean method4884(int var1) { + return this.validGroups[var1]; // L: 262 } - @ObfuscatedName("i") + @ObfuscatedName("u") @ObfuscatedSignature( - descriptor = "(IB)Z", - garbageValue = "123" + descriptor = "(II)Z", + garbageValue = "-1677083054" ) - public boolean method4842(int var1) { - return this.getGroupFileIds(var1) != null; // L: 262 + public boolean method4887(int var1) { + return this.getGroupFileIds(var1) != null; // L: 266 } - @ObfuscatedName("x") + @ObfuscatedName("l") @ObfuscatedSignature( - descriptor = "(B)I", - garbageValue = "-55" + descriptor = "(I)I", + garbageValue = "-1371864603" ) @Export("loadPercent") public int loadPercent() { - int var1 = 0; // L: 266 - int var2 = 0; // L: 267 + int var1 = 0; // L: 270 + int var2 = 0; // L: 271 int var3; - for (var3 = 0; var3 < super.groups.length; ++var3) { // L: 268 - if (super.fileCounts[var3] > 0) { // L: 269 - var1 += 100; // L: 270 - var2 += this.groupLoadPercent(var3); // L: 271 + for (var3 = 0; var3 < super.groups.length; ++var3) { // L: 272 + if (super.fileCounts[var3] > 0) { // L: 273 + var1 += 100; // L: 274 + var2 += this.groupLoadPercent(var3); // L: 275 } } - if (var1 == 0) { // L: 274 + if (var1 == 0) { // L: 278 return 100; } else { - var3 = var2 * 100 / var1; // L: 275 - return var3; // L: 276 + var3 = var2 * 100 / var1; // L: 279 + return var3; // L: 280 } } - - @ObfuscatedName("h") - @ObfuscatedSignature( - descriptor = "(S)J", - garbageValue = "6233" - ) - @Export("currentTimeMillis") - public static final synchronized long currentTimeMillis() { - long var0 = System.currentTimeMillis(); // L: 14 - if (var0 < class379.field4152) { // L: 15 - class379.field4153 += class379.field4152 - var0; // L: 16 - } - - class379.field4152 = var0; // L: 18 - return var0 + class379.field4153; // L: 19 - } } diff --git a/runescape-client/src/main/java/ArchiveDisk.java b/runescape-client/src/main/java/ArchiveDisk.java index c59380b6cb..1c9c142656 100644 --- a/runescape-client/src/main/java/ArchiveDisk.java +++ b/runescape-client/src/main/java/ArchiveDisk.java @@ -6,33 +6,38 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("lw") +@ObfuscatedName("lh") @Implements("ArchiveDisk") public final class ArchiveDisk { - @ObfuscatedName("h") + @ObfuscatedName("ru") + @ObfuscatedGetter( + intValue = 1117053017 + ) + static int field3886; + @ObfuscatedName("v") @Export("ArchiveDisk_buffer") static byte[] ArchiveDisk_buffer; - @ObfuscatedName("c") + @ObfuscatedName("n") @ObfuscatedSignature( - descriptor = "Lne;" + descriptor = "Lnf;" ) @Export("datFile") BufferedFile datFile; - @ObfuscatedName("o") + @ObfuscatedName("f") @ObfuscatedSignature( - descriptor = "Lne;" + descriptor = "Lnf;" ) @Export("idxFile") BufferedFile idxFile; - @ObfuscatedName("g") + @ObfuscatedName("y") @ObfuscatedGetter( - intValue = 827560813 + intValue = 1496779987 ) @Export("archive") int archive; - @ObfuscatedName("l") + @ObfuscatedName("p") @ObfuscatedGetter( - intValue = -780130401 + intValue = 322921177 ) @Export("maxEntrySize") int maxEntrySize; @@ -42,7 +47,7 @@ public final class ArchiveDisk { } @ObfuscatedSignature( - descriptor = "(ILne;Lne;I)V" + descriptor = "(ILnf;Lnf;I)V" ) public ArchiveDisk(int var1, BufferedFile var2, BufferedFile var3, int var4) { this.datFile = null; // L: 8 @@ -54,10 +59,10 @@ public final class ArchiveDisk { this.maxEntrySize = var4; // L: 17 } // L: 18 - @ObfuscatedName("h") + @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "(II)[B", - garbageValue = "1429073742" + descriptor = "(IB)[B", + garbageValue = "1" ) @Export("read") public byte[] read(int var1) { @@ -112,14 +117,14 @@ public final class ArchiveDisk { } var13 = 8; // L: 53 - this.datFile.read(ArchiveDisk_buffer, 0, var13 + var8); // L: 54 + this.datFile.read(ArchiveDisk_buffer, 0, var8 + var13); // L: 54 var9 = (ArchiveDisk_buffer[1] & 255) + ((ArchiveDisk_buffer[0] & 255) << 8); // L: 55 var10 = (ArchiveDisk_buffer[3] & 255) + ((ArchiveDisk_buffer[2] & 255) << 8); // L: 56 var11 = ((ArchiveDisk_buffer[5] & 255) << 8) + ((ArchiveDisk_buffer[4] & 255) << 16) + (ArchiveDisk_buffer[6] & 255); // L: 57 var12 = ArchiveDisk_buffer[7] & 255; // L: 58 } - if (var9 != var1 || var7 != var10 || var12 != this.archive) { // L: 60 + if (var9 != var1 || var10 != var7 || var12 != this.archive) { // L: 60 var10000 = null; return (byte[])var10000; } @@ -148,10 +153,10 @@ public final class ArchiveDisk { } } - @ObfuscatedName("c") + @ObfuscatedName("n") @ObfuscatedSignature( - descriptor = "(I[BII)Z", - garbageValue = "475877997" + descriptor = "(I[BIB)Z", + garbageValue = "77" ) @Export("write") public boolean write(int var1, byte[] var2, int var3) { @@ -169,10 +174,10 @@ public final class ArchiveDisk { } } - @ObfuscatedName("o") + @ObfuscatedName("f") @ObfuscatedSignature( descriptor = "(I[BIZI)Z", - garbageValue = "1891795807" + garbageValue = "-1453784211" ) @Export("write0") boolean write0(int var1, byte[] var2, int var3, boolean var4) { @@ -217,7 +222,7 @@ public final class ArchiveDisk { int var9 = 0; // L: 112 int var10; if (var4) { // L: 113 - this.datFile.seek(520L * (long)var6); // L: 114 + this.datFile.seek((long)var6 * 520L); // L: 114 int var11; int var12; if (var1 > 65535) { // L: 118 @@ -262,7 +267,7 @@ public final class ArchiveDisk { ++var9; } - if (var9 == var6) { // L: 149 + if (var6 == var9) { // L: 149 ++var9; } } diff --git a/runescape-client/src/main/java/ArchiveDiskAction.java b/runescape-client/src/main/java/ArchiveDiskAction.java index 090ba02888..652a563f7c 100644 --- a/runescape-client/src/main/java/ArchiveDiskAction.java +++ b/runescape-client/src/main/java/ArchiveDiskAction.java @@ -4,36 +4,35 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("jj") +@ObfuscatedName("jy") @Implements("ArchiveDiskAction") public class ArchiveDiskAction extends Node { - @ObfuscatedName("dz") - @ObfuscatedSignature( - descriptor = "Llc;" - ) - @Export("js5Socket") - static AbstractSocket js5Socket; - @ObfuscatedName("h") + @ObfuscatedName("dy") @ObfuscatedGetter( - intValue = 1113782185 + longValue = -6353355391446000035L + ) + static long field3556; + @ObfuscatedName("v") + @ObfuscatedGetter( + intValue = -1287454433 ) @Export("type") int type; - @ObfuscatedName("c") + @ObfuscatedName("n") @Export("data") - byte[] data; - @ObfuscatedName("o") + public byte[] data; + @ObfuscatedName("f") @ObfuscatedSignature( - descriptor = "Llw;" + descriptor = "Llh;" ) @Export("archiveDisk") - ArchiveDisk archiveDisk; - @ObfuscatedName("g") + public ArchiveDisk archiveDisk; + @ObfuscatedName("y") @ObfuscatedSignature( - descriptor = "Lji;" + descriptor = "Ljp;" ) @Export("archive") - Archive archive; + public Archive archive; ArchiveDiskAction() { } // L: 12 diff --git a/runescape-client/src/main/java/ArchiveDiskActionHandler.java b/runescape-client/src/main/java/ArchiveDiskActionHandler.java index bf29b16282..dc0f5a7d33 100644 --- a/runescape-client/src/main/java/ArchiveDiskActionHandler.java +++ b/runescape-client/src/main/java/ArchiveDiskActionHandler.java @@ -7,42 +7,34 @@ import net.runelite.mapping.ObfuscatedSignature; @ObfuscatedName("jg") @Implements("ArchiveDiskActionHandler") public class ArchiveDiskActionHandler implements Runnable { - @ObfuscatedName("h") + @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "Lka;" + descriptor = "Lkx;" ) @Export("ArchiveDiskActionHandler_requestQueue") - static NodeDeque ArchiveDiskActionHandler_requestQueue; - @ObfuscatedName("c") + public static NodeDeque ArchiveDiskActionHandler_requestQueue; + @ObfuscatedName("n") @ObfuscatedSignature( - descriptor = "Lka;" + descriptor = "Lkx;" ) @Export("ArchiveDiskActionHandler_responseQueue") - static NodeDeque ArchiveDiskActionHandler_responseQueue; - @ObfuscatedName("o") + public static NodeDeque ArchiveDiskActionHandler_responseQueue; + @ObfuscatedName("f") @ObfuscatedGetter( - intValue = 1281764183 + intValue = 2106150539 ) - public static int field3574; - @ObfuscatedName("g") + static int field3562; + @ObfuscatedName("y") @Export("ArchiveDiskActionHandler_lock") - public static Object ArchiveDiskActionHandler_lock; - @ObfuscatedName("l") + static Object ArchiveDiskActionHandler_lock; + @ObfuscatedName("p") @Export("ArchiveDiskActionHandler_thread") static Thread ArchiveDiskActionHandler_thread; - @ObfuscatedName("z") - @Export("SpriteBuffer_spriteWidths") - public static int[] SpriteBuffer_spriteWidths; - @ObfuscatedName("d") - @ObfuscatedSignature( - descriptor = "Lx;" - ) - static class11 field3575; static { ArchiveDiskActionHandler_requestQueue = new NodeDeque(); // L: 9 ArchiveDiskActionHandler_responseQueue = new NodeDeque(); // L: 10 - field3574 = 0; // L: 11 + field3562 = 0; // L: 11 ArchiveDiskActionHandler_lock = new Object(); } // L: 12 @@ -53,47 +45,67 @@ public class ArchiveDiskActionHandler implements Runnable { try { while (true) { ArchiveDiskAction var1; - synchronized(ArchiveDiskActionHandler_requestQueue) { // L: 56 - var1 = (ArchiveDiskAction)ArchiveDiskActionHandler_requestQueue.last(); // L: 57 - } // L: 58 + synchronized(ArchiveDiskActionHandler_requestQueue) { // L: 21 + var1 = (ArchiveDiskAction)ArchiveDiskActionHandler_requestQueue.last(); // L: 22 + } // L: 23 - if (var1 != null) { // L: 59 - if (var1.type == 0) { // L: 60 - var1.archiveDisk.write((int)var1.key, var1.data, var1.data.length); // L: 61 - synchronized(ArchiveDiskActionHandler_requestQueue) { // L: 62 - var1.remove(); // L: 63 - } // L: 64 - } else if (var1.type == 1) { // L: 66 - var1.data = var1.archiveDisk.read((int)var1.key); // L: 67 - synchronized(ArchiveDiskActionHandler_requestQueue) { // L: 68 - ArchiveDiskActionHandler_responseQueue.addFirst(var1); // L: 69 - } // L: 70 + if (var1 != null) { // L: 24 + if (var1.type == 0) { // L: 25 + var1.archiveDisk.write((int)var1.key, var1.data, var1.data.length); // L: 26 + synchronized(ArchiveDiskActionHandler_requestQueue) { // L: 27 + var1.remove(); // L: 28 + } // L: 29 + } else if (var1.type == 1) { // L: 31 + var1.data = var1.archiveDisk.read((int)var1.key); // L: 32 + synchronized(ArchiveDiskActionHandler_requestQueue) { // L: 33 + ArchiveDiskActionHandler_responseQueue.addFirst(var1); // L: 34 + } // L: 35 } - synchronized(ArchiveDiskActionHandler_lock) { // L: 72 - if (field3574 <= 1) { // L: 73 - field3574 = 0; // L: 74 - ArchiveDiskActionHandler_lock.notifyAll(); // L: 75 - return; // L: 76 + synchronized(ArchiveDiskActionHandler_lock) { // L: 37 + if (field3562 <= 1) { // L: 38 + field3562 = 0; // L: 39 + ArchiveDiskActionHandler_lock.notifyAll(); // L: 40 + return; // L: 41 } - field3574 = 600; // L: 78 + field3562 = 600; // L: 43 } } else { - UrlRequest.sleepExact(100L); // L: 82 - synchronized(ArchiveDiskActionHandler_lock) { // L: 83 - if (field3574 <= 1) { // L: 84 - field3574 = 0; // L: 85 - ArchiveDiskActionHandler_lock.notifyAll(); // L: 86 - return; // L: 87 + long var8 = 99L; // L: 50 + + try { + Thread.sleep(var8); // L: 53 + } catch (InterruptedException var15) { // L: 55 + } + + try { + Thread.sleep(1L); // L: 59 + } catch (InterruptedException var14) { // L: 61 + } + + synchronized(ArchiveDiskActionHandler_lock) { // L: 71 + if (field3562 <= 1) { // L: 72 + field3562 = 0; // L: 73 + ArchiveDiskActionHandler_lock.notifyAll(); // L: 74 + return; // L: 75 } - --field3574; // L: 89 + --field3562; // L: 77 } } } - } catch (Exception var13) { // L: 94 - class27.RunException_sendStackTrace((String)null, var13); // L: 95 + } catch (Exception var17) { // L: 82 + class266.RunException_sendStackTrace((String)null, var17); // L: 83 } - } // L: 97 + } // L: 85 + + @ObfuscatedName("n") + @ObfuscatedSignature( + descriptor = "(IB)V", + garbageValue = "13" + ) + public static void method4867(int var0) { + MouseHandler.MouseHandler_idleCycles = var0; // L: 51 + } // L: 52 } diff --git a/runescape-client/src/main/java/ArchiveLoader.java b/runescape-client/src/main/java/ArchiveLoader.java index 5f1cd808ad..39321d3ccc 100644 --- a/runescape-client/src/main/java/ArchiveLoader.java +++ b/runescape-client/src/main/java/ArchiveLoader.java @@ -4,30 +4,41 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ct") +@ObfuscatedName("ck") @Implements("ArchiveLoader") public class ArchiveLoader { - @ObfuscatedName("c") + @ObfuscatedName("m") @ObfuscatedSignature( - descriptor = "Lji;" + descriptor = "Ly;" + ) + static ClanChannel field1147; + @ObfuscatedName("ho") + @ObfuscatedSignature( + descriptor = "[Loh;" + ) + @Export("crossSprites") + static SpritePixels[] crossSprites; + @ObfuscatedName("n") + @ObfuscatedSignature( + descriptor = "Ljp;" ) @Export("archive") final Archive archive; - @ObfuscatedName("o") + @ObfuscatedName("f") @ObfuscatedGetter( - intValue = -907537521 + intValue = 605141689 ) @Export("groupCount") final int groupCount; - @ObfuscatedName("g") + @ObfuscatedName("y") @ObfuscatedGetter( - intValue = -1059334553 + intValue = -1897441913 ) @Export("loadedCount") int loadedCount; @ObfuscatedSignature( - descriptor = "(Lji;Ljava/lang/String;)V" + descriptor = "(Ljp;Ljava/lang/String;)V" ) ArchiveLoader(Archive var1, String var2) { this.loadedCount = 0; // L: 9 @@ -35,21 +46,69 @@ public class ArchiveLoader { this.groupCount = var1.getGroupCount(); // L: 13 } // L: 14 - @ObfuscatedName("h") + @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "(S)Z", - garbageValue = "256" + descriptor = "(B)Z", + garbageValue = "14" ) @Export("isLoaded") boolean isLoaded() { this.loadedCount = 0; // L: 17 for (int var1 = 0; var1 < this.groupCount; ++var1) { // L: 18 - if (!this.archive.method4842(var1) || this.archive.method4831(var1)) { // L: 19 - ++this.loadedCount; + if (!this.archive.method4887(var1) || this.archive.method4884(var1)) { + ++this.loadedCount; // L: 19 } } return this.loadedCount >= this.groupCount; // L: 21 } + + @ObfuscatedName("n") + @ObfuscatedSignature( + descriptor = "(II)Lei;", + garbageValue = "598444391" + ) + @Export("StructDefinition_getStructDefinition") + public static StructComposition StructDefinition_getStructDefinition(int var0) { + StructComposition var1 = (StructComposition)StructComposition.StructDefinition_cached.get((long)var0); // L: 23 + if (var1 != null) { // L: 24 + return var1; + } else { + byte[] var2 = StructComposition.StructDefinition_archive.takeFile(34, var0); // L: 25 + var1 = new StructComposition(); // L: 26 + if (var2 != null) { // L: 27 + var1.decode(new Buffer(var2)); + } + + var1.postDecode(); // L: 28 + StructComposition.StructDefinition_cached.put(var1, (long)var0); // L: 29 + return var1; // L: 30 + } + } + + @ObfuscatedName("a") + @ObfuscatedSignature( + descriptor = "(IIIIIIII)Z", + garbageValue = "1961168244" + ) + static final boolean method2059(int var0, int var1, int var2, int var3, int var4, int var5, int var6) { + int var7 = ViewportMouse.ViewportMouse_y + var6; // L: 156 + if (var7 < var0 && var7 < var1 && var7 < var2) { // L: 157 + return false; + } else { + var7 = ViewportMouse.ViewportMouse_y - var6; // L: 158 + if (var7 > var0 && var7 > var1 && var7 > var2) { + return false; // L: 159 + } else { + var7 = ViewportMouse.ViewportMouse_x + var6; // L: 160 + if (var7 < var3 && var7 < var4 && var7 < var5) { // L: 161 + return false; + } else { + var7 = ViewportMouse.ViewportMouse_x - var6; // L: 162 + return var7 <= var3 || var7 <= var4 || var7 <= var5; // L: 163 + } + } + } + } } diff --git a/runescape-client/src/main/java/AttackOption.java b/runescape-client/src/main/java/AttackOption.java index feb86edf51..1e4b224e77 100644 --- a/runescape-client/src/main/java/AttackOption.java +++ b/runescape-client/src/main/java/AttackOption.java @@ -7,25 +7,25 @@ import net.runelite.mapping.ObfuscatedSignature; @ObfuscatedName("dj") @Implements("AttackOption") public enum AttackOption implements Enumerated { - @ObfuscatedName("h") + @ObfuscatedName("v") @ObfuscatedSignature( descriptor = "Ldj;" ) @Export("AttackOption_dependsOnCombatLevels") AttackOption_dependsOnCombatLevels(0), - @ObfuscatedName("c") + @ObfuscatedName("n") @ObfuscatedSignature( descriptor = "Ldj;" ) @Export("AttackOption_alwaysRightClick") AttackOption_alwaysRightClick(1), - @ObfuscatedName("o") + @ObfuscatedName("f") @ObfuscatedSignature( descriptor = "Ldj;" ) @Export("AttackOption_leftClickWhereAvailable") AttackOption_leftClickWhereAvailable(2), - @ObfuscatedName("g") + @ObfuscatedName("y") @ObfuscatedSignature( descriptor = "Ldj;" ) @@ -33,89 +33,33 @@ public enum AttackOption implements Enumerated { AttackOption_hidden(3); @ObfuscatedName("p") - @ObfuscatedSignature( - descriptor = "Lcb;" - ) - @Export("loginScreenRunesAnimation") - static LoginScreenAnimation loginScreenRunesAnimation; - @ObfuscatedName("l") @ObfuscatedGetter( - intValue = 1870134493 + intValue = 198709193 ) @Export("id") final int id; AttackOption(int var3) { - this.id = var3; // L: 11799 - } // L: 11800 + this.id = var3; // L: 11562 + } // L: 11563 - @ObfuscatedName("h") + @ObfuscatedName("v") @ObfuscatedSignature( descriptor = "(I)I", - garbageValue = "-708237537" + garbageValue = "-907662946" ) @Export("rsOrdinal") public int rsOrdinal() { - return this.id; // L: 11803 + return this.id; // L: 11566 } - @ObfuscatedName("h") + @ObfuscatedName("n") @ObfuscatedSignature( - descriptor = "(II)Lem;", - garbageValue = "-1875014155" - ) - @Export("getObjectDefinition") - public static ObjectComposition getObjectDefinition(int var0) { - ObjectComposition var1 = (ObjectComposition)ObjectComposition.ObjectDefinition_cached.get((long)var0); // L: 73 - if (var1 != null) { // L: 74 - return var1; - } else { - byte[] var2 = ObjectComposition.ObjectDefinition_archive.takeFile(6, var0); // L: 75 - var1 = new ObjectComposition(); // L: 76 - var1.id = var0; // L: 77 - if (var2 != null) { // L: 78 - var1.decode(new Buffer(var2)); - } - - var1.postDecode(); // L: 79 - if (var1.isSolid) { // L: 80 - var1.interactType = 0; // L: 81 - var1.boolean1 = false; // L: 82 - } - - ObjectComposition.ObjectDefinition_cached.put(var1, (long)var0); // L: 84 - return var1; // L: 85 - } - } - - @ObfuscatedName("o") - @ObfuscatedSignature( - descriptor = "(II)I", - garbageValue = "1497706067" + descriptor = "(IB)I", + garbageValue = "-114" ) @Export("Widget_unpackTargetMask") public static int Widget_unpackTargetMask(int var0) { - return var0 >> 11 & 63; // L: 17 - } - - @ObfuscatedName("z") - @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "-1033303884" - ) - static void method2286() { - Messages.Messages_channels.clear(); // L: 50 - Messages.Messages_hashTable.clear(); // L: 51 - Messages.Messages_queue.clear(); // L: 52 - Messages.Messages_count = 0; // L: 53 - } // L: 54 - - @ObfuscatedName("ie") - @ObfuscatedSignature( - descriptor = "(I)I", - garbageValue = "-918339029" - ) - static final int method2285() { - return Client.menuOptionsCount - 1; // L: 9101 + return var0 >> 11 & 63; // L: 13 } } diff --git a/runescape-client/src/main/java/AudioFilter.java b/runescape-client/src/main/java/AudioFilter.java index 27fdd20a79..75af1848d7 100644 --- a/runescape-client/src/main/java/AudioFilter.java +++ b/runescape-client/src/main/java/AudioFilter.java @@ -3,154 +3,154 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("bi") +@ObfuscatedName("bj") @Implements("AudioFilter") public class AudioFilter { - @ObfuscatedName("z") - static float[][] field536; - @ObfuscatedName("t") + @ObfuscatedName("j") + static float[][] field562; + @ObfuscatedName("r") @Export("coefficients") static int[][] coefficients; - @ObfuscatedName("v") - static float field533; @ObfuscatedName("b") + static float field561; + @ObfuscatedName("d") @Export("forwardMultiplier") static int forwardMultiplier; - @ObfuscatedName("h") + @ObfuscatedName("v") @Export("pairs") int[] pairs; - @ObfuscatedName("o") - int[][][] field529; - @ObfuscatedName("g") - int[][][] field528; - @ObfuscatedName("l") - int[] field525; + @ObfuscatedName("f") + int[][][] field556; + @ObfuscatedName("y") + int[][][] field565; + @ObfuscatedName("p") + int[] field558; static { - field536 = new float[2][8]; // L: 13 + field562 = new float[2][8]; // L: 13 coefficients = new int[2][8]; // L: 14 } AudioFilter() { this.pairs = new int[2]; // L: 8 - this.field529 = new int[2][2][4]; // L: 10 - this.field528 = new int[2][2][4]; // L: 11 - this.field525 = new int[2]; // L: 12 + this.field556 = new int[2][2][4]; // L: 10 + this.field565 = new int[2][2][4]; // L: 11 + this.field558 = new int[2]; // L: 12 } // L: 21 - @ObfuscatedName("h") - float method1113(int var1, int var2, float var3) { - float var4 = (float)this.field528[var1][0][var2] + var3 * (float)(this.field528[var1][1][var2] - this.field528[var1][0][var2]); // L: 24 + @ObfuscatedName("v") + float method1087(int var1, int var2, float var3) { + float var4 = (float)this.field565[var1][0][var2] + var3 * (float)(this.field565[var1][1][var2] - this.field565[var1][0][var2]); // L: 24 var4 *= 0.0015258789F; // L: 25 return 1.0F - (float)Math.pow(10.0D, (double)(-var4 / 20.0F)); // L: 26 } - @ObfuscatedName("o") - float method1112(int var1, int var2, float var3) { - float var4 = (float)this.field529[var1][0][var2] + var3 * (float)(this.field529[var1][1][var2] - this.field529[var1][0][var2]); // L: 35 + @ObfuscatedName("f") + float method1078(int var1, int var2, float var3) { + float var4 = (float)this.field556[var1][0][var2] + var3 * (float)(this.field556[var1][1][var2] - this.field556[var1][0][var2]); // L: 35 var4 *= 1.2207031E-4F; // L: 36 return normalize(var4); // L: 37 } - @ObfuscatedName("g") + @ObfuscatedName("y") @Export("compute") int compute(int var1, float var2) { float var3; if (var1 == 0) { // L: 41 - var3 = (float)this.field525[0] + (float)(this.field525[1] - this.field525[0]) * var2; // L: 42 + var3 = (float)this.field558[0] + (float)(this.field558[1] - this.field558[0]) * var2; // L: 42 var3 *= 0.0030517578F; // L: 43 - field533 = (float)Math.pow(0.1D, (double)(var3 / 20.0F)); // L: 44 - forwardMultiplier = (int)(field533 * 65536.0F); // L: 45 + field561 = (float)Math.pow(0.1D, (double)(var3 / 20.0F)); // L: 44 + forwardMultiplier = (int)(field561 * 65536.0F); // L: 45 } if (this.pairs[var1] == 0) { // L: 47 return 0; } else { - var3 = this.method1113(var1, 0, var2); // L: 48 - field536[var1][0] = -2.0F * var3 * (float)Math.cos((double)this.method1112(var1, 0, var2)); // L: 49 - field536[var1][1] = var3 * var3; // L: 50 + var3 = this.method1087(var1, 0, var2); // L: 48 + field562[var1][0] = -2.0F * var3 * (float)Math.cos((double)this.method1078(var1, 0, var2)); // L: 49 + field562[var1][1] = var3 * var3; // L: 50 float[] var10000; int var4; for (var4 = 1; var4 < this.pairs[var1]; ++var4) { // L: 51 - var3 = this.method1113(var1, var4, var2); // L: 52 - float var5 = -2.0F * var3 * (float)Math.cos((double)this.method1112(var1, var4, var2)); // L: 53 + var3 = this.method1087(var1, var4, var2); // L: 52 + float var5 = -2.0F * var3 * (float)Math.cos((double)this.method1078(var1, var4, var2)); // L: 53 float var6 = var3 * var3; // L: 54 - field536[var1][var4 * 2 + 1] = field536[var1][var4 * 2 - 1] * var6; // L: 55 - field536[var1][var4 * 2] = field536[var1][var4 * 2 - 1] * var5 + field536[var1][var4 * 2 - 2] * var6; // L: 56 + field562[var1][var4 * 2 + 1] = field562[var1][var4 * 2 - 1] * var6; // L: 55 + field562[var1][var4 * 2] = field562[var1][var4 * 2 - 1] * var5 + field562[var1][var4 * 2 - 2] * var6; // L: 56 for (int var7 = var4 * 2 - 1; var7 >= 2; --var7) { // L: 57 - var10000 = field536[var1]; - var10000[var7] += field536[var1][var7 - 1] * var5 + field536[var1][var7 - 2] * var6; + var10000 = field562[var1]; + var10000[var7] += field562[var1][var7 - 1] * var5 + field562[var1][var7 - 2] * var6; } - var10000 = field536[var1]; // L: 58 - var10000[1] += field536[var1][0] * var5 + var6; - var10000 = field536[var1]; // L: 59 + var10000 = field562[var1]; // L: 58 + var10000[1] += field562[var1][0] * var5 + var6; + var10000 = field562[var1]; // L: 59 var10000[0] += var5; } if (var1 == 0) { // L: 61 for (var4 = 0; var4 < this.pairs[0] * 2; ++var4) { - var10000 = field536[0]; - var10000[var4] *= field533; + var10000 = field562[0]; + var10000[var4] *= field561; } } for (var4 = 0; var4 < this.pairs[var1] * 2; ++var4) { // L: 62 - coefficients[var1][var4] = (int)(field536[var1][var4] * 65536.0F); + coefficients[var1][var4] = (int)(field562[var1][var4] * 65536.0F); } return this.pairs[var1] * 2; // L: 63 } } - @ObfuscatedName("l") + @ObfuscatedName("p") @ObfuscatedSignature( - descriptor = "(Lnk;Lbw;)V" + descriptor = "(Lnd;Lbt;)V" ) - final void method1124(Buffer var1, SoundEnvelope var2) { + final void method1080(Buffer var1, SoundEnvelope var2) { int var3 = var1.readUnsignedByte(); // L: 67 this.pairs[0] = var3 >> 4; // L: 68 this.pairs[1] = var3 & 15; // L: 69 if (var3 != 0) { // L: 70 - this.field525[0] = var1.readUnsignedShort(); // L: 71 - this.field525[1] = var1.readUnsignedShort(); // L: 72 + this.field558[0] = var1.readUnsignedShort(); // L: 71 + this.field558[1] = var1.readUnsignedShort(); // L: 72 int var7 = var1.readUnsignedByte(); // L: 73 int var5; int var6; for (var5 = 0; var5 < 2; ++var5) { // L: 74 for (var6 = 0; var6 < this.pairs[var5]; ++var6) { // L: 75 - this.field529[var5][0][var6] = var1.readUnsignedShort(); // L: 76 - this.field528[var5][0][var6] = var1.readUnsignedShort(); // L: 77 + this.field556[var5][0][var6] = var1.readUnsignedShort(); // L: 76 + this.field565[var5][0][var6] = var1.readUnsignedShort(); // L: 77 } } for (var5 = 0; var5 < 2; ++var5) { // L: 80 for (var6 = 0; var6 < this.pairs[var5]; ++var6) { // L: 81 if ((var7 & 1 << var5 * 4 << var6) != 0) { // L: 82 - this.field529[var5][1][var6] = var1.readUnsignedShort(); // L: 83 - this.field528[var5][1][var6] = var1.readUnsignedShort(); // L: 84 + this.field556[var5][1][var6] = var1.readUnsignedShort(); // L: 83 + this.field565[var5][1][var6] = var1.readUnsignedShort(); // L: 84 } else { - this.field529[var5][1][var6] = this.field529[var5][0][var6]; // L: 87 - this.field528[var5][1][var6] = this.field528[var5][0][var6]; // L: 88 + this.field556[var5][1][var6] = this.field556[var5][0][var6]; // L: 87 + this.field565[var5][1][var6] = this.field565[var5][0][var6]; // L: 88 } } } - if (var7 != 0 || this.field525[1] != this.field525[0]) { // L: 92 + if (var7 != 0 || this.field558[1] != this.field558[0]) { // L: 92 var2.decodeSegments(var1); } } else { - int[] var4 = this.field525; // L: 95 - this.field525[1] = 0; // L: 96 + int[] var4 = this.field558; // L: 95 + this.field558[1] = 0; // L: 96 var4[0] = 0; // L: 97 } } // L: 99 - @ObfuscatedName("c") + @ObfuscatedName("n") @Export("normalize") static float normalize(float var0) { float var1 = 32.703197F * (float)Math.pow(2.0D, (double)var0); // L: 30 diff --git a/runescape-client/src/main/java/BZip2Decompressor.java b/runescape-client/src/main/java/BZip2Decompressor.java index d876f31e6c..7cdfc01324 100644 --- a/runescape-client/src/main/java/BZip2Decompressor.java +++ b/runescape-client/src/main/java/BZip2Decompressor.java @@ -3,12 +3,12 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("nq") +@ObfuscatedName("nt") @Implements("BZip2Decompressor") public final class BZip2Decompressor { - @ObfuscatedName("v") + @ObfuscatedName("b") @ObfuscatedSignature( - descriptor = "Lnc;" + descriptor = "Lnh;" ) @Export("BZip2Decompressor_state") static BZip2State BZip2Decompressor_state; @@ -17,7 +17,7 @@ public final class BZip2Decompressor { BZip2Decompressor_state = new BZip2State(); // L: 13 } - @ObfuscatedName("h") + @ObfuscatedName("v") @Export("BZip2Decompressor_decompress") public static int BZip2Decompressor_decompress(byte[] var0, int var1, byte[] var2, int var3, int var4) { synchronized(BZip2Decompressor_state) { // L: 20 @@ -29,7 +29,7 @@ public final class BZip2Decompressor { BZip2Decompressor_state.bsLive = 0; // L: 26 BZip2Decompressor_state.bsBuff = 0; // L: 27 BZip2Decompressor_state.nextBit_unused = 0; // L: 28 - BZip2Decompressor_state.field4172 = 0; // L: 29 + BZip2Decompressor_state.field4177 = 0; // L: 29 BZip2Decompressor_decompress(BZip2Decompressor_state); // L: 30 var1 -= BZip2Decompressor_state.outputLength; // L: 31 BZip2Decompressor_state.inputArray = null; // L: 32 @@ -38,21 +38,21 @@ public final class BZip2Decompressor { } } - @ObfuscatedName("c") + @ObfuscatedName("n") @ObfuscatedSignature( - descriptor = "(Lnc;)V" + descriptor = "(Lnh;)V" ) - static void method6696(BZip2State var0) { + static void method6788(BZip2State var0) { byte var2 = var0.out_char; // L: 40 int var3 = var0.su_rNToGo; // L: 41 int var4 = var0.nblocks_used; // L: 42 int var5 = var0.su_ch2; // L: 43 - int[] var6 = class313.BZip2Decompressor_block; // L: 44 - int var7 = var0.field4188; // L: 45 + int[] var6 = class375.BZip2Decompressor_block; // L: 44 + int var7 = var0.field4195; // L: 45 byte[] var8 = var0.outputArray; // L: 46 int var9 = var0.next_out; // L: 47 int var10 = var0.outputLength; // L: 48 - int var12 = var0.field4200 + 1; // L: 50 + int var12 = var0.field4174 + 1; // L: 50 label70: while (true) { @@ -148,25 +148,25 @@ public final class BZip2Decompressor { break; // L: 73 } - int var13 = var0.field4172; // L: 133 - var0.field4172 += var10 - var10; // L: 134 - if (var0.field4172 < var13) { // L: 135 + int var13 = var0.field4177; // L: 133 + var0.field4177 += var10 - var10; // L: 134 + if (var0.field4177 < var13) { // L: 135 } var0.out_char = var2; // L: 136 var0.su_rNToGo = var3; // L: 137 var0.nblocks_used = var4; // L: 138 var0.su_ch2 = var5; // L: 139 - class313.BZip2Decompressor_block = var6; // L: 140 - var0.field4188 = var7; // L: 141 + class375.BZip2Decompressor_block = var6; // L: 140 + var0.field4195 = var7; // L: 141 var0.outputArray = var8; // L: 142 var0.next_out = var9; // L: 143 var0.outputLength = var10; // L: 144 } // L: 145 - @ObfuscatedName("o") + @ObfuscatedName("f") @ObfuscatedSignature( - descriptor = "(Lnc;)V" + descriptor = "(Lnh;)V" ) @Export("BZip2Decompressor_decompress") static void BZip2Decompressor_decompress(BZip2State var0) { @@ -192,9 +192,9 @@ public final class BZip2Decompressor { int[] var23 = null; // L: 170 int[] var24 = null; // L: 171 int[] var25 = null; // L: 172 - var0.blockSize100k = 880335031; // L: 173 - if (class313.BZip2Decompressor_block == null) { // L: 174 - class313.BZip2Decompressor_block = new int[var0.blockSize100k * -1894003104]; + var0.blockSize100k = -1565112471; // L: 173 + if (class375.BZip2Decompressor_block == null) { // L: 174 + class375.BZip2Decompressor_block = new int[var0.blockSize100k * -162652768]; } boolean var26 = true; // L: 175 @@ -430,7 +430,7 @@ public final class BZip2Decompressor { } var10002 = var0.unzftab[var0.seqToUnseq[var1 & 255] & 255]++; // L: 396 - class313.BZip2Decompressor_block[var47] = var0.seqToUnseq[var1 & 255] & 255; // L: 397 + class375.BZip2Decompressor_block[var47] = var0.seqToUnseq[var1 & 255] & 255; // L: 397 ++var47; // L: 398 if (var45 == 0) { // L: 399 ++var43; // L: 400 @@ -489,7 +489,7 @@ public final class BZip2Decompressor { var10000 = var0.unzftab; // L: 332 for (var10000[var1 & 255] += var48; var48 > 0; --var48) { // L: 333 336 - class313.BZip2Decompressor_block[var47] = var1 & 255; // L: 334 + class375.BZip2Decompressor_block[var47] = var1 & 255; // L: 334 ++var47; // L: 335 } } @@ -509,22 +509,22 @@ public final class BZip2Decompressor { } for (var36 = 0; var36 < var47; ++var36) { // L: 426 - var1 = (byte)(class313.BZip2Decompressor_block[var36] & 255); // L: 427 - var10000 = class313.BZip2Decompressor_block; // L: 428 + var1 = (byte)(class375.BZip2Decompressor_block[var36] & 255); // L: 427 + var10000 = class375.BZip2Decompressor_block; // L: 428 int var10001 = var0.cftab[var1 & 255]; var10000[var10001] |= var36 << 8; var10002 = var0.cftab[var1 & 255]++; // L: 429 } - var0.field4188 = class313.BZip2Decompressor_block[var0.originalPointer] >> 8; // L: 431 + var0.field4195 = class375.BZip2Decompressor_block[var0.originalPointer] >> 8; // L: 431 var0.nblocks_used = 0; // L: 432 - var0.field4188 = class313.BZip2Decompressor_block[var0.field4188]; // L: 433 - var0.su_ch2 = (byte)(var0.field4188 & 255); // L: 434 - var0.field4188 >>= 8; // L: 436 + var0.field4195 = class375.BZip2Decompressor_block[var0.field4195]; // L: 433 + var0.su_ch2 = (byte)(var0.field4195 & 255); // L: 434 + var0.field4195 >>= 8; // L: 436 ++var0.nblocks_used; // L: 437 - var0.field4200 = var47; // L: 438 - method6696(var0); // L: 439 - if (var0.field4200 + 1 == var0.nblocks_used && var0.su_rNToGo == 0) { // L: 440 + var0.field4174 = var47; // L: 438 + method6788(var0); // L: 439 + if (var0.field4174 + 1 == var0.nblocks_used && var0.su_rNToGo == 0) { // L: 440 var26 = true; break; } @@ -538,27 +538,27 @@ public final class BZip2Decompressor { } } - @ObfuscatedName("g") + @ObfuscatedName("y") @ObfuscatedSignature( - descriptor = "(Lnc;)B" + descriptor = "(Lnh;)B" ) @Export("BZip2Decompressor_readNextByte") static byte BZip2Decompressor_readNextByte(BZip2State var0) { return (byte)BZip2Decompressor_readBits(8, var0); // L: 447 } - @ObfuscatedName("l") + @ObfuscatedName("p") @ObfuscatedSignature( - descriptor = "(Lnc;)B" + descriptor = "(Lnh;)B" ) @Export("BZip2Decompressor_readNextBit") static byte BZip2Decompressor_readNextBit(BZip2State var0) { return (byte)BZip2Decompressor_readBits(1, var0); // L: 451 } - @ObfuscatedName("z") + @ObfuscatedName("j") @ObfuscatedSignature( - descriptor = "(ILnc;)I" + descriptor = "(ILnh;)I" ) @Export("BZip2Decompressor_readBits") static int BZip2Decompressor_readBits(int var0, BZip2State var1) { @@ -576,9 +576,9 @@ public final class BZip2Decompressor { return var2; // L: 460 } - @ObfuscatedName("t") + @ObfuscatedName("r") @ObfuscatedSignature( - descriptor = "(Lnc;)V" + descriptor = "(Lnh;)V" ) @Export("makeMaps") static void makeMaps(BZip2State var0) { @@ -593,7 +593,7 @@ public final class BZip2Decompressor { } // L: 479 - @ObfuscatedName("v") + @ObfuscatedName("b") @Export("BZip2Decompressor_createHuffmanTables") static void BZip2Decompressor_createHuffmanTables(int[] var0, int[] var1, int[] var2, byte[] var3, int var4, int var5, int var6) { int var7 = 0; // L: 486 diff --git a/runescape-client/src/main/java/BZip2State.java b/runescape-client/src/main/java/BZip2State.java index 500f3b1edf..177867b933 100644 --- a/runescape-client/src/main/java/BZip2State.java +++ b/runescape-client/src/main/java/BZip2State.java @@ -3,164 +3,164 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; -@ObfuscatedName("nc") +@ObfuscatedName("nh") @Implements("BZip2State") public final class BZip2State { - @ObfuscatedName("h") - final int field4182; - @ObfuscatedName("c") - final int field4197; - @ObfuscatedName("o") + @ObfuscatedName("v") + final int field4171; + @ObfuscatedName("n") + final int field4161; + @ObfuscatedName("f") + final int field4162; + @ObfuscatedName("y") + final int field4186; + @ObfuscatedName("p") + final int field4164; + @ObfuscatedName("j") final int field4165; - @ObfuscatedName("g") - final int field4166; - @ObfuscatedName("l") - final int field4167; - @ObfuscatedName("z") - final int field4192; - @ObfuscatedName("t") + @ObfuscatedName("r") @Export("inputArray") byte[] inputArray; - @ObfuscatedName("v") + @ObfuscatedName("b") @ObfuscatedGetter( - intValue = 121849623 + intValue = 1851391215 ) @Export("nextByte") int nextByte; - @ObfuscatedName("b") + @ObfuscatedName("d") @ObfuscatedGetter( - intValue = 1991745759 + intValue = -1612509485 ) @Export("nextBit_unused") int nextBit_unused; - @ObfuscatedName("q") + @ObfuscatedName("s") @Export("outputArray") byte[] outputArray; - @ObfuscatedName("i") + @ObfuscatedName("u") @ObfuscatedGetter( - intValue = 326697693 + intValue = -1856584985 ) @Export("next_out") int next_out; - @ObfuscatedName("x") + @ObfuscatedName("l") @ObfuscatedGetter( - intValue = -262176685 + intValue = -795709793 ) @Export("outputLength") int outputLength; - @ObfuscatedName("k") + @ObfuscatedName("o") @ObfuscatedGetter( - intValue = 226319063 + intValue = -743824809 ) - int field4172; - @ObfuscatedName("r") + int field4177; + @ObfuscatedName("c") @Export("out_char") byte out_char; - @ObfuscatedName("p") + @ObfuscatedName("e") @ObfuscatedGetter( - intValue = 2065877891 + intValue = -1772899085 ) @Export("su_rNToGo") int su_rNToGo; - @ObfuscatedName("a") + @ObfuscatedName("g") @ObfuscatedGetter( - intValue = -899182977 + intValue = -492240629 ) @Export("bsBuff") int bsBuff; - @ObfuscatedName("e") + @ObfuscatedName("a") @ObfuscatedGetter( - intValue = 772528539 + intValue = -1723069525 ) @Export("bsLive") int bsLive; - @ObfuscatedName("d") + @ObfuscatedName("k") @Export("blockSize100k") int blockSize100k; - @ObfuscatedName("u") + @ObfuscatedName("m") @ObfuscatedGetter( - intValue = 1960680631 + intValue = -1146975777 ) @Export("originalPointer") int originalPointer; - @ObfuscatedName("m") + @ObfuscatedName("x") @ObfuscatedGetter( - intValue = 1501531237 + intValue = -1768365777 ) - int field4188; - @ObfuscatedName("j") + int field4195; + @ObfuscatedName("z") @ObfuscatedGetter( - intValue = 1394480725 + intValue = -2146251751 ) @Export("su_ch2") int su_ch2; - @ObfuscatedName("f") + @ObfuscatedName("w") @Export("unzftab") int[] unzftab; - @ObfuscatedName("s") + @ObfuscatedName("t") @ObfuscatedGetter( - intValue = -444065165 + intValue = -985271003 ) @Export("nblocks_used") int nblocks_used; - @ObfuscatedName("y") + @ObfuscatedName("h") @Export("cftab") int[] cftab; - @ObfuscatedName("n") + @ObfuscatedName("i") @ObfuscatedGetter( - intValue = -243440813 + intValue = -846985049 ) @Export("nInUse") int nInUse; - @ObfuscatedName("ag") + @ObfuscatedName("ae") @Export("inUse") boolean[] inUse; - @ObfuscatedName("ae") + @ObfuscatedName("ap") @Export("inUse16") boolean[] inUse16; - @ObfuscatedName("ao") + @ObfuscatedName("ab") @Export("seqToUnseq") byte[] seqToUnseq; - @ObfuscatedName("aj") + @ObfuscatedName("al") @Export("ll8") byte[] ll8; - @ObfuscatedName("aw") + @ObfuscatedName("ad") @Export("getAndMoveToFrontDecode_yy") int[] getAndMoveToFrontDecode_yy; - @ObfuscatedName("at") + @ObfuscatedName("ai") @Export("selector") byte[] selector; - @ObfuscatedName("av") + @ObfuscatedName("ar") @Export("selectorMtf") byte[] selectorMtf; - @ObfuscatedName("al") + @ObfuscatedName("ag") @Export("temp_charArray2d") byte[][] temp_charArray2d; - @ObfuscatedName("ap") + @ObfuscatedName("ax") @Export("limit") int[][] limit; - @ObfuscatedName("am") + @ObfuscatedName("as") @Export("base") int[][] base; - @ObfuscatedName("ax") + @ObfuscatedName("aj") @Export("perm") int[][] perm; - @ObfuscatedName("ak") + @ObfuscatedName("am") @Export("minLens") int[] minLens; - @ObfuscatedName("ay") + @ObfuscatedName("az") @ObfuscatedGetter( - intValue = 1956200463 + intValue = 375128139 ) - int field4200; + int field4174; BZip2State() { - this.field4182 = 4096; // L: 4 - this.field4197 = 16; // L: 5 - this.field4165 = 258; // L: 6 - this.field4166 = 6; // L: 7 - this.field4167 = 50; // L: 8 - this.field4192 = 18002; // L: 9 + this.field4171 = 4096; // L: 4 + this.field4161 = 16; // L: 5 + this.field4162 = 258; // L: 6 + this.field4186 = 6; // L: 7 + this.field4164 = 50; // L: 8 + this.field4165 = 18002; // L: 9 this.nextByte = 0; // L: 11 this.next_out = 0; // L: 14 this.unzftab = new int[256]; // L: 25 diff --git a/runescape-client/src/main/java/BoundaryObject.java b/runescape-client/src/main/java/BoundaryObject.java index ca8acda203..8af06471d3 100644 --- a/runescape-client/src/main/java/BoundaryObject.java +++ b/runescape-client/src/main/java/BoundaryObject.java @@ -4,66 +4,60 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("hf") +@ObfuscatedName("hw") @Implements("BoundaryObject") public final class BoundaryObject { - @ObfuscatedName("ex") + @ObfuscatedName("v") @ObfuscatedGetter( - intValue = 156821715 - ) - @Export("currentPort") - static int currentPort; - @ObfuscatedName("h") - @ObfuscatedGetter( - intValue = 81410901 + intValue = -727989945 ) @Export("tileHeight") int tileHeight; - @ObfuscatedName("c") + @ObfuscatedName("n") @ObfuscatedGetter( - intValue = 1731477927 + intValue = 662711357 ) @Export("x") int x; - @ObfuscatedName("o") + @ObfuscatedName("f") @ObfuscatedGetter( - intValue = 828570099 + intValue = -1127510877 ) @Export("y") int y; - @ObfuscatedName("g") + @ObfuscatedName("y") @ObfuscatedGetter( - intValue = -2004551277 + intValue = 643320237 ) @Export("orientationA") int orientationA; - @ObfuscatedName("l") + @ObfuscatedName("p") @ObfuscatedGetter( - intValue = -1692741097 + intValue = 1924609359 ) @Export("orientationB") int orientationB; - @ObfuscatedName("z") + @ObfuscatedName("j") @ObfuscatedSignature( - descriptor = "Lge;" + descriptor = "Lgl;" ) @Export("renderable1") public Renderable renderable1; - @ObfuscatedName("t") + @ObfuscatedName("r") @ObfuscatedSignature( - descriptor = "Lge;" + descriptor = "Lgl;" ) @Export("renderable2") public Renderable renderable2; - @ObfuscatedName("v") + @ObfuscatedName("b") @ObfuscatedGetter( - longValue = -5701861202645263443L + longValue = 1374506562499121997L ) @Export("tag") public long tag; - @ObfuscatedName("b") + @ObfuscatedName("d") @ObfuscatedGetter( - intValue = 1847127539 + intValue = -1331667357 ) @Export("flags") int flags; @@ -72,4 +66,40 @@ public final class BoundaryObject { this.tag = 0L; // L: 11 this.flags = 0; // L: 12 } // L: 14 + + @ObfuscatedName("io") + @ObfuscatedSignature( + descriptor = "(Ljava/lang/String;Ljava/lang/String;IIIIZI)V", + garbageValue = "-2076246411" + ) + @Export("insertMenuItem") + static final void insertMenuItem(String var0, String var1, int var2, int var3, int var4, int var5, boolean var6) { + if (!Client.isMenuOpen) { // L: 8805 + if (Client.menuOptionsCount < 500) { // L: 8806 + Client.menuActions[Client.menuOptionsCount] = var0; // L: 8807 + Client.menuTargets[Client.menuOptionsCount] = var1; // L: 8808 + Client.menuOpcodes[Client.menuOptionsCount] = var2; // L: 8809 + Client.menuIdentifiers[Client.menuOptionsCount] = var3; // L: 8810 + Client.menuArguments1[Client.menuOptionsCount] = var4; // L: 8811 + Client.menuArguments2[Client.menuOptionsCount] = var5; // L: 8812 + Client.menuShiftClick[Client.menuOptionsCount] = var6; // L: 8813 + ++Client.menuOptionsCount; // L: 8814 + } + + } + } // L: 8816 + + @ObfuscatedName("lo") + @ObfuscatedSignature( + descriptor = "(Lio;I)Ljava/lang/String;", + garbageValue = "-502869844" + ) + @Export("Widget_getSpellActionName") + static String Widget_getSpellActionName(Widget var0) { + if (AttackOption.Widget_unpackTargetMask(class21.getWidgetFlags(var0)) == 0) { // L: 11377 + return null; + } else { + return var0.spellActionName != null && var0.spellActionName.trim().length() != 0 ? var0.spellActionName : null; // L: 11378 11379 11381 + } + } } diff --git a/runescape-client/src/main/java/Bounds.java b/runescape-client/src/main/java/Bounds.java index c7506bbd7d..88e46693d7 100644 --- a/runescape-client/src/main/java/Bounds.java +++ b/runescape-client/src/main/java/Bounds.java @@ -4,30 +4,30 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("le") +@ObfuscatedName("li") @Implements("Bounds") public class Bounds { - @ObfuscatedName("h") + @ObfuscatedName("v") @ObfuscatedGetter( - intValue = 1148660607 + intValue = -1774637825 ) @Export("lowX") public int lowX; - @ObfuscatedName("c") + @ObfuscatedName("n") @ObfuscatedGetter( - intValue = -1798540523 + intValue = 47432047 ) @Export("lowY") public int lowY; - @ObfuscatedName("o") + @ObfuscatedName("f") @ObfuscatedGetter( - intValue = -806999089 + intValue = -250215195 ) @Export("highX") public int highX; - @ObfuscatedName("g") + @ObfuscatedName("y") @ObfuscatedGetter( - intValue = -1354432091 + intValue = 1839374135 ) @Export("highY") public int highY; @@ -41,10 +41,10 @@ public class Bounds { this(0, 0, var1, var2); // L: 10 } // L: 11 - @ObfuscatedName("h") + @ObfuscatedName("v") @ObfuscatedSignature( descriptor = "(III)V", - garbageValue = "-1883564042" + garbageValue = "1379140744" ) @Export("setLow") public void setLow(int var1, int var2) { @@ -52,10 +52,10 @@ public class Bounds { this.lowY = var2; // L: 20 } // L: 21 - @ObfuscatedName("c") + @ObfuscatedName("n") @ObfuscatedSignature( - descriptor = "(IIB)V", - garbageValue = "-102" + descriptor = "(III)V", + garbageValue = "1063534704" ) @Export("setHigh") public void setHigh(int var1, int var2) { @@ -63,31 +63,31 @@ public class Bounds { this.highY = var2; // L: 25 } // L: 26 - @ObfuscatedName("o") + @ObfuscatedName("f") @ObfuscatedSignature( - descriptor = "(Lle;Lle;B)V", - garbageValue = "77" + descriptor = "(Lli;Lli;B)V", + garbageValue = "-80" ) - public void method5849(Bounds var1, Bounds var2) { - this.method5830(var1, var2); // L: 33 - this.method5831(var1, var2); // L: 34 + public void method5977(Bounds var1, Bounds var2) { + this.method5981(var1, var2); // L: 33 + this.method5982(var1, var2); // L: 34 } // L: 35 - @ObfuscatedName("g") + @ObfuscatedName("y") @ObfuscatedSignature( - descriptor = "(Lle;Lle;I)V", - garbageValue = "2013781151" + descriptor = "(Lli;Lli;I)V", + garbageValue = "-1616583168" ) - void method5830(Bounds var1, Bounds var2) { + void method5981(Bounds var1, Bounds var2) { var2.lowX = this.lowX; // L: 38 var2.highX = this.highX; // L: 39 if (this.lowX < var1.lowX) { // L: 40 - var2.highX = (var2.highX * 1545009967 - (var1.lowX * 1545009967 - this.lowX * 1545009967)) * -806999089; // L: 41 + var2.highX = (var2.highX * -888661779 - (var1.lowX * -888661779 - this.lowX * -888661779)) * -250215195; // L: 41 var2.lowX = var1.lowX; // L: 42 } - if (var2.method5832() > var1.method5832()) { // L: 44 - var2.highX -= var2.method5832() - var1.method5832(); // L: 45 + if (var2.method5983() > var1.method5983()) { // L: 44 + var2.highX -= var2.method5983() - var1.method5983(); // L: 45 } if (var2.highX < 0) { // L: 47 @@ -96,21 +96,21 @@ public class Bounds { } // L: 48 - @ObfuscatedName("l") + @ObfuscatedName("p") @ObfuscatedSignature( - descriptor = "(Lle;Lle;I)V", - garbageValue = "-1814937047" + descriptor = "(Lli;Lli;S)V", + garbageValue = "11660" ) - void method5831(Bounds var1, Bounds var2) { + void method5982(Bounds var1, Bounds var2) { var2.lowY = this.lowY; // L: 51 var2.highY = this.highY; // L: 52 if (this.lowY < var1.lowY) { // L: 53 - var2.highY = (var2.highY * 364510765 - (var1.lowY * 364510765 - this.lowY * 364510765)) * -1354432091; // L: 54 + var2.highY = (var2.highY * 1584612999 - (var1.lowY * 1584612999 - this.lowY * 1584612999)) * 1839374135; // L: 54 var2.lowY = var1.lowY; // L: 55 } - if (var2.method5834() > var1.method5834()) { // L: 57 - var2.highY -= var2.method5834() - var1.method5834(); // L: 58 + if (var2.method5984() > var1.method5984()) { // L: 57 + var2.highY -= var2.method5984() - var1.method5984(); // L: 58 } if (var2.highY < 0) { // L: 60 @@ -119,22 +119,22 @@ public class Bounds { } // L: 61 - @ObfuscatedName("z") + @ObfuscatedName("j") @ObfuscatedSignature( - descriptor = "(I)I", - garbageValue = "1788216788" + descriptor = "(B)I", + garbageValue = "-67" ) - int method5832() { + int method5983() { return this.highX + this.lowX; // L: 64 } - @ObfuscatedName("t") + @ObfuscatedName("r") @ObfuscatedSignature( descriptor = "(B)I", - garbageValue = "111" + garbageValue = "8" ) - int method5834() { - return this.lowY + this.highY; // L: 68 + int method5984() { + return this.highY + this.lowY; // L: 68 } public String toString() { diff --git a/runescape-client/src/main/java/Buddy.java b/runescape-client/src/main/java/Buddy.java index bb523fb0b8..f1339faf85 100644 --- a/runescape-client/src/main/java/Buddy.java +++ b/runescape-client/src/main/java/Buddy.java @@ -1,29 +1,27 @@ -import java.io.File; -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("lq") +@ObfuscatedName("lv") @Implements("Buddy") public class Buddy extends User { - @ObfuscatedName("l") + @ObfuscatedName("p") @ObfuscatedGetter( - intValue = 1876506073 + intValue = 1693720149 ) @Export("world") public int world; - @ObfuscatedName("z") + @ObfuscatedName("j") @ObfuscatedGetter( - intValue = 1660852993 + intValue = -1023710905 ) @Export("int2") public int int2; - @ObfuscatedName("t") + @ObfuscatedName("r") @ObfuscatedGetter( - intValue = 278975133 + intValue = -523203081 ) @Export("rank") public int rank; @@ -32,10 +30,10 @@ public class Buddy extends User { this.world = -1; // L: 4 } // L: 8 - @ObfuscatedName("ap") + @ObfuscatedName("ao") @ObfuscatedSignature( - descriptor = "(IIB)V", - garbageValue = "45" + descriptor = "(III)V", + garbageValue = "-1819363744" ) @Export("set") void set(int var1, int var2) { @@ -43,64 +41,23 @@ public class Buddy extends User { this.int2 = var2; // L: 12 } // L: 13 - @ObfuscatedName("am") + @ObfuscatedName("aq") @ObfuscatedSignature( descriptor = "(I)I", - garbageValue = "-1247009443" + garbageValue = "1872799310" ) @Export("getWorld") public int getWorld() { return this.world; // L: 16 } - @ObfuscatedName("ax") + @ObfuscatedName("aw") @ObfuscatedSignature( descriptor = "(I)Z", - garbageValue = "731832682" + garbageValue = "2092193613" ) @Export("hasWorld") public boolean hasWorld() { return this.world > 0; // L: 20 } - - @ObfuscatedName("o") - @ObfuscatedSignature( - descriptor = "(Ljava/lang/String;Ljava/lang/String;ZI)Lng;", - garbageValue = "2145866234" - ) - @Export("getPreferencesFile") - public static AccessFile getPreferencesFile(String var0, String var1, boolean var2) { - File var3 = new File(JagexCache.cacheDir, "preferences" + var0 + ".dat"); // L: 254 - if (var3.exists()) { // L: 255 - try { - AccessFile var10 = new AccessFile(var3, "rw", 10000L); // L: 257 - return var10; // L: 258 - } catch (IOException var9) { // L: 260 - } - } - - String var4 = ""; // L: 262 - if (class310.cacheGamebuild == 33) { // L: 263 - var4 = "_rc"; - } else if (class310.cacheGamebuild == 34) { // L: 264 - var4 = "_wip"; - } - - File var5 = new File(AccessFile.userHomeDirectory, "jagex_" + var1 + "_preferences" + var0 + var4 + ".dat"); // L: 265 - AccessFile var6; - if (!var2 && var5.exists()) { // L: 266 - try { - var6 = new AccessFile(var5, "rw", 10000L); // L: 268 - return var6; // L: 269 - } catch (IOException var8) { // L: 271 - } - } - - try { - var6 = new AccessFile(var3, "rw", 10000L); // L: 274 - return var6; // L: 275 - } catch (IOException var7) { // L: 277 - throw new RuntimeException(); // L: 278 - } - } } diff --git a/runescape-client/src/main/java/BuddyRankComparator.java b/runescape-client/src/main/java/BuddyRankComparator.java index 86ff1f3371..b69b4e05a3 100644 --- a/runescape-client/src/main/java/BuddyRankComparator.java +++ b/runescape-client/src/main/java/BuddyRankComparator.java @@ -6,45 +6,80 @@ import net.runelite.mapping.ObfuscatedSignature; @ObfuscatedName("dt") @Implements("BuddyRankComparator") public class BuddyRankComparator extends AbstractUserComparator { - @ObfuscatedName("h") + @ObfuscatedName("sq") + @ObfuscatedSignature( + descriptor = "Ljm;" + ) + @Export("grandExchangeEvents") + static GrandExchangeEvents grandExchangeEvents; + @ObfuscatedName("c") + @ObfuscatedSignature( + descriptor = "Ljf;" + ) + @Export("NetCache_currentResponse") + public static NetFileRequest NetCache_currentResponse; + @ObfuscatedName("v") @Export("reversed") final boolean reversed; public BuddyRankComparator(boolean var1) { this.reversed = var1; // L: 10 - } // L: 11 + } - @ObfuscatedName("h") + @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "(Llq;Llq;I)I", - garbageValue = "2091372703" + descriptor = "(Llv;Llv;B)I", + garbageValue = "17" ) @Export("compareBuddy") int compareBuddy(Buddy var1, Buddy var2) { - if (var2.rank != var1.rank) { // L: 14 - return this.reversed ? var1.rank - var2.rank : var2.rank - var1.rank; // L: 15 + if (var2.rank != var1.rank) { + return this.reversed ? var1.rank - var2.rank : var2.rank - var1.rank; } else { - return this.compareUser(var1, var2); // L: 17 + return this.compareUser(var1, var2); } } public int compare(Object var1, Object var2) { - return this.compareBuddy((Buddy)var1, (Buddy)var2); // L: 21 + return this.compareBuddy((Buddy)var1, (Buddy)var2); } - @ObfuscatedName("fv") + @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "(S)V", - garbageValue = "30955" + descriptor = "([Ljava/lang/CharSequence;III)Ljava/lang/String;", + garbageValue = "2136518609" ) - static final void method2492() { - if (Client.logoutTimer > 0) { // L: 3099 - FileSystem.logOut(); // L: 3100 + public static String method2484(CharSequence[] var0, int var1, int var2) { + if (var2 == 0) { // L: 11 + return ""; + } else if (var2 == 1) { // L: 12 + CharSequence var10 = var0[var1]; // L: 13 + return var10 == null ? "null" : var10.toString(); // L: 14 15 } else { - Client.timer.method5464(); // L: 3103 - Client.updateGameState(40); // L: 3104 - TriBool.field3866 = Client.packetWriter.getSocket(); // L: 3105 - Client.packetWriter.removeSocket(); // L: 3106 + int var3 = var2 + var1; // L: 17 + int var4 = 0; // L: 18 + + for (int var5 = var1; var5 < var3; ++var5) { // L: 19 + CharSequence var9 = var0[var5]; // L: 20 + if (var9 == null) { // L: 21 + var4 += 4; + } else { + var4 += var9.length(); // L: 22 + } + } + + StringBuilder var8 = new StringBuilder(var4); // L: 24 + + for (int var6 = var1; var6 < var3; ++var6) { // L: 25 + CharSequence var7 = var0[var6]; // L: 26 + if (var7 == null) { // L: 27 + var8.append("null"); + } else { + var8.append(var7); // L: 28 + } + } + + return var8.toString(); // L: 30 } - } // L: 3101 3107 + } } diff --git a/runescape-client/src/main/java/Buffer.java b/runescape-client/src/main/java/Buffer.java index f16782d6ea..67b4c74e92 100644 --- a/runescape-client/src/main/java/Buffer.java +++ b/runescape-client/src/main/java/Buffer.java @@ -5,21 +5,21 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("nk") +@ObfuscatedName("nd") @Implements("Buffer") public class Buffer extends Node { - @ObfuscatedName("v") + @ObfuscatedName("b") @Export("crc32Table") static int[] crc32Table; - @ObfuscatedName("q") + @ObfuscatedName("s") @Export("crc64Table") static long[] crc64Table; - @ObfuscatedName("z") + @ObfuscatedName("j") @Export("array") public byte[] array; - @ObfuscatedName("t") + @ObfuscatedName("r") @ObfuscatedGetter( - intValue = 1556710419 + intValue = -442398587 ) @Export("offset") public int offset; @@ -48,7 +48,7 @@ public class Buffer extends Node { long var0 = (long)var2; // L: 35 for (int var3 = 0; var3 < 8; ++var3) { // L: 36 - if ((var0 & 1L) == 1L) { // L: 37 + if (1L == (var0 & 1L)) { // L: 37 var0 = var0 >>> 1 ^ -3932672073523589310L; } else { var0 >>>= 1; // L: 38 @@ -61,7 +61,7 @@ public class Buffer extends Node { } // L: 42 public Buffer(int var1) { - this.array = WorldMapScaleHandler.ByteArrayPool_getArray(var1); // L: 54 + this.array = class5.ByteArrayPool_getArray(var1); // L: 54 this.offset = 0; // L: 55 } // L: 56 @@ -70,34 +70,34 @@ public class Buffer extends Node { this.offset = 0; // L: 60 } // L: 61 - @ObfuscatedName("ay") + @ObfuscatedName("ar") @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "-680959814" + descriptor = "(B)V", + garbageValue = "32" ) @Export("releaseArray") public void releaseArray() { if (this.array != null) { // L: 64 - WorldMapSection0.ByteArrayPool_release(this.array); + ItemLayer.ByteArrayPool_release(this.array); } this.array = null; // L: 65 } // L: 66 - @ObfuscatedName("ai") + @ObfuscatedName("ag") @ObfuscatedSignature( - descriptor = "(IS)V", - garbageValue = "-6746" + descriptor = "(II)V", + garbageValue = "303066737" ) @Export("writeByte") public void writeByte(int var1) { this.array[++this.offset - 1] = (byte)var1; // L: 69 } // L: 70 - @ObfuscatedName("aa") + @ObfuscatedName("ax") @ObfuscatedSignature( - descriptor = "(IB)V", - garbageValue = "14" + descriptor = "(II)V", + garbageValue = "-1826329058" ) @Export("writeShort") public void writeShort(int var1) { @@ -105,10 +105,10 @@ public class Buffer extends Node { this.array[++this.offset - 1] = (byte)var1; // L: 74 } // L: 75 - @ObfuscatedName("au") + @ObfuscatedName("as") @ObfuscatedSignature( descriptor = "(II)V", - garbageValue = "-524333253" + garbageValue = "-1756916961" ) @Export("writeMedium") public void writeMedium(int var1) { @@ -117,10 +117,10 @@ public class Buffer extends Node { this.array[++this.offset - 1] = (byte)var1; // L: 80 } // L: 81 - @ObfuscatedName("as") + @ObfuscatedName("aj") @ObfuscatedSignature( descriptor = "(II)V", - garbageValue = "-761674832" + garbageValue = "1017867447" ) @Export("writeInt") public void writeInt(int var1) { @@ -130,7 +130,7 @@ public class Buffer extends Node { this.array[++this.offset - 1] = (byte)var1; // L: 87 } // L: 88 - @ObfuscatedName("ad") + @ObfuscatedName("am") @Export("writeLongMedium") public void writeLongMedium(long var1) { this.array[++this.offset - 1] = (byte)((int)(var1 >> 40)); // L: 91 @@ -141,7 +141,7 @@ public class Buffer extends Node { this.array[++this.offset - 1] = (byte)((int)var1); // L: 96 } // L: 97 - @ObfuscatedName("ac") + @ObfuscatedName("az") @Export("writeLong") public void writeLong(long var1) { this.array[++this.offset - 1] = (byte)((int)(var1 >> 56)); // L: 100 @@ -154,20 +154,20 @@ public class Buffer extends Node { this.array[++this.offset - 1] = (byte)((int)var1); // L: 107 } // L: 108 - @ObfuscatedName("az") + @ObfuscatedName("av") @ObfuscatedSignature( - descriptor = "(ZI)V", - garbageValue = "-2114638693" + descriptor = "(ZS)V", + garbageValue = "-16479" ) @Export("writeBoolean") public void writeBoolean(boolean var1) { this.writeByte(var1 ? 1 : 0); // L: 111 } // L: 112 - @ObfuscatedName("ab") + @ObfuscatedName("at") @ObfuscatedSignature( descriptor = "(Ljava/lang/String;I)V", - garbageValue = "1155791680" + garbageValue = "-427478981" ) @Export("writeStringCp1252NullTerminated") public void writeStringCp1252NullTerminated(String var1) { @@ -175,919 +175,945 @@ public class Buffer extends Node { if (var2 >= 0) { // L: 120 throw new IllegalArgumentException(""); } else { - this.offset += AbstractWorldMapIcon.encodeStringCp1252(var1, 0, var1.length(), this.array, this.offset); // L: 121 + this.offset += Player.encodeStringCp1252(var1, 0, var1.length(), this.array, this.offset); // L: 121 this.array[++this.offset - 1] = 0; // L: 122 } } // L: 123 - @ObfuscatedName("ar") + @ObfuscatedName("ao") @ObfuscatedSignature( - descriptor = "(Ljava/lang/String;I)V", - garbageValue = "-409538179" + descriptor = "(Ljava/lang/String;B)V", + garbageValue = "-39" ) @Export("writeStringCp1252NullCircumfixed") public void writeStringCp1252NullCircumfixed(String var1) { - int var2 = var1.indexOf(0); // L: 126 - if (var2 >= 0) { // L: 127 + int var2 = var1.indexOf(0); // L: 130 + if (var2 >= 0) { // L: 131 throw new IllegalArgumentException(""); } else { - this.array[++this.offset - 1] = 0; // L: 128 - this.offset += AbstractWorldMapIcon.encodeStringCp1252(var1, 0, var1.length(), this.array, this.offset); // L: 129 - this.array[++this.offset - 1] = 0; // L: 130 + this.array[++this.offset - 1] = 0; // L: 132 + this.offset += Player.encodeStringCp1252(var1, 0, var1.length(), this.array, this.offset); // L: 133 + this.array[++this.offset - 1] = 0; // L: 134 } - } // L: 131 + } // L: 135 - @ObfuscatedName("ah") + @ObfuscatedName("aq") @ObfuscatedSignature( - descriptor = "(Ljava/lang/CharSequence;B)V", - garbageValue = "13" + descriptor = "(Ljava/lang/CharSequence;I)V", + garbageValue = "499802318" ) @Export("writeCESU8") public void writeCESU8(CharSequence var1) { - int var2 = class25.method313(var1); // L: 134 - this.array[++this.offset - 1] = 0; // L: 135 - this.writeVarInt(var2); // L: 136 - this.offset += ChatChannel.method2042(this.array, this.offset, var1); // L: 137 - } // L: 138 + int var3 = var1.length(); // L: 140 + int var4 = 0; // L: 141 - @ObfuscatedName("af") + int var5; + for (var5 = 0; var5 < var3; ++var5) { // L: 142 + char var12 = var1.charAt(var5); // L: 143 + if (var12 <= 127) { // L: 144 + ++var4; + } else if (var12 <= 2047) { // L: 145 + var4 += 2; + } else { + var4 += 3; // L: 146 + } + } + + this.array[++this.offset - 1] = 0; // L: 151 + this.writeVarInt(var4); // L: 152 + var4 = this.offset * -1025691571; // L: 153 + byte[] var6 = this.array; // L: 155 + int var7 = this.offset; // L: 156 + int var8 = var1.length(); // L: 158 + int var9 = var7; // L: 159 + + for (int var10 = 0; var10 < var8; ++var10) { // L: 160 + char var11 = var1.charAt(var10); // L: 161 + if (var11 <= 127) { // L: 162 + var6[var9++] = (byte)var11; // L: 163 + } else if (var11 <= 2047) { // L: 165 + var6[var9++] = (byte)(192 | var11 >> 6); // L: 166 + var6[var9++] = (byte)(128 | var11 & '?'); // L: 167 + } else { + var6[var9++] = (byte)(224 | var11 >> '\f'); // L: 170 + var6[var9++] = (byte)(128 | var11 >> 6 & 63); // L: 171 + var6[var9++] = (byte)(128 | var11 & '?'); // L: 172 + } + } + + var5 = var9 - var7; // L: 175 + this.offset = (var4 + var5 * -1025691571) * -442398587; // L: 177 + } // L: 178 + + @ObfuscatedName("aw") @ObfuscatedSignature( descriptor = "([BIII)V", - garbageValue = "1505516276" + garbageValue = "1890718426" ) @Export("writeBytes") public void writeBytes(byte[] var1, int var2, int var3) { - for (int var4 = var2; var4 < var3 + var2; ++var4) { // L: 141 - this.array[++this.offset - 1] = var1[var4]; + for (int var4 = var2; var4 < var3 + var2; ++var4) { + this.array[++this.offset - 1] = var1[var4]; // L: 181 } - } // L: 142 + } // L: 182 - @ObfuscatedName("an") + @ObfuscatedName("af") @ObfuscatedSignature( - descriptor = "(Lnk;I)V", - garbageValue = "925576173" + descriptor = "(Lnd;B)V", + garbageValue = "8" ) - public void method6441(Buffer var1) { - this.writeBytes(var1.array, 0, var1.offset); // L: 145 - } // L: 146 + public void method6768(Buffer var1) { + this.writeBytes(var1.array, 0, var1.offset); // L: 185 + } // L: 186 - @ObfuscatedName("bd") + @ObfuscatedName("ak") @ObfuscatedSignature( descriptor = "(II)V", - garbageValue = "-1000118777" + garbageValue = "-665940595" ) @Export("writeLengthInt") public void writeLengthInt(int var1) { - if (var1 < 0) { // L: 149 - throw new IllegalArgumentException(); // L: 150 + if (var1 < 0) { // L: 189 + throw new IllegalArgumentException(); // L: 190 } else { - this.array[this.offset - var1 - 4] = (byte)(var1 >> 24); // L: 152 - this.array[this.offset - var1 - 3] = (byte)(var1 >> 16); // L: 153 - this.array[this.offset - var1 - 2] = (byte)(var1 >> 8); // L: 154 - this.array[this.offset - var1 - 1] = (byte)var1; // L: 155 + this.array[this.offset - var1 - 4] = (byte)(var1 >> 24); // L: 192 + this.array[this.offset - var1 - 3] = (byte)(var1 >> 16); // L: 193 + this.array[this.offset - var1 - 2] = (byte)(var1 >> 8); // L: 194 + this.array[this.offset - var1 - 1] = (byte)var1; // L: 195 } - } // L: 156 + } // L: 196 - @ObfuscatedName("bw") + @ObfuscatedName("ay") @ObfuscatedSignature( descriptor = "(IB)V", - garbageValue = "-122" + garbageValue = "2" ) @Export("writeLengthShort") public void writeLengthShort(int var1) { - if (var1 >= 0 && var1 <= 65535) { // L: 159 - this.array[this.offset - var1 - 2] = (byte)(var1 >> 8); // L: 162 - this.array[this.offset - var1 - 1] = (byte)var1; // L: 163 + if (var1 >= 0 && var1 <= 65535) { // L: 199 + this.array[this.offset - var1 - 2] = (byte)(var1 >> 8); // L: 202 + this.array[this.offset - var1 - 1] = (byte)var1; // L: 203 } else { - throw new IllegalArgumentException(); // L: 160 + throw new IllegalArgumentException(); // L: 200 } - } // L: 164 + } // L: 204 - @ObfuscatedName("bf") + @ObfuscatedName("aa") @ObfuscatedSignature( descriptor = "(II)V", - garbageValue = "2145686126" + garbageValue = "-576610400" ) @Export("writeLengthByte") public void writeLengthByte(int var1) { - if (var1 >= 0 && var1 <= 255) { // L: 167 - this.array[this.offset - var1 - 1] = (byte)var1; // L: 170 + if (var1 >= 0 && var1 <= 255) { // L: 207 + this.array[this.offset - var1 - 1] = (byte)var1; // L: 210 } else { - throw new IllegalArgumentException(); // L: 168 + throw new IllegalArgumentException(); // L: 208 } - } // L: 171 + } // L: 211 - @ObfuscatedName("bu") + @ObfuscatedName("au") @ObfuscatedSignature( descriptor = "(II)V", - garbageValue = "1925411229" + garbageValue = "1514054821" ) @Export("writeSmartByteShort") public void writeSmartByteShort(int var1) { - if (var1 >= 0 && var1 < 128) { // L: 174 - this.writeByte(var1); // L: 175 - } else if (var1 >= 0 && var1 < 32768) { // L: 178 - this.writeShort(var1 + 32768); // L: 179 + if (var1 >= 0 && var1 < 128) { // L: 214 + this.writeByte(var1); // L: 215 + } else if (var1 >= 0 && var1 < 32768) { // L: 218 + this.writeShort(var1 + 32768); // L: 219 } else { - throw new IllegalArgumentException(); // L: 182 + throw new IllegalArgumentException(); // L: 222 } - } // L: 176 180 + } // L: 216 220 - @ObfuscatedName("bb") + @ObfuscatedName("an") @ObfuscatedSignature( - descriptor = "(IB)V", - garbageValue = "32" + descriptor = "(II)V", + garbageValue = "2063951954" ) @Export("writeVarInt") public void writeVarInt(int var1) { - if ((var1 & -128) != 0) { // L: 186 - if ((var1 & -16384) != 0) { // L: 187 - if ((var1 & -2097152) != 0) { // L: 188 - if ((var1 & -268435456) != 0) { // L: 189 + if ((var1 & -128) != 0) { // L: 226 + if ((var1 & -16384) != 0) { // L: 227 + if ((var1 & -2097152) != 0) { // L: 228 + if ((var1 & -268435456) != 0) { // L: 229 this.writeByte(var1 >>> 28 | 128); } - this.writeByte(var1 >>> 21 | 128); // L: 190 + this.writeByte(var1 >>> 21 | 128); // L: 230 } - this.writeByte(var1 >>> 14 | 128); // L: 192 + this.writeByte(var1 >>> 14 | 128); // L: 232 } - this.writeByte(var1 >>> 7 | 128); // L: 194 + this.writeByte(var1 >>> 7 | 128); // L: 234 } - this.writeByte(var1 & 127); // L: 196 - } // L: 197 + this.writeByte(var1 & 127); // L: 236 + } // L: 237 - @ObfuscatedName("bk") + @ObfuscatedName("bd") @ObfuscatedSignature( descriptor = "(I)I", - garbageValue = "1358138020" + garbageValue = "-236245275" ) @Export("readUnsignedByte") public int readUnsignedByte() { - return this.array[++this.offset - 1] & 255; // L: 200 + return this.array[++this.offset - 1] & 255; // L: 240 } @ObfuscatedName("bt") @ObfuscatedSignature( descriptor = "(B)B", - garbageValue = "12" + garbageValue = "-17" ) @Export("readByte") public byte readByte() { - return this.array[++this.offset - 1]; // L: 204 + return this.array[++this.offset - 1]; // L: 244 } - @ObfuscatedName("by") + @ObfuscatedName("bq") @ObfuscatedSignature( - descriptor = "(I)I", - garbageValue = "1575802030" + descriptor = "(B)I", + garbageValue = "-37" ) @Export("readUnsignedShort") public int readUnsignedShort() { - this.offset += 2; // L: 208 - return (this.array[this.offset - 1] & 255) + ((this.array[this.offset - 2] & 255) << 8); // L: 209 + this.offset += 2; // L: 248 + return (this.array[this.offset - 1] & 255) + ((this.array[this.offset - 2] & 255) << 8); // L: 249 } - @ObfuscatedName("bz") + @ObfuscatedName("bu") @ObfuscatedSignature( - descriptor = "(B)I", - garbageValue = "-119" + descriptor = "(I)I", + garbageValue = "-1542485131" ) @Export("readShort") public int readShort() { - this.offset += 2; // L: 213 - int var1 = (this.array[this.offset - 1] & 255) + ((this.array[this.offset - 2] & 255) << 8); // L: 214 - if (var1 > 32767) { // L: 215 + this.offset += 2; // L: 253 + int var1 = (this.array[this.offset - 1] & 255) + ((this.array[this.offset - 2] & 255) << 8); // L: 254 + if (var1 > 32767) { // L: 255 var1 -= 65536; } - return var1; // L: 216 + return var1; // L: 256 } - @ObfuscatedName("br") + @ObfuscatedName("bl") @ObfuscatedSignature( - descriptor = "(I)I", - garbageValue = "1140346310" + descriptor = "(B)I", + garbageValue = "-108" ) @Export("readMedium") public int readMedium() { - this.offset += 3; // L: 220 - return ((this.array[this.offset - 3] & 255) << 16) + (this.array[this.offset - 1] & 255) + ((this.array[this.offset - 2] & 255) << 8); // L: 221 + this.offset += 3; // L: 260 + return ((this.array[this.offset - 3] & 255) << 16) + (this.array[this.offset - 1] & 255) + ((this.array[this.offset - 2] & 255) << 8); // L: 261 + } + + @ObfuscatedName("bv") + @ObfuscatedSignature( + descriptor = "(B)I", + garbageValue = "-62" + ) + @Export("readInt") + public int readInt() { + this.offset += 4; // L: 265 + return ((this.array[this.offset - 3] & 255) << 16) + (this.array[this.offset - 1] & 255) + ((this.array[this.offset - 2] & 255) << 8) + ((this.array[this.offset - 4] & 255) << 24); // L: 266 } @ObfuscatedName("bm") - @ObfuscatedSignature( - descriptor = "(B)I", - garbageValue = "-6" - ) - @Export("readInt") - public int readInt() { - this.offset += 4; // L: 225 - return ((this.array[this.offset - 3] & 255) << 16) + (this.array[this.offset - 1] & 255) + ((this.array[this.offset - 2] & 255) << 8) + ((this.array[this.offset - 4] & 255) << 24); // L: 226 - } - - @ObfuscatedName("bn") @ObfuscatedSignature( descriptor = "(I)J", - garbageValue = "474358183" + garbageValue = "-1938103618" ) @Export("readLong") public long readLong() { - long var1 = (long)this.readInt() & 4294967295L; // L: 230 - long var3 = (long)this.readInt() & 4294967295L; // L: 231 - return (var1 << 32) + var3; // L: 232 + long var1 = (long)this.readInt() & 4294967295L; // L: 270 + long var3 = (long)this.readInt() & 4294967295L; // L: 271 + return (var1 << 32) + var3; // L: 272 } - @ObfuscatedName("ba") + @ObfuscatedName("bz") @ObfuscatedSignature( descriptor = "(I)Z", - garbageValue = "-1218772276" + garbageValue = "788058203" ) @Export("readBoolean") public boolean readBoolean() { - return (this.readUnsignedByte() & 1) == 1; // L: 236 + return (this.readUnsignedByte() & 1) == 1; // L: 276 } - @ObfuscatedName("bg") + @ObfuscatedName("bh") @ObfuscatedSignature( descriptor = "(I)Ljava/lang/String;", - garbageValue = "-960368875" + garbageValue = "-189323230" ) @Export("readStringCp1252NullTerminatedOrNull") public String readStringCp1252NullTerminatedOrNull() { - if (this.array[this.offset] == 0) { // L: 240 - ++this.offset; // L: 241 - return null; // L: 242 + if (this.array[this.offset] == 0) { // L: 280 + ++this.offset; // L: 281 + return null; // L: 282 } else { - return this.readStringCp1252NullTerminated(); // L: 244 + return this.readStringCp1252NullTerminated(); // L: 284 } } - @ObfuscatedName("bi") + @ObfuscatedName("bs") @ObfuscatedSignature( descriptor = "(I)Ljava/lang/String;", - garbageValue = "888129368" + garbageValue = "-391631059" ) @Export("readStringCp1252NullTerminated") public String readStringCp1252NullTerminated() { - int var1 = this.offset; // L: 248 + int var1 = this.offset; // L: 288 - while (this.array[++this.offset - 1] != 0) { // L: 249 + while (this.array[++this.offset - 1] != 0) { // L: 289 } - int var2 = this.offset - var1 - 1; // L: 250 - return var2 == 0 ? "" : class17.decodeStringCp1252(this.array, var1, var2); // L: 251 252 + int var2 = this.offset - var1 - 1; // L: 290 + return var2 == 0 ? "" : class43.decodeStringCp1252(this.array, var1, var2); // L: 291 292 } - @ObfuscatedName("bp") + @ObfuscatedName("br") @ObfuscatedSignature( descriptor = "(B)Ljava/lang/String;", - garbageValue = "3" + garbageValue = "100" ) @Export("readStringCp1252NullCircumfixed") public String readStringCp1252NullCircumfixed() { - byte var1 = this.array[++this.offset - 1]; // L: 256 - if (var1 != 0) { // L: 257 + byte var1 = this.array[++this.offset - 1]; // L: 296 + if (var1 != 0) { // L: 297 throw new IllegalStateException(""); } else { - int var2 = this.offset; // L: 258 + int var2 = this.offset; // L: 298 - while (this.array[++this.offset - 1] != 0) { // L: 259 + while (this.array[++this.offset - 1] != 0) { // L: 299 } - int var3 = this.offset - var2 - 1; // L: 260 - return var3 == 0 ? "" : class17.decodeStringCp1252(this.array, var2, var3); // L: 261 262 + int var3 = this.offset - var2 - 1; // L: 300 + return var3 == 0 ? "" : class43.decodeStringCp1252(this.array, var2, var3); // L: 301 302 } } - @ObfuscatedName("bj") + @ObfuscatedName("bf") @ObfuscatedSignature( descriptor = "(B)Ljava/lang/String;", - garbageValue = "-1" + garbageValue = "41" ) @Export("readCESU8") public String readCESU8() { - byte var1 = this.array[++this.offset - 1]; // L: 266 - if (var1 != 0) { // L: 267 + byte var1 = this.array[++this.offset - 1]; // L: 306 + if (var1 != 0) { // L: 307 throw new IllegalStateException(""); } else { - int var2 = this.readVarInt(); // L: 268 - if (var2 + this.offset > this.array.length) { // L: 269 + int var2 = this.readVarInt(); // L: 308 + if (var2 + this.offset > this.array.length) { // L: 309 throw new IllegalStateException(""); } else { - byte[] var4 = this.array; // L: 271 - int var5 = this.offset; // L: 272 - char[] var6 = new char[var2]; // L: 274 - int var7 = 0; // L: 275 - int var8 = var5; // L: 276 + byte[] var4 = this.array; // L: 311 + int var5 = this.offset; // L: 312 + char[] var6 = new char[var2]; // L: 314 + int var7 = 0; // L: 315 + int var8 = var5; // L: 316 int var11; - for (int var9 = var2 + var5; var8 < var9; var6[var7++] = (char)var11) { // L: 277 278 309 - int var10 = var4[var8++] & 255; // L: 279 - if (var10 < 128) { // L: 281 - if (var10 == 0) { // L: 282 + for (int var9 = var2 + var5; var8 < var9; var6[var7++] = (char)var11) { // L: 317 318 349 + int var10 = var4[var8++] & 255; // L: 319 + if (var10 < 128) { // L: 321 + if (var10 == 0) { // L: 322 var11 = 65533; } else { - var11 = var10; // L: 283 + var11 = var10; // L: 323 } - } else if (var10 < 192) { // L: 285 + } else if (var10 < 192) { // L: 325 var11 = 65533; - } else if (var10 < 224) { // L: 286 - if (var8 < var9 && (var4[var8] & 192) == 128) { // L: 287 - var11 = (var10 & 31) << 6 | var4[var8++] & 63; // L: 288 - if (var11 < 128) { // L: 289 + } else if (var10 < 224) { // L: 326 + if (var8 < var9 && (var4[var8] & 192) == 128) { // L: 327 + var11 = (var10 & 31) << 6 | var4[var8++] & 63; // L: 328 + if (var11 < 128) { // L: 329 var11 = 65533; } } else { - var11 = 65533; // L: 291 + var11 = 65533; // L: 331 } - } else if (var10 < 240) { // L: 293 - if (var8 + 1 < var9 && (var4[var8] & 192) == 128 && (var4[var8 + 1] & 192) == 128) { // L: 294 - var11 = (var10 & 15) << 12 | (var4[var8++] & 63) << 6 | var4[var8++] & 63; // L: 295 - if (var11 < 2048) { // L: 296 + } else if (var10 < 240) { // L: 333 + if (var8 + 1 < var9 && (var4[var8] & 192) == 128 && (var4[var8 + 1] & 192) == 128) { // L: 334 + var11 = (var10 & 15) << 12 | (var4[var8++] & 63) << 6 | var4[var8++] & 63; // L: 335 + if (var11 < 2048) { // L: 336 var11 = 65533; } } else { - var11 = 65533; // L: 298 + var11 = 65533; // L: 338 } - } else if (var10 < 248) { // L: 300 - if (var8 + 2 < var9 && (var4[var8] & 192) == 128 && (var4[var8 + 1] & 192) == 128 && (var4[var8 + 2] & 192) == 128) { // L: 301 - var11 = (var10 & 7) << 18 | (var4[var8++] & 63) << 12 | (var4[var8++] & 63) << 6 | var4[var8++] & 63; // L: 302 - if (var11 >= 65536 && var11 <= 1114111) { // L: 303 - var11 = 65533; // L: 304 + } else if (var10 < 248) { // L: 340 + if (var8 + 2 < var9 && (var4[var8] & 192) == 128 && (var4[var8 + 1] & 192) == 128 && (var4[var8 + 2] & 192) == 128) { // L: 341 + var11 = (var10 & 7) << 18 | (var4[var8++] & 63) << 12 | (var4[var8++] & 63) << 6 | var4[var8++] & 63; // L: 342 + if (var11 >= 65536 && var11 <= 1114111) { // L: 343 + var11 = 65533; // L: 344 } else { var11 = 65533; } } else { - var11 = 65533; // L: 306 + var11 = 65533; // L: 346 } } else { - var11 = 65533; // L: 308 + var11 = 65533; // L: 348 } } - String var3 = new String(var6, 0, var7); // L: 311 - this.offset += var2; // L: 314 - return var3; // L: 315 + String var3 = new String(var6, 0, var7); // L: 351 + this.offset += var2; // L: 354 + return var3; // L: 355 } } } - @ObfuscatedName("be") + @ObfuscatedName("ba") @ObfuscatedSignature( - descriptor = "([BIIB)V", - garbageValue = "-105" + descriptor = "([BIII)V", + garbageValue = "1260377098" ) @Export("readBytes") public void readBytes(byte[] var1, int var2, int var3) { for (int var4 = var2; var4 < var3 + var2; ++var4) { - var1[var4] = this.array[++this.offset - 1]; // L: 319 + var1[var4] = this.array[++this.offset - 1]; // L: 359 } - } // L: 320 + } // L: 360 - @ObfuscatedName("bs") + @ObfuscatedName("be") @ObfuscatedSignature( - descriptor = "(I)I", - garbageValue = "2110023250" + descriptor = "(B)I", + garbageValue = "88" ) @Export("readShortSmart") public int readShortSmart() { - int var1 = this.array[this.offset] & 255; // L: 323 - return var1 < 128 ? this.readUnsignedByte() - 64 : this.readUnsignedShort() - 49152; // L: 324 325 + int var1 = this.array[this.offset] & 255; // L: 363 + return var1 < 128 ? this.readUnsignedByte() - 64 : this.readUnsignedShort() - 49152; // L: 364 365 + } + + @ObfuscatedName("bj") + @ObfuscatedSignature( + descriptor = "(B)I", + garbageValue = "-104" + ) + @Export("readUShortSmart") + public int readUShortSmart() { + int var1 = this.array[this.offset] & 255; // L: 369 + return var1 < 128 ? this.readUnsignedByte() : this.readUnsignedShort() - 32768; // L: 370 371 } @ObfuscatedName("bx") @ObfuscatedSignature( descriptor = "(I)I", - garbageValue = "-286680622" + garbageValue = "-1225252005" ) - @Export("readUShortSmart") - public int readUShortSmart() { - int var1 = this.array[this.offset] & 255; // L: 329 - return var1 < 128 ? this.readUnsignedByte() : this.readUnsignedShort() - 32768; // L: 330 331 - } - - @ObfuscatedName("bv") - @ObfuscatedSignature( - descriptor = "(I)I", - garbageValue = "1606093630" - ) - public int method6462() { - int var1 = 0; // L: 335 + public int method6560() { + int var1 = 0; // L: 375 int var2; - for (var2 = this.readUShortSmart(); var2 == 32767; var2 = this.readUShortSmart()) { // L: 336 337 339 - var1 += 32767; // L: 338 + for (var2 = this.readUShortSmart(); var2 == 32767; var2 = this.readUShortSmart()) { // L: 376 377 379 + var1 += 32767; // L: 378 } - var1 += var2; // L: 341 - return var1; // L: 342 + var1 += var2; // L: 381 + return var1; // L: 382 } - @ObfuscatedName("bh") - @ObfuscatedSignature( - descriptor = "(S)I", - garbageValue = "15286" - ) - public int method6463() { - return this.array[this.offset] < 0 ? this.readInt() & Integer.MAX_VALUE : this.readUnsignedShort(); // L: 346 347 - } - - @ObfuscatedName("bl") + @ObfuscatedName("bp") @ObfuscatedSignature( descriptor = "(I)I", - garbageValue = "1285482969" + garbageValue = "-1043655096" ) - public int method6464() { - if (this.array[this.offset] < 0) { // L: 351 + public int method6569() { + return this.array[this.offset] < 0 ? this.readInt() & Integer.MAX_VALUE : this.readUnsignedShort(); // L: 386 387 + } + + @ObfuscatedName("bn") + @ObfuscatedSignature( + descriptor = "(I)I", + garbageValue = "1957977001" + ) + public int method6583() { + if (this.array[this.offset] < 0) { // L: 391 return this.readInt() & Integer.MAX_VALUE; } else { - int var1 = this.readUnsignedShort(); // L: 352 - return var1 == 32767 ? -1 : var1; // L: 353 + int var1 = this.readUnsignedShort(); // L: 392 + return var1 == 32767 ? -1 : var1; // L: 393 } } - @ObfuscatedName("bc") - @ObfuscatedSignature( - descriptor = "(I)I", - garbageValue = "-235714575" - ) - @Export("readVarInt") - public int readVarInt() { - byte var1 = this.array[++this.offset - 1]; // L: 358 - - int var2; - for (var2 = 0; var1 < 0; var1 = this.array[++this.offset - 1]) { // L: 359 360 362 - var2 = (var2 | var1 & 127) << 7; // L: 361 - } - - return var2 | var1; // L: 364 - } - @ObfuscatedName("bo") @ObfuscatedSignature( - descriptor = "([IB)V", - garbageValue = "-11" + descriptor = "(I)I", + garbageValue = "-70655510" + ) + @Export("readVarInt") + public int readVarInt() { + byte var1 = this.array[++this.offset - 1]; // L: 398 + + int var2; + for (var2 = 0; var1 < 0; var1 = this.array[++this.offset - 1]) { // L: 399 400 402 + var2 = (var2 | var1 & 127) << 7; // L: 401 + } + + return var2 | var1; // L: 404 + } + + @ObfuscatedName("bw") + @ObfuscatedSignature( + descriptor = "([II)V", + garbageValue = "-1937738349" ) @Export("xteaEncryptAll") public void xteaEncryptAll(int[] var1) { - int var2 = this.offset / 8; // L: 368 - this.offset = 0; // L: 369 + int var2 = this.offset / 8; // L: 408 + this.offset = 0; // L: 409 - for (int var3 = 0; var3 < var2; ++var3) { // L: 370 - int var4 = this.readInt(); // L: 371 - int var5 = this.readInt(); // L: 372 - int var6 = 0; // L: 373 - int var7 = -1640531527; // L: 374 + for (int var3 = 0; var3 < var2; ++var3) { // L: 410 + int var4 = this.readInt(); // L: 411 + int var5 = this.readInt(); // L: 412 + int var6 = 0; // L: 413 + int var7 = -1640531527; // L: 414 - for (int var8 = 32; var8-- > 0; var5 += var4 + (var4 << 4 ^ var4 >>> 5) ^ var1[var6 >>> 11 & 3] + var6) { // L: 375 376 379 - var4 += var5 + (var5 << 4 ^ var5 >>> 5) ^ var6 + var1[var6 & 3]; // L: 377 - var6 += var7; // L: 378 + for (int var8 = 32; var8-- > 0; var5 += var4 + (var4 << 4 ^ var4 >>> 5) ^ var1[var6 >>> 11 & 3] + var6) { // L: 415 416 419 + var4 += var5 + (var5 << 4 ^ var5 >>> 5) ^ var6 + var1[var6 & 3]; // L: 417 + var6 += var7; // L: 418 } - this.offset -= 8; // L: 381 - this.writeInt(var4); // L: 382 - this.writeInt(var5); // L: 383 + this.offset -= 8; // L: 421 + this.writeInt(var4); // L: 422 + this.writeInt(var5); // L: 423 } - } // L: 385 + } // L: 425 - @ObfuscatedName("bq") + @ObfuscatedName("bi") @ObfuscatedSignature( descriptor = "([II)V", - garbageValue = "-2038500196" + garbageValue = "1314548709" ) @Export("xteaDecryptAll") public void xteaDecryptAll(int[] var1) { - int var2 = this.offset / 8; // L: 388 - this.offset = 0; // L: 389 + int var2 = this.offset / 8; // L: 428 + this.offset = 0; // L: 429 - for (int var3 = 0; var3 < var2; ++var3) { // L: 390 - int var4 = this.readInt(); // L: 391 - int var5 = this.readInt(); // L: 392 - int var6 = -957401312; // L: 393 - int var7 = -1640531527; // L: 394 + for (int var3 = 0; var3 < var2; ++var3) { // L: 430 + int var4 = this.readInt(); // L: 431 + int var5 = this.readInt(); // L: 432 + int var6 = -957401312; // L: 433 + int var7 = -1640531527; // L: 434 - for (int var8 = 32; var8-- > 0; var4 -= var5 + (var5 << 4 ^ var5 >>> 5) ^ var6 + var1[var6 & 3]) { // L: 395 396 399 - var5 -= var4 + (var4 << 4 ^ var4 >>> 5) ^ var1[var6 >>> 11 & 3] + var6; // L: 397 - var6 -= var7; // L: 398 + for (int var8 = 32; var8-- > 0; var4 -= var5 + (var5 << 4 ^ var5 >>> 5) ^ var6 + var1[var6 & 3]) { // L: 435 436 439 + var5 -= var4 + (var4 << 4 ^ var4 >>> 5) ^ var1[var6 >>> 11 & 3] + var6; // L: 437 + var6 -= var7; // L: 438 } - this.offset -= 8; // L: 401 - this.writeInt(var4); // L: 402 - this.writeInt(var5); // L: 403 + this.offset -= 8; // L: 441 + this.writeInt(var4); // L: 442 + this.writeInt(var5); // L: 443 } - } // L: 405 + } // L: 445 - @ObfuscatedName("cm") + @ObfuscatedName("bb") @ObfuscatedSignature( - descriptor = "([IIIS)V", - garbageValue = "4002" + descriptor = "([IIIB)V", + garbageValue = "-6" ) @Export("xteaEncrypt") public void xteaEncrypt(int[] var1, int var2, int var3) { - int var4 = this.offset; // L: 408 - this.offset = var2; // L: 409 - int var5 = (var3 - var2) / 8; // L: 410 + int var4 = this.offset; // L: 448 + this.offset = var2; // L: 449 + int var5 = (var3 - var2) / 8; // L: 450 - for (int var6 = 0; var6 < var5; ++var6) { // L: 411 - int var7 = this.readInt(); // L: 412 - int var8 = this.readInt(); // L: 413 - int var9 = 0; // L: 414 - int var10 = -1640531527; // L: 415 + for (int var6 = 0; var6 < var5; ++var6) { // L: 451 + int var7 = this.readInt(); // L: 452 + int var8 = this.readInt(); // L: 453 + int var9 = 0; // L: 454 + int var10 = -1640531527; // L: 455 - for (int var11 = 32; var11-- > 0; var8 += var7 + (var7 << 4 ^ var7 >>> 5) ^ var1[var9 >>> 11 & 3] + var9) { // L: 416 417 420 - var7 += var8 + (var8 << 4 ^ var8 >>> 5) ^ var9 + var1[var9 & 3]; // L: 418 - var9 += var10; // L: 419 + for (int var11 = 32; var11-- > 0; var8 += var7 + (var7 << 4 ^ var7 >>> 5) ^ var1[var9 >>> 11 & 3] + var9) { // L: 456 457 460 + var7 += var8 + (var8 << 4 ^ var8 >>> 5) ^ var9 + var1[var9 & 3]; // L: 458 + var9 += var10; // L: 459 } - this.offset -= 8; // L: 422 - this.writeInt(var7); // L: 423 - this.writeInt(var8); // L: 424 + this.offset -= 8; // L: 462 + this.writeInt(var7); // L: 463 + this.writeInt(var8); // L: 464 } - this.offset = var4; // L: 426 - } // L: 427 + this.offset = var4; // L: 466 + } // L: 467 - @ObfuscatedName("ch") + @ObfuscatedName("bk") @ObfuscatedSignature( descriptor = "([IIII)V", - garbageValue = "669714061" + garbageValue = "141901592" ) @Export("xteaDecrypt") public void xteaDecrypt(int[] var1, int var2, int var3) { - int var4 = this.offset; // L: 430 - this.offset = var2; // L: 431 - int var5 = (var3 - var2) / 8; // L: 432 + int var4 = this.offset; // L: 470 + this.offset = var2; // L: 471 + int var5 = (var3 - var2) / 8; // L: 472 - for (int var6 = 0; var6 < var5; ++var6) { // L: 433 - int var7 = this.readInt(); // L: 434 - int var8 = this.readInt(); // L: 435 - int var9 = -957401312; // L: 436 - int var10 = -1640531527; // L: 437 + for (int var6 = 0; var6 < var5; ++var6) { // L: 473 + int var7 = this.readInt(); // L: 474 + int var8 = this.readInt(); // L: 475 + int var9 = -957401312; // L: 476 + int var10 = -1640531527; // L: 477 - for (int var11 = 32; var11-- > 0; var7 -= var8 + (var8 << 4 ^ var8 >>> 5) ^ var9 + var1[var9 & 3]) { // L: 438 439 442 - var8 -= var7 + (var7 << 4 ^ var7 >>> 5) ^ var1[var9 >>> 11 & 3] + var9; // L: 440 - var9 -= var10; // L: 441 + for (int var11 = 32; var11-- > 0; var7 -= var8 + (var8 << 4 ^ var8 >>> 5) ^ var9 + var1[var9 & 3]) { // L: 478 479 482 + var8 -= var7 + (var7 << 4 ^ var7 >>> 5) ^ var1[var9 >>> 11 & 3] + var9; // L: 480 + var9 -= var10; // L: 481 } - this.offset -= 8; // L: 444 - this.writeInt(var7); // L: 445 - this.writeInt(var8); // L: 446 + this.offset -= 8; // L: 484 + this.writeInt(var7); // L: 485 + this.writeInt(var8); // L: 486 } - this.offset = var4; // L: 448 - } // L: 449 + this.offset = var4; // L: 488 + } // L: 489 - @ObfuscatedName("cu") + @ObfuscatedName("bg") @ObfuscatedSignature( - descriptor = "(Ljava/math/BigInteger;Ljava/math/BigInteger;B)V", - garbageValue = "-6" + descriptor = "(Ljava/math/BigInteger;Ljava/math/BigInteger;I)V", + garbageValue = "-1634492016" ) @Export("encryptRsa") public void encryptRsa(BigInteger var1, BigInteger var2) { - int var3 = this.offset; // L: 452 - this.offset = 0; // L: 453 - byte[] var4 = new byte[var3]; // L: 454 - this.readBytes(var4, 0, var3); // L: 455 - BigInteger var5 = new BigInteger(var4); // L: 456 - BigInteger var6 = var5.modPow(var1, var2); // L: 457 - byte[] var7 = var6.toByteArray(); // L: 458 - this.offset = 0; // L: 459 - this.writeShort(var7.length); // L: 460 - this.writeBytes(var7, 0, var7.length); // L: 461 - } // L: 462 + int var3 = this.offset; // L: 492 + this.offset = 0; // L: 493 + byte[] var4 = new byte[var3]; // L: 494 + this.readBytes(var4, 0, var3); // L: 495 + BigInteger var5 = new BigInteger(var4); // L: 496 + BigInteger var6 = var5.modPow(var1, var2); // L: 497 + byte[] var7 = var6.toByteArray(); // L: 498 + this.offset = 0; // L: 499 + this.writeShort(var7.length); // L: 500 + this.writeBytes(var7, 0, var7.length); // L: 501 + } // L: 502 - @ObfuscatedName("ce") + @ObfuscatedName("by") @ObfuscatedSignature( descriptor = "(II)I", - garbageValue = "1537548493" + garbageValue = "-1065581057" ) @Export("writeCrc") public int writeCrc(int var1) { - int var2 = GrandExchangeOffer.method5017(this.array, var1, this.offset); // L: 465 - this.writeInt(var2); // L: 466 - return var2; // L: 467 + byte[] var3 = this.array; // L: 506 + int var4 = this.offset; // L: 507 + int var5 = -1; // L: 509 + + for (int var6 = var1; var6 < var4; ++var6) { // L: 510 + var5 = var5 >>> 8 ^ crc32Table[(var5 ^ var3[var6]) & 255]; // L: 511 + } + + var5 = ~var5; // L: 513 + this.writeInt(var5); // L: 517 + return var5; // L: 518 } - @ObfuscatedName("cn") + @ObfuscatedName("bc") @ObfuscatedSignature( - descriptor = "(B)Z", - garbageValue = "-13" + descriptor = "(I)Z", + garbageValue = "-1907450706" ) @Export("checkCrc") public boolean checkCrc() { - this.offset -= 4; // L: 471 - int var1 = GrandExchangeOffer.method5017(this.array, 0, this.offset); // L: 472 - int var2 = this.readInt(); // L: 473 - return var1 == var2; // L: 474 - } - - @ObfuscatedName("cc") - @ObfuscatedSignature( - descriptor = "(II)V", - garbageValue = "1867348974" - ) - public void method6449(int var1) { - this.array[++this.offset - 1] = (byte)(var1 + 128); // L: 479 - } // L: 480 - - @ObfuscatedName("ck") - @ObfuscatedSignature( - descriptor = "(IB)V", - garbageValue = "0" - ) - public void method6610(int var1) { - this.array[++this.offset - 1] = (byte)(0 - var1); // L: 483 - } // L: 484 - - @ObfuscatedName("cx") - @ObfuscatedSignature( - descriptor = "(IB)V", - garbageValue = "101" - ) - public void method6475(int var1) { - this.array[++this.offset - 1] = (byte)(128 - var1); // L: 487 - } // L: 488 - - @ObfuscatedName("ci") - @ObfuscatedSignature( - descriptor = "(B)I", - garbageValue = "0" - ) - public int method6476() { - return this.array[++this.offset - 1] - 128 & 255; // L: 491 - } - - @ObfuscatedName("cf") - @ObfuscatedSignature( - descriptor = "(I)I", - garbageValue = "707714285" - ) - public int method6477() { - return 0 - this.array[++this.offset - 1] & 255; // L: 495 - } - - @ObfuscatedName("cq") - @ObfuscatedSignature( - descriptor = "(I)I", - garbageValue = "1496339455" - ) - public int method6478() { - return 128 - this.array[++this.offset - 1] & 255; // L: 499 - } - - @ObfuscatedName("cs") - @ObfuscatedSignature( - descriptor = "(S)B", - garbageValue = "1486" - ) - public byte method6530() { - return (byte)(this.array[++this.offset - 1] - 128); // L: 503 + this.offset -= 4; // L: 522 + int var1 = GrandExchangeOfferOwnWorldComparator.method1176(this.array, 0, this.offset); // L: 523 + int var2 = this.readInt(); // L: 524 + return var2 == var1; // L: 525 } @ObfuscatedName("cd") @ObfuscatedSignature( - descriptor = "(I)B", - garbageValue = "-1088217006" + descriptor = "(IB)V", + garbageValue = "43" ) - public byte method6480() { - return (byte)(0 - this.array[++this.offset - 1]); // L: 507 - } + public void method6581(int var1) { + this.array[++this.offset - 1] = (byte)(var1 + 128); // L: 530 + } // L: 531 - @ObfuscatedName("ct") - @ObfuscatedSignature( - descriptor = "(I)B", - garbageValue = "-1755655115" - ) - public byte method6526() { - return (byte)(128 - this.array[++this.offset - 1]); // L: 511 - } - - @ObfuscatedName("co") + @ObfuscatedName("cm") @ObfuscatedSignature( descriptor = "(II)V", - garbageValue = "299150194" + garbageValue = "1524887597" ) - public void method6482(int var1) { - this.array[++this.offset - 1] = (byte)var1; // L: 515 - this.array[++this.offset - 1] = (byte)(var1 >> 8); // L: 516 - } // L: 517 + public void method6584(int var1) { + this.array[++this.offset - 1] = (byte)(0 - var1); // L: 534 + } // L: 535 - @ObfuscatedName("cz") - @ObfuscatedSignature( - descriptor = "(IS)V", - garbageValue = "3134" - ) - public void method6483(int var1) { - this.array[++this.offset - 1] = (byte)(var1 >> 8); // L: 520 - this.array[++this.offset - 1] = (byte)(var1 + 128); // L: 521 - } // L: 522 - - @ObfuscatedName("cl") + @ObfuscatedName("cv") @ObfuscatedSignature( descriptor = "(II)V", - garbageValue = "-531554995" + garbageValue = "2052004397" ) - public void method6484(int var1) { - this.array[++this.offset - 1] = (byte)(var1 + 128); // L: 525 - this.array[++this.offset - 1] = (byte)(var1 >> 8); // L: 526 - } // L: 527 + public void method6594(int var1) { + this.array[++this.offset - 1] = (byte)(128 - var1); // L: 538 + } // L: 539 @ObfuscatedName("cp") @ObfuscatedSignature( descriptor = "(I)I", - garbageValue = "-1561631359" + garbageValue = "25540074" ) - public int method6620() { - this.offset += 2; // L: 530 - return ((this.array[this.offset - 1] & 255) << 8) + (this.array[this.offset - 2] & 255); // L: 531 + public int method6595() { + return this.array[++this.offset - 1] - 128 & 255; // L: 542 + } + + @ObfuscatedName("ci") + @ObfuscatedSignature( + descriptor = "(I)I", + garbageValue = "-834329867" + ) + public int method6671() { + return 0 - this.array[++this.offset - 1] & 255; // L: 546 + } + + @ObfuscatedName("ct") + @ObfuscatedSignature( + descriptor = "(I)I", + garbageValue = "1690497653" + ) + public int method6549() { + return 128 - this.array[++this.offset - 1] & 255; // L: 550 + } + + @ObfuscatedName("cq") + @ObfuscatedSignature( + descriptor = "(I)B", + garbageValue = "-2114811487" + ) + public byte method6597() { + return (byte)(this.array[++this.offset - 1] - 128); // L: 554 } @ObfuscatedName("cr") @ObfuscatedSignature( - descriptor = "(B)I", - garbageValue = "1" + descriptor = "(B)B", + garbageValue = "0" ) - public int method6486() { - this.offset += 2; // L: 535 - return (this.array[this.offset - 1] - 128 & 255) + ((this.array[this.offset - 2] & 255) << 8); // L: 536 + public byte method6593() { + return (byte)(0 - this.array[++this.offset - 1]); // L: 558 } + @ObfuscatedName("cf") + @ObfuscatedSignature( + descriptor = "(I)B", + garbageValue = "15855750" + ) + public byte method6559() { + return (byte)(128 - this.array[++this.offset - 1]); // L: 562 + } + + @ObfuscatedName("cn") + @ObfuscatedSignature( + descriptor = "(II)V", + garbageValue = "1659882221" + ) + public void method6600(int var1) { + this.array[++this.offset - 1] = (byte)var1; // L: 566 + this.array[++this.offset - 1] = (byte)(var1 >> 8); // L: 567 + } // L: 568 + + @ObfuscatedName("cs") + @ObfuscatedSignature( + descriptor = "(II)V", + garbageValue = "-2003773273" + ) + public void method6619(int var1) { + this.array[++this.offset - 1] = (byte)(var1 >> 8); // L: 571 + this.array[++this.offset - 1] = (byte)(var1 + 128); // L: 572 + } // L: 573 + @ObfuscatedName("cg") @ObfuscatedSignature( - descriptor = "(I)I", - garbageValue = "438565580" + descriptor = "(IB)V", + garbageValue = "58" ) - public int method6648() { - this.offset += 2; // L: 540 - return ((this.array[this.offset - 1] & 255) << 8) + (this.array[this.offset - 2] - 128 & 255); // L: 541 + public void method6602(int var1) { + this.array[++this.offset - 1] = (byte)(var1 + 128); // L: 576 + this.array[++this.offset - 1] = (byte)(var1 >> 8); // L: 577 + } // L: 578 + + @ObfuscatedName("co") + @ObfuscatedSignature( + descriptor = "(I)I", + garbageValue = "429131059" + ) + public int method6603() { + this.offset += 2; // L: 581 + return ((this.array[this.offset - 1] & 255) << 8) + (this.array[this.offset - 2] & 255); // L: 582 } - @ObfuscatedName("cw") + @ObfuscatedName("ck") @ObfuscatedSignature( - descriptor = "(B)I", - garbageValue = "-86" + descriptor = "(I)I", + garbageValue = "777271421" ) - public int method6488() { - this.offset += 2; // L: 545 - int var1 = ((this.array[this.offset - 1] & 255) << 8) + (this.array[this.offset - 2] & 255); // L: 546 - if (var1 > 32767) { // L: 547 - var1 -= 65536; - } - - return var1; // L: 548 + public int method6604() { + this.offset += 2; // L: 586 + return (this.array[this.offset - 1] - 128 & 255) + ((this.array[this.offset - 2] & 255) << 8); // L: 587 } @ObfuscatedName("cj") @ObfuscatedSignature( - descriptor = "(B)I", - garbageValue = "46" + descriptor = "(I)I", + garbageValue = "-1551850883" ) - public int method6489() { - this.offset += 2; // L: 552 - int var1 = (this.array[this.offset - 1] - 128 & 255) + ((this.array[this.offset - 2] & 255) << 8); // L: 553 - if (var1 > 32767) { // L: 554 - var1 -= 65536; - } - - return var1; // L: 555 + public int method6605() { + this.offset += 2; // L: 591 + return ((this.array[this.offset - 1] & 255) << 8) + (this.array[this.offset - 2] - 128 & 255); // L: 592 } - @ObfuscatedName("cy") + @ObfuscatedName("cc") @ObfuscatedSignature( descriptor = "(I)I", - garbageValue = "454812532" + garbageValue = "-896578435" ) - public int method6490() { - this.offset += 2; // L: 559 - int var1 = ((this.array[this.offset - 1] & 255) << 8) + (this.array[this.offset - 2] - 128 & 255); // L: 560 - if (var1 > 32767) { // L: 561 + public int method6621() { + this.offset += 2; // L: 596 + int var1 = ((this.array[this.offset - 1] & 255) << 8) + (this.array[this.offset - 2] & 255); // L: 597 + if (var1 > 32767) { // L: 598 var1 -= 65536; } - return var1; // L: 562 + return var1; // L: 599 + } + + @ObfuscatedName("cu") + @ObfuscatedSignature( + descriptor = "(I)I", + garbageValue = "-1905667053" + ) + public int method6661() { + this.offset += 2; // L: 603 + int var1 = (this.array[this.offset - 1] - 128 & 255) + ((this.array[this.offset - 2] & 255) << 8); // L: 604 + if (var1 > 32767) { // L: 605 + var1 -= 65536; + } + + return var1; // L: 606 + } + + @ObfuscatedName("cz") + @ObfuscatedSignature( + descriptor = "(B)I", + garbageValue = "-111" + ) + public int method6726() { + this.offset += 2; // L: 610 + int var1 = ((this.array[this.offset - 1] & 255) << 8) + (this.array[this.offset - 2] - 128 & 255); // L: 611 + if (var1 > 32767) { // L: 612 + var1 -= 65536; + } + + return var1; // L: 613 } @ObfuscatedName("cb") @ObfuscatedSignature( descriptor = "(II)V", - garbageValue = "1573116718" + garbageValue = "643572871" ) - public void method6491(int var1) { - this.array[++this.offset - 1] = (byte)var1; // L: 566 - this.array[++this.offset - 1] = (byte)(var1 >> 8); // L: 567 - this.array[++this.offset - 1] = (byte)(var1 >> 16); // L: 568 - } // L: 569 + public void method6758(int var1) { + this.array[++this.offset - 1] = (byte)var1; // L: 617 + this.array[++this.offset - 1] = (byte)(var1 >> 8); // L: 618 + this.array[++this.offset - 1] = (byte)(var1 >> 16); // L: 619 + } // L: 620 - @ObfuscatedName("cv") + @ObfuscatedName("ce") @ObfuscatedSignature( descriptor = "(I)I", - garbageValue = "-323412798" + garbageValue = "1373250265" ) - public int method6492() { - this.offset += 3; // L: 572 - return (this.array[this.offset - 3] & 255) + ((this.array[this.offset - 2] & 255) << 8) + ((this.array[this.offset - 1] & 255) << 16); // L: 573 + public int method6610() { + this.offset += 3; // L: 623 + return (this.array[this.offset - 3] & 255) + ((this.array[this.offset - 2] & 255) << 8) + ((this.array[this.offset - 1] & 255) << 16); // L: 624 } - @ObfuscatedName("ca") + @ObfuscatedName("ch") @ObfuscatedSignature( descriptor = "(II)V", - garbageValue = "-438273456" + garbageValue = "-1878732628" ) - public void method6493(int var1) { - this.array[++this.offset - 1] = (byte)var1; // L: 577 - this.array[++this.offset - 1] = (byte)(var1 >> 8); // L: 578 - this.array[++this.offset - 1] = (byte)(var1 >> 16); // L: 579 - this.array[++this.offset - 1] = (byte)(var1 >> 24); // L: 580 - } // L: 581 + public void method6611(int var1) { + this.array[++this.offset - 1] = (byte)var1; // L: 628 + this.array[++this.offset - 1] = (byte)(var1 >> 8); // L: 629 + this.array[++this.offset - 1] = (byte)(var1 >> 16); // L: 630 + this.array[++this.offset - 1] = (byte)(var1 >> 24); // L: 631 + } // L: 632 - @ObfuscatedName("ds") + @ObfuscatedName("cy") @ObfuscatedSignature( - descriptor = "(II)V", - garbageValue = "1197714149" + descriptor = "(IB)V", + garbageValue = "2" ) - public void method6445(int var1) { - this.array[++this.offset - 1] = (byte)(var1 >> 8); // L: 584 - this.array[++this.offset - 1] = (byte)var1; // L: 585 - this.array[++this.offset - 1] = (byte)(var1 >> 24); // L: 586 - this.array[++this.offset - 1] = (byte)(var1 >> 16); // L: 587 - } // L: 588 + public void method6612(int var1) { + this.array[++this.offset - 1] = (byte)(var1 >> 8); // L: 635 + this.array[++this.offset - 1] = (byte)var1; // L: 636 + this.array[++this.offset - 1] = (byte)(var1 >> 24); // L: 637 + this.array[++this.offset - 1] = (byte)(var1 >> 16); // L: 638 + } // L: 639 - @ObfuscatedName("do") + @ObfuscatedName("cx") @ObfuscatedSignature( descriptor = "(II)V", - garbageValue = "-2058155655" + garbageValue = "410819013" ) @Export("writeIntME") public void writeIntME(int var1) { - this.array[++this.offset - 1] = (byte)(var1 >> 16); // L: 591 - this.array[++this.offset - 1] = (byte)(var1 >> 24); // L: 592 - this.array[++this.offset - 1] = (byte)var1; // L: 593 - this.array[++this.offset - 1] = (byte)(var1 >> 8); // L: 594 - } // L: 595 + this.array[++this.offset - 1] = (byte)(var1 >> 16); // L: 642 + this.array[++this.offset - 1] = (byte)(var1 >> 24); // L: 643 + this.array[++this.offset - 1] = (byte)var1; // L: 644 + this.array[++this.offset - 1] = (byte)(var1 >> 8); // L: 645 + } // L: 646 - @ObfuscatedName("dj") + @ObfuscatedName("ca") @ObfuscatedSignature( descriptor = "(I)I", - garbageValue = "-612164560" + garbageValue = "-1347830086" ) - public int method6481() { - this.offset += 4; // L: 598 - return (this.array[this.offset - 4] & 255) + ((this.array[this.offset - 3] & 255) << 8) + ((this.array[this.offset - 2] & 255) << 16) + ((this.array[this.offset - 1] & 255) << 24); // L: 599 + public int method6613() { + this.offset += 4; // L: 649 + return (this.array[this.offset - 4] & 255) + ((this.array[this.offset - 3] & 255) << 8) + ((this.array[this.offset - 2] & 255) << 16) + ((this.array[this.offset - 1] & 255) << 24); // L: 650 } - @ObfuscatedName("du") + @ObfuscatedName("cl") @ObfuscatedSignature( descriptor = "(I)I", - garbageValue = "1200276089" + garbageValue = "-1599322510" ) - public int method6497() { - this.offset += 4; // L: 603 - return ((this.array[this.offset - 2] & 255) << 24) + ((this.array[this.offset - 4] & 255) << 8) + (this.array[this.offset - 3] & 255) + ((this.array[this.offset - 1] & 255) << 16); // L: 604 + public int method6614() { + this.offset += 4; // L: 654 + return ((this.array[this.offset - 2] & 255) << 24) + ((this.array[this.offset - 4] & 255) << 8) + (this.array[this.offset - 3] & 255) + ((this.array[this.offset - 1] & 255) << 16); // L: 655 } - @ObfuscatedName("dw") + @ObfuscatedName("cw") @ObfuscatedSignature( descriptor = "(I)I", - garbageValue = "248933529" + garbageValue = "-248188143" ) - public int method6428() { - this.offset += 4; // L: 608 - return ((this.array[this.offset - 1] & 255) << 8) + ((this.array[this.offset - 4] & 255) << 16) + (this.array[this.offset - 2] & 255) + ((this.array[this.offset - 3] & 255) << 24); // L: 609 + public int method6598() { + this.offset += 4; // L: 659 + return ((this.array[this.offset - 1] & 255) << 8) + ((this.array[this.offset - 4] & 255) << 16) + (this.array[this.offset - 2] & 255) + ((this.array[this.offset - 3] & 255) << 24); // L: 660 } - @ObfuscatedName("dp") + @ObfuscatedName("db") @ObfuscatedSignature( - descriptor = "([BIII)V", - garbageValue = "558288726" + descriptor = "([BIIS)V", + garbageValue = "21226" ) - public void method6499(byte[] var1, int var2, int var3) { - for (int var4 = var3 + var2 - 1; var4 >= var2; --var4) { - var1[var4] = (byte)(this.array[++this.offset - 1] - 128); // L: 613 + public void method6677(byte[] var1, int var2, int var3) { + for (int var4 = var3 + var2 - 1; var4 >= var2; --var4) { // L: 664 + var1[var4] = (byte)(this.array[++this.offset - 1] - 128); } - } // L: 614 - - @ObfuscatedName("fd") - @ObfuscatedSignature( - descriptor = "(B)V", - garbageValue = "16" - ) - static final void method6602() { - if (Script.field1055) { // L: 3802 - for (int var0 = 0; var0 < Players.Players_count; ++var0) { // L: 3804 - Player var1 = Client.players[Players.Players_indices[var0]]; // L: 3805 - var1.method2130(); // L: 3806 - } - - Script.field1055 = false; // L: 3809 - } - - } // L: 3811 + } // L: 665 } diff --git a/runescape-client/src/main/java/BufferedFile.java b/runescape-client/src/main/java/BufferedFile.java index 82ac6a0d9a..7f6cdfb9b0 100644 --- a/runescape-client/src/main/java/BufferedFile.java +++ b/runescape-client/src/main/java/BufferedFile.java @@ -6,72 +6,72 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ne") +@ObfuscatedName("nf") @Implements("BufferedFile") public class BufferedFile { - @ObfuscatedName("c") + @ObfuscatedName("n") @ObfuscatedSignature( - descriptor = "Lng;" + descriptor = "Lnm;" ) @Export("accessFile") AccessFile accessFile; - @ObfuscatedName("o") + @ObfuscatedName("f") @Export("readBuffer") byte[] readBuffer; - @ObfuscatedName("g") + @ObfuscatedName("y") @ObfuscatedGetter( - longValue = -6744150222670745989L + longValue = 4024474701341933375L ) @Export("readBufferOffset") long readBufferOffset; - @ObfuscatedName("l") + @ObfuscatedName("p") @ObfuscatedGetter( - intValue = 90173331 + intValue = -1725800063 ) @Export("readBufferLength") int readBufferLength; - @ObfuscatedName("z") + @ObfuscatedName("j") @Export("writeBuffer") byte[] writeBuffer; - @ObfuscatedName("t") + @ObfuscatedName("r") @ObfuscatedGetter( - longValue = -1552296798150661587L + longValue = 8737860925507049089L ) @Export("writeBufferOffset") long writeBufferOffset; - @ObfuscatedName("v") + @ObfuscatedName("b") @ObfuscatedGetter( - intValue = 1183607275 + intValue = -97062741 ) @Export("writeBufferLength") int writeBufferLength; - @ObfuscatedName("b") + @ObfuscatedName("d") @ObfuscatedGetter( - longValue = -3662689780010320167L + longValue = -3326324260793149209L ) @Export("offset") long offset; - @ObfuscatedName("q") + @ObfuscatedName("s") @ObfuscatedGetter( - longValue = 1224932206319687923L + longValue = -6829996619110357721L ) @Export("fileLength") long fileLength; - @ObfuscatedName("i") + @ObfuscatedName("u") @ObfuscatedGetter( - longValue = -4763138432886005745L + longValue = 3454228653685997387L ) @Export("length") long length; - @ObfuscatedName("x") + @ObfuscatedName("l") @ObfuscatedGetter( - longValue = -9205690103689237141L + longValue = 1780782613106431365L ) @Export("fileOffset") long fileOffset; @ObfuscatedSignature( - descriptor = "(Lng;II)V" + descriptor = "(Lnm;II)V" ) public BufferedFile(AccessFile var1, int var2, int var3) throws IOException { this.readBufferOffset = -1L; // L: 9 @@ -84,10 +84,10 @@ public class BufferedFile { this.offset = 0L; // L: 24 } // L: 25 - @ObfuscatedName("h") + @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "1520440653" + descriptor = "(B)V", + garbageValue = "116" ) @Export("close") public void close() throws IOException { @@ -95,7 +95,7 @@ public class BufferedFile { this.accessFile.close(); // L: 29 } // L: 30 - @ObfuscatedName("c") + @ObfuscatedName("n") @Export("seek") public void seek(long var1) throws IOException { if (var1 < 0L) { // L: 33 @@ -105,30 +105,30 @@ public class BufferedFile { } } // L: 35 - @ObfuscatedName("o") + @ObfuscatedName("f") @ObfuscatedSignature( - descriptor = "(I)J", - garbageValue = "-1480972779" + descriptor = "(B)J", + garbageValue = "17" ) @Export("length") public long length() { return this.length; // L: 38 } - @ObfuscatedName("g") + @ObfuscatedName("y") @ObfuscatedSignature( - descriptor = "([BI)V", - garbageValue = "1394165113" + descriptor = "([BB)V", + garbageValue = "-4" ) @Export("readFully") public void readFully(byte[] var1) throws IOException { this.read(var1, 0, var1.length); // L: 42 } // L: 43 - @ObfuscatedName("l") + @ObfuscatedName("p") @ObfuscatedSignature( - descriptor = "([BIIB)V", - garbageValue = "8" + descriptor = "([BIII)V", + garbageValue = "1635241805" ) @Export("read") public void read(byte[] var1, int var2, int var3) throws IOException { @@ -137,7 +137,7 @@ public class BufferedFile { throw new ArrayIndexOutOfBoundsException(var3 + var2 - var1.length); } - if (-1L != this.writeBufferOffset && this.offset >= this.writeBufferOffset && this.offset + (long)var3 <= (long)this.writeBufferLength + this.writeBufferOffset) { // L: 48 + if (this.writeBufferOffset != -1L && this.offset >= this.writeBufferOffset && (long)var3 + this.offset <= (long)this.writeBufferLength + this.writeBufferOffset) { // L: 48 System.arraycopy(this.writeBuffer, (int)(this.offset - this.writeBufferOffset), var1, var2, var3); // L: 49 this.offset += (long)var3; // L: 50 return; // L: 51 @@ -146,7 +146,7 @@ public class BufferedFile { long var4 = this.offset; // L: 53 int var7 = var3; // L: 55 int var8; - if (this.offset >= this.readBufferOffset && this.offset < (long)this.readBufferLength + this.readBufferOffset) { // L: 56 + if (this.offset >= this.readBufferOffset && this.offset < this.readBufferOffset + (long)this.readBufferLength) { // L: 56 var8 = (int)((long)this.readBufferLength - (this.offset - this.readBufferOffset)); // L: 57 if (var8 > var3) { // L: 58 var8 = var3; @@ -184,7 +184,7 @@ public class BufferedFile { this.offset += (long)var8; // L: 83 } - if (this.writeBufferOffset != -1L) { // L: 85 + if (-1L != this.writeBufferOffset) { // L: 85 if (this.writeBufferOffset > this.offset && var3 > 0) { // L: 86 var8 = var2 + (int)(this.writeBufferOffset - this.offset); // L: 87 if (var8 > var3 + var2) { // L: 88 @@ -200,16 +200,16 @@ public class BufferedFile { long var13 = -1L; // L: 95 long var10 = -1L; // L: 96 - if (this.writeBufferOffset >= var4 && this.writeBufferOffset < var4 + (long)var7) { // L: 97 + if (this.writeBufferOffset >= var4 && this.writeBufferOffset < (long)var7 + var4) { // L: 97 var13 = this.writeBufferOffset; // L: 98 - } else if (var4 >= this.writeBufferOffset && var4 < (long)this.writeBufferLength + this.writeBufferOffset) { // L: 100 + } else if (var4 >= this.writeBufferOffset && var4 < this.writeBufferOffset + (long)this.writeBufferLength) { // L: 100 var13 = var4; // L: 101 } - if ((long)this.writeBufferLength + this.writeBufferOffset > var4 && (long)this.writeBufferLength + this.writeBufferOffset <= (long)var7 + var4) { // L: 103 + if ((long)this.writeBufferLength + this.writeBufferOffset > var4 && this.writeBufferOffset + (long)this.writeBufferLength <= (long)var7 + var4) { // L: 103 var10 = this.writeBufferOffset + (long)this.writeBufferLength; // L: 104 - } else if (var4 + (long)var7 > this.writeBufferOffset && (long)var7 + var4 <= this.writeBufferOffset + (long)this.writeBufferLength) { // L: 106 - var10 = (long)var7 + var4; // L: 107 + } else if (var4 + (long)var7 > this.writeBufferOffset && (long)var7 + var4 <= (long)this.writeBufferLength + this.writeBufferOffset) { // L: 106 + var10 = var4 + (long)var7; // L: 107 } if (var13 > -1L && var10 > var13) { // L: 109 @@ -231,15 +231,15 @@ public class BufferedFile { } } // L: 125 - @ObfuscatedName("z") + @ObfuscatedName("j") @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "-2141358915" + descriptor = "(B)V", + garbageValue = "104" ) @Export("load") void load() throws IOException { this.readBufferLength = 0; // L: 128 - if (this.fileOffset != this.offset) { // L: 129 + if (this.offset != this.fileOffset) { // L: 129 this.accessFile.seek(this.offset); // L: 130 this.fileOffset = this.offset; // L: 131 } @@ -261,23 +261,23 @@ public class BufferedFile { } // L: 142 - @ObfuscatedName("t") + @ObfuscatedName("r") @ObfuscatedSignature( - descriptor = "([BIIB)V", - garbageValue = "65" + descriptor = "([BIII)V", + garbageValue = "231162903" ) @Export("write") public void write(byte[] var1, int var2, int var3) throws IOException { try { - if (this.offset + (long)var3 > this.length) { // L: 146 - this.length = this.offset + (long)var3; + if ((long)var3 + this.offset > this.length) { // L: 146 + this.length = (long)var3 + this.offset; } if (this.writeBufferOffset != -1L && (this.offset < this.writeBufferOffset || this.offset > this.writeBufferOffset + (long)this.writeBufferLength)) { // L: 147 this.flush(); // L: 148 } - if (-1L != this.writeBufferOffset && (long)var3 + this.offset > (long)this.writeBuffer.length + this.writeBufferOffset) { // L: 150 + if (this.writeBufferOffset != -1L && this.offset + (long)var3 > (long)this.writeBuffer.length + this.writeBufferOffset) { // L: 150 int var4 = (int)((long)this.writeBuffer.length - (this.offset - this.writeBufferOffset)); // L: 151 System.arraycopy(var1, var2, this.writeBuffer, (int)(this.offset - this.writeBufferOffset), var4); // L: 152 this.offset += (long)var4; // L: 153 @@ -314,16 +314,16 @@ public class BufferedFile { long var9 = -1L; // L: 167 long var6 = -1L; // L: 168 - if (this.offset >= this.readBufferOffset && this.offset < (long)this.readBufferLength + this.readBufferOffset) { // L: 169 + if (this.offset >= this.readBufferOffset && this.offset < this.readBufferOffset + (long)this.readBufferLength) { // L: 169 var9 = this.offset; // L: 170 - } else if (this.readBufferOffset >= this.offset && this.readBufferOffset < (long)var3 + this.offset) { // L: 172 + } else if (this.readBufferOffset >= this.offset && this.readBufferOffset < this.offset + (long)var3) { // L: 172 var9 = this.readBufferOffset; // L: 173 } - if (this.offset + (long)var3 > this.readBufferOffset && (long)var3 + this.offset <= (long)this.readBufferLength + this.readBufferOffset) { // L: 175 + if (this.offset + (long)var3 > this.readBufferOffset && this.offset + (long)var3 <= (long)this.readBufferLength + this.readBufferOffset) { // L: 175 var6 = this.offset + (long)var3; // L: 176 - } else if (this.readBufferOffset + (long)this.readBufferLength > this.offset && this.readBufferOffset + (long)this.readBufferLength <= (long)var3 + this.offset) { // L: 178 - var6 = (long)this.readBufferLength + this.readBufferOffset; // L: 179 + } else if ((long)this.readBufferLength + this.readBufferOffset > this.offset && (long)this.readBufferLength + this.readBufferOffset <= (long)var3 + this.offset) { // L: 178 + var6 = this.readBufferOffset + (long)this.readBufferLength; // L: 179 } if (var9 > -1L && var6 > var9) { // L: 181 @@ -339,36 +339,36 @@ public class BufferedFile { } } // L: 186 193 200 - @ObfuscatedName("v") + @ObfuscatedName("b") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "-1478008586" + garbageValue = "1231168990" ) @Export("flush") void flush() throws IOException { - if (-1L != this.writeBufferOffset) { // L: 203 - if (this.writeBufferOffset != this.fileOffset) { // L: 204 + if (this.writeBufferOffset != -1L) { // L: 203 + if (this.fileOffset != this.writeBufferOffset) { // L: 204 this.accessFile.seek(this.writeBufferOffset); // L: 205 this.fileOffset = this.writeBufferOffset; // L: 206 } this.accessFile.write(this.writeBuffer, 0, this.writeBufferLength); // L: 208 - this.fileOffset += (long)this.writeBufferLength * -2235576888984600575L; // L: 209 + this.fileOffset += (long)this.writeBufferLength * -27464314403160063L; // L: 209 if (this.fileOffset > this.fileLength) { // L: 210 this.fileLength = this.fileOffset; } long var1 = -1L; // L: 211 long var3 = -1L; // L: 212 - if (this.writeBufferOffset >= this.readBufferOffset && this.writeBufferOffset < (long)this.readBufferLength + this.readBufferOffset) { // L: 213 + if (this.writeBufferOffset >= this.readBufferOffset && this.writeBufferOffset < this.readBufferOffset + (long)this.readBufferLength) { // L: 213 var1 = this.writeBufferOffset; // L: 214 } else if (this.readBufferOffset >= this.writeBufferOffset && this.readBufferOffset < (long)this.writeBufferLength + this.writeBufferOffset) { // L: 216 var1 = this.readBufferOffset; // L: 217 } - if ((long)this.writeBufferLength + this.writeBufferOffset > this.readBufferOffset && this.writeBufferOffset + (long)this.writeBufferLength <= (long)this.readBufferLength + this.readBufferOffset) { // L: 219 - var3 = (long)this.writeBufferLength + this.writeBufferOffset; // L: 220 - } else if (this.readBufferOffset + (long)this.readBufferLength > this.writeBufferOffset && this.readBufferOffset + (long)this.readBufferLength <= (long)this.writeBufferLength + this.writeBufferOffset) { // L: 222 + if ((long)this.writeBufferLength + this.writeBufferOffset > this.readBufferOffset && (long)this.writeBufferLength + this.writeBufferOffset <= this.readBufferOffset + (long)this.readBufferLength) { // L: 219 + var3 = this.writeBufferOffset + (long)this.writeBufferLength; // L: 220 + } else if ((long)this.readBufferLength + this.readBufferOffset > this.writeBufferOffset && this.readBufferOffset + (long)this.readBufferLength <= this.writeBufferOffset + (long)this.writeBufferLength) { // L: 222 var3 = (long)this.readBufferLength + this.readBufferOffset; // L: 223 } @@ -382,4 +382,13 @@ public class BufferedFile { } } // L: 232 + + @ObfuscatedName("ah") + @ObfuscatedSignature( + descriptor = "(Ljava/lang/String;I)I", + garbageValue = "-387323412" + ) + public static int method6418(String var0) { + return var0.length() + 2; // L: 126 + } } diff --git a/runescape-client/src/main/java/BufferedNetSocket.java b/runescape-client/src/main/java/BufferedNetSocket.java index 6a54a2dc79..76f514ca4b 100644 --- a/runescape-client/src/main/java/BufferedNetSocket.java +++ b/runescape-client/src/main/java/BufferedNetSocket.java @@ -5,29 +5,26 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("lp") +@ObfuscatedName("lg") @Implements("BufferedNetSocket") public class BufferedNetSocket extends AbstractSocket { @ObfuscatedName("v") - @Export("ItemDefinition_inMembersWorld") - static boolean ItemDefinition_inMembersWorld; - @ObfuscatedName("h") @Export("socket") Socket socket; - @ObfuscatedName("c") + @ObfuscatedName("n") @ObfuscatedSignature( - descriptor = "Lld;" + descriptor = "Llw;" ) @Export("source") BufferedSource source; - @ObfuscatedName("o") + @ObfuscatedName("f") @ObfuscatedSignature( - descriptor = "Lly;" + descriptor = "Lle;" ) @Export("sink") BufferedSink sink; - BufferedNetSocket(Socket var1, int var2, int var3) throws IOException { + public BufferedNetSocket(Socket var1, int var2, int var3) throws IOException { this.socket = var1; // L: 12 this.socket.setSoTimeout(30000); // L: 13 this.socket.setTcpNoDelay(true); // L: 14 @@ -37,110 +34,74 @@ public class BufferedNetSocket extends AbstractSocket { this.sink = new BufferedSink(this.socket.getOutputStream(), var3); // L: 18 } // L: 19 - @ObfuscatedName("h") + @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "(B)V", - garbageValue = "-36" + descriptor = "(I)V", + garbageValue = "1654713390" ) @Export("close") public void close() { - this.sink.close(); + this.sink.close(); // L: 42 try { - this.socket.close(); - } catch (IOException var2) { + this.socket.close(); // L: 44 + } catch (IOException var2) { // L: 46 } - this.source.close(); - } + this.source.close(); // L: 47 + } // L: 48 - @ObfuscatedName("c") + @ObfuscatedName("n") @ObfuscatedSignature( descriptor = "(I)I", - garbageValue = "-2027143758" + garbageValue = "479468921" ) @Export("readUnsignedByte") public int readUnsignedByte() throws IOException { return this.source.readUnsignedByte(); // L: 30 } - @ObfuscatedName("o") + @ObfuscatedName("f") @ObfuscatedSignature( descriptor = "(I)I", - garbageValue = "-640327653" + garbageValue = "1659206769" ) @Export("available") public int available() throws IOException { return this.source.available(); // L: 26 } - @ObfuscatedName("g") + @ObfuscatedName("y") @ObfuscatedSignature( descriptor = "(II)Z", - garbageValue = "-1880004365" + garbageValue = "-211935081" ) @Export("isAvailable") public boolean isAvailable(int var1) throws IOException { return this.source.isAvailable(var1); // L: 22 } - @ObfuscatedName("l") + @ObfuscatedName("p") @ObfuscatedSignature( descriptor = "([BIII)I", - garbageValue = "-1936066161" + garbageValue = "-2041736219" ) @Export("read") public int read(byte[] var1, int var2, int var3) throws IOException { return this.source.read(var1, var2, var3); // L: 34 } - @ObfuscatedName("t") + @ObfuscatedName("r") @ObfuscatedSignature( descriptor = "([BIII)V", - garbageValue = "1752522959" + garbageValue = "263213011" ) @Export("write") public void write(byte[] var1, int var2, int var3) throws IOException { this.sink.write(var1, var2, var3); // L: 38 - } + } // L: 39 protected void finalize() { - this.close(); - } - - @ObfuscatedName("g") - @ObfuscatedSignature( - descriptor = "(IIIII)V", - garbageValue = "1689772773" - ) - @Export("itemContainerSetItem") - static void itemContainerSetItem(int var0, int var1, int var2, int var3) { - ItemContainer var4 = (ItemContainer)ItemContainer.itemContainers.get((long)var0); // L: 39 - if (var4 == null) { // L: 40 - var4 = new ItemContainer(); // L: 41 - ItemContainer.itemContainers.put(var4, (long)var0); // L: 42 - } - - if (var4.ids.length <= var1) { // L: 44 - int[] var5 = new int[var1 + 1]; // L: 45 - int[] var6 = new int[var1 + 1]; // L: 46 - - int var7; - for (var7 = 0; var7 < var4.ids.length; ++var7) { // L: 47 - var5[var7] = var4.ids[var7]; // L: 48 - var6[var7] = var4.quantities[var7]; // L: 49 - } - - for (var7 = var4.ids.length; var7 < var1; ++var7) { // L: 51 - var5[var7] = -1; // L: 52 - var6[var7] = 0; // L: 53 - } - - var4.ids = var5; // L: 55 - var4.quantities = var6; // L: 56 - } - - var4.ids[var1] = var2; // L: 58 - var4.quantities[var1] = var3; // L: 59 - } // L: 60 + this.close(); // L: 51 + } // L: 52 } diff --git a/runescape-client/src/main/java/BufferedSink.java b/runescape-client/src/main/java/BufferedSink.java index 68d2772ac3..7e794ad3ec 100644 --- a/runescape-client/src/main/java/BufferedSink.java +++ b/runescape-client/src/main/java/BufferedSink.java @@ -6,40 +6,40 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ly") +@ObfuscatedName("le") @Implements("BufferedSink") public class BufferedSink implements Runnable { - @ObfuscatedName("h") + @ObfuscatedName("v") @Export("thread") Thread thread; - @ObfuscatedName("c") + @ObfuscatedName("n") @Export("outputStream") OutputStream outputStream; - @ObfuscatedName("o") + @ObfuscatedName("f") @ObfuscatedGetter( - intValue = 1589128659 + intValue = 255745785 ) @Export("capacity") int capacity; - @ObfuscatedName("g") + @ObfuscatedName("y") @Export("buffer") byte[] buffer; - @ObfuscatedName("l") + @ObfuscatedName("p") @ObfuscatedGetter( - intValue = -831388653 + intValue = -1232062539 ) @Export("position") int position; - @ObfuscatedName("z") + @ObfuscatedName("j") @ObfuscatedGetter( - intValue = -846688281 + intValue = 956656333 ) @Export("limit") int limit; - @ObfuscatedName("t") + @ObfuscatedName("r") @Export("exception") IOException exception; - @ObfuscatedName("v") + @ObfuscatedName("b") @Export("closed") boolean closed; @@ -54,10 +54,10 @@ public class BufferedSink implements Runnable { this.thread.start(); // L: 197 } // L: 198 - @ObfuscatedName("h") + @ObfuscatedName("v") @ObfuscatedSignature( descriptor = "(B)Z", - garbageValue = "0" + garbageValue = "1" ) @Export("isClosed") boolean isClosed() { @@ -79,10 +79,10 @@ public class BufferedSink implements Runnable { } } - @ObfuscatedName("c") + @ObfuscatedName("n") @ObfuscatedSignature( - descriptor = "([BIIB)V", - garbageValue = "57" + descriptor = "([BIII)V", + garbageValue = "1271901026" ) @Export("write") void write(byte[] var1, int var2, int var3) throws IOException { @@ -119,10 +119,10 @@ public class BufferedSink implements Runnable { } } // L: 279 - @ObfuscatedName("o") + @ObfuscatedName("f") @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "2030103699" + descriptor = "(B)V", + garbageValue = "21" ) @Export("close") void close() { @@ -197,23 +197,4 @@ public class BufferedSink implements Runnable { } while(!this.isClosed()); // L: 256 } - - @ObfuscatedName("v") - @ObfuscatedSignature( - descriptor = "(ZB)V", - garbageValue = "-50" - ) - @Export("Login_promptCredentials") - static void Login_promptCredentials(boolean var0) { - Login.Login_response1 = ""; // L: 983 - Login.Login_response2 = "Enter your username/email & password."; // L: 984 - Login.Login_response3 = ""; // L: 985 - Login.loginIndex = 2; // L: 986 - if (var0) { // L: 987 - Login.Login_password = ""; - } - - ReflectionCheck.method1157(); // L: 988 - GrandExchangeOfferOwnWorldComparator.method1213(); // L: 989 - } // L: 990 } diff --git a/runescape-client/src/main/java/BufferedSource.java b/runescape-client/src/main/java/BufferedSource.java index 38cc834b3f..7e928d1dc6 100644 --- a/runescape-client/src/main/java/BufferedSource.java +++ b/runescape-client/src/main/java/BufferedSource.java @@ -7,37 +7,37 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ld") +@ObfuscatedName("lw") @Implements("BufferedSource") public class BufferedSource implements Runnable { - @ObfuscatedName("h") + @ObfuscatedName("v") @Export("thread") Thread thread; - @ObfuscatedName("c") + @ObfuscatedName("n") @Export("inputStream") InputStream inputStream; - @ObfuscatedName("o") + @ObfuscatedName("f") @ObfuscatedGetter( - intValue = 1528491691 + intValue = 1742068389 ) @Export("capacity") int capacity; - @ObfuscatedName("g") + @ObfuscatedName("y") @Export("buffer") byte[] buffer; - @ObfuscatedName("l") + @ObfuscatedName("p") @ObfuscatedGetter( - intValue = -1476530643 + intValue = -189496199 ) @Export("position") int position; - @ObfuscatedName("z") + @ObfuscatedName("j") @ObfuscatedGetter( - intValue = 810063119 + intValue = -1909735131 ) @Export("limit") int limit; - @ObfuscatedName("t") + @ObfuscatedName("r") @Export("exception") IOException exception; @@ -52,10 +52,10 @@ public class BufferedSource implements Runnable { this.thread.start(); // L: 69 } // L: 70 - @ObfuscatedName("h") + @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "(II)Z", - garbageValue = "1912163084" + descriptor = "(IB)Z", + garbageValue = "6" ) @Export("isAvailable") boolean isAvailable(int var1) throws IOException { @@ -86,10 +86,10 @@ public class BufferedSource implements Runnable { } } - @ObfuscatedName("c") + @ObfuscatedName("n") @ObfuscatedSignature( - descriptor = "(B)I", - garbageValue = "0" + descriptor = "(I)I", + garbageValue = "-2046252752" ) @Export("available") int available() throws IOException { @@ -110,10 +110,10 @@ public class BufferedSource implements Runnable { } } - @ObfuscatedName("o") + @ObfuscatedName("f") @ObfuscatedSignature( - descriptor = "(B)I", - garbageValue = "-91" + descriptor = "(I)I", + garbageValue = "963599553" ) @Export("readUnsignedByte") int readUnsignedByte() throws IOException { @@ -133,10 +133,10 @@ public class BufferedSource implements Runnable { } } - @ObfuscatedName("g") + @ObfuscatedName("y") @ObfuscatedSignature( descriptor = "([BIII)I", - garbageValue = "1470851684" + garbageValue = "-989264976" ) @Export("read") int read(byte[] var1, int var2, int var3) throws IOException { @@ -174,10 +174,10 @@ public class BufferedSource implements Runnable { } } - @ObfuscatedName("l") + @ObfuscatedName("p") @ObfuscatedSignature( - descriptor = "(B)V", - garbageValue = "-95" + descriptor = "(I)V", + garbageValue = "715878078" ) @Export("close") void close() { @@ -244,12 +244,21 @@ public class BufferedSource implements Runnable { } } - @ObfuscatedName("h") + @ObfuscatedName("fx") @ObfuscatedSignature( - descriptor = "(Ljp;B)V", - garbageValue = "-18" + descriptor = "(IIII)V", + garbageValue = "1648779145" ) - public static void method5782(AbstractArchive var0) { - class288.FloorOverlayDefinition_archive = var0; // L: 26 - } // L: 27 + @Export("queueSoundEffect") + static void queueSoundEffect(int var0, int var1, int var2) { + if (ObjectComposition.clientPreferences.soundEffectsVolume != 0 && var1 != 0 && Client.soundEffectCount < 50) { // L: 3376 + Client.soundEffectIds[Client.soundEffectCount] = var0; // L: 3377 + Client.queuedSoundEffectLoops[Client.soundEffectCount] = var1; // L: 3378 + Client.queuedSoundEffectDelays[Client.soundEffectCount] = var2; // L: 3379 + Client.soundEffects[Client.soundEffectCount] = null; // L: 3380 + Client.soundLocations[Client.soundEffectCount] = 0; // L: 3381 + ++Client.soundEffectCount; // L: 3382 + } + + } // L: 3384 } diff --git a/runescape-client/src/main/java/ByteArrayNode.java b/runescape-client/src/main/java/ByteArrayNode.java index 3b14dbd296..abe9163a95 100644 --- a/runescape-client/src/main/java/ByteArrayNode.java +++ b/runescape-client/src/main/java/ByteArrayNode.java @@ -2,10 +2,10 @@ import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; -@ObfuscatedName("ma") +@ObfuscatedName("mn") @Implements("ByteArrayNode") public class ByteArrayNode extends Node { - @ObfuscatedName("h") + @ObfuscatedName("v") @Export("byteArray") public byte[] byteArray; diff --git a/runescape-client/src/main/java/ByteArrayPool.java b/runescape-client/src/main/java/ByteArrayPool.java index 3500a43324..304ae9dd67 100644 --- a/runescape-client/src/main/java/ByteArrayPool.java +++ b/runescape-client/src/main/java/ByteArrayPool.java @@ -4,39 +4,42 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("kt") +@ObfuscatedName("ke") @Implements("ByteArrayPool") public class ByteArrayPool { - @ObfuscatedName("h") + @ObfuscatedName("v") @ObfuscatedGetter( - intValue = -687377531 + intValue = -1219327977 ) @Export("ByteArrayPool_smallCount") static int ByteArrayPool_smallCount; - @ObfuscatedName("c") + @ObfuscatedName("n") @ObfuscatedGetter( - intValue = -789880073 + intValue = -1748405633 ) @Export("ByteArrayPool_mediumCount") static int ByteArrayPool_mediumCount; - @ObfuscatedName("o") + @ObfuscatedName("f") @ObfuscatedGetter( - intValue = -335516745 + intValue = 434807287 ) @Export("ByteArrayPool_largeCount") static int ByteArrayPool_largeCount; - @ObfuscatedName("g") + @ObfuscatedName("y") @Export("ByteArrayPool_small") static byte[][] ByteArrayPool_small; - @ObfuscatedName("l") + @ObfuscatedName("p") @Export("ByteArrayPool_medium") static byte[][] ByteArrayPool_medium; - @ObfuscatedName("z") + @ObfuscatedName("j") @Export("ByteArrayPool_large") static byte[][] ByteArrayPool_large; + @ObfuscatedName("r") + @Export("ByteArrayPool_alternativeSizes") + static int[] ByteArrayPool_alternativeSizes; @ObfuscatedName("b") - @Export("ByteArrayPool_arrays") - static byte[][][] ByteArrayPool_arrays; + @Export("ByteArrayPool_altSizeArrayCounts") + static int[] ByteArrayPool_altSizeArrayCounts; static { ByteArrayPool_smallCount = 0; // L: 4 @@ -47,10 +50,10 @@ public class ByteArrayPool { ByteArrayPool_large = new byte[50][]; // L: 9 } - @ObfuscatedName("c") + @ObfuscatedName("n") @ObfuscatedSignature( - descriptor = "(IZI)[B", - garbageValue = "1490789395" + descriptor = "(IZB)[B", + garbageValue = "100" ) @Export("ByteArrayPool_getArrayBool") static synchronized byte[] ByteArrayPool_getArrayBool(int var0, boolean var1) { @@ -59,37 +62,37 @@ public class ByteArrayPool { if (var0 < 100) { } } else if (ByteArrayPool_smallCount > 0) { - var4 = ByteArrayPool_small[--ByteArrayPool_smallCount]; // L: 36 - ByteArrayPool_small[ByteArrayPool_smallCount] = null; // L: 37 - return var4; // L: 38 + var4 = ByteArrayPool_small[--ByteArrayPool_smallCount]; + ByteArrayPool_small[ByteArrayPool_smallCount] = null; + return var4; } if (var0 != 5000) { // L: 40 if (var0 < 5000) { } } else if (ByteArrayPool_mediumCount > 0) { - var4 = ByteArrayPool_medium[--ByteArrayPool_mediumCount]; // L: 41 + var4 = ByteArrayPool_medium[--ByteArrayPool_mediumCount]; ByteArrayPool_medium[ByteArrayPool_mediumCount] = null; // L: 42 - return var4; // L: 43 + return var4; } - if (var0 != 30000) { // L: 45 + if (var0 != 30000) { if (var0 < 30000) { } } else if (ByteArrayPool_largeCount > 0) { - var4 = ByteArrayPool_large[--ByteArrayPool_largeCount]; // L: 46 - ByteArrayPool_large[ByteArrayPool_largeCount] = null; // L: 47 + var4 = ByteArrayPool_large[--ByteArrayPool_largeCount]; + ByteArrayPool_large[ByteArrayPool_largeCount] = null; return var4; // L: 48 } - if (ByteArrayPool_arrays != null) { // L: 50 - for (int var2 = 0; var2 < class15.ByteArrayPool_alternativeSizes.length; ++var2) { // L: 51 - if (class15.ByteArrayPool_alternativeSizes[var2] != var0) { // L: 52 - if (var0 < class15.ByteArrayPool_alternativeSizes[var2]) { + if (class20.ByteArrayPool_arrays != null) { // L: 50 + for (int var2 = 0; var2 < ByteArrayPool_alternativeSizes.length; ++var2) { // L: 51 + if (ByteArrayPool_alternativeSizes[var2] != var0) { // L: 52 + if (var0 < ByteArrayPool_alternativeSizes[var2]) { } - } else if (class9.ByteArrayPool_altSizeArrayCounts[var2] > 0) { - byte[] var3 = ByteArrayPool_arrays[var2][--class9.ByteArrayPool_altSizeArrayCounts[var2]]; // L: 53 - ByteArrayPool_arrays[var2][class9.ByteArrayPool_altSizeArrayCounts[var2]] = null; // L: 54 + } else if (ByteArrayPool_altSizeArrayCounts[var2] > 0) { + byte[] var3 = class20.ByteArrayPool_arrays[var2][--ByteArrayPool_altSizeArrayCounts[var2]]; // L: 53 + class20.ByteArrayPool_arrays[var2][ByteArrayPool_altSizeArrayCounts[var2]] = null; // L: 54 return var3; // L: 55 } } @@ -97,4 +100,30 @@ public class ByteArrayPool { return new byte[var0]; // L: 68 } + + @ObfuscatedName("n") + @ObfuscatedSignature( + descriptor = "(Ljava/lang/Object;ZB)[B", + garbageValue = "-76" + ) + public static byte[] method5573(Object var0, boolean var1) { + if (var0 == null) { // L: 30 + return null; + } else if (var0 instanceof byte[]) { // L: 31 + byte[] var6 = (byte[])((byte[])var0); // L: 32 + if (var1) { // L: 33 + int var4 = var6.length; // L: 36 + byte[] var5 = new byte[var4]; // L: 37 + System.arraycopy(var6, 0, var5, 0, var4); // L: 38 + return var5; // L: 41 + } else { + return var6; // L: 43 + } + } else if (var0 instanceof AbstractByteArrayCopier) { // L: 45 + AbstractByteArrayCopier var2 = (AbstractByteArrayCopier)var0; // L: 46 + return var2.get(); // L: 47 + } else { + throw new IllegalArgumentException(); // L: 49 + } + } } diff --git a/runescape-client/src/main/java/Calendar.java b/runescape-client/src/main/java/Calendar.java index 9fa13e7a18..644c819e53 100644 --- a/runescape-client/src/main/java/Calendar.java +++ b/runescape-client/src/main/java/Calendar.java @@ -2,24 +2,208 @@ import java.util.TimeZone; import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; +import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ih") +@ObfuscatedName("ip") @Implements("Calendar") public class Calendar { - @ObfuscatedName("h") + @ObfuscatedName("v") @Export("MONTH_NAMES_ENGLISH_GERMAN") public static final String[][] MONTH_NAMES_ENGLISH_GERMAN; - @ObfuscatedName("c") + @ObfuscatedName("n") @Export("DAYS_OF_THE_WEEK") public static final String[] DAYS_OF_THE_WEEK; - @ObfuscatedName("o") + @ObfuscatedName("f") @Export("Calendar_calendar") public static java.util.Calendar Calendar_calendar; + @ObfuscatedName("p") + @Export("SpriteBuffer_yOffsets") + public static int[] SpriteBuffer_yOffsets; static { MONTH_NAMES_ENGLISH_GERMAN = new String[][]{{"Jan", "Feb", "Mar", "Apr", "May", "Jun", "Jul", "Aug", "Sep", "Oct", "Nov", "Dec"}, {"Jan", "Feb", "Mär", "Apr", "Mai", "Jun", "Jul", "Aug", "Sep", "Okt", "Nov", "Dez"}, {"jan", "fév", "mars", "avr", "mai", "juin", "juil", "août", "sept", "oct", "nov", "déc"}, {"jan", "fev", "mar", "abr", "mai", "jun", "jul", "ago", "set", "out", "nov", "dez"}, {"jan", "feb", "mrt", "apr", "mei", "jun", "jul", "aug", "sep", "okt", "nov", "dec"}, {"Jan", "Feb", "Mar", "Apr", "May", "Jun", "Jul", "Aug", "Sep", "Oct", "Nov", "Dec"}, {"ene", "feb", "mar", "abr", "may", "jun", "jul", "ago", "sep", "oct", "nov", "dic"}}; // L: 7 DAYS_OF_THE_WEEK = new String[]{"Sun", "Mon", "Tue", "Wed", "Thu", "Fri", "Sat"}; // L: 17 java.util.Calendar.getInstance(); // L: 21 Calendar_calendar = java.util.Calendar.getInstance(TimeZone.getTimeZone("GMT")); // L: 22 - } // L: 23 + } + + @ObfuscatedName("v") + @ObfuscatedSignature( + descriptor = "(Ljava/lang/CharSequence;Ljava/lang/CharSequence;Lkk;I)I", + garbageValue = "61619413" + ) + @Export("compareStrings") + public static int compareStrings(CharSequence var0, CharSequence var1, Language var2) { + int var3 = var0.length(); // L: 11 + int var4 = var1.length(); // L: 12 + int var5 = 0; // L: 13 + int var6 = 0; // L: 14 + char var7 = 0; // L: 15 + char var8 = 0; // L: 16 + + while (var5 - var7 < var3 || var6 - var8 < var4) { // L: 18 + if (var5 - var7 >= var3) { // L: 19 + return -1; + } + + if (var6 - var8 >= var4) { // L: 20 + return 1; + } + + char var9; + if (var7 != 0) { // L: 23 + var9 = var7; // L: 24 + boolean var14 = false; // L: 25 + } else { + var9 = var0.charAt(var5++); // L: 27 + } + + char var10; + if (var8 != 0) { // L: 28 + var10 = var8; // L: 29 + boolean var15 = false; // L: 30 + } else { + var10 = var1.charAt(var6++); // L: 32 + } + + var7 = MusicPatchPcmStream.method4620(var9); // L: 33 + var8 = MusicPatchPcmStream.method4620(var10); // L: 34 + var9 = standardizeChar(var9, var2); // L: 35 + var10 = standardizeChar(var10, var2); // L: 36 + if (var9 != var10 && Character.toUpperCase(var9) != Character.toUpperCase(var10)) { // L: 37 + var9 = Character.toLowerCase(var9); // L: 38 + var10 = Character.toLowerCase(var10); // L: 39 + if (var9 != var10) { // L: 40 + return WorldMapLabelSize.lowercaseChar(var9, var2) - WorldMapLabelSize.lowercaseChar(var10, var2); + } + } + } + + int var16 = Math.min(var3, var4); // L: 43 + + char var12; + int var17; + for (var17 = 0; var17 < var16; ++var17) { // L: 44 + if (var2 == Language.Language_FR) { // L: 45 + var5 = var3 - 1 - var17; // L: 46 + var6 = var4 - 1 - var17; // L: 47 + } else { + var6 = var17; // L: 49 + var5 = var17; + } + + char var11 = var0.charAt(var5); // L: 50 + var12 = var1.charAt(var6); // L: 51 + if (var11 != var12 && Character.toUpperCase(var11) != Character.toUpperCase(var12)) { // L: 52 + var11 = Character.toLowerCase(var11); // L: 53 + var12 = Character.toLowerCase(var12); // L: 54 + if (var12 != var11) { // L: 55 + return WorldMapLabelSize.lowercaseChar(var11, var2) - WorldMapLabelSize.lowercaseChar(var12, var2); + } + } + } + + var17 = var3 - var4; // L: 58 + if (var17 != 0) { // L: 59 + return var17; + } else { + for (int var18 = 0; var18 < var16; ++var18) { // L: 60 + var12 = var0.charAt(var18); // L: 61 + char var13 = var1.charAt(var18); // L: 62 + if (var13 != var12) { // L: 63 + return WorldMapLabelSize.lowercaseChar(var12, var2) - WorldMapLabelSize.lowercaseChar(var13, var2); + } + } + + return 0; // L: 65 + } + } + + @ObfuscatedName("n") + @ObfuscatedSignature( + descriptor = "(CLkk;I)C", + garbageValue = "-1670785567" + ) + @Export("standardizeChar") + static char standardizeChar(char var0, Language var1) { + if (var0 >= 192 && var0 <= 255) { // L: 69 + if (var0 >= 192 && var0 <= 198) { // L: 70 + return 'A'; + } + + if (var0 == 199) { // L: 71 + return 'C'; + } + + if (var0 >= 200 && var0 <= 203) { // L: 72 + return 'E'; + } + + if (var0 >= 204 && var0 <= 207) { // L: 73 + return 'I'; + } + + if (var0 == 209 && var1 != Language.Language_ES) { // L: 74 + return 'N'; + } + + if (var0 >= 210 && var0 <= 214) { // L: 75 + return 'O'; + } + + if (var0 >= 217 && var0 <= 220) { // L: 76 + return 'U'; + } + + if (var0 == 221) { // L: 77 + return 'Y'; + } + + if (var0 == 223) { // L: 78 + return 's'; + } + + if (var0 >= 224 && var0 <= 230) { // L: 79 + return 'a'; + } + + if (var0 == 231) { // L: 80 + return 'c'; + } + + if (var0 >= 232 && var0 <= 235) { // L: 81 + return 'e'; + } + + if (var0 >= 236 && var0 <= 239) { + return 'i'; // L: 82 + } + + if (var0 == 241 && var1 != Language.Language_ES) { // L: 83 + return 'n'; + } + + if (var0 >= 242 && var0 <= 246) { // L: 84 + return 'o'; + } + + if (var0 >= 249 && var0 <= 252) { // L: 85 + return 'u'; + } + + if (var0 == 253 || var0 == 255) { // L: 86 + return 'y'; + } + } + + if (var0 == 338) { // L: 88 + return 'O'; + } else if (var0 == 339) { // L: 89 + return 'o'; + } else if (var0 == 376) { // L: 90 + return 'Y'; + } else { + return var0; // L: 91 + } + } } diff --git a/runescape-client/src/main/java/Canvas.java b/runescape-client/src/main/java/Canvas.java index e1e9c2a3aa..547e732dc8 100644 --- a/runescape-client/src/main/java/Canvas.java +++ b/runescape-client/src/main/java/Canvas.java @@ -1,29 +1,23 @@ import java.awt.Component; import java.awt.Graphics; +import java.io.File; +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("aa") +@ObfuscatedName("ac") @Implements("Canvas") public final class Canvas extends java.awt.Canvas { - @ObfuscatedName("t") - @ObfuscatedSignature( - descriptor = "Low;" + @ObfuscatedName("tf") + @ObfuscatedGetter( + intValue = 1846107143 ) - @Export("leftTitleSprite") - static SpritePixels leftTitleSprite; - @ObfuscatedName("q") - public static short[][] field295; - @ObfuscatedName("u") - @ObfuscatedSignature( - descriptor = "Lg;" - ) - static class3 field292; - @ObfuscatedName("br") - static String field291; - @ObfuscatedName("h") + @Export("foundItemIndex") + static int foundItemIndex; + @ObfuscatedName("v") @Export("component") Component component; @@ -31,54 +25,357 @@ public final class Canvas extends java.awt.Canvas { this.component = var1; // L: 11 } // L: 12 - public final void update(Graphics var1) { - this.component.update(var1); // L: 15 - } // L: 16 - public final void paint(Graphics var1) { this.component.paint(var1); // L: 19 } // L: 20 - @ObfuscatedName("gh") + public final void update(Graphics var1) { + this.component.update(var1); // L: 15 + } // L: 16 + + @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "(I)Z", - garbageValue = "-1733422772" + descriptor = "(Ljava/lang/String;Ljava/lang/String;II)Ljava/io/File;", + garbageValue = "1145652403" ) - static boolean method469() { - return (Client.drawPlayerNames & 4) != 0; // L: 4830 + public static File method393(String var0, String var1, int var2) { + String var3 = var2 == 0 ? "" : "" + var2; // L: 40 + class390.JagexCache_locationFile = new File(class22.userHomeDirectory, "jagex_cl_" + var0 + "_" + var1 + var3 + ".dat"); // L: 41 + String var4 = null; // L: 42 + String var5 = null; // L: 43 + boolean var6 = false; // L: 44 + Buffer var8; + File var23; + if (class390.JagexCache_locationFile.exists()) { // L: 45 + try { + AccessFile var7 = new AccessFile(class390.JagexCache_locationFile, "rw", 10000L); // L: 48 + + int var9; + for (var8 = new Buffer((int)var7.length()); var8.offset < var8.array.length; var8.offset += var9) { // L: 49 + var9 = var7.read(var8.array, var8.offset, var8.array.length - var8.offset); + if (var9 == -1) { + throw new IOException(); + } + } + + var8.offset = 0; + var9 = var8.readUnsignedByte(); + if (var9 < 1 || var9 > 3) { + throw new IOException("" + var9); + } + + int var10 = 0; // L: 58 + if (var9 > 1) { // L: 59 + var10 = var8.readUnsignedByte(); + } + + if (var9 <= 2) { // L: 60 + var4 = var8.readStringCp1252NullCircumfixed(); // L: 61 + if (var10 == 1) { // L: 62 + var5 = var8.readStringCp1252NullCircumfixed(); + } + } else { + var4 = var8.readCESU8(); // L: 65 + if (var10 == 1) { // L: 66 + var5 = var8.readCESU8(); + } + } + + var7.close(); // L: 68 + } catch (IOException var21) { // L: 70 + var21.printStackTrace(); // L: 71 + } + + if (var4 != null) { // L: 73 + var23 = new File(var4); // L: 74 + if (!var23.exists()) { // L: 75 + var4 = null; // L: 76 + } + } + + if (var4 != null) { // L: 79 + var23 = new File(var4, "test.dat"); // L: 80 + if (!FaceNormal.isWriteable(var23, true)) { // L: 81 + var4 = null; // L: 82 + } + } + } + + if (var4 == null && var2 == 0) { // L: 86 + label141: + for (int var15 = 0; var15 < PlayerType.cacheSubPaths.length; ++var15) { // L: 87 + for (int var16 = 0; var16 < InterfaceParent.cacheParentPaths.length; ++var16) { // L: 88 + File var17 = new File(InterfaceParent.cacheParentPaths[var16] + PlayerType.cacheSubPaths[var15] + File.separatorChar + var0 + File.separatorChar); // L: 89 + if (var17.exists() && FaceNormal.isWriteable(new File(var17, "test.dat"), true)) { // L: 90 91 + var4 = var17.toString(); // L: 92 + var6 = true; // L: 93 + break label141; // L: 94 + } + } + } + } + + if (var4 == null) { // L: 100 + var4 = class22.userHomeDirectory + File.separatorChar + "jagexcache" + var3 + File.separatorChar + var0 + File.separatorChar + var1 + File.separatorChar; // L: 101 + var6 = true; // L: 102 + } + + File var22; + if (var5 != null) { // L: 104 + var22 = new File(var5); // L: 105 + var23 = new File(var4); // L: 106 + + try { + File[] var24 = var22.listFiles(); // L: 108 + File[] var18 = var24; // L: 110 + + for (int var11 = 0; var11 < var18.length; ++var11) { // L: 111 + File var12 = var18[var11]; // L: 112 + File var13 = new File(var23, var12.getName()); // L: 114 + boolean var14 = var12.renameTo(var13); // L: 115 + if (!var14) { // L: 116 + throw new IOException(); + } + } + } catch (Exception var20) { // L: 121 + var20.printStackTrace(); // L: 122 + } + + var6 = true; // L: 124 + } + + if (var6) { // L: 126 + var22 = new File(var4); // L: 127 + var8 = null; // L: 128 + + try { + AccessFile var25 = new AccessFile(class390.JagexCache_locationFile, "rw", 10000L); // L: 132 + Buffer var26 = new Buffer(500); // L: 133 + var26.writeByte(3); // L: 134 + var26.writeByte(var8 != null ? 1 : 0); // L: 135 + var26.writeCESU8(var22.getPath()); // L: 136 + if (var8 != null) { // L: 137 + var26.writeCESU8(""); + } + + var25.write(var26.array, 0, var26.offset); // L: 138 + var25.close(); // L: 139 + } catch (IOException var19) { // L: 141 + var19.printStackTrace(); // L: 142 + } + } + + return new File(var4); // L: 146 } + @ObfuscatedName("y") + @ObfuscatedSignature( + descriptor = "(ILjv;IIIZI)V", + garbageValue = "1003938789" + ) + public static void method395(int var0, AbstractArchive var1, int var2, int var3, int var4, boolean var5) { + class232.musicPlayerStatus = 1; // L: 50 + ModelData0.musicTrackArchive = var1; // L: 51 + class32.musicTrackGroupId = var2; // L: 52 + class18.musicTrackFileId = var3; // L: 53 + class232.musicTrackVolume = var4; // L: 54 + class232.musicTrackBoolean = var5; // L: 55 + class232.pcmSampleLength = var0; // L: 56 + } // L: 57 + + @ObfuscatedName("p") + @ObfuscatedSignature( + descriptor = "(II)Z", + garbageValue = "1869214638" + ) + public static boolean method394(int var0) { + return (var0 >> 29 & 1) != 0; // L: 25 + } + + @ObfuscatedName("hj") + @ObfuscatedSignature( + descriptor = "(IIZI)V", + garbageValue = "-786826616" + ) + static final void method391(int var0, int var1, boolean var2) { + if (!var2 || var0 != GrandExchangeOfferOwnWorldComparator.field632 || UserComparator4.field1427 != var1) { // L: 5137 + GrandExchangeOfferOwnWorldComparator.field632 = var0; // L: 5140 + UserComparator4.field1427 = var1; // L: 5141 + class12.updateGameState(25); // L: 5142 + DirectByteArrayCopier.drawLoadingMessage("Loading - please wait.", true); // L: 5143 + int var3 = VertexNormal.baseX; // L: 5144 + int var4 = SoundSystem.baseY; // L: 5145 + VertexNormal.baseX = (var0 - 6) * 8; // L: 5146 + SoundSystem.baseY = (var1 - 6) * 8; // L: 5147 + int var5 = VertexNormal.baseX - var3; // L: 5148 + int var6 = SoundSystem.baseY - var4; // L: 5149 + var3 = VertexNormal.baseX; // L: 5150 + var4 = SoundSystem.baseY; // L: 5151 + + int var7; + int var9; + int[] var10000; + for (var7 = 0; var7 < 32768; ++var7) { // L: 5152 + NPC var19 = Client.npcs[var7]; // L: 5153 + if (var19 != null) { // L: 5154 + for (var9 = 0; var9 < 10; ++var9) { // L: 5155 + var10000 = var19.pathX; // L: 5156 + var10000[var9] -= var5; + var10000 = var19.pathY; // L: 5157 + var10000[var9] -= var6; + } + + var19.x -= var5 * 128; // L: 5159 + var19.y -= var6 * 128; // L: 5160 + } + } + + for (var7 = 0; var7 < 2048; ++var7) { // L: 5163 + Player var22 = Client.players[var7]; // L: 5164 + if (var22 != null) { // L: 5165 + for (var9 = 0; var9 < 10; ++var9) { // L: 5166 + var10000 = var22.pathX; // L: 5167 + var10000[var9] -= var5; + var10000 = var22.pathY; // L: 5168 + var10000[var9] -= var6; + } + + var22.x -= var5 * 128; // L: 5170 + var22.y -= var6 * 128; // L: 5171 + } + } + + byte var20 = 0; // L: 5174 + byte var8 = 104; // L: 5175 + byte var21 = 1; // L: 5176 + if (var5 < 0) { // L: 5177 + var20 = 103; // L: 5178 + var8 = -1; // L: 5179 + var21 = -1; // L: 5180 + } + + byte var10 = 0; // L: 5182 + byte var11 = 104; // L: 5183 + byte var12 = 1; // L: 5184 + if (var6 < 0) { // L: 5185 + var10 = 103; // L: 5186 + var11 = -1; // L: 5187 + var12 = -1; // L: 5188 + } + + int var14; + for (int var13 = var20; var8 != var13; var13 += var21) { // L: 5190 + for (var14 = var10; var14 != var11; var14 += var12) { // L: 5191 + int var15 = var13 + var5; // L: 5192 + int var16 = var6 + var14; // L: 5193 + + for (int var17 = 0; var17 < 4; ++var17) { // L: 5194 + if (var15 >= 0 && var16 >= 0 && var15 < 104 && var16 < 104) { + Client.groundItems[var17][var13][var14] = Client.groundItems[var17][var15][var16]; // L: 5195 + } else { + Client.groundItems[var17][var13][var14] = null; // L: 5196 + } + } + } + } + + for (PendingSpawn var18 = (PendingSpawn)Client.pendingSpawns.last(); var18 != null; var18 = (PendingSpawn)Client.pendingSpawns.previous()) { // L: 5200 5201 5205 + var18.x -= var5; // L: 5202 + var18.y -= var6; // L: 5203 + if (var18.x < 0 || var18.y < 0 || var18.x >= 104 || var18.y >= 104) { // L: 5204 + var18.remove(); + } + } + + if (Client.destinationX != 0) { // L: 5207 + Client.destinationX -= var5; // L: 5208 + Client.destinationY -= var6; // L: 5209 + } + + Client.soundEffectCount = 0; // L: 5211 + Client.isCameraLocked = false; // L: 5212 + MouseHandler.cameraX -= var5 << 7; // L: 5213 + class105.cameraZ -= var6 << 7; // L: 5214 + RouteStrategy.oculusOrbFocalPointX -= var5 << 7; // L: 5215 + ModelData0.oculusOrbFocalPointY -= var6 << 7; // L: 5216 + Client.field872 = -1; // L: 5217 + Client.graphicsObjects.clear(); // L: 5218 + Client.projectiles.clear(); // L: 5219 + + for (var14 = 0; var14 < 4; ++var14) { // L: 5220 + Client.collisionMaps[var14].clear(); + } + + } + } // L: 5138 5221 + @ObfuscatedName("jz") @ObfuscatedSignature( - descriptor = "(II)Z", - garbageValue = "-1799291119" + descriptor = "([Lio;II)V", + garbageValue = "1454811445" ) - static boolean method467(int var0) { - for (int var1 = 0; var1 < Client.field842; ++var1) { // L: 10935 - if (Client.field844[var1] == var0) { // L: 10936 - return true; + @Export("drawModelComponents") + static final void drawModelComponents(Widget[] var0, int var1) { + for (int var2 = 0; var2 < var0.length; ++var2) { // L: 10836 + Widget var3 = var0[var2]; // L: 10837 + if (var3 != null && var3.parentId == var1 && (!var3.isIf3 || !HitSplatDefinition.isComponentHidden(var3))) { // L: 10838 10839 10840 + int var5; + if (var3.type == 0) { // L: 10841 + if (!var3.isIf3 && HitSplatDefinition.isComponentHidden(var3) && var3 != World.mousedOverWidgetIf1) { // L: 10842 + continue; + } + + drawModelComponents(var0, var3.id); // L: 10843 + if (var3.children != null) { // L: 10844 + drawModelComponents(var3.children, var3.id); + } + + InterfaceParent var4 = (InterfaceParent)Client.interfaceParents.get((long)var3.id); // L: 10845 + if (var4 != null) { // L: 10846 + var5 = var4.group; // L: 10847 + if (Clock.loadInterface(var5)) { // L: 10849 + drawModelComponents(Widget.Widget_interfaceComponents[var5], -1); // L: 10850 + } + } + } + + if (var3.type == 6) { // L: 10854 + if (var3.sequenceId != -1 || var3.sequenceId2 != -1) { // L: 10855 + boolean var7 = InvDefinition.runCs1(var3); // L: 10856 + if (var7) { // L: 10858 + var5 = var3.sequenceId2; + } else { + var5 = var3.sequenceId; // L: 10859 + } + + if (var5 != -1) { // L: 10860 + SequenceDefinition var6 = LoginScreenAnimation.SequenceDefinition_get(var5); // L: 10861 + + for (var3.modelFrameCycle += Client.field913; var3.modelFrameCycle > var6.frameLengths[var3.modelFrame]; WorldMapCacheName.invalidateWidget(var3)) { // L: 10862 10863 10870 + var3.modelFrameCycle -= var6.frameLengths[var3.modelFrame]; // L: 10864 + ++var3.modelFrame; // L: 10865 + if (var3.modelFrame >= var6.frameIds.length) { // L: 10866 + var3.modelFrame -= var6.frameCount; // L: 10867 + if (var3.modelFrame < 0 || var3.modelFrame >= var6.frameIds.length) { // L: 10868 + var3.modelFrame = 0; + } + } + } + } + } + + if (var3.field3014 != 0 && !var3.isIf3) { // L: 10874 + int var8 = var3.field3014 >> 16; // L: 10875 + var5 = var3.field3014 << 16 >> 16; // L: 10876 + var8 *= Client.field913; // L: 10877 + var5 *= Client.field913; // L: 10878 + var3.modelAngleX = var8 + var3.modelAngleX & 2047; // L: 10879 + var3.modelAngleY = var5 + var3.modelAngleY & 2047; // L: 10880 + WorldMapCacheName.invalidateWidget(var3); // L: 10881 + } + } } } - return false; // L: 10938 - } - - @ObfuscatedName("lw") - @ObfuscatedSignature( - descriptor = "(Ljava/lang/String;B)Ljava/lang/String;", - garbageValue = "1" - ) - static String method468(String var0) { - PlayerType[] var1 = class249.PlayerType_values(); // L: 11757 - - for (int var2 = 0; var2 < var1.length; ++var2) { // L: 11758 - PlayerType var3 = var1[var2]; // L: 11759 - if (var3.modIcon != -1 && var0.startsWith(class169.method3495(var3.modIcon))) { // L: 11761 11762 - var0 = var0.substring(6 + Integer.toString(var3.modIcon).length()); // L: 11763 - break; - } - } - - return var0; // L: 11770 - } + } // L: 10885 } diff --git a/runescape-client/src/main/java/ChatChannel.java b/runescape-client/src/main/java/ChatChannel.java index 534be61bac..27886cdd0f 100644 --- a/runescape-client/src/main/java/ChatChannel.java +++ b/runescape-client/src/main/java/ChatChannel.java @@ -3,115 +3,267 @@ 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("cq") +@ObfuscatedName("cs") @Implements("ChatChannel") public class ChatChannel { - @ObfuscatedName("se") + @ObfuscatedName("s") + @Export("Tiles_hue") + static int[] Tiles_hue; + @ObfuscatedName("ey") @ObfuscatedGetter( - longValue = 9135333041797517911L + intValue = -495301739 ) - static long field1081; - @ObfuscatedName("c") + static int field1110; + @ObfuscatedName("n") @ObfuscatedSignature( - descriptor = "[Lbv;" + descriptor = "[Lbi;" ) @Export("messages") Message[] messages; - @ObfuscatedName("o") + @ObfuscatedName("f") @ObfuscatedGetter( - intValue = 426962571 + intValue = -1182640923 ) @Export("count") int count; ChatChannel() { - this.messages = new Message[100]; // L: 92 - } // L: 95 + this.messages = new Message[100]; // L: 81 + } // L: 84 - @ObfuscatedName("h") + @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "(ILjava/lang/String;Ljava/lang/String;Ljava/lang/String;I)Lbv;", - garbageValue = "-17263542" + descriptor = "(ILjava/lang/String;Ljava/lang/String;Ljava/lang/String;I)Lbi;", + garbageValue = "437343873" ) @Export("addMessage") Message addMessage(int var1, String var2, String var3, String var4) { - Message var5 = this.messages[99]; // L: 98 + Message var5 = this.messages[99]; // L: 87 - for (int var6 = this.count; var6 > 0; --var6) { // L: 99 - if (var6 != 100) { // L: 100 - this.messages[var6] = this.messages[var6 - 1]; // L: 101 + for (int var6 = this.count; var6 > 0; --var6) { // L: 88 + if (var6 != 100) { // L: 89 + this.messages[var6] = this.messages[var6 - 1]; // L: 90 } } - if (var5 == null) { // L: 103 + if (var5 == null) { // L: 92 var5 = new Message(var1, var2, var4, var3); } else { - var5.remove(); // L: 105 - var5.removeDual(); // L: 106 - var5.set(var1, var2, var4, var3); // L: 107 + var5.remove(); // L: 94 + var5.removeDual(); // L: 95 + var5.set(var1, var2, var4, var3); // L: 96 } - this.messages[0] = var5; // L: 109 - if (this.count < 100) { // L: 110 + this.messages[0] = var5; // L: 98 + if (this.count < 100) { // L: 99 ++this.count; } - return var5; // L: 111 + return var5; // L: 100 } - @ObfuscatedName("c") + @ObfuscatedName("n") @ObfuscatedSignature( - descriptor = "(IB)Lbv;", - garbageValue = "29" + descriptor = "(II)Lbi;", + garbageValue = "-94614591" ) @Export("getMessage") Message getMessage(int var1) { - return var1 >= 0 && var1 < this.count ? this.messages[var1] : null; // L: 115 116 + return var1 >= 0 && var1 < this.count ? this.messages[var1] : null; // L: 104 105 } - @ObfuscatedName("o") + @ObfuscatedName("f") @ObfuscatedSignature( - descriptor = "(I)I", - garbageValue = "-294918247" + descriptor = "(B)I", + garbageValue = "-36" ) @Export("size") int size() { - return this.count; // L: 120 - } - - @ObfuscatedName("c") - @ObfuscatedSignature( - descriptor = "([BILjava/lang/CharSequence;I)I", - garbageValue = "1815997374" - ) - public static int method2042(byte[] var0, int var1, CharSequence var2) { - int var3 = var2.length(); // L: 21 - int var4 = var1; // L: 22 - - for (int var5 = 0; var5 < var3; ++var5) { // L: 23 - char var6 = var2.charAt(var5); // L: 24 - if (var6 <= 127) { // L: 25 - var0[var4++] = (byte)var6; // L: 26 - } else if (var6 <= 2047) { // L: 28 - var0[var4++] = (byte)(192 | var6 >> 6); // L: 29 - var0[var4++] = (byte)(128 | var6 & '?'); // L: 30 - } else { - var0[var4++] = (byte)(224 | var6 >> '\f'); // L: 33 - var0[var4++] = (byte)(128 | var6 >> 6 & 63); // L: 34 - var0[var4++] = (byte)(128 | var6 & '?'); // L: 35 - } - } - - return var4 - var1; // L: 38 + return this.count; // L: 109 } @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "(Ljp;II)Lof;", - garbageValue = "-2132120014" + descriptor = "(Ljv;Ljv;I)V", + garbageValue = "-1209366980" ) - public static IndexedSprite method2043(AbstractArchive var0, int var1) { - return !UserComparator5.method2465(var0, var1) ? null : GraphicsObject.method1938(); // L: 160 161 + public static void method2012(AbstractArchive var0, AbstractArchive var1) { + class404.KitDefinition_archive = var0; // L: 27 + KitDefinition.KitDefinition_modelsArchive = var1; // L: 28 + ModelData0.KitDefinition_fileCount = class404.KitDefinition_archive.getGroupFileCount(3); // L: 29 + } // L: 30 + + @ObfuscatedName("n") + @ObfuscatedSignature( + descriptor = "([Ljava/lang/String;[II)V", + garbageValue = "-652699785" + ) + public static void method2013(String[] var0, int[] var1) { + TaskHandler.method2518(var0, var1, 0, var0.length - 1); // L: 39 + } // L: 40 + + @ObfuscatedName("b") + @ObfuscatedSignature( + descriptor = "(ILcf;ZB)I", + garbageValue = "-84" + ) + static int method2009(int var0, Script var1, boolean var2) { + boolean var3 = true; // L: 834 + Widget var4; + if (var0 >= 2000) { // L: 836 + var0 -= 1000; // L: 837 + var4 = Frames.getWidget(Interpreter.Interpreter_intStack[--class44.Interpreter_intStackSize]); // L: 838 + var3 = false; // L: 839 + } else { + var4 = var2 ? class13.scriptDotWidget : Interpreter.scriptActiveWidget; // L: 841 + } + + int var11; + if (var0 == ScriptOpcodes.CC_SETOP) { // L: 842 + var11 = Interpreter.Interpreter_intStack[--class44.Interpreter_intStackSize] - 1; // L: 843 + if (var11 >= 0 && var11 <= 9) { // L: 844 + var4.setAction(var11, Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize]); // L: 848 + return 1; // L: 849 + } else { + --Interpreter.Interpreter_stringStackSize; // L: 845 + return 1; // L: 846 + } + } else { + int var6; + if (var0 == ScriptOpcodes.CC_SETDRAGGABLE) { // L: 851 + class44.Interpreter_intStackSize -= 2; // L: 852 + var11 = Interpreter.Interpreter_intStack[class44.Interpreter_intStackSize]; // L: 853 + var6 = Interpreter.Interpreter_intStack[class44.Interpreter_intStackSize + 1]; // L: 854 + var4.parent = ModeWhere.getWidgetChild(var11, var6); // L: 855 + return 1; // L: 856 + } else if (var0 == ScriptOpcodes.CC_SETDRAGGABLEBEHAVIOR) { // L: 858 + var4.isScrollBar = Interpreter.Interpreter_intStack[--class44.Interpreter_intStackSize] == 1; // L: 859 + return 1; // L: 860 + } else if (var0 == ScriptOpcodes.CC_SETDRAGDEADZONE) { // L: 862 + var4.dragZoneSize = Interpreter.Interpreter_intStack[--class44.Interpreter_intStackSize]; // L: 863 + return 1; // L: 864 + } else if (var0 == ScriptOpcodes.CC_SETDRAGDEADTIME) { // L: 866 + var4.dragThreshold = Interpreter.Interpreter_intStack[--class44.Interpreter_intStackSize]; // L: 867 + return 1; // L: 868 + } else if (var0 == ScriptOpcodes.CC_SETOPBASE) { // L: 870 + var4.dataText = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize]; // L: 871 + return 1; // L: 872 + } else if (var0 == ScriptOpcodes.CC_SETTARGETVERB) { // L: 874 + var4.spellActionName = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize]; // L: 875 + return 1; // L: 876 + } else if (var0 == ScriptOpcodes.CC_CLEAROPS) { // L: 878 + var4.actions = null; // L: 879 + return 1; // L: 880 + } else if (var0 == 1308) { // L: 882 + var4.prioritizeMenuEntry = Interpreter.Interpreter_intStack[--class44.Interpreter_intStackSize] == 1; // L: 883 + return 1; // L: 884 + } else if (var0 == 1309) { // L: 886 + --class44.Interpreter_intStackSize; // L: 887 + return 1; // L: 888 + } else { + int var7; + byte[] var8; + if (var0 != ScriptOpcodes.CC_SETOPKEY) { // L: 890 + byte var5; + if (var0 == ScriptOpcodes.CC_SETOPTKEY) { // L: 920 + class44.Interpreter_intStackSize -= 2; // L: 921 + var5 = 10; // L: 922 + var8 = new byte[]{(byte)Interpreter.Interpreter_intStack[class44.Interpreter_intStackSize]}; // L: 923 + byte[] var9 = new byte[]{(byte)Interpreter.Interpreter_intStack[class44.Interpreter_intStackSize + 1]}; // L: 924 + class253.Widget_setKey(var4, var5, var8, var9); // L: 925 + return 1; // L: 926 + } else if (var0 == ScriptOpcodes.CC_SETOPKEYRATE) { // L: 928 + class44.Interpreter_intStackSize -= 3; // L: 929 + var11 = Interpreter.Interpreter_intStack[class44.Interpreter_intStackSize] - 1; // L: 930 + var6 = Interpreter.Interpreter_intStack[class44.Interpreter_intStackSize + 1]; // L: 931 + var7 = Interpreter.Interpreter_intStack[class44.Interpreter_intStackSize + 2]; // L: 932 + if (var11 >= 0 && var11 <= 9) { // L: 933 + IsaacCipher.Widget_setKeyRate(var4, var11, var6, var7); // L: 936 + return 1; // L: 937 + } else { + throw new RuntimeException(); // L: 934 + } + } else if (var0 == ScriptOpcodes.CC_SETOPTKEYRATE) { // L: 939 + var5 = 10; // L: 940 + var6 = Interpreter.Interpreter_intStack[--class44.Interpreter_intStackSize]; // L: 941 + var7 = Interpreter.Interpreter_intStack[--class44.Interpreter_intStackSize]; // L: 942 + IsaacCipher.Widget_setKeyRate(var4, var5, var6, var7); // L: 943 + return 1; // L: 944 + } else if (var0 == ScriptOpcodes.CC_SETOPKEYIGNOREHELD) { // L: 946 + --class44.Interpreter_intStackSize; // L: 947 + var11 = Interpreter.Interpreter_intStack[class44.Interpreter_intStackSize] - 1; // L: 948 + if (var11 >= 0 && var11 <= 9) { // L: 949 + class23.Widget_setKeyIgnoreHeld(var4, var11); // L: 952 + return 1; // L: 953 + } else { + throw new RuntimeException(); // L: 950 + } + } else if (var0 == ScriptOpcodes.CC_SETOPTKEYIGNOREHELD) { // L: 955 + var5 = 10; // L: 956 + class23.Widget_setKeyIgnoreHeld(var4, var5); // L: 957 + return 1; // L: 958 + } else { + return 2; // L: 960 + } + } else { + byte[] var10 = null; // L: 891 + var8 = null; // L: 892 + if (var3) { // L: 893 + class44.Interpreter_intStackSize -= 10; // L: 894 + + for (var7 = 0; var7 < 10 && Interpreter.Interpreter_intStack[var7 + class44.Interpreter_intStackSize] >= 0; var7 += 2) { // L: 896 897 + } + + if (var7 > 0) { // L: 899 + var10 = new byte[var7 / 2]; // L: 900 + var8 = new byte[var7 / 2]; // L: 901 + + for (var7 -= 2; var7 >= 0; var7 -= 2) { // L: 902 + var10[var7 / 2] = (byte)Interpreter.Interpreter_intStack[var7 + class44.Interpreter_intStackSize]; // L: 903 + var8[var7 / 2] = (byte)Interpreter.Interpreter_intStack[var7 + class44.Interpreter_intStackSize + 1]; // L: 904 + } + } + } else { + class44.Interpreter_intStackSize -= 2; // L: 909 + var10 = new byte[]{(byte)Interpreter.Interpreter_intStack[class44.Interpreter_intStackSize]}; // L: 910 + var8 = new byte[]{(byte)Interpreter.Interpreter_intStack[class44.Interpreter_intStackSize + 1]}; // L: 911 + } + + var7 = Interpreter.Interpreter_intStack[--class44.Interpreter_intStackSize] - 1; // L: 913 + if (var7 >= 0 && var7 <= 9) { // L: 914 + class253.Widget_setKey(var4, var7, var10, var8); // L: 917 + return 1; // L: 918 + } else { + throw new RuntimeException(); // L: 915 + } + } + } + } } + + @ObfuscatedName("u") + @ObfuscatedSignature( + descriptor = "(I)V", + garbageValue = "1145228216" + ) + public static void method2015() { + PlayerComposition.PlayerAppearance_cachedModels.clear(); // L: 279 + } // L: 280 + + @ObfuscatedName("gd") + @ObfuscatedSignature( + descriptor = "(III)V", + garbageValue = "694193640" + ) + static final void method2014(int var0, int var1) { + if (Client.hintArrowType == 2) { // L: 4416 + GrandExchangeEvents.worldToScreen((Client.hintArrowX - VertexNormal.baseX << 7) + Client.hintArrowSubX, (Client.hintArrowY - SoundSystem.baseY << 7) + Client.hintArrowSubY, Client.hintArrowHeight * 2); // L: 4417 + if (Client.viewportTempX > -1 && Client.cycle % 20 < 10) { // L: 4418 + PacketBufferNode.headIconHintSprites[0].drawTransBgAt(var0 + Client.viewportTempX - 12, Client.viewportTempY + var1 - 28); + } + + } + } // L: 4419 } diff --git a/runescape-client/src/main/java/ClanChannel.java b/runescape-client/src/main/java/ClanChannel.java new file mode 100644 index 0000000000..f11185ec23 --- /dev/null +++ b/runescape-client/src/main/java/ClanChannel.java @@ -0,0 +1,252 @@ +import java.util.ArrayList; +import java.util.BitSet; +import java.util.List; +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("y") +@Implements("ClanChannel") +public class ClanChannel extends Node { + @ObfuscatedName("c") + @ObfuscatedSignature( + descriptor = "Lop;" + ) + static IndexedSprite field33; + @ObfuscatedName("dg") + @ObfuscatedSignature( + descriptor = "Ljp;" + ) + @Export("archive3") + static Archive archive3; + @ObfuscatedName("ny") + @ObfuscatedGetter( + intValue = -217468963 + ) + static int field38; + @ObfuscatedName("v") + boolean field30; + @ObfuscatedName("n") + boolean field27; + @ObfuscatedName("f") + @Export("members") + public List members; + @ObfuscatedName("y") + @Export("sortedMembers") + int[] sortedMembers; + @ObfuscatedName("p") + @ObfuscatedGetter( + longValue = -8222609313489775677L + ) + long field29; + @ObfuscatedName("j") + @Export("name") + public String name; + @ObfuscatedName("r") + public byte field32; + @ObfuscatedName("b") + public byte field26; + + static { + new BitSet(65536); // L: 21 + } // L: 22 + + @ObfuscatedSignature( + descriptor = "(Lnd;)V" + ) + public ClanChannel(Buffer var1) { + this.field27 = true; // L: 12 + this.name = null; // L: 16 + this.method29(var1); // L: 25 + } // L: 26 + + @ObfuscatedName("v") + @ObfuscatedSignature( + descriptor = "(I)[I", + garbageValue = "1562690283" + ) + @Export("getSortedMembers") + public int[] getSortedMembers() { + if (this.sortedMembers == null) { // L: 29 + String[] var1 = new String[this.members.size()]; // L: 30 + this.sortedMembers = new int[this.members.size()]; // L: 31 + + for (int var2 = 0; var2 < this.members.size(); this.sortedMembers[var2] = var2++) { // L: 32 34 + var1[var2] = ((ClanChannelMember)this.members.get(var2)).name; // L: 33 + } + + ChatChannel.method2013(var1, this.sortedMembers); // L: 36 + } + + return this.sortedMembers; // L: 38 + } + + @ObfuscatedName("n") + @ObfuscatedSignature( + descriptor = "(Ls;I)V", + garbageValue = "-1843980816" + ) + @Export("addMember") + void addMember(ClanChannelMember var1) { + this.members.add(var1); // L: 42 + this.sortedMembers = null; // L: 43 + } // L: 44 + + @ObfuscatedName("f") + @ObfuscatedSignature( + descriptor = "(IB)V", + garbageValue = "85" + ) + @Export("removeMember") + void removeMember(int var1) { + this.members.remove(var1); // L: 47 + this.sortedMembers = null; // L: 48 + } // L: 49 + + @ObfuscatedName("y") + @ObfuscatedSignature( + descriptor = "(B)I", + garbageValue = "-27" + ) + public int method27() { + return this.members.size(); // L: 52 + } + + @ObfuscatedName("p") + @ObfuscatedSignature( + descriptor = "(Ljava/lang/String;I)I", + garbageValue = "493868170" + ) + public int method30(String var1) { + if (!this.field27) { // L: 56 + throw new RuntimeException("Displaynames not available"); + } else { + for (int var2 = 0; var2 < this.members.size(); ++var2) { // L: 57 + if (((ClanChannelMember)this.members.get(var2)).name.equalsIgnoreCase(var1)) { + return var2; // L: 58 + } + } + + return -1; // L: 60 + } + } + + @ObfuscatedName("j") + @ObfuscatedSignature( + descriptor = "(Lnd;I)V", + garbageValue = "-104022179" + ) + void method29(Buffer var1) { + int var2 = var1.readUnsignedByte(); // L: 64 + if ((var2 & 1) != 0) { // L: 65 + this.field30 = true; + } + + if ((var2 & 2) != 0) { // L: 66 + this.field27 = true; + } + + int var3 = 2; // L: 67 + if ((var2 & 4) != 0) { // L: 68 + var3 = var1.readUnsignedByte(); + } + + super.key = var1.readLong(); // L: 69 + this.field29 = var1.readLong(); // L: 70 + this.name = var1.readStringCp1252NullTerminated(); // L: 71 + var1.readBoolean(); // L: 72 + this.field26 = var1.readByte(); // L: 73 + this.field32 = var1.readByte(); // L: 74 + int var4 = var1.readUnsignedShort(); // L: 75 + if (var4 > 0) { // L: 76 + this.members = new ArrayList(var4); // L: 77 + + for (int var5 = 0; var5 < var4; ++var5) { // L: 78 + ClanChannelMember var6 = new ClanChannelMember(); // L: 79 + if (this.field30) { // L: 80 + var1.readLong(); // L: 81 + } + + if (this.field27) { // L: 83 + var6.name = var1.readStringCp1252NullTerminated(); + } + + var6.rank = var1.readByte(); // L: 84 + var6.world = var1.readUnsignedShort(); // L: 85 + if (var3 >= 3) { // L: 86 + var1.readBoolean(); // L: 87 + } + + this.members.add(var5, var6); // L: 90 + } + } + + } // L: 93 + + @ObfuscatedName("ae") + @ObfuscatedSignature( + descriptor = "(ILcf;ZI)I", + garbageValue = "1446319005" + ) + static int method41(int var0, Script var1, boolean var2) { + if (var0 != 3700 && var0 != 3701) { // L: 2409 + if (var0 == 3702) { // L: 2414 + ++class44.Interpreter_intStackSize; // L: 2415 + return 1; // L: 2416 + } else { + return 2; // L: 2418 + } + } else { + --class44.Interpreter_intStackSize; // L: 2410 + --Interpreter.Interpreter_stringStackSize; // L: 2411 + return 1; // L: 2412 + } + } + + @ObfuscatedName("ix") + @ObfuscatedSignature( + descriptor = "(IIIIIII)V", + garbageValue = "331312284" + ) + static final void method36(int var0, int var1, int var2, int var3, int var4, int var5) { + int var6 = var2 - var0; // L: 9671 + int var7 = var3 - var1; // L: 9672 + int var8 = var6 >= 0 ? var6 : -var6; // L: 9673 + int var9 = var7 >= 0 ? var7 : -var7; // L: 9674 + int var10 = var8; // L: 9675 + if (var8 < var9) { // L: 9676 + var10 = var9; + } + + if (var10 != 0) { // L: 9677 + int var11 = (var6 << 16) / var10; // L: 9678 + int var12 = (var7 << 16) / var10; // L: 9679 + if (var12 <= var11) { // L: 9680 + var11 = -var11; + } else { + var12 = -var12; // L: 9681 + } + + int var13 = var5 * var12 >> 17; // L: 9682 + int var14 = var5 * var12 + 1 >> 17; // L: 9683 + int var15 = var5 * var11 >> 17; // L: 9684 + int var16 = var5 * var11 + 1 >> 17; // L: 9685 + var0 -= Rasterizer2D.Rasterizer2D_xClipStart; // L: 9686 + var1 -= Rasterizer2D.Rasterizer2D_yClipStart; // L: 9687 + int var17 = var0 + var13; // L: 9688 + int var18 = var0 - var14; // L: 9689 + int var19 = var0 + var6 - var14; // L: 9690 + int var20 = var0 + var13 + var6; // L: 9691 + int var21 = var15 + var1; // L: 9692 + int var22 = var1 - var16; // L: 9693 + int var23 = var7 + var1 - var16; // L: 9694 + int var24 = var7 + var15 + var1; // L: 9695 + Rasterizer3D.method3856(var17, var18, var19); // L: 9696 + Rasterizer3D.method3919(var21, var22, var23, var17, var18, var19, var4); // L: 9697 + Rasterizer3D.method3856(var17, var19, var20); // L: 9698 + Rasterizer3D.method3919(var21, var23, var24, var17, var19, var20, var4); // L: 9699 + } + } // L: 9700 +} diff --git a/runescape-client/src/main/java/ClanChannelMember.java b/runescape-client/src/main/java/ClanChannelMember.java new file mode 100644 index 0000000000..027be97297 --- /dev/null +++ b/runescape-client/src/main/java/ClanChannelMember.java @@ -0,0 +1,495 @@ +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("s") +@Implements("ClanChannelMember") +public class ClanChannelMember { + @ObfuscatedName("mq") + @ObfuscatedGetter( + intValue = 81340013 + ) + @Export("selectedItemSlot") + static int selectedItemSlot; + @ObfuscatedName("v") + @Export("rank") + public byte rank; + @ObfuscatedName("n") + @ObfuscatedGetter( + intValue = 186545257 + ) + @Export("world") + public int world; + @ObfuscatedName("f") + @Export("name") + public String name; + + ClanChannelMember() { + } // L: 8 + + @ObfuscatedName("v") + @ObfuscatedSignature( + descriptor = "(Lid;I)V", + garbageValue = "-2073984636" + ) + public static void method88(Huffman var0) { + class249.huffman = var0; // L: 14 + } // L: 15 + + @ObfuscatedName("v") + @ObfuscatedSignature( + descriptor = "(IIII)I", + garbageValue = "-1338731866" + ) + public static int method86(int var0, int var1, int var2) { + var2 &= 3; // L: 9 + if (var2 == 0) { // L: 10 + return var1; + } else if (var2 == 1) { // L: 11 + return 7 - var0; + } else { + return var2 == 2 ? 7 - var1 : var0; // L: 12 + } + } + + @ObfuscatedName("f") + @ObfuscatedSignature( + descriptor = "(IIB)Lbi;", + garbageValue = "-22" + ) + @Export("Messages_getByChannelAndID") + static Message Messages_getByChannelAndID(int var0, int var1) { + ChatChannel var2 = (ChatChannel)Messages.Messages_channels.get(var0); // L: 35 + return var2.getMessage(var1); // L: 36 + } + + @ObfuscatedName("y") + @ObfuscatedSignature( + descriptor = "(I)Z", + garbageValue = "-1385459044" + ) + @Export("isKeyDown") + public static final boolean isKeyDown() { + synchronized(KeyHandler.KeyHandler_instance) { // L: 162 + if (KeyHandler.field293 == KeyHandler.field295) { // L: 163 + return false; + } else { + ItemComposition.field1859 = KeyHandler.field289[KeyHandler.field293]; // L: 164 + class249.field3116 = KeyHandler.field286[KeyHandler.field293]; // L: 165 + KeyHandler.field293 = KeyHandler.field293 + 1 & 127; // L: 166 + return true; // L: 167 + } + } + } + + @ObfuscatedName("b") + @ObfuscatedSignature( + descriptor = "(ZB)V", + garbageValue = "74" + ) + @Export("Login_promptCredentials") + static void Login_promptCredentials(boolean var0) { + Login.Login_response1 = ""; // L: 762 + Login.Login_response2 = "Enter your username/email & password."; // L: 763 + Login.Login_response3 = ""; // L: 764 + Login.loginIndex = 2; // L: 765 + if (var0) { // L: 766 + Login.Login_password = ""; + } + + if (Login.Login_username == null || Login.Login_username.length() <= 0) { // L: 768 + if (ObjectComposition.clientPreferences.rememberedUsername != null) { // L: 769 + Login.Login_username = ObjectComposition.clientPreferences.rememberedUsername; // L: 770 + Client.Login_isUsernameRemembered = true; // L: 771 + } else { + Client.Login_isUsernameRemembered = false; // L: 773 + } + } + + if (Client.Login_isUsernameRemembered && Login.Login_username != null && Login.Login_username.length() > 0) { // L: 776 + Login.currentLoginField = 1; // L: 777 + } else { + Login.currentLoginField = 0; // L: 780 + } + + } // L: 783 + + @ObfuscatedName("b") + @ObfuscatedSignature( + descriptor = "(IIIIIILgt;Lfz;B)V", + garbageValue = "11" + ) + static final void method89(int var0, int var1, int var2, int var3, int var4, int var5, Scene var6, CollisionMap var7) { + if (!Client.isLowDetail || (Tiles.Tiles_renderFlags[0][var1][var2] & 2) != 0 || (Tiles.Tiles_renderFlags[var0][var1][var2] & 16) == 0) { // L: 245 246 247 + if (var0 < Tiles.Tiles_minPlane) { // L: 250 + Tiles.Tiles_minPlane = var0; + } + + ObjectComposition var8 = class23.getObjectDefinition(var3); // L: 251 + int var9; + int var10; + if (var4 != 1 && var4 != 3) { // L: 254 + var9 = var8.sizeX; // L: 259 + var10 = var8.sizeY; // L: 260 + } else { + var9 = var8.sizeY; // L: 255 + var10 = var8.sizeX; // L: 256 + } + + int var11; + int var12; + if (var9 + var1 <= 104) { // L: 266 + var11 = (var9 >> 1) + var1; // L: 267 + var12 = (var9 + 1 >> 1) + var1; // L: 268 + } else { + var11 = var1; // L: 271 + var12 = var1 + 1; // L: 272 + } + + int var13; + int var14; + if (var10 + var2 <= 104) { // L: 274 + var13 = (var10 >> 1) + var2; // L: 275 + var14 = var2 + (var10 + 1 >> 1); // L: 276 + } else { + var13 = var2; // L: 279 + var14 = var2 + 1; // L: 280 + } + + int[][] var15 = Tiles.Tiles_heights[var0]; // L: 282 + int var16 = var15[var12][var14] + var15[var11][var14] + var15[var12][var13] + var15[var11][var13] >> 2; // L: 283 + int var17 = (var1 << 7) + (var9 << 6); // L: 284 + int var18 = (var2 << 7) + (var10 << 6); // L: 285 + long var19 = DevicePcmPlayerProvider.calculateTag(var1, var2, 2, var8.int1 == 0, var3); // L: 286 + int var21 = var5 + (var4 << 6); // L: 287 + if (var8.int3 == 1) { // L: 288 + var21 += 256; + } + + if (var8.hasSound()) { // L: 289 + class268.method4851(var0, var1, var2, var8, var4); + } + + Object var29; + if (var5 == 22) { // L: 290 + if (!Client.isLowDetail || var8.int1 != 0 || var8.interactType == 1 || var8.boolean2) { // L: 291 + if (var8.animationId == -1 && var8.transforms == null) { // L: 293 + var29 = var8.getEntity(22, var4, var15, var17, var16, var18); + } else { + var29 = new DynamicObject(var3, 22, var4, var0, var1, var2, var8.animationId, var8.field1801, (Renderable)null); // L: 294 + } + + var6.newFloorDecoration(var0, var1, var2, var16, (Renderable)var29, var19, var21); // L: 295 + if (var8.interactType == 1 && var7 != null) { // L: 296 + var7.setBlockedByFloorDec(var1, var2); + } + + } + } else { + int var28; + if (var5 != 10 && var5 != 11) { // L: 299 + int[] var10000; + if (var5 >= 12) { // L: 320 + if (var8.animationId == -1 && var8.transforms == null) { // L: 322 + var29 = var8.getEntity(var5, var4, var15, var17, var16, var18); + } else { + var29 = new DynamicObject(var3, var5, var4, var0, var1, var2, var8.animationId, var8.field1801, (Renderable)null); // L: 323 + } + + var6.method4007(var0, var1, var2, var16, 1, 1, (Renderable)var29, 0, var19, var21); // L: 324 + if (var5 >= 12 && var5 <= 17 && var5 != 13 && var0 > 0) { // L: 325 + var10000 = UrlRequester.field1419[var0][var1]; + var10000[var2] |= 2340; + } + + if (var8.interactType != 0 && var7 != null) { // L: 326 + var7.addGameObject(var1, var2, var9, var10, var8.boolean1); + } + + } else if (var5 == 0) { // L: 329 + if (var8.animationId == -1 && var8.transforms == null) { // L: 331 + var29 = var8.getEntity(0, var4, var15, var17, var16, var18); + } else { + var29 = new DynamicObject(var3, 0, var4, var0, var1, var2, var8.animationId, var8.field1801, (Renderable)null); // L: 332 + } + + var6.newBoundaryObject(var0, var1, var2, var16, (Renderable)var29, (Renderable)null, Tiles.field1117[var4], 0, var19, var21); // L: 333 + if (var4 == 0) { // L: 334 + if (var8.clipped) { // L: 335 + class372.field4123[var0][var1][var2] = 50; // L: 336 + class372.field4123[var0][var1][var2 + 1] = 50; // L: 337 + } + + if (var8.modelClipped) { // L: 339 + var10000 = UrlRequester.field1419[var0][var1]; + var10000[var2] |= 585; + } + } else if (var4 == 1) { // L: 341 + if (var8.clipped) { // L: 342 + class372.field4123[var0][var1][var2 + 1] = 50; // L: 343 + class372.field4123[var0][var1 + 1][var2 + 1] = 50; // L: 344 + } + + if (var8.modelClipped) { // L: 346 + var10000 = UrlRequester.field1419[var0][var1]; + var10000[1 + var2] |= 1170; + } + } else if (var4 == 2) { // L: 348 + if (var8.clipped) { // L: 349 + class372.field4123[var0][var1 + 1][var2] = 50; // L: 350 + class372.field4123[var0][var1 + 1][var2 + 1] = 50; // L: 351 + } + + if (var8.modelClipped) { // L: 353 + var10000 = UrlRequester.field1419[var0][var1 + 1]; + var10000[var2] |= 585; + } + } else if (var4 == 3) { // L: 355 + if (var8.clipped) { // L: 356 + class372.field4123[var0][var1][var2] = 50; // L: 357 + class372.field4123[var0][var1 + 1][var2] = 50; // L: 358 + } + + if (var8.modelClipped) { // L: 360 + var10000 = UrlRequester.field1419[var0][var1]; + var10000[var2] |= 1170; + } + } + + if (var8.interactType != 0 && var7 != null) { // L: 362 + var7.method3164(var1, var2, var5, var4, var8.boolean1); + } + + if (var8.int2 != 16) { // L: 363 + var6.method3967(var0, var1, var2, var8.int2); + } + + } else if (var5 == 1) { // L: 366 + if (var8.animationId == -1 && var8.transforms == null) { // L: 368 + var29 = var8.getEntity(1, var4, var15, var17, var16, var18); + } else { + var29 = new DynamicObject(var3, 1, var4, var0, var1, var2, var8.animationId, var8.field1801, (Renderable)null); // L: 369 + } + + var6.newBoundaryObject(var0, var1, var2, var16, (Renderable)var29, (Renderable)null, Tiles.field1125[var4], 0, var19, var21); // L: 370 + if (var8.clipped) { // L: 371 + if (var4 == 0) { // L: 372 + class372.field4123[var0][var1][var2 + 1] = 50; + } else if (var4 == 1) { // L: 373 + class372.field4123[var0][var1 + 1][var2 + 1] = 50; + } else if (var4 == 2) { // L: 374 + class372.field4123[var0][var1 + 1][var2] = 50; + } else if (var4 == 3) { // L: 375 + class372.field4123[var0][var1][var2] = 50; + } + } + + if (var8.interactType != 0 && var7 != null) { // L: 377 + var7.method3164(var1, var2, var5, var4, var8.boolean1); + } + + } else { + int var22; + if (var5 == 2) { // L: 380 + var22 = var4 + 1 & 3; // L: 381 + Object var24; + Object var30; + if (var8.animationId == -1 && var8.transforms == null) { // L: 384 + var30 = var8.getEntity(2, var4 + 4, var15, var17, var16, var18); // L: 385 + var24 = var8.getEntity(2, var22, var15, var17, var16, var18); // L: 386 + } else { + var30 = new DynamicObject(var3, 2, var4 + 4, var0, var1, var2, var8.animationId, var8.field1801, (Renderable)null); // L: 389 + var24 = new DynamicObject(var3, 2, var22, var0, var1, var2, var8.animationId, var8.field1801, (Renderable)null); // L: 390 + } + + var6.newBoundaryObject(var0, var1, var2, var16, (Renderable)var30, (Renderable)var24, Tiles.field1117[var4], Tiles.field1117[var22], var19, var21); // L: 392 + if (var8.modelClipped) { // L: 393 + if (var4 == 0) { // L: 394 + var10000 = UrlRequester.field1419[var0][var1]; // L: 395 + var10000[var2] |= 585; + var10000 = UrlRequester.field1419[var0][var1]; // L: 396 + var10000[1 + var2] |= 1170; + } else if (var4 == 1) { // L: 398 + var10000 = UrlRequester.field1419[var0][var1]; // L: 399 + var10000[var2 + 1] |= 1170; + var10000 = UrlRequester.field1419[var0][var1 + 1]; // L: 400 + var10000[var2] |= 585; + } else if (var4 == 2) { // L: 402 + var10000 = UrlRequester.field1419[var0][var1 + 1]; // L: 403 + var10000[var2] |= 585; + var10000 = UrlRequester.field1419[var0][var1]; // L: 404 + var10000[var2] |= 1170; + } else if (var4 == 3) { // L: 406 + var10000 = UrlRequester.field1419[var0][var1]; // L: 407 + var10000[var2] |= 1170; + var10000 = UrlRequester.field1419[var0][var1]; // L: 408 + var10000[var2] |= 585; + } + } + + if (var8.interactType != 0 && var7 != null) { // L: 411 + var7.method3164(var1, var2, var5, var4, var8.boolean1); + } + + if (var8.int2 != 16) { // L: 412 + var6.method3967(var0, var1, var2, var8.int2); + } + + } else if (var5 == 3) { // L: 415 + if (var8.animationId == -1 && var8.transforms == null) { // L: 417 + var29 = var8.getEntity(3, var4, var15, var17, var16, var18); + } else { + var29 = new DynamicObject(var3, 3, var4, var0, var1, var2, var8.animationId, var8.field1801, (Renderable)null); // L: 418 + } + + var6.newBoundaryObject(var0, var1, var2, var16, (Renderable)var29, (Renderable)null, Tiles.field1125[var4], 0, var19, var21); // L: 419 + if (var8.clipped) { // L: 420 + if (var4 == 0) { // L: 421 + class372.field4123[var0][var1][var2 + 1] = 50; + } else if (var4 == 1) { // L: 422 + class372.field4123[var0][var1 + 1][var2 + 1] = 50; + } else if (var4 == 2) { // L: 423 + class372.field4123[var0][var1 + 1][var2] = 50; + } else if (var4 == 3) { // L: 424 + class372.field4123[var0][var1][var2] = 50; + } + } + + if (var8.interactType != 0 && var7 != null) { // L: 426 + var7.method3164(var1, var2, var5, var4, var8.boolean1); + } + + } else if (var5 == 9) { // L: 429 + if (var8.animationId == -1 && var8.transforms == null) { // L: 431 + var29 = var8.getEntity(var5, var4, var15, var17, var16, var18); + } else { + var29 = new DynamicObject(var3, var5, var4, var0, var1, var2, var8.animationId, var8.field1801, (Renderable)null); // L: 432 + } + + var6.method4007(var0, var1, var2, var16, 1, 1, (Renderable)var29, 0, var19, var21); // L: 433 + if (var8.interactType != 0 && var7 != null) { // L: 434 + var7.addGameObject(var1, var2, var9, var10, var8.boolean1); + } + + if (var8.int2 != 16) { // L: 435 + var6.method3967(var0, var1, var2, var8.int2); + } + + } else if (var5 == 4) { // L: 438 + if (var8.animationId == -1 && var8.transforms == null) { // L: 440 + var29 = var8.getEntity(4, var4, var15, var17, var16, var18); + } else { + var29 = new DynamicObject(var3, 4, var4, var0, var1, var2, var8.animationId, var8.field1801, (Renderable)null); // L: 441 + } + + var6.newWallDecoration(var0, var1, var2, var16, (Renderable)var29, (Renderable)null, Tiles.field1117[var4], 0, 0, 0, var19, var21); // L: 442 + } else { + long var23; + Object var25; + if (var5 == 5) { // L: 445 + var22 = 16; // L: 446 + var23 = var6.getBoundaryObjectTag(var0, var1, var2); // L: 447 + if (0L != var23) { // L: 448 + var22 = class23.getObjectDefinition(class93.Entity_unpackID(var23)).int2; + } + + if (var8.animationId == -1 && var8.transforms == null) { // L: 450 + var25 = var8.getEntity(4, var4, var15, var17, var16, var18); + } else { + var25 = new DynamicObject(var3, 4, var4, var0, var1, var2, var8.animationId, var8.field1801, (Renderable)null); // L: 451 + } + + var6.newWallDecoration(var0, var1, var2, var16, (Renderable)var25, (Renderable)null, Tiles.field1117[var4], 0, var22 * Tiles.field1126[var4], var22 * Tiles.field1123[var4], var19, var21); // L: 452 + } else if (var5 == 6) { // L: 455 + var22 = 8; // L: 456 + var23 = var6.getBoundaryObjectTag(var0, var1, var2); // L: 457 + if (var23 != 0L) { // L: 458 + var22 = class23.getObjectDefinition(class93.Entity_unpackID(var23)).int2 / 2; + } + + if (var8.animationId == -1 && var8.transforms == null) { // L: 460 + var25 = var8.getEntity(4, var4 + 4, var15, var17, var16, var18); + } else { + var25 = new DynamicObject(var3, 4, var4 + 4, var0, var1, var2, var8.animationId, var8.field1801, (Renderable)null); // L: 461 + } + + var6.newWallDecoration(var0, var1, var2, var16, (Renderable)var25, (Renderable)null, 256, var4, var22 * Tiles.field1128[var4], var22 * Tiles.field1129[var4], var19, var21); // L: 462 + } else if (var5 == 7) { // L: 465 + var28 = var4 + 2 & 3; // L: 467 + if (var8.animationId == -1 && var8.transforms == null) { // L: 468 + var29 = var8.getEntity(4, var28 + 4, var15, var17, var16, var18); + } else { + var29 = new DynamicObject(var3, 4, var28 + 4, var0, var1, var2, var8.animationId, var8.field1801, (Renderable)null); // L: 469 + } + + var6.newWallDecoration(var0, var1, var2, var16, (Renderable)var29, (Renderable)null, 256, var28, 0, 0, var19, var21); // L: 470 + } else if (var5 == 8) { // L: 473 + var22 = 8; // L: 474 + var23 = var6.getBoundaryObjectTag(var0, var1, var2); // L: 475 + if (0L != var23) { // L: 476 + var22 = class23.getObjectDefinition(class93.Entity_unpackID(var23)).int2 / 2; + } + + int var27 = var4 + 2 & 3; // L: 479 + Object var26; + if (var8.animationId == -1 && var8.transforms == null) { // L: 480 + var25 = var8.getEntity(4, var4 + 4, var15, var17, var16, var18); // L: 481 + var26 = var8.getEntity(4, var27 + 4, var15, var17, var16, var18); // L: 482 + } else { + var25 = new DynamicObject(var3, 4, var4 + 4, var0, var1, var2, var8.animationId, var8.field1801, (Renderable)null); // L: 485 + var26 = new DynamicObject(var3, 4, var27 + 4, var0, var1, var2, var8.animationId, var8.field1801, (Renderable)null); // L: 486 + } + + var6.newWallDecoration(var0, var1, var2, var16, (Renderable)var25, (Renderable)var26, 256, var4, var22 * Tiles.field1128[var4], var22 * Tiles.field1129[var4], var19, var21); // L: 488 + } + } + } + } else { + if (var8.animationId == -1 && var8.transforms == null) { // L: 301 + var29 = var8.getEntity(10, var4, var15, var17, var16, var18); + } else { + var29 = new DynamicObject(var3, 10, var4, var0, var1, var2, var8.animationId, var8.field1801, (Renderable)null); // L: 302 + } + + if (var29 != null && var6.method4007(var0, var1, var2, var16, var9, var10, (Renderable)var29, var5 == 11 ? 256 : 0, var19, var21) && var8.clipped) { // L: 303 304 + var28 = 15; // L: 305 + if (var29 instanceof Model) { // L: 306 + var28 = ((Model)var29).method4180() / 4; // L: 307 + if (var28 > 30) { // L: 308 + var28 = 30; + } + } + + for (int var31 = 0; var31 <= var9; ++var31) { // L: 310 + for (int var32 = 0; var32 <= var10; ++var32) { // L: 311 + if (var28 > class372.field4123[var0][var31 + var1][var32 + var2]) { // L: 312 + class372.field4123[var0][var31 + var1][var32 + var2] = (byte)var28; + } + } + } + } + + if (var8.interactType != 0 && var7 != null) { // L: 317 + var7.addGameObject(var1, var2, var9, var10, var8.boolean1); + } + + } + } + } + } // L: 297 318 327 364 378 413 427 436 443 453 463 471 489 491 + + @ObfuscatedName("kz") + @ObfuscatedSignature( + descriptor = "(I)V", + garbageValue = "813346347" + ) + static final void method85() { + for (int var0 = 0; var0 < Players.Players_count; ++var0) { // L: 11269 + Player var1 = Client.players[Players.Players_indices[var0]]; // L: 11270 + var1.clearIsInFriendsChat(); // L: 11271 + } + + } // L: 11273 +} diff --git a/runescape-client/src/main/java/ClanChat.java b/runescape-client/src/main/java/ClanChat.java deleted file mode 100644 index 7d73c0c952..0000000000 --- a/runescape-client/src/main/java/ClanChat.java +++ /dev/null @@ -1,674 +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("lx") -@Implements("ClanChat") -public class ClanChat extends UserList { - @ObfuscatedName("c") - @ObfuscatedSignature( - descriptor = "Lnj;" - ) - @Export("loginType") - final LoginType loginType; - @ObfuscatedName("o") - @ObfuscatedSignature( - descriptor = "Llt;" - ) - @Export("localUser") - final Usernamed localUser; - @ObfuscatedName("g") - @Export("name") - public String name; - @ObfuscatedName("l") - @Export("owner") - public String owner; - @ObfuscatedName("z") - @Export("minKick") - public byte minKick; - @ObfuscatedName("t") - @ObfuscatedGetter( - intValue = 504381773 - ) - @Export("rank") - public int rank; - @ObfuscatedName("v") - @ObfuscatedGetter( - intValue = 1476924317 - ) - int field3835; - - @ObfuscatedSignature( - descriptor = "(Lnj;Llt;)V" - ) - public ClanChat(LoginType var1, Usernamed var2) { - super(100); // L: 18 - this.name = null; // L: 11 - this.owner = null; // L: 12 - this.field3835 = 1; // L: 15 - this.loginType = var1; // L: 19 - this.localUser = var2; // L: 20 - } // L: 21 - - @ObfuscatedName("h") - @ObfuscatedSignature( - descriptor = "(I)Llm;", - garbageValue = "-1768347101" - ) - @Export("newInstance") - User newInstance() { - return new ClanMate(); // L: 24 - } - - @ObfuscatedName("c") - @ObfuscatedSignature( - descriptor = "(II)[Llm;", - garbageValue = "836907267" - ) - @Export("newTypedArray") - User[] newTypedArray(int var1) { - return new ClanMate[var1]; // L: 28 - } - - @ObfuscatedName("o") - @ObfuscatedSignature( - descriptor = "(Ljava/lang/String;I)V", - garbageValue = "-1078557001" - ) - @Export("readName") - final void readName(String var1) { - long var5 = 0L; // L: 36 - int var7 = var1.length(); // L: 37 - - for (int var8 = 0; var8 < var7; ++var8) { // L: 38 - var5 *= 37L; // L: 39 - char var9 = var1.charAt(var8); // L: 40 - if (var9 >= 'A' && var9 <= 'Z') { // L: 41 - var5 += (long)(var9 + 1 - 65); - } else if (var9 >= 'a' && var9 <= 'z') { // L: 42 - var5 += (long)(var9 + 1 - 97); - } else if (var9 >= '0' && var9 <= '9') { - var5 += (long)(var9 + 27 - 48); // L: 43 - } - - if (var5 >= 177917621779460413L) { // L: 44 - break; - } - } - - while (var5 % 37L == 0L && var5 != 0L) { // L: 46 - var5 /= 37L; - } - - String var10 = MilliClock.base37DecodeLong(var5); // L: 49 - if (var10 == null) { // L: 50 - var10 = ""; - } - - this.name = var10; // L: 53 - } // L: 54 - - @ObfuscatedName("v") - @ObfuscatedSignature( - descriptor = "(Ljava/lang/String;I)V", - garbageValue = "-786554920" - ) - @Export("setOwner") - final void setOwner(String var1) { - long var5 = 0L; // L: 61 - int var7 = var1.length(); // L: 62 - - for (int var8 = 0; var8 < var7; ++var8) { // L: 63 - var5 *= 37L; // L: 64 - char var9 = var1.charAt(var8); // L: 65 - if (var9 >= 'A' && var9 <= 'Z') { // L: 66 - var5 += (long)(var9 + 1 - 65); - } else if (var9 >= 'a' && var9 <= 'z') { // L: 67 - var5 += (long)(var9 + 1 - 97); - } else if (var9 >= '0' && var9 <= '9') { - var5 += (long)(var9 + 27 - 48); // L: 68 - } - - if (var5 >= 177917621779460413L) { // L: 69 - break; - } - } - - while (0L == var5 % 37L && var5 != 0L) { // L: 71 - var5 /= 37L; - } - - String var10 = MilliClock.base37DecodeLong(var5); // L: 74 - if (var10 == null) { // L: 75 - var10 = ""; - } - - this.owner = var10; // L: 78 - } // L: 79 - - @ObfuscatedName("b") - @ObfuscatedSignature( - descriptor = "(Lnk;I)V", - garbageValue = "1366673555" - ) - @Export("readUpdate") - public final void readUpdate(Buffer var1) { - this.setOwner(var1.readStringCp1252NullTerminated()); // L: 82 - long var2 = var1.readLong(); // L: 83 - long var5 = var2; // L: 85 - String var4; - int var7; - if (var2 > 0L && var2 < 6582952005840035281L) { // L: 87 - if (0L == var2 % 37L) { // L: 91 - var4 = null; // L: 92 - } else { - var7 = 0; // L: 95 - - for (long var8 = var2; var8 != 0L; var8 /= 37L) { // L: 96 97 99 - ++var7; // L: 98 - } - - StringBuilder var10 = new StringBuilder(var7); // L: 101 - - while (0L != var5) { // L: 102 - long var11 = var5; // L: 103 - var5 /= 37L; // L: 104 - var10.append(class305.base37Table[(int)(var11 - 37L * var5)]); // L: 105 - } - - var4 = var10.reverse().toString(); // L: 107 - } - } else { - var4 = null; // L: 88 - } - - this.readName(var4); // L: 109 - this.minKick = var1.readByte(); // L: 110 - var7 = var1.readUnsignedByte(); // L: 111 - if (var7 != 255) { // L: 112 - this.clear(); // L: 113 - - for (int var13 = 0; var13 < var7; ++var13) { // L: 114 - ClanMate var9 = (ClanMate)this.addLastNoPreviousUsername(new Username(var1.readStringCp1252NullTerminated(), this.loginType)); // L: 115 - int var14 = var1.readUnsignedShort(); // L: 116 - var9.set(var14, ++this.field3835 - 1); // L: 117 - var9.rank = var1.readByte(); // L: 118 - var1.readStringCp1252NullTerminated(); // L: 119 - this.isLocalPlayer(var9); // L: 120 - } - - } - } // L: 122 - - @ObfuscatedName("q") - @ObfuscatedSignature( - descriptor = "(Lnk;I)V", - garbageValue = "-759910337" - ) - public final void method5519(Buffer var1) { - Username var2 = new Username(var1.readStringCp1252NullTerminated(), this.loginType); // L: 125 - int var3 = var1.readUnsignedShort(); // L: 126 - byte var4 = var1.readByte(); // L: 127 - boolean var5 = false; // L: 128 - if (var4 == -128) { // L: 129 - var5 = true; - } - - ClanMate var6; - if (var5) { // L: 130 - if (this.getSize() == 0) { // L: 131 - return; - } - - var6 = (ClanMate)this.getByCurrentUsername(var2); // L: 132 - if (var6 != null && var6.getWorld() == var3) { // L: 133 - this.remove(var6); // L: 134 - } - } else { - var1.readStringCp1252NullTerminated(); // L: 138 - var6 = (ClanMate)this.getByCurrentUsername(var2); // L: 139 - if (var6 == null) { // L: 140 - if (this.getSize() > super.capacity) { // L: 141 - return; - } - - var6 = (ClanMate)this.addLastNoPreviousUsername(var2); // L: 142 - } - - var6.set(var3, ++this.field3835 - 1); // L: 144 - var6.rank = var4; // L: 145 - this.isLocalPlayer(var6); // L: 146 - } - - } // L: 148 - - @ObfuscatedName("i") - @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "-1356197970" - ) - @Export("clearFriends") - public final void clearFriends() { - for (int var1 = 0; var1 < this.getSize(); ++var1) { // L: 151 - ((ClanMate)this.get(var1)).clearIsFriend(); // L: 152 - } - - } // L: 154 - - @ObfuscatedName("x") - @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "-404793839" - ) - @Export("invalidateIgnoreds") - public final void invalidateIgnoreds() { - for (int var1 = 0; var1 < this.getSize(); ++var1) { // L: 157 - ((ClanMate)this.get(var1)).clearIsIgnored(); // L: 158 - } - - } // L: 160 - - @ObfuscatedName("k") - @ObfuscatedSignature( - descriptor = "(Llh;I)V", - garbageValue = "-1814056265" - ) - @Export("isLocalPlayer") - final void isLocalPlayer(ClanMate var1) { - if (var1.getUsername().equals(this.localUser.username())) { // L: 163 - this.rank = var1.rank; - } - - } // L: 164 - - @ObfuscatedName("l") - @ObfuscatedSignature( - descriptor = "(IIIIIILgz;Lfa;B)V", - garbageValue = "-119" - ) - static final void method5541(int var0, int var1, int var2, int var3, int var4, int var5, Scene var6, CollisionMap var7) { - if (!Client.isLowDetail || (Tiles.Tiles_renderFlags[0][var1][var2] & 2) != 0 || (Tiles.Tiles_renderFlags[var0][var1][var2] & 16) == 0) { // L: 176 177 178 - if (var0 < Tiles.Tiles_minPlane) { // L: 181 - Tiles.Tiles_minPlane = var0; - } - - ObjectComposition var8 = AttackOption.getObjectDefinition(var3); // L: 182 - int var9; - int var10; - if (var4 != 1 && var4 != 3) { // L: 185 - var9 = var8.sizeX; // L: 190 - var10 = var8.sizeY; // L: 191 - } else { - var9 = var8.sizeY; // L: 186 - var10 = var8.sizeX; // L: 187 - } - - int var11; - int var12; - if (var9 + var1 <= 104) { // L: 197 - var11 = (var9 >> 1) + var1; // L: 198 - var12 = (var9 + 1 >> 1) + var1; // L: 199 - } else { - var11 = var1; // L: 202 - var12 = var1 + 1; // L: 203 - } - - int var13; - int var14; - if (var10 + var2 <= 104) { // L: 205 - var13 = (var10 >> 1) + var2; // L: 206 - var14 = var2 + (var10 + 1 >> 1); // L: 207 - } else { - var13 = var2; // L: 210 - var14 = var2 + 1; // L: 211 - } - - int[][] var15 = Tiles.Tiles_heights[var0]; // L: 213 - int var16 = var15[var12][var13] + var15[var11][var13] + var15[var11][var14] + var15[var12][var14] >> 2; // L: 214 - int var17 = (var1 << 7) + (var9 << 6); // L: 215 - int var18 = (var2 << 7) + (var10 << 6); // L: 216 - long var19 = class17.calculateTag(var1, var2, 2, var8.int1 == 0, var3); // L: 217 - int var21 = var5 + (var4 << 6); // L: 218 - if (var8.int3 == 1) { // L: 219 - var21 += 256; - } - - int var23; - int var24; - if (var8.hasSound()) { // L: 220 - ObjectSound var22 = new ObjectSound(); // L: 221 - var22.plane = var0; // L: 222 - var22.x = var1 * 128; // L: 223 - var22.y = var2 * 128; // L: 224 - var23 = var8.sizeX; // L: 225 - var24 = var8.sizeY; // L: 226 - if (var4 == 1 || var4 == 3) { // L: 227 - var23 = var8.sizeY; // L: 228 - var24 = var8.sizeX; // L: 229 - } - - var22.field926 = (var23 + var1) * 128; // L: 231 - var22.field927 = (var24 + var2) * 128; // L: 232 - var22.soundEffectId = var8.ambientSoundId; // L: 233 - var22.field929 = var8.int4 * 128; // L: 234 - var22.field934 = var8.int5; // L: 235 - var22.field932 = var8.int6; // L: 236 - var22.soundEffectIds = var8.soundEffectIds; // L: 237 - if (var8.transforms != null) { // L: 238 - var22.obj = var8; // L: 239 - var22.set(); // L: 240 - } - - ObjectSound.objectSounds.addFirst(var22); // L: 242 - if (var22.soundEffectIds != null) { // L: 243 - var22.field923 = var22.field934 + (int)(Math.random() * (double)(var22.field932 - var22.field934)); - } - } - - Object var34; - if (var5 == 22) { // L: 245 - if (!Client.isLowDetail || var8.int1 != 0 || var8.interactType == 1 || var8.boolean2) { // L: 246 - if (var8.animationId == -1 && var8.transforms == null) { // L: 248 - var34 = var8.getEntity(22, var4, var15, var17, var16, var18); - } else { - var34 = new DynamicObject(var3, 22, var4, var0, var1, var2, var8.animationId, var8.field1761, (Renderable)null); // L: 249 - } - - var6.newFloorDecoration(var0, var1, var2, var16, (Renderable)var34, var19, var21); // L: 250 - if (var8.interactType == 1 && var7 != null) { // L: 251 - var7.setBlockedByFloorDec(var1, var2); - } - - } - } else if (var5 != 10 && var5 != 11) { // L: 254 - int[] var10000; - if (var5 >= 12) { // L: 275 - if (var8.animationId == -1 && var8.transforms == null) { // L: 277 - var34 = var8.getEntity(var5, var4, var15, var17, var16, var18); - } else { - var34 = new DynamicObject(var3, var5, var4, var0, var1, var2, var8.animationId, var8.field1761, (Renderable)null); // L: 278 - } - - var6.method4008(var0, var1, var2, var16, 1, 1, (Renderable)var34, 0, var19, var21); // L: 279 - if (var5 >= 12 && var5 <= 17 && var5 != 13 && var0 > 0) { // L: 280 - var10000 = Tiles.field1105[var0][var1]; - var10000[var2] |= 2340; - } - - if (var8.interactType != 0 && var7 != null) { // L: 281 - var7.addGameObject(var1, var2, var9, var10, var8.boolean1); - } - - } else if (var5 == 0) { // L: 284 - if (var8.animationId == -1 && var8.transforms == null) { // L: 286 - var34 = var8.getEntity(0, var4, var15, var17, var16, var18); - } else { - var34 = new DynamicObject(var3, 0, var4, var0, var1, var2, var8.animationId, var8.field1761, (Renderable)null); // L: 287 - } - - var6.newBoundaryObject(var0, var1, var2, var16, (Renderable)var34, (Renderable)null, Tiles.field1085[var4], 0, var19, var21); // L: 288 - if (var4 == 0) { // L: 289 - if (var8.clipped) { // L: 290 - Tiles.field1090[var0][var1][var2] = 50; // L: 291 - Tiles.field1090[var0][var1][var2 + 1] = 50; // L: 292 - } - - if (var8.modelClipped) { // L: 294 - var10000 = Tiles.field1105[var0][var1]; - var10000[var2] |= 585; - } - } else if (var4 == 1) { // L: 296 - if (var8.clipped) { // L: 297 - Tiles.field1090[var0][var1][var2 + 1] = 50; // L: 298 - Tiles.field1090[var0][var1 + 1][var2 + 1] = 50; // L: 299 - } - - if (var8.modelClipped) { // L: 301 - var10000 = Tiles.field1105[var0][var1]; - var10000[var2 + 1] |= 1170; - } - } else if (var4 == 2) { // L: 303 - if (var8.clipped) { // L: 304 - Tiles.field1090[var0][var1 + 1][var2] = 50; // L: 305 - Tiles.field1090[var0][var1 + 1][var2 + 1] = 50; // L: 306 - } - - if (var8.modelClipped) { // L: 308 - var10000 = Tiles.field1105[var0][var1 + 1]; - var10000[var2] |= 585; - } - } else if (var4 == 3) { // L: 310 - if (var8.clipped) { // L: 311 - Tiles.field1090[var0][var1][var2] = 50; // L: 312 - Tiles.field1090[var0][var1 + 1][var2] = 50; // L: 313 - } - - if (var8.modelClipped) { // L: 315 - var10000 = Tiles.field1105[var0][var1]; - var10000[var2] |= 1170; - } - } - - if (var8.interactType != 0 && var7 != null) { // L: 317 - var7.method3094(var1, var2, var5, var4, var8.boolean1); - } - - if (var8.int2 != 16) { // L: 318 - var6.method3917(var0, var1, var2, var8.int2); - } - - } else if (var5 == 1) { // L: 321 - if (var8.animationId == -1 && var8.transforms == null) { // L: 323 - var34 = var8.getEntity(1, var4, var15, var17, var16, var18); - } else { - var34 = new DynamicObject(var3, 1, var4, var0, var1, var2, var8.animationId, var8.field1761, (Renderable)null); // L: 324 - } - - var6.newBoundaryObject(var0, var1, var2, var16, (Renderable)var34, (Renderable)null, Tiles.field1095[var4], 0, var19, var21); // L: 325 - if (var8.clipped) { // L: 326 - if (var4 == 0) { // L: 327 - Tiles.field1090[var0][var1][var2 + 1] = 50; - } else if (var4 == 1) { // L: 328 - Tiles.field1090[var0][var1 + 1][var2 + 1] = 50; - } else if (var4 == 2) { // L: 329 - Tiles.field1090[var0][var1 + 1][var2] = 50; - } else if (var4 == 3) { // L: 330 - Tiles.field1090[var0][var1][var2] = 50; - } - } - - if (var8.interactType != 0 && var7 != null) { // L: 332 - var7.method3094(var1, var2, var5, var4, var8.boolean1); - } - - } else { - int var28; - if (var5 == 2) { // L: 335 - var28 = var4 + 1 & 3; // L: 336 - Object var31; - Object var32; - if (var8.animationId == -1 && var8.transforms == null) { // L: 339 - var31 = var8.getEntity(2, var4 + 4, var15, var17, var16, var18); // L: 340 - var32 = var8.getEntity(2, var28, var15, var17, var16, var18); // L: 341 - } else { - var31 = new DynamicObject(var3, 2, var4 + 4, var0, var1, var2, var8.animationId, var8.field1761, (Renderable)null); // L: 344 - var32 = new DynamicObject(var3, 2, var28, var0, var1, var2, var8.animationId, var8.field1761, (Renderable)null); // L: 345 - } - - var6.newBoundaryObject(var0, var1, var2, var16, (Renderable)var31, (Renderable)var32, Tiles.field1085[var4], Tiles.field1085[var28], var19, var21); // L: 347 - if (var8.modelClipped) { // L: 348 - if (var4 == 0) { // L: 349 - var10000 = Tiles.field1105[var0][var1]; // L: 350 - var10000[var2] |= 585; - var10000 = Tiles.field1105[var0][var1]; // L: 351 - var10000[var2 + 1] |= 1170; - } else if (var4 == 1) { // L: 353 - var10000 = Tiles.field1105[var0][var1]; // L: 354 - var10000[var2 + 1] |= 1170; - var10000 = Tiles.field1105[var0][var1 + 1]; // L: 355 - var10000[var2] |= 585; - } else if (var4 == 2) { // L: 357 - var10000 = Tiles.field1105[var0][var1 + 1]; // L: 358 - var10000[var2] |= 585; - var10000 = Tiles.field1105[var0][var1]; // L: 359 - var10000[var2] |= 1170; - } else if (var4 == 3) { // L: 361 - var10000 = Tiles.field1105[var0][var1]; // L: 362 - var10000[var2] |= 1170; - var10000 = Tiles.field1105[var0][var1]; // L: 363 - var10000[var2] |= 585; - } - } - - if (var8.interactType != 0 && var7 != null) { // L: 366 - var7.method3094(var1, var2, var5, var4, var8.boolean1); - } - - if (var8.int2 != 16) { // L: 367 - var6.method3917(var0, var1, var2, var8.int2); - } - - } else if (var5 == 3) { // L: 370 - if (var8.animationId == -1 && var8.transforms == null) { // L: 372 - var34 = var8.getEntity(3, var4, var15, var17, var16, var18); - } else { - var34 = new DynamicObject(var3, 3, var4, var0, var1, var2, var8.animationId, var8.field1761, (Renderable)null); // L: 373 - } - - var6.newBoundaryObject(var0, var1, var2, var16, (Renderable)var34, (Renderable)null, Tiles.field1095[var4], 0, var19, var21); // L: 374 - if (var8.clipped) { // L: 375 - if (var4 == 0) { // L: 376 - Tiles.field1090[var0][var1][var2 + 1] = 50; - } else if (var4 == 1) { // L: 377 - Tiles.field1090[var0][var1 + 1][var2 + 1] = 50; - } else if (var4 == 2) { // L: 378 - Tiles.field1090[var0][var1 + 1][var2] = 50; - } else if (var4 == 3) { // L: 379 - Tiles.field1090[var0][var1][var2] = 50; - } - } - - if (var8.interactType != 0 && var7 != null) { // L: 381 - var7.method3094(var1, var2, var5, var4, var8.boolean1); - } - - } else if (var5 == 9) { // L: 384 - if (var8.animationId == -1 && var8.transforms == null) { // L: 386 - var34 = var8.getEntity(var5, var4, var15, var17, var16, var18); - } else { - var34 = new DynamicObject(var3, var5, var4, var0, var1, var2, var8.animationId, var8.field1761, (Renderable)null); // L: 387 - } - - var6.method4008(var0, var1, var2, var16, 1, 1, (Renderable)var34, 0, var19, var21); // L: 388 - if (var8.interactType != 0 && var7 != null) { // L: 389 - var7.addGameObject(var1, var2, var9, var10, var8.boolean1); - } - - if (var8.int2 != 16) { // L: 390 - var6.method3917(var0, var1, var2, var8.int2); - } - - } else if (var5 == 4) { // L: 393 - if (var8.animationId == -1 && var8.transforms == null) { // L: 395 - var34 = var8.getEntity(4, var4, var15, var17, var16, var18); - } else { - var34 = new DynamicObject(var3, 4, var4, var0, var1, var2, var8.animationId, var8.field1761, (Renderable)null); // L: 396 - } - - var6.newWallDecoration(var0, var1, var2, var16, (Renderable)var34, (Renderable)null, Tiles.field1085[var4], 0, 0, 0, var19, var21); // L: 397 - } else { - Object var25; - long var29; - if (var5 == 5) { // L: 400 - var28 = 16; // L: 401 - var29 = var6.getBoundaryObjectTag(var0, var1, var2); // L: 402 - if (var29 != 0L) { // L: 403 - var28 = AttackOption.getObjectDefinition(class6.Entity_unpackID(var29)).int2; - } - - if (var8.animationId == -1 && var8.transforms == null) { // L: 405 - var25 = var8.getEntity(4, var4, var15, var17, var16, var18); - } else { - var25 = new DynamicObject(var3, 4, var4, var0, var1, var2, var8.animationId, var8.field1761, (Renderable)null); // L: 406 - } - - var6.newWallDecoration(var0, var1, var2, var16, (Renderable)var25, (Renderable)null, Tiles.field1085[var4], 0, var28 * Tiles.field1096[var4], var28 * Tiles.field1100[var4], var19, var21); // L: 407 - } else if (var5 == 6) { // L: 410 - var28 = 8; // L: 411 - var29 = var6.getBoundaryObjectTag(var0, var1, var2); // L: 412 - if (var29 != 0L) { // L: 413 - var28 = AttackOption.getObjectDefinition(class6.Entity_unpackID(var29)).int2 / 2; - } - - if (var8.animationId == -1 && var8.transforms == null) { // L: 415 - var25 = var8.getEntity(4, var4 + 4, var15, var17, var16, var18); - } else { - var25 = new DynamicObject(var3, 4, var4 + 4, var0, var1, var2, var8.animationId, var8.field1761, (Renderable)null); // L: 416 - } - - var6.newWallDecoration(var0, var1, var2, var16, (Renderable)var25, (Renderable)null, 256, var4, var28 * Tiles.field1098[var4], var28 * Tiles.field1094[var4], var19, var21); // L: 417 - } else if (var5 == 7) { // L: 420 - var23 = var4 + 2 & 3; // L: 422 - if (var8.animationId == -1 && var8.transforms == null) { // L: 423 - var34 = var8.getEntity(4, var23 + 4, var15, var17, var16, var18); - } else { - var34 = new DynamicObject(var3, 4, var23 + 4, var0, var1, var2, var8.animationId, var8.field1761, (Renderable)null); // L: 424 - } - - var6.newWallDecoration(var0, var1, var2, var16, (Renderable)var34, (Renderable)null, 256, var23, 0, 0, var19, var21); // L: 425 - } else if (var5 == 8) { // L: 428 - var28 = 8; // L: 429 - var29 = var6.getBoundaryObjectTag(var0, var1, var2); // L: 430 - if (0L != var29) { // L: 431 - var28 = AttackOption.getObjectDefinition(class6.Entity_unpackID(var29)).int2 / 2; - } - - int var27 = var4 + 2 & 3; // L: 434 - Object var26; - if (var8.animationId == -1 && var8.transforms == null) { // L: 435 - var25 = var8.getEntity(4, var4 + 4, var15, var17, var16, var18); // L: 436 - var26 = var8.getEntity(4, var27 + 4, var15, var17, var16, var18); // L: 437 - } else { - var25 = new DynamicObject(var3, 4, var4 + 4, var0, var1, var2, var8.animationId, var8.field1761, (Renderable)null); // L: 440 - var26 = new DynamicObject(var3, 4, var27 + 4, var0, var1, var2, var8.animationId, var8.field1761, (Renderable)null); // L: 441 - } - - var6.newWallDecoration(var0, var1, var2, var16, (Renderable)var25, (Renderable)var26, 256, var4, var28 * Tiles.field1098[var4], var28 * Tiles.field1094[var4], var19, var21); // L: 443 - } - } - } - } else { - if (var8.animationId == -1 && var8.transforms == null) { // L: 256 - var34 = var8.getEntity(10, var4, var15, var17, var16, var18); - } else { - var34 = new DynamicObject(var3, 10, var4, var0, var1, var2, var8.animationId, var8.field1761, (Renderable)null); // L: 257 - } - - if (var34 != null && var6.method4008(var0, var1, var2, var16, var9, var10, (Renderable)var34, var5 == 11 ? 256 : 0, var19, var21) && var8.clipped) { // L: 258 259 - var23 = 15; // L: 260 - if (var34 instanceof Model) { // L: 261 - var23 = ((Model)var34).method4125() / 4; // L: 262 - if (var23 > 30) { // L: 263 - var23 = 30; - } - } - - for (var24 = 0; var24 <= var9; ++var24) { // L: 265 - for (int var33 = 0; var33 <= var10; ++var33) { // L: 266 - if (var23 > Tiles.field1090[var0][var24 + var1][var33 + var2]) { // L: 267 - Tiles.field1090[var0][var24 + var1][var33 + var2] = (byte)var23; - } - } - } - } - - if (var8.interactType != 0 && var7 != null) { // L: 272 - var7.addGameObject(var1, var2, var9, var10, var8.boolean1); - } - - } - } - } // L: 252 273 282 319 333 368 382 391 398 408 418 426 444 446 -} diff --git a/runescape-client/src/main/java/ClanMate.java b/runescape-client/src/main/java/ClanMate.java index 4bac2b60f3..c10a59647d 100644 --- a/runescape-client/src/main/java/ClanMate.java +++ b/runescape-client/src/main/java/ClanMate.java @@ -1,20 +1,32 @@ +import java.io.IOException; +import java.io.InputStream; +import java.io.OutputStreamWriter; +import java.net.URL; +import java.net.URLConnection; +import java.util.Random; import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("lh") +@ObfuscatedName("ll") @Implements("ClanMate") public class ClanMate extends Buddy { - @ObfuscatedName("h") + @ObfuscatedName("ea") @ObfuscatedSignature( - descriptor = "Lls;" + descriptor = "Ljp;" + ) + @Export("archive15") + static Archive archive15; + @ObfuscatedName("v") + @ObfuscatedSignature( + descriptor = "Llu;" ) @Export("friend") TriBool friend; - @ObfuscatedName("c") + @ObfuscatedName("n") @ObfuscatedSignature( - descriptor = "Lls;" + descriptor = "Llu;" ) @Export("ignored") TriBool ignored; @@ -24,20 +36,20 @@ public class ClanMate extends Buddy { this.ignored = TriBool.TriBool_unknown; // L: 7 } // L: 9 - @ObfuscatedName("h") + @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "(B)V", - garbageValue = "36" + descriptor = "(I)V", + garbageValue = "-1300571849" ) @Export("clearIsFriend") void clearIsFriend() { this.friend = TriBool.TriBool_unknown; // L: 12 } // L: 13 - @ObfuscatedName("v") + @ObfuscatedName("f") @ObfuscatedSignature( descriptor = "(I)Z", - garbageValue = "2128884199" + garbageValue = "1945487843" ) @Export("isFriend") public final boolean isFriend() { @@ -48,30 +60,30 @@ public class ClanMate extends Buddy { return this.friend == TriBool.TriBool_true; // L: 19 } - @ObfuscatedName("b") + @ObfuscatedName("y") @ObfuscatedSignature( - descriptor = "(B)V", - garbageValue = "-61" + descriptor = "(S)V", + garbageValue = "256" ) @Export("fillIsFriend") void fillIsFriend() { - this.friend = GrandExchangeOfferUnitPriceComparator.friendSystem.friendsList.contains(super.username) ? TriBool.TriBool_true : TriBool.TriBool_false; // L: 23 + this.friend = NetSocket.friendSystem.friendsList.contains(super.username) ? TriBool.TriBool_true : TriBool.TriBool_false; // L: 23 } // L: 24 - @ObfuscatedName("q") + @ObfuscatedName("p") @ObfuscatedSignature( descriptor = "(B)V", - garbageValue = "84" + garbageValue = "61" ) @Export("clearIsIgnored") void clearIsIgnored() { this.ignored = TriBool.TriBool_unknown; // L: 27 } // L: 28 - @ObfuscatedName("i") + @ObfuscatedName("c") @ObfuscatedSignature( descriptor = "(I)Z", - garbageValue = "1876506073" + garbageValue = "601254132" ) @Export("isIgnored") public final boolean isIgnored() { @@ -82,13 +94,242 @@ public class ClanMate extends Buddy { return this.ignored == TriBool.TriBool_true; // L: 34 } - @ObfuscatedName("x") + @ObfuscatedName("e") @ObfuscatedSignature( - descriptor = "(B)V", - garbageValue = "-74" + descriptor = "(I)V", + garbageValue = "-440591589" ) @Export("fillIsIgnored") void fillIsIgnored() { - this.ignored = GrandExchangeOfferUnitPriceComparator.friendSystem.ignoreList.contains(super.username) ? TriBool.TriBool_true : TriBool.TriBool_false; // L: 38 + this.ignored = NetSocket.friendSystem.ignoreList.contains(super.username) ? TriBool.TriBool_true : TriBool.TriBool_false; // L: 38 } // L: 39 + + @ObfuscatedName("d") + @ObfuscatedSignature( + descriptor = "(I)V", + garbageValue = "-1024085126" + ) + static void method5712() { + Login.Login_username = Login.Login_username.trim(); // L: 786 + if (Login.Login_username.length() == 0) { // L: 787 + class260.setLoginResponseString("Please enter your username.", "If you created your account after November", "2010, this will be the creation email address."); // L: 788 + } else { + long var1; + try { + URL var3 = new URL(KitDefinition.method2705("services", false) + "m=accountappeal/login.ws"); // L: 795 + URLConnection var4 = var3.openConnection(); // L: 796 + var4.setRequestProperty("connection", "close"); // L: 797 + var4.setDoInput(true); // L: 798 + var4.setDoOutput(true); // L: 799 + var4.setConnectTimeout(5000); // L: 800 + OutputStreamWriter var5 = new OutputStreamWriter(var4.getOutputStream()); // L: 801 + var5.write("data1=req"); // L: 802 + var5.flush(); // L: 803 + InputStream var6 = var4.getInputStream(); // L: 804 + Buffer var7 = new Buffer(new byte[1000]); // L: 805 + + while (true) { + int var8 = var6.read(var7.array, var7.offset, 1000 - var7.offset); // L: 807 + if (var8 == -1) { // L: 808 + var7.offset = 0; // L: 815 + long var23 = var7.readLong(); // L: 816 + var1 = var23; // L: 817 + break; + } + + var7.offset += var8; // L: 809 + if (var7.offset >= 1000) { // L: 810 + var1 = 0L; // L: 811 + break; + } + } + } catch (Exception var38) { // L: 819 + var1 = 0L; // L: 820 + } + + byte var0; + if (var1 == 0L) { // L: 824 + var0 = 5; + } else { + String var39 = Login.Login_username; // L: 827 + Random var40 = new Random(); // L: 829 + Buffer var27 = new Buffer(128); // L: 830 + Buffer var9 = new Buffer(128); // L: 831 + int[] var10 = new int[]{var40.nextInt(), var40.nextInt(), (int)(var1 >> 32), (int)var1}; // L: 832 833 834 835 836 + var27.writeByte(10); // L: 837 + + int var11; + for (var11 = 0; var11 < 4; ++var11) { // L: 838 + var27.writeInt(var40.nextInt()); // L: 839 + } + + var27.writeInt(var10[0]); // L: 841 + var27.writeInt(var10[1]); // L: 842 + var27.writeLong(var1); // L: 843 + var27.writeLong(0L); // L: 844 + + for (var11 = 0; var11 < 4; ++var11) { // L: 845 + var27.writeInt(var40.nextInt()); // L: 846 + } + + var27.encryptRsa(class80.field1006, class80.field1007); // L: 848 + var9.writeByte(10); // L: 849 + + for (var11 = 0; var11 < 3; ++var11) { // L: 850 + var9.writeInt(var40.nextInt()); // L: 851 + } + + var9.writeLong(var40.nextLong()); // L: 853 + var9.writeLongMedium(var40.nextLong()); // L: 854 + if (Client.randomDatData != null) { // L: 856 + var9.writeBytes(Client.randomDatData, 0, Client.randomDatData.length); // L: 857 + } else { + byte[] var12 = new byte[24]; // L: 862 + + try { + JagexCache.JagexCache_randomDat.seek(0L); // L: 864 + JagexCache.JagexCache_randomDat.readFully(var12); // L: 865 + + int var13; + for (var13 = 0; var13 < 24 && var12[var13] == 0; ++var13) { // L: 866 867 868 + } + + if (var13 >= 24) { // L: 870 + throw new IOException(); + } + } catch (Exception var37) { + for (int var14 = 0; var14 < 24; ++var14) { // L: 873 + var12[var14] = -1; + } + } + + var9.writeBytes(var12, 0, var12.length); // L: 878 + } + + var9.writeLong(var40.nextLong()); // L: 880 + var9.encryptRsa(class80.field1006, class80.field1007); // L: 881 + var11 = Tiles.stringCp1252NullTerminatedByteSize(var39); // L: 882 + if (var11 % 8 != 0) { // L: 883 + var11 += 8 - var11 % 8; + } + + Buffer var41 = new Buffer(var11); // L: 884 + var41.writeStringCp1252NullTerminated(var39); // L: 885 + var41.offset = var11; // L: 886 + var41.xteaEncryptAll(var10); // L: 887 + Buffer var28 = new Buffer(var41.offset + var27.offset + var9.offset + 5); // L: 888 + var28.writeByte(2); // L: 889 + var28.writeByte(var27.offset); // L: 890 + var28.writeBytes(var27.array, 0, var27.offset); // L: 891 + var28.writeByte(var9.offset); // L: 892 + var28.writeBytes(var9.array, 0, var9.offset); // L: 893 + var28.writeShort(var41.offset); // L: 894 + var28.writeBytes(var41.array, 0, var41.offset); // L: 895 + byte[] var15 = var28.array; // L: 897 + int var17 = var15.length; // L: 900 + StringBuilder var18 = new StringBuilder(); // L: 902 + + int var21; + for (int var19 = 0; var19 < var17 + 0; var19 += 3) { // L: 903 + int var20 = var15[var19] & 255; // L: 904 + var18.append(class302.field3743[var20 >>> 2]); // L: 905 + if (var19 < var17 - 1) { // L: 906 + var21 = var15[var19 + 1] & 255; // L: 907 + var18.append(class302.field3743[(var20 & 3) << 4 | var21 >>> 4]); // L: 908 + if (var19 < var17 - 2) { // L: 909 + int var22 = var15[var19 + 2] & 255; // L: 910 + var18.append(class302.field3743[(var21 & 15) << 2 | var22 >>> 6]).append(class302.field3743[var22 & 63]); // L: 911 + } else { + var18.append(class302.field3743[(var21 & 15) << 2]).append("="); // L: 913 + } + } else { + var18.append(class302.field3743[(var20 & 3) << 4]).append("=="); // L: 915 + } + } + + String var16 = var18.toString(); // L: 917 + var16 = var16; // L: 921 + + byte var34; + try { + URL var31 = new URL(KitDefinition.method2705("services", false) + "m=accountappeal/login.ws"); // L: 923 + URLConnection var42 = var31.openConnection(); // L: 924 + var42.setDoInput(true); // L: 925 + var42.setDoOutput(true); // L: 926 + var42.setConnectTimeout(5000); // L: 927 + OutputStreamWriter var32 = new OutputStreamWriter(var42.getOutputStream()); // L: 928 + var32.write("data2=" + FloorUnderlayDefinition.method2839(var16) + "&dest=" + FloorUnderlayDefinition.method2839("passwordchoice.ws")); // L: 929 + var32.flush(); // L: 930 + InputStream var33 = var42.getInputStream(); // L: 931 + var28 = new Buffer(new byte[1000]); // L: 932 + + while (true) { + var21 = var33.read(var28.array, var28.offset, 1000 - var28.offset); // L: 934 + if (var21 == -1) { // L: 935 + var32.close(); // L: 942 + var33.close(); // L: 943 + String var35 = new String(var28.array); // L: 944 + if (var35.startsWith("OFFLINE")) { // L: 945 + var34 = 4; // L: 946 + } else if (var35.startsWith("WRONG")) { // L: 949 + var34 = 7; // L: 950 + } else if (var35.startsWith("RELOAD")) { // L: 953 + var34 = 3; // L: 954 + } else if (var35.startsWith("Not permitted for social network accounts.")) { // L: 957 + var34 = 6; // L: 958 + } else { + var28.xteaDecryptAll(var10); // L: 961 + + while (var28.offset > 0 && var28.array[var28.offset - 1] == 0) { // L: 962 + --var28.offset; // L: 963 + } + + var35 = new String(var28.array, 0, var28.offset); // L: 965 + if (Interpreter.method1848(var35)) { // L: 966 + Players.openURL(var35, true, false); // L: 967 + var34 = 2; // L: 968 + } else { + var34 = 5; // L: 970 + } + } + break; + } + + var28.offset += var21; // L: 936 + if (var28.offset >= 1000) { // L: 937 + var34 = 5; // L: 938 + break; + } + } + } catch (Throwable var36) { // L: 972 + var36.printStackTrace(); // L: 973 + var34 = 5; // L: 974 + } + + var0 = var34; // L: 977 + } + + switch(var0) { // L: 979 + case 2: + class260.setLoginResponseString(Strings.field3503, Strings.field3504, Strings.field3505); // L: 996 + Login.loginIndex = 6; // L: 997 + break; + case 3: + class260.setLoginResponseString("", "Error connecting to server.", ""); // L: 984 + break; // L: 985 + case 4: + class260.setLoginResponseString("The part of the website you are trying", "to connect to is offline at the moment.", "Please try again later."); // L: 993 + break; // L: 994 + case 5: + class260.setLoginResponseString("Sorry, there was an error trying to", "log you in to this part of the website.", "Please try again later."); // L: 990 + break; // L: 991 + case 6: + class260.setLoginResponseString("", "Error connecting to server.", ""); // L: 981 + break; // L: 982 + case 7: + class260.setLoginResponseString("You must enter a valid login to proceed. For accounts", "created after 24th November 2010, please use your", "email address. Otherwise please use your username."); // L: 987 + } + + } + } // L: 789 1000 } diff --git a/runescape-client/src/main/java/ClanSettings.java b/runescape-client/src/main/java/ClanSettings.java new file mode 100644 index 0000000000..32fb4d2b83 --- /dev/null +++ b/runescape-client/src/main/java/ClanSettings.java @@ -0,0 +1,906 @@ +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("l") +@Implements("ClanSettings") +public class ClanSettings { + @ObfuscatedName("tn") + @ObfuscatedGetter( + intValue = -1559836599 + ) + @Export("foundItemIdCount") + static int foundItemIdCount; + @ObfuscatedName("n") + @Export("useHashes") + boolean useHashes; + @ObfuscatedName("f") + @Export("useNames") + boolean useNames; + @ObfuscatedName("y") + @ObfuscatedGetter( + longValue = 2571294659414795761L + ) + long field109; + @ObfuscatedName("p") + @ObfuscatedGetter( + intValue = 1000102115 + ) + int field94; + @ObfuscatedName("j") + @Export("name") + public String name; + @ObfuscatedName("r") + @ObfuscatedGetter( + intValue = -2010490505 + ) + int field114; + @ObfuscatedName("b") + @Export("allowGuests") + public boolean allowGuests; + @ObfuscatedName("d") + public byte field103; + @ObfuscatedName("s") + public byte field113; + @ObfuscatedName("u") + public byte field98; + @ObfuscatedName("l") + public byte field96; + @ObfuscatedName("o") + @ObfuscatedGetter( + intValue = -1916816431 + ) + @Export("memberCount") + public int memberCount; + @ObfuscatedName("c") + @Export("memberHashes") + long[] memberHashes; + @ObfuscatedName("e") + @Export("memberRanks") + public byte[] memberRanks; + @ObfuscatedName("g") + @Export("sortedMembers") + int[] sortedMembers; + @ObfuscatedName("a") + int[] field106; + @ObfuscatedName("k") + public int[] field101; + @ObfuscatedName("m") + public boolean[] field108; + @ObfuscatedName("x") + @ObfuscatedGetter( + intValue = 1791364373 + ) + @Export("currentOwner") + public int currentOwner; + @ObfuscatedName("z") + @ObfuscatedGetter( + intValue = 1909839147 + ) + public int field99; + @ObfuscatedName("w") + @ObfuscatedGetter( + intValue = 1521260055 + ) + @Export("bannedMemberCount") + public int bannedMemberCount; + @ObfuscatedName("t") + @Export("bannedMemberHashes") + long[] bannedMemberHashes; + @ObfuscatedName("h") + @Export("memberNames") + public String[] memberNames; + @ObfuscatedName("q") + @Export("bannedMemberNames") + public String[] bannedMemberNames; + @ObfuscatedName("i") + @ObfuscatedSignature( + descriptor = "Lmr;" + ) + @Export("parameters") + IterableNodeHashTable parameters; + + @ObfuscatedSignature( + descriptor = "(Lnd;)V" + ) + public ClanSettings(Buffer var1) { + this.field94 = 0; // L: 14 + this.name = null; // L: 15 + this.field114 = 0; // L: 16 + this.currentOwner = -1; + this.field99 = -1; // L: 30 + this.method127(var1); // L: 43 + } // L: 44 + + @ObfuscatedName("v") + @ObfuscatedSignature( + descriptor = "(II)V", + garbageValue = "1920986266" + ) + void method97(int var1) { + if (this.useHashes) { // L: 47 + if (this.memberHashes != null) { // L: 48 + System.arraycopy(this.memberHashes, 0, this.memberHashes = new long[var1], 0, this.memberCount); + } else { + this.memberHashes = new long[var1]; // L: 49 + } + } + + if (this.useNames) { // L: 51 + if (this.memberNames != null) { // L: 52 + System.arraycopy(this.memberNames, 0, this.memberNames = new String[var1], 0, this.memberCount); + } else { + this.memberNames = new String[var1]; // L: 53 + } + } + + if (this.memberRanks != null) { + System.arraycopy(this.memberRanks, 0, this.memberRanks = new byte[var1], 0, this.memberCount); // L: 55 + } else { + this.memberRanks = new byte[var1]; // L: 56 + } + + if (this.field106 != null) { // L: 57 + System.arraycopy(this.field106, 0, this.field106 = new int[var1], 0, this.memberCount); + } else { + this.field106 = new int[var1]; // L: 58 + } + + if (this.field101 != null) { // L: 59 + System.arraycopy(this.field101, 0, this.field101 = new int[var1], 0, this.memberCount); + } else { + this.field101 = new int[var1]; // L: 60 + } + + if (this.field108 != null) { // L: 61 + System.arraycopy(this.field108, 0, this.field108 = new boolean[var1], 0, this.memberCount); + } else { + this.field108 = new boolean[var1]; // L: 62 + } + + } // L: 63 + + @ObfuscatedName("n") + @ObfuscatedSignature( + descriptor = "(IB)V", + garbageValue = "0" + ) + void method98(int var1) { + if (this.useHashes) { // L: 66 + if (this.bannedMemberHashes != null) { // L: 67 + System.arraycopy(this.bannedMemberHashes, 0, this.bannedMemberHashes = new long[var1], 0, this.bannedMemberCount); + } else { + this.bannedMemberHashes = new long[var1]; // L: 68 + } + } + + if (this.useNames) { // L: 70 + if (this.bannedMemberNames != null) { // L: 71 + System.arraycopy(this.bannedMemberNames, 0, this.bannedMemberNames = new String[var1], 0, this.bannedMemberCount); + } else { + this.bannedMemberNames = new String[var1]; // L: 72 + } + } + + } // L: 74 + + @ObfuscatedName("f") + @ObfuscatedSignature( + descriptor = "(Ljava/lang/String;I)I", + garbageValue = "562871679" + ) + public int method99(String var1) { + if (var1 != null && var1.length() != 0) { // L: 77 + for (int var2 = 0; var2 < this.memberCount; ++var2) { // L: 78 + if (this.memberNames[var2].equals(var1)) { // L: 79 + return var2; + } + } + + return -1; // L: 81 + } else { + return -1; + } + } + + @ObfuscatedName("y") + @ObfuscatedSignature( + descriptor = "(IIII)I", + garbageValue = "-1640558909" + ) + public int method100(int var1, int var2, int var3) { + int var4 = var3 == 31 ? -1 : (1 << var3 + 1) - 1; // L: 85 + return (this.field106[var1] & var4) >>> var2; // L: 86 + } + + @ObfuscatedName("p") + @ObfuscatedSignature( + descriptor = "(IB)Ljava/lang/Integer;", + garbageValue = "5" + ) + @Export("getTitleGroupValue") + public Integer getTitleGroupValue(int var1) { + if (this.parameters == null) { // L: 90 + return null; + } else { + Node var2 = this.parameters.get((long)var1); // L: 91 + return var2 != null && var2 instanceof IntegerNode ? new Integer(((IntegerNode)var2).integer) : null; // L: 92 93 + } + } + + @ObfuscatedName("j") + @ObfuscatedSignature( + descriptor = "(I)[I", + garbageValue = "-1269043110" + ) + @Export("getSortedMembers") + public int[] getSortedMembers() { + if (this.sortedMembers == null) { // L: 97 + String[] var1 = new String[this.memberCount]; // L: 98 + this.sortedMembers = new int[this.memberCount]; // L: 99 + + for (int var2 = 0; var2 < this.memberCount; this.sortedMembers[var2] = var2++) { // L: 100 103 + var1[var2] = this.memberNames[var2]; // L: 101 + if (var1[var2] != null) { // L: 102 + var1[var2] = var1[var2].toLowerCase(); + } + } + + ChatChannel.method2013(var1, this.sortedMembers); // L: 105 + } + + return this.sortedMembers; // L: 107 + } + + @ObfuscatedName("r") + @ObfuscatedSignature( + descriptor = "(JLjava/lang/String;II)V", + garbageValue = "965862752" + ) + void method103(long var1, String var3, int var4) { + if (var3 != null && var3.length() == 0) { // L: 111 + var3 = null; + } + + if (var1 > 0L != this.useHashes) { // L: 112 + throw new RuntimeException(""); + } else if (this.useNames != (var3 != null)) { // L: 113 + throw new RuntimeException(""); + } else { + if (var1 > 0L && (this.memberHashes == null || this.memberCount >= this.memberHashes.length) || var3 != null && (this.memberNames == null || this.memberCount >= this.memberNames.length)) { // L: 114 + this.method97(this.memberCount + 5); + } + + if (this.memberHashes != null) { // L: 115 + this.memberHashes[this.memberCount] = var1; + } + + if (this.memberNames != null) { // L: 116 + this.memberNames[this.memberCount] = var3; + } + + if (this.currentOwner == -1) { // L: 117 + this.currentOwner = this.memberCount; // L: 118 + this.memberRanks[this.memberCount] = 126; // L: 119 + } else { + this.memberRanks[this.memberCount] = 0; // L: 122 + } + + this.field106[this.memberCount] = 0; // L: 124 + this.field101[this.memberCount] = var4; // L: 125 + this.field108[this.memberCount] = false; // L: 126 + ++this.memberCount; // L: 127 + this.sortedMembers = null; // L: 128 + } + } // L: 129 + + @ObfuscatedName("b") + @ObfuscatedSignature( + descriptor = "(II)V", + garbageValue = "-888167097" + ) + void method121(int var1) { + if (var1 >= 0 && var1 < this.memberCount) { // L: 132 + --this.memberCount; // L: 133 + this.sortedMembers = null; // L: 134 + if (this.memberCount == 0) { // L: 135 + this.memberHashes = null; // L: 136 + this.memberNames = null; // L: 137 + this.memberRanks = null; // L: 138 + this.field106 = null; // L: 139 + this.field101 = null; // L: 140 + this.field108 = null; // L: 141 + this.currentOwner = -1; // L: 142 + this.field99 = -1; // L: 143 + } else { + System.arraycopy(this.memberRanks, var1 + 1, this.memberRanks, var1, this.memberCount - var1); // L: 146 + System.arraycopy(this.field106, var1 + 1, this.field106, var1, this.memberCount - var1); // L: 147 + System.arraycopy(this.field101, var1 + 1, this.field101, var1, this.memberCount - var1); // L: 148 + System.arraycopy(this.field108, var1 + 1, this.field108, var1, this.memberCount - var1); // L: 149 + if (this.memberHashes != null) { // L: 150 + System.arraycopy(this.memberHashes, var1 + 1, this.memberHashes, var1, this.memberCount - var1); + } + + if (this.memberNames != null) { // L: 151 + System.arraycopy(this.memberNames, var1 + 1, this.memberNames, var1, this.memberCount - var1); + } + + this.updateOwner(); // L: 152 + } + + } else { + throw new RuntimeException(""); + } + } // L: 154 + + @ObfuscatedName("d") + @ObfuscatedSignature( + descriptor = "(I)V", + garbageValue = "-1130726760" + ) + @Export("updateOwner") + void updateOwner() { + if (this.memberCount == 0) { // L: 157 + this.currentOwner = -1; // L: 158 + this.field99 = -1; // L: 159 + } else { + this.currentOwner = -1; // L: 162 + this.field99 = -1; // L: 163 + int var1 = 0; // L: 164 + byte var2 = this.memberRanks[0]; // L: 165 + + for (int var3 = 1; var3 < this.memberCount; ++var3) { // L: 166 + if (this.memberRanks[var3] > var2) { // L: 167 + if (var2 == 125) { // L: 168 + this.field99 = var1; + } + + var1 = var3; // L: 169 + var2 = this.memberRanks[var3]; // L: 170 + } else if (this.field99 == -1 && this.memberRanks[var3] == 125) { // L: 172 + this.field99 = var3; // L: 173 + } + } + + this.currentOwner = var1; // L: 176 + if (this.currentOwner != -1) { // L: 177 + this.memberRanks[this.currentOwner] = 126; + } + + } + } // L: 160 178 + + @ObfuscatedName("s") + @ObfuscatedSignature( + descriptor = "(JLjava/lang/String;B)V", + garbageValue = "16" + ) + void method106(long var1, String var3) { + if (var3 != null && var3.length() == 0) { // L: 181 + var3 = null; + } + + if (this.useHashes != var1 > 0L) { // L: 182 + throw new RuntimeException(""); + } else if (this.useNames != (var3 != null)) { // L: 183 + throw new RuntimeException(""); + } else { + if (var1 > 0L && (this.bannedMemberHashes == null || this.bannedMemberCount >= this.bannedMemberHashes.length) || var3 != null && (this.bannedMemberNames == null || this.bannedMemberCount >= this.bannedMemberNames.length)) { // L: 184 + this.method98(this.bannedMemberCount + 5); + } + + if (this.bannedMemberHashes != null) { // L: 185 + this.bannedMemberHashes[this.bannedMemberCount] = var1; + } + + if (this.bannedMemberNames != null) { // L: 186 + this.bannedMemberNames[this.bannedMemberCount] = var3; + } + + ++this.bannedMemberCount; // L: 187 + } + } // L: 188 + + @ObfuscatedName("u") + @ObfuscatedSignature( + descriptor = "(II)V", + garbageValue = "618378761" + ) + void method139(int var1) { + --this.bannedMemberCount; // L: 191 + if (this.bannedMemberCount == 0) { // L: 192 + this.bannedMemberHashes = null; // L: 193 + this.bannedMemberNames = null; // L: 194 + } else { + if (this.bannedMemberHashes != null) { // L: 197 + System.arraycopy(this.bannedMemberHashes, var1 + 1, this.bannedMemberHashes, var1, this.bannedMemberCount - var1); + } + + if (this.bannedMemberNames != null) { + System.arraycopy(this.bannedMemberNames, var1 + 1, this.bannedMemberNames, var1, this.bannedMemberCount - var1); // L: 198 + } + } + + } // L: 200 + + @ObfuscatedName("l") + @ObfuscatedSignature( + descriptor = "(IBB)I", + garbageValue = "-45" + ) + int method112(int var1, byte var2) { + if (var2 != 126 && var2 != 127) { // L: 203 + if (this.currentOwner == var1 && (this.field99 == -1 || this.memberRanks[this.field99] < 125)) { // L: 204 + return -1; + } else if (this.memberRanks[var1] == var2) { + return -1; // L: 205 + } else { + this.memberRanks[var1] = var2; // L: 206 + this.updateOwner(); // L: 207 + return var1; // L: 208 + } + } else { + return -1; + } + } + + @ObfuscatedName("o") + @ObfuscatedSignature( + descriptor = "(IB)Z", + garbageValue = "-5" + ) + boolean method109(int var1) { + if (this.currentOwner != var1 && this.memberRanks[var1] != 126) { // L: 212 + this.memberRanks[this.currentOwner] = 125; // L: 213 + this.field99 = this.currentOwner; // L: 214 + this.memberRanks[var1] = 126; // L: 215 + this.currentOwner = var1; // L: 216 + return true; // L: 217 + } else { + return false; + } + } + + @ObfuscatedName("c") + @ObfuscatedSignature( + descriptor = "(IZB)I", + garbageValue = "2" + ) + int method110(int var1, boolean var2) { + if (this.field108[var1] == var2) { // L: 221 + return -1; + } else { + this.field108[var1] = var2; // L: 222 + return var1; // L: 223 + } + } + + @ObfuscatedName("e") + @ObfuscatedSignature( + descriptor = "(IIIII)I", + garbageValue = "-2110063672" + ) + int method126(int var1, int var2, int var3, int var4) { + int var5 = (1 << var3) - 1; // L: 227 + int var6 = var4 == 31 ? -1 : (1 << var4 + 1) - 1; // L: 228 + int var7 = var6 ^ var5; // L: 229 + var2 <<= var3; // L: 230 + var2 &= var7; // L: 231 + int var8 = this.field106[var1]; // L: 232 + if ((var8 & var7) == var2) { + return -1; // L: 233 + } else { + var8 &= ~var7; // L: 234 + this.field106[var1] = var8 | var2; // L: 235 + return var1; // L: 236 + } + } + + @ObfuscatedName("g") + @ObfuscatedSignature( + descriptor = "(III)Z", + garbageValue = "-677454143" + ) + boolean method157(int var1, int var2) { + if (this.parameters != null) { // L: 240 + Node var3 = this.parameters.get((long)var1); // L: 241 + if (var3 != null) { // L: 242 + if (var3 instanceof IntegerNode) { // L: 243 + IntegerNode var4 = (IntegerNode)var3; // L: 244 + if (var2 == var4.integer) { // L: 245 + return false; + } + + var4.integer = var2; // L: 246 + return true; // L: 247 + } + + var3.remove(); // L: 249 + } + } else { + this.parameters = new IterableNodeHashTable(4); // L: 252 + } + + this.parameters.put(new IntegerNode(var2), (long)var1); // L: 253 + return true; // L: 254 + } + + @ObfuscatedName("a") + @ObfuscatedSignature( + descriptor = "(IIIII)Z", + garbageValue = "-1951488302" + ) + boolean method113(int var1, int var2, int var3, int var4) { + int var5 = (1 << var3) - 1; // L: 258 + int var6 = var4 == 31 ? -1 : (1 << var4 + 1) - 1; // L: 259 + int var7 = var6 ^ var5; // L: 260 + var2 <<= var3; // L: 261 + var2 &= var7; // L: 262 + if (this.parameters != null) { // L: 263 + Node var8 = this.parameters.get((long)var1); // L: 264 + if (var8 != null) { // L: 265 + if (var8 instanceof IntegerNode) { // L: 266 + IntegerNode var9 = (IntegerNode)var8; // L: 267 + if ((var9.integer & var7) == var2) { // L: 268 + return false; + } + + var9.integer &= ~var7; // L: 269 + var9.integer |= var2; // L: 270 + return true; // L: 271 + } + + var8.remove(); // L: 273 + } + } else { + this.parameters = new IterableNodeHashTable(4); // L: 276 + } + + this.parameters.put(new IntegerNode(var2), (long)var1); // L: 277 + return true; // L: 278 + } + + @ObfuscatedName("k") + boolean method122(int var1, long var2) { + if (this.parameters != null) { // L: 282 + Node var4 = this.parameters.get((long)var1); // L: 283 + if (var4 != null) { // L: 284 + if (var4 instanceof class349) { // L: 285 + class349 var5 = (class349)var4; // L: 286 + if (var5.field3935 == var2) { // L: 287 + return false; + } + + var5.field3935 = var2; // L: 288 + return true; // L: 289 + } + + var4.remove(); // L: 291 + } + } else { + this.parameters = new IterableNodeHashTable(4); // L: 294 + } + + this.parameters.put(new class349(var2), (long)var1); // L: 295 + return true; // L: 296 + } + + @ObfuscatedName("m") + @ObfuscatedSignature( + descriptor = "(ILjava/lang/String;I)Z", + garbageValue = "1252307954" + ) + boolean method115(int var1, String var2) { + if (var2 == null) { // L: 300 + var2 = ""; + } else if (var2.length() > 80) { // L: 301 + var2 = var2.substring(0, 80); + } + + if (this.parameters != null) { // L: 302 + Node var3 = this.parameters.get((long)var1); // L: 303 + if (var3 != null) { // L: 304 + if (var3 instanceof ObjectNode) { // L: 305 + ObjectNode var4 = (ObjectNode)var3; // L: 306 + if (var4.obj instanceof String) { // L: 307 + if (var2.equals(var4.obj)) { // L: 308 + return false; + } + + var4.remove(); // L: 309 + this.parameters.put(new ObjectNode(var2), var4.key); // L: 310 + return true; // L: 311 + } + } + + var3.remove(); // L: 314 + } + } else { + this.parameters = new IterableNodeHashTable(4); // L: 317 + } + + this.parameters.put(new ObjectNode(var2), (long)var1); // L: 318 + return true; // L: 319 + } + + @ObfuscatedName("x") + @ObfuscatedSignature( + descriptor = "(Lnd;I)V", + garbageValue = "469321554" + ) + void method127(Buffer var1) { + int var2 = var1.readUnsignedByte(); // L: 323 + if (var2 >= 1 && var2 <= 6) { // L: 324 + int var3 = var1.readUnsignedByte(); // L: 325 + if ((var3 & 1) != 0) { // L: 326 + this.useHashes = true; + } + + if ((var3 & 2) != 0) { // L: 327 + this.useNames = true; + } + + if (!this.useHashes) { // L: 328 + this.memberHashes = null; // L: 329 + this.bannedMemberHashes = null; // L: 330 + } + + if (!this.useNames) { // L: 332 + this.memberNames = null; // L: 333 + this.bannedMemberNames = null; // L: 334 + } + + this.field94 = var1.readInt(); // L: 336 + this.field114 = var1.readInt(); // L: 337 + if (var2 <= 3 && this.field114 != 0) { // L: 338 + this.field114 += 16912800; + } + + this.memberCount = var1.readUnsignedShort(); // L: 339 + this.bannedMemberCount = var1.readUnsignedByte(); // L: 340 + this.name = var1.readStringCp1252NullTerminated(); // L: 341 + if (var2 >= 4) { // L: 342 + var1.readInt(); // L: 343 + } + + this.allowGuests = var1.readUnsignedByte() == 1; // L: 345 + this.field103 = var1.readByte(); // L: 346 + this.field113 = var1.readByte(); // L: 347 + this.field98 = var1.readByte(); // L: 348 + this.field96 = var1.readByte(); // L: 349 + int var4; + if (this.memberCount > 0) { // L: 350 + if (this.useHashes && (this.memberHashes == null || this.memberHashes.length < this.memberCount)) { // L: 351 + this.memberHashes = new long[this.memberCount]; + } + + if (this.useNames && (this.memberNames == null || this.memberNames.length < this.memberCount)) { // L: 352 + this.memberNames = new String[this.memberCount]; + } + + if (this.memberRanks == null || this.memberRanks.length < this.memberCount) { // L: 353 + this.memberRanks = new byte[this.memberCount]; + } + + if (this.field106 == null || this.field106.length < this.memberCount) { // L: 354 + this.field106 = new int[this.memberCount]; + } + + if (this.field101 == null || this.field101.length < this.memberCount) { // L: 355 + this.field101 = new int[this.memberCount]; + } + + if (this.field108 == null || this.field108.length < this.memberCount) { // L: 356 + this.field108 = new boolean[this.memberCount]; + } + + for (var4 = 0; var4 < this.memberCount; ++var4) { // L: 357 + if (this.useHashes) { // L: 358 + this.memberHashes[var4] = var1.readLong(); + } + + if (this.useNames) { // L: 359 + this.memberNames[var4] = var1.readStringCp1252NullTerminatedOrNull(); + } + + this.memberRanks[var4] = var1.readByte(); // L: 360 + if (var2 >= 2) { // L: 361 + this.field106[var4] = var1.readInt(); + } + + if (var2 >= 5) { // L: 362 + this.field101[var4] = var1.readUnsignedShort(); + } else { + this.field101[var4] = 0; // L: 363 + } + + if (var2 >= 6) { // L: 364 + this.field108[var4] = var1.readUnsignedByte() == 1; + } else { + this.field108[var4] = false; // L: 365 + } + } + + this.updateOwner(); // L: 367 + } + + if (this.bannedMemberCount > 0) { // L: 369 + if (this.useHashes && (this.bannedMemberHashes == null || this.bannedMemberHashes.length < this.bannedMemberCount)) { // L: 370 + this.bannedMemberHashes = new long[this.bannedMemberCount]; + } + + if (this.useNames && (this.bannedMemberNames == null || this.bannedMemberNames.length < this.bannedMemberCount)) { // L: 371 + this.bannedMemberNames = new String[this.bannedMemberCount]; + } + + for (var4 = 0; var4 < this.bannedMemberCount; ++var4) { // L: 372 + if (this.useHashes) { // L: 373 + this.bannedMemberHashes[var4] = var1.readLong(); + } + + if (this.useNames) { // L: 374 + this.bannedMemberNames[var4] = var1.readStringCp1252NullTerminatedOrNull(); + } + } + } + + if (var2 >= 3) { // L: 377 + var4 = var1.readUnsignedShort(); // L: 378 + if (var4 > 0) { // L: 379 + this.parameters = new IterableNodeHashTable(var4 < 16 ? Player.method2128(var4) : 16); // L: 380 + + while (var4-- > 0) { // L: 381 + int var5 = var1.readInt(); // L: 382 + int var6 = var5 & 1073741823; // L: 383 + int var7 = var5 >>> 30; // L: 384 + if (var7 == 0) { // L: 385 + int var12 = var1.readInt(); // L: 386 + this.parameters.put(new IntegerNode(var12), (long)var6); // L: 387 + } else if (var7 == 1) { // L: 389 + long var10 = var1.readLong(); // L: 390 + this.parameters.put(new class349(var10), (long)var6); // L: 391 + } else if (var7 == 2) { // L: 393 + String var8 = var1.readStringCp1252NullTerminated(); // L: 394 + this.parameters.put(new ObjectNode(var8), (long)var6); // L: 395 + } + } + } + } + + } else { + throw new RuntimeException("" + var2); + } + } // L: 400 + + @ObfuscatedName("n") + @ObfuscatedSignature( + descriptor = "(II)Lex;", + garbageValue = "760269699" + ) + @Export("VarpDefinition_get") + public static VarpDefinition VarpDefinition_get(int var0) { + VarpDefinition var1 = (VarpDefinition)VarpDefinition.VarpDefinition_cached.get((long)var0); // L: 23 + if (var1 != null) { // L: 24 + return var1; + } else { + byte[] var2 = VarpDefinition.VarpDefinition_archive.takeFile(16, var0); // L: 25 + var1 = new VarpDefinition(); // L: 26 + if (var2 != null) { // L: 27 + var1.decode(new Buffer(var2)); + } + + VarpDefinition.VarpDefinition_cached.put(var1, (long)var0); // L: 28 + return var1; // L: 29 + } + } + + @ObfuscatedName("fv") + @ObfuscatedSignature( + descriptor = "(I)V", + garbageValue = "1049112805" + ) + static final void method165() { + int[] var0 = Players.Players_indices; // L: 3460 + + int var1; + for (var1 = 0; var1 < Players.Players_count; ++var1) { // L: 3461 + Player var4 = Client.players[var0[var1]]; // L: 3462 + if (var4 != null && var4.overheadTextCyclesRemaining > 0) { // L: 3463 + --var4.overheadTextCyclesRemaining; // L: 3464 + if (var4.overheadTextCyclesRemaining == 0) { // L: 3465 + var4.overheadText = null; + } + } + } + + for (var1 = 0; var1 < Client.npcCount; ++var1) { // L: 3468 + int var2 = Client.npcIndices[var1]; // L: 3469 + NPC var3 = Client.npcs[var2]; // L: 3470 + if (var3 != null && var3.overheadTextCyclesRemaining > 0) { // L: 3471 + --var3.overheadTextCyclesRemaining; // L: 3472 + if (var3.overheadTextCyclesRemaining == 0) { // L: 3473 + var3.overheadText = null; + } + } + } + + } // L: 3476 + + @ObfuscatedName("he") + @ObfuscatedSignature( + descriptor = "(IIB)V", + garbageValue = "0" + ) + @Export("updateItemPile") + static final void updateItemPile(int var0, int var1) { + NodeDeque var2 = Client.groundItems[class22.Client_plane][var0][var1]; // L: 7289 + if (var2 == null) { // L: 7290 + AbstractSocket.scene.removeGroundItemPile(class22.Client_plane, var0, var1); // L: 7291 + } else { + long var3 = -99999999L; // L: 7294 + TileItem var5 = null; // L: 7295 + + TileItem var6; + for (var6 = (TileItem)var2.last(); var6 != null; var6 = (TileItem)var2.previous()) { // L: 7296 7297 7305 + ItemComposition var7 = class260.ItemDefinition_get(var6.id); // L: 7298 + long var11 = (long)var7.price; // L: 7299 + if (var7.isStackable == 1) { // L: 7300 + var11 *= (long)(var6.quantity + 1); + } + + if (var11 > var3) { // L: 7301 + var3 = var11; // L: 7302 + var5 = var6; // L: 7303 + } + } + + if (var5 == null) { // L: 7307 + AbstractSocket.scene.removeGroundItemPile(class22.Client_plane, var0, var1); // L: 7308 + } else { + var2.addLast(var5); // L: 7311 + TileItem var13 = null; // L: 7312 + TileItem var8 = null; // L: 7313 + + for (var6 = (TileItem)var2.last(); var6 != null; var6 = (TileItem)var2.previous()) { // L: 7314 7315 7320 + if (var6.id != var5.id) { // L: 7316 + if (var13 == null) { // L: 7317 + var13 = var6; + } + + if (var13.id != var6.id && var8 == null) { // L: 7318 + var8 = var6; + } + } + } + + long var9 = DevicePcmPlayerProvider.calculateTag(var0, var1, 3, false, 0); // L: 7322 + AbstractSocket.scene.newGroundItemPile(class22.Client_plane, var0, var1, class105.getTileHeight(var0 * 128 + 64, var1 * 128 + 64, class22.Client_plane), var5, var9, var13, var8); // L: 7323 + } + } + } // L: 7292 7309 7324 + + @ObfuscatedName("js") + @ObfuscatedSignature( + descriptor = "(Lio;I)Lio;", + garbageValue = "-778219160" + ) + static Widget method125(Widget var0) { + Widget var1 = StructComposition.method2892(var0); // L: 10819 + if (var1 == null) { + var1 = var0.parent; // L: 10820 + } + + return var1; // L: 10821 + } + + @ObfuscatedName("lj") + @ObfuscatedSignature( + descriptor = "(IB)V", + garbageValue = "-104" + ) + static void method163(int var0) { + Client.oculusOrbState = var0; // L: 11495 + } // L: 11496 +} diff --git a/runescape-client/src/main/java/Client.java b/runescape-client/src/main/java/Client.java index 97a8bb3eda..f78e80aca5 100644 --- a/runescape-client/src/main/java/Client.java +++ b/runescape-client/src/main/java/Client.java @@ -1,6 +1,8 @@ +import java.io.File; import java.io.IOException; import java.net.Socket; import java.util.ArrayList; +import java.util.Arrays; import java.util.HashMap; import java.util.Iterator; import java.util.LinkedHashMap; @@ -9,1322 +11,1313 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -import netscape.javascript.JSObject; @Implements("Client") @ObfuscatedName("client") public final class Client extends GameEngine implements Usernamed { - @ObfuscatedName("qo") + @ObfuscatedName("qh") @ObfuscatedSignature( - descriptor = "[Lx;" + descriptor = "[Ll;" ) - static class11[] field678; - @ObfuscatedName("oh") + @Export("currentClanSettings") + static ClanSettings[] currentClanSettings; + @ObfuscatedName("ok") @ObfuscatedGetter( - intValue = 1788518295 + intValue = 257317803 ) @Export("rootWidgetCount") static int rootWidgetCount; - @ObfuscatedName("og") + @ObfuscatedName("ol") @ObfuscatedGetter( - intValue = -113595795 + intValue = -1275777925 ) - static int field824; - @ObfuscatedName("ph") - @ObfuscatedGetter( - longValue = 5266993254335523925L - ) - static long field833; - @ObfuscatedName("qc") - static boolean field866; - @ObfuscatedName("oi") - static boolean[] field825; - @ObfuscatedName("pb") - static boolean[] field636; - @ObfuscatedName("oe") - static boolean[] field826; + static int field849; @ObfuscatedName("pq") + @ObfuscatedGetter( + longValue = 6326177537901632971L + ) + static long field858; + @ObfuscatedName("ov") + static boolean[] field719; + @ObfuscatedName("pc") + static boolean[] field860; + @ObfuscatedName("or") + static boolean[] field780; + @ObfuscatedName("pb") @Export("isResizable") static boolean isResizable; - @ObfuscatedName("tm") + @ObfuscatedName("tr") @ObfuscatedGetter( - intValue = -1549606513 + intValue = -106098945 ) - public static int field687; - @ObfuscatedName("on") + public static int field717; + @ObfuscatedName("qr") + static boolean field881; + @ObfuscatedName("pv") + @Export("rootWidgetWidths") + static int[] rootWidgetWidths; + @ObfuscatedName("oq") @ObfuscatedSignature( - descriptor = "Lmt;" + descriptor = "Lmd;" ) @Export("widgetFlags") static NodeHashTable widgetFlags; - @ObfuscatedName("pr") + @ObfuscatedName("pz") @Export("rootWidgetXs") static int[] rootWidgetXs; - @ObfuscatedName("pf") - @Export("rootWidgetWidths") - static int[] rootWidgetWidths; @ObfuscatedName("pm") @ObfuscatedGetter( - intValue = 262990251 + intValue = 568772133 ) @Export("gameDrawingMode") static int gameDrawingMode; - @ObfuscatedName("px") - @Export("rootWidgetHeights") - static int[] rootWidgetHeights; - @ObfuscatedName("tc") - @ObfuscatedSignature( - descriptor = "Lbh;" - ) - static final ApproximateRouteStrategy field894; - @ObfuscatedName("pj") + @ObfuscatedName("pl") @Export("rootWidgetYs") static int[] rootWidgetYs; - @ObfuscatedName("qe") - @ObfuscatedGetter( - intValue = 1483097923 - ) - @Export("destinationX") - static int destinationX; - @ObfuscatedName("qt") - @ObfuscatedGetter( - intValue = -40329921 - ) - @Export("destinationY") - static int destinationY; - @ObfuscatedName("om") + @ObfuscatedName("pa") + @Export("rootWidgetHeights") + static int[] rootWidgetHeights; + @ObfuscatedName("tu") + static int[] field689; + @ObfuscatedName("tt") + static int[] field851; + @ObfuscatedName("ty") @ObfuscatedSignature( - descriptor = "Lka;" + descriptor = "Lbb;" + ) + static final ApproximateRouteStrategy field785; + @ObfuscatedName("ot") + @ObfuscatedSignature( + descriptor = "Lkx;" ) @Export("scriptEvents") static NodeDeque scriptEvents; - @ObfuscatedName("ox") + @ObfuscatedName("qy") @ObfuscatedGetter( - intValue = 616687799 + intValue = -1714532039 ) - @Export("mouseWheelRotation") - static int mouseWheelRotation; - @ObfuscatedName("tt") - static int[] field828; - @ObfuscatedName("th") - static int[] field896; - @ObfuscatedName("tr") - @Export("archiveLoaders") - static ArrayList archiveLoaders; - @ObfuscatedName("tj") - @ObfuscatedGetter( - intValue = 1233962749 - ) - @Export("archiveLoadersDone") - static int archiveLoadersDone; - @ObfuscatedName("sx") - @ObfuscatedGetter( - intValue = -735836521 - ) - static int field630; - @ObfuscatedName("sa") + @Export("destinationX") + static int destinationX; + @ObfuscatedName("sv") @ObfuscatedSignature( - descriptor = "Lii;" - ) - @Export("playerAppearance") - static PlayerComposition playerAppearance; - @ObfuscatedName("sz") - @ObfuscatedGetter( - intValue = -85732501 - ) - static int field631; - @ObfuscatedName("qr") - @ObfuscatedSignature( - descriptor = "[Lg;" - ) - static class3[] field847; - @ObfuscatedName("qq") - @ObfuscatedGetter( - intValue = 850098079 - ) - @Export("currentTrackGroupId") - static int currentTrackGroupId; - @ObfuscatedName("qx") - @ObfuscatedGetter( - intValue = -236108179 - ) - @Export("minimapState") - static int minimapState; - @ObfuscatedName("sq") - @ObfuscatedSignature( - descriptor = "Lmc;" - ) - @Export("platformInfoProvider") - static PlatformInfoProvider platformInfoProvider; - @ObfuscatedName("rj") - @ObfuscatedGetter( - intValue = -1291952621 - ) - @Export("soundEffectCount") - static int soundEffectCount; - @ObfuscatedName("ro") - @Export("soundEffectIds") - static int[] soundEffectIds; - @ObfuscatedName("rl") - @Export("queuedSoundEffectLoops") - static int[] queuedSoundEffectLoops; - @ObfuscatedName("rh") - @Export("queuedSoundEffectDelays") - static int[] queuedSoundEffectDelays; - @ObfuscatedName("rw") - @ObfuscatedSignature( - descriptor = "[Lah;" - ) - @Export("soundEffects") - static SoundEffect[] soundEffects; - @ObfuscatedName("qj") - @ObfuscatedGetter( - intValue = 789202625 - ) - static int field848; - @ObfuscatedName("rc") - @Export("soundLocations") - static int[] soundLocations; - @ObfuscatedName("qg") - @ObfuscatedGetter( - longValue = -3798909112925654061L - ) - static long field799; - @ObfuscatedName("ri") - static boolean[] field846; - @ObfuscatedName("rn") - static int[] field744; - @ObfuscatedName("sr") - static short field820; - @ObfuscatedName("ql") - @ObfuscatedGetter( - intValue = 628214371 - ) - @Export("mapIconCount") - static int mapIconCount; - @ObfuscatedName("re") - static int[] field868; - @ObfuscatedName("sh") - static short field872; - @ObfuscatedName("sf") - static short field877; - @ObfuscatedName("rs") - static int[] field869; - @ObfuscatedName("ss") - static short field878; - @ObfuscatedName("sd") - static int[] field870; - @ObfuscatedName("qm") - @Export("mapIconXs") - static int[] mapIconXs; - @ObfuscatedName("sl") - static short field738; - @ObfuscatedName("sb") - @ObfuscatedGetter( - intValue = -210947507 - ) - @Export("viewportZoom") - static int viewportZoom; - @ObfuscatedName("si") - static short field875; - @ObfuscatedName("st") - @ObfuscatedGetter( - intValue = -1100911913 - ) - @Export("viewportWidth") - static int viewportWidth; - @ObfuscatedName("qp") - @Export("mapIconYs") - static int[] mapIconYs; - @ObfuscatedName("tk") - @ObfuscatedGetter( - intValue = 1410279679 - ) - static int field893; - @ObfuscatedName("qa") - @ObfuscatedSignature( - descriptor = "[Low;" - ) - @Export("mapIcons") - static SpritePixels[] mapIcons; - @ObfuscatedName("ra") - @Export("isCameraLocked") - static boolean isCameraLocked; - @ObfuscatedName("sm") - @ObfuscatedGetter( - intValue = -924623343 - ) - @Export("viewportHeight") - static int viewportHeight; - @ObfuscatedName("sy") - @ObfuscatedGetter( - intValue = 1145926541 - ) - @Export("viewportOffsetX") - static int viewportOffsetX; - @ObfuscatedName("py") - @ObfuscatedGetter( - intValue = -1876245101 - ) - static int field842; - @ObfuscatedName("sw") - @ObfuscatedGetter( - intValue = -1350718359 - ) - @Export("viewportOffsetY") - static int viewportOffsetY; - @ObfuscatedName("su") - @Export("zoomWidth") - static short zoomWidth; - @ObfuscatedName("sj") - @Export("zoomHeight") - static short zoomHeight; - @ObfuscatedName("rx") - @ObfuscatedGetter( - intValue = -202544545 - ) - static int field696; - @ObfuscatedName("po") - @Export("crossWorldMessageIds") - static long[] crossWorldMessageIds; - @ObfuscatedName("pv") - static int[] field844; - @ObfuscatedName("ob") - @ObfuscatedSignature( - descriptor = "Lka;" - ) - static NodeDeque field865; - @ObfuscatedName("pz") - static int[] field746; - @ObfuscatedName("os") - @ObfuscatedSignature( - descriptor = "Lka;" - ) - static NodeDeque field821; - @ObfuscatedName("ps") - @ObfuscatedGetter( - intValue = 1716898751 - ) - @Export("crossWorldMessageIdsIndex") - static int crossWorldMessageIdsIndex; - @ObfuscatedName("sp") - @ObfuscatedSignature( - descriptor = "[Ljm;" + descriptor = "[Lju;" ) @Export("grandExchangeOffers") static GrandExchangeOffer[] grandExchangeOffers; - @ObfuscatedName("pi") + @ObfuscatedName("qw") @ObfuscatedGetter( - intValue = -1775028253 + intValue = 1810222737 + ) + @Export("destinationY") + static int destinationY; + @ObfuscatedName("ow") + @ObfuscatedGetter( + intValue = 1005623717 + ) + @Export("mouseWheelRotation") + static int mouseWheelRotation; + @ObfuscatedName("rg") + @Export("isCameraLocked") + static boolean isCameraLocked; + @ObfuscatedName("rj") + @ObfuscatedGetter( + intValue = -1084759211 + ) + @Export("soundEffectCount") + static int soundEffectCount; + @ObfuscatedName("rb") + @Export("soundEffectIds") + static int[] soundEffectIds; + @ObfuscatedName("sd") + @ObfuscatedGetter( + intValue = 909671199 + ) + static int field908; + @ObfuscatedName("rt") + @Export("queuedSoundEffectLoops") + static int[] queuedSoundEffectLoops; + @ObfuscatedName("sj") + @ObfuscatedSignature( + descriptor = "Lic;" + ) + @Export("playerAppearance") + static PlayerComposition playerAppearance; + @ObfuscatedName("rq") + @Export("queuedSoundEffectDelays") + static int[] queuedSoundEffectDelays; + @ObfuscatedName("sh") + @ObfuscatedGetter( + intValue = 15595769 + ) + static int field752; + @ObfuscatedName("rc") + @ObfuscatedSignature( + descriptor = "[Laa;" + ) + @Export("soundEffects") + static SoundEffect[] soundEffects; + @ObfuscatedName("rx") + @Export("soundLocations") + static int[] soundLocations; + @ObfuscatedName("to") + @Export("archiveLoaders") + static ArrayList archiveLoaders; + @ObfuscatedName("te") + @ObfuscatedGetter( + intValue = -1953954605 + ) + @Export("archiveLoadersDone") + static int archiveLoadersDone; + @ObfuscatedName("qj") + @ObfuscatedGetter( + intValue = -771809921 + ) + @Export("minimapState") + static int minimapState; + @ObfuscatedName("qq") + @ObfuscatedGetter( + intValue = 565415243 + ) + static int field872; + @ObfuscatedName("sn") + @ObfuscatedSignature( + descriptor = "Lmh;" + ) + @Export("platformInfoProvider") + static PlatformInfoProvider platformInfoProvider; + @ObfuscatedName("sg") + static short field894; + @ObfuscatedName("sp") + static short field895; + @ObfuscatedName("sa") + static short field900; + @ObfuscatedName("su") + static short field901; + @ObfuscatedName("qs") + @ObfuscatedGetter( + intValue = -1674931291 + ) + @Export("mapIconCount") + static int mapIconCount; + @ObfuscatedName("qe") + @ObfuscatedGetter( + intValue = 2076100495 + ) + @Export("currentTrackGroupId") + static int currentTrackGroupId; + @ObfuscatedName("sm") + static short field828; + @ObfuscatedName("ss") + @ObfuscatedGetter( + intValue = 755828989 + ) + @Export("viewportZoom") + static int viewportZoom; + @ObfuscatedName("sk") + static short field909; + @ObfuscatedName("sc") + @ObfuscatedGetter( + intValue = -592780465 + ) + @Export("viewportWidth") + static int viewportWidth; + @ObfuscatedName("qu") + @Export("mapIconXs") + static int[] mapIconXs; + @ObfuscatedName("qp") + @Export("mapIconYs") + static int[] mapIconYs; + @ObfuscatedName("qz") + @ObfuscatedSignature( + descriptor = "[Loh;" + ) + @Export("mapIcons") + static SpritePixels[] mapIcons; + @ObfuscatedName("sy") + @ObfuscatedGetter( + intValue = 1806233111 + ) + @Export("viewportHeight") + static int viewportHeight; + @ObfuscatedName("st") + @ObfuscatedGetter( + intValue = -2020111655 + ) + @Export("viewportOffsetX") + static int viewportOffsetX; + @ObfuscatedName("sw") + @ObfuscatedGetter( + intValue = 407581195 + ) + @Export("viewportOffsetY") + static int viewportOffsetY; + @ObfuscatedName("pe") + @Export("crossWorldMessageIds") + static long[] crossWorldMessageIds; + @ObfuscatedName("qb") + @ObfuscatedGetter( + longValue = 1950859972192234267L + ) + static long field809; + @ObfuscatedName("pw") + @ObfuscatedGetter( + intValue = 2087031963 + ) + static int field806; + @ObfuscatedName("pn") + @ObfuscatedGetter( + intValue = -2103302667 + ) + @Export("crossWorldMessageIdsIndex") + static int crossWorldMessageIdsIndex; + @ObfuscatedName("tx") + @ObfuscatedGetter( + intValue = 112640073 + ) + static int field916; + @ObfuscatedName("rs") + static boolean[] field693; + @ObfuscatedName("ph") + static int[] field868; + @ObfuscatedName("rd") + static int[] field891; + @ObfuscatedName("qv") + @ObfuscatedSignature( + descriptor = "[Ly;" + ) + static ClanChannel[] currentClanChannels; + @ObfuscatedName("pi") + static int[] field867; + @ObfuscatedName("oj") + @ObfuscatedSignature( + descriptor = "Lkx;" + ) + static NodeDeque field652; + @ObfuscatedName("om") + @ObfuscatedSignature( + descriptor = "Lkx;" + ) + static NodeDeque field846; + @ObfuscatedName("rv") + static int[] field890; + @ObfuscatedName("si") + @Export("zoomHeight") + static short zoomHeight; + @ObfuscatedName("so") + @Export("zoomWidth") + static short zoomWidth; + @ObfuscatedName("ps") + @ObfuscatedGetter( + intValue = -639645947 ) @Export("publicChatMode") static int publicChatMode; - @ObfuscatedName("pu") + @ObfuscatedName("sb") + static int[] field893; + @ObfuscatedName("rh") + static int[] field892; + @ObfuscatedName("pg") @ObfuscatedGetter( - intValue = 2144397203 + intValue = -1863932723 ) @Export("tradeChatMode") static int tradeChatMode; - @ObfuscatedName("pk") - static int[] field651; - @ObfuscatedName("pw") - static String field843; - @ObfuscatedName("sk") + @ObfuscatedName("py") + static int[] field877; + @ObfuscatedName("pp") + static String field863; + @ObfuscatedName("sz") @ObfuscatedSignature( - descriptor = "Lbl;" + descriptor = "Lbk;" ) @Export("GrandExchangeEvents_worldComparator") static GrandExchangeOfferOwnWorldComparator GrandExchangeEvents_worldComparator; @ObfuscatedName("w") @ObfuscatedSignature( - descriptor = "[Lfa;" + descriptor = "[Lfz;" ) @Export("collisionMaps") static CollisionMap[] collisionMaps; @ObfuscatedName("an") - static boolean field767; + static boolean field889; @ObfuscatedName("bd") @ObfuscatedGetter( - intValue = -692981731 + intValue = 1396273817 ) @Export("worldId") public static int worldId; - @ObfuscatedName("bw") + @ObfuscatedName("bt") @ObfuscatedGetter( - intValue = -1329265657 + intValue = 1088533541 ) @Export("worldProperties") static int worldProperties; @ObfuscatedName("bu") @ObfuscatedGetter( - intValue = 2041787237 + intValue = 60643507 ) @Export("gameBuild") static int gameBuild; - @ObfuscatedName("bt") + @ObfuscatedName("bm") @Export("isMembersWorld") public static boolean isMembersWorld; - @ObfuscatedName("by") + @ObfuscatedName("bz") @Export("isLowDetail") static boolean isLowDetail; @ObfuscatedName("ba") @ObfuscatedGetter( - intValue = 1908341387 + intValue = -1731105959 ) @Export("clientType") static int clientType; - @ObfuscatedName("bg") + @ObfuscatedName("be") @ObfuscatedGetter( - intValue = -437666989 + intValue = 1523027191 ) - static int field621; - @ObfuscatedName("bi") + static int field643; + @ObfuscatedName("bj") @Export("onMobile") static boolean onMobile; - @ObfuscatedName("bp") + @ObfuscatedName("bx") @ObfuscatedGetter( - intValue = 2142578293 + intValue = -888167097 ) @Export("gameState") static int gameState; - @ObfuscatedName("cq") + @ObfuscatedName("cs") @Export("isLoading") static boolean isLoading; - @ObfuscatedName("cs") + @ObfuscatedName("cg") @ObfuscatedGetter( - intValue = 991600141 + intValue = -1702273423 ) @Export("cycle") static int cycle; - @ObfuscatedName("cd") + @ObfuscatedName("co") @ObfuscatedGetter( - longValue = -7684819836719052823L + longValue = 8707347461681450731L ) @Export("mouseLastLastPressedTimeMillis") static long mouseLastLastPressedTimeMillis; - @ObfuscatedName("co") + @ObfuscatedName("cj") @ObfuscatedGetter( - intValue = -1325156765 + intValue = -1975403091 ) - static int field627; + static int field651; + @ObfuscatedName("cc") + @ObfuscatedGetter( + intValue = 424553417 + ) + static int field812; + @ObfuscatedName("cu") + @ObfuscatedGetter( + longValue = 8694062253931131003L + ) + static long field653; @ObfuscatedName("cz") - @ObfuscatedGetter( - intValue = -72303975 - ) - static int field837; - @ObfuscatedName("cl") - @ObfuscatedGetter( - longValue = 2473810867611188183L - ) - static long field629; - @ObfuscatedName("cp") @Export("hadFocus") static boolean hadFocus; - @ObfuscatedName("cr") + @ObfuscatedName("cb") @Export("displayFps") static boolean displayFps; - @ObfuscatedName("cg") + @ObfuscatedName("ce") @ObfuscatedGetter( - intValue = 1479862317 + intValue = -414435005 ) @Export("rebootTimer") static int rebootTimer; - @ObfuscatedName("cw") + @ObfuscatedName("ch") @ObfuscatedGetter( - intValue = -225259253 + intValue = -1764619255 ) @Export("hintArrowType") static int hintArrowType; - @ObfuscatedName("cj") + @ObfuscatedName("cy") @ObfuscatedGetter( - intValue = 1520579627 + intValue = 1564576307 ) @Export("hintArrowNpcIndex") static int hintArrowNpcIndex; - @ObfuscatedName("cy") + @ObfuscatedName("cx") @ObfuscatedGetter( - intValue = 163411299 + intValue = 1851530429 ) @Export("hintArrowPlayerIndex") static int hintArrowPlayerIndex; - @ObfuscatedName("cb") + @ObfuscatedName("ca") @ObfuscatedGetter( - intValue = 1197232959 + intValue = -659326571 ) @Export("hintArrowX") static int hintArrowX; - @ObfuscatedName("cv") + @ObfuscatedName("cl") @ObfuscatedGetter( - intValue = 878242253 + intValue = 122660467 ) @Export("hintArrowY") static int hintArrowY; - @ObfuscatedName("ca") + @ObfuscatedName("cw") @ObfuscatedGetter( - intValue = -728381759 + intValue = 1213777129 ) @Export("hintArrowHeight") static int hintArrowHeight; - @ObfuscatedName("ds") + @ObfuscatedName("db") @ObfuscatedGetter( - intValue = 219564971 + intValue = -213439381 ) @Export("hintArrowSubX") static int hintArrowSubX; - @ObfuscatedName("do") + @ObfuscatedName("dz") @ObfuscatedGetter( - intValue = 620991381 + intValue = 2031424669 ) @Export("hintArrowSubY") static int hintArrowSubY; - @ObfuscatedName("du") + @ObfuscatedName("dj") + @Export("mouseCam") + static boolean mouseCam; + @ObfuscatedName("dr") @ObfuscatedSignature( descriptor = "Ldj;" ) @Export("playerAttackOption") static AttackOption playerAttackOption; - @ObfuscatedName("dw") + @ObfuscatedName("di") @ObfuscatedSignature( descriptor = "Ldj;" ) @Export("npcAttackOption") static AttackOption npcAttackOption; - @ObfuscatedName("dl") + @ObfuscatedName("dk") @ObfuscatedGetter( - intValue = 210105277 + intValue = -1127540073 ) @Export("titleLoadingStage") static int titleLoadingStage; - @ObfuscatedName("dd") - @ObfuscatedSignature( - descriptor = "Lek;" - ) - @Export("js5SocketTask") - static Task js5SocketTask; - @ObfuscatedName("dh") + @ObfuscatedName("df") @ObfuscatedGetter( - intValue = 216100051 + intValue = 534657201 ) @Export("js5ConnectState") static int js5ConnectState; - @ObfuscatedName("dn") + @ObfuscatedName("dv") @ObfuscatedGetter( - intValue = 2041285997 + intValue = -587760519 ) - static int field646; - @ObfuscatedName("en") + static int field670; + @ObfuscatedName("ep") @ObfuscatedGetter( - intValue = 1231560959 + intValue = -515874317 ) @Export("js5Errors") static int js5Errors; - @ObfuscatedName("et") + @ObfuscatedName("ew") @ObfuscatedGetter( - intValue = 1387097531 + intValue = -1024706269 ) @Export("loginState") static int loginState; - @ObfuscatedName("ev") - @ObfuscatedGetter( - intValue = -340243899 - ) - static int field649; - @ObfuscatedName("es") - @ObfuscatedGetter( - intValue = -512490615 - ) - static int field749; @ObfuscatedName("ej") @ObfuscatedGetter( - intValue = 153516227 + intValue = 1134111881 ) static int field673; - @ObfuscatedName("ew") - @ObfuscatedSignature( - descriptor = "Ldv;" + @ObfuscatedName("el") + @ObfuscatedGetter( + intValue = -2135696499 ) - static class125 field652; + static int field845; + @ObfuscatedName("et") + @ObfuscatedGetter( + intValue = -1200580919 + ) + static int field675; @ObfuscatedName("eb") + @ObfuscatedSignature( + descriptor = "Ldq;" + ) + static class125 field676; + @ObfuscatedName("ei") @Export("Login_isUsernameRemembered") static boolean Login_isUsernameRemembered; - @ObfuscatedName("ep") + @ObfuscatedName("ev") @ObfuscatedSignature( - descriptor = "Lcx;" + descriptor = "Lcr;" ) @Export("secureRandomFuture") static SecureRandomFuture secureRandomFuture; - @ObfuscatedName("fa") + @ObfuscatedName("fz") @Export("randomDatData") static byte[] randomDatData; - @ObfuscatedName("fj") + @ObfuscatedName("fs") @ObfuscatedSignature( - descriptor = "[Lds;" + descriptor = "[Ldb;" ) @Export("npcs") static NPC[] npcs; - @ObfuscatedName("fi") + @ObfuscatedName("fp") @ObfuscatedGetter( - intValue = 1541459935 + intValue = -1300723479 ) @Export("npcCount") static int npcCount; - @ObfuscatedName("fo") + @ObfuscatedName("fe") @Export("npcIndices") static int[] npcIndices; - @ObfuscatedName("fz") + @ObfuscatedName("fb") @ObfuscatedGetter( - intValue = 1005735511 + intValue = 1045404765 ) - static int field661; - @ObfuscatedName("fe") - static int[] field662; - @ObfuscatedName("ft") + static int field685; + @ObfuscatedName("fo") + static int[] field686; + @ObfuscatedName("fw") @ObfuscatedSignature( - descriptor = "Ldd;" + descriptor = "Lds;" ) @Export("packetWriter") public static final PacketWriter packetWriter; - @ObfuscatedName("fv") + @ObfuscatedName("fj") + @ObfuscatedSignature( + descriptor = "Lls;" + ) + static AbstractSocket field688; + @ObfuscatedName("fg") @ObfuscatedGetter( - intValue = 1365433979 + intValue = -688107431 ) @Export("logoutTimer") static int logoutTimer; - @ObfuscatedName("fk") + @ObfuscatedName("fi") @Export("hadNetworkError") static boolean hadNetworkError; - @ObfuscatedName("fc") + @ObfuscatedName("fy") @Export("useBufferedSocket") static boolean useBufferedSocket; - @ObfuscatedName("fp") + @ObfuscatedName("fx") @ObfuscatedSignature( - descriptor = "Lkn;" + descriptor = "Lkv;" ) @Export("timer") static Timer timer; - @ObfuscatedName("fd") + @ObfuscatedName("fn") @Export("fontsMap") static HashMap fontsMap; - @ObfuscatedName("gc") + @ObfuscatedName("gz") @ObfuscatedGetter( - intValue = 844995417 + intValue = -1548218417 ) - static int field669; - @ObfuscatedName("gp") + static int field694; + @ObfuscatedName("gb") @ObfuscatedGetter( - intValue = 242618933 + intValue = 834526125 ) - static int field670; + static int field695; @ObfuscatedName("gs") @ObfuscatedGetter( - intValue = 914071231 + intValue = 1282334079 ) - static int field671; - @ObfuscatedName("gf") + static int field696; + @ObfuscatedName("gv") @ObfuscatedGetter( - intValue = -347228261 + intValue = 1781171757 ) - static int field672; - @ObfuscatedName("gk") + static int field697; + @ObfuscatedName("gm") @ObfuscatedGetter( - intValue = -1685518623 + intValue = -189422017 ) - static int field790; - @ObfuscatedName("ge") + static int field698; + @ObfuscatedName("gl") @Export("isInInstance") static boolean isInInstance; - @ObfuscatedName("gt") + @ObfuscatedName("gk") @Export("instanceChunkTemplates") static int[][][] instanceChunkTemplates; - @ObfuscatedName("gi") - static final int[] field677; - @ObfuscatedName("gy") + @ObfuscatedName("gd") + static final int[] field702; + @ObfuscatedName("gp") @ObfuscatedGetter( - intValue = -1396894627 + intValue = 613265553 ) - static int field768; - @ObfuscatedName("hu") - @ObfuscatedGetter( - intValue = -148347713 - ) - static int field679; + static int field913; @ObfuscatedName("ht") @ObfuscatedGetter( - intValue = -2098931785 + intValue = -119839221 ) - static int field680; - @ObfuscatedName("hq") + static int field704; + @ObfuscatedName("hm") @ObfuscatedGetter( - intValue = 10479103 + intValue = 1576725955 ) - static int field681; - @ObfuscatedName("hl") + static int field705; + @ObfuscatedName("hh") @ObfuscatedGetter( - intValue = -1139086205 + intValue = 1820360451 ) - static int field658; - @ObfuscatedName("hg") - static boolean field683; - @ObfuscatedName("ho") + static int field706; + @ObfuscatedName("hn") @ObfuscatedGetter( - intValue = -1528783631 + intValue = -944863209 + ) + static int field707; + @ObfuscatedName("hc") + static boolean field708; + @ObfuscatedName("hz") + @ObfuscatedGetter( + intValue = -2035208823 ) @Export("alternativeScrollbarWidth") static int alternativeScrollbarWidth; - @ObfuscatedName("hk") + @ObfuscatedName("hv") @ObfuscatedGetter( - intValue = -1461862337 + intValue = -2031705619 ) @Export("camAngleX") static int camAngleX; - @ObfuscatedName("hr") + @ObfuscatedName("hu") @ObfuscatedGetter( - intValue = 844977603 + intValue = -574530013 ) @Export("camAngleY") static int camAngleY; - @ObfuscatedName("hv") + @ObfuscatedName("hi") @ObfuscatedGetter( - intValue = 1815922645 + intValue = -308632201 ) @Export("camAngleDY") static int camAngleDY; - @ObfuscatedName("he") + @ObfuscatedName("hk") @ObfuscatedGetter( - intValue = 1379421729 + intValue = -1928381453 ) @Export("camAngleDX") static int camAngleDX; - @ObfuscatedName("hc") + @ObfuscatedName("hx") @ObfuscatedGetter( - intValue = 2142968919 + intValue = -1017968913 ) @Export("mouseCamClickedX") static int mouseCamClickedX; @ObfuscatedName("hp") @ObfuscatedGetter( - intValue = 541743917 + intValue = 1156171963 ) @Export("mouseCamClickedY") static int mouseCamClickedY; - @ObfuscatedName("ik") + @ObfuscatedName("ir") @ObfuscatedGetter( - intValue = -618034625 + intValue = -400479567 ) @Export("oculusOrbState") static int oculusOrbState; - @ObfuscatedName("ic") + @ObfuscatedName("in") @ObfuscatedGetter( - intValue = 1408776823 + intValue = 334319879 ) @Export("camFollowHeight") static int camFollowHeight; @ObfuscatedName("it") @Export("selectedItemName") static String selectedItemName; - @ObfuscatedName("ij") + @ObfuscatedName("ik") @ObfuscatedGetter( - intValue = 363746617 + intValue = -859124845 ) - static int field693; - @ObfuscatedName("ia") + static int field718; + @ObfuscatedName("ii") @ObfuscatedGetter( - intValue = -763624637 + intValue = -1624140925 ) - static int field694; - @ObfuscatedName("ir") + static int field732; + @ObfuscatedName("iu") @ObfuscatedGetter( - intValue = -1603870419 + intValue = 286253175 ) - static int field695; - @ObfuscatedName("ip") + static int field720; + @ObfuscatedName("ig") @ObfuscatedGetter( - intValue = -832411863 + intValue = -503425261 ) @Export("oculusOrbNormalSpeed") static int oculusOrbNormalSpeed; - @ObfuscatedName("iv") + @ObfuscatedName("io") @ObfuscatedGetter( - intValue = -217353197 + intValue = 918404705 ) @Export("oculusOrbSlowedSpeed") static int oculusOrbSlowedSpeed; + @ObfuscatedName("is") + @ObfuscatedGetter( + intValue = -315190483 + ) + static int field723; + @ObfuscatedName("id") + static boolean field724; + @ObfuscatedName("il") + @ObfuscatedGetter( + intValue = -1396591603 + ) + static int field725; + @ObfuscatedName("im") + static boolean field726; + @ObfuscatedName("ip") + @ObfuscatedGetter( + intValue = 627480141 + ) + static int field727; @ObfuscatedName("if") @ObfuscatedGetter( - intValue = 102452491 - ) - static int field839; - @ObfuscatedName("io") - static boolean field699; - @ObfuscatedName("iw") - @ObfuscatedGetter( - intValue = -941791215 - ) - static int field700; - @ObfuscatedName("ih") - static boolean field701; - @ObfuscatedName("ie") - @ObfuscatedGetter( - intValue = 1674344591 - ) - static int field702; - @ObfuscatedName("im") - @ObfuscatedGetter( - intValue = 1530805403 + intValue = 964514413 ) @Export("overheadTextCount") static int overheadTextCount; - @ObfuscatedName("is") + @ObfuscatedName("ia") @ObfuscatedGetter( - intValue = 1202936959 + intValue = 1347852179 ) @Export("overheadTextLimit") static int overheadTextLimit; - @ObfuscatedName("iu") + @ObfuscatedName("ij") @Export("overheadTextXs") static int[] overheadTextXs; - @ObfuscatedName("id") + @ObfuscatedName("iw") @Export("overheadTextYs") static int[] overheadTextYs; - @ObfuscatedName("ig") + @ObfuscatedName("iv") @Export("overheadTextAscents") static int[] overheadTextAscents; - @ObfuscatedName("ib") + @ObfuscatedName("iy") @Export("overheadTextXOffsets") static int[] overheadTextXOffsets; - @ObfuscatedName("iy") + @ObfuscatedName("ib") @Export("overheadTextColors") static int[] overheadTextColors; - @ObfuscatedName("jk") + @ObfuscatedName("ji") @Export("overheadTextEffects") static int[] overheadTextEffects; - @ObfuscatedName("jq") + @ObfuscatedName("jw") @Export("overheadTextCyclesRemaining") static int[] overheadTextCyclesRemaining; - @ObfuscatedName("jh") + @ObfuscatedName("jk") @Export("overheadText") static String[] overheadText; - @ObfuscatedName("jr") + @ObfuscatedName("jd") @Export("tileLastDrawnActor") static int[][] tileLastDrawnActor; - @ObfuscatedName("js") + @ObfuscatedName("jl") @ObfuscatedGetter( - intValue = -853391295 + intValue = -213028925 ) @Export("viewportDrawCount") static int viewportDrawCount; - @ObfuscatedName("jb") + @ObfuscatedName("jh") @ObfuscatedGetter( - intValue = -1874267305 + intValue = 1057202329 ) @Export("viewportTempX") static int viewportTempX; - @ObfuscatedName("jf") + @ObfuscatedName("jq") @ObfuscatedGetter( - intValue = 963772291 + intValue = -1775322899 ) @Export("viewportTempY") static int viewportTempY; - @ObfuscatedName("jt") + @ObfuscatedName("jo") @ObfuscatedGetter( - intValue = 41238441 + intValue = 2140784851 ) @Export("mouseCrossX") static int mouseCrossX; - @ObfuscatedName("jd") + @ObfuscatedName("jn") @ObfuscatedGetter( - intValue = 109132029 + intValue = -1518689867 ) @Export("mouseCrossY") static int mouseCrossY; - @ObfuscatedName("jx") + @ObfuscatedName("ja") @ObfuscatedGetter( - intValue = 790228439 + intValue = -1932536521 ) @Export("mouseCrossState") static int mouseCrossState; - @ObfuscatedName("jj") + @ObfuscatedName("jy") @ObfuscatedGetter( - intValue = -1356198849 + intValue = 993621687 ) @Export("mouseCrossColor") static int mouseCrossColor; @ObfuscatedName("jg") @Export("showMouseCross") static boolean showMouseCross; - @ObfuscatedName("jc") + @ObfuscatedName("jf") @ObfuscatedGetter( - intValue = 265343843 + intValue = -1890193251 ) - static int field817; - @ObfuscatedName("jp") + static int field747; + @ObfuscatedName("jv") @ObfuscatedGetter( - intValue = 349995619 + intValue = -657236193 ) - static int field633; - @ObfuscatedName("ja") + static int field841; + @ObfuscatedName("jr") @ObfuscatedGetter( - intValue = 1346918943 + intValue = -65004085 ) @Export("dragItemSlotSource") static int dragItemSlotSource; - @ObfuscatedName("jv") + @ObfuscatedName("jc") @ObfuscatedGetter( - intValue = 1136970621 + intValue = 823942939 ) @Export("draggedWidgetX") static int draggedWidgetX; - @ObfuscatedName("jo") + @ObfuscatedName("jt") @ObfuscatedGetter( - intValue = 631327227 + intValue = -732224895 ) @Export("draggedWidgetY") static int draggedWidgetY; - @ObfuscatedName("je") + @ObfuscatedName("jb") @ObfuscatedGetter( - intValue = 1883127447 + intValue = -1148388107 ) @Export("dragItemSlotDestination") static int dragItemSlotDestination; - @ObfuscatedName("jl") - static boolean field728; - @ObfuscatedName("jz") + @ObfuscatedName("jj") + static boolean field848; + @ObfuscatedName("js") @ObfuscatedGetter( - intValue = 776678463 + intValue = -599181589 ) @Export("itemDragDuration") static int itemDragDuration; - @ObfuscatedName("jm") + @ObfuscatedName("ju") @ObfuscatedGetter( - intValue = -932914447 + intValue = -267997189 ) - static int field727; - @ObfuscatedName("jn") + static int field755; + @ObfuscatedName("je") @Export("showLoadingMessages") static boolean showLoadingMessages; - @ObfuscatedName("ke") + @ObfuscatedName("kj") @ObfuscatedSignature( - descriptor = "[Lcg;" + descriptor = "[Lce;" ) @Export("players") static Player[] players; - @ObfuscatedName("kr") + @ObfuscatedName("kk") @ObfuscatedGetter( - intValue = 1354032689 + intValue = 929092845 ) @Export("localPlayerIndex") static int localPlayerIndex; - @ObfuscatedName("kb") + @ObfuscatedName("kl") @ObfuscatedGetter( - intValue = -1658998443 + intValue = -1721569989 ) - static int field734; - @ObfuscatedName("kz") + static int field759; + @ObfuscatedName("ka") @Export("renderSelf") static boolean renderSelf; - @ObfuscatedName("kp") + @ObfuscatedName("kg") @ObfuscatedGetter( - intValue = 1751716757 + intValue = -1493328845 ) @Export("drawPlayerNames") static int drawPlayerNames; - @ObfuscatedName("kd") + @ObfuscatedName("ko") @ObfuscatedGetter( - intValue = -533269303 + intValue = 1717996379 ) - static int field737; - @ObfuscatedName("kc") - static int[] field614; - @ObfuscatedName("kh") + static int field762; + @ObfuscatedName("kt") + static int[] field771; + @ObfuscatedName("kz") @Export("playerMenuOpcodes") static final int[] playerMenuOpcodes; - @ObfuscatedName("kq") + @ObfuscatedName("kd") @Export("playerMenuActions") static String[] playerMenuActions; - @ObfuscatedName("kv") + @ObfuscatedName("kp") @Export("playerOptionsPriorities") static boolean[] playerOptionsPriorities; - @ObfuscatedName("ks") + @ObfuscatedName("kw") @Export("defaultRotations") static int[] defaultRotations; - @ObfuscatedName("kk") + @ObfuscatedName("ku") @ObfuscatedGetter( - intValue = -566095449 + intValue = 845336023 ) @Export("combatTargetPlayerIndex") static int combatTargetPlayerIndex; - @ObfuscatedName("kw") + @ObfuscatedName("kb") @ObfuscatedSignature( - descriptor = "[[[Lka;" + descriptor = "[[[Lkx;" ) @Export("groundItems") static NodeDeque[][][] groundItems; - @ObfuscatedName("kt") + @ObfuscatedName("ke") @ObfuscatedSignature( - descriptor = "Lka;" + descriptor = "Lkx;" ) @Export("pendingSpawns") static NodeDeque pendingSpawns; - @ObfuscatedName("km") + @ObfuscatedName("kf") @ObfuscatedSignature( - descriptor = "Lka;" + descriptor = "Lkx;" ) @Export("projectiles") static NodeDeque projectiles; - @ObfuscatedName("kn") + @ObfuscatedName("kv") @ObfuscatedSignature( - descriptor = "Lka;" + descriptor = "Lkx;" ) @Export("graphicsObjects") static NodeDeque graphicsObjects; - @ObfuscatedName("kf") + @ObfuscatedName("kn") @Export("currentLevels") static int[] currentLevels; - @ObfuscatedName("kg") + @ObfuscatedName("ks") @Export("levels") static int[] levels; - @ObfuscatedName("lv") + @ObfuscatedName("lr") @Export("experience") static int[] experience; - @ObfuscatedName("lb") + @ObfuscatedName("lk") @ObfuscatedGetter( - intValue = 1571858545 + intValue = 161491329 ) @Export("leftClickOpensMenu") static int leftClickOpensMenu; - @ObfuscatedName("lj") + @ObfuscatedName("lo") @Export("isMenuOpen") static boolean isMenuOpen; - @ObfuscatedName("lh") + @ObfuscatedName("ll") @ObfuscatedGetter( - intValue = 505897793 + intValue = 673512273 ) @Export("menuOptionsCount") static int menuOptionsCount; - @ObfuscatedName("lm") + @ObfuscatedName("lx") @Export("menuArguments1") static int[] menuArguments1; - @ObfuscatedName("lr") + @ObfuscatedName("ln") @Export("menuArguments2") static int[] menuArguments2; - @ObfuscatedName("lf") + @ObfuscatedName("lj") @Export("menuOpcodes") static int[] menuOpcodes; - @ObfuscatedName("lo") + @ObfuscatedName("la") @Export("menuIdentifiers") static int[] menuIdentifiers; - @ObfuscatedName("lq") + @ObfuscatedName("lv") @Export("menuActions") static String[] menuActions; - @ObfuscatedName("ls") + @ObfuscatedName("lu") @Export("menuTargets") static String[] menuTargets; - @ObfuscatedName("la") + @ObfuscatedName("ly") @Export("menuShiftClick") static boolean[] menuShiftClick; - @ObfuscatedName("lc") + @ObfuscatedName("ls") @Export("followerOpsLowPriority") static boolean followerOpsLowPriority; - @ObfuscatedName("ld") + @ObfuscatedName("lw") @Export("shiftClickDrop") static boolean shiftClickDrop; - @ObfuscatedName("ly") + @ObfuscatedName("le") @Export("tapToDrop") static boolean tapToDrop; - @ObfuscatedName("lw") + @ObfuscatedName("lh") @Export("showMouseOverText") static boolean showMouseOverText; - @ObfuscatedName("ll") + @ObfuscatedName("lm") @ObfuscatedGetter( - intValue = 603205383 + intValue = 1449324429 ) @Export("viewportX") static int viewportX; - @ObfuscatedName("lz") + @ObfuscatedName("lf") @ObfuscatedGetter( - intValue = 601388073 + intValue = -406218029 ) @Export("viewportY") static int viewportY; + @ObfuscatedName("mi") + @ObfuscatedGetter( + intValue = -1946501383 + ) + static int field792; + @ObfuscatedName("ms") + @ObfuscatedGetter( + intValue = 625904081 + ) + static int field833; @ObfuscatedName("me") @ObfuscatedGetter( - intValue = 1882009083 - ) - static int field741; - @ObfuscatedName("mn") - @ObfuscatedGetter( - intValue = 1654565793 - ) - static int field811; - @ObfuscatedName("mp") - @ObfuscatedGetter( - intValue = -1660999759 + intValue = -438265211 ) @Export("isItemSelected") static int isItemSelected; - @ObfuscatedName("mi") + @ObfuscatedName("ml") @Export("isSpellSelected") static boolean isSpellSelected; - @ObfuscatedName("mq") + @ObfuscatedName("mp") @ObfuscatedGetter( - intValue = -740413975 + intValue = 1683168531 ) @Export("selectedSpellChildIndex") static int selectedSpellChildIndex; - @ObfuscatedName("mg") + @ObfuscatedName("mz") @ObfuscatedGetter( - intValue = 1336991211 + intValue = 1424616685 ) - static int field773; - @ObfuscatedName("ml") + static int field788; + @ObfuscatedName("mk") @Export("selectedSpellActionName") static String selectedSpellActionName; - @ObfuscatedName("ma") + @ObfuscatedName("mn") @Export("selectedSpellName") static String selectedSpellName; - @ObfuscatedName("mm") + @ObfuscatedName("mx") @ObfuscatedGetter( - intValue = -357201731 + intValue = 1338880923 ) @Export("rootInterface") static int rootInterface; - @ObfuscatedName("mb") + @ObfuscatedName("mo") @ObfuscatedSignature( - descriptor = "Lmt;" + descriptor = "Lmd;" ) @Export("interfaceParents") static NodeHashTable interfaceParents; - @ObfuscatedName("mz") + @ObfuscatedName("ma") @ObfuscatedGetter( - intValue = -354031881 + intValue = -907665653 ) - static int field778; - @ObfuscatedName("mv") + static int field803; + @ObfuscatedName("mc") @ObfuscatedGetter( - intValue = 45793283 + intValue = 1274187443 ) - static int field779; - @ObfuscatedName("mw") + static int field805; + @ObfuscatedName("mu") @ObfuscatedGetter( - intValue = -517702931 + intValue = -234914901 ) @Export("chatEffects") static int chatEffects; - @ObfuscatedName("mx") + @ObfuscatedName("mv") @ObfuscatedGetter( - intValue = 2005264199 + intValue = -1287342199 ) - static int field781; - @ObfuscatedName("mu") + static int field912; + @ObfuscatedName("mj") @ObfuscatedSignature( - descriptor = "Liv;" + descriptor = "Lio;" ) @Export("meslayerContinueWidget") static Widget meslayerContinueWidget; - @ObfuscatedName("mo") + @ObfuscatedName("mr") @ObfuscatedGetter( - intValue = -1243890845 + intValue = 1008679671 ) @Export("runEnergy") static int runEnergy; - @ObfuscatedName("mt") + @ObfuscatedName("md") @ObfuscatedGetter( - intValue = 104863933 + intValue = -612986977 ) @Export("weight") static int weight; - @ObfuscatedName("mj") + @ObfuscatedName("mg") @ObfuscatedGetter( - intValue = -850293393 + intValue = -816484905 ) @Export("staffModLevel") - public static int staffModLevel; - @ObfuscatedName("mk") + static int staffModLevel; + @ObfuscatedName("mt") @ObfuscatedGetter( - intValue = -597963117 + intValue = -1092871253 ) @Export("followerIndex") static int followerIndex; - @ObfuscatedName("nj") + @ObfuscatedName("nc") @Export("playerMod") static boolean playerMod; - @ObfuscatedName("ny") + @ObfuscatedName("nk") @ObfuscatedSignature( - descriptor = "Liv;" + descriptor = "Lio;" ) @Export("viewportWidget") static Widget viewportWidget; - @ObfuscatedName("ng") + @ObfuscatedName("nm") @ObfuscatedSignature( - descriptor = "Liv;" + descriptor = "Lio;" ) @Export("clickedWidget") static Widget clickedWidget; - @ObfuscatedName("ne") + @ObfuscatedName("nf") @ObfuscatedSignature( - descriptor = "Liv;" + descriptor = "Lio;" ) @Export("clickedWidgetParent") static Widget clickedWidgetParent; - @ObfuscatedName("na") + @ObfuscatedName("ni") @ObfuscatedGetter( - intValue = 667205137 + intValue = -653830947 ) @Export("widgetClickX") static int widgetClickX; - @ObfuscatedName("no") + @ObfuscatedName("nu") @ObfuscatedGetter( - intValue = -1660810691 + intValue = 1055501491 ) @Export("widgetClickY") static int widgetClickY; - @ObfuscatedName("nt") + @ObfuscatedName("nv") @ObfuscatedSignature( - descriptor = "Liv;" + descriptor = "Lio;" ) @Export("draggedOnWidget") static Widget draggedOnWidget; - @ObfuscatedName("nh") - static boolean field794; - @ObfuscatedName("np") - @ObfuscatedGetter( - intValue = -2004615367 - ) - static int field795; - @ObfuscatedName("nb") - @ObfuscatedGetter( - intValue = -699615005 - ) - static int field785; - @ObfuscatedName("nz") - static boolean field797; - @ObfuscatedName("nu") - @ObfuscatedGetter( - intValue = 1453699169 - ) - static int field871; + @ObfuscatedName("no") + static boolean field819; @ObfuscatedName("nx") @ObfuscatedGetter( - intValue = 116122765 + intValue = 1941546241 ) - static int field798; - @ObfuscatedName("nn") + static int field740; + @ObfuscatedName("nw") + @ObfuscatedGetter( + intValue = -356014141 + ) + static int field821; + @ObfuscatedName("np") + static boolean field822; + @ObfuscatedName("nq") + @ObfuscatedGetter( + intValue = -227792449 + ) + static int field854; + @ObfuscatedName("nl") + @ObfuscatedGetter( + intValue = 662563071 + ) + static int field804; + @ObfuscatedName("nz") @Export("isDraggingWidget") static boolean isDraggingWidget; - @ObfuscatedName("nk") + @ObfuscatedName("nd") @ObfuscatedGetter( - intValue = 367486059 + intValue = 1675804533 ) @Export("cycleCntr") static int cycleCntr; - @ObfuscatedName("nd") + @ObfuscatedName("nn") @Export("changedVarps") static int[] changedVarps; - @ObfuscatedName("nw") + @ObfuscatedName("na") @ObfuscatedGetter( - intValue = -1280387963 + intValue = 1149971569 ) @Export("changedVarpCount") static int changedVarpCount; @ObfuscatedName("ns") @Export("changedItemContainers") static int[] changedItemContainers; - @ObfuscatedName("nl") + @ObfuscatedName("nj") @ObfuscatedGetter( - intValue = -657143437 + intValue = 102304557 ) - static int field805; - @ObfuscatedName("nf") + static int field830; + @ObfuscatedName("ne") @Export("changedSkills") static int[] changedSkills; - @ObfuscatedName("ol") + @ObfuscatedName("oc") @ObfuscatedGetter( - intValue = -1210343069 + intValue = 28091927 ) @Export("changedSkillsCount") static int changedSkillsCount; - @ObfuscatedName("op") - static int[] field808; - @ObfuscatedName("oa") + @ObfuscatedName("oi") + static int[] field911; + @ObfuscatedName("oe") @ObfuscatedGetter( - intValue = 1273627685 + intValue = 1843609775 ) - static int field809; - @ObfuscatedName("oq") + static int field852; + @ObfuscatedName("on") @ObfuscatedGetter( - intValue = -499616417 + intValue = 1908476521 ) @Export("chatCycle") static int chatCycle; + @ObfuscatedName("op") + @ObfuscatedGetter( + intValue = 56143531 + ) + static int field836; + @ObfuscatedName("oh") + @ObfuscatedGetter( + intValue = 1400025619 + ) + static int field844; + @ObfuscatedName("ox") + @ObfuscatedGetter( + intValue = -1827987357 + ) + static int field654; @ObfuscatedName("of") @ObfuscatedGetter( - intValue = -1349767563 + intValue = -31959039 ) - static int field801; - @ObfuscatedName("ow") - @ObfuscatedGetter( - intValue = 1371918319 - ) - static int field698; - @ObfuscatedName("od") - @ObfuscatedGetter( - intValue = -781333479 - ) - static int field822; - @ObfuscatedName("ov") - @ObfuscatedGetter( - intValue = 151143003 - ) - static int field814; + static int field839; @ObfuscatedName("oy") @ObfuscatedGetter( - intValue = -90279163 + intValue = 77736245 ) - static int field815; - @ObfuscatedName("ok") + static int field840; + @ObfuscatedName("og") @ObfuscatedGetter( - intValue = -195161785 + intValue = -194606347 ) - static int field816; - @ObfuscatedName("oo") + static int field748; + @ObfuscatedName("ou") @ObfuscatedGetter( - intValue = 690686753 + intValue = 1047300925 ) - static int field731; - @ObfuscatedName("oc") + static int field659; + @ObfuscatedName("eo") @ObfuscatedSignature( - descriptor = "Ldp;" + descriptor = "Lnd;" ) - @Export("varcs") - static Varcs varcs; - @ObfuscatedName("er") + Buffer field679; + @ObfuscatedName("fl") @ObfuscatedSignature( - descriptor = "Lnk;" + descriptor = "Las;" ) - Buffer field655; - @ObfuscatedName("fb") - @ObfuscatedSignature( - descriptor = "Lam;" - ) - class35 field656; + class35 field680; static { - field767 = true; // L: 194 + field889 = true; // L: 194 worldId = 1; // L: 195 worldProperties = 0; // L: 196 gameBuild = 0; // L: 198 isMembersWorld = false; // L: 201 isLowDetail = false; // L: 202 clientType = -1; // L: 207 - field621 = -1; // L: 208 + field643 = -1; // L: 208 onMobile = false; // L: 209 gameState = 0; // L: 210 isLoading = true; // L: 231 cycle = 0; // L: 232 mouseLastLastPressedTimeMillis = -1L; // L: 233 - field627 = -1; // L: 235 - field837 = -1; // L: 236 - field629 = -1L; // L: 237 + field651 = -1; // L: 235 + field812 = -1; // L: 236 + field653 = -1L; // L: 237 hadFocus = true; // L: 238 displayFps = false; // L: 239 rebootTimer = 0; // L: 240 @@ -1340,42 +1333,42 @@ public final class Client extends GameEngine implements Usernamed { npcAttackOption = AttackOption.AttackOption_hidden; // L: 251 titleLoadingStage = 0; // L: 253 js5ConnectState = 0; // L: 256 - field646 = 0; // L: 257 + field670 = 0; // L: 257 js5Errors = 0; // L: 279 loginState = 0; // L: 281 - field649 = 0; // L: 282 - field749 = 0; // L: 283 - field673 = 0; // L: 284 - field652 = class125.field1449; // L: 285 + field673 = 0; // L: 282 + field845 = 0; // L: 283 + field675 = 0; // L: 284 + field676 = class125.field1468; // L: 285 Login_isUsernameRemembered = false; // L: 294 secureRandomFuture = new SecureRandomFuture(); // L: 295 randomDatData = null; // L: 300 npcs = new NPC[32768]; // L: 304 npcCount = 0; // L: 305 npcIndices = new int[32768]; // L: 306 - field661 = 0; // L: 307 - field662 = new int[250]; // L: 308 + field685 = 0; // L: 307 + field686 = new int[250]; // L: 308 packetWriter = new PacketWriter(); // L: 311 logoutTimer = 0; // L: 313 hadNetworkError = false; // L: 314 useBufferedSocket = true; // L: 315 timer = new Timer(); // L: 316 fontsMap = new HashMap(); // L: 322 - field669 = 0; // L: 329 - field670 = 1; // L: 330 - field671 = 0; // L: 331 - field672 = 1; // L: 332 - field790 = 0; // L: 333 + field694 = 0; // L: 329 + field695 = 1; // L: 330 + field696 = 0; // L: 331 + field697 = 1; // L: 332 + field698 = 0; // L: 333 collisionMaps = new CollisionMap[4]; // L: 341 isInInstance = false; // L: 342 instanceChunkTemplates = new int[4][13][13]; // L: 343 - field677 = new int[]{0, 0, 0, 0, 1, 1, 1, 1, 1, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 3}; // L: 344 - field768 = 0; // L: 347 - field679 = 2301979; // L: 359 - field680 = 5063219; // L: 360 - field681 = 3353893; // L: 361 - field658 = 7759444; // L: 362 - field683 = false; // L: 363 + field702 = new int[]{0, 0, 0, 0, 1, 1, 1, 1, 1, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 3}; // L: 344 + field913 = 0; // L: 347 + field704 = 2301979; // L: 359 + field705 = 5063219; // L: 360 + field706 = 3353893; // L: 361 + field707 = 7759444; // L: 362 + field708 = false; // L: 363 alternativeScrollbarWidth = 0; // L: 364 camAngleX = 128; // L: 372 camAngleY = 0; // L: 373 @@ -1385,16 +1378,16 @@ public final class Client extends GameEngine implements Usernamed { mouseCamClickedY = 0; // L: 377 oculusOrbState = 0; // L: 378 camFollowHeight = 50; // L: 379 - field693 = 0; // L: 383 - field694 = 0; // L: 384 - field695 = 0; // L: 385 + field718 = 0; // L: 383 + field732 = 0; // L: 384 + field720 = 0; // L: 385 oculusOrbNormalSpeed = 12; // L: 387 oculusOrbSlowedSpeed = 6; // L: 388 - field839 = 0; // L: 389 - field699 = false; // L: 390 - field700 = 0; // L: 391 - field701 = false; // L: 392 - field702 = 0; // L: 393 + field723 = 0; // L: 389 + field724 = false; // L: 390 + field725 = 0; // L: 391 + field726 = false; // L: 392 + field727 = 0; // L: 393 overheadTextCount = 0; // L: 394 overheadTextLimit = 50; // L: 395 overheadTextXs = new int[overheadTextLimit]; // L: 396 @@ -1414,23 +1407,23 @@ public final class Client extends GameEngine implements Usernamed { mouseCrossState = 0; // L: 410 mouseCrossColor = 0; // L: 411 showMouseCross = true; // L: 412 - field817 = 0; // L: 414 - field633 = 0; // L: 415 + field747 = 0; // L: 414 + field841 = 0; // L: 415 dragItemSlotSource = 0; // L: 418 draggedWidgetX = 0; // L: 419 draggedWidgetY = 0; // L: 420 dragItemSlotDestination = 0; // L: 421 - field728 = false; // L: 422 + field848 = false; // L: 422 itemDragDuration = 0; // L: 423 - field727 = 0; // L: 424 + field755 = 0; // L: 424 showLoadingMessages = true; // L: 426 players = new Player[2048]; // L: 428 localPlayerIndex = -1; // L: 430 - field734 = 0; // L: 431 + field759 = 0; // L: 431 renderSelf = true; // L: 433 drawPlayerNames = 0; // L: 438 - field737 = 0; // L: 439 - field614 = new int[1000]; // L: 440 + field762 = 0; // L: 439 + field771 = new int[1000]; // L: 440 playerMenuOpcodes = new int[]{44, 45, 46, 47, 48, 49, 50, 51}; // L: 442 playerMenuActions = new String[8]; // L: 443 playerOptionsPriorities = new boolean[8]; // L: 444 @@ -1459,21 +1452,21 @@ public final class Client extends GameEngine implements Usernamed { showMouseOverText = true; // L: 473 viewportX = -1; // L: 474 viewportY = -1; // L: 475 - field741 = 0; // L: 479 - field811 = 50; // L: 480 + field792 = 0; // L: 479 + field833 = 50; // L: 480 isItemSelected = 0; // L: 481 selectedItemName = null; // L: 485 isSpellSelected = false; // L: 486 selectedSpellChildIndex = -1; // L: 488 - field773 = -1; // L: 489 + field788 = -1; // L: 489 selectedSpellActionName = null; // L: 491 selectedSpellName = null; // L: 492 rootInterface = -1; // L: 493 interfaceParents = new NodeHashTable(8); // L: 494 - field778 = 0; // L: 499 - field779 = -1; // L: 500 + field803 = 0; // L: 499 + field805 = -1; // L: 500 chatEffects = 0; // L: 501 - field781 = 0; // L: 502 + field912 = 0; // L: 502 meslayerContinueWidget = null; // L: 503 runEnergy = 0; // L: 504 weight = 0; // L: 505 @@ -1486,60 +1479,60 @@ public final class Client extends GameEngine implements Usernamed { widgetClickX = 0; // L: 512 widgetClickY = 0; // L: 513 draggedOnWidget = null; // L: 514 - field794 = false; // L: 515 - field795 = -1; // L: 516 - field785 = -1; // L: 517 - field797 = false; // L: 518 - field871 = -1; // L: 519 - field798 = -1; // L: 520 + field819 = false; // L: 515 + field740 = -1; // L: 516 + field821 = -1; // L: 517 + field822 = false; // L: 518 + field854 = -1; // L: 519 + field804 = -1; // L: 520 isDraggingWidget = false; // L: 521 cycleCntr = 1; // L: 526 changedVarps = new int[32]; // L: 529 changedVarpCount = 0; // L: 530 changedItemContainers = new int[32]; // L: 531 - field805 = 0; // L: 532 + field830 = 0; // L: 532 changedSkills = new int[32]; // L: 533 changedSkillsCount = 0; // L: 534 - field808 = new int[32]; // L: 535 - field809 = 0; // L: 536 + field911 = new int[32]; // L: 535 + field852 = 0; // L: 536 chatCycle = 0; // L: 537 - field801 = 0; // L: 538 - field698 = 0; // L: 539 - field822 = 0; // L: 540 - field814 = 0; // L: 541 - field815 = 0; // L: 542 - field816 = 0; // L: 543 - field731 = 0; // L: 544 + field836 = 0; // L: 538 + field844 = 0; // L: 539 + field654 = 0; // L: 540 + field839 = 0; // L: 541 + field840 = 0; // L: 542 + field748 = 0; // L: 543 + field659 = 0; // L: 544 mouseWheelRotation = 0; // L: 550 scriptEvents = new NodeDeque(); // L: 551 - field865 = new NodeDeque(); // L: 552 - field821 = new NodeDeque(); // L: 553 + field652 = new NodeDeque(); // L: 552 + field846 = new NodeDeque(); // L: 553 widgetFlags = new NodeHashTable(512); // L: 554 rootWidgetCount = 0; // L: 556 - field824 = -2; // L: 557 - field825 = new boolean[100]; // L: 558 - field826 = new boolean[100]; // L: 559 - field636 = new boolean[100]; // L: 560 + field849 = -2; // L: 557 + field719 = new boolean[100]; // L: 558 + field780 = new boolean[100]; // L: 559 + field860 = new boolean[100]; // L: 560 rootWidgetXs = new int[100]; // L: 561 rootWidgetYs = new int[100]; // L: 562 rootWidgetWidths = new int[100]; // L: 563 rootWidgetHeights = new int[100]; // L: 564 gameDrawingMode = 0; // L: 565 - field833 = 0L; // L: 566 + field858 = 0L; // L: 566 isResizable = true; // L: 567 - field651 = new int[]{16776960, 16711680, 65280, 65535, 16711935, 16777215}; // L: 574 + field877 = new int[]{16776960, 16711680, 65280, 65535, 16711935, 16777215}; // L: 574 publicChatMode = 0; // L: 575 tradeChatMode = 0; // L: 577 - field843 = ""; // L: 578 + field863 = ""; // L: 578 crossWorldMessageIds = new long[100]; // L: 580 crossWorldMessageIdsIndex = 0; // L: 581 - field842 = 0; // L: 583 - field746 = new int[128]; // L: 584 - field844 = new int[128]; // L: 585 - field799 = -1L; // L: 586 - field678 = new class11[1]; // L: 590 - field847 = new class3[1]; // L: 592 - field848 = -1; // L: 594 + field806 = 0; // L: 583 + field867 = new int[128]; // L: 584 + field868 = new int[128]; // L: 585 + field809 = -1L; // L: 586 + currentClanSettings = new ClanSettings[1]; // L: 590 + currentClanChannels = new ClanChannel[1]; // L: 592 + field872 = -1; // L: 594 mapIconCount = 0; // L: 595 mapIconXs = new int[1000]; // L: 596 mapIconYs = new int[1000]; // L: 597 @@ -1548,7 +1541,7 @@ public final class Client extends GameEngine implements Usernamed { destinationY = 0; // L: 600 minimapState = 0; // L: 607 currentTrackGroupId = -1; // L: 608 - field866 = false; // L: 609 + field881 = false; // L: 609 soundEffectCount = 0; // L: 615 soundEffectIds = new int[50]; // L: 616 queuedSoundEffectLoops = new int[50]; // L: 617 @@ -1556,1388 +1549,408 @@ public final class Client extends GameEngine implements Usernamed { soundLocations = new int[50]; // L: 619 soundEffects = new SoundEffect[50]; // L: 620 isCameraLocked = false; // L: 622 - field846 = new boolean[5]; // L: 634 - field744 = new int[5]; // L: 635 - field868 = new int[5]; // L: 636 - field869 = new int[5]; // L: 637 - field870 = new int[5]; // L: 638 - field820 = 256; // L: 639 - field872 = 205; // L: 640 + field693 = new boolean[5]; // L: 634 + field890 = new int[5]; // L: 635 + field891 = new int[5]; // L: 636 + field892 = new int[5]; // L: 637 + field893 = new int[5]; // L: 638 + field894 = 256; // L: 639 + field895 = 205; // L: 640 zoomHeight = 256; // L: 641 zoomWidth = 320; // L: 642 - field875 = 1; // L: 643 - field738 = 32767; // L: 644 - field877 = 1; // L: 645 - field878 = 32767; // L: 646 + field909 = 1; // L: 643 + field828 = 32767; // L: 644 + field900 = 1; // L: 645 + field901 = 32767; // L: 646 viewportOffsetX = 0; // L: 647 viewportOffsetY = 0; // L: 648 viewportWidth = 0; // L: 649 viewportHeight = 0; // L: 650 viewportZoom = 0; // L: 651 playerAppearance = new PlayerComposition(); // L: 653 - field630 = -1; // L: 654 - field631 = -1; // L: 655 + field908 = -1; // L: 654 + field752 = -1; // L: 655 platformInfoProvider = new DesktopPlatformInfoProvider(); // L: 657 grandExchangeOffers = new GrandExchangeOffer[8]; // L: 659 GrandExchangeEvents_worldComparator = new GrandExchangeOfferOwnWorldComparator(); // L: 662 - field687 = -1; // L: 669 + field717 = -1; // L: 669 archiveLoaders = new ArrayList(10); // L: 670 archiveLoadersDone = 0; // L: 671 - field893 = 0; // L: 672 - field894 = new ApproximateRouteStrategy(); // L: 681 - field828 = new int[50]; // L: 682 - field896 = new int[50]; // L: 683 + field916 = 0; // L: 672 + field785 = new ApproximateRouteStrategy(); // L: 681 + field689 = new int[50]; // L: 682 + field851 = new int[50]; // L: 683 } - @ObfuscatedName("d") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "-997141942" + descriptor = "(B)V", + garbageValue = "50" ) @Export("resizeGame") protected final void resizeGame() { - field833 = Archive.currentTimeMillis() + 500L; // L: 4360 - this.resizeJS(); // L: 4361 - if (rootInterface != -1) { // L: 4362 + field858 = ObjectComposition.currentTimeMillis() + 500L; // L: 3933 + this.resizeJS(); // L: 3934 + if (rootInterface != -1) { // L: 3935 this.resizeRoot(true); } - } // L: 4363 + } // L: 3936 - @ObfuscatedName("am") + @ObfuscatedName("ab") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "1254682788" + garbageValue = "-232069568" ) @Export("setUp") protected final void setUp() { - Players.method2312(new int[]{20, 260, 10000}, new int[]{1000, 100, 500}); // L: 812 - class69.worldPort = gameBuild == 0 ? 43594 : worldId + 40000; // L: 813 - class24.js5Port = gameBuild == 0 ? 443 : worldId + 50000; // L: 814 - BoundaryObject.currentPort = class69.worldPort; // L: 815 - PlayerComposition.field2934 = class245.field2949; // L: 816 - Canvas.field295 = class245.field2948; // L: 817 - Script.field1064 = class245.field2950; // L: 818 - PlayerComposition.field2937 = class245.field2951; // L: 819 - class19.urlRequester = new UrlRequester(); // L: 820 - this.setUpKeyboard(); // L: 821 - this.setUpMouse(); // L: 822 - class2.mouseWheel = this.mouseWheel(); // L: 823 - class1.masterDisk = new ArchiveDisk(255, JagexCache.JagexCache_dat2File, JagexCache.JagexCache_idx255File, 500000); // L: 824 - AccessFile var2 = null; // L: 827 - ClientPreferences var3 = new ClientPreferences(); // L: 828 + SecureRandomFuture.method1981(new int[]{20, 260, 10000}, new int[]{1000, 100, 500}); // L: 880 + WorldMapLabelSize.worldPort = gameBuild == 0 ? 43594 : worldId + 40000; // L: 881 + GrandExchangeOfferTotalQuantityComparator.js5Port = gameBuild == 0 ? 443 : worldId + 50000; // L: 882 + DesktopPlatformInfoProvider.currentPort = WorldMapLabelSize.worldPort; // L: 883 + class29.field233 = class245.field2944; // L: 884 + class15.field137 = class245.field2940; // L: 885 + UserComparator5.field1442 = class245.field2941; // L: 886 + VarbitComposition.field1708 = class245.field2942; // L: 887 + ServerPacket.urlRequester = new UrlRequester(); // L: 888 + this.setUpKeyboard(); // L: 889 + this.setUpMouse(); // L: 890 + MidiPcmStream.mouseWheel = this.mouseWheel(); // L: 891 + class43.masterDisk = new ArchiveDisk(255, JagexCache.JagexCache_dat2File, JagexCache.JagexCache_idx255File, 500000); // L: 892 + AccessFile var2 = null; // L: 895 + ClientPreferences var3 = new ClientPreferences(); // L: 896 try { - var2 = Buddy.getPreferencesFile("", NetSocket.field1492.name, false); // L: 830 - byte[] var4 = new byte[(int)var2.length()]; // L: 831 + var2 = class82.getPreferencesFile("", SoundSystem.field461.name, false); // L: 898 + byte[] var4 = new byte[(int)var2.length()]; // L: 899 int var6; - for (int var5 = 0; var5 < var4.length; var5 += var6) { // L: 832 833 836 - var6 = var2.read(var4, var5, var4.length - var5); // L: 834 - if (var6 == -1) { // L: 835 + for (int var5 = 0; var5 < var4.length; var5 += var6) { // L: 900 901 904 + var6 = var2.read(var4, var5, var4.length - var5); // L: 902 + if (var6 == -1) { // L: 903 throw new IOException(); } } - var3 = new ClientPreferences(new Buffer(var4)); // L: 838 - } catch (Exception var8) { // L: 840 + var3 = new ClientPreferences(new Buffer(var4)); // L: 906 + } catch (Exception var8) { // L: 908 } try { - if (var2 != null) { // L: 842 + if (var2 != null) { // L: 910 var2.close(); } - } catch (Exception var7) { // L: 844 + } catch (Exception var7) { // L: 912 } - class12.clientPreferences = var3; // L: 847 - this.setUpClipboard(); // L: 848 - String var9 = ModeWhere.null_string; // L: 850 - class44.applet = this; // L: 852 - if (var9 != null) { // L: 853 - class44.field305 = var9; + ObjectComposition.clientPreferences = var3; // L: 915 + this.setUpClipboard(); // L: 916 + String var9 = PacketWriter.null_string; // L: 918 + class44.applet = this; // L: 920 + if (var9 != null) { // L: 921 + class44.field318 = var9; } - if (gameBuild != 0) { // L: 855 + if (gameBuild != 0) { // L: 923 displayFps = true; } - class374.setWindowedMode(class12.clientPreferences.windowMode); // L: 856 - GrandExchangeOfferUnitPriceComparator.friendSystem = new FriendSystem(ModeWhere.loginType); // L: 857 - } // L: 858 + CollisionMap.setWindowedMode(ObjectComposition.clientPreferences.windowMode); // L: 924 + NetSocket.friendSystem = new FriendSystem(WorldMapSection0.loginType); // L: 925 + } // L: 926 - @ObfuscatedName("ax") + @ObfuscatedName("al") @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "302617031" + descriptor = "(B)V", + garbageValue = "68" ) @Export("doCycle") protected final void doCycle() { - ++cycle; // L: 861 - this.doCycleJs5(); // L: 862 - class10.method109(); // L: 863 - class371.method6333(); // L: 864 - WorldMapIcon_1.playPcmPlayers(); // L: 865 - Players.method2311(); // L: 866 - synchronized(MouseHandler.MouseHandler_instance) { // L: 868 - MouseHandler.MouseHandler_currentButton = MouseHandler.MouseHandler_currentButtonVolatile; // L: 869 - MouseHandler.MouseHandler_x = MouseHandler.MouseHandler_xVolatile; // L: 870 - MouseHandler.MouseHandler_y = MouseHandler.MouseHandler_yVolatile; // L: 871 - MouseHandler.MouseHandler_millis = MouseHandler.MouseHandler_lastMovedVolatile; // L: 872 - MouseHandler.MouseHandler_lastButton = MouseHandler.MouseHandler_lastButtonVolatile; // L: 873 - MouseHandler.MouseHandler_lastPressedX = MouseHandler.MouseHandler_lastPressedXVolatile; // L: 874 - MouseHandler.MouseHandler_lastPressedY = MouseHandler.MouseHandler_lastPressedYVolatile; // L: 875 - MouseHandler.MouseHandler_lastPressedTimeMillis = MouseHandler.MouseHandler_lastPressedTimeMillisVolatile; // L: 876 - MouseHandler.MouseHandler_lastButtonVolatile = 0; // L: 877 - } // L: 878 + ++cycle; // L: 929 + this.doCycleJs5(); // L: 930 - int var45; - if (class2.mouseWheel != null) { // L: 880 - var45 = class2.mouseWheel.useRotation(); // L: 881 - mouseWheelRotation = var45; // L: 882 - } + while (true) { + ArchiveDiskAction var1; + synchronized(ArchiveDiskActionHandler.ArchiveDiskActionHandler_requestQueue) { // L: 934 + var1 = (ArchiveDiskAction)ArchiveDiskActionHandler.ArchiveDiskActionHandler_responseQueue.removeLast(); // L: 935 + } // L: 936 - if (gameState == 0) { // L: 884 - UrlRequest.load(); // L: 885 - WorldMapRectangle.clock.mark(); // L: 887 - - for (var45 = 0; var45 < 32; ++var45) { // L: 888 - GameEngine.graphicsTickTimes[var45] = 0L; - } - - for (var45 = 0; var45 < 32; ++var45) { // L: 889 - GameEngine.clientTickTimes[var45] = 0L; - } - - GameEngine.gameCyclesToDo = 0; // L: 890 - } else if (gameState == 5) { // L: 893 - class179.doCycleTitle(this); // L: 894 - UrlRequest.load(); // L: 895 - WorldMapRectangle.clock.mark(); // L: 897 - - for (var45 = 0; var45 < 32; ++var45) { // L: 898 - GameEngine.graphicsTickTimes[var45] = 0L; - } - - for (var45 = 0; var45 < 32; ++var45) { // L: 899 - GameEngine.clientTickTimes[var45] = 0L; - } - - GameEngine.gameCyclesToDo = 0; // L: 900 - } else if (gameState != 10 && gameState != 11) { // L: 903 - if (gameState == 20) { // L: 904 - class179.doCycleTitle(this); // L: 905 - this.doCycleLoggedOut(); // L: 906 - } else if (gameState == 25) { // L: 908 - class9.method97(false); // L: 909 - field669 = 0; // L: 910 - boolean var77 = true; // L: 911 - - int var46; - for (var46 = 0; var46 < Messages.regionLandArchives.length; ++var46) { // L: 912 - if (class264.regionMapArchiveIds[var46] != -1 && Messages.regionLandArchives[var46] == null) { // L: 913 914 - Messages.regionLandArchives[var46] = WorldMapSection0.archive5.takeFile(class264.regionMapArchiveIds[var46], 0); // L: 915 - if (Messages.regionLandArchives[var46] == null) { // L: 916 - var77 = false; // L: 917 - ++field669; // L: 918 - } - } - - if (class15.regionLandArchiveIds[var46] != -1 && class159.regionMapArchives[var46] == null) { // L: 922 923 - class159.regionMapArchives[var46] = WorldMapSection0.archive5.takeFileEncrypted(class15.regionLandArchiveIds[var46], 0, FriendsList.xteaKeys[var46]); // L: 924 - if (class159.regionMapArchives[var46] == null) { // L: 925 - var77 = false; // L: 926 - ++field669; // L: 927 - } - } - } - - if (!var77) { // L: 932 - field790 = 1; // L: 933 - } else { - field671 = 0; // L: 936 - var77 = true; // L: 937 - - int var4; + if (var1 == null) { // L: 937 + Interpreter.method1870(); // L: 941 + HealthBarUpdate.playPcmPlayers(); // L: 942 + synchronized(KeyHandler.KeyHandler_instance) { // L: 944 + ++KeyHandler.KeyHandler_idleCycles; // L: 945 + KeyHandler.field293 = KeyHandler.field295; // L: 946 + KeyHandler.field292 = 0; // L: 947 int var5; - Buffer var9; - int var10; - int var11; - int var12; - int var14; - int var15; - int var16; - int var17; - int var18; - int var19; - for (var46 = 0; var46 < Messages.regionLandArchives.length; ++var46) { // L: 938 - byte[] var3 = class159.regionMapArchives[var46]; // L: 939 - if (var3 != null) { // L: 940 - var4 = (HealthBar.regions[var46] >> 8) * 64 - JagexCache.baseX; // L: 941 - var5 = (HealthBar.regions[var46] & 255) * 64 - Messages.baseY; // L: 942 - if (isInInstance) { // L: 943 - var4 = 10; // L: 944 - var5 = 10; // L: 945 - } - - boolean var8 = true; // L: 950 - var9 = new Buffer(var3); // L: 951 - var10 = -1; // L: 952 - - label1497: - while (true) { - var11 = var9.method6462(); // L: 954 - if (var11 == 0) { // L: 955 - var77 &= var8; // L: 988 - break; - } - - var10 += var11; // L: 956 - var12 = 0; // L: 957 - boolean var13 = false; // L: 958 - - while (true) { - while (!var13) { // L: 960 - var14 = var9.readUShortSmart(); // L: 966 - if (var14 == 0) { // L: 967 - continue label1497; - } - - var12 += var14 - 1; // L: 968 - var15 = var12 & 63; // L: 969 - var16 = var12 >> 6 & 63; // L: 970 - var17 = var9.readUnsignedByte() >> 2; // L: 971 - var18 = var4 + var16; // L: 972 - var19 = var5 + var15; // L: 973 - if (var18 > 0 && var19 > 0 && var18 < 103 && var19 < 103) { // L: 974 - ObjectComposition var20 = AttackOption.getObjectDefinition(var10); // L: 975 - if (var17 != 22 || !isLowDetail || var20.int1 != 0 || var20.interactType == 1 || var20.boolean2) { // L: 976 - if (!var20.needsModelFiles()) { // L: 977 - ++field671; // L: 978 - var8 = false; // L: 979 - } - - var13 = true; // L: 981 - } - } - } - - var14 = var9.readUShortSmart(); // L: 961 - if (var14 == 0) { // L: 962 - break; - } - - var9.readUnsignedByte(); // L: 963 - } - } - } - } - - if (!var77) { // L: 991 - field790 = 2; // L: 992 - } else { - if (field790 != 0) { // L: 995 - class7.drawLoadingMessage("Loading - please wait." + "
" + " (" + 100 + "%" + ")", true); - } - - WorldMapIcon_1.playPcmPlayers(); // L: 996 - class5.scene.clear(); // L: 997 - - for (var46 = 0; var46 < 4; ++var46) { // L: 998 - collisionMaps[var46].clear(); - } - - int var47; - for (var46 = 0; var46 < 4; ++var46) { // L: 999 - for (var47 = 0; var47 < 104; ++var47) { // L: 1000 - for (var4 = 0; var4 < 104; ++var4) { // L: 1001 - Tiles.Tiles_renderFlags[var46][var47][var4] = 0; // L: 1002 - } - } - } - - WorldMapIcon_1.playPcmPlayers(); // L: 1006 - Tiles.Tiles_minPlane = 99; // L: 1008 - Tiles.field1097 = new byte[4][104][104]; // L: 1009 - class9.field71 = new byte[4][104][104]; // L: 1010 - Tiles.field1088 = new byte[4][104][104]; // L: 1011 - Tiles.field1086 = new byte[4][104][104]; // L: 1012 - Tiles.field1105 = new int[4][105][105]; // L: 1013 - Tiles.field1090 = new byte[4][105][105]; // L: 1014 - StructComposition.field1730 = new int[105][105]; // L: 1015 - Tiles.Tiles_hue = new int[104]; // L: 1016 - class280.Tiles_saturation = new int[104]; // L: 1017 - Tiles.Tiles_lightness = new int[104]; // L: 1018 - class20.Tiles_hueMultiplier = new int[104]; // L: 1019 - AbstractByteArrayCopier.field3115 = new int[104]; // L: 1020 - var46 = Messages.regionLandArchives.length; // L: 1022 - - for (ObjectSound var66 = (ObjectSound)ObjectSound.objectSounds.last(); var66 != null; var66 = (ObjectSound)ObjectSound.objectSounds.previous()) { // L: 1024 - if (var66.stream1 != null) { // L: 1025 - FloorOverlayDefinition.pcmStreamMixer.removeSubStream(var66.stream1); // L: 1026 - var66.stream1 = null; // L: 1027 - } - - if (var66.stream2 != null) { // L: 1029 - FloorOverlayDefinition.pcmStreamMixer.removeSubStream(var66.stream2); // L: 1030 - var66.stream2 = null; // L: 1031 - } - } - - ObjectSound.objectSounds.clear(); // L: 1034 - class9.method97(true); // L: 1036 - int var6; - int var7; - int[] var10000; - int var21; - int var22; - int var53; - int var69; - int var71; - if (!isInInstance) { // L: 1037 - var47 = 0; - - label1429: - while (true) { - byte[] var48; - if (var47 >= var46) { - for (var47 = 0; var47 < var46; ++var47) { // L: 1066 - var4 = (HealthBar.regions[var47] >> 8) * 64 - JagexCache.baseX; // L: 1067 - var5 = (HealthBar.regions[var47] & 255) * 64 - Messages.baseY; // L: 1068 - var48 = Messages.regionLandArchives[var47]; // L: 1069 - if (var48 == null && class11.field112 < 800) { // L: 1070 - WorldMapIcon_1.playPcmPlayers(); // L: 1071 - FileSystem.method2542(var4, var5, 64, 64); // L: 1072 - } - } - - class9.method97(true); // L: 1075 - var47 = 0; - - while (true) { - if (var47 >= var46) { - break label1429; - } - - byte[] var50 = class159.regionMapArchives[var47]; // L: 1077 - if (var50 != null) { // L: 1078 - var5 = (HealthBar.regions[var47] >> 8) * 64 - JagexCache.baseX; // L: 1079 - var6 = (HealthBar.regions[var47] & 255) * 64 - Messages.baseY; // L: 1080 - WorldMapIcon_1.playPcmPlayers(); // L: 1081 - Scene var51 = class5.scene; // L: 1082 - CollisionMap[] var52 = collisionMaps; // L: 1083 - var9 = new Buffer(var50); // L: 1085 - var10 = -1; // L: 1086 - - while (true) { - var11 = var9.method6462(); // L: 1088 - if (var11 == 0) { // L: 1089 - break; - } - - var10 += var11; // L: 1090 - var12 = 0; // L: 1091 - - while (true) { - var71 = var9.readUShortSmart(); // L: 1093 - if (var71 == 0) { // L: 1094 - break; - } - - var12 += var71 - 1; // L: 1095 - var14 = var12 & 63; // L: 1096 - var15 = var12 >> 6 & 63; // L: 1097 - var16 = var12 >> 12; // L: 1098 - var17 = var9.readUnsignedByte(); // L: 1099 - var18 = var17 >> 2; // L: 1100 - var19 = var17 & 3; // L: 1101 - var53 = var5 + var15; // L: 1102 - var21 = var14 + var6; // L: 1103 - if (var53 > 0 && var21 > 0 && var53 < 103 && var21 < 103) { // L: 1104 - var22 = var16; // L: 1105 - if ((Tiles.Tiles_renderFlags[1][var53][var21] & 2) == 2) { // L: 1106 - var22 = var16 - 1; - } - - CollisionMap var23 = null; // L: 1107 - if (var22 >= 0) { // L: 1108 - var23 = var52[var22]; - } - - ClanChat.method5541(var16, var53, var21, var10, var19, var18, var51, var23); // L: 1109 - } - } - } - } - - ++var47; // L: 1076 - } - } - - var4 = (HealthBar.regions[var47] >> 8) * 64 - JagexCache.baseX; // L: 1039 - var5 = (HealthBar.regions[var47] & 255) * 64 - Messages.baseY; // L: 1040 - var48 = Messages.regionLandArchives[var47]; // L: 1041 - if (var48 != null) { // L: 1042 - WorldMapIcon_1.playPcmPlayers(); // L: 1043 - var7 = MusicPatchNode2.field2827 * 8 - 48; // L: 1044 - var69 = class11.field112 * 8 - 48; // L: 1045 - CollisionMap[] var70 = collisionMaps; // L: 1046 - var10 = 0; - - label1426: - while (true) { - if (var10 >= 4) { - Buffer var49 = new Buffer(var48); // L: 1055 - var11 = 0; - - while (true) { - if (var11 >= 4) { - break label1426; - } - - for (var12 = 0; var12 < 64; ++var12) { // L: 1057 - for (var71 = 0; var71 < 64; ++var71) { // L: 1058 - AbstractWorldMapData.loadTerrain(var49, var11, var4 + var12, var5 + var71, var7, var69, 0); // L: 1059 - } - } - - ++var11; // L: 1056 - } - } - - for (var11 = 0; var11 < 64; ++var11) { // L: 1049 - for (var12 = 0; var12 < 64; ++var12) { // L: 1050 - if (var11 + var4 > 0 && var4 + var11 < 103 && var12 + var5 > 0 && var5 + var12 < 103) { // L: 1051 - var10000 = var70[var10].flags[var11 + var4]; - var10000[var5 + var12] &= -16777217; - } - } - } - - ++var10; // L: 1048 - } - } - - ++var47; // L: 1038 - } - } - - int var24; - int var25; - int var26; - int var27; - int var28; - int var29; - int var30; - int var33; - int var34; - int var35; - int var36; - int var37; - int var39; - int var40; - int var41; - int var54; - int var58; - if (isInInstance) { // L: 1117 - var47 = 0; - - label1362: - while (true) { - if (var47 >= 4) { - for (var47 = 0; var47 < 13; ++var47) { // L: 1160 - for (var4 = 0; var4 < 13; ++var4) { // L: 1161 - var5 = instanceChunkTemplates[0][var47][var4]; // L: 1162 - if (var5 == -1) { // L: 1163 - FileSystem.method2542(var47 * 8, var4 * 8, 8, 8); // L: 1164 - } - } - } - - class9.method97(true); // L: 1168 - var47 = 0; - - while (true) { - if (var47 >= 4) { - break label1362; - } - - WorldMapIcon_1.playPcmPlayers(); // L: 1170 - - for (var4 = 0; var4 < 13; ++var4) { // L: 1171 - label1285: - for (var5 = 0; var5 < 13; ++var5) { // L: 1172 - var6 = instanceChunkTemplates[var47][var4][var5]; // L: 1173 - if (var6 != -1) { // L: 1174 - var7 = var6 >> 24 & 3; // L: 1175 - var69 = var6 >> 1 & 3; // L: 1176 - var54 = var6 >> 14 & 1023; // L: 1177 - var10 = var6 >> 3 & 2047; // L: 1178 - var11 = (var54 / 8 << 8) + var10 / 8; // L: 1179 - - for (var12 = 0; var12 < HealthBar.regions.length; ++var12) { // L: 1180 - if (HealthBar.regions[var12] == var11 && class159.regionMapArchives[var12] != null) { // L: 1181 - byte[] var55 = class159.regionMapArchives[var12]; // L: 1182 - var14 = var4 * 8; // L: 1183 - var15 = var5 * 8; // L: 1184 - var16 = (var54 & 7) * 8; // L: 1185 - var17 = (var10 & 7) * 8; // L: 1186 - Scene var56 = class5.scene; // L: 1187 - CollisionMap[] var57 = collisionMaps; // L: 1188 - Buffer var72 = new Buffer(var55); // L: 1190 - var21 = -1; // L: 1191 - - while (true) { - var22 = var72.method6462(); // L: 1193 - if (var22 == 0) { // L: 1194 - continue label1285; - } - - var21 += var22; // L: 1195 - var58 = 0; // L: 1196 - - while (true) { - var24 = var72.readUShortSmart(); // L: 1198 - if (var24 == 0) { // L: 1199 - break; - } - - var58 += var24 - 1; // L: 1200 - var25 = var58 & 63; // L: 1201 - var26 = var58 >> 6 & 63; // L: 1202 - var27 = var58 >> 12; // L: 1203 - var28 = var72.readUnsignedByte(); // L: 1204 - var29 = var28 >> 2; // L: 1205 - var30 = var28 & 3; // L: 1206 - if (var27 == var7 && var26 >= var16 && var26 < var16 + 8 && var25 >= var17 && var25 < var17 + 8) { // L: 1207 - ObjectComposition var31 = AttackOption.getObjectDefinition(var21); // L: 1208 - var34 = var26 & 7; // L: 1211 - var35 = var25 & 7; // L: 1212 - var37 = var31.sizeX; // L: 1214 - int var38 = var31.sizeY; // L: 1215 - if ((var30 & 1) == 1) { // L: 1217 - var39 = var37; // L: 1218 - var37 = var38; // L: 1219 - var38 = var39; // L: 1220 - } - - var36 = var69 & 3; // L: 1222 - if (var36 == 0) { // L: 1223 - var33 = var34; // L: 1224 - } else if (var36 == 1) { // L: 1227 - var33 = var35; // L: 1228 - } else if (var36 == 2) { // L: 1231 - var33 = 7 - var34 - (var37 - 1); // L: 1232 - } else { - var33 = 7 - var35 - (var38 - 1); // L: 1235 - } - - var39 = var14 + var33; // L: 1237 - var40 = var15 + GameEngine.method674(var26 & 7, var25 & 7, var69, var31.sizeX, var31.sizeY, var30); // L: 1238 - if (var39 > 0 && var40 > 0 && var39 < 103 && var40 < 103) { // L: 1239 - var41 = var47; // L: 1240 - if ((Tiles.Tiles_renderFlags[1][var39][var40] & 2) == 2) { // L: 1241 - var41 = var47 - 1; - } - - CollisionMap var42 = null; // L: 1242 - if (var41 >= 0) { // L: 1243 - var42 = var57[var41]; - } - - ClanChat.method5541(var47, var39, var40, var21, var69 + var30 & 3, var29, var56, var42); // L: 1244 - } - } - } - } - } - } - } - } - } - - ++var47; // L: 1169 - } - } - - WorldMapIcon_1.playPcmPlayers(); // L: 1119 - - for (var4 = 0; var4 < 13; ++var4) { // L: 1120 - for (var5 = 0; var5 < 13; ++var5) { // L: 1121 - boolean var68 = false; // L: 1122 - var7 = instanceChunkTemplates[var47][var4][var5]; // L: 1123 - if (var7 != -1) { // L: 1124 - var69 = var7 >> 24 & 3; // L: 1125 - var54 = var7 >> 1 & 3; // L: 1126 - var10 = var7 >> 14 & 1023; // L: 1127 - var11 = var7 >> 3 & 2047; // L: 1128 - var12 = (var10 / 8 << 8) + var11 / 8; // L: 1129 - - for (var71 = 0; var71 < HealthBar.regions.length; ++var71) { // L: 1130 - if (HealthBar.regions[var71] == var12 && Messages.regionLandArchives[var71] != null) { // L: 1131 - class29.method355(Messages.regionLandArchives[var71], var47, var4 * 8, var5 * 8, var69, (var10 & 7) * 8, (var11 & 7) * 8, var54, collisionMaps); // L: 1132 - var68 = true; // L: 1133 - break; // L: 1134 - } - } - } - - if (!var68) { // L: 1138 - var69 = var47; // L: 1139 - var54 = var4 * 8; // L: 1140 - var10 = var5 * 8; // L: 1141 - - for (var11 = 0; var11 < 8; ++var11) { // L: 1143 - for (var12 = 0; var12 < 8; ++var12) { // L: 1144 - Tiles.Tiles_heights[var69][var11 + var54][var10 + var12] = 0; - } - } - - if (var54 > 0) { // L: 1146 - for (var11 = 1; var11 < 8; ++var11) { // L: 1147 - Tiles.Tiles_heights[var69][var54][var11 + var10] = Tiles.Tiles_heights[var69][var54 - 1][var11 + var10]; - } - } - - if (var10 > 0) { // L: 1149 - for (var11 = 1; var11 < 8; ++var11) { // L: 1150 - Tiles.Tiles_heights[var69][var11 + var54][var10] = Tiles.Tiles_heights[var69][var54 + var11][var10 - 1]; - } - } - - if (var54 > 0 && Tiles.Tiles_heights[var69][var54 - 1][var10] != 0) { // L: 1152 - Tiles.Tiles_heights[var69][var54][var10] = Tiles.Tiles_heights[var69][var54 - 1][var10]; - } else if (var10 > 0 && Tiles.Tiles_heights[var69][var54][var10 - 1] != 0) { // L: 1153 - Tiles.Tiles_heights[var69][var54][var10] = Tiles.Tiles_heights[var69][var54][var10 - 1]; - } else if (var54 > 0 && var10 > 0 && Tiles.Tiles_heights[var69][var54 - 1][var10 - 1] != 0) { // L: 1154 - Tiles.Tiles_heights[var69][var54][var10] = Tiles.Tiles_heights[var69][var54 - 1][var10 - 1]; - } - } - } - } - - ++var47; // L: 1118 - } - } - - class9.method97(true); // L: 1258 - WorldMapIcon_1.playPcmPlayers(); // L: 1259 - Scene var67 = class5.scene; // L: 1260 - CollisionMap[] var81 = collisionMaps; // L: 1261 - - for (var5 = 0; var5 < 4; ++var5) { // L: 1263 - for (var6 = 0; var6 < 104; ++var6) { // L: 1264 - for (var7 = 0; var7 < 104; ++var7) { // L: 1265 - if ((Tiles.Tiles_renderFlags[var5][var6][var7] & 1) == 1) { // L: 1266 - var69 = var5; // L: 1267 - if ((Tiles.Tiles_renderFlags[1][var6][var7] & 2) == 2) { // L: 1268 - var69 = var5 - 1; - } - - if (var69 >= 0) { // L: 1269 - var81[var69].setBlockedByFloor(var6, var7); - } - } - } - } - } - - Tiles.field1092 += (int)(Math.random() * 5.0D) - 2; // L: 1274 - if (Tiles.field1092 < -8) { // L: 1275 - Tiles.field1092 = -8; - } - - if (Tiles.field1092 > 8) { // L: 1276 - Tiles.field1092 = 8; - } - - Tiles.field1101 += (int)(Math.random() * 5.0D) - 2; // L: 1277 - if (Tiles.field1101 < -16) { // L: 1278 - Tiles.field1101 = -16; - } - - if (Tiles.field1101 > 16) { // L: 1279 - Tiles.field1101 = 16; - } - - for (var5 = 0; var5 < 4; ++var5) { // L: 1280 - byte[][] var78 = Tiles.field1090[var5]; // L: 1281 - var12 = (int)Math.sqrt(5100.0D); // L: 1287 - var71 = var12 * 768 >> 8; // L: 1288 - - for (var14 = 1; var14 < 103; ++var14) { // L: 1289 - for (var15 = 1; var15 < 103; ++var15) { // L: 1290 - var16 = Tiles.Tiles_heights[var5][var15 + 1][var14] - Tiles.Tiles_heights[var5][var15 - 1][var14]; // L: 1291 - var17 = Tiles.Tiles_heights[var5][var15][var14 + 1] - Tiles.Tiles_heights[var5][var15][var14 - 1]; // L: 1292 - var18 = (int)Math.sqrt((double)(var16 * var16 + var17 * var17 + 65536)); // L: 1293 - var19 = (var16 << 8) / var18; // L: 1294 - var53 = 65536 / var18; // L: 1295 - var21 = (var17 << 8) / var18; // L: 1296 - var22 = (var19 * -50 + var21 * -50 + var53 * -10) / var71 + 96; // L: 1297 - var58 = (var78[var15][var14 + 1] >> 3) + (var78[var15 - 1][var14] >> 2) + (var78[var15][var14 - 1] >> 2) + (var78[var15 + 1][var14] >> 3) + (var78[var15][var14] >> 1); // L: 1298 - StructComposition.field1730[var15][var14] = var22 - var58; // L: 1299 - } - } - - for (var14 = 0; var14 < 104; ++var14) { // L: 1302 - Tiles.Tiles_hue[var14] = 0; // L: 1303 - class280.Tiles_saturation[var14] = 0; // L: 1304 - Tiles.Tiles_lightness[var14] = 0; // L: 1305 - class20.Tiles_hueMultiplier[var14] = 0; // L: 1306 - AbstractByteArrayCopier.field3115[var14] = 0; // L: 1307 - } - - for (var14 = -5; var14 < 109; ++var14) { // L: 1309 - for (var15 = 0; var15 < 104; ++var15) { // L: 1310 - var16 = var14 + 5; // L: 1311 - int var10002; - if (var16 >= 0 && var16 < 104) { // L: 1312 - var17 = Tiles.field1097[var5][var16][var15] & 255; // L: 1313 - if (var17 > 0) { // L: 1314 - var19 = var17 - 1; // L: 1316 - FloorUnderlayDefinition var73 = (FloorUnderlayDefinition)FloorUnderlayDefinition.FloorUnderlayDefinition_cached.get((long)var19); // L: 1318 - FloorUnderlayDefinition var82; - if (var73 != null) { // L: 1319 - var82 = var73; // L: 1320 - } else { - byte[] var59 = FloorUnderlayDefinition.FloorUnderlayDefinition_archive.takeFile(1, var19); // L: 1323 - var73 = new FloorUnderlayDefinition(); // L: 1324 - if (var59 != null) { // L: 1325 - var73.decode(new Buffer(var59), var19); - } - - var73.postDecode(); // L: 1326 - FloorUnderlayDefinition.FloorUnderlayDefinition_cached.put(var73, (long)var19); // L: 1327 - var82 = var73; // L: 1328 - } - - var10000 = Tiles.Tiles_hue; // L: 1331 - var10000[var15] += var82.hue; - var10000 = class280.Tiles_saturation; // L: 1332 - var10000[var15] += var82.saturation; - var10000 = Tiles.Tiles_lightness; // L: 1333 - var10000[var15] += var82.lightness; - var10000 = class20.Tiles_hueMultiplier; // L: 1334 - var10000[var15] += var82.hueMultiplier; - var10002 = AbstractByteArrayCopier.field3115[var15]++; // L: 1335 - } - } - - var17 = var14 - 5; // L: 1338 - if (var17 >= 0 && var17 < 104) { // L: 1339 - var18 = Tiles.field1097[var5][var17][var15] & 255; // L: 1340 - if (var18 > 0) { // L: 1341 - var53 = var18 - 1; // L: 1343 - FloorUnderlayDefinition var84 = (FloorUnderlayDefinition)FloorUnderlayDefinition.FloorUnderlayDefinition_cached.get((long)var53); // L: 1345 - FloorUnderlayDefinition var83; - if (var84 != null) { // L: 1346 - var83 = var84; // L: 1347 - } else { - byte[] var60 = FloorUnderlayDefinition.FloorUnderlayDefinition_archive.takeFile(1, var53); // L: 1350 - var84 = new FloorUnderlayDefinition(); // L: 1351 - if (var60 != null) { // L: 1352 - var84.decode(new Buffer(var60), var53); - } - - var84.postDecode(); // L: 1353 - FloorUnderlayDefinition.FloorUnderlayDefinition_cached.put(var84, (long)var53); // L: 1354 - var83 = var84; // L: 1355 - } - - var10000 = Tiles.Tiles_hue; // L: 1358 - var10000[var15] -= var83.hue; - var10000 = class280.Tiles_saturation; // L: 1359 - var10000[var15] -= var83.saturation; - var10000 = Tiles.Tiles_lightness; // L: 1360 - var10000[var15] -= var83.lightness; - var10000 = class20.Tiles_hueMultiplier; // L: 1361 - var10000[var15] -= var83.hueMultiplier; - var10002 = AbstractByteArrayCopier.field3115[var15]--; // L: 1362 - } - } - } - - if (var14 >= 1 && var14 < 103) { // L: 1366 - var15 = 0; // L: 1367 - var16 = 0; // L: 1368 - var17 = 0; // L: 1369 - var18 = 0; // L: 1370 - var19 = 0; // L: 1371 - - for (var53 = -5; var53 < 109; ++var53) { // L: 1372 - var21 = var53 + 5; // L: 1373 - if (var21 >= 0 && var21 < 104) { // L: 1374 - var15 += Tiles.Tiles_hue[var21]; // L: 1375 - var16 += class280.Tiles_saturation[var21]; // L: 1376 - var17 += Tiles.Tiles_lightness[var21]; // L: 1377 - var18 += class20.Tiles_hueMultiplier[var21]; // L: 1378 - var19 += AbstractByteArrayCopier.field3115[var21]; // L: 1379 - } - - var22 = var53 - 5; // L: 1381 - if (var22 >= 0 && var22 < 104) { // L: 1382 - var15 -= Tiles.Tiles_hue[var22]; // L: 1383 - var16 -= class280.Tiles_saturation[var22]; // L: 1384 - var17 -= Tiles.Tiles_lightness[var22]; // L: 1385 - var18 -= class20.Tiles_hueMultiplier[var22]; // L: 1386 - var19 -= AbstractByteArrayCopier.field3115[var22]; // L: 1387 - } - - if (var53 >= 1 && var53 < 103 && (!isLowDetail || (Tiles.Tiles_renderFlags[0][var14][var53] & 2) != 0 || (Tiles.Tiles_renderFlags[var5][var14][var53] & 16) == 0)) { // L: 1389 1390 1391 1392 - if (var5 < Tiles.Tiles_minPlane) { // L: 1395 - Tiles.Tiles_minPlane = var5; - } - - var58 = Tiles.field1097[var5][var14][var53] & 255; // L: 1396 - var24 = class9.field71[var5][var14][var53] & 255; // L: 1397 - if (var58 > 0 || var24 > 0) { // L: 1398 - var25 = Tiles.Tiles_heights[var5][var14][var53]; // L: 1399 - var26 = Tiles.Tiles_heights[var5][var14 + 1][var53]; // L: 1400 - var27 = Tiles.Tiles_heights[var5][var14 + 1][var53 + 1]; // L: 1401 - var28 = Tiles.Tiles_heights[var5][var14][var53 + 1]; // L: 1402 - var29 = StructComposition.field1730[var14][var53]; // L: 1403 - var30 = StructComposition.field1730[var14 + 1][var53]; // L: 1404 - int var61 = StructComposition.field1730[var14 + 1][var53 + 1]; // L: 1405 - int var32 = StructComposition.field1730[var14][var53 + 1]; // L: 1406 - var33 = -1; // L: 1407 - var34 = -1; // L: 1408 - if (var58 > 0) { // L: 1409 - var35 = var15 * 256 / var18; // L: 1410 - var36 = var16 / var19; // L: 1411 - var37 = var17 / var19; // L: 1412 - var33 = Message.hslToRgb(var35, var36, var37); // L: 1413 - var35 = var35 + Tiles.field1092 & 255; // L: 1414 - var37 += Tiles.field1101; // L: 1415 - if (var37 < 0) { // L: 1416 - var37 = 0; - } else if (var37 > 255) { // L: 1417 - var37 = 255; - } - - var34 = Message.hslToRgb(var35, var36, var37); // L: 1418 - } - - if (var5 > 0) { // L: 1420 - boolean var75 = true; // L: 1421 - if (var58 == 0 && Tiles.field1088[var5][var14][var53] != 0) { // L: 1422 - var75 = false; - } - - if (var24 > 0 && !WorldMapSection0.method3534(var24 - 1).hideUnderlay) { // L: 1423 - var75 = false; - } - - if (var75 && var26 == var25 && var25 == var27 && var28 == var25) { // L: 1424 1425 - var10000 = Tiles.field1105[var5][var14]; - var10000[var53] |= 2340; - } - } - - var35 = 0; // L: 1428 - if (var34 != -1) { // L: 1429 - var35 = Rasterizer3D.Rasterizer3D_colorPalette[GrandExchangeOfferNameComparator.method4986(var34, 96)]; - } - - if (var24 == 0) { // L: 1430 - var67.addTile(var5, var14, var53, 0, 0, -1, var25, var26, var27, var28, GrandExchangeOfferNameComparator.method4986(var33, var29), GrandExchangeOfferNameComparator.method4986(var33, var30), GrandExchangeOfferNameComparator.method4986(var33, var61), GrandExchangeOfferNameComparator.method4986(var33, var32), 0, 0, 0, 0, var35, 0); // L: 1431 - } else { - var36 = Tiles.field1088[var5][var14][var53] + 1; // L: 1434 - byte var76 = Tiles.field1086[var5][var14][var53]; // L: 1435 - FloorOverlayDefinition var62 = WorldMapSection0.method3534(var24 - 1); // L: 1436 - var39 = var62.texture; // L: 1437 - int var43; - int var63; - if (var39 >= 0) { // L: 1440 - var41 = Rasterizer3D.Rasterizer3D_textureLoader.getAverageTextureRGB(var39); // L: 1441 - var40 = -1; // L: 1442 - } else if (var62.primaryRgb == 16711935) { // L: 1445 - var40 = -2; // L: 1446 - var39 = -1; // L: 1447 - var41 = -2; // L: 1448 - } else { - var40 = Message.hslToRgb(var62.hue, var62.saturation, var62.lightness); // L: 1451 - var63 = var62.hue + Tiles.field1092 & 255; // L: 1452 - var43 = var62.lightness + Tiles.field1101; // L: 1453 - if (var43 < 0) { // L: 1454 - var43 = 0; - } else if (var43 > 255) { // L: 1455 - var43 = 255; - } - - var41 = Message.hslToRgb(var63, var62.saturation, var43); // L: 1456 - } - - var63 = 0; // L: 1459 - if (var41 != -2) { // L: 1460 - var63 = Rasterizer3D.Rasterizer3D_colorPalette[class43.method487(var41, 96)]; - } - - if (var62.secondaryRgb != -1) { // L: 1461 - var43 = var62.secondaryHue + Tiles.field1092 & 255; // L: 1462 - int var44 = var62.secondaryLightness + Tiles.field1101; // L: 1463 - if (var44 < 0) { // L: 1464 - var44 = 0; - } else if (var44 > 255) { // L: 1465 - var44 = 255; - } - - var41 = Message.hslToRgb(var43, var62.secondarySaturation, var44); // L: 1466 - var63 = Rasterizer3D.Rasterizer3D_colorPalette[class43.method487(var41, 96)]; // L: 1467 - } - - var67.addTile(var5, var14, var53, var36, var76, var39, var25, var26, var27, var28, GrandExchangeOfferNameComparator.method4986(var33, var29), GrandExchangeOfferNameComparator.method4986(var33, var30), GrandExchangeOfferNameComparator.method4986(var33, var61), GrandExchangeOfferNameComparator.method4986(var33, var32), class43.method487(var40, var29), class43.method487(var40, var30), class43.method487(var40, var61), class43.method487(var40, var32), var35, var63); // L: 1469 - } - } - } - } - } - } - - for (var14 = 1; var14 < 103; ++var14) { // L: 1476 - for (var15 = 1; var15 < 103; ++var15) { // L: 1477 - if ((Tiles.Tiles_renderFlags[var5][var15][var14] & 8) != 0) { // L: 1484 - var53 = 0; // L: 1485 - } else if (var5 > 0 && (Tiles.Tiles_renderFlags[1][var15][var14] & 2) != 0) { // L: 1488 - var53 = var5 - 1; // L: 1489 - } else { - var53 = var5; // L: 1492 - } - - var67.setTileMinPlane(var5, var15, var14, var53); // L: 1494 - } - } - - Tiles.field1097[var5] = null; // L: 1497 - class9.field71[var5] = null; // L: 1498 - Tiles.field1088[var5] = null; // L: 1499 - Tiles.field1086[var5] = null; // L: 1500 - Tiles.field1090[var5] = null; // L: 1501 - } - - var67.method3932(-50, -10, -50); // L: 1503 - - for (var5 = 0; var5 < 104; ++var5) { // L: 1504 - for (var6 = 0; var6 < 104; ++var6) { // L: 1505 - if ((Tiles.Tiles_renderFlags[1][var5][var6] & 2) == 2) { // L: 1506 - var67.setLinkBelow(var5, var6); - } - } - } - - var5 = 1; // L: 1509 - var6 = 2; // L: 1510 - var7 = 4; // L: 1511 - - for (var69 = 0; var69 < 4; ++var69) { // L: 1512 - if (var69 > 0) { // L: 1513 - var5 <<= 3; // L: 1514 - var6 <<= 3; // L: 1515 - var7 <<= 3; // L: 1516 - } - - for (var54 = 0; var54 <= var69; ++var54) { // L: 1518 - for (var10 = 0; var10 <= 104; ++var10) { // L: 1519 - for (var11 = 0; var11 <= 104; ++var11) { // L: 1520 - short var74; - if ((Tiles.field1105[var54][var11][var10] & var5) != 0) { // L: 1521 - var12 = var10; // L: 1522 - var71 = var10; // L: 1523 - var14 = var54; // L: 1524 - - for (var15 = var54; var12 > 0 && (Tiles.field1105[var54][var11][var12 - 1] & var5) != 0; --var12) { // L: 1525 1526 - } - - while (var71 < 104 && (Tiles.field1105[var54][var11][var71 + 1] & var5) != 0) { // L: 1527 - ++var71; - } - - label1004: - while (var14 > 0) { // L: 1528 - for (var16 = var12; var16 <= var71; ++var16) { // L: 1529 - if ((Tiles.field1105[var14 - 1][var11][var16] & var5) == 0) { - break label1004; - } - } - - --var14; // L: 1530 - } - - label993: - while (var15 < var69) { // L: 1532 - for (var16 = var12; var16 <= var71; ++var16) { // L: 1533 - if ((Tiles.field1105[var15 + 1][var11][var16] & var5) == 0) { - break label993; - } - } - - ++var15; // L: 1534 - } - - var16 = (var15 + 1 - var14) * (var71 - var12 + 1); // L: 1536 - if (var16 >= 8) { // L: 1537 - var74 = 240; // L: 1538 - var18 = Tiles.Tiles_heights[var15][var11][var12] - var74; // L: 1539 - var19 = Tiles.Tiles_heights[var14][var11][var12]; // L: 1540 - Scene.Scene_addOccluder(var69, 1, var11 * 128, var11 * 128, var12 * 128, var71 * 128 + 128, var18, var19); // L: 1541 - - for (var53 = var14; var53 <= var15; ++var53) { // L: 1542 - for (var21 = var12; var21 <= var71; ++var21) { // L: 1543 - var10000 = Tiles.field1105[var53][var11]; - var10000[var21] &= ~var5; - } - } - } - } - - if ((Tiles.field1105[var54][var11][var10] & var6) != 0) { // L: 1547 - var12 = var11; // L: 1548 - var71 = var11; // L: 1549 - var14 = var54; // L: 1550 - - for (var15 = var54; var12 > 0 && (Tiles.field1105[var54][var12 - 1][var10] & var6) != 0; --var12) { // L: 1551 1552 - } - - while (var71 < 104 && (Tiles.field1105[var54][var71 + 1][var10] & var6) != 0) { // L: 1553 - ++var71; - } - - label1057: - while (var14 > 0) { // L: 1554 - for (var16 = var12; var16 <= var71; ++var16) { // L: 1555 - if ((Tiles.field1105[var14 - 1][var16][var10] & var6) == 0) { - break label1057; - } - } - - --var14; // L: 1556 - } - - label1046: - while (var15 < var69) { // L: 1558 - for (var16 = var12; var16 <= var71; ++var16) { // L: 1559 - if ((Tiles.field1105[var15 + 1][var16][var10] & var6) == 0) { - break label1046; - } - } - - ++var15; // L: 1560 - } - - var16 = (var71 - var12 + 1) * (var15 + 1 - var14); // L: 1562 - if (var16 >= 8) { // L: 1563 - var74 = 240; // L: 1564 - var18 = Tiles.Tiles_heights[var15][var12][var10] - var74; // L: 1565 - var19 = Tiles.Tiles_heights[var14][var12][var10]; // L: 1566 - Scene.Scene_addOccluder(var69, 2, var12 * 128, var71 * 128 + 128, var10 * 128, var10 * 128, var18, var19); // L: 1567 - - for (var53 = var14; var53 <= var15; ++var53) { // L: 1568 - for (var21 = var12; var21 <= var71; ++var21) { // L: 1569 - var10000 = Tiles.field1105[var53][var21]; - var10000[var10] &= ~var6; - } - } - } - } - - if ((Tiles.field1105[var54][var11][var10] & var7) != 0) { // L: 1573 - var12 = var11; // L: 1574 - var71 = var11; // L: 1575 - var14 = var10; // L: 1576 - - for (var15 = var10; var14 > 0 && (Tiles.field1105[var54][var11][var14 - 1] & var7) != 0; --var14) { // L: 1577 1578 - } - - while (var15 < 104 && (Tiles.field1105[var54][var11][var15 + 1] & var7) != 0) { // L: 1579 - ++var15; - } - - label1110: - while (var12 > 0) { // L: 1580 - for (var16 = var14; var16 <= var15; ++var16) { // L: 1581 - if ((Tiles.field1105[var54][var12 - 1][var16] & var7) == 0) { - break label1110; - } - } - - --var12; // L: 1582 - } - - label1099: - while (var71 < 104) { // L: 1584 - for (var16 = var14; var16 <= var15; ++var16) { // L: 1585 - if ((Tiles.field1105[var54][var71 + 1][var16] & var7) == 0) { - break label1099; - } - } - - ++var71; // L: 1586 - } - - if ((var15 - var14 + 1) * (var71 - var12 + 1) >= 4) { // L: 1588 - var16 = Tiles.Tiles_heights[var54][var12][var14]; // L: 1589 - Scene.Scene_addOccluder(var69, 4, var12 * 128, var71 * 128 + 128, var14 * 128, var15 * 128 + 128, var16, var16); // L: 1590 - - for (var17 = var12; var17 <= var71; ++var17) { // L: 1591 - for (var18 = var14; var18 <= var15; ++var18) { // L: 1592 - var10000 = Tiles.field1105[var54][var17]; - var10000[var18] &= ~var7; - } - } - } - } - } - } - } - } - - class9.method97(true); // L: 1601 - var5 = Tiles.Tiles_minPlane; // L: 1602 - if (var5 > ParamComposition.Client_plane) { // L: 1603 - var5 = ParamComposition.Client_plane; - } - - if (var5 < ParamComposition.Client_plane - 1) { // L: 1604 - var5 = ParamComposition.Client_plane - 1; - } - - if (isLowDetail) { // L: 1605 - class5.scene.init(Tiles.Tiles_minPlane); - } else { - class5.scene.init(0); // L: 1606 - } - - for (var6 = 0; var6 < 104; ++var6) { // L: 1607 - for (var7 = 0; var7 < 104; ++var7) { // L: 1608 - Varcs.updateItemPile(var6, var7); // L: 1609 - } - } - - WorldMapIcon_1.playPcmPlayers(); // L: 1612 - - for (PendingSpawn var79 = (PendingSpawn)pendingSpawns.last(); var79 != null; var79 = (PendingSpawn)pendingSpawns.previous()) { // L: 1614 1615 1621 - if (var79.hitpoints == -1) { // L: 1616 - var79.delay = 0; // L: 1617 - WorldMapData_0.method3145(var79); // L: 1618 + if (KeyHandler.field288 >= 0) { // L: 948 + while (KeyHandler.field296 != KeyHandler.field288) { // L: 953 + var5 = KeyHandler.field287[KeyHandler.field296]; // L: 954 + KeyHandler.field296 = KeyHandler.field296 + 1 & 127; // L: 955 + if (var5 < 0) { // L: 956 + KeyHandler.KeyHandler_pressedKeys[~var5] = false; } else { - var79.remove(); // L: 1620 - } - } - - ObjectComposition.ObjectDefinition_cachedModelData.clear(); // L: 1624 - PacketBufferNode var80; - if (class303.client.hasFrame()) { // L: 1625 - var80 = HealthBarDefinition.getPacketBufferNode(ClientPacket.field2637, packetWriter.isaacCipher); // L: 1627 - var80.packetBuffer.writeInt(1057001181); // L: 1628 - packetWriter.addNode(var80); // L: 1629 - } - - if (!isInInstance) { // L: 1631 - var6 = (MusicPatchNode2.field2827 - 6) / 8; // L: 1632 - var7 = (MusicPatchNode2.field2827 + 6) / 8; // L: 1633 - var69 = (class11.field112 - 6) / 8; // L: 1634 - var54 = (class11.field112 + 6) / 8; // L: 1635 - - for (var10 = var6 - 1; var10 <= var7 + 1; ++var10) { // L: 1636 - for (var11 = var69 - 1; var11 <= var54 + 1; ++var11) { // L: 1637 - if (var10 < var6 || var10 > var7 || var11 < var69 || var11 > var54) { // L: 1638 - WorldMapSection0.archive5.loadRegionFromName("m" + var10 + "_" + var11); // L: 1639 - WorldMapSection0.archive5.loadRegionFromName("l" + var10 + "_" + var11); // L: 1640 - } + if (!KeyHandler.KeyHandler_pressedKeys[var5] && KeyHandler.field292 < KeyHandler.field274.length - 1) { // L: 958 + KeyHandler.field274[++KeyHandler.field292 - 1] = var5; // L: 959 } + + KeyHandler.KeyHandler_pressedKeys[var5] = true; // L: 961 } } - - updateGameState(30); // L: 1644 - WorldMapIcon_1.playPcmPlayers(); // L: 1645 - class14.method224(); // L: 1646 - var80 = HealthBarDefinition.getPacketBufferNode(ClientPacket.field2662, packetWriter.isaacCipher); // L: 1647 - packetWriter.addNode(var80); // L: 1648 - WorldMapRectangle.clock.mark(); // L: 1650 - - for (var7 = 0; var7 < 32; ++var7) { // L: 1651 - GameEngine.graphicsTickTimes[var7] = 0L; + } else { + for (var5 = 0; var5 < 112; ++var5) { // L: 949 + KeyHandler.KeyHandler_pressedKeys[var5] = false; } - for (var7 = 0; var7 < 32; ++var7) { // L: 1652 - GameEngine.clientTickTimes[var7] = 0L; - } - - GameEngine.gameCyclesToDo = 0; // L: 1653 + KeyHandler.field288 = KeyHandler.field296; // L: 950 } + + if (KeyHandler.field292 > 0) { // L: 965 + KeyHandler.KeyHandler_idleCycles = 0; + } + + KeyHandler.field295 = KeyHandler.field294; // L: 966 } + + Player.method2166(); // L: 969 + int var6; + if (MidiPcmStream.mouseWheel != null) { // L: 970 + var6 = MidiPcmStream.mouseWheel.useRotation(); // L: 971 + mouseWheelRotation = var6; // L: 972 + } + + if (gameState == 0) { // L: 974 + MilliClock.load(); // L: 975 + GameEngine.clock.mark(); // L: 977 + + for (var6 = 0; var6 < 32; ++var6) { // L: 978 + GameEngine.graphicsTickTimes[var6] = 0L; + } + + for (var6 = 0; var6 < 32; ++var6) { // L: 979 + GameEngine.clientTickTimes[var6] = 0L; + } + + class260.gameCyclesToDo = 0; // L: 980 + } else if (gameState == 5) { // L: 983 + WorldMapManager.doCycleTitle(this); // L: 984 + MilliClock.load(); // L: 985 + GameEngine.clock.mark(); // L: 987 + + for (var6 = 0; var6 < 32; ++var6) { // L: 988 + GameEngine.graphicsTickTimes[var6] = 0L; + } + + for (var6 = 0; var6 < 32; ++var6) { // L: 989 + GameEngine.clientTickTimes[var6] = 0L; + } + + class260.gameCyclesToDo = 0; // L: 990 + } else if (gameState != 10 && gameState != 11) { // L: 993 + if (gameState == 20) { // L: 994 + WorldMapManager.doCycleTitle(this); // L: 995 + this.doCycleLoggedOut(); // L: 996 + } else if (gameState == 25) { // L: 998 + WorldMapAreaData.method3708(); + } + } else { + WorldMapManager.doCycleTitle(this); + } + + if (gameState == 30) { // L: 999 + this.doCycleLoggedIn(); + } else if (gameState == 40 || gameState == 45) { // L: 1000 + this.doCycleLoggedOut(); + } + + return; // L: 1001 } - } else { - class179.doCycleTitle(this); + + var1.archive.load(var1.archiveDisk, (int)var1.key, var1.data, false); // L: 938 } + } - if (gameState == 30) { // L: 1656 - this.doCycleLoggedIn(); - } else if (gameState == 40 || gameState == 45) { // L: 1657 - this.doCycleLoggedOut(); - } - - } // L: 1658 - - @ObfuscatedName("ak") + @ObfuscatedName("ad") @ObfuscatedSignature( - descriptor = "(ZI)V", - garbageValue = "1176468254" + descriptor = "(ZS)V", + garbageValue = "9311" ) @Export("draw") protected final void draw(boolean var1) { - boolean var2 = WorldMapID.method3587(); // L: 1661 - if (var2 && field866 && WorldMapAreaData.pcmPlayer0 != null) { // L: 1662 1663 - WorldMapAreaData.pcmPlayer0.tryDiscard(); + boolean var2; + label168: { + try { + if (class232.musicPlayerStatus == 2) { // L: 1007 + if (class2.musicTrack == null) { // L: 1008 + class2.musicTrack = MusicTrack.readTrack(ModelData0.musicTrackArchive, class32.musicTrackGroupId, class18.musicTrackFileId); // L: 1009 + if (class2.musicTrack == null) { // L: 1010 + var2 = false; // L: 1011 + break label168; + } + } + + if (Messages.soundCache == null) { // L: 1015 + Messages.soundCache = new SoundCache(WorldMapElement.soundEffectsArchive, class232.musicSamplesArchive); + } + + if (class124.midiPcmStream.loadMusicTrack(class2.musicTrack, class232.musicPatchesArchive, Messages.soundCache, 22050)) { // L: 1016 + class124.midiPcmStream.clearAll(); // L: 1017 + class124.midiPcmStream.setPcmStreamVolume(class232.musicTrackVolume); // L: 1018 + class124.midiPcmStream.setMusicTrack(class2.musicTrack, class232.musicTrackBoolean); // L: 1019 + class232.musicPlayerStatus = 0; // L: 1020 + class2.musicTrack = null; // L: 1021 + Messages.soundCache = null; // L: 1022 + ModelData0.musicTrackArchive = null; // L: 1023 + var2 = true; // L: 1024 + break label168; + } + } + } catch (Exception var6) { // L: 1029 + var6.printStackTrace(); // L: 1030 + class124.midiPcmStream.clear(); // L: 1031 + class232.musicPlayerStatus = 0; // L: 1032 + class2.musicTrack = null; // L: 1033 + Messages.soundCache = null; // L: 1034 + ModelData0.musicTrackArchive = null; // L: 1035 + } + + var2 = false; // L: 1037 } - if ((gameState == 10 || gameState == 20 || gameState == 30) && field833 != 0L && Archive.currentTimeMillis() > field833) { // L: 1665 1666 - class374.setWindowedMode(HitSplatDefinition.getWindowedMode()); // L: 1667 + if (var2 && field881 && DesktopPlatformInfoProvider.pcmPlayer0 != null) { // L: 1040 1041 + DesktopPlatformInfoProvider.pcmPlayer0.tryDiscard(); } - int var3; - if (var1) { // L: 1670 - for (var3 = 0; var3 < 100; ++var3) { // L: 1671 - field825[var3] = true; + if ((gameState == 10 || gameState == 20 || gameState == 30) && field858 != 0L && ObjectComposition.currentTimeMillis() > field858) { // L: 1043 1044 + CollisionMap.setWindowedMode(SpotAnimationDefinition.getWindowedMode()); // L: 1045 + } + + int var4; + if (var1) { // L: 1048 + for (var4 = 0; var4 < 100; ++var4) { // L: 1049 + field719[var4] = true; } } - if (gameState == 0) { // L: 1673 + if (gameState == 0) { // L: 1051 this.drawInitial(Login.Login_loadingPercent, Login.Login_loadingText, var1); - } else if (gameState == 5) { // L: 1674 - class23.drawTitle(WorldMapArea.fontBold12, class11.fontPlain11, Message.fontPlain12); - } else if (gameState != 10 && gameState != 11) { // L: 1675 - if (gameState == 20) { // L: 1676 - class23.drawTitle(WorldMapArea.fontBold12, class11.fontPlain11, Message.fontPlain12); - } else if (gameState == 25) { // L: 1677 - if (field790 == 1) { // L: 1678 - if (field669 > field670) { // L: 1679 - field670 = field669; + } else if (gameState == 5) { // L: 1052 + FriendSystem.drawTitle(Widget.fontBold12, Actor.fontPlain11, UserComparator3.fontPlain12); + } else if (gameState != 10 && gameState != 11) { // L: 1053 + if (gameState == 20) { // L: 1054 + FriendSystem.drawTitle(Widget.fontBold12, Actor.fontPlain11, UserComparator3.fontPlain12); + } else if (gameState == 25) { // L: 1055 + if (field698 == 1) { // L: 1056 + if (field694 > field695) { // L: 1057 + field695 = field694; } - var3 = (field670 * 50 - field669 * 50) / field670; // L: 1680 - class7.drawLoadingMessage("Loading - please wait." + "
" + " (" + var3 + "%" + ")", false); // L: 1681 - } else if (field790 == 2) { // L: 1683 - if (field671 > field672) { // L: 1684 - field672 = field671; + var4 = (field695 * 50 - field694 * 50) / field695; // L: 1058 + DirectByteArrayCopier.drawLoadingMessage("Loading - please wait." + "
" + " (" + var4 + "%" + ")", false); // L: 1059 + } else if (field698 == 2) { // L: 1061 + if (field696 > field697) { // L: 1062 + field697 = field696; } - var3 = (field672 * 50 - field671 * 50) / field672 + 50; // L: 1685 - class7.drawLoadingMessage("Loading - please wait." + "
" + " (" + var3 + "%" + ")", false); // L: 1686 + var4 = (field697 * 50 - field696 * 50) / field697 + 50; // L: 1063 + DirectByteArrayCopier.drawLoadingMessage("Loading - please wait." + "
" + " (" + var4 + "%" + ")", false); // L: 1064 } else { - class7.drawLoadingMessage("Loading - please wait.", false); // L: 1688 + DirectByteArrayCopier.drawLoadingMessage("Loading - please wait.", false); // L: 1066 } - } else if (gameState == 30) { // L: 1690 + } else if (gameState == 30) { // L: 1068 this.drawLoggedIn(); - } else if (gameState == 40) { // L: 1691 - class7.drawLoadingMessage("Connection lost" + "
" + "Please wait - attempting to reestablish", false); - } else if (gameState == 45) { // L: 1692 - class7.drawLoadingMessage("Please wait...", false); + } else if (gameState == 40) { // L: 1069 + DirectByteArrayCopier.drawLoadingMessage("Connection lost" + "
" + "Please wait - attempting to reestablish", false); + } else if (gameState == 45) { // L: 1070 + DirectByteArrayCopier.drawLoadingMessage("Please wait...", false); } } else { - class23.drawTitle(WorldMapArea.fontBold12, class11.fontPlain11, Message.fontPlain12); // L: 1682 + FriendSystem.drawTitle(Widget.fontBold12, Actor.fontPlain11, UserComparator3.fontPlain12); } - if (gameState == 30 && gameDrawingMode == 0 && !var1 && !isResizable) { // L: 1693 - for (var3 = 0; var3 < rootWidgetCount; ++var3) { // L: 1694 - if (field826[var3]) { // L: 1695 - WorldMapDecorationType.rasterProvider.draw(rootWidgetXs[var3], rootWidgetYs[var3], rootWidgetWidths[var3], rootWidgetHeights[var3]); // L: 1696 - field826[var3] = false; // L: 1697 + if (gameState == 30 && gameDrawingMode == 0 && !var1 && !isResizable) { // L: 1071 + for (var4 = 0; var4 < rootWidgetCount; ++var4) { // L: 1072 + if (field780[var4]) { // L: 1073 + class26.rasterProvider.draw(rootWidgetXs[var4], rootWidgetYs[var4], rootWidgetWidths[var4], rootWidgetHeights[var4]); // L: 1074 + field780[var4] = false; // L: 1075 } } - } else if (gameState > 0) { // L: 1701 - WorldMapDecorationType.rasterProvider.drawFull(0, 0); // L: 1702 + } else if (gameState > 0) { // L: 1079 + class26.rasterProvider.drawFull(0, 0); // L: 1080 - for (var3 = 0; var3 < rootWidgetCount; ++var3) { // L: 1703 - field826[var3] = false; + for (var4 = 0; var4 < rootWidgetCount; ++var4) { // L: 1081 + field780[var4] = false; } } - } // L: 1705 + } // L: 1083 - @ObfuscatedName("ay") + @ObfuscatedName("ai") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "2107475994" + garbageValue = "561275520" ) @Export("kill0") protected final void kill0() { - if (varcs.hasUnwrittenChanges()) { // L: 1708 - varcs.write(); + if (GrandExchangeOfferOwnWorldComparator.varcs.hasUnwrittenChanges()) { // L: 1086 + GrandExchangeOfferOwnWorldComparator.varcs.write(); } - if (class69.mouseRecorder != null) { // L: 1709 - class69.mouseRecorder.isRunning = false; + if (Skills.mouseRecorder != null) { // L: 1087 + Skills.mouseRecorder.isRunning = false; } - class69.mouseRecorder = null; // L: 1710 - packetWriter.close(); // L: 1711 - class29.method354(); // L: 1712 - if (MouseHandler.MouseHandler_instance != null) { // L: 1714 - synchronized(MouseHandler.MouseHandler_instance) { // L: 1715 - MouseHandler.MouseHandler_instance = null; // L: 1716 - } // L: 1717 + Skills.mouseRecorder = null; // L: 1088 + packetWriter.close(); // L: 1089 + if (KeyHandler.KeyHandler_instance != null) { // L: 1091 + synchronized(KeyHandler.KeyHandler_instance) { // L: 1092 + KeyHandler.KeyHandler_instance = null; // L: 1093 + } // L: 1094 } - class2.mouseWheel = null; // L: 1720 - if (WorldMapAreaData.pcmPlayer0 != null) { // L: 1721 - WorldMapAreaData.pcmPlayer0.shutdown(); + if (MouseHandler.MouseHandler_instance != null) { // L: 1098 + synchronized(MouseHandler.MouseHandler_instance) { // L: 1099 + MouseHandler.MouseHandler_instance = null; // L: 1100 + } // L: 1101 } - if (class93.pcmPlayer1 != null) { // L: 1722 - class93.pcmPlayer1.shutdown(); + MidiPcmStream.mouseWheel = null; // L: 1104 + if (DesktopPlatformInfoProvider.pcmPlayer0 != null) { // L: 1105 + DesktopPlatformInfoProvider.pcmPlayer0.shutdown(); } - if (NetCache.NetCache_socket != null) { // L: 1724 - NetCache.NetCache_socket.close(); + if (MouseRecorder.pcmPlayer1 != null) { // L: 1106 + MouseRecorder.pcmPlayer1.shutdown(); } - synchronized(ArchiveDiskActionHandler.ArchiveDiskActionHandler_lock) { // L: 1727 - if (ArchiveDiskActionHandler.field3574 != 0) { // L: 1728 - ArchiveDiskActionHandler.field3574 = 1; // L: 1729 - - try { - ArchiveDiskActionHandler.ArchiveDiskActionHandler_lock.wait(); // L: 1731 - } catch (InterruptedException var5) { // L: 1733 - } - } + VarcInt.method2673(); // L: 1107 + Widget.method4759(); // L: 1108 + if (ServerPacket.urlRequester != null) { // L: 1109 + ServerPacket.urlRequester.close(); // L: 1110 + ServerPacket.urlRequester = null; // L: 1111 } - if (class19.urlRequester != null) { // L: 1737 - class19.urlRequester.close(); // L: 1738 - class19.urlRequester = null; // L: 1739 - } + FriendSystem.method1746(); // L: 1113 + } // L: 1114 - try { - JagexCache.JagexCache_dat2File.close(); // L: 1743 - - for (int var4 = 0; var4 < class124.idxCount; ++var4) { // L: 1744 - class21.JagexCache_idxFiles[var4].close(); - } - - JagexCache.JagexCache_idx255File.close(); // L: 1745 - JagexCache.JagexCache_randomDat.close(); // L: 1746 - } catch (Exception var7) { // L: 1748 - } - - } // L: 1750 - - @ObfuscatedName("aq") + @ObfuscatedName("av") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "-1701648283" + garbageValue = "-992375266" ) - protected final void vmethod1216() { + protected final void vmethod1471() { } // L: 690 public final void init() { try { if (this.checkHost()) { // L: 696 + int var4; for (int var1 = 0; var1 <= 20; ++var1) { // L: 697 String var2 = this.getParameter(Integer.toString(var1)); // L: 698 if (var2 != null) { // L: 699 switch(var1) { // L: 700 case 1: - useBufferedSocket = Integer.parseInt(var2) != 0; // L: 720 + useBufferedSocket = Integer.parseInt(var2) != 0; // L: 755 case 2: case 11: case 13: @@ -2945,819 +1958,1296 @@ public final class Client extends GameEngine implements Usernamed { default: break; case 3: - if (var2.equalsIgnoreCase("true")) { // L: 745 + if (var2.equalsIgnoreCase("true")) { // L: 786 isMembersWorld = true; } else { - isMembersWorld = false; // L: 746 + isMembersWorld = false; // L: 787 } break; case 4: - if (clientType == -1) { // L: 713 - clientType = Integer.parseInt(var2); // L: 714 + if (clientType == -1) { // L: 792 + clientType = Integer.parseInt(var2); // L: 793 } break; case 5: - worldProperties = Integer.parseInt(var2); // L: 735 - break; // L: 736 + worldProperties = Integer.parseInt(var2); // L: 771 + break; // L: 772 case 6: - int var4 = Integer.parseInt(var2); // L: 752 - Language var9; - if (var4 >= 0 && var4 < Language.Language_valuesOrdered.length) { // L: 754 - var9 = Language.Language_valuesOrdered[var4]; // L: 758 - } else { - var9 = null; // L: 755 + class378.clientLanguage = Language.method5151(Integer.parseInt(var2)); // L: 745 + break; // L: 746 + case 7: + var4 = Integer.parseInt(var2); // L: 704 + GameBuild[] var5 = new GameBuild[]{GameBuild.WIP, GameBuild.LIVE, GameBuild.RC, GameBuild.BUILDLIVE}; // L: 709 + GameBuild[] var6 = var5; // L: 711 + int var7 = 0; + + GameBuild var20; + while (true) { + if (var7 >= var6.length) { + var20 = null; // L: 722 + break; + } + + GameBuild var8 = var6[var7]; // L: 713 + if (var4 == var8.buildId) { // L: 715 + var20 = var8; // L: 716 + break; // L: 717 + } + + ++var7; // L: 712 } - class7.clientLanguage = var9; // L: 760 - break; // L: 761 - case 7: - Fonts.field4063 = class181.method3592(Integer.parseInt(var2)); // L: 740 - break; // L: 741 + FaceNormal.field2365 = var20; // L: 724 + break; // L: 725 case 8: - if (var2.equalsIgnoreCase("true")) { // L: 776 + if (var2.equalsIgnoreCase("true")) { // L: 765 } break; case 9: - class253.field3136 = var2; // L: 725 - break; // L: 726 + class363.field4079 = var2; // L: 776 + break; // L: 777 case 10: - StudioGame[] var3 = new StudioGame[]{StudioGame.oldscape, StudioGame.game3, StudioGame.runescape, StudioGame.game5, StudioGame.game4, StudioGame.stellardawn}; // L: 767 - NetSocket.field1492 = (StudioGame)UserComparator4.findEnumerated(var3, Integer.parseInt(var2)); // L: 769 - if (NetSocket.field1492 == StudioGame.oldscape) { // L: 770 - ModeWhere.loginType = LoginType.oldscape; + StudioGame[] var3 = new StudioGame[]{StudioGame.runescape, StudioGame.stellardawn, StudioGame.game5, StudioGame.oldscape, StudioGame.game3, StudioGame.game4}; // L: 736 + SoundSystem.field461 = (StudioGame)Messages.findEnumerated(var3, Integer.parseInt(var2)); // L: 738 + if (StudioGame.oldscape == SoundSystem.field461) { // L: 739 + WorldMapSection0.loginType = LoginType.oldscape; } else { - ModeWhere.loginType = LoginType.field4101; // L: 771 + WorldMapSection0.loginType = LoginType.field4091; // L: 740 } break; case 12: - worldId = Integer.parseInt(var2); // L: 730 - break; // L: 731 + worldId = Integer.parseInt(var2); // L: 729 + break; // L: 730 case 14: - class44.field310 = Integer.parseInt(var2); // L: 782 - break; + Script.field1094 = Integer.parseInt(var2); // L: 750 + break; // L: 751 case 15: - gameBuild = Integer.parseInt(var2); // L: 703 - break; // L: 704 + gameBuild = Integer.parseInt(var2); // L: 781 + break; // L: 782 case 17: - Canvas.field291 = var2; // L: 708 + class6.field58 = var2; // L: 760 } } } - class13.method214(); // L: 788 - class26.worldHost = this.getCodeBase().getHost(); // L: 789 - String var5 = Fonts.field4063.name; // L: 790 - byte var6 = 0; // L: 791 + Scene.Scene_isLowDetail = false; // L: 801 + isLowDetail = false; // L: 802 + class80.worldHost = this.getCodeBase().getHost(); // L: 804 + String var9 = FaceNormal.field2365.name; // L: 805 + byte var10 = 0; // L: 806 try { - UserComparator5.findAndLoadCache("oldschool", var5, var6, 21); // L: 793 - } catch (Exception var7) { // L: 795 - class27.RunException_sendStackTrace((String)null, var7); // L: 796 + SoundCache.idxCount = 21; // L: 809 + UserComparator10.cacheGamebuild = var10; // L: 810 + + try { + class35.operatingSystemName = System.getProperty("os.name"); // L: 812 + } catch (Exception var17) { // L: 814 + class35.operatingSystemName = "Unknown"; // L: 815 + } + + UserComparator5.formattedOperatingSystemName = class35.operatingSystemName.toLowerCase(); // L: 817 + + try { + class22.userHomeDirectory = System.getProperty("user.home"); // L: 819 + if (class22.userHomeDirectory != null) { // L: 820 + class22.userHomeDirectory = class22.userHomeDirectory + "/"; + } + } catch (Exception var16) { // L: 822 + } + + try { + if (UserComparator5.formattedOperatingSystemName.startsWith("win")) { // L: 824 + if (class22.userHomeDirectory == null) { // L: 825 + class22.userHomeDirectory = System.getenv("USERPROFILE"); + } + } else if (class22.userHomeDirectory == null) { // L: 828 + class22.userHomeDirectory = System.getenv("HOME"); + } + + if (class22.userHomeDirectory != null) { // L: 830 + class22.userHomeDirectory = class22.userHomeDirectory + "/"; + } + } catch (Exception var15) { // L: 832 + } + + if (class22.userHomeDirectory == null) { // L: 833 + class22.userHomeDirectory = "~/"; + } + + InterfaceParent.cacheParentPaths = new String[]{"c:/rscache/", "/rscache/", "c:/windows/", "c:/winnt/", "c:/", class22.userHomeDirectory, "/tmp/", ""}; // L: 834 + PlayerType.cacheSubPaths = new String[]{".jagex_cache_" + UserComparator10.cacheGamebuild, ".file_store_" + UserComparator10.cacheGamebuild}; // L: 835 + + label137: + for (int var11 = 0; var11 < 4; ++var11) { // L: 836 + class12.cacheDir = Canvas.method393("oldschool", var9, var11); // L: 837 + if (!class12.cacheDir.exists()) { // L: 838 + class12.cacheDir.mkdirs(); + } + + File[] var12 = class12.cacheDir.listFiles(); // L: 839 + if (var12 == null) { // L: 840 + break; + } + + File[] var22 = var12; // L: 842 + int var13 = 0; + + while (true) { + if (var13 >= var22.length) { + break label137; + } + + File var14 = var22[var13]; // L: 844 + if (!FaceNormal.isWriteable(var14, false)) { // L: 846 + break; + } + + ++var13; // L: 843 + } + } + + File var21 = class12.cacheDir; // L: 853 + FileSystem.FileSystem_cacheDir = var21; // L: 855 + if (!FileSystem.FileSystem_cacheDir.exists()) { // L: 856 + throw new RuntimeException(""); + } + + FileSystem.FileSystem_hasPermissions = true; // L: 857 + SoundCache.method830(); // L: 859 + JagexCache.JagexCache_dat2File = new BufferedFile(new AccessFile(ScriptFrame.getFile("main_file_cache.dat2"), "rw", 1048576000L), 5200, 0); // L: 860 + JagexCache.JagexCache_idx255File = new BufferedFile(new AccessFile(ScriptFrame.getFile("main_file_cache.idx255"), "rw", 1048576L), 6000, 0); // L: 861 + class93.JagexCache_idxFiles = new BufferedFile[SoundCache.idxCount]; // L: 862 + + for (var4 = 0; var4 < SoundCache.idxCount; ++var4) { // L: 863 + class93.JagexCache_idxFiles[var4] = new BufferedFile(new AccessFile(ScriptFrame.getFile("main_file_cache.idx" + var4), "rw", 1048576L), 6000, 0); // L: 864 + } + } catch (Exception var18) { // L: 868 + class266.RunException_sendStackTrace((String)null, var18); // L: 869 } - class303.client = this; // L: 798 - RunException.clientType = clientType; // L: 799 - if (field621 == -1) { // L: 800 - field621 = 0; // L: 801 + class23.client = this; // L: 871 + RunException.clientType = clientType; // L: 872 + if (field643 == -1) { // L: 873 + field643 = 0; // L: 874 } - this.startThread(765, 503, 196); // L: 803 + this.startThread(765, 503, 196); // L: 876 } - } catch (RuntimeException var8) { - throw class20.newRunException(var8, "client.init(" + ')'); + } catch (RuntimeException var19) { + throw WorldMapDecoration.newRunException(var19, "client.init(" + ')'); } - } // L: 804 + } // L: 877 - @ObfuscatedName("fa") + @ObfuscatedName("ei") @ObfuscatedSignature( - descriptor = "(B)V", - garbageValue = "35" + descriptor = "(I)V", + garbageValue = "1243838219" ) @Export("doCycleJs5") void doCycleJs5() { - if (gameState != 1000) { // L: 1825 - boolean var1 = HitSplatDefinition.method2896(); // L: 1826 - if (!var1) { // L: 1827 + if (gameState != 1000) { // L: 1173 + long var2 = ObjectComposition.currentTimeMillis(); // L: 1176 + int var4 = (int)(var2 - class18.field159); // L: 1177 + class18.field159 = var2; // L: 1178 + if (var4 > 200) { // L: 1179 + var4 = 200; + } + + NetCache.NetCache_loadTime += var4; // L: 1180 + boolean var1; + if (NetCache.NetCache_pendingResponsesCount == 0 && NetCache.NetCache_pendingPriorityResponsesCount == 0 && NetCache.NetCache_pendingWritesCount == 0 && NetCache.NetCache_pendingPriorityWritesCount == 0) { // L: 1181 + var1 = true; // L: 1182 + } else if (NetCache.NetCache_socket == null) { // L: 1185 + var1 = false; // L: 1186 + } else { + try { + label238: { + if (NetCache.NetCache_loadTime > 30000) { // L: 1190 + throw new IOException(); + } + + NetFileRequest var5; + Buffer var6; + while (NetCache.NetCache_pendingPriorityResponsesCount < 200 && NetCache.NetCache_pendingPriorityWritesCount > 0) { // L: 1191 + var5 = (NetFileRequest)NetCache.NetCache_pendingPriorityWrites.first(); // L: 1192 + var6 = new Buffer(4); // L: 1193 + var6.writeByte(1); // L: 1194 + var6.writeMedium((int)var5.key); // L: 1195 + NetCache.NetCache_socket.write(var6.array, 0, 4); // L: 1196 + NetCache.NetCache_pendingPriorityResponses.put(var5, var5.key); // L: 1197 + --NetCache.NetCache_pendingPriorityWritesCount; // L: 1198 + ++NetCache.NetCache_pendingPriorityResponsesCount; // L: 1199 + } + + while (NetCache.NetCache_pendingResponsesCount < 200 && NetCache.NetCache_pendingWritesCount > 0) { // L: 1201 + var5 = (NetFileRequest)NetCache.NetCache_pendingWritesQueue.removeLast(); // L: 1202 + var6 = new Buffer(4); // L: 1203 + var6.writeByte(0); // L: 1204 + var6.writeMedium((int)var5.key); // L: 1205 + NetCache.NetCache_socket.write(var6.array, 0, 4); // L: 1206 + var5.removeDual(); // L: 1207 + NetCache.NetCache_pendingResponses.put(var5, var5.key); // L: 1208 + --NetCache.NetCache_pendingWritesCount; // L: 1209 + ++NetCache.NetCache_pendingResponsesCount; // L: 1210 + } + + for (int var17 = 0; var17 < 100; ++var17) { // L: 1212 + int var18 = NetCache.NetCache_socket.available(); // L: 1213 + if (var18 < 0) { // L: 1214 + throw new IOException(); + } + + if (var18 == 0) { // L: 1215 + break; + } + + NetCache.NetCache_loadTime = 0; // L: 1216 + byte var7 = 0; // L: 1217 + if (BuddyRankComparator.NetCache_currentResponse == null) { // L: 1218 + var7 = 8; + } else if (NetCache.field3612 == 0) { // L: 1219 + var7 = 1; + } + + int var8; + int var9; + int var10; + int var12; + byte[] var10000; + int var10001; + Buffer var25; + if (var7 > 0) { // L: 1220 + var8 = var7 - NetCache.NetCache_responseHeaderBuffer.offset; // L: 1221 + if (var8 > var18) { // L: 1222 + var8 = var18; + } + + NetCache.NetCache_socket.read(NetCache.NetCache_responseHeaderBuffer.array, NetCache.NetCache_responseHeaderBuffer.offset, var8); // L: 1223 + if (NetCache.field3607 != 0) { // L: 1224 + for (var9 = 0; var9 < var8; ++var9) { // L: 1225 + var10000 = NetCache.NetCache_responseHeaderBuffer.array; + var10001 = var9 + NetCache.NetCache_responseHeaderBuffer.offset; + var10000[var10001] ^= NetCache.field3607; + } + } + + var25 = NetCache.NetCache_responseHeaderBuffer; // L: 1227 + var25.offset += var8; + if (NetCache.NetCache_responseHeaderBuffer.offset < var7) { // L: 1228 + break; + } + + if (BuddyRankComparator.NetCache_currentResponse == null) { // L: 1229 + NetCache.NetCache_responseHeaderBuffer.offset = 0; // L: 1230 + var9 = NetCache.NetCache_responseHeaderBuffer.readUnsignedByte(); // L: 1231 + var10 = NetCache.NetCache_responseHeaderBuffer.readUnsignedShort(); // L: 1232 + int var11 = NetCache.NetCache_responseHeaderBuffer.readUnsignedByte(); // L: 1233 + var12 = NetCache.NetCache_responseHeaderBuffer.readInt(); // L: 1234 + long var13 = (long)(var10 + (var9 << 16)); // L: 1235 + NetFileRequest var15 = (NetFileRequest)NetCache.NetCache_pendingPriorityResponses.get(var13); // L: 1236 + class8.field75 = true; // L: 1237 + if (var15 == null) { // L: 1238 + var15 = (NetFileRequest)NetCache.NetCache_pendingResponses.get(var13); // L: 1239 + class8.field75 = false; // L: 1240 + } + + if (var15 == null) { // L: 1242 + throw new IOException(); // L: 1243 + } + + int var16 = var11 == 0 ? 5 : 9; // L: 1245 + BuddyRankComparator.NetCache_currentResponse = var15; // L: 1246 + SoundSystem.NetCache_responseArchiveBuffer = new Buffer(var16 + var12 + BuddyRankComparator.NetCache_currentResponse.padding); // L: 1247 + SoundSystem.NetCache_responseArchiveBuffer.writeByte(var11); // L: 1248 + SoundSystem.NetCache_responseArchiveBuffer.writeInt(var12); // L: 1249 + NetCache.field3612 = 8; // L: 1250 + NetCache.NetCache_responseHeaderBuffer.offset = 0; // L: 1251 + } else if (NetCache.field3612 == 0) { // L: 1254 + if (NetCache.NetCache_responseHeaderBuffer.array[0] == -1) { // L: 1255 + NetCache.field3612 = 1; // L: 1256 + NetCache.NetCache_responseHeaderBuffer.offset = 0; // L: 1257 + } else { + BuddyRankComparator.NetCache_currentResponse = null; // L: 1261 + } + } + } else { + var8 = SoundSystem.NetCache_responseArchiveBuffer.array.length - BuddyRankComparator.NetCache_currentResponse.padding; // L: 1267 + var9 = 512 - NetCache.field3612; // L: 1268 + if (var9 > var8 - SoundSystem.NetCache_responseArchiveBuffer.offset) { // L: 1269 + var9 = var8 - SoundSystem.NetCache_responseArchiveBuffer.offset; + } + + if (var9 > var18) { // L: 1270 + var9 = var18; + } + + NetCache.NetCache_socket.read(SoundSystem.NetCache_responseArchiveBuffer.array, SoundSystem.NetCache_responseArchiveBuffer.offset, var9); // L: 1271 + if (NetCache.field3607 != 0) { // L: 1272 + for (var10 = 0; var10 < var9; ++var10) { // L: 1273 + var10000 = SoundSystem.NetCache_responseArchiveBuffer.array; + var10001 = var10 + SoundSystem.NetCache_responseArchiveBuffer.offset; + var10000[var10001] ^= NetCache.field3607; + } + } + + var25 = SoundSystem.NetCache_responseArchiveBuffer; // L: 1275 + var25.offset += var9; + NetCache.field3612 += var9; // L: 1276 + if (var8 == SoundSystem.NetCache_responseArchiveBuffer.offset) { // L: 1277 + if (BuddyRankComparator.NetCache_currentResponse.key == 16711935L) { // L: 1278 + class125.NetCache_reference = SoundSystem.NetCache_responseArchiveBuffer; // L: 1279 + + for (var10 = 0; var10 < 256; ++var10) { // L: 1280 + Archive var19 = NetCache.NetCache_archives[var10]; // L: 1281 + if (var19 != null) { // L: 1282 + class125.NetCache_reference.offset = var10 * 8 + 5; // L: 1283 + var12 = class125.NetCache_reference.readInt(); // L: 1284 + int var20 = class125.NetCache_reference.readInt(); // L: 1285 + var19.loadIndex(var12, var20); // L: 1286 + } + } + } else { + NetCache.NetCache_crc.reset(); // L: 1291 + NetCache.NetCache_crc.update(SoundSystem.NetCache_responseArchiveBuffer.array, 0, var8); // L: 1292 + var10 = (int)NetCache.NetCache_crc.getValue(); // L: 1293 + if (var10 != BuddyRankComparator.NetCache_currentResponse.crc) { // L: 1294 + try { + NetCache.NetCache_socket.close(); // L: 1296 + } catch (Exception var23) { // L: 1298 + } + + ++NetCache.NetCache_crcMismatches; // L: 1299 + NetCache.NetCache_socket = null; // L: 1300 + NetCache.field3607 = (byte)((int)(Math.random() * 255.0D + 1.0D)); // L: 1301 + var1 = false; // L: 1302 + break label238; + } + + NetCache.NetCache_crcMismatches = 0; // L: 1305 + NetCache.NetCache_ioExceptions = 0; // L: 1306 + BuddyRankComparator.NetCache_currentResponse.archive.write((int)(BuddyRankComparator.NetCache_currentResponse.key & 65535L), SoundSystem.NetCache_responseArchiveBuffer.array, (BuddyRankComparator.NetCache_currentResponse.key & 16711680L) == 16711680L, class8.field75); // L: 1307 + } + + BuddyRankComparator.NetCache_currentResponse.remove(); // L: 1309 + if (class8.field75) { // L: 1310 + --NetCache.NetCache_pendingPriorityResponsesCount; + } else { + --NetCache.NetCache_pendingResponsesCount; // L: 1311 + } + + NetCache.field3612 = 0; // L: 1312 + BuddyRankComparator.NetCache_currentResponse = null; // L: 1313 + SoundSystem.NetCache_responseArchiveBuffer = null; // L: 1314 + } else { + if (NetCache.field3612 != 512) { // L: 1316 + break; + } + + NetCache.field3612 = 0; + } + } + } + + var1 = true; // L: 1320 + } + } catch (IOException var24) { + try { + NetCache.NetCache_socket.close(); // L: 1324 + } catch (Exception var22) { // L: 1326 + } + + ++NetCache.NetCache_ioExceptions; // L: 1327 + NetCache.NetCache_socket = null; // L: 1328 + var1 = false; // L: 1329 + } + } + + if (!var1) { // L: 1333 this.doCycleJs5Connect(); } } - } // L: 1828 + } // L: 1334 - @ObfuscatedName("fx") + @ObfuscatedName("ev") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "1917770828" + garbageValue = "1090327888" ) @Export("doCycleJs5Connect") void doCycleJs5Connect() { - if (NetCache.NetCache_crcMismatches >= 4) { // L: 1831 - this.error("js5crc"); // L: 1832 - gameState = 1000; // L: 1833 + if (NetCache.NetCache_crcMismatches >= 4) { // L: 1337 + this.error("js5crc"); // L: 1338 + gameState = 1000; // L: 1339 } else { - if (NetCache.NetCache_ioExceptions >= 4) { // L: 1836 - if (gameState <= 5) { // L: 1837 - this.error("js5io"); // L: 1838 - gameState = 1000; // L: 1839 - return; // L: 1840 + if (NetCache.NetCache_ioExceptions >= 4) { // L: 1342 + if (gameState <= 5) { // L: 1343 + this.error("js5io"); // L: 1344 + gameState = 1000; // L: 1345 + return; // L: 1346 } - field646 = 3000; // L: 1843 - NetCache.NetCache_ioExceptions = 3; // L: 1844 + field670 = 3000; // L: 1349 + NetCache.NetCache_ioExceptions = 3; // L: 1350 } - if (--field646 + 1 <= 0) { // L: 1847 + if (--field670 + 1 <= 0) { // L: 1353 try { - if (js5ConnectState == 0) { // L: 1849 - js5SocketTask = GameEngine.taskHandler.newSocketTask(class26.worldHost, BoundaryObject.currentPort); // L: 1850 - ++js5ConnectState; // L: 1851 + if (js5ConnectState == 0) { // L: 1355 + class159.js5SocketTask = GameEngine.taskHandler.newSocketTask(class80.worldHost, DesktopPlatformInfoProvider.currentPort); // L: 1356 + ++js5ConnectState; // L: 1357 } - if (js5ConnectState == 1) { // L: 1853 - if (js5SocketTask.status == 2) { // L: 1854 - this.js5Error(-1); // L: 1855 - return; // L: 1856 + if (js5ConnectState == 1) { // L: 1359 + if (class159.js5SocketTask.status == 2) { // L: 1360 + this.js5Error(-1); // L: 1361 + return; // L: 1362 } - if (js5SocketTask.status == 1) { // L: 1858 + if (class159.js5SocketTask.status == 1) { // L: 1364 ++js5ConnectState; } } - if (js5ConnectState == 2) { // L: 1860 - if (useBufferedSocket) { // L: 1861 - ArchiveDiskAction.js5Socket = Varps.method4585((Socket)js5SocketTask.result, 40000, 5000); // L: 1862 + if (js5ConnectState == 2) { // L: 1366 + if (useBufferedSocket) { // L: 1367 + Socket var2 = (Socket)class159.js5SocketTask.result; // L: 1369 + BufferedNetSocket var1 = new BufferedNetSocket(var2, 40000, 5000); // L: 1371 + WorldMapID.js5Socket = var1; // L: 1373 } else { - ArchiveDiskAction.js5Socket = new NetSocket((Socket)js5SocketTask.result, GameEngine.taskHandler, 5000); // L: 1865 + WorldMapID.js5Socket = new NetSocket((Socket)class159.js5SocketTask.result, GameEngine.taskHandler, 5000); // L: 1376 } - Buffer var1 = new Buffer(5); // L: 1867 - var1.writeByte(15); // L: 1868 - var1.writeInt(196); // L: 1869 - ArchiveDiskAction.js5Socket.write(var1.array, 0, 5); // L: 1870 - ++js5ConnectState; // L: 1871 - class43.field302 = Archive.currentTimeMillis(); // L: 1872 + Buffer var11 = new Buffer(5); // L: 1378 + var11.writeByte(15); // L: 1379 + var11.writeInt(196); // L: 1380 + WorldMapID.js5Socket.write(var11.array, 0, 5); // L: 1381 + ++js5ConnectState; // L: 1382 + ArchiveDiskAction.field3556 = ObjectComposition.currentTimeMillis(); // L: 1383 } - if (js5ConnectState == 3) { // L: 1874 - if (ArchiveDiskAction.js5Socket.available() > 0 || !useBufferedSocket && gameState <= 5) { // L: 1875 - int var2 = ArchiveDiskAction.js5Socket.readUnsignedByte(); // L: 1876 - if (var2 != 0) { // L: 1877 - this.js5Error(var2); // L: 1878 - return; // L: 1879 + if (js5ConnectState == 3) { // L: 1385 + if (WorldMapID.js5Socket.available() > 0 || !useBufferedSocket && gameState <= 5) { // L: 1386 + int var5 = WorldMapID.js5Socket.readUnsignedByte(); // L: 1387 + if (var5 != 0) { // L: 1388 + this.js5Error(var5); // L: 1389 + return; // L: 1390 } - ++js5ConnectState; // L: 1881 - } else if (Archive.currentTimeMillis() - class43.field302 > 30000L) { // L: 1884 - this.js5Error(-2); // L: 1885 - return; // L: 1886 + ++js5ConnectState; // L: 1392 + } else if (ObjectComposition.currentTimeMillis() - ArchiveDiskAction.field3556 > 30000L) { // L: 1395 + this.js5Error(-2); // L: 1396 + return; // L: 1397 } } - if (js5ConnectState == 4) { // L: 1890 - FaceNormal.method4081(ArchiveDiskAction.js5Socket, gameState > 20); // L: 1891 - js5SocketTask = null; // L: 1892 - ArchiveDiskAction.js5Socket = null; // L: 1893 - js5ConnectState = 0; // L: 1894 - js5Errors = 0; // L: 1895 + if (js5ConnectState == 4) { // L: 1401 + AbstractSocket var12 = WorldMapID.js5Socket; // L: 1402 + boolean var6 = gameState > 20; // L: 1403 + if (NetCache.NetCache_socket != null) { // L: 1405 + try { + NetCache.NetCache_socket.close(); // L: 1407 + } catch (Exception var9) { // L: 1409 + } + + NetCache.NetCache_socket = null; // L: 1410 + } + + NetCache.NetCache_socket = var12; // L: 1412 + StudioGame.method4847(var6); // L: 1413 + NetCache.NetCache_responseHeaderBuffer.offset = 0; // L: 1414 + BuddyRankComparator.NetCache_currentResponse = null; // L: 1415 + SoundSystem.NetCache_responseArchiveBuffer = null; // L: 1416 + NetCache.field3612 = 0; // L: 1417 + + while (true) { + NetFileRequest var3 = (NetFileRequest)NetCache.NetCache_pendingPriorityResponses.first(); // L: 1419 + if (var3 == null) { // L: 1420 + while (true) { + var3 = (NetFileRequest)NetCache.NetCache_pendingResponses.first(); // L: 1426 + if (var3 == null) { // L: 1427 + if (NetCache.field3607 != 0) { // L: 1433 + try { + Buffer var13 = new Buffer(4); // L: 1435 + var13.writeByte(4); // L: 1436 + var13.writeByte(NetCache.field3607); // L: 1437 + var13.writeShort(0); // L: 1438 + NetCache.NetCache_socket.write(var13.array, 0, 4); // L: 1439 + } catch (IOException var8) { + try { + NetCache.NetCache_socket.close(); // L: 1443 + } catch (Exception var7) { // L: 1445 + } + + ++NetCache.NetCache_ioExceptions; // L: 1446 + NetCache.NetCache_socket = null; // L: 1447 + } + } + + NetCache.NetCache_loadTime = 0; // L: 1450 + class18.field159 = ObjectComposition.currentTimeMillis(); // L: 1451 + class159.js5SocketTask = null; // L: 1453 + WorldMapID.js5Socket = null; // L: 1454 + js5ConnectState = 0; // L: 1455 + js5Errors = 0; // L: 1456 + return; // L: 1462 + } + + NetCache.NetCache_pendingWritesQueue.addLast(var3); // L: 1428 + NetCache.NetCache_pendingWrites.put(var3, var3.key); // L: 1429 + ++NetCache.NetCache_pendingWritesCount; // L: 1430 + --NetCache.NetCache_pendingResponsesCount; // L: 1431 + } + } + + NetCache.NetCache_pendingPriorityWrites.put(var3, var3.key); // L: 1421 + ++NetCache.NetCache_pendingPriorityWritesCount; // L: 1422 + --NetCache.NetCache_pendingPriorityResponsesCount; // L: 1423 + } } - } catch (IOException var3) { // L: 1898 - this.js5Error(-3); // L: 1899 + } catch (IOException var10) { // L: 1459 + this.js5Error(-3); // L: 1460 } } } - } // L: 1834 1901 + } // L: 1340 - @ObfuscatedName("fn") + @ObfuscatedName("eq") @ObfuscatedSignature( descriptor = "(II)V", - garbageValue = "1439234587" + garbageValue = "1995142761" ) @Export("js5Error") void js5Error(int var1) { - js5SocketTask = null; // L: 1904 - ArchiveDiskAction.js5Socket = null; // L: 1905 - js5ConnectState = 0; // L: 1906 - if (BoundaryObject.currentPort == class69.worldPort) { // L: 1907 - BoundaryObject.currentPort = class24.js5Port; + class159.js5SocketTask = null; // L: 1465 + WorldMapID.js5Socket = null; // L: 1466 + js5ConnectState = 0; // L: 1467 + if (WorldMapLabelSize.worldPort == DesktopPlatformInfoProvider.currentPort) { // L: 1468 + DesktopPlatformInfoProvider.currentPort = GrandExchangeOfferTotalQuantityComparator.js5Port; } else { - BoundaryObject.currentPort = class69.worldPort; // L: 1908 + DesktopPlatformInfoProvider.currentPort = WorldMapLabelSize.worldPort; // L: 1469 } - ++js5Errors; // L: 1909 - if (js5Errors >= 2 && (var1 == 7 || var1 == 9)) { // L: 1910 - if (gameState <= 5) { // L: 1911 - this.error("js5connect_full"); // L: 1912 - gameState = 1000; // L: 1913 + ++js5Errors; // L: 1470 + if (js5Errors >= 2 && (var1 == 7 || var1 == 9)) { // L: 1471 + if (gameState <= 5) { // L: 1472 + this.error("js5connect_full"); // L: 1473 + gameState = 1000; // L: 1474 } else { - field646 = 3000; // L: 1915 + field670 = 3000; // L: 1476 } - } else if (js5Errors >= 2 && var1 == 6) { // L: 1917 - this.error("js5connect_outofdate"); // L: 1918 - gameState = 1000; // L: 1919 - } else if (js5Errors >= 4) { // L: 1921 - if (gameState <= 5) { // L: 1922 - this.error("js5connect"); // L: 1923 - gameState = 1000; // L: 1924 + } else if (js5Errors >= 2 && var1 == 6) { // L: 1478 + this.error("js5connect_outofdate"); // L: 1479 + gameState = 1000; // L: 1480 + } else if (js5Errors >= 4) { // L: 1482 + if (gameState <= 5) { // L: 1483 + this.error("js5connect"); // L: 1484 + gameState = 1000; // L: 1485 } else { - field646 = 3000; // L: 1926 + field670 = 3000; // L: 1487 } } - } // L: 1928 + } // L: 1489 @ObfuscatedName("fe") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "36948173" + garbageValue = "-607645058" ) @Export("doCycleLoggedOut") final void doCycleLoggedOut() { - Object var1 = packetWriter.getSocket(); // L: 2333 - PacketBuffer var2 = packetWriter.packetBuffer; // L: 2334 + Object var1 = packetWriter.getSocket(); // L: 1923 + PacketBuffer var2 = packetWriter.packetBuffer; // L: 1924 try { - if (loginState == 0) { // L: 2336 - if (class1.secureRandom == null && (secureRandomFuture.isDone() || field649 > 250)) { // L: 2337 - class1.secureRandom = secureRandomFuture.get(); // L: 2338 - secureRandomFuture.shutdown(); // L: 2339 - secureRandomFuture = null; // L: 2340 + if (loginState == 0) { // L: 1926 + if (ClientPreferences.secureRandom == null && (secureRandomFuture.isDone() || field673 > 250)) { // L: 1927 + ClientPreferences.secureRandom = secureRandomFuture.get(); // L: 1928 + secureRandomFuture.shutdown(); // L: 1929 + secureRandomFuture = null; // L: 1930 } - if (class1.secureRandom != null) { // L: 2342 - if (var1 != null) { // L: 2343 - ((AbstractSocket)var1).close(); // L: 2344 - var1 = null; // L: 2345 + if (ClientPreferences.secureRandom != null) { // L: 1932 + if (var1 != null) { // L: 1933 + ((AbstractSocket)var1).close(); // L: 1934 + var1 = null; // L: 1935 } - Archive.socketTask = null; // L: 2347 - hadNetworkError = false; // L: 2348 - field649 = 0; // L: 2349 - loginState = 1; // L: 2350 + UserComparator9.socketTask = null; // L: 1937 + hadNetworkError = false; // L: 1938 + field673 = 0; // L: 1939 + loginState = 1; // L: 1940 } } - if (loginState == 1) { // L: 2353 - if (Archive.socketTask == null) { // L: 2354 - Archive.socketTask = GameEngine.taskHandler.newSocketTask(class26.worldHost, BoundaryObject.currentPort); // L: 2355 + if (loginState == 1) { // L: 1943 + if (UserComparator9.socketTask == null) { // L: 1944 + UserComparator9.socketTask = GameEngine.taskHandler.newSocketTask(class80.worldHost, DesktopPlatformInfoProvider.currentPort); // L: 1945 } - if (Archive.socketTask.status == 2) { // L: 2357 + if (UserComparator9.socketTask.status == 2) { // L: 1947 throw new IOException(); } - if (Archive.socketTask.status == 1) { // L: 2358 - if (useBufferedSocket) { // L: 2359 - var1 = Varps.method4585((Socket)Archive.socketTask.result, 40000, 5000); // L: 2360 + if (UserComparator9.socketTask.status == 1) { // L: 1948 + if (useBufferedSocket) { // L: 1949 + Socket var4 = (Socket)UserComparator9.socketTask.result; // L: 1951 + BufferedNetSocket var3 = new BufferedNetSocket(var4, 40000, 5000); // L: 1953 + var1 = var3; // L: 1955 } else { - var1 = new NetSocket((Socket)Archive.socketTask.result, GameEngine.taskHandler, 5000); // L: 2363 + var1 = new NetSocket((Socket)UserComparator9.socketTask.result, GameEngine.taskHandler, 5000); // L: 1958 } - packetWriter.setSocket((AbstractSocket)var1); // L: 2365 - Archive.socketTask = null; // L: 2366 - loginState = 2; // L: 2367 + packetWriter.setSocket((AbstractSocket)var1); // L: 1960 + UserComparator9.socketTask = null; // L: 1961 + loginState = 2; // L: 1962 } } - PacketBufferNode var4; - if (loginState == 2) { // L: 2370 - packetWriter.clearBuffer(); // L: 2371 - var4 = Clock.method2590(); // L: 2374 - var4.clientPacket = null; // L: 2375 - var4.clientPacketLength = 0; // L: 2376 - var4.packetBuffer = new PacketBuffer(5000); // L: 2377 - var4.packetBuffer.writeByte(LoginPacket.field2803.id); // L: 2381 - packetWriter.addNode(var4); // L: 2382 - packetWriter.flush(); // L: 2383 - var2.offset = 0; // L: 2384 - loginState = 3; // L: 2385 + PacketBufferNode var26; + if (loginState == 2) { // L: 1965 + packetWriter.clearBuffer(); // L: 1966 + var26 = class22.method247(); // L: 1967 + var26.packetBuffer.writeByte(LoginPacket.field2806.id); // L: 1968 + packetWriter.addNode(var26); // L: 1969 + packetWriter.flush(); // L: 1970 + var2.offset = 0; // L: 1971 + loginState = 3; // L: 1972 } boolean var13; int var14; - if (loginState == 3) { // L: 2387 - if (WorldMapAreaData.pcmPlayer0 != null) { // L: 2388 - WorldMapAreaData.pcmPlayer0.method794(); + if (loginState == 3) { // L: 1974 + if (DesktopPlatformInfoProvider.pcmPlayer0 != null) { // L: 1975 + DesktopPlatformInfoProvider.pcmPlayer0.method733(); } - if (class93.pcmPlayer1 != null) { // L: 2389 - class93.pcmPlayer1.method794(); + if (MouseRecorder.pcmPlayer1 != null) { // L: 1976 + MouseRecorder.pcmPlayer1.method733(); } - var13 = true; // L: 2390 - if (useBufferedSocket && !((AbstractSocket)var1).isAvailable(1)) { // L: 2391 2392 + var13 = true; // L: 1977 + if (useBufferedSocket && !((AbstractSocket)var1).isAvailable(1)) { // L: 1978 1979 var13 = false; } - if (var13) { // L: 2394 - var14 = ((AbstractSocket)var1).readUnsignedByte(); // L: 2395 - if (WorldMapAreaData.pcmPlayer0 != null) { // L: 2396 - WorldMapAreaData.pcmPlayer0.method794(); + if (var13) { // L: 1981 + var14 = ((AbstractSocket)var1).readUnsignedByte(); // L: 1982 + if (DesktopPlatformInfoProvider.pcmPlayer0 != null) { // L: 1983 + DesktopPlatformInfoProvider.pcmPlayer0.method733(); } - if (class93.pcmPlayer1 != null) { // L: 2397 - class93.pcmPlayer1.method794(); + if (MouseRecorder.pcmPlayer1 != null) { // L: 1984 + MouseRecorder.pcmPlayer1.method733(); } - if (var14 != 0) { // L: 2398 - class22.getLoginError(var14); // L: 2399 - return; // L: 2400 + if (var14 != 0) { // L: 1985 + MouseHandler.getLoginError(var14); // L: 1986 + return; // L: 1987 } - var2.offset = 0; // L: 2402 - loginState = 4; // L: 2403 + var2.offset = 0; // L: 1989 + loginState = 4; // L: 1990 } } - int var36; - if (loginState == 4) { // L: 2406 - if (var2.offset < 8) { // L: 2407 - var36 = ((AbstractSocket)var1).available(); // L: 2408 - if (var36 > 8 - var2.offset) { // L: 2409 - var36 = 8 - var2.offset; + int var41; + if (loginState == 4) { // L: 1993 + if (var2.offset < 8) { // L: 1994 + var41 = ((AbstractSocket)var1).available(); // L: 1995 + if (var41 > 8 - var2.offset) { // L: 1996 + var41 = 8 - var2.offset; } - if (var36 > 0) { // L: 2410 - ((AbstractSocket)var1).read(var2.array, var2.offset, var36); // L: 2411 - var2.offset += var36; // L: 2412 + if (var41 > 0) { // L: 1997 + ((AbstractSocket)var1).read(var2.array, var2.offset, var41); // L: 1998 + var2.offset += var41; // L: 1999 } } - if (var2.offset == 8) { // L: 2415 - var2.offset = 0; // L: 2416 - FileSystem.field1486 = var2.readLong(); // L: 2417 - loginState = 5; // L: 2418 + if (var2.offset == 8) { // L: 2002 + var2.offset = 0; // L: 2003 + GrandExchangeOfferAgeComparator.field3634 = var2.readLong(); // L: 2004 + loginState = 5; // L: 2005 } } int var7; int var9; int var15; - if (loginState == 5) { // L: 2421 - packetWriter.packetBuffer.offset = 0; // L: 2422 - packetWriter.clearBuffer(); // L: 2423 - PacketBuffer var3 = new PacketBuffer(500); // L: 2424 - int[] var27 = new int[]{class1.secureRandom.nextInt(), class1.secureRandom.nextInt(), class1.secureRandom.nextInt(), class1.secureRandom.nextInt()}; // L: 2425 2426 2427 2428 2429 - var3.offset = 0; // L: 2430 - var3.writeByte(1); // L: 2431 - var3.writeInt(var27[0]); // L: 2432 - var3.writeInt(var27[1]); // L: 2433 - var3.writeInt(var27[2]); // L: 2434 - var3.writeInt(var27[3]); // L: 2435 - var3.writeLong(FileSystem.field1486); // L: 2436 - if (gameState == 40) { // L: 2437 - var3.writeInt(SoundSystem.field432[0]); // L: 2438 - var3.writeInt(SoundSystem.field432[1]); // L: 2439 - var3.writeInt(SoundSystem.field432[2]); // L: 2440 - var3.writeInt(SoundSystem.field432[3]); // L: 2441 + if (loginState == 5) { // L: 2008 + packetWriter.packetBuffer.offset = 0; // L: 2009 + packetWriter.clearBuffer(); // L: 2010 + PacketBuffer var27 = new PacketBuffer(500); // L: 2011 + int[] var29 = new int[]{ClientPreferences.secureRandom.nextInt(), ClientPreferences.secureRandom.nextInt(), ClientPreferences.secureRandom.nextInt(), ClientPreferences.secureRandom.nextInt()}; // L: 2012 2013 2014 2015 2016 + var27.offset = 0; // L: 2017 + var27.writeByte(1); // L: 2018 + var27.writeInt(var29[0]); // L: 2019 + var27.writeInt(var29[1]); // L: 2020 + var27.writeInt(var29[2]); // L: 2021 + var27.writeInt(var29[3]); // L: 2022 + var27.writeLong(GrandExchangeOfferAgeComparator.field3634); // L: 2023 + int var11; + if (gameState == 40) { // L: 2024 + var27.writeInt(HealthBarDefinition.field1603[0]); // L: 2025 + var27.writeInt(HealthBarDefinition.field1603[1]); // L: 2026 + var27.writeInt(HealthBarDefinition.field1603[2]); // L: 2027 + var27.writeInt(HealthBarDefinition.field1603[3]); // L: 2028 } else { - var3.writeByte(field652.rsOrdinal()); // L: 2444 - switch(field652.field1453) { // L: 2445 + var27.writeByte(field676.rsOrdinal()); // L: 2031 + switch(field676.field1472) { // L: 2032 case 0: - LinkedHashMap var6 = class12.clientPreferences.parameters; // L: 2449 - String var8 = Login.Login_username; // L: 2451 - var9 = var8.length(); // L: 2453 - int var10 = 0; // L: 2454 + var27.offset += 4; // L: 2057 + break; + case 1: + case 3: + var27.writeMedium(class5.field53); // L: 2051 + ++var27.offset; // L: 2052 + break; // L: 2053 + case 2: + LinkedHashMap var6 = ObjectComposition.clientPreferences.parameters; // L: 2036 + String var8 = Login.Login_username; // L: 2038 + var9 = var8.length(); // L: 2040 + int var10 = 0; // L: 2041 - for (int var11 = 0; var11 < var9; ++var11) { // L: 2455 + for (var11 = 0; var11 < var9; ++var11) { // L: 2042 var10 = (var10 << 5) - var10 + var8.charAt(var11); } - var3.writeInt((Integer)var6.get(var10)); // L: 2458 - break; // L: 2459 - case 1: - case 2: - var3.writeMedium(PendingSpawn.field1204); // L: 2464 - ++var3.offset; // L: 2465 - break; // L: 2466 - case 3: - var3.offset += 4; // L: 2470 + var27.writeInt((Integer)var6.get(var10)); // L: 2045 } - var3.writeByte(class386.field4213.rsOrdinal()); // L: 2474 - var3.writeStringCp1252NullTerminated(Login.Login_password); // L: 2475 + var27.writeByte(class386.field4210.rsOrdinal()); // L: 2061 + var27.writeStringCp1252NullTerminated(Login.Login_password); // L: 2062 } - var3.encryptRsa(class82.field986, class82.field987); // L: 2477 - SoundSystem.field432 = var27; // L: 2478 - PacketBufferNode var33 = Clock.method2590(); // L: 2481 - var33.clientPacket = null; // L: 2482 - var33.clientPacketLength = 0; // L: 2483 - var33.packetBuffer = new PacketBuffer(5000); // L: 2484 - var33.packetBuffer.offset = 0; // L: 2488 - if (gameState == 40) { // L: 2489 - var33.packetBuffer.writeByte(LoginPacket.field2799.id); // L: 2490 + var27.encryptRsa(class82.field1018, class82.field1017); // L: 2064 + HealthBarDefinition.field1603 = var29; // L: 2065 + PacketBufferNode var5 = class22.method247(); // L: 2066 + var5.packetBuffer.offset = 0; // L: 2067 + if (gameState == 40) { // L: 2068 + var5.packetBuffer.writeByte(LoginPacket.field2799.id); // L: 2069 } else { - var33.packetBuffer.writeByte(LoginPacket.field2798.id); // L: 2493 + var5.packetBuffer.writeByte(LoginPacket.field2802.id); // L: 2072 } - var33.packetBuffer.writeShort(0); // L: 2495 - var7 = var33.packetBuffer.offset; // L: 2496 - var33.packetBuffer.writeInt(196); // L: 2497 - var33.packetBuffer.writeInt(1); // L: 2498 - var33.packetBuffer.writeByte(clientType); // L: 2499 - var33.packetBuffer.writeByte(field621); // L: 2500 - var33.packetBuffer.writeBytes(var3.array, 0, var3.offset); // L: 2501 - var15 = var33.packetBuffer.offset; // L: 2502 - var33.packetBuffer.writeStringCp1252NullTerminated(Login.Login_username); // L: 2503 - var33.packetBuffer.writeByte((isResizable ? 1 : 0) << 1 | (isLowDetail ? 1 : 0)); // L: 2504 - var33.packetBuffer.writeShort(GameEngine.canvasWidth); // L: 2505 - var33.packetBuffer.writeShort(HealthBarDefinition.canvasHeight); // L: 2506 - PacketBuffer var16 = var33.packetBuffer; // L: 2507 - if (randomDatData != null) { // L: 2509 - var16.writeBytes(randomDatData, 0, randomDatData.length); // L: 2510 + var5.packetBuffer.writeShort(0); // L: 2074 + var15 = var5.packetBuffer.offset; // L: 2075 + var5.packetBuffer.writeInt(196); // L: 2076 + var5.packetBuffer.writeInt(1); // L: 2077 + var5.packetBuffer.writeByte(clientType); // L: 2078 + var5.packetBuffer.writeByte(field643); // L: 2079 + var5.packetBuffer.writeBytes(var27.array, 0, var27.offset); // L: 2080 + var7 = var5.packetBuffer.offset; // L: 2081 + var5.packetBuffer.writeStringCp1252NullTerminated(Login.Login_username); // L: 2082 + var5.packetBuffer.writeByte((isResizable ? 1 : 0) << 1 | (isLowDetail ? 1 : 0)); // L: 2083 + var5.packetBuffer.writeShort(class32.canvasWidth); // L: 2084 + var5.packetBuffer.writeShort(ReflectionCheck.canvasHeight); // L: 2085 + PacketBuffer var39 = var5.packetBuffer; // L: 2086 + if (randomDatData != null) { // L: 2088 + var39.writeBytes(randomDatData, 0, randomDatData.length); // L: 2089 } else { - byte[] var17 = DynamicObject.method2030(); // L: 2513 - var16.writeBytes(var17, 0, var17.length); // L: 2514 - } + byte[] var16 = new byte[24]; // L: 2094 - var33.packetBuffer.writeStringCp1252NullTerminated(class253.field3136); // L: 2516 - var33.packetBuffer.writeInt(class44.field310); // L: 2517 - Buffer var38 = new Buffer(GameObject.platformInfo.size()); // L: 2518 - GameObject.platformInfo.write(var38); // L: 2519 - var33.packetBuffer.writeBytes(var38.array, 0, var38.array.length); // L: 2520 - var33.packetBuffer.writeByte(clientType); // L: 2521 - var33.packetBuffer.writeInt(0); // L: 2522 - var33.packetBuffer.writeInt(class29.archive6.hash); // L: 2523 - var33.packetBuffer.method6445(0); // L: 2524 - var33.packetBuffer.method6445(Actor.archive17.hash); // L: 2525 - var33.packetBuffer.writeIntME(class0.archive1.hash); // L: 2526 - var33.packetBuffer.method6445(EnumComposition.archive3.hash); // L: 2527 - var33.packetBuffer.writeIntME(class9.archive20.hash); // L: 2528 - var33.packetBuffer.writeInt(class232.archive19.hash); // L: 2529 - var33.packetBuffer.method6493(MilliClock.archive0.hash); // L: 2530 - var33.packetBuffer.writeInt(class16.archive15.hash); // L: 2531 - var33.packetBuffer.writeInt(PendingSpawn.archive10.hash); // L: 2532 - var33.packetBuffer.writeInt(KitDefinition.archive2.hash); // L: 2533 - var33.packetBuffer.method6493(KeyHandler.archive11.hash); // L: 2534 - var33.packetBuffer.writeIntME(class14.archive4.hash); // L: 2535 - var33.packetBuffer.writeInt(class18.archive13.hash); // L: 2536 - var33.packetBuffer.writeIntME(Huffman.archive14.hash); // L: 2537 - var33.packetBuffer.method6445(GameBuild.archive9.hash); // L: 2538 - var33.packetBuffer.method6493(class22.archive12.hash); // L: 2539 - var33.packetBuffer.writeIntME(WorldMapAreaData.archive18.hash); // L: 2540 - var33.packetBuffer.method6493(WorldMapSection0.archive5.hash); // L: 2541 - var33.packetBuffer.writeInt(class260.archive7.hash); // L: 2542 - var33.packetBuffer.writeInt(class43.archive8.hash); // L: 2543 - var33.packetBuffer.xteaEncrypt(var27, var15, var33.packetBuffer.offset); // L: 2544 - var33.packetBuffer.writeLengthShort(var33.packetBuffer.offset - var7); // L: 2545 - packetWriter.addNode(var33); // L: 2546 - packetWriter.flush(); // L: 2547 - packetWriter.isaacCipher = new IsaacCipher(var27); // L: 2548 - int[] var18 = new int[4]; // L: 2549 + try { + JagexCache.JagexCache_randomDat.seek(0L); // L: 2096 + JagexCache.JagexCache_randomDat.readFully(var16); // L: 2097 - for (int var12 = 0; var12 < 4; ++var12) { // L: 2550 - var18[var12] = var27[var12] + 50; - } + for (var11 = 0; var11 < 24 && var16[var11] == 0; ++var11) { // L: 2098 2099 2100 + } - var2.newIsaacCipher(var18); // L: 2551 - loginState = 6; // L: 2552 - } - - if (loginState == 6 && ((AbstractSocket)var1).available() > 0) { // L: 2554 2555 - var36 = ((AbstractSocket)var1).readUnsignedByte(); // L: 2556 - if (var36 == 21 && gameState == 20) { // L: 2557 - loginState = 12; // L: 2558 - } else if (var36 == 2) { // L: 2560 - loginState = 14; // L: 2561 - } else if (var36 == 15 && gameState == 40) { // L: 2563 - packetWriter.serverPacketLength = -1; // L: 2564 - loginState = 19; // L: 2565 - } else if (var36 == 64) { // L: 2567 - loginState = 10; // L: 2568 - } else if (var36 == 23 && field749 < 1) { // L: 2570 - ++field749; // L: 2571 - loginState = 0; // L: 2572 - } else if (var36 == 29) { // L: 2574 - loginState = 17; // L: 2575 - } else { - if (var36 != 69) { // L: 2577 - class22.getLoginError(var36); // L: 2581 - return; // L: 2582 + if (var11 >= 24) { // L: 2102 + throw new IOException(); + } + } catch (Exception var24) { + for (int var12 = 0; var12 < 24; ++var12) { // L: 2105 + var16[var12] = -1; + } } - loginState = 7; // L: 2578 + var39.writeBytes(var16, 0, var16.length); // L: 2110 + } + + var5.packetBuffer.writeStringCp1252NullTerminated(class363.field4079); // L: 2112 + var5.packetBuffer.writeInt(Script.field1094); // L: 2113 + Buffer var18 = new Buffer(class10.platformInfo.size()); // L: 2114 + class10.platformInfo.write(var18); // L: 2115 + var5.packetBuffer.writeBytes(var18.array, 0, var18.array.length); // L: 2116 + var5.packetBuffer.writeByte(clientType); // L: 2117 + var5.packetBuffer.writeInt(0); // L: 2118 + var5.packetBuffer.writeInt(UrlRequest.archive6.hash); // L: 2119 + var5.packetBuffer.method6612(0); // L: 2120 + var5.packetBuffer.method6612(class8.archive17.hash); // L: 2121 + var5.packetBuffer.writeIntME(class27.archive1.hash); // L: 2122 + var5.packetBuffer.method6612(ClanChannel.archive3.hash); // L: 2123 + var5.packetBuffer.writeIntME(class5.archive20.hash); // L: 2124 + var5.packetBuffer.writeInt(class179.archive19.hash); // L: 2125 + var5.packetBuffer.method6611(NetCache.archive0.hash); // L: 2126 + var5.packetBuffer.writeInt(ClanMate.archive15.hash); // L: 2127 + var5.packetBuffer.writeInt(SoundCache.archive10.hash); // L: 2128 + var5.packetBuffer.writeInt(class8.archive2.hash); // L: 2129 + var5.packetBuffer.method6611(WorldMapManager.archive11.hash); // L: 2130 + var5.packetBuffer.writeIntME(class32.archive4.hash); // L: 2131 + var5.packetBuffer.writeInt(Decimator.archive13.hash); // L: 2132 + var5.packetBuffer.writeIntME(class125.archive14.hash); // L: 2133 + var5.packetBuffer.method6612(CollisionMap.archive9.hash); // L: 2134 + var5.packetBuffer.method6611(UserComparator5.archive12.hash); // L: 2135 + var5.packetBuffer.writeIntME(FontName.archive18.hash); // L: 2136 + var5.packetBuffer.method6611(class247.archive5.hash); // L: 2137 + var5.packetBuffer.writeInt(Decimator.archive7.hash); // L: 2138 + var5.packetBuffer.writeInt(GrandExchangeOfferAgeComparator.archive8.hash); // L: 2139 + var5.packetBuffer.xteaEncrypt(var29, var7, var5.packetBuffer.offset); // L: 2140 + var5.packetBuffer.writeLengthShort(var5.packetBuffer.offset - var15); // L: 2141 + packetWriter.addNode(var5); // L: 2142 + packetWriter.flush(); // L: 2143 + packetWriter.isaacCipher = new IsaacCipher(var29); // L: 2144 + int[] var43 = new int[4]; // L: 2145 + + for (var11 = 0; var11 < 4; ++var11) { // L: 2146 + var43[var11] = var29[var11] + 50; + } + + var2.newIsaacCipher(var43); // L: 2147 + loginState = 6; // L: 2148 + } + + if (loginState == 6 && ((AbstractSocket)var1).available() > 0) { // L: 2150 2151 + var41 = ((AbstractSocket)var1).readUnsignedByte(); // L: 2152 + if (var41 == 21 && gameState == 20) { // L: 2153 + loginState = 12; // L: 2154 + } else if (var41 == 2) { // L: 2156 + loginState = 14; // L: 2157 + } else if (var41 == 15 && gameState == 40) { // L: 2159 + packetWriter.serverPacketLength = -1; // L: 2160 + loginState = 19; // L: 2161 + } else if (var41 == 64) { // L: 2163 + loginState = 10; // L: 2164 + } else if (var41 == 23 && field845 < 1) { // L: 2166 + ++field845; // L: 2167 + loginState = 0; // L: 2168 + } else if (var41 == 29) { // L: 2170 + loginState = 17; // L: 2171 + } else { + if (var41 != 69) { // L: 2173 + MouseHandler.getLoginError(var41); // L: 2177 + return; // L: 2178 + } + + loginState = 7; // L: 2174 } } - if (loginState == 7 && ((AbstractSocket)var1).available() >= 2) { // L: 2586 2587 - ((AbstractSocket)var1).read(var2.array, 0, 2); // L: 2588 - var2.offset = 0; // L: 2589 - Clock.field1522 = var2.readUnsignedShort(); // L: 2590 - loginState = 8; // L: 2591 + if (loginState == 7 && ((AbstractSocket)var1).available() >= 2) { // L: 2182 2183 + ((AbstractSocket)var1).read(var2.array, 0, 2); // L: 2184 + var2.offset = 0; // L: 2185 + class27.field231 = var2.readUnsignedShort(); // L: 2186 + loginState = 8; // L: 2187 } - if (loginState == 8 && ((AbstractSocket)var1).available() >= Clock.field1522) { // L: 2594 2595 - var2.offset = 0; // L: 2596 - ((AbstractSocket)var1).read(var2.array, var2.offset, Clock.field1522); // L: 2597 - class34[] var25 = new class34[]{class34.field243}; // L: 2600 - class34 var28 = var25[var2.readUnsignedByte()]; // L: 2602 + if (loginState == 8 && ((AbstractSocket)var1).available() >= class27.field231) { // L: 2190 2191 + var2.offset = 0; // L: 2192 + ((AbstractSocket)var1).read(var2.array, var2.offset, class27.field231); // L: 2193 + class34[] var28 = new class34[]{class34.field256}; // L: 2196 + class34 var30 = var28[var2.readUnsignedByte()]; // L: 2198 try { - class31 var5 = MenuAction.method1944(var28); // L: 2604 - this.field656 = new class35(var2, var5); // L: 2605 - loginState = 9; // L: 2606 - } catch (Exception var23) { // L: 2608 - class22.getLoginError(22); // L: 2609 - return; // L: 2610 + class31 var33 = class374.method6477(var30); // L: 2200 + this.field680 = new class35(var2, var33); // L: 2201 + loginState = 9; // L: 2202 + } catch (Exception var23) { // L: 2204 + MouseHandler.getLoginError(22); // L: 2205 + return; // L: 2206 } } - if (loginState == 9 && this.field656.method409()) { // L: 2614 2615 - this.field655 = this.field656.method408(); // L: 2616 - this.field656.method397(); // L: 2617 - this.field656 = null; // L: 2618 - if (this.field655 == null) { // L: 2619 - class22.getLoginError(22); // L: 2620 - return; // L: 2621 + if (loginState == 9 && this.field680.method342()) { // L: 2210 2211 + this.field679 = this.field680.method331(); // L: 2212 + this.field680.method332(); // L: 2213 + this.field680 = null; // L: 2214 + if (this.field679 == null) { // L: 2215 + MouseHandler.getLoginError(22); // L: 2216 + return; // L: 2217 } - packetWriter.clearBuffer(); // L: 2623 - var4 = Clock.method2590(); // L: 2626 - var4.clientPacket = null; // L: 2627 - var4.clientPacketLength = 0; // L: 2628 - var4.packetBuffer = new PacketBuffer(5000); // L: 2629 - var4.packetBuffer.writeByte(LoginPacket.field2800.id); // L: 2633 - var4.packetBuffer.writeShort(this.field655.offset); // L: 2634 - var4.packetBuffer.method6441(this.field655); // L: 2635 - packetWriter.addNode(var4); // L: 2636 - packetWriter.flush(); // L: 2637 - this.field655 = null; // L: 2638 - loginState = 6; // L: 2639 + packetWriter.clearBuffer(); // L: 2219 + var26 = class22.method247(); // L: 2220 + var26.packetBuffer.writeByte(LoginPacket.field2803.id); // L: 2221 + var26.packetBuffer.writeShort(this.field679.offset); // L: 2222 + var26.packetBuffer.method6768(this.field679); // L: 2223 + packetWriter.addNode(var26); // L: 2224 + packetWriter.flush(); // L: 2225 + this.field679 = null; // L: 2226 + loginState = 6; // L: 2227 } - if (loginState == 10 && ((AbstractSocket)var1).available() > 0) { // L: 2642 2643 - class225.field2676 = ((AbstractSocket)var1).readUnsignedByte(); // L: 2644 - loginState = 11; // L: 2645 + if (loginState == 10 && ((AbstractSocket)var1).available() > 0) { // L: 2230 2231 + ChatChannel.field1110 = ((AbstractSocket)var1).readUnsignedByte(); // L: 2232 + loginState = 11; // L: 2233 } - if (loginState == 11 && ((AbstractSocket)var1).available() >= class225.field2676) { // L: 2648 2649 - ((AbstractSocket)var1).read(var2.array, 0, class225.field2676); // L: 2650 - var2.offset = 0; // L: 2651 - loginState = 6; // L: 2652 + if (loginState == 11 && ((AbstractSocket)var1).available() >= ChatChannel.field1110) { // L: 2236 2237 + ((AbstractSocket)var1).read(var2.array, 0, ChatChannel.field1110); // L: 2238 + var2.offset = 0; // L: 2239 + loginState = 6; // L: 2240 } - if (loginState == 12 && ((AbstractSocket)var1).available() > 0) { // L: 2655 2656 - field673 = (((AbstractSocket)var1).readUnsignedByte() + 3) * 60; // L: 2657 - loginState = 13; // L: 2658 + if (loginState == 12 && ((AbstractSocket)var1).available() > 0) { // L: 2243 2244 + field675 = (((AbstractSocket)var1).readUnsignedByte() + 3) * 60; // L: 2245 + loginState = 13; // L: 2246 } - if (loginState == 13) { // L: 2661 - field649 = 0; // L: 2662 - class44.setLoginResponseString("You have only just left another world.", "Your profile will be transferred in:", field673 / 60 + " seconds."); // L: 2663 - if (--field673 <= 0) { // L: 2664 + if (loginState == 13) { // L: 2249 + field673 = 0; // L: 2250 + class260.setLoginResponseString("You have only just left another world.", "Your profile will be transferred in:", field675 / 60 + " seconds."); // L: 2251 + if (--field675 <= 0) { // L: 2252 loginState = 0; } } else { - if (loginState == 14 && ((AbstractSocket)var1).available() >= 1) { // L: 2667 2668 - UserComparator9.field1426 = ((AbstractSocket)var1).readUnsignedByte(); // L: 2669 - loginState = 15; // L: 2670 + if (loginState == 14 && ((AbstractSocket)var1).available() >= 1) { // L: 2255 2256 + class20.field184 = ((AbstractSocket)var1).readUnsignedByte(); // L: 2257 + loginState = 15; // L: 2258 } - if (loginState == 15 && ((AbstractSocket)var1).available() >= UserComparator9.field1426) { // L: 2673 2674 - var13 = ((AbstractSocket)var1).readUnsignedByte() == 1; // L: 2675 - ((AbstractSocket)var1).read(var2.array, 0, 4); // L: 2676 - var2.offset = 0; // L: 2677 - boolean var37 = false; // L: 2678 - if (var13) { // L: 2679 - var14 = var2.readByteIsaac() << 24; // L: 2680 - var14 |= var2.readByteIsaac() << 16; // L: 2681 - var14 |= var2.readByteIsaac() << 8; // L: 2682 - var14 |= var2.readByteIsaac(); // L: 2683 - String var34 = Login.Login_username; // L: 2685 - var7 = var34.length(); // L: 2687 - var15 = 0; // L: 2688 - var9 = 0; // L: 2689 + boolean var42; + if (loginState == 15 && ((AbstractSocket)var1).available() >= class20.field184) { // L: 2261 2262 + var13 = ((AbstractSocket)var1).readUnsignedByte() == 1; // L: 2263 + ((AbstractSocket)var1).read(var2.array, 0, 4); // L: 2264 + var2.offset = 0; // L: 2265 + var42 = false; // L: 2266 + if (var13) { // L: 2267 + var14 = var2.readByteIsaac() << 24; // L: 2268 + var14 |= var2.readByteIsaac() << 16; // L: 2269 + var14 |= var2.readByteIsaac() << 8; // L: 2270 + var14 |= var2.readByteIsaac(); // L: 2271 + String var38 = Login.Login_username; // L: 2273 + var7 = var38.length(); // L: 2275 + int var19 = 0; // L: 2276 + var9 = 0; // L: 2277 while (true) { if (var9 >= var7) { - if (class12.clientPreferences.parameters.size() >= 10 && !class12.clientPreferences.parameters.containsKey(var15)) { // L: 2693 2694 - Iterator var35 = class12.clientPreferences.parameters.entrySet().iterator(); // L: 2695 - var35.next(); // L: 2696 - var35.remove(); // L: 2697 + if (ObjectComposition.clientPreferences.parameters.size() >= 10 && !ObjectComposition.clientPreferences.parameters.containsKey(var19)) { // L: 2281 2282 + Iterator var40 = ObjectComposition.clientPreferences.parameters.entrySet().iterator(); // L: 2283 + var40.next(); // L: 2284 + var40.remove(); // L: 2285 } - class12.clientPreferences.parameters.put(var15, var14); // L: 2700 + ObjectComposition.clientPreferences.parameters.put(var19, var14); // L: 2288 break; } - var15 = (var15 << 5) - var15 + var34.charAt(var9); + var19 = (var19 << 5) - var19 + var38.charAt(var9); ++var9; } } - if (Login_isUsernameRemembered) { // L: 2702 - class12.clientPreferences.rememberedUsername = Login.Login_username; // L: 2703 + if (Login_isUsernameRemembered) { // L: 2290 + ObjectComposition.clientPreferences.rememberedUsername = Login.Login_username; // L: 2291 } else { - class12.clientPreferences.rememberedUsername = null; // L: 2706 + ObjectComposition.clientPreferences.rememberedUsername = null; // L: 2294 } - KeyHandler.savePreferences(); // L: 2708 - staffModLevel = ((AbstractSocket)var1).readUnsignedByte(); // L: 2709 - playerMod = ((AbstractSocket)var1).readUnsignedByte() == 1; // L: 2710 - localPlayerIndex = ((AbstractSocket)var1).readUnsignedByte(); // L: 2711 - localPlayerIndex <<= 8; // L: 2712 - localPlayerIndex += ((AbstractSocket)var1).readUnsignedByte(); // L: 2713 - field734 = ((AbstractSocket)var1).readUnsignedByte(); // L: 2714 - ((AbstractSocket)var1).read(var2.array, 0, 1); // L: 2715 - var2.offset = 0; // L: 2716 - ServerPacket[] var29 = ModeWhere.ServerPacket_values(); // L: 2717 - int var20 = var2.readSmartByteShortIsaac(); // L: 2718 - if (var20 < 0 || var20 >= var29.length) { // L: 2719 - throw new IOException(var20 + " " + var2.offset); + TileItem.savePreferences(); // L: 2296 + staffModLevel = ((AbstractSocket)var1).readUnsignedByte(); // L: 2297 + playerMod = ((AbstractSocket)var1).readUnsignedByte() == 1; // L: 2298 + localPlayerIndex = ((AbstractSocket)var1).readUnsignedByte(); // L: 2299 + localPlayerIndex <<= 8; // L: 2300 + localPlayerIndex += ((AbstractSocket)var1).readUnsignedByte(); // L: 2301 + field759 = ((AbstractSocket)var1).readUnsignedByte(); // L: 2302 + ((AbstractSocket)var1).read(var2.array, 0, 1); // L: 2303 + var2.offset = 0; // L: 2304 + ServerPacket[] var35 = class24.ServerPacket_values(); // L: 2305 + var15 = var2.readSmartByteShortIsaac(); // L: 2306 + if (var15 < 0 || var15 >= var35.length) { // L: 2307 + throw new IOException(var15 + " " + var2.offset); } - packetWriter.serverPacket = var29[var20]; // L: 2720 - packetWriter.serverPacketLength = packetWriter.serverPacket.length; // L: 2721 - ((AbstractSocket)var1).read(var2.array, 0, 2); // L: 2722 - var2.offset = 0; // L: 2723 - packetWriter.serverPacketLength = var2.readUnsignedShort(); // L: 2724 + packetWriter.serverPacket = var35[var15]; // L: 2308 + packetWriter.serverPacketLength = packetWriter.serverPacket.length; // L: 2309 + ((AbstractSocket)var1).read(var2.array, 0, 2); // L: 2310 + var2.offset = 0; // L: 2311 + packetWriter.serverPacketLength = var2.readUnsignedShort(); // L: 2312 try { - Client var21 = class303.client; // L: 2726 - JSObject.getWindow(var21).call("zap", (Object[])null); // L: 2729 - } catch (Throwable var22) { // L: 2732 + class42.method421(class23.client, "zap"); // L: 2314 + } catch (Throwable var22) { // L: 2316 } - loginState = 16; // L: 2733 + loginState = 16; // L: 2317 } - if (loginState == 16) { // L: 2736 - if (((AbstractSocket)var1).available() >= packetWriter.serverPacketLength) { // L: 2737 - var2.offset = 0; // L: 2738 - ((AbstractSocket)var1).read(var2.array, 0, packetWriter.serverPacketLength); // L: 2739 - timer.method5466(); // L: 2740 - class25.method321(); // L: 2741 - KeyHandler.updatePlayer(var2); // L: 2742 - MusicPatchNode2.field2827 = -1; // L: 2743 - ClientPreferences.loadRegions(false, var2); // L: 2744 - packetWriter.serverPacket = null; // L: 2745 + if (loginState != 16) { // L: 2320 + if (loginState == 17 && ((AbstractSocket)var1).available() >= 2) { // L: 2440 2441 + var2.offset = 0; // L: 2442 + ((AbstractSocket)var1).read(var2.array, 0, 2); // L: 2443 + var2.offset = 0; // L: 2444 + WorldMapData_1.field2008 = var2.readUnsignedShort(); // L: 2445 + loginState = 18; // L: 2446 } - } else { - if (loginState == 17 && ((AbstractSocket)var1).available() >= 2) { // L: 2749 2750 - var2.offset = 0; // L: 2751 - ((AbstractSocket)var1).read(var2.array, 0, 2); // L: 2752 - var2.offset = 0; // L: 2753 - class15.field133 = var2.readUnsignedShort(); // L: 2754 - loginState = 18; // L: 2755 + if (loginState == 18 && ((AbstractSocket)var1).available() >= WorldMapData_1.field2008) { // L: 2449 2450 + var2.offset = 0; // L: 2451 + ((AbstractSocket)var1).read(var2.array, 0, WorldMapData_1.field2008); // L: 2452 + var2.offset = 0; // L: 2453 + String var36 = var2.readStringCp1252NullTerminated(); // L: 2454 + String var34 = var2.readStringCp1252NullTerminated(); // L: 2455 + String var37 = var2.readStringCp1252NullTerminated(); // L: 2456 + class260.setLoginResponseString(var36, var34, var37); // L: 2457 + class12.updateGameState(10); // L: 2458 } - if (loginState == 18 && ((AbstractSocket)var1).available() >= class15.field133) { // L: 2758 2759 - var2.offset = 0; // L: 2760 - ((AbstractSocket)var1).read(var2.array, 0, class15.field133); // L: 2761 - var2.offset = 0; // L: 2762 - String var26 = var2.readStringCp1252NullTerminated(); // L: 2763 - String var30 = var2.readStringCp1252NullTerminated(); // L: 2764 - String var31 = var2.readStringCp1252NullTerminated(); // L: 2765 - class44.setLoginResponseString(var26, var30, var31); // L: 2766 - updateGameState(10); // L: 2767 - } - - if (loginState != 19) { // L: 2770 - ++field649; // L: 2822 - if (field649 > 2000) { // L: 2823 - if (field749 < 1) { // L: 2824 - if (BoundaryObject.currentPort == class69.worldPort) { // L: 2825 - BoundaryObject.currentPort = class24.js5Port; - } else { - BoundaryObject.currentPort = class69.worldPort; // L: 2826 - } - - ++field749; // L: 2827 - loginState = 0; // L: 2828 - } else { - class22.getLoginError(-3); // L: 2831 - } - } - } else { - if (packetWriter.serverPacketLength == -1) { // L: 2771 - if (((AbstractSocket)var1).available() < 2) { // L: 2772 + if (loginState == 19) { // L: 2461 + if (packetWriter.serverPacketLength == -1) { // L: 2462 + if (((AbstractSocket)var1).available() < 2) { // L: 2463 return; } - ((AbstractSocket)var1).read(var2.array, 0, 2); // L: 2773 - var2.offset = 0; // L: 2774 - packetWriter.serverPacketLength = var2.readUnsignedShort(); // L: 2775 + ((AbstractSocket)var1).read(var2.array, 0, 2); // L: 2464 + var2.offset = 0; // L: 2465 + packetWriter.serverPacketLength = var2.readUnsignedShort(); // L: 2466 } - if (((AbstractSocket)var1).available() >= packetWriter.serverPacketLength) { // L: 2777 - ((AbstractSocket)var1).read(var2.array, 0, packetWriter.serverPacketLength); // L: 2778 - var2.offset = 0; // L: 2779 - var36 = packetWriter.serverPacketLength; // L: 2780 - timer.method5477(); // L: 2781 - packetWriter.clearBuffer(); // L: 2783 - packetWriter.packetBuffer.offset = 0; // L: 2784 - packetWriter.serverPacket = null; // L: 2785 - packetWriter.field1386 = null; // L: 2786 - packetWriter.field1387 = null; // L: 2787 - packetWriter.field1391 = null; // L: 2788 - packetWriter.serverPacketLength = 0; // L: 2789 - packetWriter.field1384 = 0; // L: 2790 - rebootTimer = 0; // L: 2791 - Occluder.method4090(); // L: 2792 - minimapState = 0; // L: 2793 - destinationX = 0; // L: 2794 - - for (var14 = 0; var14 < 2048; ++var14) { // L: 2795 - players[var14] = null; + if (((AbstractSocket)var1).available() >= packetWriter.serverPacketLength) { // L: 2468 + ((AbstractSocket)var1).read(var2.array, 0, packetWriter.serverPacketLength); // L: 2469 + var2.offset = 0; // L: 2470 + var41 = packetWriter.serverPacketLength; // L: 2471 + timer.method5594(); // L: 2472 + WorldMapSectionType.method3594(); // L: 2473 + Coord.updatePlayer(var2); // L: 2474 + if (var41 != var2.offset) { // L: 2475 + throw new RuntimeException(); // L: 2476 } - - class35.localPlayer = null; // L: 2796 - - for (var14 = 0; var14 < npcs.length; ++var14) { // L: 2797 - NPC var32 = npcs[var14]; // L: 2798 - if (var32 != null) { // L: 2799 - var32.targetIndex = -1; // L: 2800 - var32.false0 = false; // L: 2801 + } + } else { + ++field673; // L: 2480 + if (field673 > 2000) { // L: 2481 + if (field845 < 1) { // L: 2482 + if (DesktopPlatformInfoProvider.currentPort == WorldMapLabelSize.worldPort) { // L: 2483 + DesktopPlatformInfoProvider.currentPort = GrandExchangeOfferTotalQuantityComparator.js5Port; + } else { + DesktopPlatformInfoProvider.currentPort = WorldMapLabelSize.worldPort; // L: 2484 } - } - class285.method5055(); // L: 2804 - updateGameState(30); // L: 2805 - - for (var14 = 0; var14 < 100; ++var14) { // L: 2806 - field825[var14] = true; - } - - var4 = HealthBarDefinition.getPacketBufferNode(ClientPacket.field2655, packetWriter.isaacCipher); // L: 2809 - var4.packetBuffer.writeByte(HitSplatDefinition.getWindowedMode()); // L: 2810 - var4.packetBuffer.writeShort(GameEngine.canvasWidth); // L: 2811 - var4.packetBuffer.writeShort(HealthBarDefinition.canvasHeight); // L: 2812 - packetWriter.addNode(var4); // L: 2813 - KeyHandler.updatePlayer(var2); // L: 2816 - if (var36 != var2.offset) { // L: 2817 - throw new RuntimeException(); // L: 2818 + ++field845; // L: 2485 + loginState = 0; // L: 2486 + } else { + MouseHandler.getLoginError(-3); // L: 2489 } } } + } else { + if (((AbstractSocket)var1).available() >= packetWriter.serverPacketLength) { // L: 2321 + var2.offset = 0; // L: 2322 + ((AbstractSocket)var1).read(var2.array, 0, packetWriter.serverPacketLength); // L: 2323 + timer.method5592(); // L: 2324 + mouseLastLastPressedTimeMillis = -1L; // L: 2327 + Skills.mouseRecorder.index = 0; // L: 2328 + WorldMapSection1.hasFocus = true; // L: 2329 + hadFocus = true; // L: 2330 + field809 = -1L; // L: 2331 + SoundCache.method811(); // L: 2332 + packetWriter.clearBuffer(); // L: 2333 + packetWriter.packetBuffer.offset = 0; // L: 2334 + packetWriter.serverPacket = null; // L: 2335 + packetWriter.field1411 = null; // L: 2336 + packetWriter.field1412 = null; // L: 2337 + packetWriter.field1400 = null; // L: 2338 + packetWriter.serverPacketLength = 0; // L: 2339 + packetWriter.field1409 = 0; // L: 2340 + rebootTimer = 0; // L: 2341 + logoutTimer = 0; // L: 2342 + hintArrowType = 0; // L: 2343 + class1.method11(); // L: 2344 + ArchiveDiskActionHandler.method4867(0); // L: 2345 + class43.method437(); // L: 2346 + isItemSelected = 0; // L: 2347 + isSpellSelected = false; // L: 2348 + soundEffectCount = 0; // L: 2349 + camAngleY = 0; // L: 2350 + oculusOrbState = 0; // L: 2351 + UserComparator3.field1444 = null; // L: 2352 + minimapState = 0; // L: 2353 + field872 = -1; // L: 2354 + destinationX = 0; // L: 2355 + destinationY = 0; // L: 2356 + playerAttackOption = AttackOption.AttackOption_hidden; // L: 2357 + npcAttackOption = AttackOption.AttackOption_hidden; // L: 2358 + npcCount = 0; // L: 2359 + Player.method2110(); // L: 2360 + + for (var41 = 0; var41 < 2048; ++var41) { // L: 2361 + players[var41] = null; + } + + for (var41 = 0; var41 < 32768; ++var41) { // L: 2362 + npcs[var41] = null; + } + + combatTargetPlayerIndex = -1; // L: 2363 + projectiles.clear(); // L: 2364 + graphicsObjects.clear(); // L: 2365 + + int var20; + for (var41 = 0; var41 < 4; ++var41) { // L: 2366 + for (var14 = 0; var14 < 104; ++var14) { // L: 2367 + for (var20 = 0; var20 < 104; ++var20) { // L: 2368 + groundItems[var41][var14][var20] = null; // L: 2369 + } + } + } + + pendingSpawns = new NodeDeque(); // L: 2373 + NetSocket.friendSystem.clear(); // L: 2374 + + for (var41 = 0; var41 < VarpDefinition.VarpDefinition_fileCount; ++var41) { // L: 2375 + VarpDefinition var32 = ClanSettings.VarpDefinition_get(var41); // L: 2376 + if (var32 != null) { // L: 2377 + Varps.Varps_temp[var41] = 0; // L: 2378 + Varps.Varps_main[var41] = 0; // L: 2379 + } + } + + GrandExchangeOfferOwnWorldComparator.varcs.clearTransient(); // L: 2382 + followerIndex = -1; // L: 2383 + if (rootInterface != -1) { // L: 2384 + var41 = rootInterface; // L: 2385 + if (var41 != -1 && Widget.Widget_loadedInterfaces[var41]) { // L: 2387 2388 + HealthBarUpdate.Widget_archive.clearFilesGroup(var41); // L: 2389 + if (Widget.Widget_interfaceComponents[var41] != null) { // L: 2390 + var42 = true; // L: 2391 + + for (var20 = 0; var20 < Widget.Widget_interfaceComponents[var41].length; ++var20) { // L: 2392 + if (Widget.Widget_interfaceComponents[var41][var20] != null) { // L: 2393 + if (Widget.Widget_interfaceComponents[var41][var20].type != 2) { // L: 2394 + Widget.Widget_interfaceComponents[var41][var20] = null; + } else { + var42 = false; // L: 2395 + } + } + } + + if (var42) { // L: 2398 + Widget.Widget_interfaceComponents[var41] = null; + } + + Widget.Widget_loadedInterfaces[var41] = false; // L: 2399 + } + } + } + + for (InterfaceParent var31 = (InterfaceParent)interfaceParents.first(); var31 != null; var31 = (InterfaceParent)interfaceParents.next()) { // L: 2402 + class43.closeInterface(var31, true); // L: 2403 + } + + rootInterface = -1; // L: 2405 + interfaceParents = new NodeHashTable(8); // L: 2406 + meslayerContinueWidget = null; // L: 2407 + class1.method11(); // L: 2408 + playerAppearance.update((int[])null, new int[]{0, 0, 0, 0, 0}, false, -1); // L: 2409 + + for (var41 = 0; var41 < 8; ++var41) { // L: 2410 + playerMenuActions[var41] = null; // L: 2411 + playerOptionsPriorities[var41] = false; // L: 2412 + } + + Skeleton.method3921(); // L: 2414 + isLoading = true; // L: 2415 + + for (var41 = 0; var41 < 100; ++var41) { // L: 2416 + field719[var41] = true; + } + + var26 = class21.getPacketBufferNode(ClientPacket.field2662, packetWriter.isaacCipher); // L: 2419 + var26.packetBuffer.writeByte(SpotAnimationDefinition.getWindowedMode()); // L: 2420 + var26.packetBuffer.writeShort(class32.canvasWidth); // L: 2421 + var26.packetBuffer.writeShort(ReflectionCheck.canvasHeight); // L: 2422 + packetWriter.addNode(var26); // L: 2423 + WorldMapRegion.friendsChat = null; // L: 2425 + NPCComposition.guestClanSettings = null; // L: 2426 + Arrays.fill(currentClanSettings, (Object)null); // L: 2427 + ApproximateRouteStrategy.guestClanChannel = null; // L: 2428 + Arrays.fill(currentClanChannels, (Object)null); // L: 2429 + + for (var41 = 0; var41 < 8; ++var41) { // L: 2430 + grandExchangeOffers[var41] = new GrandExchangeOffer(); + } + + BuddyRankComparator.grandExchangeEvents = null; // L: 2431 + Coord.updatePlayer(var2); // L: 2433 + GrandExchangeOfferOwnWorldComparator.field632 = -1; // L: 2434 + class339.loadRegions(false, var2); // L: 2435 + packetWriter.serverPacket = null; // L: 2436 + } + } } - } catch (IOException var24) { // L: 2835 - if (field749 < 1) { // L: 2836 - if (BoundaryObject.currentPort == class69.worldPort) { // L: 2837 - BoundaryObject.currentPort = class24.js5Port; + } catch (IOException var25) { // L: 2493 + if (field845 < 1) { // L: 2494 + if (DesktopPlatformInfoProvider.currentPort == WorldMapLabelSize.worldPort) { // L: 2495 + DesktopPlatformInfoProvider.currentPort = GrandExchangeOfferTotalQuantityComparator.js5Port; } else { - BoundaryObject.currentPort = class69.worldPort; // L: 2838 + DesktopPlatformInfoProvider.currentPort = WorldMapLabelSize.worldPort; // L: 2496 } - ++field749; // L: 2839 - loginState = 0; // L: 2840 + ++field845; // L: 2497 + loginState = 0; // L: 2498 } else { - class22.getLoginError(-2); // L: 2843 + MouseHandler.getLoginError(-2); // L: 2501 } } - } // L: 2665 2747 2820 2829 2832 2841 2844 2846 + } // L: 2253 2438 2478 2487 2490 2499 2502 2504 - @ObfuscatedName("fc") + @ObfuscatedName("fg") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "-784204391" + garbageValue = "-1496762169" ) @Export("doCycleLoggedIn") final void doCycleLoggedIn() { - if (rebootTimer > 1) { // L: 3128 + if (rebootTimer > 1) { // L: 2716 --rebootTimer; } - if (logoutTimer > 0) { // L: 3129 + if (logoutTimer > 0) { // L: 2717 --logoutTimer; } - if (hadNetworkError) { // L: 3130 - hadNetworkError = false; // L: 3131 - BuddyRankComparator.method2492(); // L: 3132 + if (hadNetworkError) { // L: 2718 + hadNetworkError = false; // L: 2719 + NetFileRequest.method4912(); // L: 2720 } else { - if (!isMenuOpen) { // L: 3135 - WorldMapEvent.addCancelMenuEntry(); + if (!isMenuOpen) { // L: 2723 + NetSocket.addCancelMenuEntry(); } int var1; - for (var1 = 0; var1 < 100 && this.method1230(packetWriter); ++var1) { // L: 3136 3137 + for (var1 = 0; var1 < 100 && this.method1192(packetWriter); ++var1) { // L: 2724 2725 } - if (gameState == 30) { // L: 3139 + if (gameState == 30) { // L: 2727 int var2; - PacketBufferNode var15; - while (StructComposition.method2846()) { // L: 3140 - var15 = HealthBarDefinition.getPacketBufferNode(ClientPacket.field2666, packetWriter.isaacCipher); // L: 3141 - var15.packetBuffer.writeByte(0); // L: 3142 - var2 = var15.packetBuffer.offset; // L: 3143 - class2.performReflectionCheck(var15.packetBuffer); // L: 3144 - var15.packetBuffer.writeLengthByte(var15.packetBuffer.offset - var2); // L: 3145 - packetWriter.addNode(var15); // L: 3146 + PacketBufferNode var14; + while (class20.method231()) { // L: 2728 + var14 = class21.getPacketBufferNode(ClientPacket.field2584, packetWriter.isaacCipher); // L: 2729 + var14.packetBuffer.writeByte(0); // L: 2730 + var2 = var14.packetBuffer.offset; // L: 2731 + UserComparator3.performReflectionCheck(var14.packetBuffer); // L: 2732 + var14.packetBuffer.writeLengthByte(var14.packetBuffer.offset - var2); // L: 2733 + packetWriter.addNode(var14); // L: 2734 } - if (timer.field3791) { // L: 3148 - var15 = HealthBarDefinition.getPacketBufferNode(ClientPacket.field2638, packetWriter.isaacCipher); // L: 3150 - var15.packetBuffer.writeByte(0); // L: 3151 - var2 = var15.packetBuffer.offset; // L: 3152 - timer.write(var15.packetBuffer); // L: 3153 - var15.packetBuffer.writeLengthByte(var15.packetBuffer.offset - var2); // L: 3154 - packetWriter.addNode(var15); // L: 3155 - timer.method5467(); // L: 3156 + if (timer.field3769) { // L: 2736 + var14 = class21.getPacketBufferNode(ClientPacket.field2645, packetWriter.isaacCipher); // L: 2738 + var14.packetBuffer.writeByte(0); // L: 2739 + var2 = var14.packetBuffer.offset; // L: 2740 + timer.write(var14.packetBuffer); // L: 2741 + var14.packetBuffer.writeLengthByte(var14.packetBuffer.offset - var2); // L: 2742 + packetWriter.addNode(var14); // L: 2743 + timer.method5593(); // L: 2744 } int var3; @@ -3770,2682 +3260,2746 @@ public final class Client extends GameEngine implements Usernamed { int var10; int var11; int var12; - synchronized(class69.mouseRecorder.lock) { // L: 3159 - if (!field767) { // L: 3160 - class69.mouseRecorder.index = 0; // L: 3246 - } else if (MouseHandler.MouseHandler_lastButton != 0 || class69.mouseRecorder.index >= 40) { // L: 3161 - PacketBufferNode var16 = null; // L: 3163 - var3 = 0; // L: 3164 - var4 = 0; // L: 3165 - var5 = 0; // L: 3166 - var6 = 0; // L: 3167 + PacketBuffer var10000; + synchronized(Skills.mouseRecorder.lock) { // L: 2747 + if (!field889) { // L: 2748 + Skills.mouseRecorder.index = 0; // L: 2834 + } else if (MouseHandler.MouseHandler_lastButton != 0 || Skills.mouseRecorder.index >= 40) { // L: 2749 + PacketBufferNode var15 = null; // L: 2751 + var3 = 0; // L: 2752 + var4 = 0; // L: 2753 + var5 = 0; // L: 2754 + var6 = 0; // L: 2755 - for (var7 = 0; var7 < class69.mouseRecorder.index && (var16 == null || var16.packetBuffer.offset - var3 < 246); ++var7) { // L: 3168 3169 - var4 = var7; // L: 3170 - var8 = class69.mouseRecorder.ys[var7]; // L: 3171 - if (var8 < -1) { // L: 3172 + for (var7 = 0; var7 < Skills.mouseRecorder.index && (var15 == null || var15.packetBuffer.offset - var3 < 246); ++var7) { // L: 2756 2757 + var4 = var7; // L: 2758 + var8 = Skills.mouseRecorder.ys[var7]; // L: 2759 + if (var8 < -1) { // L: 2760 var8 = -1; - } else if (var8 > 65534) { // L: 3173 + } else if (var8 > 65534) { // L: 2761 var8 = 65534; } - var9 = class69.mouseRecorder.xs[var7]; // L: 3174 - if (var9 < -1) { // L: 3175 + var9 = Skills.mouseRecorder.xs[var7]; // L: 2762 + if (var9 < -1) { // L: 2763 var9 = -1; - } else if (var9 > 65534) { // L: 3176 + } else if (var9 > 65534) { // L: 2764 var9 = 65534; } - if (var9 != field627 || var8 != field837) { // L: 3177 - if (var16 == null) { // L: 3180 - var16 = HealthBarDefinition.getPacketBufferNode(ClientPacket.field2646, packetWriter.isaacCipher); // L: 3181 - var16.packetBuffer.writeByte(0); // L: 3182 - var3 = var16.packetBuffer.offset; // L: 3183 - PacketBuffer var10000 = var16.packetBuffer; // L: 3184 + if (var9 != field651 || var8 != field812) { // L: 2765 + if (var15 == null) { // L: 2768 + var15 = class21.getPacketBufferNode(ClientPacket.field2628, packetWriter.isaacCipher); // L: 2769 + var15.packetBuffer.writeByte(0); // L: 2770 + var3 = var15.packetBuffer.offset; // L: 2771 + var10000 = var15.packetBuffer; // L: 2772 var10000.offset += 2; - var5 = 0; // L: 3185 - var6 = 0; // L: 3186 + var5 = 0; // L: 2773 + var6 = 0; // L: 2774 } - if (-1L != field629) { // L: 3191 - var10 = var9 - field627; // L: 3192 - var11 = var8 - field837; // L: 3193 - var12 = (int)((class69.mouseRecorder.millis[var7] - field629) / 20L); // L: 3194 - var5 = (int)((long)var5 + (class69.mouseRecorder.millis[var7] - field629) % 20L); // L: 3195 + if (-1L != field653) { // L: 2779 + var10 = var9 - field651; // L: 2780 + var11 = var8 - field812; // L: 2781 + var12 = (int)((Skills.mouseRecorder.millis[var7] - field653) / 20L); // L: 2782 + var5 = (int)((long)var5 + (Skills.mouseRecorder.millis[var7] - field653) % 20L); // L: 2783 } else { - var10 = var9; // L: 3198 - var11 = var8; // L: 3199 - var12 = Integer.MAX_VALUE; // L: 3200 + var10 = var9; // L: 2786 + var11 = var8; // L: 2787 + var12 = Integer.MAX_VALUE; // L: 2788 } - field627 = var9; // L: 3202 - field837 = var8; // L: 3203 - if (var12 < 8 && var10 >= -32 && var10 <= 31 && var11 >= -32 && var11 <= 31) { // L: 3204 - var10 += 32; // L: 3205 - var11 += 32; // L: 3206 - var16.packetBuffer.writeShort((var12 << 12) + var11 + (var10 << 6)); // L: 3207 - } else if (var12 < 32 && var10 >= -128 && var10 <= 127 && var11 >= -128 && var11 <= 127) { // L: 3209 - var10 += 128; // L: 3210 - var11 += 128; // L: 3211 - var16.packetBuffer.writeByte(var12 + 128); // L: 3212 - var16.packetBuffer.writeShort(var11 + (var10 << 8)); // L: 3213 - } else if (var12 < 32) { // L: 3215 - var16.packetBuffer.writeByte(var12 + 192); // L: 3216 - if (var9 != -1 && var8 != -1) { // L: 3217 - var16.packetBuffer.writeInt(var9 | var8 << 16); // L: 3218 + field651 = var9; // L: 2790 + field812 = var8; // L: 2791 + if (var12 < 8 && var10 >= -32 && var10 <= 31 && var11 >= -32 && var11 <= 31) { // L: 2792 + var10 += 32; // L: 2793 + var11 += 32; // L: 2794 + var15.packetBuffer.writeShort((var12 << 12) + var11 + (var10 << 6)); // L: 2795 + } else if (var12 < 32 && var10 >= -128 && var10 <= 127 && var11 >= -128 && var11 <= 127) { // L: 2797 + var10 += 128; // L: 2798 + var11 += 128; // L: 2799 + var15.packetBuffer.writeByte(var12 + 128); // L: 2800 + var15.packetBuffer.writeShort(var11 + (var10 << 8)); // L: 2801 + } else if (var12 < 32) { // L: 2803 + var15.packetBuffer.writeByte(var12 + 192); // L: 2804 + if (var9 != -1 && var8 != -1) { // L: 2805 + var15.packetBuffer.writeInt(var9 | var8 << 16); // L: 2806 } else { - var16.packetBuffer.writeInt(Integer.MIN_VALUE); + var15.packetBuffer.writeInt(Integer.MIN_VALUE); } } else { - var16.packetBuffer.writeShort((var12 & 8191) + 57344); // L: 3221 - if (var9 != -1 && var8 != -1) { // L: 3222 - var16.packetBuffer.writeInt(var9 | var8 << 16); // L: 3223 + var15.packetBuffer.writeShort((var12 & 8191) + 57344); // L: 2809 + if (var9 != -1 && var8 != -1) { // L: 2810 + var15.packetBuffer.writeInt(var9 | var8 << 16); // L: 2811 } else { - var16.packetBuffer.writeInt(Integer.MIN_VALUE); + var15.packetBuffer.writeInt(Integer.MIN_VALUE); } } - ++var6; // L: 3225 - field629 = class69.mouseRecorder.millis[var7]; // L: 3226 + ++var6; // L: 2813 + field653 = Skills.mouseRecorder.millis[var7]; // L: 2814 } } - if (var16 != null) { // L: 3228 - var16.packetBuffer.writeLengthByte(var16.packetBuffer.offset - var3); // L: 3229 - var7 = var16.packetBuffer.offset; // L: 3230 - var16.packetBuffer.offset = var3; // L: 3231 - var16.packetBuffer.writeByte(var5 / var6); // L: 3232 - var16.packetBuffer.writeByte(var5 % var6); // L: 3233 - var16.packetBuffer.offset = var7; // L: 3234 - packetWriter.addNode(var16); // L: 3235 + if (var15 != null) { // L: 2816 + var15.packetBuffer.writeLengthByte(var15.packetBuffer.offset - var3); // L: 2817 + var7 = var15.packetBuffer.offset; // L: 2818 + var15.packetBuffer.offset = var3; // L: 2819 + var15.packetBuffer.writeByte(var5 / var6); // L: 2820 + var15.packetBuffer.writeByte(var5 % var6); // L: 2821 + var15.packetBuffer.offset = var7; // L: 2822 + packetWriter.addNode(var15); // L: 2823 } - if (var4 >= class69.mouseRecorder.index) { // L: 3237 - class69.mouseRecorder.index = 0; + if (var4 >= Skills.mouseRecorder.index) { // L: 2825 + Skills.mouseRecorder.index = 0; } else { - MouseRecorder var43 = class69.mouseRecorder; // L: 3239 - var43.index -= var4; - System.arraycopy(class69.mouseRecorder.xs, var4, class69.mouseRecorder.xs, 0, class69.mouseRecorder.index); // L: 3240 - System.arraycopy(class69.mouseRecorder.ys, var4, class69.mouseRecorder.ys, 0, class69.mouseRecorder.index); // L: 3241 - System.arraycopy(class69.mouseRecorder.millis, var4, class69.mouseRecorder.millis, 0, class69.mouseRecorder.index); // L: 3242 + MouseRecorder var48 = Skills.mouseRecorder; // L: 2827 + var48.index -= var4; + System.arraycopy(Skills.mouseRecorder.xs, var4, Skills.mouseRecorder.xs, 0, Skills.mouseRecorder.index); // L: 2828 + System.arraycopy(Skills.mouseRecorder.ys, var4, Skills.mouseRecorder.ys, 0, Skills.mouseRecorder.index); // L: 2829 + System.arraycopy(Skills.mouseRecorder.millis, var4, Skills.mouseRecorder.millis, 0, Skills.mouseRecorder.index); // L: 2830 } } } - PacketBufferNode var19; - if (MouseHandler.MouseHandler_lastButton == 1 || !class229.mouseCam && MouseHandler.MouseHandler_lastButton == 4 || MouseHandler.MouseHandler_lastButton == 2) { // L: 3248 - long var17 = MouseHandler.MouseHandler_lastPressedTimeMillis - mouseLastLastPressedTimeMillis; // L: 3249 - if (var17 > 32767L) { // L: 3250 - var17 = 32767L; + PacketBufferNode var18; + if (MouseHandler.MouseHandler_lastButton == 1 || !mouseCam && MouseHandler.MouseHandler_lastButton == 4 || MouseHandler.MouseHandler_lastButton == 2) { // L: 2836 + long var16 = MouseHandler.MouseHandler_lastPressedTimeMillis - mouseLastLastPressedTimeMillis; // L: 2837 + if (var16 > 32767L) { // L: 2838 + var16 = 32767L; } - mouseLastLastPressedTimeMillis = MouseHandler.MouseHandler_lastPressedTimeMillis; // L: 3251 - var3 = MouseHandler.MouseHandler_lastPressedY; // L: 3252 - if (var3 < 0) { // L: 3253 + mouseLastLastPressedTimeMillis = MouseHandler.MouseHandler_lastPressedTimeMillis; // L: 2839 + var3 = MouseHandler.MouseHandler_lastPressedY; // L: 2840 + if (var3 < 0) { // L: 2841 var3 = 0; - } else if (var3 > HealthBarDefinition.canvasHeight) { // L: 3254 - var3 = HealthBarDefinition.canvasHeight; + } else if (var3 > ReflectionCheck.canvasHeight) { // L: 2842 + var3 = ReflectionCheck.canvasHeight; } - var4 = MouseHandler.MouseHandler_lastPressedX; // L: 3255 - if (var4 < 0) { // L: 3256 + var4 = MouseHandler.MouseHandler_lastPressedX; // L: 2843 + if (var4 < 0) { // L: 2844 var4 = 0; - } else if (var4 > GameEngine.canvasWidth) { // L: 3257 - var4 = GameEngine.canvasWidth; + } else if (var4 > class32.canvasWidth) { // L: 2845 + var4 = class32.canvasWidth; } - var5 = (int)var17; // L: 3258 - var19 = HealthBarDefinition.getPacketBufferNode(ClientPacket.field2578, packetWriter.isaacCipher); // L: 3259 - var19.packetBuffer.writeShort((var5 << 1) + (MouseHandler.MouseHandler_lastButton == 2 ? 1 : 0)); // L: 3260 - var19.packetBuffer.writeShort(var4); // L: 3261 - var19.packetBuffer.writeShort(var3); // L: 3262 - packetWriter.addNode(var19); // L: 3263 + var5 = (int)var16; // L: 2846 + var18 = class21.getPacketBufferNode(ClientPacket.field2663, packetWriter.isaacCipher); // L: 2847 + var18.packetBuffer.writeShort((MouseHandler.MouseHandler_lastButton == 2 ? 1 : 0) + (var5 << 1)); // L: 2848 + var18.packetBuffer.writeShort(var4); // L: 2849 + var18.packetBuffer.writeShort(var3); // L: 2850 + packetWriter.addNode(var18); // L: 2851 } - if (KeyHandler.field276 > 0) { // L: 3265 - var15 = HealthBarDefinition.getPacketBufferNode(ClientPacket.field2566, packetWriter.isaacCipher); // L: 3266 - var15.packetBuffer.writeShort(0); // L: 3267 - var2 = var15.packetBuffer.offset; // L: 3268 - long var20 = Archive.currentTimeMillis(); // L: 3269 + if (KeyHandler.field292 > 0) { // L: 2853 + var14 = class21.getPacketBufferNode(ClientPacket.field2573, packetWriter.isaacCipher); // L: 2854 + var14.packetBuffer.writeShort(0); // L: 2855 + var2 = var14.packetBuffer.offset; // L: 2856 + long var19 = ObjectComposition.currentTimeMillis(); // L: 2857 - for (var5 = 0; var5 < KeyHandler.field276; ++var5) { // L: 3270 - long var22 = var20 - field799; // L: 3271 - if (var22 > 16777215L) { // L: 3272 - var22 = 16777215L; + for (var5 = 0; var5 < KeyHandler.field292; ++var5) { // L: 2858 + long var21 = var19 - field809; // L: 2859 + if (var21 > 16777215L) { // L: 2860 + var21 = 16777215L; } - field799 = var20; // L: 3273 - var15.packetBuffer.method6475(KeyHandler.field275[var5]); // L: 3274 - var15.packetBuffer.method6491((int)var22); // L: 3275 + field809 = var19; // L: 2861 + var14.packetBuffer.method6594(KeyHandler.field274[var5]); // L: 2862 + var14.packetBuffer.method6758((int)var21); // L: 2863 } - var15.packetBuffer.writeLengthShort(var15.packetBuffer.offset - var2); // L: 3277 - packetWriter.addNode(var15); // L: 3278 + var14.packetBuffer.writeLengthShort(var14.packetBuffer.offset - var2); // L: 2865 + packetWriter.addNode(var14); // L: 2866 } - if (field700 > 0) { // L: 3280 - --field700; + if (field725 > 0) { // L: 2868 + --field725; } - if (KeyHandler.KeyHandler_pressedKeys[96] || KeyHandler.KeyHandler_pressedKeys[97] || KeyHandler.KeyHandler_pressedKeys[98] || KeyHandler.KeyHandler_pressedKeys[99]) { // L: 3281 - field701 = true; + if (KeyHandler.KeyHandler_pressedKeys[96] || KeyHandler.KeyHandler_pressedKeys[97] || KeyHandler.KeyHandler_pressedKeys[98] || KeyHandler.KeyHandler_pressedKeys[99]) { // L: 2869 + field726 = true; } - if (field701 && field700 <= 0) { // L: 3282 - field700 = 20; // L: 3283 - field701 = false; // L: 3284 - var15 = HealthBarDefinition.getPacketBufferNode(ClientPacket.field2623, packetWriter.isaacCipher); // L: 3286 - var15.packetBuffer.method6483(camAngleX); // L: 3287 - var15.packetBuffer.writeShort(camAngleY); // L: 3288 - packetWriter.addNode(var15); // L: 3289 + if (field726 && field725 <= 0) { // L: 2870 + field725 = 20; // L: 2871 + field726 = false; // L: 2872 + var14 = class21.getPacketBufferNode(ClientPacket.field2630, packetWriter.isaacCipher); // L: 2874 + var14.packetBuffer.method6619(camAngleX); // L: 2875 + var14.packetBuffer.writeShort(camAngleY); // L: 2876 + packetWriter.addNode(var14); // L: 2877 } - if (class124.hasFocus && !hadFocus) { // L: 3291 - hadFocus = true; // L: 3292 - var15 = HealthBarDefinition.getPacketBufferNode(ClientPacket.field2576, packetWriter.isaacCipher); // L: 3294 - var15.packetBuffer.writeByte(1); // L: 3295 - packetWriter.addNode(var15); // L: 3296 + if (WorldMapSection1.hasFocus && !hadFocus) { // L: 2879 + hadFocus = true; // L: 2880 + var14 = class21.getPacketBufferNode(ClientPacket.field2580, packetWriter.isaacCipher); // L: 2882 + var14.packetBuffer.writeByte(1); // L: 2883 + packetWriter.addNode(var14); // L: 2884 } - if (!class124.hasFocus && hadFocus) { // L: 3298 - hadFocus = false; // L: 3299 - var15 = HealthBarDefinition.getPacketBufferNode(ClientPacket.field2576, packetWriter.isaacCipher); // L: 3301 - var15.packetBuffer.writeByte(0); // L: 3302 - packetWriter.addNode(var15); // L: 3303 + if (!WorldMapSection1.hasFocus && hadFocus) { // L: 2886 + hadFocus = false; // L: 2887 + var14 = class21.getPacketBufferNode(ClientPacket.field2580, packetWriter.isaacCipher); // L: 2889 + var14.packetBuffer.writeByte(0); // L: 2890 + packetWriter.addNode(var14); // L: 2891 } - if (NetSocket.worldMap != null) { // L: 3306 - NetSocket.worldMap.method6124(); + if (class243.worldMap != null) { // L: 2894 + class243.worldMap.method6100(); } - if (FloorOverlayDefinition.ClanChat_inClanChat) { // L: 3308 - if (class25.clanChat != null) { // L: 3309 - class25.clanChat.sort(); // L: 3310 + if (MusicPatch.ClanChat_inClanChat) { // L: 2896 + if (WorldMapRegion.friendsChat != null) { // L: 2897 + WorldMapRegion.friendsChat.sort(); // L: 2898 } - for (var1 = 0; var1 < Players.Players_count; ++var1) { // L: 3313 - Player var38 = players[Players.Players_indices[var1]]; // L: 3314 - var38.clearIsInClanChat(); // L: 3315 - } - - FloorOverlayDefinition.ClanChat_inClanChat = false; // L: 3318 + ClanChannelMember.method85(); // L: 2900 + MusicPatch.ClanChat_inClanChat = false; // L: 2901 } - Buffer.method6602(); // L: 3321 - if (field848 != ParamComposition.Client_plane) { // L: 3323 - field848 = ParamComposition.Client_plane; // L: 3324 - KeyHandler.createMinimapSprite(ParamComposition.Client_plane); // L: 3325 + VarbitComposition.method2846(); // L: 2904 + if (class22.Client_plane != field872) { // L: 2906 + field872 = class22.Client_plane; // L: 2907 + GraphicsObject.createMinimapSprite(class22.Client_plane); // L: 2908 } - if (gameState == 30) { // L: 3328 - for (PendingSpawn var36 = (PendingSpawn)pendingSpawns.last(); var36 != null; var36 = (PendingSpawn)pendingSpawns.previous()) { // L: 3330 3331 3374 - if (var36.hitpoints > 0) { // L: 3332 - --var36.hitpoints; + if (gameState == 30) { // L: 2911 + for (PendingSpawn var32 = (PendingSpawn)pendingSpawns.last(); var32 != null; var32 = (PendingSpawn)pendingSpawns.previous()) { // L: 2913 2914 2957 + if (var32.hitpoints > 0) { // L: 2915 + --var32.hitpoints; } - ObjectComposition var24; - boolean var32; - if (var36.hitpoints == 0) { // L: 3333 - if (var36.objectId >= 0) { // L: 3335 - var3 = var36.objectId; // L: 3337 - var4 = var36.field1203; // L: 3338 - var24 = AttackOption.getObjectDefinition(var3); // L: 3340 - if (var4 == 11) { // L: 3341 + ObjectComposition var23; + boolean var30; + if (var32.hitpoints == 0) { // L: 2916 + if (var32.objectId >= 0) { // L: 2918 + var3 = var32.objectId; // L: 2920 + var4 = var32.field1229; // L: 2921 + var23 = class23.getObjectDefinition(var3); // L: 2923 + if (var4 == 11) { // L: 2924 var4 = 10; } - if (var4 >= 5 && var4 <= 8) { // L: 3342 + if (var4 >= 5 && var4 <= 8) { // L: 2925 var4 = 4; } - var32 = var24.method2916(var4); // L: 3343 - if (!var32) { // L: 3345 + var30 = var23.method2956(var4); // L: 2926 + if (!var30) { // L: 2928 continue; } } - Message.addPendingSpawnToScene(var36.plane, var36.type, var36.x, var36.y, var36.objectId, var36.field1199, var36.field1203); // L: 3347 - var36.remove(); // L: 3348 + class247.addPendingSpawnToScene(var32.plane, var32.type, var32.x, var32.y, var32.objectId, var32.field1225, var32.field1229); // L: 2930 + var32.remove(); // L: 2931 } else { - if (var36.delay > 0) { // L: 3352 - --var36.delay; + if (var32.delay > 0) { // L: 2935 + --var32.delay; } - if (var36.delay == 0 && var36.x >= 1 && var36.y >= 1 && var36.x <= 102 && var36.y <= 102) { // L: 3353 - if (var36.id >= 0) { // L: 3355 - var3 = var36.id; // L: 3357 - var4 = var36.field1196; // L: 3358 - var24 = AttackOption.getObjectDefinition(var3); // L: 3360 - if (var4 == 11) { // L: 3361 + if (var32.delay == 0 && var32.x >= 1 && var32.y >= 1 && var32.x <= 102 && var32.y <= 102) { // L: 2936 + if (var32.id >= 0) { // L: 2938 + var3 = var32.id; // L: 2940 + var4 = var32.field1232; // L: 2941 + var23 = class23.getObjectDefinition(var3); // L: 2943 + if (var4 == 11) { // L: 2944 var4 = 10; } - if (var4 >= 5 && var4 <= 8) { // L: 3362 + if (var4 >= 5 && var4 <= 8) { // L: 2945 var4 = 4; } - var32 = var24.method2916(var4); // L: 3363 - if (!var32) { // L: 3365 + var30 = var23.method2956(var4); // L: 2946 + if (!var30) { // L: 2948 continue; } } - Message.addPendingSpawnToScene(var36.plane, var36.type, var36.x, var36.y, var36.id, var36.orientation, var36.field1196); // L: 3367 - var36.delay = -1; // L: 3368 - if (var36.id == var36.objectId && var36.objectId == -1) { // L: 3369 - var36.remove(); - } else if (var36.id == var36.objectId && var36.orientation == var36.field1199 && var36.field1196 == var36.field1203) { // L: 3370 - var36.remove(); + class247.addPendingSpawnToScene(var32.plane, var32.type, var32.x, var32.y, var32.id, var32.orientation, var32.field1232); // L: 2950 + var32.delay = -1; // L: 2951 + if (var32.objectId == var32.id && var32.objectId == -1) { // L: 2952 + var32.remove(); + } else if (var32.id == var32.objectId && var32.orientation == var32.field1225 && var32.field1229 == var32.field1232) { // L: 2953 + var32.remove(); } } } } - class15.method228(); // L: 3377 - ++packetWriter.field1384; // L: 3378 - if (packetWriter.field1384 > 750) { // L: 3379 - BuddyRankComparator.method2492(); // L: 3380 + int var10002; + for (var1 = 0; var1 < soundEffectCount; ++var1) { // L: 2961 + var10002 = queuedSoundEffectDelays[var1]--; // L: 2962 + if (queuedSoundEffectDelays[var1] >= -10) { // L: 2963 + SoundEffect var34 = soundEffects[var1]; // L: 2975 + if (var34 == null) { // L: 2976 + var10000 = null; // L: 2977 + var34 = SoundEffect.readSoundEffect(class32.archive4, soundEffectIds[var1], 0); + if (var34 == null) { // L: 2978 + continue; + } + + int[] var49 = queuedSoundEffectDelays; // L: 2979 + var49[var1] += var34.calculateDelay(); + soundEffects[var1] = var34; // L: 2980 + } + + if (queuedSoundEffectDelays[var1] < 0) { // L: 2986 + if (soundLocations[var1] != 0) { // L: 2988 + var4 = (soundLocations[var1] & 255) * 128; // L: 2989 + var5 = soundLocations[var1] >> 16 & 255; // L: 2990 + var6 = var5 * 128 + 64 - class93.localPlayer.x; // L: 2991 + if (var6 < 0) { // L: 2992 + var6 = -var6; + } + + var7 = soundLocations[var1] >> 8 & 255; // L: 2993 + var8 = var7 * 128 + 64 - class93.localPlayer.y; // L: 2994 + if (var8 < 0) { // L: 2995 + var8 = -var8; + } + + var9 = var6 + var8 - 128; // L: 2996 + if (var9 > var4) { // L: 2997 + queuedSoundEffectDelays[var1] = -100; // L: 2998 + continue; // L: 2999 + } + + if (var9 < 0) { // L: 3001 + var9 = 0; + } + + var3 = (var4 - var9) * ObjectComposition.clientPreferences.areaSoundEffectsVolume / var4; // L: 3002 + } else { + var3 = ObjectComposition.clientPreferences.soundEffectsVolume; // L: 3004 + } + + if (var3 > 0) { // L: 3005 + RawSound var24 = var34.toRawSound().resample(TileItem.decimator); // L: 3006 + RawPcmStream var38 = RawPcmStream.createRawPcmStream(var24, 100, var3); // L: 3007 + var38.setNumLoops(queuedSoundEffectLoops[var1] - 1); // L: 3008 + class308.pcmStreamMixer.addSubStream(var38); // L: 3009 + } + + queuedSoundEffectDelays[var1] = -100; // L: 3011 + } + } else { + --soundEffectCount; // L: 2964 + + for (var2 = var1; var2 < soundEffectCount; ++var2) { // L: 2965 + soundEffectIds[var2] = soundEffectIds[var2 + 1]; // L: 2966 + soundEffects[var2] = soundEffects[var2 + 1]; // L: 2967 + queuedSoundEffectLoops[var2] = queuedSoundEffectLoops[var2 + 1]; // L: 2968 + queuedSoundEffectDelays[var2] = queuedSoundEffectDelays[var2 + 1]; // L: 2969 + soundLocations[var2] = soundLocations[var2 + 1]; // L: 2970 + } + + --var1; // L: 2972 + } + } + + if (field881) { // L: 3014 + boolean var29; + if (class232.musicPlayerStatus != 0) { // L: 3017 + var29 = true; // L: 3018 + } else { + var29 = class124.midiPcmStream.isReady(); // L: 3021 + } + + if (!var29) { // L: 3023 + if (ObjectComposition.clientPreferences.musicVolume != 0 && currentTrackGroupId != -1) { // L: 3024 + LoginScreenAnimation.method2219(UrlRequest.archive6, currentTrackGroupId, 0, ObjectComposition.clientPreferences.musicVolume, false); + } + + field881 = false; // L: 3025 + } + } + + ++packetWriter.field1409; // L: 3029 + if (packetWriter.field1409 > 750) { // L: 3030 + NetFileRequest.method4912(); // L: 3031 } else { - ItemComposition.method3006(); // L: 3383 - MouseHandler.method686(); // L: 3384 - HorizontalAlignment.method2733(); // L: 3385 - ++field768; // L: 3386 - if (mouseCrossColor != 0) { // L: 3387 - mouseCrossState += 20; // L: 3388 - if (mouseCrossState >= 400) { // L: 3389 + var1 = Players.Players_count; // L: 3035 + int[] var35 = Players.Players_indices; // L: 3036 + + for (var3 = 0; var3 < var1; ++var3) { // L: 3037 + Player var40 = players[var35[var3]]; // L: 3038 + if (var40 != null) { // L: 3039 + class7.updateActorSequence(var40, 1); // L: 3040 + } + } + + for (var1 = 0; var1 < npcCount; ++var1) { // L: 3045 + var2 = npcIndices[var1]; // L: 3046 + NPC var25 = npcs[var2]; // L: 3047 + if (var25 != null) { // L: 3048 + class7.updateActorSequence(var25, var25.definition.size); // L: 3049 + } + } + + ClanSettings.method165(); // L: 3053 + ++field913; // L: 3054 + if (mouseCrossColor != 0) { // L: 3055 + mouseCrossState += 20; // L: 3056 + if (mouseCrossState >= 400) { // L: 3057 mouseCrossColor = 0; } } - if (Projectile.field1039 != null) { // L: 3391 - ++field817; // L: 3392 - if (field817 >= 15) { // L: 3393 - VerticalAlignment.invalidateWidget(Projectile.field1039); // L: 3394 - Projectile.field1039 = null; // L: 3395 + if (GrandExchangeEvents.field3626 != null) { // L: 3059 + ++field747; // L: 3060 + if (field747 >= 15) { // L: 3061 + WorldMapCacheName.invalidateWidget(GrandExchangeEvents.field3626); // L: 3062 + GrandExchangeEvents.field3626 = null; // L: 3063 } } - Widget var37 = SpriteMask.mousedOverWidgetIf1; // L: 3398 - Widget var39 = class34.field241; // L: 3399 - SpriteMask.mousedOverWidgetIf1 = null; // L: 3400 - class34.field241 = null; // L: 3401 - draggedOnWidget = null; // L: 3402 - field797 = false; // L: 3403 - field794 = false; // L: 3404 - field842 = 0; // L: 3405 + Widget var33 = World.mousedOverWidgetIf1; // L: 3066 + Widget var36 = ReflectionCheck.field609; // L: 3067 + World.mousedOverWidgetIf1 = null; // L: 3068 + ReflectionCheck.field609 = null; // L: 3069 + draggedOnWidget = null; // L: 3070 + field822 = false; // L: 3071 + field819 = false; // L: 3072 + field806 = 0; // L: 3073 - while (class17.isKeyDown() && field842 < 128) { // L: 3406 - if (staffModLevel >= 2 && KeyHandler.KeyHandler_pressedKeys[82] && MenuAction.field982 == 66) { // L: 3407 - String var25 = Login.method1986(); // L: 3408 - class303.client.clipboardSetString(var25); // L: 3409 - } else if (oculusOrbState != 1 || class25.field207 <= 0) { // L: 3412 - field844[field842] = MenuAction.field982; // L: 3415 - field746[field842] = class25.field207; // L: 3416 - ++field842; // L: 3417 + while (ClanChannelMember.isKeyDown() && field806 < 128) { // L: 3074 + if (staffModLevel >= 2 && KeyHandler.KeyHandler_pressedKeys[82] && ItemComposition.field1859 == 66) { // L: 3075 + String var42 = ""; // L: 3078 + + Message var37; + for (Iterator var39 = Messages.Messages_hashTable.iterator(); var39.hasNext(); var42 = var42 + var37.sender + ':' + var37.text + '\n') { // L: 3079 3082 + var37 = (Message)var39.next(); // L: 3080 + } + + class23.client.clipboardSetString(var42); // L: 3088 + } else if (oculusOrbState != 1 || class249.field3116 <= 0) { // L: 3091 + field868[field806] = ItemComposition.field1859; // L: 3094 + field867[field806] = class249.field3116; // L: 3095 + ++field806; // L: 3096 } } - boolean var33 = staffModLevel >= 2; // L: 3421 - if (var33 && KeyHandler.KeyHandler_pressedKeys[82] && KeyHandler.KeyHandler_pressedKeys[81] && mouseWheelRotation != 0) { // L: 3423 - var4 = class35.localPlayer.plane - mouseWheelRotation; // L: 3424 - if (var4 < 0) { // L: 3425 - var4 = 0; - } else if (var4 > 3) { // L: 3426 - var4 = 3; + if (FontName.method6297() && KeyHandler.KeyHandler_pressedKeys[82] && KeyHandler.KeyHandler_pressedKeys[81] && mouseWheelRotation != 0) { // L: 3098 + var3 = class93.localPlayer.plane - mouseWheelRotation; // L: 3099 + if (var3 < 0) { // L: 3100 + var3 = 0; + } else if (var3 > 3) { // L: 3101 + var3 = 3; } - if (var4 != class35.localPlayer.plane) { // L: 3427 - ClientPreferences.method2239(class35.localPlayer.pathX[0] + JagexCache.baseX, class35.localPlayer.pathY[0] + Messages.baseY, var4, false); // L: 3428 + if (var3 != class93.localPlayer.plane) { // L: 3102 + class4.method50(class93.localPlayer.pathX[0] + VertexNormal.baseX, class93.localPlayer.pathY[0] + SoundSystem.baseY, var3, false); // L: 3103 } - mouseWheelRotation = 0; // L: 3430 + mouseWheelRotation = 0; // L: 3105 } - if (rootInterface != -1) { // L: 3432 - Clock.updateRootInterface(rootInterface, 0, 0, GameEngine.canvasWidth, HealthBarDefinition.canvasHeight, 0, 0); + if (rootInterface != -1) { // L: 3107 + class32.updateRootInterface(rootInterface, 0, 0, class32.canvasWidth, ReflectionCheck.canvasHeight, 0, 0); } - ++cycleCntr; // L: 3433 + ++cycleCntr; // L: 3108 while (true) { - ScriptEvent var26; - Widget var40; Widget var41; + ScriptEvent var43; + Widget var44; do { - var26 = (ScriptEvent)field865.removeLast(); // L: 3435 - if (var26 == null) { // L: 3436 + var43 = (ScriptEvent)field652.removeLast(); // L: 3110 + if (var43 == null) { // L: 3111 while (true) { do { - var26 = (ScriptEvent)field821.removeLast(); // L: 3447 - if (var26 == null) { // L: 3448 + var43 = (ScriptEvent)field846.removeLast(); // L: 3122 + if (var43 == null) { // L: 3123 while (true) { do { - var26 = (ScriptEvent)scriptEvents.removeLast(); // L: 3459 - if (var26 == null) { // L: 3460 - this.menu(); // L: 3470 - if (NetSocket.worldMap != null) { // L: 3472 - NetSocket.worldMap.method5961(ParamComposition.Client_plane, (class35.localPlayer.x >> 7) + JagexCache.baseX, (class35.localPlayer.y >> 7) + Messages.baseY, false); // L: 3473 - NetSocket.worldMap.loadCache(); // L: 3474 + var43 = (ScriptEvent)scriptEvents.removeLast(); // L: 3134 + if (var43 == null) { // L: 3135 + this.menu(); // L: 3145 + if (class243.worldMap != null) { // L: 3147 + class243.worldMap.method6110(class22.Client_plane, (class93.localPlayer.x >> 7) + VertexNormal.baseX, (class93.localPlayer.y >> 7) + SoundSystem.baseY, false); // L: 3148 + class243.worldMap.loadCache(); // L: 3149 } - if (clickedWidget != null) { // L: 3477 - this.method1236(); + if (clickedWidget != null) { // L: 3152 + this.method1198(); } - if (class34.dragInventoryWidget != null) { // L: 3478 - VerticalAlignment.invalidateWidget(class34.dragInventoryWidget); // L: 3479 - ++itemDragDuration; // L: 3480 - if (MouseHandler.MouseHandler_currentButton == 0) { // L: 3481 - if (field728) { // L: 3482 - if (NPCComposition.hoveredItemContainer == class34.dragInventoryWidget && dragItemSlotDestination != dragItemSlotSource) { // L: 3483 - Widget var42 = class34.dragInventoryWidget; // L: 3484 - byte var34 = 0; // L: 3485 - if (field781 == 1 && var42.contentType == 206) { // L: 3486 - var34 = 1; + PacketBufferNode var46; + if (Script.dragInventoryWidget != null) { // L: 3153 + WorldMapCacheName.invalidateWidget(Script.dragInventoryWidget); // L: 3154 + ++itemDragDuration; // L: 3155 + if (MouseHandler.MouseHandler_currentButton == 0) { // L: 3156 + if (field848) { // L: 3157 + if (Script.dragInventoryWidget == class18.hoveredItemContainer && dragItemSlotSource != dragItemSlotDestination) { // L: 3158 + Widget var47 = Script.dragInventoryWidget; // L: 3159 + byte var31 = 0; // L: 3160 + if (field912 == 1 && var47.contentType == 206) { // L: 3161 + var31 = 1; } - if (var42.itemIds[dragItemSlotDestination] <= 0) { // L: 3487 - var34 = 0; + if (var47.itemIds[dragItemSlotDestination] <= 0) { // L: 3162 + var31 = 0; } - var7 = class26.getWidgetFlags(var42); // L: 3489 - boolean var35 = (var7 >> 29 & 1) != 0; // L: 3491 - if (var35) { // L: 3493 - var8 = dragItemSlotSource; // L: 3494 - var9 = dragItemSlotDestination; // L: 3495 - var42.itemIds[var9] = var42.itemIds[var8]; // L: 3496 - var42.itemQuantities[var9] = var42.itemQuantities[var8]; // L: 3497 - var42.itemIds[var8] = -1; // L: 3498 - var42.itemQuantities[var8] = 0; // L: 3499 - } else if (var34 == 1) { // L: 3501 - var8 = dragItemSlotSource; // L: 3502 - var9 = dragItemSlotDestination; // L: 3503 + if (Canvas.method394(class21.getWidgetFlags(var47))) { // L: 3163 + var5 = dragItemSlotSource; // L: 3164 + var6 = dragItemSlotDestination; // L: 3165 + var47.itemIds[var6] = var47.itemIds[var5]; // L: 3166 + var47.itemQuantities[var6] = var47.itemQuantities[var5]; // L: 3167 + var47.itemIds[var5] = -1; // L: 3168 + var47.itemQuantities[var5] = 0; // L: 3169 + } else if (var31 == 1) { // L: 3171 + var5 = dragItemSlotSource; // L: 3172 + var6 = dragItemSlotDestination; // L: 3173 - while (var8 != var9) { // L: 3504 - if (var8 > var9) { // L: 3505 - var42.swapItems(var8 - 1, var8); // L: 3506 - --var8; // L: 3507 - } else if (var8 < var9) { // L: 3509 - var42.swapItems(var8 + 1, var8); // L: 3510 - ++var8; // L: 3511 + while (var5 != var6) { // L: 3174 + if (var5 > var6) { // L: 3175 + var47.swapItems(var5 - 1, var5); // L: 3176 + --var5; // L: 3177 + } else if (var5 < var6) { // L: 3179 + var47.swapItems(var5 + 1, var5); // L: 3180 + ++var5; // L: 3181 } } } else { - var42.swapItems(dragItemSlotDestination, dragItemSlotSource); // L: 3516 + var47.swapItems(dragItemSlotDestination, dragItemSlotSource); // L: 3186 } - PacketBufferNode var27 = HealthBarDefinition.getPacketBufferNode(ClientPacket.field2628, packetWriter.isaacCipher); // L: 3519 - var27.packetBuffer.method6445(class34.dragInventoryWidget.id); // L: 3520 - var27.packetBuffer.method6475(var34); // L: 3521 - var27.packetBuffer.method6484(dragItemSlotSource); // L: 3522 - var27.packetBuffer.writeShort(dragItemSlotDestination); // L: 3523 - packetWriter.addNode(var27); // L: 3524 + var46 = class21.getPacketBufferNode(ClientPacket.field2658, packetWriter.isaacCipher); // L: 3189 + var46.packetBuffer.method6612(Script.dragInventoryWidget.id); // L: 3190 + var46.packetBuffer.method6594(var31); // L: 3191 + var46.packetBuffer.method6602(dragItemSlotSource); // L: 3192 + var46.packetBuffer.writeShort(dragItemSlotDestination); // L: 3193 + packetWriter.addNode(var46); // L: 3194 } - } else if (this.shouldLeftClickOpenMenu()) { // L: 3528 - this.openMenu(draggedWidgetX, draggedWidgetY); // L: 3529 - } else if (menuOptionsCount > 0) { // L: 3531 - ItemLayer.method3715(draggedWidgetX, draggedWidgetY); // L: 3532 + } else if (this.shouldLeftClickOpenMenu()) { // L: 3198 + this.openMenu(draggedWidgetX, draggedWidgetY); // L: 3199 + } else if (menuOptionsCount > 0) { // L: 3201 + var3 = draggedWidgetX; // L: 3202 + var4 = draggedWidgetY; // L: 3203 + MenuAction var45 = ReflectionCheck.tempMenuAction; // L: 3205 + Script.menuAction(var45.param0, var45.param1, var45.opcode, var45.identifier, var45.action, var45.action, var3, var4); // L: 3207 + ReflectionCheck.tempMenuAction = null; // L: 3209 } - field817 = 10; // L: 3535 - MouseHandler.MouseHandler_lastButton = 0; // L: 3536 - class34.dragInventoryWidget = null; // L: 3537 - } else if (itemDragDuration >= 5 && (MouseHandler.MouseHandler_x > draggedWidgetX + 5 || MouseHandler.MouseHandler_x < draggedWidgetX - 5 || MouseHandler.MouseHandler_y > draggedWidgetY + 5 || MouseHandler.MouseHandler_y < draggedWidgetY - 5)) { // L: 3540 3541 - field728 = true; // L: 3542 + field747 = 10; // L: 3213 + MouseHandler.MouseHandler_lastButton = 0; // L: 3214 + Script.dragInventoryWidget = null; // L: 3215 + } else if (itemDragDuration >= 5 && (MouseHandler.MouseHandler_x > draggedWidgetX + 5 || MouseHandler.MouseHandler_x < draggedWidgetX - 5 || MouseHandler.MouseHandler_y > draggedWidgetY + 5 || MouseHandler.MouseHandler_y < draggedWidgetY - 5)) { // L: 3218 3219 + field848 = true; // L: 3220 } } - if (Scene.shouldSendWalk()) { // L: 3547 - var4 = Scene.Scene_selectedX; // L: 3548 - var5 = Scene.Scene_selectedY; // L: 3549 - var19 = HealthBarDefinition.getPacketBufferNode(ClientPacket.field2611, packetWriter.isaacCipher); // L: 3551 - var19.packetBuffer.writeByte(5); // L: 3552 - var19.packetBuffer.method6610(KeyHandler.KeyHandler_pressedKeys[82] ? (KeyHandler.KeyHandler_pressedKeys[81] ? 2 : 1) : 0); // L: 3553 - var19.packetBuffer.writeShort(var5 + Messages.baseY); // L: 3554 - var19.packetBuffer.writeShort(var4 + JagexCache.baseX); // L: 3555 - packetWriter.addNode(var19); // L: 3556 - Scene.method3941(); // L: 3557 - mouseCrossX = MouseHandler.MouseHandler_lastPressedX; // L: 3558 - mouseCrossY = MouseHandler.MouseHandler_lastPressedY; // L: 3559 - mouseCrossColor = 1; // L: 3560 - mouseCrossState = 0; // L: 3561 - destinationX = var4; // L: 3562 - destinationY = var5; // L: 3563 + if (Scene.shouldSendWalk()) { // L: 3225 + var3 = Scene.Scene_selectedX; // L: 3226 + var4 = Scene.Scene_selectedY; // L: 3227 + var46 = class21.getPacketBufferNode(ClientPacket.field2642, packetWriter.isaacCipher); // L: 3229 + var46.packetBuffer.writeByte(5); // L: 3230 + var46.packetBuffer.method6584(KeyHandler.KeyHandler_pressedKeys[82] ? (KeyHandler.KeyHandler_pressedKeys[81] ? 2 : 1) : 0); // L: 3231 + var46.packetBuffer.writeShort(var4 + SoundSystem.baseY); // L: 3232 + var46.packetBuffer.writeShort(var3 + VertexNormal.baseX); // L: 3233 + packetWriter.addNode(var46); // L: 3234 + Scene.method4047(); // L: 3235 + mouseCrossX = MouseHandler.MouseHandler_lastPressedX; // L: 3236 + mouseCrossY = MouseHandler.MouseHandler_lastPressedY; // L: 3237 + mouseCrossColor = 1; // L: 3238 + mouseCrossState = 0; // L: 3239 + destinationX = var3; // L: 3240 + destinationY = var4; // L: 3241 } - if (var37 != SpriteMask.mousedOverWidgetIf1) { // L: 3565 - if (var37 != null) { // L: 3566 - VerticalAlignment.invalidateWidget(var37); + if (var33 != World.mousedOverWidgetIf1) { // L: 3243 + if (var33 != null) { // L: 3244 + WorldMapCacheName.invalidateWidget(var33); } - if (SpriteMask.mousedOverWidgetIf1 != null) { // L: 3567 - VerticalAlignment.invalidateWidget(SpriteMask.mousedOverWidgetIf1); + if (World.mousedOverWidgetIf1 != null) { // L: 3245 + WorldMapCacheName.invalidateWidget(World.mousedOverWidgetIf1); } } - if (var39 != class34.field241 && field741 == field811) { // L: 3569 - if (var39 != null) { // L: 3570 - VerticalAlignment.invalidateWidget(var39); + if (var36 != ReflectionCheck.field609 && field833 == field792) { // L: 3247 + if (var36 != null) { // L: 3248 + WorldMapCacheName.invalidateWidget(var36); } - if (class34.field241 != null) { // L: 3571 - VerticalAlignment.invalidateWidget(class34.field241); + if (ReflectionCheck.field609 != null) { // L: 3249 + WorldMapCacheName.invalidateWidget(ReflectionCheck.field609); } } - if (class34.field241 != null) { // L: 3573 - if (field741 < field811) { // L: 3574 - ++field741; // L: 3575 - if (field741 == field811) { // L: 3576 - VerticalAlignment.invalidateWidget(class34.field241); + if (ReflectionCheck.field609 != null) { // L: 3251 + if (field792 < field833) { // L: 3252 + ++field792; // L: 3253 + if (field833 == field792) { // L: 3254 + WorldMapCacheName.invalidateWidget(ReflectionCheck.field609); } } - } else if (field741 > 0) { // L: 3579 - --field741; + } else if (field792 > 0) { // L: 3257 + --field792; } - WorldMapManager.method3439(); // L: 3580 - if (isCameraLocked) { // L: 3581 - var4 = field696 * 128 + 64; // L: 3582 - var5 = class18.field157 * 128 + 64; // L: 3583 - var6 = SceneTilePaint.getTileHeight(var4, var5, ParamComposition.Client_plane) - class0.field5; // L: 3584 - if (class20.cameraX < var4) { // L: 3585 - class20.cameraX = (var4 - class20.cameraX) * SoundSystem.field436 / 1000 + class20.cameraX + UserComparator4.field1403; // L: 3586 - if (class20.cameraX > var4) { // L: 3587 - class20.cameraX = var4; + FloorOverlayDefinition.method3104(); // L: 3258 + if (isCameraLocked) { // L: 3259 + var3 = VarpDefinition.field1544 * 128 + 64; // L: 3260 + var4 = Ignored.field3847 * 128 + 64; // L: 3261 + var5 = class105.getTileHeight(var3, var4, class22.Client_plane) - AbstractByteArrayCopier.field3119; // L: 3262 + if (MouseHandler.cameraX < var3) { // L: 3263 + MouseHandler.cameraX = (var3 - MouseHandler.cameraX) * class18.field156 / 1000 + MouseHandler.cameraX + class35.field264; // L: 3264 + if (MouseHandler.cameraX > var3) { // L: 3265 + MouseHandler.cameraX = var3; } } - if (class20.cameraX > var4) { // L: 3589 - class20.cameraX -= SoundSystem.field436 * (class20.cameraX - var4) / 1000 + UserComparator4.field1403; // L: 3590 - if (class20.cameraX < var4) { // L: 3591 - class20.cameraX = var4; + if (MouseHandler.cameraX > var3) { // L: 3267 + MouseHandler.cameraX -= class18.field156 * (MouseHandler.cameraX - var3) / 1000 + class35.field264; // L: 3268 + if (MouseHandler.cameraX < var3) { // L: 3269 + MouseHandler.cameraX = var3; } } - if (Skeleton.cameraY < var6) { // L: 3593 - Skeleton.cameraY = (var6 - Skeleton.cameraY) * SoundSystem.field436 / 1000 + Skeleton.cameraY + UserComparator4.field1403; // L: 3594 - if (Skeleton.cameraY > var6) { // L: 3595 - Skeleton.cameraY = var6; + if (SecureRandomCallable.cameraY < var5) { // L: 3271 + SecureRandomCallable.cameraY = (var5 - SecureRandomCallable.cameraY) * class18.field156 / 1000 + SecureRandomCallable.cameraY + class35.field264; // L: 3272 + if (SecureRandomCallable.cameraY > var5) { // L: 3273 + SecureRandomCallable.cameraY = var5; } } - if (Skeleton.cameraY > var6) { // L: 3597 - Skeleton.cameraY -= SoundSystem.field436 * (Skeleton.cameraY - var6) / 1000 + UserComparator4.field1403; // L: 3598 - if (Skeleton.cameraY < var6) { // L: 3599 - Skeleton.cameraY = var6; + if (SecureRandomCallable.cameraY > var5) { // L: 3275 + SecureRandomCallable.cameraY -= class18.field156 * (SecureRandomCallable.cameraY - var5) / 1000 + class35.field264; // L: 3276 + if (SecureRandomCallable.cameraY < var5) { // L: 3277 + SecureRandomCallable.cameraY = var5; } } - if (WorldMapDecoration.cameraZ < var5) { // L: 3601 - WorldMapDecoration.cameraZ = (var5 - WorldMapDecoration.cameraZ) * SoundSystem.field436 / 1000 + WorldMapDecoration.cameraZ + UserComparator4.field1403; // L: 3602 - if (WorldMapDecoration.cameraZ > var5) { // L: 3603 - WorldMapDecoration.cameraZ = var5; + if (class105.cameraZ < var4) { // L: 3279 + class105.cameraZ = (var4 - class105.cameraZ) * class18.field156 / 1000 + class105.cameraZ + class35.field264; // L: 3280 + if (class105.cameraZ > var4) { // L: 3281 + class105.cameraZ = var4; } } - if (WorldMapDecoration.cameraZ > var5) { // L: 3605 - WorldMapDecoration.cameraZ -= SoundSystem.field436 * (WorldMapDecoration.cameraZ - var5) / 1000 + UserComparator4.field1403; // L: 3606 - if (WorldMapDecoration.cameraZ < var5) { // L: 3607 - WorldMapDecoration.cameraZ = var5; + if (class105.cameraZ > var4) { // L: 3283 + class105.cameraZ -= class18.field156 * (class105.cameraZ - var4) / 1000 + class35.field264; // L: 3284 + if (class105.cameraZ < var4) { // L: 3285 + class105.cameraZ = var4; } } - var4 = Language.field3704 * 128 + 64; // L: 3609 - var5 = Interpreter.field947 * 128 + 64; // L: 3610 - var6 = SceneTilePaint.getTileHeight(var4, var5, ParamComposition.Client_plane) - KitDefinition.field1592; // L: 3611 - var7 = var4 - class20.cameraX; // L: 3612 - var8 = var6 - Skeleton.cameraY; // L: 3613 - var9 = var5 - WorldMapDecoration.cameraZ; // L: 3614 - var10 = (int)Math.sqrt((double)(var7 * var7 + var9 * var9)); // L: 3615 - var11 = (int)(Math.atan2((double)var8, (double)var10) * 325.949D) & 2047; // L: 3616 - var12 = (int)(Math.atan2((double)var7, (double)var9) * -325.949D) & 2047; // L: 3617 - if (var11 < 128) { // L: 3618 - var11 = 128; + var3 = ArchiveDisk.field3886 * 128 + 64; // L: 3287 + var4 = class4.field47 * 128 + 64; // L: 3288 + var5 = class105.getTileHeight(var3, var4, class22.Client_plane) - class18.field153; // L: 3289 + var6 = var3 - MouseHandler.cameraX; // L: 3290 + var7 = var5 - SecureRandomCallable.cameraY; // L: 3291 + var8 = var4 - class105.cameraZ; // L: 3292 + var9 = (int)Math.sqrt((double)(var6 * var6 + var8 * var8)); // L: 3293 + var10 = (int)(Math.atan2((double)var7, (double)var9) * 325.949D) & 2047; // L: 3294 + var11 = (int)(Math.atan2((double)var6, (double)var8) * -325.949D) & 2047; // L: 3295 + if (var10 < 128) { // L: 3296 + var10 = 128; } - if (var11 > 383) { // L: 3619 - var11 = 383; + if (var10 > 383) { // L: 3297 + var10 = 383; } - if (class1.cameraPitch < var11) { // L: 3620 - class1.cameraPitch = (var11 - class1.cameraPitch) * ReflectionCheck.field580 / 1000 + class1.cameraPitch + class2.field18; // L: 3621 - if (class1.cameraPitch > var11) { // L: 3622 - class1.cameraPitch = var11; + if (SpotAnimationDefinition.cameraPitch < var10) { // L: 3298 + SpotAnimationDefinition.cameraPitch = (var10 - SpotAnimationDefinition.cameraPitch) * SoundCache.field468 / 1000 + SpotAnimationDefinition.cameraPitch + FriendsList.field3812; // L: 3299 + if (SpotAnimationDefinition.cameraPitch > var10) { // L: 3300 + SpotAnimationDefinition.cameraPitch = var10; } } - if (class1.cameraPitch > var11) { // L: 3624 - class1.cameraPitch -= ReflectionCheck.field580 * (class1.cameraPitch - var11) / 1000 + class2.field18; // L: 3625 - if (class1.cameraPitch < var11) { // L: 3626 - class1.cameraPitch = var11; + if (SpotAnimationDefinition.cameraPitch > var10) { // L: 3302 + SpotAnimationDefinition.cameraPitch -= SoundCache.field468 * (SpotAnimationDefinition.cameraPitch - var10) / 1000 + FriendsList.field3812; // L: 3303 + if (SpotAnimationDefinition.cameraPitch < var10) { // L: 3304 + SpotAnimationDefinition.cameraPitch = var10; } } - int var28 = var12 - HealthBarDefinition.cameraYaw; // L: 3628 - if (var28 > 1024) { // L: 3629 - var28 -= 2048; + var12 = var11 - class376.cameraYaw; // L: 3306 + if (var12 > 1024) { // L: 3307 + var12 -= 2048; } - if (var28 < -1024) { // L: 3630 - var28 += 2048; + if (var12 < -1024) { // L: 3308 + var12 += 2048; } - if (var28 > 0) { // L: 3631 - HealthBarDefinition.cameraYaw = HealthBarDefinition.cameraYaw + class2.field18 + var28 * ReflectionCheck.field580 / 1000; // L: 3632 - HealthBarDefinition.cameraYaw &= 2047; // L: 3633 + if (var12 > 0) { // L: 3309 + class376.cameraYaw = var12 * SoundCache.field468 / 1000 + class376.cameraYaw + FriendsList.field3812; // L: 3310 + class376.cameraYaw &= 2047; // L: 3311 } - if (var28 < 0) { // L: 3635 - HealthBarDefinition.cameraYaw -= -var28 * ReflectionCheck.field580 / 1000 + class2.field18; // L: 3636 - HealthBarDefinition.cameraYaw &= 2047; // L: 3637 + if (var12 < 0) { // L: 3313 + class376.cameraYaw -= -var12 * SoundCache.field468 / 1000 + FriendsList.field3812; // L: 3314 + class376.cameraYaw &= 2047; // L: 3315 } - int var14 = var12 - HealthBarDefinition.cameraYaw; // L: 3639 - if (var14 > 1024) { // L: 3640 - var14 -= 2048; + int var26 = var11 - class376.cameraYaw; // L: 3317 + if (var26 > 1024) { // L: 3318 + var26 -= 2048; } - if (var14 < -1024) { // L: 3641 - var14 += 2048; + if (var26 < -1024) { // L: 3319 + var26 += 2048; } - if (var14 < 0 && var28 > 0 || var14 > 0 && var28 < 0) { // L: 3642 - HealthBarDefinition.cameraYaw = var12; + if (var26 < 0 && var12 > 0 || var26 > 0 && var12 < 0) { // L: 3320 + class376.cameraYaw = var11; } } - for (var4 = 0; var4 < 5; ++var4) { // L: 3644 - int var10002 = field870[var4]++; + for (var3 = 0; var3 < 5; ++var3) { // L: 3322 + var10002 = field893[var3]++; } - varcs.tryWrite(); // L: 3645 - var4 = class301.method5371(); // L: 3646 - var5 = KeyHandler.KeyHandler_idleCycles; // L: 3649 - PacketBufferNode var29; - if (var4 > 15000 && var5 > 15000) { // L: 3652 - logoutTimer = 250; // L: 3653 - MouseHandler.MouseHandler_idleCycles = 14500; // L: 3655 - var29 = HealthBarDefinition.getPacketBufferNode(ClientPacket.field2657, packetWriter.isaacCipher); // L: 3658 - packetWriter.addNode(var29); // L: 3659 + GrandExchangeOfferOwnWorldComparator.varcs.tryWrite(); // L: 3323 + var3 = ++MouseHandler.MouseHandler_idleCycles - 1; // L: 3326 + var5 = WorldMapLabelSize.method3206(); // L: 3329 + if (var3 > 15000 && var5 > 15000) { // L: 3330 + logoutTimer = 250; // L: 3331 + ArchiveDiskActionHandler.method4867(14500); // L: 3332 + var18 = class21.getPacketBufferNode(ClientPacket.field2644, packetWriter.isaacCipher); // L: 3334 + packetWriter.addNode(var18); // L: 3335 } - GrandExchangeOfferUnitPriceComparator.friendSystem.processFriendUpdates(); // L: 3661 - ++packetWriter.pendingWrites; // L: 3662 - if (packetWriter.pendingWrites > 50) { // L: 3663 - var29 = HealthBarDefinition.getPacketBufferNode(ClientPacket.field2583, packetWriter.isaacCipher); // L: 3665 - packetWriter.addNode(var29); // L: 3666 + NetSocket.friendSystem.processFriendUpdates(); // L: 3337 + ++packetWriter.pendingWrites; // L: 3338 + if (packetWriter.pendingWrites > 50) { // L: 3339 + var18 = class21.getPacketBufferNode(ClientPacket.field2590, packetWriter.isaacCipher); // L: 3341 + packetWriter.addNode(var18); // L: 3342 } try { - packetWriter.flush(); // L: 3669 - } catch (IOException var30) { // L: 3671 - BuddyRankComparator.method2492(); // L: 3672 + packetWriter.flush(); // L: 3345 + } catch (IOException var27) { // L: 3347 + NetFileRequest.method4912(); // L: 3348 } - return; // L: 3674 + return; // L: 3350 } - var41 = var26.widget; // L: 3461 - if (var41.childIndex < 0) { // L: 3462 + var44 = var43.widget; // L: 3136 + if (var44.childIndex < 0) { // L: 3137 break; } - var40 = DevicePcmPlayerProvider.getWidget(var41.parentId); // L: 3463 - } while(var40 == null || var40.children == null || var41.childIndex >= var40.children.length || var41 != var40.children[var41.childIndex]); // L: 3464 + var41 = Frames.getWidget(var44.parentId); // L: 3138 + } while(var41 == null || var41.children == null || var44.childIndex >= var41.children.length || var44 != var41.children[var44.childIndex]); // L: 3139 - class259.runScriptEvent(var26); // L: 3468 + PacketWriter.runScriptEvent(var43); // L: 3143 } } - var41 = var26.widget; // L: 3449 - if (var41.childIndex < 0) { // L: 3450 + var44 = var43.widget; // L: 3124 + if (var44.childIndex < 0) { // L: 3125 break; } - var40 = DevicePcmPlayerProvider.getWidget(var41.parentId); // L: 3451 - } while(var40 == null || var40.children == null || var41.childIndex >= var40.children.length || var41 != var40.children[var41.childIndex]); // L: 3452 + var41 = Frames.getWidget(var44.parentId); // L: 3126 + } while(var41 == null || var41.children == null || var44.childIndex >= var41.children.length || var44 != var41.children[var44.childIndex]); // L: 3127 - class259.runScriptEvent(var26); // L: 3456 + PacketWriter.runScriptEvent(var43); // L: 3131 } } - var41 = var26.widget; // L: 3437 - if (var41.childIndex < 0) { // L: 3438 + var44 = var43.widget; // L: 3112 + if (var44.childIndex < 0) { // L: 3113 break; } - var40 = DevicePcmPlayerProvider.getWidget(var41.parentId); // L: 3439 - } while(var40 == null || var40.children == null || var41.childIndex >= var40.children.length || var41 != var40.children[var41.childIndex]); // L: 3440 + var41 = Frames.getWidget(var44.parentId); // L: 3114 + } while(var41 == null || var41.children == null || var44.childIndex >= var41.children.length || var44 != var41.children[var44.childIndex]); // L: 3115 - class259.runScriptEvent(var26); // L: 3444 + PacketWriter.runScriptEvent(var43); // L: 3119 } } } } } - } // L: 3133 3381 + } // L: 2721 3032 - @ObfuscatedName("gx") + @ObfuscatedName("gv") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "-252374005" + garbageValue = "65280" ) @Export("resizeJS") void resizeJS() { - int var1 = GameEngine.canvasWidth; // L: 4366 - int var2 = HealthBarDefinition.canvasHeight; // L: 4367 - if (super.contentWidth < var1) { // L: 4368 + int var1 = class32.canvasWidth; // L: 3939 + int var2 = ReflectionCheck.canvasHeight; // L: 3940 + if (super.contentWidth < var1) { // L: 3941 var1 = super.contentWidth; } if (super.contentHeight < var2) { - var2 = super.contentHeight; // L: 4369 + var2 = super.contentHeight; // L: 3942 } - if (class12.clientPreferences != null) { // L: 4370 + if (ObjectComposition.clientPreferences != null) { // L: 3943 try { - Client var3 = class303.client; // L: 4372 - Object[] var4 = new Object[]{HitSplatDefinition.getWindowedMode()}; // L: 4373 - JSObject.getWindow(var3).call("resize", var4); // L: 4376 - } catch (Throwable var5) { // L: 4379 + class42.method422(class23.client, "resize", new Object[]{SpotAnimationDefinition.getWindowedMode()}); // L: 3945 + } catch (Throwable var4) { // L: 3947 } } - } // L: 4381 + } // L: 3949 - @ObfuscatedName("gg") + @ObfuscatedName("gm") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "-638945661" + garbageValue = "-1520673658" ) @Export("drawLoggedIn") final void drawLoggedIn() { - if (rootInterface != -1) { // L: 4384 - Messages.method2357(rootInterface); - } - int var1; - for (var1 = 0; var1 < rootWidgetCount; ++var1) { // L: 4385 - if (field825[var1]) { // L: 4386 - field826[var1] = true; - } - - field636[var1] = field825[var1]; // L: 4387 - field825[var1] = false; // L: 4388 - } - - field824 = cycle; // L: 4390 - viewportX = -1; // L: 4391 - viewportY = -1; // L: 4392 - NPCComposition.hoveredItemContainer = null; // L: 4393 - if (rootInterface != -1) { // L: 4394 - rootWidgetCount = 0; // L: 4395 - ModeWhere.drawWidgets(rootInterface, 0, 0, GameEngine.canvasWidth, HealthBarDefinition.canvasHeight, 0, 0, -1); // L: 4396 - } - - Rasterizer2D.Rasterizer2D_resetClip(); // L: 4398 - if (showMouseCross) { // L: 4399 - if (mouseCrossColor == 1) { // L: 4400 - MouseHandler.crossSprites[mouseCrossState / 100].drawTransBgAt(mouseCrossX - 8, mouseCrossY - 8); // L: 4401 - } - - if (mouseCrossColor == 2) { // L: 4403 - MouseHandler.crossSprites[mouseCrossState / 100 + 4].drawTransBgAt(mouseCrossX - 8, mouseCrossY - 8); // L: 4404 + if (rootInterface != -1) { // L: 3952 + var1 = rootInterface; // L: 3953 + if (Clock.loadInterface(var1)) { // L: 3955 + Canvas.drawModelComponents(Widget.Widget_interfaceComponents[var1], -1); // L: 3956 } } - if (!isMenuOpen) { // L: 4407 - if (viewportX != -1) { // L: 4408 - class0.method0(viewportX, viewportY); + for (var1 = 0; var1 < rootWidgetCount; ++var1) { // L: 3959 + if (field719[var1]) { // L: 3960 + field780[var1] = true; + } + + field860[var1] = field719[var1]; // L: 3961 + field719[var1] = false; // L: 3962 + } + + field849 = cycle; // L: 3964 + viewportX = -1; // L: 3965 + viewportY = -1; // L: 3966 + class18.hoveredItemContainer = null; // L: 3967 + if (rootInterface != -1) { // L: 3968 + rootWidgetCount = 0; // L: 3969 + class225.drawWidgets(rootInterface, 0, 0, class32.canvasWidth, ReflectionCheck.canvasHeight, 0, 0, -1); // L: 3970 + } + + Rasterizer2D.Rasterizer2D_resetClip(); // L: 3972 + if (showMouseCross) { // L: 3973 + if (mouseCrossColor == 1) { // L: 3974 + ArchiveLoader.crossSprites[mouseCrossState / 100].drawTransBgAt(mouseCrossX - 8, mouseCrossY - 8); // L: 3975 + } + + if (mouseCrossColor == 2) { // L: 3977 + ArchiveLoader.crossSprites[mouseCrossState / 100 + 4].drawTransBgAt(mouseCrossX - 8, mouseCrossY - 8); // L: 3978 + } + } + + if (!isMenuOpen) { // L: 3981 + if (viewportX != -1) { // L: 3982 + FileSystem.method2547(viewportX, viewportY); } } else { - ScriptFrame.method1161(); // L: 4410 + var1 = class14.menuX; // L: 3985 + int var2 = class243.menuY; // L: 3986 + int var3 = class29.menuWidth; // L: 3987 + int var4 = class24.menuHeight; // L: 3988 + int var5 = 6116423; // L: 3989 + Rasterizer2D.Rasterizer2D_fillRectangle(var1, var2, var3, var4, var5); // L: 3990 + Rasterizer2D.Rasterizer2D_fillRectangle(var1 + 1, var2 + 1, var3 - 2, 16, 0); // L: 3991 + Rasterizer2D.Rasterizer2D_drawRectangle(var1 + 1, var2 + 18, var3 - 2, var4 - 19, 0); // L: 3992 + Widget.fontBold12.draw("Choose Option", var1 + 3, var2 + 14, var5, -1); // L: 3993 + int var6 = MouseHandler.MouseHandler_x; // L: 3994 + int var7 = MouseHandler.MouseHandler_y; // L: 3995 + + for (int var8 = 0; var8 < menuOptionsCount; ++var8) { // L: 3996 + int var9 = var2 + (menuOptionsCount - 1 - var8) * 15 + 31; // L: 3997 + int var10 = 16777215; // L: 3998 + if (var6 > var1 && var6 < var1 + var3 && var7 > var9 - 13 && var7 < var9 + 3) { // L: 3999 + var10 = 16776960; + } + + Widget.fontBold12.draw(MouseRecorder.method2098(var8), var1 + 3, var9, var10, 0); // L: 4000 + } + + PcmPlayer.method786(class14.menuX, class243.menuY, class29.menuWidth, class24.menuHeight); // L: 4002 } - if (gameDrawingMode == 3) { // L: 4411 - for (var1 = 0; var1 < rootWidgetCount; ++var1) { // L: 4412 - if (field636[var1]) { // L: 4413 - Rasterizer2D.Rasterizer2D_fillRectangleAlpha(rootWidgetXs[var1], rootWidgetYs[var1], rootWidgetWidths[var1], rootWidgetHeights[var1], 16711935, 128); // L: 4414 - } else if (field826[var1]) { // L: 4416 - Rasterizer2D.Rasterizer2D_fillRectangleAlpha(rootWidgetXs[var1], rootWidgetYs[var1], rootWidgetWidths[var1], rootWidgetHeights[var1], 16711680, 128); // L: 4417 + if (gameDrawingMode == 3) { // L: 4004 + for (var1 = 0; var1 < rootWidgetCount; ++var1) { // L: 4005 + if (field860[var1]) { // L: 4006 + Rasterizer2D.Rasterizer2D_fillRectangleAlpha(rootWidgetXs[var1], rootWidgetYs[var1], rootWidgetWidths[var1], rootWidgetHeights[var1], 16711935, 128); // L: 4007 + } else if (field780[var1]) { // L: 4009 + Rasterizer2D.Rasterizer2D_fillRectangleAlpha(rootWidgetXs[var1], rootWidgetYs[var1], rootWidgetWidths[var1], rootWidgetHeights[var1], 16711680, 128); // L: 4010 } } } - World.method1728(ParamComposition.Client_plane, class35.localPlayer.x, class35.localPlayer.y, field768); // L: 4421 - field768 = 0; // L: 4422 - } // L: 4423 + class169.method3549(class22.Client_plane, class93.localPlayer.x, class93.localPlayer.y, field913); // L: 4014 + field913 = 0; // L: 4015 + } // L: 4016 - @ObfuscatedName("hb") + @ObfuscatedName("hh") @ObfuscatedSignature( - descriptor = "(Ldd;I)Z", - garbageValue = "1161587969" + descriptor = "(Lds;I)Z", + garbageValue = "-2018950508" ) - final boolean method1230(PacketWriter var1) { - AbstractSocket var2 = var1.getSocket(); // L: 5845 - PacketBuffer var3 = var1.packetBuffer; // L: 5846 - if (var2 == null) { // L: 5847 + final boolean method1192(PacketWriter var1) { + AbstractSocket var2 = var1.getSocket(); // L: 5767 + PacketBuffer var3 = var1.packetBuffer; // L: 5768 + if (var2 == null) { // L: 5769 return false; } else { int var6; - String var19; + String var18; try { int var5; - if (var1.serverPacket == null) { // L: 5849 - if (var1.field1383) { // L: 5850 - if (!var2.isAvailable(1)) { // L: 5851 + if (var1.serverPacket == null) { // L: 5771 + if (var1.field1408) { // L: 5772 + if (!var2.isAvailable(1)) { // L: 5773 return false; } - var2.read(var1.packetBuffer.array, 0, 1); // L: 5852 - var1.field1384 = 0; // L: 5853 - var1.field1383 = false; // L: 5854 + var2.read(var1.packetBuffer.array, 0, 1); // L: 5774 + var1.field1409 = 0; // L: 5775 + var1.field1408 = false; // L: 5776 } - var3.offset = 0; // L: 5856 - if (var3.method6395()) { // L: 5857 - if (!var2.isAvailable(1)) { // L: 5858 + var3.offset = 0; // L: 5778 + if (var3.method6529()) { // L: 5779 + if (!var2.isAvailable(1)) { // L: 5780 return false; } - var2.read(var1.packetBuffer.array, 1, 1); // L: 5859 - var1.field1384 = 0; // L: 5860 + var2.read(var1.packetBuffer.array, 1, 1); // L: 5781 + var1.field1409 = 0; // L: 5782 } - var1.field1383 = true; // L: 5862 - ServerPacket[] var4 = ModeWhere.ServerPacket_values(); // L: 5863 - var5 = var3.readSmartByteShortIsaac(); // L: 5864 - if (var5 < 0 || var5 >= var4.length) { // L: 5865 + var1.field1408 = true; // L: 5784 + ServerPacket[] var4 = class24.ServerPacket_values(); // L: 5785 + var5 = var3.readSmartByteShortIsaac(); // L: 5786 + if (var5 < 0 || var5 >= var4.length) { // L: 5787 throw new IOException(var5 + " " + var3.offset); } - var1.serverPacket = var4[var5]; // L: 5866 - var1.serverPacketLength = var1.serverPacket.length; // L: 5867 + var1.serverPacket = var4[var5]; // L: 5788 + var1.serverPacketLength = var1.serverPacket.length; // L: 5789 } - if (var1.serverPacketLength == -1) { // L: 5869 - if (!var2.isAvailable(1)) { // L: 5870 + if (var1.serverPacketLength == -1) { // L: 5791 + if (!var2.isAvailable(1)) { // L: 5792 return false; } - var1.getSocket().read(var3.array, 0, 1); // L: 5871 - var1.serverPacketLength = var3.array[0] & 255; // L: 5872 + var1.getSocket().read(var3.array, 0, 1); // L: 5793 + var1.serverPacketLength = var3.array[0] & 255; // L: 5794 } - if (var1.serverPacketLength == -2) { // L: 5874 - if (!var2.isAvailable(2)) { // L: 5875 + if (var1.serverPacketLength == -2) { // L: 5796 + if (!var2.isAvailable(2)) { // L: 5797 return false; } - var1.getSocket().read(var3.array, 0, 2); // L: 5876 - var3.offset = 0; // L: 5877 - var1.serverPacketLength = var3.readUnsignedShort(); // L: 5878 + var1.getSocket().read(var3.array, 0, 2); // L: 5798 + var3.offset = 0; // L: 5799 + var1.serverPacketLength = var3.readUnsignedShort(); // L: 5800 } - if (!var2.isAvailable(var1.serverPacketLength)) { // L: 5880 + if (!var2.isAvailable(var1.serverPacketLength)) { // L: 5802 return false; } - var3.offset = 0; // L: 5881 - var2.read(var3.array, 0, var1.serverPacketLength); // L: 5882 - var1.field1384 = 0; // L: 5883 - timer.method5463(); // L: 5884 - var1.field1391 = var1.field1387; // L: 5885 - var1.field1387 = var1.field1386; // L: 5886 - var1.field1386 = var1.serverPacket; // L: 5887 + var3.offset = 0; // L: 5803 + var2.read(var3.array, 0, var1.serverPacketLength); // L: 5804 + var1.field1409 = 0; // L: 5805 + timer.method5602(); // L: 5806 + var1.field1400 = var1.field1412; // L: 5807 + var1.field1412 = var1.field1411; // L: 5808 + var1.field1411 = var1.serverPacket; // L: 5809 int var7; int var8; int var9; - int var17; - if (ServerPacket.field2772 == var1.serverPacket) { // L: 5888 - var17 = var3.readUnsignedShort(); // L: 5889 - var5 = var3.readInt(); // L: 5890 - var6 = var17 >> 10 & 31; // L: 5891 - var7 = var17 >> 5 & 31; // L: 5892 - var8 = var17 & 31; // L: 5893 - var9 = (var7 << 11) + (var6 << 19) + (var8 << 3); // L: 5894 - Widget var53 = DevicePcmPlayerProvider.getWidget(var5); // L: 5895 - if (var9 != var53.color) { // L: 5896 - var53.color = var9; // L: 5897 - VerticalAlignment.invalidateWidget(var53); // L: 5898 + int var60; + if (ServerPacket.field2732 == var1.serverPacket) { // L: 5810 + var60 = var3.readUnsignedShort(); // L: 5811 + var5 = var3.readInt(); // L: 5812 + var6 = var60 >> 10 & 31; // L: 5813 + var7 = var60 >> 5 & 31; // L: 5814 + var8 = var60 & 31; // L: 5815 + var9 = (var7 << 11) + (var6 << 19) + (var8 << 3); // L: 5816 + Widget var55 = Frames.getWidget(var5); // L: 5817 + if (var9 != var55.color) { // L: 5818 + var55.color = var9; // L: 5819 + WorldMapCacheName.invalidateWidget(var55); // L: 5820 } - var1.serverPacket = null; // L: 5900 - return true; // L: 5901 + var1.serverPacket = null; // L: 5822 + return true; // L: 5823 } - if (ServerPacket.field2734 == var1.serverPacket) { // L: 5903 - if (var1.serverPacketLength == 0) { // L: 5904 - class25.clanChat = null; // L: 5905 + boolean var78; + if (ServerPacket.field2734 == var1.serverPacket) { // L: 5825 + var78 = var3.readBoolean(); // L: 5826 + if (var78) { // L: 5827 + if (UserComparator3.field1444 == null) { // L: 5828 + UserComparator3.field1444 = new class285(); + } } else { - if (class25.clanChat == null) { // L: 5908 - class25.clanChat = new ClanChat(ModeWhere.loginType, class303.client); // L: 5909 - } - - class25.clanChat.readUpdate(var3); // L: 5911 + UserComparator3.field1444 = null; // L: 5830 } - ItemContainer.method2108(); // L: 5913 - var1.serverPacket = null; // L: 5914 - return true; // L: 5915 + var1.serverPacket = null; // L: 5831 + return true; // L: 5832 } - if (ServerPacket.field2777 == var1.serverPacket) { // L: 5917 - FileSystem.logOut(); // L: 5918 - var1.serverPacket = null; // L: 5919 - return false; // L: 5920 - } + if (ServerPacket.field2757 == var1.serverPacket) { // L: 5834 + class69.field596 = var3.readUnsignedByte(); // L: 5835 + Occluder.field2387 = var3.readUnsignedByte(); // L: 5836 - Widget var18; - if (ServerPacket.field2775 == var1.serverPacket) { // L: 5922 - var17 = var3.method6481(); // L: 5923 - var5 = var3.method6490(); // L: 5924 - var18 = DevicePcmPlayerProvider.getWidget(var17); // L: 5925 - if (var5 != var18.sequenceId || var5 == -1) { // L: 5926 - var18.sequenceId = var5; // L: 5927 - var18.modelFrame = 0; // L: 5928 - var18.modelFrameCycle = 0; // L: 5929 - VerticalAlignment.invalidateWidget(var18); // L: 5930 + while (var3.offset < var1.serverPacketLength) { // L: 5837 + var60 = var3.readUnsignedByte(); // L: 5838 + class225 var71 = PlayerComposition.method4705()[var60]; // L: 5839 + Tile.method3843(var71); // L: 5840 } - var1.serverPacket = null; // L: 5932 - return true; // L: 5933 + var1.serverPacket = null; // L: 5842 + return true; // L: 5843 } - if (ServerPacket.field2754 == var1.serverPacket) { // L: 5935 - for (var17 = 0; var17 < class403.VarpDefinition_fileCount; ++var17) { // L: 5936 - VarpDefinition var73 = MusicPatchNode.VarpDefinition_get(var17); // L: 5937 - if (var73 != null) { // L: 5938 - Varps.Varps_temp[var17] = 0; // L: 5939 - Varps.Varps_main[var17] = 0; // L: 5940 - } - } - - Script.method2014(); // L: 5943 - changedVarpCount += 32; // L: 5944 - var1.serverPacket = null; // L: 5945 - return true; // L: 5946 - } - - Widget var20; - if (ServerPacket.field2711 == var1.serverPacket) { // L: 5948 - var17 = var3.method6489(); // L: 5949 - var5 = var3.method6428(); // L: 5950 - var6 = var3.method6488(); // L: 5951 - var20 = DevicePcmPlayerProvider.getWidget(var5); // L: 5952 - if (var6 != var20.rawX || var17 != var20.rawY || var20.xAlignment != 0 || var20.yAlignment != 0) { // L: 5953 - var20.rawX = var6; // L: 5954 - var20.rawY = var17; // L: 5955 - var20.xAlignment = 0; // L: 5956 - var20.yAlignment = 0; // L: 5957 - VerticalAlignment.invalidateWidget(var20); // L: 5958 - this.alignWidget(var20); // L: 5959 - if (var20.type == 0) { // L: 5960 - ApproximateRouteStrategy.revalidateWidgetScroll(Widget.Widget_interfaceComponents[var5 >> 16], var20, false); - } - } - - var1.serverPacket = null; // L: 5962 - return true; // L: 5963 - } - - if (ServerPacket.field2720 == var1.serverPacket) { // L: 5965 - class19.method267(class225.field2682); // L: 5966 - var1.serverPacket = null; // L: 5967 - return true; // L: 5968 + if (ServerPacket.field2750 == var1.serverPacket) { // L: 5845 + Tile.method3843(class225.field2687); // L: 5846 + var1.serverPacket = null; // L: 5847 + return true; // L: 5848 } String var46; - if (ServerPacket.field2760 == var1.serverPacket) { // L: 5970 - var46 = var3.readStringCp1252NullTerminated(); // L: 5971 - Object[] var72 = new Object[var46.length() + 1]; // L: 5972 + if (ServerPacket.field2781 == var1.serverPacket) { // L: 5850 + var46 = var3.readStringCp1252NullTerminated(); // L: 5851 + Object[] var70 = new Object[var46.length() + 1]; // L: 5852 - for (var6 = var46.length() - 1; var6 >= 0; --var6) { // L: 5973 - if (var46.charAt(var6) == 's') { // L: 5974 - var72[var6 + 1] = var3.readStringCp1252NullTerminated(); + for (var6 = var46.length() - 1; var6 >= 0; --var6) { // L: 5853 + if (var46.charAt(var6) == 's') { // L: 5854 + var70[var6 + 1] = var3.readStringCp1252NullTerminated(); } else { - var72[var6 + 1] = new Integer(var3.readInt()); // L: 5975 + var70[var6 + 1] = new Integer(var3.readInt()); // L: 5855 } } - var72[0] = new Integer(var3.readInt()); // L: 5977 - ScriptEvent var77 = new ScriptEvent(); // L: 5978 - var77.args = var72; // L: 5979 - class259.runScriptEvent(var77); // L: 5980 - var1.serverPacket = null; // L: 5981 - return true; // L: 5982 + var70[0] = new Integer(var3.readInt()); // L: 5857 + ScriptEvent var77 = new ScriptEvent(); // L: 5858 + var77.args = var70; // L: 5859 + PacketWriter.runScriptEvent(var77); // L: 5860 + var1.serverPacket = null; // L: 5861 + return true; // L: 5862 } - if (ServerPacket.field2737 == var1.serverPacket) { // L: 5984 - GrandExchangeOfferUnitPriceComparator.friendSystem.readUpdate(var3, var1.serverPacketLength); // L: 5985 - field801 = cycleCntr; // L: 5986 - var1.serverPacket = null; // L: 5987 - return true; // L: 5988 - } - - if (ServerPacket.field2784 == var1.serverPacket) { // L: 5990 - rebootTimer = var3.readUnsignedShort() * 30; // L: 5991 - field731 = cycleCntr; // L: 5992 - var1.serverPacket = null; // L: 5993 - return true; // L: 5994 - } - - if (ServerPacket.field2767 == var1.serverPacket) { // L: 5996 - class19.method267(class225.field2679); // L: 5997 - var1.serverPacket = null; // L: 5998 - return true; // L: 5999 - } - - Widget var66; - if (ServerPacket.field2763 == var1.serverPacket) { // L: 6001 - var17 = var3.method6497(); // L: 6002 - var66 = DevicePcmPlayerProvider.getWidget(var17); // L: 6003 - var66.modelType = 3; // L: 6004 - var66.modelId = class35.localPlayer.appearance.getChatHeadId(); // L: 6005 - VerticalAlignment.invalidateWidget(var66); // L: 6006 - var1.serverPacket = null; // L: 6007 - return true; // L: 6008 - } - - if (ServerPacket.field2782 == var1.serverPacket) { // L: 6010 - VarpDefinition.field1542 = var3.readUnsignedByte(); // L: 6011 - class7.field66 = var3.readUnsignedByte(); // L: 6012 - - for (var17 = class7.field66; var17 < class7.field66 + 8; ++var17) { // L: 6013 - for (var5 = VarpDefinition.field1542; var5 < VarpDefinition.field1542 + 8; ++var5) { // L: 6014 - if (groundItems[ParamComposition.Client_plane][var17][var5] != null) { // L: 6015 - groundItems[ParamComposition.Client_plane][var17][var5] = null; // L: 6016 - Varcs.updateItemPile(var17, var5); // L: 6017 - } - } - } - - for (PendingSpawn var50 = (PendingSpawn)pendingSpawns.last(); var50 != null; var50 = (PendingSpawn)pendingSpawns.previous()) { // L: 6021 6022 6024 - if (var50.x >= class7.field66 && var50.x < class7.field66 + 8 && var50.y >= VarpDefinition.field1542 && var50.y < VarpDefinition.field1542 + 8 && var50.plane == ParamComposition.Client_plane) { // L: 6023 - var50.hitpoints = 0; - } - } - - var1.serverPacket = null; // L: 6026 - return true; // L: 6027 - } - - if (ServerPacket.field2725 == var1.serverPacket) { // L: 6029 - if (rootInterface != -1) { // L: 6030 - LoginType.runIntfCloseListeners(rootInterface, 0); - } - - var1.serverPacket = null; // L: 6031 - return true; // L: 6032 - } - - if (ServerPacket.field2729 == var1.serverPacket) { // L: 6034 - class19.method267(class225.field2675); // L: 6035 - var1.serverPacket = null; // L: 6036 - return true; // L: 6037 - } - - if (ServerPacket.field2766 == var1.serverPacket) { // L: 6039 - class3.updateNpcs(true, var3); // L: 6040 - var1.serverPacket = null; // L: 6041 - return true; // L: 6042 - } - - if (ServerPacket.field2774 == var1.serverPacket) { // L: 6044 - ClientPreferences.loadRegions(false, var1.packetBuffer); // L: 6045 - var1.serverPacket = null; // L: 6046 - return true; // L: 6047 - } - - if (ServerPacket.field2700 == var1.serverPacket) { // L: 6049 - var17 = var3.readInt(); // L: 6050 - var5 = var3.readInt(); // L: 6051 - var6 = SpotAnimationDefinition.getGcDuration(); // L: 6052 - PacketBufferNode var69 = HealthBarDefinition.getPacketBufferNode(ClientPacket.field2649, packetWriter.isaacCipher); // L: 6054 - var69.packetBuffer.method6493(var17); // L: 6055 - var69.packetBuffer.writeInt(var5); // L: 6056 - var69.packetBuffer.method6449(GameEngine.fps); // L: 6057 - var69.packetBuffer.method6610(var6); // L: 6058 - packetWriter.addNode(var69); // L: 6059 - var1.serverPacket = null; // L: 6060 - return true; // L: 6061 - } - - byte var60; - if (ServerPacket.field2788 == var1.serverPacket) { // L: 6063 - field814 = cycleCntr; // L: 6064 - var60 = var3.readByte(); // L: 6065 - if (var1.serverPacketLength == 1) { // L: 6066 - if (var60 >= 0) { // L: 6067 - field847[var60] = null; - } else { - Players.field1358 = null; // L: 6068 - } - - var1.serverPacket = null; // L: 6069 - return true; // L: 6070 - } - - if (var60 >= 0) { // L: 6072 - field847[var60] = new class3(var3); // L: 6073 - } else { - Players.field1358 = new class3(var3); // L: 6076 - } - - var1.serverPacket = null; // L: 6078 - return true; // L: 6079 - } - - if (ServerPacket.field2713 == var1.serverPacket) { // L: 6081 - var17 = var3.readUnsignedByte(); // L: 6082 - class9.method95(var17); // L: 6083 - var1.serverPacket = null; // L: 6084 - return true; // L: 6085 - } - - if (ServerPacket.field2739 == var1.serverPacket) { // L: 6087 - var17 = var3.readUnsignedShort(); // L: 6088 - if (var17 == 65535) { // L: 6089 - var17 = -1; - } - - FontName.playSong(var17); // L: 6090 - var1.serverPacket = null; // L: 6091 - return true; // L: 6092 - } - - if (ServerPacket.field2724 == var1.serverPacket) { // L: 6094 - var17 = var3.method6486(); // L: 6095 - if (var17 == 65535) { // L: 6096 - var17 = -1; - } - - var5 = var3.method6492(); // L: 6097 - class311.method5486(var17, var5); // L: 6098 - var1.serverPacket = null; // L: 6099 - return true; // L: 6100 - } - - if (ServerPacket.field2768 == var1.serverPacket) { // L: 6102 - class19.method267(class225.field2674); // L: 6103 - var1.serverPacket = null; // L: 6104 - return true; // L: 6105 - } - - if (ServerPacket.field2749 == var1.serverPacket) { // L: 6107 - class19.method267(class225.field2677); // L: 6108 - var1.serverPacket = null; // L: 6109 - return true; // L: 6110 - } - - if (ServerPacket.field2699 == var1.serverPacket) { // L: 6112 - for (var17 = 0; var17 < players.length; ++var17) { // L: 6113 - if (players[var17] != null) { // L: 6114 - players[var17].sequence = -1; - } - } - - for (var17 = 0; var17 < npcs.length; ++var17) { // L: 6116 - if (npcs[var17] != null) { // L: 6117 - npcs[var17].sequence = -1; - } - } - - var1.serverPacket = null; // L: 6119 - return true; // L: 6120 - } - - long var12; - int var21; - InterfaceParent var63; - if (ServerPacket.field2726 == var1.serverPacket) { // L: 6122 - var17 = var3.offset + var1.serverPacketLength; // L: 6123 - var5 = var3.readUnsignedShort(); // L: 6124 - var6 = var3.readUnsignedShort(); // L: 6125 - if (var5 != rootInterface) { // L: 6126 - rootInterface = var5; // L: 6127 - this.resizeRoot(false); // L: 6128 - ApproximateRouteStrategy.Widget_resetModelFrames(rootInterface); // L: 6129 - HealthBar.runWidgetOnLoadListener(rootInterface); // L: 6130 - - for (var7 = 0; var7 < 100; ++var7) { // L: 6131 - field825[var7] = true; - } - } - - InterfaceParent var52; - for (; var6-- > 0; var52.field1136 = true) { // L: 6133 6143 - var7 = var3.readInt(); // L: 6134 - var8 = var3.readUnsignedShort(); // L: 6135 - var9 = var3.readUnsignedByte(); // L: 6136 - var52 = (InterfaceParent)interfaceParents.get((long)var7); // L: 6137 - if (var52 != null && var8 != var52.group) { // L: 6138 - class18.closeInterface(var52, true); // L: 6139 - var52 = null; // L: 6140 - } - - if (var52 == null) { // L: 6142 - var52 = GrandExchangeOfferWorldComparator.method5010(var7, var8, var9); - } - } - - for (var63 = (InterfaceParent)interfaceParents.first(); var63 != null; var63 = (InterfaceParent)interfaceParents.next()) { // L: 6145 - if (var63.field1136) { // L: 6146 - var63.field1136 = false; - } else { - class18.closeInterface(var63, true); // L: 6148 - } - } - - widgetFlags = new NodeHashTable(512); // L: 6151 - - while (var3.offset < var17) { // L: 6152 - var7 = var3.readInt(); // L: 6153 - var8 = var3.readUnsignedShort(); // L: 6154 - var9 = var3.readUnsignedShort(); // L: 6155 - var21 = var3.readInt(); // L: 6156 - - for (int var54 = var8; var54 <= var9; ++var54) { // L: 6157 - var12 = ((long)var7 << 32) + (long)var54; // L: 6158 - widgetFlags.put(new IntegerNode(var21), var12); // L: 6159 - } - } - - var1.serverPacket = null; // L: 6162 - return true; // L: 6163 - } - - if (ServerPacket.field2731 == var1.serverPacket) { // L: 6165 - class19.method267(class225.field2673); // L: 6166 - var1.serverPacket = null; // L: 6167 - return true; // L: 6168 - } - - if (ServerPacket.field2716 == var1.serverPacket) { // L: 6170 - var17 = var3.readInt(); // L: 6171 - var5 = var3.readUnsignedShort(); // L: 6172 - var18 = DevicePcmPlayerProvider.getWidget(var17); // L: 6173 - if (var18.modelType != 2 || var5 != var18.modelId) { // L: 6174 - var18.modelType = 2; // L: 6175 - var18.modelId = var5; // L: 6176 - VerticalAlignment.invalidateWidget(var18); // L: 6177 - } - - var1.serverPacket = null; // L: 6179 - return true; // L: 6180 - } - - if (ServerPacket.field2769 == var1.serverPacket) { // L: 6182 - GameObject.readReflectionCheck(var3, var1.serverPacketLength); // L: 6183 - var1.serverPacket = null; // L: 6184 - return true; // L: 6185 - } - - if (ServerPacket.field2757 == var1.serverPacket) { // L: 6187 - class22.method297(); // L: 6188 - var60 = var3.readByte(); // L: 6189 - if (var1.serverPacketLength == 1) { // L: 6190 - if (var60 >= 0) { // L: 6191 - field678[var60] = null; - } else { - class105.field1328 = null; // L: 6192 - } - - var1.serverPacket = null; // L: 6193 - return true; // L: 6194 - } - - if (var60 >= 0) { // L: 6196 - field678[var60] = new class11(var3); // L: 6197 - } else { - class105.field1328 = new class11(var3); // L: 6200 - } - - var1.serverPacket = null; // L: 6202 - return true; // L: 6203 - } - - boolean var76; - if (ServerPacket.field2722 == var1.serverPacket) { // L: 6205 - var76 = var3.readBoolean(); // L: 6206 - if (var76) { // L: 6207 - if (class18.field154 == null) { // L: 6208 - class18.field154 = new class285(); - } - } else { - class18.field154 = null; // L: 6210 - } - - var1.serverPacket = null; // L: 6211 - return true; // L: 6212 - } - - if (ServerPacket.field2779 == var1.serverPacket) { // L: 6214 - minimapState = var3.readUnsignedByte(); // L: 6215 - var1.serverPacket = null; // L: 6216 - return true; // L: 6217 - } - - if (ServerPacket.field2759 == var1.serverPacket) { // L: 6219 - Script.method2014(); // L: 6220 - weight = var3.readShort(); // L: 6221 - field731 = cycleCntr; // L: 6222 - var1.serverPacket = null; // L: 6223 - return true; // L: 6224 - } - - if (ServerPacket.field2755 == var1.serverPacket) { // L: 6226 - VarpDefinition.field1542 = var3.readUnsignedByte(); // L: 6227 - class7.field66 = var3.readUnsignedByte(); // L: 6228 - - while (var3.offset < var1.serverPacketLength) { // L: 6229 - var17 = var3.readUnsignedByte(); // L: 6230 - class225 var70 = class124.method2501()[var17]; // L: 6231 - class19.method267(var70); // L: 6232 - } - - var1.serverPacket = null; // L: 6234 - return true; // L: 6235 - } - - if (ServerPacket.field2742 == var1.serverPacket) { // L: 6237 - var17 = var3.readUnsignedByte(); // L: 6238 - var5 = var3.readUnsignedByte(); // L: 6239 - var6 = var3.readUnsignedByte(); // L: 6240 - var7 = var3.readUnsignedByte(); // L: 6241 - field846[var17] = true; // L: 6242 - field744[var17] = var5; // L: 6243 - field868[var17] = var6; // L: 6244 - field869[var17] = var7; // L: 6245 - field870[var17] = 0; // L: 6246 - var1.serverPacket = null; // L: 6247 - return true; // L: 6248 - } - - long var22; - if (ServerPacket.field2780 == var1.serverPacket) { // L: 6250 - var17 = var3.readUnsignedShort(); // L: 6251 - if (var17 == 65535) { // L: 6252 - var17 = -1; - } - - var5 = var3.method6481(); // L: 6253 - var6 = var3.method6648(); // L: 6254 - if (var6 == 65535) { // L: 6255 - var6 = -1; - } - - var7 = var3.method6428(); // L: 6256 - - for (var8 = var17; var8 <= var6; ++var8) { // L: 6257 - var22 = (long)var8 + ((long)var7 << 32); // L: 6258 - Node var75 = widgetFlags.get(var22); // L: 6259 - if (var75 != null) { // L: 6260 - var75.remove(); - } - - widgetFlags.put(new IntegerNode(var5), var22); // L: 6261 - } - - var1.serverPacket = null; // L: 6263 - return true; // L: 6264 - } - - if (ServerPacket.field2735 == var1.serverPacket) { // L: 6266 - var17 = var3.method6620(); // L: 6267 - rootInterface = var17; // L: 6268 - this.resizeRoot(false); // L: 6269 - ApproximateRouteStrategy.Widget_resetModelFrames(var17); // L: 6270 - HealthBar.runWidgetOnLoadListener(rootInterface); // L: 6271 - - for (var5 = 0; var5 < 100; ++var5) { // L: 6272 - field825[var5] = true; - } - - var1.serverPacket = null; // L: 6273 - return true; // L: 6274 - } - - if (ServerPacket.field2758 == var1.serverPacket) { // L: 6276 - hintArrowType = var3.readUnsignedByte(); // L: 6277 - if (hintArrowType == 1) { // L: 6278 + if (ServerPacket.field2759 == var1.serverPacket) { // L: 5864 + hintArrowType = var3.readUnsignedByte(); // L: 5865 + if (hintArrowType == 1) { // L: 5866 hintArrowNpcIndex = var3.readUnsignedShort(); } - if (hintArrowType >= 2 && hintArrowType <= 6) { // L: 6279 - if (hintArrowType == 2) { // L: 6280 - hintArrowSubX = 64; // L: 6281 - hintArrowSubY = 64; // L: 6282 + if (hintArrowType >= 2 && hintArrowType <= 6) { // L: 5867 + if (hintArrowType == 2) { // L: 5868 + hintArrowSubX = 64; // L: 5869 + hintArrowSubY = 64; // L: 5870 } - if (hintArrowType == 3) { // L: 6284 - hintArrowSubX = 0; // L: 6285 - hintArrowSubY = 64; // L: 6286 + if (hintArrowType == 3) { // L: 5872 + hintArrowSubX = 0; // L: 5873 + hintArrowSubY = 64; // L: 5874 } - if (hintArrowType == 4) { // L: 6288 - hintArrowSubX = 128; // L: 6289 - hintArrowSubY = 64; // L: 6290 + if (hintArrowType == 4) { // L: 5876 + hintArrowSubX = 128; // L: 5877 + hintArrowSubY = 64; // L: 5878 } - if (hintArrowType == 5) { // L: 6292 - hintArrowSubX = 64; // L: 6293 - hintArrowSubY = 0; // L: 6294 + if (hintArrowType == 5) { // L: 5880 + hintArrowSubX = 64; // L: 5881 + hintArrowSubY = 0; // L: 5882 } - if (hintArrowType == 6) { // L: 6296 - hintArrowSubX = 64; // L: 6297 - hintArrowSubY = 128; // L: 6298 + if (hintArrowType == 6) { // L: 5884 + hintArrowSubX = 64; // L: 5885 + hintArrowSubY = 128; // L: 5886 } - hintArrowType = 2; // L: 6300 - hintArrowX = var3.readUnsignedShort(); // L: 6301 - hintArrowY = var3.readUnsignedShort(); // L: 6302 - hintArrowHeight = var3.readUnsignedByte(); // L: 6303 + hintArrowType = 2; // L: 5888 + hintArrowX = var3.readUnsignedShort(); // L: 5889 + hintArrowY = var3.readUnsignedShort(); // L: 5890 + hintArrowHeight = var3.readUnsignedByte(); // L: 5891 } - if (hintArrowType == 10) { // L: 6305 + if (hintArrowType == 10) { // L: 5893 hintArrowPlayerIndex = var3.readUnsignedShort(); } - var1.serverPacket = null; // L: 6306 - return true; // L: 6307 + var1.serverPacket = null; // L: 5894 + return true; // L: 5895 } - String var74; - if (ServerPacket.field2764 == var1.serverPacket) { // L: 6309 - byte[] var49 = new byte[var1.serverPacketLength]; // L: 6310 - var3.method6397(var49, 0, var49.length); // L: 6311 - Buffer var67 = new Buffer(var49); // L: 6312 - var74 = var67.readStringCp1252NullTerminated(); // L: 6313 - Interpreter.openURL(var74, true, false); // L: 6314 - var1.serverPacket = null; // L: 6315 - return true; // L: 6316 + if (ServerPacket.field2711 == var1.serverPacket) { // L: 5897 + Tile.method3843(class225.field2683); // L: 5898 + var1.serverPacket = null; // L: 5899 + return true; // L: 5900 } + if (ServerPacket.field2730 == var1.serverPacket) { // L: 5902 + class34.field254 = new class339(ViewportMouse.HitSplatDefinition_cachedSprites); // L: 5903 + var1.serverPacket = null; // L: 5904 + return true; // L: 5905 + } + + if (ServerPacket.field2777 == var1.serverPacket) { // L: 5907 + var60 = var3.readUnsignedByte(); // L: 5908 + class15.forceDisconnect(var60); // L: 5909 + var1.serverPacket = null; // L: 5910 + return false; // L: 5911 + } + + if (ServerPacket.field2752 == var1.serverPacket) { // L: 5913 + var60 = var3.readUnsignedByte(); // L: 5914 + if (var3.readUnsignedByte() == 0) { // L: 5915 + grandExchangeOffers[var60] = new GrandExchangeOffer(); // L: 5916 + var3.offset += 18; // L: 5917 + } else { + --var3.offset; // L: 5920 + grandExchangeOffers[var60] = new GrandExchangeOffer(var3, false); // L: 5921 + } + + field840 = cycleCntr; // L: 5923 + var1.serverPacket = null; // L: 5924 + return true; // L: 5925 + } + + if (ServerPacket.field2741 == var1.serverPacket) { // L: 5927 + ScriptEvent.privateChatMode = class124.method2498(var3.readUnsignedByte()); // L: 5928 + var1.serverPacket = null; // L: 5929 + return true; // L: 5930 + } + + if (ServerPacket.field2746 == var1.serverPacket) { // L: 5932 + Tile.method3843(class225.field2681); // L: 5933 + var1.serverPacket = null; // L: 5934 + return true; // L: 5935 + } + + if (ServerPacket.field2704 == var1.serverPacket) { // L: 5937 + var60 = var3.readUnsignedShort(); // L: 5938 + var5 = var3.readUnsignedByte(); // L: 5939 + var6 = var3.readUnsignedShort(); // L: 5940 + BufferedSource.queueSoundEffect(var60, var5, var6); // L: 5941 + var1.serverPacket = null; // L: 5942 + return true; // L: 5943 + } + + Widget var67; + if (ServerPacket.field2717 == var1.serverPacket) { // L: 5945 + var60 = var3.readInt(); // L: 5946 + var5 = var3.readUnsignedShort(); // L: 5947 + var67 = Frames.getWidget(var60); // L: 5948 + if (var67.modelType != 2 || var5 != var67.modelId) { // L: 5949 + var67.modelType = 2; // L: 5950 + var67.modelId = var5; // L: 5951 + WorldMapCacheName.invalidateWidget(var67); // L: 5952 + } + + var1.serverPacket = null; // L: 5954 + return true; // L: 5955 + } + + int var20; + if (ServerPacket.field2788 == var1.serverPacket) { // L: 5957 + isCameraLocked = true; // L: 5958 + ArchiveDisk.field3886 = var3.readUnsignedByte(); // L: 5959 + class4.field47 = var3.readUnsignedByte(); // L: 5960 + class18.field153 = var3.readUnsignedShort(); // L: 5961 + FriendsList.field3812 = var3.readUnsignedByte(); // L: 5962 + SoundCache.field468 = var3.readUnsignedByte(); // L: 5963 + if (SoundCache.field468 >= 100) { // L: 5964 + var60 = ArchiveDisk.field3886 * 128 + 64; // L: 5965 + var5 = class4.field47 * 128 + 64; // L: 5966 + var6 = class105.getTileHeight(var60, var5, class22.Client_plane) - class18.field153; // L: 5967 + var7 = var60 - MouseHandler.cameraX; // L: 5968 + var8 = var6 - SecureRandomCallable.cameraY; // L: 5969 + var9 = var5 - class105.cameraZ; // L: 5970 + var20 = (int)Math.sqrt((double)(var7 * var7 + var9 * var9)); // L: 5971 + SpotAnimationDefinition.cameraPitch = (int)(Math.atan2((double)var8, (double)var20) * 325.949D) & 2047; // L: 5972 + class376.cameraYaw = (int)(Math.atan2((double)var7, (double)var9) * -325.949D) & 2047; // L: 5973 + if (SpotAnimationDefinition.cameraPitch < 128) { // L: 5974 + SpotAnimationDefinition.cameraPitch = 128; + } + + if (SpotAnimationDefinition.cameraPitch > 383) { // L: 5975 + SpotAnimationDefinition.cameraPitch = 383; + } + } + + var1.serverPacket = null; // L: 5977 + return true; // L: 5978 + } + + if (ServerPacket.field2776 == var1.serverPacket) { // L: 5980 + var60 = var3.method6613(); // L: 5981 + var5 = var3.method6726(); // L: 5982 + var67 = Frames.getWidget(var60); // L: 5983 + if (var5 != var67.sequenceId || var5 == -1) { // L: 5984 + var67.sequenceId = var5; // L: 5985 + var67.modelFrame = 0; // L: 5986 + var67.modelFrameCycle = 0; // L: 5987 + WorldMapCacheName.invalidateWidget(var67); // L: 5988 + } + + var1.serverPacket = null; // L: 5990 + return true; // L: 5991 + } + + if (ServerPacket.field2721 == var1.serverPacket) { // L: 5993 + Tile.method3843(class225.field2689); // L: 5994 + var1.serverPacket = null; // L: 5995 + return true; // L: 5996 + } + + if (ServerPacket.field2709 == var1.serverPacket) { // L: 5998 + Tile.method3843(class225.field2686); // L: 5999 + var1.serverPacket = null; // L: 6000 + return true; // L: 6001 + } + + if (ServerPacket.field2714 == var1.serverPacket) { // L: 6003 + var60 = var3.readUnsignedByte(); // L: 6004 + ClanSettings.method163(var60); // L: 6005 + var1.serverPacket = null; // L: 6006 + return true; // L: 6007 + } + + if (ServerPacket.field2738 == var1.serverPacket) { // L: 6009 + if (class34.field254 == null) { // L: 6010 + class34.field254 = new class339(ViewportMouse.HitSplatDefinition_cachedSprites); + } + + class390 var51 = ViewportMouse.HitSplatDefinition_cachedSprites.method6021(var3); // L: 6011 + class34.field254.field3921.vmethod6364(var51.field4219, var51.field4218); // L: 6012 + field911[++field852 - 1 & 31] = var51.field4219; // L: 6013 + var1.serverPacket = null; // L: 6014 + return true; // L: 6015 + } + + if (ServerPacket.field2735 == var1.serverPacket) { // L: 6017 + NetSocket.friendSystem.readUpdate(var3, var1.serverPacketLength); // L: 6018 + field836 = cycleCntr; // L: 6019 + var1.serverPacket = null; // L: 6020 + return true; // L: 6021 + } + + if (ServerPacket.field2701 == var1.serverPacket) { // L: 6023 + isCameraLocked = true; // L: 6024 + VarpDefinition.field1544 = var3.readUnsignedByte(); // L: 6025 + Ignored.field3847 = var3.readUnsignedByte(); // L: 6026 + AbstractByteArrayCopier.field3119 = var3.readUnsignedShort(); // L: 6027 + class35.field264 = var3.readUnsignedByte(); // L: 6028 + class18.field156 = var3.readUnsignedByte(); // L: 6029 + if (class18.field156 >= 100) { // L: 6030 + MouseHandler.cameraX = VarpDefinition.field1544 * 128 + 64; // L: 6031 + class105.cameraZ = Ignored.field3847 * 128 + 64; // L: 6032 + SecureRandomCallable.cameraY = class105.getTileHeight(MouseHandler.cameraX, class105.cameraZ, class22.Client_plane) - AbstractByteArrayCopier.field3119; // L: 6033 + } + + var1.serverPacket = null; // L: 6035 + return true; // L: 6036 + } + + if (ServerPacket.field2767 == var1.serverPacket) { // L: 6038 + SoundSystem.updateNpcs(true, var3); // L: 6039 + var1.serverPacket = null; // L: 6040 + return true; // L: 6041 + } + + if (ServerPacket.field2772 == var1.serverPacket) { // L: 6043 + destinationX = var3.readUnsignedByte(); // L: 6044 + if (destinationX == 255) { // L: 6045 + destinationX = 0; + } + + destinationY = var3.readUnsignedByte(); // L: 6046 + if (destinationY == 255) { // L: 6047 + destinationY = 0; + } + + var1.serverPacket = null; // L: 6048 + return true; // L: 6049 + } + + InterfaceParent var21; + Widget var74; + if (ServerPacket.field2743 == var1.serverPacket) { // L: 6051 + var60 = var3.method6614(); // L: 6052 + var5 = var3.method6614(); // L: 6053 + InterfaceParent var76 = (InterfaceParent)interfaceParents.get((long)var5); // L: 6054 + var21 = (InterfaceParent)interfaceParents.get((long)var60); // L: 6055 + if (var21 != null) { // L: 6056 + class43.closeInterface(var21, var76 == null || var21.group != var76.group); + } + + if (var76 != null) { // L: 6057 + var76.remove(); // L: 6058 + interfaceParents.put(var76, (long)var60); // L: 6059 + } + + var74 = Frames.getWidget(var5); // L: 6061 + if (var74 != null) { // L: 6062 + WorldMapCacheName.invalidateWidget(var74); + } + + var74 = Frames.getWidget(var60); // L: 6063 + if (var74 != null) { // L: 6064 + WorldMapCacheName.invalidateWidget(var74); // L: 6065 + class313.revalidateWidgetScroll(Widget.Widget_interfaceComponents[var74.id >>> 16], var74, true); // L: 6066 + } + + if (rootInterface != -1) { // L: 6068 + Login.runIntfCloseListeners(rootInterface, 1); + } + + var1.serverPacket = null; // L: 6069 + return true; // L: 6070 + } + + if (ServerPacket.field2729 == var1.serverPacket) { // L: 6072 + FriendLoginUpdate.method5690(var3.readStringCp1252NullTerminated()); // L: 6073 + var1.serverPacket = null; // L: 6074 + return true; // L: 6075 + } + + if (ServerPacket.field2736 == var1.serverPacket) { // L: 6077 + var60 = var3.readInt(); // L: 6078 + InterfaceParent var68 = (InterfaceParent)interfaceParents.get((long)var60); // L: 6079 + if (var68 != null) { // L: 6080 + class43.closeInterface(var68, true); + } + + if (meslayerContinueWidget != null) { // L: 6081 + WorldMapCacheName.invalidateWidget(meslayerContinueWidget); // L: 6082 + meslayerContinueWidget = null; // L: 6083 + } + + var1.serverPacket = null; // L: 6085 + return true; // L: 6086 + } + + if (ServerPacket.field2722 == var1.serverPacket) { // L: 6088 + if (rootInterface != -1) { // L: 6089 + Login.runIntfCloseListeners(rootInterface, 0); + } + + var1.serverPacket = null; // L: 6090 + return true; // L: 6091 + } + + long var12; + if (ServerPacket.field2775 == var1.serverPacket) { // L: 6093 + var60 = var3.offset + var1.serverPacketLength; // L: 6094 + var5 = var3.readUnsignedShort(); // L: 6095 + var6 = var3.readUnsignedShort(); // L: 6096 + if (var5 != rootInterface) { // L: 6097 + rootInterface = var5; // L: 6098 + this.resizeRoot(false); // L: 6099 + class21.Widget_resetModelFrames(rootInterface); // L: 6100 + FloorDecoration.runWidgetOnLoadListener(rootInterface); // L: 6101 + + for (var7 = 0; var7 < 100; ++var7) { // L: 6102 + field719[var7] = true; + } + } + + InterfaceParent var53; + for (; var6-- > 0; var53.field1165 = true) { // L: 6104 6114 + var7 = var3.readInt(); // L: 6105 + var8 = var3.readUnsignedShort(); // L: 6106 + var9 = var3.readUnsignedByte(); // L: 6107 + var53 = (InterfaceParent)interfaceParents.get((long)var7); // L: 6108 + if (var53 != null && var8 != var53.group) { // L: 6109 + class43.closeInterface(var53, true); // L: 6110 + var53 = null; // L: 6111 + } + + if (var53 == null) { // L: 6113 + var53 = class17.method208(var7, var8, var9); + } + } + + for (var21 = (InterfaceParent)interfaceParents.first(); var21 != null; var21 = (InterfaceParent)interfaceParents.next()) { // L: 6116 + if (var21.field1165) { // L: 6117 + var21.field1165 = false; + } else { + class43.closeInterface(var21, true); // L: 6119 + } + } + + widgetFlags = new NodeHashTable(512); // L: 6122 + + while (var3.offset < var60) { // L: 6123 + var7 = var3.readInt(); // L: 6124 + var8 = var3.readUnsignedShort(); // L: 6125 + var9 = var3.readUnsignedShort(); // L: 6126 + var20 = var3.readInt(); // L: 6127 + + for (int var56 = var8; var56 <= var9; ++var56) { // L: 6128 + var12 = ((long)var7 << 32) + (long)var56; // L: 6129 + widgetFlags.put(new IntegerNode(var20), var12); // L: 6130 + } + } + + var1.serverPacket = null; // L: 6133 + return true; // L: 6134 + } + + if (ServerPacket.field2705 == var1.serverPacket) { // L: 6136 + var78 = var3.method6549() == 1; // L: 6137 + var5 = var3.method6598(); // L: 6138 + var67 = Frames.getWidget(var5); // L: 6139 + if (var78 != var67.isHidden) { // L: 6140 + var67.isHidden = var78; // L: 6141 + WorldMapCacheName.invalidateWidget(var67); // L: 6142 + } + + var1.serverPacket = null; // L: 6144 + return true; // L: 6145 + } + + if (ServerPacket.field2751 == var1.serverPacket) { // L: 6147 + class34.field254 = null; // L: 6148 + var1.serverPacket = null; // L: 6149 + return true; // L: 6150 + } + + int var15; + long var23; long var25; long var27; - String var33; - int var58; - if (ServerPacket.field2712 == var1.serverPacket) { // L: 6318 - var46 = var3.readStringCp1252NullTerminated(); // L: 6319 - var25 = (long)var3.readUnsignedShort(); // L: 6320 - var27 = (long)var3.readMedium(); // L: 6321 - PlayerType var29 = (PlayerType)UserComparator4.findEnumerated(class249.PlayerType_values(), var3.readUnsignedByte()); // L: 6322 - long var30 = (var25 << 32) + var27; // L: 6323 - boolean var32 = false; // L: 6324 + String var30; + if (ServerPacket.field2785 == var1.serverPacket) { // L: 6152 + var46 = var3.readStringCp1252NullTerminated(); // L: 6153 + var23 = var3.readLong(); // L: 6154 + var25 = (long)var3.readUnsignedShort(); // L: 6155 + var27 = (long)var3.readMedium(); // L: 6156 + PlayerType var79 = (PlayerType)Messages.findEnumerated(class372.PlayerType_values(), var3.readUnsignedByte()); // L: 6157 + var12 = var27 + (var25 << 32); // L: 6158 + boolean var59 = false; // L: 6159 - for (var58 = 0; var58 < 100; ++var58) { // L: 6325 - if (crossWorldMessageIds[var58] == var30) { // L: 6326 - var32 = true; // L: 6327 - break; // L: 6328 + for (var15 = 0; var15 < 100; ++var15) { // L: 6160 + if (var12 == crossWorldMessageIds[var15]) { // L: 6161 + var59 = true; // L: 6162 + break; // L: 6163 } } - if (GrandExchangeOfferUnitPriceComparator.friendSystem.isIgnored(new Username(var46, ModeWhere.loginType))) { // L: 6331 - var32 = true; + if (var79.isUser && NetSocket.friendSystem.isIgnored(new Username(var46, WorldMapSection0.loginType))) { // L: 6166 6167 + var59 = true; } - if (!var32 && field727 == 0) { // L: 6332 - crossWorldMessageIds[crossWorldMessageIdsIndex] = var30; // L: 6333 - crossWorldMessageIdsIndex = (crossWorldMessageIdsIndex + 1) % 100; // L: 6334 - var33 = AbstractFont.escapeBrackets(Clock.method2592(class22.method299(var3))); // L: 6335 - byte var59; - if (var29.isPrivileged) { // L: 6337 - var59 = 7; + if (!var59 && field755 == 0) { // L: 6169 + crossWorldMessageIds[crossWorldMessageIdsIndex] = var12; // L: 6170 + crossWorldMessageIdsIndex = (crossWorldMessageIdsIndex + 1) % 100; // L: 6171 + var30 = AbstractFont.escapeBrackets(class43.method433(MusicPatch.method4592(var3))); // L: 6172 + if (var79.modIcon != -1) { // L: 6173 + class5.addChatMessage(9, SecureRandomFuture.method1982(var79.modIcon) + var46, var30, class258.base37DecodeLong(var23)); } else { - var59 = 3; // L: 6338 - } - - if (var29.modIcon != -1) { // L: 6339 - WorldMapScaleHandler.addGameMessage(var59, class169.method3495(var29.modIcon) + var46, var33); - } else { - WorldMapScaleHandler.addGameMessage(var59, var46, var33); // L: 6340 + class5.addChatMessage(9, var46, var30, class258.base37DecodeLong(var23)); // L: 6174 } } - var1.serverPacket = null; // L: 6342 - return true; // L: 6343 + var1.serverPacket = null; // L: 6176 + return true; // L: 6177 } - Widget var34; - if (ServerPacket.field2761 == var1.serverPacket) { // L: 6345 - var17 = var3.method6620(); // L: 6346 - var5 = var3.method6648(); // L: 6347 - var6 = var3.method6486(); // L: 6348 - var7 = var3.method6428(); // L: 6349 - var34 = DevicePcmPlayerProvider.getWidget(var7); // L: 6350 - if (var17 != var34.modelAngleX || var5 != var34.modelAngleY || var6 != var34.modelZoom) { // L: 6351 - var34.modelAngleX = var17; // L: 6352 - var34.modelAngleY = var5; // L: 6353 - var34.modelZoom = var6; // L: 6354 - VerticalAlignment.invalidateWidget(var34); // L: 6355 - } - - var1.serverPacket = null; // L: 6357 - return true; // L: 6358 + if (ServerPacket.field2770 == var1.serverPacket) { // L: 6179 + Tile.method3843(class225.field2685); // L: 6180 + var1.serverPacket = null; // L: 6181 + return true; // L: 6182 } - if (ServerPacket.field2771 == var1.serverPacket) { // L: 6360 - HealthBar.updatePlayers(var3, var1.serverPacketLength); // L: 6361 - Clock.method2583(); // L: 6362 + if (ServerPacket.field2779 == var1.serverPacket) { // L: 6184 + var46 = var3.readStringCp1252NullTerminated(); // L: 6185 + var5 = var3.method6614(); // L: 6186 + var67 = Frames.getWidget(var5); // L: 6187 + if (!var46.equals(var67.text)) { // L: 6188 + var67.text = var46; // L: 6189 + WorldMapCacheName.invalidateWidget(var67); // L: 6190 + } + + var1.serverPacket = null; // L: 6192 + return true; // L: 6193 + } + + if (ServerPacket.field2787 == var1.serverPacket) { // L: 6195 + var60 = var3.method6603(); // L: 6196 + var5 = var3.method6598(); // L: 6197 + var67 = Frames.getWidget(var5); // L: 6198 + if (var67.modelType != 1 || var60 != var67.modelId) { // L: 6199 + var67.modelType = 1; // L: 6200 + var67.modelId = var60; // L: 6201 + WorldMapCacheName.invalidateWidget(var67); // L: 6202 + } + + var1.serverPacket = null; // L: 6204 + return true; // L: 6205 + } + + if (ServerPacket.field2706 == var1.serverPacket) { // L: 6207 + var60 = var3.readInt(); // L: 6208 + if (var60 != field723) { // L: 6209 + field723 = var60; // L: 6210 + Script.method1999(); // L: 6211 + } + + var1.serverPacket = null; // L: 6213 + return true; // L: 6214 + } + + if (ServerPacket.field2778 == var1.serverPacket) { // L: 6216 + class7.logOut(); // L: 6217 + var1.serverPacket = null; // L: 6218 + return false; // L: 6219 + } + + if (ServerPacket.field2737 == var1.serverPacket) { // L: 6221 + World var50 = new World(); // L: 6222 + var50.host = var3.readStringCp1252NullTerminated(); // L: 6223 + var50.id = var3.readUnsignedShort(); // L: 6224 + var5 = var3.readInt(); // L: 6225 + var50.properties = var5; // L: 6226 + class12.updateGameState(45); // L: 6227 + var2.close(); // L: 6228 + var2 = null; // L: 6229 + class0.changeWorld(var50); // L: 6230 + var1.serverPacket = null; // L: 6231 + return false; // L: 6232 + } + + if (ServerPacket.field2728 == var1.serverPacket) { // L: 6234 + rebootTimer = var3.readUnsignedShort() * 30; // L: 6235 + field659 = cycleCntr; // L: 6236 + var1.serverPacket = null; // L: 6237 + return true; // L: 6238 + } + + String var72; + if (ServerPacket.field2765 == var1.serverPacket) { // L: 6240 + byte[] var48 = new byte[var1.serverPacketLength]; // L: 6241 + var3.method6521(var48, 0, var48.length); // L: 6242 + Buffer var66 = new Buffer(var48); // L: 6243 + var72 = var66.readStringCp1252NullTerminated(); // L: 6244 + Players.openURL(var72, true, false); // L: 6245 + var1.serverPacket = null; // L: 6246 + return true; // L: 6247 + } + + byte var17; + if (ServerPacket.field2739 == var1.serverPacket) { // L: 6249 + class124.method2496(); // L: 6250 + var17 = var3.readByte(); // L: 6251 + if (var1.serverPacketLength == 1) { // L: 6252 + if (var17 >= 0) { // L: 6253 + currentClanSettings[var17] = null; + } else { + NPCComposition.guestClanSettings = null; // L: 6254 + } + + var1.serverPacket = null; // L: 6255 + return true; // L: 6256 + } + + if (var17 >= 0) { // L: 6258 + currentClanSettings[var17] = new ClanSettings(var3); // L: 6259 + } else { + NPCComposition.guestClanSettings = new ClanSettings(var3); // L: 6262 + } + + var1.serverPacket = null; // L: 6264 + return true; // L: 6265 + } + + if (ServerPacket.field2724 == var1.serverPacket) { // L: 6267 + var60 = var3.method6598(); // L: 6268 + var5 = var3.method6603(); // L: 6269 + var67 = Frames.getWidget(var60); // L: 6270 + if (var67 != null && var67.type == 0) { // L: 6271 + if (var5 > var67.scrollHeight - var67.height) { // L: 6272 + var5 = var67.scrollHeight - var67.height; + } + + if (var5 < 0) { // L: 6273 + var5 = 0; + } + + if (var5 != var67.scrollY) { // L: 6274 + var67.scrollY = var5; // L: 6275 + WorldMapCacheName.invalidateWidget(var67); // L: 6276 + } + } + + var1.serverPacket = null; // L: 6279 + return true; // L: 6280 + } + + if (ServerPacket.field2790 == var1.serverPacket) { // L: 6282 + for (var60 = 0; var60 < Varps.Varps_main.length; ++var60) { // L: 6283 + if (Varps.Varps_main[var60] != Varps.Varps_temp[var60]) { // L: 6284 + Varps.Varps_main[var60] = Varps.Varps_temp[var60]; // L: 6285 + ApproximateRouteStrategy.changeGameOptions(var60); // L: 6286 + changedVarps[++changedVarpCount - 1 & 31] = var60; // L: 6287 + } + } + + var1.serverPacket = null; // L: 6290 + return true; // L: 6291 + } + + if (ServerPacket.field2710 == var1.serverPacket) { // L: 6293 + PlayerComposition.readReflectionCheck(var3, var1.serverPacketLength); // L: 6294 + var1.serverPacket = null; // L: 6295 + return true; // L: 6296 + } + + if (ServerPacket.field2792 == var1.serverPacket) { // L: 6298 + var60 = var3.readInt(); // L: 6299 + var5 = var3.readUnsignedShort(); // L: 6300 + if (var60 < -70000) { // L: 6301 + var5 += 32768; + } + + if (var60 >= 0) { // L: 6303 + var67 = Frames.getWidget(var60); + } else { + var67 = null; // L: 6304 + } + + for (; var3.offset < var1.serverPacketLength; class4.itemContainerSetItem(var5, var7, var8 - 1, var9)) { // L: 6305 6319 + var7 = var3.readUShortSmart(); // L: 6306 + var8 = var3.readUnsignedShort(); // L: 6307 + var9 = 0; // L: 6308 + if (var8 != 0) { // L: 6309 + var9 = var3.readUnsignedByte(); // L: 6310 + if (var9 == 255) { // L: 6311 + var9 = var3.readInt(); + } + } + + if (var67 != null && var7 >= 0 && var7 < var67.itemIds.length) { // L: 6313 6314 + var67.itemIds[var7] = var8; // L: 6315 + var67.itemQuantities[var7] = var9; // L: 6316 + } + } + + if (var67 != null) { // L: 6321 + WorldMapCacheName.invalidateWidget(var67); + } + + class170.method3554(); // L: 6322 + changedItemContainers[++field830 - 1 & 31] = var5 & 32767; // L: 6323 + var1.serverPacket = null; // L: 6324 + return true; // L: 6325 + } + + if (ServerPacket.field2780 == var1.serverPacket) { // L: 6327 + class339.loadRegions(false, var1.packetBuffer); // L: 6328 + var1.serverPacket = null; // L: 6329 + return true; // L: 6330 + } + + if (ServerPacket.field2726 == var1.serverPacket) { // L: 6332 + FriendSystem.updatePlayers(var3, var1.serverPacketLength); // L: 6333 + ObjectSound.method1761(); // L: 6334 + var1.serverPacket = null; // L: 6335 + return true; // L: 6336 + } + + if (ServerPacket.field2769 == var1.serverPacket) { // L: 6338 + Tile.method3843(class225.field2680); // L: 6339 + var1.serverPacket = null; // L: 6340 + return true; // L: 6341 + } + + if (ServerPacket.field2760 == var1.serverPacket) { // L: 6343 + class170.method3554(); // L: 6344 + runEnergy = var3.readUnsignedByte(); // L: 6345 + field659 = cycleCntr; // L: 6346 + var1.serverPacket = null; // L: 6347 + return true; // L: 6348 + } + + if (ServerPacket.field2718 == var1.serverPacket) { // L: 6350 + var60 = var3.readUnsignedShort(); // L: 6351 + if (var60 == 65535) { // L: 6352 + var60 = -1; + } + + var5 = var3.method6613(); // L: 6353 + var6 = var3.method6605(); // L: 6354 + if (var6 == 65535) { // L: 6355 + var6 = -1; + } + + var7 = var3.method6598(); // L: 6356 + + for (var8 = var60; var8 <= var6; ++var8) { // L: 6357 + var27 = ((long)var7 << 32) + (long)var8; // L: 6358 + Node var29 = widgetFlags.get(var27); // L: 6359 + if (var29 != null) { // L: 6360 + var29.remove(); + } + + widgetFlags.put(new IntegerNode(var5), var27); // L: 6361 + } + var1.serverPacket = null; // L: 6363 return true; // L: 6364 } - if (ServerPacket.field2728 == var1.serverPacket) { // L: 6366 - class19.method267(class225.field2687); // L: 6367 - var1.serverPacket = null; // L: 6368 - return true; // L: 6369 - } - - if (ServerPacket.field2738 == var1.serverPacket) { // L: 6371 - var17 = var3.readInt(); // L: 6372 - if (var17 != field839) { // L: 6373 - field839 = var17; // L: 6374 - FriendSystem.method1732(); // L: 6375 - } - + if (ServerPacket.field2764 == var1.serverPacket) { // L: 6366 + var60 = var3.readInt(); // L: 6367 + var5 = var3.readInt(); // L: 6368 + var6 = class43.getGcDuration(); // L: 6369 + PacketBufferNode var73 = class21.getPacketBufferNode(ClientPacket.field2634, packetWriter.isaacCipher); // L: 6371 + var73.packetBuffer.method6611(var60); // L: 6372 + var73.packetBuffer.writeInt(var5); // L: 6373 + var73.packetBuffer.method6581(GameEngine.fps); // L: 6374 + var73.packetBuffer.method6584(var6); // L: 6375 + packetWriter.addNode(var73); // L: 6376 var1.serverPacket = null; // L: 6377 return true; // L: 6378 } - if (ServerPacket.field2718 == var1.serverPacket) { // L: 6380 - var17 = var3.readUShortSmart(); // L: 6381 - boolean var56 = var3.readUnsignedByte() == 1; // L: 6382 - var74 = ""; // L: 6383 - boolean var51 = false; // L: 6384 - if (var56) { // L: 6385 - var74 = var3.readStringCp1252NullTerminated(); // L: 6386 - if (GrandExchangeOfferUnitPriceComparator.friendSystem.isIgnored(new Username(var74, ModeWhere.loginType))) { // L: 6387 - var51 = true; - } - } - - String var79 = var3.readStringCp1252NullTerminated(); // L: 6389 - if (!var51) { // L: 6390 - WorldMapScaleHandler.addGameMessage(var17, var74, var79); - } - - var1.serverPacket = null; // L: 6391 - return true; // L: 6392 + if (ServerPacket.field2786 == var1.serverPacket) { // L: 6380 + class339.loadRegions(true, var1.packetBuffer); // L: 6381 + var1.serverPacket = null; // L: 6382 + return true; // L: 6383 } - if (ServerPacket.field2751 == var1.serverPacket) { // L: 6394 - isCameraLocked = true; // L: 6395 - Language.field3704 = var3.readUnsignedByte(); // L: 6396 - Interpreter.field947 = var3.readUnsignedByte(); // L: 6397 - KitDefinition.field1592 = var3.readUnsignedShort(); // L: 6398 - class2.field18 = var3.readUnsignedByte(); // L: 6399 - ReflectionCheck.field580 = var3.readUnsignedByte(); // L: 6400 - if (ReflectionCheck.field580 >= 100) { // L: 6401 - var17 = Language.field3704 * 128 + 64; // L: 6402 - var5 = Interpreter.field947 * 128 + 64; // L: 6403 - var6 = SceneTilePaint.getTileHeight(var17, var5, ParamComposition.Client_plane) - KitDefinition.field1592; // L: 6404 - var7 = var17 - class20.cameraX; // L: 6405 - var8 = var6 - Skeleton.cameraY; // L: 6406 - var9 = var5 - WorldMapDecoration.cameraZ; // L: 6407 - var21 = (int)Math.sqrt((double)(var7 * var7 + var9 * var9)); // L: 6408 - class1.cameraPitch = (int)(Math.atan2((double)var8, (double)var21) * 325.949D) & 2047; // L: 6409 - HealthBarDefinition.cameraYaw = (int)(Math.atan2((double)var7, (double)var9) * -325.949D) & 2047; // L: 6410 - if (class1.cameraPitch < 128) { // L: 6411 - class1.cameraPitch = 128; - } - - if (class1.cameraPitch > 383) { // L: 6412 - class1.cameraPitch = 383; - } - } - - var1.serverPacket = null; // L: 6414 - return true; // L: 6415 + if (ServerPacket.field2712 == var1.serverPacket) { // L: 6385 + Tile.method3843(class225.field2682); // L: 6386 + var1.serverPacket = null; // L: 6387 + return true; // L: 6388 } - if (ServerPacket.field2747 == var1.serverPacket) { // L: 6417 - var17 = var3.readUnsignedByte(); // L: 6418 - var5 = var3.method6648(); // L: 6419 - var6 = var3.method6481(); // L: 6420 - var63 = (InterfaceParent)interfaceParents.get((long)var6); // L: 6421 - if (var63 != null) { // L: 6422 - class18.closeInterface(var63, var5 != var63.group); - } - - GrandExchangeOfferWorldComparator.method5010(var6, var5, var17); // L: 6423 - var1.serverPacket = null; // L: 6424 - return true; // L: 6425 - } - - if (ServerPacket.field2704 == var1.serverPacket) { // L: 6427 - var76 = var3.method6478() == 1; // L: 6428 - var5 = var3.method6428(); // L: 6429 - var18 = DevicePcmPlayerProvider.getWidget(var5); // L: 6430 - if (var76 != var18.isHidden) { // L: 6431 - var18.isHidden = var76; // L: 6432 - VerticalAlignment.invalidateWidget(var18); // L: 6433 - } - - var1.serverPacket = null; // L: 6435 - return true; // L: 6436 - } - - if (ServerPacket.field2778 == var1.serverPacket) { // L: 6438 - var46 = var3.readStringCp1252NullTerminated(); // L: 6439 - var5 = var3.method6497(); // L: 6440 - var18 = DevicePcmPlayerProvider.getWidget(var5); // L: 6441 - if (!var46.equals(var18.text)) { // L: 6442 - var18.text = var46; // L: 6443 - VerticalAlignment.invalidateWidget(var18); // L: 6444 - } - - var1.serverPacket = null; // L: 6446 - return true; // L: 6447 - } - - if (ServerPacket.field2744 == var1.serverPacket) { // L: 6449 - var17 = var3.readUnsignedShort(); // L: 6450 - byte var55 = var3.readByte(); // L: 6451 - Varps.Varps_temp[var17] = var55; // L: 6452 - if (Varps.Varps_main[var17] != var55) { // L: 6453 - Varps.Varps_main[var17] = var55; // L: 6454 - } - - WorldMapData_0.changeGameOptions(var17); // L: 6456 - changedVarps[++changedVarpCount - 1 & 31] = var17; // L: 6457 - var1.serverPacket = null; // L: 6458 - return true; // L: 6459 - } - - if (ServerPacket.field2786 == var1.serverPacket) { // L: 6461 - class3.updateNpcs(false, var3); // L: 6462 - var1.serverPacket = null; // L: 6463 - return true; // L: 6464 - } - - if (ServerPacket.field2710 == var1.serverPacket) { // L: 6466 - class19.method267(class225.field2678); // L: 6467 - var1.serverPacket = null; // L: 6468 - return true; // L: 6469 - } - - if (ServerPacket.field2773 == var1.serverPacket) { // L: 6471 - isCameraLocked = true; // L: 6472 - field696 = var3.readUnsignedByte(); // L: 6473 - class18.field157 = var3.readUnsignedByte(); // L: 6474 - class0.field5 = var3.readUnsignedShort(); // L: 6475 - UserComparator4.field1403 = var3.readUnsignedByte(); // L: 6476 - SoundSystem.field436 = var3.readUnsignedByte(); // L: 6477 - if (SoundSystem.field436 >= 100) { // L: 6478 - class20.cameraX = field696 * 128 + 64; // L: 6479 - WorldMapDecoration.cameraZ = class18.field157 * 128 + 64; // L: 6480 - Skeleton.cameraY = SceneTilePaint.getTileHeight(class20.cameraX, WorldMapDecoration.cameraZ, ParamComposition.Client_plane) - class0.field5; // L: 6481 - } - - var1.serverPacket = null; // L: 6483 - return true; // L: 6484 - } - - if (ServerPacket.field2743 == var1.serverPacket) { // L: 6486 - class19.method267(class225.field2680); // L: 6487 - var1.serverPacket = null; // L: 6488 - return true; // L: 6489 - } - - if (ServerPacket.field2752 == var1.serverPacket) { // L: 6491 - var17 = var3.method6620(); // L: 6492 - var5 = var3.method6428(); // L: 6493 - var18 = DevicePcmPlayerProvider.getWidget(var5); // L: 6494 - if (var18.modelType != 1 || var17 != var18.modelId) { // L: 6495 - var18.modelType = 1; // L: 6496 - var18.modelId = var17; // L: 6497 - VerticalAlignment.invalidateWidget(var18); // L: 6498 - } - - var1.serverPacket = null; // L: 6500 - return true; // L: 6501 - } - - if (ServerPacket.field2750 == var1.serverPacket) { // L: 6503 - ObjectSound.field935 = null; // L: 6504 - var1.serverPacket = null; // L: 6505 - return true; // L: 6506 - } - - if (ServerPacket.field2783 == var1.serverPacket) { // L: 6508 - var76 = var3.readUnsignedByte() == 1; // L: 6509 - if (var76) { // L: 6510 - ChatChannel.field1081 = Archive.currentTimeMillis() - var3.readLong(); // L: 6511 - class29.grandExchangeEvents = new GrandExchangeEvents(var3, true); // L: 6512 + if (ServerPacket.field2727 == var1.serverPacket) { // L: 6390 + var78 = var3.readUnsignedByte() == 1; // L: 6391 + if (var78) { // L: 6392 + Widget.field3099 = ObjectComposition.currentTimeMillis() - var3.readLong(); // L: 6393 + BuddyRankComparator.grandExchangeEvents = new GrandExchangeEvents(var3, true); // L: 6394 } else { - class29.grandExchangeEvents = null; // L: 6514 + BuddyRankComparator.grandExchangeEvents = null; // L: 6396 } - field816 = cycleCntr; // L: 6515 - var1.serverPacket = null; // L: 6516 - return true; // L: 6517 + field748 = cycleCntr; // L: 6397 + var1.serverPacket = null; // L: 6398 + return true; // L: 6399 } - if (ServerPacket.field2719 == var1.serverPacket) { // L: 6519 - var17 = var3.method6428(); // L: 6520 - var5 = var3.method6497(); // L: 6521 - var6 = var3.method6486(); // L: 6522 - if (var6 == 65535) { // L: 6523 + if (ServerPacket.field2789 == var1.serverPacket) { // L: 6401 + isCameraLocked = false; // L: 6402 + + for (var60 = 0; var60 < 5; ++var60) { // L: 6403 + field693[var60] = false; + } + + var1.serverPacket = null; // L: 6404 + return true; // L: 6405 + } + + Widget var69; + if (ServerPacket.field2753 == var1.serverPacket) { // L: 6407 + var60 = var3.method6598(); // L: 6408 + var5 = var3.method6614(); // L: 6409 + var6 = var3.method6604(); // L: 6410 + if (var6 == 65535) { // L: 6411 var6 = -1; } - var20 = DevicePcmPlayerProvider.getWidget(var5); // L: 6524 - ItemComposition var78; - if (!var20.isIf3) { // L: 6525 - if (var6 == -1) { // L: 6526 - var20.modelType = 0; // L: 6527 - var1.serverPacket = null; // L: 6528 - return true; // L: 6529 + var69 = Frames.getWidget(var5); // L: 6412 + ItemComposition var75; + if (!var69.isIf3) { // L: 6413 + if (var6 == -1) { // L: 6414 + var69.modelType = 0; // L: 6415 + var1.serverPacket = null; // L: 6416 + return true; // L: 6417 } - var78 = Strings.ItemDefinition_get(var6); // L: 6531 - var20.modelType = 4; // L: 6532 - var20.modelId = var6; // L: 6533 - var20.modelAngleX = var78.xan2d; // L: 6534 - var20.modelAngleY = var78.yan2d; // L: 6535 - var20.modelZoom = var78.zoom2d * 100 / var17; // L: 6536 - VerticalAlignment.invalidateWidget(var20); // L: 6537 + var75 = class260.ItemDefinition_get(var6); // L: 6419 + var69.modelType = 4; // L: 6420 + var69.modelId = var6; // L: 6421 + var69.modelAngleX = var75.xan2d; // L: 6422 + var69.modelAngleY = var75.yan2d; // L: 6423 + var69.modelZoom = var75.zoom2d * 100 / var60; // L: 6424 + WorldMapCacheName.invalidateWidget(var69); // L: 6425 } else { - var20.itemId = var6; // L: 6540 - var20.itemQuantity = var17; // L: 6541 - var78 = Strings.ItemDefinition_get(var6); // L: 6542 - var20.modelAngleX = var78.xan2d; // L: 6543 - var20.modelAngleY = var78.yan2d; // L: 6544 - var20.modelAngleZ = var78.zan2d; // L: 6545 - var20.modelOffsetX = var78.offsetX2d; // L: 6546 - var20.modelOffsetY = var78.offsetY2d; // L: 6547 - var20.modelZoom = var78.zoom2d; // L: 6548 - if (var78.isStackable == 1) { // L: 6549 - var20.itemQuantityMode = 1; + var69.itemId = var6; // L: 6428 + var69.itemQuantity = var60; // L: 6429 + var75 = class260.ItemDefinition_get(var6); // L: 6430 + var69.modelAngleX = var75.xan2d; // L: 6431 + var69.modelAngleY = var75.yan2d; // L: 6432 + var69.modelAngleZ = var75.zan2d; // L: 6433 + var69.modelOffsetX = var75.offsetX2d; // L: 6434 + var69.modelOffsetY = var75.offsetY2d; // L: 6435 + var69.modelZoom = var75.zoom2d; // L: 6436 + if (var75.isStackable == 1) { // L: 6437 + var69.itemQuantityMode = 1; } else { - var20.itemQuantityMode = 2; // L: 6550 + var69.itemQuantityMode = 2; // L: 6438 } - if (var20.field3019 > 0) { // L: 6551 - var20.modelZoom = var20.modelZoom * 32 / var20.field3019; - } else if (var20.rawWidth > 0) { // L: 6552 - var20.modelZoom = var20.modelZoom * 32 / var20.rawWidth; + if (var69.field3013 > 0) { // L: 6439 + var69.modelZoom = var69.modelZoom * 32 / var69.field3013; + } else if (var69.rawWidth > 0) { // L: 6440 + var69.modelZoom = var69.modelZoom * 32 / var69.rawWidth; } - VerticalAlignment.invalidateWidget(var20); // L: 6553 + WorldMapCacheName.invalidateWidget(var69); // L: 6441 } - var1.serverPacket = null; // L: 6555 - return true; // L: 6556 + var1.serverPacket = null; // L: 6443 + return true; // L: 6444 } - if (ServerPacket.field2701 == var1.serverPacket) { // L: 6558 - ObjectSound.field935 = new class339(ModeWhere.HitSplatDefinition_cachedSprites); // L: 6559 - var1.serverPacket = null; // L: 6560 - return true; // L: 6561 + if (ServerPacket.field2794 == var1.serverPacket) { // L: 6446 + minimapState = var3.readUnsignedByte(); // L: 6447 + var1.serverPacket = null; // L: 6448 + return true; // L: 6449 } - if (ServerPacket.field2702 == var1.serverPacket) { // L: 6563 - var46 = var3.readStringCp1252NullTerminated(); // L: 6564 - var19 = AbstractFont.escapeBrackets(Clock.method2592(class22.method299(var3))); // L: 6565 - WorldMapScaleHandler.addGameMessage(6, var46, var19); // L: 6566 - var1.serverPacket = null; // L: 6567 - return true; // L: 6568 + if (ServerPacket.field2745 == var1.serverPacket) { // L: 6451 + var46 = var3.readStringCp1252NullTerminated(); // L: 6452 + var18 = AbstractFont.escapeBrackets(class43.method433(MusicPatch.method4592(var3))); // L: 6453 + World.addGameMessage(6, var46, var18); // L: 6454 + var1.serverPacket = null; // L: 6455 + return true; // L: 6456 } - if (ServerPacket.field2703 == var1.serverPacket) { // L: 6570 - var17 = var3.readUnsignedShort(); // L: 6571 - var5 = var3.readUnsignedByte(); // L: 6572 - var6 = var3.readUnsignedShort(); // L: 6573 - class69.queueSoundEffect(var17, var5, var6); // L: 6574 - var1.serverPacket = null; // L: 6575 - return true; // L: 6576 - } - - if (ServerPacket.field2709 == var1.serverPacket) { // L: 6578 - class5.method64(var3.readStringCp1252NullTerminated()); // L: 6579 - var1.serverPacket = null; // L: 6580 - return true; // L: 6581 - } - - int var15; - String var35; - if (ServerPacket.field2708 == var1.serverPacket) { // L: 6583 - var46 = var3.readStringCp1252NullTerminated(); // L: 6584 - var25 = var3.readLong(); // L: 6585 - var27 = (long)var3.readUnsignedShort(); // L: 6586 - var22 = (long)var3.readMedium(); // L: 6587 - PlayerType var24 = (PlayerType)UserComparator4.findEnumerated(class249.PlayerType_values(), var3.readUnsignedByte()); // L: 6588 - var12 = (var27 << 32) + var22; // L: 6589 - boolean var57 = false; // L: 6590 - - for (var15 = 0; var15 < 100; ++var15) { // L: 6591 - if (crossWorldMessageIds[var15] == var12) { // L: 6592 - var57 = true; // L: 6593 - break; // L: 6594 - } - } - - if (var24.isUser && GrandExchangeOfferUnitPriceComparator.friendSystem.isIgnored(new Username(var46, ModeWhere.loginType))) { // L: 6597 6598 - var57 = true; - } - - if (!var57 && field727 == 0) { // L: 6600 - crossWorldMessageIds[crossWorldMessageIdsIndex] = var12; // L: 6601 - crossWorldMessageIdsIndex = (crossWorldMessageIdsIndex + 1) % 100; // L: 6602 - var35 = AbstractFont.escapeBrackets(Clock.method2592(class22.method299(var3))); // L: 6603 - if (var24.modIcon != -1) { // L: 6604 - class69.addChatMessage(9, class169.method3495(var24.modIcon) + var46, var35, MilliClock.base37DecodeLong(var25)); - } else { - class69.addChatMessage(9, var46, var35, MilliClock.base37DecodeLong(var25)); // L: 6605 - } - } - - var1.serverPacket = null; // L: 6607 - return true; // L: 6608 - } - - if (ServerPacket.field2721 == var1.serverPacket) { // L: 6610 - var17 = var3.method6481(); // L: 6611 - var66 = DevicePcmPlayerProvider.getWidget(var17); // L: 6612 - - for (var6 = 0; var6 < var66.itemIds.length; ++var6) { // L: 6613 - var66.itemIds[var6] = -1; // L: 6614 - var66.itemIds[var6] = 0; // L: 6615 - } - - VerticalAlignment.invalidateWidget(var66); // L: 6617 - var1.serverPacket = null; // L: 6618 - return true; // L: 6619 - } - - if (ServerPacket.field2762 == var1.serverPacket) { // L: 6621 - class22.method297(); // L: 6622 - var60 = var3.readByte(); // L: 6623 - class2 var64 = new class2(var3); // L: 6624 - class11 var71; - if (var60 >= 0) { // L: 6626 - var71 = field678[var60]; - } else { - var71 = class105.field1328; // L: 6627 - } - - var64.method25(var71); // L: 6628 - var1.serverPacket = null; // L: 6629 - return true; // L: 6630 - } - - if (ServerPacket.field2730 == var1.serverPacket) { // L: 6632 - var17 = var3.method6497(); // L: 6633 - var5 = var3.readUnsignedShort(); // L: 6634 - Varps.Varps_temp[var5] = var17; // L: 6635 - if (Varps.Varps_main[var5] != var17) { // L: 6636 - Varps.Varps_main[var5] = var17; // L: 6637 - } - - WorldMapData_0.changeGameOptions(var5); // L: 6639 - changedVarps[++changedVarpCount - 1 & 31] = var5; // L: 6640 - var1.serverPacket = null; // L: 6641 - return true; // L: 6642 - } - - if (ServerPacket.field2732 == var1.serverPacket) { // L: 6644 - class19.method267(class225.field2681); // L: 6645 - var1.serverPacket = null; // L: 6646 - return true; // L: 6647 - } - - if (ServerPacket.field2787 == var1.serverPacket) { // L: 6649 - var60 = var3.readByte(); // L: 6650 - var25 = (long)var3.readUnsignedShort(); // L: 6651 - var27 = (long)var3.readMedium(); // L: 6652 - var22 = (var25 << 32) + var27; // L: 6653 - boolean var11 = false; // L: 6654 - class3 var36 = var60 >= 0 ? field847[var60] : Players.field1358; // L: 6655 - if (var36 == null) { // L: 6656 + String var32; + int var57; + if (ServerPacket.field2719 == var1.serverPacket) { // L: 6458 + var17 = var3.readByte(); // L: 6459 + var23 = (long)var3.readUnsignedShort(); // L: 6460 + var25 = (long)var3.readMedium(); // L: 6461 + var27 = var25 + (var23 << 32); // L: 6462 + boolean var11 = false; // L: 6463 + ClanChannel var31 = var17 >= 0 ? currentClanChannels[var17] : ApproximateRouteStrategy.guestClanChannel; // L: 6464 + if (var31 == null) { // L: 6465 var11 = true; } else { - for (var58 = 0; var58 < 100; ++var58) { // L: 6658 - if (crossWorldMessageIds[var58] == var22) { // L: 6659 - var11 = true; // L: 6660 - break; // L: 6661 + for (var57 = 0; var57 < 100; ++var57) { // L: 6467 + if (var27 == crossWorldMessageIds[var57]) { // L: 6468 + var11 = true; // L: 6469 + break; // L: 6470 } } } - if (!var11) { // L: 6665 - crossWorldMessageIds[crossWorldMessageIdsIndex] = var22; // L: 6666 - crossWorldMessageIdsIndex = (crossWorldMessageIdsIndex + 1) % 100; // L: 6667 - var33 = class22.method299(var3); // L: 6668 - int var14 = var60 >= 0 ? 43 : 46; // L: 6669 - class69.addChatMessage(var14, "", var33, var36.field38); // L: 6670 + if (!var11) { // L: 6474 + crossWorldMessageIds[crossWorldMessageIdsIndex] = var27; // L: 6475 + crossWorldMessageIdsIndex = (crossWorldMessageIdsIndex + 1) % 100; // L: 6476 + var32 = MusicPatch.method4592(var3); // L: 6477 + int var58 = var17 >= 0 ? 43 : 46; // L: 6478 + class5.addChatMessage(var58, "", var32, var31.name); // L: 6479 } - var1.serverPacket = null; // L: 6672 - return true; // L: 6673 + var1.serverPacket = null; // L: 6481 + return true; // L: 6482 } - if (ServerPacket.field2733 == var1.serverPacket) { // L: 6675 - var17 = var3.readUnsignedByte(); // L: 6676 - if (var3.readUnsignedByte() == 0) { // L: 6677 - grandExchangeOffers[var17] = new GrandExchangeOffer(); // L: 6678 - var3.offset += 18; // L: 6679 - } else { - --var3.offset; // L: 6682 - grandExchangeOffers[var17] = new GrandExchangeOffer(var3, false); // L: 6683 + if (ServerPacket.field2708 == var1.serverPacket) { // L: 6484 + Occluder.field2387 = var3.method6595(); // L: 6485 + class69.field596 = var3.method6549(); // L: 6486 + var1.serverPacket = null; // L: 6487 + return true; // L: 6488 + } + + if (ServerPacket.field2762 == var1.serverPacket) { // L: 6490 + var60 = var3.method6603(); // L: 6491 + var5 = var3.method6605(); // L: 6492 + var6 = var3.method6604(); // L: 6493 + var7 = var3.method6598(); // L: 6494 + var74 = Frames.getWidget(var7); // L: 6495 + if (var60 != var74.modelAngleX || var5 != var74.modelAngleY || var6 != var74.modelZoom) { // L: 6496 + var74.modelAngleX = var60; // L: 6497 + var74.modelAngleY = var5; // L: 6498 + var74.modelZoom = var6; // L: 6499 + WorldMapCacheName.invalidateWidget(var74); // L: 6500 } - field815 = cycleCntr; // L: 6685 - var1.serverPacket = null; // L: 6686 - return true; // L: 6687 + var1.serverPacket = null; // L: 6502 + return true; // L: 6503 } - if (ServerPacket.field2785 == var1.serverPacket) { // L: 6689 - ClientPreferences.loadRegions(true, var1.packetBuffer); // L: 6690 - var1.serverPacket = null; // L: 6691 - return true; // L: 6692 + Widget var64; + if (ServerPacket.field2761 == var1.serverPacket) { // L: 6505 + var60 = var3.method6614(); // L: 6506 + var64 = Frames.getWidget(var60); // L: 6507 + var64.modelType = 3; // L: 6508 + var64.modelId = class93.localPlayer.appearance.getChatHeadId(); // L: 6509 + WorldMapCacheName.invalidateWidget(var64); // L: 6510 + var1.serverPacket = null; // L: 6511 + return true; // L: 6512 } - if (ServerPacket.field2795 == var1.serverPacket) { // L: 6694 - destinationX = var3.readUnsignedByte(); // L: 6695 - if (destinationX == 255) { // L: 6696 - destinationX = 0; + if (ServerPacket.field2763 == var1.serverPacket) { // L: 6514 + var60 = var3.readUShortSmart(); // L: 6515 + boolean var54 = var3.readUnsignedByte() == 1; // L: 6516 + var72 = ""; // L: 6517 + boolean var52 = false; // L: 6518 + if (var54) { // L: 6519 + var72 = var3.readStringCp1252NullTerminated(); // L: 6520 + if (NetSocket.friendSystem.isIgnored(new Username(var72, WorldMapSection0.loginType))) { // L: 6521 + var52 = true; + } } - destinationY = var3.readUnsignedByte(); // L: 6697 - if (destinationY == 255) { // L: 6698 - destinationY = 0; + String var22 = var3.readStringCp1252NullTerminated(); // L: 6523 + if (!var52) { // L: 6524 + World.addGameMessage(var60, var72, var22); } - var1.serverPacket = null; // L: 6699 - return true; // L: 6700 + var1.serverPacket = null; // L: 6525 + return true; // L: 6526 } - if (ServerPacket.field2745 == var1.serverPacket) { // L: 6702 - Script.method2014(); // L: 6703 - var17 = var3.method6476(); // L: 6704 - var5 = var3.method6478(); // L: 6705 - var6 = var3.method6497(); // L: 6706 - experience[var5] = var6; // L: 6707 - currentLevels[var5] = var17; // L: 6708 - levels[var5] = 1; // L: 6709 + if (ServerPacket.field2793 == var1.serverPacket) { // L: 6528 + class170.method3554(); // L: 6529 + weight = var3.readShort(); // L: 6530 + field659 = cycleCntr; // L: 6531 + var1.serverPacket = null; // L: 6532 + return true; // L: 6533 + } - for (var7 = 0; var7 < 98; ++var7) { // L: 6710 + if (ServerPacket.field2791 == var1.serverPacket) { // L: 6535 + publicChatMode = var3.readUnsignedByte(); // L: 6536 + tradeChatMode = var3.method6549(); // L: 6537 + var1.serverPacket = null; // L: 6538 + return true; // L: 6539 + } + + if (ServerPacket.field2784 == var1.serverPacket) { // L: 6541 + var3.offset += 28; // L: 6542 + if (var3.checkCrc()) { // L: 6543 + class245.method4714(var3, var3.offset - 28); + } + + var1.serverPacket = null; // L: 6544 + return true; // L: 6545 + } + + if (ServerPacket.field2740 == var1.serverPacket) { // L: 6547 + var60 = var3.readUnsignedShort(); // L: 6548 + if (var60 == 65535) { // L: 6549 + var60 = -1; + } + + class27.playSong(var60); // L: 6550 + var1.serverPacket = null; // L: 6551 + return true; // L: 6552 + } + + if (ServerPacket.field2725 == var1.serverPacket) { // L: 6554 + var60 = var3.method6604(); // L: 6555 + if (var60 == 65535) { // L: 6556 + var60 = -1; + } + + var5 = var3.method6610(); // L: 6557 + GrandExchangeOfferNameComparator.method5059(var60, var5); // L: 6558 + var1.serverPacket = null; // L: 6559 + return true; // L: 6560 + } + + if (ServerPacket.field2754 == var1.serverPacket) { // L: 6562 + var46 = var3.readStringCp1252NullTerminated(); // L: 6563 + var5 = var3.method6549(); // L: 6564 + var6 = var3.method6671(); // L: 6565 + if (var5 >= 1 && var5 <= 8) { // L: 6566 + if (var46.equalsIgnoreCase("null")) { // L: 6567 + var46 = null; + } + + playerMenuActions[var5 - 1] = var46; // L: 6568 + playerOptionsPriorities[var5 - 1] = var6 == 0; // L: 6569 + } + + var1.serverPacket = null; // L: 6571 + return true; // L: 6572 + } + + if (ServerPacket.field2748 == var1.serverPacket) { // L: 6574 + var60 = var3.readUnsignedByte(); // L: 6575 + var5 = var3.readUnsignedByte(); // L: 6576 + var6 = var3.readUnsignedByte(); // L: 6577 + var7 = var3.readUnsignedByte(); // L: 6578 + field693[var60] = true; // L: 6579 + field890[var60] = var5; // L: 6580 + field891[var60] = var6; // L: 6581 + field892[var60] = var7; // L: 6582 + field893[var60] = 0; // L: 6583 + var1.serverPacket = null; // L: 6584 + return true; // L: 6585 + } + + if (ServerPacket.field2783 == var1.serverPacket) { // L: 6587 + class69.field596 = var3.readUnsignedByte(); // L: 6588 + Occluder.field2387 = var3.readUnsignedByte(); // L: 6589 + + for (var60 = Occluder.field2387; var60 < Occluder.field2387 + 8; ++var60) { // L: 6590 + for (var5 = class69.field596; var5 < class69.field596 + 8; ++var5) { // L: 6591 + if (groundItems[class22.Client_plane][var60][var5] != null) { // L: 6592 + groundItems[class22.Client_plane][var60][var5] = null; // L: 6593 + ClanSettings.updateItemPile(var60, var5); // L: 6594 + } + } + } + + for (PendingSpawn var47 = (PendingSpawn)pendingSpawns.last(); var47 != null; var47 = (PendingSpawn)pendingSpawns.previous()) { // L: 6598 6599 6601 + if (var47.x >= Occluder.field2387 && var47.x < Occluder.field2387 + 8 && var47.y >= class69.field596 && var47.y < class69.field596 + 8 && var47.plane == class22.Client_plane) { // L: 6600 + var47.hitpoints = 0; + } + } + + var1.serverPacket = null; // L: 6603 + return true; // L: 6604 + } + + if (ServerPacket.field2723 == var1.serverPacket) { // L: 6606 + for (var60 = 0; var60 < players.length; ++var60) { // L: 6607 + if (players[var60] != null) { // L: 6608 + players[var60].sequence = -1; + } + } + + for (var60 = 0; var60 < npcs.length; ++var60) { // L: 6610 + if (npcs[var60] != null) { // L: 6611 + npcs[var60].sequence = -1; + } + } + + var1.serverPacket = null; // L: 6613 + return true; // L: 6614 + } + + if (ServerPacket.field2715 == var1.serverPacket) { // L: 6616 + var60 = var3.method6613(); // L: 6617 + var64 = Frames.getWidget(var60); // L: 6618 + + for (var6 = 0; var6 < var64.itemIds.length; ++var6) { // L: 6619 + var64.itemIds[var6] = -1; // L: 6620 + var64.itemIds[var6] = 0; // L: 6621 + } + + WorldMapCacheName.invalidateWidget(var64); // L: 6623 + var1.serverPacket = null; // L: 6624 + return true; // L: 6625 + } + + if (ServerPacket.field2774 == var1.serverPacket) { // L: 6627 + class170.method3554(); // L: 6628 + var60 = var3.method6595(); // L: 6629 + var5 = var3.method6549(); // L: 6630 + var6 = var3.method6614(); // L: 6631 + experience[var5] = var6; // L: 6632 + currentLevels[var5] = var60; // L: 6633 + levels[var5] = 1; // L: 6634 + + for (var7 = 0; var7 < 98; ++var7) { // L: 6635 if (var6 >= Skills.Skills_experienceTable[var7]) { levels[var5] = var7 + 2; } } - changedSkills[++changedSkillsCount - 1 & 31] = var5; // L: 6711 + changedSkills[++changedSkillsCount - 1 & 31] = var5; // L: 6636 + var1.serverPacket = null; // L: 6637 + return true; // L: 6638 + } + + if (ServerPacket.field2782 == var1.serverPacket) { // L: 6640 + NetSocket.friendSystem.method1698(); // L: 6641 + field836 = cycleCntr; // L: 6642 + var1.serverPacket = null; // L: 6643 + return true; // L: 6644 + } + + if (ServerPacket.field2747 == var1.serverPacket) { // L: 6646 + var60 = var3.method6614(); // L: 6647 + var5 = var3.method6605(); // L: 6648 + var6 = var3.method6605(); // L: 6649 + var69 = Frames.getWidget(var60); // L: 6650 + var69.field3014 = var6 + (var5 << 16); // L: 6651 + var1.serverPacket = null; // L: 6652 + return true; // L: 6653 + } + + if (ServerPacket.field2731 == var1.serverPacket) { // L: 6655 + var60 = var3.method6614(); // L: 6656 + var5 = var3.readUnsignedShort(); // L: 6657 + Varps.Varps_temp[var5] = var60; // L: 6658 + if (Varps.Varps_main[var5] != var60) { // L: 6659 + Varps.Varps_main[var5] = var60; // L: 6660 + } + + ApproximateRouteStrategy.changeGameOptions(var5); // L: 6662 + changedVarps[++changedVarpCount - 1 & 31] = var5; // L: 6663 + var1.serverPacket = null; // L: 6664 + return true; // L: 6665 + } + + if (ServerPacket.field2771 == var1.serverPacket) { // L: 6667 + var60 = var3.readInt(); // L: 6668 + var5 = var3.readUnsignedShort(); // L: 6669 + if (var60 < -70000) { // L: 6670 + var5 += 32768; + } + + if (var60 >= 0) { // L: 6672 + var67 = Frames.getWidget(var60); + } else { + var67 = null; // L: 6673 + } + + if (var67 != null) { // L: 6674 + for (var7 = 0; var7 < var67.itemIds.length; ++var7) { // L: 6675 + var67.itemIds[var7] = 0; // L: 6676 + var67.itemQuantities[var7] = 0; // L: 6677 + } + } + + GrandExchangeOfferOwnWorldComparator.clearItemContainer(var5); // L: 6680 + var7 = var3.readUnsignedShort(); // L: 6681 + + for (var8 = 0; var8 < var7; ++var8) { // L: 6682 + var9 = var3.method6604(); // L: 6683 + var20 = var3.method6595(); // L: 6684 + if (var20 == 255) { // L: 6685 + var20 = var3.method6613(); + } + + if (var67 != null && var8 < var67.itemIds.length) { // L: 6686 6687 + var67.itemIds[var8] = var9; // L: 6688 + var67.itemQuantities[var8] = var20; // L: 6689 + } + + class4.itemContainerSetItem(var5, var8, var9 - 1, var20); // L: 6692 + } + + if (var67 != null) { // L: 6694 + WorldMapCacheName.invalidateWidget(var67); + } + + class170.method3554(); // L: 6695 + changedItemContainers[++field830 - 1 & 31] = var5 & 32767; // L: 6696 + var1.serverPacket = null; // L: 6697 + return true; // L: 6698 + } + + if (ServerPacket.field2756 == var1.serverPacket) { // L: 6700 + var60 = var3.method6604(); // L: 6701 + Login.method1941(var60); // L: 6702 + changedItemContainers[++field830 - 1 & 31] = var60 & 32767; // L: 6703 + var1.serverPacket = null; // L: 6704 + return true; // L: 6705 + } + + if (ServerPacket.field2720 == var1.serverPacket) { // L: 6707 + if (WorldMapRegion.friendsChat != null) { // L: 6708 + WorldMapRegion.friendsChat.method5659(var3); // L: 6709 + } + + CollisionMap.method3155(); // L: 6711 var1.serverPacket = null; // L: 6712 return true; // L: 6713 } - if (ServerPacket.field2781 == var1.serverPacket) { // L: 6715 - var17 = var3.method6497(); // L: 6716 - var5 = var3.method6497(); // L: 6717 - InterfaceParent var68 = (InterfaceParent)interfaceParents.get((long)var5); // L: 6718 - var63 = (InterfaceParent)interfaceParents.get((long)var17); // L: 6719 - if (var63 != null) { // L: 6720 - class18.closeInterface(var63, var68 == null || var63.group != var68.group); + if (ServerPacket.field2755 == var1.serverPacket) { // L: 6715 + for (var60 = 0; var60 < VarpDefinition.VarpDefinition_fileCount; ++var60) { // L: 6716 + VarpDefinition var63 = ClanSettings.VarpDefinition_get(var60); // L: 6717 + if (var63 != null) { // L: 6718 + Varps.Varps_temp[var60] = 0; // L: 6719 + Varps.Varps_main[var60] = 0; // L: 6720 + } } - if (var68 != null) { // L: 6721 - var68.remove(); // L: 6722 - interfaceParents.put(var68, (long)var17); // L: 6723 - } - - var34 = DevicePcmPlayerProvider.getWidget(var5); // L: 6725 - if (var34 != null) { // L: 6726 - VerticalAlignment.invalidateWidget(var34); - } - - var34 = DevicePcmPlayerProvider.getWidget(var17); // L: 6727 - if (var34 != null) { // L: 6728 - VerticalAlignment.invalidateWidget(var34); // L: 6729 - ApproximateRouteStrategy.revalidateWidgetScroll(Widget.Widget_interfaceComponents[var34.id >>> 16], var34, true); // L: 6730 - } - - if (rootInterface != -1) { // L: 6732 - LoginType.runIntfCloseListeners(rootInterface, 1); - } - - var1.serverPacket = null; // L: 6733 - return true; // L: 6734 + class170.method3554(); // L: 6723 + changedVarpCount += 32; // L: 6724 + var1.serverPacket = null; // L: 6725 + return true; // L: 6726 } - if (ServerPacket.field2746 == var1.serverPacket) { // L: 6736 - var17 = var3.method6497(); // L: 6737 - var5 = var3.method6648(); // L: 6738 - var6 = var3.method6648(); // L: 6739 - var20 = DevicePcmPlayerProvider.getWidget(var17); // L: 6740 - var20.field3020 = var6 + (var5 << 16); // L: 6741 + if (ServerPacket.field2707 == var1.serverPacket) { // L: 6728 + SoundSystem.updateNpcs(false, var3); // L: 6729 + var1.serverPacket = null; // L: 6730 + return true; // L: 6731 + } + + if (ServerPacket.field2702 == var1.serverPacket) { // L: 6733 + var60 = var3.readUnsignedShort(); // L: 6734 + byte var49 = var3.readByte(); // L: 6735 + Varps.Varps_temp[var60] = var49; // L: 6736 + if (Varps.Varps_main[var60] != var49) { // L: 6737 + Varps.Varps_main[var60] = var49; // L: 6738 + } + + ApproximateRouteStrategy.changeGameOptions(var60); // L: 6740 + changedVarps[++changedVarpCount - 1 & 31] = var60; // L: 6741 var1.serverPacket = null; // L: 6742 return true; // L: 6743 } - if (ServerPacket.field2741 == var1.serverPacket) { // L: 6745 - AbstractArchive.privateChatMode = EnumComposition.method2727(var3.readUnsignedByte()); // L: 6746 - var1.serverPacket = null; // L: 6747 - return true; // L: 6748 + if (ServerPacket.field2768 == var1.serverPacket) { // L: 6745 + NetSocket.friendSystem.ignoreList.read(var3, var1.serverPacketLength); // L: 6746 + MouseRecorder.FriendSystem_invalidateIgnoreds(); // L: 6747 + field836 = cycleCntr; // L: 6748 + var1.serverPacket = null; // L: 6749 + return true; // L: 6750 } - if (ServerPacket.field2794 == var1.serverPacket) { // L: 6750 - GrandExchangeOfferUnitPriceComparator.friendSystem.ignoreList.read(var3, var1.serverPacketLength); // L: 6751 - class181.FriendSystem_invalidateIgnoreds(); // L: 6752 - field801 = cycleCntr; // L: 6753 + if (ServerPacket.field2744 == var1.serverPacket) { // L: 6752 + Tile.method3843(class225.field2684); // L: 6753 var1.serverPacket = null; // L: 6754 return true; // L: 6755 } - if (ServerPacket.field2756 == var1.serverPacket) { // L: 6757 - isCameraLocked = false; // L: 6758 + if (ServerPacket.field2713 == var1.serverPacket) { // L: 6757 + var46 = var3.readStringCp1252NullTerminated(); // L: 6758 + var23 = (long)var3.readUnsignedShort(); // L: 6759 + var25 = (long)var3.readMedium(); // L: 6760 + PlayerType var33 = (PlayerType)Messages.findEnumerated(class372.PlayerType_values(), var3.readUnsignedByte()); // L: 6761 + long var34 = var25 + (var23 << 32); // L: 6762 + boolean var36 = false; // L: 6763 - for (var17 = 0; var17 < 5; ++var17) { // L: 6759 - field846[var17] = false; + for (var57 = 0; var57 < 100; ++var57) { // L: 6764 + if (crossWorldMessageIds[var57] == var34) { // L: 6765 + var36 = true; // L: 6766 + break; // L: 6767 + } } - var1.serverPacket = null; // L: 6760 - return true; // L: 6761 + if (NetSocket.friendSystem.isIgnored(new Username(var46, WorldMapSection0.loginType))) { // L: 6770 + var36 = true; + } + + if (!var36 && field755 == 0) { // L: 6771 + crossWorldMessageIds[crossWorldMessageIdsIndex] = var34; // L: 6772 + crossWorldMessageIdsIndex = (crossWorldMessageIdsIndex + 1) % 100; // L: 6773 + var32 = AbstractFont.escapeBrackets(class43.method433(MusicPatch.method4592(var3))); // L: 6774 + byte var14; + if (var33.isPrivileged) { // L: 6776 + var14 = 7; + } else { + var14 = 3; // L: 6777 + } + + if (var33.modIcon != -1) { // L: 6778 + World.addGameMessage(var14, SecureRandomFuture.method1982(var33.modIcon) + var46, var32); + } else { + World.addGameMessage(var14, var46, var32); // L: 6779 + } + } + + var1.serverPacket = null; // L: 6781 + return true; // L: 6782 } - if (ServerPacket.field2714 == var1.serverPacket) { // L: 6763 - Script.method2014(); // L: 6764 - runEnergy = var3.readUnsignedByte(); // L: 6765 - field731 = cycleCntr; // L: 6766 - var1.serverPacket = null; // L: 6767 - return true; // L: 6768 - } - - if (ServerPacket.field2740 == var1.serverPacket) { // L: 6770 - var60 = var3.readByte(); // L: 6771 - var19 = var3.readStringCp1252NullTerminated(); // L: 6772 - long var37 = (long)var3.readUnsignedShort(); // L: 6773 - long var39 = (long)var3.readMedium(); // L: 6774 - PlayerType var10 = (PlayerType)UserComparator4.findEnumerated(class249.PlayerType_values(), var3.readUnsignedByte()); // L: 6775 - long var41 = (var37 << 32) + var39; // L: 6776 - boolean var13 = false; // L: 6777 - class3 var43 = null; // L: 6778 - var43 = var60 >= 0 ? field847[var60] : Players.field1358; // L: 6780 - if (var43 == null) { // L: 6781 - var13 = true; // L: 6782 + if (ServerPacket.field2742 == var1.serverPacket) { // L: 6784 + var17 = var3.readByte(); // L: 6785 + var18 = var3.readStringCp1252NullTerminated(); // L: 6786 + long var37 = (long)var3.readUnsignedShort(); // L: 6787 + long var39 = (long)var3.readMedium(); // L: 6788 + PlayerType var10 = (PlayerType)Messages.findEnumerated(class372.PlayerType_values(), var3.readUnsignedByte()); // L: 6789 + long var41 = (var37 << 32) + var39; // L: 6790 + boolean var13 = false; // L: 6791 + ClanChannel var43 = null; // L: 6792 + var43 = var17 >= 0 ? currentClanChannels[var17] : ApproximateRouteStrategy.guestClanChannel; // L: 6794 + if (var43 == null) { // L: 6795 + var13 = true; // L: 6796 } else { var15 = 0; while (true) { if (var15 >= 100) { - if (var10.isUser && GrandExchangeOfferUnitPriceComparator.friendSystem.isIgnored(new Username(var19, ModeWhere.loginType))) { // L: 6791 6792 + if (var10.isUser && NetSocket.friendSystem.isIgnored(new Username(var18, WorldMapSection0.loginType))) { // L: 6805 6806 var13 = true; } break; } - if (crossWorldMessageIds[var15] == var41) { // L: 6786 - var13 = true; // L: 6787 - break; // L: 6788 + if (crossWorldMessageIds[var15] == var41) { // L: 6800 + var13 = true; // L: 6801 + break; // L: 6802 } - ++var15; // L: 6785 + ++var15; // L: 6799 } } - if (!var13) { // L: 6795 - crossWorldMessageIds[crossWorldMessageIdsIndex] = var41; // L: 6796 - crossWorldMessageIdsIndex = (crossWorldMessageIdsIndex + 1) % 100; // L: 6797 - var35 = AbstractFont.escapeBrackets(class22.method299(var3)); // L: 6798 - int var16 = var60 >= 0 ? 41 : 44; // L: 6799 - if (var10.modIcon != -1) { // L: 6800 - class69.addChatMessage(var16, class169.method3495(var10.modIcon) + var19, var35, var43.field38); + if (!var13) { // L: 6809 + crossWorldMessageIds[crossWorldMessageIdsIndex] = var41; // L: 6810 + crossWorldMessageIdsIndex = (crossWorldMessageIdsIndex + 1) % 100; // L: 6811 + var30 = AbstractFont.escapeBrackets(MusicPatch.method4592(var3)); // L: 6812 + int var16 = var17 >= 0 ? 41 : 44; // L: 6813 + if (var10.modIcon != -1) { // L: 6814 + class5.addChatMessage(var16, SecureRandomFuture.method1982(var10.modIcon) + var18, var30, var43.name); } else { - class69.addChatMessage(var16, var19, var35, var43.field38); // L: 6801 + class5.addChatMessage(var16, var18, var30, var43.name); // L: 6815 } } - var1.serverPacket = null; // L: 6803 - return true; // L: 6804 + var1.serverPacket = null; // L: 6817 + return true; // L: 6818 } - if (ServerPacket.field2727 == var1.serverPacket) { // L: 6806 - var17 = var3.method6486(); // L: 6807 - FriendSystem.method1782(var17); // L: 6808 - changedItemContainers[++field805 - 1 & 31] = var17 & 32767; // L: 6809 - var1.serverPacket = null; // L: 6810 - return true; // L: 6811 - } - - if (ServerPacket.field2707 == var1.serverPacket) { // L: 6813 - class7.field66 = var3.method6476(); // L: 6814 - VarpDefinition.field1542 = var3.method6478(); // L: 6815 - var1.serverPacket = null; // L: 6816 - return true; // L: 6817 - } - - if (ServerPacket.field2715 == var1.serverPacket) { // L: 6819 - field814 = cycleCntr; // L: 6820 - var60 = var3.readByte(); // L: 6821 - class19 var62 = new class19(var3); // L: 6822 - class3 var65; - if (var60 >= 0) { // L: 6824 - var65 = field847[var60]; + if (ServerPacket.field2716 == var1.serverPacket) { // L: 6820 + field839 = cycleCntr; // L: 6821 + var17 = var3.readByte(); // L: 6822 + class19 var62 = new class19(var3); // L: 6823 + ClanChannel var65; + if (var17 >= 0) { // L: 6825 + var65 = currentClanChannels[var17]; } else { - var65 = Players.field1358; // L: 6825 + var65 = ApproximateRouteStrategy.guestClanChannel; // L: 6826 } - var62.method263(var65); // L: 6826 - var1.serverPacket = null; // L: 6827 - return true; // L: 6828 + var62.method218(var65); // L: 6827 + var1.serverPacket = null; // L: 6828 + return true; // L: 6829 } - if (ServerPacket.field2705 == var1.serverPacket) { // L: 6830 - GrandExchangeOfferUnitPriceComparator.friendSystem.method1734(); // L: 6831 - field801 = cycleCntr; // L: 6832 - var1.serverPacket = null; // L: 6833 - return true; // L: 6834 - } - - if (ServerPacket.field2792 == var1.serverPacket) { // L: 6836 - if (class25.clanChat != null) { // L: 6837 - class25.clanChat.method5519(var3); // L: 6838 + if (ServerPacket.field2798 == var1.serverPacket) { // L: 6831 + class124.method2496(); // L: 6832 + var17 = var3.readByte(); // L: 6833 + class2 var61 = new class2(var3); // L: 6834 + ClanSettings var19; + if (var17 >= 0) { // L: 6836 + var19 = currentClanSettings[var17]; + } else { + var19 = NPCComposition.guestClanSettings; // L: 6837 } - ItemContainer.method2108(); // L: 6840 - var1.serverPacket = null; // L: 6841 - return true; // L: 6842 + var61.method16(var19); // L: 6838 + var1.serverPacket = null; // L: 6839 + return true; // L: 6840 } - if (ServerPacket.field2789 == var1.serverPacket) { // L: 6844 - for (var17 = 0; var17 < Varps.Varps_main.length; ++var17) { // L: 6845 - if (Varps.Varps_main[var17] != Varps.Varps_temp[var17]) { // L: 6846 - Varps.Varps_main[var17] = Varps.Varps_temp[var17]; // L: 6847 - WorldMapData_0.changeGameOptions(var17); // L: 6848 - changedVarps[++changedVarpCount - 1 & 31] = var17; // L: 6849 + if (ServerPacket.field2703 == var1.serverPacket) { // L: 6842 + var60 = var3.method6661(); // L: 6843 + var5 = var3.method6598(); // L: 6844 + var6 = var3.method6621(); // L: 6845 + var69 = Frames.getWidget(var5); // L: 6846 + if (var6 != var69.rawX || var60 != var69.rawY || var69.xAlignment != 0 || var69.yAlignment != 0) { // L: 6847 + var69.rawX = var6; // L: 6848 + var69.rawY = var60; // L: 6849 + var69.xAlignment = 0; // L: 6850 + var69.yAlignment = 0; // L: 6851 + WorldMapCacheName.invalidateWidget(var69); // L: 6852 + this.alignWidget(var69); // L: 6853 + if (var69.type == 0) { // L: 6854 + class313.revalidateWidgetScroll(Widget.Widget_interfaceComponents[var5 >> 16], var69, false); } } - var1.serverPacket = null; // L: 6852 - return true; // L: 6853 + var1.serverPacket = null; // L: 6856 + return true; // L: 6857 } - if (ServerPacket.field2748 == var1.serverPacket) { // L: 6855 - if (ObjectSound.field935 == null) { // L: 6856 - ObjectSound.field935 = new class339(ModeWhere.HitSplatDefinition_cachedSprites); + if (ServerPacket.field2773 == var1.serverPacket) { // L: 6859 + var60 = var3.readUnsignedByte(); // L: 6860 + var5 = var3.method6605(); // L: 6861 + var6 = var3.method6613(); // L: 6862 + var21 = (InterfaceParent)interfaceParents.get((long)var6); // L: 6863 + if (var21 != null) { + class43.closeInterface(var21, var5 != var21.group); // L: 6864 } - class390 var48 = ModeWhere.HitSplatDefinition_cachedSprites.method5873(var3); // L: 6857 - ObjectSound.field935.field3930.vmethod6221(var48.field4222, var48.field4221); // L: 6858 - field808[++field809 - 1 & 31] = var48.field4222; // L: 6859 - var1.serverPacket = null; // L: 6860 - return true; // L: 6861 + class17.method208(var6, var5, var60); // L: 6865 + var1.serverPacket = null; // L: 6866 + return true; // L: 6867 } - if (ServerPacket.field2736 == var1.serverPacket) { // L: 6863 - World var47 = new World(); // L: 6864 - var47.host = var3.readStringCp1252NullTerminated(); // L: 6865 - var47.id = var3.readUnsignedShort(); // L: 6866 - var5 = var3.readInt(); // L: 6867 - var47.properties = var5; // L: 6868 - updateGameState(45); // L: 6869 - var2.close(); // L: 6870 - var2 = null; // L: 6871 - PlatformInfo.changeWorld(var47); // L: 6872 - var1.serverPacket = null; // L: 6873 - return false; // L: 6874 + if (ServerPacket.field2700 == var1.serverPacket) { // L: 6869 + var60 = var3.method6603(); // L: 6870 + rootInterface = var60; // L: 6871 + this.resizeRoot(false); // L: 6872 + class21.Widget_resetModelFrames(var60); // L: 6873 + FloorDecoration.runWidgetOnLoadListener(rootInterface); // L: 6874 + + for (var5 = 0; var5 < 100; ++var5) { // L: 6875 + field719[var5] = true; + } + + var1.serverPacket = null; // L: 6876 + return true; // L: 6877 } - if (ServerPacket.field2765 == var1.serverPacket) { // L: 6876 - var3.offset += 28; // L: 6877 - if (var3.checkCrc()) { // L: 6878 - RouteStrategy.method3134(var3, var3.offset - 28); - } - - var1.serverPacket = null; // L: 6879 - return true; // L: 6880 - } - - if (ServerPacket.field2793 == var1.serverPacket) { // L: 6882 - var17 = var3.readInt(); // L: 6883 - InterfaceParent var61 = (InterfaceParent)interfaceParents.get((long)var17); // L: 6884 - if (var61 != null) { // L: 6885 - class18.closeInterface(var61, true); - } - - if (meslayerContinueWidget != null) { // L: 6886 - VerticalAlignment.invalidateWidget(meslayerContinueWidget); // L: 6887 - meslayerContinueWidget = null; // L: 6888 + if (ServerPacket.field2749 == var1.serverPacket) { // L: 6879 + if (var1.serverPacketLength == 0) { // L: 6880 + WorldMapRegion.friendsChat = null; // L: 6881 + } else { + if (WorldMapRegion.friendsChat == null) { // L: 6884 + WorldMapRegion.friendsChat = new FriendsChat(WorldMapSection0.loginType, class23.client); // L: 6885 + } + + WorldMapRegion.friendsChat.readUpdate(var3); // L: 6887 } + CollisionMap.method3155(); // L: 6889 var1.serverPacket = null; // L: 6890 return true; // L: 6891 } - if (ServerPacket.field2753 == var1.serverPacket) { // L: 6893 - var46 = var3.readStringCp1252NullTerminated(); // L: 6894 - var5 = var3.method6478(); // L: 6895 - var6 = var3.method6477(); // L: 6896 - if (var5 >= 1 && var5 <= 8) { // L: 6897 - if (var46.equalsIgnoreCase("null")) { // L: 6898 - var46 = null; - } - - playerMenuActions[var5 - 1] = var46; // L: 6899 - playerOptionsPriorities[var5 - 1] = var6 == 0; // L: 6900 - } - - var1.serverPacket = null; // L: 6902 - return true; // L: 6903 + if (ServerPacket.field2795 == var1.serverPacket) { // L: 6893 + Tile.method3843(class225.field2688); // L: 6894 + var1.serverPacket = null; // L: 6895 + return true; // L: 6896 } - if (ServerPacket.field2791 == var1.serverPacket) { // L: 6905 - var17 = var3.readInt(); // L: 6906 - var5 = var3.readUnsignedShort(); // L: 6907 - if (var17 < -70000) { // L: 6908 - var5 += 32768; + if (ServerPacket.field2766 == var1.serverPacket) { // L: 6898 + field839 = cycleCntr; // L: 6899 + var17 = var3.readByte(); // L: 6900 + if (var1.serverPacketLength == 1) { // L: 6901 + if (var17 >= 0) { // L: 6902 + currentClanChannels[var17] = null; + } else { + ApproximateRouteStrategy.guestClanChannel = null; // L: 6903 + } + + var1.serverPacket = null; // L: 6904 + return true; // L: 6905 } - if (var17 >= 0) { // L: 6910 - var18 = DevicePcmPlayerProvider.getWidget(var17); + if (var17 >= 0) { // L: 6907 + currentClanChannels[var17] = new ClanChannel(var3); // L: 6908 } else { - var18 = null; // L: 6911 + ApproximateRouteStrategy.guestClanChannel = new ClanChannel(var3); // L: 6911 } - for (; var3.offset < var1.serverPacketLength; BufferedNetSocket.itemContainerSetItem(var5, var7, var8 - 1, var9)) { // L: 6912 6926 - var7 = var3.readUShortSmart(); // L: 6913 - var8 = var3.readUnsignedShort(); // L: 6914 - var9 = 0; // L: 6915 - if (var8 != 0) { // L: 6916 - var9 = var3.readUnsignedByte(); // L: 6917 - if (var9 == 255) { // L: 6918 - var9 = var3.readInt(); - } - } - - if (var18 != null && var7 >= 0 && var7 < var18.itemIds.length) { // L: 6920 6921 - var18.itemIds[var7] = var8; // L: 6922 - var18.itemQuantities[var7] = var9; // L: 6923 - } - } - - if (var18 != null) { // L: 6928 - VerticalAlignment.invalidateWidget(var18); - } - - Script.method2014(); // L: 6929 - changedItemContainers[++field805 - 1 & 31] = var5 & 32767; // L: 6930 - var1.serverPacket = null; // L: 6931 - return true; // L: 6932 + var1.serverPacket = null; // L: 6913 + return true; // L: 6914 } - if (ServerPacket.field2776 == var1.serverPacket) { // L: 6934 - var17 = var3.readUnsignedByte(); // L: 6935 - class25.forceDisconnect(var17); // L: 6936 - var1.serverPacket = null; // L: 6937 - return false; // L: 6938 - } - - if (ServerPacket.field2723 == var1.serverPacket) { // L: 6940 - var17 = var3.method6428(); // L: 6941 - var5 = var3.method6620(); // L: 6942 - var18 = DevicePcmPlayerProvider.getWidget(var17); // L: 6943 - if (var18 != null && var18.type == 0) { // L: 6944 - if (var5 > var18.scrollHeight - var18.height) { // L: 6945 - var5 = var18.scrollHeight - var18.height; - } - - if (var5 < 0) { // L: 6946 - var5 = 0; - } - - if (var5 != var18.scrollY) { // L: 6947 - var18.scrollY = var5; // L: 6948 - VerticalAlignment.invalidateWidget(var18); // L: 6949 - } - } - - var1.serverPacket = null; // L: 6952 - return true; // L: 6953 - } - - if (ServerPacket.field2790 == var1.serverPacket) { // L: 6955 - publicChatMode = var3.readUnsignedByte(); // L: 6956 - tradeChatMode = var3.method6478(); // L: 6957 - var1.serverPacket = null; // L: 6958 - return true; // L: 6959 - } - - if (ServerPacket.field2770 == var1.serverPacket) { // L: 6961 - var17 = var3.readInt(); // L: 6962 - var5 = var3.readUnsignedShort(); // L: 6963 - if (var17 < -70000) { // L: 6964 - var5 += 32768; - } - - if (var17 >= 0) { // L: 6966 - var18 = DevicePcmPlayerProvider.getWidget(var17); - } else { - var18 = null; // L: 6967 - } - - if (var18 != null) { // L: 6968 - for (var7 = 0; var7 < var18.itemIds.length; ++var7) { // L: 6969 - var18.itemIds[var7] = 0; // L: 6970 - var18.itemQuantities[var7] = 0; // L: 6971 - } - } - - Skills.clearItemContainer(var5); // L: 6974 - var7 = var3.readUnsignedShort(); // L: 6975 - - for (var8 = 0; var8 < var7; ++var8) { // L: 6976 - var9 = var3.method6486(); // L: 6977 - var21 = var3.method6476(); // L: 6978 - if (var21 == 255) { // L: 6979 - var21 = var3.method6481(); - } - - if (var18 != null && var8 < var18.itemIds.length) { // L: 6980 6981 - var18.itemIds[var8] = var9; // L: 6982 - var18.itemQuantities[var8] = var21; // L: 6983 - } - - BufferedNetSocket.itemContainerSetItem(var5, var8, var9 - 1, var21); // L: 6986 - } - - if (var18 != null) { // L: 6988 - VerticalAlignment.invalidateWidget(var18); - } - - Script.method2014(); // L: 6989 - changedItemContainers[++field805 - 1 & 31] = var5 & 32767; // L: 6990 - var1.serverPacket = null; // L: 6991 - return true; // L: 6992 - } - - class27.RunException_sendStackTrace("" + (var1.serverPacket != null ? var1.serverPacket.id * -1354398359 * -1217176871 : -1) + "," + (var1.field1387 != null ? var1.field1387.id * -1354398359 * -1217176871 : -1) + "," + (var1.field1391 != null ? var1.field1391.id * -1354398359 * -1217176871 : -1) + "," + var1.serverPacketLength, (Throwable)null); // L: 6994 - FileSystem.logOut(); // L: 6995 - } catch (IOException var44) { // L: 6997 - BuddyRankComparator.method2492(); // L: 6998 + class266.RunException_sendStackTrace("" + (var1.serverPacket != null ? var1.serverPacket.id * -1581409905 * 1593533807 : -1) + "," + (var1.field1412 != null ? var1.field1412.id * -1581409905 * 1593533807 : -1) + "," + (var1.field1400 != null ? var1.field1400.id * -1581409905 * 1593533807 : -1) + "," + var1.serverPacketLength, (Throwable)null); // L: 6916 + class7.logOut(); // L: 6917 + } catch (IOException var44) { // L: 6919 + NetFileRequest.method4912(); // L: 6920 } catch (Exception var45) { - var19 = "" + (var1.serverPacket != null ? var1.serverPacket.id * -1354398359 * -1217176871 : -1) + "," + (var1.field1387 != null ? var1.field1387.id * -1354398359 * -1217176871 : -1) + "," + (var1.field1391 != null ? var1.field1391.id * -1354398359 * -1217176871 : -1) + "," + var1.serverPacketLength + "," + (class35.localPlayer.pathX[0] + JagexCache.baseX) + "," + (class35.localPlayer.pathY[0] + Messages.baseY) + ","; // L: 7001 + var18 = "" + (var1.serverPacket != null ? var1.serverPacket.id * -1581409905 * 1593533807 : -1) + "," + (var1.field1412 != null ? var1.field1412.id * -1581409905 * 1593533807 : -1) + "," + (var1.field1400 != null ? var1.field1400.id * -1581409905 * 1593533807 : -1) + "," + var1.serverPacketLength + "," + (class93.localPlayer.pathX[0] + VertexNormal.baseX) + "," + (class93.localPlayer.pathY[0] + SoundSystem.baseY) + ","; // L: 6923 - for (var6 = 0; var6 < var1.serverPacketLength && var6 < 50; ++var6) { // L: 7002 - var19 = var19 + var3.array[var6] + ","; + for (var6 = 0; var6 < var1.serverPacketLength && var6 < 50; ++var6) { // L: 6924 + var18 = var18 + var3.array[var6] + ","; } - class27.RunException_sendStackTrace(var19, var45); // L: 7003 - FileSystem.logOut(); // L: 7004 + class266.RunException_sendStackTrace(var18, var45); // L: 6925 + class7.logOut(); // L: 6926 } - return true; // L: 7006 + return true; // L: 6928 } } - @ObfuscatedName("iz") + @ObfuscatedName("hk") @ObfuscatedSignature( descriptor = "(B)V", - garbageValue = "104" + garbageValue = "0" ) @Export("menu") final void menu() { - ViewportMouse.method4194(); // L: 7908 - if (class34.dragInventoryWidget == null) { // L: 7909 - if (clickedWidget == null) { // L: 7910 + class377.method6509(); // L: 7624 + if (Script.dragInventoryWidget == null) { // L: 7625 + if (clickedWidget == null) { // L: 7626 int var2; int var4; int var5; - label262: { - int var1 = MouseHandler.MouseHandler_lastButton; // L: 7911 + int var9; + int var10; + label272: { + int var1 = MouseHandler.MouseHandler_lastButton; // L: 7627 int var3; int var8; - int var10; - int var14; - if (isMenuOpen) { // L: 7912 - if (var1 != 1 && (class229.mouseCam || var1 != 4)) { // L: 7913 - var2 = MouseHandler.MouseHandler_x; // L: 7914 - var3 = MouseHandler.MouseHandler_y; // L: 7915 - if (var2 < AbstractByteArrayCopier.menuX - 10 || var2 > AbstractByteArrayCopier.menuX + SoundCache.menuWidth + 10 || var3 < HitSplatDefinition.menuY - 10 || var3 > GrandExchangeOfferOwnWorldComparator.menuHeight + HitSplatDefinition.menuY + 10) { // L: 7916 - isMenuOpen = false; // L: 7917 - class179.method3586(AbstractByteArrayCopier.menuX, HitSplatDefinition.menuY, SoundCache.menuWidth, GrandExchangeOfferOwnWorldComparator.menuHeight); // L: 7918 + if (isMenuOpen) { // L: 7628 + int var13; + int var15; + if (var1 != 1 && (mouseCam || var1 != 4)) { // L: 7629 + var2 = MouseHandler.MouseHandler_x; // L: 7630 + var3 = MouseHandler.MouseHandler_y; // L: 7631 + if (var2 < class14.menuX - 10 || var2 > class14.menuX + class29.menuWidth + 10 || var3 < class243.menuY - 10 || var3 > class243.menuY + class24.menuHeight + 10) { // L: 7632 + isMenuOpen = false; // L: 7633 + var4 = class14.menuX; // L: 7634 + var5 = class243.menuY; // L: 7635 + var13 = class29.menuWidth; // L: 7636 + var15 = class24.menuHeight; // L: 7637 + + for (var8 = 0; var8 < rootWidgetCount; ++var8) { // L: 7639 + if (rootWidgetWidths[var8] + rootWidgetXs[var8] > var4 && rootWidgetXs[var8] < var13 + var4 && rootWidgetHeights[var8] + rootWidgetYs[var8] > var5 && rootWidgetYs[var8] < var5 + var15) { // L: 7640 + field719[var8] = true; + } + } } } - if (var1 == 1 || !class229.mouseCam && var1 == 4) { // L: 7921 - var2 = AbstractByteArrayCopier.menuX; // L: 7922 - var3 = HitSplatDefinition.menuY; // L: 7923 - var4 = SoundCache.menuWidth; // L: 7924 - var5 = MouseHandler.MouseHandler_lastPressedX; // L: 7925 - var14 = MouseHandler.MouseHandler_lastPressedY; // L: 7926 - int var18 = -1; // L: 7927 + if (var1 == 1 || !mouseCam && var1 == 4) { // L: 7645 + var2 = class14.menuX; // L: 7646 + var3 = class243.menuY; // L: 7647 + var4 = class29.menuWidth; // L: 7648 + var5 = MouseHandler.MouseHandler_lastPressedX; // L: 7649 + var13 = MouseHandler.MouseHandler_lastPressedY; // L: 7650 + var15 = -1; // L: 7651 - int var19; - for (var8 = 0; var8 < menuOptionsCount; ++var8) { // L: 7928 - var19 = (menuOptionsCount - 1 - var8) * 15 + var3 + 31; // L: 7929 - if (var5 > var2 && var5 < var4 + var2 && var14 > var19 - 13 && var14 < var19 + 3) { // L: 7930 - var18 = var8; + for (var8 = 0; var8 < menuOptionsCount; ++var8) { // L: 7652 + var9 = var3 + (menuOptionsCount - 1 - var8) * 15 + 31; // L: 7653 + if (var5 > var2 && var5 < var2 + var4 && var13 > var9 - 13 && var13 < var9 + 3) { // L: 7654 + var15 = var8; } } - int var11; - if (var18 != -1 && var18 >= 0) { // L: 7932 7933 - var8 = menuArguments1[var18]; // L: 7934 - var19 = menuArguments2[var18]; // L: 7935 - var10 = menuOpcodes[var18]; // L: 7936 - var11 = menuIdentifiers[var18]; // L: 7937 - String var12 = menuActions[var18]; // L: 7938 - String var13 = menuTargets[var18]; // L: 7939 - HorizontalAlignment.menuAction(var8, var19, var10, var11, var12, var13, MouseHandler.MouseHandler_lastPressedX, MouseHandler.MouseHandler_lastPressedY); // L: 7940 + if (var15 != -1) { // L: 7656 + Interpreter.method1888(var15); } - isMenuOpen = false; // L: 7942 - var8 = AbstractByteArrayCopier.menuX; // L: 7943 - var19 = HitSplatDefinition.menuY; // L: 7944 - var10 = SoundCache.menuWidth; // L: 7945 - var11 = GrandExchangeOfferOwnWorldComparator.menuHeight; // L: 7946 + isMenuOpen = false; // L: 7657 + var8 = class14.menuX; // L: 7658 + var9 = class243.menuY; // L: 7659 + var10 = class29.menuWidth; // L: 7660 + int var14 = class24.menuHeight; // L: 7661 - for (int var17 = 0; var17 < rootWidgetCount; ++var17) { // L: 7948 - if (rootWidgetXs[var17] + rootWidgetWidths[var17] > var8 && rootWidgetXs[var17] < var10 + var8 && rootWidgetHeights[var17] + rootWidgetYs[var17] > var19 && rootWidgetYs[var17] < var11 + var19) { // L: 7949 - field825[var17] = true; + for (int var12 = 0; var12 < rootWidgetCount; ++var12) { // L: 7663 + if (rootWidgetXs[var12] + rootWidgetWidths[var12] > var8 && rootWidgetXs[var12] < var10 + var8 && rootWidgetYs[var12] + rootWidgetHeights[var12] > var9 && rootWidgetYs[var12] < var9 + var14) { // L: 7664 + field719[var12] = true; } } } } else { - var2 = AttackOption.method2285(); // L: 7955 - if ((var1 == 1 || !class229.mouseCam && var1 == 4) && var2 >= 0) { // L: 7956 - var3 = menuOpcodes[var2]; // L: 7957 - if (var3 == 39 || var3 == 40 || var3 == 41 || var3 == 42 || var3 == 43 || var3 == 33 || var3 == 34 || var3 == 35 || var3 == 36 || var3 == 37 || var3 == 38 || var3 == 1005) { // L: 7958 - var4 = menuArguments1[var2]; // L: 7959 - var5 = menuArguments2[var2]; // L: 7960 - Widget var6 = DevicePcmPlayerProvider.getWidget(var5); // L: 7961 - var8 = class26.getWidgetFlags(var6); // L: 7963 - boolean var7 = (var8 >> 28 & 1) != 0; // L: 7965 - if (var7) { // L: 7968 - break label262; + var2 = MilliClock.method2588(); // L: 7670 + if ((var1 == 1 || !mouseCam && var1 == 4) && var2 >= 0) { // L: 7671 + var3 = menuOpcodes[var2]; // L: 7672 + if (var3 == 39 || var3 == 40 || var3 == 41 || var3 == 42 || var3 == 43 || var3 == 33 || var3 == 34 || var3 == 35 || var3 == 36 || var3 == 37 || var3 == 38 || var3 == 1005) { // L: 7673 + var4 = menuArguments1[var2]; // L: 7674 + var5 = menuArguments2[var2]; // L: 7675 + Widget var6 = Frames.getWidget(var5); // L: 7676 + var8 = class21.getWidgetFlags(var6); // L: 7678 + boolean var7 = (var8 >> 28 & 1) != 0; // L: 7680 + if (var7) { // L: 7682 + break label272; } - var10 = class26.getWidgetFlags(var6); // L: 7970 - boolean var9 = (var10 >> 29 & 1) != 0; // L: 7972 - if (var9) { // L: 7974 - break label262; + Object var10000 = null; + if (Canvas.method394(class21.getWidgetFlags(var6))) { + break label272; } } } - if ((var1 == 1 || !class229.mouseCam && var1 == 4) && this.shouldLeftClickOpenMenu()) { // L: 7994 7995 - var1 = 2; // L: 7996 + if ((var1 == 1 || !mouseCam && var1 == 4) && this.shouldLeftClickOpenMenu()) { // L: 7716 7717 + var1 = 2; // L: 7718 } - if ((var1 == 1 || !class229.mouseCam && var1 == 4) && menuOptionsCount > 0 && var2 >= 0) { // L: 7999 8001 - var3 = menuArguments1[var2]; // L: 8002 - var4 = menuArguments2[var2]; // L: 8003 - var5 = menuOpcodes[var2]; // L: 8004 - var14 = menuIdentifiers[var2]; // L: 8005 - String var15 = menuActions[var2]; // L: 8006 - String var16 = menuTargets[var2]; // L: 8007 - HorizontalAlignment.menuAction(var3, var4, var5, var14, var15, var16, MouseHandler.MouseHandler_lastPressedX, MouseHandler.MouseHandler_lastPressedY); // L: 8008 + if ((var1 == 1 || !mouseCam && var1 == 4) && menuOptionsCount > 0) { // L: 7721 + Interpreter.method1888(var2); // L: 7722 } - if (var1 == 2 && menuOptionsCount > 0) { // L: 8011 + if (var1 == 2 && menuOptionsCount > 0) { // L: 7724 this.openMenu(MouseHandler.MouseHandler_lastPressedX, MouseHandler.MouseHandler_lastPressedY); } } - return; // L: 8013 + return; // L: 7726 } - if (class34.dragInventoryWidget != null && !field728 && menuOptionsCount > 0 && !this.shouldLeftClickOpenMenu()) { // L: 7976 7977 - ItemLayer.method3715(draggedWidgetX, draggedWidgetY); // L: 7978 + if (Script.dragInventoryWidget != null && !field848 && menuOptionsCount > 0 && !this.shouldLeftClickOpenMenu()) { // L: 7683 7684 + var9 = draggedWidgetX; // L: 7685 + var10 = draggedWidgetY; // L: 7686 + MenuAction var11 = ReflectionCheck.tempMenuAction; // L: 7688 + Script.menuAction(var11.param0, var11.param1, var11.opcode, var11.identifier, var11.action, var11.action, var9, var10); // L: 7690 + ReflectionCheck.tempMenuAction = null; // L: 7692 } - field728 = false; // L: 7981 - itemDragDuration = 0; // L: 7982 - if (class34.dragInventoryWidget != null) { // L: 7983 - VerticalAlignment.invalidateWidget(class34.dragInventoryWidget); + field848 = false; // L: 7696 + itemDragDuration = 0; // L: 7697 + if (Script.dragInventoryWidget != null) { // L: 7698 + WorldMapCacheName.invalidateWidget(Script.dragInventoryWidget); } - class34.dragInventoryWidget = DevicePcmPlayerProvider.getWidget(var5); // L: 7984 - dragItemSlotSource = var4; // L: 7985 - draggedWidgetX = MouseHandler.MouseHandler_lastPressedX; // L: 7986 - draggedWidgetY = MouseHandler.MouseHandler_lastPressedY; // L: 7987 - if (var2 >= 0) { // L: 7988 - GrandExchangeOfferAgeComparator.method4989(var2); + Script.dragInventoryWidget = Frames.getWidget(var5); // L: 7699 + dragItemSlotSource = var4; // L: 7700 + draggedWidgetX = MouseHandler.MouseHandler_lastPressedX; // L: 7701 + draggedWidgetY = MouseHandler.MouseHandler_lastPressedY; // L: 7702 + if (var2 >= 0) { // L: 7703 + ReflectionCheck.tempMenuAction = new MenuAction(); // L: 7704 + ReflectionCheck.tempMenuAction.param0 = menuArguments1[var2]; // L: 7705 + ReflectionCheck.tempMenuAction.param1 = menuArguments2[var2]; // L: 7706 + ReflectionCheck.tempMenuAction.opcode = menuOpcodes[var2]; // L: 7707 + ReflectionCheck.tempMenuAction.identifier = menuIdentifiers[var2]; // L: 7708 + ReflectionCheck.tempMenuAction.action = menuActions[var2]; // L: 7709 } - VerticalAlignment.invalidateWidget(class34.dragInventoryWidget); // L: 7989 + WorldMapCacheName.invalidateWidget(Script.dragInventoryWidget); // L: 7711 } } - } // L: 7990 + } // L: 7712 - @ObfuscatedName("iq") + @ObfuscatedName("hx") @ObfuscatedSignature( - descriptor = "(B)Z", - garbageValue = "11" + descriptor = "(I)Z", + garbageValue = "-1407075512" ) @Export("shouldLeftClickOpenMenu") final boolean shouldLeftClickOpenMenu() { - int var1 = AttackOption.method2285(); // L: 8016 - return (leftClickOpensMenu == 1 && menuOptionsCount > 2 || LoginPacket.method4319(var1)) && !menuShiftClick[var1]; // L: 8017 + int var1 = MilliClock.method2588(); // L: 7729 + return (leftClickOpensMenu == 1 && menuOptionsCount > 2 || class5.method51(var1)) && !menuShiftClick[var1]; // L: 7730 } - @ObfuscatedName("il") + @ObfuscatedName("hp") @ObfuscatedSignature( - descriptor = "(IIB)V", - garbageValue = "1" + descriptor = "(III)V", + garbageValue = "1521465353" ) @Export("openMenu") final void openMenu(int var1, int var2) { - WorldMapRegion.method3317(var1, var2); // L: 8021 - class5.scene.menuOpen(ParamComposition.Client_plane, var1, var2, false); // L: 8022 - isMenuOpen = true; // L: 8023 - } // L: 8024 + ReflectionCheck.method1126(var1, var2); // L: 7734 + AbstractSocket.scene.menuOpen(class22.Client_plane, var1, var2, false); // L: 7735 + isMenuOpen = true; // L: 7736 + } // L: 7737 - @ObfuscatedName("jr") + @ObfuscatedName("iy") @ObfuscatedSignature( - descriptor = "(ZB)V", - garbageValue = "0" + descriptor = "(ZI)V", + garbageValue = "2038823416" ) @Export("resizeRoot") final void resizeRoot(boolean var1) { - Strings.method4801(rootInterface, GameEngine.canvasWidth, HealthBarDefinition.canvasHeight, var1); // L: 10021 - } // L: 10022 + PlayerType.method4857(rootInterface, class32.canvasWidth, ReflectionCheck.canvasHeight, var1); // L: 9736 + } // L: 9737 - @ObfuscatedName("js") + @ObfuscatedName("ib") @ObfuscatedSignature( - descriptor = "(Liv;I)V", - garbageValue = "724279909" + descriptor = "(Lio;I)V", + garbageValue = "2012935641" ) @Export("alignWidget") void alignWidget(Widget var1) { - Widget var2 = var1.parentId == -1 ? null : DevicePcmPlayerProvider.getWidget(var1.parentId); // L: 10025 + Widget var2 = var1.parentId == -1 ? null : Frames.getWidget(var1.parentId); // L: 9740 int var3; int var4; - if (var2 == null) { // L: 10028 - var3 = GameEngine.canvasWidth; // L: 10029 - var4 = HealthBarDefinition.canvasHeight; // L: 10030 + if (var2 == null) { // L: 9743 + var3 = class32.canvasWidth; // L: 9744 + var4 = ReflectionCheck.canvasHeight; // L: 9745 } else { - var3 = var2.width; // L: 10033 - var4 = var2.height; // L: 10034 + var3 = var2.width; // L: 9748 + var4 = var2.height; // L: 9749 } - class17.alignWidgetSize(var1, var3, var4, false); // L: 10036 - UserComparator3.alignWidgetPosition(var1, var3, var4); // L: 10037 - } // L: 10038 + Clock.alignWidgetSize(var1, var3, var4, false); // L: 9751 + class24.alignWidgetPosition(var1, var3, var4); // L: 9752 + } // L: 9753 - @ObfuscatedName("kl") + @ObfuscatedName("jt") @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "1158614340" + descriptor = "(B)V", + garbageValue = "-72" ) - final void method1236() { - VerticalAlignment.invalidateWidget(clickedWidget); // L: 10990 - ++class288.widgetDragDuration; // L: 10991 - if (field797 && field794) { // L: 10992 - int var1 = MouseHandler.MouseHandler_x; // L: 10998 - int var2 = MouseHandler.MouseHandler_y; // L: 10999 - var1 -= widgetClickX; // L: 11000 - var2 -= widgetClickY; // L: 11001 - if (var1 < field795) { // L: 11002 - var1 = field795; + final void method1198() { + WorldMapCacheName.invalidateWidget(clickedWidget); // L: 10714 + ++Actor.widgetDragDuration; // L: 10715 + if (field822 && field819) { // L: 10716 + int var1 = MouseHandler.MouseHandler_x; // L: 10722 + int var2 = MouseHandler.MouseHandler_y; // L: 10723 + var1 -= widgetClickX; // L: 10724 + var2 -= widgetClickY; // L: 10725 + if (var1 < field740) { // L: 10726 + var1 = field740; } - if (var1 + clickedWidget.width > field795 + clickedWidgetParent.width) { // L: 11003 - var1 = field795 + clickedWidgetParent.width - clickedWidget.width; + if (var1 + clickedWidget.width > field740 + clickedWidgetParent.width) { // L: 10727 + var1 = field740 + clickedWidgetParent.width - clickedWidget.width; } - if (var2 < field785) { // L: 11004 - var2 = field785; + if (var2 < field821) { // L: 10728 + var2 = field821; } - if (var2 + clickedWidget.height > field785 + clickedWidgetParent.height) { // L: 11005 - var2 = field785 + clickedWidgetParent.height - clickedWidget.height; + if (var2 + clickedWidget.height > field821 + clickedWidgetParent.height) { // L: 10729 + var2 = field821 + clickedWidgetParent.height - clickedWidget.height; } - int var3 = var1 - field871; // L: 11006 - int var4 = var2 - field798; // L: 11007 - int var5 = clickedWidget.dragZoneSize; // L: 11008 - if (class288.widgetDragDuration > clickedWidget.dragThreshold && (var3 > var5 || var3 < -var5 || var4 > var5 || var4 < -var5)) { // L: 11009 11010 - isDraggingWidget = true; // L: 11011 + int var3 = var1 - field854; // L: 10730 + int var4 = var2 - field804; // L: 10731 + int var5 = clickedWidget.dragZoneSize; // L: 10732 + if (Actor.widgetDragDuration > clickedWidget.dragThreshold && (var3 > var5 || var3 < -var5 || var4 > var5 || var4 < -var5)) { // L: 10733 10734 + isDraggingWidget = true; // L: 10735 } - int var6 = var1 - field795 + clickedWidgetParent.scrollX; // L: 11014 - int var7 = var2 - field785 + clickedWidgetParent.scrollY; // L: 11015 + int var6 = var1 - field740 + clickedWidgetParent.scrollX; // L: 10738 + int var7 = var2 - field821 + clickedWidgetParent.scrollY; // L: 10739 ScriptEvent var8; - if (clickedWidget.onDrag != null && isDraggingWidget) { // L: 11016 - var8 = new ScriptEvent(); // L: 11017 - var8.widget = clickedWidget; // L: 11018 - var8.mouseX = var6; // L: 11019 - var8.mouseY = var7; // L: 11020 - var8.args = clickedWidget.onDrag; // L: 11021 - class259.runScriptEvent(var8); // L: 11022 + if (clickedWidget.onDrag != null && isDraggingWidget) { // L: 10740 + var8 = new ScriptEvent(); // L: 10741 + var8.widget = clickedWidget; // L: 10742 + var8.mouseX = var6; // L: 10743 + var8.mouseY = var7; // L: 10744 + var8.args = clickedWidget.onDrag; // L: 10745 + PacketWriter.runScriptEvent(var8); // L: 10746 } - if (MouseHandler.MouseHandler_currentButton == 0) { // L: 11024 - if (isDraggingWidget) { // L: 11025 - if (clickedWidget.onDragComplete != null) { // L: 11026 - var8 = new ScriptEvent(); // L: 11027 - var8.widget = clickedWidget; // L: 11028 - var8.mouseX = var6; // L: 11029 - var8.mouseY = var7; // L: 11030 - var8.dragTarget = draggedOnWidget; // L: 11031 - var8.args = clickedWidget.onDragComplete; // L: 11032 - class259.runScriptEvent(var8); // L: 11033 + if (MouseHandler.MouseHandler_currentButton == 0) { // L: 10748 + if (isDraggingWidget) { // L: 10749 + if (clickedWidget.onDragComplete != null) { // L: 10750 + var8 = new ScriptEvent(); // L: 10751 + var8.widget = clickedWidget; // L: 10752 + var8.mouseX = var6; // L: 10753 + var8.mouseY = var7; // L: 10754 + var8.dragTarget = draggedOnWidget; // L: 10755 + var8.args = clickedWidget.onDragComplete; // L: 10756 + PacketWriter.runScriptEvent(var8); // L: 10757 } - if (draggedOnWidget != null && HorizontalAlignment.method2731(clickedWidget) != null) { // L: 11035 - PacketBufferNode var9 = HealthBarDefinition.getPacketBufferNode(ClientPacket.field2568, packetWriter.isaacCipher); // L: 11037 - var9.packetBuffer.method6493(draggedOnWidget.id); // L: 11038 - var9.packetBuffer.method6484(clickedWidget.itemId); // L: 11039 - var9.packetBuffer.writeShort(draggedOnWidget.childIndex); // L: 11040 - var9.packetBuffer.writeInt(clickedWidget.id); // L: 11041 - var9.packetBuffer.writeShort(draggedOnWidget.itemId); // L: 11042 - var9.packetBuffer.method6484(clickedWidget.childIndex); // L: 11043 - packetWriter.addNode(var9); // L: 11044 + if (draggedOnWidget != null && StructComposition.method2892(clickedWidget) != null) { // L: 10759 + PacketBufferNode var12 = class21.getPacketBufferNode(ClientPacket.field2586, packetWriter.isaacCipher); // L: 10761 + var12.packetBuffer.method6611(draggedOnWidget.id); // L: 10762 + var12.packetBuffer.method6602(clickedWidget.itemId); // L: 10763 + var12.packetBuffer.writeShort(draggedOnWidget.childIndex); // L: 10764 + var12.packetBuffer.writeInt(clickedWidget.id); // L: 10765 + var12.packetBuffer.writeShort(draggedOnWidget.itemId); // L: 10766 + var12.packetBuffer.method6602(clickedWidget.childIndex); // L: 10767 + packetWriter.addNode(var12); // L: 10768 } - } else if (this.shouldLeftClickOpenMenu()) { // L: 11048 - this.openMenu(field871 + widgetClickX, widgetClickY + field798); // L: 11049 - } else if (menuOptionsCount > 0) { // L: 11051 - ItemLayer.method3715(field871 + widgetClickX, widgetClickY + field798); // L: 11052 + } else if (this.shouldLeftClickOpenMenu()) { // L: 10772 + this.openMenu(field854 + widgetClickX, widgetClickY + field804); // L: 10773 + } else if (menuOptionsCount > 0) { // L: 10775 + int var11 = field854 + widgetClickX; // L: 10776 + int var9 = widgetClickY + field804; // L: 10777 + MenuAction var10 = ReflectionCheck.tempMenuAction; // L: 10779 + Script.menuAction(var10.param0, var10.param1, var10.opcode, var10.identifier, var10.action, var10.action, var11, var9); // L: 10781 + ReflectionCheck.tempMenuAction = null; // L: 10783 } - clickedWidget = null; // L: 11055 + clickedWidget = null; // L: 10787 } } else { - if (class288.widgetDragDuration > 1) { // L: 10993 - clickedWidget = null; // L: 10994 + if (Actor.widgetDragDuration > 1) { // L: 10717 + clickedWidget = null; // L: 10718 } } - } // L: 10996 11057 + } // L: 10720 10789 - @ObfuscatedName("lc") + @ObfuscatedName("ll") @ObfuscatedSignature( - descriptor = "(B)Lla;", - garbageValue = "98" + descriptor = "(I)Lly;", + garbageValue = "-1180229355" ) @Export("username") public Username username() { - return class35.localPlayer != null ? class35.localPlayer.username : null; // L: 11732 + return class93.localPlayer != null ? class93.localPlayer.username : null; // L: 11477 } - @ObfuscatedName("fb") + @ObfuscatedName("gn") @ObfuscatedSignature( - descriptor = "(IB)V", - garbageValue = "-101" + descriptor = "(I)Z", + garbageValue = "2028963456" ) - @Export("updateGameState") - static void updateGameState(int var0) { - if (var0 != gameState) { // L: 1753 - if (gameState == 0) { // L: 1754 - class303.client.method548(); - } - - if (var0 == 20 || var0 == 40 || var0 == 45) { // L: 1755 - loginState = 0; // L: 1756 - field649 = 0; // L: 1757 - field749 = 0; // L: 1758 - timer.method5465(var0); // L: 1759 - if (var0 != 20) { // L: 1760 - HealthBarUpdate.method2204(false); - } - } - - if (var0 != 20 && var0 != 40 && TriBool.field3866 != null) { // L: 1762 1763 - TriBool.field3866.close(); // L: 1764 - TriBool.field3866 = null; // L: 1765 - } - - if (gameState == 25) { // L: 1768 - field790 = 0; // L: 1769 - field669 = 0; // L: 1770 - field670 = 1; // L: 1771 - field671 = 0; // L: 1772 - field672 = 1; // L: 1773 - } - - if (var0 != 5 && var0 != 10) { // L: 1775 - if (var0 == 20) { // L: 1778 - class169.method3494(PendingSpawn.archive10, class43.archive8, true, gameState == 11 ? 4 : 0); // L: 1779 - } else if (var0 == 11) { // L: 1781 - class169.method3494(PendingSpawn.archive10, class43.archive8, false, 4); // L: 1782 - } else if (Login.clearLoginScreen) { // L: 1785 - ItemContainer.titleboxSprite = null; // L: 1786 - Login.titlebuttonSprite = null; // L: 1787 - Login.runesSprite = null; // L: 1788 - Canvas.leftTitleSprite = null; // L: 1789 - class12.rightTitleSprite = null; // L: 1790 - FontName.logoSprite = null; // L: 1791 - FontName.title_muteSprite = null; // L: 1792 - GrandExchangeOfferUnitPriceComparator.options_buttons_0Sprite = null; // L: 1793 - GrandExchangeEvent.options_buttons_2Sprite = null; // L: 1794 - Login.worldSelectBackSprites = null; // L: 1795 - UserComparator5.worldSelectFlagSprites = null; // L: 1796 - Login.worldSelectArrows = null; // L: 1797 - AbstractWorldMapIcon.worldSelectStars = null; // L: 1798 - class288.field3691 = null; // L: 1799 - AttackOption.loginScreenRunesAnimation.method2207(); // L: 1800 - class390.method6744(2); // L: 1801 - if (NetCache.NetCache_socket != null) { // L: 1803 - try { - Buffer var1 = new Buffer(4); // L: 1805 - var1.writeByte(2); // L: 1806 - var1.writeMedium(0); // L: 1807 - NetCache.NetCache_socket.write(var1.array, 0, 4); // L: 1808 - } catch (IOException var4) { - try { - NetCache.NetCache_socket.close(); // L: 1812 - } catch (Exception var3) { // L: 1814 - } - - ++NetCache.NetCache_ioExceptions; // L: 1815 - NetCache.NetCache_socket = null; // L: 1816 - } - } - - Login.clearLoginScreen = false; // L: 1819 - } - } else { - class169.method3494(PendingSpawn.archive10, class43.archive8, true, 0); // L: 1776 - } - - gameState = var0; // L: 1821 - } - } // L: 1822 + static boolean method1514() { + return (drawPlayerNames & 4) != 0; // L: 4422 + } } diff --git a/runescape-client/src/main/java/ClientPacket.java b/runescape-client/src/main/java/ClientPacket.java index df205dc7c7..c9441731d5 100644 --- a/runescape-client/src/main/java/ClientPacket.java +++ b/runescape-client/src/main/java/ClientPacket.java @@ -4,659 +4,659 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ha") +@ObfuscatedName("hs") @Implements("ClientPacket") public class ClientPacket implements class223 { - @ObfuscatedName("h") - @ObfuscatedSignature( - descriptor = "Lha;" - ) - public static final ClientPacket field2598; - @ObfuscatedName("c") - @ObfuscatedSignature( - descriptor = "Lha;" - ) - public static final ClientPacket field2566; - @ObfuscatedName("o") - @ObfuscatedSignature( - descriptor = "Lha;" - ) - public static final ClientPacket field2658; - @ObfuscatedName("g") - @ObfuscatedSignature( - descriptor = "Lha;" - ) - public static final ClientPacket field2645; - @ObfuscatedName("l") - @ObfuscatedSignature( - descriptor = "Lha;" - ) - public static final ClientPacket field2569; - @ObfuscatedName("z") - @ObfuscatedSignature( - descriptor = "Lha;" - ) - public static final ClientPacket field2570; - @ObfuscatedName("t") - @ObfuscatedSignature( - descriptor = "Lha;" - ) - public static final ClientPacket field2593; @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "Lha;" + descriptor = "Lhs;" ) - public static final ClientPacket field2591; - @ObfuscatedName("b") - @ObfuscatedSignature( - descriptor = "Lha;" - ) - public static final ClientPacket field2573; - @ObfuscatedName("q") - @ObfuscatedSignature( - descriptor = "Lha;" - ) - static final ClientPacket field2574; - @ObfuscatedName("i") - @ObfuscatedSignature( - descriptor = "Lha;" - ) - public static final ClientPacket field2670; - @ObfuscatedName("x") - @ObfuscatedSignature( - descriptor = "Lha;" - ) - public static final ClientPacket field2637; - @ObfuscatedName("k") - @ObfuscatedSignature( - descriptor = "Lha;" - ) - public static final ClientPacket field2666; - @ObfuscatedName("r") - @ObfuscatedSignature( - descriptor = "Lha;" - ) - public static final ClientPacket field2595; - @ObfuscatedName("p") - @ObfuscatedSignature( - descriptor = "Lha;" - ) - public static final ClientPacket field2568; - @ObfuscatedName("a") - @ObfuscatedSignature( - descriptor = "Lha;" - ) - static final ClientPacket field2580; - @ObfuscatedName("e") - @ObfuscatedSignature( - descriptor = "Lha;" - ) - public static final ClientPacket field2581; - @ObfuscatedName("d") - @ObfuscatedSignature( - descriptor = "Lha;" - ) - public static final ClientPacket field2582; - @ObfuscatedName("u") - @ObfuscatedSignature( - descriptor = "Lha;" - ) - public static final ClientPacket field2583; - @ObfuscatedName("m") - @ObfuscatedSignature( - descriptor = "Lha;" - ) - public static final ClientPacket field2584; - @ObfuscatedName("j") - @ObfuscatedSignature( - descriptor = "Lha;" - ) - public static final ClientPacket field2585; - @ObfuscatedName("f") - @ObfuscatedSignature( - descriptor = "Lha;" - ) - public static final ClientPacket field2632; - @ObfuscatedName("s") - @ObfuscatedSignature( - descriptor = "Lha;" - ) - public static final ClientPacket field2587; - @ObfuscatedName("y") - @ObfuscatedSignature( - descriptor = "Lha;" - ) - public static final ClientPacket field2588; - @ObfuscatedName("w") - @ObfuscatedSignature( - descriptor = "Lha;" - ) - public static final ClientPacket field2589; + public static final ClientPacket field2598; @ObfuscatedName("n") @ObfuscatedSignature( - descriptor = "Lha;" + descriptor = "Lhs;" ) - public static final ClientPacket field2571; - @ObfuscatedName("ag") + public static final ClientPacket field2573; + @ObfuscatedName("f") @ObfuscatedSignature( - descriptor = "Lha;" + descriptor = "Lhs;" ) - public static final ClientPacket field2626; - @ObfuscatedName("ae") + public static final ClientPacket field2574; + @ObfuscatedName("y") @ObfuscatedSignature( - descriptor = "Lha;" + descriptor = "Lhs;" ) - public static final ClientPacket field2592; - @ObfuscatedName("ao") + public static final ClientPacket field2575; + @ObfuscatedName("p") @ObfuscatedSignature( - descriptor = "Lha;" + descriptor = "Lhs;" ) - static final ClientPacket field2633; - @ObfuscatedName("aj") + public static final ClientPacket field2576; + @ObfuscatedName("j") @ObfuscatedSignature( - descriptor = "Lha;" + descriptor = "Lhs;" ) - public static final ClientPacket field2594; - @ObfuscatedName("aw") + public static final ClientPacket field2577; + @ObfuscatedName("r") @ObfuscatedSignature( - descriptor = "Lha;" + descriptor = "Lhs;" ) - public static final ClientPacket field2654; - @ObfuscatedName("at") + public static final ClientPacket field2578; + @ObfuscatedName("b") @ObfuscatedSignature( - descriptor = "Lha;" - ) - static final ClientPacket field2596; - @ObfuscatedName("av") - @ObfuscatedSignature( - descriptor = "Lha;" - ) - public static final ClientPacket field2597; - @ObfuscatedName("al") - @ObfuscatedSignature( - descriptor = "Lha;" - ) - public static final ClientPacket field2565; - @ObfuscatedName("ap") - @ObfuscatedSignature( - descriptor = "Lha;" + descriptor = "Lhs;" ) public static final ClientPacket field2599; - @ObfuscatedName("am") + @ObfuscatedName("d") @ObfuscatedSignature( - descriptor = "Lha;" + descriptor = "Lhs;" ) - public static final ClientPacket field2665; - @ObfuscatedName("ax") + public static final ClientPacket field2671; + @ObfuscatedName("s") @ObfuscatedSignature( - descriptor = "Lha;" + descriptor = "Lhs;" ) - public static final ClientPacket field2601; - @ObfuscatedName("ak") + static final ClientPacket field2638; + @ObfuscatedName("u") @ObfuscatedSignature( - descriptor = "Lha;" + descriptor = "Lhs;" ) - public static final ClientPacket field2641; - @ObfuscatedName("ay") + public static final ClientPacket field2582; + @ObfuscatedName("l") @ObfuscatedSignature( - descriptor = "Lha;" + descriptor = "Lhs;" ) - public static final ClientPacket field2603; - @ObfuscatedName("ai") + public static final ClientPacket field2583; + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "Lha;" + descriptor = "Lhs;" + ) + public static final ClientPacket field2584; + @ObfuscatedName("c") + @ObfuscatedSignature( + descriptor = "Lhs;" + ) + public static final ClientPacket field2585; + @ObfuscatedName("e") + @ObfuscatedSignature( + descriptor = "Lhs;" + ) + public static final ClientPacket field2586; + @ObfuscatedName("g") + @ObfuscatedSignature( + descriptor = "Lhs;" + ) + static final ClientPacket field2587; + @ObfuscatedName("a") + @ObfuscatedSignature( + descriptor = "Lhs;" ) public static final ClientPacket field2604; - @ObfuscatedName("aa") + @ObfuscatedName("k") @ObfuscatedSignature( - descriptor = "Lha;" + descriptor = "Lhs;" ) - public static final ClientPacket field2605; - @ObfuscatedName("au") + public static final ClientPacket field2589; + @ObfuscatedName("m") @ObfuscatedSignature( - descriptor = "Lha;" + descriptor = "Lhs;" ) - public static final ClientPacket field2606; - @ObfuscatedName("as") + public static final ClientPacket field2590; + @ObfuscatedName("x") @ObfuscatedSignature( - descriptor = "Lha;" + descriptor = "Lhs;" ) - public static final ClientPacket field2607; - @ObfuscatedName("ad") + public static final ClientPacket field2652; + @ObfuscatedName("z") @ObfuscatedSignature( - descriptor = "Lha;" + descriptor = "Lhs;" ) - public static final ClientPacket field2608; - @ObfuscatedName("ac") + public static final ClientPacket field2592; + @ObfuscatedName("w") @ObfuscatedSignature( - descriptor = "Lha;" + descriptor = "Lhs;" ) - public static final ClientPacket field2609; - @ObfuscatedName("az") + public static final ClientPacket field2593; + @ObfuscatedName("t") @ObfuscatedSignature( - descriptor = "Lha;" + descriptor = "Lhs;" ) - public static final ClientPacket field2610; - @ObfuscatedName("aq") + public static final ClientPacket field2648; + @ObfuscatedName("h") @ObfuscatedSignature( - descriptor = "Lha;" + descriptor = "Lhs;" ) - public static final ClientPacket field2611; + public static final ClientPacket field2595; + @ObfuscatedName("q") + @ObfuscatedSignature( + descriptor = "Lhs;" + ) + public static final ClientPacket field2664; + @ObfuscatedName("i") + @ObfuscatedSignature( + descriptor = "Lhs;" + ) + public static final ClientPacket field2597; + @ObfuscatedName("ae") + @ObfuscatedSignature( + descriptor = "Lhs;" + ) + public static final ClientPacket field2653; + @ObfuscatedName("ap") + @ObfuscatedSignature( + descriptor = "Lhs;" + ) + public static final ClientPacket field2678; @ObfuscatedName("ab") @ObfuscatedSignature( - descriptor = "Lha;" + descriptor = "Lhs;" ) - public static final ClientPacket field2612; + static final ClientPacket field2600; + @ObfuscatedName("al") + @ObfuscatedSignature( + descriptor = "Lhs;" + ) + public static final ClientPacket field2601; + @ObfuscatedName("ad") + @ObfuscatedSignature( + descriptor = "Lhs;" + ) + public static final ClientPacket field2602; + @ObfuscatedName("ai") + @ObfuscatedSignature( + descriptor = "Lhs;" + ) + static final ClientPacket field2667; @ObfuscatedName("ar") @ObfuscatedSignature( - descriptor = "Lha;" + descriptor = "Lhs;" + ) + public static final ClientPacket field2624; + @ObfuscatedName("ag") + @ObfuscatedSignature( + descriptor = "Lhs;" + ) + public static final ClientPacket field2605; + @ObfuscatedName("ax") + @ObfuscatedSignature( + descriptor = "Lhs;" + ) + public static final ClientPacket field2596; + @ObfuscatedName("as") + @ObfuscatedSignature( + descriptor = "Lhs;" + ) + public static final ClientPacket field2607; + @ObfuscatedName("aj") + @ObfuscatedSignature( + descriptor = "Lhs;" + ) + public static final ClientPacket field2608; + @ObfuscatedName("am") + @ObfuscatedSignature( + descriptor = "Lhs;" + ) + public static final ClientPacket field2579; + @ObfuscatedName("az") + @ObfuscatedSignature( + descriptor = "Lhs;" + ) + public static final ClientPacket field2610; + @ObfuscatedName("av") + @ObfuscatedSignature( + descriptor = "Lhs;" + ) + public static final ClientPacket field2611; + @ObfuscatedName("ac") + @ObfuscatedSignature( + descriptor = "Lhs;" + ) + public static final ClientPacket field2612; + @ObfuscatedName("at") + @ObfuscatedSignature( + descriptor = "Lhs;" ) public static final ClientPacket field2613; @ObfuscatedName("ah") @ObfuscatedSignature( - descriptor = "Lha;" + descriptor = "Lhs;" ) public static final ClientPacket field2614; - @ObfuscatedName("af") + @ObfuscatedName("ao") @ObfuscatedSignature( - descriptor = "Lha;" + descriptor = "Lhs;" ) - public static final ClientPacket field2567; - @ObfuscatedName("an") + public static final ClientPacket field2615; + @ObfuscatedName("aq") @ObfuscatedSignature( - descriptor = "Lha;" + descriptor = "Lhs;" ) public static final ClientPacket field2616; - @ObfuscatedName("bd") + @ObfuscatedName("aw") @ObfuscatedSignature( - descriptor = "Lha;" + descriptor = "Lhs;" ) - public static final ClientPacket field2622; - @ObfuscatedName("bw") + public static final ClientPacket field2594; + @ObfuscatedName("af") @ObfuscatedSignature( - descriptor = "Lha;" - ) - public static final ClientPacket field2618; - @ObfuscatedName("bf") - @ObfuscatedSignature( - descriptor = "Lha;" - ) - public static final ClientPacket field2619; - @ObfuscatedName("bu") - @ObfuscatedSignature( - descriptor = "Lha;" - ) - public static final ClientPacket field2620; - @ObfuscatedName("bb") - @ObfuscatedSignature( - descriptor = "Lha;" - ) - public static final ClientPacket field2621; - @ObfuscatedName("bk") - @ObfuscatedSignature( - descriptor = "Lha;" - ) - static final ClientPacket field2586; - @ObfuscatedName("bt") - @ObfuscatedSignature( - descriptor = "Lha;" - ) - public static final ClientPacket field2623; - @ObfuscatedName("by") - @ObfuscatedSignature( - descriptor = "Lha;" - ) - public static final ClientPacket field2624; - @ObfuscatedName("bz") - @ObfuscatedSignature( - descriptor = "Lha;" - ) - public static final ClientPacket field2625; - @ObfuscatedName("br") - @ObfuscatedSignature( - descriptor = "Lha;" - ) - public static final ClientPacket field2660; - @ObfuscatedName("bm") - @ObfuscatedSignature( - descriptor = "Lha;" - ) - public static final ClientPacket field2627; - @ObfuscatedName("bn") - @ObfuscatedSignature( - descriptor = "Lha;" - ) - public static final ClientPacket field2577; - @ObfuscatedName("ba") - @ObfuscatedSignature( - descriptor = "Lha;" - ) - public static final ClientPacket field2600; - @ObfuscatedName("bg") - @ObfuscatedSignature( - descriptor = "Lha;" - ) - public static final ClientPacket field2630; - @ObfuscatedName("bi") - @ObfuscatedSignature( - descriptor = "Lha;" - ) - public static final ClientPacket field2631; - @ObfuscatedName("bp") - @ObfuscatedSignature( - descriptor = "Lha;" - ) - public static final ClientPacket field2668; - @ObfuscatedName("bj") - @ObfuscatedSignature( - descriptor = "Lha;" - ) - public static final ClientPacket field2635; - @ObfuscatedName("be") - @ObfuscatedSignature( - descriptor = "Lha;" - ) - public static final ClientPacket field2634; - @ObfuscatedName("bs") - @ObfuscatedSignature( - descriptor = "Lha;" - ) - public static final ClientPacket field2576; - @ObfuscatedName("bx") - @ObfuscatedSignature( - descriptor = "Lha;" - ) - public static final ClientPacket field2636; - @ObfuscatedName("bv") - @ObfuscatedSignature( - descriptor = "Lha;" - ) - public static final ClientPacket field2657; - @ObfuscatedName("bh") - @ObfuscatedSignature( - descriptor = "Lha;" - ) - public static final ClientPacket field2638; - @ObfuscatedName("bl") - @ObfuscatedSignature( - descriptor = "Lha;" - ) - public static final ClientPacket field2639; - @ObfuscatedName("bc") - @ObfuscatedSignature( - descriptor = "Lha;" - ) - public static final ClientPacket field2640; - @ObfuscatedName("bo") - @ObfuscatedSignature( - descriptor = "Lha;" - ) - public static final ClientPacket field2617; - @ObfuscatedName("bq") - @ObfuscatedSignature( - descriptor = "Lha;" + descriptor = "Lhs;" ) public static final ClientPacket field2642; - @ObfuscatedName("cm") + @ObfuscatedName("ak") @ObfuscatedSignature( - descriptor = "Lha;" + descriptor = "Lhs;" + ) + public static final ClientPacket field2670; + @ObfuscatedName("ay") + @ObfuscatedSignature( + descriptor = "Lhs;" + ) + public static final ClientPacket field2620; + @ObfuscatedName("aa") + @ObfuscatedSignature( + descriptor = "Lhs;" + ) + public static final ClientPacket field2621; + @ObfuscatedName("au") + @ObfuscatedSignature( + descriptor = "Lhs;" + ) + public static final ClientPacket field2622; + @ObfuscatedName("an") + @ObfuscatedSignature( + descriptor = "Lhs;" + ) + public static final ClientPacket field2623; + @ObfuscatedName("bd") + @ObfuscatedSignature( + descriptor = "Lhs;" + ) + public static final ClientPacket field2637; + @ObfuscatedName("bt") + @ObfuscatedSignature( + descriptor = "Lhs;" + ) + public static final ClientPacket field2625; + @ObfuscatedName("bq") + @ObfuscatedSignature( + descriptor = "Lhs;" + ) + public static final ClientPacket field2626; + @ObfuscatedName("bu") + @ObfuscatedSignature( + descriptor = "Lhs;" + ) + public static final ClientPacket field2627; + @ObfuscatedName("bl") + @ObfuscatedSignature( + descriptor = "Lhs;" + ) + public static final ClientPacket field2665; + @ObfuscatedName("bv") + @ObfuscatedSignature( + descriptor = "Lhs;" + ) + static final ClientPacket field2629; + @ObfuscatedName("bm") + @ObfuscatedSignature( + descriptor = "Lhs;" + ) + public static final ClientPacket field2630; + @ObfuscatedName("bz") + @ObfuscatedSignature( + descriptor = "Lhs;" + ) + public static final ClientPacket field2631; + @ObfuscatedName("bh") + @ObfuscatedSignature( + descriptor = "Lhs;" + ) + public static final ClientPacket field2632; + @ObfuscatedName("bs") + @ObfuscatedSignature( + descriptor = "Lhs;" + ) + public static final ClientPacket field2633; + @ObfuscatedName("br") + @ObfuscatedSignature( + descriptor = "Lhs;" + ) + public static final ClientPacket field2676; + @ObfuscatedName("bf") + @ObfuscatedSignature( + descriptor = "Lhs;" + ) + public static final ClientPacket field2635; + @ObfuscatedName("ba") + @ObfuscatedSignature( + descriptor = "Lhs;" + ) + public static final ClientPacket field2636; + @ObfuscatedName("be") + @ObfuscatedSignature( + descriptor = "Lhs;" + ) + public static final ClientPacket field2619; + @ObfuscatedName("bj") + @ObfuscatedSignature( + descriptor = "Lhs;" + ) + public static final ClientPacket field2603; + @ObfuscatedName("bx") + @ObfuscatedSignature( + descriptor = "Lhs;" + ) + public static final ClientPacket field2639; + @ObfuscatedName("bp") + @ObfuscatedSignature( + descriptor = "Lhs;" + ) + public static final ClientPacket field2651; + @ObfuscatedName("bn") + @ObfuscatedSignature( + descriptor = "Lhs;" + ) + public static final ClientPacket field2641; + @ObfuscatedName("bo") + @ObfuscatedSignature( + descriptor = "Lhs;" + ) + public static final ClientPacket field2580; + @ObfuscatedName("bw") + @ObfuscatedSignature( + descriptor = "Lhs;" ) public static final ClientPacket field2643; - @ObfuscatedName("ch") + @ObfuscatedName("bi") @ObfuscatedSignature( - descriptor = "Lha;" + descriptor = "Lhs;" ) public static final ClientPacket field2644; - @ObfuscatedName("cu") + @ObfuscatedName("bb") @ObfuscatedSignature( - descriptor = "Lha;" + descriptor = "Lhs;" ) - public static final ClientPacket field2671; - @ObfuscatedName("ce") + public static final ClientPacket field2645; + @ObfuscatedName("bk") @ObfuscatedSignature( - descriptor = "Lha;" + descriptor = "Lhs;" ) public static final ClientPacket field2646; - @ObfuscatedName("cn") + @ObfuscatedName("bg") @ObfuscatedSignature( - descriptor = "Lha;" + descriptor = "Lhs;" ) public static final ClientPacket field2647; - @ObfuscatedName("cc") + @ObfuscatedName("by") @ObfuscatedSignature( - descriptor = "Lha;" + descriptor = "Lhs;" ) - public static final ClientPacket field2648; - @ObfuscatedName("ck") + public static final ClientPacket field2666; + @ObfuscatedName("bc") @ObfuscatedSignature( - descriptor = "Lha;" + descriptor = "Lhs;" ) public static final ClientPacket field2649; - @ObfuscatedName("cx") - @ObfuscatedSignature( - descriptor = "Lha;" - ) - public static final ClientPacket field2650; - @ObfuscatedName("ci") - @ObfuscatedSignature( - descriptor = "Lha;" - ) - public static final ClientPacket field2628; - @ObfuscatedName("cf") - @ObfuscatedSignature( - descriptor = "Lha;" - ) - public static final ClientPacket field2652; - @ObfuscatedName("cq") - @ObfuscatedSignature( - descriptor = "Lha;" - ) - public static final ClientPacket field2653; - @ObfuscatedName("cs") - @ObfuscatedSignature( - descriptor = "Lha;" - ) - public static final ClientPacket field2629; @ObfuscatedName("cd") @ObfuscatedSignature( - descriptor = "Lha;" + descriptor = "Lhs;" ) - public static final ClientPacket field2655; - @ObfuscatedName("ct") + public static final ClientPacket field2640; + @ObfuscatedName("cm") @ObfuscatedSignature( - descriptor = "Lha;" + descriptor = "Lhs;" ) - public static final ClientPacket field2578; - @ObfuscatedName("co") + public static final ClientPacket field2588; + @ObfuscatedName("cv") @ObfuscatedSignature( - descriptor = "Lha;" + descriptor = "Lhs;" ) - public static final ClientPacket field2602; - @ObfuscatedName("cz") - @ObfuscatedSignature( - descriptor = "Lha;" - ) - public static final ClientPacket field2572; - @ObfuscatedName("cl") - @ObfuscatedSignature( - descriptor = "Lha;" - ) - public static final ClientPacket field2659; + public static final ClientPacket field2591; @ObfuscatedName("cp") @ObfuscatedSignature( - descriptor = "Lha;" + descriptor = "Lhs;" ) - public static final ClientPacket field2575; + public static final ClientPacket field2628; + @ObfuscatedName("ci") + @ObfuscatedSignature( + descriptor = "Lhs;" + ) + public static final ClientPacket field2654; + @ObfuscatedName("ct") + @ObfuscatedSignature( + descriptor = "Lhs;" + ) + public static final ClientPacket field2655; + @ObfuscatedName("cq") + @ObfuscatedSignature( + descriptor = "Lhs;" + ) + public static final ClientPacket field2634; @ObfuscatedName("cr") @ObfuscatedSignature( - descriptor = "Lha;" + descriptor = "Lhs;" ) - public static final ClientPacket field2661; + public static final ClientPacket field2657; + @ObfuscatedName("cf") + @ObfuscatedSignature( + descriptor = "Lhs;" + ) + public static final ClientPacket field2658; + @ObfuscatedName("cn") + @ObfuscatedSignature( + descriptor = "Lhs;" + ) + public static final ClientPacket field2659; + @ObfuscatedName("cs") + @ObfuscatedSignature( + descriptor = "Lhs;" + ) + public static final ClientPacket field2660; @ObfuscatedName("cg") @ObfuscatedSignature( - descriptor = "Lha;" + descriptor = "Lhs;" + ) + public static final ClientPacket field2674; + @ObfuscatedName("co") + @ObfuscatedSignature( + descriptor = "Lhs;" ) public static final ClientPacket field2662; - @ObfuscatedName("cw") + @ObfuscatedName("ck") @ObfuscatedSignature( - descriptor = "Lha;" + descriptor = "Lhs;" ) public static final ClientPacket field2663; @ObfuscatedName("cj") @ObfuscatedSignature( - descriptor = "Lha;" + descriptor = "Lhs;" ) - public static final ClientPacket field2664; - @ObfuscatedName("cy") + public static final ClientPacket field2618; + @ObfuscatedName("cc") @ObfuscatedSignature( - descriptor = "Lha;" + descriptor = "Lhs;" ) - public static final ClientPacket field2615; + public static final ClientPacket field2572; + @ObfuscatedName("cu") + @ObfuscatedSignature( + descriptor = "Lhs;" + ) + public static final ClientPacket field2650; + @ObfuscatedName("cz") + @ObfuscatedSignature( + descriptor = "Lhs;" + ) + public static final ClientPacket field2673; @ObfuscatedName("cb") @ObfuscatedSignature( - descriptor = "Lha;" + descriptor = "Lhs;" ) - public static final ClientPacket field2651; - @ObfuscatedName("cv") + public static final ClientPacket field2668; + @ObfuscatedName("ce") @ObfuscatedSignature( - descriptor = "Lha;" + descriptor = "Lhs;" ) public static final ClientPacket field2669; + @ObfuscatedName("ch") + @ObfuscatedSignature( + descriptor = "Lhs;" + ) + public static final ClientPacket field2609; + @ObfuscatedName("cy") + @ObfuscatedSignature( + descriptor = "Lhs;" + ) + public static final ClientPacket field2581; + @ObfuscatedName("cx") + @ObfuscatedSignature( + descriptor = "Lhs;" + ) + public static final ClientPacket field2672; @ObfuscatedName("ca") @ObfuscatedSignature( - descriptor = "Lha;" + descriptor = "Lhs;" ) - public static final ClientPacket field2579; - @ObfuscatedName("ds") + public static final ClientPacket field2661; + @ObfuscatedName("cl") @ObfuscatedSignature( - descriptor = "Lha;" - ) - public static final ClientPacket field2590; - @ObfuscatedName("do") - @ObfuscatedSignature( - descriptor = "Lha;" + descriptor = "Lhs;" ) public static final ClientPacket field2656; + @ObfuscatedName("cw") + @ObfuscatedSignature( + descriptor = "Lhs;" + ) + public static final ClientPacket field2675; + @ObfuscatedName("db") + @ObfuscatedSignature( + descriptor = "Lhs;" + ) + public static final ClientPacket field2606; + @ObfuscatedName("dz") + @ObfuscatedSignature( + descriptor = "Lhs;" + ) + public static final ClientPacket field2677; @ObfuscatedName("dj") @ObfuscatedGetter( - intValue = 213597567 + intValue = -1958588669 ) @Export("id") final int id; - @ObfuscatedName("du") + @ObfuscatedName("dr") @ObfuscatedGetter( - intValue = 1412890633 + intValue = -209814861 ) @Export("length") final int length; static { field2598 = new ClientPacket(0, 16); // L: 5 - field2566 = new ClientPacket(1, -2); // L: 6 - field2658 = new ClientPacket(2, -1); // L: 7 - field2645 = new ClientPacket(3, 7); // L: 8 - field2569 = new ClientPacket(4, 8); // L: 9 - field2570 = new ClientPacket(5, 15); // L: 10 - field2593 = new ClientPacket(6, 2); // L: 11 - field2591 = new ClientPacket(7, 11); // L: 12 - field2573 = new ClientPacket(8, -1); // L: 13 - field2574 = new ClientPacket(9, 2); // L: 14 - field2670 = new ClientPacket(10, 4); // L: 15 - field2637 = new ClientPacket(11, 4); // L: 16 - field2666 = new ClientPacket(12, -1); // L: 17 - field2595 = new ClientPacket(13, 8); // L: 18 - field2568 = new ClientPacket(14, 16); // L: 19 - field2580 = new ClientPacket(15, -1); // L: 20 - field2581 = new ClientPacket(16, 8); // L: 21 - field2582 = new ClientPacket(17, -1); // L: 22 - field2583 = new ClientPacket(18, 0); // L: 23 - field2584 = new ClientPacket(19, 6); // L: 24 - field2585 = new ClientPacket(20, 8); - field2632 = new ClientPacket(21, 8); - field2587 = new ClientPacket(22, 8); - field2588 = new ClientPacket(23, -1); - field2589 = new ClientPacket(24, -1); - field2571 = new ClientPacket(25, 3); - field2626 = new ClientPacket(26, -1); - field2592 = new ClientPacket(27, 8); // L: 32 - field2633 = new ClientPacket(28, -1); - field2594 = new ClientPacket(29, 3); - field2654 = new ClientPacket(30, 3); - field2596 = new ClientPacket(31, 7); - field2597 = new ClientPacket(32, 3); - field2565 = new ClientPacket(33, 3); - field2599 = new ClientPacket(34, -1); - field2665 = new ClientPacket(35, -1); // L: 40 - field2601 = new ClientPacket(36, 0); - field2641 = new ClientPacket(37, 8); // L: 42 - field2603 = new ClientPacket(38, -1); - field2604 = new ClientPacket(39, 3); // L: 44 - field2605 = new ClientPacket(40, -1); // L: 45 - field2606 = new ClientPacket(41, 8); // L: 46 - field2607 = new ClientPacket(42, -2); // L: 47 - field2608 = new ClientPacket(43, 11); // L: 48 - field2609 = new ClientPacket(44, 8); // L: 49 - field2610 = new ClientPacket(45, 0); // L: 50 - field2611 = new ClientPacket(46, -1); // L: 51 - field2612 = new ClientPacket(47, 3); // L: 52 - field2613 = new ClientPacket(48, 3); // L: 53 - field2614 = new ClientPacket(49, -1); // L: 54 - field2567 = new ClientPacket(50, -1); // L: 55 - field2616 = new ClientPacket(51, 11); // L: 56 - field2622 = new ClientPacket(52, 3); // L: 57 - field2618 = new ClientPacket(53, 3); // L: 58 - field2619 = new ClientPacket(54, 7); // L: 59 - field2620 = new ClientPacket(55, 8); // L: 60 - field2621 = new ClientPacket(56, -1); // L: 61 - field2586 = new ClientPacket(57, -1); // L: 62 - field2623 = new ClientPacket(58, 4); // L: 63 - field2624 = new ClientPacket(59, 16); // L: 64 - field2625 = new ClientPacket(60, 8); // L: 65 - field2660 = new ClientPacket(61, 8); // L: 66 - field2627 = new ClientPacket(62, 7); // L: 67 - field2577 = new ClientPacket(63, 8); // L: 68 - field2600 = new ClientPacket(64, 3); // L: 69 - field2630 = new ClientPacket(65, 4); // L: 70 - field2631 = new ClientPacket(66, 8); // L: 71 - field2668 = new ClientPacket(67, 8); // L: 72 - field2635 = new ClientPacket(68, -1); // L: 73 - field2634 = new ClientPacket(69, 7); // L: 74 - field2576 = new ClientPacket(70, 1); // L: 75 - field2636 = new ClientPacket(71, 15); // L: 76 - field2657 = new ClientPacket(72, 0); // L: 77 - field2638 = new ClientPacket(73, -1); // L: 78 - field2639 = new ClientPacket(74, 2); // L: 79 - field2640 = new ClientPacket(75, 2); // L: 80 - field2617 = new ClientPacket(76, 7); // L: 81 - field2642 = new ClientPacket(77, 7); // L: 82 - field2643 = new ClientPacket(78, 7); // L: 83 - field2644 = new ClientPacket(79, -2); // L: 84 - field2671 = new ClientPacket(80, 2); // L: 85 - field2646 = new ClientPacket(81, -1); // L: 86 - field2647 = new ClientPacket(82, 3); // L: 87 - field2648 = new ClientPacket(83, -1); // L: 88 - field2649 = new ClientPacket(84, 10); // L: 89 - field2650 = new ClientPacket(85, 9); // L: 90 - field2628 = new ClientPacket(86, 9); // L: 91 - field2652 = new ClientPacket(87, 7); // L: 92 - field2653 = new ClientPacket(88, -1); // L: 93 - field2629 = new ClientPacket(89, 13); // L: 94 - field2655 = new ClientPacket(90, 5); // L: 95 - field2578 = new ClientPacket(91, 6); // L: 96 - field2602 = new ClientPacket(92, 3); // L: 97 + field2573 = new ClientPacket(1, -2); // L: 6 + field2574 = new ClientPacket(2, -1); // L: 7 + field2575 = new ClientPacket(3, 7); // L: 8 + field2576 = new ClientPacket(4, 8); // L: 9 + field2577 = new ClientPacket(5, 15); // L: 10 + field2578 = new ClientPacket(6, 2); // L: 11 + field2599 = new ClientPacket(7, 11); // L: 12 + field2671 = new ClientPacket(8, -1); // L: 13 + field2638 = new ClientPacket(9, 2); // L: 14 + field2582 = new ClientPacket(10, 4); // L: 15 + field2583 = new ClientPacket(11, 4); // L: 16 + field2584 = new ClientPacket(12, -1); // L: 17 + field2585 = new ClientPacket(13, 8); // L: 18 + field2586 = new ClientPacket(14, 16); // L: 19 + field2587 = new ClientPacket(15, -1); // L: 20 + field2604 = new ClientPacket(16, 8); // L: 21 + field2589 = new ClientPacket(17, -1); // L: 22 + field2590 = new ClientPacket(18, 0); // L: 23 + field2652 = new ClientPacket(19, 6); // L: 24 + field2592 = new ClientPacket(20, 8); // L: 25 + field2593 = new ClientPacket(21, 8); // L: 26 + field2648 = new ClientPacket(22, 8); // L: 27 + field2595 = new ClientPacket(23, -1); // L: 28 + field2664 = new ClientPacket(24, -1); // L: 29 + field2597 = new ClientPacket(25, 3); // L: 30 + field2653 = new ClientPacket(26, -1); // L: 31 + field2678 = new ClientPacket(27, 8); // L: 32 + field2600 = new ClientPacket(28, -1); // L: 33 + field2601 = new ClientPacket(29, 3); // L: 34 + field2602 = new ClientPacket(30, 3); // L: 35 + field2667 = new ClientPacket(31, 7); // L: 36 + field2624 = new ClientPacket(32, 3); // L: 37 + field2605 = new ClientPacket(33, 3); // L: 38 + field2596 = new ClientPacket(34, -1); // L: 39 + field2607 = new ClientPacket(35, -1); // L: 40 + field2608 = new ClientPacket(36, 0); // L: 41 + field2579 = new ClientPacket(37, 8); // L: 42 + field2610 = new ClientPacket(38, -1); // L: 43 + field2611 = new ClientPacket(39, 3); + field2612 = new ClientPacket(40, -1); + field2613 = new ClientPacket(41, 8); // L: 46 + field2614 = new ClientPacket(42, -2); + field2615 = new ClientPacket(43, 11); // L: 48 + field2616 = new ClientPacket(44, 8); // L: 49 + field2594 = new ClientPacket(45, 0); // L: 50 + field2642 = new ClientPacket(46, -1); // L: 51 + field2670 = new ClientPacket(47, 3); // L: 52 + field2620 = new ClientPacket(48, 3); // L: 53 + field2621 = new ClientPacket(49, -1); + field2622 = new ClientPacket(50, -1); + field2623 = new ClientPacket(51, 11); + field2637 = new ClientPacket(52, 3); // L: 57 + field2625 = new ClientPacket(53, 3); // L: 58 + field2626 = new ClientPacket(54, 7); + field2627 = new ClientPacket(55, 8); + field2665 = new ClientPacket(56, -1); // L: 61 + field2629 = new ClientPacket(57, -1); + field2630 = new ClientPacket(58, 4); // L: 63 + field2631 = new ClientPacket(59, 16); // L: 64 + field2632 = new ClientPacket(60, 8); + field2633 = new ClientPacket(61, 8); + field2676 = new ClientPacket(62, 7); + field2635 = new ClientPacket(63, 8); + field2636 = new ClientPacket(64, 3); + field2619 = new ClientPacket(65, 4); + field2603 = new ClientPacket(66, 8); + field2639 = new ClientPacket(67, 8); + field2651 = new ClientPacket(68, -1); + field2641 = new ClientPacket(69, 7); + field2580 = new ClientPacket(70, 1); + field2643 = new ClientPacket(71, 15); + field2644 = new ClientPacket(72, 0); // L: 77 + field2645 = new ClientPacket(73, -1); // L: 78 + field2646 = new ClientPacket(74, 2); + field2647 = new ClientPacket(75, 2); // L: 80 + field2666 = new ClientPacket(76, 7); // L: 81 + field2649 = new ClientPacket(77, 7); // L: 82 + field2640 = new ClientPacket(78, 7); // L: 83 + field2588 = new ClientPacket(79, -2); // L: 84 + field2591 = new ClientPacket(80, 2); // L: 85 + field2628 = new ClientPacket(81, -1); // L: 86 + field2654 = new ClientPacket(82, 3); // L: 87 + field2655 = new ClientPacket(83, -1); // L: 88 + field2634 = new ClientPacket(84, 10); // L: 89 + field2657 = new ClientPacket(85, 9); // L: 90 + field2658 = new ClientPacket(86, 9); // L: 91 + field2659 = new ClientPacket(87, 7); // L: 92 + field2660 = new ClientPacket(88, -1); // L: 93 + field2674 = new ClientPacket(89, 13); // L: 94 + field2662 = new ClientPacket(90, 5); // L: 95 + field2663 = new ClientPacket(91, 6); // L: 96 + field2618 = new ClientPacket(92, 3); // L: 97 field2572 = new ClientPacket(93, 7); // L: 98 - field2659 = new ClientPacket(94, 8); // L: 99 - field2575 = new ClientPacket(95, 8); // L: 100 - field2661 = new ClientPacket(96, 15); // L: 101 - field2662 = new ClientPacket(97, 0); // L: 102 - field2663 = new ClientPacket(98, 14); // L: 103 - field2664 = new ClientPacket(99, 8); // L: 104 - field2615 = new ClientPacket(100, 7); // L: 105 - field2651 = new ClientPacket(101, 8); // L: 106 - field2669 = new ClientPacket(102, 3); // L: 107 - field2579 = new ClientPacket(103, 11); // L: 108 - field2590 = new ClientPacket(104, 4); // L: 109 - field2656 = new ClientPacket(105, 15); // L: 110 + field2650 = new ClientPacket(94, 8); // L: 99 + field2673 = new ClientPacket(95, 8); // L: 100 + field2668 = new ClientPacket(96, 15); // L: 101 + field2669 = new ClientPacket(97, 0); // L: 102 + field2609 = new ClientPacket(98, 14); // L: 103 + field2581 = new ClientPacket(99, 8); // L: 104 + field2672 = new ClientPacket(100, 7); // L: 105 + field2661 = new ClientPacket(101, 8); // L: 106 + field2656 = new ClientPacket(102, 3); // L: 107 + field2675 = new ClientPacket(103, 11); // L: 108 + field2606 = new ClientPacket(104, 4); // L: 109 + field2677 = new ClientPacket(105, 15); // L: 110 } ClientPacket(int var1, int var2) { @@ -664,32 +664,56 @@ public class ClientPacket implements class223 { this.length = var2; // L: 116 } // L: 117 - @ObfuscatedName("h") + @ObfuscatedName("n") @ObfuscatedSignature( - descriptor = "(B)V", - garbageValue = "-54" + descriptor = "(I)V", + garbageValue = "1602650141" ) - static void method4299() { - class285.field3675 = new int[2000]; // L: 25 - int var0 = 0; // L: 26 - int var1 = 240; // L: 27 - - int var3; - for (byte var2 = 12; var0 < 16; var1 -= var2) { // L: 28 - var3 = class23.method309((double)((float)var1 / 360.0F), 0.9998999834060669D, (double)((float)var0 * 0.425F / 16.0F + 0.075F)); // L: 30 - class285.field3675[var0] = var3; // L: 31 - ++var0; // L: 29 - } - - var1 = 48; // L: 33 - - for (int var5 = var1 / 6; var0 < class285.field3675.length; var1 -= var5) { // L: 34 35 41 - var3 = var0 * 2; // L: 36 - - for (int var4 = class23.method309((double)((float)var1 / 360.0F), 0.9998999834060669D, 0.5D); var0 < var3 && var0 < class285.field3675.length; ++var0) { // L: 37 38 - class285.field3675[var0] = var4; // L: 39 + static void method4354() { + for (ObjectSound var0 = (ObjectSound)ObjectSound.objectSounds.last(); var0 != null; var0 = (ObjectSound)ObjectSound.objectSounds.previous()) { // L: 44 + if (var0.obj != null) { // L: 45 + var0.set(); } } - } // L: 43 + } // L: 47 + + @ObfuscatedName("y") + @ObfuscatedSignature( + descriptor = "(Ljv;IIB)Loh;", + garbageValue = "14" + ) + @Export("SpriteBuffer_getSprite") + public static SpritePixels SpriteBuffer_getSprite(AbstractArchive var0, int var1, int var2) { + byte[] var4 = var0.takeFile(var1, var2); // L: 54 + boolean var3; + if (var4 == null) { // L: 55 + var3 = false; // L: 56 + } else { + ItemLayer.SpriteBuffer_decode(var4); // L: 59 + var3 = true; // L: 60 + } + + if (!var3) { // L: 62 + return null; + } else { + SpritePixels var5 = new SpritePixels(); // L: 65 + var5.width = class396.SpriteBuffer_spriteWidth; // L: 66 + var5.height = UserComparator2.SpriteBuffer_spriteHeight; // L: 67 + var5.xOffset = WorldMapDecoration.SpriteBuffer_xOffsets[0]; // L: 68 + var5.yOffset = Calendar.SpriteBuffer_yOffsets[0]; // L: 69 + var5.subWidth = class396.SpriteBuffer_spriteWidths[0]; // L: 70 + var5.subHeight = class302.SpriteBuffer_spriteHeights[0]; // L: 71 + int var6 = var5.subWidth * var5.subHeight; // L: 72 + byte[] var7 = class396.SpriteBuffer_pixels[0]; // L: 73 + var5.pixels = new int[var6]; // L: 74 + + for (int var8 = 0; var8 < var6; ++var8) { // L: 75 + var5.pixels[var8] = MilliClock.SpriteBuffer_spritePalette[var7[var8] & 255]; + } + + MilliClock.method2587(); // L: 76 + return var5; // L: 79 + } + } } diff --git a/runescape-client/src/main/java/ClientPreferences.java b/runescape-client/src/main/java/ClientPreferences.java index 1fceedd57e..dce1b5fd1d 100644 --- a/runescape-client/src/main/java/ClientPreferences.java +++ b/runescape-client/src/main/java/ClientPreferences.java @@ -1,3 +1,4 @@ +import java.security.SecureRandom; import java.util.Iterator; import java.util.LinkedHashMap; import java.util.Map.Entry; @@ -7,54 +8,57 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("cv") +@ObfuscatedName("cl") @Implements("ClientPreferences") public class ClientPreferences { - @ObfuscatedName("h") + @ObfuscatedName("v") @ObfuscatedGetter( - intValue = -589693927 + intValue = -437407307 ) @Export("ClientPreferences_optionCount") static int ClientPreferences_optionCount; - @ObfuscatedName("o") + @ObfuscatedName("eg") + @Export("secureRandom") + static SecureRandom secureRandom; + @ObfuscatedName("f") @Export("roofsHidden") boolean roofsHidden; - @ObfuscatedName("g") + @ObfuscatedName("y") @Export("titleMusicDisabled") boolean titleMusicDisabled; - @ObfuscatedName("l") + @ObfuscatedName("p") @ObfuscatedGetter( - intValue = 706113995 + intValue = -660685365 ) @Export("windowMode") int windowMode; - @ObfuscatedName("z") + @ObfuscatedName("j") @Export("rememberedUsername") String rememberedUsername; - @ObfuscatedName("t") + @ObfuscatedName("r") @Export("hideUsername") boolean hideUsername; - @ObfuscatedName("v") - double field1303; @ObfuscatedName("b") + double field1337; + @ObfuscatedName("d") @ObfuscatedGetter( - intValue = 1983540285 + intValue = 1285356667 ) @Export("musicVolume") int musicVolume; - @ObfuscatedName("q") + @ObfuscatedName("s") @ObfuscatedGetter( - intValue = 1893161511 + intValue = -140834991 ) @Export("soundEffectsVolume") int soundEffectsVolume; - @ObfuscatedName("i") + @ObfuscatedName("u") @ObfuscatedGetter( - intValue = 51671271 + intValue = -1768933319 ) @Export("areaSoundEffectsVolume") int areaSoundEffectsVolume; - @ObfuscatedName("x") + @ObfuscatedName("l") @Export("parameters") LinkedHashMap parameters; @@ -66,22 +70,22 @@ public class ClientPreferences { this.windowMode = 1; this.rememberedUsername = null; this.hideUsername = false; - this.field1303 = 0.8D; + this.field1337 = 0.8D; this.musicVolume = 127; this.soundEffectsVolume = 127; this.areaSoundEffectsVolume = 127; this.parameters = new LinkedHashMap(); - this.method2233(true); // L: 25 + this.method2239(true); // L: 25 } // L: 26 @ObfuscatedSignature( - descriptor = "(Lnk;)V" + descriptor = "(Lnd;)V" ) ClientPreferences(Buffer var1) { this.windowMode = 1; // L: 15 this.rememberedUsername = null; // L: 16 this.hideUsername = false; // L: 17 - this.field1303 = 0.8D; // L: 18 + this.field1337 = 0.8D; // L: 18 this.musicVolume = 127; // L: 19 this.soundEffectsVolume = 127; // L: 20 this.areaSoundEffectsVolume = 127; // L: 21 @@ -120,32 +124,32 @@ public class ClientPreferences { } if (var2 > 6) { // L: 59 - this.field1303 = (double)var1.readUnsignedByte() / 100.0D; // L: 60 + this.field1337 = (double)var1.readUnsignedByte() / 100.0D; // L: 60 this.musicVolume = var1.readUnsignedByte(); // L: 61 this.soundEffectsVolume = var1.readUnsignedByte(); // L: 62 this.areaSoundEffectsVolume = var1.readUnsignedByte(); // L: 63 } } else { - this.method2233(true); // L: 35 + this.method2239(true); // L: 35 } } else { - this.method2233(true); // L: 30 + this.method2239(true); // L: 30 } } // L: 67 - @ObfuscatedName("h") + @ObfuscatedName("v") @ObfuscatedSignature( descriptor = "(ZI)V", - garbageValue = "-1649794389" + garbageValue = "2046027023" ) - void method2233(boolean var1) { + void method2239(boolean var1) { } // L: 69 - @ObfuscatedName("c") + @ObfuscatedName("n") @ObfuscatedSignature( - descriptor = "(B)Lnk;", - garbageValue = "0" + descriptor = "(I)Lnd;", + garbageValue = "2063389348" ) @Export("toBuffer") Buffer toBuffer() { @@ -165,151 +169,10 @@ public class ClientPreferences { var1.writeStringCp1252NullTerminated(this.rememberedUsername != null ? this.rememberedUsername : ""); // L: 85 var1.writeBoolean(this.hideUsername); // L: 86 - var1.writeByte((int)(this.field1303 * 100.0D)); // L: 87 + var1.writeByte((int)(100.0D * this.field1337)); // L: 87 var1.writeByte(this.musicVolume); // L: 88 var1.writeByte(this.soundEffectsVolume); // L: 89 var1.writeByte(this.areaSoundEffectsVolume); // L: 90 return var1; // L: 91 } - - @ObfuscatedName("hl") - @ObfuscatedSignature( - descriptor = "(ZLnm;I)V", - garbageValue = "530803334" - ) - @Export("loadRegions") - static final void loadRegions(boolean var0, PacketBuffer var1) { - Client.isInInstance = var0; // L: 5469 - int var2; - int var3; - int var5; - int var6; - int var7; - int var8; - if (!Client.isInInstance) { // L: 5470 - var2 = var1.method6648(); // L: 5471 - var3 = var1.method6620(); // L: 5472 - int var4 = var1.readUnsignedShort(); // L: 5473 - FriendsList.xteaKeys = new int[var4][4]; // L: 5474 - - for (var5 = 0; var5 < var4; ++var5) { // L: 5475 - for (var6 = 0; var6 < 4; ++var6) { // L: 5476 - FriendsList.xteaKeys[var5][var6] = var1.readInt(); // L: 5477 - } - } - - HealthBar.regions = new int[var4]; // L: 5480 - class264.regionMapArchiveIds = new int[var4]; // L: 5481 - class15.regionLandArchiveIds = new int[var4]; // L: 5482 - Messages.regionLandArchives = new byte[var4][]; // L: 5483 - class159.regionMapArchives = new byte[var4][]; // L: 5484 - boolean var16 = false; // L: 5485 - if ((var3 / 8 == 48 || var3 / 8 == 49) && var2 / 8 == 48) { // L: 5486 - var16 = true; - } - - if (var3 / 8 == 48 && var2 / 8 == 148) { // L: 5487 - var16 = true; - } - - var4 = 0; // L: 5488 - - for (var6 = (var3 - 6) / 8; var6 <= (var3 + 6) / 8; ++var6) { // L: 5489 - for (var7 = (var2 - 6) / 8; var7 <= (var2 + 6) / 8; ++var7) { // L: 5490 - var8 = var7 + (var6 << 8); // L: 5491 - if (!var16 || var7 != 49 && var7 != 149 && var7 != 147 && var6 != 50 && (var6 != 49 || var7 != 47)) { // L: 5492 - HealthBar.regions[var4] = var8; // L: 5493 - class264.regionMapArchiveIds[var4] = WorldMapSection0.archive5.getGroupId("m" + var6 + "_" + var7); // L: 5494 - class15.regionLandArchiveIds[var4] = WorldMapSection0.archive5.getGroupId("l" + var6 + "_" + var7); // L: 5495 - ++var4; // L: 5496 - } - } - } - - Actor.method2199(var3, var2, true); // L: 5499 - } else { - var2 = var1.readUnsignedShort(); // L: 5502 - var3 = var1.method6620(); // L: 5503 - boolean var15 = var1.method6478() == 1; // L: 5504 - var5 = var1.readUnsignedShort(); // L: 5505 - var1.importIndex(); // L: 5506 - - int var9; - for (var6 = 0; var6 < 4; ++var6) { // L: 5507 - for (var7 = 0; var7 < 13; ++var7) { // L: 5508 - for (var8 = 0; var8 < 13; ++var8) { // L: 5509 - var9 = var1.readBits(1); // L: 5510 - if (var9 == 1) { - Client.instanceChunkTemplates[var6][var7][var8] = var1.readBits(26); // L: 5511 - } else { - Client.instanceChunkTemplates[var6][var7][var8] = -1; // L: 5512 - } - } - } - } - - var1.exportIndex(); // L: 5516 - FriendsList.xteaKeys = new int[var5][4]; // L: 5517 - - for (var6 = 0; var6 < var5; ++var6) { // L: 5518 - for (var7 = 0; var7 < 4; ++var7) { // L: 5519 - FriendsList.xteaKeys[var6][var7] = var1.readInt(); // L: 5520 - } - } - - HealthBar.regions = new int[var5]; // L: 5523 - class264.regionMapArchiveIds = new int[var5]; // L: 5524 - class15.regionLandArchiveIds = new int[var5]; // L: 5525 - Messages.regionLandArchives = new byte[var5][]; // L: 5526 - class159.regionMapArchives = new byte[var5][]; // L: 5527 - var5 = 0; // L: 5528 - - for (var6 = 0; var6 < 4; ++var6) { // L: 5529 - for (var7 = 0; var7 < 13; ++var7) { // L: 5530 - for (var8 = 0; var8 < 13; ++var8) { // L: 5531 - var9 = Client.instanceChunkTemplates[var6][var7][var8]; // L: 5532 - if (var9 != -1) { // L: 5533 - int var10 = var9 >> 14 & 1023; // L: 5534 - int var11 = var9 >> 3 & 2047; // L: 5535 - int var12 = (var10 / 8 << 8) + var11 / 8; // L: 5536 - - int var13; - for (var13 = 0; var13 < var5; ++var13) { // L: 5537 - if (HealthBar.regions[var13] == var12) { - var12 = -1; // L: 5538 - break; // L: 5539 - } - } - - if (var12 != -1) { // L: 5541 - HealthBar.regions[var5] = var12; // L: 5542 - var13 = var12 >> 8 & 255; // L: 5543 - int var14 = var12 & 255; // L: 5544 - class264.regionMapArchiveIds[var5] = WorldMapSection0.archive5.getGroupId("m" + var13 + "_" + var14); // L: 5545 - class15.regionLandArchiveIds[var5] = WorldMapSection0.archive5.getGroupId("l" + var13 + "_" + var14); // L: 5546 - ++var5; // L: 5547 - } - } - } - } - } - - Actor.method2199(var3, var2, !var15); // L: 5553 - } - - } // L: 5555 - - @ObfuscatedName("lp") - @ObfuscatedSignature( - descriptor = "(IIIZI)V", - garbageValue = "2116886515" - ) - public static void method2239(int var0, int var1, int var2, boolean var3) { - PacketBufferNode var4 = HealthBarDefinition.getPacketBufferNode(ClientPacket.field2650, Client.packetWriter.isaacCipher); // L: 11737 - var4.packetBuffer.method6484(var1); // L: 11738 - var4.packetBuffer.writeInt(var3 ? Client.field839 * 102452491 * -1252190557 : 0); // L: 11739 - var4.packetBuffer.writeByte(var2); // L: 11740 - var4.packetBuffer.method6483(var0); // L: 11741 - Client.packetWriter.addNode(var4); // L: 11742 - } // L: 11743 } diff --git a/runescape-client/src/main/java/Clock.java b/runescape-client/src/main/java/Clock.java index 9d49190759..553c7c9c97 100644 --- a/runescape-client/src/main/java/Clock.java +++ b/runescape-client/src/main/java/Clock.java @@ -1,132 +1,119 @@ 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("ee") +@ObfuscatedName("ez") @Implements("Clock") public abstract class Clock { - @ObfuscatedName("eo") - @ObfuscatedGetter( - intValue = 7166595 - ) - static int field1522; + @ObfuscatedName("tg") + @Export("foundItemIds") + static short[] foundItemIds; Clock() { } // L: 4 - @ObfuscatedName("h") + @ObfuscatedName("v") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "2109522039" + garbageValue = "-1887937791" ) @Export("mark") public abstract void mark(); - @ObfuscatedName("c") + @ObfuscatedName("n") @ObfuscatedSignature( descriptor = "(III)I", - garbageValue = "665432073" + garbageValue = "-1841090229" ) @Export("wait") public abstract int wait(int var1, int var2); - @ObfuscatedName("h") + @ObfuscatedName("f") @ObfuscatedSignature( - descriptor = "(S)Lhm;", - garbageValue = "5230" + descriptor = "(IB)Z", + garbageValue = "-56" ) - public static PacketBufferNode method2590() { - return PacketBufferNode.PacketBufferNode_packetBufferNodeCount == 0 ? new PacketBufferNode() : PacketBufferNode.PacketBufferNode_packetBufferNodes[--PacketBufferNode.PacketBufferNode_packetBufferNodeCount]; // L: 22 23 - } - - @ObfuscatedName("t") - @ObfuscatedSignature( - descriptor = "(I)Lee;", - garbageValue = "-74631623" - ) - public static Clock method2597() { - try { - return new NanoClock(); // L: 8 - } catch (Throwable var1) { // L: 10 - return new MilliClock(); // L: 11 - } - } - - @ObfuscatedName("i") - @ObfuscatedSignature( - descriptor = "(Ljava/lang/String;I)Ljava/lang/String;", - garbageValue = "-1967334125" - ) - public static String method2592(String var0) { - int var1 = var0.length(); // L: 163 - char[] var2 = new char[var1]; // L: 164 - byte var3 = 2; // L: 165 - - for (int var4 = 0; var4 < var1; ++var4) { // L: 166 - char var5 = var0.charAt(var4); // L: 167 - if (var3 == 0) { // L: 168 - var5 = Character.toLowerCase(var5); - } else if (var3 == 2 || Character.isUpperCase(var5)) { // L: 169 - char var6; - if (var5 != 181 && var5 != 402) { // L: 172 - var6 = Character.toTitleCase(var5); // L: 176 - } else { - var6 = var5; // L: 173 - } - - var5 = var6; // L: 178 - } - - if (Character.isLetter(var5)) { // L: 180 - var3 = 0; - } else if (var5 != '.' && var5 != '?' && var5 != '!') { // L: 181 - if (Character.isSpaceChar(var5)) { // L: 182 - if (var3 != 2) { // L: 183 - var3 = 1; - } - } else { - var3 = 1; // L: 185 - } + @Export("loadInterface") + public static boolean loadInterface(int var0) { + if (Widget.Widget_loadedInterfaces[var0]) { // L: 205 + return true; + } else if (!HealthBarUpdate.Widget_archive.tryLoadGroup(var0)) { // L: 206 + return false; + } else { + int var1 = HealthBarUpdate.Widget_archive.getGroupFileCount(var0); // L: 207 + if (var1 == 0) { // L: 208 + Widget.Widget_loadedInterfaces[var0] = true; // L: 209 + return true; // L: 210 } else { - var3 = 2; + if (Widget.Widget_interfaceComponents[var0] == null) { // L: 212 + Widget.Widget_interfaceComponents[var0] = new Widget[var1]; + } + + for (int var2 = 0; var2 < var1; ++var2) { // L: 213 + if (Widget.Widget_interfaceComponents[var0][var2] == null) { // L: 214 + byte[] var3 = HealthBarUpdate.Widget_archive.takeFile(var0, var2); // L: 215 + if (var3 != null) { // L: 216 + Widget.Widget_interfaceComponents[var0][var2] = new Widget(); // L: 217 + Widget.Widget_interfaceComponents[var0][var2].id = var2 + (var0 << 16); // L: 218 + if (var3[0] == -1) { // L: 219 + Widget.Widget_interfaceComponents[var0][var2].decode(new Buffer(var3)); + } else { + Widget.Widget_interfaceComponents[var0][var2].decodeLegacy(new Buffer(var3)); // L: 220 + } + } + } + } + + Widget.Widget_loadedInterfaces[var0] = true; // L: 224 + return true; // L: 225 } - - var2[var4] = var5; // L: 186 } - - return new String(var2); // L: 188 } - @ObfuscatedName("je") + @ObfuscatedName("jd") @ObfuscatedSignature( - descriptor = "(IIIIIIII)V", - garbageValue = "2056453136" + descriptor = "(Lio;IIZI)V", + garbageValue = "-1829145394" ) - @Export("updateRootInterface") - static final void updateRootInterface(int var0, int var1, int var2, int var3, int var4, int var5, int var6) { - if (UserComparator8.loadInterface(var0)) { // L: 10463 - class32.updateInterface(Widget.Widget_interfaceComponents[var0], -1, var1, var2, var3, var4, var5, var6); // L: 10464 - } - } // L: 10465 - - @ObfuscatedName("ll") - @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "1034595766" - ) - static void method2583() { - if (class18.field154 != null) { // L: 11774 - Client.field687 = Client.cycle; // L: 11775 - class18.field154.method5048(); // L: 11776 - - for (int var0 = 0; var0 < Client.players.length; ++var0) { // L: 11777 - if (Client.players[var0] != null) { // L: 11778 - class18.field154.method5037((Client.players[var0].x >> 7) + JagexCache.baseX, (Client.players[var0].y >> 7) + Messages.baseY); // L: 11779 - } - } + @Export("alignWidgetSize") + static void alignWidgetSize(Widget var0, int var1, int var2, boolean var3) { + int var4 = var0.width; // L: 9786 + int var5 = var0.height; // L: 9787 + if (var0.widthAlignment == 0) { // L: 9788 + var0.width = var0.rawWidth; + } else if (var0.widthAlignment == 1) { // L: 9789 + var0.width = var1 - var0.rawWidth; + } else if (var0.widthAlignment == 2) { // L: 9790 + var0.width = var0.rawWidth * var1 >> 14; } - } // L: 11783 + if (var0.heightAlignment == 0) { // L: 9791 + var0.height = var0.rawHeight; + } else if (var0.heightAlignment == 1) { // L: 9792 + var0.height = var2 - var0.rawHeight; + } else if (var0.heightAlignment == 2) { // L: 9793 + var0.height = var2 * var0.rawHeight >> 14; + } + + if (var0.widthAlignment == 4) { // L: 9794 + var0.width = var0.field3060 * var0.height / var0.field2976; + } + + if (var0.heightAlignment == 4) { // L: 9795 + var0.height = var0.width * var0.field2976 / var0.field3060; + } + + if (var0.contentType == 1337) { // L: 9796 + Client.viewportWidget = var0; + } + + if (var3 && var0.onResize != null && (var4 != var0.width || var5 != var0.height)) { // L: 9797 + ScriptEvent var6 = new ScriptEvent(); // L: 9798 + var6.widget = var0; // L: 9799 + var6.args = var0.onResize; // L: 9800 + Client.scriptEvents.addFirst(var6); // L: 9801 + } + + } // L: 9803 } diff --git a/runescape-client/src/main/java/CollisionMap.java b/runescape-client/src/main/java/CollisionMap.java index c0a67e33c5..596a5c002e 100644 --- a/runescape-client/src/main/java/CollisionMap.java +++ b/runescape-client/src/main/java/CollisionMap.java @@ -3,36 +3,41 @@ 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("fa") +@ObfuscatedName("fz") @Implements("CollisionMap") public class CollisionMap { - @ObfuscatedName("al") + @ObfuscatedName("dq") + @ObfuscatedSignature( + descriptor = "Ljp;" + ) + @Export("archive9") + static Archive archive9; + @ObfuscatedName("ag") @ObfuscatedGetter( - intValue = 1848440881 + intValue = 280751135 ) @Export("xInset") - public int xInset; - @ObfuscatedName("ap") + int xInset; + @ObfuscatedName("ax") @ObfuscatedGetter( - intValue = -344240049 + intValue = -992681321 ) @Export("yInset") - public int yInset; - @ObfuscatedName("am") + int yInset; + @ObfuscatedName("as") @ObfuscatedGetter( - intValue = 973299583 + intValue = 960002853 ) @Export("xSize") int xSize; - @ObfuscatedName("ax") + @ObfuscatedName("aj") @ObfuscatedGetter( - intValue = -2082361781 + intValue = 1646122993 ) @Export("ySize") int ySize; - @ObfuscatedName("ak") + @ObfuscatedName("am") @Export("flags") public int[][] flags; @@ -45,10 +50,10 @@ public class CollisionMap { this.clear(); // L: 49 } // L: 50 - @ObfuscatedName("h") + @ObfuscatedName("v") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "2125907821" + garbageValue = "1513589499" ) @Export("clear") public void clear() { @@ -64,12 +69,12 @@ public class CollisionMap { } // L: 59 - @ObfuscatedName("c") + @ObfuscatedName("n") @ObfuscatedSignature( descriptor = "(IIIIZI)V", - garbageValue = "207593472" + garbageValue = "-1946469678" ) - public void method3094(int var1, int var2, int var3, int var4, boolean var5) { + public void method3164(int var1, int var2, int var3, int var4, boolean var5) { var1 -= this.xInset; // L: 62 var2 -= this.yInset; // L: 63 if (var3 == 0) { // L: 64 @@ -84,33 +89,33 @@ public class CollisionMap { } if (var4 == 2) { // L: 73 - this.setFlag(var1, var2, 8); // L: 74 - this.setFlag(var1 + 1, var2, 128); // L: 75 + this.setFlag(var1, var2, 8); + this.setFlag(var1 + 1, var2, 128); } - if (var4 == 3) { // L: 77 + if (var4 == 3) { this.setFlag(var1, var2, 32); // L: 78 - this.setFlag(var1, var2 - 1, 2); // L: 79 + this.setFlag(var1, var2 - 1, 2); } } if (var3 == 1 || var3 == 3) { // L: 82 - if (var4 == 0) { // L: 83 - this.setFlag(var1, var2, 1); // L: 84 - this.setFlag(var1 - 1, var2 + 1, 16); // L: 85 + if (var4 == 0) { + this.setFlag(var1, var2, 1); + this.setFlag(var1 - 1, var2 + 1, 16); } - if (var4 == 1) { // L: 87 - this.setFlag(var1, var2, 4); // L: 88 - this.setFlag(var1 + 1, var2 + 1, 64); // L: 89 + if (var4 == 1) { + this.setFlag(var1, var2, 4); + this.setFlag(var1 + 1, var2 + 1, 64); } - if (var4 == 2) { // L: 91 - this.setFlag(var1, var2, 16); // L: 92 - this.setFlag(var1 + 1, var2 - 1, 1); // L: 93 + if (var4 == 2) { + this.setFlag(var1, var2, 16); + this.setFlag(var1 + 1, var2 - 1, 1); } - if (var4 == 3) { // L: 95 + if (var4 == 3) { this.setFlag(var1, var2, 64); // L: 96 this.setFlag(var1 - 1, var2 - 1, 4); // L: 97 } @@ -216,10 +221,10 @@ public class CollisionMap { } // L: 182 - @ObfuscatedName("o") + @ObfuscatedName("f") @ObfuscatedSignature( - descriptor = "(IIIIZB)V", - garbageValue = "15" + descriptor = "(IIIIZI)V", + garbageValue = "281902458" ) @Export("addGameObject") public void addGameObject(int var1, int var2, int var3, int var4, boolean var5) { @@ -243,10 +248,10 @@ public class CollisionMap { } // L: 196 - @ObfuscatedName("g") + @ObfuscatedName("y") @ObfuscatedSignature( descriptor = "(III)V", - garbageValue = "-1507041806" + garbageValue = "-1025691571" ) @Export("setBlockedByFloor") public void setBlockedByFloor(int var1, int var2) { @@ -256,10 +261,10 @@ public class CollisionMap { var10000[var2] |= 2097152; } // L: 202 - @ObfuscatedName("l") + @ObfuscatedName("p") @ObfuscatedSignature( descriptor = "(III)V", - garbageValue = "-1454787756" + garbageValue = "-323601081" ) @Export("setBlockedByFloorDec") public void setBlockedByFloorDec(int var1, int var2) { @@ -269,10 +274,10 @@ public class CollisionMap { var10000[var2] |= 262144; } // L: 208 - @ObfuscatedName("z") + @ObfuscatedName("j") @ObfuscatedSignature( descriptor = "(IIII)V", - garbageValue = "1498371160" + garbageValue = "1796762342" ) @Export("setFlag") void setFlag(int var1, int var2, int var3) { @@ -280,12 +285,12 @@ public class CollisionMap { var10000[var2] |= var3; } // L: 212 - @ObfuscatedName("t") + @ObfuscatedName("r") @ObfuscatedSignature( descriptor = "(IIIIZI)V", - garbageValue = "68640304" + garbageValue = "2020526331" ) - public void method3099(int var1, int var2, int var3, int var4, boolean var5) { + public void method3156(int var1, int var2, int var3, int var4, boolean var5) { var1 -= this.xInset; // L: 215 var2 -= this.yInset; // L: 216 if (var3 == 0) { // L: 217 @@ -432,10 +437,10 @@ public class CollisionMap { } // L: 335 - @ObfuscatedName("v") + @ObfuscatedName("b") @ObfuscatedSignature( descriptor = "(IIIIIZI)V", - garbageValue = "-573687075" + garbageValue = "1639638094" ) @Export("setFlagOffNonSquare") public void setFlagOffNonSquare(int var1, int var2, int var3, int var4, int var5, boolean var6) { @@ -465,10 +470,10 @@ public class CollisionMap { } // L: 354 - @ObfuscatedName("b") + @ObfuscatedName("d") @ObfuscatedSignature( descriptor = "(IIII)V", - garbageValue = "1089758431" + garbageValue = "-308385855" ) @Export("setFlagOff") void setFlagOff(int var1, int var2, int var3) { @@ -476,127 +481,100 @@ public class CollisionMap { var10000[var2] &= ~var3; } // L: 358 - @ObfuscatedName("q") + @ObfuscatedName("s") @ObfuscatedSignature( descriptor = "(III)V", - garbageValue = "-143187538" + garbageValue = "-118708245" ) - public void method3102(int var1, int var2) { + public void method3150(int var1, int var2) { var1 -= this.xInset; // L: 361 var2 -= this.yInset; // L: 362 int[] var10000 = this.flags[var1]; // L: 363 var10000[var2] &= -262145; } // L: 364 - @ObfuscatedName("w") + @ObfuscatedName("n") @ObfuscatedSignature( - descriptor = "(ILci;ZI)I", - garbageValue = "2011512595" + descriptor = "(II)I", + garbageValue = "832294555" ) - static int method3127(int var0, Script var1, boolean var2) { - int var3; - int var6; - int var9; - if (var0 == ScriptOpcodes.ENUM_STRING) { // L: 2001 - WorldMapCacheName.Interpreter_intStackSize -= 2; // L: 2002 - var3 = Interpreter.Interpreter_intStack[WorldMapCacheName.Interpreter_intStackSize]; // L: 2003 - var9 = Interpreter.Interpreter_intStack[WorldMapCacheName.Interpreter_intStackSize + 1]; // L: 2004 - EnumComposition var10 = ViewportMouse.getEnum(var3); // L: 2005 - if (var10.outputType != 's') { // L: 2006 - } - - for (var6 = 0; var6 < var10.outputCount; ++var6) { // L: 2007 - if (var9 == var10.keys[var6]) { // L: 2008 - Interpreter.Interpreter_stringStack[++class13.Interpreter_stringStackSize - 1] = var10.strVals[var6]; // L: 2009 - var10 = null; // L: 2010 - break; - } - } - - if (var10 != null) { // L: 2014 - Interpreter.Interpreter_stringStack[++class13.Interpreter_stringStackSize - 1] = var10.defaultStr; - } - - return 1; // L: 2015 - } else if (var0 != ScriptOpcodes.ENUM) { // L: 2017 - if (var0 == ScriptOpcodes.ENUM_GETOUTPUTCOUNT) { // L: 2043 - var3 = Interpreter.Interpreter_intStack[--WorldMapCacheName.Interpreter_intStackSize]; // L: 2044 - EnumComposition var4 = ViewportMouse.getEnum(var3); // L: 2045 - Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = var4.size(); // L: 2046 - return 1; // L: 2047 - } else { - return 2; // L: 2049 - } - } else { - WorldMapCacheName.Interpreter_intStackSize -= 4; // L: 2018 - var3 = Interpreter.Interpreter_intStack[WorldMapCacheName.Interpreter_intStackSize]; // L: 2019 - var9 = Interpreter.Interpreter_intStack[WorldMapCacheName.Interpreter_intStackSize + 1]; // L: 2020 - int var5 = Interpreter.Interpreter_intStack[WorldMapCacheName.Interpreter_intStackSize + 2]; // L: 2021 - var6 = Interpreter.Interpreter_intStack[WorldMapCacheName.Interpreter_intStackSize + 3]; // L: 2022 - EnumComposition var7 = ViewportMouse.getEnum(var5); // L: 2023 - if (var3 == var7.inputType && var9 == var7.outputType) { // L: 2024 - for (int var8 = 0; var8 < var7.outputCount; ++var8) { // L: 2029 - if (var6 == var7.keys[var8]) { // L: 2030 - if (var9 == 115) { // L: 2031 - Interpreter.Interpreter_stringStack[++class13.Interpreter_stringStackSize - 1] = var7.strVals[var8]; - } else { - Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = var7.intVals[var8]; // L: 2032 - } - - var7 = null; // L: 2033 - break; - } - } - - if (var7 != null) { // L: 2037 - if (var9 == 115) { - Interpreter.Interpreter_stringStack[++class13.Interpreter_stringStackSize - 1] = var7.defaultStr; // L: 2038 - } else { - Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = var7.defaultInt; // L: 2039 - } - } - - return 1; // L: 2041 - } else { - if (var9 == 115) { // L: 2025 - Interpreter.Interpreter_stringStack[++class13.Interpreter_stringStackSize - 1] = "null"; - } else { - Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = 0; // L: 2026 - } - - return 1; // L: 2027 - } - } + public static int method3185(int var0) { + return class230.field2814[var0]; // L: 38 } - @ObfuscatedName("az") + @ObfuscatedName("r") @ObfuscatedSignature( - descriptor = "(ILci;ZI)I", - garbageValue = "-308143601" + descriptor = "(II)I", + garbageValue = "-687702354" ) - static int method3110(int var0, Script var1, boolean var2) { - if (var0 == 7100) { // L: 4262 - ++WorldMapCacheName.Interpreter_intStackSize; // L: 4263 - return 1; // L: 4264 - } else if (var0 == 7101) { // L: 4266 - class13.Interpreter_stringStackSize += 2; // L: 4267 - return 1; // L: 4268 - } else if (var0 != 7102 && var0 != 7103 && var0 != 7104 && var0 != 7105 && var0 != 7109) { // L: 4270 - if (var0 == 7106) { // L: 4274 - ++WorldMapCacheName.Interpreter_intStackSize; // L: 4275 - return 1; // L: 4276 - } else if (var0 == 7107) { // L: 4278 - ++WorldMapCacheName.Interpreter_intStackSize; // L: 4279 - return 1; // L: 4280 - } else if (var0 == 7108) { // L: 4282 - Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = class11.method190() ? 1 : 0; // L: 4283 - return 1; // L: 4284 - } else { - return 2; // L: 4286 - } - } else { - ++WorldMapCacheName.Interpreter_intStackSize; // L: 4271 - return 1; // L: 4272 + @Export("iLog") + public static int iLog(int var0) { + int var1 = 0; // L: 74 + if (var0 < 0 || var0 >= 65536) { // L: 75 + var0 >>>= 16; // L: 76 + var1 += 16; // L: 77 } + + if (var0 >= 256) { // L: 79 + var0 >>>= 8; // L: 80 + var1 += 8; // L: 81 + } + + if (var0 >= 16) { // L: 83 + var0 >>>= 4; // L: 84 + var1 += 4; // L: 85 + } + + if (var0 >= 4) { // L: 87 + var0 >>>= 2; // L: 88 + var1 += 2; // L: 89 + } + + if (var0 >= 1) { // L: 91 + var0 >>>= 1; // L: 92 + ++var1; // L: 93 + } + + return var0 + var1; // L: 95 } + + @ObfuscatedName("gs") + @ObfuscatedSignature( + descriptor = "(II)V", + garbageValue = "847550164" + ) + @Export("setWindowedMode") + static void setWindowedMode(int var0) { + Client.field858 = 0L; // L: 3913 + if (var0 >= 2) { // L: 3914 + Client.isResizable = true; + } else { + Client.isResizable = false; // L: 3915 + } + + if (SpotAnimationDefinition.getWindowedMode() == 1) { // L: 3916 + class23.client.setMaxCanvasSize(765, 503); // L: 3917 + } else { + class23.client.setMaxCanvasSize(7680, 2160); // L: 3920 + } + + if (Client.gameState >= 25) { // L: 3922 + PacketBufferNode var1 = class21.getPacketBufferNode(ClientPacket.field2662, Client.packetWriter.isaacCipher); // L: 3924 + var1.packetBuffer.writeByte(SpotAnimationDefinition.getWindowedMode()); // L: 3925 + var1.packetBuffer.writeShort(class32.canvasWidth); // L: 3926 + var1.packetBuffer.writeShort(ReflectionCheck.canvasHeight); // L: 3927 + Client.packetWriter.addNode(var1); // L: 3928 + } + + } // L: 3930 + + @ObfuscatedName("kp") + @ObfuscatedSignature( + descriptor = "(B)V", + garbageValue = "16" + ) + static final void method3155() { + Client.field844 = Client.cycleCntr; // L: 11280 + MusicPatch.ClanChat_inClanChat = true; // L: 11281 + } // L: 11282 } diff --git a/runescape-client/src/main/java/Coord.java b/runescape-client/src/main/java/Coord.java index f1556ed4f1..1fe5a3af85 100644 --- a/runescape-client/src/main/java/Coord.java +++ b/runescape-client/src/main/java/Coord.java @@ -4,30 +4,30 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ia") +@ObfuscatedName("ii") @Implements("Coord") public class Coord { - @ObfuscatedName("h") + @ObfuscatedName("v") @ObfuscatedGetter( - intValue = -1443965225 + intValue = -1820038389 ) @Export("plane") public int plane; - @ObfuscatedName("c") + @ObfuscatedName("n") @ObfuscatedGetter( - intValue = 463916309 + intValue = -2092998769 ) @Export("x") public int x; - @ObfuscatedName("o") + @ObfuscatedName("f") @ObfuscatedGetter( - intValue = 759274921 + intValue = 349527629 ) @Export("y") public int y; @ObfuscatedSignature( - descriptor = "(Lia;)V" + descriptor = "(Lii;)V" ) public Coord(Coord var1) { this.plane = var1.plane; // L: 15 @@ -52,40 +52,40 @@ public class Coord { } // L: 27 - @ObfuscatedName("h") + @ObfuscatedName("v") @ObfuscatedSignature( descriptor = "(I)I", - garbageValue = "-1657786881" + garbageValue = "-738811910" ) @Export("packed") public int packed() { return this.plane << 28 | this.x << 14 | this.y; // L: 30 } - @ObfuscatedName("c") + @ObfuscatedName("n") @ObfuscatedSignature( - descriptor = "(Lia;S)Z", - garbageValue = "-559" + descriptor = "(Lii;B)Z", + garbageValue = "-43" ) @Export("equalsCoord") boolean equalsCoord(Coord var1) { - if (this.plane != var1.plane) { // L: 40 + if (this.plane != var1.plane) { return false; - } else if (this.x != var1.x) { // L: 41 + } else if (this.x != var1.x) { return false; } else { - return this.y == var1.y; // L: 42 + return this.y == var1.y; } } - @ObfuscatedName("o") + @ObfuscatedName("f") @ObfuscatedSignature( - descriptor = "(Ljava/lang/String;B)Ljava/lang/String;", - garbageValue = "64" + descriptor = "(Ljava/lang/String;I)Ljava/lang/String;", + garbageValue = "36531623" ) @Export("toString") String toString(String var1) { - return this.plane + var1 + (this.x >> 6) + var1 + (this.y >> 6) + var1 + (this.x & 63) + var1 + (this.y & 63); // L: 55 + return this.plane + var1 + (this.x >> 6) + var1 + (this.y >> 6) + var1 + (this.x & 63) + var1 + (this.y & 63); } public boolean equals(Object var1) { @@ -97,10 +97,217 @@ public class Coord { } public int hashCode() { - return this.packed(); // L: 47 + return this.packed(); } public String toString() { - return this.toString(","); // L: 51 + return this.toString(","); } + + @ObfuscatedName("v") + @ObfuscatedSignature( + descriptor = "(Lnb;B)V", + garbageValue = "-128" + ) + @Export("updatePlayer") + static final void updatePlayer(PacketBuffer var0) { + var0.importIndex(); // L: 37 + int var1 = Client.localPlayerIndex; // L: 38 + Player var2 = class93.localPlayer = Client.players[var1] = new Player(); // L: 39 + var2.index = var1; // L: 40 + int var3 = var0.readBits(30); // L: 41 + byte var4 = (byte)(var3 >> 28); // L: 42 + int var5 = var3 >> 14 & 16383; // L: 43 + int var6 = var3 & 16383; // L: 44 + var2.pathX[0] = var5 - VertexNormal.baseX; // L: 45 + var2.x = (var2.pathX[0] << 7) + (var2.transformedSize() << 6); // L: 46 + var2.pathY[0] = var6 - SoundSystem.baseY; // L: 47 + var2.y = (var2.pathY[0] << 7) + (var2.transformedSize() << 6); // L: 48 + class22.Client_plane = var2.plane = var4; // L: 49 + if (Players.field1374[var1] != null) { // L: 50 + var2.read(Players.field1374[var1]); + } + + Players.Players_count = 0; // L: 51 + Players.Players_indices[++Players.Players_count - 1] = var1; // L: 52 + Players.field1370[var1] = 0; // L: 53 + Players.Players_emptyIdxCount = 0; // L: 54 + + for (int var7 = 1; var7 < 2048; ++var7) { // L: 55 + if (var1 != var7) { // L: 56 + int var8 = var0.readBits(18); // L: 57 + int var9 = var8 >> 16; // L: 58 + int var10 = var8 >> 8 & 597; // L: 59 + int var11 = var8 & 597; // L: 60 + Players.Players_regions[var7] = (var10 << 14) + var11 + (var9 << 28); // L: 61 + Players.Players_orientations[var7] = 0; // L: 62 + Players.Players_targetIndices[var7] = -1; // L: 63 + Players.Players_emptyIndices[++Players.Players_emptyIdxCount - 1] = var7; // L: 64 + Players.field1370[var7] = 0; // L: 65 + } + } + + var0.exportIndex(); // L: 67 + } // L: 68 + + @ObfuscatedName("hm") + @ObfuscatedSignature( + descriptor = "(IIIIII)V", + garbageValue = "1649813812" + ) + @Export("drawObject") + static final void drawObject(int var0, int var1, int var2, int var3, int var4) { + long var5 = AbstractSocket.scene.getBoundaryObjectTag(var0, var1, var2); // L: 5612 + int var7; + int var8; + int var9; + int var10; + int var14; + int var26; + if (var5 != 0L) { // L: 5613 + var7 = AbstractSocket.scene.getObjectFlags(var0, var1, var2, var5); // L: 5614 + var8 = var7 >> 6 & 3; // L: 5615 + var9 = var7 & 31; // L: 5616 + var10 = var3; // L: 5617 + boolean var12 = 0L != var5; // L: 5620 + if (var12) { // L: 5621 + boolean var13 = (int)(var5 >>> 16 & 1L) == 1; // L: 5624 + var12 = !var13; // L: 5626 + } + + if (var12) { // L: 5630 + var10 = var4; + } + + int[] var19 = GameEngine.sceneMinimapSprite.pixels; // L: 5631 + var26 = var1 * 4 + (103 - var2) * 2048 + 24624; // L: 5632 + var14 = class93.Entity_unpackID(var5); // L: 5633 + ObjectComposition var15 = class23.getObjectDefinition(var14); // L: 5634 + if (var15.mapSceneId != -1) { // L: 5635 + IndexedSprite var16 = class10.mapSceneSprites[var15.mapSceneId]; // L: 5636 + if (var16 != null) { // L: 5637 + int var17 = (var15.sizeX * 4 - var16.subWidth) / 2; // L: 5638 + int var18 = (var15.sizeY * 4 - var16.subHeight) / 2; // L: 5639 + var16.drawAt(var1 * 4 + var17 + 48, var18 + (104 - var2 - var15.sizeY) * 4 + 48); // L: 5640 + } + } else { + if (var9 == 0 || var9 == 2) { // L: 5644 + if (var8 == 0) { // L: 5645 + var19[var26] = var10; // L: 5646 + var19[var26 + 512] = var10; // L: 5647 + var19[var26 + 1024] = var10; // L: 5648 + var19[var26 + 1536] = var10; // L: 5649 + } else if (var8 == 1) { // L: 5651 + var19[var26] = var10; // L: 5652 + var19[var26 + 1] = var10; // L: 5653 + var19[var26 + 2] = var10; // L: 5654 + var19[var26 + 3] = var10; // L: 5655 + } else if (var8 == 2) { // L: 5657 + var19[var26 + 3] = var10; // L: 5658 + var19[var26 + 512 + 3] = var10; // L: 5659 + var19[var26 + 1024 + 3] = var10; // L: 5660 + var19[var26 + 1536 + 3] = var10; // L: 5661 + } else if (var8 == 3) { // L: 5663 + var19[var26 + 1536] = var10; // L: 5664 + var19[var26 + 1536 + 1] = var10; // L: 5665 + var19[var26 + 1536 + 2] = var10; // L: 5666 + var19[var26 + 1536 + 3] = var10; // L: 5667 + } + } + + if (var9 == 3) { // L: 5670 + if (var8 == 0) { // L: 5671 + var19[var26] = var10; + } else if (var8 == 1) { // L: 5672 + var19[var26 + 3] = var10; + } else if (var8 == 2) { // L: 5673 + var19[var26 + 1536 + 3] = var10; + } else if (var8 == 3) { // L: 5674 + var19[var26 + 1536] = var10; + } + } + + if (var9 == 2) { // L: 5676 + if (var8 == 3) { // L: 5677 + var19[var26] = var10; // L: 5678 + var19[var26 + 512] = var10; // L: 5679 + var19[var26 + 1024] = var10; // L: 5680 + var19[var26 + 1536] = var10; // L: 5681 + } else if (var8 == 0) { // L: 5683 + var19[var26] = var10; // L: 5684 + var19[var26 + 1] = var10; // L: 5685 + var19[var26 + 2] = var10; // L: 5686 + var19[var26 + 3] = var10; // L: 5687 + } else if (var8 == 1) { // L: 5689 + var19[var26 + 3] = var10; // L: 5690 + var19[var26 + 512 + 3] = var10; // L: 5691 + var19[var26 + 1024 + 3] = var10; // L: 5692 + var19[var26 + 1536 + 3] = var10; // L: 5693 + } else if (var8 == 2) { // L: 5695 + var19[var26 + 1536] = var10; // L: 5696 + var19[var26 + 1536 + 1] = var10; // L: 5697 + var19[var26 + 1536 + 2] = var10; // L: 5698 + var19[var26 + 1536 + 3] = var10; // L: 5699 + } + } + } + } + + var5 = AbstractSocket.scene.getGameObjectTag(var0, var1, var2); // L: 5704 + if (0L != var5) { // L: 5705 + var7 = AbstractSocket.scene.getObjectFlags(var0, var1, var2, var5); // L: 5706 + var8 = var7 >> 6 & 3; // L: 5707 + var9 = var7 & 31; // L: 5708 + var10 = class93.Entity_unpackID(var5); // L: 5709 + ObjectComposition var20 = class23.getObjectDefinition(var10); // L: 5710 + if (var20.mapSceneId != -1) { // L: 5711 + IndexedSprite var28 = class10.mapSceneSprites[var20.mapSceneId]; // L: 5712 + if (var28 != null) { // L: 5713 + var26 = (var20.sizeX * 4 - var28.subWidth) / 2; // L: 5714 + var14 = (var20.sizeY * 4 - var28.subHeight) / 2; // L: 5715 + var28.drawAt(var1 * 4 + var26 + 48, var14 + (104 - var2 - var20.sizeY) * 4 + 48); // L: 5716 + } + } else if (var9 == 9) { // L: 5719 + int var25 = 15658734; // L: 5720 + boolean var27 = var5 != 0L; // L: 5723 + if (var27) { // L: 5724 + boolean var21 = (int)(var5 >>> 16 & 1L) == 1; // L: 5727 + var27 = !var21; // L: 5729 + } + + if (var27) { // L: 5733 + var25 = 15597568; + } + + int[] var22 = GameEngine.sceneMinimapSprite.pixels; // L: 5734 + int var29 = var1 * 4 + (103 - var2) * 2048 + 24624; // L: 5735 + if (var8 != 0 && var8 != 2) { // L: 5736 + var22[var29] = var25; // L: 5743 + var22[var29 + 1 + 512] = var25; // L: 5744 + var22[var29 + 1024 + 2] = var25; // L: 5745 + var22[var29 + 1536 + 3] = var25; // L: 5746 + } else { + var22[var29 + 1536] = var25; // L: 5737 + var22[var29 + 1 + 1024] = var25; // L: 5738 + var22[var29 + 512 + 2] = var25; // L: 5739 + var22[var29 + 3] = var25; // L: 5740 + } + } + } + + var5 = AbstractSocket.scene.getFloorDecorationTag(var0, var1, var2); // L: 5750 + if (var5 != 0L) { // L: 5751 + var7 = class93.Entity_unpackID(var5); // L: 5752 + ObjectComposition var23 = class23.getObjectDefinition(var7); // L: 5753 + if (var23.mapSceneId != -1) { // L: 5754 + IndexedSprite var24 = class10.mapSceneSprites[var23.mapSceneId]; // L: 5755 + if (var24 != null) { // L: 5756 + var10 = (var23.sizeX * 4 - var24.subWidth) / 2; // L: 5757 + int var11 = (var23.sizeY * 4 - var24.subHeight) / 2; // L: 5758 + var24.drawAt(var10 + var1 * 4 + 48, (104 - var2 - var23.sizeY) * 4 + var11 + 48); // L: 5759 + } + } + } + + } // L: 5763 } diff --git a/runescape-client/src/main/java/Decimator.java b/runescape-client/src/main/java/Decimator.java index 8025232738..d8b416a872 100644 --- a/runescape-client/src/main/java/Decimator.java +++ b/runescape-client/src/main/java/Decimator.java @@ -4,175 +4,233 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("bg") +@ObfuscatedName("be") @Implements("Decimator") public class Decimator { - @ObfuscatedName("iq") - @ObfuscatedGetter( - intValue = 1480789945 + @ObfuscatedName("s") + @ObfuscatedSignature( + descriptor = "[Lop;" ) - static int field523; - @ObfuscatedName("g") + @Export("title_muteSprite") + static IndexedSprite[] title_muteSprite; + @ObfuscatedName("l") + @ObfuscatedSignature( + descriptor = "Lop;" + ) + static IndexedSprite field553; + @ObfuscatedName("dh") + @ObfuscatedSignature( + descriptor = "Ljp;" + ) + @Export("archive7") + static Archive archive7; + @ObfuscatedName("dw") + @ObfuscatedSignature( + descriptor = "Ljp;" + ) + @Export("archive13") + static Archive archive13; + @ObfuscatedName("mm") @ObfuscatedGetter( - intValue = -1201795043 + intValue = 1430642749 + ) + @Export("selectedSpellWidget") + static int selectedSpellWidget; + @ObfuscatedName("y") + @ObfuscatedGetter( + intValue = 1278002573 ) @Export("inputRate") int inputRate; - @ObfuscatedName("l") + @ObfuscatedName("p") @ObfuscatedGetter( - intValue = -324273253 + intValue = -308385855 ) @Export("outputRate") int outputRate; - @ObfuscatedName("z") + @ObfuscatedName("j") @Export("table") int[][] table; public Decimator(int var1, int var2) { if (var2 != var1) { // L: 14 - int var4 = var1; // L: 16 - int var5 = var2; // L: 17 - if (var2 > var1) { // L: 19 - var4 = var2; // L: 21 - var5 = var1; // L: 22 - } + int var3 = class386.method6818(var1, var2); // L: 15 + var1 /= var3; // L: 16 + var2 /= var3; // L: 17 + this.inputRate = var1; // L: 18 + this.outputRate = var2; // L: 19 + this.table = new int[var1][14]; // L: 20 - while (var5 != 0) { // L: 24 - int var6 = var4 % var5; // L: 25 - var4 = var5; // L: 26 - var5 = var6; // L: 27 - } - - var1 /= var4; // L: 32 - var2 /= var4; // L: 33 - this.inputRate = var1; // L: 34 - this.outputRate = var2; // L: 35 - this.table = new int[var1][14]; // L: 36 - - for (int var7 = 0; var7 < var1; ++var7) { // L: 37 - int[] var8 = this.table[var7]; // L: 38 - double var9 = (double)var7 / (double)var1 + 6.0D; // L: 39 - int var11 = (int)Math.floor(1.0D + (var9 - 7.0D)); // L: 40 - if (var11 < 0) { // L: 41 - var11 = 0; + for (int var4 = 0; var4 < var1; ++var4) { // L: 21 + int[] var5 = this.table[var4]; // L: 22 + double var6 = (double)var4 / (double)var1 + 6.0D; // L: 23 + int var8 = (int)Math.floor(1.0D + (var6 - 7.0D)); // L: 24 + if (var8 < 0) { // L: 25 + var8 = 0; } - int var12 = (int)Math.ceil(var9 + 7.0D); // L: 42 - if (var12 > 14) { // L: 43 - var12 = 14; + int var9 = (int)Math.ceil(var6 + 7.0D); // L: 26 + if (var9 > 14) { // L: 27 + var9 = 14; } - for (double var13 = (double)var2 / (double)var1; var11 < var12; ++var11) { // L: 44 45 - double var15 = ((double)var11 - var9) * 3.141592653589793D; // L: 46 - double var17 = var13; // L: 47 - if (var15 < -1.0E-4D || var15 > 1.0E-4D) { // L: 48 - var17 = var13 * (Math.sin(var15) / var15); + for (double var10 = (double)var2 / (double)var1; var8 < var9; ++var8) { // L: 28 29 + double var12 = ((double)var8 - var6) * 3.141592653589793D; // L: 30 + double var14 = var10; // L: 31 + if (var12 < -1.0E-4D || var12 > 1.0E-4D) { // L: 32 + var14 = var10 * (Math.sin(var12) / var12); } - var17 *= 0.54D + 0.46D * Math.cos(0.2243994752564138D * ((double)var11 - var9)); // L: 49 - var8[var11] = (int)Math.floor(0.5D + var17 * 65536.0D); // L: 50 + var14 *= 0.54D + 0.46D * Math.cos(0.2243994752564138D * ((double)var8 - var6)); // L: 33 + var5[var8] = (int)Math.floor(var14 * 65536.0D + 0.5D); // L: 34 } } } - } // L: 53 + } // L: 37 - @ObfuscatedName("h") + @ObfuscatedName("v") @ObfuscatedSignature( descriptor = "([BI)[B", - garbageValue = "-1326273381" + garbageValue = "25186157" ) @Export("resample") byte[] resample(byte[] var1) { - if (this.table != null) { // L: 56 - int var2 = (int)((long)var1.length * (long)this.outputRate / (long)this.inputRate) + 14; // L: 57 - int[] var3 = new int[var2]; // L: 58 - int var4 = 0; // L: 59 - int var5 = 0; // L: 60 + if (this.table != null) { // L: 40 + int var2 = (int)((long)var1.length * (long)this.outputRate / (long)this.inputRate) + 14; // L: 41 + int[] var3 = new int[var2]; // L: 42 + int var4 = 0; // L: 43 + int var5 = 0; // L: 44 int var6; - for (var6 = 0; var6 < var1.length; ++var6) { // L: 61 - byte var7 = var1[var6]; // L: 62 - int[] var8 = this.table[var5]; // L: 63 + for (var6 = 0; var6 < var1.length; ++var6) { // L: 45 + byte var7 = var1[var6]; // L: 46 + int[] var8 = this.table[var5]; // L: 47 int var9; - for (var9 = 0; var9 < 14; ++var9) { // L: 64 - var3[var4 + var9] += var7 * var8[var9]; + for (var9 = 0; var9 < 14; ++var9) { // L: 48 + var3[var9 + var4] += var7 * var8[var9]; } - var5 += this.outputRate; // L: 65 - var9 = var5 / this.inputRate; // L: 66 - var4 += var9; // L: 67 - var5 -= var9 * this.inputRate; // L: 68 + var5 += this.outputRate; // L: 49 + var9 = var5 / this.inputRate; // L: 50 + var4 += var9; // L: 51 + var5 -= var9 * this.inputRate; // L: 52 } - var1 = new byte[var2]; // L: 70 + var1 = new byte[var2]; // L: 54 - for (var6 = 0; var6 < var2; ++var6) { // L: 71 - int var10 = var3[var6] + 32768 >> 16; // L: 72 - if (var10 < -128) { // L: 73 + for (var6 = 0; var6 < var2; ++var6) { // L: 55 + int var10 = var3[var6] + 32768 >> 16; // L: 56 + if (var10 < -128) { // L: 57 var1[var6] = -128; - } else if (var10 > 127) { // L: 74 + } else if (var10 > 127) { // L: 58 var1[var6] = 127; } else { - var1[var6] = (byte)var10; // L: 75 + var1[var6] = (byte)var10; // L: 59 } } } - return var1; // L: 78 + return var1; // L: 62 } - @ObfuscatedName("c") + @ObfuscatedName("n") @ObfuscatedSignature( descriptor = "(II)I", - garbageValue = "-320971908" + garbageValue = "-202023878" ) @Export("scaleRate") int scaleRate(int var1) { - if (this.table != null) { - var1 = (int)((long)this.outputRate * (long)var1 / (long)this.inputRate); // L: 82 + if (this.table != null) { // L: 66 + var1 = (int)((long)this.outputRate * (long)var1 / (long)this.inputRate); } - return var1; // L: 83 + return var1; // L: 67 + } + + @ObfuscatedName("f") + @ObfuscatedSignature( + descriptor = "(II)I", + garbageValue = "1042913417" + ) + @Export("scalePosition") + int scalePosition(int var1) { + if (this.table != null) { // L: 71 + var1 = (int)((long)var1 * (long)this.outputRate / (long)this.inputRate) + 6; + } + + return var1; // L: 72 } @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "(II)I", - garbageValue = "-1393284558" + descriptor = "(Ljv;II)Z", + garbageValue = "-1461937174" ) - @Export("scalePosition") - int scalePosition(int var1) { - if (this.table != null) { // L: 87 - var1 = (int)((long)var1 * (long)this.outputRate / (long)this.inputRate) + 6; - } - - return var1; // L: 88 - } - - @ObfuscatedName("as") - @ObfuscatedSignature( - descriptor = "(ILci;ZI)I", - garbageValue = "-174373717" - ) - static int method1111(int var0, Script var1, boolean var2) { - if (var0 == 6800) { // L: 4185 - ++class13.Interpreter_stringStackSize; // L: 4186 - return 1; // L: 4187 - } else if (var0 != 6801 && var0 != 6802) { // L: 4189 - if (var0 == 6850) { // L: 4193 - ++class13.Interpreter_stringStackSize; // L: 4194 - return 1; // L: 4195 - } else if (var0 != 6851 && var0 != 6852) { // L: 4197 - return 2; // L: 4201 - } else { - ++WorldMapCacheName.Interpreter_intStackSize; // L: 4198 - return 1; // L: 4199 - } + static boolean method1075(AbstractArchive var0, int var1) { + byte[] var2 = var0.takeFileFlat(var1); // L: 189 + if (var2 == null) { // L: 190 + return false; } else { - ++WorldMapCacheName.Interpreter_intStackSize; // L: 4190 - return 1; // L: 4191 + ItemLayer.SpriteBuffer_decode(var2); // L: 191 + return true; // L: 192 } } + + @ObfuscatedName("x") + @ObfuscatedSignature( + descriptor = "(I)V", + garbageValue = "-1064690457" + ) + public static void method1073() { + ItemComposition.ItemDefinition_cachedSprites.clear(); // L: 542 + } // L: 543 + + @ObfuscatedName("fy") + @ObfuscatedSignature( + descriptor = "(Lfl;IIII)V", + garbageValue = "-1353639896" + ) + static void method1074(SequenceDefinition var0, int var1, int var2, int var3) { + if (Client.soundEffectCount < 50 && ObjectComposition.clientPreferences.areaSoundEffectsVolume != 0) { // L: 3358 + if (var0.soundEffects != null && var1 < var0.soundEffects.length) { // L: 3359 + int var4 = var0.soundEffects[var1]; // L: 3360 + if (var4 != 0) { // L: 3361 + int var5 = var4 >> 8; // L: 3362 + int var6 = var4 >> 4 & 7; // L: 3363 + int var7 = var4 & 15; // L: 3364 + Client.soundEffectIds[Client.soundEffectCount] = var5; // L: 3365 + Client.queuedSoundEffectLoops[Client.soundEffectCount] = var6; // L: 3366 + Client.queuedSoundEffectDelays[Client.soundEffectCount] = 0; // L: 3367 + Client.soundEffects[Client.soundEffectCount] = null; // L: 3368 + int var8 = (var2 - 64) / 128; // L: 3369 + int var9 = (var3 - 64) / 128; // L: 3370 + Client.soundLocations[Client.soundEffectCount] = var7 + (var9 << 8) + (var8 << 16); // L: 3371 + ++Client.soundEffectCount; // L: 3372 + } + } + } + } // L: 3373 + + @ObfuscatedName("gx") + @ObfuscatedSignature( + descriptor = "(B)V", + garbageValue = "5" + ) + static void method1068() { + if (Client.renderSelf) { // L: 4340 + NetSocket.addPlayerToScene(class93.localPlayer, false); // L: 4341 + } + + } // L: 4343 + + @ObfuscatedName("kd") + @ObfuscatedSignature( + descriptor = "(I)V", + garbageValue = "-2146015753" + ) + static final void method1071() { + Client.field836 = Client.cycleCntr; // L: 11276 + } // L: 11277 } diff --git a/runescape-client/src/main/java/DefaultsGroup.java b/runescape-client/src/main/java/DefaultsGroup.java index e7888bf9f9..73f060694d 100644 --- a/runescape-client/src/main/java/DefaultsGroup.java +++ b/runescape-client/src/main/java/DefaultsGroup.java @@ -1,26 +1,32 @@ +import java.awt.FontMetrics; 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("lz") +@ObfuscatedName("lf") @Implements("DefaultsGroup") public class DefaultsGroup { - @ObfuscatedName("h") + @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "Llz;" + descriptor = "Llf;" ) - static final DefaultsGroup field3903; + static final DefaultsGroup field3892; @ObfuscatedName("c") + static int[] field3894; + @ObfuscatedName("ad") + @Export("loginScreenFontMetrics") + static FontMetrics loginScreenFontMetrics; + @ObfuscatedName("n") @ObfuscatedGetter( - intValue = 1585130707 + intValue = -1567646551 ) @Export("group") final int group; static { - field3903 = new DefaultsGroup(3); // L: 4 + field3892 = new DefaultsGroup(3); // L: 4 } DefaultsGroup(int var1) { diff --git a/runescape-client/src/main/java/DemotingHashTable.java b/runescape-client/src/main/java/DemotingHashTable.java index dc27491f75..227e5983de 100644 --- a/runescape-client/src/main/java/DemotingHashTable.java +++ b/runescape-client/src/main/java/DemotingHashTable.java @@ -3,32 +3,32 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("hl") +@ObfuscatedName("hn") @Implements("DemotingHashTable") public final class DemotingHashTable { - @ObfuscatedName("h") + @ObfuscatedName("v") @Export("capacity") int capacity; - @ObfuscatedName("c") + @ObfuscatedName("n") @Export("remaining") int remaining; - @ObfuscatedName("o") + @ObfuscatedName("f") @ObfuscatedSignature( - descriptor = "Lmo;" + descriptor = "Lmr;" ) @Export("hashTable") IterableNodeHashTable hashTable; - @ObfuscatedName("g") + @ObfuscatedName("y") @ObfuscatedSignature( - descriptor = "Lkd;" + descriptor = "Lko;" ) @Export("queue") IterableDualNodeQueue queue; - @ObfuscatedName("l") + @ObfuscatedName("p") @ObfuscatedSignature( - descriptor = "Lhq;" + descriptor = "Lhh;" ) - class217 field2553; + class217 field2563; public DemotingHashTable(int var1, int var2) { this.queue = new IterableDualNodeQueue(); // L: 11 @@ -46,7 +46,7 @@ public final class DemotingHashTable { this(var1, var1); // L: 15 } // L: 16 - @ObfuscatedName("h") + @ObfuscatedName("v") @Export("get") public Object get(long var1) { Wrapper var3 = (Wrapper)this.hashTable.get(var1); // L: 27 @@ -77,16 +77,16 @@ public final class DemotingHashTable { } } - @ObfuscatedName("c") + @ObfuscatedName("n") @Export("remove") void remove(long var1) { Wrapper var3 = (Wrapper)this.hashTable.get(var1); // L: 52 this.removeWrapper(var3); // L: 53 } // L: 54 - @ObfuscatedName("o") + @ObfuscatedName("f") @ObfuscatedSignature( - descriptor = "(Lhx;)V" + descriptor = "(Lhe;)V" ) @Export("removeWrapper") void removeWrapper(Wrapper var1) { @@ -98,12 +98,12 @@ public final class DemotingHashTable { } // L: 62 - @ObfuscatedName("g") - public void method4249(Object var1, long var2) { + @ObfuscatedName("y") + public void method4290(Object var1, long var2) { this.put(var1, var2, 1); // L: 65 } // L: 66 - @ObfuscatedName("l") + @ObfuscatedName("p") @Export("put") public void put(Object var1, long var2, int var4) { if (var4 > this.capacity) { // L: 69 @@ -122,8 +122,8 @@ public final class DemotingHashTable { } this.removeWrapper(var5); // L: 78 - if (this.field2553 != null) { // L: 79 - this.field2553.method4244(var5.get()); // L: 80 + if (this.field2563 != null) { // L: 79 + this.field2563.method4282(var5.get()); // L: 80 } } @@ -134,7 +134,7 @@ public final class DemotingHashTable { } } // L: 87 - @ObfuscatedName("z") + @ObfuscatedName("j") @Export("demote") public void demote(int var1) { for (Wrapper var2 = (Wrapper)this.queue.last(); var2 != null; var2 = (Wrapper)this.queue.previous()) { // L: 90 @@ -155,7 +155,7 @@ public final class DemotingHashTable { } // L: 109 - @ObfuscatedName("t") + @ObfuscatedName("r") @Export("clear") public void clear() { this.queue.clear(); // L: 112 diff --git a/runescape-client/src/main/java/DesktopPlatformInfoProvider.java b/runescape-client/src/main/java/DesktopPlatformInfoProvider.java index d41694f01e..bfbb980b11 100644 --- a/runescape-client/src/main/java/DesktopPlatformInfoProvider.java +++ b/runescape-client/src/main/java/DesktopPlatformInfoProvider.java @@ -1,41 +1,54 @@ +import java.util.Iterator; 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("my") +@ObfuscatedName("mb") @Implements("DesktopPlatformInfoProvider") public class DesktopPlatformInfoProvider implements PlatformInfoProvider { - @ObfuscatedName("g") - @ObfuscatedGetter( - intValue = -809794169 - ) - int field3953; - @ObfuscatedName("l") - @ObfuscatedGetter( - intValue = 703568573 - ) - int field3950; - @ObfuscatedName("z") - @ObfuscatedGetter( - intValue = -2108631699 - ) - int field3955; - - @ObfuscatedName("h") + @ObfuscatedName("rm") @ObfuscatedSignature( - descriptor = "(I)Lms;", - garbageValue = "-741799305" + descriptor = "Lbd;" + ) + @Export("pcmPlayer0") + static PcmPlayer pcmPlayer0; + @ObfuscatedName("em") + @ObfuscatedGetter( + intValue = 1745891823 + ) + @Export("currentPort") + static int currentPort; + @ObfuscatedName("y") + @ObfuscatedGetter( + intValue = -1520925295 + ) + int field3946; + @ObfuscatedName("p") + @ObfuscatedGetter( + intValue = -1280779565 + ) + int field3940; + @ObfuscatedName("j") + @ObfuscatedGetter( + intValue = 1746870345 + ) + int field3945; + + @ObfuscatedName("v") + @ObfuscatedSignature( + descriptor = "(B)Lmy;", + garbageValue = "-10" ) @Export("get") public PlatformInfo get() { byte var1; - if (EnumComposition.formattedOperatingSystemName.startsWith("win")) { // L: 15 + if (UserComparator5.formattedOperatingSystemName.startsWith("win")) { // L: 15 var1 = 1; - } else if (EnumComposition.formattedOperatingSystemName.startsWith("mac")) { // L: 16 + } else if (UserComparator5.formattedOperatingSystemName.startsWith("mac")) { // L: 16 var1 = 2; - } else if (EnumComposition.formattedOperatingSystemName.startsWith("linux")) { // L: 17 + } else if (UserComparator5.formattedOperatingSystemName.startsWith("linux")) { // L: 17 var1 = 3; } else { var1 = 4; // L: 18 @@ -96,23 +109,23 @@ public class DesktopPlatformInfoProvider implements PlatformInfoProvider { } else if (var3.indexOf("10.0") != -1) { // L: 55 var7 = 11; } - } else if (var1 == 2) { // L: 57 - if (var3.indexOf("10.4") != -1) { // L: 58 + } else if (var1 == 2) { + if (var3.indexOf("10.4") != -1) { var7 = 20; } else if (var3.indexOf("10.5") != -1) { // L: 59 var7 = 21; - } else if (var3.indexOf("10.6") != -1) { // L: 60 + } else if (var3.indexOf("10.6") != -1) { var7 = 22; } else if (var3.indexOf("10.7") != -1) { // L: 61 var7 = 23; } else if (var3.indexOf("10.8") != -1) { // L: 62 var7 = 24; - } else if (var3.indexOf("10.9") != -1) { // L: 63 + } else if (var3.indexOf("10.9") != -1) { var7 = 25; } else if (var3.indexOf("10.10") != -1) { // L: 64 var7 = 26; - } else if (var3.indexOf("10.11") != -1) { - var7 = 27; // L: 65 + } else if (var3.indexOf("10.11") != -1) { // L: 65 + var7 = 27; } else if (var3.indexOf("10.12") != -1) { // L: 66 var7 = 28; } else if (var3.indexOf("10.13") != -1) { // L: 67 @@ -133,10 +146,10 @@ public class DesktopPlatformInfoProvider implements PlatformInfoProvider { var8 = 4; // L: 74 } - this.method5919(var5); // L: 75 + this.method6063(var5); // L: 75 int var10 = (int)(Runtime.getRuntime().maxMemory() / 1048576L) + 1; // L: 77 int var11; - if (this.field3953 > 3) { // L: 80 + if (this.field3946 > 3) { // L: 80 var11 = Runtime.getRuntime().availableProcessors(); } else { var11 = 0; // L: 81 @@ -150,55 +163,120 @@ public class DesktopPlatformInfoProvider implements PlatformInfoProvider { String var17 = ""; // L: 87 String var18 = ""; // L: 88 int[] var23 = new int[3]; // L: 93 - return new PlatformInfo(var1, var24, var7, var8, this.field3953, this.field3950, this.field3955, false, var10, var11, var12, 0, var13, var14, var15, var16, 0, 0, 0, 0, var17, var18, var23, 0, ""); // L: 97 + return new PlatformInfo(var1, var24, var7, var8, this.field3946, this.field3940, this.field3945, false, var10, var11, var12, 0, var13, var14, var15, var16, 0, 0, 0, 0, var17, var18, var23, 0, ""); // L: 97 } - @ObfuscatedName("c") + @ObfuscatedName("n") @ObfuscatedSignature( descriptor = "(Ljava/lang/String;B)V", - garbageValue = "52" + garbageValue = "-33" ) - void method5919(String var1) { + void method6063(String var1) { if (var1.startsWith("1.")) { // L: 101 - this.method5906(var1); // L: 102 + this.method6064(var1); // L: 102 } else { - this.method5907(var1); // L: 105 + this.method6078(var1); // L: 105 } } // L: 107 - @ObfuscatedName("o") + @ObfuscatedName("f") @ObfuscatedSignature( - descriptor = "(Ljava/lang/String;I)V", - garbageValue = "1601356504" + descriptor = "(Ljava/lang/String;B)V", + garbageValue = "94" ) - void method5906(String var1) { + void method6064(String var1) { String[] var2 = var1.split("\\."); // L: 110 try { - this.field3953 = Integer.parseInt(var2[1]); // L: 112 + this.field3946 = Integer.parseInt(var2[1]); // L: 112 var2 = var2[2].split("_"); // L: 113 - this.field3950 = Integer.parseInt(var2[0]); // L: 114 - this.field3955 = Integer.parseInt(var2[1]); // L: 115 + this.field3940 = Integer.parseInt(var2[0]); // L: 114 + this.field3945 = Integer.parseInt(var2[1]); // L: 115 } catch (Exception var4) { // L: 117 } } // L: 118 - @ObfuscatedName("g") + @ObfuscatedName("y") @ObfuscatedSignature( - descriptor = "(Ljava/lang/String;B)V", - garbageValue = "1" + descriptor = "(Ljava/lang/String;I)V", + garbageValue = "-1652585717" ) - void method5907(String var1) { + void method6078(String var1) { String[] var2 = var1.split("\\."); // L: 121 try { - this.field3953 = Integer.parseInt(var2[0]); // L: 123 - this.field3950 = Integer.parseInt(var2[1]); // L: 124 - this.field3955 = Integer.parseInt(var2[2]); // L: 125 + this.field3946 = Integer.parseInt(var2[0]); // L: 123 + this.field3940 = Integer.parseInt(var2[1]); // L: 124 + this.field3945 = Integer.parseInt(var2[2]); // L: 125 } catch (Exception var4) { // L: 127 } } // L: 128 + + @ObfuscatedName("p") + @ObfuscatedSignature( + descriptor = "(IIIZIZI)V", + garbageValue = "848721482" + ) + @Export("doWorldSorting") + static void doWorldSorting(int var0, int var1, int var2, boolean var3, int var4, boolean var5) { + if (var0 < var1) { // L: 177 + int var6 = (var0 + var1) / 2; // L: 178 + int var7 = var0; // L: 179 + World var8 = Tiles.World_worlds[var6]; // L: 180 + Tiles.World_worlds[var6] = Tiles.World_worlds[var1]; // L: 181 + Tiles.World_worlds[var1] = var8; // L: 182 + + for (int var9 = var0; var9 < var1; ++var9) { // L: 183 + World var11 = Tiles.World_worlds[var9]; // L: 185 + int var12 = class12.compareWorlds(var11, var8, var2, var3); // L: 187 + int var10; + if (var12 != 0) { // L: 188 + if (var3) { // L: 189 + var10 = -var12; // L: 190 + } else { + var10 = var12; // L: 194 + } + } else if (var4 == -1) { // L: 198 + var10 = 0; // L: 199 + } else { + int var13 = class12.compareWorlds(var11, var8, var4, var5); // L: 202 + if (var5) { // L: 203 + var10 = -var13; + } else { + var10 = var13; // L: 204 + } + } + + if (var10 <= 0) { // L: 206 + World var14 = Tiles.World_worlds[var9]; // L: 207 + Tiles.World_worlds[var9] = Tiles.World_worlds[var7]; // L: 208 + Tiles.World_worlds[var7++] = var14; // L: 209 + } + } + + Tiles.World_worlds[var1] = Tiles.World_worlds[var7]; // L: 213 + Tiles.World_worlds[var7] = var8; // L: 214 + doWorldSorting(var0, var7 - 1, var2, var3, var4, var5); // L: 215 + doWorldSorting(var7 + 1, var1, var2, var3, var4, var5); // L: 216 + } + + } // L: 218 + + @ObfuscatedName("r") + @ObfuscatedSignature( + descriptor = "(B)V", + garbageValue = "1" + ) + static void method6068() { + Iterator var0 = Messages.Messages_hashTable.iterator(); // L: 57 + + while (var0.hasNext()) { + Message var1 = (Message)var0.next(); // L: 58 + var1.clearIsFromIgnored(); // L: 60 + } + + } // L: 63 } diff --git a/runescape-client/src/main/java/DevicePcmPlayer.java b/runescape-client/src/main/java/DevicePcmPlayer.java index 63e1468493..0fdf4803dc 100644 --- a/runescape-client/src/main/java/DevicePcmPlayer.java +++ b/runescape-client/src/main/java/DevicePcmPlayer.java @@ -9,55 +9,55 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("au") +@ObfuscatedName("at") @Implements("DevicePcmPlayer") public class DevicePcmPlayer extends PcmPlayer { - @ObfuscatedName("h") + @ObfuscatedName("v") @Export("format") AudioFormat format; - @ObfuscatedName("c") + @ObfuscatedName("n") @Export("line") SourceDataLine line; - @ObfuscatedName("o") + @ObfuscatedName("f") @ObfuscatedGetter( - intValue = -736963931 + intValue = -1982491607 ) @Export("capacity2") int capacity2; - @ObfuscatedName("g") + @ObfuscatedName("y") @Export("byteSamples") byte[] byteSamples; DevicePcmPlayer() { } // L: 18 - @ObfuscatedName("h") + @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "1996880040" + descriptor = "(B)V", + garbageValue = "4" ) @Export("init") protected void init() { - this.format = new AudioFormat((float)PcmPlayer.field401, 16, ApproximateRouteStrategy.PcmPlayer_stereo ? 2 : 1, true, false); // L: 21 - this.byteSamples = new byte[256 << (ApproximateRouteStrategy.PcmPlayer_stereo ? 2 : 1)]; // L: 22 + this.format = new AudioFormat((float)PcmPlayer.field428, 16, PcmPlayer.PcmPlayer_stereo ? 2 : 1, true, false); // L: 21 + this.byteSamples = new byte[256 << (PcmPlayer.PcmPlayer_stereo ? 2 : 1)]; // L: 22 } // L: 23 - @ObfuscatedName("c") + @ObfuscatedName("n") @ObfuscatedSignature( - descriptor = "(II)V", - garbageValue = "-1272180581" + descriptor = "(IS)V", + garbageValue = "-6942" ) @Export("open") protected void open(int var1) throws LineUnavailableException { try { - Info var2 = new Info(SourceDataLine.class, this.format, var1 << (ApproximateRouteStrategy.PcmPlayer_stereo ? 2 : 1)); // L: 27 + Info var2 = new Info(SourceDataLine.class, this.format, var1 << (PcmPlayer.PcmPlayer_stereo ? 2 : 1)); // L: 27 this.line = (SourceDataLine)AudioSystem.getLine(var2); // L: 28 this.line.open(); // L: 29 this.line.start(); // L: 30 this.capacity2 = var1; // L: 31 } catch (LineUnavailableException var3) { // L: 33 - if (ItemContainer.method2104(var1) != 1) { // L: 34 - this.open(MouseRecorder.method2126(var1)); // L: 35 + if (SequenceDefinition.method3149(var1) != 1) { // L: 34 + this.open(Player.method2128(var1)); // L: 35 } else { this.line = null; // L: 38 throw var3; // L: 39 @@ -65,21 +65,21 @@ public class DevicePcmPlayer extends PcmPlayer { } } // L: 36 41 - @ObfuscatedName("o") + @ObfuscatedName("f") @ObfuscatedSignature( - descriptor = "(S)I", - garbageValue = "-10918" + descriptor = "(B)I", + garbageValue = "-42" ) @Export("position") protected int position() { - return this.capacity2 - (this.line.available() >> (ApproximateRouteStrategy.PcmPlayer_stereo ? 2 : 1)); // L: 44 + return this.capacity2 - (this.line.available() >> (PcmPlayer.PcmPlayer_stereo ? 2 : 1)); // L: 44 } - @ObfuscatedName("g") + @ObfuscatedName("y") @Export("write") protected void write() { int var1 = 256; // L: 49 - if (ApproximateRouteStrategy.PcmPlayer_stereo) { // L: 50 + if (PcmPlayer.PcmPlayer_stereo) { // L: 50 var1 <<= 1; } @@ -96,10 +96,10 @@ public class DevicePcmPlayer extends PcmPlayer { this.line.write(this.byteSamples, 0, var1 << 1); // L: 59 } // L: 60 - @ObfuscatedName("l") + @ObfuscatedName("p") @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "-1221564732" + descriptor = "(S)V", + garbageValue = "4345" ) @Export("close") protected void close() { @@ -110,10 +110,10 @@ public class DevicePcmPlayer extends PcmPlayer { } // L: 67 - @ObfuscatedName("z") + @ObfuscatedName("j") @ObfuscatedSignature( - descriptor = "(B)V", - garbageValue = "30" + descriptor = "(I)V", + garbageValue = "-2070498959" ) @Export("discard") protected void discard() { diff --git a/runescape-client/src/main/java/DevicePcmPlayerProvider.java b/runescape-client/src/main/java/DevicePcmPlayerProvider.java index 93f9605203..663c5d311c 100644 --- a/runescape-client/src/main/java/DevicePcmPlayerProvider.java +++ b/runescape-client/src/main/java/DevicePcmPlayerProvider.java @@ -2,101 +2,304 @@ 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("ai") +@ObfuscatedName("av") @Implements("DevicePcmPlayerProvider") public class DevicePcmPlayerProvider implements PlayerProvider { DevicePcmPlayerProvider() { } // L: 7 - @ObfuscatedName("h") + @ObfuscatedName("v") @ObfuscatedSignature( descriptor = "(I)Lbd;", - garbageValue = "65542938" + garbageValue = "-597712139" ) @Export("player") public PcmPlayer player() { return new DevicePcmPlayer(); // L: 10 } - @ObfuscatedName("c") + @ObfuscatedName("r") @ObfuscatedSignature( - descriptor = "(II)Liv;", - garbageValue = "-159166525" + descriptor = "(CI)Z", + garbageValue = "228217886" ) - @Export("getWidget") - public static Widget getWidget(int var0) { - int var1 = var0 >> 16; // L: 197 - int var2 = var0 & 65535; // L: 198 - if (Widget.Widget_interfaceComponents[var1] == null || Widget.Widget_interfaceComponents[var1][var2] == null) { // L: 199 - boolean var3 = UserComparator8.loadInterface(var1); // L: 200 - if (!var3) { // L: 201 - return null; - } - } - - return Widget.Widget_interfaceComponents[var1][var2]; // L: 203 + static boolean method385(char var0) { + return "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789!\"£$%^&*()-_=+[{]};:'@#~,<.>/?\\| ".indexOf(var0) != -1; // L: 758 } - @ObfuscatedName("l") + @ObfuscatedName("s") @ObfuscatedSignature( - descriptor = "(ILci;ZI)I", - garbageValue = "1197541083" + descriptor = "(IIIZII)J", + garbageValue = "-591767217" ) - static int method454(int var0, Script var1, boolean var2) { - int var3 = -1; // L: 555 - Widget var4; - if (var0 >= 2000) { // L: 557 - var0 -= 1000; // L: 558 - var3 = Interpreter.Interpreter_intStack[--WorldMapCacheName.Interpreter_intStackSize]; // L: 559 - var4 = getWidget(var3); // L: 560 - } else { - var4 = var2 ? class308.scriptDotWidget : class24.scriptActiveWidget; // L: 562 + @Export("calculateTag") + public static long calculateTag(int var0, int var1, int var2, boolean var3, int var4) { + long var5 = (long)((var0 & 127) << 0 | (var1 & 127) << 7 | (var2 & 3) << 14) | ((long)var4 & 4294967295L) << 17; // L: 89 + if (var3) { // L: 90 + var5 |= 65536L; } - if (var0 == ScriptOpcodes.CC_SETPOSITION) { // L: 563 - WorldMapCacheName.Interpreter_intStackSize -= 4; // L: 564 - var4.rawX = Interpreter.Interpreter_intStack[WorldMapCacheName.Interpreter_intStackSize]; // L: 565 - var4.rawY = Interpreter.Interpreter_intStack[WorldMapCacheName.Interpreter_intStackSize + 1]; // L: 566 - var4.xAlignment = Interpreter.Interpreter_intStack[WorldMapCacheName.Interpreter_intStackSize + 2]; // L: 567 - var4.yAlignment = Interpreter.Interpreter_intStack[WorldMapCacheName.Interpreter_intStackSize + 3]; // L: 568 - VerticalAlignment.invalidateWidget(var4); // L: 569 - class303.client.alignWidget(var4); // L: 570 - if (var3 != -1 && var4.type == 0) { // L: 571 - ApproximateRouteStrategy.revalidateWidgetScroll(Widget.Widget_interfaceComponents[var3 >> 16], var4, false); - } - - return 1; // L: 572 - } else if (var0 == ScriptOpcodes.CC_SETSIZE) { // L: 574 - WorldMapCacheName.Interpreter_intStackSize -= 4; // L: 575 - var4.rawWidth = Interpreter.Interpreter_intStack[WorldMapCacheName.Interpreter_intStackSize]; // L: 576 - var4.rawHeight = Interpreter.Interpreter_intStack[WorldMapCacheName.Interpreter_intStackSize + 1]; // L: 577 - var4.widthAlignment = Interpreter.Interpreter_intStack[WorldMapCacheName.Interpreter_intStackSize + 2]; // L: 578 - var4.heightAlignment = Interpreter.Interpreter_intStack[WorldMapCacheName.Interpreter_intStackSize + 3]; // L: 579 - VerticalAlignment.invalidateWidget(var4); // L: 580 - class303.client.alignWidget(var4); // L: 581 - if (var3 != -1 && var4.type == 0) { // L: 582 - ApproximateRouteStrategy.revalidateWidgetScroll(Widget.Widget_interfaceComponents[var3 >> 16], var4, false); - } - - return 1; // L: 583 - } else if (var0 == ScriptOpcodes.CC_SETHIDE) { // L: 585 - boolean var5 = Interpreter.Interpreter_intStack[--WorldMapCacheName.Interpreter_intStackSize] == 1; // L: 586 - if (var5 != var4.isHidden) { // L: 587 - var4.isHidden = var5; // L: 588 - VerticalAlignment.invalidateWidget(var4); // L: 589 - } - - return 1; // L: 591 - } else if (var0 == ScriptOpcodes.CC_SETNOCLICKTHROUGH) { // L: 593 - var4.noClickThrough = Interpreter.Interpreter_intStack[--WorldMapCacheName.Interpreter_intStackSize] == 1; // L: 594 - return 1; // L: 595 - } else if (var0 == ScriptOpcodes.CC_SETNOSCROLLTHROUGH) { // L: 597 - var4.noScrollThrough = Interpreter.Interpreter_intStack[--WorldMapCacheName.Interpreter_intStackSize] == 1; // L: 598 - return 1; // L: 599 - } else { - return 2; // L: 601 - } + return var5; // L: 91 } + + @ObfuscatedName("a") + @ObfuscatedSignature( + descriptor = "(IIIIIIILgt;Lfz;B)V", + garbageValue = "85" + ) + static final void method386(int var0, int var1, int var2, int var3, int var4, int var5, int var6, Scene var7, CollisionMap var8) { + ObjectComposition var9 = class23.getObjectDefinition(var4); // L: 877 + int var10; + int var11; + if (var5 != 1 && var5 != 3) { // L: 880 + var10 = var9.sizeX; // L: 885 + var11 = var9.sizeY; // L: 886 + } else { + var10 = var9.sizeY; // L: 881 + var11 = var9.sizeX; // L: 882 + } + + int var12; + int var13; + if (var10 + var2 <= 104) { // L: 892 + var12 = (var10 >> 1) + var2; // L: 893 + var13 = var2 + (var10 + 1 >> 1); // L: 894 + } else { + var12 = var2; // L: 897 + var13 = var2 + 1; // L: 898 + } + + int var14; + int var15; + if (var3 + var11 <= 104) { // L: 900 + var14 = var3 + (var11 >> 1); // L: 901 + var15 = var3 + (var11 + 1 >> 1); // L: 902 + } else { + var14 = var3; // L: 905 + var15 = var3 + 1; // L: 906 + } + + int[][] var16 = Tiles.Tiles_heights[var1]; // L: 908 + int var17 = var16[var13][var15] + var16[var13][var14] + var16[var12][var14] + var16[var12][var15] >> 2; // L: 909 + int var18 = (var2 << 7) + (var10 << 6); // L: 910 + int var19 = (var3 << 7) + (var11 << 6); // L: 911 + long var20 = calculateTag(var2, var3, 2, var9.int1 == 0, var4); // L: 912 + int var22 = (var5 << 6) + var6; // L: 913 + if (var9.int3 == 1) { // L: 914 + var22 += 256; + } + + Object var30; + if (var6 == 22) { // L: 915 + if (var9.animationId == -1 && var9.transforms == null) { // L: 917 + var30 = var9.getModel(22, var5, var16, var18, var17, var19); + } else { + var30 = new DynamicObject(var4, 22, var5, var1, var2, var3, var9.animationId, var9.field1801, (Renderable)null); // L: 918 + } + + var7.newFloorDecoration(var0, var2, var3, var17, (Renderable)var30, var20, var22); // L: 919 + if (var9.interactType == 1) { // L: 920 + var8.setBlockedByFloorDec(var2, var3); + } + + } else if (var6 != 10 && var6 != 11) { // L: 923 + if (var6 >= 12) { // L: 931 + if (var9.animationId == -1 && var9.transforms == null) { // L: 933 + var30 = var9.getModel(var6, var5, var16, var18, var17, var19); + } else { + var30 = new DynamicObject(var4, var6, var5, var1, var2, var3, var9.animationId, var9.field1801, (Renderable)null); // L: 934 + } + + var7.method4007(var0, var2, var3, var17, 1, 1, (Renderable)var30, 0, var20, var22); // L: 935 + if (var9.interactType != 0) { // L: 936 + var8.addGameObject(var2, var3, var10, var11, var9.boolean1); + } + + } else if (var6 == 0) { // L: 939 + if (var9.animationId == -1 && var9.transforms == null) { // L: 941 + var30 = var9.getModel(0, var5, var16, var18, var17, var19); + } else { + var30 = new DynamicObject(var4, 0, var5, var1, var2, var3, var9.animationId, var9.field1801, (Renderable)null); // L: 942 + } + + var7.newBoundaryObject(var0, var2, var3, var17, (Renderable)var30, (Renderable)null, Tiles.field1117[var5], 0, var20, var22); // L: 943 + if (var9.interactType != 0) { // L: 944 + var8.method3164(var2, var3, var6, var5, var9.boolean1); + } + + } else if (var6 == 1) { // L: 947 + if (var9.animationId == -1 && var9.transforms == null) { // L: 949 + var30 = var9.getModel(1, var5, var16, var18, var17, var19); + } else { + var30 = new DynamicObject(var4, 1, var5, var1, var2, var3, var9.animationId, var9.field1801, (Renderable)null); // L: 950 + } + + var7.newBoundaryObject(var0, var2, var3, var17, (Renderable)var30, (Renderable)null, Tiles.field1125[var5], 0, var20, var22); // L: 951 + if (var9.interactType != 0) { // L: 952 + var8.method3164(var2, var3, var6, var5, var9.boolean1); + } + + } else { + int var23; + if (var6 == 2) { // L: 955 + var23 = var5 + 1 & 3; // L: 956 + Object var25; + Object var31; + if (var9.animationId == -1 && var9.transforms == null) { // L: 959 + var31 = var9.getModel(2, var5 + 4, var16, var18, var17, var19); // L: 960 + var25 = var9.getModel(2, var23, var16, var18, var17, var19); // L: 961 + } else { + var31 = new DynamicObject(var4, 2, var5 + 4, var1, var2, var3, var9.animationId, var9.field1801, (Renderable)null); // L: 964 + var25 = new DynamicObject(var4, 2, var23, var1, var2, var3, var9.animationId, var9.field1801, (Renderable)null); // L: 965 + } + + var7.newBoundaryObject(var0, var2, var3, var17, (Renderable)var31, (Renderable)var25, Tiles.field1117[var5], Tiles.field1117[var23], var20, var22); // L: 967 + if (var9.interactType != 0) { // L: 968 + var8.method3164(var2, var3, var6, var5, var9.boolean1); + } + + } else if (var6 == 3) { // L: 971 + if (var9.animationId == -1 && var9.transforms == null) { // L: 973 + var30 = var9.getModel(3, var5, var16, var18, var17, var19); + } else { + var30 = new DynamicObject(var4, 3, var5, var1, var2, var3, var9.animationId, var9.field1801, (Renderable)null); // L: 974 + } + + var7.newBoundaryObject(var0, var2, var3, var17, (Renderable)var30, (Renderable)null, Tiles.field1125[var5], 0, var20, var22); // L: 975 + if (var9.interactType != 0) { // L: 976 + var8.method3164(var2, var3, var6, var5, var9.boolean1); + } + + } else if (var6 == 9) { // L: 979 + if (var9.animationId == -1 && var9.transforms == null) { // L: 981 + var30 = var9.getModel(var6, var5, var16, var18, var17, var19); + } else { + var30 = new DynamicObject(var4, var6, var5, var1, var2, var3, var9.animationId, var9.field1801, (Renderable)null); // L: 982 + } + + var7.method4007(var0, var2, var3, var17, 1, 1, (Renderable)var30, 0, var20, var22); // L: 983 + if (var9.interactType != 0) { // L: 984 + var8.addGameObject(var2, var3, var10, var11, var9.boolean1); + } + + } else if (var6 == 4) { // L: 987 + if (var9.animationId == -1 && var9.transforms == null) { // L: 989 + var30 = var9.getModel(4, var5, var16, var18, var17, var19); + } else { + var30 = new DynamicObject(var4, 4, var5, var1, var2, var3, var9.animationId, var9.field1801, (Renderable)null); // L: 990 + } + + var7.newWallDecoration(var0, var2, var3, var17, (Renderable)var30, (Renderable)null, Tiles.field1117[var5], 0, 0, 0, var20, var22); // L: 991 + } else { + long var24; + Object var26; + if (var6 == 5) { // L: 994 + var23 = 16; // L: 995 + var24 = var7.getBoundaryObjectTag(var0, var2, var3); // L: 996 + if (var24 != 0L) { // L: 997 + var23 = class23.getObjectDefinition(class93.Entity_unpackID(var24)).int2; + } + + if (var9.animationId == -1 && var9.transforms == null) { // L: 999 + var26 = var9.getModel(4, var5, var16, var18, var17, var19); + } else { + var26 = new DynamicObject(var4, 4, var5, var1, var2, var3, var9.animationId, var9.field1801, (Renderable)null); // L: 1000 + } + + var7.newWallDecoration(var0, var2, var3, var17, (Renderable)var26, (Renderable)null, Tiles.field1117[var5], 0, var23 * Tiles.field1126[var5], var23 * Tiles.field1123[var5], var20, var22); // L: 1001 + } else if (var6 == 6) { // L: 1004 + var23 = 8; // L: 1005 + var24 = var7.getBoundaryObjectTag(var0, var2, var3); // L: 1006 + if (0L != var24) { // L: 1007 + var23 = class23.getObjectDefinition(class93.Entity_unpackID(var24)).int2 / 2; + } + + if (var9.animationId == -1 && var9.transforms == null) { // L: 1009 + var26 = var9.getModel(4, var5 + 4, var16, var18, var17, var19); + } else { + var26 = new DynamicObject(var4, 4, var5 + 4, var1, var2, var3, var9.animationId, var9.field1801, (Renderable)null); // L: 1010 + } + + var7.newWallDecoration(var0, var2, var3, var17, (Renderable)var26, (Renderable)null, 256, var5, var23 * Tiles.field1128[var5], var23 * Tiles.field1129[var5], var20, var22); // L: 1011 + } else if (var6 == 7) { // L: 1014 + int var29 = var5 + 2 & 3; // L: 1016 + if (var9.animationId == -1 && var9.transforms == null) { // L: 1017 + var30 = var9.getModel(4, var29 + 4, var16, var18, var17, var19); + } else { + var30 = new DynamicObject(var4, 4, var29 + 4, var1, var2, var3, var9.animationId, var9.field1801, (Renderable)null); // L: 1018 + } + + var7.newWallDecoration(var0, var2, var3, var17, (Renderable)var30, (Renderable)null, 256, var29, 0, 0, var20, var22); // L: 1019 + } else if (var6 == 8) { // L: 1022 + var23 = 8; // L: 1023 + var24 = var7.getBoundaryObjectTag(var0, var2, var3); // L: 1024 + if (var24 != 0L) { // L: 1025 + var23 = class23.getObjectDefinition(class93.Entity_unpackID(var24)).int2 / 2; + } + + int var28 = var5 + 2 & 3; // L: 1028 + Object var27; + if (var9.animationId == -1 && var9.transforms == null) { // L: 1029 + var26 = var9.getModel(4, var5 + 4, var16, var18, var17, var19); // L: 1030 + var27 = var9.getModel(4, var28 + 4, var16, var18, var17, var19); // L: 1031 + } else { + var26 = new DynamicObject(var4, 4, var5 + 4, var1, var2, var3, var9.animationId, var9.field1801, (Renderable)null); // L: 1034 + var27 = new DynamicObject(var4, 4, var28 + 4, var1, var2, var3, var9.animationId, var9.field1801, (Renderable)null); // L: 1035 + } + + var7.newWallDecoration(var0, var2, var3, var17, (Renderable)var26, (Renderable)var27, 256, var5, var23 * Tiles.field1128[var5], var23 * Tiles.field1129[var5], var20, var22); // L: 1037 + } + } + } + } else { + if (var9.animationId == -1 && var9.transforms == null) { // L: 925 + var30 = var9.getModel(10, var5, var16, var18, var17, var19); + } else { + var30 = new DynamicObject(var4, 10, var5, var1, var2, var3, var9.animationId, var9.field1801, (Renderable)null); // L: 926 + } + + if (var30 != null) { // L: 927 + var7.method4007(var0, var2, var3, var17, var10, var11, (Renderable)var30, var6 == 11 ? 256 : 0, var20, var22); + } + + if (var9.interactType != 0) { // L: 928 + var8.addGameObject(var2, var3, var10, var11, var9.boolean1); + } + + } + } // L: 921 929 937 945 953 969 977 985 992 1002 1012 1020 1038 1040 + + @ObfuscatedName("hc") + @ObfuscatedSignature( + descriptor = "(IIIIIIIIIB)V", + garbageValue = "-12" + ) + @Export("updatePendingSpawn") + static final void updatePendingSpawn(int var0, int var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8) { + PendingSpawn var9 = null; // L: 7201 + + for (PendingSpawn var10 = (PendingSpawn)Client.pendingSpawns.last(); var10 != null; var10 = (PendingSpawn)Client.pendingSpawns.previous()) { // L: 7202 7203 7208 + if (var0 == var10.plane && var10.x == var1 && var2 == var10.y && var3 == var10.type) { // L: 7204 + var9 = var10; // L: 7205 + break; + } + } + + if (var9 == null) { // L: 7210 + var9 = new PendingSpawn(); // L: 7211 + var9.plane = var0; // L: 7212 + var9.type = var3; // L: 7213 + var9.x = var1; // L: 7214 + var9.y = var2; // L: 7215 + UserComparator5.method2448(var9); // L: 7216 + Client.pendingSpawns.addFirst(var9); // L: 7217 + } + + var9.id = var4; // L: 7219 + var9.field1232 = var5; // L: 7220 + var9.orientation = var6; // L: 7221 + var9.delay = var7; // L: 7222 + var9.hitpoints = var8; // L: 7223 + } // L: 7224 } diff --git a/runescape-client/src/main/java/DirectByteArrayCopier.java b/runescape-client/src/main/java/DirectByteArrayCopier.java index fd17a83543..6e7905751f 100644 --- a/runescape-client/src/main/java/DirectByteArrayCopier.java +++ b/runescape-client/src/main/java/DirectByteArrayCopier.java @@ -1,114 +1,145 @@ import java.nio.ByteBuffer; 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("ie") +@ObfuscatedName("if") @Implements("DirectByteArrayCopier") public class DirectByteArrayCopier extends AbstractByteArrayCopier { - @ObfuscatedName("h") + @ObfuscatedName("r") + static byte[][][] field3128; + @ObfuscatedName("s") + @ObfuscatedGetter( + intValue = -1885485519 + ) + static int field3126; + @ObfuscatedName("v") @Export("directBuffer") ByteBuffer directBuffer; DirectByteArrayCopier() { } // L: 10 - @ObfuscatedName("g") + @ObfuscatedName("f") @ObfuscatedSignature( - descriptor = "(I)[B", - garbageValue = "-1778746914" + descriptor = "(B)[B", + garbageValue = "74" ) @Export("get") byte[] get() { - byte[] var1 = new byte[this.directBuffer.capacity()]; - this.directBuffer.position(0); - this.directBuffer.get(var1); - return var1; + byte[] var1 = new byte[this.directBuffer.capacity()]; // L: 13 + this.directBuffer.position(0); // L: 14 + this.directBuffer.get(var1); // L: 15 + return var1; // L: 16 } - @ObfuscatedName("l") + @ObfuscatedName("y") @ObfuscatedSignature( - descriptor = "([BI)V", - garbageValue = "973811650" + descriptor = "([BB)V", + garbageValue = "43" ) @Export("set") void set(byte[] var1) { - this.directBuffer = ByteBuffer.allocateDirect(var1.length); - this.directBuffer.position(0); - this.directBuffer.put(var1); - } + this.directBuffer = ByteBuffer.allocateDirect(var1.length); // L: 20 + this.directBuffer.position(0); // L: 21 + this.directBuffer.put(var1); // L: 22 + } // L: 23 - @ObfuscatedName("h") + @ObfuscatedName("f") @ObfuscatedSignature( - descriptor = "(CI)B", - garbageValue = "-277042529" + descriptor = "(Ljp;IIIBZB)V", + garbageValue = "-95" ) - @Export("charToByteCp1252") - public static byte charToByteCp1252(char var0) { - byte var1; - if ((var0 <= 0 || var0 >= 128) && (var0 < 160 || var0 > 255)) { // L: 12 - if (var0 == 8364) { // L: 13 - var1 = -128; - } else if (var0 == 8218) { // L: 14 - var1 = -126; - } else if (var0 == 402) { // L: 15 - var1 = -125; - } else if (var0 == 8222) { // L: 16 - var1 = -124; - } else if (var0 == 8230) { // L: 17 - var1 = -123; - } else if (var0 == 8224) { // L: 18 - var1 = -122; - } else if (var0 == 8225) { // L: 19 - var1 = -121; - } else if (var0 == 710) { // L: 20 - var1 = -120; - } else if (var0 == 8240) { // L: 21 - var1 = -119; - } else if (var0 == 352) { // L: 22 - var1 = -118; - } else if (var0 == 8249) { // L: 23 - var1 = -117; - } else if (var0 == 338) { // L: 24 - var1 = -116; - } else if (var0 == 381) { // L: 25 - var1 = -114; - } else if (var0 == 8216) { - var1 = -111; // L: 26 - } else if (var0 == 8217) { // L: 27 - var1 = -110; - } else if (var0 == 8220) { // L: 28 - var1 = -109; - } else if (var0 == 8221) { // L: 29 - var1 = -108; - } else if (var0 == 8226) { // L: 30 - var1 = -107; - } else if (var0 == 8211) { // L: 31 - var1 = -106; - } else if (var0 == 8212) { // L: 32 - var1 = -105; - } else if (var0 == 732) { // L: 33 - var1 = -104; - } else if (var0 == 8482) { // L: 34 - var1 = -103; - } else if (var0 == 353) { // L: 35 - var1 = -102; - } else if (var0 == 8250) { // L: 36 - var1 = -101; - } else if (var0 == 339) { // L: 37 - var1 = -100; - } else if (var0 == 382) { // L: 38 - var1 = -98; - } else if (var0 == 376) { // L: 39 - var1 = -97; - } else { - var1 = 63; // L: 40 + @Export("requestNetFile") + static void requestNetFile(Archive var0, int var1, int var2, int var3, byte var4, boolean var5) { + long var6 = (long)((var1 << 16) + var2); // L: 72 + NetFileRequest var8 = (NetFileRequest)NetCache.NetCache_pendingPriorityWrites.get(var6); // L: 73 + if (var8 == null) { // L: 74 + var8 = (NetFileRequest)NetCache.NetCache_pendingPriorityResponses.get(var6); // L: 75 + if (var8 == null) { // L: 76 + var8 = (NetFileRequest)NetCache.NetCache_pendingWrites.get(var6); // L: 77 + if (var8 != null) { // L: 78 + if (var5) { // L: 79 + var8.removeDual(); // L: 80 + NetCache.NetCache_pendingPriorityWrites.put(var8, var6); // L: 81 + --NetCache.NetCache_pendingWritesCount; // L: 82 + ++NetCache.NetCache_pendingPriorityWritesCount; // L: 83 + } + + } else { + if (!var5) { // L: 87 + var8 = (NetFileRequest)NetCache.NetCache_pendingResponses.get(var6); // L: 88 + if (var8 != null) { // L: 89 + return; + } + } + + var8 = new NetFileRequest(); // L: 91 + var8.archive = var0; // L: 92 + var8.crc = var3; // L: 93 + var8.padding = var4; // L: 94 + if (var5) { // L: 95 + NetCache.NetCache_pendingPriorityWrites.put(var8, var6); // L: 96 + ++NetCache.NetCache_pendingPriorityWritesCount; // L: 97 + } else { + NetCache.NetCache_pendingWritesQueue.addFirst(var8); // L: 100 + NetCache.NetCache_pendingWrites.put(var8, var6); // L: 101 + ++NetCache.NetCache_pendingWritesCount; // L: 102 + } + + } } - } else { - var1 = (byte)var0; + } + } // L: 85 104 + + @ObfuscatedName("y") + @ObfuscatedSignature( + descriptor = "(IZIZI)V", + garbageValue = "-1640664715" + ) + @Export("sortWorldList") + static void sortWorldList(int var0, boolean var1, int var2, boolean var3) { + if (Tiles.World_worlds != null) { // L: 171 + DesktopPlatformInfoProvider.doWorldSorting(0, Tiles.World_worlds.length - 1, var0, var1, var2, var3); // L: 172 } - return var1; // L: 41 - } + } // L: 174 + + @ObfuscatedName("go") + @ObfuscatedSignature( + descriptor = "(Ljava/lang/String;ZI)V", + garbageValue = "-1591335539" + ) + @Export("drawLoadingMessage") + static final void drawLoadingMessage(String var0, boolean var1) { + if (Client.showLoadingMessages) { // L: 4019 + byte var2 = 4; // L: 4020 + int var3 = var2 + 6; // L: 4021 + int var4 = var2 + 6; // L: 4022 + int var5 = UserComparator3.fontPlain12.lineWidth(var0, 250); // L: 4023 + int var6 = UserComparator3.fontPlain12.lineCount(var0, 250) * 13; // L: 4024 + Rasterizer2D.Rasterizer2D_fillRectangle(var3 - var2, var4 - var2, var5 + var2 + var2, var6 + var2 + var2, 0); // L: 4025 + Rasterizer2D.Rasterizer2D_drawRectangle(var3 - var2, var4 - var2, var2 + var2 + var5, var6 + var2 + var2, 16777215); // L: 4026 + UserComparator3.fontPlain12.drawLines(var0, var3, var4, var5, var6, 16777215, -1, 1, 1, 0); // L: 4027 + int var7 = var3 - var2; // L: 4028 + int var8 = var4 - var2; // L: 4029 + int var9 = var2 + var2 + var5; // L: 4030 + int var10 = var2 + var2 + var6; // L: 4031 + + for (int var11 = 0; var11 < Client.rootWidgetCount; ++var11) { // L: 4033 + if (Client.rootWidgetXs[var11] + Client.rootWidgetWidths[var11] > var7 && Client.rootWidgetXs[var11] < var9 + var7 && Client.rootWidgetHeights[var11] + Client.rootWidgetYs[var11] > var8 && Client.rootWidgetYs[var11] < var10 + var8) { // L: 4034 + Client.field719[var11] = true; + } + } + + if (var1) { // L: 4037 + class26.rasterProvider.drawFull(0, 0); // L: 4038 + } else { + PcmPlayer.method786(var3, var4, var5, var6); // L: 4041 + } + + } + } // L: 4043 } diff --git a/runescape-client/src/main/java/DirectWrapper.java b/runescape-client/src/main/java/DirectWrapper.java index 35c33441dd..984df98183 100644 --- a/runescape-client/src/main/java/DirectWrapper.java +++ b/runescape-client/src/main/java/DirectWrapper.java @@ -2,10 +2,10 @@ import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; -@ObfuscatedName("hy") +@ObfuscatedName("hd") @Implements("DirectWrapper") public class DirectWrapper extends Wrapper { - @ObfuscatedName("h") + @ObfuscatedName("v") @Export("obj") Object obj; @@ -14,13 +14,13 @@ public class DirectWrapper extends Wrapper { this.obj = var1; // L: 8 } // L: 9 - @ObfuscatedName("h") + @ObfuscatedName("v") @Export("get") Object get() { return this.obj; // L: 12 } - @ObfuscatedName("c") + @ObfuscatedName("n") @Export("isSoft") boolean isSoft() { return false; // L: 16 diff --git a/runescape-client/src/main/java/DualNode.java b/runescape-client/src/main/java/DualNode.java index acafe746bd..a683a04b93 100644 --- a/runescape-client/src/main/java/DualNode.java +++ b/runescape-client/src/main/java/DualNode.java @@ -6,23 +6,23 @@ import net.runelite.mapping.ObfuscatedSignature; @ObfuscatedName("mf") @Implements("DualNode") public class DualNode extends Node { - @ObfuscatedName("cz") + @ObfuscatedName("cc") @Export("keyDual") public long keyDual; - @ObfuscatedName("cl") + @ObfuscatedName("cu") @ObfuscatedSignature( descriptor = "Lmf;" ) @Export("previousDual") public DualNode previousDual; - @ObfuscatedName("cp") + @ObfuscatedName("cz") @ObfuscatedSignature( descriptor = "Lmf;" ) @Export("nextDual") public DualNode nextDual; - @ObfuscatedName("cr") + @ObfuscatedName("dj") @Export("removeDual") public void removeDual() { if (this.nextDual != null) { // L: 9 diff --git a/runescape-client/src/main/java/DualNodeDeque.java b/runescape-client/src/main/java/DualNodeDeque.java index 73b1ca4cd0..0da4a47ea0 100644 --- a/runescape-client/src/main/java/DualNodeDeque.java +++ b/runescape-client/src/main/java/DualNodeDeque.java @@ -3,10 +3,10 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("kz") +@ObfuscatedName("ka") @Implements("DualNodeDeque") public final class DualNodeDeque { - @ObfuscatedName("h") + @ObfuscatedName("v") @ObfuscatedSignature( descriptor = "Lmf;" ) @@ -19,7 +19,7 @@ public final class DualNodeDeque { this.sentinel.nextDual = this.sentinel; // L: 10 } // L: 11 - @ObfuscatedName("h") + @ObfuscatedName("v") @ObfuscatedSignature( descriptor = "(Lmf;)V" ) @@ -35,7 +35,7 @@ public final class DualNodeDeque { var1.previousDual.nextDual = var1; // L: 18 } // L: 19 - @ObfuscatedName("c") + @ObfuscatedName("n") @ObfuscatedSignature( descriptor = "(Lmf;)V" ) @@ -51,7 +51,7 @@ public final class DualNodeDeque { var1.previousDual.nextDual = var1; // L: 26 } // L: 27 - @ObfuscatedName("o") + @ObfuscatedName("f") @ObfuscatedSignature( descriptor = "()Lmf;" ) diff --git a/runescape-client/src/main/java/DynamicObject.java b/runescape-client/src/main/java/DynamicObject.java index ae8ce774ea..1844d4ee27 100644 --- a/runescape-client/src/main/java/DynamicObject.java +++ b/runescape-client/src/main/java/DynamicObject.java @@ -1,71 +1,74 @@ -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; -import net.runelite.rs.ScriptOpcodes; -@ObfuscatedName("cf") +@ObfuscatedName("cn") @Implements("DynamicObject") public class DynamicObject extends Renderable { - @ObfuscatedName("h") + @ObfuscatedName("ax") + @ObfuscatedSignature( + descriptor = "Lli;" + ) + static Bounds field1107; + @ObfuscatedName("v") @ObfuscatedGetter( - intValue = -605907223 + intValue = -335258197 ) @Export("id") int id; - @ObfuscatedName("c") + @ObfuscatedName("n") @ObfuscatedGetter( - intValue = -235619829 + intValue = -1002371349 ) @Export("type") int type; - @ObfuscatedName("o") + @ObfuscatedName("f") @ObfuscatedGetter( - intValue = -898110991 + intValue = 1337909425 ) @Export("orientation") int orientation; - @ObfuscatedName("g") + @ObfuscatedName("y") @ObfuscatedGetter( - intValue = 853925999 + intValue = -1976431629 ) @Export("plane") int plane; - @ObfuscatedName("l") + @ObfuscatedName("p") @ObfuscatedGetter( - intValue = -665305113 + intValue = 1710957787 ) @Export("x") int x; - @ObfuscatedName("z") + @ObfuscatedName("j") @ObfuscatedGetter( - intValue = 1158524887 + intValue = 1005968135 ) @Export("y") int y; - @ObfuscatedName("t") + @ObfuscatedName("r") @ObfuscatedSignature( - descriptor = "Lfb;" + descriptor = "Lfl;" ) @Export("sequenceDefinition") SequenceDefinition sequenceDefinition; - @ObfuscatedName("v") + @ObfuscatedName("b") @ObfuscatedGetter( - intValue = -782720615 + intValue = -1176341893 ) @Export("frame") int frame; - @ObfuscatedName("b") + @ObfuscatedName("d") @ObfuscatedGetter( - intValue = 6537399 + intValue = 1918179577 ) @Export("cycleStart") int cycleStart; @ObfuscatedSignature( - descriptor = "(IIIIIIIZLge;)V" + descriptor = "(IIIIIIIZLgl;)V" ) DynamicObject(int var1, int var2, int var3, int var4, int var5, int var6, int var7, boolean var8, Renderable var9) { this.id = var1; // L: 20 @@ -75,12 +78,12 @@ public class DynamicObject extends Renderable { this.x = var5; // L: 24 this.y = var6; // L: 25 if (var7 != -1) { // L: 26 - this.sequenceDefinition = Player.SequenceDefinition_get(var7); // L: 27 + this.sequenceDefinition = LoginScreenAnimation.SequenceDefinition_get(var7); // L: 27 this.frame = 0; // L: 28 this.cycleStart = Client.cycle - 1; // L: 29 - if (this.sequenceDefinition.field1900 == 0 && var9 != null && var9 instanceof DynamicObject) { // L: 30 + if (this.sequenceDefinition.field1891 == 0 && var9 != null && var9 instanceof DynamicObject) { // L: 30 DynamicObject var10 = (DynamicObject)var9; // L: 31 - if (var10.sequenceDefinition == this.sequenceDefinition) { // L: 32 + if (this.sequenceDefinition == var10.sequenceDefinition) { // L: 32 this.frame = var10.frame; // L: 33 this.cycleStart = var10.cycleStart; // L: 34 return; // L: 35 @@ -95,10 +98,10 @@ public class DynamicObject extends Renderable { } // L: 43 - @ObfuscatedName("c") + @ObfuscatedName("n") @ObfuscatedSignature( - descriptor = "(I)Lgj;", - garbageValue = "-220627570" + descriptor = "(B)Lgr;", + garbageValue = "-76" ) @Export("getModel") protected final Model getModel() { @@ -108,11 +111,11 @@ public class DynamicObject extends Renderable { var1 = 100; } - label54: { + label56: { do { do { if (var1 <= this.sequenceDefinition.frameLengths[this.frame]) { // L: 49 - break label54; + break label56; } var1 -= this.sequenceDefinition.frameLengths[this.frame]; // L: 50 @@ -128,7 +131,7 @@ public class DynamicObject extends Renderable { this.cycleStart = Client.cycle - var1; // L: 60 } - ObjectComposition var12 = AttackOption.getObjectDefinition(this.id); // L: 62 + ObjectComposition var12 = class23.getObjectDefinition(this.id); // L: 62 if (var12.transforms != null) { // L: 63 var12 = var12.transform(); } @@ -138,166 +141,98 @@ public class DynamicObject extends Renderable { } else { int var2; int var3; - if (this.orientation != 1 && this.orientation != 3) { // L: 67 - var2 = var12.sizeX; // L: 72 - var3 = var12.sizeY; // L: 73 + if (this.orientation != 1 && this.orientation != 3) { + var2 = var12.sizeX; + var3 = var12.sizeY; } else { - var2 = var12.sizeY; // L: 68 - var3 = var12.sizeX; // L: 69 + var2 = var12.sizeY; + var3 = var12.sizeX; } - int var4 = (var2 >> 1) + this.x; // L: 75 - int var5 = (var2 + 1 >> 1) + this.x; // L: 76 - int var6 = (var3 >> 1) + this.y; // L: 77 - int var7 = (var3 + 1 >> 1) + this.y; // L: 78 - int[][] var8 = Tiles.Tiles_heights[this.plane]; // L: 79 - int var9 = var8[var4][var6] + var8[var5][var6] + var8[var4][var7] + var8[var5][var7] >> 2; // L: 80 - int var10 = (this.x << 7) + (var2 << 6); // L: 81 - int var11 = (this.y << 7) + (var3 << 6); // L: 82 - return var12.getModelDynamic(this.type, this.orientation, var8, var10, var9, var11, this.sequenceDefinition, this.frame); // L: 83 + int var4 = (var2 >> 1) + this.x; + int var5 = (var2 + 1 >> 1) + this.x; + int var6 = (var3 >> 1) + this.y; + int var7 = (var3 + 1 >> 1) + this.y; + int[][] var8 = Tiles.Tiles_heights[this.plane]; + int var9 = var8[var4][var6] + var8[var5][var6] + var8[var4][var7] + var8[var5][var7] >> 2; + int var10 = (this.x << 7) + (var2 << 6); + int var11 = (this.y << 7) + (var3 << 6); + return var12.getModelDynamic(this.type, this.orientation, var8, var10, var9, var11, this.sequenceDefinition, this.frame); } } - @ObfuscatedName("g") + @ObfuscatedName("y") @ObfuscatedSignature( - descriptor = "(B)[B", - garbageValue = "-7" + descriptor = "(Ljava/lang/CharSequence;B)[B", + garbageValue = "1" ) - public static byte[] method2030() { - byte[] var0 = new byte[24]; // L: 282 + public static byte[] method2004(CharSequence var0) { + int var1 = var0.length(); // L: 66 + byte[] var2 = new byte[var1]; // L: 67 - try { - JagexCache.JagexCache_randomDat.seek(0L); // L: 284 - JagexCache.JagexCache_randomDat.readFully(var0); // L: 285 - - int var1; - for (var1 = 0; var1 < 24 && var0[var1] == 0; ++var1) { // L: 286 287 288 - } - - if (var1 >= 24) { - throw new IOException(); // L: 290 - } - } catch (Exception var4) { - for (int var2 = 0; var2 < 24; ++var2) { // L: 293 - var0[var2] = -1; - } - } - - return var0; // L: 295 - } - - @ObfuscatedName("x") - @ObfuscatedSignature( - descriptor = "(ILci;ZI)I", - garbageValue = "1496767083" - ) - static int method2027(int var0, Script var1, boolean var2) { - Widget var3; - if (var0 >= 2000) { // L: 1007 - var0 -= 1000; // L: 1008 - var3 = DevicePcmPlayerProvider.getWidget(Interpreter.Interpreter_intStack[--WorldMapCacheName.Interpreter_intStackSize]); // L: 1009 - } else { - var3 = var2 ? class308.scriptDotWidget : class24.scriptActiveWidget; // L: 1011 - } - - String var4 = Interpreter.Interpreter_stringStack[--class13.Interpreter_stringStackSize]; // L: 1012 - int[] var5 = null; // L: 1013 - if (var4.length() > 0 && var4.charAt(var4.length() - 1) == 'Y') { // L: 1014 - int var6 = Interpreter.Interpreter_intStack[--WorldMapCacheName.Interpreter_intStackSize]; // L: 1015 - if (var6 > 0) { // L: 1016 - for (var5 = new int[var6]; var6-- > 0; var5[var6] = Interpreter.Interpreter_intStack[--WorldMapCacheName.Interpreter_intStackSize]) { // L: 1017 1018 - } - } - - var4 = var4.substring(0, var4.length() - 1); // L: 1020 - } - - Object[] var8 = new Object[var4.length() + 1]; // L: 1022 - - int var7; - for (var7 = var8.length - 1; var7 >= 1; --var7) { // L: 1023 - if (var4.charAt(var7 - 1) == 's') { // L: 1024 - var8[var7] = Interpreter.Interpreter_stringStack[--class13.Interpreter_stringStackSize]; + for (int var3 = 0; var3 < var1; ++var3) { // L: 68 + char var4 = var0.charAt(var3); // L: 69 + if (var4 > 0 && var4 < 128 || var4 >= 160 && var4 <= 255) { // L: 70 + var2[var3] = (byte)var4; + } else if (var4 == 8364) { // L: 71 + var2[var3] = -128; + } else if (var4 == 8218) { // L: 72 + var2[var3] = -126; + } else if (var4 == 402) { // L: 73 + var2[var3] = -125; + } else if (var4 == 8222) { // L: 74 + var2[var3] = -124; + } else if (var4 == 8230) { // L: 75 + var2[var3] = -123; + } else if (var4 == 8224) { // L: 76 + var2[var3] = -122; + } else if (var4 == 8225) { // L: 77 + var2[var3] = -121; + } else if (var4 == 710) { // L: 78 + var2[var3] = -120; + } else if (var4 == 8240) { // L: 79 + var2[var3] = -119; + } else if (var4 == 352) { + var2[var3] = -118; // L: 80 + } else if (var4 == 8249) { // L: 81 + var2[var3] = -117; + } else if (var4 == 338) { // L: 82 + var2[var3] = -116; + } else if (var4 == 381) { // L: 83 + var2[var3] = -114; + } else if (var4 == 8216) { // L: 84 + var2[var3] = -111; + } else if (var4 == 8217) { // L: 85 + var2[var3] = -110; + } else if (var4 == 8220) { // L: 86 + var2[var3] = -109; + } else if (var4 == 8221) { // L: 87 + var2[var3] = -108; + } else if (var4 == 8226) { // L: 88 + var2[var3] = -107; + } else if (var4 == 8211) { // L: 89 + var2[var3] = -106; + } else if (var4 == 8212) { // L: 90 + var2[var3] = -105; + } else if (var4 == 732) { // L: 91 + var2[var3] = -104; + } else if (var4 == 8482) { // L: 92 + var2[var3] = -103; + } else if (var4 == 353) { // L: 93 + var2[var3] = -102; + } else if (var4 == 8250) { // L: 94 + var2[var3] = -101; + } else if (var4 == 339) { // L: 95 + var2[var3] = -100; + } else if (var4 == 382) { // L: 96 + var2[var3] = -98; + } else if (var4 == 376) { // L: 97 + var2[var3] = -97; } else { - var8[var7] = new Integer(Interpreter.Interpreter_intStack[--WorldMapCacheName.Interpreter_intStackSize]); // L: 1025 + var2[var3] = 63; // L: 98 } } - var7 = Interpreter.Interpreter_intStack[--WorldMapCacheName.Interpreter_intStackSize]; // L: 1027 - if (var7 != -1) { // L: 1028 - var8[0] = new Integer(var7); - } else { - var8 = null; // L: 1029 - } - - if (var0 == ScriptOpcodes.CC_SETONCLICK) { - var3.onClick = var8; // L: 1030 - } else if (var0 == ScriptOpcodes.CC_SETONHOLD) { // L: 1031 - var3.onHold = var8; - } else if (var0 == ScriptOpcodes.CC_SETONRELEASE) { // L: 1032 - var3.onRelease = var8; - } else if (var0 == ScriptOpcodes.CC_SETONMOUSEOVER) { // L: 1033 - var3.onMouseOver = var8; - } else if (var0 == ScriptOpcodes.CC_SETONMOUSELEAVE) { // L: 1034 - var3.onMouseLeave = var8; - } else if (var0 == ScriptOpcodes.CC_SETONDRAG) { // L: 1035 - var3.onDrag = var8; - } else if (var0 == ScriptOpcodes.CC_SETONTARGETLEAVE) { // L: 1036 - var3.onTargetLeave = var8; - } else if (var0 == ScriptOpcodes.CC_SETONVARTRANSMIT) { // L: 1037 - var3.onVarTransmit = var8; // L: 1038 - var3.varTransmitTriggers = var5; // L: 1039 - } else if (var0 == ScriptOpcodes.CC_SETONTIMER) { // L: 1041 - var3.onTimer = var8; - } else if (var0 == ScriptOpcodes.CC_SETONOP) { // L: 1042 - var3.onOp = var8; - } else if (var0 == ScriptOpcodes.CC_SETONDRAGCOMPLETE) { // L: 1043 - var3.onDragComplete = var8; - } else if (var0 == ScriptOpcodes.CC_SETONCLICKREPEAT) { // L: 1044 - var3.onClickRepeat = var8; - } else if (var0 == ScriptOpcodes.CC_SETONMOUSEREPEAT) { // L: 1045 - var3.onMouseRepeat = var8; - } else if (var0 == ScriptOpcodes.CC_SETONINVTRANSMIT) { // L: 1046 - var3.onInvTransmit = var8; // L: 1047 - var3.invTransmitTriggers = var5; // L: 1048 - } else if (var0 == ScriptOpcodes.CC_SETONSTATTRANSMIT) { // L: 1050 - var3.onStatTransmit = var8; // L: 1051 - var3.statTransmitTriggers = var5; // L: 1052 - } else if (var0 == ScriptOpcodes.CC_SETONTARGETENTER) { - var3.onTargetEnter = var8; // L: 1054 - } else if (var0 == ScriptOpcodes.CC_SETONSCROLLWHEEL) { // L: 1055 - var3.onScroll = var8; - } else if (var0 == ScriptOpcodes.CC_SETONCHATTRANSMIT) { // L: 1056 - var3.onChatTransmit = var8; - } else if (var0 == ScriptOpcodes.CC_SETONKEY) { // L: 1057 - var3.onKey = var8; - } else if (var0 == ScriptOpcodes.CC_SETONFRIENDTRANSMIT) { // L: 1058 - var3.onFriendTransmit = var8; - } else if (var0 == ScriptOpcodes.CC_SETONCLANTRANSMIT) { // L: 1059 - var3.onClanTransmit = var8; - } else if (var0 == ScriptOpcodes.CC_SETONMISCTRANSMIT) { // L: 1060 - var3.onMiscTransmit = var8; - } else if (var0 == ScriptOpcodes.CC_SETONDIALOGABORT) { // L: 1061 - var3.onDialogAbort = var8; - } else if (var0 == ScriptOpcodes.CC_SETONSUBCHANGE) { // L: 1062 - var3.onSubChange = var8; - } else if (var0 == ScriptOpcodes.CC_SETONSTOCKTRANSMIT) { // L: 1063 - var3.onStockTransmit = var8; - } else if (var0 == 1426) { // L: 1064 - var3.field3004 = var8; - } else if (var0 == ScriptOpcodes.CC_SETONRESIZE) { // L: 1065 - var3.onResize = var8; - } else if (var0 == 1428) { // L: 1066 - var3.field3076 = var8; - } else { - if (var0 != 1429) { // L: 1067 - return 2; // L: 1068 - } - - var3.field2974 = var8; - } - - var3.hasListener = true; // L: 1069 - return 1; // L: 1070 + return var2; // L: 100 } } diff --git a/runescape-client/src/main/java/EnumComposition.java b/runescape-client/src/main/java/EnumComposition.java index 8f40305df8..c0813f30ea 100644 --- a/runescape-client/src/main/java/EnumComposition.java +++ b/runescape-client/src/main/java/EnumComposition.java @@ -4,58 +4,49 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("eq") +@ObfuscatedName("er") @Implements("EnumComposition") public class EnumComposition extends DualNode { - @ObfuscatedName("h") + @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "Ljp;" + descriptor = "Ljv;" ) @Export("EnumDefinition_archive") - public static AbstractArchive EnumDefinition_archive; - @ObfuscatedName("c") + static AbstractArchive EnumDefinition_archive; + @ObfuscatedName("n") @ObfuscatedSignature( - descriptor = "Lho;" + descriptor = "Lhz;" ) @Export("EnumDefinition_cached") static EvictingDualNodeHashTable EnumDefinition_cached; - @ObfuscatedName("j") - @Export("formattedOperatingSystemName") - public static String formattedOperatingSystemName; - @ObfuscatedName("dy") - @ObfuscatedSignature( - descriptor = "Lji;" - ) - @Export("archive3") - static Archive archive3; - @ObfuscatedName("o") + @ObfuscatedName("f") @Export("inputType") public char inputType; - @ObfuscatedName("g") + @ObfuscatedName("y") @Export("outputType") public char outputType; - @ObfuscatedName("l") + @ObfuscatedName("p") @Export("defaultStr") public String defaultStr; - @ObfuscatedName("z") + @ObfuscatedName("j") @ObfuscatedGetter( - intValue = -1421097463 + intValue = 865656165 ) @Export("defaultInt") public int defaultInt; - @ObfuscatedName("t") + @ObfuscatedName("r") @ObfuscatedGetter( - intValue = 1998953015 + intValue = -2113237229 ) @Export("outputCount") public int outputCount; - @ObfuscatedName("v") + @ObfuscatedName("b") @Export("keys") public int[] keys; - @ObfuscatedName("b") + @ObfuscatedName("d") @Export("intVals") public int[] intVals; - @ObfuscatedName("q") + @ObfuscatedName("s") @Export("strVals") public String[] strVals; @@ -66,90 +57,84 @@ public class EnumComposition extends DualNode { EnumComposition() { this.defaultStr = "null"; // L: 15 this.outputCount = 0; // L: 17 - } + } // L: 22 - @ObfuscatedName("c") + @ObfuscatedName("f") @ObfuscatedSignature( - descriptor = "(Lnk;I)V", - garbageValue = "967216263" + descriptor = "(Lnd;I)V", + garbageValue = "1467910885" ) @Export("decode") void decode(Buffer var1) { while (true) { - int var2 = var1.readUnsignedByte(); // L: 36 - if (var2 == 0) { // L: 37 - return; // L: 40 + int var2 = var1.readUnsignedByte(); // L: 40 + if (var2 == 0) { // L: 41 + return; // L: 44 } - this.decodeNext(var1, var2); // L: 38 + this.decodeNext(var1, var2); // L: 42 } } - @ObfuscatedName("o") + @ObfuscatedName("y") @ObfuscatedSignature( - descriptor = "(Lnk;IS)V", - garbageValue = "249" + descriptor = "(Lnd;IB)V", + garbageValue = "-60" ) @Export("decodeNext") void decodeNext(Buffer var1, int var2) { - if (var2 == 1) { // L: 43 + if (var2 == 1) { // L: 47 this.inputType = (char)var1.readUnsignedByte(); - } else if (var2 == 2) { // L: 44 + } else if (var2 == 2) { // L: 48 this.outputType = (char)var1.readUnsignedByte(); - } else if (var2 == 3) { // L: 45 + } else if (var2 == 3) { // L: 49 this.defaultStr = var1.readStringCp1252NullTerminated(); - } else if (var2 == 4) { // L: 46 + } else if (var2 == 4) { // L: 50 this.defaultInt = var1.readInt(); } else { int var3; - if (var2 == 5) { // L: 47 - this.outputCount = var1.readUnsignedShort(); // L: 48 - this.keys = new int[this.outputCount]; // L: 49 - this.strVals = new String[this.outputCount]; // L: 50 + if (var2 == 5) { // L: 51 + this.outputCount = var1.readUnsignedShort(); // L: 52 + this.keys = new int[this.outputCount]; // L: 53 + this.strVals = new String[this.outputCount]; // L: 54 - for (var3 = 0; var3 < this.outputCount; ++var3) { // L: 51 - this.keys[var3] = var1.readInt(); // L: 52 - this.strVals[var3] = var1.readStringCp1252NullTerminated(); // L: 53 + for (var3 = 0; var3 < this.outputCount; ++var3) { // L: 55 + this.keys[var3] = var1.readInt(); // L: 56 + this.strVals[var3] = var1.readStringCp1252NullTerminated(); // L: 57 } - } else if (var2 == 6) { // L: 56 - this.outputCount = var1.readUnsignedShort(); // L: 57 - this.keys = new int[this.outputCount]; // L: 58 - this.intVals = new int[this.outputCount]; // L: 59 + } else if (var2 == 6) { // L: 60 + this.outputCount = var1.readUnsignedShort(); // L: 61 + this.keys = new int[this.outputCount]; // L: 62 + this.intVals = new int[this.outputCount]; // L: 63 - for (var3 = 0; var3 < this.outputCount; ++var3) { // L: 60 - this.keys[var3] = var1.readInt(); // L: 61 - this.intVals[var3] = var1.readInt(); // L: 62 + for (var3 = 0; var3 < this.outputCount; ++var3) { // L: 64 + this.keys[var3] = var1.readInt(); // L: 65 + this.intVals[var3] = var1.readInt(); // L: 66 } } } - } // L: 66 + } // L: 70 - @ObfuscatedName("g") + @ObfuscatedName("p") @ObfuscatedSignature( descriptor = "(I)I", - garbageValue = "713399938" + garbageValue = "-149949948" ) @Export("size") public int size() { - return this.outputCount; // L: 69 + return this.outputCount; // L: 73 } - @ObfuscatedName("c") + @ObfuscatedName("j") @ObfuscatedSignature( - descriptor = "(IB)Lll;", - garbageValue = "3" + descriptor = "(Ljv;Ljava/lang/String;Ljava/lang/String;I)Lop;", + garbageValue = "-1892718374" ) - public static PrivateChatMode method2727(int var0) { - PrivateChatMode[] var1 = WorldMapRegion.method3351(); // L: 20 - - for (int var2 = 0; var2 < var1.length; ++var2) { // L: 21 - PrivateChatMode var3 = var1[var2]; // L: 22 - if (var0 == var3.field3898) { - return var3; // L: 24 - } - } - - return null; // L: 28 + @Export("SpriteBuffer_getIndexedSpriteByName") + public static IndexedSprite SpriteBuffer_getIndexedSpriteByName(AbstractArchive var0, String var1, String var2) { + int var3 = var0.getGroupId(var1); // L: 109 + int var4 = var0.getFileId(var3, var2); // L: 110 + return AbstractByteArrayCopier.method4802(var0, var3, var4); // L: 111 } } diff --git a/runescape-client/src/main/java/Enumerated.java b/runescape-client/src/main/java/Enumerated.java index f121a68917..d9e73460f8 100644 --- a/runescape-client/src/main/java/Enumerated.java +++ b/runescape-client/src/main/java/Enumerated.java @@ -3,13 +3,13 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ke") +@ObfuscatedName("kj") @Implements("Enumerated") public interface Enumerated { - @ObfuscatedName("h") + @ObfuscatedName("v") @ObfuscatedSignature( descriptor = "(I)I", - garbageValue = "-708237537" + garbageValue = "-907662946" ) @Export("rsOrdinal") int rsOrdinal(); diff --git a/runescape-client/src/main/java/EvictingDualNodeHashTable.java b/runescape-client/src/main/java/EvictingDualNodeHashTable.java index 03aa7e5df1..ca9d02058d 100644 --- a/runescape-client/src/main/java/EvictingDualNodeHashTable.java +++ b/runescape-client/src/main/java/EvictingDualNodeHashTable.java @@ -3,35 +3,35 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ho") +@ObfuscatedName("hz") @Implements("EvictingDualNodeHashTable") public final class EvictingDualNodeHashTable { - @ObfuscatedName("h") + @ObfuscatedName("v") @ObfuscatedSignature( descriptor = "Lmf;" ) - DualNode field2561; - @ObfuscatedName("c") + DualNode field2566; + @ObfuscatedName("n") @Export("capacity") int capacity; - @ObfuscatedName("o") + @ObfuscatedName("f") @Export("remainingCapacity") int remainingCapacity; - @ObfuscatedName("g") + @ObfuscatedName("y") @ObfuscatedSignature( - descriptor = "Lmo;" + descriptor = "Lmr;" ) @Export("hashTable") IterableNodeHashTable hashTable; - @ObfuscatedName("l") + @ObfuscatedName("p") @ObfuscatedSignature( - descriptor = "Lkd;" + descriptor = "Lko;" ) @Export("deque") IterableDualNodeQueue deque; public EvictingDualNodeHashTable(int var1) { - this.field2561 = new DualNode(); // L: 8 + this.field2566 = new DualNode(); // L: 8 this.deque = new IterableDualNodeQueue(); // L: 12 this.capacity = var1; // L: 15 this.remainingCapacity = var1; // L: 16 @@ -43,7 +43,7 @@ public final class EvictingDualNodeHashTable { this.hashTable = new IterableNodeHashTable(var2); // L: 19 } // L: 20 - @ObfuscatedName("h") + @ObfuscatedName("v") @ObfuscatedSignature( descriptor = "(J)Lmf;" ) @@ -57,7 +57,7 @@ public final class EvictingDualNodeHashTable { return var3; // L: 28 } - @ObfuscatedName("c") + @ObfuscatedName("n") @Export("remove") public void remove(long var1) { DualNode var3 = (DualNode)this.hashTable.get(var1); // L: 32 @@ -69,7 +69,7 @@ public final class EvictingDualNodeHashTable { } // L: 38 - @ObfuscatedName("o") + @ObfuscatedName("f") @ObfuscatedSignature( descriptor = "(Lmf;J)V" ) @@ -79,7 +79,7 @@ public final class EvictingDualNodeHashTable { DualNode var4 = this.deque.removeLast(); // L: 42 var4.remove(); // L: 43 var4.removeDual(); // L: 44 - if (var4 == this.field2561) { // L: 45 + if (var4 == this.field2566) { // L: 45 var4 = this.deque.removeLast(); // L: 46 var4.remove(); // L: 47 var4.removeDual(); // L: 48 @@ -92,12 +92,12 @@ public final class EvictingDualNodeHashTable { this.deque.add(var1); // L: 53 } // L: 54 - @ObfuscatedName("g") + @ObfuscatedName("y") @Export("clear") public void clear() { this.deque.clear(); // L: 57 this.hashTable.clear(); // L: 58 - this.field2561 = new DualNode(); // L: 59 + this.field2566 = new DualNode(); // L: 59 this.remainingCapacity = this.capacity; // L: 60 } // L: 61 } diff --git a/runescape-client/src/main/java/FaceNormal.java b/runescape-client/src/main/java/FaceNormal.java index beff089ead..e54bc84558 100644 --- a/runescape-client/src/main/java/FaceNormal.java +++ b/runescape-client/src/main/java/FaceNormal.java @@ -1,28 +1,39 @@ -import java.io.IOException; +import java.io.File; +import java.io.RandomAccessFile; 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("gt") +@ObfuscatedName("gk") @Implements("FaceNormal") public class FaceNormal { - @ObfuscatedName("h") + @ObfuscatedName("j") @ObfuscatedGetter( - intValue = 1370299305 + intValue = -311250571 + ) + static int field2363; + @ObfuscatedName("bq") + @ObfuscatedSignature( + descriptor = "Ljk;" + ) + static GameBuild field2365; + @ObfuscatedName("v") + @ObfuscatedGetter( + intValue = 771770075 ) @Export("x") int x; - @ObfuscatedName("c") + @ObfuscatedName("n") @ObfuscatedGetter( - intValue = 937419017 + intValue = -1803245333 ) @Export("y") int y; - @ObfuscatedName("o") + @ObfuscatedName("f") @ObfuscatedGetter( - intValue = -1295456613 + intValue = -1870263719 ) @Export("z") int z; @@ -30,84 +41,27 @@ public class FaceNormal { FaceNormal() { } // L: 8 - @ObfuscatedName("c") + @ObfuscatedName("n") @ObfuscatedSignature( - descriptor = "(Llc;ZI)V", - garbageValue = "273969388" + descriptor = "(Ljava/io/File;ZI)Z", + garbageValue = "-920183026" ) - public static void method4081(AbstractSocket var0, boolean var1) { - if (NetCache.NetCache_socket != null) { // L: 193 - try { - NetCache.NetCache_socket.close(); // L: 195 - } catch (Exception var8) { // L: 197 + @Export("isWriteable") + public static boolean isWriteable(File var0, boolean var1) { + try { + RandomAccessFile var2 = new RandomAccessFile(var0, "rw"); // L: 151 + int var3 = var2.read(); // L: 152 + var2.seek(0L); // L: 153 + var2.write(var3); // L: 154 + var2.seek(0L); // L: 155 + var2.close(); // L: 156 + if (var1) { // L: 157 + var0.delete(); } - NetCache.NetCache_socket = null; // L: 198 - } - - NetCache.NetCache_socket = var0; // L: 200 - Buffer var2; - if (NetCache.NetCache_socket != null) { // L: 202 - try { - var2 = new Buffer(4); // L: 204 - var2.writeByte(var1 ? 2 : 3); // L: 205 - var2.writeMedium(0); // L: 206 - NetCache.NetCache_socket.write(var2.array, 0, 4); // L: 207 - } catch (IOException var7) { - try { - NetCache.NetCache_socket.close(); // L: 211 - } catch (Exception var6) { // L: 213 - } - - ++NetCache.NetCache_ioExceptions; // L: 214 - NetCache.NetCache_socket = null; // L: 215 - } - } - - NetCache.NetCache_responseHeaderBuffer.offset = 0; // L: 218 - class7.NetCache_currentResponse = null; // L: 219 - NetCache.NetCache_responseArchiveBuffer = null; // L: 220 - NetCache.field3626 = 0; // L: 221 - - while (true) { - NetFileRequest var9 = (NetFileRequest)NetCache.NetCache_pendingPriorityResponses.first(); // L: 223 - if (var9 == null) { // L: 224 - while (true) { - var9 = (NetFileRequest)NetCache.NetCache_pendingResponses.first(); // L: 230 - if (var9 == null) { // L: 231 - if (NetCache.field3629 != 0) { // L: 237 - try { - var2 = new Buffer(4); // L: 239 - var2.writeByte(4); // L: 240 - var2.writeByte(NetCache.field3629); // L: 241 - var2.writeShort(0); // L: 242 - NetCache.NetCache_socket.write(var2.array, 0, 4); // L: 243 - } catch (IOException var5) { - try { - NetCache.NetCache_socket.close(); // L: 247 - } catch (Exception var4) { // L: 249 - } - - ++NetCache.NetCache_ioExceptions; // L: 250 - NetCache.NetCache_socket = null; // L: 251 - } - } - - NetCache.NetCache_loadTime = 0; // L: 254 - SecureRandomCallable.field1108 = Archive.currentTimeMillis(); // L: 255 - return; // L: 256 - } - - NetCache.NetCache_pendingWritesQueue.addLast(var9); // L: 232 - NetCache.NetCache_pendingWrites.put(var9, var9.key); // L: 233 - ++NetCache.NetCache_pendingWritesCount; // L: 234 - --NetCache.NetCache_pendingResponsesCount; // L: 235 - } - } - - NetCache.NetCache_pendingPriorityWrites.put(var9, var9.key); // L: 225 - ++NetCache.NetCache_pendingPriorityWritesCount; // L: 226 - --NetCache.NetCache_pendingPriorityResponsesCount; // L: 227 + return true; // L: 158 + } catch (Exception var4) { // L: 160 + return false; // L: 161 } } } diff --git a/runescape-client/src/main/java/FileSystem.java b/runescape-client/src/main/java/FileSystem.java index 5632909095..6c2aafec29 100644 --- a/runescape-client/src/main/java/FileSystem.java +++ b/runescape-client/src/main/java/FileSystem.java @@ -2,139 +2,100 @@ import java.io.File; import java.util.Hashtable; 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("el") +@ObfuscatedName("ec") @Implements("FileSystem") public class FileSystem { - @ObfuscatedName("h") + @ObfuscatedName("v") @Export("FileSystem_hasPermissions") - static boolean FileSystem_hasPermissions; - @ObfuscatedName("c") + public static boolean FileSystem_hasPermissions; + @ObfuscatedName("n") @Export("FileSystem_cacheDir") - static File FileSystem_cacheDir; - @ObfuscatedName("o") + public static File FileSystem_cacheDir; + @ObfuscatedName("f") @Export("FileSystem_cacheFiles") static Hashtable FileSystem_cacheFiles; - @ObfuscatedName("x") - @ObfuscatedSignature( - descriptor = "Ljp;" - ) - @Export("Widget_fontsArchive") - static AbstractArchive Widget_fontsArchive; - @ObfuscatedName("fm") - @ObfuscatedGetter( - longValue = -9193432977542192121L - ) - static long field1486; static { FileSystem_hasPermissions = false; // L: 7 FileSystem_cacheFiles = new Hashtable(16); } // L: 9 - @ObfuscatedName("c") - @ObfuscatedSignature( - descriptor = "(IIIII)V", - garbageValue = "1134946214" - ) - static final void method2542(int var0, int var1, int var2, int var3) { - for (int var4 = var1; var4 <= var3 + var1; ++var4) { // L: 63 - for (int var5 = var0; var5 <= var0 + var2; ++var5) { // L: 64 - if (var5 >= 0 && var5 < 104 && var4 >= 0 && var4 < 104) { // L: 65 - Tiles.field1090[0][var5][var4] = 127; // L: 66 - if (var0 == var5 && var5 > 0) { // L: 67 - Tiles.Tiles_heights[0][var5][var4] = Tiles.Tiles_heights[0][var5 - 1][var4]; - } - - if (var0 + var2 == var5 && var5 < 103) { // L: 68 - Tiles.Tiles_heights[0][var5][var4] = Tiles.Tiles_heights[0][var5 + 1][var4]; - } - - if (var4 == var1 && var4 > 0) { // L: 69 - Tiles.Tiles_heights[0][var5][var4] = Tiles.Tiles_heights[0][var5][var4 - 1]; - } - - if (var3 + var1 == var4 && var4 < 103) { // L: 70 - Tiles.Tiles_heights[0][var5][var4] = Tiles.Tiles_heights[0][var5][var4 + 1]; - } - } - } - } - - } // L: 74 - - @ObfuscatedName("ft") + @ObfuscatedName("j") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "-1955007405" + garbageValue = "383441651" ) - @Export("logOut") - static final void logOut() { - Client.packetWriter.close(); // L: 3006 - PrivateChatMode.method5815(); // L: 3008 - class44.method494(); // L: 3009 - KitDefinition.KitDefinition_cached.clear(); // L: 3011 - class32.method365(); // L: 3013 - JagexCache.method2538(); // L: 3014 - ItemComposition.ItemDefinition_cached.clear(); // L: 3016 - ItemComposition.ItemDefinition_cachedModels.clear(); // L: 3017 - ItemComposition.ItemDefinition_cachedSprites.clear(); // L: 3018 - SequenceDefinition.SequenceDefinition_cached.clear(); // L: 3021 - SequenceDefinition.SequenceDefinition_cachedFrames.clear(); // L: 3022 - UserComparator8.method2447(); // L: 3024 - VarbitComposition.VarbitDefinition_cached.clear(); // L: 3026 - class169.method3493(); // L: 3028 - class7.field60.method6309(); // L: 3029 - ModeWhere.HitSplatDefinition_cachedSprites.method6309(); // L: 3030 - ScriptFrame.method1162(); // L: 3031 - HealthBarDefinition.HealthBarDefinition_cached.clear(); // L: 3033 - HealthBarDefinition.HealthBarDefinition_cachedSprites.clear(); // L: 3034 - StructComposition.StructDefinition_cached.clear(); // L: 3037 - UrlRequester.method2422(); // L: 3039 - class12.method202(); // L: 3040 - PlayerComposition.PlayerAppearance_cachedModels.clear(); // L: 3042 - HealthBarUpdate.method2200(); // L: 3044 - ((TextureProvider)Rasterizer3D.Rasterizer3D_textureLoader).clear(); // L: 3045 - Script.Script_cached.clear(); // L: 3046 - MilliClock.archive0.clearFiles(); // L: 3047 - class0.archive1.clearFiles(); // L: 3048 - EnumComposition.archive3.clearFiles(); // L: 3049 - class14.archive4.clearFiles(); // L: 3050 - WorldMapSection0.archive5.clearFiles(); // L: 3051 - class29.archive6.clearFiles(); // L: 3052 - class260.archive7.clearFiles(); // L: 3053 - class43.archive8.clearFiles(); // L: 3054 - GameBuild.archive9.clearFiles(); // L: 3055 - PendingSpawn.archive10.clearFiles(); // L: 3056 - KeyHandler.archive11.clearFiles(); // L: 3057 - class22.archive12.clearFiles(); // L: 3058 - class5.scene.clear(); // L: 3060 + public static void method2548() { + ParamComposition.ParamDefinition_cached.clear(); // L: 68 + } // L: 69 - for (int var0 = 0; var0 < 4; ++var0) { // L: 3061 - Client.collisionMaps[var0].clear(); + @ObfuscatedName("g") + @ObfuscatedSignature( + descriptor = "(I)V", + garbageValue = "-26460885" + ) + static final void method2545() { + if (!ViewportMouse.ViewportMouse_false0) { // L: 120 + int var0 = Scene.Scene_cameraPitchSine; // L: 121 + int var1 = Scene.Scene_cameraPitchCosine; // L: 122 + int var2 = Scene.Scene_cameraYawSine; // L: 123 + int var3 = Scene.Scene_cameraYawCosine; // L: 124 + byte var4 = 50; // L: 125 + short var5 = 3500; // L: 126 + int var6 = (ViewportMouse.ViewportMouse_x - Rasterizer3D.Rasterizer3D_clipMidX) * var4 / Rasterizer3D.Rasterizer3D_zoom; // L: 127 + int var7 = (ViewportMouse.ViewportMouse_y - Rasterizer3D.Rasterizer3D_clipMidY) * var4 / Rasterizer3D.Rasterizer3D_zoom; // L: 128 + int var8 = (ViewportMouse.ViewportMouse_x - Rasterizer3D.Rasterizer3D_clipMidX) * var5 / Rasterizer3D.Rasterizer3D_zoom; // L: 129 + int var9 = (ViewportMouse.ViewportMouse_y - Rasterizer3D.Rasterizer3D_clipMidY) * var5 / Rasterizer3D.Rasterizer3D_zoom; // L: 130 + int var10 = Rasterizer3D.method3867(var7, var4, var1, var0); // L: 132 + int var11 = Rasterizer3D.method3897(var7, var4, var1, var0); // L: 133 + var7 = var10; // L: 134 + var10 = Rasterizer3D.method3867(var9, var5, var1, var0); // L: 135 + int var12 = Rasterizer3D.method3897(var9, var5, var1, var0); // L: 136 + var9 = var10; // L: 137 + var10 = Rasterizer3D.method3865(var6, var11, var3, var2); // L: 138 + var11 = Rasterizer3D.method3866(var6, var11, var3, var2); // L: 139 + var6 = var10; // L: 140 + var10 = Rasterizer3D.method3865(var8, var12, var3, var2); // L: 141 + var12 = Rasterizer3D.method3866(var8, var12, var3, var2); // L: 142 + ViewportMouse.field2492 = (var10 + var6) / 2; // L: 144 + class249.field3118 = (var9 + var7) / 2; // L: 145 + ViewportMouse.field2497 = (var12 + var11) / 2; // L: 146 + ViewportMouse.field2496 = (var10 - var6) / 2; // L: 147 + WorldMapDecoration.field2082 = (var9 - var7) / 2; // L: 148 + DirectByteArrayCopier.field3126 = (var12 - var11) / 2; // L: 149 + class161.field1920 = Math.abs(ViewportMouse.field2496); // L: 150 + class15.field140 = Math.abs(WorldMapDecoration.field2082); // L: 151 + ApproximateRouteStrategy.field629 = Math.abs(DirectByteArrayCopier.field3126); // L: 152 } + } // L: 153 - System.gc(); // L: 3062 - class390.method6744(2); // L: 3063 - Client.currentTrackGroupId = -1; // L: 3064 - Client.field866 = false; // L: 3065 + @ObfuscatedName("hv") + @ObfuscatedSignature( + descriptor = "(III)V", + garbageValue = "-828545505" + ) + static final void method2547(int var0, int var1) { + if (Client.menuOptionsCount >= 2 || Client.isItemSelected != 0 || Client.isSpellSelected) { // L: 7602 + if (Client.showMouseOverText) { // L: 7603 + int var2 = MilliClock.method2588(); // L: 7604 + String var3; + if (Client.isItemSelected == 1 && Client.menuOptionsCount < 2) { // L: 7606 + var3 = "Use" + " " + Client.selectedItemName + " " + "->"; + } else if (Client.isSpellSelected && Client.menuOptionsCount < 2) { // L: 7607 + var3 = Client.selectedSpellActionName + " " + Client.selectedSpellName + " " + "->"; + } else { + var3 = MouseRecorder.method2098(var2); // L: 7608 + } - for (ObjectSound var1 = (ObjectSound)ObjectSound.objectSounds.last(); var1 != null; var1 = (ObjectSound)ObjectSound.objectSounds.previous()) { // L: 3067 - if (var1.stream1 != null) { // L: 3068 - FloorOverlayDefinition.pcmStreamMixer.removeSubStream(var1.stream1); // L: 3069 - var1.stream1 = null; // L: 3070 - } + if (Client.menuOptionsCount > 2) { // L: 7609 + var3 = var3 + class44.colorStartTag(16777215) + " " + '/' + " " + (Client.menuOptionsCount - 2) + " more options"; + } - if (var1.stream2 != null) { // L: 3072 - FloorOverlayDefinition.pcmStreamMixer.removeSubStream(var1.stream2); // L: 3073 - var1.stream2 = null; // L: 3074 + Widget.fontBold12.drawRandomAlphaAndSpacing(var3, var0 + 4, var1 + 15, 16777215, 0, Client.cycle / 1000); // L: 7610 } } - - ObjectSound.objectSounds.clear(); // L: 3077 - Client.updateGameState(10); // L: 3079 - } // L: 3080 + } // L: 7611 } diff --git a/runescape-client/src/main/java/FillMode.java b/runescape-client/src/main/java/FillMode.java index cf6dc36213..5002f6dc61 100644 --- a/runescape-client/src/main/java/FillMode.java +++ b/runescape-client/src/main/java/FillMode.java @@ -4,49 +4,49 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; +@ObfuscatedName("on") @Implements("FillMode") -@ObfuscatedName("oq") public enum FillMode implements Enumerated { - @ObfuscatedName("h") + @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "Loq;" + descriptor = "Lon;" ) @Export("SOLID") SOLID(0, 0), - @ObfuscatedName("c") + @ObfuscatedName("n") @ObfuscatedSignature( - descriptor = "Loq;" + descriptor = "Lon;" ) - field4234(1, 1), - @ObfuscatedName("o") + field4233(1, 1), + @ObfuscatedName("f") @ObfuscatedSignature( - descriptor = "Loq;" + descriptor = "Lon;" ) - field4235(2, 2); + field4232(2, 2); - @ObfuscatedName("g") + @ObfuscatedName("y") @ObfuscatedGetter( - intValue = 1063564995 + intValue = -662302415 ) - public final int field4236; - @ObfuscatedName("l") + public final int field4230; + @ObfuscatedName("p") @ObfuscatedGetter( - intValue = 198879841 + intValue = -1060401875 ) - final int field4237; + final int field4234; FillMode(int var3, int var4) { - this.field4236 = var3; // L: 19 - this.field4237 = var4; // L: 20 + this.field4230 = var3; // L: 19 + this.field4234 = var4; // L: 20 } // L: 21 - @ObfuscatedName("h") + @ObfuscatedName("v") @ObfuscatedSignature( descriptor = "(I)I", - garbageValue = "-708237537" + garbageValue = "-907662946" ) @Export("rsOrdinal") public int rsOrdinal() { - return this.field4237; // L: 24 + return this.field4234; // L: 24 } } diff --git a/runescape-client/src/main/java/FloorDecoration.java b/runescape-client/src/main/java/FloorDecoration.java index b8cc7e2285..a9c06db709 100644 --- a/runescape-client/src/main/java/FloorDecoration.java +++ b/runescape-client/src/main/java/FloorDecoration.java @@ -4,48 +4,42 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("gd") +@ObfuscatedName("go") @Implements("FloorDecoration") public final class FloorDecoration { - @ObfuscatedName("t") - @ObfuscatedSignature( - descriptor = "Ljp;" - ) - @Export("ItemDefinition_modelArchive") - static AbstractArchive ItemDefinition_modelArchive; - @ObfuscatedName("h") + @ObfuscatedName("v") @ObfuscatedGetter( - intValue = 1666950009 + intValue = 859770957 ) @Export("tileHeight") int tileHeight; - @ObfuscatedName("c") + @ObfuscatedName("n") @ObfuscatedGetter( - intValue = 2121076865 + intValue = -1864149275 ) @Export("x") int x; - @ObfuscatedName("o") + @ObfuscatedName("f") @ObfuscatedGetter( - intValue = -1721468405 + intValue = -1474470851 ) @Export("y") int y; - @ObfuscatedName("g") + @ObfuscatedName("y") @ObfuscatedSignature( - descriptor = "Lge;" + descriptor = "Lgl;" ) @Export("renderable") public Renderable renderable; - @ObfuscatedName("l") + @ObfuscatedName("p") @ObfuscatedGetter( - longValue = -1483946918703188851L + longValue = 5096767537878498943L ) @Export("tag") public long tag; - @ObfuscatedName("z") + @ObfuscatedName("j") @ObfuscatedGetter( - intValue = -895600119 + intValue = -383801797 ) @Export("flags") int flags; @@ -53,12 +47,37 @@ public final class FloorDecoration { FloorDecoration() { } // L: 11 - @ObfuscatedName("hd") + @ObfuscatedName("y") @ObfuscatedSignature( - descriptor = "(I)Z", - garbageValue = "296096631" + descriptor = "(I)[Lmi;", + garbageValue = "-71321726" ) - static boolean method3799() { - return (Client.drawPlayerNames & 1) != 0; // L: 4834 + static class338[] method3834() { + return new class338[]{class338.field3914, class338.field3916, class338.field3915, class338.field3917}; // L: 16 } + + @ObfuscatedName("ak") + @ObfuscatedSignature( + descriptor = "(IB)V", + garbageValue = "-15" + ) + @Export("runWidgetOnLoadListener") + static void runWidgetOnLoadListener(int var0) { + if (var0 != -1) { // L: 4321 + if (Clock.loadInterface(var0)) { // L: 4322 + Widget[] var1 = Widget.Widget_interfaceComponents[var0]; // L: 4323 + + for (int var2 = 0; var2 < var1.length; ++var2) { // L: 4324 + Widget var3 = var1[var2]; // L: 4325 + if (var3.onLoad != null) { // L: 4326 + ScriptEvent var4 = new ScriptEvent(); // L: 4327 + var4.widget = var3; // L: 4328 + var4.args = var3.onLoad; // L: 4329 + World.runScript(var4, 5000000, 0); // L: 4330 + } + } + + } + } + } // L: 4333 } diff --git a/runescape-client/src/main/java/FloorOverlayDefinition.java b/runescape-client/src/main/java/FloorOverlayDefinition.java index 4a7415a9f1..9aa9000fc3 100644 --- a/runescape-client/src/main/java/FloorOverlayDefinition.java +++ b/runescape-client/src/main/java/FloorOverlayDefinition.java @@ -3,80 +3,70 @@ 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("er") +@ObfuscatedName("eo") @Implements("FloorOverlayDefinition") public class FloorOverlayDefinition extends DualNode { - @ObfuscatedName("qb") + @ObfuscatedName("n") @ObfuscatedSignature( - descriptor = "Lar;" - ) - @Export("pcmStreamMixer") - static PcmStreamMixer pcmStreamMixer; - @ObfuscatedName("qi") - @Export("ClanChat_inClanChat") - static boolean ClanChat_inClanChat; - @ObfuscatedName("c") - @ObfuscatedSignature( - descriptor = "Lho;" + descriptor = "Lhz;" ) @Export("FloorOverlayDefinition_cached") - static EvictingDualNodeHashTable FloorOverlayDefinition_cached; - @ObfuscatedName("o") + public static EvictingDualNodeHashTable FloorOverlayDefinition_cached; + @ObfuscatedName("f") @ObfuscatedGetter( - intValue = 1001309157 + intValue = -313850043 ) @Export("primaryRgb") public int primaryRgb; - @ObfuscatedName("g") + @ObfuscatedName("y") @ObfuscatedGetter( - intValue = -62801967 + intValue = -1167855135 ) @Export("texture") public int texture; - @ObfuscatedName("l") + @ObfuscatedName("p") @Export("hideUnderlay") public boolean hideUnderlay; - @ObfuscatedName("z") + @ObfuscatedName("j") @ObfuscatedGetter( - intValue = -1070753701 + intValue = 1447154143 ) @Export("secondaryRgb") public int secondaryRgb; - @ObfuscatedName("t") + @ObfuscatedName("r") @ObfuscatedGetter( - intValue = 1137076507 + intValue = 1593028731 ) @Export("hue") public int hue; - @ObfuscatedName("v") + @ObfuscatedName("b") @ObfuscatedGetter( - intValue = -1165641247 + intValue = -1490944887 ) @Export("saturation") public int saturation; - @ObfuscatedName("b") + @ObfuscatedName("d") @ObfuscatedGetter( - intValue = -1846121867 + intValue = 1914058459 ) @Export("lightness") public int lightness; - @ObfuscatedName("q") + @ObfuscatedName("s") @ObfuscatedGetter( - intValue = 1497091503 + intValue = 1757390819 ) @Export("secondaryHue") public int secondaryHue; - @ObfuscatedName("i") + @ObfuscatedName("u") @ObfuscatedGetter( - intValue = 85102399 + intValue = -1776147055 ) @Export("secondarySaturation") public int secondarySaturation; - @ObfuscatedName("x") + @ObfuscatedName("l") @ObfuscatedGetter( - intValue = 128394293 + intValue = -1239811963 ) @Export("secondaryLightness") public int secondaryLightness; @@ -88,199 +78,337 @@ public class FloorOverlayDefinition extends DualNode { FloorOverlayDefinition() { this.primaryRgb = 0; // L: 12 this.texture = -1; // L: 13 - this.hideUnderlay = true; // L: 14 + this.hideUnderlay = true; this.secondaryRgb = -1; // L: 15 } // L: 23 - @ObfuscatedName("o") + @ObfuscatedName("n") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "281376633" + garbageValue = "-593078672" ) @Export("postDecode") void postDecode() { - if (this.secondaryRgb != -1) { // L: 41 - this.setHsl(this.secondaryRgb); - this.secondaryHue = this.hue; // L: 43 - this.secondarySaturation = this.saturation; - this.secondaryLightness = this.lightness; + if (this.secondaryRgb != -1) { // L: 37 + this.setHsl(this.secondaryRgb); // L: 38 + this.secondaryHue = this.hue; // L: 39 + this.secondarySaturation = this.saturation; // L: 40 + this.secondaryLightness = this.lightness; // L: 41 } - this.setHsl(this.primaryRgb); // L: 47 - } // L: 48 + this.setHsl(this.primaryRgb); // L: 43 + } // L: 44 - @ObfuscatedName("g") + @ObfuscatedName("f") @ObfuscatedSignature( - descriptor = "(Lnk;II)V", - garbageValue = "-1967254458" + descriptor = "(Lnd;II)V", + garbageValue = "-1052896488" ) @Export("decode") void decode(Buffer var1, int var2) { while (true) { - int var3 = var1.readUnsignedByte(); // L: 52 - if (var3 == 0) { // L: 53 - return; // L: 56 + int var3 = var1.readUnsignedByte(); // L: 48 + if (var3 == 0) { // L: 49 + return; // L: 52 } - this.decodeNext(var1, var3, var2); // L: 54 + this.decodeNext(var1, var3, var2); // L: 50 } } - @ObfuscatedName("l") + @ObfuscatedName("y") @ObfuscatedSignature( - descriptor = "(Lnk;III)V", - garbageValue = "1171237603" + descriptor = "(Lnd;III)V", + garbageValue = "666748128" ) @Export("decodeNext") void decodeNext(Buffer var1, int var2, int var3) { - if (var2 == 1) { // L: 59 + if (var2 == 1) { // L: 55 this.primaryRgb = var1.readMedium(); - } else if (var2 == 2) { // L: 60 - this.texture = var1.readUnsignedByte(); - } else if (var2 == 5) { // L: 61 + } else if (var2 == 2) { + this.texture = var1.readUnsignedByte(); // L: 56 + } else if (var2 == 5) { // L: 57 this.hideUnderlay = false; - } else if (var2 == 7) { // L: 62 - this.secondaryRgb = var1.readMedium(); - } else if (var2 == 8) { // L: 63 + } else if (var2 == 7) { + this.secondaryRgb = var1.readMedium(); // L: 58 + } else if (var2 == 8) { // L: 59 } - } // L: 65 + } // L: 61 - @ObfuscatedName("z") + @ObfuscatedName("p") @ObfuscatedSignature( descriptor = "(II)V", - garbageValue = "-2102756856" + garbageValue = "273923551" ) @Export("setHsl") void setHsl(int var1) { - double var2 = (double)(var1 >> 16 & 255) / 256.0D; // L: 68 - double var4 = (double)(var1 >> 8 & 255) / 256.0D; // L: 69 - double var6 = (double)(var1 & 255) / 256.0D; // L: 70 - double var8 = var2; // L: 71 - if (var4 < var2) { // L: 72 + double var2 = (double)(var1 >> 16 & 255) / 256.0D; // L: 64 + double var4 = (double)(var1 >> 8 & 255) / 256.0D; // L: 65 + double var6 = (double)(var1 & 255) / 256.0D; // L: 66 + double var8 = var2; // L: 67 + if (var4 < var2) { // L: 68 var8 = var4; } - if (var6 < var8) { // L: 73 + if (var6 < var8) { // L: 69 var8 = var6; } - double var10 = var2; // L: 74 - if (var4 > var2) { // L: 75 + double var10 = var2; // L: 70 + if (var4 > var2) { // L: 71 var10 = var4; } - if (var6 > var10) { // L: 76 + if (var6 > var10) { // L: 72 var10 = var6; } - double var12 = 0.0D; // L: 77 - double var14 = 0.0D; // L: 78 - double var16 = (var8 + var10) / 2.0D; // L: 79 - if (var10 != var8) { // L: 80 - if (var16 < 0.5D) { // L: 81 + double var12 = 0.0D; // L: 73 + double var14 = 0.0D; // L: 74 + double var16 = (var10 + var8) / 2.0D; // L: 75 + if (var8 != var10) { // L: 76 + if (var16 < 0.5D) { // L: 77 var14 = (var10 - var8) / (var8 + var10); } - if (var16 >= 0.5D) { // L: 82 + if (var16 >= 0.5D) { // L: 78 var14 = (var10 - var8) / (2.0D - var10 - var8); } - if (var2 == var10) { // L: 83 + if (var10 == var2) { // L: 79 var12 = (var4 - var6) / (var10 - var8); - } else if (var4 == var10) { // L: 84 + } else if (var4 == var10) { // L: 80 var12 = (var6 - var2) / (var10 - var8) + 2.0D; } else if (var10 == var6) { - var12 = (var2 - var4) / (var10 - var8) + 4.0D; // L: 85 + var12 = 4.0D + (var2 - var4) / (var10 - var8); // L: 81 } } - var12 /= 6.0D; // L: 87 - this.hue = (int)(var12 * 256.0D); // L: 88 - this.saturation = (int)(var14 * 256.0D); // L: 89 - this.lightness = (int)(256.0D * var16); // L: 90 - if (this.saturation < 0) { // L: 91 + var12 /= 6.0D; // L: 83 + this.hue = (int)(256.0D * var12); // L: 84 + this.saturation = (int)(256.0D * var14); // L: 85 + this.lightness = (int)(256.0D * var16); // L: 86 + if (this.saturation < 0) { // L: 87 this.saturation = 0; - } else if (this.saturation > 255) { // L: 92 + } else if (this.saturation > 255) { // L: 88 this.saturation = 255; } - if (this.lightness < 0) { // L: 93 + if (this.lightness < 0) { // L: 89 this.lightness = 0; - } else if (this.lightness > 255) { // L: 94 + } else if (this.lightness > 255) { // L: 90 this.lightness = 255; } - } // L: 95 + } // L: 91 - @ObfuscatedName("h") + @ObfuscatedName("y") @ObfuscatedSignature( - descriptor = "(Low;IIII)V", - garbageValue = "-1684210447" + descriptor = "(S)[Len;", + garbageValue = "-10573" ) - static void method3052(SpritePixels var0, int var1, int var2, int var3) { - DemotingHashTable var4 = WorldMapRegion.WorldMapRegion_cachedSprites; // L: 38 - long var6 = (long)(var3 << 16 | var1 << 8 | var2); // L: 42 - var4.put(var0, var6, var0.pixels.length * 4); // L: 44 - } // L: 45 - - @ObfuscatedName("r") - @ObfuscatedSignature( - descriptor = "(ILci;ZI)I", - garbageValue = "2095665462" - ) - static int method3049(int var0, Script var1, boolean var2) { - Widget var3 = var2 ? class308.scriptDotWidget : class24.scriptActiveWidget; // L: 1103 - if (var0 == ScriptOpcodes.CC_GETSCROLLX) { // L: 1104 - Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = var3.scrollX; // L: 1105 - return 1; // L: 1106 - } else if (var0 == ScriptOpcodes.CC_GETSCROLLY) { // L: 1108 - Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = var3.scrollY; // L: 1109 - return 1; // L: 1110 - } else if (var0 == ScriptOpcodes.CC_GETTEXT) { // L: 1112 - Interpreter.Interpreter_stringStack[++class13.Interpreter_stringStackSize - 1] = var3.text; // L: 1113 - return 1; // L: 1114 - } else if (var0 == ScriptOpcodes.CC_GETSCROLLWIDTH) { // L: 1116 - Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = var3.scrollWidth; // L: 1117 - return 1; // L: 1118 - } else if (var0 == ScriptOpcodes.CC_GETSCROLLHEIGHT) { // L: 1120 - Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = var3.scrollHeight; // L: 1121 - return 1; // L: 1122 - } else if (var0 == ScriptOpcodes.CC_GETMODELZOOM) { // L: 1124 - Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = var3.modelZoom; // L: 1125 - return 1; // L: 1126 - } else if (var0 == ScriptOpcodes.CC_GETMODELANGLE_X) { // L: 1128 - Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = var3.modelAngleX; // L: 1129 - return 1; // L: 1130 - } else if (var0 == ScriptOpcodes.CC_GETMODELANGLE_Z) { // L: 1132 - Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = var3.modelAngleZ; // L: 1133 - return 1; // L: 1134 - } else if (var0 == ScriptOpcodes.CC_GETMODELANGLE_Y) { // L: 1136 - Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = var3.modelAngleY; // L: 1137 - return 1; // L: 1138 - } else if (var0 == ScriptOpcodes.CC_GETTRANSTOP) { // L: 1140 - Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = var3.transparencyTop; // L: 1141 - return 1; // L: 1142 - } else if (var0 == ScriptOpcodes.CC_GETTRANSBOT) { // L: 1144 - Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = var3.transparencyBot; // L: 1145 - return 1; // L: 1146 - } else if (var0 == ScriptOpcodes.CC_GETCOLOUR) { // L: 1148 - Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = var3.color; // L: 1149 - return 1; // L: 1150 - } else if (var0 == ScriptOpcodes.CC_GETFILLCOLOUR) { // L: 1152 - Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = var3.color2; // L: 1153 - return 1; // L: 1154 - } else if (var0 == ScriptOpcodes.CC_GETFILLMODE) { // L: 1156 - Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = var3.fillMode.rsOrdinal(); // L: 1157 - return 1; // L: 1158 - } else if (var0 == ScriptOpcodes.CC_GETMODELTRANSPARENT) { // L: 1160 - Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = var3.modelTransparency ? 1 : 0; // L: 1161 - return 1; // L: 1162 - } else if (var0 != 1615 && var0 != 1616) { // L: 1164 - return 2; // L: 1168 - } else { - ++WorldMapCacheName.Interpreter_intStackSize; // L: 1165 - return 1; // L: 1166 - } + static HorizontalAlignment[] method3103() { + return new HorizontalAlignment[]{HorizontalAlignment.HorizontalAlignment_centered, HorizontalAlignment.field1628, HorizontalAlignment.field1624}; // L: 14 } + + @ObfuscatedName("ar") + @ObfuscatedSignature( + descriptor = "(Lbm;S)V", + garbageValue = "10038" + ) + @Export("PcmStream_disable") + static final void PcmStream_disable(PcmStream var0) { + var0.active = false; // L: 263 + if (var0.sound != null) { // L: 264 + var0.sound.position = 0; + } + + for (PcmStream var1 = var0.firstSubStream(); var1 != null; var1 = var0.nextSubStream()) { + PcmStream_disable(var1); // L: 265 + } + + } // L: 266 + + @ObfuscatedName("fr") + @ObfuscatedSignature( + descriptor = "(I)V", + garbageValue = "672313899" + ) + static final void method3104() { + int var0; + int var1; + int var2; + int var3; + int var4; + int var5; + if (Client.oculusOrbState == 0) { // L: 3504 + var0 = class93.localPlayer.x; // L: 3505 + var1 = class93.localPlayer.y; // L: 3506 + if (RouteStrategy.oculusOrbFocalPointX - var0 < -500 || RouteStrategy.oculusOrbFocalPointX - var0 > 500 || ModelData0.oculusOrbFocalPointY - var1 < -500 || ModelData0.oculusOrbFocalPointY - var1 > 500) { // L: 3507 + RouteStrategy.oculusOrbFocalPointX = var0; // L: 3508 + ModelData0.oculusOrbFocalPointY = var1; // L: 3509 + } + + if (var0 != RouteStrategy.oculusOrbFocalPointX) { // L: 3511 + RouteStrategy.oculusOrbFocalPointX += (var0 - RouteStrategy.oculusOrbFocalPointX) / 16; + } + + if (var1 != ModelData0.oculusOrbFocalPointY) { // L: 3512 + ModelData0.oculusOrbFocalPointY += (var1 - ModelData0.oculusOrbFocalPointY) / 16; + } + + var2 = RouteStrategy.oculusOrbFocalPointX >> 7; // L: 3513 + var3 = ModelData0.oculusOrbFocalPointY >> 7; // L: 3514 + var4 = class105.getTileHeight(RouteStrategy.oculusOrbFocalPointX, ModelData0.oculusOrbFocalPointY, class22.Client_plane); // L: 3515 + var5 = 0; // L: 3516 + int var6; + if (var2 > 3 && var3 > 3 && var2 < 100 && var3 < 100) { // L: 3517 + for (var6 = var2 - 4; var6 <= var2 + 4; ++var6) { // L: 3518 + for (int var7 = var3 - 4; var7 <= var3 + 4; ++var7) { // L: 3519 + int var8 = class22.Client_plane; // L: 3520 + if (var8 < 3 && (Tiles.Tiles_renderFlags[1][var6][var7] & 2) == 2) { // L: 3521 + ++var8; + } + + int var9 = var4 - Tiles.Tiles_heights[var8][var6][var7]; // L: 3522 + if (var9 > var5) { // L: 3523 + var5 = var9; + } + } + } + } + + var6 = var5 * 192; // L: 3527 + if (var6 > 98048) { // L: 3528 + var6 = 98048; + } + + if (var6 < 32768) { // L: 3529 + var6 = 32768; + } + + if (var6 > Client.field727) { // L: 3530 + Client.field727 += (var6 - Client.field727) / 24; + } else if (var6 < Client.field727) { // L: 3531 + Client.field727 += (var6 - Client.field727) / 80; + } + + class17.field148 = class105.getTileHeight(class93.localPlayer.x, class93.localPlayer.y, class22.Client_plane) - Client.camFollowHeight; // L: 3532 + } else if (Client.oculusOrbState == 1) { // L: 3534 + NPCComposition.method2791(); // L: 3535 + short var10 = -1; // L: 3536 + if (KeyHandler.KeyHandler_pressedKeys[33]) { // L: 3537 + var10 = 0; + } else if (KeyHandler.KeyHandler_pressedKeys[49]) { // L: 3538 + var10 = 1024; + } + + if (KeyHandler.KeyHandler_pressedKeys[48]) { // L: 3539 + if (var10 == 0) { // L: 3540 + var10 = 1792; + } else if (var10 == 1024) { // L: 3541 + var10 = 1280; + } else { + var10 = 1536; // L: 3542 + } + } else if (KeyHandler.KeyHandler_pressedKeys[50]) { // L: 3544 + if (var10 == 0) { // L: 3545 + var10 = 256; + } else if (var10 == 1024) { // L: 3546 + var10 = 768; + } else { + var10 = 512; // L: 3547 + } + } + + byte var11 = 0; // L: 3549 + if (KeyHandler.KeyHandler_pressedKeys[35]) { // L: 3550 + var11 = -1; + } else if (KeyHandler.KeyHandler_pressedKeys[51]) { // L: 3551 + var11 = 1; + } + + var2 = 0; // L: 3552 + if (var10 >= 0 || var11 != 0) { // L: 3553 + var2 = KeyHandler.KeyHandler_pressedKeys[81] ? Client.oculusOrbSlowedSpeed * 988767649 * 918404705 : Client.oculusOrbNormalSpeed * 615844635 * -503425261; // L: 3554 + var2 *= 16; // L: 3555 + Client.field732 = var10; // L: 3556 + Client.field720 = var11; // L: 3557 + } + + if (Client.field718 < var2) { // L: 3559 + Client.field718 += var2 / 8; // L: 3560 + if (Client.field718 > var2) { // L: 3561 + Client.field718 = var2; + } + } else if (Client.field718 > var2) { // L: 3563 + Client.field718 = Client.field718 * 9 / 10; + } + + if (Client.field718 > 0) { // L: 3564 + var3 = Client.field718 / 16; // L: 3565 + if (Client.field732 >= 0) { // L: 3566 + var0 = Client.field732 - class376.cameraYaw & 2047; // L: 3567 + var4 = Rasterizer3D.Rasterizer3D_sine[var0]; // L: 3568 + var5 = Rasterizer3D.Rasterizer3D_cosine[var0]; // L: 3569 + RouteStrategy.oculusOrbFocalPointX += var4 * var3 / 65536; // L: 3570 + ModelData0.oculusOrbFocalPointY += var3 * var5 / 65536; // L: 3571 + } + + if (Client.field720 != 0) { // L: 3573 + class17.field148 += var3 * Client.field720; // L: 3574 + if (class17.field148 > 0) { // L: 3575 + class17.field148 = 0; + } + } + } else { + Client.field732 = -1; // L: 3579 + Client.field720 = -1; // L: 3580 + } + + if (KeyHandler.KeyHandler_pressedKeys[13]) { // L: 3582 + MouseHandler.method634(); // L: 3583 + } + } + + if (MouseHandler.MouseHandler_currentButton == 4 && Client.mouseCam) { // L: 3586 + var0 = MouseHandler.MouseHandler_y - Client.mouseCamClickedY; // L: 3587 + Client.camAngleDX = var0 * 2; // L: 3588 + Client.mouseCamClickedY = var0 != -1 && var0 != 1 ? (MouseHandler.MouseHandler_y + Client.mouseCamClickedY) / 2 : MouseHandler.MouseHandler_y * 1903378733 * -460999003; // L: 3589 + var1 = Client.mouseCamClickedX - MouseHandler.MouseHandler_x; // L: 3590 + Client.camAngleDY = var1 * 2; // L: 3591 + Client.mouseCamClickedX = var1 != -1 && var1 != 1 ? (MouseHandler.MouseHandler_x + Client.mouseCamClickedX) / 2 : MouseHandler.MouseHandler_x * -678881683 * -243899547; // L: 3592 + } else { + if (KeyHandler.KeyHandler_pressedKeys[96]) { // L: 3595 + Client.camAngleDY += (-24 - Client.camAngleDY) / 2; + } else if (KeyHandler.KeyHandler_pressedKeys[97]) { // L: 3596 + Client.camAngleDY += (24 - Client.camAngleDY) / 2; + } else { + Client.camAngleDY /= 2; // L: 3597 + } + + if (KeyHandler.KeyHandler_pressedKeys[98]) { // L: 3598 + Client.camAngleDX += (12 - Client.camAngleDX) / 2; + } else if (KeyHandler.KeyHandler_pressedKeys[99]) { // L: 3599 + Client.camAngleDX += (-12 - Client.camAngleDX) / 2; + } else { + Client.camAngleDX /= 2; // L: 3600 + } + + Client.mouseCamClickedY = MouseHandler.MouseHandler_y; // L: 3601 + Client.mouseCamClickedX = MouseHandler.MouseHandler_x; // L: 3602 + } + + Client.camAngleY = Client.camAngleDY / 2 + Client.camAngleY & 2047; // L: 3604 + Client.camAngleX += Client.camAngleDX / 2; // L: 3605 + if (Client.camAngleX < 128) { // L: 3606 + Client.camAngleX = 128; + } + + if (Client.camAngleX > 383) { // L: 3607 + Client.camAngleX = 383; + } + + } // L: 3608 } diff --git a/runescape-client/src/main/java/FloorUnderlayDefinition.java b/runescape-client/src/main/java/FloorUnderlayDefinition.java index d02521b13e..8b7694e7a9 100644 --- a/runescape-client/src/main/java/FloorUnderlayDefinition.java +++ b/runescape-client/src/main/java/FloorUnderlayDefinition.java @@ -4,174 +4,213 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("eh") +@ObfuscatedName("ey") @Implements("FloorUnderlayDefinition") public class FloorUnderlayDefinition extends DualNode { - @ObfuscatedName("h") + @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "Ljp;" + descriptor = "Ljv;" ) @Export("FloorUnderlayDefinition_archive") - public static AbstractArchive FloorUnderlayDefinition_archive; - @ObfuscatedName("c") + static AbstractArchive FloorUnderlayDefinition_archive; + @ObfuscatedName("n") @ObfuscatedSignature( - descriptor = "Lho;" + descriptor = "Lhz;" ) @Export("FloorUnderlayDefinition_cached") - public static EvictingDualNodeHashTable FloorUnderlayDefinition_cached; - @ObfuscatedName("o") + static EvictingDualNodeHashTable FloorUnderlayDefinition_cached; + @ObfuscatedName("f") @ObfuscatedGetter( - intValue = -503223355 + intValue = -72962439 ) @Export("rgb") int rgb; - @ObfuscatedName("g") + @ObfuscatedName("y") @ObfuscatedGetter( - intValue = -1970388375 + intValue = 1393073383 ) @Export("hue") public int hue; - @ObfuscatedName("l") + @ObfuscatedName("p") @ObfuscatedGetter( - intValue = 274290143 + intValue = 1777498607 ) @Export("saturation") public int saturation; - @ObfuscatedName("z") + @ObfuscatedName("j") @ObfuscatedGetter( - intValue = -1605413599 + intValue = 1425037395 ) @Export("lightness") public int lightness; - @ObfuscatedName("t") + @ObfuscatedName("r") @ObfuscatedGetter( - intValue = 1454421193 + intValue = 1828983275 ) @Export("hueMultiplier") public int hueMultiplier; static { - FloorUnderlayDefinition_cached = new EvictingDualNodeHashTable(64); // L: 11 + FloorUnderlayDefinition_cached = new EvictingDualNodeHashTable(64); } - public FloorUnderlayDefinition() { - this.rgb = 0; // L: 12 + FloorUnderlayDefinition() { + this.rgb = 0; } - @ObfuscatedName("h") + @ObfuscatedName("f") @ObfuscatedSignature( - descriptor = "(B)V", - garbageValue = "-109" + descriptor = "(I)V", + garbageValue = "1519662904" ) @Export("postDecode") - public void postDecode() { - this.setHsl(this.rgb); // L: 19 - } // L: 20 + void postDecode() { + this.setHsl(this.rgb); // L: 36 + } // L: 37 - @ObfuscatedName("c") + @ObfuscatedName("y") @ObfuscatedSignature( - descriptor = "(Lnk;II)V", - garbageValue = "-1891906576" + descriptor = "(Lnd;IB)V", + garbageValue = "44" ) @Export("decode") - public void decode(Buffer var1, int var2) { + void decode(Buffer var1, int var2) { while (true) { - int var3 = var1.readUnsignedByte(); // L: 24 - if (var3 == 0) { // L: 25 - return; // L: 28 + int var3 = var1.readUnsignedByte(); // L: 41 + if (var3 == 0) { // L: 42 + return; // L: 45 } - this.decodeNext(var1, var3, var2); // L: 26 + this.decodeNext(var1, var3, var2); // L: 43 } } - @ObfuscatedName("o") + @ObfuscatedName("p") @ObfuscatedSignature( - descriptor = "(Lnk;IIB)V", - garbageValue = "-108" + descriptor = "(Lnd;III)V", + garbageValue = "-1482547443" ) @Export("decodeNext") void decodeNext(Buffer var1, int var2, int var3) { - if (var2 == 1) { // L: 31 + if (var2 == 1) { // L: 48 this.rgb = var1.readMedium(); } - } // L: 33 + } // L: 50 - @ObfuscatedName("g") + @ObfuscatedName("j") @ObfuscatedSignature( - descriptor = "(II)V", - garbageValue = "-717507824" + descriptor = "(IB)V", + garbageValue = "46" ) @Export("setHsl") void setHsl(int var1) { - double var2 = (double)(var1 >> 16 & 255) / 256.0D; // L: 36 - double var4 = (double)(var1 >> 8 & 255) / 256.0D; // L: 37 - double var6 = (double)(var1 & 255) / 256.0D; // L: 38 - double var8 = var2; // L: 39 - if (var4 < var2) { // L: 40 + double var2 = (double)(var1 >> 16 & 255) / 256.0D; // L: 53 + double var4 = (double)(var1 >> 8 & 255) / 256.0D; // L: 54 + double var6 = (double)(var1 & 255) / 256.0D; // L: 55 + double var8 = var2; // L: 56 + if (var4 < var2) { // L: 57 var8 = var4; } - if (var6 < var8) { // L: 41 + if (var6 < var8) { // L: 58 var8 = var6; } - double var10 = var2; // L: 42 - if (var4 > var2) { // L: 43 + double var10 = var2; // L: 59 + if (var4 > var2) { // L: 60 var10 = var4; } - if (var6 > var10) { // L: 44 + if (var6 > var10) { // L: 61 var10 = var6; } - double var12 = 0.0D; // L: 45 - double var14 = 0.0D; // L: 46 - double var16 = (var10 + var8) / 2.0D; // L: 47 - if (var10 != var8) { // L: 48 - if (var16 < 0.5D) { // L: 49 + double var12 = 0.0D; // L: 62 + double var14 = 0.0D; // L: 63 + double var16 = (var8 + var10) / 2.0D; // L: 64 + if (var8 != var10) { // L: 65 + if (var16 < 0.5D) { // L: 66 var14 = (var10 - var8) / (var10 + var8); } - if (var16 >= 0.5D) { // L: 50 + if (var16 >= 0.5D) { // L: 67 var14 = (var10 - var8) / (2.0D - var10 - var8); } - if (var10 == var2) { // L: 51 + if (var2 == var10) { // L: 68 var12 = (var4 - var6) / (var10 - var8); - } else if (var4 == var10) { // L: 52 - var12 = (var6 - var2) / (var10 - var8) + 2.0D; + } else if (var10 == var4) { // L: 69 + var12 = 2.0D + (var6 - var2) / (var10 - var8); } else if (var6 == var10) { - var12 = (var2 - var4) / (var10 - var8) + 4.0D; // L: 53 + var12 = (var2 - var4) / (var10 - var8) + 4.0D; // L: 70 } } - var12 /= 6.0D; // L: 55 - this.saturation = (int)(var14 * 256.0D); // L: 56 - this.lightness = (int)(256.0D * var16); // L: 57 - if (this.saturation < 0) { // L: 58 + var12 /= 6.0D; // L: 72 + this.saturation = (int)(var14 * 256.0D); // L: 73 + this.lightness = (int)(var16 * 256.0D); // L: 74 + if (this.saturation < 0) { // L: 75 this.saturation = 0; - } else if (this.saturation > 255) { // L: 59 + } else if (this.saturation > 255) { // L: 76 this.saturation = 255; } - if (this.lightness < 0) { // L: 60 + if (this.lightness < 0) { // L: 77 this.lightness = 0; - } else if (this.lightness > 255) { // L: 61 + } else if (this.lightness > 255) { // L: 78 this.lightness = 255; } - if (var16 > 0.5D) { // L: 62 - this.hueMultiplier = (int)(512.0D * (1.0D - var16) * var14); + if (var16 > 0.5D) { // L: 79 + this.hueMultiplier = (int)((1.0D - var16) * var14 * 512.0D); } else { - this.hueMultiplier = (int)(512.0D * var14 * var16); // L: 63 + this.hueMultiplier = (int)(512.0D * var14 * var16); // L: 80 } - if (this.hueMultiplier < 1) { // L: 64 + if (this.hueMultiplier < 1) { // L: 81 this.hueMultiplier = 1; } - this.hue = (int)((double)this.hueMultiplier * var12); // L: 65 - } // L: 66 + this.hue = (int)(var12 * (double)this.hueMultiplier); // L: 82 + } // L: 83 + + @ObfuscatedName("v") + @ObfuscatedSignature( + descriptor = "(Ljava/lang/CharSequence;I)Ljava/lang/String;", + garbageValue = "-899515900" + ) + public static String method2839(CharSequence var0) { + int var1 = var0.length(); // L: 11 + StringBuilder var2 = new StringBuilder(var1); // L: 12 + + for (int var3 = 0; var3 < var1; ++var3) { // L: 13 + char var4 = var0.charAt(var3); // L: 14 + if ((var4 < 'a' || var4 > 'z') && (var4 < 'A' || var4 > 'Z') && (var4 < '0' || var4 > '9') && var4 != '.' && var4 != '-' && var4 != '*' && var4 != '_') { // L: 15 + if (var4 == ' ') { // L: 16 + var2.append('+'); + } else { + byte var5 = ServerPacket.charToByteCp1252(var4); // L: 18 + var2.append('%'); // L: 19 + int var6 = var5 >> 4 & 15; // L: 20 + if (var6 >= 10) { // L: 21 + var2.append((char)(var6 + 55)); + } else { + var2.append((char)(var6 + 48)); // L: 22 + } + + var6 = var5 & 15; // L: 23 + if (var6 >= 10) { // L: 24 + var2.append((char)(var6 + 55)); + } else { + var2.append((char)(var6 + 48)); + } + } + } else { + var2.append(var4); // L: 25 + } + } + + return var2.toString(); // L: 28 + } } diff --git a/runescape-client/src/main/java/Font.java b/runescape-client/src/main/java/Font.java index 3245f1c85d..08cec51ca8 100644 --- a/runescape-client/src/main/java/Font.java +++ b/runescape-client/src/main/java/Font.java @@ -2,7 +2,7 @@ import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; -@ObfuscatedName("kc") +@ObfuscatedName("kt") @Implements("Font") public final class Font extends AbstractFont { public Font(byte[] var1, int[] var2, int[] var3, int[] var4, int[] var5, int[] var6, byte[][] var7) { @@ -13,7 +13,7 @@ public final class Font extends AbstractFont { super(var1); // L: 11 } // L: 12 - @ObfuscatedName("h") + @ObfuscatedName("v") @Export("drawGlyph") final void drawGlyph(byte[] var1, int var2, int var3, int var4, int var5, int var6) { int var7 = var3 * Rasterizer2D.Rasterizer2D_width + var2; // L: 15 @@ -55,7 +55,7 @@ public final class Font extends AbstractFont { } } // L: 44 - @ObfuscatedName("c") + @ObfuscatedName("n") @Export("drawGlyphAlpha") final void drawGlyphAlpha(byte[] var1, int var2, int var3, int var4, int var5, int var6, int var7) { int var8 = var3 * Rasterizer2D.Rasterizer2D_width + var2; // L: 47 diff --git a/runescape-client/src/main/java/FontName.java b/runescape-client/src/main/java/FontName.java index 515b46b5ac..4e6f96c4ed 100644 --- a/runescape-client/src/main/java/FontName.java +++ b/runescape-client/src/main/java/FontName.java @@ -1,61 +1,55 @@ -import java.util.Iterator; 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("mx") +@ObfuscatedName("mv") @Implements("FontName") public class FontName { - @ObfuscatedName("h") + @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "Lmx;" + descriptor = "Lmv;" ) @Export("FontName_plain11") public static final FontName FontName_plain11; - @ObfuscatedName("c") + @ObfuscatedName("n") @ObfuscatedSignature( - descriptor = "Lmx;" + descriptor = "Lmv;" ) @Export("FontName_plain12") public static final FontName FontName_plain12; - @ObfuscatedName("o") + @ObfuscatedName("f") @ObfuscatedSignature( - descriptor = "Lmx;" + descriptor = "Lmv;" ) @Export("FontName_bold12") public static final FontName FontName_bold12; - @ObfuscatedName("g") + @ObfuscatedName("y") @ObfuscatedSignature( - descriptor = "Lmx;" + descriptor = "Lmv;" ) @Export("FontName_verdana11") public static final FontName FontName_verdana11; - @ObfuscatedName("l") + @ObfuscatedName("p") @ObfuscatedSignature( - descriptor = "Lmx;" + descriptor = "Lmv;" ) @Export("FontName_verdana13") public static final FontName FontName_verdana13; - @ObfuscatedName("z") + @ObfuscatedName("j") @ObfuscatedSignature( - descriptor = "Lmx;" + descriptor = "Lmv;" ) @Export("FontName_verdana15") public static final FontName FontName_verdana15; - @ObfuscatedName("b") + @ObfuscatedName("eu") @ObfuscatedSignature( - descriptor = "Lof;" + descriptor = "Ljp;" ) - @Export("logoSprite") - static IndexedSprite logoSprite; - @ObfuscatedName("q") - @ObfuscatedSignature( - descriptor = "[Lof;" - ) - @Export("title_muteSprite") - static IndexedSprite[] title_muteSprite; - @ObfuscatedName("t") + @Export("archive18") + static Archive archive18; + @ObfuscatedName("r") @Export("name") String name; @@ -72,185 +66,184 @@ public class FontName { this.name = var1; // L: 16 } // L: 17 - @ObfuscatedName("o") + @ObfuscatedName("n") @ObfuscatedSignature( - descriptor = "(Ljava/lang/CharSequence;I)I", - garbageValue = "-605392872" + descriptor = "(II)Lee;", + garbageValue = "743368656" ) - public static int method6162(CharSequence var0) { - return class18.method255(var0, 10, true); // L: 76 - } - - @ObfuscatedName("z") - @ObfuscatedSignature( - descriptor = "(IIII)I", - garbageValue = "2091708586" - ) - static final int method6160(int var0, int var1, int var2) { - int var3 = var0 / var2; // L: 449 - int var4 = var0 & var2 - 1; // L: 450 - int var5 = var1 / var2; // L: 451 - int var6 = var1 & var2 - 1; // L: 452 - int var7 = ScriptFrame.method1160(var3, var5); // L: 453 - int var8 = ScriptFrame.method1160(var3 + 1, var5); // L: 454 - int var9 = ScriptFrame.method1160(var3, var5 + 1); // L: 455 - int var10 = ScriptFrame.method1160(var3 + 1, var5 + 1); // L: 456 - int var12 = 65536 - Rasterizer3D.Rasterizer3D_cosine[var4 * 1024 / var2] >> 1; // L: 459 - int var11 = ((65536 - var12) * var7 >> 16) + (var8 * var12 >> 16); // L: 460 - int var14 = 65536 - Rasterizer3D.Rasterizer3D_cosine[var4 * 1024 / var2] >> 1; // L: 465 - int var13 = ((65536 - var14) * var9 >> 16) + (var10 * var14 >> 16); // L: 466 - int var16 = 65536 - Rasterizer3D.Rasterizer3D_cosine[var6 * 1024 / var2] >> 1; // L: 471 - int var15 = ((65536 - var16) * var11 >> 16) + (var16 * var13 >> 16); // L: 472 - return var15; // L: 474 - } - - @ObfuscatedName("t") - @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "321225908" - ) - static void method6159() { - Iterator var0 = Messages.Messages_hashTable.iterator(); // L: 57 - - while (var0.hasNext()) { - Message var1 = (Message)var0.next(); // L: 58 - var1.clearIsFromFriend(); // L: 60 - } - - } // L: 63 - - @ObfuscatedName("a") - @ObfuscatedSignature( - descriptor = "(B)V", - garbageValue = "2" - ) - static void method6157() { - Login.loginIndex = 24; // L: 1566 - class44.setLoginResponseString("", "You were disconnected from the server.", ""); // L: 1567 - } // L: 1568 - - @ObfuscatedName("fu") - @ObfuscatedSignature( - descriptor = "(IB)V", - garbageValue = "0" - ) - @Export("playSong") - static void playSong(int var0) { - if (var0 == -1 && !Client.field866) { // L: 3781 - class232.midiPcmStream.clear(); // L: 3783 - class232.musicPlayerStatus = 1; // L: 3784 - JagexCache.musicTrackArchive = null; // L: 3785 - } else if (var0 != -1 && var0 != Client.currentTrackGroupId && class12.clientPreferences.musicVolume != 0 && !Client.field866) { // L: 3788 - class229.method4321(2, class29.archive6, var0, 0, class12.clientPreferences.musicVolume, false); // L: 3789 - } - - Client.currentTrackGroupId = var0; // L: 3791 - } // L: 3792 - - @ObfuscatedName("gm") - @ObfuscatedSignature( - descriptor = "(B)I", - garbageValue = "91" - ) - static final int method6161() { - if (class12.clientPreferences.roofsHidden) { // L: 4817 - return ParamComposition.Client_plane; + public static VarbitComposition method6299(int var0) { + VarbitComposition var1 = (VarbitComposition)VarbitComposition.VarbitDefinition_cached.get((long)var0); // L: 30 + if (var1 != null) { // L: 31 + return var1; } else { - int var0 = SceneTilePaint.getTileHeight(class20.cameraX, WorldMapDecoration.cameraZ, ParamComposition.Client_plane); // L: 4818 - return var0 - Skeleton.cameraY < 800 && (Tiles.Tiles_renderFlags[ParamComposition.Client_plane][class20.cameraX >> 7][WorldMapDecoration.cameraZ >> 7] & 4) != 0 ? ParamComposition.Client_plane : 3; // L: 4819 4820 + byte[] var2 = VarbitComposition.VarbitDefinition_archive.takeFile(14, var0); // L: 32 + var1 = new VarbitComposition(); // L: 33 + if (var2 != null) { // L: 34 + var1.decode(new Buffer(var2)); + } + + VarbitComposition.VarbitDefinition_cached.put(var1, (long)var0); // L: 35 + return var1; // L: 36 } } - @ObfuscatedName("ig") + @ObfuscatedName("r") @ObfuscatedSignature( - descriptor = "(Lcg;IIII)V", - garbageValue = "-587367035" + descriptor = "([BIIIIIIILgt;[Lfz;I)V", + garbageValue = "305716239" ) - @Export("addPlayerToMenu") - static final void addPlayerToMenu(Player var0, int var1, int var2, int var3) { - if (class35.localPlayer != var0) { // L: 9397 - if (Client.menuOptionsCount < 400) { // L: 9398 - String var4; - int var7; - if (var0.skillLevel == 0) { // L: 9400 - String var5 = var0.actions[0] + var0.username + var0.actions[1]; // L: 9401 - var7 = var0.combatLevel; // L: 9403 - int var8 = class35.localPlayer.combatLevel; // L: 9404 - int var9 = var8 - var7; // L: 9406 - String var6; - if (var9 < -9) { // L: 9407 - var6 = HorizontalAlignment.colorStartTag(16711680); // L: 9408 - } else if (var9 < -6) { // L: 9411 - var6 = HorizontalAlignment.colorStartTag(16723968); // L: 9412 - } else if (var9 < -3) { // L: 9415 - var6 = HorizontalAlignment.colorStartTag(16740352); // L: 9416 - } else if (var9 < 0) { // L: 9419 - var6 = HorizontalAlignment.colorStartTag(16756736); // L: 9420 - } else if (var9 > 9) { // L: 9423 - var6 = HorizontalAlignment.colorStartTag(65280); // L: 9424 - } else if (var9 > 6) { // L: 9427 - var6 = HorizontalAlignment.colorStartTag(4259584); // L: 9428 - } else if (var9 > 3) { // L: 9431 - var6 = HorizontalAlignment.colorStartTag(8453888); // L: 9432 - } else if (var9 > 0) { // L: 9435 - var6 = HorizontalAlignment.colorStartTag(12648192); // L: 9436 + static final void method6296(byte[] var0, int var1, int var2, int var3, int var4, int var5, int var6, int var7, Scene var8, CollisionMap[] var9) { + Buffer var10 = new Buffer(var0); // L: 183 + int var11 = -1; // L: 184 + + while (true) { + int var12 = var10.method6560(); // L: 186 + if (var12 == 0) { // L: 187 + return; // L: 242 + } + + var11 += var12; // L: 188 + int var13 = 0; // L: 189 + + while (true) { + int var14 = var10.readUShortSmart(); // L: 191 + if (var14 == 0) { // L: 192 + break; + } + + var13 += var14 - 1; // L: 193 + int var15 = var13 & 63; // L: 194 + int var16 = var13 >> 6 & 63; // L: 195 + int var17 = var13 >> 12; // L: 196 + int var18 = var10.readUnsignedByte(); // L: 197 + int var19 = var18 >> 2; // L: 198 + int var20 = var18 & 3; // L: 199 + if (var17 == var4 && var16 >= var5 && var16 < var5 + 8 && var15 >= var6 && var15 < var6 + 8) { // L: 200 + ObjectComposition var21 = class23.getObjectDefinition(var11); // L: 201 + int var24 = var16 & 7; // L: 204 + int var25 = var15 & 7; // L: 205 + int var27 = var21.sizeX; // L: 207 + int var28 = var21.sizeY; // L: 208 + int var29; + if ((var20 & 1) == 1) { // L: 210 + var29 = var27; // L: 211 + var27 = var28; // L: 212 + var28 = var29; // L: 213 + } + + int var26 = var7 & 3; // L: 215 + int var23; + if (var26 == 0) { // L: 216 + var23 = var24; // L: 217 + } else if (var26 == 1) { // L: 220 + var23 = var25; // L: 221 + } else if (var26 == 2) { // L: 224 + var23 = 7 - var24 - (var27 - 1); // L: 225 } else { - var6 = HorizontalAlignment.colorStartTag(16776960); // L: 9439 + var23 = 7 - var25 - (var28 - 1); // L: 228 } - var4 = var5 + var6 + " " + " (" + "level-" + var0.combatLevel + ")" + var0.actions[2]; // L: 9441 - } else { - var4 = var0.actions[0] + var0.username + var0.actions[1] + " " + " (" + "skill-" + var0.skillLevel + ")" + var0.actions[2]; // L: 9443 - } - - int var10; - if (Client.isItemSelected == 1) { // L: 9444 - InterfaceParent.insertMenuItemNoShift("Use", Client.selectedItemName + " " + "->" + " " + HorizontalAlignment.colorStartTag(16777215) + var4, 14, var1, var2, var3); // L: 9445 - } else if (Client.isSpellSelected) { // L: 9448 - if ((GrandExchangeOfferUnitPriceComparator.selectedSpellFlags & 8) == 8) { // L: 9449 - InterfaceParent.insertMenuItemNoShift(Client.selectedSpellActionName, Client.selectedSpellName + " " + "->" + " " + HorizontalAlignment.colorStartTag(16777215) + var4, 15, var1, var2, var3); // L: 9450 - } - } else { - for (var10 = 7; var10 >= 0; --var10) { // L: 9455 - if (Client.playerMenuActions[var10] != null) { // L: 9456 - short var11 = 0; // L: 9457 - if (Client.playerMenuActions[var10].equalsIgnoreCase("Attack")) { // L: 9458 - if (Client.playerAttackOption == AttackOption.AttackOption_hidden) { // L: 9459 - continue; - } - - if (AttackOption.AttackOption_alwaysRightClick == Client.playerAttackOption || Client.playerAttackOption == AttackOption.AttackOption_dependsOnCombatLevels && var0.combatLevel > class35.localPlayer.combatLevel) { // L: 9460 - var11 = 2000; // L: 9461 - } - - if (class35.localPlayer.team != 0 && var0.team != 0) { // L: 9463 - if (var0.team == class35.localPlayer.team) { // L: 9464 - var11 = 2000; - } else { - var11 = 0; // L: 9465 - } - } else if (var0.method2137()) { // L: 9467 - var11 = 2000; // L: 9468 - } - } else if (Client.playerOptionsPriorities[var10]) { // L: 9471 - var11 = 2000; - } - - boolean var12 = false; // L: 9472 - var7 = Client.playerMenuOpcodes[var10] + var11; // L: 9473 - InterfaceParent.insertMenuItemNoShift(Client.playerMenuActions[var10], HorizontalAlignment.colorStartTag(16777215) + var4, var7, var1, var2, var3); // L: 9474 + var29 = var23 + var2; // L: 230 + int var30 = var3 + class179.method3635(var16 & 7, var15 & 7, var7, var21.sizeX, var21.sizeY, var20); // L: 231 + if (var29 > 0 && var30 > 0 && var29 < 103 && var30 < 103) { // L: 232 + int var31 = var1; // L: 233 + if ((Tiles.Tiles_renderFlags[1][var29][var30] & 2) == 2) { // L: 234 + var31 = var1 - 1; } + + CollisionMap var32 = null; // L: 235 + if (var31 >= 0) { // L: 236 + var32 = var9[var31]; + } + + ClanChannelMember.method89(var1, var29, var30, var11, var20 + var7 & 3, var19, var8, var32); // L: 237 } } - - for (var10 = 0; var10 < Client.menuOptionsCount; ++var10) { // L: 9479 - if (Client.menuOpcodes[var10] == 23) { // L: 9480 - Client.menuTargets[var10] = HorizontalAlignment.colorStartTag(16777215) + var4; // L: 9481 - break; - } - } - } } - } // L: 9485 + } + + @ObfuscatedName("m") + @ObfuscatedSignature( + descriptor = "(ILcf;ZI)I", + garbageValue = "1272154519" + ) + static int method6298(int var0, Script var1, boolean var2) { + Widget var3 = Frames.getWidget(Interpreter.Interpreter_intStack[--class44.Interpreter_intStackSize]); // L: 1281 + if (var0 == ScriptOpcodes.IF_GETSCROLLX) { // L: 1282 + Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = var3.scrollX; // L: 1283 + return 1; // L: 1284 + } else if (var0 == ScriptOpcodes.IF_GETSCROLLY) { // L: 1286 + Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = var3.scrollY; // L: 1287 + return 1; // L: 1288 + } else if (var0 == ScriptOpcodes.IF_GETTEXT) { // L: 1290 + Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var3.text; // L: 1291 + return 1; // L: 1292 + } else if (var0 == ScriptOpcodes.IF_GETSCROLLWIDTH) { // L: 1294 + Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = var3.scrollWidth; // L: 1295 + return 1; // L: 1296 + } else if (var0 == ScriptOpcodes.IF_GETSCROLLHEIGHT) { // L: 1298 + Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = var3.scrollHeight; // L: 1299 + return 1; // L: 1300 + } else if (var0 == ScriptOpcodes.IF_GETMODELZOOM) { // L: 1302 + Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = var3.modelZoom; // L: 1303 + return 1; // L: 1304 + } else if (var0 == ScriptOpcodes.IF_GETMODELANGLE_X) { // L: 1306 + Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = var3.modelAngleX; // L: 1307 + return 1; // L: 1308 + } else if (var0 == ScriptOpcodes.IF_GETMODELANGLE_Z) { // L: 1310 + Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = var3.modelAngleZ; // L: 1311 + return 1; // L: 1312 + } else if (var0 == ScriptOpcodes.IF_GETMODELANGLE_Y) { // L: 1314 + Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = var3.modelAngleY; // L: 1315 + return 1; // L: 1316 + } else if (var0 == ScriptOpcodes.IF_GETTRANSTOP) { // L: 1318 + Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = var3.transparencyTop; // L: 1319 + return 1; // L: 1320 + } else if (var0 == ScriptOpcodes.IF_GETTRANSBOT) { // L: 1322 + Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = var3.transparencyBot; // L: 1323 + return 1; // L: 1324 + } else if (var0 == ScriptOpcodes.IF_GETCOLOUR) { // L: 1326 + Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = var3.color; // L: 1327 + return 1; // L: 1328 + } else if (var0 == ScriptOpcodes.IF_GETFILLCOLOUR) { // L: 1330 + Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = var3.color2; // L: 1331 + return 1; // L: 1332 + } else if (var0 == ScriptOpcodes.IF_GETFILLMODE) { // L: 1334 + Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = var3.fillMode.rsOrdinal(); // L: 1335 + return 1; // L: 1336 + } else if (var0 == ScriptOpcodes.IF_GETMODELTRANSPARENT) { // L: 1338 + Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = var3.modelTransparency ? 1 : 0; // L: 1339 + return 1; // L: 1340 + } else if (var0 != 2615 && var0 != 2616) { // L: 1342 + return 2; // L: 1346 + } else { + ++class44.Interpreter_intStackSize; // L: 1343 + return 1; // L: 1344 + } + } + + @ObfuscatedName("fp") + @ObfuscatedSignature( + descriptor = "(IZZZB)Ljp;", + garbageValue = "28" + ) + @Export("newArchive") + static Archive newArchive(int var0, boolean var1, boolean var2, boolean var3) { + ArchiveDisk var4 = null; // L: 1917 + if (JagexCache.JagexCache_dat2File != null) { // L: 1918 + var4 = new ArchiveDisk(var0, JagexCache.JagexCache_dat2File, class93.JagexCache_idxFiles[var0], 1000000); + } + + return new Archive(var4, class43.masterDisk, var0, var1, var2, var3); // L: 1919 + } + + @ObfuscatedName("ln") + @ObfuscatedSignature( + descriptor = "(I)Z", + garbageValue = "-81607341" + ) + public static boolean method6297() { + return Client.staffModLevel >= 2; // L: 11491 + } } diff --git a/runescape-client/src/main/java/Fonts.java b/runescape-client/src/main/java/Fonts.java index 3f068ed6c7..ab6a630d53 100644 --- a/runescape-client/src/main/java/Fonts.java +++ b/runescape-client/src/main/java/Fonts.java @@ -4,32 +4,33 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("mw") +@ObfuscatedName("mu") @Implements("Fonts") public class Fonts { - @ObfuscatedName("bf") + @ObfuscatedName("d") @ObfuscatedSignature( - descriptor = "Ljh;" + descriptor = "Lop;" ) - static GameBuild field4063; - @ObfuscatedName("h") + @Export("logoSprite") + static IndexedSprite logoSprite; + @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "Ljp;" + descriptor = "Ljv;" ) @Export("spritesArchive") AbstractArchive spritesArchive; - @ObfuscatedName("c") + @ObfuscatedName("n") @ObfuscatedSignature( - descriptor = "Ljp;" + descriptor = "Ljv;" ) @Export("fontsArchive") AbstractArchive fontsArchive; - @ObfuscatedName("o") + @ObfuscatedName("f") @Export("map") HashMap map; @ObfuscatedSignature( - descriptor = "(Ljp;Ljp;)V" + descriptor = "(Ljv;Ljv;)V" ) public Fonts(AbstractArchive var1, AbstractArchive var2) { this.spritesArchive = var1; // L: 14 @@ -37,10 +38,10 @@ public class Fonts { this.map = new HashMap(); // L: 16 } // L: 17 - @ObfuscatedName("h") + @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "([Lmx;I)Ljava/util/HashMap;", - garbageValue = "489474" + descriptor = "([Lmv;I)Ljava/util/HashMap;", + garbageValue = "-1349307579" ) @Export("createMap") public HashMap createMap(FontName[] var1) { @@ -52,7 +53,7 @@ public class Fonts { if (this.map.containsKey(var5)) { // L: 26 var2.put(var5, this.map.get(var5)); // L: 27 } else { - Font var6 = InvDefinition.method2609(this.spritesArchive, this.fontsArchive, var5.name, ""); // L: 30 + Font var6 = AbstractSocket.method5900(this.spritesArchive, this.fontsArchive, var5.name, ""); // L: 30 if (var6 != null) { // L: 31 this.map.put(var5, var6); // L: 32 var2.put(var5, var6); // L: 33 @@ -62,14 +63,4 @@ public class Fonts { return var2; // L: 39 } - - @ObfuscatedName("g") - @ObfuscatedSignature( - descriptor = "(II)Lbv;", - garbageValue = "-2048173545" - ) - @Export("Messages_getMessage") - static Message Messages_getMessage(int var0) { - return (Message)Messages.Messages_hashTable.get((long)var0); // L: 40 - } } diff --git a/runescape-client/src/main/java/Frames.java b/runescape-client/src/main/java/Frames.java index b9ec1bfd6e..d069b10e6f 100644 --- a/runescape-client/src/main/java/Frames.java +++ b/runescape-client/src/main/java/Frames.java @@ -3,61 +3,75 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("gi") +@ObfuscatedName("gd") @Implements("Frames") public class Frames extends DualNode { - @ObfuscatedName("h") + @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "[Lgx;" + descriptor = "[Lgu;" ) @Export("frames") Animation[] frames; @ObfuscatedSignature( - descriptor = "(Ljp;Ljp;IZ)V" + descriptor = "(Ljv;Ljv;IZ)V", + garbageValue = "0" ) - Frames(AbstractArchive var1, AbstractArchive var2, int var3, boolean var4) { - NodeDeque var5 = new NodeDeque(); // L: 35 - int var6 = var1.getGroupFileCount(var3); // L: 36 - this.frames = new Animation[var6]; // L: 37 - int[] var7 = var1.getGroupFileIds(var3); // L: 38 + public Frames(AbstractArchive var1, AbstractArchive var2, int var3, boolean var4) { + NodeDeque var5 = new NodeDeque(); // L: 11 + int var6 = var1.getGroupFileCount(var3); // L: 12 + this.frames = new Animation[var6]; // L: 13 + int[] var7 = var1.getGroupFileIds(var3); // L: 14 - for (int var8 = 0; var8 < var7.length; ++var8) { // L: 39 - byte[] var9 = var1.takeFile(var3, var7[var8]); // L: 40 - Skeleton var10 = null; // L: 41 - int var11 = (var9[0] & 255) << 8 | var9[1] & 255; // L: 42 + for (int var8 = 0; var8 < var7.length; ++var8) { // L: 15 + byte[] var9 = var1.takeFile(var3, var7[var8]); // L: 16 + Skeleton var10 = null; // L: 17 + int var11 = (var9[0] & 255) << 8 | var9[1] & 255; // L: 18 - for (Skeleton var12 = (Skeleton)var5.last(); var12 != null; var12 = (Skeleton)var5.previous()) { // L: 43 44 49 - if (var11 == var12.id) { // L: 45 - var10 = var12; // L: 46 + for (Skeleton var12 = (Skeleton)var5.last(); var12 != null; var12 = (Skeleton)var5.previous()) { // L: 19 20 25 + if (var11 == var12.id) { // L: 21 + var10 = var12; // L: 22 break; } } - if (var10 == null) { // L: 51 - byte[] var13; - if (var4) { // L: 53 - var13 = var2.getFile(0, var11); - } else { - var13 = var2.getFile(var11, 0); // L: 54 - } - - var10 = new Skeleton(var11, var13); // L: 55 - var5.addFirst(var10); // L: 56 + if (var10 == null) { // L: 27 + byte[] var13 = var2.getFile(var11, 0); // L: 30 + var10 = new Skeleton(var11, var13); // L: 31 + var5.addFirst(var10); // L: 32 } - this.frames[var7[var8]] = new Animation(var9, var10); // L: 58 + this.frames[var7[var8]] = new Animation(var9, var10); // L: 34 } - } // L: 60 + } // L: 36 - @ObfuscatedName("c") + @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "(II)Z", - garbageValue = "1252473140" + descriptor = "(IB)Z", + garbageValue = "4" ) @Export("hasAlphaTransform") public boolean hasAlphaTransform(int var1) { - return this.frames[var1].hasAlphaTransform; // L: 63 + return this.frames[var1].hasAlphaTransform; // L: 39 + } + + @ObfuscatedName("v") + @ObfuscatedSignature( + descriptor = "(II)Lio;", + garbageValue = "416186781" + ) + @Export("getWidget") + public static Widget getWidget(int var0) { + int var1 = var0 >> 16; // L: 188 + int var2 = var0 & 65535; // L: 189 + if (Widget.Widget_interfaceComponents[var1] == null || Widget.Widget_interfaceComponents[var1][var2] == null) { // L: 190 + boolean var3 = Clock.loadInterface(var1); // L: 191 + if (!var3) { // L: 192 + return null; + } + } + + return Widget.Widget_interfaceComponents[var1][var2]; // L: 194 } } diff --git a/runescape-client/src/main/java/Friend.java b/runescape-client/src/main/java/Friend.java index 7aa945af19..a0b8f4bb6a 100644 --- a/runescape-client/src/main/java/Friend.java +++ b/runescape-client/src/main/java/Friend.java @@ -3,21 +3,21 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("lk") +@ObfuscatedName("lp") @Implements("Friend") public class Friend extends Buddy { - @ObfuscatedName("h") - boolean field3838; - @ObfuscatedName("c") - boolean field3839; + @ObfuscatedName("v") + boolean field3824; + @ObfuscatedName("n") + boolean field3823; Friend() { } // L: 9 - @ObfuscatedName("h") + @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "(Llk;I)I", - garbageValue = "1098181185" + descriptor = "(Llp;I)I", + garbageValue = "-1023710905" ) @Export("compareToFriend") int compareToFriend(Friend var1) { @@ -29,23 +29,23 @@ public class Friend extends Buddy { return -1; } else if (var1.world != 0 && super.world == 0) { // L: 15 return 1; - } else if (this.field3838 && !var1.field3838) { // L: 16 + } else if (this.field3824 && !var1.field3824) { // L: 16 return -1; - } else if (!this.field3838 && var1.field3838) { // L: 17 + } else if (!this.field3824 && var1.field3824) { // L: 17 return 1; - } else if (this.field3839 && !var1.field3839) { // L: 18 + } else if (this.field3823 && !var1.field3823) { // L: 18 return -1; - } else if (!this.field3839 && var1.field3839) { // L: 19 + } else if (!this.field3823 && var1.field3823) { // L: 19 return 1; } else { return super.world != 0 ? super.int2 - var1.int2 : var1.int2 - super.int2; // L: 20 21 24 } } - @ObfuscatedName("c") + @ObfuscatedName("n") @ObfuscatedSignature( - descriptor = "(Llm;B)I", - garbageValue = "88" + descriptor = "(Llx;I)I", + garbageValue = "539732409" ) @Export("compareTo_user") public int compareTo_user(User var1) { @@ -55,245 +55,4 @@ public class Friend extends Buddy { public int compareTo(Object var1) { return this.compareToFriend((Friend)var1); // L: 33 } - - @ObfuscatedName("c") - @ObfuscatedSignature( - descriptor = "(IB)Lef;", - garbageValue = "-6" - ) - @Export("SpotAnimationDefinition_get") - public static SpotAnimationDefinition SpotAnimationDefinition_get(int var0) { - SpotAnimationDefinition var1 = (SpotAnimationDefinition)SpotAnimationDefinition.SpotAnimationDefinition_cached.get((long)var0); // L: 37 - if (var1 != null) { // L: 38 - return var1; - } else { - byte[] var2 = SpotAnimationDefinition.SpotAnimationDefinition_archive.takeFile(13, var0); // L: 39 - var1 = new SpotAnimationDefinition(); // L: 40 - var1.id = var0; // L: 41 - if (var2 != null) { // L: 42 - var1.decode(new Buffer(var2)); - } - - SpotAnimationDefinition.SpotAnimationDefinition_cached.put(var1, (long)var0); // L: 43 - return var1; // L: 44 - } - } - - @ObfuscatedName("o") - @ObfuscatedSignature( - descriptor = "(Lnm;I)V", - garbageValue = "-1000223970" - ) - static final void method5550(PacketBuffer var0) { - int var1 = 0; // L: 89 - var0.importIndex(); // L: 90 - - byte[] var10000; - int var2; - int var4; - int var6; - int var7; - int var8; - for (var2 = 0; var2 < Players.Players_count; ++var2) { - var8 = Players.Players_indices[var2]; - if ((Players.field1344[var8] & 1) == 0) { - if (var1 > 0) { - --var1; - var10000 = Players.field1344; - var10000[var8] = (byte)(var10000[var8] | 2); - } else { - var4 = var0.readBits(1); - if (var4 == 0) { - var6 = var0.readBits(2); - if (var6 == 0) { - var7 = 0; - } else if (var6 == 1) { - var7 = var0.readBits(5); - } else if (var6 == 2) { - var7 = var0.readBits(8); - } else { - var7 = var0.readBits(11); - } - - var1 = var7; // L: 111 - var10000 = Players.field1344; - var10000[var8] = (byte)(var10000[var8] | 2); - } else { - class35.readPlayerUpdate(var0, var8); // L: 115 - } - } - } - } - - var0.exportIndex(); // L: 118 - if (var1 != 0) { // L: 119 - throw new RuntimeException(); // L: 120 - } else { - var0.importIndex(); // L: 122 - - for (var2 = 0; var2 < Players.Players_count; ++var2) { // L: 123 - var8 = Players.Players_indices[var2]; // L: 124 - if ((Players.field1344[var8] & 1) != 0) { // L: 125 - if (var1 > 0) { // L: 126 - --var1; // L: 127 - var10000 = Players.field1344; // L: 128 - var10000[var8] = (byte)(var10000[var8] | 2); - } else { - var4 = var0.readBits(1); // L: 131 - if (var4 == 0) { // L: 132 - var6 = var0.readBits(2); // L: 135 - if (var6 == 0) { // L: 137 - var7 = 0; - } else if (var6 == 1) { // L: 138 - var7 = var0.readBits(5); - } else if (var6 == 2) { // L: 139 - var7 = var0.readBits(8); - } else { - var7 = var0.readBits(11); // L: 140 - } - - var1 = var7; // L: 143 - var10000 = Players.field1344; // L: 144 - var10000[var8] = (byte)(var10000[var8] | 2); - } else { - class35.readPlayerUpdate(var0, var8); // L: 147 - } - } - } - } - - var0.exportIndex(); // L: 150 - if (var1 != 0) { // L: 151 - throw new RuntimeException(); // L: 152 - } else { - var0.importIndex(); // L: 154 - - for (var2 = 0; var2 < Players.Players_emptyIdxCount; ++var2) { // L: 155 - var8 = Players.Players_emptyIndices[var2]; // L: 156 - if ((Players.field1344[var8] & 1) != 0) { // L: 157 - if (var1 > 0) { // L: 158 - --var1; // L: 159 - var10000 = Players.field1344; // L: 160 - var10000[var8] = (byte)(var10000[var8] | 2); - } else { - var4 = var0.readBits(1); // L: 163 - if (var4 == 0) { // L: 164 - var6 = var0.readBits(2); // L: 167 - if (var6 == 0) { // L: 169 - var7 = 0; - } else if (var6 == 1) { // L: 170 - var7 = var0.readBits(5); - } else if (var6 == 2) { // L: 171 - var7 = var0.readBits(8); - } else { - var7 = var0.readBits(11); // L: 172 - } - - var1 = var7; // L: 175 - var10000 = Players.field1344; // L: 176 - var10000[var8] = (byte)(var10000[var8] | 2); - } else if (Tiles.updateExternalPlayer(var0, var8)) { // L: 179 - var10000 = Players.field1344; - var10000[var8] = (byte)(var10000[var8] | 2); - } - } - } - } - - var0.exportIndex(); // L: 182 - if (var1 != 0) { // L: 183 - throw new RuntimeException(); // L: 184 - } else { - var0.importIndex(); // L: 186 - - for (var2 = 0; var2 < Players.Players_emptyIdxCount; ++var2) { // L: 187 - var8 = Players.Players_emptyIndices[var2]; // L: 188 - if ((Players.field1344[var8] & 1) == 0) { // L: 189 - if (var1 > 0) { // L: 190 - --var1; // L: 191 - var10000 = Players.field1344; // L: 192 - var10000[var8] = (byte)(var10000[var8] | 2); - } else { - var4 = var0.readBits(1); // L: 195 - if (var4 == 0) { // L: 196 - var6 = var0.readBits(2); // L: 199 - if (var6 == 0) { // L: 201 - var7 = 0; - } else if (var6 == 1) { // L: 202 - var7 = var0.readBits(5); - } else if (var6 == 2) { // L: 203 - var7 = var0.readBits(8); - } else { - var7 = var0.readBits(11); // L: 204 - } - - var1 = var7; // L: 207 - var10000 = Players.field1344; // L: 208 - var10000[var8] = (byte)(var10000[var8] | 2); - } else if (Tiles.updateExternalPlayer(var0, var8)) { // L: 211 - var10000 = Players.field1344; - var10000[var8] = (byte)(var10000[var8] | 2); - } - } - } - } - - var0.exportIndex(); // L: 214 - if (var1 != 0) { // L: 215 - throw new RuntimeException(); // L: 216 - } else { - Players.Players_count = 0; // L: 218 - Players.Players_emptyIdxCount = 0; // L: 219 - - for (var2 = 1; var2 < 2048; ++var2) { // L: 220 - var10000 = Players.field1344; // L: 221 - var10000[var2] = (byte)(var10000[var2] >> 1); - Player var3 = Client.players[var2]; // L: 222 - if (var3 != null) { // L: 223 - Players.Players_indices[++Players.Players_count - 1] = var2; - } else { - Players.Players_emptyIndices[++Players.Players_emptyIdxCount - 1] = var2; // L: 224 - } - } - - } - } - } - } - } // L: 226 - - @ObfuscatedName("g") - @ObfuscatedSignature( - descriptor = "(Ljp;III)Low;", - garbageValue = "609200231" - ) - @Export("SpriteBuffer_getSprite") - public static SpritePixels SpriteBuffer_getSprite(AbstractArchive var0, int var1, int var2) { - if (!Username.method5711(var0, var1, var2)) { // L: 88 - return null; - } else { - SpritePixels var4 = new SpritePixels(); // L: 91 - var4.width = class396.SpriteBuffer_spriteWidth; // L: 92 - var4.height = class396.SpriteBuffer_spriteHeight; // L: 93 - var4.xOffset = class243.SpriteBuffer_xOffsets[0]; // L: 94 - var4.yOffset = class396.SpriteBuffer_yOffsets[0]; // L: 95 - var4.subWidth = ArchiveDiskActionHandler.SpriteBuffer_spriteWidths[0]; // L: 96 - var4.subHeight = class372.SpriteBuffer_spriteHeights[0]; // L: 97 - int var5 = var4.subWidth * var4.subHeight; // L: 98 - byte[] var6 = class396.SpriteBuffer_pixels[0]; // L: 99 - var4.pixels = new int[var5]; // L: 100 - - for (int var7 = 0; var7 < var5; ++var7) { // L: 101 - var4.pixels[var7] = AccessFile.SpriteBuffer_spritePalette[var6[var7] & 255]; - } - - class243.SpriteBuffer_xOffsets = null; // L: 103 - class396.SpriteBuffer_yOffsets = null; // L: 104 - ArchiveDiskActionHandler.SpriteBuffer_spriteWidths = null; // L: 105 - class372.SpriteBuffer_spriteHeights = null; // L: 106 - AccessFile.SpriteBuffer_spritePalette = null; // L: 107 - class396.SpriteBuffer_pixels = null; // L: 108 - return var4; // L: 112 - } - } } diff --git a/runescape-client/src/main/java/FriendLoginUpdate.java b/runescape-client/src/main/java/FriendLoginUpdate.java index 4dd8c28043..c4e7d786df 100644 --- a/runescape-client/src/main/java/FriendLoginUpdate.java +++ b/runescape-client/src/main/java/FriendLoginUpdate.java @@ -1,69 +1,69 @@ +import java.util.Date; 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("ln") +@ObfuscatedName("lq") @Implements("FriendLoginUpdate") public class FriendLoginUpdate extends Link { - @ObfuscatedName("h") + @ObfuscatedName("v") @ObfuscatedGetter( - intValue = 1916862787 + intValue = -641330339 ) - public int field3840; - @ObfuscatedName("c") + public int field3828; + @ObfuscatedName("n") @ObfuscatedSignature( - descriptor = "Lla;" + descriptor = "Lly;" ) @Export("username") public Username username; - @ObfuscatedName("o") + @ObfuscatedName("f") @Export("world") public short world; @ObfuscatedSignature( - descriptor = "(Lla;I)V" + descriptor = "(Lly;I)V" ) FriendLoginUpdate(Username var1, int var2) { - this.field3840 = (int)(Archive.currentTimeMillis() / 1000L); // L: 106 + this.field3828 = (int)(ObjectComposition.currentTimeMillis() / 1000L); // L: 106 this.username = var1; // L: 107 this.world = (short)var2; // L: 108 } // L: 109 - @ObfuscatedName("g") + @ObfuscatedName("lb") @ObfuscatedSignature( - descriptor = "(IB)V", - garbageValue = "56" + descriptor = "(Ljava/lang/String;I)V", + garbageValue = "-1148380845" ) - public static void method5552(int var0) { - if (class232.musicPlayerStatus != 0) { // L: 50 - LoginPacket.musicTrackVolume = var0; - } else { - class232.midiPcmStream.setPcmStreamVolume(var0); // L: 51 - } + static void method5690(String var0) { + class363.field4079 = var0; // L: 11398 - } // L: 52 - - @ObfuscatedName("lt") - @ObfuscatedSignature( - descriptor = "(III)V", - garbageValue = "1660242957" - ) - static final void method5553(int var0, int var1) { - class3 var2 = var0 >= 0 ? Client.field847[var0] : Players.field1358; // L: 11551 - if (var2 != null && var1 >= 0 && var1 < var2.method39()) { // L: 11552 - class9 var3 = (class9)var2.field32.get(var1); // L: 11553 - if (var3.field76 == -1) { - String var4 = var3.field73; // L: 11555 - PacketWriter var5 = Client.packetWriter; // L: 11556 - PacketBufferNode var6 = HealthBarDefinition.getPacketBufferNode(ClientPacket.field2635, var5.isaacCipher); // L: 11557 - var6.packetBuffer.writeByte(3 + class4.stringCp1252NullTerminatedByteSize(var4)); // L: 11558 - var6.packetBuffer.writeByte(var0); // L: 11559 - var6.packetBuffer.writeShort(var1); // L: 11560 - var6.packetBuffer.writeStringCp1252NullTerminated(var4); // L: 11561 - var5.addNode(var6); // L: 11562 + try { + String var1 = class23.client.getParameter(Integer.toString(18)); // L: 11400 + String var2 = class23.client.getParameter(Integer.toString(13)); // L: 11401 + String var3 = var1 + "settings=" + var0 + "; version=1; path=/; domain=" + var2; // L: 11402 + if (var0.length() == 0) { // L: 11403 + var3 = var3 + "; Expires=Thu, 01-Jan-1970 00:00:00 GMT; Max-Age=0"; + } else { + String var4 = var3 + "; Expires="; // L: 11405 + long var6 = ObjectComposition.currentTimeMillis() + 94608000000L; // L: 11407 + Calendar.Calendar_calendar.setTime(new Date(var6)); // L: 11409 + int var8 = Calendar.Calendar_calendar.get(7); // L: 11410 + int var9 = Calendar.Calendar_calendar.get(5); // L: 11411 + int var10 = Calendar.Calendar_calendar.get(2); // L: 11412 + int var11 = Calendar.Calendar_calendar.get(1); // L: 11413 + int var12 = Calendar.Calendar_calendar.get(11); // L: 11414 + int var13 = Calendar.Calendar_calendar.get(12); // L: 11415 + int var14 = Calendar.Calendar_calendar.get(13); // L: 11416 + String var5 = Calendar.DAYS_OF_THE_WEEK[var8 - 1] + ", " + var9 / 10 + var9 % 10 + "-" + Calendar.MONTH_NAMES_ENGLISH_GERMAN[0][var10] + "-" + var11 + " " + var12 / 10 + var12 % 10 + ":" + var13 / 10 + var13 % 10 + ":" + var14 / 10 + var14 % 10 + " GMT"; // L: 11417 + var3 = var4 + var5 + "; Max-Age=" + 94608000L; // L: 11419 } + + class42.method420(class23.client, "document.cookie=\"" + var3 + "\""); // L: 11421 + } catch (Throwable var15) { // L: 11423 } - } // L: 11554 11563 + + } // L: 11424 } diff --git a/runescape-client/src/main/java/FriendSystem.java b/runescape-client/src/main/java/FriendSystem.java index e82dd355d3..9d9695fe3e 100644 --- a/runescape-client/src/main/java/FriendSystem.java +++ b/runescape-client/src/main/java/FriendSystem.java @@ -3,462 +3,1158 @@ 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("bo") +@ObfuscatedName("by") @Implements("FriendSystem") public class FriendSystem { - @ObfuscatedName("hi") + @ObfuscatedName("u") @ObfuscatedSignature( - descriptor = "[Lof;" + descriptor = "Lop;" ) - @Export("modIconSprites") - static IndexedSprite[] modIconSprites; - @ObfuscatedName("g") + @Export("options_buttons_0Sprite") + static IndexedSprite options_buttons_0Sprite; + @ObfuscatedName("y") @ObfuscatedSignature( - descriptor = "Lnj;" + descriptor = "Lnc;" ) @Export("loginType") final LoginType loginType; - @ObfuscatedName("l") + @ObfuscatedName("p") @ObfuscatedSignature( - descriptor = "Llu;" + descriptor = "Llb;" ) @Export("friendsList") public final FriendsList friendsList; - @ObfuscatedName("z") + @ObfuscatedName("j") @ObfuscatedSignature( - descriptor = "Llj;" + descriptor = "Llo;" ) @Export("ignoreList") public final IgnoreList ignoreList; - @ObfuscatedName("t") + @ObfuscatedName("r") @ObfuscatedGetter( - intValue = 1129387531 + intValue = 1124775275 ) - int field920; + int field941; @ObfuscatedSignature( - descriptor = "(Lnj;)V" + descriptor = "(Lnc;)V" ) FriendSystem(LoginType var1) { - this.field920 = 0; // L: 23 + this.field941 = 0; // L: 23 this.loginType = var1; // L: 26 this.friendsList = new FriendsList(var1); // L: 27 this.ignoreList = new IgnoreList(var1); // L: 28 } // L: 29 - @ObfuscatedName("h") + @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "(B)Z", - garbageValue = "-75" + descriptor = "(I)Z", + garbageValue = "1883790130" ) - boolean method1744() { - return this.field920 == 2; // L: 32 + boolean method1689() { + return this.field941 == 2; // L: 32 } - @ObfuscatedName("c") + @ObfuscatedName("n") @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "1542795320" + descriptor = "(B)V", + garbageValue = "6" ) - final void method1734() { - this.field920 = 1; // L: 36 + final void method1698() { + this.field941 = 1; // L: 36 } // L: 37 - @ObfuscatedName("o") + @ObfuscatedName("f") @ObfuscatedSignature( - descriptor = "(Lnk;IB)V", - garbageValue = "-75" + descriptor = "(Lnd;IB)V", + garbageValue = "103" ) @Export("readUpdate") final void readUpdate(Buffer var1, int var2) { this.friendsList.read(var1, var2); // L: 40 - this.field920 = 2; // L: 41 + this.field941 = 2; // L: 41 + Varps.method4647(); // L: 42 + } // L: 43 - for (int var3 = 0; var3 < Players.Players_count; ++var3) { // L: 43 - Player var4 = Client.players[Players.Players_indices[var3]]; // L: 44 - var4.clearIsFriend(); // L: 45 - } - - FontName.method6159(); // L: 47 - if (class25.clanChat != null) { // L: 48 - class25.clanChat.clearFriends(); // L: 49 - } - - } // L: 52 - - @ObfuscatedName("g") + @ObfuscatedName("y") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "-1264028150" + garbageValue = "1668816694" ) @Export("processFriendUpdates") final void processFriendUpdates() { - for (FriendLoginUpdate var1 = (FriendLoginUpdate)this.friendsList.friendLoginUpdates.last(); var1 != null; var1 = (FriendLoginUpdate)this.friendsList.friendLoginUpdates.previous()) { // L: 55 - if ((long)var1.field3840 < Archive.currentTimeMillis() / 1000L - 5L) { // L: 56 + for (FriendLoginUpdate var1 = (FriendLoginUpdate)this.friendsList.friendLoginUpdates.last(); var1 != null; var1 = (FriendLoginUpdate)this.friendsList.friendLoginUpdates.previous()) { // L: 46 + if ((long)var1.field3828 < ObjectComposition.currentTimeMillis() / 1000L - 5L) { // L: 47 if (var1.world > 0) { - WorldMapScaleHandler.addGameMessage(5, "", var1.username + " has logged in."); // L: 57 + World.addGameMessage(5, "", var1.username + " has logged in."); // L: 48 } - if (var1.world == 0) { // L: 58 - WorldMapScaleHandler.addGameMessage(5, "", var1.username + " has logged out."); + if (var1.world == 0) { // L: 49 + World.addGameMessage(5, "", var1.username + " has logged out."); } - var1.remove(); // L: 59 + var1.remove(); // L: 50 } } - } // L: 62 + } // L: 53 - @ObfuscatedName("l") + @ObfuscatedName("p") @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "962792858" + descriptor = "(B)V", + garbageValue = "118" ) @Export("clear") final void clear() { - this.field920 = 0; // L: 65 - this.friendsList.clear(); // L: 66 - this.ignoreList.clear(); // L: 67 - } // L: 68 + this.field941 = 0; // L: 56 + this.friendsList.clear(); // L: 57 + this.ignoreList.clear(); // L: 58 + } // L: 59 - @ObfuscatedName("z") + @ObfuscatedName("j") @ObfuscatedSignature( - descriptor = "(Lla;ZI)Z", - garbageValue = "166133195" + descriptor = "(Lly;ZI)Z", + garbageValue = "-1207370332" ) @Export("isFriended") final boolean isFriended(Username var1, boolean var2) { - if (var1 == null) { // L: 71 + if (var1 == null) { // L: 62 return false; - } else if (var1.equals(class35.localPlayer.username)) { + } else if (var1.equals(class93.localPlayer.username)) { // L: 63 return true; } else { - return this.friendsList.isFriended(var1, var2); + return this.friendsList.isFriended(var1, var2); // L: 64 } } - @ObfuscatedName("t") + @ObfuscatedName("r") @ObfuscatedSignature( - descriptor = "(Lla;I)Z", - garbageValue = "-919307241" + descriptor = "(Lly;I)Z", + garbageValue = "279756852" ) @Export("isIgnored") final boolean isIgnored(Username var1) { - if (var1 == null) { // L: 78 + if (var1 == null) { // L: 69 return false; } else { - return this.ignoreList.contains(var1); // L: 79 + return this.ignoreList.contains(var1); // L: 70 } } - @ObfuscatedName("v") + @ObfuscatedName("b") @ObfuscatedSignature( - descriptor = "(Ljava/lang/String;B)V", - garbageValue = "60" + descriptor = "(Ljava/lang/String;I)V", + garbageValue = "-2078408502" ) @Export("addFriend") final void addFriend(String var1) { - if (var1 != null) { // L: 84 - Username var2 = new Username(var1, this.loginType); // L: 85 - if (var2.hasCleanName()) { // L: 86 - if (this.friendsListIsFull()) { // L: 87 - AbstractByteArrayCopier.method4738(); // L: 88 + if (var1 != null) { + Username var2 = new Username(var1, this.loginType); + if (var2.hasCleanName()) { + if (this.friendsListIsFull()) { + Tiles.method2053(); } else { StringBuilder var10000; String var4; - if (class35.localPlayer.username.equals(var2)) { // L: 91 - var10000 = null; // L: 93 + if (class93.localPlayer.username.equals(var2)) { + var10000 = null; var4 = "You can't add yourself to your own friend list"; - WorldMapScaleHandler.addGameMessage(30, "", var4); // L: 95 + World.addGameMessage(30, "", var4); + } else if (this.isFriended(var2, false)) { + WorldMapManager.method3490(var1); + } else if (this.isIgnored(var2)) { // L: 95 + var10000 = new StringBuilder(); + Object var10001 = null; + var10000 = var10000.append("Please remove ").append(var1); + var10001 = null; + var4 = var10000.append(" from your ignore list first").toString(); + World.addGameMessage(30, "", var4); } else { - Object var10001; - if (this.isFriended(var2, false)) { // L: 100 - var10000 = (new StringBuilder()).append(var1); // L: 102 - var10001 = null; - var4 = var10000.append(" is already on your friend list").toString(); - WorldMapScaleHandler.addGameMessage(30, "", var4); // L: 104 - } else if (this.isIgnored(var2)) { // L: 109 - var10000 = new StringBuilder(); - var10001 = null; // L: 111 - var10000 = var10000.append("Please remove ").append(var1); - var10001 = null; - var4 = var10000.append(" from your ignore list first").toString(); - WorldMapScaleHandler.addGameMessage(30, "", var4); // L: 113 + PacketBufferNode var3 = class21.getPacketBufferNode(ClientPacket.field2664, Client.packetWriter.isaacCipher); + var3.packetBuffer.writeByte(Tiles.stringCp1252NullTerminatedByteSize(var1)); + var3.packetBuffer.writeStringCp1252NullTerminated(var1); + Client.packetWriter.addNode(var3); + } + } + } + } + } // L: 80 + + @ObfuscatedName("u") + @ObfuscatedSignature( + descriptor = "(I)Z", + garbageValue = "-1614251669" + ) + @Export("friendsListIsFull") + final boolean friendsListIsFull() { + return this.friendsList.isFull() || this.friendsList.getSize() >= 200 && Client.field759 != 1; + } + + @ObfuscatedName("l") + @ObfuscatedSignature( + descriptor = "(Ljava/lang/String;B)V", + garbageValue = "-7" + ) + @Export("addIgnore") + final void addIgnore(String var1) { + if (var1 != null) { + Username var2 = new Username(var1, this.loginType); + if (var2.hasCleanName()) { + StringBuilder var10000; + String var4; + if (this.canAddIgnore()) { + var10000 = null; // L: 140 + var4 = "Your ignore list is full. Max of 100 for free users, and 400 for members"; + World.addGameMessage(30, "", var4); + } else if (class93.localPlayer.username.equals(var2)) { + var10000 = null; + var4 = "You can't add yourself to your own ignore list"; + World.addGameMessage(30, "", var4); + } else { + Object var10001; + if (this.isIgnored(var2)) { + var10000 = (new StringBuilder()).append(var1); + var10001 = null; + var4 = var10000.append(" is already on your ignore list").toString(); + World.addGameMessage(30, "", var4); + } else if (this.isFriended(var2, false)) { + var10000 = new StringBuilder(); + var10001 = null; + var10000 = var10000.append("Please remove ").append(var1); + var10001 = null; + var4 = var10000.append(" from your friend list first").toString(); + World.addGameMessage(30, "", var4); + } else { + PacketBufferNode var3 = class21.getPacketBufferNode(ClientPacket.field2622, Client.packetWriter.isaacCipher); + var3.packetBuffer.writeByte(Tiles.stringCp1252NullTerminatedByteSize(var1)); + var3.packetBuffer.writeStringCp1252NullTerminated(var1); + Client.packetWriter.addNode(var3); + } + } + } + } + } // L: 181 + + @ObfuscatedName("o") + @ObfuscatedSignature( + descriptor = "(I)Z", + garbageValue = "-1390615002" + ) + @Export("canAddIgnore") + final boolean canAddIgnore() { + return this.ignoreList.isFull() || this.ignoreList.getSize() >= 100 && Client.field759 != 1; + } + + @ObfuscatedName("c") + @ObfuscatedSignature( + descriptor = "(Ljava/lang/String;I)V", + garbageValue = "752053487" + ) + @Export("removeFriend") + final void removeFriend(String var1) { + if (var1 != null) { + Username var2 = new Username(var1, this.loginType); + if (var2.hasCleanName()) { // L: 193 + if (this.friendsList.removeByUsername(var2)) { + Decimator.method1071(); + PacketBufferNode var3 = class21.getPacketBufferNode(ClientPacket.field2671, Client.packetWriter.isaacCipher); + var3.packetBuffer.writeByte(Tiles.stringCp1252NullTerminatedByteSize(var1)); // L: 198 + var3.packetBuffer.writeStringCp1252NullTerminated(var1); // L: 199 + Client.packetWriter.addNode(var3); + } + + Varps.method4647(); + } + } + } + + @ObfuscatedName("e") + @ObfuscatedSignature( + descriptor = "(Ljava/lang/String;I)V", + garbageValue = "-1893508939" + ) + @Export("removeIgnore") + final void removeIgnore(String var1) { + if (var1 != null) { + Username var2 = new Username(var1, this.loginType); + if (var2.hasCleanName()) { + if (this.ignoreList.removeByUsername(var2)) { // L: 209 + Decimator.method1071(); + PacketBufferNode var3 = class21.getPacketBufferNode(ClientPacket.field2655, Client.packetWriter.isaacCipher); + var3.packetBuffer.writeByte(Tiles.stringCp1252NullTerminatedByteSize(var1)); + var3.packetBuffer.writeStringCp1252NullTerminated(var1); + Client.packetWriter.addNode(var3); // L: 215 + } + + MouseRecorder.FriendSystem_invalidateIgnoreds(); + } + } + } // L: 218 + + @ObfuscatedName("a") + @ObfuscatedSignature( + descriptor = "(Lly;B)Z", + garbageValue = "96" + ) + @Export("isFriendAndHasWorld") + final boolean isFriendAndHasWorld(Username var1) { + Friend var2 = (Friend)this.friendsList.getByUsername(var1); + return var2 != null && var2.hasWorld(); + } + + @ObfuscatedName("n") + @ObfuscatedSignature( + descriptor = "(Lnb;II)V", + garbageValue = "-1580432233" + ) + @Export("updatePlayers") + static final void updatePlayers(PacketBuffer var0, int var1) { + int var2 = var0.offset; // L: 71 + Players.Players_pendingUpdateCount = 0; // L: 72 + PcmPlayer.method750(var0); // L: 73 + + for (int var3 = 0; var3 < Players.Players_pendingUpdateCount; ++var3) { // L: 75 + int var4 = Players.Players_pendingUpdateIndices[var3]; // L: 76 + Player var5 = Client.players[var4]; // L: 77 + int var6 = var0.readUnsignedByte(); // L: 78 + if ((var6 & 128) != 0) { // L: 79 + var6 += var0.readUnsignedByte() << 8; + } + + byte var7 = -1; // L: 81 + if ((var6 & 8) != 0) { // L: 82 + var5.targetIndex = var0.readUnsignedShort(); // L: 83 + if (var5.targetIndex == 65535) { // L: 84 + var5.targetIndex = -1; + } + } + + int var8; + if ((var6 & 256) != 0) { // L: 86 + var5.spotAnimation = var0.method6604(); // L: 87 + var8 = var0.method6613(); // L: 88 + var5.field1277 = var8 >> 16; // L: 89 + var5.field1287 = (var8 & 65535) + Client.cycle; // L: 90 + var5.spotAnimationFrame = 0; // L: 91 + var5.spotAnimationFrameCycle = 0; // L: 92 + if (var5.field1287 > Client.cycle) { // L: 93 + var5.spotAnimationFrame = -1; + } + + if (var5.spotAnimation == 65535) { // L: 94 + var5.spotAnimation = -1; + } + } + + int var9; + int var11; + int var12; + int var15; + if ((var6 & 16) != 0) { // L: 96 + var8 = var0.method6549(); // L: 97 + int var10; + int var13; + int var18; + if (var8 > 0) { // L: 98 + for (var9 = 0; var9 < var8; ++var9) { // L: 99 + var11 = -1; // L: 101 + var12 = -1; // L: 102 + var13 = -1; // L: 103 + var10 = var0.readUShortSmart(); // L: 104 + if (var10 == 32767) { // L: 105 + var10 = var0.readUShortSmart(); // L: 106 + var12 = var0.readUShortSmart(); // L: 107 + var11 = var0.readUShortSmart(); // L: 108 + var13 = var0.readUShortSmart(); // L: 109 + } else if (var10 != 32766) { // L: 111 + var12 = var0.readUShortSmart(); // L: 112 } else { - PacketBufferNode var3 = HealthBarDefinition.getPacketBufferNode(ClientPacket.field2589, Client.packetWriter.isaacCipher); // L: 120 - var3.packetBuffer.writeByte(class4.stringCp1252NullTerminatedByteSize(var1)); // L: 121 - var3.packetBuffer.writeStringCp1252NullTerminated(var1); // L: 122 - Client.packetWriter.addNode(var3); // L: 123 + var10 = -1; // L: 114 + } + + var18 = var0.readUShortSmart(); // L: 115 + var5.addHitSplat(var10, var12, var11, var13, Client.cycle, var18); // L: 116 + } + } + + var9 = var0.readUnsignedByte(); // L: 119 + if (var9 > 0) { // L: 120 + for (var10 = 0; var10 < var9; ++var10) { // L: 121 + var11 = var0.readUShortSmart(); // L: 122 + var12 = var0.readUShortSmart(); // L: 123 + if (var12 != 32767) { // L: 124 + var13 = var0.readUShortSmart(); // L: 125 + var18 = var0.method6671(); // L: 126 + var15 = var12 > 0 ? var0.method6595() : var18; // L: 127 + var5.addHealthBar(var11, Client.cycle, var12, var13, var18, var15); // L: 128 + } else { + var5.removeHealthBar(var11); // L: 130 } } } } - } - } // L: 89 98 107 116 125 - @ObfuscatedName("q") - @ObfuscatedSignature( - descriptor = "(I)Z", - garbageValue = "-2083998302" - ) - @Export("friendsListIsFull") - final boolean friendsListIsFull() { - return this.friendsList.isFull() || this.friendsList.getSize() >= 200 && Client.field734 != 1; // L: 135 - } + if ((var6 & 1) != 0) { // L: 134 + var5.field1264 = var0.method6605(); // L: 135 + if (var5.pathLength == 0) { // L: 136 + var5.orientation = var5.field1264; // L: 137 + var5.field1264 = -1; // L: 138 + } + } - @ObfuscatedName("i") - @ObfuscatedSignature( - descriptor = "(Ljava/lang/String;I)V", - garbageValue = "1460320800" - ) - @Export("addIgnore") - final void addIgnore(String var1) { - if (var1 != null) { // L: 142 - Username var2 = new Username(var1, this.loginType); // L: 143 - if (var2.hasCleanName()) { // L: 144 - StringBuilder var10000; - String var3; - if (this.canAddIgnore()) { // L: 145 - var10000 = null; // L: 147 - var3 = "Your ignore list is full. Max of 100 for free users, and 400 for members"; - WorldMapScaleHandler.addGameMessage(30, "", var3); // L: 149 - } else if (class35.localPlayer.username.equals(var2)) { // L: 154 - var10000 = null; // L: 156 - var3 = "You can't add yourself to your own ignore list"; - WorldMapScaleHandler.addGameMessage(30, "", var3); // L: 158 - } else if (this.isIgnored(var2)) { // L: 163 - class14.method222(var1); // L: 164 - } else if (this.isFriended(var2, false)) { // L: 167 - var10000 = new StringBuilder(); - Object var10001 = null; // L: 169 - var10000 = var10000.append("Please remove ").append(var1); - var10001 = null; - var3 = var10000.append(" from your friend list first").toString(); - WorldMapScaleHandler.addGameMessage(30, "", var3); // L: 171 + if ((var6 & 2048) != 0) { // L: 141 + Players.field1373[var4] = var0.method6593(); // L: 142 + } + + if ((var6 & 512) != 0) { // L: 144 + for (var8 = 0; var8 < 3; ++var8) { // L: 145 + var5.actions[var8] = var0.readStringCp1252NullTerminated(); + } + } + + if ((var6 & 8192) != 0) { // L: 147 + var5.field1278 = var0.method6559(); // L: 148 + var5.field1280 = var0.method6597(); // L: 149 + var5.field1269 = var0.method6597(); // L: 150 + var5.field1238 = var0.method6593(); // L: 151 + var5.field1265 = var0.readUnsignedShort() + Client.cycle; // L: 152 + var5.field1283 = var0.method6604() + Client.cycle; // L: 153 + var5.field1284 = var0.method6605(); // L: 154 + if (var5.field1218) { // L: 155 + var5.field1278 += var5.tileX; // L: 156 + var5.field1280 += var5.tileY; // L: 157 + var5.field1269 += var5.tileX; // L: 158 + var5.field1238 += var5.tileY; // L: 159 + var5.pathLength = 0; // L: 160 } else { - class34.method393(var1); // L: 176 + var5.field1278 += var5.pathX[0]; // L: 163 + var5.field1280 += var5.pathY[0]; // L: 164 + var5.field1269 += var5.pathX[0]; // L: 165 + var5.field1238 += var5.pathY[0]; // L: 166 + var5.pathLength = 1; // L: 167 + } + + var5.field1274 = 0; // L: 169 + } + + if ((var6 & 64) != 0) { // L: 171 + var8 = var0.method6604(); // L: 172 + PlayerType var16 = (PlayerType)Messages.findEnumerated(class372.PlayerType_values(), var0.method6549()); // L: 173 + boolean var20 = var0.method6595() == 1; // L: 174 + var11 = var0.method6595(); // L: 175 + var12 = var0.offset; // L: 176 + if (var5.username != null && var5.appearance != null) { // L: 177 + boolean var21 = false; // L: 178 + if (var16.isUser && NetSocket.friendSystem.isIgnored(var5.username)) { // L: 179 180 + var21 = true; + } + + if (!var21 && Client.field755 == 0 && !var5.isHidden) { // L: 182 + Players.field1384.offset = 0; // L: 183 + var0.method6677(Players.field1384.array, 0, var11); // L: 184 + Players.field1384.offset = 0; // L: 185 + String var14 = AbstractFont.escapeBrackets(class43.method433(MusicPatch.method4592(Players.field1384))); // L: 186 + var5.overheadText = var14.trim(); // L: 187 + var5.overheadTextColor = var8 >> 8; // L: 188 + var5.overheadTextEffect = var8 & 255; // L: 189 + var5.overheadTextCyclesRemaining = 150; // L: 190 + var5.isAutoChatting = var20; // L: 191 + var5.field1248 = var5 != class93.localPlayer && var16.isUser && "" != Client.field863 && var14.toLowerCase().indexOf(Client.field863) == -1; // L: 192 + if (var16.isPrivileged) { // L: 194 + var15 = var20 ? 91 : 1; + } else { + var15 = var20 ? 90 : 2; // L: 195 + } + + if (var16.modIcon != -1) { + World.addGameMessage(var15, SecureRandomFuture.method1982(var16.modIcon) + var5.username.getName(), var14); // L: 196 + } else { + World.addGameMessage(var15, var5.username.getName(), var14); // L: 197 + } + } + } + + var0.offset = var12 + var11; // L: 200 + } + + if ((var6 & 2) != 0) { // L: 202 + var8 = var0.method6595(); // L: 203 + byte[] var22 = new byte[var8]; // L: 204 + Buffer var17 = new Buffer(var22); // L: 205 + var0.method6677(var22, 0, var8); // L: 206 + Players.field1374[var4] = var17; // L: 207 + var5.read(var17); // L: 208 + } + + if ((var6 & 4) != 0) { // L: 210 + var8 = var0.method6603(); // L: 211 + if (var8 == 65535) { // L: 212 + var8 = -1; + } + + var9 = var0.method6595(); // L: 213 + class32.performPlayerAnimation(var5, var8, var9); // L: 214 + } + + if ((var6 & 4096) != 0) { // L: 216 + var7 = var0.method6597(); // L: 217 + } + + if ((var6 & 32) != 0) { // L: 219 + var5.overheadText = var0.readStringCp1252NullTerminated(); // L: 220 + if (var5.overheadText.charAt(0) == '~') { // L: 221 + var5.overheadText = var5.overheadText.substring(1); // L: 222 + World.addGameMessage(2, var5.username.getName(), var5.overheadText); // L: 223 + } else if (var5 == class93.localPlayer) { + World.addGameMessage(2, var5.username.getName(), var5.overheadText); + } + + var5.isAutoChatting = false; + var5.overheadTextColor = 0; // L: 229 + var5.overheadTextEffect = 0; + var5.overheadTextCyclesRemaining = 150; + } + + if (var5.field1218) { // L: 233 + if (var7 == 127) { // L: 234 + var5.resetPath(var5.tileX, var5.tileY); + } else { + byte var19; + if (var7 != -1) { // L: 237 + var19 = var7; + } else { + var19 = Players.field1373[var4]; // L: 238 + } + + var5.method2129(var5.tileX, var5.tileY, var19); // L: 239 } } } - } // L: 152 161 165 174 177 - @ObfuscatedName("r") - @ObfuscatedSignature( - descriptor = "(B)Z", - garbageValue = "2" - ) - @Export("canAddIgnore") - final boolean canAddIgnore() { - return this.ignoreList.isFull() || this.ignoreList.getSize() >= 100 && Client.field734 != 1; // L: 195 - } + if (var0.offset - var2 != var1) { // L: 246 + throw new RuntimeException(var0.offset - var2 + " " + var1); // L: 247 + } + } // L: 249 @ObfuscatedName("p") - @ObfuscatedSignature( - descriptor = "(Ljava/lang/String;B)V", - garbageValue = "-81" - ) - @Export("removeFriend") - final void removeFriend(String var1) { - if (var1 != null) { // L: 202 - Username var2 = new Username(var1, this.loginType); // L: 203 - if (var2.hasCleanName()) { // L: 204 - if (this.friendsList.removeByUsername(var2)) { // L: 205 - Client.field801 = Client.cycleCntr; // L: 207 - PacketBufferNode var3 = HealthBarDefinition.getPacketBufferNode(ClientPacket.field2573, Client.packetWriter.isaacCipher); // L: 210 - var3.packetBuffer.writeByte(class4.stringCp1252NullTerminatedByteSize(var1)); // L: 211 - var3.packetBuffer.writeStringCp1252NullTerminated(var1); // L: 212 - Client.packetWriter.addNode(var3); // L: 213 - } - - for (int var5 = 0; var5 < Players.Players_count; ++var5) { // L: 216 - Player var4 = Client.players[Players.Players_indices[var5]]; // L: 217 - var4.clearIsFriend(); // L: 218 - } - - FontName.method6159(); // L: 220 - if (class25.clanChat != null) { // L: 221 - class25.clanChat.clearFriends(); // L: 222 - } - - } - } - } // L: 225 - - @ObfuscatedName("a") - @ObfuscatedSignature( - descriptor = "(Ljava/lang/String;I)V", - garbageValue = "1160977242" - ) - @Export("removeIgnore") - final void removeIgnore(String var1) { - if (var1 != null) { // L: 228 - Username var2 = new Username(var1, this.loginType); // L: 229 - if (var2.hasCleanName()) { // L: 230 - if (this.ignoreList.removeByUsername(var2)) { // L: 231 - Client.field801 = Client.cycleCntr; // L: 233 - PacketBufferNode var3 = HealthBarDefinition.getPacketBufferNode(ClientPacket.field2648, Client.packetWriter.isaacCipher); // L: 236 - var3.packetBuffer.writeByte(class4.stringCp1252NullTerminatedByteSize(var1)); // L: 237 - var3.packetBuffer.writeStringCp1252NullTerminated(var1); // L: 238 - Client.packetWriter.addNode(var3); // L: 239 - } - - class181.FriendSystem_invalidateIgnoreds(); // L: 241 - } - } - } // L: 242 - - @ObfuscatedName("d") - @ObfuscatedSignature( - descriptor = "(Lla;B)Z", - garbageValue = "-128" - ) - @Export("isFriendAndHasWorld") - final boolean isFriendAndHasWorld(Username var1) { - Friend var2 = (Friend)this.friendsList.getByUsername(var1); // L: 254 - return var2 != null && var2.hasWorld(); // L: 255 - } - - @ObfuscatedName("z") - @ObfuscatedSignature( - descriptor = "(II)V", - garbageValue = "-153839217" - ) - static void method1782(int var0) { - ItemContainer var1 = (ItemContainer)ItemContainer.itemContainers.get((long)var0); // L: 72 - if (var1 != null) { - var1.remove(); // L: 74 - } - } // L: 73 75 - - @ObfuscatedName("at") - @ObfuscatedSignature( - descriptor = "(ILci;ZI)I", - garbageValue = "714561014" - ) - static int method1795(int var0, Script var1, boolean var2) { - int var6; - if (var0 == ScriptOpcodes.OC_NAME) { // L: 3120 - var6 = Interpreter.Interpreter_intStack[--WorldMapCacheName.Interpreter_intStackSize]; // L: 3121 - Interpreter.Interpreter_stringStack[++class13.Interpreter_stringStackSize - 1] = Strings.ItemDefinition_get(var6).name; // L: 3122 - return 1; // L: 3123 - } else { - int var4; - ItemComposition var5; - if (var0 == ScriptOpcodes.OC_OP) { // L: 3125 - WorldMapCacheName.Interpreter_intStackSize -= 2; // L: 3126 - var6 = Interpreter.Interpreter_intStack[WorldMapCacheName.Interpreter_intStackSize]; // L: 3127 - var4 = Interpreter.Interpreter_intStack[WorldMapCacheName.Interpreter_intStackSize + 1]; // L: 3128 - var5 = Strings.ItemDefinition_get(var6); // L: 3129 - if (var4 >= 1 && var4 <= 5 && var5.groundActions[var4 - 1] != null) { // L: 3130 - Interpreter.Interpreter_stringStack[++class13.Interpreter_stringStackSize - 1] = var5.groundActions[var4 - 1]; - } else { - Interpreter.Interpreter_stringStack[++class13.Interpreter_stringStackSize - 1] = ""; // L: 3131 - } - - return 1; // L: 3132 - } else if (var0 == ScriptOpcodes.OC_IOP) { // L: 3134 - WorldMapCacheName.Interpreter_intStackSize -= 2; // L: 3135 - var6 = Interpreter.Interpreter_intStack[WorldMapCacheName.Interpreter_intStackSize]; // L: 3136 - var4 = Interpreter.Interpreter_intStack[WorldMapCacheName.Interpreter_intStackSize + 1]; // L: 3137 - var5 = Strings.ItemDefinition_get(var6); // L: 3138 - if (var4 >= 1 && var4 <= 5 && var5.inventoryActions[var4 - 1] != null) { // L: 3139 - Interpreter.Interpreter_stringStack[++class13.Interpreter_stringStackSize - 1] = var5.inventoryActions[var4 - 1]; - } else { - Interpreter.Interpreter_stringStack[++class13.Interpreter_stringStackSize - 1] = ""; // L: 3140 - } - - return 1; // L: 3141 - } else if (var0 == ScriptOpcodes.OC_COST) { // L: 3143 - var6 = Interpreter.Interpreter_intStack[--WorldMapCacheName.Interpreter_intStackSize]; // L: 3144 - Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = Strings.ItemDefinition_get(var6).price; // L: 3145 - return 1; // L: 3146 - } else if (var0 == ScriptOpcodes.OC_STACKABLE) { // L: 3148 - var6 = Interpreter.Interpreter_intStack[--WorldMapCacheName.Interpreter_intStackSize]; // L: 3149 - Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = Strings.ItemDefinition_get(var6).isStackable == 1 ? 1 : 0; // L: 3150 - return 1; // L: 3151 - } else { - ItemComposition var7; - if (var0 == ScriptOpcodes.OC_CERT) { // L: 3153 - var6 = Interpreter.Interpreter_intStack[--WorldMapCacheName.Interpreter_intStackSize]; // L: 3154 - var7 = Strings.ItemDefinition_get(var6); // L: 3155 - if (var7.noteTemplate == -1 && var7.note >= 0) { // L: 3156 - Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = var7.note; - } else { - Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = var6; // L: 3157 - } - - return 1; // L: 3158 - } else if (var0 == ScriptOpcodes.OC_UNCERT) { // L: 3160 - var6 = Interpreter.Interpreter_intStack[--WorldMapCacheName.Interpreter_intStackSize]; // L: 3161 - var7 = Strings.ItemDefinition_get(var6); // L: 3162 - if (var7.noteTemplate >= 0 && var7.note >= 0) { // L: 3163 - Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = var7.note; - } else { - Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = var6; // L: 3164 - } - - return 1; // L: 3165 - } else if (var0 == ScriptOpcodes.OC_MEMBERS) { // L: 3167 - var6 = Interpreter.Interpreter_intStack[--WorldMapCacheName.Interpreter_intStackSize]; // L: 3168 - Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = Strings.ItemDefinition_get(var6).isMembersOnly ? 1 : 0; // L: 3169 - return 1; // L: 3170 - } else if (var0 == ScriptOpcodes.OC_PLACEHOLDER) { // L: 3172 - var6 = Interpreter.Interpreter_intStack[--WorldMapCacheName.Interpreter_intStackSize]; // L: 3173 - var7 = Strings.ItemDefinition_get(var6); // L: 3174 - if (var7.placeholderTemplate == -1 && var7.placeholder >= 0) { // L: 3175 - Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = var7.placeholder; - } else { - Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = var6; // L: 3176 - } - - return 1; // L: 3177 - } else if (var0 == ScriptOpcodes.OC_UNPLACEHOLDER) { // L: 3179 - var6 = Interpreter.Interpreter_intStack[--WorldMapCacheName.Interpreter_intStackSize]; // L: 3180 - var7 = Strings.ItemDefinition_get(var6); // L: 3181 - if (var7.placeholderTemplate >= 0 && var7.placeholder >= 0) { // L: 3182 - Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = var7.placeholder; - } else { - Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = var6; // L: 3183 - } - - return 1; // L: 3184 - } else if (var0 == ScriptOpcodes.OC_FIND) { // L: 3186 - String var3 = Interpreter.Interpreter_stringStack[--class13.Interpreter_stringStackSize]; // L: 3187 - var4 = Interpreter.Interpreter_intStack[--WorldMapCacheName.Interpreter_intStackSize]; // L: 3188 - class10.findItemDefinitions(var3, var4 == 1); // L: 3189 - Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = class135.foundItemIdCount; // L: 3190 - return 1; // L: 3191 - } else if (var0 != ScriptOpcodes.OC_FINDNEXT) { // L: 3193 - if (var0 == ScriptOpcodes.OC_FINDRESET) { // L: 3198 - WorldMapManager.foundItemIndex = 0; // L: 3199 - return 1; // L: 3200 - } else { - return 2; // L: 3202 - } - } else { - if (class179.foundItemIds != null && WorldMapManager.foundItemIndex < class135.foundItemIdCount) { // L: 3194 - Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = class179.foundItemIds[++WorldMapManager.foundItemIndex - 1] & '\uffff'; // L: 3195 - } else { - Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = -1; - } - - return 1; // L: 3196 - } - } - } - } - - @ObfuscatedName("ly") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "405028707" + garbageValue = "1063766627" ) - static void method1732() { - if (Client.oculusOrbState == 1) { // L: 11750 - Client.field699 = true; // L: 11751 + public static void method1746() { + try { + JagexCache.JagexCache_dat2File.close(); // L: 225 + + for (int var0 = 0; var0 < SoundCache.idxCount; ++var0) { // L: 226 + class93.JagexCache_idxFiles[var0].close(); + } + + JagexCache.JagexCache_idx255File.close(); // L: 227 + JagexCache.JagexCache_randomDat.close(); // L: 228 + } catch (Exception var2) { // L: 230 } - } // L: 11753 + } // L: 231 + + @ObfuscatedName("s") + @ObfuscatedSignature( + descriptor = "(Lkt;Lkt;Lkt;B)V", + garbageValue = "0" + ) + @Export("drawTitle") + static void drawTitle(Font var0, Font var1, Font var2) { + Login.xPadding = (class32.canvasWidth - 765) / 2; // L: 1003 + Login.loginBoxX = Login.xPadding + 202; // L: 1004 + UserComparator4.loginBoxCenter = Login.loginBoxX + 180; // L: 1005 + byte var3; + int var4; + int var12; + int var25; + int var26; + int var32; + int var41; + if (Login.worldSelectOpen) { // L: 1006 + if (class337.worldSelectBackSprites == null) { // L: 1008 + class337.worldSelectBackSprites = class369.method6443(GrandExchangeOfferAgeComparator.archive8, "sl_back", ""); + } + + Archive var42; + IndexedSprite[] var46; + if (class25.worldSelectFlagSprites == null) { // L: 1009 + var42 = GrandExchangeOfferAgeComparator.archive8; // L: 1011 + var41 = var42.getGroupId("sl_flags"); // L: 1013 + var26 = var42.getFileId(var41, ""); // L: 1014 + var46 = VerticalAlignment.method2799(var42, var41, var26); // L: 1015 + class25.worldSelectFlagSprites = var46; // L: 1017 + } + + if (HitSplatDefinition.worldSelectArrows == null) { // L: 1019 + var42 = GrandExchangeOfferAgeComparator.archive8; // L: 1021 + var41 = var42.getGroupId("sl_arrows"); // L: 1023 + var26 = var42.getFileId(var41, ""); // L: 1024 + var46 = VerticalAlignment.method2799(var42, var41, var26); // L: 1025 + HitSplatDefinition.worldSelectArrows = var46; // L: 1027 + } + + if (class18.worldSelectStars == null) { // L: 1029 + var42 = GrandExchangeOfferAgeComparator.archive8; // L: 1031 + var41 = var42.getGroupId("sl_stars"); // L: 1033 + var26 = var42.getFileId(var41, ""); // L: 1034 + var46 = VerticalAlignment.method2799(var42, var41, var26); // L: 1035 + class18.worldSelectStars = var46; // L: 1037 + } + + if (class19.worldSelectLeftSprite == null) { // L: 1039 + class19.worldSelectLeftSprite = EnumComposition.SpriteBuffer_getIndexedSpriteByName(GrandExchangeOfferAgeComparator.archive8, "leftarrow", ""); + } + + if (WorldMapID.worldSelectRightSprite == null) { // L: 1040 + WorldMapID.worldSelectRightSprite = EnumComposition.SpriteBuffer_getIndexedSpriteByName(GrandExchangeOfferAgeComparator.archive8, "rightarrow", ""); + } + + Rasterizer2D.Rasterizer2D_fillRectangle(Login.xPadding, 23, 765, 480, 0); // L: 1041 + Rasterizer2D.Rasterizer2D_fillRectangleGradient(Login.xPadding, 0, 125, 23, 12425273, 9135624); // L: 1042 + Rasterizer2D.Rasterizer2D_fillRectangleGradient(Login.xPadding + 125, 0, 640, 23, 5197647, 2697513); // L: 1043 + var0.drawCentered("Select a world", Login.xPadding + 62, 15, 0, -1); // L: 1044 + if (class18.worldSelectStars != null) { // L: 1045 + class18.worldSelectStars[1].drawAt(Login.xPadding + 140, 1); // L: 1046 + var1.draw("Members only world", Login.xPadding + 152, 10, 16777215, -1); // L: 1047 + class18.worldSelectStars[0].drawAt(Login.xPadding + 140, 12); // L: 1048 + var1.draw("Free world", Login.xPadding + 152, 21, 16777215, -1); // L: 1049 + } + + if (HitSplatDefinition.worldSelectArrows != null) { // L: 1051 + var32 = Login.xPadding + 280; // L: 1052 + if (World.World_sortOption1[0] == 0 && World.World_sortOption2[0] == 0) { // L: 1053 + HitSplatDefinition.worldSelectArrows[2].drawAt(var32, 4); + } else { + HitSplatDefinition.worldSelectArrows[0].drawAt(var32, 4); // L: 1054 + } + + if (World.World_sortOption1[0] == 0 && World.World_sortOption2[0] == 1) { // L: 1055 + HitSplatDefinition.worldSelectArrows[3].drawAt(var32 + 15, 4); + } else { + HitSplatDefinition.worldSelectArrows[1].drawAt(var32 + 15, 4); // L: 1056 + } + + var0.draw("World", var32 + 32, 17, 16777215, -1); // L: 1057 + var4 = Login.xPadding + 390; // L: 1058 + if (World.World_sortOption1[0] == 1 && World.World_sortOption2[0] == 0) { // L: 1059 + HitSplatDefinition.worldSelectArrows[2].drawAt(var4, 4); + } else { + HitSplatDefinition.worldSelectArrows[0].drawAt(var4, 4); // L: 1060 + } + + if (World.World_sortOption1[0] == 1 && World.World_sortOption2[0] == 1) { // L: 1061 + HitSplatDefinition.worldSelectArrows[3].drawAt(var4 + 15, 4); + } else { + HitSplatDefinition.worldSelectArrows[1].drawAt(var4 + 15, 4); // L: 1062 + } + + var0.draw("Players", var4 + 32, 17, 16777215, -1); // L: 1063 + var41 = Login.xPadding + 500; // L: 1064 + if (World.World_sortOption1[0] == 2 && World.World_sortOption2[0] == 0) { // L: 1065 + HitSplatDefinition.worldSelectArrows[2].drawAt(var41, 4); + } else { + HitSplatDefinition.worldSelectArrows[0].drawAt(var41, 4); // L: 1066 + } + + if (World.World_sortOption1[0] == 2 && World.World_sortOption2[0] == 1) { // L: 1067 + HitSplatDefinition.worldSelectArrows[3].drawAt(var41 + 15, 4); + } else { + HitSplatDefinition.worldSelectArrows[1].drawAt(var41 + 15, 4); // L: 1068 + } + + var0.draw("Location", var41 + 32, 17, 16777215, -1); // L: 1069 + var26 = Login.xPadding + 610; // L: 1070 + if (World.World_sortOption1[0] == 3 && World.World_sortOption2[0] == 0) { // L: 1071 + HitSplatDefinition.worldSelectArrows[2].drawAt(var26, 4); + } else { + HitSplatDefinition.worldSelectArrows[0].drawAt(var26, 4); // L: 1072 + } + + if (World.World_sortOption1[0] == 3 && World.World_sortOption2[0] == 1) { // L: 1073 + HitSplatDefinition.worldSelectArrows[3].drawAt(var26 + 15, 4); + } else { + HitSplatDefinition.worldSelectArrows[1].drawAt(var26 + 15, 4); // L: 1074 + } + + var0.draw("Type", var26 + 32, 17, 16777215, -1); // L: 1075 + } + + Rasterizer2D.Rasterizer2D_fillRectangle(Login.xPadding + 708, 4, 50, 16, 0); // L: 1077 + var1.drawCentered("Cancel", Login.xPadding + 708 + 25, 16, 16777215, -1); // L: 1078 + Login.hoveredWorldIndex = -1; // L: 1079 + if (class337.worldSelectBackSprites != null) { // L: 1080 + var3 = 88; // L: 1081 + byte var37 = 19; // L: 1082 + var41 = 765 / (var3 + 1) - 1; // L: 1083 + var26 = 480 / (var37 + 1); // L: 1084 + + int var35; + do { + var25 = var26; // L: 1086 + var35 = var41; // L: 1087 + if (var26 * (var41 - 1) >= World.World_count) { // L: 1088 + --var41; + } + + if (var41 * (var26 - 1) >= World.World_count) { // L: 1089 + --var26; + } + + if (var41 * (var26 - 1) >= World.World_count) { // L: 1090 + --var26; + } + } while(var26 != var25 || var41 != var35); // L: 1091 + + var25 = (765 - var41 * var3) / (var41 + 1); // L: 1093 + if (var25 > 5) { // L: 1094 + var25 = 5; + } + + var35 = (480 - var37 * var26) / (var26 + 1); // L: 1095 + if (var35 > 5) { // L: 1096 + var35 = 5; + } + + int var36 = (765 - var41 * var3 - var25 * (var41 - 1)) / 2; // L: 1097 + int var38 = (480 - var37 * var26 - var35 * (var26 - 1)) / 2; // L: 1098 + int var29 = (var26 + World.World_count - 1) / var26; // L: 1099 + Login.worldSelectPagesCount = var29 - var41; // L: 1100 + if (class19.worldSelectLeftSprite != null && Login.worldSelectPage > 0) { // L: 1101 + class19.worldSelectLeftSprite.drawAt(8, ReflectionCheck.canvasHeight / 2 - class19.worldSelectLeftSprite.subHeight / 2); // L: 1102 + } + + if (WorldMapID.worldSelectRightSprite != null && Login.worldSelectPage < Login.worldSelectPagesCount) { // L: 1104 + WorldMapID.worldSelectRightSprite.drawAt(class32.canvasWidth - WorldMapID.worldSelectRightSprite.subWidth - 8, ReflectionCheck.canvasHeight / 2 - WorldMapID.worldSelectRightSprite.subHeight / 2); // L: 1105 + } + + var12 = var38 + 23; // L: 1107 + int var39 = var36 + Login.xPadding; // L: 1108 + int var14 = 0; // L: 1109 + boolean var15 = false; // L: 1110 + int var16 = Login.worldSelectPage; // L: 1111 + + int var17; + for (var17 = var16 * var26; var17 < World.World_count && var16 - Login.worldSelectPage < var41; ++var17) { // L: 1112 1113 + World var18 = Tiles.World_worlds[var17]; // L: 1116 + boolean var19 = true; // L: 1117 + String var20 = Integer.toString(var18.population); // L: 1118 + if (var18.population == -1) { // L: 1119 + var20 = "OFF"; // L: 1120 + var19 = false; // L: 1121 + } else if (var18.population > 1980) { // L: 1123 + var20 = "FULL"; // L: 1124 + var19 = false; // L: 1125 + } + + int var22 = 0; // L: 1128 + byte var21; + if (var18.isBeta()) { // L: 1129 + if (var18.isMembersOnly()) { // L: 1130 + var21 = 7; + } else { + var21 = 6; // L: 1131 + } + } else if (var18.isDeadman()) { // L: 1133 + var22 = 16711680; // L: 1134 + if (var18.isMembersOnly()) { // L: 1135 + var21 = 5; + } else { + var21 = 4; // L: 1136 + } + } else if (var18.method1643()) { // L: 1138 + if (var18.isMembersOnly()) { // L: 1139 + var21 = 9; + } else { + var21 = 8; // L: 1140 + } + } else if (var18.isPvp()) { // L: 1142 + if (var18.isMembersOnly()) { // L: 1143 + var21 = 3; + } else { + var21 = 2; // L: 1144 + } + } else if (var18.isMembersOnly()) { // L: 1147 + var21 = 1; + } else { + var21 = 0; // L: 1148 + } + + if (MouseHandler.MouseHandler_x >= var39 && MouseHandler.MouseHandler_y >= var12 && MouseHandler.MouseHandler_x < var3 + var39 && MouseHandler.MouseHandler_y < var37 + var12 && var19) { // L: 1150 + Login.hoveredWorldIndex = var17; // L: 1151 + class337.worldSelectBackSprites[var21].drawTransOverlayAt(var39, var12, 128, 16777215); // L: 1152 + var15 = true; // L: 1153 + } else { + class337.worldSelectBackSprites[var21].drawAt(var39, var12); // L: 1155 + } + + if (class25.worldSelectFlagSprites != null) { // L: 1156 + class25.worldSelectFlagSprites[(var18.isMembersOnly() ? 8 : 0) + var18.location].drawAt(var39 + 29, var12); + } + + var0.drawCentered(Integer.toString(var18.id), var39 + 15, var37 / 2 + var12 + 5, var22, -1); // L: 1157 + var1.drawCentered(var20, var39 + 60, var37 / 2 + var12 + 5, 268435455, -1); // L: 1158 + var12 = var12 + var37 + var35; // L: 1159 + ++var14; // L: 1160 + if (var14 >= var26) { + var12 = var38 + 23; // L: 1161 + var39 = var39 + var3 + var25; // L: 1162 + var14 = 0; // L: 1163 + ++var16; // L: 1164 + } + } + + if (var15) { // L: 1167 + var17 = var1.stringWidth(Tiles.World_worlds[Login.hoveredWorldIndex].activity) + 6; // L: 1168 + int var30 = var1.ascent + 8; // L: 1169 + int var40 = MouseHandler.MouseHandler_y + 25; // L: 1170 + if (var40 + var30 > 480) { // L: 1171 + var40 = MouseHandler.MouseHandler_y - 25 - var30; // L: 1172 + } + + Rasterizer2D.Rasterizer2D_fillRectangle(MouseHandler.MouseHandler_x - var17 / 2, var40, var17, var30, 16777120); // L: 1174 + Rasterizer2D.Rasterizer2D_drawRectangle(MouseHandler.MouseHandler_x - var17 / 2, var40, var17, var30, 0); // L: 1175 + var1.drawCentered(Tiles.World_worlds[Login.hoveredWorldIndex].activity, MouseHandler.MouseHandler_x, var40 + var1.ascent + 4, 0, -1); // L: 1176 + } + } + + class26.rasterProvider.drawFull(0, 0); // L: 1179 + } else { + Login.leftTitleSprite.drawAt(Login.xPadding, 0); // L: 1183 + class20.rightTitleSprite.drawAt(Login.xPadding + 382, 0); // L: 1184 + Fonts.logoSprite.drawAt(Login.xPadding + 382 - Fonts.logoSprite.subWidth / 2, 18); // L: 1185 + if (Client.gameState == 0 || Client.gameState == 5) { // L: 1186 + var3 = 20; // L: 1187 + var0.drawCentered("RuneScape is loading - please wait...", Login.loginBoxX + 180, 245 - var3, 16777215, -1); // L: 1188 + var4 = 253 - var3; // L: 1189 + Rasterizer2D.Rasterizer2D_drawRectangle(Login.loginBoxX + 180 - 152, var4, 304, 34, 9179409); // L: 1190 + Rasterizer2D.Rasterizer2D_drawRectangle(Login.loginBoxX + 180 - 151, var4 + 1, 302, 32, 0); // L: 1191 + Rasterizer2D.Rasterizer2D_fillRectangle(Login.loginBoxX + 180 - 150, var4 + 2, Login.Login_loadingPercent * 3, 30, 9179409); // L: 1192 + Rasterizer2D.Rasterizer2D_fillRectangle(Login.loginBoxX + 180 - 150 + Login.Login_loadingPercent * 3, var4 + 2, 300 - Login.Login_loadingPercent * 3, 30, 0); // L: 1193 + var0.drawCentered(Login.Login_loadingText, Login.loginBoxX + 180, 276 - var3, 16777215, -1); // L: 1194 + } + + String var5; + String var6; + short var31; + short var33; + if (Client.gameState == 20) { // L: 1196 + class260.titleboxSprite.drawAt(Login.loginBoxX + 180 - class260.titleboxSprite.subWidth / 2, 271 - class260.titleboxSprite.subHeight / 2); // L: 1197 + var31 = 201; // L: 1198 + var0.drawCentered(Login.Login_response1, Login.loginBoxX + 180, var31, 16776960, 0); // L: 1199 + var32 = var31 + 15; // L: 1200 + var0.drawCentered(Login.Login_response2, Login.loginBoxX + 180, var32, 16776960, 0); // L: 1201 + var32 += 15; // L: 1202 + var0.drawCentered(Login.Login_response3, Login.loginBoxX + 180, var32, 16776960, 0); // L: 1203 + var32 += 15; // L: 1204 + var32 += 7; // L: 1205 + if (Login.loginIndex != 4) { // L: 1206 + var0.draw("Login: ", Login.loginBoxX + 180 - 110, var32, 16777215, 0); // L: 1207 + var33 = 200; // L: 1208 + var5 = ObjectComposition.clientPreferences.hideUsername ? class6.method67(Login.Login_username) : Login.Login_username; // L: 1211 + + for (var6 = var5; var0.stringWidth(var6) > var33; var6 = var6.substring(0, var6.length() - 1)) { // L: 1213 1214 1215 + } + + var0.draw(AbstractFont.escapeBrackets(var6), Login.loginBoxX + 180 - 70, var32, 16777215, 0); // L: 1217 + var32 += 15; // L: 1218 + + String var7; + for (var7 = class6.method67(Login.Login_password); var0.stringWidth(var7) > var33; var7 = var7.substring(1)) { // L: 1219 1220 1221 + } + + var0.draw("Password: " + var7, Login.loginBoxX + 180 - 108, var32, 16777215, 0); // L: 1223 + var32 += 15; // L: 1224 + } + } + + if (Client.gameState == 10 || Client.gameState == 11) { // L: 1227 + class260.titleboxSprite.drawAt(Login.loginBoxX, 171); // L: 1228 + short var23; + if (Login.loginIndex == 0) { // L: 1229 + var31 = 251; // L: 1230 + var0.drawCentered("Welcome to RuneScape", Login.loginBoxX + 180, var31, 16776960, 0); // L: 1231 + var32 = var31 + 30; // L: 1232 + var4 = Login.loginBoxX + 180 - 80; // L: 1233 + var23 = 291; // L: 1234 + Login.titlebuttonSprite.drawAt(var4 - 73, var23 - 20); // L: 1235 + var0.drawLines("New User", var4 - 73, var23 - 20, 144, 40, 16777215, 0, 1, 1, 0); // L: 1236 + var4 = Login.loginBoxX + 180 + 80; // L: 1237 + Login.titlebuttonSprite.drawAt(var4 - 73, var23 - 20); // L: 1238 + var0.drawLines("Existing User", var4 - 73, var23 - 20, 144, 40, 16777215, 0, 1, 1, 0); // L: 1239 + } else if (Login.loginIndex == 1) { // L: 1241 + var0.drawCentered(Login.Login_response0, Login.loginBoxX + 180, 201, 16776960, 0); // L: 1242 + var31 = 236; // L: 1243 + var0.drawCentered(Login.Login_response1, Login.loginBoxX + 180, var31, 16777215, 0); // L: 1244 + var32 = var31 + 15; // L: 1245 + var0.drawCentered(Login.Login_response2, Login.loginBoxX + 180, var32, 16777215, 0); // L: 1246 + var32 += 15; // L: 1247 + var0.drawCentered(Login.Login_response3, Login.loginBoxX + 180, var32, 16777215, 0); // L: 1248 + var32 += 15; // L: 1249 + var4 = Login.loginBoxX + 180 - 80; // L: 1250 + var23 = 321; // L: 1251 + Login.titlebuttonSprite.drawAt(var4 - 73, var23 - 20); // L: 1252 + var0.drawCentered("Continue", var4, var23 + 5, 16777215, 0); // L: 1253 + var4 = Login.loginBoxX + 180 + 80; // L: 1254 + Login.titlebuttonSprite.drawAt(var4 - 73, var23 - 20); // L: 1255 + var0.drawCentered("Cancel", var4, var23 + 5, 16777215, 0); // L: 1256 + } else if (Login.loginIndex == 2) { // L: 1258 + var31 = 201; // L: 1259 + var0.drawCentered(Login.Login_response1, UserComparator4.loginBoxCenter, var31, 16776960, 0); // L: 1260 + var32 = var31 + 15; // L: 1261 + var0.drawCentered(Login.Login_response2, UserComparator4.loginBoxCenter, var32, 16776960, 0); // L: 1262 + var32 += 15; // L: 1263 + var0.drawCentered(Login.Login_response3, UserComparator4.loginBoxCenter, var32, 16776960, 0); // L: 1264 + var32 += 15; // L: 1265 + var32 += 7; // L: 1266 + var0.draw("Login: ", UserComparator4.loginBoxCenter - 110, var32, 16777215, 0); // L: 1267 + var33 = 200; // L: 1268 + + for (var5 = ScriptEvent.method2086(); var0.stringWidth(var5) > var33; var5 = var5.substring(1)) { // L: 1269 1270 1271 + } + + var0.draw(AbstractFont.escapeBrackets(var5) + (Login.currentLoginField == 0 & Client.cycle % 40 < 20 ? class44.colorStartTag(16776960) + "|" : ""), UserComparator4.loginBoxCenter - 70, var32, 16777215, 0); // L: 1273 + var32 += 15; // L: 1274 + + for (var6 = class6.method67(Login.Login_password); var0.stringWidth(var6) > var33; var6 = var6.substring(1)) { // L: 1275 1276 1277 + } + + var0.draw("Password: " + var6 + (Login.currentLoginField == 1 & Client.cycle % 40 < 20 ? class44.colorStartTag(16776960) + "|" : ""), UserComparator4.loginBoxCenter - 108, var32, 16777215, 0); // L: 1279 + var32 += 15; // L: 1280 + var31 = 277; // L: 1281 + var25 = UserComparator4.loginBoxCenter + -117; // L: 1282 + boolean var9 = Client.Login_isUsernameRemembered; // L: 1284 + boolean var10 = Login.field1041; // L: 1285 + IndexedSprite var27 = var9 ? (var10 ? ClanChannel.field33 : GrandExchangeOffer.options_buttons_2Sprite) : (var10 ? Decimator.field553 : options_buttons_0Sprite); // L: 1287 + var27.drawAt(var25, var31); // L: 1290 + var25 = var25 + var27.subWidth + 5; // L: 1291 + var1.draw("Remember username", var25, var31 + 13, 16776960, 0); // L: 1292 + var25 = UserComparator4.loginBoxCenter + 24; // L: 1293 + IndexedSprite var11 = Script.method1995(ObjectComposition.clientPreferences.hideUsername, Login.field1047); // L: 1294 + var11.drawAt(var25, var31); // L: 1295 + var25 = var25 + var11.subWidth + 5; // L: 1296 + var1.draw("Hide username", var25, var31 + 13, 16776960, 0); // L: 1297 + var32 = var31 + 15; // L: 1298 + var12 = UserComparator4.loginBoxCenter - 80; // L: 1299 + short var13 = 321; // L: 1300 + Login.titlebuttonSprite.drawAt(var12 - 73, var13 - 20); // L: 1301 + var0.drawCentered("Login", var12, var13 + 5, 16777215, 0); // L: 1302 + var12 = UserComparator4.loginBoxCenter + 80; // L: 1303 + Login.titlebuttonSprite.drawAt(var12 - 73, var13 - 20); // L: 1304 + var0.drawCentered("Cancel", var12, var13 + 5, 16777215, 0); // L: 1305 + var31 = 357; // L: 1306 + switch(Login.field1039) { // L: 1307 + case 2: + MusicPatchPcmStream.field2885 = "Having trouble logging in?"; // L: 1312 + break; + default: + MusicPatchPcmStream.field2885 = "Can't login? Click here."; // L: 1309 + } + + DynamicObject.field1107 = new Bounds(UserComparator4.loginBoxCenter, var31, var1.stringWidth(MusicPatchPcmStream.field2885), 11); // L: 1315 + GrandExchangeOfferOwnWorldComparator.field631 = new Bounds(UserComparator4.loginBoxCenter, var31, var1.stringWidth("Still having trouble logging in?"), 11); // L: 1316 + var1.drawCentered(MusicPatchPcmStream.field2885, UserComparator4.loginBoxCenter, var31, 16777215, 0); // L: 1317 + } else if (Login.loginIndex == 3) { // L: 1319 + var31 = 201; // L: 1320 + var0.drawCentered("Invalid credentials.", Login.loginBoxX + 180, var31, 16776960, 0); // L: 1321 + var32 = var31 + 20; // L: 1322 + var1.drawCentered("For accounts created after 24th November 2010, please use your", Login.loginBoxX + 180, var32, 16776960, 0); // L: 1323 + var32 += 15; // L: 1324 + var1.drawCentered("email address to login. Otherwise please login with your username.", Login.loginBoxX + 180, var32, 16776960, 0); // L: 1325 + var32 += 15; // L: 1326 + var4 = Login.loginBoxX + 180; // L: 1327 + var23 = 276; // L: 1328 + Login.titlebuttonSprite.drawAt(var4 - 73, var23 - 20); // L: 1329 + var2.drawCentered("Try again", var4, var23 + 5, 16777215, 0); // L: 1330 + var4 = Login.loginBoxX + 180; // L: 1331 + var23 = 326; // L: 1332 + Login.titlebuttonSprite.drawAt(var4 - 73, var23 - 20); // L: 1333 + var2.drawCentered("Forgotten password?", var4, var23 + 5, 16777215, 0); // L: 1334 + } else { + short var8; + if (Login.loginIndex == 4) { // L: 1336 + var0.drawCentered("Authenticator", Login.loginBoxX + 180, 201, 16776960, 0); // L: 1337 + var31 = 236; // L: 1338 + var0.drawCentered(Login.Login_response1, Login.loginBoxX + 180, var31, 16777215, 0); // L: 1339 + var32 = var31 + 15; // L: 1340 + var0.drawCentered(Login.Login_response2, Login.loginBoxX + 180, var32, 16777215, 0); // L: 1341 + var32 += 15; // L: 1342 + var0.drawCentered(Login.Login_response3, Login.loginBoxX + 180, var32, 16777215, 0); // L: 1343 + var32 += 15; // L: 1344 + var0.draw("PIN: " + class6.method67(Varps.otp) + (Client.cycle % 40 < 20 ? class44.colorStartTag(16776960) + "|" : ""), Login.loginBoxX + 180 - 108, var32, 16777215, 0); // L: 1345 + var32 -= 8; // L: 1346 + var0.draw("Trust this computer", Login.loginBoxX + 180 - 9, var32, 16776960, 0); // L: 1347 + var32 += 15; // L: 1348 + var0.draw("for 30 days: ", Login.loginBoxX + 180 - 9, var32, 16776960, 0); // L: 1349 + var4 = Login.loginBoxX + 180 - 9 + var0.stringWidth("for 30 days: ") + 15; // L: 1350 + var41 = var32 - var0.ascent; // L: 1351 + IndexedSprite var34; + if (Login.field1043) { // L: 1353 + var34 = GrandExchangeOffer.options_buttons_2Sprite; // L: 1354 + } else { + var34 = options_buttons_0Sprite; // L: 1357 + } + + var34.drawAt(var4, var41); // L: 1359 + var32 += 15; // L: 1360 + var25 = Login.loginBoxX + 180 - 80; // L: 1361 + var8 = 321; // L: 1362 + Login.titlebuttonSprite.drawAt(var25 - 73, var8 - 20); // L: 1363 + var0.drawCentered("Continue", var25, var8 + 5, 16777215, 0); // L: 1364 + var25 = Login.loginBoxX + 180 + 80; // L: 1365 + Login.titlebuttonSprite.drawAt(var25 - 73, var8 - 20); // L: 1366 + var0.drawCentered("Cancel", var25, var8 + 5, 16777215, 0); // L: 1367 + var1.drawCentered("Can't Log In?", Login.loginBoxX + 180, var8 + 36, 255, 0); // L: 1368 + } else if (Login.loginIndex == 5) { // L: 1370 + var0.drawCentered("Forgotten your password?", Login.loginBoxX + 180, 201, 16776960, 0); // L: 1371 + var31 = 221; // L: 1372 + var2.drawCentered(Login.Login_response1, Login.loginBoxX + 180, var31, 16776960, 0); // L: 1373 + var32 = var31 + 15; // L: 1374 + var2.drawCentered(Login.Login_response2, Login.loginBoxX + 180, var32, 16776960, 0); // L: 1375 + var32 += 15; // L: 1376 + var2.drawCentered(Login.Login_response3, Login.loginBoxX + 180, var32, 16776960, 0); // L: 1377 + var32 += 15; // L: 1378 + var32 += 14; // L: 1379 + var0.draw("Username/email: ", Login.loginBoxX + 180 - 145, var32, 16777215, 0); // L: 1380 + var33 = 174; // L: 1381 + + for (var5 = ScriptEvent.method2086(); var0.stringWidth(var5) > var33; var5 = var5.substring(1)) { // L: 1382 1383 1384 + } + + var0.draw(AbstractFont.escapeBrackets(var5) + (Client.cycle % 40 < 20 ? class44.colorStartTag(16776960) + "|" : ""), Login.loginBoxX + 180 - 34, var32, 16777215, 0); // L: 1386 + var32 += 15; // L: 1387 + var26 = Login.loginBoxX + 180 - 80; // L: 1388 + short var45 = 321; // L: 1389 + Login.titlebuttonSprite.drawAt(var26 - 73, var45 - 20); // L: 1390 + var0.drawCentered("Recover", var26, var45 + 5, 16777215, 0); // L: 1391 + var26 = Login.loginBoxX + 180 + 80; // L: 1392 + Login.titlebuttonSprite.drawAt(var26 - 73, var45 - 20); // L: 1393 + var0.drawCentered("Back", var26, var45 + 5, 16777215, 0); // L: 1394 + var45 = 356; // L: 1395 + var1.drawCentered("Still having trouble logging in?", UserComparator4.loginBoxCenter, var45, 268435455, 0); // L: 1396 + } else if (Login.loginIndex == 6) { // L: 1398 + var31 = 201; // L: 1399 + var0.drawCentered(Login.Login_response1, Login.loginBoxX + 180, var31, 16776960, 0); // L: 1400 + var32 = var31 + 15; // L: 1401 + var0.drawCentered(Login.Login_response2, Login.loginBoxX + 180, var32, 16776960, 0); // L: 1402 + var32 += 15; // L: 1403 + var0.drawCentered(Login.Login_response3, Login.loginBoxX + 180, var32, 16776960, 0); // L: 1404 + var32 += 15; // L: 1405 + var4 = Login.loginBoxX + 180; // L: 1406 + var23 = 321; // L: 1407 + Login.titlebuttonSprite.drawAt(var4 - 73, var23 - 20); // L: 1408 + var0.drawCentered("Back", var4, var23 + 5, 16777215, 0); // L: 1409 + } else if (Login.loginIndex == 7) { // L: 1411 + var31 = 216; // L: 1412 + var0.drawCentered("Your date of birth isn't set.", Login.loginBoxX + 180, var31, 16776960, 0); // L: 1413 + var32 = var31 + 15; // L: 1414 + var2.drawCentered("Please verify your account status by", Login.loginBoxX + 180, var32, 16776960, 0); // L: 1415 + var32 += 15; // L: 1416 + var2.drawCentered("setting your date of birth.", Login.loginBoxX + 180, var32, 16776960, 0); // L: 1417 + var32 += 15; // L: 1418 + var4 = Login.loginBoxX + 180 - 80; // L: 1419 + var23 = 321; // L: 1420 + Login.titlebuttonSprite.drawAt(var4 - 73, var23 - 20); // L: 1421 + var0.drawCentered("Set Date of Birth", var4, var23 + 5, 16777215, 0); // L: 1422 + var4 = Login.loginBoxX + 180 + 80; // L: 1423 + Login.titlebuttonSprite.drawAt(var4 - 73, var23 - 20); // L: 1424 + var0.drawCentered("Back", var4, var23 + 5, 16777215, 0); // L: 1425 + } else if (Login.loginIndex == 8) { // L: 1427 + var31 = 216; // L: 1428 + var0.drawCentered("Sorry, but your account is not eligible to play.", Login.loginBoxX + 180, var31, 16776960, 0); // L: 1429 + var32 = var31 + 15; // L: 1430 + var2.drawCentered("For more information, please take a look at", Login.loginBoxX + 180, var32, 16776960, 0); // L: 1431 + var32 += 15; // L: 1432 + var2.drawCentered("our privacy policy.", Login.loginBoxX + 180, var32, 16776960, 0); // L: 1433 + var32 += 15; // L: 1434 + var4 = Login.loginBoxX + 180 - 80; // L: 1435 + var23 = 321; // L: 1436 + Login.titlebuttonSprite.drawAt(var4 - 73, var23 - 20); // L: 1437 + var0.drawCentered("Privacy Policy", var4, var23 + 5, 16777215, 0); // L: 1438 + var4 = Login.loginBoxX + 180 + 80; // L: 1439 + Login.titlebuttonSprite.drawAt(var4 - 73, var23 - 20); // L: 1440 + var0.drawCentered("Back", var4, var23 + 5, 16777215, 0); // L: 1441 + } else if (Login.loginIndex == 12) { // L: 1443 + var31 = 201; // L: 1444 + String var24 = ""; // L: 1445 + var5 = ""; // L: 1446 + var6 = ""; // L: 1447 + switch(Login.field1032) { // L: 1448 + case 0: + var24 = "Your account has been disabled."; // L: 1463 + var5 = Strings.field3306; // L: 1464 + var6 = ""; // L: 1465 + break; + case 1: + var24 = "Account locked as we suspect it has been stolen."; // L: 1451 + var5 = Strings.field3327; // L: 1452 + var6 = ""; // L: 1453 + break; + default: + ClanChannelMember.Login_promptCredentials(false); // L: 1458 + } + + var0.drawCentered(var24, Login.loginBoxX + 180, var31, 16776960, 0); // L: 1469 + var32 = var31 + 15; // L: 1470 + var2.drawCentered(var5, Login.loginBoxX + 180, var32, 16776960, 0); // L: 1471 + var32 += 15; // L: 1472 + var2.drawCentered(var6, Login.loginBoxX + 180, var32, 16776960, 0); // L: 1473 + var32 += 15; // L: 1474 + var25 = Login.loginBoxX + 180; // L: 1475 + var8 = 276; // L: 1476 + Login.titlebuttonSprite.drawAt(var25 - 73, var8 - 20); // L: 1477 + var0.drawCentered("Support Page", var25, var8 + 5, 16777215, 0); // L: 1478 + var25 = Login.loginBoxX + 180; // L: 1479 + var8 = 326; // L: 1480 + Login.titlebuttonSprite.drawAt(var25 - 73, var8 - 20); // L: 1481 + var0.drawCentered("Back", var25, var8 + 5, 16777215, 0); // L: 1482 + } else if (Login.loginIndex == 24) { // L: 1484 + var31 = 221; // L: 1485 + var0.drawCentered(Login.Login_response1, Login.loginBoxX + 180, var31, 16777215, 0); // L: 1486 + var32 = var31 + 15; // L: 1487 + var0.drawCentered(Login.Login_response2, Login.loginBoxX + 180, var32, 16777215, 0); // L: 1488 + var32 += 15; // L: 1489 + var0.drawCentered(Login.Login_response3, Login.loginBoxX + 180, var32, 16777215, 0); // L: 1490 + var32 += 15; // L: 1491 + var4 = Login.loginBoxX + 180; // L: 1492 + var23 = 301; // L: 1493 + Login.titlebuttonSprite.drawAt(var4 - 73, var23 - 20); // L: 1494 + var0.drawCentered("Ok", var4, var23 + 5, 16777215, 0); // L: 1495 + } + } + } + + if (Client.gameState >= 10) { // L: 1498 + int[] var28 = new int[4]; // L: 1499 + Rasterizer2D.Rasterizer2D_getClipArray(var28); // L: 1500 + Rasterizer2D.Rasterizer2D_setClip(Login.xPadding, 0, Login.xPadding + 765, ReflectionCheck.canvasHeight); // L: 1501 + class24.loginScreenRunesAnimation.draw(Login.xPadding - 22, Client.cycle); // L: 1502 + class24.loginScreenRunesAnimation.draw(Login.xPadding + 22 + 765 - 128, Client.cycle); // L: 1503 + Rasterizer2D.Rasterizer2D_setClipArray(var28); // L: 1504 + } + + Decimator.title_muteSprite[ObjectComposition.clientPreferences.titleMusicDisabled ? 1 : 0].drawAt(Login.xPadding + 765 - 40, 463); // L: 1506 + if (Client.gameState > 5 && Language.Language_EN == class378.clientLanguage) { // L: 1507 + if (class69.field597 != null) { // L: 1508 + var32 = Login.xPadding + 5; // L: 1509 + var33 = 463; // L: 1510 + byte var43 = 100; // L: 1511 + byte var44 = 35; // L: 1512 + class69.field597.drawAt(var32, var33); // L: 1513 + var0.drawCentered("World" + " " + Client.worldId, var43 / 2 + var32, var44 / 2 + var33 - 2, 16777215, 0); // L: 1514 + if (MilliClock.World_request != null) { // L: 1515 + var1.drawCentered("Loading...", var43 / 2 + var32, var44 / 2 + var33 + 12, 16777215, 0); + } else { + var1.drawCentered("Click to switch", var43 / 2 + var32, var44 / 2 + var33 + 12, 16777215, 0); // L: 1516 + } + } else { + class69.field597 = EnumComposition.SpriteBuffer_getIndexedSpriteByName(GrandExchangeOfferAgeComparator.archive8, "sl_button", ""); // L: 1519 + } + } + + } + } // L: 1181 1522 } diff --git a/runescape-client/src/main/java/FriendsChat.java b/runescape-client/src/main/java/FriendsChat.java new file mode 100644 index 0000000000..543902a3db --- /dev/null +++ b/runescape-client/src/main/java/FriendsChat.java @@ -0,0 +1,229 @@ +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("lt") +@Implements("FriendsChat") +public class FriendsChat extends UserList { + @ObfuscatedName("n") + @ObfuscatedSignature( + descriptor = "Lnc;" + ) + @Export("loginType") + final LoginType loginType; + @ObfuscatedName("f") + @ObfuscatedSignature( + descriptor = "Llc;" + ) + @Export("localUser") + final Usernamed localUser; + @ObfuscatedName("y") + @Export("name") + public String name; + @ObfuscatedName("p") + @Export("owner") + public String owner; + @ObfuscatedName("j") + @Export("minKick") + public byte minKick; + @ObfuscatedName("r") + @ObfuscatedGetter( + intValue = -78473377 + ) + @Export("rank") + public int rank; + @ObfuscatedName("b") + @ObfuscatedGetter( + intValue = -1952190137 + ) + int field3817; + + @ObfuscatedSignature( + descriptor = "(Lnc;Llc;)V" + ) + public FriendsChat(LoginType var1, Usernamed var2) { + super(100); // L: 18 + this.name = null; // L: 11 + this.owner = null; // L: 12 + this.field3817 = 1; // L: 15 + this.loginType = var1; // L: 19 + this.localUser = var2; // L: 20 + } // L: 21 + + @ObfuscatedName("v") + @ObfuscatedSignature( + descriptor = "(B)Llx;", + garbageValue = "126" + ) + @Export("newInstance") + User newInstance() { + return new ClanMate(); // L: 24 + } + + @ObfuscatedName("n") + @ObfuscatedSignature( + descriptor = "(II)[Llx;", + garbageValue = "1924184817" + ) + @Export("newTypedArray") + User[] newTypedArray(int var1) { + return new ClanMate[var1]; // L: 28 + } + + @ObfuscatedName("f") + @ObfuscatedSignature( + descriptor = "(Ljava/lang/String;B)V", + garbageValue = "-11" + ) + @Export("readName") + final void readName(String var1) { + this.name = WorldMapSection0.method3589(var1); // L: 32 + } // L: 33 + + @ObfuscatedName("b") + @ObfuscatedSignature( + descriptor = "(Ljava/lang/String;I)V", + garbageValue = "-412609184" + ) + @Export("setOwner") + final void setOwner(String var1) { + this.owner = WorldMapSection0.method3589(var1); // L: 36 + } // L: 37 + + @ObfuscatedName("d") + @ObfuscatedSignature( + descriptor = "(Lnd;I)V", + garbageValue = "-1281712604" + ) + @Export("readUpdate") + public final void readUpdate(Buffer var1) { + this.setOwner(var1.readStringCp1252NullTerminated()); // L: 40 + long var2 = var1.readLong(); // L: 41 + long var5 = var2; // L: 43 + String var4; + int var7; + if (var2 > 0L && var2 < 6582952005840035281L) { // L: 45 + if (0L == var2 % 37L) { // L: 49 + var4 = null; // L: 50 + } else { + var7 = 0; // L: 53 + + for (long var8 = var2; var8 != 0L; var8 /= 37L) { // L: 54 55 57 + ++var7; // L: 56 + } + + StringBuilder var10 = new StringBuilder(var7); // L: 59 + + while (0L != var5) { // L: 60 + long var11 = var5; // L: 61 + var5 /= 37L; // L: 62 + var10.append(class305.base37Table[(int)(var11 - var5 * 37L)]); // L: 63 + } + + var4 = var10.reverse().toString(); // L: 65 + } + } else { + var4 = null; // L: 46 + } + + this.readName(var4); // L: 67 + this.minKick = var1.readByte(); // L: 68 + var7 = var1.readUnsignedByte(); // L: 69 + if (var7 != 255) { // L: 70 + this.clear(); // L: 71 + + for (int var13 = 0; var13 < var7; ++var13) { // L: 72 + ClanMate var9 = (ClanMate)this.addLastNoPreviousUsername(new Username(var1.readStringCp1252NullTerminated(), this.loginType)); // L: 73 + int var14 = var1.readUnsignedShort(); // L: 74 + var9.set(var14, ++this.field3817 - 1); // L: 75 + var9.rank = var1.readByte(); // L: 76 + var1.readStringCp1252NullTerminated(); // L: 77 + this.isLocalPlayer(var9); // L: 78 + } + + } + } // L: 80 + + @ObfuscatedName("s") + @ObfuscatedSignature( + descriptor = "(Lnd;I)V", + garbageValue = "817545734" + ) + public final void method5659(Buffer var1) { + Username var2 = new Username(var1.readStringCp1252NullTerminated(), this.loginType); // L: 83 + int var3 = var1.readUnsignedShort(); // L: 84 + byte var4 = var1.readByte(); // L: 85 + boolean var5 = false; // L: 86 + if (var4 == -128) { // L: 87 + var5 = true; + } + + ClanMate var6; + if (var5) { // L: 88 + if (this.getSize() == 0) { // L: 89 + return; + } + + var6 = (ClanMate)this.getByCurrentUsername(var2); // L: 90 + if (var6 != null && var6.getWorld() == var3) { // L: 91 + this.remove(var6); // L: 92 + } + } else { + var1.readStringCp1252NullTerminated(); // L: 96 + var6 = (ClanMate)this.getByCurrentUsername(var2); // L: 97 + if (var6 == null) { // L: 98 + if (this.getSize() > super.capacity) { // L: 99 + return; + } + + var6 = (ClanMate)this.addLastNoPreviousUsername(var2); // L: 100 + } + + var6.set(var3, ++this.field3817 - 1); // L: 102 + var6.rank = var4; // L: 103 + this.isLocalPlayer(var6); // L: 104 + } + + } // L: 106 + + @ObfuscatedName("u") + @ObfuscatedSignature( + descriptor = "(I)V", + garbageValue = "308669829" + ) + @Export("clearFriends") + public final void clearFriends() { + for (int var1 = 0; var1 < this.getSize(); ++var1) { // L: 109 + ((ClanMate)this.get(var1)).clearIsFriend(); // L: 110 + } + + } // L: 112 + + @ObfuscatedName("l") + @ObfuscatedSignature( + descriptor = "(I)V", + garbageValue = "1091935656" + ) + @Export("invalidateIgnoreds") + public final void invalidateIgnoreds() { + for (int var1 = 0; var1 < this.getSize(); ++var1) { // L: 115 + ((ClanMate)this.get(var1)).clearIsIgnored(); // L: 116 + } + + } // L: 118 + + @ObfuscatedName("o") + @ObfuscatedSignature( + descriptor = "(Lll;I)V", + garbageValue = "-263854446" + ) + @Export("isLocalPlayer") + final void isLocalPlayer(ClanMate var1) { + if (var1.getUsername().equals(this.localUser.username())) { // L: 121 + this.rank = var1.rank; + } + + } // L: 122 +} diff --git a/runescape-client/src/main/java/FriendsList.java b/runescape-client/src/main/java/FriendsList.java index 9b22598c37..86e34a9c5a 100644 --- a/runescape-client/src/main/java/FriendsList.java +++ b/runescape-client/src/main/java/FriendsList.java @@ -3,65 +3,68 @@ 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("lu") +@ObfuscatedName("lb") @Implements("FriendsList") public class FriendsList extends UserList { - @ObfuscatedName("gg") - @Export("xteaKeys") - static int[][] xteaKeys; - @ObfuscatedName("o") + @ObfuscatedName("rn") + @ObfuscatedGetter( + intValue = 993918805 + ) + static int field3812; + @ObfuscatedName("f") @ObfuscatedSignature( - descriptor = "Lnj;" + descriptor = "Lnc;" ) @Export("loginType") final LoginType loginType; - @ObfuscatedName("g") + @ObfuscatedName("y") @ObfuscatedGetter( - intValue = -1915245561 + intValue = 1152075333 ) - int field3826; - @ObfuscatedName("l") + int field3808; + @ObfuscatedName("p") @ObfuscatedSignature( - descriptor = "Lki;" + descriptor = "Lkm;" ) @Export("friendLoginUpdates") public LinkDeque friendLoginUpdates; @ObfuscatedSignature( - descriptor = "(Lnj;)V" + descriptor = "(Lnc;)V" ) public FriendsList(LoginType var1) { super(400); // L: 17 - this.field3826 = 1; // L: 13 + this.field3808 = 1; // L: 13 this.friendLoginUpdates = new LinkDeque(); // L: 14 this.loginType = var1; // L: 18 } // L: 19 - @ObfuscatedName("h") + @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "(I)Llm;", - garbageValue = "-1768347101" + descriptor = "(B)Llx;", + garbageValue = "126" ) @Export("newInstance") User newInstance() { return new Friend(); // L: 22 } - @ObfuscatedName("c") + @ObfuscatedName("n") @ObfuscatedSignature( - descriptor = "(II)[Llm;", - garbageValue = "836907267" + descriptor = "(II)[Llx;", + garbageValue = "1924184817" ) @Export("newTypedArray") User[] newTypedArray(int var1) { return new Friend[var1]; // L: 26 } - @ObfuscatedName("o") + @ObfuscatedName("f") @ObfuscatedSignature( - descriptor = "(Lla;ZI)Z", - garbageValue = "-1488951229" + descriptor = "(Lly;ZB)Z", + garbageValue = "112" ) @Export("isFriended") public boolean isFriended(Username var1, boolean var2) { @@ -73,10 +76,10 @@ public class FriendsList extends UserList { } } - @ObfuscatedName("v") + @ObfuscatedName("b") @ObfuscatedSignature( - descriptor = "(Lnk;IB)V", - garbageValue = "1" + descriptor = "(Lnd;II)V", + garbageValue = "1726713479" ) @Export("read") public void read(Buffer var1, int var2) { @@ -84,10 +87,10 @@ public class FriendsList extends UserList { if (var1.offset < var2) { // L: 37 boolean var3 = var1.readUnsignedByte() == 1; // L: 38 Username var4 = new Username(var1.readStringCp1252NullTerminated(), this.loginType); // L: 39 - Username var5 = new Username(var1.readStringCp1252NullTerminated(), this.loginType); // L: 40 - int var6 = var1.readUnsignedShort(); // L: 41 - int var7 = var1.readUnsignedByte(); // L: 42 - int var8 = var1.readUnsignedByte(); // L: 43 + Username var5 = new Username(var1.readStringCp1252NullTerminated(), this.loginType); + int var6 = var1.readUnsignedShort(); + int var7 = var1.readUnsignedByte(); + int var8 = var1.readUnsignedByte(); boolean var9 = (var8 & 2) != 0; // L: 44 boolean var10 = (var8 & 1) != 0; // L: 45 if (var6 > 0) { // L: 46 @@ -101,7 +104,7 @@ public class FriendsList extends UserList { Friend var11 = (Friend)this.getByCurrentUsername(var4); // L: 53 if (var3) { // L: 54 Friend var12 = (Friend)this.getByCurrentUsername(var5); // L: 55 - if (var12 != null && var11 != var12) { // L: 56 + if (var12 != null && var12 != var11) { // L: 56 if (var11 != null) { // L: 57 this.remove(var12); // L: 58 } else { @@ -140,17 +143,17 @@ public class FriendsList extends UserList { } if (var6 != var11.world) { // L: 88 - var11.int2 = ++this.field3826 - 1; // L: 89 + var11.int2 = ++this.field3808 - 1; // L: 89 if (var11.world == -1 && var6 == 0) { // L: 90 - var11.int2 = -(var11.int2 * 735732993) * 1660852993; + var11.int2 = -(var11.int2 * -2116718473) * -1023710905; } var11.world = var6; // L: 91 } var11.rank = var7; // L: 93 - var11.field3838 = var9; // L: 94 - var11.field3839 = var10; // L: 95 + var11.field3824 = var9; // L: 94 + var11.field3823 = var10; // L: 95 continue; // L: 96 } @@ -161,4 +164,213 @@ public class FriendsList extends UserList { return; // L: 98 } } + + @ObfuscatedName("f") + @ObfuscatedSignature( + descriptor = "(Lmr;ILjava/lang/String;B)Ljava/lang/String;", + garbageValue = "98" + ) + static String method5650(IterableNodeHashTable var0, int var1, String var2) { + if (var0 == null) { // L: 40 + return var2; + } else { + ObjectNode var3 = (ObjectNode)var0.get((long)var1); // L: 41 + return var3 == null ? var2 : (String)var3.obj; // L: 42 43 + } + } + + @ObfuscatedName("al") + @ObfuscatedSignature( + descriptor = "(ILcf;ZI)I", + garbageValue = "574138081" + ) + static int method5647(int var0, Script var1, boolean var2) { + int var3; + int var4; + if (var0 == ScriptOpcodes.ADD) { // L: 2751 + class44.Interpreter_intStackSize -= 2; // L: 2752 + var3 = Interpreter.Interpreter_intStack[class44.Interpreter_intStackSize]; // L: 2753 + var4 = Interpreter.Interpreter_intStack[class44.Interpreter_intStackSize + 1]; // L: 2754 + Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = var3 + var4; // L: 2755 + return 1; // L: 2756 + } else if (var0 == ScriptOpcodes.SUB) { // L: 2758 + class44.Interpreter_intStackSize -= 2; // L: 2759 + var3 = Interpreter.Interpreter_intStack[class44.Interpreter_intStackSize]; // L: 2760 + var4 = Interpreter.Interpreter_intStack[class44.Interpreter_intStackSize + 1]; // L: 2761 + Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = var3 - var4; // L: 2762 + return 1; // L: 2763 + } else if (var0 == ScriptOpcodes.MULTIPLY) { // L: 2765 + class44.Interpreter_intStackSize -= 2; // L: 2766 + var3 = Interpreter.Interpreter_intStack[class44.Interpreter_intStackSize]; // L: 2767 + var4 = Interpreter.Interpreter_intStack[class44.Interpreter_intStackSize + 1]; // L: 2768 + Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = var4 * var3; // L: 2769 + return 1; // L: 2770 + } else if (var0 == ScriptOpcodes.DIV) { // L: 2772 + class44.Interpreter_intStackSize -= 2; // L: 2773 + var3 = Interpreter.Interpreter_intStack[class44.Interpreter_intStackSize]; // L: 2774 + var4 = Interpreter.Interpreter_intStack[class44.Interpreter_intStackSize + 1]; // L: 2775 + Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = var3 / var4; // L: 2776 + return 1; // L: 2777 + } else if (var0 == ScriptOpcodes.RANDOM) { // L: 2779 + var3 = Interpreter.Interpreter_intStack[--class44.Interpreter_intStackSize]; // L: 2780 + Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = (int)(Math.random() * (double)var3); // L: 2781 + return 1; // L: 2782 + } else if (var0 == ScriptOpcodes.RANDOMINC) { // L: 2784 + var3 = Interpreter.Interpreter_intStack[--class44.Interpreter_intStackSize]; // L: 2785 + Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = (int)(Math.random() * (double)(var3 + 1)); // L: 2786 + return 1; // L: 2787 + } else { + int var5; + int var6; + int var7; + if (var0 == ScriptOpcodes.INTERPOLATE) { // L: 2789 + class44.Interpreter_intStackSize -= 5; // L: 2790 + var3 = Interpreter.Interpreter_intStack[class44.Interpreter_intStackSize]; // L: 2791 + var4 = Interpreter.Interpreter_intStack[class44.Interpreter_intStackSize + 1]; // L: 2792 + var5 = Interpreter.Interpreter_intStack[class44.Interpreter_intStackSize + 2]; // L: 2793 + var6 = Interpreter.Interpreter_intStack[class44.Interpreter_intStackSize + 3]; // L: 2794 + var7 = Interpreter.Interpreter_intStack[class44.Interpreter_intStackSize + 4]; // L: 2795 + Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = var3 + (var4 - var3) * (var7 - var5) / (var6 - var5); // L: 2796 + return 1; // L: 2797 + } else if (var0 == ScriptOpcodes.ADDPERCENT) { // L: 2799 + class44.Interpreter_intStackSize -= 2; // L: 2800 + var3 = Interpreter.Interpreter_intStack[class44.Interpreter_intStackSize]; // L: 2801 + var4 = Interpreter.Interpreter_intStack[class44.Interpreter_intStackSize + 1]; // L: 2802 + Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = var3 + var4 * var3 / 100; // L: 2803 + return 1; // L: 2804 + } else if (var0 == ScriptOpcodes.SETBIT) { // L: 2806 + class44.Interpreter_intStackSize -= 2; // L: 2807 + var3 = Interpreter.Interpreter_intStack[class44.Interpreter_intStackSize]; // L: 2808 + var4 = Interpreter.Interpreter_intStack[class44.Interpreter_intStackSize + 1]; // L: 2809 + Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = var3 | 1 << var4; // L: 2810 + return 1; // L: 2811 + } else if (var0 == ScriptOpcodes.CLEARBIT) { // L: 2813 + class44.Interpreter_intStackSize -= 2; // L: 2814 + var3 = Interpreter.Interpreter_intStack[class44.Interpreter_intStackSize]; // L: 2815 + var4 = Interpreter.Interpreter_intStack[class44.Interpreter_intStackSize + 1]; // L: 2816 + Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = var3 & -1 - (1 << var4); // L: 2817 + return 1; // L: 2818 + } else if (var0 == ScriptOpcodes.TESTBIT) { // L: 2820 + class44.Interpreter_intStackSize -= 2; // L: 2821 + var3 = Interpreter.Interpreter_intStack[class44.Interpreter_intStackSize]; // L: 2822 + var4 = Interpreter.Interpreter_intStack[class44.Interpreter_intStackSize + 1]; // L: 2823 + Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = (var3 & 1 << var4) != 0 ? 1 : 0; // L: 2824 + return 1; // L: 2825 + } else if (var0 == ScriptOpcodes.MOD) { // L: 2827 + class44.Interpreter_intStackSize -= 2; // L: 2828 + var3 = Interpreter.Interpreter_intStack[class44.Interpreter_intStackSize]; // L: 2829 + var4 = Interpreter.Interpreter_intStack[class44.Interpreter_intStackSize + 1]; // L: 2830 + Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = var3 % var4; // L: 2831 + return 1; // L: 2832 + } else if (var0 == ScriptOpcodes.POW) { // L: 2834 + class44.Interpreter_intStackSize -= 2; // L: 2835 + var3 = Interpreter.Interpreter_intStack[class44.Interpreter_intStackSize]; // L: 2836 + var4 = Interpreter.Interpreter_intStack[class44.Interpreter_intStackSize + 1]; // L: 2837 + if (var3 == 0) { // L: 2838 + Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = 0; + } else { + Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = (int)Math.pow((double)var3, (double)var4); // L: 2839 + } + + return 1; // L: 2840 + } else if (var0 == ScriptOpcodes.INVPOW) { // L: 2842 + class44.Interpreter_intStackSize -= 2; // L: 2843 + var3 = Interpreter.Interpreter_intStack[class44.Interpreter_intStackSize]; // L: 2844 + var4 = Interpreter.Interpreter_intStack[class44.Interpreter_intStackSize + 1]; // L: 2845 + if (var3 == 0) { // L: 2846 + Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = 0; // L: 2847 + return 1; // L: 2848 + } else { + switch(var4) { // L: 2850 + case 0: + Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = Integer.MAX_VALUE; // L: 2868 + break; // L: 2869 + case 1: + Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = var3; // L: 2863 + break; // L: 2864 + case 2: + Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = (int)Math.sqrt((double)var3); // L: 2878 + break; + case 3: + Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = (int)Math.cbrt((double)var3); // L: 2873 + break; // L: 2874 + case 4: + Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = (int)Math.sqrt(Math.sqrt((double)var3)); // L: 2858 + break; // L: 2859 + default: + Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = (int)Math.pow((double)var3, 1.0D / (double)var4); // L: 2853 + } + + return 1; // L: 2882 + } + } else if (var0 == ScriptOpcodes.AND) { // L: 2884 + class44.Interpreter_intStackSize -= 2; // L: 2885 + var3 = Interpreter.Interpreter_intStack[class44.Interpreter_intStackSize]; // L: 2886 + var4 = Interpreter.Interpreter_intStack[class44.Interpreter_intStackSize + 1]; // L: 2887 + Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = var3 & var4; // L: 2888 + return 1; // L: 2889 + } else if (var0 == ScriptOpcodes.OR) { // L: 2891 + class44.Interpreter_intStackSize -= 2; // L: 2892 + var3 = Interpreter.Interpreter_intStack[class44.Interpreter_intStackSize]; // L: 2893 + var4 = Interpreter.Interpreter_intStack[class44.Interpreter_intStackSize + 1]; // L: 2894 + Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = var3 | var4; // L: 2895 + return 1; // L: 2896 + } else if (var0 == ScriptOpcodes.SCALE) { // L: 2898 + class44.Interpreter_intStackSize -= 3; // L: 2899 + long var9 = (long)Interpreter.Interpreter_intStack[class44.Interpreter_intStackSize]; // L: 2900 + long var11 = (long)Interpreter.Interpreter_intStack[class44.Interpreter_intStackSize + 1]; // L: 2901 + long var13 = (long)Interpreter.Interpreter_intStack[class44.Interpreter_intStackSize + 2]; // L: 2902 + Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = (int)(var9 * var13 / var11); // L: 2903 + return 1; // L: 2904 + } else if (var0 == 4025) { // L: 2906 + var3 = SequenceDefinition.method3149(Interpreter.Interpreter_intStack[--class44.Interpreter_intStackSize]); // L: 2907 + Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = var3; // L: 2908 + return 1; // L: 2909 + } else if (var0 == 4026) { // L: 2911 + class44.Interpreter_intStackSize -= 2; // L: 2912 + var3 = Interpreter.Interpreter_intStack[class44.Interpreter_intStackSize]; // L: 2913 + var4 = Interpreter.Interpreter_intStack[class44.Interpreter_intStackSize + 1]; // L: 2914 + Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = var3 ^ 1 << var4; // L: 2915 + return 1; // L: 2916 + } else if (var0 == 4027) { // L: 2918 + class44.Interpreter_intStackSize -= 3; // L: 2919 + var3 = Interpreter.Interpreter_intStack[class44.Interpreter_intStackSize]; // L: 2920 + var4 = Interpreter.Interpreter_intStack[class44.Interpreter_intStackSize + 1]; // L: 2921 + var5 = Interpreter.Interpreter_intStack[class44.Interpreter_intStackSize + 2]; // L: 2922 + Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = class342.method6043(var3, var4, var5); // L: 2923 + return 1; // L: 2924 + } else if (var0 == 4028) { // L: 2926 + class44.Interpreter_intStackSize -= 3; // L: 2927 + var3 = Interpreter.Interpreter_intStack[class44.Interpreter_intStackSize]; // L: 2928 + var4 = Interpreter.Interpreter_intStack[class44.Interpreter_intStackSize + 1]; // L: 2929 + var5 = Interpreter.Interpreter_intStack[class44.Interpreter_intStackSize + 2]; // L: 2930 + Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = World.method1685(var3, var4, var5); // L: 2931 + return 1; // L: 2932 + } else if (var0 == 4029) { // L: 2934 + class44.Interpreter_intStackSize -= 3; // L: 2935 + var3 = Interpreter.Interpreter_intStack[class44.Interpreter_intStackSize]; // L: 2936 + var4 = Interpreter.Interpreter_intStack[class44.Interpreter_intStackSize + 1]; // L: 2937 + var5 = Interpreter.Interpreter_intStack[class44.Interpreter_intStackSize + 2]; // L: 2938 + var6 = 31 - var5; // L: 2939 + Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = var3 << var6 >>> var4 + var6; // L: 2940 + return 1; // L: 2941 + } else if (var0 == 4030) { // L: 2943 + class44.Interpreter_intStackSize -= 4; // L: 2944 + var3 = Interpreter.Interpreter_intStack[class44.Interpreter_intStackSize]; // L: 2945 + var4 = Interpreter.Interpreter_intStack[class44.Interpreter_intStackSize + 1]; // L: 2946 + var5 = Interpreter.Interpreter_intStack[class44.Interpreter_intStackSize + 2]; // L: 2947 + var6 = Interpreter.Interpreter_intStack[class44.Interpreter_intStackSize + 3]; // L: 2948 + var3 = World.method1685(var3, var5, var6); // L: 2949 + var7 = CollisionMap.method3185(var6 - var5 + 1); // L: 2950 + if (var4 > var7) { // L: 2951 + var4 = var7; + } + + Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = var3 | var4 << var5; // L: 2952 + return 1; // L: 2953 + } else { + return 2; // L: 2955 + } + } + } } diff --git a/runescape-client/src/main/java/GZipDecompressor.java b/runescape-client/src/main/java/GZipDecompressor.java index a058c052e0..16c5ad4814 100644 --- a/runescape-client/src/main/java/GZipDecompressor.java +++ b/runescape-client/src/main/java/GZipDecompressor.java @@ -4,10 +4,10 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ok") +@ObfuscatedName("og") @Implements("GZipDecompressor") public class GZipDecompressor { - @ObfuscatedName("h") + @ObfuscatedName("v") @Export("inflater") Inflater inflater; @@ -22,10 +22,10 @@ public class GZipDecompressor { this(-1, 1000000, 1000000); // L: 10 } // L: 11 - @ObfuscatedName("h") + @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "(Lnk;[BI)V", - garbageValue = "1918838814" + descriptor = "(Lnd;[BB)V", + garbageValue = "48" ) @Export("decompress") public void decompress(Buffer var1, byte[] var2) { diff --git a/runescape-client/src/main/java/GameBuild.java b/runescape-client/src/main/java/GameBuild.java index 05dac649c4..9b33ea473d 100644 --- a/runescape-client/src/main/java/GameBuild.java +++ b/runescape-client/src/main/java/GameBuild.java @@ -3,49 +3,44 @@ 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("jh") +@ObfuscatedName("jk") @Implements("GameBuild") public class GameBuild { - @ObfuscatedName("h") + @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "Ljh;" + descriptor = "Ljk;" ) @Export("LIVE") - static final GameBuild LIVE; - @ObfuscatedName("c") + public static final GameBuild LIVE; + @ObfuscatedName("n") @ObfuscatedSignature( - descriptor = "Ljh;" + descriptor = "Ljk;" ) @Export("BUILDLIVE") - static final GameBuild BUILDLIVE; - @ObfuscatedName("o") + public static final GameBuild BUILDLIVE; + @ObfuscatedName("f") @ObfuscatedSignature( - descriptor = "Ljh;" + descriptor = "Ljk;" ) @Export("RC") - static final GameBuild RC; - @ObfuscatedName("g") + public static final GameBuild RC; + @ObfuscatedName("y") @ObfuscatedSignature( - descriptor = "Ljh;" + descriptor = "Ljk;" ) @Export("WIP") - static final GameBuild WIP; - @ObfuscatedName("dv") - @ObfuscatedSignature( - descriptor = "Lji;" - ) - @Export("archive9") - static Archive archive9; - @ObfuscatedName("l") + public static final GameBuild WIP; + @ObfuscatedName("p") @Export("name") public final String name; - @ObfuscatedName("z") + @ObfuscatedName("j") @ObfuscatedGetter( - intValue = 1611941383 + intValue = 629900867 ) @Export("buildId") - final int buildId; + public final int buildId; static { LIVE = new GameBuild("LIVE", 0); // L: 5 @@ -58,4 +53,361 @@ public class GameBuild { this.name = var1; // L: 13 this.buildId = var2; // L: 14 } // L: 15 + + @ObfuscatedName("ac") + @ObfuscatedSignature( + descriptor = "(ILcf;ZB)I", + garbageValue = "4" + ) + static int method4843(int var0, Script var1, boolean var2) { + int var3; + if (var0 == 6600) { // L: 3792 + var3 = class22.Client_plane; // L: 3793 + int var15 = (class93.localPlayer.x >> 7) + VertexNormal.baseX; // L: 3794 + int var8 = (class93.localPlayer.y >> 7) + SoundSystem.baseY; // L: 3795 + HealthBarUpdate.getWorldMap().method6110(var3, var15, var8, true); // L: 3796 + return 1; // L: 3797 + } else { + WorldMapArea var9; + if (var0 == ScriptOpcodes.WORLDMAP_GETMAPNAME) { // L: 3799 + var3 = Interpreter.Interpreter_intStack[--class44.Interpreter_intStackSize]; // L: 3800 + String var16 = ""; // L: 3801 + var9 = HealthBarUpdate.getWorldMap().getMapArea(var3); // L: 3802 + if (var9 != null) { // L: 3803 + var16 = var9.getExternalName(); // L: 3804 + } + + Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var16; // L: 3806 + return 1; // L: 3807 + } else if (var0 == ScriptOpcodes.WORLDMAP_SETMAP) { // L: 3809 + var3 = Interpreter.Interpreter_intStack[--class44.Interpreter_intStackSize]; // L: 3810 + HealthBarUpdate.getWorldMap().setCurrentMapAreaId(var3); // L: 3811 + return 1; // L: 3812 + } else if (var0 == ScriptOpcodes.WORLDMAP_GETZOOM) { // L: 3814 + Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = HealthBarUpdate.getWorldMap().getZoomLevel(); // L: 3815 + return 1; // L: 3816 + } else if (var0 == ScriptOpcodes.WORLDMAP_SETZOOM) { // L: 3818 + var3 = Interpreter.Interpreter_intStack[--class44.Interpreter_intStackSize]; // L: 3819 + HealthBarUpdate.getWorldMap().setZoomPercentage(var3); // L: 3820 + return 1; // L: 3821 + } else if (var0 == ScriptOpcodes.WORLDMAP_ISLOADED) { // L: 3823 + Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = HealthBarUpdate.getWorldMap().isCacheLoaded() ? 1 : 0; // L: 3824 + return 1; // L: 3825 + } else { + Coord var14; + if (var0 == ScriptOpcodes.WORLDMAP_JUMPTODISPLAYCOORD) { // L: 3827 + var14 = new Coord(Interpreter.Interpreter_intStack[--class44.Interpreter_intStackSize]); // L: 3828 + HealthBarUpdate.getWorldMap().setWorldMapPositionTarget(var14.x, var14.y); // L: 3829 + return 1; // L: 3830 + } else if (var0 == ScriptOpcodes.WORLDMAP_JUMPTODISPLAYCOORD_INSTANT) { // L: 3832 + var14 = new Coord(Interpreter.Interpreter_intStack[--class44.Interpreter_intStackSize]); // L: 3833 + HealthBarUpdate.getWorldMap().setWorldMapPositionTargetInstant(var14.x, var14.y); // L: 3834 + return 1; // L: 3835 + } else if (var0 == ScriptOpcodes.WORLDMAP_JUMPTOSOURCECOORD) { // L: 3837 + var14 = new Coord(Interpreter.Interpreter_intStack[--class44.Interpreter_intStackSize]); // L: 3838 + HealthBarUpdate.getWorldMap().jumpToSourceCoord(var14.plane, var14.x, var14.y); // L: 3839 + return 1; // L: 3840 + } else if (var0 == ScriptOpcodes.WORLDMAP_JUMPTOSOURCECOORD_INSTANT) { // L: 3842 + var14 = new Coord(Interpreter.Interpreter_intStack[--class44.Interpreter_intStackSize]); // L: 3843 + HealthBarUpdate.getWorldMap().jumpToSourceCoordInstant(var14.plane, var14.x, var14.y); // L: 3844 + return 1; // L: 3845 + } else if (var0 == ScriptOpcodes.WORLDMAP_GETDISPLAYPOSITION) { // L: 3847 + Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = HealthBarUpdate.getWorldMap().getDisplayX(); // L: 3848 + Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = HealthBarUpdate.getWorldMap().getDisplayY(); // L: 3849 + return 1; // L: 3850 + } else { + WorldMapArea var11; + if (var0 == ScriptOpcodes.WORLDMAP_GETCONFIGORIGIN) { // L: 3852 + var3 = Interpreter.Interpreter_intStack[--class44.Interpreter_intStackSize]; // L: 3853 + var11 = HealthBarUpdate.getWorldMap().getMapArea(var3); // L: 3854 + if (var11 == null) { // L: 3855 + Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = 0; // L: 3856 + } else { + Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = var11.getOrigin().packed(); // L: 3859 + } + + return 1; // L: 3861 + } else if (var0 == ScriptOpcodes.WORLDMAP_GETCONFIGSIZE) { // L: 3863 + var3 = Interpreter.Interpreter_intStack[--class44.Interpreter_intStackSize]; // L: 3864 + var11 = HealthBarUpdate.getWorldMap().getMapArea(var3); // L: 3865 + if (var11 == null) { // L: 3866 + Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = 0; // L: 3867 + Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = 0; // L: 3868 + } else { + Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = (var11.getRegionHighX() - var11.getRegionLowX() + 1) * 64; // L: 3871 + Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = (var11.getRegionHighY() - var11.getRegionLowY() + 1) * 64; // L: 3872 + } + + return 1; // L: 3874 + } else if (var0 == ScriptOpcodes.WORLDMAP_GETCONFIGBOUNDS) { // L: 3876 + var3 = Interpreter.Interpreter_intStack[--class44.Interpreter_intStackSize]; // L: 3877 + var11 = HealthBarUpdate.getWorldMap().getMapArea(var3); // L: 3878 + if (var11 == null) { // L: 3879 + Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = 0; // L: 3880 + Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = 0; // L: 3881 + Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = 0; // L: 3882 + Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = 0; // L: 3883 + } else { + Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = var11.getRegionLowX() * 64; // L: 3886 + Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = var11.getRegionLowY() * 64; // L: 3887 + Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = var11.getRegionHighX() * 64 + 64 - 1; // L: 3888 + Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = var11.getRegionHighY() * 64 + 64 - 1; // L: 3889 + } + + return 1; // L: 3891 + } else if (var0 == ScriptOpcodes.WORLDMAP_GETCONFIGZOOM) { // L: 3893 + var3 = Interpreter.Interpreter_intStack[--class44.Interpreter_intStackSize]; // L: 3894 + var11 = HealthBarUpdate.getWorldMap().getMapArea(var3); // L: 3895 + if (var11 == null) { // L: 3896 + Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = -1; // L: 3897 + } else { + Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = var11.getZoom(); // L: 3900 + } + + return 1; // L: 3902 + } else if (var0 == 6615) { // L: 3904 + var14 = HealthBarUpdate.getWorldMap().getDisplayCoord(); // L: 3905 + if (var14 == null) { // L: 3906 + Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = -1; // L: 3907 + Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = -1; // L: 3908 + } else { + Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = var14.x; // L: 3911 + Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = var14.y; // L: 3912 + } + + return 1; // L: 3914 + } else if (var0 == ScriptOpcodes.WORLDMAP_GETCURRENTMAP) { // L: 3916 + Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = HealthBarUpdate.getWorldMap().currentMapAreaId(); // L: 3917 + return 1; // L: 3918 + } else if (var0 == ScriptOpcodes.WORLDMAP_GETDISPLAYCOORD) { // L: 3920 + var14 = new Coord(Interpreter.Interpreter_intStack[--class44.Interpreter_intStackSize]); // L: 3921 + var11 = HealthBarUpdate.getWorldMap().getCurrentMapArea(); // L: 3922 + if (var11 == null) { // L: 3923 + Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = -1; // L: 3924 + Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = -1; // L: 3925 + return 1; // L: 3926 + } else { + int[] var12 = var11.position(var14.plane, var14.x, var14.y); // L: 3928 + if (var12 == null) { // L: 3929 + Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = -1; // L: 3930 + Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = -1; // L: 3931 + } else { + Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = var12[0]; // L: 3934 + Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = var12[1]; // L: 3935 + } + + return 1; // L: 3937 + } + } else { + Coord var5; + if (var0 == 6618) { // L: 3939 + var14 = new Coord(Interpreter.Interpreter_intStack[--class44.Interpreter_intStackSize]); // L: 3940 + var11 = HealthBarUpdate.getWorldMap().getCurrentMapArea(); // L: 3941 + if (var11 == null) { // L: 3942 + Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = -1; // L: 3943 + Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = -1; // L: 3944 + return 1; // L: 3945 + } else { + var5 = var11.coord(var14.x, var14.y); // L: 3947 + if (var5 == null) { // L: 3948 + Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = -1; // L: 3949 + } else { + Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = var5.packed(); // L: 3952 + } + + return 1; // L: 3954 + } + } else { + Coord var10; + if (var0 == 6619) { // L: 3956 + class44.Interpreter_intStackSize -= 2; // L: 3957 + var3 = Interpreter.Interpreter_intStack[class44.Interpreter_intStackSize]; // L: 3958 + var10 = new Coord(Interpreter.Interpreter_intStack[class44.Interpreter_intStackSize + 1]); // L: 3959 + Skeleton.method3922(var3, var10, false); // L: 3960 + return 1; // L: 3961 + } else if (var0 == 6620) { // L: 3963 + class44.Interpreter_intStackSize -= 2; // L: 3964 + var3 = Interpreter.Interpreter_intStack[class44.Interpreter_intStackSize]; // L: 3965 + var10 = new Coord(Interpreter.Interpreter_intStack[class44.Interpreter_intStackSize + 1]); // L: 3966 + Skeleton.method3922(var3, var10, true); // L: 3967 + return 1; // L: 3968 + } else if (var0 == ScriptOpcodes.WORLDMAP_COORDINMAP) { // L: 3970 + class44.Interpreter_intStackSize -= 2; // L: 3971 + var3 = Interpreter.Interpreter_intStack[class44.Interpreter_intStackSize]; // L: 3972 + var10 = new Coord(Interpreter.Interpreter_intStack[class44.Interpreter_intStackSize + 1]); // L: 3973 + var9 = HealthBarUpdate.getWorldMap().getMapArea(var3); // L: 3974 + if (var9 == null) { // L: 3975 + Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = 0; // L: 3976 + return 1; // L: 3977 + } else { + Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = var9.containsCoord(var10.plane, var10.x, var10.y) ? 1 : 0; // L: 3979 + return 1; // L: 3980 + } + } else if (var0 == ScriptOpcodes.WORLDMAP_GETSIZE) { // L: 3982 + Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = HealthBarUpdate.getWorldMap().getDisplayWith(); // L: 3983 + Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = HealthBarUpdate.getWorldMap().getDisplayHeight(); // L: 3984 + return 1; // L: 3985 + } else if (var0 == 6623) { // L: 3987 + var14 = new Coord(Interpreter.Interpreter_intStack[--class44.Interpreter_intStackSize]); // L: 3988 + var11 = HealthBarUpdate.getWorldMap().mapAreaAtCoord(var14.plane, var14.x, var14.y); // L: 3989 + if (var11 == null) { // L: 3990 + Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = -1; // L: 3991 + } else { + Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = var11.getId(); // L: 3994 + } + + return 1; // L: 3996 + } else if (var0 == 6624) { // L: 3998 + HealthBarUpdate.getWorldMap().setMaxFlashCount(Interpreter.Interpreter_intStack[--class44.Interpreter_intStackSize]); // L: 3999 + return 1; // L: 4000 + } else if (var0 == 6625) { // L: 4002 + HealthBarUpdate.getWorldMap().resetMaxFlashCount(); // L: 4003 + return 1; // L: 4004 + } else if (var0 == 6626) { // L: 4006 + HealthBarUpdate.getWorldMap().setCyclesPerFlash(Interpreter.Interpreter_intStack[--class44.Interpreter_intStackSize]); // L: 4007 + return 1; // L: 4008 + } else if (var0 == 6627) { // L: 4010 + HealthBarUpdate.getWorldMap().resetCyclesPerFlash(); // L: 4011 + return 1; // L: 4012 + } else { + boolean var13; + if (var0 == ScriptOpcodes.WORLDMAP_PERPETUALFLASH) { // L: 4014 + var13 = Interpreter.Interpreter_intStack[--class44.Interpreter_intStackSize] == 1; // L: 4015 + HealthBarUpdate.getWorldMap().setPerpetualFlash(var13); // L: 4016 + return 1; // L: 4017 + } else if (var0 == ScriptOpcodes.WORLDMAP_FLASHELEMENT) { // L: 4019 + var3 = Interpreter.Interpreter_intStack[--class44.Interpreter_intStackSize]; // L: 4020 + HealthBarUpdate.getWorldMap().flashElement(var3); // L: 4021 + return 1; // L: 4022 + } else if (var0 == ScriptOpcodes.WORLDMAP_FLASHELEMENTCATEGORY) { // L: 4024 + var3 = Interpreter.Interpreter_intStack[--class44.Interpreter_intStackSize]; // L: 4025 + HealthBarUpdate.getWorldMap().flashCategory(var3); // L: 4026 + return 1; // L: 4027 + } else if (var0 == ScriptOpcodes.WORLDMAP_STOPCURRENTFLASHES) { // L: 4029 + HealthBarUpdate.getWorldMap().stopCurrentFlashes(); // L: 4030 + return 1; // L: 4031 + } else if (var0 == ScriptOpcodes.WORLDMAP_DISABLEELEMENTS) { // L: 4033 + var13 = Interpreter.Interpreter_intStack[--class44.Interpreter_intStackSize] == 1; // L: 4034 + HealthBarUpdate.getWorldMap().setElementsDisabled(var13); // L: 4035 + return 1; // L: 4036 + } else { + boolean var7; + if (var0 == ScriptOpcodes.WORLDMAP_DISABLEELEMENT) { // L: 4038 + class44.Interpreter_intStackSize -= 2; // L: 4039 + var3 = Interpreter.Interpreter_intStack[class44.Interpreter_intStackSize]; // L: 4040 + var7 = Interpreter.Interpreter_intStack[class44.Interpreter_intStackSize + 1] == 1; // L: 4041 + HealthBarUpdate.getWorldMap().disableElement(var3, var7); // L: 4042 + return 1; // L: 4043 + } else if (var0 == ScriptOpcodes.WORLDMAP_DISABLEELEMENTCATEGORY) { // L: 4045 + class44.Interpreter_intStackSize -= 2; // L: 4046 + var3 = Interpreter.Interpreter_intStack[class44.Interpreter_intStackSize]; // L: 4047 + var7 = Interpreter.Interpreter_intStack[class44.Interpreter_intStackSize + 1] == 1; // L: 4048 + HealthBarUpdate.getWorldMap().setCategoryDisabled(var3, var7); // L: 4049 + return 1; // L: 4050 + } else if (var0 == ScriptOpcodes.WORLDMAP_GETDISABLEELEMENTS) { // L: 4052 + Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = HealthBarUpdate.getWorldMap().getElementsDisabled() ? 1 : 0; // L: 4053 + return 1; // L: 4054 + } else if (var0 == ScriptOpcodes.WORLDMAP_GETDISABLEELEMENT) { // L: 4056 + var3 = Interpreter.Interpreter_intStack[--class44.Interpreter_intStackSize]; // L: 4057 + Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = HealthBarUpdate.getWorldMap().isElementDisabled(var3) ? 1 : 0; // L: 4058 + return 1; // L: 4059 + } else if (var0 == ScriptOpcodes.WORLDMAP_GETDISABLEELEMENTCATEGORY) { // L: 4061 + var3 = Interpreter.Interpreter_intStack[--class44.Interpreter_intStackSize]; // L: 4062 + Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = HealthBarUpdate.getWorldMap().isCategoryDisabled(var3) ? 1 : 0; // L: 4063 + return 1; // L: 4064 + } else if (var0 == 6638) { // L: 4066 + class44.Interpreter_intStackSize -= 2; // L: 4067 + var3 = Interpreter.Interpreter_intStack[class44.Interpreter_intStackSize]; // L: 4068 + var10 = new Coord(Interpreter.Interpreter_intStack[class44.Interpreter_intStackSize + 1]); // L: 4069 + var5 = HealthBarUpdate.getWorldMap().method6153(var3, var10); // L: 4070 + if (var5 == null) { // L: 4071 + Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = -1; // L: 4072 + } else { + Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = var5.packed(); // L: 4075 + } + + return 1; // L: 4077 + } else { + AbstractWorldMapIcon var6; + if (var0 == ScriptOpcodes.WORLDMAP_LISTELEMENT_START) { // L: 4079 + var6 = HealthBarUpdate.getWorldMap().iconStart(); // L: 4080 + if (var6 == null) { // L: 4081 + Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = -1; // L: 4082 + Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = -1; // L: 4083 + } else { + Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = var6.getElement(); // L: 4086 + Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = var6.coord2.packed(); // L: 4087 + } + + return 1; // L: 4089 + } else if (var0 == ScriptOpcodes.WORLDMAP_LISTELEMENT_NEXT) { // L: 4091 + var6 = HealthBarUpdate.getWorldMap().iconNext(); // L: 4092 + if (var6 == null) { // L: 4093 + Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = -1; // L: 4094 + Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = -1; // L: 4095 + } else { + Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = var6.getElement(); // L: 4098 + Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = var6.coord2.packed(); // L: 4099 + } + + return 1; // L: 4101 + } else { + WorldMapElement var4; + if (var0 == ScriptOpcodes.MEC_TEXT) { // L: 4103 + var3 = Interpreter.Interpreter_intStack[--class44.Interpreter_intStackSize]; // L: 4104 + var4 = class6.WorldMapElement_get(var3); // L: 4105 + if (var4.name == null) { // L: 4106 + Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = ""; // L: 4107 + } else { + Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var4.name; // L: 4110 + } + + return 1; // L: 4112 + } else if (var0 == ScriptOpcodes.MEC_TEXTSIZE) { // L: 4114 + var3 = Interpreter.Interpreter_intStack[--class44.Interpreter_intStackSize]; // L: 4115 + var4 = class6.WorldMapElement_get(var3); // L: 4116 + Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = var4.textSize; // L: 4117 + return 1; // L: 4118 + } else if (var0 == ScriptOpcodes.MEC_CATEGORY) { // L: 4120 + var3 = Interpreter.Interpreter_intStack[--class44.Interpreter_intStackSize]; // L: 4121 + var4 = class6.WorldMapElement_get(var3); // L: 4122 + if (var4 == null) { // L: 4123 + Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = -1; // L: 4124 + } else { + Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = var4.category; // L: 4127 + } + + return 1; // L: 4129 + } else if (var0 == ScriptOpcodes.MEC_SPRITE) { // L: 4131 + var3 = Interpreter.Interpreter_intStack[--class44.Interpreter_intStackSize]; // L: 4132 + var4 = class6.WorldMapElement_get(var3); // L: 4133 + if (var4 == null) { // L: 4134 + Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = -1; // L: 4135 + } else { + Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = var4.sprite1; // L: 4138 + } + + return 1; // L: 4140 + } else if (var0 == ScriptOpcodes.WORLDMAP_ELEMENT) { // L: 4142 + Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = class69.worldMapEvent.mapElement; // L: 4143 + return 1; // L: 4144 + } else if (var0 == 6698) { // L: 4146 + Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = class69.worldMapEvent.coord1.packed(); // L: 4147 + return 1; // L: 4148 + } else if (var0 == ScriptOpcodes.WORLDMAP_ELEMENTCOORD) { // L: 4150 + Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = class69.worldMapEvent.coord2.packed(); // L: 4151 + return 1; // L: 4152 + } else { + return 2; // L: 4154 + } + } + } + } + } + } + } + } + } + } + } } diff --git a/runescape-client/src/main/java/GameEngine.java b/runescape-client/src/main/java/GameEngine.java index bc9b6f8cdd..001315c0fa 100644 --- a/runescape-client/src/main/java/GameEngine.java +++ b/runescape-client/src/main/java/GameEngine.java @@ -4,6 +4,7 @@ import java.awt.Container; import java.awt.EventQueue; import java.awt.Frame; import java.awt.Graphics; +import java.awt.Image; import java.awt.Insets; import java.awt.LayoutManager; import java.awt.Rectangle; @@ -23,179 +24,186 @@ 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("aq") +@ObfuscatedName("af") @Implements("GameEngine") public abstract class GameEngine extends Applet implements Runnable, FocusListener, WindowListener { - @ObfuscatedName("h") + @ObfuscatedName("qg") @ObfuscatedSignature( - descriptor = "Ldk;" + descriptor = "Loh;" + ) + @Export("sceneMinimapSprite") + static SpritePixels sceneMinimapSprite; + @ObfuscatedName("v") + @ObfuscatedSignature( + descriptor = "Ldp;" ) @Export("taskHandler") protected static TaskHandler taskHandler; - @ObfuscatedName("c") + @ObfuscatedName("n") @ObfuscatedSignature( - descriptor = "Laq;" + descriptor = "Laf;" ) @Export("gameEngine") static GameEngine gameEngine; - @ObfuscatedName("o") + @ObfuscatedName("f") @ObfuscatedGetter( - intValue = 592572313 + intValue = 661166393 ) @Export("GameEngine_redundantStartThreadCount") static int GameEngine_redundantStartThreadCount; - @ObfuscatedName("g") + @ObfuscatedName("p") @ObfuscatedGetter( - longValue = 4399734566856099317L + longValue = 3801980113368397719L ) @Export("stopTimeMs") static long stopTimeMs; - @ObfuscatedName("l") + @ObfuscatedName("j") @Export("isKilled") static boolean isKilled; - @ObfuscatedName("t") + @ObfuscatedName("d") @ObfuscatedGetter( - intValue = -217446521 - ) - @Export("gameCyclesToDo") - protected static int gameCyclesToDo; - @ObfuscatedName("v") - @ObfuscatedGetter( - intValue = -2138888743 + intValue = 849049895 ) @Export("cycleDurationMillis") static int cycleDurationMillis; - @ObfuscatedName("b") + @ObfuscatedName("s") @ObfuscatedGetter( - intValue = 484725993 + intValue = 1089824943 ) @Export("fiveOrOne") static int fiveOrOne; - @ObfuscatedName("q") + @ObfuscatedName("u") @ObfuscatedGetter( - intValue = 410287199 + intValue = -1080528073 ) @Export("fps") protected static int fps; - @ObfuscatedName("r") + @ObfuscatedName("l") + @ObfuscatedSignature( + descriptor = "Lez;" + ) + @Export("clock") + protected static Clock clock; + @ObfuscatedName("c") @Export("graphicsTickTimes") protected static long[] graphicsTickTimes; - @ObfuscatedName("a") - @Export("clientTickTimes") - protected static long[] clientTickTimes; @ObfuscatedName("e") @ObfuscatedGetter( - intValue = 2119001659 + intValue = -1807936759 + ) + @Export("graphicsTickTimeIdx") + static int graphicsTickTimeIdx; + @ObfuscatedName("g") + @Export("clientTickTimes") + protected static long[] clientTickTimes; + @ObfuscatedName("a") + @ObfuscatedGetter( + intValue = 1202015039 ) @Export("clientTickTimeIdx") static int clientTickTimeIdx; - @ObfuscatedName("f") + @ObfuscatedName("ax") + static Image field354; + @ObfuscatedName("as") @ObfuscatedGetter( - intValue = -135808343 + intValue = 116937435 ) - @Export("canvasWidth") - public static int canvasWidth; - @ObfuscatedName("am") - @ObfuscatedGetter( - intValue = -1378639745 - ) - static int field339; - @ObfuscatedName("ac") + static int field355; + @ObfuscatedName("aq") @Export("volatileFocus") static volatile boolean volatileFocus; - @ObfuscatedName("ab") + @ObfuscatedName("ak") @ObfuscatedGetter( - longValue = -1169990265502420109L + longValue = 6246927008582722683L ) @Export("garbageCollectorLastCollectionTime") static long garbageCollectorLastCollectionTime; - @ObfuscatedName("ar") + @ObfuscatedName("ay") @ObfuscatedGetter( - longValue = 6076947773962414417L + longValue = -7805304911218154981L ) @Export("garbageCollectorLastCheckTimeMs") static long garbageCollectorLastCheckTimeMs; - @ObfuscatedName("z") + @ObfuscatedName("r") @Export("hasErrored") boolean hasErrored; - @ObfuscatedName("d") + @ObfuscatedName("k") @ObfuscatedGetter( - intValue = 743110399 + intValue = -1091351445 ) @Export("contentWidth") protected int contentWidth; - @ObfuscatedName("u") + @ObfuscatedName("m") @ObfuscatedGetter( - intValue = -1135790119 + intValue = -2128033235 ) @Export("contentHeight") protected int contentHeight; - @ObfuscatedName("m") + @ObfuscatedName("z") @ObfuscatedGetter( - intValue = 2057175105 + intValue = -1437613301 ) @Export("canvasX") int canvasX; - @ObfuscatedName("j") + @ObfuscatedName("t") @ObfuscatedGetter( - intValue = 992390113 + intValue = -179382835 ) @Export("canvasY") int canvasY; - @ObfuscatedName("n") + @ObfuscatedName("i") @ObfuscatedGetter( - intValue = 1928026365 + intValue = -1558391463 ) - int field332; - @ObfuscatedName("ag") - @ObfuscatedGetter( - intValue = -387860183 - ) - int field333; + int field350; @ObfuscatedName("ae") @ObfuscatedGetter( - intValue = -328692287 + intValue = -422930921 + ) + int field348; + @ObfuscatedName("ap") + @ObfuscatedGetter( + intValue = 59571423 ) @Export("maxCanvasWidth") int maxCanvasWidth; - @ObfuscatedName("ao") + @ObfuscatedName("ab") @ObfuscatedGetter( - intValue = 1109070493 + intValue = -45318295 ) @Export("maxCanvasHeight") int maxCanvasHeight; - @ObfuscatedName("at") + @ObfuscatedName("ai") @Export("frame") Frame frame; - @ObfuscatedName("av") + @ObfuscatedName("ar") @Export("canvas") java.awt.Canvas canvas; - @ObfuscatedName("al") + @ObfuscatedName("ag") @Export("fullRedraw") volatile boolean fullRedraw; - @ObfuscatedName("ax") + @ObfuscatedName("aj") @Export("resizeCanvasNextFrame") boolean resizeCanvasNextFrame; - @ObfuscatedName("ak") + @ObfuscatedName("am") @Export("isCanvasInvalid") volatile boolean isCanvasInvalid; - @ObfuscatedName("ay") + @ObfuscatedName("az") @ObfuscatedGetter( - longValue = 7498009749239990725L + longValue = 8555805370222747289L ) - volatile long field342; - @ObfuscatedName("au") + volatile long field363; + @ObfuscatedName("at") @ObfuscatedSignature( - descriptor = "Lak;" + descriptor = "Lam;" ) @Export("mouseWheelHandler") MouseWheelHandler mouseWheelHandler; - @ObfuscatedName("as") + @ObfuscatedName("ah") @Export("clipboard") Clipboard clipboard; - @ObfuscatedName("ad") + @ObfuscatedName("ao") @Export("eventQueue") final EventQueue eventQueue; @@ -209,7 +217,7 @@ public abstract class GameEngine extends Applet implements Runnable, FocusListen fps = 0; // L: 50 graphicsTickTimes = new long[32]; // L: 53 clientTickTimes = new long[32]; // L: 55 - field339 = 500; // L: 73 + field355 = 500; // L: 73 volatileFocus = true; // L: 82 garbageCollectorLastCollectionTime = -1L; // L: 85 garbageCollectorLastCheckTimeMs = -1L; // L: 86 @@ -222,7 +230,7 @@ public abstract class GameEngine extends Applet implements Runnable, FocusListen this.fullRedraw = true; // L: 71 this.resizeCanvasNextFrame = false; // L: 74 this.isCanvasInvalid = false; // L: 75 - this.field342 = 0L; // L: 76 + this.field363 = 0L; // L: 76 EventQueue var1 = null; // L: 89 try { @@ -231,327 +239,334 @@ public abstract class GameEngine extends Applet implements Runnable, FocusListen } this.eventQueue = var1; // L: 94 - StructComposition.method2863(new DevicePcmPlayerProvider()); // L: 95 + class19.method225(new DevicePcmPlayerProvider()); // L: 95 } // L: 96 - @ObfuscatedName("q") + @ObfuscatedName("p") @ObfuscatedSignature( - descriptor = "(IIB)V", - garbageValue = "-26" + descriptor = "(III)V", + garbageValue = "-1134068726" ) @Export("setMaxCanvasSize") protected final void setMaxCanvasSize(int var1, int var2) { if (this.maxCanvasWidth != var1 || var2 != this.maxCanvasHeight) { // L: 99 - this.method542(); + this.method490(); } this.maxCanvasWidth = var1; // L: 100 this.maxCanvasHeight = var2; // L: 101 } // L: 102 - @ObfuscatedName("i") + @ObfuscatedName("j") @ObfuscatedSignature( descriptor = "(Ljava/lang/Object;B)V", - garbageValue = "-21" + garbageValue = "104" ) @Export("post") final void post(Object var1) { if (this.eventQueue != null) { // L: 105 for (int var2 = 0; var2 < 50 && this.eventQueue.peekEvent() != null; ++var2) { // L: 106 - UrlRequest.sleepExact(1L); + try { + Thread.sleep(1L); // L: 125 + } catch (InterruptedException var4) { // L: 127 + } } if (var1 != null) { - this.eventQueue.postEvent(new ActionEvent(var1, 1001, "dummy")); // L: 107 + this.eventQueue.postEvent(new ActionEvent(var1, 1001, "dummy")); // L: 130 } } - } // L: 108 - - @ObfuscatedName("x") - @ObfuscatedSignature( - descriptor = "(B)Ldb;", - garbageValue = "49" - ) - @Export("mouseWheel") - protected MouseWheel mouseWheel() { - if (this.mouseWheelHandler == null) { // L: 111 - this.mouseWheelHandler = new MouseWheelHandler(); // L: 112 - this.mouseWheelHandler.addTo(this.canvas); // L: 113 - } - - return this.mouseWheelHandler; // L: 115 - } - - @ObfuscatedName("k") - @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "45003502" - ) - @Export("setUpClipboard") - protected void setUpClipboard() { - this.clipboard = this.getToolkit().getSystemClipboard(); // L: 119 - } // L: 120 + } // L: 131 @ObfuscatedName("r") @ObfuscatedSignature( - descriptor = "(Ljava/lang/String;I)V", - garbageValue = "-1356656584" + descriptor = "(B)Ldw;", + garbageValue = "-92" ) - @Export("clipboardSetString") - protected void clipboardSetString(String var1) { - this.clipboard.setContents(new StringSelection(var1), (ClipboardOwner)null); // L: 123 - } // L: 124 - - @ObfuscatedName("p") - @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "615867530" - ) - @Export("setUpKeyboard") - protected final void setUpKeyboard() { - SecureRandomCallable.method2080(); // L: 127 - class82.method1946(this.canvas); // L: 128 - } // L: 129 - - @ObfuscatedName("a") - @ObfuscatedSignature( - descriptor = "(B)V", - garbageValue = "-119" - ) - @Export("setUpMouse") - protected final void setUpMouse() { - java.awt.Canvas var1 = this.canvas; // L: 132 - var1.addMouseListener(MouseHandler.MouseHandler_instance); // L: 134 - var1.addMouseMotionListener(MouseHandler.MouseHandler_instance); // L: 135 - var1.addFocusListener(MouseHandler.MouseHandler_instance); // L: 136 - } // L: 138 - - @ObfuscatedName("e") - @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "-715885048" - ) - @Export("resizeCanvas") - final void resizeCanvas() { - Container var1 = this.container(); // L: 141 - if (var1 != null) { // L: 142 - Bounds var2 = this.getFrameContentBounds(); // L: 143 - this.contentWidth = Math.max(var2.highX, this.field332); // L: 144 - this.contentHeight = Math.max(var2.highY, this.field333); // L: 145 - if (this.contentWidth <= 0) { // L: 146 - this.contentWidth = 1; - } - - if (this.contentHeight <= 0) { // L: 147 - this.contentHeight = 1; - } - - canvasWidth = Math.min(this.contentWidth, this.maxCanvasWidth); // L: 148 - HealthBarDefinition.canvasHeight = Math.min(this.contentHeight, this.maxCanvasHeight); // L: 149 - this.canvasX = (this.contentWidth - canvasWidth) / 2; // L: 150 - this.canvasY = 0; // L: 151 - this.canvas.setSize(canvasWidth, HealthBarDefinition.canvasHeight); // L: 152 - WorldMapDecorationType.rasterProvider = new RasterProvider(canvasWidth, HealthBarDefinition.canvasHeight, this.canvas); // L: 153 - if (var1 == this.frame) { // L: 154 - Insets var3 = this.frame.getInsets(); // L: 155 - this.canvas.setLocation(var3.left + this.canvasX, this.canvasY + var3.top); // L: 156 - } else { - this.canvas.setLocation(this.canvasX, this.canvasY); // L: 158 - } - - this.fullRedraw = true; // L: 159 - this.resizeGame(); // L: 160 + @Export("mouseWheel") + protected MouseWheel mouseWheel() { + if (this.mouseWheelHandler == null) { // L: 134 + this.mouseWheelHandler = new MouseWheelHandler(); // L: 135 + this.mouseWheelHandler.addTo(this.canvas); // L: 136 } - } // L: 161 + + return this.mouseWheelHandler; // L: 138 + } + + @ObfuscatedName("b") + @ObfuscatedSignature( + descriptor = "(I)V", + garbageValue = "383352988" + ) + @Export("setUpClipboard") + protected void setUpClipboard() { + this.clipboard = this.getToolkit().getSystemClipboard(); // L: 142 + } // L: 143 @ObfuscatedName("d") + @ObfuscatedSignature( + descriptor = "(Ljava/lang/String;I)V", + garbageValue = "973874436" + ) + @Export("clipboardSetString") + protected void clipboardSetString(String var1) { + this.clipboard.setContents(new StringSelection(var1), (ClipboardOwner)null); // L: 146 + } // L: 147 + + @ObfuscatedName("s") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "-997141942" + garbageValue = "1238474569" + ) + @Export("setUpKeyboard") + protected final void setUpKeyboard() { + class243.method4668(); // L: 150 + LoginScreenAnimation.method2236(this.canvas); // L: 151 + } // L: 152 + + @ObfuscatedName("u") + @ObfuscatedSignature( + descriptor = "(B)V", + garbageValue = "-59" + ) + @Export("setUpMouse") + protected final void setUpMouse() { + java.awt.Canvas var1 = this.canvas; // L: 155 + var1.addMouseListener(MouseHandler.MouseHandler_instance); // L: 157 + var1.addMouseMotionListener(MouseHandler.MouseHandler_instance); // L: 158 + var1.addFocusListener(MouseHandler.MouseHandler_instance); // L: 159 + } // L: 161 + + @ObfuscatedName("l") + @ObfuscatedSignature( + descriptor = "(I)V", + garbageValue = "1759538265" + ) + @Export("resizeCanvas") + final void resizeCanvas() { + Container var1 = this.container(); // L: 164 + if (var1 != null) { // L: 165 + Bounds var2 = this.getFrameContentBounds(); // L: 166 + this.contentWidth = Math.max(var2.highX, this.field350); // L: 167 + this.contentHeight = Math.max(var2.highY, this.field348); // L: 168 + if (this.contentWidth <= 0) { // L: 169 + this.contentWidth = 1; + } + + if (this.contentHeight <= 0) { // L: 170 + this.contentHeight = 1; + } + + class32.canvasWidth = Math.min(this.contentWidth, this.maxCanvasWidth); // L: 171 + ReflectionCheck.canvasHeight = Math.min(this.contentHeight, this.maxCanvasHeight); // L: 172 + this.canvasX = (this.contentWidth - class32.canvasWidth) / 2; // L: 173 + this.canvasY = 0; // L: 174 + this.canvas.setSize(class32.canvasWidth, ReflectionCheck.canvasHeight); // L: 175 + class26.rasterProvider = new RasterProvider(class32.canvasWidth, ReflectionCheck.canvasHeight, this.canvas); // L: 176 + if (var1 == this.frame) { // L: 177 + Insets var3 = this.frame.getInsets(); // L: 178 + this.canvas.setLocation(var3.left + this.canvasX, this.canvasY + var3.top); // L: 179 + } else { + this.canvas.setLocation(this.canvasX, this.canvasY); // L: 181 + } + + this.fullRedraw = true; // L: 182 + this.resizeGame(); // L: 183 + } + } // L: 184 + + @ObfuscatedName("o") + @ObfuscatedSignature( + descriptor = "(B)V", + garbageValue = "50" ) @Export("resizeGame") protected abstract void resizeGame(); - @ObfuscatedName("u") + @ObfuscatedName("c") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "1625111694" + garbageValue = "2101906226" ) @Export("clearBackground") void clearBackground() { - int var1 = this.canvasX; // L: 166 - int var2 = this.canvasY; // L: 167 - int var3 = this.contentWidth - canvasWidth - var1; // L: 168 - int var4 = this.contentHeight - HealthBarDefinition.canvasHeight - var2; // L: 169 - if (var1 > 0 || var3 > 0 || var2 > 0 || var4 > 0) { // L: 170 + int var1 = this.canvasX; // L: 189 + int var2 = this.canvasY; // L: 190 + int var3 = this.contentWidth - class32.canvasWidth - var1; // L: 191 + int var4 = this.contentHeight - ReflectionCheck.canvasHeight - var2; // L: 192 + if (var1 > 0 || var3 > 0 || var2 > 0 || var4 > 0) { // L: 193 try { - Container var5 = this.container(); // L: 172 - int var6 = 0; // L: 173 - int var7 = 0; // L: 174 - if (var5 == this.frame) { // L: 175 - Insets var8 = this.frame.getInsets(); // L: 176 - var6 = var8.left; // L: 177 - var7 = var8.top; // L: 178 + Container var5 = this.container(); // L: 195 + int var6 = 0; // L: 196 + int var7 = 0; // L: 197 + if (var5 == this.frame) { // L: 198 + Insets var8 = this.frame.getInsets(); // L: 199 + var6 = var8.left; // L: 200 + var7 = var8.top; // L: 201 } - Graphics var10 = var5.getGraphics(); // L: 180 - var10.setColor(Color.black); // L: 181 + Graphics var10 = var5.getGraphics(); // L: 203 + var10.setColor(Color.black); // L: 204 if (var1 > 0) { - var10.fillRect(var6, var7, var1, this.contentHeight); // L: 182 + var10.fillRect(var6, var7, var1, this.contentHeight); // L: 205 } - if (var2 > 0) { // L: 183 + if (var2 > 0) { // L: 206 var10.fillRect(var6, var7, this.contentWidth, var2); } - if (var3 > 0) { // L: 184 + if (var3 > 0) { // L: 207 var10.fillRect(var6 + this.contentWidth - var3, var7, var3, this.contentHeight); } - if (var4 > 0) { // L: 185 + if (var4 > 0) { // L: 208 var10.fillRect(var6, var7 + this.contentHeight - var4, this.contentWidth, var4); } - } catch (Exception var9) { // L: 187 + } catch (Exception var9) { // L: 210 } } - } // L: 189 + } // L: 212 - @ObfuscatedName("m") + @ObfuscatedName("e") @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "22836699" + descriptor = "(B)V", + garbageValue = "6" ) @Export("replaceCanvas") final void replaceCanvas() { - java.awt.Canvas var1 = this.canvas; // L: 192 - var1.removeKeyListener(KeyHandler.KeyHandler_instance); // L: 194 - var1.removeFocusListener(KeyHandler.KeyHandler_instance); // L: 195 - KeyHandler.field260 = -1; // L: 196 - class21.method289(this.canvas); // L: 198 - if (this.mouseWheelHandler != null) { // L: 199 + SoundSystem.method803(this.canvas); // L: 215 + java.awt.Canvas var1 = this.canvas; // L: 216 + var1.removeMouseListener(MouseHandler.MouseHandler_instance); // L: 218 + var1.removeMouseMotionListener(MouseHandler.MouseHandler_instance); // L: 219 + var1.removeFocusListener(MouseHandler.MouseHandler_instance); // L: 220 + MouseHandler.MouseHandler_currentButtonVolatile = 0; // L: 221 + if (this.mouseWheelHandler != null) { // L: 223 this.mouseWheelHandler.removeFrom(this.canvas); } - this.addCanvas(); // L: 200 - class82.method1946(this.canvas); // L: 201 - class12.method192(this.canvas); // L: 202 - if (this.mouseWheelHandler != null) { // L: 203 + this.addCanvas(); // L: 224 + LoginScreenAnimation.method2236(this.canvas); // L: 225 + java.awt.Canvas var2 = this.canvas; // L: 226 + var2.addMouseListener(MouseHandler.MouseHandler_instance); // L: 228 + var2.addMouseMotionListener(MouseHandler.MouseHandler_instance); // L: 229 + var2.addFocusListener(MouseHandler.MouseHandler_instance); // L: 230 + if (this.mouseWheelHandler != null) { // L: 232 this.mouseWheelHandler.addTo(this.canvas); } - this.method542(); // L: 204 - } // L: 205 + this.method490(); // L: 233 + } // L: 234 - @ObfuscatedName("ae") + @ObfuscatedName("g") @ObfuscatedSignature( - descriptor = "(IIIB)V", - garbageValue = "70" + descriptor = "(IIII)V", + garbageValue = "428962423" ) @Export("startThread") protected final void startThread(int var1, int var2, int var3) { try { - if (gameEngine != null) { // L: 209 - ++GameEngine_redundantStartThreadCount; // L: 210 - if (GameEngine_redundantStartThreadCount >= 3) { // L: 211 - this.error("alreadyloaded"); // L: 212 - return; // L: 213 + if (gameEngine != null) { // L: 238 + ++GameEngine_redundantStartThreadCount; // L: 239 + if (GameEngine_redundantStartThreadCount >= 3) { // L: 240 + this.error("alreadyloaded"); // L: 241 + return; // L: 242 } - this.getAppletContext().showDocument(this.getDocumentBase(), "_self"); // L: 215 - return; // L: 216 + this.getAppletContext().showDocument(this.getDocumentBase(), "_self"); // L: 244 + return; // L: 245 } - gameEngine = this; // L: 218 - canvasWidth = var1; // L: 219 - HealthBarDefinition.canvasHeight = var2; // L: 220 - TileItem.RunException_revision = var3; // L: 221 - RunException.RunException_applet = this; // L: 222 - if (taskHandler == null) { // L: 223 + gameEngine = this; // L: 247 + class32.canvasWidth = var1; // L: 248 + ReflectionCheck.canvasHeight = var2; // L: 249 + RunException.RunException_revision = var3; // L: 250 + RunException.RunException_applet = this; // L: 251 + if (taskHandler == null) { // L: 252 taskHandler = new TaskHandler(); } - taskHandler.newThreadTask(this, 1); // L: 224 - } catch (Exception var5) { // L: 226 - class27.RunException_sendStackTrace((String)null, var5); // L: 227 - this.error("crash"); // L: 228 + taskHandler.newThreadTask(this, 1); // L: 253 + } catch (Exception var5) { // L: 255 + class266.RunException_sendStackTrace((String)null, var5); // L: 256 + this.error("crash"); // L: 257 } - } // L: 230 + } // L: 259 - @ObfuscatedName("ao") + @ObfuscatedName("a") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "-159166525" + garbageValue = "1032083147" ) @Export("addCanvas") final synchronized void addCanvas() { - Container var1 = this.container(); // L: 233 - if (this.canvas != null) { // L: 234 - this.canvas.removeFocusListener(this); // L: 235 - var1.remove(this.canvas); // L: 236 + Container var1 = this.container(); // L: 262 + if (this.canvas != null) { // L: 263 + this.canvas.removeFocusListener(this); // L: 264 + var1.remove(this.canvas); // L: 265 } - canvasWidth = Math.max(var1.getWidth(), this.field332); // L: 238 - HealthBarDefinition.canvasHeight = Math.max(var1.getHeight(), this.field333); // L: 239 + class32.canvasWidth = Math.max(var1.getWidth(), this.field350); // L: 267 + ReflectionCheck.canvasHeight = Math.max(var1.getHeight(), this.field348); // L: 268 Insets var2; - if (this.frame != null) { // L: 240 - var2 = this.frame.getInsets(); // L: 241 - canvasWidth -= var2.left + var2.right; // L: 242 - HealthBarDefinition.canvasHeight -= var2.top + var2.bottom; // L: 243 + if (this.frame != null) { // L: 269 + var2 = this.frame.getInsets(); // L: 270 + class32.canvasWidth -= var2.right + var2.left; // L: 271 + ReflectionCheck.canvasHeight -= var2.bottom + var2.top; // L: 272 } - this.canvas = new Canvas(this); // L: 245 - var1.setBackground(Color.BLACK); // L: 246 - var1.setLayout((LayoutManager)null); // L: 247 - var1.add(this.canvas); // L: 248 - this.canvas.setSize(canvasWidth, HealthBarDefinition.canvasHeight); // L: 249 - this.canvas.setVisible(true); // L: 250 - this.canvas.setBackground(Color.BLACK); // L: 251 - if (var1 == this.frame) { // L: 252 - var2 = this.frame.getInsets(); // L: 253 - this.canvas.setLocation(this.canvasX + var2.left, this.canvasY + var2.top); // L: 254 + this.canvas = new Canvas(this); // L: 274 + var1.setBackground(Color.BLACK); // L: 275 + var1.setLayout((LayoutManager)null); // L: 276 + var1.add(this.canvas); // L: 277 + this.canvas.setSize(class32.canvasWidth, ReflectionCheck.canvasHeight); // L: 278 + this.canvas.setVisible(true); // L: 279 + this.canvas.setBackground(Color.BLACK); // L: 280 + if (var1 == this.frame) { // L: 281 + var2 = this.frame.getInsets(); // L: 282 + this.canvas.setLocation(var2.left + this.canvasX, this.canvasY + var2.top); // L: 283 } else { - this.canvas.setLocation(this.canvasX, this.canvasY); // L: 256 + this.canvas.setLocation(this.canvasX, this.canvasY); // L: 285 } - this.canvas.addFocusListener(this); // L: 257 - this.canvas.requestFocus(); // L: 258 - this.fullRedraw = true; // L: 259 - if (WorldMapDecorationType.rasterProvider != null && canvasWidth == WorldMapDecorationType.rasterProvider.width && HealthBarDefinition.canvasHeight == WorldMapDecorationType.rasterProvider.height) { // L: 260 - ((RasterProvider)WorldMapDecorationType.rasterProvider).setComponent(this.canvas); // L: 261 - WorldMapDecorationType.rasterProvider.drawFull(0, 0); // L: 262 + this.canvas.addFocusListener(this); // L: 286 + this.canvas.requestFocus(); // L: 287 + this.fullRedraw = true; // L: 288 + if (class26.rasterProvider != null && class32.canvasWidth == class26.rasterProvider.width && ReflectionCheck.canvasHeight == class26.rasterProvider.height) { // L: 289 + ((RasterProvider)class26.rasterProvider).setComponent(this.canvas); // L: 290 + class26.rasterProvider.drawFull(0, 0); // L: 291 } else { - WorldMapDecorationType.rasterProvider = new RasterProvider(canvasWidth, HealthBarDefinition.canvasHeight, this.canvas); // L: 265 + class26.rasterProvider = new RasterProvider(class32.canvasWidth, ReflectionCheck.canvasHeight, this.canvas); // L: 294 } - this.isCanvasInvalid = false; // L: 267 - this.field342 = Archive.currentTimeMillis(); // L: 268 - } // L: 269 + this.isCanvasInvalid = false; // L: 296 + this.field363 = ObjectComposition.currentTimeMillis(); // L: 297 + } // L: 298 - @ObfuscatedName("aj") + @ObfuscatedName("k") @ObfuscatedSignature( descriptor = "(I)Z", - garbageValue = "-1116268715" + garbageValue = "-1231993586" ) @Export("checkHost") protected final boolean checkHost() { - String var1 = this.getDocumentBase().getHost().toLowerCase(); // L: 272 - if (!var1.equals("jagex.com") && !var1.endsWith(".jagex.com")) { // L: 273 - if (!var1.equals("runescape.com") && !var1.endsWith(".runescape.com")) { // L: 274 - if (var1.endsWith("127.0.0.1")) { // L: 275 + String var1 = this.getDocumentBase().getHost().toLowerCase(); // L: 301 + if (!var1.equals("jagex.com") && !var1.endsWith(".jagex.com")) { // L: 302 + if (!var1.equals("runescape.com") && !var1.endsWith(".runescape.com")) { // L: 303 + if (var1.endsWith("127.0.0.1")) { // L: 304 return true; } else { while (var1.length() > 0 && var1.charAt(var1.length() - 1) >= '0' && var1.charAt(var1.length() - 1) <= '9') { - var1 = var1.substring(0, var1.length() - 1); // L: 276 + var1 = var1.substring(0, var1.length() - 1); // L: 305 } - if (var1.endsWith("192.168.1.")) { // L: 277 + if (var1.endsWith("192.168.1.")) { // L: 306 return true; } else { - this.error("invalidhost"); // L: 278 - return false; // L: 279 + this.error("invalidhost"); // L: 307 + return false; // L: 308 } } } else { @@ -562,548 +577,455 @@ public abstract class GameEngine extends Applet implements Runnable, FocusListen } } - @ObfuscatedName("aw") + @ObfuscatedName("m") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "2127496332" + garbageValue = "996629970" ) @Export("clientTick") void clientTick() { - long var1 = Archive.currentTimeMillis(); // L: 323 - long var3 = clientTickTimes[clientTickTimeIdx]; // L: 324 - clientTickTimes[clientTickTimeIdx] = var1; // L: 325 - clientTickTimeIdx = clientTickTimeIdx + 1 & 31; // L: 326 - if (var3 != 0L && var1 > var3) { // L: 327 + long var1 = ObjectComposition.currentTimeMillis(); // L: 361 + long var3 = clientTickTimes[clientTickTimeIdx]; // L: 362 + clientTickTimes[clientTickTimeIdx] = var1; // L: 363 + clientTickTimeIdx = clientTickTimeIdx + 1 & 31; // L: 364 + if (var3 != 0L && var1 > var3) { // L: 365 } - synchronized(this) { // L: 328 - class124.hasFocus = volatileFocus; // L: 329 - } // L: 330 + synchronized(this) { // L: 366 + WorldMapSection1.hasFocus = volatileFocus; // L: 367 + } // L: 368 - this.doCycle(); // L: 331 - } // L: 332 + this.doCycle(); // L: 369 + } // L: 370 - @ObfuscatedName("at") + @ObfuscatedName("x") @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "585935525" + descriptor = "(B)V", + garbageValue = "-49" ) @Export("graphicsTick") void graphicsTick() { - Container var1 = this.container(); // L: 335 - long var2 = Archive.currentTimeMillis(); // L: 336 - long var4 = graphicsTickTimes[class286.graphicsTickTimeIdx]; // L: 337 - graphicsTickTimes[class286.graphicsTickTimeIdx] = var2; // L: 338 - class286.graphicsTickTimeIdx = class286.graphicsTickTimeIdx + 1 & 31; // L: 339 - if (0L != var4 && var2 > var4) { // L: 340 - int var6 = (int)(var2 - var4); // L: 341 - fps = ((var6 >> 1) + 32000) / var6; // L: 342 + Container var1 = this.container(); // L: 373 + long var2 = ObjectComposition.currentTimeMillis(); // L: 374 + long var4 = graphicsTickTimes[graphicsTickTimeIdx]; // L: 375 + graphicsTickTimes[graphicsTickTimeIdx] = var2; // L: 376 + graphicsTickTimeIdx = graphicsTickTimeIdx + 1 & 31; // L: 377 + if (0L != var4 && var2 > var4) { // L: 378 + int var6 = (int)(var2 - var4); // L: 379 + fps = ((var6 >> 1) + 32000) / var6; // L: 380 } - if (++field339 - 1 > 50) { // L: 344 - field339 -= 50; // L: 345 - this.fullRedraw = true; // L: 346 - this.canvas.setSize(canvasWidth, HealthBarDefinition.canvasHeight); // L: 347 - this.canvas.setVisible(true); // L: 348 - if (var1 == this.frame) { // L: 349 - Insets var7 = this.frame.getInsets(); // L: 350 - this.canvas.setLocation(var7.left + this.canvasX, this.canvasY + var7.top); // L: 351 + if (++field355 - 1 > 50) { // L: 382 + field355 -= 50; // L: 383 + this.fullRedraw = true; // L: 384 + this.canvas.setSize(class32.canvasWidth, ReflectionCheck.canvasHeight); // L: 385 + this.canvas.setVisible(true); // L: 386 + if (var1 == this.frame) { // L: 387 + Insets var7 = this.frame.getInsets(); // L: 388 + this.canvas.setLocation(this.canvasX + var7.left, var7.top + this.canvasY); // L: 389 } else { - this.canvas.setLocation(this.canvasX, this.canvasY); // L: 353 + this.canvas.setLocation(this.canvasX, this.canvasY); // L: 391 } } - if (this.isCanvasInvalid) { // L: 355 + if (this.isCanvasInvalid) { // L: 393 this.replaceCanvas(); } - this.method538(); // L: 356 - this.draw(this.fullRedraw); // L: 357 - if (this.fullRedraw) { // L: 358 + this.method493(); // L: 394 + this.draw(this.fullRedraw); // L: 395 + if (this.fullRedraw) { // L: 396 this.clearBackground(); } - this.fullRedraw = false; // L: 359 - } // L: 360 + this.fullRedraw = false; // L: 397 + } // L: 398 - @ObfuscatedName("av") - @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "-2139850312" - ) - final void method538() { - Bounds var1 = this.getFrameContentBounds(); // L: 363 - if (this.contentWidth != var1.highX || this.contentHeight != var1.highY || this.resizeCanvasNextFrame) { // L: 364 - this.resizeCanvas(); // L: 365 - this.resizeCanvasNextFrame = false; // L: 366 - } - - } // L: 368 - - @ObfuscatedName("al") + @ObfuscatedName("i") @ObfuscatedSignature( descriptor = "(B)V", - garbageValue = "-35" + garbageValue = "45" ) - final void method542() { - this.resizeCanvasNextFrame = true; // L: 371 - } // L: 372 + final void method493() { + Bounds var1 = this.getFrameContentBounds(); // L: 401 + if (this.contentWidth != var1.highX || this.contentHeight != var1.highY || this.resizeCanvasNextFrame) { // L: 402 + this.resizeCanvas(); // L: 403 + this.resizeCanvasNextFrame = false; // L: 404 + } + + } // L: 406 + + @ObfuscatedName("ae") + @ObfuscatedSignature( + descriptor = "(I)V", + garbageValue = "1998261621" + ) + final void method490() { + this.resizeCanvasNextFrame = true; // L: 409 + } // L: 410 @ObfuscatedName("ap") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "-643465371" + garbageValue = "928825308" ) @Export("kill") final synchronized void kill() { - if (!isKilled) { // L: 375 - isKilled = true; // L: 376 + if (!isKilled) { // L: 413 + isKilled = true; // L: 414 try { - this.canvas.removeFocusListener(this); // L: 378 - } catch (Exception var5) { // L: 380 + this.canvas.removeFocusListener(this); // L: 416 + } catch (Exception var5) { // L: 418 } try { - this.kill0(); // L: 382 - } catch (Exception var4) { // L: 384 + this.kill0(); // L: 420 + } catch (Exception var4) { // L: 422 } - if (this.frame != null) { // L: 385 + if (this.frame != null) { // L: 423 try { - System.exit(0); // L: 387 - } catch (Throwable var3) { // L: 389 + System.exit(0); // L: 425 + } catch (Throwable var3) { // L: 427 } } - if (taskHandler != null) { // L: 391 + if (taskHandler != null) { // L: 429 try { - taskHandler.close(); // L: 393 - } catch (Exception var2) { // L: 395 + taskHandler.close(); // L: 431 + } catch (Exception var2) { // L: 433 } } - this.vmethod1216(); // L: 397 + this.vmethod1471(); // L: 435 } - } // L: 398 + } // L: 436 - @ObfuscatedName("am") + @ObfuscatedName("ab") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "1254682788" + garbageValue = "-232069568" ) @Export("setUp") protected abstract void setUp(); - @ObfuscatedName("ax") + @ObfuscatedName("al") @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "302617031" + descriptor = "(B)V", + garbageValue = "68" ) @Export("doCycle") protected abstract void doCycle(); - @ObfuscatedName("ak") + @ObfuscatedName("ad") @ObfuscatedSignature( - descriptor = "(ZI)V", - garbageValue = "1176468254" + descriptor = "(ZS)V", + garbageValue = "9311" ) @Export("draw") protected abstract void draw(boolean var1); - @ObfuscatedName("ay") + @ObfuscatedName("ai") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "2107475994" + garbageValue = "561275520" ) @Export("kill0") protected abstract void kill0(); - @ObfuscatedName("ai") + @ObfuscatedName("ar") @ObfuscatedSignature( descriptor = "(ILjava/lang/String;ZI)V", - garbageValue = "-802613405" + garbageValue = "91092739" ) @Export("drawInitial") protected final void drawInitial(int var1, String var2, boolean var3) { try { - Graphics var4 = this.canvas.getGraphics(); // L: 458 - if (class9.fontHelvetica13 == null) { // L: 459 - class9.fontHelvetica13 = new java.awt.Font("Helvetica", 1, 13); // L: 460 - Interpreter.loginScreenFontMetrics = this.canvas.getFontMetrics(class9.fontHelvetica13); // L: 461 + Graphics var4 = this.canvas.getGraphics(); // L: 519 + if (KitDefinition.fontHelvetica13 == null) { // L: 520 + KitDefinition.fontHelvetica13 = new java.awt.Font("Helvetica", 1, 13); // L: 521 + DefaultsGroup.loginScreenFontMetrics = this.canvas.getFontMetrics(KitDefinition.fontHelvetica13); // L: 522 } - if (var3) { // L: 463 - var4.setColor(Color.black); // L: 464 - var4.fillRect(0, 0, canvasWidth, HealthBarDefinition.canvasHeight); // L: 465 + if (var3) { // L: 524 + var4.setColor(Color.black); // L: 525 + var4.fillRect(0, 0, class32.canvasWidth, ReflectionCheck.canvasHeight); // L: 526 } - Color var5 = new Color(140, 17, 17); // L: 467 + Color var5 = new Color(140, 17, 17); // L: 528 try { - if (class340.field3934 == null) { // L: 469 - class340.field3934 = this.canvas.createImage(304, 34); + if (field354 == null) { // L: 530 + field354 = this.canvas.createImage(304, 34); } - Graphics var6 = class340.field3934.getGraphics(); // L: 470 - var6.setColor(var5); // L: 471 - var6.drawRect(0, 0, 303, 33); - var6.fillRect(2, 2, var1 * 3, 30); - var6.setColor(Color.black); - var6.drawRect(1, 1, 301, 31); - var6.fillRect(var1 * 3 + 2, 2, 300 - var1 * 3, 30); - var6.setFont(class9.fontHelvetica13); - var6.setColor(Color.white); - var6.drawString(var2, (304 - Interpreter.loginScreenFontMetrics.stringWidth(var2)) / 2, 22); // L: 479 - var4.drawImage(class340.field3934, canvasWidth / 2 - 152, HealthBarDefinition.canvasHeight / 2 - 18, (ImageObserver)null); - } catch (Exception var9) { - int var7 = canvasWidth / 2 - 152; - int var8 = HealthBarDefinition.canvasHeight / 2 - 18; - var4.setColor(var5); - var4.drawRect(var7, var8, 303, 33); // L: 486 - var4.fillRect(var7 + 2, var8 + 2, var1 * 3, 30); - var4.setColor(Color.black); - var4.drawRect(var7 + 1, var8 + 1, 301, 31); - var4.fillRect(var1 * 3 + var7 + 2, var8 + 2, 300 - var1 * 3, 30); - var4.setFont(class9.fontHelvetica13); - var4.setColor(Color.white); - var4.drawString(var2, var7 + (304 - Interpreter.loginScreenFontMetrics.stringWidth(var2)) / 2, var8 + 22); + Graphics var6 = field354.getGraphics(); // L: 531 + var6.setColor(var5); // L: 532 + var6.drawRect(0, 0, 303, 33); // L: 533 + var6.fillRect(2, 2, var1 * 3, 30); // L: 534 + var6.setColor(Color.black); // L: 535 + var6.drawRect(1, 1, 301, 31); // L: 536 + var6.fillRect(var1 * 3 + 2, 2, 300 - var1 * 3, 30); // L: 537 + var6.setFont(KitDefinition.fontHelvetica13); // L: 538 + var6.setColor(Color.white); // L: 539 + var6.drawString(var2, (304 - DefaultsGroup.loginScreenFontMetrics.stringWidth(var2)) / 2, 22); // L: 540 + var4.drawImage(field354, class32.canvasWidth / 2 - 152, ReflectionCheck.canvasHeight / 2 - 18, (ImageObserver)null); // L: 541 + } catch (Exception var9) { // L: 543 + int var7 = class32.canvasWidth / 2 - 152; // L: 544 + int var8 = ReflectionCheck.canvasHeight / 2 - 18; // L: 545 + var4.setColor(var5); // L: 546 + var4.drawRect(var7, var8, 303, 33); // L: 547 + var4.fillRect(var7 + 2, var8 + 2, var1 * 3, 30); // L: 548 + var4.setColor(Color.black); // L: 549 + var4.drawRect(var7 + 1, var8 + 1, 301, 31); // L: 550 + var4.fillRect(var1 * 3 + var7 + 2, var8 + 2, 300 - var1 * 3, 30); // L: 551 + var4.setFont(KitDefinition.fontHelvetica13); // L: 552 + var4.setColor(Color.white); // L: 553 + var4.drawString(var2, var7 + (304 - DefaultsGroup.loginScreenFontMetrics.stringWidth(var2)) / 2, var8 + 22); // L: 554 } - } catch (Exception var10) { - this.canvas.repaint(); + } catch (Exception var10) { // L: 557 + this.canvas.repaint(); // L: 558 } - } + } // L: 560 - @ObfuscatedName("aa") + @ObfuscatedName("ag") @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "-856068332" + descriptor = "(B)V", + garbageValue = "82" ) - protected final void method548() { - class340.field3934 = null; - class9.fontHelvetica13 = null; - Interpreter.loginScreenFontMetrics = null; - } // L: 505 + protected final void method501() { + field354 = null; // L: 563 + KitDefinition.fontHelvetica13 = null; // L: 564 + DefaultsGroup.loginScreenFontMetrics = null; // L: 565 + } // L: 566 - @ObfuscatedName("au") + @ObfuscatedName("ax") @ObfuscatedSignature( - descriptor = "(Ljava/lang/String;I)V", - garbageValue = "-1312350525" + descriptor = "(Ljava/lang/String;B)V", + garbageValue = "-1" ) @Export("error") protected void error(String var1) { - if (!this.hasErrored) { - this.hasErrored = true; - System.out.println("error_game_" + var1); + if (!this.hasErrored) { // L: 569 + this.hasErrored = true; // L: 570 + System.out.println("error_game_" + var1); // L: 571 try { - this.getAppletContext().showDocument(new URL(this.getCodeBase(), "error_game_" + var1 + ".ws"), "_self"); - } catch (Exception var3) { + this.getAppletContext().showDocument(new URL(this.getCodeBase(), "error_game_" + var1 + ".ws"), "_self"); // L: 573 + } catch (Exception var3) { // L: 575 } } - } // L: 515 + } // L: 576 @ObfuscatedName("as") @ObfuscatedSignature( descriptor = "(I)Ljava/awt/Container;", - garbageValue = "2028320240" + garbageValue = "1142166715" ) @Export("container") Container container() { - return (Container)(this.frame != null ? this.frame : this); + return (Container)(this.frame != null ? this.frame : this); // L: 579 } - @ObfuscatedName("ad") + @ObfuscatedName("aj") @ObfuscatedSignature( - descriptor = "(I)Lle;", - garbageValue = "1474283096" + descriptor = "(I)Lli;", + garbageValue = "1389693294" ) @Export("getFrameContentBounds") Bounds getFrameContentBounds() { - Container var1 = this.container(); - int var2 = Math.max(var1.getWidth(), this.field332); - int var3 = Math.max(var1.getHeight(), this.field333); - if (this.frame != null) { - Insets var4 = this.frame.getInsets(); - var2 -= var4.right + var4.left; - var3 -= var4.bottom + var4.top; // L: 529 + Container var1 = this.container(); // L: 584 + int var2 = Math.max(var1.getWidth(), this.field350); // L: 585 + int var3 = Math.max(var1.getHeight(), this.field348); // L: 586 + if (this.frame != null) { // L: 587 + Insets var4 = this.frame.getInsets(); // L: 588 + var2 -= var4.right + var4.left; // L: 589 + var3 -= var4.bottom + var4.top; // L: 590 } - return new Bounds(var2, var3); + return new Bounds(var2, var3); // L: 592 } - @ObfuscatedName("ac") + @ObfuscatedName("am") @ObfuscatedSignature( - descriptor = "(I)Z", - garbageValue = "-290533301" + descriptor = "(B)Z", + garbageValue = "-45" ) @Export("hasFrame") protected final boolean hasFrame() { - return this.frame != null; + return this.frame != null; // L: 596 } - @ObfuscatedName("aq") + @ObfuscatedName("av") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "-1701648283" + garbageValue = "-992375266" ) - protected abstract void vmethod1216(); + protected abstract void vmethod1471(); + + public final void destroy() { + if (this == gameEngine && !isKilled) { // L: 449 + stopTimeMs = ObjectComposition.currentTimeMillis(); // L: 450 + long var1 = 4999L; // L: 454 + + try { + Thread.sleep(var1); // L: 457 + } catch (InterruptedException var5) { // L: 459 + } + + try { + Thread.sleep(1L); // L: 463 + } catch (InterruptedException var4) { // L: 465 + } + + this.kill(); // L: 475 + } + } // L: 476 public final synchronized void paint(Graphics var1) { - if (this == gameEngine && !isKilled) { // L: 422 - this.fullRedraw = true; // L: 423 - if (Archive.currentTimeMillis() - this.field342 > 1000L) { // L: 424 - Rectangle var2 = var1.getClipBounds(); // L: 425 - if (var2 == null || var2.width >= canvasWidth && var2.height >= HealthBarDefinition.canvasHeight) { - this.isCanvasInvalid = true; // L: 426 + if (this == gameEngine && !isKilled) { // L: 483 + this.fullRedraw = true; // L: 484 + if (ObjectComposition.currentTimeMillis() - this.field363 > 1000L) { // L: 485 + Rectangle var2 = var1.getClipBounds(); // L: 486 + if (var2 == null || var2.width >= class32.canvasWidth && var2.height >= ReflectionCheck.canvasHeight) { + this.isCanvasInvalid = true; // L: 487 } } } - } // L: 428 + } // L: 489 - public final void destroy() { - if (this == gameEngine && !isKilled) { // L: 411 - stopTimeMs = Archive.currentTimeMillis(); // L: 412 - UrlRequest.sleepExact(5000L); // L: 413 - this.kill(); // L: 414 + public final void start() { + if (this == gameEngine && !isKilled) { // L: 439 + stopTimeMs = 0L; // L: 440 } - } // L: 415 + } // L: 441 public final void stop() { - if (this == gameEngine && !isKilled) { // L: 406 - stopTimeMs = Archive.currentTimeMillis() + 4000L; // L: 407 + if (this == gameEngine && !isKilled) { // L: 444 + stopTimeMs = ObjectComposition.currentTimeMillis() + 4000L; // L: 445 } - } // L: 408 + } // L: 446 + + public final void update(Graphics var1) { + this.paint(var1); // L: 479 + } // L: 480 + + public final void focusGained(FocusEvent var1) { + volatileFocus = true; // L: 492 + this.fullRedraw = true; // L: 493 + } // L: 494 + + public final void focusLost(FocusEvent var1) { + volatileFocus = false; // L: 497 + } // L: 498 public void run() { try { - if (TaskHandler.javaVendor != null) { // L: 284 - String var1 = TaskHandler.javaVendor.toLowerCase(); // L: 285 - if (var1.indexOf("sun") != -1 || var1.indexOf("apple") != -1) { // L: 286 - String var2 = TaskHandler.javaVersion; // L: 287 - if (var2.equals("1.1") || var2.startsWith("1.1.") || var2.equals("1.2") || var2.startsWith("1.2.") || var2.equals("1.3") || var2.startsWith("1.3.") || var2.equals("1.4") || var2.startsWith("1.4.") || var2.equals("1.5") || var2.startsWith("1.5.") || var2.equals("1.6.0")) { // L: 288 - this.error("wrongjava"); // L: 289 - return; // L: 290 + if (TaskHandler.javaVendor != null) { // L: 313 + String var1 = TaskHandler.javaVendor.toLowerCase(); // L: 314 + if (var1.indexOf("sun") != -1 || var1.indexOf("apple") != -1) { // L: 315 + String var2 = TaskHandler.javaVersion; // L: 316 + if (var2.equals("1.1") || var2.startsWith("1.1.") || var2.equals("1.2") || var2.startsWith("1.2.") || var2.equals("1.3") || var2.startsWith("1.3.") || var2.equals("1.4") || var2.startsWith("1.4.") || var2.equals("1.5") || var2.startsWith("1.5.") || var2.equals("1.6.0")) { // L: 317 + this.error("wrongjava"); // L: 318 + return; // L: 319 } - if (var2.startsWith("1.6.0_")) { // L: 292 + if (var2.startsWith("1.6.0_")) { // L: 321 int var3; - for (var3 = 6; var3 < var2.length() && GrandExchangeOfferWorldComparator.isDigit(var2.charAt(var3)); ++var3) { // L: 293 294 + for (var3 = 6; var3 < var2.length() && UserComparator10.isDigit(var2.charAt(var3)); ++var3) { // L: 322 323 } - String var4 = var2.substring(6, var3); // L: 295 - if (GrandExchangeOfferAgeComparator.isNumber(var4) && FontName.method6162(var4) < 10) { // L: 296 - this.error("wrongjava"); // L: 297 - return; // L: 298 + String var4 = var2.substring(6, var3); // L: 324 + if (class20.isNumber(var4) && class82.method1908(var4) < 10) { // L: 325 + this.error("wrongjava"); // L: 326 + return; // L: 327 } } - fiveOrOne = 5; // L: 301 + fiveOrOne = 5; // L: 330 } } - this.setFocusCycleRoot(true); // L: 304 - this.addCanvas(); // L: 305 - this.setUp(); // L: 306 - WorldMapRectangle.clock = Clock.method2597(); // L: 307 + this.setFocusCycleRoot(true); // L: 333 + this.addCanvas(); // L: 334 + this.setUp(); // L: 335 - while (stopTimeMs == 0L || Archive.currentTimeMillis() < stopTimeMs) { // L: 308 - gameCyclesToDo = WorldMapRectangle.clock.wait(cycleDurationMillis, fiveOrOne); // L: 309 + Object var8; + try { + var8 = new NanoClock(); // L: 339 + } catch (Throwable var6) { // L: 341 + var8 = new MilliClock(); // L: 342 + } - for (int var5 = 0; var5 < gameCyclesToDo; ++var5) { // L: 310 + clock = (Clock)var8; // L: 345 + + while (0L == stopTimeMs || ObjectComposition.currentTimeMillis() < stopTimeMs) { // L: 346 + class260.gameCyclesToDo = clock.wait(cycleDurationMillis, fiveOrOne); // L: 347 + + for (int var5 = 0; var5 < class260.gameCyclesToDo; ++var5) { // L: 348 this.clientTick(); } - this.graphicsTick(); // L: 311 - this.post(this.canvas); // L: 312 + this.graphicsTick(); // L: 349 + this.post(this.canvas); // L: 350 } - } catch (Exception var6) { // L: 315 - class27.RunException_sendStackTrace((String)null, var6); // L: 316 - this.error("crash"); // L: 317 + } catch (Exception var7) { // L: 353 + class266.RunException_sendStackTrace((String)null, var7); // L: 354 + this.error("crash"); // L: 355 } - this.kill(); // L: 319 - } // L: 320 - - public final void start() { - if (this == gameEngine && !isKilled) { // L: 401 - stopTimeMs = 0L; // L: 402 - } - } // L: 403 - - public final void focusGained(FocusEvent var1) { - volatileFocus = true; // L: 431 - this.fullRedraw = true; // L: 432 - } // L: 433 - - public final void focusLost(FocusEvent var1) { - volatileFocus = false; // L: 436 - } // L: 437 - - public final void windowClosed(WindowEvent var1) { - } // L: 440 - - public final void windowClosing(WindowEvent var1) { - this.destroy(); // L: 443 - } // L: 444 + this.kill(); // L: 357 + } // L: 358 public final void windowDeactivated(WindowEvent var1) { - } // L: 446 - - public final void windowDeiconified(WindowEvent var1) { - } // L: 447 + } // L: 507 public final void windowIconified(WindowEvent var1) { - } // L: 448 + } // L: 509 + + public final void windowClosed(WindowEvent var1) { + } // L: 501 + + public final void windowClosing(WindowEvent var1) { + this.destroy(); // L: 504 + } // L: 505 + + public final void windowActivated(WindowEvent var1) { + } // L: 500 public final void windowOpened(WindowEvent var1) { - } // L: 449 + } // L: 510 public abstract void init(); - public final void windowActivated(WindowEvent var1) { - } // L: 439 + public final void windowDeiconified(WindowEvent var1) { + } // L: 508 - public final void update(Graphics var1) { - this.paint(var1); // L: 418 - } // L: 419 + @ObfuscatedName("v") + @ObfuscatedSignature( + descriptor = "(III)I", + garbageValue = "-1726985857" + ) + static int method538(int var0, int var1) { + ItemContainer var2 = (ItemContainer)ItemContainer.itemContainers.get((long)var0); // L: 14 + if (var2 == null) { // L: 15 + return -1; + } else { + return var1 >= 0 && var1 < var2.ids.length ? var2.ids[var1] : -1; // L: 16 17 + } + } @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "(IIIIIII)I", - garbageValue = "1912933891" + descriptor = "(II)V", + garbageValue = "-2043539672" ) - public static int method674(int var0, int var1, int var2, int var3, int var4, int var5) { - if ((var5 & 1) == 1) { // L: 17 - int var6 = var3; // L: 18 - var3 = var4; // L: 19 - var4 = var6; // L: 20 - } - - var2 &= 3; // L: 22 - if (var2 == 0) { // L: 23 - return var1; - } else if (var2 == 1) { // L: 24 - return 7 - var0 - (var3 - 1); - } else { - return var2 == 2 ? 7 - var1 - (var4 - 1) : var0; // L: 25 - } - } - - @ObfuscatedName("g") - @ObfuscatedSignature( - descriptor = "(ILci;ZB)I", - garbageValue = "18" - ) - static int method588(int var0, Script var1, boolean var2) { - int var4; - int var9; - if (var0 == ScriptOpcodes.CC_CREATE) { // L: 472 - WorldMapCacheName.Interpreter_intStackSize -= 3; // L: 473 - var9 = Interpreter.Interpreter_intStack[WorldMapCacheName.Interpreter_intStackSize]; // L: 474 - var4 = Interpreter.Interpreter_intStack[WorldMapCacheName.Interpreter_intStackSize + 1]; // L: 475 - int var11 = Interpreter.Interpreter_intStack[WorldMapCacheName.Interpreter_intStackSize + 2]; // L: 476 - if (var4 == 0) { // L: 477 - throw new RuntimeException(); // L: 478 - } else { - Widget var6 = DevicePcmPlayerProvider.getWidget(var9); // L: 480 - if (var6.children == null) { // L: 481 - var6.children = new Widget[var11 + 1]; - } - - if (var6.children.length <= var11) { // L: 482 - Widget[] var7 = new Widget[var11 + 1]; // L: 483 - - for (int var8 = 0; var8 < var6.children.length; ++var8) { // L: 484 - var7[var8] = var6.children[var8]; - } - - var6.children = var7; // L: 485 - } - - if (var11 > 0 && var6.children[var11 - 1] == null) { // L: 487 - throw new RuntimeException("" + (var11 - 1)); - } else { - Widget var12 = new Widget(); // L: 488 - var12.type = var4; // L: 489 - var12.parentId = var12.id = var6.id; // L: 490 - var12.childIndex = var11; // L: 491 - var12.isIf3 = true; // L: 492 - var6.children[var11] = var12; // L: 493 - if (var2) { // L: 494 - class308.scriptDotWidget = var12; - } else { - class24.scriptActiveWidget = var12; // L: 495 - } - - VerticalAlignment.invalidateWidget(var6); // L: 496 - return 1; // L: 497 - } - } - } else { - Widget var3; - if (var0 == ScriptOpcodes.CC_DELETE) { // L: 499 - var3 = var2 ? class308.scriptDotWidget : class24.scriptActiveWidget; // L: 500 - Widget var10 = DevicePcmPlayerProvider.getWidget(var3.id); // L: 501 - var10.children[var3.childIndex] = null; // L: 502 - VerticalAlignment.invalidateWidget(var10); // L: 503 - return 1; // L: 504 - } else if (var0 == ScriptOpcodes.CC_DELETEALL) { // L: 506 - var3 = DevicePcmPlayerProvider.getWidget(Interpreter.Interpreter_intStack[--WorldMapCacheName.Interpreter_intStackSize]); // L: 507 - var3.children = null; // L: 508 - VerticalAlignment.invalidateWidget(var3); // L: 509 - return 1; // L: 510 - } else if (var0 == 103) { // L: 512 - WorldMapCacheName.Interpreter_intStackSize -= 3; // L: 513 - return 1; // L: 514 - } else if (var0 == 104) { // L: 516 - --WorldMapCacheName.Interpreter_intStackSize; // L: 517 - return 1; // L: 518 - } else if (var0 != ScriptOpcodes.CC_FIND) { // L: 520 - if (var0 == ScriptOpcodes.IF_FIND) { // L: 533 - var3 = DevicePcmPlayerProvider.getWidget(Interpreter.Interpreter_intStack[--WorldMapCacheName.Interpreter_intStackSize]); // L: 534 - if (var3 != null) { // L: 535 - Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = 1; // L: 536 - if (var2) { // L: 537 - class308.scriptDotWidget = var3; - } else { - class24.scriptActiveWidget = var3; // L: 538 - } - } else { - Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = 0; // L: 540 - } - - return 1; // L: 541 - } else if (var0 == 202) { // L: 543 - Interpreter.Interpreter_intStack[WorldMapCacheName.Interpreter_intStackSize + 1] = 0; // L: 544 - return 1; // L: 545 - } else if (var0 == 203) { // L: 547 - Interpreter.Interpreter_intStack[--WorldMapCacheName.Interpreter_intStackSize + 1] = 0; // L: 548 - return 1; // L: 549 - } else { - return 2; // L: 551 - } - } else { - WorldMapCacheName.Interpreter_intStackSize -= 2; // L: 521 - var9 = Interpreter.Interpreter_intStack[WorldMapCacheName.Interpreter_intStackSize]; // L: 522 - var4 = Interpreter.Interpreter_intStack[WorldMapCacheName.Interpreter_intStackSize + 1]; // L: 523 - Widget var5 = PacketWriter.getWidgetChild(var9, var4); // L: 524 - if (var5 != null && var4 != -1) { // L: 525 - Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = 1; // L: 526 - if (var2) { // L: 527 - class308.scriptDotWidget = var5; - } else { - class24.scriptActiveWidget = var5; // L: 528 - } - } else { - Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = 0; // L: 530 - } - - return 1; // L: 531 - } - } - } + static void method572(int var0) { + Login.loginIndex = 12; // L: 1635 + Login.field1032 = var0; // L: 1636 + } // L: 1637 } diff --git a/runescape-client/src/main/java/GameObject.java b/runescape-client/src/main/java/GameObject.java index e8745ac0ab..79bb17320b 100644 --- a/runescape-client/src/main/java/GameObject.java +++ b/runescape-client/src/main/java/GameObject.java @@ -1,101 +1,92 @@ -import java.lang.reflect.Field; -import java.lang.reflect.Method; 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.Reflection; -@ObfuscatedName("hz") +@ObfuscatedName("hj") @Implements("GameObject") public final class GameObject { - @ObfuscatedName("sn") - @ObfuscatedSignature( - descriptor = "Lms;" - ) - @Export("platformInfo") - static PlatformInfo platformInfo; - @ObfuscatedName("h") + @ObfuscatedName("v") @ObfuscatedGetter( - intValue = 1006788737 + intValue = -254047513 ) @Export("plane") int plane; - @ObfuscatedName("c") + @ObfuscatedName("n") @ObfuscatedGetter( - intValue = 537985055 + intValue = -1917415421 ) @Export("height") int height; - @ObfuscatedName("o") + @ObfuscatedName("f") @ObfuscatedGetter( - intValue = 1950826709 + intValue = 1140262961 ) @Export("centerX") int centerX; - @ObfuscatedName("g") + @ObfuscatedName("y") @ObfuscatedGetter( - intValue = -1652041871 + intValue = 364858457 ) @Export("centerY") int centerY; - @ObfuscatedName("l") + @ObfuscatedName("p") @ObfuscatedSignature( - descriptor = "Lge;" + descriptor = "Lgl;" ) @Export("renderable") public Renderable renderable; - @ObfuscatedName("z") + @ObfuscatedName("j") @ObfuscatedGetter( - intValue = -1185454061 + intValue = -202388443 ) @Export("orientation") int orientation; - @ObfuscatedName("t") + @ObfuscatedName("r") @ObfuscatedGetter( - intValue = -982826151 + intValue = 1674574095 ) @Export("startX") int startX; - @ObfuscatedName("v") + @ObfuscatedName("b") @ObfuscatedGetter( - intValue = 1670448045 + intValue = -2078907755 ) @Export("endX") int endX; - @ObfuscatedName("b") + @ObfuscatedName("d") @ObfuscatedGetter( - intValue = 470621493 + intValue = 1202737381 ) @Export("startY") int startY; - @ObfuscatedName("q") + @ObfuscatedName("s") @ObfuscatedGetter( - intValue = -994471517 + intValue = -129893675 ) @Export("endY") int endY; - @ObfuscatedName("i") + @ObfuscatedName("u") @ObfuscatedGetter( - intValue = -296238485 + intValue = -327316739 ) - int field2543; - @ObfuscatedName("x") + int field2554; + @ObfuscatedName("l") @ObfuscatedGetter( - intValue = 1322032331 + intValue = -137941941 ) @Export("lastDrawn") int lastDrawn; - @ObfuscatedName("k") + @ObfuscatedName("o") @ObfuscatedGetter( - longValue = 6995464757226252125L + longValue = 1142152799211342585L ) @Export("tag") public long tag; - @ObfuscatedName("r") + @ObfuscatedName("c") @ObfuscatedGetter( - intValue = -1823541423 + intValue = -2139353773 ) @Export("flags") int flags; @@ -105,149 +96,15 @@ public final class GameObject { this.flags = 0; // L: 17 } // L: 19 - @ObfuscatedName("g") + @ObfuscatedName("gj") @ObfuscatedSignature( - descriptor = "(Lnk;IB)V", - garbageValue = "8" + descriptor = "(B)V", + garbageValue = "7" ) - @Export("readReflectionCheck") - public static void readReflectionCheck(Buffer var0, int var1) { - ReflectionCheck var2 = new ReflectionCheck(); // L: 133 - var2.size = var0.readUnsignedByte(); // L: 134 - var2.id = var0.readInt(); // L: 135 - var2.operations = new int[var2.size]; // L: 136 - var2.creationErrors = new int[var2.size]; // L: 137 - var2.fields = new Field[var2.size]; // L: 138 - var2.intReplaceValues = new int[var2.size]; // L: 139 - var2.methods = new Method[var2.size]; // L: 140 - var2.arguments = new byte[var2.size][][]; // L: 141 - - for (int var3 = 0; var3 < var2.size; ++var3) { // L: 142 - try { - int var4 = var0.readUnsignedByte(); // L: 144 - String var5; - String var6; - int var7; - if (var4 != 0 && var4 != 1 && var4 != 2) { // L: 145 - if (var4 == 3 || var4 == 4) { // L: 155 - var5 = var0.readStringCp1252NullTerminated(); // L: 156 - var6 = var0.readStringCp1252NullTerminated(); // L: 157 - var7 = var0.readUnsignedByte(); // L: 158 - String[] var8 = new String[var7]; // L: 159 - - for (int var9 = 0; var9 < var7; ++var9) { // L: 160 - var8[var9] = var0.readStringCp1252NullTerminated(); - } - - String var20 = var0.readStringCp1252NullTerminated(); // L: 161 - byte[][] var10 = new byte[var7][]; // L: 162 - int var12; - if (var4 == 3) { // L: 163 - for (int var11 = 0; var11 < var7; ++var11) { // L: 164 - var12 = var0.readInt(); // L: 165 - var10[var11] = new byte[var12]; // L: 166 - var0.readBytes(var10[var11], 0, var12); // L: 167 - } - } - - var2.operations[var3] = var4; // L: 170 - Class[] var21 = new Class[var7]; // L: 171 - - for (var12 = 0; var12 < var7; ++var12) { // L: 172 - var21[var12] = class34.loadClassFromDescriptor(var8[var12]); - } - - Class var22 = class34.loadClassFromDescriptor(var20); // L: 173 - if (class34.loadClassFromDescriptor(var5).getClassLoader() == null) { // L: 174 - throw new SecurityException(); - } - - Method[] var13 = class34.loadClassFromDescriptor(var5).getDeclaredMethods(); // L: 175 - Method[] var14 = var13; // L: 177 - - for (int var15 = 0; var15 < var14.length; ++var15) { // L: 178 - Method var16 = var14[var15]; // L: 179 - if (Reflection.getMethodName(var16).equals(var6)) { // L: 181 - Class[] var17 = Reflection.getParameterTypes(var16); // L: 182 - if (var21.length == var17.length) { // L: 183 - boolean var18 = true; // L: 184 - - for (int var19 = 0; var19 < var21.length; ++var19) { // L: 185 - if (var21[var19] != var17[var19]) { // L: 186 - var18 = false; // L: 187 - break; // L: 188 - } - } - - if (var18 && var22 == var16.getReturnType()) { // L: 191 - var2.methods[var3] = var16; // L: 192 - } - } - } - } - - var2.arguments[var3] = var10; // L: 199 - } - } else { - var5 = var0.readStringCp1252NullTerminated(); // L: 146 - var6 = var0.readStringCp1252NullTerminated(); // L: 147 - var7 = 0; // L: 148 - if (var4 == 1) { // L: 149 - var7 = var0.readInt(); - } - - var2.operations[var3] = var4; // L: 150 - var2.intReplaceValues[var3] = var7; - if (class34.loadClassFromDescriptor(var5).getClassLoader() == null) { // L: 152 - throw new SecurityException(); - } - - var2.fields[var3] = Reflection.findField(class34.loadClassFromDescriptor(var5), var6); // L: 153 - } - } catch (ClassNotFoundException var24) { // L: 202 - var2.creationErrors[var3] = -1; // L: 203 - } catch (SecurityException var25) { // L: 205 - var2.creationErrors[var3] = -2; // L: 206 - } catch (NullPointerException var26) { // L: 208 - var2.creationErrors[var3] = -3; // L: 209 - } catch (Exception var27) { // L: 211 - var2.creationErrors[var3] = -4; // L: 212 - } catch (Throwable var28) { // L: 214 - var2.creationErrors[var3] = -5; // L: 215 - } + static void method4279() { + if (Client.combatTargetPlayerIndex >= 0 && Client.players[Client.combatTargetPlayerIndex] != null) { // L: 4346 + NetSocket.addPlayerToScene(Client.players[Client.combatTargetPlayerIndex], false); // L: 4347 } - class69.reflectionChecks.addFirst(var2); // L: 218 - } // L: 219 - - @ObfuscatedName("l") - @ObfuscatedSignature( - descriptor = "(Ljp;Ljava/lang/String;Ljava/lang/String;B)[Lof;", - garbageValue = "-66" - ) - public static IndexedSprite[] method4235(AbstractArchive var0, String var1, String var2) { - int var3 = var0.getGroupId(var1); // L: 116 - int var4 = var0.getFileId(var3, var2); // L: 117 - return WorldMapDecoration.method3571(var0, var3, var4); // L: 118 - } - - @ObfuscatedName("v") - @ObfuscatedSignature( - descriptor = "(CB)Z", - garbageValue = "-36" - ) - @Export("isCharAlphabetic") - public static boolean isCharAlphabetic(char var0) { - return var0 >= 'A' && var0 <= 'Z' || var0 >= 'a' && var0 <= 'z'; // L: 151 - } - - @ObfuscatedName("jv") - @ObfuscatedSignature( - descriptor = "(S)Z", - garbageValue = "10491" - ) - @Export("getTapToDrop") - static boolean getTapToDrop() { - return Client.tapToDrop; // L: 10455 - } + } // L: 4349 } diff --git a/runescape-client/src/main/java/GrandExchangeEvent.java b/runescape-client/src/main/java/GrandExchangeEvent.java index c9e08dbe2d..61f41ceceb 100644 --- a/runescape-client/src/main/java/GrandExchangeEvent.java +++ b/runescape-client/src/main/java/GrandExchangeEvent.java @@ -4,42 +4,36 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("jz") +@ObfuscatedName("js") @Implements("GrandExchangeEvent") public class GrandExchangeEvent { - @ObfuscatedName("k") - @ObfuscatedSignature( - descriptor = "Lof;" - ) - @Export("options_buttons_2Sprite") - static IndexedSprite options_buttons_2Sprite; - @ObfuscatedName("h") + @ObfuscatedName("v") @ObfuscatedGetter( - intValue = 1061538211 + intValue = 512263149 ) @Export("world") public final int world; - @ObfuscatedName("c") + @ObfuscatedName("n") @ObfuscatedGetter( - longValue = -779308497234252569L + longValue = 6451811657459395973L ) @Export("age") public final long age; - @ObfuscatedName("o") + @ObfuscatedName("f") @ObfuscatedSignature( - descriptor = "Ljm;" + descriptor = "Lju;" ) @Export("grandExchangeOffer") public final GrandExchangeOffer grandExchangeOffer; - @ObfuscatedName("g") + @ObfuscatedName("y") @Export("offerName") String offerName; - @ObfuscatedName("l") + @ObfuscatedName("p") @Export("previousOfferName") String previousOfferName; @ObfuscatedSignature( - descriptor = "(Lnk;BI)V" + descriptor = "(Lnd;BI)V" ) GrandExchangeEvent(Buffer var1, byte var2, int var3) { this.offerName = var1.readStringCp1252NullTerminated(); // L: 111 @@ -49,8 +43,8 @@ public class GrandExchangeEvent { int var4 = var1.readInt(); // L: 115 int var5 = var1.readInt(); // L: 116 this.grandExchangeOffer = new GrandExchangeOffer(); // L: 117 - this.grandExchangeOffer.method5018(2); // L: 118 - this.grandExchangeOffer.method5019(var2); // L: 119 + this.grandExchangeOffer.method5092(2); // L: 118 + this.grandExchangeOffer.method5102(var2); // L: 119 this.grandExchangeOffer.unitPrice = var4; // L: 120 this.grandExchangeOffer.totalQuantity = var5; // L: 121 this.grandExchangeOffer.currentQuantity = 0; // L: 122 @@ -58,20 +52,20 @@ public class GrandExchangeEvent { this.grandExchangeOffer.id = var3; // L: 124 } // L: 125 - @ObfuscatedName("h") + @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "(S)Ljava/lang/String;", - garbageValue = "255" + descriptor = "(B)Ljava/lang/String;", + garbageValue = "-72" ) @Export("getOfferName") public String getOfferName() { return this.offerName; // L: 128 } - @ObfuscatedName("c") + @ObfuscatedName("n") @ObfuscatedSignature( descriptor = "(I)Ljava/lang/String;", - garbageValue = "-1435135839" + garbageValue = "1720963732" ) @Export("getPreviousOfferName") public String getPreviousOfferName() { diff --git a/runescape-client/src/main/java/GrandExchangeEvents.java b/runescape-client/src/main/java/GrandExchangeEvents.java index 1337beb0be..3af42a53aa 100644 --- a/runescape-client/src/main/java/GrandExchangeEvents.java +++ b/runescape-client/src/main/java/GrandExchangeEvents.java @@ -2,29 +2,32 @@ import java.util.ArrayList; import java.util.Collections; import java.util.Comparator; import java.util.List; -import java.util.concurrent.Executors; -import java.util.concurrent.TimeUnit; import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("jw") +@ObfuscatedName("jm") @Implements("GrandExchangeEvents") public class GrandExchangeEvents { - @ObfuscatedName("c") + @ObfuscatedName("n") @Export("GrandExchangeEvents_ageComparator") public static Comparator GrandExchangeEvents_ageComparator; - @ObfuscatedName("o") + @ObfuscatedName("f") @Export("GrandExchangeEvents_priceComparator") public static Comparator GrandExchangeEvents_priceComparator; - @ObfuscatedName("g") + @ObfuscatedName("y") @Export("GrandExchangeEvents_nameComparator") public static Comparator GrandExchangeEvents_nameComparator; - @ObfuscatedName("l") + @ObfuscatedName("p") @Export("GrandExchangeEvents_quantityComparator") public static Comparator GrandExchangeEvents_quantityComparator; - @ObfuscatedName("h") + @ObfuscatedName("jp") + @ObfuscatedSignature( + descriptor = "Lio;" + ) + static Widget field3626; + @ObfuscatedName("v") @Export("events") public final List events; @@ -34,10 +37,10 @@ public class GrandExchangeEvents { GrandExchangeEvents_priceComparator = new GrandExchangeOfferUnitPriceComparator(); // L: 41 GrandExchangeEvents_nameComparator = new GrandExchangeOfferNameComparator(); // L: 54 GrandExchangeEvents_quantityComparator = new GrandExchangeOfferTotalQuantityComparator(); - } + } // L: 67 @ObfuscatedSignature( - descriptor = "(Lnk;Z)V", + descriptor = "(Lnd;Z)V", garbageValue = "1" ) public GrandExchangeEvents(Buffer var1, boolean var2) { @@ -59,10 +62,10 @@ public class GrandExchangeEvents { } // L: 92 - @ObfuscatedName("h") + @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "(Ljava/util/Comparator;ZB)V", - garbageValue = "1" + descriptor = "(Ljava/util/Comparator;ZI)V", + garbageValue = "-1954624010" ) @Export("sort") public void sort(Comparator var1, boolean var2) { @@ -74,74 +77,38 @@ public class GrandExchangeEvents { } // L: 101 - @ObfuscatedName("o") + @ObfuscatedName("hy") @ObfuscatedSignature( - descriptor = "(IIII)I", - garbageValue = "-1006012588" + descriptor = "(IIII)V", + garbageValue = "-1158444411" ) - public static int method4968(int var0, int var1, int var2) { - int var3 = WorldMapLabel.method3582(var2 - var1 + 1); // L: 37 - var3 <<= var1; // L: 38 - return var0 & ~var3; // L: 39 - } - - @ObfuscatedName("g") - @ObfuscatedSignature( - descriptor = "(IZIZB)V", - garbageValue = "-1" - ) - @Export("sortWorldList") - static void sortWorldList(int var0, boolean var1, int var2, boolean var3) { - if (Messages.World_worlds != null) { // L: 171 - LoginScreenAnimation.doWorldSorting(0, Messages.World_worlds.length - 1, var0, var1, var2, var3); // L: 172 - } - - } // L: 174 - - @ObfuscatedName("u") - @ObfuscatedSignature( - descriptor = "(Ldk;IIB)Lbd;", - garbageValue = "79" - ) - public static final PcmPlayer method4969(TaskHandler var0, int var1, int var2) { - if (PcmPlayer.field401 == 0) { // L: 56 - throw new IllegalStateException(); - } else if (var1 >= 0 && var1 < 2) { // L: 57 - if (var2 < 256) { // L: 58 - var2 = 256; + @Export("worldToScreen") + static final void worldToScreen(int var0, int var1, int var2) { + if (var0 >= 128 && var1 >= 128 && var0 <= 13056 && var1 <= 13056) { // L: 4997 + int var3 = class105.getTileHeight(var0, var1, class22.Client_plane) - var2; // L: 5002 + var0 -= MouseHandler.cameraX; // L: 5003 + var3 -= SecureRandomCallable.cameraY; // L: 5004 + var1 -= class105.cameraZ; // L: 5005 + int var4 = Rasterizer3D.Rasterizer3D_sine[SpotAnimationDefinition.cameraPitch]; // L: 5006 + int var5 = Rasterizer3D.Rasterizer3D_cosine[SpotAnimationDefinition.cameraPitch]; // L: 5007 + int var6 = Rasterizer3D.Rasterizer3D_sine[class376.cameraYaw]; // L: 5008 + int var7 = Rasterizer3D.Rasterizer3D_cosine[class376.cameraYaw]; // L: 5009 + int var8 = var6 * var1 + var0 * var7 >> 16; // L: 5010 + var1 = var7 * var1 - var0 * var6 >> 16; // L: 5011 + var0 = var8; // L: 5012 + var8 = var5 * var3 - var4 * var1 >> 16; // L: 5013 + var1 = var5 * var1 + var4 * var3 >> 16; // L: 5014 + if (var1 >= 50) { // L: 5016 + Client.viewportTempX = var0 * Client.viewportZoom / var1 + Client.viewportWidth / 2; // L: 5017 + Client.viewportTempY = var8 * Client.viewportZoom / var1 + Client.viewportHeight / 2; // L: 5018 + } else { + Client.viewportTempX = -1; // L: 5021 + Client.viewportTempY = -1; // L: 5022 } - try { - PcmPlayer var3 = Tiles.pcmPlayerProvider.player(); // L: 60 - var3.samples = new int[(ApproximateRouteStrategy.PcmPlayer_stereo ? 2 : 1) * 256]; // L: 61 - var3.field400 = var2; // L: 62 - var3.init(); // L: 63 - var3.capacity = (var2 & -1024) + 1024; // L: 64 - if (var3.capacity > 16384) { // L: 65 - var3.capacity = 16384; - } - - var3.open(var3.capacity); // L: 66 - if (PcmPlayer.field405 > 0 && PcmPlayer.soundSystem == null) { // L: 67 - PcmPlayer.soundSystem = new SoundSystem(); // L: 68 - class337.soundSystemExecutor = Executors.newScheduledThreadPool(1); // L: 69 - class337.soundSystemExecutor.scheduleAtFixedRate(PcmPlayer.soundSystem, 0L, 10L, TimeUnit.MILLISECONDS); // L: 70 - } - - if (PcmPlayer.soundSystem != null) { // L: 72 - if (PcmPlayer.soundSystem.players[var1] != null) { // L: 73 - throw new IllegalArgumentException(); - } - - PcmPlayer.soundSystem.players[var1] = var3; // L: 74 - } - - return var3; // L: 76 - } catch (Throwable var4) { // L: 78 - return new PcmPlayer(); // L: 79 - } } else { - throw new IllegalArgumentException(); + Client.viewportTempX = -1; // L: 4998 + Client.viewportTempY = -1; // L: 4999 } - } + } // L: 5000 5024 } diff --git a/runescape-client/src/main/java/GrandExchangeOffer.java b/runescape-client/src/main/java/GrandExchangeOffer.java index e83c6814f3..d846735da8 100644 --- a/runescape-client/src/main/java/GrandExchangeOffer.java +++ b/runescape-client/src/main/java/GrandExchangeOffer.java @@ -4,45 +4,45 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("jm") +@ObfuscatedName("ju") @Implements("GrandExchangeOffer") public class GrandExchangeOffer { - @ObfuscatedName("b") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "Ljp;" + descriptor = "Lop;" ) - @Export("Widget_archive") - static AbstractArchive Widget_archive; - @ObfuscatedName("h") + @Export("options_buttons_2Sprite") + static IndexedSprite options_buttons_2Sprite; + @ObfuscatedName("v") @Export("state") byte state; - @ObfuscatedName("c") + @ObfuscatedName("n") @ObfuscatedGetter( - intValue = -60064091 + intValue = -1898711 ) @Export("id") public int id; - @ObfuscatedName("o") + @ObfuscatedName("f") @ObfuscatedGetter( - intValue = -975130915 + intValue = 1229494071 ) @Export("unitPrice") public int unitPrice; - @ObfuscatedName("g") + @ObfuscatedName("y") @ObfuscatedGetter( - intValue = 1629352851 + intValue = -822093809 ) @Export("totalQuantity") public int totalQuantity; - @ObfuscatedName("l") + @ObfuscatedName("p") @ObfuscatedGetter( - intValue = -65467077 + intValue = -1567060795 ) @Export("currentQuantity") public int currentQuantity; - @ObfuscatedName("z") + @ObfuscatedName("j") @ObfuscatedGetter( - intValue = -1657421715 + intValue = 176369301 ) @Export("currentPrice") public int currentPrice; @@ -51,7 +51,7 @@ public class GrandExchangeOffer { } // L: 13 @ObfuscatedSignature( - descriptor = "(Lnk;Z)V", + descriptor = "(Lnd;Z)V", garbageValue = "0" ) public GrandExchangeOffer(Buffer var1, boolean var2) { @@ -63,85 +63,46 @@ public class GrandExchangeOffer { this.currentPrice = var1.readInt(); // L: 21 } // L: 22 - @ObfuscatedName("c") + @ObfuscatedName("n") @ObfuscatedSignature( - descriptor = "(B)I", - garbageValue = "-90" + descriptor = "(I)I", + garbageValue = "184180839" ) @Export("status") public int status() { - return this.state & 7; + return this.state & 7; // L: 50 } - @ObfuscatedName("o") + @ObfuscatedName("f") @ObfuscatedSignature( descriptor = "(I)I", - garbageValue = "1415242363" + garbageValue = "-1399016532" ) @Export("type") public int type() { return (this.state & 8) == 8 ? 1 : 0; // L: 54 } - @ObfuscatedName("g") + @ObfuscatedName("y") @ObfuscatedSignature( descriptor = "(II)V", - garbageValue = "-17191535" + garbageValue = "1177781475" ) - void method5018(int var1) { + void method5092(int var1) { this.state &= -8; // L: 58 this.state = (byte)(this.state | var1 & 7); // L: 59 } // L: 60 - @ObfuscatedName("l") + @ObfuscatedName("p") @ObfuscatedSignature( - descriptor = "(II)V", - garbageValue = "-704513201" + descriptor = "(IB)V", + garbageValue = "110" ) - void method5019(int var1) { + void method5102(int var1) { this.state &= -9; // L: 63 if (var1 == 1) { this.state = (byte)(this.state | 8); // L: 64 } } // L: 65 - - @ObfuscatedName("ak") - @ObfuscatedSignature( - descriptor = "([BIIB)I", - garbageValue = "-21" - ) - public static int method5017(byte[] var0, int var1, int var2) { - int var3 = -1; // L: 45 - - for (int var4 = var1; var4 < var2; ++var4) { // L: 46 - var3 = var3 >>> 8 ^ Buffer.crc32Table[(var3 ^ var0[var4]) & 255]; // L: 47 - } - - var3 = ~var3; // L: 49 - return var3; // L: 50 - } - - @ObfuscatedName("ip") - @ObfuscatedSignature( - descriptor = "(IIIIB)V", - garbageValue = "-28" - ) - @Export("selectSpell") - static void selectSpell(int var0, int var1, int var2, int var3) { - Widget var4 = PacketWriter.getWidgetChild(var0, var1); // L: 8913 - if (var4 != null && var4.onTargetEnter != null) { // L: 8914 - ScriptEvent var5 = new ScriptEvent(); // L: 8915 - var5.widget = var4; // L: 8916 - var5.args = var4.onTargetEnter; // L: 8917 - class259.runScriptEvent(var5); // L: 8918 - } - - Client.field773 = var3; // L: 8920 - Client.isSpellSelected = true; // L: 8921 - class6.selectedSpellWidget = var0; // L: 8922 - Client.selectedSpellChildIndex = var1; // L: 8923 - GrandExchangeOfferUnitPriceComparator.selectedSpellFlags = var2; // L: 8924 - VerticalAlignment.invalidateWidget(var4); // L: 8925 - } // L: 8926 } diff --git a/runescape-client/src/main/java/GrandExchangeOfferAgeComparator.java b/runescape-client/src/main/java/GrandExchangeOfferAgeComparator.java index 82d9a77163..c977745673 100644 --- a/runescape-client/src/main/java/GrandExchangeOfferAgeComparator.java +++ b/runescape-client/src/main/java/GrandExchangeOfferAgeComparator.java @@ -1,123 +1,95 @@ 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("jo") +@ObfuscatedName("jt") @Implements("GrandExchangeOfferAgeComparator") final class GrandExchangeOfferAgeComparator implements Comparator { - @ObfuscatedName("h") + @ObfuscatedName("dl") @ObfuscatedSignature( - descriptor = "(Ljz;Ljz;I)I", - garbageValue = "698282162" + descriptor = "Ljp;" + ) + @Export("archive8") + static Archive archive8; + @ObfuscatedName("fq") + @ObfuscatedGetter( + longValue = 172020438683337197L + ) + static long field3634; + + @ObfuscatedName("v") + @ObfuscatedSignature( + descriptor = "(Ljs;Ljs;I)I", + garbageValue = "119350129" ) @Export("compare_bridged") int compare_bridged(GrandExchangeEvent var1, GrandExchangeEvent var2) { return var1.age < var2.age ? -1 : (var2.age == var1.age ? 0 : 1); // L: 13 } - public boolean equals(Object var1) { - return super.equals(var1); // L: 21 - } - public int compare(Object var1, Object var2) { return this.compare_bridged((GrandExchangeEvent)var1, (GrandExchangeEvent)var2); // L: 17 } - @ObfuscatedName("c") + public boolean equals(Object var1) { + return super.equals(var1); // L: 21 + } + + @ObfuscatedName("p") @ObfuscatedSignature( - descriptor = "(Ljava/lang/CharSequence;B)Z", - garbageValue = "-33" + descriptor = "(Ljv;IB)V", + garbageValue = "26" ) - @Export("isNumber") - public static boolean isNumber(CharSequence var0) { - boolean var2 = false; // L: 37 - boolean var3 = false; // L: 38 - int var4 = 0; // L: 39 - int var5 = var0.length(); // L: 40 - int var6 = 0; - - boolean var1; - while (true) { - if (var6 >= var5) { - var1 = var3; // L: 70 - break; - } - - label84: { - char var7 = var0.charAt(var6); // L: 42 - if (var6 == 0) { // L: 43 - if (var7 == '-') { // L: 44 - var2 = true; // L: 45 - break label84; - } - - if (var7 == '+') { // L: 48 - break label84; - } - } - - int var9; - if (var7 >= '0' && var7 <= '9') { // L: 50 - var9 = var7 - '0'; - } else if (var7 >= 'A' && var7 <= 'Z') { // L: 51 - var9 = var7 - '7'; - } else { - if (var7 < 'a' || var7 > 'z') { // L: 52 - var1 = false; // L: 54 - break; - } - - var9 = var7 - 'W'; - } - - if (var9 >= 10) { // L: 57 - var1 = false; // L: 58 - break; // L: 59 - } - - if (var2) { // L: 61 - var9 = -var9; - } - - int var8 = var4 * 10 + var9; // L: 62 - if (var4 != var8 / 10) { // L: 63 - var1 = false; // L: 64 - break; // L: 65 - } - - var4 = var8; // L: 67 - var3 = true; // L: 68 - } - - ++var6; // L: 41 + static void method5068(AbstractArchive var0, int var1) { + if ((var1 & 536870912) != 0) { // L: 192 + Fonts.logoSprite = EnumComposition.SpriteBuffer_getIndexedSpriteByName(var0, "logo_deadman_mode", ""); // L: 193 + } else if ((var1 & 1073741824) != 0) { // L: 195 + Fonts.logoSprite = EnumComposition.SpriteBuffer_getIndexedSpriteByName(var0, "logo_seasonal_mode", ""); // L: 196 + } else { + Fonts.logoSprite = EnumComposition.SpriteBuffer_getIndexedSpriteByName(var0, "logo", ""); // L: 199 } - return var1; // L: 72 + } // L: 201 + + @ObfuscatedName("o") + @ObfuscatedSignature( + descriptor = "(III)I", + garbageValue = "-324437873" + ) + static final int method5067(int var0, int var1) { + int var2 = var1 * 57 + var0; // L: 840 + var2 ^= var2 << 13; // L: 841 + int var3 = (var2 * var2 * 15731 + 789221) * var2 + 1376312589 & Integer.MAX_VALUE; // L: 842 + return var3 >> 19 & 255; // L: 843 } - @ObfuscatedName("em") + @ObfuscatedName("e") @ObfuscatedSignature( - descriptor = "(B)Lmv;", - garbageValue = "0" + descriptor = "(ILcf;ZI)I", + garbageValue = "918594995" ) - @Export("getWorldMap") - static WorldMap getWorldMap() { - return NetSocket.worldMap; // L: 686 - } + static int method5064(int var0, Script var1, boolean var2) { + Widget var3 = var2 ? class13.scriptDotWidget : Interpreter.scriptActiveWidget; // L: 1172 + if (var0 == ScriptOpcodes.CC_GETINVOBJECT) { // L: 1173 + Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = var3.itemId; // L: 1174 + return 1; // L: 1175 + } else if (var0 == ScriptOpcodes.CC_GETINVCOUNT) { // L: 1177 + if (var3.itemId != -1) { // L: 1178 + Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = var3.itemQuantity; + } else { + Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = 0; // L: 1179 + } - @ObfuscatedName("ke") - @ObfuscatedSignature( - descriptor = "(II)V", - garbageValue = "1853647691" - ) - static void method4989(int var0) { - class9.tempMenuAction = new MenuAction(); // L: 11060 - class9.tempMenuAction.param0 = Client.menuArguments1[var0]; // L: 11061 - class9.tempMenuAction.param1 = Client.menuArguments2[var0]; // L: 11062 - class9.tempMenuAction.opcode = Client.menuOpcodes[var0]; // L: 11063 - class9.tempMenuAction.identifier = Client.menuIdentifiers[var0]; // L: 11064 - class9.tempMenuAction.action = Client.menuActions[var0]; // L: 11065 - } // L: 11066 + return 1; // L: 1180 + } else if (var0 == ScriptOpcodes.CC_GETID) { // L: 1182 + Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = var3.childIndex; // L: 1183 + return 1; // L: 1184 + } else { + return 2; // L: 1186 + } + } } diff --git a/runescape-client/src/main/java/GrandExchangeOfferNameComparator.java b/runescape-client/src/main/java/GrandExchangeOfferNameComparator.java index d438a5f8a7..8ff14d9cb0 100644 --- a/runescape-client/src/main/java/GrandExchangeOfferNameComparator.java +++ b/runescape-client/src/main/java/GrandExchangeOfferNameComparator.java @@ -4,62 +4,37 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("jv") +@ObfuscatedName("jc") @Implements("GrandExchangeOfferNameComparator") final class GrandExchangeOfferNameComparator implements Comparator { - @ObfuscatedName("h") + @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "(Ljz;Ljz;I)I", - garbageValue = "2030845639" + descriptor = "(Ljs;Ljs;I)I", + garbageValue = "-929613700" ) @Export("compare_bridged") int compare_bridged(GrandExchangeEvent var1, GrandExchangeEvent var2) { return var1.getOfferName().compareTo(var2.getOfferName()); // L: 56 } - public boolean equals(Object var1) { - return super.equals(var1); // L: 64 - } - public int compare(Object var1, Object var2) { return this.compare_bridged((GrandExchangeEvent)var1, (GrandExchangeEvent)var2); // L: 60 } - @ObfuscatedName("h") - @ObfuscatedSignature( - descriptor = "(ILlw;Lji;S)V", - garbageValue = "-5330" - ) - static void method4987(int var0, ArchiveDisk var1, Archive var2) { - ArchiveDiskAction var3 = new ArchiveDiskAction(); // L: 18 - var3.type = 1; // L: 19 - var3.key = (long)var0; // L: 20 - var3.archiveDisk = var1; // L: 21 - var3.archive = var2; // L: 22 - synchronized(ArchiveDiskActionHandler.ArchiveDiskActionHandler_requestQueue) { // L: 23 - ArchiveDiskActionHandler.ArchiveDiskActionHandler_requestQueue.addFirst(var3); // L: 24 - } // L: 25 - - class43.method486(); // L: 26 - } // L: 27 - - @ObfuscatedName("b") - @ObfuscatedSignature( - descriptor = "(III)I", - garbageValue = "-537107433" - ) - static final int method4986(int var0, int var1) { - if (var0 == -1) { // L: 492 - return 12345678; - } else { - var1 = (var0 & 127) * var1 / 128; // L: 493 - if (var1 < 2) { // L: 494 - var1 = 2; - } else if (var1 > 126) { // L: 495 - var1 = 126; - } - - return (var0 & 65408) + var1; // L: 496 - } + public boolean equals(Object var1) { + return super.equals(var1); // L: 64 } + + @ObfuscatedName("fu") + @ObfuscatedSignature( + descriptor = "(III)V", + garbageValue = "-1454161058" + ) + static void method5059(int var0, int var1) { + if (ObjectComposition.clientPreferences.musicVolume != 0 && var0 != -1) { // L: 3401 + LoginScreenAnimation.method2219(WorldMapManager.archive11, var0, 0, ObjectComposition.clientPreferences.musicVolume, false); // L: 3402 + Client.field881 = true; // L: 3403 + } + + } // L: 3405 } diff --git a/runescape-client/src/main/java/GrandExchangeOfferOwnWorldComparator.java b/runescape-client/src/main/java/GrandExchangeOfferOwnWorldComparator.java index 383e25e405..863a63ae10 100644 --- a/runescape-client/src/main/java/GrandExchangeOfferOwnWorldComparator.java +++ b/runescape-client/src/main/java/GrandExchangeOfferOwnWorldComparator.java @@ -5,108 +5,160 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("bl") +@ObfuscatedName("bk") @Implements("GrandExchangeOfferOwnWorldComparator") public class GrandExchangeOfferOwnWorldComparator implements Comparator { - @ObfuscatedName("gm") + @ObfuscatedName("as") @ObfuscatedSignature( - descriptor = "Low;" + descriptor = "Lli;" ) - @Export("redHintArrowSprite") - static SpritePixels redHintArrowSprite; - @ObfuscatedName("lk") + static Bounds field631; + @ObfuscatedName("gw") @ObfuscatedGetter( - intValue = -1477191609 + intValue = 1130183005 ) - @Export("menuHeight") - static int menuHeight; - @ObfuscatedName("h") + static int field632; + @ObfuscatedName("ob") + @ObfuscatedSignature( + descriptor = "Ldc;" + ) + @Export("varcs") + static Varcs varcs; + @ObfuscatedName("oo") + @ObfuscatedSignature( + descriptor = "Lnu;" + ) + static class369 field634; + @ObfuscatedName("v") @Export("filterWorlds") boolean filterWorlds; GrandExchangeOfferOwnWorldComparator() { - } // L: 11820 + } // L: 11583 - @ObfuscatedName("h") + @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "(Ljz;Ljz;B)I", - garbageValue = "-64" + descriptor = "(Ljs;Ljs;I)I", + garbageValue = "-1562146243" ) @Export("compare_bridged") int compare_bridged(GrandExchangeEvent var1, GrandExchangeEvent var2) { - if (var2.world == var1.world) { // L: 11823 + if (var2.world == var1.world) { // L: 11586 return 0; } else { - if (this.filterWorlds) { // L: 11824 - if (Client.worldId == var1.world) { // L: 11825 + if (this.filterWorlds) { // L: 11587 + if (Client.worldId == var1.world) { // L: 11588 return -1; } - if (var2.world == Client.worldId) { // L: 11826 + if (var2.world == Client.worldId) { // L: 11589 return 1; } } - return var1.world < var2.world ? -1 : 1; // L: 11828 + return var1.world < var2.world ? -1 : 1; // L: 11591 } } public boolean equals(Object var1) { - return super.equals(var1); // L: 11836 + return super.equals(var1); // L: 11599 } public int compare(Object var1, Object var2) { - return this.compare_bridged((GrandExchangeEvent)var1, (GrandExchangeEvent)var2); // L: 11832 + return this.compare_bridged((GrandExchangeEvent)var1, (GrandExchangeEvent)var2); // L: 11595 } - @ObfuscatedName("z") + @ObfuscatedName("n") @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "836817261" + descriptor = "(IB)Lep;", + garbageValue = "-78" ) - static void method1213() { - if (Client.Login_isUsernameRemembered && Login.Login_username != null && Login.Login_username.length() > 0) { // L: 242 - Login.currentLoginField = 1; // L: 243 + @Export("getInvDefinition") + public static InvDefinition getInvDefinition(int var0) { + InvDefinition var1 = (InvDefinition)InvDefinition.InvDefinition_cached.get((long)var0); // L: 21 + if (var1 != null) { // L: 22 + return var1; } else { - Login.currentLoginField = 0; // L: 246 + byte[] var2 = InvDefinition.InvDefinition_archive.takeFile(5, var0); // L: 23 + var1 = new InvDefinition(); // L: 24 + if (var2 != null) { // L: 25 + var1.decode(new Buffer(var2)); + } + + InvDefinition.InvDefinition_cached.put(var1, (long)var0); // L: 26 + return var1; // L: 27 + } + } + + @ObfuscatedName("p") + @ObfuscatedSignature( + descriptor = "(II)V", + garbageValue = "-1916477751" + ) + @Export("clearItemContainer") + static void clearItemContainer(int var0) { + ItemContainer var1 = (ItemContainer)ItemContainer.itemContainers.get((long)var0); // L: 63 + if (var1 != null) { // L: 64 + for (int var2 = 0; var2 < var1.ids.length; ++var2) { // L: 65 + var1.ids[var2] = -1; // L: 66 + var1.quantities[var2] = 0; // L: 67 + } + + } + } // L: 69 + + @ObfuscatedName("j") + @ObfuscatedSignature( + descriptor = "(II)I", + garbageValue = "-1870393029" + ) + public static int method1166(int var0) { + return class229.method4374(ViewportMouse.ViewportMouse_entityTags[var0]); // L: 68 + } + + @ObfuscatedName("ai") + @ObfuscatedSignature( + descriptor = "([BIII)I", + garbageValue = "1889329497" + ) + public static int method1176(byte[] var0, int var1, int var2) { + int var3 = -1; // L: 45 + + for (int var4 = var1; var4 < var2; ++var4) { // L: 46 + var3 = var3 >>> 8 ^ Buffer.crc32Table[(var3 ^ var0[var4]) & 255]; // L: 47 } - } // L: 248 + var3 = ~var3; // L: 49 + return var3; // L: 50 + } - @ObfuscatedName("im") + @ObfuscatedName("gl") @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "-1470000440" + descriptor = "(ZI)V", + garbageValue = "2022835517" ) - static void method1212() { - for (int var0 = 0; var0 < Client.menuOptionsCount; ++var0) { // L: 9105 - if (class44.method499(Client.menuOpcodes[var0])) { // L: 9106 - if (var0 < Client.menuOptionsCount - 1) { // L: 9107 - for (int var1 = var0; var1 < Client.menuOptionsCount - 1; ++var1) { // L: 9108 - Client.menuActions[var1] = Client.menuActions[var1 + 1]; // L: 9109 - Client.menuTargets[var1] = Client.menuTargets[var1 + 1]; // L: 9110 - Client.menuOpcodes[var1] = Client.menuOpcodes[var1 + 1]; // L: 9111 - Client.menuIdentifiers[var1] = Client.menuIdentifiers[var1 + 1]; // L: 9112 - Client.menuArguments1[var1] = Client.menuArguments1[var1 + 1]; // L: 9113 - Client.menuArguments2[var1] = Client.menuArguments2[var1 + 1]; // L: 9114 - Client.menuShiftClick[var1] = Client.menuShiftClick[var1 + 1]; // L: 9115 - } - } + @Export("addNpcsToScene") + static final void addNpcsToScene(boolean var0) { + for (int var1 = 0; var1 < Client.npcCount; ++var1) { // L: 4390 + NPC var2 = Client.npcs[Client.npcIndices[var1]]; // L: 4391 + if (var2 != null && var2.isVisible() && var2.definition.isVisible == var0 && var2.definition.transformIsVisible()) { // L: 4392 + int var3 = var2.x >> 7; // L: 4393 + int var4 = var2.y >> 7; // L: 4394 + if (var3 >= 0 && var3 < 104 && var4 >= 0 && var4 < 104) { // L: 4395 + if (var2.field1239 == 1 && (var2.x & 127) == 64 && (var2.y & 127) == 64) { // L: 4396 + if (Client.tileLastDrawnActor[var3][var4] == Client.viewportDrawCount) { // L: 4397 + continue; + } - --var0; // L: 9118 - --Client.menuOptionsCount; // L: 9119 + Client.tileLastDrawnActor[var3][var4] = Client.viewportDrawCount; // L: 4398 + } + + long var5 = DevicePcmPlayerProvider.calculateTag(0, 0, 1, !var2.definition.isInteractable, Client.npcIndices[var1]); // L: 4400 + var2.playerCycle = Client.cycle; // L: 4401 + AbstractSocket.scene.drawEntity(class22.Client_plane, var2.x, var2.y, class105.getTileHeight(var2.field1239 * 64 - 64 + var2.x, var2.field1239 * 64 - 64 + var2.y, class22.Client_plane), var2.field1239 * 64 - 64 + 60, var2, var2.rotation, var5, var2.isWalking); // L: 4402 + } } } - WorldMapRegion.method3317(SoundCache.menuWidth / 2 + AbstractByteArrayCopier.menuX, HitSplatDefinition.menuY); // L: 9123 - } // L: 9125 - - @ObfuscatedName("ji") - @ObfuscatedSignature( - descriptor = "(IB)Ljava/lang/String;", - garbageValue = "117" - ) - static final String method1214(int var0) { - return var0 < 999999999 ? Integer.toString(var0) : "*"; // L: 10156 10157 - } + } // L: 4406 } diff --git a/runescape-client/src/main/java/GrandExchangeOfferTotalQuantityComparator.java b/runescape-client/src/main/java/GrandExchangeOfferTotalQuantityComparator.java index 13fb01e8d4..a3e0a16641 100644 --- a/runescape-client/src/main/java/GrandExchangeOfferTotalQuantityComparator.java +++ b/runescape-client/src/main/java/GrandExchangeOfferTotalQuantityComparator.java @@ -1,23 +1,24 @@ 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; -@ObfuscatedName("ja") +@ObfuscatedName("jr") @Implements("GrandExchangeOfferTotalQuantityComparator") final class GrandExchangeOfferTotalQuantityComparator implements Comparator { - @ObfuscatedName("hj") - @ObfuscatedSignature( - descriptor = "[Lof;" + @ObfuscatedName("ef") + @ObfuscatedGetter( + intValue = 1162087447 ) - @Export("scrollBarSprites") - static IndexedSprite[] scrollBarSprites; + @Export("js5Port") + static int js5Port; - @ObfuscatedName("h") + @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "(Ljz;Ljz;B)I", - garbageValue = "-64" + descriptor = "(Ljs;Ljs;I)I", + garbageValue = "1946951772" ) @Export("compare_bridged") int compare_bridged(GrandExchangeEvent var1, GrandExchangeEvent var2) { @@ -31,35 +32,4 @@ final class GrandExchangeOfferTotalQuantityComparator implements Comparator { public boolean equals(Object var1) { return super.equals(var1); // L: 77 } - - @ObfuscatedName("hi") - @ObfuscatedSignature( - descriptor = "(Lcj;II)V", - garbageValue = "1442681811" - ) - static final void method4972(Actor var0, int var1) { - PcmPlayer.worldToScreen(var0.x, var0.y, var1); // L: 5414 - } // L: 5415 - - @ObfuscatedName("jq") - @ObfuscatedSignature( - descriptor = "(Ljava/lang/String;Liv;B)Ljava/lang/String;", - garbageValue = "12" - ) - static String method4979(String var0, Widget var1) { - if (var0.indexOf("%") != -1) { // L: 9998 - for (int var2 = 1; var2 <= 5; ++var2) { // L: 9999 - while (true) { - int var3 = var0.indexOf("%" + var2); // L: 10001 - if (var3 == -1) { // L: 10002 - break; - } - - var0 = var0.substring(0, var3) + GrandExchangeOfferOwnWorldComparator.method1214(class161.method3150(var1, var2 - 1)) + var0.substring(var3 + 2); // L: 10003 - } - } - } - - return var0; // L: 10007 - } } diff --git a/runescape-client/src/main/java/GrandExchangeOfferUnitPriceComparator.java b/runescape-client/src/main/java/GrandExchangeOfferUnitPriceComparator.java index 4c79654bb4..8436fc5f81 100644 --- a/runescape-client/src/main/java/GrandExchangeOfferUnitPriceComparator.java +++ b/runescape-client/src/main/java/GrandExchangeOfferUnitPriceComparator.java @@ -1,47 +1,36 @@ 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; -@ObfuscatedName("jy") +@ObfuscatedName("jz") @Implements("GrandExchangeOfferUnitPriceComparator") final class GrandExchangeOfferUnitPriceComparator implements Comparator { - @ObfuscatedName("so") + @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "Lbo;" - ) - @Export("friendSystem") - public static FriendSystem friendSystem; - @ObfuscatedName("i") - @ObfuscatedSignature( - descriptor = "Lof;" - ) - @Export("options_buttons_0Sprite") - static IndexedSprite options_buttons_0Sprite; - @ObfuscatedName("mf") - @ObfuscatedGetter( - intValue = -241051859 - ) - @Export("selectedSpellFlags") - static int selectedSpellFlags; - - @ObfuscatedName("h") - @ObfuscatedSignature( - descriptor = "(Ljz;Ljz;I)I", - garbageValue = "-2067115084" + descriptor = "(Ljs;Ljs;I)I", + garbageValue = "2126049073" ) @Export("compare_bridged") int compare_bridged(GrandExchangeEvent var1, GrandExchangeEvent var2) { return var1.grandExchangeOffer.unitPrice < var2.grandExchangeOffer.unitPrice ? -1 : (var2.grandExchangeOffer.unitPrice == var1.grandExchangeOffer.unitPrice ? 0 : 1); // L: 43 } + public int compare(Object var1, Object var2) { + return this.compare_bridged((GrandExchangeEvent)var1, (GrandExchangeEvent)var2); // L: 47 + } + public boolean equals(Object var1) { return super.equals(var1); // L: 51 } - public int compare(Object var1, Object var2) { - return this.compare_bridged((GrandExchangeEvent)var1, (GrandExchangeEvent)var2); // L: 47 - } + @ObfuscatedName("v") + @ObfuscatedSignature( + descriptor = "(Ljv;B)V", + garbageValue = "55" + ) + public static void method5109(AbstractArchive var0) { + EnumComposition.EnumDefinition_archive = var0; // L: 25 + } // L: 26 } diff --git a/runescape-client/src/main/java/GrandExchangeOfferWorldComparator.java b/runescape-client/src/main/java/GrandExchangeOfferWorldComparator.java index 7ff034939a..9e7a92366b 100644 --- a/runescape-client/src/main/java/GrandExchangeOfferWorldComparator.java +++ b/runescape-client/src/main/java/GrandExchangeOfferWorldComparator.java @@ -4,13 +4,13 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("jl") +@ObfuscatedName("jj") @Implements("GrandExchangeOfferWorldComparator") final class GrandExchangeOfferWorldComparator implements Comparator { - @ObfuscatedName("h") + @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "(Ljz;Ljz;I)I", - garbageValue = "54151939" + descriptor = "(Ljs;Ljs;I)I", + garbageValue = "78911903" ) @Export("compare_bridged") int compare_bridged(GrandExchangeEvent var1, GrandExchangeEvent var2) { @@ -25,56 +25,20 @@ final class GrandExchangeOfferWorldComparator implements Comparator { return super.equals(var1); // L: 36 } - @ObfuscatedName("c") + @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "(III)I", - garbageValue = "-1109160711" + descriptor = "([BZI)Ljava/lang/Object;", + garbageValue = "-1900092184" ) - @Export("ItemContainer_getCount") - static int ItemContainer_getCount(int var0, int var1) { - ItemContainer var2 = (ItemContainer)ItemContainer.itemContainers.get((long)var0); // L: 21 - if (var2 == null) { // L: 22 - return 0; + public static Object method5079(byte[] var0, boolean var1) { + if (var0 == null) { // L: 7 + return null; + } else if (var0.length > 136) { // L: 8 + DirectByteArrayCopier var2 = new DirectByteArrayCopier(); // L: 10 + var2.set(var0); // L: 11 + return var2; // L: 12 } else { - return var1 >= 0 && var1 < var2.quantities.length ? var2.quantities[var1] : 0; // L: 23 24 + return var0; // L: 25 } } - - @ObfuscatedName("b") - @ObfuscatedSignature( - descriptor = "(CI)Z", - garbageValue = "-514625373" - ) - @Export("isDigit") - public static boolean isDigit(char var0) { - return var0 >= '0' && var0 <= '9'; // L: 155 - } - - @ObfuscatedName("kq") - @ObfuscatedSignature( - descriptor = "(IIII)Lcl;", - garbageValue = "-1358292624" - ) - static final InterfaceParent method5010(int var0, int var1, int var2) { - InterfaceParent var3 = new InterfaceParent(); // L: 11321 - var3.group = var1; // L: 11322 - var3.type = var2; // L: 11323 - Client.interfaceParents.put(var3, (long)var0); // L: 11324 - ApproximateRouteStrategy.Widget_resetModelFrames(var1); // L: 11325 - Widget var4 = DevicePcmPlayerProvider.getWidget(var0); // L: 11326 - VerticalAlignment.invalidateWidget(var4); // L: 11327 - if (Client.meslayerContinueWidget != null) { // L: 11328 - VerticalAlignment.invalidateWidget(Client.meslayerContinueWidget); // L: 11329 - Client.meslayerContinueWidget = null; // L: 11330 - } - - GrandExchangeOfferOwnWorldComparator.method1212(); // L: 11332 - ApproximateRouteStrategy.revalidateWidgetScroll(Widget.Widget_interfaceComponents[var0 >> 16], var4, false); // L: 11333 - HealthBar.runWidgetOnLoadListener(var1); // L: 11334 - if (Client.rootInterface != -1) { // L: 11335 - LoginType.runIntfCloseListeners(Client.rootInterface, 1); - } - - return var3; // L: 11336 - } } diff --git a/runescape-client/src/main/java/GraphicsDefaults.java b/runescape-client/src/main/java/GraphicsDefaults.java index d3b6fece7c..9443720a40 100644 --- a/runescape-client/src/main/java/GraphicsDefaults.java +++ b/runescape-client/src/main/java/GraphicsDefaults.java @@ -4,90 +4,90 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("lg") +@ObfuscatedName("lz") @Implements("GraphicsDefaults") public class GraphicsDefaults { - @ObfuscatedName("h") + @ObfuscatedName("v") @ObfuscatedGetter( - intValue = 1395626587 + intValue = -1949566455 ) @Export("compass") public int compass; - @ObfuscatedName("c") + @ObfuscatedName("n") @ObfuscatedGetter( - intValue = -489214437 + intValue = -1513831133 ) - public int field3915; - @ObfuscatedName("o") + public int field3897; + @ObfuscatedName("f") @ObfuscatedGetter( - intValue = 1090663559 + intValue = 791427789 ) @Export("mapScenes") public int mapScenes; - @ObfuscatedName("g") + @ObfuscatedName("y") @ObfuscatedGetter( - intValue = -722037607 + intValue = -14842639 ) @Export("headIconsPk") public int headIconsPk; - @ObfuscatedName("l") + @ObfuscatedName("p") @ObfuscatedGetter( - intValue = 1949905153 + intValue = 765584361 ) - public int field3908; - @ObfuscatedName("z") + public int field3900; + @ObfuscatedName("j") @ObfuscatedGetter( - intValue = 2078884559 + intValue = -1577822991 ) - public int field3909; - @ObfuscatedName("t") + public int field3901; + @ObfuscatedName("r") @ObfuscatedGetter( - intValue = -1596503367 + intValue = -1223274063 ) - public int field3910; - @ObfuscatedName("v") - @ObfuscatedGetter( - intValue = -898287369 - ) - public int field3914; + public int field3905; @ObfuscatedName("b") @ObfuscatedGetter( - intValue = -1050617327 + intValue = -1228774673 + ) + public int field3903; + @ObfuscatedName("d") + @ObfuscatedGetter( + intValue = -353348843 ) public int field3904; - @ObfuscatedName("q") + @ObfuscatedName("s") @ObfuscatedGetter( - intValue = 1817726075 + intValue = 1865970227 ) - public int field3913; - @ObfuscatedName("i") + public int field3898; + @ObfuscatedName("u") @ObfuscatedGetter( - intValue = 854072411 + intValue = 1606283035 ) - public int field3916; + public int field3906; public GraphicsDefaults() { this.compass = -1; // L: 7 - this.field3915 = -1; // L: 8 + this.field3897 = -1; // L: 8 this.mapScenes = -1; // L: 9 this.headIconsPk = -1; // L: 10 - this.field3908 = -1; // L: 11 - this.field3909 = -1; // L: 12 - this.field3910 = -1; // L: 13 - this.field3914 = -1; // L: 14 + this.field3900 = -1; // L: 11 + this.field3901 = -1; // L: 12 + this.field3905 = -1; // L: 13 + this.field3903 = -1; // L: 14 this.field3904 = -1; // L: 15 - this.field3913 = -1; // L: 16 - this.field3916 = -1; // L: 17 + this.field3898 = -1; // L: 16 + this.field3906 = -1; // L: 17 } - @ObfuscatedName("h") + @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "(Ljp;I)V", - garbageValue = "301330792" + descriptor = "(Ljv;B)V", + garbageValue = "-61" ) @Export("decode") public void decode(AbstractArchive var1) { - byte[] var2 = var1.takeFileFlat(DefaultsGroup.field3903.group); // L: 20 + byte[] var2 = var1.takeFileFlat(DefaultsGroup.field3892.group); // L: 20 Buffer var3 = new Buffer(var2); // L: 21 while (true) { @@ -101,81 +101,18 @@ public class GraphicsDefaults { var3.readMedium(); // L: 28 break; case 2: - this.compass = var3.method6464(); // L: 33 - this.field3915 = var3.method6464(); // L: 34 - this.mapScenes = var3.method6464(); // L: 35 - this.headIconsPk = var3.method6464(); // L: 36 - this.field3908 = var3.method6464(); // L: 37 - this.field3909 = var3.method6464(); // L: 38 - this.field3910 = var3.method6464(); // L: 39 - this.field3914 = var3.method6464(); // L: 40 - this.field3904 = var3.method6464(); // L: 41 - this.field3913 = var3.method6464(); // L: 42 - this.field3916 = var3.method6464(); // L: 43 + this.compass = var3.method6583(); // L: 33 + this.field3897 = var3.method6583(); // L: 34 + this.mapScenes = var3.method6583(); // L: 35 + this.headIconsPk = var3.method6583(); // L: 36 + this.field3900 = var3.method6583(); // L: 37 + this.field3901 = var3.method6583(); // L: 38 + this.field3905 = var3.method6583(); // L: 39 + this.field3903 = var3.method6583(); // L: 40 + this.field3904 = var3.method6583(); // L: 41 + this.field3898 = var3.method6583(); // L: 42 + this.field3906 = var3.method6583(); // L: 43 } } } - - @ObfuscatedName("h") - @ObfuscatedSignature( - descriptor = "(Ljp;Ljp;I)I", - garbageValue = "-1709043428" - ) - static int method5825(AbstractArchive var0, AbstractArchive var1) { - int var2 = 0; // L: 124 - if (var0.tryLoadFileByNames("title.jpg", "")) { // L: 125 - ++var2; - } - - if (var1.tryLoadFileByNames("logo", "")) { // L: 126 - ++var2; - } - - if (var1.tryLoadFileByNames("logo_deadman_mode", "")) { // L: 127 - ++var2; - } - - if (var1.tryLoadFileByNames("logo_seasonal_mode", "")) { // L: 128 - ++var2; - } - - if (var1.tryLoadFileByNames("titlebox", "")) { // L: 129 - ++var2; - } - - if (var1.tryLoadFileByNames("titlebutton", "")) { // L: 130 - ++var2; - } - - if (var1.tryLoadFileByNames("runes", "")) { // L: 131 - ++var2; - } - - if (var1.tryLoadFileByNames("title_mute", "")) { - ++var2; // L: 132 - } - - if (var1.tryLoadFileByNames("options_radio_buttons,0", "")) { // L: 133 - ++var2; - } - - if (var1.tryLoadFileByNames("options_radio_buttons,2", "")) { // L: 134 - ++var2; - } - - if (var1.tryLoadFileByNames("options_radio_buttons,4", "")) { // L: 135 - ++var2; - } - - if (var1.tryLoadFileByNames("options_radio_buttons,6", "")) { // L: 136 - ++var2; - } - - var1.tryLoadFileByNames("sl_back", ""); // L: 137 - var1.tryLoadFileByNames("sl_flags", ""); // L: 138 - var1.tryLoadFileByNames("sl_arrows", ""); // L: 139 - var1.tryLoadFileByNames("sl_stars", ""); // L: 140 - var1.tryLoadFileByNames("sl_button", ""); // L: 141 - return var2; // L: 142 - } } diff --git a/runescape-client/src/main/java/GraphicsObject.java b/runescape-client/src/main/java/GraphicsObject.java index 1c469fe3e5..145b3d8d05 100644 --- a/runescape-client/src/main/java/GraphicsObject.java +++ b/runescape-client/src/main/java/GraphicsObject.java @@ -3,65 +3,66 @@ 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("ch") +@ObfuscatedName("cm") @Implements("GraphicsObject") public final class GraphicsObject extends Renderable { - @ObfuscatedName("h") + @ObfuscatedName("v") @ObfuscatedGetter( - intValue = 652996061 + intValue = -177863619 ) @Export("id") int id; - @ObfuscatedName("c") + @ObfuscatedName("n") @ObfuscatedGetter( - intValue = 791668409 + intValue = 2035613177 ) @Export("cycleStart") int cycleStart; - @ObfuscatedName("o") + @ObfuscatedName("f") @ObfuscatedGetter( - intValue = -188159569 + intValue = -1151722421 ) @Export("plane") int plane; - @ObfuscatedName("g") - @ObfuscatedGetter( - intValue = 1936566135 - ) - @Export("x") - int x; - @ObfuscatedName("l") - @ObfuscatedGetter( - intValue = -1356555865 - ) - @Export("y") - int y; - @ObfuscatedName("z") - @ObfuscatedGetter( - intValue = -2049551863 - ) - @Export("height") - int height; - @ObfuscatedName("t") + @ObfuscatedName("y") @ObfuscatedSignature( - descriptor = "Lfb;" + descriptor = "Lfl;" ) @Export("sequenceDefinition") SequenceDefinition sequenceDefinition; - @ObfuscatedName("v") + @ObfuscatedName("p") @ObfuscatedGetter( - intValue = 938422053 + intValue = 886051665 + ) + @Export("x") + int x; + @ObfuscatedName("j") + @ObfuscatedGetter( + intValue = -1737947099 + ) + @Export("y") + int y; + @ObfuscatedName("r") + @ObfuscatedGetter( + intValue = 1509450081 + ) + @Export("height") + int height; + @ObfuscatedName("b") + @ObfuscatedGetter( + intValue = 1147002155 ) @Export("frame") int frame; - @ObfuscatedName("b") + @ObfuscatedName("d") @ObfuscatedGetter( - intValue = -1003613529 + intValue = -1179440823 ) @Export("frameCycle") int frameCycle; - @ObfuscatedName("q") + @ObfuscatedName("s") @Export("isFinished") boolean isFinished; @@ -75,24 +76,24 @@ public final class GraphicsObject extends Renderable { this.y = var4; // L: 24 this.height = var5; // L: 25 this.cycleStart = var7 + var6; // L: 26 - int var8 = Friend.SpotAnimationDefinition_get(this.id).sequence; // L: 27 + int var8 = VarcInt.SpotAnimationDefinition_get(this.id).sequence; // L: 27 if (var8 != -1) { // L: 28 this.isFinished = false; // L: 29 - this.sequenceDefinition = Player.SequenceDefinition_get(var8); // L: 30 + this.sequenceDefinition = LoginScreenAnimation.SequenceDefinition_get(var8); // L: 30 } else { this.isFinished = true; // L: 32 } - } + } // L: 33 - @ObfuscatedName("h") + @ObfuscatedName("v") @ObfuscatedSignature( descriptor = "(II)V", - garbageValue = "1887073818" + garbageValue = "-1622052519" ) @Export("advance") final void advance(int var1) { - if (!this.isFinished) { + if (!this.isFinished) { // L: 36 this.frameCycle += var1; // L: 37 while (this.frameCycle > this.sequenceDefinition.frameLengths[this.frame]) { // L: 38 @@ -107,14 +108,14 @@ public final class GraphicsObject extends Renderable { } } // L: 46 - @ObfuscatedName("c") + @ObfuscatedName("n") @ObfuscatedSignature( - descriptor = "(I)Lgj;", - garbageValue = "-220627570" + descriptor = "(B)Lgr;", + garbageValue = "-76" ) @Export("getModel") protected final Model getModel() { - SpotAnimationDefinition var1 = Friend.SpotAnimationDefinition_get(this.id); // L: 49 + SpotAnimationDefinition var1 = VarcInt.SpotAnimationDefinition_get(this.id); // L: 49 Model var2; if (!this.isFinished) { // L: 51 var2 = var1.getModel(this.frame); @@ -125,41 +126,304 @@ public final class GraphicsObject extends Renderable { return var2 == null ? null : var2; // L: 53 } - @ObfuscatedName("c") + @ObfuscatedName("b") @ObfuscatedSignature( - descriptor = "(Lmo;III)I", - garbageValue = "-1747152974" + descriptor = "(Ljava/lang/CharSequence;I)I", + garbageValue = "-1841267567" ) - static int method1937(IterableNodeHashTable var0, int var1, int var2) { - if (var0 == null) { // L: 33 - return var2; - } else { - IntegerNode var3 = (IntegerNode)var0.get((long)var1); // L: 34 - return var3 == null ? var2 : var3.integer; // L: 35 36 + @Export("hashString") + public static int hashString(CharSequence var0) { + int var1 = var0.length(); // L: 127 + int var2 = 0; // L: 128 + + for (int var3 = 0; var3 < var1; ++var3) { // L: 129 + var2 = (var2 << 5) - var2 + ServerPacket.charToByteCp1252(var0.charAt(var3)); } + + return var2; // L: 130 } @ObfuscatedName("b") @ObfuscatedSignature( - descriptor = "(B)Lof;", - garbageValue = "104" + descriptor = "(I)Lbg;", + garbageValue = "503233534" ) - static IndexedSprite method1938() { - IndexedSprite var0 = new IndexedSprite(); // L: 165 - var0.width = class396.SpriteBuffer_spriteWidth; // L: 166 - var0.height = class396.SpriteBuffer_spriteHeight; // L: 167 - var0.xOffset = class243.SpriteBuffer_xOffsets[0]; // L: 168 - var0.yOffset = class396.SpriteBuffer_yOffsets[0]; // L: 169 - var0.subWidth = ArchiveDiskActionHandler.SpriteBuffer_spriteWidths[0]; // L: 170 - var0.subHeight = class372.SpriteBuffer_spriteHeights[0]; // L: 171 - var0.palette = AccessFile.SpriteBuffer_spritePalette; // L: 172 - var0.pixels = class396.SpriteBuffer_pixels[0]; // L: 173 - class243.SpriteBuffer_xOffsets = null; // L: 175 - class396.SpriteBuffer_yOffsets = null; // L: 176 - ArchiveDiskActionHandler.SpriteBuffer_spriteWidths = null; // L: 177 - class372.SpriteBuffer_spriteHeights = null; // L: 178 - AccessFile.SpriteBuffer_spritePalette = null; // L: 179 - class396.SpriteBuffer_pixels = null; // L: 180 - return var0; // L: 182 + @Export("getNextWorldListWorld") + static World getNextWorldListWorld() { + return World.World_listCount < World.World_count ? Tiles.World_worlds[++World.World_listCount - 1] : null; // L: 252 253 } + + @ObfuscatedName("av") + @ObfuscatedSignature( + descriptor = "(ILcf;ZI)I", + garbageValue = "-510374773" + ) + static int method1892(int var0, Script var1, boolean var2) { + if (var0 == ScriptOpcodes.WORLDLIST_FETCH) { // L: 3591 + Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = SoundSystem.loadWorlds() ? 1 : 0; // L: 3592 + return 1; // L: 3593 + } else { + World var9; + if (var0 == ScriptOpcodes.WORLDLIST_START) { // L: 3595 + var9 = SpotAnimationDefinition.worldListStart(); // L: 3596 + if (var9 != null) { // L: 3597 + Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = var9.id; // L: 3598 + Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = var9.properties; // L: 3599 + Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var9.activity; // L: 3600 + Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = var9.location; // L: 3601 + Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = var9.population; // L: 3602 + Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var9.host; // L: 3603 + } else { + Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = -1; // L: 3606 + Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = 0; // L: 3607 + Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = ""; // L: 3608 + Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = 0; // L: 3609 + Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = 0; // L: 3610 + Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = ""; // L: 3611 + } + + return 1; // L: 3613 + } else if (var0 == ScriptOpcodes.WORLDLIST_NEXT) { // L: 3615 + var9 = getNextWorldListWorld(); // L: 3616 + if (var9 != null) { // L: 3617 + Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = var9.id; // L: 3618 + Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = var9.properties; // L: 3619 + Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var9.activity; // L: 3620 + Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = var9.location; // L: 3621 + Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = var9.population; // L: 3622 + Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var9.host; // L: 3623 + } else { + Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = -1; // L: 3626 + Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = 0; // L: 3627 + Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = ""; // L: 3628 + Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = 0; // L: 3629 + Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = 0; // L: 3630 + Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = ""; // L: 3631 + } + + return 1; // L: 3633 + } else { + int var3; + World var7; + int var8; + if (var0 == ScriptOpcodes.WORLDLIST_SPECIFIC) { // L: 3635 + var3 = Interpreter.Interpreter_intStack[--class44.Interpreter_intStackSize]; // L: 3636 + var7 = null; // L: 3637 + + for (var8 = 0; var8 < World.World_count; ++var8) { // L: 3638 + if (var3 == Tiles.World_worlds[var8].id) { // L: 3639 + var7 = Tiles.World_worlds[var8]; // L: 3640 + break; + } + } + + if (var7 != null) { // L: 3644 + Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = var7.id; // L: 3645 + Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = var7.properties; // L: 3646 + Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var7.activity; // L: 3647 + Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = var7.location; // L: 3648 + Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = var7.population; // L: 3649 + Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var7.host; // L: 3650 + } else { + Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = -1; // L: 3653 + Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = 0; // L: 3654 + Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = ""; // L: 3655 + Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = 0; // L: 3656 + Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = 0; // L: 3657 + Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = ""; // L: 3658 + } + + return 1; // L: 3660 + } else if (var0 == ScriptOpcodes.WORLDLIST_SORT) { // L: 3662 + class44.Interpreter_intStackSize -= 4; // L: 3663 + var3 = Interpreter.Interpreter_intStack[class44.Interpreter_intStackSize]; // L: 3664 + boolean var10 = Interpreter.Interpreter_intStack[class44.Interpreter_intStackSize + 1] == 1; // L: 3665 + var8 = Interpreter.Interpreter_intStack[class44.Interpreter_intStackSize + 2]; // L: 3666 + boolean var6 = Interpreter.Interpreter_intStack[class44.Interpreter_intStackSize + 3] == 1; // L: 3667 + DirectByteArrayCopier.sortWorldList(var3, var10, var8, var6); // L: 3668 + return 1; // L: 3669 + } else if (var0 != ScriptOpcodes.GETWORLDINFO) { // L: 3671 + if (var0 == ScriptOpcodes.SETFOLLOWEROPSLOWPRIORITY) { // L: 3692 + Client.followerOpsLowPriority = Interpreter.Interpreter_intStack[--class44.Interpreter_intStackSize] == 1; // L: 3693 + return 1; // L: 3694 + } else { + int var4; + ParamComposition var5; + if (var0 == ScriptOpcodes.NC_PARAM) { // L: 3696 + class44.Interpreter_intStackSize -= 2; // L: 3697 + var3 = Interpreter.Interpreter_intStack[class44.Interpreter_intStackSize]; // L: 3698 + var4 = Interpreter.Interpreter_intStack[class44.Interpreter_intStackSize + 1]; // L: 3699 + var5 = Varcs.getParamDefinition(var4); // L: 3700 + if (var5.isString()) { // L: 3701 + Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = StructComposition.getNpcDefinition(var3).getStringParam(var4, var5.defaultStr); // L: 3702 + } else { + Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = StructComposition.getNpcDefinition(var3).getIntParam(var4, var5.defaultInt); // L: 3705 + } + + return 1; // L: 3707 + } else if (var0 == ScriptOpcodes.LC_PARAM) { // L: 3709 + class44.Interpreter_intStackSize -= 2; // L: 3710 + var3 = Interpreter.Interpreter_intStack[class44.Interpreter_intStackSize]; // L: 3711 + var4 = Interpreter.Interpreter_intStack[class44.Interpreter_intStackSize + 1]; // L: 3712 + var5 = Varcs.getParamDefinition(var4); // L: 3713 + if (var5.isString()) { // L: 3714 + Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = class23.getObjectDefinition(var3).getStringParam(var4, var5.defaultStr); // L: 3715 + } else { + Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = class23.getObjectDefinition(var3).getIntParam(var4, var5.defaultInt); // L: 3718 + } + + return 1; // L: 3720 + } else if (var0 == ScriptOpcodes.OC_PARAM) { // L: 3722 + class44.Interpreter_intStackSize -= 2; // L: 3723 + var3 = Interpreter.Interpreter_intStack[class44.Interpreter_intStackSize]; // L: 3724 + var4 = Interpreter.Interpreter_intStack[class44.Interpreter_intStackSize + 1]; // L: 3725 + var5 = Varcs.getParamDefinition(var4); // L: 3726 + if (var5.isString()) { // L: 3727 + Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = class260.ItemDefinition_get(var3).getStringParam(var4, var5.defaultStr); // L: 3728 + } else { + Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = class260.ItemDefinition_get(var3).getIntParam(var4, var5.defaultInt); // L: 3731 + } + + return 1; // L: 3733 + } else if (var0 == ScriptOpcodes.STRUCT_PARAM) { // L: 3735 + class44.Interpreter_intStackSize -= 2; // L: 3736 + var3 = Interpreter.Interpreter_intStack[class44.Interpreter_intStackSize]; // L: 3737 + var4 = Interpreter.Interpreter_intStack[class44.Interpreter_intStackSize + 1]; // L: 3738 + var5 = Varcs.getParamDefinition(var4); // L: 3739 + if (var5.isString()) { // L: 3740 + Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = ArchiveLoader.StructDefinition_getStructDefinition(var3).getStringParam(var4, var5.defaultStr); // L: 3741 + } else { + Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = ArchiveLoader.StructDefinition_getStructDefinition(var3).getIntParam(var4, var5.defaultInt); // L: 3744 + } + + return 1; // L: 3746 + } else if (var0 == ScriptOpcodes.ON_MOBILE) { // L: 3748 + Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = Client.onMobile ? 1 : 0; // L: 3749 + return 1; // L: 3750 + } else if (var0 == ScriptOpcodes.CLIENTTYPE) { // L: 3752 + Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = Client.clientType & 3; // L: 3753 + return 1; // L: 3754 + } else if (var0 == 6520) { // L: 3756 + return 1; // L: 3757 + } else if (var0 == ScriptOpcodes.MOBILE_KEYBOARDHIDE) { // L: 3759 + return 1; // L: 3760 + } else if (var0 == 6522) { // L: 3762 + --Interpreter.Interpreter_stringStackSize; // L: 3763 + --class44.Interpreter_intStackSize; // L: 3764 + return 1; // L: 3765 + } else if (var0 == 6523) { // L: 3767 + --Interpreter.Interpreter_stringStackSize; // L: 3768 + --class44.Interpreter_intStackSize; // L: 3769 + return 1; // L: 3770 + } else if (var0 == ScriptOpcodes.BATTERYLEVEL) { // L: 3772 + Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = -1; // L: 3773 + return 1; // L: 3774 + } else if (var0 == ScriptOpcodes.BATTERYCHARGING) { // L: 3776 + Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = 1; // L: 3777 + return 1; // L: 3778 + } else if (var0 == ScriptOpcodes.WIFIAVAILABLE) { // L: 3780 + Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = 1; // L: 3781 + return 1; // L: 3782 + } else if (var0 == 6527) { // L: 3784 + Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = Client.field643; // L: 3785 + return 1; // L: 3786 + } else { + return 2; // L: 3788 + } + } + } else { + var3 = Interpreter.Interpreter_intStack[--class44.Interpreter_intStackSize]; // L: 3672 + if (var3 >= 0 && var3 < World.World_count) { // L: 3673 + var7 = Tiles.World_worlds[var3]; // L: 3674 + Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = var7.id; // L: 3675 + Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = var7.properties; // L: 3676 + Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var7.activity; // L: 3677 + Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = var7.location; // L: 3678 + Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = var7.population; // L: 3679 + Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var7.host; // L: 3680 + } else { + Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = -1; // L: 3683 + Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = 0; // L: 3684 + Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = ""; // L: 3685 + Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = 0; // L: 3686 + Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = 0; // L: 3687 + Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = ""; // L: 3688 + } + + return 1; // L: 3690 + } + } + } + } + + @ObfuscatedName("ht") + @ObfuscatedSignature( + descriptor = "(IB)V", + garbageValue = "-27" + ) + @Export("createMinimapSprite") + static final void createMinimapSprite(int var0) { + int[] var1 = GameEngine.sceneMinimapSprite.pixels; // L: 5569 + int var2 = var1.length; // L: 5570 + + int var3; + for (var3 = 0; var3 < var2; ++var3) { // L: 5571 + var1[var3] = 0; + } + + int var4; + int var5; + for (var3 = 1; var3 < 103; ++var3) { // L: 5572 + var4 = (103 - var3) * 2048 + 24628; // L: 5573 + + for (var5 = 1; var5 < 103; ++var5) { // L: 5574 + if ((Tiles.Tiles_renderFlags[var0][var5][var3] & 24) == 0) { // L: 5575 + AbstractSocket.scene.drawTileMinimap(var1, var4, 512, var0, var5, var3); + } + + if (var0 < 3 && (Tiles.Tiles_renderFlags[var0 + 1][var5][var3] & 8) != 0) { // L: 5576 + AbstractSocket.scene.drawTileMinimap(var1, var4, 512, var0 + 1, var5, var3); + } + + var4 += 4; // L: 5577 + } + } + + var3 = (238 + (int)(Math.random() * 20.0D) - 10 << 16) + (238 + (int)(Math.random() * 20.0D) - 10 << 8) + (238 + (int)(Math.random() * 20.0D) - 10); // L: 5580 + var4 = 238 + (int)(Math.random() * 20.0D) - 10 << 16; // L: 5581 + GameEngine.sceneMinimapSprite.setRaster(); // L: 5582 + + int var6; + for (var5 = 1; var5 < 103; ++var5) { // L: 5583 + for (var6 = 1; var6 < 103; ++var6) { // L: 5584 + if ((Tiles.Tiles_renderFlags[var0][var6][var5] & 24) == 0) { // L: 5585 + Coord.drawObject(var0, var6, var5, var3, var4); + } + + if (var0 < 3 && (Tiles.Tiles_renderFlags[var0 + 1][var6][var5] & 8) != 0) { // L: 5586 + Coord.drawObject(var0 + 1, var6, var5, var3, var4); + } + } + } + + Client.mapIconCount = 0; // L: 5589 + + for (var5 = 0; var5 < 104; ++var5) { // L: 5590 + for (var6 = 0; var6 < 104; ++var6) { // L: 5591 + long var7 = AbstractSocket.scene.getFloorDecorationTag(class22.Client_plane, var5, var6); // L: 5592 + if (var7 != 0L) { // L: 5593 + int var9 = class93.Entity_unpackID(var7); // L: 5594 + int var10 = class23.getObjectDefinition(var9).mapIconId; // L: 5595 + if (var10 >= 0 && class6.WorldMapElement_get(var10).field1561) { // L: 5596 5597 + Client.mapIcons[Client.mapIconCount] = class6.WorldMapElement_get(var10).getSpriteBool(false); // L: 5600 + Client.mapIconXs[Client.mapIconCount] = var5; // L: 5601 + Client.mapIconYs[Client.mapIconCount] = var6; // L: 5602 + ++Client.mapIconCount; // L: 5603 + } + } + } + } + + class26.rasterProvider.apply(); // L: 5608 + } // L: 5609 } diff --git a/runescape-client/src/main/java/HealthBar.java b/runescape-client/src/main/java/HealthBar.java index e21e6a8691..90d8e04657 100644 --- a/runescape-client/src/main/java/HealthBar.java +++ b/runescape-client/src/main/java/HealthBar.java @@ -2,58 +2,54 @@ 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("ca") +@ObfuscatedName("cw") @Implements("HealthBar") public class HealthBar extends Node { - @ObfuscatedName("gd") - @Export("regions") - static int[] regions; - @ObfuscatedName("o") + @ObfuscatedName("f") @ObfuscatedSignature( - descriptor = "Lej;" + descriptor = "Let;" ) @Export("definition") HealthBarDefinition definition; - @ObfuscatedName("g") + @ObfuscatedName("y") @ObfuscatedSignature( - descriptor = "Lko;" + descriptor = "Lki;" ) @Export("updates") IterableNodeDeque updates; @ObfuscatedSignature( - descriptor = "(Lej;)V" + descriptor = "(Let;)V" ) HealthBar(HealthBarDefinition var1) { this.updates = new IterableNodeDeque(); // L: 12 this.definition = var1; // L: 15 - } + } // L: 16 - @ObfuscatedName("h") + @ObfuscatedName("v") @ObfuscatedSignature( descriptor = "(IIIII)V", - garbageValue = "1388423843" + garbageValue = "-2108595638" ) @Export("put") void put(int var1, int var2, int var3, int var4) { - HealthBarUpdate var5 = null; + HealthBarUpdate var5 = null; // L: 19 int var6 = 0; // L: 20 - for (HealthBarUpdate var7 = (HealthBarUpdate)this.updates.last(); var7 != null; var7 = (HealthBarUpdate)this.updates.previous()) { - ++var6; - if (var7.cycle == var1) { + for (HealthBarUpdate var7 = (HealthBarUpdate)this.updates.last(); var7 != null; var7 = (HealthBarUpdate)this.updates.previous()) { // L: 21 + ++var6; // L: 22 + if (var7.cycle == var1) { // L: 23 var7.set(var1, var2, var3, var4); // L: 24 - return; + return; // L: 25 } - if (var7.cycle <= var1) { + if (var7.cycle <= var1) { // L: 27 var5 = var7; } } - if (var5 == null) { + if (var5 == null) { // L: 29 if (var6 < 4) { // L: 30 this.updates.addLast(new HealthBarUpdate(var1, var2, var3, var4)); } @@ -67,10 +63,10 @@ public class HealthBar extends Node { } } // L: 31 35 - @ObfuscatedName("c") + @ObfuscatedName("n") @ObfuscatedSignature( - descriptor = "(II)Lcy;", - garbageValue = "-1813556269" + descriptor = "(IB)Lcx;", + garbageValue = "-3" ) @Export("get") HealthBarUpdate get(int var1) { @@ -92,237 +88,13 @@ public class HealthBar extends Node { } } - @ObfuscatedName("o") + @ObfuscatedName("f") @ObfuscatedSignature( descriptor = "(I)Z", - garbageValue = "-1134289303" + garbageValue = "1762138493" ) @Export("isEmpty") boolean isEmpty() { - return this.updates.method5149(); // L: 55 + return this.updates.method5236(); // L: 55 } - - @ObfuscatedName("h") - @ObfuscatedSignature( - descriptor = "(Lnk;Lmo;I)Lmo;", - garbageValue = "-159166525" - ) - @Export("readStringIntParameters") - static final IterableNodeHashTable readStringIntParameters(Buffer var0, IterableNodeHashTable var1) { - int var2 = var0.readUnsignedByte(); // L: 16 - int var3; - if (var1 == null) { // L: 17 - var3 = MouseRecorder.method2126(var2); // L: 18 - var1 = new IterableNodeHashTable(var3); // L: 19 - } - - for (var3 = 0; var3 < var2; ++var3) { // L: 21 - boolean var4 = var0.readUnsignedByte() == 1; // L: 22 - int var5 = var0.readMedium(); // L: 23 - Object var6; - if (var4) { - var6 = new ObjectNode(var0.readStringCp1252NullTerminated()); // L: 25 - } else { - var6 = new IntegerNode(var0.readInt()); // L: 26 - } - - var1.put((Node)var6, (long)var5); // L: 27 - } - - return var1; // L: 29 - } - - @ObfuscatedName("c") - @ObfuscatedSignature( - descriptor = "(Lnm;IB)V", - garbageValue = "-15" - ) - @Export("updatePlayers") - static final void updatePlayers(PacketBuffer var0, int var1) { - int var2 = var0.offset; // L: 71 - Players.Players_pendingUpdateCount = 0; // L: 72 - Friend.method5550(var0); // L: 73 - - for (int var3 = 0; var3 < Players.Players_pendingUpdateCount; ++var3) { // L: 75 - int var4 = Players.Players_pendingUpdateIndices[var3]; // L: 76 - Player var5 = Client.players[var4]; // L: 77 - int var6 = var0.readUnsignedByte(); // L: 78 - if ((var6 & 128) != 0) { // L: 79 - var6 += var0.readUnsignedByte() << 8; - } - - ScriptEvent.method2116(var0, var4, var5, var6); // L: 80 - } - - if (var0.offset - var2 != var1) { // L: 83 - throw new RuntimeException(var0.offset - var2 + " " + var1); // L: 84 - } - } // L: 86 - - @ObfuscatedName("y") - @ObfuscatedSignature( - descriptor = "(ILci;ZI)I", - garbageValue = "-938940288" - ) - static int method2250(int var0, Script var1, boolean var2) { - if (var0 == ScriptOpcodes.CLIENTCLOCK) { // L: 1855 - Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = Client.cycle; // L: 1856 - return 1; // L: 1857 - } else { - int var3; - int var4; - if (var0 == ScriptOpcodes.INV_GETOBJ) { // L: 1859 - WorldMapCacheName.Interpreter_intStackSize -= 2; // L: 1860 - var3 = Interpreter.Interpreter_intStack[WorldMapCacheName.Interpreter_intStackSize]; // L: 1861 - var4 = Interpreter.Interpreter_intStack[WorldMapCacheName.Interpreter_intStackSize + 1]; // L: 1862 - Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = KeyHandler.method453(var3, var4); // L: 1863 - return 1; // L: 1864 - } else if (var0 == ScriptOpcodes.INV_GETNUM) { // L: 1866 - WorldMapCacheName.Interpreter_intStackSize -= 2; // L: 1867 - var3 = Interpreter.Interpreter_intStack[WorldMapCacheName.Interpreter_intStackSize]; // L: 1868 - var4 = Interpreter.Interpreter_intStack[WorldMapCacheName.Interpreter_intStackSize + 1]; // L: 1869 - Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = GrandExchangeOfferWorldComparator.ItemContainer_getCount(var3, var4); // L: 1870 - return 1; // L: 1871 - } else if (var0 == ScriptOpcodes.INV_TOTAL) { // L: 1873 - WorldMapCacheName.Interpreter_intStackSize -= 2; // L: 1874 - var3 = Interpreter.Interpreter_intStack[WorldMapCacheName.Interpreter_intStackSize]; // L: 1875 - var4 = Interpreter.Interpreter_intStack[WorldMapCacheName.Interpreter_intStackSize + 1]; // L: 1876 - Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = class0.method6(var3, var4); // L: 1877 - return 1; // L: 1878 - } else if (var0 == ScriptOpcodes.INV_SIZE) { // L: 1880 - var3 = Interpreter.Interpreter_intStack[--WorldMapCacheName.Interpreter_intStackSize]; // L: 1881 - Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = KitDefinition.getInvDefinition(var3).size; // L: 1882 - return 1; // L: 1883 - } else if (var0 == ScriptOpcodes.STAT) { // L: 1885 - var3 = Interpreter.Interpreter_intStack[--WorldMapCacheName.Interpreter_intStackSize]; // L: 1886 - Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = Client.currentLevels[var3]; // L: 1887 - return 1; // L: 1888 - } else if (var0 == ScriptOpcodes.STAT_BASE) { // L: 1890 - var3 = Interpreter.Interpreter_intStack[--WorldMapCacheName.Interpreter_intStackSize]; // L: 1891 - Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = Client.levels[var3]; // L: 1892 - return 1; // L: 1893 - } else if (var0 == ScriptOpcodes.STAT_XP) { // L: 1895 - var3 = Interpreter.Interpreter_intStack[--WorldMapCacheName.Interpreter_intStackSize]; // L: 1896 - Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = Client.experience[var3]; // L: 1897 - return 1; // L: 1898 - } else { - int var5; - if (var0 == ScriptOpcodes.COORD) { // L: 1900 - var3 = ParamComposition.Client_plane; // L: 1901 - var4 = (class35.localPlayer.x >> 7) + JagexCache.baseX; // L: 1902 - var5 = (class35.localPlayer.y >> 7) + Messages.baseY; // L: 1903 - Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = (var4 << 14) + var5 + (var3 << 28); // L: 1904 - return 1; // L: 1905 - } else if (var0 == ScriptOpcodes.COORDX) { // L: 1907 - var3 = Interpreter.Interpreter_intStack[--WorldMapCacheName.Interpreter_intStackSize]; // L: 1908 - Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = var3 >> 14 & 16383; // L: 1909 - return 1; // L: 1910 - } else if (var0 == ScriptOpcodes.COORDZ) { // L: 1912 - var3 = Interpreter.Interpreter_intStack[--WorldMapCacheName.Interpreter_intStackSize]; // L: 1913 - Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = var3 >> 28; // L: 1914 - return 1; // L: 1915 - } else if (var0 == ScriptOpcodes.COORDY) { // L: 1917 - var3 = Interpreter.Interpreter_intStack[--WorldMapCacheName.Interpreter_intStackSize]; // L: 1918 - Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = var3 & 16383; // L: 1919 - return 1; // L: 1920 - } else if (var0 == ScriptOpcodes.MAP_MEMBERS) { // L: 1922 - Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = Client.isMembersWorld ? 1 : 0; // L: 1923 - return 1; // L: 1924 - } else if (var0 == ScriptOpcodes.INVOTHER_GETOBJ) { // L: 1926 - WorldMapCacheName.Interpreter_intStackSize -= 2; // L: 1927 - var3 = Interpreter.Interpreter_intStack[WorldMapCacheName.Interpreter_intStackSize] + 32768; // L: 1928 - var4 = Interpreter.Interpreter_intStack[WorldMapCacheName.Interpreter_intStackSize + 1]; // L: 1929 - Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = KeyHandler.method453(var3, var4); // L: 1930 - return 1; // L: 1931 - } else if (var0 == ScriptOpcodes.INVOTHER_GETNUM) { // L: 1933 - WorldMapCacheName.Interpreter_intStackSize -= 2; // L: 1934 - var3 = Interpreter.Interpreter_intStack[WorldMapCacheName.Interpreter_intStackSize] + 32768; // L: 1935 - var4 = Interpreter.Interpreter_intStack[WorldMapCacheName.Interpreter_intStackSize + 1]; // L: 1936 - Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = GrandExchangeOfferWorldComparator.ItemContainer_getCount(var3, var4); // L: 1937 - return 1; // L: 1938 - } else if (var0 == ScriptOpcodes.INVOTHER_TOTAL) { // L: 1940 - WorldMapCacheName.Interpreter_intStackSize -= 2; // L: 1941 - var3 = Interpreter.Interpreter_intStack[WorldMapCacheName.Interpreter_intStackSize] + 32768; // L: 1942 - var4 = Interpreter.Interpreter_intStack[WorldMapCacheName.Interpreter_intStackSize + 1]; // L: 1943 - Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = class0.method6(var3, var4); // L: 1944 - return 1; // L: 1945 - } else if (var0 == ScriptOpcodes.STAFFMODLEVEL) { // L: 1947 - if (Client.staffModLevel >= 2) { // L: 1948 - Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = Client.staffModLevel; - } else { - Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = 0; // L: 1949 - } - - return 1; // L: 1950 - } else if (var0 == ScriptOpcodes.REBOOTTIMER) { // L: 1952 - Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = Client.rebootTimer; // L: 1953 - return 1; // L: 1954 - } else if (var0 == ScriptOpcodes.MAP_WORLD) { // L: 1956 - Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = Client.worldId; // L: 1957 - return 1; // L: 1958 - } else if (var0 == ScriptOpcodes.RUNENERGY_VISIBLE) { // L: 1960 - Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = Client.runEnergy; // L: 1961 - return 1; // L: 1962 - } else if (var0 == ScriptOpcodes.RUNWEIGHT_VISIBLE) { // L: 1964 - Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = Client.weight; // L: 1965 - return 1; // L: 1966 - } else if (var0 == ScriptOpcodes.PLAYERMOD) { // L: 1968 - if (Client.playerMod) { // L: 1969 - Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = 1; - } else { - Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = 0; // L: 1970 - } - - return 1; // L: 1971 - } else if (var0 == ScriptOpcodes.WORLDFLAGS) { // L: 1973 - Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = Client.worldProperties; // L: 1974 - return 1; // L: 1975 - } else if (var0 == ScriptOpcodes.MOVECOORD) { // L: 1977 - WorldMapCacheName.Interpreter_intStackSize -= 4; // L: 1978 - var3 = Interpreter.Interpreter_intStack[WorldMapCacheName.Interpreter_intStackSize]; // L: 1979 - var4 = Interpreter.Interpreter_intStack[WorldMapCacheName.Interpreter_intStackSize + 1]; // L: 1980 - var5 = Interpreter.Interpreter_intStack[WorldMapCacheName.Interpreter_intStackSize + 2]; // L: 1981 - int var6 = Interpreter.Interpreter_intStack[WorldMapCacheName.Interpreter_intStackSize + 3]; // L: 1982 - var3 += var4 << 14; // L: 1983 - var3 += var5 << 28; // L: 1984 - var3 += var6; // L: 1985 - Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = var3; // L: 1986 - return 1; // L: 1987 - } else if (var0 == 3326) { // L: 1989 - Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = Client.field627; // L: 1990 - return 1; // L: 1991 - } else if (var0 == 3327) { // L: 1993 - Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = Client.field837; // L: 1994 - return 1; // L: 1995 - } else { - return 2; // L: 1997 - } - } - } - } - - @ObfuscatedName("ab") - @ObfuscatedSignature( - descriptor = "(II)V", - garbageValue = "-1471202584" - ) - @Export("runWidgetOnLoadListener") - static void runWidgetOnLoadListener(int var0) { - if (var0 != -1) { // L: 4321 - if (UserComparator8.loadInterface(var0)) { // L: 4322 - Widget[] var1 = Widget.Widget_interfaceComponents[var0]; // L: 4323 - - for (int var2 = 0; var2 < var1.length; ++var2) { // L: 4324 - Widget var3 = var1[var2]; // L: 4325 - if (var3.onLoad != null) { // L: 4326 - ScriptEvent var4 = new ScriptEvent(); // L: 4327 - var4.widget = var3; // L: 4328 - var4.args = var3.onLoad; // L: 4329 - class243.runScript(var4, 5000000, 0); // L: 4330 - } - } - - } - } - } // L: 4333 } diff --git a/runescape-client/src/main/java/HealthBarDefinition.java b/runescape-client/src/main/java/HealthBarDefinition.java index b19e46f600..00d6faf2d5 100644 --- a/runescape-client/src/main/java/HealthBarDefinition.java +++ b/runescape-client/src/main/java/HealthBarDefinition.java @@ -3,101 +3,92 @@ 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("ej") +@ObfuscatedName("et") @Implements("HealthBarDefinition") public class HealthBarDefinition extends DualNode { - @ObfuscatedName("h") + @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "Ljp;" + descriptor = "Ljv;" ) @Export("HealthBarDefinition_archive") public static AbstractArchive HealthBarDefinition_archive; - @ObfuscatedName("c") + @ObfuscatedName("n") @ObfuscatedSignature( - descriptor = "Ljp;" + descriptor = "Ljv;" ) @Export("HitSplatDefinition_spritesArchive") public static AbstractArchive HitSplatDefinition_spritesArchive; - @ObfuscatedName("o") + @ObfuscatedName("f") @ObfuscatedSignature( - descriptor = "Lho;" + descriptor = "Lhz;" ) @Export("HealthBarDefinition_cached") - public static EvictingDualNodeHashTable HealthBarDefinition_cached; - @ObfuscatedName("g") + static EvictingDualNodeHashTable HealthBarDefinition_cached; + @ObfuscatedName("y") @ObfuscatedSignature( - descriptor = "Lho;" + descriptor = "Lhz;" ) @Export("HealthBarDefinition_cachedSprites") - public static EvictingDualNodeHashTable HealthBarDefinition_cachedSprites; - @ObfuscatedName("s") + static EvictingDualNodeHashTable HealthBarDefinition_cachedSprites; + @ObfuscatedName("eq") + static int[] field1603; + @ObfuscatedName("p") @ObfuscatedGetter( - intValue = -1531205989 + intValue = -1268318299 ) - @Export("canvasHeight") - public static int canvasHeight; - @ObfuscatedName("hs") + public int field1596; + @ObfuscatedName("b") @ObfuscatedGetter( - intValue = 2070758947 - ) - @Export("cameraYaw") - static int cameraYaw; - @ObfuscatedName("l") - @ObfuscatedGetter( - intValue = 1307904599 - ) - public int field1597; - @ObfuscatedName("v") - @ObfuscatedGetter( - intValue = -1927234279 + intValue = -786020391 ) @Export("int1") public int int1; - @ObfuscatedName("b") + @ObfuscatedName("d") @ObfuscatedGetter( - intValue = 114451643 + intValue = -1840545813 ) @Export("int2") public int int2; - @ObfuscatedName("q") + @ObfuscatedName("s") @ObfuscatedGetter( - intValue = 2139429703 + intValue = 2113389855 ) @Export("int3") public int int3; - @ObfuscatedName("i") + @ObfuscatedName("u") @ObfuscatedGetter( - intValue = 1992705999 + intValue = -490506125 ) - public int field1593; - @ObfuscatedName("x") + public int field1608; + @ObfuscatedName("l") @ObfuscatedGetter( - intValue = -1827284877 + intValue = 181606605 ) @Export("int5") public int int5; - @ObfuscatedName("k") + @ObfuscatedName("o") @ObfuscatedGetter( - intValue = 1214012917 + intValue = -714777503 ) @Export("frontSpriteID") int frontSpriteID; - @ObfuscatedName("r") + @ObfuscatedName("c") @ObfuscatedGetter( - intValue = 1527087545 + intValue = -1753833631 ) @Export("backSpriteID") int backSpriteID; - @ObfuscatedName("p") + @ObfuscatedName("e") @ObfuscatedGetter( - intValue = -630601597 + intValue = -567773935 ) @Export("width") public int width; - @ObfuscatedName("a") + @ObfuscatedName("g") @ObfuscatedGetter( - intValue = 1019196477 + intValue = -1691333321 ) @Export("widthPadding") public int widthPadding; @@ -107,141 +98,164 @@ public class HealthBarDefinition extends DualNode { HealthBarDefinition_cachedSprites = new EvictingDualNodeHashTable(64); // L: 15 } - public HealthBarDefinition() { + HealthBarDefinition() { this.int1 = 255; // L: 19 this.int2 = 255; // L: 20 this.int3 = -1; // L: 21 - this.field1593 = 1; // L: 22 + this.field1608 = 1; // L: 22 this.int5 = 70; // L: 23 this.frontSpriteID = -1; // L: 24 this.backSpriteID = -1; // L: 25 this.width = 30; // L: 26 - this.widthPadding = 0; - } + this.widthPadding = 0; // L: 27 + } // L: 29 - @ObfuscatedName("h") + @ObfuscatedName("n") @ObfuscatedSignature( - descriptor = "(Lnk;B)V", - garbageValue = "-50" + descriptor = "(Lnd;I)V", + garbageValue = "1613150424" ) @Export("decode") - public void decode(Buffer var1) { + void decode(Buffer var1) { while (true) { - int var2 = var1.readUnsignedByte(); - if (var2 == 0) { - return; + int var2 = var1.readUnsignedByte(); // L: 43 + if (var2 == 0) { // L: 44 + return; // L: 47 } - this.decodeNext(var1, var2); + this.decodeNext(var1, var2); // L: 45 } } - @ObfuscatedName("c") + @ObfuscatedName("f") @ObfuscatedSignature( - descriptor = "(Lnk;II)V", - garbageValue = "-1755851989" + descriptor = "(Lnd;IB)V", + garbageValue = "98" ) @Export("decodeNext") void decodeNext(Buffer var1, int var2) { - if (var2 == 1) { - var1.readUnsignedShort(); // L: 39 - } else if (var2 == 2) { // L: 41 + if (var2 == 1) { // L: 50 + var1.readUnsignedShort(); // L: 51 + } else if (var2 == 2) { // L: 53 this.int1 = var1.readUnsignedByte(); - } else if (var2 == 3) { // L: 42 + } else if (var2 == 3) { // L: 54 this.int2 = var1.readUnsignedByte(); - } else if (var2 == 4) { // L: 43 + } else if (var2 == 4) { // L: 55 this.int3 = 0; - } else if (var2 == 5) { // L: 44 + } else if (var2 == 5) { this.int5 = var1.readUnsignedShort(); - } else if (var2 == 6) { // L: 45 - var1.readUnsignedByte(); // L: 46 - } else if (var2 == 7) { // L: 48 - this.frontSpriteID = var1.method6464(); - } else if (var2 == 8) { // L: 49 - this.backSpriteID = var1.method6464(); - } else if (var2 == 11) { // L: 50 - this.int3 = var1.readUnsignedShort(); - } else if (var2 == 14) { // L: 51 + } else if (var2 == 6) { // L: 57 + var1.readUnsignedByte(); // L: 58 + } else if (var2 == 7) { // L: 60 + this.frontSpriteID = var1.method6583(); + } else if (var2 == 8) { // L: 61 + this.backSpriteID = var1.method6583(); + } else if (var2 == 11) { + this.int3 = var1.readUnsignedShort(); // L: 62 + } else if (var2 == 14) { // L: 63 this.width = var1.readUnsignedByte(); - } else if (var2 == 15) { // L: 52 + } else if (var2 == 15) { // L: 64 this.widthPadding = var1.readUnsignedByte(); } - } // L: 54 + } // L: 66 - @ObfuscatedName("o") + @ObfuscatedName("y") @ObfuscatedSignature( - descriptor = "(I)Low;", - garbageValue = "2025527166" + descriptor = "(B)Loh;", + garbageValue = "-48" ) @Export("getFrontSprite") public SpritePixels getFrontSprite() { - if (this.frontSpriteID < 0) { // L: 57 + if (this.frontSpriteID < 0) { // L: 69 return null; } else { - SpritePixels var1 = (SpritePixels) HealthBarDefinition_cachedSprites.get((long)this.frontSpriteID); // L: 58 + SpritePixels var1 = (SpritePixels)HealthBarDefinition_cachedSprites.get((long)this.frontSpriteID); // L: 70 if (var1 != null) { - return var1; // L: 59 + return var1; // L: 71 } else { - var1 = Friend.SpriteBuffer_getSprite(HitSplatDefinition_spritesArchive, this.frontSpriteID, 0); // L: 60 - if (var1 != null) { // L: 61 + var1 = ClientPacket.SpriteBuffer_getSprite(HitSplatDefinition_spritesArchive, this.frontSpriteID, 0); // L: 72 + if (var1 != null) { // L: 73 HealthBarDefinition_cachedSprites.put(var1, (long)this.frontSpriteID); } - return var1; // L: 63 + return var1; // L: 75 } } } - @ObfuscatedName("g") + @ObfuscatedName("p") @ObfuscatedSignature( - descriptor = "(I)Low;", - garbageValue = "579958180" + descriptor = "(S)Loh;", + garbageValue = "-6435" ) @Export("getBackSprite") public SpritePixels getBackSprite() { - if (this.backSpriteID < 0) { // L: 67 + if (this.backSpriteID < 0) { // L: 79 return null; } else { - SpritePixels var1 = (SpritePixels) HealthBarDefinition_cachedSprites.get((long)this.backSpriteID); // L: 68 + SpritePixels var1 = (SpritePixels)HealthBarDefinition_cachedSprites.get((long)this.backSpriteID); // L: 80 if (var1 != null) { - return var1; // L: 69 + return var1; // L: 81 } else { - var1 = Friend.SpriteBuffer_getSprite(HitSplatDefinition_spritesArchive, this.backSpriteID, 0); // L: 70 + var1 = ClientPacket.SpriteBuffer_getSprite(HitSplatDefinition_spritesArchive, this.backSpriteID, 0); // L: 82 if (var1 != null) { - HealthBarDefinition_cachedSprites.put(var1, (long)this.backSpriteID); // L: 71 + HealthBarDefinition_cachedSprites.put(var1, (long)this.backSpriteID); // L: 83 } - return var1; // L: 73 + return var1; // L: 85 } } } + @ObfuscatedName("f") + @ObfuscatedSignature( + descriptor = "(II)J", + garbageValue = "459943946" + ) + public static long method2720(int var0) { + return ViewportMouse.ViewportMouse_entityTags[var0]; // L: 56 + } + @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "(Lha;Loy;I)Lhm;", - garbageValue = "-1113207713" + descriptor = "(IIB)I", + garbageValue = "42" ) - @Export("getPacketBufferNode") - public static PacketBufferNode getPacketBufferNode(ClientPacket var0, IsaacCipher var1) { - PacketBufferNode var2 = Clock.method2590(); // L: 27 - var2.clientPacket = var0; // L: 28 - var2.clientPacketLength = var0.length; // L: 29 - if (var2.clientPacketLength == -1) { // L: 30 - var2.packetBuffer = new PacketBuffer(260); - } else if (var2.clientPacketLength == -2) { - var2.packetBuffer = new PacketBuffer(10000); // L: 31 - } else if (var2.clientPacketLength <= 18) { // L: 32 - var2.packetBuffer = new PacketBuffer(20); - } else if (var2.clientPacketLength <= 98) { // L: 33 - var2.packetBuffer = new PacketBuffer(100); + static final int method2728(int var0, int var1) { + if (var0 == -1) { // L: 847 + return 12345678; } else { - var2.packetBuffer = new PacketBuffer(260); // L: 34 - } + var1 = (var0 & 127) * var1 / 128; // L: 848 + if (var1 < 2) { // L: 849 + var1 = 2; + } else if (var1 > 126) { // L: 850 + var1 = 126; + } - var2.packetBuffer.setIsaacCipher(var1); // L: 35 - var2.packetBuffer.writeByteIsaac(var2.clientPacket.id); // L: 36 - var2.index = 0; // L: 37 - return var2; // L: 38 + return (var0 & 65408) + var1; // L: 851 + } + } + + @ObfuscatedName("as") + @ObfuscatedSignature( + descriptor = "(ILcf;ZI)I", + garbageValue = "-849038542" + ) + static int method2727(int var0, Script var1, boolean var2) { + if (var0 == ScriptOpcodes.LOGOUT) { // L: 3495 + Client.logoutTimer = 250; // L: 3496 + return 1; // L: 3497 + } else if (var0 != 5631 && var0 != 5633) { // L: 3499 + if (var0 == 5632) { // L: 3503 + Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = 26; // L: 3504 + return 1; // L: 3505 + } else { + return 2; // L: 3507 + } + } else { + Interpreter.Interpreter_stringStackSize -= 2; // L: 3500 + return 1; // L: 3501 + } } } diff --git a/runescape-client/src/main/java/HealthBarUpdate.java b/runescape-client/src/main/java/HealthBarUpdate.java index 7ce93457d8..eda1d9ea48 100644 --- a/runescape-client/src/main/java/HealthBarUpdate.java +++ b/runescape-client/src/main/java/HealthBarUpdate.java @@ -1,34 +1,39 @@ -import java.util.LinkedHashMap; 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("cy") +@ObfuscatedName("cx") @Implements("HealthBarUpdate") public class HealthBarUpdate extends Node { - @ObfuscatedName("h") + @ObfuscatedName("d") + @ObfuscatedSignature( + descriptor = "Ljv;" + ) + @Export("Widget_archive") + public static AbstractArchive Widget_archive; + @ObfuscatedName("v") @ObfuscatedGetter( - intValue = -1385080741 + intValue = -859723449 ) @Export("cycle") int cycle; - @ObfuscatedName("c") + @ObfuscatedName("n") @ObfuscatedGetter( - intValue = -1702069549 + intValue = 36021957 ) @Export("health") int health; - @ObfuscatedName("o") + @ObfuscatedName("f") @ObfuscatedGetter( - intValue = 113982143 + intValue = 1070199867 ) @Export("health2") int health2; - @ObfuscatedName("g") + @ObfuscatedName("y") @ObfuscatedGetter( - intValue = -48902103 + intValue = 687360175 ) @Export("cycleOffset") int cycleOffset; @@ -40,10 +45,10 @@ public class HealthBarUpdate extends Node { this.cycleOffset = var4; // L: 15 } // L: 16 - @ObfuscatedName("h") + @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "(IIIIB)V", - garbageValue = "27" + descriptor = "(IIIII)V", + garbageValue = "-629620630" ) @Export("set") void set(int var1, int var2, int var3, int var4) { @@ -53,38 +58,230 @@ public class HealthBarUpdate extends Node { this.cycleOffset = var4; // L: 22 } // L: 23 - @ObfuscatedName("a") + @ObfuscatedName("p") @ObfuscatedSignature( - descriptor = "(B)V", - garbageValue = "-84" + descriptor = "(S)V", + garbageValue = "-1591" ) - public static void method2200() { - Widget.Widget_cachedSprites.clear(); // L: 728 - Widget.Widget_cachedModels.clear(); // L: 729 - Widget.Widget_cachedFonts.clear(); // L: 730 - Widget.Widget_cachedSpriteMasks.clear(); // L: 731 - } // L: 732 + public static void method2197() { + VarbitComposition.VarbitDefinition_cached.clear(); // L: 57 + } // L: 58 - @ObfuscatedName("fk") + @ObfuscatedName("ey") @ObfuscatedSignature( - descriptor = "(ZI)V", - garbageValue = "-1100971674" + descriptor = "(B)Lmc;", + garbageValue = "7" ) - static final void method2204(boolean var0) { - if (var0) { // L: 3110 - Client.field652 = Login.field1008 ? class125.field1450 : class125.field1452; // L: 3111 - } else { - LinkedHashMap var1 = class12.clientPreferences.parameters; // L: 3114 - String var3 = Login.Login_username; // L: 3116 - int var4 = var3.length(); // L: 3118 - int var5 = 0; // L: 3119 + @Export("getWorldMap") + static WorldMap getWorldMap() { + return class243.worldMap; // L: 686 + } - for (int var6 = 0; var6 < var4; ++var6) { // L: 3120 - var5 = (var5 << 5) - var5 + var3.charAt(var6); - } - - Client.field652 = var1.containsKey(var5) ? class125.field1451 : class125.field1449; // L: 3123 + @ObfuscatedName("fi") + @ObfuscatedSignature( + descriptor = "(I)V", + garbageValue = "-1808857292" + ) + @Export("playPcmPlayers") + static final void playPcmPlayers() { + if (MouseRecorder.pcmPlayer1 != null) { // L: 3353 + MouseRecorder.pcmPlayer1.run(); } - } // L: 3125 + if (DesktopPlatformInfoProvider.pcmPlayer0 != null) { // L: 3354 + DesktopPlatformInfoProvider.pcmPlayer0.run(); + } + + } // L: 3355 + + @ObfuscatedName("jy") + @ObfuscatedSignature( + descriptor = "(Lio;III)V", + garbageValue = "-190288118" + ) + @Export("Widget_addToMenu") + static final void Widget_addToMenu(Widget var0, int var1, int var2) { + if (var0.buttonType == 1) { // L: 9993 + Occluder.insertMenuItemNoShift(var0.buttonText, "", 24, 0, 0, var0.id); // L: 9994 + } + + String var3; + if (var0.buttonType == 2 && !Client.isSpellSelected) { // L: 9997 + var3 = BoundaryObject.Widget_getSpellActionName(var0); // L: 9998 + if (var3 != null) { // L: 9999 + Occluder.insertMenuItemNoShift(var3, class44.colorStartTag(65280) + var0.spellName, 25, 0, -1, var0.id); // L: 10000 + } + } + + if (var0.buttonType == 3) { // L: 10004 + Occluder.insertMenuItemNoShift("Close", "", 26, 0, 0, var0.id); // L: 10005 + } + + if (var0.buttonType == 4) { // L: 10008 + Occluder.insertMenuItemNoShift(var0.buttonText, "", 28, 0, 0, var0.id); // L: 10009 + } + + if (var0.buttonType == 5) { // L: 10012 + Occluder.insertMenuItemNoShift(var0.buttonText, "", 29, 0, 0, var0.id); // L: 10013 + } + + if (var0.buttonType == 6 && Client.meslayerContinueWidget == null) { // L: 10016 + Occluder.insertMenuItemNoShift(var0.buttonText, "", 30, 0, -1, var0.id); // L: 10017 + } + + int var4; + int var5; + int var13; + if (var0.type == 2) { // L: 10020 + var13 = 0; // L: 10021 + + for (var4 = 0; var4 < var0.height; ++var4) { // L: 10022 + for (var5 = 0; var5 < var0.width; ++var5) { // L: 10023 + int var16 = (var0.paddingX + 32) * var5; // L: 10024 + int var7 = (var0.paddingY + 32) * var4; // L: 10025 + if (var13 < 20) { // L: 10026 + var16 += var0.inventoryXOffsets[var13]; // L: 10027 + var7 += var0.inventoryYOffsets[var13]; // L: 10028 + } + + if (var1 >= var16 && var2 >= var7 && var1 < var16 + 32 && var2 < var7 + 32) { // L: 10030 + Client.dragItemSlotDestination = var13; // L: 10031 + class18.hoveredItemContainer = var0; // L: 10032 + if (var0.itemIds[var13] > 0) { // L: 10033 + ItemComposition var8 = class260.ItemDefinition_get(var0.itemIds[var13] - 1); // L: 10034 + if (Client.isItemSelected == 1 && World.method1663(class21.getWidgetFlags(var0))) { // L: 10035 + if (var0.id != Player.selectedItemWidget || var13 != ClanChannelMember.selectedItemSlot) { // L: 10036 + Occluder.insertMenuItemNoShift("Use", Client.selectedItemName + " " + "->" + " " + class44.colorStartTag(16748608) + var8.name, 31, var8.id, var13, var0.id); // L: 10037 + } + } else if (Client.isSpellSelected && World.method1663(class21.getWidgetFlags(var0))) { // L: 10041 + if ((class4.selectedSpellFlags & 16) == 16) { // L: 10042 + Occluder.insertMenuItemNoShift(Client.selectedSpellActionName, Client.selectedSpellName + " " + "->" + " " + class44.colorStartTag(16748608) + var8.name, 32, var8.id, var13, var0.id); // L: 10043 + } + } else { + String[] var9 = var8.inventoryActions; // L: 10048 + int var10 = -1; // L: 10049 + if (Client.shiftClickDrop) { // L: 10050 + boolean var11 = Client.tapToDrop || KeyHandler.KeyHandler_pressedKeys[81]; // L: 10053 + if (var11) { // L: 10055 + var10 = var8.getShiftClickIndex(); // L: 10056 + } + } + + int var18; + if (World.method1663(class21.getWidgetFlags(var0))) { // L: 10059 + for (var18 = 4; var18 >= 3; --var18) { // L: 10060 + if (var10 != var18) { // L: 10061 + class125.addWidgetItemMenuItem(var0, var8, var13, var18, false); // L: 10062 + } + } + } + + if (StructComposition.method2908(class21.getWidgetFlags(var0))) { // L: 10065 + Occluder.insertMenuItemNoShift("Use", class44.colorStartTag(16748608) + var8.name, 38, var8.id, var13, var0.id); // L: 10066 + } + + if (World.method1663(class21.getWidgetFlags(var0))) { // L: 10069 + for (var18 = 2; var18 >= 0; --var18) { // L: 10070 + if (var18 != var10) { // L: 10071 + class125.addWidgetItemMenuItem(var0, var8, var13, var18, false); // L: 10072 + } + } + + if (var10 >= 0) { // L: 10074 + class125.addWidgetItemMenuItem(var0, var8, var13, var10, true); // L: 10075 + } + } + + var9 = var0.itemActions; // L: 10078 + if (var9 != null) { // L: 10079 + for (var18 = 4; var18 >= 0; --var18) { // L: 10080 + if (var9[var18] != null) { // L: 10081 + byte var12 = 0; // L: 10082 + if (var18 == 0) { // L: 10083 + var12 = 39; + } + + if (var18 == 1) { // L: 10084 + var12 = 40; + } + + if (var18 == 2) { // L: 10085 + var12 = 41; + } + + if (var18 == 3) { // L: 10086 + var12 = 42; + } + + if (var18 == 4) { // L: 10087 + var12 = 43; + } + + Occluder.insertMenuItemNoShift(var9[var18], class44.colorStartTag(16748608) + var8.name, var12, var8.id, var13, var0.id); // L: 10088 + } + } + } + + Occluder.insertMenuItemNoShift("Examine", class44.colorStartTag(16748608) + var8.name, 1005, var8.id, var13, var0.id); // L: 10093 + } + } + } + + ++var13; // L: 10098 + } + } + } + + if (var0.isIf3) { // L: 10102 + if (Client.isSpellSelected) { // L: 10103 + var4 = class21.getWidgetFlags(var0); // L: 10105 + boolean var19 = (var4 >> 21 & 1) != 0; // L: 10107 + if (var19 && (class4.selectedSpellFlags & 32) == 32) { // L: 10109 + Occluder.insertMenuItemNoShift(Client.selectedSpellActionName, Client.selectedSpellName + " " + "->" + " " + var0.dataText, 58, 0, var0.childIndex, var0.id); // L: 10110 + } + } else { + for (var13 = 9; var13 >= 5; --var13) { // L: 10115 + String var15; + if (!TextureProvider.method4141(class21.getWidgetFlags(var0), var13) && var0.onOp == null) { // L: 10118 + var15 = null; // L: 10119 + } else if (var0.actions != null && var0.actions.length > var13 && var0.actions[var13] != null && var0.actions[var13].trim().length() != 0) { // L: 10122 + var15 = var0.actions[var13]; // L: 10126 + } else { + var15 = null; // L: 10123 + } + + if (var15 != null) { // L: 10129 + Occluder.insertMenuItemNoShift(var15, var0.dataText, 1007, var13 + 1, var0.childIndex, var0.id); // L: 10130 + } + } + + var3 = BoundaryObject.Widget_getSpellActionName(var0); // L: 10134 + if (var3 != null) { // L: 10135 + Occluder.insertMenuItemNoShift(var3, var0.dataText, 25, 0, var0.childIndex, var0.id); // L: 10136 + } + + for (var4 = 4; var4 >= 0; --var4) { // L: 10139 + String var14; + if (!TextureProvider.method4141(class21.getWidgetFlags(var0), var4) && var0.onOp == null) { // L: 10142 + var14 = null; // L: 10143 + } else if (var0.actions != null && var0.actions.length > var4 && var0.actions[var4] != null && var0.actions[var4].trim().length() != 0) { // L: 10146 + var14 = var0.actions[var4]; // L: 10150 + } else { + var14 = null; // L: 10147 + } + + if (var14 != null) { // L: 10153 + BoundaryObject.insertMenuItem(var14, var0.dataText, 57, var4 + 1, var0.childIndex, var0.id, var0.prioritizeMenuEntry); // L: 10154 + } + } + + var5 = class21.getWidgetFlags(var0); // L: 10159 + boolean var17 = (var5 & 1) != 0; // L: 10161 + if (var17) { // L: 10163 + Occluder.insertMenuItemNoShift("Continue", "", 30, 0, var0.childIndex, var0.id); // L: 10164 + } + } + } + + } // L: 10169 } diff --git a/runescape-client/src/main/java/HitSplatDefinition.java b/runescape-client/src/main/java/HitSplatDefinition.java index 89016a6720..abbcf30c0d 100644 --- a/runescape-client/src/main/java/HitSplatDefinition.java +++ b/runescape-client/src/main/java/HitSplatDefinition.java @@ -1,130 +1,129 @@ -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("ep") +@ObfuscatedName("ev") @Implements("HitSplatDefinition") public class HitSplatDefinition extends DualNode { - @ObfuscatedName("h") + @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "Ljp;" + descriptor = "Ljv;" ) @Export("HitSplatDefinition_archive") public static AbstractArchive HitSplatDefinition_archive; - @ObfuscatedName("c") + @ObfuscatedName("n") @ObfuscatedSignature( - descriptor = "Ljp;" + descriptor = "Ljv;" ) - public static AbstractArchive field1731; - @ObfuscatedName("o") + public static AbstractArchive field1734; + @ObfuscatedName("f") @ObfuscatedSignature( - descriptor = "Ljp;" + descriptor = "Ljv;" ) @Export("HitSplatDefinition_fontsArchive") public static AbstractArchive HitSplatDefinition_fontsArchive; - @ObfuscatedName("g") + @ObfuscatedName("y") @ObfuscatedSignature( - descriptor = "Lho;" + descriptor = "Lhz;" ) @Export("HitSplatDefinition_cached") - public static EvictingDualNodeHashTable HitSplatDefinition_cached; - @ObfuscatedName("l") + static EvictingDualNodeHashTable HitSplatDefinition_cached; + @ObfuscatedName("p") @ObfuscatedSignature( - descriptor = "Lho;" + descriptor = "Lhz;" ) @Export("HitSplatDefinition_cachedSprites") static EvictingDualNodeHashTable HitSplatDefinition_cachedSprites; - @ObfuscatedName("z") + @ObfuscatedName("j") @ObfuscatedSignature( - descriptor = "Lho;" + descriptor = "Lhz;" ) @Export("HitSplatDefinition_cachedFonts") static EvictingDualNodeHashTable HitSplatDefinition_cachedFonts; - @ObfuscatedName("lu") - @ObfuscatedGetter( - intValue = -562228541 + @ObfuscatedName("bs") + @ObfuscatedSignature( + descriptor = "[Lop;" ) - @Export("menuY") - static int menuY; - @ObfuscatedName("x") + @Export("worldSelectArrows") + static IndexedSprite[] worldSelectArrows; + @ObfuscatedName("l") @ObfuscatedGetter( - intValue = 1310441091 + intValue = -418995629 ) @Export("fontId") int fontId; - @ObfuscatedName("k") + @ObfuscatedName("o") @ObfuscatedGetter( - intValue = -654467791 + intValue = -131436485 ) @Export("textColor") public int textColor; - @ObfuscatedName("r") + @ObfuscatedName("c") @ObfuscatedGetter( - intValue = 926003347 + intValue = -1784798067 ) - public int field1735; - @ObfuscatedName("p") - @ObfuscatedGetter( - intValue = -317860375 - ) - int field1732; - @ObfuscatedName("a") - @ObfuscatedGetter( - intValue = -1265156123 - ) - int field1750; + public int field1731; @ObfuscatedName("e") @ObfuscatedGetter( - intValue = 389377947 + intValue = 444689543 ) - int field1746; - @ObfuscatedName("d") + int field1735; + @ObfuscatedName("g") @ObfuscatedGetter( - intValue = -874345173 + intValue = 311873853 ) - int field1747; - @ObfuscatedName("u") + int field1736; + @ObfuscatedName("a") @ObfuscatedGetter( - intValue = -1104481509 + intValue = 592944735 ) - public int field1748; + int field1737; + @ObfuscatedName("k") + @ObfuscatedGetter( + intValue = -1479453361 + ) + int field1738; @ObfuscatedName("m") @ObfuscatedGetter( - intValue = -1793396621 + intValue = -264775369 + ) + public int field1739; + @ObfuscatedName("x") + @ObfuscatedGetter( + intValue = 1703061619 + ) + public int field1740; + @ObfuscatedName("z") + @ObfuscatedGetter( + intValue = 154309501 ) public int field1749; - @ObfuscatedName("j") + @ObfuscatedName("w") + String field1742; + @ObfuscatedName("t") @ObfuscatedGetter( - intValue = 208289651 + intValue = -1751658075 ) public int field1743; - @ObfuscatedName("f") - String field1751; - @ObfuscatedName("s") + @ObfuscatedName("h") @ObfuscatedGetter( - intValue = -2027049703 + intValue = -942409287 ) - public int field1752; - @ObfuscatedName("y") - @ObfuscatedGetter( - intValue = 1572052995 - ) - public int field1753; - @ObfuscatedName("w") + public int field1744; + @ObfuscatedName("q") @Export("transforms") public int[] transforms; - @ObfuscatedName("n") + @ObfuscatedName("i") @ObfuscatedGetter( - intValue = -965854333 + intValue = 1819526357 ) @Export("transformVarbit") int transformVarbit; - @ObfuscatedName("ag") + @ObfuscatedName("ae") @ObfuscatedGetter( - intValue = 329700349 + intValue = 1097710595 ) @Export("transformVarp") int transformVarp; @@ -135,301 +134,286 @@ public class HitSplatDefinition extends DualNode { HitSplatDefinition_cachedFonts = new EvictingDualNodeHashTable(20); // L: 20 } - public HitSplatDefinition() { + HitSplatDefinition() { this.fontId = -1; // L: 26 this.textColor = 16777215; // L: 27 - this.field1735 = 70; // L: 28 - this.field1732 = -1; // L: 29 - this.field1750 = -1; // L: 30 - this.field1746 = -1; // L: 31 - this.field1747 = -1; // L: 32 - this.field1748 = 0; // L: 33 - this.field1749 = 0; // L: 34 - this.field1743 = -1; // L: 35 - this.field1751 = ""; // L: 36 - this.field1752 = -1; // L: 37 - this.field1753 = 0; // L: 38 + this.field1731 = 70; // L: 28 + this.field1735 = -1; // L: 29 + this.field1736 = -1; // L: 30 + this.field1737 = -1; // L: 31 + this.field1738 = -1; // L: 32 + this.field1739 = 0; // L: 33 + this.field1740 = 0; // L: 34 + this.field1749 = -1; // L: 35 + this.field1742 = ""; // L: 36 + this.field1743 = -1; // L: 37 + this.field1744 = 0; // L: 38 this.transformVarbit = -1; // L: 40 this.transformVarp = -1; // L: 41 - } + } // L: 43 - @ObfuscatedName("h") + @ObfuscatedName("n") @ObfuscatedSignature( - descriptor = "(Lnk;I)V", - garbageValue = "-135808343" + descriptor = "(Lnd;I)V", + garbageValue = "1040710174" ) @Export("decode") - public void decode(Buffer var1) { + void decode(Buffer var1) { while (true) { - int var2 = var1.readUnsignedByte(); - if (var2 == 0) { - return; // L: 49 + int var2 = var1.readUnsignedByte(); // L: 57 + if (var2 == 0) { // L: 58 + return; // L: 61 } - this.decodeNext(var1, var2); + this.decodeNext(var1, var2); // L: 59 } } - @ObfuscatedName("c") + @ObfuscatedName("f") @ObfuscatedSignature( - descriptor = "(Lnk;II)V", - garbageValue = "1862722203" + descriptor = "(Lnd;II)V", + garbageValue = "1647125333" ) @Export("decodeNext") void decodeNext(Buffer var1, int var2) { - if (var2 == 1) { - this.fontId = var1.method6464(); - } else if (var2 == 2) { + if (var2 == 1) { // L: 64 + this.fontId = var1.method6583(); + } else if (var2 == 2) { // L: 65 this.textColor = var1.readMedium(); - } else if (var2 == 3) { - this.field1732 = var1.method6464(); - } else if (var2 == 4) { - this.field1746 = var1.method6464(); - } else if (var2 == 5) { - this.field1750 = var1.method6464(); - } else if (var2 == 6) { - this.field1747 = var1.method6464(); - } else if (var2 == 7) { - this.field1748 = var1.readShort(); - } else if (var2 == 8) { - this.field1751 = var1.readStringCp1252NullCircumfixed(); - } else if (var2 == 9) { // L: 60 - this.field1735 = var1.readUnsignedShort(); - } else if (var2 == 10) { - this.field1749 = var1.readShort(); - } else if (var2 == 11) { - this.field1743 = 0; - } else if (var2 == 12) { - this.field1752 = var1.readUnsignedByte(); - } else if (var2 == 13) { - this.field1753 = var1.readShort(); + } else if (var2 == 3) { // L: 66 + this.field1735 = var1.method6583(); + } else if (var2 == 4) { // L: 67 + this.field1737 = var1.method6583(); + } else if (var2 == 5) { // L: 68 + this.field1736 = var1.method6583(); + } else if (var2 == 6) { // L: 69 + this.field1738 = var1.method6583(); + } else if (var2 == 7) { // L: 70 + this.field1739 = var1.readShort(); + } else if (var2 == 8) { // L: 71 + this.field1742 = var1.readStringCp1252NullCircumfixed(); + } else if (var2 == 9) { // L: 72 + this.field1731 = var1.readUnsignedShort(); + } else if (var2 == 10) { // L: 73 + this.field1740 = var1.readShort(); + } else if (var2 == 11) { // L: 74 + this.field1749 = 0; + } else if (var2 == 12) { // L: 75 + this.field1743 = var1.readUnsignedByte(); + } else if (var2 == 13) { // L: 76 + this.field1744 = var1.readShort(); } else if (var2 == 14) { - this.field1743 = var1.readUnsignedShort(); - } else if (var2 == 17 || var2 == 18) { - this.transformVarbit = var1.readUnsignedShort(); - if (this.transformVarbit == 65535) { + this.field1749 = var1.readUnsignedShort(); // L: 77 + } else if (var2 == 17 || var2 == 18) { // L: 78 + this.transformVarbit = var1.readUnsignedShort(); // L: 79 + if (this.transformVarbit == 65535) { // L: 80 this.transformVarbit = -1; } - this.transformVarp = var1.readUnsignedShort(); - if (this.transformVarp == 65535) { + this.transformVarp = var1.readUnsignedShort(); // L: 81 + if (this.transformVarp == 65535) { // L: 82 this.transformVarp = -1; } - int var3 = -1; // L: 71 - if (var2 == 18) { - var3 = var1.readUnsignedShort(); - if (var3 == 65535) { + int var3 = -1; // L: 83 + if (var2 == 18) { // L: 84 + var3 = var1.readUnsignedShort(); // L: 85 + if (var3 == 65535) { // L: 86 var3 = -1; } } - int var4 = var1.readUnsignedByte(); - this.transforms = new int[var4 + 2]; + int var4 = var1.readUnsignedByte(); // L: 88 + this.transforms = new int[var4 + 2]; // L: 89 - for (int var5 = 0; var5 <= var4; ++var5) { - this.transforms[var5] = var1.readUnsignedShort(); - if (this.transforms[var5] == 65535) { + for (int var5 = 0; var5 <= var4; ++var5) { // L: 90 + this.transforms[var5] = var1.readUnsignedShort(); // L: 91 + if (this.transforms[var5] == 65535) { // L: 92 this.transforms[var5] = -1; } } - this.transforms[var4 + 1] = var3; + this.transforms[var4 + 1] = var3; // L: 94 } - } + } // L: 97 - @ObfuscatedName("o") + @ObfuscatedName("y") @ObfuscatedSignature( - descriptor = "(S)Lep;", - garbageValue = "-20229" + descriptor = "(I)Lev;", + garbageValue = "-1025207361" ) @Export("transform") public final HitSplatDefinition transform() { - int var1 = -1; - if (this.transformVarbit != -1) { - var1 = ObjectComposition.getVarbit(this.transformVarbit); - } else if (this.transformVarp != -1) { + int var1 = -1; // L: 100 + if (this.transformVarbit != -1) { // L: 101 + var1 = Skeleton.getVarbit(this.transformVarbit); + } else if (this.transformVarp != -1) { // L: 102 var1 = Varps.Varps_main[this.transformVarp]; } int var2; - if (var1 >= 0 && var1 < this.transforms.length - 1) { - var2 = this.transforms[var1]; + if (var1 >= 0 && var1 < this.transforms.length - 1) { // L: 104 + var2 = this.transforms[var1]; // L: 105 } else { var2 = this.transforms[this.transforms.length - 1]; } - if (var2 != -1) { - HitSplatDefinition var4 = (HitSplatDefinition)HitSplatDefinition_cached.get((long)var2); - HitSplatDefinition var3; - if (var4 != null) { - var3 = var4; - } else { - byte[] var5 = HitSplatDefinition_archive.takeFile(32, var2); - var4 = new HitSplatDefinition(); - if (var5 != null) { // L: 104 - var4.decode(new Buffer(var5)); - } - - HitSplatDefinition_cached.put(var4, (long)var2); - var3 = var4; - } - - return var3; - } else { - return null; - } + return var2 != -1 ? Projectile.method1966(var2) : null; // L: 106 107 } - @ObfuscatedName("g") + @ObfuscatedName("p") @ObfuscatedSignature( descriptor = "(II)Ljava/lang/String;", - garbageValue = "-2025907756" + garbageValue = "-1622557292" ) @Export("getString") public String getString(int var1) { - String var2 = this.field1751; + String var2 = this.field1742; // L: 111 while (true) { - int var3 = var2.indexOf("%1"); - if (var3 < 0) { - return var2; // L: 120 + int var3 = var2.indexOf("%1"); // L: 113 + if (var3 < 0) { // L: 114 + return var2; // L: 117 } - var2 = var2.substring(0, var3) + PendingSpawn.intToString(var1, false) + var2.substring(var3 + 2); // L: 118 + var2 = var2.substring(0, var3) + class80.intToString(var1, false) + var2.substring(var3 + 2); // L: 115 } } - @ObfuscatedName("l") + @ObfuscatedName("j") @ObfuscatedSignature( - descriptor = "(I)Low;", - garbageValue = "-1353066238" + descriptor = "(I)Loh;", + garbageValue = "-1594808435" ) - public SpritePixels method2890() { - if (this.field1732 < 0) { // L: 124 + public SpritePixels method2916() { + if (this.field1735 < 0) { // L: 121 return null; } else { - SpritePixels var1 = (SpritePixels) HitSplatDefinition_cachedSprites.get((long)this.field1732); // L: 125 - if (var1 != null) { // L: 126 + SpritePixels var1 = (SpritePixels)HitSplatDefinition_cachedSprites.get((long)this.field1735); // L: 122 + if (var1 != null) { // L: 123 return var1; } else { - var1 = Friend.SpriteBuffer_getSprite(field1731, this.field1732, 0); + var1 = ClientPacket.SpriteBuffer_getSprite(field1734, this.field1735, 0); // L: 124 if (var1 != null) { - HitSplatDefinition_cachedSprites.put(var1, (long)this.field1732); + HitSplatDefinition_cachedSprites.put(var1, (long)this.field1735); // L: 125 } - return var1; + return var1; // L: 127 } } } - @ObfuscatedName("z") + @ObfuscatedName("r") @ObfuscatedSignature( - descriptor = "(I)Low;", - garbageValue = "-1885835544" + descriptor = "(I)Loh;", + garbageValue = "1804785923" ) - public SpritePixels method2893() { - if (this.field1750 < 0) { // L: 134 + public SpritePixels method2931() { + if (this.field1736 < 0) { // L: 131 return null; } else { - SpritePixels var1 = (SpritePixels) HitSplatDefinition_cachedSprites.get((long)this.field1750); - if (var1 != null) { + SpritePixels var1 = (SpritePixels)HitSplatDefinition_cachedSprites.get((long)this.field1736); // L: 132 + if (var1 != null) { // L: 133 return var1; } else { - var1 = Friend.SpriteBuffer_getSprite(field1731, this.field1750, 0); - if (var1 != null) { - HitSplatDefinition_cachedSprites.put(var1, (long)this.field1750); + var1 = ClientPacket.SpriteBuffer_getSprite(field1734, this.field1736, 0); // L: 134 + if (var1 != null) { // L: 135 + HitSplatDefinition_cachedSprites.put(var1, (long)this.field1736); } - return var1; - } - } - } - - @ObfuscatedName("t") - @ObfuscatedSignature( - descriptor = "(I)Low;", - garbageValue = "1224895394" - ) - public SpritePixels method2871() { - if (this.field1746 < 0) { - return null; - } else { - SpritePixels var1 = (SpritePixels) HitSplatDefinition_cachedSprites.get((long)this.field1746); - if (var1 != null) { - return var1; - } else { - var1 = Friend.SpriteBuffer_getSprite(field1731, this.field1746, 0); // L: 147 - if (var1 != null) { - HitSplatDefinition_cachedSprites.put(var1, (long)this.field1746); // L: 148 - } - - return var1; // L: 150 - } - } - } - - @ObfuscatedName("v") - @ObfuscatedSignature( - descriptor = "(I)Low;", - garbageValue = "-1519234970" - ) - public SpritePixels method2872() { - if (this.field1747 < 0) { - return null; - } else { - SpritePixels var1 = (SpritePixels) HitSplatDefinition_cachedSprites.get((long)this.field1747); // L: 155 - if (var1 != null) { - return var1; - } else { - var1 = Friend.SpriteBuffer_getSprite(field1731, this.field1747, 0); // L: 157 - if (var1 != null) { - HitSplatDefinition_cachedSprites.put(var1, (long)this.field1747); - } - - return var1; + return var1; // L: 137 } } } @ObfuscatedName("b") @ObfuscatedSignature( - descriptor = "(I)Lkc;", - garbageValue = "247804226" + descriptor = "(I)Loh;", + garbageValue = "-2095016456" + ) + public SpritePixels method2951() { + if (this.field1737 < 0) { // L: 141 + return null; + } else { + SpritePixels var1 = (SpritePixels)HitSplatDefinition_cachedSprites.get((long)this.field1737); // L: 142 + if (var1 != null) { // L: 143 + return var1; + } else { + var1 = ClientPacket.SpriteBuffer_getSprite(field1734, this.field1737, 0); // L: 144 + if (var1 != null) { // L: 145 + HitSplatDefinition_cachedSprites.put(var1, (long)this.field1737); + } + + return var1; // L: 147 + } + } + } + + @ObfuscatedName("d") + @ObfuscatedSignature( + descriptor = "(B)Loh;", + garbageValue = "-1" + ) + public SpritePixels method2945() { + if (this.field1738 < 0) { // L: 151 + return null; + } else { + SpritePixels var1 = (SpritePixels)HitSplatDefinition_cachedSprites.get((long)this.field1738); // L: 152 + if (var1 != null) { + return var1; // L: 153 + } else { + var1 = ClientPacket.SpriteBuffer_getSprite(field1734, this.field1738, 0); // L: 154 + if (var1 != null) { // L: 155 + HitSplatDefinition_cachedSprites.put(var1, (long)this.field1738); + } + + return var1; // L: 157 + } + } + } + + @ObfuscatedName("s") + @ObfuscatedSignature( + descriptor = "(I)Lkt;", + garbageValue = "2065112934" ) @Export("getFont") public Font getFont() { - if (this.fontId == -1) { + if (this.fontId == -1) { // L: 161 return null; } else { - Font var1 = (Font) HitSplatDefinition_cachedFonts.get((long)this.fontId); - if (var1 != null) { + Font var1 = (Font)HitSplatDefinition_cachedFonts.get((long)this.fontId); // L: 162 + if (var1 != null) { // L: 163 return var1; } else { - AbstractArchive var3 = field1731; - AbstractArchive var4 = HitSplatDefinition_fontsArchive; - int var5 = this.fontId; - Font var2; - if (!Username.method5711(var3, var5, 0)) { - var2 = null; + AbstractArchive var3 = field1734; // L: 165 + AbstractArchive var4 = HitSplatDefinition_fontsArchive; // L: 166 + int var5 = this.fontId; // L: 167 + byte[] var7 = var3.takeFile(var5, 0); // L: 171 + boolean var6; + if (var7 == null) { // L: 172 + var6 = false; // L: 173 } else { - byte[] var7 = var4.takeFile(var5, 0); // L: 177 - Font var6; - if (var7 == null) { - var6 = null; // L: 180 + ItemLayer.SpriteBuffer_decode(var7); // L: 176 + var6 = true; // L: 177 + } + + Font var2; + if (!var6) { // L: 179 + var2 = null; // L: 180 + } else { + byte[] var8 = var4.takeFile(var5, 0); // L: 184 + Font var10; + if (var8 == null) { // L: 186 + var10 = null; // L: 187 } else { - Font var8 = new Font(var7, class243.SpriteBuffer_xOffsets, class396.SpriteBuffer_yOffsets, ArchiveDiskActionHandler.SpriteBuffer_spriteWidths, class372.SpriteBuffer_spriteHeights, AccessFile.SpriteBuffer_spritePalette, class396.SpriteBuffer_pixels); - class243.SpriteBuffer_xOffsets = null; - class396.SpriteBuffer_yOffsets = null; - ArchiveDiskActionHandler.SpriteBuffer_spriteWidths = null; - class372.SpriteBuffer_spriteHeights = null; - AccessFile.SpriteBuffer_spritePalette = null; // L: 189 - class396.SpriteBuffer_pixels = null; // L: 190 - var6 = var8; // L: 192 + Font var9 = new Font(var8, WorldMapDecoration.SpriteBuffer_xOffsets, Calendar.SpriteBuffer_yOffsets, class396.SpriteBuffer_spriteWidths, class302.SpriteBuffer_spriteHeights, MilliClock.SpriteBuffer_spritePalette, class396.SpriteBuffer_pixels); // L: 190 + MilliClock.method2587(); // L: 191 + var10 = var9; // L: 192 } - var2 = var6; // L: 194 + var2 = var10; // L: 194 } if (var2 != null) { // L: 197 @@ -441,232 +425,106 @@ public class HitSplatDefinition extends DualNode { } } - @ObfuscatedName("h") + @ObfuscatedName("if") @ObfuscatedSignature( - descriptor = "(I)Z", - garbageValue = "2092279976" + descriptor = "(Lce;IIII)V", + garbageValue = "65535" ) - public static boolean method2896() { - long var0 = Archive.currentTimeMillis(); // L: 42 - int var2 = (int)(var0 - SecureRandomCallable.field1108); // L: 43 - SecureRandomCallable.field1108 = var0; // L: 44 - if (var2 > 200) { // L: 45 - var2 = 200; - } + @Export("addPlayerToMenu") + static final void addPlayerToMenu(Player var0, int var1, int var2, int var3) { + if (class93.localPlayer != var0) { // L: 9102 + if (Client.menuOptionsCount < 400) { // L: 9103 + String var4; + int var7; + if (var0.skillLevel == 0) { // L: 9105 + String var5 = var0.actions[0] + var0.username + var0.actions[1]; // L: 9106 + var7 = var0.combatLevel; // L: 9108 + int var8 = class93.localPlayer.combatLevel; // L: 9109 + int var9 = var8 - var7; // L: 9111 + String var6; + if (var9 < -9) { // L: 9112 + var6 = class44.colorStartTag(16711680); // L: 9113 + } else if (var9 < -6) { // L: 9116 + var6 = class44.colorStartTag(16723968); // L: 9117 + } else if (var9 < -3) { // L: 9120 + var6 = class44.colorStartTag(16740352); // L: 9121 + } else if (var9 < 0) { // L: 9124 + var6 = class44.colorStartTag(16756736); // L: 9125 + } else if (var9 > 9) { // L: 9128 + var6 = class44.colorStartTag(65280); // L: 9129 + } else if (var9 > 6) { // L: 9132 + var6 = class44.colorStartTag(4259584); // L: 9133 + } else if (var9 > 3) { // L: 9136 + var6 = class44.colorStartTag(8453888); // L: 9137 + } else if (var9 > 0) { // L: 9140 + var6 = class44.colorStartTag(12648192); // L: 9141 + } else { + var6 = class44.colorStartTag(16776960); // L: 9144 + } - NetCache.NetCache_loadTime += var2; // L: 46 - if (NetCache.NetCache_pendingResponsesCount == 0 && NetCache.NetCache_pendingPriorityResponsesCount == 0 && NetCache.NetCache_pendingWritesCount == 0 && NetCache.NetCache_pendingPriorityWritesCount == 0) { // L: 47 - return true; - } else if (NetCache.NetCache_socket == null) { // L: 48 - return false; - } else { - try { - if (NetCache.NetCache_loadTime > 30000) { // L: 50 - throw new IOException(); + var4 = var5 + var6 + " " + " (" + "level-" + var0.combatLevel + ")" + var0.actions[2]; // L: 9146 } else { - NetFileRequest var3; - Buffer var4; - while (NetCache.NetCache_pendingPriorityResponsesCount < 200 && NetCache.NetCache_pendingPriorityWritesCount > 0) { // L: 51 - var3 = (NetFileRequest)NetCache.NetCache_pendingPriorityWrites.first(); // L: 52 - var4 = new Buffer(4); // L: 53 - var4.writeByte(1); // L: 54 - var4.writeMedium((int)var3.key); // L: 55 - NetCache.NetCache_socket.write(var4.array, 0, 4); // L: 56 - NetCache.NetCache_pendingPriorityResponses.put(var3, var3.key); // L: 57 - --NetCache.NetCache_pendingPriorityWritesCount; // L: 58 - ++NetCache.NetCache_pendingPriorityResponsesCount; // L: 59 - } - - while (NetCache.NetCache_pendingResponsesCount < 200 && NetCache.NetCache_pendingWritesCount > 0) { // L: 61 - var3 = (NetFileRequest)NetCache.NetCache_pendingWritesQueue.removeLast(); // L: 62 - var4 = new Buffer(4); // L: 63 - var4.writeByte(0); // L: 64 - var4.writeMedium((int)var3.key); // L: 65 - NetCache.NetCache_socket.write(var4.array, 0, 4); // L: 66 - var3.removeDual(); // L: 67 - NetCache.NetCache_pendingResponses.put(var3, var3.key); // L: 68 - --NetCache.NetCache_pendingWritesCount; // L: 69 - ++NetCache.NetCache_pendingResponsesCount; // L: 70 - } - - for (int var15 = 0; var15 < 100; ++var15) { // L: 72 - int var16 = NetCache.NetCache_socket.available(); // L: 73 - if (var16 < 0) { // L: 74 - throw new IOException(); - } - - if (var16 == 0) { // L: 75 - break; - } - - NetCache.NetCache_loadTime = 0; // L: 76 - byte var5 = 0; // L: 77 - if (class7.NetCache_currentResponse == null) { // L: 78 - var5 = 8; - } else if (NetCache.field3626 == 0) { // L: 79 - var5 = 1; - } - - int var6; - int var7; - int var8; - int var10; - byte[] var10000; - int var10001; - Buffer var22; - if (var5 > 0) { // L: 80 - var6 = var5 - NetCache.NetCache_responseHeaderBuffer.offset; // L: 81 - if (var6 > var16) { // L: 82 - var6 = var16; - } - - NetCache.NetCache_socket.read(NetCache.NetCache_responseHeaderBuffer.array, NetCache.NetCache_responseHeaderBuffer.offset, var6); // L: 83 - if (NetCache.field3629 != 0) { // L: 84 - for (var7 = 0; var7 < var6; ++var7) { // L: 85 - var10000 = NetCache.NetCache_responseHeaderBuffer.array; - var10001 = var7 + NetCache.NetCache_responseHeaderBuffer.offset; - var10000[var10001] ^= NetCache.field3629; - } - } - - var22 = NetCache.NetCache_responseHeaderBuffer; // L: 87 - var22.offset += var6; - if (NetCache.NetCache_responseHeaderBuffer.offset < var5) { // L: 88 - break; - } - - if (class7.NetCache_currentResponse == null) { // L: 89 - NetCache.NetCache_responseHeaderBuffer.offset = 0; // L: 90 - var7 = NetCache.NetCache_responseHeaderBuffer.readUnsignedByte(); // L: 91 - var8 = NetCache.NetCache_responseHeaderBuffer.readUnsignedShort(); // L: 92 - int var9 = NetCache.NetCache_responseHeaderBuffer.readUnsignedByte(); // L: 93 - var10 = NetCache.NetCache_responseHeaderBuffer.readInt(); // L: 94 - long var11 = (long)(var8 + (var7 << 16)); // L: 95 - NetFileRequest var13 = (NetFileRequest)NetCache.NetCache_pendingPriorityResponses.get(var11); // L: 96 - PlayerType.field3563 = true; // L: 97 - if (var13 == null) { // L: 98 - var13 = (NetFileRequest)NetCache.NetCache_pendingResponses.get(var11); // L: 99 - PlayerType.field3563 = false; // L: 100 - } - - if (var13 == null) { // L: 102 - throw new IOException(); // L: 103 - } - - int var14 = var9 == 0 ? 5 : 9; // L: 105 - class7.NetCache_currentResponse = var13; // L: 106 - NetCache.NetCache_responseArchiveBuffer = new Buffer(var14 + var10 + class7.NetCache_currentResponse.padding); // L: 107 - NetCache.NetCache_responseArchiveBuffer.writeByte(var9); // L: 108 - NetCache.NetCache_responseArchiveBuffer.writeInt(var10); // L: 109 - NetCache.field3626 = 8; // L: 110 - NetCache.NetCache_responseHeaderBuffer.offset = 0; // L: 111 - } else if (NetCache.field3626 == 0) { // L: 114 - if (NetCache.NetCache_responseHeaderBuffer.array[0] == -1) { // L: 115 - NetCache.field3626 = 1; // L: 116 - NetCache.NetCache_responseHeaderBuffer.offset = 0; // L: 117 - } else { - class7.NetCache_currentResponse = null; // L: 121 - } - } - } else { - var6 = NetCache.NetCache_responseArchiveBuffer.array.length - class7.NetCache_currentResponse.padding; // L: 127 - var7 = 512 - NetCache.field3626; // L: 128 - if (var7 > var6 - NetCache.NetCache_responseArchiveBuffer.offset) { // L: 129 - var7 = var6 - NetCache.NetCache_responseArchiveBuffer.offset; - } - - if (var7 > var16) { // L: 130 - var7 = var16; - } - - NetCache.NetCache_socket.read(NetCache.NetCache_responseArchiveBuffer.array, NetCache.NetCache_responseArchiveBuffer.offset, var7); // L: 131 - if (NetCache.field3629 != 0) { // L: 132 - for (var8 = 0; var8 < var7; ++var8) { // L: 133 - var10000 = NetCache.NetCache_responseArchiveBuffer.array; - var10001 = NetCache.NetCache_responseArchiveBuffer.offset + var8; - var10000[var10001] ^= NetCache.field3629; - } - } - - var22 = NetCache.NetCache_responseArchiveBuffer; // L: 135 - var22.offset += var7; - NetCache.field3626 += var7; // L: 136 - if (var6 == NetCache.NetCache_responseArchiveBuffer.offset) { // L: 137 - if (class7.NetCache_currentResponse.key == 16711935L) { // L: 138 - SecureRandomCallable.NetCache_reference = NetCache.NetCache_responseArchiveBuffer; // L: 139 - - for (var8 = 0; var8 < 256; ++var8) { // L: 140 - Archive var17 = NetCache.NetCache_archives[var8]; // L: 141 - if (var17 != null) { // L: 142 - SecureRandomCallable.NetCache_reference.offset = var8 * 8 + 5; // L: 143 - var10 = SecureRandomCallable.NetCache_reference.readInt(); // L: 144 - int var18 = SecureRandomCallable.NetCache_reference.readInt(); // L: 145 - var17.loadIndex(var10, var18); // L: 146 - } - } - } else { - NetCache.NetCache_crc.reset(); // L: 151 - NetCache.NetCache_crc.update(NetCache.NetCache_responseArchiveBuffer.array, 0, var6); // L: 152 - var8 = (int)NetCache.NetCache_crc.getValue(); // L: 153 - if (var8 != class7.NetCache_currentResponse.crc) { // L: 154 - try { - NetCache.NetCache_socket.close(); // L: 156 - } catch (Exception var20) { // L: 158 - } - - ++NetCache.NetCache_crcMismatches; // L: 159 - NetCache.NetCache_socket = null; // L: 160 - NetCache.field3629 = (byte)((int)(Math.random() * 255.0D + 1.0D)); // L: 161 - return false; // L: 162 - } - - NetCache.NetCache_crcMismatches = 0; // L: 164 - NetCache.NetCache_ioExceptions = 0; // L: 165 - class7.NetCache_currentResponse.archive.write((int)(class7.NetCache_currentResponse.key & 65535L), NetCache.NetCache_responseArchiveBuffer.array, 16711680L == (class7.NetCache_currentResponse.key & 16711680L), PlayerType.field3563); // L: 166 - } - - class7.NetCache_currentResponse.remove(); // L: 168 - if (PlayerType.field3563) { // L: 169 - --NetCache.NetCache_pendingPriorityResponsesCount; - } else { - --NetCache.NetCache_pendingResponsesCount; // L: 170 - } - - NetCache.field3626 = 0; // L: 171 - class7.NetCache_currentResponse = null; // L: 172 - NetCache.NetCache_responseArchiveBuffer = null; // L: 173 - } else { - if (NetCache.field3626 != 512) { // L: 175 - break; - } - - NetCache.field3626 = 0; - } - } - } - - return true; // L: 179 - } - } catch (IOException var21) { - try { - NetCache.NetCache_socket.close(); // L: 183 - } catch (Exception var19) { // L: 185 + var4 = var0.actions[0] + var0.username + var0.actions[1] + " " + " (" + "skill-" + var0.skillLevel + ")" + var0.actions[2]; // L: 9148 + } + + int var10; + if (Client.isItemSelected == 1) { // L: 9149 + Occluder.insertMenuItemNoShift("Use", Client.selectedItemName + " " + "->" + " " + class44.colorStartTag(16777215) + var4, 14, var1, var2, var3); // L: 9150 + } else if (Client.isSpellSelected) { // L: 9153 + if ((class4.selectedSpellFlags & 8) == 8) { // L: 9154 + Occluder.insertMenuItemNoShift(Client.selectedSpellActionName, Client.selectedSpellName + " " + "->" + " " + class44.colorStartTag(16777215) + var4, 15, var1, var2, var3); // L: 9155 + } + } else { + for (var10 = 7; var10 >= 0; --var10) { // L: 9160 + if (Client.playerMenuActions[var10] != null) { // L: 9161 + short var11 = 0; // L: 9162 + if (Client.playerMenuActions[var10].equalsIgnoreCase("Attack")) { // L: 9163 + if (AttackOption.AttackOption_hidden == Client.playerAttackOption) { // L: 9164 + continue; + } + + if (Client.playerAttackOption == AttackOption.AttackOption_alwaysRightClick || Client.playerAttackOption == AttackOption.AttackOption_dependsOnCombatLevels && var0.combatLevel > class93.localPlayer.combatLevel) { // L: 9165 + var11 = 2000; // L: 9166 + } + + if (class93.localPlayer.team != 0 && var0.team != 0) { // L: 9168 + if (var0.team == class93.localPlayer.team) { // L: 9169 + var11 = 2000; + } else { + var11 = 0; // L: 9170 + } + } else if (var0.isClanMember()) { // L: 9172 + var11 = 2000; // L: 9173 + } + } else if (Client.playerOptionsPriorities[var10]) { // L: 9176 + var11 = 2000; + } + + boolean var12 = false; // L: 9177 + var7 = Client.playerMenuOpcodes[var10] + var11; // L: 9178 + Occluder.insertMenuItemNoShift(Client.playerMenuActions[var10], class44.colorStartTag(16777215) + var4, var7, var1, var2, var3); // L: 9179 + } + } + } + + for (var10 = 0; var10 < Client.menuOptionsCount; ++var10) { // L: 9184 + if (Client.menuOpcodes[var10] == 23) { // L: 9185 + Client.menuTargets[var10] = class44.colorStartTag(16777215) + var4; // L: 9186 + break; + } } - ++NetCache.NetCache_ioExceptions; // L: 186 - NetCache.NetCache_socket = null; // L: 187 - return false; // L: 188 } } - } + } // L: 9190 - @ObfuscatedName("gd") + @ObfuscatedName("lk") @ObfuscatedSignature( - descriptor = "(I)I", - garbageValue = "2037549792" + descriptor = "(Lio;I)Z", + garbageValue = "2130552221" ) - @Export("getWindowedMode") - static int getWindowedMode() { - return Client.isResizable ? 2 : 1; // L: 4336 + @Export("isComponentHidden") + static boolean isComponentHidden(Widget var0) { + return var0.isHidden; // L: 11373 } } diff --git a/runescape-client/src/main/java/HorizontalAlignment.java b/runescape-client/src/main/java/HorizontalAlignment.java index 9b36ec9f18..35060c2f18 100644 --- a/runescape-client/src/main/java/HorizontalAlignment.java +++ b/runescape-client/src/main/java/HorizontalAlignment.java @@ -1,921 +1,103 @@ +import java.util.concurrent.Executors; +import java.util.concurrent.TimeUnit; 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("eg") +@ObfuscatedName("en") @Implements("HorizontalAlignment") public enum HorizontalAlignment implements Enumerated { - @ObfuscatedName("h") + @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "Leg;" + descriptor = "Len;" ) - field1626(0, 0), - @ObfuscatedName("c") + field1628(1, 0), + @ObfuscatedName("n") @ObfuscatedSignature( - descriptor = "Leg;" + descriptor = "Len;" ) @Export("HorizontalAlignment_centered") - HorizontalAlignment_centered(1, 1), - @ObfuscatedName("o") + HorizontalAlignment_centered(0, 1), + @ObfuscatedName("f") @ObfuscatedSignature( - descriptor = "Leg;" + descriptor = "Len;" ) - field1632(2, 2); + field1624(2, 2); - @ObfuscatedName("in") + @ObfuscatedName("y") @ObfuscatedGetter( - intValue = 822805303 - ) - @Export("oculusOrbFocalPointX") - static int oculusOrbFocalPointX; - @ObfuscatedName("g") - @ObfuscatedGetter( - intValue = 1511289313 + intValue = -161686761 ) @Export("value") public final int value; - @ObfuscatedName("l") + @ObfuscatedName("p") @ObfuscatedGetter( - intValue = -571608141 + intValue = 1344358763 ) @Export("id") final int id; HorizontalAlignment(int var3, int var4) { - this.value = var3; // L: 14 - this.id = var4; // L: 15 - } // L: 16 + this.value = var3; // L: 18 + this.id = var4; // L: 19 + } // L: 20 - @ObfuscatedName("h") + @ObfuscatedName("v") @ObfuscatedSignature( descriptor = "(I)I", - garbageValue = "-708237537" + garbageValue = "-907662946" ) @Export("rsOrdinal") public int rsOrdinal() { - return this.id; // L: 19 + return this.id; // L: 23 } - @ObfuscatedName("c") + @ObfuscatedName("q") @ObfuscatedSignature( - descriptor = "(IB)Ljava/lang/String;", - garbageValue = "0" + descriptor = "(Ldp;IIB)Lbd;", + garbageValue = "1" ) - @Export("colorStartTag") - static String colorStartTag(int var0) { - return ""; // L: 22 - } - - @ObfuscatedName("fr") - @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "-313207505" - ) - static final void method2733() { - int[] var0 = Players.Players_indices; // L: 3854 - - int var1; - for (var1 = 0; var1 < Players.Players_count; ++var1) { // L: 3855 - Player var4 = Client.players[var0[var1]]; // L: 3856 - if (var4 != null && var4.overheadTextCyclesRemaining > 0) { // L: 3857 - --var4.overheadTextCyclesRemaining; // L: 3858 - if (var4.overheadTextCyclesRemaining == 0) { - var4.overheadText = null; // L: 3859 - } + public static final PcmPlayer method2762(TaskHandler var0, int var1, int var2) { + if (PcmPlayer.field428 == 0) { // L: 49 + throw new IllegalStateException(); + } else if (var1 >= 0 && var1 < 2) { // L: 50 + if (var2 < 256) { // L: 51 + var2 = 256; } - } - for (var1 = 0; var1 < Client.npcCount; ++var1) { // L: 3862 - int var2 = Client.npcIndices[var1]; // L: 3863 - NPC var3 = Client.npcs[var2]; // L: 3864 - if (var3 != null && var3.overheadTextCyclesRemaining > 0) { // L: 3865 - --var3.overheadTextCyclesRemaining; // L: 3866 - if (var3.overheadTextCyclesRemaining == 0) { // L: 3867 - var3.overheadText = null; + try { + PcmPlayer var3 = class26.pcmPlayerProvider.player(); // L: 53 + var3.samples = new int[256 * (PcmPlayer.PcmPlayer_stereo ? 2 : 1)]; // L: 54 + var3.field425 = var2; // L: 55 + var3.init(); // L: 56 + var3.capacity = (var2 & -1024) + 1024; // L: 57 + if (var3.capacity > 16384) { // L: 58 + var3.capacity = 16384; } + + var3.open(var3.capacity); // L: 59 + if (PcmPlayer.field418 > 0 && Message.soundSystem == null) { // L: 60 + Message.soundSystem = new SoundSystem(); // L: 61 + Huffman.soundSystemExecutor = Executors.newScheduledThreadPool(1); // L: 62 + Huffman.soundSystemExecutor.scheduleAtFixedRate(Message.soundSystem, 0L, 10L, TimeUnit.MILLISECONDS); // L: 63 + } + + if (Message.soundSystem != null) { // L: 65 + if (Message.soundSystem.players[var1] != null) { // L: 66 + throw new IllegalArgumentException(); + } + + Message.soundSystem.players[var1] = var3; // L: 67 + } + + return var3; // L: 69 + } catch (Throwable var4) { // L: 71 + return new PcmPlayer(); // L: 72 } - } - - } // L: 3870 - - @ObfuscatedName("ir") - @ObfuscatedSignature( - descriptor = "(IIIILjava/lang/String;Ljava/lang/String;IIB)V", - garbageValue = "4" - ) - @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) { // L: 8068 - var2 -= 2000; - } - - PacketBufferNode var8; - if (var2 == 1) { // L: 8069 - Client.mouseCrossX = var6; // L: 8663 - Client.mouseCrossY = var7; // L: 8664 - Client.mouseCrossColor = 2; // L: 8665 - Client.mouseCrossState = 0; // L: 8666 - Client.destinationX = var0; // L: 8667 - Client.destinationY = var1; // L: 8668 - var8 = HealthBarDefinition.getPacketBufferNode(ClientPacket.field2656, Client.packetWriter.isaacCipher); // L: 8670 - var8.packetBuffer.method6483(class8.selectedItemId); // L: 8671 - var8.packetBuffer.method6484(var3); // L: 8672 - var8.packetBuffer.method6475(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); // L: 8673 - var8.packetBuffer.method6484(Messages.baseY + var1); // L: 8674 - var8.packetBuffer.writeInt(class35.selectedItemWidget); // L: 8675 - var8.packetBuffer.method6484(var0 + JagexCache.baseX); // L: 8676 - var8.packetBuffer.writeShort(UserComparator8.selectedItemSlot); // L: 8677 - Client.packetWriter.addNode(var8); // L: 8678 - } else if (var2 == 2) { - Client.mouseCrossX = var6; // L: 8153 - Client.mouseCrossY = var7; // L: 8154 - Client.mouseCrossColor = 2; // L: 8155 - Client.mouseCrossState = 0; // L: 8156 - Client.destinationX = var0; // L: 8157 - Client.destinationY = var1; // L: 8158 - var8 = HealthBarDefinition.getPacketBufferNode(ClientPacket.field2636, Client.packetWriter.isaacCipher); // L: 8159 - var8.packetBuffer.method6482(var0 + JagexCache.baseX); // L: 8160 - var8.packetBuffer.writeShort(var3); // L: 8161 - var8.packetBuffer.method6482(Client.field773); // L: 8162 - var8.packetBuffer.writeShort(Messages.baseY + var1); // L: 8163 - var8.packetBuffer.writeShort(Client.selectedSpellChildIndex); // L: 8164 - var8.packetBuffer.method6475(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); // L: 8165 - var8.packetBuffer.method6445(class6.selectedSpellWidget); // L: 8166 - Client.packetWriter.addNode(var8); // L: 8167 - } else if (var2 == 3) { - Client.mouseCrossX = var6; // L: 8338 - Client.mouseCrossY = var7; // L: 8339 - Client.mouseCrossColor = 2; // L: 8340 - Client.mouseCrossState = 0; // L: 8341 - Client.destinationX = var0; // L: 8342 - Client.destinationY = var1; // L: 8343 - var8 = HealthBarDefinition.getPacketBufferNode(ClientPacket.field2634, Client.packetWriter.isaacCipher); // L: 8345 - var8.packetBuffer.method6475(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); // L: 8346 - var8.packetBuffer.method6484(var3); // L: 8347 - var8.packetBuffer.writeShort(var0 + JagexCache.baseX); // L: 8348 - var8.packetBuffer.method6482(Messages.baseY + var1); // L: 8349 - Client.packetWriter.addNode(var8); // L: 8350 - } else if (var2 == 4) { - Client.mouseCrossX = var6; // L: 8706 - Client.mouseCrossY = var7; // L: 8707 - Client.mouseCrossColor = 2; // L: 8708 - Client.mouseCrossState = 0; // L: 8709 - Client.destinationX = var0; // L: 8710 - Client.destinationY = var1; // L: 8711 - var8 = HealthBarDefinition.getPacketBufferNode(ClientPacket.field2619, Client.packetWriter.isaacCipher); // L: 8713 - var8.packetBuffer.writeShort(var0 + JagexCache.baseX); // L: 8714 - var8.packetBuffer.method6484(var3); // L: 8715 - var8.packetBuffer.method6449(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); // L: 8716 - var8.packetBuffer.method6484(Messages.baseY + var1); // L: 8717 - Client.packetWriter.addNode(var8); // L: 8718 - } else if (var2 == 5) { - Client.mouseCrossX = var6; // L: 8189 - Client.mouseCrossY = var7; // L: 8190 - Client.mouseCrossColor = 2; // L: 8191 - Client.mouseCrossState = 0; // L: 8192 - Client.destinationX = var0; // L: 8193 - Client.destinationY = var1; // L: 8194 - var8 = HealthBarDefinition.getPacketBufferNode(ClientPacket.field2615, Client.packetWriter.isaacCipher); // L: 8196 - var8.packetBuffer.method6482(var0 + JagexCache.baseX); // L: 8197 - var8.packetBuffer.method6484(Messages.baseY + var1); // L: 8198 - var8.packetBuffer.method6449(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); // L: 8199 - var8.packetBuffer.method6483(var3); // L: 8200 - Client.packetWriter.addNode(var8); // L: 8201 - } else if (var2 == 6) { - Client.mouseCrossX = var6; // L: 8557 - Client.mouseCrossY = var7; // L: 8558 - Client.mouseCrossColor = 2; // L: 8559 - Client.mouseCrossState = 0; // L: 8560 - Client.destinationX = var0; // L: 8561 - Client.destinationY = var1; // L: 8562 - var8 = HealthBarDefinition.getPacketBufferNode(ClientPacket.field2572, Client.packetWriter.isaacCipher); // L: 8564 - var8.packetBuffer.method6483(var3); // L: 8565 - var8.packetBuffer.method6483(Messages.baseY + var1); // L: 8566 - var8.packetBuffer.method6449(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); // L: 8567 - var8.packetBuffer.method6484(var0 + JagexCache.baseX); // L: 8568 - Client.packetWriter.addNode(var8); // L: 8569 } else { - PacketBufferNode var9; - NPC var13; - if (var2 == 7) { - var13 = Client.npcs[var3]; // L: 8289 - if (var13 != null) { // L: 8290 - Client.mouseCrossX = var6; // L: 8291 - Client.mouseCrossY = var7; // L: 8292 - Client.mouseCrossColor = 2; // L: 8293 - Client.mouseCrossState = 0; // L: 8294 - Client.destinationX = var0; // L: 8295 - Client.destinationY = var1; // L: 8296 - var9 = HealthBarDefinition.getPacketBufferNode(ClientPacket.field2579, Client.packetWriter.isaacCipher); // L: 8298 - var9.packetBuffer.writeByte(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); // L: 8299 - var9.packetBuffer.method6484(class8.selectedItemId); // L: 8300 - var9.packetBuffer.method6445(class35.selectedItemWidget); // L: 8301 - var9.packetBuffer.method6483(var3); // L: 8302 - var9.packetBuffer.method6482(UserComparator8.selectedItemSlot); // L: 8303 - Client.packetWriter.addNode(var9); // L: 8304 - } - } else if (var2 == 8) { - var13 = Client.npcs[var3]; // L: 8501 - if (var13 != null) { // L: 8502 - Client.mouseCrossX = var6; // L: 8503 - Client.mouseCrossY = var7; // L: 8504 - Client.mouseCrossColor = 2; // L: 8505 - Client.mouseCrossState = 0; // L: 8506 - Client.destinationX = var0; // L: 8507 - Client.destinationY = var1; // L: 8508 - var9 = HealthBarDefinition.getPacketBufferNode(ClientPacket.field2591, Client.packetWriter.isaacCipher); // L: 8509 - var9.packetBuffer.method6445(class6.selectedSpellWidget); // L: 8510 - var9.packetBuffer.method6482(Client.field773); // L: 8511 - var9.packetBuffer.method6482(var3); // L: 8512 - var9.packetBuffer.writeShort(Client.selectedSpellChildIndex); // L: 8513 - var9.packetBuffer.method6475(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); // L: 8514 - Client.packetWriter.addNode(var9); // L: 8515 - } - } else if (var2 == 9) { - var13 = Client.npcs[var3]; // L: 8745 - if (var13 != null) { // L: 8746 - Client.mouseCrossX = var6; // L: 8747 - Client.mouseCrossY = var7; // L: 8748 - Client.mouseCrossColor = 2; // L: 8749 - Client.mouseCrossState = 0; // L: 8750 - Client.destinationX = var0; // L: 8751 - Client.destinationY = var1; // L: 8752 - var9 = HealthBarDefinition.getPacketBufferNode(ClientPacket.field2597, Client.packetWriter.isaacCipher); // L: 8754 - var9.packetBuffer.method6449(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); // L: 8755 - var9.packetBuffer.method6482(var3); // L: 8756 - Client.packetWriter.addNode(var9); // L: 8757 - } - } else if (var2 == 10) { - var13 = Client.npcs[var3]; // L: 8809 - if (var13 != null) { // L: 8810 - Client.mouseCrossX = var6; // L: 8811 - Client.mouseCrossY = var7; // L: 8812 - Client.mouseCrossColor = 2; // L: 8813 - Client.mouseCrossState = 0; // L: 8814 - Client.destinationX = var0; // L: 8815 - Client.destinationY = var1; // L: 8816 - var9 = HealthBarDefinition.getPacketBufferNode(ClientPacket.field2612, Client.packetWriter.isaacCipher); // L: 8818 - var9.packetBuffer.method6483(var3); // L: 8819 - var9.packetBuffer.method6449(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); // L: 8820 - Client.packetWriter.addNode(var9); // L: 8821 - } - } else if (var2 == 11) { - var13 = Client.npcs[var3]; // L: 8761 - if (var13 != null) { // L: 8762 - Client.mouseCrossX = var6; // L: 8763 - Client.mouseCrossY = var7; // L: 8764 - Client.mouseCrossColor = 2; // L: 8765 - Client.mouseCrossState = 0; // L: 8766 - Client.destinationX = var0; // L: 8767 - Client.destinationY = var1; // L: 8768 - var9 = HealthBarDefinition.getPacketBufferNode(ClientPacket.field2602, Client.packetWriter.isaacCipher); // L: 8770 - var9.packetBuffer.method6482(var3); // L: 8771 - var9.packetBuffer.writeByte(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); // L: 8772 - Client.packetWriter.addNode(var9); // L: 8773 - } - } else if (var2 == 12) { - var13 = Client.npcs[var3]; // L: 8137 - if (var13 != null) { // L: 8138 - Client.mouseCrossX = var6; // L: 8139 - Client.mouseCrossY = var7; // L: 8140 - Client.mouseCrossColor = 2; // L: 8141 - Client.mouseCrossState = 0; // L: 8142 - Client.destinationX = var0; // L: 8143 - Client.destinationY = var1; // L: 8144 - var9 = HealthBarDefinition.getPacketBufferNode(ClientPacket.field2594, Client.packetWriter.isaacCipher); // L: 8146 - var9.packetBuffer.writeByte(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); // L: 8147 - var9.packetBuffer.method6483(var3); // L: 8148 - Client.packetWriter.addNode(var9); // L: 8149 - } - } else if (var2 == 13) { - var13 = Client.npcs[var3]; // L: 8572 - if (var13 != null) { // L: 8573 - Client.mouseCrossX = var6; // L: 8574 - Client.mouseCrossY = var7; // L: 8575 - Client.mouseCrossColor = 2; // L: 8576 - Client.mouseCrossState = 0; // L: 8577 - Client.destinationX = var0; // L: 8578 - Client.destinationY = var1; // L: 8579 - var9 = HealthBarDefinition.getPacketBufferNode(ClientPacket.field2618, Client.packetWriter.isaacCipher); // L: 8581 - var9.packetBuffer.method6475(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); // L: 8582 - var9.packetBuffer.method6484(var3); // L: 8583 - Client.packetWriter.addNode(var9); // L: 8584 - } - } else { - Player var15; - if (var2 == 14) { - var15 = Client.players[var3]; // L: 8170 - if (var15 != null) { // L: 8171 - Client.mouseCrossX = var6; // L: 8172 - Client.mouseCrossY = var7; // L: 8173 - Client.mouseCrossColor = 2; // L: 8174 - Client.mouseCrossState = 0; // L: 8175 - Client.destinationX = var0; // L: 8176 - Client.destinationY = var1; // L: 8177 - var9 = HealthBarDefinition.getPacketBufferNode(ClientPacket.field2616, Client.packetWriter.isaacCipher); // L: 8179 - var9.packetBuffer.writeIntME(class35.selectedItemWidget); // L: 8180 - var9.packetBuffer.method6483(class8.selectedItemId); // L: 8181 - var9.packetBuffer.method6449(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); // L: 8182 - var9.packetBuffer.method6483(UserComparator8.selectedItemSlot); // L: 8183 - var9.packetBuffer.writeShort(var3); // L: 8184 - Client.packetWriter.addNode(var9); // L: 8185 - } - } else if (var2 == 15) { - var15 = Client.players[var3]; // L: 8617 - if (var15 != null) { // L: 8618 - Client.mouseCrossX = var6; // L: 8619 - Client.mouseCrossY = var7; // L: 8620 - Client.mouseCrossColor = 2; // L: 8621 - Client.mouseCrossState = 0; // L: 8622 - Client.destinationX = var0; // L: 8623 - Client.destinationY = var1; // L: 8624 - var9 = HealthBarDefinition.getPacketBufferNode(ClientPacket.field2608, Client.packetWriter.isaacCipher); // L: 8625 - var9.packetBuffer.method6483(Client.selectedSpellChildIndex); // L: 8626 - var9.packetBuffer.method6484(var3); // L: 8627 - var9.packetBuffer.method6493(class6.selectedSpellWidget); // L: 8628 - var9.packetBuffer.method6610(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); // L: 8629 - var9.packetBuffer.method6484(Client.field773); // L: 8630 - Client.packetWriter.addNode(var9); // L: 8631 - } - } else if (var2 == 16) { - Client.mouseCrossX = var6; // L: 8456 - Client.mouseCrossY = var7; // L: 8457 - Client.mouseCrossColor = 2; // L: 8458 - Client.mouseCrossState = 0; // L: 8459 - Client.destinationX = var0; // L: 8460 - Client.destinationY = var1; // L: 8461 - var8 = HealthBarDefinition.getPacketBufferNode(ClientPacket.field2570, Client.packetWriter.isaacCipher); // L: 8463 - var8.packetBuffer.method6482(UserComparator8.selectedItemSlot); // L: 8464 - var8.packetBuffer.method6483(var3); // L: 8465 - var8.packetBuffer.method6482(class8.selectedItemId); // L: 8466 - var8.packetBuffer.method6484(Messages.baseY + var1); // L: 8467 - var8.packetBuffer.method6482(var0 + JagexCache.baseX); // L: 8468 - var8.packetBuffer.method6445(class35.selectedItemWidget); // L: 8469 - var8.packetBuffer.method6610(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); // L: 8470 - Client.packetWriter.addNode(var8); // L: 8471 - } else if (var2 == 17) { - Client.mouseCrossX = var6; // L: 8635 - Client.mouseCrossY = var7; // L: 8636 - Client.mouseCrossColor = 2; // L: 8637 - Client.mouseCrossState = 0; // L: 8638 - Client.destinationX = var0; // L: 8639 - Client.destinationY = var1; // L: 8640 - var8 = HealthBarDefinition.getPacketBufferNode(ClientPacket.field2661, Client.packetWriter.isaacCipher); // L: 8641 - var8.packetBuffer.method6449(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); // L: 8642 - var8.packetBuffer.method6493(class6.selectedSpellWidget); // L: 8643 - var8.packetBuffer.method6482(Messages.baseY + var1); // L: 8644 - var8.packetBuffer.method6484(Client.field773); // L: 8645 - var8.packetBuffer.method6483(var3); // L: 8646 - var8.packetBuffer.writeShort(var0 + JagexCache.baseX); // L: 8647 - var8.packetBuffer.method6482(Client.selectedSpellChildIndex); // L: 8648 - Client.packetWriter.addNode(var8); // L: 8649 - } else if (var2 == 18) { - Client.mouseCrossX = var6; // L: 8721 - Client.mouseCrossY = var7; // L: 8722 - Client.mouseCrossColor = 2; // L: 8723 - Client.mouseCrossState = 0; // L: 8724 - Client.destinationX = var0; // L: 8725 - Client.destinationY = var1; // L: 8726 - var8 = HealthBarDefinition.getPacketBufferNode(ClientPacket.field2617, Client.packetWriter.isaacCipher); // L: 8728 - var8.packetBuffer.writeShort(var3); // L: 8729 - var8.packetBuffer.method6610(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); // L: 8730 - var8.packetBuffer.method6484(Messages.baseY + var1); // L: 8731 - var8.packetBuffer.writeShort(var0 + JagexCache.baseX); // L: 8732 - Client.packetWriter.addNode(var8); // L: 8733 - } else if (var2 == 19) { - Client.mouseCrossX = var6; // L: 8474 - Client.mouseCrossY = var7; // L: 8475 - Client.mouseCrossColor = 2; // L: 8476 - Client.mouseCrossState = 0; // L: 8477 - Client.destinationX = var0; // L: 8478 - Client.destinationY = var1; // L: 8479 - var8 = HealthBarDefinition.getPacketBufferNode(ClientPacket.field2652, Client.packetWriter.isaacCipher); // L: 8481 - var8.packetBuffer.method6482(var0 + JagexCache.baseX); // L: 8482 - var8.packetBuffer.method6484(Messages.baseY + var1); // L: 8483 - var8.packetBuffer.method6449(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); // L: 8484 - var8.packetBuffer.method6482(var3); // L: 8485 - Client.packetWriter.addNode(var8); // L: 8486 - } else if (var2 == 20) { - Client.mouseCrossX = var6; // L: 8308 - Client.mouseCrossY = var7; // L: 8309 - Client.mouseCrossColor = 2; // L: 8310 - Client.mouseCrossState = 0; // L: 8311 - Client.destinationX = var0; // L: 8312 - Client.destinationY = var1; // L: 8313 - var8 = HealthBarDefinition.getPacketBufferNode(ClientPacket.field2627, Client.packetWriter.isaacCipher); // L: 8315 - var8.packetBuffer.method6483(var3); // L: 8316 - var8.packetBuffer.method6482(var0 + JagexCache.baseX); // L: 8317 - var8.packetBuffer.method6610(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); // L: 8318 - var8.packetBuffer.method6484(Messages.baseY + var1); // L: 8319 - Client.packetWriter.addNode(var8); // L: 8320 - } else if (var2 == 21) { - Client.mouseCrossX = var6; // L: 8353 - Client.mouseCrossY = var7; // L: 8354 - Client.mouseCrossColor = 2; // L: 8355 - Client.mouseCrossState = 0; // L: 8356 - Client.destinationX = var0; // L: 8357 - Client.destinationY = var1; // L: 8358 - var8 = HealthBarDefinition.getPacketBufferNode(ClientPacket.field2645, Client.packetWriter.isaacCipher); // L: 8360 - var8.packetBuffer.method6484(var3); // L: 8361 - var8.packetBuffer.writeShort(Messages.baseY + var1); // L: 8362 - var8.packetBuffer.method6449(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); // L: 8363 - var8.packetBuffer.writeShort(var0 + JagexCache.baseX); // L: 8364 - Client.packetWriter.addNode(var8); // L: 8365 - } else if (var2 == 22) { - Client.mouseCrossX = var6; // L: 8323 - Client.mouseCrossY = var7; // L: 8324 - Client.mouseCrossColor = 2; // L: 8325 - Client.mouseCrossState = 0; // L: 8326 - Client.destinationX = var0; // L: 8327 - Client.destinationY = var1; // L: 8328 - var8 = HealthBarDefinition.getPacketBufferNode(ClientPacket.field2642, Client.packetWriter.isaacCipher); // L: 8330 - var8.packetBuffer.method6484(var3); // L: 8331 - var8.packetBuffer.method6483(var0 + JagexCache.baseX); // L: 8332 - var8.packetBuffer.method6475(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); // L: 8333 - var8.packetBuffer.method6483(Messages.baseY + var1); // L: 8334 - Client.packetWriter.addNode(var8); // L: 8335 - } else if (var2 == 23) { - if (Client.isMenuOpen) { // L: 8204 - class5.scene.setViewportWalking(); // L: 8205 - } else { - class5.scene.menuOpen(ParamComposition.Client_plane, var0, var1, true); // L: 8208 - } - } else { - PacketBufferNode var10; - Widget var16; - if (var2 == 24) { - var16 = DevicePcmPlayerProvider.getWidget(var1); // L: 8519 - boolean var12 = true; // L: 8520 - if (var16.contentType > 0) { // L: 8521 - var12 = WorldMapSprite.method3580(var16); - } - - if (var12) { // L: 8522 - var10 = HealthBarDefinition.getPacketBufferNode(ClientPacket.field2630, Client.packetWriter.isaacCipher); // L: 8524 - var10.packetBuffer.writeInt(var1); // L: 8525 - Client.packetWriter.addNode(var10); // L: 8526 - } - } else { - if (var2 == 25) { - var16 = PacketWriter.getWidgetChild(var1, var0); // L: 8588 - if (var16 != null) { // L: 8589 - class15.Widget_runOnTargetLeave(); // L: 8590 - GrandExchangeOffer.selectSpell(var1, var0, AttackOption.Widget_unpackTargetMask(class26.getWidgetFlags(var16)), var16.itemId); // L: 8591 - Client.isItemSelected = 0; // L: 8592 - Client.selectedSpellActionName = UserComparator9.Widget_getSpellActionName(var16); // L: 8593 - if (Client.selectedSpellActionName == null) { // L: 8594 - Client.selectedSpellActionName = "null"; - } - - if (var16.isIf3) { // L: 8595 - Client.selectedSpellName = var16.dataText + colorStartTag(16777215); - } else { - Client.selectedSpellName = colorStartTag(65280) + var16.spellName + colorStartTag(16777215); // L: 8596 - } - } - - return; // L: 8598 - } - - if (var2 == 26) { - class80.method1943(); // L: 8229 - } else { - int var11; - Widget var14; - if (var2 == 28) { - var8 = HealthBarDefinition.getPacketBufferNode(ClientPacket.field2630, Client.packetWriter.isaacCipher); // L: 8490 - var8.packetBuffer.writeInt(var1); // L: 8491 - Client.packetWriter.addNode(var8); // L: 8492 - var14 = DevicePcmPlayerProvider.getWidget(var1); // L: 8493 - if (var14.cs1Instructions != null && var14.cs1Instructions[0][0] == 5) { // L: 8494 - var11 = var14.cs1Instructions[0][1]; // L: 8495 - Varps.Varps_main[var11] = 1 - Varps.Varps_main[var11]; // L: 8496 - WorldMapData_0.changeGameOptions(var11); // L: 8497 - } - } else if (var2 == 29) { - var8 = HealthBarDefinition.getPacketBufferNode(ClientPacket.field2630, Client.packetWriter.isaacCipher); // L: 8531 - var8.packetBuffer.writeInt(var1); // L: 8532 - Client.packetWriter.addNode(var8); // L: 8533 - var14 = DevicePcmPlayerProvider.getWidget(var1); // L: 8534 - if (var14.cs1Instructions != null && var14.cs1Instructions[0][0] == 5) { // L: 8535 - var11 = var14.cs1Instructions[0][1]; // L: 8536 - if (Varps.Varps_main[var11] != var14.cs1ComparisonValues[0]) { // L: 8537 - Varps.Varps_main[var11] = var14.cs1ComparisonValues[0]; // L: 8538 - WorldMapData_0.changeGameOptions(var11); // L: 8539 - } - } - } else if (var2 == 30) { - if (Client.meslayerContinueWidget == null) { // L: 8212 - resumePauseWidget(var1, var0); // L: 8213 - Client.meslayerContinueWidget = PacketWriter.getWidgetChild(var1, var0); // L: 8214 - VerticalAlignment.invalidateWidget(Client.meslayerContinueWidget); // L: 8215 - } - } else if (var2 == 31) { - var8 = HealthBarDefinition.getPacketBufferNode(ClientPacket.field2624, Client.packetWriter.isaacCipher); // L: 8693 - var8.packetBuffer.writeInt(var1); // L: 8694 - var8.packetBuffer.writeIntME(class35.selectedItemWidget); // L: 8695 - var8.packetBuffer.method6483(var0); // L: 8696 - var8.packetBuffer.writeShort(var3); // L: 8697 - var8.packetBuffer.method6484(UserComparator8.selectedItemSlot); // L: 8698 - var8.packetBuffer.method6484(class8.selectedItemId); // L: 8699 - Client.packetWriter.addNode(var8); // L: 8700 - Client.field817 = 0; // L: 8701 - Projectile.field1039 = DevicePcmPlayerProvider.getWidget(var1); // L: 8702 - Client.field633 = var0; // L: 8703 - } else if (var2 == 32) { - var8 = HealthBarDefinition.getPacketBufferNode(ClientPacket.field2663, Client.packetWriter.isaacCipher); // L: 8545 - var8.packetBuffer.method6445(class6.selectedSpellWidget); // L: 8546 - var8.packetBuffer.method6483(Client.selectedSpellChildIndex); // L: 8547 - var8.packetBuffer.method6445(var1); // L: 8548 - var8.packetBuffer.method6482(var3); // L: 8549 - var8.packetBuffer.method6483(var0); // L: 8550 - Client.packetWriter.addNode(var8); // L: 8551 - Client.field817 = 0; // L: 8552 - Projectile.field1039 = DevicePcmPlayerProvider.getWidget(var1); // L: 8553 - Client.field633 = var0; // L: 8554 - } else if (var2 == 33) { - var8 = HealthBarDefinition.getPacketBufferNode(ClientPacket.field2595, Client.packetWriter.isaacCipher); // L: 8396 - var8.packetBuffer.method6445(var1); // L: 8397 - var8.packetBuffer.method6482(var0); // L: 8398 - var8.packetBuffer.writeShort(var3); // L: 8399 - Client.packetWriter.addNode(var8); // L: 8400 - Client.field817 = 0; // L: 8401 - Projectile.field1039 = DevicePcmPlayerProvider.getWidget(var1); // L: 8402 - Client.field633 = var0; // L: 8403 - } else if (var2 == 34) { - var8 = HealthBarDefinition.getPacketBufferNode(ClientPacket.field2569, Client.packetWriter.isaacCipher); // L: 8113 - var8.packetBuffer.writeIntME(var1); // L: 8114 - var8.packetBuffer.method6482(var0); // L: 8115 - var8.packetBuffer.method6482(var3); // L: 8116 - Client.packetWriter.addNode(var8); // L: 8117 - Client.field817 = 0; // L: 8118 - Projectile.field1039 = DevicePcmPlayerProvider.getWidget(var1); // L: 8119 - Client.field633 = var0; // L: 8120 - } else if (var2 == 35) { - var8 = HealthBarDefinition.getPacketBufferNode(ClientPacket.field2620, Client.packetWriter.isaacCipher); // L: 8407 - var8.packetBuffer.writeShort(var3); // L: 8408 - var8.packetBuffer.method6445(var1); // L: 8409 - var8.packetBuffer.method6484(var0); // L: 8410 - Client.packetWriter.addNode(var8); // L: 8411 - Client.field817 = 0; // L: 8412 - Projectile.field1039 = DevicePcmPlayerProvider.getWidget(var1); // L: 8413 - Client.field633 = var0; // L: 8414 - } else if (var2 == 36) { - var8 = HealthBarDefinition.getPacketBufferNode(ClientPacket.field2651, Client.packetWriter.isaacCipher); // L: 8682 - var8.packetBuffer.method6493(var1); // L: 8683 - var8.packetBuffer.method6482(var3); // L: 8684 - var8.packetBuffer.method6484(var0); // L: 8685 - Client.packetWriter.addNode(var8); // L: 8686 - Client.field817 = 0; // L: 8687 - Projectile.field1039 = DevicePcmPlayerProvider.getWidget(var1); // L: 8688 - Client.field633 = var0; // L: 8689 - } else if (var2 == 37) { - var8 = HealthBarDefinition.getPacketBufferNode(ClientPacket.field2575, Client.packetWriter.isaacCipher); // L: 8429 - var8.packetBuffer.writeIntME(var1); // L: 8430 - var8.packetBuffer.method6484(var0); // L: 8431 - var8.packetBuffer.writeShort(var3); // L: 8432 - Client.packetWriter.addNode(var8); // L: 8433 - Client.field817 = 0; // L: 8434 - Projectile.field1039 = DevicePcmPlayerProvider.getWidget(var1); // L: 8435 - Client.field633 = var0; // L: 8436 - } else { - if (var2 == 38) { - class15.Widget_runOnTargetLeave(); // L: 8261 - var16 = DevicePcmPlayerProvider.getWidget(var1); // L: 8262 - Client.isItemSelected = 1; // L: 8263 - UserComparator8.selectedItemSlot = var0; // L: 8264 - class35.selectedItemWidget = var1; // L: 8265 - class8.selectedItemId = var3; // L: 8266 - VerticalAlignment.invalidateWidget(var16); // L: 8267 - Client.selectedItemName = colorStartTag(16748608) + Strings.ItemDefinition_get(var3).name + colorStartTag(16777215); // L: 8268 - if (Client.selectedItemName == null) { // L: 8269 - Client.selectedItemName = "null"; - } - - return; // L: 8270 - } - - if (var2 == 39) { - var8 = HealthBarDefinition.getPacketBufferNode(ClientPacket.field2664, Client.packetWriter.isaacCipher); // L: 8369 - var8.packetBuffer.method6484(var0); // L: 8370 - var8.packetBuffer.method6482(var3); // L: 8371 - var8.packetBuffer.method6493(var1); // L: 8372 - Client.packetWriter.addNode(var8); // L: 8373 - Client.field817 = 0; // L: 8374 - Projectile.field1039 = DevicePcmPlayerProvider.getWidget(var1); // L: 8375 - Client.field633 = var0; // L: 8376 - } else if (var2 == 40) { - var8 = HealthBarDefinition.getPacketBufferNode(ClientPacket.field2641, Client.packetWriter.isaacCipher); // L: 8086 - var8.packetBuffer.method6482(var0); // L: 8087 - var8.packetBuffer.writeIntME(var1); // L: 8088 - var8.packetBuffer.method6483(var3); // L: 8089 - Client.packetWriter.addNode(var8); // L: 8090 - Client.field817 = 0; // L: 8091 - Projectile.field1039 = DevicePcmPlayerProvider.getWidget(var1); // L: 8092 - Client.field633 = var0; // L: 8093 - } else if (var2 == 41) { - var8 = HealthBarDefinition.getPacketBufferNode(ClientPacket.field2668, Client.packetWriter.isaacCipher); // L: 8418 - var8.packetBuffer.method6482(var3); // L: 8419 - var8.packetBuffer.method6483(var0); // L: 8420 - var8.packetBuffer.writeIntME(var1); // L: 8421 - Client.packetWriter.addNode(var8); // L: 8422 - Client.field817 = 0; // L: 8423 - Projectile.field1039 = DevicePcmPlayerProvider.getWidget(var1); // L: 8424 - Client.field633 = var0; // L: 8425 - } else if (var2 == 42) { - var8 = HealthBarDefinition.getPacketBufferNode(ClientPacket.field2577, Client.packetWriter.isaacCipher); // L: 8826 - var8.packetBuffer.method6445(var1); // L: 8827 - var8.packetBuffer.writeShort(var3); // L: 8828 - var8.packetBuffer.method6483(var0); // L: 8829 - Client.packetWriter.addNode(var8); // L: 8830 - Client.field817 = 0; // L: 8831 - Projectile.field1039 = DevicePcmPlayerProvider.getWidget(var1); // L: 8832 - Client.field633 = var0; // L: 8833 - } else if (var2 == 43) { - var8 = HealthBarDefinition.getPacketBufferNode(ClientPacket.field2660, Client.packetWriter.isaacCipher); // L: 8653 - var8.packetBuffer.method6483(var3); // L: 8654 - var8.packetBuffer.method6484(var0); // L: 8655 - var8.packetBuffer.method6493(var1); // L: 8656 - Client.packetWriter.addNode(var8); // L: 8657 - Client.field817 = 0; // L: 8658 - Projectile.field1039 = DevicePcmPlayerProvider.getWidget(var1); // L: 8659 - Client.field633 = var0; // L: 8660 - } else if (var2 == 44) { - var15 = Client.players[var3]; // L: 8601 - if (var15 != null) { // L: 8602 - Client.mouseCrossX = var6; // L: 8603 - Client.mouseCrossY = var7; // L: 8604 - Client.mouseCrossColor = 2; // L: 8605 - Client.mouseCrossState = 0; // L: 8606 - Client.destinationX = var0; // L: 8607 - Client.destinationY = var1; // L: 8608 - var9 = HealthBarDefinition.getPacketBufferNode(ClientPacket.field2571, Client.packetWriter.isaacCipher); // L: 8610 - var9.packetBuffer.method6483(var3); // L: 8611 - var9.packetBuffer.method6610(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); // L: 8612 - Client.packetWriter.addNode(var9); // L: 8613 - } - } else if (var2 == 45) { - var15 = Client.players[var3]; // L: 8846 - if (var15 != null) { // L: 8847 - Client.mouseCrossX = var6; // L: 8848 - Client.mouseCrossY = var7; // L: 8849 - Client.mouseCrossColor = 2; // L: 8850 - Client.mouseCrossState = 0; // L: 8851 - Client.destinationX = var0; // L: 8852 - Client.destinationY = var1; // L: 8853 - var9 = HealthBarDefinition.getPacketBufferNode(ClientPacket.field2647, Client.packetWriter.isaacCipher); // L: 8855 - var9.packetBuffer.method6482(var3); // L: 8856 - var9.packetBuffer.writeByte(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); // L: 8857 - Client.packetWriter.addNode(var9); // L: 8858 - } - } else if (var2 == 46) { - var15 = Client.players[var3]; // L: 8793 - if (var15 != null) { // L: 8794 - Client.mouseCrossX = var6; // L: 8795 - Client.mouseCrossY = var7; // L: 8796 - Client.mouseCrossColor = 2; // L: 8797 - Client.mouseCrossState = 0; // L: 8798 - Client.destinationX = var0; // L: 8799 - Client.destinationY = var1; // L: 8800 - var9 = HealthBarDefinition.getPacketBufferNode(ClientPacket.field2622, Client.packetWriter.isaacCipher); // L: 8802 - var9.packetBuffer.method6610(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); // L: 8803 - var9.packetBuffer.writeShort(var3); // L: 8804 - Client.packetWriter.addNode(var9); // L: 8805 - } - } else if (var2 == 47) { - var15 = Client.players[var3]; // L: 8273 - if (var15 != null) { // L: 8274 - Client.mouseCrossX = var6; // L: 8275 - Client.mouseCrossY = var7; // L: 8276 - Client.mouseCrossColor = 2; // L: 8277 - Client.mouseCrossState = 0; // L: 8278 - Client.destinationX = var0; // L: 8279 - Client.destinationY = var1; // L: 8280 - var9 = HealthBarDefinition.getPacketBufferNode(ClientPacket.field2565, Client.packetWriter.isaacCipher); // L: 8282 - var9.packetBuffer.method6483(var3); // L: 8283 - var9.packetBuffer.method6610(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); // L: 8284 - Client.packetWriter.addNode(var9); // L: 8285 - } - } else if (var2 == 48) { - var15 = Client.players[var3]; // L: 8777 - if (var15 != null) { // L: 8778 - Client.mouseCrossX = var6; // L: 8779 - Client.mouseCrossY = var7; // L: 8780 - Client.mouseCrossColor = 2; // L: 8781 - Client.mouseCrossState = 0; // L: 8782 - Client.destinationX = var0; // L: 8783 - Client.destinationY = var1; // L: 8784 - var9 = HealthBarDefinition.getPacketBufferNode(ClientPacket.field2654, Client.packetWriter.isaacCipher); // L: 8786 - var9.packetBuffer.method6484(var3); // L: 8787 - var9.packetBuffer.writeByte(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); // L: 8788 - Client.packetWriter.addNode(var9); // L: 8789 - } - } else if (var2 == 49) { - var15 = Client.players[var3]; // L: 8379 - if (var15 != null) { // L: 8380 - Client.mouseCrossX = var6; // L: 8381 - Client.mouseCrossY = var7; // L: 8382 - Client.mouseCrossColor = 2; // L: 8383 - Client.mouseCrossState = 0; // L: 8384 - Client.destinationX = var0; // L: 8385 - Client.destinationY = var1; // L: 8386 - var9 = HealthBarDefinition.getPacketBufferNode(ClientPacket.field2600, Client.packetWriter.isaacCipher); // L: 8388 - var9.packetBuffer.method6449(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); // L: 8389 - var9.packetBuffer.method6484(var3); // L: 8390 - Client.packetWriter.addNode(var9); // L: 8391 - } - } else if (var2 == 50) { - var15 = Client.players[var3]; // L: 8096 - if (var15 != null) { // L: 8097 - Client.mouseCrossX = var6; // L: 8098 - Client.mouseCrossY = var7; // L: 8099 - Client.mouseCrossColor = 2; // L: 8100 - Client.mouseCrossState = 0; // L: 8101 - Client.destinationX = var0; // L: 8102 - Client.destinationY = var1; // L: 8103 - var9 = HealthBarDefinition.getPacketBufferNode(ClientPacket.field2613, Client.packetWriter.isaacCipher); // L: 8105 - var9.packetBuffer.writeByte(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); // L: 8106 - var9.packetBuffer.method6484(var3); // L: 8107 - Client.packetWriter.addNode(var9); // L: 8108 - } - } else if (var2 == 51) { - var15 = Client.players[var3]; // L: 8232 - if (var15 != null) { // L: 8233 - Client.mouseCrossX = var6; // L: 8234 - Client.mouseCrossY = var7; // L: 8235 - Client.mouseCrossColor = 2; // L: 8236 - Client.mouseCrossState = 0; // L: 8237 - Client.destinationX = var0; // L: 8238 - Client.destinationY = var1; // L: 8239 - var9 = HealthBarDefinition.getPacketBufferNode(ClientPacket.field2669, Client.packetWriter.isaacCipher); // L: 8241 - var9.packetBuffer.writeShort(var3); // L: 8242 - var9.packetBuffer.method6475(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); // L: 8243 - Client.packetWriter.addNode(var9); // L: 8244 - } - } else { - label640: { - if (var2 != 57) { - if (var2 == 58) { - var16 = PacketWriter.getWidgetChild(var1, var0); // L: 8123 - if (var16 != null) { // L: 8124 - var9 = HealthBarDefinition.getPacketBufferNode(ClientPacket.field2598, Client.packetWriter.isaacCipher); // L: 8126 - var9.packetBuffer.writeIntME(var1); // L: 8127 - var9.packetBuffer.method6483(var16.itemId); // L: 8128 - var9.packetBuffer.method6482(Client.field773); // L: 8129 - var9.packetBuffer.writeInt(class6.selectedSpellWidget); // L: 8130 - var9.packetBuffer.method6483(Client.selectedSpellChildIndex); // L: 8131 - var9.packetBuffer.method6482(var0); // L: 8132 - Client.packetWriter.addNode(var9); // L: 8133 - } - break label640; - } - - if (var2 == 1001) { - Client.mouseCrossX = var6; // L: 8070 - Client.mouseCrossY = var7; // L: 8071 - Client.mouseCrossColor = 2; // L: 8072 - Client.mouseCrossState = 0; // L: 8073 - Client.destinationX = var0; // L: 8074 - Client.destinationY = var1; // L: 8075 - var8 = HealthBarDefinition.getPacketBufferNode(ClientPacket.field2643, Client.packetWriter.isaacCipher); // L: 8077 - var8.packetBuffer.method6484(var0 + JagexCache.baseX); // L: 8078 - var8.packetBuffer.method6475(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); // L: 8079 - var8.packetBuffer.writeShort(var3); // L: 8080 - var8.packetBuffer.method6484(Messages.baseY + var1); // L: 8081 - Client.packetWriter.addNode(var8); // L: 8082 - break label640; - } - - if (var2 == 1002) { - Client.mouseCrossX = var6; // L: 8836 - Client.mouseCrossY = var7; // L: 8837 - Client.mouseCrossColor = 2; // L: 8838 - Client.mouseCrossState = 0; // L: 8839 - var8 = HealthBarDefinition.getPacketBufferNode(ClientPacket.field2671, Client.packetWriter.isaacCipher); // L: 8841 - var8.packetBuffer.method6482(var3); // L: 8842 - Client.packetWriter.addNode(var8); // L: 8843 - break label640; - } - - if (var2 == 1003) { - Client.mouseCrossX = var6; // L: 8439 - Client.mouseCrossY = var7; // L: 8440 - Client.mouseCrossColor = 2; // L: 8441 - Client.mouseCrossState = 0; // L: 8442 - var13 = Client.npcs[var3]; // L: 8443 - if (var13 != null) { // L: 8444 - NPCComposition var17 = var13.definition; // L: 8445 - if (var17.transforms != null) { // L: 8446 - var17 = var17.transform(); - } - - if (var17 != null) { // L: 8447 - var10 = HealthBarDefinition.getPacketBufferNode(ClientPacket.field2593, Client.packetWriter.isaacCipher); // L: 8449 - var10.packetBuffer.method6482(var17.id); // L: 8450 - Client.packetWriter.addNode(var10); // L: 8451 - } - } - break label640; - } - - if (var2 == 1004) { - Client.mouseCrossX = var6; // L: 8219 - Client.mouseCrossY = var7; // L: 8220 - Client.mouseCrossColor = 2; // L: 8221 - Client.mouseCrossState = 0; // L: 8222 - var8 = HealthBarDefinition.getPacketBufferNode(ClientPacket.field2639, Client.packetWriter.isaacCipher); // L: 8224 - var8.packetBuffer.method6482(var3); // L: 8225 - Client.packetWriter.addNode(var8); // L: 8226 - break label640; - } - - if (var2 == 1005) { - var16 = DevicePcmPlayerProvider.getWidget(var1); // L: 8248 - if (var16 != null && var16.itemQuantities[var0] >= 100000) { // L: 8249 - WorldMapScaleHandler.addGameMessage(27, "", var16.itemQuantities[var0] + " x " + Strings.ItemDefinition_get(var3).name); - } else { - var9 = HealthBarDefinition.getPacketBufferNode(ClientPacket.field2639, Client.packetWriter.isaacCipher); // L: 8252 - var9.packetBuffer.method6482(var3); // L: 8253 - Client.packetWriter.addNode(var9); // L: 8254 - } - - Client.field817 = 0; // L: 8256 - Projectile.field1039 = DevicePcmPlayerProvider.getWidget(var1); // L: 8257 - Client.field633 = var0; // L: 8258 - break label640; - } - - if (var2 != 1007) { - if (var2 == 1008 || var2 == 1010 || var2 == 1009 || var2 == 1011 || var2 == 1012) { - NetSocket.worldMap.worldMapMenuAction(var2, var3, new Coord(var0), new Coord(var1)); // L: 8736 - } - break label640; - } - } - - var16 = PacketWriter.getWidgetChild(var1, var0); // L: 8739 - if (var16 != null) { // L: 8740 - class245.widgetDefaultMenuAction(var3, var1, var0, var16.itemId, var5); // L: 8741 - } - } - } - } - } - } - } - } - } - - if (Client.isItemSelected != 0) { // L: 8861 - Client.isItemSelected = 0; // L: 8862 - VerticalAlignment.invalidateWidget(DevicePcmPlayerProvider.getWidget(class35.selectedItemWidget)); // L: 8863 - } - - if (Client.isSpellSelected) { // L: 8865 - class15.Widget_runOnTargetLeave(); - } - - if (Projectile.field1039 != null && Client.field817 == 0) { // L: 8866 - VerticalAlignment.invalidateWidget(Projectile.field1039); - } - - } // L: 8867 - - @ObfuscatedName("if") - @ObfuscatedSignature( - descriptor = "(III)V", - garbageValue = "999793942" - ) - @Export("resumePauseWidget") - static void resumePauseWidget(int var0, int var1) { - PacketBufferNode var2 = HealthBarDefinition.getPacketBufferNode(ClientPacket.field2584, Client.packetWriter.isaacCipher); // L: 8944 - var2.packetBuffer.method6483(var1); // L: 8945 - var2.packetBuffer.writeIntME(var0); // L: 8946 - Client.packetWriter.addNode(var2); // L: 8947 - } // L: 8948 - - @ObfuscatedName("lh") - @ObfuscatedSignature( - descriptor = "(Liv;I)Liv;", - garbageValue = "2056882108" - ) - static Widget method2731(Widget var0) { - int var2 = class26.getWidgetFlags(var0); // L: 11609 - int var1 = var2 >> 17 & 7; // L: 11611 - int var3 = var1; // L: 11613 - if (var1 == 0) { // L: 11614 - return null; - } else { - for (int var4 = 0; var4 < var3; ++var4) { // L: 11615 - var0 = DevicePcmPlayerProvider.getWidget(var0.parentId); // L: 11616 - if (var0 == null) { // L: 11617 - return null; - } - } - - return var0; // L: 11619 + throw new IllegalArgumentException(); } } } diff --git a/runescape-client/src/main/java/Huffman.java b/runescape-client/src/main/java/Huffman.java index fa95bdf32c..673e360cc0 100644 --- a/runescape-client/src/main/java/Huffman.java +++ b/runescape-client/src/main/java/Huffman.java @@ -1,24 +1,22 @@ +import java.util.concurrent.ScheduledExecutorService; import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ix") +@ObfuscatedName("id") @Implements("Huffman") public class Huffman { - @ObfuscatedName("el") - @ObfuscatedSignature( - descriptor = "Lji;" - ) - @Export("archive14") - static Archive archive14; - @ObfuscatedName("h") + @ObfuscatedName("b") + @Export("soundSystemExecutor") + static ScheduledExecutorService soundSystemExecutor; + @ObfuscatedName("v") @Export("masks") int[] masks; - @ObfuscatedName("c") + @ObfuscatedName("n") @Export("bits") byte[] bits; - @ObfuscatedName("o") + @ObfuscatedName("f") @Export("keys") int[] keys; @@ -105,10 +103,10 @@ public class Huffman { } // L: 60 - @ObfuscatedName("h") + @ObfuscatedName("v") @ObfuscatedSignature( descriptor = "([BII[BII)I", - garbageValue = "509657550" + garbageValue = "-1771956050" ) @Export("compress") int compress(byte[] var1, int var2, int var3, byte[] var4, int var5) { @@ -156,10 +154,10 @@ public class Huffman { return (var7 + 7 >> 3) - var5; // L: 97 } - @ObfuscatedName("c") + @ObfuscatedName("n") @ObfuscatedSignature( descriptor = "([BI[BIII)I", - garbageValue = "2101223048" + garbageValue = "2146568122" ) @Export("decompress") int decompress(byte[] var1, int var2, byte[] var3, int var4, int var5) { diff --git a/runescape-client/src/main/java/IgnoreList.java b/runescape-client/src/main/java/IgnoreList.java index f6cd1c44a2..3a5081a83c 100644 --- a/runescape-client/src/main/java/IgnoreList.java +++ b/runescape-client/src/main/java/IgnoreList.java @@ -3,48 +3,48 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("lj") +@ObfuscatedName("lo") @Implements("IgnoreList") public class IgnoreList extends UserList { - @ObfuscatedName("o") + @ObfuscatedName("f") @ObfuscatedSignature( - descriptor = "Lnj;" + descriptor = "Lnc;" ) @Export("loginType") final LoginType loginType; @ObfuscatedSignature( - descriptor = "(Lnj;)V" + descriptor = "(Lnc;)V" ) public IgnoreList(LoginType var1) { super(400); // L: 12 this.loginType = var1; // L: 13 } // L: 14 - @ObfuscatedName("h") + @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "(I)Llm;", - garbageValue = "-1768347101" + descriptor = "(B)Llx;", + garbageValue = "126" ) @Export("newInstance") User newInstance() { return new Ignored(); // L: 17 } - @ObfuscatedName("c") + @ObfuscatedName("n") @ObfuscatedSignature( - descriptor = "(II)[Llm;", - garbageValue = "836907267" + descriptor = "(II)[Llx;", + garbageValue = "1924184817" ) @Export("newTypedArray") User[] newTypedArray(int var1) { return new Ignored[var1]; // L: 21 } - @ObfuscatedName("o") + @ObfuscatedName("f") @ObfuscatedSignature( - descriptor = "(Lnk;IB)V", - garbageValue = "-118" + descriptor = "(Lnd;IS)V", + garbageValue = "-13688" ) @Export("read") public void read(Buffer var1, int var2) { @@ -87,4 +87,103 @@ public class IgnoreList extends UserList { return; // L: 54 } } + + @ObfuscatedName("f") + @ObfuscatedSignature( + descriptor = "(ILcf;ZI)I", + garbageValue = "369567526" + ) + static int method5628(int var0, Script var1, boolean var2) { + if (var0 < 1000) { // L: 423 + return WorldMapDecorationType.method4833(var0, var1, var2); + } else if (var0 < 1100) { // L: 424 + return class312.method5616(var0, var1, var2); + } else if (var0 < 1200) { // L: 425 + return InvDefinition.method2619(var0, var1, var2); + } else if (var0 < 1300) { // L: 426 + return class43.method435(var0, var1, var2); + } else if (var0 < 1400) { // L: 427 + return ChatChannel.method2009(var0, var1, var2); + } else if (var0 < 1500) { // L: 428 + return class135.method2600(var0, var1, var2); + } else if (var0 < 1600) { // L: 429 + return SceneTilePaint.method4258(var0, var1, var2); + } else if (var0 < 1700) { // L: 430 + return Timer.method5600(var0, var1, var2); + } else if (var0 < 1800) { // L: 431 + return GrandExchangeOfferAgeComparator.method5064(var0, var1, var2); + } else if (var0 < 1900) { // L: 432 + return ScriptEvent.method2093(var0, var1, var2); + } else if (var0 < 2000) { // L: 433 + return class26.method274(var0, var1, var2); + } else if (var0 < 2100) { // L: 434 + return class312.method5616(var0, var1, var2); + } else if (var0 < 2200) { // L: 435 + return InvDefinition.method2619(var0, var1, var2); + } else if (var0 < 2300) { // L: 436 + return class43.method435(var0, var1, var2); + } else if (var0 < 2400) { // L: 437 + return ChatChannel.method2009(var0, var1, var2); + } else if (var0 < 2500) { + return class135.method2600(var0, var1, var2); // L: 438 + } else if (var0 < 2600) { // L: 439 + return VarpDefinition.method2629(var0, var1, var2); + } else if (var0 < 2700) { // L: 440 + return FontName.method6298(var0, var1, var2); + } else if (var0 < 2800) { // L: 441 + return class93.method2080(var0, var1, var2); + } else if (var0 < 2900) { // L: 442 + return Occluder.method4110(var0, var1, var2); + } else if (var0 < 3000) { // L: 443 + return class26.method274(var0, var1, var2); + } else if (var0 < 3200) { // L: 444 + return UserComparator9.method2466(var0, var1, var2); + } else if (var0 < 3300) { // L: 445 + return ObjectComposition.method2964(var0, var1, var2); + } else if (var0 < 3400) { // L: 446 + return WorldMapSection2.method3257(var0, var1, var2); + } else if (var0 < 3500) { // L: 447 + return WorldMapLabelSize.method3217(var0, var1, var2); + } else if (var0 < 3700) { // L: 448 + return class26.method273(var0, var1, var2); + } else if (var0 < 3800) { // L: 449 + return ClanChannel.method41(var0, var1, var2); + } else if (var0 < 3900) { // L: 450 + return WorldMapLabelSize.method3219(var0, var1, var2); + } else if (var0 < 4000) { // L: 451 + return class304.method5528(var0, var1, var2); + } else if (var0 < 4100) { // L: 452 + return FriendsList.method5647(var0, var1, var2); + } else if (var0 < 4200) { // L: 453 + return class80.method1902(var0, var1, var2); + } else if (var0 < 4300) { + return WorldMapLabelSize.method3209(var0, var1, var2); // L: 454 + } else if (var0 < 5100) { // L: 455 + return class24.method261(var0, var1, var2); + } else if (var0 < 5400) { // L: 456 + return class7.method74(var0, var1, var2); + } else if (var0 < 5600) { // L: 457 + return class12.method173(var0, var1, var2); + } else if (var0 < 5700) { // L: 458 + return HealthBarDefinition.method2727(var0, var1, var2); + } else if (var0 < 6300) { // L: 459 + return UrlRequester.method2420(var0, var1, var2); + } else if (var0 < 6600) { // L: 460 + return GraphicsObject.method1892(var0, var1, var2); + } else if (var0 < 6700) { // L: 461 + return GameBuild.method4843(var0, var1, var2); + } else if (var0 < 6800) { // L: 462 + return class27.method280(var0, var1, var2); + } else if (var0 < 6900) { // L: 463 + return class214.method4280(var0, var1, var2); + } else if (var0 < 7000) { // L: 464 + return Login.method1937(var0, var1, var2); + } else if (var0 < 7100) { // L: 465 + return SceneTilePaint.method4260(var0, var1, var2); + } else if (var0 < 7200) { // L: 466 + return class8.method82(var0, var1, var2); + } else { + return var0 < 7300 ? KeyHandler.method364(var0, var1, var2) : 2; // L: 467 468 + } + } } diff --git a/runescape-client/src/main/java/Ignored.java b/runescape-client/src/main/java/Ignored.java index 66e3b69bc9..79c8687b1f 100644 --- a/runescape-client/src/main/java/Ignored.java +++ b/runescape-client/src/main/java/Ignored.java @@ -4,17 +4,17 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("lo") +@ObfuscatedName("la") @Implements("Ignored") public class Ignored extends User { - @ObfuscatedName("nv") - @ObfuscatedSignature( - descriptor = "[Liv;" - ) - static Widget[] field3859; - @ObfuscatedName("h") + @ObfuscatedName("rl") @ObfuscatedGetter( - intValue = -121727977 + intValue = -114974043 + ) + static int field3847; + @ObfuscatedName("v") + @ObfuscatedGetter( + intValue = -792451577 ) @Export("id") int id; @@ -22,20 +22,20 @@ public class Ignored extends User { Ignored() { } // L: 6 - @ObfuscatedName("h") + @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "(Llo;I)I", - garbageValue = "-2048641211" + descriptor = "(Lla;I)I", + garbageValue = "-208555214" ) @Export("compareTo_ignored") int compareTo_ignored(Ignored var1) { return this.id - var1.id; // L: 9 } - @ObfuscatedName("c") + @ObfuscatedName("n") @ObfuscatedSignature( - descriptor = "(Llm;B)I", - garbageValue = "88" + descriptor = "(Llx;I)I", + garbageValue = "539732409" ) @Export("compareTo_user") public int compareTo_user(User var1) { @@ -45,4 +45,611 @@ public class Ignored extends User { public int compareTo(Object var1) { return this.compareTo_ignored((Ignored)var1); // L: 17 } + + @ObfuscatedName("gy") + @ObfuscatedSignature( + descriptor = "(Lcy;IIIIII)V", + garbageValue = "-82802445" + ) + @Export("drawActor2d") + static final void drawActor2d(Actor var0, int var1, int var2, int var3, int var4, int var5) { + if (var0 != null && var0.isVisible()) { // L: 4450 + if (var0 instanceof NPC) { // L: 4451 + NPCComposition var6 = ((NPC)var0).definition; // L: 4452 + if (var6.transforms != null) { // L: 4453 + var6 = var6.transform(); + } + + if (var6 == null) { // L: 4454 + return; + } + } + + int var76 = Players.Players_count; // L: 4456 + int[] var7 = Players.Players_indices; // L: 4457 + byte var8 = 0; // L: 4458 + int var10; + if (var1 < var76 && var0.playerCycle == Client.cycle && WorldMapIcon_1.method3232((Player)var0)) { // L: 4459 + Player var9 = (Player)var0; // L: 4460 + if (var1 < var76) { // L: 4461 + var10 = var0.defaultHeight + 15; // L: 4462 + GrandExchangeEvents.worldToScreen(var0.x, var0.y, var10); // L: 4464 + AbstractFont var11 = (AbstractFont)Client.fontsMap.get(FontName.FontName_plain12); // L: 4466 + byte var12 = 9; // L: 4467 + var11.drawCentered(var9.username.getName(), var2 + Client.viewportTempX, var3 + Client.viewportTempY - var12, 16777215, 0); // L: 4468 + var8 = 18; // L: 4469 + } + } + + int var77 = -2; // L: 4472 + int var17; + int var23; + int var24; + if (!var0.healthBars.method5236()) { // L: 4473 + var10 = var0.defaultHeight + 15; // L: 4474 + GrandExchangeEvents.worldToScreen(var0.x, var0.y, var10); // L: 4476 + + for (HealthBar var89 = (HealthBar)var0.healthBars.last(); var89 != null; var89 = (HealthBar)var0.healthBars.previous()) { // L: 4478 + HealthBarUpdate var81 = var89.get(Client.cycle); // L: 4479 + if (var81 == null) { // L: 4480 + if (var89.isEmpty()) { // L: 4538 + var89.remove(); + } + } else { + HealthBarDefinition var13 = var89.definition; // L: 4481 + SpritePixels var82 = var13.getBackSprite(); // L: 4482 + SpritePixels var83 = var13.getFrontSprite(); // L: 4483 + var17 = 0; // L: 4485 + int var84; + if (var82 != null && var83 != null) { // L: 4486 + if (var13.widthPadding * 2 < var83.subWidth) { // L: 4487 + var17 = var13.widthPadding; + } + + var84 = var83.subWidth - var17 * 2; // L: 4488 + } else { + var84 = var13.width; // L: 4490 + } + + int var18 = 255; // L: 4491 + boolean var85 = true; // L: 4492 + int var86 = Client.cycle - var81.cycle; // L: 4493 + int var87 = var84 * var81.health2 / var13.width; // L: 4494 + int var88; + int var94; + if (var81.cycleOffset > var86) { // L: 4495 + var88 = var13.field1608 == 0 ? 0 : var13.field1608 * (var86 / var13.field1608); // L: 4496 + var23 = var84 * var81.health / var13.width; // L: 4497 + var94 = var88 * (var87 - var23) / var81.cycleOffset + var23; // L: 4498 + } else { + var94 = var87; // L: 4501 + var88 = var13.int5 + var81.cycleOffset - var86; // L: 4502 + if (var13.int3 >= 0) { // L: 4503 + var18 = (var88 << 8) / (var13.int5 - var13.int3); + } + } + + if (var81.health2 > 0 && var94 < 1) { // L: 4505 + var94 = 1; + } + + if (var82 != null && var83 != null) { // L: 4506 + if (var94 == var84) { // L: 4507 + var94 += var17 * 2; + } else { + var94 += var17; // L: 4508 + } + + var88 = var82.subHeight; // L: 4509 + var77 += var88; // L: 4510 + var23 = var2 + Client.viewportTempX - (var84 >> 1); // L: 4511 + var24 = var3 + Client.viewportTempY - var77; // L: 4512 + var23 -= var17; // L: 4513 + if (var18 >= 0 && var18 < 255) { // L: 4514 + var82.drawTransAt(var23, var24, var18); // L: 4515 + Rasterizer2D.Rasterizer2D_expandClip(var23, var24, var94 + var23, var24 + var88); // L: 4516 + var83.drawTransAt(var23, var24, var18); // L: 4517 + } else { + var82.drawTransBgAt(var23, var24); // L: 4520 + Rasterizer2D.Rasterizer2D_expandClip(var23, var24, var23 + var94, var24 + var88); // L: 4521 + var83.drawTransBgAt(var23, var24); // L: 4522 + } + + Rasterizer2D.Rasterizer2D_setClip(var2, var3, var2 + var4, var3 + var5); // L: 4524 + var77 += 2; // L: 4525 + } else { + var77 += 5; // L: 4528 + if (Client.viewportTempX > -1) { // L: 4529 + var88 = var2 + Client.viewportTempX - (var84 >> 1); // L: 4530 + var23 = var3 + Client.viewportTempY - var77; // L: 4531 + Rasterizer2D.Rasterizer2D_fillRectangle(var88, var23, var94, 5, 65280); // L: 4532 + Rasterizer2D.Rasterizer2D_fillRectangle(var88 + var94, var23, var84 - var94, 5, 16711680); // L: 4533 + } + + var77 += 2; // L: 4535 + } + } + } + } + + if (var77 == -2) { // L: 4541 + var77 += 7; + } + + var77 += var8; // L: 4542 + int var79; + if (var1 < var76) { // L: 4543 + Player var78 = (Player)var0; // L: 4544 + if (var78.isHidden) { // L: 4545 + return; + } + + if (var78.headIconPk != -1 || var78.headIconPrayer != -1) { // L: 4546 + var79 = var0.defaultHeight + 15; // L: 4547 + GrandExchangeEvents.worldToScreen(var0.x, var0.y, var79); // L: 4549 + if (Client.viewportTempX > -1) { // L: 4551 + if (var78.headIconPk != -1) { // L: 4552 + var77 += 25; // L: 4553 + class35.headIconPkSprites[var78.headIconPk].drawTransBgAt(var2 + Client.viewportTempX - 12, var3 + Client.viewportTempY - var77); // L: 4554 + } + + if (var78.headIconPrayer != -1) { // L: 4556 + var77 += 25; // L: 4557 + TextureProvider.headIconPrayerSprites[var78.headIconPrayer].drawTransBgAt(var2 + Client.viewportTempX - 12, var3 + Client.viewportTempY - var77); // L: 4558 + } + } + } + + if (var1 >= 0 && Client.hintArrowType == 10 && var7[var1] == Client.hintArrowPlayerIndex) { // L: 4562 + var79 = var0.defaultHeight + 15; // L: 4563 + GrandExchangeEvents.worldToScreen(var0.x, var0.y, var79); // L: 4565 + if (Client.viewportTempX > -1) { // L: 4567 + var77 += PacketBufferNode.headIconHintSprites[1].subHeight; // L: 4568 + PacketBufferNode.headIconHintSprites[1].drawTransBgAt(var2 + Client.viewportTempX - 12, var3 + Client.viewportTempY - var77); // L: 4569 + } + } + } else { + NPCComposition var93 = ((NPC)var0).definition; // L: 4574 + if (var93.transforms != null) { // L: 4575 + var93 = var93.transform(); + } + + if (var93.headIconPrayer >= 0 && var93.headIconPrayer < TextureProvider.headIconPrayerSprites.length) { // L: 4576 + var79 = var0.defaultHeight + 15; // L: 4577 + GrandExchangeEvents.worldToScreen(var0.x, var0.y, var79); // L: 4579 + if (Client.viewportTempX > -1) { // L: 4581 + TextureProvider.headIconPrayerSprites[var93.headIconPrayer].drawTransBgAt(var2 + Client.viewportTempX - 12, var3 + Client.viewportTempY - 30); // L: 4582 + } + } + + if (Client.hintArrowType == 1 && Client.npcIndices[var1 - var76] == Client.hintArrowNpcIndex && Client.cycle % 20 < 10) { // L: 4585 + var79 = var0.defaultHeight + 15; // L: 4586 + GrandExchangeEvents.worldToScreen(var0.x, var0.y, var79); // L: 4588 + if (Client.viewportTempX > -1) { // L: 4590 + PacketBufferNode.headIconHintSprites[0].drawTransBgAt(var2 + Client.viewportTempX - 12, var3 + Client.viewportTempY - 28); + } + } + } + + if (var0.overheadText != null && (var1 >= var76 || !var0.field1248 && (Client.publicChatMode == 4 || !var0.isAutoChatting && (Client.publicChatMode == 0 || Client.publicChatMode == 3 || Client.publicChatMode == 1 && ((Player)var0).isFriend())))) { // L: 4593 4594 + var10 = var0.defaultHeight; // L: 4595 + GrandExchangeEvents.worldToScreen(var0.x, var0.y, var10); // L: 4597 + if (Client.viewportTempX > -1 && Client.overheadTextCount < Client.overheadTextLimit) { // L: 4599 + Client.overheadTextXOffsets[Client.overheadTextCount] = Widget.fontBold12.stringWidth(var0.overheadText) / 2; // L: 4600 + Client.overheadTextAscents[Client.overheadTextCount] = Widget.fontBold12.ascent; // L: 4601 + Client.overheadTextXs[Client.overheadTextCount] = Client.viewportTempX; // L: 4602 + Client.overheadTextYs[Client.overheadTextCount] = Client.viewportTempY; // L: 4603 + Client.overheadTextColors[Client.overheadTextCount] = var0.overheadTextColor; // L: 4604 + Client.overheadTextEffects[Client.overheadTextCount] = var0.overheadTextEffect; // L: 4605 + Client.overheadTextCyclesRemaining[Client.overheadTextCount] = var0.overheadTextCyclesRemaining; // L: 4606 + Client.overheadText[Client.overheadTextCount] = var0.overheadText; // L: 4607 + ++Client.overheadTextCount; // L: 4608 + } + } + + for (var10 = 0; var10 < 4; ++var10) { // L: 4612 + var79 = var0.hitSplatCycles[var10]; // L: 4613 + int var90 = var0.hitSplatTypes[var10]; // L: 4614 + HitSplatDefinition var91 = null; // L: 4615 + int var14 = 0; // L: 4616 + if (var90 >= 0) { // L: 4617 + if (var79 <= Client.cycle) { // L: 4618 + continue; + } + + var91 = Projectile.method1966(var0.hitSplatTypes[var10]); // L: 4619 + var14 = var91.field1731; // L: 4620 + if (var91 != null && var91.transforms != null) { // L: 4621 + var91 = var91.transform(); // L: 4622 + if (var91 == null) { // L: 4623 + var0.hitSplatCycles[var10] = -1; // L: 4624 + continue; // L: 4625 + } + } + } else if (var79 < 0) { // L: 4629 + continue; + } + + int var15 = var0.hitSplatTypes2[var10]; // L: 4630 + HitSplatDefinition var16 = null; // L: 4631 + if (var15 >= 0) { // L: 4632 + var16 = Projectile.method1966(var15); // L: 4633 + if (var16 != null && var16.transforms != null) { // L: 4634 + var16 = var16.transform(); + } + } + + if (var79 - var14 <= Client.cycle) { // L: 4636 + if (var91 == null) { // L: 4637 + var0.hitSplatCycles[var10] = -1; // L: 4638 + } else { + var17 = var0.defaultHeight / 2; // L: 4641 + GrandExchangeEvents.worldToScreen(var0.x, var0.y, var17); // L: 4643 + if (Client.viewportTempX > -1) { // L: 4645 + if (var10 == 1) { // L: 4647 + Client.viewportTempY -= 20; // L: 4648 + } + + if (var10 == 2) { // L: 4650 + Client.viewportTempX -= 15; // L: 4651 + Client.viewportTempY -= 10; // L: 4652 + } + + if (var10 == 3) { // L: 4654 + Client.viewportTempX += 15; // L: 4655 + Client.viewportTempY -= 10; // L: 4656 + } + + SpritePixels var19 = null; // L: 4658 + SpritePixels var20 = null; // L: 4659 + SpritePixels var21 = null; // L: 4660 + SpritePixels var22 = null; // L: 4661 + var23 = 0; // L: 4662 + var24 = 0; // L: 4663 + int var25 = 0; // L: 4664 + int var26 = 0; // L: 4665 + int var27 = 0; // L: 4666 + int var28 = 0; // L: 4667 + int var29 = 0; // L: 4668 + int var30 = 0; // L: 4669 + SpritePixels var31 = null; // L: 4670 + SpritePixels var32 = null; // L: 4671 + SpritePixels var33 = null; // L: 4672 + SpritePixels var34 = null; // L: 4673 + int var35 = 0; // L: 4674 + int var36 = 0; // L: 4675 + int var37 = 0; // L: 4676 + int var38 = 0; // L: 4677 + int var39 = 0; // L: 4678 + int var40 = 0; // L: 4679 + int var41 = 0; // L: 4680 + int var42 = 0; // L: 4681 + int var43 = 0; // L: 4682 + var19 = var91.method2916(); // L: 4683 + int var44; + if (var19 != null) { // L: 4684 + var23 = var19.subWidth; // L: 4685 + var44 = var19.subHeight; // L: 4686 + if (var44 > var43) { // L: 4687 + var43 = var44; + } + + var27 = var19.xOffset; // L: 4688 + } + + var20 = var91.method2931(); // L: 4690 + if (var20 != null) { // L: 4691 + var24 = var20.subWidth; // L: 4692 + var44 = var20.subHeight; // L: 4693 + if (var44 > var43) { // L: 4694 + var43 = var44; + } + + var28 = var20.xOffset; // L: 4695 + } + + var21 = var91.method2951(); // L: 4697 + if (var21 != null) { // L: 4698 + var25 = var21.subWidth; // L: 4699 + var44 = var21.subHeight; // L: 4700 + if (var44 > var43) { // L: 4701 + var43 = var44; + } + + var29 = var21.xOffset; // L: 4702 + } + + var22 = var91.method2945(); // L: 4704 + if (var22 != null) { // L: 4705 + var26 = var22.subWidth; // L: 4706 + var44 = var22.subHeight; // L: 4707 + if (var44 > var43) { // L: 4708 + var43 = var44; + } + + var30 = var22.xOffset; // L: 4709 + } + + if (var16 != null) { // L: 4711 + var31 = var16.method2916(); // L: 4712 + if (var31 != null) { // L: 4713 + var35 = var31.subWidth; // L: 4714 + var44 = var31.subHeight; // L: 4715 + if (var44 > var43) { // L: 4716 + var43 = var44; + } + + var39 = var31.xOffset; // L: 4717 + } + + var32 = var16.method2931(); // L: 4719 + if (var32 != null) { // L: 4720 + var36 = var32.subWidth; // L: 4721 + var44 = var32.subHeight; // L: 4722 + if (var44 > var43) { // L: 4723 + var43 = var44; + } + + var40 = var32.xOffset; // L: 4724 + } + + var33 = var16.method2951(); // L: 4726 + if (var33 != null) { // L: 4727 + var37 = var33.subWidth; // L: 4728 + var44 = var33.subHeight; // L: 4729 + if (var44 > var43) { // L: 4730 + var43 = var44; + } + + var41 = var33.xOffset; // L: 4731 + } + + var34 = var16.method2945(); // L: 4733 + if (var34 != null) { // L: 4734 + var38 = var34.subWidth; // L: 4735 + var44 = var34.subHeight; // L: 4736 + if (var44 > var43) { // L: 4737 + var43 = var44; + } + + var42 = var34.xOffset; // L: 4738 + } + } + + Font var80 = var91.getFont(); // L: 4743 + if (var80 == null) { // L: 4744 + var80 = Actor.fontPlain11; + } + + Font var45; + if (var16 != null) { // L: 4745 + var45 = var16.getFont(); // L: 4746 + if (var45 == null) { // L: 4747 + var45 = Actor.fontPlain11; + } + } else { + var45 = Actor.fontPlain11; // L: 4749 + } + + String var46 = null; // L: 4750 + String var47 = null; // L: 4751 + boolean var48 = false; // L: 4752 + int var49 = 0; // L: 4753 + var46 = var91.getString(var0.hitSplatValues[var10]); // L: 4754 + int var92 = var80.stringWidth(var46); // L: 4755 + if (var16 != null) { // L: 4756 + var47 = var16.getString(var0.hitSplatValues2[var10]); // L: 4757 + var49 = var45.stringWidth(var47); // L: 4758 + } + + int var50 = 0; // L: 4760 + int var51 = 0; // L: 4761 + if (var24 > 0) { // L: 4762 + if (var21 == null && var22 == null) { // L: 4763 + var50 = 1; // L: 4764 + } else { + var50 = var92 / var24 + 1; + } + } + + if (var16 != null && var36 > 0) { // L: 4766 4767 + if (var33 == null && var34 == null) { // L: 4768 + var51 = 1; // L: 4769 + } else { + var51 = var49 / var36 + 1; + } + } + + int var52 = 0; // L: 4772 + int var53 = var52; // L: 4773 + if (var23 > 0) { // L: 4774 + var52 += var23; + } + + var52 += 2; // L: 4775 + int var54 = var52; // L: 4776 + if (var25 > 0) { // L: 4777 + var52 += var25; + } + + int var55 = var52; // L: 4778 + int var56 = var52; // L: 4779 + int var57; + if (var24 > 0) { // L: 4780 + var57 = var24 * var50; // L: 4781 + var52 += var57; // L: 4782 + var56 += (var57 - var92) / 2; // L: 4783 + } else { + var52 += var92; // L: 4786 + } + + var57 = var52; // L: 4788 + if (var26 > 0) { // L: 4789 + var52 += var26; + } + + int var58 = 0; // L: 4790 + int var59 = 0; // L: 4791 + int var60 = 0; // L: 4792 + int var61 = 0; // L: 4793 + int var62 = 0; // L: 4794 + int var63; + if (var16 != null) { // L: 4795 + var52 += 2; // L: 4796 + var58 = var52; // L: 4797 + if (var35 > 0) { // L: 4798 + var52 += var35; + } + + var52 += 2; // L: 4799 + var59 = var52; // L: 4800 + if (var37 > 0) { // L: 4801 + var52 += var37; + } + + var60 = var52; // L: 4802 + var62 = var52; // L: 4803 + if (var36 > 0) { // L: 4804 + var63 = var36 * var51; // L: 4805 + var52 += var63; // L: 4806 + var62 += (var63 - var49) / 2; // L: 4807 + } else { + var52 += var49; // L: 4810 + } + + var61 = var52; // L: 4812 + if (var38 > 0) { // L: 4813 + var52 += var38; + } + } + + var63 = var0.hitSplatCycles[var10] - Client.cycle; // L: 4815 + int var64 = var91.field1739 - var63 * var91.field1739 / var91.field1731; // L: 4816 + int var65 = var63 * var91.field1740 / var91.field1731 + -var91.field1740; // L: 4817 + int var66 = var64 + (var2 + Client.viewportTempX - (var52 >> 1)); // L: 4818 + int var67 = var3 + Client.viewportTempY - 12 + var65; // L: 4819 + int var68 = var67; // L: 4820 + int var69 = var67 + var43; // L: 4821 + int var70 = var67 + var91.field1744 + 15; // L: 4822 + int var71 = var70 - var80.maxAscent; // L: 4823 + int var72 = var70 + var80.maxDescent; // L: 4824 + if (var71 < var67) { // L: 4825 + var68 = var71; + } + + if (var72 > var69) { // L: 4826 + var69 = var72; + } + + int var73 = 0; // L: 4827 + int var74; + int var75; + if (var16 != null) { // L: 4828 + var73 = var67 + var16.field1744 + 15; // L: 4829 + var74 = var73 - var45.maxAscent; // L: 4830 + var75 = var73 + var45.maxDescent; // L: 4831 + if (var74 < var68) { // L: 4832 + ; + } + + if (var75 > var69) { // L: 4833 + ; + } + } + + var74 = 255; // L: 4835 + if (var91.field1749 >= 0) { // L: 4836 + var74 = (var63 << 8) / (var91.field1731 - var91.field1749); + } + + if (var74 >= 0 && var74 < 255) { // L: 4837 + if (var19 != null) { // L: 4838 + var19.drawTransAt(var53 + var66 - var27, var67, var74); + } + + if (var21 != null) { // L: 4839 + var21.drawTransAt(var66 + var54 - var29, var67, var74); + } + + if (var20 != null) { // L: 4840 + for (var75 = 0; var75 < var50; ++var75) { // L: 4841 + var20.drawTransAt(var24 * var75 + (var66 + var55 - var28), var67, var74); // L: 4842 + } + } + + if (var22 != null) { // L: 4845 + var22.drawTransAt(var66 + var57 - var30, var67, var74); + } + + var80.drawAlpha(var46, var66 + var56, var70, var91.textColor, 0, var74); // L: 4846 + if (var16 != null) { // L: 4847 + if (var31 != null) { // L: 4848 + var31.drawTransAt(var58 + var66 - var39, var67, var74); + } + + if (var33 != null) { // L: 4849 + var33.drawTransAt(var66 + var59 - var41, var67, var74); + } + + if (var32 != null) { // L: 4850 + for (var75 = 0; var75 < var51; ++var75) { // L: 4851 + var32.drawTransAt(var36 * var75 + (var60 + var66 - var40), var67, var74); // L: 4852 + } + } + + if (var34 != null) { // L: 4855 + var34.drawTransAt(var66 + var61 - var42, var67, var74); + } + + var45.drawAlpha(var47, var62 + var66, var73, var16.textColor, 0, var74); // L: 4856 + } + } else { + if (var19 != null) { // L: 4860 + var19.drawTransBgAt(var66 + var53 - var27, var67); + } + + if (var21 != null) { // L: 4861 + var21.drawTransBgAt(var54 + var66 - var29, var67); + } + + if (var20 != null) { // L: 4862 + for (var75 = 0; var75 < var50; ++var75) { // L: 4863 + var20.drawTransBgAt(var24 * var75 + (var55 + var66 - var28), var67); // L: 4864 + } + } + + if (var22 != null) { // L: 4867 + var22.drawTransBgAt(var57 + var66 - var30, var67); + } + + var80.draw(var46, var66 + var56, var70, var91.textColor | -16777216, 0); // L: 4868 + if (var16 != null) { // L: 4869 + if (var31 != null) { // L: 4870 + var31.drawTransBgAt(var58 + var66 - var39, var67); + } + + if (var33 != null) { // L: 4871 + var33.drawTransBgAt(var59 + var66 - var41, var67); + } + + if (var32 != null) { // L: 4872 + for (var75 = 0; var75 < var51; ++var75) { // L: 4873 + var32.drawTransBgAt(var36 * var75 + (var60 + var66 - var40), var67); // L: 4874 + } + } + + if (var34 != null) { // L: 4877 + var34.drawTransBgAt(var61 + var66 - var42, var67); + } + + var45.draw(var47, var66 + var62, var73, var16.textColor | -16777216, 0); // L: 4878 + } + } + } + } + } + } + + } + } // L: 4883 } diff --git a/runescape-client/src/main/java/IndexedSprite.java b/runescape-client/src/main/java/IndexedSprite.java index 89d3811186..81a99af35a 100644 --- a/runescape-client/src/main/java/IndexedSprite.java +++ b/runescape-client/src/main/java/IndexedSprite.java @@ -2,38 +2,38 @@ import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; -@ObfuscatedName("of") +@ObfuscatedName("op") @Implements("IndexedSprite") public final class IndexedSprite extends Rasterizer2D { - @ObfuscatedName("h") + @ObfuscatedName("v") @Export("pixels") public byte[] pixels; - @ObfuscatedName("c") + @ObfuscatedName("n") @Export("palette") public int[] palette; - @ObfuscatedName("o") + @ObfuscatedName("f") @Export("subWidth") public int subWidth; - @ObfuscatedName("g") + @ObfuscatedName("y") @Export("subHeight") public int subHeight; - @ObfuscatedName("l") + @ObfuscatedName("p") @Export("xOffset") public int xOffset; - @ObfuscatedName("z") + @ObfuscatedName("j") @Export("yOffset") public int yOffset; - @ObfuscatedName("t") + @ObfuscatedName("r") @Export("width") public int width; - @ObfuscatedName("v") + @ObfuscatedName("b") @Export("height") public int height; IndexedSprite() { } // L: 15 - @ObfuscatedName("h") + @ObfuscatedName("v") @Export("normalize") public void normalize() { if (this.subWidth != this.width || this.subHeight != this.height) { // L: 18 @@ -54,7 +54,7 @@ public final class IndexedSprite extends Rasterizer2D { } } // L: 31 - @ObfuscatedName("c") + @ObfuscatedName("n") @Export("shiftColors") public void shiftColors(int var1, int var2, int var3) { for (int var4 = 0; var4 < this.palette.length; ++var4) { // L: 34 @@ -87,7 +87,7 @@ public final class IndexedSprite extends Rasterizer2D { } // L: 49 - @ObfuscatedName("o") + @ObfuscatedName("f") @Export("drawAt") public void drawAt(int var1, int var2) { var1 += this.xOffset; // L: 52 @@ -133,8 +133,8 @@ public final class IndexedSprite extends Rasterizer2D { } } // L: 85 - @ObfuscatedName("l") - public void method6846(int var1, int var2, int var3, int var4) { + @ObfuscatedName("p") + public void method6958(int var1, int var2, int var3, int var4) { int var5 = this.subWidth; // L: 116 int var6 = this.subHeight; // L: 117 int var7 = 0; // L: 118 @@ -195,7 +195,7 @@ public final class IndexedSprite extends Rasterizer2D { IndexedSprite_something(Rasterizer2D.Rasterizer2D_pixels, this.pixels, this.palette, var7, var8, var13, var14, var3, var4, var11, var12, var5); // L: 157 } // L: 158 - @ObfuscatedName("g") + @ObfuscatedName("y") @Export("IndexedSprite_two") static void IndexedSprite_two(int[] var0, byte[] var1, int[] var2, int var3, int var4, int var5, int var6, int var7, int var8) { int var9 = -(var5 >> 2); // L: 88 @@ -249,7 +249,7 @@ public final class IndexedSprite extends Rasterizer2D { } // L: 113 - @ObfuscatedName("z") + @ObfuscatedName("j") @Export("IndexedSprite_something") static void IndexedSprite_something(int[] var0, byte[] var1, int[] var2, int var3, int var4, int var5, int var6, int var7, int var8, int var9, int var10, int var11) { int var12 = var3; // L: 161 diff --git a/runescape-client/src/main/java/Instrument.java b/runescape-client/src/main/java/Instrument.java index e2e2ac36ff..1c52c5a903 100644 --- a/runescape-client/src/main/java/Instrument.java +++ b/runescape-client/src/main/java/Instrument.java @@ -4,112 +4,112 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("bp") +@ObfuscatedName("bx") @Implements("Instrument") public class Instrument { - @ObfuscatedName("d") + @ObfuscatedName("k") @Export("Instrument_samples") static int[] Instrument_samples; - @ObfuscatedName("u") + @ObfuscatedName("m") @Export("Instrument_noise") static int[] Instrument_noise; - @ObfuscatedName("m") + @ObfuscatedName("x") @Export("Instrument_sine") static int[] Instrument_sine; - @ObfuscatedName("f") + @ObfuscatedName("w") @Export("Instrument_phases") static int[] Instrument_phases; - @ObfuscatedName("s") + @ObfuscatedName("t") @Export("Instrument_delays") static int[] Instrument_delays; - @ObfuscatedName("y") + @ObfuscatedName("h") @Export("Instrument_volumeSteps") static int[] Instrument_volumeSteps; - @ObfuscatedName("w") + @ObfuscatedName("q") @Export("Instrument_pitchSteps") static int[] Instrument_pitchSteps; - @ObfuscatedName("n") + @ObfuscatedName("i") @Export("Instrument_pitchBaseSteps") static int[] Instrument_pitchBaseSteps; - @ObfuscatedName("h") + @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "Lbw;" + descriptor = "Lbt;" ) @Export("pitch") SoundEnvelope pitch; - @ObfuscatedName("c") + @ObfuscatedName("n") @ObfuscatedSignature( - descriptor = "Lbw;" + descriptor = "Lbt;" ) @Export("volume") SoundEnvelope volume; - @ObfuscatedName("o") + @ObfuscatedName("f") @ObfuscatedSignature( - descriptor = "Lbw;" + descriptor = "Lbt;" ) @Export("pitchModifier") SoundEnvelope pitchModifier; - @ObfuscatedName("g") + @ObfuscatedName("y") @ObfuscatedSignature( - descriptor = "Lbw;" + descriptor = "Lbt;" ) @Export("pitchModifierAmplitude") SoundEnvelope pitchModifierAmplitude; - @ObfuscatedName("l") + @ObfuscatedName("p") @ObfuscatedSignature( - descriptor = "Lbw;" + descriptor = "Lbt;" ) @Export("volumeMultiplier") SoundEnvelope volumeMultiplier; - @ObfuscatedName("z") + @ObfuscatedName("j") @ObfuscatedSignature( - descriptor = "Lbw;" + descriptor = "Lbt;" ) @Export("volumeMultiplierAmplitude") SoundEnvelope volumeMultiplierAmplitude; - @ObfuscatedName("t") + @ObfuscatedName("r") @ObfuscatedSignature( - descriptor = "Lbw;" + descriptor = "Lbt;" ) @Export("release") SoundEnvelope release; - @ObfuscatedName("v") + @ObfuscatedName("b") @ObfuscatedSignature( - descriptor = "Lbw;" + descriptor = "Lbt;" ) @Export("attack") SoundEnvelope attack; - @ObfuscatedName("b") + @ObfuscatedName("d") @Export("oscillatorVolume") int[] oscillatorVolume; - @ObfuscatedName("q") + @ObfuscatedName("s") @Export("oscillatorPitch") int[] oscillatorPitch; - @ObfuscatedName("i") + @ObfuscatedName("u") @Export("oscillatorDelays") int[] oscillatorDelays; - @ObfuscatedName("x") + @ObfuscatedName("l") @Export("delayTime") int delayTime; - @ObfuscatedName("k") + @ObfuscatedName("o") @Export("delayDecay") int delayDecay; - @ObfuscatedName("r") + @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "Lbi;" + descriptor = "Lbj;" ) @Export("filter") AudioFilter filter; - @ObfuscatedName("p") + @ObfuscatedName("e") @ObfuscatedSignature( - descriptor = "Lbw;" + descriptor = "Lbt;" ) @Export("filterEnvelope") SoundEnvelope filterEnvelope; - @ObfuscatedName("a") + @ObfuscatedName("g") @Export("duration") int duration; - @ObfuscatedName("e") + @ObfuscatedName("a") @Export("offset") int offset; @@ -146,7 +146,7 @@ public class Instrument { this.offset = 0; // L: 25 } // L: 50 - @ObfuscatedName("h") + @ObfuscatedName("v") @Export("synthesize") final int[] synthesize(int var1, int var2) { class306.clearIntArray(Instrument_samples, 0, var1); // L: 53 @@ -353,7 +353,7 @@ public class Instrument { } } - @ObfuscatedName("c") + @ObfuscatedName("n") @Export("evaluateWave") final int evaluateWave(int var1, int var2, int var3) { if (var3 == 1) { // L: 179 @@ -367,9 +367,9 @@ public class Instrument { } } - @ObfuscatedName("o") + @ObfuscatedName("f") @ObfuscatedSignature( - descriptor = "(Lnk;)V" + descriptor = "(Lnd;)V" ) @Export("decode") final void decode(Buffer var1) { @@ -421,6 +421,6 @@ public class Instrument { this.offset = var1.readUnsignedShort(); // L: 228 this.filter = new AudioFilter(); // L: 229 this.filterEnvelope = new SoundEnvelope(); // L: 230 - this.filter.method1124(var1, this.filterEnvelope); // L: 231 + this.filter.method1080(var1, this.filterEnvelope); // L: 231 } // L: 232 } diff --git a/runescape-client/src/main/java/IntHashTable.java b/runescape-client/src/main/java/IntHashTable.java index b25a415a80..fd7d451632 100644 --- a/runescape-client/src/main/java/IntHashTable.java +++ b/runescape-client/src/main/java/IntHashTable.java @@ -3,10 +3,10 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("oo") +@ObfuscatedName("ou") @Implements("IntHashTable") public class IntHashTable { - @ObfuscatedName("h") + @ObfuscatedName("v") @Export("array") int[] array; @@ -32,10 +32,10 @@ public class IntHashTable { } // L: 17 - @ObfuscatedName("h") + @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "(IB)I", - garbageValue = "98" + descriptor = "(II)I", + garbageValue = "-2076070335" ) @Export("get") public int get(int var1) { diff --git a/runescape-client/src/main/java/IntegerNode.java b/runescape-client/src/main/java/IntegerNode.java index ea0b34de51..e5a01aef3f 100644 --- a/runescape-client/src/main/java/IntegerNode.java +++ b/runescape-client/src/main/java/IntegerNode.java @@ -2,10 +2,10 @@ import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; -@ObfuscatedName("mb") +@ObfuscatedName("mo") @Implements("IntegerNode") public class IntegerNode extends Node { - @ObfuscatedName("h") + @ObfuscatedName("v") @Export("integer") public int integer; diff --git a/runescape-client/src/main/java/InterfaceParent.java b/runescape-client/src/main/java/InterfaceParent.java index 1403e02074..f5c451c5bc 100644 --- a/runescape-client/src/main/java/InterfaceParent.java +++ b/runescape-client/src/main/java/InterfaceParent.java @@ -4,51 +4,220 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("cl") +@ObfuscatedName("cu") @Implements("InterfaceParent") public class InterfaceParent extends Node { - @ObfuscatedName("x") - @ObfuscatedSignature( - descriptor = "Lof;" - ) - static IndexedSprite field1134; - @ObfuscatedName("h") + @ObfuscatedName("a") + @Export("cacheParentPaths") + public static String[] cacheParentPaths; + @ObfuscatedName("v") @ObfuscatedGetter( - intValue = -2063280523 + intValue = 897280301 ) @Export("group") int group; - @ObfuscatedName("c") + @ObfuscatedName("n") @ObfuscatedGetter( - intValue = -2020547515 + intValue = 1329352515 ) @Export("type") int type; - @ObfuscatedName("o") - boolean field1136; + @ObfuscatedName("f") + boolean field1165; InterfaceParent() { - this.field1136 = false; // L: 8 + this.field1165 = false; // L: 8 } // L: 10 - @ObfuscatedName("c") + @ObfuscatedName("n") @ObfuscatedSignature( - descriptor = "(IS)I", - garbageValue = "-24242" + descriptor = "(II)Ler;", + garbageValue = "-647978763" ) - public static int method2111(int var0) { - long var2 = ViewportMouse.ViewportMouse_entityTags[var0]; // L: 49 - int var1 = (int)(var2 >>> 0 & 127L); // L: 51 - return var1; // L: 53 + @Export("getEnum") + public static EnumComposition getEnum(int var0) { + EnumComposition var1 = (EnumComposition)EnumComposition.EnumDefinition_cached.get((long)var0); // L: 29 + if (var1 != null) { // L: 30 + return var1; + } else { + byte[] var2 = EnumComposition.EnumDefinition_archive.takeFile(8, var0); // L: 31 + var1 = new EnumComposition(); // L: 32 + if (var2 != null) { // L: 33 + var1.decode(new Buffer(var2)); + } + + EnumComposition.EnumDefinition_cached.put(var1, (long)var0); // L: 34 + return var1; // L: 35 + } } - @ObfuscatedName("iw") + @ObfuscatedName("gq") @ObfuscatedSignature( - descriptor = "(Ljava/lang/String;Ljava/lang/String;IIIII)V", - garbageValue = "463563662" + descriptor = "(Lcy;I)V", + garbageValue = "-1452736307" ) - @Export("insertMenuItemNoShift") - public static final void insertMenuItemNoShift(String var0, String var1, int var2, int var3, int var4, int var5) { - class311.insertMenuItem(var0, var1, var2, var3, var4, var5, false); // L: 9083 - } // L: 9084 + static final void method2083(Actor var0) { + var0.movementSequence = var0.idleSequence; // L: 3663 + if (var0.pathLength == 0) { // L: 3664 + var0.field1294 = 0; // L: 3665 + } else { + if (var0.sequence != -1 && var0.sequenceDelay == 0) { // L: 3668 + SequenceDefinition var1 = LoginScreenAnimation.SequenceDefinition_get(var0.sequence); // L: 3669 + if (var0.field1274 > 0 && var1.field1883 == 0) { // L: 3670 + ++var0.field1294; // L: 3671 + return; // L: 3672 + } + + if (var0.field1274 <= 0 && var1.field1890 == 0) { // L: 3674 + ++var0.field1294; // L: 3675 + return; // L: 3676 + } + } + + int var10 = var0.x; // L: 3679 + int var2 = var0.y; // L: 3680 + int var3 = var0.field1239 * 64 + var0.pathX[var0.pathLength - 1] * 128; // L: 3681 + int var4 = var0.field1239 * 64 + var0.pathY[var0.pathLength - 1] * 128; // L: 3682 + if (var10 < var3) { // L: 3683 + if (var2 < var4) { // L: 3684 + var0.orientation = 1280; + } else if (var2 > var4) { // L: 3685 + var0.orientation = 1792; + } else { + var0.orientation = 1536; // L: 3686 + } + } else if (var10 > var3) { // L: 3688 + if (var2 < var4) { // L: 3689 + var0.orientation = 768; + } else if (var2 > var4) { // L: 3690 + var0.orientation = 256; + } else { + var0.orientation = 512; // L: 3691 + } + } else if (var2 < var4) { // L: 3693 + var0.orientation = 1024; + } else if (var2 > var4) { // L: 3694 + var0.orientation = 0; + } + + byte var5 = var0.pathTraversed[var0.pathLength - 1]; // L: 3695 + if (var3 - var10 <= 256 && var3 - var10 >= -256 && var4 - var2 <= 256 && var4 - var2 >= -256) { // L: 3696 + int var6 = var0.orientation - var0.rotation & 2047; // L: 3703 + if (var6 > 1024) { // L: 3704 + var6 -= 2048; + } + + int var7 = var0.walkBackSequence; // L: 3705 + if (var6 >= -256 && var6 <= 256) { // L: 3706 + var7 = var0.walkSequence; + } else if (var6 >= 256 && var6 < 768) { // L: 3707 + var7 = var0.walkRightSequence; + } else if (var6 >= -768 && var6 <= -256) { // L: 3708 + var7 = var0.walkLeftSequence; + } + + if (var7 == -1) { // L: 3709 + var7 = var0.walkSequence; + } + + var0.movementSequence = var7; // L: 3710 + int var8 = 4; // L: 3711 + boolean var9 = true; // L: 3712 + if (var0 instanceof NPC) { // L: 3713 + var9 = ((NPC)var0).definition.isClickable; + } + + if (var9) { // L: 3714 + if (var0.rotation != var0.orientation && var0.targetIndex == -1 && var0.field1289 != 0) { // L: 3715 + var8 = 2; + } + + if (var0.pathLength > 2) { // L: 3716 + var8 = 6; + } + + if (var0.pathLength > 3) { // L: 3717 + var8 = 8; + } + + if (var0.field1294 > 0 && var0.pathLength > 1) { // L: 3718 + var8 = 8; // L: 3719 + --var0.field1294; // L: 3720 + } + } else { + if (var0.pathLength > 1) { // L: 3724 + var8 = 6; + } + + if (var0.pathLength > 2) { // L: 3725 + var8 = 8; + } + + if (var0.field1294 > 0 && var0.pathLength > 1) { // L: 3726 + var8 = 8; // L: 3727 + --var0.field1294; // L: 3728 + } + } + + if (var5 == 2) { // L: 3731 + var8 <<= 1; + } + + if (var8 >= 8 && var0.movementSequence == var0.walkSequence && var0.runSequence != -1) { // L: 3732 + var0.movementSequence = var0.runSequence; + } + + if (var3 != var10 || var4 != var2) { // L: 3733 + if (var10 < var3) { // L: 3734 + var0.x += var8; // L: 3735 + if (var0.x > var3) { // L: 3736 + var0.x = var3; + } + } else if (var10 > var3) { // L: 3738 + var0.x -= var8; // L: 3739 + if (var0.x < var3) { // L: 3740 + var0.x = var3; + } + } + + if (var2 < var4) { // L: 3742 + var0.y += var8; // L: 3743 + if (var0.y > var4) { // L: 3744 + var0.y = var4; + } + } else if (var2 > var4) { // L: 3746 + var0.y -= var8; // L: 3747 + if (var0.y < var4) { // L: 3748 + var0.y = var4; + } + } + } + + if (var3 == var0.x && var4 == var0.y) { // L: 3751 + --var0.pathLength; // L: 3752 + if (var0.field1274 > 0) { // L: 3753 + --var0.field1274; + } + } + + } else { + var0.x = var3; // L: 3697 + var0.y = var4; // L: 3698 + --var0.pathLength; // L: 3699 + if (var0.field1274 > 0) { // L: 3700 + --var0.field1274; + } + + } + } + } // L: 3666 3701 3755 + + @ObfuscatedName("je") + static final void method2082(double var0) { + Rasterizer3D.Rasterizer3D_setBrightness(var0); // L: 10888 + ((TextureProvider)Rasterizer3D.Rasterizer3D_textureLoader).setBrightness(var0); // L: 10889 + Decimator.method1073(); // L: 10890 + ObjectComposition.clientPreferences.field1337 = var0; // L: 10891 + TileItem.savePreferences(); // L: 10892 + } // L: 10893 } diff --git a/runescape-client/src/main/java/Interpreter.java b/runescape-client/src/main/java/Interpreter.java index e729367f3a..1ebdde5b02 100644 --- a/runescape-client/src/main/java/Interpreter.java +++ b/runescape-client/src/main/java/Interpreter.java @@ -1,178 +1,170 @@ -import java.awt.Desktop; -import java.awt.FontMetrics; -import java.awt.Desktop.Action; -import java.net.URI; +import java.net.MalformedURLException; +import java.net.URL; 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("cm") +@ObfuscatedName("cd") @Implements("Interpreter") public class Interpreter { - @ObfuscatedName("rk") - @ObfuscatedGetter( - intValue = -947609559 - ) - static int field947; - @ObfuscatedName("t") + @ObfuscatedName("r") @Export("Interpreter_stringLocals") static String[] Interpreter_stringLocals; - @ObfuscatedName("v") + @ObfuscatedName("b") @Export("Interpreter_arrayLengths") static int[] Interpreter_arrayLengths; - @ObfuscatedName("b") + @ObfuscatedName("d") @Export("Interpreter_arrays") static int[][] Interpreter_arrays; - @ObfuscatedName("q") + @ObfuscatedName("s") @Export("Interpreter_intStack") static int[] Interpreter_intStack; - @ObfuscatedName("x") + @ObfuscatedName("l") @Export("Interpreter_stringStack") static String[] Interpreter_stringStack; - @ObfuscatedName("r") + @ObfuscatedName("o") @ObfuscatedGetter( - intValue = -1509964487 + intValue = 1824375293 + ) + @Export("Interpreter_stringStackSize") + static int Interpreter_stringStackSize; + @ObfuscatedName("c") + @ObfuscatedGetter( + intValue = 114758639 ) @Export("Interpreter_frameDepth") static int Interpreter_frameDepth; - @ObfuscatedName("p") + @ObfuscatedName("e") @ObfuscatedSignature( - descriptor = "[Lbx;" + descriptor = "[Lbw;" ) @Export("Interpreter_frames") static ScriptFrame[] Interpreter_frames; - @ObfuscatedName("j") + @ObfuscatedName("g") + @ObfuscatedSignature( + descriptor = "Lio;" + ) + @Export("scriptActiveWidget") + static Widget scriptActiveWidget; + @ObfuscatedName("x") + @ObfuscatedGetter( + intValue = -1830375703 + ) + static int field982; + @ObfuscatedName("z") @Export("Interpreter_calendar") static java.util.Calendar Interpreter_calendar; - @ObfuscatedName("f") + @ObfuscatedName("w") @Export("Interpreter_MONTHS") static final String[] Interpreter_MONTHS; - @ObfuscatedName("y") - static boolean field950; - @ObfuscatedName("w") - static boolean field951; - @ObfuscatedName("n") + @ObfuscatedName("h") + static boolean field973; + @ObfuscatedName("q") + static boolean field986; + @ObfuscatedName("i") @ObfuscatedGetter( - intValue = 991337999 + intValue = 606273051 ) - static int field956; - @ObfuscatedName("aj") - static final double field953; - @ObfuscatedName("aw") - @Export("loginScreenFontMetrics") - static FontMetrics loginScreenFontMetrics; + static int field987; + @ObfuscatedName("al") + static final double field989; + @ObfuscatedName("gy") + @ObfuscatedSignature( + descriptor = "Loh;" + ) + @Export("redHintArrowSprite") + static SpritePixels redHintArrowSprite; static { - Interpreter_arrayLengths = new int[5]; // L: 74 - Interpreter_arrays = new int[5][5000]; // L: 75 - Interpreter_intStack = new int[1000]; // L: 76 + Interpreter_arrayLengths = new int[5]; + Interpreter_arrays = new int[5][5000]; + Interpreter_intStack = new int[1000]; Interpreter_stringStack = new String[1000]; // L: 78 - Interpreter_frameDepth = 0; // L: 80 - Interpreter_frames = new ScriptFrame[50]; // L: 81 - Interpreter_calendar = java.util.Calendar.getInstance(); // L: 87 - Interpreter_MONTHS = new String[]{"Jan", "Feb", "Mar", "Apr", "May", "Jun", "Jul", "Aug", "Sep", "Oct", "Nov", "Dec"}; // L: 90 - field950 = false; // L: 93 - field951 = false; // L: 94 - field956 = 0; // L: 95 - field953 = Math.log(2.0D); // L: 99 + Interpreter_frameDepth = 0; + Interpreter_frames = new ScriptFrame[50]; + Interpreter_calendar = java.util.Calendar.getInstance(); + Interpreter_MONTHS = new String[]{"Jan", "Feb", "Mar", "Apr", "May", "Jun", "Jul", "Aug", "Sep", "Oct", "Nov", "Dec"}; + field973 = false; + field986 = false; // L: 94 + field987 = 0; + field989 = Math.log(2.0D); // L: 99 } - @ObfuscatedName("h") + @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "(Ljava/lang/String;ZZI)V", - garbageValue = "710417468" + descriptor = "(Ljava/lang/String;B)Z", + garbageValue = "-3" ) - @Export("openURL") - public static void openURL(String var0, boolean var1, boolean var2) { - if (var1) { // L: 23 - if (Desktop.isDesktopSupported() && Desktop.getDesktop().isSupported(Action.BROWSE)) { // L: 24 - try { - Desktop.getDesktop().browse(new URI(var0)); // L: 26 - return; // L: 47 - } catch (Exception var4) { // L: 29 + static boolean method1848(String var0) { + if (var0 == null) { // L: 35 + return false; + } else { + try { + new URL(var0); + return true; // L: 42 + } catch (MalformedURLException var2) { // L: 39 + return false; // L: 40 + } + } + } + + @ObfuscatedName("j") + @ObfuscatedSignature( + descriptor = "(I)V", + garbageValue = "1954289740" + ) + public static void method1870() { + try { + if (class232.musicPlayerStatus == 1) { // L: 71 + int var0 = class124.midiPcmStream.method4410(); // L: 72 + if (var0 > 0 && class124.midiPcmStream.isReady()) { // L: 73 + var0 -= class232.pcmSampleLength; // L: 74 + if (var0 < 0) { // L: 75 + var0 = 0; + } + + class124.midiPcmStream.setPcmStreamVolume(var0); // L: 76 + return; // L: 77 } - } - if (class44.field305.startsWith("win")) { // L: 31 - class9.method98(var0, 0); // L: 33 - } else if (class44.field305.startsWith("mac")) { // L: 37 - class230.method4348(var0, 1, "openjs"); // L: 38 - } else { - class9.method98(var0, 2); // L: 41 + class124.midiPcmStream.clear(); // L: 79 + class124.midiPcmStream.removeAll(); // L: 80 + if (ModelData0.musicTrackArchive != null) { // L: 81 + class232.musicPlayerStatus = 2; + } else { + class232.musicPlayerStatus = 0; // L: 82 + } + + class2.musicTrack = null; // L: 83 + Messages.soundCache = null; // L: 84 } - } else { - class9.method98(var0, 3); // L: 44 + } catch (Exception var2) { // L: 87 + var2.printStackTrace(); // L: 88 + class124.midiPcmStream.clear(); // L: 89 + class232.musicPlayerStatus = 0; // L: 90 + class2.musicTrack = null; // L: 91 + Messages.soundCache = null; // L: 92 + ModelData0.musicTrackArchive = null; // L: 93 } - } + } // L: 95 - @ObfuscatedName("t") + @ObfuscatedName("ie") @ObfuscatedSignature( - descriptor = "(ILci;ZS)I", - garbageValue = "-19668" + descriptor = "(II)V", + garbageValue = "-1390224792" ) - static int method1921(int var0, Script var1, boolean var2) { - Widget var3; - if (var0 >= 2000) { // L: 794 - var0 -= 1000; // L: 795 - var3 = DevicePcmPlayerProvider.getWidget(Interpreter_intStack[--WorldMapCacheName.Interpreter_intStackSize]); // L: 796 - } else { - var3 = var2 ? class308.scriptDotWidget : class24.scriptActiveWidget; // L: 798 + static final void method1888(int var0) { + if (var0 >= 0) { // L: 7774 + int var1 = Client.menuArguments1[var0]; // L: 7775 + int var2 = Client.menuArguments2[var0]; // L: 7776 + int var3 = Client.menuOpcodes[var0]; // L: 7777 + int var4 = Client.menuIdentifiers[var0]; // L: 7778 + String var5 = Client.menuActions[var0]; // L: 7779 + String var6 = Client.menuTargets[var0]; // L: 7780 + Script.menuAction(var1, var2, var3, var4, var5, var6, MouseHandler.MouseHandler_lastPressedX, MouseHandler.MouseHandler_lastPressedY); // L: 7781 } - - VerticalAlignment.invalidateWidget(var3); // L: 799 - if (var0 != ScriptOpcodes.CC_SETOBJECT && var0 != ScriptOpcodes.CC_SETOBJECT_NONUM && var0 != ScriptOpcodes.CC_SETOBJECT_ALWAYS_NUM) { // L: 800 - if (var0 == ScriptOpcodes.CC_SETNPCHEAD) { // L: 820 - var3.modelType = 2; // L: 821 - var3.modelId = Interpreter_intStack[--WorldMapCacheName.Interpreter_intStackSize]; // L: 822 - return 1; // L: 823 - } else if (var0 == ScriptOpcodes.CC_SETPLAYERHEAD_SELF) { // L: 825 - var3.modelType = 3; // L: 826 - var3.modelId = class35.localPlayer.appearance.getChatHeadId(); // L: 827 - return 1; // L: 828 - } else { - return 2; // L: 830 - } - } else { - WorldMapCacheName.Interpreter_intStackSize -= 2; // L: 801 - int var4 = Interpreter_intStack[WorldMapCacheName.Interpreter_intStackSize]; // L: 802 - int var5 = Interpreter_intStack[WorldMapCacheName.Interpreter_intStackSize + 1]; // L: 803 - var3.itemId = var4; // L: 804 - var3.itemQuantity = var5; // L: 805 - ItemComposition var6 = Strings.ItemDefinition_get(var4); // L: 806 - var3.modelAngleX = var6.xan2d; // L: 807 - var3.modelAngleY = var6.yan2d; // L: 808 - var3.modelAngleZ = var6.zan2d; // L: 809 - var3.modelOffsetX = var6.offsetX2d; // L: 810 - var3.modelOffsetY = var6.offsetY2d; // L: 811 - var3.modelZoom = var6.zoom2d; // L: 812 - if (var0 == ScriptOpcodes.CC_SETOBJECT_NONUM) { // L: 813 - var3.itemQuantityMode = 0; - } else if (var0 == ScriptOpcodes.CC_SETOBJECT_ALWAYS_NUM | 1 == var6.isStackable) { // L: 814 - var3.itemQuantityMode = 1; - } else { - var3.itemQuantityMode = 2; // L: 815 - } - - if (var3.field3019 > 0) { // L: 816 - var3.modelZoom = var3.modelZoom * 32 / var3.field3019; - } else if (var3.rawWidth > 0) { // L: 817 - var3.modelZoom = var3.modelZoom * 32 / var3.rawWidth; - } - - return 1; // L: 818 - } - } - - @ObfuscatedName("ak") - @ObfuscatedSignature( - descriptor = "(II)I", - garbageValue = "-4124956" - ) - static int method1808(int var0) { - return (int)((Math.log((double)var0) / field953 - 7.0D) * 256.0D); // L: 3515 - } + } // L: 7782 } diff --git a/runescape-client/src/main/java/InvDefinition.java b/runescape-client/src/main/java/InvDefinition.java index c453c35624..13c294b0d2 100644 --- a/runescape-client/src/main/java/InvDefinition.java +++ b/runescape-client/src/main/java/InvDefinition.java @@ -5,24 +5,24 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; import net.runelite.rs.ScriptOpcodes; -@ObfuscatedName("en") +@ObfuscatedName("ep") @Implements("InvDefinition") public class InvDefinition extends DualNode { - @ObfuscatedName("h") + @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "Ljp;" + descriptor = "Ljv;" ) @Export("InvDefinition_archive") static AbstractArchive InvDefinition_archive; - @ObfuscatedName("c") + @ObfuscatedName("n") @ObfuscatedSignature( - descriptor = "Lho;" + descriptor = "Lhz;" ) @Export("InvDefinition_cached") static EvictingDualNodeHashTable InvDefinition_cached; - @ObfuscatedName("o") + @ObfuscatedName("f") @ObfuscatedGetter( - intValue = 1346199123 + intValue = -1820336081 ) @Export("size") public int size; @@ -35,10 +35,10 @@ public class InvDefinition extends DualNode { this.size = 0; // L: 12 } // L: 14 - @ObfuscatedName("o") + @ObfuscatedName("f") @ObfuscatedSignature( - descriptor = "(Lnk;I)V", - garbageValue = "66775283" + descriptor = "(Lnd;I)V", + garbageValue = "1433861399" ) @Export("decode") void decode(Buffer var1) { @@ -52,10 +52,10 @@ public class InvDefinition extends DualNode { } } - @ObfuscatedName("g") + @ObfuscatedName("y") @ObfuscatedSignature( - descriptor = "(Lnk;II)V", - garbageValue = "2113892179" + descriptor = "(Lnd;II)V", + garbageValue = "-1191086190" ) @Export("decodeNext") void decodeNext(Buffer var1, int var2) { @@ -65,419 +65,239 @@ public class InvDefinition extends DualNode { } // L: 41 - @ObfuscatedName("t") + @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "(Ljp;Ljp;Ljava/lang/String;Ljava/lang/String;I)Lkc;", - garbageValue = "-16711936" + descriptor = "(Ljv;II)Lin;", + garbageValue = "-1662391635" ) - public static Font method2609(AbstractArchive var0, AbstractArchive var1, String var2, String var3) { - int var4 = var0.getGroupId(var2); // L: 128 - int var5 = var0.getFileId(var4, var3); // L: 129 - Font var6; - if (!Username.method5711(var0, var4, var5)) { // L: 132 - var6 = null; // L: 133 - } else { - byte[] var8 = var1.takeFile(var4, var5); // L: 137 - Font var7; - if (var8 == null) { // L: 139 - var7 = null; // L: 140 - } else { - Font var9 = new Font(var8, class243.SpriteBuffer_xOffsets, class396.SpriteBuffer_yOffsets, ArchiveDiskActionHandler.SpriteBuffer_spriteWidths, class372.SpriteBuffer_spriteHeights, AccessFile.SpriteBuffer_spritePalette, class396.SpriteBuffer_pixels); // L: 143 - class243.SpriteBuffer_xOffsets = null; // L: 145 - class396.SpriteBuffer_yOffsets = null; // L: 146 - ArchiveDiskActionHandler.SpriteBuffer_spriteWidths = null; // L: 147 - class372.SpriteBuffer_spriteHeights = null; // L: 148 - AccessFile.SpriteBuffer_spritePalette = null; // L: 149 - class396.SpriteBuffer_pixels = null; // L: 150 - var7 = var9; // L: 152 - } - - var6 = var7; // L: 154 - } - - return var6; // L: 156 + static MusicPatch method2609(AbstractArchive var0, int var1) { + byte[] var2 = var0.takeFileFlat(var1); // L: 21 + return var2 == null ? null : new MusicPatch(var2); // L: 22 } - @ObfuscatedName("f") + @ObfuscatedName("j") @ObfuscatedSignature( - descriptor = "(ILci;ZI)I", - garbageValue = "1802356722" + descriptor = "(ILcf;ZI)I", + garbageValue = "1464061704" ) - static int method2616(int var0, Script var1, boolean var2) { - String var7; - if (var0 == ScriptOpcodes.MES) { // L: 1397 - var7 = Interpreter.Interpreter_stringStack[--class13.Interpreter_stringStackSize]; // L: 1398 - WorldMapScaleHandler.addGameMessage(0, "", var7); // L: 1399 - return 1; // L: 1400 - } else if (var0 == ScriptOpcodes.ANIM) { - WorldMapCacheName.Interpreter_intStackSize -= 2; // L: 1403 - class69.performPlayerAnimation(class35.localPlayer, Interpreter.Interpreter_intStack[WorldMapCacheName.Interpreter_intStackSize], Interpreter.Interpreter_intStack[WorldMapCacheName.Interpreter_intStackSize + 1]); // L: 1404 - return 1; // L: 1405 - } else if (var0 == ScriptOpcodes.IF_CLOSE) { - if (!Interpreter.field951) { // L: 1408 - Interpreter.field950 = true; // L: 1409 + static int method2619(int var0, Script var1, boolean var2) { + int var4 = -1; // L: 606 + Widget var3; + if (var0 >= 2000) { // L: 607 + var0 -= 1000; // L: 608 + var4 = Interpreter.Interpreter_intStack[--class44.Interpreter_intStackSize]; // L: 609 + var3 = Frames.getWidget(var4); // L: 610 + } else { + var3 = var2 ? class13.scriptDotWidget : Interpreter.scriptActiveWidget; // L: 612 + } + + if (var0 == ScriptOpcodes.CC_SETSCROLLPOS) { // L: 613 + class44.Interpreter_intStackSize -= 2; // L: 614 + var3.scrollX = Interpreter.Interpreter_intStack[class44.Interpreter_intStackSize]; // L: 615 + if (var3.scrollX > var3.scrollWidth - var3.width) { // L: 616 + var3.scrollX = var3.scrollWidth - var3.width; } - return 1; // L: 1411 + if (var3.scrollX < 0) { // L: 617 + var3.scrollX = 0; + } + + var3.scrollY = Interpreter.Interpreter_intStack[class44.Interpreter_intStackSize + 1]; // L: 618 + if (var3.scrollY > var3.scrollHeight - var3.height) { // L: 619 + var3.scrollY = var3.scrollHeight - var3.height; + } + + if (var3.scrollY < 0) { // L: 620 + var3.scrollY = 0; + } + + WorldMapCacheName.invalidateWidget(var3); // L: 621 + return 1; // L: 622 + } else if (var0 == ScriptOpcodes.CC_SETCOLOUR) { // L: 624 + var3.color = Interpreter.Interpreter_intStack[--class44.Interpreter_intStackSize]; // L: 625 + WorldMapCacheName.invalidateWidget(var3); // L: 626 + return 1; // L: 627 + } else if (var0 == ScriptOpcodes.CC_SETFILL) { // L: 629 + var3.fill = Interpreter.Interpreter_intStack[--class44.Interpreter_intStackSize] == 1; // L: 630 + WorldMapCacheName.invalidateWidget(var3); // L: 631 + return 1; // L: 632 + } else if (var0 == ScriptOpcodes.CC_SETTRANS) { // L: 634 + var3.transparencyTop = Interpreter.Interpreter_intStack[--class44.Interpreter_intStackSize]; // L: 635 + WorldMapCacheName.invalidateWidget(var3); // L: 636 + return 1; // L: 637 + } else if (var0 == ScriptOpcodes.CC_SETLINEWID) { // L: 639 + var3.lineWid = Interpreter.Interpreter_intStack[--class44.Interpreter_intStackSize]; // L: 640 + WorldMapCacheName.invalidateWidget(var3); // L: 641 + return 1; // L: 642 + } else if (var0 == ScriptOpcodes.CC_SETGRAPHIC) { // L: 644 + var3.spriteId2 = Interpreter.Interpreter_intStack[--class44.Interpreter_intStackSize]; // L: 645 + WorldMapCacheName.invalidateWidget(var3); // L: 646 + return 1; // L: 647 + } else if (var0 == ScriptOpcodes.CC_SET2DANGLE) { // L: 649 + var3.spriteAngle = Interpreter.Interpreter_intStack[--class44.Interpreter_intStackSize]; // L: 650 + WorldMapCacheName.invalidateWidget(var3); // L: 651 + return 1; // L: 652 + } else if (var0 == ScriptOpcodes.CC_SETTILING) { // L: 654 + var3.spriteTiling = Interpreter.Interpreter_intStack[--class44.Interpreter_intStackSize] == 1; // L: 655 + WorldMapCacheName.invalidateWidget(var3); // L: 656 + return 1; // L: 657 + } else if (var0 == ScriptOpcodes.CC_SETMODEL) { // L: 659 + var3.modelType = 1; // L: 660 + var3.modelId = Interpreter.Interpreter_intStack[--class44.Interpreter_intStackSize]; // L: 661 + WorldMapCacheName.invalidateWidget(var3); // L: 662 + return 1; // L: 663 + } else if (var0 == ScriptOpcodes.CC_SETMODELANGLE) { // L: 665 + class44.Interpreter_intStackSize -= 6; // L: 666 + var3.modelOffsetX = Interpreter.Interpreter_intStack[class44.Interpreter_intStackSize]; // L: 667 + var3.modelOffsetY = Interpreter.Interpreter_intStack[class44.Interpreter_intStackSize + 1]; // L: 668 + var3.modelAngleX = Interpreter.Interpreter_intStack[class44.Interpreter_intStackSize + 2]; // L: 669 + var3.modelAngleY = Interpreter.Interpreter_intStack[class44.Interpreter_intStackSize + 3]; // L: 670 + var3.modelAngleZ = Interpreter.Interpreter_intStack[class44.Interpreter_intStackSize + 4]; // L: 671 + var3.modelZoom = Interpreter.Interpreter_intStack[class44.Interpreter_intStackSize + 5]; // L: 672 + WorldMapCacheName.invalidateWidget(var3); // L: 673 + return 1; // L: 674 } else { - int var16; - if (var0 == ScriptOpcodes.RESUME_COUNTDIALOG) { - var7 = Interpreter.Interpreter_stringStack[--class13.Interpreter_stringStackSize]; // L: 1414 - var16 = 0; // L: 1415 - if (GrandExchangeOfferAgeComparator.isNumber(var7)) { // L: 1416 - var16 = FontName.method6162(var7); + int var8; + if (var0 == ScriptOpcodes.CC_SETMODELANIM) { // L: 676 + var8 = Interpreter.Interpreter_intStack[--class44.Interpreter_intStackSize]; // L: 677 + if (var8 != var3.sequenceId) { // L: 678 + var3.sequenceId = var8; // L: 679 + var3.modelFrame = 0; // L: 680 + var3.modelFrameCycle = 0; // L: 681 + WorldMapCacheName.invalidateWidget(var3); // L: 682 } - PacketBufferNode var14 = HealthBarDefinition.getPacketBufferNode(ClientPacket.field2670, Client.packetWriter.isaacCipher); // L: 1418 - var14.packetBuffer.writeInt(var16); // L: 1419 - Client.packetWriter.addNode(var14); // L: 1420 - return 1; // L: 1421 + return 1; // L: 684 + } else if (var0 == ScriptOpcodes.CC_SETMODELORTHOG) { // L: 686 + var3.modelOrthog = Interpreter.Interpreter_intStack[--class44.Interpreter_intStackSize] == 1; // L: 687 + WorldMapCacheName.invalidateWidget(var3); // L: 688 + return 1; // L: 689 + } else if (var0 == ScriptOpcodes.CC_SETTEXT) { // L: 691 + String var7 = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize]; // L: 692 + if (!var7.equals(var3.text)) { // L: 693 + var3.text = var7; // L: 694 + WorldMapCacheName.invalidateWidget(var3); // L: 695 + } + + return 1; // L: 697 + } else if (var0 == ScriptOpcodes.CC_SETTEXTFONT) { // L: 699 + var3.fontId = Interpreter.Interpreter_intStack[--class44.Interpreter_intStackSize]; // L: 700 + WorldMapCacheName.invalidateWidget(var3); // L: 701 + return 1; // L: 702 + } else if (var0 == ScriptOpcodes.CC_SETTEXTALIGN) { // L: 704 + class44.Interpreter_intStackSize -= 3; // L: 705 + var3.textXAlignment = Interpreter.Interpreter_intStack[class44.Interpreter_intStackSize]; // L: 706 + var3.textYAlignment = Interpreter.Interpreter_intStack[class44.Interpreter_intStackSize + 1]; // L: 707 + var3.textLineHeight = Interpreter.Interpreter_intStack[class44.Interpreter_intStackSize + 2]; // L: 708 + WorldMapCacheName.invalidateWidget(var3); // L: 709 + return 1; // L: 710 + } else if (var0 == ScriptOpcodes.CC_SETTEXTSHADOW) { // L: 712 + var3.textShadowed = Interpreter.Interpreter_intStack[--class44.Interpreter_intStackSize] == 1; // L: 713 + WorldMapCacheName.invalidateWidget(var3); // L: 714 + return 1; // L: 715 + } else if (var0 == ScriptOpcodes.CC_SETOUTLINE) { // L: 717 + var3.outline = Interpreter.Interpreter_intStack[--class44.Interpreter_intStackSize]; // L: 718 + WorldMapCacheName.invalidateWidget(var3); // L: 719 + return 1; // L: 720 + } else if (var0 == ScriptOpcodes.CC_SETGRAPHICSHADOW) { // L: 722 + var3.spriteShadow = Interpreter.Interpreter_intStack[--class44.Interpreter_intStackSize]; // L: 723 + WorldMapCacheName.invalidateWidget(var3); // L: 724 + return 1; // L: 725 + } else if (var0 == ScriptOpcodes.CC_SETVFLIP) { // L: 727 + var3.spriteFlipV = Interpreter.Interpreter_intStack[--class44.Interpreter_intStackSize] == 1; // L: 728 + WorldMapCacheName.invalidateWidget(var3); // L: 729 + return 1; // L: 730 + } else if (var0 == ScriptOpcodes.CC_SETHFLIP) { // L: 732 + var3.spriteFlipH = Interpreter.Interpreter_intStack[--class44.Interpreter_intStackSize] == 1; // L: 733 + WorldMapCacheName.invalidateWidget(var3); // L: 734 + return 1; // L: 735 + } else if (var0 == ScriptOpcodes.CC_SETSCROLLSIZE) { // L: 737 + class44.Interpreter_intStackSize -= 2; // L: 738 + var3.scrollWidth = Interpreter.Interpreter_intStack[class44.Interpreter_intStackSize]; // L: 739 + var3.scrollHeight = Interpreter.Interpreter_intStack[class44.Interpreter_intStackSize + 1]; // L: 740 + WorldMapCacheName.invalidateWidget(var3); // L: 741 + if (var4 != -1 && var3.type == 0) { // L: 742 + class313.revalidateWidgetScroll(Widget.Widget_interfaceComponents[var4 >> 16], var3, false); + } + + return 1; // L: 743 + } else if (var0 == ScriptOpcodes.CC_RESUME_PAUSEBUTTON) { // L: 745 + class22.resumePauseWidget(var3.id, var3.childIndex); // L: 746 + Client.meslayerContinueWidget = var3; // L: 747 + WorldMapCacheName.invalidateWidget(var3); // L: 748 + return 1; // L: 749 + } else if (var0 == 1122) { // L: 751 + var3.spriteId = Interpreter.Interpreter_intStack[--class44.Interpreter_intStackSize]; // L: 752 + WorldMapCacheName.invalidateWidget(var3); // L: 753 + return 1; // L: 754 + } else if (var0 == ScriptOpcodes.CC_SETFILLCOLOUR) { // L: 756 + var3.color2 = Interpreter.Interpreter_intStack[--class44.Interpreter_intStackSize]; // L: 757 + WorldMapCacheName.invalidateWidget(var3); // L: 758 + return 1; // L: 759 + } else if (var0 == 1124) { // L: 761 + var3.transparencyBot = Interpreter.Interpreter_intStack[--class44.Interpreter_intStackSize]; // L: 762 + WorldMapCacheName.invalidateWidget(var3); // L: 763 + return 1; // L: 764 + } else if (var0 == ScriptOpcodes.CC_SETFILLMODE) { // L: 766 + var8 = Interpreter.Interpreter_intStack[--class44.Interpreter_intStackSize]; // L: 767 + FillMode var6 = (FillMode)Messages.findEnumerated(VertexNormal.FillMode_values(), var8); // L: 768 + if (var6 != null) { // L: 769 + var3.fillMode = var6; // L: 770 + WorldMapCacheName.invalidateWidget(var3); // L: 771 + } + + return 1; // L: 773 } else { - PacketBufferNode var12; - if (var0 == ScriptOpcodes.RESUME_NAMEDIALOG) { - var7 = Interpreter.Interpreter_stringStack[--class13.Interpreter_stringStackSize]; // L: 1424 - var12 = HealthBarDefinition.getPacketBufferNode(ClientPacket.field2588, Client.packetWriter.isaacCipher); // L: 1426 - var12.packetBuffer.writeByte(var7.length() + 1); // L: 1427 - var12.packetBuffer.writeStringCp1252NullTerminated(var7); // L: 1428 - Client.packetWriter.addNode(var12); // L: 1429 - return 1; // L: 1430 - } else if (var0 == ScriptOpcodes.RESUME_STRINGDIALOG) { - var7 = Interpreter.Interpreter_stringStack[--class13.Interpreter_stringStackSize]; // L: 1433 - var12 = HealthBarDefinition.getPacketBufferNode(ClientPacket.field2626, Client.packetWriter.isaacCipher); // L: 1435 - var12.packetBuffer.writeByte(var7.length() + 1); // L: 1436 - var12.packetBuffer.writeStringCp1252NullTerminated(var7); // L: 1437 - Client.packetWriter.addNode(var12); // L: 1438 - return 1; // L: 1439 + boolean var5; + if (var0 == ScriptOpcodes.CC_SETLINEDIRECTION) { // L: 775 + var5 = Interpreter.Interpreter_intStack[--class44.Interpreter_intStackSize] == 1; // L: 776 + var3.field2992 = var5; // L: 777 + return 1; // L: 778 + } else if (var0 == ScriptOpcodes.CC_SETMODELTRANSPARENT) { // L: 780 + var5 = Interpreter.Interpreter_intStack[--class44.Interpreter_intStackSize] == 1; // L: 781 + var3.modelTransparency = var5; // L: 782 + return 1; // L: 783 + } else if (var0 == 1128) { // L: 785 + class44.Interpreter_intStackSize -= 2; // L: 786 + return 1; // L: 787 } else { - String var4; - int var10; - if (var0 == ScriptOpcodes.OPPLAYER) { - var10 = Interpreter.Interpreter_intStack[--WorldMapCacheName.Interpreter_intStackSize]; // L: 1442 - var4 = Interpreter.Interpreter_stringStack[--class13.Interpreter_stringStackSize]; // L: 1443 - Skeleton.method3899(var10, var4); // L: 1444 - return 1; // L: 1445 - } else if (var0 == ScriptOpcodes.IF_DRAGPICKUP) { - WorldMapCacheName.Interpreter_intStackSize -= 3; // L: 1448 - var10 = Interpreter.Interpreter_intStack[WorldMapCacheName.Interpreter_intStackSize]; // L: 1449 - var16 = Interpreter.Interpreter_intStack[WorldMapCacheName.Interpreter_intStackSize + 1]; // L: 1450 - int var9 = Interpreter.Interpreter_intStack[WorldMapCacheName.Interpreter_intStackSize + 2]; // L: 1451 - Widget var15 = DevicePcmPlayerProvider.getWidget(var9); // L: 1452 - class214.clickWidget(var15, var10, var16); // L: 1453 - return 1; // L: 1454 - } else if (var0 == ScriptOpcodes.CC_DRAGPICKUP) { - WorldMapCacheName.Interpreter_intStackSize -= 2; // L: 1457 - var10 = Interpreter.Interpreter_intStack[WorldMapCacheName.Interpreter_intStackSize]; // L: 1458 - var16 = Interpreter.Interpreter_intStack[WorldMapCacheName.Interpreter_intStackSize + 1]; // L: 1459 - Widget var13 = var2 ? class308.scriptDotWidget : class24.scriptActiveWidget; // L: 1460 - class214.clickWidget(var13, var10, var16); // L: 1461 - return 1; // L: 1462 - } else if (var0 == ScriptOpcodes.MOUSECAM) { - class229.mouseCam = Interpreter.Interpreter_intStack[--WorldMapCacheName.Interpreter_intStackSize] == 1; // L: 1465 - return 1; // L: 1466 - } else if (var0 == ScriptOpcodes.GETREMOVEROOFS) { - Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = class12.clientPreferences.roofsHidden ? 1 : 0; // L: 1469 - return 1; // L: 1470 - } else if (var0 == ScriptOpcodes.SETREMOVEROOFS) { - class12.clientPreferences.roofsHidden = Interpreter.Interpreter_intStack[--WorldMapCacheName.Interpreter_intStackSize] == 1; // L: 1473 - KeyHandler.savePreferences(); // L: 1474 - return 1; // L: 1475 - } else if (var0 == ScriptOpcodes.OPENURL) { - var7 = Interpreter.Interpreter_stringStack[--class13.Interpreter_stringStackSize]; // L: 1478 - boolean var8 = Interpreter.Interpreter_intStack[--WorldMapCacheName.Interpreter_intStackSize] == 1; // L: 1479 - Interpreter.openURL(var7, var8, false); // L: 1480 - return 1; // L: 1481 - } else if (var0 == ScriptOpcodes.RESUME_OBJDIALOG) { - var10 = Interpreter.Interpreter_intStack[--WorldMapCacheName.Interpreter_intStackSize]; // L: 1484 - var12 = HealthBarDefinition.getPacketBufferNode(ClientPacket.field2640, Client.packetWriter.isaacCipher); // L: 1486 - var12.packetBuffer.writeShort(var10); // L: 1487 - Client.packetWriter.addNode(var12); // L: 1488 - return 1; // L: 1489 - } else if (var0 == ScriptOpcodes.BUG_REPORT) { - var10 = Interpreter.Interpreter_intStack[--WorldMapCacheName.Interpreter_intStackSize]; // L: 1492 - class13.Interpreter_stringStackSize -= 2; // L: 1493 - var4 = Interpreter.Interpreter_stringStack[class13.Interpreter_stringStackSize]; // L: 1494 - String var5 = Interpreter.Interpreter_stringStack[class13.Interpreter_stringStackSize + 1]; // L: 1495 - if (var4.length() > 500) { // L: 1496 - return 1; - } else if (var5.length() > 500) { // L: 1497 - return 1; - } else { - PacketBufferNode var6 = HealthBarDefinition.getPacketBufferNode(ClientPacket.field2644, Client.packetWriter.isaacCipher); // L: 1498 - var6.packetBuffer.writeShort(1 + class4.stringCp1252NullTerminatedByteSize(var4) + class4.stringCp1252NullTerminatedByteSize(var5)); // L: 1499 - var6.packetBuffer.writeStringCp1252NullTerminated(var4); // L: 1500 - var6.packetBuffer.writeStringCp1252NullTerminated(var5); // L: 1501 - var6.packetBuffer.writeByte(var10); // L: 1502 - Client.packetWriter.addNode(var6); // L: 1503 - return 1; // L: 1504 - } - } else if (var0 == ScriptOpcodes.SETSHIFTCLICKDROP) { - Client.shiftClickDrop = Interpreter.Interpreter_intStack[--WorldMapCacheName.Interpreter_intStackSize] == 1; // L: 1507 - return 1; // L: 1508 - } else if (var0 == ScriptOpcodes.SETSHOWMOUSEOVERTEXT) { - Client.showMouseOverText = Interpreter.Interpreter_intStack[--WorldMapCacheName.Interpreter_intStackSize] == 1; // L: 1511 - return 1; // L: 1512 - } else if (var0 == ScriptOpcodes.RENDERSELF) { - Client.renderSelf = Interpreter.Interpreter_intStack[--WorldMapCacheName.Interpreter_intStackSize] == 1; // L: 1515 - return 1; // L: 1516 - } else if (var0 == 3120) { - if (Interpreter.Interpreter_intStack[--WorldMapCacheName.Interpreter_intStackSize] == 1) { // L: 1519 - Client.drawPlayerNames |= 1; - } else { - Client.drawPlayerNames &= -2; // L: 1520 - } - - return 1; // L: 1521 - } else if (var0 == 3121) { - if (Interpreter.Interpreter_intStack[--WorldMapCacheName.Interpreter_intStackSize] == 1) { // L: 1524 - Client.drawPlayerNames |= 2; - } else { - Client.drawPlayerNames &= -3; // L: 1525 - } - - return 1; // L: 1526 - } else if (var0 == 3122) { - if (Interpreter.Interpreter_intStack[--WorldMapCacheName.Interpreter_intStackSize] == 1) { // L: 1529 - Client.drawPlayerNames |= 4; - } else { - Client.drawPlayerNames &= -5; // L: 1530 - } - - return 1; // L: 1531 - } else if (var0 == 3123) { - if (Interpreter.Interpreter_intStack[--WorldMapCacheName.Interpreter_intStackSize] == 1) { // L: 1534 - Client.drawPlayerNames |= 8; - } else { - Client.drawPlayerNames &= -9; // L: 1535 - } - - return 1; // L: 1536 - } else if (var0 == 3124) { - Client.drawPlayerNames = 0; // L: 1539 - return 1; // L: 1540 - } else if (var0 == ScriptOpcodes.SETSHOWMOUSECROSS) { - Client.showMouseCross = Interpreter.Interpreter_intStack[--WorldMapCacheName.Interpreter_intStackSize] == 1; // L: 1543 - return 1; // L: 1544 - } else if (var0 == ScriptOpcodes.SETSHOWLOADINGMESSAGES) { - Client.showLoadingMessages = Interpreter.Interpreter_intStack[--WorldMapCacheName.Interpreter_intStackSize] == 1; // L: 1547 - return 1; // L: 1548 - } else if (var0 == ScriptOpcodes.SETTAPTODROP) { - class24.setTapToDrop(Interpreter.Interpreter_intStack[--WorldMapCacheName.Interpreter_intStackSize] == 1); // L: 1551 - return 1; // L: 1552 - } else if (var0 == ScriptOpcodes.GETTAPTODROP) { - Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = GameObject.getTapToDrop() ? 1 : 0; // L: 1555 - return 1; // L: 1556 - } else if (var0 == ScriptOpcodes.SETOCULUSORBSPEED) { - WorldMapCacheName.Interpreter_intStackSize -= 2; // L: 1559 - Client.oculusOrbNormalSpeed = Interpreter.Interpreter_intStack[WorldMapCacheName.Interpreter_intStackSize]; // L: 1560 - Client.oculusOrbSlowedSpeed = Interpreter.Interpreter_intStack[WorldMapCacheName.Interpreter_intStackSize + 1]; // L: 1561 - return 1; // L: 1562 - } else if (var0 == 3130) { - WorldMapCacheName.Interpreter_intStackSize -= 2; // L: 1565 - return 1; // L: 1566 - } else if (var0 == 3131) { - --WorldMapCacheName.Interpreter_intStackSize; // L: 1569 - return 1; // L: 1570 - } else if (var0 == ScriptOpcodes.GETCANVASSIZE) { - Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = GameEngine.canvasWidth; // L: 1573 - Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = HealthBarDefinition.canvasHeight; // L: 1574 - return 1; // L: 1575 - } else if (var0 == ScriptOpcodes.MOBILE_SETFPS) { - --WorldMapCacheName.Interpreter_intStackSize; // L: 1578 - return 1; // L: 1579 - } else if (var0 == ScriptOpcodes.MOBILE_OPENSTORE) { - return 1; // L: 1582 - } else if (var0 == ScriptOpcodes.MOBILE_OPENSTORECATEGORY) { - WorldMapCacheName.Interpreter_intStackSize -= 2; // L: 1585 - return 1; // L: 1586 - } else if (var0 == 3136) { - Client.field778 = 3; // L: 1589 - Client.field779 = Interpreter.Interpreter_intStack[--WorldMapCacheName.Interpreter_intStackSize]; // L: 1590 - return 1; // L: 1591 - } else if (var0 == 3137) { - Client.field778 = 2; // L: 1594 - Client.field779 = Interpreter.Interpreter_intStack[--WorldMapCacheName.Interpreter_intStackSize]; // L: 1595 - return 1; // L: 1596 - } else if (var0 == 3138) { - Client.field778 = 0; // L: 1599 - return 1; // L: 1600 - } else if (var0 == 3139) { - Client.field778 = 1; // L: 1603 - return 1; // L: 1604 - } else if (var0 == 3140) { - Client.field778 = 3; // L: 1607 - Client.field779 = var2 ? class308.scriptDotWidget.id * 1657404511 * 976969631 : class24.scriptActiveWidget.id * 1657404511 * 976969631; // L: 1608 - return 1; // L: 1609 - } else { - boolean var11; - if (var0 == ScriptOpcodes.SETHIDEUSERNAME) { - var11 = Interpreter.Interpreter_intStack[--WorldMapCacheName.Interpreter_intStackSize] == 1; // L: 1612 - class12.clientPreferences.hideUsername = var11; // L: 1613 - KeyHandler.savePreferences(); // L: 1614 - return 1; // L: 1615 - } else if (var0 == ScriptOpcodes.GETHIDEUSERNAME) { - Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = class12.clientPreferences.hideUsername ? 1 : 0; // L: 1618 - return 1; // L: 1619 - } else if (var0 == ScriptOpcodes.SETREMEMBERUSERNAME) { - var11 = Interpreter.Interpreter_intStack[--WorldMapCacheName.Interpreter_intStackSize] == 1; // L: 1622 - Client.Login_isUsernameRemembered = var11; // L: 1623 - if (!var11) { // L: 1624 - class12.clientPreferences.rememberedUsername = ""; // L: 1625 - KeyHandler.savePreferences(); // L: 1626 - } - - return 1; // L: 1628 - } else if (var0 == ScriptOpcodes.GETREMEMBERUSERNAME) { - Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = Client.Login_isUsernameRemembered ? 1 : 0; // L: 1631 - return 1; // L: 1632 - } else if (var0 == 3145) { - return 1; // L: 1635 - } else if (var0 == ScriptOpcodes.SETTITLEMUSICENABLED) { - var11 = Interpreter.Interpreter_intStack[--WorldMapCacheName.Interpreter_intStackSize] == 1; // L: 1638 - if (var11 == class12.clientPreferences.titleMusicDisabled) { // L: 1639 - class12.clientPreferences.titleMusicDisabled = !var11; // L: 1640 - KeyHandler.savePreferences(); // L: 1641 - } - - return 1; // L: 1643 - } else if (var0 == ScriptOpcodes.GETTITLEMUSICENABLED) { - Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = class12.clientPreferences.titleMusicDisabled ? 0 : 1; // L: 1646 - return 1; // L: 1647 - } else if (var0 == 3148) { - return 1; // L: 1650 - } else if (var0 == 3149) { - Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = 0; // L: 1653 - return 1; // L: 1654 - } else if (var0 == 3150) { - Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = 0; // L: 1657 - return 1; // L: 1658 - } else if (var0 == 3151) { - Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = 0; // L: 1661 - return 1; // L: 1662 - } else if (var0 == 3152) { - Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = 0; // L: 1665 - return 1; // L: 1666 - } else if (var0 == 3153) { - Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = Login.Login_loadingPercent; // L: 1669 - return 1; // L: 1670 - } else if (var0 == 3154) { - Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = Script.method2026(); // L: 1673 - return 1; // L: 1674 - } else if (var0 == 3155) { - --class13.Interpreter_stringStackSize; // L: 1677 - return 1; // L: 1678 - } else if (var0 == 3156) { - return 1; // L: 1681 - } else if (var0 == 3157) { - WorldMapCacheName.Interpreter_intStackSize -= 2; // L: 1684 - return 1; // L: 1685 - } else if (var0 == 3158) { - Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = 0; // L: 1688 - return 1; // L: 1689 - } else if (var0 == 3159) { - Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = 0; // L: 1692 - return 1; // L: 1693 - } else if (var0 == 3160) { - Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = 0; // L: 1696 - return 1; // L: 1697 - } else if (var0 == 3161) { - --WorldMapCacheName.Interpreter_intStackSize; // L: 1700 - Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = 0; // L: 1701 - return 1; // L: 1702 - } else if (var0 == 3162) { - --WorldMapCacheName.Interpreter_intStackSize; // L: 1705 - Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = 0; // L: 1706 - return 1; // L: 1707 - } else if (var0 == 3163) { - --class13.Interpreter_stringStackSize; // L: 1710 - Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = 0; // L: 1711 - return 1; // L: 1712 - } else if (var0 == 3164) { - --WorldMapCacheName.Interpreter_intStackSize; // L: 1715 - Interpreter.Interpreter_stringStack[++class13.Interpreter_stringStackSize - 1] = ""; // L: 1716 - return 1; // L: 1717 - } else if (var0 == 3165) { - --WorldMapCacheName.Interpreter_intStackSize; // L: 1720 - Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = 0; // L: 1721 - return 1; // L: 1722 - } else if (var0 == 3166) { - WorldMapCacheName.Interpreter_intStackSize -= 2; // L: 1725 - Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = 0; // L: 1726 - return 1; // L: 1727 - } else if (var0 == 3167) { - WorldMapCacheName.Interpreter_intStackSize -= 2; // L: 1730 - Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = 0; // L: 1731 - return 1; // L: 1732 - } else if (var0 == 3168) { - WorldMapCacheName.Interpreter_intStackSize -= 2; // L: 1735 - Interpreter.Interpreter_stringStack[++class13.Interpreter_stringStackSize - 1] = ""; // L: 1736 - Interpreter.Interpreter_stringStack[++class13.Interpreter_stringStackSize - 1] = ""; // L: 1737 - Interpreter.Interpreter_stringStack[++class13.Interpreter_stringStackSize - 1] = ""; // L: 1738 - Interpreter.Interpreter_stringStack[++class13.Interpreter_stringStackSize - 1] = ""; // L: 1739 - Interpreter.Interpreter_stringStack[++class13.Interpreter_stringStackSize - 1] = ""; // L: 1740 - Interpreter.Interpreter_stringStack[++class13.Interpreter_stringStackSize - 1] = ""; // L: 1741 - Interpreter.Interpreter_stringStack[++class13.Interpreter_stringStackSize - 1] = ""; // L: 1742 - Interpreter.Interpreter_stringStack[++class13.Interpreter_stringStackSize - 1] = ""; // L: 1743 - Interpreter.Interpreter_stringStack[++class13.Interpreter_stringStackSize - 1] = ""; // L: 1744 - return 1; // L: 1745 - } else if (var0 == 3169) { - return 1; // L: 1748 - } else if (var0 == 3170) { - Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = 0; // L: 1751 - return 1; // L: 1752 - } else if (var0 == 3171) { - Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = 0; // L: 1755 - return 1; // L: 1756 - } else if (var0 == 3172) { - --WorldMapCacheName.Interpreter_intStackSize; // L: 1759 - return 1; // L: 1760 - } else if (var0 == 3173) { - --WorldMapCacheName.Interpreter_intStackSize; // L: 1763 - Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = 0; // L: 1764 - return 1; // L: 1765 - } else if (var0 == 3174) { - --WorldMapCacheName.Interpreter_intStackSize; // L: 1768 - return 1; // L: 1769 - } else if (var0 == 3175) { - Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = 0; // L: 1772 - return 1; // L: 1773 - } else if (var0 == 3176) { - return 1; // L: 1776 - } else if (var0 == 3177) { - return 1; // L: 1779 - } else if (var0 == 3178) { - --class13.Interpreter_stringStackSize; // L: 1782 - return 1; // L: 1783 - } else if (var0 == 3179) { - return 1; // L: 1786 - } else if (var0 == 3180) { - --class13.Interpreter_stringStackSize; // L: 1789 - return 1; // L: 1790 - } else if (var0 == 3181) { - var10 = 100 - Math.min(Math.max(Interpreter.Interpreter_intStack[--WorldMapCacheName.Interpreter_intStackSize], 0), 100); // L: 1793 - class264.method4796((double)(0.5F + (float)var10 / 200.0F)); // L: 1794 - return 1; // L: 1795 - } else if (var0 == 3182) { - float var3 = ((float)class12.clientPreferences.field1303 - 0.5F) * 200.0F; // L: 1798 - Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = 100 - Math.round(var3); // L: 1799 - return 1; // L: 1800 - } else if (var0 != 3183 && var0 != 3184) { - return 2; // L: 1806 - } else { - --WorldMapCacheName.Interpreter_intStackSize; // L: 1803 - return 1; // L: 1804 - } - } + return 2; // L: 789 } } } } - @ObfuscatedName("hj") + @ObfuscatedName("jo") @ObfuscatedSignature( - descriptor = "(IIIII)V", - garbageValue = "882607989" + descriptor = "(Lio;I)Z", + garbageValue = "-1051636424" ) - static final void method2615(int var0, int var1, int var2, int var3) { - class125.method2506(); // L: 5410 - } // L: 5411 + @Export("runCs1") + static final boolean runCs1(Widget var0) { + if (var0.cs1Comparisons == null) { // L: 9871 + return false; + } else { + for (int var1 = 0; var1 < var0.cs1Comparisons.length; ++var1) { // L: 9872 + int var2 = ModeWhere.method5160(var0, var1); // L: 9873 + int var3 = var0.cs1ComparisonValues[var1]; // L: 9874 + if (var0.cs1Comparisons[var1] == 2) { // L: 9875 + if (var2 >= var3) { // L: 9876 + return false; + } + } else if (var0.cs1Comparisons[var1] == 3) { // L: 9878 + if (var2 <= var3) { // L: 9879 + return false; + } + } else if (var0.cs1Comparisons[var1] == 4) { // L: 9881 + if (var3 == var2) { // L: 9882 + return false; + } + } else if (var2 != var3) { // L: 9884 + return false; + } + } + + return true; // L: 9886 + } + } } diff --git a/runescape-client/src/main/java/IsaacCipher.java b/runescape-client/src/main/java/IsaacCipher.java index 4df43f21d8..8f090bf714 100644 --- a/runescape-client/src/main/java/IsaacCipher.java +++ b/runescape-client/src/main/java/IsaacCipher.java @@ -7,69 +7,69 @@ import net.runelite.mapping.ObfuscatedSignature; @ObfuscatedName("oy") @Implements("IsaacCipher") public final class IsaacCipher { - @ObfuscatedName("g") + @ObfuscatedName("y") @ObfuscatedGetter( - intValue = 1255372445 + intValue = -21857667 ) @Export("valuesRemaining") int valuesRemaining; - @ObfuscatedName("l") + @ObfuscatedName("p") @Export("results") int[] results; - @ObfuscatedName("z") + @ObfuscatedName("j") @Export("mm") int[] mm; - @ObfuscatedName("t") + @ObfuscatedName("r") @ObfuscatedGetter( - intValue = -1713890931 + intValue = 2044871249 ) @Export("aa") int aa; - @ObfuscatedName("v") + @ObfuscatedName("b") @ObfuscatedGetter( - intValue = -113768935 + intValue = 1090157991 ) @Export("bb") int bb; - @ObfuscatedName("b") + @ObfuscatedName("d") @ObfuscatedGetter( - intValue = -1917238977 + intValue = 1872182579 ) @Export("cc") int cc; public IsaacCipher(int[] var1) { - this.mm = new int[256]; - this.results = new int[256]; + this.mm = new int[256]; // L: 15 + this.results = new int[256]; // L: 16 for (int var2 = 0; var2 < var1.length; ++var2) { // L: 17 this.results[var2] = var1[var2]; // L: 18 } - this.method7017(); // L: 20 - } + this.method7098(); // L: 20 + } // L: 21 - @ObfuscatedName("h") + @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "(S)I", - garbageValue = "-4327" + descriptor = "(B)I", + garbageValue = "81" ) @Export("nextInt") public final int nextInt() { if (this.valuesRemaining == 0) { // L: 24 - this.generateMoreResults(); + this.generateMoreResults(); // L: 25 this.valuesRemaining = 256; // L: 26 } return this.results[--this.valuesRemaining]; // L: 28 } - @ObfuscatedName("c") + @ObfuscatedName("n") @ObfuscatedSignature( - descriptor = "(I)I", - garbageValue = "-1246307592" + descriptor = "(B)I", + garbageValue = "-58" ) - public final int method7019() { + public final int method7096() { if (this.valuesRemaining == 0) { // L: 32 this.generateMoreResults(); // L: 33 this.valuesRemaining = 256; // L: 34 @@ -78,10 +78,10 @@ public final class IsaacCipher { return this.results[this.valuesRemaining - 1]; // L: 36 } - @ObfuscatedName("o") + @ObfuscatedName("f") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "-477539920" + garbageValue = "-2083438988" ) @Export("generateMoreResults") final void generateMoreResults() { @@ -109,12 +109,12 @@ public final class IsaacCipher { } // L: 58 - @ObfuscatedName("g") + @ObfuscatedName("y") @ObfuscatedSignature( - descriptor = "(B)V", - garbageValue = "0" + descriptor = "(S)V", + garbageValue = "128" ) - final void method7017() { + final void method7098() { int var9 = -1640531527; // L: 70 int var8 = -1640531527; // L: 71 int var7 = -1640531527; // L: 72 @@ -242,43 +242,18 @@ public final class IsaacCipher { this.valuesRemaining = 256; // L: 189 } // L: 190 - @ObfuscatedName("h") + @ObfuscatedName("s") @ObfuscatedSignature( - descriptor = "(Ljp;Ljp;IZB)Lgi;", - garbageValue = "5" + descriptor = "(Lio;IIIB)V", + garbageValue = "-43" ) - @Export("loadFrames") - public static Frames loadFrames(AbstractArchive var0, AbstractArchive var1, int var2, boolean var3) { - boolean var4 = true; // L: 11 - int[] var5 = var0.getGroupFileIds(var2); // L: 12 - - for (int var6 = 0; var6 < var5.length; ++var6) { // L: 13 - byte[] var7 = var0.getFile(var2, var5[var6]); // L: 14 - if (var7 == null) { // L: 15 - var4 = false; // L: 16 - } else { - int var8 = (var7[0] & 255) << 8 | var7[1] & 255; // L: 19 - byte[] var9; - if (var3) { // L: 21 - var9 = var1.getFile(0, var8); - } else { - var9 = var1.getFile(var8, 0); // L: 22 - } - - if (var9 == null) { // L: 23 - var4 = false; - } - } - } - - if (!var4) { // L: 25 - return null; + @Export("Widget_setKeyRate") + static final void Widget_setKeyRate(Widget var0, int var1, int var2, int var3) { + if (var0.field3035 == null) { // L: 988 + throw new RuntimeException(); // L: 989 } else { - try { - return new Frames(var0, var1, var2, var3); // L: 27 - } catch (Exception var11) { // L: 29 - return null; // L: 30 - } + var0.field3035[var1] = var2; // L: 991 + var0.field3079[var1] = var3; // L: 992 } - } + } // L: 993 } diff --git a/runescape-client/src/main/java/ItemComposition.java b/runescape-client/src/main/java/ItemComposition.java index 53495bcbab..bce7f98445 100644 --- a/runescape-client/src/main/java/ItemComposition.java +++ b/runescape-client/src/main/java/ItemComposition.java @@ -4,301 +4,306 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ez") +@ObfuscatedName("eq") @Implements("ItemComposition") public class ItemComposition extends DualNode { - @ObfuscatedName("z") - @ObfuscatedSignature( - descriptor = "Ljp;" + @ObfuscatedName("d") + @ObfuscatedGetter( + intValue = 251127981 ) - @Export("ItemDefinition_archive") - static AbstractArchive ItemDefinition_archive; - @ObfuscatedName("q") + @Export("ItemDefinition_fileCount") + public static int ItemDefinition_fileCount; + @ObfuscatedName("s") @ObfuscatedSignature( - descriptor = "Lho;" + descriptor = "Lhz;" ) @Export("ItemDefinition_cached") - public static EvictingDualNodeHashTable ItemDefinition_cached; - @ObfuscatedName("i") + static EvictingDualNodeHashTable ItemDefinition_cached; + @ObfuscatedName("u") @ObfuscatedSignature( - descriptor = "Lho;" + descriptor = "Lhz;" ) @Export("ItemDefinition_cachedModels") - public static EvictingDualNodeHashTable ItemDefinition_cachedModels; - @ObfuscatedName("x") + static EvictingDualNodeHashTable ItemDefinition_cachedModels; + @ObfuscatedName("l") @ObfuscatedSignature( - descriptor = "Lho;" + descriptor = "Lhz;" ) @Export("ItemDefinition_cachedSprites") - public static EvictingDualNodeHashTable ItemDefinition_cachedSprites; - @ObfuscatedName("r") + static EvictingDualNodeHashTable ItemDefinition_cachedSprites; + @ObfuscatedName("cg") @ObfuscatedGetter( - intValue = 547633189 + intValue = 644081785 + ) + public static int field1859; + @ObfuscatedName("c") + @ObfuscatedGetter( + intValue = -882422617 ) @Export("id") public int id; - @ObfuscatedName("p") + @ObfuscatedName("e") @ObfuscatedGetter( - intValue = 1266178465 + intValue = -1212146295 ) @Export("model") int model; - @ObfuscatedName("a") + @ObfuscatedName("g") @Export("name") public String name; - @ObfuscatedName("e") + @ObfuscatedName("a") @Export("recolorFrom") public short[] recolorFrom; - @ObfuscatedName("d") + @ObfuscatedName("k") @Export("recolorTo") public short[] recolorTo; - @ObfuscatedName("u") + @ObfuscatedName("m") @Export("retextureFrom") public short[] retextureFrom; - @ObfuscatedName("m") + @ObfuscatedName("x") @Export("retextureTo") public short[] retextureTo; - @ObfuscatedName("j") + @ObfuscatedName("z") @ObfuscatedGetter( - intValue = 483565977 + intValue = 1180916267 ) @Export("zoom2d") public int zoom2d; - @ObfuscatedName("f") + @ObfuscatedName("w") @ObfuscatedGetter( - intValue = 1616193781 + intValue = 143465415 ) @Export("xan2d") public int xan2d; - @ObfuscatedName("s") + @ObfuscatedName("t") @ObfuscatedGetter( - intValue = 50079583 + intValue = 10451221 ) @Export("yan2d") public int yan2d; - @ObfuscatedName("y") + @ObfuscatedName("h") @ObfuscatedGetter( - intValue = 309959763 + intValue = -1707042663 ) @Export("zan2d") public int zan2d; - @ObfuscatedName("w") + @ObfuscatedName("q") @ObfuscatedGetter( - intValue = -341173427 + intValue = -538415603 ) @Export("offsetX2d") public int offsetX2d; - @ObfuscatedName("n") + @ObfuscatedName("i") @ObfuscatedGetter( - intValue = -565964941 + intValue = -1515805085 ) @Export("offsetY2d") public int offsetY2d; - @ObfuscatedName("ag") + @ObfuscatedName("ae") @ObfuscatedGetter( - intValue = -619330899 + intValue = -1049731853 ) @Export("isStackable") public int isStackable; - @ObfuscatedName("ae") + @ObfuscatedName("ap") @ObfuscatedGetter( - intValue = 279752497 + intValue = -407851249 ) @Export("price") public int price; - @ObfuscatedName("ao") + @ObfuscatedName("ab") @Export("isMembersOnly") public boolean isMembersOnly; - @ObfuscatedName("aj") + @ObfuscatedName("al") @Export("groundActions") public String[] groundActions; - @ObfuscatedName("aw") + @ObfuscatedName("ad") @Export("inventoryActions") public String[] inventoryActions; - @ObfuscatedName("av") + @ObfuscatedName("ar") @ObfuscatedGetter( - intValue = 1461867551 + intValue = -1244064173 ) @Export("shiftClickIndex") int shiftClickIndex; - @ObfuscatedName("al") + @ObfuscatedName("ag") @ObfuscatedGetter( - intValue = 2021927303 + intValue = 461761185 ) @Export("maleModel") int maleModel; - @ObfuscatedName("ap") + @ObfuscatedName("ax") @ObfuscatedGetter( - intValue = 906728493 + intValue = -2090621981 ) @Export("maleModel1") int maleModel1; - @ObfuscatedName("am") + @ObfuscatedName("as") @ObfuscatedGetter( - intValue = -116866817 + intValue = 2017655331 ) @Export("maleOffset") int maleOffset; - @ObfuscatedName("ax") + @ObfuscatedName("aj") @ObfuscatedGetter( - intValue = 326211461 + intValue = 1881995837 ) @Export("femaleModel") int femaleModel; - @ObfuscatedName("ak") + @ObfuscatedName("am") @ObfuscatedGetter( - intValue = -2000061499 + intValue = 264233001 ) @Export("femaleModel1") int femaleModel1; - @ObfuscatedName("ay") + @ObfuscatedName("az") @ObfuscatedGetter( - intValue = 85695415 + intValue = 237060879 ) @Export("femaleOffset") int femaleOffset; - @ObfuscatedName("ai") + @ObfuscatedName("av") @ObfuscatedGetter( - intValue = -10248853 + intValue = 1265781663 ) @Export("maleModel2") int maleModel2; - @ObfuscatedName("aa") + @ObfuscatedName("ac") @ObfuscatedGetter( - intValue = 1127357827 + intValue = -459952191 ) @Export("femaleModel2") int femaleModel2; - @ObfuscatedName("au") + @ObfuscatedName("at") @ObfuscatedGetter( - intValue = 1899931167 + intValue = 2115221939 ) @Export("maleHeadModel") int maleHeadModel; - @ObfuscatedName("as") + @ObfuscatedName("ah") @ObfuscatedGetter( - intValue = -291882105 + intValue = 1899720535 ) @Export("maleHeadModel2") int maleHeadModel2; - @ObfuscatedName("ad") + @ObfuscatedName("ao") @ObfuscatedGetter( - intValue = 80586719 + intValue = 1556168093 ) @Export("femaleHeadModel") int femaleHeadModel; - @ObfuscatedName("ac") + @ObfuscatedName("aq") @ObfuscatedGetter( - intValue = -935374551 + intValue = 586976285 ) @Export("femaleHeadModel2") int femaleHeadModel2; - @ObfuscatedName("az") + @ObfuscatedName("aw") @Export("countobj") int[] countobj; - @ObfuscatedName("aq") + @ObfuscatedName("af") @Export("countco") int[] countco; - @ObfuscatedName("ab") + @ObfuscatedName("ak") @ObfuscatedGetter( - intValue = 1859432357 + intValue = 1027633359 ) @Export("note") public int note; - @ObfuscatedName("ar") + @ObfuscatedName("ay") @ObfuscatedGetter( - intValue = 328279449 + intValue = 168192755 ) @Export("noteTemplate") public int noteTemplate; - @ObfuscatedName("ah") + @ObfuscatedName("aa") @ObfuscatedGetter( - intValue = 1093690633 + intValue = 1366362761 ) @Export("resizeX") int resizeX; - @ObfuscatedName("af") + @ObfuscatedName("au") @ObfuscatedGetter( - intValue = -52556217 + intValue = -1651193245 ) @Export("resizeY") int resizeY; @ObfuscatedName("an") @ObfuscatedGetter( - intValue = -1405177909 + intValue = -867000627 ) @Export("resizeZ") int resizeZ; @ObfuscatedName("bd") @ObfuscatedGetter( - intValue = -173880273 + intValue = -333382647 ) @Export("ambient") public int ambient; - @ObfuscatedName("bw") + @ObfuscatedName("bt") @ObfuscatedGetter( - intValue = -1352036525 + intValue = -512843981 ) @Export("contrast") public int contrast; - @ObfuscatedName("bf") + @ObfuscatedName("bq") @ObfuscatedGetter( - intValue = 2087677201 + intValue = 1898498591 ) @Export("team") public int team; @ObfuscatedName("bu") @ObfuscatedSignature( - descriptor = "Lmo;" + descriptor = "Lmr;" ) @Export("params") IterableNodeHashTable params; - @ObfuscatedName("bb") + @ObfuscatedName("bl") @Export("isTradable") public boolean isTradable; - @ObfuscatedName("bk") + @ObfuscatedName("bv") @ObfuscatedGetter( - intValue = -646463005 + intValue = -1249308017 ) @Export("unnotedId") int unnotedId; - @ObfuscatedName("bt") + @ObfuscatedName("bm") @ObfuscatedGetter( - intValue = -569756661 + intValue = -1893254845 ) @Export("notedId") int notedId; - @ObfuscatedName("by") + @ObfuscatedName("bz") @ObfuscatedGetter( - intValue = 93657053 + intValue = 1563500305 ) @Export("placeholder") public int placeholder; - @ObfuscatedName("bz") + @ObfuscatedName("bh") @ObfuscatedGetter( - intValue = 1039838991 + intValue = 1689317723 ) @Export("placeholderTemplate") public int placeholderTemplate; static { - ItemDefinition_cached = new EvictingDualNodeHashTable(64); - ItemDefinition_cachedModels = new EvictingDualNodeHashTable(50); - ItemDefinition_cachedSprites = new EvictingDualNodeHashTable(200); + ItemDefinition_cached = new EvictingDualNodeHashTable(64); // L: 28 + ItemDefinition_cachedModels = new EvictingDualNodeHashTable(50); // L: 29 + ItemDefinition_cachedSprites = new EvictingDualNodeHashTable(200); // L: 30 } ItemComposition() { - this.name = "null"; + this.name = "null"; // L: 34 this.zoom2d = 2000; // L: 39 this.xan2d = 0; // L: 40 this.yan2d = 0; // L: 41 this.zan2d = 0; // L: 42 this.offsetX2d = 0; // L: 43 - this.offsetY2d = 0; // L: 44 + this.offsetY2d = 0; this.isStackable = 0; // L: 45 this.price = 1; // L: 46 - this.isMembersOnly = false; // L: 47 - this.groundActions = new String[]{null, null, "Take", null, null}; // L: 48 + this.isMembersOnly = false; + this.groundActions = new String[]{null, null, "Take", null, null}; this.inventoryActions = new String[]{null, null, null, null, "Drop"}; // L: 49 this.shiftClickIndex = -2; // L: 51 this.maleModel = -1; // L: 52 @@ -325,785 +330,850 @@ public class ItemComposition extends DualNode { this.unnotedId = -1; // L: 76 this.notedId = -1; // L: 77 this.placeholder = -1; // L: 78 - this.placeholderTemplate = -1; // L: 79 - } // L: 81 + this.placeholderTemplate = -1; + } - @ObfuscatedName("o") + @ObfuscatedName("n") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "-478531714" + garbageValue = "1352174221" ) @Export("post") void post() { - } // L: 123 + } // L: 115 - @ObfuscatedName("g") + @ObfuscatedName("f") @ObfuscatedSignature( - descriptor = "(Lnk;B)V", - garbageValue = "1" + descriptor = "(Lnd;I)V", + garbageValue = "2116753290" ) @Export("decode") void decode(Buffer var1) { while (true) { - int var2 = var1.readUnsignedByte(); // L: 127 - if (var2 == 0) { // L: 128 - return; // L: 131 + int var2 = var1.readUnsignedByte(); // L: 119 + if (var2 == 0) { // L: 120 + return; // L: 123 } - this.decodeNext(var1, var2); // L: 129 + this.decodeNext(var1, var2); // L: 121 } } - @ObfuscatedName("l") + @ObfuscatedName("y") @ObfuscatedSignature( - descriptor = "(Lnk;II)V", - garbageValue = "-1644464908" + descriptor = "(Lnd;II)V", + garbageValue = "-610453643" ) @Export("decodeNext") void decodeNext(Buffer var1, int var2) { - if (var2 == 1) { // L: 134 + if (var2 == 1) { // L: 126 this.model = var1.readUnsignedShort(); - } else if (var2 == 2) { // L: 135 + } else if (var2 == 2) { // L: 127 this.name = var1.readStringCp1252NullTerminated(); - } else if (var2 == 4) { // L: 136 + } else if (var2 == 4) { // L: 128 this.zoom2d = var1.readUnsignedShort(); - } else if (var2 == 5) { // L: 137 + } else if (var2 == 5) { // L: 129 this.xan2d = var1.readUnsignedShort(); - } else if (var2 == 6) { // L: 138 + } else if (var2 == 6) { // L: 130 this.yan2d = var1.readUnsignedShort(); - } else if (var2 == 7) { // L: 139 - this.offsetX2d = var1.readUnsignedShort(); // L: 140 - if (this.offsetX2d > 32767) { // L: 141 + } else if (var2 == 7) { // L: 131 + this.offsetX2d = var1.readUnsignedShort(); // L: 132 + if (this.offsetX2d > 32767) { // L: 133 this.offsetX2d -= 65536; } - } else if (var2 == 8) { // L: 143 - this.offsetY2d = var1.readUnsignedShort(); // L: 144 + } else if (var2 == 8) { // L: 135 + this.offsetY2d = var1.readUnsignedShort(); // L: 136 if (this.offsetY2d > 32767) { - this.offsetY2d -= 65536; // L: 145 + this.offsetY2d -= 65536; // L: 137 } - } else if (var2 == 11) { // L: 147 + } else if (var2 == 11) { // L: 139 this.isStackable = 1; - } else if (var2 == 12) { // L: 148 + } else if (var2 == 12) { // L: 140 this.price = var1.readInt(); - } else if (var2 == 16) { // L: 149 + } else if (var2 == 16) { // L: 141 this.isMembersOnly = true; - } else if (var2 == 23) { // L: 150 - this.maleModel = var1.readUnsignedShort(); // L: 151 - this.maleOffset = var1.readUnsignedByte(); // L: 152 - } else if (var2 == 24) { // L: 154 + } else if (var2 == 23) { // L: 142 + this.maleModel = var1.readUnsignedShort(); // L: 143 + this.maleOffset = var1.readUnsignedByte(); // L: 144 + } else if (var2 == 24) { // L: 146 this.maleModel1 = var1.readUnsignedShort(); - } else if (var2 == 25) { // L: 155 - this.femaleModel = var1.readUnsignedShort(); // L: 156 - this.femaleOffset = var1.readUnsignedByte(); // L: 157 - } else if (var2 == 26) { // L: 159 + } else if (var2 == 25) { // L: 147 + this.femaleModel = var1.readUnsignedShort(); // L: 148 + this.femaleOffset = var1.readUnsignedByte(); // L: 149 + } else if (var2 == 26) { // L: 151 this.femaleModel1 = var1.readUnsignedShort(); - } else if (var2 >= 30 && var2 < 35) { // L: 160 - this.groundActions[var2 - 30] = var1.readStringCp1252NullTerminated(); // L: 161 - if (this.groundActions[var2 - 30].equalsIgnoreCase("Hidden")) { // L: 162 + } else if (var2 >= 30 && var2 < 35) { // L: 152 + this.groundActions[var2 - 30] = var1.readStringCp1252NullTerminated(); // L: 153 + if (this.groundActions[var2 - 30].equalsIgnoreCase("Hidden")) { // L: 154 this.groundActions[var2 - 30] = null; } - } else if (var2 >= 35 && var2 < 40) { // L: 164 + } else if (var2 >= 35 && var2 < 40) { // L: 156 this.inventoryActions[var2 - 35] = var1.readStringCp1252NullTerminated(); } else { int var3; int var4; - if (var2 == 40) { // L: 165 - var3 = var1.readUnsignedByte(); // L: 166 - this.recolorFrom = new short[var3]; // L: 167 - this.recolorTo = new short[var3]; // L: 168 + if (var2 == 40) { // L: 157 + var3 = var1.readUnsignedByte(); // L: 158 + this.recolorFrom = new short[var3]; // L: 159 + this.recolorTo = new short[var3]; // L: 160 - for (var4 = 0; var4 < var3; ++var4) { // L: 169 - this.recolorFrom[var4] = (short)var1.readUnsignedShort(); // L: 170 - this.recolorTo[var4] = (short)var1.readUnsignedShort(); // L: 171 + for (var4 = 0; var4 < var3; ++var4) { // L: 161 + this.recolorFrom[var4] = (short)var1.readUnsignedShort(); // L: 162 + this.recolorTo[var4] = (short)var1.readUnsignedShort(); // L: 163 } - } else if (var2 == 41) { // L: 174 - var3 = var1.readUnsignedByte(); // L: 175 - this.retextureFrom = new short[var3]; // L: 176 - this.retextureTo = new short[var3]; // L: 177 + } else if (var2 == 41) { // L: 166 + var3 = var1.readUnsignedByte(); // L: 167 + this.retextureFrom = new short[var3]; // L: 168 + this.retextureTo = new short[var3]; // L: 169 - for (var4 = 0; var4 < var3; ++var4) { // L: 178 - this.retextureFrom[var4] = (short)var1.readUnsignedShort(); // L: 179 - this.retextureTo[var4] = (short)var1.readUnsignedShort(); // L: 180 + for (var4 = 0; var4 < var3; ++var4) { // L: 170 + this.retextureFrom[var4] = (short)var1.readUnsignedShort(); // L: 171 + this.retextureTo[var4] = (short)var1.readUnsignedShort(); // L: 172 } - } else if (var2 == 42) { // L: 183 - this.shiftClickIndex = var1.readByte(); // L: 184 - } else if (var2 == 65) { // L: 186 + } else if (var2 == 42) { // L: 175 + this.shiftClickIndex = var1.readByte(); // L: 176 + } else if (var2 == 65) { // L: 178 this.isTradable = true; - } else if (var2 == 78) { // L: 187 + } else if (var2 == 78) { // L: 179 this.maleModel2 = var1.readUnsignedShort(); - } else if (var2 == 79) { // L: 188 + } else if (var2 == 79) { // L: 180 this.femaleModel2 = var1.readUnsignedShort(); - } else if (var2 == 90) { // L: 189 + } else if (var2 == 90) { // L: 181 this.maleHeadModel = var1.readUnsignedShort(); - } else if (var2 == 91) { // L: 190 + } else if (var2 == 91) { // L: 182 this.femaleHeadModel = var1.readUnsignedShort(); - } else if (var2 == 92) { // L: 191 + } else if (var2 == 92) { // L: 183 this.maleHeadModel2 = var1.readUnsignedShort(); - } else if (var2 == 93) { // L: 192 + } else if (var2 == 93) { // L: 184 this.femaleHeadModel2 = var1.readUnsignedShort(); - } else if (var2 == 95) { // L: 193 + } else if (var2 == 95) { // L: 185 this.zan2d = var1.readUnsignedShort(); - } else if (var2 == 97) { // L: 194 + } else if (var2 == 97) { // L: 186 this.note = var1.readUnsignedShort(); - } else if (var2 == 98) { // L: 195 - this.noteTemplate = var1.readUnsignedShort(); - } else if (var2 >= 100 && var2 < 110) { // L: 196 - if (this.countobj == null) { // L: 197 - this.countobj = new int[10]; // L: 198 - this.countco = new int[10]; // L: 199 + } else if (var2 == 98) { + this.noteTemplate = var1.readUnsignedShort(); // L: 187 + } else if (var2 >= 100 && var2 < 110) { // L: 188 + if (this.countobj == null) { // L: 189 + this.countobj = new int[10]; // L: 190 + this.countco = new int[10]; // L: 191 } - this.countobj[var2 - 100] = var1.readUnsignedShort(); // L: 201 - this.countco[var2 - 100] = var1.readUnsignedShort(); // L: 202 - } else if (var2 == 110) { // L: 204 + this.countobj[var2 - 100] = var1.readUnsignedShort(); // L: 193 + this.countco[var2 - 100] = var1.readUnsignedShort(); // L: 194 + } else if (var2 == 110) { // L: 196 this.resizeX = var1.readUnsignedShort(); - } else if (var2 == 111) { // L: 205 + } else if (var2 == 111) { // L: 197 this.resizeY = var1.readUnsignedShort(); - } else if (var2 == 112) { // L: 206 + } else if (var2 == 112) { // L: 198 this.resizeZ = var1.readUnsignedShort(); - } else if (var2 == 113) { // L: 207 + } else if (var2 == 113) { // L: 199 this.ambient = var1.readByte(); - } else if (var2 == 114) { // L: 208 + } else if (var2 == 114) { // L: 200 this.contrast = var1.readByte() * 5; - } else if (var2 == 115) { // L: 209 + } else if (var2 == 115) { // L: 201 this.team = var1.readUnsignedByte(); - } else if (var2 == 139) { // L: 210 + } else if (var2 == 139) { // L: 202 this.unnotedId = var1.readUnsignedShort(); - } else if (var2 == 140) { // L: 211 + } else if (var2 == 140) { // L: 203 this.notedId = var1.readUnsignedShort(); - } else if (var2 == 148) { // L: 212 + } else if (var2 == 148) { // L: 204 this.placeholder = var1.readUnsignedShort(); - } else if (var2 == 149) { // L: 213 + } else if (var2 == 149) { // L: 205 this.placeholderTemplate = var1.readUnsignedShort(); - } else if (var2 == 249) { // L: 214 - this.params = HealthBar.readStringIntParameters(var1, this.params); + } else if (var2 == 249) { // L: 206 + this.params = ModeWhere.readStringIntParameters(var1, this.params); } } - } // L: 216 + } // L: 208 - @ObfuscatedName("z") + @ObfuscatedName("p") @ObfuscatedSignature( - descriptor = "(Lez;Lez;I)V", - garbageValue = "-132004885" + descriptor = "(Leq;Leq;B)V", + garbageValue = "107" ) @Export("genCert") void genCert(ItemComposition var1, ItemComposition var2) { - this.model = var1.model; // L: 219 - this.zoom2d = var1.zoom2d; // L: 220 - this.xan2d = var1.xan2d; // L: 221 - this.yan2d = var1.yan2d; // L: 222 - this.zan2d = var1.zan2d; // L: 223 - this.offsetX2d = var1.offsetX2d; // L: 224 - this.offsetY2d = var1.offsetY2d; // L: 225 - this.recolorFrom = var1.recolorFrom; // L: 226 - this.recolorTo = var1.recolorTo; // L: 227 - this.retextureFrom = var1.retextureFrom; // L: 228 - this.retextureTo = var1.retextureTo; // L: 229 - this.name = var2.name; // L: 230 - this.isMembersOnly = var2.isMembersOnly; // L: 231 - this.price = var2.price; // L: 232 - this.isStackable = 1; // L: 233 - } // L: 234 + this.model = var1.model; // L: 211 + this.zoom2d = var1.zoom2d; // L: 212 + this.xan2d = var1.xan2d; // L: 213 + this.yan2d = var1.yan2d; // L: 214 + this.zan2d = var1.zan2d; // L: 215 + this.offsetX2d = var1.offsetX2d; // L: 216 + this.offsetY2d = var1.offsetY2d; // L: 217 + this.recolorFrom = var1.recolorFrom; // L: 218 + this.recolorTo = var1.recolorTo; // L: 219 + this.retextureFrom = var1.retextureFrom; // L: 220 + this.retextureTo = var1.retextureTo; // L: 221 + this.name = var2.name; // L: 222 + this.isMembersOnly = var2.isMembersOnly; // L: 223 + this.price = var2.price; // L: 224 + this.isStackable = 1; // L: 225 + } // L: 226 - @ObfuscatedName("t") + @ObfuscatedName("j") @ObfuscatedSignature( - descriptor = "(Lez;Lez;I)V", - garbageValue = "1563324491" + descriptor = "(Leq;Leq;I)V", + garbageValue = "2093027907" ) @Export("genBought") void genBought(ItemComposition var1, ItemComposition var2) { - this.model = var1.model; // L: 237 - this.zoom2d = var1.zoom2d; // L: 238 - this.xan2d = var1.xan2d; // L: 239 - this.yan2d = var1.yan2d; // L: 240 - this.zan2d = var1.zan2d; // L: 241 - this.offsetX2d = var1.offsetX2d; // L: 242 - this.offsetY2d = var1.offsetY2d; // L: 243 - this.recolorFrom = var2.recolorFrom; // L: 244 - this.recolorTo = var2.recolorTo; // L: 245 - this.retextureFrom = var2.retextureFrom; // L: 246 - this.retextureTo = var2.retextureTo; // L: 247 - this.name = var2.name; // L: 248 - this.isMembersOnly = var2.isMembersOnly; // L: 249 - this.isStackable = var2.isStackable; // L: 250 - this.maleModel = var2.maleModel; // L: 251 - this.maleModel1 = var2.maleModel1; // L: 252 - this.maleModel2 = var2.maleModel2; // L: 253 - this.femaleModel = var2.femaleModel; // L: 254 - this.femaleModel1 = var2.femaleModel1; // L: 255 - this.femaleModel2 = var2.femaleModel2; // L: 256 - this.maleHeadModel = var2.maleHeadModel; // L: 257 - this.maleHeadModel2 = var2.maleHeadModel2; // L: 258 - this.femaleHeadModel = var2.femaleHeadModel; // L: 259 - this.femaleHeadModel2 = var2.femaleHeadModel2; // L: 260 - this.team = var2.team; // L: 261 - this.groundActions = var2.groundActions; // L: 262 - this.inventoryActions = new String[5]; // L: 263 - if (var2.inventoryActions != null) { // L: 264 + this.model = var1.model; // L: 229 + this.zoom2d = var1.zoom2d; // L: 230 + this.xan2d = var1.xan2d; // L: 231 + this.yan2d = var1.yan2d; // L: 232 + this.zan2d = var1.zan2d; // L: 233 + this.offsetX2d = var1.offsetX2d; // L: 234 + this.offsetY2d = var1.offsetY2d; // L: 235 + this.recolorFrom = var2.recolorFrom; // L: 236 + this.recolorTo = var2.recolorTo; // L: 237 + this.retextureFrom = var2.retextureFrom; // L: 238 + this.retextureTo = var2.retextureTo; // L: 239 + this.name = var2.name; // L: 240 + this.isMembersOnly = var2.isMembersOnly; // L: 241 + this.isStackable = var2.isStackable; // L: 242 + this.maleModel = var2.maleModel; // L: 243 + this.maleModel1 = var2.maleModel1; // L: 244 + this.maleModel2 = var2.maleModel2; // L: 245 + this.femaleModel = var2.femaleModel; // L: 246 + this.femaleModel1 = var2.femaleModel1; // L: 247 + this.femaleModel2 = var2.femaleModel2; // L: 248 + this.maleHeadModel = var2.maleHeadModel; // L: 249 + this.maleHeadModel2 = var2.maleHeadModel2; // L: 250 + this.femaleHeadModel = var2.femaleHeadModel; // L: 251 + this.femaleHeadModel2 = var2.femaleHeadModel2; // L: 252 + this.team = var2.team; // L: 253 + this.groundActions = var2.groundActions; // L: 254 + this.inventoryActions = new String[5]; // L: 255 + if (var2.inventoryActions != null) { // L: 256 for (int var3 = 0; var3 < 4; ++var3) { this.inventoryActions[var3] = var2.inventoryActions[var3]; } } - this.inventoryActions[4] = "Discard"; // L: 265 - this.price = 0; // L: 266 - } // L: 267 + this.inventoryActions[4] = "Discard"; // L: 257 + this.price = 0; // L: 258 + } // L: 259 - @ObfuscatedName("v") + @ObfuscatedName("r") @ObfuscatedSignature( - descriptor = "(Lez;Lez;I)V", - garbageValue = "86533098" + descriptor = "(Leq;Leq;I)V", + garbageValue = "555956610" ) @Export("genPlaceholder") void genPlaceholder(ItemComposition var1, ItemComposition var2) { - this.model = var1.model; // L: 270 - this.zoom2d = var1.zoom2d; // L: 271 - this.xan2d = var1.xan2d; // L: 272 - this.yan2d = var1.yan2d; // L: 273 - this.zan2d = var1.zan2d; // L: 274 - this.offsetX2d = var1.offsetX2d; // L: 275 - this.offsetY2d = var1.offsetY2d; // L: 276 - this.recolorFrom = var1.recolorFrom; // L: 277 - this.recolorTo = var1.recolorTo; // L: 278 - this.retextureFrom = var1.retextureFrom; // L: 279 - this.retextureTo = var1.retextureTo; // L: 280 - this.isStackable = var1.isStackable; // L: 281 - this.name = var2.name; // L: 282 - this.price = 0; // L: 283 - this.isMembersOnly = false; // L: 284 - this.isTradable = false; // L: 285 - } // L: 286 + this.model = var1.model; // L: 262 + this.zoom2d = var1.zoom2d; // L: 263 + this.xan2d = var1.xan2d; // L: 264 + this.yan2d = var1.yan2d; // L: 265 + this.zan2d = var1.zan2d; // L: 266 + this.offsetX2d = var1.offsetX2d; // L: 267 + this.offsetY2d = var1.offsetY2d; // L: 268 + this.recolorFrom = var1.recolorFrom; // L: 269 + this.recolorTo = var1.recolorTo; // L: 270 + this.retextureFrom = var1.retextureFrom; // L: 271 + this.retextureTo = var1.retextureTo; // L: 272 + this.isStackable = var1.isStackable; // L: 273 + this.name = var2.name; // L: 274 + this.price = 0; // L: 275 + this.isMembersOnly = false; // L: 276 + this.isTradable = false; // L: 277 + } // L: 278 @ObfuscatedName("b") @ObfuscatedSignature( - descriptor = "(II)Lgk;", - garbageValue = "-1124224184" + descriptor = "(II)Lgm;", + garbageValue = "594500425" ) @Export("getModelData") public final ModelData getModelData(int var1) { int var3; - if (this.countobj != null && var1 > 1) { // L: 289 - int var2 = -1; // L: 290 + if (this.countobj != null && var1 > 1) { // L: 281 + int var2 = -1; // L: 282 - for (var3 = 0; var3 < 10; ++var3) { // L: 291 - if (var1 >= this.countco[var3] && this.countco[var3] != 0) { // L: 292 + for (var3 = 0; var3 < 10; ++var3) { // L: 283 + if (var1 >= this.countco[var3] && this.countco[var3] != 0) { // L: 284 var2 = this.countobj[var3]; } } - if (var2 != -1) { // L: 294 - return Strings.ItemDefinition_get(var2).getModelData(1); + if (var2 != -1) { // L: 286 + return class260.ItemDefinition_get(var2).getModelData(1); } } - ModelData var4 = ModelData.ModelData_get(FloorDecoration.ItemDefinition_modelArchive, this.model, 0); // L: 296 - if (var4 == null) { // L: 297 + ModelData var4 = ModelData.ModelData_get(class311.ItemDefinition_modelArchive, this.model, 0); // L: 288 + if (var4 == null) { // L: 289 return null; } else { - if (this.resizeX != 128 || this.resizeY != 128 || this.resizeZ != 128) { // L: 298 + if (this.resizeX != 128 || this.resizeY != 128 || this.resizeZ != 128) { // L: 290 var4.resize(this.resizeX, this.resizeY, this.resizeZ); } - if (this.recolorFrom != null) { // L: 299 - for (var3 = 0; var3 < this.recolorFrom.length; ++var3) { // L: 300 - var4.recolor(this.recolorFrom[var3], this.recolorTo[var3]); // L: 301 + if (this.recolorFrom != null) { // L: 291 + for (var3 = 0; var3 < this.recolorFrom.length; ++var3) { // L: 292 + var4.recolor(this.recolorFrom[var3], this.recolorTo[var3]); // L: 293 } } - if (this.retextureFrom != null) { // L: 304 - for (var3 = 0; var3 < this.retextureFrom.length; ++var3) { // L: 305 - var4.retexture(this.retextureFrom[var3], this.retextureTo[var3]); // L: 306 + if (this.retextureFrom != null) { // L: 296 + for (var3 = 0; var3 < this.retextureFrom.length; ++var3) { // L: 297 + var4.retexture(this.retextureFrom[var3], this.retextureTo[var3]); // L: 298 } } - return var4; // L: 309 - } - } - - @ObfuscatedName("q") - @ObfuscatedSignature( - descriptor = "(II)Lgj;", - garbageValue = "1922187853" - ) - @Export("getModel") - public final Model getModel(int var1) { - if (this.countobj != null && var1 > 1) { // L: 313 - int var2 = -1; // L: 314 - - for (int var3 = 0; var3 < 10; ++var3) { // L: 315 - if (var1 >= this.countco[var3] && this.countco[var3] != 0) { // L: 316 - var2 = this.countobj[var3]; - } - } - - if (var2 != -1) { // L: 318 - return Strings.ItemDefinition_get(var2).getModel(1); - } - } - - Model var5 = (Model)ItemDefinition_cachedModels.get((long)this.id); // L: 320 - if (var5 != null) { // L: 321 - return var5; - } else { - ModelData var6 = ModelData.ModelData_get(FloorDecoration.ItemDefinition_modelArchive, this.model, 0); // L: 322 - if (var6 == null) { // L: 323 - return null; - } else { - if (this.resizeX != 128 || this.resizeY != 128 || this.resizeZ != 128) { // L: 324 - var6.resize(this.resizeX, this.resizeY, this.resizeZ); - } - - int var4; - if (this.recolorFrom != null) { // L: 325 - for (var4 = 0; var4 < this.recolorFrom.length; ++var4) { // L: 326 - var6.recolor(this.recolorFrom[var4], this.recolorTo[var4]); // L: 327 - } - } - - if (this.retextureFrom != null) { // L: 330 - for (var4 = 0; var4 < this.retextureFrom.length; ++var4) { // L: 331 - var6.retexture(this.retextureFrom[var4], this.retextureTo[var4]); // L: 332 - } - } - - var5 = var6.toModel(this.ambient + 64, this.contrast + 768, -50, -10, -50); // L: 335 - var5.isSingleTile = true; // L: 336 - ItemDefinition_cachedModels.put(var5, (long)this.id); // L: 337 - return var5; // L: 338 - } - } - } - - @ObfuscatedName("i") - @ObfuscatedSignature( - descriptor = "(II)Lez;", - garbageValue = "-1165831963" - ) - @Export("getCountObj") - public ItemComposition getCountObj(int var1) { - if (this.countobj != null && var1 > 1) { // L: 342 - int var2 = -1; // L: 343 - - for (int var3 = 0; var3 < 10; ++var3) { // L: 344 - if (var1 >= this.countco[var3] && this.countco[var3] != 0) { // L: 345 - var2 = this.countobj[var3]; - } - } - - if (var2 != -1) { // L: 347 - return Strings.ItemDefinition_get(var2); - } - } - - return this; // L: 349 - } - - @ObfuscatedName("r") - @ObfuscatedSignature( - descriptor = "(ZI)Z", - garbageValue = "-1362289585" - ) - @Export("hasNoValidModel") - public final boolean hasNoValidModel(boolean var1) { - int var2 = this.maleModel; // L: 427 - int var3 = this.maleModel1; // L: 428 - int var4 = this.maleModel2; // L: 429 - if (var1) { // L: 430 - var2 = this.femaleModel; // L: 431 - var3 = this.femaleModel1; // L: 432 - var4 = this.femaleModel2; // L: 433 - } - - if (var2 == -1) { // L: 435 - return true; - } else { - boolean var5 = true; // L: 436 - if (!FloorDecoration.ItemDefinition_modelArchive.tryLoadFile(var2, 0)) { // L: 437 - var5 = false; - } - - if (var3 != -1 && !FloorDecoration.ItemDefinition_modelArchive.tryLoadFile(var3, 0)) { // L: 438 - var5 = false; - } - - if (var4 != -1 && !FloorDecoration.ItemDefinition_modelArchive.tryLoadFile(var4, 0)) { // L: 439 - var5 = false; - } - - return var5; // L: 440 - } - } - - @ObfuscatedName("p") - @ObfuscatedSignature( - descriptor = "(ZB)Lgk;", - garbageValue = "-68" - ) - public final ModelData method3026(boolean var1) { - int var2 = this.maleModel; // L: 444 - int var3 = this.maleModel1; // L: 445 - int var4 = this.maleModel2; // L: 446 - if (var1) { // L: 447 - var2 = this.femaleModel; // L: 448 - var3 = this.femaleModel1; // L: 449 - var4 = this.femaleModel2; // L: 450 - } - - if (var2 == -1) { // L: 452 - return null; - } else { - ModelData var5 = ModelData.ModelData_get(FloorDecoration.ItemDefinition_modelArchive, var2, 0); // L: 453 - if (var3 != -1) { // L: 454 - ModelData var6 = ModelData.ModelData_get(FloorDecoration.ItemDefinition_modelArchive, var3, 0); // L: 455 - if (var4 != -1) { // L: 456 - ModelData var7 = ModelData.ModelData_get(FloorDecoration.ItemDefinition_modelArchive, var4, 0); // L: 457 - ModelData[] var8 = new ModelData[]{var5, var6, var7}; // L: 458 - var5 = new ModelData(var8, 3); // L: 459 - } else { - ModelData[] var10 = new ModelData[]{var5, var6}; // L: 462 - var5 = new ModelData(var10, 2); // L: 463 - } - } - - if (!var1 && this.maleOffset != 0) { // L: 466 - var5.changeOffset(0, this.maleOffset, 0); - } - - if (var1 && this.femaleOffset != 0) { // L: 467 - var5.changeOffset(0, this.femaleOffset, 0); - } - - int var9; - if (this.recolorFrom != null) { // L: 468 - for (var9 = 0; var9 < this.recolorFrom.length; ++var9) { // L: 469 - var5.recolor(this.recolorFrom[var9], this.recolorTo[var9]); // L: 470 - } - } - - if (this.retextureFrom != null) { // L: 473 - for (var9 = 0; var9 < this.retextureFrom.length; ++var9) { // L: 474 - var5.retexture(this.retextureFrom[var9], this.retextureTo[var9]); // L: 475 - } - } - - return var5; // L: 478 - } - } - - @ObfuscatedName("a") - @ObfuscatedSignature( - descriptor = "(ZB)Z", - garbageValue = "-3" - ) - public final boolean method2959(boolean var1) { - int var2 = this.maleHeadModel; // L: 482 - int var3 = this.maleHeadModel2; // L: 483 - if (var1) { // L: 484 - var2 = this.femaleHeadModel; // L: 485 - var3 = this.femaleHeadModel2; // L: 486 - } - - if (var2 == -1) { // L: 488 - return true; - } else { - boolean var4 = true; // L: 489 - if (!FloorDecoration.ItemDefinition_modelArchive.tryLoadFile(var2, 0)) { // L: 490 - var4 = false; - } - - if (var3 != -1 && !FloorDecoration.ItemDefinition_modelArchive.tryLoadFile(var3, 0)) { // L: 491 - var4 = false; - } - - return var4; // L: 492 - } - } - - @ObfuscatedName("e") - @ObfuscatedSignature( - descriptor = "(ZI)Lgk;", - garbageValue = "-1602050368" - ) - public final ModelData method2950(boolean var1) { - int var2 = this.maleHeadModel; // L: 496 - int var3 = this.maleHeadModel2; // L: 497 - if (var1) { // L: 498 - var2 = this.femaleHeadModel; // L: 499 - var3 = this.femaleHeadModel2; // L: 500 - } - - if (var2 == -1) { // L: 502 - return null; - } else { - ModelData var4 = ModelData.ModelData_get(FloorDecoration.ItemDefinition_modelArchive, var2, 0); // L: 503 - if (var3 != -1) { // L: 504 - ModelData var5 = ModelData.ModelData_get(FloorDecoration.ItemDefinition_modelArchive, var3, 0); // L: 505 - ModelData[] var6 = new ModelData[]{var4, var5}; // L: 506 - var4 = new ModelData(var6, 2); // L: 507 - } - - int var7; - if (this.recolorFrom != null) { // L: 509 - for (var7 = 0; var7 < this.recolorFrom.length; ++var7) { // L: 510 - var4.recolor(this.recolorFrom[var7], this.recolorTo[var7]); // L: 511 - } - } - - if (this.retextureFrom != null) { // L: 514 - for (var7 = 0; var7 < this.retextureFrom.length; ++var7) { // L: 515 - var4.retexture(this.retextureFrom[var7], this.retextureTo[var7]); // L: 516 - } - } - - return var4; // L: 519 + return var4; // L: 301 } } @ObfuscatedName("d") @ObfuscatedSignature( - descriptor = "(III)I", - garbageValue = "-1395652903" + descriptor = "(II)Lgr;", + garbageValue = "-1748661120" + ) + @Export("getModel") + public final Model getModel(int var1) { + if (this.countobj != null && var1 > 1) { // L: 305 + int var2 = -1; // L: 306 + + for (int var3 = 0; var3 < 10; ++var3) { // L: 307 + if (var1 >= this.countco[var3] && this.countco[var3] != 0) { // L: 308 + var2 = this.countobj[var3]; + } + } + + if (var2 != -1) { // L: 310 + return class260.ItemDefinition_get(var2).getModel(1); + } + } + + Model var5 = (Model)ItemDefinition_cachedModels.get((long)this.id); // L: 312 + if (var5 != null) { // L: 313 + return var5; + } else { + ModelData var6 = ModelData.ModelData_get(class311.ItemDefinition_modelArchive, this.model, 0); // L: 314 + if (var6 == null) { // L: 315 + return null; + } else { + if (this.resizeX != 128 || this.resizeY != 128 || this.resizeZ != 128) { // L: 316 + var6.resize(this.resizeX, this.resizeY, this.resizeZ); + } + + int var4; + if (this.recolorFrom != null) { // L: 317 + for (var4 = 0; var4 < this.recolorFrom.length; ++var4) { // L: 318 + var6.recolor(this.recolorFrom[var4], this.recolorTo[var4]); // L: 319 + } + } + + if (this.retextureFrom != null) { // L: 322 + for (var4 = 0; var4 < this.retextureFrom.length; ++var4) { // L: 323 + var6.retexture(this.retextureFrom[var4], this.retextureTo[var4]); // L: 324 + } + } + + var5 = var6.toModel(this.ambient + 64, this.contrast + 768, -50, -10, -50); // L: 327 + var5.isSingleTile = true; // L: 328 + ItemDefinition_cachedModels.put(var5, (long)this.id); // L: 329 + return var5; // L: 330 + } + } + } + + @ObfuscatedName("s") + @ObfuscatedSignature( + descriptor = "(IS)Leq;", + garbageValue = "312" + ) + @Export("getCountObj") + public ItemComposition getCountObj(int var1) { + if (this.countobj != null && var1 > 1) { // L: 334 + int var2 = -1; // L: 335 + + for (int var3 = 0; var3 < 10; ++var3) { // L: 336 + if (var1 >= this.countco[var3] && this.countco[var3] != 0) { + var2 = this.countobj[var3]; // L: 337 + } + } + + if (var2 != -1) { // L: 339 + return class260.ItemDefinition_get(var2); + } + } + + return this; // L: 341 + } + + @ObfuscatedName("l") + @ObfuscatedSignature( + descriptor = "(ZB)Z", + garbageValue = "-46" + ) + @Export("hasNoValidModel") + public final boolean hasNoValidModel(boolean var1) { + int var2 = this.maleModel; + int var3 = this.maleModel1; + int var4 = this.maleModel2; // L: 428 + if (var1) { + var2 = this.femaleModel; + var3 = this.femaleModel1; + var4 = this.femaleModel2; + } + + if (var2 == -1) { + return true; + } else { + boolean var5 = true; + if (!class311.ItemDefinition_modelArchive.tryLoadFile(var2, 0)) { + var5 = false; + } + + if (var3 != -1 && !class311.ItemDefinition_modelArchive.tryLoadFile(var3, 0)) { // L: 437 + var5 = false; + } + + if (var4 != -1 && !class311.ItemDefinition_modelArchive.tryLoadFile(var4, 0)) { + var5 = false; + } + + return var5; + } + } + + @ObfuscatedName("o") + @ObfuscatedSignature( + descriptor = "(ZI)Lgm;", + garbageValue = "-1178156518" + ) + public final ModelData method3018(boolean var1) { + int var2 = this.maleModel; // L: 443 + int var3 = this.maleModel1; + int var4 = this.maleModel2; + if (var1) { // L: 446 + var2 = this.femaleModel; + var3 = this.femaleModel1; // L: 448 + var4 = this.femaleModel2; + } + + if (var2 == -1) { + return null; + } else { + ModelData var5 = ModelData.ModelData_get(class311.ItemDefinition_modelArchive, var2, 0); + if (var3 != -1) { + ModelData var6 = ModelData.ModelData_get(class311.ItemDefinition_modelArchive, var3, 0); + if (var4 != -1) { + ModelData var7 = ModelData.ModelData_get(class311.ItemDefinition_modelArchive, var4, 0); // L: 456 + ModelData[] var8 = new ModelData[]{var5, var6, var7}; + var5 = new ModelData(var8, 3); + } else { + ModelData[] var10 = new ModelData[]{var5, var6}; + var5 = new ModelData(var10, 2); + } + } + + if (!var1 && this.maleOffset != 0) { // L: 465 + var5.changeOffset(0, this.maleOffset, 0); + } + + if (var1 && this.femaleOffset != 0) { + var5.changeOffset(0, this.femaleOffset, 0); + } + + int var9; + if (this.recolorFrom != null) { + for (var9 = 0; var9 < this.recolorFrom.length; ++var9) { + var5.recolor(this.recolorFrom[var9], this.recolorTo[var9]); // L: 469 + } + } + + if (this.retextureFrom != null) { + for (var9 = 0; var9 < this.retextureFrom.length; ++var9) { // L: 473 + var5.retexture(this.retextureFrom[var9], this.retextureTo[var9]); + } + } + + return var5; // L: 477 + } + } + + @ObfuscatedName("c") + @ObfuscatedSignature( + descriptor = "(ZI)Z", + garbageValue = "673638768" + ) + public final boolean method3019(boolean var1) { + int var2 = this.maleHeadModel; + int var3 = this.maleHeadModel2; + if (var1) { // L: 483 + var2 = this.femaleHeadModel; + var3 = this.femaleHeadModel2; + } + + if (var2 == -1) { // L: 487 + return true; + } else { + boolean var4 = true; + if (!class311.ItemDefinition_modelArchive.tryLoadFile(var2, 0)) { + var4 = false; + } + + if (var3 != -1 && !class311.ItemDefinition_modelArchive.tryLoadFile(var3, 0)) { + var4 = false; + } + + return var4; // L: 491 + } + } + + @ObfuscatedName("e") + @ObfuscatedSignature( + descriptor = "(ZB)Lgm;", + garbageValue = "10" + ) + public final ModelData method3020(boolean var1) { + int var2 = this.maleHeadModel; // L: 495 + int var3 = this.maleHeadModel2; + if (var1) { + var2 = this.femaleHeadModel; + var3 = this.femaleHeadModel2; + } + + if (var2 == -1) { + return null; + } else { + ModelData var4 = ModelData.ModelData_get(class311.ItemDefinition_modelArchive, var2, 0); + if (var3 != -1) { + ModelData var5 = ModelData.ModelData_get(class311.ItemDefinition_modelArchive, var3, 0); // L: 504 + ModelData[] var6 = new ModelData[]{var4, var5}; + var4 = new ModelData(var6, 2); + } + + int var7; + if (this.recolorFrom != null) { // L: 508 + for (var7 = 0; var7 < this.recolorFrom.length; ++var7) { + var4.recolor(this.recolorFrom[var7], this.recolorTo[var7]); + } + } + + if (this.retextureFrom != null) { // L: 513 + for (var7 = 0; var7 < this.retextureFrom.length; ++var7) { // L: 514 + var4.retexture(this.retextureFrom[var7], this.retextureTo[var7]); + } + } + + return var4; + } + } + + @ObfuscatedName("g") + @ObfuscatedSignature( + descriptor = "(IIB)I", + garbageValue = "117" ) @Export("getIntParam") public int getIntParam(int var1, int var2) { - return GraphicsObject.method1937(this.params, var1, var2); // L: 523 + return SecureRandomFuture.method1977(this.params, var1, var2); } - @ObfuscatedName("u") + @ObfuscatedName("a") @ObfuscatedSignature( - descriptor = "(ILjava/lang/String;I)Ljava/lang/String;", - garbageValue = "-18910024" + descriptor = "(ILjava/lang/String;S)Ljava/lang/String;", + garbageValue = "239" ) @Export("getStringParam") public String getStringParam(int var1, String var2) { - return Varcs.method2326(this.params, var1, var2); // L: 527 + return FriendsList.method5650(this.params, var1, var2); } - @ObfuscatedName("m") + @ObfuscatedName("k") @ObfuscatedSignature( - descriptor = "(B)I", - garbageValue = "48" + descriptor = "(I)I", + garbageValue = "1596135449" ) @Export("getShiftClickIndex") public int getShiftClickIndex() { - if (this.shiftClickIndex != -1 && this.inventoryActions != null) { // L: 531 - if (this.shiftClickIndex >= 0) { // L: 532 - return this.inventoryActions[this.shiftClickIndex] != null ? this.shiftClickIndex * -1732761633 * 1461867551 : -1; + if (this.shiftClickIndex != -1 && this.inventoryActions != null) { + if (this.shiftClickIndex >= 0) { + return this.inventoryActions[this.shiftClickIndex] != null ? this.shiftClickIndex * -1244064173 * 1541643739 : -1; } else { - return "Drop".equalsIgnoreCase(this.inventoryActions[4]) ? 4 : -1; // L: 533 + return "Drop".equalsIgnoreCase(this.inventoryActions[4]) ? 4 : -1; } } else { return -1; } } - @ObfuscatedName("s") + @ObfuscatedName("w") @ObfuscatedSignature( - descriptor = "(B)Z", - garbageValue = "71" + descriptor = "(S)Z", + garbageValue = "-14386" ) - boolean method2964() { - return this.recolorTo != null; // L: 552 + boolean method3024() { + return this.recolorTo != null; } + @ObfuscatedName("t") + @ObfuscatedSignature( + descriptor = "(I)Z", + garbageValue = "604113686" + ) + boolean method3025() { + return this.retextureTo != null; + } + + @ObfuscatedName("v") + @ObfuscatedSignature( + descriptor = "(I)I", + garbageValue = "-378975040" + ) + public static int method3084() { + return ViewportMouse.ViewportMouse_entityCount; // L: 44 + } + + @ObfuscatedName("f") + @ObfuscatedSignature( + descriptor = "(Ljv;III)[Loh;", + garbageValue = "-1264314377" + ) + public static SpritePixels[] method3087(AbstractArchive var0, int var1, int var2) { + return !class339.method6015(var0, var1, var2) ? null : class142.method2739(); // L: 47 48 + } + + @ObfuscatedName("f") + @ObfuscatedSignature( + descriptor = "(IIIII)V", + garbageValue = "-919320059" + ) + static final void method3085(int var0, int var1, int var2, int var3) { + for (int var4 = var1; var4 <= var3 + var1; ++var4) { // L: 79 + for (int var5 = var0; var5 <= var0 + var2; ++var5) { // L: 80 + if (var5 >= 0 && var5 < 104 && var4 >= 0 && var4 < 104) { // L: 81 + class372.field4123[0][var5][var4] = 127; // L: 82 + if (var0 == var5 && var5 > 0) { // L: 83 + Tiles.Tiles_heights[0][var5][var4] = Tiles.Tiles_heights[0][var5 - 1][var4]; + } + + if (var0 + var2 == var5 && var5 < 103) { + Tiles.Tiles_heights[0][var5][var4] = Tiles.Tiles_heights[0][var5 + 1][var4]; // L: 84 + } + + if (var4 == var1 && var4 > 0) { // L: 85 + Tiles.Tiles_heights[0][var5][var4] = Tiles.Tiles_heights[0][var5][var4 - 1]; + } + + if (var4 == var3 + var1 && var4 < 103) { // L: 86 + Tiles.Tiles_heights[0][var5][var4] = Tiles.Tiles_heights[0][var5][var4 + 1]; + } + } + } + } + + } // L: 90 + @ObfuscatedName("y") @ObfuscatedSignature( - descriptor = "(B)Z", - garbageValue = "102" + descriptor = "(Lnb;IB)V", + garbageValue = "100" ) - boolean method2965() { - return this.retextureTo != null; // L: 556 - } + @Export("readPlayerUpdate") + static void readPlayerUpdate(PacketBuffer var0, int var1) { + boolean var2 = var0.readBits(1) == 1; // L: 392 + if (var2) { // L: 393 + Players.Players_pendingUpdateIndices[++Players.Players_pendingUpdateCount - 1] = var1; + } - @ObfuscatedName("h") - @ObfuscatedSignature( - descriptor = "(II)Lci;", - garbageValue = "2018073249" - ) - @Export("getScript") - static Script getScript(int var0) { - Script var1 = (Script)Script.Script_cached.get((long)var0); // L: 26 - if (var1 != null) { // L: 27 - return var1; - } else { - byte[] var2 = class22.archive12.takeFile(var0, 0); // L: 28 - if (var2 == null) { // L: 29 - return null; // L: 30 + int var3 = var0.readBits(2); // L: 394 + Player var4 = Client.players[var1]; // L: 395 + if (var3 == 0) { // L: 396 + if (var2) { // L: 397 + var4.field1218 = false; // L: 398 + } else if (Client.localPlayerIndex == var1) { // L: 401 + throw new RuntimeException(); } else { - var1 = class25.newScript(var2); // L: 32 - Script.Script_cached.put(var1, (long)var0); // L: 33 - return var1; // L: 34 - } - } - } - - @ObfuscatedName("gb") - @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "-509097744" - ) - static final void method3006() { - int var0 = Players.Players_count; // L: 4019 - int[] var1 = Players.Players_indices; // L: 4020 - - for (int var2 = 0; var2 < var0; ++var2) { // L: 4021 - Player var3 = Client.players[var1[var2]]; // L: 4022 - if (var3 != null) { // L: 4023 - class35.updateActorSequence(var3, 1); // L: 4024 - } - } - - } // L: 4027 - - @ObfuscatedName("hx") - @ObfuscatedSignature( - descriptor = "(IIIIII)V", - garbageValue = "-2102409671" - ) - @Export("drawObject") - static final void drawObject(int var0, int var1, int var2, int var3, int var4) { - long var5 = class5.scene.getBoundaryObjectTag(var0, var1, var2); // L: 5706 - int var7; - int var8; - int var9; - int var10; - int var13; - int var14; - if (var5 != 0L) { // L: 5707 - var7 = class5.scene.getObjectFlags(var0, var1, var2, var5); // L: 5708 - var8 = var7 >> 6 & 3; // L: 5709 - var9 = var7 & 31; // L: 5710 - var10 = var3; // L: 5711 - boolean var11 = 0L != var5 && !WorldMapEvent.method3714(var5); // L: 5714 - if (var11) { // L: 5716 - var10 = var4; - } - - int[] var12 = UserComparator8.sceneMinimapSprite.pixels; // L: 5717 - var13 = var1 * 4 + (103 - var2) * 2048 + 24624; // L: 5718 - var14 = class6.Entity_unpackID(var5); // L: 5719 - ObjectComposition var15 = AttackOption.getObjectDefinition(var14); // L: 5720 - if (var15.mapSceneId != -1) { // L: 5721 - IndexedSprite var16 = class23.mapSceneSprites[var15.mapSceneId]; // L: 5722 - if (var16 != null) { // L: 5723 - int var17 = (var15.sizeX * 4 - var16.subWidth) / 2; // L: 5724 - int var18 = (var15.sizeY * 4 - var16.subHeight) / 2; // L: 5725 - var16.drawAt(var17 + var1 * 4 + 48, (104 - var2 - var15.sizeY) * 4 + var18 + 48); // L: 5726 - } - } else { - if (var9 == 0 || var9 == 2) { // L: 5730 - if (var8 == 0) { // L: 5731 - var12[var13] = var10; // L: 5732 - var12[var13 + 512] = var10; // L: 5733 - var12[var13 + 1024] = var10; // L: 5734 - var12[var13 + 1536] = var10; // L: 5735 - } else if (var8 == 1) { // L: 5737 - var12[var13] = var10; // L: 5738 - var12[var13 + 1] = var10; // L: 5739 - var12[var13 + 2] = var10; // L: 5740 - var12[var13 + 3] = var10; // L: 5741 - } else if (var8 == 2) { // L: 5743 - var12[var13 + 3] = var10; // L: 5744 - var12[var13 + 512 + 3] = var10; // L: 5745 - var12[var13 + 1024 + 3] = var10; // L: 5746 - var12[var13 + 1536 + 3] = var10; // L: 5747 - } else if (var8 == 3) { // L: 5749 - var12[var13 + 1536] = var10; // L: 5750 - var12[var13 + 1536 + 1] = var10; // L: 5751 - var12[var13 + 1536 + 2] = var10; // L: 5752 - var12[var13 + 1536 + 3] = var10; // L: 5753 - } - } - - if (var9 == 3) { // L: 5756 - if (var8 == 0) { // L: 5757 - var12[var13] = var10; - } else if (var8 == 1) { // L: 5758 - var12[var13 + 3] = var10; - } else if (var8 == 2) { // L: 5759 - var12[var13 + 1536 + 3] = var10; - } else if (var8 == 3) { // L: 5760 - var12[var13 + 1536] = var10; - } - } - - if (var9 == 2) { // L: 5762 - if (var8 == 3) { // L: 5763 - var12[var13] = var10; // L: 5764 - var12[var13 + 512] = var10; // L: 5765 - var12[var13 + 1024] = var10; // L: 5766 - var12[var13 + 1536] = var10; // L: 5767 - } else if (var8 == 0) { // L: 5769 - var12[var13] = var10; // L: 5770 - var12[var13 + 1] = var10; // L: 5771 - var12[var13 + 2] = var10; // L: 5772 - var12[var13 + 3] = var10; // L: 5773 - } else if (var8 == 1) { // L: 5775 - var12[var13 + 3] = var10; // L: 5776 - var12[var13 + 512 + 3] = var10; // L: 5777 - var12[var13 + 1024 + 3] = var10; // L: 5778 - var12[var13 + 1536 + 3] = var10; // L: 5779 - } else if (var8 == 2) { // L: 5781 - var12[var13 + 1536] = var10; // L: 5782 - var12[var13 + 1536 + 1] = var10; // L: 5783 - var12[var13 + 1536 + 2] = var10; // L: 5784 - var12[var13 + 1536 + 3] = var10; // L: 5785 - } - } - } - } - - var5 = class5.scene.getGameObjectTag(var0, var1, var2); // L: 5790 - if (0L != var5) { // L: 5791 - var7 = class5.scene.getObjectFlags(var0, var1, var2, var5); // L: 5792 - var8 = var7 >> 6 & 3; // L: 5793 - var9 = var7 & 31; // L: 5794 - var10 = class6.Entity_unpackID(var5); // L: 5795 - ObjectComposition var19 = AttackOption.getObjectDefinition(var10); // L: 5796 - if (var19.mapSceneId != -1) { // L: 5797 - IndexedSprite var26 = class23.mapSceneSprites[var19.mapSceneId]; // L: 5798 - if (var26 != null) { // L: 5799 - var13 = (var19.sizeX * 4 - var26.subWidth) / 2; // L: 5800 - var14 = (var19.sizeY * 4 - var26.subHeight) / 2; // L: 5801 - var26.drawAt(var1 * 4 + var13 + 48, var14 + (104 - var2 - var19.sizeY) * 4 + 48); // L: 5802 - } - } else if (var9 == 9) { // L: 5805 - int var20 = 15658734; // L: 5806 - boolean var27 = 0L != var5 && !WorldMapEvent.method3714(var5); // L: 5809 - if (var27) { // L: 5811 - var20 = 15597568; - } - - int[] var21 = UserComparator8.sceneMinimapSprite.pixels; // L: 5812 - int var22 = var1 * 4 + (103 - var2) * 2048 + 24624; // L: 5813 - if (var8 != 0 && var8 != 2) { // L: 5814 - var21[var22] = var20; // L: 5821 - var21[var22 + 1 + 512] = var20; // L: 5822 - var21[var22 + 1024 + 2] = var20; // L: 5823 - var21[var22 + 1536 + 3] = var20; // L: 5824 + Players.Players_regions[var1] = (var4.plane << 28) + (VertexNormal.baseX + var4.pathX[0] >> 13 << 14) + (SoundSystem.baseY + var4.pathY[0] >> 13); // L: 402 + if (var4.field1264 != -1) { // L: 403 + Players.Players_orientations[var1] = var4.field1264; } else { - var21[var22 + 1536] = var20; // L: 5815 - var21[var22 + 1 + 1024] = var20; // L: 5816 - var21[var22 + 512 + 2] = var20; // L: 5817 - var21[var22 + 3] = var20; // L: 5818 + Players.Players_orientations[var1] = var4.orientation; // L: 404 + } + + Players.Players_targetIndices[var1] = var4.targetIndex; // L: 405 + Client.players[var1] = null; // L: 406 + if (var0.readBits(1) != 0) { // L: 407 + ParamComposition.updateExternalPlayer(var0, var1); + } + + } + } else { + int var5; + int var6; + int var7; + if (var3 == 1) { // L: 410 + var5 = var0.readBits(3); // L: 411 + var6 = var4.pathX[0]; // L: 412 + var7 = var4.pathY[0]; // L: 413 + if (var5 == 0) { // L: 414 + --var6; // L: 415 + --var7; // L: 416 + } else if (var5 == 1) { // L: 418 + --var7; + } else if (var5 == 2) { // L: 419 + ++var6; // L: 420 + --var7; // L: 421 + } else if (var5 == 3) { // L: 423 + --var6; + } else if (var5 == 4) { // L: 424 + ++var6; + } else if (var5 == 5) { // L: 425 + --var6; // L: 426 + ++var7; // L: 427 + } else if (var5 == 6) { // L: 429 + ++var7; + } else if (var5 == 7) { // L: 430 + ++var6; // L: 431 + ++var7; // L: 432 + } + + if (Client.localPlayerIndex == var1 && (var4.x < 1536 || var4.y < 1536 || var4.x >= 11776 || var4.y >= 11776)) { // L: 434 + var4.resetPath(var6, var7); // L: 435 + var4.field1218 = false; // L: 436 + } else if (var2) { // L: 438 + var4.field1218 = true; // L: 439 + var4.tileX = var6; // L: 440 + var4.tileY = var7; // L: 441 + } else { + var4.field1218 = false; // L: 444 + var4.method2129(var6, var7, Players.field1373[var1]); // L: 445 + } + + } else if (var3 == 2) { // L: 449 + var5 = var0.readBits(4); // L: 450 + var6 = var4.pathX[0]; // L: 451 + var7 = var4.pathY[0]; // L: 452 + if (var5 == 0) { // L: 453 + var6 -= 2; // L: 454 + var7 -= 2; // L: 455 + } else if (var5 == 1) { // L: 457 + --var6; // L: 458 + var7 -= 2; // L: 459 + } else if (var5 == 2) { // L: 461 + var7 -= 2; + } else if (var5 == 3) { // L: 462 + ++var6; // L: 463 + var7 -= 2; // L: 464 + } else if (var5 == 4) { // L: 466 + var6 += 2; // L: 467 + var7 -= 2; // L: 468 + } else if (var5 == 5) { // L: 470 + var6 -= 2; // L: 471 + --var7; // L: 472 + } else if (var5 == 6) { // L: 474 + var6 += 2; // L: 475 + --var7; // L: 476 + } else if (var5 == 7) { // L: 478 + var6 -= 2; + } else if (var5 == 8) { // L: 479 + var6 += 2; + } else if (var5 == 9) { // L: 480 + var6 -= 2; // L: 481 + ++var7; // L: 482 + } else if (var5 == 10) { // L: 484 + var6 += 2; // L: 485 + ++var7; // L: 486 + } else if (var5 == 11) { // L: 488 + var6 -= 2; // L: 489 + var7 += 2; // L: 490 + } else if (var5 == 12) { // L: 492 + --var6; // L: 493 + var7 += 2; // L: 494 + } else if (var5 == 13) { // L: 496 + var7 += 2; + } else if (var5 == 14) { // L: 497 + ++var6; // L: 498 + var7 += 2; // L: 499 + } else if (var5 == 15) { // L: 501 + var6 += 2; // L: 502 + var7 += 2; // L: 503 + } + + if (Client.localPlayerIndex != var1 || var4.x >= 1536 && var4.y >= 1536 && var4.x < 11776 && var4.y < 11776) { // L: 505 + if (var2) { // L: 509 + var4.field1218 = true; // L: 510 + var4.tileX = var6; // L: 511 + var4.tileY = var7; // L: 512 + } else { + var4.field1218 = false; // L: 515 + var4.method2129(var6, var7, Players.field1373[var1]); // L: 516 + } + } else { + var4.resetPath(var6, var7); // L: 506 + var4.field1218 = false; // L: 507 + } + + } else { + var5 = var0.readBits(1); // L: 520 + int var8; + int var9; + int var10; + int var11; + if (var5 == 0) { // L: 521 + var6 = var0.readBits(12); // L: 522 + var7 = var6 >> 10; // L: 523 + var8 = var6 >> 5 & 31; // L: 524 + if (var8 > 15) { // L: 525 + var8 -= 32; + } + + var9 = var6 & 31; // L: 526 + if (var9 > 15) { // L: 527 + var9 -= 32; + } + + var10 = var8 + var4.pathX[0]; // L: 528 + var11 = var9 + var4.pathY[0]; // L: 529 + if (Client.localPlayerIndex == var1 && (var4.x < 1536 || var4.y < 1536 || var4.x >= 11776 || var4.y >= 11776)) { // L: 530 + var4.resetPath(var10, var11); // L: 531 + var4.field1218 = false; // L: 532 + } else if (var2) { // L: 534 + var4.field1218 = true; // L: 535 + var4.tileX = var10; // L: 536 + var4.tileY = var11; // L: 537 + } else { + var4.field1218 = false; // L: 540 + var4.method2129(var10, var11, Players.field1373[var1]); // L: 541 + } + + var4.plane = (byte)(var7 + var4.plane & 3); // L: 543 + if (Client.localPlayerIndex == var1) { // L: 544 + class22.Client_plane = var4.plane; + } + + } else { + var6 = var0.readBits(30); // L: 547 + var7 = var6 >> 28; // L: 548 + var8 = var6 >> 14 & 16383; // L: 549 + var9 = var6 & 16383; // L: 550 + var10 = (var8 + VertexNormal.baseX + var4.pathX[0] & 16383) - VertexNormal.baseX; // L: 551 + var11 = (var9 + SoundSystem.baseY + var4.pathY[0] & 16383) - SoundSystem.baseY; // L: 552 + if (Client.localPlayerIndex == var1 && (var4.x < 1536 || var4.y < 1536 || var4.x >= 11776 || var4.y >= 11776)) { // L: 553 + var4.resetPath(var10, var11); // L: 554 + var4.field1218 = false; // L: 555 + } else if (var2) { // L: 557 + var4.field1218 = true; // L: 558 + var4.tileX = var10; // L: 559 + var4.tileY = var11; // L: 560 + } else { + var4.field1218 = false; // L: 563 + var4.method2129(var10, var11, Players.field1373[var1]); // L: 564 + } + + var4.plane = (byte)(var7 + var4.plane & 3); // L: 566 + if (Client.localPlayerIndex == var1) { // L: 567 + class22.Client_plane = var4.plane; + } + } } } - - var5 = class5.scene.getFloorDecorationTag(var0, var1, var2); // L: 5828 - if (var5 != 0L) { // L: 5829 - var7 = class6.Entity_unpackID(var5); // L: 5830 - ObjectComposition var23 = AttackOption.getObjectDefinition(var7); // L: 5831 - if (var23.mapSceneId != -1) { // L: 5832 - IndexedSprite var24 = class23.mapSceneSprites[var23.mapSceneId]; // L: 5833 - if (var24 != null) { // L: 5834 - var10 = (var23.sizeX * 4 - var24.subWidth) / 2; // L: 5835 - int var25 = (var23.sizeY * 4 - var24.subHeight) / 2; // L: 5836 - var24.drawAt(var1 * 4 + var10 + 48, var25 + (104 - var2 - var23.sizeY) * 4 + 48); // L: 5837 - } - } - } - - } // L: 5841 + } // L: 399 408 447 518 545 568 } diff --git a/runescape-client/src/main/java/ItemContainer.java b/runescape-client/src/main/java/ItemContainer.java index a8a4cf28d5..a14892d516 100644 --- a/runescape-client/src/main/java/ItemContainer.java +++ b/runescape-client/src/main/java/ItemContainer.java @@ -3,25 +3,22 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("co") +@ObfuscatedName("cj") @Implements("ItemContainer") public class ItemContainer extends Node { - @ObfuscatedName("h") + @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "Lmt;" + descriptor = "Lmd;" ) @Export("itemContainers") static NodeHashTable itemContainers; - @ObfuscatedName("l") - @ObfuscatedSignature( - descriptor = "Lof;" - ) - @Export("titleboxSprite") - static IndexedSprite titleboxSprite; - @ObfuscatedName("c") + @ObfuscatedName("b") + @Export("ItemDefinition_inMembersWorld") + public static boolean ItemDefinition_inMembersWorld; + @ObfuscatedName("n") @Export("ids") int[] ids; - @ObfuscatedName("o") + @ObfuscatedName("f") @Export("quantities") int[] quantities; @@ -33,28 +30,4 @@ public class ItemContainer extends Node { this.ids = new int[]{-1}; // L: 8 this.quantities = new int[]{0}; // L: 9 } // L: 11 - - @ObfuscatedName("c") - @ObfuscatedSignature( - descriptor = "(IB)I", - garbageValue = "1" - ) - public static int method2104(int var0) { - var0 = (var0 & 1431655765) + (var0 >>> 1 & 1431655765); // L: 28 - var0 = (var0 >>> 2 & 858993459) + (var0 & 858993459); // L: 29 - var0 = var0 + (var0 >>> 4) & 252645135; // L: 30 - var0 += var0 >>> 8; // L: 31 - var0 += var0 >>> 16; // L: 32 - return var0 & 255; // L: 33 - } - - @ObfuscatedName("kf") - @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "-246752714" - ) - static final void method2108() { - Client.field698 = Client.cycleCntr; // L: 11517 - FloorOverlayDefinition.ClanChat_inClanChat = true; // L: 11518 - } // L: 11519 } diff --git a/runescape-client/src/main/java/ItemLayer.java b/runescape-client/src/main/java/ItemLayer.java index ecdafd84c4..e4ea96006f 100644 --- a/runescape-client/src/main/java/ItemLayer.java +++ b/runescape-client/src/main/java/ItemLayer.java @@ -4,54 +4,54 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("gf") +@ObfuscatedName("gv") @Implements("ItemLayer") public final class ItemLayer { - @ObfuscatedName("h") + @ObfuscatedName("v") @ObfuscatedGetter( - intValue = 1420989371 + intValue = 1950267115 ) @Export("tileHeight") int tileHeight; - @ObfuscatedName("c") + @ObfuscatedName("n") @ObfuscatedGetter( - intValue = -488248925 + intValue = -840082071 ) @Export("x") int x; - @ObfuscatedName("o") + @ObfuscatedName("f") @ObfuscatedGetter( - intValue = -984495605 + intValue = -1958043433 ) @Export("y") int y; - @ObfuscatedName("g") + @ObfuscatedName("y") @ObfuscatedSignature( - descriptor = "Lge;" + descriptor = "Lgl;" ) @Export("first") Renderable first; - @ObfuscatedName("l") + @ObfuscatedName("p") @ObfuscatedSignature( - descriptor = "Lge;" + descriptor = "Lgl;" ) @Export("second") Renderable second; - @ObfuscatedName("z") + @ObfuscatedName("j") @ObfuscatedSignature( - descriptor = "Lge;" + descriptor = "Lgl;" ) @Export("third") Renderable third; - @ObfuscatedName("t") + @ObfuscatedName("r") @ObfuscatedGetter( - longValue = -8281197282247893905L + longValue = 8707211480451132889L ) @Export("tag") long tag; - @ObfuscatedName("v") + @ObfuscatedName("b") @ObfuscatedGetter( - intValue = -415134249 + intValue = 1688818251 ) @Export("height") int height; @@ -59,14 +59,101 @@ public final class ItemLayer { ItemLayer() { } // L: 13 - @ObfuscatedName("kj") + @ObfuscatedName("y") @ObfuscatedSignature( - descriptor = "(IIB)V", - garbageValue = "-22" + descriptor = "([BI)V", + garbageValue = "-830600929" ) - static void method3715(int var0, int var1) { - MenuAction var2 = class9.tempMenuAction; // L: 11069 - HorizontalAlignment.menuAction(var2.param0, var2.param1, var2.opcode, var2.identifier, var2.action, var2.action, var0, var1); // L: 11071 - class9.tempMenuAction = null; // L: 11073 - } // L: 11074 + @Export("ByteArrayPool_release") + public static synchronized void ByteArrayPool_release(byte[] var0) { + if (var0.length == 100 && ByteArrayPool.ByteArrayPool_smallCount < 1000) { // L: 76 + ByteArrayPool.ByteArrayPool_small[++ByteArrayPool.ByteArrayPool_smallCount - 1] = var0; // L: 77 + } else if (var0.length == 5000 && ByteArrayPool.ByteArrayPool_mediumCount < 250) { // L: 80 + ByteArrayPool.ByteArrayPool_medium[++ByteArrayPool.ByteArrayPool_mediumCount - 1] = var0; // L: 81 + } else if (var0.length == 30000 && ByteArrayPool.ByteArrayPool_largeCount < 50) { // L: 84 + ByteArrayPool.ByteArrayPool_large[++ByteArrayPool.ByteArrayPool_largeCount - 1] = var0; // L: 85 + } else { + if (class20.ByteArrayPool_arrays != null) { // L: 88 + for (int var1 = 0; var1 < ByteArrayPool.ByteArrayPool_alternativeSizes.length; ++var1) { // L: 89 + if (var0.length == ByteArrayPool.ByteArrayPool_alternativeSizes[var1] && ByteArrayPool.ByteArrayPool_altSizeArrayCounts[var1] < class20.ByteArrayPool_arrays[var1].length) { // L: 90 + class20.ByteArrayPool_arrays[var1][ByteArrayPool.ByteArrayPool_altSizeArrayCounts[var1]++] = var0; // L: 91 + return; // L: 92 + } + } + } + + } + } // L: 78 82 86 96 + + @ObfuscatedName("c") + @ObfuscatedSignature( + descriptor = "([BB)V", + garbageValue = "1" + ) + @Export("SpriteBuffer_decode") + public static void SpriteBuffer_decode(byte[] var0) { + Buffer var1 = new Buffer(var0); // L: 196 + var1.offset = var0.length - 2; // L: 197 + class396.SpriteBuffer_spriteCount = var1.readUnsignedShort(); // L: 198 + WorldMapDecoration.SpriteBuffer_xOffsets = new int[class396.SpriteBuffer_spriteCount]; // L: 199 + Calendar.SpriteBuffer_yOffsets = new int[class396.SpriteBuffer_spriteCount]; // L: 200 + class396.SpriteBuffer_spriteWidths = new int[class396.SpriteBuffer_spriteCount]; // L: 201 + class302.SpriteBuffer_spriteHeights = new int[class396.SpriteBuffer_spriteCount]; // L: 202 + class396.SpriteBuffer_pixels = new byte[class396.SpriteBuffer_spriteCount][]; // L: 203 + var1.offset = var0.length - 7 - class396.SpriteBuffer_spriteCount * 8; // L: 204 + class396.SpriteBuffer_spriteWidth = var1.readUnsignedShort(); // L: 205 + UserComparator2.SpriteBuffer_spriteHeight = var1.readUnsignedShort(); // L: 206 + int var2 = (var1.readUnsignedByte() & 255) + 1; // L: 207 + + int var3; + for (var3 = 0; var3 < class396.SpriteBuffer_spriteCount; ++var3) { // L: 208 + WorldMapDecoration.SpriteBuffer_xOffsets[var3] = var1.readUnsignedShort(); + } + + for (var3 = 0; var3 < class396.SpriteBuffer_spriteCount; ++var3) { // L: 209 + Calendar.SpriteBuffer_yOffsets[var3] = var1.readUnsignedShort(); + } + + for (var3 = 0; var3 < class396.SpriteBuffer_spriteCount; ++var3) { // L: 210 + class396.SpriteBuffer_spriteWidths[var3] = var1.readUnsignedShort(); + } + + for (var3 = 0; var3 < class396.SpriteBuffer_spriteCount; ++var3) { // L: 211 + class302.SpriteBuffer_spriteHeights[var3] = var1.readUnsignedShort(); + } + + var1.offset = var0.length - 7 - class396.SpriteBuffer_spriteCount * 8 - (var2 - 1) * 3; // L: 212 + MilliClock.SpriteBuffer_spritePalette = new int[var2]; // L: 213 + + for (var3 = 1; var3 < var2; ++var3) { // L: 214 + MilliClock.SpriteBuffer_spritePalette[var3] = var1.readMedium(); // L: 215 + if (MilliClock.SpriteBuffer_spritePalette[var3] == 0) { // L: 216 + MilliClock.SpriteBuffer_spritePalette[var3] = 1; + } + } + + var1.offset = 0; // L: 218 + + for (var3 = 0; var3 < class396.SpriteBuffer_spriteCount; ++var3) { // L: 219 + int var4 = class396.SpriteBuffer_spriteWidths[var3]; // L: 220 + int var5 = class302.SpriteBuffer_spriteHeights[var3]; // L: 221 + int var6 = var4 * var5; // L: 222 + byte[] var7 = new byte[var6]; // L: 223 + class396.SpriteBuffer_pixels[var3] = var7; // L: 224 + int var8 = var1.readUnsignedByte(); // L: 225 + int var9; + if (var8 == 0) { // L: 226 + for (var9 = 0; var9 < var6; ++var9) { // L: 227 + var7[var9] = var1.readByte(); + } + } else if (var8 == 1) { // L: 229 + for (var9 = 0; var9 < var4; ++var9) { // L: 230 + for (int var10 = 0; var10 < var5; ++var10) { // L: 231 + var7[var9 + var4 * var10] = var1.readByte(); // L: 232 + } + } + } + } + + } // L: 237 } diff --git a/runescape-client/src/main/java/IterableDualNodeQueue.java b/runescape-client/src/main/java/IterableDualNodeQueue.java index cbd1e6f13e..636c7a5659 100644 --- a/runescape-client/src/main/java/IterableDualNodeQueue.java +++ b/runescape-client/src/main/java/IterableDualNodeQueue.java @@ -4,16 +4,16 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("kd") +@ObfuscatedName("ko") @Implements("IterableDualNodeQueue") public class IterableDualNodeQueue implements Iterable { - @ObfuscatedName("h") + @ObfuscatedName("v") @ObfuscatedSignature( descriptor = "Lmf;" ) @Export("sentinel") public DualNode sentinel; - @ObfuscatedName("c") + @ObfuscatedName("n") @ObfuscatedSignature( descriptor = "Lmf;" ) @@ -26,7 +26,7 @@ public class IterableDualNodeQueue implements Iterable { this.sentinel.nextDual = this.sentinel; // L: 12 } // L: 13 - @ObfuscatedName("h") + @ObfuscatedName("v") @Export("clear") public void clear() { while (this.sentinel.previousDual != this.sentinel) { // L: 16 @@ -35,7 +35,7 @@ public class IterableDualNodeQueue implements Iterable { } // L: 19 - @ObfuscatedName("c") + @ObfuscatedName("n") @ObfuscatedSignature( descriptor = "(Lmf;)V" ) @@ -51,7 +51,7 @@ public class IterableDualNodeQueue implements Iterable { var1.previousDual.nextDual = var1; // L: 26 } // L: 27 - @ObfuscatedName("g") + @ObfuscatedName("y") @ObfuscatedSignature( descriptor = "()Lmf;" ) @@ -66,7 +66,7 @@ public class IterableDualNodeQueue implements Iterable { } } - @ObfuscatedName("l") + @ObfuscatedName("p") @ObfuscatedSignature( descriptor = "()Lmf;" ) @@ -75,7 +75,7 @@ public class IterableDualNodeQueue implements Iterable { return this.previousOrLast((DualNode)null); // L: 45 } - @ObfuscatedName("z") + @ObfuscatedName("j") @ObfuscatedSignature( descriptor = "(Lmf;)Lmf;" ) @@ -97,7 +97,7 @@ public class IterableDualNodeQueue implements Iterable { } } - @ObfuscatedName("t") + @ObfuscatedName("r") @ObfuscatedSignature( descriptor = "()Lmf;" ) @@ -117,7 +117,7 @@ public class IterableDualNodeQueue implements Iterable { return new IterableDualNodeQueueIterator(this); // L: 71 } - @ObfuscatedName("o") + @ObfuscatedName("f") @ObfuscatedSignature( descriptor = "(Lmf;Lmf;)V" ) diff --git a/runescape-client/src/main/java/IterableDualNodeQueueIterator.java b/runescape-client/src/main/java/IterableDualNodeQueueIterator.java index 1ca7e1f999..434be55036 100644 --- a/runescape-client/src/main/java/IterableDualNodeQueueIterator.java +++ b/runescape-client/src/main/java/IterableDualNodeQueueIterator.java @@ -4,22 +4,22 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("kp") +@ObfuscatedName("kg") @Implements("IterableDualNodeQueueIterator") public class IterableDualNodeQueueIterator implements Iterator { - @ObfuscatedName("h") + @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "Lkd;" + descriptor = "Lko;" ) @Export("queue") IterableDualNodeQueue queue; - @ObfuscatedName("c") + @ObfuscatedName("n") @ObfuscatedSignature( descriptor = "Lmf;" ) @Export("head") DualNode head; - @ObfuscatedName("o") + @ObfuscatedName("f") @ObfuscatedSignature( descriptor = "Lmf;" ) @@ -27,7 +27,7 @@ public class IterableDualNodeQueueIterator implements Iterator { DualNode last; @ObfuscatedSignature( - descriptor = "(Lkd;)V" + descriptor = "(Lko;)V" ) IterableDualNodeQueueIterator(IterableDualNodeQueue var1) { this.last = null; // L: 9 @@ -36,19 +36,6 @@ public class IterableDualNodeQueueIterator implements Iterator { this.last = null; // L: 14 } // L: 15 - public Object next() { - DualNode var1 = this.head; // L: 18 - if (var1 == this.queue.sentinel) { // L: 19 - var1 = null; // L: 20 - this.head = null; // L: 21 - } else { - this.head = var1.previousDual; // L: 23 - } - - this.last = var1; // L: 24 - return var1; // L: 25 - } - public void remove() { if (this.last == null) { // L: 33 throw new IllegalStateException(); @@ -61,4 +48,17 @@ public class IterableDualNodeQueueIterator implements Iterator { public boolean hasNext() { return this.queue.sentinel != this.head; // L: 29 } + + public Object next() { + DualNode var1 = this.head; // L: 18 + if (var1 == this.queue.sentinel) { // L: 19 + var1 = null; // L: 20 + this.head = null; // L: 21 + } else { + this.head = var1.previousDual; // L: 23 + } + + this.last = var1; // L: 24 + return var1; // L: 25 + } } diff --git a/runescape-client/src/main/java/IterableNodeDeque.java b/runescape-client/src/main/java/IterableNodeDeque.java index f9294dfe24..4fe2faeba1 100644 --- a/runescape-client/src/main/java/IterableNodeDeque.java +++ b/runescape-client/src/main/java/IterableNodeDeque.java @@ -5,20 +5,20 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ko") +@ObfuscatedName("ki") @Implements("IterableNodeDeque") public class IterableNodeDeque implements Iterable, Collection { - @ObfuscatedName("h") + @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "Lmd;" + descriptor = "Lmw;" ) @Export("sentinel") Node sentinel; - @ObfuscatedName("c") + @ObfuscatedName("n") @ObfuscatedSignature( - descriptor = "Lmd;" + descriptor = "Lmw;" ) - Node field3734; + Node field3709; public IterableNodeDeque() { this.sentinel = new Node(); // L: 7 @@ -26,7 +26,7 @@ public class IterableNodeDeque implements Iterable, Collection { this.sentinel.next = this.sentinel; // L: 12 } // L: 13 - @ObfuscatedName("h") + @ObfuscatedName("v") @Export("rsClear") public void rsClear() { while (this.sentinel.previous != this.sentinel) { // L: 16 @@ -35,9 +35,9 @@ public class IterableNodeDeque implements Iterable, Collection { } // L: 19 - @ObfuscatedName("c") + @ObfuscatedName("n") @ObfuscatedSignature( - descriptor = "(Lmd;)V" + descriptor = "(Lmw;)V" ) @Export("addFirst") public void addFirst(Node var1) { @@ -51,9 +51,9 @@ public class IterableNodeDeque implements Iterable, Collection { var1.previous.next = var1; // L: 26 } // L: 27 - @ObfuscatedName("o") + @ObfuscatedName("f") @ObfuscatedSignature( - descriptor = "(Lmd;)V" + descriptor = "(Lmw;)V" ) @Export("addLast") public void addLast(Node var1) { @@ -67,20 +67,20 @@ public class IterableNodeDeque implements Iterable, Collection { var1.previous.next = var1; // L: 34 } // L: 35 - @ObfuscatedName("l") + @ObfuscatedName("p") @ObfuscatedSignature( - descriptor = "()Lmd;" + descriptor = "()Lmw;" ) @Export("last") public Node last() { - return this.method5146((Node)null); // L: 46 + return this.method5233((Node)null); // L: 46 } - @ObfuscatedName("z") + @ObfuscatedName("j") @ObfuscatedSignature( - descriptor = "(Lmd;)Lmd;" + descriptor = "(Lmw;)Lmw;" ) - Node method5146(Node var1) { + Node method5233(Node var1) { Node var2; if (var1 == null) { // L: 51 var2 = this.sentinel.previous; @@ -89,32 +89,32 @@ public class IterableNodeDeque implements Iterable, Collection { } if (var2 == this.sentinel) { // L: 53 - this.field3734 = null; // L: 54 + this.field3709 = null; // L: 54 return null; // L: 55 } else { - this.field3734 = var2.previous; // L: 57 + this.field3709 = var2.previous; // L: 57 return var2; // L: 58 } } - @ObfuscatedName("t") + @ObfuscatedName("r") @ObfuscatedSignature( - descriptor = "()Lmd;" + descriptor = "()Lmw;" ) @Export("previous") public Node previous() { - Node var1 = this.field3734; // L: 62 + Node var1 = this.field3709; // L: 62 if (var1 == this.sentinel) { // L: 63 - this.field3734 = null; // L: 64 + this.field3709 = null; // L: 64 return null; // L: 65 } else { - this.field3734 = var1.previous; // L: 67 + this.field3709 = var1.previous; // L: 67 return var1; // L: 68 } } - @ObfuscatedName("v") - int method5148() { + @ObfuscatedName("b") + int method5235() { int var1 = 0; // L: 72 for (Node var2 = this.sentinel.previous; var2 != this.sentinel; var2 = var2.previous) { // L: 73 74 76 @@ -124,17 +124,17 @@ public class IterableNodeDeque implements Iterable, Collection { return var1; // L: 78 } - @ObfuscatedName("b") - public boolean method5149() { + @ObfuscatedName("d") + public boolean method5236() { return this.sentinel.previous == this.sentinel; // L: 82 } - @ObfuscatedName("q") + @ObfuscatedName("s") @ObfuscatedSignature( - descriptor = "()[Lmd;" + descriptor = "()[Lmw;" ) - Node[] method5166() { - Node[] var1 = new Node[this.method5148()]; // L: 86 + Node[] method5240() { + Node[] var1 = new Node[this.method5235()]; // L: 86 int var2 = 0; // L: 87 for (Node var3 = this.sentinel.previous; var3 != this.sentinel; var3 = var3.previous) { // L: 88 89 91 @@ -144,29 +144,39 @@ public class IterableNodeDeque implements Iterable, Collection { return var1; // L: 93 } - @ObfuscatedName("i") + @ObfuscatedName("u") @ObfuscatedSignature( - descriptor = "(Lmd;)Z" + descriptor = "(Lmw;)Z" ) - boolean method5170(Node var1) { + boolean method5239(Node var1) { this.addFirst(var1); // L: 127 return true; // L: 128 } + public boolean removeAll(Collection var1) { + throw new RuntimeException(); // L: 144 + } + public Iterator iterator() { return new IterableNodeDequeDescendingIterator(this); // L: 97 } - public boolean add(Object var1) { - return this.method5170((Node)var1); // L: 156 - } - public boolean isEmpty() { - return this.method5149(); // L: 105 + return this.method5236(); // L: 105 } - public boolean contains(Object var1) { - throw new RuntimeException(); // L: 109 + public Object[] toArray() { + return this.method5240(); // L: 113 + } + + public Object[] toArray(Object[] var1) { + int var2 = 0; // L: 117 + + for (Node var3 = this.sentinel.previous; var3 != this.sentinel; var3 = var3.previous) { // L: 118 119 121 + var1[var2++] = var3; // L: 120 + } + + return var1; // L: 123 } public boolean remove(Object var1) { @@ -181,15 +191,9 @@ public class IterableNodeDeque implements Iterable, Collection { throw new RuntimeException(); // L: 148 } - public Object[] toArray(Object[] var1) { - int var2 = 0; // L: 117 - - for (Node var3 = this.sentinel.previous; var3 != this.sentinel; var3 = var3.previous) { // L: 118 119 121 - var1[var2++] = var3; // L: 120 - } - - return var1; // L: 123 - } + public void clear() { + this.rsClear(); // L: 152 + } // L: 153 public boolean equals(Object var1) { return super.equals(var1); // L: 160 @@ -199,29 +203,25 @@ public class IterableNodeDeque implements Iterable, Collection { return super.hashCode(); // L: 164 } - public Object[] toArray() { - return this.method5166(); // L: 113 + public boolean add(Object var1) { + return this.method5239((Node)var1); // L: 156 + } + + public int size() { + return this.method5235(); // L: 101 + } + + public boolean contains(Object var1) { + throw new RuntimeException(); // L: 109 } public boolean addAll(Collection var1) { throw new RuntimeException(); // L: 140 } - public boolean removeAll(Collection var1) { - throw new RuntimeException(); // L: 144 - } - - public int size() { - return this.method5148(); // L: 101 - } - - public void clear() { - this.rsClear(); // L: 152 - } // L: 153 - - @ObfuscatedName("g") + @ObfuscatedName("y") @ObfuscatedSignature( - descriptor = "(Lmd;Lmd;)V" + descriptor = "(Lmw;Lmw;)V" ) @Export("IterableNodeDeque_addBefore") public static void IterableNodeDeque_addBefore(Node var0, Node var1) { diff --git a/runescape-client/src/main/java/IterableNodeDequeDescendingIterator.java b/runescape-client/src/main/java/IterableNodeDequeDescendingIterator.java index 2e73fd3e7f..fb51c7328f 100644 --- a/runescape-client/src/main/java/IterableNodeDequeDescendingIterator.java +++ b/runescape-client/src/main/java/IterableNodeDequeDescendingIterator.java @@ -4,38 +4,38 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ku") +@ObfuscatedName("kq") @Implements("IterableNodeDequeDescendingIterator") public class IterableNodeDequeDescendingIterator implements Iterator { - @ObfuscatedName("h") + @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "Lko;" + descriptor = "Lki;" ) @Export("deque") IterableNodeDeque deque; - @ObfuscatedName("c") + @ObfuscatedName("n") @ObfuscatedSignature( - descriptor = "Lmd;" + descriptor = "Lmw;" ) - Node field3730; - @ObfuscatedName("o") + Node field3706; + @ObfuscatedName("f") @ObfuscatedSignature( - descriptor = "Lmd;" + descriptor = "Lmw;" ) @Export("last") Node last; @ObfuscatedSignature( - descriptor = "(Lko;)V" + descriptor = "(Lki;)V" ) IterableNodeDequeDescendingIterator(IterableNodeDeque var1) { this.last = null; // L: 9 this.setDeque(var1); // L: 12 } // L: 13 - @ObfuscatedName("h") + @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "(Lko;)V" + descriptor = "(Lki;)V" ) @Export("setDeque") void setDeque(IterableNodeDeque var1) { @@ -43,30 +43,13 @@ public class IterableNodeDequeDescendingIterator implements Iterator { this.start(); // L: 17 } // L: 18 - @ObfuscatedName("c") + @ObfuscatedName("n") @Export("start") void start() { - this.field3730 = this.deque != null ? this.deque.sentinel.previous : null; // L: 21 + this.field3706 = this.deque != null ? this.deque.sentinel.previous : null; // L: 21 this.last = null; // L: 22 } // L: 23 - public Object next() { - Node var1 = this.field3730; // L: 26 - if (var1 == this.deque.sentinel) { // L: 27 - var1 = null; // L: 28 - this.field3730 = null; // L: 29 - } else { - this.field3730 = var1.previous; // L: 31 - } - - this.last = var1; // L: 32 - return var1; // L: 33 - } - - public boolean hasNext() { - return this.deque.sentinel != this.field3730; // L: 37 - } - public void remove() { if (this.last == null) { // L: 41 throw new IllegalStateException(); @@ -75,4 +58,21 @@ public class IterableNodeDequeDescendingIterator implements Iterator { this.last = null; // L: 43 } } // L: 44 + + public boolean hasNext() { + return this.deque.sentinel != this.field3706; // L: 37 + } + + public Object next() { + Node var1 = this.field3706; // L: 26 + if (var1 == this.deque.sentinel) { // L: 27 + var1 = null; // L: 28 + this.field3706 = null; // L: 29 + } else { + this.field3706 = var1.previous; // L: 31 + } + + this.last = var1; // L: 32 + return var1; // L: 33 + } } diff --git a/runescape-client/src/main/java/IterableNodeHashTable.java b/runescape-client/src/main/java/IterableNodeHashTable.java index ec1c3c56d6..f96ae707d6 100644 --- a/runescape-client/src/main/java/IterableNodeHashTable.java +++ b/runescape-client/src/main/java/IterableNodeHashTable.java @@ -4,31 +4,31 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("mo") +@ObfuscatedName("mr") @Implements("IterableNodeHashTable") public final class IterableNodeHashTable implements Iterable { - @ObfuscatedName("h") + @ObfuscatedName("v") @Export("size") int size; - @ObfuscatedName("c") + @ObfuscatedName("n") @ObfuscatedSignature( - descriptor = "[Lmd;" + descriptor = "[Lmw;" ) @Export("buckets") Node[] buckets; - @ObfuscatedName("o") + @ObfuscatedName("f") @ObfuscatedSignature( - descriptor = "Lmd;" + descriptor = "Lmw;" ) @Export("currentGet") Node currentGet; - @ObfuscatedName("g") + @ObfuscatedName("y") @ObfuscatedSignature( - descriptor = "Lmd;" + descriptor = "Lmw;" ) @Export("current") Node current; - @ObfuscatedName("l") + @ObfuscatedName("p") @Export("index") int index; @@ -45,9 +45,9 @@ public final class IterableNodeHashTable implements Iterable { } // L: 21 - @ObfuscatedName("h") + @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "(J)Lmd;" + descriptor = "(J)Lmw;" ) @Export("get") public Node get(long var1) { @@ -65,9 +65,9 @@ public final class IterableNodeHashTable implements Iterable { return null; // L: 35 } - @ObfuscatedName("c") + @ObfuscatedName("n") @ObfuscatedSignature( - descriptor = "(Lmd;J)V" + descriptor = "(Lmw;J)V" ) @Export("put") public void put(Node var1, long var2) { @@ -83,7 +83,7 @@ public final class IterableNodeHashTable implements Iterable { var1.key = var2; // L: 45 } // L: 46 - @ObfuscatedName("o") + @ObfuscatedName("f") @Export("clear") public void clear() { for (int var1 = 0; var1 < this.size; ++var1) { // L: 49 @@ -103,9 +103,9 @@ public final class IterableNodeHashTable implements Iterable { this.current = null; // L: 58 } // L: 59 - @ObfuscatedName("g") + @ObfuscatedName("y") @ObfuscatedSignature( - descriptor = "()Lmd;" + descriptor = "()Lmw;" ) @Export("first") public Node first() { @@ -113,9 +113,9 @@ public final class IterableNodeHashTable implements Iterable { return this.next(); // L: 63 } - @ObfuscatedName("l") + @ObfuscatedName("p") @ObfuscatedSignature( - descriptor = "()Lmd;" + descriptor = "()Lmw;" ) @Export("next") public Node next() { diff --git a/runescape-client/src/main/java/IterableNodeHashTableIterator.java b/runescape-client/src/main/java/IterableNodeHashTableIterator.java index 89da0dc1f2..5abcca84df 100644 --- a/runescape-client/src/main/java/IterableNodeHashTableIterator.java +++ b/runescape-client/src/main/java/IterableNodeHashTableIterator.java @@ -4,33 +4,33 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("mu") +@ObfuscatedName("mj") @Implements("IterableNodeHashTableIterator") public class IterableNodeHashTableIterator implements Iterator { - @ObfuscatedName("h") + @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "Lmo;" + descriptor = "Lmr;" ) @Export("hashTable") IterableNodeHashTable hashTable; - @ObfuscatedName("c") + @ObfuscatedName("n") @ObfuscatedSignature( - descriptor = "Lmd;" + descriptor = "Lmw;" ) @Export("head") Node head; - @ObfuscatedName("o") + @ObfuscatedName("f") @Export("index") int index; - @ObfuscatedName("g") + @ObfuscatedName("y") @ObfuscatedSignature( - descriptor = "Lmd;" + descriptor = "Lmw;" ) @Export("last") Node last; @ObfuscatedSignature( - descriptor = "(Lmo;)V" + descriptor = "(Lmr;)V" ) IterableNodeHashTableIterator(IterableNodeHashTable var1) { this.last = null; // L: 10 @@ -38,7 +38,7 @@ public class IterableNodeHashTableIterator implements Iterator { this.start(); // L: 14 } // L: 15 - @ObfuscatedName("h") + @ObfuscatedName("v") @Export("start") void start() { this.head = this.hashTable.buckets[0].previous; // L: 18 @@ -46,6 +46,23 @@ public class IterableNodeHashTableIterator implements Iterator { this.last = null; // L: 20 } // L: 21 + public boolean hasNext() { + if (this.hashTable.buckets[this.index - 1] != this.head) { // L: 42 + return true; + } else { + while (this.index < this.hashTable.size) { // L: 43 + if (this.hashTable.buckets[this.index++].previous != this.hashTable.buckets[this.index - 1]) { // L: 44 + this.head = this.hashTable.buckets[this.index - 1].previous; // L: 45 + return true; // L: 46 + } + + this.head = this.hashTable.buckets[this.index - 1]; // L: 49 + } + + return false; // L: 52 + } + } + public void remove() { if (this.last == null) { // L: 56 throw new IllegalStateException(); @@ -76,21 +93,4 @@ public class IterableNodeHashTableIterator implements Iterator { return var1; // L: 35 } } - - public boolean hasNext() { - if (this.hashTable.buckets[this.index - 1] != this.head) { // L: 42 - return true; - } else { - while (this.index < this.hashTable.size) { // L: 43 - if (this.hashTable.buckets[this.index++].previous != this.hashTable.buckets[this.index - 1]) { // L: 44 - this.head = this.hashTable.buckets[this.index - 1].previous; // L: 45 - return true; // L: 46 - } - - this.head = this.hashTable.buckets[this.index - 1]; // L: 49 - } - - return false; // L: 52 - } - } } diff --git a/runescape-client/src/main/java/JagexCache.java b/runescape-client/src/main/java/JagexCache.java index 0688752d1c..39f64c17de 100644 --- a/runescape-client/src/main/java/JagexCache.java +++ b/runescape-client/src/main/java/JagexCache.java @@ -1,49 +1,29 @@ -import java.io.File; 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("dc") +@ObfuscatedName("dm") @Implements("JagexCache") public class JagexCache { - @ObfuscatedName("g") - @Export("JagexCache_locationFile") - static File JagexCache_locationFile; @ObfuscatedName("l") - @Export("cacheDir") - static File cacheDir; - @ObfuscatedName("z") @ObfuscatedSignature( - descriptor = "Ljp;" - ) - @Export("musicTrackArchive") - public static AbstractArchive musicTrackArchive; - @ObfuscatedName("x") - @ObfuscatedSignature( - descriptor = "Lne;" + descriptor = "Lnf;" ) @Export("JagexCache_randomDat") public static BufferedFile JagexCache_randomDat; - @ObfuscatedName("k") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "Lne;" + descriptor = "Lnf;" ) @Export("JagexCache_dat2File") public static BufferedFile JagexCache_dat2File; - @ObfuscatedName("r") + @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "Lne;" + descriptor = "Lnf;" ) @Export("JagexCache_idx255File") public static BufferedFile JagexCache_idx255File; - @ObfuscatedName("go") - @ObfuscatedGetter( - intValue = 1374549723 - ) - @Export("baseX") - static int baseX; static { JagexCache_randomDat = null; // L: 22 @@ -51,13 +31,34 @@ public class JagexCache { JagexCache_idx255File = null; // L: 24 } - @ObfuscatedName("i") + @ObfuscatedName("iw") @ObfuscatedSignature( - descriptor = "(B)V", - garbageValue = "104" + descriptor = "(Ljava/lang/String;Lio;B)Ljava/lang/String;", + garbageValue = "109" ) - public static void method2538() { - NPCComposition.NpcDefinition_cached.clear(); // L: 255 - NPCComposition.NpcDefinition_cachedModels.clear(); // L: 256 - } // L: 257 + static String method2540(String var0, Widget var1) { + if (var0.indexOf("%") != -1) { // L: 9703 + for (int var2 = 1; var2 <= 5; ++var2) { // L: 9704 + while (true) { + int var3 = var0.indexOf("%" + var2); // L: 9706 + if (var3 == -1) { // L: 9707 + break; + } + + String var4 = var0.substring(0, var3); // L: 9708 + int var6 = ModeWhere.method5160(var1, var2 - 1); // L: 9710 + String var5; + if (var6 < 999999999) { // L: 9712 + var5 = Integer.toString(var6); // L: 9713 + } else { + var5 = "*"; // L: 9716 + } + + var0 = var4 + var5 + var0.substring(var3 + 2); // L: 9718 + } + } + } + + return var0; // L: 9722 + } } diff --git a/runescape-client/src/main/java/KeyHandler.java b/runescape-client/src/main/java/KeyHandler.java index d44553ceb2..68f535b497 100644 --- a/runescape-client/src/main/java/KeyHandler.java +++ b/runescape-client/src/main/java/KeyHandler.java @@ -8,85 +8,79 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ay") +@ObfuscatedName("az") @Implements("KeyHandler") public final class KeyHandler implements KeyListener, FocusListener { - @ObfuscatedName("h") + @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "Lay;" + descriptor = "Laz;" ) @Export("KeyHandler_instance") - static KeyHandler KeyHandler_instance; - @ObfuscatedName("cf") + public static KeyHandler KeyHandler_instance; + @ObfuscatedName("cn") @Export("KeyHandler_pressedKeys") public static boolean[] KeyHandler_pressedKeys; - @ObfuscatedName("cd") - static int[] field270; - @ObfuscatedName("ct") - @ObfuscatedGetter( - intValue = 1180346521 - ) - static int field273; @ObfuscatedName("co") + public static int[] field287; + @ObfuscatedName("ck") @ObfuscatedGetter( - intValue = 244620517 + intValue = -961604687 ) - static int field260; - @ObfuscatedName("cz") - static char[] field255; - @ObfuscatedName("cl") - static int[] field274; - @ObfuscatedName("cp") - public static int[] field275; - @ObfuscatedName("cr") - @ObfuscatedGetter( - intValue = 189017369 - ) - public static int field276; - @ObfuscatedName("cg") - @ObfuscatedGetter( - intValue = -1087799347 - ) - static int field277; - @ObfuscatedName("cw") - @ObfuscatedGetter( - intValue = 741110317 - ) - static int field278; + public static int field296; @ObfuscatedName("cj") @ObfuscatedGetter( - intValue = 477685323 + intValue = -1243891281 ) - static int field279; + public static int field288; + @ObfuscatedName("cc") + static char[] field286; + @ObfuscatedName("cu") + static int[] field289; + @ObfuscatedName("cz") + public static int[] field274; + @ObfuscatedName("cb") + @ObfuscatedGetter( + intValue = -402048791 + ) + public static int field292; + @ObfuscatedName("ce") + @ObfuscatedGetter( + intValue = 924382931 + ) + public static int field293; + @ObfuscatedName("ch") + @ObfuscatedGetter( + intValue = -1003990119 + ) + public static int field294; @ObfuscatedName("cy") @ObfuscatedGetter( - intValue = -1222037043 + intValue = 300307947 + ) + public static int field295; + @ObfuscatedName("cx") + @ObfuscatedGetter( + intValue = 1384960375 ) @Export("KeyHandler_idleCycles") public static volatile int KeyHandler_idleCycles; - @ObfuscatedName("cb") + @ObfuscatedName("ca") @Export("KeyHandler_keyCodes") static int[] KeyHandler_keyCodes; - @ObfuscatedName("dk") - @ObfuscatedSignature( - descriptor = "Lji;" - ) - @Export("archive11") - static Archive archive11; static { KeyHandler_instance = new KeyHandler(); // L: 13 KeyHandler_pressedKeys = new boolean[112]; // L: 100 - field270 = new int[128]; - field273 = 0; - field260 = 0; // L: 105 - field255 = new char[128]; // L: 106 - field274 = new int[128]; - field275 = new int[128]; - field276 = 0; // L: 109 - field277 = 0; // L: 110 - field278 = 0; // L: 111 - field279 = 0; // L: 112 + field287 = new int[128]; // L: 103 + field296 = 0; // L: 104 + field288 = 0; // L: 105 + field286 = new char[128]; // L: 106 + field289 = new int[128]; // L: 107 + field274 = new int[128]; // L: 108 + field292 = 0; // L: 109 + field293 = 0; // L: 110 + field294 = 0; // L: 111 + field295 = 0; // L: 112 KeyHandler_idleCycles = 0; // L: 113 KeyHandler_keyCodes = new int[]{-1, -1, -1, -1, -1, -1, -1, -1, 85, 80, 84, -1, 91, -1, -1, -1, 81, 82, 86, -1, -1, -1, -1, -1, -1, -1, -1, 13, -1, -1, -1, -1, 83, 104, 105, 103, 102, 96, 98, 97, 99, -1, -1, -1, -1, -1, -1, -1, 25, 16, 17, 18, 19, 20, 21, 22, 23, 24, -1, -1, -1, -1, -1, -1, -1, 48, 68, 66, 50, 34, 51, 52, 53, 39, 54, 55, 56, 70, 69, 40, 41, 32, 35, 49, 36, 38, 67, 33, 65, 37, 64, -1, -1, -1, -1, -1, 228, 231, 227, 233, 224, 219, 225, 230, 226, 232, 89, 87, -1, 88, 229, 90, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, -1, -1, -1, 101, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 100, -1, 87, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1}; // L: 114 } @@ -95,281 +89,129 @@ public final class KeyHandler implements KeyListener, FocusListener { } // L: 116 public final synchronized void keyPressed(KeyEvent var1) { - if (KeyHandler_instance != null) { // L: 201 - int var2 = var1.getKeyCode(); // L: 202 - if (var2 >= 0 && var2 < KeyHandler_keyCodes.length) { // L: 203 - var2 = KeyHandler_keyCodes[var2]; // L: 204 - if ((var2 & 128) != 0) { // L: 205 + if (KeyHandler_instance != null) { // L: 176 + int var2 = var1.getKeyCode(); // L: 177 + if (var2 >= 0 && var2 < KeyHandler_keyCodes.length) { // L: 178 + var2 = KeyHandler_keyCodes[var2]; // L: 179 + if ((var2 & 128) != 0) { // L: 180 var2 = -1; } } else { - var2 = -1; // L: 207 + var2 = -1; // L: 182 } - if (field260 >= 0 && var2 >= 0) { // L: 208 - field270[field260] = var2; // L: 209 - field260 = field260 + 1 & 127; // L: 210 - if (field260 == field273) { // L: 211 - field260 = -1; + if (field288 >= 0 && var2 >= 0) { // L: 183 + field287[field288] = var2; // L: 184 + field288 = field288 + 1 & 127; // L: 185 + if (field288 == field296) { // L: 186 + field288 = -1; } } int var3; - if (var2 >= 0) { // L: 213 - var3 = field278 + 1 & 127; // L: 214 - if (var3 != field277) { // L: 215 - field274[field278] = var2; // L: 216 - field255[field278] = 0; // L: 217 - field278 = var3; // L: 218 + if (var2 >= 0) { // L: 188 + var3 = field294 + 1 & 127; // L: 189 + if (var3 != field293) { // L: 190 + field289[field294] = var2; // L: 191 + field286[field294] = 0; // L: 192 + field294 = var3; // L: 193 } } - var3 = var1.getModifiers(); // L: 221 - if ((var3 & 10) != 0 || var2 == 85 || var2 == 10) { // L: 222 - var1.consume(); // L: 223 + var3 = var1.getModifiers(); // L: 196 + if ((var3 & 10) != 0 || var2 == 85 || var2 == 10) { // L: 197 + var1.consume(); // L: 198 } } - } // L: 226 - - public final void keyTyped(KeyEvent var1) { - if (KeyHandler_instance != null) { // L: 243 - char var2 = var1.getKeyChar(); // L: 244 - if (var2 != 0 && var2 != '\uffff') { // L: 245 - boolean var3; - if ((var2 <= 0 || var2 >= 128) && (var2 < 160 || var2 > 255)) { // L: 248 - label53: { - if (var2 != 0) { // L: 252 - char[] var4 = class301.cp1252AsciiExtension; // L: 254 - - for (int var5 = 0; var5 < var4.length; ++var5) { // L: 255 - char var6 = var4[var5]; // L: 256 - if (var6 == var2) { // L: 258 - var3 = true; // L: 259 - break label53; // L: 260 - } - } - } - - var3 = false; // L: 266 - } - } else { - var3 = true; // L: 249 - } - - if (var3) { // L: 268 - int var7 = field278 + 1 & 127; // L: 269 - if (var7 != field277) { // L: 270 - field274[field278] = -1; // L: 271 - field255[field278] = var2; // L: 272 - field278 = var7; // L: 273 - } - } - } - } - - var1.consume(); // L: 278 - } // L: 279 - - public final void focusGained(FocusEvent var1) { - } // L: 281 - - public final synchronized void focusLost(FocusEvent var1) { - if (KeyHandler_instance != null) { // L: 284 - field260 = -1; // L: 285 - } - - } // L: 287 + } // L: 201 public final synchronized void keyReleased(KeyEvent var1) { - if (KeyHandler_instance != null) { // L: 229 - int var2 = var1.getKeyCode(); // L: 230 - if (var2 >= 0 && var2 < KeyHandler_keyCodes.length) { // L: 231 + if (KeyHandler_instance != null) { // L: 204 + int var2 = var1.getKeyCode(); // L: 205 + if (var2 >= 0 && var2 < KeyHandler_keyCodes.length) { // L: 206 var2 = KeyHandler_keyCodes[var2] & -129; } else { - var2 = -1; // L: 232 + var2 = -1; // L: 207 } - if (field260 >= 0 && var2 >= 0) { // L: 233 - field270[field260] = ~var2; // L: 234 - field260 = field260 + 1 & 127; // L: 235 - if (field260 == field273) { // L: 236 - field260 = -1; + if (field288 >= 0 && var2 >= 0) { // L: 208 + field287[field288] = ~var2; // L: 209 + field288 = field288 + 1 & 127; // L: 210 + if (field296 == field288) { // L: 211 + field288 = -1; } } } - var1.consume(); // L: 239 - } // L: 240 + var1.consume(); // L: 214 + } // L: 215 - @ObfuscatedName("h") - @ObfuscatedSignature( - descriptor = "(Lnm;I)V", - garbageValue = "-1477820122" - ) - @Export("updatePlayer") - static final void updatePlayer(PacketBuffer var0) { - var0.importIndex(); // L: 37 - int var1 = Client.localPlayerIndex; // L: 38 - Player var2 = class35.localPlayer = Client.players[var1] = new Player(); // L: 39 - var2.index = var1; // L: 40 - int var3 = var0.readBits(30); // L: 41 - byte var4 = (byte)(var3 >> 28); // L: 42 - int var5 = var3 >> 14 & 16383; // L: 43 - int var6 = var3 & 16383; // L: 44 - var2.pathX[0] = var5 - JagexCache.baseX; // L: 45 - var2.x = (var2.pathX[0] << 7) + (var2.transformedSize() << 6); // L: 46 - var2.pathY[0] = var6 - Messages.baseY; // L: 47 - var2.y = (var2.pathY[0] << 7) + (var2.transformedSize() << 6); // L: 48 - ParamComposition.Client_plane = var2.plane = var4; // L: 49 - if (Players.field1346[var1] != null) { // L: 50 - var2.read(Players.field1346[var1]); + public final synchronized void focusLost(FocusEvent var1) { + if (KeyHandler_instance != null) { // L: 235 + field288 = -1; // L: 236 } - Players.Players_count = 0; // L: 51 - Players.Players_indices[++Players.Players_count - 1] = var1; // L: 52 - Players.field1344[var1] = 0; // L: 53 - Players.Players_emptyIdxCount = 0; // L: 54 + } // L: 238 - for (int var7 = 1; var7 < 2048; ++var7) { // L: 55 - if (var7 != var1) { // L: 56 - int var8 = var0.readBits(18); // L: 57 - int var9 = var8 >> 16; // L: 58 - int var10 = var8 >> 8 & 597; // L: 59 - int var11 = var8 & 597; // L: 60 - Players.Players_regions[var7] = (var10 << 14) + var11 + (var9 << 28); // L: 61 - Players.Players_orientations[var7] = 0; // L: 62 - Players.Players_targetIndices[var7] = -1; // L: 63 - Players.Players_emptyIndices[++Players.Players_emptyIdxCount - 1] = var7; // L: 64 - Players.field1344[var7] = 0; // L: 65 + public final void keyTyped(KeyEvent var1) { + if (KeyHandler_instance != null) { // L: 218 + char var2 = var1.getKeyChar(); // L: 219 + if (var2 != 0 && var2 != '\uffff' && Timer.method5614(var2)) { // L: 220 + int var3 = field294 + 1 & 127; // L: 221 + if (var3 != field293) { // L: 222 + field289[field294] = -1; // L: 223 + field286[field294] = var2; // L: 224 + field294 = var3; // L: 225 + } } } - var0.exportIndex(); // L: 67 - } // L: 68 + var1.consume(); // L: 229 + } // L: 230 - @ObfuscatedName("h") + public final void focusGained(FocusEvent var1) { + } // L: 232 + + @ObfuscatedName("j") @ObfuscatedSignature( - descriptor = "(III)I", - garbageValue = "-692879798" + descriptor = "(I)V", + garbageValue = "-1154026076" ) - static int method453(int var0, int var1) { - ItemContainer var2 = (ItemContainer)ItemContainer.itemContainers.get((long)var0); // L: 14 - if (var2 == null) { // L: 15 - return -1; + public static void method378() { + HealthBarDefinition.HealthBarDefinition_cached.clear(); // L: 89 + HealthBarDefinition.HealthBarDefinition_cachedSprites.clear(); // L: 90 + } // L: 91 + + @ObfuscatedName("af") + @ObfuscatedSignature( + descriptor = "(ILcf;ZI)I", + garbageValue = "946272501" + ) + static int method364(int var0, Script var1, boolean var2) { + if (var0 >= 7200 && var0 < 7204) { // L: 4290 + class44.Interpreter_intStackSize -= 5; // L: 4291 + Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = -1; // L: 4292 + return 1; // L: 4293 + } else if (var0 == 7204) { // L: 4295 + class44.Interpreter_intStackSize -= 6; // L: 4296 + Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = -1; // L: 4297 + return 1; // L: 4298 + } else if (var0 >= 7205 && var0 < 7209) { // L: 4300 + Interpreter.Interpreter_intStack[class44.Interpreter_intStackSize - 1] = -1; // L: 4301 + return 1; // L: 4302 + } else if (var0 == 7209) { // L: 4304 + class44.Interpreter_intStackSize -= 2; // L: 4305 + Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = -1; // L: 4306 + return 1; // L: 4307 + } else if (var0 >= 7210 && var0 < 7214) { // L: 4309 + --class44.Interpreter_intStackSize; // L: 4310 + return 1; // L: 4311 + } else if (var0 == 7214) { // L: 4313 + class44.Interpreter_intStackSize -= 2; // L: 4314 + return 1; // L: 4315 } else { - return var1 >= 0 && var1 < var2.ids.length ? var2.ids[var1] : -1; // L: 16 17 + return 2; // L: 4317 } } - - @ObfuscatedName("o") - @ObfuscatedSignature( - descriptor = "(B)V", - garbageValue = "93" - ) - @Export("savePreferences") - static void savePreferences() { - AccessFile var0 = null; // L: 95 - - try { - var0 = Buddy.getPreferencesFile("", NetSocket.field1492.name, true); // L: 97 - Buffer var1 = class12.clientPreferences.toBuffer(); // L: 98 - var0.write(var1.array, 0, var1.offset); // L: 99 - } catch (Exception var3) { // L: 101 - } - - try { - if (var0 != null) { // L: 103 - var0.closeSync(true); // L: 104 - } - } catch (Exception var2) { // L: 107 - } - - } // L: 108 - - @ObfuscatedName("f") - @ObfuscatedSignature( - descriptor = "(ZI)V", - garbageValue = "1908910529" - ) - public static void method451(boolean var0) { - if (var0 != BufferedNetSocket.ItemDefinition_inMembersWorld) { // L: 541 - ItemComposition.ItemDefinition_cached.clear(); // L: 543 - ItemComposition.ItemDefinition_cachedModels.clear(); // L: 544 - ItemComposition.ItemDefinition_cachedSprites.clear(); // L: 545 - BufferedNetSocket.ItemDefinition_inMembersWorld = var0; // L: 547 - } - - } // L: 549 - - @ObfuscatedName("hy") - @ObfuscatedSignature( - descriptor = "(II)V", - garbageValue = "-1066006751" - ) - @Export("createMinimapSprite") - static final void createMinimapSprite(int var0) { - int[] var1 = UserComparator8.sceneMinimapSprite.pixels; // L: 5663 - int var2 = var1.length; // L: 5664 - - int var3; - for (var3 = 0; var3 < var2; ++var3) { // L: 5665 - var1[var3] = 0; - } - - int var4; - int var5; - for (var3 = 1; var3 < 103; ++var3) { // L: 5666 - var4 = (103 - var3) * 2048 + 24628; // L: 5667 - - for (var5 = 1; var5 < 103; ++var5) { // L: 5668 - if ((Tiles.Tiles_renderFlags[var0][var5][var3] & 24) == 0) { // L: 5669 - class5.scene.drawTileMinimap(var1, var4, 512, var0, var5, var3); - } - - if (var0 < 3 && (Tiles.Tiles_renderFlags[var0 + 1][var5][var3] & 8) != 0) { // L: 5670 - class5.scene.drawTileMinimap(var1, var4, 512, var0 + 1, var5, var3); - } - - var4 += 4; // L: 5671 - } - } - - var3 = (238 + (int)(Math.random() * 20.0D) - 10 << 16) + (238 + (int)(Math.random() * 20.0D) - 10 << 8) + (238 + (int)(Math.random() * 20.0D) - 10); // L: 5674 - var4 = 238 + (int)(Math.random() * 20.0D) - 10 << 16; // L: 5675 - UserComparator8.sceneMinimapSprite.setRaster(); // L: 5676 - - int var6; - for (var5 = 1; var5 < 103; ++var5) { // L: 5677 - for (var6 = 1; var6 < 103; ++var6) { // L: 5678 - if ((Tiles.Tiles_renderFlags[var0][var6][var5] & 24) == 0) { // L: 5679 - ItemComposition.drawObject(var0, var6, var5, var3, var4); - } - - if (var0 < 3 && (Tiles.Tiles_renderFlags[var0 + 1][var6][var5] & 8) != 0) { // L: 5680 - ItemComposition.drawObject(var0 + 1, var6, var5, var3, var4); - } - } - } - - Client.mapIconCount = 0; // L: 5683 - - for (var5 = 0; var5 < 104; ++var5) { // L: 5684 - for (var6 = 0; var6 < 104; ++var6) { // L: 5685 - long var7 = class5.scene.getFloorDecorationTag(ParamComposition.Client_plane, var5, var6); // L: 5686 - if (var7 != 0L) { // L: 5687 - int var9 = class6.Entity_unpackID(var7); // L: 5688 - int var10 = AttackOption.getObjectDefinition(var9).mapIconId; // L: 5689 - if (var10 >= 0 && WorldMapAreaData.WorldMapElement_get(var10).field1558) { // L: 5690 5691 - Client.mapIcons[Client.mapIconCount] = WorldMapAreaData.WorldMapElement_get(var10).getSpriteBool(false); // L: 5694 - Client.mapIconXs[Client.mapIconCount] = var5; // L: 5695 - Client.mapIconYs[Client.mapIconCount] = var6; // L: 5696 - ++Client.mapIconCount; // L: 5697 - } - } - } - } - - WorldMapDecorationType.rasterProvider.apply(); // L: 5702 - } // L: 5703 } diff --git a/runescape-client/src/main/java/KitDefinition.java b/runescape-client/src/main/java/KitDefinition.java index c8b371fbe8..e7cb36a0d4 100644 --- a/runescape-client/src/main/java/KitDefinition.java +++ b/runescape-client/src/main/java/KitDefinition.java @@ -4,69 +4,49 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("es") +@ObfuscatedName("el") @Implements("KitDefinition") public class KitDefinition extends DualNode { - @ObfuscatedName("rd") - @ObfuscatedGetter( - intValue = 1875814841 - ) - static int field1592; - @ObfuscatedName("h") + @ObfuscatedName("n") @ObfuscatedSignature( - descriptor = "Ljp;" - ) - @Export("KitDefinition_archive") - public static AbstractArchive KitDefinition_archive; - @ObfuscatedName("c") - @ObfuscatedSignature( - descriptor = "Ljp;" + descriptor = "Ljv;" ) @Export("KitDefinition_modelsArchive") - public static AbstractArchive KitDefinition_modelsArchive; - @ObfuscatedName("o") - @ObfuscatedGetter( - intValue = 755505833 - ) - @Export("KitDefinition_fileCount") - public static int KitDefinition_fileCount; - @ObfuscatedName("g") + static AbstractArchive KitDefinition_modelsArchive; + @ObfuscatedName("y") @ObfuscatedSignature( - descriptor = "Lho;" + descriptor = "Lhz;" ) @Export("KitDefinition_cached") - public static EvictingDualNodeHashTable KitDefinition_cached; - @ObfuscatedName("de") - @ObfuscatedSignature( - descriptor = "Lji;" - ) - @Export("archive2") - static Archive archive2; - @ObfuscatedName("l") + static EvictingDualNodeHashTable KitDefinition_cached; + @ObfuscatedName("al") + @Export("fontHelvetica13") + static java.awt.Font fontHelvetica13; + @ObfuscatedName("p") @ObfuscatedGetter( - intValue = 341886267 + intValue = 2136524687 ) @Export("bodypartID") public int bodypartID; - @ObfuscatedName("z") + @ObfuscatedName("j") @Export("models2") int[] models2; - @ObfuscatedName("t") + @ObfuscatedName("r") @Export("recolorFrom") short[] recolorFrom; - @ObfuscatedName("v") + @ObfuscatedName("b") @Export("recolorTo") short[] recolorTo; - @ObfuscatedName("b") + @ObfuscatedName("d") @Export("retextureFrom") short[] retextureFrom; - @ObfuscatedName("q") + @ObfuscatedName("s") @Export("retextureTo") short[] retextureTo; - @ObfuscatedName("i") + @ObfuscatedName("u") @Export("models") int[] models; - @ObfuscatedName("x") + @ObfuscatedName("l") @Export("nonSelectable") public boolean nonSelectable; @@ -76,204 +56,223 @@ public class KitDefinition extends DualNode { KitDefinition() { this.bodypartID = -1; // L: 15 - this.models = new int[]{-1, -1, -1, -1, -1}; - this.nonSelectable = false; - } + this.models = new int[]{-1, -1, -1, -1, -1}; // L: 21 + this.nonSelectable = false; // L: 22 + } // L: 24 - @ObfuscatedName("c") + @ObfuscatedName("f") @ObfuscatedSignature( - descriptor = "(Lnk;I)V", - garbageValue = "-1874267305" + descriptor = "(Lnd;I)V", + garbageValue = "76297691" ) @Export("decode") void decode(Buffer var1) { while (true) { - int var2 = var1.readUnsignedByte(); // L: 38 - if (var2 == 0) { // L: 39 - return; // L: 42 + int var2 = var1.readUnsignedByte(); // L: 44 + if (var2 == 0) { // L: 45 + return; // L: 48 } - this.decodeNext(var1, var2); // L: 40 + this.decodeNext(var1, var2); // L: 46 } } - @ObfuscatedName("o") + @ObfuscatedName("y") @ObfuscatedSignature( - descriptor = "(Lnk;II)V", - garbageValue = "1591009005" + descriptor = "(Lnd;II)V", + garbageValue = "-662659008" ) @Export("decodeNext") void decodeNext(Buffer var1, int var2) { - if (var2 == 1) { // L: 45 + if (var2 == 1) { // L: 51 this.bodypartID = var1.readUnsignedByte(); } else { int var3; int var4; - if (var2 == 2) { // L: 46 - var3 = var1.readUnsignedByte(); // L: 47 - this.models2 = new int[var3]; // L: 48 + if (var2 == 2) { // L: 52 + var3 = var1.readUnsignedByte(); // L: 53 + this.models2 = new int[var3]; // L: 54 - for (var4 = 0; var4 < var3; ++var4) { // L: 49 + for (var4 = 0; var4 < var3; ++var4) { // L: 55 this.models2[var4] = var1.readUnsignedShort(); } - } else if (var2 == 3) { // L: 51 + } else if (var2 == 3) { // L: 57 this.nonSelectable = true; - } else if (var2 == 40) { // L: 52 - var3 = var1.readUnsignedByte(); // L: 53 - this.recolorFrom = new short[var3]; // L: 54 - this.recolorTo = new short[var3]; // L: 55 + } else if (var2 == 40) { // L: 58 + var3 = var1.readUnsignedByte(); // L: 59 + this.recolorFrom = new short[var3]; // L: 60 + this.recolorTo = new short[var3]; // L: 61 - for (var4 = 0; var4 < var3; ++var4) { // L: 56 - this.recolorFrom[var4] = (short)var1.readUnsignedShort(); // L: 57 - this.recolorTo[var4] = (short)var1.readUnsignedShort(); // L: 58 + for (var4 = 0; var4 < var3; ++var4) { // L: 62 + this.recolorFrom[var4] = (short)var1.readUnsignedShort(); // L: 63 + this.recolorTo[var4] = (short)var1.readUnsignedShort(); // L: 64 } - } else if (var2 == 41) { // L: 61 - var3 = var1.readUnsignedByte(); // L: 62 - this.retextureFrom = new short[var3]; // L: 63 - this.retextureTo = new short[var3]; // L: 64 + } else if (var2 == 41) { // L: 67 + var3 = var1.readUnsignedByte(); // L: 68 + this.retextureFrom = new short[var3]; // L: 69 + this.retextureTo = new short[var3]; // L: 70 - for (var4 = 0; var4 < var3; ++var4) { // L: 65 - this.retextureFrom[var4] = (short)var1.readUnsignedShort(); // L: 66 - this.retextureTo[var4] = (short)var1.readUnsignedShort(); // L: 67 + for (var4 = 0; var4 < var3; ++var4) { // L: 71 + this.retextureFrom[var4] = (short)var1.readUnsignedShort(); // L: 72 + this.retextureTo[var4] = (short)var1.readUnsignedShort(); // L: 73 } - } else if (var2 >= 60 && var2 < 70) { // L: 70 + } else if (var2 >= 60 && var2 < 70) { // L: 76 this.models[var2 - 60] = var1.readUnsignedShort(); } } - } // L: 72 + } // L: 78 - @ObfuscatedName("g") + @ObfuscatedName("p") @ObfuscatedSignature( - descriptor = "(B)Z", - garbageValue = "-81" + descriptor = "(I)Z", + garbageValue = "-2100349999" ) @Export("ready") public boolean ready() { - if (this.models2 == null) { // L: 75 + if (this.models2 == null) { // L: 81 return true; } else { - boolean var1 = true; // L: 76 + boolean var1 = true; // L: 82 - for (int var2 = 0; var2 < this.models2.length; ++var2) { // L: 77 + for (int var2 = 0; var2 < this.models2.length; ++var2) { // L: 83 if (!KitDefinition_modelsArchive.tryLoadFile(this.models2[var2], 0)) { var1 = false; } } - return var1; // L: 78 + return var1; // L: 84 } } - @ObfuscatedName("l") + @ObfuscatedName("j") @ObfuscatedSignature( - descriptor = "(I)Lgk;", - garbageValue = "-1950704441" + descriptor = "(I)Lgm;", + garbageValue = "218525675" ) @Export("getModelData") public ModelData getModelData() { - if (this.models2 == null) { // L: 82 + if (this.models2 == null) { // L: 88 return null; } else { - ModelData[] var1 = new ModelData[this.models2.length]; // L: 83 + ModelData[] var1 = new ModelData[this.models2.length]; // L: 89 - for (int var2 = 0; var2 < this.models2.length; ++var2) { // L: 84 + for (int var2 = 0; var2 < this.models2.length; ++var2) { // L: 90 var1[var2] = ModelData.ModelData_get(KitDefinition_modelsArchive, this.models2[var2], 0); } ModelData var4; - if (var1.length == 1) { // L: 86 + if (var1.length == 1) { // L: 92 var4 = var1[0]; } else { - var4 = new ModelData(var1, var1.length); // L: 87 + var4 = new ModelData(var1, var1.length); // L: 93 } int var3; - if (this.recolorFrom != null) { // L: 88 - for (var3 = 0; var3 < this.recolorFrom.length; ++var3) { // L: 89 - var4.recolor(this.recolorFrom[var3], this.recolorTo[var3]); // L: 90 + if (this.recolorFrom != null) { // L: 94 + for (var3 = 0; var3 < this.recolorFrom.length; ++var3) { // L: 95 + var4.recolor(this.recolorFrom[var3], this.recolorTo[var3]); // L: 96 } } - if (this.retextureFrom != null) { // L: 93 - for (var3 = 0; var3 < this.retextureFrom.length; ++var3) { // L: 94 - var4.retexture(this.retextureFrom[var3], this.retextureTo[var3]); // L: 95 + if (this.retextureFrom != null) { // L: 99 + for (var3 = 0; var3 < this.retextureFrom.length; ++var3) { // L: 100 + var4.retexture(this.retextureFrom[var3], this.retextureTo[var3]); // L: 101 } } - return var4; // L: 98 + return var4; // L: 104 } } - @ObfuscatedName("z") + @ObfuscatedName("r") @ObfuscatedSignature( descriptor = "(I)Z", - garbageValue = "-456802974" + garbageValue = "-1717732165" ) - public boolean method2673() { - boolean var1 = true; // L: 102 + public boolean method2684() { + boolean var1 = true; // L: 108 - for (int var2 = 0; var2 < 5; ++var2) { // L: 103 - if (this.models[var2] != -1 && !KitDefinition_modelsArchive.tryLoadFile(this.models[var2], 0)) { // L: 104 + for (int var2 = 0; var2 < 5; ++var2) { // L: 109 + if (this.models[var2] != -1 && !KitDefinition_modelsArchive.tryLoadFile(this.models[var2], 0)) { // L: 110 var1 = false; } } - return var1; // L: 106 + return var1; // L: 112 } - @ObfuscatedName("t") + @ObfuscatedName("b") @ObfuscatedSignature( - descriptor = "(B)Lgk;", - garbageValue = "1" + descriptor = "(I)Lgm;", + garbageValue = "787356684" ) @Export("getKitDefinitionModels") public ModelData getKitDefinitionModels() { - ModelData[] var1 = new ModelData[5]; // L: 110 - int var2 = 0; // L: 111 + ModelData[] var1 = new ModelData[5]; // L: 116 + int var2 = 0; // L: 117 - for (int var3 = 0; var3 < 5; ++var3) { // L: 112 - if (this.models[var3] != -1) { // L: 113 + for (int var3 = 0; var3 < 5; ++var3) { // L: 118 + if (this.models[var3] != -1) { // L: 119 var1[var2++] = ModelData.ModelData_get(KitDefinition_modelsArchive, this.models[var3], 0); } } - ModelData var5 = new ModelData(var1, var2); // L: 115 + ModelData var5 = new ModelData(var1, var2); // L: 121 int var4; - if (this.recolorFrom != null) { // L: 116 - for (var4 = 0; var4 < this.recolorFrom.length; ++var4) { // L: 117 - var5.recolor(this.recolorFrom[var4], this.recolorTo[var4]); // L: 118 + if (this.recolorFrom != null) { // L: 122 + for (var4 = 0; var4 < this.recolorFrom.length; ++var4) { // L: 123 + var5.recolor(this.recolorFrom[var4], this.recolorTo[var4]); // L: 124 } } - if (this.retextureFrom != null) { // L: 121 - for (var4 = 0; var4 < this.retextureFrom.length; ++var4) { // L: 122 - var5.retexture(this.retextureFrom[var4], this.retextureTo[var4]); // L: 123 + if (this.retextureFrom != null) { // L: 127 + for (var4 = 0; var4 < this.retextureFrom.length; ++var4) { // L: 128 + var5.retexture(this.retextureFrom[var4], this.retextureTo[var4]); // L: 129 } } - return var5; // L: 126 + return var5; // L: 132 } - @ObfuscatedName("c") + @ObfuscatedName("lc") @ObfuscatedSignature( - descriptor = "(II)Len;", - garbageValue = "65280" + descriptor = "(Ljava/lang/String;ZI)Ljava/lang/String;", + garbageValue = "-1936080360" ) - @Export("getInvDefinition") - public static InvDefinition getInvDefinition(int var0) { - InvDefinition var1 = (InvDefinition)InvDefinition.InvDefinition_cached.get((long)var0); // L: 21 - if (var1 != null) { // L: 22 - return var1; - } else { - byte[] var2 = InvDefinition.InvDefinition_archive.takeFile(5, var0); // L: 23 - var1 = new InvDefinition(); // L: 24 - if (var2 != null) { // L: 25 - var1.decode(new Buffer(var2)); - } - - InvDefinition.InvDefinition_cached.put(var1, (long)var0); // L: 26 - return var1; // L: 27 + static String method2705(String var0, boolean var1) { + String var2 = var1 ? "https://" : "http://"; // L: 11385 + if (Client.gameBuild == 1) { // L: 11386 + var0 = var0 + "-wtrc"; + } else if (Client.gameBuild == 2) { // L: 11387 + var0 = var0 + "-wtqa"; + } else if (Client.gameBuild == 3) { // L: 11388 + var0 = var0 + "-wtwip"; + } else if (Client.gameBuild == 5) { // L: 11389 + var0 = var0 + "-wti"; + } else if (Client.gameBuild == 4) { // L: 11390 + var0 = "local"; } + + String var3 = ""; // L: 11391 + if (class363.field4079 != null) { // L: 11392 + var3 = "/p=" + class363.field4079; + } + + String var4 = "runescape.com"; // L: 11393 + return var2 + var0 + "." + var4 + "/l=" + class378.clientLanguage + "/a=" + Script.field1094 + var3 + "/"; // L: 11394 } + + @ObfuscatedName("lp") + @ObfuscatedSignature( + descriptor = "([BII)V", + garbageValue = "-1641732404" + ) + static void method2687(byte[] var0, int var1) { + if (Client.randomDatData == null) { // L: 11459 + Client.randomDatData = new byte[24]; + } + + class306.writeRandomDat(var0, var1, Client.randomDatData, 0, 24); // L: 11460 + } // L: 11461 } diff --git a/runescape-client/src/main/java/Language.java b/runescape-client/src/main/java/Language.java index 0f1c540438..31ef9f256c 100644 --- a/runescape-client/src/main/java/Language.java +++ b/runescape-client/src/main/java/Language.java @@ -5,208 +5,146 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("kr") +@ObfuscatedName("kk") @Implements("Language") public class Language implements Enumerated { - @ObfuscatedName("rf") - @ObfuscatedGetter( - intValue = -430967817 - ) - static int field3704; - @ObfuscatedName("h") + @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "Lkr;" + descriptor = "Lkk;" ) @Export("Language_EN") public static final Language Language_EN; - @ObfuscatedName("c") + @ObfuscatedName("n") @ObfuscatedSignature( - descriptor = "Lkr;" + descriptor = "Lkk;" ) @Export("Language_DE") static final Language Language_DE; - @ObfuscatedName("o") + @ObfuscatedName("f") @ObfuscatedSignature( - descriptor = "Lkr;" + descriptor = "Lkk;" ) @Export("Language_FR") public static final Language Language_FR; - @ObfuscatedName("g") + @ObfuscatedName("y") @ObfuscatedSignature( - descriptor = "Lkr;" + descriptor = "Lkk;" ) @Export("Language_PT") static final Language Language_PT; - @ObfuscatedName("l") + @ObfuscatedName("p") @ObfuscatedSignature( - descriptor = "Lkr;" + descriptor = "Lkk;" ) @Export("Language_NL") static final Language Language_NL; - @ObfuscatedName("z") + @ObfuscatedName("j") @ObfuscatedSignature( - descriptor = "Lkr;" + descriptor = "Lkk;" ) @Export("Language_ES") public static final Language Language_ES; - @ObfuscatedName("t") + @ObfuscatedName("r") @ObfuscatedSignature( - descriptor = "Lkr;" + descriptor = "Lkk;" ) @Export("Language_ES_MX") static final Language Language_ES_MX; - @ObfuscatedName("i") + @ObfuscatedName("u") @ObfuscatedSignature( - descriptor = "[Lkr;" + descriptor = "[Lkk;" ) @Export("Language_valuesOrdered") - public static final Language[] Language_valuesOrdered; - @ObfuscatedName("v") - final String field3701; + static final Language[] Language_valuesOrdered; @ObfuscatedName("b") + final String field3680; + @ObfuscatedName("d") @Export("language") final String language; - @ObfuscatedName("q") + @ObfuscatedName("s") @ObfuscatedGetter( - intValue = -2016416161 + intValue = 2108172383 ) @Export("id") final int id; static { - Language_EN = new Language("EN", "en", "English", ModeWhere.field3710, 0, "GB"); // L: 10 - Language_DE = new Language("DE", "de", "German", ModeWhere.field3710, 1, "DE"); // L: 11 - Language_FR = new Language("FR", "fr", "French", ModeWhere.field3710, 2, "FR"); // L: 12 - Language_PT = new Language("PT", "pt", "Portuguese", ModeWhere.field3710, 3, "BR"); // L: 13 - Language_NL = new Language("NL", "nl", "Dutch", ModeWhere.field3717, 4, "NL"); // L: 14 - Language_ES = new Language("ES", "es", "Spanish", ModeWhere.field3717, 5, "ES"); // L: 15 - Language_ES_MX = new Language("ES_MX", "es-mx", "Spanish (Latin American)", ModeWhere.field3710, 6, "MX"); // L: 16 - Language[] var0 = new Language[]{Language_DE, Language_NL, Language_FR, Language_ES_MX, Language_EN, Language_PT, Language_ES}; // L: 25 - Language_valuesOrdered = new Language[var0.length]; // L: 28 - Language[] var2 = var0; // L: 30 + Language_EN = new Language("EN", "en", "English", ModeWhere.field3686, 0, "GB"); // L: 10 + Language_DE = new Language("DE", "de", "German", ModeWhere.field3686, 1, "DE"); // L: 11 + Language_FR = new Language("FR", "fr", "French", ModeWhere.field3686, 2, "FR"); // L: 12 + Language_PT = new Language("PT", "pt", "Portuguese", ModeWhere.field3686, 3, "BR"); // L: 13 + Language_NL = new Language("NL", "nl", "Dutch", ModeWhere.field3698, 4, "NL"); // L: 14 + Language_ES = new Language("ES", "es", "Spanish", ModeWhere.field3698, 5, "ES"); // L: 15 + Language_ES_MX = new Language("ES_MX", "es-mx", "Spanish (Latin American)", ModeWhere.field3686, 6, "MX"); // L: 16 + Language[] var0 = method5145(); // L: 23 + Language_valuesOrdered = new Language[var0.length]; // L: 24 + Language[] var1 = var0; // L: 26 - for (int var3 = 0; var3 < var2.length; ++var3) { // L: 31 - Language var4 = var2[var3]; // L: 32 - if (Language_valuesOrdered[var4.id] != null) { // L: 34 - throw new IllegalStateException(); // L: 35 + for (int var2 = 0; var2 < var1.length; ++var2) { // L: 27 + Language var3 = var1[var2]; // L: 28 + if (Language_valuesOrdered[var3.id] != null) { // L: 30 + throw new IllegalStateException(); // L: 31 } - Language_valuesOrdered[var4.id] = var4; // L: 37 + Language_valuesOrdered[var3.id] = var3; // L: 33 } - } // L: 41 + } // L: 37 @ObfuscatedSignature( - descriptor = "(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Lkb;ILjava/lang/String;)V" + descriptor = "(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Lkl;ILjava/lang/String;)V" ) Language(String var1, String var2, String var3, ModeWhere var4, int var5, String var6) { - this.field3701 = var1; // L: 44 - this.language = var2; - this.id = var5; - if (var6 != null) { - new Locale(var2.substring(0, 2), var6); + this.field3680 = var1; // L: 44 + this.language = var2; // L: 45 + this.id = var5; // L: 46 + if (var6 != null) { // L: 47 + new Locale(var2.substring(0, 2), var6); // L: 48 } else { - new Locale(var2.substring(0, 2)); + new Locale(var2.substring(0, 2)); // L: 51 } - } + } // L: 53 - @ObfuscatedName("h") + @ObfuscatedName("v") @ObfuscatedSignature( descriptor = "(I)I", - garbageValue = "-708237537" + garbageValue = "-907662946" ) @Export("rsOrdinal") public int rsOrdinal() { - return this.id; + return this.id; // L: 60 } - @ObfuscatedName("g") + @ObfuscatedName("p") @ObfuscatedSignature( descriptor = "(B)Ljava/lang/String;", - garbageValue = "-65" + garbageValue = "91" ) @Export("getLanguage") String getLanguage() { - return this.language; + return this.language; // L: 56 } public String toString() { - return this.getLanguage().toLowerCase(Locale.ENGLISH); + return this.getLanguage().toLowerCase(Locale.ENGLISH); // L: 69 } - @ObfuscatedName("c") + @ObfuscatedName("y") @ObfuscatedSignature( - descriptor = "(Ljava/lang/CharSequence;B)[B", - garbageValue = "21" + descriptor = "(B)[Lkk;", + garbageValue = "123" ) - public static byte[] method5070(CharSequence var0) { - int var1 = var0.length(); // L: 45 - byte[] var2 = new byte[var1]; // L: 46 + static Language[] method5145() { + return new Language[]{Language_FR, Language_DE, Language_ES_MX, Language_ES, Language_EN, Language_NL, Language_PT}; // L: 40 + } - for (int var3 = 0; var3 < var1; ++var3) { // L: 47 - char var4 = var0.charAt(var3); // L: 48 - if (var4 > 0 && var4 < 128 || var4 >= 160 && var4 <= 255) { // L: 49 - var2[var3] = (byte)var4; - } else if (var4 == 8364) { // L: 50 - var2[var3] = -128; - } else if (var4 == 8218) { // L: 51 - var2[var3] = -126; - } else if (var4 == 402) { // L: 52 - var2[var3] = -125; - } else if (var4 == 8222) { // L: 53 - var2[var3] = -124; - } else if (var4 == 8230) { // L: 54 - var2[var3] = -123; - } else if (var4 == 8224) { // L: 55 - var2[var3] = -122; - } else if (var4 == 8225) { // L: 56 - var2[var3] = -121; - } else if (var4 == 710) { // L: 57 - var2[var3] = -120; - } else if (var4 == 8240) { // L: 58 - var2[var3] = -119; - } else if (var4 == 352) { // L: 59 - var2[var3] = -118; - } else if (var4 == 8249) { // L: 60 - var2[var3] = -117; - } else if (var4 == 338) { // L: 61 - var2[var3] = -116; - } else if (var4 == 381) { // L: 62 - var2[var3] = -114; - } else if (var4 == 8216) { // L: 63 - var2[var3] = -111; - } else if (var4 == 8217) { // L: 64 - var2[var3] = -110; - } else if (var4 == 8220) { // L: 65 - var2[var3] = -109; - } else if (var4 == 8221) { // L: 66 - var2[var3] = -108; - } else if (var4 == 8226) { // L: 67 - var2[var3] = -107; - } else if (var4 == 8211) { // L: 68 - var2[var3] = -106; - } else if (var4 == 8212) { // L: 69 - var2[var3] = -105; - } else if (var4 == 732) { // L: 70 - var2[var3] = -104; - } else if (var4 == 8482) { // L: 71 - var2[var3] = -103; - } else if (var4 == 353) { // L: 72 - var2[var3] = -102; - } else if (var4 == 8250) { // L: 73 - var2[var3] = -101; - } else if (var4 == 339) { // L: 74 - var2[var3] = -100; - } else if (var4 == 382) { // L: 75 - var2[var3] = -98; - } else if (var4 == 376) { // L: 76 - var2[var3] = -97; - } else { - var2[var3] = 63; // L: 77 - } - } - - return var2; // L: 79 + @ObfuscatedName("j") + @ObfuscatedSignature( + descriptor = "(IB)Lkk;", + garbageValue = "-17" + ) + public static Language method5151(int var0) { + return var0 >= 0 && var0 < Language_valuesOrdered.length ? Language_valuesOrdered[var0] : null; // L: 64 65 } } diff --git a/runescape-client/src/main/java/Link.java b/runescape-client/src/main/java/Link.java index c9fe305237..b0aee490a4 100644 --- a/runescape-client/src/main/java/Link.java +++ b/runescape-client/src/main/java/Link.java @@ -3,23 +3,23 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("mg") +@ObfuscatedName("mz") @Implements("Link") public class Link { - @ObfuscatedName("g") + @ObfuscatedName("y") @ObfuscatedSignature( - descriptor = "Lmg;" + descriptor = "Lmz;" ) @Export("previous") public Link previous; - @ObfuscatedName("l") + @ObfuscatedName("p") @ObfuscatedSignature( - descriptor = "Lmg;" + descriptor = "Lmz;" ) @Export("next") public Link next; - @ObfuscatedName("h") + @ObfuscatedName("v") @Export("remove") public void remove() { if (this.next != null) { // L: 8 diff --git a/runescape-client/src/main/java/LinkDeque.java b/runescape-client/src/main/java/LinkDeque.java index 983f49683a..86a46b0cf7 100644 --- a/runescape-client/src/main/java/LinkDeque.java +++ b/runescape-client/src/main/java/LinkDeque.java @@ -3,18 +3,18 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ki") +@ObfuscatedName("km") @Implements("LinkDeque") public class LinkDeque { - @ObfuscatedName("h") + @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "Lmg;" + descriptor = "Lmz;" ) @Export("sentinel") Link sentinel; - @ObfuscatedName("c") + @ObfuscatedName("n") @ObfuscatedSignature( - descriptor = "Lmg;" + descriptor = "Lmz;" ) @Export("current") Link current; @@ -25,9 +25,9 @@ public class LinkDeque { this.sentinel.next = this.sentinel; // L: 11 } // L: 12 - @ObfuscatedName("h") + @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "(Lmg;)V" + descriptor = "(Lmz;)V" ) @Export("addFirst") public void addFirst(Link var1) { @@ -41,9 +41,9 @@ public class LinkDeque { var1.previous.next = var1; // L: 19 } // L: 20 - @ObfuscatedName("c") + @ObfuscatedName("n") @ObfuscatedSignature( - descriptor = "()Lmg;" + descriptor = "()Lmz;" ) @Export("last") public Link last() { @@ -57,9 +57,9 @@ public class LinkDeque { } } - @ObfuscatedName("o") + @ObfuscatedName("f") @ObfuscatedSignature( - descriptor = "()Lmg;" + descriptor = "()Lmz;" ) @Export("previous") public Link previous() { diff --git a/runescape-client/src/main/java/Login.java b/runescape-client/src/main/java/Login.java index 9252db7562..588b4c6a6a 100644 --- a/runescape-client/src/main/java/Login.java +++ b/runescape-client/src/main/java/Login.java @@ -1,157 +1,150 @@ import java.text.DecimalFormat; -import java.util.Iterator; 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("cc") +@ObfuscatedName("ct") @Implements("Login") public class Login { - @ObfuscatedName("c") + @ObfuscatedName("n") @Export("clearLoginScreen") static boolean clearLoginScreen; - @ObfuscatedName("o") + @ObfuscatedName("f") @ObfuscatedGetter( - intValue = -2110313631 + intValue = 751544539 ) @Export("xPadding") static int xPadding; - @ObfuscatedName("g") + @ObfuscatedName("y") @ObfuscatedSignature( - descriptor = "[Lof;" + descriptor = "[Lop;" ) @Export("runesSprite") static IndexedSprite[] runesSprite; - @ObfuscatedName("z") + @ObfuscatedName("j") @ObfuscatedSignature( - descriptor = "Lof;" + descriptor = "Lop;" ) @Export("titlebuttonSprite") static IndexedSprite titlebuttonSprite; - @ObfuscatedName("m") + @ObfuscatedName("r") + @ObfuscatedSignature( + descriptor = "Loh;" + ) + @Export("leftTitleSprite") + static SpritePixels leftTitleSprite; + @ObfuscatedName("x") @ObfuscatedGetter( - intValue = 1247885701 + intValue = 2130552221 ) @Export("loginBoxX") static int loginBoxX; - @ObfuscatedName("f") + @ObfuscatedName("w") @ObfuscatedGetter( - intValue = 475750009 + intValue = -564105319 ) @Export("Login_loadingPercent") static int Login_loadingPercent; - @ObfuscatedName("s") + @ObfuscatedName("t") @Export("Login_loadingText") static String Login_loadingText; + @ObfuscatedName("al") + @ObfuscatedGetter( + intValue = -162991545 + ) + static int field1032; + @ObfuscatedName("ar") + @ObfuscatedGetter( + intValue = -519325819 + ) + static int field1039; @ObfuscatedName("aj") @ObfuscatedGetter( - intValue = 1828335141 - ) - static int field996; - @ObfuscatedName("av") - @ObfuscatedGetter( - intValue = 2142505193 - ) - static int field997; - @ObfuscatedName("ax") - @ObfuscatedGetter( - intValue = 820410415 + intValue = -677995589 ) @Export("loginIndex") static int loginIndex; - @ObfuscatedName("ak") + @ObfuscatedName("am") @Export("Login_response0") static String Login_response0; - @ObfuscatedName("ay") + @ObfuscatedName("az") @Export("Login_response1") static String Login_response1; - @ObfuscatedName("ai") + @ObfuscatedName("av") @Export("Login_response2") static String Login_response2; - @ObfuscatedName("aa") + @ObfuscatedName("ac") @Export("Login_response3") static String Login_response3; - @ObfuscatedName("au") + @ObfuscatedName("at") @Export("Login_username") static String Login_username; - @ObfuscatedName("as") + @ObfuscatedName("ah") @Export("Login_password") static String Login_password; - @ObfuscatedName("ah") - static boolean field1006; - @ObfuscatedName("af") - static boolean field1007; - @ObfuscatedName("bw") - static boolean field1008; - @ObfuscatedName("bf") + @ObfuscatedName("aa") + static boolean field1041; + @ObfuscatedName("au") + static boolean field1047; + @ObfuscatedName("bt") + static boolean field1043; + @ObfuscatedName("bq") @ObfuscatedGetter( - intValue = 1174698339 + intValue = -1482820819 ) @Export("currentLoginField") static int currentLoginField; - @ObfuscatedName("bt") + @ObfuscatedName("bm") @Export("worldSelectOpen") static boolean worldSelectOpen; - @ObfuscatedName("by") - @ObfuscatedSignature( - descriptor = "[Low;" - ) - @Export("worldSelectBackSprites") - static SpritePixels[] worldSelectBackSprites; - @ObfuscatedName("br") - @ObfuscatedSignature( - descriptor = "[Lof;" - ) - @Export("worldSelectArrows") - static IndexedSprite[] worldSelectArrows; - @ObfuscatedName("bi") + @ObfuscatedName("bj") @ObfuscatedGetter( - intValue = 1751069647 + intValue = 1383104493 ) @Export("hoveredWorldIndex") static int hoveredWorldIndex; - @ObfuscatedName("bp") + @ObfuscatedName("bx") @ObfuscatedGetter( - intValue = 1245392413 + intValue = -1580902995 ) @Export("worldSelectPage") static int worldSelectPage; - @ObfuscatedName("bj") + @ObfuscatedName("bp") @ObfuscatedGetter( - intValue = 1101245239 + intValue = -386301875 ) @Export("worldSelectPagesCount") static int worldSelectPagesCount; - @ObfuscatedName("bs") + @ObfuscatedName("bo") @ObfuscatedGetter( - longValue = -1907057503222812431L + longValue = -6552387078387254053L ) - static long field1001; - @ObfuscatedName("bx") + static long field1050; + @ObfuscatedName("bw") @ObfuscatedGetter( - longValue = 8210570863350662601L + longValue = 6302773758436356871L ) - static long field1019; + static long field1022; static { xPadding = 0; // L: 38 loginBoxX = xPadding + 202; // L: 55 Login_loadingPercent = 10; // L: 57 Login_loadingText = ""; // L: 58 - field996 = -1; // L: 65 - field997 = 1; // L: 68 - loginIndex = 0; // L: 72 - Login_response0 = ""; // L: 73 - Login_response1 = ""; // L: 74 - Login_response2 = ""; // L: 75 + field1032 = -1; // L: 65 + field1039 = 1; // L: 68 + loginIndex = 0; + Login_response0 = ""; + Login_response1 = ""; + Login_response2 = ""; Login_response3 = ""; // L: 76 Login_username = ""; // L: 77 Login_password = ""; // L: 78 - field1006 = false; // L: 85 - field1007 = false; // L: 86 - field1008 = true; // L: 89 + field1041 = false; // L: 85 + field1047 = false; // L: 86 + field1043 = true; // L: 89 currentLoginField = 0; // L: 90 worldSelectOpen = false; // L: 94 hoveredWorldIndex = -1; // L: 102 @@ -159,59 +152,91 @@ public class Login { worldSelectPagesCount = 0; // L: 104 new DecimalFormat("##0.00"); // L: 107 new class124(); - field1001 = -1L; // L: 115 - field1019 = -1L; // L: 116 + field1050 = -1L; // L: 115 + field1022 = -1L; // L: 116 } - @ObfuscatedName("q") + @ObfuscatedName("n") @ObfuscatedSignature( - descriptor = "(I)Ljava/lang/String;", - garbageValue = "629530002" + descriptor = "(III)V", + garbageValue = "-179599940" ) - static String method1986() { - String var0 = ""; // L: 80 - - Message var2; - for (Iterator var1 = Messages.Messages_hashTable.iterator(); var1.hasNext(); var0 = var0 + var2.sender + ':' + var2.text + '\n') { // L: 81 84 - var2 = (Message)var1.next(); // L: 82 - } - - return var0; // L: 87 - } - - @ObfuscatedName("jt") - @ObfuscatedSignature( - descriptor = "([Liv;IIIZI)V", - garbageValue = "-2026225464" - ) - @Export("resizeInterface") - static void resizeInterface(Widget[] var0, int var1, int var2, int var3, boolean var4) { - for (int var5 = 0; var5 < var0.length; ++var5) { // L: 10056 - Widget var6 = var0[var5]; // L: 10057 - if (var6 != null && var6.parentId == var1) { // L: 10058 10059 - class17.alignWidgetSize(var6, var2, var3, var4); // L: 10060 - UserComparator3.alignWidgetPosition(var6, var2, var3); // L: 10061 - if (var6.scrollX > var6.scrollWidth - var6.width) { // L: 10062 - var6.scrollX = var6.scrollWidth - var6.width; - } - - if (var6.scrollX < 0) { // L: 10063 - var6.scrollX = 0; - } - - if (var6.scrollY > var6.scrollHeight - var6.height) { // L: 10064 - var6.scrollY = var6.scrollHeight - var6.height; - } - - if (var6.scrollY < 0) { // L: 10065 - var6.scrollY = 0; - } - - if (var6.type == 0) { // L: 10066 - ApproximateRouteStrategy.revalidateWidgetScroll(var0, var6, var4); - } + public static void method1951(int var0, int var1) { + VarbitComposition var3 = (VarbitComposition)VarbitComposition.VarbitDefinition_cached.get((long)var0); // L: 35 + VarbitComposition var2; + if (var3 != null) { // L: 36 + var2 = var3; // L: 37 + } else { + byte[] var4 = VarbitComposition.VarbitDefinition_archive.takeFile(14, var0); // L: 40 + var3 = new VarbitComposition(); // L: 41 + if (var4 != null) { // L: 42 + var3.decode(new Buffer(var4)); } + + VarbitComposition.VarbitDefinition_cached.put(var3, (long)var0); // L: 43 + var2 = var3; // L: 44 } - } // L: 10068 + int var8 = var2.baseVar; // L: 47 + int var5 = var2.startBit; // L: 48 + int var6 = var2.endBit; // L: 49 + int var7 = Varps.Varps_masks[var6 - var5]; // L: 50 + if (var1 < 0 || var1 > var7) { // L: 51 + var1 = 0; + } + + var7 <<= var5; // L: 52 + Varps.Varps_main[var8] = Varps.Varps_main[var8] & ~var7 | var1 << var5 & var7; // L: 53 + } // L: 54 + + @ObfuscatedName("j") + @ObfuscatedSignature( + descriptor = "(IB)V", + garbageValue = "0" + ) + static void method1941(int var0) { + ItemContainer var1 = (ItemContainer)ItemContainer.itemContainers.get((long)var0); // L: 72 + if (var1 != null) { + var1.remove(); // L: 74 + } + } // L: 73 75 + + @ObfuscatedName("u") + @ObfuscatedSignature( + descriptor = "(CI)Z", + garbageValue = "1338737271" + ) + @Export("isAlphaNumeric") + public static boolean isAlphaNumeric(char var0) { + return var0 >= '0' && var0 <= '9' || var0 >= 'A' && var0 <= 'Z' || var0 >= 'a' && var0 <= 'z'; // L: 142 + } + + @ObfuscatedName("ao") + @ObfuscatedSignature( + descriptor = "(ILcf;ZI)I", + garbageValue = "-1087727229" + ) + static int method1937(int var0, Script var1, boolean var2) { + if (var0 == 6900) { // L: 4205 + ++Interpreter.Interpreter_stringStackSize; // L: 4206 + return 1; // L: 4207 + } else if (var0 == 6950) { // L: 4209 + ++class44.Interpreter_intStackSize; // L: 4210 + return 1; // L: 4211 + } else { + return 2; // L: 4213 + } + } + + @ObfuscatedName("jm") + @ObfuscatedSignature( + descriptor = "(III)V", + garbageValue = "684555967" + ) + @Export("runIntfCloseListeners") + static final void runIntfCloseListeners(int var0, int var1) { + if (Clock.loadInterface(var0)) { // L: 10659 + ReflectionCheck.runComponentCloseListeners(Widget.Widget_interfaceComponents[var0], var1); // L: 10660 + } + } // L: 10661 } diff --git a/runescape-client/src/main/java/LoginPacket.java b/runescape-client/src/main/java/LoginPacket.java index 41ad5b0307..3186ed7b66 100644 --- a/runescape-client/src/main/java/LoginPacket.java +++ b/runescape-client/src/main/java/LoginPacket.java @@ -4,73 +4,68 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("hk") +@ObfuscatedName("hv") @Implements("LoginPacket") public class LoginPacket implements class223 { - @ObfuscatedName("h") - @ObfuscatedSignature( - descriptor = "Lhk;" - ) - public static final LoginPacket field2803; - @ObfuscatedName("c") - @ObfuscatedSignature( - descriptor = "Lhk;" - ) - static final LoginPacket field2804; - @ObfuscatedName("o") - @ObfuscatedSignature( - descriptor = "Lhk;" - ) - public static final LoginPacket field2798; - @ObfuscatedName("g") - @ObfuscatedSignature( - descriptor = "Lhk;" - ) - public static final LoginPacket field2799; - @ObfuscatedName("l") - @ObfuscatedSignature( - descriptor = "Lhk;" - ) - public static final LoginPacket field2800; - @ObfuscatedName("z") - @ObfuscatedSignature( - descriptor = "Lhk;" - ) - static final LoginPacket field2801; @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "[Lhk;" + descriptor = "Lhv;" + ) + public static final LoginPacket field2806; + @ObfuscatedName("n") + @ObfuscatedSignature( + descriptor = "Lhv;" + ) + static final LoginPacket field2800; + @ObfuscatedName("f") + @ObfuscatedSignature( + descriptor = "Lhv;" + ) + public static final LoginPacket field2802; + @ObfuscatedName("y") + @ObfuscatedSignature( + descriptor = "Lhv;" + ) + public static final LoginPacket field2799; + @ObfuscatedName("p") + @ObfuscatedSignature( + descriptor = "Lhv;" + ) + public static final LoginPacket field2803; + @ObfuscatedName("j") + @ObfuscatedSignature( + descriptor = "Lhv;" + ) + static final LoginPacket field2804; + @ObfuscatedName("b") + @ObfuscatedSignature( + descriptor = "[Lhv;" ) @Export("LoginPacket_indexedValues") static final LoginPacket[] LoginPacket_indexedValues; - @ObfuscatedName("b") + @ObfuscatedName("r") @ObfuscatedGetter( - intValue = 295659423 - ) - @Export("musicTrackVolume") - static int musicTrackVolume; - @ObfuscatedName("t") - @ObfuscatedGetter( - intValue = 1672297033 + intValue = -2104818809 ) @Export("id") public final int id; static { - field2803 = new LoginPacket(14, 0); // L: 5 - field2804 = new LoginPacket(15, 4); // L: 6 - field2798 = new LoginPacket(16, -2); // L: 7 + field2806 = new LoginPacket(14, 0); // L: 5 + field2800 = new LoginPacket(15, 4); // L: 6 + field2802 = new LoginPacket(16, -2); // L: 7 field2799 = new LoginPacket(18, -2); // L: 8 - field2800 = new LoginPacket(19, -2); // L: 9 - field2801 = new LoginPacket(27, 0); // L: 10 + field2803 = new LoginPacket(19, -2); // L: 9 + field2804 = new LoginPacket(27, 0); // L: 10 LoginPacket_indexedValues = new LoginPacket[32]; // L: 12 - LoginPacket[] var0 = NPC.method2253(); // L: 15 + LoginPacket[] var0 = new LoginPacket[]{field2804, field2806, field2803, field2799, field2800, field2802}; // L: 17 + LoginPacket[] var1 = var0; // L: 19 - for (int var1 = 0; var1 < var0.length; ++var1) { // L: 16 - LoginPacket_indexedValues[var0[var1].id] = var0[var1]; // L: 17 + for (int var2 = 0; var2 < var1.length; ++var2) { // L: 20 + LoginPacket_indexedValues[var1[var2].id] = var1[var2]; // L: 21 } - } // L: 19 + } // L: 23 @ObfuscatedSignature( descriptor = "(II)V", @@ -80,36 +75,14 @@ public class LoginPacket implements class223 { this.id = var1; // L: 26 } // L: 27 - @ObfuscatedName("q") + @ObfuscatedName("kh") @ObfuscatedSignature( - descriptor = "(Liv;IIIS)V", - garbageValue = "-15678" + descriptor = "(II)V", + garbageValue = "-1030853503" ) - @Export("Widget_setKeyRate") - static final void Widget_setKeyRate(Widget var0, int var1, int var2, int var3) { - if (var0.field3070 == null) { // L: 988 - throw new RuntimeException(); // L: 989 - } else { - var0.field3070[var1] = var2; // L: 991 - var0.field3090[var1] = var3; // L: 992 - } - } // L: 993 - - @ObfuscatedName("ia") - @ObfuscatedSignature( - descriptor = "(II)Z", - garbageValue = "-1188700312" - ) - static final boolean method4319(int var0) { - if (var0 < 0) { // L: 8057 - return false; - } else { - int var1 = Client.menuOpcodes[var0]; // L: 8058 - if (var1 >= 2000) { // L: 8059 - var1 -= 2000; - } - - return var1 == 1007; // L: 8060 - } - } + static final void method4373(int var0) { + var0 = Math.min(Math.max(var0, 0), 127); // L: 10926 + ObjectComposition.clientPreferences.areaSoundEffectsVolume = var0; // L: 10927 + TileItem.savePreferences(); // L: 10928 + } // L: 10929 } diff --git a/runescape-client/src/main/java/LoginScreenAnimation.java b/runescape-client/src/main/java/LoginScreenAnimation.java index b86ce9de56..d7f6afc996 100644 --- a/runescape-client/src/main/java/LoginScreenAnimation.java +++ b/runescape-client/src/main/java/LoginScreenAnimation.java @@ -1,211 +1,212 @@ +import java.awt.Component; 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("cb") +@ObfuscatedName("ca") @Implements("LoginScreenAnimation") public class LoginScreenAnimation { - @ObfuscatedName("h") + @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "[Lof;" + descriptor = "[Lop;" ) @Export("sprites") IndexedSprite[] sprites; - @ObfuscatedName("t") - int[] field1281; - @ObfuscatedName("v") - @ObfuscatedGetter( - intValue = 741566833 - ) - int field1291; - @ObfuscatedName("b") - int[] field1288; - @ObfuscatedName("q") - int[] field1284; - @ObfuscatedName("i") - int[] field1285; - @ObfuscatedName("x") - int[] field1286; - @ObfuscatedName("k") - @ObfuscatedGetter( - intValue = 1396163051 - ) - int field1287; @ObfuscatedName("r") + int[] field1308; + @ObfuscatedName("b") @ObfuscatedGetter( - intValue = 906725841 + intValue = 1934818705 ) - int field1292; - @ObfuscatedName("p") - int[] field1276; - @ObfuscatedName("a") - int[] field1289; - @ObfuscatedName("e") - int[] field1282; + int field1309; @ObfuscatedName("d") - int[] field1290; + int[] field1310; + @ObfuscatedName("s") + int[] field1311; @ObfuscatedName("u") + int[] field1304; + @ObfuscatedName("l") + int[] field1315; + @ObfuscatedName("o") @ObfuscatedGetter( - intValue = -1651028079 + intValue = 1784020073 ) - int field1283; + int field1318; + @ObfuscatedName("c") + @ObfuscatedGetter( + intValue = -962717377 + ) + int field1313; + @ObfuscatedName("e") + int[] field1316; + @ObfuscatedName("g") + int[] field1317; + @ObfuscatedName("a") + int[] field1319; + @ObfuscatedName("k") + int[] field1312; @ObfuscatedName("m") @ObfuscatedGetter( - intValue = -610053833 + intValue = 348893403 ) - int field1294; - @ObfuscatedName("j") + int field1320; + @ObfuscatedName("x") @ObfuscatedGetter( - intValue = 1434372763 + intValue = -1953512307 ) - int field1295; + int field1321; + @ObfuscatedName("z") + @ObfuscatedGetter( + intValue = -453028953 + ) + int field1322; @ObfuscatedSignature( - descriptor = "([Lof;)V" + descriptor = "([Lop;)V" ) LoginScreenAnimation(IndexedSprite[] var1) { - this.field1281 = new int[256]; // L: 13 - this.field1291 = 0; // L: 14 - this.field1287 = 0; // L: 19 - this.field1292 = 0; // L: 20 - this.field1283 = 0; // L: 25 - this.field1294 = 0; // L: 26 - this.field1295 = 0; // L: 27 - this.sprites = var1; // L: 30 - this.initColors(); // L: 31 - } // L: 32 + this.field1308 = new int[256]; // L: 13 + this.field1309 = 0; // L: 14 + this.field1318 = 0; // L: 19 + this.field1313 = 0; // L: 20 + this.field1320 = 0; // L: 25 + this.field1321 = 0; // L: 26 + this.field1322 = 0; // L: 27 + this.sprites = var1; + this.initColors(); + } - @ObfuscatedName("h") + @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "-2114989388" + descriptor = "(B)V", + garbageValue = "41" ) @Export("initColors") void initColors() { - this.field1284 = new int[256]; // L: 35 + this.field1311 = new int[256]; int var1; - for (var1 = 0; var1 < 64; ++var1) { // L: 36 - this.field1284[var1] = var1 * 262144; + for (var1 = 0; var1 < 64; ++var1) { + this.field1311[var1] = var1 * 262144; } - for (var1 = 0; var1 < 64; ++var1) { // L: 37 - this.field1284[var1 + 64] = var1 * 1024 + 16711680; + for (var1 = 0; var1 < 64; ++var1) { + this.field1311[var1 + 64] = var1 * 1024 + 16711680; } - for (var1 = 0; var1 < 64; ++var1) { // L: 38 - this.field1284[var1 + 128] = var1 * 4 + 16776960; + for (var1 = 0; var1 < 64; ++var1) { + this.field1311[var1 + 128] = var1 * 4 + 16776960; } - for (var1 = 0; var1 < 64; ++var1) { // L: 39 - this.field1284[var1 + 192] = 16777215; + for (var1 = 0; var1 < 64; ++var1) { + this.field1311[var1 + 192] = 16777215; } - this.field1285 = new int[256]; // L: 40 + this.field1304 = new int[256]; - for (var1 = 0; var1 < 64; ++var1) { // L: 41 - this.field1285[var1] = var1 * 1024; + for (var1 = 0; var1 < 64; ++var1) { + this.field1304[var1] = var1 * 1024; } - for (var1 = 0; var1 < 64; ++var1) { // L: 42 - this.field1285[var1 + 64] = var1 * 4 + 65280; + for (var1 = 0; var1 < 64; ++var1) { + this.field1304[var1 + 64] = var1 * 4 + 65280; } for (var1 = 0; var1 < 64; ++var1) { // L: 43 - this.field1285[var1 + 128] = var1 * 262144 + 65535; + this.field1304[var1 + 128] = var1 * 262144 + 65535; } for (var1 = 0; var1 < 64; ++var1) { // L: 44 - this.field1285[var1 + 192] = 16777215; + this.field1304[var1 + 192] = 16777215; } - this.field1286 = new int[256]; // L: 45 + this.field1315 = new int[256]; // L: 45 for (var1 = 0; var1 < 64; ++var1) { // L: 46 - this.field1286[var1] = var1 * 4; + this.field1315[var1] = var1 * 4; } for (var1 = 0; var1 < 64; ++var1) { // L: 47 - this.field1286[var1 + 64] = var1 * 262144 + 255; + this.field1315[var1 + 64] = var1 * 262144 + 255; } for (var1 = 0; var1 < 64; ++var1) { // L: 48 - this.field1286[var1 + 128] = var1 * 1024 + 16711935; + this.field1315[var1 + 128] = var1 * 1024 + 16711935; } for (var1 = 0; var1 < 64; ++var1) { // L: 49 - this.field1286[var1 + 192] = 16777215; + this.field1315[var1 + 192] = 16777215; } - this.field1288 = new int[256]; // L: 50 - this.field1283 = 0; // L: 51 - this.field1282 = new int[32768]; // L: 52 - this.field1290 = new int[32768]; // L: 53 - this.method2218((IndexedSprite)null); // L: 54 - this.field1276 = new int[32768]; // L: 55 - this.field1289 = new int[32768]; // L: 56 + this.field1310 = new int[256]; // L: 50 + this.field1320 = 0; // L: 51 + this.field1319 = new int[32768]; // L: 52 + this.field1312 = new int[32768]; // L: 53 + this.method2232((IndexedSprite)null); // L: 54 + this.field1316 = new int[32768]; // L: 55 + this.field1317 = new int[32768]; // L: 56 } // L: 57 - @ObfuscatedName("c") + @ObfuscatedName("n") @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "16711680" + descriptor = "(S)V", + garbageValue = "7298" ) - void method2207() { - this.field1284 = null; // L: 60 - this.field1285 = null; // L: 61 - this.field1286 = null; // L: 62 - this.field1288 = null; // L: 63 - this.field1282 = null; // L: 64 - this.field1290 = null; // L: 65 - this.field1276 = null; // L: 66 - this.field1289 = null; // L: 67 - this.field1283 = 0; // L: 68 - this.field1294 = 0; // L: 69 + void method2202() { + this.field1311 = null; // L: 60 + this.field1304 = null; // L: 61 + this.field1315 = null; // L: 62 + this.field1310 = null; // L: 63 + this.field1319 = null; // L: 64 + this.field1312 = null; // L: 65 + this.field1316 = null; // L: 66 + this.field1317 = null; // L: 67 + this.field1320 = 0; // L: 68 + this.field1321 = 0; // L: 69 } // L: 70 - @ObfuscatedName("o") + @ObfuscatedName("f") @ObfuscatedSignature( - descriptor = "(IIB)V", - garbageValue = "91" + descriptor = "(III)V", + garbageValue = "-2082612852" ) @Export("draw") void draw(int var1, int var2) { - if (this.field1276 == null) { // L: 73 + if (this.field1316 == null) { // L: 73 this.initColors(); // L: 74 } - if (this.field1295 == 0) { // L: 76 - this.field1295 = var2; // L: 77 + if (this.field1322 == 0) { // L: 76 + this.field1322 = var2; // L: 77 } - int var3 = var2 - this.field1295; // L: 79 + int var3 = var2 - this.field1322; // L: 79 if (var3 >= 256) { // L: 80 var3 = 0; } - this.field1295 = var2; // L: 81 + this.field1322 = var2; // L: 81 if (var3 > 0) { // L: 82 - this.method2209(var3); // L: 83 + this.method2204(var3); // L: 83 } - this.method2211(var1); // L: 85 + this.method2206(var1); // L: 85 } // L: 86 - @ObfuscatedName("g") + @ObfuscatedName("y") @ObfuscatedSignature( - descriptor = "(II)V", - garbageValue = "-1781173943" + descriptor = "(IS)V", + garbageValue = "12943" ) - final void method2209(int var1) { - this.field1283 += 128 * var1; // L: 89 + final void method2204(int var1) { + this.field1320 += 128 * var1; // L: 89 int var2; - if (this.field1283 > this.field1282.length) { // L: 90 - this.field1283 -= this.field1282.length; // L: 91 + if (this.field1320 > this.field1319.length) { // L: 90 + this.field1320 -= this.field1319.length; // L: 91 var2 = (int)(Math.random() * 12.0D); // L: 92 - this.method2218(this.sprites[var2]); // L: 93 + this.method2232(this.sprites[var2]); // L: 93 } var2 = 0; // L: 95 @@ -214,12 +215,12 @@ public class LoginScreenAnimation { int var6; for (int var5 = 0; var5 < var4; ++var5) { // L: 98 - var6 = this.field1276[var2 + var3] - this.field1282[var2 + this.field1283 & this.field1282.length - 1] * var1 / 6; // L: 99 + var6 = this.field1316[var2 + var3] - this.field1319[var2 + this.field1320 & this.field1319.length - 1] * var1 / 6; // L: 99 if (var6 < 0) { // L: 100 var6 = 0; } - this.field1276[var2++] = var6; // L: 101 + this.field1316[var2++] = var6; // L: 101 } byte var15 = 10; // L: 103 @@ -233,42 +234,42 @@ public class LoginScreenAnimation { for (int var9 = 0; var9 < 128; ++var9) { // L: 107 var10 = (int)(Math.random() * 100.0D); // L: 108 if (var10 < 50 && var9 > var15 && var9 < var6) { // L: 109 - this.field1276[var8 + var9] = 255; + this.field1316[var8 + var9] = 255; } else { - this.field1276[var8 + var9] = 0; // L: 110 + this.field1316[var9 + var8] = 0; // L: 110 } } } - if (this.field1287 > 0) { // L: 113 - this.field1287 -= var1 * 4; + if (this.field1318 > 0) { // L: 113 + this.field1318 -= var1 * 4; } - if (this.field1292 > 0) { // L: 114 - this.field1292 -= var1 * 4; + if (this.field1313 > 0) { // L: 114 + this.field1313 -= var1 * 4; } - if (this.field1287 == 0 && this.field1292 == 0) { // L: 115 + if (this.field1318 == 0 && this.field1313 == 0) { // L: 115 var7 = (int)(Math.random() * (double)(2000 / var1)); // L: 116 if (var7 == 0) { // L: 117 - this.field1287 = 1024; + this.field1318 = 1024; } if (var7 == 1) { // L: 118 - this.field1292 = 1024; + this.field1313 = 1024; } } for (var7 = 0; var7 < 256 - var1; ++var7) { // L: 120 - this.field1281[var7] = this.field1281[var7 + var1]; + this.field1308[var7] = this.field1308[var7 + var1]; } for (var7 = 256 - var1; var7 < 256; ++var7) { // L: 121 - this.field1281[var7] = (int)(Math.sin((double)this.field1291 / 14.0D) * 16.0D + Math.sin((double)this.field1291 / 15.0D) * 14.0D + Math.sin((double)this.field1291 / 16.0D) * 12.0D); // L: 122 - ++this.field1291; // L: 123 + this.field1308[var7] = (int)(Math.sin((double)this.field1309 / 14.0D) * 16.0D + Math.sin((double)this.field1309 / 15.0D) * 14.0D + Math.sin((double)this.field1309 / 16.0D) * 12.0D); // L: 122 + ++this.field1309; // L: 123 } - this.field1294 += var1; // L: 125 + this.field1321 += var1; // L: 125 var7 = ((Client.cycle & 1) + var1) / 2; // L: 126 if (var7 > 0) { // L: 127 short var16 = 128; // L: 128 @@ -278,13 +279,13 @@ public class LoginScreenAnimation { int var11; int var12; int var13; - for (var11 = 0; var11 < this.field1294 * 100; ++var11) { // L: 131 + for (var11 = 0; var11 < this.field1321 * 100; ++var11) { // L: 131 var12 = (int)(Math.random() * (double)var10) + var17; // L: 132 var13 = (int)(Math.random() * (double)var16) + var16; // L: 133 - this.field1276[var12 + (var13 << 7)] = 192; // L: 134 + this.field1316[var12 + (var13 << 7)] = 192; // L: 134 } - this.field1294 = 0; // L: 136 + this.field1321 = 0; // L: 136 int var14; for (var11 = 0; var11 < 256; ++var11) { // L: 137 @@ -292,16 +293,16 @@ public class LoginScreenAnimation { var13 = var11 * 128; // L: 139 for (var14 = -var7; var14 < 128; ++var14) { // L: 140 - if (var7 + var14 < 128) { // L: 141 - var12 += this.field1276[var7 + var13 + var14]; + if (var14 + var7 < 128) { // L: 141 + var12 += this.field1316[var7 + var13 + var14]; } if (var14 - (var7 + 1) >= 0) { // L: 142 - var12 -= this.field1276[var13 + var14 - (var7 + 1)]; + var12 -= this.field1316[var13 + var14 - (var7 + 1)]; } if (var14 >= 0) { // L: 143 - this.field1289[var14 + var13] = var12 / (var7 * 2 + 1); + this.field1317[var13 + var14] = var12 / (var7 * 2 + 1); } } } @@ -311,16 +312,16 @@ public class LoginScreenAnimation { for (var13 = -var7; var13 < 256; ++var13) { // L: 148 var14 = var13 * 128; // L: 149 - if (var13 + var7 < 256) { // L: 150 - var12 += this.field1289[var7 * 128 + var11 + var14]; + if (var7 + var13 < 256) { + var12 += this.field1317[var7 * 128 + var14 + var11]; } - if (var13 - (var7 + 1) >= 0) { // L: 151 - var12 -= this.field1289[var11 + var14 - (var7 + 1) * 128]; + if (var13 - (var7 + 1) >= 0) { + var12 -= this.field1317[var11 + var14 - (var7 + 1) * 128]; } - if (var13 >= 0) { // L: 152 - this.field1276[var11 + var14] = var12 / (var7 * 2 + 1); + if (var13 >= 0) { + this.field1316[var14 + var11] = var12 / (var7 * 2 + 1); } } } @@ -328,90 +329,90 @@ public class LoginScreenAnimation { } // L: 156 - @ObfuscatedName("l") + @ObfuscatedName("p") @ObfuscatedSignature( - descriptor = "(IIII)I", - garbageValue = "-1814586002" + descriptor = "(IIIB)I", + garbageValue = "-67" ) - final int method2210(int var1, int var2, int var3) { + final int method2205(int var1, int var2, int var3) { int var4 = 256 - var3; // L: 159 - return (var4 * (var1 & 16711935) + var3 * (var2 & 16711935) & -16711936) + (var3 * (var2 & 65280) + var4 * (var1 & 65280) & 16711680) >> 8; // L: 160 + return (var3 * (var2 & 65280) + var4 * (var1 & 65280) & 16711680) + (var3 * (var2 & 16711935) + var4 * (var1 & 16711935) & -16711936) >> 8; // L: 160 } - @ObfuscatedName("z") + @ObfuscatedName("j") @ObfuscatedSignature( descriptor = "(II)V", - garbageValue = "-809072308" + garbageValue = "2071342179" ) - final void method2211(int var1) { - int var2 = this.field1288.length; // L: 164 - if (this.field1287 > 0) { // L: 165 - this.method2212(this.field1287, this.field1285); // L: 166 - } else if (this.field1292 > 0) { // L: 168 - this.method2212(this.field1292, this.field1286); // L: 169 + final void method2206(int var1) { + int var2 = this.field1310.length; // L: 164 + if (this.field1318 > 0) { // L: 165 + this.method2201(this.field1318, this.field1304); // L: 166 + } else if (this.field1313 > 0) { // L: 168 + this.method2201(this.field1313, this.field1315); // L: 169 } else { for (int var3 = 0; var3 < var2; ++var3) { // L: 172 - this.field1288[var3] = this.field1284[var3]; + this.field1310[var3] = this.field1311[var3]; } } - this.method2213(var1); // L: 174 + this.method2208(var1); // L: 174 } // L: 175 - @ObfuscatedName("t") + @ObfuscatedName("r") @ObfuscatedSignature( descriptor = "(I[II)V", - garbageValue = "1544752849" + garbageValue = "889214650" ) - final void method2212(int var1, int[] var2) { - int var3 = this.field1288.length; + final void method2201(int var1, int[] var2) { + int var3 = this.field1310.length; // L: 178 - for (int var4 = 0; var4 < var3; ++var4) { - if (var1 > 768) { - this.field1288[var4] = this.method2210(this.field1284[var4], var2[var4], 1024 - var1); + for (int var4 = 0; var4 < var3; ++var4) { // L: 179 + if (var1 > 768) { // L: 180 + this.field1310[var4] = this.method2205(this.field1311[var4], var2[var4], 1024 - var1); } else if (var1 > 256) { - this.field1288[var4] = var2[var4]; + this.field1310[var4] = var2[var4]; // L: 181 } else { - this.field1288[var4] = this.method2210(var2[var4], this.field1284[var4], 256 - var1); + this.field1310[var4] = this.method2205(var2[var4], this.field1311[var4], 256 - var1); // L: 182 } } - } + } // L: 184 - @ObfuscatedName("v") + @ObfuscatedName("b") @ObfuscatedSignature( descriptor = "(II)V", - garbageValue = "1976947254" + garbageValue = "366284227" ) - final void method2213(int var1) { - int var2 = 0; + final void method2208(int var1) { + int var2 = 0; // L: 187 for (int var3 = 1; var3 < 255; ++var3) { // L: 188 - int var4 = (256 - var3) * this.field1281[var3] / 256; // L: 189 + int var4 = (256 - var3) * this.field1308[var3] / 256; // L: 189 int var5 = var4 + var1; // L: 190 - int var6 = 0; - int var7 = 128; - if (var5 < 0) { - var6 = -var5; + int var6 = 0; // L: 191 + int var7 = 128; // L: 192 + if (var5 < 0) { // L: 193 + var6 = -var5; // L: 194 var5 = 0; // L: 195 } - if (var5 + 128 >= WorldMapDecorationType.rasterProvider.width) { // L: 197 - var7 = WorldMapDecorationType.rasterProvider.width - var5; // L: 198 + if (var5 + 128 >= class26.rasterProvider.width) { // L: 197 + var7 = class26.rasterProvider.width - var5; // L: 198 } - int var8 = var5 + (var3 + 8) * WorldMapDecorationType.rasterProvider.width; // L: 200 + int var8 = var5 + (var3 + 8) * class26.rasterProvider.width; // L: 200 var2 += var6; // L: 201 for (int var9 = var6; var9 < var7; ++var9) { // L: 202 - int var10 = this.field1276[var2++]; // L: 203 + int var10 = this.field1316[var2++]; // L: 203 int var11 = var8 % Rasterizer2D.Rasterizer2D_width; // L: 204 if (var10 != 0 && var11 >= Rasterizer2D.Rasterizer2D_xClipStart && var11 < Rasterizer2D.Rasterizer2D_xClipEnd) { // L: 205 int var12 = var10; // L: 206 int var13 = 256 - var10; // L: 207 - var10 = this.field1288[var10]; // L: 208 - int var14 = WorldMapDecorationType.rasterProvider.pixels[var8]; // L: 209 - WorldMapDecorationType.rasterProvider.pixels[var8++] = -16777216 | ((var10 & 16711935) * var12 + (var14 & 16711935) * var13 & -16711936) + (var12 * (var10 & 65280) + var13 * (var14 & 65280) & 16711680) >> 8; // L: 210 + var10 = this.field1310[var10]; // L: 208 + int var14 = class26.rasterProvider.pixels[var8]; // L: 209 + class26.rasterProvider.pixels[var8++] = -16777216 | ((var14 & 16711935) * var13 + (var10 & 16711935) * var12 & -16711936) + (var12 * (var10 & 65280) + var13 * (var14 & 65280) & 16711680) >> 8; // L: 210 } else { ++var8; // L: 212 } @@ -422,21 +423,21 @@ public class LoginScreenAnimation { } // L: 216 - @ObfuscatedName("b") + @ObfuscatedName("d") @ObfuscatedSignature( - descriptor = "(Lof;I)V", - garbageValue = "871990485" + descriptor = "(Lop;B)V", + garbageValue = "-54" ) - final void method2218(IndexedSprite var1) { + final void method2232(IndexedSprite var1) { int var2; - for (var2 = 0; var2 < this.field1282.length; ++var2) { // L: 219 - this.field1282[var2] = 0; + for (var2 = 0; var2 < this.field1319.length; ++var2) { // L: 219 + this.field1319[var2] = 0; } int var3; for (var2 = 0; var2 < 5000; ++var2) { // L: 220 var3 = (int)(Math.random() * 128.0D * 256.0D); // L: 221 - this.field1282[var3] = (int)(Math.random() * 256.0D); // L: 222 + this.field1319[var3] = (int)(Math.random() * 256.0D); // L: 222 } int var4; @@ -445,13 +446,13 @@ public class LoginScreenAnimation { for (var3 = 1; var3 < 255; ++var3) { // L: 225 for (var4 = 1; var4 < 127; ++var4) { // L: 226 var5 = var4 + (var3 << 7); // L: 227 - this.field1290[var5] = (this.field1282[var5 - 128] + this.field1282[var5 + 1] + this.field1282[var5 + 128] + this.field1282[var5 - 1]) / 4; // L: 228 + this.field1312[var5] = (this.field1319[var5 + 128] + this.field1319[var5 - 128] + this.field1319[var5 + 1] + this.field1319[var5 - 1]) / 4; // L: 228 } } - int[] var8 = this.field1282; // L: 231 - this.field1282 = this.field1290; // L: 232 - this.field1290 = var8; // L: 233 + int[] var8 = this.field1319; // L: 231 + this.field1319 = this.field1312; // L: 232 + this.field1312 = var8; // L: 233 } if (var1 != null) { // L: 235 @@ -463,7 +464,7 @@ public class LoginScreenAnimation { var5 = var4 + var1.xOffset + 16; // L: 240 int var6 = var3 + var1.yOffset + 16; // L: 241 int var7 = var5 + (var6 << 7); // L: 242 - this.field1282[var7] = 0; // L: 243 + this.field1319[var7] = 0; // L: 243 } } } @@ -471,33 +472,108 @@ public class LoginScreenAnimation { } // L: 248 - @ObfuscatedName("l") + @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "(IIIZIZI)V", - garbageValue = "-2141894611" + descriptor = "(II)Lfl;", + garbageValue = "-77736406" ) - @Export("doWorldSorting") - static void doWorldSorting(int var0, int var1, int var2, boolean var3, int var4, boolean var5) { - if (var0 < var1) { // L: 177 - int var6 = (var0 + var1) / 2; // L: 178 - int var7 = var0; // L: 179 - World var8 = Messages.World_worlds[var6]; // L: 180 - Messages.World_worlds[var6] = Messages.World_worlds[var1]; // L: 181 - Messages.World_worlds[var1] = var8; // L: 182 + @Export("SequenceDefinition_get") + public static SequenceDefinition SequenceDefinition_get(int var0) { + SequenceDefinition var1 = (SequenceDefinition)SequenceDefinition.SequenceDefinition_cached.get((long)var0); + if (var1 != null) { + return var1; + } else { + byte[] var2 = SequenceDefinition.SequenceDefinition_archive.takeFile(12, var0); + var1 = new SequenceDefinition(); + if (var2 != null) { + var1.decode(new Buffer(var2)); + } - for (int var9 = var0; var9 < var1; ++var9) { // L: 183 - if (Widget.method4688(Messages.World_worlds[var9], var8, var2, var3, var4, var5) <= 0) { // L: 184 - World var10 = Messages.World_worlds[var9]; // L: 185 - Messages.World_worlds[var9] = Messages.World_worlds[var7]; // L: 186 - Messages.World_worlds[var7++] = var10; // L: 187 + var1.postDecode(); + SequenceDefinition.SequenceDefinition_cached.put(var1, (long)var0); + return var1; // L: 42 + } + } + + @ObfuscatedName("v") + @ObfuscatedSignature( + descriptor = "(Ljv;I)V", + garbageValue = "1926363806" + ) + public static void method2210(AbstractArchive var0) { + InvDefinition.InvDefinition_archive = var0; // L: 17 + } // L: 18 + + @ObfuscatedName("n") + @ObfuscatedSignature( + descriptor = "(Ljava/awt/Component;I)V", + garbageValue = "-1738532871" + ) + static void method2236(Component var0) { + var0.setFocusTraversalKeysEnabled(false); // L: 150 + var0.addKeyListener(KeyHandler.KeyHandler_instance); // L: 151 + var0.addFocusListener(KeyHandler.KeyHandler_instance); // L: 152 + } // L: 153 + + @ObfuscatedName("n") + @ObfuscatedSignature( + descriptor = "(Ljv;IIIZI)V", + garbageValue = "1103817184" + ) + public static void method2219(AbstractArchive var0, int var1, int var2, int var3, boolean var4) { + class232.musicPlayerStatus = 1; // L: 34 + ModelData0.musicTrackArchive = var0; + class32.musicTrackGroupId = var1; // L: 36 + class18.musicTrackFileId = var2; // L: 37 + class232.musicTrackVolume = var3; // L: 38 + class232.musicTrackBoolean = var4; // L: 39 + class232.pcmSampleLength = 10000; // L: 40 + } // L: 41 + + @ObfuscatedName("f") + @ObfuscatedSignature( + descriptor = "(III)I", + garbageValue = "-2048658082" + ) + static int method2235(int var0, int var1) { + ItemContainer var2 = (ItemContainer)ItemContainer.itemContainers.get((long)var0); // L: 28 + if (var2 == null) { // L: 29 + return 0; + } else if (var1 == -1) { // L: 30 + return 0; + } else { + int var3 = 0; // L: 31 + + for (int var4 = 0; var4 < var2.quantities.length; ++var4) { // L: 32 + if (var2.ids[var4] == var1) { + var3 += var2.quantities[var4]; // L: 33 } } - Messages.World_worlds[var1] = Messages.World_worlds[var7]; // L: 191 - Messages.World_worlds[var7] = var8; // L: 192 - doWorldSorting(var0, var7 - 1, var2, var3, var4, var5); // L: 193 - doWorldSorting(var7 + 1, var1, var2, var3, var4, var5); // L: 194 + return var3; // L: 35 + } + } + + @ObfuscatedName("it") + @ObfuscatedSignature( + descriptor = "(IIIII)V", + garbageValue = "-2141700582" + ) + @Export("selectSpell") + static void selectSpell(int var0, int var1, int var2, int var3) { + Widget var4 = ModeWhere.getWidgetChild(var0, var1); // L: 8631 + if (var4 != null && var4.onTargetEnter != null) { // L: 8632 + ScriptEvent var5 = new ScriptEvent(); // L: 8633 + var5.widget = var4; // L: 8634 + var5.args = var4.onTargetEnter; // L: 8635 + PacketWriter.runScriptEvent(var5); // L: 8636 } - } // L: 196 + Client.field788 = var3; // L: 8638 + Client.isSpellSelected = true; // L: 8639 + Decimator.selectedSpellWidget = var0; // L: 8640 + Client.selectedSpellChildIndex = var1; // L: 8641 + class4.selectedSpellFlags = var2; // L: 8642 + WorldMapCacheName.invalidateWidget(var4); // L: 8643 + } // L: 8644 } diff --git a/runescape-client/src/main/java/LoginType.java b/runescape-client/src/main/java/LoginType.java index 176b2a03b2..f6cf6a4d3c 100644 --- a/runescape-client/src/main/java/LoginType.java +++ b/runescape-client/src/main/java/LoginType.java @@ -4,101 +4,89 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("nj") +@ObfuscatedName("nc") @Implements("LoginType") public class LoginType { - @ObfuscatedName("h") + @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "Lnj;" + descriptor = "Lnc;" ) @Export("oldscape") public static final LoginType oldscape; - @ObfuscatedName("c") + @ObfuscatedName("n") @ObfuscatedSignature( - descriptor = "Lnj;" + descriptor = "Lnc;" ) - static final LoginType field4100; - @ObfuscatedName("o") + static final LoginType field4084; + @ObfuscatedName("f") @ObfuscatedSignature( - descriptor = "Lnj;" + descriptor = "Lnc;" ) - static final LoginType field4095; - @ObfuscatedName("g") + static final LoginType field4085; + @ObfuscatedName("y") @ObfuscatedSignature( - descriptor = "Lnj;" + descriptor = "Lnc;" ) - static final LoginType field4096; - @ObfuscatedName("l") + static final LoginType field4086; + @ObfuscatedName("p") @ObfuscatedSignature( - descriptor = "Lnj;" + descriptor = "Lnc;" ) - static final LoginType field4093; - @ObfuscatedName("z") + static final LoginType field4088; + @ObfuscatedName("j") @ObfuscatedSignature( - descriptor = "Lnj;" + descriptor = "Lnc;" ) - static final LoginType field4102; - @ObfuscatedName("t") + static final LoginType field4083; + @ObfuscatedName("r") @ObfuscatedSignature( - descriptor = "Lnj;" + descriptor = "Lnc;" ) - static final LoginType field4099; - @ObfuscatedName("v") - @ObfuscatedSignature( - descriptor = "Lnj;" - ) - static final LoginType field4094; + static final LoginType field4089; @ObfuscatedName("b") @ObfuscatedSignature( - descriptor = "Lnj;" + descriptor = "Lnc;" ) - public static final LoginType field4101; - @ObfuscatedName("q") + static final LoginType field4087; + @ObfuscatedName("d") + @ObfuscatedSignature( + descriptor = "Lnc;" + ) + public static final LoginType field4091; + @ObfuscatedName("s") @ObfuscatedGetter( - intValue = 1474668793 + intValue = 1440229409 ) - final int field4097; - @ObfuscatedName("i") - final String field4103; + public final int field4092; + @ObfuscatedName("u") + final String field4093; static { - oldscape = new LoginType(0, 0, "", ""); // L: 5 - field4100 = new LoginType(7, 1, "", ""); // L: 6 - field4095 = new LoginType(8, 2, "", ""); // L: 7 - field4096 = new LoginType(1, 3, "", ""); // L: 8 - field4093 = new LoginType(2, 4, "", ""); // L: 9 - field4102 = new LoginType(4, 5, "", ""); // L: 10 - field4099 = new LoginType(5, 6, "", ""); // L: 11 - field4094 = new LoginType(3, 7, "", ""); // L: 12 - field4101 = new LoginType(6, -1, "", "", true, new LoginType[]{oldscape, field4100, field4095, field4093, field4096}); // L: 13 + oldscape = new LoginType(5, 0, "", ""); // L: 5 + field4084 = new LoginType(0, 1, "", ""); // L: 6 + field4085 = new LoginType(7, 2, "", ""); // L: 7 + field4086 = new LoginType(3, 3, "", ""); // L: 8 + field4088 = new LoginType(2, 4, "", ""); // L: 9 + field4083 = new LoginType(8, 5, "", ""); // L: 10 + field4089 = new LoginType(1, 6, "", ""); // L: 11 + field4087 = new LoginType(4, 7, "", ""); // L: 12 + field4091 = new LoginType(6, -1, "", "", true, new LoginType[]{oldscape, field4084, field4085, field4088, field4086}); // L: 13 } LoginType(int var1, int var2, String var3, String var4) { - this.field4097 = var1; // L: 18 - this.field4103 = var4; // L: 19 + this.field4092 = var1; // L: 18 + this.field4093 = var4; // L: 19 } // L: 20 @ObfuscatedSignature( - descriptor = "(IILjava/lang/String;Ljava/lang/String;Z[Lnj;)V" + descriptor = "(IILjava/lang/String;Ljava/lang/String;Z[Lnc;)V" ) LoginType(int var1, int var2, String var3, String var4, boolean var5, LoginType[] var6) { - this.field4097 = var1; // L: 23 - this.field4103 = var4; // L: 24 + this.field4092 = var1; // L: 23 + this.field4093 = var4; // L: 24 } // L: 25 public String toString() { - return this.field4103; // L: 28 + return this.field4093; // L: 28 } - - @ObfuscatedName("jm") - @ObfuscatedSignature( - descriptor = "(III)V", - garbageValue = "794068414" - ) - @Export("runIntfCloseListeners") - static final void runIntfCloseListeners(int var0, int var1) { - if (UserComparator8.loadInterface(var0)) { // L: 10942 - UserComparator5.runComponentCloseListeners(Widget.Widget_interfaceComponents[var0], var1); // L: 10943 - } - } // L: 10944 } diff --git a/runescape-client/src/main/java/MenuAction.java b/runescape-client/src/main/java/MenuAction.java index 29c97c192a..ee2ac1c27b 100644 --- a/runescape-client/src/main/java/MenuAction.java +++ b/runescape-client/src/main/java/MenuAction.java @@ -4,68 +4,63 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ce") +@ObfuscatedName("cp") @Implements("MenuAction") public class MenuAction { - @ObfuscatedName("cs") + @ObfuscatedName("v") @ObfuscatedGetter( - intValue = -1383560021 - ) - public static int field982; - @ObfuscatedName("h") - @ObfuscatedGetter( - intValue = 38468049 + intValue = 1908566839 ) @Export("param0") int param0; - @ObfuscatedName("c") + @ObfuscatedName("n") @ObfuscatedGetter( - intValue = 871574221 + intValue = 213019407 ) @Export("param1") int param1; - @ObfuscatedName("o") + @ObfuscatedName("f") @ObfuscatedGetter( - intValue = -1494499467 + intValue = -187586953 ) @Export("opcode") int opcode; - @ObfuscatedName("g") + @ObfuscatedName("y") @ObfuscatedGetter( - intValue = 1225362571 + intValue = 651752445 ) @Export("identifier") int identifier; - @ObfuscatedName("l") + @ObfuscatedName("p") @Export("action") String action; MenuAction() { - } // L: 11814 + } // L: 11577 - @ObfuscatedName("h") + @ObfuscatedName("kg") @ObfuscatedSignature( - descriptor = "(Lap;B)Lat;", - garbageValue = "7" + descriptor = "(IIIILoh;Lit;I)V", + garbageValue = "836097385" ) - public static class31 method1944(class34 var0) { - switch(var0.field238) { // L: 9 - case 0: - return new class28(); // L: 16 - default: - throw new IllegalArgumentException(); // L: 12 + @Export("worldToMinimap") + static final void worldToMinimap(int var0, int var1, int var2, int var3, SpritePixels var4, SpriteMask var5) { + int var6 = var3 * var3 + var2 * var2; // L: 11213 + if (var6 > 4225 && var6 < 90000) { // L: 11214 + int var7 = Client.camAngleY & 2047; // L: 11215 + int var8 = Rasterizer3D.Rasterizer3D_sine[var7]; // L: 11216 + int var9 = Rasterizer3D.Rasterizer3D_cosine[var7]; // L: 11217 + int var10 = var3 * var8 + var9 * var2 >> 16; // L: 11218 + int var11 = var3 * var9 - var8 * var2 >> 16; // L: 11219 + double var12 = Math.atan2((double)var10, (double)var11); // L: 11220 + int var14 = var5.width / 2 - 25; // L: 11221 + int var15 = (int)(Math.sin(var12) * (double)var14); // L: 11222 + int var16 = (int)(Math.cos(var12) * (double)var14); // L: 11223 + byte var17 = 20; // L: 11224 + Interpreter.redHintArrowSprite.method6990(var15 + (var0 + var5.width / 2 - var17 / 2), var5.height / 2 + var1 - var17 / 2 - var16 - 10, var17, var17, 15, 15, var12, 256); // L: 11225 + } else { + ObjectComposition.drawSpriteOnMinimap(var0, var1, var2, var3, var4, var5); // L: 11227 } - } - @ObfuscatedName("z") - @ObfuscatedSignature( - descriptor = "(Ljp;Ljava/lang/String;Ljava/lang/String;I)Lof;", - garbageValue = "48725768" - ) - @Export("SpriteBuffer_getIndexedSpriteByName") - public static IndexedSprite SpriteBuffer_getIndexedSpriteByName(AbstractArchive var0, String var1, String var2) { - int var3 = var0.getGroupId(var1); // L: 122 - int var4 = var0.getFileId(var3, var2); // L: 123 - return SequenceDefinition.method3091(var0, var3, var4); // L: 124 - } + } // L: 11228 } diff --git a/runescape-client/src/main/java/Message.java b/runescape-client/src/main/java/Message.java index eebc331df8..a8670b363c 100644 --- a/runescape-client/src/main/java/Message.java +++ b/runescape-client/src/main/java/Message.java @@ -4,58 +4,58 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("bv") +@ObfuscatedName("bi") @Implements("Message") public class Message extends DualNode { - @ObfuscatedName("fu") + @ObfuscatedName("s") @ObfuscatedSignature( - descriptor = "Lkc;" + descriptor = "Lbq;" ) - @Export("fontPlain12") - static Font fontPlain12; - @ObfuscatedName("h") + @Export("soundSystem") + static SoundSystem soundSystem; + @ObfuscatedName("v") @ObfuscatedGetter( - intValue = -1616463731 + intValue = 1017616665 ) @Export("count") int count; - @ObfuscatedName("c") + @ObfuscatedName("n") @ObfuscatedGetter( - intValue = -286699527 + intValue = 19367569 ) @Export("cycle") int cycle; - @ObfuscatedName("o") + @ObfuscatedName("f") @ObfuscatedGetter( - intValue = -1679180039 + intValue = -330063829 ) @Export("type") int type; - @ObfuscatedName("g") + @ObfuscatedName("y") @Export("sender") String sender; - @ObfuscatedName("l") + @ObfuscatedName("p") @ObfuscatedSignature( - descriptor = "Lla;" + descriptor = "Lly;" ) @Export("senderUsername") Username senderUsername; - @ObfuscatedName("z") + @ObfuscatedName("j") @ObfuscatedSignature( - descriptor = "Lls;" + descriptor = "Llu;" ) @Export("isFromFriend0") TriBool isFromFriend0; - @ObfuscatedName("t") + @ObfuscatedName("r") @ObfuscatedSignature( - descriptor = "Lls;" + descriptor = "Llu;" ) @Export("isFromIgnored0") TriBool isFromIgnored0; - @ObfuscatedName("v") + @ObfuscatedName("b") @Export("prefix") String prefix; - @ObfuscatedName("b") + @ObfuscatedName("d") @Export("text") String text; @@ -65,10 +65,10 @@ public class Message extends DualNode { this.set(var1, var2, var3, var4); // L: 19 } // L: 20 - @ObfuscatedName("h") + @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "(ILjava/lang/String;Ljava/lang/String;Ljava/lang/String;B)V", - garbageValue = "-87" + descriptor = "(ILjava/lang/String;Ljava/lang/String;Ljava/lang/String;I)V", + garbageValue = "-449593753" ) @Export("set") void set(int var1, String var2, String var3, String var4) { @@ -84,20 +84,20 @@ public class Message extends DualNode { this.clearIsFromIgnored(); // L: 35 } // L: 36 - @ObfuscatedName("c") + @ObfuscatedName("n") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "1516900151" + garbageValue = "1400910895" ) @Export("clearIsFromFriend") void clearIsFromFriend() { this.isFromFriend0 = TriBool.TriBool_unknown; // L: 39 } // L: 40 - @ObfuscatedName("o") + @ObfuscatedName("f") @ObfuscatedSignature( - descriptor = "(B)Z", - garbageValue = "87" + descriptor = "(I)Z", + garbageValue = "1571534939" ) @Export("isFromFriend") final boolean isFromFriend() { @@ -108,30 +108,30 @@ public class Message extends DualNode { return this.isFromFriend0 == TriBool.TriBool_true; // L: 46 } - @ObfuscatedName("g") + @ObfuscatedName("y") @ObfuscatedSignature( descriptor = "(B)V", - garbageValue = "-25" + garbageValue = "118" ) @Export("fillIsFromFriend") void fillIsFromFriend() { - this.isFromFriend0 = GrandExchangeOfferUnitPriceComparator.friendSystem.friendsList.contains(this.senderUsername) ? TriBool.TriBool_true : TriBool.TriBool_false; - } + this.isFromFriend0 = NetSocket.friendSystem.friendsList.contains(this.senderUsername) ? TriBool.TriBool_true : TriBool.TriBool_false; // L: 50 + } // L: 51 - @ObfuscatedName("l") + @ObfuscatedName("p") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "-1886823274" + garbageValue = "1764151140" ) @Export("clearIsFromIgnored") void clearIsFromIgnored() { this.isFromIgnored0 = TriBool.TriBool_unknown; // L: 54 } // L: 55 - @ObfuscatedName("z") + @ObfuscatedName("j") @ObfuscatedSignature( descriptor = "(I)Z", - garbageValue = "1274568020" + garbageValue = "-342072399" ) @Export("isFromIgnored") final boolean isFromIgnored() { @@ -142,499 +142,28 @@ public class Message extends DualNode { return this.isFromIgnored0 == TriBool.TriBool_true; // L: 61 } - @ObfuscatedName("t") + @ObfuscatedName("r") @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "-1898664175" + descriptor = "(B)V", + garbageValue = "-2" ) @Export("fillIsFromIgnored") void fillIsFromIgnored() { - this.isFromIgnored0 = GrandExchangeOfferUnitPriceComparator.friendSystem.ignoreList.contains(this.senderUsername) ? TriBool.TriBool_true : TriBool.TriBool_false; // L: 65 + this.isFromIgnored0 = NetSocket.friendSystem.ignoreList.contains(this.senderUsername) ? TriBool.TriBool_true : TriBool.TriBool_false; // L: 65 } // L: 66 - @ObfuscatedName("v") + @ObfuscatedName("b") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "-349189555" + garbageValue = "1824375293" ) @Export("fillSenderUsername") final void fillSenderUsername() { if (this.sender != null) { // L: 69 - this.senderUsername = new Username(Canvas.method468(this.sender), ModeWhere.loginType); + this.senderUsername = new Username(class15.method189(this.sender), WorldMapSection0.loginType); } else { this.senderUsername = null; // L: 70 } } // L: 71 - - @ObfuscatedName("i") - @ObfuscatedSignature( - descriptor = "(IIIB)I", - garbageValue = "-108" - ) - @Export("hslToRgb") - static final int hslToRgb(int var0, int var1, int var2) { - if (var2 > 179) { // L: 513 - var1 /= 2; - } - - if (var2 > 192) { // L: 514 - var1 /= 2; - } - - if (var2 > 217) { // L: 515 - var1 /= 2; - } - - if (var2 > 243) { // L: 516 - var1 /= 2; - } - - int var3 = (var1 / 32 << 7) + (var0 / 4 << 10) + var2 / 2; // L: 517 - return var3; // L: 518 - } - - @ObfuscatedName("d") - @ObfuscatedSignature( - descriptor = "(IZII)V", - garbageValue = "-366902049" - ) - public static final void method1166(int var0, boolean var1, int var2) { - if (var0 >= 8000 && var0 <= 48000) { // L: 49 - PcmPlayer.field401 = var0; // L: 50 - ApproximateRouteStrategy.PcmPlayer_stereo = var1; // L: 51 - PcmPlayer.field405 = var2; // L: 52 - } else { - throw new IllegalArgumentException(); - } - } // L: 53 - - @ObfuscatedName("gj") - @ObfuscatedSignature( - descriptor = "(I)I", - garbageValue = "2128922058" - ) - static final int method1174() { - if (class12.clientPreferences.roofsHidden) { // L: 4754 - return ParamComposition.Client_plane; - } else { - int var0 = 3; // L: 4755 - if (class1.cameraPitch < 310) { // L: 4756 - label166: { - int var1; - int var2; - if (Client.oculusOrbState == 1) { // L: 4759 - var1 = HorizontalAlignment.oculusOrbFocalPointX >> 7; // L: 4760 - var2 = class280.oculusOrbFocalPointY >> 7; // L: 4761 - } else { - var1 = class35.localPlayer.x >> 7; // L: 4764 - var2 = class35.localPlayer.y >> 7; // L: 4765 - } - - int var3 = class20.cameraX >> 7; // L: 4767 - int var4 = WorldMapDecoration.cameraZ >> 7; // L: 4768 - if (var3 >= 0 && var4 >= 0 && var3 < 104 && var4 < 104) { // L: 4769 - if (var1 >= 0 && var2 >= 0 && var1 < 104 && var2 < 104) { // L: 4770 - if ((Tiles.Tiles_renderFlags[ParamComposition.Client_plane][var3][var4] & 4) != 0) { // L: 4771 - var0 = ParamComposition.Client_plane; - } - - int var5; - if (var1 > var3) { // L: 4773 - var5 = var1 - var3; - } else { - var5 = var3 - var1; // L: 4774 - } - - int var6; - if (var2 > var4) { // L: 4776 - var6 = var2 - var4; - } else { - var6 = var4 - var2; // L: 4777 - } - - int var7; - int var8; - if (var5 > var6) { // L: 4778 - var7 = var6 * 65536 / var5; // L: 4779 - var8 = 32768; // L: 4780 - - while (true) { - if (var1 == var3) { // L: 4781 - break label166; - } - - if (var3 < var1) { // L: 4782 - ++var3; - } else if (var3 > var1) { // L: 4783 - --var3; - } - - if ((Tiles.Tiles_renderFlags[ParamComposition.Client_plane][var3][var4] & 4) != 0) { // L: 4784 - var0 = ParamComposition.Client_plane; - } - - var8 += var7; // L: 4785 - if (var8 >= 65536) { // L: 4786 - var8 -= 65536; // L: 4787 - if (var4 < var2) { // L: 4788 - ++var4; - } else if (var4 > var2) { // L: 4789 - --var4; - } - - if ((Tiles.Tiles_renderFlags[ParamComposition.Client_plane][var3][var4] & 4) != 0) { // L: 4790 - var0 = ParamComposition.Client_plane; - } - } - } - } else { - if (var6 > 0) { // L: 4794 - var7 = var5 * 65536 / var6; // L: 4795 - var8 = 32768; // L: 4796 - - while (var4 != var2) { // L: 4797 - if (var4 < var2) { // L: 4798 - ++var4; - } else if (var4 > var2) { // L: 4799 - --var4; - } - - if ((Tiles.Tiles_renderFlags[ParamComposition.Client_plane][var3][var4] & 4) != 0) { // L: 4800 - var0 = ParamComposition.Client_plane; - } - - var8 += var7; // L: 4801 - if (var8 >= 65536) { // L: 4802 - var8 -= 65536; // L: 4803 - if (var3 < var1) { // L: 4804 - ++var3; - } else if (var3 > var1) { // L: 4805 - --var3; - } - - if ((Tiles.Tiles_renderFlags[ParamComposition.Client_plane][var3][var4] & 4) != 0) { // L: 4806 - var0 = ParamComposition.Client_plane; - } - } - } - } - break label166; - } - } - - return ParamComposition.Client_plane; - } - - return ParamComposition.Client_plane; - } - } - - if (class35.localPlayer.x >= 0 && class35.localPlayer.y >= 0 && class35.localPlayer.x < 13312 && class35.localPlayer.y < 13312) { // L: 4811 - if ((Tiles.Tiles_renderFlags[ParamComposition.Client_plane][class35.localPlayer.x >> 7][class35.localPlayer.y >> 7] & 4) != 0) { // L: 4812 - var0 = ParamComposition.Client_plane; - } - - return var0; // L: 4813 - } else { - return ParamComposition.Client_plane; - } - } - } - - @ObfuscatedName("hs") - @ObfuscatedSignature( - descriptor = "(IIIIIIII)V", - garbageValue = "-1851837703" - ) - @Export("addPendingSpawnToScene") - static final void addPendingSpawnToScene(int var0, int var1, int var2, int var3, int var4, int var5, int var6) { - if (var2 >= 1 && var3 >= 1 && var2 <= 102 && var3 <= 102) { // L: 7325 - if (Client.isLowDetail && var0 != ParamComposition.Client_plane) { // L: 7326 - return; - } - - long var7 = 0L; // L: 7327 - boolean var9 = true; // L: 7328 - boolean var10 = false; // L: 7329 - boolean var11 = false; // L: 7330 - if (var1 == 0) { // L: 7331 - var7 = class5.scene.getBoundaryObjectTag(var0, var2, var3); - } - - if (var1 == 1) { // L: 7332 - var7 = class5.scene.getWallDecorationTag(var0, var2, var3); - } - - if (var1 == 2) { // L: 7333 - var7 = class5.scene.getGameObjectTag(var0, var2, var3); - } - - if (var1 == 3) { // L: 7334 - var7 = class5.scene.getFloorDecorationTag(var0, var2, var3); - } - - int var12; - if (var7 != 0L) { // L: 7335 - var12 = class5.scene.getObjectFlags(var0, var2, var3, var7); // L: 7336 - int var38 = class6.Entity_unpackID(var7); // L: 7337 - int var39 = var12 & 31; // L: 7338 - int var40 = var12 >> 6 & 3; // L: 7339 - ObjectComposition var13; - if (var1 == 0) { // L: 7340 - class5.scene.removeBoundaryObject(var0, var2, var3); // L: 7341 - var13 = AttackOption.getObjectDefinition(var38); // L: 7342 - if (var13.interactType != 0) { // L: 7343 - Client.collisionMaps[var0].method3099(var2, var3, var39, var40, var13.boolean1); - } - } - - if (var1 == 1) { // L: 7345 - class5.scene.removeWallDecoration(var0, var2, var3); - } - - if (var1 == 2) { // L: 7346 - class5.scene.removeGameObject(var0, var2, var3); // L: 7347 - var13 = AttackOption.getObjectDefinition(var38); // L: 7348 - if (var2 + var13.sizeX > 103 || var3 + var13.sizeX > 103 || var2 + var13.sizeY > 103 || var3 + var13.sizeY > 103) { // L: 7349 - return; - } - - if (var13.interactType != 0) { // L: 7350 - Client.collisionMaps[var0].setFlagOffNonSquare(var2, var3, var13.sizeX, var13.sizeY, var40, var13.boolean1); - } - } - - if (var1 == 3) { // L: 7352 - class5.scene.removeFloorDecoration(var0, var2, var3); // L: 7353 - var13 = AttackOption.getObjectDefinition(var38); // L: 7354 - if (var13.interactType == 1) { // L: 7355 - Client.collisionMaps[var0].method3102(var2, var3); - } - } - } - - if (var4 >= 0) { // L: 7358 - var12 = var0; // L: 7359 - if (var0 < 3 && (Tiles.Tiles_renderFlags[1][var2][var3] & 2) == 2) { // L: 7360 - var12 = var0 + 1; - } - - Scene var41 = class5.scene; // L: 7361 - CollisionMap var14 = Client.collisionMaps[var0]; // L: 7362 - ObjectComposition var15 = AttackOption.getObjectDefinition(var4); // L: 7364 - int var16; - int var17; - if (var5 != 1 && var5 != 3) { // L: 7367 - var16 = var15.sizeX; // L: 7372 - var17 = var15.sizeY; // L: 7373 - } else { - var16 = var15.sizeY; // L: 7368 - var17 = var15.sizeX; // L: 7369 - } - - int var18; - int var19; - if (var16 + var2 <= 104) { // L: 7379 - var18 = (var16 >> 1) + var2; // L: 7380 - var19 = var2 + (var16 + 1 >> 1); // L: 7381 - } else { - var18 = var2; // L: 7384 - var19 = var2 + 1; // L: 7385 - } - - int var20; - int var21; - if (var3 + var17 <= 104) { // L: 7387 - var20 = var3 + (var17 >> 1); // L: 7388 - var21 = var3 + (var17 + 1 >> 1); // L: 7389 - } else { - var20 = var3; // L: 7392 - var21 = var3 + 1; // L: 7393 - } - - int[][] var22 = Tiles.Tiles_heights[var12]; // L: 7395 - int var23 = var22[var19][var21] + var22[var18][var21] + var22[var19][var20] + var22[var18][var20] >> 2; // L: 7396 - int var24 = (var2 << 7) + (var16 << 6); // L: 7397 - int var25 = (var3 << 7) + (var17 << 6); // L: 7398 - long var26 = class17.calculateTag(var2, var3, 2, var15.int1 == 0, var4); // L: 7399 - int var28 = (var5 << 6) + var6; // L: 7400 - if (var15.int3 == 1) { // L: 7401 - var28 += 256; - } - - Object var36; - if (var6 == 22) { // L: 7402 - if (var15.animationId == -1 && var15.transforms == null) { // L: 7404 - var36 = var15.getModel(22, var5, var22, var24, var23, var25); - } else { - var36 = new DynamicObject(var4, 22, var5, var12, var2, var3, var15.animationId, var15.field1761, (Renderable)null); // L: 7405 - } - - var41.newFloorDecoration(var0, var2, var3, var23, (Renderable)var36, var26, var28); // L: 7406 - if (var15.interactType == 1) { // L: 7407 - var14.setBlockedByFloorDec(var2, var3); - } - } else if (var6 != 10 && var6 != 11) { // L: 7410 - if (var6 >= 12) { // L: 7418 - if (var15.animationId == -1 && var15.transforms == null) { // L: 7420 - var36 = var15.getModel(var6, var5, var22, var24, var23, var25); - } else { - var36 = new DynamicObject(var4, var6, var5, var12, var2, var3, var15.animationId, var15.field1761, (Renderable)null); // L: 7421 - } - - var41.method4008(var0, var2, var3, var23, 1, 1, (Renderable)var36, 0, var26, var28); // L: 7422 - if (var15.interactType != 0) { // L: 7423 - var14.addGameObject(var2, var3, var16, var17, var15.boolean1); - } - } else if (var6 == 0) { // L: 7426 - if (var15.animationId == -1 && var15.transforms == null) { // L: 7428 - var36 = var15.getModel(0, var5, var22, var24, var23, var25); - } else { - var36 = new DynamicObject(var4, 0, var5, var12, var2, var3, var15.animationId, var15.field1761, (Renderable)null); // L: 7429 - } - - var41.newBoundaryObject(var0, var2, var3, var23, (Renderable)var36, (Renderable)null, Tiles.field1085[var5], 0, var26, var28); // L: 7430 - if (var15.interactType != 0) { // L: 7431 - var14.method3094(var2, var3, var6, var5, var15.boolean1); - } - } else if (var6 == 1) { // L: 7434 - if (var15.animationId == -1 && var15.transforms == null) { // L: 7436 - var36 = var15.getModel(1, var5, var22, var24, var23, var25); - } else { - var36 = new DynamicObject(var4, 1, var5, var12, var2, var3, var15.animationId, var15.field1761, (Renderable)null); // L: 7437 - } - - var41.newBoundaryObject(var0, var2, var3, var23, (Renderable)var36, (Renderable)null, Tiles.field1095[var5], 0, var26, var28); // L: 7438 - if (var15.interactType != 0) { // L: 7439 - var14.method3094(var2, var3, var6, var5, var15.boolean1); - } - } else { - int var29; - if (var6 == 2) { // L: 7442 - var29 = var5 + 1 & 3; // L: 7443 - Object var31; - Object var37; - if (var15.animationId == -1 && var15.transforms == null) { // L: 7446 - var37 = var15.getModel(2, var5 + 4, var22, var24, var23, var25); // L: 7447 - var31 = var15.getModel(2, var29, var22, var24, var23, var25); // L: 7448 - } else { - var37 = new DynamicObject(var4, 2, var5 + 4, var12, var2, var3, var15.animationId, var15.field1761, (Renderable)null); // L: 7451 - var31 = new DynamicObject(var4, 2, var29, var12, var2, var3, var15.animationId, var15.field1761, (Renderable)null); // L: 7452 - } - - var41.newBoundaryObject(var0, var2, var3, var23, (Renderable)var37, (Renderable)var31, Tiles.field1085[var5], Tiles.field1085[var29], var26, var28); // L: 7454 - if (var15.interactType != 0) { // L: 7455 - var14.method3094(var2, var3, var6, var5, var15.boolean1); - } - } else if (var6 == 3) { // L: 7458 - if (var15.animationId == -1 && var15.transforms == null) { // L: 7460 - var36 = var15.getModel(3, var5, var22, var24, var23, var25); - } else { - var36 = new DynamicObject(var4, 3, var5, var12, var2, var3, var15.animationId, var15.field1761, (Renderable)null); // L: 7461 - } - - var41.newBoundaryObject(var0, var2, var3, var23, (Renderable)var36, (Renderable)null, Tiles.field1095[var5], 0, var26, var28); // L: 7462 - if (var15.interactType != 0) { // L: 7463 - var14.method3094(var2, var3, var6, var5, var15.boolean1); - } - } else if (var6 == 9) { // L: 7466 - if (var15.animationId == -1 && var15.transforms == null) { // L: 7468 - var36 = var15.getModel(var6, var5, var22, var24, var23, var25); - } else { - var36 = new DynamicObject(var4, var6, var5, var12, var2, var3, var15.animationId, var15.field1761, (Renderable)null); // L: 7469 - } - - var41.method4008(var0, var2, var3, var23, 1, 1, (Renderable)var36, 0, var26, var28); // L: 7470 - if (var15.interactType != 0) { // L: 7471 - var14.addGameObject(var2, var3, var16, var17, var15.boolean1); - } - } else if (var6 == 4) { // L: 7474 - if (var15.animationId == -1 && var15.transforms == null) { // L: 7476 - var36 = var15.getModel(4, var5, var22, var24, var23, var25); - } else { - var36 = new DynamicObject(var4, 4, var5, var12, var2, var3, var15.animationId, var15.field1761, (Renderable)null); // L: 7477 - } - - var41.newWallDecoration(var0, var2, var3, var23, (Renderable)var36, (Renderable)null, Tiles.field1085[var5], 0, 0, 0, var26, var28); // L: 7478 - } else { - long var30; - Object var32; - if (var6 == 5) { // L: 7481 - var29 = 16; // L: 7482 - var30 = var41.getBoundaryObjectTag(var0, var2, var3); // L: 7483 - if (0L != var30) { // L: 7484 - var29 = AttackOption.getObjectDefinition(class6.Entity_unpackID(var30)).int2; - } - - if (var15.animationId == -1 && var15.transforms == null) { // L: 7486 - var32 = var15.getModel(4, var5, var22, var24, var23, var25); - } else { - var32 = new DynamicObject(var4, 4, var5, var12, var2, var3, var15.animationId, var15.field1761, (Renderable)null); // L: 7487 - } - - var41.newWallDecoration(var0, var2, var3, var23, (Renderable)var32, (Renderable)null, Tiles.field1085[var5], 0, var29 * Tiles.field1096[var5], var29 * Tiles.field1100[var5], var26, var28); // L: 7488 - } else if (var6 == 6) { // L: 7491 - var29 = 8; // L: 7492 - var30 = var41.getBoundaryObjectTag(var0, var2, var3); // L: 7493 - if (var30 != 0L) { // L: 7494 - var29 = AttackOption.getObjectDefinition(class6.Entity_unpackID(var30)).int2 / 2; - } - - if (var15.animationId == -1 && var15.transforms == null) { // L: 7496 - var32 = var15.getModel(4, var5 + 4, var22, var24, var23, var25); - } else { - var32 = new DynamicObject(var4, 4, var5 + 4, var12, var2, var3, var15.animationId, var15.field1761, (Renderable)null); // L: 7497 - } - - var41.newWallDecoration(var0, var2, var3, var23, (Renderable)var32, (Renderable)null, 256, var5, var29 * Tiles.field1098[var5], var29 * Tiles.field1094[var5], var26, var28); // L: 7498 - } else if (var6 == 7) { // L: 7501 - int var35 = var5 + 2 & 3; // L: 7503 - if (var15.animationId == -1 && var15.transforms == null) { // L: 7504 - var36 = var15.getModel(4, var35 + 4, var22, var24, var23, var25); - } else { - var36 = new DynamicObject(var4, 4, var35 + 4, var12, var2, var3, var15.animationId, var15.field1761, (Renderable)null); // L: 7505 - } - - var41.newWallDecoration(var0, var2, var3, var23, (Renderable)var36, (Renderable)null, 256, var35, 0, 0, var26, var28); // L: 7506 - } else if (var6 == 8) { // L: 7509 - var29 = 8; // L: 7510 - var30 = var41.getBoundaryObjectTag(var0, var2, var3); // L: 7511 - if (var30 != 0L) { // L: 7512 - var29 = AttackOption.getObjectDefinition(class6.Entity_unpackID(var30)).int2 / 2; - } - - int var34 = var5 + 2 & 3; // L: 7515 - Object var33; - if (var15.animationId == -1 && var15.transforms == null) { // L: 7516 - var32 = var15.getModel(4, var5 + 4, var22, var24, var23, var25); // L: 7517 - var33 = var15.getModel(4, var34 + 4, var22, var24, var23, var25); // L: 7518 - } else { - var32 = new DynamicObject(var4, 4, var5 + 4, var12, var2, var3, var15.animationId, var15.field1761, (Renderable)null); // L: 7521 - var33 = new DynamicObject(var4, 4, var34 + 4, var12, var2, var3, var15.animationId, var15.field1761, (Renderable)null); // L: 7522 - } - - var41.newWallDecoration(var0, var2, var3, var23, (Renderable)var32, (Renderable)var33, 256, var5, var29 * Tiles.field1098[var5], var29 * Tiles.field1094[var5], var26, var28); // L: 7524 - } - } - } - } else { - if (var15.animationId == -1 && var15.transforms == null) { // L: 7412 - var36 = var15.getModel(10, var5, var22, var24, var23, var25); - } else { - var36 = new DynamicObject(var4, 10, var5, var12, var2, var3, var15.animationId, var15.field1761, (Renderable)null); // L: 7413 - } - - if (var36 != null) { // L: 7414 - var41.method4008(var0, var2, var3, var23, var16, var17, (Renderable)var36, var6 == 11 ? 256 : 0, var26, var28); - } - - if (var15.interactType != 0) { // L: 7415 - var14.addGameObject(var2, var3, var16, var17, var15.boolean1); - } - } - } - } - - } // L: 7529 } diff --git a/runescape-client/src/main/java/Messages.java b/runescape-client/src/main/java/Messages.java index be7ff5d982..e100c6ca93 100644 --- a/runescape-client/src/main/java/Messages.java +++ b/runescape-client/src/main/java/Messages.java @@ -6,45 +6,36 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("dl") +@ObfuscatedName("dk") @Implements("Messages") public class Messages { - @ObfuscatedName("h") + @ObfuscatedName("v") @Export("Messages_channels") static final Map Messages_channels; - @ObfuscatedName("c") + @ObfuscatedName("n") @ObfuscatedSignature( - descriptor = "Lmo;" + descriptor = "Lmr;" ) @Export("Messages_hashTable") static final IterableNodeHashTable Messages_hashTable; - @ObfuscatedName("o") + @ObfuscatedName("f") @ObfuscatedSignature( - descriptor = "Lkd;" + descriptor = "Lko;" ) @Export("Messages_queue") static final IterableDualNodeQueue Messages_queue; - @ObfuscatedName("g") + @ObfuscatedName("y") @ObfuscatedGetter( - intValue = 383484853 + intValue = 543094313 ) @Export("Messages_count") static int Messages_count; - @ObfuscatedName("l") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "[Lbc;" + descriptor = "Lbu;" ) - @Export("World_worlds") - static World[] World_worlds; - @ObfuscatedName("gw") - @ObfuscatedGetter( - intValue = -1601684285 - ) - @Export("baseY") - static int baseY; - @ObfuscatedName("gu") - @Export("regionLandArchives") - static byte[][] regionLandArchives; + @Export("soundCache") + public static SoundCache soundCache; static { Messages_channels = new HashMap(); // L: 9 @@ -53,105 +44,22 @@ public class Messages { Messages_count = 0; // L: 12 } - @ObfuscatedName("b") + @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "(III)V", - garbageValue = "1068493596" + descriptor = "([Lkj;II)Lkj;", + garbageValue = "-611336247" ) - public static final void method2374(int var0, int var1) { - ViewportMouse.ViewportMouse_x = var0; // L: 88 - ViewportMouse.ViewportMouse_y = var1; // L: 89 - ViewportMouse.ViewportMouse_isInViewport = true; // L: 90 - ViewportMouse.ViewportMouse_entityCount = 0; // L: 91 - ViewportMouse.ViewportMouse_false0 = false; // L: 92 - } // L: 93 + @Export("findEnumerated") + public static Enumerated findEnumerated(Enumerated[] var0, int var1) { + Enumerated[] var2 = var0; // L: 17 - @ObfuscatedName("r") - @ObfuscatedSignature( - descriptor = "(II)I", - garbageValue = "252284948" - ) - public static int method2381(int var0) { - if (var0 > 0) { // L: 210 - return 1; - } else { - return var0 < 0 ? -1 : 0; // L: 211 212 - } - } - - @ObfuscatedName("jk") - @ObfuscatedSignature( - descriptor = "(IIIIIII)V", - garbageValue = "-1395505171" - ) - static final void method2378(int var0, int var1, int var2, int var3, int var4, int var5) { - int var6 = var2 - var0; // L: 9966 - int var7 = var3 - var1; // L: 9967 - int var8 = var6 >= 0 ? var6 : -var6; // L: 9968 - int var9 = var7 >= 0 ? var7 : -var7; // L: 9969 - int var10 = var8; // L: 9970 - if (var8 < var9) { // L: 9971 - var10 = var9; - } - - if (var10 != 0) { // L: 9972 - int var11 = (var6 << 16) / var10; // L: 9973 - int var12 = (var7 << 16) / var10; // L: 9974 - if (var12 <= var11) { // L: 9975 - var11 = -var11; - } else { - var12 = -var12; // L: 9976 + for (int var3 = 0; var3 < var2.length; ++var3) { // L: 18 + Enumerated var4 = var2[var3]; // L: 19 + if (var1 == var4.rsOrdinal()) { + return var4; // L: 21 } - - int var13 = var5 * var12 >> 17; // L: 9977 - int var14 = var5 * var12 + 1 >> 17; // L: 9978 - int var15 = var5 * var11 >> 17; // L: 9979 - int var16 = var5 * var11 + 1 >> 17; // L: 9980 - var0 -= Rasterizer2D.Rasterizer2D_xClipStart; // L: 9981 - var1 -= Rasterizer2D.Rasterizer2D_yClipStart; // L: 9982 - int var17 = var0 + var13; // L: 9983 - int var18 = var0 - var14; // L: 9984 - int var19 = var0 + var6 - var14; // L: 9985 - int var20 = var0 + var13 + var6; // L: 9986 - int var21 = var15 + var1; // L: 9987 - int var22 = var1 - var16; // L: 9988 - int var23 = var7 + var1 - var16; // L: 9989 - int var24 = var7 + var15 + var1; // L: 9990 - Rasterizer3D.method3823(var17, var18, var19); // L: 9991 - Rasterizer3D.method3826(var21, var22, var23, var17, var18, var19, var4); // L: 9992 - Rasterizer3D.method3823(var17, var19, var20); // L: 9993 - Rasterizer3D.method3826(var21, var23, var24, var17, var19, var20, var4); // L: 9994 - } - } // L: 9995 - - @ObfuscatedName("jh") - @ObfuscatedSignature( - descriptor = "(II)Ljava/lang/String;", - garbageValue = "930594009" - ) - @Export("formatItemStacks") - static final String formatItemStacks(int var0) { - String var1 = Integer.toString(var0); // L: 10011 - - for (int var2 = var1.length() - 3; var2 > 0; var2 -= 3) { // L: 10012 - var1 = var1.substring(0, var2) + "," + var1.substring(var2); // L: 10013 } - if (var1.length() > 9) { // L: 10015 - return " " + HorizontalAlignment.colorStartTag(65408) + var1.substring(0, var1.length() - 8) + "M" + " " + " (" + var1 + ")" + ""; - } else { - return var1.length() > 6 ? " " + HorizontalAlignment.colorStartTag(16777215) + var1.substring(0, var1.length() - 4) + "K" + " " + " (" + var1 + ")" + "" : " " + HorizontalAlignment.colorStartTag(16776960) + var1 + ""; // L: 10016 10017 - } + return null; // L: 25 } - - @ObfuscatedName("ka") - @ObfuscatedSignature( - descriptor = "(II)V", - garbageValue = "716451367" - ) - static final void method2357(int var0) { - if (UserComparator8.loadInterface(var0)) { // L: 11121 - class308.drawModelComponents(Widget.Widget_interfaceComponents[var0], -1); // L: 11122 - } - } // L: 11123 } diff --git a/runescape-client/src/main/java/MidiFileReader.java b/runescape-client/src/main/java/MidiFileReader.java index cd6df032a9..318198bd2b 100644 --- a/runescape-client/src/main/java/MidiFileReader.java +++ b/runescape-client/src/main/java/MidiFileReader.java @@ -3,38 +3,38 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ik") +@ObfuscatedName("ir") @Implements("MidiFileReader") public class MidiFileReader { - @ObfuscatedName("q") - static final byte[] field2875; - @ObfuscatedName("h") + @ObfuscatedName("s") + static final byte[] field2871; + @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "Lnk;" + descriptor = "Lnd;" ) @Export("buffer") Buffer buffer; - @ObfuscatedName("c") + @ObfuscatedName("n") @Export("division") int division; - @ObfuscatedName("o") + @ObfuscatedName("f") @Export("trackStarts") int[] trackStarts; - @ObfuscatedName("g") + @ObfuscatedName("y") @Export("trackPositions") int[] trackPositions; - @ObfuscatedName("l") + @ObfuscatedName("p") @Export("trackLengths") int[] trackLengths; - @ObfuscatedName("z") - int[] field2871; - @ObfuscatedName("t") - int field2872; - @ObfuscatedName("b") - long field2874; + @ObfuscatedName("j") + int[] field2862; + @ObfuscatedName("r") + int field2867; + @ObfuscatedName("d") + long field2870; static { - field2875 = new byte[]{2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 0, 1, 2, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}; // L: 17 + field2871 = new byte[]{2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 0, 1, 2, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}; // L: 17 } MidiFileReader(byte[] var1) { @@ -46,14 +46,14 @@ public class MidiFileReader { this.buffer = new Buffer((byte[])null); // L: 8 } // L: 23 - @ObfuscatedName("h") + @ObfuscatedName("v") @Export("parse") void parse(byte[] var1) { this.buffer.array = var1; // L: 30 this.buffer.offset = 10; // L: 33 int var2 = this.buffer.readUnsignedShort(); // L: 34 this.division = this.buffer.readUnsignedShort(); // L: 36 - this.field2872 = 500000; // L: 37 + this.field2867 = 500000; // L: 37 this.trackStarts = new int[var2]; // L: 38 Buffer var10000; @@ -70,7 +70,7 @@ public class MidiFileReader { var10000 = this.buffer; // L: 46 } - this.field2874 = 0L; // L: 48 + this.field2870 = 0L; // L: 48 this.trackPositions = new int[var2]; // L: 49 for (var3 = 0; var3 < var2; ++var3) { // L: 50 @@ -78,50 +78,50 @@ public class MidiFileReader { } this.trackLengths = new int[var2]; // L: 51 - this.field2871 = new int[var2]; // L: 52 + this.field2862 = new int[var2]; // L: 52 } // L: 53 - @ObfuscatedName("c") + @ObfuscatedName("n") @Export("clear") void clear() { this.buffer.array = null; // L: 56 this.trackStarts = null; // L: 57 this.trackPositions = null; // L: 58 this.trackLengths = null; // L: 59 - this.field2871 = null; // L: 60 + this.field2862 = null; // L: 60 } // L: 61 - @ObfuscatedName("o") + @ObfuscatedName("f") @Export("isReady") boolean isReady() { return this.buffer.array != null; // L: 64 } - @ObfuscatedName("g") + @ObfuscatedName("y") @Export("trackCount") int trackCount() { return this.trackPositions.length; // L: 68 } - @ObfuscatedName("l") + @ObfuscatedName("p") @Export("gotoTrack") void gotoTrack(int var1) { this.buffer.offset = this.trackPositions[var1]; // L: 72 } // L: 73 - @ObfuscatedName("z") + @ObfuscatedName("j") @Export("markTrackPosition") void markTrackPosition(int var1) { this.trackPositions[var1] = this.buffer.offset; // L: 76 } // L: 77 - @ObfuscatedName("t") + @ObfuscatedName("r") @Export("setTrackDone") void setTrackDone() { this.buffer.offset = -1; // L: 80 } // L: 81 - @ObfuscatedName("v") + @ObfuscatedName("b") @Export("readTrackLength") void readTrackLength(int var1) { int var2 = this.buffer.readVarInt(); // L: 84 @@ -129,36 +129,36 @@ public class MidiFileReader { var10000[var1] += var2; // L: 85 } // L: 86 - @ObfuscatedName("b") + @ObfuscatedName("d") @Export("readMessage") int readMessage(int var1) { int var2 = this.readMessage0(var1); // L: 89 return var2; // L: 90 } - @ObfuscatedName("q") + @ObfuscatedName("s") @Export("readMessage0") int readMessage0(int var1) { byte var2 = this.buffer.array[this.buffer.offset]; // L: 94 int var5; if (var2 < 0) { // L: 95 var5 = var2 & 255; // L: 96 - this.field2871[var1] = var5; // L: 97 + this.field2862[var1] = var5; // L: 97 ++this.buffer.offset; // L: 98 } else { - var5 = this.field2871[var1]; // L: 101 + var5 = this.field2862[var1]; // L: 101 } if (var5 != 240 && var5 != 247) { // L: 103 - return this.method4497(var1, var5); // L: 116 + return this.method4541(var1, var5); // L: 116 } else { int var3 = this.buffer.readVarInt(); // L: 104 if (var5 == 247 && var3 > 0) { // L: 105 int var4 = this.buffer.array[this.buffer.offset] & 255; // L: 106 if (var4 >= 241 && var4 <= 243 || var4 == 246 || var4 == 248 || var4 >= 250 && var4 <= 252 || var4 == 254) { // L: 107 ++this.buffer.offset; // L: 108 - this.field2871[var1] = var4; // L: 109 - return this.method4497(var1, var4); // L: 110 + this.field2862[var1] = var4; // L: 109 + return this.method4541(var1, var4); // L: 110 } } @@ -168,8 +168,8 @@ public class MidiFileReader { } } - @ObfuscatedName("i") - int method4497(int var1, int var2) { + @ObfuscatedName("u") + int method4541(int var1, int var2) { int var4; if (var2 == 255) { // L: 120 int var7 = this.buffer.readUnsignedByte(); // L: 121 @@ -183,8 +183,8 @@ public class MidiFileReader { int var5 = this.buffer.readMedium(); // L: 128 var4 -= 3; // L: 129 int var6 = this.trackLengths[var1]; // L: 130 - this.field2874 += (long)var6 * (long)(this.field2872 - var5); // L: 131 - this.field2872 = var5; // L: 132 + this.field2870 += (long)var6 * (long)(this.field2867 - var5); // L: 131 + this.field2867 = var5; // L: 132 var10000 = this.buffer; // L: 133 var10000.offset += var4; return 2; // L: 134 @@ -194,7 +194,7 @@ public class MidiFileReader { return 3; // L: 137 } } else { - byte var3 = field2875[var2 - 128]; // L: 139 + byte var3 = field2871[var2 - 128]; // L: 139 var4 = var2; // L: 140 if (var3 >= 1) { // L: 141 var4 = var2 | this.buffer.readUnsignedByte() << 8; @@ -208,12 +208,12 @@ public class MidiFileReader { } } - @ObfuscatedName("x") - long method4498(int var1) { - return this.field2874 + (long)var1 * (long)this.field2872; // L: 147 + @ObfuscatedName("l") + long method4552(int var1) { + return this.field2870 + (long)var1 * (long)this.field2867; // L: 147 } - @ObfuscatedName("k") + @ObfuscatedName("o") @Export("getPrioritizedTrack") int getPrioritizedTrack() { int var1 = this.trackPositions.length; // L: 151 @@ -230,7 +230,7 @@ public class MidiFileReader { return var2; // L: 161 } - @ObfuscatedName("r") + @ObfuscatedName("c") @Export("isDone") boolean isDone() { int var1 = this.trackPositions.length; // L: 165 @@ -244,15 +244,15 @@ public class MidiFileReader { return true; // L: 167 } - @ObfuscatedName("p") + @ObfuscatedName("e") @Export("reset") void reset(long var1) { - this.field2874 = var1; // L: 171 + this.field2870 = var1; // L: 171 int var3 = this.trackPositions.length; // L: 172 for (int var4 = 0; var4 < var3; ++var4) { // L: 173 this.trackLengths[var4] = 0; // L: 174 - this.field2871[var4] = 0; // L: 175 + this.field2862[var4] = 0; // L: 175 this.buffer.offset = this.trackStarts[var4]; // L: 176 this.readTrackLength(var4); // L: 177 this.trackPositions[var4] = this.buffer.offset; // L: 178 diff --git a/runescape-client/src/main/java/MidiPcmStream.java b/runescape-client/src/main/java/MidiPcmStream.java index f03a25c209..e8ed7bb82b 100644 --- a/runescape-client/src/main/java/MidiPcmStream.java +++ b/runescape-client/src/main/java/MidiPcmStream.java @@ -7,152 +7,158 @@ import net.runelite.mapping.ObfuscatedSignature; @ObfuscatedName("hp") @Implements("MidiPcmStream") public class MidiPcmStream extends PcmStream { - @ObfuscatedName("h") + @ObfuscatedName("oz") @ObfuscatedSignature( - descriptor = "Lmt;" + descriptor = "Ldw;" + ) + @Export("mouseWheel") + static MouseWheel mouseWheel; + @ObfuscatedName("v") + @ObfuscatedSignature( + descriptor = "Lmd;" ) @Export("musicPatches") NodeHashTable musicPatches; - @ObfuscatedName("c") + @ObfuscatedName("n") @ObfuscatedGetter( - intValue = -721191879 + intValue = -386188103 ) - int field2859; - @ObfuscatedName("o") + int field2834; + @ObfuscatedName("f") @ObfuscatedGetter( - intValue = -937356665 + intValue = 759378439 ) - int field2839; - @ObfuscatedName("g") - int[] field2840; - @ObfuscatedName("l") - int[] field2847; - @ObfuscatedName("z") - int[] field2842; - @ObfuscatedName("t") - int[] field2843; - @ObfuscatedName("v") - int[] field2844; + int field2853; + @ObfuscatedName("y") + int[] field2854; + @ObfuscatedName("p") + int[] field2837; + @ObfuscatedName("j") + int[] field2835; + @ObfuscatedName("r") + int[] field2839; @ObfuscatedName("b") - int[] field2845; - @ObfuscatedName("q") - int[] field2846; - @ObfuscatedName("i") + int[] field2861; + @ObfuscatedName("d") + int[] field2841; + @ObfuscatedName("s") + int[] field2842; + @ObfuscatedName("u") + int[] field2843; + @ObfuscatedName("l") int[] field2852; @ObfuscatedName("x") - int[] field2848; - @ObfuscatedName("m") - int[] field2853; - @ObfuscatedName("j") - int[] field2862; - @ObfuscatedName("f") - int[] field2861; - @ObfuscatedName("s") - int[] field2854; - @ObfuscatedName("y") - int[] field2855; + int[] field2846; + @ObfuscatedName("z") + int[] field2844; @ObfuscatedName("w") - int[] field2841; - @ObfuscatedName("n") + int[] field2848; + @ObfuscatedName("t") + int[] field2836; + @ObfuscatedName("h") + int[] field2850; + @ObfuscatedName("q") + int[] field2851; + @ObfuscatedName("i") @ObfuscatedSignature( - descriptor = "[[Liz;" + descriptor = "[[Liq;" ) - MusicPatchNode[][] field2857; - @ObfuscatedName("ag") - @ObfuscatedSignature( - descriptor = "[[Liz;" - ) - MusicPatchNode[][] field2858; + MusicPatchNode[][] field2847; @ObfuscatedName("ae") @ObfuscatedSignature( - descriptor = "Lik;" + descriptor = "[[Liq;" + ) + MusicPatchNode[][] field2849; + @ObfuscatedName("ap") + @ObfuscatedSignature( + descriptor = "Lir;" ) @Export("midiFile") MidiFileReader midiFile; - @ObfuscatedName("ao") - boolean field2860; - @ObfuscatedName("aj") + @ObfuscatedName("ab") + boolean field2855; + @ObfuscatedName("al") @ObfuscatedGetter( - intValue = 583793183 + intValue = -398624825 ) @Export("track") int track; - @ObfuscatedName("aw") + @ObfuscatedName("ad") @ObfuscatedGetter( - intValue = 1823610323 + intValue = 495959299 ) @Export("trackLength") int trackLength; - @ObfuscatedName("at") + @ObfuscatedName("ai") @ObfuscatedGetter( - longValue = -5295398764407046939L + longValue = 8283552259153278903L ) - long field2863; - @ObfuscatedName("av") + long field2858; + @ObfuscatedName("ar") @ObfuscatedGetter( - longValue = 8913828661084540373L + longValue = 5710666307152973315L ) - long field2864; - @ObfuscatedName("al") + long field2859; + @ObfuscatedName("ag") @ObfuscatedSignature( - descriptor = "Lin;" + descriptor = "Lih;" ) @Export("patchStream") MusicPatchPcmStream patchStream; public MidiPcmStream() { - this.field2859 = 256; // L: 14 - this.field2839 = 1000000; // L: 15 - this.field2840 = new int[16]; // L: 16 - this.field2847 = new int[16]; // L: 17 - this.field2842 = new int[16]; // L: 18 - this.field2843 = new int[16]; // L: 19 - this.field2844 = new int[16]; // L: 20 - this.field2845 = new int[16]; // L: 21 - this.field2846 = new int[16]; // L: 22 - this.field2852 = new int[16]; // L: 23 - this.field2848 = new int[16]; // L: 24 - this.field2853 = new int[16]; // L: 28 - this.field2862 = new int[16]; // L: 29 - this.field2861 = new int[16]; // L: 30 - this.field2854 = new int[16]; // L: 31 - this.field2855 = new int[16]; // L: 32 - this.field2841 = new int[16]; // L: 33 - this.field2857 = new MusicPatchNode[16][128]; // L: 34 - this.field2858 = new MusicPatchNode[16][128]; // L: 35 + this.field2834 = 256; // L: 14 + this.field2853 = 1000000; // L: 15 + this.field2854 = new int[16]; // L: 16 + this.field2837 = new int[16]; // L: 17 + this.field2835 = new int[16]; // L: 18 + this.field2839 = new int[16]; // L: 19 + this.field2861 = new int[16]; // L: 20 + this.field2841 = new int[16]; // L: 21 + this.field2842 = new int[16]; // L: 22 + this.field2843 = new int[16]; // L: 23 + this.field2852 = new int[16]; // L: 24 + this.field2846 = new int[16]; // L: 28 + this.field2844 = new int[16]; // L: 29 + this.field2848 = new int[16]; // L: 30 + this.field2836 = new int[16]; // L: 31 + this.field2850 = new int[16]; // L: 32 + this.field2851 = new int[16]; // L: 33 + this.field2847 = new MusicPatchNode[16][128]; // L: 34 + this.field2849 = new MusicPatchNode[16][128]; // L: 35 this.midiFile = new MidiFileReader(); // L: 36 this.patchStream = new MusicPatchPcmStream(this); // L: 42 this.musicPatches = new NodeHashTable(128); // L: 45 - this.method4443(); // L: 46 + this.method4429(); // L: 46 } // L: 47 - @ObfuscatedName("h") + @ObfuscatedName("v") @ObfuscatedSignature( descriptor = "(II)V", - garbageValue = "-1642106109" + garbageValue = "-315791633" ) @Export("setPcmStreamVolume") - synchronized void setPcmStreamVolume(int var1) { - this.field2859 = var1; // L: 50 + public synchronized void setPcmStreamVolume(int var1) { + this.field2834 = var1; // L: 50 } // L: 51 - @ObfuscatedName("c") + @ObfuscatedName("n") @ObfuscatedSignature( descriptor = "(I)I", - garbageValue = "-189437667" + garbageValue = "-1796230784" ) - int method4370() { - return this.field2859; // L: 54 + int method4410() { + return this.field2834; // L: 54 } - @ObfuscatedName("o") + @ObfuscatedName("f") @ObfuscatedSignature( - descriptor = "(Lit;Ljp;Lbu;II)Z", - garbageValue = "-945056189" + descriptor = "(Lie;Ljv;Lbu;II)Z", + garbageValue = "-1829332053" ) @Export("loadMusicTrack") - synchronized boolean loadMusicTrack(MusicTrack var1, AbstractArchive var2, SoundCache var3, int var4) { - var1.method4562(); // L: 58 + public synchronized boolean loadMusicTrack(MusicTrack var1, AbstractArchive var2, SoundCache var3, int var4) { + var1.method4622(); // L: 58 boolean var5 = true; // L: 59 int[] var6 = null; // L: 60 if (var4 > 0) { // L: 61 @@ -163,924 +169,925 @@ public class MidiPcmStream extends PcmStream { int var8 = (int)var7.key; // L: 63 MusicPatch var9 = (MusicPatch)this.musicPatches.get((long)var8); // L: 64 if (var9 == null) { // L: 65 - byte[] var11 = var2.takeFileFlat(var8); // L: 68 - MusicPatch var10; - if (var11 == null) { // L: 69 - var10 = null; // L: 70 - } else { - var10 = new MusicPatch(var11); // L: 73 - } - - var9 = var10; // L: 75 - if (var10 == null) { // L: 76 - var5 = false; // L: 77 + var9 = InvDefinition.method2609(var2, var8); // L: 66 + if (var9 == null) { // L: 67 + var5 = false; // L: 68 continue; } - this.musicPatches.put(var10, (long)var8); // L: 80 + this.musicPatches.put(var9, (long)var8); // L: 71 } - if (!var9.method4533(var3, var7.byteArray, var6)) { // L: 82 + if (!var9.method4588(var3, var7.byteArray, var6)) { // L: 73 var5 = false; } } - if (var5) { // L: 84 + if (var5) { // L: 75 var1.clear(); } - return var5; // L: 85 + return var5; // L: 76 } - @ObfuscatedName("g") + @ObfuscatedName("y") @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "1664614714" + descriptor = "(B)V", + garbageValue = "89" ) @Export("clearAll") - synchronized void clearAll() { - for (MusicPatch var1 = (MusicPatch)this.musicPatches.first(); var1 != null; var1 = (MusicPatch)this.musicPatches.next()) { // L: 89 + public synchronized void clearAll() { + for (MusicPatch var1 = (MusicPatch)this.musicPatches.first(); var1 != null; var1 = (MusicPatch)this.musicPatches.next()) { // L: 80 var1.clear(); } - } // L: 90 + } // L: 81 - @ObfuscatedName("l") + @ObfuscatedName("p") @ObfuscatedSignature( - descriptor = "(B)V", - garbageValue = "36" + descriptor = "(I)V", + garbageValue = "1244074850" ) @Export("removeAll") synchronized void removeAll() { - for (MusicPatch var1 = (MusicPatch)this.musicPatches.first(); var1 != null; var1 = (MusicPatch)this.musicPatches.next()) { // L: 93 + for (MusicPatch var1 = (MusicPatch)this.musicPatches.first(); var1 != null; var1 = (MusicPatch)this.musicPatches.next()) { // L: 84 var1.remove(); } - } // L: 94 + } // L: 85 - @ObfuscatedName("z") + @ObfuscatedName("j") @ObfuscatedSignature( - descriptor = "()Lbt;" + descriptor = "()Lbm;" ) @Export("firstSubStream") protected synchronized PcmStream firstSubStream() { - return this.patchStream; // L: 469 - } - - @ObfuscatedName("t") - @ObfuscatedSignature( - descriptor = "()Lbt;" - ) - @Export("nextSubStream") - protected synchronized PcmStream nextSubStream() { - return null; // L: 473 - } - - @ObfuscatedName("v") - protected synchronized int vmethod4560() { - return 0; // L: 477 - } - - @ObfuscatedName("b") - @Export("fill") - protected synchronized void fill(int[] var1, int var2, int var3) { - if (this.midiFile.isReady()) { // L: 481 - int var4 = this.midiFile.division * this.field2839 / PcmPlayer.field401; // L: 482 - - do { - long var5 = (long)var3 * (long)var4 + this.field2863; // L: 484 - if (this.field2864 - var5 >= 0L) { // L: 485 - this.field2863 = var5; // L: 486 - break; - } - - int var7 = (int)(((long)var4 + (this.field2864 - this.field2863) - 1L) / (long)var4); // L: 489 - this.field2863 += (long)var7 * (long)var4; // L: 490 - this.patchStream.fill(var1, var2, var7); // L: 491 - var2 += var7; // L: 492 - var3 -= var7; // L: 493 - this.method4457(); // L: 494 - } while(this.midiFile.isReady()); // L: 495 - } - - this.patchStream.fill(var1, var2, var3); // L: 498 - } // L: 499 - - @ObfuscatedName("q") - @ObfuscatedSignature( - descriptor = "(Lit;ZI)V", - garbageValue = "-1708010896" - ) - @Export("setMusicTrack") - synchronized void setMusicTrack(MusicTrack var1, boolean var2) { - this.clear(); // L: 97 - this.midiFile.parse(var1.midi); // L: 98 - this.field2860 = var2; // L: 99 - this.field2863 = 0L; // L: 100 - int var3 = this.midiFile.trackCount(); // L: 101 - - for (int var4 = 0; var4 < var3; ++var4) { // L: 102 - this.midiFile.gotoTrack(var4); // L: 103 - this.midiFile.readTrackLength(var4); // L: 104 - this.midiFile.markTrackPosition(var4); // L: 105 - } - - this.track = this.midiFile.getPrioritizedTrack(); // L: 107 - this.trackLength = this.midiFile.trackLengths[this.track]; // L: 108 - this.field2864 = this.midiFile.method4498(this.trackLength); // L: 109 - } // L: 110 - - @ObfuscatedName("i") - @Export("skip") - protected synchronized void skip(int var1) { - if (this.midiFile.isReady()) { // L: 502 - int var2 = this.midiFile.division * this.field2839 / PcmPlayer.field401; // L: 503 - - do { - long var3 = this.field2863 + (long)var2 * (long)var1; // L: 505 - if (this.field2864 - var3 >= 0L) { // L: 506 - this.field2863 = var3; // L: 507 - break; - } - - int var5 = (int)(((long)var2 + (this.field2864 - this.field2863) - 1L) / (long)var2); // L: 510 - this.field2863 += (long)var2 * (long)var5; // L: 511 - this.patchStream.skip(var5); // L: 512 - var1 -= var5; // L: 513 - this.method4457(); // L: 514 - } while(this.midiFile.isReady()); // L: 515 - } - - this.patchStream.skip(var1); // L: 518 - } // L: 519 - - @ObfuscatedName("x") - @ObfuscatedSignature( - descriptor = "(B)V", - garbageValue = "1" - ) - @Export("clear") - public synchronized void clear() { - this.midiFile.clear(); // L: 113 - this.method4443(); // L: 114 - } // L: 115 - - @ObfuscatedName("k") - @ObfuscatedSignature( - descriptor = "(B)Z", - garbageValue = "108" - ) - @Export("isReady") - public synchronized boolean isReady() { - return this.midiFile.isReady(); // L: 118 + return this.patchStream; // L: 460 } @ObfuscatedName("r") @ObfuscatedSignature( - descriptor = "(III)V", - garbageValue = "1960430804" + descriptor = "()Lbm;" ) - public synchronized void method4467(int var1, int var2) { - this.method4378(var1, var2); // L: 122 - } // L: 123 + @Export("nextSubStream") + protected synchronized PcmStream nextSubStream() { + return null; // L: 464 + } - @ObfuscatedName("p") - @ObfuscatedSignature( - descriptor = "(III)V", - garbageValue = "-1901698457" - ) - void method4378(int var1, int var2) { - this.field2843[var1] = var2; // L: 126 - this.field2845[var1] = var2 & -128; // L: 127 - this.method4379(var1, var2); // L: 128 - } // L: 129 + @ObfuscatedName("b") + protected synchronized int vmethod4610() { + return 0; // L: 468 + } - @ObfuscatedName("a") - @ObfuscatedSignature( - descriptor = "(IIB)V", - garbageValue = "-9" - ) - void method4379(int var1, int var2) { - if (var2 != this.field2844[var1]) { // L: 132 - this.field2844[var1] = var2; // L: 133 + @ObfuscatedName("d") + @Export("fill") + protected synchronized void fill(int[] var1, int var2, int var3) { + if (this.midiFile.isReady()) { // L: 472 + int var4 = this.midiFile.division * this.field2853 / PcmPlayer.field428; // L: 473 - for (int var3 = 0; var3 < 128; ++var3) { // L: 134 - this.field2858[var1][var3] = null; - } + do { + long var5 = this.field2858 + (long)var3 * (long)var4; // L: 475 + if (this.field2859 - var5 >= 0L) { // L: 476 + this.field2858 = var5; // L: 477 + break; + } + + int var7 = (int)((this.field2859 - this.field2858 + (long)var4 - 1L) / (long)var4); // L: 480 + this.field2858 += (long)var4 * (long)var7; // L: 481 + this.patchStream.fill(var1, var2, var7); // L: 482 + var2 += var7; // L: 483 + var3 -= var7; // L: 484 + this.method4441(); // L: 485 + } while(this.midiFile.isReady()); // L: 486 } - } // L: 136 + this.patchStream.fill(var1, var2, var3); // L: 489 + } // L: 490 + + @ObfuscatedName("s") + @ObfuscatedSignature( + descriptor = "(Lie;ZI)V", + garbageValue = "1330192797" + ) + @Export("setMusicTrack") + public synchronized void setMusicTrack(MusicTrack var1, boolean var2) { + this.clear(); // L: 88 + this.midiFile.parse(var1.midi); // L: 89 + this.field2855 = var2; // L: 90 + this.field2858 = 0L; // L: 91 + int var3 = this.midiFile.trackCount(); // L: 92 + + for (int var4 = 0; var4 < var3; ++var4) { // L: 93 + this.midiFile.gotoTrack(var4); // L: 94 + this.midiFile.readTrackLength(var4); // L: 95 + this.midiFile.markTrackPosition(var4); // L: 96 + } + + this.track = this.midiFile.getPrioritizedTrack(); // L: 98 + this.trackLength = this.midiFile.trackLengths[this.track]; // L: 99 + this.field2859 = this.midiFile.method4552(this.trackLength); // L: 100 + } // L: 101 + + @ObfuscatedName("u") + @Export("skip") + protected synchronized void skip(int var1) { + if (this.midiFile.isReady()) { // L: 493 + int var2 = this.midiFile.division * this.field2853 / PcmPlayer.field428; // L: 494 + + do { + long var3 = this.field2858 + (long)var2 * (long)var1; // L: 496 + if (this.field2859 - var3 >= 0L) { // L: 497 + this.field2858 = var3; // L: 498 + break; + } + + int var5 = (int)(((long)var2 + (this.field2859 - this.field2858) - 1L) / (long)var2); // L: 501 + this.field2858 += (long)var5 * (long)var2; // L: 502 + this.patchStream.skip(var5); // L: 503 + var1 -= var5; // L: 504 + this.method4441(); // L: 505 + } while(this.midiFile.isReady()); // L: 506 + } + + this.patchStream.skip(var1); // L: 509 + } // L: 510 + + @ObfuscatedName("l") + @ObfuscatedSignature( + descriptor = "(I)V", + garbageValue = "-1985172216" + ) + @Export("clear") + public synchronized void clear() { + this.midiFile.clear(); // L: 104 + this.method4429(); // L: 105 + } // L: 106 + + @ObfuscatedName("o") + @ObfuscatedSignature( + descriptor = "(I)Z", + garbageValue = "-1892448379" + ) + @Export("isReady") + public synchronized boolean isReady() { + return this.midiFile.isReady(); // L: 109 + } + + @ObfuscatedName("c") + @ObfuscatedSignature( + descriptor = "(III)V", + garbageValue = "1570912029" + ) + public synchronized void method4502(int var1, int var2) { + this.method4512(var1, var2); // L: 113 + } // L: 114 @ObfuscatedName("e") @ObfuscatedSignature( - descriptor = "(IIII)V", - garbageValue = "1677515144" + descriptor = "(IIB)V", + garbageValue = "-75" ) - void method4380(int var1, int var2, int var3) { - this.method4382(var1, var2, 64); // L: 139 - if ((this.field2853[var1] & 2) != 0) { // L: 140 - for (MusicPatchNode var4 = (MusicPatchNode)this.patchStream.queue.first(); var4 != null; var4 = (MusicPatchNode)this.patchStream.queue.next()) { // L: 141 - if (var4.field2908 == var1 && var4.field2898 < 0) { // L: 142 - this.field2857[var1][var4.field2902] = null; // L: 143 - this.field2857[var1][var2] = var4; // L: 144 - int var8 = (var4.field2900 * var4.field2906 >> 12) + var4.field2905; // L: 145 - var4.field2905 += var2 - var4.field2902 << 8; // L: 146 - var4.field2906 = var8 - var4.field2905; // L: 147 - var4.field2900 = 4096; // L: 148 - var4.field2902 = var2; // L: 149 - return; // L: 150 + void method4512(int var1, int var2) { + this.field2839[var1] = var2; // L: 117 + this.field2841[var1] = var2 & -128; // L: 118 + this.method4419(var1, var2); // L: 119 + } // L: 120 + + @ObfuscatedName("g") + @ObfuscatedSignature( + descriptor = "(III)V", + garbageValue = "-81134935" + ) + void method4419(int var1, int var2) { + if (var2 != this.field2861[var1]) { // L: 123 + this.field2861[var1] = var2; // L: 124 + + for (int var3 = 0; var3 < 128; ++var3) { // L: 125 + this.field2849[var1][var3] = null; + } + } + + } // L: 127 + + @ObfuscatedName("a") + @ObfuscatedSignature( + descriptor = "(IIII)V", + garbageValue = "1345766655" + ) + void method4420(int var1, int var2, int var3) { + this.method4418(var1, var2, 64); // L: 130 + if ((this.field2846[var1] & 2) != 0) { // L: 131 + for (MusicPatchNode var4 = (MusicPatchNode)this.patchStream.queue.first(); var4 != null; var4 = (MusicPatchNode)this.patchStream.queue.next()) { // L: 132 + if (var4.field2905 == var1 && var4.field2895 < 0) { // L: 133 + this.field2847[var1][var4.field2896] = null; // L: 134 + this.field2847[var1][var2] = var4; // L: 135 + int var8 = (var4.field2901 * var4.field2899 >> 12) + var4.field2900; // L: 136 + var4.field2900 += var2 - var4.field2896 << 8; // L: 137 + var4.field2899 = var8 - var4.field2900; // L: 138 + var4.field2901 = 4096; // L: 139 + var4.field2896 = var2; // L: 140 + return; // L: 141 } } } - MusicPatch var9 = (MusicPatch)this.musicPatches.get((long)this.field2844[var1]); // L: 154 - if (var9 != null) { // L: 155 - RawSound var5 = var9.rawSounds[var2]; // L: 156 - if (var5 != null) { // L: 157 - MusicPatchNode var6 = new MusicPatchNode(); // L: 158 - var6.field2908 = var1; // L: 159 - var6.patch = var9; // L: 160 - var6.rawSound = var5; // L: 161 - var6.field2915 = var9.field2880[var2]; // L: 162 - var6.field2907 = var9.field2886[var2]; // L: 163 - var6.field2902 = var2; // L: 164 - var6.field2903 = var3 * var3 * var9.field2888[var2] * var9.field2883 + 1024 >> 11; // L: 165 - var6.field2904 = var9.field2884[var2] & 255; // L: 166 - var6.field2905 = (var2 << 8) - (var9.field2881[var2] & 32767); // L: 167 - var6.field2911 = 0; // L: 168 - var6.field2909 = 0; // L: 169 - var6.field2910 = 0; // L: 170 - var6.field2898 = -1; // L: 171 - var6.field2912 = 0; // L: 172 - if (this.field2854[var1] == 0) { // L: 173 - var6.stream = RawPcmStream.method885(var5, this.method4402(var6), this.method4395(var6), this.method4480(var6)); // L: 174 + MusicPatch var9 = (MusicPatch)this.musicPatches.get((long)this.field2861[var1]); // L: 145 + if (var9 != null) { // L: 146 + RawSound var5 = var9.rawSounds[var2]; // L: 147 + if (var5 != null) { // L: 148 + MusicPatchNode var6 = new MusicPatchNode(); // L: 149 + var6.field2905 = var1; // L: 150 + var6.patch = var9; // L: 151 + var6.rawSound = var5; // L: 152 + var6.field2894 = var9.field2876[var2]; // L: 153 + var6.field2893 = var9.field2882[var2]; // L: 154 + var6.field2896 = var2; // L: 155 + var6.field2897 = var3 * var3 * var9.field2879[var2] * var9.field2881 + 1024 >> 11; // L: 156 + var6.field2898 = var9.field2880[var2] & 255; // L: 157 + var6.field2900 = (var2 << 8) - (var9.field2878[var2] & 32767); // L: 158 + var6.field2902 = 0; // L: 159 + var6.field2903 = 0; // L: 160 + var6.field2911 = 0; // L: 161 + var6.field2895 = -1; // L: 162 + var6.field2906 = 0; // L: 163 + if (this.field2836[var1] == 0) { // L: 164 + var6.stream = RawPcmStream.method842(var5, this.method4415(var6), this.method4434(var6), this.method4435(var6)); // L: 165 } else { - var6.stream = RawPcmStream.method885(var5, this.method4402(var6), 0, this.method4480(var6)); // L: 177 - this.method4430(var6, var9.field2881[var2] < 0); // L: 178 + var6.stream = RawPcmStream.method842(var5, this.method4415(var6), 0, this.method4435(var6)); // L: 168 + this.method4421(var6, var9.field2878[var2] < 0); // L: 169 } - if (var9.field2881[var2] < 0) { // L: 180 + if (var9.field2878[var2] < 0) { // L: 171 var6.stream.setNumLoops(-1); } - if (var6.field2907 >= 0) { // L: 181 - MusicPatchNode var7 = this.field2858[var1][var6.field2907]; // L: 182 - if (var7 != null && var7.field2898 < 0) { // L: 183 - this.field2857[var1][var7.field2902] = null; // L: 184 - var7.field2898 = 0; // L: 185 + if (var6.field2893 >= 0) { // L: 172 + MusicPatchNode var7 = this.field2849[var1][var6.field2893]; // L: 173 + if (var7 != null && var7.field2895 < 0) { // L: 174 + this.field2847[var1][var7.field2896] = null; // L: 175 + var7.field2895 = 0; // L: 176 } - this.field2858[var1][var6.field2907] = var6; // L: 187 + this.field2849[var1][var6.field2893] = var6; // L: 178 } - this.patchStream.queue.addFirst(var6); // L: 189 - this.field2857[var1][var2] = var6; // L: 190 + this.patchStream.queue.addFirst(var6); // L: 180 + this.field2847[var1][var2] = var6; // L: 181 } } - } // L: 191 + } // L: 182 - @ObfuscatedName("d") + @ObfuscatedName("k") @ObfuscatedSignature( - descriptor = "(Liz;ZI)V", - garbageValue = "-1985723327" + descriptor = "(Liq;ZB)V", + garbageValue = "-23" ) - void method4430(MusicPatchNode var1, boolean var2) { - int var3 = var1.rawSound.samples.length; // L: 194 + void method4421(MusicPatchNode var1, boolean var2) { + int var3 = var1.rawSound.samples.length; // L: 185 int var4; - if (var2 && var1.rawSound.field381) { // L: 196 - int var5 = var3 + var3 - var1.rawSound.start; // L: 197 - var4 = (int)((long)var5 * (long)this.field2854[var1.field2908] >> 6); // L: 198 - var3 <<= 8; // L: 199 - if (var4 >= var3) { // L: 200 - var4 = var3 + var3 - 1 - var4; // L: 201 - var1.stream.method959(); // L: 202 + if (var2 && var1.rawSound.field399) { // L: 187 + int var5 = var3 + var3 - var1.rawSound.start; // L: 188 + var4 = (int)((long)this.field2836[var1.field2905] * (long)var5 >> 6); // L: 189 + var3 <<= 8; // L: 190 + if (var4 >= var3) { // L: 191 + var4 = var3 + var3 - 1 - var4; // L: 192 + var1.stream.method888(); // L: 193 } } else { - var4 = (int)((long)this.field2854[var1.field2908] * (long)var3 >> 6); // L: 206 + var4 = (int)((long)var3 * (long)this.field2836[var1.field2905] >> 6); // L: 197 } - var1.stream.method893(var4); // L: 208 - } // L: 209 - - @ObfuscatedName("u") - @ObfuscatedSignature( - descriptor = "(IIII)V", - garbageValue = "346835095" - ) - void method4382(int var1, int var2, int var3) { - MusicPatchNode var4 = this.field2857[var1][var2]; // L: 212 - if (var4 != null) { // L: 213 - this.field2857[var1][var2] = null; // L: 214 - if ((this.field2853[var1] & 2) != 0) { // L: 215 - for (MusicPatchNode var5 = (MusicPatchNode)this.patchStream.queue.last(); var5 != null; var5 = (MusicPatchNode)this.patchStream.queue.previous()) { // L: 216 - if (var5.field2908 == var4.field2908 && var5.field2898 < 0 && var5 != var4) { // L: 217 - var4.field2898 = 0; // L: 218 - break; // L: 219 - } - } - } else { - var4.field2898 = 0; // L: 224 - } - - } - } // L: 226 + var1.stream.method900(var4); // L: 199 + } // L: 200 @ObfuscatedName("m") @ObfuscatedSignature( - descriptor = "(IIII)V", - garbageValue = "-2125411861" - ) - void method4383(int var1, int var2, int var3) { - } // L: 228 - - @ObfuscatedName("j") - @ObfuscatedSignature( - descriptor = "(III)V", - garbageValue = "-1228183682" - ) - void method4384(int var1, int var2) { - } // L: 229 - - @ObfuscatedName("f") - @ObfuscatedSignature( - descriptor = "(IIB)V", + descriptor = "(IIIB)V", garbageValue = "58" ) - void method4414(int var1, int var2) { - this.field2846[var1] = var2; // L: 232 - } // L: 233 + void method4418(int var1, int var2, int var3) { + MusicPatchNode var4 = this.field2847[var1][var2]; // L: 203 + if (var4 != null) { // L: 204 + this.field2847[var1][var2] = null; // L: 205 + if ((this.field2846[var1] & 2) != 0) { // L: 206 + for (MusicPatchNode var5 = (MusicPatchNode)this.patchStream.queue.last(); var5 != null; var5 = (MusicPatchNode)this.patchStream.queue.previous()) { // L: 207 + if (var5.field2905 == var4.field2905 && var5.field2895 < 0 && var4 != var5) { // L: 208 + var4.field2895 = 0; // L: 209 + break; // L: 210 + } + } + } else { + var4.field2895 = 0; // L: 215 + } - @ObfuscatedName("aw") + } + } // L: 217 + + @ObfuscatedName("x") + @ObfuscatedSignature( + descriptor = "(IIII)V", + garbageValue = "-366047626" + ) + void method4423(int var1, int var2, int var3) { + } // L: 219 + + @ObfuscatedName("z") + @ObfuscatedSignature( + descriptor = "(III)V", + garbageValue = "852353128" + ) + void method4501(int var1, int var2) { + } // L: 220 + + @ObfuscatedName("w") + @ObfuscatedSignature( + descriptor = "(IIB)V", + garbageValue = "-5" + ) + void method4425(int var1, int var2) { + this.field2842[var1] = var2; // L: 223 + } // L: 224 + + @ObfuscatedName("t") @ObfuscatedSignature( descriptor = "(II)V", - garbageValue = "1869660394" + garbageValue = "2477568" ) - void method4386(int var1) { - for (MusicPatchNode var2 = (MusicPatchNode)this.patchStream.queue.last(); var2 != null; var2 = (MusicPatchNode)this.patchStream.queue.previous()) { // L: 236 - if (var1 < 0 || var2.field2908 == var1) { // L: 237 - if (var2.stream != null) { // L: 238 - var2.stream.method898(PcmPlayer.field401 / 100); // L: 239 - if (var2.stream.method902()) { // L: 240 + void method4426(int var1) { + for (MusicPatchNode var2 = (MusicPatchNode)this.patchStream.queue.last(); var2 != null; var2 = (MusicPatchNode)this.patchStream.queue.previous()) { // L: 227 + if (var1 < 0 || var2.field2905 == var1) { // L: 228 + if (var2.stream != null) { // L: 229 + var2.stream.method855(PcmPlayer.field428 / 100); // L: 230 + if (var2.stream.method859()) { // L: 231 this.patchStream.mixer.addSubStream(var2.stream); } - var2.method4575(); // L: 241 + var2.method4634(); // L: 232 } - if (var2.field2898 < 0) { // L: 243 - this.field2857[var2.field2908][var2.field2902] = null; + if (var2.field2895 < 0) { // L: 234 + this.field2847[var2.field2905][var2.field2896] = null; } - var2.remove(); // L: 244 + var2.remove(); // L: 235 } } - } // L: 247 + } // L: 238 - @ObfuscatedName("ap") + @ObfuscatedName("h") @ObfuscatedSignature( descriptor = "(II)V", - garbageValue = "-2132119463" + garbageValue = "-1043884473" ) - void method4387(int var1) { - if (var1 >= 0) { // L: 250 - this.field2840[var1] = 12800; // L: 254 - this.field2847[var1] = 8192; // L: 255 - this.field2842[var1] = 16383; // L: 256 - this.field2846[var1] = 8192; // L: 257 - this.field2852[var1] = 0; // L: 258 - this.field2848[var1] = 8192; // L: 259 - this.method4390(var1); // L: 260 - this.method4391(var1); // L: 261 - this.field2853[var1] = 0; // L: 262 - this.field2862[var1] = 32767; // L: 263 - this.field2861[var1] = 256; // L: 264 - this.field2854[var1] = 0; // L: 265 - this.method4454(var1, 8192); // L: 266 + void method4433(int var1) { + if (var1 >= 0) { // L: 241 + this.field2854[var1] = 12800; // L: 245 + this.field2837[var1] = 8192; // L: 246 + this.field2835[var1] = 16383; // L: 247 + this.field2842[var1] = 8192; // L: 248 + this.field2843[var1] = 0; // L: 249 + this.field2852[var1] = 8192; // L: 250 + this.method4438(var1); // L: 251 + this.method4431(var1); // L: 252 + this.field2846[var1] = 0; // L: 253 + this.field2844[var1] = 32767; // L: 254 + this.field2848[var1] = 256; // L: 255 + this.field2836[var1] = 0; // L: 256 + this.method4474(var1, 8192); // L: 257 } else { - for (var1 = 0; var1 < 16; ++var1) { // L: 251 - this.method4387(var1); + for (var1 = 0; var1 < 16; ++var1) { // L: 242 + this.method4433(var1); } } - } // L: 252 267 + } // L: 243 258 - @ObfuscatedName("am") + @ObfuscatedName("ag") @ObfuscatedSignature( - descriptor = "(IB)V", - garbageValue = "68" + descriptor = "(II)V", + garbageValue = "1363851317" ) - void method4388(int var1) { - for (MusicPatchNode var2 = (MusicPatchNode)this.patchStream.queue.last(); var2 != null; var2 = (MusicPatchNode)this.patchStream.queue.previous()) { // L: 270 - if ((var1 < 0 || var2.field2908 == var1) && var2.field2898 < 0) { // L: 271 272 - this.field2857[var2.field2908][var2.field2902] = null; // L: 273 - var2.field2898 = 0; // L: 274 + void method4436(int var1) { + for (MusicPatchNode var2 = (MusicPatchNode)this.patchStream.queue.last(); var2 != null; var2 = (MusicPatchNode)this.patchStream.queue.previous()) { // L: 261 + if ((var1 < 0 || var2.field2905 == var1) && var2.field2895 < 0) { // L: 262 263 + this.field2847[var2.field2905][var2.field2896] = null; // L: 264 + var2.field2895 = 0; // L: 265 } } - } // L: 278 + } // L: 269 - @ObfuscatedName("ak") + @ObfuscatedName("ax") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "1564118561" + garbageValue = "1017241688" ) - void method4443() { - this.method4386(-1); // L: 281 - this.method4387(-1); // L: 282 + void method4429() { + this.method4426(-1); // L: 272 + this.method4433(-1); // L: 273 int var1; - for (var1 = 0; var1 < 16; ++var1) { // L: 283 - this.field2844[var1] = this.field2843[var1]; + for (var1 = 0; var1 < 16; ++var1) { // L: 274 + this.field2861[var1] = this.field2839[var1]; } - for (var1 = 0; var1 < 16; ++var1) { // L: 284 - this.field2845[var1] = this.field2843[var1] & -128; + for (var1 = 0; var1 < 16; ++var1) { // L: 275 + this.field2841[var1] = this.field2839[var1] & -128; } - } // L: 285 + } // L: 276 - @ObfuscatedName("ay") + @ObfuscatedName("as") + @ObfuscatedSignature( + descriptor = "(II)V", + garbageValue = "1658989122" + ) + void method4438(int var1) { + if ((this.field2846[var1] & 2) != 0) { // L: 279 + for (MusicPatchNode var2 = (MusicPatchNode)this.patchStream.queue.last(); var2 != null; var2 = (MusicPatchNode)this.patchStream.queue.previous()) { // L: 280 + if (var2.field2905 == var1 && this.field2847[var1][var2.field2896] == null && var2.field2895 < 0) { // L: 281 282 + var2.field2895 = 0; + } + } + } + + } // L: 286 + + @ObfuscatedName("av") @ObfuscatedSignature( descriptor = "(IB)V", - garbageValue = "-62" + garbageValue = "119" ) - void method4390(int var1) { - if ((this.field2853[var1] & 2) != 0) { // L: 288 - for (MusicPatchNode var2 = (MusicPatchNode)this.patchStream.queue.last(); var2 != null; var2 = (MusicPatchNode)this.patchStream.queue.previous()) { // L: 289 - if (var2.field2908 == var1 && this.field2857[var1][var2.field2902] == null && var2.field2898 < 0) { // L: 290 291 - var2.field2898 = 0; + void method4431(int var1) { + if ((this.field2846[var1] & 4) != 0) { // L: 289 + for (MusicPatchNode var2 = (MusicPatchNode)this.patchStream.queue.last(); var2 != null; var2 = (MusicPatchNode)this.patchStream.queue.previous()) { // L: 290 + if (var2.field2905 == var1) { // L: 291 + var2.field2904 = 0; } } } - } // L: 295 + } // L: 294 - @ObfuscatedName("ai") + @ObfuscatedName("ac") @ObfuscatedSignature( - descriptor = "(II)V", - garbageValue = "-588228357" + descriptor = "(IB)V", + garbageValue = "1" ) - void method4391(int var1) { - if ((this.field2853[var1] & 4) != 0) { // L: 298 - for (MusicPatchNode var2 = (MusicPatchNode)this.patchStream.queue.last(); var2 != null; var2 = (MusicPatchNode)this.patchStream.queue.previous()) { // L: 299 - if (var2.field2908 == var1) { // L: 300 - var2.field2917 = 0; - } - } - } - - } // L: 303 - - @ObfuscatedName("aa") - @ObfuscatedSignature( - descriptor = "(II)V", - garbageValue = "74597031" - ) - void method4392(int var1) { - int var2 = var1 & 240; // L: 306 + void method4452(int var1) { + int var2 = var1 & 240; // L: 297 int var3; int var4; int var5; - if (var2 == 128) { // L: 307 - var3 = var1 & 15; // L: 308 - var4 = var1 >> 8 & 127; // L: 309 - var5 = var1 >> 16 & 127; // L: 310 - this.method4382(var3, var4, var5); // L: 311 - } else if (var2 == 144) { // L: 314 - var3 = var1 & 15; // L: 315 - var4 = var1 >> 8 & 127; // L: 316 - var5 = var1 >> 16 & 127; // L: 317 - if (var5 > 0) { // L: 318 - this.method4380(var3, var4, var5); + if (var2 == 128) { // L: 298 + var3 = var1 & 15; // L: 299 + var4 = var1 >> 8 & 127; // L: 300 + var5 = var1 >> 16 & 127; // L: 301 + this.method4418(var3, var4, var5); // L: 302 + } else if (var2 == 144) { // L: 305 + var3 = var1 & 15; // L: 306 + var4 = var1 >> 8 & 127; // L: 307 + var5 = var1 >> 16 & 127; // L: 308 + if (var5 > 0) { // L: 309 + this.method4420(var3, var4, var5); } else { - this.method4382(var3, var4, 64); // L: 319 + this.method4418(var3, var4, 64); // L: 310 } - } else if (var2 == 160) { // L: 322 - var3 = var1 & 15; // L: 323 - var4 = var1 >> 8 & 127; // L: 324 - var5 = var1 >> 16 & 127; // L: 325 - this.method4383(var3, var4, var5); // L: 326 - } else if (var2 == 176) { // L: 329 - var3 = var1 & 15; // L: 330 - var4 = var1 >> 8 & 127; // L: 331 - var5 = var1 >> 16 & 127; // L: 332 - if (var4 == 0) { // L: 333 - this.field2845[var3] = (var5 << 14) + (this.field2845[var3] & -2080769); + } else if (var2 == 160) { // L: 313 + var3 = var1 & 15; // L: 314 + var4 = var1 >> 8 & 127; // L: 315 + var5 = var1 >> 16 & 127; // L: 316 + this.method4423(var3, var4, var5); // L: 317 + } else if (var2 == 176) { // L: 320 + var3 = var1 & 15; // L: 321 + var4 = var1 >> 8 & 127; // L: 322 + var5 = var1 >> 16 & 127; // L: 323 + if (var4 == 0) { // L: 324 + this.field2841[var3] = (var5 << 14) + (this.field2841[var3] & -2080769); } - if (var4 == 32) { // L: 334 - this.field2845[var3] = (var5 << 7) + (this.field2845[var3] & -16257); + if (var4 == 32) { // L: 325 + this.field2841[var3] = (var5 << 7) + (this.field2841[var3] & -16257); } - if (var4 == 1) { // L: 335 + if (var4 == 1) { // L: 326 + this.field2843[var3] = (var5 << 7) + (this.field2843[var3] & -16257); + } + + if (var4 == 33) { // L: 327 + this.field2843[var3] = var5 + (this.field2843[var3] & -128); + } + + if (var4 == 5) { // L: 328 this.field2852[var3] = (var5 << 7) + (this.field2852[var3] & -16257); } - if (var4 == 33) { // L: 336 + if (var4 == 37) { // L: 329 this.field2852[var3] = var5 + (this.field2852[var3] & -128); } - if (var4 == 5) { // L: 337 - this.field2848[var3] = (var5 << 7) + (this.field2848[var3] & -16257); + if (var4 == 7) { // L: 330 + this.field2854[var3] = (var5 << 7) + (this.field2854[var3] & -16257); } - if (var4 == 37) { // L: 338 - this.field2848[var3] = var5 + (this.field2848[var3] & -128); + if (var4 == 39) { // L: 331 + this.field2854[var3] = var5 + (this.field2854[var3] & -128); } - if (var4 == 7) { // L: 339 - this.field2840[var3] = (var5 << 7) + (this.field2840[var3] & -16257); + if (var4 == 10) { // L: 332 + this.field2837[var3] = (var5 << 7) + (this.field2837[var3] & -16257); } - if (var4 == 39) { // L: 340 - this.field2840[var3] = var5 + (this.field2840[var3] & -128); + if (var4 == 42) { // L: 333 + this.field2837[var3] = var5 + (this.field2837[var3] & -128); } - if (var4 == 10) { // L: 341 - this.field2847[var3] = (var5 << 7) + (this.field2847[var3] & -16257); + if (var4 == 11) { // L: 334 + this.field2835[var3] = (var5 << 7) + (this.field2835[var3] & -16257); } - if (var4 == 42) { // L: 342 - this.field2847[var3] = var5 + (this.field2847[var3] & -128); - } - - if (var4 == 11) { // L: 343 - this.field2842[var3] = (var5 << 7) + (this.field2842[var3] & -16257); - } - - if (var4 == 43) { // L: 344 - this.field2842[var3] = var5 + (this.field2842[var3] & -128); + if (var4 == 43) { // L: 335 + this.field2835[var3] = var5 + (this.field2835[var3] & -128); } int[] var10000; - if (var4 == 64) { // L: 345 - if (var5 >= 64) { // L: 346 - var10000 = this.field2853; + if (var4 == 64) { // L: 336 + if (var5 >= 64) { // L: 337 + var10000 = this.field2846; var10000[var3] |= 1; } else { - var10000 = this.field2853; // L: 347 + var10000 = this.field2846; // L: 338 var10000[var3] &= -2; } } - if (var4 == 65) { // L: 349 - if (var5 >= 64) { // L: 350 - var10000 = this.field2853; + if (var4 == 65) { // L: 340 + if (var5 >= 64) { // L: 341 + var10000 = this.field2846; var10000[var3] |= 2; } else { - this.method4390(var3); // L: 352 - var10000 = this.field2853; // L: 353 + this.method4438(var3); // L: 343 + var10000 = this.field2846; // L: 344 var10000[var3] &= -3; } } - if (var4 == 99) { // L: 356 - this.field2862[var3] = (var5 << 7) + (this.field2862[var3] & 127); + if (var4 == 99) { // L: 347 + this.field2844[var3] = (var5 << 7) + (this.field2844[var3] & 127); } - if (var4 == 98) { // L: 357 - this.field2862[var3] = (this.field2862[var3] & 16256) + var5; + if (var4 == 98) { // L: 348 + this.field2844[var3] = (this.field2844[var3] & 16256) + var5; } - if (var4 == 101) { // L: 358 - this.field2862[var3] = (var5 << 7) + (this.field2862[var3] & 127) + 16384; + if (var4 == 101) { // L: 349 + this.field2844[var3] = (var5 << 7) + (this.field2844[var3] & 127) + 16384; } - if (var4 == 100) { // L: 359 - this.field2862[var3] = (this.field2862[var3] & 16256) + var5 + 16384; + if (var4 == 100) { // L: 350 + this.field2844[var3] = (this.field2844[var3] & 16256) + var5 + 16384; } - if (var4 == 120) { // L: 360 - this.method4386(var3); + if (var4 == 120) { // L: 351 + this.method4426(var3); } - if (var4 == 121) { // L: 361 - this.method4387(var3); + if (var4 == 121) { // L: 352 + this.method4433(var3); } - if (var4 == 123) { // L: 362 - this.method4388(var3); + if (var4 == 123) { // L: 353 + this.method4436(var3); } int var6; - if (var4 == 6) { // L: 363 - var6 = this.field2862[var3]; // L: 364 - if (var6 == 16384) { // L: 365 - this.field2861[var3] = (var5 << 7) + (this.field2861[var3] & -16257); + if (var4 == 6) { // L: 354 + var6 = this.field2844[var3]; // L: 355 + if (var6 == 16384) { // L: 356 + this.field2848[var3] = (var5 << 7) + (this.field2848[var3] & -16257); } } - if (var4 == 38) { // L: 367 - var6 = this.field2862[var3]; // L: 368 - if (var6 == 16384) { // L: 369 - this.field2861[var3] = var5 + (this.field2861[var3] & -128); + if (var4 == 38) { // L: 358 + var6 = this.field2844[var3]; // L: 359 + if (var6 == 16384) { // L: 360 + this.field2848[var3] = var5 + (this.field2848[var3] & -128); } } - if (var4 == 16) { // L: 371 - this.field2854[var3] = (var5 << 7) + (this.field2854[var3] & -16257); + if (var4 == 16) { // L: 362 + this.field2836[var3] = (var5 << 7) + (this.field2836[var3] & -16257); } - if (var4 == 48) { // L: 372 - this.field2854[var3] = var5 + (this.field2854[var3] & -128); + if (var4 == 48) { // L: 363 + this.field2836[var3] = var5 + (this.field2836[var3] & -128); } - if (var4 == 81) { // L: 373 - if (var5 >= 64) { // L: 374 - var10000 = this.field2853; + if (var4 == 81) { // L: 364 + if (var5 >= 64) { // L: 365 + var10000 = this.field2846; var10000[var3] |= 4; } else { - this.method4391(var3); // L: 376 - var10000 = this.field2853; // L: 377 + this.method4431(var3); // L: 367 + var10000 = this.field2846; // L: 368 var10000[var3] &= -5; } } - if (var4 == 17) { // L: 380 - this.method4454(var3, (var5 << 7) + (this.field2855[var3] & -16257)); + if (var4 == 17) { + this.method4474(var3, (var5 << 7) + (this.field2850[var3] & -16257)); // L: 371 } - if (var4 == 49) { // L: 381 - this.method4454(var3, var5 + (this.field2855[var3] & -128)); + if (var4 == 49) { // L: 372 + this.method4474(var3, var5 + (this.field2850[var3] & -128)); } - } else if (var2 == 192) { // L: 384 - var3 = var1 & 15; // L: 385 - var4 = var1 >> 8 & 127; // L: 386 - this.method4379(var3, var4 + this.field2845[var3]); // L: 387 - } else if (var2 == 208) { // L: 390 - var3 = var1 & 15; // L: 391 - var4 = var1 >> 8 & 127; // L: 392 - this.method4384(var3, var4); // L: 393 - } else if (var2 == 224) { // L: 396 - var3 = var1 & 15; // L: 397 - var4 = (var1 >> 8 & 127) + (var1 >> 9 & 16256); // L: 398 - this.method4414(var3, var4); // L: 399 + } else if (var2 == 192) { // L: 375 + var3 = var1 & 15; // L: 376 + var4 = var1 >> 8 & 127; // L: 377 + this.method4419(var3, var4 + this.field2841[var3]); // L: 378 + } else if (var2 == 208) { // L: 381 + var3 = var1 & 15; // L: 382 + var4 = var1 >> 8 & 127; // L: 383 + this.method4501(var3, var4); // L: 384 + } else if (var2 == 224) { // L: 387 + var3 = var1 & 15; // L: 388 + var4 = (var1 >> 8 & 127) + (var1 >> 9 & 16256); // L: 389 + this.method4425(var3, var4); // L: 390 } else { - var2 = var1 & 255; // L: 402 - if (var2 == 255) { // L: 403 - this.method4443(); // L: 404 + var2 = var1 & 255; // L: 393 + if (var2 == 255) { // L: 394 + this.method4429(); // L: 395 } } - } // L: 312 320 327 382 388 394 400 405 407 + } // L: 303 311 318 373 379 385 391 396 398 - @ObfuscatedName("au") + @ObfuscatedName("at") @ObfuscatedSignature( - descriptor = "(IIB)V", - garbageValue = "49" + descriptor = "(III)V", + garbageValue = "498737337" ) - void method4454(int var1, int var2) { - this.field2855[var1] = var2; // L: 410 - this.field2841[var1] = (int)(2097152.0D * Math.pow(2.0D, 5.4931640625E-4D * (double)var2) + 0.5D); // L: 411 - } // L: 412 + void method4474(int var1, int var2) { + this.field2850[var1] = var2; // L: 401 + this.field2851[var1] = (int)(2097152.0D * Math.pow(2.0D, (double)var2 * 5.4931640625E-4D) + 0.5D); // L: 402 + } // L: 403 - @ObfuscatedName("as") + @ObfuscatedName("ao") @ObfuscatedSignature( - descriptor = "(Liz;I)I", - garbageValue = "-2127783338" + descriptor = "(Liq;B)I", + garbageValue = "1" ) - int method4402(MusicPatchNode var1) { - int var2 = (var1.field2906 * var1.field2900 >> 12) + var1.field2905; // L: 415 - var2 += (this.field2846[var1.field2908] - 8192) * this.field2861[var1.field2908] >> 12; // L: 416 - MusicPatchNode2 var3 = var1.field2915; // L: 417 + int method4415(MusicPatchNode var1) { + int var2 = (var1.field2901 * var1.field2899 >> 12) + var1.field2900; // L: 406 + var2 += (this.field2842[var1.field2905] - 8192) * this.field2848[var1.field2905] >> 12; // L: 407 + MusicPatchNode2 var3 = var1.field2894; // L: 408 int var4; - if (var3.field2826 > 0 && (var3.field2824 > 0 || this.field2852[var1.field2908] > 0)) { // L: 418 - var4 = var3.field2824 << 2; // L: 419 - int var5 = var3.field2817 << 1; // L: 420 - if (var1.field2913 < var5) { // L: 421 - var4 = var4 * var1.field2913 / var5; + if (var3.field2817 > 0 && (var3.field2822 > 0 || this.field2843[var1.field2905] > 0)) { // L: 409 + var4 = var3.field2822 << 2; // L: 410 + int var5 = var3.field2823 << 1; // L: 411 + if (var1.field2907 < var5) { // L: 412 + var4 = var4 * var1.field2907 / var5; } - var4 += this.field2852[var1.field2908] >> 7; // L: 422 - double var6 = Math.sin(0.01227184630308513D * (double)(var1.field2901 & 511)); // L: 423 - var2 += (int)(var6 * (double)var4); // L: 424 + var4 += this.field2843[var1.field2905] >> 7; // L: 413 + double var6 = Math.sin(0.01227184630308513D * (double)(var1.field2908 & 511)); // L: 414 + var2 += (int)((double)var4 * var6); // L: 415 } - var4 = (int)((double)(var1.rawSound.sampleRate * 256) * Math.pow(2.0D, (double)var2 * 3.255208333333333E-4D) / (double)PcmPlayer.field401 + 0.5D); // L: 426 - return var4 < 1 ? 1 : var4; // L: 427 + var4 = (int)((double)(var1.rawSound.sampleRate * 256) * Math.pow(2.0D, 3.255208333333333E-4D * (double)var2) / (double)PcmPlayer.field428 + 0.5D); // L: 417 + return var4 < 1 ? 1 : var4; // L: 418 } - @ObfuscatedName("ad") + @ObfuscatedName("aq") @ObfuscatedSignature( - descriptor = "(Liz;I)I", - garbageValue = "-1764215804" + descriptor = "(Liq;I)I", + garbageValue = "-2121980978" ) - int method4395(MusicPatchNode var1) { - MusicPatchNode2 var2 = var1.field2915; // L: 431 - int var3 = this.field2842[var1.field2908] * this.field2840[var1.field2908] + 4096 >> 13; // L: 432 - var3 = var3 * var3 + 16384 >> 15; // L: 433 - var3 = var3 * var1.field2903 + 16384 >> 15; // L: 434 - var3 = var3 * this.field2859 + 128 >> 8; // L: 435 - if (var2.field2825 > 0) { // L: 436 - var3 = (int)((double)var3 * Math.pow(0.5D, 1.953125E-5D * (double)var1.field2911 * (double)var2.field2825) + 0.5D); // L: 437 + int method4434(MusicPatchNode var1) { + MusicPatchNode2 var2 = var1.field2894; // L: 422 + int var3 = this.field2854[var1.field2905] * this.field2835[var1.field2905] + 4096 >> 13; // L: 423 + var3 = var3 * var3 + 16384 >> 15; // L: 424 + var3 = var3 * var1.field2897 + 16384 >> 15; // L: 425 + var3 = var3 * this.field2834 + 128 >> 8; // L: 426 + if (var2.field2815 > 0) { // L: 427 + var3 = (int)((double)var3 * Math.pow(0.5D, (double)var2.field2815 * (double)var1.field2902 * 1.953125E-5D) + 0.5D); // L: 428 } int var4; int var5; int var6; int var7; - if (var2.field2819 != null) { // L: 439 - var4 = var1.field2909; // L: 440 - var5 = var2.field2819[var1.field2910 + 1]; // L: 441 - if (var1.field2910 < var2.field2819.length - 2) { // L: 442 - var6 = (var2.field2819[var1.field2910] & 255) << 8; // L: 443 - var7 = (var2.field2819[var1.field2910 + 2] & 255) << 8; // L: 444 - var5 += (var4 - var6) * (var2.field2819[var1.field2910 + 3] - var5) / (var7 - var6); // L: 445 + if (var2.field2825 != null) { // L: 430 + var4 = var1.field2903; // L: 431 + var5 = var2.field2825[var1.field2911 + 1]; // L: 432 + if (var1.field2911 < var2.field2825.length - 2) { // L: 433 + var6 = (var2.field2825[var1.field2911] & 255) << 8; // L: 434 + var7 = (var2.field2825[var1.field2911 + 2] & 255) << 8; // L: 435 + var5 += (var4 - var6) * (var2.field2825[var1.field2911 + 3] - var5) / (var7 - var6); // L: 436 } - var3 = var5 * var3 + 32 >> 6; // L: 447 + var3 = var5 * var3 + 32 >> 6; // L: 438 } - if (var1.field2898 > 0 && var2.field2818 != null) { // L: 449 - var4 = var1.field2898; // L: 450 - var5 = var2.field2818[var1.field2912 + 1]; // L: 451 - if (var1.field2912 < var2.field2818.length - 2) { // L: 452 - var6 = (var2.field2818[var1.field2912] & 255) << 8; // L: 453 - var7 = (var2.field2818[var1.field2912 + 2] & 255) << 8; // L: 454 - var5 += (var2.field2818[var1.field2912 + 3] - var5) * (var4 - var6) / (var7 - var6); // L: 455 + if (var1.field2895 > 0 && var2.field2816 != null) { // L: 440 + var4 = var1.field2895; // L: 441 + var5 = var2.field2816[var1.field2906 + 1]; // L: 442 + if (var1.field2906 < var2.field2816.length - 2) { // L: 443 + var6 = (var2.field2816[var1.field2906] & 255) << 8; // L: 444 + var7 = (var2.field2816[var1.field2906 + 2] & 255) << 8; // L: 445 + var5 += (var2.field2816[var1.field2906 + 3] - var5) * (var4 - var6) / (var7 - var6); // L: 446 } - var3 = var3 * var5 + 32 >> 6; // L: 457 + var3 = var5 * var3 + 32 >> 6; // L: 448 } - return var3; // L: 459 + return var3; // L: 450 } - @ObfuscatedName("ac") + @ObfuscatedName("aw") @ObfuscatedSignature( - descriptor = "(Liz;I)I", - garbageValue = "-1625883404" + descriptor = "(Liq;I)I", + garbageValue = "-1483701319" ) - int method4480(MusicPatchNode var1) { - int var2 = this.field2847[var1.field2908]; // L: 463 - return var2 < 8192 ? var2 * var1.field2904 + 32 >> 6 : 16384 - ((128 - var1.field2904) * (16384 - var2) + 32 >> 6); // L: 464 465 + int method4435(MusicPatchNode var1) { + int var2 = this.field2837[var1.field2905]; // L: 454 + return var2 < 8192 ? var2 * var1.field2898 + 32 >> 6 : 16384 - ((128 - var1.field2898) * (16384 - var2) + 32 >> 6); // L: 455 456 } - @ObfuscatedName("az") + @ObfuscatedName("af") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "1065370929" + garbageValue = "981767255" ) - void method4457() { - int var1 = this.track; // L: 522 - int var2 = this.trackLength; // L: 523 + void method4441() { + int var1 = this.track; // L: 513 + int var2 = this.trackLength; // L: 514 long var3; - for (var3 = this.field2864; var2 == this.trackLength; var3 = this.midiFile.method4498(var2)) { // L: 524 525 547 - while (var2 == this.midiFile.trackLengths[var1]) { // L: 526 - this.midiFile.gotoTrack(var1); // L: 527 - int var5 = this.midiFile.readMessage(var1); // L: 528 - if (var5 == 1) { // L: 529 - this.midiFile.setTrackDone(); // L: 530 - this.midiFile.markTrackPosition(var1); // L: 531 - if (this.midiFile.isDone()) { // L: 532 - if (!this.field2860 || var2 == 0) { // L: 533 - this.method4443(); // L: 537 - this.midiFile.clear(); // L: 538 - return; // L: 539 + for (var3 = this.field2859; var2 == this.trackLength; var3 = this.midiFile.method4552(var2)) { // L: 515 516 538 + while (var2 == this.midiFile.trackLengths[var1]) { // L: 517 + this.midiFile.gotoTrack(var1); // L: 518 + int var5 = this.midiFile.readMessage(var1); // L: 519 + if (var5 == 1) { // L: 520 + this.midiFile.setTrackDone(); // L: 521 + this.midiFile.markTrackPosition(var1); // L: 522 + if (this.midiFile.isDone()) { // L: 523 + if (!this.field2855 || var2 == 0) { // L: 524 + this.method4429(); // L: 528 + this.midiFile.clear(); // L: 529 + return; // L: 530 } - this.midiFile.reset(var3); // L: 534 + this.midiFile.reset(var3); // L: 525 } break; } - if ((var5 & 128) != 0) { // L: 541 - this.method4392(var5); + if ((var5 & 128) != 0) { // L: 532 + this.method4452(var5); } - this.midiFile.readTrackLength(var1); // L: 542 - this.midiFile.markTrackPosition(var1); // L: 543 + this.midiFile.readTrackLength(var1); // L: 533 + this.midiFile.markTrackPosition(var1); // L: 534 } - var1 = this.midiFile.getPrioritizedTrack(); // L: 545 - var2 = this.midiFile.trackLengths[var1]; // L: 546 + var1 = this.midiFile.getPrioritizedTrack(); // L: 536 + var2 = this.midiFile.trackLengths[var1]; // L: 537 } - this.track = var1; // L: 549 - this.trackLength = var2; // L: 550 - this.field2864 = var3; // L: 551 - } // L: 552 + this.track = var1; // L: 540 + this.trackLength = var2; // L: 541 + this.field2859 = var3; // L: 542 + } // L: 543 - @ObfuscatedName("aq") + @ObfuscatedName("ak") @ObfuscatedSignature( - descriptor = "(Liz;I)Z", - garbageValue = "-1827120522" + descriptor = "(Liq;B)Z", + garbageValue = "-21" ) - boolean method4403(MusicPatchNode var1) { - if (var1.stream == null) { // L: 555 - if (var1.field2898 >= 0) { // L: 556 - var1.remove(); // L: 557 - if (var1.field2907 > 0 && var1 == this.field2858[var1.field2908][var1.field2907]) { // L: 558 - this.field2858[var1.field2908][var1.field2907] = null; // L: 559 + boolean method4442(MusicPatchNode var1) { + if (var1.stream == null) { // L: 546 + if (var1.field2895 >= 0) { // L: 547 + var1.remove(); // L: 548 + if (var1.field2893 > 0 && var1 == this.field2849[var1.field2905][var1.field2893]) { // L: 549 + this.field2849[var1.field2905][var1.field2893] = null; // L: 550 } } - return true; // L: 562 + return true; // L: 553 } else { - return false; // L: 564 + return false; // L: 555 } } - @ObfuscatedName("ab") + @ObfuscatedName("ay") @ObfuscatedSignature( - descriptor = "(Liz;[IIII)Z", - garbageValue = "-2104430914" + descriptor = "(Liq;[IIII)Z", + garbageValue = "-1838256621" ) - boolean method4419(MusicPatchNode var1, int[] var2, int var3, int var4) { - var1.field2916 = PcmPlayer.field401 / 100; // L: 568 - if (var1.field2898 < 0 || var1.stream != null && !var1.stream.method1004()) { // L: 569 - int var5 = var1.field2900; // L: 577 - if (var5 > 0) { // L: 578 - var5 -= (int)(16.0D * Math.pow(2.0D, 4.921259842519685E-4D * (double)this.field2848[var1.field2908]) + 0.5D); // L: 579 - if (var5 < 0) { // L: 580 + boolean method4443(MusicPatchNode var1, int[] var2, int var3, int var4) { + var1.field2891 = PcmPlayer.field428 / 100; // L: 559 + if (var1.field2895 < 0 || var1.stream != null && !var1.stream.method848()) { // L: 560 + int var5 = var1.field2901; // L: 568 + if (var5 > 0) { // L: 569 + var5 -= (int)(16.0D * Math.pow(2.0D, (double)this.field2852[var1.field2905] * 4.921259842519685E-4D) + 0.5D); // L: 570 + if (var5 < 0) { // L: 571 var5 = 0; } - var1.field2900 = var5; // L: 581 + var1.field2901 = var5; // L: 572 } - var1.stream.method899(this.method4402(var1)); // L: 583 - MusicPatchNode2 var6 = var1.field2915; // L: 584 - boolean var7 = false; // L: 585 - ++var1.field2913; // L: 586 - var1.field2901 += var6.field2826; // L: 587 - double var8 = (double)((var1.field2902 - 60 << 8) + (var1.field2906 * var1.field2900 >> 12)) * 5.086263020833333E-6D; // L: 588 - if (var6.field2825 > 0) { // L: 589 - if (var6.field2822 > 0) { // L: 590 - var1.field2911 += (int)(128.0D * Math.pow(2.0D, (double)var6.field2822 * var8) + 0.5D); + var1.stream.method959(this.method4415(var1)); // L: 574 + MusicPatchNode2 var6 = var1.field2894; // L: 575 + boolean var7 = false; // L: 576 + ++var1.field2907; // L: 577 + var1.field2908 += var6.field2817; // L: 578 + double var8 = 5.086263020833333E-6D * (double)((var1.field2896 - 60 << 8) + (var1.field2901 * var1.field2899 >> 12)); // L: 579 + if (var6.field2815 > 0) { // L: 580 + if (var6.field2820 > 0) { // L: 581 + var1.field2902 += (int)(128.0D * Math.pow(2.0D, var8 * (double)var6.field2820) + 0.5D); } else { - var1.field2911 += 128; // L: 591 + var1.field2902 += 128; // L: 582 } } - if (var6.field2819 != null) { // L: 593 - if (var6.field2820 > 0) { // L: 594 - var1.field2909 += (int)(128.0D * Math.pow(2.0D, var8 * (double)var6.field2820) + 0.5D); + if (var6.field2825 != null) { // L: 584 + if (var6.field2821 > 0) { // L: 585 + var1.field2903 += (int)(128.0D * Math.pow(2.0D, (double)var6.field2821 * var8) + 0.5D); } else { - var1.field2909 += 128; // L: 595 + var1.field2903 += 128; // L: 586 } - while (var1.field2910 < var6.field2819.length - 2 && var1.field2909 > (var6.field2819[var1.field2910 + 2] & 255) << 8) { // L: 596 - var1.field2910 += 2; + while (var1.field2911 < var6.field2825.length - 2 && var1.field2903 > (var6.field2825[var1.field2911 + 2] & 255) << 8) { // L: 587 + var1.field2911 += 2; } - if (var6.field2819.length - 2 == var1.field2910 && var6.field2819[var1.field2910 + 1] == 0) { // L: 597 + if (var6.field2825.length - 2 == var1.field2911 && var6.field2825[var1.field2911 + 1] == 0) { // L: 588 var7 = true; } } - if (var1.field2898 >= 0 && var6.field2818 != null && (this.field2853[var1.field2908] & 1) == 0 && (var1.field2907 < 0 || var1 != this.field2858[var1.field2908][var1.field2907])) { // L: 599 600 - if (var6.field2821 > 0) { // L: 601 - var1.field2898 += (int)(128.0D * Math.pow(2.0D, (double)var6.field2821 * var8) + 0.5D); + if (var1.field2895 >= 0 && var6.field2816 != null && (this.field2846[var1.field2905] & 1) == 0 && (var1.field2893 < 0 || var1 != this.field2849[var1.field2905][var1.field2893])) { // L: 590 591 + if (var6.field2819 > 0) { // L: 592 + var1.field2895 += (int)(128.0D * Math.pow(2.0D, (double)var6.field2819 * var8) + 0.5D); } else { - var1.field2898 += 128; // L: 602 + var1.field2895 += 128; // L: 593 } - while (var1.field2912 < var6.field2818.length - 2 && var1.field2898 > (var6.field2818[var1.field2912 + 2] & 255) << 8) { // L: 603 - var1.field2912 += 2; + while (var1.field2906 < var6.field2816.length - 2 && var1.field2895 > (var6.field2816[var1.field2906 + 2] & 255) << 8) { // L: 594 + var1.field2906 += 2; } - if (var6.field2818.length - 2 == var1.field2912) { // L: 604 + if (var6.field2816.length - 2 == var1.field2906) { // L: 595 var7 = true; } } - if (var7) { // L: 607 - var1.stream.method898(var1.field2916); // L: 608 - if (var2 != null) { // L: 609 + if (var7) { // L: 598 + var1.stream.method855(var1.field2891); // L: 599 + if (var2 != null) { // L: 600 var1.stream.fill(var2, var3, var4); } else { - var1.stream.skip(var4); // L: 610 + var1.stream.skip(var4); // L: 601 } - if (var1.stream.method902()) { // L: 611 + if (var1.stream.method859()) { // L: 602 this.patchStream.mixer.addSubStream(var1.stream); } - var1.method4575(); // L: 612 - if (var1.field2898 >= 0) { // L: 613 - var1.remove(); // L: 614 - if (var1.field2907 > 0 && var1 == this.field2858[var1.field2908][var1.field2907]) { // L: 615 - this.field2858[var1.field2908][var1.field2907] = null; // L: 616 + var1.method4634(); // L: 603 + if (var1.field2895 >= 0) { // L: 604 + var1.remove(); // L: 605 + if (var1.field2893 > 0 && var1 == this.field2849[var1.field2905][var1.field2893]) { // L: 606 + this.field2849[var1.field2905][var1.field2893] = null; // L: 607 } } - return true; // L: 619 + return true; // L: 610 } else { - var1.stream.method897(var1.field2916, this.method4395(var1), this.method4480(var1)); // L: 621 - return false; // L: 622 + var1.stream.method983(var1.field2891, this.method4434(var1), this.method4435(var1)); // L: 612 + return false; // L: 613 } } else { - var1.method4575(); // L: 570 - var1.remove(); // L: 571 - if (var1.field2907 > 0 && var1 == this.field2858[var1.field2908][var1.field2907]) { // L: 572 - this.field2858[var1.field2908][var1.field2907] = null; // L: 573 + var1.method4634(); // L: 561 + var1.remove(); // L: 562 + if (var1.field2893 > 0 && var1 == this.field2849[var1.field2905][var1.field2893]) { // L: 563 + this.field2849[var1.field2905][var1.field2893] = null; // L: 564 } - return true; // L: 575 + return true; // L: 566 } } + + @ObfuscatedName("gp") + @ObfuscatedSignature( + descriptor = "(I)Z", + garbageValue = "-792504046" + ) + static boolean method4445() { + return (Client.drawPlayerNames & 8) != 0; // L: 4430 + } } diff --git a/runescape-client/src/main/java/MilliClock.java b/runescape-client/src/main/java/MilliClock.java index 9acf62a2de..a38bf656e4 100644 --- a/runescape-client/src/main/java/MilliClock.java +++ b/runescape-client/src/main/java/MilliClock.java @@ -4,158 +4,602 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ei") +@ObfuscatedName("ek") @Implements("MilliClock") public class MilliClock extends Clock { - @ObfuscatedName("dq") + @ObfuscatedName("b") + @Export("SpriteBuffer_spritePalette") + public static int[] SpriteBuffer_spritePalette; + @ObfuscatedName("s") @ObfuscatedSignature( - descriptor = "Lji;" + descriptor = "Ldf;" ) - @Export("archive0") - static Archive archive0; - @ObfuscatedName("h") - long[] field1512; - @ObfuscatedName("c") + @Export("World_request") + static UrlRequest World_request; + @ObfuscatedName("v") + long[] field1519; + @ObfuscatedName("n") @ObfuscatedGetter( - intValue = 1004088735 + intValue = 1403302325 ) - int field1506; - @ObfuscatedName("o") + int field1515; + @ObfuscatedName("f") @ObfuscatedGetter( - intValue = 1832363075 + intValue = 892183401 ) - int field1507; - @ObfuscatedName("g") + int field1517; + @ObfuscatedName("y") @ObfuscatedGetter( - longValue = 315218757111690761L + longValue = -3130930086544390357L ) - long field1508; - @ObfuscatedName("l") + long field1516; + @ObfuscatedName("p") @ObfuscatedGetter( - intValue = -125385855 + intValue = 543039723 ) - int field1509; - @ObfuscatedName("z") + int field1518; + @ObfuscatedName("j") @ObfuscatedGetter( - intValue = 1314949819 + intValue = 652562423 ) - int field1510; + int field1514; - MilliClock() { - this.field1512 = new long[10]; // L: 7 - this.field1506 = 256; // L: 15 - this.field1507 = 1; - this.field1509 = 0; - this.field1508 = Archive.currentTimeMillis(); + public MilliClock() { + this.field1519 = new long[10]; // L: 7 + this.field1515 = 256; // L: 15 + this.field1517 = 1; // L: 16 + this.field1518 = 0; // L: 17 + this.field1516 = ObjectComposition.currentTimeMillis(); // L: 18 - for (int var1 = 0; var1 < 10; ++var1) { - this.field1512[var1] = this.field1508; + for (int var1 = 0; var1 < 10; ++var1) { // L: 19 + this.field1519[var1] = this.field1516; // L: 20 } - } + } // L: 22 - @ObfuscatedName("h") + @ObfuscatedName("v") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "2109522039" + garbageValue = "-1887937791" ) @Export("mark") public void mark() { - for (int var1 = 0; var1 < 10; ++var1) { - this.field1512[var1] = 0L; + for (int var1 = 0; var1 < 10; ++var1) { // L: 25 + this.field1519[var1] = 0L; // L: 26 } - } + } // L: 28 - @ObfuscatedName("c") + @ObfuscatedName("n") @ObfuscatedSignature( descriptor = "(III)I", - garbageValue = "665432073" + garbageValue = "-1841090229" ) @Export("wait") public int wait(int var1, int var2) { - int var3 = this.field1506; - int var4 = this.field1507; - this.field1506 = 300; // L: 33 - this.field1507 = 1; - this.field1508 = Archive.currentTimeMillis(); // L: 35 - if (this.field1512[this.field1510] == 0L) { - this.field1506 = var3; - this.field1507 = var4; - } else if (this.field1508 > this.field1512[this.field1510]) { // L: 40 - this.field1506 = (int)((long)(var1 * 2560) / (this.field1508 - this.field1512[this.field1510])); + int var3 = this.field1515; // L: 31 + int var4 = this.field1517; // L: 32 + this.field1515 = 300; // L: 33 + this.field1517 = 1; // L: 34 + this.field1516 = ObjectComposition.currentTimeMillis(); // L: 35 + if (0L == this.field1519[this.field1514]) { // L: 36 + this.field1515 = var3; // L: 37 + this.field1517 = var4; // L: 38 + } else if (this.field1516 > this.field1519[this.field1514]) { // L: 40 + this.field1515 = (int)((long)(var1 * 2560) / (this.field1516 - this.field1519[this.field1514])); } - if (this.field1506 < 25) { // L: 41 - this.field1506 = 25; + if (this.field1515 < 25) { // L: 41 + this.field1515 = 25; } - if (this.field1506 > 256) { // L: 42 - this.field1506 = 256; // L: 43 - this.field1507 = (int)((long)var1 - (this.field1508 - this.field1512[this.field1510]) / 10L); // L: 44 + if (this.field1515 > 256) { // L: 42 + this.field1515 = 256; // L: 43 + this.field1517 = (int)((long)var1 - (this.field1516 - this.field1519[this.field1514]) / 10L); // L: 44 } - if (this.field1507 > var1) { // L: 46 - this.field1507 = var1; + if (this.field1517 > var1) { // L: 46 + this.field1517 = var1; } - this.field1512[this.field1510] = this.field1508; // L: 47 - this.field1510 = (this.field1510 + 1) % 10; // L: 48 - int var5; - if (this.field1507 > 1) { // L: 49 - for (var5 = 0; var5 < 10; ++var5) { // L: 50 - if (0L != this.field1512[var5]) { // L: 51 - this.field1512[var5] += (long)this.field1507; + this.field1519[this.field1514] = this.field1516; // L: 47 + this.field1514 = (this.field1514 + 1) % 10; // L: 48 + if (this.field1517 > 1) { // L: 49 + for (int var5 = 0; var5 < 10; ++var5) { // L: 50 + if (0L != this.field1519[var5]) { // L: 51 + this.field1519[var5] += (long)this.field1517; } } } - if (this.field1507 < var2) { // L: 54 - this.field1507 = var2; + if (this.field1517 < var2) { // L: 54 + this.field1517 = var2; } - UrlRequest.sleepExact((long)this.field1507); // L: 55 + long var10 = (long)this.field1517; // L: 55 + if (var10 > 0L) { // L: 57 + if (0L == var10 % 10L) { // L: 58 + long var7 = var10 - 1L; // L: 59 - for (var5 = 0; this.field1509 < 256; this.field1509 += this.field1506) { // L: 56 57 59 - ++var5; // L: 58 - } - - this.field1509 &= 255; // L: 61 - return var5; // L: 62 - } - - @ObfuscatedName("h") - @Export("base37DecodeLong") - public static String base37DecodeLong(long var0) { - if (var0 > 0L && var0 < 6582952005840035281L) { // L: 16 - if (0L == var0 % 37L) { // L: 17 - return null; - } else { - int var2 = 0; // L: 18 - - for (long var3 = var0; var3 != 0L; var3 /= 37L) { // L: 19 20 22 - ++var2; // L: 21 + try { + Thread.sleep(var7); // L: 62 + } catch (InterruptedException var16) { // L: 64 } - StringBuilder var5; - char var8; - for (var5 = new StringBuilder(var2); var0 != 0L; var5.append(var8)) { // L: 24 25 34 - long var6 = var0; // L: 26 - var0 /= 37L; // L: 27 - var8 = class305.base37Table[(int)(var6 - var0 * 37L)]; // L: 28 - if (var8 == '_') { // L: 29 - int var9 = var5.length() - 1; // L: 30 - var5.setCharAt(var9, Character.toUpperCase(var5.charAt(var9))); // L: 31 - var8 = 160; // L: 32 + try { + Thread.sleep(1L); // L: 68 + } catch (InterruptedException var15) { // L: 70 + } + } else { + try { + Thread.sleep(var10); // L: 75 + } catch (InterruptedException var14) { // L: 77 + } + } + } + + int var13; + for (var13 = 0; this.field1518 < 256; this.field1518 += this.field1515) { // L: 80 81 83 + ++var13; // L: 82 + } + + this.field1518 &= 255; // L: 85 + return var13; // L: 86 + } + + @ObfuscatedName("e") + @ObfuscatedSignature( + descriptor = "(I)V", + garbageValue = "179304235" + ) + public static void method2587() { + WorldMapDecoration.SpriteBuffer_xOffsets = null; // L: 240 + Calendar.SpriteBuffer_yOffsets = null; // L: 241 + class396.SpriteBuffer_spriteWidths = null; // L: 242 + class302.SpriteBuffer_spriteHeights = null; // L: 243 + SpriteBuffer_spritePalette = null; // L: 244 + class396.SpriteBuffer_pixels = null; // L: 245 + } // L: 246 + + @ObfuscatedName("fs") + @ObfuscatedSignature( + descriptor = "(B)V", + garbageValue = "47" + ) + @Export("load") + static void load() { + int var31; + if (Client.titleLoadingStage == 0) { // L: 1523 + AbstractSocket.scene = new Scene(4, 104, 104, Tiles.Tiles_heights); // L: 1524 + + for (var31 = 0; var31 < 4; ++var31) { // L: 1525 + Client.collisionMaps[var31] = new CollisionMap(104, 104); + } + + GameEngine.sceneMinimapSprite = new SpritePixels(512, 512); // L: 1526 + Login.Login_loadingText = "Starting game engine..."; // L: 1527 + Login.Login_loadingPercent = 5; // L: 1528 + Client.titleLoadingStage = 20; // L: 1529 + } else if (Client.titleLoadingStage == 20) { // L: 1532 + Login.Login_loadingText = "Prepared visibility map"; // L: 1533 + Login.Login_loadingPercent = 10; // L: 1534 + Client.titleLoadingStage = 30; // L: 1535 + } else if (Client.titleLoadingStage == 30) { // L: 1538 + NetCache.archive0 = FontName.newArchive(0, false, true, true); // L: 1539 + class27.archive1 = FontName.newArchive(1, false, true, true); // L: 1540 + class8.archive2 = FontName.newArchive(2, true, false, true); // L: 1541 + ClanChannel.archive3 = FontName.newArchive(3, false, true, true); // L: 1542 + class32.archive4 = FontName.newArchive(4, false, true, true); // L: 1543 + class247.archive5 = FontName.newArchive(5, true, true, true); // L: 1544 + UrlRequest.archive6 = FontName.newArchive(6, true, true, true); // L: 1545 + Decimator.archive7 = FontName.newArchive(7, false, true, true); // L: 1546 + GrandExchangeOfferAgeComparator.archive8 = FontName.newArchive(8, false, true, true); // L: 1547 + CollisionMap.archive9 = FontName.newArchive(9, false, true, true); // L: 1548 + SoundCache.archive10 = FontName.newArchive(10, false, true, true); // L: 1549 + WorldMapManager.archive11 = FontName.newArchive(11, false, true, true); // L: 1550 + UserComparator5.archive12 = FontName.newArchive(12, false, true, true); // L: 1551 + Decimator.archive13 = FontName.newArchive(13, true, false, true); // L: 1552 + class125.archive14 = FontName.newArchive(14, false, true, true); // L: 1553 + ClanMate.archive15 = FontName.newArchive(15, false, true, true); // L: 1554 + class8.archive17 = FontName.newArchive(17, true, true, true); // L: 1555 + FontName.archive18 = FontName.newArchive(18, false, true, true); // L: 1556 + class179.archive19 = FontName.newArchive(19, false, true, true); // L: 1557 + class5.archive20 = FontName.newArchive(20, false, true, true); // L: 1558 + Login.Login_loadingText = "Connecting to update server"; // L: 1559 + Login.Login_loadingPercent = 20; // L: 1560 + Client.titleLoadingStage = 40; // L: 1561 + } else if (Client.titleLoadingStage != 40) { // L: 1564 + if (Client.titleLoadingStage == 45) { // L: 1611 + boolean var34 = !Client.isLowDetail; // L: 1612 + PcmPlayer.field428 = 22050; // L: 1615 + PcmPlayer.PcmPlayer_stereo = var34; // L: 1616 + PcmPlayer.field418 = 2; // L: 1617 + MidiPcmStream var32 = new MidiPcmStream(); // L: 1619 + var32.method4502(9, 128); // L: 1620 + DesktopPlatformInfoProvider.pcmPlayer0 = HorizontalAlignment.method2762(GameEngine.taskHandler, 0, 22050); // L: 1621 + DesktopPlatformInfoProvider.pcmPlayer0.setStream(var32); // L: 1622 + WorldMapID.method3636(ClanMate.archive15, class125.archive14, class32.archive4, var32); // L: 1623 + MouseRecorder.pcmPlayer1 = HorizontalAlignment.method2762(GameEngine.taskHandler, 1, 2048); // L: 1624 + class308.pcmStreamMixer = new PcmStreamMixer(); // L: 1625 + MouseRecorder.pcmPlayer1.setStream(class308.pcmStreamMixer); // L: 1626 + TileItem.decimator = new Decimator(22050, PcmPlayer.field428); // L: 1627 + Login.Login_loadingText = "Prepared sound engine"; // L: 1628 + Login.Login_loadingPercent = 35; // L: 1629 + Client.titleLoadingStage = 50; // L: 1630 + World.WorldMapElement_fonts = new Fonts(GrandExchangeOfferAgeComparator.archive8, Decimator.archive13); // L: 1631 + } else { + int var1; + if (Client.titleLoadingStage == 50) { // L: 1634 + FontName[] var29 = new FontName[]{FontName.FontName_plain12, FontName.FontName_plain11, FontName.FontName_verdana15, FontName.FontName_verdana13, FontName.FontName_verdana11, FontName.FontName_bold12}; // L: 1637 + var1 = var29.length; // L: 1639 + Fonts var33 = World.WorldMapElement_fonts; // L: 1640 + FontName[] var27 = new FontName[]{FontName.FontName_plain12, FontName.FontName_plain11, FontName.FontName_verdana15, FontName.FontName_verdana13, FontName.FontName_verdana11, FontName.FontName_bold12}; // L: 1643 + Client.fontsMap = var33.createMap(var27); // L: 1645 + if (Client.fontsMap.size() < var1) { // L: 1646 + Login.Login_loadingText = "Loading fonts - " + Client.fontsMap.size() * 100 / var1 + "%"; // L: 1647 + Login.Login_loadingPercent = 40; // L: 1648 + } else { + Actor.fontPlain11 = (Font)Client.fontsMap.get(FontName.FontName_plain11); // L: 1651 + UserComparator3.fontPlain12 = (Font)Client.fontsMap.get(FontName.FontName_plain12); // L: 1652 + Widget.fontBold12 = (Font)Client.fontsMap.get(FontName.FontName_bold12); // L: 1653 + class10.platformInfo = Client.platformInfoProvider.get(); // L: 1654 + Login.Login_loadingText = "Loaded fonts"; // L: 1655 + Login.Login_loadingPercent = 40; // L: 1656 + Client.titleLoadingStage = 60; // L: 1657 + } + } else { + int var3; + int var4; + Archive var24; + Archive var25; + if (Client.titleLoadingStage == 60) { // L: 1660 + var24 = SoundCache.archive10; // L: 1662 + var25 = GrandExchangeOfferAgeComparator.archive8; // L: 1663 + var3 = 0; // L: 1665 + if (var24.tryLoadFileByNames("title.jpg", "")) { // L: 1666 + ++var3; + } + + if (var25.tryLoadFileByNames("logo", "")) { // L: 1667 + ++var3; + } + + if (var25.tryLoadFileByNames("logo_deadman_mode", "")) { // L: 1668 + ++var3; + } + + if (var25.tryLoadFileByNames("logo_seasonal_mode", "")) { // L: 1669 + ++var3; + } + + if (var25.tryLoadFileByNames("titlebox", "")) { // L: 1670 + ++var3; + } + + if (var25.tryLoadFileByNames("titlebutton", "")) { // L: 1671 + ++var3; + } + + if (var25.tryLoadFileByNames("runes", "")) { // L: 1672 + ++var3; + } + + if (var25.tryLoadFileByNames("title_mute", "")) { // L: 1673 + ++var3; + } + + if (var25.tryLoadFileByNames("options_radio_buttons,0", "")) { // L: 1674 + ++var3; + } + + if (var25.tryLoadFileByNames("options_radio_buttons,2", "")) { // L: 1675 + ++var3; + } + + if (var25.tryLoadFileByNames("options_radio_buttons,4", "")) { // L: 1676 + ++var3; + } + + if (var25.tryLoadFileByNames("options_radio_buttons,6", "")) { // L: 1677 + ++var3; + } + + var25.tryLoadFileByNames("sl_back", ""); // L: 1678 + var25.tryLoadFileByNames("sl_flags", ""); // L: 1679 + var25.tryLoadFileByNames("sl_arrows", ""); // L: 1680 + var25.tryLoadFileByNames("sl_stars", ""); // L: 1681 + var25.tryLoadFileByNames("sl_button", ""); // L: 1682 + var4 = AbstractSocket.method5901(); // L: 1686 + if (var3 < var4) { // L: 1687 + Login.Login_loadingText = "Loading title screen - " + var3 * 100 / var4 + "%"; // L: 1688 + Login.Login_loadingPercent = 50; // L: 1689 + } else { + Login.Login_loadingText = "Loaded title screen"; // L: 1692 + Login.Login_loadingPercent = 50; // L: 1693 + class12.updateGameState(5); // L: 1694 + Client.titleLoadingStage = 70; // L: 1695 + } + } else if (Client.titleLoadingStage == 70) { // L: 1698 + if (!class8.archive2.isFullyLoaded()) { // L: 1699 + Login.Login_loadingText = "Loading config - " + class8.archive2.loadPercent() + "%"; // L: 1700 + Login.Login_loadingPercent = 60; // L: 1701 + } else { + Archive var28 = class8.archive2; // L: 1704 + class142.FloorOverlayDefinition_archive = var28; // L: 1706 + class27.method277(class8.archive2); // L: 1708 + ChatChannel.method2012(class8.archive2, Decimator.archive7); // L: 1709 + var24 = class8.archive2; // L: 1710 + var25 = Decimator.archive7; // L: 1711 + boolean var30 = Client.isLowDetail; // L: 1712 + ObjectComposition.ObjectDefinition_archive = var24; // L: 1714 + class310.ObjectDefinition_modelsArchive = var25; // L: 1715 + ObjectComposition.ObjectDefinition_isLowDetail = var30; // L: 1716 + Archive var26 = class8.archive2; // L: 1718 + Archive var5 = Decimator.archive7; // L: 1719 + NPCComposition.NpcDefinition_archive = var26; // L: 1721 + NPCComposition.NpcDefinition_modelArchive = var5; // L: 1722 + class13.method180(class8.archive2); // L: 1724 + Archive var6 = class8.archive2; // L: 1725 + Archive var7 = Decimator.archive7; // L: 1726 + boolean var8 = Client.isMembersWorld; // L: 1727 + Font var9 = Actor.fontPlain11; // L: 1728 + class341.ItemDefinition_archive = var6; // L: 1730 + class311.ItemDefinition_modelArchive = var7; // L: 1731 + ItemContainer.ItemDefinition_inMembersWorld = var8; // L: 1732 + ItemComposition.ItemDefinition_fileCount = class341.ItemDefinition_archive.getGroupFileCount(10); // L: 1733 + class288.ItemDefinition_fontPlain11 = var9; // L: 1734 + Archive var10 = class8.archive2; // L: 1736 + Archive var11 = NetCache.archive0; // L: 1737 + Archive var12 = class27.archive1; // L: 1738 + SequenceDefinition.SequenceDefinition_archive = var10; // L: 1740 + SequenceDefinition.SequenceDefinition_animationsArchive = var11; // L: 1741 + SequenceDefinition.SequenceDefinition_skeletonsArchive = var12; // L: 1742 + class1.method13(class8.archive2, Decimator.archive7); // L: 1744 + UserComparator10.method2471(class8.archive2); // L: 1745 + class280.method5070(class8.archive2); // L: 1746 + Archive var13 = ClanChannel.archive3; // L: 1747 + Archive var14 = Decimator.archive7; // L: 1748 + Archive var15 = GrandExchangeOfferAgeComparator.archive8; // L: 1749 + Archive var16 = Decimator.archive13; // L: 1750 + HealthBarUpdate.Widget_archive = var13; // L: 1752 + SpriteMask.Widget_modelsArchive = var14; // L: 1753 + class245.Widget_spritesArchive = var15; // L: 1754 + VertexNormal.Widget_fontsArchive = var16; // L: 1755 + Widget.Widget_interfaceComponents = new Widget[HealthBarUpdate.Widget_archive.getGroupCount()][]; // L: 1756 + Widget.Widget_loadedInterfaces = new boolean[HealthBarUpdate.Widget_archive.getGroupCount()]; // L: 1757 + LoginScreenAnimation.method2210(class8.archive2); // L: 1759 + GrandExchangeOfferUnitPriceComparator.method5109(class8.archive2); // L: 1760 + PacketWriter.method2384(class8.archive2); // L: 1761 + Archive var17 = class8.archive2; // L: 1762 + ParamComposition.ParamDefinition_archive = var17; // L: 1764 + GrandExchangeOfferOwnWorldComparator.field634 = new class369(SoundSystem.field461, 54, class378.clientLanguage, class8.archive2); // L: 1766 + ViewportMouse.HitSplatDefinition_cachedSprites = new class369(SoundSystem.field461, 47, class378.clientLanguage, class8.archive2); // L: 1767 + GrandExchangeOfferOwnWorldComparator.varcs = new Varcs(); // L: 1768 + Archive var18 = class8.archive2; // L: 1769 + Archive var19 = GrandExchangeOfferAgeComparator.archive8; // L: 1770 + Archive var20 = Decimator.archive13; // L: 1771 + HitSplatDefinition.HitSplatDefinition_archive = var18; // L: 1773 + HitSplatDefinition.field1734 = var19; // L: 1774 + HitSplatDefinition.HitSplatDefinition_fontsArchive = var20; // L: 1775 + Archive var21 = class8.archive2; // L: 1777 + Archive var22 = GrandExchangeOfferAgeComparator.archive8; // L: 1778 + HealthBarDefinition.HealthBarDefinition_archive = var21; // L: 1780 + HealthBarDefinition.HitSplatDefinition_spritesArchive = var22; // L: 1781 + UserComparator5.method2449(class8.archive2, GrandExchangeOfferAgeComparator.archive8); // L: 1783 + Login.Login_loadingText = "Loaded config"; // L: 1784 + Login.Login_loadingPercent = 60; // L: 1785 + Client.titleLoadingStage = 80; // L: 1786 + } + } else if (Client.titleLoadingStage == 80) { // L: 1789 + var31 = 0; // L: 1790 + if (NPCComposition.compass == null) { // L: 1791 + NPCComposition.compass = ClientPacket.SpriteBuffer_getSprite(GrandExchangeOfferAgeComparator.archive8, TaskHandler.spriteIds.compass, 0); + } else { + ++var31; // L: 1792 + } + + if (Interpreter.redHintArrowSprite == null) { // L: 1793 + Interpreter.redHintArrowSprite = ClientPacket.SpriteBuffer_getSprite(GrandExchangeOfferAgeComparator.archive8, TaskHandler.spriteIds.field3897, 0); + } else { + ++var31; // L: 1794 + } + + if (class10.mapSceneSprites == null) { // L: 1795 + class10.mapSceneSprites = VerticalAlignment.method2799(GrandExchangeOfferAgeComparator.archive8, TaskHandler.spriteIds.mapScenes, 0); + } else { + ++var31; // L: 1796 + } + + if (class35.headIconPkSprites == null) { // L: 1797 + class35.headIconPkSprites = ItemComposition.method3087(GrandExchangeOfferAgeComparator.archive8, TaskHandler.spriteIds.headIconsPk, 0); + } else { + ++var31; // L: 1798 + } + + if (TextureProvider.headIconPrayerSprites == null) { // L: 1799 + TextureProvider.headIconPrayerSprites = ItemComposition.method3087(GrandExchangeOfferAgeComparator.archive8, TaskHandler.spriteIds.field3900, 0); + } else { + ++var31; // L: 1800 + } + + if (PacketBufferNode.headIconHintSprites == null) { // L: 1801 + PacketBufferNode.headIconHintSprites = ItemComposition.method3087(GrandExchangeOfferAgeComparator.archive8, TaskHandler.spriteIds.field3901, 0); + } else { + ++var31; // L: 1802 + } + + if (WorldMapArea.mapMarkerSprites == null) { // L: 1803 + WorldMapArea.mapMarkerSprites = ItemComposition.method3087(GrandExchangeOfferAgeComparator.archive8, TaskHandler.spriteIds.field3905, 0); + } else { + ++var31; // L: 1804 + } + + if (ArchiveLoader.crossSprites == null) { // L: 1805 + ArchiveLoader.crossSprites = ItemComposition.method3087(GrandExchangeOfferAgeComparator.archive8, TaskHandler.spriteIds.field3903, 0); + } else { + ++var31; // L: 1806 + } + + if (class170.mapDotSprites == null) { // L: 1807 + class170.mapDotSprites = ItemComposition.method3087(GrandExchangeOfferAgeComparator.archive8, TaskHandler.spriteIds.field3904, 0); + } else { + ++var31; // L: 1808 + } + + if (Player.scrollBarSprites == null) { // L: 1809 + Player.scrollBarSprites = VerticalAlignment.method2799(GrandExchangeOfferAgeComparator.archive8, TaskHandler.spriteIds.field3898, 0); + } else { + ++var31; // L: 1810 + } + + if (WorldMapDecoration.modIconSprites == null) { // L: 1811 + WorldMapDecoration.modIconSprites = VerticalAlignment.method2799(GrandExchangeOfferAgeComparator.archive8, TaskHandler.spriteIds.field3906, 0); + } else { + ++var31; // L: 1812 + } + + if (var31 < 11) { // L: 1813 + Login.Login_loadingText = "Loading sprites - " + var31 * 100 / 12 + "%"; // L: 1814 + Login.Login_loadingPercent = 70; // L: 1815 + } else { + AbstractFont.AbstractFont_modIconSprites = WorldMapDecoration.modIconSprites; // L: 1818 + Interpreter.redHintArrowSprite.normalize(); // L: 1819 + var1 = (int)(Math.random() * 21.0D) - 10; // L: 1820 + int var2 = (int)(Math.random() * 21.0D) - 10; // L: 1821 + var3 = (int)(Math.random() * 21.0D) - 10; // L: 1822 + var4 = (int)(Math.random() * 41.0D) - 20; // L: 1823 + class10.mapSceneSprites[0].shiftColors(var1 + var4, var2 + var4, var4 + var3); // L: 1824 + Login.Login_loadingText = "Loaded sprites"; // L: 1825 + Login.Login_loadingPercent = 70; // L: 1826 + Client.titleLoadingStage = 90; // L: 1827 + } + } else if (Client.titleLoadingStage == 90) { // L: 1830 + if (!CollisionMap.archive9.isFullyLoaded()) { // L: 1831 + Login.Login_loadingText = "Loading textures - " + "0%"; // L: 1832 + Login.Login_loadingPercent = 90; // L: 1833 + } else { + World.textureProvider = new TextureProvider(CollisionMap.archive9, GrandExchangeOfferAgeComparator.archive8, 20, ObjectComposition.clientPreferences.field1337, Client.isLowDetail ? 64 : 128); // L: 1836 + Rasterizer3D.Rasterizer3D_setTextureLoader(World.textureProvider); // L: 1837 + Rasterizer3D.Rasterizer3D_setBrightness(ObjectComposition.clientPreferences.field1337); // L: 1838 + Client.titleLoadingStage = 100; // L: 1839 + } + } else if (Client.titleLoadingStage == 100) { // L: 1842 + var31 = World.textureProvider.getLoadedPercentage(); // L: 1843 + if (var31 < 100) { // L: 1844 + Login.Login_loadingText = "Loading textures - " + var31 + "%"; // L: 1845 + Login.Login_loadingPercent = 90; // L: 1846 + } else { + Login.Login_loadingText = "Loaded textures"; // L: 1849 + Login.Login_loadingPercent = 90; // L: 1850 + Client.titleLoadingStage = 110; // L: 1851 + } + } else if (Client.titleLoadingStage == 110) { // L: 1854 + Skills.mouseRecorder = new MouseRecorder(); // L: 1855 + GameEngine.taskHandler.newThreadTask(Skills.mouseRecorder, 10); // L: 1856 + Login.Login_loadingText = "Loaded input handler"; // L: 1857 + Login.Login_loadingPercent = 92; // L: 1858 + Client.titleLoadingStage = 120; // L: 1859 + } else if (Client.titleLoadingStage == 120) { // L: 1862 + if (!SoundCache.archive10.tryLoadFileByNames("huffman", "")) { // L: 1863 + Login.Login_loadingText = "Loading wordpack - " + 0 + "%"; // L: 1864 + Login.Login_loadingPercent = 94; // L: 1865 + } else { + Huffman var0 = new Huffman(SoundCache.archive10.takeFileByNames("huffman", "")); // L: 1868 + ClanChannelMember.method88(var0); // L: 1869 + Login.Login_loadingText = "Loaded wordpack"; // L: 1870 + Login.Login_loadingPercent = 94; // L: 1871 + Client.titleLoadingStage = 130; // L: 1872 + } + } else if (Client.titleLoadingStage == 130) { // L: 1875 + if (!ClanChannel.archive3.isFullyLoaded()) { // L: 1876 + Login.Login_loadingText = "Loading interfaces - " + ClanChannel.archive3.loadPercent() * 4 / 5 + "%"; // L: 1877 + Login.Login_loadingPercent = 96; // L: 1878 + } else if (!UserComparator5.archive12.isFullyLoaded()) { // L: 1881 + Login.Login_loadingText = "Loading interfaces - " + (80 + UserComparator5.archive12.loadPercent() / 6) + "%"; // L: 1882 + Login.Login_loadingPercent = 96; // L: 1883 + } else if (!Decimator.archive13.isFullyLoaded()) { // L: 1886 + Login.Login_loadingText = "Loading interfaces - " + (96 + Decimator.archive13.loadPercent() / 50) + "%"; // L: 1887 + Login.Login_loadingPercent = 96; // L: 1888 + } else { + Login.Login_loadingText = "Loaded interfaces"; // L: 1891 + Login.Login_loadingPercent = 98; // L: 1892 + Client.titleLoadingStage = 140; // L: 1893 + } + } else if (Client.titleLoadingStage == 140) { // L: 1896 + Login.Login_loadingPercent = 100; // L: 1897 + if (!class179.archive19.tryLoadGroupByName(WorldMapCacheName.field2137.name)) { // L: 1898 + Login.Login_loadingText = "Loading world map - " + class179.archive19.groupLoadPercentByName(WorldMapCacheName.field2137.name) / 10 + "%"; // L: 1899 + } else { + if (class243.worldMap == null) { // L: 1902 + class243.worldMap = new WorldMap(); // L: 1903 + class243.worldMap.init(class179.archive19, FontName.archive18, class5.archive20, Widget.fontBold12, Client.fontsMap, class10.mapSceneSprites); // L: 1904 + } + + Login.Login_loadingText = "Loaded world map"; // L: 1906 + Client.titleLoadingStage = 150; // L: 1907 + } + } else if (Client.titleLoadingStage == 150) { // L: 1910 + class12.updateGameState(10); // L: 1911 } } - - var5.reverse(); // L: 36 - var5.setCharAt(0, Character.toUpperCase(var5.charAt(0))); // L: 37 - return var5.toString(); // L: 38 } } else { - return null; + byte var23 = 0; // L: 1565 + var31 = var23 + NetCache.archive0.percentage() * 4 / 100; // L: 1566 + var31 += class27.archive1.percentage() * 4 / 100; // L: 1567 + var31 += class8.archive2.percentage() * 2 / 100; // L: 1568 + var31 += ClanChannel.archive3.percentage() * 2 / 100; // L: 1569 + var31 += class32.archive4.percentage() * 6 / 100; // L: 1570 + var31 += class247.archive5.percentage() * 4 / 100; // L: 1571 + var31 += UrlRequest.archive6.percentage() * 2 / 100; // L: 1572 + var31 += Decimator.archive7.percentage() * 56 / 100; // L: 1573 + var31 += GrandExchangeOfferAgeComparator.archive8.percentage() * 2 / 100; // L: 1574 + var31 += CollisionMap.archive9.percentage() * 2 / 100; // L: 1575 + var31 += SoundCache.archive10.percentage() * 2 / 100; // L: 1576 + var31 += WorldMapManager.archive11.percentage() * 2 / 100; // L: 1577 + var31 += UserComparator5.archive12.percentage() * 2 / 100; // L: 1578 + var31 += Decimator.archive13.percentage() * 2 / 100; // L: 1579 + var31 += class125.archive14.percentage() * 2 / 100; // L: 1580 + var31 += ClanMate.archive15.percentage() * 2 / 100; // L: 1581 + var31 += class179.archive19.percentage() / 100; // L: 1582 + var31 += FontName.archive18.percentage() / 100; // L: 1583 + var31 += class5.archive20.percentage() / 100; // L: 1584 + var31 += class8.archive17.method4869() && class8.archive17.isFullyLoaded() ? 1 : 0; // L: 1585 + if (var31 != 100) { // L: 1586 + if (var31 != 0) { // L: 1587 + Login.Login_loadingText = "Checking for updates - " + var31 + "%"; + } + + Login.Login_loadingPercent = 30; // L: 1588 + } else { + class13.method175(NetCache.archive0, "Animations"); // L: 1591 + class13.method175(class27.archive1, "Skeletons"); // L: 1592 + class13.method175(class32.archive4, "Sound FX"); // L: 1593 + class13.method175(class247.archive5, "Maps"); // L: 1594 + class13.method175(UrlRequest.archive6, "Music Tracks"); // L: 1595 + class13.method175(Decimator.archive7, "Models"); // L: 1596 + class13.method175(GrandExchangeOfferAgeComparator.archive8, "Sprites"); // L: 1597 + class13.method175(WorldMapManager.archive11, "Music Jingles"); // L: 1598 + class13.method175(class125.archive14, "Music Samples"); // L: 1599 + class13.method175(ClanMate.archive15, "Music Patches"); // L: 1600 + class13.method175(class179.archive19, "World Map"); // L: 1601 + class13.method175(FontName.archive18, "World Map Geography"); // L: 1602 + class13.method175(class5.archive20, "World Map Ground"); // L: 1603 + TaskHandler.spriteIds = new GraphicsDefaults(); // L: 1604 + TaskHandler.spriteIds.decode(class8.archive17); // L: 1605 + Login.Login_loadingText = "Loaded update list"; // L: 1606 + Login.Login_loadingPercent = 30; // L: 1607 + Client.titleLoadingStage = 45; // L: 1608 + } } + } // L: 1530 1536 1562 1589 1609 1632 1649 1658 1690 1696 1702 1787 1816 1828 1834 1840 1847 1852 1860 1866 1873 1879 1884 1889 1894 1900 1908 1912 1914 + + @ObfuscatedName("is") + @ObfuscatedSignature( + descriptor = "(I)I", + garbageValue = "-1594517863" + ) + static final int method2588() { + return Client.menuOptionsCount - 1; // L: 8819 } } diff --git a/runescape-client/src/main/java/ModeWhere.java b/runescape-client/src/main/java/ModeWhere.java index 62680247a6..8c54d0231e 100644 --- a/runescape-client/src/main/java/ModeWhere.java +++ b/runescape-client/src/main/java/ModeWhere.java @@ -6,176 +6,332 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("kb") +@ObfuscatedName("kl") @Implements("ModeWhere") public enum ModeWhere implements Enumerated { - @ObfuscatedName("h") - @ObfuscatedSignature( - descriptor = "Lkb;" - ) - field3710("", 0, new class286[]{class286.field3686}), - @ObfuscatedName("c") - @ObfuscatedSignature( - descriptor = "Lkb;" - ) - field3708("", 1, new class286[]{class286.field3687, class286.field3686}), - @ObfuscatedName("o") - @ObfuscatedSignature( - descriptor = "Lkb;" - ) - field3726("", 2, new class286[]{class286.field3687, class286.field3684, class286.field3686}), - @ObfuscatedName("g") - @ObfuscatedSignature( - descriptor = "Lkb;" - ) - field3717("", 3, new class286[]{class286.field3687}), - @ObfuscatedName("l") - @ObfuscatedSignature( - descriptor = "Lkb;" - ) - field3711("", 4), - @ObfuscatedName("z") - @ObfuscatedSignature( - descriptor = "Lkb;" - ) - field3718("", 5, new class286[]{class286.field3687, class286.field3686}), - @ObfuscatedName("t") - @ObfuscatedSignature( - descriptor = "Lkb;" - ) - field3720("", 6, new class286[]{class286.field3686}), @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "Lkb;" + descriptor = "Lkl;" ) - field3714("", 8, new class286[]{class286.field3687, class286.field3686}), + field3686("", 0, new class286[]{class286.field3667}), + @ObfuscatedName("n") + @ObfuscatedSignature( + descriptor = "Lkl;" + ) + field3702("", 1, new class286[]{class286.field3668, class286.field3667}), + @ObfuscatedName("f") + @ObfuscatedSignature( + descriptor = "Lkl;" + ) + field3699("", 2, new class286[]{class286.field3668, class286.field3671, class286.field3667}), + @ObfuscatedName("y") + @ObfuscatedSignature( + descriptor = "Lkl;" + ) + field3698("", 3, new class286[]{class286.field3668}), + @ObfuscatedName("p") + @ObfuscatedSignature( + descriptor = "Lkl;" + ) + field3690("", 4), + @ObfuscatedName("j") + @ObfuscatedSignature( + descriptor = "Lkl;" + ) + field3687("", 5, new class286[]{class286.field3668, class286.field3667}), + @ObfuscatedName("r") + @ObfuscatedSignature( + descriptor = "Lkl;" + ) + field3692("", 6, new class286[]{class286.field3667}), @ObfuscatedName("b") @ObfuscatedSignature( - descriptor = "Lkb;" + descriptor = "Lkl;" ) - field3715("", 9, new class286[]{class286.field3687, class286.field3684}), - @ObfuscatedName("q") + field3693("", 8, new class286[]{class286.field3668, class286.field3667}), + @ObfuscatedName("d") @ObfuscatedSignature( - descriptor = "Lkb;" + descriptor = "Lkl;" ) - field3716("", 10, new class286[]{class286.field3687}), - @ObfuscatedName("i") + field3694("", 9, new class286[]{class286.field3668, class286.field3671}), + @ObfuscatedName("s") @ObfuscatedSignature( - descriptor = "Lkb;" + descriptor = "Lkl;" ) - field3709("", 11, new class286[]{class286.field3687}), - @ObfuscatedName("x") + field3695("", 10, new class286[]{class286.field3668}), + @ObfuscatedName("u") @ObfuscatedSignature( - descriptor = "Lkb;" + descriptor = "Lkl;" ) - field3707("", 12, new class286[]{class286.field3687, class286.field3686}), - @ObfuscatedName("k") + field3696("", 11, new class286[]{class286.field3668}), + @ObfuscatedName("l") @ObfuscatedSignature( - descriptor = "Lkb;" + descriptor = "Lkl;" ) - field3719("", 13, new class286[]{class286.field3687}); + field3697("", 12, new class286[]{class286.field3668, class286.field3667}), + @ObfuscatedName("o") + @ObfuscatedSignature( + descriptor = "Lkl;" + ) + field3689("", 13, new class286[]{class286.field3668}); - @ObfuscatedName("ai") - @Export("null_string") - protected static String null_string; - @ObfuscatedName("bk") - @ObfuscatedSignature( - descriptor = "Lnj;" - ) - @Export("loginType") - static LoginType loginType; - @ObfuscatedName("ou") - @ObfuscatedSignature( - descriptor = "Lno;" - ) - @Export("HitSplatDefinition_cachedSprites") - static class369 HitSplatDefinition_cachedSprites; - @ObfuscatedName("r") + @ObfuscatedName("c") @ObfuscatedGetter( - intValue = -1167949463 + intValue = 448487515 ) @Export("id") final int id; - @ObfuscatedName("p") - final Set field3721; + @ObfuscatedName("e") + final Set field3700; static { - method5073(); // L: 28 - } // L: 29 + method5162(); // L: 28 + } @ObfuscatedSignature( - descriptor = "(Ljava/lang/String;I[Lkl;)V" + descriptor = "(Ljava/lang/String;I[Lky;)V" ) ModeWhere(String var3, int var4, class286[] var5) { - this.field3721 = new HashSet(); + this.field3700 = new HashSet(); this.id = var4; // L: 43 class286[] var6 = var5; // L: 45 for (int var7 = 0; var7 < var6.length; ++var7) { // L: 46 class286 var8 = var6[var7]; // L: 47 - this.field3721.add(var8); // L: 48 + this.field3700.add(var8); // L: 48 } } // L: 51 ModeWhere(String var3, int var4) { - this.field3721 = new HashSet(); // L: 32 + this.field3700 = new HashSet(); // L: 32 this.id = var4; // L: 39 } // L: 40 - @ObfuscatedName("h") + @ObfuscatedName("v") @ObfuscatedSignature( descriptor = "(I)I", - garbageValue = "-708237537" + garbageValue = "-907662946" ) @Export("rsOrdinal") public int rsOrdinal() { return this.id; // L: 54 } - @ObfuscatedName("h") + @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "(I)[Lhs;", - garbageValue = "-1050476944" + descriptor = "(Lnd;Lmr;I)Lmr;", + garbageValue = "-391561047" ) - @Export("ServerPacket_values") - public static ServerPacket[] ServerPacket_values() { - return new ServerPacket[]{ServerPacket.field2774, ServerPacket.field2750, ServerPacket.field2744, ServerPacket.field2711, ServerPacket.field2703, ServerPacket.field2704, ServerPacket.field2738, ServerPacket.field2762, ServerPacket.field2707, ServerPacket.field2708, ServerPacket.field2709, ServerPacket.field2710, ServerPacket.field2742, ServerPacket.field2712, ServerPacket.field2713, ServerPacket.field2714, ServerPacket.field2715, ServerPacket.field2716, ServerPacket.field2729, ServerPacket.field2787, ServerPacket.field2767, ServerPacket.field2720, ServerPacket.field2721, ServerPacket.field2699, ServerPacket.field2723, ServerPacket.field2724, ServerPacket.field2771, ServerPacket.field2726, ServerPacket.field2727, ServerPacket.field2725, ServerPacket.field2700, ServerPacket.field2730, ServerPacket.field2731, ServerPacket.field2732, ServerPacket.field2722, ServerPacket.field2737, ServerPacket.field2735, ServerPacket.field2736, ServerPacket.field2734, ServerPacket.field2757, ServerPacket.field2739, ServerPacket.field2741, ServerPacket.field2740, ServerPacket.field2781, ServerPacket.field2743, ServerPacket.field2702, ServerPacket.field2745, ServerPacket.field2772, ServerPacket.field2747, ServerPacket.field2748, ServerPacket.field2749, ServerPacket.field2746, ServerPacket.field2733, ServerPacket.field2719, ServerPacket.field2753, ServerPacket.field2754, ServerPacket.field2755, ServerPacket.field2756, ServerPacket.field2769, ServerPacket.field2758, ServerPacket.field2759, ServerPacket.field2763, ServerPacket.field2761, ServerPacket.field2718, ServerPacket.field2752, ServerPacket.field2764, ServerPacket.field2765, ServerPacket.field2766, ServerPacket.field2701, ServerPacket.field2768, ServerPacket.field2728, ServerPacket.field2770, ServerPacket.field2795, ServerPacket.field2794, ServerPacket.field2773, ServerPacket.field2780, ServerPacket.field2775, ServerPacket.field2776, ServerPacket.field2777, ServerPacket.field2778, ServerPacket.field2779, ServerPacket.field2760, ServerPacket.field2705, ServerPacket.field2782, ServerPacket.field2783, ServerPacket.field2784, ServerPacket.field2785, ServerPacket.field2786, ServerPacket.field2751, ServerPacket.field2788, ServerPacket.field2789, ServerPacket.field2790, ServerPacket.field2791, ServerPacket.field2792, ServerPacket.field2793}; // L: 104 - } - - @ObfuscatedName("g") - @ObfuscatedSignature( - descriptor = "(B)[Lkb;", - garbageValue = "62" - ) - static ModeWhere[] method5073() { - return new ModeWhere[]{field3711, field3714, field3718, field3710, field3707, field3726, field3709, field3719, field3717, field3720, field3715, field3708, field3716}; // L: 35 - } - - @ObfuscatedName("ib") - @ObfuscatedSignature( - descriptor = "(IIIIIIIIB)V", - garbageValue = "1" - ) - @Export("drawWidgets") - static final void drawWidgets(int var0, int var1, int var2, int var3, int var4, int var5, int var6, int var7) { - if (UserComparator8.loadInterface(var0)) { // L: 9488 - Ignored.field3859 = null; // L: 9495 - class44.drawInterface(Widget.Widget_interfaceComponents[var0], -1, var1, var2, var3, var4, var5, var6, var7); // L: 9496 - if (Ignored.field3859 != null) { // L: 9497 - class44.drawInterface(Ignored.field3859, -1412584499, var1, var2, var3, var4, VarcInt.field1576, class230.field2812, var7); // L: 9498 - Ignored.field3859 = null; // L: 9499 - } - - } else { - if (var7 != -1) { // L: 9489 - Client.field825[var7] = true; - } else { - for (int var8 = 0; var8 < 100; ++var8) { // L: 9491 - Client.field825[var8] = true; - } - } - + @Export("readStringIntParameters") + static final IterableNodeHashTable readStringIntParameters(Buffer var0, IterableNodeHashTable var1) { + int var2 = var0.readUnsignedByte(); // L: 16 + int var3; + if (var1 == null) { // L: 17 + var3 = Player.method2128(var2); // L: 18 + var1 = new IterableNodeHashTable(var3); // L: 19 } - } // L: 9493 9501 + + for (var3 = 0; var3 < var2; ++var3) { // L: 21 + boolean var4 = var0.readUnsignedByte() == 1; // L: 22 + int var5 = var0.readMedium(); // L: 23 + Object var6; + if (var4) { // L: 25 + var6 = new ObjectNode(var0.readStringCp1252NullTerminated()); + } else { + var6 = new IntegerNode(var0.readInt()); // L: 26 + } + + var1.put((Node)var6, (long)var5); // L: 27 + } + + return var1; // L: 29 + } + + @ObfuscatedName("n") + @ObfuscatedSignature( + descriptor = "(III)Lio;", + garbageValue = "-594011323" + ) + @Export("getWidgetChild") + public static Widget getWidgetChild(int var0, int var1) { + Widget var2 = Frames.getWidget(var0); // L: 198 + if (var1 == -1) { // L: 199 + return var2; + } else { + return var2 != null && var2.children != null && var1 < var2.children.length ? var2.children[var1] : null; // L: 200 201 + } + } + + @ObfuscatedName("y") + @ObfuscatedSignature( + descriptor = "(I)[Lkl;", + garbageValue = "1537765097" + ) + static ModeWhere[] method5162() { + return new ModeWhere[]{field3702, field3695, field3697, field3686, field3699, field3696, field3692, field3687, field3698, field3694, field3690, field3693, field3689}; // L: 35 + } + + @ObfuscatedName("jn") + @ObfuscatedSignature( + descriptor = "(Lio;II)I", + garbageValue = "411912150" + ) + static final int method5160(Widget var0, int var1) { + if (var0.cs1Instructions != null && var1 < var0.cs1Instructions.length) { // L: 9890 + try { + int[] var2 = var0.cs1Instructions[var1]; // L: 9892 + int var3 = 0; // L: 9893 + int var4 = 0; // L: 9894 + byte var5 = 0; // L: 9895 + + while (true) { + int var6 = var2[var4++]; // L: 9897 + int var7 = 0; // L: 9898 + byte var8 = 0; // L: 9899 + if (var6 == 0) { // L: 9900 + return var3; + } + + if (var6 == 1) { // L: 9901 + var7 = Client.currentLevels[var2[var4++]]; + } + + if (var6 == 2) { // L: 9902 + var7 = Client.levels[var2[var4++]]; + } + + if (var6 == 3) { // L: 9903 + var7 = Client.experience[var2[var4++]]; + } + + int var9; + Widget var10; + int var11; + int var12; + if (var6 == 4) { // L: 9904 + var9 = var2[var4++] << 16; // L: 9905 + var9 += var2[var4++]; // L: 9906 + var10 = Frames.getWidget(var9); // L: 9907 + var11 = var2[var4++]; // L: 9908 + if (var11 != -1 && (!class260.ItemDefinition_get(var11).isMembersOnly || Client.isMembersWorld)) { // L: 9909 + for (var12 = 0; var12 < var10.itemIds.length; ++var12) { // L: 9910 + if (var11 + 1 == var10.itemIds[var12]) { // L: 9911 + var7 += var10.itemQuantities[var12]; + } + } + } + } + + if (var6 == 5) { // L: 9915 + var7 = Varps.Varps_main[var2[var4++]]; + } + + if (var6 == 6) { // L: 9916 + var7 = Skills.Skills_experienceTable[Client.levels[var2[var4++]] - 1]; + } + + if (var6 == 7) { // L: 9917 + var7 = Varps.Varps_main[var2[var4++]] * 100 / 46875; + } + + if (var6 == 8) { // L: 9918 + var7 = class93.localPlayer.combatLevel; + } + + if (var6 == 9) { // L: 9919 + for (var9 = 0; var9 < 25; ++var9) { // L: 9920 + if (Skills.Skills_enabled[var9]) { // L: 9921 + var7 += Client.levels[var9]; + } + } + } + + if (var6 == 10) { // L: 9924 + var9 = var2[var4++] << 16; // L: 9925 + var9 += var2[var4++]; // L: 9926 + var10 = Frames.getWidget(var9); // L: 9927 + var11 = var2[var4++]; // L: 9928 + if (var11 != -1 && (!class260.ItemDefinition_get(var11).isMembersOnly || Client.isMembersWorld)) { // L: 9929 + for (var12 = 0; var12 < var10.itemIds.length; ++var12) { // L: 9930 + if (var11 + 1 == var10.itemIds[var12]) { // L: 9931 + var7 = 999999999; // L: 9932 + break; // L: 9933 + } + } + } + } + + if (var6 == 11) { // L: 9938 + var7 = Client.runEnergy; + } + + if (var6 == 12) { // L: 9939 + var7 = Client.weight; + } + + if (var6 == 13) { // L: 9940 + var9 = Varps.Varps_main[var2[var4++]]; // L: 9941 + int var13 = var2[var4++]; // L: 9942 + var7 = (var9 & 1 << var13) != 0 ? 1 : 0; // L: 9943 + } + + if (var6 == 14) { // L: 9945 + var9 = var2[var4++]; // L: 9946 + var7 = Skeleton.getVarbit(var9); // L: 9947 + } + + if (var6 == 15) { // L: 9949 + var8 = 1; + } + + if (var6 == 16) { // L: 9950 + var8 = 2; + } + + if (var6 == 17) { // L: 9951 + var8 = 3; + } + + if (var6 == 18) { // L: 9952 + var7 = (class93.localPlayer.x >> 7) + VertexNormal.baseX; + } + + if (var6 == 19) { // L: 9953 + var7 = (class93.localPlayer.y >> 7) + SoundSystem.baseY; + } + + if (var6 == 20) { // L: 9954 + var7 = var2[var4++]; + } + + if (var8 == 0) { // L: 9955 + if (var5 == 0) { // L: 9956 + var3 += var7; + } + + if (var5 == 1) { // L: 9957 + var3 -= var7; + } + + if (var5 == 2 && var7 != 0) { // L: 9958 + var3 /= var7; + } + + if (var5 == 3) { // L: 9959 + var3 *= var7; + } + + var5 = 0; // L: 9960 + } else { + var5 = var8; // L: 9962 + } + } + } catch (Exception var14) { // L: 9965 + return -1; // L: 9966 + } + } else { + return -2; + } + } } diff --git a/runescape-client/src/main/java/Model.java b/runescape-client/src/main/java/Model.java index 449c6b527c..2a3435a783 100644 --- a/runescape-client/src/main/java/Model.java +++ b/runescape-client/src/main/java/Model.java @@ -3,180 +3,180 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("gj") +@ObfuscatedName("gr") @Implements("Model") public class Model extends Renderable { - @ObfuscatedName("h") + @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "Lgj;" + descriptor = "Lgr;" ) @Export("Model_sharedSequenceModel") static Model Model_sharedSequenceModel; - @ObfuscatedName("c") + @ObfuscatedName("n") @Export("Model_sharedSequenceModelFaceAlphas") static byte[] Model_sharedSequenceModelFaceAlphas; - @ObfuscatedName("o") + @ObfuscatedName("f") @ObfuscatedSignature( - descriptor = "Lgj;" + descriptor = "Lgr;" ) @Export("Model_sharedSpotAnimationModel") static Model Model_sharedSpotAnimationModel; - @ObfuscatedName("g") + @ObfuscatedName("y") @Export("Model_sharedSpotAnimationModelFaceAlphas") static byte[] Model_sharedSpotAnimationModelFaceAlphas; - @ObfuscatedName("ai") - static boolean[] field2451; - @ObfuscatedName("aa") - static boolean[] field2452; - @ObfuscatedName("au") + @ObfuscatedName("av") + static boolean[] field2455; + @ObfuscatedName("ac") + static boolean[] field2485; + @ObfuscatedName("at") @Export("modelViewportXs") static int[] modelViewportXs; - @ObfuscatedName("as") + @ObfuscatedName("ah") @Export("modelViewportYs") static int[] modelViewportYs; - @ObfuscatedName("ad") - static int[] field2460; - @ObfuscatedName("ac") - static int[] field2418; - @ObfuscatedName("az") - static int[] field2467; - @ObfuscatedName("aq") - static int[] field2471; - @ObfuscatedName("ar") - static int[] field2425; - @ObfuscatedName("ah") - static int[][] field2461; - @ObfuscatedName("af") - static int[] field2470; - @ObfuscatedName("an") - static int[][] field2463; - @ObfuscatedName("bd") - static int[] field2464; - @ObfuscatedName("bw") + @ObfuscatedName("ao") static int[] field2465; - @ObfuscatedName("bf") - static int[] field2415; - @ObfuscatedName("bu") + @ObfuscatedName("aq") + static int[] field2445; + @ObfuscatedName("aw") + static int[] field2467; + @ObfuscatedName("af") + static int[] field2422; + @ObfuscatedName("ay") + static int[] field2466; + @ObfuscatedName("aa") + static int[][] field2471; + @ObfuscatedName("au") + static int[] field2472; + @ObfuscatedName("an") + static int[][] field2473; + @ObfuscatedName("bd") static int[] field2474; - @ObfuscatedName("bb") - static int[] field2457; - @ObfuscatedName("bk") - static int[] field2469; @ObfuscatedName("bt") + static int[] field2475; + @ObfuscatedName("bq") + static int[] field2434; + @ObfuscatedName("bu") + static int[] field2477; + @ObfuscatedName("bl") + static int[] field2489; + @ObfuscatedName("bv") + static int[] field2479; + @ObfuscatedName("bm") @Export("Model_transformTempX") static int Model_transformTempX; - @ObfuscatedName("by") + @ObfuscatedName("bz") @Export("Model_transformTempY") static int Model_transformTempY; - @ObfuscatedName("bz") + @ObfuscatedName("bh") @Export("Model_transformTempZ") static int Model_transformTempZ; - @ObfuscatedName("br") - static boolean field2473; + @ObfuscatedName("bs") + static boolean field2483; @ObfuscatedName("ba") @Export("Model_sine") static int[] Model_sine; - @ObfuscatedName("bg") + @ObfuscatedName("be") @Export("Model_cosine") static int[] Model_cosine; - @ObfuscatedName("bi") - static int[] field2478; - @ObfuscatedName("bp") - static int[] field2479; - @ObfuscatedName("l") + @ObfuscatedName("bj") + static int[] field2488; + @ObfuscatedName("bx") + static int[] field2425; + @ObfuscatedName("p") @Export("verticesCount") int verticesCount; - @ObfuscatedName("z") + @ObfuscatedName("j") @Export("verticesX") int[] verticesX; - @ObfuscatedName("t") + @ObfuscatedName("r") @Export("verticesY") int[] verticesY; - @ObfuscatedName("v") + @ObfuscatedName("b") @Export("verticesZ") int[] verticesZ; - @ObfuscatedName("b") + @ObfuscatedName("d") @Export("indicesCount") int indicesCount; - @ObfuscatedName("q") + @ObfuscatedName("s") @Export("indices1") int[] indices1; - @ObfuscatedName("i") + @ObfuscatedName("u") @Export("indices2") int[] indices2; - @ObfuscatedName("x") + @ObfuscatedName("l") @Export("indices3") int[] indices3; - @ObfuscatedName("k") + @ObfuscatedName("o") @Export("faceColors1") int[] faceColors1; - @ObfuscatedName("r") + @ObfuscatedName("c") @Export("faceColors2") int[] faceColors2; - @ObfuscatedName("p") + @ObfuscatedName("e") @Export("faceColors3") int[] faceColors3; - @ObfuscatedName("a") + @ObfuscatedName("g") @Export("faceRenderPriorities") byte[] faceRenderPriorities; - @ObfuscatedName("e") + @ObfuscatedName("a") @Export("faceAlphas") byte[] faceAlphas; - @ObfuscatedName("d") - byte[] field2429; - @ObfuscatedName("u") + @ObfuscatedName("k") + byte[] field2439; + @ObfuscatedName("m") @Export("faceTextures") short[] faceTextures; - @ObfuscatedName("m") - byte field2431; - @ObfuscatedName("j") - int field2432; - @ObfuscatedName("f") - int[] field2433; - @ObfuscatedName("s") - int[] field2434; - @ObfuscatedName("y") - int[] field2436; + @ObfuscatedName("x") + byte field2441; + @ObfuscatedName("z") + int field2442; @ObfuscatedName("w") + int[] field2443; + @ObfuscatedName("t") + int[] field2444; + @ObfuscatedName("h") + int[] field2468; + @ObfuscatedName("q") @Export("vertexLabels") int[][] vertexLabels; - @ObfuscatedName("n") + @ObfuscatedName("i") @Export("faceLabelsAlpha") int[][] faceLabelsAlpha; - @ObfuscatedName("ag") + @ObfuscatedName("ae") @Export("isSingleTile") public boolean isSingleTile; - @ObfuscatedName("ae") + @ObfuscatedName("ap") @Export("boundsType") int boundsType; - @ObfuscatedName("ao") + @ObfuscatedName("ab") @Export("bottomY") int bottomY; - @ObfuscatedName("aj") + @ObfuscatedName("al") @Export("xzRadius") int xzRadius; - @ObfuscatedName("aw") + @ObfuscatedName("ad") @Export("diameter") int diameter; - @ObfuscatedName("at") + @ObfuscatedName("ai") @Export("radius") int radius; - @ObfuscatedName("av") + @ObfuscatedName("ar") @Export("xMid") int xMid; - @ObfuscatedName("al") + @ObfuscatedName("ag") @Export("yMid") int yMid; - @ObfuscatedName("ap") + @ObfuscatedName("ax") @Export("zMid") int zMid; - @ObfuscatedName("am") + @ObfuscatedName("as") @Export("xMidOffset") int xMidOffset; - @ObfuscatedName("ax") + @ObfuscatedName("aj") @Export("yMidOffset") int yMidOffset; - @ObfuscatedName("ak") + @ObfuscatedName("am") @Export("zMidOffset") int zMidOffset; @@ -185,36 +185,36 @@ public class Model extends Renderable { Model_sharedSequenceModelFaceAlphas = new byte[1]; // L: 7 Model_sharedSpotAnimationModel = new Model(); // L: 8 Model_sharedSpotAnimationModelFaceAlphas = new byte[1]; // L: 9 - field2451 = new boolean[4700]; // L: 45 - field2452 = new boolean[4700]; // L: 46 + field2455 = new boolean[4700]; // L: 45 + field2485 = new boolean[4700]; // L: 46 modelViewportXs = new int[4700]; // L: 47 modelViewportYs = new int[4700]; // L: 48 - field2460 = new int[4700]; // L: 49 - field2418 = new int[4700]; // L: 50 + field2465 = new int[4700]; // L: 49 + field2445 = new int[4700]; // L: 50 field2467 = new int[4700]; // L: 51 - field2471 = new int[4700]; // L: 52 - field2425 = new int[1600]; // L: 54 - field2461 = new int[1600][512]; // L: 55 - field2470 = new int[12]; // L: 56 - field2463 = new int[12][2000]; // L: 57 - field2464 = new int[2000]; // L: 58 - field2465 = new int[2000]; // L: 59 - field2415 = new int[12]; // L: 60 - field2474 = new int[10]; // L: 61 - field2457 = new int[10]; // L: 62 - field2469 = new int[10]; // L: 63 - field2473 = true; // L: 67 + field2422 = new int[4700]; // L: 52 + field2466 = new int[1600]; // L: 54 + field2471 = new int[1600][512]; // L: 55 + field2472 = new int[12]; // L: 56 + field2473 = new int[12][2000]; // L: 57 + field2474 = new int[2000]; // L: 58 + field2475 = new int[2000]; // L: 59 + field2434 = new int[12]; // L: 60 + field2477 = new int[10]; // L: 61 + field2489 = new int[10]; // L: 62 + field2479 = new int[10]; // L: 63 + field2483 = true; // L: 67 Model_sine = Rasterizer3D.Rasterizer3D_sine; // L: 70 Model_cosine = Rasterizer3D.Rasterizer3D_cosine; // L: 71 - field2478 = Rasterizer3D.Rasterizer3D_colorPalette; // L: 72 - field2479 = Rasterizer3D.field2275; // L: 73 + field2488 = Rasterizer3D.Rasterizer3D_colorPalette; // L: 72 + field2425 = Rasterizer3D.field2283; // L: 73 } Model() { this.verticesCount = 0; this.indicesCount = 0; - this.field2431 = 0; - this.field2432 = 0; + this.field2441 = 0; + this.field2442 = 0; this.isSingleTile = false; this.xMidOffset = -1; this.yMidOffset = -1; @@ -222,13 +222,13 @@ public class Model extends Renderable { } // L: 77 @ObfuscatedSignature( - descriptor = "([Lgj;I)V" + descriptor = "([Lgr;I)V" ) public Model(Model[] var1, int var2) { this.verticesCount = 0; // L: 10 this.indicesCount = 0; // L: 14 - this.field2431 = 0; // L: 25 - this.field2432 = 0; // L: 26 + this.field2441 = 0; // L: 25 + this.field2442 = 0; // L: 26 this.isSingleTile = false; // L: 32 this.xMidOffset = -1; // L: 41 this.yMidOffset = -1; // L: 42 @@ -239,8 +239,8 @@ public class Model extends Renderable { boolean var6 = false; // L: 83 this.verticesCount = 0; // L: 84 this.indicesCount = 0; // L: 85 - this.field2432 = 0; // L: 86 - this.field2431 = -1; // L: 87 + this.field2442 = 0; // L: 86 + this.field2441 = -1; // L: 87 int var7; Model var8; @@ -249,22 +249,22 @@ public class Model extends Renderable { if (var8 != null) { // L: 90 this.verticesCount += var8.verticesCount; // L: 91 this.indicesCount += var8.indicesCount; // L: 92 - this.field2432 += var8.field2432; // L: 93 + this.field2442 += var8.field2442; // L: 93 if (var8.faceRenderPriorities != null) { // L: 94 var3 = true; } else { - if (this.field2431 == -1) { // L: 96 - this.field2431 = var8.field2431; + if (this.field2441 == -1) { // L: 96 + this.field2441 = var8.field2441; } - if (this.field2431 != var8.field2431) { // L: 97 + if (this.field2441 != var8.field2441) { // L: 97 var3 = true; } } var4 |= var8.faceAlphas != null; // L: 99 var5 |= var8.faceTextures != null; // L: 100 - var6 |= var8.field2429 != null; // L: 101 + var6 |= var8.field2439 != null; // L: 101 } } @@ -290,18 +290,18 @@ public class Model extends Renderable { } if (var6) { // L: 116 - this.field2429 = new byte[this.indicesCount]; + this.field2439 = new byte[this.indicesCount]; } - if (this.field2432 > 0) { // L: 117 - this.field2433 = new int[this.field2432]; // L: 118 - this.field2434 = new int[this.field2432]; // L: 119 - this.field2436 = new int[this.field2432]; // L: 120 + if (this.field2442 > 0) { // L: 117 + this.field2443 = new int[this.field2442]; // L: 118 + this.field2444 = new int[this.field2442]; // L: 119 + this.field2468 = new int[this.field2442]; // L: 120 } this.verticesCount = 0; // L: 122 this.indicesCount = 0; // L: 123 - this.field2432 = 0; // L: 124 + this.field2442 = 0; // L: 124 for (var7 = 0; var7 < var2; ++var7) { // L: 125 var8 = var1[var7]; // L: 126 @@ -318,7 +318,7 @@ public class Model extends Renderable { if (var8.faceRenderPriorities != null) { // L: 136 this.faceRenderPriorities[this.indicesCount] = var8.faceRenderPriorities[var9]; } else { - this.faceRenderPriorities[this.indicesCount] = var8.field2431; // L: 137 + this.faceRenderPriorities[this.indicesCount] = var8.field2441; // L: 137 } } @@ -335,21 +335,21 @@ public class Model extends Renderable { } if (var6) { // L: 146 - if (var8.field2429 != null && var8.field2429[var9] != -1) { // L: 147 - this.field2429[this.indicesCount] = (byte)(this.field2432 + var8.field2429[var9]); + if (var8.field2439 != null && var8.field2439[var9] != -1) { // L: 147 + this.field2439[this.indicesCount] = (byte)(this.field2442 + var8.field2439[var9]); } else { - this.field2429[this.indicesCount] = -1; // L: 148 + this.field2439[this.indicesCount] = -1; // L: 148 } } ++this.indicesCount; // L: 150 } - for (var9 = 0; var9 < var8.field2432; ++var9) { // L: 152 - this.field2433[this.field2432] = this.verticesCount + var8.field2433[var9]; // L: 153 - this.field2434[this.field2432] = this.verticesCount + var8.field2434[var9]; // L: 154 - this.field2436[this.field2432] = this.verticesCount + var8.field2436[var9]; // L: 155 - ++this.field2432; // L: 156 + for (var9 = 0; var9 < var8.field2442; ++var9) { // L: 152 + this.field2443[this.field2442] = this.verticesCount + var8.field2443[var9]; // L: 153 + this.field2444[this.field2442] = this.verticesCount + var8.field2444[var9]; // L: 154 + this.field2468[this.field2442] = this.verticesCount + var8.field2468[var9]; // L: 155 + ++this.field2442; // L: 156 } for (var9 = 0; var9 < var8.verticesCount; ++var9) { // L: 158 @@ -363,9 +363,9 @@ public class Model extends Renderable { } // L: 166 - @ObfuscatedName("h") + @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "([[IIIIZI)Lgj;" + descriptor = "([[IIIIZI)Lgr;" ) @Export("contourGround") public Model contourGround(int[][] var1, int var2, int var3, int var4, boolean var5, int var6) { @@ -387,7 +387,7 @@ public class Model extends Renderable { var11 = new Model(); // L: 182 var11.verticesCount = this.verticesCount; // L: 183 var11.indicesCount = this.indicesCount; // L: 184 - var11.field2432 = this.field2432; // L: 185 + var11.field2442 = this.field2442; // L: 185 var11.verticesX = this.verticesX; // L: 186 var11.verticesZ = this.verticesZ; // L: 187 var11.indices1 = this.indices1; // L: 188 @@ -398,12 +398,12 @@ public class Model extends Renderable { var11.faceColors3 = this.faceColors3; // L: 193 var11.faceRenderPriorities = this.faceRenderPriorities; // L: 194 var11.faceAlphas = this.faceAlphas; // L: 195 - var11.field2429 = this.field2429; // L: 196 + var11.field2439 = this.field2439; // L: 196 var11.faceTextures = this.faceTextures; // L: 197 - var11.field2431 = this.field2431; // L: 198 - var11.field2433 = this.field2433; // L: 199 - var11.field2434 = this.field2434; // L: 200 - var11.field2436 = this.field2436; // L: 201 + var11.field2441 = this.field2441; // L: 198 + var11.field2443 = this.field2443; // L: 199 + var11.field2444 = this.field2444; // L: 200 + var11.field2468 = this.field2468; // L: 201 var11.vertexLabels = this.vertexLabels; // L: 202 var11.faceLabelsAlpha = this.faceLabelsAlpha; // L: 203 var11.isSingleTile = this.isSingleTile; // L: 204 @@ -461,9 +461,9 @@ public class Model extends Renderable { } } - @ObfuscatedName("o") + @ObfuscatedName("f") @ObfuscatedSignature( - descriptor = "(Z)Lgj;" + descriptor = "(Z)Lgr;" ) @Export("toSharedSequenceModel") public Model toSharedSequenceModel(boolean var1) { @@ -474,9 +474,9 @@ public class Model extends Renderable { return this.buildSharedModel(var1, Model_sharedSequenceModel, Model_sharedSequenceModelFaceAlphas); // L: 247 } - @ObfuscatedName("g") + @ObfuscatedName("y") @ObfuscatedSignature( - descriptor = "(Z)Lgj;" + descriptor = "(Z)Lgr;" ) @Export("toSharedSpotAnimationModel") public Model toSharedSpotAnimationModel(boolean var1) { @@ -487,15 +487,15 @@ public class Model extends Renderable { return this.buildSharedModel(var1, Model_sharedSpotAnimationModel, Model_sharedSpotAnimationModelFaceAlphas); // L: 252 } - @ObfuscatedName("l") + @ObfuscatedName("b") @ObfuscatedSignature( - descriptor = "(ZLgj;[B)Lgj;" + descriptor = "(ZLgr;[B)Lgr;" ) @Export("buildSharedModel") Model buildSharedModel(boolean var1, Model var2, byte[] var3) { var2.verticesCount = this.verticesCount; // L: 256 var2.indicesCount = this.indicesCount; // L: 257 - var2.field2432 = this.field2432; // L: 258 + var2.field2442 = this.field2442; // L: 258 if (var2.verticesX == null || var2.verticesX.length < this.verticesCount) { // L: 259 var2.verticesX = new int[this.verticesCount + 100]; // L: 260 var2.verticesY = new int[this.verticesCount + 100]; // L: 261 @@ -531,12 +531,12 @@ public class Model extends Renderable { var2.faceColors2 = this.faceColors2; // L: 283 var2.faceColors3 = this.faceColors3; // L: 284 var2.faceRenderPriorities = this.faceRenderPriorities; // L: 285 - var2.field2429 = this.field2429; // L: 286 + var2.field2439 = this.field2439; // L: 286 var2.faceTextures = this.faceTextures; // L: 287 - var2.field2431 = this.field2431; // L: 288 - var2.field2433 = this.field2433; // L: 289 - var2.field2434 = this.field2434; // L: 290 - var2.field2436 = this.field2436; // L: 291 + var2.field2441 = this.field2441; // L: 288 + var2.field2443 = this.field2443; // L: 289 + var2.field2444 = this.field2444; // L: 290 + var2.field2468 = this.field2468; // L: 291 var2.vertexLabels = this.vertexLabels; // L: 292 var2.faceLabelsAlpha = this.faceLabelsAlpha; // L: 293 var2.isSingleTile = this.isSingleTile; // L: 294 @@ -544,7 +544,7 @@ public class Model extends Renderable { return var2; // L: 296 } - @ObfuscatedName("z") + @ObfuscatedName("d") @Export("calculateBoundingBox") void calculateBoundingBox(int var1) { if (this.xMidOffset == -1) { // L: 300 @@ -558,9 +558,9 @@ public class Model extends Renderable { int var9 = Model_sine[var1]; // L: 308 for (int var10 = 0; var10 < this.verticesCount; ++var10) { // L: 309 - int var11 = Rasterizer3D.method3833(this.verticesX[var10], this.verticesZ[var10], var8, var9); // L: 310 + int var11 = Rasterizer3D.method3863(this.verticesX[var10], this.verticesZ[var10], var8, var9); // L: 310 int var12 = this.verticesY[var10]; // L: 311 - int var13 = Rasterizer3D.method3834(this.verticesX[var10], this.verticesZ[var10], var8, var9); // L: 312 + int var13 = Rasterizer3D.method3864(this.verticesX[var10], this.verticesZ[var10], var8, var9); // L: 312 if (var11 < var2) { // L: 313 var2 = var11; } @@ -608,7 +608,7 @@ public class Model extends Renderable { } } // L: 334 - @ObfuscatedName("b") + @ObfuscatedName("s") @Export("calculateBoundsCylinder") public void calculateBoundsCylinder() { if (this.boundsType != 1) { // L: 337 @@ -641,8 +641,8 @@ public class Model extends Renderable { } } // L: 354 - @ObfuscatedName("q") - void method4124() { + @ObfuscatedName("u") + void method4150() { if (this.boundsType != 2) { // L: 357 this.boundsType = 2; // L: 358 this.xzRadius = 0; // L: 359 @@ -663,22 +663,22 @@ public class Model extends Renderable { } } // L: 370 - @ObfuscatedName("i") - public int method4125() { + @ObfuscatedName("l") + public int method4180() { this.calculateBoundsCylinder(); // L: 373 return this.xzRadius; // L: 374 } - @ObfuscatedName("x") + @ObfuscatedName("o") @Export("resetBounds") void resetBounds() { this.boundsType = 0; // L: 378 this.xMidOffset = -1; // L: 379 } // L: 380 - @ObfuscatedName("k") + @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "(Lgi;I)V" + descriptor = "(Lgd;I)V" ) @Export("animate") public void animate(Frames var1, int var2) { @@ -700,9 +700,9 @@ public class Model extends Renderable { } } // L: 395 - @ObfuscatedName("r") + @ObfuscatedName("e") @ObfuscatedSignature( - descriptor = "(Lgi;ILgi;I[I)V" + descriptor = "(Lgd;ILgd;I[I)V" ) @Export("animate2") public void animate2(Frames var1, int var2, Frames var3, int var4, int[] var5) { @@ -752,7 +752,7 @@ public class Model extends Renderable { } } // L: 401 427 - @ObfuscatedName("p") + @ObfuscatedName("g") @Export("transform") void transform(int var1, int[] var2, int var3, int var4, int var5) { int var6 = var2.length; // L: 430 @@ -932,7 +932,7 @@ public class Model extends Renderable { this.resetBounds(); // L: 565 } // L: 566 - @ObfuscatedName("e") + @ObfuscatedName("k") @Export("rotateY180") public void rotateY180() { for (int var1 = 0; var1 < this.verticesCount; ++var1) { // L: 569 @@ -943,7 +943,7 @@ public class Model extends Renderable { this.resetBounds(); // L: 573 } // L: 574 - @ObfuscatedName("d") + @ObfuscatedName("m") @Export("rotateY270Ccw") public void rotateY270Ccw() { for (int var1 = 0; var1 < this.verticesCount; ++var1) { // L: 577 @@ -955,7 +955,7 @@ public class Model extends Renderable { this.resetBounds(); // L: 582 } // L: 583 - @ObfuscatedName("u") + @ObfuscatedName("x") @Export("rotateZ") public void rotateZ(int var1) { int var2 = Model_sine[var1]; // L: 586 @@ -970,7 +970,7 @@ public class Model extends Renderable { this.resetBounds(); // L: 593 } // L: 594 - @ObfuscatedName("m") + @ObfuscatedName("z") @Export("offsetBy") public void offsetBy(int var1, int var2, int var3) { for (int var4 = 0; var4 < this.verticesCount; ++var4) { // L: 597 @@ -985,7 +985,7 @@ public class Model extends Renderable { this.resetBounds(); // L: 602 } // L: 603 - @ObfuscatedName("j") + @ObfuscatedName("w") @Export("scale") public void scale(int var1, int var2, int var3) { for (int var4 = 0; var4 < this.verticesCount; ++var4) { // L: 606 @@ -997,11 +997,11 @@ public class Model extends Renderable { this.resetBounds(); // L: 611 } // L: 612 - @ObfuscatedName("f") - public final void method4136(int var1, int var2, int var3, int var4, int var5, int var6, int var7) { - field2425[0] = -1; // L: 615 + @ObfuscatedName("t") + public final void method4217(int var1, int var2, int var3, int var4, int var5, int var6, int var7) { + field2466[0] = -1; // L: 615 if (this.boundsType != 2 && this.boundsType != 1) { // L: 616 - this.method4124(); + this.method4150(); } int var8 = Rasterizer3D.Rasterizer3D_clipMidX; // L: 617 @@ -1044,13 +1044,13 @@ public class Model extends Renderable { var22 += var7; // L: 649 var23 = var21 * var17 - var22 * var16 >> 16; // L: 650 var22 = var21 * var16 + var22 * var17 >> 16; // L: 651 - field2460[var19] = var22 - var18; // L: 653 + field2465[var19] = var22 - var18; // L: 653 modelViewportXs[var19] = var20 * Rasterizer3D.Rasterizer3D_zoom / var22 + var8; // L: 654 modelViewportYs[var19] = var23 * Rasterizer3D.Rasterizer3D_zoom / var22 + var9; // L: 655 - if (this.field2432 > 0) { // L: 656 - field2418[var19] = var20; // L: 657 + if (this.field2442 > 0) { // L: 656 + field2445[var19] = var20; // L: 657 field2467[var19] = var23; // L: 658 - field2471[var19] = var22; // L: 659 + field2422[var19] = var22; // L: 659 } } @@ -1061,11 +1061,11 @@ public class Model extends Renderable { } // L: 666 - @ObfuscatedName("s") - public final void method4137(int var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8) { - field2425[0] = -1; // L: 669 + @ObfuscatedName("h") + public final void method4209(int var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8) { + field2466[0] = -1; // L: 669 if (this.boundsType != 2 && this.boundsType != 1) { // L: 670 - this.method4124(); + this.method4150(); } int var9 = Rasterizer3D.Rasterizer3D_clipMidX; // L: 671 @@ -1108,13 +1108,13 @@ public class Model extends Renderable { var23 += var7; // L: 703 var24 = var22 * var18 - var23 * var17 >> 16; // L: 704 var23 = var22 * var17 + var23 * var18 >> 16; // L: 705 - field2460[var20] = var23 - var19; // L: 707 + field2465[var20] = var23 - var19; // L: 707 modelViewportXs[var20] = var9 + var21 * Rasterizer3D.Rasterizer3D_zoom / var8; // L: 708 modelViewportYs[var20] = var10 + var24 * Rasterizer3D.Rasterizer3D_zoom / var8; // L: 709 - if (this.field2432 > 0) { // L: 710 - field2418[var20] = var21; // L: 711 + if (this.field2442 > 0) { // L: 710 + field2445[var20] = var21; // L: 711 field2467[var20] = var24; // L: 712 - field2471[var20] = var23; // L: 713 + field2422[var20] = var23; // L: 713 } } @@ -1125,16 +1125,16 @@ public class Model extends Renderable { } // L: 720 - @ObfuscatedName("y") + @ObfuscatedName("q") @Export("draw0") final void draw0(boolean var1, boolean var2, boolean var3, long var4) { - if (this.diameter < 1600) { // L: 925 + if (this.diameter < 1600) { // L: 899 int var6; - for (var6 = 0; var6 < this.diameter; ++var6) { // L: 926 - field2425[var6] = 0; + for (var6 = 0; var6 < this.diameter; ++var6) { // L: 900 + field2466[var6] = 0; } - var6 = var3 ? 20 : 5; // L: 927 + var6 = var3 ? 20 : 5; // L: 901 int var7; int var8; @@ -1146,455 +1146,426 @@ public class Model extends Renderable { int var16; int var18; int var28; - for (var7 = 0; var7 < this.indicesCount; ++var7) { // L: 928 - if (this.faceColors3[var7] != -2) { // L: 929 - var8 = this.indices1[var7]; // L: 930 - var9 = this.indices2[var7]; // L: 931 - var10 = this.indices3[var7]; // L: 932 - var11 = modelViewportXs[var8]; // L: 933 - var12 = modelViewportXs[var9]; // L: 934 - var28 = modelViewportXs[var10]; // L: 935 + for (var7 = 0; var7 < this.indicesCount; ++var7) { // L: 902 + if (this.faceColors3[var7] != -2) { // L: 903 + var8 = this.indices1[var7]; // L: 904 + var9 = this.indices2[var7]; // L: 905 + var10 = this.indices3[var7]; // L: 906 + var11 = modelViewportXs[var8]; // L: 907 + var12 = modelViewportXs[var9]; // L: 908 + var28 = modelViewportXs[var10]; // L: 909 int var29; - int var30; - if (!var1 || var11 != -5000 && var12 != -5000 && var28 != -5000) { // L: 936 - if (var2) { // L: 962 - var15 = modelViewportYs[var8]; // L: 964 - var16 = modelViewportYs[var9]; // L: 965 - var30 = modelViewportYs[var10]; // L: 966 - var18 = var6 + ViewportMouse.ViewportMouse_y; // L: 968 - boolean var32; - if (var18 < var15 && var18 < var16 && var18 < var30) { // L: 969 - var32 = false; // L: 970 - } else { - var18 = ViewportMouse.ViewportMouse_y - var6; // L: 973 - if (var18 > var15 && var18 > var16 && var18 > var30) { // L: 974 - var32 = false; // L: 975 - } else { - var18 = var6 + ViewportMouse.ViewportMouse_x; // L: 978 - if (var18 < var11 && var18 < var12 && var18 < var28) { // L: 979 - var32 = false; // L: 980 - } else { - var18 = ViewportMouse.ViewportMouse_x - var6; // L: 983 - if (var18 > var11 && var18 > var12 && var18 > var28) { // L: 984 - var32 = false; // L: 985 - } else { - var32 = true; // L: 988 - } - } - } - } - - if (var32) { // L: 990 - class159.method3135(var4); // L: 991 - var2 = false; // L: 992 - } + if (!var1 || var11 != -5000 && var12 != -5000 && var28 != -5000) { // L: 910 + if (var2 && ArchiveLoader.method2059(modelViewportYs[var8], modelViewportYs[var9], modelViewportYs[var10], var11, var12, var28, var6)) { // L: 936 + Actor.method2191(var4); // L: 937 + var2 = false; // L: 938 } - if ((var11 - var12) * (modelViewportYs[var10] - modelViewportYs[var9]) - (var28 - var12) * (modelViewportYs[var8] - modelViewportYs[var9]) > 0) { // L: 995 - field2452[var7] = false; // L: 996 - if (var11 >= 0 && var12 >= 0 && var28 >= 0 && var11 <= Rasterizer3D.Rasterizer3D_clipWidth && var12 <= Rasterizer3D.Rasterizer3D_clipWidth && var28 <= Rasterizer3D.Rasterizer3D_clipWidth) { // L: 997 - field2451[var7] = false; // L: 998 + if ((var11 - var12) * (modelViewportYs[var10] - modelViewportYs[var9]) - (var28 - var12) * (modelViewportYs[var8] - modelViewportYs[var9]) > 0) { // L: 940 + field2485[var7] = false; // L: 941 + if (var11 >= 0 && var12 >= 0 && var28 >= 0 && var11 <= Rasterizer3D.Rasterizer3D_clipWidth && var12 <= Rasterizer3D.Rasterizer3D_clipWidth && var28 <= Rasterizer3D.Rasterizer3D_clipWidth) { // L: 942 + field2455[var7] = false; // L: 943 } else { - field2451[var7] = true; + field2455[var7] = true; } - var29 = (field2460[var8] + field2460[var9] + field2460[var10]) / 3 + this.radius; // L: 999 - field2461[var29][field2425[var29]++] = var7; // L: 1000 + var29 = (field2465[var8] + field2465[var9] + field2465[var10]) / 3 + this.radius; // L: 944 + field2471[var29][field2466[var29]++] = var7; // L: 945 } } else { - var29 = field2418[var8]; // L: 937 - var15 = field2418[var9]; // L: 938 - var16 = field2418[var10]; // L: 939 - var30 = field2467[var8]; // L: 940 - var18 = field2467[var9]; // L: 941 - int var19 = field2467[var10]; // L: 942 - int var20 = field2471[var8]; // L: 943 - int var21 = field2471[var9]; // L: 944 - int var22 = field2471[var10]; // L: 945 - var29 -= var15; // L: 946 - var16 -= var15; // L: 947 - var30 -= var18; // L: 948 - var19 -= var18; // L: 949 - var20 -= var21; // L: 950 - var22 -= var21; // L: 951 - int var23 = var30 * var22 - var20 * var19; // L: 952 - int var24 = var20 * var16 - var29 * var22; // L: 953 - int var25 = var29 * var19 - var30 * var16; // L: 954 - if (var15 * var23 + var18 * var24 + var21 * var25 > 0) { // L: 955 - field2452[var7] = true; // L: 956 - int var26 = (field2460[var8] + field2460[var9] + field2460[var10]) / 3 + this.radius; // L: 957 - field2461[var26][field2425[var26]++] = var7; // L: 958 + var29 = field2445[var8]; // L: 911 + var15 = field2445[var9]; // L: 912 + var16 = field2445[var10]; // L: 913 + int var30 = field2467[var8]; // L: 914 + var18 = field2467[var9]; // L: 915 + int var19 = field2467[var10]; // L: 916 + int var20 = field2422[var8]; // L: 917 + int var21 = field2422[var9]; // L: 918 + int var22 = field2422[var10]; // L: 919 + var29 -= var15; // L: 920 + var16 -= var15; // L: 921 + var30 -= var18; // L: 922 + var19 -= var18; // L: 923 + var20 -= var21; // L: 924 + var22 -= var21; // L: 925 + int var23 = var30 * var22 - var20 * var19; // L: 926 + int var24 = var20 * var16 - var29 * var22; // L: 927 + int var25 = var29 * var19 - var30 * var16; // L: 928 + if (var15 * var23 + var18 * var24 + var21 * var25 > 0) { // L: 929 + field2485[var7] = true; // L: 930 + int var26 = (field2465[var8] + field2465[var9] + field2465[var10]) / 3 + this.radius; // L: 931 + field2471[var26][field2466[var26]++] = var7; // L: 932 } } } } int[] var27; - if (this.faceRenderPriorities == null) { // L: 1004 - for (var7 = this.diameter - 1; var7 >= 0; --var7) { // L: 1005 - var8 = field2425[var7]; // L: 1006 - if (var8 > 0) { // L: 1007 - var27 = field2461[var7]; // L: 1008 + if (this.faceRenderPriorities == null) { // L: 949 + for (var7 = this.diameter - 1; var7 >= 0; --var7) { // L: 950 + var8 = field2466[var7]; // L: 951 + if (var8 > 0) { // L: 952 + var27 = field2471[var7]; // L: 953 - for (var10 = 0; var10 < var8; ++var10) { // L: 1009 + for (var10 = 0; var10 < var8; ++var10) { // L: 954 this.drawFace(var27[var10]); } } } } else { - for (var7 = 0; var7 < 12; ++var7) { // L: 1014 - field2470[var7] = 0; // L: 1015 - field2415[var7] = 0; // L: 1016 + for (var7 = 0; var7 < 12; ++var7) { // L: 959 + field2472[var7] = 0; // L: 960 + field2434[var7] = 0; // L: 961 } - for (var7 = this.diameter - 1; var7 >= 0; --var7) { // L: 1018 - var8 = field2425[var7]; // L: 1019 - if (var8 > 0) { // L: 1020 - var27 = field2461[var7]; // L: 1021 + for (var7 = this.diameter - 1; var7 >= 0; --var7) { // L: 963 + var8 = field2466[var7]; // L: 964 + if (var8 > 0) { // L: 965 + var27 = field2471[var7]; // L: 966 - for (var10 = 0; var10 < var8; ++var10) { // L: 1022 - var11 = var27[var10]; // L: 1023 - byte var31 = this.faceRenderPriorities[var11]; // L: 1024 - var28 = field2470[var31]++; // L: 1025 - field2463[var31][var28] = var11; // L: 1026 - if (var31 < 10) { // L: 1027 - int[] var10000 = field2415; + for (var10 = 0; var10 < var8; ++var10) { // L: 967 + var11 = var27[var10]; // L: 968 + byte var31 = this.faceRenderPriorities[var11]; // L: 969 + var28 = field2472[var31]++; // L: 970 + field2473[var31][var28] = var11; // L: 971 + if (var31 < 10) { // L: 972 + int[] var10000 = field2434; var10000[var31] += var7; - } else if (var31 == 10) { // L: 1028 - field2464[var28] = var7; + } else if (var31 == 10) { // L: 973 + field2474[var28] = var7; } else { - field2465[var28] = var7; // L: 1029 + field2475[var28] = var7; // L: 974 } } } } - var7 = 0; // L: 1033 - if (field2470[1] > 0 || field2470[2] > 0) { // L: 1034 - var7 = (field2415[1] + field2415[2]) / (field2470[1] + field2470[2]); + var7 = 0; // L: 978 + if (field2472[1] > 0 || field2472[2] > 0) { // L: 979 + var7 = (field2434[1] + field2434[2]) / (field2472[1] + field2472[2]); } - var8 = 0; // L: 1035 - if (field2470[3] > 0 || field2470[4] > 0) { // L: 1036 - var8 = (field2415[3] + field2415[4]) / (field2470[3] + field2470[4]); + var8 = 0; // L: 980 + if (field2472[3] > 0 || field2472[4] > 0) { // L: 981 + var8 = (field2434[3] + field2434[4]) / (field2472[3] + field2472[4]); } - var9 = 0; // L: 1037 - if (field2470[6] > 0 || field2470[8] > 0) { // L: 1038 - var9 = (field2415[8] + field2415[6]) / (field2470[8] + field2470[6]); + var9 = 0; // L: 982 + if (field2472[6] > 0 || field2472[8] > 0) { // L: 983 + var9 = (field2434[8] + field2434[6]) / (field2472[8] + field2472[6]); } - var11 = 0; // L: 1040 - var12 = field2470[10]; // L: 1041 - int[] var13 = field2463[10]; // L: 1042 - int[] var14 = field2464; // L: 1043 - if (var11 == var12) { // L: 1044 - var11 = 0; // L: 1045 - var12 = field2470[11]; // L: 1046 - var13 = field2463[11]; // L: 1047 - var14 = field2465; // L: 1048 + var11 = 0; // L: 985 + var12 = field2472[10]; // L: 986 + int[] var13 = field2473[10]; // L: 987 + int[] var14 = field2474; // L: 988 + if (var11 == var12) { // L: 989 + var11 = 0; // L: 990 + var12 = field2472[11]; // L: 991 + var13 = field2473[11]; // L: 992 + var14 = field2475; // L: 993 } - if (var11 < var12) { // L: 1050 + if (var11 < var12) { // L: 995 var10 = var14[var11]; } else { - var10 = -1000; // L: 1051 + var10 = -1000; // L: 996 } - for (var15 = 0; var15 < 10; ++var15) { // L: 1052 - while (var15 == 0 && var10 > var7) { // L: 1053 - this.drawFace(var13[var11++]); // L: 1054 - if (var11 == var12 && var13 != field2463[11]) { // L: 1055 - var11 = 0; // L: 1056 - var12 = field2470[11]; // L: 1057 - var13 = field2463[11]; // L: 1058 - var14 = field2465; // L: 1059 + for (var15 = 0; var15 < 10; ++var15) { // L: 997 + while (var15 == 0 && var10 > var7) { // L: 998 + this.drawFace(var13[var11++]); // L: 999 + if (var11 == var12 && var13 != field2473[11]) { // L: 1000 + var11 = 0; // L: 1001 + var12 = field2472[11]; // L: 1002 + var13 = field2473[11]; // L: 1003 + var14 = field2475; // L: 1004 } - if (var11 < var12) { // L: 1061 + if (var11 < var12) { // L: 1006 var10 = var14[var11]; } else { - var10 = -1000; // L: 1062 + var10 = -1000; // L: 1007 } } - while (var15 == 3 && var10 > var8) { // L: 1064 - this.drawFace(var13[var11++]); // L: 1065 - if (var11 == var12 && var13 != field2463[11]) { // L: 1066 - var11 = 0; // L: 1067 - var12 = field2470[11]; // L: 1068 - var13 = field2463[11]; // L: 1069 - var14 = field2465; // L: 1070 + while (var15 == 3 && var10 > var8) { // L: 1009 + this.drawFace(var13[var11++]); // L: 1010 + if (var11 == var12 && var13 != field2473[11]) { // L: 1011 + var11 = 0; // L: 1012 + var12 = field2472[11]; // L: 1013 + var13 = field2473[11]; // L: 1014 + var14 = field2475; // L: 1015 } - if (var11 < var12) { // L: 1072 + if (var11 < var12) { // L: 1017 var10 = var14[var11]; } else { - var10 = -1000; // L: 1073 + var10 = -1000; // L: 1018 } } - while (var15 == 5 && var10 > var9) { // L: 1075 - this.drawFace(var13[var11++]); // L: 1076 - if (var11 == var12 && var13 != field2463[11]) { // L: 1077 - var11 = 0; // L: 1078 - var12 = field2470[11]; // L: 1079 - var13 = field2463[11]; // L: 1080 - var14 = field2465; // L: 1081 + while (var15 == 5 && var10 > var9) { // L: 1020 + this.drawFace(var13[var11++]); // L: 1021 + if (var11 == var12 && var13 != field2473[11]) { // L: 1022 + var11 = 0; // L: 1023 + var12 = field2472[11]; // L: 1024 + var13 = field2473[11]; // L: 1025 + var14 = field2475; // L: 1026 } - if (var11 < var12) { // L: 1083 + if (var11 < var12) { // L: 1028 var10 = var14[var11]; } else { - var10 = -1000; // L: 1084 + var10 = -1000; // L: 1029 } } - var16 = field2470[var15]; // L: 1086 - int[] var17 = field2463[var15]; // L: 1087 + var16 = field2472[var15]; // L: 1031 + int[] var17 = field2473[var15]; // L: 1032 - for (var18 = 0; var18 < var16; ++var18) { // L: 1088 - this.drawFace(var17[var18]); // L: 1089 + for (var18 = 0; var18 < var16; ++var18) { // L: 1033 + this.drawFace(var17[var18]); // L: 1034 } } - while (var10 != -1000) { // L: 1092 - this.drawFace(var13[var11++]); // L: 1093 - if (var11 == var12 && var13 != field2463[11]) { // L: 1094 - var11 = 0; // L: 1095 - var13 = field2463[11]; // L: 1096 - var12 = field2470[11]; // L: 1097 - var14 = field2465; // L: 1098 + while (var10 != -1000) { // L: 1037 + this.drawFace(var13[var11++]); // L: 1038 + if (var11 == var12 && var13 != field2473[11]) { // L: 1039 + var11 = 0; // L: 1040 + var13 = field2473[11]; // L: 1041 + var12 = field2472[11]; // L: 1042 + var14 = field2475; // L: 1043 } - if (var11 < var12) { // L: 1100 + if (var11 < var12) { // L: 1045 var10 = var14[var11]; } else { - var10 = -1000; // L: 1101 + var10 = -1000; // L: 1046 } } } } - } // L: 1012 1103 + } // L: 957 1048 - @ObfuscatedName("w") + @ObfuscatedName("i") @Export("drawFace") final void drawFace(int var1) { - if (field2452[var1]) { // L: 1106 - this.method4141(var1); // L: 1107 + if (field2485[var1]) { // L: 1051 + this.method4167(var1); // L: 1052 } else { - int var2 = this.indices1[var1]; // L: 1110 - int var3 = this.indices2[var1]; // L: 1111 - int var4 = this.indices3[var1]; // L: 1112 - Rasterizer3D.field2260 = field2451[var1]; // L: 1113 - if (this.faceAlphas == null) { // L: 1114 + int var2 = this.indices1[var1]; // L: 1055 + int var3 = this.indices2[var1]; // L: 1056 + int var4 = this.indices3[var1]; // L: 1057 + Rasterizer3D.field2262 = field2455[var1]; // L: 1058 + if (this.faceAlphas == null) { // L: 1059 Rasterizer3D.Rasterizer3D_alpha = 0; } else { - Rasterizer3D.Rasterizer3D_alpha = this.faceAlphas[var1] & 255; // L: 1115 + Rasterizer3D.Rasterizer3D_alpha = this.faceAlphas[var1] & 255; // L: 1060 } - if (this.faceTextures != null && this.faceTextures[var1] != -1) { // L: 1116 + if (this.faceTextures != null && this.faceTextures[var1] != -1) { // L: 1061 int var5; int var6; int var7; - if (this.field2429 != null && this.field2429[var1] != -1) { // L: 1124 - int var8 = this.field2429[var1] & 255; // L: 1125 - var5 = this.field2433[var8]; // L: 1126 - var6 = this.field2434[var8]; // L: 1127 - var7 = this.field2436[var8]; // L: 1128 + if (this.field2439 != null && this.field2439[var1] != -1) { // L: 1069 + int var8 = this.field2439[var1] & 255; // L: 1070 + var5 = this.field2443[var8]; // L: 1071 + var6 = this.field2444[var8]; // L: 1072 + var7 = this.field2468[var8]; // L: 1073 } else { - var5 = var2; // L: 1131 - var6 = var3; // L: 1132 - var7 = var4; // L: 1133 + var5 = var2; // L: 1076 + var6 = var3; // L: 1077 + var7 = var4; // L: 1078 } if (this.faceColors3[var1] == -1) { - Rasterizer3D.method3843(modelViewportYs[var2], modelViewportYs[var3], modelViewportYs[var4], modelViewportXs[var2], modelViewportXs[var3], modelViewportXs[var4], this.faceColors1[var1], this.faceColors1[var1], this.faceColors1[var1], field2418[var5], field2418[var6], field2418[var7], field2467[var5], field2467[var6], field2467[var7], field2471[var5], field2471[var6], field2471[var7], this.faceTextures[var1]); // L: 1135 + Rasterizer3D.method3877(modelViewportYs[var2], modelViewportYs[var3], modelViewportYs[var4], modelViewportXs[var2], modelViewportXs[var3], modelViewportXs[var4], this.faceColors1[var1], this.faceColors1[var1], this.faceColors1[var1], field2445[var5], field2445[var6], field2445[var7], field2467[var5], field2467[var6], field2467[var7], field2422[var5], field2422[var6], field2422[var7], this.faceTextures[var1]); // L: 1080 } else { - Rasterizer3D.method3843(modelViewportYs[var2], modelViewportYs[var3], modelViewportYs[var4], modelViewportXs[var2], modelViewportXs[var3], modelViewportXs[var4], this.faceColors1[var1], this.faceColors2[var1], this.faceColors3[var1], field2418[var5], field2418[var6], field2418[var7], field2467[var5], field2467[var6], field2467[var7], field2471[var5], field2471[var6], field2471[var7], this.faceTextures[var1]); // L: 1136 + Rasterizer3D.method3877(modelViewportYs[var2], modelViewportYs[var3], modelViewportYs[var4], modelViewportXs[var2], modelViewportXs[var3], modelViewportXs[var4], this.faceColors1[var1], this.faceColors2[var1], this.faceColors3[var1], field2445[var5], field2445[var6], field2445[var7], field2467[var5], field2467[var6], field2467[var7], field2422[var5], field2422[var6], field2422[var7], this.faceTextures[var1]); // L: 1081 } - } else if (this.faceColors3[var1] == -1) { // L: 1117 - Rasterizer3D.method3826(modelViewportYs[var2], modelViewportYs[var3], modelViewportYs[var4], modelViewportXs[var2], modelViewportXs[var3], modelViewportXs[var4], field2478[this.faceColors1[var1]]); + } else if (this.faceColors3[var1] == -1) { // L: 1062 + Rasterizer3D.method3919(modelViewportYs[var2], modelViewportYs[var3], modelViewportYs[var4], modelViewportXs[var2], modelViewportXs[var3], modelViewportXs[var4], field2488[this.faceColors1[var1]]); } else { - Rasterizer3D.method3824(modelViewportYs[var2], modelViewportYs[var3], modelViewportYs[var4], modelViewportXs[var2], modelViewportXs[var3], modelViewportXs[var4], this.faceColors1[var1], this.faceColors2[var1], this.faceColors3[var1]); // L: 1118 + Rasterizer3D.method3854(modelViewportYs[var2], modelViewportYs[var3], modelViewportYs[var4], modelViewportXs[var2], modelViewportXs[var3], modelViewportXs[var4], this.faceColors1[var1], this.faceColors2[var1], this.faceColors3[var1]); // L: 1063 } } - } // L: 1108 1138 + } // L: 1053 1083 - @ObfuscatedName("n") - final void method4141(int var1) { - int var2 = Rasterizer3D.Rasterizer3D_clipMidX; // L: 1141 - int var3 = Rasterizer3D.Rasterizer3D_clipMidY; // L: 1142 - int var4 = 0; // L: 1143 - int var5 = this.indices1[var1]; // L: 1144 - int var6 = this.indices2[var1]; // L: 1145 - int var7 = this.indices3[var1]; // L: 1146 - int var8 = field2471[var5]; // L: 1147 - int var9 = field2471[var6]; // L: 1148 - int var10 = field2471[var7]; // L: 1149 - if (this.faceAlphas == null) { // L: 1150 + @ObfuscatedName("ae") + final void method4167(int var1) { + int var2 = Rasterizer3D.Rasterizer3D_clipMidX; // L: 1086 + int var3 = Rasterizer3D.Rasterizer3D_clipMidY; // L: 1087 + int var4 = 0; // L: 1088 + int var5 = this.indices1[var1]; // L: 1089 + int var6 = this.indices2[var1]; // L: 1090 + int var7 = this.indices3[var1]; // L: 1091 + int var8 = field2422[var5]; // L: 1092 + int var9 = field2422[var6]; // L: 1093 + int var10 = field2422[var7]; // L: 1094 + if (this.faceAlphas == null) { // L: 1095 Rasterizer3D.Rasterizer3D_alpha = 0; } else { - Rasterizer3D.Rasterizer3D_alpha = this.faceAlphas[var1] & 255; // L: 1151 + Rasterizer3D.Rasterizer3D_alpha = this.faceAlphas[var1] & 255; // L: 1096 } int var11; int var12; int var13; int var14; - if (var8 >= 50) { // L: 1152 - field2474[var4] = modelViewportXs[var5]; // L: 1153 - field2457[var4] = modelViewportYs[var5]; // L: 1154 - field2469[var4++] = this.faceColors1[var1]; // L: 1155 + if (var8 >= 50) { // L: 1097 + field2477[var4] = modelViewportXs[var5]; // L: 1098 + field2489[var4] = modelViewportYs[var5]; // L: 1099 + field2479[var4++] = this.faceColors1[var1]; // L: 1100 } else { - var11 = field2418[var5]; // L: 1158 - var12 = field2467[var5]; // L: 1159 - var13 = this.faceColors1[var1]; // L: 1160 - if (var10 >= 50) { // L: 1161 - var14 = field2479[var10 - var8] * (50 - var8); // L: 1162 - field2474[var4] = var2 + Rasterizer3D.Rasterizer3D_zoom * (var11 + ((field2418[var7] - var11) * var14 >> 16)) / 50; // L: 1163 - field2457[var4] = var3 + Rasterizer3D.Rasterizer3D_zoom * (var12 + ((field2467[var7] - var12) * var14 >> 16)) / 50; // L: 1164 - field2469[var4++] = var13 + ((this.faceColors3[var1] - var13) * var14 >> 16); // L: 1165 + var11 = field2445[var5]; // L: 1103 + var12 = field2467[var5]; // L: 1104 + var13 = this.faceColors1[var1]; // L: 1105 + if (var10 >= 50) { // L: 1106 + var14 = field2425[var10 - var8] * (50 - var8); // L: 1107 + field2477[var4] = var2 + Rasterizer3D.Rasterizer3D_zoom * (var11 + ((field2445[var7] - var11) * var14 >> 16)) / 50; // L: 1108 + field2489[var4] = var3 + Rasterizer3D.Rasterizer3D_zoom * (var12 + ((field2467[var7] - var12) * var14 >> 16)) / 50; // L: 1109 + field2479[var4++] = var13 + ((this.faceColors3[var1] - var13) * var14 >> 16); // L: 1110 } - if (var9 >= 50) { // L: 1167 - var14 = field2479[var9 - var8] * (50 - var8); // L: 1168 - field2474[var4] = var2 + Rasterizer3D.Rasterizer3D_zoom * (var11 + ((field2418[var6] - var11) * var14 >> 16)) / 50; // L: 1169 - field2457[var4] = var3 + Rasterizer3D.Rasterizer3D_zoom * (var12 + ((field2467[var6] - var12) * var14 >> 16)) / 50; // L: 1170 - field2469[var4++] = var13 + ((this.faceColors2[var1] - var13) * var14 >> 16); // L: 1171 + if (var9 >= 50) { // L: 1112 + var14 = field2425[var9 - var8] * (50 - var8); // L: 1113 + field2477[var4] = var2 + Rasterizer3D.Rasterizer3D_zoom * (var11 + ((field2445[var6] - var11) * var14 >> 16)) / 50; // L: 1114 + field2489[var4] = var3 + Rasterizer3D.Rasterizer3D_zoom * (var12 + ((field2467[var6] - var12) * var14 >> 16)) / 50; // L: 1115 + field2479[var4++] = var13 + ((this.faceColors2[var1] - var13) * var14 >> 16); // L: 1116 } } - if (var9 >= 50) { // L: 1174 - field2474[var4] = modelViewportXs[var6]; // L: 1175 - field2457[var4] = modelViewportYs[var6]; // L: 1176 - field2469[var4++] = this.faceColors2[var1]; // L: 1177 + if (var9 >= 50) { // L: 1119 + field2477[var4] = modelViewportXs[var6]; // L: 1120 + field2489[var4] = modelViewportYs[var6]; // L: 1121 + field2479[var4++] = this.faceColors2[var1]; // L: 1122 } else { - var11 = field2418[var6]; // L: 1180 - var12 = field2467[var6]; // L: 1181 - var13 = this.faceColors2[var1]; // L: 1182 - if (var8 >= 50) { // L: 1183 - var14 = field2479[var8 - var9] * (50 - var9); // L: 1184 - field2474[var4] = var2 + Rasterizer3D.Rasterizer3D_zoom * (var11 + ((field2418[var5] - var11) * var14 >> 16)) / 50; // L: 1185 - field2457[var4] = var3 + Rasterizer3D.Rasterizer3D_zoom * (var12 + ((field2467[var5] - var12) * var14 >> 16)) / 50; // L: 1186 - field2469[var4++] = var13 + ((this.faceColors1[var1] - var13) * var14 >> 16); // L: 1187 + var11 = field2445[var6]; // L: 1125 + var12 = field2467[var6]; // L: 1126 + var13 = this.faceColors2[var1]; // L: 1127 + if (var8 >= 50) { // L: 1128 + var14 = field2425[var8 - var9] * (50 - var9); // L: 1129 + field2477[var4] = var2 + Rasterizer3D.Rasterizer3D_zoom * (var11 + ((field2445[var5] - var11) * var14 >> 16)) / 50; // L: 1130 + field2489[var4] = var3 + Rasterizer3D.Rasterizer3D_zoom * (var12 + ((field2467[var5] - var12) * var14 >> 16)) / 50; // L: 1131 + field2479[var4++] = var13 + ((this.faceColors1[var1] - var13) * var14 >> 16); // L: 1132 } - if (var10 >= 50) { // L: 1189 - var14 = field2479[var10 - var9] * (50 - var9); // L: 1190 - field2474[var4] = var2 + Rasterizer3D.Rasterizer3D_zoom * (var11 + ((field2418[var7] - var11) * var14 >> 16)) / 50; // L: 1191 - field2457[var4] = var3 + Rasterizer3D.Rasterizer3D_zoom * (var12 + ((field2467[var7] - var12) * var14 >> 16)) / 50; // L: 1192 - field2469[var4++] = var13 + ((this.faceColors3[var1] - var13) * var14 >> 16); // L: 1193 + if (var10 >= 50) { // L: 1134 + var14 = field2425[var10 - var9] * (50 - var9); // L: 1135 + field2477[var4] = var2 + Rasterizer3D.Rasterizer3D_zoom * (var11 + ((field2445[var7] - var11) * var14 >> 16)) / 50; // L: 1136 + field2489[var4] = var3 + Rasterizer3D.Rasterizer3D_zoom * (var12 + ((field2467[var7] - var12) * var14 >> 16)) / 50; // L: 1137 + field2479[var4++] = var13 + ((this.faceColors3[var1] - var13) * var14 >> 16); // L: 1138 } } - if (var10 >= 50) { // L: 1196 - field2474[var4] = modelViewportXs[var7]; // L: 1197 - field2457[var4] = modelViewportYs[var7]; // L: 1198 - field2469[var4++] = this.faceColors3[var1]; // L: 1199 + if (var10 >= 50) { // L: 1141 + field2477[var4] = modelViewportXs[var7]; // L: 1142 + field2489[var4] = modelViewportYs[var7]; // L: 1143 + field2479[var4++] = this.faceColors3[var1]; // L: 1144 } else { - var11 = field2418[var7]; // L: 1202 - var12 = field2467[var7]; // L: 1203 - var13 = this.faceColors3[var1]; // L: 1204 - if (var9 >= 50) { // L: 1205 - var14 = field2479[var9 - var10] * (50 - var10); // L: 1206 - field2474[var4] = var2 + Rasterizer3D.Rasterizer3D_zoom * (var11 + ((field2418[var6] - var11) * var14 >> 16)) / 50; // L: 1207 - field2457[var4] = var3 + Rasterizer3D.Rasterizer3D_zoom * (var12 + ((field2467[var6] - var12) * var14 >> 16)) / 50; // L: 1208 - field2469[var4++] = var13 + ((this.faceColors2[var1] - var13) * var14 >> 16); // L: 1209 + var11 = field2445[var7]; // L: 1147 + var12 = field2467[var7]; // L: 1148 + var13 = this.faceColors3[var1]; // L: 1149 + if (var9 >= 50) { // L: 1150 + var14 = field2425[var9 - var10] * (50 - var10); // L: 1151 + field2477[var4] = var2 + Rasterizer3D.Rasterizer3D_zoom * (var11 + ((field2445[var6] - var11) * var14 >> 16)) / 50; // L: 1152 + field2489[var4] = var3 + Rasterizer3D.Rasterizer3D_zoom * (var12 + ((field2467[var6] - var12) * var14 >> 16)) / 50; // L: 1153 + field2479[var4++] = var13 + ((this.faceColors2[var1] - var13) * var14 >> 16); // L: 1154 } - if (var8 >= 50) { // L: 1211 - var14 = field2479[var8 - var10] * (50 - var10); // L: 1212 - field2474[var4] = var2 + Rasterizer3D.Rasterizer3D_zoom * (var11 + ((field2418[var5] - var11) * var14 >> 16)) / 50; // L: 1213 - field2457[var4] = var3 + Rasterizer3D.Rasterizer3D_zoom * (var12 + ((field2467[var5] - var12) * var14 >> 16)) / 50; // L: 1214 - field2469[var4++] = var13 + ((this.faceColors1[var1] - var13) * var14 >> 16); // L: 1215 + if (var8 >= 50) { // L: 1156 + var14 = field2425[var8 - var10] * (50 - var10); // L: 1157 + field2477[var4] = var2 + Rasterizer3D.Rasterizer3D_zoom * (var11 + ((field2445[var5] - var11) * var14 >> 16)) / 50; // L: 1158 + field2489[var4] = var3 + Rasterizer3D.Rasterizer3D_zoom * (var12 + ((field2467[var5] - var12) * var14 >> 16)) / 50; // L: 1159 + field2479[var4++] = var13 + ((this.faceColors1[var1] - var13) * var14 >> 16); // L: 1160 } } - var11 = field2474[0]; // L: 1218 - var12 = field2474[1]; // L: 1219 - var13 = field2474[2]; // L: 1220 - var14 = field2457[0]; // L: 1221 - int var15 = field2457[1]; // L: 1222 - int var16 = field2457[2]; // L: 1223 - Rasterizer3D.field2260 = false; // L: 1224 + var11 = field2477[0]; // L: 1163 + var12 = field2477[1]; // L: 1164 + var13 = field2477[2]; // L: 1165 + var14 = field2489[0]; // L: 1166 + int var15 = field2489[1]; // L: 1167 + int var16 = field2489[2]; // L: 1168 + Rasterizer3D.field2262 = false; // L: 1169 int var17; int var18; int var19; int var20; - if (var4 == 3) { // L: 1225 - if (var11 < 0 || var12 < 0 || var13 < 0 || var11 > Rasterizer3D.Rasterizer3D_clipWidth || var12 > Rasterizer3D.Rasterizer3D_clipWidth || var13 > Rasterizer3D.Rasterizer3D_clipWidth) { // L: 1226 - Rasterizer3D.field2260 = true; + if (var4 == 3) { // L: 1170 + if (var11 < 0 || var12 < 0 || var13 < 0 || var11 > Rasterizer3D.Rasterizer3D_clipWidth || var12 > Rasterizer3D.Rasterizer3D_clipWidth || var13 > Rasterizer3D.Rasterizer3D_clipWidth) { // L: 1171 + Rasterizer3D.field2262 = true; } - if (this.faceTextures != null && this.faceTextures[var1] != -1) { // L: 1227 - if (this.field2429 != null && this.field2429[var1] != -1) { // L: 1235 - var20 = this.field2429[var1] & 255; // L: 1236 - var17 = this.field2433[var20]; // L: 1237 - var18 = this.field2434[var20]; // L: 1238 - var19 = this.field2436[var20]; // L: 1239 + if (this.faceTextures != null && this.faceTextures[var1] != -1) { // L: 1172 + if (this.field2439 != null && this.field2439[var1] != -1) { // L: 1180 + var20 = this.field2439[var1] & 255; // L: 1181 + var17 = this.field2443[var20]; // L: 1182 + var18 = this.field2444[var20]; // L: 1183 + var19 = this.field2468[var20]; // L: 1184 } else { - var17 = var5; // L: 1242 - var18 = var6; // L: 1243 - var19 = var7; // L: 1244 + var17 = var5; // L: 1187 + var18 = var6; // L: 1188 + var19 = var7; // L: 1189 } - if (this.faceColors3[var1] == -1) { // L: 1246 - Rasterizer3D.method3843(var14, var15, var16, var11, var12, var13, this.faceColors1[var1], this.faceColors1[var1], this.faceColors1[var1], field2418[var17], field2418[var18], field2418[var19], field2467[var17], field2467[var18], field2467[var19], field2471[var17], field2471[var18], field2471[var19], this.faceTextures[var1]); + if (this.faceColors3[var1] == -1) { // L: 1191 + Rasterizer3D.method3877(var14, var15, var16, var11, var12, var13, this.faceColors1[var1], this.faceColors1[var1], this.faceColors1[var1], field2445[var17], field2445[var18], field2445[var19], field2467[var17], field2467[var18], field2467[var19], field2422[var17], field2422[var18], field2422[var19], this.faceTextures[var1]); } else { - Rasterizer3D.method3843(var14, var15, var16, var11, var12, var13, field2469[0], field2469[1], field2469[2], field2418[var17], field2418[var18], field2418[var19], field2467[var17], field2467[var18], field2467[var19], field2471[var17], field2471[var18], field2471[var19], this.faceTextures[var1]); // L: 1247 + Rasterizer3D.method3877(var14, var15, var16, var11, var12, var13, field2479[0], field2479[1], field2479[2], field2445[var17], field2445[var18], field2445[var19], field2467[var17], field2467[var18], field2467[var19], field2422[var17], field2422[var18], field2422[var19], this.faceTextures[var1]); // L: 1192 } - } else if (this.faceColors3[var1] == -1) { // L: 1228 - Rasterizer3D.method3826(var14, var15, var16, var11, var12, var13, field2478[this.faceColors1[var1]]); + } else if (this.faceColors3[var1] == -1) { // L: 1173 + Rasterizer3D.method3919(var14, var15, var16, var11, var12, var13, field2488[this.faceColors1[var1]]); } else { - Rasterizer3D.method3824(var14, var15, var16, var11, var12, var13, field2469[0], field2469[1], field2469[2]); // L: 1229 + Rasterizer3D.method3854(var14, var15, var16, var11, var12, var13, field2479[0], field2479[1], field2479[2]); // L: 1174 } } - if (var4 == 4) { // L: 1250 - if (var11 < 0 || var12 < 0 || var13 < 0 || var11 > Rasterizer3D.Rasterizer3D_clipWidth || var12 > Rasterizer3D.Rasterizer3D_clipWidth || var13 > Rasterizer3D.Rasterizer3D_clipWidth || field2474[3] < 0 || field2474[3] > Rasterizer3D.Rasterizer3D_clipWidth) { // L: 1251 - Rasterizer3D.field2260 = true; + if (var4 == 4) { // L: 1195 + if (var11 < 0 || var12 < 0 || var13 < 0 || var11 > Rasterizer3D.Rasterizer3D_clipWidth || var12 > Rasterizer3D.Rasterizer3D_clipWidth || var13 > Rasterizer3D.Rasterizer3D_clipWidth || field2477[3] < 0 || field2477[3] > Rasterizer3D.Rasterizer3D_clipWidth) { // L: 1196 + Rasterizer3D.field2262 = true; } - if (this.faceTextures != null && this.faceTextures[var1] != -1) { // L: 1252 - if (this.field2429 != null && this.field2429[var1] != -1) { // L: 1267 - var20 = this.field2429[var1] & 255; // L: 1268 - var17 = this.field2433[var20]; // L: 1269 - var18 = this.field2434[var20]; // L: 1270 - var19 = this.field2436[var20]; // L: 1271 + if (this.faceTextures != null && this.faceTextures[var1] != -1) { // L: 1197 + if (this.field2439 != null && this.field2439[var1] != -1) { // L: 1212 + var20 = this.field2439[var1] & 255; // L: 1213 + var17 = this.field2443[var20]; // L: 1214 + var18 = this.field2444[var20]; // L: 1215 + var19 = this.field2468[var20]; // L: 1216 } else { - var17 = var5; // L: 1274 - var18 = var6; // L: 1275 - var19 = var7; // L: 1276 + var17 = var5; // L: 1219 + var18 = var6; // L: 1220 + var19 = var7; // L: 1221 } - short var21 = this.faceTextures[var1]; // L: 1278 - if (this.faceColors3[var1] == -1) { // L: 1279 - Rasterizer3D.method3843(var14, var15, var16, var11, var12, var13, this.faceColors1[var1], this.faceColors1[var1], this.faceColors1[var1], field2418[var17], field2418[var18], field2418[var19], field2467[var17], field2467[var18], field2467[var19], field2471[var17], field2471[var18], field2471[var19], var21); // L: 1280 - Rasterizer3D.method3843(var14, var16, field2457[3], var11, var13, field2474[3], this.faceColors1[var1], this.faceColors1[var1], this.faceColors1[var1], field2418[var17], field2418[var18], field2418[var19], field2467[var17], field2467[var18], field2467[var19], field2471[var17], field2471[var18], field2471[var19], var21); // L: 1281 + short var21 = this.faceTextures[var1]; // L: 1223 + if (this.faceColors3[var1] == -1) { // L: 1224 + Rasterizer3D.method3877(var14, var15, var16, var11, var12, var13, this.faceColors1[var1], this.faceColors1[var1], this.faceColors1[var1], field2445[var17], field2445[var18], field2445[var19], field2467[var17], field2467[var18], field2467[var19], field2422[var17], field2422[var18], field2422[var19], var21); // L: 1225 + Rasterizer3D.method3877(var14, var16, field2489[3], var11, var13, field2477[3], this.faceColors1[var1], this.faceColors1[var1], this.faceColors1[var1], field2445[var17], field2445[var18], field2445[var19], field2467[var17], field2467[var18], field2467[var19], field2422[var17], field2422[var18], field2422[var19], var21); // L: 1226 } else { - Rasterizer3D.method3843(var14, var15, var16, var11, var12, var13, field2469[0], field2469[1], field2469[2], field2418[var17], field2418[var18], field2418[var19], field2467[var17], field2467[var18], field2467[var19], field2471[var17], field2471[var18], field2471[var19], var21); // L: 1284 - Rasterizer3D.method3843(var14, var16, field2457[3], var11, var13, field2474[3], field2469[0], field2469[2], field2469[3], field2418[var17], field2418[var18], field2418[var19], field2467[var17], field2467[var18], field2467[var19], field2471[var17], field2471[var18], field2471[var19], var21); // L: 1285 + Rasterizer3D.method3877(var14, var15, var16, var11, var12, var13, field2479[0], field2479[1], field2479[2], field2445[var17], field2445[var18], field2445[var19], field2467[var17], field2467[var18], field2467[var19], field2422[var17], field2422[var18], field2422[var19], var21); // L: 1229 + Rasterizer3D.method3877(var14, var16, field2489[3], var11, var13, field2477[3], field2479[0], field2479[2], field2479[3], field2445[var17], field2445[var18], field2445[var19], field2467[var17], field2467[var18], field2467[var19], field2422[var17], field2422[var18], field2422[var19], var21); // L: 1230 } - } else if (this.faceColors3[var1] == -1) { // L: 1253 - var17 = field2478[this.faceColors1[var1]]; // L: 1254 - Rasterizer3D.method3826(var14, var15, var16, var11, var12, var13, var17); // L: 1255 - Rasterizer3D.method3826(var14, var16, field2457[3], var11, var13, field2474[3], var17); // L: 1256 + } else if (this.faceColors3[var1] == -1) { // L: 1198 + var17 = field2488[this.faceColors1[var1]]; // L: 1199 + Rasterizer3D.method3919(var14, var15, var16, var11, var12, var13, var17); // L: 1200 + Rasterizer3D.method3919(var14, var16, field2489[3], var11, var13, field2477[3], var17); // L: 1201 } else { - Rasterizer3D.method3824(var14, var15, var16, var11, var12, var13, field2469[0], field2469[1], field2469[2]); // L: 1259 - Rasterizer3D.method3824(var14, var16, field2457[3], var11, var13, field2474[3], field2469[0], field2469[2], field2469[3]); // L: 1260 + Rasterizer3D.method3854(var14, var15, var16, var11, var12, var13, field2479[0], field2479[1], field2479[2]); // L: 1204 + Rasterizer3D.method3854(var14, var16, field2489[3], var11, var13, field2477[3], field2479[0], field2479[2], field2479[3]); // L: 1205 } } - } // L: 1289 + } // L: 1234 - @ObfuscatedName("ci") + @ObfuscatedName("ct") @Export("draw") void draw(int var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8, long var9) { - field2425[0] = -1; // L: 723 + field2466[0] = -1; // L: 723 if (this.boundsType != 1) { // L: 724 this.calculateBoundsCylinder(); } @@ -1624,174 +1595,146 @@ public class Model extends Renderable { var25 = true; } - boolean var26 = var25 || this.field2432 > 0; // L: 747 - int var27 = ViewportMouse.ViewportMouse_x; // L: 750 - int var29 = ViewportMouse.ViewportMouse_y; // L: 755 - boolean var31 = class245.method4648(); // L: 758 - boolean var32 = 0L != var9 && !WorldMapEvent.method3714(var9); // L: 761 - boolean var34 = false; // L: 764 + boolean var26 = var25 || this.field2442 > 0; // L: 747 + int var27 = class125.method2504(); // L: 748 + int var28 = Players.method2311(); // L: 749 + boolean var29 = ViewportMouse.ViewportMouse_isInViewport; // L: 752 + boolean var32 = var9 != 0L; // L: 757 + boolean var33; + if (var32) { // L: 758 + var33 = (int)(var9 >>> 16 & 1L) == 1; // L: 761 + var32 = !var33; // L: 763 + } + + var33 = false; // L: 768 int var38; int var39; int var40; int var41; - int var49; - int var53; - int var54; - int var55; - if (var32 && var31) { // L: 765 - boolean var35 = false; // L: 766 - if (field2473) { // L: 767 - boolean var36; - if (!class245.method4648()) { // L: 771 - var36 = false; // L: 772 + int var42; + int var47; + int var51; + int var52; + if (var32 && var29) { // L: 769 + boolean var34 = false; // L: 770 + if (field2483) { // L: 771 + boolean var37 = ViewportMouse.ViewportMouse_isInViewport; // L: 777 + boolean var35; + if (!var37) { // L: 779 + var35 = false; // L: 780 } else { - int var44; - int var45; - int var46; - if (!ViewportMouse.ViewportMouse_false0) { // L: 776 - var38 = Scene.Scene_cameraPitchSine; // L: 777 - var39 = Scene.Scene_cameraPitchCosine; // L: 778 - var40 = Scene.Scene_cameraYawSine; // L: 779 - var41 = Scene.Scene_cameraYawCosine; // L: 780 - byte var42 = 50; // L: 781 - short var43 = 3500; // L: 782 - var44 = (ViewportMouse.ViewportMouse_x - Rasterizer3D.Rasterizer3D_clipMidX) * var42 / Rasterizer3D.Rasterizer3D_zoom; // L: 783 - var45 = (ViewportMouse.ViewportMouse_y - Rasterizer3D.Rasterizer3D_clipMidY) * var42 / Rasterizer3D.Rasterizer3D_zoom; // L: 784 - var46 = (ViewportMouse.ViewportMouse_x - Rasterizer3D.Rasterizer3D_clipMidX) * var43 / Rasterizer3D.Rasterizer3D_zoom; // L: 785 - int var47 = (ViewportMouse.ViewportMouse_y - Rasterizer3D.Rasterizer3D_clipMidY) * var43 / Rasterizer3D.Rasterizer3D_zoom; // L: 786 - int var48 = Rasterizer3D.method3837(var45, var42, var39, var38); // L: 788 - var54 = Rasterizer3D.method3842(var45, var42, var39, var38); // L: 789 - var45 = var48; // L: 790 - var48 = Rasterizer3D.method3837(var47, var43, var39, var38); // L: 791 - var55 = Rasterizer3D.method3842(var47, var43, var39, var38); // L: 792 - var47 = var48; // L: 793 - var48 = Rasterizer3D.method3835(var44, var54, var41, var40); // L: 794 - var54 = Rasterizer3D.method3890(var44, var54, var41, var40); // L: 795 - var44 = var48; // L: 796 - var48 = Rasterizer3D.method3835(var46, var55, var41, var40); // L: 797 - var55 = Rasterizer3D.method3890(var46, var55, var41, var40); // L: 798 - ViewportMouse.field2486 = (var44 + var48) / 2; // L: 800 - VerticalAlignment.field1680 = (var45 + var47) / 2; // L: 801 - VarbitComposition.field1710 = (var54 + var55) / 2; // L: 802 - class253.field3134 = (var48 - var44) / 2; // L: 803 - ViewportMouse.field2482 = (var47 - var45) / 2; // L: 804 - ViewportMouse.field2488 = (var55 - var54) / 2; // L: 805 - class225.field2686 = Math.abs(class253.field3134); // L: 806 - class170.field2023 = Math.abs(ViewportMouse.field2482); // L: 807 - WorldMapEvent.field2141 = Math.abs(ViewportMouse.field2488); // L: 808 - } - - var38 = this.xMid + var6; // L: 810 - var39 = var7 + this.yMid; // L: 811 - var40 = var8 + this.zMid; // L: 812 - var41 = this.xMidOffset; // L: 813 - var54 = this.yMidOffset; // L: 814 - var55 = this.zMidOffset; // L: 815 - var44 = ViewportMouse.field2486 - var38; // L: 816 - var45 = VerticalAlignment.field1680 - var39; // L: 817 - var46 = VarbitComposition.field1710 - var40; // L: 818 - if (Math.abs(var44) > var41 + class225.field2686) { // L: 819 - var36 = false; // L: 820 - } else if (Math.abs(var45) > var54 + class170.field2023) { // L: 823 - var36 = false; // L: 824 - } else if (Math.abs(var46) > var55 + WorldMapEvent.field2141) { // L: 827 - var36 = false; // L: 828 - } else if (Math.abs(var46 * ViewportMouse.field2482 - var45 * ViewportMouse.field2488) > var54 * WorldMapEvent.field2141 + var55 * class170.field2023) { // L: 831 - var36 = false; // L: 832 - } else if (Math.abs(var44 * ViewportMouse.field2488 - var46 * class253.field3134) > var55 * class225.field2686 + var41 * WorldMapEvent.field2141) { // L: 835 - var36 = false; // L: 836 - } else if (Math.abs(var45 * class253.field3134 - var44 * ViewportMouse.field2482) > var54 * class225.field2686 + var41 * class170.field2023) { // L: 839 - var36 = false; // L: 840 + FileSystem.method2545(); // L: 783 + var38 = this.xMid + var6; // L: 784 + var39 = var7 + this.yMid; // L: 785 + var40 = var8 + this.zMid; // L: 786 + var41 = this.xMidOffset; // L: 787 + var42 = this.yMidOffset; // L: 788 + int var43 = this.zMidOffset; // L: 789 + int var44 = ViewportMouse.field2492 - var38; // L: 790 + int var45 = class249.field3118 - var39; // L: 791 + int var46 = ViewportMouse.field2497 - var40; // L: 792 + if (Math.abs(var44) > var41 + class161.field1920) { // L: 793 + var35 = false; // L: 794 + } else if (Math.abs(var45) > var42 + class15.field140) { // L: 797 + var35 = false; // L: 798 + } else if (Math.abs(var46) > var43 + ApproximateRouteStrategy.field629) { // L: 801 + var35 = false; // L: 802 + } else if (Math.abs(var46 * WorldMapDecoration.field2082 - var45 * DirectByteArrayCopier.field3126) > var43 * class15.field140 + var42 * ApproximateRouteStrategy.field629) { // L: 805 + var35 = false; // L: 806 + } else if (Math.abs(var44 * DirectByteArrayCopier.field3126 - var46 * ViewportMouse.field2496) > var43 * class161.field1920 + var41 * ApproximateRouteStrategy.field629) { // L: 809 + var35 = false; // L: 810 + } else if (Math.abs(var45 * ViewportMouse.field2496 - var44 * WorldMapDecoration.field2082) > var41 * class15.field140 + var42 * class161.field1920) { // L: 813 + var35 = false; // L: 814 } else { - var36 = true; // L: 843 + var35 = true; // L: 817 } } - var35 = var36; // L: 845 + var34 = var35; // L: 819 } else { - var53 = var12 - var13; // L: 848 - if (var53 <= 50) { // L: 849 - var53 = 50; + var52 = var12 - var13; // L: 822 + if (var52 <= 50) { // L: 823 + var52 = 50; } - if (var15 > 0) { // L: 850 - var16 /= var14; // L: 851 - var17 /= var53; // L: 852 + if (var15 > 0) { // L: 824 + var16 /= var14; // L: 825 + var17 /= var52; // L: 826 } else { - var17 /= var14; // L: 855 - var16 /= var53; // L: 856 + var17 /= var14; // L: 829 + var16 /= var52; // L: 830 } - if (var18 > 0) { // L: 858 - var22 /= var14; // L: 859 - var20 /= var53; // L: 860 + if (var18 > 0) { // L: 832 + var22 /= var14; // L: 833 + var20 /= var52; // L: 834 } else { - var20 /= var14; // L: 863 - var22 /= var53; // L: 864 + var20 /= var14; // L: 837 + var22 /= var52; // L: 838 } - var49 = var27 - Rasterizer3D.Rasterizer3D_clipMidX; // L: 866 - var38 = var29 - Rasterizer3D.Rasterizer3D_clipMidY; // L: 867 - if (var49 > var16 && var49 < var17 && var38 > var22 && var38 < var20) { // L: 868 - var35 = true; // L: 869 + var47 = var27 - Rasterizer3D.Rasterizer3D_clipMidX; // L: 840 + var51 = var28 - Rasterizer3D.Rasterizer3D_clipMidY; // L: 841 + if (var47 > var16 && var47 < var17 && var51 > var22 && var51 < var20) { // L: 842 + var34 = true; // L: 843 } } - if (var35) { // L: 872 - if (this.isSingleTile) { // L: 873 - class159.method3135(var9); + if (var34) { // L: 846 + if (this.isSingleTile) { // L: 847 + Actor.method2191(var9); } else { - var34 = true; // L: 874 + var33 = true; // L: 848 } } } - int var52 = Rasterizer3D.Rasterizer3D_clipMidX; // L: 877 - var53 = Rasterizer3D.Rasterizer3D_clipMidY; // L: 878 - var49 = 0; // L: 879 - var38 = 0; // L: 880 - if (var1 != 0) { // L: 881 - var49 = Model_sine[var1]; // L: 882 - var38 = Model_cosine[var1]; // L: 883 + int var50 = Rasterizer3D.Rasterizer3D_clipMidX; // L: 851 + var52 = Rasterizer3D.Rasterizer3D_clipMidY; // L: 852 + var47 = 0; // L: 853 + var51 = 0; // L: 854 + if (var1 != 0) { // L: 855 + var47 = Model_sine[var1]; // L: 856 + var51 = Model_cosine[var1]; // L: 857 } - for (var39 = 0; var39 < this.verticesCount; ++var39) { // L: 885 - var40 = this.verticesX[var39]; // L: 886 - var41 = this.verticesY[var39]; // L: 887 - var54 = this.verticesZ[var39]; // L: 888 - if (var1 != 0) { // L: 889 - var55 = var54 * var49 + var40 * var38 >> 16; // L: 890 - var54 = var54 * var38 - var40 * var49 >> 16; // L: 891 - var40 = var55; // L: 892 + for (var38 = 0; var38 < this.verticesCount; ++var38) { // L: 859 + var39 = this.verticesX[var38]; // L: 860 + var40 = this.verticesY[var38]; // L: 861 + var41 = this.verticesZ[var38]; // L: 862 + if (var1 != 0) { // L: 863 + var42 = var41 * var47 + var39 * var51 >> 16; // L: 864 + var41 = var41 * var51 - var39 * var47 >> 16; // L: 865 + var39 = var42; // L: 866 } - var40 += var6; // L: 894 - var41 += var7; // L: 895 - var54 += var8; // L: 896 - var55 = var54 * var4 + var5 * var40 >> 16; // L: 897 - var54 = var5 * var54 - var40 * var4 >> 16; // L: 898 - var40 = var55; // L: 899 - var55 = var3 * var41 - var54 * var2 >> 16; // L: 900 - var54 = var41 * var2 + var3 * var54 >> 16; // L: 901 - field2460[var39] = var54 - var12; // L: 903 - if (var54 >= 50) { // L: 904 - modelViewportXs[var39] = var40 * Rasterizer3D.Rasterizer3D_zoom / var54 + var52; // L: 905 - modelViewportYs[var39] = var55 * Rasterizer3D.Rasterizer3D_zoom / var54 + var53; // L: 906 + var39 += var6; // L: 868 + var40 += var7; // L: 869 + var41 += var8; // L: 870 + var42 = var41 * var4 + var5 * var39 >> 16; // L: 871 + var41 = var5 * var41 - var39 * var4 >> 16; // L: 872 + var39 = var42; // L: 873 + var42 = var3 * var40 - var41 * var2 >> 16; // L: 874 + var41 = var40 * var2 + var3 * var41 >> 16; // L: 875 + field2465[var38] = var41 - var12; // L: 877 + if (var41 >= 50) { // L: 878 + modelViewportXs[var38] = var39 * Rasterizer3D.Rasterizer3D_zoom / var41 + var50; // L: 879 + modelViewportYs[var38] = var42 * Rasterizer3D.Rasterizer3D_zoom / var41 + var52; // L: 880 } else { - modelViewportXs[var39] = -5000; // L: 909 - var24 = true; // L: 910 + modelViewportXs[var38] = -5000; // L: 883 + var24 = true; // L: 884 } - if (var26) { // L: 912 - field2418[var39] = var40; // L: 913 - field2467[var39] = var55; // L: 914 - field2471[var39] = var54; // L: 915 + if (var26) { // L: 886 + field2445[var38] = var39; // L: 887 + field2467[var38] = var42; // L: 888 + field2422[var38] = var41; // L: 889 } } try { - this.draw0(var24, var34, this.isSingleTile, var9); // L: 919 - } catch (Exception var51) { // L: 921 + this.draw0(var24, var33, this.isSingleTile, var9); // L: 893 + } catch (Exception var49) { // L: 895 } } @@ -1799,5 +1742,5 @@ public class Model extends Renderable { } } } - } // L: 922 + } // L: 896 } diff --git a/runescape-client/src/main/java/ModelData.java b/runescape-client/src/main/java/ModelData.java index 5bc9f87de5..cff425b605 100644 --- a/runescape-client/src/main/java/ModelData.java +++ b/runescape-client/src/main/java/ModelData.java @@ -3,134 +3,134 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("gk") +@ObfuscatedName("gm") @Implements("ModelData") public class ModelData extends Renderable { + @ObfuscatedName("as") + static int[] field2196; + @ObfuscatedName("aj") + static int[] field2163; @ObfuscatedName("am") - static int[] field2187; - @ObfuscatedName("ax") - static int[] field2188; - @ObfuscatedName("ak") - static int field2189; - @ObfuscatedName("ay") + static int field2198; + @ObfuscatedName("az") @Export("ModelData_sine") static int[] ModelData_sine; - @ObfuscatedName("ai") + @ObfuscatedName("av") @Export("ModelData_cosine") static int[] ModelData_cosine; - @ObfuscatedName("h") + @ObfuscatedName("v") @Export("verticesCount") int verticesCount; - @ObfuscatedName("c") + @ObfuscatedName("n") @Export("verticesX") int[] verticesX; - @ObfuscatedName("o") + @ObfuscatedName("f") @Export("verticesY") int[] verticesY; - @ObfuscatedName("g") + @ObfuscatedName("y") @Export("verticesZ") int[] verticesZ; - @ObfuscatedName("l") + @ObfuscatedName("p") @Export("faceCount") int faceCount; - @ObfuscatedName("z") + @ObfuscatedName("j") @Export("indices1") int[] indices1; - @ObfuscatedName("t") + @ObfuscatedName("r") @Export("indices2") int[] indices2; - @ObfuscatedName("v") + @ObfuscatedName("b") @Export("indices3") int[] indices3; - @ObfuscatedName("b") + @ObfuscatedName("d") @Export("faceRenderTypes") byte[] faceRenderTypes; - @ObfuscatedName("q") + @ObfuscatedName("s") @Export("faceRenderPriorities") byte[] faceRenderPriorities; - @ObfuscatedName("i") + @ObfuscatedName("u") @Export("faceAlphas") byte[] faceAlphas; - @ObfuscatedName("x") + @ObfuscatedName("l") @Export("textureCoords") byte[] textureCoords; - @ObfuscatedName("k") + @ObfuscatedName("o") @Export("faceColors") short[] faceColors; - @ObfuscatedName("r") + @ObfuscatedName("c") @Export("faceTextures") short[] faceTextures; - @ObfuscatedName("p") + @ObfuscatedName("e") @Export("priority") byte priority; - @ObfuscatedName("a") + @ObfuscatedName("g") @Export("textureTriangleCount") int textureTriangleCount; - @ObfuscatedName("e") + @ObfuscatedName("a") @Export("textureRenderTypes") byte[] textureRenderTypes; - @ObfuscatedName("d") + @ObfuscatedName("k") @Export("texTriangleX") short[] texTriangleX; - @ObfuscatedName("u") + @ObfuscatedName("m") @Export("texTriangleY") short[] texTriangleY; - @ObfuscatedName("m") + @ObfuscatedName("x") @Export("texTriangleZ") short[] texTriangleZ; - @ObfuscatedName("j") + @ObfuscatedName("z") @Export("vertexSkins") int[] vertexSkins; - @ObfuscatedName("f") + @ObfuscatedName("w") @Export("faceSkins") int[] faceSkins; - @ObfuscatedName("s") + @ObfuscatedName("t") @Export("vertexLabels") int[][] vertexLabels; - @ObfuscatedName("y") + @ObfuscatedName("h") @Export("faceLabelsAlpha") int[][] faceLabelsAlpha; - @ObfuscatedName("w") + @ObfuscatedName("q") @ObfuscatedSignature( - descriptor = "[Lgt;" + descriptor = "[Lgk;" ) @Export("faceNormals") FaceNormal[] faceNormals; - @ObfuscatedName("n") + @ObfuscatedName("i") @ObfuscatedSignature( - descriptor = "[Lgq;" + descriptor = "[Lgc;" ) @Export("vertexNormals") VertexNormal[] vertexNormals; - @ObfuscatedName("ag") - @ObfuscatedSignature( - descriptor = "[Lgq;" - ) - VertexNormal[] field2175; @ObfuscatedName("ae") + @ObfuscatedSignature( + descriptor = "[Lgc;" + ) + VertexNormal[] field2166; + @ObfuscatedName("ap") @Export("ambient") public short ambient; - @ObfuscatedName("ao") + @ObfuscatedName("ab") @Export("contrast") public short contrast; - @ObfuscatedName("aj") + @ObfuscatedName("al") @Export("isBoundsCalculated") boolean isBoundsCalculated; - @ObfuscatedName("aw") - int field2178; - @ObfuscatedName("at") - int field2183; - @ObfuscatedName("av") - int field2184; - @ObfuscatedName("al") - int field2159; - @ObfuscatedName("ap") - int field2162; + @ObfuscatedName("ad") + int field2191; + @ObfuscatedName("ai") + int field2192; + @ObfuscatedName("ar") + int field2195; + @ObfuscatedName("ag") + int field2174; + @ObfuscatedName("ax") + int field2199; static { - field2187 = new int[10000]; // L: 44 - field2188 = new int[10000]; // L: 45 - field2189 = 0; // L: 46 + field2196 = new int[10000]; // L: 44 + field2163 = new int[10000]; // L: 45 + field2198 = 0; // L: 46 ModelData_sine = Rasterizer3D.Rasterizer3D_sine; // L: 47 ModelData_cosine = Rasterizer3D.Rasterizer3D_cosine; // L: 48 } @@ -143,7 +143,7 @@ public class ModelData extends Renderable { } // L: 50 @ObfuscatedSignature( - descriptor = "([Lgk;I)V" + descriptor = "([Lgm;I)V" ) public ModelData(ModelData[] var1, int var2) { this.verticesCount = 0; @@ -242,8 +242,8 @@ public class ModelData extends Renderable { } if (var4) { // L: 529 - if (var10.faceRenderPriorities != null) { - this.faceRenderPriorities[this.faceCount] = var10.faceRenderPriorities[var11]; // L: 530 + if (var10.faceRenderPriorities != null) { // L: 530 + this.faceRenderPriorities[this.faceCount] = var10.faceRenderPriorities[var11]; } else { this.faceRenderPriorities[this.faceCount] = var10.priority; // L: 531 } @@ -274,18 +274,18 @@ public class ModelData extends Renderable { } this.faceColors[this.faceCount] = var10.faceColors[var11]; // L: 547 - this.indices1[this.faceCount] = this.method3794(var10, var10.indices1[var11]); // L: 548 - this.indices2[this.faceCount] = this.method3794(var10, var10.indices2[var11]); // L: 549 - this.indices3[this.faceCount] = this.method3794(var10, var10.indices3[var11]); // L: 550 + this.indices1[this.faceCount] = this.method3759(var10, var10.indices1[var11]); // L: 548 + this.indices2[this.faceCount] = this.method3759(var10, var10.indices2[var11]); // L: 549 + this.indices3[this.faceCount] = this.method3759(var10, var10.indices3[var11]); // L: 550 ++this.faceCount; // L: 551 } for (var11 = 0; var11 < var10.textureTriangleCount; ++var11) { // L: 553 byte var12 = this.textureRenderTypes[this.textureTriangleCount] = var10.textureRenderTypes[var11]; // L: 554 if (var12 == 0) { // L: 555 - this.texTriangleX[this.textureTriangleCount] = (short)this.method3794(var10, var10.texTriangleX[var11]); // L: 556 - this.texTriangleY[this.textureTriangleCount] = (short)this.method3794(var10, var10.texTriangleY[var11]); // L: 557 - this.texTriangleZ[this.textureTriangleCount] = (short)this.method3794(var10, var10.texTriangleZ[var11]); // L: 558 + this.texTriangleX[this.textureTriangleCount] = (short)this.method3759(var10, var10.texTriangleX[var11]); // L: 556 + this.texTriangleY[this.textureTriangleCount] = (short)this.method3759(var10, var10.texTriangleY[var11]); // L: 557 + this.texTriangleZ[this.textureTriangleCount] = (short)this.method3759(var10, var10.texTriangleZ[var11]); // L: 558 } ++this.textureTriangleCount; // L: 560 @@ -301,15 +301,15 @@ public class ModelData extends Renderable { this.priority = 0; this.isBoundsCalculated = false; if (var1[var1.length - 1] == -1 && var1[var1.length - 2] == -1) { // L: 59 - this.method3734(var1); + this.method3780(var1); } else { - this.method3722(var1); // L: 60 + this.method3758(var1); // L: 60 } } // L: 61 @ObfuscatedSignature( - descriptor = "(Lgk;ZZZZ)V", + descriptor = "(Lgm;ZZZZ)V", garbageValue = "1" ) public ModelData(ModelData var1, boolean var2, boolean var3, boolean var4, boolean var5) { @@ -375,13 +375,13 @@ public class ModelData extends Renderable { this.faceLabelsAlpha = var1.faceLabelsAlpha; // L: 640 this.vertexNormals = var1.vertexNormals; // L: 641 this.faceNormals = var1.faceNormals; // L: 642 - this.field2175 = var1.field2175; // L: 643 + this.field2166 = var1.field2166; // L: 643 this.ambient = var1.ambient; // L: 644 this.contrast = var1.contrast; // L: 645 } - @ObfuscatedName("o") - void method3734(byte[] var1) { + @ObfuscatedName("f") + void method3780(byte[] var1) { Buffer var2 = new Buffer(var1); // L: 64 Buffer var3 = new Buffer(var1); // L: 65 Buffer var4 = new Buffer(var1); // L: 66 @@ -686,8 +686,8 @@ public class ModelData extends Renderable { } // L: 273 - @ObfuscatedName("g") - void method3722(byte[] var1) { + @ObfuscatedName("y") + void method3758(byte[] var1) { boolean var2 = false; // L: 276 boolean var3 = false; // L: 277 Buffer var4 = new Buffer(var1); // L: 278 @@ -963,11 +963,11 @@ public class ModelData extends Renderable { } // L: 468 - @ObfuscatedName("l") + @ObfuscatedName("b") @ObfuscatedSignature( - descriptor = "(Lgk;I)I" + descriptor = "(Lgm;I)I" ) - final int method3794(ModelData var1, int var2) { + final int method3759(ModelData var1, int var2) { int var3 = -1; // L: 567 int var4 = var1.verticesX[var2]; // L: 568 int var5 = var1.verticesY[var2]; // L: 569 @@ -994,11 +994,11 @@ public class ModelData extends Renderable { return var3; // L: 584 } - @ObfuscatedName("z") + @ObfuscatedName("d") @ObfuscatedSignature( - descriptor = "()Lgk;" + descriptor = "()Lgm;" ) - public ModelData method3796() { + public ModelData method3760() { ModelData var1 = new ModelData(); // L: 650 if (this.faceRenderTypes != null) { // L: 651 var1.faceRenderTypes = new byte[this.faceCount]; // L: 652 @@ -1038,16 +1038,16 @@ public class ModelData extends Renderable { return var1; // L: 682 } - @ObfuscatedName("b") + @ObfuscatedName("s") @ObfuscatedSignature( - descriptor = "([[IIIIZI)Lgk;" + descriptor = "([[IIIIZI)Lgm;" ) - public ModelData method3723(int[][] var1, int var2, int var3, int var4, boolean var5, int var6) { + public ModelData method3761(int[][] var1, int var2, int var3, int var4, boolean var5, int var6) { this.calculateBounds(); // L: 686 - int var7 = var2 + this.field2183; // L: 687 - int var8 = var2 + this.field2184; // L: 688 - int var9 = var4 + this.field2162; // L: 689 - int var10 = var4 + this.field2159; // L: 690 + int var7 = var2 + this.field2192; // L: 687 + int var8 = var2 + this.field2195; // L: 688 + int var9 = var4 + this.field2199; // L: 689 + int var10 = var4 + this.field2174; // L: 690 if (var7 >= 0 && var8 + 128 >> 7 < var1.length && var9 >= 0 && var10 + 128 >> 7 < var1[0].length) { // L: 691 var7 >>= 7; // L: 692 var8 = var8 + 127 >> 7; // L: 693 @@ -1132,8 +1132,8 @@ public class ModelData extends Renderable { } } - @ObfuscatedName("q") - void method3771() { + @ObfuscatedName("u") + void method3809() { int[] var1; int var2; int var10002; @@ -1193,8 +1193,8 @@ public class ModelData extends Renderable { } // L: 804 - @ObfuscatedName("i") - public void method3725() { + @ObfuscatedName("l") + public void method3763() { for (int var1 = 0; var1 < this.verticesCount; ++var1) { // L: 807 int var2 = this.verticesX[var1]; // L: 808 this.verticesX[var1] = this.verticesZ[var1]; // L: 809 @@ -1204,8 +1204,8 @@ public class ModelData extends Renderable { this.invalidate(); // L: 812 } // L: 813 - @ObfuscatedName("x") - public void method3759() { + @ObfuscatedName("o") + public void method3829() { for (int var1 = 0; var1 < this.verticesCount; ++var1) { // L: 816 this.verticesX[var1] = -this.verticesX[var1]; // L: 817 this.verticesZ[var1] = -this.verticesZ[var1]; // L: 818 @@ -1214,8 +1214,8 @@ public class ModelData extends Renderable { this.invalidate(); // L: 820 } // L: 821 - @ObfuscatedName("k") - public void method3727() { + @ObfuscatedName("c") + public void method3765() { for (int var1 = 0; var1 < this.verticesCount; ++var1) { // L: 824 int var2 = this.verticesZ[var1]; // L: 825 this.verticesZ[var1] = this.verticesX[var1]; // L: 826 @@ -1225,8 +1225,8 @@ public class ModelData extends Renderable { this.invalidate(); // L: 829 } // L: 830 - @ObfuscatedName("r") - public void method3728(int var1) { + @ObfuscatedName("e") + public void method3776(int var1) { int var2 = ModelData_sine[var1]; // L: 833 int var3 = ModelData_cosine[var1]; // L: 834 @@ -1239,7 +1239,7 @@ public class ModelData extends Renderable { this.invalidate(); // L: 840 } // L: 841 - @ObfuscatedName("p") + @ObfuscatedName("g") @Export("changeOffset") public void changeOffset(int var1, int var2, int var3) { for (int var4 = 0; var4 < this.verticesCount; ++var4) { // L: 844 @@ -1265,7 +1265,7 @@ public class ModelData extends Renderable { } // L: 856 - @ObfuscatedName("e") + @ObfuscatedName("k") @Export("retexture") public void retexture(short var1, short var2) { if (this.faceTextures != null) { // L: 859 @@ -1278,8 +1278,8 @@ public class ModelData extends Renderable { } } // L: 863 - @ObfuscatedName("d") - public void method3732() { + @ObfuscatedName("m") + public void method3769() { int var1; for (var1 = 0; var1 < this.verticesCount; ++var1) { // L: 866 this.verticesZ[var1] = -this.verticesZ[var1]; @@ -1294,7 +1294,7 @@ public class ModelData extends Renderable { this.invalidate(); // L: 872 } // L: 873 - @ObfuscatedName("u") + @ObfuscatedName("x") @Export("resize") public void resize(int var1, int var2, int var3) { for (int var4 = 0; var4 < this.verticesCount; ++var4) { // L: 876 @@ -1306,7 +1306,7 @@ public class ModelData extends Renderable { this.invalidate(); // L: 881 } // L: 882 - @ObfuscatedName("m") + @ObfuscatedName("z") @Export("calculateVertexNormals") public void calculateVertexNormals() { if (this.vertexNormals == null) { // L: 885 @@ -1382,52 +1382,52 @@ public class ModelData extends Renderable { } } // L: 940 - @ObfuscatedName("j") + @ObfuscatedName("w") @Export("invalidate") void invalidate() { this.vertexNormals = null; // L: 943 - this.field2175 = null; // L: 944 + this.field2166 = null; // L: 944 this.faceNormals = null; // L: 945 this.isBoundsCalculated = false; // L: 946 } // L: 947 - @ObfuscatedName("f") + @ObfuscatedName("t") @Export("calculateBounds") void calculateBounds() { if (!this.isBoundsCalculated) { // L: 950 super.height = 0; // L: 951 - this.field2178 = 0; // L: 952 - this.field2183 = 999999; // L: 953 - this.field2184 = -999999; // L: 954 - this.field2159 = -99999; // L: 955 - this.field2162 = 99999; // L: 956 + this.field2191 = 0; // L: 952 + this.field2192 = 999999; // L: 953 + this.field2195 = -999999; // L: 954 + this.field2174 = -99999; // L: 955 + this.field2199 = 99999; // L: 956 for (int var1 = 0; var1 < this.verticesCount; ++var1) { // L: 957 int var2 = this.verticesX[var1]; // L: 958 int var3 = this.verticesY[var1]; // L: 959 int var4 = this.verticesZ[var1]; // L: 960 - if (var2 < this.field2183) { // L: 961 - this.field2183 = var2; + if (var2 < this.field2192) { // L: 961 + this.field2192 = var2; } - if (var2 > this.field2184) { // L: 962 - this.field2184 = var2; + if (var2 > this.field2195) { // L: 962 + this.field2195 = var2; } - if (var4 < this.field2162) { // L: 963 - this.field2162 = var4; + if (var4 < this.field2199) { // L: 963 + this.field2199 = var4; } - if (var4 > this.field2159) { // L: 964 - this.field2159 = var4; + if (var4 > this.field2174) { // L: 964 + this.field2174 = var4; } if (-var3 > super.height) { // L: 965 super.height = -var3; } - if (var3 > this.field2178) { // L: 966 - this.field2178 = var3; + if (var3 > this.field2191) { // L: 966 + this.field2191 = var3; } } @@ -1435,9 +1435,9 @@ public class ModelData extends Renderable { } } // L: 969 - @ObfuscatedName("y") + @ObfuscatedName("q") @ObfuscatedSignature( - descriptor = "(IIIII)Lgj;" + descriptor = "(IIIII)Lgr;" ) @Export("toModel") public final Model toModel(int var1, int var2, int var3, int var4, int var5) { @@ -1458,38 +1458,38 @@ public class ModelData extends Renderable { } } - var8.field2432 = 0; // L: 1040 + var8.field2442 = 0; // L: 1040 for (var10 = 0; var10 < this.textureTriangleCount; ++var10) { // L: 1041 if (var9[var10] > 0 && this.textureRenderTypes[var10] == 0) { // L: 1042 - ++var8.field2432; + ++var8.field2442; } } - var8.field2433 = new int[var8.field2432]; // L: 1044 - var8.field2434 = new int[var8.field2432]; // L: 1045 - var8.field2436 = new int[var8.field2432]; // L: 1046 + var8.field2443 = new int[var8.field2442]; // L: 1044 + var8.field2444 = new int[var8.field2442]; // L: 1045 + var8.field2468 = new int[var8.field2442]; // L: 1046 var10 = 0; // L: 1047 int var11; for (var11 = 0; var11 < this.textureTriangleCount; ++var11) { // L: 1048 if (var9[var11] > 0 && this.textureRenderTypes[var11] == 0) { // L: 1049 - var8.field2433[var10] = this.texTriangleX[var11] & '\uffff'; // L: 1050 - var8.field2434[var10] = this.texTriangleY[var11] & '\uffff'; // L: 1051 - var8.field2436[var10] = this.texTriangleZ[var11] & '\uffff'; // L: 1052 + var8.field2443[var10] = this.texTriangleX[var11] & '\uffff'; // L: 1050 + var8.field2444[var10] = this.texTriangleY[var11] & '\uffff'; // L: 1051 + var8.field2468[var10] = this.texTriangleZ[var11] & '\uffff'; // L: 1052 var9[var11] = var10++; // L: 1053 } else { var9[var11] = -1; // L: 1055 } } - var8.field2429 = new byte[this.faceCount]; // L: 1057 + var8.field2439 = new byte[this.faceCount]; // L: 1057 for (var11 = 0; var11 < this.faceCount; ++var11) { // L: 1058 if (this.textureCoords[var11] != -1) { // L: 1059 - var8.field2429[var11] = (byte)var9[this.textureCoords[var11] & 255]; + var8.field2439[var11] = (byte)var9[this.textureCoords[var11] & 255]; } else { - var8.field2429[var11] = -1; // L: 1060 + var8.field2439[var11] = -1; // L: 1060 } } } @@ -1532,7 +1532,7 @@ public class ModelData extends Renderable { if (var17 == 1) { // L: 1093 var19 = this.faceNormals[var16]; // L: 1094 var14 = (var4 * var19.y + var5 * var19.z + var3 * var19.x) / (var7 / 2 + var7) + var1; // L: 1095 - var8.faceColors1[var16] = method3738(this.faceColors[var16] & '\uffff', var14); // L: 1096 + var8.faceColors1[var16] = method3764(this.faceColors[var16] & '\uffff', var14); // L: 1096 var8.faceColors3[var16] = -1; // L: 1097 } else if (var17 == 3) { // L: 1099 var8.faceColors1[var16] = 128; // L: 1100 @@ -1542,69 +1542,69 @@ public class ModelData extends Renderable { } } else { int var15 = this.faceColors[var16] & '\uffff'; // L: 1079 - if (this.field2175 != null && this.field2175[this.indices1[var16]] != null) { // L: 1080 - var13 = this.field2175[this.indices1[var16]]; + if (this.field2166 != null && this.field2166[this.indices1[var16]] != null) { // L: 1080 + var13 = this.field2166[this.indices1[var16]]; } else { var13 = this.vertexNormals[this.indices1[var16]]; // L: 1081 } var14 = (var4 * var13.y + var5 * var13.z + var3 * var13.x) / (var7 * var13.magnitude) + var1; // L: 1082 - var8.faceColors1[var16] = method3738(var15, var14); // L: 1083 - if (this.field2175 != null && this.field2175[this.indices2[var16]] != null) { // L: 1084 - var13 = this.field2175[this.indices2[var16]]; + var8.faceColors1[var16] = method3764(var15, var14); // L: 1083 + if (this.field2166 != null && this.field2166[this.indices2[var16]] != null) { // L: 1084 + var13 = this.field2166[this.indices2[var16]]; } else { var13 = this.vertexNormals[this.indices2[var16]]; // L: 1085 } var14 = (var4 * var13.y + var5 * var13.z + var3 * var13.x) / (var7 * var13.magnitude) + var1; // L: 1086 - var8.faceColors2[var16] = method3738(var15, var14); // L: 1087 - if (this.field2175 != null && this.field2175[this.indices3[var16]] != null) { // L: 1088 - var13 = this.field2175[this.indices3[var16]]; + var8.faceColors2[var16] = method3764(var15, var14); // L: 1087 + if (this.field2166 != null && this.field2166[this.indices3[var16]] != null) { // L: 1088 + var13 = this.field2166[this.indices3[var16]]; } else { var13 = this.vertexNormals[this.indices3[var16]]; // L: 1089 } var14 = (var4 * var13.y + var5 * var13.z + var3 * var13.x) / (var7 * var13.magnitude) + var1; // L: 1090 - var8.faceColors3[var16] = method3738(var15, var14); // L: 1091 + var8.faceColors3[var16] = method3764(var15, var14); // L: 1091 } } else if (var17 != 0) { // L: 1108 if (var17 == 1) { // L: 1124 var19 = this.faceNormals[var16]; // L: 1125 var14 = (var4 * var19.y + var5 * var19.z + var3 * var19.x) / (var7 / 2 + var7) + var1; // L: 1126 - var8.faceColors1[var16] = method3739(var14); // L: 1127 + var8.faceColors1[var16] = method3777(var14); // L: 1127 var8.faceColors3[var16] = -1; // L: 1128 } else { var8.faceColors3[var16] = -2; // L: 1131 } } else { - if (this.field2175 != null && this.field2175[this.indices1[var16]] != null) { // L: 1111 - var13 = this.field2175[this.indices1[var16]]; + if (this.field2166 != null && this.field2166[this.indices1[var16]] != null) { // L: 1111 + var13 = this.field2166[this.indices1[var16]]; } else { var13 = this.vertexNormals[this.indices1[var16]]; // L: 1112 } var14 = (var4 * var13.y + var5 * var13.z + var3 * var13.x) / (var7 * var13.magnitude) + var1; // L: 1113 - var8.faceColors1[var16] = method3739(var14); // L: 1114 - if (this.field2175 != null && this.field2175[this.indices2[var16]] != null) { // L: 1115 - var13 = this.field2175[this.indices2[var16]]; + var8.faceColors1[var16] = method3777(var14); // L: 1114 + if (this.field2166 != null && this.field2166[this.indices2[var16]] != null) { // L: 1115 + var13 = this.field2166[this.indices2[var16]]; } else { var13 = this.vertexNormals[this.indices2[var16]]; // L: 1116 } var14 = (var4 * var13.y + var5 * var13.z + var3 * var13.x) / (var7 * var13.magnitude) + var1; // L: 1117 - var8.faceColors2[var16] = method3739(var14); // L: 1118 - if (this.field2175 != null && this.field2175[this.indices3[var16]] != null) { // L: 1119 - var13 = this.field2175[this.indices3[var16]]; + var8.faceColors2[var16] = method3777(var14); // L: 1118 + if (this.field2166 != null && this.field2166[this.indices3[var16]] != null) { // L: 1119 + var13 = this.field2166[this.indices3[var16]]; } else { var13 = this.vertexNormals[this.indices3[var16]]; // L: 1120 } var14 = (var4 * var13.y + var5 * var13.z + var3 * var13.x) / (var7 * var13.magnitude) + var1; // L: 1121 - var8.faceColors3[var16] = method3739(var14); // L: 1122 + var8.faceColors3[var16] = method3777(var14); // L: 1122 } } - this.method3771(); // L: 1135 + this.method3809(); // L: 1135 var8.verticesCount = this.verticesCount; // L: 1136 var8.verticesX = this.verticesX; // L: 1137 var8.verticesY = this.verticesY; // L: 1138 @@ -1615,16 +1615,16 @@ public class ModelData extends Renderable { var8.indices3 = this.indices3; // L: 1143 var8.faceRenderPriorities = this.faceRenderPriorities; // L: 1144 var8.faceAlphas = this.faceAlphas; // L: 1145 - var8.field2431 = this.priority; // L: 1146 + var8.field2441 = this.priority; // L: 1146 var8.vertexLabels = this.vertexLabels; // L: 1147 var8.faceLabelsAlpha = this.faceLabelsAlpha; // L: 1148 var8.faceTextures = this.faceTextures; // L: 1149 return var8; // L: 1150 } - @ObfuscatedName("h") + @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "(Ljp;II)Lgk;" + descriptor = "(Ljv;II)Lgm;" ) @Export("ModelData_get") public static ModelData ModelData_get(AbstractArchive var0, int var1, int var2) { @@ -1632,16 +1632,16 @@ public class ModelData extends Renderable { return var3 == null ? null : new ModelData(var3); // L: 54 } - @ObfuscatedName("s") + @ObfuscatedName("h") @ObfuscatedSignature( - descriptor = "(Lgk;Lgk;IIIZ)V" + descriptor = "(Lgm;Lgm;IIIZ)V" ) - static void method3736(ModelData var0, ModelData var1, int var2, int var3, int var4, boolean var5) { + static void method3774(ModelData var0, ModelData var1, int var2, int var3, int var4, boolean var5) { var0.calculateBounds(); // L: 972 var0.calculateVertexNormals(); // L: 973 var1.calculateBounds(); // L: 974 var1.calculateVertexNormals(); // L: 975 - ++field2189; // L: 976 + ++field2198; // L: 976 int var6 = 0; // L: 977 int[] var7 = var1.verticesX; // L: 978 int var8 = var1.verticesCount; // L: 979 @@ -1651,30 +1651,30 @@ public class ModelData extends Renderable { VertexNormal var10 = var0.vertexNormals[var9]; // L: 981 if (var10.magnitude != 0) { // L: 982 int var11 = var0.verticesY[var9] - var3; // L: 983 - if (var11 <= var1.field2178) { // L: 984 + if (var11 <= var1.field2191) { // L: 984 int var12 = var0.verticesX[var9] - var2; // L: 985 - if (var12 >= var1.field2183 && var12 <= var1.field2184) { // L: 986 + if (var12 >= var1.field2192 && var12 <= var1.field2195) { // L: 986 int var13 = var0.verticesZ[var9] - var4; // L: 987 - if (var13 >= var1.field2162 && var13 <= var1.field2159) { // L: 988 + if (var13 >= var1.field2199 && var13 <= var1.field2174) { // L: 988 for (int var14 = 0; var14 < var8; ++var14) { // L: 989 VertexNormal var15 = var1.vertexNormals[var14]; // L: 990 if (var12 == var7[var14] && var13 == var1.verticesZ[var14] && var11 == var1.verticesY[var14] && var15.magnitude != 0) { // L: 991 - if (var0.field2175 == null) { // L: 992 - var0.field2175 = new VertexNormal[var0.verticesCount]; + if (var0.field2166 == null) { // L: 992 + var0.field2166 = new VertexNormal[var0.verticesCount]; } - if (var1.field2175 == null) { // L: 993 - var1.field2175 = new VertexNormal[var8]; + if (var1.field2166 == null) { // L: 993 + var1.field2166 = new VertexNormal[var8]; } - VertexNormal var16 = var0.field2175[var9]; // L: 994 + VertexNormal var16 = var0.field2166[var9]; // L: 994 if (var16 == null) { // L: 995 - var16 = var0.field2175[var9] = new VertexNormal(var10); + var16 = var0.field2166[var9] = new VertexNormal(var10); } - VertexNormal var17 = var1.field2175[var14]; // L: 996 + VertexNormal var17 = var1.field2166[var14]; // L: 996 if (var17 == null) { - var17 = var1.field2175[var14] = new VertexNormal(var15); // L: 997 + var17 = var1.field2166[var14] = new VertexNormal(var15); // L: 997 } var16.x += var15.x; // L: 998 @@ -1686,8 +1686,8 @@ public class ModelData extends Renderable { var17.z += var10.z; // L: 1004 var17.magnitude += var10.magnitude; // L: 1005 ++var6; // L: 1006 - field2187[var9] = field2189; // L: 1007 - field2188[var14] = field2189; // L: 1008 + field2196[var9] = field2198; // L: 1007 + field2163[var14] = field2198; // L: 1008 } } } @@ -1698,7 +1698,7 @@ public class ModelData extends Renderable { if (var6 >= 3 && var5) { // L: 1012 for (var9 = 0; var9 < var0.faceCount; ++var9) { // L: 1013 - if (field2187[var0.indices1[var9]] == field2189 && field2187[var0.indices2[var9]] == field2189 && field2187[var0.indices3[var9]] == field2189) { // L: 1014 + if (field2196[var0.indices1[var9]] == field2198 && field2196[var0.indices2[var9]] == field2198 && field2196[var0.indices3[var9]] == field2198) { // L: 1014 if (var0.faceRenderTypes == null) { // L: 1015 var0.faceRenderTypes = new byte[var0.faceCount]; } @@ -1708,7 +1708,7 @@ public class ModelData extends Renderable { } for (var9 = 0; var9 < var1.faceCount; ++var9) { // L: 1019 - if (field2189 == field2188[var1.indices1[var9]] && field2189 == field2188[var1.indices2[var9]] && field2189 == field2188[var1.indices3[var9]]) { // L: 1020 + if (field2198 == field2163[var1.indices1[var9]] && field2198 == field2163[var1.indices2[var9]] && field2198 == field2163[var1.indices3[var9]]) { // L: 1020 if (var1.faceRenderTypes == null) { // L: 1021 var1.faceRenderTypes = new byte[var1.faceCount]; } @@ -1720,8 +1720,8 @@ public class ModelData extends Renderable { } } // L: 1025 - @ObfuscatedName("w") - static final int method3738(int var0, int var1) { + @ObfuscatedName("i") + static final int method3764(int var0, int var1) { var1 = (var0 & 127) * var1 >> 7; // L: 1154 if (var1 < 2) { // L: 1155 var1 = 2; @@ -1732,8 +1732,8 @@ public class ModelData extends Renderable { return (var0 & 65408) + var1; // L: 1157 } - @ObfuscatedName("n") - static final int method3739(int var0) { + @ObfuscatedName("ae") + static final int method3777(int var0) { if (var0 < 2) { // L: 1161 var0 = 2; } else if (var0 > 126) { diff --git a/runescape-client/src/main/java/ModelData0.java b/runescape-client/src/main/java/ModelData0.java index 174db0f51e..668eaba718 100644 --- a/runescape-client/src/main/java/ModelData0.java +++ b/runescape-client/src/main/java/ModelData0.java @@ -1,16 +1,184 @@ +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("hd") +@ObfuscatedName("hy") @Implements("ModelData0") public class ModelData0 { - @ObfuscatedName("m") + @ObfuscatedName("f") @ObfuscatedGetter( - intValue = 293794089 + intValue = -254849601 ) - static int field2510; + @Export("KitDefinition_fileCount") + public static int KitDefinition_fileCount; + @ObfuscatedName("j") + @ObfuscatedSignature( + descriptor = "Ljv;" + ) + @Export("musicTrackArchive") + public static AbstractArchive musicTrackArchive; + @ObfuscatedName("iq") + @ObfuscatedGetter( + intValue = -145310383 + ) + @Export("oculusOrbFocalPointY") + static int oculusOrbFocalPointY; ModelData0() { } // L: 4 + + @ObfuscatedName("y") + @ObfuscatedSignature( + descriptor = "(Lnd;IB)Ljava/lang/String;", + garbageValue = "25" + ) + static String method4261(Buffer var0, int var1) { + try { + int var2 = var0.readUShortSmart(); // L: 31 + if (var2 > var1) { // L: 32 + var2 = var1; + } + + byte[] var3 = new byte[var2]; // L: 33 + var0.offset += class249.huffman.decompress(var0.array, var0.offset, var3, 0, var2); // L: 34 + String var4 = class43.decodeStringCp1252(var3, 0, var2); // L: 35 + return var4; // L: 36 + } catch (Exception var6) { // L: 38 + return "Cabbage"; // L: 39 + } + } + + @ObfuscatedName("u") + @ObfuscatedSignature( + descriptor = "(IIIIIZI)Loh;", + garbageValue = "768816682" + ) + @Export("getItemSprite") + public static final SpritePixels getItemSprite(int var0, int var1, int var2, int var3, int var4, boolean var5) { + if (var1 == -1) { // L: 345 + var4 = 0; + } else if (var4 == 2 && var1 != 1) { // L: 346 + var4 = 1; + } + + long var6 = ((long)var3 << 42) + ((long)var4 << 40) + (long)var0 + ((long)var1 << 16) + ((long)var2 << 38); // L: 347 + SpritePixels var8; + if (!var5) { // L: 349 + var8 = (SpritePixels)ItemComposition.ItemDefinition_cachedSprites.get(var6); // L: 350 + if (var8 != null) { // L: 351 + return var8; + } + } + + ItemComposition var9 = class260.ItemDefinition_get(var0); // L: 353 + if (var1 > 1 && var9.countobj != null) { // L: 354 + int var10 = -1; // L: 355 + + for (int var11 = 0; var11 < 10; ++var11) { // L: 356 + if (var1 >= var9.countco[var11] && var9.countco[var11] != 0) { // L: 357 + var10 = var9.countobj[var11]; + } + } + + if (var10 != -1) { // L: 359 + var9 = class260.ItemDefinition_get(var10); + } + } + + Model var21 = var9.getModel(1); // L: 361 + if (var21 == null) { // L: 362 + return null; + } else { + SpritePixels var22 = null; // L: 363 + if (var9.noteTemplate != -1) { // L: 364 + var22 = getItemSprite(var9.note, 10, 1, 0, 0, true); // L: 365 + if (var22 == null) { // L: 366 + return null; + } + } else if (var9.notedId != -1) { // L: 368 + var22 = getItemSprite(var9.unnotedId, var1, var2, var3, 0, false); // L: 369 + if (var22 == null) { // L: 370 + return null; + } + } else if (var9.placeholderTemplate != -1) { // L: 372 + var22 = getItemSprite(var9.placeholder, var1, 0, 0, 0, false); // L: 373 + if (var22 == null) { // L: 374 + return null; + } + } + + int[] var12 = Rasterizer2D.Rasterizer2D_pixels; // L: 376 + int var13 = Rasterizer2D.Rasterizer2D_width; // L: 377 + int var14 = Rasterizer2D.Rasterizer2D_height; // L: 378 + int[] var15 = new int[4]; // L: 379 + Rasterizer2D.Rasterizer2D_getClipArray(var15); // L: 380 + var8 = new SpritePixels(36, 32); // L: 381 + Rasterizer2D.Rasterizer2D_replace(var8.pixels, 36, 32); // L: 382 + Rasterizer2D.Rasterizer2D_clear(); // L: 383 + Rasterizer3D.Rasterizer3D_setClipFromRasterizer2D(); // L: 384 + Rasterizer3D.method3848(16, 16); // L: 385 + Rasterizer3D.field2282 = false; // L: 386 + if (var9.placeholderTemplate != -1) { // L: 387 + var22.drawTransBgAt(0, 0); + } + + int var16 = var9.zoom2d; // L: 388 + if (var5) { // L: 389 + var16 = (int)((double)var16 * 1.5D); + } else if (var2 == 2) { // L: 390 + var16 = (int)((double)var16 * 1.04D); + } + + int var17 = var16 * Rasterizer3D.Rasterizer3D_sine[var9.xan2d] >> 16; // L: 391 + int var18 = var16 * Rasterizer3D.Rasterizer3D_cosine[var9.xan2d] >> 16; // L: 392 + var21.calculateBoundsCylinder(); // L: 393 + var21.method4217(0, var9.yan2d, var9.zan2d, var9.xan2d, var9.offsetX2d, var21.height / 2 + var17 + var9.offsetY2d, var18 + var9.offsetY2d); // L: 394 + if (var9.notedId != -1) { // L: 395 + var22.drawTransBgAt(0, 0); + } + + if (var2 >= 1) { // L: 396 + var8.outline(1); + } + + if (var2 >= 2) { // L: 397 + var8.outline(16777215); + } + + if (var3 != 0) { // L: 398 + var8.shadow(var3); + } + + Rasterizer2D.Rasterizer2D_replace(var8.pixels, 36, 32); // L: 399 + if (var9.noteTemplate != -1) { // L: 400 + var22.drawTransBgAt(0, 0); + } + + if (var4 == 1 || var4 == 2 && var9.isStackable == 1) { // L: 401 + Font var19 = class288.ItemDefinition_fontPlain11; // L: 402 + String var20; + if (var1 < 100000) { // L: 405 + var20 = "" + var1 + ""; // L: 406 + } else if (var1 < 10000000) { // L: 409 + var20 = "" + var1 / 1000 + "K" + ""; // L: 410 + } else { + var20 = "" + var1 / 1000000 + "M" + ""; // L: 413 + } + + var19.draw(var20, 0, 9, 16776960, 1); // L: 415 + } + + if (!var5) { // L: 417 + ItemComposition.ItemDefinition_cachedSprites.put(var8, var6); + } + + Rasterizer2D.Rasterizer2D_replace(var12, var13, var14); // L: 418 + Rasterizer2D.Rasterizer2D_setClipArray(var15); // L: 419 + Rasterizer3D.Rasterizer3D_setClipFromRasterizer2D(); // L: 420 + Rasterizer3D.field2282 = true; // L: 421 + return var8; // L: 422 + } + } } diff --git a/runescape-client/src/main/java/MouseHandler.java b/runescape-client/src/main/java/MouseHandler.java index 993d1500ea..fd891e9660 100644 --- a/runescape-client/src/main/java/MouseHandler.java +++ b/runescape-client/src/main/java/MouseHandler.java @@ -9,123 +9,123 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ab") +@ObfuscatedName("ak") @Implements("MouseHandler") public class MouseHandler implements MouseListener, MouseMotionListener, FocusListener { - @ObfuscatedName("g") - @ObfuscatedSignature( - descriptor = "Lab;" - ) - @Export("MouseHandler_instance") - public static MouseHandler MouseHandler_instance; - @ObfuscatedName("l") + @ObfuscatedName("y") @ObfuscatedGetter( - intValue = 1203671229 - ) - @Export("MouseHandler_idleCycles") - public static volatile int MouseHandler_idleCycles; - @ObfuscatedName("z") - @ObfuscatedGetter( - intValue = -1070541047 - ) - @Export("MouseHandler_currentButtonVolatile") - public static volatile int MouseHandler_currentButtonVolatile; - @ObfuscatedName("t") - @ObfuscatedGetter( - intValue = 671107575 - ) - @Export("MouseHandler_xVolatile") - public static volatile int MouseHandler_xVolatile; - @ObfuscatedName("v") - @ObfuscatedGetter( - intValue = 1944795407 - ) - @Export("MouseHandler_yVolatile") - public static volatile int MouseHandler_yVolatile; - @ObfuscatedName("b") - @ObfuscatedGetter( - longValue = 6457713861817890273L - ) - @Export("MouseHandler_lastMovedVolatile") - public static volatile long MouseHandler_lastMovedVolatile; - @ObfuscatedName("q") - @ObfuscatedGetter( - intValue = -1502128885 - ) - @Export("MouseHandler_currentButton") - public static int MouseHandler_currentButton; - @ObfuscatedName("i") - @ObfuscatedGetter( - intValue = -661389681 - ) - @Export("MouseHandler_x") - public static int MouseHandler_x; - @ObfuscatedName("x") - @ObfuscatedGetter( - intValue = -563072281 - ) - @Export("MouseHandler_y") - public static int MouseHandler_y; - @ObfuscatedName("k") - @ObfuscatedGetter( - longValue = -7265018834219168001L + longValue = -7947308061041944289L ) @Export("MouseHandler_millis") public static long MouseHandler_millis; + @ObfuscatedName("p") + @ObfuscatedSignature( + descriptor = "Lak;" + ) + @Export("MouseHandler_instance") + public static MouseHandler MouseHandler_instance; + @ObfuscatedName("j") + @ObfuscatedGetter( + intValue = -1851121549 + ) + @Export("MouseHandler_idleCycles") + public static volatile int MouseHandler_idleCycles; @ObfuscatedName("r") @ObfuscatedGetter( - intValue = -662783221 + intValue = -574089045 ) - @Export("MouseHandler_lastButtonVolatile") - public static volatile int MouseHandler_lastButtonVolatile; - @ObfuscatedName("p") + @Export("MouseHandler_currentButtonVolatile") + static volatile int MouseHandler_currentButtonVolatile; + @ObfuscatedName("b") @ObfuscatedGetter( - intValue = -1121821905 + intValue = 1657948993 ) - @Export("MouseHandler_lastPressedXVolatile") - public static volatile int MouseHandler_lastPressedXVolatile; - @ObfuscatedName("a") - @ObfuscatedGetter( - intValue = 1456763281 - ) - @Export("MouseHandler_lastPressedYVolatile") - public static volatile int MouseHandler_lastPressedYVolatile; - @ObfuscatedName("e") - @ObfuscatedGetter( - longValue = 4471934586475877591L - ) - @Export("MouseHandler_lastPressedTimeMillisVolatile") - public static volatile long MouseHandler_lastPressedTimeMillisVolatile; + @Export("MouseHandler_xVolatile") + static volatile int MouseHandler_xVolatile; @ObfuscatedName("d") @ObfuscatedGetter( - intValue = 499374847 + intValue = 299061503 + ) + @Export("MouseHandler_yVolatile") + static volatile int MouseHandler_yVolatile; + @ObfuscatedName("s") + @ObfuscatedGetter( + longValue = 7392479486141447999L + ) + @Export("MouseHandler_lastMovedVolatile") + static volatile long MouseHandler_lastMovedVolatile; + @ObfuscatedName("u") + @ObfuscatedGetter( + intValue = 97210001 + ) + @Export("MouseHandler_currentButton") + public static int MouseHandler_currentButton; + @ObfuscatedName("l") + @ObfuscatedGetter( + intValue = -678881683 + ) + @Export("MouseHandler_x") + public static int MouseHandler_x; + @ObfuscatedName("o") + @ObfuscatedGetter( + intValue = 1903378733 + ) + @Export("MouseHandler_y") + public static int MouseHandler_y; + @ObfuscatedName("c") + @ObfuscatedGetter( + intValue = -1156070407 + ) + @Export("MouseHandler_lastButtonVolatile") + static volatile int MouseHandler_lastButtonVolatile; + @ObfuscatedName("e") + @ObfuscatedGetter( + intValue = -221251943 + ) + @Export("MouseHandler_lastPressedXVolatile") + static volatile int MouseHandler_lastPressedXVolatile; + @ObfuscatedName("g") + @ObfuscatedGetter( + intValue = -2106187795 + ) + @Export("MouseHandler_lastPressedYVolatile") + static volatile int MouseHandler_lastPressedYVolatile; + @ObfuscatedName("a") + @ObfuscatedGetter( + longValue = 3127797728599755635L + ) + @Export("MouseHandler_lastPressedTimeMillisVolatile") + static volatile long MouseHandler_lastPressedTimeMillisVolatile; + @ObfuscatedName("k") + @ObfuscatedGetter( + intValue = -265253353 ) @Export("MouseHandler_lastButton") public static int MouseHandler_lastButton; - @ObfuscatedName("u") + @ObfuscatedName("m") @ObfuscatedGetter( - intValue = 234052353 + intValue = 1003938789 ) @Export("MouseHandler_lastPressedX") public static int MouseHandler_lastPressedX; - @ObfuscatedName("m") + @ObfuscatedName("x") @ObfuscatedGetter( - intValue = 864945233 + intValue = 339791065 ) @Export("MouseHandler_lastPressedY") public static int MouseHandler_lastPressedY; - @ObfuscatedName("j") + @ObfuscatedName("z") @ObfuscatedGetter( - longValue = -2883108443216478533L + longValue = -6895120112634760665L ) @Export("MouseHandler_lastPressedTimeMillis") public static long MouseHandler_lastPressedTimeMillis; - @ObfuscatedName("hw") - @ObfuscatedSignature( - descriptor = "[Low;" + @ObfuscatedName("hr") + @ObfuscatedGetter( + intValue = 1681670171 ) - @Export("crossSprites") - static SpritePixels[] crossSprites; + @Export("cameraX") + static int cameraX; static { MouseHandler_instance = new MouseHandler(); // L: 15 @@ -151,120 +151,239 @@ public class MouseHandler implements MouseListener, MouseMotionListener, FocusLi MouseHandler() { } // L: 34 - @ObfuscatedName("g") + @ObfuscatedName("f") @ObfuscatedSignature( descriptor = "(Ljava/awt/event/MouseEvent;I)I", - garbageValue = "-606551724" + garbageValue = "1689031104" ) @Export("getButton") final int getButton(MouseEvent var1) { - int var2 = var1.getButton(); // L: 54 - if (!var1.isAltDown() && var2 != 2) { // L: 55 - return !var1.isMetaDown() && var2 != 3 ? 1 : 2; // L: 56 57 + int var2 = var1.getButton(); // L: 55 + if (!var1.isAltDown() && var2 != 2) { // L: 56 + return !var1.isMetaDown() && var2 != 3 ? 1 : 2; // L: 57 58 } else { return 4; } } public final synchronized void mouseMoved(MouseEvent var1) { - if (MouseHandler_instance != null) { // L: 102 - MouseHandler_idleCycles = 0; // L: 103 - MouseHandler_xVolatile = var1.getX(); // L: 104 - MouseHandler_yVolatile = var1.getY(); // L: 105 - MouseHandler_lastMovedVolatile = var1.getWhen(); // L: 106 + if (MouseHandler_instance != null) { // L: 103 + MouseHandler_idleCycles = 0; // L: 104 + MouseHandler_xVolatile = var1.getX(); // L: 105 + MouseHandler_yVolatile = var1.getY(); // L: 106 + MouseHandler_lastMovedVolatile = var1.getWhen(); // L: 107 } - } // L: 108 + } // L: 109 public final synchronized void mousePressed(MouseEvent var1) { - if (MouseHandler_instance != null) { // L: 61 - MouseHandler_idleCycles = 0; - MouseHandler_lastPressedXVolatile = var1.getX(); // L: 63 - MouseHandler_lastPressedYVolatile = var1.getY(); // L: 64 - MouseHandler_lastPressedTimeMillisVolatile = Archive.currentTimeMillis(); // L: 65 - MouseHandler_lastButtonVolatile = this.getButton(var1); // L: 66 - if (MouseHandler_lastButtonVolatile != 0) { // L: 67 + if (MouseHandler_instance != null) { // L: 62 + MouseHandler_idleCycles = 0; // L: 63 + MouseHandler_lastPressedXVolatile = var1.getX(); // L: 64 + MouseHandler_lastPressedYVolatile = var1.getY(); // L: 65 + MouseHandler_lastPressedTimeMillisVolatile = ObjectComposition.currentTimeMillis(); // L: 66 + MouseHandler_lastButtonVolatile = this.getButton(var1); // L: 67 + if (MouseHandler_lastButtonVolatile != 0) { // L: 68 MouseHandler_currentButtonVolatile = MouseHandler_lastButtonVolatile; } } - if (var1.isPopupTrigger()) { // L: 69 + if (var1.isPopupTrigger()) { // L: 70 var1.consume(); } - } // L: 70 + } // L: 71 - public final void mouseClicked(MouseEvent var1) { - if (var1.isPopupTrigger()) { // L: 81 + public final synchronized void mouseReleased(MouseEvent var1) { + if (MouseHandler_instance != null) { // L: 74 + MouseHandler_idleCycles = 0; // L: 75 + MouseHandler_currentButtonVolatile = 0; // L: 76 + } + + if (var1.isPopupTrigger()) { // L: 78 var1.consume(); } - } // L: 82 + } // L: 79 + + public final synchronized void mouseExited(MouseEvent var1) { + if (MouseHandler_instance != null) { // L: 90 + MouseHandler_idleCycles = 0; // L: 91 + MouseHandler_xVolatile = -1; // L: 92 + MouseHandler_yVolatile = -1; // L: 93 + MouseHandler_lastMovedVolatile = var1.getWhen(); // L: 94 + } + + } // L: 96 public final synchronized void mouseDragged(MouseEvent var1) { - this.mouseMoved(var1); // L: 98 - } // L: 99 + this.mouseMoved(var1); // L: 99 + } // L: 100 public final synchronized void mouseEntered(MouseEvent var1) { - this.mouseMoved(var1); // L: 85 - } // L: 86 + this.mouseMoved(var1); // L: 86 + } // L: 87 + + public final void focusGained(FocusEvent var1) { + } // L: 111 public final synchronized void focusLost(FocusEvent var1) { - if (MouseHandler_instance != null) { // L: 113 + if (MouseHandler_instance != null) { // L: 114 MouseHandler_currentButtonVolatile = 0; } - } // L: 114 + } // L: 115 - public final synchronized void mouseExited(MouseEvent var1) { - if (MouseHandler_instance != null) { // L: 89 - MouseHandler_idleCycles = 0; // L: 90 - MouseHandler_xVolatile = -1; // L: 91 - MouseHandler_yVolatile = -1; // L: 92 - MouseHandler_lastMovedVolatile = var1.getWhen(); // L: 93 - } - - } // L: 95 - - public final void focusGained(FocusEvent var1) { - } // L: 110 - - public final synchronized void mouseReleased(MouseEvent var1) { - if (MouseHandler_instance != null) { // L: 73 - MouseHandler_idleCycles = 0; // L: 74 - MouseHandler_currentButtonVolatile = 0; // L: 75 - } - - if (var1.isPopupTrigger()) { // L: 77 + public final void mouseClicked(MouseEvent var1) { + if (var1.isPopupTrigger()) { // L: 82 var1.consume(); } - } // L: 78 + } // L: 83 - @ObfuscatedName("o") - @ObfuscatedSignature( - descriptor = "(II)I", - garbageValue = "1680800354" - ) - public static int method688(int var0) { - long var2 = ViewportMouse.ViewportMouse_entityTags[var0]; // L: 58 - int var1 = (int)(var2 >>> 7 & 127L); // L: 60 - return var1; // L: 62 + @ObfuscatedName("v") + static double method620(double var0) { + return Math.exp(-var0 * var0 / 2.0D) / Math.sqrt(6.283185307179586D); // L: 9 } - @ObfuscatedName("gl") + @ObfuscatedName("d") @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "1494646828" + descriptor = "(Ljv;IS)Lop;", + garbageValue = "234" ) - static final void method686() { - for (int var0 = 0; var0 < Client.npcCount; ++var0) { // L: 4030 - int var1 = Client.npcIndices[var0]; // L: 4031 - NPC var2 = Client.npcs[var1]; // L: 4032 - if (var2 != null) { // L: 4033 - class35.updateActorSequence(var2, var2.definition.size); // L: 4034 + public static IndexedSprite method647(AbstractArchive var0, int var1) { + if (!Decimator.method1075(var0, var1)) { // L: 127 + return null; + } else { + IndexedSprite var3 = new IndexedSprite(); // L: 130 + var3.width = class396.SpriteBuffer_spriteWidth; // L: 131 + var3.height = UserComparator2.SpriteBuffer_spriteHeight; // L: 132 + var3.xOffset = WorldMapDecoration.SpriteBuffer_xOffsets[0]; // L: 133 + var3.yOffset = Calendar.SpriteBuffer_yOffsets[0]; // L: 134 + var3.subWidth = class396.SpriteBuffer_spriteWidths[0]; // L: 135 + var3.subHeight = class302.SpriteBuffer_spriteHeights[0]; // L: 136 + var3.palette = MilliClock.SpriteBuffer_spritePalette; // L: 137 + var3.pixels = class396.SpriteBuffer_pixels[0]; // L: 138 + MilliClock.method2587(); // L: 139 + return var3; // L: 142 + } + } + + @ObfuscatedName("fo") + @ObfuscatedSignature( + descriptor = "(II)V", + garbageValue = "-1345954057" + ) + @Export("getLoginError") + static void getLoginError(int var0) { + if (var0 == -3) { // L: 2542 + class260.setLoginResponseString("Connection timed out.", "Please try using a different world.", ""); + } else if (var0 == -2) { // L: 2543 + class260.setLoginResponseString("Error connecting to server.", "Please try using a different world.", ""); + } else if (var0 == -1) { // L: 2544 + class260.setLoginResponseString("No response from server.", "Please try using a different world.", ""); + } else if (var0 == 3) { // L: 2545 + Login.loginIndex = 3; // L: 2546 + Login.field1039 = 1; // L: 2547 + } else if (var0 == 4) { // L: 2549 + GameEngine.method572(0); // L: 2550 + } else if (var0 == 5) { // L: 2552 + Login.field1039 = 2; // L: 2553 + class260.setLoginResponseString("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."); // L: 2554 + } else if (var0 != 68 && (Client.onMobile || var0 != 6)) { // L: 2556 + if (var0 == 7) { // L: 2559 + class260.setLoginResponseString("This world is full.", "Please use a different world.", ""); + } else if (var0 == 8) { // L: 2560 + class260.setLoginResponseString("Unable to connect.", "Login server offline.", ""); + } else if (var0 == 9) { // L: 2561 + class260.setLoginResponseString("Login limit exceeded.", "Too many connections from your address.", ""); + } else if (var0 == 10) { // L: 2562 + class260.setLoginResponseString("Unable to connect.", "Bad session id.", ""); + } else if (var0 == 11) { // L: 2563 + class260.setLoginResponseString("We suspect someone knows your password.", "Press 'change your password' on front page.", ""); + } else if (var0 == 12) { // L: 2564 + class260.setLoginResponseString("You need a members account to login to this world.", "Please subscribe, or use a different world.", ""); + } else if (var0 == 13) { // L: 2565 + class260.setLoginResponseString("Could not complete login.", "Please try using a different world.", ""); + } else if (var0 == 14) { // L: 2566 + class260.setLoginResponseString("The server is being updated.", "Please wait 1 minute and try again.", ""); + } else if (var0 == 16) { // L: 2567 + class260.setLoginResponseString("Too many login attempts.", "Please wait a few minutes before trying again.", ""); + } else if (var0 == 17) { // L: 2568 + class260.setLoginResponseString("You are standing in a members-only area.", "To play on this world move to a free area first", ""); + } else if (var0 == 18) { // L: 2569 + GameEngine.method572(1); // L: 2570 + } else if (var0 == 19) { // L: 2572 + class260.setLoginResponseString("This world is running a closed Beta.", "Sorry invited players only.", "Please use a different world."); + } else if (var0 == 20) { // L: 2573 + class260.setLoginResponseString("Invalid loginserver requested.", "Please try using a different world.", ""); + } else if (var0 == 22) { // L: 2574 + class260.setLoginResponseString("Malformed login packet.", "Please try again.", ""); + } else if (var0 == 23) { // L: 2575 + class260.setLoginResponseString("No reply from loginserver.", "Please wait 1 minute and try again.", ""); + } else if (var0 == 24) { // L: 2576 + class260.setLoginResponseString("Error loading your profile.", "Please contact customer support.", ""); + } else if (var0 == 25) { // L: 2577 + class260.setLoginResponseString("Unexpected loginserver response.", "Please try using a different world.", ""); + } else if (var0 == 26) { + class260.setLoginResponseString("This computers address has been blocked", "as it was used to break our rules.", ""); // L: 2578 + } else if (var0 == 27) { // L: 2579 + class260.setLoginResponseString("", "Service unavailable.", ""); + } else if (var0 == 31) { // L: 2580 + class260.setLoginResponseString("Your account must have a displayname set", "in order to play the game. Please set it", "via the website, or the main game."); + } else if (var0 == 32) { // L: 2581 + class260.setLoginResponseString("Your attempt to log into your account was", "unsuccessful. Don't worry, you can sort", "this out by visiting the billing system."); + } else if (var0 == 37) { // L: 2582 + class260.setLoginResponseString("Your account is currently inaccessible.", "Please try again in a few minutes.", ""); + } else if (var0 == 38) { // L: 2583 + class260.setLoginResponseString("You need to vote to play!", "Visit runescape.com and vote,", "and then come back here!"); + } else if (var0 == 55) { // L: 2584 + Login.loginIndex = 8; // L: 2585 + } else { + if (var0 == 56) { // L: 2587 + class260.setLoginResponseString("Enter the 6-digit code generated by your", "authenticator app.", ""); // L: 2588 + class12.updateGameState(11); // L: 2589 + return; // L: 2590 + } + + if (var0 == 57) { // L: 2592 + class260.setLoginResponseString("The code you entered was incorrect.", "Please try again.", ""); // L: 2593 + class12.updateGameState(11); // L: 2594 + return; // L: 2595 + } + + if (var0 == 61) { // L: 2597 + Login.loginIndex = 7; // L: 2598 + } else { + class260.setLoginResponseString("Unexpected server response", "Please try using a different world.", ""); // L: 2600 + } } + } else { + class260.setLoginResponseString("RuneScape has been updated!", "Please reload this page.", ""); // L: 2557 } - } // L: 4037 + class12.updateGameState(10); // L: 2601 + } // L: 2602 + + @ObfuscatedName("ke") + @ObfuscatedSignature( + descriptor = "(B)V", + garbageValue = "86" + ) + @Export("Clan_leaveChat") + static final void Clan_leaveChat() { + PacketBufferNode var0 = class21.getPacketBufferNode(ClientPacket.field2574, Client.packetWriter.isaacCipher); // L: 11308 + var0.packetBuffer.writeByte(0); // L: 11309 + Client.packetWriter.addNode(var0); // L: 11310 + } // L: 11311 + + @ObfuscatedName("la") + @ObfuscatedSignature( + descriptor = "(I)V", + garbageValue = "-508707417" + ) + static void method634() { + Client.packetWriter.addNode(class21.getPacketBufferNode(ClientPacket.field2608, Client.packetWriter.isaacCipher)); // L: 11499 + Client.oculusOrbState = 0; // L: 11500 + } // L: 11501 } diff --git a/runescape-client/src/main/java/MouseRecorder.java b/runescape-client/src/main/java/MouseRecorder.java index c5010438d3..1ec1bc32f6 100644 --- a/runescape-client/src/main/java/MouseRecorder.java +++ b/runescape-client/src/main/java/MouseRecorder.java @@ -3,30 +3,35 @@ 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("cr") +@ObfuscatedName("cb") @Implements("MouseRecorder") public class MouseRecorder implements Runnable { - @ObfuscatedName("h") + @ObfuscatedName("ri") + @ObfuscatedSignature( + descriptor = "Lbd;" + ) + @Export("pcmPlayer1") + static PcmPlayer pcmPlayer1; + @ObfuscatedName("v") @Export("isRunning") boolean isRunning; - @ObfuscatedName("c") + @ObfuscatedName("n") @Export("lock") Object lock; - @ObfuscatedName("o") + @ObfuscatedName("f") @ObfuscatedGetter( - intValue = 1951116577 + intValue = -1046460859 ) @Export("index") int index; - @ObfuscatedName("g") + @ObfuscatedName("y") @Export("xs") int[] xs; - @ObfuscatedName("l") + @ObfuscatedName("p") @Export("ys") int[] ys; - @ObfuscatedName("z") + @ObfuscatedName("j") @Export("millis") long[] millis; @@ -37,10 +42,10 @@ public class MouseRecorder implements Runnable { this.xs = new int[500]; // L: 10 this.ys = new int[500]; // L: 11 this.millis = new long[500]; // L: 12 - } // L: 14 + } public void run() { - for (; this.isRunning; UrlRequest.sleepExact(50L)) { // L: 17 26 + while (this.isRunning) { // L: 17 synchronized(this.lock) { // L: 18 if (this.index < 500) { // L: 19 this.xs[this.index] = MouseHandler.MouseHandler_x; // L: 20 @@ -49,236 +54,90 @@ public class MouseRecorder implements Runnable { ++this.index; // L: 23 } } - } - } // L: 28 + long var4 = 49L; // L: 29 - @ObfuscatedName("c") - @ObfuscatedSignature( - descriptor = "(Ljp;Ljava/lang/String;Ljava/lang/String;IZB)V", - garbageValue = "-90" - ) - public static void method2124(AbstractArchive var0, String var1, String var2, int var3, boolean var4) { - int var5 = var0.getGroupId(var1); // L: 34 - int var6 = var0.getFileId(var5, var2); // L: 35 - World.method1684(var0, var5, var6, var3, var4); // L: 36 - } // L: 37 + try { + Thread.sleep(var4); // L: 32 + } catch (InterruptedException var7) { // L: 34 + } - @ObfuscatedName("l") - @ObfuscatedSignature( - descriptor = "(II)I", - garbageValue = "-975055690" - ) - public static int method2126(int var0) { - --var0; // L: 50 - var0 |= var0 >>> 1; // L: 51 - var0 |= var0 >>> 2; // L: 52 - var0 |= var0 >>> 4; // L: 53 - var0 |= var0 >>> 8; // L: 54 - var0 |= var0 >>> 16; // L: 55 - return var0 + 1; // L: 56 - } - - @ObfuscatedName("ai") - @ObfuscatedSignature( - descriptor = "(ILci;ZI)I", - garbageValue = "2105644144" - ) - static int method2125(int var0, Script var1, boolean var2) { - if (var0 == ScriptOpcodes.WORLDLIST_FETCH) { // L: 3591 - Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = PrivateChatMode.loadWorlds() ? 1 : 0; // L: 3592 - return 1; // L: 3593 - } else { - World var9; - if (var0 == ScriptOpcodes.WORLDLIST_START) { // L: 3595 - var9 = class21.worldListStart(); // L: 3596 - if (var9 != null) { // L: 3597 - Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = var9.id; // L: 3598 - Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = var9.properties; // L: 3599 - Interpreter.Interpreter_stringStack[++class13.Interpreter_stringStackSize - 1] = var9.activity; // L: 3600 - Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = var9.location; // L: 3601 - Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = var9.population; // L: 3602 - Interpreter.Interpreter_stringStack[++class13.Interpreter_stringStackSize - 1] = var9.host; // L: 3603 - } else { - Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = -1; // L: 3606 - Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = 0; // L: 3607 - Interpreter.Interpreter_stringStack[++class13.Interpreter_stringStackSize - 1] = ""; // L: 3608 - Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = 0; // L: 3609 - Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = 0; // L: 3610 - Interpreter.Interpreter_stringStack[++class13.Interpreter_stringStackSize - 1] = ""; // L: 3611 - } - - return 1; // L: 3613 - } else if (var0 == ScriptOpcodes.WORLDLIST_NEXT) { // L: 3615 - var9 = class13.getNextWorldListWorld(); // L: 3616 - if (var9 != null) { // L: 3617 - Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = var9.id; // L: 3618 - Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = var9.properties; // L: 3619 - Interpreter.Interpreter_stringStack[++class13.Interpreter_stringStackSize - 1] = var9.activity; // L: 3620 - Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = var9.location; // L: 3621 - Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = var9.population; // L: 3622 - Interpreter.Interpreter_stringStack[++class13.Interpreter_stringStackSize - 1] = var9.host; // L: 3623 - } else { - Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = -1; // L: 3626 - Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = 0; // L: 3627 - Interpreter.Interpreter_stringStack[++class13.Interpreter_stringStackSize - 1] = ""; // L: 3628 - Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = 0; // L: 3629 - Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = 0; // L: 3630 - Interpreter.Interpreter_stringStack[++class13.Interpreter_stringStackSize - 1] = ""; // L: 3631 - } - - return 1; // L: 3633 - } else { - int var3; - World var7; - int var8; - if (var0 == ScriptOpcodes.WORLDLIST_SPECIFIC) { // L: 3635 - var3 = Interpreter.Interpreter_intStack[--WorldMapCacheName.Interpreter_intStackSize]; // L: 3636 - var7 = null; // L: 3637 - - for (var8 = 0; var8 < World.World_count; ++var8) { // L: 3638 - if (var3 == Messages.World_worlds[var8].id) { // L: 3639 - var7 = Messages.World_worlds[var8]; // L: 3640 - break; - } - } - - if (var7 != null) { // L: 3644 - Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = var7.id; // L: 3645 - Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = var7.properties; // L: 3646 - Interpreter.Interpreter_stringStack[++class13.Interpreter_stringStackSize - 1] = var7.activity; // L: 3647 - Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = var7.location; // L: 3648 - Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = var7.population; // L: 3649 - Interpreter.Interpreter_stringStack[++class13.Interpreter_stringStackSize - 1] = var7.host; // L: 3650 - } else { - Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = -1; // L: 3653 - Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = 0; // L: 3654 - Interpreter.Interpreter_stringStack[++class13.Interpreter_stringStackSize - 1] = ""; // L: 3655 - Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = 0; // L: 3656 - Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = 0; // L: 3657 - Interpreter.Interpreter_stringStack[++class13.Interpreter_stringStackSize - 1] = ""; // L: 3658 - } - - return 1; // L: 3660 - } else if (var0 == ScriptOpcodes.WORLDLIST_SORT) { // L: 3662 - WorldMapCacheName.Interpreter_intStackSize -= 4; // L: 3663 - var3 = Interpreter.Interpreter_intStack[WorldMapCacheName.Interpreter_intStackSize]; // L: 3664 - boolean var10 = Interpreter.Interpreter_intStack[WorldMapCacheName.Interpreter_intStackSize + 1] == 1; // L: 3665 - var8 = Interpreter.Interpreter_intStack[WorldMapCacheName.Interpreter_intStackSize + 2]; // L: 3666 - boolean var6 = Interpreter.Interpreter_intStack[WorldMapCacheName.Interpreter_intStackSize + 3] == 1; // L: 3667 - GrandExchangeEvents.sortWorldList(var3, var10, var8, var6); // L: 3668 - return 1; // L: 3669 - } else if (var0 != ScriptOpcodes.GETWORLDINFO) { // L: 3671 - if (var0 == ScriptOpcodes.SETFOLLOWEROPSLOWPRIORITY) { // L: 3692 - Client.followerOpsLowPriority = Interpreter.Interpreter_intStack[--WorldMapCacheName.Interpreter_intStackSize] == 1; // L: 3693 - return 1; // L: 3694 - } else { - int var4; - ParamComposition var5; - if (var0 == ScriptOpcodes.NC_PARAM) { // L: 3696 - WorldMapCacheName.Interpreter_intStackSize -= 2; // L: 3697 - var3 = Interpreter.Interpreter_intStack[WorldMapCacheName.Interpreter_intStackSize]; // L: 3698 - var4 = Interpreter.Interpreter_intStack[WorldMapCacheName.Interpreter_intStackSize + 1]; // L: 3699 - var5 = WorldMapElement.getParamDefinition(var4); // L: 3700 - if (var5.isString()) { // L: 3701 - Interpreter.Interpreter_stringStack[++class13.Interpreter_stringStackSize - 1] = class8.getNpcDefinition(var3).getStringParam(var4, var5.defaultStr); // L: 3702 - } else { - Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = class8.getNpcDefinition(var3).getIntParam(var4, var5.defaultInt); // L: 3705 - } - - return 1; // L: 3707 - } else if (var0 == ScriptOpcodes.LC_PARAM) { // L: 3709 - WorldMapCacheName.Interpreter_intStackSize -= 2; // L: 3710 - var3 = Interpreter.Interpreter_intStack[WorldMapCacheName.Interpreter_intStackSize]; // L: 3711 - var4 = Interpreter.Interpreter_intStack[WorldMapCacheName.Interpreter_intStackSize + 1]; // L: 3712 - var5 = WorldMapElement.getParamDefinition(var4); // L: 3713 - if (var5.isString()) { // L: 3714 - Interpreter.Interpreter_stringStack[++class13.Interpreter_stringStackSize - 1] = AttackOption.getObjectDefinition(var3).getStringParam(var4, var5.defaultStr); // L: 3715 - } else { - Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = AttackOption.getObjectDefinition(var3).getIntParam(var4, var5.defaultInt); // L: 3718 - } - - return 1; // L: 3720 - } else if (var0 == ScriptOpcodes.OC_PARAM) { // L: 3722 - WorldMapCacheName.Interpreter_intStackSize -= 2; // L: 3723 - var3 = Interpreter.Interpreter_intStack[WorldMapCacheName.Interpreter_intStackSize]; // L: 3724 - var4 = Interpreter.Interpreter_intStack[WorldMapCacheName.Interpreter_intStackSize + 1]; // L: 3725 - var5 = WorldMapElement.getParamDefinition(var4); // L: 3726 - if (var5.isString()) { // L: 3727 - Interpreter.Interpreter_stringStack[++class13.Interpreter_stringStackSize - 1] = Strings.ItemDefinition_get(var3).getStringParam(var4, var5.defaultStr); // L: 3728 - } else { - Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = Strings.ItemDefinition_get(var3).getIntParam(var4, var5.defaultInt); // L: 3731 - } - - return 1; // L: 3733 - } else if (var0 == ScriptOpcodes.STRUCT_PARAM) { // L: 3735 - WorldMapCacheName.Interpreter_intStackSize -= 2; // L: 3736 - var3 = Interpreter.Interpreter_intStack[WorldMapCacheName.Interpreter_intStackSize]; // L: 3737 - var4 = Interpreter.Interpreter_intStack[WorldMapCacheName.Interpreter_intStackSize + 1]; // L: 3738 - var5 = WorldMapElement.getParamDefinition(var4); // L: 3739 - if (var5.isString()) { // L: 3740 - Interpreter.Interpreter_stringStack[++class13.Interpreter_stringStackSize - 1] = class229.StructDefinition_getStructDefinition(var3).getStringParam(var4, var5.defaultStr); // L: 3741 - } else { - Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = class229.StructDefinition_getStructDefinition(var3).getIntParam(var4, var5.defaultInt); // L: 3744 - } - - return 1; // L: 3746 - } else if (var0 == ScriptOpcodes.ON_MOBILE) { // L: 3748 - Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = Client.onMobile ? 1 : 0; // L: 3749 - return 1; // L: 3750 - } else if (var0 == ScriptOpcodes.CLIENTTYPE) { // L: 3752 - Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = Client.clientType & 3; // L: 3753 - return 1; // L: 3754 - } else if (var0 == 6520) { // L: 3756 - return 1; // L: 3757 - } else if (var0 == ScriptOpcodes.MOBILE_KEYBOARDHIDE) { // L: 3759 - return 1; // L: 3760 - } else if (var0 == 6522) { // L: 3762 - --class13.Interpreter_stringStackSize; // L: 3763 - --WorldMapCacheName.Interpreter_intStackSize; // L: 3764 - return 1; // L: 3765 - } else if (var0 == 6523) { // L: 3767 - --class13.Interpreter_stringStackSize; // L: 3768 - --WorldMapCacheName.Interpreter_intStackSize; // L: 3769 - return 1; // L: 3770 - } else if (var0 == ScriptOpcodes.BATTERYLEVEL) { // L: 3772 - Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = -1; // L: 3773 - return 1; // L: 3774 - } else if (var0 == ScriptOpcodes.BATTERYCHARGING) { // L: 3776 - Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = 1; // L: 3777 - return 1; // L: 3778 - } else if (var0 == ScriptOpcodes.WIFIAVAILABLE) { // L: 3780 - Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = 1; // L: 3781 - return 1; // L: 3782 - } else if (var0 == 6527) { // L: 3784 - Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = Client.field621; // L: 3785 - return 1; // L: 3786 - } else { - return 2; // L: 3788 - } - } - } else { - var3 = Interpreter.Interpreter_intStack[--WorldMapCacheName.Interpreter_intStackSize]; // L: 3672 - if (var3 >= 0 && var3 < World.World_count) { // L: 3673 - var7 = Messages.World_worlds[var3]; // L: 3674 - Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = var7.id; // L: 3675 - Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = var7.properties; // L: 3676 - Interpreter.Interpreter_stringStack[++class13.Interpreter_stringStackSize - 1] = var7.activity; // L: 3677 - Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = var7.location; // L: 3678 - Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = var7.population; // L: 3679 - Interpreter.Interpreter_stringStack[++class13.Interpreter_stringStackSize - 1] = var7.host; // L: 3680 - } else { - Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = -1; // L: 3683 - Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = 0; // L: 3684 - Interpreter.Interpreter_stringStack[++class13.Interpreter_stringStackSize - 1] = ""; // L: 3685 - Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = 0; // L: 3686 - Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = 0; // L: 3687 - Interpreter.Interpreter_stringStack[++class13.Interpreter_stringStackSize - 1] = ""; // L: 3688 - } - - return 1; // L: 3690 - } + try { + Thread.sleep(1L); // L: 38 + } catch (InterruptedException var6) { // L: 40 } } + + } // L: 51 + + @ObfuscatedName("y") + @ObfuscatedSignature( + descriptor = "(I)[Lem;", + garbageValue = "1845003548" + ) + static VerticalAlignment[] method2095() { + return new VerticalAlignment[]{VerticalAlignment.field1672, VerticalAlignment.VerticalAlignment_centered, VerticalAlignment.field1670}; // L: 14 } + + @ObfuscatedName("p") + @ObfuscatedSignature( + descriptor = "(IIII)V", + garbageValue = "-558099635" + ) + static final void method2099(int var0, int var1, int var2) { + int var3; + for (var3 = 0; var3 < 8; ++var3) { // L: 111 + for (int var4 = 0; var4 < 8; ++var4) { // L: 112 + Tiles.Tiles_heights[var0][var3 + var1][var4 + var2] = 0; + } + } + + if (var1 > 0) { // L: 114 + for (var3 = 1; var3 < 8; ++var3) { // L: 115 + Tiles.Tiles_heights[var0][var1][var3 + var2] = Tiles.Tiles_heights[var0][var1 - 1][var3 + var2]; + } + } + + if (var2 > 0) { // L: 117 + for (var3 = 1; var3 < 8; ++var3) { // L: 118 + Tiles.Tiles_heights[var0][var3 + var1][var2] = Tiles.Tiles_heights[var0][var3 + var1][var2 - 1]; + } + } + + if (var1 > 0 && Tiles.Tiles_heights[var0][var1 - 1][var2] != 0) { // L: 120 + Tiles.Tiles_heights[var0][var1][var2] = Tiles.Tiles_heights[var0][var1 - 1][var2]; + } else if (var2 > 0 && Tiles.Tiles_heights[var0][var1][var2 - 1] != 0) { // L: 121 + Tiles.Tiles_heights[var0][var1][var2] = Tiles.Tiles_heights[var0][var1][var2 - 1]; + } else if (var1 > 0 && var2 > 0 && Tiles.Tiles_heights[var0][var1 - 1][var2 - 1] != 0) { // L: 122 + Tiles.Tiles_heights[var0][var1][var2] = Tiles.Tiles_heights[var0][var1 - 1][var2 - 1]; + } + + } // L: 123 + + @ObfuscatedName("il") + @ObfuscatedSignature( + descriptor = "(II)Ljava/lang/String;", + garbageValue = "-195720663" + ) + static String method2098(int var0) { + if (var0 < 0) { // L: 8849 + return ""; + } else { + return Client.menuTargets[var0].length() > 0 ? Client.menuActions[var0] + " " + Client.menuTargets[var0] : Client.menuActions[var0]; // L: 8850 8851 + } + } + + @ObfuscatedName("kc") + @ObfuscatedSignature( + descriptor = "(I)V", + garbageValue = "642993573" + ) + @Export("FriendSystem_invalidateIgnoreds") + static final void FriendSystem_invalidateIgnoreds() { + DesktopPlatformInfoProvider.method6068(); // L: 11262 + if (WorldMapRegion.friendsChat != null) { // L: 11263 + WorldMapRegion.friendsChat.invalidateIgnoreds(); // L: 11264 + } + + } // L: 11266 } diff --git a/runescape-client/src/main/java/MouseWheel.java b/runescape-client/src/main/java/MouseWheel.java index 428b250663..7ec8a5c8f2 100644 --- a/runescape-client/src/main/java/MouseWheel.java +++ b/runescape-client/src/main/java/MouseWheel.java @@ -3,13 +3,13 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("db") +@ObfuscatedName("dw") @Implements("MouseWheel") public interface MouseWheel { - @ObfuscatedName("o") + @ObfuscatedName("f") @ObfuscatedSignature( descriptor = "(I)I", - garbageValue = "1914010660" + garbageValue = "-1490330016" ) @Export("useRotation") int useRotation(); diff --git a/runescape-client/src/main/java/MouseWheelHandler.java b/runescape-client/src/main/java/MouseWheelHandler.java index 15a5b1ee18..7faa442719 100644 --- a/runescape-client/src/main/java/MouseWheelHandler.java +++ b/runescape-client/src/main/java/MouseWheelHandler.java @@ -7,12 +7,12 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ak") +@ObfuscatedName("am") @Implements("MouseWheelHandler") public final class MouseWheelHandler implements MouseWheel, MouseWheelListener { - @ObfuscatedName("h") + @ObfuscatedName("v") @ObfuscatedGetter( - intValue = -1732160685 + intValue = 1696386671 ) @Export("rotation") int rotation; @@ -21,30 +21,30 @@ public final class MouseWheelHandler implements MouseWheel, MouseWheelListener { this.rotation = 0; // L: 8 } // L: 10 - @ObfuscatedName("h") + @ObfuscatedName("v") @ObfuscatedSignature( descriptor = "(Ljava/awt/Component;I)V", - garbageValue = "-12192689" + garbageValue = "-1721881715" ) @Export("addTo") void addTo(Component var1) { var1.addMouseWheelListener(this); // L: 13 } // L: 14 - @ObfuscatedName("c") + @ObfuscatedName("n") @ObfuscatedSignature( descriptor = "(Ljava/awt/Component;I)V", - garbageValue = "1128643930" + garbageValue = "1850795023" ) @Export("removeFrom") void removeFrom(Component var1) { var1.removeMouseWheelListener(this); // L: 17 } // L: 18 - @ObfuscatedName("o") + @ObfuscatedName("f") @ObfuscatedSignature( descriptor = "(I)I", - garbageValue = "1914010660" + garbageValue = "-1490330016" ) @Export("useRotation") public synchronized int useRotation() { diff --git a/runescape-client/src/main/java/MusicPatch.java b/runescape-client/src/main/java/MusicPatch.java index af12aeca98..2905c43a9b 100644 --- a/runescape-client/src/main/java/MusicPatch.java +++ b/runescape-client/src/main/java/MusicPatch.java @@ -4,327 +4,330 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ic") +@ObfuscatedName("in") @Implements("MusicPatch") public class MusicPatch extends Node { - @ObfuscatedName("h") + @ObfuscatedName("qo") + @Export("ClanChat_inClanChat") + static boolean ClanChat_inClanChat; + @ObfuscatedName("v") @ObfuscatedGetter( - intValue = 1390964845 + intValue = 222358093 ) - int field2883; - @ObfuscatedName("c") + int field2881; + @ObfuscatedName("n") @ObfuscatedSignature( - descriptor = "[Laf;" + descriptor = "[Lau;" ) @Export("rawSounds") RawSound[] rawSounds; - @ObfuscatedName("o") - short[] field2881; - @ObfuscatedName("g") - byte[] field2888; - @ObfuscatedName("l") - byte[] field2884; - @ObfuscatedName("z") + @ObfuscatedName("f") + short[] field2878; + @ObfuscatedName("y") + byte[] field2879; + @ObfuscatedName("p") + byte[] field2880; + @ObfuscatedName("j") @ObfuscatedSignature( - descriptor = "[Lhe;" + descriptor = "[Lhk;" ) - MusicPatchNode2[] field2880; - @ObfuscatedName("t") - byte[] field2886; - @ObfuscatedName("v") - int[] field2887; + MusicPatchNode2[] field2876; + @ObfuscatedName("r") + byte[] field2882; + @ObfuscatedName("b") + int[] field2883; MusicPatch(byte[] var1) { - this.rawSounds = new RawSound[128]; // L: 21 - this.field2881 = new short[128]; // L: 22 - this.field2888 = new byte[128]; // L: 23 - this.field2884 = new byte[128]; // L: 24 - this.field2880 = new MusicPatchNode2[128]; // L: 25 - this.field2886 = new byte[128]; // L: 26 - this.field2887 = new int[128]; // L: 27 - Buffer var2 = new Buffer(var1); // L: 28 + this.rawSounds = new RawSound[128]; // L: 27 + this.field2878 = new short[128]; // L: 28 + this.field2879 = new byte[128]; // L: 29 + this.field2880 = new byte[128]; // L: 30 + this.field2876 = new MusicPatchNode2[128]; // L: 31 + this.field2882 = new byte[128]; // L: 32 + this.field2883 = new int[128]; // L: 33 + Buffer var2 = new Buffer(var1); // L: 34 int var3; - for (var3 = 0; var2.array[var3 + var2.offset] != 0; ++var3) { // L: 29 30 + for (var3 = 0; var2.array[var3 + var2.offset] != 0; ++var3) { // L: 35 36 } - byte[] var4 = new byte[var3]; // L: 31 + byte[] var4 = new byte[var3]; // L: 37 int var5; - for (var5 = 0; var5 < var3; ++var5) { // L: 32 + for (var5 = 0; var5 < var3; ++var5) { // L: 38 var4[var5] = var2.readByte(); } - ++var2.offset; // L: 33 - ++var3; // L: 34 - var5 = var2.offset; // L: 35 - var2.offset += var3; // L: 36 + ++var2.offset; // L: 39 + ++var3; // L: 40 + var5 = var2.offset; // L: 41 + var2.offset += var3; // L: 42 int var6; - for (var6 = 0; var2.array[var6 + var2.offset] != 0; ++var6) { // L: 37 38 + for (var6 = 0; var2.array[var6 + var2.offset] != 0; ++var6) { // L: 43 44 } - byte[] var7 = new byte[var6]; // L: 39 + byte[] var7 = new byte[var6]; // L: 45 int var8; - for (var8 = 0; var8 < var6; ++var8) { // L: 40 + for (var8 = 0; var8 < var6; ++var8) { // L: 46 var7[var8] = var2.readByte(); } - ++var2.offset; // L: 41 - ++var6; // L: 42 - var8 = var2.offset; // L: 43 - var2.offset += var6; // L: 44 + ++var2.offset; // L: 47 + ++var6; // L: 48 + var8 = var2.offset; // L: 49 + var2.offset += var6; // L: 50 int var9; - for (var9 = 0; var2.array[var9 + var2.offset] != 0; ++var9) { // L: 45 46 + for (var9 = 0; var2.array[var9 + var2.offset] != 0; ++var9) { // L: 51 52 } - byte[] var10 = new byte[var9]; // L: 47 + byte[] var10 = new byte[var9]; // L: 53 - for (int var11 = 0; var11 < var9; ++var11) { // L: 48 + for (int var11 = 0; var11 < var9; ++var11) { // L: 54 var10[var11] = var2.readByte(); } - ++var2.offset; // L: 49 - ++var9; // L: 50 - byte[] var38 = new byte[var9]; // L: 51 + ++var2.offset; // L: 55 + ++var9; // L: 56 + byte[] var38 = new byte[var9]; // L: 57 int var12; int var14; - if (var9 > 1) { // L: 53 - var38[1] = 1; // L: 54 - int var13 = 1; // L: 55 - var12 = 2; // L: 56 + if (var9 > 1) { // L: 59 + var38[1] = 1; // L: 60 + int var13 = 1; // L: 61 + var12 = 2; // L: 62 - for (var14 = 2; var14 < var9; ++var14) { // L: 57 - int var43 = var2.readUnsignedByte(); // L: 58 - if (var43 == 0) { // L: 59 + for (var14 = 2; var14 < var9; ++var14) { // L: 63 + int var43 = var2.readUnsignedByte(); // L: 64 + if (var43 == 0) { // L: 65 var13 = var12++; } else { - if (var43 <= var13) { // L: 61 + if (var43 <= var13) { // L: 67 --var43; } - var13 = var43; // L: 62 + var13 = var43; // L: 68 } - var38[var14] = (byte)var13; // L: 64 + var38[var14] = (byte)var13; // L: 70 } } else { - var12 = var9; // L: 67 + var12 = var9; // L: 73 } - MusicPatchNode2[] var39 = new MusicPatchNode2[var12]; // L: 68 + MusicPatchNode2[] var39 = new MusicPatchNode2[var12]; // L: 74 MusicPatchNode2 var15; - for (var14 = 0; var14 < var39.length; ++var14) { // L: 69 - var15 = var39[var14] = new MusicPatchNode2(); // L: 70 - int var42 = var2.readUnsignedByte(); // L: 71 - if (var42 > 0) { // L: 72 - var15.field2819 = new byte[var42 * 2]; + for (var14 = 0; var14 < var39.length; ++var14) { // L: 75 + var15 = var39[var14] = new MusicPatchNode2(); // L: 76 + int var42 = var2.readUnsignedByte(); // L: 77 + if (var42 > 0) { // L: 78 + var15.field2825 = new byte[var42 * 2]; } - var42 = var2.readUnsignedByte(); // L: 73 - if (var42 > 0) { // L: 74 - var15.field2818 = new byte[var42 * 2 + 2]; // L: 75 - var15.field2818[1] = 64; // L: 76 + var42 = var2.readUnsignedByte(); // L: 79 + if (var42 > 0) { // L: 80 + var15.field2816 = new byte[var42 * 2 + 2]; // L: 81 + var15.field2816[1] = 64; // L: 82 } } - var14 = var2.readUnsignedByte(); // L: 79 - byte[] var44 = var14 > 0 ? new byte[var14 * 2] : null; // L: 80 - var14 = var2.readUnsignedByte(); // L: 81 - byte[] var16 = var14 > 0 ? new byte[var14 * 2] : null; // L: 82 + var14 = var2.readUnsignedByte(); // L: 85 + byte[] var44 = var14 > 0 ? new byte[var14 * 2] : null; // L: 86 + var14 = var2.readUnsignedByte(); // L: 87 + byte[] var16 = var14 > 0 ? new byte[var14 * 2] : null; // L: 88 int var17; - for (var17 = 0; var2.array[var17 + var2.offset] != 0; ++var17) { // L: 83 84 + for (var17 = 0; var2.array[var17 + var2.offset] != 0; ++var17) { // L: 89 90 } - byte[] var18 = new byte[var17]; // L: 85 + byte[] var18 = new byte[var17]; // L: 91 int var19; - for (var19 = 0; var19 < var17; ++var19) { // L: 86 + for (var19 = 0; var19 < var17; ++var19) { // L: 92 var18[var19] = var2.readByte(); } - ++var2.offset; // L: 87 - ++var17; // L: 88 - var19 = 0; // L: 89 + ++var2.offset; // L: 93 + ++var17; // L: 94 + var19 = 0; // L: 95 int var20; - for (var20 = 0; var20 < 128; ++var20) { // L: 90 - var19 += var2.readUnsignedByte(); // L: 91 - this.field2881[var20] = (short)var19; // L: 92 + for (var20 = 0; var20 < 128; ++var20) { // L: 96 + var19 += var2.readUnsignedByte(); // L: 97 + this.field2878[var20] = (short)var19; // L: 98 } - var19 = 0; // L: 94 + var19 = 0; // L: 100 short[] var50; - for (var20 = 0; var20 < 128; ++var20) { // L: 95 - var19 += var2.readUnsignedByte(); // L: 96 - var50 = this.field2881; // L: 97 + for (var20 = 0; var20 < 128; ++var20) { // L: 101 + var19 += var2.readUnsignedByte(); // L: 102 + var50 = this.field2878; // L: 103 var50[var20] = (short)(var50[var20] + (var19 << 8)); } - var20 = 0; // L: 99 - int var21 = 0; // L: 100 - int var22 = 0; // L: 101 + var20 = 0; // L: 105 + int var21 = 0; // L: 106 + int var22 = 0; // L: 107 int var23; - for (var23 = 0; var23 < 128; ++var23) { // L: 102 - if (var20 == 0) { // L: 103 - if (var21 < var18.length) { // L: 104 + for (var23 = 0; var23 < 128; ++var23) { // L: 108 + if (var20 == 0) { // L: 109 + if (var21 < var18.length) { // L: 110 var20 = var18[var21++]; } else { - var20 = -1; // L: 105 + var20 = -1; // L: 111 } - var22 = var2.readVarInt(); // L: 106 + var22 = var2.readVarInt(); // L: 112 } - var50 = this.field2881; // L: 108 + var50 = this.field2878; // L: 114 var50[var23] = (short)(var50[var23] + ((var22 - 1 & 2) << 14)); - this.field2887[var23] = var22; // L: 109 - --var20; // L: 110 + this.field2883[var23] = var22; // L: 115 + --var20; // L: 116 } - var20 = 0; // L: 112 - var21 = 0; // L: 113 - var23 = 0; // L: 114 + var20 = 0; // L: 118 + var21 = 0; // L: 119 + var23 = 0; // L: 120 int var24; - for (var24 = 0; var24 < 128; ++var24) { // L: 115 - if (this.field2887[var24] != 0) { // L: 116 - if (var20 == 0) { // L: 117 - if (var21 < var4.length) { // L: 118 + for (var24 = 0; var24 < 128; ++var24) { // L: 121 + if (this.field2883[var24] != 0) { // L: 122 + if (var20 == 0) { // L: 123 + if (var21 < var4.length) { // L: 124 var20 = var4[var21++]; } else { - var20 = -1; // L: 119 + var20 = -1; // L: 125 } - var23 = var2.array[var5++] - 1; // L: 120 + var23 = var2.array[var5++] - 1; // L: 126 } - this.field2886[var24] = (byte)var23; // L: 122 - --var20; // L: 123 + this.field2882[var24] = (byte)var23; // L: 128 + --var20; // L: 129 } } - var20 = 0; // L: 125 - var21 = 0; // L: 126 - var24 = 0; // L: 127 + var20 = 0; // L: 131 + var21 = 0; // L: 132 + var24 = 0; // L: 133 - for (int var25 = 0; var25 < 128; ++var25) { // L: 128 - if (this.field2887[var25] != 0) { // L: 129 - if (var20 == 0) { // L: 130 - if (var21 < var7.length) { // L: 131 - var20 = var7[var21++]; + for (int var25 = 0; var25 < 128; ++var25) { // L: 134 + if (this.field2883[var25] != 0) { // L: 135 + if (var20 == 0) { // L: 136 + if (var21 < var7.length) { + var20 = var7[var21++]; // L: 137 } else { - var20 = -1; // L: 132 + var20 = -1; // L: 138 } - var24 = var2.array[var8++] + 16 << 2; // L: 133 + var24 = var2.array[var8++] + 16 << 2; // L: 139 } - this.field2884[var25] = (byte)var24; // L: 135 - --var20; // L: 136 + this.field2880[var25] = (byte)var24; // L: 141 + --var20; // L: 142 } } - var20 = 0; // L: 138 - var21 = 0; // L: 139 - MusicPatchNode2 var40 = null; // L: 140 + var20 = 0; // L: 144 + var21 = 0; // L: 145 + MusicPatchNode2 var40 = null; // L: 146 int var26; - for (var26 = 0; var26 < 128; ++var26) { // L: 141 - if (this.field2887[var26] != 0) { // L: 142 - if (var20 == 0) { // L: 143 - var40 = var39[var38[var21]]; // L: 144 - if (var21 < var10.length) { // L: 145 + for (var26 = 0; var26 < 128; ++var26) { // L: 147 + if (this.field2883[var26] != 0) { // L: 148 + if (var20 == 0) { // L: 149 + var40 = var39[var38[var21]]; // L: 150 + if (var21 < var10.length) { // L: 151 var20 = var10[var21++]; } else { - var20 = -1; // L: 146 + var20 = -1; // L: 152 } } - this.field2880[var26] = var40; // L: 148 - --var20; // L: 149 + this.field2876[var26] = var40; // L: 154 + --var20; // L: 155 } } - var20 = 0; // L: 151 - var21 = 0; // L: 152 - var26 = 0; // L: 153 + var20 = 0; // L: 157 + var21 = 0; // L: 158 + var26 = 0; // L: 159 int var27; - for (var27 = 0; var27 < 128; ++var27) { // L: 154 - if (var20 == 0) { // L: 155 - if (var21 < var18.length) { // L: 156 + for (var27 = 0; var27 < 128; ++var27) { // L: 160 + if (var20 == 0) { // L: 161 + if (var21 < var18.length) { // L: 162 var20 = var18[var21++]; } else { - var20 = -1; // L: 157 + var20 = -1; // L: 163 } - if (this.field2887[var27] > 0) { // L: 158 + if (this.field2883[var27] > 0) { // L: 164 var26 = var2.readUnsignedByte() + 1; } } - this.field2888[var27] = (byte)var26; // L: 160 - --var20; // L: 161 + this.field2879[var27] = (byte)var26; // L: 166 + --var20; // L: 167 } - this.field2883 = var2.readUnsignedByte() + 1; // L: 163 + this.field2881 = var2.readUnsignedByte() + 1; // L: 169 int var29; MusicPatchNode2 var41; - for (var27 = 0; var27 < var12; ++var27) { // L: 164 - var41 = var39[var27]; // L: 165 - if (var41.field2819 != null) { // L: 166 - for (var29 = 1; var29 < var41.field2819.length; var29 += 2) { // L: 167 - var41.field2819[var29] = var2.readByte(); + for (var27 = 0; var27 < var12; ++var27) { // L: 170 + var41 = var39[var27]; // L: 171 + if (var41.field2825 != null) { // L: 172 + for (var29 = 1; var29 < var41.field2825.length; var29 += 2) { // L: 173 + var41.field2825[var29] = var2.readByte(); } } - if (var41.field2818 != null) { // L: 169 - for (var29 = 3; var29 < var41.field2818.length - 2; var29 += 2) { // L: 170 - var41.field2818[var29] = var2.readByte(); + if (var41.field2816 != null) { // L: 175 + for (var29 = 3; var29 < var41.field2816.length - 2; var29 += 2) { // L: 176 + var41.field2816[var29] = var2.readByte(); } } } - if (var44 != null) { // L: 173 - for (var27 = 1; var27 < var44.length; var27 += 2) { // L: 174 + if (var44 != null) { // L: 179 + for (var27 = 1; var27 < var44.length; var27 += 2) { // L: 180 var44[var27] = var2.readByte(); } } - if (var16 != null) { // L: 176 - for (var27 = 1; var27 < var16.length; var27 += 2) { // L: 177 + if (var16 != null) { // L: 182 + for (var27 = 1; var27 < var16.length; var27 += 2) { // L: 183 var16[var27] = var2.readByte(); } } - for (var27 = 0; var27 < var12; ++var27) { // L: 179 - var41 = var39[var27]; // L: 180 - if (var41.field2818 != null) { // L: 181 - var19 = 0; // L: 182 + for (var27 = 0; var27 < var12; ++var27) { // L: 185 + var41 = var39[var27]; // L: 186 + if (var41.field2816 != null) { // L: 187 + var19 = 0; // L: 188 - for (var29 = 2; var29 < var41.field2818.length; var29 += 2) { // L: 183 - var19 = var19 + 1 + var2.readUnsignedByte(); // L: 184 - var41.field2818[var29] = (byte)var19; // L: 185 + for (var29 = 2; var29 < var41.field2816.length; var29 += 2) { // L: 189 + var19 = 1 + var19 + var2.readUnsignedByte(); // L: 190 + var41.field2816[var29] = (byte)var19; // L: 191 } } } - for (var27 = 0; var27 < var12; ++var27) { // L: 189 - var41 = var39[var27]; // L: 190 - if (var41.field2819 != null) { // L: 191 - var19 = 0; // L: 192 + for (var27 = 0; var27 < var12; ++var27) { // L: 195 + var41 = var39[var27]; // L: 196 + if (var41.field2825 != null) { // L: 197 + var19 = 0; // L: 198 - for (var29 = 2; var29 < var41.field2819.length; var29 += 2) { // L: 193 - var19 = var19 + 1 + var2.readUnsignedByte(); // L: 194 - var41.field2819[var29] = (byte)var19; // L: 195 + for (var29 = 2; var29 < var41.field2825.length; var29 += 2) { // L: 199 + var19 = 1 + var19 + var2.readUnsignedByte(); // L: 200 + var41.field2825[var29] = (byte)var19; // L: 201 } } } @@ -337,198 +340,207 @@ public class MusicPatch extends Node { int var36; int var47; byte var49; - if (var44 != null) { // L: 199 - var19 = var2.readUnsignedByte(); // L: 200 - var44[0] = (byte)var19; // L: 201 + if (var44 != null) { // L: 205 + var19 = var2.readUnsignedByte(); // L: 206 + var44[0] = (byte)var19; // L: 207 - for (var27 = 2; var27 < var44.length; var27 += 2) { // L: 202 - var19 = var19 + 1 + var2.readUnsignedByte(); // L: 203 - var44[var27] = (byte)var19; // L: 204 + for (var27 = 2; var27 < var44.length; var27 += 2) { // L: 208 + var19 = 1 + var19 + var2.readUnsignedByte(); // L: 209 + var44[var27] = (byte)var19; // L: 210 } - var49 = var44[0]; // L: 206 - byte var28 = var44[1]; // L: 207 + var49 = var44[0]; // L: 212 + byte var28 = var44[1]; // L: 213 - for (var29 = 0; var29 < var49; ++var29) { // L: 208 - this.field2888[var29] = (byte)(var28 * this.field2888[var29] + 32 >> 6); + for (var29 = 0; var29 < var49; ++var29) { // L: 214 + this.field2879[var29] = (byte)(var28 * this.field2879[var29] + 32 >> 6); } - for (var29 = 2; var29 < var44.length; var29 += 2) { // L: 209 210 227 - var30 = var44[var29]; // L: 211 - byte var31 = var44[var29 + 1]; // L: 212 - var32 = var28 * (var30 - var49) + (var30 - var49) / 2; // L: 213 + for (var29 = 2; var29 < var44.length; var29 += 2) { // L: 215 216 233 + var30 = var44[var29]; // L: 217 + byte var31 = var44[var29 + 1]; // L: 218 + var32 = var28 * (var30 - var49) + (var30 - var49) / 2; // L: 219 - for (var33 = var49; var33 < var30; ++var33) { // L: 214 - var35 = var30 - var49; // L: 216 - var36 = var32 >>> 31; // L: 218 - var34 = (var32 + var36) / var35 - var36; // L: 219 - this.field2888[var33] = (byte)(var34 * this.field2888[var33] + 32 >> 6); // L: 222 - var32 += var31 - var28; // L: 223 + for (var33 = var49; var33 < var30; ++var33) { // L: 220 + var35 = var30 - var49; // L: 222 + var36 = var32 >>> 31; // L: 224 + var34 = (var32 + var36) / var35 - var36; // L: 225 + this.field2879[var33] = (byte)(var34 * this.field2879[var33] + 32 >> 6); // L: 228 + var32 += var31 - var28; // L: 229 } - var49 = var30; // L: 225 - var28 = var31; // L: 226 + var49 = var30; // L: 231 + var28 = var31; // L: 232 } - for (var47 = var49; var47 < 128; ++var47) { // L: 229 - this.field2888[var47] = (byte)(var28 * this.field2888[var47] + 32 >> 6); + for (var47 = var49; var47 < 128; ++var47) { // L: 235 + this.field2879[var47] = (byte)(var28 * this.field2879[var47] + 32 >> 6); } - var15 = null; // L: 230 + var15 = null; // L: 236 } - if (var16 != null) { // L: 232 - var19 = var2.readUnsignedByte(); // L: 233 - var16[0] = (byte)var19; // L: 234 + if (var16 != null) { // L: 238 + var19 = var2.readUnsignedByte(); // L: 239 + var16[0] = (byte)var19; // L: 240 - for (var27 = 2; var27 < var16.length; var27 += 2) { // L: 235 - var19 = var19 + 1 + var2.readUnsignedByte(); // L: 236 - var16[var27] = (byte)var19; // L: 237 + for (var27 = 2; var27 < var16.length; var27 += 2) { // L: 241 + var19 = 1 + var19 + var2.readUnsignedByte(); // L: 242 + var16[var27] = (byte)var19; // L: 243 } - var49 = var16[0]; // L: 239 - int var46 = var16[1] << 1; // L: 240 + var49 = var16[0]; // L: 245 + int var46 = var16[1] << 1; // L: 246 - for (var29 = 0; var29 < var49; ++var29) { // L: 241 - var47 = var46 + (this.field2884[var29] & 255); // L: 242 - if (var47 < 0) { // L: 243 + for (var29 = 0; var29 < var49; ++var29) { // L: 247 + var47 = var46 + (this.field2880[var29] & 255); // L: 248 + if (var47 < 0) { // L: 249 var47 = 0; } - if (var47 > 128) { // L: 244 + if (var47 > 128) { // L: 250 var47 = 128; } - this.field2884[var29] = (byte)var47; // L: 245 + this.field2880[var29] = (byte)var47; // L: 251 } int var48; - for (var29 = 2; var29 < var16.length; var29 += 2) { // L: 247 248 268 - var30 = var16[var29]; // L: 249 - var48 = var16[var29 + 1] << 1; // L: 250 - var32 = var46 * (var30 - var49) + (var30 - var49) / 2; // L: 251 + for (var29 = 2; var29 < var16.length; var29 += 2) { // L: 253 254 274 + var30 = var16[var29]; // L: 255 + var48 = var16[var29 + 1] << 1; // L: 256 + var32 = var46 * (var30 - var49) + (var30 - var49) / 2; // L: 257 - for (var33 = var49; var33 < var30; ++var33) { // L: 252 - var35 = var30 - var49; // L: 254 - var36 = var32 >>> 31; // L: 256 - var34 = (var36 + var32) / var35 - var36; // L: 257 - int var37 = var34 + (this.field2884[var33] & 255); // L: 260 - if (var37 < 0) { // L: 261 + for (var33 = var49; var33 < var30; ++var33) { // L: 258 + var35 = var30 - var49; // L: 260 + var36 = var32 >>> 31; // L: 262 + var34 = (var32 + var36) / var35 - var36; // L: 263 + int var37 = var34 + (this.field2880[var33] & 255); // L: 266 + if (var37 < 0) { // L: 267 var37 = 0; } - if (var37 > 128) { // L: 262 + if (var37 > 128) { // L: 268 var37 = 128; } - this.field2884[var33] = (byte)var37; // L: 263 - var32 += var48 - var46; // L: 264 + this.field2880[var33] = (byte)var37; // L: 269 + var32 += var48 - var46; // L: 270 } - var49 = var30; // L: 266 - var46 = var48; // L: 267 + var49 = var30; // L: 272 + var46 = var48; // L: 273 } - for (var47 = var49; var47 < 128; ++var47) { // L: 270 - var48 = var46 + (this.field2884[var47] & 255); // L: 271 - if (var48 < 0) { // L: 272 + for (var47 = var49; var47 < 128; ++var47) { // L: 276 + var48 = var46 + (this.field2880[var47] & 255); // L: 277 + if (var48 < 0) { // L: 278 var48 = 0; } - if (var48 > 128) { // L: 273 + if (var48 > 128) { // L: 279 var48 = 128; } - this.field2884[var47] = (byte)var48; // L: 274 + this.field2880[var47] = (byte)var48; // L: 280 } - Object var45 = null; // L: 276 + Object var45 = null; // L: 282 } - for (var27 = 0; var27 < var12; ++var27) { // L: 278 - var39[var27].field2825 = var2.readUnsignedByte(); + for (var27 = 0; var27 < var12; ++var27) { // L: 284 + var39[var27].field2815 = var2.readUnsignedByte(); } - for (var27 = 0; var27 < var12; ++var27) { // L: 279 - var41 = var39[var27]; // L: 280 - if (var41.field2819 != null) { // L: 281 - var41.field2820 = var2.readUnsignedByte(); - } - - if (var41.field2818 != null) { // L: 282 + for (var27 = 0; var27 < var12; ++var27) { // L: 285 + var41 = var39[var27]; // L: 286 + if (var41.field2825 != null) { // L: 287 var41.field2821 = var2.readUnsignedByte(); } - if (var41.field2825 > 0) { // L: 283 + if (var41.field2816 != null) { // L: 288 + var41.field2819 = var2.readUnsignedByte(); + } + + if (var41.field2815 > 0) { // L: 289 + var41.field2820 = var2.readUnsignedByte(); + } + } + + for (var27 = 0; var27 < var12; ++var27) { // L: 291 + var39[var27].field2817 = var2.readUnsignedByte(); + } + + for (var27 = 0; var27 < var12; ++var27) { // L: 292 + var41 = var39[var27]; // L: 293 + if (var41.field2817 > 0) { // L: 294 var41.field2822 = var2.readUnsignedByte(); } } - for (var27 = 0; var27 < var12; ++var27) { // L: 285 - var39[var27].field2826 = var2.readUnsignedByte(); - } - - for (var27 = 0; var27 < var12; ++var27) { // L: 286 - var41 = var39[var27]; // L: 287 - if (var41.field2826 > 0) { // L: 288 - var41.field2824 = var2.readUnsignedByte(); + for (var27 = 0; var27 < var12; ++var27) { // L: 296 + var41 = var39[var27]; // L: 297 + if (var41.field2822 > 0) { // L: 298 + var41.field2823 = var2.readUnsignedByte(); } } - for (var27 = 0; var27 < var12; ++var27) { // L: 290 - var41 = var39[var27]; // L: 291 - if (var41.field2824 > 0) { // L: 292 - var41.field2817 = var2.readUnsignedByte(); - } - } + } // L: 300 - } // L: 294 - - @ObfuscatedName("h") + @ObfuscatedName("n") @ObfuscatedSignature( - descriptor = "(Lbu;[B[IB)Z", - garbageValue = "-84" + descriptor = "(Lbu;[B[II)Z", + garbageValue = "122660467" ) - boolean method4533(SoundCache var1, byte[] var2, int[] var3) { - boolean var4 = true; // L: 297 - int var5 = 0; // L: 298 - RawSound var6 = null; // L: 299 + boolean method4588(SoundCache var1, byte[] var2, int[] var3) { + boolean var4 = true; // L: 303 + int var5 = 0; // L: 304 + RawSound var6 = null; // L: 305 - for (int var7 = 0; var7 < 128; ++var7) { // L: 300 - if (var2 == null || var2[var7] != 0) { // L: 301 - int var8 = this.field2887[var7]; // L: 302 - if (var8 != 0) { // L: 303 - if (var5 != var8) { // L: 304 - var5 = var8--; // L: 305 306 - if ((var8 & 1) == 0) { // L: 307 + for (int var7 = 0; var7 < 128; ++var7) { // L: 306 + if (var2 == null || var2[var7] != 0) { // L: 307 + int var8 = this.field2883[var7]; // L: 308 + if (var8 != 0) { // L: 309 + if (var5 != var8) { // L: 310 + var5 = var8--; // L: 311 312 + if ((var8 & 1) == 0) { // L: 313 var6 = var1.getSoundEffect(var8 >> 2, var3); } else { - var6 = var1.getMusicSample(var8 >> 2, var3); // L: 308 + var6 = var1.getMusicSample(var8 >> 2, var3); // L: 314 } - if (var6 == null) { // L: 309 - var4 = false; + if (var6 == null) { + var4 = false; // L: 315 } } - if (var6 != null) { // L: 311 - this.rawSounds[var7] = var6; // L: 312 - this.field2887[var7] = 0; // L: 313 + if (var6 != null) { // L: 317 + this.rawSounds[var7] = var6; // L: 318 + this.field2883[var7] = 0; // L: 319 } } } } - return var4; // L: 317 + return var4; // L: 323 } - @ObfuscatedName("c") + @ObfuscatedName("f") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "-602164498" + garbageValue = "1514154807" ) @Export("clear") void clear() { - this.field2887 = null; // L: 321 - } // L: 322 + this.field2883 = null; // L: 327 + } // L: 328 + + @ObfuscatedName("f") + @ObfuscatedSignature( + descriptor = "(Lnd;I)Ljava/lang/String;", + garbageValue = "502303985" + ) + public static String method4592(Buffer var0) { + return ModelData0.method4261(var0, 32767); // L: 26 + } } diff --git a/runescape-client/src/main/java/MusicPatchNode.java b/runescape-client/src/main/java/MusicPatchNode.java index 460975f8aa..71b4aa9420 100644 --- a/runescape-client/src/main/java/MusicPatchNode.java +++ b/runescape-client/src/main/java/MusicPatchNode.java @@ -4,152 +4,191 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("iz") +@ObfuscatedName("iq") @Implements("MusicPatchNode") public class MusicPatchNode extends Node { - @ObfuscatedName("h") + @ObfuscatedName("v") @ObfuscatedGetter( - intValue = 1463975921 + intValue = -1025207361 ) - int field2908; - @ObfuscatedName("c") + int field2905; + @ObfuscatedName("n") @ObfuscatedSignature( - descriptor = "Lic;" + descriptor = "Lin;" ) @Export("patch") MusicPatch patch; - @ObfuscatedName("o") + @ObfuscatedName("f") @ObfuscatedSignature( - descriptor = "Laf;" + descriptor = "Lau;" ) @Export("rawSound") RawSound rawSound; - @ObfuscatedName("g") + @ObfuscatedName("y") @ObfuscatedSignature( - descriptor = "Lhe;" + descriptor = "Lhk;" ) - MusicPatchNode2 field2915; - @ObfuscatedName("l") - @ObfuscatedGetter( - intValue = 526262157 - ) - int field2907; - @ObfuscatedName("z") - @ObfuscatedGetter( - intValue = -6114463 - ) - int field2902; - @ObfuscatedName("t") - @ObfuscatedGetter( - intValue = -970161773 - ) - int field2903; - @ObfuscatedName("v") - @ObfuscatedGetter( - intValue = -339875115 - ) - int field2904; - @ObfuscatedName("b") - @ObfuscatedGetter( - intValue = -749236091 - ) - int field2905; - @ObfuscatedName("q") - @ObfuscatedGetter( - intValue = 421352965 - ) - int field2906; - @ObfuscatedName("i") - @ObfuscatedGetter( - intValue = -1907989053 - ) - int field2900; - @ObfuscatedName("x") - @ObfuscatedGetter( - intValue = -585821047 - ) - int field2911; - @ObfuscatedName("k") - @ObfuscatedGetter( - intValue = 1406585343 - ) - int field2909; - @ObfuscatedName("r") - @ObfuscatedGetter( - intValue = 1645733579 - ) - int field2910; + MusicPatchNode2 field2894; @ObfuscatedName("p") @ObfuscatedGetter( - intValue = -1129661053 + intValue = -2143225367 + ) + int field2893; + @ObfuscatedName("j") + @ObfuscatedGetter( + intValue = -723940785 + ) + int field2896; + @ObfuscatedName("r") + @ObfuscatedGetter( + intValue = 1566640151 + ) + int field2897; + @ObfuscatedName("b") + @ObfuscatedGetter( + intValue = 970092925 ) int field2898; - @ObfuscatedName("a") - @ObfuscatedGetter( - intValue = -304660997 - ) - int field2912; - @ObfuscatedName("e") - @ObfuscatedGetter( - intValue = -1833594555 - ) - int field2913; @ObfuscatedName("d") @ObfuscatedGetter( - intValue = 2087137619 + intValue = 215164221 + ) + int field2900; + @ObfuscatedName("s") + @ObfuscatedGetter( + intValue = -1146128297 + ) + int field2899; + @ObfuscatedName("u") + @ObfuscatedGetter( + intValue = 1897214019 ) int field2901; - @ObfuscatedName("u") + @ObfuscatedName("l") + @ObfuscatedGetter( + intValue = -955818271 + ) + int field2902; + @ObfuscatedName("o") + @ObfuscatedGetter( + intValue = 370154707 + ) + int field2903; + @ObfuscatedName("c") + @ObfuscatedGetter( + intValue = 939918277 + ) + int field2911; + @ObfuscatedName("e") + @ObfuscatedGetter( + intValue = 1951740649 + ) + int field2895; + @ObfuscatedName("g") + @ObfuscatedGetter( + intValue = -292962099 + ) + int field2906; + @ObfuscatedName("a") + @ObfuscatedGetter( + intValue = 726334989 + ) + int field2907; + @ObfuscatedName("k") + @ObfuscatedGetter( + intValue = 1237883869 + ) + int field2908; + @ObfuscatedName("m") @ObfuscatedSignature( - descriptor = "Lbk;" + descriptor = "Lbv;" ) @Export("stream") RawPcmStream stream; - @ObfuscatedName("m") + @ObfuscatedName("x") @ObfuscatedGetter( - intValue = 987956441 + intValue = 730487289 ) - int field2916; - @ObfuscatedName("f") + int field2891; + @ObfuscatedName("w") @ObfuscatedGetter( - intValue = -218831321 + intValue = -576530835 ) - int field2917; + int field2904; MusicPatchNode() { } // L: 31 - @ObfuscatedName("h") + @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "-1154138933" + descriptor = "(B)V", + garbageValue = "-88" ) - void method4575() { + void method4634() { this.patch = null; // L: 34 this.rawSound = null; // L: 35 - this.field2915 = null; // L: 36 + this.field2894 = null; // L: 36 this.stream = null; // L: 37 - } // L: 38 + } - @ObfuscatedName("h") + @ObfuscatedName("f") @ObfuscatedSignature( - descriptor = "(IB)Led;", - garbageValue = "-24" + descriptor = "(Ljava/lang/CharSequence;IZI)Z", + garbageValue = "-387650050" ) - @Export("VarpDefinition_get") - public static VarpDefinition VarpDefinition_get(int var0) { - VarpDefinition var1 = (VarpDefinition)VarpDefinition.VarpDefinition_cached.get((long)var0); // L: 18 - if (var1 != null) { // L: 19 - return var1; - } else { - byte[] var2 = VarpDefinition.VarpDefinition_archive.takeFile(16, var0); // L: 20 - var1 = new VarpDefinition(); // L: 21 - if (var2 != null) { // L: 22 - var1.decode(new Buffer(var2)); + static boolean method4638(CharSequence var0, int var1, boolean var2) { + if (var1 >= 2 && var1 <= 36) { // L: 38 + boolean var3 = false; // L: 39 + boolean var4 = false; // L: 40 + int var5 = 0; // L: 41 + int var6 = var0.length(); // L: 42 + + for (int var7 = 0; var7 < var6; ++var7) { // L: 43 + char var8 = var0.charAt(var7); // L: 44 + if (var7 == 0) { // L: 45 + if (var8 == '-') { // L: 46 + var3 = true; // L: 47 + continue; + } + + if (var8 == '+') { // L: 50 + continue; + } + } + + int var10; + if (var8 >= '0' && var8 <= '9') { // L: 52 + var10 = var8 - '0'; + } else if (var8 >= 'A' && var8 <= 'Z') { // L: 53 + var10 = var8 - '7'; + } else { + if (var8 < 'a' || var8 > 'z') { // L: 54 + return false; // L: 55 + } + + var10 = var8 - 'W'; + } + + if (var10 >= var1) { // L: 56 + return false; + } + + if (var3) { // L: 57 + var10 = -var10; + } + + int var9 = var10 + var5 * var1; // L: 58 + if (var9 / var1 != var5) { // L: 59 + return false; + } + + var5 = var9; // L: 60 + var4 = true; // L: 61 } - VarpDefinition.VarpDefinition_cached.put(var1, (long)var0); // L: 23 - return var1; // L: 24 + return var4; // L: 63 + } else { + throw new IllegalArgumentException("" + var1); } } } diff --git a/runescape-client/src/main/java/MusicPatchNode2.java b/runescape-client/src/main/java/MusicPatchNode2.java index 756f3adeba..787498182e 100644 --- a/runescape-client/src/main/java/MusicPatchNode2.java +++ b/runescape-client/src/main/java/MusicPatchNode2.java @@ -2,59 +2,49 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; -@ObfuscatedName("he") +@ObfuscatedName("hk") @Implements("MusicPatchNode2") public class MusicPatchNode2 { - @ObfuscatedName("gb") + @ObfuscatedName("v") + byte[] field2825; + @ObfuscatedName("n") + byte[] field2816; + @ObfuscatedName("f") @ObfuscatedGetter( - intValue = 1435623037 + intValue = -1176756579 ) - static int field2827; - @ObfuscatedName("h") - byte[] field2819; - @ObfuscatedName("c") - byte[] field2818; - @ObfuscatedName("o") + int field2815; + @ObfuscatedName("y") @ObfuscatedGetter( - intValue = -363994675 - ) - int field2825; - @ObfuscatedName("g") - @ObfuscatedGetter( - intValue = 612743299 - ) - int field2820; - @ObfuscatedName("l") - @ObfuscatedGetter( - intValue = 84150397 + intValue = -2020328807 ) int field2821; - @ObfuscatedName("z") + @ObfuscatedName("p") @ObfuscatedGetter( - intValue = -2015819751 + intValue = -540295213 + ) + int field2819; + @ObfuscatedName("j") + @ObfuscatedGetter( + intValue = 1149162475 + ) + int field2820; + @ObfuscatedName("r") + @ObfuscatedGetter( + intValue = 1263113975 ) int field2822; - @ObfuscatedName("t") - @ObfuscatedGetter( - intValue = 2040346983 - ) - int field2824; - @ObfuscatedName("v") - @ObfuscatedGetter( - intValue = -4510781 - ) - int field2826; @ObfuscatedName("b") @ObfuscatedGetter( - intValue = 2119976999 + intValue = -75268449 ) int field2817; + @ObfuscatedName("d") + @ObfuscatedGetter( + intValue = -1029030671 + ) + int field2823; MusicPatchNode2() { } // L: 14 - - @ObfuscatedName("h") - static boolean method4349(long var0) { - return PacketWriter.method2409(var0) == 2; // L: 44 - } } diff --git a/runescape-client/src/main/java/MusicPatchPcmStream.java b/runescape-client/src/main/java/MusicPatchPcmStream.java index 16280c86eb..cbddd5c8c2 100644 --- a/runescape-client/src/main/java/MusicPatchPcmStream.java +++ b/runescape-client/src/main/java/MusicPatchPcmStream.java @@ -3,24 +3,26 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("in") +@ObfuscatedName("ih") @Implements("MusicPatchPcmStream") public class MusicPatchPcmStream extends PcmStream { - @ObfuscatedName("h") + @ObfuscatedName("ag") + static String field2885; + @ObfuscatedName("v") @ObfuscatedSignature( descriptor = "Lhp;" ) @Export("superStream") MidiPcmStream superStream; - @ObfuscatedName("c") + @ObfuscatedName("n") @ObfuscatedSignature( - descriptor = "Lka;" + descriptor = "Lkx;" ) @Export("queue") NodeDeque queue; - @ObfuscatedName("o") + @ObfuscatedName("f") @ObfuscatedSignature( - descriptor = "Lar;" + descriptor = "Lay;" ) @Export("mixer") PcmStreamMixer mixer; @@ -34,48 +36,48 @@ public class MusicPatchPcmStream extends PcmStream { this.superStream = var1; // L: 15 } // L: 16 - @ObfuscatedName("h") + @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "(Liz;[IIIII)V", - garbageValue = "382384073" + descriptor = "(Liq;[IIIIS)V", + garbageValue = "25857" ) - void method4546(MusicPatchNode var1, int[] var2, int var3, int var4, int var5) { - if ((this.superStream.field2853[var1.field2908] & 4) != 0 && var1.field2898 < 0) { // L: 73 - int var6 = this.superStream.field2841[var1.field2908] / PcmPlayer.field401; // L: 74 + void method4604(MusicPatchNode var1, int[] var2, int var3, int var4, int var5) { + if ((this.superStream.field2846[var1.field2905] & 4) != 0 && var1.field2895 < 0) { // L: 73 + int var6 = this.superStream.field2851[var1.field2905] / PcmPlayer.field428; // L: 74 while (true) { - int var7 = (var6 + 1048575 - var1.field2917) / var6; // L: 76 + int var7 = (var6 + 1048575 - var1.field2904) / var6; // L: 76 if (var7 > var4) { // L: 77 - var1.field2917 += var6 * var4; // L: 99 + var1.field2904 += var4 * var6; break; } var1.stream.fill(var2, var3, var7); // L: 78 var3 += var7; // L: 79 var4 -= var7; // L: 80 - var1.field2917 += var7 * var6 - 1048576; // L: 81 - int var8 = PcmPlayer.field401 / 100; // L: 82 + var1.field2904 += var6 * var7 - 1048576; // L: 81 + int var8 = PcmPlayer.field428 / 100; // L: 82 int var9 = 262144 / var6; // L: 83 if (var9 < var8) { // L: 84 var8 = var9; } RawPcmStream var10 = var1.stream; // L: 85 - if (this.superStream.field2854[var1.field2908] == 0) { // L: 86 - var1.stream = RawPcmStream.method885(var1.rawSound, var10.method935(), var10.method891(), var10.method892()); // L: 87 + if (this.superStream.field2836[var1.field2905] == 0) { // L: 86 + var1.stream = RawPcmStream.method842(var1.rawSound, var10.method857(), var10.method914(), var10.method971()); // L: 87 } else { - var1.stream = RawPcmStream.method885(var1.rawSound, var10.method935(), 0, var10.method892()); // L: 90 - this.superStream.method4430(var1, var1.patch.field2881[var1.field2902] < 0); // L: 91 - var1.stream.method896(var8, var10.method891()); // L: 92 + var1.stream = RawPcmStream.method842(var1.rawSound, var10.method857(), 0, var10.method971()); // L: 90 + this.superStream.method4421(var1, var1.patch.field2878[var1.field2896] < 0); // L: 91 + var1.stream.method853(var8, var10.method914()); // L: 92 } - if (var1.patch.field2881[var1.field2902] < 0) { // L: 94 + if (var1.patch.field2878[var1.field2896] < 0) { // L: 94 var1.stream.setNumLoops(-1); } - var10.method898(var8); // L: 95 - var10.fill(var2, var3, var5 - var3); // L: 96 - if (var10.method902()) { // L: 97 + var10.method855(var8); + var10.fill(var2, var3, var5 - var3); + if (var10.method859()) { this.mixer.addSubStream(var10); } } @@ -84,52 +86,52 @@ public class MusicPatchPcmStream extends PcmStream { var1.stream.fill(var2, var3, var4); // L: 101 } // L: 102 - @ObfuscatedName("c") + @ObfuscatedName("n") @ObfuscatedSignature( - descriptor = "(Liz;II)V", - garbageValue = "-1341794565" + descriptor = "(Liq;II)V", + garbageValue = "1404066411" ) - void method4547(MusicPatchNode var1, int var2) { - if ((this.superStream.field2853[var1.field2908] & 4) != 0 && var1.field2898 < 0) { // L: 105 - int var3 = this.superStream.field2841[var1.field2908] / PcmPlayer.field401; // L: 106 - int var4 = (var3 + 1048575 - var1.field2917) / var3; // L: 107 - var1.field2917 = var3 * var2 + var1.field2917 & 1048575; // L: 108 + void method4605(MusicPatchNode var1, int var2) { + if ((this.superStream.field2846[var1.field2905] & 4) != 0 && var1.field2895 < 0) { // L: 105 + int var3 = this.superStream.field2851[var1.field2905] / PcmPlayer.field428; // L: 106 + int var4 = (var3 + 1048575 - var1.field2904) / var3; // L: 107 + var1.field2904 = var3 * var2 + var1.field2904 & 1048575; // L: 108 if (var4 <= var2) { // L: 109 - if (this.superStream.field2854[var1.field2908] == 0) { // L: 110 - var1.stream = RawPcmStream.method885(var1.rawSound, var1.stream.method935(), var1.stream.method891(), var1.stream.method892()); // L: 111 + if (this.superStream.field2836[var1.field2905] == 0) { // L: 110 + var1.stream = RawPcmStream.method842(var1.rawSound, var1.stream.method857(), var1.stream.method914(), var1.stream.method971()); // L: 111 } else { - var1.stream = RawPcmStream.method885(var1.rawSound, var1.stream.method935(), 0, var1.stream.method892()); // L: 114 - this.superStream.method4430(var1, var1.patch.field2881[var1.field2902] < 0); // L: 115 + var1.stream = RawPcmStream.method842(var1.rawSound, var1.stream.method857(), 0, var1.stream.method971()); // L: 114 + this.superStream.method4421(var1, var1.patch.field2878[var1.field2896] < 0); // L: 115 } - if (var1.patch.field2881[var1.field2902] < 0) { // L: 117 + if (var1.patch.field2878[var1.field2896] < 0) { // L: 117 var1.stream.setNumLoops(-1); } - var2 = var1.field2917 / var3; // L: 118 + var2 = var1.field2904 / var3; // L: 118 } } var1.stream.skip(var2); // L: 121 } // L: 122 - @ObfuscatedName("z") + @ObfuscatedName("j") @ObfuscatedSignature( - descriptor = "()Lbt;" + descriptor = "()Lbm;" ) @Export("firstSubStream") protected PcmStream firstSubStream() { MusicPatchNode var1 = (MusicPatchNode)this.queue.last(); // L: 19 - if (var1 == null) { // L: 20 - return null; + if (var1 == null) { + return null; // L: 20 } else { return (PcmStream)(var1.stream != null ? var1.stream : this.nextSubStream()); // L: 21 22 } } - @ObfuscatedName("t") + @ObfuscatedName("r") @ObfuscatedSignature( - descriptor = "()Lbt;" + descriptor = "()Lbm;" ) @Export("nextSubStream") protected PcmStream nextSubStream() { @@ -144,58 +146,77 @@ public class MusicPatchPcmStream extends PcmStream { return var1.stream; } - @ObfuscatedName("v") - protected int vmethod4560() { + @ObfuscatedName("b") + protected int vmethod4610() { return 0; // L: 34 } - @ObfuscatedName("b") + @ObfuscatedName("d") @Export("fill") protected void fill(int[] var1, int var2, int var3) { this.mixer.fill(var1, var2, var3); // L: 40 for (MusicPatchNode var6 = (MusicPatchNode)this.queue.last(); var6 != null; var6 = (MusicPatchNode)this.queue.previous()) { // L: 41 - if (!this.superStream.method4403(var6)) { // L: 42 + if (!this.superStream.method4442(var6)) { // L: 42 int var4 = var2; // L: 43 int var5 = var3; // L: 44 do { - if (var5 <= var6.field2916) { // L: 45 - this.method4546(var6, var1, var4, var5, var5 + var4); // L: 51 - var6.field2916 -= var5; // L: 52 + if (var5 <= var6.field2891) { // L: 45 + this.method4604(var6, var1, var4, var5, var4 + var5); // L: 51 + var6.field2891 -= var5; // L: 52 break; } - this.method4546(var6, var1, var4, var6.field2916, var5 + var4); // L: 46 - var4 += var6.field2916; // L: 47 - var5 -= var6.field2916; // L: 48 - } while(!this.superStream.method4419(var6, var1, var4, var5)); // L: 49 + this.method4604(var6, var1, var4, var6.field2891, var5 + var4); // L: 46 + var4 += var6.field2891; // L: 47 + var5 -= var6.field2891; // L: 48 + } while(!this.superStream.method4443(var6, var1, var4, var5)); // L: 49 } } } // L: 54 - @ObfuscatedName("i") + @ObfuscatedName("u") @Export("skip") protected void skip(int var1) { this.mixer.skip(var1); // L: 58 for (MusicPatchNode var3 = (MusicPatchNode)this.queue.last(); var3 != null; var3 = (MusicPatchNode)this.queue.previous()) { // L: 59 - if (!this.superStream.method4403(var3)) { // L: 60 + if (!this.superStream.method4442(var3)) { // L: 60 int var2 = var1; // L: 61 do { - if (var2 <= var3.field2916) { // L: 62 - this.method4547(var3, var2); // L: 67 - var3.field2916 -= var2; // L: 68 + if (var2 <= var3.field2891) { // L: 62 + this.method4605(var3, var2); // L: 67 + var3.field2891 -= var2; // L: 68 break; } - this.method4547(var3, var3.field2916); // L: 63 - var2 -= var3.field2916; // L: 64 - } while(!this.superStream.method4419(var3, (int[])null, 0, var2)); // L: 65 + this.method4605(var3, var3.field2891); // L: 63 + var2 -= var3.field2891; // L: 64 + } while(!this.superStream.method4443(var3, (int[])null, 0, var2)); // L: 65 } } } // L: 70 + + @ObfuscatedName("f") + @ObfuscatedSignature( + descriptor = "(CB)C", + garbageValue = "-53" + ) + static char method4620(char var0) { + if (var0 == 198) { // L: 95 + return 'E'; + } else if (var0 == 230) { // L: 96 + return 'e'; + } else if (var0 == 223) { + return 's'; // L: 97 + } else if (var0 == 338) { // L: 98 + return 'E'; + } else { + return (char)(var0 == 339 ? 'e' : '\u0000'); // L: 99 100 + } + } } diff --git a/runescape-client/src/main/java/MusicTrack.java b/runescape-client/src/main/java/MusicTrack.java index 6d9062118f..8ff431ac0a 100644 --- a/runescape-client/src/main/java/MusicTrack.java +++ b/runescape-client/src/main/java/MusicTrack.java @@ -3,21 +3,21 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("it") +@ObfuscatedName("ie") @Implements("MusicTrack") public class MusicTrack extends Node { - @ObfuscatedName("h") + @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "Lmt;" + descriptor = "Lmd;" ) @Export("table") NodeHashTable table; - @ObfuscatedName("c") + @ObfuscatedName("n") @Export("midi") byte[] midi; @ObfuscatedSignature( - descriptor = "(Lnk;)V" + descriptor = "(Lnd;)V" ) MusicTrack(Buffer var1) { var1.offset = var1.array.length - 3; // L: 22 @@ -335,8 +335,8 @@ public class MusicTrack extends Node { } // L: 271 - @ObfuscatedName("c") - void method4562() { + @ObfuscatedName("n") + void method4622() { if (this.table == null) { // L: 274 this.table = new NodeHashTable(16); // L: 275 int[] var1 = new int[16]; // L: 276 @@ -416,18 +416,18 @@ public class MusicTrack extends Node { } } // L: 331 - @ObfuscatedName("o") + @ObfuscatedName("f") @Export("clear") void clear() { this.table = null; // L: 334 } // L: 335 - @ObfuscatedName("h") + @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "(Ljp;II)Lit;" + descriptor = "(Ljv;II)Lie;" ) @Export("readTrack") - static MusicTrack readTrack(AbstractArchive var0, int var1, int var2) { + public static MusicTrack readTrack(AbstractArchive var0, int var1, int var2) { byte[] var3 = var0.takeFile(var1, var2); // L: 16 return var3 == null ? null : new MusicTrack(new Buffer(var3)); // L: 17 } diff --git a/runescape-client/src/main/java/NPC.java b/runescape-client/src/main/java/NPC.java index 9292d26a60..0dc73eacf0 100644 --- a/runescape-client/src/main/java/NPC.java +++ b/runescape-client/src/main/java/NPC.java @@ -1,22 +1,14 @@ -import java.io.File; -import java.io.RandomAccessFile; import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ds") +@ObfuscatedName("db") @Implements("NPC") public final class NPC extends Actor { - @ObfuscatedName("x") + @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "Lit;" - ) - @Export("musicTrack") - static MusicTrack musicTrack; - @ObfuscatedName("h") - @ObfuscatedSignature( - descriptor = "Ley;" + descriptor = "Lef;" ) @Export("definition") NPCComposition definition; @@ -24,16 +16,16 @@ public final class NPC extends Actor { NPC() { } // L: 12 - @ObfuscatedName("h") + @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "(IBB)V", - garbageValue = "2" + descriptor = "(IBI)V", + garbageValue = "-300135840" ) - final void method2254(int var1, byte var2) { + final void method2259(int var1, byte var2) { int var3 = super.pathX[0]; // L: 15 - int var4 = super.pathY[0]; - if (var1 == 0) { - --var3; + int var4 = super.pathY[0]; // L: 16 + if (var1 == 0) { // L: 17 + --var3; // L: 18 ++var4; } @@ -41,22 +33,22 @@ public final class NPC extends Actor { ++var4; } - if (var1 == 2) { - ++var3; - ++var4; + if (var1 == 2) { // L: 22 + ++var3; // L: 23 + ++var4; // L: 24 } - if (var1 == 3) { + if (var1 == 3) { // L: 26 --var3; } - if (var1 == 4) { + if (var1 == 4) { // L: 27 ++var3; } - if (var1 == 5) { - --var3; - --var4; + if (var1 == 5) { // L: 28 + --var3; // L: 29 + --var4; // L: 30 } if (var1 == 6) { // L: 32 @@ -65,11 +57,11 @@ public final class NPC extends Actor { if (var1 == 7) { // L: 33 ++var3; // L: 34 - --var4; + --var4; // L: 35 } - if (super.sequence != -1 && Player.SequenceDefinition_get(super.sequence).field1882 == 1) { - super.sequence = -1; + if (super.sequence != -1 && LoginScreenAnimation.SequenceDefinition_get(super.sequence).field1890 == 1) { + super.sequence = -1; // L: 37 } if (super.pathLength < 9) { // L: 38 @@ -77,9 +69,9 @@ public final class NPC extends Actor { } for (int var5 = super.pathLength; var5 > 0; --var5) { // L: 39 - super.pathX[var5] = super.pathX[var5 - 1]; + super.pathX[var5] = super.pathX[var5 - 1]; // L: 40 super.pathY[var5] = super.pathY[var5 - 1]; // L: 41 - super.pathTraversed[var5] = super.pathTraversed[var5 - 1]; + super.pathTraversed[var5] = super.pathTraversed[var5 - 1]; // L: 42 } super.pathX[0] = var3; // L: 44 @@ -87,18 +79,18 @@ public final class NPC extends Actor { super.pathTraversed[0] = var2; // L: 46 } // L: 47 - @ObfuscatedName("c") + @ObfuscatedName("n") @ObfuscatedSignature( - descriptor = "(I)Lgj;", - garbageValue = "-220627570" + descriptor = "(B)Lgr;", + garbageValue = "-76" ) @Export("getModel") protected final Model getModel() { if (this.definition == null) { // L: 77 return null; } else { - SequenceDefinition var1 = super.sequence != -1 && super.sequenceDelay == 0 ? Player.SequenceDefinition_get(super.sequence) : null; // L: 78 - SequenceDefinition var2 = super.movementSequence == -1 || super.movementSequence == super.idleSequence && var1 != null ? null : Player.SequenceDefinition_get(super.movementSequence); // L: 79 + SequenceDefinition var1 = super.sequence != -1 && super.sequenceDelay == 0 ? LoginScreenAnimation.SequenceDefinition_get(super.sequence) : null; // L: 78 + SequenceDefinition var2 = super.movementSequence == -1 || super.idleSequence == super.movementSequence && var1 != null ? null : LoginScreenAnimation.SequenceDefinition_get(super.movementSequence); // L: 79 Model var3 = this.definition.getModel(var1, super.sequenceFrame, var2, super.movementFrame); // L: 80 if (var3 == null) { // L: 81 return null; @@ -106,9 +98,9 @@ public final class NPC extends Actor { var3.calculateBoundsCylinder(); // L: 82 super.defaultHeight = var3.height; // L: 83 if (super.spotAnimation != -1 && super.spotAnimationFrame != -1) { // L: 84 - Model var4 = Friend.SpotAnimationDefinition_get(super.spotAnimation).getModel(super.spotAnimationFrame); // L: 85 + Model var4 = VarcInt.SpotAnimationDefinition_get(super.spotAnimation).getModel(super.spotAnimationFrame); // L: 85 if (var4 != null) { // L: 86 - var4.offsetBy(0, -super.field1224, 0); // L: 87 + var4.offsetBy(0, -super.field1277, 0); // L: 87 Model[] var5 = new Model[]{var3, var4}; // L: 88 var3 = new Model(var5, 2); // L: 89 } @@ -123,13 +115,13 @@ public final class NPC extends Actor { } } - @ObfuscatedName("o") + @ObfuscatedName("f") @ObfuscatedSignature( descriptor = "(IIZI)V", - garbageValue = "137252857" + garbageValue = "-660093008" ) - final void method2267(int var1, int var2, boolean var3) { - if (super.sequence != -1 && Player.SequenceDefinition_get(super.sequence).field1882 == 1) { // L: 50 + final void method2260(int var1, int var2, boolean var3) { + if (super.sequence != -1 && LoginScreenAnimation.SequenceDefinition_get(super.sequence).field1890 == 1) { // L: 50 super.sequence = -1; } @@ -155,85 +147,46 @@ public final class NPC extends Actor { } super.pathLength = 0; // L: 67 - super.field1215 = 0; // L: 68 - super.field1250 = 0; // L: 69 + super.field1274 = 0; // L: 68 + super.field1294 = 0; // L: 69 super.pathX[0] = var1; // L: 70 super.pathY[0] = var2; // L: 71 - super.x = super.pathX[0] * 128 + super.field1211 * 64; // L: 72 - super.y = super.field1211 * 64 + super.pathY[0] * 128; // L: 73 + super.x = super.pathX[0] * 128 + super.field1239 * 64; // L: 72 + super.y = super.pathY[0] * 128 + super.field1239 * 64; // L: 73 } // L: 74 - @ObfuscatedName("d") + @ObfuscatedName("m") @ObfuscatedSignature( - descriptor = "(I)Z", - garbageValue = "-1701330496" + descriptor = "(B)Z", + garbageValue = "-6" ) @Export("isVisible") final boolean isVisible() { return this.definition != null; // L: 97 } - @ObfuscatedName("h") + @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "(I)[Lhk;", - garbageValue = "1337289345" + descriptor = "(II)Z", + garbageValue = "-785880631" ) - static LoginPacket[] method2253() { - return new LoginPacket[]{LoginPacket.field2803, LoginPacket.field2804, LoginPacket.field2798, LoginPacket.field2800, LoginPacket.field2801, LoginPacket.field2799}; + @Export("isWorldMapEvent") + public static boolean isWorldMapEvent(int var0) { + return var0 == 10 || var0 == 11 || var0 == 12 || var0 == 13 || var0 == 14 || var0 == 15 || var0 == 16 || var0 == 17; // L: 19 } - @ObfuscatedName("h") + @ObfuscatedName("jx") @ObfuscatedSignature( - descriptor = "(Ljava/lang/String;B)Ljava/io/File;", - garbageValue = "16" + descriptor = "(IB)Z", + garbageValue = "3" ) - @Export("getFile") - static File getFile(String var0) { - if (!FileSystem.FileSystem_hasPermissions) { // L: 16 - throw new RuntimeException(""); - } else { - File var1 = (File)FileSystem.FileSystem_cacheFiles.get(var0); - if (var1 != null) { - return var1; - } else { - File var2 = new File(FileSystem.FileSystem_cacheDir, var0); // L: 19 - RandomAccessFile var3 = null; // L: 20 - - try { - File var4 = new File(var2.getParent()); // L: 22 - if (!var4.exists()) { // L: 23 - throw new RuntimeException(""); - } else { - var3 = new RandomAccessFile(var2, "rw"); // L: 24 - int var5 = var3.read(); // L: 25 - var3.seek(0L); // L: 26 - var3.write(var5); // L: 27 - var3.seek(0L); // L: 28 - var3.close(); // L: 29 - FileSystem.FileSystem_cacheFiles.put(var0, var2); // L: 30 - return var2; // L: 31 - } - } catch (Exception var8) { - try { - if (var3 != null) { // L: 35 - var3.close(); // L: 36 - var3 = null; // L: 37 - } - } catch (Exception var7) { // L: 40 - } - - throw new RuntimeException(); // L: 42 - } + static boolean method2258(int var0) { + for (int var1 = 0; var1 < Client.field806; ++var1) { // L: 10652 + if (Client.field868[var1] == var0) { // L: 10653 + return true; } } - } - @ObfuscatedName("h") - @ObfuscatedSignature( - descriptor = "(Ljp;B)V", - garbageValue = "1" - ) - public static void method2266(AbstractArchive var0) { - InvDefinition.InvDefinition_archive = var0; // L: 17 - } // L: 18 + return false; // L: 10655 + } } diff --git a/runescape-client/src/main/java/NPCComposition.java b/runescape-client/src/main/java/NPCComposition.java index 9f4127e44e..64f524ee7f 100644 --- a/runescape-client/src/main/java/NPCComposition.java +++ b/runescape-client/src/main/java/NPCComposition.java @@ -3,193 +3,198 @@ 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("ey") +@ObfuscatedName("ef") @Implements("NPCComposition") public class NPCComposition extends DualNode { - @ObfuscatedName("h") + @ObfuscatedName("qn") @ObfuscatedSignature( - descriptor = "Ljp;" + descriptor = "Ll;" + ) + @Export("guestClanSettings") + static ClanSettings guestClanSettings; + @ObfuscatedName("v") + @ObfuscatedSignature( + descriptor = "Ljv;" ) @Export("NpcDefinition_archive") public static AbstractArchive NpcDefinition_archive; - @ObfuscatedName("c") + @ObfuscatedName("n") @ObfuscatedSignature( - descriptor = "Ljp;" + descriptor = "Ljv;" ) @Export("NpcDefinition_modelArchive") public static AbstractArchive NpcDefinition_modelArchive; - @ObfuscatedName("o") + @ObfuscatedName("f") @ObfuscatedSignature( - descriptor = "Lho;" + descriptor = "Lhz;" ) @Export("NpcDefinition_cached") - static EvictingDualNodeHashTable NpcDefinition_cached; - @ObfuscatedName("g") + public static EvictingDualNodeHashTable NpcDefinition_cached; + @ObfuscatedName("y") @ObfuscatedSignature( - descriptor = "Lho;" + descriptor = "Lhz;" ) @Export("NpcDefinition_cachedModels") - static EvictingDualNodeHashTable NpcDefinition_cachedModels; - @ObfuscatedName("jw") + public static EvictingDualNodeHashTable NpcDefinition_cachedModels; + @ObfuscatedName("gr") @ObfuscatedSignature( - descriptor = "Liv;" + descriptor = "Loh;" ) - @Export("hoveredItemContainer") - static Widget hoveredItemContainer; - @ObfuscatedName("l") + @Export("compass") + static SpritePixels compass; + @ObfuscatedName("p") @ObfuscatedGetter( - intValue = 1784023543 + intValue = -2060838679 ) @Export("id") public int id; - @ObfuscatedName("z") + @ObfuscatedName("j") @Export("name") public String name; - @ObfuscatedName("t") + @ObfuscatedName("r") @ObfuscatedGetter( - intValue = 1638336549 + intValue = 1748856001 ) @Export("size") public int size; - @ObfuscatedName("v") + @ObfuscatedName("b") @Export("models") int[] models; - @ObfuscatedName("b") - int[] field1642; - @ObfuscatedName("q") + @ObfuscatedName("d") + int[] field1638; + @ObfuscatedName("s") @ObfuscatedGetter( - intValue = 667265637 + intValue = 1310735685 ) @Export("idleSequence") public int idleSequence; - @ObfuscatedName("i") + @ObfuscatedName("u") @ObfuscatedGetter( - intValue = 436341475 + intValue = 1743545491 ) @Export("turnLeftSequence") public int turnLeftSequence; - @ObfuscatedName("x") + @ObfuscatedName("l") @ObfuscatedGetter( - intValue = 1285622519 + intValue = -1143137827 ) @Export("turnRightSequence") public int turnRightSequence; - @ObfuscatedName("k") + @ObfuscatedName("o") @ObfuscatedGetter( - intValue = -1275856501 + intValue = -1881319333 ) @Export("walkSequence") public int walkSequence; - @ObfuscatedName("r") + @ObfuscatedName("c") @ObfuscatedGetter( - intValue = 736514543 + intValue = -2006031471 ) @Export("walkBackSequence") public int walkBackSequence; - @ObfuscatedName("p") + @ObfuscatedName("e") @ObfuscatedGetter( - intValue = -72987535 + intValue = -1692683489 ) @Export("walkLeftSequence") public int walkLeftSequence; - @ObfuscatedName("a") + @ObfuscatedName("g") @ObfuscatedGetter( - intValue = 1373331391 + intValue = -1089328917 ) @Export("walkRightSequence") public int walkRightSequence; - @ObfuscatedName("e") + @ObfuscatedName("a") @Export("recolorFrom") short[] recolorFrom; - @ObfuscatedName("d") + @ObfuscatedName("k") @Export("recolorTo") short[] recolorTo; - @ObfuscatedName("u") + @ObfuscatedName("m") @Export("retextureFrom") short[] retextureFrom; - @ObfuscatedName("m") + @ObfuscatedName("x") @Export("retextureTo") short[] retextureTo; - @ObfuscatedName("j") + @ObfuscatedName("z") @Export("actions") public String[] actions; - @ObfuscatedName("f") + @ObfuscatedName("w") @Export("drawMapDot") public boolean drawMapDot; - @ObfuscatedName("s") + @ObfuscatedName("t") @ObfuscatedGetter( - intValue = 212636383 + intValue = -427478981 ) @Export("combatLevel") public int combatLevel; - @ObfuscatedName("y") + @ObfuscatedName("h") @ObfuscatedGetter( - intValue = 2045757013 + intValue = 1078672503 ) @Export("widthScale") int widthScale; - @ObfuscatedName("w") + @ObfuscatedName("q") @ObfuscatedGetter( - intValue = -139544959 + intValue = -1467757175 ) @Export("heightScale") int heightScale; - @ObfuscatedName("n") + @ObfuscatedName("i") @Export("isVisible") public boolean isVisible; - @ObfuscatedName("ag") + @ObfuscatedName("ae") @ObfuscatedGetter( - intValue = -466195845 + intValue = 2079488611 ) @Export("ambient") int ambient; - @ObfuscatedName("ae") + @ObfuscatedName("ap") @ObfuscatedGetter( - intValue = 1035732171 + intValue = 1867659125 ) @Export("contrast") int contrast; - @ObfuscatedName("ao") + @ObfuscatedName("ab") @ObfuscatedGetter( - intValue = -879137791 + intValue = 1099409813 ) @Export("headIconPrayer") public int headIconPrayer; - @ObfuscatedName("aj") + @ObfuscatedName("al") @ObfuscatedGetter( - intValue = 1545649603 + intValue = -729878735 ) @Export("rotation") public int rotation; - @ObfuscatedName("aw") + @ObfuscatedName("ad") @Export("transforms") public int[] transforms; - @ObfuscatedName("at") + @ObfuscatedName("ai") @ObfuscatedGetter( - intValue = 1245131695 + intValue = -17335253 ) @Export("transformVarbit") int transformVarbit; - @ObfuscatedName("av") + @ObfuscatedName("ar") @ObfuscatedGetter( - intValue = 709359433 + intValue = -1483491067 ) @Export("transformVarp") int transformVarp; - @ObfuscatedName("al") + @ObfuscatedName("ag") @Export("isInteractable") public boolean isInteractable; - @ObfuscatedName("ap") + @ObfuscatedName("ax") @Export("isClickable") public boolean isClickable; - @ObfuscatedName("am") + @ObfuscatedName("as") @Export("isFollower") public boolean isFollower; - @ObfuscatedName("ax") + @ObfuscatedName("aj") @ObfuscatedSignature( - descriptor = "Lmo;" + descriptor = "Lmr;" ) @Export("params") IterableNodeHashTable params; @@ -226,19 +231,19 @@ public class NPCComposition extends DualNode { this.isFollower = false; // L: 51 } // L: 54 - @ObfuscatedName("c") + @ObfuscatedName("n") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "575744744" + garbageValue = "-260686681" ) @Export("postDecode") void postDecode() { } // L: 68 - @ObfuscatedName("o") + @ObfuscatedName("f") @ObfuscatedSignature( - descriptor = "(Lnk;I)V", - garbageValue = "-516960834" + descriptor = "(Lnd;I)V", + garbageValue = "1170104499" ) @Export("decode") void decode(Buffer var1) { @@ -252,10 +257,10 @@ public class NPCComposition extends DualNode { } } - @ObfuscatedName("g") + @ObfuscatedName("y") @ObfuscatedSignature( - descriptor = "(Lnk;II)V", - garbageValue = "-1956707108" + descriptor = "(Lnd;IB)V", + garbageValue = "-16" ) @Export("decodeNext") void decodeNext(Buffer var1, int var2) { @@ -312,10 +317,10 @@ public class NPCComposition extends DualNode { } } else if (var2 == 60) { // L: 121 var3 = var1.readUnsignedByte(); // L: 122 - this.field1642 = new int[var3]; // L: 123 + this.field1638 = new int[var3]; // L: 123 for (var4 = 0; var4 < var3; ++var4) { // L: 124 - this.field1642[var4] = var1.readUnsignedShort(); + this.field1638[var4] = var1.readUnsignedShort(); } } else if (var2 == 93) { // L: 126 this.drawMapDot = false; @@ -343,12 +348,12 @@ public class NPCComposition extends DualNode { } else if (var2 == 111) { // L: 155 this.isFollower = true; } else if (var2 == 249) { // L: 156 - this.params = HealthBar.readStringIntParameters(var1, this.params); + this.params = ModeWhere.readStringIntParameters(var1, this.params); } } else { this.transformVarbit = var1.readUnsignedShort(); // L: 136 - if (this.transformVarbit == 65535) { - this.transformVarbit = -1; // L: 137 + if (this.transformVarbit == 65535) { // L: 137 + this.transformVarbit = -1; } this.transformVarp = var1.readUnsignedShort(); // L: 138 @@ -379,10 +384,10 @@ public class NPCComposition extends DualNode { } // L: 158 - @ObfuscatedName("l") + @ObfuscatedName("p") @ObfuscatedSignature( - descriptor = "(Lfb;ILfb;II)Lgj;", - garbageValue = "1245322712" + descriptor = "(Lfl;ILfl;II)Lgr;", + garbageValue = "-26460885" ) @Export("getModel") public final Model getModel(SequenceDefinition var1, int var2, SequenceDefinition var3, int var4) { @@ -453,23 +458,23 @@ public class NPCComposition extends DualNode { } } - @ObfuscatedName("z") + @ObfuscatedName("j") @ObfuscatedSignature( - descriptor = "(I)Lgk;", - garbageValue = "-45308681" + descriptor = "(S)Lgm;", + garbageValue = "7106" ) @Export("getModelData") public final ModelData getModelData() { if (this.transforms != null) { // L: 199 NPCComposition var7 = this.transform(); // L: 200 return var7 == null ? null : var7.getModelData(); // L: 201 202 - } else if (this.field1642 == null) { // L: 204 + } else if (this.field1638 == null) { // L: 204 return null; } else { boolean var1 = false; // L: 205 - for (int var2 = 0; var2 < this.field1642.length; ++var2) { // L: 206 - if (!NpcDefinition_modelArchive.tryLoadFile(this.field1642[var2], 0)) { + for (int var2 = 0; var2 < this.field1638.length; ++var2) { // L: 206 + if (!NpcDefinition_modelArchive.tryLoadFile(this.field1638[var2], 0)) { var1 = true; } } @@ -477,10 +482,10 @@ public class NPCComposition extends DualNode { if (var1) { // L: 207 return null; } else { - ModelData[] var5 = new ModelData[this.field1642.length]; // L: 208 + ModelData[] var5 = new ModelData[this.field1638.length]; // L: 208 - for (int var3 = 0; var3 < this.field1642.length; ++var3) { // L: 209 - var5[var3] = ModelData.ModelData_get(NpcDefinition_modelArchive, this.field1642[var3], 0); + for (int var3 = 0; var3 < this.field1638.length; ++var3) { // L: 209 + var5[var3] = ModelData.ModelData_get(NpcDefinition_modelArchive, this.field1638[var3], 0); } ModelData var6; @@ -508,16 +513,16 @@ public class NPCComposition extends DualNode { } } - @ObfuscatedName("t") + @ObfuscatedName("r") @ObfuscatedSignature( - descriptor = "(I)Ley;", - garbageValue = "-475318325" + descriptor = "(B)Lef;", + garbageValue = "5" ) @Export("transform") public final NPCComposition transform() { int var1 = -1; // L: 227 if (this.transformVarbit != -1) { // L: 228 - var1 = ObjectComposition.getVarbit(this.transformVarbit); + var1 = Skeleton.getVarbit(this.transformVarbit); } else if (this.transformVarp != -1) { // L: 229 var1 = Varps.Varps_main[this.transformVarp]; } @@ -529,13 +534,13 @@ public class NPCComposition extends DualNode { var2 = this.transforms[this.transforms.length - 1]; } - return var2 != -1 ? class8.getNpcDefinition(var2) : null; // L: 233 234 + return var2 != -1 ? StructComposition.getNpcDefinition(var2) : null; // L: 233 234 } - @ObfuscatedName("v") + @ObfuscatedName("b") @ObfuscatedSignature( descriptor = "(I)Z", - garbageValue = "-903840231" + garbageValue = "-1279569027" ) @Export("transformIsVisible") public boolean transformIsVisible() { @@ -544,7 +549,7 @@ public class NPCComposition extends DualNode { } else { int var1 = -1; // L: 239 if (this.transformVarbit != -1) { // L: 240 - var1 = ObjectComposition.getVarbit(this.transformVarbit); + var1 = Skeleton.getVarbit(this.transformVarbit); } else if (this.transformVarp != -1) { // L: 241 var1 = Varps.Varps_main[this.transformVarp]; } @@ -557,169 +562,63 @@ public class NPCComposition extends DualNode { } } - @ObfuscatedName("b") + @ObfuscatedName("d") @ObfuscatedSignature( descriptor = "(III)I", - garbageValue = "1401953801" + garbageValue = "506916452" ) @Export("getIntParam") public int getIntParam(int var1, int var2) { - return GraphicsObject.method1937(this.params, var1, var2); // L: 247 + return SecureRandomFuture.method1977(this.params, var1, var2); // L: 247 } - @ObfuscatedName("q") + @ObfuscatedName("s") @ObfuscatedSignature( descriptor = "(ILjava/lang/String;I)Ljava/lang/String;", - garbageValue = "1650549866" + garbageValue = "-614305753" ) @Export("getStringParam") public String getStringParam(int var1, String var2) { - return Varcs.method2326(this.params, var1, var2); // L: 251 + return FriendsList.method5650(this.params, var1, var2); // L: 251 } - @ObfuscatedName("ao") + @ObfuscatedName("kb") @ObfuscatedSignature( - descriptor = "(ILci;ZI)I", - garbageValue = "2096258072" + descriptor = "(Ljava/lang/String;S)V", + garbageValue = "-1922" ) - static int method2744(int var0, Script var1, boolean var2) { - int var3; - if (var0 == ScriptOpcodes.STOCKMARKET_GETOFFERTYPE) { // L: 2604 - var3 = Interpreter.Interpreter_intStack[--WorldMapCacheName.Interpreter_intStackSize]; // L: 2605 - Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = Client.grandExchangeOffers[var3].type(); // L: 2606 - return 1; // L: 2607 - } else if (var0 == ScriptOpcodes.STOCKMARKET_GETOFFERITEM) { // L: 2609 - var3 = Interpreter.Interpreter_intStack[--WorldMapCacheName.Interpreter_intStackSize]; // L: 2610 - Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = Client.grandExchangeOffers[var3].id; // L: 2611 - return 1; // L: 2612 - } else if (var0 == ScriptOpcodes.STOCKMARKET_GETOFFERPRICE) { // L: 2614 - var3 = Interpreter.Interpreter_intStack[--WorldMapCacheName.Interpreter_intStackSize]; // L: 2615 - Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = Client.grandExchangeOffers[var3].unitPrice; // L: 2616 - return 1; // L: 2617 - } else if (var0 == ScriptOpcodes.STOCKMARKET_GETOFFERCOUNT) { // L: 2619 - var3 = Interpreter.Interpreter_intStack[--WorldMapCacheName.Interpreter_intStackSize]; // L: 2620 - Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = Client.grandExchangeOffers[var3].totalQuantity; // L: 2621 - return 1; // L: 2622 - } else if (var0 == ScriptOpcodes.STOCKMARKET_GETOFFERCOMPLETEDCOUNT) { // L: 2624 - var3 = Interpreter.Interpreter_intStack[--WorldMapCacheName.Interpreter_intStackSize]; // L: 2625 - Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = Client.grandExchangeOffers[var3].currentQuantity; // L: 2626 - return 1; // L: 2627 - } else if (var0 == ScriptOpcodes.STOCKMARKET_GETOFFERCOMPLETEDGOLD) { // L: 2629 - var3 = Interpreter.Interpreter_intStack[--WorldMapCacheName.Interpreter_intStackSize]; // L: 2630 - Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = Client.grandExchangeOffers[var3].currentPrice; // L: 2631 - return 1; // L: 2632 - } else { - int var13; - if (var0 == ScriptOpcodes.STOCKMARKET_ISOFFEREMPTY) { // L: 2634 - var3 = Interpreter.Interpreter_intStack[--WorldMapCacheName.Interpreter_intStackSize]; // L: 2635 - var13 = Client.grandExchangeOffers[var3].status(); // L: 2636 - Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = var13 == 0 ? 1 : 0; // L: 2637 - return 1; // L: 2638 - } else if (var0 == ScriptOpcodes.STOCKMARKET_ISOFFERSTABLE) { // L: 2640 - var3 = Interpreter.Interpreter_intStack[--WorldMapCacheName.Interpreter_intStackSize]; // L: 2641 - var13 = Client.grandExchangeOffers[var3].status(); // L: 2642 - Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = var13 == 2 ? 1 : 0; // L: 2643 - return 1; // L: 2644 - } else if (var0 == ScriptOpcodes.STOCKMARKET_ISOFFERFINISHED) { // L: 2646 - var3 = Interpreter.Interpreter_intStack[--WorldMapCacheName.Interpreter_intStackSize]; // L: 2647 - var13 = Client.grandExchangeOffers[var3].status(); // L: 2648 - Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = var13 == 5 ? 1 : 0; // L: 2649 - return 1; // L: 2650 - } else if (var0 == ScriptOpcodes.STOCKMARKET_ISOFFERADDING) { // L: 2652 - var3 = Interpreter.Interpreter_intStack[--WorldMapCacheName.Interpreter_intStackSize]; // L: 2653 - var13 = Client.grandExchangeOffers[var3].status(); // L: 2654 - Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = var13 == 1 ? 1 : 0; // L: 2655 - return 1; // L: 2656 - } else { - boolean var12; - if (var0 == ScriptOpcodes.TRADINGPOST_SORTBY_NAME) { // L: 2658 - var12 = Interpreter.Interpreter_intStack[--WorldMapCacheName.Interpreter_intStackSize] == 1; // L: 2659 - if (class29.grandExchangeEvents != null) { // L: 2660 - class29.grandExchangeEvents.sort(GrandExchangeEvents.GrandExchangeEvents_nameComparator, var12); // L: 2661 - } - - return 1; // L: 2663 - } else if (var0 == ScriptOpcodes.TRADINGPOST_SORTBY_PRICE) { // L: 2665 - var12 = Interpreter.Interpreter_intStack[--WorldMapCacheName.Interpreter_intStackSize] == 1; // L: 2666 - if (class29.grandExchangeEvents != null) { // L: 2667 - class29.grandExchangeEvents.sort(GrandExchangeEvents.GrandExchangeEvents_priceComparator, var12); // L: 2668 - } - - return 1; // L: 2670 - } else if (var0 == ScriptOpcodes.TRADINGPOST_SORTFILTERBY_WORLD) { // L: 2672 - WorldMapCacheName.Interpreter_intStackSize -= 2; // L: 2673 - var12 = Interpreter.Interpreter_intStack[WorldMapCacheName.Interpreter_intStackSize] == 1; // L: 2674 - boolean var11 = Interpreter.Interpreter_intStack[WorldMapCacheName.Interpreter_intStackSize + 1] == 1; // L: 2675 - if (class29.grandExchangeEvents != null) { // L: 2676 - Client.GrandExchangeEvents_worldComparator.filterWorlds = var11; // L: 2677 - class29.grandExchangeEvents.sort(Client.GrandExchangeEvents_worldComparator, var12); // L: 2678 - } - - return 1; // L: 2680 - } else if (var0 == ScriptOpcodes.TRADINGPOST_SORTBY_AGE) { // L: 2682 - var12 = Interpreter.Interpreter_intStack[--WorldMapCacheName.Interpreter_intStackSize] == 1; // L: 2683 - if (class29.grandExchangeEvents != null) { // L: 2684 - class29.grandExchangeEvents.sort(GrandExchangeEvents.GrandExchangeEvents_ageComparator, var12); // L: 2685 - } - - return 1; // L: 2687 - } else if (var0 == ScriptOpcodes.TRADINGPOST_SORTBY_COUNT) { // L: 2689 - var12 = Interpreter.Interpreter_intStack[--WorldMapCacheName.Interpreter_intStackSize] == 1; // L: 2690 - if (class29.grandExchangeEvents != null) { // L: 2691 - class29.grandExchangeEvents.sort(GrandExchangeEvents.GrandExchangeEvents_quantityComparator, var12); // L: 2692 - } - - return 1; // L: 2694 - } else if (var0 == ScriptOpcodes.TRADINGPOST_GETTOTALOFFERS) { // L: 2696 - Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = class29.grandExchangeEvents == null ? 0 : class29.grandExchangeEvents.events.size(); // L: 2697 - return 1; // L: 2698 - } else { - GrandExchangeEvent var4; - if (var0 == ScriptOpcodes.TRADINGPOST_GETOFFERWORLD) { // L: 2700 - var3 = Interpreter.Interpreter_intStack[--WorldMapCacheName.Interpreter_intStackSize]; // L: 2701 - var4 = (GrandExchangeEvent)class29.grandExchangeEvents.events.get(var3); // L: 2702 - Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = var4.world; // L: 2703 - return 1; // L: 2704 - } else if (var0 == ScriptOpcodes.TRADINGPOST_GETOFFERNAME) { // L: 2706 - var3 = Interpreter.Interpreter_intStack[--WorldMapCacheName.Interpreter_intStackSize]; // L: 2707 - var4 = (GrandExchangeEvent)class29.grandExchangeEvents.events.get(var3); // L: 2708 - Interpreter.Interpreter_stringStack[++class13.Interpreter_stringStackSize - 1] = var4.getOfferName(); // L: 2709 - return 1; // L: 2710 - } else if (var0 == ScriptOpcodes.TRADINGPOST_GETOFFERPREVIOUSNAME) { // L: 2712 - var3 = Interpreter.Interpreter_intStack[--WorldMapCacheName.Interpreter_intStackSize]; // L: 2713 - var4 = (GrandExchangeEvent)class29.grandExchangeEvents.events.get(var3); // L: 2714 - Interpreter.Interpreter_stringStack[++class13.Interpreter_stringStackSize - 1] = var4.getPreviousOfferName(); // L: 2715 - return 1; // L: 2716 - } else if (var0 == ScriptOpcodes.TRADINGPOST_GETOFFERAGE) { // L: 2718 - var3 = Interpreter.Interpreter_intStack[--WorldMapCacheName.Interpreter_intStackSize]; // L: 2719 - var4 = (GrandExchangeEvent)class29.grandExchangeEvents.events.get(var3); // L: 2720 - long var5 = Archive.currentTimeMillis() - ChatChannel.field1081 - var4.age; // L: 2721 - int var7 = (int)(var5 / 3600000L); // L: 2722 - int var8 = (int)((var5 - (long)(var7 * 3600000)) / 60000L); // L: 2723 - int var9 = (int)((var5 - (long)(var7 * 3600000) - (long)(var8 * 60000)) / 1000L); // L: 2724 - String var10 = var7 + ":" + var8 / 10 + var8 % 10 + ":" + var9 / 10 + var9 % 10; // L: 2725 - Interpreter.Interpreter_stringStack[++class13.Interpreter_stringStackSize - 1] = var10; // L: 2726 - return 1; // L: 2727 - } else if (var0 == ScriptOpcodes.TRADINGPOST_GETOFFERCOUNT) { // L: 2729 - var3 = Interpreter.Interpreter_intStack[--WorldMapCacheName.Interpreter_intStackSize]; // L: 2730 - var4 = (GrandExchangeEvent)class29.grandExchangeEvents.events.get(var3); // L: 2731 - Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = var4.grandExchangeOffer.totalQuantity; // L: 2732 - return 1; // L: 2733 - } else if (var0 == ScriptOpcodes.TRADINGPOST_GETOFFERPRICE) { // L: 2735 - var3 = Interpreter.Interpreter_intStack[--WorldMapCacheName.Interpreter_intStackSize]; // L: 2736 - var4 = (GrandExchangeEvent)class29.grandExchangeEvents.events.get(var3); // L: 2737 - Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = var4.grandExchangeOffer.unitPrice; // L: 2738 - return 1; // L: 2739 - } else if (var0 == ScriptOpcodes.TRADINGPOST_GETOFFERITEM) { // L: 2741 - var3 = Interpreter.Interpreter_intStack[--WorldMapCacheName.Interpreter_intStackSize]; // L: 2742 - var4 = (GrandExchangeEvent)class29.grandExchangeEvents.events.get(var3); // L: 2743 - Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = var4.grandExchangeOffer.id; // L: 2744 - return 1; // L: 2745 - } else { - return 2; // L: 2747 - } - } - } + @Export("Clan_joinChat") + static final void Clan_joinChat(String var0) { + if (!var0.equals("")) { // L: 11298 + PacketBufferNode var1 = class21.getPacketBufferNode(ClientPacket.field2574, Client.packetWriter.isaacCipher); // L: 11300 + var1.packetBuffer.writeByte(Tiles.stringCp1252NullTerminatedByteSize(var0)); // L: 11301 + var1.packetBuffer.writeStringCp1252NullTerminated(var0); // L: 11302 + Client.packetWriter.addNode(var1); // L: 11303 } - } + } // L: 11304 + + @ObfuscatedName("lu") + @ObfuscatedSignature( + descriptor = "(I)V", + garbageValue = "-1165253281" + ) + static void method2791() { + if (Client.field724 && class93.localPlayer != null) { // L: 11510 + int var0 = class93.localPlayer.pathX[0]; // L: 11511 + int var1 = class93.localPlayer.pathY[0]; // L: 11512 + if (var0 < 0 || var1 < 0 || var0 >= 104 || var1 >= 104) { // L: 11513 + return; + } + + RouteStrategy.oculusOrbFocalPointX = class93.localPlayer.x; // L: 11514 + int var2 = class105.getTileHeight(class93.localPlayer.x, class93.localPlayer.y, class22.Client_plane) - Client.camFollowHeight; // L: 11515 + if (var2 < class17.field148) { // L: 11516 + class17.field148 = var2; + } + + ModelData0.oculusOrbFocalPointY = class93.localPlayer.y; // L: 11517 + Client.field724 = false; // L: 11518 + } + + } // L: 11520 } diff --git a/runescape-client/src/main/java/NanoClock.java b/runescape-client/src/main/java/NanoClock.java index 61554bfe28..0ce8b0ee56 100644 --- a/runescape-client/src/main/java/NanoClock.java +++ b/runescape-client/src/main/java/NanoClock.java @@ -4,34 +4,34 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("dx") +@ObfuscatedName("de") @Implements("NanoClock") public class NanoClock extends Clock { - @ObfuscatedName("h") + @ObfuscatedName("v") @ObfuscatedGetter( - longValue = -6431087590291668695L + longValue = -87747295156547195L ) @Export("lastTimeNano") long lastTimeNano; - NanoClock() { + public NanoClock() { this.lastTimeNano = System.nanoTime(); // L: 10 } // L: 11 - @ObfuscatedName("h") + @ObfuscatedName("v") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "2109522039" + garbageValue = "-1887937791" ) @Export("mark") public void mark() { this.lastTimeNano = System.nanoTime(); // L: 14 } // L: 15 - @ObfuscatedName("c") + @ObfuscatedName("n") @ObfuscatedSignature( descriptor = "(III)I", - garbageValue = "665432073" + garbageValue = "-1841090229" ) @Export("wait") public int wait(int var1, int var2) { @@ -41,18 +41,40 @@ public class NanoClock extends Clock { var5 = var3; } - UrlRequest.sleepExact(var5 / 1000000L); // L: 21 - long var7 = System.nanoTime(); // L: 22 + long var7 = var5 / 1000000L; // L: 21 + long var9; + if (var7 > 0L) { // L: 23 + if (var7 % 10L == 0L) { // L: 24 + var9 = var7 - 1L; // L: 25 - int var9; - for (var9 = 0; var9 < 10 && (var9 < 1 || this.lastTimeNano < var7); this.lastTimeNano += 1000000L * (long)var1) { // L: 23 24 26 - ++var9; // L: 25 + try { + Thread.sleep(var9); // L: 28 + } catch (InterruptedException var16) { // L: 30 + } + + try { + Thread.sleep(1L); // L: 34 + } catch (InterruptedException var15) { // L: 36 + } + } else { + try { + Thread.sleep(var7); // L: 41 + } catch (InterruptedException var14) { // L: 43 + } + } } - if (this.lastTimeNano < var7) { // L: 28 - this.lastTimeNano = var7; + var9 = System.nanoTime(); // L: 46 + + int var13; + for (var13 = 0; var13 < 10 && (var13 < 1 || this.lastTimeNano < var9); this.lastTimeNano += 1000000L * (long)var1) { // L: 47 48 50 + ++var13; // L: 49 } - return var9; // L: 29 + if (this.lastTimeNano < var9) { // L: 52 + this.lastTimeNano = var9; + } + + return var13; // L: 53 } } diff --git a/runescape-client/src/main/java/NetCache.java b/runescape-client/src/main/java/NetCache.java index b9691c78d2..09fe12cf87 100644 --- a/runescape-client/src/main/java/NetCache.java +++ b/runescape-client/src/main/java/NetCache.java @@ -5,115 +5,115 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ju") +@ObfuscatedName("jx") @Implements("NetCache") public class NetCache { - @ObfuscatedName("h") + @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "Llc;" + descriptor = "Lls;" ) @Export("NetCache_socket") public static AbstractSocket NetCache_socket; - @ObfuscatedName("c") + @ObfuscatedName("n") @ObfuscatedGetter( - intValue = 1338905363 + intValue = 356448421 ) @Export("NetCache_loadTime") - static int NetCache_loadTime; - @ObfuscatedName("g") + public static int NetCache_loadTime; + @ObfuscatedName("y") @ObfuscatedSignature( - descriptor = "Lmt;" + descriptor = "Lmd;" ) @Export("NetCache_pendingPriorityWrites") - static NodeHashTable NetCache_pendingPriorityWrites; - @ObfuscatedName("l") + public static NodeHashTable NetCache_pendingPriorityWrites; + @ObfuscatedName("p") @ObfuscatedGetter( - intValue = -1273441533 + intValue = -1204808007 ) @Export("NetCache_pendingPriorityWritesCount") public static int NetCache_pendingPriorityWritesCount; - @ObfuscatedName("z") + @ObfuscatedName("j") @ObfuscatedSignature( - descriptor = "Lmt;" + descriptor = "Lmd;" ) @Export("NetCache_pendingPriorityResponses") - static NodeHashTable NetCache_pendingPriorityResponses; - @ObfuscatedName("t") + public static NodeHashTable NetCache_pendingPriorityResponses; + @ObfuscatedName("r") @ObfuscatedGetter( - intValue = -550422443 + intValue = 317801023 ) @Export("NetCache_pendingPriorityResponsesCount") public static int NetCache_pendingPriorityResponsesCount; - @ObfuscatedName("v") - @ObfuscatedSignature( - descriptor = "Lkz;" - ) - @Export("NetCache_pendingWritesQueue") - static DualNodeDeque NetCache_pendingWritesQueue; @ObfuscatedName("b") @ObfuscatedSignature( - descriptor = "Lmt;" + descriptor = "Lka;" + ) + @Export("NetCache_pendingWritesQueue") + public static DualNodeDeque NetCache_pendingWritesQueue; + @ObfuscatedName("d") + @ObfuscatedSignature( + descriptor = "Lmd;" ) @Export("NetCache_pendingWrites") - static NodeHashTable NetCache_pendingWrites; - @ObfuscatedName("q") + public static NodeHashTable NetCache_pendingWrites; + @ObfuscatedName("s") @ObfuscatedGetter( - intValue = 417611781 + intValue = -2006204735 ) @Export("NetCache_pendingWritesCount") public static int NetCache_pendingWritesCount; - @ObfuscatedName("i") + @ObfuscatedName("u") @ObfuscatedSignature( - descriptor = "Lmt;" + descriptor = "Lmd;" ) @Export("NetCache_pendingResponses") - static NodeHashTable NetCache_pendingResponses; - @ObfuscatedName("x") + public static NodeHashTable NetCache_pendingResponses; + @ObfuscatedName("l") @ObfuscatedGetter( - intValue = -2053891301 + intValue = -1362666837 ) @Export("NetCache_pendingResponsesCount") public static int NetCache_pendingResponsesCount; - @ObfuscatedName("p") + @ObfuscatedName("e") @ObfuscatedSignature( - descriptor = "Lnk;" + descriptor = "Lnd;" ) @Export("NetCache_responseHeaderBuffer") - static Buffer NetCache_responseHeaderBuffer; + public static Buffer NetCache_responseHeaderBuffer; @ObfuscatedName("a") - @ObfuscatedSignature( - descriptor = "Lnk;" - ) - @Export("NetCache_responseArchiveBuffer") - static Buffer NetCache_responseArchiveBuffer; - @ObfuscatedName("e") @ObfuscatedGetter( - intValue = 1088927211 + intValue = -288041073 ) - static int field3626; - @ObfuscatedName("u") + public static int field3612; + @ObfuscatedName("m") @Export("NetCache_crc") - static CRC32 NetCache_crc; - @ObfuscatedName("j") + public static CRC32 NetCache_crc; + @ObfuscatedName("z") @ObfuscatedSignature( - descriptor = "[Lji;" + descriptor = "[Ljp;" ) @Export("NetCache_archives") - static Archive[] NetCache_archives; - @ObfuscatedName("f") - static byte field3629; - @ObfuscatedName("s") + public static Archive[] NetCache_archives; + @ObfuscatedName("w") + public static byte field3607; + @ObfuscatedName("t") @ObfuscatedGetter( - intValue = 1574278149 + intValue = -1063840627 ) @Export("NetCache_crcMismatches") public static int NetCache_crcMismatches; - @ObfuscatedName("y") + @ObfuscatedName("h") @ObfuscatedGetter( - intValue = 101288901 + intValue = 1965429235 ) @Export("NetCache_ioExceptions") public static int NetCache_ioExceptions; + @ObfuscatedName("dd") + @ObfuscatedSignature( + descriptor = "Ljp;" + ) + @Export("archive0") + static Archive archive0; static { NetCache_loadTime = 0; // L: 13 @@ -127,26 +127,170 @@ public class NetCache { NetCache_pendingResponses = new NodeHashTable(4096); // L: 22 NetCache_pendingResponsesCount = 0; // L: 23 NetCache_responseHeaderBuffer = new Buffer(8); // L: 26 - field3626 = 0; // L: 28 + field3612 = 0; // L: 28 NetCache_crc = new CRC32(); // L: 30 NetCache_archives = new Archive[256]; // L: 32 - field3629 = 0; // L: 33 + field3607 = 0; // L: 33 NetCache_crcMismatches = 0; // L: 34 NetCache_ioExceptions = 0; // L: 35 } - @ObfuscatedName("b") + @ObfuscatedName("gc") @ObfuscatedSignature( - descriptor = "(IB)I", - garbageValue = "8" + descriptor = "(IIIII)V", + garbageValue = "1592550546" ) - @Export("Messages_getLastChatID") - static int Messages_getLastChatID(int var0) { - Message var1 = (Message)Messages.Messages_hashTable.get((long)var0); // L: 73 - if (var1 == null) { // L: 74 - return -1; - } else { - return var1.previousDual == Messages.Messages_queue.sentinel ? -1 : ((Message)var1.previousDual).count; // L: 75 76 + static final void method5025(int var0, int var1, int var2, int var3) { + Client.overheadTextCount = 0; // L: 4886 + boolean var4 = false; // L: 4887 + int var5 = -1; // L: 4888 + int var6 = -1; // L: 4889 + int var7 = Players.Players_count; // L: 4890 + int[] var8 = Players.Players_indices; // L: 4891 + + int var9; + for (var9 = 0; var9 < var7 + Client.npcCount; ++var9) { // L: 4892 + Object var20; + if (var9 < var7) { // L: 4894 + var20 = Client.players[var8[var9]]; // L: 4895 + if (var8[var9] == Client.combatTargetPlayerIndex) { // L: 4896 + var4 = true; // L: 4897 + var5 = var9; // L: 4898 + continue; + } + + if (var20 == class93.localPlayer) { // L: 4901 + var6 = var9; // L: 4902 + continue; // L: 4903 + } + } else { + var20 = Client.npcs[Client.npcIndices[var9 - var7]]; // L: 4906 + } + + Ignored.drawActor2d((Actor)var20, var9, var0, var1, var2, var3); // L: 4907 } - } + + if (Client.renderSelf && var6 != -1) { // L: 4909 + Ignored.drawActor2d(class93.localPlayer, var6, var0, var1, var2, var3); // L: 4910 + } + + if (var4) { // L: 4912 + Ignored.drawActor2d(Client.players[Client.combatTargetPlayerIndex], var5, var0, var1, var2, var3); // L: 4913 + } + + for (var9 = 0; var9 < Client.overheadTextCount; ++var9) { // L: 4915 + int var10 = Client.overheadTextXs[var9]; // L: 4916 + int var11 = Client.overheadTextYs[var9]; // L: 4917 + int var12 = Client.overheadTextXOffsets[var9]; // L: 4918 + int var13 = Client.overheadTextAscents[var9]; // L: 4919 + boolean var14 = true; // L: 4920 + + while (var14) { + var14 = false; // L: 4922 + + for (int var19 = 0; var19 < var9; ++var19) { // L: 4923 + if (var11 + 2 > Client.overheadTextYs[var19] - Client.overheadTextAscents[var19] && var11 - var13 < Client.overheadTextYs[var19] + 2 && var10 - var12 < Client.overheadTextXs[var19] + Client.overheadTextXOffsets[var19] && var12 + var10 > Client.overheadTextXs[var19] - Client.overheadTextXOffsets[var19] && Client.overheadTextYs[var19] - Client.overheadTextAscents[var19] < var11) { // L: 4924 4925 + var11 = Client.overheadTextYs[var19] - Client.overheadTextAscents[var19]; // L: 4926 + var14 = true; // L: 4927 + } + } + } + + Client.viewportTempX = Client.overheadTextXs[var9]; // L: 4932 + Client.viewportTempY = Client.overheadTextYs[var9] = var11; // L: 4933 + String var15 = Client.overheadText[var9]; // L: 4934 + if (Client.chatEffects == 0) { // L: 4935 + int var16 = 16776960; // L: 4936 + if (Client.overheadTextColors[var9] < 6) { // L: 4937 + var16 = Client.field877[Client.overheadTextColors[var9]]; + } + + if (Client.overheadTextColors[var9] == 6) { // L: 4938 + var16 = Client.viewportDrawCount % 20 < 10 ? 16711680 : 16776960; + } + + if (Client.overheadTextColors[var9] == 7) { // L: 4939 + var16 = Client.viewportDrawCount % 20 < 10 ? 255 : '\uffff'; + } + + if (Client.overheadTextColors[var9] == 8) { // L: 4940 + var16 = Client.viewportDrawCount % 20 < 10 ? '뀀' : 8454016; + } + + int var17; + if (Client.overheadTextColors[var9] == 9) { // L: 4941 + var17 = 150 - Client.overheadTextCyclesRemaining[var9]; // L: 4942 + if (var17 < 50) { // L: 4943 + var16 = var17 * 1280 + 16711680; + } else if (var17 < 100) { // L: 4944 + var16 = 16776960 - (var17 - 50) * 327680; + } else if (var17 < 150) { // L: 4945 + var16 = (var17 - 100) * 5 + 65280; + } + } + + if (Client.overheadTextColors[var9] == 10) { // L: 4947 + var17 = 150 - Client.overheadTextCyclesRemaining[var9]; // L: 4948 + if (var17 < 50) { // L: 4949 + var16 = var17 * 5 + 16711680; + } else if (var17 < 100) { // L: 4950 + var16 = 16711935 - (var17 - 50) * 327680; + } else if (var17 < 150) { // L: 4951 + var16 = (var17 - 100) * 327680 + 255 - (var17 - 100) * 5; + } + } + + if (Client.overheadTextColors[var9] == 11) { // L: 4953 + var17 = 150 - Client.overheadTextCyclesRemaining[var9]; // L: 4954 + if (var17 < 50) { // L: 4955 + var16 = 16777215 - var17 * 327685; + } else if (var17 < 100) { // L: 4956 + var16 = (var17 - 50) * 327685 + 65280; + } else if (var17 < 150) { // L: 4957 + var16 = 16777215 - (var17 - 100) * 327680; + } + } + + if (Client.overheadTextEffects[var9] == 0) { // L: 4959 + Widget.fontBold12.drawCentered(var15, var0 + Client.viewportTempX, Client.viewportTempY + var1, var16, 0); + } + + if (Client.overheadTextEffects[var9] == 1) { // L: 4960 + Widget.fontBold12.drawCenteredWave(var15, var0 + Client.viewportTempX, Client.viewportTempY + var1, var16, 0, Client.viewportDrawCount); + } + + if (Client.overheadTextEffects[var9] == 2) { // L: 4961 + Widget.fontBold12.drawCenteredWave2(var15, var0 + Client.viewportTempX, Client.viewportTempY + var1, var16, 0, Client.viewportDrawCount); + } + + if (Client.overheadTextEffects[var9] == 3) { // L: 4962 + Widget.fontBold12.drawCenteredShake(var15, var0 + Client.viewportTempX, Client.viewportTempY + var1, var16, 0, Client.viewportDrawCount, 150 - Client.overheadTextCyclesRemaining[var9]); + } + + if (Client.overheadTextEffects[var9] == 4) { // L: 4963 + var17 = (150 - Client.overheadTextCyclesRemaining[var9]) * (Widget.fontBold12.stringWidth(var15) + 100) / 150; // L: 4964 + Rasterizer2D.Rasterizer2D_expandClip(var0 + Client.viewportTempX - 50, var1, var0 + Client.viewportTempX + 50, var3 + var1); // L: 4965 + Widget.fontBold12.draw(var15, var0 + Client.viewportTempX + 50 - var17, Client.viewportTempY + var1, var16, 0); // L: 4966 + Rasterizer2D.Rasterizer2D_setClip(var0, var1, var0 + var2, var3 + var1); // L: 4967 + } + + if (Client.overheadTextEffects[var9] == 5) { // L: 4969 + var17 = 150 - Client.overheadTextCyclesRemaining[var9]; // L: 4970 + int var18 = 0; // L: 4971 + if (var17 < 25) { // L: 4972 + var18 = var17 - 25; + } else if (var17 > 125) { // L: 4973 + var18 = var17 - 125; + } + + Rasterizer2D.Rasterizer2D_expandClip(var0, Client.viewportTempY + var1 - Widget.fontBold12.ascent - 1, var0 + var2, Client.viewportTempY + var1 + 5); // L: 4974 + Widget.fontBold12.drawCentered(var15, var0 + Client.viewportTempX, var18 + Client.viewportTempY + var1, var16, 0); // L: 4975 + Rasterizer2D.Rasterizer2D_setClip(var0, var1, var0 + var2, var3 + var1); // L: 4976 + } + } else { + Widget.fontBold12.drawCentered(var15, var0 + Client.viewportTempX, Client.viewportTempY + var1, 16776960, 0); // L: 4980 + } + } + + } // L: 4983 } diff --git a/runescape-client/src/main/java/NetFileRequest.java b/runescape-client/src/main/java/NetFileRequest.java index bb5180a63b..cdcb7de2e3 100644 --- a/runescape-client/src/main/java/NetFileRequest.java +++ b/runescape-client/src/main/java/NetFileRequest.java @@ -4,25 +4,41 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("jc") +@ObfuscatedName("jf") @Implements("NetFileRequest") public class NetFileRequest extends DualNode { - @ObfuscatedName("h") + @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "Lji;" + descriptor = "Ljp;" ) @Export("archive") - Archive archive; - @ObfuscatedName("c") + public Archive archive; + @ObfuscatedName("n") @ObfuscatedGetter( - intValue = -279924423 + intValue = 1816786653 ) @Export("crc") - int crc; - @ObfuscatedName("o") + public int crc; + @ObfuscatedName("f") @Export("padding") - byte padding; + public byte padding; NetFileRequest() { } // L: 10 + + @ObfuscatedName("fw") + @ObfuscatedSignature( + descriptor = "(I)V", + garbageValue = "-552402310" + ) + static final void method4912() { + if (Client.logoutTimer > 0) { // L: 2687 + class7.logOut(); // L: 2688 + } else { + Client.timer.method5590(); // L: 2691 + class12.updateGameState(40); // L: 2692 + Client.field688 = Client.packetWriter.getSocket(); // L: 2693 + Client.packetWriter.removeSocket(); // L: 2694 + } + } // L: 2689 2695 } diff --git a/runescape-client/src/main/java/NetSocket.java b/runescape-client/src/main/java/NetSocket.java index a67fcb913a..a54622bdbb 100644 --- a/runescape-client/src/main/java/NetSocket.java +++ b/runescape-client/src/main/java/NetSocket.java @@ -8,79 +8,73 @@ 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("ec") +@ObfuscatedName("ea") @Implements("NetSocket") public final class NetSocket extends AbstractSocket implements Runnable { - @ObfuscatedName("ty") + @ObfuscatedName("se") @ObfuscatedSignature( - descriptor = "Lmv;" + descriptor = "Lby;" ) - @Export("worldMap") - static WorldMap worldMap; - @ObfuscatedName("bb") - @ObfuscatedSignature( - descriptor = "Ljr;" - ) - static StudioGame field1492; - @ObfuscatedName("h") + @Export("friendSystem") + public static FriendSystem friendSystem; + @ObfuscatedName("v") @Export("inputStream") InputStream inputStream; - @ObfuscatedName("c") + @ObfuscatedName("n") @Export("outputStream") OutputStream outputStream; - @ObfuscatedName("o") + @ObfuscatedName("f") @Export("socket") Socket socket; - @ObfuscatedName("g") + @ObfuscatedName("y") @Export("isClosed") boolean isClosed; - @ObfuscatedName("l") + @ObfuscatedName("p") @ObfuscatedSignature( - descriptor = "Ldk;" + descriptor = "Ldp;" ) @Export("taskHandler") TaskHandler taskHandler; - @ObfuscatedName("z") + @ObfuscatedName("j") @ObfuscatedSignature( - descriptor = "Lek;" + descriptor = "Leu;" ) @Export("task") Task task; - @ObfuscatedName("t") + @ObfuscatedName("r") @Export("outBuffer") byte[] outBuffer; - @ObfuscatedName("v") + @ObfuscatedName("b") @ObfuscatedGetter( - intValue = -911833781 + intValue = 1751872319 ) @Export("outLength") int outLength; - @ObfuscatedName("b") + @ObfuscatedName("d") @ObfuscatedGetter( - intValue = -1776922823 + intValue = -1540552653 ) @Export("outOffset") int outOffset; - @ObfuscatedName("q") + @ObfuscatedName("s") @Export("exceptionWriting") boolean exceptionWriting; - @ObfuscatedName("i") + @ObfuscatedName("u") @ObfuscatedGetter( - intValue = -341311153 + intValue = -459397033 ) @Export("bufferLength") final int bufferLength; - @ObfuscatedName("x") + @ObfuscatedName("l") @ObfuscatedGetter( - intValue = 772156429 + intValue = 1021465411 ) @Export("maxPacketLength") final int maxPacketLength; @ObfuscatedSignature( - descriptor = "(Ljava/net/Socket;Ldk;I)V" + descriptor = "(Ljava/net/Socket;Ldp;I)V" ) public NetSocket(Socket var1, TaskHandler var2, int var3) throws IOException { this.isClosed = false; // L: 16 @@ -99,10 +93,10 @@ public final class NetSocket extends AbstractSocket implements Runnable { this.outputStream = this.socket.getOutputStream(); // L: 37 } // L: 38 - @ObfuscatedName("h") + @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "(B)V", - garbageValue = "-36" + descriptor = "(I)V", + garbageValue = "1654713390" ) @Export("close") public void close() { @@ -114,128 +108,131 @@ public final class NetSocket extends AbstractSocket implements Runnable { if (this.task != null) { // L: 46 while (this.task.status == 0) { // L: 47 - UrlRequest.sleepExact(1L); // L: 48 + try { + Thread.sleep(1L); // L: 67 + } catch (InterruptedException var4) { // L: 69 + } } - if (this.task.status == 1) { // L: 50 + if (this.task.status == 1) { // L: 73 try { - ((Thread)this.task.result).join(); // L: 52 - } catch (InterruptedException var3) { // L: 54 + ((Thread)this.task.result).join(); // L: 75 + } catch (InterruptedException var3) { // L: 77 } } } - this.task = null; // L: 57 + this.task = null; // L: 80 } - } // L: 58 + } // L: 81 - @ObfuscatedName("c") + @ObfuscatedName("n") @ObfuscatedSignature( descriptor = "(I)I", - garbageValue = "-2027143758" + garbageValue = "479468921" ) @Export("readUnsignedByte") public int readUnsignedByte() throws IOException { - return this.isClosed ? 0 : this.inputStream.read(); // L: 65 66 + return this.isClosed ? 0 : this.inputStream.read(); // L: 88 89 } - @ObfuscatedName("o") + @ObfuscatedName("f") @ObfuscatedSignature( descriptor = "(I)I", - garbageValue = "-640327653" + garbageValue = "1659206769" ) @Export("available") public int available() throws IOException { - return this.isClosed ? 0 : this.inputStream.available(); // L: 70 71 + return this.isClosed ? 0 : this.inputStream.available(); // L: 93 94 } - @ObfuscatedName("g") + @ObfuscatedName("y") @ObfuscatedSignature( descriptor = "(II)Z", - garbageValue = "-1880004365" + garbageValue = "-211935081" ) @Export("isAvailable") public boolean isAvailable(int var1) throws IOException { - if (this.isClosed) { // L: 75 + if (this.isClosed) { // L: 98 return false; } else { - return this.inputStream.available() >= var1; // L: 76 + return this.inputStream.available() >= var1; // L: 99 } } - @ObfuscatedName("l") + @ObfuscatedName("p") @ObfuscatedSignature( descriptor = "([BIII)I", - garbageValue = "-1936066161" + garbageValue = "-2041736219" ) @Export("read") public int read(byte[] var1, int var2, int var3) throws IOException { - if (this.isClosed) { // L: 80 + if (this.isClosed) { // L: 103 return 0; } else { int var4; int var5; - for (var4 = var3; var3 > 0; var3 -= var5) { // L: 81 82 86 - var5 = this.inputStream.read(var1, var2, var3); // L: 83 - if (var5 <= 0) { // L: 84 + for (var4 = var3; var3 > 0; var3 -= var5) { // L: 104 105 109 + var5 = this.inputStream.read(var1, var2, var3); // L: 106 + if (var5 <= 0) { // L: 107 throw new EOFException(); } - var2 += var5; // L: 85 + var2 += var5; // L: 108 } - return var4; // L: 88 + return var4; // L: 111 } } - @ObfuscatedName("z") + @ObfuscatedName("j") @ObfuscatedSignature( - descriptor = "([BIII)V", - garbageValue = "-1940944682" + descriptor = "([BIIB)V", + garbageValue = "12" ) @Export("write0") void write0(byte[] var1, int var2, int var3) throws IOException { - if (!this.isClosed) { // L: 92 - if (this.exceptionWriting) { // L: 93 - this.exceptionWriting = false; // L: 94 - throw new IOException(); // L: 95 + if (!this.isClosed) { // L: 115 + if (this.exceptionWriting) { // L: 116 + this.exceptionWriting = false; // L: 117 + throw new IOException(); // L: 118 } else { - if (this.outBuffer == null) { // L: 97 + if (this.outBuffer == null) { // L: 120 this.outBuffer = new byte[this.bufferLength]; } - synchronized(this) { // L: 98 - for (int var5 = 0; var5 < var3; ++var5) { // L: 99 - this.outBuffer[this.outOffset] = var1[var5 + var2]; // L: 100 - this.outOffset = (this.outOffset + 1) % this.bufferLength; // L: 101 - if ((this.maxPacketLength + this.outLength) % this.bufferLength == this.outOffset) { // L: 102 - throw new IOException(); // L: 103 + synchronized(this) { // L: 121 + for (int var5 = 0; var5 < var3; ++var5) { // L: 122 + this.outBuffer[this.outOffset] = var1[var5 + var2]; // L: 123 + this.outOffset = (this.outOffset + 1) % this.bufferLength; // L: 124 + if ((this.maxPacketLength + this.outLength) % this.bufferLength == this.outOffset) { // L: 125 + throw new IOException(); // L: 126 } } - if (this.task == null) { // L: 106 - this.task = this.taskHandler.newThreadTask(this, 3); // L: 107 + if (this.task == null) { // L: 129 + this.task = this.taskHandler.newThreadTask(this, 3); // L: 130 } - this.notifyAll(); // L: 109 + this.notifyAll(); // L: 132 } } } - } // L: 111 + } // L: 134 - @ObfuscatedName("t") + @ObfuscatedName("r") @ObfuscatedSignature( descriptor = "([BIII)V", - garbageValue = "1752522959" + garbageValue = "263213011" ) @Export("write") public void write(byte[] var1, int var2, int var3) throws IOException { - this.write0(var1, var2, var3); // L: 160 - } // L: 161 + this.write0(var1, var2, var3); // L: 183 + } // L: 184 protected void finalize() { - this.close(); // L: 61 - } // L: 62 + this.close(); // L: 84 + } // L: 85 public void run() { try { @@ -243,104 +240,125 @@ public final class NetSocket extends AbstractSocket implements Runnable { label84: { int var1; int var2; - synchronized(this) { // L: 118 - if (this.outLength == this.outOffset) { // L: 119 - if (this.isClosed) { // L: 120 + synchronized(this) { // L: 141 + if (this.outOffset == this.outLength) { // L: 142 + if (this.isClosed) { // L: 143 break label84; } try { - this.wait(); // L: 122 - } catch (InterruptedException var10) { // L: 124 + this.wait(); // L: 145 + } catch (InterruptedException var10) { // L: 147 } } - var2 = this.outLength; // L: 126 - if (this.outOffset >= this.outLength) { // L: 127 + var2 = this.outLength; // L: 149 + if (this.outOffset >= this.outLength) { // L: 150 var1 = this.outOffset - this.outLength; } else { - var1 = this.bufferLength - this.outLength; // L: 128 + var1 = this.bufferLength - this.outLength; // L: 151 } } - if (var1 <= 0) { // L: 130 + if (var1 <= 0) { // L: 153 continue; } try { - this.outputStream.write(this.outBuffer, var2, var1); // L: 132 - } catch (IOException var9) { // L: 134 - this.exceptionWriting = true; // L: 135 + this.outputStream.write(this.outBuffer, var2, var1); // L: 155 + } catch (IOException var9) { // L: 157 + this.exceptionWriting = true; // L: 158 } - this.outLength = (var1 + this.outLength) % this.bufferLength; // L: 137 + this.outLength = (var1 + this.outLength) % this.bufferLength; // L: 160 try { - if (this.outLength == this.outOffset) { // L: 139 + if (this.outLength == this.outOffset) { // L: 162 this.outputStream.flush(); } - } catch (IOException var8) { // L: 141 - this.exceptionWriting = true; // L: 142 + } catch (IOException var8) { // L: 164 + this.exceptionWriting = true; // L: 165 } continue; } try { - if (this.inputStream != null) { // L: 147 + if (this.inputStream != null) { // L: 170 this.inputStream.close(); } - if (this.outputStream != null) { // L: 148 + if (this.outputStream != null) { // L: 171 this.outputStream.close(); } - if (this.socket != null) { // L: 149 + if (this.socket != null) { // L: 172 this.socket.close(); } - } catch (IOException var7) { // L: 151 + } catch (IOException var7) { // L: 174 } - this.outBuffer = null; // L: 152 + this.outBuffer = null; // L: 175 break; } - } catch (Exception var12) { // L: 154 - class27.RunException_sendStackTrace((String)null, var12); // L: 155 + } catch (Exception var12) { // L: 177 + class266.RunException_sendStackTrace((String)null, var12); // L: 178 } - } // L: 157 + } // L: 180 - @ObfuscatedName("a") + @ObfuscatedName("gt") @ObfuscatedSignature( - descriptor = "(ILci;ZI)I", - garbageValue = "1636570408" + descriptor = "(Lce;ZI)V", + garbageValue = "2061936798" ) - static int method2570(int var0, Script var1, boolean var2) { - Widget var3 = var2 ? class308.scriptDotWidget : class24.scriptActiveWidget; // L: 1190 - if (var0 == ScriptOpcodes.CC_GETTARGETMASK) { // L: 1191 - Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = AttackOption.Widget_unpackTargetMask(class26.getWidgetFlags(var3)); // L: 1192 - return 1; // L: 1193 - } else if (var0 != ScriptOpcodes.CC_GETOP) { // L: 1195 - if (var0 == ScriptOpcodes.CC_GETOPBASE) { // L: 1202 - if (var3.dataText == null) { // L: 1203 - Interpreter.Interpreter_stringStack[++class13.Interpreter_stringStackSize - 1] = ""; + @Export("addPlayerToScene") + static void addPlayerToScene(Player var0, boolean var1) { + if (var0 != null && var0.isVisible() && !var0.isHidden) { // L: 4361 + var0.isUnanimated = false; // L: 4362 + if ((Client.isLowDetail && Players.Players_count > 50 || Players.Players_count > 200) && var1 && var0.idleSequence == var0.movementSequence) { // L: 4363 4364 + var0.isUnanimated = true; + } + + int var2 = var0.x >> 7; // L: 4366 + int var3 = var0.y >> 7; // L: 4367 + if (var2 >= 0 && var2 < 104 && var3 >= 0 && var3 < 104) { // L: 4368 + long var4 = DevicePcmPlayerProvider.calculateTag(0, 0, 0, false, var0.index); // L: 4369 + if (var0.model0 != null && Client.cycle >= var0.animationCycleStart && Client.cycle < var0.animationCycleEnd) { // L: 4370 + var0.isUnanimated = false; // L: 4371 + var0.tileHeight = class105.getTileHeight(var0.x, var0.y, class22.Client_plane); // L: 4372 + var0.playerCycle = Client.cycle; // L: 4373 + AbstractSocket.scene.addNullableObject(class22.Client_plane, var0.x, var0.y, var0.tileHeight, 60, var0, var0.rotation, var4, var0.minX, var0.minY, var0.maxX, var0.maxY); // L: 4374 } else { - Interpreter.Interpreter_stringStack[++class13.Interpreter_stringStackSize - 1] = var3.dataText; // L: 1204 + if ((var0.x & 127) == 64 && (var0.y & 127) == 64) { // L: 4377 + if (Client.tileLastDrawnActor[var2][var3] == Client.viewportDrawCount) { // L: 4378 + return; + } + + Client.tileLastDrawnActor[var2][var3] = Client.viewportDrawCount; // L: 4379 + } + + var0.tileHeight = class105.getTileHeight(var0.x, var0.y, class22.Client_plane); // L: 4381 + var0.playerCycle = Client.cycle; // L: 4382 + AbstractSocket.scene.drawEntity(class22.Client_plane, var0.x, var0.y, var0.tileHeight, 60, var0, var0.rotation, var4, var0.isWalking); // L: 4383 } - - return 1; // L: 1205 - } else { - return 2; // L: 1207 } - } else { - int var4 = Interpreter.Interpreter_intStack[--WorldMapCacheName.Interpreter_intStackSize]; // L: 1196 - --var4; // L: 1197 - if (var3.actions != null && var4 < var3.actions.length && var3.actions[var4] != null) { // L: 1198 - Interpreter.Interpreter_stringStack[++class13.Interpreter_stringStackSize - 1] = var3.actions[var4]; // L: 1199 - } else { - Interpreter.Interpreter_stringStack[++class13.Interpreter_stringStackSize - 1] = ""; - } - - return 1; // L: 1200 } - } + + } // L: 4387 + + @ObfuscatedName("hl") + @ObfuscatedSignature( + descriptor = "(I)V", + garbageValue = "-1283553484" + ) + @Export("addCancelMenuEntry") + static void addCancelMenuEntry() { + Client.menuOptionsCount = 0; // L: 7591 + Client.isMenuOpen = false; // L: 7592 + Client.menuActions[0] = "Cancel"; // L: 7594 + Client.menuTargets[0] = ""; // L: 7595 + Client.menuOpcodes[0] = 1006; // L: 7596 + Client.menuShiftClick[0] = false; // L: 7597 + Client.menuOptionsCount = 1; // L: 7598 + } // L: 7599 } diff --git a/runescape-client/src/main/java/Node.java b/runescape-client/src/main/java/Node.java index 8bd4871aee..c14f24c749 100644 --- a/runescape-client/src/main/java/Node.java +++ b/runescape-client/src/main/java/Node.java @@ -3,26 +3,26 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("md") +@ObfuscatedName("mw") @Implements("Node") public class Node { - @ObfuscatedName("fs") + @ObfuscatedName("ff") @Export("key") public long key; - @ObfuscatedName("ft") + @ObfuscatedName("fw") @ObfuscatedSignature( - descriptor = "Lmd;" + descriptor = "Lmw;" ) @Export("previous") public Node previous; - @ObfuscatedName("fy") + @ObfuscatedName("fj") @ObfuscatedSignature( - descriptor = "Lmd;" + descriptor = "Lmw;" ) @Export("next") public Node next; - @ObfuscatedName("ef") + @ObfuscatedName("eq") @Export("remove") public void remove() { if (this.next != null) { // L: 9 @@ -33,7 +33,7 @@ public class Node { } } // L: 14 - @ObfuscatedName("eh") + @ObfuscatedName("fz") @Export("hasNext") public boolean hasNext() { return this.next != null; // L: 17 diff --git a/runescape-client/src/main/java/NodeDeque.java b/runescape-client/src/main/java/NodeDeque.java index 212eaa9f8b..87cf700c19 100644 --- a/runescape-client/src/main/java/NodeDeque.java +++ b/runescape-client/src/main/java/NodeDeque.java @@ -3,18 +3,18 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ka") +@ObfuscatedName("kx") @Implements("NodeDeque") public class NodeDeque { - @ObfuscatedName("h") + @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "Lmd;" + descriptor = "Lmw;" ) @Export("sentinel") public Node sentinel; - @ObfuscatedName("c") + @ObfuscatedName("n") @ObfuscatedSignature( - descriptor = "Lmd;" + descriptor = "Lmw;" ) @Export("current") Node current; @@ -25,7 +25,7 @@ public class NodeDeque { this.sentinel.next = this.sentinel; // L: 11 } // L: 12 - @ObfuscatedName("h") + @ObfuscatedName("v") @Export("clear") public void clear() { while (true) { @@ -39,9 +39,9 @@ public class NodeDeque { } } - @ObfuscatedName("c") + @ObfuscatedName("n") @ObfuscatedSignature( - descriptor = "(Lmd;)V" + descriptor = "(Lmw;)V" ) @Export("addFirst") public void addFirst(Node var1) { @@ -55,9 +55,9 @@ public class NodeDeque { var1.previous.next = var1; // L: 28 } // L: 29 - @ObfuscatedName("o") + @ObfuscatedName("f") @ObfuscatedSignature( - descriptor = "(Lmd;)V" + descriptor = "(Lmw;)V" ) @Export("addLast") public void addLast(Node var1) { @@ -71,9 +71,9 @@ public class NodeDeque { var1.previous.next = var1; // L: 36 } // L: 37 - @ObfuscatedName("l") + @ObfuscatedName("p") @ObfuscatedSignature( - descriptor = "()Lmd;" + descriptor = "()Lmw;" ) @Export("removeLast") public Node removeLast() { @@ -86,9 +86,9 @@ public class NodeDeque { } } - @ObfuscatedName("z") + @ObfuscatedName("j") @ObfuscatedSignature( - descriptor = "()Lmd;" + descriptor = "()Lmw;" ) @Export("removeFirst") public Node removeFirst() { @@ -101,9 +101,9 @@ public class NodeDeque { } } - @ObfuscatedName("t") + @ObfuscatedName("r") @ObfuscatedSignature( - descriptor = "()Lmd;" + descriptor = "()Lmw;" ) @Export("last") public Node last() { @@ -117,9 +117,9 @@ public class NodeDeque { } } - @ObfuscatedName("v") + @ObfuscatedName("b") @ObfuscatedSignature( - descriptor = "()Lmd;" + descriptor = "()Lmw;" ) @Export("first") public Node first() { @@ -133,9 +133,9 @@ public class NodeDeque { } } - @ObfuscatedName("b") + @ObfuscatedName("d") @ObfuscatedSignature( - descriptor = "()Lmd;" + descriptor = "()Lmw;" ) @Export("previous") public Node previous() { @@ -149,9 +149,9 @@ public class NodeDeque { } } - @ObfuscatedName("q") + @ObfuscatedName("s") @ObfuscatedSignature( - descriptor = "()Lmd;" + descriptor = "()Lmw;" ) @Export("next") public Node next() { @@ -165,9 +165,9 @@ public class NodeDeque { } } - @ObfuscatedName("g") + @ObfuscatedName("y") @ObfuscatedSignature( - descriptor = "(Lmd;Lmd;)V" + descriptor = "(Lmw;Lmw;)V" ) @Export("NodeDeque_addBefore") public static void NodeDeque_addBefore(Node var0, Node var1) { diff --git a/runescape-client/src/main/java/NodeHashTable.java b/runescape-client/src/main/java/NodeHashTable.java index 163740cc22..a21b89a0b0 100644 --- a/runescape-client/src/main/java/NodeHashTable.java +++ b/runescape-client/src/main/java/NodeHashTable.java @@ -3,31 +3,31 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("mt") +@ObfuscatedName("md") @Implements("NodeHashTable") public final class NodeHashTable { - @ObfuscatedName("h") + @ObfuscatedName("v") @Export("size") int size; - @ObfuscatedName("c") + @ObfuscatedName("n") @ObfuscatedSignature( - descriptor = "[Lmd;" + descriptor = "[Lmw;" ) @Export("buckets") Node[] buckets; - @ObfuscatedName("o") + @ObfuscatedName("f") @ObfuscatedSignature( - descriptor = "Lmd;" + descriptor = "Lmw;" ) @Export("currentGet") Node currentGet; - @ObfuscatedName("g") + @ObfuscatedName("y") @ObfuscatedSignature( - descriptor = "Lmd;" + descriptor = "Lmw;" ) @Export("current") Node current; - @ObfuscatedName("l") + @ObfuscatedName("p") @Export("index") int index; @@ -44,9 +44,9 @@ public final class NodeHashTable { } // L: 20 - @ObfuscatedName("h") + @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "(J)Lmd;" + descriptor = "(J)Lmw;" ) @Export("get") public Node get(long var1) { @@ -64,9 +64,9 @@ public final class NodeHashTable { return null; // L: 34 } - @ObfuscatedName("c") + @ObfuscatedName("n") @ObfuscatedSignature( - descriptor = "(Lmd;J)V" + descriptor = "(Lmw;J)V" ) @Export("put") public void put(Node var1, long var2) { @@ -82,9 +82,9 @@ public final class NodeHashTable { var1.key = var2; // L: 44 } // L: 45 - @ObfuscatedName("o") + @ObfuscatedName("f") @ObfuscatedSignature( - descriptor = "()Lmd;" + descriptor = "()Lmw;" ) @Export("first") public Node first() { @@ -92,9 +92,9 @@ public final class NodeHashTable { return this.next(); // L: 49 } - @ObfuscatedName("g") + @ObfuscatedName("y") @ObfuscatedSignature( - descriptor = "()Lmd;" + descriptor = "()Lmw;" ) @Export("next") public Node next() { diff --git a/runescape-client/src/main/java/ObjectComposition.java b/runescape-client/src/main/java/ObjectComposition.java index 66f40b9c5f..b406e382e4 100644 --- a/runescape-client/src/main/java/ObjectComposition.java +++ b/runescape-client/src/main/java/ObjectComposition.java @@ -3,266 +3,261 @@ 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("em") +@ObfuscatedName("eg") @Implements("ObjectComposition") public class ObjectComposition extends DualNode { - @ObfuscatedName("h") + @ObfuscatedName("sf") + @ObfuscatedSignature( + descriptor = "Lcl;" + ) + @Export("clientPreferences") + static ClientPreferences clientPreferences; + @ObfuscatedName("v") @Export("ObjectDefinition_isLowDetail") public static boolean ObjectDefinition_isLowDetail; - @ObfuscatedName("c") + @ObfuscatedName("n") @ObfuscatedSignature( - descriptor = "Ljp;" + descriptor = "Ljv;" ) @Export("ObjectDefinition_archive") public static AbstractArchive ObjectDefinition_archive; - @ObfuscatedName("o") + @ObfuscatedName("y") @ObfuscatedSignature( - descriptor = "Ljp;" - ) - @Export("ObjectDefinition_modelsArchive") - public static AbstractArchive ObjectDefinition_modelsArchive; - @ObfuscatedName("g") - @ObfuscatedSignature( - descriptor = "Lho;" + descriptor = "Lhz;" ) @Export("ObjectDefinition_cached") static EvictingDualNodeHashTable ObjectDefinition_cached; - @ObfuscatedName("l") + @ObfuscatedName("p") @ObfuscatedSignature( - descriptor = "Lho;" + descriptor = "Lhz;" ) @Export("ObjectDefinition_cachedModelData") public static EvictingDualNodeHashTable ObjectDefinition_cachedModelData; - @ObfuscatedName("z") + @ObfuscatedName("j") @ObfuscatedSignature( - descriptor = "Lho;" + descriptor = "Lhz;" ) @Export("ObjectDefinition_cachedEntities") static EvictingDualNodeHashTable ObjectDefinition_cachedEntities; - @ObfuscatedName("t") + @ObfuscatedName("r") @ObfuscatedSignature( - descriptor = "Lho;" + descriptor = "Lhz;" ) @Export("ObjectDefinition_cachedModels") static EvictingDualNodeHashTable ObjectDefinition_cachedModels; - @ObfuscatedName("v") - @ObfuscatedSignature( - descriptor = "[Lgk;" - ) - static ModelData[] field1765; - @ObfuscatedName("hn") - @ObfuscatedSignature( - descriptor = "[Low;" - ) - @Export("mapMarkerSprites") - static SpritePixels[] mapMarkerSprites; @ObfuscatedName("b") + @ObfuscatedSignature( + descriptor = "[Lgm;" + ) + static ModelData[] field1758; + @ObfuscatedName("d") @ObfuscatedGetter( - intValue = -1878331737 + intValue = 1257920551 ) @Export("id") public int id; - @ObfuscatedName("q") + @ObfuscatedName("s") @Export("modelIds") int[] modelIds; - @ObfuscatedName("i") + @ObfuscatedName("u") @Export("models") int[] models; - @ObfuscatedName("x") + @ObfuscatedName("l") @Export("name") public String name; - @ObfuscatedName("k") + @ObfuscatedName("o") @Export("recolorFrom") short[] recolorFrom; - @ObfuscatedName("r") + @ObfuscatedName("c") @Export("recolorTo") short[] recolorTo; - @ObfuscatedName("p") + @ObfuscatedName("e") @Export("retextureFrom") short[] retextureFrom; - @ObfuscatedName("a") + @ObfuscatedName("g") @Export("retextureTo") short[] retextureTo; - @ObfuscatedName("e") + @ObfuscatedName("a") @ObfuscatedGetter( - intValue = -1437298293 + intValue = -288612135 ) @Export("sizeX") public int sizeX; - @ObfuscatedName("d") + @ObfuscatedName("k") @ObfuscatedGetter( - intValue = 609698911 + intValue = -1812944985 ) @Export("sizeY") public int sizeY; - @ObfuscatedName("u") + @ObfuscatedName("m") @ObfuscatedGetter( - intValue = 87982863 + intValue = 1384594797 ) @Export("interactType") public int interactType; - @ObfuscatedName("m") + @ObfuscatedName("x") @Export("boolean1") public boolean boolean1; - @ObfuscatedName("j") + @ObfuscatedName("z") @ObfuscatedGetter( - intValue = -606680229 + intValue = -1747290425 ) @Export("int1") public int int1; - @ObfuscatedName("f") + @ObfuscatedName("w") @ObfuscatedGetter( - intValue = -533490969 + intValue = 1982259081 ) @Export("clipType") int clipType; - @ObfuscatedName("s") + @ObfuscatedName("t") @Export("nonFlatShading") boolean nonFlatShading; - @ObfuscatedName("y") + @ObfuscatedName("h") @Export("modelClipped") public boolean modelClipped; - @ObfuscatedName("w") + @ObfuscatedName("q") @ObfuscatedGetter( - intValue = -926574345 + intValue = 91732693 ) @Export("animationId") public int animationId; - @ObfuscatedName("n") + @ObfuscatedName("i") @ObfuscatedGetter( - intValue = -1043420487 + intValue = -2141564523 ) @Export("int2") public int int2; - @ObfuscatedName("ag") + @ObfuscatedName("ae") @ObfuscatedGetter( - intValue = -108030549 + intValue = 737098019 ) @Export("ambient") int ambient; - @ObfuscatedName("ae") + @ObfuscatedName("ap") @ObfuscatedGetter( - intValue = 1002632409 + intValue = -1951915357 ) @Export("contrast") int contrast; - @ObfuscatedName("ao") + @ObfuscatedName("ab") @Export("actions") public String[] actions; - @ObfuscatedName("aj") + @ObfuscatedName("al") @ObfuscatedGetter( - intValue = 762696279 + intValue = 715137677 ) @Export("mapIconId") public int mapIconId; - @ObfuscatedName("aw") + @ObfuscatedName("ad") @ObfuscatedGetter( - intValue = 451592881 + intValue = 1953806269 ) @Export("mapSceneId") public int mapSceneId; - @ObfuscatedName("at") + @ObfuscatedName("ai") @Export("isRotated") boolean isRotated; - @ObfuscatedName("av") + @ObfuscatedName("ar") @Export("clipped") public boolean clipped; - @ObfuscatedName("al") + @ObfuscatedName("ag") @ObfuscatedGetter( - intValue = -707186951 + intValue = 2023882183 ) @Export("modelSizeX") int modelSizeX; - @ObfuscatedName("ap") + @ObfuscatedName("ax") @ObfuscatedGetter( - intValue = -952395829 + intValue = -128734905 ) @Export("modelHeight") int modelHeight; - @ObfuscatedName("am") + @ObfuscatedName("as") @ObfuscatedGetter( - intValue = -1765816031 + intValue = 1793446173 ) @Export("modelSizeY") int modelSizeY; - @ObfuscatedName("ax") + @ObfuscatedName("aj") @ObfuscatedGetter( - intValue = -707787703 + intValue = -1494268527 ) @Export("offsetX") int offsetX; - @ObfuscatedName("ak") + @ObfuscatedName("am") @ObfuscatedGetter( - intValue = 1508092653 + intValue = -743874879 ) @Export("offsetHeight") int offsetHeight; - @ObfuscatedName("ay") + @ObfuscatedName("az") @ObfuscatedGetter( - intValue = 381553565 + intValue = -227509265 ) @Export("offsetY") int offsetY; - @ObfuscatedName("ai") + @ObfuscatedName("av") @Export("boolean2") public boolean boolean2; - @ObfuscatedName("aa") + @ObfuscatedName("ac") @Export("isSolid") boolean isSolid; - @ObfuscatedName("au") + @ObfuscatedName("at") @ObfuscatedGetter( - intValue = -17710627 + intValue = -1364896901 ) @Export("int3") public int int3; - @ObfuscatedName("as") + @ObfuscatedName("ah") @Export("transforms") public int[] transforms; - @ObfuscatedName("ad") + @ObfuscatedName("ao") @ObfuscatedGetter( - intValue = 2015859493 + intValue = -240174169 ) @Export("transformVarbit") int transformVarbit; - @ObfuscatedName("ac") + @ObfuscatedName("aq") @ObfuscatedGetter( - intValue = -1480972779 + intValue = 758936167 ) @Export("transformVarp") int transformVarp; - @ObfuscatedName("az") + @ObfuscatedName("aw") @ObfuscatedGetter( - intValue = 1140263959 + intValue = 805251355 ) @Export("ambientSoundId") public int ambientSoundId; - @ObfuscatedName("aq") + @ObfuscatedName("af") @ObfuscatedGetter( - intValue = 262834993 + intValue = -342258981 ) @Export("int4") public int int4; - @ObfuscatedName("ab") + @ObfuscatedName("ak") @ObfuscatedGetter( - intValue = -1274090963 + intValue = 777161755 ) @Export("int5") public int int5; - @ObfuscatedName("ar") + @ObfuscatedName("ay") @ObfuscatedGetter( - intValue = 1128849875 + intValue = -1832840413 ) @Export("int6") public int int6; - @ObfuscatedName("ah") + @ObfuscatedName("aa") @Export("soundEffectIds") public int[] soundEffectIds; - @ObfuscatedName("af") - public boolean field1761; + @ObfuscatedName("au") + public boolean field1801; @ObfuscatedName("an") @ObfuscatedSignature( - descriptor = "Lmo;" + descriptor = "Lmr;" ) @Export("params") IterableNodeHashTable params; @@ -273,21 +268,21 @@ public class ObjectComposition extends DualNode { ObjectDefinition_cachedModelData = new EvictingDualNodeHashTable(500); // L: 21 ObjectDefinition_cachedEntities = new EvictingDualNodeHashTable(30); // L: 22 ObjectDefinition_cachedModels = new EvictingDualNodeHashTable(30); // L: 23 - field1765 = new ModelData[4]; // L: 24 + field1758 = new ModelData[4]; // L: 24 } ObjectComposition() { - this.name = "null"; - this.sizeX = 1; - this.sizeY = 1; - this.interactType = 2; + this.name = "null"; // L: 28 + this.sizeX = 1; // L: 33 + this.sizeY = 1; // L: 34 + this.interactType = 2; // L: 35 this.boolean1 = true; // L: 36 this.int1 = -1; // L: 37 - this.clipType = -1; - this.nonFlatShading = false; - this.modelClipped = false; - this.animationId = -1; - this.int2 = 16; + this.clipType = -1; // L: 38 + this.nonFlatShading = false; // L: 39 + this.modelClipped = false; // L: 40 + this.animationId = -1; // L: 41 + this.int2 = 16; // L: 42 this.ambient = 0; // L: 43 this.contrast = 0; // L: 44 this.actions = new String[5]; // L: 45 @@ -310,13 +305,13 @@ public class ObjectComposition extends DualNode { this.int4 = 0; // L: 63 this.int5 = 0; // L: 64 this.int6 = 0; // L: 65 - this.field1761 = true; // L: 67 + this.field1801 = true; // L: 67 } // L: 70 - @ObfuscatedName("c") + @ObfuscatedName("n") @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "785756929" + descriptor = "(B)V", + garbageValue = "1" ) @Export("postDecode") void postDecode() { @@ -339,10 +334,10 @@ public class ObjectComposition extends DualNode { } // L: 95 - @ObfuscatedName("o") + @ObfuscatedName("f") @ObfuscatedSignature( - descriptor = "(Lnk;B)V", - garbageValue = "34" + descriptor = "(Lnd;B)V", + garbageValue = "1" ) @Export("decode") void decode(Buffer var1) { @@ -356,10 +351,10 @@ public class ObjectComposition extends DualNode { } } - @ObfuscatedName("g") + @ObfuscatedName("y") @ObfuscatedSignature( - descriptor = "(Lnk;II)V", - garbageValue = "444999898" + descriptor = "(Lnd;II)V", + garbageValue = "-1041207607" ) @Export("decodeNext") void decodeNext(Buffer var1, int var2) { @@ -494,9 +489,9 @@ public class ObjectComposition extends DualNode { } else if (var2 == 82) { // L: 219 this.mapIconId = var1.readUnsignedShort(); } else if (var2 == 89) { // L: 220 - this.field1761 = false; + this.field1801 = false; } else if (var2 == 249) { // L: 221 - this.params = HealthBar.readStringIntParameters(var1, this.params); + this.params = ModeWhere.readStringIntParameters(var1, this.params); } } else { this.transformVarbit = var1.readUnsignedShort(); // L: 189 @@ -532,16 +527,16 @@ public class ObjectComposition extends DualNode { } // L: 223 - @ObfuscatedName("l") + @ObfuscatedName("p") @ObfuscatedSignature( - descriptor = "(IB)Z", - garbageValue = "7" + descriptor = "(II)Z", + garbageValue = "-1378932606" ) - public final boolean method2916(int var1) { + public final boolean method2956(int var1) { if (this.models != null) { // L: 226 for (int var4 = 0; var4 < this.models.length; ++var4) { // L: 236 if (this.models[var4] == var1) { // L: 237 - return ObjectDefinition_modelsArchive.tryLoadFile(this.modelIds[var4] & 65535, 0); + return class310.ObjectDefinition_modelsArchive.tryLoadFile(this.modelIds[var4] & 65535, 0); } } @@ -554,17 +549,17 @@ public class ObjectComposition extends DualNode { boolean var2 = true; // L: 229 for (int var3 = 0; var3 < this.modelIds.length; ++var3) { // L: 230 - var2 &= ObjectDefinition_modelsArchive.tryLoadFile(this.modelIds[var3] & 65535, 0); // L: 231 + var2 &= class310.ObjectDefinition_modelsArchive.tryLoadFile(this.modelIds[var3] & 65535, 0); // L: 231 } return var2; // L: 233 } } - @ObfuscatedName("z") + @ObfuscatedName("j") @ObfuscatedSignature( - descriptor = "(S)Z", - garbageValue = "11544" + descriptor = "(I)Z", + garbageValue = "-205337927" ) @Export("needsModelFiles") public final boolean needsModelFiles() { @@ -574,17 +569,17 @@ public class ObjectComposition extends DualNode { boolean var1 = true; // L: 245 for (int var2 = 0; var2 < this.modelIds.length; ++var2) { // L: 246 - var1 &= ObjectDefinition_modelsArchive.tryLoadFile(this.modelIds[var2] & 65535, 0); // L: 247 + var1 &= class310.ObjectDefinition_modelsArchive.tryLoadFile(this.modelIds[var2] & 65535, 0); // L: 247 } return var1; // L: 249 } } - @ObfuscatedName("t") + @ObfuscatedName("r") @ObfuscatedSignature( - descriptor = "(II[[IIIIB)Lge;", - garbageValue = "-7" + descriptor = "(II[[IIIIB)Lgl;", + garbageValue = "109" ) @Export("getEntity") public final Renderable getEntity(int var1, int var2, int[][] var3, int var4, int var5, int var6) { @@ -615,24 +610,24 @@ public class ObjectComposition extends DualNode { } if (this.nonFlatShading) { // L: 269 - var9 = ((ModelData)var9).method3796(); // L: 270 + var9 = ((ModelData)var9).method3760(); // L: 270 } if (this.clipType >= 0) { // L: 272 if (var9 instanceof Model) { // L: 273 var9 = ((Model)var9).contourGround(var3, var4, var5, var6, true, this.clipType); } else if (var9 instanceof ModelData) { - var9 = ((ModelData)var9).method3723(var3, var4, var5, var6, true, this.clipType); // L: 274 + var9 = ((ModelData)var9).method3761(var3, var4, var5, var6, true, this.clipType); // L: 274 } } return (Renderable)var9; // L: 276 } - @ObfuscatedName("v") + @ObfuscatedName("b") @ObfuscatedSignature( - descriptor = "(II[[IIIII)Lgj;", - garbageValue = "-1052657042" + descriptor = "(II[[IIIII)Lgr;", + garbageValue = "-925676771" ) @Export("getModel") public final Model getModel(int var1, int var2, int[][] var3, int var4, int var5, int var6) { @@ -661,10 +656,10 @@ public class ObjectComposition extends DualNode { return var9; // L: 291 } - @ObfuscatedName("b") + @ObfuscatedName("d") @ObfuscatedSignature( - descriptor = "(II[[IIIILfb;IB)Lgj;", - garbageValue = "0" + descriptor = "(II[[IIIILfl;II)Lgr;", + garbageValue = "1200809976" ) @Export("getModelDynamic") public final Model getModelDynamic(int var1, int var2, int[][] var3, int var4, int var5, int var6, SequenceDefinition var7, int var8) { @@ -703,10 +698,10 @@ public class ObjectComposition extends DualNode { } } - @ObfuscatedName("q") + @ObfuscatedName("s") @ObfuscatedSignature( - descriptor = "(III)Lgk;", - garbageValue = "-1846121867" + descriptor = "(III)Lgm;", + garbageValue = "1581886638" ) @Export("getModelData") final ModelData getModelData(int var1, int var2) { @@ -738,25 +733,25 @@ public class ObjectComposition extends DualNode { var3 = (ModelData)ObjectDefinition_cachedModelData.get((long)var7); // L: 323 if (var3 == null) { // L: 324 - var3 = ModelData.ModelData_get(ObjectDefinition_modelsArchive, var7 & 65535, 0); // L: 325 + var3 = ModelData.ModelData_get(class310.ObjectDefinition_modelsArchive, var7 & 65535, 0); // L: 325 if (var3 == null) { // L: 326 return null; } if (var4) { // L: 327 - var3.method3732(); + var3.method3769(); } ObjectDefinition_cachedModelData.put(var3, (long)var7); // L: 328 } if (var5 > 1) { // L: 330 - field1765[var6] = var3; + field1758[var6] = var3; } } if (var5 > 1) { // L: 332 - var3 = new ModelData(field1765, var5); + var3 = new ModelData(field1758, var5); } } else { int var9 = -1; // L: 335 @@ -780,13 +775,13 @@ public class ObjectComposition extends DualNode { var3 = (ModelData)ObjectDefinition_cachedModelData.get((long)var5); // L: 346 if (var3 == null) { // L: 347 - var3 = ModelData.ModelData_get(ObjectDefinition_modelsArchive, var5 & 65535, 0); // L: 348 + var3 = ModelData.ModelData_get(class310.ObjectDefinition_modelsArchive, var5 & 65535, 0); // L: 348 if (var3 == null) { // L: 349 return null; } if (var10) { // L: 350 - var3.method3732(); + var3.method3769(); } ObjectDefinition_cachedModelData.put(var3, (long)var5); // L: 351 @@ -806,19 +801,19 @@ public class ObjectComposition extends DualNode { var11 = true; } - ModelData var8 = new ModelData(var3, var2 == 0 && !var4 && !var11, null == this.recolorFrom, this.retextureFrom == null, true); // L: 360 + ModelData var8 = new ModelData(var3, var2 == 0 && !var4 && !var11, this.recolorFrom == null, null == this.retextureFrom, true); // L: 360 if (var1 == 4 && var2 > 3) { // L: 361 - var8.method3728(256); // L: 362 + var8.method3776(256); // L: 362 var8.changeOffset(45, 0, -45); // L: 363 } var2 &= 3; // L: 365 if (var2 == 1) { // L: 366 - var8.method3725(); + var8.method3763(); } else if (var2 == 2) { // L: 367 - var8.method3759(); + var8.method3829(); } else if (var2 == 3) { // L: 368 - var8.method3727(); + var8.method3765(); } if (this.recolorFrom != null) { // L: 369 @@ -844,16 +839,16 @@ public class ObjectComposition extends DualNode { return var8; // L: 381 } - @ObfuscatedName("i") + @ObfuscatedName("u") @ObfuscatedSignature( - descriptor = "(I)Lem;", - garbageValue = "987622241" + descriptor = "(I)Leg;", + garbageValue = "1894862325" ) @Export("transform") public final ObjectComposition transform() { int var1 = -1; // L: 385 if (this.transformVarbit != -1) { // L: 386 - var1 = getVarbit(this.transformVarbit); + var1 = Skeleton.getVarbit(this.transformVarbit); } else if (this.transformVarp != -1) { // L: 387 var1 = Varps.Varps_main[this.transformVarp]; } @@ -865,33 +860,33 @@ public class ObjectComposition extends DualNode { var2 = this.transforms[this.transforms.length - 1]; } - return var2 != -1 ? AttackOption.getObjectDefinition(var2) : null; // L: 391 392 + return var2 != -1 ? class23.getObjectDefinition(var2) : null; // L: 391 392 } - @ObfuscatedName("x") + @ObfuscatedName("l") @ObfuscatedSignature( - descriptor = "(IIB)I", - garbageValue = "-37" + descriptor = "(III)I", + garbageValue = "-1270474150" ) @Export("getIntParam") public int getIntParam(int var1, int var2) { - return GraphicsObject.method1937(this.params, var1, var2); // L: 396 + return SecureRandomFuture.method1977(this.params, var1, var2); // L: 396 } - @ObfuscatedName("k") + @ObfuscatedName("o") @ObfuscatedSignature( descriptor = "(ILjava/lang/String;I)Ljava/lang/String;", - garbageValue = "1774081221" + garbageValue = "110294181" ) @Export("getStringParam") public String getStringParam(int var1, String var2) { - return Varcs.method2326(this.params, var1, var2); // L: 400 + return FriendsList.method5650(this.params, var1, var2); // L: 400 } - @ObfuscatedName("p") + @ObfuscatedName("e") @ObfuscatedSignature( - descriptor = "(I)Z", - garbageValue = "-889649033" + descriptor = "(B)Z", + garbageValue = "16" ) @Export("hasSound") public boolean hasSound() { @@ -900,7 +895,7 @@ public class ObjectComposition extends DualNode { } else { for (int var1 = 0; var1 < this.transforms.length; ++var1) { // L: 412 if (this.transforms[var1] != -1) { // L: 413 - ObjectComposition var2 = AttackOption.getObjectDefinition(this.transforms[var1]); // L: 414 + ObjectComposition var2 = class23.getObjectDefinition(this.transforms[var1]); // L: 414 if (var2.ambientSoundId != -1 || var2.soundEffectIds != null) { // L: 415 return true; } @@ -911,32 +906,137 @@ public class ObjectComposition extends DualNode { } } - @ObfuscatedName("h") + @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "(IB)I", - garbageValue = "-5" + descriptor = "(B)J", + garbageValue = "1" ) - @Export("getVarbit") - public static int getVarbit(int var0) { - VarbitComposition var2 = (VarbitComposition)VarbitComposition.VarbitDefinition_cached.get((long)var0); // L: 26 - VarbitComposition var1; - if (var2 != null) { // L: 27 - var1 = var2; // L: 28 - } else { - byte[] var3 = VarbitComposition.VarbitDefinition_archive.takeFile(14, var0); // L: 31 - var2 = new VarbitComposition(); // L: 32 - if (var3 != null) { // L: 33 - var2.decode(new Buffer(var3)); - } - - VarbitComposition.VarbitDefinition_cached.put(var2, (long)var0); // L: 34 - var1 = var2; // L: 35 + @Export("currentTimeMillis") + public static final synchronized long currentTimeMillis() { + long var0 = System.currentTimeMillis(); // L: 14 + if (var0 < class379.field4146) { // L: 15 + class379.field4147 += class379.field4146 - var0; // L: 16 } - int var7 = var1.baseVar; // L: 38 - int var4 = var1.startBit; // L: 39 - int var5 = var1.endBit; // L: 40 - int var6 = Varps.Varps_masks[var5 - var4]; // L: 41 - return Varps.Varps_main[var7] >> var4 & var6; // L: 42 + class379.field4146 = var0; // L: 18 + return class379.field4147 + var0; // L: 19 } + + @ObfuscatedName("t") + @ObfuscatedSignature( + descriptor = "(ILcf;ZI)I", + garbageValue = "2009331321" + ) + static int method2964(int var0, Script var1, boolean var2) { + if (var0 == ScriptOpcodes.SOUND_SYNTH) { // L: 1810 + class44.Interpreter_intStackSize -= 3; // L: 1811 + BufferedSource.queueSoundEffect(Interpreter.Interpreter_intStack[class44.Interpreter_intStackSize], Interpreter.Interpreter_intStack[class44.Interpreter_intStackSize + 1], Interpreter.Interpreter_intStack[class44.Interpreter_intStackSize + 2]); // L: 1812 + return 1; // L: 1813 + } else if (var0 == ScriptOpcodes.SOUND_SONG) { // L: 1815 + class27.playSong(Interpreter.Interpreter_intStack[--class44.Interpreter_intStackSize]); // L: 1816 + return 1; // L: 1817 + } else if (var0 == ScriptOpcodes.SOUND_JINGLE) { // L: 1819 + class44.Interpreter_intStackSize -= 2; // L: 1820 + GrandExchangeOfferNameComparator.method5059(Interpreter.Interpreter_intStack[class44.Interpreter_intStackSize], Interpreter.Interpreter_intStack[class44.Interpreter_intStackSize + 1]); // L: 1821 + return 1; // L: 1822 + } else { + int var3; + if (var0 == 3203) { // L: 1824 + var3 = Math.min(Math.max(Interpreter.Interpreter_intStack[--class44.Interpreter_intStackSize], 0), 100); // L: 1825 + PacketWriter.method2402(Math.round((float)var3 * 2.55F)); // L: 1826 + return 1; // L: 1827 + } else if (var0 == 3204) { // L: 1829 + Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = Math.round((float)clientPreferences.musicVolume / 2.55F); // L: 1830 + return 1; // L: 1831 + } else if (var0 == 3205) { // L: 1833 + var3 = Math.min(Math.max(Interpreter.Interpreter_intStack[--class44.Interpreter_intStackSize], 0), 100); // L: 1834 + WorldMapLabelSize.updateSoundEffectVolume(Math.round(1.27F * (float)var3)); // L: 1835 + return 1; // L: 1836 + } else if (var0 == 3206) { // L: 1838 + Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = Math.round((float)clientPreferences.soundEffectsVolume / 1.27F); // L: 1839 + return 1; // L: 1840 + } else if (var0 == 3207) { // L: 1842 + var3 = Math.min(Math.max(Interpreter.Interpreter_intStack[--class44.Interpreter_intStackSize], 0), 100); // L: 1843 + LoginPacket.method4373(Math.round((float)var3 * 1.27F)); // L: 1844 + return 1; // L: 1845 + } else if (var0 == 3208) { // L: 1847 + Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = Math.round((float)clientPreferences.areaSoundEffectsVolume / 1.27F); // L: 1848 + return 1; // L: 1849 + } else { + return 2; // L: 1851 + } + } + } + + @ObfuscatedName("ko") + @ObfuscatedSignature( + descriptor = "(IIIILoh;Lit;I)V", + garbageValue = "-1287867325" + ) + @Export("drawSpriteOnMinimap") + static final void drawSpriteOnMinimap(int var0, int var1, int var2, int var3, SpritePixels var4, SpriteMask var5) { + if (var4 != null) { // L: 11231 + int var6 = Client.camAngleY & 2047; // L: 11232 + int var7 = var3 * var3 + var2 * var2; // L: 11233 + if (var7 <= 6400) { // L: 11234 + int var8 = Rasterizer3D.Rasterizer3D_sine[var6]; // L: 11235 + int var9 = Rasterizer3D.Rasterizer3D_cosine[var6]; // L: 11236 + int var10 = var3 * var8 + var9 * var2 >> 16; // L: 11237 + int var11 = var3 * var9 - var8 * var2 >> 16; // L: 11238 + if (var7 > 2500) { + var4.method6989(var10 + var5.width / 2 - var4.width / 2, var5.height / 2 - var11 - var4.height / 2, var0, var1, var5.width, var5.height, var5.xStarts, var5.xWidths); // L: 11239 + } else { + var4.drawTransBgAt(var0 + var10 + var5.width / 2 - var4.width / 2, var5.height / 2 + var1 - var11 - var4.height / 2); // L: 11240 + } + + } + } + } // L: 11241 + + @ObfuscatedName("lt") + @ObfuscatedSignature( + descriptor = "(Ljava/lang/String;ZB)V", + garbageValue = "42" + ) + @Export("findItemDefinitions") + static void findItemDefinitions(String var0, boolean var1) { + var0 = var0.toLowerCase(); // L: 11427 + short[] var2 = new short[16]; // L: 11428 + int var3 = 0; // L: 11429 + + for (int var4 = 0; var4 < ItemComposition.ItemDefinition_fileCount; ++var4) { // L: 11430 + ItemComposition var9 = class260.ItemDefinition_get(var4); // L: 11431 + if ((!var1 || var9.isTradable) && var9.noteTemplate == -1 && var9.name.toLowerCase().indexOf(var0) != -1) { // L: 11432 11433 11434 + if (var3 >= 250) { // L: 11435 + ClanSettings.foundItemIdCount = -1; // L: 11436 + Clock.foundItemIds = null; // L: 11437 + return; // L: 11438 + } + + if (var3 >= var2.length) { // L: 11440 + short[] var6 = new short[var2.length * 2]; // L: 11441 + + for (int var7 = 0; var7 < var3; ++var7) { // L: 11442 + var6[var7] = var2[var7]; + } + + var2 = var6; // L: 11443 + } + + var2[var3++] = (short)var4; // L: 11445 + } + } + + Clock.foundItemIds = var2; // L: 11447 + Canvas.foundItemIndex = 0; // L: 11448 + ClanSettings.foundItemIdCount = var3; // L: 11449 + String[] var8 = new String[ClanSettings.foundItemIdCount]; // L: 11450 + + for (int var5 = 0; var5 < ClanSettings.foundItemIdCount; ++var5) { // L: 11451 + var8[var5] = class260.ItemDefinition_get(var2[var5]).name; + } + + short[] var10 = Clock.foundItemIds; // L: 11452 + PacketBufferNode.sortItemsByName(var8, var10, 0, var8.length - 1); // L: 11454 + } // L: 11456 } diff --git a/runescape-client/src/main/java/ObjectNode.java b/runescape-client/src/main/java/ObjectNode.java index 90c2887102..5a582a0c5c 100644 --- a/runescape-client/src/main/java/ObjectNode.java +++ b/runescape-client/src/main/java/ObjectNode.java @@ -2,10 +2,10 @@ import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; -@ObfuscatedName("ml") +@ObfuscatedName("mk") @Implements("ObjectNode") public class ObjectNode extends Node { - @ObfuscatedName("h") + @ObfuscatedName("v") @Export("obj") public final Object obj; diff --git a/runescape-client/src/main/java/ObjectSound.java b/runescape-client/src/main/java/ObjectSound.java index 9ea3e71d02..7a6b4b3d03 100644 --- a/runescape-client/src/main/java/ObjectSound.java +++ b/runescape-client/src/main/java/ObjectSound.java @@ -4,92 +4,87 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("bq") +@ObfuscatedName("bc") @Implements("ObjectSound") public final class ObjectSound extends Node { - @ObfuscatedName("h") + @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "Lka;" + descriptor = "Lkx;" ) @Export("objectSounds") static NodeDeque objectSounds; - @ObfuscatedName("oz") - @ObfuscatedSignature( - descriptor = "Lmn;" - ) - static class339 field935; - @ObfuscatedName("c") + @ObfuscatedName("n") @ObfuscatedGetter( - intValue = 1117134453 + intValue = 1262714503 ) @Export("plane") int plane; - @ObfuscatedName("o") + @ObfuscatedName("f") @ObfuscatedGetter( - intValue = -1380268011 + intValue = 382039955 ) @Export("x") int x; - @ObfuscatedName("g") + @ObfuscatedName("y") @ObfuscatedGetter( - intValue = 381586537 + intValue = -377542945 ) @Export("y") int y; - @ObfuscatedName("l") + @ObfuscatedName("p") @ObfuscatedGetter( - intValue = 858005117 + intValue = -1913199289 ) - int field926; - @ObfuscatedName("z") + int field956; + @ObfuscatedName("j") @ObfuscatedGetter( - intValue = 2023231639 + intValue = 846164283 ) - int field927; - @ObfuscatedName("t") - @ObfuscatedGetter( - intValue = 260916973 - ) - int field929; - @ObfuscatedName("v") - @ObfuscatedGetter( - intValue = -226676411 - ) - @Export("soundEffectId") - int soundEffectId; - @ObfuscatedName("b") - @ObfuscatedSignature( - descriptor = "Lbk;" - ) - @Export("stream1") - RawPcmStream stream1; - @ObfuscatedName("q") - @ObfuscatedGetter( - intValue = 378956141 - ) - int field934; - @ObfuscatedName("i") - @ObfuscatedGetter( - intValue = -848976241 - ) - int field932; - @ObfuscatedName("x") - @Export("soundEffectIds") - int[] soundEffectIds; - @ObfuscatedName("k") - @ObfuscatedGetter( - intValue = 1700564665 - ) - int field923; + int field957; @ObfuscatedName("r") @ObfuscatedSignature( - descriptor = "Lem;" + descriptor = "Leg;" ) @Export("obj") ObjectComposition obj; - @ObfuscatedName("p") + @ObfuscatedName("b") + @ObfuscatedGetter( + intValue = 2101998419 + ) + int field958; + @ObfuscatedName("d") + @ObfuscatedGetter( + intValue = 2113426875 + ) + @Export("soundEffectId") + int soundEffectId; + @ObfuscatedName("s") + @ObfuscatedGetter( + intValue = 1385478755 + ) + int field961; + @ObfuscatedName("u") @ObfuscatedSignature( - descriptor = "Lbk;" + descriptor = "Lbv;" + ) + @Export("stream1") + RawPcmStream stream1; + @ObfuscatedName("l") + @ObfuscatedGetter( + intValue = -1819837691 + ) + int field964; + @ObfuscatedName("o") + @Export("soundEffectIds") + int[] soundEffectIds; + @ObfuscatedName("c") + @ObfuscatedGetter( + intValue = 1313201795 + ) + int field954; + @ObfuscatedName("e") + @ObfuscatedSignature( + descriptor = "Lbv;" ) @Export("stream2") RawPcmStream stream2; @@ -101,66 +96,172 @@ public final class ObjectSound extends Node { ObjectSound() { } // L: 27 - @ObfuscatedName("h") + @ObfuscatedName("f") @ObfuscatedSignature( descriptor = "(B)V", - garbageValue = "-89" + garbageValue = "10" ) @Export("set") void set() { - int var1 = this.soundEffectId; // L: 30 - ObjectComposition var2 = this.obj.transform(); // L: 31 - if (var2 != null) { // L: 32 - this.soundEffectId = var2.ambientSoundId; // L: 33 - this.field929 = var2.int4 * 128; // L: 34 - this.field934 = var2.int5; // L: 35 - this.field932 = var2.int6; // L: 36 - this.soundEffectIds = var2.soundEffectIds; // L: 37 + int var1 = this.soundEffectId; // L: 50 + ObjectComposition var2 = this.obj.transform(); // L: 51 + if (var2 != null) { // L: 52 + this.soundEffectId = var2.ambientSoundId; // L: 53 + this.field958 = var2.int4 * 128; // L: 54 + this.field961 = var2.int5; // L: 55 + this.field964 = var2.int6; // L: 56 + this.soundEffectIds = var2.soundEffectIds; // L: 57 } else { - this.soundEffectId = -1; // L: 40 - this.field929 = 0; // L: 41 - this.field934 = 0; // L: 42 - this.field932 = 0; // L: 43 - this.soundEffectIds = null; // L: 44 + this.soundEffectId = -1; // L: 60 + this.field958 = 0; // L: 61 + this.field961 = 0; // L: 62 + this.field964 = 0; // L: 63 + this.soundEffectIds = null; // L: 64 } - if (var1 != this.soundEffectId && this.stream1 != null) { // L: 46 - FloorOverlayDefinition.pcmStreamMixer.removeSubStream(this.stream1); // L: 47 - this.stream1 = null; // L: 48 + if (var1 != this.soundEffectId && this.stream1 != null) { // L: 66 + class308.pcmStreamMixer.removeSubStream(this.stream1); // L: 67 + this.stream1 = null; // L: 68 } - } // L: 50 + } // L: 70 - @ObfuscatedName("bp") + @ObfuscatedName("ki") @ObfuscatedSignature( - descriptor = "([BI)[B", - garbageValue = "1381719532" + descriptor = "(Lio;IIII)V", + garbageValue = "-1477565954" ) - @Export("decompressBytes") - static final byte[] decompressBytes(byte[] var0) { - Buffer var1 = new Buffer(var0); // L: 381 - int var2 = var1.readUnsignedByte(); // L: 382 - int var3 = var1.readInt(); // L: 383 - if (var3 < 0 || AbstractArchive.field3611 != 0 && var3 > AbstractArchive.field3611) { // L: 384 - throw new RuntimeException(); // L: 385 - } else if (var2 == 0) { // L: 387 - byte[] var6 = new byte[var3]; // L: 388 - var1.readBytes(var6, 0, var3); // L: 389 - return var6; // L: 390 - } else { - int var4 = var1.readInt(); // L: 393 - if (var4 >= 0 && (AbstractArchive.field3611 == 0 || var4 <= AbstractArchive.field3611)) { // L: 394 - byte[] var5 = new byte[var4]; // L: 397 - if (var2 == 1) { // L: 398 - BZip2Decompressor.BZip2Decompressor_decompress(var5, var4, var0, var3, 9); - } else { - AbstractArchive.gzipDecompressor.decompress(var1, var5); // L: 399 + @Export("drawMinimap") + static final void drawMinimap(Widget var0, int var1, int var2, int var3) { + HealthBarUpdate.playPcmPlayers(); // L: 11121 + SpriteMask var4 = var0.getSpriteMask(false); // L: 11122 + if (var4 != null) { // L: 11123 + Rasterizer2D.Rasterizer2D_setClip(var1, var2, var4.width + var1, var2 + var4.height); // L: 11124 + if (Client.minimapState != 2 && Client.minimapState != 5) { // L: 11125 + int var5 = Client.camAngleY & 2047; // L: 11126 + int var6 = class93.localPlayer.x / 32 + 48; // L: 11127 + int var7 = 464 - class93.localPlayer.y / 32; // L: 11128 + GameEngine.sceneMinimapSprite.drawRotatedMaskedCenteredAround(var1, var2, var4.width, var4.height, var6, var7, var5, 256, var4.xStarts, var4.xWidths); // L: 11129 + + int var8; + int var10; + int var16; + for (var8 = 0; var8 < Client.mapIconCount; ++var8) { // L: 11130 + var16 = Client.mapIconXs[var8] * 4 + 2 - class93.localPlayer.x / 32; // L: 11131 + var10 = Client.mapIconYs[var8] * 4 + 2 - class93.localPlayer.y / 32; // L: 11132 + ObjectComposition.drawSpriteOnMinimap(var1, var2, var16, var10, Client.mapIcons[var8], var4); // L: 11133 } - return var5; // L: 400 + int var11; + int var12; + for (var8 = 0; var8 < 104; ++var8) { // L: 11135 + for (var16 = 0; var16 < 104; ++var16) { // L: 11136 + NodeDeque var14 = Client.groundItems[class22.Client_plane][var8][var16]; // L: 11137 + if (var14 != null) { // L: 11138 + var11 = var8 * 4 + 2 - class93.localPlayer.x / 32; // L: 11139 + var12 = var16 * 4 + 2 - class93.localPlayer.y / 32; // L: 11140 + ObjectComposition.drawSpriteOnMinimap(var1, var2, var11, var12, class170.mapDotSprites[0], var4); // L: 11141 + } + } + } + + for (var8 = 0; var8 < Client.npcCount; ++var8) { // L: 11145 + NPC var9 = Client.npcs[Client.npcIndices[var8]]; // L: 11146 + if (var9 != null && var9.isVisible()) { // L: 11147 + NPCComposition var18 = var9.definition; // L: 11148 + if (var18 != null && var18.transforms != null) { // L: 11149 + var18 = var18.transform(); + } + + if (var18 != null && var18.drawMapDot && var18.isInteractable) { // L: 11150 + var11 = var9.x / 32 - class93.localPlayer.x / 32; // L: 11151 + var12 = var9.y / 32 - class93.localPlayer.y / 32; // L: 11152 + ObjectComposition.drawSpriteOnMinimap(var1, var2, var11, var12, class170.mapDotSprites[1], var4); // L: 11153 + } + } + } + + var8 = Players.Players_count; // L: 11157 + int[] var17 = Players.Players_indices; // L: 11158 + + for (var10 = 0; var10 < var8; ++var10) { // L: 11159 + Player var15 = Client.players[var17[var10]]; // L: 11160 + if (var15 != null && var15.isVisible() && !var15.isHidden && var15 != class93.localPlayer) { // L: 11161 + var12 = var15.x / 32 - class93.localPlayer.x / 32; // L: 11162 + int var13 = var15.y / 32 - class93.localPlayer.y / 32; // L: 11163 + if (var15.isFriend()) { // L: 11164 + ObjectComposition.drawSpriteOnMinimap(var1, var2, var12, var13, class170.mapDotSprites[3], var4); + } else if (class93.localPlayer.team != 0 && var15.team != 0 && var15.team == class93.localPlayer.team) { // L: 11165 + ObjectComposition.drawSpriteOnMinimap(var1, var2, var12, var13, class170.mapDotSprites[4], var4); + } else if (var15.isFriendsChatMember()) { // L: 11166 + ObjectComposition.drawSpriteOnMinimap(var1, var2, var12, var13, class170.mapDotSprites[5], var4); + } else if (var15.isClanMember()) { // L: 11167 + ObjectComposition.drawSpriteOnMinimap(var1, var2, var12, var13, class170.mapDotSprites[6], var4); + } else { + ObjectComposition.drawSpriteOnMinimap(var1, var2, var12, var13, class170.mapDotSprites[2], var4); // L: 11168 + } + } + } + + if (Client.hintArrowType != 0 && Client.cycle % 20 < 10) { // L: 11171 + if (Client.hintArrowType == 1 && Client.hintArrowNpcIndex >= 0 && Client.hintArrowNpcIndex < Client.npcs.length) { // L: 11172 + NPC var19 = Client.npcs[Client.hintArrowNpcIndex]; // L: 11173 + if (var19 != null) { // L: 11174 + var11 = var19.x / 32 - class93.localPlayer.x / 32; // L: 11175 + var12 = var19.y / 32 - class93.localPlayer.y / 32; // L: 11176 + MenuAction.worldToMinimap(var1, var2, var11, var12, WorldMapArea.mapMarkerSprites[1], var4); // L: 11177 + } + } + + if (Client.hintArrowType == 2) { // L: 11180 + var10 = Client.hintArrowX * 4 - VertexNormal.baseX * 4 + 2 - class93.localPlayer.x / 32; // L: 11181 + var11 = Client.hintArrowY * 4 - SoundSystem.baseY * 4 + 2 - class93.localPlayer.y / 32; // L: 11182 + MenuAction.worldToMinimap(var1, var2, var10, var11, WorldMapArea.mapMarkerSprites[1], var4); // L: 11183 + } + + if (Client.hintArrowType == 10 && Client.hintArrowPlayerIndex >= 0 && Client.hintArrowPlayerIndex < Client.players.length) { // L: 11185 + Player var20 = Client.players[Client.hintArrowPlayerIndex]; // L: 11186 + if (var20 != null) { // L: 11187 + var11 = var20.x / 32 - class93.localPlayer.x / 32; // L: 11188 + var12 = var20.y / 32 - class93.localPlayer.y / 32; // L: 11189 + MenuAction.worldToMinimap(var1, var2, var11, var12, WorldMapArea.mapMarkerSprites[1], var4); // L: 11190 + } + } + } + + if (Client.destinationX != 0) { // L: 11194 + var10 = Client.destinationX * 4 + 2 - class93.localPlayer.x / 32; // L: 11195 + var11 = Client.destinationY * 4 + 2 - class93.localPlayer.y / 32; // L: 11196 + ObjectComposition.drawSpriteOnMinimap(var1, var2, var10, var11, WorldMapArea.mapMarkerSprites[0], var4); // L: 11197 + } + + if (!class93.localPlayer.isHidden) { // L: 11199 + Rasterizer2D.Rasterizer2D_fillRectangle(var4.width / 2 + var1 - 1, var4.height / 2 + var2 - 1, 3, 3, 16777215); + } } else { - throw new RuntimeException(); // L: 395 + Rasterizer2D.Rasterizer2D_fillMaskedRectangle(var1, var2, 0, var4.xStarts, var4.xWidths); // L: 11201 + } + + Client.field780[var3] = true; // L: 11202 + } + } // L: 11203 + + @ObfuscatedName("ls") + @ObfuscatedSignature( + descriptor = "(I)V", + garbageValue = "-1750320042" + ) + static void method1761() { + if (UserComparator3.field1444 != null) { // L: 11541 + Client.field717 = Client.cycle; // L: 11542 + UserComparator3.field1444.method5126(); // L: 11543 + + for (int var0 = 0; var0 < Client.players.length; ++var0) { // L: 11544 + if (Client.players[var0] != null) { // L: 11545 + UserComparator3.field1444.method5117((Client.players[var0].x >> 7) + VertexNormal.baseX, (Client.players[var0].y >> 7) + SoundSystem.baseY); // L: 11546 + } } } - } + + } // L: 11550 } diff --git a/runescape-client/src/main/java/Occluder.java b/runescape-client/src/main/java/Occluder.java index f827563a5f..5fc4dbad39 100644 --- a/runescape-client/src/main/java/Occluder.java +++ b/runescape-client/src/main/java/Occluder.java @@ -3,146 +3,175 @@ 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("ga") +@ObfuscatedName("gn") @Implements("Occluder") public final class Occluder { - @ObfuscatedName("h") + @ObfuscatedName("gn") @ObfuscatedGetter( - intValue = 1689903637 + intValue = 1575841489 + ) + static int field2387; + @ObfuscatedName("v") + @ObfuscatedGetter( + intValue = -1269044325 ) @Export("minTileX") int minTileX; - @ObfuscatedName("c") + @ObfuscatedName("n") @ObfuscatedGetter( - intValue = -1260940049 + intValue = -386233567 ) @Export("maxTileX") int maxTileX; - @ObfuscatedName("o") + @ObfuscatedName("f") @ObfuscatedGetter( - intValue = -117710629 + intValue = 725968227 ) @Export("minTileY") int minTileY; - @ObfuscatedName("g") + @ObfuscatedName("y") @ObfuscatedGetter( - intValue = -1407439953 + intValue = 1353247321 ) @Export("maxTileY") int maxTileY; - @ObfuscatedName("l") + @ObfuscatedName("p") @ObfuscatedGetter( - intValue = 2009142717 + intValue = -713034583 ) @Export("type") int type; - @ObfuscatedName("z") + @ObfuscatedName("j") @ObfuscatedGetter( - intValue = -1177929287 + intValue = 818345769 ) @Export("minX") int minX; - @ObfuscatedName("t") + @ObfuscatedName("r") @ObfuscatedGetter( - intValue = 1697237449 + intValue = -635118225 ) @Export("maxX") int maxX; - @ObfuscatedName("v") + @ObfuscatedName("b") @ObfuscatedGetter( - intValue = 1873689371 + intValue = -621751483 ) @Export("minZ") int minZ; - @ObfuscatedName("b") + @ObfuscatedName("d") @ObfuscatedGetter( - intValue = 20317203 + intValue = 1703842397 ) @Export("maxZ") int maxZ; - @ObfuscatedName("q") + @ObfuscatedName("s") @ObfuscatedGetter( - intValue = -1660830247 + intValue = -189041849 ) @Export("minY") int minY; - @ObfuscatedName("i") + @ObfuscatedName("u") @ObfuscatedGetter( - intValue = -1623185181 + intValue = 1423545413 ) @Export("maxY") int maxY; - @ObfuscatedName("x") + @ObfuscatedName("l") @ObfuscatedGetter( - intValue = 1102414179 - ) - int field2374; - @ObfuscatedName("k") - @ObfuscatedGetter( - intValue = -1992323793 + intValue = -2138961749 ) int field2380; - @ObfuscatedName("r") + @ObfuscatedName("o") @ObfuscatedGetter( - intValue = -1961407493 + intValue = -853135435 ) - int field2376; - @ObfuscatedName("p") + int field2385; + @ObfuscatedName("c") @ObfuscatedGetter( - intValue = 1190526879 + intValue = -668340379 ) - int field2377; - @ObfuscatedName("a") - @ObfuscatedGetter( - intValue = 897436961 - ) - int field2368; + int field2372; @ObfuscatedName("e") @ObfuscatedGetter( - intValue = 1480308041 + intValue = -2125693873 ) - int field2378; - @ObfuscatedName("d") + int field2382; + @ObfuscatedName("g") @ObfuscatedGetter( - intValue = -1837563395 + intValue = 1761408947 ) - int field2363; + int field2384; + @ObfuscatedName("a") + @ObfuscatedGetter( + intValue = 536172955 + ) + int field2369; + @ObfuscatedName("k") + @ObfuscatedGetter( + intValue = -533190237 + ) + int field2386; Occluder() { } // L: 23 - @ObfuscatedName("c") + @ObfuscatedName("l") @ObfuscatedSignature( - descriptor = "(Lnk;Ljava/lang/String;I)I", - garbageValue = "1064465292" + descriptor = "(IIB)I", + garbageValue = "106" ) - public static int method4089(Buffer var0, String var1) { - int var2 = var0.offset; // L: 18 - byte[] var3 = Language.method5070(var1); // L: 19 - var0.writeSmartByteShort(var3.length); // L: 20 - var0.offset += class377.huffman.compress(var3, 0, var3.length, var0.array, var0.offset); // L: 21 - return var0.offset - var2; // L: 22 + static final int method4109(int var0, int var1) { + int var2 = GrandExchangeOfferAgeComparator.method5067(var0 - 1, var1 - 1) + GrandExchangeOfferAgeComparator.method5067(1 + var0, var1 - 1) + GrandExchangeOfferAgeComparator.method5067(var0 - 1, 1 + var1) + GrandExchangeOfferAgeComparator.method5067(1 + var0, 1 + var1); // L: 833 + int var3 = GrandExchangeOfferAgeComparator.method5067(var0 - 1, var1) + GrandExchangeOfferAgeComparator.method5067(var0 + 1, var1) + GrandExchangeOfferAgeComparator.method5067(var0, var1 - 1) + GrandExchangeOfferAgeComparator.method5067(var0, var1 + 1); // L: 834 + int var4 = GrandExchangeOfferAgeComparator.method5067(var0, var1); // L: 835 + return var2 / 16 + var3 / 8 + var4 / 4; // L: 836 } - @ObfuscatedName("hc") + @ObfuscatedName("z") @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "281084501" + descriptor = "(ILcf;ZI)I", + garbageValue = "-1000061278" ) - static void method4090() { - Client.menuOptionsCount = 0; // L: 7822 - Client.isMenuOpen = false; // L: 7823 - } // L: 7824 + static int method4110(int var0, Script var1, boolean var2) { + Widget var3 = Frames.getWidget(Interpreter.Interpreter_intStack[--class44.Interpreter_intStackSize]); // L: 1376 + if (var0 == ScriptOpcodes.IF_GETTARGETMASK) { // L: 1377 + Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = AttackOption.Widget_unpackTargetMask(class21.getWidgetFlags(var3)); // L: 1378 + return 1; // L: 1379 + } else if (var0 != ScriptOpcodes.IF_GETOP) { // L: 1381 + if (var0 == ScriptOpcodes.IF_GETOPBASE) { // L: 1388 + if (var3.dataText == null) { // L: 1389 + Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = ""; + } else { + Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var3.dataText; // L: 1390 + } - @ObfuscatedName("kd") + return 1; // L: 1391 + } else { + return 2; // L: 1393 + } + } else { + int var4 = Interpreter.Interpreter_intStack[--class44.Interpreter_intStackSize]; // L: 1382 + --var4; // L: 1383 + if (var3.actions != null && var4 < var3.actions.length && var3.actions[var4] != null) { // L: 1384 + Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var3.actions[var4]; // L: 1385 + } else { + Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = ""; + } + + return 1; // L: 1386 + } + } + + @ObfuscatedName("ig") @ObfuscatedSignature( - descriptor = "(II)V", - garbageValue = "-128058403" + descriptor = "(Ljava/lang/String;Ljava/lang/String;IIIII)V", + garbageValue = "-1750560328" ) - static final void method4088(int var0) { - var0 = Math.min(Math.max(var0, 0), 127); // L: 11209 - class12.clientPreferences.areaSoundEffectsVolume = var0; // L: 11210 - KeyHandler.savePreferences(); // L: 11211 - } // L: 11212 + @Export("insertMenuItemNoShift") + public static final void insertMenuItemNoShift(String var0, String var1, int var2, int var3, int var4, int var5) { + BoundaryObject.insertMenuItem(var0, var1, var2, var3, var4, var5, false); // L: 8801 + } // L: 8802 } diff --git a/runescape-client/src/main/java/PacketBuffer.java b/runescape-client/src/main/java/PacketBuffer.java index d5323ccf22..455b8a0ebc 100644 --- a/runescape-client/src/main/java/PacketBuffer.java +++ b/runescape-client/src/main/java/PacketBuffer.java @@ -4,86 +4,86 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("nm") +@ObfuscatedName("nb") @Implements("PacketBuffer") public class PacketBuffer extends Buffer { - @ObfuscatedName("c") - static final int[] field4157; - @ObfuscatedName("h") + @ObfuscatedName("n") + static final int[] field4153; + @ObfuscatedName("v") @ObfuscatedSignature( descriptor = "Loy;" ) @Export("isaacCipher") IsaacCipher isaacCipher; - @ObfuscatedName("o") + @ObfuscatedName("f") @ObfuscatedGetter( - intValue = -1204003105 + intValue = -958717145 ) @Export("bitIndex") int bitIndex; static { - field4157 = new int[]{0, 1, 3, 7, 15, 31, 63, 127, 255, 511, 1023, 2047, 4095, 8191, 16383, 32767, 65535, 131071, 262143, 524287, 1048575, 2097151, 4194303, 8388607, 16777215, 33554431, 67108863, 134217727, 268435455, 536870911, 1073741823, Integer.MAX_VALUE, -1}; // L: 7 + field4153 = new int[]{0, 1, 3, 7, 15, 31, 63, 127, 255, 511, 1023, 2047, 4095, 8191, 16383, 32767, 65535, 131071, 262143, 524287, 1048575, 2097151, 4194303, 8388607, 16777215, 33554431, 67108863, 134217727, 268435455, 536870911, 1073741823, Integer.MAX_VALUE, -1}; // L: 7 } public PacketBuffer(int var1) { super(var1); // L: 11 } // L: 12 - @ObfuscatedName("h") + @ObfuscatedName("v") @ObfuscatedSignature( descriptor = "([II)V", - garbageValue = "-1375320443" + garbageValue = "-1125763957" ) @Export("newIsaacCipher") public void newIsaacCipher(int[] var1) { this.isaacCipher = new IsaacCipher(var1); // L: 15 } // L: 16 - @ObfuscatedName("c") + @ObfuscatedName("n") @ObfuscatedSignature( descriptor = "(Loy;B)V", - garbageValue = "-33" + garbageValue = "78" ) @Export("setIsaacCipher") public void setIsaacCipher(IsaacCipher var1) { this.isaacCipher = var1; // L: 19 } // L: 20 - @ObfuscatedName("o") + @ObfuscatedName("f") @ObfuscatedSignature( descriptor = "(II)V", - garbageValue = "1450829490" + garbageValue = "60225869" ) @Export("writeByteIsaac") public void writeByteIsaac(int var1) { super.array[++super.offset - 1] = (byte)(var1 + this.isaacCipher.nextInt()); // L: 23 } // L: 24 - @ObfuscatedName("g") + @ObfuscatedName("y") @ObfuscatedSignature( - descriptor = "(I)I", - garbageValue = "-335054664" + descriptor = "(B)I", + garbageValue = "7" ) @Export("readByteIsaac") public int readByteIsaac() { return super.array[++super.offset - 1] - this.isaacCipher.nextInt() & 255; // L: 27 } - @ObfuscatedName("l") + @ObfuscatedName("p") @ObfuscatedSignature( descriptor = "(I)Z", - garbageValue = "2018293173" + garbageValue = "-1334182155" ) - public boolean method6395() { - int var1 = super.array[super.offset] - this.isaacCipher.method7019() & 255; // L: 31 + public boolean method6529() { + int var1 = super.array[super.offset] - this.isaacCipher.method7096() & 255; // L: 31 return var1 >= 128; // L: 32 } - @ObfuscatedName("z") + @ObfuscatedName("j") @ObfuscatedSignature( descriptor = "(I)I", - garbageValue = "1959495715" + garbageValue = "1807969364" ) @Export("readSmartByteShortIsaac") public int readSmartByteShortIsaac() { @@ -91,32 +91,32 @@ public class PacketBuffer extends Buffer { return var1 < 128 ? var1 : (var1 - 128 << 8) + (super.array[++super.offset - 1] - this.isaacCipher.nextInt() & 255); // L: 38 39 } - @ObfuscatedName("t") + @ObfuscatedName("r") @ObfuscatedSignature( - descriptor = "([BIII)V", - garbageValue = "150376609" + descriptor = "([BIIS)V", + garbageValue = "255" ) - public void method6397(byte[] var1, int var2, int var3) { + public void method6521(byte[] var1, int var2, int var3) { for (int var4 = 0; var4 < var3; ++var4) { // L: 43 var1[var4 + var2] = (byte)(super.array[++super.offset - 1] - this.isaacCipher.nextInt()); } } // L: 44 - @ObfuscatedName("v") + @ObfuscatedName("b") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "-1034759074" + garbageValue = "-201706662" ) @Export("importIndex") public void importIndex() { this.bitIndex = super.offset * 8; // L: 47 } // L: 48 - @ObfuscatedName("b") + @ObfuscatedName("d") @ObfuscatedSignature( - descriptor = "(II)I", - garbageValue = "-720634957" + descriptor = "(IB)I", + garbageValue = "-61" ) @Export("readBits") public int readBits(int var1) { @@ -125,33 +125,33 @@ public class PacketBuffer extends Buffer { int var4 = 0; // L: 53 for (this.bitIndex += var1; var1 > var3; var3 = 8) { // L: 54 55 58 - var4 += (super.array[var2++] & field4157[var3]) << var1 - var3; // L: 56 + var4 += (super.array[var2++] & field4153[var3]) << var1 - var3; // L: 56 var1 -= var3; // L: 57 } if (var3 == var1) { // L: 60 - var4 += super.array[var2] & field4157[var3]; + var4 += super.array[var2] & field4153[var3]; } else { - var4 += super.array[var2] >> var3 - var1 & field4157[var1]; // L: 61 + var4 += super.array[var2] >> var3 - var1 & field4153[var1]; // L: 61 } return var4; // L: 62 } - @ObfuscatedName("q") + @ObfuscatedName("s") @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "-1595298458" + descriptor = "(B)V", + garbageValue = "-32" ) @Export("exportIndex") public void exportIndex() { super.offset = (this.bitIndex + 7) / 8; // L: 66 } // L: 67 - @ObfuscatedName("i") + @ObfuscatedName("u") @ObfuscatedSignature( descriptor = "(IB)I", - garbageValue = "94" + garbageValue = "41" ) @Export("bitsRemaining") public int bitsRemaining(int var1) { diff --git a/runescape-client/src/main/java/PacketBufferNode.java b/runescape-client/src/main/java/PacketBufferNode.java index 8aac469b76..7e6452c43f 100644 --- a/runescape-client/src/main/java/PacketBufferNode.java +++ b/runescape-client/src/main/java/PacketBufferNode.java @@ -4,183 +4,116 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("hm") +@ObfuscatedName("hq") @Implements("PacketBufferNode") public class PacketBufferNode extends Node { - @ObfuscatedName("l") + @ObfuscatedName("p") @ObfuscatedSignature( - descriptor = "[Lhm;" + descriptor = "[Lhq;" ) @Export("PacketBufferNode_packetBufferNodes") static PacketBufferNode[] PacketBufferNode_packetBufferNodes; - @ObfuscatedName("z") + @ObfuscatedName("j") @ObfuscatedGetter( - intValue = 916049887 + intValue = -227614929 ) @Export("PacketBufferNode_packetBufferNodeCount") static int PacketBufferNode_packetBufferNodeCount; - @ObfuscatedName("h") + @ObfuscatedName("hw") @ObfuscatedSignature( - descriptor = "Lha;" + descriptor = "[Loh;" + ) + @Export("headIconHintSprites") + static SpritePixels[] headIconHintSprites; + @ObfuscatedName("v") + @ObfuscatedSignature( + descriptor = "Lhs;" ) @Export("clientPacket") - public ClientPacket clientPacket; - @ObfuscatedName("c") + ClientPacket clientPacket; + @ObfuscatedName("n") @ObfuscatedGetter( - intValue = 22124575 + intValue = 1934863547 ) @Export("clientPacketLength") - public int clientPacketLength; - @ObfuscatedName("o") + int clientPacketLength; + @ObfuscatedName("f") @ObfuscatedSignature( - descriptor = "Lnm;" + descriptor = "Lnb;" ) @Export("packetBuffer") public PacketBuffer packetBuffer; - @ObfuscatedName("g") + @ObfuscatedName("y") @ObfuscatedGetter( - intValue = 564962157 + intValue = -2120774193 ) @Export("index") public int index; static { - PacketBufferNode_packetBufferNodes = new PacketBufferNode[300]; // L: 13 - PacketBufferNode_packetBufferNodeCount = 0; // L: 14 + PacketBufferNode_packetBufferNodes = new PacketBufferNode[300]; + PacketBufferNode_packetBufferNodeCount = 0; } PacketBufferNode() { - } // L: 19 + } - @ObfuscatedName("o") + @ObfuscatedName("f") @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "584072698" + descriptor = "(B)V", + garbageValue = "100" ) @Export("release") public void release() { - if (PacketBufferNode_packetBufferNodeCount < PacketBufferNode_packetBufferNodes.length) { // L: 42 - PacketBufferNode_packetBufferNodes[++PacketBufferNode_packetBufferNodeCount - 1] = this; // L: 43 + if (PacketBufferNode_packetBufferNodeCount < PacketBufferNode_packetBufferNodes.length) { // L: 61 + PacketBufferNode_packetBufferNodes[++PacketBufferNode_packetBufferNodeCount - 1] = this; // L: 62 } - } // L: 44 + } // L: 63 - @ObfuscatedName("kk") + @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "(Liv;IIII)V", - garbageValue = "-476832840" + descriptor = "([Ljava/lang/String;[SIII)V", + garbageValue = "1137110463" ) - @Export("drawMinimap") - static final void drawMinimap(Widget var0, int var1, int var2, int var3) { - WorldMapIcon_1.playPcmPlayers(); // L: 11380 - SpriteMask var4 = var0.getSpriteMask(false); // L: 11381 - if (var4 != null) { // L: 11382 - Rasterizer2D.Rasterizer2D_setClip(var1, var2, var4.width + var1, var2 + var4.height); // L: 11383 - if (Client.minimapState != 2 && Client.minimapState != 5) { // L: 11384 - int var5 = Client.camAngleY & 2047; // L: 11385 - int var6 = class35.localPlayer.x / 32 + 48; // L: 11386 - int var7 = 464 - class35.localPlayer.y / 32; // L: 11387 - UserComparator8.sceneMinimapSprite.drawRotatedMaskedCenteredAround(var1, var2, var4.width, var4.height, var6, var7, var5, 256, var4.xStarts, var4.xWidths); // L: 11388 + @Export("sortItemsByName") + public static void sortItemsByName(String[] var0, short[] var1, int var2, int var3) { + if (var2 < var3) { // L: 9 + int var4 = (var3 + var2) / 2; // L: 10 + int var5 = var2; // L: 11 + String var6 = var0[var4]; // L: 12 + var0[var4] = var0[var3]; // L: 13 + var0[var3] = var6; // L: 14 + short var7 = var1[var4]; // L: 15 + var1[var4] = var1[var3]; // L: 16 + var1[var3] = var7; // L: 17 - int var8; - int var10; - int var16; - for (var8 = 0; var8 < Client.mapIconCount; ++var8) { // L: 11389 - var16 = Client.mapIconXs[var8] * 4 + 2 - class35.localPlayer.x / 32; // L: 11390 - var10 = Client.mapIconYs[var8] * 4 + 2 - class35.localPlayer.y / 32; // L: 11391 - class10.drawSpriteOnMinimap(var1, var2, var16, var10, Client.mapIcons[var8], var4); // L: 11392 + for (int var8 = var2; var8 < var3; ++var8) { // L: 18 + if (var6 == null || var0[var8] != null && var0[var8].compareTo(var6) < (var8 & 1)) { // L: 19 + String var9 = var0[var8]; // L: 20 + var0[var8] = var0[var5]; // L: 21 + var0[var5] = var9; // L: 22 + short var10 = var1[var8]; // L: 23 + var1[var8] = var1[var5]; // L: 24 + var1[var5++] = var10; // L: 25 } - - int var11; - int var12; - for (var8 = 0; var8 < 104; ++var8) { // L: 11394 - for (var16 = 0; var16 < 104; ++var16) { // L: 11395 - NodeDeque var14 = Client.groundItems[ParamComposition.Client_plane][var8][var16]; // L: 11396 - if (var14 != null) { // L: 11397 - var11 = var8 * 4 + 2 - class35.localPlayer.x / 32; // L: 11398 - var12 = var16 * 4 + 2 - class35.localPlayer.y / 32; // L: 11399 - class10.drawSpriteOnMinimap(var1, var2, var11, var12, class341.mapDotSprites[0], var4); // L: 11400 - } - } - } - - for (var8 = 0; var8 < Client.npcCount; ++var8) { // L: 11404 - NPC var9 = Client.npcs[Client.npcIndices[var8]]; // L: 11405 - if (var9 != null && var9.isVisible()) { // L: 11406 - NPCComposition var18 = var9.definition; // L: 11407 - if (var18 != null && var18.transforms != null) { // L: 11408 - var18 = var18.transform(); - } - - if (var18 != null && var18.drawMapDot && var18.isInteractable) { // L: 11409 - var11 = var9.x / 32 - class35.localPlayer.x / 32; // L: 11410 - var12 = var9.y / 32 - class35.localPlayer.y / 32; // L: 11411 - class10.drawSpriteOnMinimap(var1, var2, var11, var12, class341.mapDotSprites[1], var4); // L: 11412 - } - } - } - - var8 = Players.Players_count; // L: 11416 - int[] var17 = Players.Players_indices; // L: 11417 - - for (var10 = 0; var10 < var8; ++var10) { // L: 11418 - Player var15 = Client.players[var17[var10]]; // L: 11419 - if (var15 != null && var15.isVisible() && !var15.isHidden && var15 != class35.localPlayer) { // L: 11420 - var12 = var15.x / 32 - class35.localPlayer.x / 32; // L: 11421 - int var13 = var15.y / 32 - class35.localPlayer.y / 32; // L: 11422 - if (var15.isFriend()) { // L: 11423 - class10.drawSpriteOnMinimap(var1, var2, var12, var13, class341.mapDotSprites[3], var4); - } else if (class35.localPlayer.team != 0 && var15.team != 0 && var15.team == class35.localPlayer.team) { // L: 11424 - class10.drawSpriteOnMinimap(var1, var2, var12, var13, class341.mapDotSprites[4], var4); - } else if (var15.isClanMember()) { // L: 11425 - class10.drawSpriteOnMinimap(var1, var2, var12, var13, class341.mapDotSprites[5], var4); - } else if (var15.method2137()) { // L: 11426 - class10.drawSpriteOnMinimap(var1, var2, var12, var13, class341.mapDotSprites[6], var4); - } else { - class10.drawSpriteOnMinimap(var1, var2, var12, var13, class341.mapDotSprites[2], var4); // L: 11427 - } - } - } - - if (Client.hintArrowType != 0 && Client.cycle % 20 < 10) { // L: 11430 - if (Client.hintArrowType == 1 && Client.hintArrowNpcIndex >= 0 && Client.hintArrowNpcIndex < Client.npcs.length) { // L: 11431 - NPC var19 = Client.npcs[Client.hintArrowNpcIndex]; // L: 11432 - if (var19 != null) { // L: 11433 - var11 = var19.x / 32 - class35.localPlayer.x / 32; // L: 11434 - var12 = var19.y / 32 - class35.localPlayer.y / 32; // L: 11435 - class20.worldToMinimap(var1, var2, var11, var12, ObjectComposition.mapMarkerSprites[1], var4); // L: 11436 - } - } - - if (Client.hintArrowType == 2) { // L: 11439 - var10 = Client.hintArrowX * 4 - JagexCache.baseX * 4 + 2 - class35.localPlayer.x / 32; // L: 11440 - var11 = Client.hintArrowY * 4 - Messages.baseY * 4 + 2 - class35.localPlayer.y / 32; // L: 11441 - class20.worldToMinimap(var1, var2, var10, var11, ObjectComposition.mapMarkerSprites[1], var4); // L: 11442 - } - - if (Client.hintArrowType == 10 && Client.hintArrowPlayerIndex >= 0 && Client.hintArrowPlayerIndex < Client.players.length) { // L: 11444 - Player var20 = Client.players[Client.hintArrowPlayerIndex]; // L: 11445 - if (var20 != null) { // L: 11446 - var11 = var20.x / 32 - class35.localPlayer.x / 32; // L: 11447 - var12 = var20.y / 32 - class35.localPlayer.y / 32; // L: 11448 - class20.worldToMinimap(var1, var2, var11, var12, ObjectComposition.mapMarkerSprites[1], var4); // L: 11449 - } - } - } - - if (Client.destinationX != 0) { // L: 11453 - var10 = Client.destinationX * 4 + 2 - class35.localPlayer.x / 32; // L: 11454 - var11 = Client.destinationY * 4 + 2 - class35.localPlayer.y / 32; // L: 11455 - class10.drawSpriteOnMinimap(var1, var2, var10, var11, ObjectComposition.mapMarkerSprites[0], var4); // L: 11456 - } - - if (!class35.localPlayer.isHidden) { // L: 11458 - Rasterizer2D.Rasterizer2D_fillRectangle(var4.width / 2 + var1 - 1, var4.height / 2 + var2 - 1, 3, 3, 16777215); - } - } else { - Rasterizer2D.Rasterizer2D_fillMaskedRectangle(var1, var2, 0, var4.xStarts, var4.xWidths); // L: 11460 } - Client.field826[var3] = true; // L: 11461 + var0[var3] = var0[var5]; // L: 29 + var0[var5] = var6; // L: 30 + var1[var3] = var1[var5]; // L: 31 + var1[var5] = var7; // L: 32 + sortItemsByName(var0, var1, var2, var5 - 1); // L: 33 + sortItemsByName(var0, var1, var5 + 1, var3); // L: 34 } - } // L: 11462 + + } // L: 36 + + @ObfuscatedName("p") + @ObfuscatedSignature( + descriptor = "(II)Z", + garbageValue = "-250082153" + ) + public static boolean method4367(int var0) { + return var0 >= WorldMapDecorationType.field3162.id && var0 <= WorldMapDecorationType.field3144.id; // L: 46 + } } diff --git a/runescape-client/src/main/java/PacketWriter.java b/runescape-client/src/main/java/PacketWriter.java index 3cfc5c048e..039ce87f76 100644 --- a/runescape-client/src/main/java/PacketWriter.java +++ b/runescape-client/src/main/java/PacketWriter.java @@ -5,102 +5,105 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("dd") +@ObfuscatedName("ds") @Implements("PacketWriter") public class PacketWriter { - @ObfuscatedName("h") + @ObfuscatedName("av") + @Export("null_string") + protected static String null_string; + @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "Llc;" + descriptor = "Lls;" ) @Export("socket") AbstractSocket socket; - @ObfuscatedName("c") + @ObfuscatedName("n") @ObfuscatedSignature( - descriptor = "Lko;" + descriptor = "Lki;" ) @Export("packetBufferNodes") IterableNodeDeque packetBufferNodes; - @ObfuscatedName("o") + @ObfuscatedName("f") @ObfuscatedGetter( - intValue = -1797910505 + intValue = -432974383 ) @Export("bufferSize") int bufferSize; - @ObfuscatedName("g") + @ObfuscatedName("y") @ObfuscatedSignature( - descriptor = "Lnk;" + descriptor = "Lnd;" ) @Export("buffer") Buffer buffer; - @ObfuscatedName("l") + @ObfuscatedName("p") @ObfuscatedSignature( descriptor = "Loy;" ) @Export("isaacCipher") public IsaacCipher isaacCipher; - @ObfuscatedName("z") + @ObfuscatedName("j") @ObfuscatedSignature( - descriptor = "Lnm;" + descriptor = "Lnb;" ) @Export("packetBuffer") PacketBuffer packetBuffer; - @ObfuscatedName("t") + @ObfuscatedName("r") @ObfuscatedSignature( - descriptor = "Lhs;" + descriptor = "Lhl;" ) @Export("serverPacket") ServerPacket serverPacket; - @ObfuscatedName("v") + @ObfuscatedName("b") @ObfuscatedGetter( - intValue = -2096948369 + intValue = -83736147 ) @Export("serverPacketLength") int serverPacketLength; - @ObfuscatedName("b") - boolean field1383; - @ObfuscatedName("q") + @ObfuscatedName("d") + boolean field1408; + @ObfuscatedName("s") @ObfuscatedGetter( - intValue = -553813647 + intValue = 1169449061 ) - int field1384; - @ObfuscatedName("i") + int field1409; + @ObfuscatedName("u") @ObfuscatedGetter( - intValue = -1243600265 + intValue = 239536285 ) @Export("pendingWrites") int pendingWrites; - @ObfuscatedName("x") + @ObfuscatedName("l") @ObfuscatedSignature( - descriptor = "Lhs;" + descriptor = "Lhl;" ) - ServerPacket field1386; - @ObfuscatedName("k") + ServerPacket field1411; + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "Lhs;" + descriptor = "Lhl;" ) - ServerPacket field1387; - @ObfuscatedName("r") + ServerPacket field1412; + @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "Lhs;" + descriptor = "Lhl;" ) - ServerPacket field1391; + ServerPacket field1400; PacketWriter() { this.packetBufferNodes = new IterableNodeDeque(); // L: 15 this.bufferSize = 0; // L: 16 - this.buffer = new Buffer(5000); // L: 17 + this.buffer = new Buffer(5000); this.packetBuffer = new PacketBuffer(40000); // L: 19 this.serverPacket = null; // L: 20 this.serverPacketLength = 0; // L: 21 - this.field1383 = true; // L: 22 - this.field1384 = 0; // L: 23 + this.field1408 = true; // L: 22 + this.field1409 = 0; // L: 23 this.pendingWrites = 0; // L: 24 } // L: 29 - @ObfuscatedName("h") + @ObfuscatedName("v") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "-1383742396" + garbageValue = "238860483" ) @Export("clearBuffer") final void clearBuffer() { @@ -108,10 +111,10 @@ public class PacketWriter { this.bufferSize = 0; // L: 33 } // L: 34 - @ObfuscatedName("c") + @ObfuscatedName("n") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "-727119774" + garbageValue = "-1875758370" ) @Export("flush") final void flush() throws IOException { @@ -136,10 +139,10 @@ public class PacketWriter { } // L: 52 - @ObfuscatedName("o") + @ObfuscatedName("f") @ObfuscatedSignature( - descriptor = "(Lhm;S)V", - garbageValue = "15740" + descriptor = "(Lhq;I)V", + garbageValue = "-2081373116" ) @Export("addNode") public final void addNode(PacketBufferNode var1) { @@ -149,20 +152,20 @@ public class PacketWriter { this.bufferSize += var1.index; // L: 58 } // L: 59 - @ObfuscatedName("g") + @ObfuscatedName("y") @ObfuscatedSignature( - descriptor = "(Llc;I)V", - garbageValue = "-2036896276" + descriptor = "(Lls;I)V", + garbageValue = "-1060689503" ) @Export("setSocket") void setSocket(AbstractSocket var1) { this.socket = var1; // L: 62 } // L: 63 - @ObfuscatedName("l") + @ObfuscatedName("p") @ObfuscatedSignature( descriptor = "(B)V", - garbageValue = "103" + garbageValue = "-24" ) @Export("close") void close() { @@ -171,61 +174,72 @@ public class PacketWriter { this.socket = null; // L: 68 } - } + } // L: 70 - @ObfuscatedName("z") + @ObfuscatedName("j") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "446343289" + garbageValue = "-329279812" ) @Export("removeSocket") void removeSocket() { this.socket = null; // L: 73 } // L: 74 - @ObfuscatedName("t") + @ObfuscatedName("r") @ObfuscatedSignature( - descriptor = "(I)Llc;", - garbageValue = "1365475884" + descriptor = "(I)Lls;", + garbageValue = "-1467210924" ) @Export("getSocket") AbstractSocket getSocket() { return this.socket; // L: 77 } - @ObfuscatedName("h") - public static double method2400(double var0, double var2, double var4) { - double var8 = (var0 - var2) / var4; // L: 10 - double var6 = Math.exp(var8 * -var8 / 2.0D) / Math.sqrt(6.283185307179586D); // L: 12 - return var6 / var4; // L: 14 - } - - @ObfuscatedName("h") + @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "(II)Z", - garbageValue = "-571772420" + descriptor = "(Lcz;B)V", + garbageValue = "1" ) - public static boolean method2410(int var0) { - return (var0 & 1) != 0; // L: 9 - } + @Export("runScriptEvent") + public static void runScriptEvent(ScriptEvent var0) { + World.runScript(var0, 500000, 475000); // L: 106 + } // L: 107 - @ObfuscatedName("o") + @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "(IIB)Liv;", - garbageValue = "-96" + descriptor = "(Ljv;B)V", + garbageValue = "0" ) - @Export("getWidgetChild") - public static Widget getWidgetChild(int var0, int var1) { - Widget var2 = DevicePcmPlayerProvider.getWidget(var0); // L: 207 - if (var1 == -1) { // L: 208 - return var2; - } else { - return var2 != null && var2.children != null && var1 < var2.children.length ? var2.children[var1] : null; // L: 209 210 + public static void method2384(AbstractArchive var0) { + VarcInt.VarcInt_archive = var0; // L: 17 + } // L: 18 + + @ObfuscatedName("ky") + @ObfuscatedSignature( + descriptor = "(II)V", + garbageValue = "1183744930" + ) + static final void method2402(int var0) { + var0 = Math.min(Math.max(var0, 0), 255); // L: 10896 + if (var0 != ObjectComposition.clientPreferences.musicVolume) { // L: 10897 + if (ObjectComposition.clientPreferences.musicVolume == 0 && Client.currentTrackGroupId != -1) { // L: 10898 + LoginScreenAnimation.method2219(UrlRequest.archive6, Client.currentTrackGroupId, 0, var0, false); // L: 10899 + Client.field881 = false; // L: 10900 + } else if (var0 == 0) { // L: 10902 + class124.midiPcmStream.clear(); // L: 10904 + class232.musicPlayerStatus = 1; // L: 10905 + ModelData0.musicTrackArchive = null; // L: 10906 + Client.field881 = false; // L: 10908 + } else if (class232.musicPlayerStatus != 0) { // L: 10911 + class232.musicTrackVolume = var0; + } else { + class124.midiPcmStream.setPcmStreamVolume(var0); // L: 10912 + } + + ObjectComposition.clientPreferences.musicVolume = var0; // L: 10914 + TileItem.savePreferences(); // L: 10915 } - } - @ObfuscatedName("l") - static int method2409(long var0) { - return (int)(var0 >>> 14 & 3L); // L: 70 - } + } // L: 10917 } diff --git a/runescape-client/src/main/java/ParamComposition.java b/runescape-client/src/main/java/ParamComposition.java index 0e1ec225d1..5355e4765f 100644 --- a/runescape-client/src/main/java/ParamComposition.java +++ b/runescape-client/src/main/java/ParamComposition.java @@ -1,43 +1,45 @@ +import java.awt.image.BufferedImage; +import java.awt.image.PixelGrabber; +import java.io.ByteArrayInputStream; +import java.io.IOException; +import javax.imageio.ImageIO; 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("eo") +@ObfuscatedName("eh") @Implements("ParamComposition") public class ParamComposition extends DualNode { - @ObfuscatedName("h") + @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "Ljp;" + descriptor = "Ljv;" ) @Export("ParamDefinition_archive") - static AbstractArchive ParamDefinition_archive; - @ObfuscatedName("c") + public static AbstractArchive ParamDefinition_archive; + @ObfuscatedName("n") @ObfuscatedSignature( - descriptor = "Lho;" + descriptor = "Lhz;" ) @Export("ParamDefinition_cached") static EvictingDualNodeHashTable ParamDefinition_cached; - @ObfuscatedName("kj") - @ObfuscatedGetter( - intValue = 1127122845 - ) - @Export("Client_plane") - static int Client_plane; @ObfuscatedName("o") + @Export("Tiles_hueMultiplier") + static int[] Tiles_hueMultiplier; + @ObfuscatedName("f") @Export("type") char type; - @ObfuscatedName("g") + @ObfuscatedName("y") @ObfuscatedGetter( - intValue = 648695719 + intValue = 1035114241 ) @Export("defaultInt") public int defaultInt; - @ObfuscatedName("l") + @ObfuscatedName("p") @Export("defaultStr") public String defaultStr; - @ObfuscatedName("z") + @ObfuscatedName("j") @Export("autoDisable") boolean autoDisable; @@ -47,197 +49,229 @@ public class ParamComposition extends DualNode { ParamComposition() { this.autoDisable = true; // L: 16 - } // L: 18 + } - @ObfuscatedName("o") + @ObfuscatedName("n") @ObfuscatedSignature( - descriptor = "(B)V", - garbageValue = "13" + descriptor = "(I)V", + garbageValue = "-2035039136" ) @Export("postDecode") void postDecode() { - } // L: 35 + } - @ObfuscatedName("g") + @ObfuscatedName("f") @ObfuscatedSignature( - descriptor = "(Lnk;B)V", - garbageValue = "-46" + descriptor = "(Lnd;S)V", + garbageValue = "-22209" ) @Export("decode") void decode(Buffer var1) { while (true) { - int var2 = var1.readUnsignedByte(); // L: 39 - if (var2 == 0) { // L: 40 - return; // L: 43 + int var2 = var1.readUnsignedByte(); // L: 35 + if (var2 == 0) { // L: 36 + return; // L: 39 } - this.decodeNext(var1, var2); // L: 41 + this.decodeNext(var1, var2); // L: 37 } } - @ObfuscatedName("l") + @ObfuscatedName("y") @ObfuscatedSignature( - descriptor = "(Lnk;IB)V", - garbageValue = "24" + descriptor = "(Lnd;IB)V", + garbageValue = "36" ) @Export("decodeNext") void decodeNext(Buffer var1, int var2) { - if (var2 == 1) { // L: 46 - byte var4 = var1.readByte(); // L: 48 - int var5 = var4 & 255; // L: 50 - if (var5 == 0) { // L: 51 + if (var2 == 1) { // L: 42 + byte var4 = var1.readByte(); // L: 44 + int var5 = var4 & 255; // L: 46 + if (var5 == 0) { // L: 47 throw new IllegalArgumentException("" + Integer.toString(var5, 16)); } - if (var5 >= 128 && var5 < 160) { // L: 52 - char var6 = class301.cp1252AsciiExtension[var5 - 128]; // L: 53 - if (var6 == 0) { // L: 54 + if (var5 >= 128 && var5 < 160) { // L: 48 + char var6 = class301.cp1252AsciiExtension[var5 - 128]; // L: 49 + if (var6 == 0) { // L: 50 var6 = '?'; } - var5 = var6; // L: 55 + var5 = var6; // L: 51 } - char var3 = (char)var5; // L: 57 - this.type = var3; // L: 59 - } else if (var2 == 2) { // L: 61 + char var3 = (char)var5; // L: 53 + this.type = var3; // L: 55 + } else if (var2 == 2) { // L: 57 this.defaultInt = var1.readInt(); - } else if (var2 == 4) { // L: 62 + } else if (var2 == 4) { // L: 58 this.autoDisable = false; - } else if (var2 == 5) { // L: 63 + } else if (var2 == 5) { // L: 59 this.defaultStr = var1.readStringCp1252NullTerminated(); } - } // L: 65 + } // L: 61 - @ObfuscatedName("z") + @ObfuscatedName("p") @ObfuscatedSignature( - descriptor = "(B)Z", - garbageValue = "-66" + descriptor = "(S)Z", + garbageValue = "25333" ) @Export("isString") public boolean isString() { - return this.type == 's'; // L: 68 + return this.type == 's'; // L: 64 } - @ObfuscatedName("c") + @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "(CLkr;I)C", - garbageValue = "-528030927" + descriptor = "([BB)Loh;", + garbageValue = "116" ) - @Export("standardizeChar") - static char standardizeChar(char var0, Language var1) { - if (var0 >= 192 && var0 <= 255) { // L: 117 - if (var0 >= 192 && var0 <= 198) { // L: 118 - return 'A'; - } + @Export("convertJpgToSprite") + public static final SpritePixels convertJpgToSprite(byte[] var0) { + BufferedImage var1 = null; - if (var0 == 199) { // L: 119 - return 'C'; - } - - if (var0 >= 200 && var0 <= 203) { // L: 120 - return 'E'; - } - - if (var0 >= 204 && var0 <= 207) { // L: 121 - return 'I'; - } - - if (var0 == 209 && var1 != Language.Language_ES) { // L: 122 - return 'N'; - } - - if (var0 >= 210 && var0 <= 214) { // L: 123 - return 'O'; - } - - if (var0 >= 217 && var0 <= 220) { // L: 124 - return 'U'; - } - - if (var0 == 221) { // L: 125 - return 'Y'; - } - - if (var0 == 223) { // L: 126 - return 's'; - } - - if (var0 >= 224 && var0 <= 230) { // L: 127 - return 'a'; - } - - if (var0 == 231) { // L: 128 - return 'c'; - } - - if (var0 >= 232 && var0 <= 235) { // L: 129 - return 'e'; - } - - if (var0 >= 236 && var0 <= 239) { // L: 130 - return 'i'; - } - - if (var0 == 241 && var1 != Language.Language_ES) { // L: 131 - return 'n'; - } - - if (var0 >= 242 && var0 <= 246) { // L: 132 - return 'o'; - } - - if (var0 >= 249 && var0 <= 252) { // L: 133 - return 'u'; - } - - if (var0 == 253 || var0 == 255) { // L: 134 - return 'y'; - } + try { + var1 = ImageIO.read(new ByteArrayInputStream(var0)); + int var2 = var1.getWidth(); // L: 23 + int var3 = var1.getHeight(); // L: 24 + int[] var4 = new int[var2 * var3]; // L: 25 + PixelGrabber var5 = new PixelGrabber(var1, 0, 0, var2, var3, var4, 0, var2); // L: 26 + var5.grabPixels(); // L: 27 + return new SpritePixels(var4, var2, var3); // L: 28 + } catch (IOException var7) { // L: 30 + } catch (InterruptedException var8) { // L: 31 } - if (var0 == 338) { // L: 136 - return 'O'; - } else if (var0 == 339) { // L: 137 - return 'o'; - } else if (var0 == 376) { // L: 138 - return 'Y'; + return new SpritePixels(0, 0); // L: 32 + } + + @ObfuscatedName("n") + @ObfuscatedSignature( + descriptor = "(Lnd;Ljava/lang/String;I)I", + garbageValue = "-44618968" + ) + public static int method2878(Buffer var0, String var1) { + int var2 = var0.offset; // L: 18 + byte[] var3 = DynamicObject.method2004(var1); // L: 19 + var0.writeSmartByteShort(var3.length); // L: 20 + var0.offset += class249.huffman.compress(var3, 0, var3.length, var0.array, var0.offset); // L: 21 + return var0.offset - var2; // L: 22 + } + + @ObfuscatedName("p") + @ObfuscatedSignature( + descriptor = "(Lnb;II)Z", + garbageValue = "422196307" + ) + @Export("updateExternalPlayer") + static boolean updateExternalPlayer(PacketBuffer var0, int var1) { + int var2 = var0.readBits(2); // L: 571 + int var3; + int var4; + int var7; + int var8; + int var9; + int var10; + if (var2 == 0) { // L: 572 + if (var0.readBits(1) != 0) { // L: 573 + updateExternalPlayer(var0, var1); + } + + var3 = var0.readBits(13); // L: 574 + var4 = var0.readBits(13); // L: 575 + boolean var12 = var0.readBits(1) == 1; // L: 576 + if (var12) { // L: 577 + Players.Players_pendingUpdateIndices[++Players.Players_pendingUpdateCount - 1] = var1; + } + + if (Client.players[var1] != null) { // L: 578 + throw new RuntimeException(); // L: 579 + } else { + Player var11 = Client.players[var1] = new Player(); // L: 581 + var11.index = var1; // L: 582 + if (Players.field1374[var1] != null) { // L: 583 + var11.read(Players.field1374[var1]); + } + + var11.orientation = Players.Players_orientations[var1]; // L: 584 + var11.targetIndex = Players.Players_targetIndices[var1]; // L: 585 + var7 = Players.Players_regions[var1]; // L: 586 + var8 = var7 >> 28; // L: 587 + var9 = var7 >> 14 & 255; // L: 588 + var10 = var7 & 255; // L: 589 + var11.pathTraversed[0] = Players.field1373[var1]; // L: 590 + var11.plane = (byte)var8; // L: 591 + var11.resetPath((var9 << 13) + var3 - VertexNormal.baseX, (var10 << 13) + var4 - SoundSystem.baseY); // L: 592 + var11.field1218 = false; // L: 593 + return true; // L: 594 + } + } else if (var2 == 1) { // L: 596 + var3 = var0.readBits(2); // L: 597 + var4 = Players.Players_regions[var1]; // L: 598 + Players.Players_regions[var1] = (var4 & 268435455) + (((var4 >> 28) + var3 & 3) << 28); // L: 599 + return false; // L: 600 } else { - return var0; // L: 139 - } - } + int var5; + int var6; + if (var2 == 2) { // L: 602 + var3 = var0.readBits(5); // L: 603 + var4 = var3 >> 3; // L: 604 + var5 = var3 & 7; // L: 605 + var6 = Players.Players_regions[var1]; // L: 606 + var7 = (var6 >> 28) + var4 & 3; // L: 607 + var8 = var6 >> 14 & 255; // L: 608 + var9 = var6 & 255; // L: 609 + if (var5 == 0) { // L: 610 + --var8; // L: 611 + --var9; // L: 612 + } - @ObfuscatedName("q") - @ObfuscatedSignature( - descriptor = "(II)Lgi;", - garbageValue = "297744519" - ) - @Export("getFrames") - static Frames getFrames(int var0) { - Frames var1 = (Frames)SequenceDefinition.SequenceDefinition_cachedFrames.get((long)var0); // L: 181 - if (var1 != null) { // L: 182 - return var1; - } else { - var1 = IsaacCipher.loadFrames(SequenceDefinition.SequenceDefinition_animationsArchive, SequenceDefinition.SequenceDefinition_skeletonsArchive, var0, false); // L: 183 - if (var1 != null) { // L: 184 - SequenceDefinition.SequenceDefinition_cachedFrames.put(var1, (long)var0); + if (var5 == 1) { // L: 614 + --var9; + } + + if (var5 == 2) { // L: 615 + ++var8; // L: 616 + --var9; // L: 617 + } + + if (var5 == 3) { // L: 619 + --var8; + } + + if (var5 == 4) { // L: 620 + ++var8; + } + + if (var5 == 5) { // L: 621 + --var8; // L: 622 + ++var9; // L: 623 + } + + if (var5 == 6) { // L: 625 + ++var9; + } + + if (var5 == 7) { // L: 626 + ++var8; // L: 627 + ++var9; // L: 628 + } + + Players.Players_regions[var1] = (var8 << 14) + var9 + (var7 << 28); // L: 630 + return false; // L: 631 + } else { + var3 = var0.readBits(18); // L: 633 + var4 = var3 >> 16; // L: 634 + var5 = var3 >> 8 & 255; // L: 635 + var6 = var3 & 255; // L: 636 + var7 = Players.Players_regions[var1]; // L: 637 + var8 = (var7 >> 28) + var4 & 3; // L: 638 + var9 = var5 + (var7 >> 14) & 255; // L: 639 + var10 = var6 + var7 & 255; // L: 640 + Players.Players_regions[var1] = (var9 << 14) + var10 + (var8 << 28); // L: 641 + return false; // L: 642 } - - return var1; // L: 185 } } - - @ObfuscatedName("e") - @ObfuscatedSignature( - descriptor = "(Ljava/lang/String;II)V", - garbageValue = "1534971761" - ) - static final void method2825(String var0, int var1) { - PacketBufferNode var2 = HealthBarDefinition.getPacketBufferNode(ClientPacket.field2614, Client.packetWriter.isaacCipher); // L: 246 - var2.packetBuffer.writeByte(class4.stringCp1252NullTerminatedByteSize(var0) + 1); // L: 247 - var2.packetBuffer.writeStringCp1252NullTerminated(var0); // L: 248 - var2.packetBuffer.method6610(var1); // L: 249 - Client.packetWriter.addNode(var2); // L: 250 - } // L: 251 } diff --git a/runescape-client/src/main/java/PcmPlayer.java b/runescape-client/src/main/java/PcmPlayer.java index 308ed6b284..aa1a81bd83 100644 --- a/runescape-client/src/main/java/PcmPlayer.java +++ b/runescape-client/src/main/java/PcmPlayer.java @@ -7,509 +7,668 @@ import net.runelite.mapping.ObfuscatedSignature; @ObfuscatedName("bd") @Implements("PcmPlayer") public class PcmPlayer { - @ObfuscatedName("l") + @ObfuscatedName("p") @ObfuscatedGetter( - intValue = 74532615 + intValue = 1631160541 ) - public static int field401; - @ObfuscatedName("b") + public static int field428; + @ObfuscatedName("j") + @Export("PcmPlayer_stereo") + public static boolean PcmPlayer_stereo; + @ObfuscatedName("d") @ObfuscatedGetter( - intValue = -866267341 + intValue = -1797165253 ) - static int field405; - @ObfuscatedName("q") - @ObfuscatedSignature( - descriptor = "Lbf;" - ) - @Export("soundSystem") - static SoundSystem soundSystem; - @ObfuscatedName("r") + public static int field418; + @ObfuscatedName("c") @Export("samples") protected int[] samples; - @ObfuscatedName("p") + @ObfuscatedName("e") @ObfuscatedSignature( - descriptor = "Lbt;" + descriptor = "Lbm;" ) @Export("stream") PcmStream stream; + @ObfuscatedName("g") + @ObfuscatedGetter( + intValue = 881118859 + ) + int field435; @ObfuscatedName("a") @ObfuscatedGetter( - intValue = -490357665 - ) - int field402; - @ObfuscatedName("e") - @ObfuscatedGetter( - longValue = -9009804721100139371L + longValue = 2377200656236085237L ) @Export("timeMs") long timeMs; - @ObfuscatedName("d") + @ObfuscatedName("k") @ObfuscatedGetter( - intValue = 878578447 + intValue = 1181152315 ) @Export("capacity") int capacity; - @ObfuscatedName("u") - @ObfuscatedGetter( - intValue = -733571391 - ) - int field400; @ObfuscatedName("m") @ObfuscatedGetter( - intValue = -1308000535 + intValue = -908602587 ) - int field406; - @ObfuscatedName("j") + int field425; + @ObfuscatedName("x") @ObfuscatedGetter( - longValue = -6126918723449100817L + intValue = 1178073075 ) - long field407; - @ObfuscatedName("f") + int field426; + @ObfuscatedName("z") @ObfuscatedGetter( - intValue = -912602509 + longValue = 7200649757382554285L ) - int field408; - @ObfuscatedName("s") - @ObfuscatedGetter( - intValue = -843557291 - ) - int field409; - @ObfuscatedName("y") - @ObfuscatedGetter( - intValue = 1543102679 - ) - int field396; + long field427; @ObfuscatedName("w") @ObfuscatedGetter( - longValue = 211548958469134193L + intValue = -847045713 ) - long field411; - @ObfuscatedName("n") - boolean field412; - @ObfuscatedName("at") + int field436; + @ObfuscatedName("t") @ObfuscatedGetter( - intValue = -1771576573 + intValue = 1580986367 ) - int field403; - @ObfuscatedName("av") + int field422; + @ObfuscatedName("h") + @ObfuscatedGetter( + intValue = -70989363 + ) + int field430; + @ObfuscatedName("q") + @ObfuscatedGetter( + longValue = -1818884622277911111L + ) + long field431; + @ObfuscatedName("i") + boolean field432; + @ObfuscatedName("ai") + @ObfuscatedGetter( + intValue = -1875393861 + ) + int field433; + @ObfuscatedName("ar") @ObfuscatedSignature( - descriptor = "[Lbt;" + descriptor = "[Lbm;" ) - PcmStream[] field415; - @ObfuscatedName("al") + PcmStream[] field434; + @ObfuscatedName("ag") @ObfuscatedSignature( - descriptor = "[Lbt;" + descriptor = "[Lbm;" ) - PcmStream[] field416; + PcmStream[] field439; protected PcmPlayer() { - this.field402 = 32; // L: 22 - this.timeMs = Archive.currentTimeMillis(); // L: 23 - this.field407 = 0L; // L: 27 - this.field408 = 0; // L: 28 - this.field409 = 0; // L: 29 - this.field396 = 0; // L: 30 - this.field411 = 0L; // L: 31 - this.field412 = true; // L: 32 - this.field403 = 0; // L: 38 - this.field415 = new PcmStream[8]; // L: 39 - this.field416 = new PcmStream[8]; // L: 40 + this.field435 = 32; // L: 22 + this.timeMs = ObjectComposition.currentTimeMillis(); // L: 23 + this.field427 = 0L; // L: 27 + this.field436 = 0; // L: 28 + this.field422 = 0; // L: 29 + this.field430 = 0; // L: 30 + this.field431 = 0L; // L: 31 + this.field432 = true; // L: 32 + this.field433 = 0; // L: 38 + this.field434 = new PcmStream[8]; // L: 39 + this.field439 = new PcmStream[8]; // L: 40 } // L: 42 - @ObfuscatedName("h") + @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "1996880040" + descriptor = "(B)V", + garbageValue = "4" ) @Export("init") protected void init() throws Exception { - } // L: 284 + } // L: 277 - @ObfuscatedName("c") + @ObfuscatedName("n") @ObfuscatedSignature( - descriptor = "(II)V", - garbageValue = "-1272180581" + descriptor = "(IS)V", + garbageValue = "-6942" ) @Export("open") protected void open(int var1) throws Exception { - } // L: 285 - - @ObfuscatedName("o") - @ObfuscatedSignature( - descriptor = "(S)I", - garbageValue = "-10918" - ) - @Export("position") - protected int position() throws Exception { - return this.capacity; // L: 288 } - @ObfuscatedName("g") - @Export("write") - protected void write() throws Exception { - } // L: 291 - - @ObfuscatedName("l") - @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "-1221564732" - ) - @Export("close") - protected void close() { - } // L: 292 - - @ObfuscatedName("z") - @ObfuscatedSignature( - descriptor = "(B)V", - garbageValue = "30" - ) - @Export("discard") - protected void discard() throws Exception { - } // L: 293 - - @ObfuscatedName("m") - @ObfuscatedSignature( - descriptor = "(Lbt;B)V", - garbageValue = "-8" - ) - @Export("setStream") - public final synchronized void setStream(PcmStream var1) { - this.stream = var1; // L: 83 - } // L: 84 - - @ObfuscatedName("j") - @ObfuscatedSignature( - descriptor = "(B)V", - garbageValue = "59" - ) - @Export("run") - public final synchronized void run() { - if (this.samples != null) { // L: 87 - long var1 = Archive.currentTimeMillis(); // L: 88 - - try { - if (0L != this.field407) { // L: 90 - if (var1 < this.field407) { // L: 91 - return; - } - - this.open(this.capacity); // L: 92 - this.field407 = 0L; // L: 93 - this.field412 = true; // L: 94 - } - - int var3 = this.position(); // L: 96 - if (this.field396 - var3 > this.field408) { // L: 97 - this.field408 = this.field396 - var3; - } - - int var4 = this.field400 + this.field406; // L: 98 - if (var4 + 256 > 16384) { // L: 99 - var4 = 16128; - } - - if (var4 + 256 > this.capacity) { // L: 100 - this.capacity += 1024; // L: 101 - if (this.capacity > 16384) { // L: 102 - this.capacity = 16384; - } - - this.close(); // L: 103 - this.open(this.capacity); // L: 104 - var3 = 0; // L: 105 - this.field412 = true; // L: 106 - if (var4 + 256 > this.capacity) { // L: 107 - var4 = this.capacity - 256; // L: 108 - this.field406 = var4 - this.field400; // L: 109 - } - } - - while (var3 < var4) { // L: 112 - this.fill(this.samples, 256); // L: 113 - this.write(); // L: 114 - var3 += 256; // L: 115 - } - - if (var1 > this.field411) { // L: 117 - if (!this.field412) { // L: 118 - if (this.field408 == 0 && this.field409 == 0) { // L: 119 - this.close(); // L: 120 - this.field407 = 2000L + var1; // L: 121 - return; // L: 122 - } - - this.field406 = Math.min(this.field409, this.field408); // L: 124 - this.field409 = this.field408; // L: 125 - } else { - this.field412 = false; // L: 127 - } - - this.field408 = 0; // L: 128 - this.field411 = var1 + 2000L; // L: 129 - } - - this.field396 = var3; // L: 131 - } catch (Exception var7) { // L: 133 - this.close(); // L: 134 - this.field407 = var1 + 2000L; // L: 135 - } - - try { - if (var1 > 500000L + this.timeMs) { // L: 138 - var1 = this.timeMs; - } - - while (var1 > 5000L + this.timeMs) { // L: 139 - this.skip(256); // L: 140 - this.timeMs += (long)(256000 / field401); // L: 141 - } - } catch (Exception var6) { // L: 144 - this.timeMs = var1; // L: 145 - } - - } - } // L: 147 - @ObfuscatedName("f") @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "-615521568" + descriptor = "(B)I", + garbageValue = "-42" ) - public final void method794() { - this.field412 = true; // L: 150 - } // L: 151 + @Export("position") + protected int position() throws Exception { + return this.capacity; + } - @ObfuscatedName("s") + @ObfuscatedName("y") + @Export("write") + protected void write() throws Exception { + } // L: 284 + + @ObfuscatedName("p") + @ObfuscatedSignature( + descriptor = "(S)V", + garbageValue = "4345" + ) + @Export("close") + protected void close() { + } + + @ObfuscatedName("j") + @ObfuscatedSignature( + descriptor = "(I)V", + garbageValue = "-2070498959" + ) + @Export("discard") + protected void discard() throws Exception { + } + + @ObfuscatedName("i") + @ObfuscatedSignature( + descriptor = "(Lbm;B)V", + garbageValue = "46" + ) + @Export("setStream") + public final synchronized void setStream(PcmStream var1) { + this.stream = var1; // L: 76 + } // L: 77 + + @ObfuscatedName("ae") @ObfuscatedSignature( descriptor = "(B)V", - garbageValue = "0" + garbageValue = "72" + ) + @Export("run") + public final synchronized void run() { + if (this.samples != null) { // L: 80 + long var1 = ObjectComposition.currentTimeMillis(); // L: 81 + + try { + if (0L != this.field427) { // L: 83 + if (var1 < this.field427) { // L: 84 + return; + } + + this.open(this.capacity); // L: 85 + this.field427 = 0L; // L: 86 + this.field432 = true; // L: 87 + } + + int var3 = this.position(); // L: 89 + if (this.field430 - var3 > this.field436) { // L: 90 + this.field436 = this.field430 - var3; + } + + int var4 = this.field426 + this.field425; // L: 91 + if (var4 + 256 > 16384) { // L: 92 + var4 = 16128; + } + + if (var4 + 256 > this.capacity) { // L: 93 + this.capacity += 1024; // L: 94 + if (this.capacity > 16384) { // L: 95 + this.capacity = 16384; + } + + this.close(); // L: 96 + this.open(this.capacity); // L: 97 + var3 = 0; // L: 98 + this.field432 = true; // L: 99 + if (var4 + 256 > this.capacity) { // L: 100 + var4 = this.capacity - 256; // L: 101 + this.field426 = var4 - this.field425; // L: 102 + } + } + + while (var3 < var4) { // L: 105 + this.fill(this.samples, 256); // L: 106 + this.write(); // L: 107 + var3 += 256; // L: 108 + } + + if (var1 > this.field431) { // L: 110 + if (!this.field432) { // L: 111 + if (this.field436 == 0 && this.field422 == 0) { // L: 112 + this.close(); // L: 113 + this.field427 = 2000L + var1; // L: 114 + return; // L: 115 + } + + this.field426 = Math.min(this.field422, this.field436); // L: 117 + this.field422 = this.field436; // L: 118 + } else { + this.field432 = false; // L: 120 + } + + this.field436 = 0; // L: 121 + this.field431 = 2000L + var1; // L: 122 + } + + this.field430 = var3; // L: 124 + } catch (Exception var7) { // L: 126 + this.close(); // L: 127 + this.field427 = var1 + 2000L; // L: 128 + } + + try { + if (var1 > this.timeMs + 500000L) { // L: 131 + var1 = this.timeMs; + } + + while (var1 > 5000L + this.timeMs) { // L: 132 + this.skip(256); // L: 133 + this.timeMs += (long)(256000 / field428); // L: 134 + } + } catch (Exception var6) { // L: 137 + this.timeMs = var1; // L: 138 + } + + } + } // L: 140 + + @ObfuscatedName("ap") + @ObfuscatedSignature( + descriptor = "(I)V", + garbageValue = "1062568016" + ) + public final void method733() { + this.field432 = true; // L: 143 + } // L: 144 + + @ObfuscatedName("ab") + @ObfuscatedSignature( + descriptor = "(I)V", + garbageValue = "955250326" ) @Export("tryDiscard") public final synchronized void tryDiscard() { - this.field412 = true; // L: 154 + this.field432 = true; // L: 147 try { - this.discard(); // L: 156 - } catch (Exception var2) { // L: 158 - this.close(); // L: 159 - this.field407 = Archive.currentTimeMillis() + 2000L; // L: 160 + this.discard(); // L: 149 + } catch (Exception var2) { // L: 151 + this.close(); // L: 152 + this.field427 = ObjectComposition.currentTimeMillis() + 2000L; // L: 153 } - } // L: 162 + } // L: 155 - @ObfuscatedName("y") + @ObfuscatedName("al") @ObfuscatedSignature( - descriptor = "(B)V", - garbageValue = "0" + descriptor = "(I)V", + garbageValue = "-2106105090" ) @Export("shutdown") public final synchronized void shutdown() { - if (soundSystem != null) { // L: 165 - boolean var1 = true; // L: 166 + if (Message.soundSystem != null) { // L: 158 + boolean var1 = true; // L: 159 - for (int var2 = 0; var2 < 2; ++var2) { // L: 167 - if (this == soundSystem.players[var2]) { - soundSystem.players[var2] = null; // L: 168 + for (int var2 = 0; var2 < 2; ++var2) { // L: 160 + if (this == Message.soundSystem.players[var2]) { // L: 161 + Message.soundSystem.players[var2] = null; } - if (soundSystem.players[var2] != null) { // L: 169 + if (Message.soundSystem.players[var2] != null) { // L: 162 var1 = false; } } - if (var1) { // L: 171 - class337.soundSystemExecutor.shutdownNow(); // L: 172 - class337.soundSystemExecutor = null; // L: 173 - soundSystem = null; // L: 174 + if (var1) { // L: 164 + Huffman.soundSystemExecutor.shutdownNow(); // L: 165 + Huffman.soundSystemExecutor = null; // L: 166 + Message.soundSystem = null; // L: 167 } } - this.close(); // L: 177 - this.samples = null; // L: 178 - } // L: 179 + this.close(); // L: 170 + this.samples = null; // L: 171 + } // L: 172 - @ObfuscatedName("w") + @ObfuscatedName("ad") @ObfuscatedSignature( descriptor = "(II)V", - garbageValue = "-2095717179" + garbageValue = "1429485953" ) @Export("skip") final void skip(int var1) { - this.field403 -= var1; // L: 182 - if (this.field403 < 0) { - this.field403 = 0; // L: 183 + this.field433 -= var1; // L: 175 + if (this.field433 < 0) { + this.field433 = 0; // L: 176 } if (this.stream != null) { - this.stream.skip(var1); // L: 184 + this.stream.skip(var1); // L: 177 } - } // L: 185 + } // L: 178 - @ObfuscatedName("n") + @ObfuscatedName("ai") @Export("fill") final void fill(int[] var1, int var2) { - int var3 = var2; // L: 189 - if (ApproximateRouteStrategy.PcmPlayer_stereo) { // L: 190 + int var3 = var2; // L: 182 + if (PcmPlayer_stereo) { // L: 183 var3 = var2 << 1; } - class306.clearIntArray(var1, 0, var3); // L: 191 - this.field403 -= var2; // L: 192 - if (this.stream != null && this.field403 <= 0) { // L: 193 - this.field403 += field401 >> 4; // L: 194 - class386.PcmStream_disable(this.stream); // L: 195 - this.method799(this.stream, this.stream.vmethod1044()); // L: 196 - int var4 = 0; // L: 197 - int var5 = 255; // L: 198 + class306.clearIntArray(var1, 0, var3); // L: 184 + this.field433 -= var2; // L: 185 + if (this.stream != null && this.field433 <= 0) { // L: 186 + this.field433 += field428 >> 4; // L: 187 + FloorOverlayDefinition.PcmStream_disable(this.stream); // L: 188 + this.method738(this.stream, this.stream.vmethod987()); // L: 189 + int var4 = 0; // L: 190 + int var5 = 255; // L: 191 int var6; PcmStream var10; label109: - for (var6 = 7; var5 != 0; --var6) { // L: 199 + for (var6 = 7; var5 != 0; --var6) { // L: 192 int var7; int var8; - if (var6 < 0) { // L: 202 - var7 = var6 & 3; // L: 203 - var8 = -(var6 >> 2); // L: 204 + if (var6 < 0) { // L: 195 + var7 = var6 & 3; // L: 196 + var8 = -(var6 >> 2); // L: 197 } else { - var7 = var6; // L: 207 - var8 = 0; // L: 208 + var7 = var6; // L: 200 + var8 = 0; // L: 201 } - for (int var9 = var5 >>> var7 & 286331153; var9 != 0; var9 >>>= 4) { // L: 210 212 - if ((var9 & 1) != 0) { // L: 215 - var5 &= ~(1 << var7); // L: 218 - var10 = null; // L: 219 - PcmStream var11 = this.field415[var7]; // L: 220 + for (int var9 = var5 >>> var7 & 286331153; var9 != 0; var9 >>>= 4) { // L: 203 205 + if ((var9 & 1) != 0) { // L: 208 + var5 &= ~(1 << var7); // L: 211 + var10 = null; // L: 212 + PcmStream var11 = this.field434[var7]; // L: 213 label103: while (true) { while (true) { - if (var11 == null) { // L: 221 + if (var11 == null) { // L: 214 break label103; } - AbstractSound var12 = var11.sound; // L: 222 - if (var12 != null && var12.position > var8) { // L: 223 - var5 |= 1 << var7; // L: 224 - var10 = var11; // L: 225 - var11 = var11.after; // L: 226 + AbstractSound var12 = var11.sound; // L: 215 + if (var12 != null && var12.position > var8) { // L: 216 + var5 |= 1 << var7; // L: 217 + var10 = var11; // L: 218 + var11 = var11.after; // L: 219 } else { - var11.active = true; // L: 229 - int var13 = var11.vmethod4560(); // L: 230 - var4 += var13; // L: 231 - if (var12 != null) { // L: 232 + var11.active = true; // L: 222 + int var13 = var11.vmethod4610(); // L: 223 + var4 += var13; // L: 224 + if (var12 != null) { // L: 225 var12.position += var13; } - if (var4 >= this.field402) { // L: 233 + if (var4 >= this.field435) { // L: 226 break label109; } - PcmStream var14 = var11.firstSubStream(); // L: 234 - if (var14 != null) { // L: 235 - for (int var15 = var11.field469; var14 != null; var14 = var11.nextSubStream()) { // L: 236 237 239 - this.method799(var14, var15 * var14.vmethod1044() >> 8); // L: 238 + PcmStream var14 = var11.firstSubStream(); // L: 227 + if (var14 != null) { // L: 228 + for (int var15 = var11.field494; var14 != null; var14 = var11.nextSubStream()) { // L: 229 230 232 + this.method738(var14, var15 * var14.vmethod987() >> 8); // L: 231 } } - PcmStream var18 = var11.after; // L: 242 - var11.after = null; // L: 243 - if (var10 == null) { // L: 244 - this.field415[var7] = var18; + PcmStream var18 = var11.after; // L: 235 + var11.after = null; // L: 236 + if (var10 == null) { // L: 237 + this.field434[var7] = var18; } else { - var10.after = var18; // L: 245 + var10.after = var18; // L: 238 } - if (var18 == null) { // L: 246 - this.field416[var7] = var10; + if (var18 == null) { // L: 239 + this.field439[var7] = var10; } - var11 = var18; // L: 247 + var11 = var18; // L: 240 } } } } - var7 += 4; // L: 211 + var7 += 4; // L: 204 ++var8; } } - for (var6 = 0; var6 < 8; ++var6) { // L: 251 - PcmStream var16 = this.field415[var6]; // L: 252 - PcmStream[] var17 = this.field415; // L: 253 - this.field416[var6] = null; // L: 255 + for (var6 = 0; var6 < 8; ++var6) { // L: 244 + PcmStream var16 = this.field434[var6]; // L: 245 + PcmStream[] var17 = this.field434; // L: 246 + this.field439[var6] = null; // L: 248 - for (var17[var6] = null; var16 != null; var16 = var10) { // L: 256 257 260 - var10 = var16.after; // L: 258 - var16.after = null; // L: 259 + for (var17[var6] = null; var16 != null; var16 = var10) { // L: 249 250 + var10 = var16.after; // L: 251 + var16.after = null; } } } - if (this.field403 < 0) { // L: 264 - this.field403 = 0; + if (this.field433 < 0) { + this.field433 = 0; } - if (this.stream != null) { // L: 265 + if (this.stream != null) { this.stream.fill(var1, 0, var2); } - this.timeMs = Archive.currentTimeMillis(); // L: 266 - } // L: 267 + this.timeMs = ObjectComposition.currentTimeMillis(); + } // L: 260 - @ObfuscatedName("ae") + @ObfuscatedName("ag") @ObfuscatedSignature( - descriptor = "(Lbt;IB)V", - garbageValue = "0" + descriptor = "(Lbm;II)V", + garbageValue = "-1859037567" ) - final void method799(PcmStream var1, int var2) { - int var3 = var2 >> 5; // L: 276 - PcmStream var4 = this.field416[var3]; // L: 277 - if (var4 == null) { // L: 278 - this.field415[var3] = var1; + final void method738(PcmStream var1, int var2) { + int var3 = var2 >> 5; + PcmStream var4 = this.field439[var3]; + if (var4 == null) { + this.field434[var3] = var1; } else { - var4.after = var1; // L: 279 + var4.after = var1; // L: 272 } - this.field416[var3] = var1; // L: 280 - var1.field469 = var2; // L: 281 - } // L: 282 + this.field439[var3] = var1; // L: 273 + var1.field494 = var2; + } - @ObfuscatedName("hu") + @ObfuscatedName("f") @ObfuscatedSignature( - descriptor = "(IIII)V", - garbageValue = "678860256" + descriptor = "(Lnb;I)V", + garbageValue = "-1728648073" ) - @Export("worldToScreen") - static final void worldToScreen(int var0, int var1, int var2) { - if (var0 >= 128 && var1 >= 128 && var0 <= 13056 && var1 <= 13056) { // L: 5418 - int var3 = SceneTilePaint.getTileHeight(var0, var1, ParamComposition.Client_plane) - var2; // L: 5423 - var0 -= class20.cameraX; // L: 5424 - var3 -= Skeleton.cameraY; // L: 5425 - var1 -= WorldMapDecoration.cameraZ; // L: 5426 - int var4 = Rasterizer3D.Rasterizer3D_sine[class1.cameraPitch]; // L: 5427 - int var5 = Rasterizer3D.Rasterizer3D_cosine[class1.cameraPitch]; // L: 5428 - int var6 = Rasterizer3D.Rasterizer3D_sine[HealthBarDefinition.cameraYaw]; // L: 5429 - int var7 = Rasterizer3D.Rasterizer3D_cosine[HealthBarDefinition.cameraYaw]; // L: 5430 - int var8 = var6 * var1 + var0 * var7 >> 16; // L: 5431 - var1 = var7 * var1 - var0 * var6 >> 16; // L: 5432 - var0 = var8; // L: 5433 - var8 = var5 * var3 - var4 * var1 >> 16; // L: 5434 - var1 = var5 * var1 + var4 * var3 >> 16; // L: 5435 - if (var1 >= 50) { // L: 5437 - Client.viewportTempX = var0 * Client.viewportZoom / var1 + Client.viewportWidth / 2; // L: 5438 - Client.viewportTempY = var8 * Client.viewportZoom / var1 + Client.viewportHeight / 2; // L: 5439 - } else { - Client.viewportTempX = -1; // L: 5442 - Client.viewportTempY = -1; // L: 5443 + static final void method750(PacketBuffer var0) { + int var1 = 0; // L: 252 + var0.importIndex(); // L: 253 + + byte[] var10000; + int var2; + int var4; + int var6; + int var7; + int var8; + for (var2 = 0; var2 < Players.Players_count; ++var2) { // L: 254 + var8 = Players.Players_indices[var2]; // L: 255 + if ((Players.field1370[var8] & 1) == 0) { // L: 256 + if (var1 > 0) { // L: 257 + --var1; // L: 258 + var10000 = Players.field1370; // L: 259 + var10000[var8] = (byte)(var10000[var8] | 2); + } else { + var4 = var0.readBits(1); // L: 262 + if (var4 == 0) { // L: 263 + var6 = var0.readBits(2); // L: 266 + if (var6 == 0) { // L: 268 + var7 = 0; + } else if (var6 == 1) { // L: 269 + var7 = var0.readBits(5); + } else if (var6 == 2) { // L: 270 + var7 = var0.readBits(8); + } else { + var7 = var0.readBits(11); // L: 271 + } + + var1 = var7; // L: 274 + var10000 = Players.field1370; // L: 275 + var10000[var8] = (byte)(var10000[var8] | 2); + } else { + ItemComposition.readPlayerUpdate(var0, var8); // L: 278 + } + } + } + } + + var0.exportIndex(); // L: 281 + if (var1 != 0) { // L: 282 + throw new RuntimeException(); // L: 283 + } else { + var0.importIndex(); // L: 285 + + for (var2 = 0; var2 < Players.Players_count; ++var2) { // L: 286 + var8 = Players.Players_indices[var2]; // L: 287 + if ((Players.field1370[var8] & 1) != 0) { // L: 288 + if (var1 > 0) { // L: 289 + --var1; // L: 290 + var10000 = Players.field1370; // L: 291 + var10000[var8] = (byte)(var10000[var8] | 2); + } else { + var4 = var0.readBits(1); // L: 294 + if (var4 == 0) { // L: 295 + var6 = var0.readBits(2); // L: 298 + if (var6 == 0) { // L: 300 + var7 = 0; + } else if (var6 == 1) { // L: 301 + var7 = var0.readBits(5); + } else if (var6 == 2) { // L: 302 + var7 = var0.readBits(8); + } else { + var7 = var0.readBits(11); // L: 303 + } + + var1 = var7; // L: 306 + var10000 = Players.field1370; // L: 307 + var10000[var8] = (byte)(var10000[var8] | 2); + } else { + ItemComposition.readPlayerUpdate(var0, var8); // L: 310 + } + } + } } - } else { - Client.viewportTempX = -1; // L: 5419 - Client.viewportTempY = -1; // L: 5420 + var0.exportIndex(); // L: 313 + if (var1 != 0) { // L: 314 + throw new RuntimeException(); // L: 315 + } else { + var0.importIndex(); // L: 317 + + for (var2 = 0; var2 < Players.Players_emptyIdxCount; ++var2) { // L: 318 + var8 = Players.Players_emptyIndices[var2]; // L: 319 + if ((Players.field1370[var8] & 1) != 0) { // L: 320 + if (var1 > 0) { // L: 321 + --var1; // L: 322 + var10000 = Players.field1370; // L: 323 + var10000[var8] = (byte)(var10000[var8] | 2); + } else { + var4 = var0.readBits(1); // L: 326 + if (var4 == 0) { // L: 327 + var6 = var0.readBits(2); // L: 330 + if (var6 == 0) { // L: 332 + var7 = 0; + } else if (var6 == 1) { // L: 333 + var7 = var0.readBits(5); + } else if (var6 == 2) { + var7 = var0.readBits(8); // L: 334 + } else { + var7 = var0.readBits(11); // L: 335 + } + + var1 = var7; // L: 338 + var10000 = Players.field1370; // L: 339 + var10000[var8] = (byte)(var10000[var8] | 2); + } else if (ParamComposition.updateExternalPlayer(var0, var8)) { // L: 342 + var10000 = Players.field1370; + var10000[var8] = (byte)(var10000[var8] | 2); + } + } + } + } + + var0.exportIndex(); // L: 345 + if (var1 != 0) { // L: 346 + throw new RuntimeException(); // L: 347 + } else { + var0.importIndex(); // L: 349 + + for (var2 = 0; var2 < Players.Players_emptyIdxCount; ++var2) { // L: 350 + var8 = Players.Players_emptyIndices[var2]; // L: 351 + if ((Players.field1370[var8] & 1) == 0) { // L: 352 + if (var1 > 0) { // L: 353 + --var1; // L: 354 + var10000 = Players.field1370; // L: 355 + var10000[var8] = (byte)(var10000[var8] | 2); + } else { + var4 = var0.readBits(1); // L: 358 + if (var4 == 0) { // L: 359 + var6 = var0.readBits(2); // L: 362 + if (var6 == 0) { // L: 364 + var7 = 0; + } else if (var6 == 1) { // L: 365 + var7 = var0.readBits(5); + } else if (var6 == 2) { // L: 366 + var7 = var0.readBits(8); + } else { + var7 = var0.readBits(11); // L: 367 + } + + var1 = var7; // L: 370 + var10000 = Players.field1370; // L: 371 + var10000[var8] = (byte)(var10000[var8] | 2); + } else if (ParamComposition.updateExternalPlayer(var0, var8)) { // L: 374 + var10000 = Players.field1370; + var10000[var8] = (byte)(var10000[var8] | 2); + } + } + } + } + + var0.exportIndex(); // L: 377 + if (var1 != 0) { // L: 378 + throw new RuntimeException(); // L: 379 + } else { + Players.Players_count = 0; // L: 381 + Players.Players_emptyIdxCount = 0; // L: 382 + + for (var2 = 1; var2 < 2048; ++var2) { // L: 383 + var10000 = Players.field1370; // L: 384 + var10000[var2] = (byte)(var10000[var2] >> 1); + Player var3 = Client.players[var2]; // L: 385 + if (var3 != null) { // L: 386 + Players.Players_indices[++Players.Players_count - 1] = var2; + } else { + Players.Players_emptyIndices[++Players.Players_emptyIdxCount - 1] = var2; // L: 387 + } + } + + } + } + } } - } // L: 5421 5445 + } // L: 389 + + @ObfuscatedName("hi") + @ObfuscatedSignature( + descriptor = "(IIIII)V", + garbageValue = "-572457964" + ) + static final void method786(int var0, int var1, int var2, int var3) { + for (int var4 = 0; var4 < Client.rootWidgetCount; ++var4) { // L: 7618 + if (Client.rootWidgetXs[var4] + Client.rootWidgetWidths[var4] > var0 && Client.rootWidgetXs[var4] < var0 + var2 && Client.rootWidgetHeights[var4] + Client.rootWidgetYs[var4] > var1 && Client.rootWidgetYs[var4] < var3 + var1) { // L: 7619 + Client.field780[var4] = true; + } + } + + } // L: 7621 } diff --git a/runescape-client/src/main/java/PcmStream.java b/runescape-client/src/main/java/PcmStream.java index a6880832d0..7112e97092 100644 --- a/runescape-client/src/main/java/PcmStream.java +++ b/runescape-client/src/main/java/PcmStream.java @@ -3,24 +3,24 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("bt") +@ObfuscatedName("bm") @Implements("PcmStream") public abstract class PcmStream extends Node { - @ObfuscatedName("a") + @ObfuscatedName("g") @ObfuscatedSignature( - descriptor = "Lbt;" + descriptor = "Lbm;" ) @Export("after") PcmStream after; - @ObfuscatedName("e") - int field469; - @ObfuscatedName("d") + @ObfuscatedName("a") + int field494; + @ObfuscatedName("k") @ObfuscatedSignature( - descriptor = "Lbj;" + descriptor = "Lbp;" ) @Export("sound") AbstractSound sound; - @ObfuscatedName("u") + @ObfuscatedName("m") @Export("active") volatile boolean active; @@ -28,37 +28,37 @@ public abstract class PcmStream extends Node { this.active = true; // L: 11 } // L: 13 - @ObfuscatedName("z") + @ObfuscatedName("j") @ObfuscatedSignature( - descriptor = "()Lbt;" + descriptor = "()Lbm;" ) @Export("firstSubStream") protected abstract PcmStream firstSubStream(); - @ObfuscatedName("t") + @ObfuscatedName("r") @ObfuscatedSignature( - descriptor = "()Lbt;" + descriptor = "()Lbm;" ) @Export("nextSubStream") protected abstract PcmStream nextSubStream(); - @ObfuscatedName("v") - protected abstract int vmethod4560(); - @ObfuscatedName("b") + protected abstract int vmethod4610(); + + @ObfuscatedName("d") @Export("fill") protected abstract void fill(int[] var1, int var2, int var3); - @ObfuscatedName("i") + @ObfuscatedName("u") @Export("skip") protected abstract void skip(int var1); - @ObfuscatedName("ax") - int vmethod1044() { + @ObfuscatedName("ah") + int vmethod987() { return 255; // L: 16 } - @ObfuscatedName("eg") + @ObfuscatedName("ee") @Export("update") final void update(int[] var1, int var2, int var3) { if (this.active) { // L: 24 diff --git a/runescape-client/src/main/java/PcmStreamMixer.java b/runescape-client/src/main/java/PcmStreamMixer.java index b1b7961f9b..acd682b05f 100644 --- a/runescape-client/src/main/java/PcmStreamMixer.java +++ b/runescape-client/src/main/java/PcmStreamMixer.java @@ -3,152 +3,152 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ar") +@ObfuscatedName("ay") @Implements("PcmStreamMixer") public class PcmStreamMixer extends PcmStream { - @ObfuscatedName("h") + @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "Lka;" + descriptor = "Lkx;" ) @Export("subStreams") NodeDeque subStreams; - @ObfuscatedName("c") + @ObfuscatedName("n") @ObfuscatedSignature( - descriptor = "Lka;" + descriptor = "Lkx;" ) - NodeDeque field372; - @ObfuscatedName("o") - int field371; - @ObfuscatedName("g") - int field373; + NodeDeque field391; + @ObfuscatedName("f") + int field392; + @ObfuscatedName("y") + int field390; public PcmStreamMixer() { this.subStreams = new NodeDeque(); // L: 9 - this.field372 = new NodeDeque(); // L: 10 - this.field371 = 0; // L: 11 - this.field373 = -1; // L: 12 + this.field391 = new NodeDeque(); // L: 10 + this.field392 = 0; // L: 11 + this.field390 = -1; // L: 12 } - @ObfuscatedName("h") + @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "(Lbt;)V" + descriptor = "(Lbm;)V" ) @Export("addSubStream") public final synchronized void addSubStream(PcmStream var1) { this.subStreams.addLast(var1); // L: 15 } // L: 16 - @ObfuscatedName("c") + @ObfuscatedName("n") @ObfuscatedSignature( - descriptor = "(Lbt;)V" + descriptor = "(Lbm;)V" ) @Export("removeSubStream") public final synchronized void removeSubStream(PcmStream var1) { var1.remove(); // L: 19 } // L: 20 - @ObfuscatedName("o") - void method719() { - if (this.field371 > 0) { // L: 23 - for (PcmStreamMixerListener var1 = (PcmStreamMixerListener)this.field372.last(); var1 != null; var1 = (PcmStreamMixerListener)this.field372.previous()) { // L: 24 - var1.field515 -= this.field371; // L: 25 + @ObfuscatedName("f") + void method665() { + if (this.field392 > 0) { // L: 23 + for (PcmStreamMixerListener var1 = (PcmStreamMixerListener)this.field391.last(); var1 != null; var1 = (PcmStreamMixerListener)this.field391.previous()) { // L: 24 + var1.field541 -= this.field392; // L: 25 } - this.field373 -= this.field371; // L: 27 - this.field371 = 0; // L: 28 + this.field390 -= this.field392; // L: 27 + this.field392 = 0; // L: 28 } } // L: 30 - @ObfuscatedName("g") + @ObfuscatedName("y") @ObfuscatedSignature( - descriptor = "(Lmd;Lbn;)V" + descriptor = "(Lmw;Lbf;)V" ) - void method734(Node var1, PcmStreamMixerListener var2) { - while (this.field372.sentinel != var1 && ((PcmStreamMixerListener)var1).field515 <= var2.field515) { // L: 33 + void method654(Node var1, PcmStreamMixerListener var2) { + while (this.field391.sentinel != var1 && ((PcmStreamMixerListener)var1).field541 <= var2.field541) { // L: 33 var1 = var1.previous; } NodeDeque.NodeDeque_addBefore(var2, var1); // L: 34 - this.field373 = ((PcmStreamMixerListener)this.field372.sentinel.previous).field515; // L: 35 + this.field390 = ((PcmStreamMixerListener)this.field391.sentinel.previous).field541; // L: 35 } // L: 36 - @ObfuscatedName("l") + @ObfuscatedName("p") @ObfuscatedSignature( - descriptor = "(Lbn;)V" + descriptor = "(Lbf;)V" ) - void method721(PcmStreamMixerListener var1) { + void method653(PcmStreamMixerListener var1) { var1.remove(); // L: 39 var1.remove2(); // L: 40 - Node var2 = this.field372.sentinel.previous; // L: 41 - if (var2 == this.field372.sentinel) { - this.field373 = -1; // L: 42 + Node var2 = this.field391.sentinel.previous; // L: 41 + if (var2 == this.field391.sentinel) { + this.field390 = -1; // L: 42 } else { - this.field373 = ((PcmStreamMixerListener)var2).field515; // L: 43 + this.field390 = ((PcmStreamMixerListener)var2).field541; // L: 43 } } // L: 44 - @ObfuscatedName("z") + @ObfuscatedName("j") @ObfuscatedSignature( - descriptor = "()Lbt;" + descriptor = "()Lbm;" ) @Export("firstSubStream") protected PcmStream firstSubStream() { return (PcmStream)this.subStreams.last(); // L: 47 } - @ObfuscatedName("t") + @ObfuscatedName("r") @ObfuscatedSignature( - descriptor = "()Lbt;" + descriptor = "()Lbm;" ) @Export("nextSubStream") protected PcmStream nextSubStream() { return (PcmStream)this.subStreams.previous(); // L: 51 } - @ObfuscatedName("v") - protected int vmethod4560() { + @ObfuscatedName("b") + protected int vmethod4610() { return 0; // L: 55 } - @ObfuscatedName("b") + @ObfuscatedName("d") @Export("fill") public final synchronized void fill(int[] var1, int var2, int var3) { do { - if (this.field373 < 0) { // L: 60 + if (this.field390 < 0) { // L: 60 this.updateSubStreams(var1, var2, var3); // L: 61 return; // L: 62 } - if (var3 + this.field371 < this.field373) { // L: 64 - this.field371 += var3; // L: 65 + if (var3 + this.field392 < this.field390) { // L: 64 + this.field392 += var3; // L: 65 this.updateSubStreams(var1, var2, var3); // L: 66 return; // L: 67 } - int var4 = this.field373 - this.field371; // L: 69 + int var4 = this.field390 - this.field392; // L: 69 this.updateSubStreams(var1, var2, var4); // L: 70 var2 += var4; // L: 71 var3 -= var4; // L: 72 - this.field371 += var4; // L: 73 - this.method719(); // L: 74 - PcmStreamMixerListener var5 = (PcmStreamMixerListener)this.field372.last(); // L: 75 + this.field392 += var4; // L: 73 + this.method665(); // L: 74 + PcmStreamMixerListener var5 = (PcmStreamMixerListener)this.field391.last(); // L: 75 synchronized(var5) { // L: 76 int var7 = var5.update(); // L: 77 if (var7 < 0) { // L: 78 - var5.field515 = 0; // L: 79 - this.method721(var5); // L: 80 + var5.field541 = 0; // L: 79 + this.method653(var5); // L: 80 } else { - var5.field515 = var7; // L: 83 - this.method734(var5.previous, var5); // L: 84 + var5.field541 = var7; // L: 83 + this.method654(var5.previous, var5); // L: 84 } } } while(var3 != 0); // L: 87 } - @ObfuscatedName("q") + @ObfuscatedName("s") @Export("updateSubStreams") void updateSubStreams(int[] var1, int var2, int var3) { for (PcmStream var4 = (PcmStream)this.subStreams.last(); var4 != null; var4 = (PcmStream)this.subStreams.previous()) { // L: 92 @@ -157,42 +157,42 @@ public class PcmStreamMixer extends PcmStream { } // L: 95 - @ObfuscatedName("i") + @ObfuscatedName("u") @Export("skip") public final synchronized void skip(int var1) { do { - if (this.field373 < 0) { // L: 99 + if (this.field390 < 0) { // L: 99 this.skipSubStreams(var1); // L: 100 return; // L: 101 } - if (this.field371 + var1 < this.field373) { // L: 103 - this.field371 += var1; // L: 104 + if (this.field392 + var1 < this.field390) { // L: 103 + this.field392 += var1; // L: 104 this.skipSubStreams(var1); // L: 105 return; // L: 106 } - int var2 = this.field373 - this.field371; // L: 108 + int var2 = this.field390 - this.field392; // L: 108 this.skipSubStreams(var2); // L: 109 var1 -= var2; // L: 110 - this.field371 += var2; // L: 111 - this.method719(); // L: 112 - PcmStreamMixerListener var3 = (PcmStreamMixerListener)this.field372.last(); // L: 113 + this.field392 += var2; // L: 111 + this.method665(); // L: 112 + PcmStreamMixerListener var3 = (PcmStreamMixerListener)this.field391.last(); // L: 113 synchronized(var3) { // L: 114 int var5 = var3.update(); // L: 115 if (var5 < 0) { // L: 116 - var3.field515 = 0; // L: 117 - this.method721(var3); // L: 118 + var3.field541 = 0; // L: 117 + this.method653(var3); // L: 118 } else { - var3.field515 = var5; // L: 121 - this.method734(var3.previous, var3); // L: 122 + var3.field541 = var5; // L: 121 + this.method654(var3.previous, var3); // L: 122 } } } while(var1 != 0); // L: 125 } - @ObfuscatedName("x") + @ObfuscatedName("l") @Export("skipSubStreams") void skipSubStreams(int var1) { for (PcmStream var2 = (PcmStream)this.subStreams.last(); var2 != null; var2 = (PcmStream)this.subStreams.previous()) { // L: 130 diff --git a/runescape-client/src/main/java/PcmStreamMixerListener.java b/runescape-client/src/main/java/PcmStreamMixerListener.java index 58fca789fd..1c942862d2 100644 --- a/runescape-client/src/main/java/PcmStreamMixerListener.java +++ b/runescape-client/src/main/java/PcmStreamMixerListener.java @@ -3,19 +3,19 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("bn") +@ObfuscatedName("bf") @Implements("PcmStreamMixerListener") public abstract class PcmStreamMixerListener extends Node { - @ObfuscatedName("h") - int field515; + @ObfuscatedName("v") + int field541; - @ObfuscatedName("h") + @ObfuscatedName("v") @Export("remove2") abstract void remove2(); - @ObfuscatedName("c") + @ObfuscatedName("n") @ObfuscatedSignature( - descriptor = "(Lar;)I" + descriptor = "(Lay;)I" ) @Export("update") abstract int update(); diff --git a/runescape-client/src/main/java/PendingSpawn.java b/runescape-client/src/main/java/PendingSpawn.java index 67275c62b0..5e153b2012 100644 --- a/runescape-client/src/main/java/PendingSpawn.java +++ b/runescape-client/src/main/java/PendingSpawn.java @@ -1,94 +1,77 @@ -import java.io.InputStream; -import java.io.OutputStreamWriter; -import java.net.URL; -import java.net.URLConnection; -import java.util.Random; 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("cw") +@ObfuscatedName("ch") @Implements("PendingSpawn") public final class PendingSpawn extends Node { - @ObfuscatedName("an") + @ObfuscatedName("v") @ObfuscatedGetter( - intValue = -670628763 - ) - static int field1204; - @ObfuscatedName("dx") - @ObfuscatedSignature( - descriptor = "Lji;" - ) - @Export("archive10") - static Archive archive10; - @ObfuscatedName("h") - @ObfuscatedGetter( - intValue = -2028305435 + intValue = -28991277 ) @Export("plane") int plane; - @ObfuscatedName("c") + @ObfuscatedName("n") @ObfuscatedGetter( - intValue = -1822340223 + intValue = -1769235093 ) @Export("type") int type; - @ObfuscatedName("o") + @ObfuscatedName("f") @ObfuscatedGetter( - intValue = 1106916281 + intValue = 1813016497 ) @Export("x") int x; - @ObfuscatedName("g") + @ObfuscatedName("y") @ObfuscatedGetter( - intValue = -1868314049 + intValue = -396145343 ) @Export("y") int y; - @ObfuscatedName("l") + @ObfuscatedName("p") @ObfuscatedGetter( - intValue = 951386477 + intValue = -558546627 ) @Export("objectId") int objectId; - @ObfuscatedName("z") + @ObfuscatedName("j") @ObfuscatedGetter( - intValue = -1193434187 + intValue = 1965670795 ) - int field1199; - @ObfuscatedName("t") + int field1225; + @ObfuscatedName("r") @ObfuscatedGetter( - intValue = -169637557 + intValue = 1054712157 ) - int field1203; - @ObfuscatedName("v") + int field1229; + @ObfuscatedName("b") @ObfuscatedGetter( - intValue = 1882420351 + intValue = 56083045 ) @Export("id") int id; - @ObfuscatedName("b") + @ObfuscatedName("d") @ObfuscatedGetter( - intValue = -2081507135 + intValue = 343995201 ) @Export("orientation") int orientation; - @ObfuscatedName("q") + @ObfuscatedName("s") @ObfuscatedGetter( - intValue = -228507891 + intValue = -990188279 ) - int field1196; - @ObfuscatedName("i") + int field1232; + @ObfuscatedName("u") @ObfuscatedGetter( - intValue = 355878997 + intValue = -870224069 ) @Export("delay") int delay; - @ObfuscatedName("x") + @ObfuscatedName("l") @ObfuscatedGetter( - intValue = -1991837151 + intValue = 2028634435 ) @Export("hitpoints") int hitpoints; @@ -97,185 +80,4 @@ public final class PendingSpawn extends Node { this.delay = 0; // L: 16 this.hitpoints = -1; // L: 17 } // L: 19 - - @ObfuscatedName("h") - @ObfuscatedSignature( - descriptor = "(JLjava/lang/String;I)I", - garbageValue = "-1496983965" - ) - static final int method2180(long var0, String var2) { - Random var3 = new Random(); // L: 35 - Buffer var4 = new Buffer(128); // L: 36 - Buffer var5 = new Buffer(128); // L: 37 - int[] var6 = new int[]{var3.nextInt(), var3.nextInt(), (int)(var0 >> 32), (int)var0}; // L: 38 39 40 41 42 - var4.writeByte(10); // L: 43 - - int var7; - for (var7 = 0; var7 < 4; ++var7) { // L: 44 - var4.writeInt(var3.nextInt()); // L: 45 - } - - var4.writeInt(var6[0]); // L: 47 - var4.writeInt(var6[1]); // L: 48 - var4.writeLong(var0); // L: 49 - var4.writeLong(0L); // L: 50 - - for (var7 = 0; var7 < 4; ++var7) { // L: 51 - var4.writeInt(var3.nextInt()); // L: 52 - } - - var4.encryptRsa(class80.field972, class80.field973); // L: 54 - var5.writeByte(10); // L: 55 - - for (var7 = 0; var7 < 3; ++var7) { // L: 56 - var5.writeInt(var3.nextInt()); // L: 57 - } - - var5.writeLong(var3.nextLong()); // L: 59 - var5.writeLongMedium(var3.nextLong()); // L: 60 - if (Client.randomDatData != null) { // L: 62 - var5.writeBytes(Client.randomDatData, 0, Client.randomDatData.length); // L: 63 - } else { - byte[] var19 = DynamicObject.method2030(); // L: 66 - var5.writeBytes(var19, 0, var19.length); // L: 67 - } - - var5.writeLong(var3.nextLong()); // L: 69 - var5.encryptRsa(class80.field972, class80.field973); // L: 70 - var7 = class4.stringCp1252NullTerminatedByteSize(var2); // L: 71 - if (var7 % 8 != 0) { // L: 72 - var7 += 8 - var7 % 8; - } - - Buffer var8 = new Buffer(var7); // L: 73 - var8.writeStringCp1252NullTerminated(var2); // L: 74 - var8.offset = var7; // L: 75 - var8.xteaEncryptAll(var6); // L: 76 - Buffer var9 = new Buffer(var5.offset + var4.offset + var8.offset + 5); // L: 77 - var9.writeByte(2); // L: 78 - var9.writeByte(var4.offset); // L: 79 - var9.writeBytes(var4.array, 0, var4.offset); // L: 80 - var9.writeByte(var5.offset); // L: 81 - var9.writeBytes(var5.array, 0, var5.offset); // L: 82 - var9.writeShort(var8.offset); // L: 83 - var9.writeBytes(var8.array, 0, var8.offset); // L: 84 - byte[] var11 = var9.array; // L: 86 - int var13 = var11.length; // L: 89 - StringBuilder var14 = new StringBuilder(); // L: 91 - - int var17; - for (int var15 = 0; var15 < var13 + 0; var15 += 3) { // L: 92 - int var16 = var11[var15] & 255; // L: 93 - var14.append(class302.field3770[var16 >>> 2]); // L: 94 - if (var15 < var13 - 1) { // L: 95 - var17 = var11[var15 + 1] & 255; // L: 96 - var14.append(class302.field3770[(var16 & 3) << 4 | var17 >>> 4]); // L: 97 - if (var15 < var13 - 2) { // L: 98 - int var18 = var11[var15 + 2] & 255; // L: 99 - var14.append(class302.field3770[(var17 & 15) << 2 | var18 >>> 6]).append(class302.field3770[var18 & 63]); // L: 100 - } else { - var14.append(class302.field3770[(var17 & 15) << 2]).append("="); // L: 102 - } - } else { - var14.append(class302.field3770[(var16 & 3) << 4]).append("=="); // L: 104 - } - } - - String var12 = var14.toString(); // L: 106 - var12 = var12; // L: 110 - - try { - URL var20 = new URL(class4.method57("services", false) + "m=accountappeal/login.ws"); // L: 112 - URLConnection var25 = var20.openConnection(); // L: 113 - var25.setDoInput(true); - var25.setDoOutput(true); // L: 115 - var25.setConnectTimeout(5000); - OutputStreamWriter var21 = new OutputStreamWriter(var25.getOutputStream()); // L: 117 - var21.write("data2=" + class368.method6299(var12) + "&dest=" + class368.method6299("passwordchoice.ws")); // L: 118 - var21.flush(); - InputStream var22 = var25.getInputStream(); - var9 = new Buffer(new byte[1000]); // L: 121 - - do { - var17 = var22.read(var9.array, var9.offset, 1000 - var9.offset); - if (var17 == -1) { - var21.close(); - var22.close(); - String var23 = new String(var9.array); - if (var23.startsWith("OFFLINE")) { - return 4; - } else if (var23.startsWith("WRONG")) { - return 7; // L: 137 - } else if (var23.startsWith("RELOAD")) { // L: 139 - return 3; - } else if (var23.startsWith("Not permitted for social network accounts.")) { // L: 142 - return 6; // L: 143 - } else { - var9.xteaDecryptAll(var6); // L: 145 - - while (var9.offset > 0 && var9.array[var9.offset - 1] == 0) { // L: 146 - --var9.offset; // L: 147 - } - - var23 = new String(var9.array, 0, var9.offset); // L: 149 - if (class23.method308(var23)) { // L: 150 - Interpreter.openURL(var23, true, false); // L: 151 - return 2; // L: 152 - } else { - return 5; // L: 154 - } - } - } - - var9.offset += var17; - } while(var9.offset < 1000); - - return 5; - } catch (Throwable var24) { // L: 156 - var24.printStackTrace(); // L: 157 - return 5; // L: 158 - } - } - - @ObfuscatedName("z") - @ObfuscatedSignature( - descriptor = "(IZI)Ljava/lang/String;", - garbageValue = "11371461" - ) - @Export("intToString") - public static String intToString(int var0, boolean var1) { - if (var1 && var0 >= 0) { // L: 114 - int var3 = var0; // L: 116 - String var2; - if (var1 && var0 >= 0) { // L: 119 - int var4 = 2; // L: 123 - - for (int var5 = var0 / 10; var5 != 0; ++var4) { // L: 124 125 127 - var5 /= 10; // L: 126 - } - - char[] var6 = new char[var4]; // L: 129 - var6[0] = '+'; // L: 130 - - for (int var7 = var4 - 1; var7 > 0; --var7) { // L: 131 - int var8 = var3; // L: 132 - var3 /= 10; // L: 133 - int var9 = var8 - var3 * 10; // L: 134 - if (var9 >= 10) { // L: 135 - var6[var7] = (char)(var9 + 87); - } else { - var6[var7] = (char)(var9 + 48); // L: 136 - } - } - - var2 = new String(var6); // L: 138 - } else { - var2 = Integer.toString(var0, 10); // L: 120 - } - - return var2; // L: 140 - } else { - return Integer.toString(var0); - } - } } diff --git a/runescape-client/src/main/java/PlatformInfo.java b/runescape-client/src/main/java/PlatformInfo.java index aa7a90bdf1..6feb1c8e8f 100644 --- a/runescape-client/src/main/java/PlatformInfo.java +++ b/runescape-client/src/main/java/PlatformInfo.java @@ -4,234 +4,188 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ms") +@ObfuscatedName("my") @Implements("PlatformInfo") public class PlatformInfo extends Node { - @ObfuscatedName("av") + @ObfuscatedName("ar") @ObfuscatedGetter( - intValue = 225638553 - ) - int field3964; - @ObfuscatedName("al") - boolean field3965; - @ObfuscatedName("ap") - @ObfuscatedGetter( - intValue = -370023237 - ) - int field3966; - @ObfuscatedName("am") - @ObfuscatedGetter( - intValue = -1543630699 - ) - int field3967; - @ObfuscatedName("ax") - @ObfuscatedGetter( - intValue = -1684646587 + intValue = -1738879851 ) int field3962; - @ObfuscatedName("ak") + @ObfuscatedName("ag") + boolean field3960; + @ObfuscatedName("ax") @ObfuscatedGetter( - intValue = -1100339875 + intValue = -841564613 ) - int field3969; - @ObfuscatedName("ay") + int field3972; + @ObfuscatedName("as") @ObfuscatedGetter( - intValue = 1933828239 + intValue = -1817348859 ) - int field3975; - @ObfuscatedName("ai") - boolean field3971; - @ObfuscatedName("aa") + int field3965; + @ObfuscatedName("aj") @ObfuscatedGetter( - intValue = 596740761 + intValue = -664826965 ) - int field3982; - @ObfuscatedName("au") + int field3963; + @ObfuscatedName("am") @ObfuscatedGetter( - intValue = -503242177 + intValue = 743323425 ) - int field3983; - @ObfuscatedName("ad") + int field3977; + @ObfuscatedName("az") @ObfuscatedGetter( - intValue = 663108825 + intValue = -1340740659 ) - int field3968; + int field3967; + @ObfuscatedName("av") + boolean field3966; @ObfuscatedName("ac") @ObfuscatedGetter( - intValue = 464711431 + intValue = -862865125 ) - int field3976; - @ObfuscatedName("az") - String field3977; - @ObfuscatedName("aq") - String field3978; - @ObfuscatedName("ab") - String field3979; - @ObfuscatedName("ar") - String field3984; - @ObfuscatedName("ah") + int field3961; + @ObfuscatedName("at") @ObfuscatedGetter( - intValue = 2062627009 + intValue = -669385777 ) int field3981; - @ObfuscatedName("af") + @ObfuscatedName("ao") @ObfuscatedGetter( - intValue = 425785549 + intValue = 1636879871 ) - int field3973; + int field3948; + @ObfuscatedName("aq") + @ObfuscatedGetter( + intValue = -741619897 + ) + int field3970; + @ObfuscatedName("aw") + String field3971; + @ObfuscatedName("af") + String field3982; + @ObfuscatedName("ak") + String field3973; + @ObfuscatedName("ay") + String field3976; + @ObfuscatedName("aa") + @ObfuscatedGetter( + intValue = 945045113 + ) + int field3975; + @ObfuscatedName("au") + @ObfuscatedGetter( + intValue = 611587281 + ) + int field3974; @ObfuscatedName("an") @ObfuscatedGetter( - intValue = 2012520725 + intValue = 942702701 ) - int field3986; + int field3956; @ObfuscatedName("bd") @ObfuscatedGetter( - intValue = 1740741469 + intValue = -2113690795 ) - int field3959; - @ObfuscatedName("bw") - String field3974; - @ObfuscatedName("bf") - String field3985; + int field3978; + @ObfuscatedName("bt") + String field3979; + @ObfuscatedName("bq") + String field3980; @ObfuscatedName("bu") - int[] field3987; - @ObfuscatedName("bb") + int[] field3964; + @ObfuscatedName("bl") @ObfuscatedGetter( - intValue = -1599832113 + intValue = 1352170779 ) - int field3988; - @ObfuscatedName("bk") - String field3989; + int field3983; + @ObfuscatedName("bv") + String field3952; PlatformInfo(int var1, boolean var2, int var3, int var4, int var5, int var6, int var7, boolean var8, int var9, int var10, int var11, int var12, String var13, String var14, String var15, String var16, int var17, int var18, int var19, int var20, String var21, String var22, int[] var23, int var24, String var25) { - this.field3987 = new int[3]; // L: 62 - this.field3964 = var1; // L: 67 - this.field3965 = var2; // L: 68 - this.field3966 = var3; // L: 69 - this.field3967 = var4; // L: 70 - this.field3962 = var5; // L: 71 - this.field3969 = var6; // L: 72 - this.field3975 = var7; // L: 73 - this.field3971 = var8; // L: 74 - this.field3982 = var9; // L: 75 - this.field3983 = var10; // L: 76 - this.field3968 = var11; // L: 77 - this.field3976 = var12; // L: 78 - this.field3977 = var13; // L: 79 - this.field3978 = var14; // L: 80 - this.field3979 = var15; // L: 81 - this.field3984 = var16; // L: 82 - this.field3981 = var17; // L: 83 - this.field3973 = var18; // L: 84 - this.field3986 = var19; // L: 85 - this.field3959 = var20; // L: 86 - this.field3974 = var21; // L: 87 - this.field3985 = var22; // L: 88 - this.field3987 = var23; // L: 89 - this.field3988 = var24; // L: 90 - this.field3989 = var25; // L: 91 + this.field3964 = new int[3]; // L: 62 + this.field3962 = var1; // L: 67 + this.field3960 = var2; // L: 68 + this.field3972 = var3; // L: 69 + this.field3965 = var4; // L: 70 + this.field3963 = var5; // L: 71 + this.field3977 = var6; // L: 72 + this.field3967 = var7; // L: 73 + this.field3966 = var8; // L: 74 + this.field3961 = var9; // L: 75 + this.field3981 = var10; // L: 76 + this.field3948 = var11; // L: 77 + this.field3970 = var12; // L: 78 + this.field3971 = var13; // L: 79 + this.field3982 = var14; // L: 80 + this.field3973 = var15; // L: 81 + this.field3976 = var16; // L: 82 + this.field3975 = var17; // L: 83 + this.field3974 = var18; // L: 84 + this.field3956 = var19; // L: 85 + this.field3978 = var20; // L: 86 + this.field3979 = var21; // L: 87 + this.field3980 = var22; // L: 88 + this.field3964 = var23; // L: 89 + this.field3983 = var24; // L: 90 + this.field3952 = var25; // L: 91 } // L: 92 - @ObfuscatedName("h") + @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "(Lnk;I)V", - garbageValue = "-1736449577" + descriptor = "(Lnd;I)V", + garbageValue = "-57324099" ) @Export("write") public void write(Buffer var1) { var1.writeByte(8); // L: 95 - var1.writeByte(this.field3964); // L: 96 - var1.writeByte(this.field3965 ? 1 : 0); // L: 97 - var1.writeShort(this.field3966); // L: 98 - var1.writeByte(this.field3967); // L: 99 - var1.writeByte(this.field3962); // L: 100 - var1.writeByte(this.field3969); // L: 101 - var1.writeByte(this.field3975); // L: 102 - var1.writeByte(this.field3971 ? 1 : 0); // L: 103 - var1.writeShort(this.field3982); // L: 104 - var1.writeByte(this.field3983); // L: 105 - var1.writeMedium(this.field3968); // L: 106 - var1.writeShort(this.field3976); // L: 107 - var1.writeStringCp1252NullCircumfixed(this.field3977); // L: 108 - var1.writeStringCp1252NullCircumfixed(this.field3978); // L: 109 - var1.writeStringCp1252NullCircumfixed(this.field3979); // L: 110 - var1.writeStringCp1252NullCircumfixed(this.field3984); // L: 111 - var1.writeByte(this.field3973); // L: 112 - var1.writeShort(this.field3981); // L: 113 - var1.writeStringCp1252NullCircumfixed(this.field3974); // L: 114 - var1.writeStringCp1252NullCircumfixed(this.field3985); // L: 115 - var1.writeByte(this.field3986); // L: 116 - var1.writeByte(this.field3959); // L: 117 + var1.writeByte(this.field3962); // L: 96 + var1.writeByte(this.field3960 ? 1 : 0); // L: 97 + var1.writeShort(this.field3972); // L: 98 + var1.writeByte(this.field3965); // L: 99 + var1.writeByte(this.field3963); // L: 100 + var1.writeByte(this.field3977); // L: 101 + var1.writeByte(this.field3967); // L: 102 + var1.writeByte(this.field3966 ? 1 : 0); // L: 103 + var1.writeShort(this.field3961); // L: 104 + var1.writeByte(this.field3981); // L: 105 + var1.writeMedium(this.field3948); // L: 106 + var1.writeShort(this.field3970); // L: 107 + var1.writeStringCp1252NullCircumfixed(this.field3971); // L: 108 + var1.writeStringCp1252NullCircumfixed(this.field3982); // L: 109 + var1.writeStringCp1252NullCircumfixed(this.field3973); // L: 110 + var1.writeStringCp1252NullCircumfixed(this.field3976); // L: 111 + var1.writeByte(this.field3974); // L: 112 + var1.writeShort(this.field3975); // L: 113 + var1.writeStringCp1252NullCircumfixed(this.field3979); // L: 114 + var1.writeStringCp1252NullCircumfixed(this.field3980); // L: 115 + var1.writeByte(this.field3956); // L: 116 + var1.writeByte(this.field3978); // L: 117 - for (int var2 = 0; var2 < this.field3987.length; ++var2) { // L: 118 - var1.writeInt(this.field3987[var2]); + for (int var2 = 0; var2 < this.field3964.length; ++var2) { // L: 118 + var1.writeInt(this.field3964[var2]); } - var1.writeInt(this.field3988); // L: 119 - var1.writeStringCp1252NullCircumfixed(this.field3989); // L: 120 + var1.writeInt(this.field3983); // L: 119 + var1.writeStringCp1252NullCircumfixed(this.field3952); // L: 120 } // L: 121 - @ObfuscatedName("c") + @ObfuscatedName("n") @ObfuscatedSignature( descriptor = "(I)I", - garbageValue = "-1618063694" + garbageValue = "1999982360" ) @Export("size") public int size() { byte var1 = 39; // L: 124 - String var4 = this.field3977; // L: 127 - int var3 = var4.length() + 2; // L: 129 - int var23 = var3 + var1; // L: 131 - String var7 = this.field3978; // L: 134 - int var6 = var7.length() + 2; // L: 136 - var23 += var6; // L: 138 - String var10 = this.field3979; // L: 141 - int var9 = var10.length() + 2; // L: 143 - var23 += var9; // L: 145 - String var13 = this.field3984; // L: 148 - int var12 = var13.length() + 2; // L: 150 - var23 += var12; // L: 152 - String var16 = this.field3974; // L: 155 - int var15 = var16.length() + 2; // L: 157 - var23 += var15; // L: 159 - String var19 = this.field3985; // L: 162 - int var18 = var19.length() + 2; // L: 164 - var23 += var18; // L: 166 - String var22 = this.field3989; // L: 169 - int var21 = var22.length() + 2; // L: 171 - var23 += var21; // L: 173 - return var23; // L: 174 + int var2 = var1 + BufferedFile.method6418(this.field3971); // L: 125 + var2 += BufferedFile.method6418(this.field3982); // L: 126 + var2 += BufferedFile.method6418(this.field3973); // L: 127 + var2 += BufferedFile.method6418(this.field3976); // L: 128 + var2 += BufferedFile.method6418(this.field3979); // L: 129 + var2 += BufferedFile.method6418(this.field3980); // L: 130 + var2 += BufferedFile.method6418(this.field3952); // L: 131 + return var2; // L: 132 } - - @ObfuscatedName("i") - @ObfuscatedSignature( - descriptor = "(Lbc;B)V", - garbageValue = "3" - ) - @Export("changeWorld") - static void changeWorld(World var0) { - if (var0.isMembersOnly() != Client.isMembersWorld) { // L: 1513 - Client.isMembersWorld = var0.isMembersOnly(); // L: 1514 - KeyHandler.method451(var0.isMembersOnly()); // L: 1515 - } - - if (var0.properties != Client.worldProperties) { // L: 1517 - Archive var1 = class43.archive8; // L: 1518 - int var2 = var0.properties; // L: 1519 - if ((var2 & 536870912) != 0) { // L: 1521 - FontName.logoSprite = MenuAction.SpriteBuffer_getIndexedSpriteByName(var1, "logo_deadman_mode", ""); // L: 1522 - } else if ((var2 & 1073741824) != 0) { // L: 1524 - FontName.logoSprite = MenuAction.SpriteBuffer_getIndexedSpriteByName(var1, "logo_seasonal_mode", ""); // L: 1525 - } else { - FontName.logoSprite = MenuAction.SpriteBuffer_getIndexedSpriteByName(var1, "logo", ""); // L: 1528 - } - } - - class26.worldHost = var0.host; // L: 1532 - Client.worldId = var0.id; // L: 1533 - Client.worldProperties = var0.properties; // L: 1534 - class69.worldPort = Client.gameBuild == 0 ? 43594 : var0.id + 40000; // L: 1535 - class24.js5Port = Client.gameBuild == 0 ? 443 : var0.id + 50000; // L: 1536 - BoundaryObject.currentPort = class69.worldPort; // L: 1537 - } // L: 1538 } diff --git a/runescape-client/src/main/java/PlatformInfoProvider.java b/runescape-client/src/main/java/PlatformInfoProvider.java index 82476fe460..0d4b81858b 100644 --- a/runescape-client/src/main/java/PlatformInfoProvider.java +++ b/runescape-client/src/main/java/PlatformInfoProvider.java @@ -3,13 +3,13 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("mc") +@ObfuscatedName("mh") @Implements("PlatformInfoProvider") public interface PlatformInfoProvider { - @ObfuscatedName("h") + @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "(I)Lms;", - garbageValue = "-741799305" + descriptor = "(B)Lmy;", + garbageValue = "-10" ) @Export("get") PlatformInfo get(); diff --git a/runescape-client/src/main/java/Player.java b/runescape-client/src/main/java/Player.java index b7ea54d578..53b02c68bb 100644 --- a/runescape-client/src/main/java/Player.java +++ b/runescape-client/src/main/java/Player.java @@ -3,166 +3,178 @@ 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("cg") +@ObfuscatedName("ce") @Implements("Player") public final class Player extends Actor { - @ObfuscatedName("h") + @ObfuscatedName("hg") @ObfuscatedSignature( - descriptor = "Lla;" + descriptor = "[Lop;" + ) + @Export("scrollBarSprites") + static IndexedSprite[] scrollBarSprites; + @ObfuscatedName("ix") + @ObfuscatedGetter( + intValue = 1565845213 + ) + @Export("selectedItemWidget") + static int selectedItemWidget; + @ObfuscatedName("v") + @ObfuscatedSignature( + descriptor = "Lly;" ) @Export("username") Username username; - @ObfuscatedName("c") + @ObfuscatedName("n") @ObfuscatedSignature( - descriptor = "Lii;" + descriptor = "Lic;" ) @Export("appearance") PlayerComposition appearance; - @ObfuscatedName("o") + @ObfuscatedName("f") @ObfuscatedGetter( - intValue = 972215407 + intValue = 268049119 ) @Export("headIconPk") int headIconPk; - @ObfuscatedName("g") + @ObfuscatedName("y") @ObfuscatedGetter( - intValue = 786520397 + intValue = 1372932469 ) @Export("headIconPrayer") int headIconPrayer; - @ObfuscatedName("z") + @ObfuscatedName("j") @Export("actions") String[] actions; - @ObfuscatedName("t") + @ObfuscatedName("r") @ObfuscatedGetter( - intValue = 177544021 + intValue = -1947441591 ) @Export("combatLevel") int combatLevel; - @ObfuscatedName("v") + @ObfuscatedName("b") @ObfuscatedGetter( - intValue = 439955349 + intValue = 1658362291 ) @Export("skillLevel") int skillLevel; - @ObfuscatedName("b") + @ObfuscatedName("d") @ObfuscatedGetter( - intValue = 1996153449 + intValue = -483485189 ) @Export("tileHeight") int tileHeight; - @ObfuscatedName("q") + @ObfuscatedName("s") @ObfuscatedGetter( - intValue = -470171859 + intValue = 1390365133 ) @Export("animationCycleStart") int animationCycleStart; - @ObfuscatedName("i") + @ObfuscatedName("u") @ObfuscatedGetter( - intValue = -2092287543 + intValue = -2037290909 ) @Export("animationCycleEnd") int animationCycleEnd; - @ObfuscatedName("x") + @ObfuscatedName("l") @ObfuscatedGetter( - intValue = -1153336923 + intValue = 1452650311 ) - int field1174; - @ObfuscatedName("k") + int field1202; + @ObfuscatedName("o") @ObfuscatedGetter( - intValue = 607445449 + intValue = 1606153053 ) @Export("tileHeight2") int tileHeight2; - @ObfuscatedName("r") + @ObfuscatedName("c") @ObfuscatedGetter( - intValue = -705770457 + intValue = -2065747987 ) - int field1172; - @ObfuscatedName("p") + int field1220; + @ObfuscatedName("e") @ObfuscatedSignature( - descriptor = "Lgj;" + descriptor = "Lgr;" ) @Export("model0") Model model0; - @ObfuscatedName("a") + @ObfuscatedName("g") @ObfuscatedGetter( - intValue = 1470022945 + intValue = -1119093931 ) @Export("minX") int minX; - @ObfuscatedName("e") + @ObfuscatedName("a") @ObfuscatedGetter( - intValue = 1450627593 + intValue = 1402081485 ) @Export("minY") int minY; - @ObfuscatedName("d") + @ObfuscatedName("k") @ObfuscatedGetter( - intValue = 410410317 + intValue = 482792791 ) @Export("maxX") int maxX; - @ObfuscatedName("u") + @ObfuscatedName("m") @ObfuscatedGetter( - intValue = -662783103 + intValue = -1028292805 ) @Export("maxY") int maxY; - @ObfuscatedName("m") + @ObfuscatedName("x") @Export("isUnanimated") boolean isUnanimated; - @ObfuscatedName("j") + @ObfuscatedName("z") @ObfuscatedGetter( - intValue = 515461967 + intValue = 1597353853 ) @Export("team") int team; - @ObfuscatedName("f") + @ObfuscatedName("w") @Export("isHidden") boolean isHidden; - @ObfuscatedName("s") + @ObfuscatedName("t") @ObfuscatedGetter( - intValue = -276233463 + intValue = 671262203 ) @Export("plane") int plane; - @ObfuscatedName("y") + @ObfuscatedName("h") @ObfuscatedGetter( - intValue = -319055031 + intValue = -104146557 ) @Export("index") int index; - @ObfuscatedName("w") + @ObfuscatedName("q") @ObfuscatedSignature( - descriptor = "Lls;" + descriptor = "Llu;" ) @Export("isFriendTriBool") TriBool isFriendTriBool; - @ObfuscatedName("n") + @ObfuscatedName("i") @ObfuscatedSignature( - descriptor = "Lls;" + descriptor = "Llu;" + ) + @Export("isInFriendsChat") + TriBool isInFriendsChat; + @ObfuscatedName("ae") + @ObfuscatedSignature( + descriptor = "Llu;" ) @Export("isInClanChat") TriBool isInClanChat; - @ObfuscatedName("ag") - @ObfuscatedSignature( - descriptor = "Lls;" - ) - TriBool field1170; - @ObfuscatedName("ae") - boolean field1186; - @ObfuscatedName("ao") + @ObfuscatedName("ap") + boolean field1218; + @ObfuscatedName("ab") @ObfuscatedGetter( - intValue = 139064121 + intValue = -40810693 ) @Export("tileX") int tileX; - @ObfuscatedName("aj") + @ObfuscatedName("al") @ObfuscatedGetter( - intValue = -1808848513 + intValue = 1966912699 ) @Export("tileY") int tileY; @@ -182,17 +194,17 @@ public final class Player extends Actor { this.animationCycleEnd = 0; // L: 32 this.isUnanimated = false; this.team = 0; - this.isHidden = false; // L: 43 - this.isFriendTriBool = TriBool.TriBool_unknown; // L: 46 - this.isInClanChat = TriBool.TriBool_unknown; // L: 47 - this.field1170 = TriBool.TriBool_unknown; // L: 48 - this.field1186 = false; // L: 49 + this.isHidden = false; + this.isFriendTriBool = TriBool.TriBool_unknown; + this.isInFriendsChat = TriBool.TriBool_unknown; // L: 47 + this.isInClanChat = TriBool.TriBool_unknown; + this.field1218 = false; // L: 49 } // L: 53 - @ObfuscatedName("h") + @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "(Lnk;B)V", - garbageValue = "100" + descriptor = "(Lnd;B)V", + garbageValue = "1" ) @Export("read") final void read(Buffer var1) { @@ -208,19 +220,19 @@ public final class Player extends Actor { int var7; int var8; for (int var5 = 0; var5 < 12; ++var5) { // L: 63 - var6 = var1.readUnsignedByte(); // L: 64 - if (var6 == 0) { // L: 65 - var4[var5] = 0; // L: 66 + var6 = var1.readUnsignedByte(); + if (var6 == 0) { + var4[var5] = 0; } else { - var7 = var1.readUnsignedByte(); // L: 69 - var4[var5] = var7 + (var6 << 8); // L: 70 + var7 = var1.readUnsignedByte(); + var4[var5] = var7 + (var6 << 8); if (var5 == 0 && var4[0] == 65535) { // L: 71 var3 = var1.readUnsignedShort(); // L: 72 break; } if (var4[var5] >= 512) { // L: 75 - var8 = Strings.ItemDefinition_get(var4[var5] - 512).team; // L: 76 + var8 = class260.ItemDefinition_get(var4[var5] - 512).team; // L: 76 if (var8 != 0) { // L: 77 this.team = var8; } @@ -228,15 +240,15 @@ public final class Player extends Actor { } } - int[] var11 = new int[5]; // L: 80 + int[] var24 = new int[5]; // L: 80 for (var6 = 0; var6 < 5; ++var6) { // L: 81 var7 = var1.readUnsignedByte(); // L: 82 - if (var7 < 0 || var7 >= Canvas.field295[var6].length) { // L: 83 + if (var7 < 0 || var7 >= class15.field137[var6].length) { // L: 83 var7 = 0; } - var11[var6] = var7; // L: 84 + var24[var6] = var7; // L: 84 } super.idleSequence = var1.readUnsignedShort(); // L: 86 @@ -261,8 +273,8 @@ public final class Player extends Actor { } super.walkLeftSequence = var1.readUnsignedShort(); // L: 95 - if (super.walkLeftSequence == 65535) { - super.walkLeftSequence = -1; // L: 96 + if (super.walkLeftSequence == 65535) { // L: 96 + super.walkLeftSequence = -1; } super.walkRightSequence = var1.readUnsignedShort(); // L: 97 @@ -275,817 +287,296 @@ public final class Player extends Actor { super.runSequence = -1; } - this.username = new Username(var1.readStringCp1252NullTerminated(), ModeWhere.loginType); // L: 101 + this.username = new Username(var1.readStringCp1252NullTerminated(), WorldMapSection0.loginType); // L: 101 this.clearIsFriend(); // L: 102 - this.clearIsInClanChat(); // L: 103 - this.method2130(); // L: 104 - if (this == class35.localPlayer) { // L: 105 + this.clearIsInFriendsChat(); // L: 103 + this.method2147(); + if (this == class93.localPlayer) { RunException.localPlayerName = this.username.getName(); } - this.combatLevel = var1.readUnsignedByte(); // L: 106 - this.skillLevel = var1.readUnsignedShort(); // L: 107 - this.isHidden = var1.readUnsignedByte() == 1; // L: 108 - if (Client.gameBuild == 0 && Client.staffModLevel >= 2) { // L: 109 + this.combatLevel = var1.readUnsignedByte(); + this.skillLevel = var1.readUnsignedShort(); + this.isHidden = var1.readUnsignedByte() == 1; + if (Client.gameBuild == 0 && Client.staffModLevel >= 2) { this.isHidden = false; } - class135[] var12 = null; // L: 110 - boolean var13 = false; // L: 111 - if (var1.offset < var1.array.length) { // L: 112 - var8 = var1.readUnsignedShort(); // L: 113 - var13 = (var8 >> 15 & 1) == 1; // L: 114 - if (var8 > 0 && var8 != 32768) { // L: 115 - var12 = new class135[12]; // L: 116 + class135[] var25 = null; + boolean var26 = false; + if (var1.offset < var1.array.length) { + var8 = var1.readUnsignedShort(); + var26 = (var8 >> 15 & 1) == 1; + if (var8 > 0 && var8 != 32768) { + var25 = new class135[12]; - for (int var9 = 0; var9 < 12; ++var9) { // L: 117 - int var10 = var8 >> 12 - var9 & 1; // L: 118 - if (var10 == 1) { // L: 119 - var12[var9] = class23.method310(var4[var9] - 512, var1); // L: 120 + for (int var9 = 0; var9 < 12; ++var9) { + int var10 = var8 >> 12 - var9 & 1; + if (var10 == 1) { + int var14 = var4[var9] - 512; + int var15 = var1.readUnsignedByte(); + boolean var16 = (var15 & 1) != 0; + boolean var17 = (var15 & 2) != 0; + class135 var18 = new class135(var14); + int var19; + int[] var20; + boolean var21; + int var22; + short var23; + if (var16) { + var19 = var1.readUnsignedByte(); + var20 = new int[]{var19 & 15, var19 >> 4 & 15}; + var21 = var18.field1537 != null && var20.length == var18.field1537.length; + + for (var22 = 0; var22 < 2; ++var22) { + if (var20[var22] != 15) { // L: 136 + var23 = (short)var1.readUnsignedShort(); + if (var21) { // L: 138 + var18.field1537[var20[var22]] = var23; // L: 139 + } + } + } + } + + if (var17) { // L: 144 + var19 = var1.readUnsignedByte(); // L: 145 + var20 = new int[]{var19 & 15, var19 >> 4 & 15}; // L: 146 147 148 + var21 = var18.field1538 != null && var20.length == var18.field1538.length; // L: 149 + + for (var22 = 0; var22 < 2; ++var22) { // L: 150 + if (var20[var22] != 15) { // L: 151 + var23 = (short)var1.readUnsignedShort(); // L: 152 + if (var21) { // L: 153 + var18.field1538[var20[var22]] = var23; // L: 154 + } + } + } + } + + var25[var9] = var18; // L: 161 } } } } - if (this.appearance == null) { // L: 125 + if (this.appearance == null) { // L: 166 this.appearance = new PlayerComposition(); } - this.appearance.method4614(var4, var12, var13, var11, var2 == 1, var3); // L: 126 - } // L: 127 + this.appearance.method4704(var4, var25, var26, var24, var2 == 1, var3); // L: 167 + } // L: 168 - @ObfuscatedName("c") + @ObfuscatedName("n") @ObfuscatedSignature( - descriptor = "(I)Lgj;", - garbageValue = "-220627570" + descriptor = "(B)Lgr;", + garbageValue = "-76" ) @Export("getModel") protected final Model getModel() { - if (this.appearance == null) { // L: 182 + if (this.appearance == null) { // L: 223 return null; } else { - SequenceDefinition var1 = super.sequence != -1 && super.sequenceDelay == 0 ? SequenceDefinition_get(super.sequence) : null; // L: 183 - SequenceDefinition var2 = super.movementSequence == -1 || this.isUnanimated || super.idleSequence == super.movementSequence && var1 != null ? null : SequenceDefinition_get(super.movementSequence); // L: 184 - Model var3 = this.appearance.getModel(var1, super.sequenceFrame, var2, super.movementFrame); // L: 185 - if (var3 == null) { // L: 186 + SequenceDefinition var1 = super.sequence != -1 && super.sequenceDelay == 0 ? LoginScreenAnimation.SequenceDefinition_get(super.sequence) : null; // L: 224 + SequenceDefinition var2 = super.movementSequence == -1 || this.isUnanimated || super.movementSequence == super.idleSequence && var1 != null ? null : LoginScreenAnimation.SequenceDefinition_get(super.movementSequence); // L: 225 + Model var3 = this.appearance.getModel(var1, super.sequenceFrame, var2, super.movementFrame); // L: 226 + if (var3 == null) { // L: 227 return null; } else { - var3.calculateBoundsCylinder(); // L: 187 - super.defaultHeight = var3.height; // L: 188 + var3.calculateBoundsCylinder(); // L: 228 + super.defaultHeight = var3.height; // L: 229 Model var4; Model[] var5; - if (!this.isUnanimated && super.spotAnimation != -1 && super.spotAnimationFrame != -1) { // L: 189 - var4 = Friend.SpotAnimationDefinition_get(super.spotAnimation).getModel(super.spotAnimationFrame); // L: 190 - if (var4 != null) { // L: 191 - var4.offsetBy(0, -super.field1224, 0); // L: 192 - var5 = new Model[]{var3, var4}; // L: 193 - var3 = new Model(var5, 2); // L: 194 + if (!this.isUnanimated && super.spotAnimation != -1 && super.spotAnimationFrame != -1) { // L: 230 + var4 = VarcInt.SpotAnimationDefinition_get(super.spotAnimation).getModel(super.spotAnimationFrame); // L: 231 + if (var4 != null) { // L: 232 + var4.offsetBy(0, -super.field1277, 0); // L: 233 + var5 = new Model[]{var3, var4}; // L: 234 + var3 = new Model(var5, 2); // L: 235 } } - if (!this.isUnanimated && this.model0 != null) { // L: 197 - if (Client.cycle >= this.animationCycleEnd) { // L: 198 + if (!this.isUnanimated && this.model0 != null) { // L: 238 + if (Client.cycle >= this.animationCycleEnd) { // L: 239 this.model0 = null; } - if (Client.cycle >= this.animationCycleStart && Client.cycle < this.animationCycleEnd) { // L: 199 - var4 = this.model0; // L: 200 - var4.offsetBy(this.field1174 - super.x, this.tileHeight2 - this.tileHeight, this.field1172 - super.y); // L: 201 - if (super.orientation == 512) { // L: 202 - var4.rotateY90Ccw(); // L: 203 - var4.rotateY90Ccw(); // L: 204 - var4.rotateY90Ccw(); // L: 205 - } else if (super.orientation == 1024) { // L: 207 - var4.rotateY90Ccw(); // L: 208 - var4.rotateY90Ccw(); // L: 209 - } else if (super.orientation == 1536) { // L: 211 + if (Client.cycle >= this.animationCycleStart && Client.cycle < this.animationCycleEnd) { // L: 240 + var4 = this.model0; // L: 241 + var4.offsetBy(this.field1202 - super.x, this.tileHeight2 - this.tileHeight, this.field1220 - super.y); // L: 242 + if (super.orientation == 512) { // L: 243 + var4.rotateY90Ccw(); // L: 244 + var4.rotateY90Ccw(); // L: 245 + var4.rotateY90Ccw(); // L: 246 + } else if (super.orientation == 1024) { // L: 248 + var4.rotateY90Ccw(); // L: 249 + var4.rotateY90Ccw(); // L: 250 + } else if (super.orientation == 1536) { // L: 252 var4.rotateY90Ccw(); } - var5 = new Model[]{var3, var4}; // L: 212 - var3 = new Model(var5, 2); // L: 213 - if (super.orientation == 512) { // L: 214 + var5 = new Model[]{var3, var4}; // L: 253 + var3 = new Model(var5, 2); // L: 254 + if (super.orientation == 512) { // L: 255 var4.rotateY90Ccw(); - } else if (super.orientation == 1024) { // L: 215 - var4.rotateY90Ccw(); // L: 216 - var4.rotateY90Ccw(); // L: 217 - } else if (super.orientation == 1536) { // L: 219 - var4.rotateY90Ccw(); // L: 220 - var4.rotateY90Ccw(); // L: 221 - var4.rotateY90Ccw(); // L: 222 + } else if (super.orientation == 1024) { // L: 256 + var4.rotateY90Ccw(); // L: 257 + var4.rotateY90Ccw(); // L: 258 + } else if (super.orientation == 1536) { // L: 260 + var4.rotateY90Ccw(); // L: 261 + var4.rotateY90Ccw(); // L: 262 + var4.rotateY90Ccw(); // L: 263 } - var4.offsetBy(super.x - this.field1174, this.tileHeight - this.tileHeight2, super.y - this.field1172); // L: 224 + var4.offsetBy(super.x - this.field1202, this.tileHeight - this.tileHeight2, super.y - this.field1220); // L: 265 } } - var3.isSingleTile = true; // L: 227 - return var3; // L: 228 + var3.isSingleTile = true; // L: 268 + return var3; // L: 269 } } } - @ObfuscatedName("o") + @ObfuscatedName("f") @ObfuscatedSignature( descriptor = "(I)Z", - garbageValue = "-1577174246" + garbageValue = "2031085482" ) @Export("isFriend") boolean isFriend() { - if (this.isFriendTriBool == TriBool.TriBool_unknown) { // L: 130 - this.checkIsFriend(); // L: 131 + if (this.isFriendTriBool == TriBool.TriBool_unknown) { // L: 171 + this.checkIsFriend(); // L: 172 } - return this.isFriendTriBool == TriBool.TriBool_true; // L: 133 + return this.isFriendTriBool == TriBool.TriBool_true; // L: 174 } - @ObfuscatedName("g") + @ObfuscatedName("y") @ObfuscatedSignature( descriptor = "(B)V", - garbageValue = "63" + garbageValue = "112" ) @Export("clearIsFriend") void clearIsFriend() { - this.isFriendTriBool = TriBool.TriBool_unknown; // L: 137 - } // L: 138 - - @ObfuscatedName("l") - @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "-2054012929" - ) - @Export("checkIsFriend") - void checkIsFriend() { - this.isFriendTriBool = GrandExchangeOfferUnitPriceComparator.friendSystem.isFriendAndHasWorld(this.username) ? TriBool.TriBool_true : TriBool.TriBool_false; // L: 141 - } // L: 142 - - @ObfuscatedName("z") - @ObfuscatedSignature( - descriptor = "(I)Z", - garbageValue = "1144773320" - ) - @Export("isClanMember") - boolean isClanMember() { - if (this.isInClanChat == TriBool.TriBool_unknown) { // L: 145 - this.updateIsInClanChat(); // L: 146 - } - - return this.isInClanChat == TriBool.TriBool_true; // L: 148 - } + this.isFriendTriBool = TriBool.TriBool_unknown; // L: 178 + } // L: 179 @ObfuscatedName("b") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "-1529344254" + garbageValue = "-574067295" ) - @Export("clearIsInClanChat") - void clearIsInClanChat() { - this.isInClanChat = TriBool.TriBool_unknown; // L: 152 - } // L: 153 + @Export("checkIsFriend") + void checkIsFriend() { + this.isFriendTriBool = NetSocket.friendSystem.isFriendAndHasWorld(this.username) ? TriBool.TriBool_true : TriBool.TriBool_false; // L: 182 + } // L: 183 - @ObfuscatedName("q") + @ObfuscatedName("d") @ObfuscatedSignature( - descriptor = "(S)V", - garbageValue = "28293" + descriptor = "(B)Z", + garbageValue = "-78" + ) + @Export("isFriendsChatMember") + boolean isFriendsChatMember() { + if (this.isInFriendsChat == TriBool.TriBool_unknown) { // L: 186 + this.updateIsInFriendsChat(); // L: 187 + } + + return this.isInFriendsChat == TriBool.TriBool_true; // L: 189 + } + + @ObfuscatedName("s") + @ObfuscatedSignature( + descriptor = "(B)V", + garbageValue = "4" + ) + @Export("clearIsInFriendsChat") + void clearIsInFriendsChat() { + this.isInFriendsChat = TriBool.TriBool_unknown; // L: 193 + } // L: 194 + + @ObfuscatedName("u") + @ObfuscatedSignature( + descriptor = "(I)V", + garbageValue = "2108325676" + ) + @Export("updateIsInFriendsChat") + void updateIsInFriendsChat() { + this.isInFriendsChat = WorldMapRegion.friendsChat != null && WorldMapRegion.friendsChat.contains(this.username) ? TriBool.TriBool_true : TriBool.TriBool_false; // L: 197 + } // L: 198 + + @ObfuscatedName("l") + @ObfuscatedSignature( + descriptor = "(B)V", + garbageValue = "50" ) @Export("updateIsInClanChat") void updateIsInClanChat() { - this.isInClanChat = class25.clanChat != null && class25.clanChat.contains(this.username) ? TriBool.TriBool_true : TriBool.TriBool_false; // L: 156 - } // L: 157 + this.isInClanChat = Client.currentClanSettings[0] != null && Client.currentClanSettings[0].method99(this.username.getName()) != -1 ? TriBool.TriBool_true : TriBool.TriBool_false; // L: 201 + } // L: 202 - @ObfuscatedName("i") + @ObfuscatedName("o") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "-925189639" + garbageValue = "-660230159" ) - void method2177() { - this.field1170 = Client.field678[0] != null && Client.field678[0].method113(this.username.getName()) != -1 ? TriBool.TriBool_true : TriBool.TriBool_false; // L: 160 - } // L: 161 + void method2147() { + this.isInClanChat = TriBool.TriBool_unknown; // L: 205 + } // L: 206 - @ObfuscatedName("x") + @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "(S)V", - garbageValue = "31443" + descriptor = "(I)Z", + garbageValue = "1964192988" ) - void method2130() { - this.field1170 = TriBool.TriBool_unknown; // L: 164 - } // L: 165 - - @ObfuscatedName("k") - @ObfuscatedSignature( - descriptor = "(B)Z", - garbageValue = "22" - ) - boolean method2137() { - if (this.field1170 == TriBool.TriBool_unknown) { // L: 168 - this.method2177(); // L: 169 + @Export("isClanMember") + boolean isClanMember() { + if (this.isInClanChat == TriBool.TriBool_unknown) { // L: 209 + this.updateIsInClanChat(); // L: 210 } - return this.field1170 == TriBool.TriBool_true; // L: 171 + return this.isInClanChat == TriBool.TriBool_true; // L: 212 } - @ObfuscatedName("r") + @ObfuscatedName("e") @ObfuscatedSignature( descriptor = "(I)I", - garbageValue = "-796021521" + garbageValue = "-1517836125" ) @Export("transformedSize") int transformedSize() { - return this.appearance != null && this.appearance.npcTransformId != -1 ? class8.getNpcDefinition(this.appearance.npcTransformId).size : 1; // L: 175 176 178 + return this.appearance != null && this.appearance.npcTransformId != -1 ? StructComposition.getNpcDefinition(this.appearance.npcTransformId).size : 1; // L: 216 217 219 } - @ObfuscatedName("p") + @ObfuscatedName("g") @ObfuscatedSignature( descriptor = "(IIBI)V", - garbageValue = "166145793" + garbageValue = "2070611264" ) - final void method2140(int var1, int var2, byte var3) { - if (super.sequence != -1 && SequenceDefinition_get(super.sequence).field1882 == 1) { // L: 232 + final void method2129(int var1, int var2, byte var3) { + if (super.sequence != -1 && LoginScreenAnimation.SequenceDefinition_get(super.sequence).field1890 == 1) { // L: 273 super.sequence = -1; } - super.field1247 = -1; // L: 233 - if (var1 >= 0 && var1 < 104 && var2 >= 0 && var2 < 104) { // L: 234 - if (super.pathX[0] >= 0 && super.pathX[0] < 104 && super.pathY[0] >= 0 && super.pathY[0] < 104) { // L: 235 - if (var3 == 2) { // L: 237 - Player var4 = this; // L: 238 - int var5 = super.pathX[0]; // L: 240 - int var6 = super.pathY[0]; // L: 241 - int var7 = this.transformedSize(); // L: 242 - if (var5 >= var7 && var5 < 104 - var7 && var6 >= var7 && var6 < 104 - var7 && var1 >= var7 && var1 < 104 - var7 && var2 >= var7 && var2 < 104 - var7) { // L: 243 244 - int var9 = this.transformedSize(); // L: 246 - Client.field894.approxDestinationX = var1; // L: 249 - Client.field894.approxDestinationY = var2; // L: 250 - Client.field894.approxDestinationSizeX = 1; // L: 251 - Client.field894.approxDestinationSizeY = 1; // L: 252 - ApproximateRouteStrategy var10 = Client.field894; // L: 253 - ApproximateRouteStrategy var11 = var10; // L: 255 - CollisionMap var12 = Client.collisionMaps[this.plane]; // L: 256 - int[] var13 = Client.field828; // L: 257 - int[] var14 = Client.field896; // L: 258 - int var15 = 0; - - label853: - while (true) { - int var16; - if (var15 >= 128) { - int var17; - int var18; - byte var19; - byte var20; - int var21; - int var22; - byte var23; - int var24; - int[][] var25; - int var26; - int var27; - int var28; - int var29; - boolean var35; - boolean var36; - int var37; - int var38; - int var40; - if (var9 == 1) { // L: 267 - var17 = var5; // L: 270 - var18 = var6; // L: 271 - var19 = 64; // L: 272 - var20 = 64; // L: 273 - var21 = var5 - var19; // L: 274 - var22 = var6 - var20; // L: 275 - class159.directions[var19][var20] = 99; // L: 276 - class159.distances[var19][var20] = 0; // L: 277 - var23 = 0; // L: 278 - var24 = 0; // L: 279 - class159.bufferX[var23] = var5; // L: 280 - var40 = var23 + 1; - class159.bufferY[var23] = var6; // L: 281 - var25 = var12.flags; // L: 282 - - while (true) { - if (var24 == var40) { // L: 285 - class159.field1920 = var17; // L: 357 - class159.field1924 = var18; // L: 358 - var36 = false; // L: 359 - break; - } - - var17 = class159.bufferX[var24]; // L: 286 - var18 = class159.bufferY[var24]; // L: 287 - var24 = var24 + 1 & 4095; // L: 288 - var37 = var17 - var21; // L: 289 - var38 = var18 - var22; // L: 290 - var26 = var17 - var12.xInset; // L: 291 - var27 = var18 - var12.yInset; // L: 292 - if (var11.hasArrived(1, var17, var18, var12)) { // L: 293 - class159.field1920 = var17; // L: 294 - class159.field1924 = var18; // L: 295 - var36 = true; // L: 296 - break; - } - - var28 = class159.distances[var37][var38] + 1; // L: 299 - if (var37 > 0 && class159.directions[var37 - 1][var38] == 0 && (var25[var26 - 1][var27] & 19136776) == 0) { // L: 300 - class159.bufferX[var40] = var17 - 1; // L: 301 - class159.bufferY[var40] = var18; // L: 302 - var40 = var40 + 1 & 4095; // L: 303 - class159.directions[var37 - 1][var38] = 2; // L: 304 - class159.distances[var37 - 1][var38] = var28; // L: 305 - } - - if (var37 < 127 && class159.directions[var37 + 1][var38] == 0 && (var25[var26 + 1][var27] & 19136896) == 0) { // L: 307 - class159.bufferX[var40] = var17 + 1; // L: 308 - class159.bufferY[var40] = var18; // L: 309 - var40 = var40 + 1 & 4095; // L: 310 - class159.directions[var37 + 1][var38] = 8; // L: 311 - class159.distances[var37 + 1][var38] = var28; // L: 312 - } - - if (var38 > 0 && class159.directions[var37][var38 - 1] == 0 && (var25[var26][var27 - 1] & 19136770) == 0) { // L: 314 - class159.bufferX[var40] = var17; // L: 315 - class159.bufferY[var40] = var18 - 1; // L: 316 - var40 = var40 + 1 & 4095; // L: 317 - class159.directions[var37][var38 - 1] = 1; // L: 318 - class159.distances[var37][var38 - 1] = var28; // L: 319 - } - - if (var38 < 127 && class159.directions[var37][var38 + 1] == 0 && (var25[var26][var27 + 1] & 19136800) == 0) { // L: 321 - class159.bufferX[var40] = var17; // L: 322 - class159.bufferY[var40] = var18 + 1; // L: 323 - var40 = var40 + 1 & 4095; // L: 324 - class159.directions[var37][var38 + 1] = 4; // L: 325 - class159.distances[var37][var38 + 1] = var28; // L: 326 - } - - if (var37 > 0 && var38 > 0 && class159.directions[var37 - 1][var38 - 1] == 0 && (var25[var26 - 1][var27 - 1] & 19136782) == 0 && (var25[var26 - 1][var27] & 19136776) == 0 && (var25[var26][var27 - 1] & 19136770) == 0) { // L: 328 - class159.bufferX[var40] = var17 - 1; // L: 329 - class159.bufferY[var40] = var18 - 1; // L: 330 - var40 = var40 + 1 & 4095; // L: 331 - class159.directions[var37 - 1][var38 - 1] = 3; // L: 332 - class159.distances[var37 - 1][var38 - 1] = var28; // L: 333 - } - - if (var37 < 127 && var38 > 0 && class159.directions[var37 + 1][var38 - 1] == 0 && (var25[var26 + 1][var27 - 1] & 19136899) == 0 && (var25[var26 + 1][var27] & 19136896) == 0 && (var25[var26][var27 - 1] & 19136770) == 0) { // L: 335 - class159.bufferX[var40] = var17 + 1; // L: 336 - class159.bufferY[var40] = var18 - 1; // L: 337 - var40 = var40 + 1 & 4095; // L: 338 - class159.directions[var37 + 1][var38 - 1] = 9; // L: 339 - class159.distances[var37 + 1][var38 - 1] = var28; // L: 340 - } - - if (var37 > 0 && var38 < 127 && class159.directions[var37 - 1][var38 + 1] == 0 && (var25[var26 - 1][var27 + 1] & 19136824) == 0 && (var25[var26 - 1][var27] & 19136776) == 0 && (var25[var26][var27 + 1] & 19136800) == 0) { // L: 342 - class159.bufferX[var40] = var17 - 1; // L: 343 - class159.bufferY[var40] = var18 + 1; // L: 344 - var40 = var40 + 1 & 4095; // L: 345 - class159.directions[var37 - 1][var38 + 1] = 6; // L: 346 - class159.distances[var37 - 1][var38 + 1] = var28; // L: 347 - } - - if (var37 < 127 && var38 < 127 && class159.directions[var37 + 1][var38 + 1] == 0 && (var25[var26 + 1][var27 + 1] & 19136992) == 0 && (var25[var26 + 1][var27] & 19136896) == 0 && (var25[var26][var27 + 1] & 19136800) == 0) { // L: 349 - class159.bufferX[var40] = var17 + 1; // L: 350 - class159.bufferY[var40] = var18 + 1; // L: 351 - var40 = var40 + 1 & 4095; // L: 352 - class159.directions[var37 + 1][var38 + 1] = 12; // L: 353 - class159.distances[var37 + 1][var38 + 1] = var28; // L: 354 - } - } - - var35 = var36; // L: 361 - } else if (var9 == 2) { // L: 363 - var17 = var5; // L: 366 - var18 = var6; // L: 367 - var19 = 64; // L: 368 - var20 = 64; // L: 369 - var21 = var5 - var19; // L: 370 - var22 = var6 - var20; // L: 371 - class159.directions[var19][var20] = 99; // L: 372 - class159.distances[var19][var20] = 0; // L: 373 - var23 = 0; // L: 374 - var24 = 0; // L: 375 - class159.bufferX[var23] = var5; // L: 376 - var40 = var23 + 1; - class159.bufferY[var23] = var6; // L: 377 - var25 = var12.flags; // L: 378 - - while (true) { - if (var40 == var24) { // L: 379 - class159.field1920 = var17; // L: 479 - class159.field1924 = var18; // L: 480 - var36 = false; // L: 481 - break; - } - - var17 = class159.bufferX[var24]; // L: 380 - var18 = class159.bufferY[var24]; // L: 381 - var24 = var24 + 1 & 4095; // L: 382 - var37 = var17 - var21; // L: 383 - var38 = var18 - var22; // L: 384 - var26 = var17 - var12.xInset; // L: 385 - var27 = var18 - var12.yInset; // L: 386 - if (var11.hasArrived(2, var17, var18, var12)) { // L: 387 - class159.field1920 = var17; // L: 388 - class159.field1924 = var18; // L: 389 - var36 = true; // L: 390 - break; - } - - var28 = class159.distances[var37][var38] + 1; // L: 393 - if (var37 > 0 && class159.directions[var37 - 1][var38] == 0 && (var25[var26 - 1][var27] & 19136782) == 0 && (var25[var26 - 1][var27 + 1] & 19136824) == 0) { // L: 394 395 396 397 - class159.bufferX[var40] = var17 - 1; // L: 398 - class159.bufferY[var40] = var18; // L: 399 - var40 = var40 + 1 & 4095; // L: 400 - class159.directions[var37 - 1][var38] = 2; // L: 401 - class159.distances[var37 - 1][var38] = var28; // L: 402 - } - - if (var37 < 126 && class159.directions[var37 + 1][var38] == 0 && (var25[var26 + 2][var27] & 19136899) == 0 && (var25[var26 + 2][var27 + 1] & 19136992) == 0) { // L: 404 405 406 407 - class159.bufferX[var40] = var17 + 1; // L: 408 - class159.bufferY[var40] = var18; // L: 409 - var40 = var40 + 1 & 4095; // L: 410 - class159.directions[var37 + 1][var38] = 8; // L: 411 - class159.distances[var37 + 1][var38] = var28; // L: 412 - } - - if (var38 > 0 && class159.directions[var37][var38 - 1] == 0 && (var25[var26][var27 - 1] & 19136782) == 0 && (var25[var26 + 1][var27 - 1] & 19136899) == 0) { // L: 414 415 416 417 - class159.bufferX[var40] = var17; // L: 418 - class159.bufferY[var40] = var18 - 1; // L: 419 - var40 = var40 + 1 & 4095; // L: 420 - class159.directions[var37][var38 - 1] = 1; // L: 421 - class159.distances[var37][var38 - 1] = var28; // L: 422 - } - - if (var38 < 126 && class159.directions[var37][var38 + 1] == 0 && (var25[var26][var27 + 2] & 19136824) == 0 && (var25[var26 + 1][var27 + 2] & 19136992) == 0) { // L: 424 425 426 427 - class159.bufferX[var40] = var17; // L: 428 - class159.bufferY[var40] = var18 + 1; // L: 429 - var40 = var40 + 1 & 4095; // L: 430 - class159.directions[var37][var38 + 1] = 4; // L: 431 - class159.distances[var37][var38 + 1] = var28; // L: 432 - } - - if (var37 > 0 && var38 > 0 && class159.directions[var37 - 1][var38 - 1] == 0 && (var25[var26 - 1][var27] & 19136830) == 0 && (var25[var26 - 1][var27 - 1] & 19136782) == 0 && (var25[var26][var27 - 1] & 19136911) == 0) { // L: 434 435 436 437 438 - class159.bufferX[var40] = var17 - 1; // L: 439 - class159.bufferY[var40] = var18 - 1; // L: 440 - var40 = var40 + 1 & 4095; // L: 441 - class159.directions[var37 - 1][var38 - 1] = 3; // L: 442 - class159.distances[var37 - 1][var38 - 1] = var28; // L: 443 - } - - if (var37 < 126 && var38 > 0 && class159.directions[var37 + 1][var38 - 1] == 0 && (var25[var26 + 1][var27 - 1] & 19136911) == 0 && (var25[var26 + 2][var27 - 1] & 19136899) == 0 && (var25[var26 + 2][var27] & 19136995) == 0) { // L: 445 446 447 448 449 - class159.bufferX[var40] = var17 + 1; // L: 450 - class159.bufferY[var40] = var18 - 1; // L: 451 - var40 = var40 + 1 & 4095; // L: 452 - class159.directions[var37 + 1][var38 - 1] = 9; // L: 453 - class159.distances[var37 + 1][var38 - 1] = var28; // L: 454 - } - - if (var37 > 0 && var38 < 126 && class159.directions[var37 - 1][var38 + 1] == 0 && (var25[var26 - 1][var27 + 1] & 19136830) == 0 && (var25[var26 - 1][var27 + 2] & 19136824) == 0 && (var25[var26][var27 + 2] & 19137016) == 0) { // L: 456 457 458 459 460 - class159.bufferX[var40] = var17 - 1; // L: 461 - class159.bufferY[var40] = var18 + 1; // L: 462 - var40 = var40 + 1 & 4095; // L: 463 - class159.directions[var37 - 1][var38 + 1] = 6; // L: 464 - class159.distances[var37 - 1][var38 + 1] = var28; // L: 465 - } - - if (var37 < 126 && var38 < 126 && class159.directions[var37 + 1][var38 + 1] == 0 && (var25[var26 + 1][var27 + 2] & 19137016) == 0 && (var25[var26 + 2][var27 + 2] & 19136992) == 0 && (var25[var26 + 2][var27 + 1] & 19136995) == 0) { // L: 467 468 469 470 471 - class159.bufferX[var40] = var17 + 1; // L: 472 - class159.bufferY[var40] = var18 + 1; // L: 473 - var40 = var40 + 1 & 4095; // L: 474 - class159.directions[var37 + 1][var38 + 1] = 12; // L: 475 - class159.distances[var37 + 1][var38 + 1] = var28; // L: 476 - } - } - - var35 = var36; // L: 483 - } else { - var17 = var5; // L: 488 - var18 = var6; // L: 489 - var19 = 64; // L: 490 - var20 = 64; // L: 491 - var21 = var5 - var19; // L: 492 - var22 = var6 - var20; // L: 493 - class159.directions[var19][var20] = 99; // L: 494 - class159.distances[var19][var20] = 0; // L: 495 - var23 = 0; // L: 496 - var24 = 0; // L: 497 - class159.bufferX[var23] = var5; // L: 498 - var40 = var23 + 1; - class159.bufferY[var23] = var6; // L: 499 - var25 = var12.flags; // L: 500 - - label839: - while (true) { - label837: - while (true) { - do { - do { - do { - label814: - do { - if (var40 == var24) { // L: 501 - class159.field1920 = var17; // L: 621 - class159.field1924 = var18; // L: 622 - var36 = false; // L: 623 - break label839; - } - - var17 = class159.bufferX[var24]; // L: 502 - var18 = class159.bufferY[var24]; // L: 503 - var24 = var24 + 1 & 4095; // L: 504 - var37 = var17 - var21; // L: 505 - var38 = var18 - var22; // L: 506 - var26 = var17 - var12.xInset; // L: 507 - var27 = var18 - var12.yInset; // L: 508 - if (var11.hasArrived(var9, var17, var18, var12)) { // L: 509 - class159.field1920 = var17; // L: 510 - class159.field1924 = var18; // L: 511 - var36 = true; // L: 512 - break label839; - } - - var28 = class159.distances[var37][var38] + 1; // L: 515 - if (var37 > 0 && class159.directions[var37 - 1][var38] == 0 && (var25[var26 - 1][var27] & 19136782) == 0 && (var25[var26 - 1][var27 + var9 - 1] & 19136824) == 0) { // L: 516 517 518 519 - var29 = 1; - - while (true) { - if (var29 >= var9 - 1) { - class159.bufferX[var40] = var17 - 1; // L: 523 - class159.bufferY[var40] = var18; // L: 524 - var40 = var40 + 1 & 4095; // L: 525 - class159.directions[var37 - 1][var38] = 2; // L: 526 - class159.distances[var37 - 1][var38] = var28; // L: 527 - break; - } - - if ((var25[var26 - 1][var29 + var27] & 19136830) != 0) { // L: 521 - break; - } - - ++var29; // L: 520 - } - } - - if (var37 < 128 - var9 && class159.directions[var37 + 1][var38] == 0 && (var25[var9 + var26][var27] & 19136899) == 0 && (var25[var9 + var26][var27 + var9 - 1] & 19136992) == 0) { // L: 529 530 531 532 - var29 = 1; - - while (true) { - if (var29 >= var9 - 1) { - class159.bufferX[var40] = var17 + 1; // L: 536 - class159.bufferY[var40] = var18; // L: 537 - var40 = var40 + 1 & 4095; // L: 538 - class159.directions[var37 + 1][var38] = 8; // L: 539 - class159.distances[var37 + 1][var38] = var28; // L: 540 - break; - } - - if ((var25[var26 + var9][var29 + var27] & 19136995) != 0) { // L: 534 - break; - } - - ++var29; // L: 533 - } - } - - if (var38 > 0 && class159.directions[var37][var38 - 1] == 0 && (var25[var26][var27 - 1] & 19136782) == 0 && (var25[var26 + var9 - 1][var27 - 1] & 19136899) == 0) { // L: 542 543 544 545 - var29 = 1; - - while (true) { - if (var29 >= var9 - 1) { - class159.bufferX[var40] = var17; // L: 549 - class159.bufferY[var40] = var18 - 1; // L: 550 - var40 = var40 + 1 & 4095; // L: 551 - class159.directions[var37][var38 - 1] = 1; // L: 552 - class159.distances[var37][var38 - 1] = var28; // L: 553 - break; - } - - if ((var25[var26 + var29][var27 - 1] & 19136911) != 0) { // L: 547 - break; - } - - ++var29; // L: 546 - } - } - - if (var38 < 128 - var9 && class159.directions[var37][var38 + 1] == 0 && (var25[var26][var9 + var27] & 19136824) == 0 && (var25[var26 + var9 - 1][var9 + var27] & 19136992) == 0) { // L: 555 556 557 558 - var29 = 1; - - while (true) { - if (var29 >= var9 - 1) { - class159.bufferX[var40] = var17; // L: 562 - class159.bufferY[var40] = var18 + 1; // L: 563 - var40 = var40 + 1 & 4095; // L: 564 - class159.directions[var37][var38 + 1] = 4; // L: 565 - class159.distances[var37][var38 + 1] = var28; // L: 566 - break; - } - - if ((var25[var29 + var26][var27 + var9] & 19137016) != 0) { // L: 560 - break; - } - - ++var29; // L: 559 - } - } - - if (var37 > 0 && var38 > 0 && class159.directions[var37 - 1][var38 - 1] == 0 && (var25[var26 - 1][var27 - 1] & 19136782) == 0) { // L: 568 569 570 - var29 = 1; - - while (true) { - if (var29 >= var9) { - class159.bufferX[var40] = var17 - 1; // L: 575 - class159.bufferY[var40] = var18 - 1; // L: 576 - var40 = var40 + 1 & 4095; // L: 577 - class159.directions[var37 - 1][var38 - 1] = 3; // L: 578 - class159.distances[var37 - 1][var38 - 1] = var28; // L: 579 - break; - } - - if ((var25[var26 - 1][var29 + (var27 - 1)] & 19136830) != 0 || (var25[var29 + (var26 - 1)][var27 - 1] & 19136911) != 0) { // L: 572 573 - break; - } - - ++var29; // L: 571 - } - } - - if (var37 < 128 - var9 && var38 > 0 && class159.directions[var37 + 1][var38 - 1] == 0 && (var25[var9 + var26][var27 - 1] & 19136899) == 0) { // L: 581 582 583 - var29 = 1; - - while (true) { - if (var29 >= var9) { - class159.bufferX[var40] = var17 + 1; // L: 588 - class159.bufferY[var40] = var18 - 1; // L: 589 - var40 = var40 + 1 & 4095; // L: 590 - class159.directions[var37 + 1][var38 - 1] = 9; // L: 591 - class159.distances[var37 + 1][var38 - 1] = var28; // L: 592 - break; - } - - if ((var25[var26 + var9][var29 + (var27 - 1)] & 19136995) != 0 || (var25[var29 + var26][var27 - 1] & 19136911) != 0) { // L: 585 586 - break; - } - - ++var29; // L: 584 - } - } - - if (var37 > 0 && var38 < 128 - var9 && class159.directions[var37 - 1][var38 + 1] == 0 && (var25[var26 - 1][var27 + var9] & 19136824) == 0) { // L: 594 595 596 - for (var29 = 1; var29 < var9; ++var29) { // L: 597 - if ((var25[var26 - 1][var27 + var29] & 19136830) != 0 || (var25[var29 + (var26 - 1)][var9 + var27] & 19137016) != 0) { // L: 598 599 - continue label814; - } - } - - class159.bufferX[var40] = var17 - 1; // L: 601 - class159.bufferY[var40] = var18 + 1; // L: 602 - var40 = var40 + 1 & 4095; // L: 603 - class159.directions[var37 - 1][var38 + 1] = 6; // L: 604 - class159.distances[var37 - 1][var38 + 1] = var28; // L: 605 - } - } while(var37 >= 128 - var9); // L: 607 - } while(var38 >= 128 - var9); - } while(class159.directions[var37 + 1][var38 + 1] != 0); // L: 608 - } while((var25[var26 + var9][var27 + var9] & 19136992) != 0); // L: 609 - - for (var29 = 1; var29 < var9; ++var29) { // L: 610 - if ((var25[var29 + var26][var9 + var27] & 19137016) != 0 || (var25[var26 + var9][var29 + var27] & 19136995) != 0) { // L: 611 612 - continue label837; - } - } - - class159.bufferX[var40] = var17 + 1; // L: 614 - class159.bufferY[var40] = var18 + 1; // L: 615 - var40 = var40 + 1 & 4095; // L: 616 - class159.directions[var37 + 1][var38 + 1] = 12; // L: 617 - class159.distances[var37 + 1][var38 + 1] = var28; // L: 618 - } - } - - var35 = var36; // L: 625 - } - - int var8; - label896: { - var16 = var5 - 64; // L: 627 - var17 = var6 - 64; // L: 628 - var18 = class159.field1920; // L: 629 - var37 = class159.field1924; // L: 630 - if (!var35) { // L: 631 - var38 = Integer.MAX_VALUE; // L: 633 - var21 = Integer.MAX_VALUE; // L: 634 - byte var39 = 10; // L: 635 - var40 = var11.approxDestinationX; // L: 636 - var24 = var11.approxDestinationY; // L: 637 - int var34 = var11.approxDestinationSizeX; // L: 638 - var26 = var11.approxDestinationSizeY; // L: 639 - - for (var27 = var40 - var39; var27 <= var39 + var40; ++var27) { // L: 640 - for (var28 = var24 - var39; var28 <= var39 + var24; ++var28) { // L: 641 - var29 = var27 - var16; // L: 642 - int var30 = var28 - var17; // L: 643 - if (var29 >= 0 && var30 >= 0 && var29 < 128 && var30 < 128 && class159.distances[var29][var30] < 100) { // L: 644 645 - int var31 = 0; // L: 646 - if (var27 < var40) { // L: 647 - var31 = var40 - var27; - } else if (var27 > var40 + var34 - 1) { // L: 648 - var31 = var27 - (var34 + var40 - 1); - } - - int var32 = 0; // L: 649 - if (var28 < var24) { // L: 650 - var32 = var24 - var28; - } else if (var28 > var26 + var24 - 1) { // L: 651 - var32 = var28 - (var26 + var24 - 1); - } - - int var33 = var31 * var31 + var32 * var32; // L: 652 - if (var33 < var38 || var38 == var33 && class159.distances[var29][var30] < var21) { // L: 653 - var38 = var33; // L: 654 - var21 = class159.distances[var29][var30]; // L: 655 - var18 = var27; // L: 656 - var37 = var28; // L: 657 - } - } - } - } - - if (var38 == Integer.MAX_VALUE) { // L: 663 - var8 = -1; // L: 664 - break label896; - } - } - - if (var18 == var5 && var6 == var37) { // L: 673 - var8 = 0; // L: 674 - } else { - var20 = 0; // L: 677 - class159.bufferX[var20] = var18; // L: 680 - var38 = var20 + 1; - class159.bufferY[var20] = var37; // L: 681 - - for (var21 = var22 = class159.directions[var18 - var16][var37 - var17]; var18 != var5 || var37 != var6; var21 = class159.directions[var18 - var16][var37 - var17]) { // L: 682 683 693 - if (var21 != var22) { // L: 684 - var22 = var21; // L: 685 - class159.bufferX[var38] = var18; // L: 686 - class159.bufferY[var38++] = var37; // L: 687 - } - - if ((var21 & 2) != 0) { // L: 689 - ++var18; - } else if ((var21 & 8) != 0) { // L: 690 - --var18; - } - - if ((var21 & 1) != 0) { // L: 691 - ++var37; - } else if ((var21 & 4) != 0) { // L: 692 - --var37; - } - } - - var40 = 0; // L: 695 - - while (var38-- > 0) { // L: 696 - var13[var40] = class159.bufferX[var38]; // L: 697 - var14[var40++] = class159.bufferY[var38]; // L: 698 - if (var40 >= var13.length) { // L: 699 - break; - } - } - - var8 = var40; // L: 701 - } - } - - var15 = var8; // L: 703 - if (var8 < 1) { // L: 704 - break; - } - - var16 = 0; // L: 705 - - while (true) { - if (var16 >= var15 - 1) { - break label853; - } - - var4.method2163(Client.field828[var16], Client.field896[var16], (byte)2); - ++var16; - } + super.field1264 = -1; // L: 274 + if (var1 >= 0 && var1 < 104 && var2 >= 0 && var2 < 104) { // L: 275 + if (super.pathX[0] >= 0 && super.pathX[0] < 104 && super.pathY[0] >= 0 && super.pathY[0] < 104) { // L: 276 + if (var3 == 2) { // L: 278 + Player var4 = this; // L: 279 + int var5 = super.pathX[0]; // L: 281 + int var6 = super.pathY[0]; // L: 282 + int var7 = this.transformedSize(); // L: 283 + if (var5 >= var7 && var5 < 104 - var7 && var6 >= var7 && var6 < 104 - var7 && var1 >= var7 && var1 < 104 - var7 && var2 >= var7 && var2 < 104 - var7) { // L: 284 285 + int var8 = SoundSystem.method808(var5, var6, this.transformedSize(), class372.method6463(var1, var2), Client.collisionMaps[this.plane], true, Client.field689, Client.field851); // L: 286 + if (var8 >= 1) { // L: 287 + for (int var9 = 0; var9 < var8 - 1; ++var9) { // L: 288 + var4.method2165(Client.field689[var9], Client.field851[var9], (byte)2); } - - for (var16 = 0; var16 < 128; ++var16) { // L: 261 - class159.directions[var15][var16] = 0; // L: 262 - class159.distances[var15][var16] = 99999999; // L: 263 - } - - ++var15; // L: 260 } } } - this.method2163(var1, var2, var3); // L: 708 + this.method2165(var1, var2, var3); // L: 291 } else { this.resetPath(var1, var2); } @@ -1093,271 +584,177 @@ public final class Player extends Actor { this.resetPath(var1, var2); } - } // L: 710 + } // L: 293 @ObfuscatedName("a") @ObfuscatedSignature( descriptor = "(III)V", - garbageValue = "-381441568" + garbageValue = "1441238495" ) @Export("resetPath") void resetPath(int var1, int var2) { - super.pathLength = 0; // L: 713 - super.field1215 = 0; // L: 714 - super.field1250 = 0; // L: 715 - super.pathX[0] = var1; // L: 716 - super.pathY[0] = var2; // L: 717 - int var3 = this.transformedSize(); // L: 718 - super.x = var3 * 64 + super.pathX[0] * 128; // L: 719 - super.y = var3 * 64 + super.pathY[0] * 128; // L: 720 - } // L: 721 + super.pathLength = 0; // L: 296 + super.field1274 = 0; // L: 297 + super.field1294 = 0; // L: 298 + super.pathX[0] = var1; // L: 299 + super.pathY[0] = var2; // L: 300 + int var3 = this.transformedSize(); // L: 301 + super.x = var3 * 64 + super.pathX[0] * 128; // L: 302 + super.y = var3 * 64 + super.pathY[0] * 128; // L: 303 + } // L: 304 - @ObfuscatedName("e") + @ObfuscatedName("k") @ObfuscatedSignature( - descriptor = "(IIBI)V", - garbageValue = "364759226" + descriptor = "(IIBB)V", + garbageValue = "-30" ) - final void method2163(int var1, int var2, byte var3) { - if (super.pathLength < 9) { // L: 724 + final void method2165(int var1, int var2, byte var3) { + if (super.pathLength < 9) { // L: 307 ++super.pathLength; } - for (int var4 = super.pathLength; var4 > 0; --var4) { // L: 725 - super.pathX[var4] = super.pathX[var4 - 1]; // L: 726 - super.pathY[var4] = super.pathY[var4 - 1]; // L: 727 - super.pathTraversed[var4] = super.pathTraversed[var4 - 1]; // L: 728 + for (int var4 = super.pathLength; var4 > 0; --var4) { // L: 308 + super.pathX[var4] = super.pathX[var4 - 1]; // L: 309 + super.pathY[var4] = super.pathY[var4 - 1]; // L: 310 + super.pathTraversed[var4] = super.pathTraversed[var4 - 1]; // L: 311 } - super.pathX[0] = var1; // L: 730 - super.pathY[0] = var2; // L: 731 - super.pathTraversed[0] = var3; // L: 732 - } // L: 733 + super.pathX[0] = var1; // L: 313 + super.pathY[0] = var2; // L: 314 + super.pathTraversed[0] = var3; // L: 315 + } // L: 316 - @ObfuscatedName("d") + @ObfuscatedName("m") @ObfuscatedSignature( - descriptor = "(I)Z", - garbageValue = "-1701330496" + descriptor = "(B)Z", + garbageValue = "-6" ) @Export("isVisible") final boolean isVisible() { - return this.appearance != null; // L: 736 + return this.appearance != null; // L: 319 } - @ObfuscatedName("h") + @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "(II)Lfb;", - garbageValue = "-595055331" + descriptor = "(I)V", + garbageValue = "-1258875415" ) - @Export("SequenceDefinition_get") - public static SequenceDefinition SequenceDefinition_get(int var0) { - SequenceDefinition var1 = (SequenceDefinition)SequenceDefinition.SequenceDefinition_cached.get((long)var0); // L: 35 - if (var1 != null) { // L: 36 - return var1; - } else { - byte[] var2 = SequenceDefinition.SequenceDefinition_archive.takeFile(12, var0); // L: 37 - var1 = new SequenceDefinition(); // L: 38 - if (var2 != null) { // L: 39 - var1.decode(new Buffer(var2)); - } - - var1.postDecode(); // L: 40 - SequenceDefinition.SequenceDefinition_cached.put(var1, (long)var0); // L: 41 - return var1; // L: 42 + public static void method2166() { + synchronized(MouseHandler.MouseHandler_instance) { // L: 37 + MouseHandler.MouseHandler_currentButton = MouseHandler.MouseHandler_currentButtonVolatile; // L: 38 + MouseHandler.MouseHandler_x = MouseHandler.MouseHandler_xVolatile; // L: 39 + MouseHandler.MouseHandler_y = MouseHandler.MouseHandler_yVolatile; // L: 40 + MouseHandler.MouseHandler_millis = MouseHandler.MouseHandler_lastMovedVolatile; // L: 41 + MouseHandler.MouseHandler_lastButton = MouseHandler.MouseHandler_lastButtonVolatile; // L: 42 + MouseHandler.MouseHandler_lastPressedX = MouseHandler.MouseHandler_lastPressedXVolatile; // L: 43 + MouseHandler.MouseHandler_lastPressedY = MouseHandler.MouseHandler_lastPressedYVolatile; // L: 44 + MouseHandler.MouseHandler_lastPressedTimeMillis = MouseHandler.MouseHandler_lastPressedTimeMillisVolatile; // L: 45 + MouseHandler.MouseHandler_lastButtonVolatile = 0; // L: 46 } - } + } // L: 48 - @ObfuscatedName("aj") + @ObfuscatedName("p") @ObfuscatedSignature( - descriptor = "(ILci;ZI)I", - garbageValue = "1209787772" + descriptor = "(Ljava/lang/CharSequence;II[BII)I", + garbageValue = "-169882356" ) - static int method2179(int var0, Script var1, boolean var2) { - int var3; - int var4; - if (var0 == ScriptOpcodes.ADD) { // L: 2751 - WorldMapCacheName.Interpreter_intStackSize -= 2; // L: 2752 - var3 = Interpreter.Interpreter_intStack[WorldMapCacheName.Interpreter_intStackSize]; // L: 2753 - var4 = Interpreter.Interpreter_intStack[WorldMapCacheName.Interpreter_intStackSize + 1]; // L: 2754 - Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = var4 + var3; // L: 2755 - return 1; // L: 2756 - } else if (var0 == ScriptOpcodes.SUB) { // L: 2758 - WorldMapCacheName.Interpreter_intStackSize -= 2; // L: 2759 - var3 = Interpreter.Interpreter_intStack[WorldMapCacheName.Interpreter_intStackSize]; // L: 2760 - var4 = Interpreter.Interpreter_intStack[WorldMapCacheName.Interpreter_intStackSize + 1]; // L: 2761 - Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = var3 - var4; // L: 2762 - return 1; // L: 2763 - } else if (var0 == ScriptOpcodes.MULTIPLY) { // L: 2765 - WorldMapCacheName.Interpreter_intStackSize -= 2; // L: 2766 - var3 = Interpreter.Interpreter_intStack[WorldMapCacheName.Interpreter_intStackSize]; // L: 2767 - var4 = Interpreter.Interpreter_intStack[WorldMapCacheName.Interpreter_intStackSize + 1]; // L: 2768 - Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = var4 * var3; // L: 2769 - return 1; // L: 2770 - } else if (var0 == ScriptOpcodes.DIV) { // L: 2772 - WorldMapCacheName.Interpreter_intStackSize -= 2; // L: 2773 - var3 = Interpreter.Interpreter_intStack[WorldMapCacheName.Interpreter_intStackSize]; // L: 2774 - var4 = Interpreter.Interpreter_intStack[WorldMapCacheName.Interpreter_intStackSize + 1]; // L: 2775 - Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = var3 / var4; // L: 2776 - return 1; // L: 2777 - } else if (var0 == ScriptOpcodes.RANDOM) { // L: 2779 - var3 = Interpreter.Interpreter_intStack[--WorldMapCacheName.Interpreter_intStackSize]; // L: 2780 - Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = (int)(Math.random() * (double)var3); // L: 2781 - return 1; // L: 2782 - } else if (var0 == ScriptOpcodes.RANDOMINC) { // L: 2784 - var3 = Interpreter.Interpreter_intStack[--WorldMapCacheName.Interpreter_intStackSize]; // L: 2785 - Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = (int)(Math.random() * (double)(var3 + 1)); // L: 2786 - return 1; // L: 2787 - } else { - int var5; - int var6; - int var7; - if (var0 == ScriptOpcodes.INTERPOLATE) { // L: 2789 - WorldMapCacheName.Interpreter_intStackSize -= 5; // L: 2790 - var3 = Interpreter.Interpreter_intStack[WorldMapCacheName.Interpreter_intStackSize]; // L: 2791 - var4 = Interpreter.Interpreter_intStack[WorldMapCacheName.Interpreter_intStackSize + 1]; // L: 2792 - var5 = Interpreter.Interpreter_intStack[WorldMapCacheName.Interpreter_intStackSize + 2]; // L: 2793 - var6 = Interpreter.Interpreter_intStack[WorldMapCacheName.Interpreter_intStackSize + 3]; // L: 2794 - var7 = Interpreter.Interpreter_intStack[WorldMapCacheName.Interpreter_intStackSize + 4]; // L: 2795 - Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = var3 + (var4 - var3) * (var7 - var5) / (var6 - var5); // L: 2796 - return 1; // L: 2797 - } else if (var0 == ScriptOpcodes.ADDPERCENT) { // L: 2799 - WorldMapCacheName.Interpreter_intStackSize -= 2; // L: 2800 - var3 = Interpreter.Interpreter_intStack[WorldMapCacheName.Interpreter_intStackSize]; // L: 2801 - var4 = Interpreter.Interpreter_intStack[WorldMapCacheName.Interpreter_intStackSize + 1]; // L: 2802 - Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = var3 + var3 * var4 / 100; // L: 2803 - return 1; // L: 2804 - } else if (var0 == ScriptOpcodes.SETBIT) { // L: 2806 - WorldMapCacheName.Interpreter_intStackSize -= 2; // L: 2807 - var3 = Interpreter.Interpreter_intStack[WorldMapCacheName.Interpreter_intStackSize]; // L: 2808 - var4 = Interpreter.Interpreter_intStack[WorldMapCacheName.Interpreter_intStackSize + 1]; // L: 2809 - Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = var3 | 1 << var4; // L: 2810 - return 1; // L: 2811 - } else if (var0 == ScriptOpcodes.CLEARBIT) { // L: 2813 - WorldMapCacheName.Interpreter_intStackSize -= 2; // L: 2814 - var3 = Interpreter.Interpreter_intStack[WorldMapCacheName.Interpreter_intStackSize]; // L: 2815 - var4 = Interpreter.Interpreter_intStack[WorldMapCacheName.Interpreter_intStackSize + 1]; // L: 2816 - Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = var3 & -1 - (1 << var4); // L: 2817 - return 1; // L: 2818 - } else if (var0 == ScriptOpcodes.TESTBIT) { // L: 2820 - WorldMapCacheName.Interpreter_intStackSize -= 2; // L: 2821 - var3 = Interpreter.Interpreter_intStack[WorldMapCacheName.Interpreter_intStackSize]; // L: 2822 - var4 = Interpreter.Interpreter_intStack[WorldMapCacheName.Interpreter_intStackSize + 1]; // L: 2823 - Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = (var3 & 1 << var4) != 0 ? 1 : 0; // L: 2824 - return 1; // L: 2825 - } else if (var0 == ScriptOpcodes.MOD) { // L: 2827 - WorldMapCacheName.Interpreter_intStackSize -= 2; // L: 2828 - var3 = Interpreter.Interpreter_intStack[WorldMapCacheName.Interpreter_intStackSize]; // L: 2829 - var4 = Interpreter.Interpreter_intStack[WorldMapCacheName.Interpreter_intStackSize + 1]; // L: 2830 - Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = var3 % var4; // L: 2831 - return 1; // L: 2832 - } else if (var0 == ScriptOpcodes.POW) { // L: 2834 - WorldMapCacheName.Interpreter_intStackSize -= 2; // L: 2835 - var3 = Interpreter.Interpreter_intStack[WorldMapCacheName.Interpreter_intStackSize]; // L: 2836 - var4 = Interpreter.Interpreter_intStack[WorldMapCacheName.Interpreter_intStackSize + 1]; // L: 2837 - if (var3 == 0) { // L: 2838 - Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = 0; - } else { - Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = (int)Math.pow((double)var3, (double)var4); // L: 2839 - } + @Export("encodeStringCp1252") + public static int encodeStringCp1252(CharSequence var0, int var1, int var2, byte[] var3, int var4) { + int var5 = var2 - var1; // L: 104 - return 1; // L: 2840 - } else if (var0 == ScriptOpcodes.INVPOW) { // L: 2842 - WorldMapCacheName.Interpreter_intStackSize -= 2; // L: 2843 - var3 = Interpreter.Interpreter_intStack[WorldMapCacheName.Interpreter_intStackSize]; // L: 2844 - var4 = Interpreter.Interpreter_intStack[WorldMapCacheName.Interpreter_intStackSize + 1]; // L: 2845 - if (var3 == 0) { // L: 2846 - Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = 0; // L: 2847 - return 1; // L: 2848 - } else { - switch(var4) { // L: 2850 - case 0: - Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = Integer.MAX_VALUE; // L: 2858 - break; // L: 2859 - case 1: - Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = var3; // L: 2878 - break; - case 2: - Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = (int)Math.sqrt((double)var3); // L: 2863 - break; // L: 2864 - case 3: - Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = (int)Math.cbrt((double)var3); // L: 2853 - break; - case 4: - Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = (int)Math.sqrt(Math.sqrt((double)var3)); // L: 2873 - break; // L: 2874 - default: - Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = (int)Math.pow((double)var3, 1.0D / (double)var4); // L: 2868 - } - - return 1; // L: 2882 - } - } else if (var0 == ScriptOpcodes.AND) { // L: 2884 - WorldMapCacheName.Interpreter_intStackSize -= 2; // L: 2885 - var3 = Interpreter.Interpreter_intStack[WorldMapCacheName.Interpreter_intStackSize]; // L: 2886 - var4 = Interpreter.Interpreter_intStack[WorldMapCacheName.Interpreter_intStackSize + 1]; // L: 2887 - Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = var3 & var4; // L: 2888 - return 1; // L: 2889 - } else if (var0 == ScriptOpcodes.OR) { // L: 2891 - WorldMapCacheName.Interpreter_intStackSize -= 2; // L: 2892 - var3 = Interpreter.Interpreter_intStack[WorldMapCacheName.Interpreter_intStackSize]; // L: 2893 - var4 = Interpreter.Interpreter_intStack[WorldMapCacheName.Interpreter_intStackSize + 1]; // L: 2894 - Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = var3 | var4; // L: 2895 - return 1; // L: 2896 - } else if (var0 == ScriptOpcodes.SCALE) { // L: 2898 - WorldMapCacheName.Interpreter_intStackSize -= 3; // L: 2899 - long var9 = (long)Interpreter.Interpreter_intStack[WorldMapCacheName.Interpreter_intStackSize]; // L: 2900 - long var11 = (long)Interpreter.Interpreter_intStack[WorldMapCacheName.Interpreter_intStackSize + 1]; // L: 2901 - long var13 = (long)Interpreter.Interpreter_intStack[WorldMapCacheName.Interpreter_intStackSize + 2]; // L: 2902 - Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = (int)(var13 * var9 / var11); // L: 2903 - return 1; // L: 2904 - } else if (var0 == 4025) { // L: 2906 - var3 = ItemContainer.method2104(Interpreter.Interpreter_intStack[--WorldMapCacheName.Interpreter_intStackSize]); // L: 2907 - Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = var3; // L: 2908 - return 1; // L: 2909 - } else if (var0 == 4026) { // L: 2911 - WorldMapCacheName.Interpreter_intStackSize -= 2; // L: 2912 - var3 = Interpreter.Interpreter_intStack[WorldMapCacheName.Interpreter_intStackSize]; // L: 2913 - var4 = Interpreter.Interpreter_intStack[WorldMapCacheName.Interpreter_intStackSize + 1]; // L: 2914 - Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = var3 ^ 1 << var4; // L: 2915 - return 1; // L: 2916 - } else if (var0 == 4027) { // L: 2918 - WorldMapCacheName.Interpreter_intStackSize -= 3; // L: 2919 - var3 = Interpreter.Interpreter_intStack[WorldMapCacheName.Interpreter_intStackSize]; // L: 2920 - var4 = Interpreter.Interpreter_intStack[WorldMapCacheName.Interpreter_intStackSize + 1]; // L: 2921 - var5 = Interpreter.Interpreter_intStack[WorldMapCacheName.Interpreter_intStackSize + 2]; // L: 2922 - Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = WorldMapElement.method2628(var3, var4, var5); // L: 2923 - return 1; // L: 2924 - } else if (var0 == 4028) { // L: 2926 - WorldMapCacheName.Interpreter_intStackSize -= 3; // L: 2927 - var3 = Interpreter.Interpreter_intStack[WorldMapCacheName.Interpreter_intStackSize]; // L: 2928 - var4 = Interpreter.Interpreter_intStack[WorldMapCacheName.Interpreter_intStackSize + 1]; // L: 2929 - var5 = Interpreter.Interpreter_intStack[WorldMapCacheName.Interpreter_intStackSize + 2]; // L: 2930 - Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = GrandExchangeEvents.method4968(var3, var4, var5); // L: 2931 - return 1; // L: 2932 - } else if (var0 == 4029) { // L: 2934 - WorldMapCacheName.Interpreter_intStackSize -= 3; // L: 2935 - var3 = Interpreter.Interpreter_intStack[WorldMapCacheName.Interpreter_intStackSize]; // L: 2936 - var4 = Interpreter.Interpreter_intStack[WorldMapCacheName.Interpreter_intStackSize + 1]; // L: 2937 - var5 = Interpreter.Interpreter_intStack[WorldMapCacheName.Interpreter_intStackSize + 2]; // L: 2938 - var6 = 31 - var5; // L: 2939 - Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = var3 << var6 >>> var4 + var6; // L: 2940 - return 1; // L: 2941 - } else if (var0 == 4030) { // L: 2943 - WorldMapCacheName.Interpreter_intStackSize -= 4; // L: 2944 - var3 = Interpreter.Interpreter_intStack[WorldMapCacheName.Interpreter_intStackSize]; // L: 2945 - var4 = Interpreter.Interpreter_intStack[WorldMapCacheName.Interpreter_intStackSize + 1]; // L: 2946 - var5 = Interpreter.Interpreter_intStack[WorldMapCacheName.Interpreter_intStackSize + 2]; // L: 2947 - var6 = Interpreter.Interpreter_intStack[WorldMapCacheName.Interpreter_intStackSize + 3]; // L: 2948 - var3 = GrandExchangeEvents.method4968(var3, var5, var6); // L: 2949 - var7 = WorldMapLabel.method3582(var6 - var5 + 1); // L: 2950 - if (var4 > var7) { // L: 2951 - var4 = var7; - } - - Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = var3 | var4 << var5; // L: 2952 - return 1; // L: 2953 + for (int var6 = 0; var6 < var5; ++var6) { // L: 105 + char var7 = var0.charAt(var6 + var1); // L: 106 + if (var7 > 0 && var7 < 128 || var7 >= 160 && var7 <= 255) { // L: 107 + var3[var6 + var4] = (byte)var7; + } else if (var7 == 8364) { // L: 108 + var3[var6 + var4] = -128; + } else if (var7 == 8218) { // L: 109 + var3[var6 + var4] = -126; + } else if (var7 == 402) { // L: 110 + var3[var6 + var4] = -125; + } else if (var7 == 8222) { // L: 111 + var3[var6 + var4] = -124; + } else if (var7 == 8230) { // L: 112 + var3[var6 + var4] = -123; + } else if (var7 == 8224) { // L: 113 + var3[var6 + var4] = -122; + } else if (var7 == 8225) { // L: 114 + var3[var6 + var4] = -121; + } else if (var7 == 710) { + var3[var6 + var4] = -120; // L: 115 + } else if (var7 == 8240) { // L: 116 + var3[var6 + var4] = -119; + } else if (var7 == 352) { // L: 117 + var3[var6 + var4] = -118; + } else if (var7 == 8249) { // L: 118 + var3[var6 + var4] = -117; + } else if (var7 == 338) { // L: 119 + var3[var6 + var4] = -116; + } else if (var7 == 381) { // L: 120 + var3[var6 + var4] = -114; + } else if (var7 == 8216) { // L: 121 + var3[var6 + var4] = -111; + } else if (var7 == 8217) { // L: 122 + var3[var6 + var4] = -110; + } else if (var7 == 8220) { // L: 123 + var3[var6 + var4] = -109; + } else if (var7 == 8221) { // L: 124 + var3[var6 + var4] = -108; + } else if (var7 == 8226) { // L: 125 + var3[var6 + var4] = -107; + } else if (var7 == 8211) { // L: 126 + var3[var6 + var4] = -106; + } else if (var7 == 8212) { // L: 127 + var3[var6 + var4] = -105; + } else if (var7 == 732) { // L: 128 + var3[var6 + var4] = -104; + } else if (var7 == 8482) { // L: 129 + var3[var6 + var4] = -103; + } else if (var7 == 353) { // L: 130 + var3[var6 + var4] = -102; + } else if (var7 == 8250) { // L: 131 + var3[var6 + var4] = -101; + } else if (var7 == 339) { // L: 132 + var3[var6 + var4] = -100; + } else if (var7 == 382) { // L: 133 + var3[var6 + var4] = -98; + } else if (var7 == 376) { // L: 134 + var3[var6 + var4] = -97; } else { - return 2; // L: 2955 + var3[var6 + var4] = 63; // L: 135 } } + + return var5; // L: 137 } + + @ObfuscatedName("j") + @ObfuscatedSignature( + descriptor = "(II)I", + garbageValue = "130039632" + ) + public static int method2128(int var0) { + --var0; // L: 64 + var0 |= var0 >>> 1; // L: 65 + var0 |= var0 >>> 2; // L: 66 + var0 |= var0 >>> 4; // L: 67 + var0 |= var0 >>> 8; // L: 68 + var0 |= var0 >>> 16; // L: 69 + return var0 + 1; // L: 70 + } + + @ObfuscatedName("j") + @ObfuscatedSignature( + descriptor = "(I)V", + garbageValue = "-201107483" + ) + static void method2110() { + Players.Players_count = 0; // L: 646 + + for (int var0 = 0; var0 < 2048; ++var0) { // L: 647 + Players.field1374[var0] = null; // L: 648 + Players.field1373[var0] = 1; // L: 649 + } + + } // L: 651 } diff --git a/runescape-client/src/main/java/PlayerComposition.java b/runescape-client/src/main/java/PlayerComposition.java index ef0071ad4c..74f1f0a4bf 100644 --- a/runescape-client/src/main/java/PlayerComposition.java +++ b/runescape-client/src/main/java/PlayerComposition.java @@ -1,58 +1,61 @@ +import java.lang.reflect.Field; +import java.lang.reflect.Method; +import java.security.SecureRandom; 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.Reflection; -@ObfuscatedName("ii") +@ObfuscatedName("ic") @Implements("PlayerComposition") public class PlayerComposition { - @ObfuscatedName("b") - public static short[] field2934; - @ObfuscatedName("x") - public static short[][] field2937; - @ObfuscatedName("k") + @ObfuscatedName("o") @Export("equipmentIndices") static final int[] equipmentIndices; - @ObfuscatedName("r") + @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "Lho;" + descriptor = "Lhz;" ) @Export("PlayerAppearance_cachedModels") - public static EvictingDualNodeHashTable PlayerAppearance_cachedModels; - @ObfuscatedName("h") + static EvictingDualNodeHashTable PlayerAppearance_cachedModels; + @ObfuscatedName("go") + @Export("regions") + static int[] regions; + @ObfuscatedName("v") @Export("equipment") int[] equipment; - @ObfuscatedName("c") + @ObfuscatedName("n") @Export("bodyColors") int[] bodyColors; - @ObfuscatedName("o") + @ObfuscatedName("f") @Export("isFemale") public boolean isFemale; - @ObfuscatedName("g") + @ObfuscatedName("y") @ObfuscatedGetter( - intValue = -1194891169 + intValue = -1525645945 ) @Export("npcTransformId") public int npcTransformId; - @ObfuscatedName("l") + @ObfuscatedName("p") @ObfuscatedGetter( - longValue = 7307112333201899495L + longValue = 3754683323986881495L ) @Export("hash") long hash; - @ObfuscatedName("z") + @ObfuscatedName("j") @ObfuscatedGetter( - longValue = -595121387593760273L + longValue = 488997904210519011L ) - long field2939; - @ObfuscatedName("t") + long field2933; + @ObfuscatedName("r") @ObfuscatedSignature( - descriptor = "[Lea;" + descriptor = "[Led;" ) - class135[] field2940; - @ObfuscatedName("v") - boolean field2941; + class135[] field2937; + @ObfuscatedName("b") + boolean field2928; static { equipmentIndices = new int[]{8, 11, 4, 6, 9, 7, 10}; // L: 26 @@ -60,24 +63,24 @@ public class PlayerComposition { } public PlayerComposition() { - this.field2941 = false; // L: 21 + this.field2928 = false; // L: 21 } - @ObfuscatedName("h") + @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "([I[Lea;Z[IZII)V", - garbageValue = "-1769828325" + descriptor = "([I[Led;Z[IZIB)V", + garbageValue = "-36" ) - public void method4614(int[] var1, class135[] var2, boolean var3, int[] var4, boolean var5, int var6) { - this.field2940 = var2; // L: 30 - this.field2941 = var3; // L: 31 + public void method4704(int[] var1, class135[] var2, boolean var3, int[] var4, boolean var5, int var6) { + this.field2937 = var2; // L: 30 + this.field2928 = var3; // L: 31 this.update(var1, var4, var5, var6); // L: 32 } // L: 33 - @ObfuscatedName("c") + @ObfuscatedName("n") @ObfuscatedSignature( descriptor = "([I[IZII)V", - garbageValue = "-1074584976" + garbageValue = "1389287024" ) @Export("update") public void update(int[] var1, int[] var2, boolean var3, int var4) { @@ -85,9 +88,9 @@ public class PlayerComposition { var1 = new int[12]; // L: 37 for (int var5 = 0; var5 < 7; ++var5) { // L: 38 - for (int var6 = 0; var6 < KitDefinition.KitDefinition_fileCount; ++var6) { // L: 39 - KitDefinition var7 = class161.KitDefinition_get(var6); // L: 40 - if (var7 != null && !var7.nonSelectable && var7.bodypartID == (var3 ? 7 : 0) + var5) { // L: 41 + for (int var6 = 0; var6 < ModelData0.KitDefinition_fileCount; ++var6) { + KitDefinition var7 = WorldMapIcon_1.KitDefinition_get(var6); + if (var7 != null && !var7.nonSelectable && var7.bodypartID == var5 + (var3 ? 7 : 0)) { var1[equipmentIndices[var5]] = var6 + 256; // L: 42 break; // L: 43 } @@ -102,10 +105,10 @@ public class PlayerComposition { this.setHash(); // L: 52 } // L: 53 - @ObfuscatedName("o") + @ObfuscatedName("f") @ObfuscatedSignature( descriptor = "(IZI)V", - garbageValue = "566513351" + garbageValue = "365347894" ) @Export("changeAppearance") public void changeAppearance(int var1, boolean var2) { @@ -119,17 +122,17 @@ public class PlayerComposition { if (!var2) { // L: 61 --var3; // L: 62 if (var3 < 0) { // L: 63 - var3 = KitDefinition.KitDefinition_fileCount - 1; + var3 = ModelData0.KitDefinition_fileCount - 1; } } else { ++var3; // L: 66 - if (var3 >= KitDefinition.KitDefinition_fileCount) { // L: 67 + if (var3 >= ModelData0.KitDefinition_fileCount) { // L: 67 var3 = 0; } } - var4 = class161.KitDefinition_get(var3); // L: 69 - } while(var4 == null || var4.nonSelectable || var1 + (this.isFemale ? 7 : 0) != var4.bodypartID); // L: 70 + var4 = WorldMapIcon_1.KitDefinition_get(var3); // L: 69 + } while(var4 == null || var4.nonSelectable || (this.isFemale ? 7 : 0) + var1 != var4.bodypartID); // L: 70 this.equipment[equipmentIndices[var1]] = var3 + 256; // L: 72 this.setHash(); // L: 73 @@ -137,337 +140,468 @@ public class PlayerComposition { } } // L: 74 - @ObfuscatedName("g") + @ObfuscatedName("y") @ObfuscatedSignature( - descriptor = "(IZB)V", - garbageValue = "38" + descriptor = "(IZI)V", + garbageValue = "-410673716" ) - public void method4617(int var1, boolean var2) { + public void method4703(int var1, boolean var2) { int var3 = this.bodyColors[var1]; // L: 77 + boolean var4; if (!var2) { // L: 78 do { --var3; // L: 80 if (var3 < 0) { // L: 81 - var3 = Canvas.field295[var1].length - 1; // L: 82 + var3 = class15.field137[var1].length - 1; // L: 82 } - } while(!class3.method47(var1, var3)); // L: 84 + + if (var1 == 4 && var3 >= 8) { // L: 86 + var4 = false; // L: 87 + } else { + var4 = true; // L: 90 + } + } while(!var4); // L: 92 } else { do { - ++var3; // L: 89 - if (var3 >= Canvas.field295[var1].length) { // L: 90 + ++var3; // L: 97 + if (var3 >= class15.field137[var1].length) { // L: 98 var3 = 0; } - } while(!class3.method47(var1, var3)); // L: 91 + + if (var1 == 4 && var3 >= 8) { // L: 101 + var4 = false; // L: 102 + } else { + var4 = true; // L: 105 + } + } while(!var4); // L: 107 } - this.bodyColors[var1] = var3; // L: 94 - this.setHash(); // L: 95 - } // L: 96 + this.bodyColors[var1] = var3; // L: 110 + this.setHash(); // L: 111 + } // L: 112 - @ObfuscatedName("l") + @ObfuscatedName("p") @ObfuscatedSignature( descriptor = "(ZI)V", - garbageValue = "2012874758" + garbageValue = "862010308" ) @Export("changeSex") public void changeSex(boolean var1) { - if (this.isFemale != var1) { // L: 99 - this.update((int[])null, this.bodyColors, var1, -1); // L: 100 + if (this.isFemale != var1) { // L: 115 + this.update((int[])null, this.bodyColors, var1, -1); // L: 116 } - } // L: 101 + } // L: 117 - @ObfuscatedName("z") + @ObfuscatedName("j") @ObfuscatedSignature( - descriptor = "(Lnk;I)V", - garbageValue = "808906560" + descriptor = "(Lnd;I)V", + garbageValue = "580596518" ) @Export("write") public void write(Buffer var1) { - var1.writeByte(this.isFemale ? 1 : 0); // L: 104 + var1.writeByte(this.isFemale ? 1 : 0); // L: 120 int var2; - for (var2 = 0; var2 < 7; ++var2) { // L: 105 - int var3 = this.equipment[equipmentIndices[var2]]; // L: 106 - if (var3 == 0) { // L: 107 + for (var2 = 0; var2 < 7; ++var2) { // L: 121 + int var3 = this.equipment[equipmentIndices[var2]]; // L: 122 + if (var3 == 0) { // L: 123 var1.writeByte(-1); } else { - var1.writeByte(var3 - 256); // L: 108 + var1.writeByte(var3 - 256); // L: 124 } } - for (var2 = 0; var2 < 5; ++var2) { // L: 110 + for (var2 = 0; var2 < 5; ++var2) { // L: 126 var1.writeByte(this.bodyColors[var2]); } - } // L: 111 + } // L: 127 - @ObfuscatedName("t") + @ObfuscatedName("r") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "56371147" + garbageValue = "-1440101066" ) @Export("setHash") void setHash() { - long var1 = this.hash; // L: 114 - int var3 = this.equipment[5]; // L: 115 - int var4 = this.equipment[9]; // L: 116 - this.equipment[5] = var4; // L: 117 - this.equipment[9] = var3; // L: 118 - this.hash = 0L; // L: 119 + long var1 = this.hash; // L: 130 + int var3 = this.equipment[5]; // L: 131 + int var4 = this.equipment[9]; // L: 132 + this.equipment[5] = var4; + this.equipment[9] = var3; + this.hash = 0L; int var5; - for (var5 = 0; var5 < 12; ++var5) { // L: 120 - this.hash <<= 4; // L: 121 - if (this.equipment[var5] >= 256) { // L: 122 + for (var5 = 0; var5 < 12; ++var5) { + this.hash <<= 4; + if (this.equipment[var5] >= 256) { this.hash += (long)(this.equipment[var5] - 256); } } - if (this.equipment[0] >= 256) { // L: 124 + if (this.equipment[0] >= 256) { this.hash += (long)(this.equipment[0] - 256 >> 4); } - if (this.equipment[1] >= 256) { // L: 125 + if (this.equipment[1] >= 256) { this.hash += (long)(this.equipment[1] - 256 >> 8); } - for (var5 = 0; var5 < 5; ++var5) { // L: 126 - this.hash <<= 3; // L: 127 - this.hash += (long)this.bodyColors[var5]; // L: 128 + for (var5 = 0; var5 < 5; ++var5) { + this.hash <<= 3; // L: 143 + this.hash += (long)this.bodyColors[var5]; } - this.hash <<= 1; // L: 130 - this.hash += (long)(this.isFemale ? 1 : 0); // L: 131 - this.equipment[5] = var3; // L: 132 - this.equipment[9] = var4; // L: 133 - if (var1 != 0L && this.hash != var1 || this.field2941) { // L: 134 + this.hash <<= 1; + this.hash += (long)(this.isFemale ? 1 : 0); + this.equipment[5] = var3; + this.equipment[9] = var4; + if (0L != var1 && this.hash != var1 || this.field2928) { PlayerAppearance_cachedModels.remove(var1); } - } // L: 135 + } - @ObfuscatedName("v") + @ObfuscatedName("b") @ObfuscatedSignature( - descriptor = "(Lfb;ILfb;II)Lgj;", - garbageValue = "-1140620498" + descriptor = "(Lfl;ILfl;II)Lgr;", + garbageValue = "1850715119" ) @Export("getModel") public Model getModel(SequenceDefinition var1, int var2, SequenceDefinition var3, int var4) { - if (this.npcTransformId != -1) { // L: 138 - return class8.getNpcDefinition(this.npcTransformId).getModel(var1, var2, var3, var4); // L: 139 + if (this.npcTransformId != -1) { // L: 154 + return StructComposition.getNpcDefinition(this.npcTransformId).getModel(var1, var2, var3, var4); } else { - long var5 = this.hash; // L: 141 - int[] var7 = this.equipment; // L: 142 - if (var1 != null && (var1.shield >= 0 || var1.weapon >= 0)) { // L: 143 - var7 = new int[12]; // L: 144 + long var5 = this.hash; + int[] var7 = this.equipment; + if (var1 != null && (var1.shield >= 0 || var1.weapon >= 0)) { + var7 = new int[12]; - for (int var8 = 0; var8 < 12; ++var8) { // L: 145 + for (int var8 = 0; var8 < 12; ++var8) { var7[var8] = this.equipment[var8]; } - if (var1.shield >= 0) { // L: 146 - var5 += (long)(var1.shield - this.equipment[5] << 40); // L: 147 - var7[5] = var1.shield; // L: 148 + if (var1.shield >= 0) { + var5 += (long)(var1.shield - this.equipment[5] << 40); + var7[5] = var1.shield; } - if (var1.weapon >= 0) { // L: 150 - var5 += (long)(var1.weapon - this.equipment[3] << 48); // L: 151 - var7[3] = var1.weapon; // L: 152 + if (var1.weapon >= 0) { + var5 += (long)(var1.weapon - this.equipment[3] << 48); + var7[3] = var1.weapon; // L: 168 } } - Model var18 = (Model) PlayerAppearance_cachedModels.get(var5); // L: 155 - if (var18 == null) { // L: 156 - boolean var9 = false; // L: 157 + Model var18 = (Model)PlayerAppearance_cachedModels.get(var5); + if (var18 == null) { + boolean var9 = false; int var11; - for (int var10 = 0; var10 < 12; ++var10) { // L: 158 - var11 = var7[var10]; // L: 159 - if (var11 >= 256 && var11 < 512 && !class161.KitDefinition_get(var11 - 256).ready()) { // L: 160 161 + for (int var10 = 0; var10 < 12; ++var10) { + var11 = var7[var10]; + if (var11 >= 256 && var11 < 512 && !WorldMapIcon_1.KitDefinition_get(var11 - 256).ready()) { // L: 176 var9 = true; } - if (var11 >= 512 && !Strings.ItemDefinition_get(var11 - 512).hasNoValidModel(this.isFemale)) { // L: 163 164 + if (var11 >= 512 && !class260.ItemDefinition_get(var11 - 512).hasNoValidModel(this.isFemale)) { // L: 180 var9 = true; } } - if (var9) { // L: 167 - if (this.field2939 != -1L) { // L: 168 - var18 = (Model) PlayerAppearance_cachedModels.get(this.field2939); + if (var9) { + if (-1L != this.field2933) { + var18 = (Model)PlayerAppearance_cachedModels.get(this.field2933); } - if (var18 == null) { // L: 169 + if (var18 == null) { return null; } } - if (var18 == null) { // L: 171 - ModelData[] var19 = new ModelData[12]; // L: 172 - var11 = 0; // L: 173 + if (var18 == null) { + ModelData[] var19 = new ModelData[12]; + var11 = 0; // L: 189 int var13; - for (int var12 = 0; var12 < 12; ++var12) { // L: 174 - var13 = var7[var12]; // L: 175 - if (var13 >= 256 && var13 < 512) { // L: 176 - ModelData var14 = class161.KitDefinition_get(var13 - 256).getModelData(); // L: 177 - if (var14 != null) { // L: 178 + for (int var12 = 0; var12 < 12; ++var12) { // L: 190 + var13 = var7[var12]; + if (var13 >= 256 && var13 < 512) { + ModelData var14 = WorldMapIcon_1.KitDefinition_get(var13 - 256).getModelData(); // L: 193 + if (var14 != null) { // L: 194 var19[var11++] = var14; } } - if (var13 >= 512) { // L: 180 - ItemComposition var22 = Strings.ItemDefinition_get(var13 - 512); // L: 181 - ModelData var15 = var22.method3026(this.isFemale); // L: 182 - if (var15 != null) { // L: 183 - if (this.field2940 != null) { // L: 184 - class135 var16 = this.field2940[var12]; // L: 185 - if (var16 != null) { // L: 186 + if (var13 >= 512) { // L: 196 + ItemComposition var22 = class260.ItemDefinition_get(var13 - 512); // L: 197 + ModelData var15 = var22.method3018(this.isFemale); // L: 198 + if (var15 != null) { + if (this.field2937 != null) { // L: 200 + class135 var16 = this.field2937[var12]; // L: 201 + if (var16 != null) { int var17; - if (var16.field1527 != null) { // L: 187 - for (var17 = 0; var17 < var22.recolorFrom.length; ++var17) { // L: 188 - var15.recolor(var22.recolorTo[var17], var16.field1527[var17]); // L: 189 + if (var16.field1537 != null && var22.recolorFrom != null && var22.recolorTo.length == var16.field1537.length) { + for (var17 = 0; var17 < var22.recolorFrom.length; ++var17) { // L: 204 + var15.recolor(var22.recolorTo[var17], var16.field1537[var17]); } } - if (var16.field1531 != null) { // L: 192 - for (var17 = 0; var17 < var22.retextureFrom.length; ++var17) { // L: 193 - var15.retexture(var22.retextureTo[var17], var16.field1531[var17]); // L: 194 + if (var16.field1538 != null && var22.retextureFrom != null && var16.field1538.length == var22.retextureTo.length) { + for (var17 = 0; var17 < var22.retextureFrom.length; ++var17) { + var15.retexture(var22.retextureTo[var17], var16.field1538[var17]); // L: 210 } } } } - var19[var11++] = var15; // L: 199 + var19[var11++] = var15; } } } - ModelData var20 = new ModelData(var19, var11); // L: 203 + ModelData var20 = new ModelData(var19, var11); - for (var13 = 0; var13 < 5; ++var13) { // L: 204 - if (this.bodyColors[var13] < Canvas.field295[var13].length) { // L: 205 - var20.recolor(field2934[var13], Canvas.field295[var13][this.bodyColors[var13]]); + for (var13 = 0; var13 < 5; ++var13) { // L: 220 + if (this.bodyColors[var13] < class15.field137[var13].length) { // L: 221 + var20.recolor(class29.field233[var13], class15.field137[var13][this.bodyColors[var13]]); } - if (this.bodyColors[var13] < field2937[var13].length) { // L: 206 - var20.recolor(Script.field1064[var13], field2937[var13][this.bodyColors[var13]]); + if (this.bodyColors[var13] < VarbitComposition.field1708[var13].length) { // L: 222 + var20.recolor(UserComparator5.field1442[var13], VarbitComposition.field1708[var13][this.bodyColors[var13]]); } } - var18 = var20.toModel(64, 850, -30, -50, -30); // L: 208 - PlayerAppearance_cachedModels.put(var18, var5); // L: 209 - this.field2939 = var5; // L: 210 + var18 = var20.toModel(64, 850, -30, -50, -30); // L: 224 + PlayerAppearance_cachedModels.put(var18, var5); // L: 225 + this.field2933 = var5; // L: 226 } } - if (var1 == null && var3 == null) { // L: 214 + if (var1 == null && var3 == null) { // L: 230 return var18; } else { Model var21; - if (var1 != null && var3 != null) { // L: 215 + if (var1 != null && var3 != null) { // L: 231 var21 = var1.applyTransformations(var18, var2, var3, var4); - } else if (var1 != null) { // L: 216 + } else if (var1 != null) { // L: 232 var21 = var1.transformActorModel(var18, var2); } else { - var21 = var3.transformActorModel(var18, var4); // L: 217 + var21 = var3.transformActorModel(var18, var4); // L: 233 } - return var21; // L: 218 + return var21; // L: 234 } } } - @ObfuscatedName("b") + @ObfuscatedName("d") @ObfuscatedSignature( - descriptor = "(I)Lgk;", - garbageValue = "2145084703" + descriptor = "(I)Lgm;", + garbageValue = "-45031641" ) @Export("getModelData") ModelData getModelData() { - if (this.npcTransformId != -1) { // L: 222 - return class8.getNpcDefinition(this.npcTransformId).getModelData(); // L: 223 + if (this.npcTransformId != -1) { // L: 238 + return StructComposition.getNpcDefinition(this.npcTransformId).getModelData(); // L: 239 } else { - boolean var1 = false; // L: 225 + boolean var1 = false; // L: 241 int var3; - for (int var2 = 0; var2 < 12; ++var2) { // L: 226 - var3 = this.equipment[var2]; // L: 227 - if (var3 >= 256 && var3 < 512 && !class161.KitDefinition_get(var3 - 256).method2673()) { // L: 228 229 + for (int var2 = 0; var2 < 12; ++var2) { // L: 242 + var3 = this.equipment[var2]; // L: 243 + if (var3 >= 256 && var3 < 512 && !WorldMapIcon_1.KitDefinition_get(var3 - 256).method2684()) { // L: 244 245 var1 = true; } - if (var3 >= 512 && !Strings.ItemDefinition_get(var3 - 512).method2959(this.isFemale)) { // L: 231 232 + if (var3 >= 512 && !class260.ItemDefinition_get(var3 - 512).method3019(this.isFemale)) { // L: 247 248 var1 = true; } } - if (var1) { // L: 235 + if (var1) { // L: 251 return null; } else { - ModelData[] var7 = new ModelData[12]; // L: 236 - var3 = 0; // L: 237 + ModelData[] var7 = new ModelData[12]; // L: 252 + var3 = 0; // L: 253 int var5; - for (int var4 = 0; var4 < 12; ++var4) { // L: 238 - var5 = this.equipment[var4]; // L: 239 + for (int var4 = 0; var4 < 12; ++var4) { // L: 254 + var5 = this.equipment[var4]; // L: 255 ModelData var6; - if (var5 >= 256 && var5 < 512) { // L: 240 - var6 = class161.KitDefinition_get(var5 - 256).getKitDefinitionModels(); // L: 241 - if (var6 != null) { // L: 242 + if (var5 >= 256 && var5 < 512) { // L: 256 + var6 = WorldMapIcon_1.KitDefinition_get(var5 - 256).getKitDefinitionModels(); // L: 257 + if (var6 != null) { // L: 258 var7[var3++] = var6; } } - if (var5 >= 512) { // L: 244 - var6 = Strings.ItemDefinition_get(var5 - 512).method2950(this.isFemale); // L: 245 - if (var6 != null) { // L: 246 + if (var5 >= 512) { // L: 260 + var6 = class260.ItemDefinition_get(var5 - 512).method3020(this.isFemale); // L: 261 + if (var6 != null) { // L: 262 var7[var3++] = var6; } } } - ModelData var8 = new ModelData(var7, var3); // L: 249 + ModelData var8 = new ModelData(var7, var3); // L: 265 - for (var5 = 0; var5 < 5; ++var5) { // L: 250 - if (this.bodyColors[var5] < Canvas.field295[var5].length) { // L: 251 - var8.recolor(field2934[var5], Canvas.field295[var5][this.bodyColors[var5]]); + for (var5 = 0; var5 < 5; ++var5) { // L: 266 + if (this.bodyColors[var5] < class15.field137[var5].length) { // L: 267 + var8.recolor(class29.field233[var5], class15.field137[var5][this.bodyColors[var5]]); } - if (this.bodyColors[var5] < field2937[var5].length) { // L: 252 - var8.recolor(Script.field1064[var5], field2937[var5][this.bodyColors[var5]]); + if (this.bodyColors[var5] < VarbitComposition.field1708[var5].length) { // L: 268 + var8.recolor(UserComparator5.field1442[var5], VarbitComposition.field1708[var5][this.bodyColors[var5]]); } } - return var8; // L: 254 + return var8; // L: 270 } } } - @ObfuscatedName("q") + @ObfuscatedName("s") @ObfuscatedSignature( descriptor = "(I)I", - garbageValue = "1404988967" + garbageValue = "-1167283796" ) @Export("getChatHeadId") public int getChatHeadId() { - return this.npcTransformId == -1 ? (this.equipment[0] << 15) + this.equipment[1] + (this.equipment[11] << 5) + (this.equipment[8] << 10) + (this.bodyColors[0] << 25) + (this.bodyColors[4] << 20) : 305419896 + class8.getNpcDefinition(this.npcTransformId).id; // L: 258 259 + return this.npcTransformId == -1 ? (this.equipment[0] << 15) + this.equipment[1] + (this.equipment[11] << 5) + (this.equipment[8] << 10) + (this.bodyColors[0] << 25) + (this.bodyColors[4] << 20) : 305419896 + StructComposition.getNpcDefinition(this.npcTransformId).id; // L: 274 275 } - @ObfuscatedName("hq") + @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "(III)I", - garbageValue = "1444810231" + descriptor = "(B)[Lha;", + garbageValue = "-90" ) - static int method4640(int var0, int var1) { - int var2 = var1 - 334; // L: 5461 - if (var2 < 0) { // L: 5462 - var2 = 0; - } else if (var2 > 100) { // L: 5463 - var2 = 100; + public static class225[] method4705() { + return new class225[]{class225.field2686, class225.field2680, class225.field2682, class225.field2683, class225.field2681, class225.field2685, class225.field2687, class225.field2684, class225.field2688, class225.field2689}; // L: 17 + } + + @ObfuscatedName("n") + @ObfuscatedSignature( + descriptor = "(I)Ljava/security/SecureRandom;", + garbageValue = "-1490609257" + ) + static SecureRandom method4711() { + SecureRandom var0 = new SecureRandom(); // L: 39 + var0.nextInt(); // L: 40 + return var0; // L: 41 + } + + @ObfuscatedName("y") + @ObfuscatedSignature( + descriptor = "(Lnd;IB)V", + garbageValue = "14" + ) + @Export("readReflectionCheck") + public static void readReflectionCheck(Buffer var0, int var1) { + ReflectionCheck var2 = new ReflectionCheck(); // L: 133 + var2.size = var0.readUnsignedByte(); // L: 134 + var2.id = var0.readInt(); // L: 135 + var2.operations = new int[var2.size]; // L: 136 + var2.creationErrors = new int[var2.size]; // L: 137 + var2.fields = new Field[var2.size]; // L: 138 + var2.intReplaceValues = new int[var2.size]; // L: 139 + var2.methods = new Method[var2.size]; // L: 140 + var2.arguments = new byte[var2.size][][]; // L: 141 + + for (int var3 = 0; var3 < var2.size; ++var3) { // L: 142 + try { + int var4 = var0.readUnsignedByte(); // L: 144 + String var5; + String var6; + int var7; + if (var4 != 0 && var4 != 1 && var4 != 2) { // L: 145 + if (var4 == 3 || var4 == 4) { // L: 155 + var5 = var0.readStringCp1252NullTerminated(); // L: 156 + var6 = var0.readStringCp1252NullTerminated(); // L: 157 + var7 = var0.readUnsignedByte(); // L: 158 + String[] var8 = new String[var7]; // L: 159 + + for (int var9 = 0; var9 < var7; ++var9) { // L: 160 + var8[var9] = var0.readStringCp1252NullTerminated(); + } + + String var20 = var0.readStringCp1252NullTerminated(); // L: 161 + byte[][] var10 = new byte[var7][]; // L: 162 + int var12; + if (var4 == 3) { // L: 163 + for (int var11 = 0; var11 < var7; ++var11) { // L: 164 + var12 = var0.readInt(); // L: 165 + var10[var11] = new byte[var12]; // L: 166 + var0.readBytes(var10[var11], 0, var12); // L: 167 + } + } + + var2.operations[var3] = var4; // L: 170 + Class[] var21 = new Class[var7]; // L: 171 + + for (var12 = 0; var12 < var7; ++var12) { // L: 172 + var21[var12] = UserComparator6.loadClassFromDescriptor(var8[var12]); + } + + Class var22 = UserComparator6.loadClassFromDescriptor(var20); // L: 173 + if (UserComparator6.loadClassFromDescriptor(var5).getClassLoader() == null) { // L: 174 + throw new SecurityException(); + } + + Method[] var13 = UserComparator6.loadClassFromDescriptor(var5).getDeclaredMethods(); // L: 175 + Method[] var14 = var13; // L: 177 + + for (int var15 = 0; var15 < var14.length; ++var15) { // L: 178 + Method var16 = var14[var15]; // L: 179 + if (Reflection.getMethodName(var16).equals(var6)) { // L: 181 + Class[] var17 = Reflection.getParameterTypes(var16); // L: 182 + if (var17.length == var21.length) { // L: 183 + boolean var18 = true; // L: 184 + + for (int var19 = 0; var19 < var21.length; ++var19) { // L: 185 + if (var17[var19] != var21[var19]) { // L: 186 + var18 = false; // L: 187 + break; // L: 188 + } + } + + if (var18 && var22 == var16.getReturnType()) { // L: 191 + var2.methods[var3] = var16; // L: 192 + } + } + } + } + + var2.arguments[var3] = var10; // L: 199 + } + } else { + var5 = var0.readStringCp1252NullTerminated(); // L: 146 + var6 = var0.readStringCp1252NullTerminated(); // L: 147 + var7 = 0; // L: 148 + if (var4 == 1) { // L: 149 + var7 = var0.readInt(); + } + + var2.operations[var3] = var4; // L: 150 + var2.intReplaceValues[var3] = var7; // L: 151 + if (UserComparator6.loadClassFromDescriptor(var5).getClassLoader() == null) { // L: 152 + throw new SecurityException(); + } + + var2.fields[var3] = Reflection.findField(UserComparator6.loadClassFromDescriptor(var5), var6); // L: 153 + } + } catch (ClassNotFoundException var24) { // L: 202 + var2.creationErrors[var3] = -1; // L: 203 + } catch (SecurityException var25) { // L: 205 + var2.creationErrors[var3] = -2; // L: 206 + } catch (NullPointerException var26) { // L: 208 + var2.creationErrors[var3] = -3; // L: 209 + } catch (Exception var27) { // L: 211 + var2.creationErrors[var3] = -4; // L: 212 + } catch (Throwable var28) { // L: 214 + var2.creationErrors[var3] = -5; // L: 215 + } } - int var3 = (Client.zoomWidth - Client.zoomHeight) * var2 / 100 + Client.zoomHeight; // L: 5464 - return var0 * var3 / 256; // L: 5465 - } + class69.reflectionChecks.addFirst(var2); // L: 218 + } // L: 219 } diff --git a/runescape-client/src/main/java/PlayerProvider.java b/runescape-client/src/main/java/PlayerProvider.java index 73690a67f9..41e4bc4cbd 100644 --- a/runescape-client/src/main/java/PlayerProvider.java +++ b/runescape-client/src/main/java/PlayerProvider.java @@ -3,13 +3,13 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("bz") +@ObfuscatedName("bh") @Implements("PlayerProvider") public interface PlayerProvider { - @ObfuscatedName("h") + @ObfuscatedName("v") @ObfuscatedSignature( descriptor = "(I)Lbd;", - garbageValue = "65542938" + garbageValue = "-597712139" ) @Export("player") PcmPlayer player(); diff --git a/runescape-client/src/main/java/PlayerType.java b/runescape-client/src/main/java/PlayerType.java index 0119c40c1c..417dc34f4a 100644 --- a/runescape-client/src/main/java/PlayerType.java +++ b/runescape-client/src/main/java/PlayerType.java @@ -4,69 +4,70 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("jx") +@ObfuscatedName("ja") @Implements("PlayerType") public enum PlayerType implements Enumerated { - @ObfuscatedName("h") + @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "Ljx;" + descriptor = "Lja;" ) @Export("PlayerType_normal") PlayerType_normal(0, -1, true, false, true), - @ObfuscatedName("c") + @ObfuscatedName("n") @ObfuscatedSignature( - descriptor = "Ljx;" + descriptor = "Lja;" ) @Export("PlayerType_playerModerator") PlayerType_playerModerator(1, 0, true, true, true), - @ObfuscatedName("o") + @ObfuscatedName("f") @ObfuscatedSignature( - descriptor = "Ljx;" + descriptor = "Lja;" ) @Export("PlayerType_jagexModerator") PlayerType_jagexModerator(2, 1, true, true, false), - @ObfuscatedName("g") + @ObfuscatedName("y") @ObfuscatedSignature( - descriptor = "Ljx;" + descriptor = "Lja;" ) @Export("PlayerType_ironman") PlayerType_ironman(3, 2, false, false, true), - @ObfuscatedName("l") + @ObfuscatedName("p") @ObfuscatedSignature( - descriptor = "Ljx;" + descriptor = "Lja;" ) @Export("PlayerType_ultimateIronman") PlayerType_ultimateIronman(4, 3, false, false, true), - @ObfuscatedName("z") + @ObfuscatedName("j") @ObfuscatedSignature( - descriptor = "Ljx;" + descriptor = "Lja;" ) @Export("PlayerType_hardcoreIronman") PlayerType_hardcoreIronman(5, 10, false, false, true), - @ObfuscatedName("t") + @ObfuscatedName("r") @ObfuscatedSignature( - descriptor = "Ljx;" + descriptor = "Lja;" ) - field3551(6, 22, false, false, true); + field3548(6, 22, false, false, true); @ObfuscatedName("k") - static boolean field3563; - @ObfuscatedName("v") + @Export("cacheSubPaths") + public static String[] cacheSubPaths; + @ObfuscatedName("b") @ObfuscatedGetter( - intValue = 43390917 + intValue = -614053173 ) @Export("id") final int id; - @ObfuscatedName("b") + @ObfuscatedName("d") @ObfuscatedGetter( - intValue = -1602973139 + intValue = 417414069 ) @Export("modIcon") public final int modIcon; - @ObfuscatedName("q") + @ObfuscatedName("s") @Export("isPrivileged") public final boolean isPrivileged; - @ObfuscatedName("i") + @ObfuscatedName("u") @Export("isUser") public final boolean isUser; @@ -77,13 +78,24 @@ public enum PlayerType implements Enumerated { this.isUser = var7; // L: 27 } // L: 28 - @ObfuscatedName("h") + @ObfuscatedName("v") @ObfuscatedSignature( descriptor = "(I)I", - garbageValue = "-708237537" + garbageValue = "-907662946" ) @Export("rsOrdinal") public int rsOrdinal() { return this.id; // L: 31 } + + @ObfuscatedName("jw") + @ObfuscatedSignature( + descriptor = "(IIIZB)V", + garbageValue = "77" + ) + static final void method4857(int var0, int var1, int var2, boolean var3) { + if (Clock.loadInterface(var0)) { // L: 9766 + class27.resizeInterface(Widget.Widget_interfaceComponents[var0], -1, var1, var2, var3); // L: 9767 + } + } // L: 9768 } diff --git a/runescape-client/src/main/java/Players.java b/runescape-client/src/main/java/Players.java index f4ba9b1b9c..a59895c023 100644 --- a/runescape-client/src/main/java/Players.java +++ b/runescape-client/src/main/java/Players.java @@ -1,144 +1,117 @@ +import java.awt.Desktop; +import java.awt.Desktop.Action; +import java.net.URI; 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("dw") +@ObfuscatedName("di") @Implements("Players") public class Players { - @ObfuscatedName("qu") + @ObfuscatedName("f") + static byte[] field1370; + @ObfuscatedName("y") + static byte[] field1373; + @ObfuscatedName("p") @ObfuscatedSignature( - descriptor = "Lg;" + descriptor = "[Lnd;" ) - static class3 field1358; - @ObfuscatedName("o") - static byte[] field1344; - @ObfuscatedName("g") - static byte[] field1345; - @ObfuscatedName("l") - @ObfuscatedSignature( - descriptor = "[Lnk;" - ) - static Buffer[] field1346; - @ObfuscatedName("z") + static Buffer[] field1374; + @ObfuscatedName("j") @ObfuscatedGetter( - intValue = -1790036089 + intValue = -1143549299 ) @Export("Players_count") static int Players_count; - @ObfuscatedName("t") + @ObfuscatedName("r") @Export("Players_indices") static int[] Players_indices; - @ObfuscatedName("v") + @ObfuscatedName("b") @ObfuscatedGetter( - intValue = -1974903215 + intValue = -1936837699 ) @Export("Players_emptyIdxCount") static int Players_emptyIdxCount; - @ObfuscatedName("b") + @ObfuscatedName("d") @Export("Players_emptyIndices") static int[] Players_emptyIndices; - @ObfuscatedName("q") + @ObfuscatedName("s") @Export("Players_regions") static int[] Players_regions; - @ObfuscatedName("i") + @ObfuscatedName("u") @Export("Players_orientations") static int[] Players_orientations; - @ObfuscatedName("x") + @ObfuscatedName("l") @Export("Players_targetIndices") static int[] Players_targetIndices; - @ObfuscatedName("k") + @ObfuscatedName("o") @ObfuscatedGetter( - intValue = 324886093 + intValue = -1149592963 ) @Export("Players_pendingUpdateCount") static int Players_pendingUpdateCount; - @ObfuscatedName("r") + @ObfuscatedName("c") @Export("Players_pendingUpdateIndices") static int[] Players_pendingUpdateIndices; - @ObfuscatedName("p") + @ObfuscatedName("e") @ObfuscatedSignature( - descriptor = "Lnk;" + descriptor = "Lnd;" ) - static Buffer field1357; + static Buffer field1384; static { - field1344 = new byte[2048]; // L: 18 - field1345 = new byte[2048]; - field1346 = new Buffer[2048]; - Players_count = 0; - Players_indices = new int[2048]; + field1370 = new byte[2048]; // L: 18 + field1373 = new byte[2048]; // L: 19 + field1374 = new Buffer[2048]; // L: 20 + Players_count = 0; // L: 21 + Players_indices = new int[2048]; // L: 22 Players_emptyIdxCount = 0; - Players_emptyIndices = new int[2048]; // L: 24 - Players_regions = new int[2048]; + Players_emptyIndices = new int[2048]; + Players_regions = new int[2048]; // L: 25 Players_orientations = new int[2048]; - Players_targetIndices = new int[2048]; - Players_pendingUpdateCount = 0; + Players_targetIndices = new int[2048]; // L: 27 + Players_pendingUpdateCount = 0; // L: 28 Players_pendingUpdateIndices = new int[2048]; - field1357 = new Buffer(new byte[5000]); // L: 30 + field1384 = new Buffer(new byte[5000]); // L: 30 } - @ObfuscatedName("h") + @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "([I[II)V", - garbageValue = "1714359849" + descriptor = "(Ljava/lang/String;ZZI)V", + garbageValue = "-1331673664" ) - public static void method2312(int[] var0, int[] var1) { - if (var0 != null && var1 != null) { // L: 19 - class15.ByteArrayPool_alternativeSizes = var0; // L: 25 - class9.ByteArrayPool_altSizeArrayCounts = new int[var0.length]; // L: 26 - ByteArrayPool.ByteArrayPool_arrays = new byte[var0.length][][]; // L: 27 - - for (int var2 = 0; var2 < class15.ByteArrayPool_alternativeSizes.length; ++var2) { // L: 28 - ByteArrayPool.ByteArrayPool_arrays[var2] = new byte[var1[var2]][]; // L: 29 + @Export("openURL") + public static void openURL(String var0, boolean var1, boolean var2) { + if (var1) { // L: 23 + if (Desktop.isDesktopSupported() && Desktop.getDesktop().isSupported(Action.BROWSE)) { // L: 24 + try { + Desktop.getDesktop().browse(new URI(var0)); // L: 26 + return; // L: 47 + } catch (Exception var4) { // L: 29 + } } - } else { - class15.ByteArrayPool_alternativeSizes = null; // L: 20 - class9.ByteArrayPool_altSizeArrayCounts = null; // L: 21 - ByteArrayPool.ByteArrayPool_arrays = null; // L: 22 - } - } // L: 23 31 - - @ObfuscatedName("g") - @ObfuscatedSignature( - descriptor = "(B)V", - garbageValue = "1" - ) - public static void method2311() { - synchronized(KeyHandler.KeyHandler_instance) { // L: 164 - ++KeyHandler.KeyHandler_idleCycles; // L: 165 - KeyHandler.field277 = KeyHandler.field279; // L: 166 - KeyHandler.field276 = 0; // L: 167 - int var1; - if (KeyHandler.field260 < 0) { // L: 168 - for (var1 = 0; var1 < 112; ++var1) { // L: 169 - KeyHandler.KeyHandler_pressedKeys[var1] = false; - } - - KeyHandler.field260 = KeyHandler.field273; // L: 170 + if (class44.field318.startsWith("win")) { // L: 31 + class249.method4792(var0, 0); // L: 33 + } else if (class44.field318.startsWith("mac")) { // L: 37 + Script.method1996(var0, 1, "openjs"); // L: 38 } else { - while (KeyHandler.field273 != KeyHandler.field260) { // L: 173 - var1 = KeyHandler.field270[KeyHandler.field273]; // L: 174 - KeyHandler.field273 = KeyHandler.field273 + 1 & 127; // L: 175 - if (var1 < 0) { // L: 176 - KeyHandler.KeyHandler_pressedKeys[~var1] = false; - } else { - if (!KeyHandler.KeyHandler_pressedKeys[var1] && KeyHandler.field276 < KeyHandler.field275.length - 1) { // L: 178 - KeyHandler.field275[++KeyHandler.field276 - 1] = var1; // L: 179 - } - - KeyHandler.KeyHandler_pressedKeys[var1] = true; // L: 181 - } - } + class249.method4792(var0, 2); // L: 41 } - - if (KeyHandler.field276 > 0) { // L: 185 - KeyHandler.KeyHandler_idleCycles = 0; - } - - KeyHandler.field279 = KeyHandler.field278; // L: 186 + } else { + class249.method4792(var0, 3); // L: 44 } - } // L: 188 + + } + + @ObfuscatedName("e") + @ObfuscatedSignature( + descriptor = "(I)I", + garbageValue = "2094559510" + ) + static final int method2311() { + return ViewportMouse.ViewportMouse_y; // L: 116 + } } diff --git a/runescape-client/src/main/java/PrivateChatMode.java b/runescape-client/src/main/java/PrivateChatMode.java index ab6d3e563e..dd3d83b5d3 100644 --- a/runescape-client/src/main/java/PrivateChatMode.java +++ b/runescape-client/src/main/java/PrivateChatMode.java @@ -1,90 +1,39 @@ -import java.net.URL; -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("ll") +@ObfuscatedName("lm") @Implements("PrivateChatMode") public class PrivateChatMode { - @ObfuscatedName("h") + @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "Lll;" + descriptor = "Llm;" ) - static final PrivateChatMode field3901; - @ObfuscatedName("c") + static final PrivateChatMode field3888; + @ObfuscatedName("n") @ObfuscatedSignature( - descriptor = "Lll;" + descriptor = "Llm;" ) - public static final PrivateChatMode field3899; - @ObfuscatedName("o") + public static final PrivateChatMode field3887; + @ObfuscatedName("f") @ObfuscatedSignature( - descriptor = "Lll;" + descriptor = "Llm;" ) - static final PrivateChatMode field3900; - @ObfuscatedName("g") + static final PrivateChatMode field3889; + @ObfuscatedName("y") @ObfuscatedGetter( - intValue = -803781563 + intValue = -767370613 ) - public final int field3898; + public final int field3890; static { - field3901 = new PrivateChatMode(0); // L: 5 - field3899 = new PrivateChatMode(1); // L: 6 - field3900 = new PrivateChatMode(2); + field3888 = new PrivateChatMode(0); // L: 5 + field3887 = new PrivateChatMode(1); // L: 6 + field3889 = new PrivateChatMode(2); } // L: 7 PrivateChatMode(int var1) { - this.field3898 = var1; // L: 15 - } // L: 16 - - @ObfuscatedName("h") - @ObfuscatedSignature( - descriptor = "(I)Z", - garbageValue = "1851240875" - ) - @Export("loadWorlds") - static boolean loadWorlds() { - try { - if (World.World_request == null) { // L: 31 - World.World_request = class19.urlRequester.request(new URL(Canvas.field291)); - } else if (World.World_request.isDone()) { // L: 33 - byte[] var0 = World.World_request.getResponse(); // L: 34 - Buffer var1 = new Buffer(var0); // L: 35 - var1.readInt(); // L: 36 - World.World_count = var1.readUnsignedShort(); // L: 37 - Messages.World_worlds = new World[World.World_count]; // L: 38 - - World var3; - for (int var2 = 0; var2 < World.World_count; var3.index = var2++) { // L: 39 47 - var3 = Messages.World_worlds[var2] = new World(); // L: 40 - var3.id = var1.readUnsignedShort(); // L: 41 - var3.properties = var1.readInt(); // L: 42 - var3.host = var1.readStringCp1252NullTerminated(); // L: 43 - var3.activity = var1.readStringCp1252NullTerminated(); // L: 44 - var3.location = var1.readUnsignedByte(); // L: 45 - var3.population = var1.readShort(); // L: 46 - } - - VarcInt.sortWorlds(Messages.World_worlds, 0, Messages.World_worlds.length - 1, World.World_sortOption1, World.World_sortOption2); // L: 49 - World.World_request = null; // L: 50 - return true; // L: 51 - } - } catch (Exception var4) { // L: 55 - var4.printStackTrace(); // L: 56 - World.World_request = null; // L: 57 - } - - return false; // L: 59 - } - - @ObfuscatedName("t") - @ObfuscatedSignature( - descriptor = "(B)V", - garbageValue = "-10" - ) - public static void method5815() { - FloorOverlayDefinition.FloorOverlayDefinition_cached.clear(); // L: 98 - } // L: 99 + this.field3890 = var1; // L: 11 + } // L: 12 } diff --git a/runescape-client/src/main/java/Projectile.java b/runescape-client/src/main/java/Projectile.java index 749c5844d2..4f7bd077f8 100644 --- a/runescape-client/src/main/java/Projectile.java +++ b/runescape-client/src/main/java/Projectile.java @@ -4,134 +4,129 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ck") +@ObfuscatedName("cq") @Implements("Projectile") public final class Projectile extends Renderable { - @ObfuscatedName("ji") - @ObfuscatedSignature( - descriptor = "Liv;" - ) - static Widget field1039; - @ObfuscatedName("h") + @ObfuscatedName("v") @ObfuscatedGetter( - intValue = -21466483 + intValue = 914973851 ) @Export("id") int id; - @ObfuscatedName("c") + @ObfuscatedName("n") @ObfuscatedGetter( - intValue = -1714458595 + intValue = -1185495603 ) @Export("plane") int plane; - @ObfuscatedName("o") + @ObfuscatedName("f") @ObfuscatedGetter( - intValue = -1769020129 + intValue = 1975154263 ) @Export("sourceX") int sourceX; - @ObfuscatedName("g") + @ObfuscatedName("y") @ObfuscatedGetter( - intValue = -1326029017 + intValue = 1770224161 ) @Export("sourceY") int sourceY; - @ObfuscatedName("l") + @ObfuscatedName("p") @ObfuscatedGetter( - intValue = -1321727169 + intValue = 1880458377 ) @Export("sourceZ") int sourceZ; - @ObfuscatedName("z") + @ObfuscatedName("j") @ObfuscatedGetter( - intValue = -1233167489 + intValue = 460279713 ) @Export("endHeight") int endHeight; - @ObfuscatedName("t") + @ObfuscatedName("r") @ObfuscatedGetter( - intValue = -1994273251 + intValue = 1894077723 ) @Export("cycleStart") int cycleStart; - @ObfuscatedName("v") + @ObfuscatedName("b") @ObfuscatedGetter( - intValue = -818433303 + intValue = -1817230173 ) @Export("cycleEnd") int cycleEnd; - @ObfuscatedName("b") + @ObfuscatedName("d") @ObfuscatedGetter( - intValue = -502302855 + intValue = 1395984447 ) @Export("slope") int slope; - @ObfuscatedName("q") + @ObfuscatedName("s") @ObfuscatedGetter( - intValue = -1531548715 + intValue = -692803357 ) @Export("startHeight") int startHeight; - @ObfuscatedName("i") + @ObfuscatedName("u") @ObfuscatedGetter( - intValue = 274415859 + intValue = 319116855 ) @Export("targetIndex") int targetIndex; - @ObfuscatedName("x") + @ObfuscatedName("l") @Export("isMoving") boolean isMoving; - @ObfuscatedName("k") + @ObfuscatedName("o") @Export("x") double x; - @ObfuscatedName("r") + @ObfuscatedName("c") @Export("y") double y; - @ObfuscatedName("p") + @ObfuscatedName("e") @Export("z") double z; - @ObfuscatedName("a") + @ObfuscatedName("g") @Export("speedX") double speedX; - @ObfuscatedName("e") + @ObfuscatedName("a") @Export("speedY") double speedY; - @ObfuscatedName("d") + @ObfuscatedName("k") @Export("speed") double speed; - @ObfuscatedName("u") + @ObfuscatedName("m") @Export("speedZ") double speedZ; - @ObfuscatedName("m") + @ObfuscatedName("x") @Export("accelerationZ") double accelerationZ; - @ObfuscatedName("j") + @ObfuscatedName("z") @ObfuscatedGetter( - intValue = -631589541 + intValue = 2013686209 ) @Export("yaw") int yaw; - @ObfuscatedName("f") + @ObfuscatedName("w") @ObfuscatedGetter( - intValue = -2003697543 + intValue = 1708799041 ) @Export("pitch") int pitch; - @ObfuscatedName("s") + @ObfuscatedName("t") @ObfuscatedSignature( - descriptor = "Lfb;" + descriptor = "Lfl;" ) @Export("sequenceDefinition") SequenceDefinition sequenceDefinition; - @ObfuscatedName("y") + @ObfuscatedName("h") @ObfuscatedGetter( - intValue = 1278263155 + intValue = -774931897 ) @Export("frame") int frame; - @ObfuscatedName("w") + @ObfuscatedName("q") @ObfuscatedGetter( - intValue = 2141182287 + intValue = 1812825413 ) @Export("frameCycle") int frameCycle; @@ -150,21 +145,21 @@ public final class Projectile extends Renderable { this.slope = var8; // L: 43 this.startHeight = var9; // L: 44 this.targetIndex = var10; // L: 45 - this.endHeight = var11; // L: 46 - this.isMoving = false; // L: 47 - int var12 = Friend.SpotAnimationDefinition_get(this.id).sequence; // L: 48 - if (var12 != -1) { // L: 49 - this.sequenceDefinition = Player.SequenceDefinition_get(var12); + this.endHeight = var11; + this.isMoving = false; + int var12 = VarcInt.SpotAnimationDefinition_get(this.id).sequence; + if (var12 != -1) { + this.sequenceDefinition = LoginScreenAnimation.SequenceDefinition_get(var12); } else { - this.sequenceDefinition = null; // L: 50 + this.sequenceDefinition = null; } - } // L: 51 + } - @ObfuscatedName("h") + @ObfuscatedName("v") @ObfuscatedSignature( descriptor = "(IIIII)V", - garbageValue = "-228325121" + garbageValue = "-1589443362" ) @Export("setDestination") final void setDestination(int var1, int var2, int var3, int var4) { @@ -172,8 +167,8 @@ public final class Projectile extends Renderable { if (!this.isMoving) { // L: 54 var5 = (double)(var1 - this.sourceX); // L: 55 double var7 = (double)(var2 - this.sourceY); // L: 56 - double var9 = Math.sqrt(var5 * var5 + var7 * var7); // L: 57 - this.x = var5 * (double)this.startHeight / var9 + (double)this.sourceX; // L: 58 + double var9 = Math.sqrt(var7 * var7 + var5 * var5); // L: 57 + this.x = (double)this.startHeight * var5 / var9 + (double)this.sourceX; // L: 58 this.y = (double)this.startHeight * var7 / var9 + (double)this.sourceY; // L: 59 this.z = (double)this.sourceZ; // L: 60 } @@ -186,17 +181,17 @@ public final class Projectile extends Renderable { this.speedZ = -this.speed * Math.tan((double)this.slope * 0.02454369D); } - this.accelerationZ = 2.0D * ((double)var3 - this.z - this.speedZ * var5) / (var5 * var5); // L: 67 + this.accelerationZ = 2.0D * ((double)var3 - this.z - var5 * this.speedZ) / (var5 * var5); // L: 67 } // L: 68 - @ObfuscatedName("c") + @ObfuscatedName("n") @ObfuscatedSignature( - descriptor = "(I)Lgj;", - garbageValue = "-220627570" + descriptor = "(B)Lgr;", + garbageValue = "-76" ) @Export("getModel") protected final Model getModel() { - SpotAnimationDefinition var1 = Friend.SpotAnimationDefinition_get(this.id); // L: 92 + SpotAnimationDefinition var1 = VarcInt.SpotAnimationDefinition_get(this.id); // L: 92 Model var2 = var1.getModel(this.frame); // L: 93 if (var2 == null) { // L: 94 return null; @@ -206,18 +201,18 @@ public final class Projectile extends Renderable { } } - @ObfuscatedName("o") + @ObfuscatedName("f") @ObfuscatedSignature( descriptor = "(II)V", - garbageValue = "982624616" + garbageValue = "-602839745" ) @Export("advance") final void advance(int var1) { this.isMoving = true; // L: 71 - this.x += (double)var1 * this.speedX; // L: 72 - this.y += this.speedY * (double)var1; // L: 73 - this.z += (double)var1 * (double)var1 * 0.5D * this.accelerationZ + (double)var1 * this.speedZ; // L: 74 - this.speedZ += (double)var1 * this.accelerationZ; // L: 75 + this.x += this.speedX * (double)var1; // L: 72 + this.y += (double)var1 * this.speedY; // L: 73 + this.z += (double)var1 * this.speedZ + (double)var1 * 0.5D * this.accelerationZ * (double)var1; // L: 74 + this.speedZ += this.accelerationZ * (double)var1; // L: 75 this.yaw = (int)(Math.atan2(this.speedX, this.speedY) * 325.949D) + 1024 & 2047; // L: 76 this.pitch = (int)(Math.atan2(this.speedZ, this.speed) * 325.949D) & 2047; // L: 77 if (this.sequenceDefinition != null) { // L: 78 @@ -242,18 +237,24 @@ public final class Projectile extends Renderable { } } - @ObfuscatedName("t") + @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "(S)V", - garbageValue = "7028" + descriptor = "(II)Lev;", + garbageValue = "-1277280984" ) - static void method1996() { - Players.Players_count = 0; // L: 648 + public static HitSplatDefinition method1966(int var0) { + HitSplatDefinition var1 = (HitSplatDefinition)HitSplatDefinition.HitSplatDefinition_cached.get((long)var0); // L: 46 + if (var1 != null) { // L: 47 + return var1; + } else { + byte[] var2 = HitSplatDefinition.HitSplatDefinition_archive.takeFile(32, var0); // L: 48 + var1 = new HitSplatDefinition(); // L: 49 + if (var2 != null) { // L: 50 + var1.decode(new Buffer(var2)); + } - for (int var0 = 0; var0 < 2048; ++var0) { // L: 649 - Players.field1346[var0] = null; // L: 650 - Players.field1345[var0] = 1; // L: 651 + HitSplatDefinition.HitSplatDefinition_cached.put(var1, (long)var0); // L: 51 + return var1; // L: 52 } - - } // L: 653 + } } diff --git a/runescape-client/src/main/java/RasterProvider.java b/runescape-client/src/main/java/RasterProvider.java index bf8adb1890..7d6972a983 100644 --- a/runescape-client/src/main/java/RasterProvider.java +++ b/runescape-client/src/main/java/RasterProvider.java @@ -14,13 +14,13 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("az") +@ObfuscatedName("aw") @Implements("RasterProvider") public final class RasterProvider extends AbstractRasterProvider { - @ObfuscatedName("h") + @ObfuscatedName("v") @Export("component") Component component; - @ObfuscatedName("c") + @ObfuscatedName("n") @Export("image") Image image; @@ -36,40 +36,40 @@ public final class RasterProvider extends AbstractRasterProvider { this.apply(); // L: 31 } // L: 32 - @ObfuscatedName("h") + @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "(Ljava/awt/Component;B)V", - garbageValue = "-2" + descriptor = "(Ljava/awt/Component;I)V", + garbageValue = "-401885377" ) @Export("setComponent") final void setComponent(Component var1) { this.component = var1; // L: 35 } // L: 36 - @ObfuscatedName("c") + @ObfuscatedName("n") @ObfuscatedSignature( descriptor = "(III)V", - garbageValue = "946927197" + garbageValue = "-974946505" ) @Export("drawFull") public final void drawFull(int var1, int var2) { this.drawFull0(this.component.getGraphics(), var1, var2); // L: 39 } // L: 40 - @ObfuscatedName("o") + @ObfuscatedName("f") @ObfuscatedSignature( descriptor = "(IIIII)V", - garbageValue = "-1873522448" + garbageValue = "331056379" ) @Export("draw") public final void draw(int var1, int var2, int var3, int var4) { this.draw0(this.component.getGraphics(), var1, var2, var3, var4); // L: 43 } // L: 44 - @ObfuscatedName("g") + @ObfuscatedName("y") @ObfuscatedSignature( descriptor = "(Ljava/awt/Graphics;III)V", - garbageValue = "506576980" + garbageValue = "1867252423" ) @Export("drawFull0") final void drawFull0(Graphics var1, int var2, int var3) { @@ -81,10 +81,10 @@ public final class RasterProvider extends AbstractRasterProvider { } // L: 53 - @ObfuscatedName("l") + @ObfuscatedName("p") @ObfuscatedSignature( - descriptor = "(Ljava/awt/Graphics;IIIII)V", - garbageValue = "-281222970" + descriptor = "(Ljava/awt/Graphics;IIIIB)V", + garbageValue = "51" ) @Export("draw0") final void draw0(Graphics var1, int var2, int var3, int var4, int var5) { diff --git a/runescape-client/src/main/java/Rasterizer2D.java b/runescape-client/src/main/java/Rasterizer2D.java index 1174bf03cc..17b1fbaf25 100644 --- a/runescape-client/src/main/java/Rasterizer2D.java +++ b/runescape-client/src/main/java/Rasterizer2D.java @@ -3,28 +3,28 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("op") +@ObfuscatedName("oi") @Implements("Rasterizer2D") public class Rasterizer2D extends DualNode { - @ObfuscatedName("ae") + @ObfuscatedName("ap") @Export("Rasterizer2D_pixels") public static int[] Rasterizer2D_pixels; - @ObfuscatedName("ao") + @ObfuscatedName("ab") @Export("Rasterizer2D_width") public static int Rasterizer2D_width; - @ObfuscatedName("aj") + @ObfuscatedName("al") @Export("Rasterizer2D_height") public static int Rasterizer2D_height; - @ObfuscatedName("aw") + @ObfuscatedName("ad") @Export("Rasterizer2D_yClipStart") public static int Rasterizer2D_yClipStart; - @ObfuscatedName("at") + @ObfuscatedName("ai") @Export("Rasterizer2D_yClipEnd") public static int Rasterizer2D_yClipEnd; - @ObfuscatedName("av") + @ObfuscatedName("ar") @Export("Rasterizer2D_xClipStart") public static int Rasterizer2D_xClipStart; - @ObfuscatedName("al") + @ObfuscatedName("ag") @Export("Rasterizer2D_xClipEnd") public static int Rasterizer2D_xClipEnd; @@ -38,7 +38,7 @@ public class Rasterizer2D extends DualNode { protected Rasterizer2D() { } // L: 16 - @ObfuscatedName("cj") + @ObfuscatedName("dk") @Export("Rasterizer2D_replace") public static void Rasterizer2D_replace(int[] var0, int var1, int var2) { Rasterizer2D_pixels = var0; // L: 19 @@ -47,7 +47,7 @@ public class Rasterizer2D extends DualNode { Rasterizer2D_setClip(0, 0, var1, var2); // L: 22 } // L: 23 - @ObfuscatedName("cy") + @ObfuscatedName("ds") @Export("Rasterizer2D_resetClip") public static void Rasterizer2D_resetClip() { Rasterizer2D_xClipStart = 0; // L: 26 @@ -56,7 +56,7 @@ public class Rasterizer2D extends DualNode { Rasterizer2D_yClipEnd = Rasterizer2D_height; // L: 29 } // L: 30 - @ObfuscatedName("cb") + @ObfuscatedName("do") @Export("Rasterizer2D_setClip") public static void Rasterizer2D_setClip(int var0, int var1, int var2, int var3) { if (var0 < 0) { // L: 33 @@ -81,7 +81,7 @@ public class Rasterizer2D extends DualNode { Rasterizer2D_yClipEnd = var3; // L: 40 } // L: 41 - @ObfuscatedName("cv") + @ObfuscatedName("df") @Export("Rasterizer2D_expandClip") public static void Rasterizer2D_expandClip(int var0, int var1, int var2, int var3) { if (Rasterizer2D_xClipStart < var0) { // L: 44 @@ -102,7 +102,7 @@ public class Rasterizer2D extends DualNode { } // L: 48 - @ObfuscatedName("ca") + @ObfuscatedName("dv") @Export("Rasterizer2D_getClipArray") public static void Rasterizer2D_getClipArray(int[] var0) { var0[0] = Rasterizer2D_xClipStart; // L: 51 @@ -111,7 +111,7 @@ public class Rasterizer2D extends DualNode { var0[3] = Rasterizer2D_yClipEnd; // L: 54 } // L: 55 - @ObfuscatedName("ds") + @ObfuscatedName("dy") @Export("Rasterizer2D_setClipArray") public static void Rasterizer2D_setClipArray(int[] var0) { Rasterizer2D_xClipStart = var0[0]; // L: 58 @@ -120,7 +120,7 @@ public class Rasterizer2D extends DualNode { Rasterizer2D_yClipEnd = var0[3]; // L: 61 } // L: 62 - @ObfuscatedName("do") + @ObfuscatedName("dd") @Export("Rasterizer2D_clear") public static void Rasterizer2D_clear() { int var0 = 0; // L: 65 @@ -141,7 +141,7 @@ public class Rasterizer2D extends DualNode { } // L: 79 - @ObfuscatedName("dj") + @ObfuscatedName("da") @Export("drawCircle") static void drawCircle(int var0, int var1, int var2, int var3) { if (var2 == 0) { // L: 82 @@ -225,8 +225,8 @@ public class Rasterizer2D extends DualNode { var14 = var12 + var6 * Rasterizer2D_width; // L: 127 - for (var15 = var12; var15 <= var13; ++var15) { // L: 128 - Rasterizer2D_pixels[var14++] = var3; + for (var15 = var12; var15 <= var13; ++var15) { + Rasterizer2D_pixels[var14++] = var3; // L: 128 } ++var6; // L: 129 @@ -236,7 +236,7 @@ public class Rasterizer2D extends DualNode { } } // L: 84 133 - @ObfuscatedName("du") + @ObfuscatedName("dx") @Export("Rasterizer2D_drawCircleAlpha") public static void Rasterizer2D_drawCircleAlpha(int var0, int var1, int var2, int var3, int var4) { if (var4 != 0) { // L: 136 @@ -349,7 +349,7 @@ public class Rasterizer2D extends DualNode { } } // L: 139 207 - @ObfuscatedName("dw") + @ObfuscatedName("dg") @Export("Rasterizer2D_fillRectangleAlpha") public static void Rasterizer2D_fillRectangleAlpha(int var0, int var1, int var2, int var3, int var4, int var5) { if (var0 < Rasterizer2D_xClipStart) { // L: 210 @@ -387,7 +387,7 @@ public class Rasterizer2D extends DualNode { } // L: 232 - @ObfuscatedName("dp") + @ObfuscatedName("du") @Export("Rasterizer2D_fillRectangle") public static void Rasterizer2D_fillRectangle(int var0, int var1, int var2, int var3, int var4) { if (var0 < Rasterizer2D_xClipStart) { // L: 235 @@ -421,7 +421,7 @@ public class Rasterizer2D extends DualNode { } // L: 253 - @ObfuscatedName("dl") + @ObfuscatedName("dt") @Export("Rasterizer2D_fillRectangleGradient") public static void Rasterizer2D_fillRectangleGradient(int var0, int var1, int var2, int var3, int var4, int var5) { if (var2 > 0 && var3 > 0) { // L: 256 @@ -465,7 +465,7 @@ public class Rasterizer2D extends DualNode { } } // L: 282 - @ObfuscatedName("dd") + @ObfuscatedName("dn") @Export("Rasterizer2D_fillRectangleGradientAlpha") public static void Rasterizer2D_fillRectangleGradientAlpha(int var0, int var1, int var2, int var3, int var4, int var5, int var6, int var7) { if (var2 > 0 && var3 > 0) { // L: 285 @@ -523,7 +523,7 @@ public class Rasterizer2D extends DualNode { } } // L: 326 - @ObfuscatedName("dz") + @ObfuscatedName("dh") @ObfuscatedSignature( descriptor = "(IIIIII[BIZ)V", garbageValue = "1" @@ -604,7 +604,7 @@ public class Rasterizer2D extends DualNode { } } // L: 380 - @ObfuscatedName("dh") + @ObfuscatedName("dl") @Export("Rasterizer2D_drawRectangle") public static void Rasterizer2D_drawRectangle(int var0, int var1, int var2, int var3, int var4) { Rasterizer2D_drawHorizontalLine(var0, var1, var2, var4); // L: 383 @@ -613,7 +613,7 @@ public class Rasterizer2D extends DualNode { Rasterizer2D_drawVerticalLine(var0 + var2 - 1, var1, var3, var4); // L: 386 } // L: 387 - @ObfuscatedName("dn") + @ObfuscatedName("dq") @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); // L: 390 @@ -625,7 +625,7 @@ public class Rasterizer2D extends DualNode { } // L: 396 - @ObfuscatedName("dm") + @ObfuscatedName("de") @Export("Rasterizer2D_drawHorizontalLine") public static void Rasterizer2D_drawHorizontalLine(int var0, int var1, int var2, int var3) { if (var1 >= Rasterizer2D_yClipStart && var1 < Rasterizer2D_yClipEnd) { // L: 399 @@ -647,7 +647,7 @@ public class Rasterizer2D extends DualNode { } } // L: 407 - @ObfuscatedName("dq") + @ObfuscatedName("dp") @Export("Rasterizer2D_drawHorizontalLineAlpha") static void Rasterizer2D_drawHorizontalLineAlpha(int var0, int var1, int var2, int var3, int var4) { if (var1 >= Rasterizer2D_yClipStart && var1 < Rasterizer2D_yClipEnd) { // L: 410 @@ -677,7 +677,7 @@ public class Rasterizer2D extends DualNode { } } // L: 431 - @ObfuscatedName("da") + @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) { // L: 434 @@ -699,7 +699,7 @@ public class Rasterizer2D extends DualNode { } } // L: 442 - @ObfuscatedName("de") + @ObfuscatedName("dw") @Export("Rasterizer2D_drawVerticalLineAlpha") static void Rasterizer2D_drawVerticalLineAlpha(int var0, int var1, int var2, int var3, int var4) { if (var0 >= Rasterizer2D_xClipStart && var0 < Rasterizer2D_xClipEnd) { // L: 445 @@ -730,7 +730,7 @@ public class Rasterizer2D extends DualNode { } } // L: 467 - @ObfuscatedName("dy") + @ObfuscatedName("ec") @Export("Rasterizer2D_drawLine") public static void Rasterizer2D_drawLine(int var0, int var1, int var2, int var3, int var4) { var2 -= var0; // L: 470 @@ -812,7 +812,7 @@ public class Rasterizer2D extends DualNode { } } // L: 475 480 524 - @ObfuscatedName("di") + @ObfuscatedName("ea") @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) { // L: 527 @@ -820,7 +820,7 @@ public class Rasterizer2D extends DualNode { } } // L: 529 - @ObfuscatedName("dt") + @ObfuscatedName("ek") @Export("Rasterizer2D_fillMaskedRectangle") public static void Rasterizer2D_fillMaskedRectangle(int var0, int var1, int var2, int[] var3, int[] var4) { int var5 = var0 + Rasterizer2D_width * var1; // L: 532 diff --git a/runescape-client/src/main/java/Rasterizer3D.java b/runescape-client/src/main/java/Rasterizer3D.java index 54cc16049e..1e3ad9e636 100644 --- a/runescape-client/src/main/java/Rasterizer3D.java +++ b/runescape-client/src/main/java/Rasterizer3D.java @@ -3,92 +3,92 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("gu") +@ObfuscatedName("gj") @Implements("Rasterizer3D") public class Rasterizer3D extends Rasterizer2D { - @ObfuscatedName("h") + @ObfuscatedName("v") + static boolean field2262; + @ObfuscatedName("n") static boolean field2260; - @ObfuscatedName("c") - static boolean field2270; - @ObfuscatedName("o") + @ObfuscatedName("f") @Export("Rasterizer3D_isLowDetailTexture") static boolean Rasterizer3D_isLowDetailTexture; - @ObfuscatedName("g") - public static boolean field2254; - @ObfuscatedName("l") + @ObfuscatedName("y") + public static boolean field2282; + @ObfuscatedName("p") @Export("Rasterizer3D_alpha") static int Rasterizer3D_alpha; - @ObfuscatedName("x") + @ObfuscatedName("l") @Export("Rasterizer3D_zoom") public static int Rasterizer3D_zoom; - @ObfuscatedName("k") + @ObfuscatedName("o") @Export("Rasterizer3D_clipMidX") static int Rasterizer3D_clipMidX; - @ObfuscatedName("r") + @ObfuscatedName("c") @Export("Rasterizer3D_clipMidY") static int Rasterizer3D_clipMidY; - @ObfuscatedName("p") + @ObfuscatedName("e") @Export("Rasterizer3D_clipWidth") static int Rasterizer3D_clipWidth; - @ObfuscatedName("a") + @ObfuscatedName("g") @Export("Rasterizer3D_clipHeight") static int Rasterizer3D_clipHeight; - @ObfuscatedName("e") + @ObfuscatedName("a") @Export("Rasterizer3D_clipNegativeMidX") static int Rasterizer3D_clipNegativeMidX; - @ObfuscatedName("d") + @ObfuscatedName("k") @Export("Rasterizer3D_clipMidX2") static int Rasterizer3D_clipMidX2; - @ObfuscatedName("u") + @ObfuscatedName("m") @Export("Rasterizer3D_clipNegativeMidY") static int Rasterizer3D_clipNegativeMidY; - @ObfuscatedName("m") + @ObfuscatedName("x") @Export("Rasterizer3D_clipMidY2") static int Rasterizer3D_clipMidY2; - @ObfuscatedName("j") + @ObfuscatedName("z") @Export("Rasterizer3D_rowOffsets") static int[] Rasterizer3D_rowOffsets; - @ObfuscatedName("f") + @ObfuscatedName("w") @Export("Rasterizer3D_colorPalette") public static int[] Rasterizer3D_colorPalette; - @ObfuscatedName("s") + @ObfuscatedName("t") @ObfuscatedSignature( - descriptor = "Lhn;" + descriptor = "Lhb;" ) @Export("Rasterizer3D_textureLoader") public static TextureLoader Rasterizer3D_textureLoader; - @ObfuscatedName("y") - static int[] field2252; - @ObfuscatedName("w") - static int[] field2275; - @ObfuscatedName("n") + @ObfuscatedName("h") + static int[] field2284; + @ObfuscatedName("q") + static int[] field2283; + @ObfuscatedName("i") @Export("Rasterizer3D_sine") public static int[] Rasterizer3D_sine; - @ObfuscatedName("ag") + @ObfuscatedName("ae") @Export("Rasterizer3D_cosine") public static int[] Rasterizer3D_cosine; static { - field2260 = false; // L: 8 - field2270 = false; // L: 9 + field2262 = false; // L: 8 + field2260 = false; // L: 9 Rasterizer3D_isLowDetailTexture = false; // L: 10 - field2254 = true; // L: 11 + field2282 = true; // L: 11 Rasterizer3D_alpha = 0; // L: 12 Rasterizer3D_zoom = 512; // L: 19 Rasterizer3D_rowOffsets = new int[1024]; // L: 28 Rasterizer3D_colorPalette = new int[65536]; // L: 29 - field2252 = new int[512]; // L: 31 - field2275 = new int[2048]; // L: 32 + field2284 = new int[512]; // L: 31 + field2283 = new int[2048]; // L: 32 Rasterizer3D_sine = new int[2048]; // L: 33 Rasterizer3D_cosine = new int[2048]; // L: 34 int var0; for (var0 = 1; var0 < 512; ++var0) { // L: 37 - field2252[var0] = 32768 / var0; // L: 38 + field2284[var0] = 32768 / var0; // L: 38 } for (var0 = 1; var0 < 2048; ++var0) { // L: 40 - field2275[var0] = 65536 / var0; // L: 41 + field2283[var0] = 65536 / var0; // L: 41 } for (var0 = 0; var0 < 2048; ++var0) { // L: 43 @@ -98,20 +98,20 @@ public class Rasterizer3D extends Rasterizer2D { } // L: 47 - @ObfuscatedName("h") + @ObfuscatedName("v") @Export("Rasterizer3D_setClipFromRasterizer2D") public static final void Rasterizer3D_setClipFromRasterizer2D() { Rasterizer3D_setClip(Rasterizer2D.Rasterizer2D_xClipStart, Rasterizer2D.Rasterizer2D_yClipStart, Rasterizer2D.Rasterizer2D_xClipEnd, Rasterizer2D.Rasterizer2D_yClipEnd); // L: 54 } // L: 55 - @ObfuscatedName("c") + @ObfuscatedName("n") @Export("Rasterizer3D_setClip") static final void Rasterizer3D_setClip(int var0, int var1, int var2, int var3) { Rasterizer3D_clipWidth = var2 - var0; // L: 58 Rasterizer3D_clipHeight = var3 - var1; // L: 59 Rasterizer3D_method3(); // L: 60 if (Rasterizer3D_rowOffsets.length < Rasterizer3D_clipHeight) { // L: 61 - Rasterizer3D_rowOffsets = new int[MouseRecorder.method2126(Rasterizer3D_clipHeight)]; + Rasterizer3D_rowOffsets = new int[Player.method2128(Rasterizer3D_clipHeight)]; } int var4 = var0 + Rasterizer2D.Rasterizer2D_width * var1; // L: 62 @@ -123,7 +123,7 @@ public class Rasterizer3D extends Rasterizer2D { } // L: 67 - @ObfuscatedName("o") + @ObfuscatedName("f") @Export("Rasterizer3D_method3") public static final void Rasterizer3D_method3() { Rasterizer3D_clipMidX = Rasterizer3D_clipWidth / 2; // L: 70 @@ -134,8 +134,8 @@ public class Rasterizer3D extends Rasterizer2D { Rasterizer3D_clipMidY2 = Rasterizer3D_clipHeight - Rasterizer3D_clipMidY; // L: 75 } // L: 76 - @ObfuscatedName("g") - public static final void method3818(int var0, int var1) { + @ObfuscatedName("y") + public static final void method3848(int var0, int var1) { int var2 = Rasterizer3D_rowOffsets[0]; // L: 79 int var3 = var2 / Rasterizer2D.Rasterizer2D_width; // L: 80 int var4 = var2 - var3 * Rasterizer2D.Rasterizer2D_width; // L: 81 @@ -147,22 +147,22 @@ public class Rasterizer3D extends Rasterizer2D { Rasterizer3D_clipMidY2 = Rasterizer3D_clipHeight - Rasterizer3D_clipMidY; // L: 87 } // L: 88 - @ObfuscatedName("l") + @ObfuscatedName("p") @ObfuscatedSignature( - descriptor = "(Lhn;)V" + descriptor = "(Lhb;)V" ) @Export("Rasterizer3D_setTextureLoader") public static final void Rasterizer3D_setTextureLoader(TextureLoader var0) { Rasterizer3D_textureLoader = var0; // L: 91 } // L: 92 - @ObfuscatedName("z") + @ObfuscatedName("j") @Export("Rasterizer3D_setBrightness") public static final void Rasterizer3D_setBrightness(double var0) { Rasterizer3D_buildPalette(var0, 0, 512); // L: 95 } // L: 96 - @ObfuscatedName("t") + @ObfuscatedName("r") @Export("Rasterizer3D_buildPalette") static final void Rasterizer3D_buildPalette(double var0, int var2, int var3) { int var4 = var2 * 128; // L: 99 @@ -241,7 +241,7 @@ public class Rasterizer3D extends Rasterizer2D { } // L: 140 - @ObfuscatedName("v") + @ObfuscatedName("b") @Export("Rasterizer3D_brighten") static int Rasterizer3D_brighten(int var0, double var1) { double var3 = (double)(var0 >> 16) / 256.0D; // L: 143 @@ -256,13 +256,13 @@ public class Rasterizer3D extends Rasterizer2D { return var11 + (var10 << 8) + (var9 << 16); // L: 152 } - @ObfuscatedName("b") - public static void method3823(int var0, int var1, int var2) { - field2260 = var0 < 0 || var0 > Rasterizer3D_clipWidth || var1 < 0 || var1 > Rasterizer3D_clipWidth || var2 < 0 || var2 > Rasterizer3D_clipWidth; // L: 156 + @ObfuscatedName("d") + public static void method3856(int var0, int var1, int var2) { + field2262 = var0 < 0 || var0 > Rasterizer3D_clipWidth || var1 < 0 || var1 > Rasterizer3D_clipWidth || var2 < 0 || var2 > Rasterizer3D_clipWidth; // L: 156 } // L: 157 - @ObfuscatedName("q") - static final void method3824(int var0, int var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8) { + @ObfuscatedName("s") + static final void method3854(int var0, int var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8) { int var9 = var4 - var3; // L: 160 int var10 = var1 - var0; // L: 161 int var11 = var5 - var3; // L: 162 @@ -767,10 +767,10 @@ public class Rasterizer3D extends Rasterizer2D { } } - @ObfuscatedName("i") + @ObfuscatedName("u") @Export("Rasterizer3D_vertAlpha") static final void Rasterizer3D_vertAlpha(int[] var0, int var1, int var2, int var3, int var4, int var5, int var6, int var7) { - if (field2260) { // L: 524 + if (field2262) { // L: 524 if (var5 > Rasterizer3D_clipWidth) { // L: 525 var5 = Rasterizer3D_clipWidth; } @@ -786,7 +786,7 @@ public class Rasterizer3D extends Rasterizer2D { int var8; int var9; int var10; - if (field2254) { // L: 531 + if (field2282) { // L: 531 var3 = var5 - var4 >> 2; // L: 532 var7 <<= 2; // L: 533 if (Rasterizer3D_alpha == 0) { // L: 534 @@ -870,8 +870,8 @@ public class Rasterizer3D extends Rasterizer2D { } } // L: 581 602 - @ObfuscatedName("x") - public static final void method3826(int var0, int var1, int var2, int var3, int var4, int var5, int var6) { + @ObfuscatedName("l") + public static final void method3919(int var0, int var1, int var2, int var3, int var4, int var5, int var6) { int var7 = 0; // L: 607 if (var0 != var1) { // L: 608 var7 = (var4 - var3 << 14) / (var1 - var0); @@ -1326,10 +1326,10 @@ public class Rasterizer3D extends Rasterizer2D { } } - @ObfuscatedName("k") + @ObfuscatedName("o") @Export("Rasterizer3D_horizAlpha") static final void Rasterizer3D_horizAlpha(int[] var0, int var1, int var2, int var3, int var4, int var5) { - if (field2260) { // L: 925 + if (field2262) { // L: 925 if (var5 > Rasterizer3D_clipWidth) { // L: 926 var5 = Rasterizer3D_clipWidth; } @@ -1421,16 +1421,16 @@ public class Rasterizer3D extends Rasterizer2D { } } - @ObfuscatedName("r") - static final void method3843(int var0, int var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8, int var9, int var10, int var11, int var12, int var13, int var14, int var15, int var16, int var17, int var18) { + @ObfuscatedName("c") + static final void method3877(int var0, int var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8, int var9, int var10, int var11, int var12, int var13, int var14, int var15, int var16, int var17, int var18) { int[] var19 = Rasterizer3D_textureLoader.getTexturePixels(var18); // L: 979 int var20; if (var19 == null) { // L: 980 var20 = Rasterizer3D_textureLoader.getAverageTextureRGB(var18); // L: 981 - method3824(var0, var1, var2, var3, var4, var5, method3887(var20, var6), method3887(var20, var7), method3887(var20, var8)); // L: 982 + method3854(var0, var1, var2, var3, var4, var5, method3881(var20, var6), method3881(var20, var7), method3881(var20, var8)); // L: 982 } else { Rasterizer3D_isLowDetailTexture = Rasterizer3D_textureLoader.isLowDetail(var18); // L: 985 - field2270 = Rasterizer3D_textureLoader.vmethod4224(var18); // L: 986 + field2260 = Rasterizer3D_textureLoader.vmethod4276(var18); // L: 986 var20 = var4 - var3; // L: 987 int var21 = var1 - var0; // L: 988 int var22 = var5 - var3; // L: 989 @@ -1590,41 +1590,7 @@ public class Rasterizer3D extends Rasterizer2D { var32 += var34 * var41; // L: 1107 var35 += var37 * var41; // L: 1108 var38 += var40 * var41; // L: 1109 - if ((var0 == var2 || var28 >= var26) && (var0 != var2 || var27 <= var26)) { // L: 1110 - var1 -= var2; // L: 1137 - var2 -= var0; // L: 1138 - var0 = Rasterizer3D_rowOffsets[var0]; // L: 1139 - - while (true) { - --var2; // L: 1140 - if (var2 < 0) { - while (true) { - --var1; // L: 1150 - if (var1 < 0) { - return; // L: 1160 - } - - Rasterizer3D_iDontKnow(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var0, var3 >> 14, var5 >> 14, var6, var30, var32, var35, var38, var33, var36, var39); // L: 1151 - var5 += var27; // L: 1152 - var3 += var26; // L: 1153 - var6 += var31; // L: 1154 - var0 += Rasterizer2D.Rasterizer2D_width; // L: 1155 - var32 += var34; // L: 1156 - var35 += var37; // L: 1157 - var38 += var40; // L: 1158 - } - } - - Rasterizer3D_iDontKnow(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var0, var3 >> 14, var4 >> 14, var6, var30, var32, var35, var38, var33, var36, var39); // L: 1141 - var4 += var28; // L: 1142 - var3 += var26; // L: 1143 - var6 += var31; // L: 1144 - var0 += Rasterizer2D.Rasterizer2D_width; // L: 1145 - var32 += var34; // L: 1146 - var35 += var37; // L: 1147 - var38 += var40; // L: 1148 - } - } else { + if (var0 != var2 && var28 < var26 || var0 == var2 && var27 > var26) { // L: 1110 var1 -= var2; // L: 1111 var2 -= var0; // L: 1112 var0 = Rasterizer3D_rowOffsets[var0]; // L: 1113 @@ -1658,6 +1624,40 @@ public class Rasterizer3D extends Rasterizer2D { var35 += var37; // L: 1121 var38 += var40; // L: 1122 } + } else { + var1 -= var2; // L: 1137 + var2 -= var0; // L: 1138 + var0 = Rasterizer3D_rowOffsets[var0]; // L: 1139 + + while (true) { + --var2; // L: 1140 + if (var2 < 0) { + while (true) { + --var1; // L: 1150 + if (var1 < 0) { + return; // L: 1160 + } + + Rasterizer3D_iDontKnow(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var0, var3 >> 14, var5 >> 14, var6, var30, var32, var35, var38, var33, var36, var39); // L: 1151 + var5 += var27; // L: 1152 + var3 += var26; // L: 1153 + var6 += var31; // L: 1154 + var0 += Rasterizer2D.Rasterizer2D_width; // L: 1155 + var32 += var34; // L: 1156 + var35 += var37; // L: 1157 + var38 += var40; // L: 1158 + } + } + + Rasterizer3D_iDontKnow(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var0, var3 >> 14, var4 >> 14, var6, var30, var32, var35, var38, var33, var36, var39); // L: 1141 + var4 += var28; // L: 1142 + var3 += var26; // L: 1143 + var6 += var31; // L: 1144 + var0 += Rasterizer2D.Rasterizer2D_width; // L: 1145 + var32 += var34; // L: 1146 + var35 += var37; // L: 1147 + var38 += var40; // L: 1148 + } } } } @@ -1691,41 +1691,7 @@ public class Rasterizer3D extends Rasterizer2D { var32 += var34 * var41; // L: 1183 var35 += var37 * var41; // L: 1184 var38 += var40 * var41; // L: 1185 - if (var2 != var1 && var26 < var27 || var2 == var1 && var26 > var28) { // L: 1186 - var0 -= var2; // L: 1187 - var2 -= var1; // L: 1188 - var1 = Rasterizer3D_rowOffsets[var1]; // L: 1189 - - while (true) { - --var2; // L: 1190 - if (var2 < 0) { - while (true) { - --var0; // L: 1200 - if (var0 < 0) { - return; // L: 1210 - } - - Rasterizer3D_iDontKnow(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var1, var3 >> 14, var5 >> 14, var7, var30, var32, var35, var38, var33, var36, var39); // L: 1201 - var3 += var26; // L: 1202 - var5 += var28; // L: 1203 - var7 += var31; // L: 1204 - var1 += Rasterizer2D.Rasterizer2D_width; // L: 1205 - var32 += var34; // L: 1206 - var35 += var37; // L: 1207 - var38 += var40; // L: 1208 - } - } - - Rasterizer3D_iDontKnow(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var1, var3 >> 14, var4 >> 14, var7, var30, var32, var35, var38, var33, var36, var39); // L: 1191 - var3 += var26; // L: 1192 - var4 += var27; // L: 1193 - var7 += var31; // L: 1194 - var1 += Rasterizer2D.Rasterizer2D_width; // L: 1195 - var32 += var34; // L: 1196 - var35 += var37; // L: 1197 - var38 += var40; // L: 1198 - } - } else { + if ((var2 == var1 || var26 >= var27) && (var2 != var1 || var26 <= var28)) { // L: 1186 var0 -= var2; // L: 1213 var2 -= var1; // L: 1214 var1 = Rasterizer3D_rowOffsets[var1]; // L: 1215 @@ -1759,6 +1725,40 @@ public class Rasterizer3D extends Rasterizer2D { var35 += var37; // L: 1223 var38 += var40; // L: 1224 } + } else { + var0 -= var2; // L: 1187 + var2 -= var1; // L: 1188 + var1 = Rasterizer3D_rowOffsets[var1]; // L: 1189 + + while (true) { + --var2; // L: 1190 + if (var2 < 0) { + while (true) { + --var0; // L: 1200 + if (var0 < 0) { + return; // L: 1210 + } + + Rasterizer3D_iDontKnow(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var1, var3 >> 14, var5 >> 14, var7, var30, var32, var35, var38, var33, var36, var39); // L: 1201 + var3 += var26; // L: 1202 + var5 += var28; // L: 1203 + var7 += var31; // L: 1204 + var1 += Rasterizer2D.Rasterizer2D_width; // L: 1205 + var32 += var34; // L: 1206 + var35 += var37; // L: 1207 + var38 += var40; // L: 1208 + } + } + + Rasterizer3D_iDontKnow(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var1, var3 >> 14, var4 >> 14, var7, var30, var32, var35, var38, var33, var36, var39); // L: 1191 + var3 += var26; // L: 1192 + var4 += var27; // L: 1193 + var7 += var31; // L: 1194 + var1 += Rasterizer2D.Rasterizer2D_width; // L: 1195 + var32 += var34; // L: 1196 + var35 += var37; // L: 1197 + var38 += var40; // L: 1198 + } } } else { var5 = var4 <<= 14; // L: 1240 @@ -2042,10 +2042,10 @@ public class Rasterizer3D extends Rasterizer2D { } } // L: 983 - @ObfuscatedName("p") + @ObfuscatedName("e") @Export("Rasterizer3D_iDontKnow") static final void Rasterizer3D_iDontKnow(int[] var0, int[] var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8, int var9, int var10, int var11, int var12, int var13, int var14) { - if (field2260) { // L: 1461 + if (field2262) { // L: 1461 if (var6 > Rasterizer3D_clipWidth) { // L: 1462 var6 = Rasterizer3D_clipWidth; } @@ -2109,7 +2109,7 @@ public class Rasterizer3D extends Rasterizer2D { var17 >>= 3; // L: 1506 var8 <<= 3; // L: 1507 var15 = var7 >> 8; // L: 1508 - if (field2270) { // L: 1509 + if (field2260) { // L: 1509 if (var17 > 0) { // L: 1510 do { var3 = var1[(var2 >>> 26) + (var2 & 4032)]; // L: 1512 @@ -2304,7 +2304,7 @@ public class Rasterizer3D extends Rasterizer2D { var17 >>= 3; // L: 1681 var8 <<= 3; // L: 1682 var15 = var7 >> 8; // L: 1683 - if (field2270) { // L: 1684 + if (field2260) { // L: 1684 if (var17 > 0) { // L: 1685 do { var3 = var1[(var2 & 16256) + (var2 >>> 25)]; // L: 1687 @@ -2463,17 +2463,17 @@ public class Rasterizer3D extends Rasterizer2D { } } // L: 1819 - @ObfuscatedName("a") + @ObfuscatedName("g") @Export("drawTexturedTile") static final void drawTexturedTile(int var0, int var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8, int var9, int var10, int var11, int var12, int var13, int var14, int var15, int var16, int var17, int var18) { int[] var19 = Rasterizer3D_textureLoader.getTexturePixels(var18); // L: 1822 int var20; if (var19 == null) { // L: 1823 var20 = Rasterizer3D_textureLoader.getAverageTextureRGB(var18); // L: 1824 - method3824(var0, var1, var2, var3, var4, var5, method3887(var20, var6), method3887(var20, var7), method3887(var20, var8)); // L: 1825 + method3854(var0, var1, var2, var3, var4, var5, method3881(var20, var6), method3881(var20, var7), method3881(var20, var8)); // L: 1825 } else { Rasterizer3D_isLowDetailTexture = Rasterizer3D_textureLoader.isLowDetail(var18); // L: 1828 - field2270 = Rasterizer3D_textureLoader.vmethod4224(var18); // L: 1829 + field2260 = Rasterizer3D_textureLoader.vmethod4276(var18); // L: 1829 var20 = var4 - var3; // L: 1830 int var21 = var1 - var0; // L: 1831 int var22 = var5 - var3; // L: 1832 @@ -2545,41 +2545,7 @@ public class Rasterizer3D extends Rasterizer2D { var32 += var34 * var41; // L: 1880 var35 += var37 * var41; // L: 1881 var38 += var40 * var41; // L: 1882 - if (var0 != var1 && var28 < var26 || var0 == var1 && var28 > var27) { // L: 1883 - var2 -= var1; // L: 1884 - var1 -= var0; // L: 1885 - var0 = Rasterizer3D_rowOffsets[var0]; // L: 1886 - - while (true) { - --var1; // L: 1887 - if (var1 < 0) { - while (true) { - --var2; // L: 1897 - if (var2 < 0) { - return; // L: 1907 - } - - Rasterizer3D_textureAlpha(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var0, var5 >> 14, var4 >> 14, var6, var30, var32, var35, var38, var33, var36, var39); // L: 1898 - var5 += var28; // L: 1899 - var4 += var27; // L: 1900 - var6 += var31; // L: 1901 - var0 += Rasterizer2D.Rasterizer2D_width; // L: 1902 - var32 += var34; // L: 1903 - var35 += var37; // L: 1904 - var38 += var40; // L: 1905 - } - } - - Rasterizer3D_textureAlpha(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var0, var5 >> 14, var3 >> 14, var6, var30, var32, var35, var38, var33, var36, var39); // L: 1888 - var5 += var28; // L: 1889 - var3 += var26; // L: 1890 - var6 += var31; // L: 1891 - var0 += Rasterizer2D.Rasterizer2D_width; // L: 1892 - var32 += var34; // L: 1893 - var35 += var37; // L: 1894 - var38 += var40; // L: 1895 - } - } else { + if ((var0 == var1 || var28 >= var26) && (var0 != var1 || var28 <= var27)) { // L: 1883 var2 -= var1; // L: 1910 var1 -= var0; // L: 1911 var0 = Rasterizer3D_rowOffsets[var0]; // L: 1912 @@ -2613,6 +2579,40 @@ public class Rasterizer3D extends Rasterizer2D { var35 += var37; // L: 1920 var38 += var40; // L: 1921 } + } else { + var2 -= var1; // L: 1884 + var1 -= var0; // L: 1885 + var0 = Rasterizer3D_rowOffsets[var0]; // L: 1886 + + while (true) { + --var1; // L: 1887 + if (var1 < 0) { + while (true) { + --var2; // L: 1897 + if (var2 < 0) { + return; // L: 1907 + } + + Rasterizer3D_textureAlpha(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var0, var5 >> 14, var4 >> 14, var6, var30, var32, var35, var38, var33, var36, var39); // L: 1898 + var5 += var28; // L: 1899 + var4 += var27; // L: 1900 + var6 += var31; // L: 1901 + var0 += Rasterizer2D.Rasterizer2D_width; // L: 1902 + var32 += var34; // L: 1903 + var35 += var37; // L: 1904 + var38 += var40; // L: 1905 + } + } + + Rasterizer3D_textureAlpha(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var0, var5 >> 14, var3 >> 14, var6, var30, var32, var35, var38, var33, var36, var39); // L: 1888 + var5 += var28; // L: 1889 + var3 += var26; // L: 1890 + var6 += var31; // L: 1891 + var0 += Rasterizer2D.Rasterizer2D_width; // L: 1892 + var32 += var34; // L: 1893 + var35 += var37; // L: 1894 + var38 += var40; // L: 1895 + } } } else { var4 = var3 <<= 14; // L: 1937 @@ -2633,41 +2633,7 @@ public class Rasterizer3D extends Rasterizer2D { var32 += var34 * var41; // L: 1950 var35 += var37 * var41; // L: 1951 var38 += var40 * var41; // L: 1952 - if (var0 != var2 && var28 < var26 || var0 == var2 && var27 > var26) { // L: 1953 - var1 -= var2; // L: 1954 - var2 -= var0; // L: 1955 - var0 = Rasterizer3D_rowOffsets[var0]; // L: 1956 - - while (true) { - --var2; // L: 1957 - if (var2 < 0) { - while (true) { - --var1; // L: 1967 - if (var1 < 0) { - return; // L: 1977 - } - - Rasterizer3D_textureAlpha(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var0, var5 >> 14, var3 >> 14, var6, var30, var32, var35, var38, var33, var36, var39); // L: 1968 - var5 += var27; // L: 1969 - var3 += var26; // L: 1970 - var6 += var31; // L: 1971 - var0 += Rasterizer2D.Rasterizer2D_width; // L: 1972 - var32 += var34; // L: 1973 - var35 += var37; // L: 1974 - var38 += var40; // L: 1975 - } - } - - Rasterizer3D_textureAlpha(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var0, var4 >> 14, var3 >> 14, var6, var30, var32, var35, var38, var33, var36, var39); // L: 1958 - var4 += var28; // L: 1959 - var3 += var26; // L: 1960 - var6 += var31; // L: 1961 - var0 += Rasterizer2D.Rasterizer2D_width; // L: 1962 - var32 += var34; // L: 1963 - var35 += var37; // L: 1964 - var38 += var40; // L: 1965 - } - } else { + if ((var0 == var2 || var28 >= var26) && (var0 != var2 || var27 <= var26)) { // L: 1953 var1 -= var2; // L: 1980 var2 -= var0; // L: 1981 var0 = Rasterizer3D_rowOffsets[var0]; // L: 1982 @@ -2701,6 +2667,40 @@ public class Rasterizer3D extends Rasterizer2D { var35 += var37; // L: 1990 var38 += var40; // L: 1991 } + } else { + var1 -= var2; // L: 1954 + var2 -= var0; // L: 1955 + var0 = Rasterizer3D_rowOffsets[var0]; // L: 1956 + + while (true) { + --var2; // L: 1957 + if (var2 < 0) { + while (true) { + --var1; // L: 1967 + if (var1 < 0) { + return; // L: 1977 + } + + Rasterizer3D_textureAlpha(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var0, var5 >> 14, var3 >> 14, var6, var30, var32, var35, var38, var33, var36, var39); // L: 1968 + var5 += var27; // L: 1969 + var3 += var26; // L: 1970 + var6 += var31; // L: 1971 + var0 += Rasterizer2D.Rasterizer2D_width; // L: 1972 + var32 += var34; // L: 1973 + var35 += var37; // L: 1974 + var38 += var40; // L: 1975 + } + } + + Rasterizer3D_textureAlpha(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var0, var4 >> 14, var3 >> 14, var6, var30, var32, var35, var38, var33, var36, var39); // L: 1958 + var4 += var28; // L: 1959 + var3 += var26; // L: 1960 + var6 += var31; // L: 1961 + var0 += Rasterizer2D.Rasterizer2D_width; // L: 1962 + var32 += var34; // L: 1963 + var35 += var37; // L: 1964 + var38 += var40; // L: 1965 + } } } } @@ -2734,41 +2734,7 @@ public class Rasterizer3D extends Rasterizer2D { var32 += var34 * var41; // L: 2026 var35 += var37 * var41; // L: 2027 var38 += var40 * var41; // L: 2028 - if ((var2 == var1 || var26 >= var27) && (var2 != var1 || var26 <= var28)) { // L: 2029 - var0 -= var2; // L: 2056 - var2 -= var1; // L: 2057 - var1 = Rasterizer3D_rowOffsets[var1]; // L: 2058 - - while (true) { - --var2; // L: 2059 - if (var2 < 0) { - while (true) { - --var0; // L: 2069 - if (var0 < 0) { - return; // L: 2079 - } - - Rasterizer3D_textureAlpha(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var1, var5 >> 14, var3 >> 14, var7, var30, var32, var35, var38, var33, var36, var39); // L: 2070 - var3 += var26; // L: 2071 - var5 += var28; // L: 2072 - var7 += var31; // L: 2073 - var1 += Rasterizer2D.Rasterizer2D_width; // L: 2074 - var32 += var34; // L: 2075 - var35 += var37; // L: 2076 - var38 += var40; // L: 2077 - } - } - - Rasterizer3D_textureAlpha(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var1, var4 >> 14, var3 >> 14, var7, var30, var32, var35, var38, var33, var36, var39); // L: 2060 - var3 += var26; // L: 2061 - var4 += var27; // L: 2062 - var7 += var31; // L: 2063 - var1 += Rasterizer2D.Rasterizer2D_width; // L: 2064 - var32 += var34; // L: 2065 - var35 += var37; // L: 2066 - var38 += var40; // L: 2067 - } - } else { + if (var2 != var1 && var26 < var27 || var2 == var1 && var26 > var28) { // L: 2029 var0 -= var2; // L: 2030 var2 -= var1; // L: 2031 var1 = Rasterizer3D_rowOffsets[var1]; // L: 2032 @@ -2802,6 +2768,40 @@ public class Rasterizer3D extends Rasterizer2D { var35 += var37; // L: 2040 var38 += var40; // L: 2041 } + } else { + var0 -= var2; // L: 2056 + var2 -= var1; // L: 2057 + var1 = Rasterizer3D_rowOffsets[var1]; // L: 2058 + + while (true) { + --var2; // L: 2059 + if (var2 < 0) { + while (true) { + --var0; // L: 2069 + if (var0 < 0) { + return; // L: 2079 + } + + Rasterizer3D_textureAlpha(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var1, var5 >> 14, var3 >> 14, var7, var30, var32, var35, var38, var33, var36, var39); // L: 2070 + var3 += var26; // L: 2071 + var5 += var28; // L: 2072 + var7 += var31; // L: 2073 + var1 += Rasterizer2D.Rasterizer2D_width; // L: 2074 + var32 += var34; // L: 2075 + var35 += var37; // L: 2076 + var38 += var40; // L: 2077 + } + } + + Rasterizer3D_textureAlpha(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var1, var4 >> 14, var3 >> 14, var7, var30, var32, var35, var38, var33, var36, var39); // L: 2060 + var3 += var26; // L: 2061 + var4 += var27; // L: 2062 + var7 += var31; // L: 2063 + var1 += Rasterizer2D.Rasterizer2D_width; // L: 2064 + var32 += var34; // L: 2065 + var35 += var37; // L: 2066 + var38 += var40; // L: 2067 + } } } else { var5 = var4 <<= 14; // L: 2083 @@ -3085,10 +3085,10 @@ public class Rasterizer3D extends Rasterizer2D { } } // L: 1826 - @ObfuscatedName("e") + @ObfuscatedName("a") @Export("Rasterizer3D_textureAlpha") static final void Rasterizer3D_textureAlpha(int[] var0, int[] var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8, int var9, int var10, int var11, int var12, int var13, int var14) { - if (field2260) { // L: 2304 + if (field2262) { // L: 2304 if (var6 > Rasterizer3D_clipWidth) { // L: 2305 var6 = Rasterizer3D_clipWidth; } @@ -3141,7 +3141,7 @@ public class Rasterizer3D extends Rasterizer2D { var17 >>= 3; // L: 2346 var8 <<= 3; // L: 2347 var15 = var7 >> 8; // L: 2348 - if (field2270) { // L: 2350 + if (field2260) { // L: 2350 if (var17 > 0) { // L: 2351 do { var3 = var1[(var2 >>> 26) + (var2 & 4032)]; // L: 2353 @@ -3284,7 +3284,7 @@ public class Rasterizer3D extends Rasterizer2D { var17 >>= 3; // L: 2483 var8 <<= 3; // L: 2484 var15 = var7 >> 8; // L: 2485 - if (field2270) { // L: 2487 + if (field2260) { // L: 2487 if (var17 > 0) { // L: 2488 do { var3 = var1[(var2 & 16256) + (var2 >>> 25)]; // L: 2490 @@ -3401,8 +3401,8 @@ public class Rasterizer3D extends Rasterizer2D { } } // L: 2586 - @ObfuscatedName("d") - static final int method3887(int var0, int var1) { + @ObfuscatedName("k") + static final int method3881(int var0, int var1) { var1 = (var0 & 127) * var1 >> 7; // L: 2589 if (var1 < 2) { // L: 2590 var1 = 2; @@ -3413,33 +3413,33 @@ public class Rasterizer3D extends Rasterizer2D { return (var0 & 65408) + var1; // L: 2592 } - @ObfuscatedName("u") - static final int method3833(int var0, int var1, int var2, int var3) { + @ObfuscatedName("m") + static final int method3863(int var0, int var1, int var2, int var3) { return var0 * var2 + var3 * var1 >> 16; // L: 2596 } - @ObfuscatedName("m") - static final int method3834(int var0, int var1, int var2, int var3) { + @ObfuscatedName("x") + static final int method3864(int var0, int var1, int var2, int var3) { return var2 * var1 - var3 * var0 >> 16; // L: 2600 } - @ObfuscatedName("j") - static final int method3835(int var0, int var1, int var2, int var3) { + @ObfuscatedName("z") + static final int method3865(int var0, int var1, int var2, int var3) { return var0 * var2 - var3 * var1 >> 16; // L: 2604 } - @ObfuscatedName("f") - static final int method3890(int var0, int var1, int var2, int var3) { + @ObfuscatedName("w") + static final int method3866(int var0, int var1, int var2, int var3) { return var3 * var0 + var2 * var1 >> 16; // L: 2608 } - @ObfuscatedName("s") - static final int method3837(int var0, int var1, int var2, int var3) { + @ObfuscatedName("t") + static final int method3867(int var0, int var1, int var2, int var3) { return var0 * var2 + var3 * var1 >> 16; // L: 2612 } - @ObfuscatedName("y") - static final int method3842(int var0, int var1, int var2, int var3) { + @ObfuscatedName("h") + static final int method3897(int var0, int var1, int var2, int var3) { return var2 * var1 - var3 * var0 >> 16; // L: 2616 } } diff --git a/runescape-client/src/main/java/RawPcmStream.java b/runescape-client/src/main/java/RawPcmStream.java index d3b110b50e..3315c48c15 100644 --- a/runescape-client/src/main/java/RawPcmStream.java +++ b/runescape-client/src/main/java/RawPcmStream.java @@ -3,107 +3,107 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("bk") +@ObfuscatedName("bv") @Implements("RawPcmStream") public class RawPcmStream extends PcmStream { - @ObfuscatedName("h") - int field466; - @ObfuscatedName("c") - int field453; - @ObfuscatedName("o") - int field460; - @ObfuscatedName("g") - int field455; - @ObfuscatedName("l") - int field463; - @ObfuscatedName("z") - int field457; - @ObfuscatedName("t") - int field452; @ObfuscatedName("v") + int field480; + @ObfuscatedName("n") + int field479; + @ObfuscatedName("f") + int field481; + @ObfuscatedName("y") + int field478; + @ObfuscatedName("p") + int field488; + @ObfuscatedName("j") + int field483; + @ObfuscatedName("r") + int field484; + @ObfuscatedName("b") @Export("numLoops") int numLoops; - @ObfuscatedName("b") + @ObfuscatedName("d") @Export("start") int start; - @ObfuscatedName("q") + @ObfuscatedName("s") @Export("end") int end; - @ObfuscatedName("i") - boolean field462; - @ObfuscatedName("x") - int field454; - @ObfuscatedName("k") - int field464; - @ObfuscatedName("r") - int field465; - @ObfuscatedName("p") - int field461; + @ObfuscatedName("u") + boolean field482; + @ObfuscatedName("l") + int field489; + @ObfuscatedName("o") + int field490; + @ObfuscatedName("c") + int field491; + @ObfuscatedName("e") + int field492; @ObfuscatedSignature( - descriptor = "(Laf;III)V" + descriptor = "(Lau;III)V" ) RawPcmStream(RawSound var1, int var2, int var3, int var4) { super.sound = var1; // L: 51 this.start = var1.start; // L: 52 this.end = var1.end; // L: 53 - this.field462 = var1.field381; // L: 54 - this.field453 = var2; // L: 55 - this.field460 = var3; // L: 56 - this.field455 = var4; // L: 57 - this.field466 = 0; // L: 58 - this.method886(); // L: 59 + this.field482 = var1.field399; // L: 54 + this.field479 = var2; // L: 55 + this.field481 = var3; // L: 56 + this.field478 = var4; // L: 57 + this.field480 = 0; // L: 58 + this.method843(); // L: 59 } // L: 60 @ObfuscatedSignature( - descriptor = "(Laf;II)V" + descriptor = "(Lau;II)V" ) RawPcmStream(RawSound var1, int var2, int var3) { super.sound = var1; // L: 39 this.start = var1.start; // L: 40 this.end = var1.end; // L: 41 - this.field462 = var1.field381; // L: 42 - this.field453 = var2; // L: 43 - this.field460 = var3; // L: 44 - this.field455 = 8192; // L: 45 - this.field466 = 0; // L: 46 - this.method886(); // L: 47 + this.field482 = var1.field399; // L: 42 + this.field479 = var2; // L: 43 + this.field481 = var3; // L: 44 + this.field478 = 8192; // L: 45 + this.field480 = 0; // L: 46 + this.method843(); // L: 47 } // L: 48 - @ObfuscatedName("l") - void method886() { - this.field463 = this.field460; // L: 73 - this.field457 = method924(this.field460, this.field455); // L: 74 - this.field452 = method880(this.field460, this.field455); // L: 75 + @ObfuscatedName("p") + void method843() { + this.field488 = this.field481; // L: 73 + this.field483 = method892(this.field481, this.field478); // L: 74 + this.field484 = method949(this.field481, this.field478); // L: 75 } // L: 76 - @ObfuscatedName("z") + @ObfuscatedName("j") @ObfuscatedSignature( - descriptor = "()Lbt;" + descriptor = "()Lbm;" ) @Export("firstSubStream") protected PcmStream firstSubStream() { return null; // L: 200 } - @ObfuscatedName("t") + @ObfuscatedName("r") @ObfuscatedSignature( - descriptor = "()Lbt;" + descriptor = "()Lbm;" ) @Export("nextSubStream") protected PcmStream nextSubStream() { return null; // L: 204 } - @ObfuscatedName("v") - protected int vmethod4560() { - return this.field460 == 0 && this.field454 == 0 ? 0 : 1; // L: 208 209 + @ObfuscatedName("b") + protected int vmethod4610() { + return this.field481 == 0 && this.field489 == 0 ? 0 : 1; // L: 208 209 } - @ObfuscatedName("b") + @ObfuscatedName("d") @Export("fill") public synchronized void fill(int[] var1, int var2, int var3) { - if (this.field460 == 0 && this.field454 == 0) { // L: 213 + if (this.field481 == 0 && this.field489 == 0) { // L: 213 this.skip(var3); // L: 214 } else { RawSound var4 = (RawSound)super.sound; // L: 217 @@ -117,163 +117,163 @@ public class RawPcmStream extends PcmStream { int var9 = var2; // L: 223 var3 += var2; // L: 224 - if (this.field466 < 0) { // L: 225 - if (this.field453 <= 0) { // L: 226 - this.method917(); // L: 228 + if (this.field480 < 0) { // L: 225 + if (this.field479 <= 0) { // L: 226 + this.method852(); // L: 228 this.remove(); // L: 229 return; // L: 230 } - this.field466 = 0; + this.field480 = 0; } - if (this.field466 >= var7) { // L: 233 - if (this.field453 >= 0) { // L: 234 - this.method917(); // L: 236 + if (this.field480 >= var7) { // L: 233 + if (this.field479 >= 0) { // L: 234 + this.method852(); // L: 236 this.remove(); // L: 237 return; // L: 238 } - this.field466 = var7 - 1; + this.field480 = var7 - 1; } if (this.numLoops < 0) { // L: 241 - if (this.field462) { // L: 242 - if (this.field453 < 0) { // L: 243 - var9 = this.method909(var1, var2, var5, var3, var4.samples[this.start]); // L: 244 - if (this.field466 >= var5) { // L: 245 + if (this.field482) { // L: 242 + if (this.field479 < 0) { // L: 243 + var9 = this.method866(var1, var2, var5, var3, var4.samples[this.start]); // L: 244 + if (this.field480 >= var5) { // L: 245 return; } - this.field466 = var5 + var5 - 1 - this.field466; // L: 246 - this.field453 = -this.field453; // L: 247 + this.field480 = var5 + var5 - 1 - this.field480; // L: 246 + this.field479 = -this.field479; // L: 247 } while (true) { - var9 = this.method908(var1, var9, var6, var3, var4.samples[this.end - 1]); // L: 250 - if (this.field466 < var6) { // L: 251 + var9 = this.method865(var1, var9, var6, var3, var4.samples[this.end - 1]); // L: 250 + if (this.field480 < var6) { // L: 251 return; } - this.field466 = var6 + var6 - 1 - this.field466; // L: 252 - this.field453 = -this.field453; // L: 253 - var9 = this.method909(var1, var9, var5, var3, var4.samples[this.start]); // L: 254 - if (this.field466 >= var5) { // L: 255 + this.field480 = var6 + var6 - 1 - this.field480; // L: 252 + this.field479 = -this.field479; // L: 253 + var9 = this.method866(var1, var9, var5, var3, var4.samples[this.start]); // L: 254 + if (this.field480 >= var5) { // L: 255 return; } - this.field466 = var5 + var5 - 1 - this.field466; // L: 256 - this.field453 = -this.field453; // L: 257 + this.field480 = var5 + var5 - 1 - this.field480; // L: 256 + this.field479 = -this.field479; // L: 257 } - } else if (this.field453 < 0) { // L: 260 + } else if (this.field479 < 0) { // L: 260 while (true) { - var9 = this.method909(var1, var9, var5, var3, var4.samples[this.end - 1]); // L: 262 - if (this.field466 >= var5) { // L: 263 + var9 = this.method866(var1, var9, var5, var3, var4.samples[this.end - 1]); // L: 262 + if (this.field480 >= var5) { // L: 263 return; } - this.field466 = var6 - 1 - (var6 - 1 - this.field466) % var8; // L: 264 + this.field480 = var6 - 1 - (var6 - 1 - this.field480) % var8; // L: 264 } } else { while (true) { - var9 = this.method908(var1, var9, var6, var3, var4.samples[this.start]); // L: 269 - if (this.field466 < var6) { // L: 270 + var9 = this.method865(var1, var9, var6, var3, var4.samples[this.start]); // L: 269 + if (this.field480 < var6) { // L: 270 return; } - this.field466 = var5 + (this.field466 - var5) % var8; // L: 271 + this.field480 = var5 + (this.field480 - var5) % var8; // L: 271 } } } else { if (this.numLoops > 0) { // L: 275 - if (this.field462) { // L: 276 + if (this.field482) { // L: 276 label127: { - if (this.field453 < 0) { // L: 277 - var9 = this.method909(var1, var2, var5, var3, var4.samples[this.start]); // L: 278 - if (this.field466 >= var5) { // L: 279 + if (this.field479 < 0) { // L: 277 + var9 = this.method866(var1, var2, var5, var3, var4.samples[this.start]); // L: 278 + if (this.field480 >= var5) { // L: 279 return; } - this.field466 = var5 + var5 - 1 - this.field466; // L: 280 - this.field453 = -this.field453; // L: 281 + this.field480 = var5 + var5 - 1 - this.field480; // L: 280 + this.field479 = -this.field479; // L: 281 if (--this.numLoops == 0) { // L: 282 break label127; } } do { - var9 = this.method908(var1, var9, var6, var3, var4.samples[this.end - 1]); // L: 285 - if (this.field466 < var6) { // L: 286 + var9 = this.method865(var1, var9, var6, var3, var4.samples[this.end - 1]); // L: 285 + if (this.field480 < var6) { // L: 286 return; } - this.field466 = var6 + var6 - 1 - this.field466; // L: 287 - this.field453 = -this.field453; // L: 288 + this.field480 = var6 + var6 - 1 - this.field480; // L: 287 + this.field479 = -this.field479; // L: 288 if (--this.numLoops == 0) { // L: 289 break; } - var9 = this.method909(var1, var9, var5, var3, var4.samples[this.start]); // L: 290 - if (this.field466 >= var5) { // L: 291 + var9 = this.method866(var1, var9, var5, var3, var4.samples[this.start]); // L: 290 + if (this.field480 >= var5) { // L: 291 return; } - this.field466 = var5 + var5 - 1 - this.field466; // L: 292 - this.field453 = -this.field453; // L: 293 + this.field480 = var5 + var5 - 1 - this.field480; // L: 292 + this.field479 = -this.field479; // L: 293 } while(--this.numLoops != 0); // L: 294 } } else { int var10; - if (this.field453 < 0) { // L: 297 + if (this.field479 < 0) { // L: 297 while (true) { - var9 = this.method909(var1, var9, var5, var3, var4.samples[this.end - 1]); // L: 299 - if (this.field466 >= var5) { // L: 300 + var9 = this.method866(var1, var9, var5, var3, var4.samples[this.end - 1]); // L: 299 + if (this.field480 >= var5) { // L: 300 return; } - var10 = (var6 - 1 - this.field466) / var8; // L: 301 + var10 = (var6 - 1 - this.field480) / var8; // L: 301 if (var10 >= this.numLoops) { // L: 302 - this.field466 += var8 * this.numLoops; // L: 303 + this.field480 += var8 * this.numLoops; // L: 303 this.numLoops = 0; // L: 304 break; // L: 305 } - this.field466 += var8 * var10; // L: 307 + this.field480 += var8 * var10; // L: 307 this.numLoops -= var10; // L: 308 } } else { while (true) { - var9 = this.method908(var1, var9, var6, var3, var4.samples[this.start]); // L: 313 - if (this.field466 < var6) { // L: 314 + var9 = this.method865(var1, var9, var6, var3, var4.samples[this.start]); // L: 313 + if (this.field480 < var6) { // L: 314 return; } - var10 = (this.field466 - var5) / var8; // L: 315 + var10 = (this.field480 - var5) / var8; // L: 315 if (var10 >= this.numLoops) { // L: 316 - this.field466 -= var8 * this.numLoops; // L: 317 + this.field480 -= var8 * this.numLoops; // L: 317 this.numLoops = 0; // L: 318 break; // L: 319 } - this.field466 -= var8 * var10; // L: 321 + this.field480 -= var8 * var10; // L: 321 this.numLoops -= var10; // L: 322 } } } } - if (this.field453 < 0) { // L: 326 - this.method909(var1, var9, 0, var3, 0); // L: 327 - if (this.field466 < 0) { // L: 328 - this.field466 = -1; // L: 329 - this.method917(); // L: 330 + if (this.field479 < 0) { // L: 326 + this.method866(var1, var9, 0, var3, 0); // L: 327 + if (this.field480 < 0) { // L: 328 + this.field480 = -1; // L: 329 + this.method852(); // L: 330 this.remove(); // L: 331 } } else { - this.method908(var1, var9, var7, var3, 0); // L: 335 - if (this.field466 >= var7) { // L: 336 - this.field466 = var7; // L: 337 - this.method917(); // L: 338 + this.method865(var1, var9, var7, var3, 0); // L: 335 + if (this.field480 >= var7) { // L: 336 + this.field480 = var7; // L: 337 + this.method852(); // L: 338 this.remove(); // L: 339 } } @@ -282,33 +282,33 @@ public class RawPcmStream extends PcmStream { } } // L: 215 342 - @ObfuscatedName("q") + @ObfuscatedName("s") @Export("setNumLoops") public synchronized void setNumLoops(int var1) { this.numLoops = var1; // L: 79 } // L: 80 - @ObfuscatedName("i") + @ObfuscatedName("u") @Export("skip") public synchronized void skip(int var1) { - if (this.field454 > 0) { // L: 345 - if (var1 >= this.field454) { // L: 346 - if (this.field460 == Integer.MIN_VALUE) { // L: 347 - this.field460 = 0; // L: 348 - this.field452 = 0; // L: 349 - this.field457 = 0; // L: 350 - this.field463 = 0; // L: 351 + if (this.field489 > 0) { // L: 345 + if (var1 >= this.field489) { // L: 346 + if (this.field481 == Integer.MIN_VALUE) { // L: 347 + this.field481 = 0; // L: 348 + this.field484 = 0; // L: 349 + this.field483 = 0; // L: 350 + this.field488 = 0; // L: 351 this.remove(); // L: 352 - var1 = this.field454; // L: 353 + var1 = this.field489; // L: 353 } - this.field454 = 0; // L: 355 - this.method886(); // L: 356 + this.field489 = 0; // L: 355 + this.method843(); // L: 356 } else { - this.field463 += this.field464 * var1; // L: 359 - this.field457 += this.field465 * var1; // L: 360 - this.field452 += this.field461 * var1; // L: 361 - this.field454 -= var1; // L: 362 + this.field488 += this.field490 * var1; // L: 359 + this.field483 += this.field491 * var1; // L: 360 + this.field484 += this.field492 * var1; // L: 361 + this.field489 -= var1; // L: 362 } } @@ -321,130 +321,130 @@ public class RawPcmStream extends PcmStream { this.numLoops = 0; } - if (this.field466 < 0) { // L: 371 - if (this.field453 <= 0) { // L: 372 - this.method917(); // L: 374 + if (this.field480 < 0) { // L: 371 + if (this.field479 <= 0) { // L: 372 + this.method852(); // L: 374 this.remove(); // L: 375 return; // L: 376 } - this.field466 = 0; + this.field480 = 0; } - if (this.field466 >= var5) { // L: 379 - if (this.field453 >= 0) { // L: 380 - this.method917(); // L: 382 + if (this.field480 >= var5) { // L: 379 + if (this.field479 >= 0) { // L: 380 + this.method852(); // L: 382 this.remove(); // L: 383 return; // L: 384 } - this.field466 = var5 - 1; + this.field480 = var5 - 1; } - this.field466 += this.field453 * var1; // L: 387 + this.field480 += this.field479 * var1; // L: 387 if (this.numLoops < 0) { // L: 388 - if (!this.field462) { // L: 389 - if (this.field453 < 0) { // L: 404 - if (this.field466 >= var3) { // L: 405 + if (!this.field482) { // L: 389 + if (this.field479 < 0) { // L: 404 + if (this.field480 >= var3) { // L: 405 return; } - this.field466 = var4 - 1 - (var4 - 1 - this.field466) % var6; // L: 406 + this.field480 = var4 - 1 - (var4 - 1 - this.field480) % var6; // L: 406 } else { - if (this.field466 < var4) { // L: 409 + if (this.field480 < var4) { // L: 409 return; } - this.field466 = var3 + (this.field466 - var3) % var6; // L: 410 + this.field480 = var3 + (this.field480 - var3) % var6; // L: 410 } } else { - if (this.field453 < 0) { // L: 390 - if (this.field466 >= var3) { // L: 391 + if (this.field479 < 0) { // L: 390 + if (this.field480 >= var3) { // L: 391 return; } - this.field466 = var3 + var3 - 1 - this.field466; // L: 392 - this.field453 = -this.field453; // L: 393 + this.field480 = var3 + var3 - 1 - this.field480; // L: 392 + this.field479 = -this.field479; // L: 393 } - while (this.field466 >= var4) { // L: 396 - this.field466 = var4 + var4 - 1 - this.field466; // L: 397 - this.field453 = -this.field453; // L: 398 - if (this.field466 >= var3) { // L: 399 + while (this.field480 >= var4) { // L: 396 + this.field480 = var4 + var4 - 1 - this.field480; // L: 397 + this.field479 = -this.field479; // L: 398 + if (this.field480 >= var3) { // L: 399 return; } - this.field466 = var3 + var3 - 1 - this.field466; // L: 400 - this.field453 = -this.field453; // L: 401 + this.field480 = var3 + var3 - 1 - this.field480; // L: 400 + this.field479 = -this.field479; // L: 401 } } } else { if (this.numLoops > 0) { // L: 414 - if (this.field462) { // L: 415 + if (this.field482) { // L: 415 label129: { - if (this.field453 < 0) { // L: 416 - if (this.field466 >= var3) { // L: 417 + if (this.field479 < 0) { // L: 416 + if (this.field480 >= var3) { // L: 417 return; } - this.field466 = var3 + var3 - 1 - this.field466; // L: 418 - this.field453 = -this.field453; // L: 419 + this.field480 = var3 + var3 - 1 - this.field480; // L: 418 + this.field479 = -this.field479; // L: 419 if (--this.numLoops == 0) { // L: 420 break label129; } } do { - if (this.field466 < var4) { // L: 423 + if (this.field480 < var4) { // L: 423 return; } - this.field466 = var4 + var4 - 1 - this.field466; // L: 424 - this.field453 = -this.field453; // L: 425 + this.field480 = var4 + var4 - 1 - this.field480; // L: 424 + this.field479 = -this.field479; // L: 425 if (--this.numLoops == 0) { // L: 426 break; } - if (this.field466 >= var3) { // L: 427 + if (this.field480 >= var3) { // L: 427 return; } - this.field466 = var3 + var3 - 1 - this.field466; // L: 428 - this.field453 = -this.field453; // L: 429 + this.field480 = var3 + var3 - 1 - this.field480; // L: 428 + this.field479 = -this.field479; // L: 429 } while(--this.numLoops != 0); // L: 430 } } else { label161: { int var7; - if (this.field453 < 0) { // L: 433 - if (this.field466 >= var3) { // L: 434 + if (this.field479 < 0) { // L: 433 + if (this.field480 >= var3) { // L: 434 return; } - var7 = (var4 - 1 - this.field466) / var6; // L: 435 + var7 = (var4 - 1 - this.field480) / var6; // L: 435 if (var7 >= this.numLoops) { // L: 436 - this.field466 += var6 * this.numLoops; // L: 437 + this.field480 += var6 * this.numLoops; // L: 437 this.numLoops = 0; // L: 438 break label161; // L: 439 } - this.field466 += var6 * var7; // L: 441 + this.field480 += var6 * var7; // L: 441 this.numLoops -= var7; // L: 442 } else { - if (this.field466 < var4) { // L: 445 + if (this.field480 < var4) { // L: 445 return; } - var7 = (this.field466 - var3) / var6; // L: 446 + var7 = (this.field480 - var3) / var6; // L: 446 if (var7 >= this.numLoops) { // L: 447 - this.field466 -= var6 * this.numLoops; // L: 448 + this.field480 -= var6 * this.numLoops; // L: 448 this.numLoops = 0; // L: 449 break label161; // L: 450 } - this.field466 -= var6 * var7; // L: 452 + this.field480 -= var6 * var7; // L: 452 this.numLoops -= var7; // L: 453 } @@ -453,51 +453,51 @@ public class RawPcmStream extends PcmStream { } } - if (this.field453 < 0) { // L: 457 - if (this.field466 < 0) { // L: 458 - this.field466 = -1; // L: 459 - this.method917(); // L: 460 + if (this.field479 < 0) { // L: 457 + if (this.field480 < 0) { // L: 458 + this.field480 = -1; // L: 459 + this.method852(); // L: 460 this.remove(); // L: 461 } - } else if (this.field466 >= var5) { // L: 465 - this.field466 = var5; // L: 466 - this.method917(); // L: 467 + } else if (this.field480 >= var5) { // L: 465 + this.field480 = var5; // L: 466 + this.method852(); // L: 467 this.remove(); // L: 468 } } } // L: 412 471 - @ObfuscatedName("x") - public synchronized void method888(int var1) { - this.method890(var1 << 6, this.method892()); // L: 83 + @ObfuscatedName("l") + public synchronized void method845(int var1) { + this.method847(var1 << 6, this.method971()); // L: 83 } // L: 84 - @ObfuscatedName("k") - synchronized void method889(int var1) { - this.method890(var1, this.method892()); // L: 87 + @ObfuscatedName("o") + synchronized void method846(int var1) { + this.method847(var1, this.method971()); // L: 87 } // L: 88 - @ObfuscatedName("r") - synchronized void method890(int var1, int var2) { - this.field460 = var1; // L: 91 - this.field455 = var2; // L: 92 - this.field454 = 0; // L: 93 - this.method886(); // L: 94 + @ObfuscatedName("c") + synchronized void method847(int var1, int var2) { + this.field481 = var1; // L: 91 + this.field478 = var2; // L: 92 + this.field489 = 0; // L: 93 + this.method843(); // L: 94 } // L: 95 - @ObfuscatedName("p") - public synchronized int method891() { - return this.field460 == Integer.MIN_VALUE ? 0 : this.field460; // L: 98 + @ObfuscatedName("e") + public synchronized int method914() { + return this.field481 == Integer.MIN_VALUE ? 0 : this.field481; // L: 98 + } + + @ObfuscatedName("g") + public synchronized int method971() { + return this.field478 < 0 ? -1 : this.field478; // L: 102 } @ObfuscatedName("a") - public synchronized int method892() { - return this.field455 < 0 ? -1 : this.field455; // L: 102 - } - - @ObfuscatedName("e") - public synchronized void method893(int var1) { + public synchronized void method900(int var1) { int var2 = ((RawSound)super.sound).samples.length << 8; // L: 106 if (var1 < -1) { // L: 107 var1 = -1; @@ -507,267 +507,254 @@ public class RawPcmStream extends PcmStream { var1 = var2; } - this.field466 = var1; // L: 109 + this.field480 = var1; // L: 109 } // L: 110 - @ObfuscatedName("d") + @ObfuscatedName("k") @ObfuscatedSignature( descriptor = "(Z)V", garbageValue = "1" ) - public synchronized void method959() { - this.field453 = (this.field453 ^ this.field453 >> 31) + (this.field453 >>> 31); // L: 113 - this.field453 = -this.field453; // L: 114 + public synchronized void method888() { + this.field479 = (this.field479 ^ this.field479 >> 31) + (this.field479 >>> 31); // L: 113 + this.field479 = -this.field479; // L: 114 } // L: 115 - @ObfuscatedName("u") - void method917() { - if (this.field454 != 0) { // L: 118 - if (this.field460 == Integer.MIN_VALUE) { - this.field460 = 0; // L: 119 + @ObfuscatedName("m") + void method852() { + if (this.field489 != 0) { // L: 118 + if (this.field481 == Integer.MIN_VALUE) { + this.field481 = 0; // L: 119 } - this.field454 = 0; // L: 120 - this.method886(); // L: 121 + this.field489 = 0; // L: 120 + this.method843(); // L: 121 } } // L: 123 - @ObfuscatedName("m") - public synchronized void method896(int var1, int var2) { - this.method897(var1, var2, this.method892()); // L: 126 + @ObfuscatedName("x") + public synchronized void method853(int var1, int var2) { + this.method983(var1, var2, this.method971()); // L: 126 } // L: 127 - @ObfuscatedName("j") - public synchronized void method897(int var1, int var2, int var3) { + @ObfuscatedName("z") + public synchronized void method983(int var1, int var2, int var3) { if (var1 == 0) { // L: 130 - this.method890(var2, var3); // L: 131 + this.method847(var2, var3); // L: 131 } else { - int var4 = method924(var2, var3); // L: 134 - int var5 = method880(var2, var3); // L: 135 - if (var4 == this.field457 && var5 == this.field452) { // L: 136 - this.field454 = 0; // L: 137 + int var4 = method892(var2, var3); // L: 134 + int var5 = method949(var2, var3); // L: 135 + if (var4 == this.field483 && var5 == this.field484) { // L: 136 + this.field489 = 0; // L: 137 } else { - int var6 = var2 - this.field463; // L: 140 - if (this.field463 - var2 > var6) { // L: 141 - var6 = this.field463 - var2; + int var6 = var2 - this.field488; // L: 140 + if (this.field488 - var2 > var6) { // L: 141 + var6 = this.field488 - var2; } - if (var4 - this.field457 > var6) { // L: 142 - var6 = var4 - this.field457; + if (var4 - this.field483 > var6) { // L: 142 + var6 = var4 - this.field483; } - if (this.field457 - var4 > var6) { // L: 143 - var6 = this.field457 - var4; + if (this.field483 - var4 > var6) { // L: 143 + var6 = this.field483 - var4; } - if (var5 - this.field452 > var6) { - var6 = var5 - this.field452; // L: 144 + if (var5 - this.field484 > var6) { + var6 = var5 - this.field484; // L: 144 } - if (this.field452 - var5 > var6) { // L: 145 - var6 = this.field452 - var5; + if (this.field484 - var5 > var6) { // L: 145 + var6 = this.field484 - var5; } if (var1 > var6) { // L: 146 var1 = var6; } - this.field454 = var1; // L: 147 - this.field460 = var2; // L: 148 - this.field455 = var3; // L: 149 - this.field464 = (var2 - this.field463) / var1; // L: 150 - this.field465 = (var4 - this.field457) / var1; // L: 151 - this.field461 = (var5 - this.field452) / var1; // L: 152 + this.field489 = var1; // L: 147 + this.field481 = var2; // L: 148 + this.field478 = var3; // L: 149 + this.field490 = (var2 - this.field488) / var1; // L: 150 + this.field491 = (var4 - this.field483) / var1; // L: 151 + this.field492 = (var5 - this.field484) / var1; // L: 152 } } } // L: 132 138 153 - @ObfuscatedName("f") - public synchronized void method898(int var1) { + @ObfuscatedName("w") + public synchronized void method855(int var1) { if (var1 == 0) { // L: 156 - this.method889(0); // L: 157 + this.method846(0); // L: 157 this.remove(); // L: 158 - } else if (this.field457 == 0 && this.field452 == 0) { // L: 161 - this.field454 = 0; // L: 162 - this.field460 = 0; // L: 163 - this.field463 = 0; // L: 164 + } else if (this.field483 == 0 && this.field484 == 0) { // L: 161 + this.field489 = 0; // L: 162 + this.field481 = 0; // L: 163 + this.field488 = 0; // L: 164 this.remove(); // L: 165 } else { - int var2 = -this.field463; // L: 168 - if (this.field463 > var2) { // L: 169 - var2 = this.field463; + int var2 = -this.field488; // L: 168 + if (this.field488 > var2) { // L: 169 + var2 = this.field488; } - if (-this.field457 > var2) { // L: 170 - var2 = -this.field457; + if (-this.field483 > var2) { // L: 170 + var2 = -this.field483; } - if (this.field457 > var2) { // L: 171 - var2 = this.field457; + if (this.field483 > var2) { // L: 171 + var2 = this.field483; } - if (-this.field452 > var2) { // L: 172 - var2 = -this.field452; + if (-this.field484 > var2) { // L: 172 + var2 = -this.field484; } - if (this.field452 > var2) { // L: 173 - var2 = this.field452; + if (this.field484 > var2) { // L: 173 + var2 = this.field484; } if (var1 > var2) { // L: 174 var1 = var2; } - this.field454 = var1; // L: 175 - this.field460 = Integer.MIN_VALUE; // L: 176 - this.field464 = -this.field463 / var1; // L: 177 - this.field465 = -this.field457 / var1; // L: 178 - this.field461 = -this.field452 / var1; // L: 179 + this.field489 = var1; // L: 175 + this.field481 = Integer.MIN_VALUE; // L: 176 + this.field490 = -this.field488 / var1; // L: 177 + this.field491 = -this.field483 / var1; // L: 178 + this.field492 = -this.field484 / var1; // L: 179 } } // L: 159 166 180 - @ObfuscatedName("aw") - public synchronized void method899(int var1) { - if (this.field453 < 0) { // L: 183 - this.field453 = -var1; + @ObfuscatedName("t") + public synchronized void method959(int var1) { + if (this.field479 < 0) { // L: 183 + this.field479 = -var1; } else { - this.field453 = var1; // L: 184 + this.field479 = var1; // L: 184 } } // L: 185 - @ObfuscatedName("ap") - public synchronized int method935() { - return this.field453 < 0 ? -this.field453 : this.field453; // L: 188 + @ObfuscatedName("h") + public synchronized int method857() { + return this.field479 < 0 ? -this.field479 : this.field479; // L: 188 } - @ObfuscatedName("am") - public boolean method1004() { - return this.field466 < 0 || this.field466 >= ((RawSound)super.sound).samples.length << 8; // L: 192 + @ObfuscatedName("ag") + public boolean method848() { + return this.field480 < 0 || this.field480 >= ((RawSound)super.sound).samples.length << 8; // L: 192 } @ObfuscatedName("ax") - int vmethod1044() { - int var1 = this.field463 * 3 >> 6; // L: 31 - var1 = (var1 ^ var1 >> 31) + (var1 >>> 31); // L: 32 - if (this.numLoops == 0) { // L: 33 - var1 -= var1 * this.field466 / (((RawSound)super.sound).samples.length << 8); - } else if (this.numLoops >= 0) { - var1 -= var1 * this.start / ((RawSound)super.sound).samples.length; // L: 34 - } - - return var1 > 255 ? 255 : var1; // L: 35 + public boolean method859() { + return this.field489 != 0; // L: 196 } - @ObfuscatedName("ak") - public boolean method902() { - return this.field454 != 0; // L: 196 - } - - @ObfuscatedName("ay") - int method908(int[] var1, int var2, int var3, int var4, int var5) { + @ObfuscatedName("as") + int method865(int[] var1, int var2, int var3, int var4, int var5) { while (true) { - if (this.field454 > 0) { // L: 474 - int var6 = var2 + this.field454; // L: 475 + if (this.field489 > 0) { // L: 474 + int var6 = var2 + this.field489; // L: 475 if (var6 > var4) { // L: 476 var6 = var4; } - this.field454 += var2; // L: 477 - if (this.field453 == 256 && (this.field466 & 255) == 0) { // L: 478 - if (ApproximateRouteStrategy.PcmPlayer_stereo) { // L: 479 - var2 = method920(0, ((RawSound)super.sound).samples, var1, this.field466, var2, this.field457, this.field452, this.field465, this.field461, 0, var6, var3, this); + this.field489 += var2; // L: 477 + if (this.field479 == 256 && (this.field480 & 255) == 0) { // L: 478 + if (PcmPlayer.PcmPlayer_stereo) { // L: 479 + var2 = method877(0, ((RawSound)super.sound).samples, var1, this.field480, var2, this.field483, this.field484, this.field491, this.field492, 0, var6, var3, this); } else { - var2 = method919(((RawSound)super.sound).samples, var1, this.field466, var2, this.field463, this.field464, 0, var6, var3, this); // L: 480 + var2 = method876(((RawSound)super.sound).samples, var1, this.field480, var2, this.field488, this.field490, 0, var6, var3, this); // L: 480 } - } else if (ApproximateRouteStrategy.PcmPlayer_stereo) { // L: 483 - var2 = method936(0, 0, ((RawSound)super.sound).samples, var1, this.field466, var2, this.field457, this.field452, this.field465, this.field461, 0, var6, var3, this, this.field453, var5); + } else if (PcmPlayer.PcmPlayer_stereo) { // L: 483 + var2 = method962(0, 0, ((RawSound)super.sound).samples, var1, this.field480, var2, this.field483, this.field484, this.field491, this.field492, 0, var6, var3, this, this.field479, var5); } else { - var2 = method987(0, 0, ((RawSound)super.sound).samples, var1, this.field466, var2, this.field463, this.field464, 0, var6, var3, this, this.field453, var5); // L: 484 + var2 = method966(0, 0, ((RawSound)super.sound).samples, var1, this.field480, var2, this.field488, this.field490, 0, var6, var3, this, this.field479, var5); // L: 484 } - this.field454 -= var2; // L: 486 - if (this.field454 != 0) { // L: 487 + this.field489 -= var2; // L: 486 + if (this.field489 != 0) { // L: 487 return var2; } - if (!this.method910()) { // L: 488 + if (!this.method867()) { // L: 488 continue; } return var4; } - if (this.field453 == 256 && (this.field466 & 255) == 0) { // L: 490 - if (ApproximateRouteStrategy.PcmPlayer_stereo) { // L: 491 - return method912(0, ((RawSound)super.sound).samples, var1, this.field466, var2, this.field457, this.field452, 0, var4, var3, this); + if (this.field479 == 256 && (this.field480 & 255) == 0) { // L: 490 + if (PcmPlayer.PcmPlayer_stereo) { // L: 491 + return method869(0, ((RawSound)super.sound).samples, var1, this.field480, var2, this.field483, this.field484, 0, var4, var3, this); } - return method911(((RawSound)super.sound).samples, var1, this.field466, var2, this.field463, 0, var4, var3, this); // L: 492 + return method868(((RawSound)super.sound).samples, var1, this.field480, var2, this.field488, 0, var4, var3, this); // L: 492 } - if (ApproximateRouteStrategy.PcmPlayer_stereo) { // L: 495 - return method916(0, 0, ((RawSound)super.sound).samples, var1, this.field466, var2, this.field457, this.field452, 0, var4, var3, this, this.field453, var5); + if (PcmPlayer.PcmPlayer_stereo) { // L: 495 + return method873(0, 0, ((RawSound)super.sound).samples, var1, this.field480, var2, this.field483, this.field484, 0, var4, var3, this, this.field479, var5); } - return method915(0, 0, ((RawSound)super.sound).samples, var1, this.field466, var2, this.field463, 0, var4, var3, this, this.field453, var5); // L: 496 + return method872(0, 0, ((RawSound)super.sound).samples, var1, this.field480, var2, this.field488, 0, var4, var3, this, this.field479, var5); // L: 496 } } - @ObfuscatedName("ai") - int method909(int[] var1, int var2, int var3, int var4, int var5) { + @ObfuscatedName("av") + int method866(int[] var1, int var2, int var3, int var4, int var5) { while (true) { - if (this.field454 > 0) { // L: 501 - int var6 = var2 + this.field454; // L: 502 + if (this.field489 > 0) { // L: 501 + int var6 = var2 + this.field489; // L: 502 if (var6 > var4) { // L: 503 var6 = var4; } - this.field454 += var2; // L: 504 - if (this.field453 == -256 && (this.field466 & 255) == 0) { // L: 505 - if (ApproximateRouteStrategy.PcmPlayer_stereo) { // L: 506 - var2 = method914(0, ((RawSound)super.sound).samples, var1, this.field466, var2, this.field457, this.field452, this.field465, this.field461, 0, var6, var3, this); + this.field489 += var2; // L: 504 + if (this.field479 == -256 && (this.field480 & 255) == 0) { // L: 505 + if (PcmPlayer.PcmPlayer_stereo) { // L: 506 + var2 = method879(0, ((RawSound)super.sound).samples, var1, this.field480, var2, this.field483, this.field484, this.field491, this.field492, 0, var6, var3, this); } else { - var2 = method921(((RawSound)super.sound).samples, var1, this.field466, var2, this.field463, this.field464, 0, var6, var3, this); // L: 507 + var2 = method878(((RawSound)super.sound).samples, var1, this.field480, var2, this.field488, this.field490, 0, var6, var3, this); // L: 507 } - } else if (ApproximateRouteStrategy.PcmPlayer_stereo) { // L: 510 - var2 = method926(0, 0, ((RawSound)super.sound).samples, var1, this.field466, var2, this.field457, this.field452, this.field465, this.field461, 0, var6, var3, this, this.field453, var5); + } else if (PcmPlayer.PcmPlayer_stereo) { // L: 510 + var2 = method917(0, 0, ((RawSound)super.sound).samples, var1, this.field480, var2, this.field483, this.field484, this.field491, this.field492, 0, var6, var3, this, this.field479, var5); } else { - var2 = method925(0, 0, ((RawSound)super.sound).samples, var1, this.field466, var2, this.field463, this.field464, 0, var6, var3, this, this.field453, var5); // L: 511 + var2 = method856(0, 0, ((RawSound)super.sound).samples, var1, this.field480, var2, this.field488, this.field490, 0, var6, var3, this, this.field479, var5); // L: 511 } - this.field454 -= var2; // L: 513 - if (this.field454 != 0) { // L: 514 + this.field489 -= var2; // L: 513 + if (this.field489 != 0) { // L: 514 return var2; } - if (!this.method910()) { // L: 515 + if (!this.method867()) { // L: 515 continue; } return var4; } - if (this.field453 == -256 && (this.field466 & 255) == 0) { // L: 517 - if (ApproximateRouteStrategy.PcmPlayer_stereo) { // L: 518 - return method1013(0, ((RawSound)super.sound).samples, var1, this.field466, var2, this.field457, this.field452, 0, var4, var3, this); + if (this.field479 == -256 && (this.field480 & 255) == 0) { // L: 517 + if (PcmPlayer.PcmPlayer_stereo) { // L: 518 + return method871(0, ((RawSound)super.sound).samples, var1, this.field480, var2, this.field483, this.field484, 0, var4, var3, this); } - return method913(((RawSound)super.sound).samples, var1, this.field466, var2, this.field463, 0, var4, var3, this); // L: 519 + return method870(((RawSound)super.sound).samples, var1, this.field480, var2, this.field488, 0, var4, var3, this); // L: 519 } - if (ApproximateRouteStrategy.PcmPlayer_stereo) { // L: 522 - return method962(0, 0, ((RawSound)super.sound).samples, var1, this.field466, var2, this.field457, this.field452, 0, var4, var3, this, this.field453, var5); + if (PcmPlayer.PcmPlayer_stereo) { // L: 522 + return method875(0, 0, ((RawSound)super.sound).samples, var1, this.field480, var2, this.field483, this.field484, 0, var4, var3, this, this.field479, var5); } - return method968(0, 0, ((RawSound)super.sound).samples, var1, this.field466, var2, this.field463, 0, var4, var3, this, this.field453, var5); // L: 523 + return method840(0, 0, ((RawSound)super.sound).samples, var1, this.field480, var2, this.field488, 0, var4, var3, this, this.field479, var5); // L: 523 } } - @ObfuscatedName("aa") - boolean method910() { - int var1 = this.field460; // L: 528 + @ObfuscatedName("ac") + boolean method867() { + int var1 = this.field481; // L: 528 int var2; int var3; if (var1 == Integer.MIN_VALUE) { // L: 531 @@ -775,97 +762,110 @@ public class RawPcmStream extends PcmStream { var2 = 0; // L: 533 var1 = 0; // L: 534 } else { - var2 = method924(var1, this.field455); // L: 537 - var3 = method880(var1, this.field455); // L: 538 + var2 = method892(var1, this.field478); // L: 537 + var3 = method949(var1, this.field478); // L: 538 } - if (var1 == this.field463 && var2 == this.field457 && var3 == this.field452) { // L: 540 - if (this.field460 == Integer.MIN_VALUE) { // L: 570 - this.field460 = 0; // L: 571 - this.field452 = 0; // L: 572 - this.field457 = 0; // L: 573 - this.field463 = 0; // L: 574 + if (var1 == this.field488 && var2 == this.field483 && var3 == this.field484) { // L: 540 + if (this.field481 == Integer.MIN_VALUE) { // L: 570 + this.field481 = 0; // L: 571 + this.field484 = 0; // L: 572 + this.field483 = 0; // L: 573 + this.field488 = 0; // L: 574 this.remove(); // L: 575 return true; // L: 576 } else { - this.method886(); // L: 578 + this.method843(); // L: 578 return false; // L: 579 } } else { - if (this.field463 < var1) { // L: 541 - this.field464 = 1; // L: 542 - this.field454 = var1 - this.field463; // L: 543 - } else if (this.field463 > var1) { // L: 545 - this.field464 = -1; // L: 546 - this.field454 = this.field463 - var1; // L: 547 + if (this.field488 < var1) { // L: 541 + this.field490 = 1; // L: 542 + this.field489 = var1 - this.field488; // L: 543 + } else if (this.field488 > var1) { // L: 545 + this.field490 = -1; // L: 546 + this.field489 = this.field488 - var1; // L: 547 } else { - this.field464 = 0; // L: 549 + this.field490 = 0; // L: 549 } - if (this.field457 < var2) { // L: 550 - this.field465 = 1; // L: 551 - if (this.field454 == 0 || this.field454 > var2 - this.field457) { // L: 552 - this.field454 = var2 - this.field457; + if (this.field483 < var2) { // L: 550 + this.field491 = 1; // L: 551 + if (this.field489 == 0 || this.field489 > var2 - this.field483) { // L: 552 + this.field489 = var2 - this.field483; } - } else if (this.field457 > var2) { // L: 554 - this.field465 = -1; // L: 555 - if (this.field454 == 0 || this.field454 > this.field457 - var2) { // L: 556 - this.field454 = this.field457 - var2; + } else if (this.field483 > var2) { // L: 554 + this.field491 = -1; // L: 555 + if (this.field489 == 0 || this.field489 > this.field483 - var2) { // L: 556 + this.field489 = this.field483 - var2; } } else { - this.field465 = 0; // L: 558 + this.field491 = 0; // L: 558 } - if (this.field452 < var3) { // L: 559 - this.field461 = 1; // L: 560 - if (this.field454 == 0 || this.field454 > var3 - this.field452) { // L: 561 - this.field454 = var3 - this.field452; + if (this.field484 < var3) { // L: 559 + this.field492 = 1; // L: 560 + if (this.field489 == 0 || this.field489 > var3 - this.field484) { // L: 561 + this.field489 = var3 - this.field484; } - } else if (this.field452 > var3) { // L: 563 - this.field461 = -1; // L: 564 - if (this.field454 == 0 || this.field454 > this.field452 - var3) { // L: 565 - this.field454 = this.field452 - var3; + } else if (this.field484 > var3) { // L: 563 + this.field492 = -1; // L: 564 + if (this.field489 == 0 || this.field489 > this.field484 - var3) { // L: 565 + this.field489 = this.field484 - var3; } } else { - this.field461 = 0; // L: 567 + this.field492 = 0; // L: 567 } return false; // L: 568 } } - @ObfuscatedName("h") - static int method924(int var0, int var1) { + @ObfuscatedName("ah") + int vmethod987() { + int var1 = this.field488 * 3 >> 6; // L: 31 + var1 = (var1 ^ var1 >> 31) + (var1 >>> 31); // L: 32 + if (this.numLoops == 0) { // L: 33 + var1 -= var1 * this.field480 / (((RawSound)super.sound).samples.length << 8); + } else if (this.numLoops >= 0) { + var1 -= var1 * this.start / ((RawSound)super.sound).samples.length; // L: 34 + } + + return var1 > 255 ? 255 : var1; // L: 35 + } + + @ObfuscatedName("v") + static int method892(int var0, int var1) { return var1 < 0 ? var0 : (int)((double)var0 * Math.sqrt((double)(16384 - var1) * 1.220703125E-4D) + 0.5D); // L: 23 } - @ObfuscatedName("c") - static int method880(int var0, int var1) { + @ObfuscatedName("n") + static int method949(int var0, int var1) { return var1 < 0 ? -var0 : (int)((double)var0 * Math.sqrt((double)var1 * 1.220703125E-4D) + 0.5D); // L: 27 } - @ObfuscatedName("o") + @ObfuscatedName("f") @ObfuscatedSignature( - descriptor = "(Laf;II)Lbk;" + descriptor = "(Lau;II)Lbv;" ) @Export("createRawPcmStream") public static RawPcmStream createRawPcmStream(RawSound var0, int var1, int var2) { - return var0.samples != null && var0.samples.length != 0 ? new RawPcmStream(var0, (int)((long)var0.sampleRate * 256L * (long)var1 / (long)(PcmPlayer.field401 * 100)), var2 << 6) : null; // L: 63 64 + return var0.samples != null && var0.samples.length != 0 ? new RawPcmStream(var0, (int)((long)var0.sampleRate * 256L * (long)var1 / (long)(PcmPlayer.field428 * 100)), var2 << 6) : null; // L: 63 64 } - @ObfuscatedName("g") + @ObfuscatedName("y") @ObfuscatedSignature( - descriptor = "(Laf;III)Lbk;" + descriptor = "(Lau;III)Lbv;" ) - public static RawPcmStream method885(RawSound var0, int var1, int var2, int var3) { + public static RawPcmStream method842(RawSound var0, int var1, int var2, int var3) { return var0.samples != null && var0.samples.length != 0 ? new RawPcmStream(var0, var1, var2, var3) : null; // L: 68 69 } - @ObfuscatedName("au") + @ObfuscatedName("at") @ObfuscatedSignature( - descriptor = "([B[IIIIIIILbk;)I" + descriptor = "([B[IIIIIIILbv;)I" ) - static int method911(byte[] var0, int[] var1, int var2, int var3, int var4, int var5, int var6, int var7, RawPcmStream var8) { + static int method868(byte[] var0, int[] var1, int var2, int var3, int var4, int var5, int var6, int var7, RawPcmStream var8) { var2 >>= 8; // L: 583 var7 >>= 8; // L: 584 var4 <<= 2; // L: 585 @@ -888,15 +888,15 @@ public class RawPcmStream extends PcmStream { var10001 = var3++; // L: 596 } - var8.field466 = var2 << 8; // L: 598 + var8.field480 = var2 << 8; // L: 598 return var3; // L: 599 } - @ObfuscatedName("as") + @ObfuscatedName("ao") @ObfuscatedSignature( - descriptor = "(I[B[IIIIIIIILbk;)I" + descriptor = "(I[B[IIIIIIIILbv;)I" ) - static int method912(int var0, byte[] var1, int[] var2, int var3, int var4, int var5, int var6, int var7, int var8, int var9, RawPcmStream var10) { + static int method869(int var0, byte[] var1, int[] var2, int var3, int var4, int var5, int var6, int var7, int var8, int var9, RawPcmStream var10) { var3 >>= 8; // L: 603 var9 >>= 8; // L: 604 var5 <<= 2; // L: 605 @@ -939,15 +939,15 @@ public class RawPcmStream extends PcmStream { var10001 = var4++; } - var10.field466 = var3 << 8; // L: 631 + var10.field480 = var3 << 8; // L: 631 return var4 >> 1; // L: 632 } - @ObfuscatedName("ad") + @ObfuscatedName("aq") @ObfuscatedSignature( - descriptor = "([B[IIIIIIILbk;)I" + descriptor = "([B[IIIIIIILbv;)I" ) - static int method913(byte[] var0, int[] var1, int var2, int var3, int var4, int var5, int var6, int var7, RawPcmStream var8) { + static int method870(byte[] var0, int[] var1, int var2, int var3, int var4, int var5, int var6, int var7, RawPcmStream var8) { var2 >>= 8; // L: 636 var7 >>= 8; // L: 637 var4 <<= 2; // L: 638 @@ -970,15 +970,15 @@ public class RawPcmStream extends PcmStream { var10001 = var3++; // L: 649 } - var8.field466 = var2 << 8; // L: 651 + var8.field480 = var2 << 8; // L: 651 return var3; // L: 652 } - @ObfuscatedName("ac") + @ObfuscatedName("aw") @ObfuscatedSignature( - descriptor = "(I[B[IIIIIIIILbk;)I" + descriptor = "(I[B[IIIIIIIILbv;)I" ) - static int method1013(int var0, byte[] var1, int[] var2, int var3, int var4, int var5, int var6, int var7, int var8, int var9, RawPcmStream var10) { + static int method871(int var0, byte[] var1, int[] var2, int var3, int var4, int var5, int var6, int var7, int var8, int var9, RawPcmStream var10) { var3 >>= 8; // L: 656 var9 >>= 8; // L: 657 var5 <<= 2; // L: 658 @@ -1021,15 +1021,15 @@ public class RawPcmStream extends PcmStream { var10001 = var4++; } - var10.field466 = var3 << 8; // L: 684 + var10.field480 = var3 << 8; // L: 684 return var4 >> 1; // L: 685 } - @ObfuscatedName("az") + @ObfuscatedName("af") @ObfuscatedSignature( - descriptor = "(II[B[IIIIIIILbk;II)I" + descriptor = "(II[B[IIIIIIILbv;II)I" ) - static int method915(int var0, int var1, byte[] var2, int[] var3, int var4, int var5, int var6, int var7, int var8, int var9, RawPcmStream var10, int var11, int var12) { + static int method872(int var0, int var1, byte[] var2, int[] var3, int var4, int var5, int var6, int var7, int var8, int var9, RawPcmStream var10, int var11, int var12) { if (var11 == 0 || (var7 = var5 + (var11 + (var9 - var4) - 257) / var11) > var8) { // L: 689 var7 = var8; } @@ -1054,15 +1054,15 @@ public class RawPcmStream extends PcmStream { var3[var10001] += ((var13 << 8) + (var1 - var13) * (var4 & 255)) * var6 >> 6; // L: 700 } - var10.field466 = var4; // L: 703 + var10.field480 = var4; // L: 703 return var5; // L: 704 } - @ObfuscatedName("aq") + @ObfuscatedName("ak") @ObfuscatedSignature( - descriptor = "(II[B[IIIIIIIILbk;II)I" + descriptor = "(II[B[IIIIIIIILbv;II)I" ) - static int method916(int var0, int var1, byte[] var2, int[] var3, int var4, int var5, int var6, int var7, int var8, int var9, int var10, RawPcmStream var11, int var12, int var13) { + static int method873(int var0, int var1, byte[] var2, int[] var3, int var4, int var5, int var6, int var7, int var8, int var9, int var10, RawPcmStream var11, int var12, int var13) { if (var12 == 0 || (var8 = var5 + (var10 - var4 + var12 - 257) / var12) > var9) { // L: 708 var8 = var9; } @@ -1096,15 +1096,15 @@ public class RawPcmStream extends PcmStream { var3[var10001] += var0 * var7 >> 6; } - var11.field466 = var4; // L: 729 + var11.field480 = var4; // L: 729 return var5 >> 1; // L: 730 } - @ObfuscatedName("ab") + @ObfuscatedName("ay") @ObfuscatedSignature( - descriptor = "(II[B[IIIIIIILbk;II)I" + descriptor = "(II[B[IIIIIIILbv;II)I" ) - static int method968(int var0, int var1, byte[] var2, int[] var3, int var4, int var5, int var6, int var7, int var8, int var9, RawPcmStream var10, int var11, int var12) { + static int method840(int var0, int var1, byte[] var2, int[] var3, int var4, int var5, int var6, int var7, int var8, int var9, RawPcmStream var10, int var11, int var12) { if (var11 == 0 || (var7 = var5 + (var11 + (var9 + 256 - var4)) / var11) > var8) { // L: 734 var7 = var8; } @@ -1129,15 +1129,15 @@ public class RawPcmStream extends PcmStream { var3[var10001] += ((var0 << 8) + (var2[var4 >> 8] - var0) * (var4 & 255)) * var6 >> 6; // L: 745 } - var10.field466 = var4; // L: 748 + var10.field480 = var4; // L: 748 return var5; // L: 749 } - @ObfuscatedName("ar") + @ObfuscatedName("aa") @ObfuscatedSignature( - descriptor = "(II[B[IIIIIIIILbk;II)I" + descriptor = "(II[B[IIIIIIIILbv;II)I" ) - static int method962(int var0, int var1, byte[] var2, int[] var3, int var4, int var5, int var6, int var7, int var8, int var9, int var10, RawPcmStream var11, int var12, int var13) { + static int method875(int var0, int var1, byte[] var2, int[] var3, int var4, int var5, int var6, int var7, int var8, int var9, int var10, RawPcmStream var11, int var12, int var13) { if (var12 == 0 || (var8 = var5 + (var10 + 256 - var4 + var12) / var12) > var9) { // L: 753 var8 = var9; } @@ -1169,15 +1169,15 @@ public class RawPcmStream extends PcmStream { var3[var10001] += var0 * var7 >> 6; } - var11.field466 = var4; // L: 773 + var11.field480 = var4; // L: 773 return var5 >> 1; // L: 774 } - @ObfuscatedName("ah") + @ObfuscatedName("au") @ObfuscatedSignature( - descriptor = "([B[IIIIIIIILbk;)I" + descriptor = "([B[IIIIIIIILbv;)I" ) - static int method919(byte[] var0, int[] var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8, RawPcmStream var9) { + static int method876(byte[] var0, int[] var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8, RawPcmStream var9) { var2 >>= 8; // L: 778 var8 >>= 8; // L: 779 var4 <<= 2; // L: 780 @@ -1186,8 +1186,8 @@ public class RawPcmStream extends PcmStream { var6 = var7; } - var9.field457 += var9.field465 * (var6 - var3); // L: 783 - var9.field452 += var9.field461 * (var6 - var3); // L: 784 + var9.field483 += var9.field491 * (var6 - var3); // L: 783 + var9.field484 += var9.field492 * (var6 - var3); // L: 784 int var10001; for (var6 -= 3; var3 < var6; var4 += var5) { // L: 785 786 794 @@ -1209,16 +1209,16 @@ public class RawPcmStream extends PcmStream { var1[var10001] += var0[var2++] * var4; } - var9.field463 = var4 >> 2; // L: 801 - var9.field466 = var2 << 8; // L: 802 + var9.field488 = var4 >> 2; // L: 801 + var9.field480 = var2 << 8; // L: 802 return var3; // L: 803 } - @ObfuscatedName("af") + @ObfuscatedName("an") @ObfuscatedSignature( - descriptor = "(I[B[IIIIIIIIIILbk;)I" + descriptor = "(I[B[IIIIIIIIIILbv;)I" ) - static int method920(int var0, byte[] var1, int[] var2, int var3, int var4, int var5, int var6, int var7, int var8, int var9, int var10, int var11, RawPcmStream var12) { + static int method877(int var0, byte[] var1, int[] var2, int var3, int var4, int var5, int var6, int var7, int var8, int var9, int var10, int var11, RawPcmStream var12) { var3 >>= 8; // L: 807 var11 >>= 8; // L: 808 var5 <<= 2; // L: 809 @@ -1229,7 +1229,7 @@ public class RawPcmStream extends PcmStream { var9 = var10; } - var12.field463 += var12.field464 * (var9 - var4); // L: 814 + var12.field488 += var12.field490 * (var9 - var4); // L: 814 var4 <<= 1; // L: 815 var9 <<= 1; // L: 816 @@ -1274,17 +1274,17 @@ public class RawPcmStream extends PcmStream { var2[var10001] += var13 * var6; } - var12.field457 = var5 >> 2; // L: 848 - var12.field452 = var6 >> 2; // L: 849 - var12.field466 = var3 << 8; // L: 850 + var12.field483 = var5 >> 2; // L: 848 + var12.field484 = var6 >> 2; // L: 849 + var12.field480 = var3 << 8; // L: 850 return var4 >> 1; // L: 851 } - @ObfuscatedName("an") + @ObfuscatedName("bd") @ObfuscatedSignature( - descriptor = "([B[IIIIIIIILbk;)I" + descriptor = "([B[IIIIIIIILbv;)I" ) - static int method921(byte[] var0, int[] var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8, RawPcmStream var9) { + static int method878(byte[] var0, int[] var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8, RawPcmStream var9) { var2 >>= 8; // L: 855 var8 >>= 8; // L: 856 var4 <<= 2; // L: 857 @@ -1293,8 +1293,8 @@ public class RawPcmStream extends PcmStream { var6 = var7; } - var9.field457 += var9.field465 * (var6 - var3); // L: 860 - var9.field452 += var9.field461 * (var6 - var3); // L: 861 + var9.field483 += var9.field491 * (var6 - var3); // L: 860 + var9.field484 += var9.field492 * (var6 - var3); // L: 861 int var10001; for (var6 -= 3; var3 < var6; var4 += var5) { // L: 862 863 871 @@ -1316,16 +1316,16 @@ public class RawPcmStream extends PcmStream { var1[var10001] += var0[var2--] * var4; } - var9.field463 = var4 >> 2; // L: 878 - var9.field466 = var2 << 8; // L: 879 + var9.field488 = var4 >> 2; // L: 878 + var9.field480 = var2 << 8; // L: 879 return var3; // L: 880 } - @ObfuscatedName("bd") + @ObfuscatedName("bt") @ObfuscatedSignature( - descriptor = "(I[B[IIIIIIIIIILbk;)I" + descriptor = "(I[B[IIIIIIIIIILbv;)I" ) - static int method914(int var0, byte[] var1, int[] var2, int var3, int var4, int var5, int var6, int var7, int var8, int var9, int var10, int var11, RawPcmStream var12) { + static int method879(int var0, byte[] var1, int[] var2, int var3, int var4, int var5, int var6, int var7, int var8, int var9, int var10, int var11, RawPcmStream var12) { var3 >>= 8; // L: 884 var11 >>= 8; // L: 885 var5 <<= 2; // L: 886 @@ -1336,7 +1336,7 @@ public class RawPcmStream extends PcmStream { var9 = var10; } - var12.field463 += var12.field464 * (var9 - var4); // L: 891 + var12.field488 += var12.field490 * (var9 - var4); // L: 891 var4 <<= 1; // L: 892 var9 <<= 1; // L: 893 @@ -1381,19 +1381,19 @@ public class RawPcmStream extends PcmStream { var2[var10001] += var13 * var6; } - var12.field457 = var5 >> 2; // L: 925 - var12.field452 = var6 >> 2; // L: 926 - var12.field466 = var3 << 8; // L: 927 + var12.field483 = var5 >> 2; // L: 925 + var12.field484 = var6 >> 2; // L: 926 + var12.field480 = var3 << 8; // L: 927 return var4 >> 1; // L: 928 } - @ObfuscatedName("bw") + @ObfuscatedName("bq") @ObfuscatedSignature( - descriptor = "(II[B[IIIIIIIILbk;II)I" + descriptor = "(II[B[IIIIIIIILbv;II)I" ) - static int method987(int var0, int var1, byte[] var2, int[] var3, int var4, int var5, int var6, int var7, int var8, int var9, int var10, RawPcmStream var11, int var12, int var13) { - var11.field457 -= var11.field465 * var5; // L: 932 - var11.field452 -= var11.field461 * var5; // L: 933 + static int method966(int var0, int var1, byte[] var2, int[] var3, int var4, int var5, int var6, int var7, int var8, int var9, int var10, RawPcmStream var11, int var12, int var13) { + var11.field483 -= var11.field491 * var5; // L: 932 + var11.field484 -= var11.field492 * var5; // L: 933 if (var12 == 0 || (var8 = var5 + (var10 - var4 + var12 - 257) / var12) > var9) { // L: 934 var8 = var9; } @@ -1420,19 +1420,19 @@ public class RawPcmStream extends PcmStream { var6 += var7; // L: 947 } - var11.field457 += var11.field465 * var5; // L: 950 - var11.field452 += var11.field461 * var5; // L: 951 - var11.field463 = var6; // L: 952 - var11.field466 = var4; // L: 953 + var11.field483 += var11.field491 * var5; // L: 950 + var11.field484 += var11.field492 * var5; // L: 951 + var11.field488 = var6; // L: 952 + var11.field480 = var4; // L: 953 return var5; // L: 954 } - @ObfuscatedName("bf") + @ObfuscatedName("bu") @ObfuscatedSignature( - descriptor = "(II[B[IIIIIIIIIILbk;II)I" + descriptor = "(II[B[IIIIIIIIIILbv;II)I" ) - static int method936(int var0, int var1, byte[] var2, int[] var3, int var4, int var5, int var6, int var7, int var8, int var9, int var10, int var11, int var12, RawPcmStream var13, int var14, int var15) { - var13.field463 -= var5 * var13.field464; // L: 958 + static int method962(int var0, int var1, byte[] var2, int[] var3, int var4, int var5, int var6, int var7, int var8, int var9, int var10, int var11, int var12, RawPcmStream var13, int var14, int var15) { + var13.field488 -= var5 * var13.field490; // L: 958 if (var14 == 0 || (var10 = var5 + (var12 - var4 + var14 - 257) / var14) > var11) { // L: 959 var10 = var11; } @@ -1471,20 +1471,20 @@ public class RawPcmStream extends PcmStream { } var5 >>= 1; // L: 984 - var13.field463 += var13.field464 * var5; // L: 985 - var13.field457 = var6; // L: 986 - var13.field452 = var7; // L: 987 - var13.field466 = var4; // L: 988 + var13.field488 += var13.field490 * var5; // L: 985 + var13.field483 = var6; // L: 986 + var13.field484 = var7; // L: 987 + var13.field480 = var4; // L: 988 return var5; // L: 989 } - @ObfuscatedName("bu") + @ObfuscatedName("bl") @ObfuscatedSignature( - descriptor = "(II[B[IIIIIIIILbk;II)I" + descriptor = "(II[B[IIIIIIIILbv;II)I" ) - static int method925(int var0, int var1, byte[] var2, int[] var3, int var4, int var5, int var6, int var7, int var8, int var9, int var10, RawPcmStream var11, int var12, int var13) { - var11.field457 -= var11.field465 * var5; // L: 993 - var11.field452 -= var11.field461 * var5; // L: 994 + static int method856(int var0, int var1, byte[] var2, int[] var3, int var4, int var5, int var6, int var7, int var8, int var9, int var10, RawPcmStream var11, int var12, int var13) { + var11.field483 -= var11.field491 * var5; // L: 993 + var11.field484 -= var11.field492 * var5; // L: 994 if (var12 == 0 || (var8 = var5 + (var10 + 256 - var4 + var12) / var12) > var9) { // L: 995 var8 = var9; } @@ -1511,19 +1511,19 @@ public class RawPcmStream extends PcmStream { var6 += var7; // L: 1008 } - var11.field457 += var11.field465 * var5; // L: 1011 - var11.field452 += var11.field461 * var5; // L: 1012 - var11.field463 = var6; // L: 1013 - var11.field466 = var4; // L: 1014 + var11.field483 += var11.field491 * var5; // L: 1011 + var11.field484 += var11.field492 * var5; // L: 1012 + var11.field488 = var6; // L: 1013 + var11.field480 = var4; // L: 1014 return var5; // L: 1015 } - @ObfuscatedName("bb") + @ObfuscatedName("bv") @ObfuscatedSignature( - descriptor = "(II[B[IIIIIIIIIILbk;II)I" + descriptor = "(II[B[IIIIIIIIIILbv;II)I" ) - static int method926(int var0, int var1, byte[] var2, int[] var3, int var4, int var5, int var6, int var7, int var8, int var9, int var10, int var11, int var12, RawPcmStream var13, int var14, int var15) { - var13.field463 -= var5 * var13.field464; // L: 1019 + static int method917(int var0, int var1, byte[] var2, int[] var3, int var4, int var5, int var6, int var7, int var8, int var9, int var10, int var11, int var12, RawPcmStream var13, int var14, int var15) { + var13.field488 -= var5 * var13.field490; // L: 1019 if (var14 == 0 || (var10 = var5 + (var12 + 256 - var4 + var14) / var14) > var11) { // L: 1020 var10 = var11; } @@ -1560,10 +1560,10 @@ public class RawPcmStream extends PcmStream { } var5 >>= 1; // L: 1044 - var13.field463 += var13.field464 * var5; // L: 1045 - var13.field457 = var6; // L: 1046 - var13.field452 = var7; // L: 1047 - var13.field466 = var4; // L: 1048 + var13.field488 += var13.field490 * var5; // L: 1045 + var13.field483 = var6; // L: 1046 + var13.field484 = var7; // L: 1047 + var13.field480 = var4; // L: 1048 return var5; // L: 1049 } } diff --git a/runescape-client/src/main/java/RawSound.java b/runescape-client/src/main/java/RawSound.java index 890ed5dd60..136ff8d2ab 100644 --- a/runescape-client/src/main/java/RawSound.java +++ b/runescape-client/src/main/java/RawSound.java @@ -3,23 +3,23 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("af") +@ObfuscatedName("au") @Implements("RawSound") public class RawSound extends AbstractSound { - @ObfuscatedName("h") + @ObfuscatedName("v") @Export("sampleRate") public int sampleRate; - @ObfuscatedName("c") + @ObfuscatedName("n") @Export("samples") public byte[] samples; - @ObfuscatedName("o") + @ObfuscatedName("f") @Export("start") public int start; - @ObfuscatedName("g") + @ObfuscatedName("y") @Export("end") int end; - @ObfuscatedName("l") - public boolean field381; + @ObfuscatedName("p") + public boolean field399; RawSound(int var1, byte[] var2, int var3, int var4) { this.sampleRate = var1; // L: 13 @@ -33,12 +33,12 @@ public class RawSound extends AbstractSound { this.samples = var2; // L: 21 this.start = var3; // L: 22 this.end = var4; // L: 23 - this.field381 = var5; // L: 24 + this.field399 = var5; // L: 24 } // L: 25 - @ObfuscatedName("h") + @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "(Lbg;)Laf;" + descriptor = "(Lbe;)Lau;" ) @Export("resample") public RawSound resample(Decimator var1) { diff --git a/runescape-client/src/main/java/ReflectionCheck.java b/runescape-client/src/main/java/ReflectionCheck.java index 4fba99a0cd..140205fe39 100644 --- a/runescape-client/src/main/java/ReflectionCheck.java +++ b/runescape-client/src/main/java/ReflectionCheck.java @@ -6,104 +6,147 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("bs") +@ObfuscatedName("bo") @Implements("ReflectionCheck") public class ReflectionCheck extends Node { - @ObfuscatedName("rp") + @ObfuscatedName("q") @ObfuscatedGetter( - intValue = -356398607 + intValue = -1538307343 ) - static int field580; - @ObfuscatedName("h") + @Export("canvasHeight") + public static int canvasHeight; + @ObfuscatedName("lz") + @ObfuscatedSignature( + descriptor = "Lcp;" + ) + @Export("tempMenuAction") + static MenuAction tempMenuAction; + @ObfuscatedName("ld") + @ObfuscatedSignature( + descriptor = "Lio;" + ) + static Widget field609; + @ObfuscatedName("v") @ObfuscatedGetter( - intValue = -1554578149 + intValue = -848582505 ) @Export("id") int id; - @ObfuscatedName("c") + @ObfuscatedName("n") @ObfuscatedGetter( - intValue = 1363104517 + intValue = -637285787 ) @Export("size") int size; - @ObfuscatedName("o") - @Export("operations") - int[] operations; - @ObfuscatedName("g") - @Export("creationErrors") - int[] creationErrors; - @ObfuscatedName("l") - @Export("fields") - Field[] fields; - @ObfuscatedName("z") + @ObfuscatedName("f") @Export("intReplaceValues") int[] intReplaceValues; - @ObfuscatedName("t") + @ObfuscatedName("y") + @Export("operations") + int[] operations; + @ObfuscatedName("p") + @Export("creationErrors") + int[] creationErrors; + @ObfuscatedName("j") + @Export("fields") + Field[] fields; + @ObfuscatedName("r") @Export("methods") Method[] methods; - @ObfuscatedName("v") + @ObfuscatedName("b") @Export("arguments") byte[][][] arguments; ReflectionCheck() { - } + } // L: 17 - @ObfuscatedName("h") + @ObfuscatedName("in") @ObfuscatedSignature( - descriptor = "(III)I", - garbageValue = "-491303444" + descriptor = "(III)V", + garbageValue = "-372153509" ) - static int method1158(int var0, int var1) { - FloorOverlayDefinition var2 = WorldMapSection0.method3534(var0); // L: 15 - if (var2 == null) { // L: 16 - return var1; // L: 17 - } else if (var2.secondaryRgb >= 0) { // L: 19 - return var2.secondaryRgb | -16777216; // L: 20 - } else { - int var3; - if (var2.texture >= 0) { // L: 22 - var3 = AbstractUserComparator.method5592(Rasterizer3D.Rasterizer3D_textureLoader.getAverageTextureRGB(var2.texture), 96); // L: 23 - return Rasterizer3D.Rasterizer3D_colorPalette[var3] | -16777216; // L: 24 - } else if (var2.primaryRgb == 16711935) { // L: 26 - return var1; // L: 27 - } else { - var3 = class374.method6359(var2.hue, var2.saturation, var2.lightness); // L: 30 - int var4 = AbstractUserComparator.method5592(var3, 96); // L: 31 - return Rasterizer3D.Rasterizer3D_colorPalette[var4] | -16777216; // L: 32 + static void method1126(int var0, int var1) { + int var2 = Widget.fontBold12.stringWidth("Choose Option"); // L: 7744 + + int var3; + int var4; + for (var3 = 0; var3 < Client.menuOptionsCount; ++var3) { // L: 7745 + var4 = Widget.fontBold12.stringWidth(MouseRecorder.method2098(var3)); // L: 7746 + if (var4 > var2) { // L: 7747 + var2 = var4; } } - } - @ObfuscatedName("h") - @ObfuscatedSignature( - descriptor = "(IIIB)I", - garbageValue = "54" - ) - public static int method1159(int var0, int var1, int var2) { - var2 &= 3; // L: 9 - if (var2 == 0) { // L: 10 - return var1; - } else if (var2 == 1) { // L: 11 - return 7 - var0; - } else { - return var2 == 2 ? 7 - var1 : var0; // L: 12 + var2 += 8; // L: 7749 + var3 = Client.menuOptionsCount * 15 + 22; // L: 7750 + var4 = var0 - var2 / 2; // L: 7751 + if (var2 + var4 > class32.canvasWidth) { // L: 7752 + var4 = class32.canvasWidth - var2; } - } - @ObfuscatedName("l") + if (var4 < 0) { // L: 7753 + var4 = 0; + } + + int var5 = var1; // L: 7754 + if (var1 + var3 > canvasHeight) { // L: 7755 + var5 = canvasHeight - var3; + } + + if (var5 < 0) { // L: 7756 + var5 = 0; + } + + class14.menuX = var4; // L: 7757 + class243.menuY = var5; // L: 7758 + class29.menuWidth = var2; // L: 7759 + class24.menuHeight = Client.menuOptionsCount * 15 + 22; // L: 7760 + } // L: 7761 + + @ObfuscatedName("jr") @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "-1090752465" + descriptor = "([Lio;II)V", + garbageValue = "2064427541" ) - static void method1157() { - if (Login.Login_username == null || Login.Login_username.length() <= 0) { // L: 233 - if (class12.clientPreferences.rememberedUsername != null) { // L: 234 - Login.Login_username = class12.clientPreferences.rememberedUsername; // L: 235 - Client.Login_isUsernameRemembered = true; // L: 236 - } else { - Client.Login_isUsernameRemembered = false; // L: 238 + @Export("runComponentCloseListeners") + static final void runComponentCloseListeners(Widget[] var0, int var1) { + for (int var2 = 0; var2 < var0.length; ++var2) { // L: 10664 + Widget var3 = var0[var2]; // L: 10665 + if (var3 != null) { // L: 10666 + if (var3.type == 0) { // L: 10667 + if (var3.children != null) { // L: 10668 + runComponentCloseListeners(var3.children, var1); + } + + InterfaceParent var4 = (InterfaceParent)Client.interfaceParents.get((long)var3.id); // L: 10669 + if (var4 != null) { // L: 10670 + Login.runIntfCloseListeners(var4.group, var1); + } + } + + ScriptEvent var5; + if (var1 == 0 && var3.onDialogAbort != null) { // L: 10672 + var5 = new ScriptEvent(); // L: 10673 + var5.widget = var3; // L: 10674 + var5.args = var3.onDialogAbort; // L: 10675 + PacketWriter.runScriptEvent(var5); // L: 10676 + } + + if (var1 == 1 && var3.onSubChange != null) { // L: 10678 + if (var3.childIndex >= 0) { // L: 10679 + Widget var6 = Frames.getWidget(var3.id); // L: 10680 + if (var6 == null || var6.children == null || var3.childIndex >= var6.children.length || var3 != var6.children[var3.childIndex]) { // L: 10681 + continue; + } + } + + var5 = new ScriptEvent(); // L: 10685 + var5.widget = var3; // L: 10686 + var5.args = var3.onSubChange; // L: 10687 + PacketWriter.runScriptEvent(var5); // L: 10688 + } } - } - } // L: 239 + + } // L: 10691 } diff --git a/runescape-client/src/main/java/Renderable.java b/runescape-client/src/main/java/Renderable.java index 9f97b07a3b..4531421587 100644 --- a/runescape-client/src/main/java/Renderable.java +++ b/runescape-client/src/main/java/Renderable.java @@ -4,12 +4,12 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ge") +@ObfuscatedName("gl") @Implements("Renderable") public abstract class Renderable extends DualNode { - @ObfuscatedName("co") + @ObfuscatedName("cj") @ObfuscatedGetter( - intValue = -942600749 + intValue = 267422413 ) @Export("height") public int height; @@ -18,17 +18,17 @@ public abstract class Renderable extends DualNode { this.height = 1000; // L: 6 } // L: 8 - @ObfuscatedName("c") + @ObfuscatedName("n") @ObfuscatedSignature( - descriptor = "(I)Lgj;", - garbageValue = "-220627570" + descriptor = "(B)Lgr;", + garbageValue = "-76" ) @Export("getModel") protected Model getModel() { return null; // L: 19 } - @ObfuscatedName("ci") + @ObfuscatedName("ct") @Export("draw") void draw(int var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8, long var9) { Model var11 = this.getModel(); // L: 11 @@ -38,88 +38,4 @@ public abstract class Renderable extends DualNode { } } // L: 16 - - @ObfuscatedName("c") - @ObfuscatedSignature( - descriptor = "(Ljava/lang/Object;ZI)[B", - garbageValue = "-2056798771" - ) - public static byte[] method4079(Object var0, boolean var1) { - if (var0 == null) { // L: 21 - return null; - } else if (var0 instanceof byte[]) { // L: 22 - byte[] var3 = (byte[])((byte[])var0); // L: 23 - return var1 ? SequenceDefinition.method3087(var3) : var3; // L: 24 - } else if (var0 instanceof AbstractByteArrayCopier) { // L: 27 - AbstractByteArrayCopier var2 = (AbstractByteArrayCopier)var0; // L: 28 - return var2.get(); // L: 29 - } else { - throw new IllegalArgumentException(); // L: 31 - } - } - - @ObfuscatedName("g") - @ObfuscatedSignature( - descriptor = "(I)[Ldj;", - garbageValue = "74672048" - ) - static AttackOption[] method4080() { - return new AttackOption[]{AttackOption.AttackOption_alwaysRightClick, AttackOption.AttackOption_leftClickWhereAvailable, AttackOption.AttackOption_dependsOnCombatLevels, AttackOption.AttackOption_hidden}; // L: 11795 - } - - @ObfuscatedName("ac") - @ObfuscatedSignature( - descriptor = "(ILci;ZI)I", - garbageValue = "-1751967768" - ) - static int method4078(int var0, Script var1, boolean var2) { - if (var0 != 7000 && var0 != 7005 && var0 != 7010 && var0 != 7015 && var0 != 7020 && var0 != 7025 && var0 != 7030 && var0 != 7035) { // L: 4217 - if (var0 != 7001 && var0 != 7002 && var0 != 7011 && var0 != 7012 && var0 != 7021 && var0 != 7022) { // L: 4221 - if (var0 != 7003 && var0 != 7013 && var0 != 7023) { // L: 4225 - if (var0 != 7006 && var0 != 7007 && var0 != 7016 && var0 != 7017 && var0 != 7026 && var0 != 7027) { // L: 4229 - if (var0 != 7008 && var0 != 7018 && var0 != 7028) { // L: 4233 - if (var0 != 7031 && var0 != 7032) { // L: 4237 - if (var0 == 7033) { // L: 4242 - --class13.Interpreter_stringStackSize; // L: 4243 - return 1; // L: 4244 - } else if (var0 != 7036 && var0 != 7037) { // L: 4246 - if (var0 == 7038) { // L: 4250 - --WorldMapCacheName.Interpreter_intStackSize; // L: 4251 - return 1; // L: 4252 - } else if (var0 != 7004 && var0 != 7009 && var0 != 7014 && var0 != 7019 && var0 != 7024 && var0 != 7029 && var0 != 7034 && var0 != 7039) { // L: 4254 - return 2; // L: 4258 - } else { - --WorldMapCacheName.Interpreter_intStackSize; // L: 4255 - return 1; // L: 4256 - } - } else { - WorldMapCacheName.Interpreter_intStackSize -= 2; // L: 4247 - return 1; // L: 4248 - } - } else { - --class13.Interpreter_stringStackSize; // L: 4238 - --WorldMapCacheName.Interpreter_intStackSize; // L: 4239 - return 1; // L: 4240 - } - } else { - --WorldMapCacheName.Interpreter_intStackSize; // L: 4234 - return 1; // L: 4235 - } - } else { - WorldMapCacheName.Interpreter_intStackSize -= 2; // L: 4230 - return 1; // L: 4231 - } - } else { - WorldMapCacheName.Interpreter_intStackSize -= 2; // L: 4226 - return 1; // L: 4227 - } - } else { - WorldMapCacheName.Interpreter_intStackSize -= 3; // L: 4222 - return 1; // L: 4223 - } - } else { - WorldMapCacheName.Interpreter_intStackSize -= 5; // L: 4218 - return 1; // L: 4219 - } - } } diff --git a/runescape-client/src/main/java/RouteStrategy.java b/runescape-client/src/main/java/RouteStrategy.java index de342e3f7c..7c5841225f 100644 --- a/runescape-client/src/main/java/RouteStrategy.java +++ b/runescape-client/src/main/java/RouteStrategy.java @@ -4,30 +4,36 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("fx") +@ObfuscatedName("fc") @Implements("RouteStrategy") public abstract class RouteStrategy { - @ObfuscatedName("h") + @ObfuscatedName("ih") @ObfuscatedGetter( - intValue = -917143075 + intValue = -1113352723 + ) + @Export("oculusOrbFocalPointX") + static int oculusOrbFocalPointX; + @ObfuscatedName("v") + @ObfuscatedGetter( + intValue = -1931856815 ) @Export("approxDestinationX") public int approxDestinationX; - @ObfuscatedName("c") + @ObfuscatedName("n") @ObfuscatedGetter( - intValue = 939054465 + intValue = -2132337773 ) @Export("approxDestinationY") public int approxDestinationY; - @ObfuscatedName("o") + @ObfuscatedName("f") @ObfuscatedGetter( - intValue = -2136918663 + intValue = 203403193 ) @Export("approxDestinationSizeX") public int approxDestinationSizeX; - @ObfuscatedName("g") + @ObfuscatedName("y") @ObfuscatedGetter( - intValue = 2032814193 + intValue = 308023697 ) @Export("approxDestinationSizeY") public int approxDestinationSizeY; @@ -35,28 +41,11 @@ public abstract class RouteStrategy { protected RouteStrategy() { } // L: 9 - @ObfuscatedName("h") + @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "(IIILfa;B)Z", - garbageValue = "2" + descriptor = "(IIILfz;I)Z", + garbageValue = "496202097" ) @Export("hasArrived") - public abstract boolean hasArrived(int var1, int var2, int var3, CollisionMap var4); - - @ObfuscatedName("la") - @ObfuscatedSignature( - descriptor = "(Lnk;IB)V", - garbageValue = "8" - ) - static void method3134(Buffer var0, int var1) { - VarbitComposition.method2818(var0.array, var1); // L: 11719 - if (JagexCache.JagexCache_randomDat != null) { // L: 11721 - try { - JagexCache.JagexCache_randomDat.seek(0L); // L: 11723 - JagexCache.JagexCache_randomDat.write(var0.array, var1, 24); // L: 11724 - } catch (Exception var3) { // L: 11726 - } - } - - } // L: 11729 + protected abstract boolean hasArrived(int var1, int var2, int var3, CollisionMap var4); } diff --git a/runescape-client/src/main/java/RunException.java b/runescape-client/src/main/java/RunException.java index 0f59770cae..bee5a3667b 100644 --- a/runescape-client/src/main/java/RunException.java +++ b/runescape-client/src/main/java/RunException.java @@ -4,25 +4,31 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; -@ObfuscatedName("ot") +@ObfuscatedName("oz") @Implements("RunException") public class RunException extends RuntimeException { - @ObfuscatedName("h") + @ObfuscatedName("v") @Export("RunException_applet") public static Applet RunException_applet; - @ObfuscatedName("c") + @ObfuscatedName("n") @Export("localPlayerName") public static String localPlayerName; - @ObfuscatedName("g") + @ObfuscatedName("f") @ObfuscatedGetter( - intValue = 259723493 + intValue = -1454650143 + ) + @Export("RunException_revision") + public static int RunException_revision; + @ObfuscatedName("y") + @ObfuscatedGetter( + intValue = 2094073605 ) @Export("clientType") public static int clientType; - @ObfuscatedName("l") + @ObfuscatedName("p") @Export("message") String message; - @ObfuscatedName("z") + @ObfuscatedName("j") @Export("throwable") Throwable throwable; diff --git a/runescape-client/src/main/java/Scene.java b/runescape-client/src/main/java/Scene.java index 928f703c21..0e2cac7904 100644 --- a/runescape-client/src/main/java/Scene.java +++ b/runescape-client/src/main/java/Scene.java @@ -3,188 +3,188 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("gz") +@ObfuscatedName("gt") @Implements("Scene") public class Scene { - @ObfuscatedName("h") + @ObfuscatedName("v") @Export("Scene_isLowDetail") public static boolean Scene_isLowDetail; - @ObfuscatedName("p") + @ObfuscatedName("e") @Export("tileUpdateCount") static int tileUpdateCount; - @ObfuscatedName("a") + @ObfuscatedName("g") @Export("Scene_plane") static int Scene_plane; - @ObfuscatedName("e") + @ObfuscatedName("a") @Export("Scene_drawnCount") static int Scene_drawnCount; - @ObfuscatedName("d") + @ObfuscatedName("k") @Export("Scene_cameraXTileMin") static int Scene_cameraXTileMin; - @ObfuscatedName("u") + @ObfuscatedName("m") @Export("Scene_cameraXTileMax") static int Scene_cameraXTileMax; - @ObfuscatedName("m") + @ObfuscatedName("x") @Export("Scene_cameraYTileMin") static int Scene_cameraYTileMin; - @ObfuscatedName("j") + @ObfuscatedName("z") @Export("Scene_cameraYTileMax") static int Scene_cameraYTileMax; - @ObfuscatedName("f") + @ObfuscatedName("w") @Export("Scene_cameraXTile") static int Scene_cameraXTile; - @ObfuscatedName("s") + @ObfuscatedName("t") @Export("Scene_cameraYTile") static int Scene_cameraYTile; - @ObfuscatedName("y") + @ObfuscatedName("h") @Export("Scene_cameraX") static int Scene_cameraX; - @ObfuscatedName("w") + @ObfuscatedName("q") @Export("Scene_cameraY") static int Scene_cameraY; - @ObfuscatedName("n") + @ObfuscatedName("i") @Export("Scene_cameraZ") static int Scene_cameraZ; - @ObfuscatedName("ag") + @ObfuscatedName("ae") @Export("Scene_cameraPitchSine") static int Scene_cameraPitchSine; - @ObfuscatedName("ae") + @ObfuscatedName("ap") @Export("Scene_cameraPitchCosine") static int Scene_cameraPitchCosine; - @ObfuscatedName("ao") + @ObfuscatedName("ab") @Export("Scene_cameraYawSine") static int Scene_cameraYawSine; - @ObfuscatedName("aj") + @ObfuscatedName("al") @Export("Scene_cameraYawCosine") static int Scene_cameraYawCosine; - @ObfuscatedName("aw") + @ObfuscatedName("ad") @ObfuscatedSignature( - descriptor = "[Lhz;" + descriptor = "[Lhj;" ) @Export("gameObjects") static GameObject[] gameObjects; - @ObfuscatedName("at") + @ObfuscatedName("ai") @Export("checkClick") static boolean checkClick; - @ObfuscatedName("av") + @ObfuscatedName("ar") @Export("Scene_selectedPlane") static int Scene_selectedPlane; - @ObfuscatedName("al") + @ObfuscatedName("ag") @Export("Scene_selectedScreenX") static int Scene_selectedScreenX; - @ObfuscatedName("ap") + @ObfuscatedName("ax") @Export("Scene_selectedScreenY") static int Scene_selectedScreenY; - @ObfuscatedName("am") + @ObfuscatedName("as") @Export("Scene_selectedX") public static int Scene_selectedX; - @ObfuscatedName("ax") + @ObfuscatedName("aj") @Export("Scene_selectedY") public static int Scene_selectedY; - @ObfuscatedName("ak") + @ObfuscatedName("am") @Export("viewportWalking") static boolean viewportWalking; - @ObfuscatedName("aa") + @ObfuscatedName("ac") @Export("Scene_planesCount") static int Scene_planesCount; - @ObfuscatedName("au") + @ObfuscatedName("at") @Export("Scene_planeOccluderCounts") static int[] Scene_planeOccluderCounts; - @ObfuscatedName("as") + @ObfuscatedName("ah") @ObfuscatedSignature( - descriptor = "[[Lga;" + descriptor = "[[Lgn;" ) @Export("Scene_planeOccluders") static Occluder[][] Scene_planeOccluders; - @ObfuscatedName("ad") + @ObfuscatedName("ao") @Export("Scene_currentOccludersCount") static int Scene_currentOccludersCount; - @ObfuscatedName("ac") + @ObfuscatedName("aq") @ObfuscatedSignature( - descriptor = "[Lga;" + descriptor = "[Lgn;" ) @Export("Scene_currentOccluders") static Occluder[] Scene_currentOccluders; - @ObfuscatedName("az") + @ObfuscatedName("aw") @ObfuscatedSignature( - descriptor = "Lka;" + descriptor = "Lkx;" ) @Export("Scene_tilesDeque") static NodeDeque Scene_tilesDeque; - @ObfuscatedName("aq") - static final int[] field2332; - @ObfuscatedName("ab") - static final int[] field2333; - @ObfuscatedName("ar") - static final int[] field2334; - @ObfuscatedName("ah") - static final int[] field2335; @ObfuscatedName("af") - static final int[] field2336; - @ObfuscatedName("an") - static final int[] field2337; - @ObfuscatedName("bd") static final int[] field2338; - @ObfuscatedName("by") + @ObfuscatedName("ak") + static final int[] field2352; + @ObfuscatedName("ay") + static final int[] field2340; + @ObfuscatedName("aa") + static final int[] field2341; + @ObfuscatedName("au") + static final int[] field2342; + @ObfuscatedName("an") + static final int[] field2305; + @ObfuscatedName("bd") + static final int[] field2344; + @ObfuscatedName("bz") @Export("visibilityMap") static boolean[][][][] visibilityMap; - @ObfuscatedName("bz") + @ObfuscatedName("bh") @Export("visibleTiles") static boolean[][] visibleTiles; - @ObfuscatedName("br") + @ObfuscatedName("bs") @Export("Scene_viewportXCenter") static int Scene_viewportXCenter; - @ObfuscatedName("bm") + @ObfuscatedName("br") @Export("Scene_viewportYCenter") static int Scene_viewportYCenter; - @ObfuscatedName("bn") + @ObfuscatedName("bf") @Export("Scene_viewportXMin") static int Scene_viewportXMin; @ObfuscatedName("ba") @Export("Scene_viewportYMin") static int Scene_viewportYMin; - @ObfuscatedName("bg") + @ObfuscatedName("be") @Export("Scene_viewportXMax") static int Scene_viewportXMax; - @ObfuscatedName("bi") + @ObfuscatedName("bj") @Export("Scene_viewportYMax") static int Scene_viewportYMax; - @ObfuscatedName("c") + @ObfuscatedName("n") @Export("planes") int planes; - @ObfuscatedName("o") + @ObfuscatedName("f") @Export("xSize") int xSize; - @ObfuscatedName("g") + @ObfuscatedName("y") @Export("ySize") int ySize; - @ObfuscatedName("l") + @ObfuscatedName("p") @Export("tileHeights") int[][][] tileHeights; - @ObfuscatedName("z") + @ObfuscatedName("j") @ObfuscatedSignature( - descriptor = "[[[Lgg;" + descriptor = "[[[Lgx;" ) @Export("tiles") Tile[][][] tiles; - @ObfuscatedName("t") + @ObfuscatedName("r") @Export("minPlane") int minPlane; - @ObfuscatedName("v") + @ObfuscatedName("b") @Export("tempGameObjectsCount") int tempGameObjectsCount; - @ObfuscatedName("b") + @ObfuscatedName("d") @ObfuscatedSignature( - descriptor = "[Lhz;" + descriptor = "[Lhj;" ) @Export("tempGameObjects") GameObject[] tempGameObjects; - @ObfuscatedName("q") - int[][][] field2295; - @ObfuscatedName("bk") + @ObfuscatedName("s") + int[][][] field2301; + @ObfuscatedName("bv") @Export("tileShape2D") int[][] tileShape2D; - @ObfuscatedName("bt") + @ObfuscatedName("bm") @Export("tileRotation2D") int[][] tileRotation2D; @@ -206,13 +206,13 @@ public class Scene { Scene_currentOccludersCount = 0; // L: 51 Scene_currentOccluders = new Occluder[500]; // L: 52 Scene_tilesDeque = new NodeDeque(); // L: 53 - field2332 = new int[]{19, 55, 38, 155, 255, 110, 137, 205, 76}; // L: 54 - field2333 = new int[]{160, 192, 80, 96, 0, 144, 80, 48, 160}; // L: 55 - field2334 = new int[]{76, 8, 137, 4, 0, 1, 38, 2, 19}; // L: 56 - field2335 = new int[]{0, 0, 2, 0, 0, 2, 1, 1, 0}; // L: 57 - field2336 = new int[]{2, 0, 0, 2, 0, 0, 0, 4, 4}; // L: 58 - field2337 = new int[]{0, 4, 4, 8, 0, 0, 8, 0, 0}; // L: 59 - field2338 = new int[]{1, 1, 0, 0, 0, 8, 0, 0, 8}; // L: 60 + field2338 = new int[]{19, 55, 38, 155, 255, 110, 137, 205, 76}; // L: 54 + field2352 = new int[]{160, 192, 80, 96, 0, 144, 80, 48, 160}; // L: 55 + field2340 = new int[]{76, 8, 137, 4, 0, 1, 38, 2, 19}; // L: 56 + field2341 = new int[]{0, 0, 2, 0, 0, 2, 1, 1, 0}; // L: 57 + field2342 = new int[]{2, 0, 0, 2, 0, 0, 0, 4, 4}; // L: 58 + field2305 = new int[]{0, 4, 4, 8, 0, 0, 8, 0, 0}; // L: 59 + field2344 = new int[]{1, 1, 0, 0, 0, 8, 0, 0, 8}; // L: 60 visibilityMap = new boolean[8][32][51][51]; // L: 86 } @@ -226,12 +226,12 @@ public class Scene { this.xSize = var2; // L: 97 this.ySize = var3; // L: 98 this.tiles = new Tile[var1][var2][var3]; // L: 99 - this.field2295 = new int[var1][var2 + 1][var3 + 1]; // L: 100 + this.field2301 = new int[var1][var2 + 1][var3 + 1]; // L: 100 this.tileHeights = var4; // L: 101 this.clear(); // L: 102 } // L: 103 - @ObfuscatedName("h") + @ObfuscatedName("v") @Export("clear") public void clear() { int var1; @@ -264,7 +264,7 @@ public class Scene { } // L: 120 - @ObfuscatedName("c") + @ObfuscatedName("n") @Export("init") public void init(int var1) { this.minPlane = var1; // L: 123 @@ -279,7 +279,7 @@ public class Scene { } // L: 129 - @ObfuscatedName("o") + @ObfuscatedName("f") @Export("setLinkBelow") public void setLinkBelow(int var1, int var2) { Tile var3 = this.tiles[0][var1][var2]; // L: 132 @@ -291,668 +291,677 @@ public class Scene { for (int var6 = 0; var6 < var5.gameObjectsCount; ++var6) { // L: 137 GameObject var7 = var5.gameObjects[var6]; // L: 138 - if (MusicPatchNode2.method4349(var7.tag) && var7.startX == var1 && var2 == var7.startY) { // L: 139 + long var9 = var7.tag; // L: 140 + int var11 = (int)(var9 >>> 14 & 3L); // L: 144 + boolean var8 = var11 == 2; // L: 146 + if (var8 && var7.startX == var1 && var2 == var7.startY) { // L: 148 --var7.plane; } } } } - if (this.tiles[0][var1][var2] == null) { // L: 143 + if (this.tiles[0][var1][var2] == null) { // L: 152 this.tiles[0][var1][var2] = new Tile(0, var1, var2); } - this.tiles[0][var1][var2].linkedBelowTile = var3; // L: 144 - this.tiles[3][var1][var2] = null; // L: 145 - } // L: 146 + this.tiles[0][var1][var2].linkedBelowTile = var3; // L: 153 + this.tiles[3][var1][var2] = null; // L: 154 + } // L: 155 - @ObfuscatedName("l") + @ObfuscatedName("p") @Export("setTileMinPlane") public void setTileMinPlane(int var1, int var2, int var3, int var4) { - Tile var5 = this.tiles[var1][var2][var3]; // L: 165 - if (var5 != null) { // L: 166 - this.tiles[var1][var2][var3].minPlane = var4; // L: 167 + Tile var5 = this.tiles[var1][var2][var3]; // L: 174 + if (var5 != null) { // L: 175 + this.tiles[var1][var2][var3].minPlane = var4; // L: 176 } - } // L: 168 + } // L: 177 - @ObfuscatedName("z") + @ObfuscatedName("j") @Export("addTile") public void addTile(int var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8, int var9, int var10, int var11, int var12, int var13, int var14, int var15, int var16, int var17, int var18, int var19, int var20) { SceneTilePaint var21; int var22; - if (var4 == 0) { // L: 171 - var21 = new SceneTilePaint(var11, var12, var13, var14, -1, var19, false); // L: 172 + if (var4 == 0) { // L: 180 + var21 = new SceneTilePaint(var11, var12, var13, var14, -1, var19, false); // L: 181 - for (var22 = var1; var22 >= 0; --var22) { // L: 173 + for (var22 = var1; var22 >= 0; --var22) { // L: 182 if (this.tiles[var22][var2][var3] == null) { this.tiles[var22][var2][var3] = new Tile(var22, var2, var3); } } - this.tiles[var1][var2][var3].paint = var21; // L: 174 - } else if (var4 != 1) { // L: 177 - SceneTileModel var23 = new SceneTileModel(var4, var5, var6, var2, var3, var7, var8, var9, var10, var11, var12, var13, var14, var15, var16, var17, var18, var19, var20); // L: 183 + this.tiles[var1][var2][var3].paint = var21; // L: 183 + } else if (var4 != 1) { // L: 186 + SceneTileModel var23 = new SceneTileModel(var4, var5, var6, var2, var3, var7, var8, var9, var10, var11, var12, var13, var14, var15, var16, var17, var18, var19, var20); // L: 192 - for (var22 = var1; var22 >= 0; --var22) { // L: 184 + for (var22 = var1; var22 >= 0; --var22) { // L: 193 if (this.tiles[var22][var2][var3] == null) { this.tiles[var22][var2][var3] = new Tile(var22, var2, var3); } } - this.tiles[var1][var2][var3].model = var23; // L: 185 + this.tiles[var1][var2][var3].model = var23; // L: 194 } else { - var21 = new SceneTilePaint(var15, var16, var17, var18, var6, var20, var8 == var7 && var7 == var9 && var10 == var7); // L: 178 + var21 = new SceneTilePaint(var15, var16, var17, var18, var6, var20, var8 == var7 && var7 == var9 && var10 == var7); // L: 187 - for (var22 = var1; var22 >= 0; --var22) { // L: 179 + for (var22 = var1; var22 >= 0; --var22) { // L: 188 if (this.tiles[var22][var2][var3] == null) { this.tiles[var22][var2][var3] = new Tile(var22, var2, var3); } } - this.tiles[var1][var2][var3].paint = var21; // L: 180 + this.tiles[var1][var2][var3].paint = var21; // L: 189 } - } // L: 175 181 186 + } // L: 184 190 195 - @ObfuscatedName("t") + @ObfuscatedName("r") @ObfuscatedSignature( - descriptor = "(IIIILge;JI)V" + descriptor = "(IIIILgl;JI)V" ) @Export("newFloorDecoration") public void newFloorDecoration(int var1, int var2, int var3, int var4, Renderable var5, long var6, int var8) { - if (var5 != null) { // L: 189 - FloorDecoration var9 = new FloorDecoration(); // L: 190 - var9.renderable = var5; // L: 191 - var9.x = var2 * 128 + 64; // L: 192 - var9.y = var3 * 128 + 64; // L: 193 - var9.tileHeight = var4; // L: 194 - var9.tag = var6; // L: 195 - var9.flags = var8; // L: 196 - if (this.tiles[var1][var2][var3] == null) { // L: 197 + if (var5 != null) { // L: 198 + FloorDecoration var9 = new FloorDecoration(); // L: 199 + var9.renderable = var5; // L: 200 + var9.x = var2 * 128 + 64; // L: 201 + var9.y = var3 * 128 + 64; // L: 202 + var9.tileHeight = var4; // L: 203 + var9.tag = var6; // L: 204 + var9.flags = var8; // L: 205 + if (this.tiles[var1][var2][var3] == null) { // L: 206 this.tiles[var1][var2][var3] = new Tile(var1, var2, var3); } - this.tiles[var1][var2][var3].floorDecoration = var9; // L: 198 + this.tiles[var1][var2][var3].floorDecoration = var9; // L: 207 } - } // L: 199 + } // L: 208 - @ObfuscatedName("v") + @ObfuscatedName("b") @ObfuscatedSignature( - descriptor = "(IIIILge;JLge;Lge;)V" + descriptor = "(IIIILgl;JLgl;Lgl;)V" ) @Export("newGroundItemPile") public void newGroundItemPile(int var1, int var2, int var3, int var4, Renderable var5, long var6, Renderable var8, Renderable var9) { - ItemLayer var10 = new ItemLayer(); // L: 202 - var10.first = var5; // L: 203 - var10.x = var2 * 128 + 64; // L: 204 - var10.y = var3 * 128 + 64; // L: 205 - var10.tileHeight = var4; // L: 206 - var10.tag = var6; // L: 207 - var10.second = var8; // L: 208 - var10.third = var9; // L: 209 - int var11 = 0; // L: 210 - Tile var12 = this.tiles[var1][var2][var3]; // L: 211 - if (var12 != null) { // L: 212 - for (int var13 = 0; var13 < var12.gameObjectsCount; ++var13) { // L: 213 - if ((var12.gameObjects[var13].flags & 256) == 256 && var12.gameObjects[var13].renderable instanceof Model) { // L: 214 - Model var14 = (Model)var12.gameObjects[var13].renderable; // L: 215 - var14.calculateBoundsCylinder(); // L: 216 - if (var14.height > var11) { // L: 217 + ItemLayer var10 = new ItemLayer(); // L: 211 + var10.first = var5; // L: 212 + var10.x = var2 * 128 + 64; // L: 213 + var10.y = var3 * 128 + 64; // L: 214 + var10.tileHeight = var4; // L: 215 + var10.tag = var6; // L: 216 + var10.second = var8; // L: 217 + var10.third = var9; // L: 218 + int var11 = 0; // L: 219 + Tile var12 = this.tiles[var1][var2][var3]; // L: 220 + if (var12 != null) { // L: 221 + for (int var13 = 0; var13 < var12.gameObjectsCount; ++var13) { // L: 222 + if ((var12.gameObjects[var13].flags & 256) == 256 && var12.gameObjects[var13].renderable instanceof Model) { // L: 223 + Model var14 = (Model)var12.gameObjects[var13].renderable; // L: 224 + var14.calculateBoundsCylinder(); // L: 225 + if (var14.height > var11) { // L: 226 var11 = var14.height; } } } } - var10.height = var11; // L: 221 + var10.height = var11; // L: 230 if (this.tiles[var1][var2][var3] == null) { - this.tiles[var1][var2][var3] = new Tile(var1, var2, var3); // L: 222 + this.tiles[var1][var2][var3] = new Tile(var1, var2, var3); // L: 231 } - this.tiles[var1][var2][var3].itemLayer = var10; // L: 223 - } // L: 224 + this.tiles[var1][var2][var3].itemLayer = var10; // L: 232 + } // L: 233 - @ObfuscatedName("b") + @ObfuscatedName("d") @ObfuscatedSignature( - descriptor = "(IIIILge;Lge;IIJI)V" + descriptor = "(IIIILgl;Lgl;IIJI)V" ) @Export("newBoundaryObject") public void newBoundaryObject(int var1, int var2, int var3, int var4, Renderable var5, Renderable var6, int var7, int var8, long var9, int var11) { - if (var5 != null || var6 != null) { // L: 227 - BoundaryObject var12 = new BoundaryObject(); // L: 228 - var12.tag = var9; // L: 229 - var12.flags = var11; // L: 230 - var12.x = var2 * 128 + 64; // L: 231 - var12.y = var3 * 128 + 64; // L: 232 - var12.tileHeight = var4; // L: 233 - var12.renderable1 = var5; // L: 234 - var12.renderable2 = var6; // L: 235 - var12.orientationA = var7; // L: 236 - var12.orientationB = var8; // L: 237 + if (var5 != null || var6 != null) { // L: 236 + BoundaryObject var12 = new BoundaryObject(); // L: 237 + var12.tag = var9; // L: 238 + var12.flags = var11; // L: 239 + var12.x = var2 * 128 + 64; // L: 240 + var12.y = var3 * 128 + 64; // L: 241 + var12.tileHeight = var4; // L: 242 + var12.renderable1 = var5; // L: 243 + var12.renderable2 = var6; // L: 244 + var12.orientationA = var7; // L: 245 + var12.orientationB = var8; // L: 246 for (int var13 = var1; var13 >= 0; --var13) { if (this.tiles[var13][var2][var3] == null) { - this.tiles[var13][var2][var3] = new Tile(var13, var2, var3); // L: 238 + this.tiles[var13][var2][var3] = new Tile(var13, var2, var3); // L: 247 } } - this.tiles[var1][var2][var3].boundaryObject = var12; // L: 239 + this.tiles[var1][var2][var3].boundaryObject = var12; // L: 248 } - } // L: 240 + } // L: 249 - @ObfuscatedName("q") + @ObfuscatedName("s") @ObfuscatedSignature( - descriptor = "(IIIILge;Lge;IIIIJI)V" + descriptor = "(IIIILgl;Lgl;IIIIJI)V" ) @Export("newWallDecoration") public void newWallDecoration(int var1, int var2, int var3, int var4, Renderable var5, Renderable var6, int var7, int var8, int var9, int var10, long var11, int var13) { - if (var5 != null) { // L: 243 - WallDecoration var14 = new WallDecoration(); // L: 244 - var14.tag = var11; // L: 245 - var14.flags = var13; // L: 246 - var14.x = var2 * 128 + 64; // L: 247 - var14.y = var3 * 128 + 64; // L: 248 - var14.tileHeight = var4; // L: 249 - var14.renderable1 = var5; // L: 250 - var14.renderable2 = var6; // L: 251 - var14.orientation = var7; // L: 252 - var14.orientation2 = var8; // L: 253 - var14.xOffset = var9; // L: 254 - var14.yOffset = var10; // L: 255 + if (var5 != null) { // L: 252 + WallDecoration var14 = new WallDecoration(); // L: 253 + var14.tag = var11; // L: 254 + var14.flags = var13; // L: 255 + var14.x = var2 * 128 + 64; // L: 256 + var14.y = var3 * 128 + 64; // L: 257 + var14.tileHeight = var4; // L: 258 + var14.renderable1 = var5; // L: 259 + var14.renderable2 = var6; // L: 260 + var14.orientation = var7; // L: 261 + var14.orientation2 = var8; // L: 262 + var14.xOffset = var9; // L: 263 + var14.yOffset = var10; // L: 264 for (int var15 = var1; var15 >= 0; --var15) { if (this.tiles[var15][var2][var3] == null) { - this.tiles[var15][var2][var3] = new Tile(var15, var2, var3); // L: 256 + this.tiles[var15][var2][var3] = new Tile(var15, var2, var3); // L: 265 } } - this.tiles[var1][var2][var3].wallDecoration = var14; // L: 257 + this.tiles[var1][var2][var3].wallDecoration = var14; // L: 266 } - } // L: 258 + } // L: 267 - @ObfuscatedName("i") + @ObfuscatedName("u") @ObfuscatedSignature( - descriptor = "(IIIIIILge;IJI)Z" + descriptor = "(IIIIIILgl;IJI)Z" ) - public boolean method4008(int var1, int var2, int var3, int var4, int var5, int var6, Renderable var7, int var8, long var9, int var11) { - if (var7 == null) { // L: 261 + public boolean method4007(int var1, int var2, int var3, int var4, int var5, int var6, Renderable var7, int var8, long var9, int var11) { + if (var7 == null) { // L: 270 return true; } else { - int var12 = var5 * 64 + var2 * 128; // L: 262 - int var13 = var6 * 64 + var3 * 128; // L: 263 - return this.newGameObject(var1, var2, var3, var5, var6, var12, var13, var4, var7, var8, false, var9, var11); // L: 264 + int var12 = var5 * 64 + var2 * 128; // L: 271 + int var13 = var6 * 64 + var3 * 128; // L: 272 + return this.newGameObject(var1, var2, var3, var5, var6, var12, var13, var4, var7, var8, false, var9, var11); // L: 273 } } - @ObfuscatedName("x") + @ObfuscatedName("l") @ObfuscatedSignature( - descriptor = "(IIIIILge;IJZ)Z" + descriptor = "(IIIIILgl;IJZ)Z" ) @Export("drawEntity") public boolean drawEntity(int var1, int var2, int var3, int var4, int var5, Renderable var6, int var7, long var8, boolean var10) { - if (var6 == null) { // L: 268 + if (var6 == null) { // L: 277 return true; } else { - int var11 = var2 - var5; // L: 269 - int var12 = var3 - var5; // L: 270 - int var13 = var5 + var2; // L: 271 - int var14 = var3 + var5; // L: 272 - if (var10) { // L: 273 - if (var7 > 640 && var7 < 1408) { // L: 274 + int var11 = var2 - var5; // L: 278 + int var12 = var3 - var5; // L: 279 + int var13 = var5 + var2; // L: 280 + int var14 = var3 + var5; // L: 281 + if (var10) { // L: 282 + if (var7 > 640 && var7 < 1408) { // L: 283 var14 += 128; } - if (var7 > 1152 && var7 < 1920) { // L: 275 + if (var7 > 1152 && var7 < 1920) { // L: 284 var13 += 128; } - if (var7 > 1664 || var7 < 384) { // L: 276 + if (var7 > 1664 || var7 < 384) { // L: 285 var12 -= 128; } - if (var7 > 128 && var7 < 896) { // L: 277 + if (var7 > 128 && var7 < 896) { // L: 286 var11 -= 128; } } - var11 /= 128; // L: 279 - var12 /= 128; // L: 280 - var13 /= 128; // L: 281 - var14 /= 128; // L: 282 - return this.newGameObject(var1, var11, var12, var13 - var11 + 1, var14 - var12 + 1, var2, var3, var4, var6, var7, true, var8, 0); // L: 283 + var11 /= 128; // L: 288 + var12 /= 128; // L: 289 + var13 /= 128; // L: 290 + var14 /= 128; // L: 291 + return this.newGameObject(var1, var11, var12, var13 - var11 + 1, var14 - var12 + 1, var2, var3, var4, var6, var7, true, var8, 0); // L: 292 } } - @ObfuscatedName("k") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "(IIIIILge;IJIIII)Z" + descriptor = "(IIIIILgl;IJIIII)Z" ) @Export("addNullableObject") public boolean addNullableObject(int var1, int var2, int var3, int var4, int var5, Renderable var6, int var7, long var8, int var10, int var11, int var12, int var13) { - return var6 == null ? true : this.newGameObject(var1, var10, var11, var12 - var10 + 1, var13 - var11 + 1, var2, var3, var4, var6, var7, true, var8, 0); // L: 287 288 + return var6 == null ? true : this.newGameObject(var1, var10, var11, var12 - var10 + 1, var13 - var11 + 1, var2, var3, var4, var6, var7, true, var8, 0); // L: 296 297 } - @ObfuscatedName("r") + @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "(IIIIIIIILge;IZJI)Z" + descriptor = "(IIIIIIIILgl;IZJI)Z" ) @Export("newGameObject") boolean newGameObject(int var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8, Renderable var9, int var10, boolean var11, long var12, int var14) { int var16; - for (int var15 = var2; var15 < var2 + var4; ++var15) { // L: 292 - for (var16 = var3; var16 < var3 + var5; ++var16) { // L: 293 - if (var15 < 0 || var16 < 0 || var15 >= this.xSize || var16 >= this.ySize) { // L: 294 + for (int var15 = var2; var15 < var2 + var4; ++var15) { // L: 301 + for (var16 = var3; var16 < var3 + var5; ++var16) { // L: 302 + if (var15 < 0 || var16 < 0 || var15 >= this.xSize || var16 >= this.ySize) { // L: 303 return false; } - Tile var23 = this.tiles[var1][var15][var16]; // L: 295 - if (var23 != null && var23.gameObjectsCount >= 5) { // L: 296 + Tile var23 = this.tiles[var1][var15][var16]; // L: 304 + if (var23 != null && var23.gameObjectsCount >= 5) { // L: 305 return false; } } } - GameObject var21 = new GameObject(); // L: 299 - var21.tag = var12; // L: 300 - var21.flags = var14; // L: 301 - var21.plane = var1; // L: 302 - var21.centerX = var6; // L: 303 - var21.centerY = var7; // L: 304 - var21.height = var8; // L: 305 - var21.renderable = var9; // L: 306 - var21.orientation = var10; // L: 307 - var21.startX = var2; // L: 308 - var21.startY = var3; // L: 309 - var21.endX = var2 + var4 - 1; // L: 310 - var21.endY = var3 + var5 - 1; // L: 311 + GameObject var21 = new GameObject(); // L: 308 + var21.tag = var12; // L: 309 + var21.flags = var14; // L: 310 + var21.plane = var1; // L: 311 + var21.centerX = var6; // L: 312 + var21.centerY = var7; // L: 313 + var21.height = var8; // L: 314 + var21.renderable = var9; // L: 315 + var21.orientation = var10; // L: 316 + var21.startX = var2; // L: 317 + var21.startY = var3; // L: 318 + var21.endX = var2 + var4 - 1; // L: 319 + var21.endY = var3 + var5 - 1; // L: 320 - for (var16 = var2; var16 < var2 + var4; ++var16) { // L: 312 - for (int var17 = var3; var17 < var3 + var5; ++var17) { // L: 313 - int var18 = 0; // L: 314 - if (var16 > var2) { // L: 315 + for (var16 = var2; var16 < var2 + var4; ++var16) { // L: 321 + for (int var17 = var3; var17 < var3 + var5; ++var17) { // L: 322 + int var18 = 0; // L: 323 + if (var16 > var2) { // L: 324 ++var18; } - if (var16 < var2 + var4 - 1) { // L: 316 + if (var16 < var2 + var4 - 1) { // L: 325 var18 += 4; } - if (var17 > var3) { // L: 317 + if (var17 > var3) { // L: 326 var18 += 8; } - if (var17 < var3 + var5 - 1) { // L: 318 + if (var17 < var3 + var5 - 1) { // L: 327 var18 += 2; } for (int var19 = var1; var19 >= 0; --var19) { if (this.tiles[var19][var16][var17] == null) { - this.tiles[var19][var16][var17] = new Tile(var19, var16, var17); // L: 319 + this.tiles[var19][var16][var17] = new Tile(var19, var16, var17); // L: 328 } } - Tile var22 = this.tiles[var1][var16][var17]; // L: 320 - var22.gameObjects[var22.gameObjectsCount] = var21; // L: 321 - var22.gameObjectEdgeMasks[var22.gameObjectsCount] = var18; // L: 322 - var22.gameObjectsEdgeMask |= var18; // L: 324 - ++var22.gameObjectsCount; // L: 325 + Tile var22 = this.tiles[var1][var16][var17]; // L: 329 + var22.gameObjects[var22.gameObjectsCount] = var21; // L: 330 + var22.gameObjectEdgeMasks[var22.gameObjectsCount] = var18; // L: 331 + var22.gameObjectsEdgeMask |= var18; // L: 333 + ++var22.gameObjectsCount; // L: 334 } } - if (var11) { // L: 328 + if (var11) { // L: 337 this.tempGameObjects[this.tempGameObjectsCount++] = var21; } - return true; // L: 329 + return true; // L: 338 } - @ObfuscatedName("p") + @ObfuscatedName("e") @Export("clearTempGameObjects") public void clearTempGameObjects() { - for (int var1 = 0; var1 < this.tempGameObjectsCount; ++var1) { // L: 333 - GameObject var2 = this.tempGameObjects[var1]; // L: 334 - this.removeGameObject(var2); // L: 335 - this.tempGameObjects[var1] = null; // L: 336 + for (int var1 = 0; var1 < this.tempGameObjectsCount; ++var1) { // L: 342 + GameObject var2 = this.tempGameObjects[var1]; // L: 343 + this.removeGameObject(var2); // L: 344 + this.tempGameObjects[var1] = null; // L: 345 } - this.tempGameObjectsCount = 0; // L: 338 - } // L: 339 + this.tempGameObjectsCount = 0; // L: 347 + } // L: 348 - @ObfuscatedName("a") + @ObfuscatedName("g") @ObfuscatedSignature( - descriptor = "(Lhz;)V" + descriptor = "(Lhj;)V" ) @Export("removeGameObject") void removeGameObject(GameObject var1) { - for (int var2 = var1.startX; var2 <= var1.endX; ++var2) { // L: 342 - for (int var3 = var1.startY; var3 <= var1.endY; ++var3) { // L: 343 - Tile var4 = this.tiles[var1.plane][var2][var3]; // L: 344 - if (var4 != null) { // L: 345 + for (int var2 = var1.startX; var2 <= var1.endX; ++var2) { // L: 351 + for (int var3 = var1.startY; var3 <= var1.endY; ++var3) { // L: 352 + Tile var4 = this.tiles[var1.plane][var2][var3]; // L: 353 + if (var4 != null) { // L: 354 int var5; - for (var5 = 0; var5 < var4.gameObjectsCount; ++var5) { // L: 346 - if (var4.gameObjects[var5] == var1) { // L: 347 - --var4.gameObjectsCount; // L: 348 + for (var5 = 0; var5 < var4.gameObjectsCount; ++var5) { // L: 355 + if (var4.gameObjects[var5] == var1) { // L: 356 + --var4.gameObjectsCount; // L: 357 - for (int var6 = var5; var6 < var4.gameObjectsCount; ++var6) { // L: 349 - var4.gameObjects[var6] = var4.gameObjects[var6 + 1]; // L: 350 - var4.gameObjectEdgeMasks[var6] = var4.gameObjectEdgeMasks[var6 + 1]; // L: 351 + for (int var6 = var5; var6 < var4.gameObjectsCount; ++var6) { // L: 358 + var4.gameObjects[var6] = var4.gameObjects[var6 + 1]; // L: 359 + var4.gameObjectEdgeMasks[var6] = var4.gameObjectEdgeMasks[var6 + 1]; // L: 360 } - var4.gameObjects[var4.gameObjectsCount] = null; // L: 353 + var4.gameObjects[var4.gameObjectsCount] = null; // L: 362 break; } } - var4.gameObjectsEdgeMask = 0; // L: 357 + var4.gameObjectsEdgeMask = 0; // L: 366 - for (var5 = 0; var5 < var4.gameObjectsCount; ++var5) { // L: 358 - var4.gameObjectsEdgeMask |= var4.gameObjectEdgeMasks[var5]; // L: 360 + for (var5 = 0; var5 < var4.gameObjectsCount; ++var5) { // L: 367 + var4.gameObjectsEdgeMask |= var4.gameObjectEdgeMasks[var5]; // L: 369 } } } } - } // L: 365 - - @ObfuscatedName("e") - public void method3917(int var1, int var2, int var3, int var4) { - Tile var5 = this.tiles[var1][var2][var3]; // L: 368 - if (var5 != null) { // L: 369 - WallDecoration var6 = var5.wallDecoration; // L: 370 - if (var6 != null) { // L: 371 - var6.xOffset = var4 * var6.xOffset / 16; // L: 372 - var6.yOffset = var4 * var6.yOffset / 16; // L: 373 - } - } } // L: 374 - @ObfuscatedName("d") + @ObfuscatedName("a") + public void method3967(int var1, int var2, int var3, int var4) { + Tile var5 = this.tiles[var1][var2][var3]; // L: 377 + if (var5 != null) { // L: 378 + WallDecoration var6 = var5.wallDecoration; // L: 379 + if (var6 != null) { // L: 380 + var6.xOffset = var4 * var6.xOffset / 16; // L: 381 + var6.yOffset = var4 * var6.yOffset / 16; // L: 382 + } + } + } // L: 383 + + @ObfuscatedName("k") @Export("removeBoundaryObject") public void removeBoundaryObject(int var1, int var2, int var3) { - Tile var4 = this.tiles[var1][var2][var3]; // L: 377 + Tile var4 = this.tiles[var1][var2][var3]; // L: 386 if (var4 != null) { - var4.boundaryObject = null; // L: 379 + var4.boundaryObject = null; // L: 388 } - } // L: 378 380 - - @ObfuscatedName("u") - @Export("removeWallDecoration") - public void removeWallDecoration(int var1, int var2, int var3) { - Tile var4 = this.tiles[var1][var2][var3]; // L: 383 - if (var4 != null) { - var4.wallDecoration = null; // L: 385 - } - } // L: 384 386 + } // L: 387 389 @ObfuscatedName("m") + @Export("removeWallDecoration") + public void removeWallDecoration(int var1, int var2, int var3) { + Tile var4 = this.tiles[var1][var2][var3]; // L: 392 + if (var4 != null) { + var4.wallDecoration = null; // L: 394 + } + } // L: 393 395 + + @ObfuscatedName("x") @Export("removeGameObject") public void removeGameObject(int var1, int var2, int var3) { - Tile var4 = this.tiles[var1][var2][var3]; // L: 389 - if (var4 != null) { // L: 390 - for (int var5 = 0; var5 < var4.gameObjectsCount; ++var5) { // L: 391 - GameObject var6 = var4.gameObjects[var5]; // L: 392 - if (MusicPatchNode2.method4349(var6.tag) && var2 == var6.startX && var3 == var6.startY) { // L: 393 - this.removeGameObject(var6); // L: 394 - return; // L: 395 + Tile var4 = this.tiles[var1][var2][var3]; // L: 398 + if (var4 != null) { // L: 399 + for (int var5 = 0; var5 < var4.gameObjectsCount; ++var5) { // L: 400 + GameObject var6 = var4.gameObjects[var5]; // L: 401 + if (UserComparator8.method2437(var6.tag) && var2 == var6.startX && var3 == var6.startY) { // L: 402 + this.removeGameObject(var6); // L: 403 + return; // L: 404 } } } - } // L: 398 + } // L: 407 - @ObfuscatedName("j") + @ObfuscatedName("z") @Export("removeFloorDecoration") public void removeFloorDecoration(int var1, int var2, int var3) { - Tile var4 = this.tiles[var1][var2][var3]; // L: 401 + Tile var4 = this.tiles[var1][var2][var3]; // L: 410 if (var4 != null) { - var4.floorDecoration = null; // L: 403 + var4.floorDecoration = null; // L: 412 } - } // L: 402 404 + } // L: 411 413 - @ObfuscatedName("f") + @ObfuscatedName("w") @Export("removeGroundItemPile") public void removeGroundItemPile(int var1, int var2, int var3) { - Tile var4 = this.tiles[var1][var2][var3]; // L: 407 + Tile var4 = this.tiles[var1][var2][var3]; // L: 416 if (var4 != null) { - var4.itemLayer = null; // L: 409 + var4.itemLayer = null; // L: 418 } - } // L: 408 410 + } // L: 417 419 - @ObfuscatedName("s") - @ObfuscatedSignature( - descriptor = "(III)Lhf;" - ) - public BoundaryObject method3960(int var1, int var2, int var3) { - Tile var4 = this.tiles[var1][var2][var3]; // L: 413 - return var4 == null ? null : var4.boundaryObject; // L: 414 415 - } - - @ObfuscatedName("y") + @ObfuscatedName("t") @ObfuscatedSignature( descriptor = "(III)Lhw;" ) - public WallDecoration method3924(int var1, int var2, int var3) { - Tile var4 = this.tiles[var1][var2][var3]; // L: 419 - return var4 == null ? null : var4.wallDecoration; // L: 420 421 + public BoundaryObject method4089(int var1, int var2, int var3) { + Tile var4 = this.tiles[var1][var2][var3]; // L: 422 + return var4 == null ? null : var4.boundaryObject; // L: 423 424 } - @ObfuscatedName("w") + @ObfuscatedName("h") @ObfuscatedSignature( - descriptor = "(III)Lhz;" + descriptor = "(III)Lho;" ) - public GameObject method3925(int var1, int var2, int var3) { - Tile var4 = this.tiles[var1][var2][var3]; // L: 425 - if (var4 == null) { // L: 426 + public WallDecoration method3948(int var1, int var2, int var3) { + Tile var4 = this.tiles[var1][var2][var3]; // L: 428 + return var4 == null ? null : var4.wallDecoration; // L: 429 430 + } + + @ObfuscatedName("q") + @ObfuscatedSignature( + descriptor = "(III)Lhj;" + ) + public GameObject method3926(int var1, int var2, int var3) { + Tile var4 = this.tiles[var1][var2][var3]; // L: 434 + if (var4 == null) { // L: 435 return null; } else { - for (int var5 = 0; var5 < var4.gameObjectsCount; ++var5) { // L: 427 - GameObject var6 = var4.gameObjects[var5]; // L: 428 - if (MusicPatchNode2.method4349(var6.tag) && var2 == var6.startX && var3 == var6.startY) { // L: 429 + for (int var5 = 0; var5 < var4.gameObjectsCount; ++var5) { // L: 436 + GameObject var6 = var4.gameObjects[var5]; // L: 437 + long var8 = var6.tag; // L: 439 + int var10 = (int)(var8 >>> 14 & 3L); // L: 443 + boolean var7 = var10 == 2; // L: 445 + if (var7 && var2 == var6.startX && var3 == var6.startY) { // L: 447 return var6; } } - return null; // L: 431 + return null; // L: 449 } } - @ObfuscatedName("n") + @ObfuscatedName("i") @ObfuscatedSignature( - descriptor = "(III)Lgd;" + descriptor = "(III)Lgo;" ) @Export("getFloorDecoration") public FloorDecoration getFloorDecoration(int var1, int var2, int var3) { - Tile var4 = this.tiles[var1][var2][var3]; // L: 435 - return var4 != null && var4.floorDecoration != null ? var4.floorDecoration : null; // L: 436 437 - } - - @ObfuscatedName("ag") - @Export("getBoundaryObjectTag") - public long getBoundaryObjectTag(int var1, int var2, int var3) { - Tile var4 = this.tiles[var1][var2][var3]; // L: 441 - return var4 != null && var4.boundaryObject != null ? var4.boundaryObject.tag : 0L; // L: 442 443 + Tile var4 = this.tiles[var1][var2][var3]; // L: 453 + return var4 != null && var4.floorDecoration != null ? var4.floorDecoration : null; // L: 454 455 } @ObfuscatedName("ae") - @Export("getWallDecorationTag") - public long getWallDecorationTag(int var1, int var2, int var3) { - Tile var4 = this.tiles[var1][var2][var3]; // L: 447 - return var4 != null && var4.wallDecoration != null ? var4.wallDecoration.tag : 0L; // L: 448 449 + @Export("getBoundaryObjectTag") + public long getBoundaryObjectTag(int var1, int var2, int var3) { + Tile var4 = this.tiles[var1][var2][var3]; // L: 459 + return var4 != null && var4.boundaryObject != null ? var4.boundaryObject.tag : 0L; // L: 460 461 } - @ObfuscatedName("ao") + @ObfuscatedName("ap") + @Export("getWallDecorationTag") + public long getWallDecorationTag(int var1, int var2, int var3) { + Tile var4 = this.tiles[var1][var2][var3]; // L: 465 + return var4 != null && var4.wallDecoration != null ? var4.wallDecoration.tag : 0L; // L: 466 467 + } + + @ObfuscatedName("ab") @Export("getGameObjectTag") public long getGameObjectTag(int var1, int var2, int var3) { - Tile var4 = this.tiles[var1][var2][var3]; // L: 453 - if (var4 == null) { // L: 454 + Tile var4 = this.tiles[var1][var2][var3]; // L: 471 + if (var4 == null) { // L: 472 return 0L; } else { - for (int var5 = 0; var5 < var4.gameObjectsCount; ++var5) { // L: 455 - GameObject var6 = var4.gameObjects[var5]; // L: 456 - if (MusicPatchNode2.method4349(var6.tag) && var2 == var6.startX && var3 == var6.startY) { // L: 457 + for (int var5 = 0; var5 < var4.gameObjectsCount; ++var5) { // L: 473 + GameObject var6 = var4.gameObjects[var5]; // L: 474 + long var8 = var6.tag; // L: 476 + int var10 = (int)(var8 >>> 14 & 3L); // L: 480 + boolean var7 = var10 == 2; // L: 482 + if (var7 && var2 == var6.startX && var3 == var6.startY) { // L: 484 return var6.tag; } } - return 0L; // L: 459 + return 0L; // L: 486 } } - @ObfuscatedName("aj") + @ObfuscatedName("al") @Export("getFloorDecorationTag") public long getFloorDecorationTag(int var1, int var2, int var3) { - Tile var4 = this.tiles[var1][var2][var3]; // L: 463 - return var4 != null && var4.floorDecoration != null ? var4.floorDecoration.tag : 0L; // L: 464 465 + Tile var4 = this.tiles[var1][var2][var3]; // L: 490 + return var4 != null && var4.floorDecoration != null ? var4.floorDecoration.tag : 0L; // L: 491 492 } - @ObfuscatedName("aw") + @ObfuscatedName("ad") @Export("getObjectFlags") public int getObjectFlags(int var1, int var2, int var3, long var4) { - Tile var6 = this.tiles[var1][var2][var3]; // L: 469 - if (var6 == null) { // L: 470 + Tile var6 = this.tiles[var1][var2][var3]; // L: 496 + if (var6 == null) { // L: 497 return -1; - } else if (var6.boundaryObject != null && var6.boundaryObject.tag == var4) { // L: 471 + } else if (var6.boundaryObject != null && var6.boundaryObject.tag == var4) { // L: 498 return var6.boundaryObject.flags & 255; - } else if (var6.wallDecoration != null && var6.wallDecoration.tag == var4) { // L: 472 + } else if (var6.wallDecoration != null && var6.wallDecoration.tag == var4) { // L: 499 return var6.wallDecoration.flags & 255; - } else if (var6.floorDecoration != null && var6.floorDecoration.tag == var4) { // L: 473 + } else if (var6.floorDecoration != null && var6.floorDecoration.tag == var4) { // L: 500 return var6.floorDecoration.flags & 255; } else { - for (int var7 = 0; var7 < var6.gameObjectsCount; ++var7) { // L: 474 - if (var6.gameObjects[var7].tag == var4) { // L: 475 + for (int var7 = 0; var7 < var6.gameObjectsCount; ++var7) { // L: 501 + if (var6.gameObjects[var7].tag == var4) { // L: 502 return var6.gameObjects[var7].flags & 255; } } - return -1; // L: 477 + return -1; // L: 504 } } - @ObfuscatedName("at") - public void method3932(int var1, int var2, int var3) { - for (int var4 = 0; var4 < this.planes; ++var4) { // L: 481 - for (int var5 = 0; var5 < this.xSize; ++var5) { // L: 482 - for (int var6 = 0; var6 < this.ySize; ++var6) { // L: 483 - Tile var7 = this.tiles[var4][var5][var6]; // L: 484 - if (var7 != null) { // L: 485 - BoundaryObject var8 = var7.boundaryObject; // L: 486 + @ObfuscatedName("ai") + public void method3955(int var1, int var2, int var3) { + for (int var4 = 0; var4 < this.planes; ++var4) { // L: 508 + for (int var5 = 0; var5 < this.xSize; ++var5) { // L: 509 + for (int var6 = 0; var6 < this.ySize; ++var6) { // L: 510 + Tile var7 = this.tiles[var4][var5][var6]; // L: 511 + if (var7 != null) { // L: 512 + BoundaryObject var8 = var7.boundaryObject; // L: 513 ModelData var10; - if (var8 != null && var8.renderable1 instanceof ModelData) { // L: 487 - ModelData var9 = (ModelData)var8.renderable1; // L: 488 - this.method4049(var9, var4, var5, var6, 1, 1); // L: 489 - if (var8.renderable2 instanceof ModelData) { // L: 490 - var10 = (ModelData)var8.renderable2; // L: 491 - this.method4049(var10, var4, var5, var6, 1, 1); // L: 492 - ModelData.method3736(var9, var10, 0, 0, 0, false); // L: 493 - var8.renderable2 = var10.toModel(var10.ambient, var10.contrast, var1, var2, var3); // L: 494 + if (var8 != null && var8.renderable1 instanceof ModelData) { // L: 514 + ModelData var9 = (ModelData)var8.renderable1; // L: 515 + this.method3957(var9, var4, var5, var6, 1, 1); // L: 516 + if (var8.renderable2 instanceof ModelData) { // L: 517 + var10 = (ModelData)var8.renderable2; // L: 518 + this.method3957(var10, var4, var5, var6, 1, 1); // L: 519 + ModelData.method3774(var9, var10, 0, 0, 0, false); // L: 520 + var8.renderable2 = var10.toModel(var10.ambient, var10.contrast, var1, var2, var3); // L: 521 } - var8.renderable1 = var9.toModel(var9.ambient, var9.contrast, var1, var2, var3); // L: 496 + var8.renderable1 = var9.toModel(var9.ambient, var9.contrast, var1, var2, var3); // L: 523 } - for (int var12 = 0; var12 < var7.gameObjectsCount; ++var12) { // L: 498 - GameObject var14 = var7.gameObjects[var12]; // L: 499 - if (var14 != null && var14.renderable instanceof ModelData) { // L: 500 - ModelData var11 = (ModelData)var14.renderable; // L: 501 - this.method4049(var11, var4, var5, var6, var14.endX - var14.startX + 1, var14.endY - var14.startY + 1); // L: 502 - var14.renderable = var11.toModel(var11.ambient, var11.contrast, var1, var2, var3); // L: 503 + for (int var12 = 0; var12 < var7.gameObjectsCount; ++var12) { // L: 525 + GameObject var14 = var7.gameObjects[var12]; // L: 526 + if (var14 != null && var14.renderable instanceof ModelData) { // L: 527 + ModelData var11 = (ModelData)var14.renderable; // L: 528 + this.method3957(var11, var4, var5, var6, var14.endX - var14.startX + 1, var14.endY - var14.startY + 1); // L: 529 + var14.renderable = var11.toModel(var11.ambient, var11.contrast, var1, var2, var3); // L: 530 } } - FloorDecoration var13 = var7.floorDecoration; // L: 506 - if (var13 != null && var13.renderable instanceof ModelData) { // L: 507 - var10 = (ModelData)var13.renderable; // L: 508 - this.method4064(var10, var4, var5, var6); // L: 509 - var13.renderable = var10.toModel(var10.ambient, var10.contrast, var1, var2, var3); // L: 510 + FloorDecoration var13 = var7.floorDecoration; // L: 533 + if (var13 != null && var13.renderable instanceof ModelData) { // L: 534 + var10 = (ModelData)var13.renderable; // L: 535 + this.method4076(var10, var4, var5, var6); // L: 536 + var13.renderable = var10.toModel(var10.ambient, var10.contrast, var1, var2, var3); // L: 537 } } } } } - } // L: 516 + } // L: 543 - @ObfuscatedName("av") + @ObfuscatedName("ar") @ObfuscatedSignature( - descriptor = "(Lgk;III)V" + descriptor = "(Lgm;III)V" ) - void method4064(ModelData var1, int var2, int var3, int var4) { + void method4076(ModelData var1, int var2, int var3, int var4) { Tile var5; ModelData var6; - if (var3 < this.xSize) { // L: 519 - var5 = this.tiles[var2][var3 + 1][var4]; // L: 520 - if (var5 != null && var5.floorDecoration != null && var5.floorDecoration.renderable instanceof ModelData) { // L: 521 - var6 = (ModelData)var5.floorDecoration.renderable; // L: 522 - ModelData.method3736(var1, var6, 128, 0, 0, true); // L: 523 + if (var3 < this.xSize) { // L: 546 + var5 = this.tiles[var2][var3 + 1][var4]; // L: 547 + if (var5 != null && var5.floorDecoration != null && var5.floorDecoration.renderable instanceof ModelData) { // L: 548 + var6 = (ModelData)var5.floorDecoration.renderable; // L: 549 + ModelData.method3774(var1, var6, 128, 0, 0, true); // L: 550 } } - if (var4 < this.xSize) { // L: 526 - var5 = this.tiles[var2][var3][var4 + 1]; // L: 527 - if (var5 != null && var5.floorDecoration != null && var5.floorDecoration.renderable instanceof ModelData) { // L: 528 - var6 = (ModelData)var5.floorDecoration.renderable; // L: 529 - ModelData.method3736(var1, var6, 0, 0, 128, true); // L: 530 + if (var4 < this.xSize) { // L: 553 + var5 = this.tiles[var2][var3][var4 + 1]; // L: 554 + if (var5 != null && var5.floorDecoration != null && var5.floorDecoration.renderable instanceof ModelData) { // L: 555 + var6 = (ModelData)var5.floorDecoration.renderable; // L: 556 + ModelData.method3774(var1, var6, 0, 0, 128, true); // L: 557 } } - if (var3 < this.xSize && var4 < this.ySize) { // L: 533 - var5 = this.tiles[var2][var3 + 1][var4 + 1]; // L: 534 - if (var5 != null && var5.floorDecoration != null && var5.floorDecoration.renderable instanceof ModelData) { // L: 535 - var6 = (ModelData)var5.floorDecoration.renderable; // L: 536 - ModelData.method3736(var1, var6, 128, 0, 128, true); // L: 537 + if (var3 < this.xSize && var4 < this.ySize) { // L: 560 + var5 = this.tiles[var2][var3 + 1][var4 + 1]; // L: 561 + if (var5 != null && var5.floorDecoration != null && var5.floorDecoration.renderable instanceof ModelData) { // L: 562 + var6 = (ModelData)var5.floorDecoration.renderable; // L: 563 + ModelData.method3774(var1, var6, 128, 0, 128, true); // L: 564 } } - if (var3 < this.xSize && var4 > 0) { // L: 540 - var5 = this.tiles[var2][var3 + 1][var4 - 1]; // L: 541 - if (var5 != null && var5.floorDecoration != null && var5.floorDecoration.renderable instanceof ModelData) { // L: 542 - var6 = (ModelData)var5.floorDecoration.renderable; // L: 543 - ModelData.method3736(var1, var6, 128, 0, -128, true); // L: 544 + if (var3 < this.xSize && var4 > 0) { // L: 567 + var5 = this.tiles[var2][var3 + 1][var4 - 1]; // L: 568 + if (var5 != null && var5.floorDecoration != null && var5.floorDecoration.renderable instanceof ModelData) { // L: 569 + var6 = (ModelData)var5.floorDecoration.renderable; // L: 570 + ModelData.method3774(var1, var6, 128, 0, -128, true); // L: 571 } } - } // L: 547 + } // L: 574 - @ObfuscatedName("al") + @ObfuscatedName("ag") @ObfuscatedSignature( - descriptor = "(Lgk;IIIII)V" + descriptor = "(Lgm;IIIII)V" ) - void method4049(ModelData var1, int var2, int var3, int var4, int var5, int var6) { - boolean var7 = true; // L: 550 - int var8 = var3; // L: 551 - int var9 = var3 + var5; // L: 552 - int var10 = var4 - 1; // L: 553 - int var11 = var4 + var6; // L: 554 + void method3957(ModelData var1, int var2, int var3, int var4, int var5, int var6) { + boolean var7 = true; // L: 577 + int var8 = var3; // L: 578 + int var9 = var3 + var5; // L: 579 + int var10 = var4 - 1; // L: 580 + int var11 = var4 + var6; // L: 581 - for (int var12 = var2; var12 <= var2 + 1; ++var12) { // L: 555 - if (var12 != this.planes) { // L: 556 - for (int var13 = var8; var13 <= var9; ++var13) { // L: 557 - if (var13 >= 0 && var13 < this.xSize) { // L: 558 - for (int var14 = var10; var14 <= var11; ++var14) { // L: 559 - if (var14 >= 0 && var14 < this.ySize && (!var7 || var13 >= var9 || var14 >= var11 || var14 < var4 && var3 != var13)) { // L: 560 561 - Tile var15 = this.tiles[var12][var13][var14]; // L: 562 - if (var15 != null) { // L: 563 - int var16 = (this.tileHeights[var12][var13 + 1][var14] + this.tileHeights[var12][var13 + 1][var14 + 1] + this.tileHeights[var12][var13][var14] + this.tileHeights[var12][var13][var14 + 1]) / 4 - (this.tileHeights[var2][var3 + 1][var4] + this.tileHeights[var2][var3][var4] + this.tileHeights[var2][var3 + 1][var4 + 1] + this.tileHeights[var2][var3][var4 + 1]) / 4; // L: 564 - BoundaryObject var17 = var15.boundaryObject; // L: 565 - if (var17 != null) { // L: 566 + for (int var12 = var2; var12 <= var2 + 1; ++var12) { // L: 582 + if (var12 != this.planes) { // L: 583 + for (int var13 = var8; var13 <= var9; ++var13) { // L: 584 + if (var13 >= 0 && var13 < this.xSize) { // L: 585 + for (int var14 = var10; var14 <= var11; ++var14) { // L: 586 + if (var14 >= 0 && var14 < this.ySize && (!var7 || var13 >= var9 || var14 >= var11 || var14 < var4 && var3 != var13)) { // L: 587 588 + Tile var15 = this.tiles[var12][var13][var14]; // L: 589 + if (var15 != null) { // L: 590 + int var16 = (this.tileHeights[var12][var13 + 1][var14] + this.tileHeights[var12][var13 + 1][var14 + 1] + this.tileHeights[var12][var13][var14] + this.tileHeights[var12][var13][var14 + 1]) / 4 - (this.tileHeights[var2][var3 + 1][var4] + this.tileHeights[var2][var3][var4] + this.tileHeights[var2][var3 + 1][var4 + 1] + this.tileHeights[var2][var3][var4 + 1]) / 4; // L: 591 + BoundaryObject var17 = var15.boundaryObject; // L: 592 + if (var17 != null) { // L: 593 ModelData var18; - if (var17.renderable1 instanceof ModelData) { // L: 567 - var18 = (ModelData)var17.renderable1; // L: 568 - ModelData.method3736(var1, var18, (1 - var5) * 64 + (var13 - var3) * 128, var16, (var14 - var4) * 128 + (1 - var6) * 64, var7); // L: 569 + if (var17.renderable1 instanceof ModelData) { // L: 594 + var18 = (ModelData)var17.renderable1; // L: 595 + ModelData.method3774(var1, var18, (1 - var5) * 64 + (var13 - var3) * 128, var16, (var14 - var4) * 128 + (1 - var6) * 64, var7); // L: 596 } - if (var17.renderable2 instanceof ModelData) { // L: 571 - var18 = (ModelData)var17.renderable2; // L: 572 - ModelData.method3736(var1, var18, (1 - var5) * 64 + (var13 - var3) * 128, var16, (var14 - var4) * 128 + (1 - var6) * 64, var7); // L: 573 + if (var17.renderable2 instanceof ModelData) { // L: 598 + var18 = (ModelData)var17.renderable2; // L: 599 + ModelData.method3774(var1, var18, (1 - var5) * 64 + (var13 - var3) * 128, var16, (var14 - var4) * 128 + (1 - var6) * 64, var7); // L: 600 } } - for (int var23 = 0; var23 < var15.gameObjectsCount; ++var23) { // L: 576 - GameObject var19 = var15.gameObjects[var23]; // L: 577 - if (var19 != null && var19.renderable instanceof ModelData) { // L: 578 - ModelData var20 = (ModelData)var19.renderable; // L: 579 - int var21 = var19.endX - var19.startX + 1; // L: 580 - int var22 = var19.endY - var19.startY + 1; // L: 581 - ModelData.method3736(var1, var20, (var21 - var5) * 64 + (var19.startX - var3) * 128, var16, (var19.startY - var4) * 128 + (var22 - var6) * 64, var7); // L: 582 + for (int var23 = 0; var23 < var15.gameObjectsCount; ++var23) { // L: 603 + GameObject var19 = var15.gameObjects[var23]; // L: 604 + if (var19 != null && var19.renderable instanceof ModelData) { // L: 605 + ModelData var20 = (ModelData)var19.renderable; // L: 606 + int var21 = var19.endX - var19.startX + 1; // L: 607 + int var22 = var19.endY - var19.startY + 1; // L: 608 + ModelData.method3774(var1, var20, (var21 - var5) * 64 + (var19.startX - var3) * 128, var16, (var19.startY - var4) * 128 + (var22 - var6) * 64, var7); // L: 609 } } } @@ -961,179 +970,179 @@ public class Scene { } } - --var8; // L: 587 - var7 = false; // L: 588 + --var8; // L: 614 + var7 = false; // L: 615 } } - } // L: 590 + } // L: 617 - @ObfuscatedName("ap") + @ObfuscatedName("ax") @Export("drawTileMinimap") public void drawTileMinimap(int[] var1, int var2, int var3, int var4, int var5, int var6) { - Tile var7 = this.tiles[var4][var5][var6]; // L: 593 - if (var7 != null) { // L: 594 - SceneTilePaint var8 = var7.paint; // L: 595 + Tile var7 = this.tiles[var4][var5][var6]; // L: 620 + if (var7 != null) { // L: 621 + SceneTilePaint var8 = var7.paint; // L: 622 int var10; - if (var8 != null) { // L: 596 - int var18 = var8.rgb; // L: 597 - if (var18 != 0) { // L: 598 - for (var10 = 0; var10 < 4; ++var10) { // L: 599 - var1[var2] = var18; // L: 600 - var1[var2 + 1] = var18; // L: 601 - var1[var2 + 2] = var18; // L: 602 - var1[var2 + 3] = var18; // L: 603 - var2 += var3; // L: 604 + if (var8 != null) { // L: 623 + int var18 = var8.rgb; // L: 624 + if (var18 != 0) { // L: 625 + for (var10 = 0; var10 < 4; ++var10) { // L: 626 + var1[var2] = var18; // L: 627 + var1[var2 + 1] = var18; // L: 628 + var1[var2 + 2] = var18; // L: 629 + var1[var2 + 3] = var18; // L: 630 + var2 += var3; // L: 631 } } } else { - SceneTileModel var9 = var7.model; // L: 608 - if (var9 != null) { // L: 609 - var10 = var9.shape; // L: 610 - int var11 = var9.rotation; // L: 611 - int var12 = var9.underlayRgb; // L: 612 - int var13 = var9.overlayRgb; // L: 613 - int[] var14 = this.tileShape2D[var10]; // L: 614 - int[] var15 = this.tileRotation2D[var11]; // L: 615 - int var16 = 0; // L: 616 + SceneTileModel var9 = var7.model; // L: 635 + if (var9 != null) { // L: 636 + var10 = var9.shape; // L: 637 + int var11 = var9.rotation; // L: 638 + int var12 = var9.underlayRgb; // L: 639 + int var13 = var9.overlayRgb; // L: 640 + int[] var14 = this.tileShape2D[var10]; // L: 641 + int[] var15 = this.tileRotation2D[var11]; // L: 642 + int var16 = 0; // L: 643 int var17; - if (var12 != 0) { // L: 617 - for (var17 = 0; var17 < 4; ++var17) { // L: 618 - var1[var2] = var14[var15[var16++]] == 0 ? var12 : var13; // L: 619 - var1[var2 + 1] = var14[var15[var16++]] == 0 ? var12 : var13; // L: 620 - var1[var2 + 2] = var14[var15[var16++]] == 0 ? var12 : var13; // L: 621 - var1[var2 + 3] = var14[var15[var16++]] == 0 ? var12 : var13; // L: 622 - var2 += var3; // L: 623 + if (var12 != 0) { // L: 644 + for (var17 = 0; var17 < 4; ++var17) { // L: 645 + var1[var2] = var14[var15[var16++]] == 0 ? var12 : var13; // L: 646 + var1[var2 + 1] = var14[var15[var16++]] == 0 ? var12 : var13; // L: 647 + var1[var2 + 2] = var14[var15[var16++]] == 0 ? var12 : var13; // L: 648 + var1[var2 + 3] = var14[var15[var16++]] == 0 ? var12 : var13; // L: 649 + var2 += var3; // L: 650 } } else { - for (var17 = 0; var17 < 4; ++var17) { // L: 627 - if (var14[var15[var16++]] != 0) { // L: 628 + for (var17 = 0; var17 < 4; ++var17) { // L: 654 + if (var14[var15[var16++]] != 0) { // L: 655 var1[var2] = var13; } - if (var14[var15[var16++]] != 0) { // L: 629 + if (var14[var15[var16++]] != 0) { // L: 656 var1[var2 + 1] = var13; } - if (var14[var15[var16++]] != 0) { // L: 630 + if (var14[var15[var16++]] != 0) { // L: 657 var1[var2 + 2] = var13; } - if (var14[var15[var16++]] != 0) { // L: 631 + if (var14[var15[var16++]] != 0) { // L: 658 var1[var2 + 3] = var13; } - var2 += var3; // L: 632 + var2 += var3; // L: 659 } } } } } - } // L: 606 635 + } // L: 633 662 - @ObfuscatedName("ak") + @ObfuscatedName("am") @Export("menuOpen") public void menuOpen(int var1, int var2, int var3, boolean var4) { - if (!shouldSendWalk() || var4) { // L: 714 - checkClick = true; // L: 715 - viewportWalking = var4; // L: 716 - Scene_selectedPlane = var1; // L: 717 - Scene_selectedScreenX = var2; // L: 718 - Scene_selectedScreenY = var3; // L: 719 - Scene_selectedX = -1; // L: 720 - Scene_selectedY = -1; // L: 721 + if (!shouldSendWalk() || var4) { // L: 741 + checkClick = true; // L: 742 + viewportWalking = var4; // L: 743 + Scene_selectedPlane = var1; // L: 744 + Scene_selectedScreenX = var2; // L: 745 + Scene_selectedScreenY = var3; // L: 746 + Scene_selectedX = -1; // L: 747 + Scene_selectedY = -1; // L: 748 } - } // L: 722 + } // L: 749 - @ObfuscatedName("ay") + @ObfuscatedName("az") @Export("setViewportWalking") public void setViewportWalking() { - viewportWalking = true; // L: 725 - } // L: 726 + viewportWalking = true; // L: 752 + } // L: 753 - @ObfuscatedName("au") + @ObfuscatedName("at") @Export("draw") public void draw(int var1, int var2, int var3, int var4, int var5, int var6) { - if (var1 < 0) { // L: 738 + if (var1 < 0) { // L: 765 var1 = 0; - } else if (var1 >= this.xSize * 128) { // L: 739 + } else if (var1 >= this.xSize * 128) { // L: 766 var1 = this.xSize * 128 - 1; } - if (var3 < 0) { // L: 740 + if (var3 < 0) { // L: 767 var3 = 0; - } else if (var3 >= this.ySize * 128) { // L: 741 + } else if (var3 >= this.ySize * 128) { // L: 768 var3 = this.ySize * 128 - 1; } - if (var4 < 128) { // L: 742 + if (var4 < 128) { // L: 769 var4 = 128; - } else if (var4 > 383) { // L: 743 + } else if (var4 > 383) { // L: 770 var4 = 383; } - ++Scene_drawnCount; // L: 744 - Scene_cameraPitchSine = Rasterizer3D.Rasterizer3D_sine[var4]; // L: 745 - Scene_cameraPitchCosine = Rasterizer3D.Rasterizer3D_cosine[var4]; // L: 746 - Scene_cameraYawSine = Rasterizer3D.Rasterizer3D_sine[var5]; // L: 747 - Scene_cameraYawCosine = Rasterizer3D.Rasterizer3D_cosine[var5]; // L: 748 - visibleTiles = visibilityMap[(var4 - 128) / 32][var5 / 64]; // L: 749 - Scene_cameraX = var1; // L: 750 - Scene_cameraY = var2; // L: 751 - Scene_cameraZ = var3; // L: 752 - Scene_cameraXTile = var1 / 128; // L: 753 - Scene_cameraYTile = var3 / 128; // L: 754 - Scene_plane = var6; // L: 755 - Scene_cameraXTileMin = Scene_cameraXTile - 25; // L: 756 - if (Scene_cameraXTileMin < 0) { // L: 757 + ++Scene_drawnCount; // L: 771 + Scene_cameraPitchSine = Rasterizer3D.Rasterizer3D_sine[var4]; // L: 772 + Scene_cameraPitchCosine = Rasterizer3D.Rasterizer3D_cosine[var4]; // L: 773 + Scene_cameraYawSine = Rasterizer3D.Rasterizer3D_sine[var5]; // L: 774 + Scene_cameraYawCosine = Rasterizer3D.Rasterizer3D_cosine[var5]; // L: 775 + visibleTiles = visibilityMap[(var4 - 128) / 32][var5 / 64]; // L: 776 + Scene_cameraX = var1; // L: 777 + Scene_cameraY = var2; // L: 778 + Scene_cameraZ = var3; // L: 779 + Scene_cameraXTile = var1 / 128; // L: 780 + Scene_cameraYTile = var3 / 128; // L: 781 + Scene_plane = var6; // L: 782 + Scene_cameraXTileMin = Scene_cameraXTile - 25; // L: 783 + if (Scene_cameraXTileMin < 0) { // L: 784 Scene_cameraXTileMin = 0; } - Scene_cameraYTileMin = Scene_cameraYTile - 25; // L: 758 - if (Scene_cameraYTileMin < 0) { // L: 759 + Scene_cameraYTileMin = Scene_cameraYTile - 25; // L: 785 + if (Scene_cameraYTileMin < 0) { // L: 786 Scene_cameraYTileMin = 0; } - Scene_cameraXTileMax = Scene_cameraXTile + 25; // L: 760 - if (Scene_cameraXTileMax > this.xSize) { // L: 761 + Scene_cameraXTileMax = Scene_cameraXTile + 25; // L: 787 + if (Scene_cameraXTileMax > this.xSize) { // L: 788 Scene_cameraXTileMax = this.xSize; } - Scene_cameraYTileMax = Scene_cameraYTile + 25; // L: 762 - if (Scene_cameraYTileMax > this.ySize) { // L: 763 + Scene_cameraYTileMax = Scene_cameraYTile + 25; // L: 789 + if (Scene_cameraYTileMax > this.ySize) { // L: 790 Scene_cameraYTileMax = this.ySize; } - this.occlude(); // L: 764 - tileUpdateCount = 0; // L: 765 + this.occlude(); // L: 791 + tileUpdateCount = 0; // L: 792 int var7; Tile[][] var8; int var9; int var10; - for (var7 = this.minPlane; var7 < this.planes; ++var7) { // L: 766 - var8 = this.tiles[var7]; // L: 767 + for (var7 = this.minPlane; var7 < this.planes; ++var7) { // L: 793 + var8 = this.tiles[var7]; // L: 794 - for (var9 = Scene_cameraXTileMin; var9 < Scene_cameraXTileMax; ++var9) { // L: 768 - for (var10 = Scene_cameraYTileMin; var10 < Scene_cameraYTileMax; ++var10) { // L: 769 - Tile var16 = var8[var9][var10]; // L: 770 - if (var16 != null) { // L: 771 - if (var16.minPlane <= var6 && (visibleTiles[var9 - Scene_cameraXTile + 25][var10 - Scene_cameraYTile + 25] || this.tileHeights[var7][var9][var10] - var2 >= 2000)) { // L: 772 - var16.drawPrimary = true; // L: 778 - var16.drawSecondary = true; // L: 779 - if (var16.gameObjectsCount > 0) { // L: 780 + for (var9 = Scene_cameraXTileMin; var9 < Scene_cameraXTileMax; ++var9) { // L: 795 + for (var10 = Scene_cameraYTileMin; var10 < Scene_cameraYTileMax; ++var10) { // L: 796 + Tile var16 = var8[var9][var10]; // L: 797 + if (var16 != null) { // L: 798 + if (var16.minPlane <= var6 && (visibleTiles[var9 - Scene_cameraXTile + 25][var10 - Scene_cameraYTile + 25] || this.tileHeights[var7][var9][var10] - var2 >= 2000)) { // L: 799 + var16.drawPrimary = true; // L: 805 + var16.drawSecondary = true; // L: 806 + if (var16.gameObjectsCount > 0) { // L: 807 var16.drawGameObjects = true; } else { - var16.drawGameObjects = false; // L: 781 + var16.drawGameObjects = false; // L: 808 } - ++tileUpdateCount; // L: 782 + ++tileUpdateCount; // L: 809 } else { - var16.drawPrimary = false; // L: 773 - var16.drawSecondary = false; // L: 774 - var16.drawGameObjectEdges = 0; // L: 775 + var16.drawPrimary = false; // L: 800 + var16.drawSecondary = false; // L: 801 + var16.drawGameObjectEdges = 0; // L: 802 } } } @@ -1145,118 +1154,118 @@ public class Scene { int var13; int var14; Tile var15; - for (var7 = this.minPlane; var7 < this.planes; ++var7) { // L: 788 - var8 = this.tiles[var7]; // L: 789 + for (var7 = this.minPlane; var7 < this.planes; ++var7) { // L: 815 + var8 = this.tiles[var7]; // L: 816 - for (var9 = -25; var9 <= 0; ++var9) { // L: 790 - var10 = var9 + Scene_cameraXTile; // L: 791 - var11 = Scene_cameraXTile - var9; // L: 792 - if (var10 >= Scene_cameraXTileMin || var11 < Scene_cameraXTileMax) { // L: 793 - for (var12 = -25; var12 <= 0; ++var12) { // L: 794 - var13 = var12 + Scene_cameraYTile; // L: 795 - var14 = Scene_cameraYTile - var12; // L: 796 - if (var10 >= Scene_cameraXTileMin) { // L: 797 - if (var13 >= Scene_cameraYTileMin) { // L: 798 - var15 = var8[var10][var13]; // L: 799 - if (var15 != null && var15.drawPrimary) { // L: 800 + for (var9 = -25; var9 <= 0; ++var9) { // L: 817 + var10 = var9 + Scene_cameraXTile; // L: 818 + var11 = Scene_cameraXTile - var9; // L: 819 + if (var10 >= Scene_cameraXTileMin || var11 < Scene_cameraXTileMax) { // L: 820 + for (var12 = -25; var12 <= 0; ++var12) { // L: 821 + var13 = var12 + Scene_cameraYTile; // L: 822 + var14 = Scene_cameraYTile - var12; // L: 823 + if (var10 >= Scene_cameraXTileMin) { // L: 824 + if (var13 >= Scene_cameraYTileMin) { // L: 825 + var15 = var8[var10][var13]; // L: 826 + if (var15 != null && var15.drawPrimary) { // L: 827 this.drawTile(var15, true); } } - if (var14 < Scene_cameraYTileMax) { // L: 802 - var15 = var8[var10][var14]; // L: 803 - if (var15 != null && var15.drawPrimary) { // L: 804 + if (var14 < Scene_cameraYTileMax) { // L: 829 + var15 = var8[var10][var14]; // L: 830 + if (var15 != null && var15.drawPrimary) { // L: 831 this.drawTile(var15, true); } } } - if (var11 < Scene_cameraXTileMax) { // L: 807 - if (var13 >= Scene_cameraYTileMin) { // L: 808 - var15 = var8[var11][var13]; // L: 809 - if (var15 != null && var15.drawPrimary) { // L: 810 - this.drawTile(var15, true); - } - } - - if (var14 < Scene_cameraYTileMax) { // L: 812 - var15 = var8[var11][var14]; // L: 813 - if (var15 != null && var15.drawPrimary) { // L: 814 - this.drawTile(var15, true); - } - } - } - - if (tileUpdateCount == 0) { // L: 817 - checkClick = false; // L: 818 - return; // L: 819 - } - } - } - } - } - - for (var7 = this.minPlane; var7 < this.planes; ++var7) { // L: 825 - var8 = this.tiles[var7]; // L: 826 - - for (var9 = -25; var9 <= 0; ++var9) { // L: 827 - var10 = var9 + Scene_cameraXTile; // L: 828 - var11 = Scene_cameraXTile - var9; // L: 829 - if (var10 >= Scene_cameraXTileMin || var11 < Scene_cameraXTileMax) { // L: 830 - for (var12 = -25; var12 <= 0; ++var12) { // L: 831 - var13 = var12 + Scene_cameraYTile; // L: 832 - var14 = Scene_cameraYTile - var12; // L: 833 - if (var10 >= Scene_cameraXTileMin) { // L: 834 + if (var11 < Scene_cameraXTileMax) { // L: 834 if (var13 >= Scene_cameraYTileMin) { // L: 835 - var15 = var8[var10][var13]; // L: 836 + var15 = var8[var11][var13]; // L: 836 if (var15 != null && var15.drawPrimary) { // L: 837 - this.drawTile(var15, false); + this.drawTile(var15, true); } } if (var14 < Scene_cameraYTileMax) { // L: 839 - var15 = var8[var10][var14]; // L: 840 - if (var15 != null && var15.drawPrimary) { - this.drawTile(var15, false); // L: 841 + var15 = var8[var11][var14]; // L: 840 + if (var15 != null && var15.drawPrimary) { // L: 841 + this.drawTile(var15, true); } } } - if (var11 < Scene_cameraXTileMax) { // L: 844 - if (var13 >= Scene_cameraYTileMin) { // L: 845 - var15 = var8[var11][var13]; // L: 846 - if (var15 != null && var15.drawPrimary) { // L: 847 - this.drawTile(var15, false); - } - } - - if (var14 < Scene_cameraYTileMax) { // L: 849 - var15 = var8[var11][var14]; // L: 850 - if (var15 != null && var15.drawPrimary) { // L: 851 - this.drawTile(var15, false); - } - } - } - - if (tileUpdateCount == 0) { // L: 854 - checkClick = false; // L: 855 - return; // L: 856 + if (tileUpdateCount == 0) { // L: 844 + checkClick = false; // L: 845 + return; // L: 846 } } } } } - checkClick = false; // L: 862 - } // L: 863 + for (var7 = this.minPlane; var7 < this.planes; ++var7) { // L: 852 + var8 = this.tiles[var7]; // L: 853 - @ObfuscatedName("as") + for (var9 = -25; var9 <= 0; ++var9) { // L: 854 + var10 = var9 + Scene_cameraXTile; // L: 855 + var11 = Scene_cameraXTile - var9; // L: 856 + if (var10 >= Scene_cameraXTileMin || var11 < Scene_cameraXTileMax) { // L: 857 + for (var12 = -25; var12 <= 0; ++var12) { // L: 858 + var13 = var12 + Scene_cameraYTile; // L: 859 + var14 = Scene_cameraYTile - var12; // L: 860 + if (var10 >= Scene_cameraXTileMin) { // L: 861 + if (var13 >= Scene_cameraYTileMin) { // L: 862 + var15 = var8[var10][var13]; // L: 863 + if (var15 != null && var15.drawPrimary) { // L: 864 + this.drawTile(var15, false); + } + } + + if (var14 < Scene_cameraYTileMax) { // L: 866 + var15 = var8[var10][var14]; // L: 867 + if (var15 != null && var15.drawPrimary) { + this.drawTile(var15, false); // L: 868 + } + } + } + + if (var11 < Scene_cameraXTileMax) { // L: 871 + if (var13 >= Scene_cameraYTileMin) { // L: 872 + var15 = var8[var11][var13]; // L: 873 + if (var15 != null && var15.drawPrimary) { // L: 874 + this.drawTile(var15, false); + } + } + + if (var14 < Scene_cameraYTileMax) { // L: 876 + var15 = var8[var11][var14]; // L: 877 + if (var15 != null && var15.drawPrimary) { // L: 878 + this.drawTile(var15, false); + } + } + } + + if (tileUpdateCount == 0) { // L: 881 + checkClick = false; // L: 882 + return; // L: 883 + } + } + } + } + } + + checkClick = false; // L: 889 + } // L: 890 + + @ObfuscatedName("ah") @ObfuscatedSignature( - descriptor = "(Lgg;Z)V" + descriptor = "(Lgx;Z)V" ) @Export("drawTile") void drawTile(Tile var1, boolean var2) { - Scene_tilesDeque.addFirst(var1); // L: 866 + Scene_tilesDeque.addFirst(var1); // L: 893 while (true) { Tile var3; @@ -1288,227 +1297,227 @@ public class Scene { Tile var36; while (true) { do { - var3 = (Tile)Scene_tilesDeque.removeLast(); // L: 868 - if (var3 == null) { // L: 869 + var3 = (Tile)Scene_tilesDeque.removeLast(); // L: 895 + if (var3 == null) { // L: 896 return; } - } while(!var3.drawSecondary); // L: 870 + } while(!var3.drawSecondary); // L: 897 - var4 = var3.x; // L: 871 - var5 = var3.y; // L: 872 - var6 = var3.plane; // L: 873 - var7 = var3.originalPlane; // L: 874 - var8 = this.tiles[var6]; // L: 875 - if (!var3.drawPrimary) { // L: 876 + var4 = var3.x; // L: 898 + var5 = var3.y; // L: 899 + var6 = var3.plane; // L: 900 + var7 = var3.originalPlane; // L: 901 + var8 = this.tiles[var6]; // L: 902 + if (!var3.drawPrimary) { // L: 903 break; } - if (var2) { // L: 877 - if (var6 > 0) { // L: 878 - var9 = this.tiles[var6 - 1][var4][var5]; // L: 879 - if (var9 != null && var9.drawSecondary) { // L: 880 + if (var2) { // L: 904 + if (var6 > 0) { // L: 905 + var9 = this.tiles[var6 - 1][var4][var5]; // L: 906 + if (var9 != null && var9.drawSecondary) { // L: 907 continue; } } - if (var4 <= Scene_cameraXTile && var4 > Scene_cameraXTileMin) { // L: 882 - var9 = var8[var4 - 1][var5]; // L: 883 - if (var9 != null && var9.drawSecondary && (var9.drawPrimary || (var3.gameObjectsEdgeMask & 1) == 0)) { // L: 884 + if (var4 <= Scene_cameraXTile && var4 > Scene_cameraXTileMin) { // L: 909 + var9 = var8[var4 - 1][var5]; // L: 910 + if (var9 != null && var9.drawSecondary && (var9.drawPrimary || (var3.gameObjectsEdgeMask & 1) == 0)) { // L: 911 continue; } } - if (var4 >= Scene_cameraXTile && var4 < Scene_cameraXTileMax - 1) { // L: 886 - var9 = var8[var4 + 1][var5]; // L: 887 - if (var9 != null && var9.drawSecondary && (var9.drawPrimary || (var3.gameObjectsEdgeMask & 4) == 0)) { // L: 888 + if (var4 >= Scene_cameraXTile && var4 < Scene_cameraXTileMax - 1) { // L: 913 + var9 = var8[var4 + 1][var5]; // L: 914 + if (var9 != null && var9.drawSecondary && (var9.drawPrimary || (var3.gameObjectsEdgeMask & 4) == 0)) { // L: 915 continue; } } - if (var5 <= Scene_cameraYTile && var5 > Scene_cameraYTileMin) { // L: 890 - var9 = var8[var4][var5 - 1]; // L: 891 - if (var9 != null && var9.drawSecondary && (var9.drawPrimary || (var3.gameObjectsEdgeMask & 8) == 0)) { // L: 892 + if (var5 <= Scene_cameraYTile && var5 > Scene_cameraYTileMin) { // L: 917 + var9 = var8[var4][var5 - 1]; // L: 918 + if (var9 != null && var9.drawSecondary && (var9.drawPrimary || (var3.gameObjectsEdgeMask & 8) == 0)) { // L: 919 continue; } } - if (var5 >= Scene_cameraYTile && var5 < Scene_cameraYTileMax - 1) { // L: 894 - var9 = var8[var4][var5 + 1]; // L: 895 - if (var9 != null && var9.drawSecondary && (var9.drawPrimary || (var3.gameObjectsEdgeMask & 2) == 0)) { // L: 896 + if (var5 >= Scene_cameraYTile && var5 < Scene_cameraYTileMax - 1) { // L: 921 + var9 = var8[var4][var5 + 1]; // L: 922 + if (var9 != null && var9.drawSecondary && (var9.drawPrimary || (var3.gameObjectsEdgeMask & 2) == 0)) { // L: 923 continue; } } } else { - var2 = true; // L: 899 + var2 = true; // L: 926 } - var3.drawPrimary = false; // L: 900 - if (var3.linkedBelowTile != null) { // L: 901 - var9 = var3.linkedBelowTile; // L: 902 - if (var9.paint != null) { // L: 903 - if (!this.method4000(0, var4, var5)) { // L: 904 + var3.drawPrimary = false; // L: 927 + if (var3.linkedBelowTile != null) { // L: 928 + var9 = var3.linkedBelowTile; // L: 929 + if (var9.paint != null) { // L: 930 + if (!this.method3972(0, var4, var5)) { // L: 931 this.drawTileUnderlay(var9.paint, 0, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var4, var5); } - } else if (var9.model != null && !this.method4000(0, var4, var5)) { // L: 906 907 + } else if (var9.model != null && !this.method3972(0, var4, var5)) { // L: 933 934 this.drawTileOverlay(var9.model, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var4, var5); } - var10 = var9.boundaryObject; // L: 909 - if (var10 != null) { // L: 910 + var10 = var9.boundaryObject; // L: 936 + if (var10 != null) { // L: 937 var10.renderable1.draw(0, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var10.x - Scene_cameraX, var10.tileHeight - Scene_cameraY, var10.y - Scene_cameraZ, var10.tag); } - for (var11 = 0; var11 < var9.gameObjectsCount; ++var11) { // L: 911 - var12 = var9.gameObjects[var11]; // L: 912 - if (var12 != null) { // L: 913 + for (var11 = 0; var11 < var9.gameObjectsCount; ++var11) { // L: 938 + var12 = var9.gameObjects[var11]; // L: 939 + if (var12 != null) { // L: 940 var12.renderable.draw(var12.orientation, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var12.centerX - Scene_cameraX, var12.height - Scene_cameraY, var12.centerY - Scene_cameraZ, var12.tag); } } } - var20 = false; // L: 916 - if (var3.paint != null) { // L: 917 - if (!this.method4000(var7, var4, var5)) { // L: 918 - var20 = true; // L: 919 - if (var3.paint.neColor != 12345678 || checkClick && var6 <= Scene_selectedPlane) { // L: 920 + var20 = false; // L: 943 + if (var3.paint != null) { // L: 944 + if (!this.method3972(var7, var4, var5)) { // L: 945 + var20 = true; // L: 946 + if (var3.paint.neColor != 12345678 || checkClick && var6 <= Scene_selectedPlane) { // L: 947 this.drawTileUnderlay(var3.paint, var7, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var4, var5); } } - } else if (var3.model != null && !this.method4000(var7, var4, var5)) { // L: 923 924 - var20 = true; // L: 925 - this.drawTileOverlay(var3.model, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var4, var5); // L: 926 + } else if (var3.model != null && !this.method3972(var7, var4, var5)) { // L: 950 951 + var20 = true; // L: 952 + this.drawTileOverlay(var3.model, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var4, var5); // L: 953 } - var21 = 0; // L: 929 - var11 = 0; // L: 930 - BoundaryObject var31 = var3.boundaryObject; // L: 931 - WallDecoration var13 = var3.wallDecoration; // L: 932 - if (var31 != null || var13 != null) { // L: 933 - if (var4 == Scene_cameraXTile) { // L: 934 + var21 = 0; // L: 956 + var11 = 0; // L: 957 + BoundaryObject var31 = var3.boundaryObject; // L: 958 + WallDecoration var13 = var3.wallDecoration; // L: 959 + if (var31 != null || var13 != null) { // L: 960 + if (var4 == Scene_cameraXTile) { // L: 961 ++var21; - } else if (Scene_cameraXTile < var4) { // L: 935 + } else if (Scene_cameraXTile < var4) { // L: 962 var21 += 2; } - if (var5 == Scene_cameraYTile) { // L: 936 + if (var5 == Scene_cameraYTile) { // L: 963 var21 += 3; - } else if (Scene_cameraYTile > var5) { // L: 937 + } else if (Scene_cameraYTile > var5) { // L: 964 var21 += 6; } - var11 = field2332[var21]; // L: 938 - var3.field2248 = field2334[var21]; // L: 939 + var11 = field2338[var21]; // L: 965 + var3.field2235 = field2340[var21]; // L: 966 } - if (var31 != null) { // L: 941 - if ((var31.orientationA & field2333[var21]) != 0) { // L: 942 - if (var31.orientationA == 16) { // L: 943 - var3.drawGameObjectEdges = 3; // L: 944 - var3.field2246 = field2335[var21]; // L: 945 - var3.field2247 = 3 - var3.field2246; // L: 946 - } else if (var31.orientationA == 32) { // L: 948 - var3.drawGameObjectEdges = 6; // L: 949 - var3.field2246 = field2336[var21]; // L: 950 - var3.field2247 = 6 - var3.field2246; // L: 951 - } else if (var31.orientationA == 64) { // L: 953 - var3.drawGameObjectEdges = 12; // L: 954 - var3.field2246 = field2337[var21]; // L: 955 - var3.field2247 = 12 - var3.field2246; // L: 956 + if (var31 != null) { // L: 968 + if ((var31.orientationA & field2352[var21]) != 0) { // L: 969 + if (var31.orientationA == 16) { // L: 970 + var3.drawGameObjectEdges = 3; // L: 971 + var3.field2254 = field2341[var21]; // L: 972 + var3.field2244 = 3 - var3.field2254; // L: 973 + } else if (var31.orientationA == 32) { // L: 975 + var3.drawGameObjectEdges = 6; // L: 976 + var3.field2254 = field2342[var21]; // L: 977 + var3.field2244 = 6 - var3.field2254; // L: 978 + } else if (var31.orientationA == 64) { // L: 980 + var3.drawGameObjectEdges = 12; // L: 981 + var3.field2254 = field2305[var21]; // L: 982 + var3.field2244 = 12 - var3.field2254; // L: 983 } else { - var3.drawGameObjectEdges = 9; // L: 959 - var3.field2246 = field2338[var21]; // L: 960 - var3.field2247 = 9 - var3.field2246; // L: 961 + var3.drawGameObjectEdges = 9; // L: 986 + var3.field2254 = field2344[var21]; // L: 987 + var3.field2244 = 9 - var3.field2254; // L: 988 } } else { - var3.drawGameObjectEdges = 0; // L: 964 + var3.drawGameObjectEdges = 0; // L: 991 } - if ((var31.orientationA & var11) != 0 && !this.method3950(var7, var4, var5, var31.orientationA)) { // L: 965 + if ((var31.orientationA & var11) != 0 && !this.method3973(var7, var4, var5, var31.orientationA)) { // L: 992 var31.renderable1.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.orientationB & var11) != 0 && !this.method3950(var7, var4, var5, var31.orientationB)) { // L: 966 + if ((var31.orientationB & var11) != 0 && !this.method3973(var7, var4, var5, var31.orientationB)) { // L: 993 var31.renderable2.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 (var13 != null && !this.method3951(var7, var4, var5, var13.renderable1.height)) { // L: 968 - if ((var13.orientation & var11) != 0) { // L: 969 - var13.renderable1.draw(0, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var13.x - Scene_cameraX + var13.xOffset, var13.tileHeight - Scene_cameraY, var13.y - Scene_cameraZ + var13.yOffset, var13.tag); // L: 970 - } else if (var13.orientation == 256) { // L: 972 - var14 = var13.x - Scene_cameraX; // L: 973 - var15 = var13.tileHeight - Scene_cameraY; // L: 974 - var16 = var13.y - Scene_cameraZ; // L: 975 - var17 = var13.orientation2; // L: 976 - if (var17 != 1 && var17 != 2) { // L: 978 - var18 = var14; // L: 979 + if (var13 != null && !this.method3974(var7, var4, var5, var13.renderable1.height)) { // L: 995 + if ((var13.orientation & var11) != 0) { // L: 996 + var13.renderable1.draw(0, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var13.x - Scene_cameraX + var13.xOffset, var13.tileHeight - Scene_cameraY, var13.y - Scene_cameraZ + var13.yOffset, var13.tag); // L: 997 + } else if (var13.orientation == 256) { // L: 999 + var14 = var13.x - Scene_cameraX; // L: 1000 + var15 = var13.tileHeight - Scene_cameraY; // L: 1001 + var16 = var13.y - Scene_cameraZ; // L: 1002 + var17 = var13.orientation2; // L: 1003 + if (var17 != 1 && var17 != 2) { // L: 1005 + var18 = var14; // L: 1006 } else { var18 = -var14; } int var19; - if (var17 != 2 && var17 != 3) { // L: 981 - var19 = var16; // L: 982 + if (var17 != 2 && var17 != 3) { // L: 1008 + var19 = var16; // L: 1009 } else { var19 = -var16; } - if (var19 < var18) { // L: 983 - var13.renderable1.draw(0, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var14 + var13.xOffset, var15, var16 + var13.yOffset, var13.tag); // L: 984 - } else if (var13.renderable2 != null) { // L: 986 - var13.renderable2.draw(0, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var14, var15, var16, var13.tag); // L: 987 + if (var19 < var18) { // L: 1010 + var13.renderable1.draw(0, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var14 + var13.xOffset, var15, var16 + var13.yOffset, var13.tag); // L: 1011 + } else if (var13.renderable2 != null) { // L: 1013 + var13.renderable2.draw(0, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var14, var15, var16, var13.tag); // L: 1014 } } } - if (var20) { // L: 991 - FloorDecoration var22 = var3.floorDecoration; // L: 992 - if (var22 != null) { // L: 993 + if (var20) { // L: 1018 + FloorDecoration var22 = var3.floorDecoration; // L: 1019 + if (var22 != null) { // L: 1020 var22.renderable.draw(0, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var22.x - Scene_cameraX, var22.tileHeight - Scene_cameraY, var22.y - Scene_cameraZ, var22.tag); } - ItemLayer var23 = var3.itemLayer; // L: 994 - if (var23 != null && var23.height == 0) { // L: 995 - if (var23.second != null) { // L: 996 + ItemLayer var23 = var3.itemLayer; // L: 1021 + if (var23 != null && var23.height == 0) { // L: 1022 + if (var23.second != null) { // L: 1023 var23.second.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.third != null) { // L: 997 + if (var23.third != null) { // L: 1024 var23.third.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.first != null) { // L: 998 + if (var23.first != null) { // L: 1025 var23.first.draw(0, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var23.x - Scene_cameraX, var23.tileHeight - Scene_cameraY, var23.y - Scene_cameraZ, var23.tag); } } } - var14 = var3.gameObjectsEdgeMask; // L: 1001 - if (var14 != 0) { // L: 1002 - if (var4 < Scene_cameraXTile && (var14 & 4) != 0) { // L: 1003 - var36 = var8[var4 + 1][var5]; // L: 1004 - if (var36 != null && var36.drawSecondary) { // L: 1005 + var14 = var3.gameObjectsEdgeMask; // L: 1028 + if (var14 != 0) { // L: 1029 + if (var4 < Scene_cameraXTile && (var14 & 4) != 0) { // L: 1030 + var36 = var8[var4 + 1][var5]; // L: 1031 + if (var36 != null && var36.drawSecondary) { // L: 1032 Scene_tilesDeque.addFirst(var36); } } - if (var5 < Scene_cameraYTile && (var14 & 2) != 0) { // L: 1007 - var36 = var8[var4][var5 + 1]; // L: 1008 - if (var36 != null && var36.drawSecondary) { // L: 1009 + if (var5 < Scene_cameraYTile && (var14 & 2) != 0) { // L: 1034 + var36 = var8[var4][var5 + 1]; // L: 1035 + if (var36 != null && var36.drawSecondary) { // L: 1036 Scene_tilesDeque.addFirst(var36); } } - if (var4 > Scene_cameraXTile && (var14 & 1) != 0) { // L: 1011 - var36 = var8[var4 - 1][var5]; // L: 1012 - if (var36 != null && var36.drawSecondary) { // L: 1013 + if (var4 > Scene_cameraXTile && (var14 & 1) != 0) { // L: 1038 + var36 = var8[var4 - 1][var5]; // L: 1039 + if (var36 != null && var36.drawSecondary) { // L: 1040 Scene_tilesDeque.addFirst(var36); } } - if (var5 > Scene_cameraYTile && (var14 & 8) != 0) { // L: 1015 - var36 = var8[var4][var5 - 1]; // L: 1016 - if (var36 != null && var36.drawSecondary) { // L: 1017 + if (var5 > Scene_cameraYTile && (var14 & 8) != 0) { // L: 1042 + var36 = var8[var4][var5 - 1]; // L: 1043 + if (var36 != null && var36.drawSecondary) { // L: 1044 Scene_tilesDeque.addFirst(var36); } } @@ -1516,372 +1525,372 @@ public class Scene { break; } - if (var3.drawGameObjectEdges != 0) { // L: 1021 - var20 = true; // L: 1022 + if (var3.drawGameObjectEdges != 0) { // L: 1048 + var20 = true; // L: 1049 - for (var21 = 0; var21 < var3.gameObjectsCount; ++var21) { // L: 1023 - if (var3.gameObjects[var21].lastDrawn != Scene_drawnCount && (var3.gameObjectEdgeMasks[var21] & var3.drawGameObjectEdges) == var3.field2246) { // L: 1024 - var20 = false; // L: 1025 - break; // L: 1026 + for (var21 = 0; var21 < var3.gameObjectsCount; ++var21) { // L: 1050 + if (var3.gameObjects[var21].lastDrawn != Scene_drawnCount && (var3.gameObjectEdgeMasks[var21] & var3.drawGameObjectEdges) == var3.field2254) { // L: 1051 + var20 = false; // L: 1052 + break; // L: 1053 } } - if (var20) { // L: 1029 - var10 = var3.boundaryObject; // L: 1030 - if (!this.method3950(var7, var4, var5, var10.orientationA)) { // L: 1031 + if (var20) { // L: 1056 + var10 = var3.boundaryObject; // L: 1057 + if (!this.method3973(var7, var4, var5, var10.orientationA)) { // L: 1058 var10.renderable1.draw(0, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var10.x - Scene_cameraX, var10.tileHeight - Scene_cameraY, var10.y - Scene_cameraZ, var10.tag); } - var3.drawGameObjectEdges = 0; // L: 1032 + var3.drawGameObjectEdges = 0; // L: 1059 } } - if (!var3.drawGameObjects) { // L: 1035 + if (!var3.drawGameObjects) { // L: 1062 break; } try { - int var34 = var3.gameObjectsCount; // L: 1037 - var3.drawGameObjects = false; // L: 1038 - var21 = 0; // L: 1039 + int var34 = var3.gameObjectsCount; // L: 1064 + var3.drawGameObjects = false; // L: 1065 + var21 = 0; // L: 1066 label563: - for (var11 = 0; var11 < var34; ++var11) { // L: 1040 - var12 = var3.gameObjects[var11]; // L: 1041 - if (var12.lastDrawn != Scene_drawnCount) { // L: 1042 - for (var24 = var12.startX; var24 <= var12.endX; ++var24) { // L: 1043 - for (var14 = var12.startY; var14 <= var12.endY; ++var14) { // L: 1044 - var36 = var8[var24][var14]; // L: 1045 - if (var36.drawPrimary) { // L: 1046 - var3.drawGameObjects = true; // L: 1047 - continue label563; // L: 1048 + for (var11 = 0; var11 < var34; ++var11) { // L: 1067 + var12 = var3.gameObjects[var11]; // L: 1068 + if (var12.lastDrawn != Scene_drawnCount) { // L: 1069 + for (var24 = var12.startX; var24 <= var12.endX; ++var24) { // L: 1070 + for (var14 = var12.startY; var14 <= var12.endY; ++var14) { // L: 1071 + var36 = var8[var24][var14]; // L: 1072 + if (var36.drawPrimary) { // L: 1073 + var3.drawGameObjects = true; // L: 1074 + continue label563; // L: 1075 } - if (var36.drawGameObjectEdges != 0) { // L: 1050 - var16 = 0; // L: 1051 - if (var24 > var12.startX) { // L: 1052 + if (var36.drawGameObjectEdges != 0) { // L: 1077 + var16 = 0; // L: 1078 + if (var24 > var12.startX) { // L: 1079 ++var16; } - if (var24 < var12.endX) { // L: 1053 + if (var24 < var12.endX) { // L: 1080 var16 += 4; } - if (var14 > var12.startY) { // L: 1054 + if (var14 > var12.startY) { // L: 1081 var16 += 8; } - if (var14 < var12.endY) { // L: 1055 + if (var14 < var12.endY) { // L: 1082 var16 += 2; } - if ((var16 & var36.drawGameObjectEdges) == var3.field2247) { // L: 1056 - var3.drawGameObjects = true; // L: 1057 - continue label563; // L: 1058 + if ((var16 & var36.drawGameObjectEdges) == var3.field2244) { // L: 1083 + var3.drawGameObjects = true; // L: 1084 + continue label563; // L: 1085 } } } } - gameObjects[var21++] = var12; // L: 1063 - var24 = Scene_cameraXTile - var12.startX; // L: 1064 - var14 = var12.endX - Scene_cameraXTile; // L: 1065 - if (var14 > var24) { // L: 1066 + gameObjects[var21++] = var12; // L: 1090 + var24 = Scene_cameraXTile - var12.startX; // L: 1091 + var14 = var12.endX - Scene_cameraXTile; // L: 1092 + if (var14 > var24) { // L: 1093 var24 = var14; } - var15 = Scene_cameraYTile - var12.startY; // L: 1067 - var16 = var12.endY - Scene_cameraYTile; // L: 1068 - if (var16 > var15) { // L: 1069 - var12.field2543 = var24 + var16; + var15 = Scene_cameraYTile - var12.startY; // L: 1094 + var16 = var12.endY - Scene_cameraYTile; // L: 1095 + if (var16 > var15) { // L: 1096 + var12.field2554 = var24 + var16; } else { - var12.field2543 = var24 + var15; // L: 1070 + var12.field2554 = var24 + var15; // L: 1097 } } } - while (var21 > 0) { // L: 1073 - var11 = -50; // L: 1074 - var25 = -1; // L: 1075 + while (var21 > 0) { // L: 1100 + var11 = -50; // L: 1101 + var25 = -1; // L: 1102 - for (var24 = 0; var24 < var21; ++var24) { // L: 1076 - GameObject var35 = gameObjects[var24]; // L: 1077 - if (var35.lastDrawn != Scene_drawnCount) { // L: 1078 - if (var35.field2543 > var11) { // L: 1079 - var11 = var35.field2543; // L: 1080 - var25 = var24; // L: 1081 - } else if (var11 == var35.field2543) { // L: 1083 - var15 = var35.centerX - Scene_cameraX; // L: 1084 - var16 = var35.centerY - Scene_cameraZ; // L: 1085 - var17 = gameObjects[var25].centerX - Scene_cameraX; // L: 1086 - var18 = gameObjects[var25].centerY - Scene_cameraZ; // L: 1087 - if (var15 * var15 + var16 * var16 > var17 * var17 + var18 * var18) { // L: 1088 + for (var24 = 0; var24 < var21; ++var24) { // L: 1103 + GameObject var35 = gameObjects[var24]; // L: 1104 + if (var35.lastDrawn != Scene_drawnCount) { // L: 1105 + if (var35.field2554 > var11) { // L: 1106 + var11 = var35.field2554; // L: 1107 + var25 = var24; // L: 1108 + } else if (var11 == var35.field2554) { // L: 1110 + var15 = var35.centerX - Scene_cameraX; // L: 1111 + var16 = var35.centerY - Scene_cameraZ; // L: 1112 + var17 = gameObjects[var25].centerX - Scene_cameraX; // L: 1113 + var18 = gameObjects[var25].centerY - Scene_cameraZ; // L: 1114 + if (var15 * var15 + var16 * var16 > var17 * var17 + var18 * var18) { // L: 1115 var25 = var24; } } } } - if (var25 == -1) { // L: 1092 + if (var25 == -1) { // L: 1119 break; } - GameObject var33 = gameObjects[var25]; // L: 1093 - var33.lastDrawn = Scene_drawnCount; // L: 1094 - if (!this.method3995(var7, var33.startX, var33.endX, var33.startY, var33.endY, var33.renderable.height)) { // L: 1095 - var33.renderable.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); // L: 1096 + GameObject var33 = gameObjects[var25]; // L: 1120 + var33.lastDrawn = Scene_drawnCount; // L: 1121 + if (!this.method3975(var7, var33.startX, var33.endX, var33.startY, var33.endY, var33.renderable.height)) { // L: 1122 + var33.renderable.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); // L: 1123 } - for (var14 = var33.startX; var14 <= var33.endX; ++var14) { // L: 1098 - for (var15 = var33.startY; var15 <= var33.endY; ++var15) { // L: 1099 - Tile var26 = var8[var14][var15]; // L: 1100 - if (var26.drawGameObjectEdges != 0) { // L: 1101 + for (var14 = var33.startX; var14 <= var33.endX; ++var14) { // L: 1125 + for (var15 = var33.startY; var15 <= var33.endY; ++var15) { // L: 1126 + Tile var26 = var8[var14][var15]; // L: 1127 + if (var26.drawGameObjectEdges != 0) { // L: 1128 Scene_tilesDeque.addFirst(var26); - } else if ((var14 != var4 || var15 != var5) && var26.drawSecondary) { // L: 1102 + } else if ((var14 != var4 || var15 != var5) && var26.drawSecondary) { // L: 1129 Scene_tilesDeque.addFirst(var26); } } } } - if (!var3.drawGameObjects) { // L: 1106 + if (!var3.drawGameObjects) { // L: 1133 break; } - } catch (Exception var28) { // L: 1108 - var3.drawGameObjects = false; // L: 1109 + } catch (Exception var28) { // L: 1135 + var3.drawGameObjects = false; // L: 1136 break; } } - } while(!var3.drawSecondary); // L: 1112 - } while(var3.drawGameObjectEdges != 0); // L: 1113 + } while(!var3.drawSecondary); // L: 1139 + } while(var3.drawGameObjectEdges != 0); // L: 1140 - if (var4 > Scene_cameraXTile || var4 <= Scene_cameraXTileMin) { // L: 1114 + if (var4 > Scene_cameraXTile || var4 <= Scene_cameraXTileMin) { // L: 1141 break; } - var9 = var8[var4 - 1][var5]; // L: 1115 - } while(var9 != null && var9.drawSecondary); // L: 1116 + var9 = var8[var4 - 1][var5]; // L: 1142 + } while(var9 != null && var9.drawSecondary); // L: 1143 - if (var4 < Scene_cameraXTile || var4 >= Scene_cameraXTileMax - 1) { // L: 1118 + if (var4 < Scene_cameraXTile || var4 >= Scene_cameraXTileMax - 1) { // L: 1145 break; } - var9 = var8[var4 + 1][var5]; // L: 1119 - } while(var9 != null && var9.drawSecondary); // L: 1120 + var9 = var8[var4 + 1][var5]; // L: 1146 + } while(var9 != null && var9.drawSecondary); // L: 1147 - if (var5 > Scene_cameraYTile || var5 <= Scene_cameraYTileMin) { // L: 1122 + if (var5 > Scene_cameraYTile || var5 <= Scene_cameraYTileMin) { // L: 1149 break; } - var9 = var8[var4][var5 - 1]; // L: 1123 - } while(var9 != null && var9.drawSecondary); // L: 1124 + var9 = var8[var4][var5 - 1]; // L: 1150 + } while(var9 != null && var9.drawSecondary); // L: 1151 - if (var5 < Scene_cameraYTile || var5 >= Scene_cameraYTileMax - 1) { // L: 1126 + if (var5 < Scene_cameraYTile || var5 >= Scene_cameraYTileMax - 1) { // L: 1153 break; } - var9 = var8[var4][var5 + 1]; // L: 1127 - } while(var9 != null && var9.drawSecondary); // L: 1128 + var9 = var8[var4][var5 + 1]; // L: 1154 + } while(var9 != null && var9.drawSecondary); // L: 1155 - var3.drawSecondary = false; // L: 1130 - --tileUpdateCount; // L: 1131 - ItemLayer var32 = var3.itemLayer; // L: 1132 - if (var32 != null && var32.height != 0) { // L: 1133 - if (var32.second != null) { // L: 1134 + var3.drawSecondary = false; // L: 1157 + --tileUpdateCount; // L: 1158 + ItemLayer var32 = var3.itemLayer; // L: 1159 + if (var32 != null && var32.height != 0) { // L: 1160 + if (var32.second != null) { // L: 1161 var32.second.draw(0, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var32.x - Scene_cameraX, var32.tileHeight - Scene_cameraY - var32.height, var32.y - Scene_cameraZ, var32.tag); } - if (var32.third != null) { // L: 1135 + if (var32.third != null) { // L: 1162 var32.third.draw(0, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var32.x - Scene_cameraX, var32.tileHeight - Scene_cameraY - var32.height, var32.y - Scene_cameraZ, var32.tag); } - if (var32.first != null) { // L: 1136 + if (var32.first != null) { // L: 1163 var32.first.draw(0, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var32.x - Scene_cameraX, var32.tileHeight - Scene_cameraY - var32.height, var32.y - Scene_cameraZ, var32.tag); } } - if (var3.field2248 != 0) { // L: 1138 - WallDecoration var29 = var3.wallDecoration; // L: 1139 - if (var29 != null && !this.method3951(var7, var4, var5, var29.renderable1.height)) { // L: 1140 - if ((var29.orientation & var3.field2248) != 0) { // L: 1141 - var29.renderable1.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); // L: 1142 - } else if (var29.orientation == 256) { // L: 1144 - var11 = var29.x - Scene_cameraX; // L: 1145 - var25 = var29.tileHeight - Scene_cameraY; // L: 1146 - var24 = var29.y - Scene_cameraZ; // L: 1147 - var14 = var29.orientation2; // L: 1148 - if (var14 != 1 && var14 != 2) { // L: 1150 - var15 = var11; // L: 1151 + if (var3.field2235 != 0) { // L: 1165 + WallDecoration var29 = var3.wallDecoration; // L: 1166 + if (var29 != null && !this.method3974(var7, var4, var5, var29.renderable1.height)) { // L: 1167 + if ((var29.orientation & var3.field2235) != 0) { // L: 1168 + var29.renderable1.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); // L: 1169 + } else if (var29.orientation == 256) { // L: 1171 + var11 = var29.x - Scene_cameraX; // L: 1172 + var25 = var29.tileHeight - Scene_cameraY; // L: 1173 + var24 = var29.y - Scene_cameraZ; // L: 1174 + var14 = var29.orientation2; // L: 1175 + if (var14 != 1 && var14 != 2) { // L: 1177 + var15 = var11; // L: 1178 } else { var15 = -var11; } - if (var14 != 2 && var14 != 3) { // L: 1153 - var16 = var24; // L: 1154 + if (var14 != 2 && var14 != 3) { // L: 1180 + var16 = var24; // L: 1181 } else { var16 = -var24; } - if (var16 >= var15) { // L: 1155 - var29.renderable1.draw(0, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var11 + var29.xOffset, var25, var24 + var29.yOffset, var29.tag); // L: 1156 - } else if (var29.renderable2 != null) { // L: 1158 - var29.renderable2.draw(0, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var11, var25, var24, var29.tag); // L: 1159 + if (var16 >= var15) { // L: 1182 + var29.renderable1.draw(0, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var11 + var29.xOffset, var25, var24 + var29.yOffset, var29.tag); // L: 1183 + } else if (var29.renderable2 != null) { // L: 1185 + var29.renderable2.draw(0, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var11, var25, var24, var29.tag); // L: 1186 } } } - BoundaryObject var27 = var3.boundaryObject; // L: 1163 - if (var27 != null) { // L: 1164 - if ((var27.orientationB & var3.field2248) != 0 && !this.method3950(var7, var4, var5, var27.orientationB)) { // L: 1165 + BoundaryObject var27 = var3.boundaryObject; // L: 1190 + if (var27 != null) { // L: 1191 + if ((var27.orientationB & var3.field2235) != 0 && !this.method3973(var7, var4, var5, var27.orientationB)) { // L: 1192 var27.renderable2.draw(0, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var27.x - Scene_cameraX, var27.tileHeight - Scene_cameraY, var27.y - Scene_cameraZ, var27.tag); } - if ((var27.orientationA & var3.field2248) != 0 && !this.method3950(var7, var4, var5, var27.orientationA)) { // L: 1166 + if ((var27.orientationA & var3.field2235) != 0 && !this.method3973(var7, var4, var5, var27.orientationA)) { // L: 1193 var27.renderable1.draw(0, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var27.x - Scene_cameraX, var27.tileHeight - Scene_cameraY, var27.y - Scene_cameraZ, var27.tag); } } } Tile var30; - if (var6 < this.planes - 1) { // L: 1169 - var30 = this.tiles[var6 + 1][var4][var5]; // L: 1170 - if (var30 != null && var30.drawSecondary) { // L: 1171 + if (var6 < this.planes - 1) { // L: 1196 + var30 = this.tiles[var6 + 1][var4][var5]; // L: 1197 + if (var30 != null && var30.drawSecondary) { // L: 1198 Scene_tilesDeque.addFirst(var30); } } - if (var4 < Scene_cameraXTile) { // L: 1173 - var30 = var8[var4 + 1][var5]; // L: 1174 - if (var30 != null && var30.drawSecondary) { // L: 1175 + if (var4 < Scene_cameraXTile) { // L: 1200 + var30 = var8[var4 + 1][var5]; // L: 1201 + if (var30 != null && var30.drawSecondary) { // L: 1202 Scene_tilesDeque.addFirst(var30); } } - if (var5 < Scene_cameraYTile) { // L: 1177 - var30 = var8[var4][var5 + 1]; // L: 1178 - if (var30 != null && var30.drawSecondary) { // L: 1179 + if (var5 < Scene_cameraYTile) { // L: 1204 + var30 = var8[var4][var5 + 1]; // L: 1205 + if (var30 != null && var30.drawSecondary) { // L: 1206 Scene_tilesDeque.addFirst(var30); } } - if (var4 > Scene_cameraXTile) { // L: 1181 - var30 = var8[var4 - 1][var5]; // L: 1182 - if (var30 != null && var30.drawSecondary) { // L: 1183 + if (var4 > Scene_cameraXTile) { // L: 1208 + var30 = var8[var4 - 1][var5]; // L: 1209 + if (var30 != null && var30.drawSecondary) { // L: 1210 Scene_tilesDeque.addFirst(var30); } } - if (var5 > Scene_cameraYTile) { // L: 1185 - var30 = var8[var4][var5 - 1]; // L: 1186 - if (var30 != null && var30.drawSecondary) { // L: 1187 + if (var5 > Scene_cameraYTile) { // L: 1212 + var30 = var8[var4][var5 - 1]; // L: 1213 + if (var30 != null && var30.drawSecondary) { // L: 1214 Scene_tilesDeque.addFirst(var30); } } } } - @ObfuscatedName("ad") + @ObfuscatedName("ao") @ObfuscatedSignature( - descriptor = "(Lgh;IIIIIII)V" + descriptor = "(Lga;IIIIIII)V" ) @Export("drawTileUnderlay") void drawTileUnderlay(SceneTilePaint var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8) { int var9; - int var10 = var9 = (var7 << 7) - Scene_cameraX; // L: 1195 + int var10 = var9 = (var7 << 7) - Scene_cameraX; // L: 1222 int var11; - int var12 = var11 = (var8 << 7) - Scene_cameraZ; // L: 1197 + int var12 = var11 = (var8 << 7) - Scene_cameraZ; // L: 1224 int var13; - int var14 = var13 = var10 + 128; // L: 1199 + int var14 = var13 = var10 + 128; // L: 1226 int var15; - int var16 = var15 = var12 + 128; // L: 1201 - int var17 = this.tileHeights[var2][var7][var8] - Scene_cameraY; // L: 1202 - int var18 = this.tileHeights[var2][var7 + 1][var8] - Scene_cameraY; // L: 1203 - int var19 = this.tileHeights[var2][var7 + 1][var8 + 1] - Scene_cameraY; // L: 1204 - int var20 = this.tileHeights[var2][var7][var8 + 1] - Scene_cameraY; // L: 1205 - int var21 = var10 * var6 + var5 * var12 >> 16; // L: 1206 - var12 = var12 * var6 - var5 * var10 >> 16; // L: 1207 - var10 = var21; // L: 1208 - var21 = var17 * var4 - var3 * var12 >> 16; // L: 1209 - var12 = var3 * var17 + var12 * var4 >> 16; // L: 1210 - var17 = var21; // L: 1211 - if (var12 >= 50) { // L: 1212 - var21 = var14 * var6 + var5 * var11 >> 16; // L: 1213 - var11 = var11 * var6 - var5 * var14 >> 16; // L: 1214 - var14 = var21; // L: 1215 - var21 = var18 * var4 - var3 * var11 >> 16; // L: 1216 - var11 = var3 * var18 + var11 * var4 >> 16; // L: 1217 - var18 = var21; // L: 1218 - if (var11 >= 50) { // L: 1219 - var21 = var13 * var6 + var5 * var16 >> 16; // L: 1220 - var16 = var16 * var6 - var5 * var13 >> 16; // L: 1221 - var13 = var21; // L: 1222 - var21 = var19 * var4 - var3 * var16 >> 16; // L: 1223 - var16 = var3 * var19 + var16 * var4 >> 16; // L: 1224 - var19 = var21; // L: 1225 - if (var16 >= 50) { // L: 1226 - var21 = var9 * var6 + var5 * var15 >> 16; // L: 1227 - var15 = var15 * var6 - var5 * var9 >> 16; // L: 1228 - var9 = var21; // L: 1229 - var21 = var20 * var4 - var3 * var15 >> 16; // L: 1230 - var15 = var3 * var20 + var15 * var4 >> 16; // L: 1231 - if (var15 >= 50) { // L: 1233 - int var22 = var10 * Rasterizer3D.Rasterizer3D_zoom / var12 + Rasterizer3D.Rasterizer3D_clipMidX; // L: 1234 - int var23 = var17 * Rasterizer3D.Rasterizer3D_zoom / var12 + Rasterizer3D.Rasterizer3D_clipMidY; // L: 1235 - int var24 = var14 * Rasterizer3D.Rasterizer3D_zoom / var11 + Rasterizer3D.Rasterizer3D_clipMidX; // L: 1236 - int var25 = var18 * Rasterizer3D.Rasterizer3D_zoom / var11 + Rasterizer3D.Rasterizer3D_clipMidY; // L: 1237 - int var26 = var13 * Rasterizer3D.Rasterizer3D_zoom / var16 + Rasterizer3D.Rasterizer3D_clipMidX; // L: 1238 - int var27 = var19 * Rasterizer3D.Rasterizer3D_zoom / var16 + Rasterizer3D.Rasterizer3D_clipMidY; // L: 1239 - int var28 = var9 * Rasterizer3D.Rasterizer3D_zoom / var15 + Rasterizer3D.Rasterizer3D_clipMidX; // L: 1240 - int var29 = var21 * Rasterizer3D.Rasterizer3D_zoom / var15 + Rasterizer3D.Rasterizer3D_clipMidY; // L: 1241 - Rasterizer3D.Rasterizer3D_alpha = 0; // L: 1242 + int var16 = var15 = var12 + 128; // L: 1228 + int var17 = this.tileHeights[var2][var7][var8] - Scene_cameraY; // L: 1229 + int var18 = this.tileHeights[var2][var7 + 1][var8] - Scene_cameraY; // L: 1230 + int var19 = this.tileHeights[var2][var7 + 1][var8 + 1] - Scene_cameraY; // L: 1231 + int var20 = this.tileHeights[var2][var7][var8 + 1] - Scene_cameraY; // L: 1232 + int var21 = var10 * var6 + var5 * var12 >> 16; // L: 1233 + var12 = var12 * var6 - var5 * var10 >> 16; // L: 1234 + var10 = var21; // L: 1235 + var21 = var17 * var4 - var3 * var12 >> 16; // L: 1236 + var12 = var3 * var17 + var12 * var4 >> 16; // L: 1237 + var17 = var21; // L: 1238 + if (var12 >= 50) { // L: 1239 + var21 = var14 * var6 + var5 * var11 >> 16; // L: 1240 + var11 = var11 * var6 - var5 * var14 >> 16; // L: 1241 + var14 = var21; // L: 1242 + var21 = var18 * var4 - var3 * var11 >> 16; // L: 1243 + var11 = var3 * var18 + var11 * var4 >> 16; // L: 1244 + var18 = var21; // L: 1245 + if (var11 >= 50) { // L: 1246 + var21 = var13 * var6 + var5 * var16 >> 16; // L: 1247 + var16 = var16 * var6 - var5 * var13 >> 16; // L: 1248 + var13 = var21; // L: 1249 + var21 = var19 * var4 - var3 * var16 >> 16; // L: 1250 + var16 = var3 * var19 + var16 * var4 >> 16; // L: 1251 + var19 = var21; // L: 1252 + if (var16 >= 50) { // L: 1253 + var21 = var9 * var6 + var5 * var15 >> 16; // L: 1254 + var15 = var15 * var6 - var5 * var9 >> 16; // L: 1255 + var9 = var21; // L: 1256 + var21 = var20 * var4 - var3 * var15 >> 16; // L: 1257 + var15 = var3 * var20 + var15 * var4 >> 16; // L: 1258 + if (var15 >= 50) { // L: 1260 + int var22 = var10 * Rasterizer3D.Rasterizer3D_zoom / var12 + Rasterizer3D.Rasterizer3D_clipMidX; // L: 1261 + int var23 = var17 * Rasterizer3D.Rasterizer3D_zoom / var12 + Rasterizer3D.Rasterizer3D_clipMidY; // L: 1262 + int var24 = var14 * Rasterizer3D.Rasterizer3D_zoom / var11 + Rasterizer3D.Rasterizer3D_clipMidX; // L: 1263 + int var25 = var18 * Rasterizer3D.Rasterizer3D_zoom / var11 + Rasterizer3D.Rasterizer3D_clipMidY; // L: 1264 + int var26 = var13 * Rasterizer3D.Rasterizer3D_zoom / var16 + Rasterizer3D.Rasterizer3D_clipMidX; // L: 1265 + int var27 = var19 * Rasterizer3D.Rasterizer3D_zoom / var16 + Rasterizer3D.Rasterizer3D_clipMidY; // L: 1266 + int var28 = var9 * Rasterizer3D.Rasterizer3D_zoom / var15 + Rasterizer3D.Rasterizer3D_clipMidX; // L: 1267 + int var29 = var21 * Rasterizer3D.Rasterizer3D_zoom / var15 + Rasterizer3D.Rasterizer3D_clipMidY; // L: 1268 + Rasterizer3D.Rasterizer3D_alpha = 0; // L: 1269 int var30; - if ((var26 - var28) * (var25 - var29) - (var27 - var29) * (var24 - var28) > 0) { // L: 1243 - Rasterizer3D.field2260 = false; // L: 1244 - if (var26 < 0 || var28 < 0 || var24 < 0 || var26 > Rasterizer3D.Rasterizer3D_clipWidth || var28 > Rasterizer3D.Rasterizer3D_clipWidth || var24 > Rasterizer3D.Rasterizer3D_clipWidth) { // L: 1245 - Rasterizer3D.field2260 = true; + if ((var26 - var28) * (var25 - var29) - (var27 - var29) * (var24 - var28) > 0) { // L: 1270 + Rasterizer3D.field2262 = false; // L: 1271 + if (var26 < 0 || var28 < 0 || var24 < 0 || var26 > Rasterizer3D.Rasterizer3D_clipWidth || var28 > Rasterizer3D.Rasterizer3D_clipWidth || var24 > Rasterizer3D.Rasterizer3D_clipWidth) { // L: 1272 + Rasterizer3D.field2262 = true; } - if (checkClick && containsBounds(Scene_selectedScreenX, Scene_selectedScreenY, var27, var29, var25, var26, var28, var24)) { // L: 1246 - Scene_selectedX = var7; // L: 1247 - Scene_selectedY = var8; // L: 1248 + if (checkClick && containsBounds(Scene_selectedScreenX, Scene_selectedScreenY, var27, var29, var25, var26, var28, var24)) { // L: 1273 + Scene_selectedX = var7; // L: 1274 + Scene_selectedY = var8; // L: 1275 } - if (var1.texture == -1) { // L: 1250 - if (var1.neColor != 12345678) { // L: 1251 - Rasterizer3D.method3824(var27, var29, var25, var26, var28, var24, var1.neColor, var1.nwColor, var1.seColor); + if (var1.texture == -1) { // L: 1277 + if (var1.neColor != 12345678) { // L: 1278 + Rasterizer3D.method3854(var27, var29, var25, var26, var28, var24, var1.neColor, var1.nwColor, var1.seColor); } - } else if (!Scene_isLowDetail) { // L: 1253 - if (var1.isFlat) { // L: 1254 + } else if (!Scene_isLowDetail) { // L: 1280 + if (var1.isFlat) { // L: 1281 Rasterizer3D.drawTexturedTile(var27, var29, var25, var26, var28, var24, var1.neColor, var1.nwColor, var1.seColor, var10, var14, var9, var17, var18, var21, var12, var11, var15, var1.texture); } else { - Rasterizer3D.drawTexturedTile(var27, var29, var25, var26, var28, var24, var1.neColor, var1.nwColor, var1.seColor, var13, var9, var14, var19, var21, var18, var16, var15, var11, var1.texture); // L: 1255 + Rasterizer3D.drawTexturedTile(var27, var29, var25, var26, var28, var24, var1.neColor, var1.nwColor, var1.seColor, var13, var9, var14, var19, var21, var18, var16, var15, var11, var1.texture); // L: 1282 } } else { - var30 = Rasterizer3D.Rasterizer3D_textureLoader.getAverageTextureRGB(var1.texture); // L: 1258 - Rasterizer3D.method3824(var27, var29, var25, var26, var28, var24, method3946(var30, var1.neColor), method3946(var30, var1.nwColor), method3946(var30, var1.seColor)); // L: 1259 + var30 = Rasterizer3D.Rasterizer3D_textureLoader.getAverageTextureRGB(var1.texture); // L: 1285 + Rasterizer3D.method3854(var27, var29, var25, var26, var28, var24, method3969(var30, var1.neColor), method3969(var30, var1.nwColor), method3969(var30, var1.seColor)); // L: 1286 } } - if ((var22 - var24) * (var29 - var25) - (var23 - var25) * (var28 - var24) > 0) { // L: 1262 - Rasterizer3D.field2260 = false; // L: 1263 - if (var22 < 0 || var24 < 0 || var28 < 0 || var22 > Rasterizer3D.Rasterizer3D_clipWidth || var24 > Rasterizer3D.Rasterizer3D_clipWidth || var28 > Rasterizer3D.Rasterizer3D_clipWidth) { // L: 1264 - Rasterizer3D.field2260 = true; + if ((var22 - var24) * (var29 - var25) - (var23 - var25) * (var28 - var24) > 0) { // L: 1289 + Rasterizer3D.field2262 = false; // L: 1290 + if (var22 < 0 || var24 < 0 || var28 < 0 || var22 > Rasterizer3D.Rasterizer3D_clipWidth || var24 > Rasterizer3D.Rasterizer3D_clipWidth || var28 > Rasterizer3D.Rasterizer3D_clipWidth) { // L: 1291 + Rasterizer3D.field2262 = true; } - if (checkClick && containsBounds(Scene_selectedScreenX, Scene_selectedScreenY, var23, var25, var29, var22, var24, var28)) { // L: 1265 - Scene_selectedX = var7; // L: 1266 - Scene_selectedY = var8; // L: 1267 + if (checkClick && containsBounds(Scene_selectedScreenX, Scene_selectedScreenY, var23, var25, var29, var22, var24, var28)) { // L: 1292 + Scene_selectedX = var7; // L: 1293 + Scene_selectedY = var8; // L: 1294 } - if (var1.texture == -1) { // L: 1269 - if (var1.swColor != 12345678) { // L: 1270 - Rasterizer3D.method3824(var23, var25, var29, var22, var24, var28, var1.swColor, var1.seColor, var1.nwColor); + if (var1.texture == -1) { // L: 1296 + if (var1.swColor != 12345678) { // L: 1297 + Rasterizer3D.method3854(var23, var25, var29, var22, var24, var28, var1.swColor, var1.seColor, var1.nwColor); } - } else if (!Scene_isLowDetail) { // L: 1272 - Rasterizer3D.drawTexturedTile(var23, var25, var29, var22, var24, var28, var1.swColor, var1.seColor, var1.nwColor, var10, var14, var9, var17, var18, var21, var12, var11, var15, var1.texture); // L: 1273 + } else if (!Scene_isLowDetail) { // L: 1299 + Rasterizer3D.drawTexturedTile(var23, var25, var29, var22, var24, var28, var1.swColor, var1.seColor, var1.nwColor, var10, var14, var9, var17, var18, var21, var12, var11, var15, var1.texture); // L: 1300 } else { - var30 = Rasterizer3D.Rasterizer3D_textureLoader.getAverageTextureRGB(var1.texture); // L: 1276 - Rasterizer3D.method3824(var23, var25, var29, var22, var24, var28, method3946(var30, var1.swColor), method3946(var30, var1.seColor), method3946(var30, var1.nwColor)); // L: 1277 + var30 = Rasterizer3D.Rasterizer3D_textureLoader.getAverageTextureRGB(var1.texture); // L: 1303 + Rasterizer3D.method3854(var23, var25, var29, var22, var24, var28, method3969(var30, var1.swColor), method3969(var30, var1.seColor), method3969(var30, var1.nwColor)); // L: 1304 } } @@ -1889,462 +1898,462 @@ public class Scene { } } } - } // L: 1280 + } // L: 1307 - @ObfuscatedName("ac") + @ObfuscatedName("aq") @ObfuscatedSignature( - descriptor = "(Lgy;IIIIII)V" + descriptor = "(Lgp;IIIIII)V" ) @Export("drawTileOverlay") void drawTileOverlay(SceneTileModel var1, int var2, int var3, int var4, int var5, int var6, int var7) { - int var8 = var1.vertexX.length; // L: 1283 + int var8 = var1.vertexX.length; // L: 1310 int var9; int var10; int var11; int var12; int var13; - for (var9 = 0; var9 < var8; ++var9) { // L: 1284 - var10 = var1.vertexX[var9] - Scene_cameraX; // L: 1285 - var11 = var1.vertexY[var9] - Scene_cameraY; // L: 1286 - var12 = var1.vertexZ[var9] - Scene_cameraZ; // L: 1287 - var13 = var12 * var4 + var5 * var10 >> 16; // L: 1288 - var12 = var5 * var12 - var10 * var4 >> 16; // L: 1289 - var10 = var13; // L: 1290 - var13 = var3 * var11 - var12 * var2 >> 16; // L: 1291 - var12 = var11 * var2 + var3 * var12 >> 16; // L: 1292 - if (var12 < 50) { // L: 1294 + for (var9 = 0; var9 < var8; ++var9) { // L: 1311 + var10 = var1.vertexX[var9] - Scene_cameraX; // L: 1312 + var11 = var1.vertexY[var9] - Scene_cameraY; // L: 1313 + var12 = var1.vertexZ[var9] - Scene_cameraZ; // L: 1314 + var13 = var12 * var4 + var5 * var10 >> 16; // L: 1315 + var12 = var5 * var12 - var10 * var4 >> 16; // L: 1316 + var10 = var13; // L: 1317 + var13 = var3 * var11 - var12 * var2 >> 16; // L: 1318 + var12 = var11 * var2 + var3 * var12 >> 16; // L: 1319 + if (var12 < 50) { // L: 1321 return; } - if (var1.triangleTextureId != null) { // L: 1295 - SceneTileModel.field2393[var9] = var10; // L: 1296 - SceneTileModel.field2394[var9] = var13; // L: 1297 - SceneTileModel.field2409[var9] = var12; // L: 1298 + if (var1.triangleTextureId != null) { // L: 1322 + SceneTileModel.field2417[var9] = var10; // L: 1323 + SceneTileModel.field2418[var9] = var13; // L: 1324 + SceneTileModel.field2419[var9] = var12; // L: 1325 } - SceneTileModel.field2405[var9] = var10 * Rasterizer3D.Rasterizer3D_zoom / var12 + Rasterizer3D.Rasterizer3D_clipMidX; // L: 1300 - SceneTileModel.field2406[var9] = var13 * Rasterizer3D.Rasterizer3D_zoom / var12 + Rasterizer3D.Rasterizer3D_clipMidY; // L: 1301 + SceneTileModel.field2402[var9] = var10 * Rasterizer3D.Rasterizer3D_zoom / var12 + Rasterizer3D.Rasterizer3D_clipMidX; // L: 1327 + SceneTileModel.field2416[var9] = var13 * Rasterizer3D.Rasterizer3D_zoom / var12 + Rasterizer3D.Rasterizer3D_clipMidY; // L: 1328 } - Rasterizer3D.Rasterizer3D_alpha = 0; // L: 1303 - var8 = var1.faceX.length; // L: 1304 + Rasterizer3D.Rasterizer3D_alpha = 0; // L: 1330 + var8 = var1.faceX.length; // L: 1331 - for (var9 = 0; var9 < var8; ++var9) { // L: 1305 - var10 = var1.faceX[var9]; // L: 1306 - var11 = var1.faceY[var9]; // L: 1307 - var12 = var1.faceZ[var9]; // L: 1308 - var13 = SceneTileModel.field2405[var10]; // L: 1309 - int var14 = SceneTileModel.field2405[var11]; // L: 1310 - int var15 = SceneTileModel.field2405[var12]; // L: 1311 - int var16 = SceneTileModel.field2406[var10]; // L: 1312 - int var17 = SceneTileModel.field2406[var11]; // L: 1313 - int var18 = SceneTileModel.field2406[var12]; // L: 1314 - if ((var13 - var14) * (var18 - var17) - (var16 - var17) * (var15 - var14) > 0) { // L: 1315 - Rasterizer3D.field2260 = false; // L: 1316 - if (var13 < 0 || var14 < 0 || var15 < 0 || var13 > Rasterizer3D.Rasterizer3D_clipWidth || var14 > Rasterizer3D.Rasterizer3D_clipWidth || var15 > Rasterizer3D.Rasterizer3D_clipWidth) { // L: 1317 - Rasterizer3D.field2260 = true; + for (var9 = 0; var9 < var8; ++var9) { // L: 1332 + var10 = var1.faceX[var9]; // L: 1333 + var11 = var1.faceY[var9]; // L: 1334 + var12 = var1.faceZ[var9]; // L: 1335 + var13 = SceneTileModel.field2402[var10]; // L: 1336 + int var14 = SceneTileModel.field2402[var11]; // L: 1337 + int var15 = SceneTileModel.field2402[var12]; // L: 1338 + int var16 = SceneTileModel.field2416[var10]; // L: 1339 + int var17 = SceneTileModel.field2416[var11]; // L: 1340 + int var18 = SceneTileModel.field2416[var12]; // L: 1341 + if ((var13 - var14) * (var18 - var17) - (var16 - var17) * (var15 - var14) > 0) { // L: 1342 + Rasterizer3D.field2262 = false; // L: 1343 + if (var13 < 0 || var14 < 0 || var15 < 0 || var13 > Rasterizer3D.Rasterizer3D_clipWidth || var14 > Rasterizer3D.Rasterizer3D_clipWidth || var15 > Rasterizer3D.Rasterizer3D_clipWidth) { // L: 1344 + Rasterizer3D.field2262 = true; } - if (checkClick && containsBounds(Scene_selectedScreenX, Scene_selectedScreenY, var16, var17, var18, var13, var14, var15)) { // L: 1318 - Scene_selectedX = var6; // L: 1319 - Scene_selectedY = var7; // L: 1320 + if (checkClick && containsBounds(Scene_selectedScreenX, Scene_selectedScreenY, var16, var17, var18, var13, var14, var15)) { // L: 1345 + Scene_selectedX = var6; // L: 1346 + Scene_selectedY = var7; // L: 1347 } - if (var1.triangleTextureId != null && var1.triangleTextureId[var9] != -1) { // L: 1322 - if (!Scene_isLowDetail) { // L: 1326 - if (var1.isFlat) { // L: 1327 - Rasterizer3D.drawTexturedTile(var16, var17, var18, var13, var14, var15, var1.triangleColorA[var9], var1.triangleColorB[var9], var1.triangleColorC[var9], SceneTileModel.field2393[0], SceneTileModel.field2393[1], SceneTileModel.field2393[3], SceneTileModel.field2394[0], SceneTileModel.field2394[1], SceneTileModel.field2394[3], SceneTileModel.field2409[0], SceneTileModel.field2409[1], SceneTileModel.field2409[3], var1.triangleTextureId[var9]); + if (var1.triangleTextureId != null && var1.triangleTextureId[var9] != -1) { // L: 1349 + if (!Scene_isLowDetail) { // L: 1353 + if (var1.isFlat) { // L: 1354 + Rasterizer3D.drawTexturedTile(var16, var17, var18, var13, var14, var15, var1.triangleColorA[var9], var1.triangleColorB[var9], var1.triangleColorC[var9], SceneTileModel.field2417[0], SceneTileModel.field2417[1], SceneTileModel.field2417[3], SceneTileModel.field2418[0], SceneTileModel.field2418[1], SceneTileModel.field2418[3], SceneTileModel.field2419[0], SceneTileModel.field2419[1], SceneTileModel.field2419[3], var1.triangleTextureId[var9]); } else { - Rasterizer3D.drawTexturedTile(var16, var17, var18, var13, var14, var15, var1.triangleColorA[var9], var1.triangleColorB[var9], var1.triangleColorC[var9], SceneTileModel.field2393[var10], SceneTileModel.field2393[var11], SceneTileModel.field2393[var12], SceneTileModel.field2394[var10], SceneTileModel.field2394[var11], SceneTileModel.field2394[var12], SceneTileModel.field2409[var10], SceneTileModel.field2409[var11], SceneTileModel.field2409[var12], var1.triangleTextureId[var9]); // L: 1328 + Rasterizer3D.drawTexturedTile(var16, var17, var18, var13, var14, var15, var1.triangleColorA[var9], var1.triangleColorB[var9], var1.triangleColorC[var9], SceneTileModel.field2417[var10], SceneTileModel.field2417[var11], SceneTileModel.field2417[var12], SceneTileModel.field2418[var10], SceneTileModel.field2418[var11], SceneTileModel.field2418[var12], SceneTileModel.field2419[var10], SceneTileModel.field2419[var11], SceneTileModel.field2419[var12], var1.triangleTextureId[var9]); // L: 1355 } } else { - int var19 = Rasterizer3D.Rasterizer3D_textureLoader.getAverageTextureRGB(var1.triangleTextureId[var9]); // L: 1331 - Rasterizer3D.method3824(var16, var17, var18, var13, var14, var15, method3946(var19, var1.triangleColorA[var9]), method3946(var19, var1.triangleColorB[var9]), method3946(var19, var1.triangleColorC[var9])); // L: 1332 + int var19 = Rasterizer3D.Rasterizer3D_textureLoader.getAverageTextureRGB(var1.triangleTextureId[var9]); // L: 1358 + Rasterizer3D.method3854(var16, var17, var18, var13, var14, var15, method3969(var19, var1.triangleColorA[var9]), method3969(var19, var1.triangleColorB[var9]), method3969(var19, var1.triangleColorC[var9])); // L: 1359 } - } else if (var1.triangleColorA[var9] != 12345678) { // L: 1323 - Rasterizer3D.method3824(var16, var17, var18, var13, var14, var15, var1.triangleColorA[var9], var1.triangleColorB[var9], var1.triangleColorC[var9]); + } else if (var1.triangleColorA[var9] != 12345678) { // L: 1350 + Rasterizer3D.method3854(var16, var17, var18, var13, var14, var15, var1.triangleColorA[var9], var1.triangleColorB[var9], var1.triangleColorC[var9]); } } } - } // L: 1337 + } // L: 1364 - @ObfuscatedName("ab") + @ObfuscatedName("ak") @Export("occlude") void occlude() { - int var1 = Scene_planeOccluderCounts[Scene_plane]; // L: 1364 - Occluder[] var2 = Scene_planeOccluders[Scene_plane]; // L: 1365 - Scene_currentOccludersCount = 0; // L: 1366 + int var1 = Scene_planeOccluderCounts[Scene_plane]; // L: 1391 + Occluder[] var2 = Scene_planeOccluders[Scene_plane]; // L: 1392 + Scene_currentOccludersCount = 0; // L: 1393 - for (int var3 = 0; var3 < var1; ++var3) { // L: 1367 - Occluder var4 = var2[var3]; // L: 1368 + for (int var3 = 0; var3 < var1; ++var3) { // L: 1394 + Occluder var4 = var2[var3]; // L: 1395 int var5; int var6; int var7; int var9; boolean var13; - if (var4.type == 1) { // L: 1369 - var5 = var4.minTileX - Scene_cameraXTile + 25; // L: 1370 - if (var5 >= 0 && var5 <= 50) { // L: 1371 - var6 = var4.minTileY - Scene_cameraYTile + 25; // L: 1372 - if (var6 < 0) { // L: 1373 + if (var4.type == 1) { // L: 1396 + var5 = var4.minTileX - Scene_cameraXTile + 25; // L: 1397 + if (var5 >= 0 && var5 <= 50) { // L: 1398 + var6 = var4.minTileY - Scene_cameraYTile + 25; // L: 1399 + if (var6 < 0) { // L: 1400 var6 = 0; } - var7 = var4.maxTileY - Scene_cameraYTile + 25; // L: 1374 - if (var7 > 50) { // L: 1375 + var7 = var4.maxTileY - Scene_cameraYTile + 25; // L: 1401 + if (var7 > 50) { // L: 1402 var7 = 50; } - var13 = false; // L: 1376 + var13 = false; // L: 1403 - while (var6 <= var7) { // L: 1377 - if (visibleTiles[var5][var6++]) { // L: 1378 - var13 = true; // L: 1379 + while (var6 <= var7) { // L: 1404 + if (visibleTiles[var5][var6++]) { // L: 1405 + var13 = true; // L: 1406 break; } } - if (var13) { // L: 1383 - var9 = Scene_cameraX - var4.minX; // L: 1384 - if (var9 > 32) { // L: 1385 - var4.field2374 = 1; + if (var13) { // L: 1410 + var9 = Scene_cameraX - var4.minX; // L: 1411 + if (var9 > 32) { // L: 1412 + var4.field2380 = 1; } else { - if (var9 >= -32) { // L: 1386 + if (var9 >= -32) { // L: 1413 continue; } - var4.field2374 = 2; // L: 1387 - var9 = -var9; // L: 1388 + var4.field2380 = 2; // L: 1414 + var9 = -var9; // L: 1415 } - var4.field2377 = (var4.minZ - Scene_cameraZ << 8) / var9; // L: 1391 - var4.field2368 = (var4.maxZ - Scene_cameraZ << 8) / var9; // L: 1392 - var4.field2378 = (var4.minY - Scene_cameraY << 8) / var9; // L: 1393 - var4.field2363 = (var4.maxY - Scene_cameraY << 8) / var9; // L: 1394 - Scene_currentOccluders[Scene_currentOccludersCount++] = var4; // L: 1395 + var4.field2382 = (var4.minZ - Scene_cameraZ << 8) / var9; // L: 1418 + var4.field2384 = (var4.maxZ - Scene_cameraZ << 8) / var9; // L: 1419 + var4.field2369 = (var4.minY - Scene_cameraY << 8) / var9; // L: 1420 + var4.field2386 = (var4.maxY - Scene_cameraY << 8) / var9; // L: 1421 + Scene_currentOccluders[Scene_currentOccludersCount++] = var4; // L: 1422 } } - } else if (var4.type == 2) { // L: 1398 - var5 = var4.minTileY - Scene_cameraYTile + 25; // L: 1399 - if (var5 >= 0 && var5 <= 50) { // L: 1400 - var6 = var4.minTileX - Scene_cameraXTile + 25; // L: 1401 - if (var6 < 0) { // L: 1402 + } else if (var4.type == 2) { // L: 1425 + var5 = var4.minTileY - Scene_cameraYTile + 25; // L: 1426 + if (var5 >= 0 && var5 <= 50) { // L: 1427 + var6 = var4.minTileX - Scene_cameraXTile + 25; // L: 1428 + if (var6 < 0) { // L: 1429 var6 = 0; } - var7 = var4.maxTileX - Scene_cameraXTile + 25; // L: 1403 - if (var7 > 50) { // L: 1404 + var7 = var4.maxTileX - Scene_cameraXTile + 25; // L: 1430 + if (var7 > 50) { // L: 1431 var7 = 50; } - var13 = false; // L: 1405 + var13 = false; // L: 1432 - while (var6 <= var7) { // L: 1406 - if (visibleTiles[var6++][var5]) { // L: 1407 - var13 = true; // L: 1408 + while (var6 <= var7) { // L: 1433 + if (visibleTiles[var6++][var5]) { // L: 1434 + var13 = true; // L: 1435 break; } } - if (var13) { // L: 1412 - var9 = Scene_cameraZ - var4.minZ; // L: 1413 - if (var9 > 32) { // L: 1414 - var4.field2374 = 3; + if (var13) { // L: 1439 + var9 = Scene_cameraZ - var4.minZ; // L: 1440 + if (var9 > 32) { // L: 1441 + var4.field2380 = 3; } else { - if (var9 >= -32) { // L: 1415 + if (var9 >= -32) { // L: 1442 continue; } - var4.field2374 = 4; // L: 1416 - var9 = -var9; // L: 1417 + var4.field2380 = 4; // L: 1443 + var9 = -var9; // L: 1444 } - var4.field2380 = (var4.minX - Scene_cameraX << 8) / var9; // L: 1420 - var4.field2376 = (var4.maxX - Scene_cameraX << 8) / var9; // L: 1421 - var4.field2378 = (var4.minY - Scene_cameraY << 8) / var9; // L: 1422 - var4.field2363 = (var4.maxY - Scene_cameraY << 8) / var9; // L: 1423 - Scene_currentOccluders[Scene_currentOccludersCount++] = var4; // L: 1424 + var4.field2385 = (var4.minX - Scene_cameraX << 8) / var9; // L: 1447 + var4.field2372 = (var4.maxX - Scene_cameraX << 8) / var9; // L: 1448 + var4.field2369 = (var4.minY - Scene_cameraY << 8) / var9; // L: 1449 + var4.field2386 = (var4.maxY - Scene_cameraY << 8) / var9; // L: 1450 + Scene_currentOccluders[Scene_currentOccludersCount++] = var4; // L: 1451 } } - } else if (var4.type == 4) { // L: 1427 - var5 = var4.minY - Scene_cameraY; // L: 1428 - if (var5 > 128) { // L: 1429 - var6 = var4.minTileY - Scene_cameraYTile + 25; // L: 1430 - if (var6 < 0) { // L: 1431 + } else if (var4.type == 4) { // L: 1454 + var5 = var4.minY - Scene_cameraY; // L: 1455 + if (var5 > 128) { // L: 1456 + var6 = var4.minTileY - Scene_cameraYTile + 25; // L: 1457 + if (var6 < 0) { // L: 1458 var6 = 0; } - var7 = var4.maxTileY - Scene_cameraYTile + 25; // L: 1432 - if (var7 > 50) { // L: 1433 + var7 = var4.maxTileY - Scene_cameraYTile + 25; // L: 1459 + if (var7 > 50) { // L: 1460 var7 = 50; } - if (var6 <= var7) { // L: 1434 - int var8 = var4.minTileX - Scene_cameraXTile + 25; // L: 1435 - if (var8 < 0) { // L: 1436 + if (var6 <= var7) { // L: 1461 + int var8 = var4.minTileX - Scene_cameraXTile + 25; // L: 1462 + if (var8 < 0) { // L: 1463 var8 = 0; } - var9 = var4.maxTileX - Scene_cameraXTile + 25; // L: 1437 - if (var9 > 50) { // L: 1438 + var9 = var4.maxTileX - Scene_cameraXTile + 25; // L: 1464 + if (var9 > 50) { // L: 1465 var9 = 50; } - boolean var10 = false; // L: 1439 + boolean var10 = false; // L: 1466 label148: - for (int var11 = var8; var11 <= var9; ++var11) { // L: 1440 - for (int var12 = var6; var12 <= var7; ++var12) { // L: 1441 - if (visibleTiles[var11][var12]) { // L: 1442 - var10 = true; // L: 1443 + for (int var11 = var8; var11 <= var9; ++var11) { // L: 1467 + for (int var12 = var6; var12 <= var7; ++var12) { // L: 1468 + if (visibleTiles[var11][var12]) { // L: 1469 + var10 = true; // L: 1470 break label148; } } } - if (var10) { // L: 1448 - var4.field2374 = 5; // L: 1449 - var4.field2380 = (var4.minX - Scene_cameraX << 8) / var5; // L: 1450 - var4.field2376 = (var4.maxX - Scene_cameraX << 8) / var5; // L: 1451 - var4.field2377 = (var4.minZ - Scene_cameraZ << 8) / var5; // L: 1452 - var4.field2368 = (var4.maxZ - Scene_cameraZ << 8) / var5; // L: 1453 - Scene_currentOccluders[Scene_currentOccludersCount++] = var4; // L: 1454 + if (var10) { // L: 1475 + var4.field2380 = 5; // L: 1476 + var4.field2385 = (var4.minX - Scene_cameraX << 8) / var5; // L: 1477 + var4.field2372 = (var4.maxX - Scene_cameraX << 8) / var5; // L: 1478 + var4.field2382 = (var4.minZ - Scene_cameraZ << 8) / var5; // L: 1479 + var4.field2384 = (var4.maxZ - Scene_cameraZ << 8) / var5; // L: 1480 + Scene_currentOccluders[Scene_currentOccludersCount++] = var4; // L: 1481 } } } } } - } // L: 1458 + } // L: 1485 - @ObfuscatedName("ar") - boolean method4000(int var1, int var2, int var3) { - int var4 = this.field2295[var1][var2][var3]; // L: 1461 - if (var4 == -Scene_drawnCount) { // L: 1462 + @ObfuscatedName("ay") + boolean method3972(int var1, int var2, int var3) { + int var4 = this.field2301[var1][var2][var3]; // L: 1488 + if (var4 == -Scene_drawnCount) { // L: 1489 return false; - } else if (var4 == Scene_drawnCount) { // L: 1463 + } else if (var4 == Scene_drawnCount) { // L: 1490 return true; } else { - int var5 = var2 << 7; // L: 1464 - int var6 = var3 << 7; // L: 1465 - if (this.method3944(var5 + 1, this.tileHeights[var1][var2][var3], var6 + 1) && this.method3944(var5 + 128 - 1, this.tileHeights[var1][var2 + 1][var3], var6 + 1) && this.method3944(var5 + 128 - 1, this.tileHeights[var1][var2 + 1][var3 + 1], var6 + 128 - 1) && this.method3944(var5 + 1, this.tileHeights[var1][var2][var3 + 1], var6 + 128 - 1)) { // L: 1466 - this.field2295[var1][var2][var3] = Scene_drawnCount; // L: 1467 - return true; // L: 1468 + int var5 = var2 << 7; // L: 1491 + int var6 = var3 << 7; // L: 1492 + if (this.method3976(var5 + 1, this.tileHeights[var1][var2][var3], var6 + 1) && this.method3976(var5 + 128 - 1, this.tileHeights[var1][var2 + 1][var3], var6 + 1) && this.method3976(var5 + 128 - 1, this.tileHeights[var1][var2 + 1][var3 + 1], var6 + 128 - 1) && this.method3976(var5 + 1, this.tileHeights[var1][var2][var3 + 1], var6 + 128 - 1)) { // L: 1493 + this.field2301[var1][var2][var3] = Scene_drawnCount; // L: 1494 + return true; // L: 1495 } else { - this.field2295[var1][var2][var3] = -Scene_drawnCount; // L: 1471 - return false; // L: 1472 + this.field2301[var1][var2][var3] = -Scene_drawnCount; // L: 1498 + return false; // L: 1499 } } } - @ObfuscatedName("ah") - boolean method3950(int var1, int var2, int var3, int var4) { - if (!this.method4000(var1, var2, var3)) { // L: 1477 + @ObfuscatedName("aa") + boolean method3973(int var1, int var2, int var3, int var4) { + if (!this.method3972(var1, var2, var3)) { // L: 1504 return false; } else { - int var5 = var2 << 7; // L: 1478 - int var6 = var3 << 7; // L: 1479 - int var7 = this.tileHeights[var1][var2][var3] - 1; // L: 1480 - int var8 = var7 - 120; // L: 1481 - int var9 = var7 - 230; // L: 1482 - int var10 = var7 - 238; // L: 1483 - if (var4 < 16) { // L: 1484 - if (var4 == 1) { // L: 1485 - if (var5 > Scene_cameraX) { // L: 1486 - if (!this.method3944(var5, var7, var6)) { // L: 1487 + int var5 = var2 << 7; // L: 1505 + int var6 = var3 << 7; // L: 1506 + int var7 = this.tileHeights[var1][var2][var3] - 1; // L: 1507 + int var8 = var7 - 120; // L: 1508 + int var9 = var7 - 230; // L: 1509 + int var10 = var7 - 238; // L: 1510 + if (var4 < 16) { // L: 1511 + if (var4 == 1) { // L: 1512 + if (var5 > Scene_cameraX) { // L: 1513 + if (!this.method3976(var5, var7, var6)) { // L: 1514 return false; } - if (!this.method3944(var5, var7, var6 + 128)) { // L: 1488 + if (!this.method3976(var5, var7, var6 + 128)) { // L: 1515 return false; } } - if (var1 > 0) { // L: 1490 - if (!this.method3944(var5, var8, var6)) { // L: 1491 + if (var1 > 0) { // L: 1517 + if (!this.method3976(var5, var8, var6)) { // L: 1518 return false; } - if (!this.method3944(var5, var8, var6 + 128)) { // L: 1492 + if (!this.method3976(var5, var8, var6 + 128)) { // L: 1519 return false; } } - if (!this.method3944(var5, var9, var6)) { // L: 1494 + if (!this.method3976(var5, var9, var6)) { // L: 1521 return false; } - if (!this.method3944(var5, var9, var6 + 128)) { // L: 1495 + if (!this.method3976(var5, var9, var6 + 128)) { // L: 1522 return false; } - return true; // L: 1496 + return true; // L: 1523 } - if (var4 == 2) { // L: 1498 - if (var6 < Scene_cameraZ) { // L: 1499 - if (!this.method3944(var5, var7, var6 + 128)) { // L: 1500 + if (var4 == 2) { // L: 1525 + if (var6 < Scene_cameraZ) { // L: 1526 + if (!this.method3976(var5, var7, var6 + 128)) { // L: 1527 return false; } - if (!this.method3944(var5 + 128, var7, var6 + 128)) { // L: 1501 + if (!this.method3976(var5 + 128, var7, var6 + 128)) { // L: 1528 return false; } } - if (var1 > 0) { // L: 1503 - if (!this.method3944(var5, var8, var6 + 128)) { // L: 1504 + if (var1 > 0) { // L: 1530 + if (!this.method3976(var5, var8, var6 + 128)) { // L: 1531 return false; } - if (!this.method3944(var5 + 128, var8, var6 + 128)) { // L: 1505 + if (!this.method3976(var5 + 128, var8, var6 + 128)) { // L: 1532 return false; } } - if (!this.method3944(var5, var9, var6 + 128)) { // L: 1507 + if (!this.method3976(var5, var9, var6 + 128)) { // L: 1534 return false; } - if (!this.method3944(var5 + 128, var9, var6 + 128)) { // L: 1508 + if (!this.method3976(var5 + 128, var9, var6 + 128)) { // L: 1535 return false; } - return true; // L: 1509 + return true; // L: 1536 } - if (var4 == 4) { // L: 1511 - if (var5 < Scene_cameraX) { // L: 1512 - if (!this.method3944(var5 + 128, var7, var6)) { // L: 1513 + if (var4 == 4) { // L: 1538 + if (var5 < Scene_cameraX) { // L: 1539 + if (!this.method3976(var5 + 128, var7, var6)) { // L: 1540 return false; } - if (!this.method3944(var5 + 128, var7, var6 + 128)) { // L: 1514 + if (!this.method3976(var5 + 128, var7, var6 + 128)) { // L: 1541 return false; } } - if (var1 > 0) { // L: 1516 - if (!this.method3944(var5 + 128, var8, var6)) { // L: 1517 + if (var1 > 0) { // L: 1543 + if (!this.method3976(var5 + 128, var8, var6)) { // L: 1544 return false; } - if (!this.method3944(var5 + 128, var8, var6 + 128)) { // L: 1518 + if (!this.method3976(var5 + 128, var8, var6 + 128)) { // L: 1545 return false; } } - if (!this.method3944(var5 + 128, var9, var6)) { // L: 1520 + if (!this.method3976(var5 + 128, var9, var6)) { // L: 1547 return false; } - if (!this.method3944(var5 + 128, var9, var6 + 128)) { // L: 1521 + if (!this.method3976(var5 + 128, var9, var6 + 128)) { // L: 1548 return false; } - return true; // L: 1522 + return true; // L: 1549 } - if (var4 == 8) { // L: 1524 - if (var6 > Scene_cameraZ) { // L: 1525 - if (!this.method3944(var5, var7, var6)) { // L: 1526 + if (var4 == 8) { // L: 1551 + if (var6 > Scene_cameraZ) { // L: 1552 + if (!this.method3976(var5, var7, var6)) { // L: 1553 return false; } - if (!this.method3944(var5 + 128, var7, var6)) { // L: 1527 + if (!this.method3976(var5 + 128, var7, var6)) { // L: 1554 return false; } } - if (var1 > 0) { // L: 1529 - if (!this.method3944(var5, var8, var6)) { // L: 1530 + if (var1 > 0) { // L: 1556 + if (!this.method3976(var5, var8, var6)) { // L: 1557 return false; } - if (!this.method3944(var5 + 128, var8, var6)) { // L: 1531 + if (!this.method3976(var5 + 128, var8, var6)) { // L: 1558 return false; } } - if (!this.method3944(var5, var9, var6)) { // L: 1533 + if (!this.method3976(var5, var9, var6)) { // L: 1560 return false; } - if (!this.method3944(var5 + 128, var9, var6)) { // L: 1534 + if (!this.method3976(var5 + 128, var9, var6)) { // L: 1561 return false; } - return true; // L: 1535 + return true; // L: 1562 } } - if (!this.method3944(var5 + 64, var10, var6 + 64)) { // L: 1538 + if (!this.method3976(var5 + 64, var10, var6 + 64)) { // L: 1565 return false; - } else if (var4 == 16) { // L: 1539 - return this.method3944(var5, var9, var6 + 128); // L: 1540 - } else if (var4 == 32) { // L: 1543 - return this.method3944(var5 + 128, var9, var6 + 128); // L: 1544 - } else if (var4 == 64) { // L: 1547 - return this.method3944(var5 + 128, var9, var6); // L: 1548 - } else if (var4 == 128) { // L: 1551 - return this.method3944(var5, var9, var6); // L: 1552 + } else if (var4 == 16) { // L: 1566 + return this.method3976(var5, var9, var6 + 128); // L: 1567 + } else if (var4 == 32) { // L: 1570 + return this.method3976(var5 + 128, var9, var6 + 128); // L: 1571 + } else if (var4 == 64) { // L: 1574 + return this.method3976(var5 + 128, var9, var6); // L: 1575 + } else if (var4 == 128) { // L: 1578 + return this.method3976(var5, var9, var6); // L: 1579 } else { - return true; // L: 1555 + return true; // L: 1582 } } } - @ObfuscatedName("af") - boolean method3951(int var1, int var2, int var3, int var4) { - if (!this.method4000(var1, var2, var3)) { // L: 1559 + @ObfuscatedName("au") + boolean method3974(int var1, int var2, int var3, int var4) { + if (!this.method3972(var1, var2, var3)) { // L: 1586 return false; } else { - int var5 = var2 << 7; // L: 1560 - int var6 = var3 << 7; // L: 1561 - return this.method3944(var5 + 1, this.tileHeights[var1][var2][var3] - var4, var6 + 1) && this.method3944(var5 + 128 - 1, this.tileHeights[var1][var2 + 1][var3] - var4, var6 + 1) && this.method3944(var5 + 128 - 1, this.tileHeights[var1][var2 + 1][var3 + 1] - var4, var6 + 128 - 1) && this.method3944(var5 + 1, this.tileHeights[var1][var2][var3 + 1] - var4, var6 + 128 - 1); // L: 1562 + int var5 = var2 << 7; // L: 1587 + int var6 = var3 << 7; // L: 1588 + return this.method3976(var5 + 1, this.tileHeights[var1][var2][var3] - var4, var6 + 1) && this.method3976(var5 + 128 - 1, this.tileHeights[var1][var2 + 1][var3] - var4, var6 + 1) && this.method3976(var5 + 128 - 1, this.tileHeights[var1][var2 + 1][var3 + 1] - var4, var6 + 128 - 1) && this.method3976(var5 + 1, this.tileHeights[var1][var2][var3 + 1] - var4, var6 + 128 - 1); // L: 1589 } } @ObfuscatedName("an") - boolean method3995(int var1, int var2, int var3, int var4, int var5, int var6) { + boolean method3975(int var1, int var2, int var3, int var4, int var5, int var6) { int var7; int var8; - if (var3 == var2 && var5 == var4) { // L: 1567 - if (!this.method4000(var1, var2, var4)) { // L: 1568 + if (var3 == var2 && var5 == var4) { // L: 1594 + if (!this.method3972(var1, var2, var4)) { // L: 1595 return false; } else { - var7 = var2 << 7; // L: 1569 - var8 = var4 << 7; // L: 1570 - return this.method3944(var7 + 1, this.tileHeights[var1][var2][var4] - var6, var8 + 1) && this.method3944(var7 + 128 - 1, this.tileHeights[var1][var2 + 1][var4] - var6, var8 + 1) && this.method3944(var7 + 128 - 1, this.tileHeights[var1][var2 + 1][var4 + 1] - var6, var8 + 128 - 1) && this.method3944(var7 + 1, this.tileHeights[var1][var2][var4 + 1] - var6, var8 + 128 - 1); // L: 1571 + var7 = var2 << 7; // L: 1596 + var8 = var4 << 7; // L: 1597 + return this.method3976(var7 + 1, this.tileHeights[var1][var2][var4] - var6, var8 + 1) && this.method3976(var7 + 128 - 1, this.tileHeights[var1][var2 + 1][var4] - var6, var8 + 1) && this.method3976(var7 + 128 - 1, this.tileHeights[var1][var2 + 1][var4 + 1] - var6, var8 + 128 - 1) && this.method3976(var7 + 1, this.tileHeights[var1][var2][var4 + 1] - var6, var8 + 128 - 1); // L: 1598 } } else { - for (var7 = var2; var7 <= var3; ++var7) { // L: 1574 - for (var8 = var4; var8 <= var5; ++var8) { // L: 1575 - if (this.field2295[var1][var7][var8] == -Scene_drawnCount) { // L: 1576 + for (var7 = var2; var7 <= var3; ++var7) { // L: 1601 + for (var8 = var4; var8 <= var5; ++var8) { // L: 1602 + if (this.field2301[var1][var7][var8] == -Scene_drawnCount) { // L: 1603 return false; } } } - var7 = (var2 << 7) + 1; // L: 1579 - var8 = (var4 << 7) + 2; // L: 1580 - int var9 = this.tileHeights[var1][var2][var4] - var6; // L: 1581 - if (!this.method3944(var7, var9, var8)) { // L: 1582 + var7 = (var2 << 7) + 1; // L: 1606 + var8 = (var4 << 7) + 2; // L: 1607 + int var9 = this.tileHeights[var1][var2][var4] - var6; // L: 1608 + if (!this.method3976(var7, var9, var8)) { // L: 1609 return false; } else { - int var10 = (var3 << 7) - 1; // L: 1583 - if (!this.method3944(var10, var9, var8)) { // L: 1584 + int var10 = (var3 << 7) - 1; // L: 1610 + if (!this.method3976(var10, var9, var8)) { // L: 1611 return false; } else { - int var11 = (var5 << 7) - 1; // L: 1585 - if (!this.method3944(var7, var9, var11)) { // L: 1586 + int var11 = (var5 << 7) - 1; // L: 1612 + if (!this.method3976(var7, var9, var11)) { // L: 1613 return false; - } else if (!this.method3944(var10, var9, var11)) { // L: 1587 + } else if (!this.method3976(var10, var9, var11)) { // L: 1614 return false; } else { - return true; // L: 1588 + return true; // L: 1615 } } } @@ -2352,103 +2361,103 @@ public class Scene { } @ObfuscatedName("bd") - boolean method3944(int var1, int var2, int var3) { - for (int var4 = 0; var4 < Scene_currentOccludersCount; ++var4) { // L: 1592 - Occluder var5 = Scene_currentOccluders[var4]; // L: 1593 + boolean method3976(int var1, int var2, int var3) { + for (int var4 = 0; var4 < Scene_currentOccludersCount; ++var4) { // L: 1619 + Occluder var5 = Scene_currentOccluders[var4]; // L: 1620 int var6; int var7; int var8; int var9; int var10; - if (var5.field2374 == 1) { // L: 1594 - var6 = var5.minX - var1; // L: 1595 - if (var6 > 0) { // L: 1596 - var7 = (var6 * var5.field2377 >> 8) + var5.minZ; // L: 1597 - var8 = (var6 * var5.field2368 >> 8) + var5.maxZ; // L: 1598 - var9 = (var6 * var5.field2378 >> 8) + var5.minY; // L: 1599 - var10 = (var6 * var5.field2363 >> 8) + var5.maxY; // L: 1600 - if (var3 >= var7 && var3 <= var8 && var2 >= var9 && var2 <= var10) { // L: 1601 + if (var5.field2380 == 1) { // L: 1621 + var6 = var5.minX - var1; // L: 1622 + if (var6 > 0) { // L: 1623 + var7 = (var6 * var5.field2382 >> 8) + var5.minZ; // L: 1624 + var8 = (var6 * var5.field2384 >> 8) + var5.maxZ; // L: 1625 + var9 = (var6 * var5.field2369 >> 8) + var5.minY; // L: 1626 + var10 = (var6 * var5.field2386 >> 8) + var5.maxY; // L: 1627 + if (var3 >= var7 && var3 <= var8 && var2 >= var9 && var2 <= var10) { // L: 1628 return true; } } - } else if (var5.field2374 == 2) { // L: 1605 - var6 = var1 - var5.minX; // L: 1606 - if (var6 > 0) { // L: 1607 - var7 = (var6 * var5.field2377 >> 8) + var5.minZ; // L: 1608 - var8 = (var6 * var5.field2368 >> 8) + var5.maxZ; // L: 1609 - var9 = (var6 * var5.field2378 >> 8) + var5.minY; // L: 1610 - var10 = (var6 * var5.field2363 >> 8) + var5.maxY; // L: 1611 - if (var3 >= var7 && var3 <= var8 && var2 >= var9 && var2 <= var10) { // L: 1612 + } else if (var5.field2380 == 2) { // L: 1632 + var6 = var1 - var5.minX; // L: 1633 + if (var6 > 0) { // L: 1634 + var7 = (var6 * var5.field2382 >> 8) + var5.minZ; // L: 1635 + var8 = (var6 * var5.field2384 >> 8) + var5.maxZ; // L: 1636 + var9 = (var6 * var5.field2369 >> 8) + var5.minY; // L: 1637 + var10 = (var6 * var5.field2386 >> 8) + var5.maxY; // L: 1638 + if (var3 >= var7 && var3 <= var8 && var2 >= var9 && var2 <= var10) { // L: 1639 return true; } } - } else if (var5.field2374 == 3) { // L: 1616 - var6 = var5.minZ - var3; // L: 1617 - if (var6 > 0) { // L: 1618 - var7 = (var6 * var5.field2380 >> 8) + var5.minX; // L: 1619 - var8 = (var6 * var5.field2376 >> 8) + var5.maxX; // L: 1620 - var9 = (var6 * var5.field2378 >> 8) + var5.minY; // L: 1621 - var10 = (var6 * var5.field2363 >> 8) + var5.maxY; // L: 1622 - if (var1 >= var7 && var1 <= var8 && var2 >= var9 && var2 <= var10) { // L: 1623 + } else if (var5.field2380 == 3) { // L: 1643 + var6 = var5.minZ - var3; // L: 1644 + if (var6 > 0) { // L: 1645 + var7 = (var6 * var5.field2385 >> 8) + var5.minX; // L: 1646 + var8 = (var6 * var5.field2372 >> 8) + var5.maxX; // L: 1647 + var9 = (var6 * var5.field2369 >> 8) + var5.minY; // L: 1648 + var10 = (var6 * var5.field2386 >> 8) + var5.maxY; // L: 1649 + if (var1 >= var7 && var1 <= var8 && var2 >= var9 && var2 <= var10) { // L: 1650 return true; } } - } else if (var5.field2374 == 4) { // L: 1627 - var6 = var3 - var5.minZ; // L: 1628 - if (var6 > 0) { // L: 1629 - var7 = (var6 * var5.field2380 >> 8) + var5.minX; // L: 1630 - var8 = (var6 * var5.field2376 >> 8) + var5.maxX; // L: 1631 - var9 = (var6 * var5.field2378 >> 8) + var5.minY; // L: 1632 - var10 = (var6 * var5.field2363 >> 8) + var5.maxY; // L: 1633 - if (var1 >= var7 && var1 <= var8 && var2 >= var9 && var2 <= var10) { // L: 1634 + } else if (var5.field2380 == 4) { // L: 1654 + var6 = var3 - var5.minZ; // L: 1655 + if (var6 > 0) { // L: 1656 + var7 = (var6 * var5.field2385 >> 8) + var5.minX; // L: 1657 + var8 = (var6 * var5.field2372 >> 8) + var5.maxX; // L: 1658 + var9 = (var6 * var5.field2369 >> 8) + var5.minY; // L: 1659 + var10 = (var6 * var5.field2386 >> 8) + var5.maxY; // L: 1660 + if (var1 >= var7 && var1 <= var8 && var2 >= var9 && var2 <= var10) { // L: 1661 return true; } } - } else if (var5.field2374 == 5) { // L: 1638 - var6 = var2 - var5.minY; // L: 1639 - if (var6 > 0) { // L: 1640 - var7 = (var6 * var5.field2380 >> 8) + var5.minX; // L: 1641 - var8 = (var6 * var5.field2376 >> 8) + var5.maxX; // L: 1642 - var9 = (var6 * var5.field2377 >> 8) + var5.minZ; // L: 1643 - var10 = (var6 * var5.field2368 >> 8) + var5.maxZ; // L: 1644 - if (var1 >= var7 && var1 <= var8 && var3 >= var9 && var3 <= var10) { // L: 1645 + } else if (var5.field2380 == 5) { // L: 1665 + var6 = var2 - var5.minY; // L: 1666 + if (var6 > 0) { // L: 1667 + var7 = (var6 * var5.field2385 >> 8) + var5.minX; // L: 1668 + var8 = (var6 * var5.field2372 >> 8) + var5.maxX; // L: 1669 + var9 = (var6 * var5.field2382 >> 8) + var5.minZ; // L: 1670 + var10 = (var6 * var5.field2384 >> 8) + var5.maxZ; // L: 1671 + if (var1 >= var7 && var1 <= var8 && var3 >= var9 && var3 <= var10) { // L: 1672 return true; } } } } - return false; // L: 1650 + return false; // L: 1677 } - @ObfuscatedName("g") + @ObfuscatedName("y") @Export("Scene_addOccluder") public static void Scene_addOccluder(int var0, int var1, int var2, int var3, int var4, int var5, int var6, int var7) { - Occluder var8 = new Occluder(); // L: 149 - var8.minTileX = var2 / 128; // L: 150 - var8.maxTileX = var3 / 128; // L: 151 - var8.minTileY = var4 / 128; // L: 152 - var8.maxTileY = var5 / 128; // L: 153 - var8.type = var1; // L: 154 - var8.minX = var2; // L: 155 - var8.maxX = var3; // L: 156 - var8.minZ = var4; // L: 157 - var8.maxZ = var5; // L: 158 - var8.minY = var6; // L: 159 - var8.maxY = var7; // L: 160 - Scene_planeOccluders[var0][Scene_planeOccluderCounts[var0]++] = var8; // L: 161 - } // L: 162 + Occluder var8 = new Occluder(); // L: 158 + var8.minTileX = var2 / 128; // L: 159 + var8.maxTileX = var3 / 128; // L: 160 + var8.minTileY = var4 / 128; // L: 161 + var8.maxTileY = var5 / 128; // L: 162 + var8.type = var1; // L: 163 + var8.minX = var2; // L: 164 + var8.maxX = var3; // L: 165 + var8.minZ = var4; // L: 166 + var8.maxZ = var5; // L: 167 + var8.minY = var6; // L: 168 + var8.maxY = var7; // L: 169 + Scene_planeOccluders[var0][Scene_planeOccluderCounts[var0]++] = var8; // L: 170 + } // L: 171 - @ObfuscatedName("am") + @ObfuscatedName("as") @Export("Scene_buildVisiblityMap") public static void Scene_buildVisiblityMap(int[] var0, int var1, int var2, int var3, int var4) { - Scene_viewportXMin = 0; // L: 638 - Scene_viewportYMin = 0; // L: 639 - Scene_viewportXMax = var3; // L: 640 - Scene_viewportYMax = var4; // L: 641 - Scene_viewportXCenter = var3 / 2; // L: 642 - Scene_viewportYCenter = var4 / 2; // L: 643 - boolean[][][][] var5 = new boolean[var0.length][32][53][53]; // L: 644 + Scene_viewportXMin = 0; // L: 665 + Scene_viewportYMin = 0; // L: 666 + Scene_viewportXMax = var3; // L: 667 + Scene_viewportYMax = var4; // L: 668 + Scene_viewportXCenter = var3 / 2; // L: 669 + Scene_viewportYCenter = var4 / 2; // L: 670 + boolean[][][][] var5 = new boolean[var0.length][32][53][53]; // L: 671 int var6; int var7; @@ -2456,135 +2465,135 @@ public class Scene { int var9; int var11; int var12; - for (var6 = 128; var6 <= 383; var6 += 32) { // L: 645 - for (var7 = 0; var7 < 2048; var7 += 64) { // L: 646 - Scene_cameraPitchSine = Rasterizer3D.Rasterizer3D_sine[var6]; // L: 647 - Scene_cameraPitchCosine = Rasterizer3D.Rasterizer3D_cosine[var6]; // L: 648 - Scene_cameraYawSine = Rasterizer3D.Rasterizer3D_sine[var7]; // L: 649 - Scene_cameraYawCosine = Rasterizer3D.Rasterizer3D_cosine[var7]; // L: 650 - var8 = (var6 - 128) / 32; // L: 651 - var9 = var7 / 64; // L: 652 + for (var6 = 128; var6 <= 383; var6 += 32) { // L: 672 + for (var7 = 0; var7 < 2048; var7 += 64) { // L: 673 + Scene_cameraPitchSine = Rasterizer3D.Rasterizer3D_sine[var6]; // L: 674 + Scene_cameraPitchCosine = Rasterizer3D.Rasterizer3D_cosine[var6]; // L: 675 + Scene_cameraYawSine = Rasterizer3D.Rasterizer3D_sine[var7]; // L: 676 + Scene_cameraYawCosine = Rasterizer3D.Rasterizer3D_cosine[var7]; // L: 677 + var8 = (var6 - 128) / 32; // L: 678 + var9 = var7 / 64; // L: 679 - for (int var10 = -26; var10 < 26; ++var10) { // L: 653 - for (var11 = -26; var11 < 26; ++var11) { // L: 654 - var12 = var10 * 128; // L: 655 - int var13 = var11 * 128; // L: 656 - boolean var14 = false; // L: 657 + for (int var10 = -26; var10 < 26; ++var10) { // L: 680 + for (var11 = -26; var11 < 26; ++var11) { // L: 681 + var12 = var10 * 128; // L: 682 + int var13 = var11 * 128; // L: 683 + boolean var14 = false; // L: 684 - for (int var15 = -var1; var15 <= var2; var15 += 128) { // L: 658 - if (method3937(var12, var0[var8] + var15, var13)) { // L: 659 - var14 = true; // L: 660 + for (int var15 = -var1; var15 <= var2; var15 += 128) { // L: 685 + if (method3960(var12, var0[var8] + var15, var13)) { // L: 686 + var14 = true; // L: 687 break; } } - var5[var8][var9][var10 + 1 + 25][var11 + 1 + 25] = var14; // L: 664 + var5[var8][var9][var10 + 1 + 25][var11 + 1 + 25] = var14; // L: 691 } } } } - for (var6 = 0; var6 < 8; ++var6) { // L: 669 - for (var7 = 0; var7 < 32; ++var7) { // L: 670 - for (var8 = -25; var8 < 25; ++var8) { // L: 671 - for (var9 = -25; var9 < 25; ++var9) { // L: 672 - boolean var16 = false; // L: 673 + for (var6 = 0; var6 < 8; ++var6) { // L: 696 + for (var7 = 0; var7 < 32; ++var7) { // L: 697 + for (var8 = -25; var8 < 25; ++var8) { // L: 698 + for (var9 = -25; var9 < 25; ++var9) { // L: 699 + boolean var16 = false; // L: 700 - label85: - for (var11 = -1; var11 <= 1; ++var11) { // L: 674 - for (var12 = -1; var12 <= 1; ++var12) { // L: 675 - if (var5[var6][var7][var8 + var11 + 1 + 25][var9 + var12 + 1 + 25]) { // L: 676 - var16 = true; // L: 677 - break label85; + label84: + for (var11 = -1; var11 <= 1; ++var11) { // L: 701 + for (var12 = -1; var12 <= 1; ++var12) { // L: 702 + if (var5[var6][var7][var8 + var11 + 1 + 25][var9 + var12 + 1 + 25]) { // L: 703 + var16 = true; // L: 704 + break label84; } - if (var5[var6][(var7 + 1) % 31][var8 + var11 + 1 + 25][var9 + var12 + 1 + 25]) { // L: 680 - var16 = true; // L: 681 - break label85; // L: 682 + if (var5[var6][(var7 + 1) % 31][var8 + var11 + 1 + 25][var9 + var12 + 1 + 25]) { // L: 707 + var16 = true; // L: 708 + break label84; } - if (var5[var6 + 1][var7][var8 + var11 + 1 + 25][var9 + var12 + 1 + 25]) { // L: 684 - var16 = true; // L: 685 - break label85; // L: 686 + if (var5[var6 + 1][var7][var8 + var11 + 1 + 25][var9 + var12 + 1 + 25]) { // L: 711 + var16 = true; // L: 712 + break label84; // L: 713 } - if (var5[var6 + 1][(var7 + 1) % 31][var8 + var11 + 1 + 25][var9 + var12 + 1 + 25]) { // L: 688 - var16 = true; // L: 689 - break label85; // L: 690 + if (var5[var6 + 1][(var7 + 1) % 31][var8 + var11 + 1 + 25][var9 + var12 + 1 + 25]) { // L: 715 + var16 = true; // L: 716 + break label84; // L: 717 } } } - visibilityMap[var6][var7][var8 + 25][var9 + 25] = var16; // L: 694 + visibilityMap[var6][var7][var8 + 25][var9 + 25] = var16; // L: 721 } } } } - } // L: 699 + } // L: 726 - @ObfuscatedName("ax") - static boolean method3937(int var0, int var1, int var2) { - int var3 = var0 * Scene_cameraYawCosine + var2 * Scene_cameraYawSine >> 16; // L: 702 - int var4 = var2 * Scene_cameraYawCosine - var0 * Scene_cameraYawSine >> 16; // L: 703 - int var5 = var4 * Scene_cameraPitchCosine + Scene_cameraPitchSine * var1 >> 16; // L: 704 - int var6 = Scene_cameraPitchCosine * var1 - var4 * Scene_cameraPitchSine >> 16; // L: 705 - if (var5 >= 50 && var5 <= 3500) { // L: 706 - int var7 = var3 * 128 / var5 + Scene_viewportXCenter; // L: 707 - int var8 = var6 * 128 / var5 + Scene_viewportYCenter; // L: 708 - return var7 >= Scene_viewportXMin && var7 <= Scene_viewportXMax && var8 >= Scene_viewportYMin && var8 <= Scene_viewportYMax; // L: 709 + @ObfuscatedName("aj") + static boolean method3960(int var0, int var1, int var2) { + int var3 = var0 * Scene_cameraYawCosine + var2 * Scene_cameraYawSine >> 16; // L: 729 + int var4 = var2 * Scene_cameraYawCosine - var0 * Scene_cameraYawSine >> 16; // L: 730 + int var5 = var4 * Scene_cameraPitchCosine + Scene_cameraPitchSine * var1 >> 16; // L: 731 + int var6 = Scene_cameraPitchCosine * var1 - var4 * Scene_cameraPitchSine >> 16; // L: 732 + if (var5 >= 50 && var5 <= 3500) { // L: 733 + int var7 = var3 * 128 / var5 + Scene_viewportXCenter; // L: 734 + int var8 = var6 * 128 / var5 + Scene_viewportYCenter; // L: 735 + return var7 >= Scene_viewportXMin && var7 <= Scene_viewportXMax && var8 >= Scene_viewportYMin && var8 <= Scene_viewportYMax; // L: 736 } else { - return false; // L: 710 + return false; // L: 737 } } - @ObfuscatedName("ai") + @ObfuscatedName("av") @Export("shouldSendWalk") public static boolean shouldSendWalk() { - return viewportWalking && Scene_selectedX != -1; // L: 729 + return viewportWalking && Scene_selectedX != -1; // L: 756 } - @ObfuscatedName("aa") - public static void method3941() { - Scene_selectedX = -1; // L: 733 - viewportWalking = false; // L: 734 - } // L: 735 + @ObfuscatedName("ac") + public static void method4047() { + Scene_selectedX = -1; // L: 760 + viewportWalking = false; // L: 761 + } // L: 762 - @ObfuscatedName("az") - static final int method3946(int var0, int var1) { - var1 = (var0 & 127) * var1 >> 7; // L: 1340 - if (var1 < 2) { // L: 1341 + @ObfuscatedName("aw") + static final int method3969(int var0, int var1) { + var1 = (var0 & 127) * var1 >> 7; // L: 1367 + if (var1 < 2) { // L: 1368 var1 = 2; - } else if (var1 > 126) { // L: 1342 + } else if (var1 > 126) { // L: 1369 var1 = 126; } - return (var0 & 65408) + var1; // L: 1343 + return (var0 & 65408) + var1; // L: 1370 } - @ObfuscatedName("aq") + @ObfuscatedName("af") @Export("containsBounds") static boolean containsBounds(int var0, int var1, int var2, int var3, int var4, int var5, int var6, int var7) { - if (var1 < var2 && var1 < var3 && var1 < var4) { // L: 1347 + if (var1 < var2 && var1 < var3 && var1 < var4) { // L: 1374 return false; - } else if (var1 > var2 && var1 > var3 && var1 > var4) { // L: 1348 + } else if (var1 > var2 && var1 > var3 && var1 > var4) { // L: 1375 return false; - } else if (var0 < var5 && var0 < var6 && var0 < var7) { // L: 1349 + } else if (var0 < var5 && var0 < var6 && var0 < var7) { // L: 1376 return false; - } else if (var0 > var5 && var0 > var6 && var0 > var7) { // L: 1350 + } else if (var0 > var5 && var0 > var6 && var0 > var7) { // L: 1377 return false; } else { - int var8 = (var1 - var2) * (var6 - var5) - (var0 - var5) * (var3 - var2); // L: 1351 - int var9 = (var7 - var6) * (var1 - var3) - (var0 - var6) * (var4 - var3); // L: 1352 - int var10 = (var5 - var7) * (var1 - var4) - (var2 - var4) * (var0 - var7); // L: 1353 - if (var8 == 0) { // L: 1354 - if (var9 != 0) { // L: 1357 - return var9 < 0 ? var10 <= 0 : var10 >= 0; // L: 1358 + int var8 = (var1 - var2) * (var6 - var5) - (var0 - var5) * (var3 - var2); // L: 1378 + int var9 = (var7 - var6) * (var1 - var3) - (var0 - var6) * (var4 - var3); // L: 1379 + int var10 = (var5 - var7) * (var1 - var4) - (var2 - var4) * (var0 - var7); // L: 1380 + if (var8 == 0) { // L: 1381 + if (var9 != 0) { // L: 1384 + return var9 < 0 ? var10 <= 0 : var10 >= 0; // L: 1385 } else { - return true; // L: 1360 + return true; // L: 1387 } } else { - return var8 < 0 ? var9 <= 0 && var10 <= 0 : var9 >= 0 && var10 >= 0; // L: 1355 + return var8 < 0 ? var9 <= 0 && var10 <= 0 : var9 >= 0 && var10 >= 0; // L: 1382 } } } diff --git a/runescape-client/src/main/java/SceneTileModel.java b/runescape-client/src/main/java/SceneTileModel.java index 034fb41bf2..6fd92408ea 100644 --- a/runescape-client/src/main/java/SceneTileModel.java +++ b/runescape-client/src/main/java/SceneTileModel.java @@ -2,77 +2,77 @@ import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; -@ObfuscatedName("gy") +@ObfuscatedName("gp") @Implements("SceneTileModel") public final class SceneTileModel { + @ObfuscatedName("g") + static int[] field2402; @ObfuscatedName("a") - static int[] field2405; - @ObfuscatedName("e") - static int[] field2406; - @ObfuscatedName("d") - static int[] field2393; - @ObfuscatedName("u") - static int[] field2394; + static int[] field2416; + @ObfuscatedName("k") + static int[] field2417; @ObfuscatedName("m") - static int[] field2409; - @ObfuscatedName("j") - static final int[][] field2407; - @ObfuscatedName("f") - static final int[][] field2397; - @ObfuscatedName("h") + static int[] field2418; + @ObfuscatedName("x") + static int[] field2419; + @ObfuscatedName("z") + static final int[][] field2420; + @ObfuscatedName("w") + static final int[][] field2421; + @ObfuscatedName("v") @Export("vertexX") int[] vertexX; - @ObfuscatedName("c") + @ObfuscatedName("n") @Export("vertexY") int[] vertexY; - @ObfuscatedName("o") + @ObfuscatedName("f") @Export("vertexZ") int[] vertexZ; - @ObfuscatedName("g") + @ObfuscatedName("y") @Export("triangleColorA") int[] triangleColorA; - @ObfuscatedName("l") + @ObfuscatedName("p") @Export("triangleColorB") int[] triangleColorB; - @ObfuscatedName("z") + @ObfuscatedName("j") @Export("triangleColorC") int[] triangleColorC; - @ObfuscatedName("t") + @ObfuscatedName("r") @Export("faceX") int[] faceX; - @ObfuscatedName("v") + @ObfuscatedName("b") @Export("faceY") int[] faceY; - @ObfuscatedName("b") + @ObfuscatedName("d") @Export("faceZ") int[] faceZ; - @ObfuscatedName("q") + @ObfuscatedName("s") @Export("triangleTextureId") int[] triangleTextureId; - @ObfuscatedName("i") + @ObfuscatedName("u") @Export("isFlat") boolean isFlat; - @ObfuscatedName("x") + @ObfuscatedName("l") @Export("shape") int shape; - @ObfuscatedName("k") + @ObfuscatedName("o") @Export("rotation") int rotation; - @ObfuscatedName("r") + @ObfuscatedName("c") @Export("underlayRgb") int underlayRgb; - @ObfuscatedName("p") + @ObfuscatedName("e") @Export("overlayRgb") int overlayRgb; static { - field2405 = new int[6]; // L: 21 - field2406 = new int[6]; // L: 22 - field2393 = new int[6]; // L: 23 - field2394 = new int[6]; // L: 24 - field2409 = new int[6]; // L: 25 - field2407 = new int[][]{{1, 3, 5, 7}, {1, 3, 5, 7}, {1, 3, 5, 7}, {1, 3, 5, 7, 6}, {1, 3, 5, 7, 6}, {1, 3, 5, 7, 6}, {1, 3, 5, 7, 6}, {1, 3, 5, 7, 2, 6}, {1, 3, 5, 7, 2, 8}, {1, 3, 5, 7, 2, 8}, {1, 3, 5, 7, 11, 12}, {1, 3, 5, 7, 11, 12}, {1, 3, 5, 7, 13, 14}}; // L: 26 - field2397 = new int[][]{{0, 1, 2, 3, 0, 0, 1, 3}, {1, 1, 2, 3, 1, 0, 1, 3}, {0, 1, 2, 3, 1, 0, 1, 3}, {0, 0, 1, 2, 0, 0, 2, 4, 1, 0, 4, 3}, {0, 0, 1, 4, 0, 0, 4, 3, 1, 1, 2, 4}, {0, 0, 4, 3, 1, 0, 1, 2, 1, 0, 2, 4}, {0, 1, 2, 4, 1, 0, 1, 4, 1, 0, 4, 3}, {0, 4, 1, 2, 0, 4, 2, 5, 1, 0, 4, 5, 1, 0, 5, 3}, {0, 4, 1, 2, 0, 4, 2, 3, 0, 4, 3, 5, 1, 0, 4, 5}, {0, 0, 4, 5, 1, 4, 1, 2, 1, 4, 2, 3, 1, 4, 3, 5}, {0, 0, 1, 5, 0, 1, 4, 5, 0, 1, 2, 4, 1, 0, 5, 3, 1, 5, 4, 3, 1, 4, 2, 3}, {1, 0, 1, 5, 1, 1, 4, 5, 1, 1, 2, 4, 0, 0, 5, 3, 0, 5, 4, 3, 0, 4, 2, 3}, {1, 0, 5, 4, 1, 0, 1, 5, 0, 0, 4, 3, 0, 4, 5, 3, 0, 5, 2, 3, 0, 1, 2, 5}}; // L: 41 + field2402 = new int[6]; // L: 21 + field2416 = new int[6]; // L: 22 + field2417 = new int[6]; // L: 23 + field2418 = new int[6]; // L: 24 + field2419 = new int[6]; // L: 25 + field2420 = new int[][]{{1, 3, 5, 7}, {1, 3, 5, 7}, {1, 3, 5, 7}, {1, 3, 5, 7, 6}, {1, 3, 5, 7, 6}, {1, 3, 5, 7, 6}, {1, 3, 5, 7, 6}, {1, 3, 5, 7, 2, 6}, {1, 3, 5, 7, 2, 8}, {1, 3, 5, 7, 2, 8}, {1, 3, 5, 7, 11, 12}, {1, 3, 5, 7, 11, 12}, {1, 3, 5, 7, 13, 14}}; // L: 26 + field2421 = new int[][]{{0, 1, 2, 3, 0, 0, 1, 3}, {1, 1, 2, 3, 1, 0, 1, 3}, {0, 1, 2, 3, 1, 0, 1, 3}, {0, 0, 1, 2, 0, 0, 2, 4, 1, 0, 4, 3}, {0, 0, 1, 4, 0, 0, 4, 3, 1, 1, 2, 4}, {0, 0, 4, 3, 1, 0, 1, 2, 1, 0, 2, 4}, {0, 1, 2, 4, 1, 0, 1, 4, 1, 0, 4, 3}, {0, 4, 1, 2, 0, 4, 2, 5, 1, 0, 4, 5, 1, 0, 5, 3}, {0, 4, 1, 2, 0, 4, 2, 3, 0, 4, 3, 5, 1, 0, 4, 5}, {0, 0, 4, 5, 1, 4, 1, 2, 1, 4, 2, 3, 1, 4, 3, 5}, {0, 0, 1, 5, 0, 1, 4, 5, 0, 1, 2, 4, 1, 0, 5, 3, 1, 5, 4, 3, 1, 4, 2, 3}, {1, 0, 1, 5, 1, 1, 4, 5, 1, 1, 2, 4, 0, 0, 5, 3, 0, 5, 4, 3, 0, 4, 2, 3}, {1, 0, 5, 4, 1, 0, 1, 5, 0, 0, 4, 3, 0, 4, 5, 3, 0, 5, 2, 3, 0, 1, 2, 5}}; // L: 41 } SceneTileModel(int var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8, int var9, int var10, int var11, int var12, int var13, int var14, int var15, int var16, int var17, int var18, int var19) { @@ -89,7 +89,7 @@ public final class SceneTileModel { int var21 = var20 / 2; // L: 64 int var22 = var20 / 4; // L: 65 int var23 = var20 * 3 / 4; // L: 66 - int[] var24 = field2407[var1]; // L: 67 + int[] var24 = field2420[var1]; // L: 67 int var25 = var24.length; // L: 68 this.vertexX = new int[var25]; // L: 69 this.vertexY = new int[var25]; // L: 70 @@ -224,7 +224,7 @@ public final class SceneTileModel { var27[var30] = var36; // L: 202 } - int[] var38 = field2397[var1]; // L: 204 + int[] var38 = field2421[var1]; // L: 204 var31 = var38.length / 4; // L: 205 this.faceX = new int[var31]; // L: 206 this.faceY = new int[var31]; // L: 207 diff --git a/runescape-client/src/main/java/SceneTilePaint.java b/runescape-client/src/main/java/SceneTilePaint.java index 89b4ff312b..81bac04e37 100644 --- a/runescape-client/src/main/java/SceneTilePaint.java +++ b/runescape-client/src/main/java/SceneTilePaint.java @@ -3,46 +3,47 @@ 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("gh") +@ObfuscatedName("ga") @Implements("SceneTilePaint") public final class SceneTilePaint { - @ObfuscatedName("h") + @ObfuscatedName("v") @ObfuscatedGetter( - intValue = 106917001 + intValue = 1657490379 ) @Export("swColor") int swColor; - @ObfuscatedName("c") + @ObfuscatedName("n") @ObfuscatedGetter( - intValue = -1198653441 + intValue = -338901479 ) @Export("seColor") int seColor; - @ObfuscatedName("o") + @ObfuscatedName("f") @ObfuscatedGetter( - intValue = 62824417 + intValue = 74746585 ) @Export("neColor") int neColor; - @ObfuscatedName("g") + @ObfuscatedName("y") @ObfuscatedGetter( - intValue = -790767125 + intValue = -1630451137 ) @Export("nwColor") int nwColor; - @ObfuscatedName("l") + @ObfuscatedName("p") @ObfuscatedGetter( - intValue = 1418532851 + intValue = -80564939 ) @Export("texture") int texture; - @ObfuscatedName("z") + @ObfuscatedName("j") @Export("isFlat") boolean isFlat; - @ObfuscatedName("t") + @ObfuscatedName("r") @ObfuscatedGetter( - intValue = -940535567 + intValue = 426134523 ) @Export("rgb") int rgb; @@ -58,104 +59,100 @@ public final class SceneTilePaint { this.isFlat = var7; // L: 19 } // L: 20 - @ObfuscatedName("c") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "(IIII)Lci;", - garbageValue = "-313203913" + descriptor = "(ILcf;ZB)I", + garbageValue = "1" ) - @Export("getWorldMapScript") - static Script getWorldMapScript(int var0, int var1, int var2) { - int var3 = (var1 << 8) + var0; // L: 40 - Script var6 = (Script)Script.Script_cached.get((long)(var3 << 16)); // L: 45 - Script var5; - if (var6 != null) { // L: 46 - var5 = var6; // L: 47 + static int method4258(int var0, Script var1, boolean var2) { + Widget var3 = var2 ? class13.scriptDotWidget : Interpreter.scriptActiveWidget; // L: 1074 + if (var0 == ScriptOpcodes.CC_GETX) { // L: 1075 + Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = var3.x; // L: 1076 + return 1; // L: 1077 + } else if (var0 == ScriptOpcodes.CC_GETY) { // L: 1079 + Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = var3.y; // L: 1080 + return 1; // L: 1081 + } else if (var0 == ScriptOpcodes.CC_GETWIDTH) { // L: 1083 + Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = var3.width; // L: 1084 + return 1; // L: 1085 + } else if (var0 == ScriptOpcodes.CC_GETHEIGHT) { // L: 1087 + Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = var3.height; // L: 1088 + return 1; // L: 1089 + } else if (var0 == ScriptOpcodes.CC_GETHIDE) { // L: 1091 + Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = var3.isHidden ? 1 : 0; // L: 1092 + return 1; // L: 1093 + } else if (var0 == ScriptOpcodes.CC_GETLAYER) { // L: 1095 + Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = var3.parentId; // L: 1096 + return 1; // L: 1097 } else { - String var7 = String.valueOf(var3); // L: 50 - int var8 = class22.archive12.getGroupId(var7); // L: 51 - if (var8 == -1) { // L: 52 - var5 = null; // L: 53 - } else { - label58: { - byte[] var9 = class22.archive12.takeFileFlat(var8); // L: 56 - if (var9 != null) { // L: 57 - if (var9.length <= 1) { // L: 58 - var5 = null; // L: 59 - break label58; // L: 60 - } - - var6 = class25.newScript(var9); // L: 62 - if (var6 != null) { // L: 63 - Script.Script_cached.put(var6, (long)(var3 << 16)); // L: 64 - var5 = var6; // L: 65 - break label58; // L: 66 - } - } - - var5 = null; // L: 69 - } - } - } - - if (var5 != null) { // L: 72 - return var5; // L: 73 - } else { - int var4 = WorldMapSection2.method3202(var2, var0); // L: 75 - Script var12 = (Script)Script.Script_cached.get((long)(var4 << 16)); // L: 78 - Script var13; - if (var12 != null) { // L: 79 - var13 = var12; // L: 80 - } else { - String var14 = String.valueOf(var4); // L: 83 - int var10 = class22.archive12.getGroupId(var14); // L: 84 - if (var10 == -1) { // L: 85 - var13 = null; // L: 86 - } else { - byte[] var11 = class22.archive12.takeFileFlat(var10); // L: 89 - if (var11 != null) { // L: 90 - if (var11.length <= 1) { // L: 91 - var13 = null; // L: 92 - return var13 != null ? var13 : null; // L: 105 108 - } - - var12 = class25.newScript(var11); // L: 95 - if (var12 != null) { // L: 96 - Script.Script_cached.put(var12, (long)(var4 << 16)); // L: 97 - var13 = var12; // L: 98 - return var13 != null ? var13 : null; - } - } - - var13 = null; // L: 102 - } - } - - return var13 != null ? var13 : null; + return 2; // L: 1099 } } - @ObfuscatedName("ht") + @ObfuscatedName("m") @ObfuscatedSignature( - descriptor = "(IIII)I", - garbageValue = "-82147640" + descriptor = "(I)V", + garbageValue = "1201682368" ) - @Export("getTileHeight") - static final int getTileHeight(int var0, int var1, int var2) { - int var3 = var0 >> 7; // L: 5448 - int var4 = var1 >> 7; // L: 5449 - if (var3 >= 0 && var4 >= 0 && var3 <= 103 && var4 <= 103) { // L: 5450 - int var5 = var2; // L: 5451 - if (var2 < 3 && (Tiles.Tiles_renderFlags[1][var3][var4] & 2) == 2) { // L: 5452 - var5 = var2 + 1; - } + public static void method4259() { + ItemComposition.ItemDefinition_cached.clear(); // L: 536 + ItemComposition.ItemDefinition_cachedModels.clear(); // L: 537 + ItemComposition.ItemDefinition_cachedSprites.clear(); // L: 538 + } // L: 539 - int var6 = var0 & 127; // L: 5453 - int var7 = var1 & 127; // L: 5454 - int var8 = (128 - var6) * Tiles.Tiles_heights[var5][var3][var4] + Tiles.Tiles_heights[var5][var3 + 1][var4] * var6 >> 7; // L: 5455 - int var9 = Tiles.Tiles_heights[var5][var3][var4 + 1] * (128 - var6) + var6 * Tiles.Tiles_heights[var5][var3 + 1][var4 + 1] >> 7; // L: 5456 - return var8 * (128 - var7) + var9 * var7 >> 7; // L: 5457 + @ObfuscatedName("aq") + @ObfuscatedSignature( + descriptor = "(ILcf;ZI)I", + garbageValue = "-1626936369" + ) + static int method4260(int var0, Script var1, boolean var2) { + if (var0 != 7000 && var0 != 7005 && var0 != 7010 && var0 != 7015 && var0 != 7020 && var0 != 7025 && var0 != 7030 && var0 != 7035) { // L: 4217 + if (var0 != 7001 && var0 != 7002 && var0 != 7011 && var0 != 7012 && var0 != 7021 && var0 != 7022) { // L: 4221 + if (var0 != 7003 && var0 != 7013 && var0 != 7023) { // L: 4225 + if (var0 != 7006 && var0 != 7007 && var0 != 7016 && var0 != 7017 && var0 != 7026 && var0 != 7027) { // L: 4229 + if (var0 != 7008 && var0 != 7018 && var0 != 7028) { // L: 4233 + if (var0 != 7031 && var0 != 7032) { // L: 4237 + if (var0 == 7033) { // L: 4242 + --Interpreter.Interpreter_stringStackSize; // L: 4243 + return 1; // L: 4244 + } else if (var0 != 7036 && var0 != 7037) { // L: 4246 + if (var0 == 7038) { // L: 4250 + --class44.Interpreter_intStackSize; // L: 4251 + return 1; // L: 4252 + } else if (var0 != 7004 && var0 != 7009 && var0 != 7014 && var0 != 7019 && var0 != 7024 && var0 != 7029 && var0 != 7034 && var0 != 7039) { // L: 4254 + return 2; // L: 4258 + } else { + --class44.Interpreter_intStackSize; // L: 4255 + return 1; // L: 4256 + } + } else { + class44.Interpreter_intStackSize -= 2; // L: 4247 + return 1; // L: 4248 + } + } else { + --Interpreter.Interpreter_stringStackSize; // L: 4238 + --class44.Interpreter_intStackSize; // L: 4239 + return 1; // L: 4240 + } + } else { + --class44.Interpreter_intStackSize; // L: 4234 + return 1; // L: 4235 + } + } else { + class44.Interpreter_intStackSize -= 2; // L: 4230 + return 1; // L: 4231 + } + } else { + class44.Interpreter_intStackSize -= 2; // L: 4226 + return 1; // L: 4227 + } + } else { + class44.Interpreter_intStackSize -= 3; // L: 4222 + return 1; // L: 4223 + } } else { - return 0; + class44.Interpreter_intStackSize -= 5; // L: 4218 + return 1; // L: 4219 } } } diff --git a/runescape-client/src/main/java/Script.java b/runescape-client/src/main/java/Script.java index 7177737854..dbc86b465c 100644 --- a/runescape-client/src/main/java/Script.java +++ b/runescape-client/src/main/java/Script.java @@ -1,63 +1,68 @@ +import java.net.URL; 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("ci") +@ObfuscatedName("cf") @Implements("Script") public class Script extends DualNode { - @ObfuscatedName("qn") - static boolean field1055; - @ObfuscatedName("h") + @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "Lho;" + descriptor = "Lhz;" ) @Export("Script_cached") static EvictingDualNodeHashTable Script_cached; - @ObfuscatedName("i") - public static short[] field1064; - @ObfuscatedName("d") - @Export("cacheSubPaths") - static String[] cacheSubPaths; - @ObfuscatedName("c") - String field1054; - @ObfuscatedName("o") + @ObfuscatedName("bf") + @ObfuscatedGetter( + intValue = 1575006245 + ) + static int field1094; + @ObfuscatedName("jx") + @ObfuscatedSignature( + descriptor = "Lio;" + ) + @Export("dragInventoryWidget") + static Widget dragInventoryWidget; + @ObfuscatedName("n") + String field1084; + @ObfuscatedName("f") @Export("opcodes") int[] opcodes; - @ObfuscatedName("g") + @ObfuscatedName("y") @Export("intOperands") int[] intOperands; - @ObfuscatedName("l") + @ObfuscatedName("p") @Export("stringOperands") String[] stringOperands; - @ObfuscatedName("z") + @ObfuscatedName("j") @ObfuscatedGetter( - intValue = -1945602351 + intValue = -1356584441 ) @Export("localIntCount") int localIntCount; - @ObfuscatedName("t") + @ObfuscatedName("r") @ObfuscatedGetter( - intValue = 2083195621 + intValue = -2056602721 ) @Export("localStringCount") int localStringCount; - @ObfuscatedName("v") + @ObfuscatedName("b") @ObfuscatedGetter( - intValue = -1877567613 + intValue = 1265512819 ) @Export("intArgumentCount") int intArgumentCount; - @ObfuscatedName("b") + @ObfuscatedName("d") @ObfuscatedGetter( - intValue = 1752633221 + intValue = -162786155 ) @Export("stringArgumentCount") int stringArgumentCount; - @ObfuscatedName("q") + @ObfuscatedName("s") @ObfuscatedSignature( - descriptor = "[Lmo;" + descriptor = "[Lmr;" ) @Export("switches") IterableNodeHashTable[] switches; @@ -69,199 +74,912 @@ public class Script extends DualNode { Script() { } // L: 23 - @ObfuscatedName("g") + @ObfuscatedName("y") @ObfuscatedSignature( - descriptor = "(IB)[Lmo;", - garbageValue = "-56" + descriptor = "(II)[Lmr;", + garbageValue = "920031088" ) @Export("newIterableNodeHashTable") IterableNodeHashTable[] newIterableNodeHashTable(int var1) { - return new IterableNodeHashTable[var1]; // L: 154 + return new IterableNodeHashTable[var1]; // L: 158 } - @ObfuscatedName("fj") + @ObfuscatedName("f") @ObfuscatedSignature( - descriptor = "(B)I", - garbageValue = "-55" + descriptor = "(Ljava/lang/String;ILjava/lang/String;I)Z", + garbageValue = "2094340190" ) - static int method2026() { - if (Client.archiveLoaders != null && Client.archiveLoadersDone < Client.archiveLoaders.size()) { // L: 1937 - int var0 = 0; // L: 1938 + static boolean method1996(String var0, int var1, String var2) { + if (var1 == 0) { // L: 54 + try { + if (!class44.field318.startsWith("win")) { // L: 56 + throw new Exception(); + } else if (!var0.startsWith("http://") && !var0.startsWith("https://")) { // L: 57 + throw new Exception(); + } else { + String var10 = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789?&=,.%+-_#:/*"; // L: 58 - for (int var1 = 0; var1 <= Client.archiveLoadersDone; ++var1) { // L: 1939 - var0 += ((ArchiveLoader)Client.archiveLoaders.get(var1)).loadedCount; // L: 1940 + for (int var4 = 0; var4 < var0.length(); ++var4) { // L: 59 + if (var10.indexOf(var0.charAt(var4)) == -1) { // L: 60 + throw new Exception(); + } + } + + Runtime.getRuntime().exec("cmd /c start \"j\" \"" + var0 + "\""); // L: 62 + return true; // L: 63 + } + } catch (Throwable var5) { // L: 65 + return false; // L: 66 + } + } else if (var1 == 1) { // L: 69 + try { + Object var3 = class42.method422(class44.applet, var2, new Object[]{(new URL(class44.applet.getCodeBase(), var0)).toString()}); // L: 71 + return var3 != null; // L: 72 + } catch (Throwable var6) { // L: 74 + return false; // L: 75 + } + } else if (var1 == 2) { // L: 78 + try { + class44.applet.getAppletContext().showDocument(new URL(class44.applet.getCodeBase(), var0), "_blank"); // L: 80 + return true; // L: 81 + } catch (Exception var7) { // L: 83 + return false; // L: 84 + } + } else if (var1 == 3) { // L: 87 + try { + class42.method421(class44.applet, "loggedout"); // L: 89 + } catch (Throwable var9) { // L: 91 } - return var0 * 10000 / Client.field893; // L: 1942 + try { + class44.applet.getAppletContext().showDocument(new URL(class44.applet.getCodeBase(), var0), "_top"); // L: 93 + return true; // L: 94 + } catch (Exception var8) { // L: 96 + return false; // L: 97 + } } else { - return 10000; + throw new IllegalArgumentException(); // L: 100 } } - @ObfuscatedName("id") + @ObfuscatedName("f") @ObfuscatedSignature( - descriptor = "(Ley;IIII)V", - garbageValue = "-1875812955" + descriptor = "(ZZI)Lop;", + garbageValue = "-488222672" ) - @Export("addNpcToMenu") - static final void addNpcToMenu(NPCComposition var0, int var1, int var2, int var3) { - if (Client.menuOptionsCount < 400) { // L: 9290 - if (var0.transforms != null) { // L: 9291 - var0 = var0.transform(); + static IndexedSprite method1995(boolean var0, boolean var1) { + return var0 ? (var1 ? ClanChannel.field33 : GrandExchangeOffer.options_buttons_2Sprite) : (var1 ? Decimator.field553 : FriendSystem.options_buttons_0Sprite); // L: 184 + } + + @ObfuscatedName("r") + @ObfuscatedSignature( + descriptor = "(IIZB)Ljava/lang/String;", + garbageValue = "-128" + ) + static String method1998(int var0, int var1, boolean var2) { + if (var1 >= 2 && var1 <= 36) { // L: 106 + if (var2 && var0 >= 0) { // L: 107 + int var3 = 2; // L: 108 + + for (int var4 = var0 / var1; var4 != 0; ++var3) { // L: 109 110 112 + var4 /= var1; // L: 111 + } + + char[] var5 = new char[var3]; // L: 114 + var5[0] = '+'; // L: 115 + + for (int var6 = var3 - 1; var6 > 0; --var6) { // L: 116 + int var7 = var0; // L: 117 + var0 /= var1; // L: 118 + int var8 = var7 - var0 * var1; // L: 119 + if (var8 >= 10) { // L: 120 + var5[var6] = (char)(var8 + 87); + } else { + var5[var6] = (char)(var8 + 48); // L: 121 + } + } + + return new String(var5); // L: 123 + } else { + return Integer.toString(var0, var1); } + } else { + throw new IllegalArgumentException("" + var1); + } + } - if (var0 != null) { // L: 9292 - if (var0.isInteractable) { // L: 9293 - if (!var0.isFollower || Client.followerIndex == var1) { // L: 9294 - String var4 = var0.name; // L: 9295 - int var7; - int var8; - if (var0.combatLevel != 0) { // L: 9296 - var7 = var0.combatLevel; // L: 9299 - var8 = class35.localPlayer.combatLevel; // L: 9300 - int var9 = var8 - var7; // L: 9302 - String var6; - if (var9 < -9) { // L: 9303 - var6 = HorizontalAlignment.colorStartTag(16711680); // L: 9304 - } else if (var9 < -6) { // L: 9307 - var6 = HorizontalAlignment.colorStartTag(16723968); // L: 9308 - } else if (var9 < -3) { // L: 9311 - var6 = HorizontalAlignment.colorStartTag(16740352); // L: 9312 - } else if (var9 < 0) { // L: 9315 - var6 = HorizontalAlignment.colorStartTag(16756736); // L: 9316 - } else if (var9 > 9) { // L: 9319 - var6 = HorizontalAlignment.colorStartTag(65280); // L: 9320 - } else if (var9 > 6) { // L: 9323 - var6 = HorizontalAlignment.colorStartTag(4259584); // L: 9324 - } else if (var9 > 3) { // L: 9327 - var6 = HorizontalAlignment.colorStartTag(8453888); // L: 9328 - } else if (var9 > 0) { // L: 9331 - var6 = HorizontalAlignment.colorStartTag(12648192); // L: 9332 - } else { - var6 = HorizontalAlignment.colorStartTag(16776960); // L: 9335 - } + @ObfuscatedName("iq") + @ObfuscatedSignature( + descriptor = "(IIIILjava/lang/String;Ljava/lang/String;III)V", + garbageValue = "2054699794" + ) + @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) { // L: 7786 + var2 -= 2000; + } - var4 = var4 + var6 + " " + " (" + "level-" + var0.combatLevel + ")"; // L: 9337 + PacketBufferNode var8; + if (var2 == 1) { // L: 7787 + Client.mouseCrossX = var6; // L: 8140 + Client.mouseCrossY = var7; // L: 8141 + Client.mouseCrossColor = 2; // L: 8142 + Client.mouseCrossState = 0; // L: 8143 + Client.destinationX = var0; // L: 8144 + Client.destinationY = var1; // L: 8145 + var8 = class21.getPacketBufferNode(ClientPacket.field2677, Client.packetWriter.isaacCipher); // L: 8147 + var8.packetBuffer.method6619(UserComparator5.selectedItemId); // L: 8148 + var8.packetBuffer.method6602(var3); // L: 8149 + var8.packetBuffer.method6594(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); // L: 8150 + var8.packetBuffer.method6602(SoundSystem.baseY + var1); // L: 8151 + var8.packetBuffer.writeInt(Player.selectedItemWidget); // L: 8152 + var8.packetBuffer.method6602(var0 + VertexNormal.baseX); // L: 8153 + var8.packetBuffer.writeShort(ClanChannelMember.selectedItemSlot); // L: 8154 + Client.packetWriter.addNode(var8); // L: 8155 + } else if (var2 == 2) { + Client.mouseCrossX = var6; // L: 8365 + Client.mouseCrossY = var7; // L: 8366 + Client.mouseCrossColor = 2; // L: 8367 + Client.mouseCrossState = 0; // L: 8368 + Client.destinationX = var0; // L: 8369 + Client.destinationY = var1; // L: 8370 + var8 = class21.getPacketBufferNode(ClientPacket.field2643, Client.packetWriter.isaacCipher); // L: 8371 + var8.packetBuffer.method6600(var0 + VertexNormal.baseX); // L: 8372 + var8.packetBuffer.writeShort(var3); // L: 8373 + var8.packetBuffer.method6600(Client.field788); // L: 8374 + var8.packetBuffer.writeShort(SoundSystem.baseY + var1); // L: 8375 + var8.packetBuffer.writeShort(Client.selectedSpellChildIndex); // L: 8376 + var8.packetBuffer.method6594(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); // L: 8377 + var8.packetBuffer.method6612(Decimator.selectedSpellWidget); // L: 8378 + Client.packetWriter.addNode(var8); // L: 8379 + } else if (var2 == 3) { + Client.mouseCrossX = var6; // L: 8037 + Client.mouseCrossY = var7; // L: 8038 + Client.mouseCrossColor = 2; // L: 8039 + Client.mouseCrossState = 0; // L: 8040 + Client.destinationX = var0; // L: 8041 + Client.destinationY = var1; // L: 8042 + var8 = class21.getPacketBufferNode(ClientPacket.field2641, Client.packetWriter.isaacCipher); // L: 8044 + var8.packetBuffer.method6594(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); // L: 8045 + var8.packetBuffer.method6602(var3); // L: 8046 + var8.packetBuffer.writeShort(var0 + VertexNormal.baseX); // L: 8047 + var8.packetBuffer.method6600(SoundSystem.baseY + var1); // L: 8048 + Client.packetWriter.addNode(var8); // L: 8049 + } else if (var2 == 4) { + Client.mouseCrossX = var6; // L: 8052 + Client.mouseCrossY = var7; // L: 8053 + Client.mouseCrossColor = 2; // L: 8054 + Client.mouseCrossState = 0; // L: 8055 + Client.destinationX = var0; // L: 8056 + Client.destinationY = var1; // L: 8057 + var8 = class21.getPacketBufferNode(ClientPacket.field2626, Client.packetWriter.isaacCipher); // L: 8059 + var8.packetBuffer.writeShort(var0 + VertexNormal.baseX); // L: 8060 + var8.packetBuffer.method6602(var3); // L: 8061 + var8.packetBuffer.method6581(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); // L: 8062 + var8.packetBuffer.method6602(SoundSystem.baseY + var1); // L: 8063 + Client.packetWriter.addNode(var8); // L: 8064 + } else if (var2 == 5) { + Client.mouseCrossX = var6; // L: 7950 + Client.mouseCrossY = var7; // L: 7951 + Client.mouseCrossColor = 2; // L: 7952 + Client.mouseCrossState = 0; // L: 7953 + Client.destinationX = var0; // L: 7954 + Client.destinationY = var1; // L: 7955 + var8 = class21.getPacketBufferNode(ClientPacket.field2672, Client.packetWriter.isaacCipher); // L: 7957 + var8.packetBuffer.method6600(var0 + VertexNormal.baseX); // L: 7958 + var8.packetBuffer.method6602(SoundSystem.baseY + var1); // L: 7959 + var8.packetBuffer.method6581(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); // L: 7960 + var8.packetBuffer.method6619(var3); // L: 7961 + Client.packetWriter.addNode(var8); // L: 7962 + } else if (var2 == 6) { + Client.mouseCrossX = var6; // L: 8334 + Client.mouseCrossY = var7; // L: 8335 + Client.mouseCrossColor = 2; // L: 8336 + Client.mouseCrossState = 0; // L: 8337 + Client.destinationX = var0; // L: 8338 + Client.destinationY = var1; // L: 8339 + var8 = class21.getPacketBufferNode(ClientPacket.field2572, Client.packetWriter.isaacCipher); // L: 8341 + var8.packetBuffer.method6619(var3); // L: 8342 + var8.packetBuffer.method6619(SoundSystem.baseY + var1); // L: 8343 + var8.packetBuffer.method6581(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); // L: 8344 + var8.packetBuffer.method6602(var0 + VertexNormal.baseX); // L: 8345 + Client.packetWriter.addNode(var8); // L: 8346 + } else { + PacketBufferNode var9; + NPC var13; + if (var2 == 7) { + var13 = Client.npcs[var3]; // L: 8284 + if (var13 != null) { // L: 8285 + Client.mouseCrossX = var6; // L: 8286 + Client.mouseCrossY = var7; // L: 8287 + Client.mouseCrossColor = 2; // L: 8288 + Client.mouseCrossState = 0; // L: 8289 + Client.destinationX = var0; // L: 8290 + Client.destinationY = var1; // L: 8291 + var9 = class21.getPacketBufferNode(ClientPacket.field2675, Client.packetWriter.isaacCipher); // L: 8293 + var9.packetBuffer.writeByte(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); // L: 8294 + var9.packetBuffer.method6602(UserComparator5.selectedItemId); // L: 8295 + var9.packetBuffer.method6612(Player.selectedItemWidget); // L: 8296 + var9.packetBuffer.method6619(var3); // L: 8297 + var9.packetBuffer.method6600(ClanChannelMember.selectedItemSlot); // L: 8298 + Client.packetWriter.addNode(var9); // L: 8299 + } + } else if (var2 == 8) { + var13 = Client.npcs[var3]; // L: 7897 + if (var13 != null) { // L: 7898 + Client.mouseCrossX = var6; // L: 7899 + Client.mouseCrossY = var7; // L: 7900 + Client.mouseCrossColor = 2; // L: 7901 + Client.mouseCrossState = 0; // L: 7902 + Client.destinationX = var0; // L: 7903 + Client.destinationY = var1; // L: 7904 + var9 = class21.getPacketBufferNode(ClientPacket.field2599, Client.packetWriter.isaacCipher); // L: 7905 + var9.packetBuffer.method6612(Decimator.selectedSpellWidget); // L: 7906 + var9.packetBuffer.method6600(Client.field788); // L: 7907 + var9.packetBuffer.method6600(var3); // L: 7908 + var9.packetBuffer.writeShort(Client.selectedSpellChildIndex); // L: 7909 + var9.packetBuffer.method6594(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); // L: 7910 + Client.packetWriter.addNode(var9); // L: 7911 + } + } else if (var2 == 9) { + var13 = Client.npcs[var3]; // L: 8268 + if (var13 != null) { // L: 8269 + Client.mouseCrossX = var6; // L: 8270 + Client.mouseCrossY = var7; // L: 8271 + Client.mouseCrossColor = 2; // L: 8272 + Client.mouseCrossState = 0; // L: 8273 + Client.destinationX = var0; // L: 8274 + Client.destinationY = var1; // L: 8275 + var9 = class21.getPacketBufferNode(ClientPacket.field2624, Client.packetWriter.isaacCipher); // L: 8277 + var9.packetBuffer.method6581(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); // L: 8278 + var9.packetBuffer.method6600(var3); // L: 8279 + Client.packetWriter.addNode(var9); // L: 8280 + } + } else if (var2 == 10) { + var13 = Client.npcs[var3]; // L: 8525 + if (var13 != null) { // L: 8526 + Client.mouseCrossX = var6; // L: 8527 + Client.mouseCrossY = var7; // L: 8528 + Client.mouseCrossColor = 2; // L: 8529 + Client.mouseCrossState = 0; // L: 8530 + Client.destinationX = var0; // L: 8531 + Client.destinationY = var1; // L: 8532 + var9 = class21.getPacketBufferNode(ClientPacket.field2670, Client.packetWriter.isaacCipher); // L: 8534 + var9.packetBuffer.method6619(var3); // L: 8535 + var9.packetBuffer.method6581(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); // L: 8536 + Client.packetWriter.addNode(var9); // L: 8537 + } + } else if (var2 == 11) { + var13 = Client.npcs[var3]; // L: 8388 + if (var13 != null) { // L: 8389 + Client.mouseCrossX = var6; // L: 8390 + Client.mouseCrossY = var7; // L: 8391 + Client.mouseCrossColor = 2; // L: 8392 + Client.mouseCrossState = 0; // L: 8393 + Client.destinationX = var0; // L: 8394 + Client.destinationY = var1; // L: 8395 + var9 = class21.getPacketBufferNode(ClientPacket.field2618, Client.packetWriter.isaacCipher); // L: 8397 + var9.packetBuffer.method6600(var3); // L: 8398 + var9.packetBuffer.writeByte(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); // L: 8399 + Client.packetWriter.addNode(var9); // L: 8400 + } + } else if (var2 == 12) { + var13 = Client.npcs[var3]; // L: 8349 + if (var13 != null) { // L: 8350 + Client.mouseCrossX = var6; // L: 8351 + Client.mouseCrossY = var7; // L: 8352 + Client.mouseCrossColor = 2; // L: 8353 + Client.mouseCrossState = 0; // L: 8354 + Client.destinationX = var0; // L: 8355 + Client.destinationY = var1; // L: 8356 + var9 = class21.getPacketBufferNode(ClientPacket.field2601, Client.packetWriter.isaacCipher); // L: 8358 + var9.packetBuffer.writeByte(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); // L: 8359 + var9.packetBuffer.method6619(var3); // L: 8360 + Client.packetWriter.addNode(var9); // L: 8361 + } + } else if (var2 == 13) { + var13 = Client.npcs[var3]; // L: 7847 + if (var13 != null) { // L: 7848 + Client.mouseCrossX = var6; // L: 7849 + Client.mouseCrossY = var7; // L: 7850 + Client.mouseCrossColor = 2; // L: 7851 + Client.mouseCrossState = 0; // L: 7852 + Client.destinationX = var0; // L: 7853 + Client.destinationY = var1; // L: 7854 + var9 = class21.getPacketBufferNode(ClientPacket.field2625, Client.packetWriter.isaacCipher); // L: 7856 + var9.packetBuffer.method6594(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); // L: 7857 + var9.packetBuffer.method6602(var3); // L: 7858 + Client.packetWriter.addNode(var9); // L: 7859 + } + } else { + Player var15; + if (var2 == 14) { + var15 = Client.players[var3]; // L: 8067 + if (var15 != null) { // L: 8068 + Client.mouseCrossX = var6; // L: 8069 + Client.mouseCrossY = var7; // L: 8070 + Client.mouseCrossColor = 2; // L: 8071 + Client.mouseCrossState = 0; // L: 8072 + Client.destinationX = var0; // L: 8073 + Client.destinationY = var1; // L: 8074 + var9 = class21.getPacketBufferNode(ClientPacket.field2623, Client.packetWriter.isaacCipher); // L: 8076 + var9.packetBuffer.writeIntME(Player.selectedItemWidget); // L: 8077 + var9.packetBuffer.method6619(UserComparator5.selectedItemId); // L: 8078 + var9.packetBuffer.method6581(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); // L: 8079 + var9.packetBuffer.method6619(ClanChannelMember.selectedItemSlot); // L: 8080 + var9.packetBuffer.writeShort(var3); // L: 8081 + Client.packetWriter.addNode(var9); // L: 8082 + } + } else if (var2 == 15) { + var15 = Client.players[var3]; // L: 8452 + if (var15 != null) { // L: 8453 + Client.mouseCrossX = var6; // L: 8454 + Client.mouseCrossY = var7; // L: 8455 + Client.mouseCrossColor = 2; // L: 8456 + Client.mouseCrossState = 0; // L: 8457 + Client.destinationX = var0; // L: 8458 + Client.destinationY = var1; // L: 8459 + var9 = class21.getPacketBufferNode(ClientPacket.field2615, Client.packetWriter.isaacCipher); // L: 8460 + var9.packetBuffer.method6619(Client.selectedSpellChildIndex); // L: 8461 + var9.packetBuffer.method6602(var3); // L: 8462 + var9.packetBuffer.method6611(Decimator.selectedSpellWidget); // L: 8463 + var9.packetBuffer.method6584(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); // L: 8464 + var9.packetBuffer.method6602(Client.field788); // L: 8465 + Client.packetWriter.addNode(var9); // L: 8466 + } + } else if (var2 == 16) { + Client.mouseCrossX = var6; // L: 7799 + Client.mouseCrossY = var7; // L: 7800 + Client.mouseCrossColor = 2; // L: 7801 + Client.mouseCrossState = 0; // L: 7802 + Client.destinationX = var0; // L: 7803 + Client.destinationY = var1; // L: 7804 + var8 = class21.getPacketBufferNode(ClientPacket.field2577, Client.packetWriter.isaacCipher); // L: 7806 + var8.packetBuffer.method6600(ClanChannelMember.selectedItemSlot); // L: 7807 + var8.packetBuffer.method6619(var3); // L: 7808 + var8.packetBuffer.method6600(UserComparator5.selectedItemId); // L: 7809 + var8.packetBuffer.method6602(SoundSystem.baseY + var1); // L: 7810 + var8.packetBuffer.method6600(var0 + VertexNormal.baseX); // L: 7811 + var8.packetBuffer.method6612(Player.selectedItemWidget); // L: 7812 + var8.packetBuffer.method6584(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); // L: 7813 + Client.packetWriter.addNode(var8); // L: 7814 + } else if (var2 == 17) { + Client.mouseCrossX = var6; // L: 8086 + Client.mouseCrossY = var7; // L: 8087 + Client.mouseCrossColor = 2; // L: 8088 + Client.mouseCrossState = 0; // L: 8089 + Client.destinationX = var0; // L: 8090 + Client.destinationY = var1; // L: 8091 + var8 = class21.getPacketBufferNode(ClientPacket.field2668, Client.packetWriter.isaacCipher); // L: 8092 + var8.packetBuffer.method6581(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); // L: 8093 + var8.packetBuffer.method6611(Decimator.selectedSpellWidget); // L: 8094 + var8.packetBuffer.method6600(SoundSystem.baseY + var1); // L: 8095 + var8.packetBuffer.method6602(Client.field788); // L: 8096 + var8.packetBuffer.method6619(var3); // L: 8097 + var8.packetBuffer.writeShort(var0 + VertexNormal.baseX); // L: 8098 + var8.packetBuffer.method6600(Client.selectedSpellChildIndex); // L: 8099 + Client.packetWriter.addNode(var8); // L: 8100 + } else if (var2 == 18) { + Client.mouseCrossX = var6; // L: 8011 + Client.mouseCrossY = var7; // L: 8012 + Client.mouseCrossColor = 2; // L: 8013 + Client.mouseCrossState = 0; // L: 8014 + Client.destinationX = var0; // L: 8015 + Client.destinationY = var1; // L: 8016 + var8 = class21.getPacketBufferNode(ClientPacket.field2666, Client.packetWriter.isaacCipher); // L: 8018 + var8.packetBuffer.writeShort(var3); // L: 8019 + var8.packetBuffer.method6584(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); // L: 8020 + var8.packetBuffer.method6602(SoundSystem.baseY + var1); // L: 8021 + var8.packetBuffer.writeShort(var0 + VertexNormal.baseX); // L: 8022 + Client.packetWriter.addNode(var8); // L: 8023 + } else if (var2 == 19) { + Client.mouseCrossX = var6; // L: 8565 + Client.mouseCrossY = var7; // L: 8566 + Client.mouseCrossColor = 2; // L: 8567 + Client.mouseCrossState = 0; // L: 8568 + Client.destinationX = var0; // L: 8569 + Client.destinationY = var1; // L: 8570 + var8 = class21.getPacketBufferNode(ClientPacket.field2659, Client.packetWriter.isaacCipher); // L: 8572 + var8.packetBuffer.method6600(var0 + VertexNormal.baseX); // L: 8573 + var8.packetBuffer.method6602(SoundSystem.baseY + var1); // L: 8574 + var8.packetBuffer.method6581(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); // L: 8575 + var8.packetBuffer.method6600(var3); // L: 8576 + Client.packetWriter.addNode(var8); // L: 8577 + } else if (var2 == 20) { + Client.mouseCrossX = var6; // L: 8470 + Client.mouseCrossY = var7; // L: 8471 + Client.mouseCrossColor = 2; // L: 8472 + Client.mouseCrossState = 0; // L: 8473 + Client.destinationX = var0; // L: 8474 + Client.destinationY = var1; // L: 8475 + var8 = class21.getPacketBufferNode(ClientPacket.field2676, Client.packetWriter.isaacCipher); // L: 8477 + var8.packetBuffer.method6619(var3); // L: 8478 + var8.packetBuffer.method6600(var0 + VertexNormal.baseX); // L: 8479 + var8.packetBuffer.method6584(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); // L: 8480 + var8.packetBuffer.method6602(SoundSystem.baseY + var1); // L: 8481 + Client.packetWriter.addNode(var8); // L: 8482 + } else if (var2 == 21) { + Client.mouseCrossX = var6; // L: 7989 + Client.mouseCrossY = var7; // L: 7990 + Client.mouseCrossColor = 2; // L: 7991 + Client.mouseCrossState = 0; // L: 7992 + Client.destinationX = var0; // L: 7993 + Client.destinationY = var1; // L: 7994 + var8 = class21.getPacketBufferNode(ClientPacket.field2575, Client.packetWriter.isaacCipher); // L: 7996 + var8.packetBuffer.method6602(var3); // L: 7997 + var8.packetBuffer.writeShort(SoundSystem.baseY + var1); // L: 7998 + var8.packetBuffer.method6581(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); // L: 7999 + var8.packetBuffer.writeShort(var0 + VertexNormal.baseX); // L: 8000 + Client.packetWriter.addNode(var8); // L: 8001 + } else if (var2 == 22) { + Client.mouseCrossX = var6; // L: 8415 + Client.mouseCrossY = var7; // L: 8416 + Client.mouseCrossColor = 2; // L: 8417 + Client.mouseCrossState = 0; // L: 8418 + Client.destinationX = var0; // L: 8419 + Client.destinationY = var1; // L: 8420 + var8 = class21.getPacketBufferNode(ClientPacket.field2649, Client.packetWriter.isaacCipher); // L: 8422 + var8.packetBuffer.method6602(var3); // L: 8423 + var8.packetBuffer.method6619(var0 + VertexNormal.baseX); // L: 8424 + var8.packetBuffer.method6594(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); // L: 8425 + var8.packetBuffer.method6619(SoundSystem.baseY + var1); // L: 8426 + Client.packetWriter.addNode(var8); // L: 8427 + } else if (var2 == 23) { + if (Client.isMenuOpen) { // L: 8158 + AbstractSocket.scene.setViewportWalking(); // L: 8159 + } else { + AbstractSocket.scene.menuOpen(class22.Client_plane, var0, var1, true); // L: 8162 + } + } else { + PacketBufferNode var11; + Widget var16; + if (var2 == 24) { + var16 = Frames.getWidget(var1); // L: 8404 + boolean var12 = true; // L: 8405 + if (var16.contentType > 0) { // L: 8406 + var12 = SequenceDefinition.method3148(var16); } - if (var0.isFollower && Client.followerOpsLowPriority) { // L: 9339 - InterfaceParent.insertMenuItemNoShift("Examine", HorizontalAlignment.colorStartTag(16776960) + var4, 1003, var1, var2, var3); // L: 9340 + if (var12) { // L: 8407 + var11 = class21.getPacketBufferNode(ClientPacket.field2619, Client.packetWriter.isaacCipher); // L: 8409 + var11.packetBuffer.writeInt(var1); // L: 8410 + Client.packetWriter.addNode(var11); // L: 8411 + } + } else { + if (var2 == 25) { + var16 = ModeWhere.getWidgetChild(var1, var0); // L: 8501 + if (var16 != null) { // L: 8502 + class5.Widget_runOnTargetLeave(); // L: 8503 + LoginScreenAnimation.selectSpell(var1, var0, AttackOption.Widget_unpackTargetMask(class21.getWidgetFlags(var16)), var16.itemId); // L: 8504 + Client.isItemSelected = 0; // L: 8505 + Client.selectedSpellActionName = BoundaryObject.Widget_getSpellActionName(var16); // L: 8506 + if (Client.selectedSpellActionName == null) { // L: 8507 + Client.selectedSpellActionName = "null"; + } + + if (var16.isIf3) { // L: 8508 + Client.selectedSpellName = var16.dataText + class44.colorStartTag(16777215); + } else { + Client.selectedSpellName = class44.colorStartTag(65280) + var16.spellName + class44.colorStartTag(16777215); // L: 8509 + } + } + + return; // L: 8511 } - if (Client.isItemSelected == 1) { // L: 9343 - InterfaceParent.insertMenuItemNoShift("Use", Client.selectedItemName + " " + "->" + " " + HorizontalAlignment.colorStartTag(16776960) + var4, 7, var1, var2, var3); // L: 9344 - } else if (Client.isSpellSelected) { // L: 9347 - if ((GrandExchangeOfferUnitPriceComparator.selectedSpellFlags & 2) == 2) { // L: 9348 - InterfaceParent.insertMenuItemNoShift(Client.selectedSpellActionName, Client.selectedSpellName + " " + "->" + " " + HorizontalAlignment.colorStartTag(16776960) + var4, 8, var1, var2, var3); // L: 9349 - } + if (var2 == 26) { + class4.method47(); // L: 8382 } else { - int var10 = var0.isFollower && Client.followerOpsLowPriority ? 2000 : 0; // L: 9354 - String[] var11 = var0.actions; // L: 9355 - if (var11 != null) { // L: 9356 - for (var7 = 4; var7 >= 0; --var7) { // L: 9357 - if (var11[var7] != null && !var11[var7].equalsIgnoreCase("Attack")) { // L: 9358 - var8 = 0; // L: 9359 - if (var7 == 0) { // L: 9360 - var8 = var10 + 9; - } - - if (var7 == 1) { // L: 9361 - var8 = var10 + 10; - } - - if (var7 == 2) { // L: 9362 - var8 = var10 + 11; - } - - if (var7 == 3) { // L: 9363 - var8 = var10 + 12; - } - - if (var7 == 4) { // L: 9364 - var8 = var10 + 13; - } - - InterfaceParent.insertMenuItemNoShift(var11[var7], HorizontalAlignment.colorStartTag(16776960) + var4, var8, var1, var2, var3); // L: 9365 + int var10; + Widget var14; + if (var2 == 28) { + var8 = class21.getPacketBufferNode(ClientPacket.field2619, Client.packetWriter.isaacCipher); // L: 7864 + var8.packetBuffer.writeInt(var1); // L: 7865 + Client.packetWriter.addNode(var8); // L: 7866 + var14 = Frames.getWidget(var1); // L: 7867 + if (var14.cs1Instructions != null && var14.cs1Instructions[0][0] == 5) { // L: 7868 + var10 = var14.cs1Instructions[0][1]; // L: 7869 + Varps.Varps_main[var10] = 1 - Varps.Varps_main[var10]; // L: 7870 + ApproximateRouteStrategy.changeGameOptions(var10); // L: 7871 + } + } else if (var2 == 29) { + var8 = class21.getPacketBufferNode(ClientPacket.field2619, Client.packetWriter.isaacCipher); // L: 8304 + var8.packetBuffer.writeInt(var1); // L: 8305 + Client.packetWriter.addNode(var8); // L: 8306 + var14 = Frames.getWidget(var1); // L: 8307 + if (var14.cs1Instructions != null && var14.cs1Instructions[0][0] == 5) { // L: 8308 + var10 = var14.cs1Instructions[0][1]; // L: 8309 + if (Varps.Varps_main[var10] != var14.cs1ComparisonValues[0]) { // L: 8310 + Varps.Varps_main[var10] = var14.cs1ComparisonValues[0]; // L: 8311 + ApproximateRouteStrategy.changeGameOptions(var10); // L: 8312 } } - } + } else if (var2 == 30) { + if (Client.meslayerContinueWidget == null) { // L: 8004 + class22.resumePauseWidget(var1, var0); // L: 8005 + Client.meslayerContinueWidget = ModeWhere.getWidgetChild(var1, var0); // L: 8006 + WorldMapCacheName.invalidateWidget(Client.meslayerContinueWidget); // L: 8007 + } + } else if (var2 == 31) { + var8 = class21.getPacketBufferNode(ClientPacket.field2631, Client.packetWriter.isaacCipher); // L: 7937 + var8.packetBuffer.writeInt(var1); // L: 7938 + var8.packetBuffer.writeIntME(Player.selectedItemWidget); // L: 7939 + var8.packetBuffer.method6619(var0); // L: 7940 + var8.packetBuffer.writeShort(var3); // L: 7941 + var8.packetBuffer.method6602(ClanChannelMember.selectedItemSlot); // L: 7942 + var8.packetBuffer.method6602(UserComparator5.selectedItemId); // L: 7943 + Client.packetWriter.addNode(var8); // L: 7944 + Client.field747 = 0; // L: 7945 + GrandExchangeEvents.field3626 = Frames.getWidget(var1); // L: 7946 + Client.field841 = var0; // L: 7947 + } else if (var2 == 32) { + var8 = class21.getPacketBufferNode(ClientPacket.field2609, Client.packetWriter.isaacCipher); // L: 7977 + var8.packetBuffer.method6612(Decimator.selectedSpellWidget); // L: 7978 + var8.packetBuffer.method6619(Client.selectedSpellChildIndex); // L: 7979 + var8.packetBuffer.method6612(var1); // L: 7980 + var8.packetBuffer.method6600(var3); // L: 7981 + var8.packetBuffer.method6619(var0); // L: 7982 + Client.packetWriter.addNode(var8); // L: 7983 + Client.field747 = 0; // L: 7984 + GrandExchangeEvents.field3626 = Frames.getWidget(var1); // L: 7985 + Client.field841 = var0; // L: 7986 + } else if (var2 == 33) { + var8 = class21.getPacketBufferNode(ClientPacket.field2585, Client.packetWriter.isaacCipher); // L: 8542 + var8.packetBuffer.method6612(var1); // L: 8543 + var8.packetBuffer.method6600(var0); // L: 8544 + var8.packetBuffer.writeShort(var3); // L: 8545 + Client.packetWriter.addNode(var8); // L: 8546 + Client.field747 = 0; // L: 8547 + GrandExchangeEvents.field3626 = Frames.getWidget(var1); // L: 8548 + Client.field841 = var0; // L: 8549 + } else if (var2 == 34) { + var8 = class21.getPacketBufferNode(ClientPacket.field2576, Client.packetWriter.isaacCipher); // L: 7887 + var8.packetBuffer.writeIntME(var1); // L: 7888 + var8.packetBuffer.method6600(var0); // L: 7889 + var8.packetBuffer.method6600(var3); // L: 7890 + Client.packetWriter.addNode(var8); // L: 7891 + Client.field747 = 0; // L: 7892 + GrandExchangeEvents.field3626 = Frames.getWidget(var1); // L: 7893 + Client.field841 = var0; // L: 7894 + } else if (var2 == 35) { + var8 = class21.getPacketBufferNode(ClientPacket.field2627, Client.packetWriter.isaacCipher); // L: 8442 + var8.packetBuffer.writeShort(var3); // L: 8443 + var8.packetBuffer.method6612(var1); // L: 8444 + var8.packetBuffer.method6602(var0); // L: 8445 + Client.packetWriter.addNode(var8); // L: 8446 + Client.field747 = 0; // L: 8447 + GrandExchangeEvents.field3626 = Frames.getWidget(var1); // L: 8448 + Client.field841 = var0; // L: 8449 + } else if (var2 == 36) { + var8 = class21.getPacketBufferNode(ClientPacket.field2661, Client.packetWriter.isaacCipher); // L: 8027 + var8.packetBuffer.method6611(var1); // L: 8028 + var8.packetBuffer.method6600(var3); // L: 8029 + var8.packetBuffer.method6602(var0); // L: 8030 + Client.packetWriter.addNode(var8); // L: 8031 + Client.field747 = 0; // L: 8032 + GrandExchangeEvents.field3626 = Frames.getWidget(var1); // L: 8033 + Client.field841 = var0; // L: 8034 + } else if (var2 == 37) { + var8 = class21.getPacketBufferNode(ClientPacket.field2673, Client.packetWriter.isaacCipher); // L: 7789 + var8.packetBuffer.writeIntME(var1); // L: 7790 + var8.packetBuffer.method6602(var0); // L: 7791 + var8.packetBuffer.writeShort(var3); // L: 7792 + Client.packetWriter.addNode(var8); // L: 7793 + Client.field747 = 0; // L: 7794 + GrandExchangeEvents.field3626 = Frames.getWidget(var1); // L: 7795 + Client.field841 = var0; // L: 7796 + } else { + if (var2 == 38) { + class5.Widget_runOnTargetLeave(); // L: 8198 + var16 = Frames.getWidget(var1); // L: 8199 + Client.isItemSelected = 1; // L: 8200 + ClanChannelMember.selectedItemSlot = var0; // L: 8201 + Player.selectedItemWidget = var1; // L: 8202 + UserComparator5.selectedItemId = var3; // L: 8203 + WorldMapCacheName.invalidateWidget(var16); // L: 8204 + Client.selectedItemName = class44.colorStartTag(16748608) + class260.ItemDefinition_get(var3).name + class44.colorStartTag(16777215); // L: 8205 + if (Client.selectedItemName == null) { // L: 8206 + Client.selectedItemName = "null"; + } - if (var11 != null) { // L: 9370 - for (var7 = 4; var7 >= 0; --var7) { // L: 9371 - if (var11[var7] != null && var11[var7].equalsIgnoreCase("Attack")) { // L: 9372 - short var12 = 0; // L: 9373 - if (Client.npcAttackOption != AttackOption.AttackOption_hidden) { // L: 9374 - if (AttackOption.AttackOption_alwaysRightClick == Client.npcAttackOption || AttackOption.AttackOption_dependsOnCombatLevels == Client.npcAttackOption && var0.combatLevel > class35.localPlayer.combatLevel) { // L: 9375 - var12 = 2000; // L: 9376 + return; // L: 8207 + } + + if (var2 == 39) { + var8 = class21.getPacketBufferNode(ClientPacket.field2581, Client.packetWriter.isaacCipher); // L: 8431 + var8.packetBuffer.method6602(var0); // L: 8432 + var8.packetBuffer.method6600(var3); // L: 8433 + var8.packetBuffer.method6611(var1); // L: 8434 + Client.packetWriter.addNode(var8); // L: 8435 + Client.field747 = 0; // L: 8436 + GrandExchangeEvents.field3626 = Frames.getWidget(var1); // L: 8437 + Client.field841 = var0; // L: 8438 + } else if (var2 == 40) { + var8 = class21.getPacketBufferNode(ClientPacket.field2579, Client.packetWriter.isaacCipher); // L: 8515 + var8.packetBuffer.method6600(var0); // L: 8516 + var8.packetBuffer.writeIntME(var1); // L: 8517 + var8.packetBuffer.method6619(var3); // L: 8518 + Client.packetWriter.addNode(var8); // L: 8519 + Client.field747 = 0; // L: 8520 + GrandExchangeEvents.field3626 = Frames.getWidget(var1); // L: 8521 + Client.field841 = var0; // L: 8522 + } else if (var2 == 41) { + var8 = class21.getPacketBufferNode(ClientPacket.field2639, Client.packetWriter.isaacCipher); // L: 7966 + var8.packetBuffer.method6600(var3); // L: 7967 + var8.packetBuffer.method6619(var0); // L: 7968 + var8.packetBuffer.writeIntME(var1); // L: 7969 + Client.packetWriter.addNode(var8); // L: 7970 + Client.field747 = 0; // L: 7971 + GrandExchangeEvents.field3626 = Frames.getWidget(var1); // L: 7972 + Client.field841 = var0; // L: 7973 + } else if (var2 == 42) { + var8 = class21.getPacketBufferNode(ClientPacket.field2635, Client.packetWriter.isaacCipher); // L: 7926 + var8.packetBuffer.method6612(var1); // L: 7927 + var8.packetBuffer.writeShort(var3); // L: 7928 + var8.packetBuffer.method6619(var0); // L: 7929 + Client.packetWriter.addNode(var8); // L: 7930 + Client.field747 = 0; // L: 7931 + GrandExchangeEvents.field3626 = Frames.getWidget(var1); // L: 7932 + Client.field841 = var0; // L: 7933 + } else if (var2 == 43) { + var8 = class21.getPacketBufferNode(ClientPacket.field2633, Client.packetWriter.isaacCipher); // L: 7876 + var8.packetBuffer.method6619(var3); // L: 7877 + var8.packetBuffer.method6602(var0); // L: 7878 + var8.packetBuffer.method6611(var1); // L: 7879 + Client.packetWriter.addNode(var8); // L: 7880 + Client.field747 = 0; // L: 7881 + GrandExchangeEvents.field3626 = Frames.getWidget(var1); // L: 7882 + Client.field841 = var0; // L: 7883 + } else if (var2 == 44) { + var15 = Client.players[var3]; // L: 8252 + if (var15 != null) { // L: 8253 + Client.mouseCrossX = var6; // L: 8254 + Client.mouseCrossY = var7; // L: 8255 + Client.mouseCrossColor = 2; // L: 8256 + Client.mouseCrossState = 0; // L: 8257 + Client.destinationX = var0; // L: 8258 + Client.destinationY = var1; // L: 8259 + var9 = class21.getPacketBufferNode(ClientPacket.field2597, Client.packetWriter.isaacCipher); // L: 8261 + var9.packetBuffer.method6619(var3); // L: 8262 + var9.packetBuffer.method6584(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); // L: 8263 + Client.packetWriter.addNode(var9); // L: 8264 + } + } else if (var2 == 45) { + var15 = Client.players[var3]; // L: 8210 + if (var15 != null) { // L: 8211 + Client.mouseCrossX = var6; // L: 8212 + Client.mouseCrossY = var7; // L: 8213 + Client.mouseCrossColor = 2; // L: 8214 + Client.mouseCrossState = 0; // L: 8215 + Client.destinationX = var0; // L: 8216 + Client.destinationY = var1; // L: 8217 + var9 = class21.getPacketBufferNode(ClientPacket.field2654, Client.packetWriter.isaacCipher); // L: 8219 + var9.packetBuffer.method6600(var3); // L: 8220 + var9.packetBuffer.writeByte(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); // L: 8221 + Client.packetWriter.addNode(var9); // L: 8222 + } + } else if (var2 == 46) { + var15 = Client.players[var3]; // L: 8166 + if (var15 != null) { // L: 8167 + Client.mouseCrossX = var6; // L: 8168 + Client.mouseCrossY = var7; // L: 8169 + Client.mouseCrossColor = 2; // L: 8170 + Client.mouseCrossState = 0; // L: 8171 + Client.destinationX = var0; // L: 8172 + Client.destinationY = var1; // L: 8173 + var9 = class21.getPacketBufferNode(ClientPacket.field2637, Client.packetWriter.isaacCipher); // L: 8175 + var9.packetBuffer.method6584(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); // L: 8176 + var9.packetBuffer.writeShort(var3); // L: 8177 + Client.packetWriter.addNode(var9); // L: 8178 + } + } else if (var2 == 47) { + var15 = Client.players[var3]; // L: 7817 + if (var15 != null) { // L: 7818 + Client.mouseCrossX = var6; // L: 7819 + Client.mouseCrossY = var7; // L: 7820 + Client.mouseCrossColor = 2; // L: 7821 + Client.mouseCrossState = 0; // L: 7822 + Client.destinationX = var0; // L: 7823 + Client.destinationY = var1; // L: 7824 + var9 = class21.getPacketBufferNode(ClientPacket.field2605, Client.packetWriter.isaacCipher); // L: 7826 + var9.packetBuffer.method6619(var3); // L: 7827 + var9.packetBuffer.method6584(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); // L: 7828 + Client.packetWriter.addNode(var9); // L: 7829 + } + } else if (var2 == 48) { + var15 = Client.players[var3]; // L: 8182 + if (var15 != null) { // L: 8183 + Client.mouseCrossX = var6; // L: 8184 + Client.mouseCrossY = var7; // L: 8185 + Client.mouseCrossColor = 2; // L: 8186 + Client.mouseCrossState = 0; // L: 8187 + Client.destinationX = var0; // L: 8188 + Client.destinationY = var1; // L: 8189 + var9 = class21.getPacketBufferNode(ClientPacket.field2602, Client.packetWriter.isaacCipher); // L: 8191 + var9.packetBuffer.method6602(var3); // L: 8192 + var9.packetBuffer.writeByte(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); // L: 8193 + Client.packetWriter.addNode(var9); // L: 8194 + } + } else if (var2 == 49) { + var15 = Client.players[var3]; // L: 8103 + if (var15 != null) { // L: 8104 + Client.mouseCrossX = var6; // L: 8105 + Client.mouseCrossY = var7; // L: 8106 + Client.mouseCrossColor = 2; // L: 8107 + Client.mouseCrossState = 0; // L: 8108 + Client.destinationX = var0; // L: 8109 + Client.destinationY = var1; // L: 8110 + var9 = class21.getPacketBufferNode(ClientPacket.field2636, Client.packetWriter.isaacCipher); // L: 8112 + var9.packetBuffer.method6581(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); // L: 8113 + var9.packetBuffer.method6602(var3); // L: 8114 + Client.packetWriter.addNode(var9); // L: 8115 + } + } else if (var2 == 50) { + var15 = Client.players[var3]; // L: 8226 + if (var15 != null) { // L: 8227 + Client.mouseCrossX = var6; // L: 8228 + Client.mouseCrossY = var7; // L: 8229 + Client.mouseCrossColor = 2; // L: 8230 + Client.mouseCrossState = 0; // L: 8231 + Client.destinationX = var0; // L: 8232 + Client.destinationY = var1; // L: 8233 + var9 = class21.getPacketBufferNode(ClientPacket.field2620, Client.packetWriter.isaacCipher); // L: 8235 + var9.packetBuffer.writeByte(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); // L: 8236 + var9.packetBuffer.method6602(var3); // L: 8237 + Client.packetWriter.addNode(var9); // L: 8238 + } + } else if (var2 == 51) { + var15 = Client.players[var3]; // L: 8485 + if (var15 != null) { // L: 8486 + Client.mouseCrossX = var6; // L: 8487 + Client.mouseCrossY = var7; // L: 8488 + Client.mouseCrossColor = 2; // L: 8489 + Client.mouseCrossState = 0; // L: 8490 + Client.destinationX = var0; // L: 8491 + Client.destinationY = var1; // L: 8492 + var9 = class21.getPacketBufferNode(ClientPacket.field2656, Client.packetWriter.isaacCipher); // L: 8494 + var9.packetBuffer.writeShort(var3); // L: 8495 + var9.packetBuffer.method6594(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); // L: 8496 + Client.packetWriter.addNode(var9); // L: 8497 + } + } else { + label642: { + if (var2 != 57) { + if (var2 == 58) { + var16 = ModeWhere.getWidgetChild(var1, var0); // L: 7833 + if (var16 != null) { // L: 7834 + var9 = class21.getPacketBufferNode(ClientPacket.field2598, Client.packetWriter.isaacCipher); // L: 7836 + var9.packetBuffer.writeIntME(var1); // L: 7837 + var9.packetBuffer.method6619(var16.itemId); // L: 7838 + var9.packetBuffer.method6600(Client.field788); // L: 7839 + var9.packetBuffer.writeInt(Decimator.selectedSpellWidget); // L: 7840 + var9.packetBuffer.method6619(Client.selectedSpellChildIndex); // L: 7841 + var9.packetBuffer.method6600(var0); // L: 7842 + Client.packetWriter.addNode(var9); // L: 7843 + } + break label642; } - var8 = 0; // L: 9378 - if (var7 == 0) { // L: 9379 - var8 = var12 + 9; + if (var2 == 1001) { + Client.mouseCrossX = var6; // L: 8125 + Client.mouseCrossY = var7; // L: 8126 + Client.mouseCrossColor = 2; // L: 8127 + Client.mouseCrossState = 0; // L: 8128 + Client.destinationX = var0; // L: 8129 + Client.destinationY = var1; // L: 8130 + var8 = class21.getPacketBufferNode(ClientPacket.field2640, Client.packetWriter.isaacCipher); // L: 8132 + var8.packetBuffer.method6602(var0 + VertexNormal.baseX); // L: 8133 + var8.packetBuffer.method6594(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); // L: 8134 + var8.packetBuffer.writeShort(var3); // L: 8135 + var8.packetBuffer.method6602(SoundSystem.baseY + var1); // L: 8136 + Client.packetWriter.addNode(var8); // L: 8137 + break label642; } - if (var7 == 1) { // L: 9380 - var8 = var12 + 10; + if (var2 == 1002) { + Client.mouseCrossX = var6; // L: 7915 + Client.mouseCrossY = var7; // L: 7916 + Client.mouseCrossColor = 2; // L: 7917 + Client.mouseCrossState = 0; // L: 7918 + var8 = class21.getPacketBufferNode(ClientPacket.field2591, Client.packetWriter.isaacCipher); // L: 7920 + var8.packetBuffer.method6600(var3); // L: 7921 + Client.packetWriter.addNode(var8); // L: 7922 + break label642; } - if (var7 == 2) { // L: 9381 - var8 = var12 + 11; + if (var2 == 1003) { + Client.mouseCrossX = var6; // L: 8317 + Client.mouseCrossY = var7; // L: 8318 + Client.mouseCrossColor = 2; // L: 8319 + Client.mouseCrossState = 0; // L: 8320 + var13 = Client.npcs[var3]; // L: 8321 + if (var13 != null) { // L: 8322 + NPCComposition var17 = var13.definition; // L: 8323 + if (var17.transforms != null) { // L: 8324 + var17 = var17.transform(); + } + + if (var17 != null) { // L: 8325 + var11 = class21.getPacketBufferNode(ClientPacket.field2578, Client.packetWriter.isaacCipher); // L: 8327 + var11.packetBuffer.method6600(var17.id); // L: 8328 + Client.packetWriter.addNode(var11); // L: 8329 + } + } + break label642; } - if (var7 == 3) { // L: 9382 - var8 = var12 + 12; + if (var2 == 1004) { + Client.mouseCrossX = var6; // L: 8242 + Client.mouseCrossY = var7; // L: 8243 + Client.mouseCrossColor = 2; // L: 8244 + Client.mouseCrossState = 0; // L: 8245 + var8 = class21.getPacketBufferNode(ClientPacket.field2646, Client.packetWriter.isaacCipher); // L: 8247 + var8.packetBuffer.method6600(var3); // L: 8248 + Client.packetWriter.addNode(var8); // L: 8249 + break label642; } - if (var7 == 4) { // L: 9383 - var8 = var12 + 13; + if (var2 == 1005) { + var16 = Frames.getWidget(var1); // L: 8552 + if (var16 != null && var16.itemQuantities[var0] >= 100000) { // L: 8553 + World.addGameMessage(27, "", var16.itemQuantities[var0] + " x " + class260.ItemDefinition_get(var3).name); + } else { + var9 = class21.getPacketBufferNode(ClientPacket.field2646, Client.packetWriter.isaacCipher); // L: 8556 + var9.packetBuffer.method6600(var3); // L: 8557 + Client.packetWriter.addNode(var9); // L: 8558 + } + + Client.field747 = 0; // L: 8560 + GrandExchangeEvents.field3626 = Frames.getWidget(var1); // L: 8561 + Client.field841 = var0; // L: 8562 + break label642; } - InterfaceParent.insertMenuItemNoShift(var11[var7], HorizontalAlignment.colorStartTag(16776960) + var4, var8, var1, var2, var3); // L: 9384 + if (var2 != 1007) { + if (var2 == 1009 || var2 == 1008 || var2 == 1010 || var2 == 1011 || var2 == 1012) { + class243.worldMap.worldMapMenuAction(var2, var3, new Coord(var0), new Coord(var1)); // L: 8385 + } + break label642; + } + } + + var16 = ModeWhere.getWidgetChild(var1, var0); // L: 8119 + if (var16 != null) { // L: 8120 + class376.widgetDefaultMenuAction(var3, var1, var0, var16.itemId, var5); // L: 8121 } } } } - - if (!var0.isFollower || !Client.followerOpsLowPriority) { // L: 9389 - InterfaceParent.insertMenuItemNoShift("Examine", HorizontalAlignment.colorStartTag(16776960) + var4, 1003, var1, var2, var3); // L: 9390 - } } - } } } } - } // L: 9394 - @ObfuscatedName("kb") + if (Client.isItemSelected != 0) { // L: 8579 + Client.isItemSelected = 0; // L: 8580 + WorldMapCacheName.invalidateWidget(Frames.getWidget(Player.selectedItemWidget)); // L: 8581 + } + + if (Client.isSpellSelected) { // L: 8583 + class5.Widget_runOnTargetLeave(); + } + + if (GrandExchangeEvents.field3626 != null && Client.field747 == 0) { // L: 8584 + WorldMapCacheName.invalidateWidget(GrandExchangeEvents.field3626); + } + + } // L: 8585 + + @ObfuscatedName("lv") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "-1736303231" + garbageValue = "2124366444" ) - static void method2014() { - for (InterfaceParent var0 = (InterfaceParent)Client.interfaceParents.first(); var0 != null; var0 = (InterfaceParent)Client.interfaceParents.next()) { // L: 11083 - int var1 = var0.group; // L: 11084 - if (UserComparator8.loadInterface(var1)) { // L: 11085 - boolean var2 = true; // L: 11086 - Widget[] var3 = Widget.Widget_interfaceComponents[var1]; // L: 11087 - - int var4; - for (var4 = 0; var4 < var3.length; ++var4) { // L: 11088 - if (var3[var4] != null) { // L: 11089 - var2 = var3[var4].isIf3; // L: 11090 - break; - } - } - - if (!var2) { // L: 11094 - var4 = (int)var0.key; // L: 11095 - Widget var5 = DevicePcmPlayerProvider.getWidget(var4); // L: 11096 - if (var5 != null) { // L: 11097 - VerticalAlignment.invalidateWidget(var5); - } - } - } + static void method1999() { + if (Client.oculusOrbState == 1) { // L: 11504 + Client.field724 = true; // L: 11505 } - } // L: 11101 + } // L: 11507 } diff --git a/runescape-client/src/main/java/ScriptEvent.java b/runescape-client/src/main/java/ScriptEvent.java index 7d72086b75..4b2261d171 100644 --- a/runescape-client/src/main/java/ScriptEvent.java +++ b/runescape-client/src/main/java/ScriptEvent.java @@ -5,68 +5,74 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; import net.runelite.rs.ScriptOpcodes; -@ObfuscatedName("cp") +@ObfuscatedName("cz") @Implements("ScriptEvent") public class ScriptEvent extends Node { - @ObfuscatedName("h") + @ObfuscatedName("pk") + @ObfuscatedSignature( + descriptor = "Llm;" + ) + @Export("privateChatMode") + static PrivateChatMode privateChatMode; + @ObfuscatedName("v") @Export("args") Object[] args; - @ObfuscatedName("c") + @ObfuscatedName("n") @Export("isMouseInputEvent") boolean isMouseInputEvent; - @ObfuscatedName("o") + @ObfuscatedName("f") @ObfuscatedSignature( - descriptor = "Liv;" + descriptor = "Lio;" ) @Export("widget") Widget widget; - @ObfuscatedName("g") + @ObfuscatedName("y") @ObfuscatedGetter( - intValue = -536753663 + intValue = -1064015207 ) @Export("mouseX") int mouseX; - @ObfuscatedName("l") + @ObfuscatedName("p") @ObfuscatedGetter( - intValue = 1589642175 + intValue = 334920693 ) @Export("mouseY") int mouseY; - @ObfuscatedName("z") + @ObfuscatedName("j") @ObfuscatedGetter( - intValue = -1051394147 + intValue = 2026444209 ) @Export("opIndex") int opIndex; - @ObfuscatedName("t") + @ObfuscatedName("r") @ObfuscatedSignature( - descriptor = "Liv;" + descriptor = "Lio;" ) @Export("dragTarget") Widget dragTarget; - @ObfuscatedName("v") + @ObfuscatedName("b") @ObfuscatedGetter( - intValue = 1110784837 + intValue = 1025309887 ) @Export("keyTyped") int keyTyped; - @ObfuscatedName("b") + @ObfuscatedName("d") @ObfuscatedGetter( - intValue = 1654982573 + intValue = -754868141 ) @Export("keyPressed") int keyPressed; - @ObfuscatedName("q") + @ObfuscatedName("s") @Export("targetName") String targetName; - @ObfuscatedName("i") + @ObfuscatedName("u") @ObfuscatedGetter( - intValue = -1407639647 + intValue = 820352111 ) - int field1140; - @ObfuscatedName("x") + int field1180; + @ObfuscatedName("l") @ObfuscatedGetter( - intValue = -1084436757 + intValue = 487377745 ) @Export("type") int type; @@ -75,587 +81,224 @@ public class ScriptEvent extends Node { this.type = 76; // L: 19 } - @ObfuscatedName("h") + @ObfuscatedName("v") @ObfuscatedSignature( descriptor = "([Ljava/lang/Object;I)V", - garbageValue = "-2043975850" + garbageValue = "1143010333" ) @Export("setArgs") public void setArgs(Object[] var1) { this.args = var1; // L: 22 } // L: 23 - @ObfuscatedName("c") + @ObfuscatedName("n") @ObfuscatedSignature( descriptor = "(II)V", - garbageValue = "-1691988247" + garbageValue = "566555821" ) @Export("setType") public void setType(int var1) { this.type = var1; // L: 26 } // L: 27 - @ObfuscatedName("z") + @ObfuscatedName("y") @ObfuscatedSignature( - descriptor = "(Lnm;ILcg;IB)V", - garbageValue = "106" + descriptor = "(I)Ljava/lang/String;", + garbageValue = "-1244600055" ) - static final void method2116(PacketBuffer var0, int var1, Player var2, int var3) { - byte var4 = -1; // L: 483 - if ((var3 & 8) != 0) { // L: 484 - var2.targetIndex = var0.readUnsignedShort(); // L: 485 - if (var2.targetIndex == 65535) { // L: 486 - var2.targetIndex = -1; - } - } + static String method2086() { + return ObjectComposition.clientPreferences.hideUsername ? class6.method67(Login.Login_username) : Login.Login_username; // L: 188 + } - int var5; - if ((var3 & 256) != 0) { // L: 488 - var2.spotAnimation = var0.method6486(); // L: 489 - var5 = var0.method6481(); // L: 490 - var2.field1224 = var5 >> 16; // L: 491 - var2.field1243 = (var5 & 65535) + Client.cycle; // L: 492 - var2.spotAnimationFrame = 0; // L: 493 - var2.spotAnimationFrameCycle = 0; // L: 494 - if (var2.field1243 > Client.cycle) { // L: 495 - var2.spotAnimationFrame = -1; - } - - if (var2.spotAnimation == 65535) { // L: 496 - var2.spotAnimation = -1; - } - } - - int var6; - int var8; - int var9; - int var12; - if ((var3 & 16) != 0) { // L: 498 - var5 = var0.method6478(); // L: 499 - int var7; - int var10; - int var15; - if (var5 > 0) { // L: 500 - for (var6 = 0; var6 < var5; ++var6) { // L: 501 - var8 = -1; // L: 503 - var9 = -1; // L: 504 - var10 = -1; // L: 505 - var7 = var0.readUShortSmart(); // L: 506 - if (var7 == 32767) { // L: 507 - var7 = var0.readUShortSmart(); // L: 508 - var9 = var0.readUShortSmart(); // L: 509 - var8 = var0.readUShortSmart(); // L: 510 - var10 = var0.readUShortSmart(); // L: 511 - } else if (var7 != 32766) { // L: 513 - var9 = var0.readUShortSmart(); // L: 514 - } else { - var7 = -1; // L: 516 - } - - var15 = var0.readUShortSmart(); // L: 517 - var2.addHitSplat(var7, var9, var8, var10, Client.cycle, var15); // L: 518 - } - } - - var6 = var0.readUnsignedByte(); // L: 521 - if (var6 > 0) { // L: 522 - for (var7 = 0; var7 < var6; ++var7) { // L: 523 - var8 = var0.readUShortSmart(); // L: 524 - var9 = var0.readUShortSmart(); // L: 525 - if (var9 != 32767) { // L: 526 - var10 = var0.readUShortSmart(); // L: 527 - var15 = var0.method6477(); // L: 528 - var12 = var9 > 0 ? var0.method6476() : var15; // L: 529 - var2.addHealthBar(var8, Client.cycle, var9, var10, var15, var12); // L: 530 - } else { - var2.removeHealthBar(var8); // L: 532 - } - } - } - } - - if ((var3 & 1) != 0) { // L: 536 - var2.field1247 = var0.method6648(); // L: 537 - if (var2.pathLength == 0) { // L: 538 - var2.orientation = var2.field1247; // L: 539 - var2.field1247 = -1; // L: 540 - } - } - - if ((var3 & 2048) != 0) { // L: 543 - Players.field1345[var1] = var0.method6480(); // L: 544 - } - - if ((var3 & 512) != 0) { // L: 546 - for (var5 = 0; var5 < 3; ++var5) { // L: 547 - var2.actions[var5] = var0.readStringCp1252NullTerminated(); - } - } - - if ((var3 & 8192) != 0) { // L: 549 - var2.field1236 = var0.method6526(); // L: 550 - var2.field1252 = var0.method6530(); // L: 551 - var2.field1251 = var0.method6530(); // L: 552 - var2.field1253 = var0.method6480(); // L: 553 - var2.field1254 = var0.readUnsignedShort() + Client.cycle; // L: 554 - var2.field1237 = var0.method6486() + Client.cycle; // L: 555 - var2.field1256 = var0.method6648(); // L: 556 - if (var2.field1186) { // L: 557 - var2.field1236 += var2.tileX; // L: 558 - var2.field1252 += var2.tileY; // L: 559 - var2.field1251 += var2.tileX; // L: 560 - var2.field1253 += var2.tileY; // L: 561 - var2.pathLength = 0; // L: 562 - } else { - var2.field1236 += var2.pathX[0]; // L: 565 - var2.field1252 += var2.pathY[0]; // L: 566 - var2.field1251 += var2.pathX[0]; // L: 567 - var2.field1253 += var2.pathY[0]; // L: 568 - var2.pathLength = 1; // L: 569 - } - - var2.field1215 = 0; // L: 571 - } - - if ((var3 & 64) != 0) { // L: 573 - var5 = var0.method6486(); // L: 574 - PlayerType var13 = (PlayerType)UserComparator4.findEnumerated(class249.PlayerType_values(), var0.method6478()); // L: 575 - boolean var17 = var0.method6476() == 1; // L: 576 - var8 = var0.method6476(); // L: 577 - var9 = var0.offset; // L: 578 - if (var2.username != null && var2.appearance != null) { // L: 579 - boolean var18 = false; // L: 580 - if (var13.isUser && GrandExchangeOfferUnitPriceComparator.friendSystem.isIgnored(var2.username)) { // L: 581 582 - var18 = true; - } - - if (!var18 && Client.field727 == 0 && !var2.isHidden) { // L: 584 - Players.field1357.offset = 0; // L: 585 - var0.method6499(Players.field1357.array, 0, var8); // L: 586 - Players.field1357.offset = 0; // L: 587 - String var11 = AbstractFont.escapeBrackets(Clock.method2592(class22.method299(Players.field1357))); // L: 588 - var2.overheadText = var11.trim(); // L: 589 - var2.overheadTextColor = var5 >> 8; // L: 590 - var2.overheadTextEffect = var5 & 255; // L: 591 - var2.overheadTextCyclesRemaining = 150; // L: 592 - var2.isAutoChatting = var17; // L: 593 - var2.field1223 = var2 != class35.localPlayer && var13.isUser && "" != Client.field843 && var11.toLowerCase().indexOf(Client.field843) == -1; // L: 594 - if (var13.isPrivileged) { // L: 596 - var12 = var17 ? 91 : 1; - } else { - var12 = var17 ? 90 : 2; // L: 597 - } - - if (var13.modIcon != -1) { // L: 598 - WorldMapScaleHandler.addGameMessage(var12, class169.method3495(var13.modIcon) + var2.username.getName(), var11); - } else { - WorldMapScaleHandler.addGameMessage(var12, var2.username.getName(), var11); // L: 599 - } - } - } - - var0.offset = var9 + var8; // L: 602 - } - - if ((var3 & 2) != 0) { // L: 604 - var5 = var0.method6476(); // L: 605 - byte[] var19 = new byte[var5]; // L: 606 - Buffer var14 = new Buffer(var19); // L: 607 - var0.method6499(var19, 0, var5); // L: 608 - Players.field1346[var1] = var14; // L: 609 - var2.read(var14); // L: 610 - } - - if ((var3 & 4) != 0) { // L: 612 - var5 = var0.method6620(); // L: 613 - if (var5 == 65535) { // L: 614 - var5 = -1; - } - - var6 = var0.method6476(); // L: 615 - class69.performPlayerAnimation(var2, var5, var6); // L: 616 - } - - if ((var3 & 4096) != 0) { // L: 618 - var4 = var0.method6530(); // L: 619 - } - - if ((var3 & 32) != 0) { // L: 621 - var2.overheadText = var0.readStringCp1252NullTerminated(); // L: 622 - if (var2.overheadText.charAt(0) == '~') { // L: 623 - var2.overheadText = var2.overheadText.substring(1); // L: 624 - WorldMapScaleHandler.addGameMessage(2, var2.username.getName(), var2.overheadText); // L: 625 - } else if (var2 == class35.localPlayer) { // L: 627 - WorldMapScaleHandler.addGameMessage(2, var2.username.getName(), var2.overheadText); // L: 628 - } - - var2.isAutoChatting = false; // L: 630 - var2.overheadTextColor = 0; // L: 631 - var2.overheadTextEffect = 0; // L: 632 - var2.overheadTextCyclesRemaining = 150; // L: 633 - } - - if (var2.field1186) { // L: 635 - if (var4 == 127) { // L: 636 - var2.resetPath(var2.tileX, var2.tileY); - } else { - byte var16; - if (var4 != -1) { // L: 639 - var16 = var4; + @ObfuscatedName("g") + @ObfuscatedSignature( + descriptor = "(ILcf;ZB)I", + garbageValue = "0" + ) + static int method2093(int var0, Script var1, boolean var2) { + Widget var3 = var2 ? class13.scriptDotWidget : Interpreter.scriptActiveWidget; // L: 1190 + if (var0 == ScriptOpcodes.CC_GETTARGETMASK) { // L: 1191 + Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = AttackOption.Widget_unpackTargetMask(class21.getWidgetFlags(var3)); // L: 1192 + return 1; // L: 1193 + } else if (var0 != ScriptOpcodes.CC_GETOP) { // L: 1195 + if (var0 == ScriptOpcodes.CC_GETOPBASE) { // L: 1202 + if (var3.dataText == null) { // L: 1203 + Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = ""; } else { - var16 = Players.field1345[var1]; // L: 640 + Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var3.dataText; // L: 1204 } - var2.method2140(var2.tileX, var2.tileY, var16); // L: 641 - } - } - - } // L: 645 - - @ObfuscatedName("v") - @ObfuscatedSignature( - descriptor = "(ILci;ZS)I", - garbageValue = "-4573" - ) - static int method2120(int var0, Script var1, boolean var2) { - boolean var3 = true; // L: 834 - Widget var4; - if (var0 >= 2000) { // L: 836 - var0 -= 1000; // L: 837 - var4 = DevicePcmPlayerProvider.getWidget(Interpreter.Interpreter_intStack[--WorldMapCacheName.Interpreter_intStackSize]); // L: 838 - var3 = false; // L: 839 - } else { - var4 = var2 ? class308.scriptDotWidget : class24.scriptActiveWidget; // L: 841 - } - - int var11; - if (var0 == ScriptOpcodes.CC_SETOP) { // L: 842 - var11 = Interpreter.Interpreter_intStack[--WorldMapCacheName.Interpreter_intStackSize] - 1; // L: 843 - if (var11 >= 0 && var11 <= 9) { // L: 844 - var4.setAction(var11, Interpreter.Interpreter_stringStack[--class13.Interpreter_stringStackSize]); // L: 848 - return 1; // L: 849 + return 1; // L: 1205 } else { - --class13.Interpreter_stringStackSize; // L: 845 - return 1; // L: 846 + return 2; // L: 1207 } } else { + int var4 = Interpreter.Interpreter_intStack[--class44.Interpreter_intStackSize]; // L: 1196 + --var4; // L: 1197 + if (var3.actions != null && var4 < var3.actions.length && var3.actions[var4] != null) { // L: 1198 + Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var3.actions[var4]; // L: 1199 + } else { + Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = ""; + } + + return 1; // L: 1200 + } + } + + @ObfuscatedName("hs") + @ObfuscatedSignature( + descriptor = "(Lnb;I)V", + garbageValue = "-1497241252" + ) + static final void method2094(PacketBuffer var0) { + for (int var1 = 0; var1 < Client.field685; ++var1) { // L: 7453 + int var2 = Client.field686[var1]; // L: 7454 + NPC var3 = Client.npcs[var2]; // L: 7455 + int var4 = var0.readUnsignedByte(); // L: 7456 + int var5; int var6; - if (var0 == ScriptOpcodes.CC_SETDRAGGABLE) { // L: 851 - WorldMapCacheName.Interpreter_intStackSize -= 2; // L: 852 - var11 = Interpreter.Interpreter_intStack[WorldMapCacheName.Interpreter_intStackSize]; // L: 853 - var6 = Interpreter.Interpreter_intStack[WorldMapCacheName.Interpreter_intStackSize + 1]; // L: 854 - var4.parent = PacketWriter.getWidgetChild(var11, var6); // L: 855 - return 1; // L: 856 - } else if (var0 == ScriptOpcodes.CC_SETDRAGGABLEBEHAVIOR) { // L: 858 - var4.isScrollBar = Interpreter.Interpreter_intStack[--WorldMapCacheName.Interpreter_intStackSize] == 1; // L: 859 - return 1; // L: 860 - } else if (var0 == ScriptOpcodes.CC_SETDRAGDEADZONE) { // L: 862 - var4.dragZoneSize = Interpreter.Interpreter_intStack[--WorldMapCacheName.Interpreter_intStackSize]; // L: 863 - return 1; // L: 864 - } else if (var0 == ScriptOpcodes.CC_SETDRAGDEADTIME) { // L: 866 - var4.dragThreshold = Interpreter.Interpreter_intStack[--WorldMapCacheName.Interpreter_intStackSize]; // L: 867 - return 1; // L: 868 - } else if (var0 == ScriptOpcodes.CC_SETOPBASE) { // L: 870 - var4.dataText = Interpreter.Interpreter_stringStack[--class13.Interpreter_stringStackSize]; // L: 871 - return 1; // L: 872 - } else if (var0 == ScriptOpcodes.CC_SETTARGETVERB) { // L: 874 - var4.spellActionName = Interpreter.Interpreter_stringStack[--class13.Interpreter_stringStackSize]; // L: 875 - return 1; // L: 876 - } else if (var0 == ScriptOpcodes.CC_CLEAROPS) { // L: 878 - var4.actions = null; // L: 879 - return 1; // L: 880 - } else if (var0 == 1308) { // L: 882 - var4.prioritizeMenuEntry = Interpreter.Interpreter_intStack[--WorldMapCacheName.Interpreter_intStackSize] == 1; // L: 883 - return 1; // L: 884 - } else if (var0 == 1309) { // L: 886 - --WorldMapCacheName.Interpreter_intStackSize; // L: 887 - return 1; // L: 888 - } else { - int var7; - byte[] var8; - if (var0 != ScriptOpcodes.CC_SETOPKEY) { // L: 890 - byte var5; - if (var0 == ScriptOpcodes.CC_SETOPTKEY) { // L: 920 - WorldMapCacheName.Interpreter_intStackSize -= 2; // L: 921 - var5 = 10; // L: 922 - var8 = new byte[]{(byte)Interpreter.Interpreter_intStack[WorldMapCacheName.Interpreter_intStackSize]}; // L: 923 - byte[] var9 = new byte[]{(byte)Interpreter.Interpreter_intStack[WorldMapCacheName.Interpreter_intStackSize + 1]}; // L: 924 - ServerPacket.Widget_setKey(var4, var5, var8, var9); // L: 925 - return 1; // L: 926 - } else if (var0 == ScriptOpcodes.CC_SETOPKEYRATE) { // L: 928 - WorldMapCacheName.Interpreter_intStackSize -= 3; // L: 929 - var11 = Interpreter.Interpreter_intStack[WorldMapCacheName.Interpreter_intStackSize] - 1; // L: 930 - var6 = Interpreter.Interpreter_intStack[WorldMapCacheName.Interpreter_intStackSize + 1]; // L: 931 - var7 = Interpreter.Interpreter_intStack[WorldMapCacheName.Interpreter_intStackSize + 2]; // L: 932 - if (var11 >= 0 && var11 <= 9) { // L: 933 - LoginPacket.Widget_setKeyRate(var4, var11, var6, var7); // L: 936 - return 1; // L: 937 - } else { - throw new RuntimeException(); // L: 934 - } - } else if (var0 == ScriptOpcodes.CC_SETOPTKEYRATE) { // L: 939 - var5 = 10; // L: 940 - var6 = Interpreter.Interpreter_intStack[--WorldMapCacheName.Interpreter_intStackSize]; // L: 941 - var7 = Interpreter.Interpreter_intStack[--WorldMapCacheName.Interpreter_intStackSize]; // L: 942 - LoginPacket.Widget_setKeyRate(var4, var5, var6, var7); // L: 943 - return 1; // L: 944 - } else if (var0 == ScriptOpcodes.CC_SETOPKEYIGNOREHELD) { // L: 946 - --WorldMapCacheName.Interpreter_intStackSize; // L: 947 - var11 = Interpreter.Interpreter_intStack[WorldMapCacheName.Interpreter_intStackSize] - 1; // L: 948 - if (var11 >= 0 && var11 <= 9) { // L: 949 - SoundSystem.Widget_setKeyIgnoreHeld(var4, var11); // L: 952 - return 1; // L: 953 - } else { - throw new RuntimeException(); // L: 950 - } - } else if (var0 == ScriptOpcodes.CC_SETOPTKEYIGNOREHELD) { // L: 955 - var5 = 10; // L: 956 - SoundSystem.Widget_setKeyIgnoreHeld(var4, var5); // L: 957 - return 1; // L: 958 - } else { - return 2; // L: 960 - } - } else { - byte[] var10 = null; // L: 891 - var8 = null; // L: 892 - if (var3) { // L: 893 - WorldMapCacheName.Interpreter_intStackSize -= 10; // L: 894 - - for (var7 = 0; var7 < 10 && Interpreter.Interpreter_intStack[var7 + WorldMapCacheName.Interpreter_intStackSize] >= 0; var7 += 2) { // L: 896 897 - } - - if (var7 > 0) { // L: 899 - var10 = new byte[var7 / 2]; // L: 900 - var8 = new byte[var7 / 2]; // L: 901 - - for (var7 -= 2; var7 >= 0; var7 -= 2) { // L: 902 - var10[var7 / 2] = (byte)Interpreter.Interpreter_intStack[var7 + WorldMapCacheName.Interpreter_intStackSize]; // L: 903 - var8[var7 / 2] = (byte)Interpreter.Interpreter_intStack[var7 + WorldMapCacheName.Interpreter_intStackSize + 1]; // L: 904 - } - } - } else { - WorldMapCacheName.Interpreter_intStackSize -= 2; // L: 909 - var10 = new byte[]{(byte)Interpreter.Interpreter_intStack[WorldMapCacheName.Interpreter_intStackSize]}; // L: 910 - var8 = new byte[]{(byte)Interpreter.Interpreter_intStack[WorldMapCacheName.Interpreter_intStackSize + 1]}; // L: 911 - } - - var7 = Interpreter.Interpreter_intStack[--WorldMapCacheName.Interpreter_intStackSize] - 1; // L: 913 - if (var7 >= 0 && var7 <= 9) { // L: 914 - ServerPacket.Widget_setKey(var4, var7, var10, var8); // L: 917 - return 1; // L: 918 - } else { - throw new RuntimeException(); // L: 915 - } - } - } - } - } - - @ObfuscatedName("iu") - @ObfuscatedSignature( - descriptor = "(IIIII)V", - garbageValue = "-1097710894" - ) - @Export("addSceneMenuOptions") - static final void addSceneMenuOptions(int var0, int var1, int var2, int var3) { - if (Client.isItemSelected == 0 && !Client.isSpellSelected) { // L: 9132 - InterfaceParent.insertMenuItemNoShift("Walk here", "", 23, 0, var0 - var2, var1 - var3); // L: 9133 - } - - long var4 = -1L; // L: 9136 - long var6 = -1L; // L: 9137 - int var8 = 0; - - while (true) { - int var10 = ViewportMouse.ViewportMouse_entityCount; // L: 9142 - if (var8 >= var10) { // L: 9144 - if (var4 != -1L) { // L: 9273 - var8 = (int)(var4 >>> 0 & 127L); // L: 9276 - var10 = (int)(var4 >>> 7 & 127L); // L: 9281 - Player var12 = Client.players[Client.combatTargetPlayerIndex]; // L: 9284 - FontName.addPlayerToMenu(var12, Client.combatTargetPlayerIndex, var8, var10); // L: 9285 + int var7; + if ((var4 & 32) != 0) { // L: 7457 + var5 = var0.method6603(); // L: 7458 + if (var5 == 65535) { // L: 7459 + var5 = -1; } - return; // L: 9287 + var6 = var0.method6549(); // L: 7460 + if (var5 == var3.sequence && var5 != -1) { // L: 7461 + var7 = LoginScreenAnimation.SequenceDefinition_get(var5).field1891; // L: 7462 + if (var7 == 1) { // L: 7463 + var3.sequenceFrame = 0; // L: 7464 + var3.sequenceFrameCycle = 0; // L: 7465 + var3.sequenceDelay = var6; // L: 7466 + var3.field1245 = 0; // L: 7467 + } + + if (var7 == 2) { // L: 7469 + var3.field1245 = 0; // L: 7470 + } + } else if (var5 == -1 || var3.sequence == -1 || LoginScreenAnimation.SequenceDefinition_get(var5).field1885 >= LoginScreenAnimation.SequenceDefinition_get(var3.sequence).field1885) { // L: 7473 + var3.sequence = var5; // L: 7474 + var3.sequenceFrame = 0; // L: 7475 + var3.sequenceFrameCycle = 0; // L: 7476 + var3.sequenceDelay = var6; // L: 7477 + var3.field1245 = 0; // L: 7478 + var3.field1274 = var3.pathLength; // L: 7479 + } } - long var26 = ViewportMouse.ViewportMouse_entityTags[var8]; // L: 9147 - if (var6 != var26) { // L: 9150 - label326: { - var6 = var26; // L: 9151 - int var15 = InterfaceParent.method2111(var8); // L: 9152 - int var16 = MouseHandler.method688(var8); // L: 9153 - int var17 = VarbitComposition.method2813(var8); // L: 9154 - int var18 = class6.Entity_unpackID(ViewportMouse.ViewportMouse_entityTags[var8]); // L: 9157 - int var19 = var18; // L: 9159 - if (var17 == 2 && class5.scene.getObjectFlags(ParamComposition.Client_plane, var15, var16, var26) >= 0) { // L: 9160 9161 - ObjectComposition var20 = AttackOption.getObjectDefinition(var18); // L: 9162 - if (var20.transforms != null) { // L: 9163 - var20 = var20.transform(); - } + int var8; + if ((var4 & 8) != 0) { // L: 7483 + var5 = var0.method6605(); // L: 7484 + var6 = var0.readUnsignedShort(); // L: 7485 + var7 = var3.x - (var5 - VertexNormal.baseX - VertexNormal.baseX) * 64; // L: 7486 + var8 = var3.y - (var6 - SoundSystem.baseY - SoundSystem.baseY) * 64; // L: 7487 + if (var7 != 0 || var8 != 0) { // L: 7488 + var3.field1264 = (int)(Math.atan2((double)var7, (double)var8) * 325.949D) & 2047; + } + } - if (var20 == null) { // L: 9164 - break label326; - } + if ((var4 & 2) != 0) { // L: 7490 + var3.definition = StructComposition.getNpcDefinition(var0.method6603()); // L: 7491 + var3.field1239 = var3.definition.size; // L: 7492 + var3.field1289 = var3.definition.rotation; // L: 7493 + var3.walkSequence = var3.definition.walkSequence; // L: 7494 + var3.walkBackSequence = var3.definition.walkBackSequence; // L: 7495 + var3.walkLeftSequence = var3.definition.walkLeftSequence; // L: 7496 + var3.walkRightSequence = var3.definition.walkRightSequence; // L: 7497 + var3.idleSequence = var3.definition.idleSequence; // L: 7498 + var3.turnLeftSequence = var3.definition.turnLeftSequence; // L: 7499 + var3.turnRightSequence = var3.definition.turnRightSequence; // L: 7500 + } - if (Client.isItemSelected == 1) { // L: 9165 - InterfaceParent.insertMenuItemNoShift("Use", Client.selectedItemName + " " + "->" + " " + HorizontalAlignment.colorStartTag(65535) + var20.name, 1, var18, var15, var16); // L: 9166 - } else if (Client.isSpellSelected) { // L: 9169 - if ((GrandExchangeOfferUnitPriceComparator.selectedSpellFlags & 4) == 4) { // L: 9170 - InterfaceParent.insertMenuItemNoShift(Client.selectedSpellActionName, Client.selectedSpellName + " " + "->" + " " + HorizontalAlignment.colorStartTag(65535) + var20.name, 2, var18, var15, var16); // L: 9171 - } + if ((var4 & 1) != 0) { // L: 7502 + var3.targetIndex = var0.method6603(); // L: 7503 + if (var3.targetIndex == 65535) { // L: 7504 + var3.targetIndex = -1; + } + } + + if ((var4 & 128) != 0) { // L: 7506 + var3.field1278 = var0.method6597(); // L: 7507 + var3.field1280 = var0.method6597(); // L: 7508 + var3.field1269 = var0.method6559(); // L: 7509 + var3.field1238 = var0.method6593(); // L: 7510 + var3.field1265 = var0.method6604() + Client.cycle; // L: 7511 + var3.field1283 = var0.method6603() + Client.cycle; // L: 7512 + var3.field1284 = var0.method6604(); // L: 7513 + var3.pathLength = 1; // L: 7514 + var3.field1274 = 0; // L: 7515 + var3.field1278 += var3.pathX[0]; // L: 7516 + var3.field1280 += var3.pathY[0]; // L: 7517 + var3.field1269 += var3.pathX[0]; // L: 7518 + var3.field1238 += var3.pathY[0]; // L: 7519 + } + + if ((var4 & 64) != 0) { // L: 7521 + var5 = var0.method6549(); // L: 7522 + int var9; + int var10; + int var11; + if (var5 > 0) { // L: 7523 + for (var6 = 0; var6 < var5; ++var6) { // L: 7524 + var8 = -1; // L: 7526 + var9 = -1; // L: 7527 + var10 = -1; // L: 7528 + var7 = var0.readUShortSmart(); // L: 7529 + if (var7 == 32767) { // L: 7530 + var7 = var0.readUShortSmart(); // L: 7531 + var9 = var0.readUShortSmart(); // L: 7532 + var8 = var0.readUShortSmart(); // L: 7533 + var10 = var0.readUShortSmart(); // L: 7534 + } else if (var7 != 32766) { // L: 7536 + var9 = var0.readUShortSmart(); // L: 7537 } else { - String[] var21 = var20.actions; // L: 9176 - if (var21 != null) { // L: 9177 - for (int var22 = 4; var22 >= 0; --var22) { // L: 9178 - if (var21[var22] != null) { // L: 9179 - short var23 = 0; // L: 9180 - if (var22 == 0) { // L: 9181 - var23 = 3; - } - - if (var22 == 1) { // L: 9182 - var23 = 4; - } - - if (var22 == 2) { // L: 9183 - var23 = 5; - } - - if (var22 == 3) { // L: 9184 - var23 = 6; - } - - if (var22 == 4) { // L: 9185 - var23 = 1001; - } - - InterfaceParent.insertMenuItemNoShift(var21[var22], HorizontalAlignment.colorStartTag(65535) + var20.name, var23, var19, var15, var16); // L: 9186 - } - } - } - - InterfaceParent.insertMenuItemNoShift("Examine", HorizontalAlignment.colorStartTag(65535) + var20.name, 1002, var20.id, var15, var16); // L: 9191 + var7 = -1; // L: 7539 } + + var11 = var0.readUShortSmart(); // L: 7540 + var3.addHitSplat(var7, var9, var8, var10, Client.cycle, var11); // L: 7541 } + } - Player var24; - int var28; - NPC var29; - int var36; - int[] var37; - if (var17 == 1) { // L: 9196 - NPC var32 = Client.npcs[var19]; // L: 9197 - if (var32 == null) { // L: 9198 - break label326; - } - - if (var32.definition.size == 1 && (var32.x & 127) == 64 && (var32.y & 127) == 64) { // L: 9199 - for (var28 = 0; var28 < Client.npcCount; ++var28) { // L: 9200 - var29 = Client.npcs[Client.npcIndices[var28]]; // L: 9201 - if (var29 != null && var29 != var32 && var29.definition.size == 1 && var29.x == var32.x && var32.y == var29.y) { // L: 9202 - Script.addNpcToMenu(var29.definition, Client.npcIndices[var28], var15, var16); - } - } - - var28 = Players.Players_count; // L: 9204 - var37 = Players.Players_indices; // L: 9205 - - for (var36 = 0; var36 < var28; ++var36) { // L: 9206 - var24 = Client.players[var37[var36]]; // L: 9207 - if (var24 != null && var24.x == var32.x && var32.y == var24.y) { // L: 9208 - FontName.addPlayerToMenu(var24, var37[var36], var15, var16); - } - } - } - - Script.addNpcToMenu(var32.definition, var19, var15, var16); // L: 9211 - } - - if (var17 == 0) { // L: 9213 - Player var33 = Client.players[var19]; // L: 9214 - if (var33 == null) { // L: 9215 - break label326; - } - - if ((var33.x & 127) == 64 && (var33.y & 127) == 64) { // L: 9216 - for (var28 = 0; var28 < Client.npcCount; ++var28) { // L: 9217 - var29 = Client.npcs[Client.npcIndices[var28]]; // L: 9218 - if (var29 != null && var29.definition.size == 1 && var33.x == var29.x && var33.y == var29.y) { // L: 9219 - Script.addNpcToMenu(var29.definition, Client.npcIndices[var28], var15, var16); - } - } - - var28 = Players.Players_count; // L: 9221 - var37 = Players.Players_indices; // L: 9222 - - for (var36 = 0; var36 < var28; ++var36) { // L: 9223 - var24 = Client.players[var37[var36]]; // L: 9224 - if (var24 != null && var33 != var24 && var33.x == var24.x && var24.y == var33.y) { // L: 9225 - FontName.addPlayerToMenu(var24, var37[var36], var15, var16); - } - } - } - - if (var19 != Client.combatTargetPlayerIndex) { // L: 9228 - FontName.addPlayerToMenu(var33, var19, var15, var16); + var6 = var0.method6671(); // L: 7544 + if (var6 > 0) { // L: 7545 + for (var7 = 0; var7 < var6; ++var7) { // L: 7546 + var8 = var0.readUShortSmart(); // L: 7547 + var9 = var0.readUShortSmart(); // L: 7548 + if (var9 != 32767) { // L: 7549 + var10 = var0.readUShortSmart(); // L: 7550 + var11 = var0.method6671(); // L: 7551 + int var12 = var9 > 0 ? var0.method6549() : var11; // L: 7552 + var3.addHealthBar(var8, Client.cycle, var9, var10, var11, var12); // L: 7553 } else { - var4 = var26; // L: 9229 - } - } - - if (var17 == 3) { // L: 9231 - NodeDeque var35 = Client.groundItems[ParamComposition.Client_plane][var15][var16]; // L: 9232 - if (var35 != null) { // L: 9233 - for (TileItem var34 = (TileItem)var35.first(); var34 != null; var34 = (TileItem)var35.next()) { // L: 9234 9235 9268 - ItemComposition var38 = Strings.ItemDefinition_get(var34.id); // L: 9236 - if (Client.isItemSelected == 1) { // L: 9237 - InterfaceParent.insertMenuItemNoShift("Use", Client.selectedItemName + " " + "->" + " " + HorizontalAlignment.colorStartTag(16748608) + var38.name, 16, var34.id, var15, var16); // L: 9238 - } else if (Client.isSpellSelected) { // L: 9241 - if ((GrandExchangeOfferUnitPriceComparator.selectedSpellFlags & 1) == 1) { // L: 9242 - InterfaceParent.insertMenuItemNoShift(Client.selectedSpellActionName, Client.selectedSpellName + " " + "->" + " " + HorizontalAlignment.colorStartTag(16748608) + var38.name, 17, var34.id, var15, var16); // L: 9243 - } - } else { - String[] var30 = var38.groundActions; // L: 9248 - - for (int var31 = 4; var31 >= 0; --var31) { // L: 9249 - if (var30 != null && var30[var31] != null) { // L: 9250 - byte var25 = 0; // L: 9251 - if (var31 == 0) { // L: 9252 - var25 = 18; - } - - if (var31 == 1) { // L: 9253 - var25 = 19; - } - - if (var31 == 2) { // L: 9254 - var25 = 20; - } - - if (var31 == 3) { // L: 9255 - var25 = 21; - } - - if (var31 == 4) { // L: 9256 - var25 = 22; - } - - InterfaceParent.insertMenuItemNoShift(var30[var31], HorizontalAlignment.colorStartTag(16748608) + var38.name, var25, var34.id, var15, var16); // L: 9257 - } else if (var31 == 2) { // L: 9260 - InterfaceParent.insertMenuItemNoShift("Take", HorizontalAlignment.colorStartTag(16748608) + var38.name, 20, var34.id, var15, var16); // L: 9261 - } - } - - InterfaceParent.insertMenuItemNoShift("Examine", HorizontalAlignment.colorStartTag(16748608) + var38.name, 1004, var34.id, var15, var16); // L: 9265 - } - } + var3.removeHealthBar(var8); // L: 7555 } } } } - ++var8; // L: 9138 + if ((var4 & 4) != 0) { // L: 7559 + var3.spotAnimation = var0.method6605(); // L: 7560 + var5 = var0.method6598(); // L: 7561 + var3.field1277 = var5 >> 16; // L: 7562 + var3.field1287 = (var5 & 65535) + Client.cycle; // L: 7563 + var3.spotAnimationFrame = 0; // L: 7564 + var3.spotAnimationFrameCycle = 0; // L: 7565 + if (var3.field1287 > Client.cycle) { // L: 7566 + var3.spotAnimationFrame = -1; + } + + if (var3.spotAnimation == 65535) { // L: 7567 + var3.spotAnimation = -1; + } + } + + if ((var4 & 16) != 0) { // L: 7569 + var3.overheadText = var0.readStringCp1252NullTerminated(); // L: 7570 + var3.overheadTextCyclesRemaining = 100; // L: 7571 + } } - } + + } // L: 7574 } diff --git a/runescape-client/src/main/java/ScriptFrame.java b/runescape-client/src/main/java/ScriptFrame.java index 749f60e71c..fcd7bddba7 100644 --- a/runescape-client/src/main/java/ScriptFrame.java +++ b/runescape-client/src/main/java/ScriptFrame.java @@ -1,37 +1,30 @@ +import java.io.File; +import java.io.RandomAccessFile; 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("bx") +@ObfuscatedName("bw") @Implements("ScriptFrame") public class ScriptFrame { - @ObfuscatedName("z") - @Export("Interpreter_intLocals") - static int[] Interpreter_intLocals; - @ObfuscatedName("ed") + @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "Llg;" - ) - @Export("spriteIds") - static GraphicsDefaults spriteIds; - @ObfuscatedName("h") - @ObfuscatedSignature( - descriptor = "Lci;" + descriptor = "Lcf;" ) @Export("script") Script script; - @ObfuscatedName("c") + @ObfuscatedName("n") @ObfuscatedGetter( - intValue = -1900092655 + intValue = -364828753 ) @Export("pc") int pc; - @ObfuscatedName("o") + @ObfuscatedName("f") @Export("intLocals") int[] intLocals; - @ObfuscatedName("g") + @ObfuscatedName("y") @Export("stringLocals") String[] stringLocals; @@ -39,80 +32,399 @@ public class ScriptFrame { this.pc = -1; // L: 5 } // L: 9 - @ObfuscatedName("t") + @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "(III)I", - garbageValue = "1150658828" + descriptor = "(Ljava/lang/String;I)Ljava/io/File;", + garbageValue = "-128953674" ) - static final int method1160(int var0, int var1) { - int var2 = AbstractByteArrayCopier.method4754(var0 - 1, var1 - 1) + AbstractByteArrayCopier.method4754(var0 + 1, var1 - 1) + AbstractByteArrayCopier.method4754(var0 - 1, 1 + var1) + AbstractByteArrayCopier.method4754(1 + var0, 1 + var1); // L: 478 - int var3 = AbstractByteArrayCopier.method4754(var0 - 1, var1) + AbstractByteArrayCopier.method4754(var0 + 1, var1) + AbstractByteArrayCopier.method4754(var0, var1 - 1) + AbstractByteArrayCopier.method4754(var0, 1 + var1); // L: 479 - int var4 = AbstractByteArrayCopier.method4754(var0, var1); // L: 480 - return var2 / 16 + var3 / 8 + var4 / 4; // L: 481 + @Export("getFile") + public static File getFile(String var0) { + if (!FileSystem.FileSystem_hasPermissions) { // L: 16 + throw new RuntimeException(""); + } else { + File var1 = (File)FileSystem.FileSystem_cacheFiles.get(var0); // L: 17 + if (var1 != null) { // L: 18 + return var1; + } else { + File var2 = new File(FileSystem.FileSystem_cacheDir, var0); // L: 19 + RandomAccessFile var3 = null; // L: 20 + + try { + File var4 = new File(var2.getParent()); // L: 22 + if (!var4.exists()) { // L: 23 + throw new RuntimeException(""); + } else { + var3 = new RandomAccessFile(var2, "rw"); // L: 24 + int var5 = var3.read(); // L: 25 + var3.seek(0L); // L: 26 + var3.write(var5); // L: 27 + var3.seek(0L); // L: 28 + var3.close(); // L: 29 + FileSystem.FileSystem_cacheFiles.put(var0, var2); // L: 30 + return var2; // L: 31 + } + } catch (Exception var8) { + try { + if (var3 != null) { // L: 35 + var3.close(); // L: 36 + var3 = null; // L: 37 + } + } catch (Exception var7) { // L: 40 + } + + throw new RuntimeException(); // L: 42 + } + } + } } - @ObfuscatedName("q") + @ObfuscatedName("gf") @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "-1457317162" + descriptor = "(IIIII)V", + garbageValue = "1213701936" ) - public static void method1162() { - HitSplatDefinition.HitSplatDefinition_cached.clear(); // L: 203 - HitSplatDefinition.HitSplatDefinition_cachedSprites.clear(); // L: 204 - HitSplatDefinition.HitSplatDefinition_cachedFonts.clear(); // L: 205 - } // L: 206 + @Export("drawEntities") + static final void drawEntities(int var0, int var1, int var2, int var3) { + ++Client.viewportDrawCount; // L: 4046 + if (class93.localPlayer.x >> 7 == Client.destinationX && class93.localPlayer.y >> 7 == Client.destinationY) { // L: 4048 + Client.destinationX = 0; // L: 4049 + } - @ObfuscatedName("ic") - @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "-2049667845" - ) - static final void method1161() { - int var0 = AbstractByteArrayCopier.menuX; // L: 7859 - int var1 = HitSplatDefinition.menuY; // L: 7860 - int var2 = SoundCache.menuWidth; // L: 7861 - int var3 = GrandExchangeOfferOwnWorldComparator.menuHeight; // L: 7862 - int var4 = 6116423; // L: 7863 - Rasterizer2D.Rasterizer2D_fillRectangle(var0, var1, var2, var3, var4); // L: 7864 - Rasterizer2D.Rasterizer2D_fillRectangle(var0 + 1, var1 + 1, var2 - 2, 16, 0); // L: 7865 - Rasterizer2D.Rasterizer2D_drawRectangle(var0 + 1, var1 + 18, var2 - 2, var3 - 19, 0); // L: 7866 - WorldMapArea.fontBold12.draw("Choose Option", var0 + 3, var1 + 14, var4, -1); // L: 7867 - int var5 = MouseHandler.MouseHandler_x; // L: 7868 - int var6 = MouseHandler.MouseHandler_y; // L: 7869 + Decimator.method1068(); // L: 4052 + GameObject.method4279(); // L: 4053 + GrandExchangeOfferOwnWorldComparator.addNpcsToScene(true); // L: 4054 + class373.method6474(); // L: 4055 + GrandExchangeOfferOwnWorldComparator.addNpcsToScene(false); // L: 4056 + int var6; + for (Projectile var4 = (Projectile)Client.projectiles.last(); var4 != null; var4 = (Projectile)Client.projectiles.previous()) { // L: 4058 4059 4076 + if (var4.plane == class22.Client_plane && Client.cycle <= var4.cycleEnd) { // L: 4060 + if (Client.cycle >= var4.cycleStart) { // L: 4061 + if (var4.targetIndex > 0) { // L: 4062 + NPC var19 = Client.npcs[var4.targetIndex - 1]; // L: 4063 + if (var19 != null && var19.x >= 0 && var19.x < 13312 && var19.y >= 0 && var19.y < 13312) { + var4.setDestination(var19.x, var19.y, class105.getTileHeight(var19.x, var19.y, var4.plane) - var4.endHeight, Client.cycle); // L: 4064 + } + } + + if (var4.targetIndex < 0) { // L: 4066 + var6 = -var4.targetIndex - 1; // L: 4068 + Player var22; + if (var6 == Client.localPlayerIndex) { // L: 4069 + var22 = class93.localPlayer; + } else { + var22 = Client.players[var6]; // L: 4070 + } + + if (var22 != null && var22.x >= 0 && var22.x < 13312 && var22.y >= 0 && var22.y < 13312) { // L: 4071 + var4.setDestination(var22.x, var22.y, class105.getTileHeight(var22.x, var22.y, var4.plane) - var4.endHeight, Client.cycle); + } + } + + var4.advance(Client.field913); // L: 4073 + AbstractSocket.scene.drawEntity(class22.Client_plane, (int)var4.x, (int)var4.y, (int)var4.z, 60, var4, var4.yaw, -1L, false); // L: 4074 + } + } else { + var4.remove(); + } + } + + for (GraphicsObject var20 = (GraphicsObject)Client.graphicsObjects.last(); var20 != null; var20 = (GraphicsObject)Client.graphicsObjects.previous()) { // L: 4080 4081 4088 + if (var20.plane == class22.Client_plane && !var20.isFinished) { // L: 4082 + if (Client.cycle >= var20.cycleStart) { // L: 4083 + var20.advance(Client.field913); // L: 4084 + if (var20.isFinished) { // L: 4085 + var20.remove(); + } else { + AbstractSocket.scene.drawEntity(var20.plane, var20.x, var20.y, var20.height, 60, var20, 0, -1L, false); // L: 4086 + } + } + } else { + var20.remove(); + } + } + + UrlRequester.setViewportShape(var0, var1, var2, var3, true); // L: 4091 + var0 = Client.viewportOffsetX; // L: 4092 + var1 = Client.viewportOffsetY; // L: 4093 + var2 = Client.viewportWidth; // L: 4094 + var3 = Client.viewportHeight; // L: 4095 + Rasterizer2D.Rasterizer2D_setClip(var0, var1, var0 + var2, var3 + var1); // L: 4096 + Rasterizer3D.Rasterizer3D_setClipFromRasterizer2D(); // L: 4097 + int var5; int var7; int var8; int var9; - for (var7 = 0; var7 < Client.menuOptionsCount; ++var7) { // L: 7870 - var8 = var1 + (Client.menuOptionsCount - 1 - var7) * 15 + 31; // L: 7871 - var9 = 16777215; // L: 7872 - if (var5 > var0 && var5 < var2 + var0 && var6 > var8 - 13 && var6 < var8 + 3) { // L: 7873 - var9 = 16776960; + int var10; + int var11; + int var12; + int var13; + int var14; + int var18; + if (!Client.isCameraLocked) { // L: 4098 + var18 = Client.camAngleX; // L: 4099 + if (Client.field727 / 256 > var18) { // L: 4100 + var18 = Client.field727 / 256; } - Font var12 = WorldMapArea.fontBold12; // L: 7874 - String var13; - if (var7 < 0) { // L: 7877 - var13 = ""; // L: 7878 - } else if (Client.menuTargets[var7].length() > 0) { // L: 7881 - var13 = Client.menuActions[var7] + " " + Client.menuTargets[var7]; + if (Client.field693[4] && Client.field891[4] + 128 > var18) { // L: 4101 + var18 = Client.field891[4] + 128; + } + + var5 = Client.camAngleY & 2047; // L: 4102 + var6 = RouteStrategy.oculusOrbFocalPointX; // L: 4103 + var7 = class17.field148; // L: 4104 + var8 = ModelData0.oculusOrbFocalPointY; // L: 4105 + var9 = SecureRandomFuture.method1980(var18); // L: 4106 + var9 = WorldMapDecoration.method3627(var9, var3); // L: 4108 + var10 = 2048 - var18 & 2047; // L: 4109 + var11 = 2048 - var5 & 2047; // L: 4110 + var12 = 0; // L: 4111 + var13 = 0; // L: 4112 + var14 = var9; // L: 4113 + int var15; + int var16; + int var17; + if (var10 != 0) { // L: 4114 + var15 = Rasterizer3D.Rasterizer3D_sine[var10]; // L: 4115 + var16 = Rasterizer3D.Rasterizer3D_cosine[var10]; // L: 4116 + var17 = var13 * var16 - var15 * var9 >> 16; // L: 4117 + var14 = var15 * var13 + var9 * var16 >> 16; // L: 4118 + var13 = var17; // L: 4119 + } + + if (var11 != 0) { // L: 4121 + var15 = Rasterizer3D.Rasterizer3D_sine[var11]; // L: 4122 + var16 = Rasterizer3D.Rasterizer3D_cosine[var11]; // L: 4123 + var17 = var12 * var16 + var14 * var15 >> 16; // L: 4124 + var14 = var14 * var16 - var12 * var15 >> 16; // L: 4125 + var12 = var17; // L: 4126 + } + + MouseHandler.cameraX = var6 - var12; // L: 4128 + SecureRandomCallable.cameraY = var7 - var13; // L: 4129 + class105.cameraZ = var8 - var14; // L: 4130 + SpotAnimationDefinition.cameraPitch = var18; // L: 4131 + class376.cameraYaw = var5; // L: 4132 + if (Client.oculusOrbState == 1 && Client.staffModLevel >= 2 && Client.cycle % 50 == 0 && (RouteStrategy.oculusOrbFocalPointX >> 7 != class93.localPlayer.x >> 7 || ModelData0.oculusOrbFocalPointY >> 7 != class93.localPlayer.y >> 7)) { // L: 4133 4134 + var15 = class93.localPlayer.plane; // L: 4135 + var16 = (RouteStrategy.oculusOrbFocalPointX >> 7) + VertexNormal.baseX; // L: 4136 + var17 = (ModelData0.oculusOrbFocalPointY >> 7) + SoundSystem.baseY; // L: 4137 + class4.method50(var16, var17, var15, true); // L: 4138 + } + } + + if (!Client.isCameraLocked) { // L: 4144 + if (ObjectComposition.clientPreferences.roofsHidden) { // L: 4147 + var5 = class22.Client_plane; // L: 4148 } else { - var13 = Client.menuActions[var7]; // L: 7882 + label407: { + var6 = 3; // L: 4151 + if (SpotAnimationDefinition.cameraPitch < 310) { // L: 4152 + label405: { + if (Client.oculusOrbState == 1) { // L: 4155 + var7 = RouteStrategy.oculusOrbFocalPointX >> 7; // L: 4156 + var8 = ModelData0.oculusOrbFocalPointY >> 7; // L: 4157 + } else { + var7 = class93.localPlayer.x >> 7; // L: 4160 + var8 = class93.localPlayer.y >> 7; // L: 4161 + } + + var9 = MouseHandler.cameraX >> 7; // L: 4163 + var10 = class105.cameraZ >> 7; // L: 4164 + if (var9 >= 0 && var10 >= 0 && var9 < 104 && var10 < 104) { // L: 4165 + if (var7 >= 0 && var8 >= 0 && var7 < 104 && var8 < 104) { // L: 4169 + if ((Tiles.Tiles_renderFlags[class22.Client_plane][var9][var10] & 4) != 0) { // L: 4173 + var6 = class22.Client_plane; + } + + if (var7 > var9) { // L: 4175 + var11 = var7 - var9; + } else { + var11 = var9 - var7; // L: 4176 + } + + if (var8 > var10) { // L: 4178 + var12 = var8 - var10; + } else { + var12 = var10 - var8; // L: 4179 + } + + if (var11 > var12) { // L: 4180 + var13 = var12 * 65536 / var11; // L: 4181 + var14 = 32768; // L: 4182 + + while (true) { + if (var7 == var9) { // L: 4183 + break label405; + } + + if (var9 < var7) { // L: 4184 + ++var9; + } else if (var9 > var7) { // L: 4185 + --var9; + } + + if ((Tiles.Tiles_renderFlags[class22.Client_plane][var9][var10] & 4) != 0) { // L: 4186 + var6 = class22.Client_plane; + } + + var14 += var13; // L: 4187 + if (var14 >= 65536) { // L: 4188 + var14 -= 65536; // L: 4189 + if (var10 < var8) { // L: 4190 + ++var10; + } else if (var10 > var8) { // L: 4191 + --var10; + } + + if ((Tiles.Tiles_renderFlags[class22.Client_plane][var9][var10] & 4) != 0) { // L: 4192 + var6 = class22.Client_plane; + } + } + } + } else { + if (var12 > 0) { // L: 4196 + var13 = var11 * 65536 / var12; // L: 4197 + var14 = 32768; // L: 4198 + + while (var10 != var8) { // L: 4199 + if (var10 < var8) { // L: 4200 + ++var10; + } else if (var10 > var8) { // L: 4201 + --var10; + } + + if ((Tiles.Tiles_renderFlags[class22.Client_plane][var9][var10] & 4) != 0) { // L: 4202 + var6 = class22.Client_plane; + } + + var14 += var13; // L: 4203 + if (var14 >= 65536) { // L: 4204 + var14 -= 65536; // L: 4205 + if (var9 < var7) { // L: 4206 + ++var9; + } else if (var9 > var7) { // L: 4207 + --var9; + } + + if ((Tiles.Tiles_renderFlags[class22.Client_plane][var9][var10] & 4) != 0) { // L: 4208 + var6 = class22.Client_plane; + } + } + } + } + break label405; + } + } + + var5 = class22.Client_plane; // L: 4170 + break label407; // L: 4171 + } + + var5 = class22.Client_plane; // L: 4166 + break label407; // L: 4167 + } + } + + if (class93.localPlayer.x >= 0 && class93.localPlayer.y >= 0 && class93.localPlayer.x < 13312 && class93.localPlayer.y < 13312) { // L: 4213 + if ((Tiles.Tiles_renderFlags[class22.Client_plane][class93.localPlayer.x >> 7][class93.localPlayer.y >> 7] & 4) != 0) { // L: 4217 + var6 = class22.Client_plane; + } + + var5 = var6; // L: 4218 + } else { + var5 = class22.Client_plane; // L: 4214 + } + } } - var12.draw(var13, var0 + 3, var8, var9, 0); // L: 7884 + var18 = var5; // L: 4220 + } else { + var18 = class32.method305(); // L: 4222 } - var7 = AbstractByteArrayCopier.menuX; // L: 7886 - var8 = HitSplatDefinition.menuY; // L: 7887 - var9 = SoundCache.menuWidth; // L: 7888 - int var10 = GrandExchangeOfferOwnWorldComparator.menuHeight; // L: 7889 + var5 = MouseHandler.cameraX; // L: 4223 + var6 = SecureRandomCallable.cameraY; // L: 4224 + var7 = class105.cameraZ; // L: 4225 + var8 = SpotAnimationDefinition.cameraPitch; // L: 4226 + var9 = class376.cameraYaw; // L: 4227 - for (int var11 = 0; var11 < Client.rootWidgetCount; ++var11) { // L: 7891 - if (Client.rootWidgetXs[var11] + Client.rootWidgetWidths[var11] > var7 && Client.rootWidgetXs[var11] < var7 + var9 && Client.rootWidgetHeights[var11] + Client.rootWidgetYs[var11] > var8 && Client.rootWidgetYs[var11] < var8 + var10) { // L: 7892 - Client.field826[var11] = true; + for (var10 = 0; var10 < 5; ++var10) { // L: 4228 + if (Client.field693[var10]) { // L: 4229 + var11 = (int)(Math.random() * (double)(Client.field890[var10] * 2 + 1) - (double)Client.field890[var10] + Math.sin((double)Client.field893[var10] * ((double)Client.field892[var10] / 100.0D)) * (double)Client.field891[var10]); // L: 4230 + if (var10 == 0) { // L: 4231 + MouseHandler.cameraX += var11; + } + + if (var10 == 1) { // L: 4232 + SecureRandomCallable.cameraY += var11; + } + + if (var10 == 2) { // L: 4233 + class105.cameraZ += var11; + } + + if (var10 == 3) { // L: 4234 + class376.cameraYaw = var11 + class376.cameraYaw & 2047; + } + + if (var10 == 4) { // L: 4235 + SpotAnimationDefinition.cameraPitch += var11; // L: 4236 + if (SpotAnimationDefinition.cameraPitch < 128) { // L: 4237 + SpotAnimationDefinition.cameraPitch = 128; + } + + if (SpotAnimationDefinition.cameraPitch > 383) { // L: 4238 + SpotAnimationDefinition.cameraPitch = 383; + } + } } } - } // L: 7895 + var10 = MouseHandler.MouseHandler_x; // L: 4242 + var11 = MouseHandler.MouseHandler_y; // L: 4243 + if (MouseHandler.MouseHandler_lastButton != 0) { // L: 4244 + var10 = MouseHandler.MouseHandler_lastPressedX; // L: 4245 + var11 = MouseHandler.MouseHandler_lastPressedY; // L: 4246 + } + + if (var10 >= var0 && var10 < var0 + var2 && var11 >= var1 && var11 < var3 + var1) { // L: 4248 + class135.method2599(var10 - var0, var11 - var1); // L: 4249 + } else { + class80.method1906(); // L: 4252 + } + + HealthBarUpdate.playPcmPlayers(); // L: 4254 + Rasterizer2D.Rasterizer2D_fillRectangle(var0, var1, var2, var3, 0); // L: 4255 + HealthBarUpdate.playPcmPlayers(); // L: 4256 + var12 = Rasterizer3D.Rasterizer3D_zoom; // L: 4257 + Rasterizer3D.Rasterizer3D_zoom = Client.viewportZoom; // L: 4258 + AbstractSocket.scene.draw(MouseHandler.cameraX, SecureRandomCallable.cameraY, class105.cameraZ, SpotAnimationDefinition.cameraPitch, class376.cameraYaw, var18); // L: 4259 + Rasterizer3D.Rasterizer3D_zoom = var12; // L: 4260 + HealthBarUpdate.playPcmPlayers(); // L: 4261 + AbstractSocket.scene.clearTempGameObjects(); // L: 4262 + NetCache.method5025(var0, var1, var2, var3); // L: 4263 + ChatChannel.method2014(var0, var1); // L: 4264 + ((TextureProvider)Rasterizer3D.Rasterizer3D_textureLoader).animate(Client.field913); // L: 4265 + class27.method283(var0, var1, var2, var3); // L: 4266 + MouseHandler.cameraX = var5; // L: 4267 + SecureRandomCallable.cameraY = var6; // L: 4268 + class105.cameraZ = var7; // L: 4269 + SpotAnimationDefinition.cameraPitch = var8; // L: 4270 + class376.cameraYaw = var9; // L: 4271 + if (Client.isLoading) { // L: 4272 + byte var21 = 0; // L: 4275 + var14 = var21 + NetCache.NetCache_pendingPriorityWritesCount + NetCache.NetCache_pendingPriorityResponsesCount; // L: 4276 + if (var14 == 0) { // L: 4280 + Client.isLoading = false; + } + } + + if (Client.isLoading) { // L: 4282 + Rasterizer2D.Rasterizer2D_fillRectangle(var0, var1, var2, var3, 0); // L: 4283 + DirectByteArrayCopier.drawLoadingMessage("Loading - please wait.", false); // L: 4284 + } + + } // L: 4286 } diff --git a/runescape-client/src/main/java/SecureRandomCallable.java b/runescape-client/src/main/java/SecureRandomCallable.java index 9cba45ab97..17a5debb9e 100644 --- a/runescape-client/src/main/java/SecureRandomCallable.java +++ b/runescape-client/src/main/java/SecureRandomCallable.java @@ -6,23 +6,18 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("cd") +@ObfuscatedName("co") @Implements("SecureRandomCallable") public class SecureRandomCallable implements Callable { - @ObfuscatedName("o") + @ObfuscatedName("hs") @ObfuscatedGetter( - longValue = -5954389703688375111L + intValue = 45831589 ) - static long field1108; - @ObfuscatedName("m") - @ObfuscatedSignature( - descriptor = "Lnk;" - ) - @Export("NetCache_reference") - static Buffer NetCache_reference; + @Export("cameraY") + static int cameraY; SecureRandomCallable() { - } // L: 42 + } // L: 36 public Object call() { SecureRandom var2 = new SecureRandom(); // L: 47 @@ -30,95 +25,13 @@ public class SecureRandomCallable implements Callable { return var2; // L: 51 } - @ObfuscatedName("h") + @ObfuscatedName("u") @ObfuscatedSignature( descriptor = "(B)V", - garbageValue = "1" + garbageValue = "61" ) - static void method2080() { - if (TaskHandler.javaVendor.toLowerCase().indexOf("microsoft") != -1) { // L: 119 - KeyHandler.KeyHandler_keyCodes[186] = 57; // L: 120 - KeyHandler.KeyHandler_keyCodes[187] = 27; // L: 121 - KeyHandler.KeyHandler_keyCodes[188] = 71; // L: 122 - KeyHandler.KeyHandler_keyCodes[189] = 26; // L: 123 - KeyHandler.KeyHandler_keyCodes[190] = 72; // L: 124 - KeyHandler.KeyHandler_keyCodes[191] = 73; // L: 125 - KeyHandler.KeyHandler_keyCodes[192] = 58; // L: 126 - KeyHandler.KeyHandler_keyCodes[219] = 42; // L: 127 - KeyHandler.KeyHandler_keyCodes[220] = 74; // L: 128 - KeyHandler.KeyHandler_keyCodes[221] = 43; // L: 129 - KeyHandler.KeyHandler_keyCodes[222] = 59; // L: 130 - KeyHandler.KeyHandler_keyCodes[223] = 28; // L: 131 - } else { - KeyHandler.KeyHandler_keyCodes[44] = 71; // L: 134 - KeyHandler.KeyHandler_keyCodes[45] = 26; // L: 135 - KeyHandler.KeyHandler_keyCodes[46] = 72; // L: 136 - KeyHandler.KeyHandler_keyCodes[47] = 73; // L: 137 - KeyHandler.KeyHandler_keyCodes[59] = 57; // L: 138 - KeyHandler.KeyHandler_keyCodes[61] = 27; // L: 139 - KeyHandler.KeyHandler_keyCodes[91] = 42; // L: 140 - KeyHandler.KeyHandler_keyCodes[92] = 74; // L: 141 - KeyHandler.KeyHandler_keyCodes[93] = 43; // L: 142 - KeyHandler.KeyHandler_keyCodes[192] = 28; // L: 143 - KeyHandler.KeyHandler_keyCodes[222] = 58; // L: 144 - KeyHandler.KeyHandler_keyCodes[520] = 59; // L: 145 - } - - } // L: 147 - - @ObfuscatedName("h") - @ObfuscatedSignature( - descriptor = "([Ljava/lang/CharSequence;III)Ljava/lang/String;", - garbageValue = "1114748874" - ) - public static String method2076(CharSequence[] var0, int var1, int var2) { - if (var2 == 0) { // L: 11 - return ""; - } else if (var2 == 1) { // L: 12 - CharSequence var10 = var0[var1]; // L: 13 - return var10 == null ? "null" : var10.toString(); // L: 14 15 - } else { - int var3 = var2 + var1; // L: 17 - int var4 = 0; // L: 18 - - for (int var5 = var1; var5 < var3; ++var5) { // L: 19 - CharSequence var9 = var0[var5]; // L: 20 - if (var9 == null) { // L: 21 - var4 += 4; - } else { - var4 += var9.length(); // L: 22 - } - } - - StringBuilder var8 = new StringBuilder(var4); // L: 24 - - for (int var6 = var1; var6 < var3; ++var6) { // L: 25 - CharSequence var7 = var0[var6]; // L: 26 - if (var7 == null) { // L: 27 - var8.append("null"); - } else { - var8.append(var7); // L: 28 - } - } - - return var8.toString(); // L: 30 - } - } - - @ObfuscatedName("x") - @ObfuscatedSignature( - descriptor = "(Ljava/lang/CharSequence;B)Ljava/lang/String;", - garbageValue = "12" - ) - public static String method2081(CharSequence var0) { - int var2 = var0.length(); // L: 193 - char[] var3 = new char[var2]; // L: 195 - - for (int var4 = 0; var4 < var2; ++var4) { // L: 196 - var3[var4] = '*'; - } - - String var1 = new String(var3); // L: 197 - return var1; // L: 199 - } + public static void method2055() { + SequenceDefinition.SequenceDefinition_cached.clear(); // L: 218 + SequenceDefinition.SequenceDefinition_cachedFrames.clear(); // L: 219 + } // L: 220 } diff --git a/runescape-client/src/main/java/SecureRandomFuture.java b/runescape-client/src/main/java/SecureRandomFuture.java index 31f2df596b..793fbfdd48 100644 --- a/runescape-client/src/main/java/SecureRandomFuture.java +++ b/runescape-client/src/main/java/SecureRandomFuture.java @@ -6,15 +6,14 @@ 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("cx") +@ObfuscatedName("cr") @Implements("SecureRandomFuture") public class SecureRandomFuture { - @ObfuscatedName("h") + @ObfuscatedName("v") @Export("executor") ExecutorService executor; - @ObfuscatedName("c") + @ObfuscatedName("n") @Export("future") Future future; @@ -23,391 +22,92 @@ public class SecureRandomFuture { this.future = this.executor.submit(new SecureRandomCallable()); // L: 14 } // L: 15 - @ObfuscatedName("h") + @ObfuscatedName("v") @ObfuscatedSignature( descriptor = "(B)V", - garbageValue = "122" + garbageValue = "32" ) @Export("shutdown") void shutdown() { - this.executor.shutdown(); // L: 18 - this.executor = null; // L: 19 - } // L: 20 + this.executor.shutdown(); + this.executor = null; + } - @ObfuscatedName("c") + @ObfuscatedName("n") @ObfuscatedSignature( descriptor = "(I)Z", - garbageValue = "-1623185181" + garbageValue = "-1067207786" ) @Export("isDone") boolean isDone() { - return this.future.isDone(); // L: 23 + return this.future.isDone(); } - @ObfuscatedName("o") + @ObfuscatedName("f") @ObfuscatedSignature( - descriptor = "(I)Ljava/security/SecureRandom;", - garbageValue = "1344768115" + descriptor = "(B)Ljava/security/SecureRandom;", + garbageValue = "97" ) @Export("get") SecureRandom get() { try { - return (SecureRandom)this.future.get(); // L: 28 - } catch (Exception var4) { // L: 30 - SecureRandom var3 = new SecureRandom(); // L: 33 - var3.nextInt(); // L: 34 - return var3; // L: 37 + return (SecureRandom)this.future.get(); + } catch (Exception var2) { // L: 30 + return PlayerComposition.method4711(); } } - @ObfuscatedName("x") + @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "(IIIIIZI)Low;", - garbageValue = "42192399" + descriptor = "([I[II)V", + garbageValue = "-2018126556" ) - @Export("getItemSprite") - public static final SpritePixels getItemSprite(int var0, int var1, int var2, int var3, int var4, boolean var5) { - if (var1 == -1) { // L: 353 - var4 = 0; - } else if (var4 == 2 && var1 != 1) { // L: 354 - var4 = 1; - } + public static void method1981(int[] var0, int[] var1) { + if (var0 != null && var1 != null) { // L: 19 + ByteArrayPool.ByteArrayPool_alternativeSizes = var0; // L: 25 + ByteArrayPool.ByteArrayPool_altSizeArrayCounts = new int[var0.length]; // L: 26 + class20.ByteArrayPool_arrays = new byte[var0.length][][]; // L: 27 - long var6 = ((long)var4 << 40) + ((long)var2 << 38) + ((long)var1 << 16) + (long)var0 + ((long)var3 << 42); // L: 355 - SpritePixels var8; - if (!var5) { // L: 357 - var8 = (SpritePixels)ItemComposition.ItemDefinition_cachedSprites.get(var6); // L: 358 - if (var8 != null) { // L: 359 - return var8; - } - } - - ItemComposition var9 = Strings.ItemDefinition_get(var0); // L: 361 - if (var1 > 1 && var9.countobj != null) { // L: 362 - int var10 = -1; // L: 363 - - for (int var11 = 0; var11 < 10; ++var11) { // L: 364 - if (var1 >= var9.countco[var11] && var9.countco[var11] != 0) { // L: 365 - var10 = var9.countobj[var11]; - } + for (int var2 = 0; var2 < ByteArrayPool.ByteArrayPool_alternativeSizes.length; ++var2) { // L: 28 + class20.ByteArrayPool_arrays[var2] = new byte[var1[var2]][]; // L: 29 } - if (var10 != -1) { // L: 367 - var9 = Strings.ItemDefinition_get(var10); - } - } - - Model var19 = var9.getModel(1); // L: 369 - if (var19 == null) { // L: 370 - return null; } else { - SpritePixels var20 = null; // L: 371 - if (var9.noteTemplate != -1) { // L: 372 - var20 = getItemSprite(var9.note, 10, 1, 0, 0, true); // L: 373 - if (var20 == null) { // L: 374 - return null; - } - } else if (var9.notedId != -1) { // L: 376 - var20 = getItemSprite(var9.unnotedId, var1, var2, var3, 0, false); // L: 377 - if (var20 == null) { // L: 378 - return null; - } - } else if (var9.placeholderTemplate != -1) { // L: 380 - var20 = getItemSprite(var9.placeholder, var1, 0, 0, 0, false); // L: 381 - if (var20 == null) { // L: 382 - return null; - } - } + ByteArrayPool.ByteArrayPool_alternativeSizes = null; // L: 20 + ByteArrayPool.ByteArrayPool_altSizeArrayCounts = null; // L: 21 + class20.ByteArrayPool_arrays = null; // L: 22 + } + } // L: 23 31 - int[] var12 = Rasterizer2D.Rasterizer2D_pixels; // L: 384 - int var13 = Rasterizer2D.Rasterizer2D_width; // L: 385 - int var14 = Rasterizer2D.Rasterizer2D_height; // L: 386 - int[] var15 = new int[4]; // L: 387 - Rasterizer2D.Rasterizer2D_getClipArray(var15); // L: 388 - var8 = new SpritePixels(36, 32); // L: 389 - Rasterizer2D.Rasterizer2D_replace(var8.pixels, 36, 32); // L: 390 - Rasterizer2D.Rasterizer2D_clear(); // L: 391 - Rasterizer3D.Rasterizer3D_setClipFromRasterizer2D(); // L: 392 - Rasterizer3D.method3818(16, 16); // L: 393 - Rasterizer3D.field2254 = false; // L: 394 - if (var9.placeholderTemplate != -1) { // L: 395 - var20.drawTransBgAt(0, 0); - } + @ObfuscatedName("v") + @ObfuscatedSignature( + descriptor = "(II)Ljava/lang/String;", + garbageValue = "-1561643653" + ) + static String method1982(int var0) { + return ""; // L: 18 + } - int var16 = var9.zoom2d; // L: 396 - if (var5) { // L: 397 - var16 = (int)(1.5D * (double)var16); - } else if (var2 == 2) { // L: 398 - var16 = (int)(1.04D * (double)var16); - } - - int var17 = var16 * Rasterizer3D.Rasterizer3D_sine[var9.xan2d] >> 16; // L: 399 - int var18 = var16 * Rasterizer3D.Rasterizer3D_cosine[var9.xan2d] >> 16; // L: 400 - var19.calculateBoundsCylinder(); // L: 401 - var19.method4136(0, var9.yan2d, var9.zan2d, var9.xan2d, var9.offsetX2d, var19.height / 2 + var17 + var9.offsetY2d, var18 + var9.offsetY2d); // L: 402 - if (var9.notedId != -1) { // L: 403 - var20.drawTransBgAt(0, 0); - } - - if (var2 >= 1) { // L: 404 - var8.outline(1); - } - - if (var2 >= 2) { // L: 405 - var8.outline(16777215); - } - - if (var3 != 0) { // L: 406 - var8.shadow(var3); - } - - Rasterizer2D.Rasterizer2D_replace(var8.pixels, 36, 32); // L: 407 - if (var9.noteTemplate != -1) { // L: 408 - var20.drawTransBgAt(0, 0); - } - - if (var4 == 1 || var4 == 2 && var9.isStackable == 1) { // L: 409 - StudioGame.ItemDefinition_fontPlain11.draw(class261.method4790(var1), 0, 9, 16776960, 1); // L: 410 - } - - if (!var5) { // L: 412 - ItemComposition.ItemDefinition_cachedSprites.put(var8, var6); - } - - Rasterizer2D.Rasterizer2D_replace(var12, var13, var14); // L: 413 - Rasterizer2D.Rasterizer2D_setClipArray(var15); // L: 414 - Rasterizer3D.Rasterizer3D_setClipFromRasterizer2D(); // L: 415 - Rasterizer3D.field2254 = true; // L: 416 - return var8; // L: 417 + @ObfuscatedName("n") + @ObfuscatedSignature( + descriptor = "(Lmr;III)I", + garbageValue = "-1327945264" + ) + static int method1977(IterableNodeHashTable var0, int var1, int var2) { + if (var0 == null) { // L: 33 + return var2; + } else { + IntegerNode var3 = (IntegerNode)var0.get((long)var1); // L: 34 + return var3 == null ? var2 : var3.integer; // L: 35 36 } } - @ObfuscatedName("av") + @ObfuscatedName("fa") @ObfuscatedSignature( - descriptor = "(ILci;ZB)I", - garbageValue = "-112" + descriptor = "(II)I", + garbageValue = "353118952" ) - static int method2000(int var0, Script var1, boolean var2) { - if (var0 == ScriptOpcodes.CHAT_GETFILTER_PUBLIC) { // L: 3206 - Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = Client.publicChatMode; // L: 3207 - return 1; // L: 3208 - } else if (var0 == ScriptOpcodes.CHAT_SETFILTER) { // L: 3210 - WorldMapCacheName.Interpreter_intStackSize -= 3; // L: 3211 - Client.publicChatMode = Interpreter.Interpreter_intStack[WorldMapCacheName.Interpreter_intStackSize]; // L: 3212 - AbstractArchive.privateChatMode = EnumComposition.method2727(Interpreter.Interpreter_intStack[WorldMapCacheName.Interpreter_intStackSize + 1]); // L: 3213 - if (AbstractArchive.privateChatMode == null) { // L: 3214 - AbstractArchive.privateChatMode = PrivateChatMode.field3899; - } - - Client.tradeChatMode = Interpreter.Interpreter_intStack[WorldMapCacheName.Interpreter_intStackSize + 2]; // L: 3215 - PacketBufferNode var13 = HealthBarDefinition.getPacketBufferNode(ClientPacket.field2604, Client.packetWriter.isaacCipher); // L: 3217 - var13.packetBuffer.writeByte(Client.publicChatMode); // L: 3218 - var13.packetBuffer.writeByte(AbstractArchive.privateChatMode.field3898); // L: 3219 - var13.packetBuffer.writeByte(Client.tradeChatMode); // L: 3220 - Client.packetWriter.addNode(var13); // L: 3221 - return 1; // L: 3222 - } else { - PacketBufferNode var6; - int var7; - String var8; - int var9; - if (var0 == ScriptOpcodes.CHAT_SENDABUSEREPORT) { // L: 3224 - var8 = Interpreter.Interpreter_stringStack[--class13.Interpreter_stringStackSize]; // L: 3225 - WorldMapCacheName.Interpreter_intStackSize -= 2; // L: 3226 - var7 = Interpreter.Interpreter_intStack[WorldMapCacheName.Interpreter_intStackSize]; // L: 3227 - var9 = Interpreter.Interpreter_intStack[WorldMapCacheName.Interpreter_intStackSize + 1]; // L: 3228 - var6 = HealthBarDefinition.getPacketBufferNode(ClientPacket.field2599, Client.packetWriter.isaacCipher); // L: 3230 - var6.packetBuffer.writeByte(class4.stringCp1252NullTerminatedByteSize(var8) + 2); // L: 3231 - var6.packetBuffer.writeStringCp1252NullTerminated(var8); // L: 3232 - var6.packetBuffer.writeByte(var7 - 1); // L: 3233 - var6.packetBuffer.writeByte(var9); // L: 3234 - Client.packetWriter.addNode(var6); // L: 3235 - return 1; // L: 3236 - } else { - int var3; - Message var5; - if (var0 == ScriptOpcodes.CHAT_GETHISTORY_BYTYPEANDLINE) { // L: 3238 - WorldMapCacheName.Interpreter_intStackSize -= 2; // L: 3239 - var3 = Interpreter.Interpreter_intStack[WorldMapCacheName.Interpreter_intStackSize]; // L: 3240 - var7 = Interpreter.Interpreter_intStack[WorldMapCacheName.Interpreter_intStackSize + 1]; // L: 3241 - var5 = class124.Messages_getByChannelAndID(var3, var7); // L: 3242 - if (var5 != null) { // L: 3243 - Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = var5.count; // L: 3244 - Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = var5.cycle; // L: 3245 - Interpreter.Interpreter_stringStack[++class13.Interpreter_stringStackSize - 1] = var5.sender != null ? var5.sender : ""; // L: 3246 - Interpreter.Interpreter_stringStack[++class13.Interpreter_stringStackSize - 1] = var5.prefix != null ? var5.prefix : ""; // L: 3247 - Interpreter.Interpreter_stringStack[++class13.Interpreter_stringStackSize - 1] = var5.text != null ? var5.text : ""; // L: 3248 - Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = var5.isFromFriend() ? 1 : (var5.isFromIgnored() ? 2 : 0); // L: 3249 - } else { - Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = -1; // L: 3252 - Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = 0; // L: 3253 - Interpreter.Interpreter_stringStack[++class13.Interpreter_stringStackSize - 1] = ""; // L: 3254 - Interpreter.Interpreter_stringStack[++class13.Interpreter_stringStackSize - 1] = ""; // L: 3255 - Interpreter.Interpreter_stringStack[++class13.Interpreter_stringStackSize - 1] = ""; // L: 3256 - Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = 0; // L: 3257 - } - - return 1; // L: 3259 - } else { - Message var4; - if (var0 == ScriptOpcodes.CHAT_GETHISTORY_BYUID) { // L: 3261 - var3 = Interpreter.Interpreter_intStack[--WorldMapCacheName.Interpreter_intStackSize]; // L: 3262 - var4 = Fonts.Messages_getMessage(var3); // L: 3263 - if (var4 != null) { // L: 3264 - Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = var4.type; // L: 3265 - Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = var4.cycle; // L: 3266 - Interpreter.Interpreter_stringStack[++class13.Interpreter_stringStackSize - 1] = var4.sender != null ? var4.sender : ""; // L: 3267 - Interpreter.Interpreter_stringStack[++class13.Interpreter_stringStackSize - 1] = var4.prefix != null ? var4.prefix : ""; // L: 3268 - Interpreter.Interpreter_stringStack[++class13.Interpreter_stringStackSize - 1] = var4.text != null ? var4.text : ""; // L: 3269 - Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = var4.isFromFriend() ? 1 : (var4.isFromIgnored() ? 2 : 0); // L: 3270 - } else { - Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = -1; // L: 3273 - Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = 0; // L: 3274 - Interpreter.Interpreter_stringStack[++class13.Interpreter_stringStackSize - 1] = ""; // L: 3275 - Interpreter.Interpreter_stringStack[++class13.Interpreter_stringStackSize - 1] = ""; // L: 3276 - Interpreter.Interpreter_stringStack[++class13.Interpreter_stringStackSize - 1] = ""; // L: 3277 - Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = 0; // L: 3278 - } - - return 1; // L: 3280 - } else if (var0 == ScriptOpcodes.CHAT_GETFILTER_PRIVATE) { // L: 3282 - if (AbstractArchive.privateChatMode == null) { // L: 3283 - Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = -1; - } else { - Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = AbstractArchive.privateChatMode.field3898; // L: 3284 - } - - return 1; // L: 3285 - } else { - PacketBufferNode var12; - if (var0 == ScriptOpcodes.CHAT_SENDPUBLIC) { // L: 3287 - var8 = Interpreter.Interpreter_stringStack[--class13.Interpreter_stringStackSize]; // L: 3288 - var7 = Interpreter.Interpreter_intStack[--WorldMapCacheName.Interpreter_intStackSize]; // L: 3289 - var12 = UserComparator10.method2486(var7, var8, class7.clientLanguage, -1); // L: 3290 - Client.packetWriter.addNode(var12); // L: 3291 - return 1; // L: 3292 - } else if (var0 == ScriptOpcodes.CHAT_SENDPRIVATE) { // L: 3294 - class13.Interpreter_stringStackSize -= 2; // L: 3295 - var8 = Interpreter.Interpreter_stringStack[class13.Interpreter_stringStackSize]; // L: 3296 - String var11 = Interpreter.Interpreter_stringStack[class13.Interpreter_stringStackSize + 1]; // L: 3297 - var12 = HealthBarDefinition.getPacketBufferNode(ClientPacket.field2607, Client.packetWriter.isaacCipher); // L: 3299 - var12.packetBuffer.writeShort(0); // L: 3300 - int var10 = var12.packetBuffer.offset; // L: 3301 - var12.packetBuffer.writeStringCp1252NullTerminated(var8); // L: 3302 - Occluder.method4089(var12.packetBuffer, var11); // L: 3303 - var12.packetBuffer.writeLengthShort(var12.packetBuffer.offset - var10); // L: 3304 - Client.packetWriter.addNode(var12); // L: 3305 - return 1; // L: 3306 - } else if (var0 == 5010) { // L: 3308 - var8 = Interpreter.Interpreter_stringStack[--class13.Interpreter_stringStackSize]; // L: 3309 - WorldMapCacheName.Interpreter_intStackSize -= 2; // L: 3310 - var7 = Interpreter.Interpreter_intStack[WorldMapCacheName.Interpreter_intStackSize]; // L: 3311 - var9 = Interpreter.Interpreter_intStack[WorldMapCacheName.Interpreter_intStackSize + 1]; // L: 3312 - var6 = UserComparator10.method2486(var7, var8, class7.clientLanguage, var9); // L: 3313 - Client.packetWriter.addNode(var6); // L: 3314 - return 1; // L: 3315 - } else if (var0 != ScriptOpcodes.CHAT_PLAYERNAME) { // L: 3317 - if (var0 == ScriptOpcodes.CHAT_GETFILTER_TRADE) { // L: 3324 - Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = Client.tradeChatMode; // L: 3325 - return 1; // L: 3326 - } else if (var0 == ScriptOpcodes.CHAT_GETHISTORYLENGTH) { // L: 3328 - var3 = Interpreter.Interpreter_intStack[--WorldMapCacheName.Interpreter_intStackSize]; // L: 3329 - Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = class10.Messages_getHistorySize(var3); // L: 3330 - return 1; // L: 3331 - } else if (var0 == ScriptOpcodes.CHAT_GETNEXTUID) { // L: 3333 - var3 = Interpreter.Interpreter_intStack[--WorldMapCacheName.Interpreter_intStackSize]; // L: 3334 - Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = NetCache.Messages_getLastChatID(var3); // L: 3335 - return 1; // L: 3336 - } else if (var0 == ScriptOpcodes.CHAT_GETPREVUID) { // L: 3338 - var3 = Interpreter.Interpreter_intStack[--WorldMapCacheName.Interpreter_intStackSize]; // L: 3339 - Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = class105.method2274(var3); // L: 3340 - return 1; // L: 3341 - } else if (var0 == ScriptOpcodes.DOCHEAT) { // L: 3343 - var8 = Interpreter.Interpreter_stringStack[--class13.Interpreter_stringStackSize]; // L: 3344 - class4.doCheat(var8); // L: 3345 - return 1; // L: 3346 - } else if (var0 == ScriptOpcodes.CHAT_SETMESSAGEFILTER) { // L: 3348 - Client.field843 = Interpreter.Interpreter_stringStack[--class13.Interpreter_stringStackSize].toLowerCase().trim(); // L: 3349 - return 1; // L: 3350 - } else if (var0 == ScriptOpcodes.CHAT_GETMESSAGEFILTER) { // L: 3352 - Interpreter.Interpreter_stringStack[++class13.Interpreter_stringStackSize - 1] = Client.field843; // L: 3353 - return 1; // L: 3354 - } else if (var0 == ScriptOpcodes.DEBUGMES) { // L: 3356 - var8 = Interpreter.Interpreter_stringStack[--class13.Interpreter_stringStackSize]; // L: 3357 - System.out.println(var8); // L: 3358 - return 1; // L: 3359 - } else if (var0 == 5024) { // L: 3361 - --WorldMapCacheName.Interpreter_intStackSize; // L: 3362 - return 1; // L: 3363 - } else if (var0 == 5025) { // L: 3365 - ++WorldMapCacheName.Interpreter_intStackSize; // L: 3366 - return 1; // L: 3367 - } else if (var0 == 5030) { // L: 3369 - WorldMapCacheName.Interpreter_intStackSize -= 2; // L: 3370 - var3 = Interpreter.Interpreter_intStack[WorldMapCacheName.Interpreter_intStackSize]; // L: 3371 - var7 = Interpreter.Interpreter_intStack[WorldMapCacheName.Interpreter_intStackSize + 1]; // L: 3372 - var5 = class124.Messages_getByChannelAndID(var3, var7); // L: 3373 - if (var5 != null) { // L: 3374 - Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = var5.count; // L: 3375 - Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = var5.cycle; // L: 3376 - Interpreter.Interpreter_stringStack[++class13.Interpreter_stringStackSize - 1] = var5.sender != null ? var5.sender : ""; // L: 3377 - Interpreter.Interpreter_stringStack[++class13.Interpreter_stringStackSize - 1] = var5.prefix != null ? var5.prefix : ""; // L: 3378 - Interpreter.Interpreter_stringStack[++class13.Interpreter_stringStackSize - 1] = var5.text != null ? var5.text : ""; // L: 3379 - Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = var5.isFromFriend() ? 1 : (var5.isFromIgnored() ? 2 : 0); // L: 3380 - Interpreter.Interpreter_stringStack[++class13.Interpreter_stringStackSize - 1] = ""; // L: 3381 - Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = 0; // L: 3382 - } else { - Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = -1; // L: 3385 - Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = 0; // L: 3386 - Interpreter.Interpreter_stringStack[++class13.Interpreter_stringStackSize - 1] = ""; // L: 3387 - Interpreter.Interpreter_stringStack[++class13.Interpreter_stringStackSize - 1] = ""; // L: 3388 - Interpreter.Interpreter_stringStack[++class13.Interpreter_stringStackSize - 1] = ""; // L: 3389 - Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = 0; // L: 3390 - Interpreter.Interpreter_stringStack[++class13.Interpreter_stringStackSize - 1] = ""; // L: 3391 - Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = 0; // L: 3392 - } - - return 1; // L: 3394 - } else if (var0 == 5031) { // L: 3396 - var3 = Interpreter.Interpreter_intStack[--WorldMapCacheName.Interpreter_intStackSize]; // L: 3397 - var4 = Fonts.Messages_getMessage(var3); // L: 3398 - if (var4 != null) { // L: 3399 - Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = var4.type; // L: 3400 - Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = var4.cycle; // L: 3401 - Interpreter.Interpreter_stringStack[++class13.Interpreter_stringStackSize - 1] = var4.sender != null ? var4.sender : ""; // L: 3402 - Interpreter.Interpreter_stringStack[++class13.Interpreter_stringStackSize - 1] = var4.prefix != null ? var4.prefix : ""; // L: 3403 - Interpreter.Interpreter_stringStack[++class13.Interpreter_stringStackSize - 1] = var4.text != null ? var4.text : ""; // L: 3404 - Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = var4.isFromFriend() ? 1 : (var4.isFromIgnored() ? 2 : 0); // L: 3405 - Interpreter.Interpreter_stringStack[++class13.Interpreter_stringStackSize - 1] = ""; // L: 3406 - Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = 0; // L: 3407 - } else { - Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = -1; // L: 3410 - Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = 0; // L: 3411 - Interpreter.Interpreter_stringStack[++class13.Interpreter_stringStackSize - 1] = ""; // L: 3412 - Interpreter.Interpreter_stringStack[++class13.Interpreter_stringStackSize - 1] = ""; // L: 3413 - Interpreter.Interpreter_stringStack[++class13.Interpreter_stringStackSize - 1] = ""; // L: 3414 - Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = 0; // L: 3415 - Interpreter.Interpreter_stringStack[++class13.Interpreter_stringStackSize - 1] = ""; // L: 3416 - Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = 0; // L: 3417 - } - - return 1; // L: 3419 - } else { - return 2; // L: 3421 - } - } else { - if (class35.localPlayer != null && class35.localPlayer.username != null) { // L: 3319 - var8 = class35.localPlayer.username.getName(); - } else { - var8 = ""; // L: 3320 - } - - Interpreter.Interpreter_stringStack[++class13.Interpreter_stringStackSize - 1] = var8; // L: 3321 - return 1; // L: 3322 - } - } - } - } - } + static int method1980(int var0) { + return var0 * 3 + 600; // L: 1507 } } diff --git a/runescape-client/src/main/java/SequenceDefinition.java b/runescape-client/src/main/java/SequenceDefinition.java index 3b5f251a5d..5d6a047b17 100644 --- a/runescape-client/src/main/java/SequenceDefinition.java +++ b/runescape-client/src/main/java/SequenceDefinition.java @@ -4,98 +4,98 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("fb") +@ObfuscatedName("fl") @Implements("SequenceDefinition") public class SequenceDefinition extends DualNode { - @ObfuscatedName("h") + @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "Ljp;" + descriptor = "Ljv;" ) @Export("SequenceDefinition_archive") public static AbstractArchive SequenceDefinition_archive; - @ObfuscatedName("c") + @ObfuscatedName("n") @ObfuscatedSignature( - descriptor = "Ljp;" + descriptor = "Ljv;" ) @Export("SequenceDefinition_animationsArchive") public static AbstractArchive SequenceDefinition_animationsArchive; - @ObfuscatedName("o") + @ObfuscatedName("f") @ObfuscatedSignature( - descriptor = "Ljp;" + descriptor = "Ljv;" ) @Export("SequenceDefinition_skeletonsArchive") public static AbstractArchive SequenceDefinition_skeletonsArchive; - @ObfuscatedName("g") + @ObfuscatedName("y") @ObfuscatedSignature( - descriptor = "Lho;" + descriptor = "Lhz;" ) @Export("SequenceDefinition_cached") - public static EvictingDualNodeHashTable SequenceDefinition_cached; - @ObfuscatedName("l") + static EvictingDualNodeHashTable SequenceDefinition_cached; + @ObfuscatedName("p") @ObfuscatedSignature( - descriptor = "Lho;" + descriptor = "Lhz;" ) @Export("SequenceDefinition_cachedFrames") - public static EvictingDualNodeHashTable SequenceDefinition_cachedFrames; - @ObfuscatedName("z") + static EvictingDualNodeHashTable SequenceDefinition_cachedFrames; + @ObfuscatedName("j") @Export("frameIds") public int[] frameIds; - @ObfuscatedName("t") + @ObfuscatedName("r") @Export("chatFrameIds") int[] chatFrameIds; - @ObfuscatedName("v") + @ObfuscatedName("b") @Export("frameLengths") public int[] frameLengths; - @ObfuscatedName("b") + @ObfuscatedName("d") @Export("soundEffects") public int[] soundEffects; - @ObfuscatedName("q") + @ObfuscatedName("s") @ObfuscatedGetter( - intValue = -1353705589 + intValue = 729318423 ) @Export("frameCount") public int frameCount; - @ObfuscatedName("i") - int[] field1892; - @ObfuscatedName("x") - public boolean field1898; - @ObfuscatedName("k") + @ObfuscatedName("u") + int[] field1884; + @ObfuscatedName("l") + public boolean field1882; + @ObfuscatedName("o") @ObfuscatedGetter( - intValue = 302624317 + intValue = 213844623 ) - public int field1894; - @ObfuscatedName("r") + public int field1885; + @ObfuscatedName("c") @ObfuscatedGetter( - intValue = 1963322079 + intValue = -1368426299 ) @Export("shield") public int shield; - @ObfuscatedName("p") + @ObfuscatedName("e") @ObfuscatedGetter( - intValue = 2146887017 + intValue = -234609209 ) @Export("weapon") public int weapon; + @ObfuscatedName("g") + @ObfuscatedGetter( + intValue = 692165837 + ) + public int field1888; @ObfuscatedName("a") @ObfuscatedGetter( - intValue = 964366639 + intValue = -1960140293 ) - public int field1897; - @ObfuscatedName("e") + public int field1883; + @ObfuscatedName("k") @ObfuscatedGetter( - intValue = 1889756253 + intValue = -263393733 ) - public int field1886; - @ObfuscatedName("d") + public int field1890; + @ObfuscatedName("m") @ObfuscatedGetter( - intValue = -1557873209 + intValue = -1161864623 ) - public int field1882; - @ObfuscatedName("u") - @ObfuscatedGetter( - intValue = -125818589 - ) - public int field1900; + public int field1891; static { SequenceDefinition_cached = new EvictingDualNodeHashTable(64); // L: 15 @@ -104,25 +104,25 @@ public class SequenceDefinition extends DualNode { SequenceDefinition() { this.frameCount = -1; // L: 21 - this.field1898 = false; // L: 23 - this.field1894 = 5; // L: 24 + this.field1882 = false; // L: 23 + this.field1885 = 5; // L: 24 this.shield = -1; // L: 25 this.weapon = -1; // L: 26 - this.field1897 = 99; // L: 27 - this.field1886 = -1; // L: 28 - this.field1882 = -1; // L: 29 - this.field1900 = 2; // L: 30 + this.field1888 = 99; // L: 27 + this.field1883 = -1; // L: 28 + this.field1890 = -1; // L: 29 + this.field1891 = 2; // L: 30 } // L: 32 - @ObfuscatedName("c") + @ObfuscatedName("n") @ObfuscatedSignature( - descriptor = "(Lnk;I)V", - garbageValue = "492235636" + descriptor = "(Lnd;B)V", + garbageValue = "11" ) @Export("decode") void decode(Buffer var1) { while (true) { - int var2 = var1.readUnsignedByte(); // L: 47 + int var2 = var1.readUnsignedByte(); if (var2 == 0) { // L: 48 return; // L: 51 } @@ -131,10 +131,10 @@ public class SequenceDefinition extends DualNode { } } - @ObfuscatedName("o") + @ObfuscatedName("f") @ObfuscatedSignature( - descriptor = "(Lnk;IB)V", - garbageValue = "24" + descriptor = "(Lnd;II)V", + garbageValue = "-1165284602" ) @Export("decodeNext") void decodeNext(Buffer var1, int var2) { @@ -161,29 +161,29 @@ public class SequenceDefinition extends DualNode { this.frameCount = var1.readUnsignedShort(); } else if (var2 == 3) { // L: 63 var3 = var1.readUnsignedByte(); // L: 64 - this.field1892 = new int[var3 + 1]; // L: 65 + this.field1884 = new int[var3 + 1]; // L: 65 for (var4 = 0; var4 < var3; ++var4) { // L: 66 - this.field1892[var4] = var1.readUnsignedByte(); + this.field1884[var4] = var1.readUnsignedByte(); } - this.field1892[var3] = 9999999; // L: 67 + this.field1884[var3] = 9999999; // L: 67 } else if (var2 == 4) { // L: 69 - this.field1898 = true; + this.field1882 = true; } else if (var2 == 5) { // L: 70 - this.field1894 = var1.readUnsignedByte(); + this.field1885 = var1.readUnsignedByte(); } else if (var2 == 6) { // L: 71 this.shield = var1.readUnsignedShort(); } else if (var2 == 7) { // L: 72 this.weapon = var1.readUnsignedShort(); } else if (var2 == 8) { // L: 73 - this.field1897 = var1.readUnsignedByte(); + this.field1888 = var1.readUnsignedByte(); } else if (var2 == 9) { // L: 74 - this.field1886 = var1.readUnsignedByte(); + this.field1883 = var1.readUnsignedByte(); } else if (var2 == 10) { // L: 75 - this.field1882 = var1.readUnsignedByte(); + this.field1890 = var1.readUnsignedByte(); } else if (var2 == 11) { // L: 76 - this.field1900 = var1.readUnsignedByte(); + this.field1891 = var1.readUnsignedByte(); } else if (var2 == 12) { // L: 77 var3 = var1.readUnsignedByte(); // L: 78 this.chatFrameIds = new int[var3]; // L: 79 @@ -206,40 +206,40 @@ public class SequenceDefinition extends DualNode { } // L: 89 - @ObfuscatedName("g") + @ObfuscatedName("y") @ObfuscatedSignature( - descriptor = "(B)V", - garbageValue = "-6" + descriptor = "(I)V", + garbageValue = "-1519522081" ) @Export("postDecode") void postDecode() { - if (this.field1886 == -1) { // L: 92 - if (this.field1892 != null) { // L: 93 - this.field1886 = 2; + if (this.field1883 == -1) { // L: 92 + if (this.field1884 != null) { // L: 93 + this.field1883 = 2; } else { - this.field1886 = 0; // L: 94 + this.field1883 = 0; // L: 94 } } - if (this.field1882 == -1) { // L: 96 - if (this.field1892 != null) { // L: 97 - this.field1882 = 2; + if (this.field1890 == -1) { // L: 96 + if (this.field1884 != null) { // L: 97 + this.field1890 = 2; } else { - this.field1882 = 0; // L: 98 + this.field1890 = 0; // L: 98 } } } // L: 100 - @ObfuscatedName("l") + @ObfuscatedName("p") @ObfuscatedSignature( - descriptor = "(Lgj;II)Lgj;", - garbageValue = "-668605957" + descriptor = "(Lgr;II)Lgr;", + garbageValue = "-2056462779" ) @Export("transformActorModel") public Model transformActorModel(Model var1, int var2) { var2 = this.frameIds[var2]; // L: 103 - Frames var3 = ParamComposition.getFrames(var2 >> 16); // L: 104 + Frames var3 = class69.getFrames(var2 >> 16); // L: 104 var2 &= 65535; // L: 105 if (var3 == null) { return var1.toSharedSequenceModel(true); // L: 106 @@ -250,15 +250,15 @@ public class SequenceDefinition extends DualNode { } } - @ObfuscatedName("z") + @ObfuscatedName("j") @ObfuscatedSignature( - descriptor = "(Lgj;III)Lgj;", - garbageValue = "2138325603" + descriptor = "(Lgr;IIB)Lgr;", + garbageValue = "-63" ) @Export("transformObjectModel") Model transformObjectModel(Model var1, int var2, int var3) { var2 = this.frameIds[var2]; // L: 113 - Frames var4 = ParamComposition.getFrames(var2 >> 16); // L: 114 + Frames var4 = class69.getFrames(var2 >> 16); // L: 114 var2 &= 65535; // L: 115 if (var4 == null) { // L: 116 return var1.toSharedSequenceModel(true); @@ -286,15 +286,15 @@ public class SequenceDefinition extends DualNode { } } - @ObfuscatedName("t") + @ObfuscatedName("r") @ObfuscatedSignature( - descriptor = "(Lgj;IB)Lgj;", - garbageValue = "86" + descriptor = "(Lgr;II)Lgr;", + garbageValue = "1547720783" ) @Export("transformSpotAnimationModel") Model transformSpotAnimationModel(Model var1, int var2) { var2 = this.frameIds[var2]; // L: 130 - Frames var3 = ParamComposition.getFrames(var2 >> 16); // L: 131 + Frames var3 = class69.getFrames(var2 >> 16); // L: 131 var2 &= 65535; // L: 132 if (var3 == null) { return var1.toSharedSpotAnimationModel(true); // L: 133 @@ -305,21 +305,21 @@ public class SequenceDefinition extends DualNode { } } - @ObfuscatedName("v") + @ObfuscatedName("b") @ObfuscatedSignature( - descriptor = "(Lgj;ILfb;II)Lgj;", - garbageValue = "-1845064839" + descriptor = "(Lgr;ILfl;II)Lgr;", + garbageValue = "-924612466" ) @Export("applyTransformations") public Model applyTransformations(Model var1, int var2, SequenceDefinition var3, int var4) { var2 = this.frameIds[var2]; // L: 140 - Frames var5 = ParamComposition.getFrames(var2 >> 16); // L: 141 + Frames var5 = class69.getFrames(var2 >> 16); // L: 141 var2 &= 65535; // L: 142 if (var5 == null) { // L: 143 return var3.transformActorModel(var1, var4); } else { var4 = var3.frameIds[var4]; // L: 144 - Frames var6 = ParamComposition.getFrames(var4 >> 16); // L: 145 + Frames var6 = class69.getFrames(var4 >> 16); // L: 145 var4 &= 65535; // L: 146 Model var7; if (var6 == null) { // L: 147 @@ -328,21 +328,21 @@ public class SequenceDefinition extends DualNode { return var7; // L: 150 } else { var7 = var1.toSharedSequenceModel(!var5.hasAlphaTransform(var2) & !var6.hasAlphaTransform(var4)); // L: 152 - var7.animate2(var5, var2, var6, var4, this.field1892); // L: 153 + var7.animate2(var5, var2, var6, var4, this.field1884); // L: 153 return var7; // L: 154 } } } - @ObfuscatedName("b") + @ObfuscatedName("d") @ObfuscatedSignature( - descriptor = "(Lgj;IB)Lgj;", - garbageValue = "2" + descriptor = "(Lgr;II)Lgr;", + garbageValue = "1569515982" ) @Export("transformWidgetModel") public Model transformWidgetModel(Model var1, int var2) { int var3 = this.frameIds[var2]; // L: 158 - Frames var4 = ParamComposition.getFrames(var3 >> 16); // L: 159 + Frames var4 = class69.getFrames(var3 >> 16); // L: 159 var3 &= 65535; // L: 160 if (var4 == null) { // L: 161 return var1.toSharedSequenceModel(true); @@ -351,7 +351,7 @@ public class SequenceDefinition extends DualNode { int var6 = 0; // L: 163 if (this.chatFrameIds != null && var2 < this.chatFrameIds.length) { // L: 164 var6 = this.chatFrameIds[var2]; // L: 165 - var5 = ParamComposition.getFrames(var6 >> 16); // L: 166 + var5 = class69.getFrames(var6 >> 16); // L: 166 var6 &= 65535; // L: 167 } @@ -369,181 +369,61 @@ public class SequenceDefinition extends DualNode { } } - @ObfuscatedName("c") + @ObfuscatedName("f") @ObfuscatedSignature( - descriptor = "(Ljp;III)Lof;", - garbageValue = "-6114463" + descriptor = "(II)I", + garbageValue = "2003025544" ) - static IndexedSprite method3091(AbstractArchive var0, int var1, int var2) { - return !Username.method5711(var0, var1, var2) ? null : GraphicsObject.method1938(); // L: 52 53 + public static int method3149(int var0) { + var0 = (var0 & 1431655765) + (var0 >>> 1 & 1431655765); // L: 42 + var0 = (var0 >>> 2 & 858993459) + (var0 & 858993459); // L: 43 + var0 = var0 + (var0 >>> 4) & 252645135; // L: 44 + var0 += var0 >>> 8; // L: 45 + var0 += var0 >>> 16; // L: 46 + return var0 & 255; // L: 47 } - @ObfuscatedName("o") + @ObfuscatedName("kq") @ObfuscatedSignature( - descriptor = "([BI)[B", - garbageValue = "1309555794" + descriptor = "(Lio;I)Z", + garbageValue = "376048815" ) - static byte[] method3087(byte[] var0) { - int var1 = var0.length; // L: 35 - byte[] var2 = new byte[var1]; // L: 36 - System.arraycopy(var0, 0, var2, 0, var1); // L: 37 - return var2; // L: 38 - } - - @ObfuscatedName("he") - @ObfuscatedSignature( - descriptor = "(Lnm;B)V", - garbageValue = "1" - ) - static final void method3086(PacketBuffer var0) { - for (int var1 = 0; var1 < Client.field661; ++var1) { // L: 7698 - int var2 = Client.field662[var1]; // L: 7699 - NPC var3 = Client.npcs[var2]; // L: 7700 - int var4 = var0.readUnsignedByte(); // L: 7701 - int var5; - int var6; - int var7; - if ((var4 & 32) != 0) { // L: 7702 - var5 = var0.method6620(); // L: 7703 - if (var5 == 65535) { // L: 7704 - var5 = -1; - } - - var6 = var0.method6478(); // L: 7705 - if (var5 == var3.sequence && var5 != -1) { // L: 7706 - var7 = Player.SequenceDefinition_get(var5).field1900; // L: 7707 - if (var7 == 1) { // L: 7708 - var3.sequenceFrame = 0; // L: 7709 - var3.sequenceFrameCycle = 0; // L: 7710 - var3.sequenceDelay = var6; // L: 7711 - var3.field1244 = 0; // L: 7712 - } - - if (var7 == 2) { // L: 7714 - var3.field1244 = 0; // L: 7715 - } - } else if (var5 == -1 || var3.sequence == -1 || Player.SequenceDefinition_get(var5).field1894 >= Player.SequenceDefinition_get(var3.sequence).field1894) { // L: 7718 - var3.sequence = var5; // L: 7719 - var3.sequenceFrame = 0; // L: 7720 - var3.sequenceFrameCycle = 0; // L: 7721 - var3.sequenceDelay = var6; // L: 7722 - var3.field1244 = 0; // L: 7723 - var3.field1215 = var3.pathLength; // L: 7724 - } + static final boolean method3148(Widget var0) { + int var1 = var0.contentType; // L: 11093 + if (var1 == 205) { // L: 11094 + Client.logoutTimer = 250; // L: 11095 + return true; // L: 11096 + } else { + int var2; + int var3; + if (var1 >= 300 && var1 <= 313) { // L: 11098 + var2 = (var1 - 300) / 2; // L: 11099 + var3 = var1 & 1; // L: 11100 + Client.playerAppearance.changeAppearance(var2, var3 == 1); // L: 11101 } - int var8; - if ((var4 & 8) != 0) { // L: 7728 - var5 = var0.method6648(); // L: 7729 - var6 = var0.readUnsignedShort(); // L: 7730 - var7 = var3.x - (var5 - JagexCache.baseX - JagexCache.baseX) * 64; // L: 7731 - var8 = var3.y - (var6 - Messages.baseY - Messages.baseY) * 64; // L: 7732 - if (var7 != 0 || var8 != 0) { // L: 7733 - var3.field1247 = (int)(Math.atan2((double)var7, (double)var8) * 325.949D) & 2047; - } + if (var1 >= 314 && var1 <= 323) { // L: 11103 + var2 = (var1 - 314) / 2; // L: 11104 + var3 = var1 & 1; // L: 11105 + Client.playerAppearance.method4703(var2, var3 == 1); // L: 11106 } - if ((var4 & 2) != 0) { // L: 7735 - var3.definition = class8.getNpcDefinition(var0.method6620()); // L: 7736 - var3.field1211 = var3.definition.size; // L: 7737 - var3.field1261 = var3.definition.rotation; // L: 7738 - var3.walkSequence = var3.definition.walkSequence; // L: 7739 - var3.walkBackSequence = var3.definition.walkBackSequence; // L: 7740 - var3.walkLeftSequence = var3.definition.walkLeftSequence; // L: 7741 - var3.walkRightSequence = var3.definition.walkRightSequence; // L: 7742 - var3.idleSequence = var3.definition.idleSequence; // L: 7743 - var3.turnLeftSequence = var3.definition.turnLeftSequence; // L: 7744 - var3.turnRightSequence = var3.definition.turnRightSequence; // L: 7745 + if (var1 == 324) { // L: 11108 + Client.playerAppearance.changeSex(false); } - if ((var4 & 1) != 0) { // L: 7747 - var3.targetIndex = var0.method6620(); // L: 7748 - if (var3.targetIndex == 65535) { // L: 7749 - var3.targetIndex = -1; - } + if (var1 == 325) { // L: 11109 + Client.playerAppearance.changeSex(true); } - if ((var4 & 128) != 0) { // L: 7751 - var3.field1236 = var0.method6530(); // L: 7752 - var3.field1252 = var0.method6530(); // L: 7753 - var3.field1251 = var0.method6526(); // L: 7754 - var3.field1253 = var0.method6480(); // L: 7755 - var3.field1254 = var0.method6486() + Client.cycle; // L: 7756 - var3.field1237 = var0.method6620() + Client.cycle; // L: 7757 - var3.field1256 = var0.method6486(); // L: 7758 - var3.pathLength = 1; // L: 7759 - var3.field1215 = 0; // L: 7760 - var3.field1236 += var3.pathX[0]; // L: 7761 - var3.field1252 += var3.pathY[0]; // L: 7762 - var3.field1251 += var3.pathX[0]; // L: 7763 - var3.field1253 += var3.pathY[0]; // L: 7764 - } - - if ((var4 & 64) != 0) { // L: 7766 - var5 = var0.method6478(); // L: 7767 - int var9; - int var10; - int var11; - if (var5 > 0) { // L: 7768 - for (var6 = 0; var6 < var5; ++var6) { // L: 7769 - var8 = -1; // L: 7771 - var9 = -1; // L: 7772 - var10 = -1; // L: 7773 - var7 = var0.readUShortSmart(); // L: 7774 - if (var7 == 32767) { // L: 7775 - var7 = var0.readUShortSmart(); // L: 7776 - var9 = var0.readUShortSmart(); // L: 7777 - var8 = var0.readUShortSmart(); // L: 7778 - var10 = var0.readUShortSmart(); // L: 7779 - } else if (var7 != 32766) { // L: 7781 - var9 = var0.readUShortSmart(); // L: 7782 - } else { - var7 = -1; // L: 7784 - } - - var11 = var0.readUShortSmart(); // L: 7785 - var3.addHitSplat(var7, var9, var8, var10, Client.cycle, var11); // L: 7786 - } - } - - var6 = var0.method6477(); // L: 7789 - if (var6 > 0) { // L: 7790 - for (var7 = 0; var7 < var6; ++var7) { // L: 7791 - var8 = var0.readUShortSmart(); // L: 7792 - var9 = var0.readUShortSmart(); // L: 7793 - if (var9 != 32767) { // L: 7794 - var10 = var0.readUShortSmart(); // L: 7795 - var11 = var0.method6477(); // L: 7796 - int var12 = var9 > 0 ? var0.method6478() : var11; // L: 7797 - var3.addHealthBar(var8, Client.cycle, var9, var10, var11, var12); // L: 7798 - } else { - var3.removeHealthBar(var8); // L: 7800 - } - } - } - } - - if ((var4 & 4) != 0) { // L: 7804 - var3.spotAnimation = var0.method6648(); // L: 7805 - var5 = var0.method6428(); // L: 7806 - var3.field1224 = var5 >> 16; // L: 7807 - var3.field1243 = (var5 & 65535) + Client.cycle; // L: 7808 - var3.spotAnimationFrame = 0; // L: 7809 - var3.spotAnimationFrameCycle = 0; // L: 7810 - if (var3.field1243 > Client.cycle) { // L: 7811 - var3.spotAnimationFrame = -1; - } - - if (var3.spotAnimation == 65535) { // L: 7812 - var3.spotAnimation = -1; - } - } - - if ((var4 & 16) != 0) { // L: 7814 - var3.overheadText = var0.readStringCp1252NullTerminated(); // L: 7815 - var3.overheadTextCyclesRemaining = 100; // L: 7816 + if (var1 == 326) { // L: 11110 + PacketBufferNode var4 = class21.getPacketBufferNode(ClientPacket.field2674, Client.packetWriter.isaacCipher); // L: 11112 + Client.playerAppearance.write(var4.packetBuffer); // L: 11113 + Client.packetWriter.addNode(var4); // L: 11114 + return true; // L: 11115 + } else { + return false; // L: 11117 } } - - } // L: 7819 + } } diff --git a/runescape-client/src/main/java/ServerPacket.java b/runescape-client/src/main/java/ServerPacket.java index 0606cb098a..f686921f2b 100644 --- a/runescape-client/src/main/java/ServerPacket.java +++ b/runescape-client/src/main/java/ServerPacket.java @@ -4,593 +4,599 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("hs") +@ObfuscatedName("hl") @Implements("ServerPacket") public class ServerPacket { - @ObfuscatedName("h") - @ObfuscatedSignature( - descriptor = "Lhs;" - ) - public static final ServerPacket field2774; - @ObfuscatedName("c") - @ObfuscatedSignature( - descriptor = "Lhs;" - ) - public static final ServerPacket field2750; - @ObfuscatedName("o") - @ObfuscatedSignature( - descriptor = "Lhs;" - ) - public static final ServerPacket field2744; - @ObfuscatedName("g") - @ObfuscatedSignature( - descriptor = "Lhs;" - ) - public static final ServerPacket field2711; - @ObfuscatedName("l") - @ObfuscatedSignature( - descriptor = "Lhs;" - ) - public static final ServerPacket field2703; - @ObfuscatedName("z") - @ObfuscatedSignature( - descriptor = "Lhs;" - ) - public static final ServerPacket field2704; - @ObfuscatedName("t") - @ObfuscatedSignature( - descriptor = "Lhs;" - ) - public static final ServerPacket field2738; @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "Lhs;" - ) - public static final ServerPacket field2762; - @ObfuscatedName("b") - @ObfuscatedSignature( - descriptor = "Lhs;" - ) - public static final ServerPacket field2707; - @ObfuscatedName("q") - @ObfuscatedSignature( - descriptor = "Lhs;" - ) - public static final ServerPacket field2708; - @ObfuscatedName("i") - @ObfuscatedSignature( - descriptor = "Lhs;" - ) - public static final ServerPacket field2709; - @ObfuscatedName("x") - @ObfuscatedSignature( - descriptor = "Lhs;" - ) - public static final ServerPacket field2710; - @ObfuscatedName("k") - @ObfuscatedSignature( - descriptor = "Lhs;" - ) - public static final ServerPacket field2742; - @ObfuscatedName("r") - @ObfuscatedSignature( - descriptor = "Lhs;" - ) - public static final ServerPacket field2712; - @ObfuscatedName("p") - @ObfuscatedSignature( - descriptor = "Lhs;" - ) - public static final ServerPacket field2713; - @ObfuscatedName("a") - @ObfuscatedSignature( - descriptor = "Lhs;" - ) - public static final ServerPacket field2714; - @ObfuscatedName("e") - @ObfuscatedSignature( - descriptor = "Lhs;" - ) - public static final ServerPacket field2715; - @ObfuscatedName("d") - @ObfuscatedSignature( - descriptor = "Lhs;" - ) - public static final ServerPacket field2716; - @ObfuscatedName("u") - @ObfuscatedSignature( - descriptor = "Lhs;" - ) - public static final ServerPacket field2729; - @ObfuscatedName("m") - @ObfuscatedSignature( - descriptor = "Lhs;" - ) - public static final ServerPacket field2787; - @ObfuscatedName("j") - @ObfuscatedSignature( - descriptor = "Lhs;" - ) - public static final ServerPacket field2767; - @ObfuscatedName("f") - @ObfuscatedSignature( - descriptor = "Lhs;" - ) - public static final ServerPacket field2720; - @ObfuscatedName("s") - @ObfuscatedSignature( - descriptor = "Lhs;" - ) - public static final ServerPacket field2721; - @ObfuscatedName("y") - @ObfuscatedSignature( - descriptor = "Lhs;" - ) - public static final ServerPacket field2699; - @ObfuscatedName("w") - @ObfuscatedSignature( - descriptor = "Lhs;" - ) - public static final ServerPacket field2723; - @ObfuscatedName("n") - @ObfuscatedSignature( - descriptor = "Lhs;" - ) - public static final ServerPacket field2724; - @ObfuscatedName("ag") - @ObfuscatedSignature( - descriptor = "Lhs;" - ) - public static final ServerPacket field2771; - @ObfuscatedName("ae") - @ObfuscatedSignature( - descriptor = "Lhs;" - ) - public static final ServerPacket field2726; - @ObfuscatedName("ao") - @ObfuscatedSignature( - descriptor = "Lhs;" - ) - public static final ServerPacket field2727; - @ObfuscatedName("aj") - @ObfuscatedSignature( - descriptor = "Lhs;" - ) - public static final ServerPacket field2725; - @ObfuscatedName("aw") - @ObfuscatedSignature( - descriptor = "Lhs;" - ) - public static final ServerPacket field2700; - @ObfuscatedName("at") - @ObfuscatedSignature( - descriptor = "Lhs;" - ) - public static final ServerPacket field2730; - @ObfuscatedName("av") - @ObfuscatedSignature( - descriptor = "Lhs;" - ) - public static final ServerPacket field2731; - @ObfuscatedName("al") - @ObfuscatedSignature( - descriptor = "Lhs;" - ) - public static final ServerPacket field2732; - @ObfuscatedName("ap") - @ObfuscatedSignature( - descriptor = "Lhs;" - ) - public static final ServerPacket field2722; - @ObfuscatedName("am") - @ObfuscatedSignature( - descriptor = "Lhs;" - ) - public static final ServerPacket field2737; - @ObfuscatedName("ax") - @ObfuscatedSignature( - descriptor = "Lhs;" - ) - public static final ServerPacket field2735; - @ObfuscatedName("ak") - @ObfuscatedSignature( - descriptor = "Lhs;" - ) - public static final ServerPacket field2736; - @ObfuscatedName("ay") - @ObfuscatedSignature( - descriptor = "Lhs;" - ) - public static final ServerPacket field2734; - @ObfuscatedName("ai") - @ObfuscatedSignature( - descriptor = "Lhs;" - ) - public static final ServerPacket field2757; - @ObfuscatedName("aa") - @ObfuscatedSignature( - descriptor = "Lhs;" - ) - public static final ServerPacket field2739; - @ObfuscatedName("au") - @ObfuscatedSignature( - descriptor = "Lhs;" - ) - public static final ServerPacket field2741; - @ObfuscatedName("as") - @ObfuscatedSignature( - descriptor = "Lhs;" - ) - public static final ServerPacket field2740; - @ObfuscatedName("ad") - @ObfuscatedSignature( - descriptor = "Lhs;" - ) - public static final ServerPacket field2781; - @ObfuscatedName("ac") - @ObfuscatedSignature( - descriptor = "Lhs;" - ) - public static final ServerPacket field2743; - @ObfuscatedName("az") - @ObfuscatedSignature( - descriptor = "Lhs;" - ) - public static final ServerPacket field2702; - @ObfuscatedName("aq") - @ObfuscatedSignature( - descriptor = "Lhs;" - ) - public static final ServerPacket field2745; - @ObfuscatedName("ab") - @ObfuscatedSignature( - descriptor = "Lhs;" - ) - public static final ServerPacket field2772; - @ObfuscatedName("ar") - @ObfuscatedSignature( - descriptor = "Lhs;" - ) - public static final ServerPacket field2747; - @ObfuscatedName("ah") - @ObfuscatedSignature( - descriptor = "Lhs;" - ) - public static final ServerPacket field2748; - @ObfuscatedName("af") - @ObfuscatedSignature( - descriptor = "Lhs;" - ) - public static final ServerPacket field2749; - @ObfuscatedName("an") - @ObfuscatedSignature( - descriptor = "Lhs;" - ) - public static final ServerPacket field2746; - @ObfuscatedName("bd") - @ObfuscatedSignature( - descriptor = "Lhs;" - ) - public static final ServerPacket field2733; - @ObfuscatedName("bw") - @ObfuscatedSignature( - descriptor = "Lhs;" - ) - public static final ServerPacket field2719; - @ObfuscatedName("bf") - @ObfuscatedSignature( - descriptor = "Lhs;" - ) - public static final ServerPacket field2753; - @ObfuscatedName("bu") - @ObfuscatedSignature( - descriptor = "Lhs;" - ) - public static final ServerPacket field2754; - @ObfuscatedName("bb") - @ObfuscatedSignature( - descriptor = "Lhs;" - ) - public static final ServerPacket field2755; - @ObfuscatedName("bk") - @ObfuscatedSignature( - descriptor = "Lhs;" - ) - public static final ServerPacket field2756; - @ObfuscatedName("bt") - @ObfuscatedSignature( - descriptor = "Lhs;" - ) - public static final ServerPacket field2769; - @ObfuscatedName("by") - @ObfuscatedSignature( - descriptor = "Lhs;" - ) - public static final ServerPacket field2758; - @ObfuscatedName("bz") - @ObfuscatedSignature( - descriptor = "Lhs;" - ) - public static final ServerPacket field2759; - @ObfuscatedName("br") - @ObfuscatedSignature( - descriptor = "Lhs;" - ) - public static final ServerPacket field2763; - @ObfuscatedName("bm") - @ObfuscatedSignature( - descriptor = "Lhs;" - ) - public static final ServerPacket field2761; - @ObfuscatedName("bn") - @ObfuscatedSignature( - descriptor = "Lhs;" - ) - public static final ServerPacket field2718; - @ObfuscatedName("ba") - @ObfuscatedSignature( - descriptor = "Lhs;" - ) - public static final ServerPacket field2752; - @ObfuscatedName("bg") - @ObfuscatedSignature( - descriptor = "Lhs;" - ) - public static final ServerPacket field2764; - @ObfuscatedName("bi") - @ObfuscatedSignature( - descriptor = "Lhs;" - ) - public static final ServerPacket field2765; - @ObfuscatedName("bp") - @ObfuscatedSignature( - descriptor = "Lhs;" - ) - public static final ServerPacket field2766; - @ObfuscatedName("bj") - @ObfuscatedSignature( - descriptor = "Lhs;" - ) - public static final ServerPacket field2701; - @ObfuscatedName("be") - @ObfuscatedSignature( - descriptor = "Lhs;" - ) - public static final ServerPacket field2768; - @ObfuscatedName("bs") - @ObfuscatedSignature( - descriptor = "Lhs;" - ) - public static final ServerPacket field2728; - @ObfuscatedName("bx") - @ObfuscatedSignature( - descriptor = "Lhs;" - ) - public static final ServerPacket field2770; - @ObfuscatedName("bv") - @ObfuscatedSignature( - descriptor = "Lhs;" - ) - public static final ServerPacket field2795; - @ObfuscatedName("bh") - @ObfuscatedSignature( - descriptor = "Lhs;" - ) - public static final ServerPacket field2794; - @ObfuscatedName("bl") - @ObfuscatedSignature( - descriptor = "Lhs;" - ) - public static final ServerPacket field2773; - @ObfuscatedName("bc") - @ObfuscatedSignature( - descriptor = "Lhs;" + descriptor = "Lhl;" ) public static final ServerPacket field2780; - @ObfuscatedName("bo") + @ObfuscatedName("n") @ObfuscatedSignature( - descriptor = "Lhs;" - ) - public static final ServerPacket field2775; - @ObfuscatedName("bq") - @ObfuscatedSignature( - descriptor = "Lhs;" - ) - public static final ServerPacket field2776; - @ObfuscatedName("cm") - @ObfuscatedSignature( - descriptor = "Lhs;" - ) - public static final ServerPacket field2777; - @ObfuscatedName("ch") - @ObfuscatedSignature( - descriptor = "Lhs;" - ) - public static final ServerPacket field2778; - @ObfuscatedName("cu") - @ObfuscatedSignature( - descriptor = "Lhs;" - ) - public static final ServerPacket field2779; - @ObfuscatedName("ce") - @ObfuscatedSignature( - descriptor = "Lhs;" - ) - public static final ServerPacket field2760; - @ObfuscatedName("cn") - @ObfuscatedSignature( - descriptor = "Lhs;" - ) - public static final ServerPacket field2705; - @ObfuscatedName("cc") - @ObfuscatedSignature( - descriptor = "Lhs;" - ) - public static final ServerPacket field2782; - @ObfuscatedName("ck") - @ObfuscatedSignature( - descriptor = "Lhs;" - ) - public static final ServerPacket field2783; - @ObfuscatedName("cx") - @ObfuscatedSignature( - descriptor = "Lhs;" - ) - public static final ServerPacket field2784; - @ObfuscatedName("ci") - @ObfuscatedSignature( - descriptor = "Lhs;" - ) - public static final ServerPacket field2785; - @ObfuscatedName("cf") - @ObfuscatedSignature( - descriptor = "Lhs;" - ) - public static final ServerPacket field2786; - @ObfuscatedName("cq") - @ObfuscatedSignature( - descriptor = "Lhs;" + descriptor = "Lhl;" ) public static final ServerPacket field2751; - @ObfuscatedName("cs") + @ObfuscatedName("f") @ObfuscatedSignature( - descriptor = "Lhs;" + descriptor = "Lhl;" ) - public static final ServerPacket field2788; - @ObfuscatedName("cd") + public static final ServerPacket field2702; + @ObfuscatedName("y") @ObfuscatedSignature( - descriptor = "Lhs;" + descriptor = "Lhl;" + ) + public static final ServerPacket field2703; + @ObfuscatedName("p") + @ObfuscatedSignature( + descriptor = "Lhl;" + ) + public static final ServerPacket field2704; + @ObfuscatedName("j") + @ObfuscatedSignature( + descriptor = "Lhl;" + ) + public static final ServerPacket field2705; + @ObfuscatedName("r") + @ObfuscatedSignature( + descriptor = "Lhl;" + ) + public static final ServerPacket field2706; + @ObfuscatedName("b") + @ObfuscatedSignature( + descriptor = "Lhl;" + ) + public static final ServerPacket field2798; + @ObfuscatedName("d") + @ObfuscatedSignature( + descriptor = "Lhl;" + ) + public static final ServerPacket field2708; + @ObfuscatedName("s") + @ObfuscatedSignature( + descriptor = "Lhl;" + ) + public static final ServerPacket field2785; + @ObfuscatedName("u") + @ObfuscatedSignature( + descriptor = "Lhl;" + ) + public static final ServerPacket field2729; + @ObfuscatedName("l") + @ObfuscatedSignature( + descriptor = "Lhl;" + ) + public static final ServerPacket field2711; + @ObfuscatedName("o") + @ObfuscatedSignature( + descriptor = "Lhl;" + ) + public static final ServerPacket field2748; + @ObfuscatedName("c") + @ObfuscatedSignature( + descriptor = "Lhl;" + ) + public static final ServerPacket field2713; + @ObfuscatedName("e") + @ObfuscatedSignature( + descriptor = "Lhl;" + ) + public static final ServerPacket field2714; + @ObfuscatedName("g") + @ObfuscatedSignature( + descriptor = "Lhl;" + ) + public static final ServerPacket field2760; + @ObfuscatedName("a") + @ObfuscatedSignature( + descriptor = "Lhl;" + ) + public static final ServerPacket field2716; + @ObfuscatedName("k") + @ObfuscatedSignature( + descriptor = "Lhl;" + ) + public static final ServerPacket field2717; + @ObfuscatedName("m") + @ObfuscatedSignature( + descriptor = "Lhl;" + ) + public static final ServerPacket field2746; + @ObfuscatedName("x") + @ObfuscatedSignature( + descriptor = "Lhl;" + ) + public static final ServerPacket field2719; + @ObfuscatedName("z") + @ObfuscatedSignature( + descriptor = "Lhl;" + ) + public static final ServerPacket field2709; + @ObfuscatedName("w") + @ObfuscatedSignature( + descriptor = "Lhl;" + ) + public static final ServerPacket field2721; + @ObfuscatedName("t") + @ObfuscatedSignature( + descriptor = "Lhl;" + ) + public static final ServerPacket field2715; + @ObfuscatedName("h") + @ObfuscatedSignature( + descriptor = "Lhl;" + ) + public static final ServerPacket field2723; + @ObfuscatedName("q") + @ObfuscatedSignature( + descriptor = "Lhl;" + ) + public static final ServerPacket field2724; + @ObfuscatedName("i") + @ObfuscatedSignature( + descriptor = "Lhl;" + ) + public static final ServerPacket field2725; + @ObfuscatedName("ae") + @ObfuscatedSignature( + descriptor = "Lhl;" + ) + public static final ServerPacket field2726; + @ObfuscatedName("ap") + @ObfuscatedSignature( + descriptor = "Lhl;" + ) + public static final ServerPacket field2775; + @ObfuscatedName("ab") + @ObfuscatedSignature( + descriptor = "Lhl;" + ) + public static final ServerPacket field2756; + @ObfuscatedName("al") + @ObfuscatedSignature( + descriptor = "Lhl;" + ) + public static final ServerPacket field2722; + @ObfuscatedName("ad") + @ObfuscatedSignature( + descriptor = "Lhl;" + ) + public static final ServerPacket field2764; + @ObfuscatedName("ai") + @ObfuscatedSignature( + descriptor = "Lhl;" + ) + public static final ServerPacket field2731; + @ObfuscatedName("ar") + @ObfuscatedSignature( + descriptor = "Lhl;" + ) + public static final ServerPacket field2712; + @ObfuscatedName("ag") + @ObfuscatedSignature( + descriptor = "Lhl;" + ) + public static final ServerPacket field2795; + @ObfuscatedName("ax") + @ObfuscatedSignature( + descriptor = "Lhl;" + ) + public static final ServerPacket field2734; + @ObfuscatedName("as") + @ObfuscatedSignature( + descriptor = "Lhl;" + ) + public static final ServerPacket field2735; + @ObfuscatedName("aj") + @ObfuscatedSignature( + descriptor = "Lhl;" + ) + public static final ServerPacket field2700; + @ObfuscatedName("am") + @ObfuscatedSignature( + descriptor = "Lhl;" + ) + public static final ServerPacket field2737; + @ObfuscatedName("az") + @ObfuscatedSignature( + descriptor = "Lhl;" + ) + public static final ServerPacket field2749; + @ObfuscatedName("av") + @ObfuscatedSignature( + descriptor = "Lhl;" + ) + public static final ServerPacket field2739; + @ObfuscatedName("ac") + @ObfuscatedSignature( + descriptor = "Lhl;" + ) + public static final ServerPacket field2740; + @ObfuscatedName("at") + @ObfuscatedSignature( + descriptor = "Lhl;" + ) + public static final ServerPacket field2741; + @ObfuscatedName("ah") + @ObfuscatedSignature( + descriptor = "Lhl;" + ) + public static final ServerPacket field2742; + @ObfuscatedName("ao") + @ObfuscatedSignature( + descriptor = "Lhl;" + ) + public static final ServerPacket field2743; + @ObfuscatedName("aq") + @ObfuscatedSignature( + descriptor = "Lhl;" + ) + public static final ServerPacket field2744; + @ObfuscatedName("aw") + @ObfuscatedSignature( + descriptor = "Lhl;" + ) + public static final ServerPacket field2745; + @ObfuscatedName("af") + @ObfuscatedSignature( + descriptor = "Lhl;" + ) + public static final ServerPacket field2774; + @ObfuscatedName("ak") + @ObfuscatedSignature( + descriptor = "Lhl;" + ) + public static final ServerPacket field2732; + @ObfuscatedName("ay") + @ObfuscatedSignature( + descriptor = "Lhl;" + ) + public static final ServerPacket field2773; + @ObfuscatedName("aa") + @ObfuscatedSignature( + descriptor = "Lhl;" + ) + public static final ServerPacket field2738; + @ObfuscatedName("au") + @ObfuscatedSignature( + descriptor = "Lhl;" + ) + public static final ServerPacket field2750; + @ObfuscatedName("an") + @ObfuscatedSignature( + descriptor = "Lhl;" + ) + public static final ServerPacket field2747; + @ObfuscatedName("bd") + @ObfuscatedSignature( + descriptor = "Lhl;" + ) + public static final ServerPacket field2752; + @ObfuscatedName("bt") + @ObfuscatedSignature( + descriptor = "Lhl;" + ) + public static final ServerPacket field2753; + @ObfuscatedName("bq") + @ObfuscatedSignature( + descriptor = "Lhl;" + ) + public static final ServerPacket field2754; + @ObfuscatedName("bu") + @ObfuscatedSignature( + descriptor = "Lhl;" + ) + public static final ServerPacket field2755; + @ObfuscatedName("bl") + @ObfuscatedSignature( + descriptor = "Lhl;" + ) + public static final ServerPacket field2757; + @ObfuscatedName("bv") + @ObfuscatedSignature( + descriptor = "Lhl;" ) public static final ServerPacket field2789; - @ObfuscatedName("ct") + @ObfuscatedName("bm") @ObfuscatedSignature( - descriptor = "Lhs;" + descriptor = "Lhl;" ) - public static final ServerPacket field2790; - @ObfuscatedName("co") + public static final ServerPacket field2710; + @ObfuscatedName("bz") @ObfuscatedSignature( - descriptor = "Lhs;" + descriptor = "Lhl;" ) - public static final ServerPacket field2791; - @ObfuscatedName("cz") + public static final ServerPacket field2759; + @ObfuscatedName("bh") @ObfuscatedSignature( - descriptor = "Lhs;" - ) - public static final ServerPacket field2792; - @ObfuscatedName("cl") - @ObfuscatedSignature( - descriptor = "Lhs;" + descriptor = "Lhl;" ) public static final ServerPacket field2793; + @ObfuscatedName("bs") + @ObfuscatedSignature( + descriptor = "Lhl;" + ) + public static final ServerPacket field2761; + @ObfuscatedName("br") + @ObfuscatedSignature( + descriptor = "Lhl;" + ) + public static final ServerPacket field2762; + @ObfuscatedName("bf") + @ObfuscatedSignature( + descriptor = "Lhl;" + ) + public static final ServerPacket field2763; + @ObfuscatedName("ba") + @ObfuscatedSignature( + descriptor = "Lhl;" + ) + public static final ServerPacket field2787; + @ObfuscatedName("be") + @ObfuscatedSignature( + descriptor = "Lhl;" + ) + public static final ServerPacket field2765; + @ObfuscatedName("bj") + @ObfuscatedSignature( + descriptor = "Lhl;" + ) + public static final ServerPacket field2784; + @ObfuscatedName("bx") + @ObfuscatedSignature( + descriptor = "Lhl;" + ) + public static final ServerPacket field2767; + @ObfuscatedName("bp") + @ObfuscatedSignature( + descriptor = "Lhl;" + ) + public static final ServerPacket field2730; + @ObfuscatedName("bn") + @ObfuscatedSignature( + descriptor = "Lhl;" + ) + public static final ServerPacket field2769; + @ObfuscatedName("bo") + @ObfuscatedSignature( + descriptor = "Lhl;" + ) + public static final ServerPacket field2770; + @ObfuscatedName("bw") + @ObfuscatedSignature( + descriptor = "Lhl;" + ) + public static final ServerPacket field2771; + @ObfuscatedName("bi") + @ObfuscatedSignature( + descriptor = "Lhl;" + ) + public static final ServerPacket field2772; + @ObfuscatedName("bb") + @ObfuscatedSignature( + descriptor = "Lhl;" + ) + public static final ServerPacket field2768; + @ObfuscatedName("bk") + @ObfuscatedSignature( + descriptor = "Lhl;" + ) + public static final ServerPacket field2701; + @ObfuscatedName("bg") + @ObfuscatedSignature( + descriptor = "Lhl;" + ) + public static final ServerPacket field2718; + @ObfuscatedName("by") + @ObfuscatedSignature( + descriptor = "Lhl;" + ) + public static final ServerPacket field2776; + @ObfuscatedName("bc") + @ObfuscatedSignature( + descriptor = "Lhl;" + ) + public static final ServerPacket field2777; + @ObfuscatedName("cd") + @ObfuscatedSignature( + descriptor = "Lhl;" + ) + public static final ServerPacket field2778; + @ObfuscatedName("cm") + @ObfuscatedSignature( + descriptor = "Lhl;" + ) + public static final ServerPacket field2779; + @ObfuscatedName("cv") + @ObfuscatedSignature( + descriptor = "Lhl;" + ) + public static final ServerPacket field2794; @ObfuscatedName("cp") + @ObfuscatedSignature( + descriptor = "Lhl;" + ) + public static final ServerPacket field2781; + @ObfuscatedName("ci") + @ObfuscatedSignature( + descriptor = "Lhl;" + ) + public static final ServerPacket field2782; + @ObfuscatedName("ct") + @ObfuscatedSignature( + descriptor = "Lhl;" + ) + public static final ServerPacket field2783; + @ObfuscatedName("cq") + @ObfuscatedSignature( + descriptor = "Lhl;" + ) + public static final ServerPacket field2727; + @ObfuscatedName("cr") + @ObfuscatedSignature( + descriptor = "Lhl;" + ) + public static final ServerPacket field2728; + @ObfuscatedName("cf") + @ObfuscatedSignature( + descriptor = "Lhl;" + ) + public static final ServerPacket field2786; + @ObfuscatedName("cn") + @ObfuscatedSignature( + descriptor = "Lhl;" + ) + public static final ServerPacket field2707; + @ObfuscatedName("cs") + @ObfuscatedSignature( + descriptor = "Lhl;" + ) + public static final ServerPacket field2788; + @ObfuscatedName("cg") + @ObfuscatedSignature( + descriptor = "Lhl;" + ) + public static final ServerPacket field2766; + @ObfuscatedName("co") + @ObfuscatedSignature( + descriptor = "Lhl;" + ) + public static final ServerPacket field2790; + @ObfuscatedName("ck") + @ObfuscatedSignature( + descriptor = "Lhl;" + ) + public static final ServerPacket field2791; + @ObfuscatedName("cj") + @ObfuscatedSignature( + descriptor = "Lhl;" + ) + public static final ServerPacket field2792; + @ObfuscatedName("cc") + @ObfuscatedSignature( + descriptor = "Lhl;" + ) + public static final ServerPacket field2720; + @ObfuscatedName("cu") + @ObfuscatedSignature( + descriptor = "Lhl;" + ) + public static final ServerPacket field2736; + @ObfuscatedName("fm") + @ObfuscatedSignature( + descriptor = "Ldo;" + ) + @Export("urlRequester") + static UrlRequester urlRequester; + @ObfuscatedName("cz") @ObfuscatedGetter( - intValue = -1354398359 + intValue = -1581409905 ) @Export("id") public final int id; - @ObfuscatedName("cr") + @ObfuscatedName("cb") @ObfuscatedGetter( - intValue = 207589923 + intValue = -17713621 ) @Export("length") public final int length; static { - field2774 = new ServerPacket(0, -2); // L: 5 - field2750 = new ServerPacket(1, 0); // L: 6 - field2744 = new ServerPacket(2, 3); // L: 7 - field2711 = new ServerPacket(3, 8); // L: 8 - field2703 = new ServerPacket(4, 5); // L: 9 - field2704 = new ServerPacket(5, 5); // L: 10 - field2738 = new ServerPacket(6, 4); // L: 11 - field2762 = new ServerPacket(7, -2); // L: 12 - field2707 = new ServerPacket(8, 2); // L: 13 - field2708 = new ServerPacket(9, -1); // L: 14 - field2709 = new ServerPacket(10, -1); // L: 15 - field2710 = new ServerPacket(11, 5); // L: 16 - field2742 = new ServerPacket(12, 4); // L: 17 - field2712 = new ServerPacket(13, -2); // L: 18 - field2713 = new ServerPacket(14, 1); // L: 19 - field2714 = new ServerPacket(15, 1); // L: 20 - field2715 = new ServerPacket(16, -2); // L: 21 - field2716 = new ServerPacket(17, 6); // L: 22 - field2729 = new ServerPacket(18, 14); // L: 23 - field2787 = new ServerPacket(19, -1); // L: 24 - field2767 = new ServerPacket(20, 15); // L: 25 - field2720 = new ServerPacket(21, 6); // L: 26 - field2721 = new ServerPacket(22, 4); // L: 27 - field2699 = new ServerPacket(23, 0); // L: 28 - field2723 = new ServerPacket(24, 6); // L: 29 - field2724 = new ServerPacket(25, 5); // L: 30 - field2771 = new ServerPacket(26, -2); - field2726 = new ServerPacket(27, -2); - field2727 = new ServerPacket(28, 2); - field2725 = new ServerPacket(29, 0); - field2700 = new ServerPacket(30, 8); - field2730 = new ServerPacket(31, 6); - field2731 = new ServerPacket(32, 2); // L: 37 - field2732 = new ServerPacket(33, 4); - field2722 = new ServerPacket(34, 1); - field2737 = new ServerPacket(35, -2); // L: 40 - field2735 = new ServerPacket(36, 2); // L: 41 - field2736 = new ServerPacket(37, -1); // L: 42 - field2734 = new ServerPacket(38, -2); // L: 43 - field2757 = new ServerPacket(39, -2); // L: 44 - field2739 = new ServerPacket(40, 2); // L: 45 + field2780 = new ServerPacket(0, -2); // L: 5 + field2751 = new ServerPacket(1, 0); // L: 6 + field2702 = new ServerPacket(2, 3); // L: 7 + field2703 = new ServerPacket(3, 8); // L: 8 + field2704 = new ServerPacket(4, 5); // L: 9 + field2705 = new ServerPacket(5, 5); // L: 10 + field2706 = new ServerPacket(6, 4); // L: 11 + field2798 = new ServerPacket(7, -2); + field2708 = new ServerPacket(8, 2); + field2785 = new ServerPacket(9, -1); + field2729 = new ServerPacket(10, -1); + field2711 = new ServerPacket(11, 5); + field2748 = new ServerPacket(12, 4); + field2713 = new ServerPacket(13, -2); + field2714 = new ServerPacket(14, 1); + field2760 = new ServerPacket(15, 1); + field2716 = new ServerPacket(16, -2); + field2717 = new ServerPacket(17, 6); + field2746 = new ServerPacket(18, 14); + field2719 = new ServerPacket(19, -1); + field2709 = new ServerPacket(20, 15); + field2721 = new ServerPacket(21, 6); + field2715 = new ServerPacket(22, 4); + field2723 = new ServerPacket(23, 0); + field2724 = new ServerPacket(24, 6); + field2725 = new ServerPacket(25, 5); + field2726 = new ServerPacket(26, -2); + field2775 = new ServerPacket(27, -2); + field2756 = new ServerPacket(28, 2); + field2722 = new ServerPacket(29, 0); + field2764 = new ServerPacket(30, 8); + field2731 = new ServerPacket(31, 6); + field2712 = new ServerPacket(32, 2); + field2795 = new ServerPacket(33, 4); + field2734 = new ServerPacket(34, 1); + field2735 = new ServerPacket(35, -2); + field2700 = new ServerPacket(36, 2); + field2737 = new ServerPacket(37, -1); // L: 42 + field2749 = new ServerPacket(38, -2); // L: 43 + field2739 = new ServerPacket(39, -2); // L: 44 + field2740 = new ServerPacket(40, 2); // L: 45 field2741 = new ServerPacket(41, 1); // L: 46 - field2740 = new ServerPacket(42, -1); // L: 47 - field2781 = new ServerPacket(43, 8); // L: 48 - field2743 = new ServerPacket(44, 4); // L: 49 - field2702 = new ServerPacket(45, -2); // L: 50 - field2745 = new ServerPacket(46, 6); // L: 51 - field2772 = new ServerPacket(47, 6); // L: 52 - field2747 = new ServerPacket(48, 7); // L: 53 - field2748 = new ServerPacket(49, -1); // L: 54 - field2749 = new ServerPacket(50, 5); // L: 55 - field2746 = new ServerPacket(51, 8); // L: 56 - field2733 = new ServerPacket(52, 20); // L: 57 - field2719 = new ServerPacket(53, 10); // L: 58 - field2753 = new ServerPacket(54, -1); // L: 59 - field2754 = new ServerPacket(55, 0); // L: 60 - field2755 = new ServerPacket(56, -2); // L: 61 - field2756 = new ServerPacket(57, 0); // L: 62 - field2769 = new ServerPacket(58, -2); // L: 63 - field2758 = new ServerPacket(59, 6); // L: 64 - field2759 = new ServerPacket(60, 2); // L: 65 - field2763 = new ServerPacket(61, 4); // L: 66 - field2761 = new ServerPacket(62, 10); // L: 67 - field2718 = new ServerPacket(63, -1); // L: 68 - field2752 = new ServerPacket(64, 6); // L: 69 - field2764 = new ServerPacket(65, -2); // L: 70 - field2765 = new ServerPacket(66, 28); // L: 71 - field2766 = new ServerPacket(67, -2); // L: 72 - field2701 = new ServerPacket(68, 0); // L: 73 - field2768 = new ServerPacket(69, 7); // L: 74 - field2728 = new ServerPacket(70, 3); // L: 75 - field2770 = new ServerPacket(71, -2); // L: 76 - field2795 = new ServerPacket(72, 2); // L: 77 - field2794 = new ServerPacket(73, -2); // L: 78 - field2773 = new ServerPacket(74, 6); // L: 79 - field2780 = new ServerPacket(75, 12); // L: 80 - field2775 = new ServerPacket(76, 6); // L: 81 - field2776 = new ServerPacket(77, 1); // L: 82 - field2777 = new ServerPacket(78, 0); // L: 83 - field2778 = new ServerPacket(79, -2); // L: 84 - field2779 = new ServerPacket(80, 1); // L: 85 - field2760 = new ServerPacket(81, -2); // L: 86 - field2705 = new ServerPacket(82, 0); // L: 87 - field2782 = new ServerPacket(83, 2); // L: 88 - field2783 = new ServerPacket(84, -2); // L: 89 - field2784 = new ServerPacket(85, 2); // L: 90 - field2785 = new ServerPacket(86, -2); // L: 91 - field2786 = new ServerPacket(87, -2); // L: 92 - field2751 = new ServerPacket(88, 6); // L: 93 - field2788 = new ServerPacket(89, -2); // L: 94 - field2789 = new ServerPacket(90, 0); // L: 95 - field2790 = new ServerPacket(91, 2); // L: 96 - field2791 = new ServerPacket(92, -2); // L: 97 - field2792 = new ServerPacket(93, -1); // L: 98 - field2793 = new ServerPacket(94, 4); // L: 99 + field2742 = new ServerPacket(42, -1); // L: 47 + field2743 = new ServerPacket(43, 8); // L: 48 + field2744 = new ServerPacket(44, 4); // L: 49 + field2745 = new ServerPacket(45, -2); // L: 50 + field2774 = new ServerPacket(46, 6); // L: 51 + field2732 = new ServerPacket(47, 6); // L: 52 + field2773 = new ServerPacket(48, 7); // L: 53 + field2738 = new ServerPacket(49, -1); // L: 54 + field2750 = new ServerPacket(50, 5); // L: 55 + field2747 = new ServerPacket(51, 8); // L: 56 + field2752 = new ServerPacket(52, 20); // L: 57 + field2753 = new ServerPacket(53, 10); // L: 58 + field2754 = new ServerPacket(54, -1); // L: 59 + field2755 = new ServerPacket(55, 0); // L: 60 + field2757 = new ServerPacket(56, -2); // L: 61 + field2789 = new ServerPacket(57, 0); // L: 62 + field2710 = new ServerPacket(58, -2); // L: 63 + field2759 = new ServerPacket(59, 6); // L: 64 + field2793 = new ServerPacket(60, 2); // L: 65 + field2761 = new ServerPacket(61, 4); // L: 66 + field2762 = new ServerPacket(62, 10); // L: 67 + field2763 = new ServerPacket(63, -1); // L: 68 + field2787 = new ServerPacket(64, 6); // L: 69 + field2765 = new ServerPacket(65, -2); // L: 70 + field2784 = new ServerPacket(66, 28); // L: 71 + field2767 = new ServerPacket(67, -2); // L: 72 + field2730 = new ServerPacket(68, 0); // L: 73 + field2769 = new ServerPacket(69, 7); // L: 74 + field2770 = new ServerPacket(70, 3); // L: 75 + field2771 = new ServerPacket(71, -2); // L: 76 + field2772 = new ServerPacket(72, 2); // L: 77 + field2768 = new ServerPacket(73, -2); // L: 78 + field2701 = new ServerPacket(74, 6); // L: 79 + field2718 = new ServerPacket(75, 12); // L: 80 + field2776 = new ServerPacket(76, 6); // L: 81 + field2777 = new ServerPacket(77, 1); // L: 82 + field2778 = new ServerPacket(78, 0); // L: 83 + field2779 = new ServerPacket(79, -2); // L: 84 + field2794 = new ServerPacket(80, 1); // L: 85 + field2781 = new ServerPacket(81, -2); // L: 86 + field2782 = new ServerPacket(82, 0); // L: 87 + field2783 = new ServerPacket(83, 2); // L: 88 + field2727 = new ServerPacket(84, -2); // L: 89 + field2728 = new ServerPacket(85, 2); // L: 90 + field2786 = new ServerPacket(86, -2); // L: 91 + field2707 = new ServerPacket(87, -2); // L: 92 + field2788 = new ServerPacket(88, 6); // L: 93 + field2766 = new ServerPacket(89, -2); // L: 94 + field2790 = new ServerPacket(90, 0); // L: 95 + field2791 = new ServerPacket(91, 2); // L: 96 + field2792 = new ServerPacket(92, -2); // L: 97 + field2720 = new ServerPacket(93, -1); // L: 98 + field2736 = new ServerPacket(94, 4); // L: 99 } ServerPacket(int var1, int var2) { @@ -598,59 +604,74 @@ public class ServerPacket { this.length = var2; // L: 109 } // L: 110 - @ObfuscatedName("g") + @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "(Lnk;IB)Ljava/lang/String;", - garbageValue = "-61" + descriptor = "(CB)B", + garbageValue = "53" ) - static String method4314(Buffer var0, int var1) { - try { - int var2 = var0.readUShortSmart(); // L: 31 - if (var2 > var1) { // L: 32 - var2 = var1; - } - - byte[] var3 = new byte[var2]; // L: 33 - var0.offset += class377.huffman.decompress(var0.array, var0.offset, var3, 0, var2); // L: 34 - String var4 = class17.decodeStringCp1252(var3, 0, var2); // L: 35 - return var4; // L: 36 - } catch (Exception var6) { // L: 38 - return "Cabbage"; // L: 39 - } - } - - @ObfuscatedName("b") - @ObfuscatedSignature( - descriptor = "(Liv;I[B[BB)V", - garbageValue = "99" - ) - @Export("Widget_setKey") - static final void Widget_setKey(Widget var0, int var1, byte[] var2, byte[] var3) { - if (var0.field3039 == null) { // L: 964 - if (var2 == null) { // L: 965 - return; // L: 971 - } - - var0.field3039 = new byte[11][]; // L: 966 - var0.field2987 = new byte[11][]; // L: 967 - var0.field3070 = new int[11]; // L: 968 - var0.field3090 = new int[11]; // L: 969 - } - - var0.field3039[var1] = var2; // L: 973 - if (var2 != null) { - var0.field2985 = true; // L: 974 + @Export("charToByteCp1252") + public static byte charToByteCp1252(char var0) { + byte var1; + if (var0 > 0 && var0 < 128 || var0 >= 160 && var0 <= 255) { // L: 12 + var1 = (byte)var0; + } else if (var0 == 8364) { // L: 13 + var1 = -128; + } else if (var0 == 8218) { // L: 14 + var1 = -126; + } else if (var0 == 402) { // L: 15 + var1 = -125; + } else if (var0 == 8222) { // L: 16 + var1 = -124; + } else if (var0 == 8230) { // L: 17 + var1 = -123; + } else if (var0 == 8224) { // L: 18 + var1 = -122; + } else if (var0 == 8225) { // L: 19 + var1 = -121; + } else if (var0 == 710) { // L: 20 + var1 = -120; + } else if (var0 == 8240) { // L: 21 + var1 = -119; + } else if (var0 == 352) { // L: 22 + var1 = -118; + } else if (var0 == 8249) { // L: 23 + var1 = -117; + } else if (var0 == 338) { // L: 24 + var1 = -116; + } else if (var0 == 381) { // L: 25 + var1 = -114; + } else if (var0 == 8216) { // L: 26 + var1 = -111; + } else if (var0 == 8217) { // L: 27 + var1 = -110; + } else if (var0 == 8220) { // L: 28 + var1 = -109; + } else if (var0 == 8221) { // L: 29 + var1 = -108; + } else if (var0 == 8226) { // L: 30 + var1 = -107; + } else if (var0 == 8211) { // L: 31 + var1 = -106; + } else if (var0 == 8212) { // L: 32 + var1 = -105; + } else if (var0 == 732) { // L: 33 + var1 = -104; + } else if (var0 == 8482) { // L: 34 + var1 = -103; + } else if (var0 == 353) { // L: 35 + var1 = -102; + } else if (var0 == 8250) { // L: 36 + var1 = -101; + } else if (var0 == 339) { // L: 37 + var1 = -100; + } else if (var0 == 382) { // L: 38 + var1 = -98; + } else if (var0 == 376) { // L: 39 + var1 = -97; } else { - var0.field2985 = false; // L: 976 - - for (int var4 = 0; var4 < var0.field3039.length; ++var4) { // L: 977 - if (var0.field3039[var4] != null) { // L: 978 - var0.field2985 = true; // L: 979 - break; - } - } + var1 = 63; // L: 40 } - var0.field2987[var1] = var3; // L: 984 - } // L: 985 + return var1; // L: 41 + } } diff --git a/runescape-client/src/main/java/Skeleton.java b/runescape-client/src/main/java/Skeleton.java index 019b3527b4..8c6161f2c7 100644 --- a/runescape-client/src/main/java/Skeleton.java +++ b/runescape-client/src/main/java/Skeleton.java @@ -4,31 +4,30 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("gn") +@ObfuscatedName("ge") @Implements("Skeleton") public class Skeleton extends Node { - @ObfuscatedName("ha") + @ObfuscatedName("ak") @ObfuscatedGetter( - intValue = 576812215 + intValue = 1049112805 ) - @Export("cameraY") - static int cameraY; - @ObfuscatedName("h") + static int field2287; + @ObfuscatedName("v") @ObfuscatedGetter( - intValue = -1229428145 + intValue = -2039033351 ) @Export("id") int id; - @ObfuscatedName("c") + @ObfuscatedName("n") @ObfuscatedGetter( - intValue = 1150264437 + intValue = -1780750535 ) @Export("count") int count; - @ObfuscatedName("o") + @ObfuscatedName("f") @Export("transformTypes") int[] transformTypes; - @ObfuscatedName("g") + @ObfuscatedName("y") @Export("labels") int[][] labels; @@ -56,51 +55,63 @@ public class Skeleton extends Node { } // L: 23 - @ObfuscatedName("ii") + @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "(ILjava/lang/String;I)V", - garbageValue = "1656377758" + descriptor = "(II)I", + garbageValue = "-651931102" ) - static void method3899(int var0, String var1) { - int var2 = Players.Players_count; // L: 8870 - int[] var3 = Players.Players_indices; // L: 8871 - boolean var4 = false; // L: 8872 - Username var5 = new Username(var1, ModeWhere.loginType); // L: 8873 + @Export("getVarbit") + public static int getVarbit(int var0) { + VarbitComposition var1 = FontName.method6299(var0); // L: 24 + int var2 = var1.baseVar; // L: 25 + int var3 = var1.startBit; // L: 26 + int var4 = var1.endBit; // L: 27 + int var5 = Varps.Varps_masks[var4 - var3]; // L: 28 + return Varps.Varps_main[var2] >> var3 & var5; // L: 29 + } - for (int var6 = 0; var6 < var2; ++var6) { // L: 8874 - Player var7 = Client.players[var3[var6]]; // L: 8875 - if (var7 != null && var7 != class35.localPlayer && var7.username != null && var7.username.equals(var5)) { // L: 8876 - PacketBufferNode var8; - if (var0 == 1) { // L: 8877 - var8 = HealthBarDefinition.getPacketBufferNode(ClientPacket.field2571, Client.packetWriter.isaacCipher); // L: 8879 - var8.packetBuffer.method6483(var3[var6]); // L: 8880 - var8.packetBuffer.method6610(0); // L: 8881 - Client.packetWriter.addNode(var8); // L: 8882 - } else if (var0 == 4) { // L: 8884 - var8 = HealthBarDefinition.getPacketBufferNode(ClientPacket.field2565, Client.packetWriter.isaacCipher); // L: 8886 - var8.packetBuffer.method6483(var3[var6]); // L: 8887 - var8.packetBuffer.method6610(0); // L: 8888 - Client.packetWriter.addNode(var8); // L: 8889 - } else if (var0 == 6) { // L: 8891 - var8 = HealthBarDefinition.getPacketBufferNode(ClientPacket.field2600, Client.packetWriter.isaacCipher); // L: 8893 - var8.packetBuffer.method6449(0); // L: 8894 - var8.packetBuffer.method6484(var3[var6]); // L: 8895 - Client.packetWriter.addNode(var8); // L: 8896 - } else if (var0 == 7) { // L: 8898 - var8 = HealthBarDefinition.getPacketBufferNode(ClientPacket.field2613, Client.packetWriter.isaacCipher); // L: 8900 - var8.packetBuffer.writeByte(0); // L: 8901 - var8.packetBuffer.method6484(var3[var6]); // L: 8902 - Client.packetWriter.addNode(var8); // L: 8903 - } + @ObfuscatedName("r") + @ObfuscatedSignature( + descriptor = "(I)V", + garbageValue = "-2037150007" + ) + static void method3921() { + ItemContainer.itemContainers = new NodeHashTable(32); // L: 78 + } // L: 79 - var4 = true; // L: 8905 - break; - } - } + @ObfuscatedName("s") + @ObfuscatedSignature( + descriptor = "(IIII)I", + garbageValue = "-698896598" + ) + static final int method3920(int var0, int var1, int var2) { + int var3 = var0 / var2; // L: 804 + int var4 = var0 & var2 - 1; // L: 805 + int var5 = var1 / var2; // L: 806 + int var6 = var1 & var2 - 1; // L: 807 + int var7 = Occluder.method4109(var3, var5); // L: 808 + int var8 = Occluder.method4109(var3 + 1, var5); // L: 809 + int var9 = Occluder.method4109(var3, var5 + 1); // L: 810 + int var10 = Occluder.method4109(var3 + 1, var5 + 1); // L: 811 + int var12 = 65536 - Rasterizer3D.Rasterizer3D_cosine[var4 * 1024 / var2] >> 1; // L: 814 + int var11 = ((65536 - var12) * var7 >> 16) + (var12 * var8 >> 16); // L: 815 + int var13 = SoundSystem.method806(var9, var10, var4, var2); // L: 818 + int var15 = 65536 - Rasterizer3D.Rasterizer3D_cosine[var6 * 1024 / var2] >> 1; // L: 821 + int var14 = ((65536 - var15) * var11 >> 16) + (var13 * var15 >> 16); // L: 822 + return var14; // L: 824 + } - if (!var4) { // L: 8909 - WorldMapScaleHandler.addGameMessage(4, "", "Unable to find " + var1); - } - - } // L: 8910 + @ObfuscatedName("ay") + @ObfuscatedSignature( + descriptor = "(ILii;ZI)V", + garbageValue = "1737731022" + ) + static void method3922(int var0, Coord var1, boolean var2) { + WorldMapArea var3 = HealthBarUpdate.getWorldMap().getMapArea(var0); // L: 4336 + int var4 = class93.localPlayer.plane; // L: 4337 + int var5 = (class93.localPlayer.x >> 7) + VertexNormal.baseX; // L: 4338 + int var6 = (class93.localPlayer.y >> 7) + SoundSystem.baseY; // L: 4339 + Coord var7 = new Coord(var4, var5, var6); // L: 4340 + HealthBarUpdate.getWorldMap().method6291(var3, var7, var1, var2); // L: 4341 + } // L: 4342 } diff --git a/runescape-client/src/main/java/Skills.java b/runescape-client/src/main/java/Skills.java index 0a167e62cf..7006181b56 100644 --- a/runescape-client/src/main/java/Skills.java +++ b/runescape-client/src/main/java/Skills.java @@ -3,15 +3,21 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("id") +@ObfuscatedName("iw") @Implements("Skills") public class Skills { - @ObfuscatedName("c") + @ObfuscatedName("n") @Export("Skills_enabled") public static final boolean[] Skills_enabled; - @ObfuscatedName("o") + @ObfuscatedName("f") @Export("Skills_experienceTable") public static int[] Skills_experienceTable; + @ObfuscatedName("ck") + @ObfuscatedSignature( + descriptor = "Lcb;" + ) + @Export("mouseRecorder") + static MouseRecorder mouseRecorder; static { Skills_enabled = new boolean[]{true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, false, false}; // L: 5 @@ -26,21 +32,4 @@ public class Skills { } } // L: 16 - - @ObfuscatedName("l") - @ObfuscatedSignature( - descriptor = "(II)V", - garbageValue = "-2107390696" - ) - @Export("clearItemContainer") - static void clearItemContainer(int var0) { - ItemContainer var1 = (ItemContainer)ItemContainer.itemContainers.get((long)var0); // L: 63 - if (var1 != null) { // L: 64 - for (int var2 = 0; var2 < var1.ids.length; ++var2) { // L: 65 - var1.ids[var2] = -1; // L: 66 - var1.quantities[var2] = 0; // L: 67 - } - - } - } // L: 69 } diff --git a/runescape-client/src/main/java/SoftWrapper.java b/runescape-client/src/main/java/SoftWrapper.java index 8883b03b5f..139d9e3eda 100644 --- a/runescape-client/src/main/java/SoftWrapper.java +++ b/runescape-client/src/main/java/SoftWrapper.java @@ -3,10 +3,10 @@ import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; -@ObfuscatedName("hg") +@ObfuscatedName("hc") @Implements("SoftWrapper") public class SoftWrapper extends Wrapper { - @ObfuscatedName("h") + @ObfuscatedName("v") @Export("ref") SoftReference ref; @@ -15,13 +15,13 @@ public class SoftWrapper extends Wrapper { this.ref = new SoftReference(var1); // L: 11 } // L: 12 - @ObfuscatedName("h") + @ObfuscatedName("v") @Export("get") Object get() { return this.ref.get(); // L: 15 } - @ObfuscatedName("c") + @ObfuscatedName("n") @Export("isSoft") boolean isSoft() { return true; // L: 19 diff --git a/runescape-client/src/main/java/SoundCache.java b/runescape-client/src/main/java/SoundCache.java index 571fcb85ee..0fdf4ba7bd 100644 --- a/runescape-client/src/main/java/SoundCache.java +++ b/runescape-client/src/main/java/SoundCache.java @@ -1,3 +1,6 @@ +import java.io.File; +import java.io.IOException; +import java.io.RandomAccessFile; import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedGetter; @@ -7,39 +10,50 @@ import net.runelite.mapping.ObfuscatedSignature; @ObfuscatedName("bu") @Implements("SoundCache") public class SoundCache { - @ObfuscatedName("lx") + @ObfuscatedName("rw") @ObfuscatedGetter( - intValue = -1065517543 + intValue = -1515591247 ) - @Export("menuWidth") - static int menuWidth; - @ObfuscatedName("h") + static int field468; + @ObfuscatedName("j") + @ObfuscatedGetter( + intValue = 264174683 + ) + @Export("idxCount") + public static int idxCount; + @ObfuscatedName("de") @ObfuscatedSignature( descriptor = "Ljp;" ) + @Export("archive10") + static Archive archive10; + @ObfuscatedName("v") + @ObfuscatedSignature( + descriptor = "Ljv;" + ) @Export("soundEffectIndex") AbstractArchive soundEffectIndex; - @ObfuscatedName("c") + @ObfuscatedName("n") @ObfuscatedSignature( - descriptor = "Ljp;" + descriptor = "Ljv;" ) @Export("musicSampleIndex") AbstractArchive musicSampleIndex; - @ObfuscatedName("o") + @ObfuscatedName("f") @ObfuscatedSignature( - descriptor = "Lmt;" + descriptor = "Lmd;" ) @Export("musicSamples") NodeHashTable musicSamples; - @ObfuscatedName("g") + @ObfuscatedName("y") @ObfuscatedSignature( - descriptor = "Lmt;" + descriptor = "Lmd;" ) @Export("rawSounds") NodeHashTable rawSounds; @ObfuscatedSignature( - descriptor = "(Ljp;Ljp;)V" + descriptor = "(Ljv;Ljv;)V" ) public SoundCache(AbstractArchive var1, AbstractArchive var2) { this.musicSamples = new NodeHashTable(256); // L: 9 @@ -48,10 +62,10 @@ public class SoundCache { this.musicSampleIndex = var2; // L: 14 } // L: 15 - @ObfuscatedName("h") + @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "(II[II)Laf;", - garbageValue = "2104545724" + descriptor = "(II[IB)Lau;", + garbageValue = "22" ) @Export("getSoundEffect0") RawSound getSoundEffect0(int var1, int var2, int[] var3) { @@ -64,8 +78,8 @@ public class SoundCache { } else if (var3 != null && var3[0] <= 0) { // L: 23 return null; } else { - SoundEffect var8 = SoundEffect.readSoundEffect(this.soundEffectIndex, var1, var2); // L: 24 - if (var8 == null) { // L: 25 + SoundEffect var8 = SoundEffect.readSoundEffect(this.soundEffectIndex, var1, var2); + if (var8 == null) { return null; } else { var7 = var8.toRawSound(); // L: 26 @@ -79,10 +93,10 @@ public class SoundCache { } } - @ObfuscatedName("c") + @ObfuscatedName("n") @ObfuscatedSignature( - descriptor = "(II[II)Laf;", - garbageValue = "-814678921" + descriptor = "(II[IB)Lau;", + garbageValue = "83" ) @Export("getMusicSample0") RawSound getMusicSample0(int var1, int var2, int[] var3) { @@ -116,10 +130,10 @@ public class SoundCache { } } - @ObfuscatedName("o") + @ObfuscatedName("f") @ObfuscatedSignature( - descriptor = "(I[II)Laf;", - garbageValue = "-1571869142" + descriptor = "(I[IB)Lau;", + garbageValue = "36" ) @Export("getSoundEffect") public RawSound getSoundEffect(int var1, int[] var2) { @@ -132,10 +146,10 @@ public class SoundCache { } } - @ObfuscatedName("g") + @ObfuscatedName("y") @ObfuscatedSignature( - descriptor = "(I[IS)Laf;", - garbageValue = "-1177" + descriptor = "(I[II)Lau;", + garbageValue = "2094009970" ) @Export("getMusicSample") public RawSound getMusicSample(int var1, int[] var2) { @@ -148,33 +162,162 @@ public class SoundCache { } } - @ObfuscatedName("o") + @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "(ZZI)Lof;", - garbageValue = "142719067" + descriptor = "(I)V", + garbageValue = "-1930699867" ) - static IndexedSprite method866(boolean var0, boolean var1) { - return var0 ? (var1 ? class225.field2684 : GrandExchangeEvent.options_buttons_2Sprite) : (var1 ? InterfaceParent.field1134 : GrandExchangeOfferUnitPriceComparator.options_buttons_0Sprite); // L: 225 - } + public static void method811() { + class69.reflectionChecks = new IterableNodeDeque(); // L: 24 + } // L: 25 - @ObfuscatedName("lx") + @ObfuscatedName("f") @ObfuscatedSignature( - descriptor = "(IIZI)V", - garbageValue = "453533499" + descriptor = "([Lbg;II[I[II)V", + garbageValue = "-408447852" ) - static final void method869(int var0, int var1, boolean var2) { - if (Client.field847[var0] != null) { // L: 11580 - if (var1 >= 0 && var1 < Client.field847[var0].method39()) { // L: 11581 - class9 var3 = (class9)Client.field847[var0].field32.get(var1); // L: 11582 - PacketWriter var4 = Client.packetWriter; // L: 11583 - PacketBufferNode var5 = HealthBarDefinition.getPacketBufferNode(ClientPacket.field2665, var4.isaacCipher); // L: 11584 - var5.packetBuffer.writeByte(4 + class4.stringCp1252NullTerminatedByteSize(var3.field73)); // L: 11585 - var5.packetBuffer.writeByte(var0); // L: 11586 - var5.packetBuffer.writeShort(var1); // L: 11587 - var5.packetBuffer.writeBoolean(var2); // L: 11588 - var5.packetBuffer.writeStringCp1252NullTerminated(var3.field73); // L: 11589 - var4.addNode(var5); // L: 11590 + @Export("sortWorlds") + static void sortWorlds(World[] var0, int var1, int var2, int[] var3, int[] var4) { + if (var1 < var2) { // L: 81 + int var5 = var1 - 1; // L: 82 + int var6 = var2 + 1; // L: 83 + int var7 = (var2 + var1) / 2; // L: 84 + World var8 = var0[var7]; // L: 85 + var0[var7] = var0[var1]; // L: 86 + var0[var1] = var8; // L: 87 + + while (var5 < var6) { // L: 88 + boolean var9 = true; // L: 89 + + int var10; + int var11; + int var12; + do { + --var6; // L: 91 + + for (var10 = 0; var10 < 4; ++var10) { // L: 92 + if (var3[var10] == 2) { // L: 95 + var11 = var0[var6].index; // L: 96 + var12 = var8.index; // L: 97 + } else if (var3[var10] == 1) { // L: 99 + var11 = var0[var6].population; // L: 100 + var12 = var8.population; // L: 101 + if (var11 == -1 && var4[var10] == 1) { // L: 102 + var11 = 2001; + } + + if (var12 == -1 && var4[var10] == 1) { // L: 103 + var12 = 2001; + } + } else if (var3[var10] == 3) { // L: 105 + var11 = var0[var6].isMembersOnly() ? 1 : 0; // L: 106 + var12 = var8.isMembersOnly() ? 1 : 0; // L: 107 + } else { + var11 = var0[var6].id; // L: 110 + var12 = var8.id; // L: 111 + } + + if (var11 != var12) { // L: 113 + if ((var4[var10] != 1 || var11 <= var12) && (var4[var10] != 0 || var11 >= var12)) { // L: 116 117 + var9 = false; // L: 119 + } + break; + } + + if (var10 == 3) { // L: 114 + var9 = false; + } + } + } while(var9); + + var9 = true; // L: 124 + + do { + ++var5; // L: 126 + + for (var10 = 0; var10 < 4; ++var10) { // L: 127 + if (var3[var10] == 2) { // L: 130 + var11 = var0[var5].index; // L: 131 + var12 = var8.index; // L: 132 + } else if (var3[var10] == 1) { // L: 134 + var11 = var0[var5].population; // L: 135 + var12 = var8.population; // L: 136 + if (var11 == -1 && var4[var10] == 1) { // L: 137 + var11 = 2001; + } + + if (var12 == -1 && var4[var10] == 1) { // L: 138 + var12 = 2001; + } + } else if (var3[var10] == 3) { // L: 140 + var11 = var0[var5].isMembersOnly() ? 1 : 0; // L: 141 + var12 = var8.isMembersOnly() ? 1 : 0; // L: 142 + } else { + var11 = var0[var5].id; // L: 145 + var12 = var8.id; // L: 146 + } + + if (var11 != var12) { // L: 148 + if ((var4[var10] != 1 || var11 >= var12) && (var4[var10] != 0 || var11 <= var12)) { // L: 151 152 + var9 = false; // L: 154 + } + break; + } + + if (var10 == 3) { // L: 149 + var9 = false; + } + } + } while(var9); + + if (var5 < var6) { // L: 159 + World var13 = var0[var5]; // L: 160 + var0[var5] = var0[var6]; // L: 161 + var0[var6] = var13; // L: 162 + } } + + sortWorlds(var0, var1, var6, var3, var4); // L: 165 + sortWorlds(var0, var6 + 1, var2, var3, var4); // L: 166 } - } // L: 11591 + + } // L: 168 + + @ObfuscatedName("y") + @ObfuscatedSignature( + descriptor = "(I)V", + garbageValue = "1514973539" + ) + public static void method830() { + try { + File var0 = new File(class22.userHomeDirectory, "random.dat"); // L: 195 + int var2; + if (var0.exists()) { // L: 196 + JagexCache.JagexCache_randomDat = new BufferedFile(new AccessFile(var0, "rw", 25L), 24, 0); // L: 197 + } else { + label38: + for (int var1 = 0; var1 < PlayerType.cacheSubPaths.length; ++var1) { // L: 200 + for (var2 = 0; var2 < InterfaceParent.cacheParentPaths.length; ++var2) { // L: 201 + File var3 = new File(InterfaceParent.cacheParentPaths[var2] + PlayerType.cacheSubPaths[var1] + File.separatorChar + "random.dat"); // L: 202 + if (var3.exists()) { // L: 203 + JagexCache.JagexCache_randomDat = new BufferedFile(new AccessFile(var3, "rw", 25L), 24, 0); // L: 204 + break label38; // L: 205 + } + } + } + } + + if (JagexCache.JagexCache_randomDat == null) { // L: 210 + RandomAccessFile var4 = new RandomAccessFile(var0, "rw"); // L: 211 + var2 = var4.read(); // L: 212 + var4.seek(0L); // L: 213 + var4.write(var2); // L: 214 + var4.seek(0L); // L: 215 + var4.close(); // L: 216 + JagexCache.JagexCache_randomDat = new BufferedFile(new AccessFile(var0, "rw", 25L), 24, 0); // L: 217 + } + } catch (IOException var5) { // L: 220 + } + + } // L: 221 } diff --git a/runescape-client/src/main/java/SoundEffect.java b/runescape-client/src/main/java/SoundEffect.java index c8a83f7195..81b93afc7c 100644 --- a/runescape-client/src/main/java/SoundEffect.java +++ b/runescape-client/src/main/java/SoundEffect.java @@ -3,24 +3,24 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ah") +@ObfuscatedName("aa") @Implements("SoundEffect") public class SoundEffect { - @ObfuscatedName("c") + @ObfuscatedName("n") @ObfuscatedSignature( - descriptor = "[Lbp;" + descriptor = "[Lbx;" ) @Export("instruments") Instrument[] instruments; - @ObfuscatedName("o") + @ObfuscatedName("f") @Export("start") int start; - @ObfuscatedName("g") + @ObfuscatedName("y") @Export("end") int end; @ObfuscatedSignature( - descriptor = "(Lnk;)V" + descriptor = "(Lnd;)V" ) SoundEffect(Buffer var1) { this.instruments = new Instrument[10]; // L: 10 @@ -38,9 +38,9 @@ public class SoundEffect { this.end = var1.readUnsignedShort(); // L: 29 } // L: 30 - @ObfuscatedName("c") + @ObfuscatedName("n") @ObfuscatedSignature( - descriptor = "()Laf;" + descriptor = "()Lau;" ) @Export("toRawSound") public RawSound toRawSound() { @@ -48,7 +48,7 @@ public class SoundEffect { return new RawSound(22050, var1, this.start * 22050 / 1000, this.end * 22050 / 1000); // L: 34 } - @ObfuscatedName("o") + @ObfuscatedName("f") @Export("calculateDelay") public final int calculateDelay() { int var1 = 9999999; // L: 38 @@ -83,7 +83,7 @@ public class SoundEffect { } } - @ObfuscatedName("g") + @ObfuscatedName("y") @Export("mix") final byte[] mix() { int var1 = 0; // L: 57 @@ -122,9 +122,9 @@ public class SoundEffect { } } - @ObfuscatedName("h") + @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "(Ljp;II)Lah;" + descriptor = "(Ljv;II)Laa;" ) @Export("readSoundEffect") public static SoundEffect readSoundEffect(AbstractArchive var0, int var1, int var2) { diff --git a/runescape-client/src/main/java/SoundEnvelope.java b/runescape-client/src/main/java/SoundEnvelope.java index d024e002a1..e95b2d3f17 100644 --- a/runescape-client/src/main/java/SoundEnvelope.java +++ b/runescape-client/src/main/java/SoundEnvelope.java @@ -3,42 +3,42 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("bw") +@ObfuscatedName("bt") @Implements("SoundEnvelope") public class SoundEnvelope { - @ObfuscatedName("h") + @ObfuscatedName("v") @Export("segments") int segments; - @ObfuscatedName("c") + @ObfuscatedName("n") @Export("durations") int[] durations; - @ObfuscatedName("o") + @ObfuscatedName("f") @Export("phases") int[] phases; - @ObfuscatedName("g") - @Export("start") - int start; - @ObfuscatedName("l") - @Export("end") - int end; - @ObfuscatedName("z") - @Export("form") - int form; - @ObfuscatedName("t") - @Export("ticks") - int ticks; - @ObfuscatedName("v") - @Export("phaseIndex") - int phaseIndex; - @ObfuscatedName("b") - @Export("step") - int step; - @ObfuscatedName("q") - @Export("amplitude") - int amplitude; - @ObfuscatedName("i") + @ObfuscatedName("y") @Export("max") int max; + @ObfuscatedName("p") + @Export("start") + int start; + @ObfuscatedName("j") + @Export("end") + int end; + @ObfuscatedName("r") + @Export("form") + int form; + @ObfuscatedName("b") + @Export("ticks") + int ticks; + @ObfuscatedName("d") + @Export("phaseIndex") + int phaseIndex; + @ObfuscatedName("s") + @Export("step") + int step; + @ObfuscatedName("u") + @Export("amplitude") + int amplitude; SoundEnvelope() { this.segments = 2; // L: 21 @@ -50,9 +50,9 @@ public class SoundEnvelope { this.phases[1] = 65535; // L: 27 } // L: 28 - @ObfuscatedName("h") + @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "(Lnk;)V" + descriptor = "(Lnd;)V" ) @Export("decode") final void decode(Buffer var1) { @@ -62,9 +62,9 @@ public class SoundEnvelope { this.decodeSegments(var1); // L: 34 } // L: 35 - @ObfuscatedName("c") + @ObfuscatedName("n") @ObfuscatedSignature( - descriptor = "(Lnk;)V" + descriptor = "(Lnd;)V" ) @Export("decodeSegments") final void decodeSegments(Buffer var1) { @@ -79,7 +79,7 @@ public class SoundEnvelope { } // L: 45 - @ObfuscatedName("o") + @ObfuscatedName("f") @Export("reset") final void reset() { this.ticks = 0; // L: 48 @@ -89,7 +89,7 @@ public class SoundEnvelope { this.max = 0; // L: 52 } // L: 53 - @ObfuscatedName("g") + @ObfuscatedName("y") @Export("doStep") final int doStep(int var1) { if (this.max >= this.ticks) { // L: 56 diff --git a/runescape-client/src/main/java/SoundSystem.java b/runescape-client/src/main/java/SoundSystem.java index abc9790b9a..fc5b1e60fe 100644 --- a/runescape-client/src/main/java/SoundSystem.java +++ b/runescape-client/src/main/java/SoundSystem.java @@ -1,20 +1,32 @@ +import java.awt.Component; +import java.net.URL; 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("bf") +@ObfuscatedName("bq") @Implements("SoundSystem") public class SoundSystem implements Runnable { - @ObfuscatedName("ry") - @ObfuscatedGetter( - intValue = -1787326705 + @ObfuscatedName("g") + @ObfuscatedSignature( + descriptor = "Lnd;" ) - static int field436; - @ObfuscatedName("ez") - static int[] field432; - @ObfuscatedName("h") + @Export("NetCache_responseArchiveBuffer") + public static Buffer NetCache_responseArchiveBuffer; + @ObfuscatedName("bl") + @ObfuscatedSignature( + descriptor = "Ljd;" + ) + static StudioGame field461; + @ObfuscatedName("gq") + @ObfuscatedGetter( + intValue = -27903763 + ) + @Export("baseY") + static int baseY; + @ObfuscatedName("v") @ObfuscatedSignature( descriptor = "[Lbd;" ) @@ -34,26 +46,799 @@ public class SoundSystem implements Runnable { } } } catch (Exception var4) { // L: 17 - class27.RunException_sendStackTrace((String)null, var4); // L: 18 + class266.RunException_sendStackTrace((String)null, var4); // L: 18 } - } // L: 20 + } - @ObfuscatedName("i") + @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "(Liv;IB)V", - garbageValue = "-86" + descriptor = "(II)Leo;", + garbageValue = "-1234409963" ) - @Export("Widget_setKeyIgnoreHeld") - static final void Widget_setKeyIgnoreHeld(Widget var0, int var1) { - if (var0.field3039 == null) { // L: 996 - throw new RuntimeException(); // L: 997 + public static FloorOverlayDefinition method807(int var0) { + FloorOverlayDefinition var1 = (FloorOverlayDefinition)FloorOverlayDefinition.FloorOverlayDefinition_cached.get((long)var0); + if (var1 != null) { // L: 27 + return var1; } else { - if (var0.field3105 == null) { // L: 999 - var0.field3105 = new int[var0.field3039.length]; // L: 1000 + byte[] var2 = class142.FloorOverlayDefinition_archive.takeFile(4, var0); // L: 28 + var1 = new FloorOverlayDefinition(); + if (var2 != null) { + var1.decode(new Buffer(var2), var0); } - var0.field3105[var1] = Integer.MAX_VALUE; // L: 1002 + var1.postDecode(); + FloorOverlayDefinition.FloorOverlayDefinition_cached.put(var1, (long)var0); + return var1; } - } // L: 1003 + } + + @ObfuscatedName("v") + @ObfuscatedSignature( + descriptor = "(IIILfc;Lfz;Z[I[II)I", + garbageValue = "1972841264" + ) + public static int method808(int var0, int var1, int var2, RouteStrategy var3, CollisionMap var4, boolean var5, int[] var6, int[] var7) { + int var9; + for (int var8 = 0; var8 < 128; ++var8) { // L: 19 + for (var9 = 0; var9 < 128; ++var9) { // L: 20 + class159.directions[var8][var9] = 0; // L: 21 + class159.distances[var8][var9] = 99999999; // L: 22 + } + } + + int var10; + int var11; + byte var12; + byte var13; + int var14; + int var15; + byte var16; + int var17; + int[][] var18; + int var19; + int var20; + int var21; + int var22; + boolean var28; + boolean var29; + int var30; + int var31; + int var33; + if (var2 == 1) { // L: 26 + var10 = var0; // L: 29 + var11 = var1; // L: 30 + var12 = 64; + var13 = 64; // L: 32 + var14 = var0 - var12; + var15 = var1 - var13; + class159.directions[var12][var13] = 99; + class159.distances[var12][var13] = 0; + var16 = 0; + var17 = 0; + class159.bufferX[var16] = var0; + var33 = var16 + 1; + class159.bufferY[var16] = var1; + var18 = var4.flags; + + while (true) { + if (var33 == var17) { + UserComparator10.field1457 = var10; // L: 116 + FaceNormal.field2363 = var11; // L: 117 + var29 = false; // L: 118 + break; + } + + var10 = class159.bufferX[var17]; + var11 = class159.bufferY[var17]; + var17 = var17 + 1 & 4095; + var30 = var10 - var14; // L: 48 + var31 = var11 - var15; + var19 = var10 - var4.xInset; + var20 = var11 - var4.yInset; + if (var3.hasArrived(1, var10, var11, var4)) { // L: 52 + UserComparator10.field1457 = var10; // L: 53 + FaceNormal.field2363 = var11; // L: 54 + var29 = true; + break; + } + + var21 = class159.distances[var30][var31] + 1; // L: 58 + if (var30 > 0 && class159.directions[var30 - 1][var31] == 0 && (var18[var19 - 1][var20] & 19136776) == 0) { + class159.bufferX[var33] = var10 - 1; // L: 60 + class159.bufferY[var33] = var11; // L: 61 + var33 = var33 + 1 & 4095; // L: 62 + class159.directions[var30 - 1][var31] = 2; // L: 63 + class159.distances[var30 - 1][var31] = var21; // L: 64 + } + + if (var30 < 127 && class159.directions[var30 + 1][var31] == 0 && (var18[var19 + 1][var20] & 19136896) == 0) { // L: 66 + class159.bufferX[var33] = var10 + 1; // L: 67 + class159.bufferY[var33] = var11; // L: 68 + var33 = var33 + 1 & 4095; // L: 69 + class159.directions[var30 + 1][var31] = 8; // L: 70 + class159.distances[var30 + 1][var31] = var21; // L: 71 + } + + if (var31 > 0 && class159.directions[var30][var31 - 1] == 0 && (var18[var19][var20 - 1] & 19136770) == 0) { // L: 73 + class159.bufferX[var33] = var10; // L: 74 + class159.bufferY[var33] = var11 - 1; // L: 75 + var33 = var33 + 1 & 4095; // L: 76 + class159.directions[var30][var31 - 1] = 1; // L: 77 + class159.distances[var30][var31 - 1] = var21; // L: 78 + } + + if (var31 < 127 && class159.directions[var30][var31 + 1] == 0 && (var18[var19][var20 + 1] & 19136800) == 0) { // L: 80 + class159.bufferX[var33] = var10; // L: 81 + class159.bufferY[var33] = var11 + 1; // L: 82 + var33 = var33 + 1 & 4095; // L: 83 + class159.directions[var30][var31 + 1] = 4; // L: 84 + class159.distances[var30][var31 + 1] = var21; // L: 85 + } + + if (var30 > 0 && var31 > 0 && class159.directions[var30 - 1][var31 - 1] == 0 && (var18[var19 - 1][var20 - 1] & 19136782) == 0 && (var18[var19 - 1][var20] & 19136776) == 0 && (var18[var19][var20 - 1] & 19136770) == 0) { // L: 87 + class159.bufferX[var33] = var10 - 1; // L: 88 + class159.bufferY[var33] = var11 - 1; // L: 89 + var33 = var33 + 1 & 4095; // L: 90 + class159.directions[var30 - 1][var31 - 1] = 3; // L: 91 + class159.distances[var30 - 1][var31 - 1] = var21; // L: 92 + } + + if (var30 < 127 && var31 > 0 && class159.directions[var30 + 1][var31 - 1] == 0 && (var18[var19 + 1][var20 - 1] & 19136899) == 0 && (var18[var19 + 1][var20] & 19136896) == 0 && (var18[var19][var20 - 1] & 19136770) == 0) { // L: 94 + class159.bufferX[var33] = var10 + 1; // L: 95 + class159.bufferY[var33] = var11 - 1; // L: 96 + var33 = var33 + 1 & 4095; // L: 97 + class159.directions[var30 + 1][var31 - 1] = 9; // L: 98 + class159.distances[var30 + 1][var31 - 1] = var21; // L: 99 + } + + if (var30 > 0 && var31 < 127 && class159.directions[var30 - 1][var31 + 1] == 0 && (var18[var19 - 1][var20 + 1] & 19136824) == 0 && (var18[var19 - 1][var20] & 19136776) == 0 && (var18[var19][var20 + 1] & 19136800) == 0) { // L: 101 + class159.bufferX[var33] = var10 - 1; // L: 102 + class159.bufferY[var33] = var11 + 1; // L: 103 + var33 = var33 + 1 & 4095; // L: 104 + class159.directions[var30 - 1][var31 + 1] = 6; // L: 105 + class159.distances[var30 - 1][var31 + 1] = var21; // L: 106 + } + + if (var30 < 127 && var31 < 127 && class159.directions[var30 + 1][var31 + 1] == 0 && (var18[var19 + 1][var20 + 1] & 19136992) == 0 && (var18[var19 + 1][var20] & 19136896) == 0 && (var18[var19][var20 + 1] & 19136800) == 0) { // L: 108 + class159.bufferX[var33] = var10 + 1; // L: 109 + class159.bufferY[var33] = var11 + 1; // L: 110 + var33 = var33 + 1 & 4095; // L: 111 + class159.directions[var30 + 1][var31 + 1] = 12; // L: 112 + class159.distances[var30 + 1][var31 + 1] = var21; // L: 113 + } + } + + var28 = var29; // L: 120 + } else if (var2 == 2) { // L: 122 + var10 = var0; // L: 125 + var11 = var1; // L: 126 + var12 = 64; // L: 127 + var13 = 64; // L: 128 + var14 = var0 - var12; // L: 129 + var15 = var1 - var13; // L: 130 + class159.directions[var12][var13] = 99; // L: 131 + class159.distances[var12][var13] = 0; // L: 132 + var16 = 0; // L: 133 + var17 = 0; // L: 134 + class159.bufferX[var16] = var0; // L: 135 + var33 = var16 + 1; + class159.bufferY[var16] = var1; // L: 136 + var18 = var4.flags; // L: 137 + + while (true) { + if (var33 == var17) { // L: 138 + UserComparator10.field1457 = var10; // L: 238 + FaceNormal.field2363 = var11; // L: 239 + var29 = false; // L: 240 + break; + } + + var10 = class159.bufferX[var17]; // L: 139 + var11 = class159.bufferY[var17]; // L: 140 + var17 = var17 + 1 & 4095; // L: 141 + var30 = var10 - var14; // L: 142 + var31 = var11 - var15; // L: 143 + var19 = var10 - var4.xInset; // L: 144 + var20 = var11 - var4.yInset; // L: 145 + if (var3.hasArrived(2, var10, var11, var4)) { // L: 146 + UserComparator10.field1457 = var10; // L: 147 + FaceNormal.field2363 = var11; // L: 148 + var29 = true; // L: 149 + break; + } + + var21 = class159.distances[var30][var31] + 1; // L: 152 + if (var30 > 0 && class159.directions[var30 - 1][var31] == 0 && (var18[var19 - 1][var20] & 19136782) == 0 && (var18[var19 - 1][var20 + 1] & 19136824) == 0) { // L: 153 154 155 + class159.bufferX[var33] = var10 - 1; + class159.bufferY[var33] = var11; + var33 = var33 + 1 & 4095; + class159.directions[var30 - 1][var31] = 2; // L: 160 + class159.distances[var30 - 1][var31] = var21; // L: 161 + } + + if (var30 < 126 && class159.directions[var30 + 1][var31] == 0 && (var18[var19 + 2][var20] & 19136899) == 0 && (var18[var19 + 2][var20 + 1] & 19136992) == 0) { // L: 163 164 165 166 + class159.bufferX[var33] = var10 + 1; // L: 167 + class159.bufferY[var33] = var11; // L: 168 + var33 = var33 + 1 & 4095; // L: 169 + class159.directions[var30 + 1][var31] = 8; // L: 170 + class159.distances[var30 + 1][var31] = var21; // L: 171 + } + + if (var31 > 0 && class159.directions[var30][var31 - 1] == 0 && (var18[var19][var20 - 1] & 19136782) == 0 && (var18[var19 + 1][var20 - 1] & 19136899) == 0) { // L: 173 174 175 176 + class159.bufferX[var33] = var10; // L: 177 + class159.bufferY[var33] = var11 - 1; // L: 178 + var33 = var33 + 1 & 4095; // L: 179 + class159.directions[var30][var31 - 1] = 1; // L: 180 + class159.distances[var30][var31 - 1] = var21; // L: 181 + } + + if (var31 < 126 && class159.directions[var30][var31 + 1] == 0 && (var18[var19][var20 + 2] & 19136824) == 0 && (var18[var19 + 1][var20 + 2] & 19136992) == 0) { // L: 183 184 185 186 + class159.bufferX[var33] = var10; // L: 187 + class159.bufferY[var33] = var11 + 1; // L: 188 + var33 = var33 + 1 & 4095; // L: 189 + class159.directions[var30][var31 + 1] = 4; // L: 190 + class159.distances[var30][var31 + 1] = var21; // L: 191 + } + + if (var30 > 0 && var31 > 0 && class159.directions[var30 - 1][var31 - 1] == 0 && (var18[var19 - 1][var20] & 19136830) == 0 && (var18[var19 - 1][var20 - 1] & 19136782) == 0 && (var18[var19][var20 - 1] & 19136911) == 0) { // L: 193 194 195 196 197 + class159.bufferX[var33] = var10 - 1; // L: 198 + class159.bufferY[var33] = var11 - 1; // L: 199 + var33 = var33 + 1 & 4095; // L: 200 + class159.directions[var30 - 1][var31 - 1] = 3; // L: 201 + class159.distances[var30 - 1][var31 - 1] = var21; // L: 202 + } + + if (var30 < 126 && var31 > 0 && class159.directions[var30 + 1][var31 - 1] == 0 && (var18[var19 + 1][var20 - 1] & 19136911) == 0 && (var18[var19 + 2][var20 - 1] & 19136899) == 0 && (var18[var19 + 2][var20] & 19136995) == 0) { // L: 204 205 206 207 208 + class159.bufferX[var33] = var10 + 1; // L: 209 + class159.bufferY[var33] = var11 - 1; // L: 210 + var33 = var33 + 1 & 4095; // L: 211 + class159.directions[var30 + 1][var31 - 1] = 9; // L: 212 + class159.distances[var30 + 1][var31 - 1] = var21; // L: 213 + } + + if (var30 > 0 && var31 < 126 && class159.directions[var30 - 1][var31 + 1] == 0 && (var18[var19 - 1][var20 + 1] & 19136830) == 0 && (var18[var19 - 1][var20 + 2] & 19136824) == 0 && (var18[var19][var20 + 2] & 19137016) == 0) { // L: 215 216 217 218 219 + class159.bufferX[var33] = var10 - 1; // L: 220 + class159.bufferY[var33] = var11 + 1; // L: 221 + var33 = var33 + 1 & 4095; // L: 222 + class159.directions[var30 - 1][var31 + 1] = 6; // L: 223 + class159.distances[var30 - 1][var31 + 1] = var21; // L: 224 + } + + if (var30 < 126 && var31 < 126 && class159.directions[var30 + 1][var31 + 1] == 0 && (var18[var19 + 1][var20 + 2] & 19137016) == 0 && (var18[var19 + 2][var20 + 2] & 19136992) == 0 && (var18[var19 + 2][var20 + 1] & 19136995) == 0) { // L: 226 227 228 229 230 + class159.bufferX[var33] = var10 + 1; // L: 231 + class159.bufferY[var33] = var11 + 1; // L: 232 + var33 = var33 + 1 & 4095; // L: 233 + class159.directions[var30 + 1][var31 + 1] = 12; // L: 234 + class159.distances[var30 + 1][var31 + 1] = var21; // L: 235 + } + } + + var28 = var29; // L: 242 + } else { + var10 = var0; // L: 247 + var11 = var1; // L: 248 + var12 = 64; // L: 249 + var13 = 64; // L: 250 + var14 = var0 - var12; // L: 251 + var15 = var1 - var13; // L: 252 + class159.directions[var12][var13] = 99; // L: 253 + class159.distances[var12][var13] = 0; // L: 254 + var16 = 0; // L: 255 + var17 = 0; // L: 256 + class159.bufferX[var16] = var0; // L: 257 + var33 = var16 + 1; + class159.bufferY[var16] = var1; // L: 258 + var18 = var4.flags; // L: 259 + + label768: + while (true) { + label766: + while (true) { + do { + do { + do { + label743: + do { + if (var17 == var33) { // L: 260 + UserComparator10.field1457 = var10; // L: 380 + FaceNormal.field2363 = var11; // L: 381 + var29 = false; // L: 382 + break label768; + } + + var10 = class159.bufferX[var17]; // L: 261 + var11 = class159.bufferY[var17]; // L: 262 + var17 = var17 + 1 & 4095; // L: 263 + var30 = var10 - var14; // L: 264 + var31 = var11 - var15; // L: 265 + var19 = var10 - var4.xInset; // L: 266 + var20 = var11 - var4.yInset; // L: 267 + if (var3.hasArrived(var2, var10, var11, var4)) { // L: 268 + UserComparator10.field1457 = var10; // L: 269 + FaceNormal.field2363 = var11; // L: 270 + var29 = true; // L: 271 + break label768; + } + + var21 = class159.distances[var30][var31] + 1; // L: 274 + if (var30 > 0 && class159.directions[var30 - 1][var31] == 0 && (var18[var19 - 1][var20] & 19136782) == 0 && (var18[var19 - 1][var20 + var2 - 1] & 19136824) == 0) { // L: 275 276 277 278 + var22 = 1; + + while (true) { + if (var22 >= var2 - 1) { + class159.bufferX[var33] = var10 - 1; // L: 282 + class159.bufferY[var33] = var11; // L: 283 + var33 = var33 + 1 & 4095; // L: 284 + class159.directions[var30 - 1][var31] = 2; // L: 285 + class159.distances[var30 - 1][var31] = var21; // L: 286 + break; + } + + if ((var18[var19 - 1][var22 + var20] & 19136830) != 0) { // L: 280 + break; + } + + ++var22; // L: 279 + } + } + + if (var30 < 128 - var2 && class159.directions[var30 + 1][var31] == 0 && (var18[var19 + var2][var20] & 19136899) == 0 && (var18[var19 + var2][var20 + var2 - 1] & 19136992) == 0) { // L: 288 289 290 291 + var22 = 1; + + while (true) { + if (var22 >= var2 - 1) { + class159.bufferX[var33] = var10 + 1; // L: 295 + class159.bufferY[var33] = var11; // L: 296 + var33 = var33 + 1 & 4095; // L: 297 + class159.directions[var30 + 1][var31] = 8; // L: 298 + class159.distances[var30 + 1][var31] = var21; // L: 299 + break; + } + + if ((var18[var19 + var2][var22 + var20] & 19136995) != 0) { // L: 293 + break; + } + + ++var22; // L: 292 + } + } + + if (var31 > 0 && class159.directions[var30][var31 - 1] == 0 && (var18[var19][var20 - 1] & 19136782) == 0 && (var18[var19 + var2 - 1][var20 - 1] & 19136899) == 0) { // L: 301 302 303 304 + var22 = 1; + + while (true) { + if (var22 >= var2 - 1) { + class159.bufferX[var33] = var10; // L: 308 + class159.bufferY[var33] = var11 - 1; // L: 309 + var33 = var33 + 1 & 4095; // L: 310 + class159.directions[var30][var31 - 1] = 1; // L: 311 + class159.distances[var30][var31 - 1] = var21; // L: 312 + break; + } + + if ((var18[var19 + var22][var20 - 1] & 19136911) != 0) { // L: 306 + break; + } + + ++var22; // L: 305 + } + } + + if (var31 < 128 - var2 && class159.directions[var30][var31 + 1] == 0 && (var18[var19][var20 + var2] & 19136824) == 0 && (var18[var19 + var2 - 1][var20 + var2] & 19136992) == 0) { // L: 314 315 316 317 + var22 = 1; + + while (true) { + if (var22 >= var2 - 1) { + class159.bufferX[var33] = var10; // L: 321 + class159.bufferY[var33] = var11 + 1; // L: 322 + var33 = var33 + 1 & 4095; // L: 323 + class159.directions[var30][var31 + 1] = 4; // L: 324 + class159.distances[var30][var31 + 1] = var21; // L: 325 + break; + } + + if ((var18[var22 + var19][var20 + var2] & 19137016) != 0) { // L: 319 + break; + } + + ++var22; // L: 318 + } + } + + if (var30 > 0 && var31 > 0 && class159.directions[var30 - 1][var31 - 1] == 0 && (var18[var19 - 1][var20 - 1] & 19136782) == 0) { // L: 327 328 329 + var22 = 1; + + while (true) { + if (var22 >= var2) { + class159.bufferX[var33] = var10 - 1; // L: 334 + class159.bufferY[var33] = var11 - 1; // L: 335 + var33 = var33 + 1 & 4095; // L: 336 + class159.directions[var30 - 1][var31 - 1] = 3; // L: 337 + class159.distances[var30 - 1][var31 - 1] = var21; // L: 338 + break; + } + + if ((var18[var19 - 1][var22 + (var20 - 1)] & 19136830) != 0 || (var18[var22 + (var19 - 1)][var20 - 1] & 19136911) != 0) { // L: 331 332 + break; + } + + ++var22; // L: 330 + } + } + + if (var30 < 128 - var2 && var31 > 0 && class159.directions[var30 + 1][var31 - 1] == 0 && (var18[var19 + var2][var20 - 1] & 19136899) == 0) { // L: 340 341 342 + var22 = 1; + + while (true) { + if (var22 >= var2) { + class159.bufferX[var33] = var10 + 1; // L: 347 + class159.bufferY[var33] = var11 - 1; // L: 348 + var33 = var33 + 1 & 4095; // L: 349 + class159.directions[var30 + 1][var31 - 1] = 9; // L: 350 + class159.distances[var30 + 1][var31 - 1] = var21; // L: 351 + break; + } + + if ((var18[var19 + var2][var22 + (var20 - 1)] & 19136995) != 0 || (var18[var19 + var22][var20 - 1] & 19136911) != 0) { // L: 344 345 + break; + } + + ++var22; // L: 343 + } + } + + if (var30 > 0 && var31 < 128 - var2 && class159.directions[var30 - 1][var31 + 1] == 0 && (var18[var19 - 1][var20 + var2] & 19136824) == 0) { // L: 353 354 355 + for (var22 = 1; var22 < var2; ++var22) { // L: 356 + if ((var18[var19 - 1][var20 + var22] & 19136830) != 0 || (var18[var22 + (var19 - 1)][var20 + var2] & 19137016) != 0) { // L: 357 358 + continue label743; + } + } + + class159.bufferX[var33] = var10 - 1; // L: 360 + class159.bufferY[var33] = var11 + 1; // L: 361 + var33 = var33 + 1 & 4095; // L: 362 + class159.directions[var30 - 1][var31 + 1] = 6; // L: 363 + class159.distances[var30 - 1][var31 + 1] = var21; // L: 364 + } + } while(var30 >= 128 - var2); // L: 366 + } while(var31 >= 128 - var2); + } while(class159.directions[var30 + 1][var31 + 1] != 0); // L: 367 + } while((var18[var19 + var2][var20 + var2] & 19136992) != 0); // L: 368 + + for (var22 = 1; var22 < var2; ++var22) { // L: 369 + if ((var18[var22 + var19][var20 + var2] & 19137016) != 0 || (var18[var19 + var2][var22 + var20] & 19136995) != 0) { // L: 370 371 + continue label766; + } + } + + class159.bufferX[var33] = var10 + 1; // L: 373 + class159.bufferY[var33] = var11 + 1; // L: 374 + var33 = var33 + 1 & 4095; // L: 375 + class159.directions[var30 + 1][var31 + 1] = 12; // L: 376 + class159.distances[var30 + 1][var31 + 1] = var21; // L: 377 + } + } + + var28 = var29; // L: 384 + } + + var9 = var0 - 64; // L: 386 + var10 = var1 - 64; // L: 387 + var11 = UserComparator10.field1457; // L: 388 + var30 = FaceNormal.field2363; // L: 389 + if (!var28) { // L: 390 + var31 = Integer.MAX_VALUE; // L: 392 + var14 = Integer.MAX_VALUE; // L: 393 + byte var32 = 10; // L: 394 + var33 = var3.approxDestinationX; // L: 395 + var17 = var3.approxDestinationY; // L: 396 + int var27 = var3.approxDestinationSizeX; // L: 397 + var19 = var3.approxDestinationSizeY; // L: 398 + + for (var20 = var33 - var32; var20 <= var33 + var32; ++var20) { // L: 399 + for (var21 = var17 - var32; var21 <= var32 + var17; ++var21) { // L: 400 + var22 = var20 - var9; // L: 401 + int var23 = var21 - var10; // L: 402 + if (var22 >= 0 && var23 >= 0 && var22 < 128 && var23 < 128 && class159.distances[var22][var23] < 100) { // L: 403 404 + int var24 = 0; // L: 405 + if (var20 < var33) { // L: 406 + var24 = var33 - var20; + } else if (var20 > var33 + var27 - 1) { // L: 407 + var24 = var20 - (var33 + var27 - 1); + } + + int var25 = 0; // L: 408 + if (var21 < var17) { // L: 409 + var25 = var17 - var21; + } else if (var21 > var17 + var19 - 1) { // L: 410 + var25 = var21 - (var19 + var17 - 1); + } + + int var26 = var25 * var25 + var24 * var24; // L: 411 + if (var26 < var31 || var31 == var26 && class159.distances[var22][var23] < var14) { // L: 412 + var31 = var26; // L: 413 + var14 = class159.distances[var22][var23]; // L: 414 + var11 = var20; // L: 415 + var30 = var21; // L: 416 + } + } + } + } + + if (var31 == Integer.MAX_VALUE) { // L: 422 + return -1; + } + } + + if (var0 == var11 && var30 == var1) { // L: 426 + return 0; + } else { + var13 = 0; // L: 427 + class159.bufferX[var13] = var11; // L: 430 + var31 = var13 + 1; + class159.bufferY[var13] = var30; // L: 431 + + for (var14 = var15 = class159.directions[var11 - var9][var30 - var10]; var0 != var11 || var30 != var1; var14 = class159.directions[var11 - var9][var30 - var10]) { // L: 432 433 443 + if (var14 != var15) { // L: 434 + var15 = var14; // L: 435 + class159.bufferX[var31] = var11; // L: 436 + class159.bufferY[var31++] = var30; // L: 437 + } + + if ((var14 & 2) != 0) { // L: 439 + ++var11; + } else if ((var14 & 8) != 0) { // L: 440 + --var11; + } + + if ((var14 & 1) != 0) { // L: 441 + ++var30; + } else if ((var14 & 4) != 0) { // L: 442 + --var30; + } + } + + var33 = 0; // L: 445 + + while (var31-- > 0) { // L: 446 + var6[var33] = class159.bufferX[var31]; // L: 447 + var7[var33++] = class159.bufferY[var31]; // L: 448 + if (var33 >= var6.length) { // L: 449 + break; + } + } + + return var33; // L: 451 + } + } + + @ObfuscatedName("v") + @ObfuscatedSignature( + descriptor = "(I)Z", + garbageValue = "2145982637" + ) + @Export("loadWorlds") + static boolean loadWorlds() { + try { + if (MilliClock.World_request == null) { // L: 31 + MilliClock.World_request = ServerPacket.urlRequester.request(new URL(class6.field58)); + } else if (MilliClock.World_request.isDone()) { // L: 33 + byte[] var0 = MilliClock.World_request.getResponse(); // L: 34 + Buffer var1 = new Buffer(var0); // L: 35 + var1.readInt(); // L: 36 + World.World_count = var1.readUnsignedShort(); // L: 37 + Tiles.World_worlds = new World[World.World_count]; // L: 38 + + World var3; + for (int var2 = 0; var2 < World.World_count; var3.index = var2++) { // L: 39 47 + var3 = Tiles.World_worlds[var2] = new World(); // L: 40 + var3.id = var1.readUnsignedShort(); // L: 41 + var3.properties = var1.readInt(); // L: 42 + var3.host = var1.readStringCp1252NullTerminated(); // L: 43 + var3.activity = var1.readStringCp1252NullTerminated(); // L: 44 + var3.location = var1.readUnsignedByte(); // L: 45 + var3.population = var1.readShort(); // L: 46 + } + + SoundCache.sortWorlds(Tiles.World_worlds, 0, Tiles.World_worlds.length - 1, World.World_sortOption1, World.World_sortOption2); // L: 49 + MilliClock.World_request = null; // L: 50 + return true; // L: 51 + } + } catch (Exception var4) { // L: 55 + var4.printStackTrace(); // L: 56 + MilliClock.World_request = null; // L: 57 + } + + return false; // L: 59 + } + + @ObfuscatedName("f") + @ObfuscatedSignature( + descriptor = "(Ljava/awt/Component;B)V", + garbageValue = "-28" + ) + static void method803(Component var0) { + var0.removeKeyListener(KeyHandler.KeyHandler_instance); // L: 156 + var0.removeFocusListener(KeyHandler.KeyHandler_instance); // L: 157 + KeyHandler.field288 = -1; // L: 158 + } // L: 159 + + @ObfuscatedName("u") + @ObfuscatedSignature( + descriptor = "(IIIIB)I", + garbageValue = "-61" + ) + static final int method806(int var0, int var1, int var2, int var3) { + int var4 = 65536 - Rasterizer3D.Rasterizer3D_cosine[var2 * 1024 / var3] >> 1; // L: 828 + return ((65536 - var4) * var0 >> 16) + (var4 * var1 >> 16); // L: 829 + } + + @ObfuscatedName("hr") + @ObfuscatedSignature( + descriptor = "(ZLnb;I)V", + garbageValue = "-964489928" + ) + @Export("updateNpcs") + static final void updateNpcs(boolean var0, PacketBuffer var1) { + Client.field762 = 0; // L: 7327 + Client.field685 = 0; // L: 7328 + PacketBuffer var2 = Client.packetWriter.packetBuffer; // L: 7330 + var2.importIndex(); // L: 7331 + int var3 = var2.readBits(8); // L: 7332 + int var4; + if (var3 < Client.npcCount) { // L: 7333 + for (var4 = var3; var4 < Client.npcCount; ++var4) { // L: 7334 + Client.field771[++Client.field762 - 1] = Client.npcIndices[var4]; + } + } + + if (var3 > Client.npcCount) { // L: 7336 + throw new RuntimeException(""); + } else { + Client.npcCount = 0; // L: 7337 + + int var5; + int var7; + int var8; + int var9; + for (var4 = 0; var4 < var3; ++var4) { // L: 7338 + var5 = Client.npcIndices[var4]; // L: 7339 + NPC var14 = Client.npcs[var5]; // L: 7340 + var7 = var2.readBits(1); // L: 7341 + if (var7 == 0) { // L: 7342 + Client.npcIndices[++Client.npcCount - 1] = var5; // L: 7343 + var14.npcCycle = Client.cycle; // L: 7344 + } else { + var8 = var2.readBits(2); // L: 7347 + if (var8 == 0) { // L: 7348 + Client.npcIndices[++Client.npcCount - 1] = var5; // L: 7349 + var14.npcCycle = Client.cycle; // L: 7350 + Client.field686[++Client.field685 - 1] = var5; // L: 7351 + } else { + int var10; + if (var8 == 1) { // L: 7354 + Client.npcIndices[++Client.npcCount - 1] = var5; // L: 7355 + var14.npcCycle = Client.cycle; // L: 7356 + var9 = var2.readBits(3); // L: 7357 + var14.method2259(var9, (byte)1); // L: 7358 + var10 = var2.readBits(1); // L: 7359 + if (var10 == 1) { // L: 7360 + Client.field686[++Client.field685 - 1] = var5; + } + } else if (var8 == 2) { // L: 7363 + Client.npcIndices[++Client.npcCount - 1] = var5; // L: 7364 + var14.npcCycle = Client.cycle; // L: 7365 + var9 = var2.readBits(3); // L: 7366 + var14.method2259(var9, (byte)2); // L: 7367 + var10 = var2.readBits(3); // L: 7368 + var14.method2259(var10, (byte)2); // L: 7369 + int var11 = var2.readBits(1); // L: 7370 + if (var11 == 1) { // L: 7371 + Client.field686[++Client.field685 - 1] = var5; + } + } else if (var8 == 3) { // L: 7374 + Client.field771[++Client.field762 - 1] = var5; // L: 7375 + } + } + } + } + + int var12; + while (var1.bitsRemaining(Client.packetWriter.serverPacketLength) >= 27) { // L: 7382 + var12 = var1.readBits(15); // L: 7383 + if (var12 == 32767) { // L: 7384 + break; + } + + boolean var15 = false; // L: 7385 + if (Client.npcs[var12] == null) { // L: 7386 + Client.npcs[var12] = new NPC(); // L: 7387 + var15 = true; // L: 7388 + } + + NPC var13 = Client.npcs[var12]; // L: 7390 + Client.npcIndices[++Client.npcCount - 1] = var12; // L: 7391 + var13.npcCycle = Client.cycle; // L: 7392 + var13.definition = StructComposition.getNpcDefinition(var1.readBits(14)); // L: 7396 + if (var0) { // L: 7397 + var7 = var1.readBits(8); // L: 7398 + if (var7 > 127) { // L: 7399 + var7 -= 256; + } + } else { + var7 = var1.readBits(5); // L: 7402 + if (var7 > 15) { // L: 7403 + var7 -= 32; + } + } + + int var6; + if (var0) { // L: 7405 + var6 = var1.readBits(8); // L: 7406 + if (var6 > 127) { // L: 7407 + var6 -= 256; + } + } else { + var6 = var1.readBits(5); // L: 7410 + if (var6 > 15) { // L: 7411 + var6 -= 32; + } + } + + var8 = Client.defaultRotations[var1.readBits(3)]; // L: 7413 + if (var15) { // L: 7414 + var13.orientation = var13.rotation = var8; + } + + var9 = var1.readBits(1); // L: 7415 + if (var9 == 1) { // L: 7416 + Client.field686[++Client.field685 - 1] = var12; + } + + boolean var16 = var1.readBits(1) == 1; // L: 7417 + if (var16) { // L: 7418 + var1.readBits(32); // L: 7419 + } + + var5 = var1.readBits(1); // L: 7421 + var13.field1239 = var13.definition.size; // L: 7422 + var13.field1289 = var13.definition.rotation; // L: 7423 + if (var13.field1289 == 0) { // L: 7424 + var13.rotation = 0; + } + + var13.walkSequence = var13.definition.walkSequence; // L: 7425 + var13.walkBackSequence = var13.definition.walkBackSequence; // L: 7426 + var13.walkLeftSequence = var13.definition.walkLeftSequence; // L: 7427 + var13.walkRightSequence = var13.definition.walkRightSequence; // L: 7428 + var13.idleSequence = var13.definition.idleSequence; // L: 7429 + var13.turnLeftSequence = var13.definition.turnLeftSequence; // L: 7430 + var13.turnRightSequence = var13.definition.turnRightSequence; // L: 7431 + var13.method2260(class93.localPlayer.pathX[0] + var6, class93.localPlayer.pathY[0] + var7, var5 == 1); // L: 7432 + } + + var1.exportIndex(); // L: 7434 + ScriptEvent.method2094(var1); // L: 7436 + + for (var12 = 0; var12 < Client.field762; ++var12) { // L: 7437 + var3 = Client.field771[var12]; // L: 7438 + if (Client.npcs[var3].npcCycle != Client.cycle) { // L: 7439 + Client.npcs[var3].definition = null; // L: 7440 + Client.npcs[var3] = null; // L: 7441 + } + } + + if (var1.offset != Client.packetWriter.serverPacketLength) { // L: 7444 + throw new RuntimeException(var1.offset + "," + Client.packetWriter.serverPacketLength); + } else { + for (var12 = 0; var12 < Client.npcCount; ++var12) { // L: 7445 + if (Client.npcs[Client.npcIndices[var12]] == null) { // L: 7446 + throw new RuntimeException(var12 + "," + Client.npcCount); // L: 7447 + } + } + + } + } + } // L: 7450 } diff --git a/runescape-client/src/main/java/SpotAnimationDefinition.java b/runescape-client/src/main/java/SpotAnimationDefinition.java index c0cf71da2e..55c8046ff0 100644 --- a/runescape-client/src/main/java/SpotAnimationDefinition.java +++ b/runescape-client/src/main/java/SpotAnimationDefinition.java @@ -1,96 +1,99 @@ -import java.lang.management.GarbageCollectorMXBean; -import java.lang.management.ManagementFactory; -import java.util.Iterator; 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("ef") +@ObfuscatedName("es") @Implements("SpotAnimationDefinition") public class SpotAnimationDefinition extends DualNode { - @ObfuscatedName("h") + @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "Ljp;" + descriptor = "Ljv;" ) @Export("SpotAnimationDefinition_archive") static AbstractArchive SpotAnimationDefinition_archive; - @ObfuscatedName("c") + @ObfuscatedName("n") @ObfuscatedSignature( - descriptor = "Ljp;" + descriptor = "Ljv;" ) @Export("SpotAnimationDefinition_modelArchive") static AbstractArchive SpotAnimationDefinition_modelArchive; - @ObfuscatedName("o") + @ObfuscatedName("f") @ObfuscatedSignature( - descriptor = "Lho;" + descriptor = "Lhz;" ) @Export("SpotAnimationDefinition_cached") - static EvictingDualNodeHashTable SpotAnimationDefinition_cached; - @ObfuscatedName("g") + public static EvictingDualNodeHashTable SpotAnimationDefinition_cached; + @ObfuscatedName("y") @ObfuscatedSignature( - descriptor = "Lho;" + descriptor = "Lhz;" ) @Export("SpotAnimationDefinition_cachedModels") - static EvictingDualNodeHashTable SpotAnimationDefinition_cachedModels; - @ObfuscatedName("l") + public static EvictingDualNodeHashTable SpotAnimationDefinition_cachedModels; + @ObfuscatedName("hq") @ObfuscatedGetter( - intValue = 380385743 + intValue = -1584922015 + ) + @Export("cameraPitch") + static int cameraPitch; + @ObfuscatedName("p") + @ObfuscatedGetter( + intValue = -1517431137 ) @Export("id") int id; - @ObfuscatedName("z") + @ObfuscatedName("j") @ObfuscatedGetter( - intValue = 130190351 + intValue = -439820555 ) @Export("archive") int archive; - @ObfuscatedName("t") + @ObfuscatedName("r") @ObfuscatedGetter( - intValue = 507083685 + intValue = -814046371 ) @Export("sequence") public int sequence; - @ObfuscatedName("v") + @ObfuscatedName("b") @Export("recolorFrom") short[] recolorFrom; - @ObfuscatedName("b") + @ObfuscatedName("d") @Export("recolorTo") short[] recolorTo; - @ObfuscatedName("q") + @ObfuscatedName("s") @Export("retextureFrom") short[] retextureFrom; - @ObfuscatedName("i") + @ObfuscatedName("u") @Export("retextureTo") short[] retextureTo; - @ObfuscatedName("x") + @ObfuscatedName("l") @ObfuscatedGetter( - intValue = -118030919 + intValue = -1653169243 ) @Export("widthScale") int widthScale; - @ObfuscatedName("k") + @ObfuscatedName("o") @ObfuscatedGetter( - intValue = 1475991545 + intValue = 1577696091 ) @Export("heightScale") int heightScale; - @ObfuscatedName("r") + @ObfuscatedName("c") @ObfuscatedGetter( - intValue = -170389419 + intValue = 1414282043 ) @Export("orientation") int orientation; - @ObfuscatedName("p") + @ObfuscatedName("e") @ObfuscatedGetter( - intValue = 97378291 + intValue = 1878430379 ) @Export("ambient") int ambient; - @ObfuscatedName("a") + @ObfuscatedName("g") @ObfuscatedGetter( - intValue = 1756548977 + intValue = -191851365 ) @Export("contrast") int contrast; @@ -109,10 +112,10 @@ public class SpotAnimationDefinition extends DualNode { this.contrast = 0; // L: 27 } // L: 29 - @ObfuscatedName("o") + @ObfuscatedName("f") @ObfuscatedSignature( - descriptor = "(Lnk;B)V", - garbageValue = "-108" + descriptor = "(Lnd;I)V", + garbageValue = "-929011134" ) @Export("decode") void decode(Buffer var1) { @@ -126,10 +129,10 @@ public class SpotAnimationDefinition extends DualNode { } } - @ObfuscatedName("g") + @ObfuscatedName("y") @ObfuscatedSignature( - descriptor = "(Lnk;II)V", - garbageValue = "-113504660" + descriptor = "(Lnd;IB)V", + garbageValue = "-81" ) @Export("decodeNext") void decodeNext(Buffer var1, int var2) { @@ -173,10 +176,10 @@ public class SpotAnimationDefinition extends DualNode { } // L: 82 - @ObfuscatedName("l") + @ObfuscatedName("p") @ObfuscatedSignature( - descriptor = "(IB)Lgj;", - garbageValue = "11" + descriptor = "(IB)Lgr;", + garbageValue = "42" ) @Export("getModel") public final Model getModel(int var1) { @@ -206,7 +209,7 @@ public class SpotAnimationDefinition extends DualNode { Model var5; if (this.sequence != -1 && var1 != -1) { // L: 103 - var5 = Player.SequenceDefinition_get(this.sequence).transformSpotAnimationModel(var2, var1); + var5 = LoginScreenAnimation.SequenceDefinition_get(this.sequence).transformSpotAnimationModel(var2, var1); } else { var5 = var2.toSharedSpotAnimationModel(true); // L: 104 } @@ -235,45 +238,24 @@ public class SpotAnimationDefinition extends DualNode { return var5; // L: 118 } - @ObfuscatedName("az") + @ObfuscatedName("r") @ObfuscatedSignature( - descriptor = "(B)I", - garbageValue = "18" + descriptor = "(I)Lbg;", + garbageValue = "395857864" ) - @Export("getGcDuration") - protected static int getGcDuration() { - int var0 = 0; // L: 539 - if (class266.garbageCollector == null || !class266.garbageCollector.isValid()) { // L: 540 - try { - Iterator var1 = ManagementFactory.getGarbageCollectorMXBeans().iterator(); // L: 542 + @Export("worldListStart") + static World worldListStart() { + World.World_listCount = 0; // L: 247 + return GraphicsObject.getNextWorldListWorld(); // L: 248 + } - while (var1.hasNext()) { - GarbageCollectorMXBean var2 = (GarbageCollectorMXBean)var1.next(); // L: 543 - if (var2.isValid()) { // L: 545 - class266.garbageCollector = var2; // L: 546 - GameEngine.garbageCollectorLastCheckTimeMs = -1L; // L: 547 - GameEngine.garbageCollectorLastCollectionTime = -1L; // L: 548 - } - } - } catch (Throwable var11) { // L: 553 - } - } - - if (class266.garbageCollector != null) { // L: 555 - long var9 = Archive.currentTimeMillis(); // L: 556 - long var3 = class266.garbageCollector.getCollectionTime(); // L: 557 - if (GameEngine.garbageCollectorLastCollectionTime != -1L) { // L: 558 - long var5 = var3 - GameEngine.garbageCollectorLastCollectionTime; // L: 559 - long var7 = var9 - GameEngine.garbageCollectorLastCheckTimeMs; // L: 560 - if (0L != var7) { // L: 561 - var0 = (int)(100L * var5 / var7); - } - } - - GameEngine.garbageCollectorLastCollectionTime = var3; // L: 563 - GameEngine.garbageCollectorLastCheckTimeMs = var9; // L: 564 - } - - return var0; // L: 566 + @ObfuscatedName("gb") + @ObfuscatedSignature( + descriptor = "(I)I", + garbageValue = "702215999" + ) + @Export("getWindowedMode") + static int getWindowedMode() { + return Client.isResizable ? 2 : 1; // L: 3909 } } diff --git a/runescape-client/src/main/java/SpriteMask.java b/runescape-client/src/main/java/SpriteMask.java index 64a0e5dd32..754f639ce9 100644 --- a/runescape-client/src/main/java/SpriteMask.java +++ b/runescape-client/src/main/java/SpriteMask.java @@ -4,100 +4,55 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("il") +@ObfuscatedName("it") @Implements("SpriteMask") public class SpriteMask extends DualNode { - @ObfuscatedName("le") + @ObfuscatedName("s") @ObfuscatedSignature( - descriptor = "Liv;" + descriptor = "Ljv;" ) - @Export("mousedOverWidgetIf1") - static Widget mousedOverWidgetIf1; - @ObfuscatedName("h") + @Export("Widget_modelsArchive") + public static AbstractArchive Widget_modelsArchive; + @ObfuscatedName("v") @ObfuscatedGetter( - intValue = -57345859 + intValue = 1279799405 ) @Export("width") public final int width; - @ObfuscatedName("c") + @ObfuscatedName("n") @ObfuscatedGetter( - intValue = -1034631213 + intValue = -1973837741 ) @Export("height") public final int height; - @ObfuscatedName("o") + @ObfuscatedName("f") @Export("xWidths") public final int[] xWidths; - @ObfuscatedName("g") + @ObfuscatedName("y") @Export("xStarts") public final int[] xStarts; SpriteMask(int var1, int var2, int[] var3, int[] var4, int var5) { - this.width = var1; // L: 752 - this.height = var2; // L: 753 - this.xWidths = var3; // L: 754 - this.xStarts = var4; // L: 755 - } // L: 756 + this.width = var1; // L: 691 + this.height = var2; // L: 692 + this.xWidths = var3; // L: 693 + this.xStarts = var4; // L: 694 + } // L: 695 - @ObfuscatedName("h") + @ObfuscatedName("v") @ObfuscatedSignature( descriptor = "(III)Z", - garbageValue = "1887065714" + garbageValue = "-1353633749" ) @Export("contains") public boolean contains(int var1, int var2) { - if (var2 >= 0 && var2 < this.xStarts.length) { // L: 759 - int var3 = this.xStarts[var2]; // L: 760 - if (var1 >= var3 && var1 <= var3 + this.xWidths[var2]) { // L: 761 + if (var2 >= 0 && var2 < this.xStarts.length) { // L: 698 + int var3 = this.xStarts[var2]; // L: 699 + if (var1 >= var3 && var1 <= var3 + this.xWidths[var2]) { // L: 700 return true; } } - return false; // L: 763 + return false; // L: 702 } - - @ObfuscatedName("jj") - @ObfuscatedSignature( - descriptor = "(Liv;IIIIIII)V", - garbageValue = "-565200159" - ) - static final void method4580(Widget var0, int var1, int var2, int var3, int var4, int var5, int var6) { - if (Client.field683) { // L: 10106 - Client.alternativeScrollbarWidth = 32; - } else { - Client.alternativeScrollbarWidth = 0; // L: 10107 - } - - Client.field683 = false; // L: 10108 - int var7; - if (MouseHandler.MouseHandler_currentButton == 1 || !class229.mouseCam && MouseHandler.MouseHandler_currentButton == 4) { // L: 10109 - if (var5 >= var1 && var5 < var1 + 16 && var6 >= var2 && var6 < var2 + 16) { // L: 10110 - var0.scrollY -= 4; // L: 10111 - VerticalAlignment.invalidateWidget(var0); // L: 10112 - } else if (var5 >= var1 && var5 < var1 + 16 && var6 >= var3 + var2 - 16 && var6 < var3 + var2) { // L: 10114 - var0.scrollY += 4; // L: 10115 - VerticalAlignment.invalidateWidget(var0); // L: 10116 - } else if (var5 >= var1 - Client.alternativeScrollbarWidth && var5 < Client.alternativeScrollbarWidth + var1 + 16 && var6 >= var2 + 16 && var6 < var3 + var2 - 16) { // L: 10118 - var7 = var3 * (var3 - 32) / var4; // L: 10119 - if (var7 < 8) { // L: 10120 - var7 = 8; - } - - int var8 = var6 - var2 - 16 - var7 / 2; // L: 10121 - int var9 = var3 - 32 - var7; // L: 10122 - var0.scrollY = var8 * (var4 - var3) / var9; // L: 10123 - VerticalAlignment.invalidateWidget(var0); // L: 10124 - Client.field683 = true; // L: 10125 - } - } - - if (Client.mouseWheelRotation != 0) { // L: 10128 - var7 = var0.width; // L: 10129 - if (var5 >= var1 - var7 && var6 >= var2 && var5 < var1 + 16 && var6 <= var3 + var2) { // L: 10130 - var0.scrollY += Client.mouseWheelRotation * 45; // L: 10131 - VerticalAlignment.invalidateWidget(var0); // L: 10132 - } - } - - } // L: 10135 } diff --git a/runescape-client/src/main/java/SpritePixels.java b/runescape-client/src/main/java/SpritePixels.java index 243113d71e..61bc5d1eb2 100644 --- a/runescape-client/src/main/java/SpritePixels.java +++ b/runescape-client/src/main/java/SpritePixels.java @@ -3,28 +3,28 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ow") +@ObfuscatedName("oh") @Implements("SpritePixels") public final class SpritePixels extends Rasterizer2D { - @ObfuscatedName("h") + @ObfuscatedName("v") @Export("pixels") public int[] pixels; - @ObfuscatedName("c") + @ObfuscatedName("n") @Export("subWidth") public int subWidth; - @ObfuscatedName("o") + @ObfuscatedName("f") @Export("subHeight") public int subHeight; - @ObfuscatedName("g") + @ObfuscatedName("y") @Export("xOffset") public int xOffset; - @ObfuscatedName("l") + @ObfuscatedName("p") @Export("yOffset") int yOffset; - @ObfuscatedName("z") + @ObfuscatedName("j") @Export("width") public int width; - @ObfuscatedName("t") + @ObfuscatedName("r") @Export("height") public int height; @@ -43,9 +43,9 @@ public final class SpritePixels extends Rasterizer2D { SpritePixels() { } // L: 19 - @ObfuscatedName("h") + @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "()Low;" + descriptor = "()Loh;" ) @Export("mirrorHorizontally") public SpritePixels mirrorHorizontally() { @@ -64,9 +64,9 @@ public final class SpritePixels extends Rasterizer2D { return var1; // L: 44 } - @ObfuscatedName("c") + @ObfuscatedName("n") @ObfuscatedSignature( - descriptor = "()Low;" + descriptor = "()Loh;" ) @Export("copyNormalized") public SpritePixels copyNormalized() { @@ -81,13 +81,13 @@ public final class SpritePixels extends Rasterizer2D { return var1; // L: 54 } - @ObfuscatedName("o") + @ObfuscatedName("f") @Export("setRaster") public void setRaster() { Rasterizer2D.Rasterizer2D_replace(this.pixels, this.subWidth, this.subHeight); // L: 58 } // L: 59 - @ObfuscatedName("g") + @ObfuscatedName("y") @Export("normalize") public void normalize() { if (this.subWidth != this.width || this.subHeight != this.height) { // L: 62 @@ -107,7 +107,7 @@ public final class SpritePixels extends Rasterizer2D { } } // L: 74 - @ObfuscatedName("l") + @ObfuscatedName("p") @Export("pad") public void pad(int var1) { if (this.subWidth != this.width || this.subHeight != this.height) { // L: 77 @@ -149,7 +149,7 @@ public final class SpritePixels extends Rasterizer2D { } } // L: 99 - @ObfuscatedName("z") + @ObfuscatedName("j") @Export("flipHorizontally") public void flipHorizontally() { int[] var1 = new int[this.subWidth * this.subHeight]; // L: 102 @@ -165,7 +165,7 @@ public final class SpritePixels extends Rasterizer2D { this.xOffset = this.width - this.subWidth - this.xOffset; // L: 108 } // L: 109 - @ObfuscatedName("t") + @ObfuscatedName("r") @Export("flipVertically") public void flipVertically() { int[] var1 = new int[this.subWidth * this.subHeight]; // L: 112 @@ -181,7 +181,7 @@ public final class SpritePixels extends Rasterizer2D { this.yOffset = this.height - this.subHeight - this.yOffset; // L: 118 } // L: 119 - @ObfuscatedName("v") + @ObfuscatedName("b") @Export("outline") public void outline(int var1) { int[] var2 = new int[this.subWidth * this.subHeight]; // L: 122 @@ -209,22 +209,22 @@ public final class SpritePixels extends Rasterizer2D { this.pixels = var2; // L: 136 } // L: 137 - @ObfuscatedName("b") + @ObfuscatedName("d") @Export("shadow") public void shadow(int var1) { for (int var2 = this.subHeight - 1; var2 > 0; --var2) { // L: 140 int var3 = var2 * this.subWidth; // L: 141 for (int var4 = this.subWidth - 1; var4 > 0; --var4) { // L: 142 - if (this.pixels[var4 + var3] == 0 && this.pixels[var4 + var3 - 1 - this.subWidth] != 0) { - this.pixels[var4 + var3] = var1; // L: 143 + if (this.pixels[var4 + var3] == 0 && this.pixels[var4 + var3 - 1 - this.subWidth] != 0) { // L: 143 + this.pixels[var4 + var3] = var1; } } } } // L: 146 - @ObfuscatedName("q") + @ObfuscatedName("s") @Export("drawAt") public void drawAt(int var1, int var2) { var1 += this.xOffset; // L: 149 @@ -270,7 +270,7 @@ public final class SpritePixels extends Rasterizer2D { } } // L: 182 - @ObfuscatedName("x") + @ObfuscatedName("l") @Export("drawTransBgAt") public void drawTransBgAt(int var1, int var2) { var1 += this.xOffset; // L: 203 @@ -316,7 +316,7 @@ public final class SpritePixels extends Rasterizer2D { } } // L: 236 - @ObfuscatedName("r") + @ObfuscatedName("c") @Export("drawScaledAt") public void drawScaledAt(int var1, int var2, int var3, int var4) { if (var3 > 0 && var4 > 0) { // L: 267 @@ -381,7 +381,7 @@ public final class SpritePixels extends Rasterizer2D { } } // L: 310 - @ObfuscatedName("a") + @ObfuscatedName("g") @Export("drawTransOverlayAt") public void drawTransOverlayAt(int var1, int var2, int var3, int var4) { if (var3 == 256) { // L: 329 @@ -431,7 +431,7 @@ public final class SpritePixels extends Rasterizer2D { } } // L: 331 366 - @ObfuscatedName("d") + @ObfuscatedName("k") @Export("drawTransAt") public void drawTransAt(int var1, int var2, int var3) { var1 += this.xOffset; // L: 389 @@ -477,7 +477,7 @@ public final class SpritePixels extends Rasterizer2D { } } // L: 422 - @ObfuscatedName("m") + @ObfuscatedName("x") @Export("drawTransScaledAt") public void drawTransScaledAt(int var1, int var2, int var3, int var4, int var5) { if (var3 > 0 && var4 > 0) { // L: 441 @@ -542,8 +542,8 @@ public final class SpritePixels extends Rasterizer2D { } } // L: 484 - @ObfuscatedName("f") - public void method6973(int var1, int var2, int var3) { + @ObfuscatedName("w") + public void method7002(int var1, int var2, int var3) { var1 += this.xOffset; // L: 507 var2 += this.yOffset; // L: 508 int var4 = var1 + var2 * Rasterizer2D.Rasterizer2D_width; // L: 509 @@ -584,16 +584,16 @@ public final class SpritePixels extends Rasterizer2D { if (var7 > 0 && var6 > 0) { // L: 538 if (var3 == 256) { - method6886(0, 0, 0, Rasterizer2D.Rasterizer2D_pixels, this.pixels, var5, 0, var4, 0, var7, var6, var8, var9); // L: 539 + method6984(0, 0, 0, Rasterizer2D.Rasterizer2D_pixels, this.pixels, var5, 0, var4, 0, var7, var6, var8, var9); // L: 539 } else { - method6887(0, 0, 0, Rasterizer2D.Rasterizer2D_pixels, this.pixels, var5, 0, var4, 0, var7, var6, var8, var9, var3); // L: 540 + method6985(0, 0, 0, Rasterizer2D.Rasterizer2D_pixels, this.pixels, var5, 0, var4, 0, var7, var6, var8, var9, var3); // L: 540 } } } // L: 541 - @ObfuscatedName("w") - public void method6888(int var1, int var2, int var3, int var4, int var5) { + @ObfuscatedName("q") + public void method6986(int var1, int var2, int var3, int var4, int var5) { if (var3 > 0 && var4 > 0) { // L: 582 int var6 = this.subWidth; // L: 583 int var7 = this.subHeight; // L: 584 @@ -653,16 +653,16 @@ public final class SpritePixels extends Rasterizer2D { } if (var5 == 256) { // L: 624 - method6889(0, 0, 0, var8, this.pixels, Rasterizer2D.Rasterizer2D_pixels, 0, 0, -var4, var9, var14, var15, var3, var12, var13, var6); + method7024(0, 0, 0, var8, this.pixels, Rasterizer2D.Rasterizer2D_pixels, 0, 0, -var4, var9, var14, var15, var3, var12, var13, var6); } else { - method6890(0, 0, 0, var8, this.pixels, Rasterizer2D.Rasterizer2D_pixels, 0, 0, -var4, var9, var14, var15, var3, var12, var13, var6, var5); // L: 625 + method6988(0, 0, 0, var8, this.pixels, Rasterizer2D.Rasterizer2D_pixels, 0, 0, -var4, var9, var14, var15, var3, var12, var13, var6, var5); // L: 625 } } } // L: 626 - @ObfuscatedName("ae") - public void method6891(int var1, int var2, int var3, int var4, int var5, int var6, int[] var7, int[] var8) { + @ObfuscatedName("ap") + public void method6989(int var1, int var2, int var3, int var4, int var5, int var6, int[] var7, int[] var8) { int var9 = var2 < 0 ? -var2 : 0; // L: 675 int var10 = var2 + this.subHeight <= var6 ? this.subHeight : var6 - var2; // L: 676 int var11 = var1 < 0 ? -var1 : 0; // L: 677 @@ -709,7 +709,7 @@ public final class SpritePixels extends Rasterizer2D { } // L: 700 - @ObfuscatedName("ao") + @ObfuscatedName("ab") @Export("drawRotatedMaskedCenteredAround") public void drawRotatedMaskedCenteredAround(int var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8, int[] var9, int[] var10) { try { @@ -744,8 +744,8 @@ public final class SpritePixels extends Rasterizer2D { } // L: 729 - @ObfuscatedName("aj") - public void method6900(int var1, int var2, int var3, int var4, int var5, int var6, double var7, int var9) { + @ObfuscatedName("al") + public void method6990(int var1, int var2, int var3, int var4, int var5, int var6, double var7, int var9) { try { int var10 = -var3 / 2; // L: 733 int var11 = -var4 / 2; // L: 734 @@ -783,13 +783,13 @@ public final class SpritePixels extends Rasterizer2D { } // L: 759 - @ObfuscatedName("aw") - public void method6894(int var1, int var2, int var3, int var4) { - this.method6895(this.width << 3, this.height << 3, var1 << 4, var2 << 4, var3, var4); // L: 762 + @ObfuscatedName("ad") + public void method6991(int var1, int var2, int var3, int var4) { + this.method6992(this.width << 3, this.height << 3, var1 << 4, var2 << 4, var3, var4); // L: 762 } // L: 763 - @ObfuscatedName("at") - void method6895(int var1, int var2, int var3, int var4, int var5, int var6) { + @ObfuscatedName("ai") + void method6992(int var1, int var2, int var3, int var4, int var5, int var6) { if (var6 != 0) { // L: 766 var1 -= this.xOffset << 4; // L: 767 var2 -= this.yOffset << 4; // L: 768 @@ -1257,7 +1257,7 @@ public final class SpritePixels extends Rasterizer2D { } } // L: 1076 - @ObfuscatedName("av") + @ObfuscatedName("ar") @Export("drawScaledWorldmap") public void drawScaledWorldmap(int var1, int var2, int var3, int var4) { if (var3 <= this.width && var4 <= this.height) { // L: 1079 @@ -1380,7 +1380,7 @@ public final class SpritePixels extends Rasterizer2D { } } // L: 1094 1151 - @ObfuscatedName("i") + @ObfuscatedName("u") @Export("Sprite_draw") static void Sprite_draw(int[] var0, int[] var1, int var2, int var3, int var4, int var5, int var6, int var7) { for (int var8 = -var5; var8 < 0; ++var8) { // L: 185 @@ -1400,7 +1400,7 @@ public final class SpritePixels extends Rasterizer2D { } // L: 200 - @ObfuscatedName("k") + @ObfuscatedName("o") @Export("Sprite_drawTransBg") static void Sprite_drawTransBg(int[] var0, int[] var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8) { int var9 = -(var5 >> 2); // L: 239 @@ -1453,7 +1453,7 @@ public final class SpritePixels extends Rasterizer2D { } // L: 264 - @ObfuscatedName("p") + @ObfuscatedName("e") @Export("Sprite_drawScaled") static void Sprite_drawScaled(int[] var0, int[] var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8, int var9, int var10, int var11) { int var12 = var3; // L: 313 @@ -1479,7 +1479,7 @@ public final class SpritePixels extends Rasterizer2D { } // L: 326 - @ObfuscatedName("e") + @ObfuscatedName("a") @Export("Sprite_drawTransOverlay") static void Sprite_drawTransOverlay(int[] var0, int[] var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8, int var9, int var10) { int var11 = 256 - var9; // L: 369 @@ -1505,7 +1505,7 @@ public final class SpritePixels extends Rasterizer2D { } // L: 386 - @ObfuscatedName("u") + @ObfuscatedName("m") @Export("Sprite_drawTransparent") static void Sprite_drawTransparent(int[] var0, int[] var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8, int var9) { int var10 = 256 - var9; // L: 425 @@ -1527,7 +1527,7 @@ public final class SpritePixels extends Rasterizer2D { } // L: 438 - @ObfuscatedName("j") + @ObfuscatedName("z") @Export("Sprite_drawTransScaled") static void Sprite_drawTransScaled(int[] var0, int[] var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8, int var9, int var10, int var11, int var12) { int var13 = 256 - var12; // L: 487 @@ -1555,8 +1555,8 @@ public final class SpritePixels extends Rasterizer2D { } // L: 504 - @ObfuscatedName("s") - static void method6886(int var0, int var1, int var2, int[] var3, int[] var4, int var5, int var6, int var7, int var8, int var9, int var10, int var11, int var12) { + @ObfuscatedName("t") + static void method6984(int var0, int var1, int var2, int[] var3, int[] var4, int var5, int var6, int var7, int var8, int var9, int var10, int var11, int var12) { for (var8 = -var10; var8 < 0; ++var8) { // L: 544 for (var6 = -var9; var6 < 0; ++var6) { // L: 545 var0 = var4[var5++]; // L: 546 @@ -1577,8 +1577,8 @@ public final class SpritePixels extends Rasterizer2D { } // L: 559 - @ObfuscatedName("y") - static void method6887(int var0, int var1, int var2, int[] var3, int[] var4, int var5, int var6, int var7, int var8, int var9, int var10, int var11, int var12, int var13) { + @ObfuscatedName("h") + static void method6985(int var0, int var1, int var2, int[] var3, int[] var4, int var5, int var6, int var7, int var8, int var9, int var10, int var11, int var12, int var13) { for (var8 = -var10; var8 < 0; ++var8) { // L: 562 for (var6 = -var9; var6 < 0; ++var6) { // L: 563 var0 = var4[var5++]; // L: 564 @@ -1601,8 +1601,8 @@ public final class SpritePixels extends Rasterizer2D { } // L: 579 - @ObfuscatedName("n") - static void method6889(int var0, int var1, int var2, int var3, int[] var4, int[] var5, int var6, int var7, int var8, int var9, int var10, int var11, int var12, int var13, int var14, int var15) { + @ObfuscatedName("i") + static void method7024(int var0, int var1, int var2, int var3, int[] var4, int[] var5, int var6, int var7, int var8, int var9, int var10, int var11, int var12, int var13, int var14, int var15) { for (int var16 = var3; var8 < 0; ++var8) { // L: 629 630 var7 = var15 * (var9 >> 16); // L: 631 @@ -1628,8 +1628,8 @@ public final class SpritePixels extends Rasterizer2D { } // L: 648 - @ObfuscatedName("ag") - static void method6890(int var0, int var1, int var2, int var3, int[] var4, int[] var5, int var6, int var7, int var8, int var9, int var10, int var11, int var12, int var13, int var14, int var15, int var16) { + @ObfuscatedName("ae") + static void method6988(int var0, int var1, int var2, int var3, int[] var4, int[] var5, int var6, int var7, int var8, int var9, int var10, int var11, int var12, int var13, int var14, int var15, int var16) { for (int var17 = var3; var8 < 0; ++var8) { // L: 651 652 var7 = var15 * (var9 >> 16); // L: 653 diff --git a/runescape-client/src/main/java/Strings.java b/runescape-client/src/main/java/Strings.java index e902c9f51e..20acbfa1c7 100644 --- a/runescape-client/src/main/java/Strings.java +++ b/runescape-client/src/main/java/Strings.java @@ -1,99 +1,107 @@ -import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("jt") +@ObfuscatedName("jo") @Implements("Strings") public class Strings { @ObfuscatedName("bu") - public static String field3295; - @ObfuscatedName("cl") - public static String field3334; - @ObfuscatedName("jj") - public static String field3439; - @ObfuscatedName("jg") + public static String field3306; + @ObfuscatedName("cu") + public static String field3327; + @ObfuscatedName("jy") public static String field3503; - @ObfuscatedName("ji") - public static String field3512; + @ObfuscatedName("jg") + public static String field3504; + @ObfuscatedName("jp") + public static String field3505; static { - field3295 = "Please visit the support page for assistance."; // L: 60 - field3334 = "Please visit the support page for assistance."; - field3439 = ""; // L: 275 - field3503 = "Page has opened in a new window."; // L: 276 - field3512 = "(Please check your popup blocker.)"; // L: 277 + field3306 = "Please visit the support page for assistance."; // L: 60 + field3327 = "Please visit the support page for assistance."; // L: 99 + field3503 = ""; // L: 275 + field3504 = "Page has opened in a new window."; // L: 276 + field3505 = "(Please check your popup blocker.)"; // L: 277 } // L: 307 - @ObfuscatedName("c") + @ObfuscatedName("gw") @ObfuscatedSignature( - descriptor = "(II)Lez;", - garbageValue = "1535423962" + descriptor = "(Lcy;I)V", + garbageValue = "-1661416870" ) - @Export("ItemDefinition_get") - public static ItemComposition ItemDefinition_get(int var0) { - ItemComposition var1 = (ItemComposition)ItemComposition.ItemDefinition_cached.get((long)var0); // L: 92 - if (var1 != null) { // L: 93 - return var1; - } else { - byte[] var2 = ItemComposition.ItemDefinition_archive.takeFile(10, var0); // L: 94 - var1 = new ItemComposition(); // L: 95 - var1.id = var0; // L: 96 - if (var2 != null) { // L: 97 - var1.decode(new Buffer(var2)); - } + static final void method4850(Actor var0) { + if (var0.field1289 != 0) { // L: 3758 + if (var0.targetIndex != -1) { // L: 3759 + Object var1 = null; // L: 3760 + if (var0.targetIndex < 32768) { // L: 3761 + var1 = Client.npcs[var0.targetIndex]; + } else if (var0.targetIndex >= 32768) { // L: 3762 + var1 = Client.players[var0.targetIndex - 32768]; + } - var1.post(); // L: 98 - if (var1.noteTemplate != -1) { // L: 99 - var1.genCert(ItemDefinition_get(var1.noteTemplate), ItemDefinition_get(var1.note)); - } - - if (var1.notedId != -1) { // L: 100 - var1.genBought(ItemDefinition_get(var1.notedId), ItemDefinition_get(var1.unnotedId)); - } - - if (var1.placeholderTemplate != -1) { // L: 101 - var1.genPlaceholder(ItemDefinition_get(var1.placeholderTemplate), ItemDefinition_get(var1.placeholder)); - } - - if (!BufferedNetSocket.ItemDefinition_inMembersWorld && var1.isMembersOnly) { // L: 102 - var1.name = "Members object"; // L: 103 - var1.isTradable = false; // L: 104 - var1.groundActions = null; // L: 105 - var1.inventoryActions = null; // L: 106 - var1.shiftClickIndex = -1; // L: 107 - var1.team = 0; // L: 108 - if (var1.params != null) { // L: 109 - boolean var3 = false; // L: 110 - - for (Node var4 = var1.params.first(); var4 != null; var4 = var1.params.next()) { // L: 111 - ParamComposition var5 = WorldMapElement.getParamDefinition((int)var4.key); // L: 112 - if (var5.autoDisable) { // L: 113 - var4.remove(); - } else { - var3 = true; // L: 114 - } - } - - if (!var3) { // L: 116 - var1.params = null; + if (var1 != null) { // L: 3763 + int var2 = var0.x - ((Actor)var1).x; // L: 3764 + int var3 = var0.y - ((Actor)var1).y; // L: 3765 + if (var2 != 0 || var3 != 0) { // L: 3766 + var0.orientation = (int)(Math.atan2((double)var2, (double)var3) * 325.949D) & 2047; } + } else if (var0.false0) { // L: 3768 + var0.targetIndex = -1; // L: 3769 + var0.false0 = false; // L: 3770 } } - ItemComposition.ItemDefinition_cached.put(var1, (long)var0); // L: 119 - return var1; // L: 120 - } - } + if (var0.field1264 != -1 && (var0.pathLength == 0 || var0.field1294 > 0)) { // L: 3773 + var0.orientation = var0.field1264; // L: 3774 + var0.field1264 = -1; // L: 3775 + } + + int var4 = var0.orientation - var0.rotation & 2047; // L: 3777 + if (var4 == 0 && var0.false0) { // L: 3778 + var0.targetIndex = -1; // L: 3779 + var0.false0 = false; // L: 3780 + } + + if (var4 != 0) { // L: 3782 + ++var0.field1282; // L: 3783 + boolean var6; + if (var4 > 1024) { // L: 3784 + var0.rotation -= var0.field1289; // L: 3785 + var6 = true; // L: 3786 + if (var4 < var0.field1289 || var4 > 2048 - var0.field1289) { // L: 3787 + var0.rotation = var0.orientation; // L: 3788 + var6 = false; // L: 3789 + } + + if (var0.idleSequence == var0.movementSequence && (var0.field1282 > 25 || var6)) { // L: 3791 + if (var0.turnLeftSequence != -1) { // L: 3792 + var0.movementSequence = var0.turnLeftSequence; + } else { + var0.movementSequence = var0.walkSequence; // L: 3793 + } + } + } else { + var0.rotation += var0.field1289; // L: 3797 + var6 = true; // L: 3798 + if (var4 < var0.field1289 || var4 > 2048 - var0.field1289) { // L: 3799 + var0.rotation = var0.orientation; // L: 3800 + var6 = false; // L: 3801 + } + + if (var0.movementSequence == var0.idleSequence && (var0.field1282 > 25 || var6)) { // L: 3803 + if (var0.turnRightSequence != -1) { // L: 3804 + var0.movementSequence = var0.turnRightSequence; + } else { + var0.movementSequence = var0.walkSequence; // L: 3805 + } + } + } + + var0.rotation &= 2047; // L: 3809 + } else { + var0.field1282 = 0; // L: 3811 + } - @ObfuscatedName("jf") - @ObfuscatedSignature( - descriptor = "(IIIZI)V", - garbageValue = "-1449127026" - ) - static final void method4801(int var0, int var1, int var2, boolean var3) { - if (UserComparator8.loadInterface(var0)) { // L: 10051 - Login.resizeInterface(Widget.Widget_interfaceComponents[var0], -1, var1, var2, var3); // L: 10052 } - } // L: 10053 + } // L: 3812 } diff --git a/runescape-client/src/main/java/StructComposition.java b/runescape-client/src/main/java/StructComposition.java index 351e8d6011..a886169e4a 100644 --- a/runescape-client/src/main/java/StructComposition.java +++ b/runescape-client/src/main/java/StructComposition.java @@ -3,26 +3,24 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("eb") +@ObfuscatedName("ei") @Implements("StructComposition") public class StructComposition extends DualNode { - @ObfuscatedName("h") + @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "Ljp;" + descriptor = "Ljv;" ) @Export("StructDefinition_archive") static AbstractArchive StructDefinition_archive; - @ObfuscatedName("c") + @ObfuscatedName("n") @ObfuscatedSignature( - descriptor = "Lho;" + descriptor = "Lhz;" ) @Export("StructDefinition_cached") public static EvictingDualNodeHashTable StructDefinition_cached; - @ObfuscatedName("b") - static int[][] field1730; - @ObfuscatedName("o") + @ObfuscatedName("f") @ObfuscatedSignature( - descriptor = "Lmo;" + descriptor = "Lmr;" ) @Export("params") IterableNodeHashTable params; @@ -34,19 +32,19 @@ public class StructComposition extends DualNode { StructComposition() { } // L: 16 - @ObfuscatedName("o") + @ObfuscatedName("f") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "-1773759277" + garbageValue = "1000000" ) @Export("postDecode") void postDecode() { - } // L: 33 + } - @ObfuscatedName("g") + @ObfuscatedName("y") @ObfuscatedSignature( - descriptor = "(Lnk;S)V", - garbageValue = "14298" + descriptor = "(Lnd;I)V", + garbageValue = "-32029901" ) @Export("decode") void decode(Buffer var1) { @@ -60,55 +58,90 @@ public class StructComposition extends DualNode { } } - @ObfuscatedName("l") + @ObfuscatedName("p") @ObfuscatedSignature( - descriptor = "(Lnk;II)V", - garbageValue = "-570855363" + descriptor = "(Lnd;II)V", + garbageValue = "-1568797940" ) @Export("decodeNext") void decodeNext(Buffer var1, int var2) { if (var2 == 249) { - this.params = HealthBar.readStringIntParameters(var1, this.params); // L: 44 + this.params = ModeWhere.readStringIntParameters(var1, this.params); // L: 44 } - } + } // L: 46 - @ObfuscatedName("z") + @ObfuscatedName("j") @ObfuscatedSignature( - descriptor = "(IIB)I", - garbageValue = "89" + descriptor = "(III)I", + garbageValue = "1766165302" ) @Export("getIntParam") public int getIntParam(int var1, int var2) { - return GraphicsObject.method1937(this.params, var1, var2); // L: 49 + return SecureRandomFuture.method1977(this.params, var1, var2); // L: 49 } - @ObfuscatedName("t") + @ObfuscatedName("r") @ObfuscatedSignature( descriptor = "(ILjava/lang/String;I)Ljava/lang/String;", - garbageValue = "-1494986082" + garbageValue = "1932867603" ) @Export("getStringParam") public String getStringParam(int var1, String var2) { - return Varcs.method2326(this.params, var1, var2); // L: 53 + return FriendsList.method5650(this.params, var1, var2); // L: 53 } - @ObfuscatedName("c") + @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "(I)Z", - garbageValue = "1212560754" + descriptor = "(II)Lef;", + garbageValue = "1856212739" ) - public static boolean method2846() { - ReflectionCheck var0 = (ReflectionCheck)class69.reflectionChecks.last(); // L: 28 - return var0 != null; // L: 29 + @Export("getNpcDefinition") + public static NPCComposition getNpcDefinition(int var0) { + NPCComposition var1 = (NPCComposition)NPCComposition.NpcDefinition_cached.get((long)var0); // L: 57 + if (var1 != null) { // L: 58 + return var1; + } else { + byte[] var2 = NPCComposition.NpcDefinition_archive.takeFile(9, var0); // L: 59 + var1 = new NPCComposition(); // L: 60 + var1.id = var0; // L: 61 + if (var2 != null) { // L: 62 + var1.decode(new Buffer(var2)); + } + + var1.postDecode(); // L: 63 + NPCComposition.NpcDefinition_cached.put(var1, (long)var0); // L: 64 + return var1; // L: 65 + } } - @ObfuscatedName("e") + @ObfuscatedName("r") @ObfuscatedSignature( - descriptor = "(Lbz;I)V", - garbageValue = "-1673250002" + descriptor = "(II)Z", + garbageValue = "-1621598776" ) - public static final void method2863(PlayerProvider var0) { - Tiles.pcmPlayerProvider = var0; // L: 45 - } // L: 46 + public static boolean method2908(int var0) { + return (var0 >> 31 & 1) != 0; // L: 33 + } + + @ObfuscatedName("lr") + @ObfuscatedSignature( + descriptor = "(Lio;I)Lio;", + garbageValue = "1650638386" + ) + static Widget method2892(Widget var0) { + int var1 = class18.method213(class21.getWidgetFlags(var0)); // L: 11363 + if (var1 == 0) { // L: 11364 + return null; + } else { + for (int var2 = 0; var2 < var1; ++var2) { // L: 11365 + var0 = Frames.getWidget(var0.parentId); // L: 11366 + if (var0 == null) { // L: 11367 + return null; + } + } + + return var0; // L: 11369 + } + } } diff --git a/runescape-client/src/main/java/StudioGame.java b/runescape-client/src/main/java/StudioGame.java index d1083daf4d..9ba36361bd 100644 --- a/runescape-client/src/main/java/StudioGame.java +++ b/runescape-client/src/main/java/StudioGame.java @@ -1,61 +1,56 @@ +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("jr") +@ObfuscatedName("jd") @Implements("StudioGame") public enum StudioGame implements Enumerated { - @ObfuscatedName("h") + @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "Ljr;" + descriptor = "Ljd;" ) @Export("runescape") runescape("runescape", "RuneScape", 0), - @ObfuscatedName("c") + @ObfuscatedName("n") @ObfuscatedSignature( - descriptor = "Ljr;" + descriptor = "Ljd;" ) @Export("stellardawn") stellardawn("stellardawn", "Stellar Dawn", 1), - @ObfuscatedName("o") + @ObfuscatedName("f") @ObfuscatedSignature( - descriptor = "Ljr;" + descriptor = "Ljd;" ) @Export("game3") game3("game3", "Game 3", 2), - @ObfuscatedName("g") + @ObfuscatedName("y") @ObfuscatedSignature( - descriptor = "Ljr;" + descriptor = "Ljd;" ) @Export("game4") game4("game4", "Game 4", 3), - @ObfuscatedName("l") + @ObfuscatedName("p") @ObfuscatedSignature( - descriptor = "Ljr;" + descriptor = "Ljd;" ) @Export("game5") game5("game5", "Game 5", 4), - @ObfuscatedName("z") + @ObfuscatedName("j") @ObfuscatedSignature( - descriptor = "Ljr;" + descriptor = "Ljd;" ) @Export("oldscape") oldscape("oldscape", "RuneScape 2007", 5); - @ObfuscatedName("k") - @ObfuscatedSignature( - descriptor = "Lkc;" - ) - @Export("ItemDefinition_fontPlain11") - static Font ItemDefinition_fontPlain11; - @ObfuscatedName("t") + @ObfuscatedName("r") @Export("name") public final String name; - @ObfuscatedName("v") + @ObfuscatedName("b") @ObfuscatedGetter( - intValue = -2033006109 + intValue = 1213598965 ) @Export("id") final int id; @@ -65,13 +60,38 @@ public enum StudioGame implements Enumerated { this.id = var5; // L: 18 } // L: 19 - @ObfuscatedName("h") + @ObfuscatedName("v") @ObfuscatedSignature( descriptor = "(I)I", - garbageValue = "-708237537" + garbageValue = "-907662946" ) @Export("rsOrdinal") public int rsOrdinal() { return this.id; // L: 22 } + + @ObfuscatedName("v") + @ObfuscatedSignature( + descriptor = "(ZB)V", + garbageValue = "31" + ) + public static void method4847(boolean var0) { + if (NetCache.NetCache_socket != null) { // L: 42 + try { + Buffer var1 = new Buffer(4); // L: 44 + var1.writeByte(var0 ? 2 : 3); // L: 45 + var1.writeMedium(0); // L: 46 + NetCache.NetCache_socket.write(var1.array, 0, 4); // L: 47 + } catch (IOException var4) { + try { + NetCache.NetCache_socket.close(); // L: 51 + } catch (Exception var3) { // L: 53 + } + + ++NetCache.NetCache_ioExceptions; // L: 54 + NetCache.NetCache_socket = null; // L: 55 + } + + } + } // L: 57 } diff --git a/runescape-client/src/main/java/Task.java b/runescape-client/src/main/java/Task.java index 2878b71ff7..f227097853 100644 --- a/runescape-client/src/main/java/Task.java +++ b/runescape-client/src/main/java/Task.java @@ -4,31 +4,31 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ek") +@ObfuscatedName("eu") @Implements("Task") public class Task { - @ObfuscatedName("h") + @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "Lek;" + descriptor = "Leu;" ) @Export("next") Task next; - @ObfuscatedName("l") + @ObfuscatedName("p") @Export("status") public volatile int status; - @ObfuscatedName("z") + @ObfuscatedName("j") @ObfuscatedGetter( - intValue = 1573135753 + intValue = -308758867 ) @Export("type") int type; - @ObfuscatedName("t") + @ObfuscatedName("r") @Export("intArgument") public int intArgument; - @ObfuscatedName("v") + @ObfuscatedName("b") @Export("objectArgument") Object objectArgument; - @ObfuscatedName("b") + @ObfuscatedName("d") @Export("result") public volatile Object result; diff --git a/runescape-client/src/main/java/TaskHandler.java b/runescape-client/src/main/java/TaskHandler.java index fe6abe28d1..eebff01a43 100644 --- a/runescape-client/src/main/java/TaskHandler.java +++ b/runescape-client/src/main/java/TaskHandler.java @@ -4,40 +4,40 @@ import java.net.Socket; import java.net.URL; 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("dk") +@ObfuscatedName("dp") @Implements("TaskHandler") public class TaskHandler implements Runnable { - @ObfuscatedName("h") + @ObfuscatedName("v") @Export("javaVendor") public static String javaVendor; - @ObfuscatedName("c") + @ObfuscatedName("n") @Export("javaVersion") public static String javaVersion; - @ObfuscatedName("ab") - @ObfuscatedGetter( - intValue = 458627189 - ) - static int field1466; - @ObfuscatedName("o") + @ObfuscatedName("ex") @ObfuscatedSignature( - descriptor = "Lek;" + descriptor = "Llz;" + ) + @Export("spriteIds") + static GraphicsDefaults spriteIds; + @ObfuscatedName("f") + @ObfuscatedSignature( + descriptor = "Leu;" ) @Export("current") Task current; - @ObfuscatedName("g") + @ObfuscatedName("y") @ObfuscatedSignature( - descriptor = "Lek;" + descriptor = "Leu;" ) @Export("task") Task task; - @ObfuscatedName("l") + @ObfuscatedName("p") @Export("thread") Thread thread; - @ObfuscatedName("z") + @ObfuscatedName("j") @Export("isClosed") boolean isClosed; @@ -61,10 +61,10 @@ public class TaskHandler implements Runnable { this.thread.start(); // L: 31 } // L: 32 - @ObfuscatedName("h") + @ObfuscatedName("v") @ObfuscatedSignature( descriptor = "(B)V", - garbageValue = "92" + garbageValue = "57" ) @Export("close") public final void close() { @@ -78,12 +78,12 @@ public class TaskHandler implements Runnable { } catch (InterruptedException var3) { // L: 42 } - } // L: 43 + } - @ObfuscatedName("c") + @ObfuscatedName("n") @ObfuscatedSignature( - descriptor = "(IIILjava/lang/Object;I)Lek;", - garbageValue = "684176071" + descriptor = "(IIILjava/lang/Object;I)Leu;", + garbageValue = "-46619903" ) @Export("newTask") final Task newTask(int var1, int var2, int var3, Object var4) { @@ -104,20 +104,20 @@ public class TaskHandler implements Runnable { } } - @ObfuscatedName("o") + @ObfuscatedName("f") @ObfuscatedSignature( - descriptor = "(Ljava/lang/String;IB)Lek;", - garbageValue = "-33" + descriptor = "(Ljava/lang/String;IB)Leu;", + garbageValue = "90" ) @Export("newSocketTask") public final Task newSocketTask(String var1, int var2) { return this.newTask(1, var2, 0, var1); // L: 108 } - @ObfuscatedName("g") + @ObfuscatedName("y") @ObfuscatedSignature( - descriptor = "(Ljava/lang/Runnable;II)Lek;", - garbageValue = "523573283" + descriptor = "(Ljava/lang/Runnable;IB)Leu;", + garbageValue = "20" ) @Export("newThreadTask") public final Task newThreadTask(Runnable var1, int var2) { @@ -127,35 +127,35 @@ public class TaskHandler implements Runnable { public final void run() { while (true) { Task var1; - synchronized(this) { // L: 48 + synchronized(this) { while (true) { - if (this.isClosed) { // L: 50 + if (this.isClosed) { return; } - if (this.current != null) { // L: 51 - var1 = this.current; // L: 52 - this.current = this.current.next; // L: 53 - if (this.current == null) { // L: 54 + if (this.current != null) { + var1 = this.current; + this.current = this.current.next; + if (this.current == null) { this.task = null; } break; } try { - this.wait(); // L: 58 + this.wait(); } catch (InterruptedException var8) { // L: 60 } } } try { - int var5 = var1.type; // L: 64 - if (var5 == 1) { // L: 65 - var1.result = new Socket(InetAddress.getByName((String)var1.objectArgument), var1.intArgument); // L: 66 - } else if (var5 == 2) { // L: 68 + int var5 = var1.type; + if (var5 == 1) { + var1.result = new Socket(InetAddress.getByName((String)var1.objectArgument), var1.intArgument); + } else if (var5 == 2) { Thread var3 = new Thread((Runnable)var1.objectArgument); // L: 69 - var3.setDaemon(true); // L: 70 + var3.setDaemon(true); var3.start(); // L: 71 var3.setPriority(var1.intArgument); // L: 72 var1.result = var3; // L: 73 @@ -172,17 +172,40 @@ public class TaskHandler implements Runnable { } } - @ObfuscatedName("lk") + @ObfuscatedName("f") @ObfuscatedSignature( - descriptor = "(II)V", - garbageValue = "-822022696" + descriptor = "([Ljava/lang/String;[IIIB)V", + garbageValue = "121" ) - static void method2515(int var0) { - for (IntegerNode var1 = (IntegerNode)Client.widgetFlags.first(); var1 != null; var1 = (IntegerNode)Client.widgetFlags.next()) { // L: 11594 - if ((long)var0 == (var1.key >> 48 & 65535L)) { // L: 11595 - var1.remove(); // L: 11596 + static void method2518(String[] var0, int[] var1, int var2, int var3) { + if (var2 < var3) { // L: 43 + int var4 = (var3 + var2) / 2; // L: 44 + int var5 = var2; // L: 45 + String var6 = var0[var4]; // L: 46 + var0[var4] = var0[var3]; // L: 47 + var0[var3] = var6; // L: 48 + int var7 = var1[var4]; // L: 49 + var1[var4] = var1[var3]; // L: 50 + var1[var3] = var7; // L: 51 + + for (int var8 = var2; var8 < var3; ++var8) { // L: 52 + if (var6 == null || var0[var8] != null && var0[var8].compareTo(var6) < (var8 & 1)) { // L: 53 + String var9 = var0[var8]; // L: 54 + var0[var8] = var0[var5]; // L: 55 + var0[var5] = var9; // L: 56 + int var10 = var1[var8]; // L: 57 + var1[var8] = var1[var5]; // L: 58 + var1[var5++] = var10; // L: 59 + } } + + var0[var3] = var0[var5]; // L: 63 + var0[var5] = var6; // L: 64 + var1[var3] = var1[var5]; // L: 65 + var1[var5] = var7; // L: 66 + method2518(var0, var1, var2, var5 - 1); // L: 67 + method2518(var0, var1, var5 + 1, var3); // L: 68 } - } // L: 11599 + } // L: 70 } diff --git a/runescape-client/src/main/java/Texture.java b/runescape-client/src/main/java/Texture.java index 5080a5c226..abaecd341f 100644 --- a/runescape-client/src/main/java/Texture.java +++ b/runescape-client/src/main/java/Texture.java @@ -3,46 +3,46 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("gr") +@ObfuscatedName("gf") @Implements("Texture") public class Texture extends Node { - @ObfuscatedName("p") + @ObfuscatedName("e") @Export("Texture_animatedPixels") static int[] Texture_animatedPixels; - @ObfuscatedName("l") + @ObfuscatedName("p") @Export("averageRGB") int averageRGB; - @ObfuscatedName("z") - boolean field2214; - @ObfuscatedName("t") + @ObfuscatedName("j") + boolean field2220; + @ObfuscatedName("r") @Export("fileIds") int[] fileIds; - @ObfuscatedName("v") - int[] field2204; @ObfuscatedName("b") - int[] field2209; - @ObfuscatedName("q") - int[] field2213; - @ObfuscatedName("i") + int[] field2216; + @ObfuscatedName("d") + int[] field2217; + @ObfuscatedName("s") + int[] field2223; + @ObfuscatedName("u") @Export("animationDirection") int animationDirection; - @ObfuscatedName("x") + @ObfuscatedName("l") @Export("animationSpeed") int animationSpeed; - @ObfuscatedName("k") + @ObfuscatedName("o") @Export("pixels") int[] pixels; - @ObfuscatedName("r") + @ObfuscatedName("c") @Export("isLoaded") boolean isLoaded; @ObfuscatedSignature( - descriptor = "(Lnk;)V" + descriptor = "(Lnd;)V" ) Texture(Buffer var1) { this.isLoaded = false; // L: 25 this.averageRGB = var1.readUnsignedShort(); // L: 29 - this.field2214 = var1.readUnsignedByte() == 1; // L: 30 + this.field2220 = var1.readUnsignedByte() == 1; // L: 30 int var2 = var1.readUnsignedByte(); // L: 31 if (var2 >= 1 && var2 <= 4) { // L: 32 this.fileIds = new int[var2]; // L: 35 @@ -53,25 +53,25 @@ public class Texture extends Node { } if (var2 > 1) { // L: 37 - this.field2204 = new int[var2 - 1]; // L: 38 + this.field2216 = new int[var2 - 1]; // L: 38 for (var3 = 0; var3 < var2 - 1; ++var3) { // L: 39 - this.field2204[var3] = var1.readUnsignedByte(); + this.field2216[var3] = var1.readUnsignedByte(); } } if (var2 > 1) { // L: 41 - this.field2209 = new int[var2 - 1]; // L: 42 + this.field2217 = new int[var2 - 1]; // L: 42 for (var3 = 0; var3 < var2 - 1; ++var3) { // L: 43 - this.field2209[var3] = var1.readUnsignedByte(); + this.field2217[var3] = var1.readUnsignedByte(); } } - this.field2213 = new int[var2]; // L: 45 + this.field2223 = new int[var2]; // L: 45 for (var3 = 0; var3 < var2; ++var3) { // L: 46 - this.field2213[var3] = var1.readInt(); + this.field2223[var3] = var1.readInt(); } this.animationDirection = var1.readUnsignedByte(); // L: 47 @@ -82,9 +82,9 @@ public class Texture extends Node { } } // L: 50 - @ObfuscatedName("h") + @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "(DILjp;)Z" + descriptor = "(DILjv;)Z" ) @Export("load") boolean load(double var1, int var3, AbstractArchive var4) { @@ -99,11 +99,11 @@ public class Texture extends Node { this.pixels = new int[var5]; // L: 57 for (int var6 = 0; var6 < this.fileIds.length; ++var6) { // L: 58 - IndexedSprite var7 = ChatChannel.method2043(var4, this.fileIds[var6]); // L: 59 + IndexedSprite var7 = MouseHandler.method647(var4, this.fileIds[var6]); // L: 59 var7.normalize(); // L: 60 byte[] var8 = var7.pixels; // L: 61 int[] var9 = var7.palette; // L: 62 - int var10 = this.field2213[var6]; // L: 63 + int var10 = this.field2223[var6]; // L: 63 if ((var10 & -16777216) == 16777216) { // L: 64 } @@ -134,7 +134,7 @@ public class Texture extends Node { if (var6 == 0) { // L: 79 var11 = 0; } else { - var11 = this.field2204[var6 - 1]; // L: 80 + var11 = this.field2216[var6 - 1]; // L: 80 } if (var11 == 0) { // L: 81 @@ -178,13 +178,13 @@ public class Texture extends Node { return true; // L: 105 } - @ObfuscatedName("c") + @ObfuscatedName("n") @Export("reset") void reset() { this.pixels = null; // L: 109 } // L: 110 - @ObfuscatedName("o") + @ObfuscatedName("f") @Export("animate") void animate(int var1) { if (this.pixels != null) { // L: 113 diff --git a/runescape-client/src/main/java/TextureLoader.java b/runescape-client/src/main/java/TextureLoader.java index facf779221..4332e3208a 100644 --- a/runescape-client/src/main/java/TextureLoader.java +++ b/runescape-client/src/main/java/TextureLoader.java @@ -3,36 +3,36 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("hn") +@ObfuscatedName("hb") @Implements("TextureLoader") public interface TextureLoader { - @ObfuscatedName("o") + @ObfuscatedName("f") @ObfuscatedSignature( descriptor = "(II)[I", - garbageValue = "1529017761" + garbageValue = "-455909856" ) @Export("getTexturePixels") int[] getTexturePixels(int var1); - @ObfuscatedName("g") + @ObfuscatedName("y") @ObfuscatedSignature( descriptor = "(II)I", - garbageValue = "1590086448" + garbageValue = "-33912050" ) @Export("getAverageTextureRGB") int getAverageTextureRGB(int var1); - @ObfuscatedName("l") + @ObfuscatedName("p") @ObfuscatedSignature( - descriptor = "(II)Z", - garbageValue = "476826726" + descriptor = "(IB)Z", + garbageValue = "28" ) - boolean vmethod4224(int var1); + boolean vmethod4276(int var1); - @ObfuscatedName("z") + @ObfuscatedName("j") @ObfuscatedSignature( descriptor = "(II)Z", - garbageValue = "68842111" + garbageValue = "1780944645" ) @Export("isLowDetail") boolean isLowDetail(int var1); diff --git a/runescape-client/src/main/java/TextureProvider.java b/runescape-client/src/main/java/TextureProvider.java index 746a98e569..73513a1ff7 100644 --- a/runescape-client/src/main/java/TextureProvider.java +++ b/runescape-client/src/main/java/TextureProvider.java @@ -1,57 +1,64 @@ +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("gv") +@ObfuscatedName("gh") @Implements("TextureProvider") public class TextureProvider implements TextureLoader { - @ObfuscatedName("h") + @ObfuscatedName("hy") @ObfuscatedSignature( - descriptor = "[Lgr;" + descriptor = "[Loh;" + ) + @Export("headIconPrayerSprites") + static SpritePixels[] headIconPrayerSprites; + @ObfuscatedName("v") + @ObfuscatedSignature( + descriptor = "[Lgf;" ) @Export("textures") Texture[] textures; - @ObfuscatedName("c") + @ObfuscatedName("n") @ObfuscatedSignature( - descriptor = "Lka;" + descriptor = "Lkx;" ) @Export("deque") NodeDeque deque; - @ObfuscatedName("o") + @ObfuscatedName("f") @ObfuscatedGetter( - intValue = -381189571 + intValue = 117958777 ) @Export("capacity") int capacity; - @ObfuscatedName("g") + @ObfuscatedName("y") @ObfuscatedGetter( - intValue = 1463275439 + intValue = 530672939 ) @Export("remaining") int remaining; - @ObfuscatedName("l") + @ObfuscatedName("p") @Export("brightness") double brightness; - @ObfuscatedName("z") + @ObfuscatedName("j") @ObfuscatedGetter( - intValue = 409309163 + intValue = 861354963 ) @Export("textureSize") int textureSize; - @ObfuscatedName("t") + @ObfuscatedName("r") @ObfuscatedSignature( - descriptor = "Ljp;" + descriptor = "Ljv;" ) @Export("archive") AbstractArchive archive; @ObfuscatedSignature( - descriptor = "(Ljp;Ljp;IDI)V" + descriptor = "(Ljv;Ljv;IDI)V" ) public TextureProvider(AbstractArchive var1, AbstractArchive var2, int var3, double var4, int var6) { - this.deque = new NodeDeque(); // L: 9 + this.deque = new NodeDeque(); this.remaining = 0; // L: 11 this.brightness = 1.0D; // L: 12 this.textureSize = 128; // L: 13 @@ -71,10 +78,10 @@ public class TextureProvider implements TextureLoader { } // L: 29 - @ObfuscatedName("h") + @ObfuscatedName("v") @ObfuscatedSignature( descriptor = "(I)I", - garbageValue = "-1560998589" + garbageValue = "1596585605" ) @Export("getLoadedPercentage") public int getLoadedPercentage() { @@ -90,7 +97,7 @@ public class TextureProvider implements TextureLoader { for (int var7 = 0; var7 < var6.length; ++var7) { // L: 43 int var8 = var6[var7]; // L: 44 - if (this.archive.method4953(var8)) { // L: 46 + if (this.archive.method4963(var8)) { // L: 46 ++var2; // L: 47 } } @@ -104,17 +111,17 @@ public class TextureProvider implements TextureLoader { } } - @ObfuscatedName("c") + @ObfuscatedName("n") @Export("setBrightness") public void setBrightness(double var1) { this.brightness = var1; // L: 60 this.clear(); // L: 61 } // L: 62 - @ObfuscatedName("o") + @ObfuscatedName("f") @ObfuscatedSignature( descriptor = "(II)[I", - garbageValue = "1529017761" + garbageValue = "-455909856" ) @Export("getTexturePixels") public int[] getTexturePixels(int var1) { @@ -144,39 +151,39 @@ public class TextureProvider implements TextureLoader { return null; // L: 84 } - @ObfuscatedName("g") + @ObfuscatedName("y") @ObfuscatedSignature( descriptor = "(II)I", - garbageValue = "1590086448" + garbageValue = "-33912050" ) @Export("getAverageTextureRGB") public int getAverageTextureRGB(int var1) { return this.textures[var1] != null ? this.textures[var1].averageRGB : 0; // L: 88 89 } - @ObfuscatedName("l") + @ObfuscatedName("p") @ObfuscatedSignature( - descriptor = "(II)Z", - garbageValue = "476826726" + descriptor = "(IB)Z", + garbageValue = "28" ) - public boolean vmethod4224(int var1) { - return this.textures[var1].field2214; // L: 93 + public boolean vmethod4276(int var1) { + return this.textures[var1].field2220; // L: 93 } - @ObfuscatedName("z") + @ObfuscatedName("j") @ObfuscatedSignature( descriptor = "(II)Z", - garbageValue = "68842111" + garbageValue = "1780944645" ) @Export("isLowDetail") public boolean isLowDetail(int var1) { return this.textureSize == 64; // L: 97 } - @ObfuscatedName("t") + @ObfuscatedName("r") @ObfuscatedSignature( - descriptor = "(B)V", - garbageValue = "47" + descriptor = "(S)V", + garbageValue = "128" ) @Export("clear") public void clear() { @@ -190,10 +197,10 @@ public class TextureProvider implements TextureLoader { this.remaining = this.capacity; // L: 105 } // L: 106 - @ObfuscatedName("v") + @ObfuscatedName("b") @ObfuscatedSignature( - descriptor = "(IS)V", - garbageValue = "-4339" + descriptor = "(II)V", + garbageValue = "-451757246" ) @Export("animate") public void animate(int var1) { @@ -207,19 +214,36 @@ public class TextureProvider implements TextureLoader { } // L: 116 - @ObfuscatedName("k") + @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "(CI)Z", - garbageValue = "592968067" + descriptor = "(III)Z", + garbageValue = "-2085550538" ) - @Export("isCharPrintable") - public static boolean isCharPrintable(char var0) { - if (var0 >= ' ' && var0 <= '~') { // L: 203 - return true; - } else if (var0 >= 160 && var0 <= 255) { - return true; // L: 204 - } else { - return var0 == 8364 || var0 == 338 || var0 == 8212 || var0 == 339 || var0 == 376; // L: 205 - } + public static boolean method4141(int var0, int var1) { + return (var0 >> var1 + 1 & 1) != 0; // L: 9 } + + @ObfuscatedName("hg") + @ObfuscatedSignature( + descriptor = "(ZI)V", + garbageValue = "-148617531" + ) + static final void method4142(boolean var0) { + HealthBarUpdate.playPcmPlayers(); // L: 5224 + ++Client.packetWriter.pendingWrites; // L: 5225 + if (Client.packetWriter.pendingWrites >= 50 || var0) { // L: 5226 + Client.packetWriter.pendingWrites = 0; // L: 5227 + if (!Client.hadNetworkError && Client.packetWriter.getSocket() != null) { // L: 5228 + PacketBufferNode var1 = class21.getPacketBufferNode(ClientPacket.field2590, Client.packetWriter.isaacCipher); // L: 5230 + Client.packetWriter.addNode(var1); // L: 5231 + + try { + Client.packetWriter.flush(); // L: 5233 + } catch (IOException var3) { // L: 5235 + Client.hadNetworkError = true; // L: 5236 + } + } + + } + } // L: 5239 } diff --git a/runescape-client/src/main/java/Tile.java b/runescape-client/src/main/java/Tile.java index a681b28009..2ed78ed819 100644 --- a/runescape-client/src/main/java/Tile.java +++ b/runescape-client/src/main/java/Tile.java @@ -4,129 +4,129 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("gg") +@ObfuscatedName("gx") @Implements("Tile") public final class Tile extends Node { - @ObfuscatedName("h") + @ObfuscatedName("v") @ObfuscatedGetter( - intValue = 807593723 + intValue = 952681323 ) @Export("plane") int plane; - @ObfuscatedName("c") + @ObfuscatedName("n") @ObfuscatedGetter( - intValue = 2036199513 + intValue = -509167035 ) @Export("x") int x; - @ObfuscatedName("o") + @ObfuscatedName("f") @ObfuscatedGetter( - intValue = -822005461 + intValue = 950473561 ) @Export("y") int y; - @ObfuscatedName("g") + @ObfuscatedName("y") @ObfuscatedGetter( - intValue = 485184207 + intValue = 1257822241 ) @Export("originalPlane") int originalPlane; - @ObfuscatedName("l") + @ObfuscatedName("p") @ObfuscatedSignature( - descriptor = "Lgh;" + descriptor = "Lga;" ) @Export("paint") SceneTilePaint paint; - @ObfuscatedName("z") + @ObfuscatedName("j") @ObfuscatedSignature( - descriptor = "Lgy;" + descriptor = "Lgp;" ) @Export("model") SceneTileModel model; - @ObfuscatedName("t") - @ObfuscatedSignature( - descriptor = "Lhf;" - ) - @Export("boundaryObject") - BoundaryObject boundaryObject; - @ObfuscatedName("v") + @ObfuscatedName("r") @ObfuscatedSignature( descriptor = "Lhw;" ) - @Export("wallDecoration") - WallDecoration wallDecoration; + @Export("boundaryObject") + BoundaryObject boundaryObject; @ObfuscatedName("b") @ObfuscatedSignature( - descriptor = "Lgd;" + descriptor = "Lho;" + ) + @Export("wallDecoration") + WallDecoration wallDecoration; + @ObfuscatedName("d") + @ObfuscatedSignature( + descriptor = "Lgo;" ) @Export("floorDecoration") FloorDecoration floorDecoration; - @ObfuscatedName("q") + @ObfuscatedName("s") @ObfuscatedSignature( - descriptor = "Lgf;" + descriptor = "Lgv;" ) @Export("itemLayer") ItemLayer itemLayer; - @ObfuscatedName("i") + @ObfuscatedName("u") @ObfuscatedGetter( - intValue = -992962401 + intValue = 1720897143 ) @Export("gameObjectsCount") int gameObjectsCount; - @ObfuscatedName("x") + @ObfuscatedName("l") @ObfuscatedSignature( - descriptor = "[Lhz;" + descriptor = "[Lhj;" ) @Export("gameObjects") GameObject[] gameObjects; - @ObfuscatedName("k") + @ObfuscatedName("o") @Export("gameObjectEdgeMasks") int[] gameObjectEdgeMasks; - @ObfuscatedName("r") + @ObfuscatedName("c") @ObfuscatedGetter( - intValue = 1417290969 + intValue = 1099123981 ) @Export("gameObjectsEdgeMask") int gameObjectsEdgeMask; - @ObfuscatedName("p") + @ObfuscatedName("e") @ObfuscatedGetter( - intValue = 1984915759 + intValue = 961427167 ) @Export("minPlane") int minPlane; - @ObfuscatedName("a") + @ObfuscatedName("g") @Export("drawPrimary") boolean drawPrimary; - @ObfuscatedName("e") + @ObfuscatedName("a") @Export("drawSecondary") boolean drawSecondary; - @ObfuscatedName("d") + @ObfuscatedName("k") @Export("drawGameObjects") boolean drawGameObjects; - @ObfuscatedName("u") + @ObfuscatedName("m") @ObfuscatedGetter( - intValue = 567739365 + intValue = 1695083523 ) @Export("drawGameObjectEdges") int drawGameObjectEdges; - @ObfuscatedName("m") + @ObfuscatedName("x") @ObfuscatedGetter( - intValue = 1688773339 + intValue = 1060231869 ) - int field2246; - @ObfuscatedName("j") + int field2254; + @ObfuscatedName("z") @ObfuscatedGetter( - intValue = 1470704437 + intValue = -726038297 ) - int field2247; - @ObfuscatedName("f") + int field2244; + @ObfuscatedName("w") @ObfuscatedGetter( - intValue = -1666464329 + intValue = 1501732115 ) - int field2248; - @ObfuscatedName("s") + int field2235; + @ObfuscatedName("t") @ObfuscatedSignature( - descriptor = "Lgg;" + descriptor = "Lgx;" ) @Export("linkedBelowTile") Tile linkedBelowTile; @@ -140,18 +140,318 @@ public final class Tile extends Node { this.y = var3; // L: 33 } // L: 34 - @ObfuscatedName("gq") + @ObfuscatedName("hn") @ObfuscatedSignature( - descriptor = "(III)V", - garbageValue = "1743016455" + descriptor = "(Lha;I)V", + garbageValue = "236848204" ) - static final void method3813(int var0, int var1) { - if (Client.hintArrowType == 2) { // L: 4824 - PcmPlayer.worldToScreen((Client.hintArrowX - JagexCache.baseX << 7) + Client.hintArrowSubX, (Client.hintArrowY - Messages.baseY << 7) + Client.hintArrowSubY, Client.hintArrowHeight * 2); // L: 4825 - if (Client.viewportTempX > -1 && Client.cycle % 20 < 10) { // L: 4826 - class375.headIconHintSprites[0].drawTransBgAt(var0 + Client.viewportTempX - 12, Client.viewportTempY + var1 - 28); + static final void method3843(class225 var0) { + PacketBuffer var1 = Client.packetWriter.packetBuffer; // L: 6933 + int var2; + int var3; + int var4; + int var5; + int var6; + int var7; + int var8; + int var9; + int var10; + if (class225.field2683 == var0) { // L: 6934 + var2 = var1.method6595(); // L: 6935 + var3 = (var2 >> 4 & 7) + Occluder.field2387; // L: 6936 + var4 = (var2 & 7) + class69.field596; // L: 6937 + var5 = var1.method6595(); // L: 6938 + var6 = var1.readUnsignedByte(); // L: 6939 + var7 = var6 >> 4 & 15; // L: 6940 + var8 = var6 & 7; // L: 6941 + var9 = var1.method6603(); // L: 6942 + if (var3 >= 0 && var4 >= 0 && var3 < 104 && var4 < 104) { // L: 6943 + var10 = var7 + 1; // L: 6944 + if (class93.localPlayer.pathX[0] >= var3 - var10 && class93.localPlayer.pathX[0] <= var3 + var10 && class93.localPlayer.pathY[0] >= var4 - var10 && class93.localPlayer.pathY[0] <= var10 + var4 && ObjectComposition.clientPreferences.areaSoundEffectsVolume != 0 && var8 > 0 && Client.soundEffectCount < 50) { // L: 6945 6946 + Client.soundEffectIds[Client.soundEffectCount] = var9; // L: 6947 + Client.queuedSoundEffectLoops[Client.soundEffectCount] = var8; // L: 6948 + Client.queuedSoundEffectDelays[Client.soundEffectCount] = var5; // L: 6949 + Client.soundEffects[Client.soundEffectCount] = null; // L: 6950 + Client.soundLocations[Client.soundEffectCount] = var7 + (var4 << 8) + (var3 << 16); // L: 6951 + ++Client.soundEffectCount; // L: 6952 + } + } + } + + if (class225.field2688 == var0) { // L: 6957 + var2 = var1.method6603(); // L: 6958 + var3 = var1.method6549(); // L: 6959 + var4 = var3 >> 2; // L: 6960 + var5 = var3 & 3; // L: 6961 + var6 = Client.field702[var4]; // L: 6962 + var7 = var1.method6595(); // L: 6963 + var8 = (var7 >> 4 & 7) + Occluder.field2387; // L: 6964 + var9 = (var7 & 7) + class69.field596; // L: 6965 + if (var8 >= 0 && var9 >= 0 && var8 < 104 && var9 < 104) { // L: 6966 + DevicePcmPlayerProvider.updatePendingSpawn(class22.Client_plane, var8, var9, var6, var2, var4, var5, 0, -1); // L: 6967 } + } else if (class225.field2680 == var0) { // L: 6971 + var2 = var1.method6603(); // L: 6972 + var3 = var1.method6604(); // L: 6973 + var4 = var1.method6603(); // L: 6974 + var5 = var1.readUnsignedByte(); // L: 6975 + var6 = (var5 >> 4 & 7) + Occluder.field2387; // L: 6976 + var7 = (var5 & 7) + class69.field596; // L: 6977 + if (var6 >= 0 && var7 >= 0 && var6 < 104 && var7 < 104) { // L: 6978 + NodeDeque var42 = Client.groundItems[class22.Client_plane][var6][var7]; // L: 6979 + if (var42 != null) { // L: 6980 + for (TileItem var36 = (TileItem)var42.last(); var36 != null; var36 = (TileItem)var42.previous()) { // L: 6981 6982 6987 + if ((var4 & 32767) == var36.id && var3 == var36.quantity) { // L: 6983 + var36.quantity = var2; // L: 6984 + break; + } + } + + ClanSettings.updateItemPile(var6, var7); // L: 6989 + } + } + + } else { + int var11; + if (class225.field2684 == var0) { // L: 6994 + var2 = var1.method6671(); // L: 6995 + var3 = (var2 >> 4 & 7) + Occluder.field2387; // L: 6996 + var4 = (var2 & 7) + class69.field596; // L: 6997 + var5 = var1.method6605(); // L: 6998 + var6 = var1.method6549(); // L: 6999 + var7 = var6 >> 2; // L: 7000 + var8 = var6 & 3; // L: 7001 + var9 = Client.field702[var7]; // L: 7002 + if (var3 >= 0 && var4 >= 0 && var3 < 103 && var4 < 103) { // L: 7003 + if (var9 == 0) { // L: 7004 + BoundaryObject var35 = AbstractSocket.scene.method4089(class22.Client_plane, var3, var4); // L: 7005 + if (var35 != null) { // L: 7006 + var11 = class93.Entity_unpackID(var35.tag); // L: 7007 + if (var7 == 2) { // L: 7008 + var35.renderable1 = new DynamicObject(var11, 2, var8 + 4, class22.Client_plane, var3, var4, var5, false, var35.renderable1); // L: 7009 + var35.renderable2 = new DynamicObject(var11, 2, var8 + 1 & 3, class22.Client_plane, var3, var4, var5, false, var35.renderable2); // L: 7010 + } else { + var35.renderable1 = new DynamicObject(var11, var7, var8, class22.Client_plane, var3, var4, var5, false, var35.renderable1); // L: 7012 + } + } + } + + if (var9 == 1) { // L: 7015 + WallDecoration var43 = AbstractSocket.scene.method3948(class22.Client_plane, var3, var4); // L: 7016 + if (var43 != null) { // L: 7017 + var11 = class93.Entity_unpackID(var43.tag); // L: 7018 + if (var7 != 4 && var7 != 5) { // L: 7019 + if (var7 == 6) { // L: 7020 + var43.renderable1 = new DynamicObject(var11, 4, var8 + 4, class22.Client_plane, var3, var4, var5, false, var43.renderable1); + } else if (var7 == 7) { // L: 7021 + var43.renderable1 = new DynamicObject(var11, 4, (var8 + 2 & 3) + 4, class22.Client_plane, var3, var4, var5, false, var43.renderable1); + } else if (var7 == 8) { // L: 7022 + var43.renderable1 = new DynamicObject(var11, 4, var8 + 4, class22.Client_plane, var3, var4, var5, false, var43.renderable1); // L: 7023 + var43.renderable2 = new DynamicObject(var11, 4, (var8 + 2 & 3) + 4, class22.Client_plane, var3, var4, var5, false, var43.renderable2); // L: 7024 + } + } else { + var43.renderable1 = new DynamicObject(var11, 4, var8, class22.Client_plane, var3, var4, var5, false, var43.renderable1); + } + } + } + + if (var9 == 2) { // L: 7028 + GameObject var44 = AbstractSocket.scene.method3926(class22.Client_plane, var3, var4); // L: 7029 + if (var7 == 11) { // L: 7030 + var7 = 10; + } + + if (var44 != null) { // L: 7031 + var44.renderable = new DynamicObject(class93.Entity_unpackID(var44.tag), var7, var8, class22.Client_plane, var3, var4, var5, false, var44.renderable); + } + } + + if (var9 == 3) { // L: 7033 + FloorDecoration var45 = AbstractSocket.scene.getFloorDecoration(class22.Client_plane, var3, var4); // L: 7034 + if (var45 != null) { // L: 7035 + var45.renderable = new DynamicObject(class93.Entity_unpackID(var45.tag), 22, var8, class22.Client_plane, var3, var4, var5, false, var45.renderable); + } + } + } + + } else if (class225.field2682 == var0) { // L: 7040 + var2 = var1.method6595(); // L: 7041 + var3 = var2 >> 2; // L: 7042 + var4 = var2 & 3; // L: 7043 + var5 = Client.field702[var3]; // L: 7044 + var6 = var1.method6595(); // L: 7045 + var7 = (var6 >> 4 & 7) + Occluder.field2387; // L: 7046 + var8 = (var6 & 7) + class69.field596; // L: 7047 + if (var7 >= 0 && var8 >= 0 && var7 < 104 && var8 < 104) { // L: 7048 + DevicePcmPlayerProvider.updatePendingSpawn(class22.Client_plane, var7, var8, var5, -1, var3, var4, 0, -1); // L: 7049 + } + + } else { + TileItem var32; + if (class225.field2685 == var0) { // L: 7053 + var2 = var1.readUnsignedShort(); // L: 7054 + var3 = var1.method6595(); // L: 7055 + var4 = (var3 >> 4 & 7) + Occluder.field2387; // L: 7056 + var5 = (var3 & 7) + class69.field596; // L: 7057 + if (var4 >= 0 && var5 >= 0 && var4 < 104 && var5 < 104) { // L: 7058 + NodeDeque var34 = Client.groundItems[class22.Client_plane][var4][var5]; // L: 7059 + if (var34 != null) { // L: 7060 + for (var32 = (TileItem)var34.last(); var32 != null; var32 = (TileItem)var34.previous()) { // L: 7061 7062 7067 + if ((var2 & 32767) == var32.id) { // L: 7063 + var32.remove(); // L: 7064 + break; + } + } + + if (var34.last() == null) { // L: 7069 + Client.groundItems[class22.Client_plane][var4][var5] = null; + } + + ClanSettings.updateItemPile(var4, var5); // L: 7070 + } + } + + } else { + int var12; + int var13; + int var14; + if (class225.field2686 == var0) { // L: 7075 + var2 = var1.method6726(); // L: 7076 + var3 = var1.method6595() * 4; // L: 7077 + byte var38 = var1.method6559(); // L: 7078 + var5 = var1.method6671() * 4; // L: 7079 + var6 = var1.method6549(); // L: 7080 + var7 = (var6 >> 4 & 7) + Occluder.field2387; // L: 7081 + var8 = (var6 & 7) + class69.field596; // L: 7082 + var9 = var1.method6549(); // L: 7083 + var10 = var1.method6604(); // L: 7084 + byte var41 = var1.method6559(); // L: 7085 + var12 = var1.method6605(); // L: 7086 + var13 = var1.readUnsignedShort(); // L: 7087 + var14 = var1.method6595(); // L: 7088 + var11 = var41 + var7; // L: 7089 + var4 = var38 + var8; // L: 7090 + if (var7 >= 0 && var8 >= 0 && var7 < 104 && var8 < 104 && var11 >= 0 && var4 >= 0 && var11 < 104 && var4 < 104 && var13 != 65535) { // L: 7091 + var7 = var7 * 128 + 64; // L: 7092 + var8 = var8 * 128 + 64; // L: 7093 + var11 = var11 * 128 + 64; // L: 7094 + var4 = var4 * 128 + 64; // L: 7095 + Projectile var33 = new Projectile(var13, class22.Client_plane, var7, var8, class105.getTileHeight(var7, var8, class22.Client_plane) - var3, var12 + Client.cycle, var10 + Client.cycle, var9, var14, var2, var5); // L: 7096 + var33.setDestination(var11, var4, class105.getTileHeight(var11, var4, class22.Client_plane) - var5, var12 + Client.cycle); // L: 7097 + Client.projectiles.addFirst(var33); // L: 7098 + } + + } else { + if (class225.field2681 == var0) { // L: 7102 + byte var37 = var1.readByte(); // L: 7103 + var3 = var1.method6604(); // L: 7104 + var4 = var1.method6603(); // L: 7105 + byte var39 = var1.method6597(); // L: 7106 + var6 = var1.readUnsignedShort(); // L: 7107 + var7 = var1.method6603(); // L: 7108 + byte var40 = var1.method6593(); // L: 7109 + var9 = var1.method6549(); // L: 7110 + var10 = (var9 >> 4 & 7) + Occluder.field2387; // L: 7111 + var11 = (var9 & 7) + class69.field596; // L: 7112 + var12 = var1.method6595(); // L: 7113 + var13 = var12 >> 2; // L: 7114 + var14 = var12 & 3; // L: 7115 + int var15 = Client.field702[var13]; // L: 7116 + byte var16 = var1.readByte(); // L: 7117 + Player var17; + if (var6 == Client.localPlayerIndex) { // L: 7119 + var17 = class93.localPlayer; + } else { + var17 = Client.players[var6]; // L: 7120 + } + + if (var17 != null) { // L: 7121 + ObjectComposition var18 = class23.getObjectDefinition(var3); // L: 7122 + int var19; + int var20; + if (var14 != 1 && var14 != 3) { // L: 7125 + var19 = var18.sizeX; // L: 7130 + var20 = var18.sizeY; // L: 7131 + } else { + var19 = var18.sizeY; // L: 7126 + var20 = var18.sizeX; // L: 7127 + } + + int var21 = var10 + (var19 >> 1); // L: 7133 + int var22 = var10 + (var19 + 1 >> 1); // L: 7134 + int var23 = var11 + (var20 >> 1); // L: 7135 + int var24 = var11 + (var20 + 1 >> 1); // L: 7136 + int[][] var25 = Tiles.Tiles_heights[class22.Client_plane]; // L: 7137 + int var26 = var25[var21][var23] + var25[var22][var23] + var25[var21][var24] + var25[var22][var24] >> 2; // L: 7138 + int var27 = (var10 << 7) + (var19 << 6); // L: 7139 + int var28 = (var11 << 7) + (var20 << 6); // L: 7140 + Model var29 = var18.getModel(var13, var14, var25, var27, var26, var28); // L: 7141 + if (var29 != null) { // L: 7142 + DevicePcmPlayerProvider.updatePendingSpawn(class22.Client_plane, var10, var11, var15, -1, 0, 0, var4 + 1, var7 + 1); // L: 7143 + var17.animationCycleStart = var4 + Client.cycle; // L: 7144 + var17.animationCycleEnd = var7 + Client.cycle; // L: 7145 + var17.model0 = var29; // L: 7146 + var17.field1202 = var19 * 64 + var10 * 128; // L: 7147 + var17.field1220 = var20 * 64 + var11 * 128; // L: 7148 + var17.tileHeight2 = var26; // L: 7149 + byte var30; + if (var16 > var39) { // L: 7150 + var30 = var16; // L: 7151 + var16 = var39; // L: 7152 + var39 = var30; // L: 7153 + } + + if (var37 > var40) { // L: 7155 + var30 = var37; // L: 7156 + var37 = var40; // L: 7157 + var40 = var30; // L: 7158 + } + + var17.minX = var16 + var10; // L: 7160 + var17.maxX = var10 + var39; // L: 7161 + var17.minY = var11 + var37; // L: 7162 + var17.maxY = var11 + var40; // L: 7163 + } + } + } + + if (class225.field2687 == var0) { // L: 7167 + var2 = var1.method6605(); // L: 7168 + var3 = var1.readUnsignedShort(); // L: 7169 + var4 = var1.readUnsignedByte(); // L: 7170 + var5 = (var4 >> 4 & 7) + Occluder.field2387; // L: 7171 + var6 = (var4 & 7) + class69.field596; // L: 7172 + if (var5 >= 0 && var6 >= 0 && var5 < 104 && var6 < 104) { // L: 7173 + var32 = new TileItem(); // L: 7174 + var32.id = var3; // L: 7175 + var32.quantity = var2; // L: 7176 + if (Client.groundItems[class22.Client_plane][var5][var6] == null) { // L: 7177 + Client.groundItems[class22.Client_plane][var5][var6] = new NodeDeque(); + } + + Client.groundItems[class22.Client_plane][var5][var6].addFirst(var32); // L: 7178 + ClanSettings.updateItemPile(var5, var6); // L: 7179 + } + + } else if (class225.field2689 == var0) { // L: 7183 + var2 = var1.readUnsignedShort(); // L: 7184 + var3 = var1.method6595(); // L: 7185 + var4 = var1.method6595(); // L: 7186 + var5 = (var4 >> 4 & 7) + Occluder.field2387; // L: 7187 + var6 = (var4 & 7) + class69.field596; // L: 7188 + var7 = var1.method6605(); // L: 7189 + if (var5 >= 0 && var6 >= 0 && var5 < 104 && var6 < 104) { // L: 7190 + var5 = var5 * 128 + 64; // L: 7191 + var6 = var6 * 128 + 64; // L: 7192 + GraphicsObject var31 = new GraphicsObject(var2, class22.Client_plane, var5, var6, class105.getTileHeight(var5, var6, class22.Client_plane) - var3, var7, Client.cycle); // L: 7193 + Client.graphicsObjects.addFirst(var31); // L: 7194 + } + + } + } + } + } } - } // L: 4827 + } // L: 6969 6992 7038 7051 7073 7100 7181 7196 7198 } diff --git a/runescape-client/src/main/java/TileItem.java b/runescape-client/src/main/java/TileItem.java index 06cf76cfc9..b81fa8bc20 100644 --- a/runescape-client/src/main/java/TileItem.java +++ b/runescape-client/src/main/java/TileItem.java @@ -4,24 +4,24 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("du") +@ObfuscatedName("dr") @Implements("TileItem") public final class TileItem extends Renderable { - @ObfuscatedName("o") - @ObfuscatedGetter( - intValue = 1665063349 + @ObfuscatedName("ro") + @ObfuscatedSignature( + descriptor = "Lbe;" ) - @Export("RunException_revision") - public static int RunException_revision; - @ObfuscatedName("h") + @Export("decimator") + static Decimator decimator; + @ObfuscatedName("v") @ObfuscatedGetter( - intValue = 1758215561 + intValue = -467972035 ) @Export("id") int id; - @ObfuscatedName("c") + @ObfuscatedName("n") @ObfuscatedGetter( - intValue = -690991683 + intValue = 223075527 ) @Export("quantity") int quantity; @@ -29,13 +29,38 @@ public final class TileItem extends Renderable { TileItem() { } // L: 11 - @ObfuscatedName("c") + @ObfuscatedName("n") @ObfuscatedSignature( - descriptor = "(I)Lgj;", - garbageValue = "-220627570" + descriptor = "(B)Lgr;", + garbageValue = "-76" ) @Export("getModel") protected final Model getModel() { - return Strings.ItemDefinition_get(this.id).getModel(this.quantity); // L: 14 + return class260.ItemDefinition_get(this.id).getModel(this.quantity); // L: 14 } + + @ObfuscatedName("f") + @ObfuscatedSignature( + descriptor = "(I)V", + garbageValue = "-1655147086" + ) + @Export("savePreferences") + static void savePreferences() { + AccessFile var0 = null; // L: 95 + + try { + var0 = class82.getPreferencesFile("", SoundSystem.field461.name, true); // L: 97 + Buffer var1 = ObjectComposition.clientPreferences.toBuffer(); // L: 98 + var0.write(var1.array, 0, var1.offset); // L: 99 + } catch (Exception var3) { // L: 101 + } + + try { + if (var0 != null) { // L: 103 + var0.closeSync(true); // L: 104 + } + } catch (Exception var2) { // L: 107 + } + + } // L: 108 } diff --git a/runescape-client/src/main/java/Tiles.java b/runescape-client/src/main/java/Tiles.java index 43037a64de..59a2f752e7 100644 --- a/runescape-client/src/main/java/Tiles.java +++ b/runescape-client/src/main/java/Tiles.java @@ -4,231 +4,87 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("cs") +@ObfuscatedName("cg") @Implements("Tiles") public final class Tiles { - @ObfuscatedName("h") + @ObfuscatedName("v") @Export("Tiles_heights") static int[][][] Tiles_heights; - @ObfuscatedName("c") + @ObfuscatedName("n") @Export("Tiles_renderFlags") static byte[][][] Tiles_renderFlags; - @ObfuscatedName("o") + @ObfuscatedName("f") @ObfuscatedGetter( - intValue = 617721713 + intValue = 1752941579 ) @Export("Tiles_minPlane") static int Tiles_minPlane; - @ObfuscatedName("g") - static byte[][][] field1097; - @ObfuscatedName("z") - static byte[][][] field1088; - @ObfuscatedName("t") - static byte[][][] field1086; - @ObfuscatedName("v") - static byte[][][] field1090; - @ObfuscatedName("q") - @Export("Tiles_hue") - static int[] Tiles_hue; - @ObfuscatedName("x") + @ObfuscatedName("y") + static byte[][][] field1120; + @ObfuscatedName("p") + @ObfuscatedSignature( + descriptor = "[Lbg;" + ) + @Export("World_worlds") + static World[] World_worlds; + @ObfuscatedName("l") @Export("Tiles_lightness") static int[] Tiles_lightness; - @ObfuscatedName("k") - @ObfuscatedSignature( - descriptor = "Lbz;" - ) - @Export("pcmPlayerProvider") - static PlayerProvider pcmPlayerProvider; - @ObfuscatedName("p") - static int[][][] field1105; - @ObfuscatedName("u") - static final int[] field1085; @ObfuscatedName("m") - static final int[] field1095; - @ObfuscatedName("j") - static final int[] field1096; - @ObfuscatedName("f") - static final int[] field1100; - @ObfuscatedName("s") - static final int[] field1098; - @ObfuscatedName("y") - static final int[] field1094; + static final int[] field1117; + @ObfuscatedName("x") + static final int[] field1125; + @ObfuscatedName("z") + static final int[] field1126; @ObfuscatedName("w") + static final int[] field1123; + @ObfuscatedName("t") + static final int[] field1128; + @ObfuscatedName("h") + static final int[] field1129; + @ObfuscatedName("q") @ObfuscatedGetter( - intValue = -606383605 + intValue = -760931637 ) - static int field1092; - @ObfuscatedName("n") + static int field1130; + @ObfuscatedName("i") @ObfuscatedGetter( - intValue = 257499445 + intValue = 696638661 ) - static int field1101; + static int field1131; static { Tiles_heights = new int[4][105][105]; // L: 16 Tiles_renderFlags = new byte[4][104][104]; // L: 17 Tiles_minPlane = 99; // L: 18 - field1085 = new int[]{1, 2, 4, 8}; // L: 34 - field1095 = new int[]{16, 32, 64, 128}; // L: 35 - field1096 = new int[]{1, 0, -1, 0}; // L: 36 - field1100 = new int[]{0, -1, 0, 1}; // L: 37 - field1098 = new int[]{1, -1, -1, 1}; // L: 38 - field1094 = new int[]{-1, -1, 1, 1}; // L: 39 - field1092 = (int)(Math.random() * 17.0D) - 8; // L: 40 - field1101 = (int)(Math.random() * 33.0D) - 16; // L: 41 + field1117 = new int[]{1, 2, 4, 8}; // L: 34 + field1125 = new int[]{16, 32, 64, 128}; // L: 35 + field1126 = new int[]{1, 0, -1, 0}; // L: 36 + field1123 = new int[]{0, -1, 0, 1}; // L: 37 + field1128 = new int[]{1, -1, -1, 1}; // L: 38 + field1129 = new int[]{-1, -1, 1, 1}; // L: 39 + field1130 = (int)(Math.random() * 17.0D) - 8; // L: 40 + field1131 = (int)(Math.random() * 33.0D) - 16; // L: 41 } - @ObfuscatedName("l") + @ObfuscatedName("d") @ObfuscatedSignature( - descriptor = "(Lnm;IS)Z", - garbageValue = "12210" + descriptor = "(I)V", + garbageValue = "928975395" ) - @Export("updateExternalPlayer") - static boolean updateExternalPlayer(PacketBuffer var0, int var1) { - int var2 = var0.readBits(2); // L: 408 - int var3; - int var4; - int var7; - int var8; - int var9; - int var10; - if (var2 == 0) { // L: 409 - if (var0.readBits(1) != 0) { // L: 410 - updateExternalPlayer(var0, var1); - } + static final void method2053() { + Object var10000 = null; // L: 114 + String var0 = "Your friend list is full. Max of 200 for free users, and 400 for members"; + World.addGameMessage(30, "", var0); // L: 116 + } // L: 118 - var3 = var0.readBits(13); // L: 411 - var4 = var0.readBits(13); // L: 412 - boolean var12 = var0.readBits(1) == 1; // L: 413 - if (var12) { // L: 414 - Players.Players_pendingUpdateIndices[++Players.Players_pendingUpdateCount - 1] = var1; - } - - if (Client.players[var1] != null) { // L: 415 - throw new RuntimeException(); // L: 416 - } else { - Player var11 = Client.players[var1] = new Player(); // L: 418 - var11.index = var1; // L: 419 - if (Players.field1346[var1] != null) { // L: 420 - var11.read(Players.field1346[var1]); - } - - var11.orientation = Players.Players_orientations[var1]; // L: 421 - var11.targetIndex = Players.Players_targetIndices[var1]; // L: 422 - var7 = Players.Players_regions[var1]; // L: 423 - var8 = var7 >> 28; // L: 424 - var9 = var7 >> 14 & 255; // L: 425 - var10 = var7 & 255; // L: 426 - var11.pathTraversed[0] = Players.field1345[var1]; // L: 427 - var11.plane = (byte)var8; // L: 428 - var11.resetPath((var9 << 13) + var3 - JagexCache.baseX, (var10 << 13) + var4 - Messages.baseY); // L: 429 - var11.field1186 = false; // L: 430 - return true; // L: 431 - } - } else if (var2 == 1) { // L: 433 - var3 = var0.readBits(2); // L: 434 - var4 = Players.Players_regions[var1]; // L: 435 - Players.Players_regions[var1] = (var4 & 268435455) + (((var4 >> 28) + var3 & 3) << 28); // L: 436 - return false; // L: 437 - } else { - int var5; - int var6; - if (var2 == 2) { // L: 439 - var3 = var0.readBits(5); // L: 440 - var4 = var3 >> 3; // L: 441 - var5 = var3 & 7; // L: 442 - var6 = Players.Players_regions[var1]; // L: 443 - var7 = (var6 >> 28) + var4 & 3; // L: 444 - var8 = var6 >> 14 & 255; // L: 445 - var9 = var6 & 255; // L: 446 - if (var5 == 0) { // L: 447 - --var8; // L: 448 - --var9; // L: 449 - } - - if (var5 == 1) { // L: 451 - --var9; - } - - if (var5 == 2) { // L: 452 - ++var8; // L: 453 - --var9; // L: 454 - } - - if (var5 == 3) { // L: 456 - --var8; - } - - if (var5 == 4) { // L: 457 - ++var8; - } - - if (var5 == 5) { // L: 458 - --var8; // L: 459 - ++var9; // L: 460 - } - - if (var5 == 6) { // L: 462 - ++var9; - } - - if (var5 == 7) { // L: 463 - ++var8; // L: 464 - ++var9; // L: 465 - } - - Players.Players_regions[var1] = (var8 << 14) + var9 + (var7 << 28); // L: 467 - return false; // L: 468 - } else { - var3 = var0.readBits(18); // L: 470 - var4 = var3 >> 16; // L: 471 - var5 = var3 >> 8 & 255; // L: 472 - var6 = var3 & 255; // L: 473 - var7 = Players.Players_regions[var1]; // L: 474 - var8 = (var7 >> 28) + var4 & 3; // L: 475 - var9 = var5 + (var7 >> 14) & 255; // L: 476 - var10 = var6 + var7 & 255; // L: 477 - Players.Players_regions[var1] = (var9 << 14) + var10 + (var8 << 28); // L: 478 - return false; // L: 479 - } - } + @ObfuscatedName("ac") + @ObfuscatedSignature( + descriptor = "(Ljava/lang/String;I)I", + garbageValue = "-175787881" + ) + @Export("stringCp1252NullTerminatedByteSize") + public static int stringCp1252NullTerminatedByteSize(String var0) { + return var0.length() + 1; // L: 115 } - - @ObfuscatedName("gy") - @ObfuscatedSignature( - descriptor = "(S)V", - garbageValue = "2232" - ) - static final void method2046() { - for (GraphicsObject var0 = (GraphicsObject)Client.graphicsObjects.last(); var0 != null; var0 = (GraphicsObject)Client.graphicsObjects.previous()) { // L: 4741 4742 4749 - if (var0.plane == ParamComposition.Client_plane && !var0.isFinished) { // L: 4743 - if (Client.cycle >= var0.cycleStart) { // L: 4744 - var0.advance(Client.field768); // L: 4745 - if (var0.isFinished) { // L: 4746 - var0.remove(); - } else { - class5.scene.drawEntity(var0.plane, var0.x, var0.y, var0.height, 60, var0, 0, -1L, false); // L: 4747 - } - } - } else { - var0.remove(); - } - } - - } // L: 4751 - - @ObfuscatedName("lb") - @ObfuscatedSignature( - descriptor = "(Ljava/lang/String;I)V", - garbageValue = "-1790483961" - ) - @Export("Clan_joinChat") - static final void Clan_joinChat(String var0) { - if (!var0.equals("")) { // L: 11535 - PacketBufferNode var1 = HealthBarDefinition.getPacketBufferNode(ClientPacket.field2658, Client.packetWriter.isaacCipher); // L: 11537 - var1.packetBuffer.writeByte(class4.stringCp1252NullTerminatedByteSize(var0)); // L: 11538 - var1.packetBuffer.writeStringCp1252NullTerminated(var0); // L: 11539 - Client.packetWriter.addNode(var1); // L: 11540 - } - } // L: 11541 } diff --git a/runescape-client/src/main/java/Timer.java b/runescape-client/src/main/java/Timer.java index ce96480797..03b9d5b2ad 100644 --- a/runescape-client/src/main/java/Timer.java +++ b/runescape-client/src/main/java/Timer.java @@ -3,150 +3,273 @@ 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("kn") +@ObfuscatedName("kv") @Implements("Timer") public class Timer { - @ObfuscatedName("h") - @ObfuscatedGetter( - longValue = -5619312364821349651L - ) - long field3794; - @ObfuscatedName("c") - @ObfuscatedGetter( - longValue = 8217755253567710943L - ) - long field3790; - @ObfuscatedName("o") - public boolean field3791; - @ObfuscatedName("g") - @ObfuscatedGetter( - longValue = -6403892094001703111L - ) - long field3793; - @ObfuscatedName("l") - @ObfuscatedGetter( - longValue = 1011813193105859669L - ) - long field3800; - @ObfuscatedName("z") - @ObfuscatedGetter( - longValue = -6711688434827611249L - ) - long field3792; - @ObfuscatedName("t") - @ObfuscatedGetter( - intValue = -1385992935 - ) - int field3795; @ObfuscatedName("v") @ObfuscatedGetter( - intValue = -1180212987 + longValue = 8797083750332969957L ) - int field3797; + long field3768; + @ObfuscatedName("n") + @ObfuscatedGetter( + longValue = 807741776312371019L + ) + long field3766; + @ObfuscatedName("f") + public boolean field3769; + @ObfuscatedName("y") + @ObfuscatedGetter( + longValue = -8039422533561910721L + ) + long field3770; + @ObfuscatedName("p") + @ObfuscatedGetter( + longValue = -1942511866147941553L + ) + long field3767; + @ObfuscatedName("j") + @ObfuscatedGetter( + longValue = -6788679505704133641L + ) + long field3771; + @ObfuscatedName("r") + @ObfuscatedGetter( + intValue = 2093027907 + ) + int field3772; @ObfuscatedName("b") @ObfuscatedGetter( - intValue = 1981469859 + intValue = 2015708795 ) - int field3798; - @ObfuscatedName("q") + int field3773; + @ObfuscatedName("d") @ObfuscatedGetter( - intValue = -1196170195 + intValue = -211935081 ) - int field3799; + int field3774; + @ObfuscatedName("s") + @ObfuscatedGetter( + intValue = -1004054843 + ) + int field3775; public Timer() { - this.field3794 = -1L; // L: 7 - this.field3790 = -1L; // L: 8 - this.field3791 = false; // L: 9 - this.field3793 = 0L; // L: 10 - this.field3800 = 0L; // L: 11 - this.field3792 = 0L; // L: 12 - this.field3795 = 0; // L: 13 - this.field3797 = 0; // L: 14 - this.field3798 = 0; // L: 15 - this.field3799 = 0; // L: 16 + this.field3768 = -1L; // L: 7 + this.field3766 = -1L; // L: 8 + this.field3769 = false; // L: 9 + this.field3770 = 0L; // L: 10 + this.field3767 = 0L; // L: 11 + this.field3771 = 0L; // L: 12 + this.field3772 = 0; // L: 13 + this.field3773 = 0; // L: 14 + this.field3774 = 0; // L: 15 + this.field3775 = 0; // L: 16 } - @ObfuscatedName("h") + @ObfuscatedName("v") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "-534715452" + garbageValue = "1898013614" ) - public void method5463() { - this.field3794 = Archive.currentTimeMillis(); // L: 19 + public void method5602() { + this.field3768 = ObjectComposition.currentTimeMillis(); // L: 19 } // L: 20 - @ObfuscatedName("c") + @ObfuscatedName("n") @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "662219834" + descriptor = "(B)V", + garbageValue = "-1" ) - public void method5464() { - if (this.field3794 != -1L) { // L: 23 - this.field3800 = Archive.currentTimeMillis() - this.field3794; // L: 24 - this.field3794 = -1L; // L: 25 + public void method5590() { + if (this.field3768 != -1L) { // L: 23 + this.field3767 = ObjectComposition.currentTimeMillis() - this.field3768; // L: 24 + this.field3768 = -1L; // L: 25 } } // L: 27 - @ObfuscatedName("o") + @ObfuscatedName("f") @ObfuscatedSignature( descriptor = "(II)V", - garbageValue = "1375613565" + garbageValue = "1638200135" ) - public void method5465(int var1) { - this.field3790 = Archive.currentTimeMillis(); // L: 30 - this.field3795 = var1; // L: 31 + public void method5591(int var1) { + this.field3766 = ObjectComposition.currentTimeMillis(); // L: 30 + this.field3772 = var1; // L: 31 } // L: 32 - @ObfuscatedName("g") + @ObfuscatedName("y") @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "562136549" + descriptor = "(B)V", + garbageValue = "-99" ) - public void method5466() { - if (-1L != this.field3790) { // L: 35 - this.field3793 = Archive.currentTimeMillis() - this.field3790; // L: 36 - this.field3790 = -1L; // L: 37 + public void method5592() { + if (-1L != this.field3766) { // L: 35 + this.field3770 = ObjectComposition.currentTimeMillis() - this.field3766; // L: 36 + this.field3766 = -1L; // L: 37 } - ++this.field3798; // L: 39 - this.field3791 = true; // L: 40 + ++this.field3774; // L: 39 + this.field3769 = true; // L: 40 } // L: 41 - @ObfuscatedName("l") + @ObfuscatedName("p") @ObfuscatedSignature( - descriptor = "(B)V", - garbageValue = "110" + descriptor = "(I)V", + garbageValue = "-722241109" ) - public void method5467() { - this.field3791 = false; // L: 44 - this.field3797 = 0; // L: 45 - } // L: 46 + public void method5593() { + this.field3769 = false; // L: 44 + this.field3773 = 0; + } - @ObfuscatedName("z") + @ObfuscatedName("j") @ObfuscatedSignature( - descriptor = "(B)V", - garbageValue = "1" + descriptor = "(I)V", + garbageValue = "2107700042" ) - public void method5477() { - this.method5466(); // L: 49 - } // L: 50 + public void method5594() { + this.method5592(); + } - @ObfuscatedName("t") + @ObfuscatedName("r") @ObfuscatedSignature( - descriptor = "(Lnk;B)V", - garbageValue = "127" + descriptor = "(Lnd;I)V", + garbageValue = "-442398587" ) @Export("write") public void write(Buffer var1) { - WorldMapIcon_1.method3181(var1, this.field3800); // L: 53 - WorldMapIcon_1.method3181(var1, this.field3793); // L: 54 - WorldMapIcon_1.method3181(var1, this.field3792); // L: 55 - var1.writeShort(this.field3795); // L: 56 - var1.writeShort(this.field3797); // L: 57 - var1.writeShort(this.field3798); // L: 58 - var1.writeShort(this.field3799); // L: 59 - } // L: 60 + long var2 = this.field3767; // L: 53 + var2 /= 10L; // L: 55 + if (var2 < 0L) { // L: 56 + var2 = 0L; + } else if (var2 > 65535L) { + var2 = 65535L; + } + + var1.writeShort((int)var2); // L: 58 + long var4 = this.field3770; // L: 60 + var4 /= 10L; // L: 62 + if (var4 < 0L) { // L: 63 + var4 = 0L; + } else if (var4 > 65535L) { // L: 64 + var4 = 65535L; + } + + var1.writeShort((int)var4); // L: 65 + long var6 = this.field3771; + var6 /= 10L; + if (var6 < 0L) { // L: 70 + var6 = 0L; + } else if (var6 > 65535L) { // L: 71 + var6 = 65535L; + } + + var1.writeShort((int)var6); // L: 72 + var1.writeShort(this.field3772); // L: 74 + var1.writeShort(this.field3773); // L: 75 + var1.writeShort(this.field3774); // L: 76 + var1.writeShort(this.field3775); // L: 77 + } // L: 78 + + @ObfuscatedName("n") + @ObfuscatedSignature( + descriptor = "(CI)Z", + garbageValue = "1457822410" + ) + public static boolean method5614(char var0) { + if ((var0 <= 0 || var0 >= 128) && (var0 < 160 || var0 > 255)) { // L: 45 + if (var0 != 0) { // L: 46 + char[] var1 = class301.cp1252AsciiExtension; // L: 48 + + for (int var2 = 0; var2 < var1.length; ++var2) { // L: 49 + char var3 = var1[var2]; // L: 50 + if (var0 == var3) { // L: 52 + return true; + } + } + } + + return false; // L: 57 + } else { + return true; + } + } + + @ObfuscatedName("b") + @ObfuscatedSignature( + descriptor = "(II)I", + garbageValue = "-2049201204" + ) + static int method5595(int var0) { + Message var1 = (Message)Messages.Messages_hashTable.get((long)var0); // L: 66 + if (var1 == null) { // L: 67 + return -1; + } else { + return var1.nextDual == Messages.Messages_queue.sentinel ? -1 : ((Message)var1.nextDual).count; // L: 68 69 + } + } + + @ObfuscatedName("c") + @ObfuscatedSignature( + descriptor = "(ILcf;ZI)I", + garbageValue = "-1991704132" + ) + static int method5600(int var0, Script var1, boolean var2) { + Widget var3 = var2 ? class13.scriptDotWidget : Interpreter.scriptActiveWidget; // L: 1103 + if (var0 == ScriptOpcodes.CC_GETSCROLLX) { // L: 1104 + Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = var3.scrollX; // L: 1105 + return 1; // L: 1106 + } else if (var0 == ScriptOpcodes.CC_GETSCROLLY) { // L: 1108 + Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = var3.scrollY; // L: 1109 + return 1; // L: 1110 + } else if (var0 == ScriptOpcodes.CC_GETTEXT) { // L: 1112 + Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var3.text; // L: 1113 + return 1; // L: 1114 + } else if (var0 == ScriptOpcodes.CC_GETSCROLLWIDTH) { // L: 1116 + Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = var3.scrollWidth; // L: 1117 + return 1; // L: 1118 + } else if (var0 == ScriptOpcodes.CC_GETSCROLLHEIGHT) { // L: 1120 + Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = var3.scrollHeight; // L: 1121 + return 1; // L: 1122 + } else if (var0 == ScriptOpcodes.CC_GETMODELZOOM) { // L: 1124 + Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = var3.modelZoom; // L: 1125 + return 1; // L: 1126 + } else if (var0 == ScriptOpcodes.CC_GETMODELANGLE_X) { // L: 1128 + Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = var3.modelAngleX; // L: 1129 + return 1; // L: 1130 + } else if (var0 == ScriptOpcodes.CC_GETMODELANGLE_Z) { // L: 1132 + Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = var3.modelAngleZ; // L: 1133 + return 1; // L: 1134 + } else if (var0 == ScriptOpcodes.CC_GETMODELANGLE_Y) { // L: 1136 + Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = var3.modelAngleY; // L: 1137 + return 1; // L: 1138 + } else if (var0 == ScriptOpcodes.CC_GETTRANSTOP) { // L: 1140 + Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = var3.transparencyTop; // L: 1141 + return 1; // L: 1142 + } else if (var0 == ScriptOpcodes.CC_GETTRANSBOT) { // L: 1144 + Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = var3.transparencyBot; // L: 1145 + return 1; // L: 1146 + } else if (var0 == ScriptOpcodes.CC_GETCOLOUR) { // L: 1148 + Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = var3.color; // L: 1149 + return 1; // L: 1150 + } else if (var0 == ScriptOpcodes.CC_GETFILLCOLOUR) { // L: 1152 + Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = var3.color2; // L: 1153 + return 1; // L: 1154 + } else if (var0 == ScriptOpcodes.CC_GETFILLMODE) { // L: 1156 + Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = var3.fillMode.rsOrdinal(); // L: 1157 + return 1; // L: 1158 + } else if (var0 == ScriptOpcodes.CC_GETMODELTRANSPARENT) { // L: 1160 + Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = var3.modelTransparency ? 1 : 0; // L: 1161 + return 1; // L: 1162 + } else if (var0 != 1615 && var0 != 1616) { // L: 1164 + return 2; // L: 1168 + } else { + ++class44.Interpreter_intStackSize; // L: 1165 + return 1; // L: 1166 + } + } } diff --git a/runescape-client/src/main/java/TriBool.java b/runescape-client/src/main/java/TriBool.java index 1def72b1c1..b61ccf34a6 100644 --- a/runescape-client/src/main/java/TriBool.java +++ b/runescape-client/src/main/java/TriBool.java @@ -3,32 +3,27 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ls") +@ObfuscatedName("lu") @Implements("TriBool") public class TriBool { - @ObfuscatedName("h") + @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "Lls;" + descriptor = "Llu;" ) @Export("TriBool_unknown") public static final TriBool TriBool_unknown; - @ObfuscatedName("c") + @ObfuscatedName("n") @ObfuscatedSignature( - descriptor = "Lls;" + descriptor = "Llu;" ) @Export("TriBool_true") public static final TriBool TriBool_true; - @ObfuscatedName("o") + @ObfuscatedName("f") @ObfuscatedSignature( - descriptor = "Lls;" + descriptor = "Llu;" ) @Export("TriBool_false") public static final TriBool TriBool_false; - @ObfuscatedName("fy") - @ObfuscatedSignature( - descriptor = "Llc;" - ) - static AbstractSocket field3866; static { TriBool_unknown = new TriBool(); // L: 4 @@ -38,13 +33,4 @@ public class TriBool { TriBool() { } // L: 8 - - @ObfuscatedName("g") - @ObfuscatedSignature( - descriptor = "(B)[Lme;", - garbageValue = "60" - ) - static class338[] method5690() { - return new class338[]{class338.field3927, class338.field3925, class338.field3926, class338.field3928}; // L: 16 - } } diff --git a/runescape-client/src/main/java/UrlRequest.java b/runescape-client/src/main/java/UrlRequest.java index 1556afcf3c..df07db40e2 100644 --- a/runescape-client/src/main/java/UrlRequest.java +++ b/runescape-client/src/main/java/UrlRequest.java @@ -4,16 +4,22 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("dh") +@ObfuscatedName("df") @Implements("UrlRequest") public class UrlRequest { - @ObfuscatedName("h") + @ObfuscatedName("dn") + @ObfuscatedSignature( + descriptor = "Ljp;" + ) + @Export("archive6") + static Archive archive6; + @ObfuscatedName("v") @Export("url") final URL url; - @ObfuscatedName("c") + @ObfuscatedName("n") @Export("isDone0") volatile boolean isDone0; - @ObfuscatedName("o") + @ObfuscatedName("f") @Export("response0") volatile byte[] response0; @@ -21,435 +27,23 @@ public class UrlRequest { this.url = var1; // L: 96 } // L: 97 - @ObfuscatedName("h") + @ObfuscatedName("v") @ObfuscatedSignature( descriptor = "(I)Z", - garbageValue = "32017774" + garbageValue = "-754673345" ) @Export("isDone") public boolean isDone() { return this.isDone0; // L: 100 } - @ObfuscatedName("c") + @ObfuscatedName("n") @ObfuscatedSignature( - descriptor = "(I)[B", - garbageValue = "1444379818" + descriptor = "(B)[B", + garbageValue = "83" ) @Export("getResponse") public byte[] getResponse() { return this.response0; // L: 104 } - - @ObfuscatedName("h") - @Export("sleepExact") - public static final void sleepExact(long var0) { - if (var0 > 0L) { // L: 9 - if (0L == var0 % 10L) { // L: 10 - long var2 = var0 - 1L; // L: 11 - - try { - Thread.sleep(var2); // L: 14 - } catch (InterruptedException var8) { // L: 16 - } - - try { - Thread.sleep(1L); // L: 20 - } catch (InterruptedException var7) { // L: 22 - } - } else { - try { - Thread.sleep(var0); // L: 27 - } catch (InterruptedException var6) { // L: 29 - } - } - - } - } // L: 31 - - @ObfuscatedName("h") - @ObfuscatedSignature( - descriptor = "(Ljp;Ljp;ZLkc;I)V", - garbageValue = "543530822" - ) - public static void method2431(AbstractArchive var0, AbstractArchive var1, boolean var2, Font var3) { - ItemComposition.ItemDefinition_archive = var0; // L: 84 - FloorDecoration.ItemDefinition_modelArchive = var1; // L: 85 - BufferedNetSocket.ItemDefinition_inMembersWorld = var2; // L: 86 - class6.ItemDefinition_fileCount = ItemComposition.ItemDefinition_archive.getGroupFileCount(10); // L: 87 - StudioGame.ItemDefinition_fontPlain11 = var3; // L: 88 - } // L: 89 - - @ObfuscatedName("fo") - @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "2069514072" - ) - @Export("load") - static void load() { - int var23; - if (Client.titleLoadingStage == 0) { // L: 1950 - class5.scene = new Scene(4, 104, 104, Tiles.Tiles_heights); // L: 1951 - - for (var23 = 0; var23 < 4; ++var23) { // L: 1952 - Client.collisionMaps[var23] = new CollisionMap(104, 104); - } - - UserComparator8.sceneMinimapSprite = new SpritePixels(512, 512); // L: 1953 - Login.Login_loadingText = "Starting game engine..."; // L: 1954 - Login.Login_loadingPercent = 5; // L: 1955 - Client.titleLoadingStage = 20; // L: 1956 - } else if (Client.titleLoadingStage == 20) { // L: 1959 - Login.Login_loadingText = "Prepared visibility map"; // L: 1960 - Login.Login_loadingPercent = 10; // L: 1961 - Client.titleLoadingStage = 30; // L: 1962 - } else if (Client.titleLoadingStage == 30) { // L: 1965 - MilliClock.archive0 = class9.newArchive(0, false, true, true); // L: 1966 - class0.archive1 = class9.newArchive(1, false, true, true); // L: 1967 - KitDefinition.archive2 = class9.newArchive(2, true, false, true); // L: 1968 - EnumComposition.archive3 = class9.newArchive(3, false, true, true); // L: 1969 - class14.archive4 = class9.newArchive(4, false, true, true); // L: 1970 - WorldMapSection0.archive5 = class9.newArchive(5, true, true, true); // L: 1971 - class29.archive6 = class9.newArchive(6, true, true, true); // L: 1972 - class260.archive7 = class9.newArchive(7, false, true, true); // L: 1973 - class43.archive8 = class9.newArchive(8, false, true, true); // L: 1974 - GameBuild.archive9 = class9.newArchive(9, false, true, true); // L: 1975 - PendingSpawn.archive10 = class9.newArchive(10, false, true, true); // L: 1976 - KeyHandler.archive11 = class9.newArchive(11, false, true, true); // L: 1977 - class22.archive12 = class9.newArchive(12, false, true, true); // L: 1978 - class18.archive13 = class9.newArchive(13, true, false, true); // L: 1979 - Huffman.archive14 = class9.newArchive(14, false, true, true); // L: 1980 - class16.archive15 = class9.newArchive(15, false, true, true); // L: 1981 - Actor.archive17 = class9.newArchive(17, true, true, true); // L: 1982 - WorldMapAreaData.archive18 = class9.newArchive(18, false, true, true); // L: 1983 - class232.archive19 = class9.newArchive(19, false, true, true); // L: 1984 - class9.archive20 = class9.newArchive(20, false, true, true); // L: 1985 - Login.Login_loadingText = "Connecting to update server"; // L: 1986 - Login.Login_loadingPercent = 20; // L: 1987 - Client.titleLoadingStage = 40; // L: 1988 - } else if (Client.titleLoadingStage == 40) { // L: 1991 - byte var34 = 0; // L: 1992 - var23 = var34 + MilliClock.archive0.percentage() * 4 / 100; // L: 1993 - var23 += class0.archive1.percentage() * 4 / 100; // L: 1994 - var23 += KitDefinition.archive2.percentage() * 2 / 100; // L: 1995 - var23 += EnumComposition.archive3.percentage() * 2 / 100; // L: 1996 - var23 += class14.archive4.percentage() * 6 / 100; // L: 1997 - var23 += WorldMapSection0.archive5.percentage() * 4 / 100; // L: 1998 - var23 += class29.archive6.percentage() * 2 / 100; // L: 1999 - var23 += class260.archive7.percentage() * 56 / 100; // L: 2000 - var23 += class43.archive8.percentage() * 2 / 100; // L: 2001 - var23 += GameBuild.archive9.percentage() * 2 / 100; // L: 2002 - var23 += PendingSpawn.archive10.percentage() * 2 / 100; // L: 2003 - var23 += KeyHandler.archive11.percentage() * 2 / 100; // L: 2004 - var23 += class22.archive12.percentage() * 2 / 100; // L: 2005 - var23 += class18.archive13.percentage() * 2 / 100; // L: 2006 - var23 += Huffman.archive14.percentage() * 2 / 100; // L: 2007 - var23 += class16.archive15.percentage() * 2 / 100; // L: 2008 - var23 += class232.archive19.percentage() / 100; // L: 2009 - var23 += WorldMapAreaData.archive18.percentage() / 100; // L: 2010 - var23 += class9.archive20.percentage() / 100; // L: 2011 - var23 += Actor.archive17.method4822() && Actor.archive17.isFullyLoaded() ? 1 : 0; // L: 2012 - if (var23 != 100) { // L: 2013 - if (var23 != 0) { // L: 2014 - Login.Login_loadingText = "Checking for updates - " + var23 + "%"; - } - - Login.Login_loadingPercent = 30; // L: 2015 - } else { - class225.method4300(MilliClock.archive0, "Animations"); // L: 2018 - class225.method4300(class0.archive1, "Skeletons"); // L: 2019 - class225.method4300(class14.archive4, "Sound FX"); // L: 2020 - class225.method4300(WorldMapSection0.archive5, "Maps"); // L: 2021 - class225.method4300(class29.archive6, "Music Tracks"); // L: 2022 - class225.method4300(class260.archive7, "Models"); // L: 2023 - class225.method4300(class43.archive8, "Sprites"); // L: 2024 - class225.method4300(KeyHandler.archive11, "Music Jingles"); // L: 2025 - class225.method4300(Huffman.archive14, "Music Samples"); // L: 2026 - class225.method4300(class16.archive15, "Music Patches"); // L: 2027 - class225.method4300(class232.archive19, "World Map"); // L: 2028 - class225.method4300(WorldMapAreaData.archive18, "World Map Geography"); // L: 2029 - class225.method4300(class9.archive20, "World Map Ground"); // L: 2030 - ScriptFrame.spriteIds = new GraphicsDefaults(); // L: 2031 - ScriptFrame.spriteIds.decode(Actor.archive17); // L: 2032 - Login.Login_loadingText = "Loaded update list"; // L: 2033 - Login.Login_loadingPercent = 30; // L: 2034 - Client.titleLoadingStage = 45; // L: 2035 - } - } else if (Client.titleLoadingStage == 45) { // L: 2038 - Message.method1166(22050, !Client.isLowDetail, 2); // L: 2039 - MidiPcmStream var30 = new MidiPcmStream(); // L: 2040 - var30.method4467(9, 128); // L: 2041 - WorldMapAreaData.pcmPlayer0 = GrandExchangeEvents.method4969(GameEngine.taskHandler, 0, 22050); // L: 2042 - WorldMapAreaData.pcmPlayer0.setStream(var30); // L: 2043 - class1.method13(class16.archive15, Huffman.archive14, class14.archive4, var30); // L: 2044 - class93.pcmPlayer1 = GrandExchangeEvents.method4969(GameEngine.taskHandler, 1, 2048); // L: 2045 - FloorOverlayDefinition.pcmStreamMixer = new PcmStreamMixer(); // L: 2046 - class93.pcmPlayer1.setStream(FloorOverlayDefinition.pcmStreamMixer); // L: 2047 - class3.decimator = new Decimator(22050, PcmPlayer.field401); // L: 2048 - Login.Login_loadingText = "Prepared sound engine"; // L: 2049 - Login.Login_loadingPercent = 35; // L: 2050 - Client.titleLoadingStage = 50; // L: 2051 - class260.WorldMapElement_fonts = new Fonts(class43.archive8, class18.archive13); // L: 2052 - } else { - int var1; - if (Client.titleLoadingStage == 50) { // L: 2055 - FontName[] var29 = new FontName[]{FontName.FontName_bold12, FontName.FontName_plain12, FontName.FontName_plain11, FontName.FontName_verdana11, FontName.FontName_verdana15, FontName.FontName_verdana13}; // L: 2058 - var1 = var29.length; // L: 2060 - Fonts var32 = class260.WorldMapElement_fonts; // L: 2061 - FontName[] var33 = new FontName[]{FontName.FontName_bold12, FontName.FontName_plain12, FontName.FontName_plain11, FontName.FontName_verdana11, FontName.FontName_verdana15, FontName.FontName_verdana13}; // L: 2064 - Client.fontsMap = var32.createMap(var33); // L: 2066 - if (Client.fontsMap.size() < var1) { // L: 2067 - Login.Login_loadingText = "Loading fonts - " + Client.fontsMap.size() * 100 / var1 + "%"; // L: 2068 - Login.Login_loadingPercent = 40; // L: 2069 - } else { - class11.fontPlain11 = (Font)Client.fontsMap.get(FontName.FontName_plain11); // L: 2072 - Message.fontPlain12 = (Font)Client.fontsMap.get(FontName.FontName_plain12); // L: 2073 - WorldMapArea.fontBold12 = (Font)Client.fontsMap.get(FontName.FontName_bold12); // L: 2074 - GameObject.platformInfo = Client.platformInfoProvider.get(); // L: 2075 - Login.Login_loadingText = "Loaded fonts"; // L: 2076 - Login.Login_loadingPercent = 40; // L: 2077 - Client.titleLoadingStage = 60; // L: 2078 - } - } else if (Client.titleLoadingStage == 60) { // L: 2081 - var23 = GraphicsDefaults.method5825(PendingSpawn.archive10, class43.archive8); // L: 2082 - byte var31 = 12; // L: 2085 - if (var23 < var31) { // L: 2088 - Login.Login_loadingText = "Loading title screen - " + var23 * 100 / var31 + "%"; // L: 2089 - Login.Login_loadingPercent = 50; // L: 2090 - } else { - Login.Login_loadingText = "Loaded title screen"; // L: 2093 - Login.Login_loadingPercent = 50; // L: 2094 - Client.updateGameState(5); // L: 2095 - Client.titleLoadingStage = 70; // L: 2096 - } - } else if (Client.titleLoadingStage == 70) { // L: 2099 - if (!KitDefinition.archive2.isFullyLoaded()) { // L: 2100 - Login.Login_loadingText = "Loading config - " + KitDefinition.archive2.loadPercent() + "%"; // L: 2101 - Login.Login_loadingPercent = 60; // L: 2102 - } else { - BufferedSource.method5782(KitDefinition.archive2); // L: 2105 - Archive var28 = KitDefinition.archive2; // L: 2106 - FloorUnderlayDefinition.FloorUnderlayDefinition_archive = var28; // L: 2108 - Archive var24 = KitDefinition.archive2; // L: 2110 - Archive var25 = class260.archive7; // L: 2111 - KitDefinition.KitDefinition_archive = var24; // L: 2113 - KitDefinition.KitDefinition_modelsArchive = var25; // L: 2114 - KitDefinition.KitDefinition_fileCount = KitDefinition.KitDefinition_archive.getGroupFileCount(3); // L: 2115 - Archive var26 = KitDefinition.archive2; // L: 2117 - Archive var27 = class260.archive7; // L: 2118 - boolean var5 = Client.isLowDetail; // L: 2119 - ObjectComposition.ObjectDefinition_archive = var26; // L: 2121 - ObjectComposition.ObjectDefinition_modelsArchive = var27; // L: 2122 - ObjectComposition.ObjectDefinition_isLowDetail = var5; // L: 2123 - Archive var6 = KitDefinition.archive2; // L: 2125 - Archive var7 = class260.archive7; // L: 2126 - NPCComposition.NpcDefinition_archive = var6; // L: 2128 - NPCComposition.NpcDefinition_modelArchive = var7; // L: 2129 - UserComparator7.method2453(KitDefinition.archive2); // L: 2131 - method2431(KitDefinition.archive2, class260.archive7, Client.isMembersWorld, class11.fontPlain11); // L: 2132 - Archive var8 = KitDefinition.archive2; // L: 2133 - Archive var9 = MilliClock.archive0; // L: 2134 - Archive var10 = class0.archive1; // L: 2135 - SequenceDefinition.SequenceDefinition_archive = var8; // L: 2137 - SequenceDefinition.SequenceDefinition_animationsArchive = var9; // L: 2138 - SequenceDefinition.SequenceDefinition_skeletonsArchive = var10; // L: 2139 - class69.method1153(KitDefinition.archive2, class260.archive7); // L: 2141 - Archive var11 = KitDefinition.archive2; // L: 2142 - VarbitComposition.VarbitDefinition_archive = var11; // L: 2144 - Archive var12 = KitDefinition.archive2; // L: 2146 - VarpDefinition.VarpDefinition_archive = var12; // L: 2148 - class403.VarpDefinition_fileCount = VarpDefinition.VarpDefinition_archive.getGroupFileCount(16); // L: 2149 - class34.method391(EnumComposition.archive3, class260.archive7, class43.archive8, class18.archive13); // L: 2151 - NPC.method2266(KitDefinition.archive2); // L: 2152 - Archive var13 = KitDefinition.archive2; // L: 2153 - EnumComposition.EnumDefinition_archive = var13; // L: 2155 - AbstractByteArrayCopier.method4756(KitDefinition.archive2); // L: 2157 - ApproximateRouteStrategy.method1203(KitDefinition.archive2); // L: 2158 - class7.field60 = new class369(NetSocket.field1492, 54, class7.clientLanguage, KitDefinition.archive2); // L: 2159 - ModeWhere.HitSplatDefinition_cachedSprites = new class369(NetSocket.field1492, 47, class7.clientLanguage, KitDefinition.archive2); // L: 2160 - Client.varcs = new Varcs(); // L: 2161 - Archive var14 = KitDefinition.archive2; // L: 2162 - Archive var15 = class43.archive8; // L: 2163 - Archive var16 = class18.archive13; // L: 2164 - HitSplatDefinition.HitSplatDefinition_archive = var14; // L: 2166 - HitSplatDefinition.field1731 = var15; // L: 2167 - HitSplatDefinition.HitSplatDefinition_fontsArchive = var16; // L: 2168 - Archive var17 = KitDefinition.archive2; // L: 2170 - Archive var18 = class43.archive8; // L: 2171 - HealthBarDefinition.HealthBarDefinition_archive = var17; // L: 2173 - HealthBarDefinition.HitSplatDefinition_spritesArchive = var18; // L: 2174 - Archive var19 = KitDefinition.archive2; // L: 2176 - Archive var20 = class43.archive8; // L: 2177 - WorldMapElement.WorldMapElement_archive = var20; // L: 2179 - if (var19.isFullyLoaded()) { // L: 2180 - WorldMapElement.WorldMapElement_count = var19.getGroupFileCount(35); // L: 2183 - WorldMapElement.WorldMapElement_cached = new WorldMapElement[WorldMapElement.WorldMapElement_count]; // L: 2184 - - for (int var21 = 0; var21 < WorldMapElement.WorldMapElement_count; ++var21) { // L: 2185 - byte[] var22 = var19.takeFile(35, var21); // L: 2186 - WorldMapElement.WorldMapElement_cached[var21] = new WorldMapElement(var21); // L: 2187 - if (var22 != null) { // L: 2188 - WorldMapElement.WorldMapElement_cached[var21].decode(new Buffer(var22)); // L: 2189 - WorldMapElement.WorldMapElement_cached[var21].method2631(); // L: 2190 - } - } - } - - Login.Login_loadingText = "Loaded config"; // L: 2194 - Login.Login_loadingPercent = 60; // L: 2195 - Client.titleLoadingStage = 80; // L: 2196 - } - } else if (Client.titleLoadingStage == 80) { // L: 2199 - var23 = 0; // L: 2200 - if (WorldMapRegion.compass == null) { // L: 2201 - WorldMapRegion.compass = Friend.SpriteBuffer_getSprite(class43.archive8, ScriptFrame.spriteIds.compass, 0); - } else { - ++var23; // L: 2202 - } - - if (GrandExchangeOfferOwnWorldComparator.redHintArrowSprite == null) { // L: 2203 - GrandExchangeOfferOwnWorldComparator.redHintArrowSprite = Friend.SpriteBuffer_getSprite(class43.archive8, ScriptFrame.spriteIds.field3915, 0); - } else { - ++var23; // L: 2204 - } - - if (class23.mapSceneSprites == null) { // L: 2205 - class23.mapSceneSprites = WorldMapDecoration.method3571(class43.archive8, ScriptFrame.spriteIds.mapScenes, 0); - } else { - ++var23; // L: 2206 - } - - if (class14.headIconPkSprites == null) { // L: 2207 - class14.headIconPkSprites = class253.method4767(class43.archive8, ScriptFrame.spriteIds.headIconsPk, 0); - } else { - ++var23; // L: 2208 - } - - if (Varcs.headIconPrayerSprites == null) { // L: 2209 - Varcs.headIconPrayerSprites = class253.method4767(class43.archive8, ScriptFrame.spriteIds.field3908, 0); - } else { - ++var23; // L: 2210 - } - - if (class375.headIconHintSprites == null) { // L: 2211 - class375.headIconHintSprites = class253.method4767(class43.archive8, ScriptFrame.spriteIds.field3909, 0); - } else { - ++var23; // L: 2212 - } - - if (ObjectComposition.mapMarkerSprites == null) { // L: 2213 - ObjectComposition.mapMarkerSprites = class253.method4767(class43.archive8, ScriptFrame.spriteIds.field3910, 0); - } else { - ++var23; // L: 2214 - } - - if (MouseHandler.crossSprites == null) { // L: 2215 - MouseHandler.crossSprites = class253.method4767(class43.archive8, ScriptFrame.spriteIds.field3914, 0); - } else { - ++var23; // L: 2216 - } - - if (class341.mapDotSprites == null) { // L: 2217 - class341.mapDotSprites = class253.method4767(class43.archive8, ScriptFrame.spriteIds.field3904, 0); - } else { - ++var23; // L: 2218 - } - - if (GrandExchangeOfferTotalQuantityComparator.scrollBarSprites == null) { // L: 2219 - GrandExchangeOfferTotalQuantityComparator.scrollBarSprites = WorldMapDecoration.method3571(class43.archive8, ScriptFrame.spriteIds.field3913, 0); - } else { - ++var23; // L: 2220 - } - - if (FriendSystem.modIconSprites == null) { // L: 2221 - FriendSystem.modIconSprites = WorldMapDecoration.method3571(class43.archive8, ScriptFrame.spriteIds.field3916, 0); - } else { - ++var23; // L: 2222 - } - - if (var23 < 11) { // L: 2223 - Login.Login_loadingText = "Loading sprites - " + var23 * 100 / 12 + "%"; // L: 2224 - Login.Login_loadingPercent = 70; // L: 2225 - } else { - AbstractFont.AbstractFont_modIconSprites = FriendSystem.modIconSprites; // L: 2228 - GrandExchangeOfferOwnWorldComparator.redHintArrowSprite.normalize(); // L: 2229 - var1 = (int)(Math.random() * 21.0D) - 10; // L: 2230 - int var2 = (int)(Math.random() * 21.0D) - 10; // L: 2231 - int var3 = (int)(Math.random() * 21.0D) - 10; // L: 2232 - int var4 = (int)(Math.random() * 41.0D) - 20; // L: 2233 - class23.mapSceneSprites[0].shiftColors(var1 + var4, var4 + var2, var3 + var4); // L: 2234 - Login.Login_loadingText = "Loaded sprites"; // L: 2235 - Login.Login_loadingPercent = 70; // L: 2236 - Client.titleLoadingStage = 90; // L: 2237 - } - } else if (Client.titleLoadingStage == 90) { // L: 2240 - if (!GameBuild.archive9.isFullyLoaded()) { // L: 2241 - Login.Login_loadingText = "Loading textures - " + "0%"; // L: 2242 - Login.Login_loadingPercent = 90; // L: 2243 - } else { - class9.textureProvider = new TextureProvider(GameBuild.archive9, class43.archive8, 20, class12.clientPreferences.field1303, Client.isLowDetail ? 64 : 128); // L: 2246 - Rasterizer3D.Rasterizer3D_setTextureLoader(class9.textureProvider); // L: 2247 - Rasterizer3D.Rasterizer3D_setBrightness(class12.clientPreferences.field1303); // L: 2248 - Client.titleLoadingStage = 100; // L: 2249 - } - } else if (Client.titleLoadingStage == 100) { // L: 2252 - var23 = class9.textureProvider.getLoadedPercentage(); // L: 2253 - if (var23 < 100) { // L: 2254 - Login.Login_loadingText = "Loading textures - " + var23 + "%"; // L: 2255 - Login.Login_loadingPercent = 90; // L: 2256 - } else { - Login.Login_loadingText = "Loaded textures"; // L: 2259 - Login.Login_loadingPercent = 90; // L: 2260 - Client.titleLoadingStage = 110; // L: 2261 - } - } else if (Client.titleLoadingStage == 110) { // L: 2264 - class69.mouseRecorder = new MouseRecorder(); // L: 2265 - GameEngine.taskHandler.newThreadTask(class69.mouseRecorder, 10); // L: 2266 - Login.Login_loadingText = "Loaded input handler"; // L: 2267 - Login.Login_loadingPercent = 92; // L: 2268 - Client.titleLoadingStage = 120; // L: 2269 - } else if (Client.titleLoadingStage == 120) { // L: 2272 - if (!PendingSpawn.archive10.tryLoadFileByNames("huffman", "")) { // L: 2273 - Login.Login_loadingText = "Loading wordpack - " + 0 + "%"; // L: 2274 - Login.Login_loadingPercent = 94; // L: 2275 - } else { - Huffman var0 = new Huffman(PendingSpawn.archive10.takeFileByNames("huffman", "")); // L: 2278 - VertexNormal.method4219(var0); // L: 2279 - Login.Login_loadingText = "Loaded wordpack"; // L: 2280 - Login.Login_loadingPercent = 94; // L: 2281 - Client.titleLoadingStage = 130; // L: 2282 - } - } else if (Client.titleLoadingStage == 130) { // L: 2285 - if (!EnumComposition.archive3.isFullyLoaded()) { // L: 2286 - Login.Login_loadingText = "Loading interfaces - " + EnumComposition.archive3.loadPercent() * 4 / 5 + "%"; // L: 2287 - Login.Login_loadingPercent = 96; // L: 2288 - } else if (!class22.archive12.isFullyLoaded()) { // L: 2291 - Login.Login_loadingText = "Loading interfaces - " + (80 + class22.archive12.loadPercent() / 6) + "%"; // L: 2292 - Login.Login_loadingPercent = 96; // L: 2293 - } else if (!class18.archive13.isFullyLoaded()) { // L: 2296 - Login.Login_loadingText = "Loading interfaces - " + (96 + class18.archive13.loadPercent() / 50) + "%"; // L: 2297 - Login.Login_loadingPercent = 96; // L: 2298 - } else { - Login.Login_loadingText = "Loaded interfaces"; // L: 2301 - Login.Login_loadingPercent = 98; // L: 2302 - Client.titleLoadingStage = 140; // L: 2303 - } - } else if (Client.titleLoadingStage == 140) { // L: 2306 - Login.Login_loadingPercent = 100; // L: 2307 - if (!class232.archive19.tryLoadGroupByName(WorldMapCacheName.field2128.name)) { // L: 2308 - Login.Login_loadingText = "Loading world map - " + class232.archive19.groupLoadPercentByName(WorldMapCacheName.field2128.name) / 10 + "%"; // L: 2309 - } else { - if (NetSocket.worldMap == null) { // L: 2312 - NetSocket.worldMap = new WorldMap(); // L: 2313 - NetSocket.worldMap.init(class232.archive19, WorldMapAreaData.archive18, class9.archive20, WorldMapArea.fontBold12, Client.fontsMap, class23.mapSceneSprites); // L: 2314 - } - - Login.Login_loadingText = "Loaded world map"; // L: 2316 - Client.titleLoadingStage = 150; // L: 2317 - } - } else if (Client.titleLoadingStage == 150) { // L: 2320 - Client.updateGameState(10); // L: 2321 - } - } - } // L: 1957 1963 1989 2016 2036 2053 2070 2079 2091 2097 2103 2197 2226 2238 2244 2250 2257 2262 2270 2276 2283 2289 2294 2299 2304 2310 2318 2322 2324 } diff --git a/runescape-client/src/main/java/UrlRequester.java b/runescape-client/src/main/java/UrlRequester.java index de00be0ce4..3eb4ad095c 100644 --- a/runescape-client/src/main/java/UrlRequester.java +++ b/runescape-client/src/main/java/UrlRequester.java @@ -9,17 +9,20 @@ 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("dz") +@ObfuscatedName("do") @Implements("UrlRequester") public class UrlRequester implements Runnable { - @ObfuscatedName("h") + @ObfuscatedName("e") + static int[][][] field1419; + @ObfuscatedName("v") @Export("thread") final Thread thread; - @ObfuscatedName("c") + @ObfuscatedName("n") @Export("isClosed") volatile boolean isClosed; - @ObfuscatedName("o") + @ObfuscatedName("f") @Export("requests") Queue requests; @@ -30,25 +33,25 @@ public class UrlRequester implements Runnable { this.thread.start(); // L: 20 } // L: 21 - @ObfuscatedName("h") + @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "(Ljava/net/URL;I)Ldh;", - garbageValue = "-1471411357" + descriptor = "(Ljava/net/URL;I)Ldf;", + garbageValue = "-1811269491" ) @Export("request") public UrlRequest request(URL var1) { UrlRequest var2 = new UrlRequest(var1); // L: 71 - synchronized(this) { - this.requests.add(var2); + synchronized(this) { // L: 72 + this.requests.add(var2); // L: 73 this.notify(); // L: 74 return var2; // L: 76 } } - @ObfuscatedName("c") + @ObfuscatedName("n") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "-1011517268" + garbageValue = "279229859" ) @Export("close") public void close() { @@ -59,11 +62,11 @@ public class UrlRequester implements Runnable { this.notify(); // L: 83 } // L: 84 - this.thread.join(); - } catch (InterruptedException var4) { + this.thread.join(); // L: 85 + } catch (InterruptedException var4) { // L: 87 } - } + } // L: 88 public void run() { while (!this.isClosed) { // L: 24 @@ -111,33 +114,178 @@ public class UrlRequester implements Runnable { } } catch (Exception var17) { // L: 64 - class27.RunException_sendStackTrace((String)null, var17); // L: 65 + class266.RunException_sendStackTrace((String)null, var17); // L: 65 } } } // L: 68 - @ObfuscatedName("t") + @ObfuscatedName("az") @ObfuscatedSignature( - descriptor = "(III)I", - garbageValue = "2060167605" + descriptor = "(ILcf;ZI)I", + garbageValue = "1175355119" ) - public static int method2421(int var0, int var1) { - int var2; - for (var2 = 0; var1 > 0; --var1) { // L: 85 86 89 - var2 = var2 << 1 | var0 & 1; // L: 87 - var0 >>>= 1; // L: 88 - } + static int method2420(int var0, Script var1, boolean var2) { + if (var0 == ScriptOpcodes.VIEWPORT_SETFOV) { // L: 3519 + class44.Interpreter_intStackSize -= 2; // L: 3520 + Client.field894 = (short)class43.method436(Interpreter.Interpreter_intStack[class44.Interpreter_intStackSize]); // L: 3521 + if (Client.field894 <= 0) { // L: 3522 + Client.field894 = 256; + } - return var2; // L: 91 + Client.field895 = (short)class43.method436(Interpreter.Interpreter_intStack[class44.Interpreter_intStackSize + 1]); // L: 3523 + if (Client.field895 <= 0) { // L: 3524 + Client.field895 = 256; + } + + return 1; // L: 3525 + } else if (var0 == ScriptOpcodes.VIEWPORT_SETZOOM) { // L: 3527 + class44.Interpreter_intStackSize -= 2; // L: 3528 + Client.zoomHeight = (short)Interpreter.Interpreter_intStack[class44.Interpreter_intStackSize]; // L: 3529 + if (Client.zoomHeight <= 0) { // L: 3530 + Client.zoomHeight = 256; + } + + Client.zoomWidth = (short)Interpreter.Interpreter_intStack[class44.Interpreter_intStackSize + 1]; // L: 3531 + if (Client.zoomWidth <= 0) { // L: 3532 + Client.zoomWidth = 320; + } + + return 1; // L: 3533 + } else if (var0 == ScriptOpcodes.VIEWPORT_CLAMPFOV) { // L: 3535 + class44.Interpreter_intStackSize -= 4; // L: 3536 + Client.field909 = (short)Interpreter.Interpreter_intStack[class44.Interpreter_intStackSize]; // L: 3537 + if (Client.field909 <= 0) { // L: 3538 + Client.field909 = 1; + } + + Client.field828 = (short)Interpreter.Interpreter_intStack[class44.Interpreter_intStackSize + 1]; // L: 3539 + if (Client.field828 <= 0) { // L: 3540 + Client.field828 = 32767; + } else if (Client.field828 < Client.field909) { // L: 3541 + Client.field828 = Client.field909; + } + + Client.field900 = (short)Interpreter.Interpreter_intStack[class44.Interpreter_intStackSize + 2]; // L: 3542 + if (Client.field900 <= 0) { // L: 3543 + Client.field900 = 1; + } + + Client.field901 = (short)Interpreter.Interpreter_intStack[class44.Interpreter_intStackSize + 3]; // L: 3544 + if (Client.field901 <= 0) { // L: 3545 + Client.field901 = 32767; + } else if (Client.field901 < Client.field900) { // L: 3546 + Client.field901 = Client.field900; + } + + return 1; // L: 3547 + } else if (var0 == ScriptOpcodes.VIEWPORT_GETEFFECTIVESIZE) { // L: 3549 + if (Client.viewportWidget != null) { // L: 3550 + setViewportShape(0, 0, Client.viewportWidget.width, Client.viewportWidget.height, false); // L: 3551 + Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = Client.viewportWidth; // L: 3552 + Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = Client.viewportHeight; // L: 3553 + } else { + Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = -1; // L: 3556 + Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = -1; // L: 3557 + } + + return 1; // L: 3559 + } else if (var0 == ScriptOpcodes.VIEWPORT_GETZOOM) { // L: 3561 + Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = Client.zoomHeight; // L: 3562 + Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = Client.zoomWidth; // L: 3563 + return 1; // L: 3564 + } else if (var0 == ScriptOpcodes.VIEWPORT_GETFOV) { // L: 3566 + Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = UserComparator9.method2467(Client.field894); // L: 3567 + Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = UserComparator9.method2467(Client.field895); // L: 3568 + return 1; // L: 3569 + } else if (var0 == 6220) { // L: 3571 + Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = 0; // L: 3572 + return 1; // L: 3573 + } else if (var0 == 6221) { // L: 3575 + Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = 0; // L: 3576 + return 1; // L: 3577 + } else if (var0 == 6222) { // L: 3579 + Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = class32.canvasWidth; // L: 3580 + return 1; // L: 3581 + } else if (var0 == 6223) { // L: 3583 + Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = ReflectionCheck.canvasHeight; // L: 3584 + return 1; // L: 3585 + } else { + return 2; // L: 3587 + } } - @ObfuscatedName("t") + @ObfuscatedName("gu") @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "1026203280" + descriptor = "(IIIIZI)V", + garbageValue = "1159694527" ) - public static void method2422() { - ParamComposition.ParamDefinition_cached.clear(); // L: 72 - } // L: 73 + @Export("setViewportShape") + static final void setViewportShape(int var0, int var1, int var2, int var3, boolean var4) { + if (var2 < 1) { // L: 4289 + var2 = 1; + } + + if (var3 < 1) { // L: 4290 + var3 = 1; + } + + int var5 = var3 - 334; // L: 4291 + int var6; + if (var5 < 0) { // L: 4293 + var6 = Client.field894; + } else if (var5 >= 100) { // L: 4294 + var6 = Client.field895; + } else { + var6 = (Client.field895 - Client.field894) * var5 / 100 + Client.field894; // L: 4295 + } + + int var7 = var3 * var6 * 512 / (var2 * 334); // L: 4296 + int var8; + int var9; + short var10; + if (var7 < Client.field900) { // L: 4297 + var10 = Client.field900; // L: 4298 + var6 = var10 * var2 * 334 / (var3 * 512); // L: 4299 + if (var6 > Client.field828) { // L: 4300 + var6 = Client.field828; // L: 4301 + var8 = var3 * var6 * 512 / (var10 * 334); // L: 4302 + var9 = (var2 - var8) / 2; // L: 4303 + if (var4) { // L: 4304 + Rasterizer2D.Rasterizer2D_resetClip(); // L: 4305 + Rasterizer2D.Rasterizer2D_fillRectangle(var0, var1, var9, var3, -16777216); // L: 4306 + Rasterizer2D.Rasterizer2D_fillRectangle(var0 + var2 - var9, var1, var9, var3, -16777216); // L: 4307 + } + + var0 += var9; // L: 4309 + var2 -= var9 * 2; // L: 4310 + } + } else if (var7 > Client.field901) { // L: 4313 + var10 = Client.field901; // L: 4314 + var6 = var10 * var2 * 334 / (var3 * 512); // L: 4315 + if (var6 < Client.field909) { // L: 4316 + var6 = Client.field909; // L: 4317 + var8 = var10 * var2 * 334 / (var6 * 512); // L: 4318 + var9 = (var3 - var8) / 2; // L: 4319 + if (var4) { // L: 4320 + Rasterizer2D.Rasterizer2D_resetClip(); // L: 4321 + Rasterizer2D.Rasterizer2D_fillRectangle(var0, var1, var2, var9, -16777216); // L: 4322 + Rasterizer2D.Rasterizer2D_fillRectangle(var0, var3 + var1 - var9, var2, var9, -16777216); // L: 4323 + } + + var1 += var9; // L: 4325 + var3 -= var9 * 2; // L: 4326 + } + } + + Client.viewportZoom = var3 * var6 / 334; // L: 4329 + if (var2 != Client.viewportWidth || var3 != Client.viewportHeight) { // L: 4330 + class17.method209(var2, var3); // L: 4331 + } + + Client.viewportOffsetX = var0; // L: 4333 + Client.viewportOffsetY = var1; // L: 4334 + Client.viewportWidth = var2; // L: 4335 + Client.viewportHeight = var3; // L: 4336 + } // L: 4337 } diff --git a/runescape-client/src/main/java/User.java b/runescape-client/src/main/java/User.java index 7bbeb42cc7..f9ba970b48 100644 --- a/runescape-client/src/main/java/User.java +++ b/runescape-client/src/main/java/User.java @@ -1,28 +1,20 @@ -import java.io.File; -import java.io.RandomAccessFile; import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("lm") +@ObfuscatedName("lx") @Implements("User") public class User implements Comparable { - @ObfuscatedName("bg") + @ObfuscatedName("f") @ObfuscatedSignature( - descriptor = "Lof;" - ) - @Export("worldSelectRightSprite") - static IndexedSprite worldSelectRightSprite; - @ObfuscatedName("o") - @ObfuscatedSignature( - descriptor = "Lla;" + descriptor = "Lly;" ) @Export("username") Username username; - @ObfuscatedName("g") + @ObfuscatedName("y") @ObfuscatedSignature( - descriptor = "Lla;" + descriptor = "Lly;" ) @Export("previousUsername") Username previousUsername; @@ -30,50 +22,50 @@ public class User implements Comparable { User() { } // L: 7 - @ObfuscatedName("c") + @ObfuscatedName("n") @ObfuscatedSignature( - descriptor = "(Llm;B)I", - garbageValue = "88" + descriptor = "(Llx;I)I", + garbageValue = "539732409" ) @Export("compareTo_user") public int compareTo_user(User var1) { return this.username.compareToTyped(var1.username); // L: 30 } - @ObfuscatedName("s") + @ObfuscatedName("ag") @ObfuscatedSignature( - descriptor = "(I)Lla;", - garbageValue = "2109048413" + descriptor = "(I)Lly;", + garbageValue = "1600385893" ) @Export("getUsername") public Username getUsername() { return this.username; // L: 10 } - @ObfuscatedName("y") + @ObfuscatedName("ax") @ObfuscatedSignature( - descriptor = "(I)Ljava/lang/String;", - garbageValue = "-1818372907" + descriptor = "(B)Ljava/lang/String;", + garbageValue = "1" ) @Export("getName") public String getName() { return this.username == null ? "" : this.username.getName(); // L: 14 15 } - @ObfuscatedName("w") + @ObfuscatedName("as") @ObfuscatedSignature( descriptor = "(I)Ljava/lang/String;", - garbageValue = "1375714428" + garbageValue = "192558419" ) @Export("getPreviousName") public String getPreviousName() { return this.previousUsername == null ? "" : this.previousUsername.getName(); // L: 19 20 } - @ObfuscatedName("n") + @ObfuscatedName("aj") @ObfuscatedSignature( - descriptor = "(Lla;Lla;I)V", - garbageValue = "-2074973533" + descriptor = "(Lly;Lly;I)V", + garbageValue = "2108784704" ) @Export("set") void set(Username var1, Username var2) { @@ -88,28 +80,4 @@ public class User implements Comparable { public int compareTo(Object var1) { return this.compareTo_user((User)var1); // L: 34 } - - @ObfuscatedName("c") - @ObfuscatedSignature( - descriptor = "(Ljava/io/File;ZB)Z", - garbageValue = "-109" - ) - @Export("isWriteable") - static boolean isWriteable(File var0, boolean var1) { - try { - RandomAccessFile var2 = new RandomAccessFile(var0, "rw"); // L: 239 - int var3 = var2.read(); // L: 240 - var2.seek(0L); // L: 241 - var2.write(var3); // L: 242 - var2.seek(0L); // L: 243 - var2.close(); // L: 244 - if (var1) { // L: 245 - var0.delete(); - } - - return true; // L: 246 - } catch (Exception var4) { // L: 248 - return false; // L: 249 - } - } } diff --git a/runescape-client/src/main/java/UserComparator1.java b/runescape-client/src/main/java/UserComparator1.java index 1ad604d607..9d18e04dfd 100644 --- a/runescape-client/src/main/java/UserComparator1.java +++ b/runescape-client/src/main/java/UserComparator1.java @@ -7,7 +7,7 @@ import net.runelite.mapping.ObfuscatedSignature; @ObfuscatedName("ns") @Implements("UserComparator1") public class UserComparator1 implements Comparator { - @ObfuscatedName("h") + @ObfuscatedName("v") @Export("reversed") final boolean reversed; @@ -15,21 +15,21 @@ public class UserComparator1 implements Comparator { this.reversed = var1; // L: 10 } // L: 11 - @ObfuscatedName("h") + @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "(Llm;Llm;I)I", - garbageValue = "1514821605" + descriptor = "(Llx;Llx;I)I", + garbageValue = "-4111631" ) @Export("compare_bridged") int compare_bridged(User var1, User var2) { return this.reversed ? var1.compareTo_user(var2) : var2.compareTo_user(var1); // L: 14 } - public boolean equals(Object var1) { - return super.equals(var1); // L: 22 - } - public int compare(Object var1, Object var2) { return this.compare_bridged((User)var1, (User)var2); // L: 18 } + + public boolean equals(Object var1) { + return super.equals(var1); // L: 22 + } } diff --git a/runescape-client/src/main/java/UserComparator10.java b/runescape-client/src/main/java/UserComparator10.java index 3a85bac5a6..deeede3900 100644 --- a/runescape-client/src/main/java/UserComparator10.java +++ b/runescape-client/src/main/java/UserComparator10.java @@ -1,297 +1,78 @@ 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("di") +@ObfuscatedName("du") @Implements("UserComparator10") public class UserComparator10 extends AbstractUserComparator { - @ObfuscatedName("o") - @ObfuscatedSignature( - descriptor = "Ljp;" + @ObfuscatedName("p") + @ObfuscatedGetter( + intValue = -2005962759 ) - @Export("soundEffectsArchive") - static AbstractArchive soundEffectsArchive; - @ObfuscatedName("h") + static int field1457; + @ObfuscatedName("g") + @ObfuscatedGetter( + intValue = -1166420103 + ) + @Export("cacheGamebuild") + public static int cacheGamebuild; + @ObfuscatedName("v") @Export("reversed") final boolean reversed; public UserComparator10(boolean var1) { - this.reversed = var1; - } + this.reversed = var1; // L: 11 + } // L: 12 - @ObfuscatedName("h") + @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "(Llq;Llq;I)I", - garbageValue = "-1855689253" + descriptor = "(Llv;Llv;I)I", + garbageValue = "254646745" ) @Export("compareBuddy") int compareBuddy(Buddy var1, Buddy var2) { - if (Client.worldId == var1.world && var2.world == Client.worldId) { - return this.reversed ? var1.int2 - var2.int2 : var2.int2 - var1.int2; + if (Client.worldId == var1.world && var2.world == Client.worldId) { // L: 15 + return this.reversed ? var1.int2 - var2.int2 : var2.int2 - var1.int2; // L: 16 } else { - return this.compareUser(var1, var2); + return this.compareUser(var1, var2); // L: 18 } } public int compare(Object var1, Object var2) { - return this.compareBuddy((Buddy)var1, (Buddy)var2); + return this.compareBuddy((Buddy)var1, (Buddy)var2); // L: 22 } - @ObfuscatedName("h") + @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "(ILjava/lang/String;Lkr;IB)Lhm;", - garbageValue = "16" + descriptor = "(Ljv;I)V", + garbageValue = "2118947714" ) - public static PacketBufferNode method2486(int var0, String var1, Language var2, int var3) { - PacketBufferNode var4 = HealthBarDefinition.getPacketBufferNode(ClientPacket.field2653, Client.packetWriter.isaacCipher); // L: 17 - var4.packetBuffer.writeByte(0); - int var5 = var4.packetBuffer.offset; - var4.packetBuffer.writeByte(var0); - String var6 = var1.toLowerCase(); // L: 21 - byte var7 = 0; // L: 22 - if (var6.startsWith("yellow:")) { - var7 = 0; - var1 = var1.substring("yellow:".length()); - } else if (var6.startsWith("red:")) { - var7 = 1; - var1 = var1.substring("red:".length()); - } else if (var6.startsWith("green:")) { // L: 31 - var7 = 2; - var1 = var1.substring("green:".length()); // L: 33 - } else if (var6.startsWith("cyan:")) { - var7 = 3; - var1 = var1.substring("cyan:".length()); // L: 37 - } else if (var6.startsWith("purple:")) { - var7 = 4; - var1 = var1.substring("purple:".length()); // L: 41 - } else if (var6.startsWith("white:")) { - var7 = 5; - var1 = var1.substring("white:".length()); // L: 45 - } else if (var6.startsWith("flash1:")) { - var7 = 6; - var1 = var1.substring("flash1:".length()); // L: 49 - } else if (var6.startsWith("flash2:")) { - var7 = 7; - var1 = var1.substring("flash2:".length()); // L: 53 - } else if (var6.startsWith("flash3:")) { - var7 = 8; // L: 56 - var1 = var1.substring("flash3:".length()); - } else if (var6.startsWith("glow1:")) { // L: 59 - var7 = 9; - var1 = var1.substring("glow1:".length()); - } else if (var6.startsWith("glow2:")) { // L: 63 - var7 = 10; - var1 = var1.substring("glow2:".length()); - } else if (var6.startsWith("glow3:")) { // L: 67 - var7 = 11; - var1 = var1.substring("glow3:".length()); - } else if (var2 != Language.Language_EN) { // L: 71 - if (var6.startsWith("yellow:")) { - var7 = 0; - var1 = var1.substring("yellow:".length()); // L: 74 - } else if (var6.startsWith("red:")) { - var7 = 1; - var1 = var1.substring("red:".length()); // L: 78 - } else if (var6.startsWith("green:")) { - var7 = 2; // L: 81 - var1 = var1.substring("green:".length()); - } else if (var6.startsWith("cyan:")) { - var7 = 3; - var1 = var1.substring("cyan:".length()); - } else if (var6.startsWith("purple:")) { - var7 = 4; // L: 89 - var1 = var1.substring("purple:".length()); // L: 90 - } else if (var6.startsWith("white:")) { - var7 = 5; - var1 = var1.substring("white:".length()); - } else if (var6.startsWith("flash1:")) { // L: 96 - var7 = 6; - var1 = var1.substring("flash1:".length()); - } else if (var6.startsWith("flash2:")) { - var7 = 7; - var1 = var1.substring("flash2:".length()); - } else if (var6.startsWith("flash3:")) { // L: 104 - var7 = 8; // L: 105 - var1 = var1.substring("flash3:".length()); - } else if (var6.startsWith("glow1:")) { - var7 = 9; - var1 = var1.substring("glow1:".length()); - } else if (var6.startsWith("glow2:")) { // L: 112 - var7 = 10; - var1 = var1.substring("glow2:".length()); // L: 114 - } else if (var6.startsWith("glow3:")) { // L: 116 - var7 = 11; // L: 117 - var1 = var1.substring("glow3:".length()); // L: 118 - } - } + public static void method2471(AbstractArchive var0) { + VarbitComposition.VarbitDefinition_archive = var0; // L: 26 + } // L: 27 - var6 = var1.toLowerCase(); // L: 121 - byte var8 = 0; // L: 122 - if (var6.startsWith("wave:")) { // L: 123 - var8 = 1; // L: 124 - var1 = var1.substring("wave:".length()); // L: 125 - } else if (var6.startsWith("wave2:")) { // L: 127 - var8 = 2; // L: 128 - var1 = var1.substring("wave2:".length()); // L: 129 - } else if (var6.startsWith("shake:")) { // L: 131 - var8 = 3; // L: 132 - var1 = var1.substring("shake:".length()); // L: 133 - } else if (var6.startsWith("scroll:")) { // L: 135 - var8 = 4; // L: 136 - var1 = var1.substring("scroll:".length()); // L: 137 - } else if (var6.startsWith("slide:")) { // L: 139 - var8 = 5; // L: 140 - var1 = var1.substring("slide:".length()); // L: 141 - } else if (var2 != Language.Language_EN) { // L: 143 - if (var6.startsWith("wave:")) { // L: 144 - var8 = 1; // L: 145 - var1 = var1.substring("wave:".length()); // L: 146 - } else if (var6.startsWith("wave2:")) { // L: 148 - var8 = 2; // L: 149 - var1 = var1.substring("wave2:".length()); // L: 150 - } else if (var6.startsWith("shake:")) { // L: 152 - var8 = 3; // L: 153 - var1 = var1.substring("shake:".length()); // L: 154 - } else if (var6.startsWith("scroll:")) { // L: 156 - var8 = 4; // L: 157 - var1 = var1.substring("scroll:".length()); // L: 158 - } else if (var6.startsWith("slide:")) { // L: 160 - var8 = 5; // L: 161 - var1 = var1.substring("slide:".length()); // L: 162 - } - } - - var4.packetBuffer.writeByte(var7); // L: 165 - var4.packetBuffer.writeByte(var8); // L: 166 - Occluder.method4089(var4.packetBuffer, var1); // L: 167 - if (var0 == class254.field3144.rsOrdinal()) { // L: 168 - var4.packetBuffer.writeByte(var3); // L: 169 - } - - var4.packetBuffer.writeLengthByte(var4.packetBuffer.offset - var5); // L: 171 - return var4; // L: 172 + @ObfuscatedName("s") + @ObfuscatedSignature( + descriptor = "(CB)Z", + garbageValue = "-13" + ) + @Export("isDigit") + public static boolean isDigit(char var0) { + return var0 >= '0' && var0 <= '9'; // L: 138 } - @ObfuscatedName("h") + @ObfuscatedName("e") @ObfuscatedSignature( - descriptor = "(Ljava/lang/CharSequence;Ljava/lang/CharSequence;Lkr;I)I", - garbageValue = "-1915703478" + descriptor = "(II)I", + garbageValue = "-1839553264" ) - @Export("compareStrings") - public static int compareStrings(CharSequence var0, CharSequence var1, Language var2) { - int var3 = var0.length(); // L: 11 - int var4 = var1.length(); // L: 12 - int var5 = 0; // L: 13 - int var6 = 0; // L: 14 - byte var7 = 0; // L: 15 - byte var8 = 0; // L: 16 - - while (var5 - var7 < var3 || var6 - var8 < var4) { // L: 18 - if (var5 - var7 >= var3) { // L: 19 - return -1; - } - - if (var6 - var8 >= var4) { // L: 20 - return 1; - } - - char var9; - if (var7 != 0) { // L: 23 - var9 = (char)var7; // L: 24 - boolean var14 = false; // L: 25 - } else { - var9 = var0.charAt(var5++); // L: 27 - } - - char var10; - if (var8 != 0) { // L: 28 - var10 = (char)var8; // L: 29 - boolean var15 = false; // L: 30 - } else { - var10 = var1.charAt(var6++); // L: 32 - } - - byte var11; - if (var9 == 198) { // L: 35 - var11 = 69; // L: 36 - } else if (var9 == 230) { // L: 39 - var11 = 101; // L: 40 - } else if (var9 == 223) { // L: 43 - var11 = 115; // L: 44 - } else if (var9 == 338) { // L: 47 - var11 = 69; // L: 48 - } else if (var9 == 339) { // L: 51 - var11 = 101; // L: 52 - } else { - var11 = 0; // L: 55 - } - - var7 = var11; // L: 57 - byte var12; - if (var10 == 198) { // L: 60 - var12 = 69; // L: 61 - } else if (var10 == 230) { // L: 64 - var12 = 101; // L: 65 - } else if (var10 == 223) { // L: 68 - var12 = 115; // L: 69 - } else if (var10 == 338) { // L: 72 - var12 = 69; // L: 73 - } else if (var10 == 339) { // L: 76 - var12 = 101; // L: 77 - } else { - var12 = 0; // L: 80 - } - - var8 = var12; // L: 82 - var9 = ParamComposition.standardizeChar(var9, var2); // L: 83 - var10 = ParamComposition.standardizeChar(var10, var2); // L: 84 - if (var10 != var9 && Character.toUpperCase(var9) != Character.toUpperCase(var10)) { // L: 85 - var9 = Character.toLowerCase(var9); // L: 86 - var10 = Character.toLowerCase(var10); // L: 87 - if (var9 != var10) { // L: 88 - return class26.lowercaseChar(var9, var2) - class26.lowercaseChar(var10, var2); - } - } - } - - int var16 = Math.min(var3, var4); // L: 91 - - int var17; - char var20; - for (var17 = 0; var17 < var16; ++var17) { // L: 92 - if (var2 == Language.Language_FR) { // L: 93 - var5 = var3 - 1 - var17; // L: 94 - var6 = var4 - 1 - var17; // L: 95 - } else { - var6 = var17; // L: 97 - var5 = var17; - } - - char var18 = var0.charAt(var5); // L: 98 - var20 = var1.charAt(var6); // L: 99 - if (var20 != var18 && Character.toUpperCase(var18) != Character.toUpperCase(var20)) { // L: 100 - var18 = Character.toLowerCase(var18); // L: 101 - var20 = Character.toLowerCase(var20); // L: 102 - if (var20 != var18) { - return class26.lowercaseChar(var18, var2) - class26.lowercaseChar(var20, var2); // L: 103 - } - } - } - - var17 = var3 - var4; // L: 106 - if (var17 != 0) { // L: 107 - return var17; + public static int method2474(int var0) { + if (var0 > 0) { // L: 183 + return 1; } else { - for (int var19 = 0; var19 < var16; ++var19) { // L: 108 - var20 = var0.charAt(var19); // L: 109 - char var13 = var1.charAt(var19); // L: 110 - if (var13 != var20) { // L: 111 - return class26.lowercaseChar(var20, var2) - class26.lowercaseChar(var13, var2); - } - } - - return 0; // L: 113 + return var0 < 0 ? -1 : 0; // L: 184 185 } } } diff --git a/runescape-client/src/main/java/UserComparator2.java b/runescape-client/src/main/java/UserComparator2.java index 5871ee49be..cd7bb11f4e 100644 --- a/runescape-client/src/main/java/UserComparator2.java +++ b/runescape-client/src/main/java/UserComparator2.java @@ -1,13 +1,20 @@ 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; -@ObfuscatedName("nl") +@ObfuscatedName("nj") @Implements("UserComparator2") public class UserComparator2 implements Comparator { - @ObfuscatedName("h") + @ObfuscatedName("f") + @ObfuscatedGetter( + intValue = -821679425 + ) + @Export("SpriteBuffer_spriteHeight") + static int SpriteBuffer_spriteHeight; + @ObfuscatedName("v") @Export("reversed") final boolean reversed; @@ -15,21 +22,21 @@ public class UserComparator2 implements Comparator { this.reversed = var1; // L: 10 } // L: 11 - @ObfuscatedName("h") + @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "(Llm;Llm;B)I", - garbageValue = "-94" + descriptor = "(Llx;Llx;B)I", + garbageValue = "-9" ) @Export("compare_bridged") int compare_bridged(User var1, User var2) { return this.reversed ? var1.getUsername().compareToTyped(var2.getUsername()) : var2.getUsername().compareToTyped(var1.getUsername()); // L: 14 } - public boolean equals(Object var1) { - return super.equals(var1); // L: 22 - } - public int compare(Object var1, Object var2) { return this.compare_bridged((User)var1, (User)var2); // L: 18 } + + public boolean equals(Object var1) { + return super.equals(var1); // L: 22 + } } diff --git a/runescape-client/src/main/java/UserComparator3.java b/runescape-client/src/main/java/UserComparator3.java index ab4c90a00e..42e7f28059 100644 --- a/runescape-client/src/main/java/UserComparator3.java +++ b/runescape-client/src/main/java/UserComparator3.java @@ -1,12 +1,33 @@ +import java.io.ByteArrayInputStream; +import java.io.IOException; +import java.io.InvalidClassException; +import java.io.ObjectInputStream; +import java.io.OptionalDataException; +import java.io.StreamCorruptedException; +import java.lang.reflect.Field; +import java.lang.reflect.InvocationTargetException; +import java.lang.reflect.Method; import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; +import net.runelite.rs.Reflection; -@ObfuscatedName("de") +@ObfuscatedName("dx") @Implements("UserComparator3") public class UserComparator3 extends AbstractUserComparator { - @ObfuscatedName("h") + @ObfuscatedName("tb") + @ObfuscatedSignature( + descriptor = "Lje;" + ) + public static class285 field1444; + @ObfuscatedName("fd") + @ObfuscatedSignature( + descriptor = "Lkt;" + ) + @Export("fontPlain12") + static Font fontPlain12; + @ObfuscatedName("v") @Export("reversed") final boolean reversed; @@ -14,10 +35,10 @@ public class UserComparator3 extends AbstractUserComparator { this.reversed = var1; // L: 10 } // L: 11 - @ObfuscatedName("h") + @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "(Llq;Llq;I)I", - garbageValue = "-1086029817" + descriptor = "(Llv;Llv;I)I", + garbageValue = "2053904932" ) @Export("compareBuddy") int compareBuddy(Buddy var1, Buddy var2) { @@ -32,40 +53,123 @@ public class UserComparator3 extends AbstractUserComparator { return this.compareBuddy((Buddy)var1, (Buddy)var2); // L: 21 } - @ObfuscatedName("jx") + @ObfuscatedName("f") @ObfuscatedSignature( - descriptor = "(Liv;III)V", - garbageValue = "1334244983" + descriptor = "(Lnb;I)V", + garbageValue = "1636861714" ) - @Export("alignWidgetPosition") - static void alignWidgetPosition(Widget var0, int var1, int var2) { - if (var0.xAlignment == 0) { // L: 10091 - var0.x = var0.rawX; - } else if (var0.xAlignment == 1) { // L: 10092 - var0.x = var0.rawX + (var1 - var0.width) / 2; - } else if (var0.xAlignment == 2) { // L: 10093 - var0.x = var1 - var0.width - var0.rawX; - } else if (var0.xAlignment == 3) { // L: 10094 - var0.x = var0.rawX * var1 >> 14; - } else if (var0.xAlignment == 4) { // L: 10095 - var0.x = (var0.rawX * var1 >> 14) + (var1 - var0.width) / 2; - } else { - var0.x = var1 - var0.width - (var0.rawX * var1 >> 14); // L: 10096 + @Export("performReflectionCheck") + public static void performReflectionCheck(PacketBuffer var0) { + ReflectionCheck var1 = (ReflectionCheck)class69.reflectionChecks.last(); // L: 35 + if (var1 != null) { // L: 36 + int var2 = var0.offset; // L: 37 + var0.writeInt(var1.id); // L: 38 + + for (int var3 = 0; var3 < var1.size; ++var3) { // L: 39 + if (var1.creationErrors[var3] != 0) { // L: 40 + var0.writeByte(var1.creationErrors[var3]); // L: 41 + } else { + try { + int var4 = var1.operations[var3]; // L: 45 + Field var5; + int var6; + if (var4 == 0) { // L: 46 + var5 = var1.fields[var3]; // L: 47 + var6 = Reflection.getInt(var5, (Object)null); // L: 48 + var0.writeByte(0); // L: 49 + var0.writeInt(var6); // L: 50 + } else if (var4 == 1) { // L: 52 + var5 = var1.fields[var3]; // L: 53 + Reflection.setInt(var5, (Object)null, var1.intReplaceValues[var3]); // L: 54 + var0.writeByte(0); // L: 55 + } else if (var4 == 2) { // L: 57 + var5 = var1.fields[var3]; // L: 58 + var6 = var5.getModifiers(); // L: 59 + var0.writeByte(0); // L: 60 + var0.writeInt(var6); // L: 61 + } + + Method var25; + if (var4 != 3) { // L: 63 + if (var4 == 4) { // L: 83 + var25 = var1.methods[var3]; // L: 84 + var6 = var25.getModifiers(); // L: 85 + var0.writeByte(0); // L: 86 + var0.writeInt(var6); // L: 87 + } + } else { + var25 = var1.methods[var3]; // L: 64 + byte[][] var10 = var1.arguments[var3]; // L: 65 + Object[] var7 = new Object[var10.length]; // L: 66 + + for (int var8 = 0; var8 < var10.length; ++var8) { // L: 67 + ObjectInputStream var9 = new ObjectInputStream(new ByteArrayInputStream(var10[var8])); // L: 68 + var7[var8] = var9.readObject(); // L: 69 + } + + Object var11 = Reflection.invoke(var25, (Object)null, var7); // L: 71 + if (var11 == null) { // L: 72 + var0.writeByte(0); + } else if (var11 instanceof Number) { // L: 73 + var0.writeByte(1); // L: 74 + var0.writeLong(((Number)var11).longValue()); // L: 75 + } else if (var11 instanceof String) { // L: 77 + var0.writeByte(2); // L: 78 + var0.writeStringCp1252NullTerminated((String)var11); // L: 79 + } else { + var0.writeByte(4); // L: 81 + } + } + } catch (ClassNotFoundException var13) { // L: 90 + var0.writeByte(-10); // L: 91 + } catch (InvalidClassException var14) { // L: 93 + var0.writeByte(-11); // L: 94 + } catch (StreamCorruptedException var15) { // L: 96 + var0.writeByte(-12); // L: 97 + } catch (OptionalDataException var16) { // L: 99 + var0.writeByte(-13); // L: 100 + } catch (IllegalAccessException var17) { // L: 102 + var0.writeByte(-14); // L: 103 + } catch (IllegalArgumentException var18) { // L: 105 + var0.writeByte(-15); // L: 106 + } catch (InvocationTargetException var19) { // L: 108 + var0.writeByte(-16); // L: 109 + } catch (SecurityException var20) { // L: 111 + var0.writeByte(-17); // L: 112 + } catch (IOException var21) { // L: 114 + var0.writeByte(-18); // L: 115 + } catch (NullPointerException var22) { // L: 117 + var0.writeByte(-19); // L: 118 + } catch (Exception var23) { // L: 120 + var0.writeByte(-20); // L: 121 + } catch (Throwable var24) { // L: 123 + var0.writeByte(-21); // L: 124 + } + } + } + + var0.writeCrc(var2); // L: 127 + var1.remove(); // L: 128 + } + } // L: 129 + + @ObfuscatedName("iv") + @ObfuscatedSignature( + descriptor = "(II)Ljava/lang/String;", + garbageValue = "-1768191443" + ) + @Export("formatItemStacks") + static final String formatItemStacks(int var0) { + String var1 = Integer.toString(var0); // L: 9726 + + for (int var2 = var1.length() - 3; var2 > 0; var2 -= 3) { // L: 9727 + var1 = var1.substring(0, var2) + "," + var1.substring(var2); // L: 9728 } - if (var0.yAlignment == 0) { // L: 10097 - var0.y = var0.rawY; - } else if (var0.yAlignment == 1) { // L: 10098 - var0.y = (var2 - var0.height) / 2 + var0.rawY; - } else if (var0.yAlignment == 2) { // L: 10099 - var0.y = var2 - var0.height - var0.rawY; - } else if (var0.yAlignment == 3) { - var0.y = var2 * var0.rawY >> 14; // L: 10100 - } else if (var0.yAlignment == 4) { // L: 10101 - var0.y = (var2 - var0.height) / 2 + (var2 * var0.rawY >> 14); + if (var1.length() > 9) { // L: 9730 + return " " + class44.colorStartTag(65408) + var1.substring(0, var1.length() - 8) + "M" + " " + " (" + var1 + ")" + ""; } else { - var0.y = var2 - var0.height - (var2 * var0.rawY >> 14); // L: 10102 + return var1.length() > 6 ? " " + class44.colorStartTag(16777215) + var1.substring(0, var1.length() - 4) + "K" + " " + " (" + var1 + ")" + "" : " " + class44.colorStartTag(16776960) + var1 + ""; // L: 9731 9732 } - - } // L: 10103 + } } diff --git a/runescape-client/src/main/java/UserComparator4.java b/runescape-client/src/main/java/UserComparator4.java index ce0b715225..7d689cd7b9 100644 --- a/runescape-client/src/main/java/UserComparator4.java +++ b/runescape-client/src/main/java/UserComparator4.java @@ -5,15 +5,21 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("dn") +@ObfuscatedName("dv") @Implements("UserComparator4") public class UserComparator4 implements Comparator { - @ObfuscatedName("rr") + @ObfuscatedName("z") @ObfuscatedGetter( - intValue = 650908415 + intValue = 2097206533 ) - static int field1403; - @ObfuscatedName("h") + @Export("loginBoxCenter") + static int loginBoxCenter; + @ObfuscatedName("gi") + @ObfuscatedGetter( + intValue = -845013717 + ) + static int field1427; + @ObfuscatedName("v") @Export("reversed") final boolean reversed; @@ -21,10 +27,10 @@ public class UserComparator4 implements Comparator { this.reversed = var1; // L: 10 } // L: 11 - @ObfuscatedName("h") + @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "(Llq;Llq;I)I", - garbageValue = "-1160366364" + descriptor = "(Llv;Llv;I)I", + garbageValue = "-903246659" ) @Export("compare_bridged") int compare_bridged(Buddy var1, Buddy var2) { @@ -32,29 +38,20 @@ public class UserComparator4 implements Comparator { } public int compare(Object var1, Object var2) { - return this.compare_bridged((Buddy)var1, (Buddy)var2); + return this.compare_bridged((Buddy)var1, (Buddy)var2); // L: 18 } public boolean equals(Object var1) { return super.equals(var1); // L: 22 } - @ObfuscatedName("h") + @ObfuscatedName("jg") @ObfuscatedSignature( - descriptor = "([Lke;II)Lke;", - garbageValue = "-1507017848" + descriptor = "(ZB)V", + garbageValue = "0" ) - @Export("findEnumerated") - public static Enumerated findEnumerated(Enumerated[] var0, int var1) { - Enumerated[] var2 = var0; // L: 17 - - for (int var3 = 0; var3 < var2.length; ++var3) { // L: 18 - Enumerated var4 = var2[var3]; // L: 19 - if (var1 == var4.rsOrdinal()) { - return var4; // L: 21 - } - } - - return null; // L: 25 - } + @Export("setTapToDrop") + static void setTapToDrop(boolean var0) { + Client.tapToDrop = var0; // L: 10172 + } // L: 10173 } diff --git a/runescape-client/src/main/java/UserComparator5.java b/runescape-client/src/main/java/UserComparator5.java index dda70a9ed1..5df27a7a19 100644 --- a/runescape-client/src/main/java/UserComparator5.java +++ b/runescape-client/src/main/java/UserComparator5.java @@ -1,21 +1,30 @@ -import java.io.File; -import java.io.IOException; -import java.io.RandomAccessFile; 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("da") @Implements("UserComparator5") public class UserComparator5 extends AbstractUserComparator { - @ObfuscatedName("bz") + @ObfuscatedName("u") + public static short[] field1442; + @ObfuscatedName("z") + @Export("formattedOperatingSystemName") + public static String formattedOperatingSystemName; + @ObfuscatedName("dm") @ObfuscatedSignature( - descriptor = "[Lof;" + descriptor = "Ljp;" ) - @Export("worldSelectFlagSprites") - static IndexedSprite[] worldSelectFlagSprites; - @ObfuscatedName("h") + @Export("archive12") + static Archive archive12; + @ObfuscatedName("iz") + @ObfuscatedGetter( + intValue = 1854633345 + ) + @Export("selectedItemId") + static int selectedItemId; + @ObfuscatedName("v") @Export("reversed") final boolean reversed; @@ -23,10 +32,10 @@ public class UserComparator5 extends AbstractUserComparator { this.reversed = var1; // L: 10 } // L: 11 - @ObfuscatedName("h") + @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "(Llq;Llq;I)I", - garbageValue = "2087209771" + descriptor = "(Llv;Llv;I)I", + garbageValue = "1211998991" ) @Export("compareBuddy") int compareBuddy(Buddy var1, Buddy var2) { @@ -45,330 +54,67 @@ public class UserComparator5 extends AbstractUserComparator { return this.compareBuddy((Buddy)var1, (Buddy)var2); // L: 24 } - @ObfuscatedName("h") + @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "(Lnj;B)I", - garbageValue = "67" + descriptor = "(Ljv;Ljv;I)Z", + garbageValue = "-1243272557" ) - public static final int method2463(LoginType var0) { - if (var0 == null) { // L: 16 - return 12; // L: 17 + public static boolean method2449(AbstractArchive var0, AbstractArchive var1) { + WorldMapElement.WorldMapElement_archive = var1; // L: 44 + if (!var0.isFullyLoaded()) { // L: 45 + return false; // L: 46 } else { - switch(var0.field4097) { // L: 19 - case 4: - return 20; // L: 23 - default: - return 12; // L: 21 + class311.WorldMapElement_count = var0.getGroupFileCount(35); // L: 48 + WorldMapElement.WorldMapElement_cached = new WorldMapElement[class311.WorldMapElement_count]; // L: 49 + + for (int var2 = 0; var2 < class311.WorldMapElement_count; ++var2) { // L: 50 + byte[] var3 = var0.takeFile(35, var2); // L: 51 + WorldMapElement.WorldMapElement_cached[var2] = new WorldMapElement(var2); // L: 52 + if (var3 != null) { // L: 53 + WorldMapElement.WorldMapElement_cached[var2].decode(new Buffer(var3)); // L: 54 + WorldMapElement.WorldMapElement_cached[var2].method2634(); // L: 55 + } } + + return true; // L: 58 } } - @ObfuscatedName("h") + @ObfuscatedName("hz") @ObfuscatedSignature( - descriptor = "(Ljava/lang/String;Ljava/lang/String;III)V", - garbageValue = "-2108211230" + descriptor = "(Lch;I)V", + garbageValue = "14093457" ) - @Export("findAndLoadCache") - public static void findAndLoadCache(String var0, String var1, int var2, int var3) throws IOException { - class124.idxCount = var3; // L: 40 - class310.cacheGamebuild = var2; // L: 41 - - try { - class35.operatingSystemName = System.getProperty("os.name"); // L: 43 - } catch (Exception var31) { // L: 45 - class35.operatingSystemName = "Unknown"; // L: 46 + static final void method2448(PendingSpawn var0) { + long var1 = 0L; // L: 7227 + int var3 = -1; // L: 7228 + int var4 = 0; // L: 7229 + int var5 = 0; // L: 7230 + if (var0.type == 0) { // L: 7231 + var1 = AbstractSocket.scene.getBoundaryObjectTag(var0.plane, var0.x, var0.y); } - EnumComposition.formattedOperatingSystemName = class35.operatingSystemName.toLowerCase(); // L: 48 - - try { - AccessFile.userHomeDirectory = System.getProperty("user.home"); // L: 50 - if (AccessFile.userHomeDirectory != null) { // L: 51 - AccessFile.userHomeDirectory = AccessFile.userHomeDirectory + "/"; - } - } catch (Exception var30) { // L: 53 + if (var0.type == 1) { // L: 7232 + var1 = AbstractSocket.scene.getWallDecorationTag(var0.plane, var0.x, var0.y); } - try { - if (EnumComposition.formattedOperatingSystemName.startsWith("win")) { // L: 55 - if (AccessFile.userHomeDirectory == null) { // L: 56 - AccessFile.userHomeDirectory = System.getenv("USERPROFILE"); - } - } else if (AccessFile.userHomeDirectory == null) { // L: 59 - AccessFile.userHomeDirectory = System.getenv("HOME"); - } - - if (AccessFile.userHomeDirectory != null) { // L: 61 - AccessFile.userHomeDirectory = AccessFile.userHomeDirectory + "/"; - } - } catch (Exception var29) { // L: 63 + if (var0.type == 2) { // L: 7233 + var1 = AbstractSocket.scene.getGameObjectTag(var0.plane, var0.x, var0.y); } - if (AccessFile.userHomeDirectory == null) { // L: 64 - AccessFile.userHomeDirectory = "~/"; + if (var0.type == 3) { + var1 = AbstractSocket.scene.getFloorDecorationTag(var0.plane, var0.x, var0.y); // L: 7234 } - class243.cacheParentPaths = new String[]{"c:/rscache/", "/rscache/", "c:/windows/", "c:/winnt/", "c:/", AccessFile.userHomeDirectory, "/tmp/", ""}; // L: 65 - Script.cacheSubPaths = new String[]{".jagex_cache_" + class310.cacheGamebuild, ".file_store_" + class310.cacheGamebuild}; // L: 66 - int var18 = 0; - - File var5; - label298: - while (var18 < 4) { - String var6 = var18 == 0 ? "" : "" + var18; // L: 70 - JagexCache.JagexCache_locationFile = new File(AccessFile.userHomeDirectory, "jagex_cl_" + var0 + "_" + var1 + var6 + ".dat"); // L: 71 - String var7 = null; // L: 72 - String var8 = null; // L: 73 - boolean var9 = false; // L: 74 - Buffer var11; - File var39; - if (JagexCache.JagexCache_locationFile.exists()) { // L: 75 - try { - AccessFile var10 = new AccessFile(JagexCache.JagexCache_locationFile, "rw", 10000L); // L: 78 - - int var12; - for (var11 = new Buffer((int)var10.length()); var11.offset < var11.array.length; var11.offset += var12) { // L: 79 80 83 - var12 = var10.read(var11.array, var11.offset, var11.array.length - var11.offset); // L: 81 - if (var12 == -1) { // L: 82 - throw new IOException(); - } - } - - var11.offset = 0; // L: 85 - var12 = var11.readUnsignedByte(); // L: 86 - if (var12 < 1 || var12 > 3) { // L: 87 - throw new IOException("" + var12); - } - - int var13 = 0; // L: 88 - if (var12 > 1) { // L: 89 - var13 = var11.readUnsignedByte(); - } - - if (var12 <= 2) { // L: 90 - var7 = var11.readStringCp1252NullCircumfixed(); // L: 91 - if (var13 == 1) { // L: 92 - var8 = var11.readStringCp1252NullCircumfixed(); - } - } else { - var7 = var11.readCESU8(); // L: 95 - if (var13 == 1) { // L: 96 - var8 = var11.readCESU8(); - } - } - - var10.close(); // L: 98 - } catch (IOException var34) { // L: 100 - var34.printStackTrace(); // L: 101 - } - - if (var7 != null) { // L: 103 - var39 = new File(var7); // L: 104 - if (!var39.exists()) { // L: 105 - var7 = null; // L: 106 - } - } - - if (var7 != null) { // L: 109 - var39 = new File(var7, "test.dat"); // L: 110 - if (!User.isWriteable(var39, true)) { // L: 111 - var7 = null; // L: 112 - } - } - } - - if (var7 == null && var18 == 0) { // L: 116 - label273: - for (int var19 = 0; var19 < Script.cacheSubPaths.length; ++var19) { // L: 117 - for (int var20 = 0; var20 < class243.cacheParentPaths.length; ++var20) { // L: 118 - File var21 = new File(class243.cacheParentPaths[var20] + Script.cacheSubPaths[var19] + File.separatorChar + var0 + File.separatorChar); // L: 119 - if (var21.exists() && User.isWriteable(new File(var21, "test.dat"), true)) { // L: 120 121 - var7 = var21.toString(); // L: 122 - var9 = true; // L: 123 - break label273; // L: 124 - } - } - } - } - - if (var7 == null) { // L: 130 - var7 = AccessFile.userHomeDirectory + File.separatorChar + "jagexcache" + var6 + File.separatorChar + var0 + File.separatorChar + var1 + File.separatorChar; // L: 131 - var9 = true; // L: 132 - } - - File var38; - if (var8 != null) { // L: 134 - var38 = new File(var8); // L: 135 - var39 = new File(var7); // L: 136 - - try { - File[] var41 = var38.listFiles(); // L: 138 - File[] var22 = var41; // L: 140 - - for (int var14 = 0; var14 < var22.length; ++var14) { // L: 141 - File var15 = var22[var14]; // L: 142 - File var16 = new File(var39, var15.getName()); // L: 144 - boolean var17 = var15.renameTo(var16); // L: 145 - if (!var17) { // L: 146 - throw new IOException(); - } - } - } catch (Exception var33) { // L: 151 - var33.printStackTrace(); // L: 152 - } - - var9 = true; // L: 154 - } - - if (var9) { // L: 156 - var38 = new File(var7); // L: 157 - var11 = null; // L: 158 - - try { - AccessFile var42 = new AccessFile(JagexCache.JagexCache_locationFile, "rw", 10000L); // L: 162 - Buffer var43 = new Buffer(500); // L: 163 - var43.writeByte(3); // L: 164 - var43.writeByte(var11 != null ? 1 : 0); // L: 165 - var43.writeCESU8(var38.getPath()); // L: 166 - if (var11 != null) { // L: 167 - var43.writeCESU8(""); - } - - var42.write(var43.array, 0, var43.offset); // L: 168 - var42.close(); // L: 169 - } catch (IOException var28) { // L: 171 - var28.printStackTrace(); // L: 172 - } - } - - var5 = new File(var7); // L: 176 - JagexCache.cacheDir = var5; // L: 178 - if (!JagexCache.cacheDir.exists()) { // L: 179 - JagexCache.cacheDir.mkdirs(); - } - - File[] var35 = JagexCache.cacheDir.listFiles(); // L: 180 - if (var35 != null) { // L: 181 - File[] var40 = var35; // L: 183 - - for (int var23 = 0; var23 < var40.length; ++var23) { // L: 184 - File var24 = var40[var23]; // L: 185 - if (!User.isWriteable(var24, false)) { // L: 187 - ++var18; // L: 67 - continue label298; - } - } - } - break; + if (0L != var1) { // L: 7235 + int var6 = AbstractSocket.scene.getObjectFlags(var0.plane, var0.x, var0.y, var1); // L: 7236 + var3 = class93.Entity_unpackID(var1); // L: 7237 + var4 = var6 & 31; // L: 7238 + var5 = var6 >> 6 & 3; // L: 7239 } - File var4 = JagexCache.cacheDir; - FileSystem.FileSystem_cacheDir = var4; - if (!FileSystem.FileSystem_cacheDir.exists()) { // L: 197 - throw new RuntimeException(""); - } else { - FileSystem.FileSystem_hasPermissions = true; // L: 198 - - try { - var5 = new File(AccessFile.userHomeDirectory, "random.dat"); // L: 202 - int var26; - if (var5.exists()) { // L: 203 - JagexCache.JagexCache_randomDat = new BufferedFile(new AccessFile(var5, "rw", 25L), 24, 0); // L: 204 - } else { - label224: - for (int var25 = 0; var25 < Script.cacheSubPaths.length; ++var25) { // L: 207 - for (var26 = 0; var26 < class243.cacheParentPaths.length; ++var26) { // L: 208 - File var37 = new File(class243.cacheParentPaths[var26] + Script.cacheSubPaths[var25] + File.separatorChar + "random.dat"); // L: 209 - if (var37.exists()) { // L: 210 - JagexCache.JagexCache_randomDat = new BufferedFile(new AccessFile(var37, "rw", 25L), 24, 0); // L: 211 - break label224; // L: 212 - } - } - } - } - - if (JagexCache.JagexCache_randomDat == null) { // L: 217 - RandomAccessFile var36 = new RandomAccessFile(var5, "rw"); // L: 218 - var26 = var36.read(); // L: 219 - var36.seek(0L); // L: 220 - var36.write(var26); // L: 221 - var36.seek(0L); // L: 222 - var36.close(); // L: 223 - JagexCache.JagexCache_randomDat = new BufferedFile(new AccessFile(var5, "rw", 25L), 24, 0); // L: 224 - } - } catch (IOException var32) { // L: 227 - } - - JagexCache.JagexCache_dat2File = new BufferedFile(new AccessFile(NPC.getFile("main_file_cache.dat2"), "rw", 1048576000L), 5200, 0); // L: 229 - JagexCache.JagexCache_idx255File = new BufferedFile(new AccessFile(NPC.getFile("main_file_cache.idx255"), "rw", 1048576L), 6000, 0); // L: 230 - class21.JagexCache_idxFiles = new BufferedFile[class124.idxCount]; // L: 231 - - for (int var27 = 0; var27 < class124.idxCount; ++var27) { // L: 232 - class21.JagexCache_idxFiles[var27] = new BufferedFile(new AccessFile(NPC.getFile("main_file_cache.idx" + var27), "rw", 1048576L), 6000, 0); // L: 233 - } - - } - } // L: 235 - - @ObfuscatedName("i") - @ObfuscatedSignature( - descriptor = "(Ljp;IB)Z", - garbageValue = "-11" - ) - static boolean method2465(AbstractArchive var0, int var1) { - byte[] var2 = var0.takeFileFlat(var1); // L: 193 - if (var2 == null) { // L: 194 - return false; - } else { - class303.SpriteBuffer_decode(var2); // L: 195 - return true; // L: 196 - } - } - - @ObfuscatedName("jy") - @ObfuscatedSignature( - descriptor = "([Liv;II)V", - garbageValue = "-1244597022" - ) - @Export("runComponentCloseListeners") - static final void runComponentCloseListeners(Widget[] var0, int var1) { - for (int var2 = 0; var2 < var0.length; ++var2) { // L: 10947 - Widget var3 = var0[var2]; // L: 10948 - if (var3 != null) { // L: 10949 - if (var3.type == 0) { // L: 10950 - if (var3.children != null) { // L: 10951 - runComponentCloseListeners(var3.children, var1); - } - - InterfaceParent var4 = (InterfaceParent)Client.interfaceParents.get((long)var3.id); // L: 10952 - if (var4 != null) { // L: 10953 - LoginType.runIntfCloseListeners(var4.group, var1); - } - } - - ScriptEvent var5; - if (var1 == 0 && var3.onDialogAbort != null) { // L: 10955 - var5 = new ScriptEvent(); // L: 10956 - var5.widget = var3; // L: 10957 - var5.args = var3.onDialogAbort; // L: 10958 - class259.runScriptEvent(var5); // L: 10959 - } - - if (var1 == 1 && var3.onSubChange != null) { // L: 10961 - if (var3.childIndex >= 0) { // L: 10962 - Widget var6 = DevicePcmPlayerProvider.getWidget(var3.id); // L: 10963 - if (var6 == null || var6.children == null || var3.childIndex >= var6.children.length || var3 != var6.children[var3.childIndex]) { // L: 10964 - continue; - } - } - - var5 = new ScriptEvent(); // L: 10968 - var5.widget = var3; // L: 10969 - var5.args = var3.onSubChange; // L: 10970 - class259.runScriptEvent(var5); // L: 10971 - } - } - } - - } // L: 10974 + var0.objectId = var3; // L: 7241 + var0.field1229 = var4; // L: 7242 + var0.field1225 = var5; // L: 7243 + } // L: 7244 } diff --git a/runescape-client/src/main/java/UserComparator6.java b/runescape-client/src/main/java/UserComparator6.java index 1a5a4b0775..725a5a2614 100644 --- a/runescape-client/src/main/java/UserComparator6.java +++ b/runescape-client/src/main/java/UserComparator6.java @@ -2,11 +2,12 @@ import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; +import net.runelite.rs.Reflection; -@ObfuscatedName("df") +@ObfuscatedName("dn") @Implements("UserComparator6") public class UserComparator6 extends AbstractUserComparator { - @ObfuscatedName("h") + @ObfuscatedName("v") @Export("reversed") final boolean reversed; @@ -14,10 +15,10 @@ public class UserComparator6 extends AbstractUserComparator { this.reversed = var1; // L: 10 } // L: 11 - @ObfuscatedName("h") + @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "(Llq;Llq;I)I", - garbageValue = "-1714327474" + descriptor = "(Llv;Llv;I)I", + garbageValue = "-26460885" ) @Export("compareBuddy") int compareBuddy(Buddy var1, Buddy var2) { @@ -31,4 +32,97 @@ public class UserComparator6 extends AbstractUserComparator { public int compare(Object var1, Object var2) { return this.compareBuddy((Buddy)var1, (Buddy)var2); // L: 21 } + + @ObfuscatedName("v") + @ObfuscatedSignature( + descriptor = "(II)Let;", + garbageValue = "1390407086" + ) + public static HealthBarDefinition method2492(int var0) { + HealthBarDefinition var1 = (HealthBarDefinition)HealthBarDefinition.HealthBarDefinition_cached.get((long)var0); // L: 32 + if (var1 != null) { // L: 33 + return var1; + } else { + byte[] var2 = HealthBarDefinition.HealthBarDefinition_archive.takeFile(33, var0); // L: 34 + var1 = new HealthBarDefinition(); // L: 35 + if (var2 != null) { // L: 36 + var1.decode(new Buffer(var2)); + } + + HealthBarDefinition.HealthBarDefinition_cached.put(var1, (long)var0); // L: 37 + return var1; // L: 38 + } + } + + @ObfuscatedName("p") + @ObfuscatedSignature( + descriptor = "(Ljava/lang/String;I)Ljava/lang/Class;", + garbageValue = "-2129011135" + ) + @Export("loadClassFromDescriptor") + static Class loadClassFromDescriptor(String var0) throws ClassNotFoundException { + if (var0.equals("B")) { // L: 222 + return Byte.TYPE; + } else if (var0.equals("I")) { // L: 223 + return Integer.TYPE; + } else if (var0.equals("S")) { // L: 224 + return Short.TYPE; + } else if (var0.equals("J")) { // L: 225 + return Long.TYPE; + } else if (var0.equals("Z")) { // L: 226 + return Boolean.TYPE; + } else if (var0.equals("F")) { // L: 227 + return Float.TYPE; + } else if (var0.equals("D")) { // L: 228 + return Double.TYPE; + } else if (var0.equals("C")) { // L: 229 + return Character.TYPE; + } else { + return var0.equals("void") ? Void.TYPE : Reflection.findClass(var0); // L: 230 231 + } + } + + @ObfuscatedName("u") + @ObfuscatedSignature( + descriptor = "(I)V", + garbageValue = "1210061532" + ) + public static void method2485() { + HitSplatDefinition.HitSplatDefinition_cached.clear(); // L: 203 + HitSplatDefinition.HitSplatDefinition_cachedSprites.clear(); // L: 204 + HitSplatDefinition.HitSplatDefinition_cachedFonts.clear(); // L: 205 + } // L: 206 + + @ObfuscatedName("bn") + @ObfuscatedSignature( + descriptor = "([BI)[B", + garbageValue = "1275679316" + ) + @Export("decompressBytes") + static final byte[] decompressBytes(byte[] var0) { + Buffer var1 = new Buffer(var0); // L: 381 + int var2 = var1.readUnsignedByte(); // L: 382 + int var3 = var1.readInt(); // L: 383 + if (var3 < 0 || AbstractArchive.field3589 != 0 && var3 > AbstractArchive.field3589) { // L: 384 + throw new RuntimeException(); // L: 385 + } else if (var2 == 0) { // L: 387 + byte[] var6 = new byte[var3]; // L: 388 + var1.readBytes(var6, 0, var3); // L: 389 + return var6; // L: 390 + } else { + int var4 = var1.readInt(); // L: 393 + if (var4 >= 0 && (AbstractArchive.field3589 == 0 || var4 <= AbstractArchive.field3589)) { // L: 394 + byte[] var5 = new byte[var4]; // L: 397 + if (var2 == 1) { // L: 398 + BZip2Decompressor.BZip2Decompressor_decompress(var5, var4, var0, var3, 9); + } else { + AbstractArchive.gzipDecompressor.decompress(var1, var5); // L: 399 + } + + return var5; // L: 400 + } else { + throw new RuntimeException(); // L: 395 + } + } + } } diff --git a/runescape-client/src/main/java/UserComparator7.java b/runescape-client/src/main/java/UserComparator7.java index 42cd313e4f..22d9de9924 100644 --- a/runescape-client/src/main/java/UserComparator7.java +++ b/runescape-client/src/main/java/UserComparator7.java @@ -3,10 +3,10 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("dq") +@ObfuscatedName("dd") @Implements("UserComparator7") public class UserComparator7 extends AbstractUserComparator { - @ObfuscatedName("h") + @ObfuscatedName("v") @Export("reversed") final boolean reversed; @@ -14,10 +14,10 @@ public class UserComparator7 extends AbstractUserComparator { this.reversed = var1; // L: 10 } // L: 11 - @ObfuscatedName("h") + @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "(Llq;Llq;I)I", - garbageValue = "-540043560" + descriptor = "(Llv;Llv;I)I", + garbageValue = "-1880914380" ) @Export("compareBuddy") int compareBuddy(Buddy var1, Buddy var2) { @@ -31,23 +31,4 @@ public class UserComparator7 extends AbstractUserComparator { public int compare(Object var1, Object var2) { return this.compareBuddy((Buddy)var1, (Buddy)var2); // L: 21 } - - @ObfuscatedName("h") - @ObfuscatedSignature( - descriptor = "(Ljp;B)V", - garbageValue = "-10" - ) - public static void method2453(AbstractArchive var0) { - StructComposition.StructDefinition_archive = var0; // L: 19 - } // L: 20 - - @ObfuscatedName("x") - @ObfuscatedSignature( - descriptor = "(IB)V", - garbageValue = "27" - ) - static void method2455(int var0) { - Login.loginIndex = 12; // L: 1541 - Login.field996 = var0; // L: 1542 - } // L: 1543 } diff --git a/runescape-client/src/main/java/UserComparator8.java b/runescape-client/src/main/java/UserComparator8.java index e49f58bfe6..695f8a282c 100644 --- a/runescape-client/src/main/java/UserComparator8.java +++ b/runescape-client/src/main/java/UserComparator8.java @@ -1,25 +1,12 @@ 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("dm") +@ObfuscatedName("dy") @Implements("UserComparator8") public class UserComparator8 extends AbstractUserComparator { - @ObfuscatedName("qf") - @ObfuscatedSignature( - descriptor = "Low;" - ) - @Export("sceneMinimapSprite") - static SpritePixels sceneMinimapSprite; - @ObfuscatedName("mr") - @ObfuscatedGetter( - intValue = -765310817 - ) - @Export("selectedItemSlot") - static int selectedItemSlot; - @ObfuscatedName("h") + @ObfuscatedName("v") @Export("reversed") final boolean reversed; @@ -27,10 +14,10 @@ public class UserComparator8 extends AbstractUserComparator { this.reversed = var1; // L: 11 } // L: 12 - @ObfuscatedName("h") + @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "(Llq;Llq;I)I", - garbageValue = "1501213760" + descriptor = "(Llv;Llv;I)I", + garbageValue = "-1643284848" ) @Export("compareBuddy") int compareBuddy(Buddy var1, Buddy var2) { @@ -49,64 +36,9 @@ public class UserComparator8 extends AbstractUserComparator { return this.compareBuddy((Buddy)var1, (Buddy)var2); // L: 25 } - @ObfuscatedName("g") - @ObfuscatedSignature( - descriptor = "(Ljava/lang/CharSequence;II)I", - garbageValue = "686379758" - ) - public static int method2440(CharSequence var0, int var1) { - return class18.method255(var0, var1, true); // L: 80 + @ObfuscatedName("n") + static boolean method2437(long var0) { + int var2 = (int)(var0 >>> 14 & 3L); // L: 50 + return var2 == 2; // L: 52 } - - @ObfuscatedName("g") - @ObfuscatedSignature( - descriptor = "(II)Z", - garbageValue = "-1683819364" - ) - @Export("loadInterface") - public static boolean loadInterface(int var0) { - if (class5.Widget_loadedInterfaces[var0]) { // L: 214 - return true; - } else if (!GrandExchangeOffer.Widget_archive.tryLoadGroup(var0)) { // L: 215 - return false; - } else { - int var1 = GrandExchangeOffer.Widget_archive.getGroupFileCount(var0); // L: 216 - if (var1 == 0) { // L: 217 - class5.Widget_loadedInterfaces[var0] = true; // L: 218 - return true; // L: 219 - } else { - if (Widget.Widget_interfaceComponents[var0] == null) { // L: 221 - Widget.Widget_interfaceComponents[var0] = new Widget[var1]; - } - - for (int var2 = 0; var2 < var1; ++var2) { // L: 222 - if (Widget.Widget_interfaceComponents[var0][var2] == null) { // L: 223 - byte[] var3 = GrandExchangeOffer.Widget_archive.takeFile(var0, var2); // L: 224 - if (var3 != null) { // L: 225 - Widget.Widget_interfaceComponents[var0][var2] = new Widget(); // L: 226 - Widget.Widget_interfaceComponents[var0][var2].id = var2 + (var0 << 16); // L: 227 - if (var3[0] == -1) { // L: 228 - Widget.Widget_interfaceComponents[var0][var2].decode(new Buffer(var3)); - } else { - Widget.Widget_interfaceComponents[var0][var2].decodeLegacy(new Buffer(var3)); // L: 229 - } - } - } - } - - class5.Widget_loadedInterfaces[var0] = true; // L: 233 - return true; // L: 234 - } - } - } - - @ObfuscatedName("z") - @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "-1727381075" - ) - public static void method2447() { - SpotAnimationDefinition.SpotAnimationDefinition_cached.clear(); // L: 122 - SpotAnimationDefinition.SpotAnimationDefinition_cachedModels.clear(); // L: 123 - } // L: 124 } diff --git a/runescape-client/src/main/java/UserComparator9.java b/runescape-client/src/main/java/UserComparator9.java index 75a21af5b3..d714181ea2 100644 --- a/runescape-client/src/main/java/UserComparator9.java +++ b/runescape-client/src/main/java/UserComparator9.java @@ -1,18 +1,19 @@ 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("dy") +@ObfuscatedName("dg") @Implements("UserComparator9") public class UserComparator9 extends AbstractUserComparator { - @ObfuscatedName("ef") - @ObfuscatedGetter( - intValue = 1831242095 + @ObfuscatedName("ff") + @ObfuscatedSignature( + descriptor = "Leu;" ) - static int field1426; - @ObfuscatedName("h") + @Export("socketTask") + static Task socketTask; + @ObfuscatedName("v") @Export("reversed") final boolean reversed; @@ -20,10 +21,10 @@ public class UserComparator9 extends AbstractUserComparator { this.reversed = var1; // L: 11 } // L: 12 - @ObfuscatedName("h") + @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "(Llq;Llq;I)I", - garbageValue = "-1608595432" + descriptor = "(Llv;Llv;B)I", + garbageValue = "-69" ) @Export("compareBuddy") int compareBuddy(Buddy var1, Buddy var2) { @@ -38,96 +39,386 @@ public class UserComparator9 extends AbstractUserComparator { return this.compareBuddy((Buddy)var1, (Buddy)var2); // L: 22 } - @ObfuscatedName("ge") + @ObfuscatedName("w") @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "-1820867955" + descriptor = "(ILcf;ZI)I", + garbageValue = "910297623" ) - static void method2478() { - if (class35.localPlayer.x >> 7 == Client.destinationX && class35.localPlayer.y >> 7 == Client.destinationY) { // L: 4658 - Client.destinationX = 0; // L: 4659 - } - - } // L: 4661 - - @ObfuscatedName("hv") - @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "-1550972970" - ) - static final void method2477() { - PacketBuffer var0 = Client.packetWriter.packetBuffer; // L: 7646 - var0.importIndex(); // L: 7647 - int var1 = var0.readBits(8); // L: 7648 - int var2; - if (var1 < Client.npcCount) { // L: 7649 - for (var2 = var1; var2 < Client.npcCount; ++var2) { // L: 7650 - Client.field614[++Client.field737 - 1] = Client.npcIndices[var2]; + static int method2466(int var0, Script var1, boolean var2) { + String var7; + if (var0 == ScriptOpcodes.MES) { // L: 1397 + var7 = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize]; // L: 1398 + World.addGameMessage(0, "", var7); // L: 1399 + return 1; // L: 1400 + } else if (var0 == ScriptOpcodes.ANIM) { + class44.Interpreter_intStackSize -= 2; // L: 1403 + class32.performPlayerAnimation(class93.localPlayer, Interpreter.Interpreter_intStack[class44.Interpreter_intStackSize], Interpreter.Interpreter_intStack[class44.Interpreter_intStackSize + 1]); // L: 1404 + return 1; // L: 1405 + } else if (var0 == ScriptOpcodes.IF_CLOSE) { + if (!Interpreter.field986) { // L: 1408 + Interpreter.field973 = true; // L: 1409 } - } - if (var1 > Client.npcCount) { // L: 7652 - throw new RuntimeException(""); + return 1; // L: 1411 } else { - Client.npcCount = 0; // L: 7653 + int var16; + if (var0 == ScriptOpcodes.RESUME_COUNTDIALOG) { + var7 = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize]; // L: 1414 + var16 = 0; // L: 1415 + if (class20.isNumber(var7)) { // L: 1416 + var16 = class82.method1908(var7); + } - for (var2 = 0; var2 < var1; ++var2) { // L: 7654 - int var3 = Client.npcIndices[var2]; // L: 7655 - NPC var4 = Client.npcs[var3]; // L: 7656 - int var5 = var0.readBits(1); // L: 7657 - if (var5 == 0) { // L: 7658 - Client.npcIndices[++Client.npcCount - 1] = var3; // L: 7659 - var4.npcCycle = Client.cycle; // L: 7660 + PacketBufferNode var14 = class21.getPacketBufferNode(ClientPacket.field2582, Client.packetWriter.isaacCipher); // L: 1418 + var14.packetBuffer.writeInt(var16); // L: 1419 + Client.packetWriter.addNode(var14); // L: 1420 + return 1; // L: 1421 + } else { + PacketBufferNode var12; + if (var0 == ScriptOpcodes.RESUME_NAMEDIALOG) { + var7 = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize]; // L: 1424 + var12 = class21.getPacketBufferNode(ClientPacket.field2595, Client.packetWriter.isaacCipher); // L: 1426 + var12.packetBuffer.writeByte(var7.length() + 1); // L: 1427 + var12.packetBuffer.writeStringCp1252NullTerminated(var7); // L: 1428 + Client.packetWriter.addNode(var12); // L: 1429 + return 1; // L: 1430 + } else if (var0 == ScriptOpcodes.RESUME_STRINGDIALOG) { + var7 = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize]; // L: 1433 + var12 = class21.getPacketBufferNode(ClientPacket.field2653, Client.packetWriter.isaacCipher); // L: 1435 + var12.packetBuffer.writeByte(var7.length() + 1); // L: 1436 + var12.packetBuffer.writeStringCp1252NullTerminated(var7); // L: 1437 + Client.packetWriter.addNode(var12); // L: 1438 + return 1; // L: 1439 } else { - int var6 = var0.readBits(2); // L: 7663 - if (var6 == 0) { // L: 7664 - Client.npcIndices[++Client.npcCount - 1] = var3; // L: 7665 - var4.npcCycle = Client.cycle; // L: 7666 - Client.field662[++Client.field661 - 1] = var3; // L: 7667 + String var4; + int var10; + if (var0 == ScriptOpcodes.OPPLAYER) { + var10 = Interpreter.Interpreter_intStack[--class44.Interpreter_intStackSize]; // L: 1442 + var4 = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize]; // L: 1443 + Actor.method2192(var10, var4); // L: 1444 + return 1; // L: 1445 + } else if (var0 == ScriptOpcodes.IF_DRAGPICKUP) { + class44.Interpreter_intStackSize -= 3; // L: 1448 + var10 = Interpreter.Interpreter_intStack[class44.Interpreter_intStackSize]; // L: 1449 + var16 = Interpreter.Interpreter_intStack[class44.Interpreter_intStackSize + 1]; // L: 1450 + int var9 = Interpreter.Interpreter_intStack[class44.Interpreter_intStackSize + 2]; // L: 1451 + Widget var15 = Frames.getWidget(var9); // L: 1452 + VarcInt.clickWidget(var15, var10, var16); // L: 1453 + return 1; // L: 1454 + } else if (var0 == ScriptOpcodes.CC_DRAGPICKUP) { + class44.Interpreter_intStackSize -= 2; // L: 1457 + var10 = Interpreter.Interpreter_intStack[class44.Interpreter_intStackSize]; // L: 1458 + var16 = Interpreter.Interpreter_intStack[class44.Interpreter_intStackSize + 1]; // L: 1459 + Widget var13 = var2 ? class13.scriptDotWidget : Interpreter.scriptActiveWidget; // L: 1460 + VarcInt.clickWidget(var13, var10, var16); // L: 1461 + return 1; // L: 1462 + } else if (var0 == ScriptOpcodes.MOUSECAM) { + Client.mouseCam = Interpreter.Interpreter_intStack[--class44.Interpreter_intStackSize] == 1; // L: 1465 + return 1; // L: 1466 + } else if (var0 == ScriptOpcodes.GETREMOVEROOFS) { + Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = ObjectComposition.clientPreferences.roofsHidden ? 1 : 0; // L: 1469 + return 1; // L: 1470 + } else if (var0 == ScriptOpcodes.SETREMOVEROOFS) { + ObjectComposition.clientPreferences.roofsHidden = Interpreter.Interpreter_intStack[--class44.Interpreter_intStackSize] == 1; // L: 1473 + TileItem.savePreferences(); // L: 1474 + return 1; // L: 1475 + } else if (var0 == ScriptOpcodes.OPENURL) { + var7 = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize]; // L: 1478 + boolean var8 = Interpreter.Interpreter_intStack[--class44.Interpreter_intStackSize] == 1; // L: 1479 + Players.openURL(var7, var8, false); // L: 1480 + return 1; // L: 1481 + } else if (var0 == ScriptOpcodes.RESUME_OBJDIALOG) { + var10 = Interpreter.Interpreter_intStack[--class44.Interpreter_intStackSize]; // L: 1484 + var12 = class21.getPacketBufferNode(ClientPacket.field2647, Client.packetWriter.isaacCipher); // L: 1486 + var12.packetBuffer.writeShort(var10); // L: 1487 + Client.packetWriter.addNode(var12); // L: 1488 + return 1; // L: 1489 + } else if (var0 == ScriptOpcodes.BUG_REPORT) { + var10 = Interpreter.Interpreter_intStack[--class44.Interpreter_intStackSize]; // L: 1492 + Interpreter.Interpreter_stringStackSize -= 2; // L: 1493 + var4 = Interpreter.Interpreter_stringStack[Interpreter.Interpreter_stringStackSize]; // L: 1494 + String var5 = Interpreter.Interpreter_stringStack[Interpreter.Interpreter_stringStackSize + 1]; // L: 1495 + if (var4.length() > 500) { // L: 1496 + return 1; + } else if (var5.length() > 500) { // L: 1497 + return 1; + } else { + PacketBufferNode var6 = class21.getPacketBufferNode(ClientPacket.field2588, Client.packetWriter.isaacCipher); // L: 1498 + var6.packetBuffer.writeShort(1 + Tiles.stringCp1252NullTerminatedByteSize(var4) + Tiles.stringCp1252NullTerminatedByteSize(var5)); // L: 1499 + var6.packetBuffer.writeStringCp1252NullTerminated(var4); // L: 1500 + var6.packetBuffer.writeStringCp1252NullTerminated(var5); // L: 1501 + var6.packetBuffer.writeByte(var10); // L: 1502 + Client.packetWriter.addNode(var6); // L: 1503 + return 1; // L: 1504 + } + } else if (var0 == ScriptOpcodes.SETSHIFTCLICKDROP) { + Client.shiftClickDrop = Interpreter.Interpreter_intStack[--class44.Interpreter_intStackSize] == 1; // L: 1507 + return 1; // L: 1508 + } else if (var0 == ScriptOpcodes.SETSHOWMOUSEOVERTEXT) { + Client.showMouseOverText = Interpreter.Interpreter_intStack[--class44.Interpreter_intStackSize] == 1; // L: 1511 + return 1; // L: 1512 + } else if (var0 == ScriptOpcodes.RENDERSELF) { + Client.renderSelf = Interpreter.Interpreter_intStack[--class44.Interpreter_intStackSize] == 1; // L: 1515 + return 1; // L: 1516 + } else if (var0 == 3120) { + if (Interpreter.Interpreter_intStack[--class44.Interpreter_intStackSize] == 1) { // L: 1519 + Client.drawPlayerNames |= 1; + } else { + Client.drawPlayerNames &= -2; // L: 1520 + } + + return 1; // L: 1521 + } else if (var0 == 3121) { + if (Interpreter.Interpreter_intStack[--class44.Interpreter_intStackSize] == 1) { // L: 1524 + Client.drawPlayerNames |= 2; + } else { + Client.drawPlayerNames &= -3; // L: 1525 + } + + return 1; // L: 1526 + } else if (var0 == 3122) { + if (Interpreter.Interpreter_intStack[--class44.Interpreter_intStackSize] == 1) { // L: 1529 + Client.drawPlayerNames |= 4; + } else { + Client.drawPlayerNames &= -5; // L: 1530 + } + + return 1; // L: 1531 + } else if (var0 == 3123) { + if (Interpreter.Interpreter_intStack[--class44.Interpreter_intStackSize] == 1) { // L: 1534 + Client.drawPlayerNames |= 8; + } else { + Client.drawPlayerNames &= -9; // L: 1535 + } + + return 1; // L: 1536 + } else if (var0 == 3124) { + Client.drawPlayerNames = 0; // L: 1539 + return 1; // L: 1540 + } else if (var0 == ScriptOpcodes.SETSHOWMOUSECROSS) { + Client.showMouseCross = Interpreter.Interpreter_intStack[--class44.Interpreter_intStackSize] == 1; // L: 1543 + return 1; // L: 1544 + } else if (var0 == ScriptOpcodes.SETSHOWLOADINGMESSAGES) { + Client.showLoadingMessages = Interpreter.Interpreter_intStack[--class44.Interpreter_intStackSize] == 1; // L: 1547 + return 1; // L: 1548 + } else if (var0 == ScriptOpcodes.SETTAPTODROP) { + UserComparator4.setTapToDrop(Interpreter.Interpreter_intStack[--class44.Interpreter_intStackSize] == 1); // L: 1551 + return 1; // L: 1552 + } else if (var0 == ScriptOpcodes.GETTAPTODROP) { + Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = class8.getTapToDrop() ? 1 : 0; // L: 1555 + return 1; // L: 1556 + } else if (var0 == ScriptOpcodes.SETOCULUSORBSPEED) { + class44.Interpreter_intStackSize -= 2; // L: 1559 + Client.oculusOrbNormalSpeed = Interpreter.Interpreter_intStack[class44.Interpreter_intStackSize]; // L: 1560 + Client.oculusOrbSlowedSpeed = Interpreter.Interpreter_intStack[class44.Interpreter_intStackSize + 1]; // L: 1561 + return 1; // L: 1562 + } else if (var0 == 3130) { + class44.Interpreter_intStackSize -= 2; // L: 1565 + return 1; // L: 1566 + } else if (var0 == 3131) { + --class44.Interpreter_intStackSize; // L: 1569 + return 1; // L: 1570 + } else if (var0 == ScriptOpcodes.GETCANVASSIZE) { + Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = class32.canvasWidth; // L: 1573 + Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = ReflectionCheck.canvasHeight; // L: 1574 + return 1; // L: 1575 + } else if (var0 == ScriptOpcodes.MOBILE_SETFPS) { + --class44.Interpreter_intStackSize; // L: 1578 + return 1; // L: 1579 + } else if (var0 == ScriptOpcodes.MOBILE_OPENSTORE) { + return 1; // L: 1582 + } else if (var0 == ScriptOpcodes.MOBILE_OPENSTORECATEGORY) { + class44.Interpreter_intStackSize -= 2; // L: 1585 + return 1; // L: 1586 + } else if (var0 == 3136) { + Client.field803 = 3; // L: 1589 + Client.field805 = Interpreter.Interpreter_intStack[--class44.Interpreter_intStackSize]; // L: 1590 + return 1; // L: 1591 + } else if (var0 == 3137) { + Client.field803 = 2; // L: 1594 + Client.field805 = Interpreter.Interpreter_intStack[--class44.Interpreter_intStackSize]; // L: 1595 + return 1; // L: 1596 + } else if (var0 == 3138) { + Client.field803 = 0; // L: 1599 + return 1; // L: 1600 + } else if (var0 == 3139) { + Client.field803 = 1; // L: 1603 + return 1; // L: 1604 + } else if (var0 == 3140) { + Client.field803 = 3; // L: 1607 + Client.field805 = var2 ? class13.scriptDotWidget.id * 1969535585 * -1722455647 : Interpreter.scriptActiveWidget.id * 1969535585 * -1722455647; // L: 1608 + return 1; // L: 1609 } else { - int var7; - int var8; - if (var6 == 1) { // L: 7670 - Client.npcIndices[++Client.npcCount - 1] = var3; // L: 7671 - var4.npcCycle = Client.cycle; // L: 7672 - var7 = var0.readBits(3); // L: 7673 - var4.method2254(var7, (byte)1); // L: 7674 - var8 = var0.readBits(1); // L: 7675 - if (var8 == 1) { // L: 7676 - Client.field662[++Client.field661 - 1] = var3; + boolean var11; + if (var0 == ScriptOpcodes.SETHIDEUSERNAME) { + var11 = Interpreter.Interpreter_intStack[--class44.Interpreter_intStackSize] == 1; // L: 1612 + ObjectComposition.clientPreferences.hideUsername = var11; // L: 1613 + TileItem.savePreferences(); // L: 1614 + return 1; // L: 1615 + } else if (var0 == ScriptOpcodes.GETHIDEUSERNAME) { + Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = ObjectComposition.clientPreferences.hideUsername ? 1 : 0; // L: 1618 + return 1; // L: 1619 + } else if (var0 == ScriptOpcodes.SETREMEMBERUSERNAME) { + var11 = Interpreter.Interpreter_intStack[--class44.Interpreter_intStackSize] == 1; // L: 1622 + Client.Login_isUsernameRemembered = var11; // L: 1623 + if (!var11) { // L: 1624 + ObjectComposition.clientPreferences.rememberedUsername = ""; // L: 1625 + TileItem.savePreferences(); // L: 1626 } - } else if (var6 == 2) { // L: 7679 - Client.npcIndices[++Client.npcCount - 1] = var3; // L: 7680 - var4.npcCycle = Client.cycle; // L: 7681 - var7 = var0.readBits(3); // L: 7682 - var4.method2254(var7, (byte)2); // L: 7683 - var8 = var0.readBits(3); // L: 7684 - var4.method2254(var8, (byte)2); // L: 7685 - int var9 = var0.readBits(1); // L: 7686 - if (var9 == 1) { - Client.field662[++Client.field661 - 1] = var3; // L: 7687 + + return 1; // L: 1628 + } else if (var0 == ScriptOpcodes.GETREMEMBERUSERNAME) { + Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = Client.Login_isUsernameRemembered ? 1 : 0; // L: 1631 + return 1; // L: 1632 + } else if (var0 == 3145) { + return 1; // L: 1635 + } else if (var0 == ScriptOpcodes.SETTITLEMUSICENABLED) { + var11 = Interpreter.Interpreter_intStack[--class44.Interpreter_intStackSize] == 1; // L: 1638 + if (var11 == ObjectComposition.clientPreferences.titleMusicDisabled) { // L: 1639 + ObjectComposition.clientPreferences.titleMusicDisabled = !var11; // L: 1640 + TileItem.savePreferences(); // L: 1641 } - } else if (var6 == 3) { // L: 7690 - Client.field614[++Client.field737 - 1] = var3; // L: 7691 + + return 1; // L: 1643 + } else if (var0 == ScriptOpcodes.GETTITLEMUSICENABLED) { + Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = ObjectComposition.clientPreferences.titleMusicDisabled ? 0 : 1; // L: 1646 + return 1; // L: 1647 + } else if (var0 == 3148) { + return 1; // L: 1650 + } else if (var0 == 3149) { + Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = 0; // L: 1653 + return 1; // L: 1654 + } else if (var0 == 3150) { + Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = 0; // L: 1657 + return 1; // L: 1658 + } else if (var0 == 3151) { + Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = 0; // L: 1661 + return 1; // L: 1662 + } else if (var0 == 3152) { + Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = 0; // L: 1665 + return 1; // L: 1666 + } else if (var0 == 3153) { + Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = Login.Login_loadingPercent; // L: 1669 + return 1; // L: 1670 + } else if (var0 == 3154) { + Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = class43.method440(); // L: 1673 + return 1; // L: 1674 + } else if (var0 == 3155) { + --Interpreter.Interpreter_stringStackSize; // L: 1677 + return 1; // L: 1678 + } else if (var0 == 3156) { + return 1; // L: 1681 + } else if (var0 == 3157) { + class44.Interpreter_intStackSize -= 2; // L: 1684 + return 1; // L: 1685 + } else if (var0 == 3158) { + Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = 0; // L: 1688 + return 1; // L: 1689 + } else if (var0 == 3159) { + Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = 0; // L: 1692 + return 1; // L: 1693 + } else if (var0 == 3160) { + Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = 0; // L: 1696 + return 1; // L: 1697 + } else if (var0 == 3161) { + --class44.Interpreter_intStackSize; // L: 1700 + Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = 0; // L: 1701 + return 1; // L: 1702 + } else if (var0 == 3162) { + --class44.Interpreter_intStackSize; // L: 1705 + Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = 0; // L: 1706 + return 1; // L: 1707 + } else if (var0 == 3163) { + --Interpreter.Interpreter_stringStackSize; // L: 1710 + Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = 0; // L: 1711 + return 1; // L: 1712 + } else if (var0 == 3164) { + --class44.Interpreter_intStackSize; // L: 1715 + Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = ""; // L: 1716 + return 1; // L: 1717 + } else if (var0 == 3165) { + --class44.Interpreter_intStackSize; // L: 1720 + Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = 0; // L: 1721 + return 1; // L: 1722 + } else if (var0 == 3166) { + class44.Interpreter_intStackSize -= 2; // L: 1725 + Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = 0; // L: 1726 + return 1; // L: 1727 + } else if (var0 == 3167) { + class44.Interpreter_intStackSize -= 2; // L: 1730 + Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = 0; // L: 1731 + return 1; // L: 1732 + } else if (var0 == 3168) { + class44.Interpreter_intStackSize -= 2; // L: 1735 + Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = ""; // L: 1736 + Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = ""; // L: 1737 + Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = ""; // L: 1738 + Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = ""; // L: 1739 + Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = ""; // L: 1740 + Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = ""; // L: 1741 + Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = ""; // L: 1742 + Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = ""; // L: 1743 + Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = ""; // L: 1744 + return 1; // L: 1745 + } else if (var0 == 3169) { + return 1; // L: 1748 + } else if (var0 == 3170) { + Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = 0; // L: 1751 + return 1; // L: 1752 + } else if (var0 == 3171) { + Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = 0; // L: 1755 + return 1; // L: 1756 + } else if (var0 == 3172) { + --class44.Interpreter_intStackSize; // L: 1759 + return 1; // L: 1760 + } else if (var0 == 3173) { + --class44.Interpreter_intStackSize; // L: 1763 + Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = 0; // L: 1764 + return 1; // L: 1765 + } else if (var0 == 3174) { + --class44.Interpreter_intStackSize; // L: 1768 + return 1; // L: 1769 + } else if (var0 == 3175) { + Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = 0; // L: 1772 + return 1; // L: 1773 + } else if (var0 == 3176) { + return 1; // L: 1776 + } else if (var0 == 3177) { + return 1; // L: 1779 + } else if (var0 == 3178) { + --Interpreter.Interpreter_stringStackSize; // L: 1782 + return 1; // L: 1783 + } else if (var0 == 3179) { + return 1; // L: 1786 + } else if (var0 == 3180) { + --Interpreter.Interpreter_stringStackSize; // L: 1789 + return 1; // L: 1790 + } else if (var0 == 3181) { + var10 = 100 - Math.min(Math.max(Interpreter.Interpreter_intStack[--class44.Interpreter_intStackSize], 0), 100); // L: 1793 + InterfaceParent.method2082((double)(0.5F + (float)var10 / 200.0F)); // L: 1794 + return 1; // L: 1795 + } else if (var0 == 3182) { + float var3 = 200.0F * ((float)ObjectComposition.clientPreferences.field1337 - 0.5F); // L: 1798 + Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = 100 - Math.round(var3); // L: 1799 + return 1; // L: 1800 + } else if (var0 != 3183 && var0 != 3184) { + return 2; // L: 1806 + } else { + --class44.Interpreter_intStackSize; // L: 1803 + return 1; // L: 1804 } } } } - - } - } // L: 7695 - - @ObfuscatedName("lr") - @ObfuscatedSignature( - descriptor = "(Liv;B)Ljava/lang/String;", - garbageValue = "7" - ) - @Export("Widget_getSpellActionName") - static String Widget_getSpellActionName(Widget var0) { - if (AttackOption.Widget_unpackTargetMask(class26.getWidgetFlags(var0)) == 0) { // L: 11627 - return null; - } else { - return var0.spellActionName != null && var0.spellActionName.trim().length() != 0 ? var0.spellActionName : null; // L: 11628 11629 11631 } } + + @ObfuscatedName("am") + @ObfuscatedSignature( + descriptor = "(II)I", + garbageValue = "70996791" + ) + static int method2467(int var0) { + return (int)((Math.log((double)var0) / Interpreter.field989 - 7.0D) * 256.0D); // L: 3515 + } } diff --git a/runescape-client/src/main/java/UserList.java b/runescape-client/src/main/java/UserList.java index e05706ecc4..b70ce46dd3 100644 --- a/runescape-client/src/main/java/UserList.java +++ b/runescape-client/src/main/java/UserList.java @@ -7,34 +7,34 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("lf") +@ObfuscatedName("lj") @Implements("UserList") public abstract class UserList { - @ObfuscatedName("b") + @ObfuscatedName("d") @ObfuscatedGetter( - intValue = -1178695315 + intValue = -446111369 ) @Export("capacity") final int capacity; - @ObfuscatedName("q") + @ObfuscatedName("s") @ObfuscatedGetter( - intValue = 584872955 + intValue = -1892768295 ) @Export("size") int size; - @ObfuscatedName("i") + @ObfuscatedName("u") @ObfuscatedSignature( - descriptor = "[Llm;" + descriptor = "[Llx;" ) @Export("array") User[] array; - @ObfuscatedName("x") + @ObfuscatedName("l") @Export("usernamesMap") HashMap usernamesMap; - @ObfuscatedName("k") + @ObfuscatedName("o") @Export("previousUsernamesMap") HashMap previousUsernamesMap; - @ObfuscatedName("r") + @ObfuscatedName("c") @Export("comparator") Comparator comparator; @@ -47,26 +47,26 @@ public abstract class UserList { this.previousUsernamesMap = new HashMap(var1 / 8); // L: 19 } // L: 20 - @ObfuscatedName("h") + @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "(I)Llm;", - garbageValue = "-1768347101" + descriptor = "(B)Llx;", + garbageValue = "126" ) @Export("newInstance") abstract User newInstance(); - @ObfuscatedName("c") + @ObfuscatedName("n") @ObfuscatedSignature( - descriptor = "(II)[Llm;", - garbageValue = "836907267" + descriptor = "(II)[Llx;", + garbageValue = "1924184817" ) @Export("newTypedArray") abstract User[] newTypedArray(int var1); - @ObfuscatedName("ao") + @ObfuscatedName("ae") @ObfuscatedSignature( - descriptor = "(S)V", - garbageValue = "1788" + descriptor = "(I)V", + garbageValue = "-1427653202" ) @Export("clear") public void clear() { @@ -76,30 +76,30 @@ public abstract class UserList { this.previousUsernamesMap.clear(); // L: 26 } // L: 27 - @ObfuscatedName("aj") + @ObfuscatedName("ap") @ObfuscatedSignature( descriptor = "(I)I", - garbageValue = "-1551225838" + garbageValue = "1340173530" ) @Export("getSize") public int getSize() { return this.size; // L: 30 } - @ObfuscatedName("aw") + @ObfuscatedName("ab") @ObfuscatedSignature( - descriptor = "(I)Z", - garbageValue = "-402639237" + descriptor = "(B)Z", + garbageValue = "54" ) @Export("isFull") public boolean isFull() { - return this.size == this.capacity; // L: 34 + return this.capacity == this.size; // L: 34 } - @ObfuscatedName("at") + @ObfuscatedName("al") @ObfuscatedSignature( - descriptor = "(Lla;I)Z", - garbageValue = "1332419914" + descriptor = "(Lly;I)Z", + garbageValue = "-234571238" ) @Export("contains") public boolean contains(Username var1) { @@ -110,10 +110,10 @@ public abstract class UserList { } } - @ObfuscatedName("av") + @ObfuscatedName("ad") @ObfuscatedSignature( - descriptor = "(Lla;I)Llm;", - garbageValue = "-412605520" + descriptor = "(Lly;I)Llx;", + garbageValue = "-1108278291" ) @Export("getByUsername") public User getByUsername(Username var1) { @@ -121,30 +121,30 @@ public abstract class UserList { return var2 != null ? var2 : this.getByPreviousUsername(var1); // L: 45 46 } - @ObfuscatedName("al") + @ObfuscatedName("ai") @ObfuscatedSignature( - descriptor = "(Lla;B)Llm;", - garbageValue = "4" + descriptor = "(Lly;B)Llx;", + garbageValue = "7" ) @Export("getByCurrentUsername") User getByCurrentUsername(Username var1) { return !var1.hasCleanName() ? null : (User)this.usernamesMap.get(var1); // L: 50 51 } - @ObfuscatedName("ap") + @ObfuscatedName("ar") @ObfuscatedSignature( - descriptor = "(Lla;I)Llm;", - garbageValue = "-1984147584" + descriptor = "(Lly;B)Llx;", + garbageValue = "1" ) @Export("getByPreviousUsername") User getByPreviousUsername(Username var1) { return !var1.hasCleanName() ? null : (User)this.previousUsernamesMap.get(var1); // L: 55 56 } - @ObfuscatedName("am") + @ObfuscatedName("ag") @ObfuscatedSignature( - descriptor = "(Lla;B)Z", - garbageValue = "1" + descriptor = "(Lly;I)Z", + garbageValue = "-787217096" ) @Export("removeByUsername") public final boolean removeByUsername(Username var1) { @@ -159,8 +159,8 @@ public abstract class UserList { @ObfuscatedName("ax") @ObfuscatedSignature( - descriptor = "(Llm;I)V", - garbageValue = "-1344539203" + descriptor = "(Llx;I)V", + garbageValue = "1934754885" ) @Export("remove") final void remove(User var1) { @@ -171,20 +171,20 @@ public abstract class UserList { } } // L: 71 - @ObfuscatedName("ak") + @ObfuscatedName("as") @ObfuscatedSignature( - descriptor = "(Lla;I)Llm;", - garbageValue = "-1013627827" + descriptor = "(Lly;I)Llx;", + garbageValue = "1218204811" ) @Export("addLastNoPreviousUsername") User addLastNoPreviousUsername(Username var1) { return this.addLast(var1, (Username)null); // L: 74 } - @ObfuscatedName("ay") + @ObfuscatedName("aj") @ObfuscatedSignature( - descriptor = "(Lla;Lla;I)Llm;", - garbageValue = "-88748057" + descriptor = "(Lly;Lly;I)Llx;", + garbageValue = "-656990705" ) @Export("addLast") User addLast(Username var1, Username var2) { @@ -199,10 +199,10 @@ public abstract class UserList { } } - @ObfuscatedName("ai") + @ObfuscatedName("am") @ObfuscatedSignature( - descriptor = "(IB)Llm;", - garbageValue = "0" + descriptor = "(IB)Llx;", + garbageValue = "-1" ) @Export("get") public final User get(int var1) { @@ -213,10 +213,10 @@ public abstract class UserList { } } - @ObfuscatedName("aa") + @ObfuscatedName("az") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "-539238258" + garbageValue = "1406178121" ) @Export("sort") public final void sort() { @@ -228,10 +228,10 @@ public abstract class UserList { } // L: 98 - @ObfuscatedName("au") + @ObfuscatedName("av") @ObfuscatedSignature( - descriptor = "(Llm;Lla;Lla;B)V", - garbageValue = "26" + descriptor = "(Llx;Lly;Lly;B)V", + garbageValue = "8" ) @Export("changeName") final void changeName(User var1, Username var2, Username var3) { @@ -240,10 +240,10 @@ public abstract class UserList { this.mapPut(var1); // L: 103 } // L: 104 - @ObfuscatedName("as") + @ObfuscatedName("ac") @ObfuscatedSignature( - descriptor = "(Llm;S)I", - garbageValue = "1103" + descriptor = "(Llx;S)I", + garbageValue = "400" ) @Export("indexOf") final int indexOf(User var1) { @@ -256,86 +256,139 @@ public abstract class UserList { return -1; // L: 110 } - @ObfuscatedName("ad") + @ObfuscatedName("at") @ObfuscatedSignature( - descriptor = "(Llm;I)V", - garbageValue = "-189402228" + descriptor = "(Llx;I)V", + garbageValue = "1618016496" ) @Export("mapRemove") final void mapRemove(User var1) { - if (this.usernamesMap.remove(var1.username) == null) { // L: 114 - throw new IllegalStateException(); - } else { - if (var1.previousUsername != null) { - this.previousUsernamesMap.remove(var1.previousUsername); // L: 115 - } - + if (var1.previousUsername != null) { + this.previousUsernamesMap.remove(var1.previousUsername); // L: 115 } - } // L: 116 - @ObfuscatedName("ac") + } + + @ObfuscatedName("ah") @ObfuscatedSignature( - descriptor = "(Llm;I)V", - garbageValue = "-1209514498" + descriptor = "(Llx;I)V", + garbageValue = "-1533955349" ) @Export("arrayAddLast") final void arrayAddLast(User var1) { - this.array[++this.size - 1] = var1; // L: 119 - } // L: 120 + this.array[++this.size - 1] = var1; + } - @ObfuscatedName("az") + @ObfuscatedName("ao") @ObfuscatedSignature( - descriptor = "(Llm;B)V", - garbageValue = "1" + descriptor = "(Llx;I)V", + garbageValue = "16776960" ) @Export("mapPut") final void mapPut(User var1) { - this.usernamesMap.put(var1.username, var1); // L: 123 - if (var1.previousUsername != null) { // L: 124 - User var2 = (User)this.previousUsernamesMap.put(var1.previousUsername, var1); // L: 125 - if (var2 != null && var2 != var1) { // L: 126 - var2.previousUsername = null; // L: 127 + this.usernamesMap.put(var1.username, var1); + if (var1.previousUsername != null) { + User var2 = (User)this.previousUsernamesMap.put(var1.previousUsername, var1); + if (var2 != null && var2 != var1) { + var2.previousUsername = null; } } - } // L: 130 + } @ObfuscatedName("aq") @ObfuscatedSignature( descriptor = "(IB)V", - garbageValue = "44" + garbageValue = "1" ) @Export("arrayRemove") final void arrayRemove(int var1) { - --this.size; // L: 133 - if (var1 < this.size) { // L: 134 - System.arraycopy(this.array, var1 + 1, this.array, var1, this.size - var1); // L: 135 + --this.size; + if (var1 < this.size) { + System.arraycopy(this.array, var1 + 1, this.array, var1, this.size - var1); } - } // L: 137 + } - @ObfuscatedName("ab") + @ObfuscatedName("aw") @ObfuscatedSignature( - descriptor = "(S)V", - garbageValue = "180" + descriptor = "(I)V", + garbageValue = "1532221549" ) @Export("removeComparator") public final void removeComparator() { - this.comparator = null; // L: 143 - } // L: 144 + this.comparator = null; + } - @ObfuscatedName("ar") + @ObfuscatedName("af") @ObfuscatedSignature( descriptor = "(Ljava/util/Comparator;I)V", - garbageValue = "1024776023" + garbageValue = "1224360715" ) @Export("addComparator") public final void addComparator(Comparator var1) { - if (this.comparator == null) { // L: 147 - this.comparator = var1; // L: 148 - } else if (this.comparator instanceof AbstractUserComparator) { // L: 150 - ((AbstractUserComparator)this.comparator).addComparator(var1); // L: 151 + if (this.comparator == null) { + this.comparator = var1; + } else if (this.comparator instanceof AbstractUserComparator) { + ((AbstractUserComparator)this.comparator).addComparator(var1); } } // L: 153 + + @ObfuscatedName("f") + @ObfuscatedSignature( + descriptor = "([BI)Lcf;", + garbageValue = "1132367592" + ) + @Export("newScript") + static Script newScript(byte[] var0) { + Script var1 = new Script(); // L: 116 + Buffer var2 = new Buffer(var0); // L: 117 + var2.offset = var2.array.length - 2; // L: 118 + int var3 = var2.readUnsignedShort(); // L: 119 + int var4 = var2.array.length - 2 - var3 - 12; // L: 120 + var2.offset = var4; // L: 121 + int var5 = var2.readInt(); // L: 122 + var1.localIntCount = var2.readUnsignedShort(); // L: 123 + var1.localStringCount = var2.readUnsignedShort(); // L: 124 + var1.intArgumentCount = var2.readUnsignedShort(); // L: 125 + var1.stringArgumentCount = var2.readUnsignedShort(); // L: 126 + int var6 = var2.readUnsignedByte(); // L: 127 + int var7; + int var8; + if (var6 > 0) { // L: 128 + var1.switches = var1.newIterableNodeHashTable(var6); // L: 129 + + for (var7 = 0; var7 < var6; ++var7) { // L: 130 + var8 = var2.readUnsignedShort(); // L: 131 + IterableNodeHashTable var9 = new IterableNodeHashTable(var8 > 0 ? Player.method2128(var8) : 1); // L: 132 + var1.switches[var7] = var9; // L: 133 + + while (var8-- > 0) { // L: 134 + int var10 = var2.readInt(); // L: 135 + int var11 = var2.readInt(); // L: 136 + var9.put(new IntegerNode(var11), (long)var10); // L: 137 + } + } + } + + var2.offset = 0; // L: 141 + var1.field1084 = var2.readStringCp1252NullTerminatedOrNull(); // L: 142 + var1.opcodes = new int[var5]; // L: 143 + var1.intOperands = new int[var5]; // L: 144 + var1.stringOperands = new String[var5]; // L: 145 + + for (var7 = 0; var2.offset < var4; var1.opcodes[var7++] = var8) { // L: 146 147 152 + var8 = var2.readUnsignedShort(); // L: 148 + if (var8 == 3) { // L: 149 + var1.stringOperands[var7] = var2.readStringCp1252NullTerminated(); + } else if (var8 < 100 && var8 != 21 && var8 != 38 && var8 != 39) { + var1.intOperands[var7] = var2.readInt(); // L: 150 + } else { + var1.intOperands[var7] = var2.readUnsignedByte(); // L: 151 + } + } + + return var1; // L: 154 + } } diff --git a/runescape-client/src/main/java/Username.java b/runescape-client/src/main/java/Username.java index b5bc1606c6..11aa22c7cb 100644 --- a/runescape-client/src/main/java/Username.java +++ b/runescape-client/src/main/java/Username.java @@ -3,18 +3,18 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("la") +@ObfuscatedName("ly") @Implements("Username") public class Username implements Comparable { - @ObfuscatedName("h") + @ObfuscatedName("v") @Export("name") String name; - @ObfuscatedName("c") + @ObfuscatedName("n") @Export("cleanName") String cleanName; @ObfuscatedSignature( - descriptor = "(Ljava/lang/String;Lnj;)V" + descriptor = "(Ljava/lang/String;Lnc;)V" ) public Username(String var1, LoginType var2) { this.name = var1; // L: 11 @@ -22,129 +22,224 @@ public class Username implements Comparable { if (var1 == null) { // L: 15 var4 = null; // L: 16 } else { - int var5 = 0; // L: 19 + label115: { + int var5 = 0; // L: 19 - int var6; - boolean var7; - char var8; - for (var6 = var1.length(); var5 < var6; ++var5) { // L: 20 23 33 - var8 = var1.charAt(var5); // L: 25 - var7 = var8 == 160 || var8 == ' ' || var8 == '_' || var8 == '-'; // L: 27 - if (!var7) { // L: 29 - break; - } - } - - while (var6 > var5) { // L: 37 - var8 = var1.charAt(var6 - 1); // L: 39 - var7 = var8 == 160 || var8 == ' ' || var8 == '_' || var8 == '-'; // L: 41 - if (!var7) { // L: 43 - break; - } - - --var6; // L: 47 - } - - int var13 = var6 - var5; // L: 49 - if (var13 >= 1 && var13 <= UserComparator5.method2463(var2)) { // L: 50 - StringBuilder var12 = new StringBuilder(var13); // L: 54 - - for (int var9 = var5; var9 < var6; ++var9) { // L: 55 - char var10 = var1.charAt(var9); // L: 56 - if (class310.method5484(var10)) { // L: 57 - char var11 = class5.method68(var10); // L: 58 - if (var11 != 0) { // L: 59 - var12.append(var11); // L: 60 - } + int var6; + boolean var7; + char var8; + for (var6 = var1.length(); var5 < var6; ++var5) { // L: 20 23 33 + var8 = var1.charAt(var5); // L: 25 + var7 = var8 == 160 || var8 == ' ' || var8 == '_' || var8 == '-'; // L: 27 + if (!var7) { // L: 29 + break; } } - if (var12.length() == 0) { // L: 62 - var4 = null; // L: 63 - } else { - var4 = var12.toString(); // L: 66 + while (var6 > var5) { // L: 37 + var8 = var1.charAt(var6 - 1); // L: 39 + var7 = var8 == 160 || var8 == ' ' || var8 == '_' || var8 == '-'; // L: 41 + if (!var7) { // L: 43 + break; + } + + --var6; // L: 47 } - } else { - var4 = null; // L: 51 + + int var14 = var6 - var5; // L: 49 + if (var14 >= 1) { // L: 51 + byte var9; + if (var2 == null) { // L: 55 + var9 = 12; // L: 56 + } else { + switch(var2.field4092) { // L: 59 + case 8: + var9 = 20; + break; + default: + var9 = 12; // L: 64 + } + } + + if (var14 <= var9) { // L: 68 + StringBuilder var13 = new StringBuilder(var14); // L: 73 + + for (int var15 = var5; var15 < var6; ++var15) { // L: 74 + char var10 = var1.charAt(var15); // L: 75 + if (class14.method188(var10)) { // L: 76 + char var11; + switch(var10) { // L: 79 + case ' ': + case '-': + case '_': + case ' ': + var11 = '_'; // L: 106 + break; // L: 107 + case '#': + case '[': + case ']': + var11 = var10; // L: 97 + break; // L: 98 + case 'À': + case 'Á': + case 'Â': + case 'Ã': + case 'Ä': + case 'à': + case 'á': + case 'â': + case 'ã': + case 'ä': + var11 = 'a'; // L: 118 + break; // L: 119 + case 'Ç': + case 'ç': + var11 = 'c'; // L: 126 + break; // L: 127 + case 'È': + case 'É': + case 'Ê': + case 'Ë': + case 'è': + case 'é': + case 'ê': + case 'ë': + var11 = 'e'; // L: 88 + break; + case 'Í': + case 'Î': + case 'Ï': + case 'í': + case 'î': + case 'ï': + var11 = 'i'; // L: 137 + break; // L: 138 + case 'Ñ': + case 'ñ': + var11 = 'n'; // L: 122 + break; // L: 123 + case 'Ò': + case 'Ó': + case 'Ô': + case 'Õ': + case 'Ö': + case 'ò': + case 'ó': + case 'ô': + case 'õ': + case 'ö': + var11 = 'o'; // L: 149 + break; // L: 150 + case 'Ù': + case 'Ú': + case 'Û': + case 'Ü': + case 'ù': + case 'ú': + case 'û': + case 'ü': + var11 = 'u'; // L: 159 + break; + case 'ß': + var11 = 'b'; // L: 129 + break; // L: 130 + case 'ÿ': + case 'Ÿ': + var11 = 'y'; // L: 92 + break; // L: 93 + default: + var11 = Character.toLowerCase(var10); // L: 100 + } + + if (var11 != 0) { // L: 164 + var13.append(var11); // L: 165 + } + } + } + + if (var13.length() == 0) { // L: 167 + var4 = null; // L: 168 + } else { + var4 = var13.toString(); // L: 171 + } + break label115; + } + } + + var4 = null; // L: 70 } } - this.cleanName = var4; // L: 68 - } // L: 69 + this.cleanName = var4; // L: 173 + } // L: 174 - @ObfuscatedName("h") + @ObfuscatedName("v") @ObfuscatedSignature( descriptor = "(I)Ljava/lang/String;", - garbageValue = "391348428" + garbageValue = "2072568808" ) @Export("getName") public String getName() { - return this.name; // L: 72 + return this.name; // L: 177 } - @ObfuscatedName("c") + @ObfuscatedName("n") @ObfuscatedSignature( descriptor = "(B)Z", - garbageValue = "1" + garbageValue = "0" ) @Export("hasCleanName") public boolean hasCleanName() { - return this.cleanName != null; // L: 76 + return this.cleanName != null; // L: 181 } - @ObfuscatedName("o") + @ObfuscatedName("f") @ObfuscatedSignature( - descriptor = "(Lla;B)I", - garbageValue = "-53" + descriptor = "(Lly;I)I", + garbageValue = "831558423" ) @Export("compareToTyped") public int compareToTyped(Username var1) { - if (this.cleanName == null) { // L: 100 - return var1.cleanName == null ? 0 : 1; // L: 101 102 + if (this.cleanName == null) { // L: 205 + return var1.cleanName == null ? 0 : 1; // L: 206 207 } else { - return var1.cleanName == null ? -1 : this.cleanName.compareTo(var1.cleanName); // L: 104 105 + return var1.cleanName == null ? -1 : this.cleanName.compareTo(var1.cleanName); // L: 209 210 } } public boolean equals(Object var1) { - if (var1 instanceof Username) { // L: 80 - Username var2 = (Username)var1; // L: 81 + if (var1 instanceof Username) { // L: 185 + Username var2 = (Username)var1; // L: 186 if (this.cleanName == null) { - return var2.cleanName == null; // L: 82 - } else if (var2.cleanName == null) { // L: 83 + return var2.cleanName == null; // L: 187 + } else if (var2.cleanName == null) { // L: 188 return false; } else { - return this.hashCode() != var2.hashCode() ? false : this.cleanName.equals(var2.cleanName); // L: 84 85 + return this.hashCode() != var2.hashCode() ? false : this.cleanName.equals(var2.cleanName); // L: 189 190 } } else { - return false; // L: 87 + return false; // L: 192 } } public int hashCode() { - return this.cleanName == null ? 0 : this.cleanName.hashCode(); // L: 91 92 + return this.cleanName == null ? 0 : this.cleanName.hashCode(); // L: 196 197 } public String toString() { - return this.getName(); // L: 96 + return this.getName(); // L: 201 } public int compareTo(Object var1) { - return this.compareToTyped((Username)var1); // L: 109 + return this.compareToTyped((Username)var1); // L: 214 } - @ObfuscatedName("q") + @ObfuscatedName("f") @ObfuscatedSignature( - descriptor = "(Ljp;III)Z", - garbageValue = "-1294784382" + descriptor = "(CI)C", + garbageValue = "717003887" ) - public static boolean method5711(AbstractArchive var0, int var1, int var2) { - byte[] var3 = var0.takeFile(var1, var2); // L: 186 - if (var3 == null) { // L: 187 - return false; - } else { - class303.SpriteBuffer_decode(var3); // L: 188 - return true; // L: 189 - } + static char method5877(char var0) { + return var0 != 181 && var0 != 402 ? Character.toTitleCase(var0) : var0; // L: 61 62 } } diff --git a/runescape-client/src/main/java/Usernamed.java b/runescape-client/src/main/java/Usernamed.java index 2fd2407941..dc23e6147d 100644 --- a/runescape-client/src/main/java/Usernamed.java +++ b/runescape-client/src/main/java/Usernamed.java @@ -3,13 +3,13 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("lt") +@ObfuscatedName("lc") @Implements("Usernamed") public interface Usernamed { - @ObfuscatedName("lc") + @ObfuscatedName("ll") @ObfuscatedSignature( - descriptor = "(B)Lla;", - garbageValue = "98" + descriptor = "(I)Lly;", + garbageValue = "-1180229355" ) @Export("username") Username username(); diff --git a/runescape-client/src/main/java/VarbitComposition.java b/runescape-client/src/main/java/VarbitComposition.java index 0463e5bf18..0b240f2ad3 100644 --- a/runescape-client/src/main/java/VarbitComposition.java +++ b/runescape-client/src/main/java/VarbitComposition.java @@ -1,197 +1,143 @@ +import java.util.LinkedHashMap; 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("eu") +@ObfuscatedName("ee") @Implements("VarbitComposition") public class VarbitComposition extends DualNode { - @ObfuscatedName("h") + @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "Ljp;" + descriptor = "Ljv;" ) @Export("VarbitDefinition_archive") public static AbstractArchive VarbitDefinition_archive; - @ObfuscatedName("c") + @ObfuscatedName("n") @ObfuscatedSignature( - descriptor = "Lho;" + descriptor = "Lhz;" ) @Export("VarbitDefinition_cached") public static EvictingDualNodeHashTable VarbitDefinition_cached; - @ObfuscatedName("z") - static final int[] field1711; - @ObfuscatedName("t") + @ObfuscatedName("j") + static final int[] field1702; + @ObfuscatedName("l") + public static short[][] field1708; + @ObfuscatedName("f") @ObfuscatedGetter( - intValue = 2064389097 - ) - static int field1710; - @ObfuscatedName("o") - @ObfuscatedGetter( - intValue = 632538905 + intValue = -2059144841 ) @Export("baseVar") public int baseVar; - @ObfuscatedName("g") + @ObfuscatedName("y") @ObfuscatedGetter( - intValue = 195506189 + intValue = -1506226221 ) @Export("startBit") public int startBit; - @ObfuscatedName("l") + @ObfuscatedName("p") @ObfuscatedGetter( - intValue = 891667147 + intValue = -354172645 ) @Export("endBit") public int endBit; static { VarbitDefinition_cached = new EvictingDualNodeHashTable(64); // L: 11 - field1711 = new int[32]; // L: 15 + field1702 = new int[32]; // L: 15 int var0 = 2; // L: 18 for (int var1 = 0; var1 < 32; ++var1) { // L: 19 - field1711[var1] = var0 - 1; // L: 20 + field1702[var1] = var0 - 1; // L: 20 var0 += var0; // L: 21 } } // L: 23 - @ObfuscatedName("h") + @ObfuscatedName("f") @ObfuscatedSignature( - descriptor = "(Lnk;I)V", - garbageValue = "812293859" + descriptor = "(Lnd;I)V", + garbageValue = "-683331130" ) @Export("decode") public void decode(Buffer var1) { while (true) { - int var2 = var1.readUnsignedByte(); // L: 27 - if (var2 == 0) { // L: 28 - return; // L: 31 + int var2 = var1.readUnsignedByte(); // L: 41 + if (var2 == 0) { // L: 42 + return; // L: 45 } - this.decodeNext(var1, var2); // L: 29 + this.decodeNext(var1, var2); // L: 43 } } - @ObfuscatedName("c") + @ObfuscatedName("y") @ObfuscatedSignature( - descriptor = "(Lnk;IS)V", - garbageValue = "21911" + descriptor = "(Lnd;II)V", + garbageValue = "375304564" ) @Export("decodeNext") void decodeNext(Buffer var1, int var2) { - if (var2 == 1) { // L: 34 - this.baseVar = var1.readUnsignedShort(); // L: 35 - this.startBit = var1.readUnsignedByte(); // L: 36 - this.endBit = var1.readUnsignedByte(); // L: 37 + if (var2 == 1) { // L: 48 + this.baseVar = var1.readUnsignedShort(); // L: 49 + this.startBit = var1.readUnsignedByte(); // L: 50 + this.endBit = var1.readUnsignedByte(); // L: 51 } - } // L: 40 + } // L: 54 - @ObfuscatedName("g") + @ObfuscatedName("e") @ObfuscatedSignature( - descriptor = "(IS)I", - garbageValue = "-15726" + descriptor = "(I)V", + garbageValue = "-1858038859" ) - public static int method2813(int var0) { - return PacketWriter.method2409(ViewportMouse.ViewportMouse_entityTags[var0]); // L: 66 - } + static void method2859() { + if (SoundSystem.loadWorlds()) { // L: 1640 + Login.worldSelectOpen = true; // L: 1641 + Login.worldSelectPage = 0; // L: 1642 + Login.worldSelectPagesCount = 0; // L: 1643 + } - @ObfuscatedName("gz") + } // L: 1645 + + @ObfuscatedName("fj") @ObfuscatedSignature( - descriptor = "(IIIIZS)V", - garbageValue = "-20141" + descriptor = "(ZB)V", + garbageValue = "-21" ) - @Export("setViewportShape") - static final void setViewportShape(int var0, int var1, int var2, int var3, boolean var4) { - if (var2 < 1) { // L: 4597 - var2 = 1; - } - - if (var3 < 1) { // L: 4598 - var3 = 1; - } - - int var5 = var3 - 334; // L: 4599 - int var6; - if (var5 < 0) { // L: 4601 - var6 = Client.field820; - } else if (var5 >= 100) { // L: 4602 - var6 = Client.field872; + static final void method2849(boolean var0) { + if (var0) { // L: 2698 + Client.field676 = Login.field1043 ? class125.field1469 : class125.field1471; // L: 2699 } else { - var6 = (Client.field872 - Client.field820) * var5 / 100 + Client.field820; // L: 4603 - } + LinkedHashMap var1 = ObjectComposition.clientPreferences.parameters; // L: 2702 + String var3 = Login.Login_username; // L: 2704 + int var4 = var3.length(); // L: 2706 + int var5 = 0; // L: 2707 - int var7 = var3 * var6 * 512 / (var2 * 334); // L: 4604 - int var8; - int var9; - short var14; - if (var7 < Client.field877) { // L: 4605 - var14 = Client.field877; // L: 4606 - var6 = var14 * var2 * 334 / (var3 * 512); // L: 4607 - if (var6 > Client.field738) { // L: 4608 - var6 = Client.field738; // L: 4609 - var8 = var3 * var6 * 512 / (var14 * 334); // L: 4610 - var9 = (var2 - var8) / 2; // L: 4611 - if (var4) { // L: 4612 - Rasterizer2D.Rasterizer2D_resetClip(); // L: 4613 - Rasterizer2D.Rasterizer2D_fillRectangle(var0, var1, var9, var3, -16777216); // L: 4614 - Rasterizer2D.Rasterizer2D_fillRectangle(var0 + var2 - var9, var1, var9, var3, -16777216); // L: 4615 - } - - var0 += var9; // L: 4617 - var2 -= var9 * 2; // L: 4618 - } - } else if (var7 > Client.field878) { // L: 4621 - var14 = Client.field878; // L: 4622 - var6 = var14 * var2 * 334 / (var3 * 512); // L: 4623 - if (var6 < Client.field875) { // L: 4624 - var6 = Client.field875; // L: 4625 - var8 = var14 * var2 * 334 / (var6 * 512); // L: 4626 - var9 = (var3 - var8) / 2; // L: 4627 - if (var4) { // L: 4628 - Rasterizer2D.Rasterizer2D_resetClip(); // L: 4629 - Rasterizer2D.Rasterizer2D_fillRectangle(var0, var1, var2, var9, -16777216); // L: 4630 - Rasterizer2D.Rasterizer2D_fillRectangle(var0, var3 + var1 - var9, var2, var9, -16777216); // L: 4631 - } - - var1 += var9; // L: 4633 - var3 -= var9 * 2; // L: 4634 - } - } - - Client.viewportZoom = var3 * var6 / 334; // L: 4637 - if (var2 != Client.viewportWidth || var3 != Client.viewportHeight) { // L: 4638 - int[] var13 = new int[9]; // L: 4640 - - for (var9 = 0; var9 < var13.length; ++var9) { // L: 4641 - int var10 = var9 * 32 + 15 + 128; // L: 4642 - int var11 = class21.method281(var10); // L: 4643 - int var12 = Rasterizer3D.Rasterizer3D_sine[var10]; // L: 4644 - var11 = PlayerComposition.method4640(var11, var3); // L: 4645 - var13[var9] = var12 * var11 >> 16; // L: 4646 + for (int var6 = 0; var6 < var4; ++var6) { // L: 2708 + var5 = (var5 << 5) - var5 + var3.charAt(var6); } - Scene.Scene_buildVisiblityMap(var13, 500, 800, var2 * 334 / var3, 334); // L: 4648 + Client.field676 = var1.containsKey(var5) ? class125.field1470 : class125.field1468; // L: 2711 } - Client.viewportOffsetX = var0; // L: 4651 - Client.viewportOffsetY = var1; // L: 4652 - Client.viewportWidth = var2; // L: 4653 - Client.viewportHeight = var3; // L: 4654 - } // L: 4655 + } // L: 2713 - @ObfuscatedName("ls") + @ObfuscatedName("fh") @ObfuscatedSignature( - descriptor = "([BIB)V", - garbageValue = "7" + descriptor = "(I)V", + garbageValue = "-1518032135" ) - static void method2818(byte[] var0, int var1) { - if (Client.randomDatData == null) { // L: 11714 - Client.randomDatData = new byte[24]; + static final void method2846() { + if (class21.field190) { // L: 3408 + for (int var0 = 0; var0 < Players.Players_count; ++var0) { // L: 3410 + Player var1 = Client.players[Players.Players_indices[var0]]; // L: 3411 + var1.method2147(); // L: 3412 + } + + class21.field190 = false; // L: 3415 } - class306.writeRandomDat(var0, var1, Client.randomDatData, 0, 24); // L: 11715 - } // L: 11716 + } // L: 3417 } diff --git a/runescape-client/src/main/java/VarcInt.java b/runescape-client/src/main/java/VarcInt.java index a563d607db..aabcb24d97 100644 --- a/runescape-client/src/main/java/VarcInt.java +++ b/runescape-client/src/main/java/VarcInt.java @@ -1,30 +1,24 @@ 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("ev") +@ObfuscatedName("ej") @Implements("VarcInt") public class VarcInt extends DualNode { - @ObfuscatedName("h") + @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "Ljp;" + descriptor = "Ljv;" ) @Export("VarcInt_archive") static AbstractArchive VarcInt_archive; - @ObfuscatedName("c") + @ObfuscatedName("n") @ObfuscatedSignature( - descriptor = "Lho;" + descriptor = "Lhz;" ) @Export("VarcInt_cached") static EvictingDualNodeHashTable VarcInt_cached; - @ObfuscatedName("ni") - @ObfuscatedGetter( - intValue = -1768124815 - ) - static int field1576; - @ObfuscatedName("o") + @ObfuscatedName("f") @Export("persist") public boolean persist; @@ -36,187 +30,95 @@ public class VarcInt extends DualNode { this.persist = false; // L: 12 } // L: 14 - @ObfuscatedName("o") + @ObfuscatedName("f") @ObfuscatedSignature( - descriptor = "(Lnk;I)V", - garbageValue = "1372759053" + descriptor = "(Lnd;B)V", + garbageValue = "-17" ) - void method2659(Buffer var1) { + void method2656(Buffer var1) { while (true) { int var2 = var1.readUnsignedByte(); // L: 32 if (var2 == 0) { // L: 33 return; // L: 36 } - this.method2657(var1, var2); // L: 34 + this.method2666(var1, var2); // L: 34 } } - @ObfuscatedName("g") + @ObfuscatedName("y") @ObfuscatedSignature( - descriptor = "(Lnk;IB)V", - garbageValue = "0" + descriptor = "(Lnd;IB)V", + garbageValue = "34" ) - void method2657(Buffer var1, int var2) { - if (var2 == 2) { // L: 39 - this.persist = true; // L: 40 + void method2666(Buffer var1, int var2) { + if (var2 == 2) { + this.persist = true; } - } // L: 43 + } - @ObfuscatedName("o") + @ObfuscatedName("n") @ObfuscatedSignature( - descriptor = "([Lbc;II[I[II)V", - garbageValue = "-2096948369" + descriptor = "(IS)Les;", + garbageValue = "-9783" ) - @Export("sortWorlds") - static void sortWorlds(World[] var0, int var1, int var2, int[] var3, int[] var4) { - if (var1 < var2) { // L: 81 - int var5 = var1 - 1; // L: 82 - int var6 = var2 + 1; // L: 83 - int var7 = (var2 + var1) / 2; // L: 84 - World var8 = var0[var7]; // L: 85 - var0[var7] = var0[var1]; // L: 86 - var0[var1] = var8; // L: 87 + @Export("SpotAnimationDefinition_get") + public static SpotAnimationDefinition SpotAnimationDefinition_get(int var0) { + SpotAnimationDefinition var1 = (SpotAnimationDefinition)SpotAnimationDefinition.SpotAnimationDefinition_cached.get((long)var0); // L: 37 + if (var1 != null) { // L: 38 + return var1; + } else { + byte[] var2 = SpotAnimationDefinition.SpotAnimationDefinition_archive.takeFile(13, var0); // L: 39 + var1 = new SpotAnimationDefinition(); // L: 40 + var1.id = var0; // L: 41 + if (var2 != null) { // L: 42 + var1.decode(new Buffer(var2)); + } - while (var5 < var6) { // L: 88 - boolean var9 = true; // L: 89 + SpotAnimationDefinition.SpotAnimationDefinition_cached.put(var1, (long)var0); // L: 43 + return var1; // L: 44 + } + } - int var10; - int var11; - int var12; - do { - --var6; // L: 91 + @ObfuscatedName("j") + @ObfuscatedSignature( + descriptor = "(I)V", + garbageValue = "1100714076" + ) + public static void method2673() { + if (NetCache.NetCache_socket != null) { // L: 120 + NetCache.NetCache_socket.close(); + } - for (var10 = 0; var10 < 4; ++var10) { // L: 92 - if (var3[var10] == 2) { // L: 95 - var11 = var0[var6].index; // L: 96 - var12 = var8.index; // L: 97 - } else if (var3[var10] == 1) { // L: 99 - var11 = var0[var6].population; // L: 100 - var12 = var8.population; // L: 101 - if (var11 == -1 && var4[var10] == 1) { // L: 102 - var11 = 2001; - } + } // L: 121 - if (var12 == -1 && var4[var10] == 1) { // L: 103 - var12 = 2001; - } - } else if (var3[var10] == 3) { // L: 105 - var11 = var0[var6].isMembersOnly() ? 1 : 0; // L: 106 - var12 = var8.isMembersOnly() ? 1 : 0; // L: 107 - } else { - var11 = var0[var6].id; // L: 110 - var12 = var8.id; // L: 111 - } - - if (var11 != var12) { // L: 113 - if ((var4[var10] != 1 || var11 <= var12) && (var4[var10] != 0 || var11 >= var12)) { // L: 116 117 - var9 = false; // L: 119 - } - break; - } - - if (var10 == 3) { // L: 114 - var9 = false; - } - } - } while(var9); - - var9 = true; // L: 124 - - do { - ++var5; // L: 126 - - for (var10 = 0; var10 < 4; ++var10) { // L: 127 - if (var3[var10] == 2) { // L: 130 - var11 = var0[var5].index; // L: 131 - var12 = var8.index; // L: 132 - } else if (var3[var10] == 1) { // L: 134 - var11 = var0[var5].population; // L: 135 - var12 = var8.population; // L: 136 - if (var11 == -1 && var4[var10] == 1) { // L: 137 - var11 = 2001; - } - - if (var12 == -1 && var4[var10] == 1) { // L: 138 - var12 = 2001; - } - } else if (var3[var10] == 3) { // L: 140 - var11 = var0[var5].isMembersOnly() ? 1 : 0; // L: 141 - var12 = var8.isMembersOnly() ? 1 : 0; // L: 142 - } else { - var11 = var0[var5].id; // L: 145 - var12 = var8.id; // L: 146 - } - - if (var12 != var11) { // L: 148 - if ((var4[var10] != 1 || var11 >= var12) && (var4[var10] != 0 || var11 <= var12)) { // L: 151 152 - var9 = false; // L: 154 - } - break; - } - - if (var10 == 3) { // L: 149 - var9 = false; - } - } - } while(var9); - - if (var5 < var6) { // L: 159 - World var13 = var0[var5]; // L: 160 - var0[var5] = var0[var6]; // L: 161 - var0[var6] = var13; // L: 162 + @ObfuscatedName("jc") + @ObfuscatedSignature( + descriptor = "(Lio;IIB)V", + garbageValue = "8" + ) + @Export("clickWidget") + static final void clickWidget(Widget var0, int var1, int var2) { + if (Client.clickedWidget == null && !Client.isMenuOpen) { // L: 10694 + if (var0 != null && ClanSettings.method125(var0) != null) { // L: 10695 + Client.clickedWidget = var0; // L: 10696 + Client.clickedWidgetParent = ClanSettings.method125(var0); // L: 10697 + Client.widgetClickX = var1; // L: 10698 + Client.widgetClickY = var2; // L: 10699 + Actor.widgetDragDuration = 0; // L: 10700 + Client.isDraggingWidget = false; // L: 10701 + int var3 = MilliClock.method2588(); // L: 10702 + if (var3 != -1) { // L: 10703 + ReflectionCheck.tempMenuAction = new MenuAction(); // L: 10704 + ReflectionCheck.tempMenuAction.param0 = Client.menuArguments1[var3]; // L: 10705 + ReflectionCheck.tempMenuAction.param1 = Client.menuArguments2[var3]; // L: 10706 + ReflectionCheck.tempMenuAction.opcode = Client.menuOpcodes[var3]; // L: 10707 + ReflectionCheck.tempMenuAction.identifier = Client.menuIdentifiers[var3]; // L: 10708 + ReflectionCheck.tempMenuAction.action = Client.menuActions[var3]; // L: 10709 } - } - sortWorlds(var0, var1, var6, var3, var4); // L: 165 - sortWorlds(var0, var6 + 1, var2, var3, var4); // L: 166 + } } - - } // L: 168 - - @ObfuscatedName("kx") - @ObfuscatedSignature( - descriptor = "(Liv;I)V", - garbageValue = "685963148" - ) - static final void method2656(Widget var0) { - int var1 = var0.contentType; // L: 11272 - if (var1 == 324) { // L: 11273 - if (Client.field630 == -1) { // L: 11274 - Client.field630 = var0.spriteId2; // L: 11275 - Client.field631 = var0.spriteId; // L: 11276 - } - - if (Client.playerAppearance.isFemale) { // L: 11278 - var0.spriteId2 = Client.field630; - } else { - var0.spriteId2 = Client.field631; // L: 11279 - } - - } else if (var1 == 325) { // L: 11282 - if (Client.field630 == -1) { // L: 11283 - Client.field630 = var0.spriteId2; // L: 11284 - Client.field631 = var0.spriteId; // L: 11285 - } - - if (Client.playerAppearance.isFemale) { // L: 11287 - var0.spriteId2 = Client.field631; - } else { - var0.spriteId2 = Client.field630; // L: 11288 - } - - } else if (var1 == 327) { // L: 11291 - var0.modelAngleX = 150; // L: 11292 - var0.modelAngleY = (int)(Math.sin((double)Client.cycle / 40.0D) * 256.0D) & 2047; // L: 11293 - var0.modelType = 5; // L: 11294 - var0.modelId = 0; // L: 11295 - } else if (var1 == 328) { // L: 11298 - var0.modelAngleX = 150; // L: 11299 - var0.modelAngleY = (int)(Math.sin((double)Client.cycle / 40.0D) * 256.0D) & 2047; // L: 11300 - var0.modelType = 5; // L: 11301 - var0.modelId = 1; // L: 11302 - } - } // L: 11280 11289 11296 11303 11305 + } // L: 10711 } diff --git a/runescape-client/src/main/java/Varcs.java b/runescape-client/src/main/java/Varcs.java index 031387402f..2a2e29c311 100644 --- a/runescape-client/src/main/java/Varcs.java +++ b/runescape-client/src/main/java/Varcs.java @@ -9,72 +9,66 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("dp") +@ObfuscatedName("dc") @Implements("Varcs") public class Varcs { - @ObfuscatedName("hd") - @ObfuscatedSignature( - descriptor = "[Low;" - ) - @Export("headIconPrayerSprites") - static SpritePixels[] headIconPrayerSprites; - @ObfuscatedName("o") + @ObfuscatedName("f") @Export("intsPersistence") boolean[] intsPersistence; - @ObfuscatedName("g") + @ObfuscatedName("y") @Export("map") Map map; - @ObfuscatedName("l") + @ObfuscatedName("p") @Export("strings") String[] strings; - @ObfuscatedName("z") + @ObfuscatedName("j") @Export("unwrittenChanges") boolean unwrittenChanges; - @ObfuscatedName("t") + @ObfuscatedName("r") @ObfuscatedGetter( - longValue = -3093933850404302195L + longValue = 8820744470819498935L ) - long field1364; + long field1385; Varcs() { - this.unwrittenChanges = false; // L: 22 - int var1 = KitDefinition.archive2.getGroupFileCount(19); // L: 26 - this.map = new HashMap(); // L: 27 - this.intsPersistence = new boolean[var1]; // L: 28 + this.unwrittenChanges = false; + int var1 = class8.archive2.getGroupFileCount(19); + this.map = new HashMap(); + this.intsPersistence = new boolean[var1]; int var2; for (var2 = 0; var2 < var1; ++var2) { // L: 29 - VarcInt var3 = class13.method210(var2); // L: 30 + VarcInt var3 = WorldMapSectionType.method3591(var2); // L: 30 this.intsPersistence[var2] = var3.persist; // L: 31 } var2 = 0; // L: 33 - if (KitDefinition.archive2.method4842(15)) { // L: 34 - var2 = KitDefinition.archive2.getGroupFileCount(15); // L: 35 + if (class8.archive2.method4887(15)) { // L: 34 + var2 = class8.archive2.getGroupFileCount(15); // L: 35 } this.strings = new String[var2]; // L: 37 this.read(); // L: 38 } // L: 39 - @ObfuscatedName("h") + @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "(III)V", - garbageValue = "-1963266648" + descriptor = "(IIB)V", + garbageValue = "36" ) @Export("setInt") void setInt(int var1, int var2) { - this.map.put(var1, var2); - if (this.intsPersistence[var1]) { + this.map.put(var1, var2); // L: 42 + if (this.intsPersistence[var1]) { // L: 43 this.unwrittenChanges = true; } } // L: 44 - @ObfuscatedName("c") + @ObfuscatedName("n") @ObfuscatedSignature( descriptor = "(II)I", - garbageValue = "1125709356" + garbageValue = "-271438249" ) @Export("getInt") int getInt(int var1) { @@ -82,20 +76,20 @@ public class Varcs { return var2 instanceof Integer ? (Integer)var2 : -1; // L: 48 49 51 } - @ObfuscatedName("o") + @ObfuscatedName("f") @ObfuscatedSignature( descriptor = "(ILjava/lang/String;I)V", - garbageValue = "-725128375" + garbageValue = "1989718678" ) @Export("setString") void setString(int var1, String var2) { this.map.put(var1, var2); // L: 55 } // L: 56 - @ObfuscatedName("g") + @ObfuscatedName("y") @ObfuscatedSignature( descriptor = "(II)Ljava/lang/String;", - garbageValue = "-484415575" + garbageValue = "-1757644423" ) @Export("getString") String getString(int var1) { @@ -103,30 +97,30 @@ public class Varcs { return var2 instanceof String ? (String)var2 : ""; // L: 60 61 63 } - @ObfuscatedName("l") + @ObfuscatedName("p") @ObfuscatedSignature( descriptor = "(ILjava/lang/String;S)V", - garbageValue = "950" + garbageValue = "29886" ) @Export("setStringOld") void setStringOld(int var1, String var2) { this.strings[var1] = var2; // L: 67 } // L: 68 - @ObfuscatedName("z") + @ObfuscatedName("j") @ObfuscatedSignature( - descriptor = "(II)Ljava/lang/String;", - garbageValue = "2112696076" + descriptor = "(IS)Ljava/lang/String;", + garbageValue = "-8380" ) @Export("getStringOld") String getStringOld(int var1) { return this.strings[var1]; // L: 71 } - @ObfuscatedName("t") + @ObfuscatedName("r") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "-362954670" + garbageValue = "-1787706587" ) @Export("clearTransient") void clearTransient() { @@ -143,20 +137,20 @@ public class Varcs { } // L: 83 - @ObfuscatedName("v") + @ObfuscatedName("b") @ObfuscatedSignature( - descriptor = "(ZB)Lng;", - garbageValue = "0" + descriptor = "(ZI)Lnm;", + garbageValue = "-1288257534" ) @Export("getPreferencesFile") AccessFile getPreferencesFile(boolean var1) { - return Buddy.getPreferencesFile("2", NetSocket.field1492.name, var1); // L: 86 + return class82.getPreferencesFile("2", SoundSystem.field461.name, var1); // L: 86 } - @ObfuscatedName("b") + @ObfuscatedName("d") @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "293338844" + descriptor = "(B)V", + garbageValue = "-2" ) @Export("write") void write() { @@ -175,244 +169,180 @@ public class Varcs { var2 += 3; // L: 100 if (var7 instanceof Integer) { // L: 101 var2 += 4; - } else if (var7 instanceof String) { // L: 102 - var2 += class4.stringCp1252NullTerminatedByteSize((String)var7); + } else if (var7 instanceof String) { + var2 += Tiles.stringCp1252NullTerminatedByteSize((String)var7); // L: 102 } ++var3; // L: 103 } } - Buffer var28 = new Buffer(var2); // L: 107 - var28.writeByte(2); // L: 108 - var28.writeShort(var3); // L: 109 - Iterator var29 = this.map.entrySet().iterator(); // L: 110 + Buffer var23 = new Buffer(var2); // L: 107 + var23.writeByte(2); // L: 108 + var23.writeShort(var3); // L: 109 + Iterator var24 = this.map.entrySet().iterator(); // L: 110 - label146: - while (true) { - Entry var16; - int var17; - do { - if (!var29.hasNext()) { - var1.write(var28.array, 0, var28.offset); // L: 143 - break label146; - } - - var16 = (Entry)var29.next(); // L: 111 - var17 = (Integer)var16.getKey(); // L: 113 - } while(!this.intsPersistence[var17]); // L: 114 - - var28.writeShort(var17); // L: 115 - Object var8 = var16.getValue(); // L: 116 - Class var10 = var8.getClass(); // L: 118 - class374[] var11 = class374.method6356(); // L: 121 - int var12 = 0; - - class374 var9; - while (true) { - if (var12 >= var11.length) { - var9 = null; // L: 132 - break; - } - - class374 var13 = var11[var12]; // L: 123 - if (var10 == var13.field4134) { // L: 125 - var9 = var13; // L: 126 - break; // L: 127 - } - - ++var12; // L: 122 + while (var24.hasNext()) { + Entry var12 = (Entry)var24.next(); // L: 111 + int var13 = (Integer)var12.getKey(); // L: 113 + if (this.intsPersistence[var13]) { // L: 114 + var23.writeShort(var13); // L: 115 + Object var8 = var12.getValue(); // L: 116 + class374 var9 = class374.method6479(var8.getClass()); // L: 117 + var23.writeByte(var9.field4135); // L: 118 + class374.method6475(var8, var23); // L: 119 } - - var28.writeByte(var9.field4138); // L: 135 - class370 var18 = class374.method6350(var8.getClass()); // L: 137 - var18.vmethod6366(var8, var28); // L: 138 } - } catch (Exception var26) { // L: 145 + + var1.write(var23.array, 0, var23.offset); // L: 123 + } catch (Exception var21) { // L: 125 } finally { try { - var1.close(); // L: 148 - } catch (Exception var25) { // L: 150 + var1.close(); // L: 128 + } catch (Exception var20) { // L: 130 } } - this.unwrittenChanges = false; // L: 152 - this.field1364 = Archive.currentTimeMillis(); // L: 153 - } // L: 154 + this.unwrittenChanges = false; // L: 132 + this.field1385 = ObjectComposition.currentTimeMillis(); // L: 133 + } // L: 134 - @ObfuscatedName("q") + @ObfuscatedName("s") @ObfuscatedSignature( descriptor = "(B)V", - garbageValue = "-115" + garbageValue = "54" ) @Export("read") void read() { - AccessFile var1 = this.getPreferencesFile(false); // L: 157 + AccessFile var1 = this.getPreferencesFile(false); // L: 137 - try { - byte[] var2 = new byte[(int)var1.length()]; // L: 159 - - int var4; - for (int var3 = 0; var3 < var2.length; var3 += var4) { // L: 160 161 164 - var4 = var1.read(var2, var3, var2.length - var3); // L: 162 - if (var4 == -1) { // L: 163 - throw new EOFException(); - } - } - - Buffer var14 = new Buffer(var2); // L: 166 - if (var14.array.length - var14.offset < 1) { // L: 167 - return; - } - - int var15 = var14.readUnsignedByte(); // L: 168 - if (var15 < 0 || var15 > 2) { // L: 169 - return; // L: 203 - } - - int var7; - int var8; - int var9; - int var16; - if (var15 >= 2) { // L: 170 - var16 = var14.readUnsignedShort(); // L: 171 - - for (var7 = 0; var7 < var16; ++var7) { // L: 172 - var8 = var14.readUnsignedShort(); // L: 173 - var9 = var14.readUnsignedByte(); // L: 174 - class374 var10 = (class374)UserComparator4.findEnumerated(class374.method6356(), var9); // L: 175 - Object var11 = var10.method6351(var14); // L: 176 - if (this.intsPersistence[var8]) { // L: 177 - this.map.put(var8, var11); // L: 178 - } - } - } else { - var16 = var14.readUnsignedShort(); // L: 183 - - for (var7 = 0; var7 < var16; ++var7) { // L: 184 - var8 = var14.readUnsignedShort(); // L: 185 - var9 = var14.readInt(); // L: 186 - if (this.intsPersistence[var8]) { // L: 187 - this.map.put(var8, var9); // L: 188 - } - } - - var7 = var14.readUnsignedShort(); // L: 191 - - for (var8 = 0; var8 < var7; ++var8) { // L: 192 - var14.readUnsignedShort(); // L: 193 - var14.readStringCp1252NullTerminated(); // L: 194 - } - } - } catch (Exception var25) { // L: 198 - } finally { + label212: { try { - var1.close(); // L: 201 - } catch (Exception var24) { + byte[] var2 = new byte[(int)var1.length()]; // L: 139 + + int var4; + for (int var3 = 0; var3 < var2.length; var3 += var4) { // L: 140 141 144 + var4 = var1.read(var2, var3, var2.length - var3); // L: 142 + if (var4 == -1) { // L: 143 + throw new EOFException(); + } + } + + Buffer var14 = new Buffer(var2); // L: 146 + if (var14.array.length - var14.offset < 1) { // L: 147 + return; + } + + int var15 = var14.readUnsignedByte(); // L: 148 + if (var15 >= 0 && var15 <= 2) { // L: 149 + int var7; + int var8; + int var9; + int var16; + if (var15 >= 2) { // L: 150 + var16 = var14.readUnsignedShort(); // L: 151 + var7 = 0; + + while (true) { + if (var7 >= var16) { + break label212; + } + + var8 = var14.readUnsignedShort(); // L: 153 + var9 = var14.readUnsignedByte(); // L: 154 + class374 var10 = (class374)Messages.findEnumerated(class374.method6476(), var9); // L: 155 + Object var11 = var10.method6480(var14); // L: 156 + if (this.intsPersistence[var8]) { // L: 157 + this.map.put(var8, var11); // L: 158 + } + + ++var7; // L: 152 + } + } else { + var16 = var14.readUnsignedShort(); // L: 163 + + for (var7 = 0; var7 < var16; ++var7) { // L: 164 + var8 = var14.readUnsignedShort(); // L: 165 + var9 = var14.readInt(); // L: 166 + if (this.intsPersistence[var8]) { // L: 167 + this.map.put(var8, var9); // L: 168 + } + } + + var7 = var14.readUnsignedShort(); // L: 171 + var8 = 0; + + while (true) { + if (var8 >= var7) { + break label212; + } + + var14.readUnsignedShort(); // L: 173 + var14.readStringCp1252NullTerminated(); // L: 174 + ++var8; // L: 172 + } + } + } + } catch (Exception var25) { // L: 178 + break label212; + } finally { + try { + var1.close(); // L: 181 + } catch (Exception var24) { + } + } + return; // L: 183 } - this.unwrittenChanges = false; // L: 205 - } // L: 206 + this.unwrittenChanges = false; // L: 185 + } // L: 186 - @ObfuscatedName("i") + @ObfuscatedName("u") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "-1105689647" + garbageValue = "-1350770877" ) @Export("tryWrite") void tryWrite() { - if (this.unwrittenChanges && this.field1364 < Archive.currentTimeMillis() - 60000L) { // L: 209 - this.write(); // L: 210 + if (this.unwrittenChanges && this.field1385 < ObjectComposition.currentTimeMillis() - 60000L) { // L: 189 + this.write(); // L: 190 } - } // L: 212 - - @ObfuscatedName("x") - @ObfuscatedSignature( - descriptor = "(B)Z", - garbageValue = "14" - ) - @Export("hasUnwrittenChanges") - boolean hasUnwrittenChanges() { - return this.unwrittenChanges; // L: 215 - } - - @ObfuscatedName("o") - @ObfuscatedSignature( - descriptor = "(Lmo;ILjava/lang/String;I)Ljava/lang/String;", - garbageValue = "77620903" - ) - static String method2326(IterableNodeHashTable var0, int var1, String var2) { - if (var0 == null) { // L: 40 - return var2; - } else { - ObjectNode var3 = (ObjectNode)var0.get((long)var1); // L: 41 - return var3 == null ? var2 : (String)var3.obj; // L: 42 43 - } - } + } // L: 192 @ObfuscatedName("l") @ObfuscatedSignature( - descriptor = "(IB)Z", - garbageValue = "-45" + descriptor = "(I)Z", + garbageValue = "-250797388" ) - public static boolean method2329(int var0) { - return (var0 >> 30 & 1) != 0; // L: 25 + @Export("hasUnwrittenChanges") + boolean hasUnwrittenChanges() { + return this.unwrittenChanges; // L: 195 } - @ObfuscatedName("hk") + @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "(III)V", - garbageValue = "-380939793" + descriptor = "(II)Leh;", + garbageValue = "-884874334" ) - @Export("updateItemPile") - static final void updateItemPile(int var0, int var1) { - NodeDeque var2 = Client.groundItems[ParamComposition.Client_plane][var0][var1]; // L: 7532 - if (var2 == null) { // L: 7533 - class5.scene.removeGroundItemPile(ParamComposition.Client_plane, var0, var1); // L: 7534 + @Export("getParamDefinition") + public static ParamComposition getParamDefinition(int var0) { + ParamComposition var1 = (ParamComposition)ParamComposition.ParamDefinition_cached.get((long)var0); // L: 21 + if (var1 != null) { // L: 22 + return var1; } else { - long var3 = -99999999L; // L: 7537 - TileItem var5 = null; // L: 7538 - - TileItem var6; - for (var6 = (TileItem)var2.last(); var6 != null; var6 = (TileItem)var2.previous()) { // L: 7539 7540 7548 - ItemComposition var7 = Strings.ItemDefinition_get(var6.id); // L: 7541 - long var11 = (long)var7.price; // L: 7542 - if (var7.isStackable == 1) { // L: 7543 - var11 *= (long)(var6.quantity + 1); - } - - if (var11 > var3) { // L: 7544 - var3 = var11; // L: 7545 - var5 = var6; // L: 7546 - } + byte[] var2 = ParamComposition.ParamDefinition_archive.takeFile(11, var0); // L: 23 + var1 = new ParamComposition(); // L: 24 + if (var2 != null) { // L: 25 + var1.decode(new Buffer(var2)); } - if (var5 == null) { // L: 7550 - class5.scene.removeGroundItemPile(ParamComposition.Client_plane, var0, var1); // L: 7551 - } else { - var2.addLast(var5); // L: 7554 - TileItem var13 = null; // L: 7555 - TileItem var8 = null; // L: 7556 - - for (var6 = (TileItem)var2.last(); var6 != null; var6 = (TileItem)var2.previous()) { // L: 7557 7558 7563 - if (var5.id != var6.id) { // L: 7559 - if (var13 == null) { // L: 7560 - var13 = var6; - } - - if (var13.id != var6.id && var8 == null) { // L: 7561 - var8 = var6; - } - } - } - - long var9 = class17.calculateTag(var0, var1, 3, false, 0); // L: 7565 - class5.scene.newGroundItemPile(ParamComposition.Client_plane, var0, var1, SceneTilePaint.getTileHeight(var0 * 128 + 64, var1 * 128 + 64, ParamComposition.Client_plane), var5, var9, var13, var8); // L: 7566 - } + var1.postDecode(); // L: 26 + ParamComposition.ParamDefinition_cached.put(var1, (long)var0); // L: 27 + return var1; // L: 28 } - } // L: 7535 7552 7567 + } } diff --git a/runescape-client/src/main/java/VarpDefinition.java b/runescape-client/src/main/java/VarpDefinition.java index fe69c9db4f..6d7189003d 100644 --- a/runescape-client/src/main/java/VarpDefinition.java +++ b/runescape-client/src/main/java/VarpDefinition.java @@ -3,33 +3,37 @@ 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("ed") +@ObfuscatedName("ex") @Implements("VarpDefinition") public class VarpDefinition extends DualNode { - @ObfuscatedName("h") + @ObfuscatedName("rr") + @ObfuscatedGetter( + intValue = 634754105 + ) + static int field1544; + @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "Ljp;" + descriptor = "Ljv;" ) @Export("VarpDefinition_archive") - public static AbstractArchive VarpDefinition_archive; - @ObfuscatedName("o") + static AbstractArchive VarpDefinition_archive; + @ObfuscatedName("n") + @ObfuscatedGetter( + intValue = -1782450907 + ) + @Export("VarpDefinition_fileCount") + public static int VarpDefinition_fileCount; + @ObfuscatedName("f") @ObfuscatedSignature( - descriptor = "Lho;" + descriptor = "Lhz;" ) @Export("VarpDefinition_cached") - static EvictingDualNodeHashTable VarpDefinition_cached; - @ObfuscatedName("i") - @Export("musicTrackBoolean") - static boolean musicTrackBoolean; - @ObfuscatedName("gv") + public static EvictingDualNodeHashTable VarpDefinition_cached; + @ObfuscatedName("y") @ObfuscatedGetter( - intValue = 325641645 - ) - static int field1542; - @ObfuscatedName("g") - @ObfuscatedGetter( - intValue = 914989933 + intValue = 812709151 ) @Export("type") public int type; @@ -42,33 +46,68 @@ public class VarpDefinition extends DualNode { this.type = 0; // L: 13 } // L: 15 - @ObfuscatedName("c") + @ObfuscatedName("f") @ObfuscatedSignature( - descriptor = "(Lnk;B)V", - garbageValue = "-66" + descriptor = "(Lnd;I)V", + garbageValue = "1856210017" ) @Export("decode") void decode(Buffer var1) { while (true) { - int var2 = var1.readUnsignedByte(); // L: 29 - if (var2 == 0) { // L: 30 - return; // L: 33 + int var2 = var1.readUnsignedByte(); // L: 34 + if (var2 == 0) { // L: 35 + return; // L: 38 } - this.decodeNext(var1, var2); // L: 31 + this.decodeNext(var1, var2); // L: 36 } } - @ObfuscatedName("o") + @ObfuscatedName("y") @ObfuscatedSignature( - descriptor = "(Lnk;II)V", - garbageValue = "1008966979" + descriptor = "(Lnd;II)V", + garbageValue = "1230881703" ) @Export("decodeNext") void decodeNext(Buffer var1, int var2) { - if (var2 == 5) { // L: 36 + if (var2 == 5) { // L: 41 this.type = var1.readUnsignedShort(); } - } // L: 38 + } // L: 43 + + @ObfuscatedName("p") + public static int method2630(long var0) { + return (int)(var0 >>> 0 & 127L); // L: 64 + } + + @ObfuscatedName("k") + @ObfuscatedSignature( + descriptor = "(ILcf;ZI)I", + garbageValue = "-2015232474" + ) + static int method2629(int var0, Script var1, boolean var2) { + Widget var3 = Frames.getWidget(Interpreter.Interpreter_intStack[--class44.Interpreter_intStackSize]); // L: 1252 + if (var0 == ScriptOpcodes.IF_GETX) { // L: 1253 + Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = var3.x; // L: 1254 + return 1; // L: 1255 + } else if (var0 == ScriptOpcodes.IF_GETY) { // L: 1257 + Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = var3.y; // L: 1258 + return 1; // L: 1259 + } else if (var0 == ScriptOpcodes.IF_GETWIDTH) { // L: 1261 + Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = var3.width; // L: 1262 + return 1; // L: 1263 + } else if (var0 == ScriptOpcodes.IF_GETHEIGHT) { // L: 1265 + Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = var3.height; // L: 1266 + return 1; // L: 1267 + } else if (var0 == ScriptOpcodes.IF_GETHIDE) { // L: 1269 + Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = var3.isHidden ? 1 : 0; // L: 1270 + return 1; // L: 1271 + } else if (var0 == ScriptOpcodes.IF_GETLAYER) { // L: 1273 + Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = var3.parentId; // L: 1274 + return 1; // L: 1275 + } else { + return 2; // L: 1277 + } + } } diff --git a/runescape-client/src/main/java/Varps.java b/runescape-client/src/main/java/Varps.java index 83e6ee0726..01849690c9 100644 --- a/runescape-client/src/main/java/Varps.java +++ b/runescape-client/src/main/java/Varps.java @@ -1,30 +1,30 @@ -import java.io.IOException; -import java.net.Socket; +import java.util.Iterator; import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ij") +@ObfuscatedName("ik") @Implements("Varps") public class Varps { - @ObfuscatedName("h") + @ObfuscatedName("v") @Export("Varps_masks") static int[] Varps_masks; - @ObfuscatedName("c") + @ObfuscatedName("n") @Export("Varps_temp") public static int[] Varps_temp; - @ObfuscatedName("o") + @ObfuscatedName("f") @Export("Varps_main") public static int[] Varps_main; - @ObfuscatedName("al") - static String field2923; + @ObfuscatedName("bd") + @Export("otp") + static String otp; static { Varps_masks = new int[32]; // L: 6 int var0 = 2; // L: 9 - for (int var1 = 0; var1 < 32; ++var1) { + for (int var1 = 0; var1 < 32; ++var1) { // L: 10 Varps_masks[var1] = var0 - 1; // L: 11 var0 += var0; // L: 12 } @@ -33,12 +33,27 @@ public class Varps { Varps_main = new int[4000]; // L: 17 } - @ObfuscatedName("n") + @ObfuscatedName("kt") @ObfuscatedSignature( - descriptor = "(Ljava/net/Socket;IIB)Llc;", - garbageValue = "0" + descriptor = "(B)V", + garbageValue = "-1" ) - public static AbstractSocket method4585(Socket var0, int var1, int var2) throws IOException { - return new BufferedNetSocket(var0, var1, var2); // L: 10 - } + static final void method4647() { + for (int var0 = 0; var0 < Players.Players_count; ++var0) { // L: 11244 + Player var1 = Client.players[Players.Players_indices[var0]]; // L: 11245 + var1.clearIsFriend(); // L: 11246 + } + + Iterator var2 = Messages.Messages_hashTable.iterator(); // L: 11249 + + while (var2.hasNext()) { + Message var3 = (Message)var2.next(); // L: 11250 + var3.clearIsFromFriend(); // L: 11252 + } + + if (WorldMapRegion.friendsChat != null) { // L: 11256 + WorldMapRegion.friendsChat.clearFriends(); // L: 11257 + } + + } // L: 11259 } diff --git a/runescape-client/src/main/java/VertexNormal.java b/runescape-client/src/main/java/VertexNormal.java index 2b30e518ec..5dbdf646bb 100644 --- a/runescape-client/src/main/java/VertexNormal.java +++ b/runescape-client/src/main/java/VertexNormal.java @@ -4,30 +4,42 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("gq") +@ObfuscatedName("gc") @Implements("VertexNormal") public class VertexNormal { - @ObfuscatedName("h") + @ObfuscatedName("l") + @ObfuscatedSignature( + descriptor = "Ljv;" + ) + @Export("Widget_fontsArchive") + public static AbstractArchive Widget_fontsArchive; + @ObfuscatedName("gg") @ObfuscatedGetter( - intValue = 617912879 + intValue = 697161691 + ) + @Export("baseX") + static int baseX; + @ObfuscatedName("v") + @ObfuscatedGetter( + intValue = -573742035 ) @Export("x") int x; - @ObfuscatedName("o") + @ObfuscatedName("n") @ObfuscatedGetter( - intValue = 88457761 + intValue = -501649501 ) @Export("y") int y; - @ObfuscatedName("g") + @ObfuscatedName("f") @ObfuscatedGetter( - intValue = 1378992651 + intValue = 256687101 ) @Export("z") int z; - @ObfuscatedName("l") + @ObfuscatedName("y") @ObfuscatedGetter( - intValue = 1412306783 + intValue = 1984775097 ) @Export("magnitude") int magnitude; @@ -36,21 +48,22 @@ public class VertexNormal { } // L: 9 @ObfuscatedSignature( - descriptor = "(Lgq;)V" + descriptor = "(Lgc;)V" ) VertexNormal(VertexNormal var1) { this.x = var1.x; // L: 12 this.y = var1.y; // L: 13 - this.z = var1.z; + this.z = var1.z; // L: 14 this.magnitude = var1.magnitude; } // L: 16 - @ObfuscatedName("h") + @ObfuscatedName("y") @ObfuscatedSignature( - descriptor = "(Lix;I)V", - garbageValue = "-2141628231" + descriptor = "(I)[Lon;", + garbageValue = "-1929062245" ) - public static void method4219(Huffman var0) { - class377.huffman = var0; // L: 14 - } // L: 15 + @Export("FillMode_values") + public static FillMode[] FillMode_values() { + return new FillMode[]{FillMode.field4233, FillMode.SOLID, FillMode.field4232}; // L: 15 + } } diff --git a/runescape-client/src/main/java/VerticalAlignment.java b/runescape-client/src/main/java/VerticalAlignment.java index 495bd73ff1..1e475a5645 100644 --- a/runescape-client/src/main/java/VerticalAlignment.java +++ b/runescape-client/src/main/java/VerticalAlignment.java @@ -4,69 +4,73 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ex") +@ObfuscatedName("em") @Implements("VerticalAlignment") public enum VerticalAlignment implements Enumerated { - @ObfuscatedName("h") + @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "Lex;" + descriptor = "Lem;" ) - field1676(1, 0), - @ObfuscatedName("c") + field1672(0, 0), + @ObfuscatedName("n") @ObfuscatedSignature( - descriptor = "Lex;" + descriptor = "Lem;" ) @Export("VerticalAlignment_centered") - VerticalAlignment_centered(0, 1), - @ObfuscatedName("o") + VerticalAlignment_centered(1, 1), + @ObfuscatedName("f") @ObfuscatedSignature( - descriptor = "Lex;" + descriptor = "Lem;" ) - field1675(2, 2); + field1670(2, 2); - @ObfuscatedName("z") + @ObfuscatedName("y") @ObfuscatedGetter( - intValue = 1077695001 - ) - static int field1680; - @ObfuscatedName("g") - @ObfuscatedGetter( - intValue = 715110919 + intValue = -1918765839 ) @Export("value") public final int value; - @ObfuscatedName("l") + @ObfuscatedName("p") @ObfuscatedGetter( - intValue = -1292564375 + intValue = 76672001 ) @Export("id") final int id; VerticalAlignment(int var3, int var4) { - this.value = var3; // L: 14 - this.id = var4; // L: 15 - } // L: 16 + this.value = var3; // L: 18 + this.id = var4; // L: 19 + } // L: 20 - @ObfuscatedName("h") + @ObfuscatedName("v") @ObfuscatedSignature( descriptor = "(I)I", - garbageValue = "-708237537" + garbageValue = "-907662946" ) @Export("rsOrdinal") public int rsOrdinal() { - return this.id; // L: 19 + return this.id; } - @ObfuscatedName("kr") + @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "(Liv;I)V", - garbageValue = "-1728613752" + descriptor = "(Ljv;III)[Lop;", + garbageValue = "-178534371" ) - @Export("invalidateWidget") - static void invalidateWidget(Widget var0) { - if (var0.cycle == Client.field824) { // L: 11077 - Client.field825[var0.rootIndex] = true; // L: 11078 - } + public static IndexedSprite[] method2799(AbstractArchive var0, int var1, int var2) { + return !class339.method6015(var0, var1, var2) ? null : class24.method262(); // L: 23 24 + } - } // L: 11080 + @ObfuscatedName("g") + @ObfuscatedSignature( + descriptor = "(Ljava/lang/String;II)V", + garbageValue = "1083454679" + ) + static final void method2796(String var0, int var1) { + PacketBufferNode var2 = class21.getPacketBufferNode(ClientPacket.field2621, Client.packetWriter.isaacCipher); // L: 222 + var2.packetBuffer.writeByte(Tiles.stringCp1252NullTerminatedByteSize(var0) + 1); // L: 223 + var2.packetBuffer.writeStringCp1252NullTerminated(var0); // L: 224 + var2.packetBuffer.method6584(var1); // L: 225 + Client.packetWriter.addNode(var2); // L: 226 + } // L: 227 } diff --git a/runescape-client/src/main/java/ViewportMouse.java b/runescape-client/src/main/java/ViewportMouse.java index 2b560d6cad..6eb0727d47 100644 --- a/runescape-client/src/main/java/ViewportMouse.java +++ b/runescape-client/src/main/java/ViewportMouse.java @@ -4,51 +4,57 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("gm") +@ObfuscatedName("gy") @Implements("ViewportMouse") public class ViewportMouse { - @ObfuscatedName("h") + @ObfuscatedName("v") @Export("ViewportMouse_isInViewport") - public static boolean ViewportMouse_isInViewport; - @ObfuscatedName("c") + static boolean ViewportMouse_isInViewport; + @ObfuscatedName("n") @ObfuscatedGetter( - intValue = 1614350995 + intValue = 836373803 ) @Export("ViewportMouse_x") static int ViewportMouse_x; - @ObfuscatedName("o") + @ObfuscatedName("f") @ObfuscatedGetter( - intValue = 1512195797 + intValue = 1131754581 ) @Export("ViewportMouse_y") static int ViewportMouse_y; - @ObfuscatedName("g") + @ObfuscatedName("y") @Export("ViewportMouse_false0") static boolean ViewportMouse_false0; - @ObfuscatedName("l") + @ObfuscatedName("p") @ObfuscatedGetter( - intValue = -260034093 + intValue = -1563417631 ) - static int field2486; - @ObfuscatedName("b") - @ObfuscatedGetter( - intValue = 824939567 - ) - static int field2482; - @ObfuscatedName("q") - @ObfuscatedGetter( - intValue = 946591513 - ) - static int field2488; + static int field2492; @ObfuscatedName("r") @ObfuscatedGetter( - intValue = -1495299577 + intValue = 1940869639 + ) + static int field2497; + @ObfuscatedName("b") + @ObfuscatedGetter( + intValue = -1999867305 + ) + static int field2496; + @ObfuscatedName("c") + @ObfuscatedGetter( + intValue = 253416581 ) @Export("ViewportMouse_entityCount") - public static int ViewportMouse_entityCount; - @ObfuscatedName("p") + static int ViewportMouse_entityCount; + @ObfuscatedName("e") @Export("ViewportMouse_entityTags") public static long[] ViewportMouse_entityTags; + @ObfuscatedName("os") + @ObfuscatedSignature( + descriptor = "Lnu;" + ) + @Export("HitSplatDefinition_cachedSprites") + static class369 HitSplatDefinition_cachedSprites; static { ViewportMouse_isInViewport = false; // L: 4 @@ -58,78 +64,4 @@ public class ViewportMouse { ViewportMouse_entityCount = 0; // L: 17 ViewportMouse_entityTags = new long[1000]; // L: 18 } - - @ObfuscatedName("h") - @ObfuscatedSignature( - descriptor = "(IB)Leq;", - garbageValue = "110" - ) - @Export("getEnum") - public static EnumComposition getEnum(int var0) { - EnumComposition var1 = (EnumComposition)EnumComposition.EnumDefinition_cached.get((long)var0); // L: 25 - if (var1 != null) { // L: 26 - return var1; - } else { - byte[] var2 = EnumComposition.EnumDefinition_archive.takeFile(8, var0); // L: 27 - var1 = new EnumComposition(); // L: 28 - if (var2 != null) { // L: 29 - var1.decode(new Buffer(var2)); - } - - EnumComposition.EnumDefinition_cached.put(var1, (long)var0); // L: 30 - return var1; // L: 31 - } - } - - @ObfuscatedName("l") - @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "-1270821311" - ) - public static void method4193() { - class232.midiPcmStream.clear(); // L: 55 - class232.musicPlayerStatus = 1; // L: 56 - JagexCache.musicTrackArchive = null; // L: 57 - } // L: 58 - - @ObfuscatedName("io") - @ObfuscatedSignature( - descriptor = "(B)V", - garbageValue = "104" - ) - static final void method4194() { - boolean var0 = false; // L: 9050 - - while (!var0) { // L: 9051 - var0 = true; // L: 9052 - - for (int var1 = 0; var1 < Client.menuOptionsCount - 1; ++var1) { // L: 9053 - if (Client.menuOpcodes[var1] < 1000 && Client.menuOpcodes[var1 + 1] > 1000) { // L: 9054 - String var2 = Client.menuTargets[var1]; // L: 9055 - Client.menuTargets[var1] = Client.menuTargets[var1 + 1]; // L: 9056 - Client.menuTargets[var1 + 1] = var2; // L: 9057 - String var3 = Client.menuActions[var1]; // L: 9058 - Client.menuActions[var1] = Client.menuActions[var1 + 1]; // L: 9059 - Client.menuActions[var1 + 1] = var3; // L: 9060 - int var4 = Client.menuOpcodes[var1]; // L: 9061 - Client.menuOpcodes[var1] = Client.menuOpcodes[var1 + 1]; // L: 9062 - Client.menuOpcodes[var1 + 1] = var4; // L: 9063 - var4 = Client.menuArguments1[var1]; // L: 9064 - Client.menuArguments1[var1] = Client.menuArguments1[var1 + 1]; // L: 9065 - Client.menuArguments1[var1 + 1] = var4; // L: 9066 - var4 = Client.menuArguments2[var1]; // L: 9067 - Client.menuArguments2[var1] = Client.menuArguments2[var1 + 1]; // L: 9068 - Client.menuArguments2[var1 + 1] = var4; // L: 9069 - var4 = Client.menuIdentifiers[var1]; // L: 9070 - Client.menuIdentifiers[var1] = Client.menuIdentifiers[var1 + 1]; // L: 9071 - Client.menuIdentifiers[var1 + 1] = var4; // L: 9072 - boolean var5 = Client.menuShiftClick[var1]; // L: 9073 - Client.menuShiftClick[var1] = Client.menuShiftClick[var1 + 1]; // L: 9074 - Client.menuShiftClick[var1 + 1] = var5; // L: 9075 - var0 = false; // L: 9076 - } - } - } - - } // L: 9080 } diff --git a/runescape-client/src/main/java/VorbisCodebook.java b/runescape-client/src/main/java/VorbisCodebook.java index d6f43c9783..e59f67ae80 100644 --- a/runescape-client/src/main/java/VorbisCodebook.java +++ b/runescape-client/src/main/java/VorbisCodebook.java @@ -2,23 +2,23 @@ import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; -@ObfuscatedName("br") +@ObfuscatedName("bs") @Implements("VorbisCodebook") public class VorbisCodebook { - @ObfuscatedName("h") + @ObfuscatedName("v") @Export("dimensions") int dimensions; - @ObfuscatedName("c") + @ObfuscatedName("n") @Export("entries") int entries; - @ObfuscatedName("o") + @ObfuscatedName("f") @Export("lengthMap") int[] lengthMap; - @ObfuscatedName("g") - int[] field475; - @ObfuscatedName("l") - float[][] field479; - @ObfuscatedName("z") + @ObfuscatedName("y") + int[] field504; + @ObfuscatedName("p") + float[][] field505; + @ObfuscatedName("j") @Export("keys") int[] keys; @@ -35,7 +35,7 @@ public class VorbisCodebook { var2 = 0; // L: 47 for (var3 = VorbisSample.readBits(5) + 1; var2 < this.entries; ++var3) { // L: 48 49 52 - int var4 = VorbisSample.readBits(class10.iLog(this.entries - var2)); // L: 50 + int var4 = VorbisSample.readBits(CollisionMap.iLog(this.entries - var2)); // L: 50 for (var5 = 0; var5 < var4; ++var5) { // L: 51 this.lengthMap[var2++] = var3; @@ -53,7 +53,7 @@ public class VorbisCodebook { } } - this.method1049(); // L: 62 + this.method1017(); // L: 62 var2 = VorbisSample.readBits(4); // L: 63 if (var2 > 0) { // L: 64 float var15 = VorbisSample.float32Unpack(VorbisSample.readBits(32)); // L: 65 @@ -67,14 +67,14 @@ public class VorbisCodebook { var7 = this.entries * this.dimensions; // L: 71 } - this.field475 = new int[var7]; // L: 72 + this.field504 = new int[var7]; // L: 72 int var8; for (var8 = 0; var8 < var7; ++var8) { // L: 73 - this.field475[var8] = VorbisSample.readBits(var5); + this.field504[var8] = VorbisSample.readBits(var5); } - this.field479 = new float[this.entries][this.dimensions]; // L: 74 + this.field505 = new float[this.entries][this.dimensions]; // L: 74 float var9; int var10; int var11; @@ -85,8 +85,8 @@ public class VorbisCodebook { for (var11 = 0; var11 < this.dimensions; ++var11) { // L: 79 int var12 = var8 / var10 % var7; // L: 80 - float var13 = (float)this.field475[var12] * var16 + var15 + var9; // L: 81 - this.field479[var8][var11] = var13; // L: 82 + float var13 = (float)this.field504[var12] * var16 + var15 + var9; // L: 81 + this.field505[var8][var11] = var13; // L: 82 if (var6) { // L: 83 var9 = var13; } @@ -100,8 +100,8 @@ public class VorbisCodebook { var10 = var8 * this.dimensions; // L: 91 for (var11 = 0; var11 < this.dimensions; ++var11) { // L: 92 - float var17 = (float)this.field475[var10] * var16 + var15 + var9; // L: 93 - this.field479[var8][var11] = var17; // L: 94 + float var17 = (float)this.field504[var10] * var16 + var15 + var9; // L: 93 + this.field505[var8][var11] = var17; // L: 94 if (var6) { // L: 95 var9 = var17; } @@ -114,8 +114,8 @@ public class VorbisCodebook { } // L: 101 - @ObfuscatedName("c") - void method1049() { + @ObfuscatedName("n") + void method1017() { int[] var1 = new int[this.entries]; // L: 104 int[] var2 = new int[33]; // L: 106 @@ -208,8 +208,8 @@ public class VorbisCodebook { } // L: 167 - @ObfuscatedName("o") - int method1048() { + @ObfuscatedName("f") + int method1014() { int var1; for (var1 = 0; this.keys[var1] >= 0; var1 = VorbisSample.readBit() != 0 ? this.keys[var1] : var1 + 1) { // L: 170 171 } @@ -217,12 +217,12 @@ public class VorbisCodebook { return ~this.keys[var1]; // L: 172 } - @ObfuscatedName("g") - float[] method1051() { - return this.field479[this.method1048()]; // L: 176 + @ObfuscatedName("y") + float[] method1015() { + return this.field505[this.method1014()]; // L: 176 } - @ObfuscatedName("h") + @ObfuscatedName("v") @Export("mapType1QuantValues") static int mapType1QuantValues(int var0, int var1) { int var2 = (int)Math.pow((double)var0, 1.0D / (double)var1) + 1; // L: 16 @@ -242,7 +242,7 @@ public class VorbisCodebook { int var3; if (var5 == 1) { // L: 28 - var3 = var4 * var6; // L: 29 + var3 = var6 * var4; // L: 29 } else { var3 = var6; // L: 32 } diff --git a/runescape-client/src/main/java/VorbisFloor.java b/runescape-client/src/main/java/VorbisFloor.java index 8eea0fe481..5e303e916c 100644 --- a/runescape-client/src/main/java/VorbisFloor.java +++ b/runescape-client/src/main/java/VorbisFloor.java @@ -5,40 +5,40 @@ import net.runelite.mapping.ObfuscatedName; @ObfuscatedName("an") @Implements("VorbisFloor") public class VorbisFloor { - @ObfuscatedName("h") - static final int[] field387; - @ObfuscatedName("c") + @ObfuscatedName("v") + static final int[] field403; + @ObfuscatedName("n") @Export("VorbisFloor_decibelStatics") static final float[] VorbisFloor_decibelStatics; - @ObfuscatedName("q") - static int[] field389; - @ObfuscatedName("i") - static int[] field384; - @ObfuscatedName("x") - static boolean[] field395; - @ObfuscatedName("o") - int[] field394; - @ObfuscatedName("g") + @ObfuscatedName("s") + static int[] field410; + @ObfuscatedName("u") + static int[] field413; + @ObfuscatedName("l") + static boolean[] field412; + @ObfuscatedName("f") + int[] field405; + @ObfuscatedName("y") @Export("multiplier") int multiplier; - @ObfuscatedName("l") + @ObfuscatedName("p") @Export("partitionClassList") int[] partitionClassList; - @ObfuscatedName("z") + @ObfuscatedName("j") @Export("classDimensions") int[] classDimensions; - @ObfuscatedName("t") + @ObfuscatedName("r") @Export("classSubClasses") int[] classSubClasses; - @ObfuscatedName("v") + @ObfuscatedName("b") @Export("classMasterbooks") int[] classMasterbooks; - @ObfuscatedName("b") + @ObfuscatedName("d") @Export("subclassBooks") int[][] subclassBooks; static { - field387 = new int[]{256, 128, 86, 64}; // L: 8 + field403 = new int[]{256, 128, 86, 64}; // L: 8 VorbisFloor_decibelStatics = new float[]{1.0649863E-7F, 1.1341951E-7F, 1.2079015E-7F, 1.2863978E-7F, 1.369995E-7F, 1.459025E-7F, 1.5538409E-7F, 1.6548181E-7F, 1.7623574E-7F, 1.8768856E-7F, 1.998856E-7F, 2.128753E-7F, 2.2670913E-7F, 2.4144197E-7F, 2.5713223E-7F, 2.7384212E-7F, 2.9163792E-7F, 3.1059022E-7F, 3.307741E-7F, 3.5226967E-7F, 3.7516213E-7F, 3.995423E-7F, 4.255068E-7F, 4.5315863E-7F, 4.8260745E-7F, 5.1397E-7F, 5.4737063E-7F, 5.829419E-7F, 6.208247E-7F, 6.611694E-7F, 7.041359E-7F, 7.4989464E-7F, 7.98627E-7F, 8.505263E-7F, 9.057983E-7F, 9.646621E-7F, 1.0273513E-6F, 1.0941144E-6F, 1.1652161E-6F, 1.2409384E-6F, 1.3215816E-6F, 1.4074654E-6F, 1.4989305E-6F, 1.5963394E-6F, 1.7000785E-6F, 1.8105592E-6F, 1.9282195E-6F, 2.053526E-6F, 2.1869757E-6F, 2.3290977E-6F, 2.4804558E-6F, 2.6416496E-6F, 2.813319E-6F, 2.9961443E-6F, 3.1908505E-6F, 3.39821E-6F, 3.619045E-6F, 3.8542307E-6F, 4.1047006E-6F, 4.371447E-6F, 4.6555283E-6F, 4.958071E-6F, 5.280274E-6F, 5.623416E-6F, 5.988857E-6F, 6.3780467E-6F, 6.7925284E-6F, 7.2339453E-6F, 7.704048E-6F, 8.2047E-6F, 8.737888E-6F, 9.305725E-6F, 9.910464E-6F, 1.0554501E-5F, 1.1240392E-5F, 1.1970856E-5F, 1.2748789E-5F, 1.3577278E-5F, 1.4459606E-5F, 1.5399271E-5F, 1.6400005E-5F, 1.7465769E-5F, 1.8600793E-5F, 1.9809577E-5F, 2.1096914E-5F, 2.2467912E-5F, 2.3928002E-5F, 2.5482977E-5F, 2.7139005E-5F, 2.890265E-5F, 3.078091E-5F, 3.2781227E-5F, 3.4911533E-5F, 3.718028E-5F, 3.9596467E-5F, 4.2169668E-5F, 4.491009E-5F, 4.7828602E-5F, 5.0936775E-5F, 5.424693E-5F, 5.7772202E-5F, 6.152657E-5F, 6.552491E-5F, 6.9783084E-5F, 7.4317984E-5F, 7.914758E-5F, 8.429104E-5F, 8.976875E-5F, 9.560242E-5F, 1.0181521E-4F, 1.0843174E-4F, 1.1547824E-4F, 1.2298267E-4F, 1.3097477E-4F, 1.3948625E-4F, 1.4855085E-4F, 1.5820454E-4F, 1.6848555E-4F, 1.7943469E-4F, 1.9109536E-4F, 2.0351382E-4F, 2.167393E-4F, 2.3082423E-4F, 2.4582449E-4F, 2.6179955E-4F, 2.7881275E-4F, 2.9693157E-4F, 3.1622787E-4F, 3.3677815E-4F, 3.5866388E-4F, 3.8197188E-4F, 4.0679457E-4F, 4.3323037E-4F, 4.613841E-4F, 4.913675E-4F, 5.2329927E-4F, 5.573062E-4F, 5.935231E-4F, 6.320936E-4F, 6.731706E-4F, 7.16917E-4F, 7.635063E-4F, 8.1312325E-4F, 8.6596457E-4F, 9.2223985E-4F, 9.821722E-4F, 0.0010459992F, 0.0011139743F, 0.0011863665F, 0.0012634633F, 0.0013455702F, 0.0014330129F, 0.0015261382F, 0.0016253153F, 0.0017309374F, 0.0018434235F, 0.0019632196F, 0.0020908006F, 0.0022266726F, 0.0023713743F, 0.0025254795F, 0.0026895993F, 0.0028643848F, 0.0030505287F, 0.003248769F, 0.0034598925F, 0.0036847359F, 0.0039241905F, 0.0041792067F, 0.004450795F, 0.004740033F, 0.005048067F, 0.0053761187F, 0.005725489F, 0.0060975635F, 0.0064938175F, 0.0069158226F, 0.0073652514F, 0.007843887F, 0.008353627F, 0.008896492F, 0.009474637F, 0.010090352F, 0.01074608F, 0.011444421F, 0.012188144F, 0.012980198F, 0.013823725F, 0.014722068F, 0.015678791F, 0.016697686F, 0.017782796F, 0.018938422F, 0.020169148F, 0.021479854F, 0.022875736F, 0.02436233F, 0.025945531F, 0.027631618F, 0.029427277F, 0.031339627F, 0.03337625F, 0.035545226F, 0.037855156F, 0.0403152F, 0.042935107F, 0.045725275F, 0.048696756F, 0.05186135F, 0.05523159F, 0.05882085F, 0.062643364F, 0.06671428F, 0.07104975F, 0.075666964F, 0.08058423F, 0.08582105F, 0.09139818F, 0.097337745F, 0.1036633F, 0.11039993F, 0.11757434F, 0.12521498F, 0.13335215F, 0.14201812F, 0.15124726F, 0.16107617F, 0.1715438F, 0.18269168F, 0.19456401F, 0.20720787F, 0.22067343F, 0.23501402F, 0.25028655F, 0.26655158F, 0.28387362F, 0.3023213F, 0.32196787F, 0.34289113F, 0.36517414F, 0.3889052F, 0.41417846F, 0.44109413F, 0.4697589F, 0.50028646F, 0.53279793F, 0.5674221F, 0.6042964F, 0.64356697F, 0.6853896F, 0.72993004F, 0.777365F, 0.8278826F, 0.88168305F, 0.9389798F, 1.0F}; // L: 9 } @@ -92,30 +92,30 @@ public class VorbisFloor { var5 += this.classDimensions[this.partitionClassList[var6]]; } - this.field394 = new int[var5]; // L: 137 - this.field394[0] = 0; // L: 138 - this.field394[1] = 1 << var4; // L: 139 + this.field405 = new int[var5]; // L: 137 + this.field405[0] = 0; // L: 138 + this.field405[1] = 1 << var4; // L: 139 var5 = 2; // L: 140 for (var6 = 0; var6 < var2; ++var6) { // L: 141 var7 = this.partitionClassList[var6]; // L: 142 for (int var8 = 0; var8 < this.classDimensions[var7]; ++var8) { // L: 143 - this.field394[var5++] = VorbisSample.readBits(var4); + this.field405[var5++] = VorbisSample.readBits(var4); } } - if (field389 == null || field389.length < var5) { // L: 145 - field389 = new int[var5]; // L: 146 - field384 = new int[var5]; // L: 147 - field395 = new boolean[var5]; // L: 148 + if (field410 == null || field410.length < var5) { // L: 145 + field410 = new int[var5]; // L: 146 + field413 = new int[var5]; // L: 147 + field412 = new boolean[var5]; // L: 148 } } } // L: 150 - @ObfuscatedName("o") - int method782(int var1, int var2, int var3, int var4, int var5) { + @ObfuscatedName("f") + int method706(int var1, int var2, int var3, int var4, int var5) { int var6 = var4 - var2; // L: 50 int var7 = var3 - var1; // L: 51 int var8 = var6 < 0 ? -var6 : var6; // L: 52 @@ -124,8 +124,8 @@ public class VorbisFloor { return var6 < 0 ? var2 - var10 : var10 + var2; // L: 55 } - @ObfuscatedName("g") - void method780(int var1, int var2, int var3, int var4, float[] var5, int var6) { + @ObfuscatedName("y") + void method719(int var1, int var2, int var3, int var4, float[] var5, int var6) { int var7 = var4 - var2; // L: 59 int var8 = var3 - var1; // L: 60 int var9 = var7 < 0 ? -var7 : var7; // L: 61 @@ -153,54 +153,54 @@ public class VorbisFloor { } // L: 80 - @ObfuscatedName("l") + @ObfuscatedName("p") @Export("VarbisFloor_sort") void VarbisFloor_sort(int var1, int var2) { if (var1 < var2) { // L: 83 int var3 = var1; // L: 84 - int var4 = field389[var1]; // L: 85 - int var5 = field384[var1]; // L: 86 - boolean var6 = field395[var1]; // L: 87 + int var4 = field410[var1]; // L: 85 + int var5 = field413[var1]; // L: 86 + boolean var6 = field412[var1]; // L: 87 for (int var7 = var1 + 1; var7 <= var2; ++var7) { // L: 88 - int var8 = field389[var7]; // L: 89 + int var8 = field410[var7]; // L: 89 if (var8 < var4) { // L: 90 - field389[var3] = var8; // L: 91 - field384[var3] = field384[var7]; // L: 92 - field395[var3] = field395[var7]; // L: 93 + field410[var3] = var8; // L: 91 + field413[var3] = field413[var7]; // L: 92 + field412[var3] = field412[var7]; // L: 93 ++var3; // L: 94 - field389[var7] = field389[var3]; // L: 95 - field384[var7] = field384[var3]; // L: 96 - field395[var7] = field395[var3]; // L: 97 + field410[var7] = field410[var3]; // L: 95 + field413[var7] = field413[var3]; // L: 96 + field412[var7] = field412[var3]; // L: 97 } } - field389[var3] = var4; // L: 100 - field384[var3] = var5; // L: 101 - field395[var3] = var6; // L: 102 + field410[var3] = var4; // L: 100 + field413[var3] = var5; // L: 101 + field412[var3] = var6; // L: 102 this.VarbisFloor_sort(var1, var3 - 1); // L: 103 this.VarbisFloor_sort(var3 + 1, var2); // L: 104 } } // L: 105 - @ObfuscatedName("z") + @ObfuscatedName("j") @Export("readSubmapFloor") boolean readSubmapFloor() { boolean var1 = VorbisSample.readBit() != 0; // L: 153 if (!var1) { // L: 154 return false; } else { - int var2 = this.field394.length; // L: 155 + int var2 = this.field405.length; // L: 155 int var3; for (var3 = 0; var3 < var2; ++var3) { // L: 156 - field389[var3] = this.field394[var3]; + field410[var3] = this.field405[var3]; } - var3 = field387[this.multiplier - 1]; // L: 157 - int var4 = class10.iLog(var3 - 1); // L: 158 - field384[0] = VorbisSample.readBits(var4); // L: 159 - field384[1] = VorbisSample.readBits(var4); // L: 160 + var3 = field403[this.multiplier - 1]; // L: 157 + int var4 = CollisionMap.iLog(var3 - 1); // L: 158 + field413[0] = VorbisSample.readBits(var4); // L: 159 + field413[1] = VorbisSample.readBits(var4); // L: 160 int var5 = 2; // L: 161 for (int var6 = 0; var6 < this.partitionClassList.length; ++var6) { // L: 162 @@ -210,13 +210,13 @@ public class VorbisFloor { int var10 = (1 << var9) - 1; // L: 166 int var11 = 0; // L: 167 if (var9 > 0) { // L: 168 - var11 = VorbisSample.VorbisSample_codebooks[this.classMasterbooks[var7]].method1048(); + var11 = VorbisSample.VorbisSample_codebooks[this.classMasterbooks[var7]].method1014(); } for (int var12 = 0; var12 < var8; ++var12) { // L: 169 int var13 = this.subclassBooks[var7][var11 & var10]; // L: 170 var11 >>>= var9; // L: 171 - field384[var5++] = var13 >= 0 ? VorbisSample.VorbisSample_codebooks[var13].method1048() : 0; // L: 172 + field413[var5++] = var13 >= 0 ? VorbisSample.VorbisSample_codebooks[var13].method1014() : 0; // L: 172 } } @@ -224,12 +224,12 @@ public class VorbisFloor { } } - @ObfuscatedName("t") - void method779(float[] var1, int var2) { - int var3 = this.field394.length; // L: 179 - int var4 = field387[this.multiplier - 1]; // L: 180 - boolean[] var5 = field395; // L: 181 - field395[1] = true; // L: 182 + @ObfuscatedName("r") + void method712(float[] var1, int var2) { + int var3 = this.field405.length; // L: 179 + int var4 = field403[this.multiplier - 1]; // L: 180 + boolean[] var5 = field412; // L: 181 + field412[1] = true; // L: 182 var5[0] = true; // L: 183 int var6; @@ -238,37 +238,37 @@ public class VorbisFloor { int var9; int var10; for (var6 = 2; var6 < var3; ++var6) { // L: 184 - var7 = method773(field389, var6); // L: 185 - var8 = method774(field389, var6); // L: 186 - var9 = this.method782(field389[var7], field384[var7], field389[var8], field384[var8], field389[var6]); // L: 187 - var10 = field384[var6]; // L: 188 + var7 = method705(field410, var6); // L: 185 + var8 = method721(field410, var6); // L: 186 + var9 = this.method706(field410[var7], field413[var7], field410[var8], field413[var8], field410[var6]); // L: 187 + var10 = field413[var6]; // L: 188 int var11 = var4 - var9; // L: 189 int var13 = (var11 < var9 ? var11 : var9) << 1; // L: 191 if (var10 != 0) { // L: 192 - boolean[] var14 = field395; // L: 193 - field395[var8] = true; // L: 195 + boolean[] var14 = field412; // L: 193 + field412[var8] = true; // L: 195 var14[var7] = true; // L: 196 - field395[var6] = true; // L: 197 + field412[var6] = true; // L: 197 if (var10 >= var13) { // L: 198 - field384[var6] = var11 > var9 ? var9 + (var10 - var9) : var11 + (var9 - var10) - 1; // L: 199 + field413[var6] = var11 > var9 ? var9 + (var10 - var9) : var11 + (var9 - var10) - 1; // L: 199 } else { - field384[var6] = (var10 & 1) != 0 ? var9 - (var10 + 1) / 2 : var10 / 2 + var9; // L: 202 + field413[var6] = (var10 & 1) != 0 ? var9 - (var10 + 1) / 2 : var10 / 2 + var9; // L: 202 } } else { - field395[var6] = false; // L: 206 - field384[var6] = var9; // L: 207 + field412[var6] = false; // L: 206 + field413[var6] = var9; // L: 207 } } this.VarbisFloor_sort(0, var3 - 1); // L: 210 var6 = 0; // L: 211 - var7 = field384[0] * this.multiplier; // L: 212 + var7 = field413[0] * this.multiplier; // L: 212 for (var8 = 1; var8 < var3; ++var8) { // L: 213 - if (field395[var8]) { // L: 214 - var9 = field389[var8]; // L: 215 - var10 = field384[var8] * this.multiplier; // L: 216 - this.method780(var6, var7, var9, var10, var1, var2); // L: 217 + if (field412[var8]) { // L: 214 + var9 = field410[var8]; // L: 215 + var10 = field413[var8] * this.multiplier; // L: 216 + this.method719(var6, var7, var9, var10, var1, var2); // L: 217 if (var9 >= var2) { // L: 218 return; } @@ -286,8 +286,8 @@ public class VorbisFloor { } // L: 225 - @ObfuscatedName("h") - static int method773(int[] var0, int var1) { + @ObfuscatedName("v") + static int method705(int[] var0, int var1) { int var2 = var0[var1]; // L: 22 int var3 = -1; // L: 23 int var4 = Integer.MIN_VALUE; // L: 24 @@ -303,8 +303,8 @@ public class VorbisFloor { return var3; // L: 32 } - @ObfuscatedName("c") - static int method774(int[] var0, int var1) { + @ObfuscatedName("n") + static int method721(int[] var0, int var1) { int var2 = var0[var1]; // L: 36 int var3 = -1; // L: 37 int var4 = Integer.MAX_VALUE; // L: 38 diff --git a/runescape-client/src/main/java/VorbisMapping.java b/runescape-client/src/main/java/VorbisMapping.java index 6118e6d7ee..0d5b6881b0 100644 --- a/runescape-client/src/main/java/VorbisMapping.java +++ b/runescape-client/src/main/java/VorbisMapping.java @@ -2,19 +2,19 @@ import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; -@ObfuscatedName("by") +@ObfuscatedName("bz") @Implements("VorbisMapping") public class VorbisMapping { - @ObfuscatedName("h") + @ObfuscatedName("v") @Export("submaps") int submaps; - @ObfuscatedName("c") + @ObfuscatedName("n") @Export("mappingMux") int mappingMux; - @ObfuscatedName("o") + @ObfuscatedName("f") @Export("submapFloor") int[] submapFloor; - @ObfuscatedName("g") + @ObfuscatedName("y") @Export("submapResidue") int[] submapResidue; diff --git a/runescape-client/src/main/java/VorbisResidue.java b/runescape-client/src/main/java/VorbisResidue.java index fa459d94d3..22d4f920fb 100644 --- a/runescape-client/src/main/java/VorbisResidue.java +++ b/runescape-client/src/main/java/VorbisResidue.java @@ -2,28 +2,28 @@ import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; -@ObfuscatedName("bb") +@ObfuscatedName("bl") @Implements("VorbisResidue") public class VorbisResidue { - @ObfuscatedName("h") + @ObfuscatedName("v") @Export("residueType") int residueType; - @ObfuscatedName("c") + @ObfuscatedName("n") @Export("begin") int begin; - @ObfuscatedName("o") + @ObfuscatedName("f") @Export("end") int end; - @ObfuscatedName("g") + @ObfuscatedName("y") @Export("partitionSize") int partitionSize; - @ObfuscatedName("l") + @ObfuscatedName("p") @Export("classifications") int classifications; - @ObfuscatedName("z") + @ObfuscatedName("j") @Export("classbook") int classbook; - @ObfuscatedName("t") + @ObfuscatedName("r") @Export("cascade") int[] cascade; @@ -56,8 +56,8 @@ public class VorbisResidue { } // L: 31 - @ObfuscatedName("h") - void method877(float[] var1, int var2, boolean var3) { + @ObfuscatedName("v") + void method833(float[] var1, int var2, boolean var3) { int var4; for (var4 = 0; var4 < var2; ++var4) { // L: 34 var1[var4] = 0.0F; @@ -76,7 +76,7 @@ public class VorbisResidue { int var10; int var11; if (var8 == 0) { // L: 43 - var10 = VorbisSample.VorbisSample_codebooks[this.classbook].method1048(); // L: 45 + var10 = VorbisSample.VorbisSample_codebooks[this.classbook].method1014(); // L: 45 for (var11 = var4 - 1; var11 >= 0; --var11) { // L: 46 if (var9 + var11 < var6) { // L: 47 @@ -98,7 +98,7 @@ public class VorbisResidue { var15 = this.partitionSize / var14.dimensions; // L: 60 for (int var19 = 0; var19 < var15; ++var19) { // L: 61 - float[] var20 = var14.method1051(); // L: 62 + float[] var20 = var14.method1015(); // L: 62 for (int var18 = 0; var18 < var14.dimensions; ++var18) { // L: 63 var1[var13 + var19 + var18 * var15] += var20[var18]; @@ -108,7 +108,7 @@ public class VorbisResidue { var15 = 0; // L: 67 while (var15 < this.partitionSize) { // L: 68 - float[] var16 = var14.method1051(); // L: 69 + float[] var16 = var14.method1015(); // L: 69 for (int var17 = 0; var17 < var14.dimensions; ++var17) { // L: 70 var1[var13 + var15] += var16[var17]; // L: 71 diff --git a/runescape-client/src/main/java/VorbisSample.java b/runescape-client/src/main/java/VorbisSample.java index e793b9a753..7bfb291476 100644 --- a/runescape-client/src/main/java/VorbisSample.java +++ b/runescape-client/src/main/java/VorbisSample.java @@ -3,115 +3,115 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("bm") +@ObfuscatedName("br") @Implements("VorbisSample") public class VorbisSample extends Node { - @ObfuscatedName("t") + @ObfuscatedName("r") @Export("VorbisSample_bytes") static byte[] VorbisSample_bytes; - @ObfuscatedName("v") + @ObfuscatedName("b") @Export("VorbisSample_byteOffset") static int VorbisSample_byteOffset; - @ObfuscatedName("b") + @ObfuscatedName("d") @Export("VorbisSample_bitOffset") static int VorbisSample_bitOffset; - @ObfuscatedName("q") + @ObfuscatedName("s") @Export("VorbisSample_blockSize0") static int VorbisSample_blockSize0; - @ObfuscatedName("i") + @ObfuscatedName("u") @Export("VorbisSample_blockSize1") static int VorbisSample_blockSize1; - @ObfuscatedName("x") + @ObfuscatedName("l") @ObfuscatedSignature( - descriptor = "[Lbr;" + descriptor = "[Lbs;" ) @Export("VorbisSample_codebooks") static VorbisCodebook[] VorbisSample_codebooks; - @ObfuscatedName("k") + @ObfuscatedName("o") @ObfuscatedSignature( descriptor = "[Lan;" ) @Export("VorbisSample_floors") static VorbisFloor[] VorbisSample_floors; - @ObfuscatedName("r") + @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "[Lbb;" + descriptor = "[Lbl;" ) @Export("VorbisSample_residues") static VorbisResidue[] VorbisSample_residues; - @ObfuscatedName("p") + @ObfuscatedName("e") @ObfuscatedSignature( - descriptor = "[Lby;" + descriptor = "[Lbz;" ) @Export("VorbisSample_mappings") static VorbisMapping[] VorbisSample_mappings; - @ObfuscatedName("a") + @ObfuscatedName("g") @Export("VorbisSample_blockFlags") static boolean[] VorbisSample_blockFlags; - @ObfuscatedName("e") + @ObfuscatedName("a") @Export("VorbisSample_mapping") static int[] VorbisSample_mapping; - @ObfuscatedName("d") - static boolean field502; - @ObfuscatedName("s") - static float[] field481; - @ObfuscatedName("y") - static float[] field496; - @ObfuscatedName("w") - static float[] field505; - @ObfuscatedName("n") - static float[] field508; - @ObfuscatedName("ag") - static float[] field507; - @ObfuscatedName("ae") - static float[] field489; - @ObfuscatedName("ao") - static float[] field509; - @ObfuscatedName("aj") - static int[] field510; - @ObfuscatedName("aw") - static int[] field511; + @ObfuscatedName("k") + static boolean field526; + @ObfuscatedName("t") + static float[] field529; @ObfuscatedName("h") - byte[][] field487; - @ObfuscatedName("c") + static float[] field530; + @ObfuscatedName("q") + static float[] field531; + @ObfuscatedName("i") + static float[] field519; + @ObfuscatedName("ae") + static float[] field533; + @ObfuscatedName("ap") + static float[] field514; + @ObfuscatedName("ab") + static float[] field535; + @ObfuscatedName("al") + static int[] field536; + @ObfuscatedName("ad") + static int[] field537; + @ObfuscatedName("v") + byte[][] field534; + @ObfuscatedName("n") @Export("sampleRate") int sampleRate; - @ObfuscatedName("o") + @ObfuscatedName("f") @Export("sampleCount") int sampleCount; - @ObfuscatedName("g") + @ObfuscatedName("y") @Export("start") int start; - @ObfuscatedName("l") + @ObfuscatedName("p") @Export("end") int end; - @ObfuscatedName("z") - boolean field486; - @ObfuscatedName("u") - float[] field499; - @ObfuscatedName("m") - int field500; @ObfuscatedName("j") - int field494; - @ObfuscatedName("f") - boolean field484; - @ObfuscatedName("at") + boolean field512; + @ObfuscatedName("m") + float[] field525; + @ObfuscatedName("x") + int field524; + @ObfuscatedName("z") + int field517; + @ObfuscatedName("w") + boolean field528; + @ObfuscatedName("ai") @Export("samples") byte[] samples; - @ObfuscatedName("av") - int field497; - @ObfuscatedName("al") - int field514; + @ObfuscatedName("ar") + int field523; + @ObfuscatedName("ag") + int field540; static { - field502 = false; // L: 28 + field526 = false; // L: 28 } VorbisSample(byte[] var1) { - this.read(var1); // L: 401 - } // L: 402 + this.read(var1); // L: 417 + } // L: 418 - @ObfuscatedName("l") + @ObfuscatedName("p") @Export("read") void read(byte[] var1) { Buffer var2 = new Buffer(var1); // L: 89 @@ -121,11 +121,11 @@ public class VorbisSample extends Node { this.end = var2.readInt(); // L: 93 if (this.end < 0) { // L: 94 this.end = ~this.end; // L: 95 - this.field486 = true; // L: 96 + this.field512 = true; // L: 96 } int var3 = var2.readInt(); // L: 98 - this.field487 = new byte[var3][]; // L: 99 + this.field534 = new byte[var3][]; // L: 99 for (int var4 = 0; var4 < var3; ++var4) { // L: 100 int var5 = 0; // L: 101 @@ -138,320 +138,320 @@ public class VorbisSample extends Node { byte[] var7 = new byte[var5]; // L: 107 var2.readBytes(var7, 0, var5); // L: 108 - this.field487[var4] = var7; // L: 109 + this.field534[var4] = var7; // L: 109 } } // L: 111 - @ObfuscatedName("t") - float[] method1058(int var1) { - VorbisSample_setData(this.field487[var1], 0); // L: 182 - readBit(); // L: 183 - int var2 = readBits(class10.iLog(VorbisSample_mapping.length - 1)); // L: 184 - boolean var3 = VorbisSample_blockFlags[var2]; // L: 185 - int var4 = var3 ? VorbisSample_blockSize1 : VorbisSample_blockSize0; // L: 186 - boolean var5 = false; // L: 187 - boolean var6 = false; // L: 188 - if (var3) { // L: 189 - var5 = readBit() != 0; // L: 190 - var6 = readBit() != 0; // L: 191 + @ObfuscatedName("r") + float[] method1027(int var1) { + VorbisSample_setData(this.field534[var1], 0); // L: 198 + readBit(); // L: 199 + int var2 = readBits(CollisionMap.iLog(VorbisSample_mapping.length - 1)); // L: 200 + boolean var3 = VorbisSample_blockFlags[var2]; // L: 201 + int var4 = var3 ? VorbisSample_blockSize1 : VorbisSample_blockSize0; // L: 202 + boolean var5 = false; // L: 203 + boolean var6 = false; // L: 204 + if (var3) { // L: 205 + var5 = readBit() != 0; // L: 206 + var6 = readBit() != 0; // L: 207 } - int var7 = var4 >> 1; // L: 193 + int var7 = var4 >> 1; // L: 209 int var8; int var9; int var10; - if (var3 && !var5) { // L: 197 - var8 = (var4 >> 2) - (VorbisSample_blockSize0 >> 2); // L: 198 - var9 = (VorbisSample_blockSize0 >> 2) + (var4 >> 2); // L: 199 - var10 = VorbisSample_blockSize0 >> 1; // L: 200 + if (var3 && !var5) { // L: 213 + var8 = (var4 >> 2) - (VorbisSample_blockSize0 >> 2); // L: 214 + var9 = (VorbisSample_blockSize0 >> 2) + (var4 >> 2); // L: 215 + var10 = VorbisSample_blockSize0 >> 1; // L: 216 } else { - var8 = 0; // L: 203 - var9 = var7; // L: 204 - var10 = var4 >> 1; // L: 205 + var8 = 0; // L: 219 + var9 = var7; // L: 220 + var10 = var4 >> 1; // L: 221 } int var11; int var12; int var13; - if (var3 && !var6) { // L: 210 - var11 = var4 - (var4 >> 2) - (VorbisSample_blockSize0 >> 2); // L: 211 - var12 = (VorbisSample_blockSize0 >> 2) + (var4 - (var4 >> 2)); // L: 212 - var13 = VorbisSample_blockSize0 >> 1; // L: 213 + if (var3 && !var6) { // L: 226 + var11 = var4 - (var4 >> 2) - (VorbisSample_blockSize0 >> 2); // L: 227 + var12 = (VorbisSample_blockSize0 >> 2) + (var4 - (var4 >> 2)); // L: 228 + var13 = VorbisSample_blockSize0 >> 1; // L: 229 } else { - var11 = var7; // L: 216 - var12 = var4; // L: 217 - var13 = var4 >> 1; // L: 218 + var11 = var7; // L: 232 + var12 = var4; // L: 233 + var13 = var4 >> 1; // L: 234 } - VorbisMapping var14 = VorbisSample_mappings[VorbisSample_mapping[var2]]; // L: 220 - int var16 = var14.mappingMux; // L: 223 - int var17 = var14.submapFloor[var16]; // L: 224 - boolean var15 = !VorbisSample_floors[var17].readSubmapFloor(); // L: 225 - boolean var45 = var15; // L: 227 + VorbisMapping var14 = VorbisSample_mappings[VorbisSample_mapping[var2]]; // L: 236 + int var16 = var14.mappingMux; // L: 239 + int var17 = var14.submapFloor[var16]; // L: 240 + boolean var15 = !VorbisSample_floors[var17].readSubmapFloor(); // L: 241 + boolean var45 = var15; // L: 243 - for (var17 = 0; var17 < var14.submaps; ++var17) { // L: 228 - VorbisResidue var42 = VorbisSample_residues[var14.submapResidue[var17]]; // L: 229 - float[] var44 = field481; // L: 230 - var42.method877(var44, var4 >> 1, var45); // L: 231 + for (var17 = 0; var17 < var14.submaps; ++var17) { // L: 244 + VorbisResidue var42 = VorbisSample_residues[var14.submapResidue[var17]]; // L: 245 + float[] var44 = field529; // L: 246 + var42.method833(var44, var4 >> 1, var45); // L: 247 } int var18; - if (!var15) { // L: 234 - var17 = var14.mappingMux; // L: 235 - var18 = var14.submapFloor[var17]; // L: 236 - VorbisSample_floors[var18].method779(field481, var4 >> 1); // L: 237 + if (!var15) { // L: 250 + var17 = var14.mappingMux; // L: 251 + var18 = var14.submapFloor[var17]; // L: 252 + VorbisSample_floors[var18].method712(field529, var4 >> 1); // L: 253 } int var19; - if (var15) { // L: 240 - for (var17 = var4 >> 1; var17 < var4; ++var17) { // L: 241 - field481[var17] = 0.0F; + if (var15) { // L: 256 + for (var17 = var4 >> 1; var17 < var4; ++var17) { // L: 257 + field529[var17] = 0.0F; } } else { - var17 = var4 >> 1; // L: 244 - var18 = var4 >> 2; // L: 245 - var19 = var4 >> 3; // L: 246 - float[] var20 = field481; // L: 247 + var17 = var4 >> 1; // L: 260 + var18 = var4 >> 2; // L: 261 + var19 = var4 >> 3; // L: 262 + float[] var20 = field529; // L: 263 int var21; - for (var21 = 0; var21 < var17; ++var21) { // L: 248 + for (var21 = 0; var21 < var17; ++var21) { // L: 264 var20[var21] *= 0.5F; } - for (var21 = var17; var21 < var4; ++var21) { // L: 249 + for (var21 = var17; var21 < var4; ++var21) { // L: 265 var20[var21] = -var20[var4 - var21 - 1]; } - float[] var40 = var3 ? field507 : field496; // L: 250 - float[] var22 = var3 ? field489 : field505; // L: 251 - float[] var23 = var3 ? field509 : field508; // L: 252 - int[] var24 = var3 ? field511 : field510; // L: 253 + float[] var40 = var3 ? field533 : field530; // L: 266 + float[] var22 = var3 ? field514 : field531; // L: 267 + float[] var23 = var3 ? field535 : field519; // L: 268 + int[] var24 = var3 ? field537 : field536; // L: 269 int var25; float var26; float var27; float var28; float var29; - for (var25 = 0; var25 < var18; ++var25) { // L: 254 - var26 = var20[var25 * 4] - var20[var4 - var25 * 4 - 1]; // L: 255 - var27 = var20[var25 * 4 + 2] - var20[var4 - var25 * 4 - 3]; // L: 256 - var28 = var40[var25 * 2]; // L: 257 - var29 = var40[var25 * 2 + 1]; // L: 258 - var20[var4 - var25 * 4 - 1] = var26 * var28 - var27 * var29; // L: 259 - var20[var4 - var25 * 4 - 3] = var26 * var29 + var27 * var28; // L: 260 + for (var25 = 0; var25 < var18; ++var25) { // L: 270 + var26 = var20[var25 * 4] - var20[var4 - var25 * 4 - 1]; // L: 271 + var27 = var20[var25 * 4 + 2] - var20[var4 - var25 * 4 - 3]; // L: 272 + var28 = var40[var25 * 2]; // L: 273 + var29 = var40[var25 * 2 + 1]; // L: 274 + var20[var4 - var25 * 4 - 1] = var26 * var28 - var27 * var29; // L: 275 + var20[var4 - var25 * 4 - 3] = var26 * var29 + var27 * var28; // L: 276 } float var30; float var31; - for (var25 = 0; var25 < var19; ++var25) { // L: 262 - var26 = var20[var17 + var25 * 4 + 3]; // L: 263 - var27 = var20[var17 + var25 * 4 + 1]; // L: 264 - var28 = var20[var25 * 4 + 3]; // L: 265 - var29 = var20[var25 * 4 + 1]; // L: 266 - var20[var17 + var25 * 4 + 3] = var26 + var28; // L: 267 - var20[var17 + var25 * 4 + 1] = var27 + var29; // L: 268 - var30 = var40[var17 - 4 - var25 * 4]; // L: 269 - var31 = var40[var17 - 3 - var25 * 4]; // L: 270 - var20[var25 * 4 + 3] = (var26 - var28) * var30 - (var27 - var29) * var31; // L: 271 - var20[var25 * 4 + 1] = (var27 - var29) * var30 + (var26 - var28) * var31; // L: 272 + for (var25 = 0; var25 < var19; ++var25) { // L: 278 + var26 = var20[var17 + var25 * 4 + 3]; // L: 279 + var27 = var20[var17 + var25 * 4 + 1]; // L: 280 + var28 = var20[var25 * 4 + 3]; // L: 281 + var29 = var20[var25 * 4 + 1]; // L: 282 + var20[var17 + var25 * 4 + 3] = var26 + var28; // L: 283 + var20[var17 + var25 * 4 + 1] = var27 + var29; // L: 284 + var30 = var40[var17 - 4 - var25 * 4]; // L: 285 + var31 = var40[var17 - 3 - var25 * 4]; // L: 286 + var20[var25 * 4 + 3] = (var26 - var28) * var30 - (var27 - var29) * var31; // L: 287 + var20[var25 * 4 + 1] = (var27 - var29) * var30 + (var26 - var28) * var31; // L: 288 } - var25 = class10.iLog(var4 - 1); // L: 274 + var25 = CollisionMap.iLog(var4 - 1); // L: 290 int var46; int var47; int var48; int var49; - for (var46 = 0; var46 < var25 - 3; ++var46) { // L: 275 - var47 = var4 >> var46 + 2; // L: 276 - var48 = 8 << var46; // L: 277 + for (var46 = 0; var46 < var25 - 3; ++var46) { // L: 291 + var47 = var4 >> var46 + 2; // L: 292 + var48 = 8 << var46; // L: 293 - for (var49 = 0; var49 < 2 << var46; ++var49) { // L: 278 - int var50 = var4 - var47 * var49 * 2; // L: 279 - int var51 = var4 - var47 * (var49 * 2 + 1); // L: 280 + for (var49 = 0; var49 < 2 << var46; ++var49) { // L: 294 + int var50 = var4 - var47 * var49 * 2; // L: 295 + int var51 = var4 - var47 * (var49 * 2 + 1); // L: 296 - for (int var32 = 0; var32 < var4 >> var46 + 4; ++var32) { // L: 281 - int var33 = var32 * 4; // L: 282 - float var34 = var20[var50 - 1 - var33]; // L: 283 - float var35 = var20[var50 - 3 - var33]; // L: 284 - float var36 = var20[var51 - 1 - var33]; // L: 285 - float var37 = var20[var51 - 3 - var33]; // L: 286 - var20[var50 - 1 - var33] = var34 + var36; // L: 287 - var20[var50 - 3 - var33] = var35 + var37; // L: 288 - float var38 = var40[var32 * var48]; // L: 289 - float var39 = var40[var32 * var48 + 1]; // L: 290 - var20[var51 - 1 - var33] = (var34 - var36) * var38 - (var35 - var37) * var39; // L: 291 - var20[var51 - 3 - var33] = (var35 - var37) * var38 + (var34 - var36) * var39; // L: 292 + for (int var32 = 0; var32 < var4 >> var46 + 4; ++var32) { // L: 297 + int var33 = var32 * 4; // L: 298 + float var34 = var20[var50 - 1 - var33]; // L: 299 + float var35 = var20[var50 - 3 - var33]; // L: 300 + float var36 = var20[var51 - 1 - var33]; // L: 301 + float var37 = var20[var51 - 3 - var33]; // L: 302 + var20[var50 - 1 - var33] = var34 + var36; // L: 303 + var20[var50 - 3 - var33] = var35 + var37; // L: 304 + float var38 = var40[var32 * var48]; // L: 305 + float var39 = var40[var32 * var48 + 1]; // L: 306 + var20[var51 - 1 - var33] = (var34 - var36) * var38 - (var35 - var37) * var39; // L: 307 + var20[var51 - 3 - var33] = (var35 - var37) * var38 + (var34 - var36) * var39; // L: 308 } } } - for (var46 = 1; var46 < var19 - 1; ++var46) { // L: 296 - var47 = var24[var46]; // L: 297 - if (var46 < var47) { // L: 298 - var48 = var46 * 8; // L: 299 - var49 = var47 * 8; // L: 300 - var30 = var20[var48 + 1]; // L: 302 - var20[var48 + 1] = var20[var49 + 1]; // L: 303 - var20[var49 + 1] = var30; // L: 304 - var30 = var20[var48 + 3]; // L: 305 - var20[var48 + 3] = var20[var49 + 3]; // L: 306 - var20[var49 + 3] = var30; // L: 307 - var30 = var20[var48 + 5]; // L: 308 - var20[var48 + 5] = var20[var49 + 5]; // L: 309 - var20[var49 + 5] = var30; // L: 310 - var30 = var20[var48 + 7]; // L: 311 - var20[var48 + 7] = var20[var49 + 7]; // L: 312 - var20[var49 + 7] = var30; // L: 313 + for (var46 = 1; var46 < var19 - 1; ++var46) { // L: 312 + var47 = var24[var46]; // L: 313 + if (var46 < var47) { // L: 314 + var48 = var46 * 8; // L: 315 + var49 = var47 * 8; // L: 316 + var30 = var20[var48 + 1]; // L: 318 + var20[var48 + 1] = var20[var49 + 1]; // L: 319 + var20[var49 + 1] = var30; // L: 320 + var30 = var20[var48 + 3]; // L: 321 + var20[var48 + 3] = var20[var49 + 3]; // L: 322 + var20[var49 + 3] = var30; // L: 323 + var30 = var20[var48 + 5]; // L: 324 + var20[var48 + 5] = var20[var49 + 5]; // L: 325 + var20[var49 + 5] = var30; // L: 326 + var30 = var20[var48 + 7]; // L: 327 + var20[var48 + 7] = var20[var49 + 7]; // L: 328 + var20[var49 + 7] = var30; // L: 329 } } - for (var46 = 0; var46 < var17; ++var46) { // L: 316 + for (var46 = 0; var46 < var17; ++var46) { // L: 332 var20[var46] = var20[var46 * 2 + 1]; } - for (var46 = 0; var46 < var19; ++var46) { // L: 317 - var20[var4 - 1 - var46 * 2] = var20[var46 * 4]; // L: 318 - var20[var4 - 2 - var46 * 2] = var20[var46 * 4 + 1]; // L: 319 - var20[var4 - var18 - 1 - var46 * 2] = var20[var46 * 4 + 2]; // L: 320 - var20[var4 - var18 - 2 - var46 * 2] = var20[var46 * 4 + 3]; // L: 321 + for (var46 = 0; var46 < var19; ++var46) { // L: 333 + var20[var4 - 1 - var46 * 2] = var20[var46 * 4]; // L: 334 + var20[var4 - 2 - var46 * 2] = var20[var46 * 4 + 1]; // L: 335 + var20[var4 - var18 - 1 - var46 * 2] = var20[var46 * 4 + 2]; // L: 336 + var20[var4 - var18 - 2 - var46 * 2] = var20[var46 * 4 + 3]; // L: 337 } - for (var46 = 0; var46 < var19; ++var46) { // L: 323 - var27 = var23[var46 * 2]; // L: 324 - var28 = var23[var46 * 2 + 1]; // L: 325 - var29 = var20[var17 + var46 * 2]; // L: 326 - var30 = var20[var17 + var46 * 2 + 1]; // L: 327 - var31 = var20[var4 - 2 - var46 * 2]; // L: 328 - float var52 = var20[var4 - 1 - var46 * 2]; // L: 329 - float var53 = var28 * (var29 - var31) + var27 * (var30 + var52); // L: 330 - var20[var17 + var46 * 2] = (var29 + var31 + var53) * 0.5F; // L: 331 - var20[var4 - 2 - var46 * 2] = (var29 + var31 - var53) * 0.5F; // L: 332 - var53 = var28 * (var30 + var52) - var27 * (var29 - var31); // L: 333 - var20[var17 + var46 * 2 + 1] = (var30 - var52 + var53) * 0.5F; // L: 334 - var20[var4 - 1 - var46 * 2] = (-var30 + var52 + var53) * 0.5F; // L: 335 + for (var46 = 0; var46 < var19; ++var46) { // L: 339 + var27 = var23[var46 * 2]; // L: 340 + var28 = var23[var46 * 2 + 1]; // L: 341 + var29 = var20[var17 + var46 * 2]; // L: 342 + var30 = var20[var17 + var46 * 2 + 1]; // L: 343 + var31 = var20[var4 - 2 - var46 * 2]; // L: 344 + float var52 = var20[var4 - 1 - var46 * 2]; // L: 345 + float var53 = var28 * (var29 - var31) + var27 * (var30 + var52); // L: 346 + var20[var17 + var46 * 2] = (var29 + var31 + var53) * 0.5F; // L: 347 + var20[var4 - 2 - var46 * 2] = (var29 + var31 - var53) * 0.5F; // L: 348 + var53 = var28 * (var30 + var52) - var27 * (var29 - var31); // L: 349 + var20[var17 + var46 * 2 + 1] = (var30 - var52 + var53) * 0.5F; // L: 350 + var20[var4 - 1 - var46 * 2] = (-var30 + var52 + var53) * 0.5F; // L: 351 } - for (var46 = 0; var46 < var18; ++var46) { // L: 337 - var20[var46] = var20[var17 + var46 * 2] * var22[var46 * 2] + var20[var17 + var46 * 2 + 1] * var22[var46 * 2 + 1]; // L: 338 - var20[var17 - 1 - var46] = var20[var17 + var46 * 2] * var22[var46 * 2 + 1] - var20[var17 + var46 * 2 + 1] * var22[var46 * 2]; // L: 339 + for (var46 = 0; var46 < var18; ++var46) { // L: 353 + var20[var46] = var20[var17 + var46 * 2] * var22[var46 * 2] + var20[var17 + var46 * 2 + 1] * var22[var46 * 2 + 1]; // L: 354 + var20[var17 - 1 - var46] = var20[var17 + var46 * 2] * var22[var46 * 2 + 1] - var20[var17 + var46 * 2 + 1] * var22[var46 * 2]; // L: 355 } - for (var46 = 0; var46 < var18; ++var46) { // L: 341 + for (var46 = 0; var46 < var18; ++var46) { // L: 357 var20[var46 + (var4 - var18)] = -var20[var46]; } - for (var46 = 0; var46 < var18; ++var46) { // L: 342 + for (var46 = 0; var46 < var18; ++var46) { // L: 358 var20[var46] = var20[var18 + var46]; } - for (var46 = 0; var46 < var18; ++var46) { // L: 343 + for (var46 = 0; var46 < var18; ++var46) { // L: 359 var20[var18 + var46] = -var20[var18 - var46 - 1]; } - for (var46 = 0; var46 < var18; ++var46) { // L: 344 + for (var46 = 0; var46 < var18; ++var46) { // L: 360 var20[var17 + var46] = var20[var4 - var46 - 1]; } float[] var10000; - for (var46 = var8; var46 < var9; ++var46) { // L: 345 - var27 = (float)Math.sin(((double)(var46 - var8) + 0.5D) / (double)var10 * 0.5D * 3.141592653589793D); // L: 346 - var10000 = field481; // L: 347 + for (var46 = var8; var46 < var9; ++var46) { // L: 361 + var27 = (float)Math.sin(((double)(var46 - var8) + 0.5D) / (double)var10 * 0.5D * 3.141592653589793D); // L: 362 + var10000 = field529; // L: 363 var10000[var46] *= (float)Math.sin(1.5707963267948966D * (double)var27 * (double)var27); } - for (var46 = var11; var46 < var12; ++var46) { // L: 349 - var27 = (float)Math.sin(((double)(var46 - var11) + 0.5D) / (double)var13 * 0.5D * 3.141592653589793D + 1.5707963267948966D); // L: 350 - var10000 = field481; // L: 351 + for (var46 = var11; var46 < var12; ++var46) { // L: 365 + var27 = (float)Math.sin(((double)(var46 - var11) + 0.5D) / (double)var13 * 0.5D * 3.141592653589793D + 1.5707963267948966D); // L: 366 + var10000 = field529; // L: 367 var10000[var46] *= (float)Math.sin(1.5707963267948966D * (double)var27 * (double)var27); } } - float[] var41 = null; // L: 354 - if (this.field500 > 0) { // L: 355 - var18 = var4 + this.field500 >> 2; // L: 356 - var41 = new float[var18]; // L: 357 + float[] var41 = null; // L: 370 + if (this.field524 > 0) { // L: 371 + var18 = var4 + this.field524 >> 2; // L: 372 + var41 = new float[var18]; // L: 373 int var43; - if (!this.field484) { // L: 358 - for (var19 = 0; var19 < this.field494; ++var19) { // L: 359 - var43 = var19 + (this.field500 >> 1); // L: 360 - var41[var19] += this.field499[var43]; // L: 361 + if (!this.field528) { // L: 374 + for (var19 = 0; var19 < this.field517; ++var19) { // L: 375 + var43 = var19 + (this.field524 >> 1); // L: 376 + var41[var19] += this.field525[var43]; // L: 377 } } - if (!var15) { // L: 364 - for (var19 = var8; var19 < var4 >> 1; ++var19) { // L: 365 - var43 = var41.length - (var4 >> 1) + var19; // L: 366 - var41[var43] += field481[var19]; // L: 367 + if (!var15) { // L: 380 + for (var19 = var8; var19 < var4 >> 1; ++var19) { // L: 381 + var43 = var41.length - (var4 >> 1) + var19; // L: 382 + var41[var43] += field529[var19]; // L: 383 } } } - float[] var54 = this.field499; // L: 371 - this.field499 = field481; // L: 372 - field481 = var54; // L: 373 - this.field500 = var4; // L: 374 - this.field494 = var12 - (var4 >> 1); // L: 375 - this.field484 = var15; // L: 376 - return var41; // L: 377 + float[] var54 = this.field525; // L: 387 + this.field525 = field529; // L: 388 + field529 = var54; // L: 389 + this.field524 = var4; // L: 390 + this.field517 = var12 - (var4 >> 1); // L: 391 + this.field528 = var15; // L: 392 + return var41; // L: 393 } - @ObfuscatedName("q") + @ObfuscatedName("s") @ObfuscatedSignature( - descriptor = "([I)Laf;" + descriptor = "([I)Lau;" ) @Export("toRawSound") RawSound toRawSound(int[] var1) { - if (var1 != null && var1[0] <= 0) { // L: 405 + if (var1 != null && var1[0] <= 0) { // L: 421 return null; } else { - if (this.samples == null) { // L: 406 - this.field500 = 0; // L: 407 - this.field499 = new float[VorbisSample_blockSize1]; // L: 408 - this.samples = new byte[this.sampleCount]; // L: 409 - this.field497 = 0; // L: 410 - this.field514 = 0; // L: 411 + if (this.samples == null) { // L: 422 + this.field524 = 0; // L: 423 + this.field525 = new float[VorbisSample_blockSize1]; // L: 424 + this.samples = new byte[this.sampleCount]; // L: 425 + this.field523 = 0; // L: 426 + this.field540 = 0; // L: 427 } - for (; this.field514 < this.field487.length; ++this.field514) { // L: 413 428 - if (var1 != null && var1[0] <= 0) { // L: 414 + for (; this.field540 < this.field534.length; ++this.field540) { // L: 429 444 + if (var1 != null && var1[0] <= 0) { // L: 430 return null; } - float[] var2 = this.method1058(this.field514); // L: 415 - if (var2 != null) { // L: 416 - int var3 = this.field497; // L: 417 - int var4 = var2.length; // L: 418 - if (var4 > this.sampleCount - var3) { // L: 419 + float[] var2 = this.method1027(this.field540); // L: 431 + if (var2 != null) { // L: 432 + int var3 = this.field523; // L: 433 + int var4 = var2.length; // L: 434 + if (var4 > this.sampleCount - var3) { // L: 435 var4 = this.sampleCount - var3; } - for (int var5 = 0; var5 < var4; ++var5) { // L: 420 - int var6 = (int)(128.0F + var2[var5] * 128.0F); // L: 421 - if ((var6 & -256) != 0) { // L: 422 + for (int var5 = 0; var5 < var4; ++var5) { // L: 436 + int var6 = (int)(128.0F + var2[var5] * 128.0F); // L: 437 + if ((var6 & -256) != 0) { // L: 438 var6 = ~var6 >> 31; } - this.samples[var3++] = (byte)(var6 - 128); // L: 423 + this.samples[var3++] = (byte)(var6 - 128); // L: 439 } - if (var1 != null) { // L: 425 - var1[0] -= var3 - this.field497; + if (var1 != null) { // L: 441 + var1[0] -= var3 - this.field523; } - this.field497 = var3; // L: 426 + this.field523 = var3; // L: 442 } } - this.field499 = null; // L: 430 - byte[] var7 = this.samples; // L: 431 - this.samples = null; // L: 432 - return new RawSound(this.sampleRate, var7, this.start, this.end, this.field486); // L: 433 + this.field525 = null; // L: 446 + byte[] var7 = this.samples; // L: 447 + this.samples = null; // L: 448 + return new RawSound(this.sampleRate, var7, this.start, this.end, this.field512); // L: 449 } } - @ObfuscatedName("h") + @ObfuscatedName("v") @Export("float32Unpack") static float float32Unpack(int var0) { int var1 = var0 & 2097151; // L: 47 @@ -464,7 +464,7 @@ public class VorbisSample extends Node { return (float)((double)var1 * Math.pow(2.0D, (double)(var3 - 788))); // L: 51 } - @ObfuscatedName("c") + @ObfuscatedName("n") @Export("VorbisSample_setData") static void VorbisSample_setData(byte[] var0, int var1) { VorbisSample_bytes = var0; // L: 55 @@ -472,7 +472,7 @@ public class VorbisSample extends Node { VorbisSample_bitOffset = 0; // L: 57 } // L: 58 - @ObfuscatedName("o") + @ObfuscatedName("f") @Export("readBit") static int readBit() { int var0 = VorbisSample_bytes[VorbisSample_byteOffset] >> VorbisSample_bitOffset & 1; // L: 61 @@ -482,7 +482,7 @@ public class VorbisSample extends Node { return var0; // L: 65 } - @ObfuscatedName("g") + @ObfuscatedName("y") @Export("readBits") static int readBits(int var0) { int var1 = 0; // L: 69 @@ -507,12 +507,12 @@ public class VorbisSample extends Node { return var1; // L: 85 } - @ObfuscatedName("z") - static void method1064(byte[] var0) { + @ObfuscatedName("j") + static void method1043(byte[] var0) { VorbisSample_setData(var0, 0); // L: 114 VorbisSample_blockSize0 = 1 << readBits(4); // L: 115 VorbisSample_blockSize1 = 1 << readBits(4); // L: 116 - field481 = new float[VorbisSample_blockSize1]; // L: 117 + field529 = new float[VorbisSample_blockSize1]; // L: 117 int var1; int var2; @@ -524,124 +524,133 @@ public class VorbisSample extends Node { var3 = var2 >> 1; // L: 120 var4 = var2 >> 2; // L: 121 var5 = var2 >> 3; // L: 122 - float[] var12 = new float[var3]; // L: 123 + float[] var18 = new float[var3]; // L: 123 for (int var7 = 0; var7 < var4; ++var7) { // L: 124 - var12[var7 * 2] = (float)Math.cos((double)(var7 * 4) * 3.141592653589793D / (double)var2); // L: 125 - var12[var7 * 2 + 1] = -((float)Math.sin((double)(var7 * 4) * 3.141592653589793D / (double)var2)); // L: 126 + var18[var7 * 2] = (float)Math.cos((double)(var7 * 4) * 3.141592653589793D / (double)var2); // L: 125 + var18[var7 * 2 + 1] = -((float)Math.sin((double)(var7 * 4) * 3.141592653589793D / (double)var2)); // L: 126 } - float[] var13 = new float[var3]; // L: 128 + float[] var19 = new float[var3]; // L: 128 for (int var8 = 0; var8 < var4; ++var8) { // L: 129 - var13[var8 * 2] = (float)Math.cos((double)(var8 * 2 + 1) * 3.141592653589793D / (double)(var2 * 2)); // L: 130 - var13[var8 * 2 + 1] = (float)Math.sin((double)(var8 * 2 + 1) * 3.141592653589793D / (double)(var2 * 2)); // L: 131 + var19[var8 * 2] = (float)Math.cos((double)(var8 * 2 + 1) * 3.141592653589793D / (double)(var2 * 2)); // L: 130 + var19[var8 * 2 + 1] = (float)Math.sin((double)(var8 * 2 + 1) * 3.141592653589793D / (double)(var2 * 2)); // L: 131 } - float[] var14 = new float[var4]; // L: 133 + float[] var20 = new float[var4]; // L: 133 for (int var9 = 0; var9 < var5; ++var9) { // L: 134 - var14[var9 * 2] = (float)Math.cos((double)(var9 * 4 + 2) * 3.141592653589793D / (double)var2); // L: 135 - var14[var9 * 2 + 1] = -((float)Math.sin((double)(var9 * 4 + 2) * 3.141592653589793D / (double)var2)); // L: 136 + var20[var9 * 2] = (float)Math.cos((double)(var9 * 4 + 2) * 3.141592653589793D / (double)var2); // L: 135 + var20[var9 * 2 + 1] = -((float)Math.sin((double)(var9 * 4 + 2) * 3.141592653589793D / (double)var2)); // L: 136 } - int[] var15 = new int[var5]; // L: 138 - int var10 = class10.iLog(var5 - 1); // L: 139 + int[] var21 = new int[var5]; // L: 138 + int var10 = CollisionMap.iLog(var5 - 1); // L: 139 for (int var11 = 0; var11 < var5; ++var11) { // L: 140 - var15[var11] = UrlRequester.method2421(var11, var10); + int var15 = var11; // L: 144 + int var16 = var10; // L: 145 + + int var17; + for (var17 = 0; var16 > 0; --var16) { // L: 147 148 151 + var17 = var17 << 1 | var15 & 1; // L: 149 + var15 >>>= 1; // L: 150 + } + + var21[var11] = var17; // L: 155 } - if (var1 != 0) { // L: 141 - field507 = var12; // L: 142 - field489 = var13; // L: 143 - field509 = var14; // L: 144 - field511 = var15; // L: 145 + if (var1 != 0) { // L: 157 + field533 = var18; // L: 158 + field514 = var19; // L: 159 + field535 = var20; // L: 160 + field537 = var21; // L: 161 } else { - field496 = var12; // L: 148 - field505 = var13; // L: 149 - field508 = var14; // L: 150 - field510 = var15; // L: 151 + field530 = var18; // L: 164 + field531 = var19; // L: 165 + field519 = var20; // L: 166 + field536 = var21; // L: 167 } } - var1 = readBits(8) + 1; // L: 154 - VorbisSample_codebooks = new VorbisCodebook[var1]; // L: 155 + var1 = readBits(8) + 1; // L: 170 + VorbisSample_codebooks = new VorbisCodebook[var1]; // L: 171 - for (var2 = 0; var2 < var1; ++var2) { // L: 156 + for (var2 = 0; var2 < var1; ++var2) { // L: 172 VorbisSample_codebooks[var2] = new VorbisCodebook(); } - var2 = readBits(6) + 1; // L: 158 + var2 = readBits(6) + 1; // L: 174 - for (var3 = 0; var3 < var2; ++var3) { // L: 159 + for (var3 = 0; var3 < var2; ++var3) { // L: 175 readBits(16); } - var2 = readBits(6) + 1; // L: 161 - VorbisSample_floors = new VorbisFloor[var2]; // L: 162 + var2 = readBits(6) + 1; // L: 177 + VorbisSample_floors = new VorbisFloor[var2]; // L: 178 - for (var3 = 0; var3 < var2; ++var3) { // L: 163 + for (var3 = 0; var3 < var2; ++var3) { // L: 179 VorbisSample_floors[var3] = new VorbisFloor(); } - var3 = readBits(6) + 1; // L: 164 - VorbisSample_residues = new VorbisResidue[var3]; // L: 165 + var3 = readBits(6) + 1; // L: 180 + VorbisSample_residues = new VorbisResidue[var3]; // L: 181 - for (var4 = 0; var4 < var3; ++var4) { // L: 166 + for (var4 = 0; var4 < var3; ++var4) { // L: 182 VorbisSample_residues[var4] = new VorbisResidue(); } - var4 = readBits(6) + 1; // L: 167 - VorbisSample_mappings = new VorbisMapping[var4]; // L: 168 + var4 = readBits(6) + 1; // L: 183 + VorbisSample_mappings = new VorbisMapping[var4]; // L: 184 - for (var5 = 0; var5 < var4; ++var5) { // L: 169 + for (var5 = 0; var5 < var4; ++var5) { // L: 185 VorbisSample_mappings[var5] = new VorbisMapping(); } - var5 = readBits(6) + 1; // L: 170 - VorbisSample_blockFlags = new boolean[var5]; // L: 171 - VorbisSample_mapping = new int[var5]; // L: 172 + var5 = readBits(6) + 1; // L: 186 + VorbisSample_blockFlags = new boolean[var5]; // L: 187 + VorbisSample_mapping = new int[var5]; // L: 188 - for (int var6 = 0; var6 < var5; ++var6) { // L: 173 - VorbisSample_blockFlags[var6] = readBit() != 0; // L: 174 - readBits(16); // L: 175 - readBits(16); // L: 176 - VorbisSample_mapping[var6] = readBits(8); // L: 177 + for (int var6 = 0; var6 < var5; ++var6) { // L: 189 + VorbisSample_blockFlags[var6] = readBit() != 0; // L: 190 + readBits(16); // L: 191 + readBits(16); // L: 192 + VorbisSample_mapping[var6] = readBits(8); // L: 193 } - } // L: 179 - - @ObfuscatedName("v") - @ObfuscatedSignature( - descriptor = "(Ljp;)Z" - ) - static boolean method1063(AbstractArchive var0) { - if (!field502) { // L: 381 - byte[] var1 = var0.takeFile(0, 0); // L: 382 - if (var1 == null) { // L: 383 - return false; - } - - method1064(var1); // L: 384 - field502 = true; // L: 385 - } - - return true; // L: 387 - } + } // L: 195 @ObfuscatedName("b") @ObfuscatedSignature( - descriptor = "(Ljp;II)Lbm;" + descriptor = "(Ljv;)Z" + ) + static boolean method1039(AbstractArchive var0) { + if (!field526) { // L: 397 + byte[] var1 = var0.takeFile(0, 0); // L: 398 + if (var1 == null) { // L: 399 + return false; + } + + method1043(var1); // L: 400 + field526 = true; // L: 401 + } + + return true; // L: 403 + } + + @ObfuscatedName("d") + @ObfuscatedSignature( + descriptor = "(Ljv;II)Lbr;" ) @Export("readMusicSample") static VorbisSample readMusicSample(AbstractArchive var0, int var1, int var2) { - if (!method1063(var0)) { // L: 391 - var0.tryLoadFile(var1, var2); // L: 392 - return null; // L: 393 + if (!method1039(var0)) { // L: 407 + var0.tryLoadFile(var1, var2); // L: 408 + return null; // L: 409 } else { - byte[] var3 = var0.takeFile(var1, var2); // L: 395 - return var3 == null ? null : new VorbisSample(var3); // L: 396 + byte[] var3 = var0.takeFile(var1, var2); // L: 411 + return var3 == null ? null : new VorbisSample(var3); // L: 412 } } } diff --git a/runescape-client/src/main/java/WallDecoration.java b/runescape-client/src/main/java/WallDecoration.java index 30d8961b33..4aac10a649 100644 --- a/runescape-client/src/main/java/WallDecoration.java +++ b/runescape-client/src/main/java/WallDecoration.java @@ -4,72 +4,72 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("hw") +@ObfuscatedName("ho") @Implements("WallDecoration") public final class WallDecoration { - @ObfuscatedName("h") + @ObfuscatedName("v") @ObfuscatedGetter( - intValue = 1910058323 + intValue = -1988235731 ) @Export("tileHeight") int tileHeight; - @ObfuscatedName("c") + @ObfuscatedName("n") @ObfuscatedGetter( - intValue = -620664259 + intValue = 1511932377 ) @Export("x") int x; - @ObfuscatedName("o") + @ObfuscatedName("f") @ObfuscatedGetter( - intValue = -476919717 + intValue = 750074813 ) @Export("y") int y; - @ObfuscatedName("g") + @ObfuscatedName("y") @ObfuscatedGetter( - intValue = -1074211039 + intValue = 1760283661 ) @Export("orientation") int orientation; - @ObfuscatedName("l") + @ObfuscatedName("p") @ObfuscatedGetter( - intValue = -112472913 + intValue = 1111812521 ) @Export("orientation2") int orientation2; - @ObfuscatedName("z") + @ObfuscatedName("j") @ObfuscatedGetter( - intValue = 290888717 + intValue = -2026318183 ) @Export("xOffset") int xOffset; - @ObfuscatedName("t") + @ObfuscatedName("r") @ObfuscatedGetter( - intValue = -2143429633 + intValue = 1292762417 ) @Export("yOffset") int yOffset; - @ObfuscatedName("v") + @ObfuscatedName("b") @ObfuscatedSignature( - descriptor = "Lge;" + descriptor = "Lgl;" ) @Export("renderable1") public Renderable renderable1; - @ObfuscatedName("b") + @ObfuscatedName("d") @ObfuscatedSignature( - descriptor = "Lge;" + descriptor = "Lgl;" ) @Export("renderable2") public Renderable renderable2; - @ObfuscatedName("q") + @ObfuscatedName("s") @ObfuscatedGetter( - longValue = -1980240772236369191L + longValue = 3146556658035252985L ) @Export("tag") public long tag; - @ObfuscatedName("i") + @ObfuscatedName("u") @ObfuscatedGetter( - intValue = -1664684485 + intValue = -740686461 ) @Export("flags") int flags; @@ -78,36 +78,4 @@ public final class WallDecoration { this.tag = 0L; // L: 13 this.flags = 0; // L: 14 } // L: 16 - - @ObfuscatedName("l") - @ObfuscatedSignature( - descriptor = "(IB)V", - garbageValue = "-10" - ) - public static void method4234(int var0) { - if (var0 != -1) { // L: 238 - if (class5.Widget_loadedInterfaces[var0]) { // L: 239 - GrandExchangeOffer.Widget_archive.clearFilesGroup(var0); // L: 240 - if (Widget.Widget_interfaceComponents[var0] != null) { // L: 241 - boolean var1 = true; // L: 242 - - for (int var2 = 0; var2 < Widget.Widget_interfaceComponents[var0].length; ++var2) { // L: 243 - if (Widget.Widget_interfaceComponents[var0][var2] != null) { // L: 244 - if (Widget.Widget_interfaceComponents[var0][var2].type != 2) { // L: 245 - Widget.Widget_interfaceComponents[var0][var2] = null; - } else { - var1 = false; // L: 246 - } - } - } - - if (var1) { // L: 249 - Widget.Widget_interfaceComponents[var0] = null; - } - - class5.Widget_loadedInterfaces[var0] = false; // L: 250 - } - } - } - } // L: 251 } diff --git a/runescape-client/src/main/java/Widget.java b/runescape-client/src/main/java/Widget.java index 0915d910fe..8b447cda84 100644 --- a/runescape-client/src/main/java/Widget.java +++ b/runescape-client/src/main/java/Widget.java @@ -4,687 +4,695 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("iv") +@ObfuscatedName("io") @Implements("Widget") public class Widget extends Node { - @ObfuscatedName("t") + @ObfuscatedName("sr") + @ObfuscatedGetter( + longValue = 132872656098905307L + ) + static long field3099; + @ObfuscatedName("r") @ObfuscatedSignature( - descriptor = "[[Liv;" + descriptor = "[[Lio;" ) @Export("Widget_interfaceComponents") public static Widget[][] Widget_interfaceComponents; - @ObfuscatedName("i") + @ObfuscatedName("b") + @Export("Widget_loadedInterfaces") + public static boolean[] Widget_loadedInterfaces; + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "Ljp;" - ) - @Export("Widget_spritesArchive") - static AbstractArchive Widget_spritesArchive; - @ObfuscatedName("k") - @ObfuscatedSignature( - descriptor = "Lho;" + descriptor = "Lhz;" ) @Export("Widget_cachedSprites") - static EvictingDualNodeHashTable Widget_cachedSprites; - @ObfuscatedName("r") + public static EvictingDualNodeHashTable Widget_cachedSprites; + @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "Lho;" + descriptor = "Lhz;" ) @Export("Widget_cachedModels") - static EvictingDualNodeHashTable Widget_cachedModels; - @ObfuscatedName("p") + public static EvictingDualNodeHashTable Widget_cachedModels; + @ObfuscatedName("e") @ObfuscatedSignature( - descriptor = "Lho;" + descriptor = "Lhz;" ) @Export("Widget_cachedFonts") - static EvictingDualNodeHashTable Widget_cachedFonts; - @ObfuscatedName("a") + public static EvictingDualNodeHashTable Widget_cachedFonts; + @ObfuscatedName("g") @ObfuscatedSignature( - descriptor = "Lho;" + descriptor = "Lhz;" ) @Export("Widget_cachedSpriteMasks") - static EvictingDualNodeHashTable Widget_cachedSpriteMasks; - @ObfuscatedName("e") - public static boolean field2962; - @ObfuscatedName("d") + public static EvictingDualNodeHashTable Widget_cachedSpriteMasks; + @ObfuscatedName("a") + public static boolean field2956; + @ObfuscatedName("fv") + @ObfuscatedSignature( + descriptor = "Lkt;" + ) + @Export("fontBold12") + static Font fontBold12; + @ObfuscatedName("k") @Export("isIf3") public boolean isIf3; - @ObfuscatedName("u") + @ObfuscatedName("m") @ObfuscatedGetter( - intValue = 1657404511 + intValue = -1722455647 ) @Export("id") public int id; - @ObfuscatedName("m") + @ObfuscatedName("x") @ObfuscatedGetter( - intValue = -698732553 + intValue = 41180389 ) @Export("childIndex") public int childIndex; - @ObfuscatedName("j") + @ObfuscatedName("z") @ObfuscatedGetter( - intValue = 64684553 + intValue = 1659206769 ) @Export("type") public int type; - @ObfuscatedName("f") + @ObfuscatedName("w") @ObfuscatedGetter( - intValue = 324979553 + intValue = 637562399 ) @Export("buttonType") public int buttonType; - @ObfuscatedName("s") + @ObfuscatedName("t") @ObfuscatedGetter( - intValue = 2139248973 + intValue = -1245218361 ) @Export("contentType") public int contentType; - @ObfuscatedName("y") + @ObfuscatedName("h") @ObfuscatedGetter( - intValue = 845784617 + intValue = 416061409 ) @Export("xAlignment") public int xAlignment; - @ObfuscatedName("w") + @ObfuscatedName("q") @ObfuscatedGetter( - intValue = 1176520073 + intValue = -843432795 ) @Export("yAlignment") public int yAlignment; - @ObfuscatedName("n") + @ObfuscatedName("i") @ObfuscatedGetter( - intValue = 121464481 + intValue = 718963747 ) @Export("widthAlignment") public int widthAlignment; - @ObfuscatedName("ag") + @ObfuscatedName("ae") @ObfuscatedGetter( - intValue = -417852981 + intValue = -685885519 ) @Export("heightAlignment") public int heightAlignment; - @ObfuscatedName("ae") + @ObfuscatedName("ap") @ObfuscatedGetter( - intValue = 89011749 + intValue = 516231807 ) @Export("rawX") public int rawX; - @ObfuscatedName("ao") + @ObfuscatedName("ab") @ObfuscatedGetter( - intValue = -1136780367 + intValue = -1017092357 ) @Export("rawY") public int rawY; - @ObfuscatedName("aj") + @ObfuscatedName("al") @ObfuscatedGetter( - intValue = 665432073 + intValue = 1593997171 ) @Export("rawWidth") public int rawWidth; - @ObfuscatedName("aw") + @ObfuscatedName("ad") @ObfuscatedGetter( - intValue = 507916453 + intValue = -16853095 ) @Export("rawHeight") public int rawHeight; - @ObfuscatedName("at") + @ObfuscatedName("ai") @ObfuscatedGetter( - intValue = -404307857 + intValue = 1347538309 ) @Export("x") public int x; - @ObfuscatedName("av") + @ObfuscatedName("ar") @ObfuscatedGetter( - intValue = -1382743151 + intValue = -2036682047 ) @Export("y") public int y; - @ObfuscatedName("al") + @ObfuscatedName("ag") @ObfuscatedGetter( - intValue = -1078557001 + intValue = 1163271639 ) @Export("width") public int width; - @ObfuscatedName("ap") + @ObfuscatedName("ax") @ObfuscatedGetter( - intValue = 761540169 + intValue = -571887853 ) @Export("height") public int height; + @ObfuscatedName("as") + @ObfuscatedGetter( + intValue = -1702141443 + ) + public int field3060; + @ObfuscatedName("aj") + @ObfuscatedGetter( + intValue = 90095899 + ) + public int field2976; @ObfuscatedName("am") @ObfuscatedGetter( - intValue = -403059855 - ) - public int field2981; - @ObfuscatedName("ax") - @ObfuscatedGetter( - intValue = 702840379 - ) - public int field3104; - @ObfuscatedName("ak") - @ObfuscatedGetter( - intValue = -1280996229 + intValue = -1338646279 ) @Export("parentId") public int parentId; - @ObfuscatedName("ay") + @ObfuscatedName("az") @Export("isHidden") public boolean isHidden; - @ObfuscatedName("ai") + @ObfuscatedName("av") @ObfuscatedGetter( - intValue = -1488969087 + intValue = -1662391635 ) @Export("scrollX") public int scrollX; - @ObfuscatedName("aa") + @ObfuscatedName("ac") @ObfuscatedGetter( - intValue = 1276398639 + intValue = 1974901921 ) @Export("scrollY") public int scrollY; - @ObfuscatedName("au") + @ObfuscatedName("at") @ObfuscatedGetter( - intValue = -734718787 + intValue = 1489642403 ) @Export("scrollWidth") public int scrollWidth; - @ObfuscatedName("as") + @ObfuscatedName("ah") @ObfuscatedGetter( - intValue = -58177491 + intValue = 1577090123 ) @Export("scrollHeight") public int scrollHeight; - @ObfuscatedName("ad") + @ObfuscatedName("ao") @ObfuscatedGetter( - intValue = -1099336735 + intValue = -1017532251 ) @Export("color") public int color; - @ObfuscatedName("ac") + @ObfuscatedName("aq") @ObfuscatedGetter( - intValue = -1999893025 + intValue = -681284339 ) @Export("color2") public int color2; - @ObfuscatedName("az") + @ObfuscatedName("aw") @ObfuscatedGetter( - intValue = -206274595 + intValue = -744384901 ) @Export("mouseOverColor") public int mouseOverColor; - @ObfuscatedName("aq") + @ObfuscatedName("af") @ObfuscatedGetter( - intValue = 1740312057 + intValue = -242226211 ) @Export("mouseOverColor2") public int mouseOverColor2; - @ObfuscatedName("ab") + @ObfuscatedName("ak") @Export("fill") public boolean fill; - @ObfuscatedName("ar") + @ObfuscatedName("ay") @ObfuscatedSignature( - descriptor = "Loq;" + descriptor = "Lon;" ) @Export("fillMode") public FillMode fillMode; - @ObfuscatedName("ah") + @ObfuscatedName("aa") @ObfuscatedGetter( - intValue = -1774292449 + intValue = 225521737 ) @Export("transparencyTop") public int transparencyTop; - @ObfuscatedName("af") + @ObfuscatedName("au") @ObfuscatedGetter( - intValue = 1067540577 + intValue = 1352946151 ) @Export("transparencyBot") public int transparencyBot; @ObfuscatedName("an") @ObfuscatedGetter( - intValue = -2036973785 + intValue = -1982124337 ) @Export("lineWid") public int lineWid; @ObfuscatedName("bd") - public boolean field2998; - @ObfuscatedName("bw") + public boolean field2992; + @ObfuscatedName("bt") @ObfuscatedGetter( - intValue = 228731547 + intValue = -1111346119 ) @Export("spriteId2") public int spriteId2; - @ObfuscatedName("bf") + @ObfuscatedName("bq") @ObfuscatedGetter( - intValue = -1015582433 + intValue = -1286862071 ) @Export("spriteId") public int spriteId; @ObfuscatedName("bu") @ObfuscatedGetter( - intValue = -855224077 + intValue = -1099843227 ) @Export("spriteAngle") public int spriteAngle; - @ObfuscatedName("bb") + @ObfuscatedName("bl") @Export("spriteTiling") public boolean spriteTiling; - @ObfuscatedName("bk") + @ObfuscatedName("bv") @ObfuscatedGetter( - intValue = -2028815797 + intValue = -713540261 ) @Export("outline") public int outline; - @ObfuscatedName("bt") + @ObfuscatedName("bm") @ObfuscatedGetter( - intValue = -321927459 + intValue = -2047701929 ) @Export("spriteShadow") public int spriteShadow; - @ObfuscatedName("by") + @ObfuscatedName("bz") @Export("spriteFlipV") public boolean spriteFlipV; - @ObfuscatedName("bz") + @ObfuscatedName("bh") @Export("spriteFlipH") public boolean spriteFlipH; - @ObfuscatedName("br") + @ObfuscatedName("bs") @ObfuscatedGetter( - intValue = -668548519 + intValue = 946573619 ) @Export("modelType") public int modelType; - @ObfuscatedName("bm") + @ObfuscatedName("br") @ObfuscatedGetter( - intValue = 522593307 + intValue = 1064486253 ) @Export("modelId") public int modelId; - @ObfuscatedName("bn") + @ObfuscatedName("bf") @ObfuscatedGetter( - intValue = -1494613609 + intValue = 1387355717 ) @Export("modelType2") int modelType2; @ObfuscatedName("ba") @ObfuscatedGetter( - intValue = 55793881 + intValue = 6278113 ) @Export("modelId2") int modelId2; - @ObfuscatedName("bg") + @ObfuscatedName("be") @ObfuscatedGetter( - intValue = 568573455 + intValue = 679546321 ) @Export("sequenceId") public int sequenceId; - @ObfuscatedName("bi") + @ObfuscatedName("bj") @ObfuscatedGetter( - intValue = 1193261339 + intValue = -296516383 ) @Export("sequenceId2") public int sequenceId2; - @ObfuscatedName("bp") + @ObfuscatedName("bx") @ObfuscatedGetter( - intValue = 722531995 + intValue = 1143287517 ) @Export("modelOffsetX") public int modelOffsetX; - @ObfuscatedName("bj") + @ObfuscatedName("bp") @ObfuscatedGetter( - intValue = -1703742235 + intValue = -712693961 ) @Export("modelOffsetY") public int modelOffsetY; - @ObfuscatedName("be") + @ObfuscatedName("bn") @ObfuscatedGetter( - intValue = -159122815 + intValue = -1005507705 ) @Export("modelAngleX") public int modelAngleX; - @ObfuscatedName("bs") + @ObfuscatedName("bo") @ObfuscatedGetter( - intValue = -252617511 + intValue = 490585271 ) @Export("modelAngleY") public int modelAngleY; - @ObfuscatedName("bx") + @ObfuscatedName("bw") @ObfuscatedGetter( - intValue = 888599943 + intValue = 625190029 ) @Export("modelAngleZ") public int modelAngleZ; - @ObfuscatedName("bv") + @ObfuscatedName("bi") @ObfuscatedGetter( - intValue = -1110666581 + intValue = 1456177915 ) @Export("modelZoom") public int modelZoom; - @ObfuscatedName("bh") + @ObfuscatedName("bb") @ObfuscatedGetter( - intValue = -851269017 + intValue = -1993271177 ) - public int field3019; - @ObfuscatedName("bl") + public int field3013; + @ObfuscatedName("bk") @ObfuscatedGetter( - intValue = -255882845 + intValue = 1762860885 ) - public int field3020; - @ObfuscatedName("bc") + public int field3014; + @ObfuscatedName("bg") @Export("modelOrthog") public boolean modelOrthog; - @ObfuscatedName("bo") + @ObfuscatedName("by") @Export("modelTransparency") public boolean modelTransparency; - @ObfuscatedName("bq") + @ObfuscatedName("bc") @ObfuscatedGetter( - intValue = 1473651185 + intValue = -960978093 ) @Export("itemQuantityMode") public int itemQuantityMode; - @ObfuscatedName("cm") + @ObfuscatedName("cd") @ObfuscatedGetter( - intValue = 713454117 + intValue = 1183409535 ) @Export("fontId") public int fontId; - @ObfuscatedName("ch") + @ObfuscatedName("cm") @Export("text") public String text; - @ObfuscatedName("cu") + @ObfuscatedName("cv") @Export("text2") public String text2; - @ObfuscatedName("ce") + @ObfuscatedName("cp") @ObfuscatedGetter( - intValue = 666665849 + intValue = 1855839745 ) @Export("textLineHeight") public int textLineHeight; - @ObfuscatedName("cn") + @ObfuscatedName("ci") @ObfuscatedGetter( - intValue = 703489487 + intValue = 1863227195 ) @Export("textXAlignment") public int textXAlignment; - @ObfuscatedName("cc") + @ObfuscatedName("ct") @ObfuscatedGetter( - intValue = 200371273 + intValue = 1397843337 ) @Export("textYAlignment") public int textYAlignment; - @ObfuscatedName("ck") + @ObfuscatedName("cq") @Export("textShadowed") public boolean textShadowed; - @ObfuscatedName("cx") + @ObfuscatedName("cr") @ObfuscatedGetter( - intValue = -605112505 + intValue = -1116733639 ) @Export("paddingX") public int paddingX; - @ObfuscatedName("ci") + @ObfuscatedName("cf") @ObfuscatedGetter( - intValue = -223176707 + intValue = 354722393 ) @Export("paddingY") public int paddingY; - @ObfuscatedName("cf") + @ObfuscatedName("cn") @Export("inventoryXOffsets") public int[] inventoryXOffsets; - @ObfuscatedName("cq") + @ObfuscatedName("cs") @Export("inventoryYOffsets") public int[] inventoryYOffsets; - @ObfuscatedName("cs") + @ObfuscatedName("cg") @Export("inventorySprites") public int[] inventorySprites; - @ObfuscatedName("cd") + @ObfuscatedName("co") @Export("itemActions") public String[] itemActions; - @ObfuscatedName("ct") + @ObfuscatedName("ck") @ObfuscatedGetter( - intValue = -201279953 + intValue = -721548567 ) @Export("flags") public int flags; - @ObfuscatedName("co") - public boolean field2985; + @ObfuscatedName("cj") + public boolean field3032; + @ObfuscatedName("cc") + public byte[][] field3033; + @ObfuscatedName("cu") + public byte[][] field3034; @ObfuscatedName("cz") - public byte[][] field3039; - @ObfuscatedName("cl") - public byte[][] field2987; - @ObfuscatedName("cp") - public int[] field3070; - @ObfuscatedName("cr") - public int[] field3090; + public int[] field3035; @ObfuscatedName("cb") + public int[] field3079; + @ObfuscatedName("ca") @Export("dataText") public String dataText; - @ObfuscatedName("cv") + @ObfuscatedName("cl") @Export("actions") public String[] actions; - @ObfuscatedName("ca") + @ObfuscatedName("cw") @ObfuscatedSignature( - descriptor = "Liv;" + descriptor = "Lio;" ) @Export("parent") public Widget parent; - @ObfuscatedName("ds") + @ObfuscatedName("db") @ObfuscatedGetter( - intValue = 1548715729 + intValue = -1741236437 ) @Export("dragZoneSize") public int dragZoneSize; - @ObfuscatedName("do") + @ObfuscatedName("dz") @ObfuscatedGetter( - intValue = 106736357 + intValue = -1216934521 ) @Export("dragThreshold") public int dragThreshold; @ObfuscatedName("dj") @Export("isScrollBar") public boolean isScrollBar; - @ObfuscatedName("du") + @ObfuscatedName("dr") @Export("spellActionName") public String spellActionName; - @ObfuscatedName("dw") + @ObfuscatedName("di") @Export("hasListener") public boolean hasListener; - @ObfuscatedName("dp") + @ObfuscatedName("dc") @Export("onLoad") public Object[] onLoad; - @ObfuscatedName("dl") + @ObfuscatedName("dk") @Export("onClick") public Object[] onClick; - @ObfuscatedName("dd") + @ObfuscatedName("ds") @Export("onClickRepeat") public Object[] onClickRepeat; - @ObfuscatedName("dz") + @ObfuscatedName("do") @Export("onRelease") public Object[] onRelease; - @ObfuscatedName("dh") + @ObfuscatedName("df") @Export("onHold") public Object[] onHold; - @ObfuscatedName("dn") + @ObfuscatedName("dv") @Export("onMouseOver") public Object[] onMouseOver; - @ObfuscatedName("dm") + @ObfuscatedName("dy") @Export("onMouseRepeat") public Object[] onMouseRepeat; - @ObfuscatedName("dq") + @ObfuscatedName("dd") @Export("onMouseLeave") public Object[] onMouseLeave; @ObfuscatedName("da") @Export("onDrag") public Object[] onDrag; - @ObfuscatedName("de") + @ObfuscatedName("dx") @Export("onDragComplete") public Object[] onDragComplete; - @ObfuscatedName("dy") + @ObfuscatedName("dg") @Export("onTargetEnter") public Object[] onTargetEnter; - @ObfuscatedName("di") + @ObfuscatedName("du") @Export("onTargetLeave") public Object[] onTargetLeave; @ObfuscatedName("dt") @Export("onVarTransmit") public Object[] onVarTransmit; - @ObfuscatedName("df") + @ObfuscatedName("dn") @Export("varTransmitTriggers") public int[] varTransmitTriggers; - @ObfuscatedName("dr") + @ObfuscatedName("dh") @Export("onInvTransmit") public Object[] onInvTransmit; - @ObfuscatedName("dg") + @ObfuscatedName("dl") @Export("invTransmitTriggers") public int[] invTransmitTriggers; - @ObfuscatedName("dv") + @ObfuscatedName("dq") @Export("onStatTransmit") public Object[] onStatTransmit; - @ObfuscatedName("dx") + @ObfuscatedName("de") @Export("statTransmitTriggers") public int[] statTransmitTriggers; - @ObfuscatedName("dk") + @ObfuscatedName("dp") @Export("onTimer") public Object[] onTimer; - @ObfuscatedName("dc") + @ObfuscatedName("dm") @Export("onOp") public Object[] onOp; - @ObfuscatedName("db") + @ObfuscatedName("dw") @Export("onScroll") public Object[] onScroll; - @ObfuscatedName("el") + @ObfuscatedName("ec") @Export("onChatTransmit") public Object[] onChatTransmit; - @ObfuscatedName("ec") + @ObfuscatedName("ea") @Export("onKey") public Object[] onKey; - @ObfuscatedName("ei") + @ObfuscatedName("ek") @Export("onFriendTransmit") public Object[] onFriendTransmit; - @ObfuscatedName("ek") + @ObfuscatedName("eu") @Export("onClanTransmit") public Object[] onClanTransmit; - @ObfuscatedName("ee") - public Object[] field3076; - @ObfuscatedName("ea") - public Object[] field2974; - @ObfuscatedName("en") + @ObfuscatedName("ez") + public Object[] field3043; + @ObfuscatedName("ed") + public Object[] field3071; + @ObfuscatedName("ep") @Export("onMiscTransmit") public Object[] onMiscTransmit; - @ObfuscatedName("ed") + @ObfuscatedName("ex") @Export("onDialogAbort") public Object[] onDialogAbort; - @ObfuscatedName("et") + @ObfuscatedName("ew") @Export("onSubChange") public Object[] onSubChange; - @ObfuscatedName("ev") + @ObfuscatedName("ej") @Export("onResize") public Object[] onResize; - @ObfuscatedName("es") + @ObfuscatedName("el") @Export("onStockTransmit") public Object[] onStockTransmit; - @ObfuscatedName("ej") - public Object[] field3004; - @ObfuscatedName("ew") + @ObfuscatedName("et") + public Object[] field3077; + @ObfuscatedName("eb") @Export("cs1Instructions") public int[][] cs1Instructions; - @ObfuscatedName("eq") + @ObfuscatedName("er") @Export("cs1Comparisons") public int[] cs1Comparisons; - @ObfuscatedName("eg") + @ObfuscatedName("en") @Export("cs1ComparisonValues") public int[] cs1ComparisonValues; - @ObfuscatedName("ey") + @ObfuscatedName("ef") @ObfuscatedGetter( - intValue = 987883999 + intValue = 898412889 ) @Export("mouseOverRedirect") public int mouseOverRedirect; - @ObfuscatedName("ex") + @ObfuscatedName("em") @Export("spellName") public String spellName; - @ObfuscatedName("ef") + @ObfuscatedName("es") @Export("buttonText") public String buttonText; - @ObfuscatedName("eh") + @ObfuscatedName("ey") @Export("itemIds") public int[] itemIds; - @ObfuscatedName("eu") + @ObfuscatedName("ee") @Export("itemQuantities") public int[] itemQuantities; - @ObfuscatedName("eo") + @ObfuscatedName("eh") @ObfuscatedGetter( - intValue = 379748005 + intValue = 539336237 ) @Export("itemId") public int itemId; - @ObfuscatedName("eb") + @ObfuscatedName("ei") @ObfuscatedGetter( - intValue = -1429348525 + intValue = 1575834679 ) @Export("itemQuantity") public int itemQuantity; - @ObfuscatedName("ep") + @ObfuscatedName("ev") @ObfuscatedGetter( - intValue = 785848287 + intValue = 903501349 ) @Export("modelFrame") public int modelFrame; - @ObfuscatedName("em") + @ObfuscatedName("eg") @ObfuscatedGetter( - intValue = -986770365 + intValue = -672258589 ) @Export("modelFrameCycle") public int modelFrameCycle; - @ObfuscatedName("ez") + @ObfuscatedName("eq") @ObfuscatedSignature( - descriptor = "[Liv;" + descriptor = "[Lio;" ) @Export("children") public Widget[] children; - @ObfuscatedName("er") + @ObfuscatedName("eo") @Export("containsMouse") public boolean containsMouse; - @ObfuscatedName("fb") + @ObfuscatedName("fl") @Export("isClicked") public boolean isClicked; + @ObfuscatedName("fz") + @ObfuscatedGetter( + intValue = -772300497 + ) + public int field3104; + @ObfuscatedName("fc") + @ObfuscatedGetter( + intValue = 1932726993 + ) + public int field2990; @ObfuscatedName("fa") @ObfuscatedGetter( - intValue = 2000499449 + intValue = 822217447 ) - public int field3015; - @ObfuscatedName("fx") + public int field3095; + @ObfuscatedName("ft") @ObfuscatedGetter( - intValue = 1600724097 + intValue = -437140673 ) - public int field3100; - @ObfuscatedName("fn") + public int field3096; + @ObfuscatedName("fs") @ObfuscatedGetter( - intValue = -2075433043 - ) - public int field3101; - @ObfuscatedName("fh") - @ObfuscatedGetter( - intValue = -1259077203 - ) - public int field3049; - @ObfuscatedName("fj") - @ObfuscatedGetter( - intValue = 1662061379 + intValue = 1408898685 ) @Export("rootIndex") public int rootIndex; - @ObfuscatedName("fi") + @ObfuscatedName("fp") @ObfuscatedGetter( - intValue = 359252081 + intValue = 861366973 ) @Export("cycle") public int cycle; - @ObfuscatedName("fo") - public int[] field3105; - @ObfuscatedName("fz") + @ObfuscatedName("fe") + public int[] field3012; + @ObfuscatedName("fb") @Export("noClickThrough") public boolean noClickThrough; - @ObfuscatedName("fe") + @ObfuscatedName("fo") @Export("noScrollThrough") public boolean noScrollThrough; - @ObfuscatedName("fm") + @ObfuscatedName("fq") @Export("prioritizeMenuEntry") public boolean prioritizeMenuEntry; @@ -693,7 +701,7 @@ public class Widget extends Node { Widget_cachedModels = new EvictingDualNodeHashTable(50); // L: 32 Widget_cachedFonts = new EvictingDualNodeHashTable(20); // L: 33 Widget_cachedSpriteMasks = new EvictingDualNodeHashTable(8); // L: 34 - field2962 = false; // L: 35 + field2956 = false; // L: 35 } public Widget() { @@ -714,8 +722,8 @@ public class Widget extends Node { this.y = 0; // L: 51 this.width = 0; // L: 52 this.height = 0; // L: 53 - this.field2981 = 1; // L: 54 - this.field3104 = 1; // L: 55 + this.field3060 = 1; // L: 54 + this.field2976 = 1; // L: 55 this.parentId = -1; // L: 56 this.isHidden = false; // L: 57 this.scrollX = 0; // L: 58 @@ -731,7 +739,7 @@ public class Widget extends Node { this.transparencyTop = 0; // L: 68 this.transparencyBot = 0; // L: 69 this.lineWid = 1; // L: 70 - this.field2998 = false; // L: 71 + this.field2992 = false; // L: 71 this.spriteId2 = -1; // L: 72 this.spriteId = -1; // L: 73 this.spriteAngle = 0; // L: 74 @@ -746,16 +754,16 @@ public class Widget extends Node { this.sequenceId2 = -1; // L: 85 this.modelOffsetX = 0; // L: 86 this.modelOffsetY = 0; // L: 87 - this.modelAngleX = 0; // L: 88 - this.modelAngleY = 0; // L: 89 - this.modelAngleZ = 0; // L: 90 + this.modelAngleX = 0; + this.modelAngleY = 0; + this.modelAngleZ = 0; this.modelZoom = 100; // L: 91 - this.field3019 = 0; // L: 92 - this.field3020 = 0; // L: 93 - this.modelOrthog = false; // L: 94 + this.field3013 = 0; + this.field3014 = 0; // L: 93 + this.modelOrthog = false; this.modelTransparency = false; // L: 95 this.itemQuantityMode = 2; // L: 96 - this.fontId = -1; // L: 97 + this.fontId = -1; this.text = ""; // L: 98 this.text2 = ""; // L: 99 this.textLineHeight = 0; // L: 100 @@ -765,7 +773,7 @@ public class Widget extends Node { this.paddingX = 0; // L: 104 this.paddingY = 0; // L: 105 this.flags = 0; // L: 110 - this.field2985 = false; // L: 111 + this.field3032 = false; // L: 111 this.dataText = ""; // L: 120 this.parent = null; // L: 122 this.dragZoneSize = 0; // L: 123 @@ -782,797 +790,775 @@ public class Widget extends Node { this.modelFrameCycle = 0; // L: 172 this.containsMouse = false; // L: 174 this.isClicked = false; // L: 175 - this.field3015 = -1; // L: 176 - this.field3100 = 0; // L: 177 - this.field3101 = 0; // L: 178 - this.field3049 = 0; // L: 179 + this.field3104 = -1; // L: 176 + this.field2990 = 0; // L: 177 + this.field3095 = 0; // L: 178 + this.field3096 = 0; // L: 179 this.rootIndex = -1; // L: 180 this.cycle = -1; // L: 181 this.noClickThrough = false; // L: 183 this.noScrollThrough = false; // L: 184 this.prioritizeMenuEntry = false; // L: 185 - } // L: 745 + } // L: 684 - @ObfuscatedName("z") + @ObfuscatedName("y") @ObfuscatedSignature( - descriptor = "(Lnk;B)V", - garbageValue = "106" + descriptor = "(Lnd;I)V", + garbageValue = "1748856001" ) @Export("decodeLegacy") void decodeLegacy(Buffer var1) { - this.isIf3 = false; // L: 254 - this.type = var1.readUnsignedByte(); // L: 255 - this.buttonType = var1.readUnsignedByte(); // L: 256 - this.contentType = var1.readUnsignedShort(); // L: 257 - this.rawX = var1.readShort(); // L: 258 - this.rawY = var1.readShort(); // L: 259 - this.rawWidth = var1.readUnsignedShort(); // L: 260 - this.rawHeight = var1.readUnsignedShort(); // L: 261 - this.transparencyTop = var1.readUnsignedByte(); // L: 262 - this.parentId = var1.readUnsignedShort(); // L: 263 - if (this.parentId == 65535) { // L: 264 + this.isIf3 = false; // L: 229 + this.type = var1.readUnsignedByte(); // L: 230 + this.buttonType = var1.readUnsignedByte(); // L: 231 + this.contentType = var1.readUnsignedShort(); // L: 232 + this.rawX = var1.readShort(); // L: 233 + this.rawY = var1.readShort(); // L: 234 + this.rawWidth = var1.readUnsignedShort(); // L: 235 + this.rawHeight = var1.readUnsignedShort(); // L: 236 + this.transparencyTop = var1.readUnsignedByte(); // L: 237 + this.parentId = var1.readUnsignedShort(); // L: 238 + if (this.parentId == 65535) { // L: 239 this.parentId = -1; } else { - this.parentId += this.id & -65536; // L: 265 + this.parentId += this.id & -65536; // L: 240 } - this.mouseOverRedirect = var1.readUnsignedShort(); // L: 266 - if (this.mouseOverRedirect == 65535) { // L: 267 + this.mouseOverRedirect = var1.readUnsignedShort(); // L: 241 + if (this.mouseOverRedirect == 65535) { // L: 242 this.mouseOverRedirect = -1; } - int var2 = var1.readUnsignedByte(); // L: 268 + int var2 = var1.readUnsignedByte(); // L: 243 int var3; - if (var2 > 0) { // L: 269 - this.cs1Comparisons = new int[var2]; // L: 270 - this.cs1ComparisonValues = new int[var2]; // L: 271 + if (var2 > 0) { // L: 244 + this.cs1Comparisons = new int[var2]; // L: 245 + this.cs1ComparisonValues = new int[var2]; // L: 246 - for (var3 = 0; var3 < var2; ++var3) { // L: 272 - this.cs1Comparisons[var3] = var1.readUnsignedByte(); // L: 273 - this.cs1ComparisonValues[var3] = var1.readUnsignedShort(); // L: 274 + for (var3 = 0; var3 < var2; ++var3) { // L: 247 + this.cs1Comparisons[var3] = var1.readUnsignedByte(); // L: 248 + this.cs1ComparisonValues[var3] = var1.readUnsignedShort(); // L: 249 } } - var3 = var1.readUnsignedByte(); // L: 277 + var3 = var1.readUnsignedByte(); // L: 252 int var4; int var5; int var6; - if (var3 > 0) { // L: 278 - this.cs1Instructions = new int[var3][]; // L: 279 + if (var3 > 0) { // L: 253 + this.cs1Instructions = new int[var3][]; // L: 254 - for (var4 = 0; var4 < var3; ++var4) { // L: 280 - var5 = var1.readUnsignedShort(); // L: 281 - this.cs1Instructions[var4] = new int[var5]; // L: 282 + for (var4 = 0; var4 < var3; ++var4) { // L: 255 + var5 = var1.readUnsignedShort(); // L: 256 + this.cs1Instructions[var4] = new int[var5]; // L: 257 - for (var6 = 0; var6 < var5; ++var6) { // L: 283 - this.cs1Instructions[var4][var6] = var1.readUnsignedShort(); // L: 284 - if (this.cs1Instructions[var4][var6] == 65535) { // L: 285 + for (var6 = 0; var6 < var5; ++var6) { // L: 258 + this.cs1Instructions[var4][var6] = var1.readUnsignedShort(); // L: 259 + if (this.cs1Instructions[var4][var6] == 65535) { // L: 260 this.cs1Instructions[var4][var6] = -1; } } } } - if (this.type == 0) { // L: 289 - this.scrollHeight = var1.readUnsignedShort(); // L: 290 - this.isHidden = var1.readUnsignedByte() == 1; // L: 291 + if (this.type == 0) { // L: 264 + this.scrollHeight = var1.readUnsignedShort(); // L: 265 + this.isHidden = var1.readUnsignedByte() == 1; // L: 266 } - if (this.type == 1) { // L: 293 - var1.readUnsignedShort(); // L: 294 - var1.readUnsignedByte(); // L: 295 + if (this.type == 1) { // L: 268 + var1.readUnsignedShort(); // L: 269 + var1.readUnsignedByte(); // L: 270 } - if (this.type == 2) { // L: 297 - this.itemIds = new int[this.rawHeight * this.rawWidth]; // L: 298 - this.itemQuantities = new int[this.rawHeight * this.rawWidth]; // L: 299 - var4 = var1.readUnsignedByte(); // L: 300 - if (var4 == 1) { // L: 301 + if (this.type == 2) { // L: 272 + this.itemIds = new int[this.rawHeight * this.rawWidth]; // L: 273 + this.itemQuantities = new int[this.rawHeight * this.rawWidth]; // L: 274 + var4 = var1.readUnsignedByte(); // L: 275 + if (var4 == 1) { // L: 276 this.flags |= 268435456; } - var5 = var1.readUnsignedByte(); // L: 302 - if (var5 == 1) { // L: 303 + var5 = var1.readUnsignedByte(); // L: 277 + if (var5 == 1) { // L: 278 this.flags |= 1073741824; } - var6 = var1.readUnsignedByte(); // L: 304 - if (var6 == 1) { // L: 305 + var6 = var1.readUnsignedByte(); // L: 279 + if (var6 == 1) { // L: 280 this.flags |= Integer.MIN_VALUE; } - int var7 = var1.readUnsignedByte(); // L: 306 - if (var7 == 1) { // L: 307 + int var7 = var1.readUnsignedByte(); // L: 281 + if (var7 == 1) { // L: 282 this.flags |= 536870912; } - this.paddingX = var1.readUnsignedByte(); // L: 308 - this.paddingY = var1.readUnsignedByte(); // L: 309 - this.inventoryXOffsets = new int[20]; // L: 310 - this.inventoryYOffsets = new int[20]; // L: 311 - this.inventorySprites = new int[20]; // L: 312 + this.paddingX = var1.readUnsignedByte(); // L: 283 + this.paddingY = var1.readUnsignedByte(); // L: 284 + this.inventoryXOffsets = new int[20]; // L: 285 + this.inventoryYOffsets = new int[20]; // L: 286 + this.inventorySprites = new int[20]; // L: 287 int var8; - for (var8 = 0; var8 < 20; ++var8) { // L: 313 - int var11 = var1.readUnsignedByte(); // L: 314 - if (var11 == 1) { // L: 315 - this.inventoryXOffsets[var8] = var1.readShort(); // L: 316 - this.inventoryYOffsets[var8] = var1.readShort(); // L: 317 - this.inventorySprites[var8] = var1.readInt(); // L: 318 + for (var8 = 0; var8 < 20; ++var8) { // L: 288 + int var11 = var1.readUnsignedByte(); // L: 289 + if (var11 == 1) { // L: 290 + this.inventoryXOffsets[var8] = var1.readShort(); // L: 291 + this.inventoryYOffsets[var8] = var1.readShort(); // L: 292 + this.inventorySprites[var8] = var1.readInt(); // L: 293 } else { - this.inventorySprites[var8] = -1; // L: 320 + this.inventorySprites[var8] = -1; // L: 295 } } - this.itemActions = new String[5]; // L: 322 + this.itemActions = new String[5]; // L: 297 - for (var8 = 0; var8 < 5; ++var8) { // L: 323 - String var9 = var1.readStringCp1252NullTerminated(); // L: 324 - if (var9.length() > 0) { // L: 325 - this.itemActions[var8] = var9; // L: 326 - this.flags |= 1 << var8 + 23; // L: 327 + for (var8 = 0; var8 < 5; ++var8) { // L: 298 + String var9 = var1.readStringCp1252NullTerminated(); // L: 299 + if (var9.length() > 0) { // L: 300 + this.itemActions[var8] = var9; // L: 301 + this.flags |= 1 << var8 + 23; // L: 302 } } } - if (this.type == 3) { // L: 331 - this.fill = var1.readUnsignedByte() == 1; // L: 332 + if (this.type == 3) { // L: 306 + this.fill = var1.readUnsignedByte() == 1; // L: 307 } - if (this.type == 4 || this.type == 1) { // L: 334 - this.textXAlignment = var1.readUnsignedByte(); // L: 335 - this.textYAlignment = var1.readUnsignedByte(); // L: 336 - this.textLineHeight = var1.readUnsignedByte(); // L: 337 - this.fontId = var1.readUnsignedShort(); // L: 338 - if (this.fontId == 65535) { // L: 339 + if (this.type == 4 || this.type == 1) { // L: 309 + this.textXAlignment = var1.readUnsignedByte(); // L: 310 + this.textYAlignment = var1.readUnsignedByte(); // L: 311 + this.textLineHeight = var1.readUnsignedByte(); // L: 312 + this.fontId = var1.readUnsignedShort(); // L: 313 + if (this.fontId == 65535) { // L: 314 this.fontId = -1; } - this.textShadowed = var1.readUnsignedByte() == 1; // L: 340 + this.textShadowed = var1.readUnsignedByte() == 1; // L: 315 } - if (this.type == 4) { // L: 342 - this.text = var1.readStringCp1252NullTerminated(); // L: 343 - this.text2 = var1.readStringCp1252NullTerminated(); // L: 344 + if (this.type == 4) { // L: 317 + this.text = var1.readStringCp1252NullTerminated(); // L: 318 + this.text2 = var1.readStringCp1252NullTerminated(); // L: 319 } - if (this.type == 1 || this.type == 3 || this.type == 4) { // L: 346 + if (this.type == 1 || this.type == 3 || this.type == 4) { // L: 321 this.color = var1.readInt(); } - if (this.type == 3 || this.type == 4) { // L: 347 - this.color2 = var1.readInt(); // L: 348 - this.mouseOverColor = var1.readInt(); // L: 349 - this.mouseOverColor2 = var1.readInt(); // L: 350 + if (this.type == 3 || this.type == 4) { // L: 322 + this.color2 = var1.readInt(); // L: 323 + this.mouseOverColor = var1.readInt(); // L: 324 + this.mouseOverColor2 = var1.readInt(); // L: 325 } - if (this.type == 5) { // L: 352 - this.spriteId2 = var1.readInt(); // L: 353 - this.spriteId = var1.readInt(); // L: 354 + if (this.type == 5) { // L: 327 + this.spriteId2 = var1.readInt(); // L: 328 + this.spriteId = var1.readInt(); // L: 329 } - if (this.type == 6) { // L: 356 - this.modelType = 1; // L: 357 - this.modelId = var1.readUnsignedShort(); // L: 358 - if (this.modelId == 65535) { // L: 359 + if (this.type == 6) { // L: 331 + this.modelType = 1; // L: 332 + this.modelId = var1.readUnsignedShort(); // L: 333 + if (this.modelId == 65535) { // L: 334 this.modelId = -1; } - this.modelType2 = 1; // L: 360 - this.modelId2 = var1.readUnsignedShort(); // L: 361 - if (this.modelId2 == 65535) { // L: 362 + this.modelType2 = 1; // L: 335 + this.modelId2 = var1.readUnsignedShort(); // L: 336 + if (this.modelId2 == 65535) { // L: 337 this.modelId2 = -1; } - this.sequenceId = var1.readUnsignedShort(); // L: 363 - if (this.sequenceId == 65535) { // L: 364 + this.sequenceId = var1.readUnsignedShort(); // L: 338 + if (this.sequenceId == 65535) { // L: 339 this.sequenceId = -1; } - this.sequenceId2 = var1.readUnsignedShort(); // L: 365 - if (this.sequenceId2 == 65535) { // L: 366 + this.sequenceId2 = var1.readUnsignedShort(); // L: 340 + if (this.sequenceId2 == 65535) { // L: 341 this.sequenceId2 = -1; } - this.modelZoom = var1.readUnsignedShort(); // L: 367 - this.modelAngleX = var1.readUnsignedShort(); // L: 368 - this.modelAngleY = var1.readUnsignedShort(); // L: 369 + this.modelZoom = var1.readUnsignedShort(); // L: 342 + this.modelAngleX = var1.readUnsignedShort(); // L: 343 + this.modelAngleY = var1.readUnsignedShort(); // L: 344 } - if (this.type == 7) { // L: 371 - this.itemIds = new int[this.rawHeight * this.rawWidth]; // L: 372 - this.itemQuantities = new int[this.rawHeight * this.rawWidth]; // L: 373 - this.textXAlignment = var1.readUnsignedByte(); // L: 374 - this.fontId = var1.readUnsignedShort(); // L: 375 - if (this.fontId == 65535) { // L: 376 + if (this.type == 7) { // L: 346 + this.itemIds = new int[this.rawWidth * this.rawHeight]; // L: 347 + this.itemQuantities = new int[this.rawHeight * this.rawWidth]; // L: 348 + this.textXAlignment = var1.readUnsignedByte(); // L: 349 + this.fontId = var1.readUnsignedShort(); // L: 350 + if (this.fontId == 65535) { // L: 351 this.fontId = -1; } - this.textShadowed = var1.readUnsignedByte() == 1; // L: 377 - this.color = var1.readInt(); // L: 378 - this.paddingX = var1.readShort(); // L: 379 - this.paddingY = var1.readShort(); // L: 380 - var4 = var1.readUnsignedByte(); // L: 381 + this.textShadowed = var1.readUnsignedByte() == 1; // L: 352 + this.color = var1.readInt(); // L: 353 + this.paddingX = var1.readShort(); // L: 354 + this.paddingY = var1.readShort(); // L: 355 + var4 = var1.readUnsignedByte(); // L: 356 if (var4 == 1) { - this.flags |= 1073741824; // L: 382 + this.flags |= 1073741824; // L: 357 } - this.itemActions = new String[5]; // L: 383 + this.itemActions = new String[5]; // L: 358 - for (var5 = 0; var5 < 5; ++var5) { // L: 384 - String var10 = var1.readStringCp1252NullTerminated(); // L: 385 - if (var10.length() > 0) { // L: 386 - this.itemActions[var5] = var10; // L: 387 - this.flags |= 1 << var5 + 23; // L: 388 + for (var5 = 0; var5 < 5; ++var5) { // L: 359 + String var10 = var1.readStringCp1252NullTerminated(); // L: 360 + if (var10.length() > 0) { // L: 361 + this.itemActions[var5] = var10; // L: 362 + this.flags |= 1 << var5 + 23; // L: 363 } } } - if (this.type == 8) { // L: 392 - this.text = var1.readStringCp1252NullTerminated(); // L: 393 + if (this.type == 8) { // L: 367 + this.text = var1.readStringCp1252NullTerminated(); // L: 368 } - if (this.buttonType == 2 || this.type == 2) { // L: 395 - this.spellActionName = var1.readStringCp1252NullTerminated(); // L: 396 - this.spellName = var1.readStringCp1252NullTerminated(); // L: 397 - var4 = var1.readUnsignedShort() & 63; // L: 398 - this.flags |= var4 << 11; // L: 399 + if (this.buttonType == 2 || this.type == 2) { // L: 370 + this.spellActionName = var1.readStringCp1252NullTerminated(); // L: 371 + this.spellName = var1.readStringCp1252NullTerminated(); // L: 372 + var4 = var1.readUnsignedShort() & 63; // L: 373 + this.flags |= var4 << 11; // L: 374 } - if (this.buttonType == 1 || this.buttonType == 4 || this.buttonType == 5 || this.buttonType == 6) { // L: 401 - this.buttonText = var1.readStringCp1252NullTerminated(); // L: 402 - if (this.buttonText.length() == 0) { // L: 403 - if (this.buttonType == 1) { // L: 404 + if (this.buttonType == 1 || this.buttonType == 4 || this.buttonType == 5 || this.buttonType == 6) { // L: 376 + this.buttonText = var1.readStringCp1252NullTerminated(); // L: 377 + if (this.buttonText.length() == 0) { // L: 378 + if (this.buttonType == 1) { // L: 379 this.buttonText = "Ok"; } - if (this.buttonType == 4) { // L: 405 + if (this.buttonType == 4) { // L: 380 this.buttonText = "Select"; } - if (this.buttonType == 5) { // L: 406 + if (this.buttonType == 5) { // L: 381 this.buttonText = "Select"; } - if (this.buttonType == 6) { // L: 407 + if (this.buttonType == 6) { // L: 382 this.buttonText = "Continue"; } } } - if (this.buttonType == 1 || this.buttonType == 4 || this.buttonType == 5) { // L: 410 - this.flags |= 4194304; // L: 411 + if (this.buttonType == 1 || this.buttonType == 4 || this.buttonType == 5) { // L: 385 + this.flags |= 4194304; // L: 386 } - if (this.buttonType == 6) { // L: 413 - this.flags |= 1; // L: 414 + if (this.buttonType == 6) { // L: 388 + this.flags |= 1; // L: 389 } - } // L: 416 + } // L: 391 - @ObfuscatedName("t") + @ObfuscatedName("p") @ObfuscatedSignature( - descriptor = "(Lnk;I)V", - garbageValue = "918444461" + descriptor = "(Lnd;I)V", + garbageValue = "107425419" ) @Export("decode") void decode(Buffer var1) { - var1.readUnsignedByte(); // L: 419 - this.isIf3 = true; // L: 420 - this.type = var1.readUnsignedByte(); // L: 421 - this.contentType = var1.readUnsignedShort(); // L: 422 - this.rawX = var1.readShort(); // L: 423 - this.rawY = var1.readShort(); // L: 424 - this.rawWidth = var1.readUnsignedShort(); // L: 425 - if (this.type == 9) { // L: 426 + var1.readUnsignedByte(); // L: 394 + this.isIf3 = true; // L: 395 + this.type = var1.readUnsignedByte(); // L: 396 + this.contentType = var1.readUnsignedShort(); // L: 397 + this.rawX = var1.readShort(); // L: 398 + this.rawY = var1.readShort(); // L: 399 + this.rawWidth = var1.readUnsignedShort(); // L: 400 + if (this.type == 9) { // L: 401 this.rawHeight = var1.readShort(); } else { - this.rawHeight = var1.readUnsignedShort(); // L: 427 + this.rawHeight = var1.readUnsignedShort(); // L: 402 } - this.widthAlignment = var1.readByte(); // L: 428 - this.heightAlignment = var1.readByte(); // L: 429 - this.xAlignment = var1.readByte(); // L: 430 - this.yAlignment = var1.readByte(); // L: 431 - this.parentId = var1.readUnsignedShort(); // L: 432 - if (this.parentId == 65535) { // L: 433 + this.widthAlignment = var1.readByte(); // L: 403 + this.heightAlignment = var1.readByte(); // L: 404 + this.xAlignment = var1.readByte(); // L: 405 + this.yAlignment = var1.readByte(); // L: 406 + this.parentId = var1.readUnsignedShort(); // L: 407 + if (this.parentId == 65535) { // L: 408 this.parentId = -1; } else { - this.parentId += this.id & -65536; // L: 434 + this.parentId += this.id & -65536; // L: 409 } - this.isHidden = var1.readUnsignedByte() == 1; // L: 435 - if (this.type == 0) { // L: 436 - this.scrollWidth = var1.readUnsignedShort(); // L: 437 - this.scrollHeight = var1.readUnsignedShort(); // L: 438 - this.noClickThrough = var1.readUnsignedByte() == 1; // L: 439 + this.isHidden = var1.readUnsignedByte() == 1; // L: 410 + if (this.type == 0) { // L: 411 + this.scrollWidth = var1.readUnsignedShort(); // L: 412 + this.scrollHeight = var1.readUnsignedShort(); // L: 413 + this.noClickThrough = var1.readUnsignedByte() == 1; // L: 414 } - if (this.type == 5) { // L: 441 - this.spriteId2 = var1.readInt(); // L: 442 - this.spriteAngle = var1.readUnsignedShort(); // L: 443 - this.spriteTiling = var1.readUnsignedByte() == 1; // L: 444 - this.transparencyTop = var1.readUnsignedByte(); // L: 445 - this.outline = var1.readUnsignedByte(); // L: 446 - this.spriteShadow = var1.readInt(); // L: 447 - this.spriteFlipV = var1.readUnsignedByte() == 1; // L: 448 - this.spriteFlipH = var1.readUnsignedByte() == 1; // L: 449 + if (this.type == 5) { // L: 416 + this.spriteId2 = var1.readInt(); // L: 417 + this.spriteAngle = var1.readUnsignedShort(); // L: 418 + this.spriteTiling = var1.readUnsignedByte() == 1; // L: 419 + this.transparencyTop = var1.readUnsignedByte(); // L: 420 + this.outline = var1.readUnsignedByte(); // L: 421 + this.spriteShadow = var1.readInt(); // L: 422 + this.spriteFlipV = var1.readUnsignedByte() == 1; // L: 423 + this.spriteFlipH = var1.readUnsignedByte() == 1; // L: 424 } - if (this.type == 6) { // L: 451 - this.modelType = 1; // L: 452 - this.modelId = var1.readUnsignedShort(); // L: 453 - if (this.modelId == 65535) { // L: 454 + if (this.type == 6) { // L: 426 + this.modelType = 1; // L: 427 + this.modelId = var1.readUnsignedShort(); // L: 428 + if (this.modelId == 65535) { // L: 429 this.modelId = -1; } - this.modelOffsetX = var1.readShort(); // L: 455 - this.modelOffsetY = var1.readShort(); // L: 456 - this.modelAngleX = var1.readUnsignedShort(); // L: 457 - this.modelAngleY = var1.readUnsignedShort(); // L: 458 - this.modelAngleZ = var1.readUnsignedShort(); // L: 459 - this.modelZoom = var1.readUnsignedShort(); // L: 460 - this.sequenceId = var1.readUnsignedShort(); // L: 461 - if (this.sequenceId == 65535) { // L: 462 + this.modelOffsetX = var1.readShort(); // L: 430 + this.modelOffsetY = var1.readShort(); // L: 431 + this.modelAngleX = var1.readUnsignedShort(); // L: 432 + this.modelAngleY = var1.readUnsignedShort(); // L: 433 + this.modelAngleZ = var1.readUnsignedShort(); // L: 434 + this.modelZoom = var1.readUnsignedShort(); // L: 435 + this.sequenceId = var1.readUnsignedShort(); // L: 436 + if (this.sequenceId == 65535) { // L: 437 this.sequenceId = -1; } - this.modelOrthog = var1.readUnsignedByte() == 1; // L: 463 - var1.readUnsignedShort(); // L: 464 - if (this.widthAlignment != 0) { // L: 465 - this.field3019 = var1.readUnsignedShort(); + this.modelOrthog = var1.readUnsignedByte() == 1; // L: 438 + var1.readUnsignedShort(); // L: 439 + if (this.widthAlignment != 0) { // L: 440 + this.field3013 = var1.readUnsignedShort(); } - if (this.heightAlignment != 0) { // L: 466 - var1.readUnsignedShort(); // L: 467 + if (this.heightAlignment != 0) { // L: 441 + var1.readUnsignedShort(); // L: 442 } } - if (this.type == 4) { // L: 470 - this.fontId = var1.readUnsignedShort(); // L: 471 - if (this.fontId == 65535) { // L: 472 + if (this.type == 4) { // L: 445 + this.fontId = var1.readUnsignedShort(); // L: 446 + if (this.fontId == 65535) { // L: 447 this.fontId = -1; } - this.text = var1.readStringCp1252NullTerminated(); // L: 473 - this.textLineHeight = var1.readUnsignedByte(); // L: 474 - this.textXAlignment = var1.readUnsignedByte(); // L: 475 - this.textYAlignment = var1.readUnsignedByte(); // L: 476 - this.textShadowed = var1.readUnsignedByte() == 1; // L: 477 - this.color = var1.readInt(); // L: 478 + this.text = var1.readStringCp1252NullTerminated(); // L: 448 + this.textLineHeight = var1.readUnsignedByte(); // L: 449 + this.textXAlignment = var1.readUnsignedByte(); // L: 450 + this.textYAlignment = var1.readUnsignedByte(); // L: 451 + this.textShadowed = var1.readUnsignedByte() == 1; // L: 452 + this.color = var1.readInt(); // L: 453 } - if (this.type == 3) { // L: 480 - this.color = var1.readInt(); // L: 481 - this.fill = var1.readUnsignedByte() == 1; // L: 482 - this.transparencyTop = var1.readUnsignedByte(); // L: 483 + if (this.type == 3) { // L: 455 + this.color = var1.readInt(); // L: 456 + this.fill = var1.readUnsignedByte() == 1; // L: 457 + this.transparencyTop = var1.readUnsignedByte(); // L: 458 } - if (this.type == 9) { // L: 485 - this.lineWid = var1.readUnsignedByte(); // L: 486 - this.color = var1.readInt(); // L: 487 - this.field2998 = var1.readUnsignedByte() == 1; // L: 488 + if (this.type == 9) { // L: 460 + this.lineWid = var1.readUnsignedByte(); // L: 461 + this.color = var1.readInt(); // L: 462 + this.field2992 = var1.readUnsignedByte() == 1; // L: 463 } - this.flags = var1.readMedium(); // L: 490 - this.dataText = var1.readStringCp1252NullTerminated(); // L: 491 - int var2 = var1.readUnsignedByte(); // L: 492 - if (var2 > 0) { // L: 493 - this.actions = new String[var2]; // L: 494 + this.flags = var1.readMedium(); // L: 465 + this.dataText = var1.readStringCp1252NullTerminated(); // L: 466 + int var2 = var1.readUnsignedByte(); // L: 467 + if (var2 > 0) { // L: 468 + this.actions = new String[var2]; // L: 469 - for (int var3 = 0; var3 < var2; ++var3) { // L: 495 + for (int var3 = 0; var3 < var2; ++var3) { // L: 470 this.actions[var3] = var1.readStringCp1252NullTerminated(); } } - this.dragZoneSize = var1.readUnsignedByte(); // L: 497 - this.dragThreshold = var1.readUnsignedByte(); // L: 498 - this.isScrollBar = var1.readUnsignedByte() == 1; // L: 499 - this.spellActionName = var1.readStringCp1252NullTerminated(); // L: 500 - this.onLoad = this.readListener(var1); // L: 501 - this.onMouseOver = this.readListener(var1); // L: 502 - this.onMouseLeave = this.readListener(var1); // L: 503 - this.onTargetLeave = this.readListener(var1); // L: 504 - this.onTargetEnter = this.readListener(var1); // L: 505 - this.onVarTransmit = this.readListener(var1); // L: 506 - this.onInvTransmit = this.readListener(var1); // L: 507 - this.onStatTransmit = this.readListener(var1); // L: 508 - this.onTimer = this.readListener(var1); // L: 509 - this.onOp = this.readListener(var1); // L: 510 - this.onMouseRepeat = this.readListener(var1); // L: 511 - this.onClick = this.readListener(var1); // L: 512 - this.onClickRepeat = this.readListener(var1); // L: 513 - this.onRelease = this.readListener(var1); // L: 514 - this.onHold = this.readListener(var1); // L: 515 - this.onDrag = this.readListener(var1); // L: 516 - this.onDragComplete = this.readListener(var1); // L: 517 - this.onScroll = this.readListener(var1); // L: 518 - this.varTransmitTriggers = this.readListenerTriggers(var1); // L: 519 - this.invTransmitTriggers = this.readListenerTriggers(var1); // L: 520 - this.statTransmitTriggers = this.readListenerTriggers(var1); // L: 521 - } // L: 522 + this.dragZoneSize = var1.readUnsignedByte(); // L: 472 + this.dragThreshold = var1.readUnsignedByte(); // L: 473 + this.isScrollBar = var1.readUnsignedByte() == 1; // L: 474 + this.spellActionName = var1.readStringCp1252NullTerminated(); // L: 475 + this.onLoad = this.readListener(var1); // L: 476 + this.onMouseOver = this.readListener(var1); // L: 477 + this.onMouseLeave = this.readListener(var1); // L: 478 + this.onTargetLeave = this.readListener(var1); // L: 479 + this.onTargetEnter = this.readListener(var1); // L: 480 + this.onVarTransmit = this.readListener(var1); // L: 481 + this.onInvTransmit = this.readListener(var1); // L: 482 + this.onStatTransmit = this.readListener(var1); // L: 483 + this.onTimer = this.readListener(var1); // L: 484 + this.onOp = this.readListener(var1); // L: 485 + this.onMouseRepeat = this.readListener(var1); // L: 486 + this.onClick = this.readListener(var1); // L: 487 + this.onClickRepeat = this.readListener(var1); // L: 488 + this.onRelease = this.readListener(var1); // L: 489 + this.onHold = this.readListener(var1); // L: 490 + this.onDrag = this.readListener(var1); // L: 491 + this.onDragComplete = this.readListener(var1); // L: 492 + this.onScroll = this.readListener(var1); // L: 493 + this.varTransmitTriggers = this.readListenerTriggers(var1); // L: 494 + this.invTransmitTriggers = this.readListenerTriggers(var1); // L: 495 + this.statTransmitTriggers = this.readListenerTriggers(var1); // L: 496 + } // L: 497 - @ObfuscatedName("v") + @ObfuscatedName("j") @ObfuscatedSignature( - descriptor = "(Lnk;I)[Ljava/lang/Object;", - garbageValue = "-926814318" + descriptor = "(Lnd;I)[Ljava/lang/Object;", + garbageValue = "1385511394" ) @Export("readListener") Object[] readListener(Buffer var1) { - int var2 = var1.readUnsignedByte(); // L: 525 - if (var2 == 0) { // L: 526 + int var2 = var1.readUnsignedByte(); // L: 500 + if (var2 == 0) { // L: 501 return null; } else { - Object[] var3 = new Object[var2]; // L: 527 + Object[] var3 = new Object[var2]; // L: 502 - for (int var4 = 0; var4 < var2; ++var4) { // L: 528 - int var5 = var1.readUnsignedByte(); // L: 529 + for (int var4 = 0; var4 < var2; ++var4) { // L: 503 + int var5 = var1.readUnsignedByte(); // L: 504 if (var5 == 0) { - var3[var4] = new Integer(var1.readInt()); // L: 530 - } else if (var5 == 1) { // L: 531 + var3[var4] = new Integer(var1.readInt()); // L: 505 + } else if (var5 == 1) { // L: 506 var3[var4] = var1.readStringCp1252NullTerminated(); } } - this.hasListener = true; // L: 533 - return var3; // L: 534 - } - } - - @ObfuscatedName("b") - @ObfuscatedSignature( - descriptor = "(Lnk;I)[I", - garbageValue = "1740975257" - ) - @Export("readListenerTriggers") - int[] readListenerTriggers(Buffer var1) { - int var2 = var1.readUnsignedByte(); // L: 538 - if (var2 == 0) { // L: 539 - return null; - } else { - int[] var3 = new int[var2]; // L: 540 - - for (int var4 = 0; var4 < var2; ++var4) { // L: 541 - var3[var4] = var1.readInt(); // L: 542 - } - - return var3; // L: 544 - } - } - - @ObfuscatedName("q") - @ObfuscatedSignature( - descriptor = "(III)V", - garbageValue = "435222986" - ) - @Export("swapItems") - public void swapItems(int var1, int var2) { - int var3 = this.itemIds[var2]; // L: 548 - this.itemIds[var2] = this.itemIds[var1]; // L: 549 - this.itemIds[var1] = var3; // L: 550 - var3 = this.itemQuantities[var2]; // L: 551 - this.itemQuantities[var2] = this.itemQuantities[var1]; // L: 552 - this.itemQuantities[var1] = var3; // L: 553 - } // L: 554 - - @ObfuscatedName("i") - @ObfuscatedSignature( - descriptor = "(ZI)Low;", - garbageValue = "1342803906" - ) - @Export("getSprite") - public SpritePixels getSprite(boolean var1) { - field2962 = false; // L: 557 - int var2; - if (var1) { // L: 559 - var2 = this.spriteId; - } else { - var2 = this.spriteId2; // L: 560 - } - - if (var2 == -1) { // L: 561 - return null; - } else { - long var3 = (long)var2 + ((long)this.outline << 36) + ((this.spriteFlipV ? 1L : 0L) << 38) + ((this.spriteFlipH ? 1L : 0L) << 39) + ((long)this.spriteShadow << 40); // L: 562 - SpritePixels var5 = (SpritePixels) Widget_cachedSprites.get(var3); // L: 563 - if (var5 != null) { // L: 564 - return var5; - } else { - var5 = Friend.SpriteBuffer_getSprite(Widget_spritesArchive, var2, 0); // L: 565 - if (var5 == null) { // L: 566 - field2962 = true; // L: 567 - return null; // L: 568 - } else { - if (this.spriteFlipV) { // L: 570 - var5.flipVertically(); - } - - if (this.spriteFlipH) { // L: 571 - var5.flipHorizontally(); - } - - if (this.outline > 0) { // L: 572 - var5.pad(this.outline); - } - - if (this.outline >= 1) { // L: 573 - var5.outline(1); - } - - if (this.outline >= 2) { // L: 574 - var5.outline(16777215); - } - - if (this.spriteShadow != 0) { // L: 575 - var5.shadow(this.spriteShadow); - } - - Widget_cachedSprites.put(var5, var3); // L: 576 - return var5; // L: 577 - } - } - } - } - - @ObfuscatedName("x") - @ObfuscatedSignature( - descriptor = "(I)Lkc;", - garbageValue = "912358255" - ) - @Export("getFont") - public Font getFont() { - field2962 = false; // L: 581 - if (this.fontId == -1) { // L: 582 - return null; - } else { - Font var1 = (Font) Widget_cachedFonts.get((long)this.fontId); // L: 583 - if (var1 != null) { // L: 584 - return var1; - } else { - AbstractArchive var3 = Widget_spritesArchive; // L: 586 - AbstractArchive var4 = FileSystem.Widget_fontsArchive; // L: 587 - int var5 = this.fontId; // L: 588 - Font var2; - if (!Username.method5711(var3, var5, 0)) { // L: 590 - var2 = null; // L: 591 - } else { - byte[] var7 = var4.takeFile(var5, 0); // L: 595 - Font var6; - if (var7 == null) { // L: 597 - var6 = null; // L: 598 - } else { - Font var8 = new Font(var7, class243.SpriteBuffer_xOffsets, class396.SpriteBuffer_yOffsets, ArchiveDiskActionHandler.SpriteBuffer_spriteWidths, class372.SpriteBuffer_spriteHeights, AccessFile.SpriteBuffer_spritePalette, class396.SpriteBuffer_pixels); // L: 601 - class243.SpriteBuffer_xOffsets = null; // L: 603 - class396.SpriteBuffer_yOffsets = null; // L: 604 - ArchiveDiskActionHandler.SpriteBuffer_spriteWidths = null; // L: 605 - class372.SpriteBuffer_spriteHeights = null; // L: 606 - AccessFile.SpriteBuffer_spritePalette = null; // L: 607 - class396.SpriteBuffer_pixels = null; // L: 608 - var6 = var8; // L: 610 - } - - var2 = var6; // L: 612 - } - - if (var2 != null) { // L: 615 - Widget_cachedFonts.put(var2, (long)this.fontId); - } else { - field2962 = true; // L: 616 - } - - return var2; // L: 617 - } - } - } - - @ObfuscatedName("k") - @ObfuscatedSignature( - descriptor = "(IB)Low;", - garbageValue = "18" - ) - @Export("getInventorySprite") - public SpritePixels getInventorySprite(int var1) { - field2962 = false; // L: 621 - if (var1 >= 0 && var1 < this.inventorySprites.length) { // L: 622 - int var2 = this.inventorySprites[var1]; // L: 623 - if (var2 == -1) { // L: 624 - return null; - } else { - SpritePixels var3 = (SpritePixels) Widget_cachedSprites.get((long)var2); // L: 625 - if (var3 != null) { // L: 626 - return var3; - } else { - var3 = Friend.SpriteBuffer_getSprite(Widget_spritesArchive, var2, 0); // L: 627 - if (var3 != null) { // L: 628 - Widget_cachedSprites.put(var3, (long)var2); - } else { - field2962 = true; // L: 629 - } - - return var3; // L: 630 - } - } - } else { - return null; + this.hasListener = true; // L: 508 + return var3; // L: 509 } } @ObfuscatedName("r") @ObfuscatedSignature( - descriptor = "(Lfb;IZLii;B)Lgj;", - garbageValue = "-34" + descriptor = "(Lnd;I)[I", + garbageValue = "548579688" + ) + @Export("readListenerTriggers") + int[] readListenerTriggers(Buffer var1) { + int var2 = var1.readUnsignedByte(); // L: 513 + if (var2 == 0) { // L: 514 + return null; + } else { + int[] var3 = new int[var2]; // L: 515 + + for (int var4 = 0; var4 < var2; ++var4) { // L: 516 + var3[var4] = var1.readInt(); // L: 517 + } + + return var3; // L: 519 + } + } + + @ObfuscatedName("b") + @ObfuscatedSignature( + descriptor = "(III)V", + garbageValue = "-296871230" + ) + @Export("swapItems") + public void swapItems(int var1, int var2) { + int var3 = this.itemIds[var2]; // L: 523 + this.itemIds[var2] = this.itemIds[var1]; // L: 524 + this.itemIds[var1] = var3; // L: 525 + var3 = this.itemQuantities[var2]; // L: 526 + this.itemQuantities[var2] = this.itemQuantities[var1]; // L: 527 + this.itemQuantities[var1] = var3; // L: 528 + } // L: 529 + + @ObfuscatedName("d") + @ObfuscatedSignature( + descriptor = "(ZI)Loh;", + garbageValue = "-903165753" + ) + @Export("getSprite") + public SpritePixels getSprite(boolean var1) { + field2956 = false; // L: 532 + int var2; + if (var1) { // L: 534 + var2 = this.spriteId; + } else { + var2 = this.spriteId2; // L: 535 + } + + if (var2 == -1) { // L: 536 + return null; + } else { + long var3 = ((long)this.spriteShadow << 40) + ((this.spriteFlipH ? 1L : 0L) << 39) + ((long)this.outline << 36) + (long)var2 + ((this.spriteFlipV ? 1L : 0L) << 38); // L: 537 + SpritePixels var5 = (SpritePixels)Widget_cachedSprites.get(var3); // L: 538 + if (var5 != null) { // L: 539 + return var5; + } else { + var5 = ClientPacket.SpriteBuffer_getSprite(class245.Widget_spritesArchive, var2, 0); // L: 540 + if (var5 == null) { // L: 541 + field2956 = true; // L: 542 + return null; // L: 543 + } else { + if (this.spriteFlipV) { // L: 545 + var5.flipVertically(); + } + + if (this.spriteFlipH) { // L: 546 + var5.flipHorizontally(); + } + + if (this.outline > 0) { // L: 547 + var5.pad(this.outline); + } + + if (this.outline >= 1) { // L: 548 + var5.outline(1); + } + + if (this.outline >= 2) { // L: 549 + var5.outline(16777215); + } + + if (this.spriteShadow != 0) { // L: 550 + var5.shadow(this.spriteShadow); + } + + Widget_cachedSprites.put(var5, var3); // L: 551 + return var5; // L: 552 + } + } + } + } + + @ObfuscatedName("s") + @ObfuscatedSignature( + descriptor = "(I)Lkt;", + garbageValue = "363940871" + ) + @Export("getFont") + public Font getFont() { + field2956 = false; // L: 556 + if (this.fontId == -1) { // L: 557 + return null; + } else { + Font var1 = (Font)Widget_cachedFonts.get((long)this.fontId); // L: 558 + if (var1 != null) { // L: 559 + return var1; + } else { + var1 = AbstractArchive.method5018(class245.Widget_spritesArchive, VertexNormal.Widget_fontsArchive, this.fontId, 0); // L: 560 + if (var1 != null) { + Widget_cachedFonts.put(var1, (long)this.fontId); // L: 561 + } else { + field2956 = true; // L: 562 + } + + return var1; // L: 563 + } + } + } + + @ObfuscatedName("u") + @ObfuscatedSignature( + descriptor = "(II)Loh;", + garbageValue = "-1449831748" + ) + @Export("getInventorySprite") + public SpritePixels getInventorySprite(int var1) { + field2956 = false; // L: 567 + if (var1 >= 0 && var1 < this.inventorySprites.length) { // L: 568 + int var2 = this.inventorySprites[var1]; // L: 569 + if (var2 == -1) { // L: 570 + return null; + } else { + SpritePixels var3 = (SpritePixels)Widget_cachedSprites.get((long)var2); // L: 571 + if (var3 != null) { // L: 572 + return var3; + } else { + var3 = ClientPacket.SpriteBuffer_getSprite(class245.Widget_spritesArchive, var2, 0); // L: 573 + if (var3 != null) { // L: 574 + Widget_cachedSprites.put(var3, (long)var2); + } else { + field2956 = true; // L: 575 + } + + return var3; // L: 576 + } + } + } else { + return null; + } + } + + @ObfuscatedName("l") + @ObfuscatedSignature( + descriptor = "(Lfl;IZLic;S)Lgr;", + garbageValue = "765" ) @Export("getModel") public Model getModel(SequenceDefinition var1, int var2, boolean var3, PlayerComposition var4) { - field2962 = false; // L: 634 + field2956 = false; // L: 580 int var5; int var6; - if (var3) { // L: 637 - var5 = this.modelType2; // L: 638 - var6 = this.modelId2; // L: 639 + if (var3) { // L: 583 + var5 = this.modelType2; // L: 584 + var6 = this.modelId2; // L: 585 } else { - var5 = this.modelType; // L: 642 - var6 = this.modelId; // L: 643 + var5 = this.modelType; // L: 588 + var6 = this.modelId; // L: 589 } - if (var5 == 0) { // L: 645 + if (var5 == 0) { // L: 591 return null; - } else if (var5 == 1 && var6 == -1) { // L: 646 + } else if (var5 == 1 && var6 == -1) { // L: 592 return null; } else { - Model var7 = (Model) Widget_cachedModels.get((long)(var6 + (var5 << 16))); // L: 647 - if (var7 == null) { // L: 648 + Model var7 = (Model)Widget_cachedModels.get((long)(var6 + (var5 << 16))); // L: 593 + if (var7 == null) { // L: 594 ModelData var8; - if (var5 == 1) { // L: 650 - var8 = ModelData.ModelData_get(class245.Widget_modelsArchive, var6, 0); // L: 651 - if (var8 == null) { // L: 652 - field2962 = true; // L: 653 - return null; // L: 654 + if (var5 == 1) { // L: 596 + var8 = ModelData.ModelData_get(SpriteMask.Widget_modelsArchive, var6, 0); // L: 597 + if (var8 == null) { // L: 598 + field2956 = true; // L: 599 + return null; // L: 600 } - var7 = var8.toModel(64, 768, -50, -10, -50); // L: 656 + var7 = var8.toModel(64, 768, -50, -10, -50); // L: 602 } - if (var5 == 2) { // L: 658 - var8 = class8.getNpcDefinition(var6).getModelData(); // L: 659 - if (var8 == null) { // L: 660 - field2962 = true; // L: 661 - return null; // L: 662 + if (var5 == 2) { // L: 604 + var8 = StructComposition.getNpcDefinition(var6).getModelData(); // L: 605 + if (var8 == null) { // L: 606 + field2956 = true; // L: 607 + return null; // L: 608 } - var7 = var8.toModel(64, 768, -50, -10, -50); // L: 664 + var7 = var8.toModel(64, 768, -50, -10, -50); // L: 610 } - if (var5 == 3) { // L: 666 - if (var4 == null) { // L: 667 + if (var5 == 3) { // L: 612 + if (var4 == null) { // L: 613 return null; } - var8 = var4.getModelData(); // L: 668 - if (var8 == null) { // L: 669 - field2962 = true; // L: 670 - return null; // L: 671 + var8 = var4.getModelData(); // L: 614 + if (var8 == null) { // L: 615 + field2956 = true; // L: 616 + return null; // L: 617 } - var7 = var8.toModel(64, 768, -50, -10, -50); // L: 673 + var7 = var8.toModel(64, 768, -50, -10, -50); // L: 619 } - if (var5 == 4) { // L: 675 - ItemComposition var9 = Strings.ItemDefinition_get(var6); // L: 676 - var8 = var9.getModelData(10); // L: 677 - if (var8 == null) { // L: 678 - field2962 = true; // L: 679 - return null; // L: 680 + if (var5 == 4) { // L: 621 + ItemComposition var9 = class260.ItemDefinition_get(var6); // L: 622 + var8 = var9.getModelData(10); // L: 623 + if (var8 == null) { // L: 624 + field2956 = true; // L: 625 + return null; // L: 626 } - var7 = var8.toModel(var9.ambient + 64, var9.contrast + 768, -50, -10, -50); // L: 682 + var7 = var8.toModel(var9.ambient + 64, var9.contrast + 768, -50, -10, -50); // L: 628 } - Widget_cachedModels.put(var7, (long)(var6 + (var5 << 16))); // L: 684 + Widget_cachedModels.put(var7, (long)(var6 + (var5 << 16))); // L: 630 } - if (var1 != null) { // L: 686 - var7 = var1.transformWidgetModel(var7, var2); // L: 687 + if (var1 != null) { // L: 632 + var7 = var1.transformWidgetModel(var7, var2); // L: 633 } - return var7; // L: 689 + return var7; // L: 635 } } - @ObfuscatedName("p") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "(ZI)Lil;", - garbageValue = "1247885701" + descriptor = "(ZI)Lit;", + garbageValue = "1203194660" ) @Export("getSpriteMask") public SpriteMask getSpriteMask(boolean var1) { - if (this.spriteId == -1) { // L: 693 + if (this.spriteId == -1) { // L: 639 var1 = false; } - int var2 = var1 ? this.spriteId * -1015582433 * 873384671 : this.spriteId2 * 228731547 * -50025581; // L: 694 - if (var2 == -1) { // L: 695 + int var2 = var1 ? this.spriteId * 1725494073 * -1286862071 : this.spriteId2 * -879658487 * -1111346119; // L: 640 + if (var2 == -1) { // L: 641 return null; } else { - long var3 = ((long)this.spriteShadow << 40) + ((this.spriteFlipH ? 1L : 0L) << 39) + (long)var2 + ((long)this.outline << 36) + ((this.spriteFlipV ? 1L : 0L) << 38); // L: 696 - SpriteMask var5 = (SpriteMask) Widget_cachedSpriteMasks.get(var3); // L: 697 - if (var5 != null) { // L: 698 + long var3 = ((long)this.spriteShadow << 40) + ((this.spriteFlipH ? 1L : 0L) << 39) + (long)var2 + ((long)this.outline << 36) + ((this.spriteFlipV ? 1L : 0L) << 38); // L: 642 + SpriteMask var5 = (SpriteMask)Widget_cachedSpriteMasks.get(var3); // L: 643 + if (var5 != null) { // L: 644 return var5; } else { - SpritePixels var6 = this.getSprite(var1); // L: 699 - if (var6 == null) { // L: 700 + SpritePixels var6 = this.getSprite(var1); // L: 645 + if (var6 == null) { // L: 646 return null; } else { - SpritePixels var7 = var6.copyNormalized(); // L: 701 - int[] var8 = new int[var7.subHeight]; // L: 702 - int[] var9 = new int[var7.subHeight]; // L: 703 + SpritePixels var7 = var6.copyNormalized(); // L: 647 + int[] var8 = new int[var7.subHeight]; // L: 648 + int[] var9 = new int[var7.subHeight]; // L: 649 - for (int var10 = 0; var10 < var7.subHeight; ++var10) { // L: 704 - int var11 = 0; // L: 705 - int var12 = var7.subWidth; // L: 706 + for (int var10 = 0; var10 < var7.subHeight; ++var10) { // L: 650 + int var11 = 0; // L: 651 + int var12 = var7.subWidth; // L: 652 int var13; - for (var13 = 0; var13 < var7.subWidth; ++var13) { // L: 707 - if (var7.pixels[var13 + var10 * var7.subWidth] == 0) { // L: 708 - var11 = var13; // L: 709 + for (var13 = 0; var13 < var7.subWidth; ++var13) { // L: 653 + if (var7.pixels[var13 + var10 * var7.subWidth] == 0) { // L: 654 + var11 = var13; // L: 655 break; } } - for (var13 = var7.subWidth - 1; var13 >= var11; --var13) { // L: 713 - if (var7.pixels[var13 + var10 * var7.subWidth] == 0) { // L: 714 - var12 = var13 + 1; // L: 715 + for (var13 = var7.subWidth - 1; var13 >= var11; --var13) { // L: 659 + if (var7.pixels[var13 + var10 * var7.subWidth] == 0) { // L: 660 + var12 = var13 + 1; // L: 661 break; } } - var8[var10] = var11; // L: 719 - var9[var10] = var12 - var11; // L: 720 + var8[var10] = var11; // L: 665 + var9[var10] = var12 - var11; // L: 666 } - var5 = new SpriteMask(var7.subWidth, var7.subHeight, var9, var8, var2); // L: 722 - Widget_cachedSpriteMasks.put(var5, var3); // L: 723 - return var5; // L: 724 + var5 = new SpriteMask(var7.subWidth, var7.subHeight, var9, var8, var2); // L: 668 + Widget_cachedSpriteMasks.put(var5, var3); // L: 669 + return var5; // L: 670 } } } } - @ObfuscatedName("e") + @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "(ILjava/lang/String;I)V", - garbageValue = "-97817393" + descriptor = "(ILjava/lang/String;B)V", + garbageValue = "-22" ) @Export("setAction") public void setAction(int var1, String var2) { - if (this.actions == null || this.actions.length <= var1) { // L: 735 - String[] var3 = new String[var1 + 1]; // L: 736 - if (this.actions != null) { // L: 737 - for (int var4 = 0; var4 < this.actions.length; ++var4) { // L: 738 + if (this.actions == null || this.actions.length <= var1) { // L: 674 + String[] var3 = new String[var1 + 1]; // L: 675 + if (this.actions != null) { // L: 676 + for (int var4 = 0; var4 < this.actions.length; ++var4) { // L: 677 var3[var4] = this.actions[var4]; } } - this.actions = var3; // L: 740 + this.actions = var3; // L: 679 } - this.actions[var1] = var2; // L: 742 - } // L: 743 + this.actions[var1] = var2; // L: 681 + } // L: 682 - @ObfuscatedName("z") + @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "(Lbc;Lbc;IZIZB)I", - garbageValue = "1" + descriptor = "(S)V", + garbageValue = "3623" ) - static int method4688(World var0, World var1, int var2, boolean var3, int var4, boolean var5) { - int var6 = ApproximateRouteStrategy.compareWorlds(var0, var1, var2, var3); // L: 199 - if (var6 != 0) { // L: 200 - return var3 ? -var6 : var6; // L: 201 - } else if (var4 == -1) { // L: 204 - return 0; - } else { - int var7 = ApproximateRouteStrategy.compareWorlds(var0, var1, var4, var5); // L: 205 - return var5 ? -var7 : var7; // L: 206 + public static void method4759() { + synchronized(ArchiveDiskActionHandler.ArchiveDiskActionHandler_lock) { // L: 88 + if (ArchiveDiskActionHandler.field3562 != 0) { // L: 89 + ArchiveDiskActionHandler.field3562 = 1; // L: 90 + + try { + ArchiveDiskActionHandler.ArchiveDiskActionHandler_lock.wait(); // L: 92 + } catch (InterruptedException var3) { // L: 94 + } + } + } - } + } // L: 97 } diff --git a/runescape-client/src/main/java/World.java b/runescape-client/src/main/java/World.java index 8d6795d7d5..84e39a00b2 100644 --- a/runescape-client/src/main/java/World.java +++ b/runescape-client/src/main/java/World.java @@ -5,66 +5,78 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; import net.runelite.rs.ScriptOpcodes; -@ObfuscatedName("bc") +@ObfuscatedName("bg") @Implements("World") public class World { - @ObfuscatedName("z") + @ObfuscatedName("j") @ObfuscatedGetter( - intValue = -287203745 + intValue = 1267509105 ) @Export("World_count") static int World_count; - @ObfuscatedName("t") + @ObfuscatedName("r") @ObfuscatedGetter( - intValue = -886714627 + intValue = -1119546685 ) @Export("World_listCount") static int World_listCount; - @ObfuscatedName("v") + @ObfuscatedName("b") @Export("World_sortOption2") static int[] World_sortOption2; - @ObfuscatedName("b") + @ObfuscatedName("d") @Export("World_sortOption1") static int[] World_sortOption1; - @ObfuscatedName("q") + @ObfuscatedName("fu") @ObfuscatedSignature( - descriptor = "Ldh;" + descriptor = "Lmu;" ) - @Export("World_request") - static UrlRequest World_request; - @ObfuscatedName("i") + @Export("WorldMapElement_fonts") + static Fonts WorldMapElement_fonts; + @ObfuscatedName("jz") + @ObfuscatedSignature( + descriptor = "Lgh;" + ) + @Export("textureProvider") + static TextureProvider textureProvider; + @ObfuscatedName("li") + @ObfuscatedSignature( + descriptor = "Lio;" + ) + @Export("mousedOverWidgetIf1") + static Widget mousedOverWidgetIf1; + @ObfuscatedName("u") @ObfuscatedGetter( - intValue = 1193469645 + intValue = -1428153959 ) @Export("id") int id; - @ObfuscatedName("x") + @ObfuscatedName("l") @ObfuscatedGetter( - intValue = 1795384885 + intValue = 264436593 ) @Export("properties") int properties; - @ObfuscatedName("k") + @ObfuscatedName("o") @ObfuscatedGetter( - intValue = -1923976783 + intValue = -508707417 ) @Export("population") int population; - @ObfuscatedName("r") + @ObfuscatedName("c") @Export("host") String host; - @ObfuscatedName("p") + @ObfuscatedName("e") @Export("activity") String activity; - @ObfuscatedName("a") + @ObfuscatedName("g") @ObfuscatedGetter( - intValue = -1414521915 + intValue = -1484367493 ) @Export("location") int location; - @ObfuscatedName("e") + @ObfuscatedName("a") @ObfuscatedGetter( - intValue = -2013336123 + intValue = 2005307775 ) @Export("index") int index; @@ -79,223 +91,442 @@ public class World { World() { } // L: 27 - @ObfuscatedName("q") + @ObfuscatedName("d") @ObfuscatedSignature( - descriptor = "(S)Z", - garbageValue = "-8093" + descriptor = "(I)Z", + garbageValue = "2086816927" ) @Export("isMembersOnly") boolean isMembersOnly() { - return (1 & this.properties) != 0; // L: 247 + return (1 & this.properties) != 0; } - @ObfuscatedName("i") + @ObfuscatedName("s") @ObfuscatedSignature( descriptor = "(I)Z", - garbageValue = "1692154963" + garbageValue = "-1823181912" ) - boolean method1722() { - return (2 & this.properties) != 0; // L: 251 + boolean method1638() { + return (2 & this.properties) != 0; // L: 261 } - @ObfuscatedName("x") + @ObfuscatedName("u") @ObfuscatedSignature( descriptor = "(I)Z", - garbageValue = "1903102242" + garbageValue = "-1133674448" ) @Export("isPvp") boolean isPvp() { - return (4 & this.properties) != 0; // L: 255 + return (4 & this.properties) != 0; // L: 265 } - @ObfuscatedName("k") + @ObfuscatedName("l") @ObfuscatedSignature( descriptor = "(I)Z", - garbageValue = "-1999947926" + garbageValue = "-1123465891" ) - boolean method1686() { - return (8 & this.properties) != 0; // L: 259 + boolean method1640() { + return (8 & this.properties) != 0; // L: 269 } - @ObfuscatedName("r") + @ObfuscatedName("o") @ObfuscatedSignature( descriptor = "(I)Z", - garbageValue = "-399759618" + garbageValue = "504803099" ) @Export("isDeadman") boolean isDeadman() { - return (536870912 & this.properties) != 0; // L: 263 - } - - @ObfuscatedName("p") - @ObfuscatedSignature( - descriptor = "(I)Z", - garbageValue = "1001248152" - ) - @Export("isBeta") - boolean isBeta() { - return (33554432 & this.properties) != 0; // L: 267 - } - - @ObfuscatedName("a") - @ObfuscatedSignature( - descriptor = "(B)Z", - garbageValue = "8" - ) - boolean method1689() { - return (1073741824 & this.properties) != 0; // L: 271 + return (536870912 & this.properties) != 0; } @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "(IIIIB)V", - garbageValue = "1" + descriptor = "(S)Z", + garbageValue = "255" ) - static void method1728(int var0, int var1, int var2, int var3) { - for (ObjectSound var4 = (ObjectSound)ObjectSound.objectSounds.last(); var4 != null; var4 = (ObjectSound)ObjectSound.objectSounds.previous()) { // L: 53 - if (var4.soundEffectId != -1 || var4.soundEffectIds != null) { // L: 54 - int var5 = 0; // L: 55 - if (var1 > var4.field926) { // L: 56 - var5 += var1 - var4.field926; - } else if (var1 < var4.x) { // L: 57 - var5 += var4.x - var1; - } - - if (var2 > var4.field927) { // L: 58 - var5 += var2 - var4.field927; - } else if (var2 < var4.y) { // L: 59 - var5 += var4.y - var2; - } - - if (var5 - 64 <= var4.field929 && class12.clientPreferences.areaSoundEffectsVolume != 0 && var0 == var4.plane) { // L: 60 - var5 -= 64; // L: 71 - if (var5 < 0) { // L: 72 - var5 = 0; - } - - int var6 = (var4.field929 - var5) * class12.clientPreferences.areaSoundEffectsVolume / var4.field929; // L: 73 - if (var4.stream1 == null) { // L: 74 - if (var4.soundEffectId >= 0) { // L: 75 - SoundEffect var7 = SoundEffect.readSoundEffect(class14.archive4, var4.soundEffectId, 0); // L: 76 - if (var7 != null) { // L: 77 - RawSound var8 = var7.toRawSound().resample(class3.decimator); // L: 78 - RawPcmStream var9 = RawPcmStream.createRawPcmStream(var8, 100, var6); // L: 79 - var9.setNumLoops(-1); // L: 80 - FloorOverlayDefinition.pcmStreamMixer.addSubStream(var9); // L: 81 - var4.stream1 = var9; // L: 82 - } - } - } else { - var4.stream1.method888(var6); // L: 86 - } - - if (var4.stream2 == null) { // L: 87 - if (var4.soundEffectIds != null && (var4.field923 -= var3) <= 0) { // L: 88 - int var11 = (int)(Math.random() * (double)var4.soundEffectIds.length); // L: 89 - SoundEffect var12 = SoundEffect.readSoundEffect(class14.archive4, var4.soundEffectIds[var11], 0); // L: 90 - if (var12 != null) { // L: 91 - RawSound var13 = var12.toRawSound().resample(class3.decimator); // L: 92 - RawPcmStream var10 = RawPcmStream.createRawPcmStream(var13, 100, var6); // L: 93 - var10.setNumLoops(0); // L: 94 - FloorOverlayDefinition.pcmStreamMixer.addSubStream(var10); // L: 95 - var4.stream2 = var10; // L: 96 - var4.field923 = var4.field934 + (int)(Math.random() * (double)(var4.field932 - var4.field934)); // L: 97 - } - } - } else { - var4.stream2.method888(var6); // L: 102 - if (!var4.stream2.hasNext()) { // L: 103 - var4.stream2 = null; // L: 104 - } - } - } else { - if (var4.stream1 != null) { // L: 61 - FloorOverlayDefinition.pcmStreamMixer.removeSubStream(var4.stream1); // L: 62 - var4.stream1 = null; // L: 63 - } - - if (var4.stream2 != null) { // L: 65 - FloorOverlayDefinition.pcmStreamMixer.removeSubStream(var4.stream2); // L: 66 - var4.stream2 = null; // L: 67 - } - } - } - } - - } // L: 108 - - @ObfuscatedName("o") - @ObfuscatedSignature( - descriptor = "(Ljp;IIIZI)V", - garbageValue = "1369105170" - ) - public static void method1684(AbstractArchive var0, int var1, int var2, int var3, boolean var4) { - class232.musicPlayerStatus = 1; // L: 40 - JagexCache.musicTrackArchive = var0; // L: 41 - class232.musicTrackGroupId = var1; // L: 42 - class232.musicTrackFileId = var2; // L: 43 - LoginPacket.musicTrackVolume = var3; // L: 44 - VarpDefinition.musicTrackBoolean = var4; // L: 45 - class232.pcmSampleLength = 10000; // L: 46 - } // L: 47 - - @ObfuscatedName("s") - @ObfuscatedSignature( - descriptor = "(ILci;ZI)I", - garbageValue = "306511777" - ) - static int method1713(int var0, Script var1, boolean var2) { - if (var0 == ScriptOpcodes.SOUND_SYNTH) { // L: 1810 - WorldMapCacheName.Interpreter_intStackSize -= 3; // L: 1811 - class69.queueSoundEffect(Interpreter.Interpreter_intStack[WorldMapCacheName.Interpreter_intStackSize], Interpreter.Interpreter_intStack[WorldMapCacheName.Interpreter_intStackSize + 1], Interpreter.Interpreter_intStack[WorldMapCacheName.Interpreter_intStackSize + 2]); // L: 1812 - return 1; // L: 1813 - } else if (var0 == ScriptOpcodes.SOUND_SONG) { // L: 1815 - FontName.playSong(Interpreter.Interpreter_intStack[--WorldMapCacheName.Interpreter_intStackSize]); // L: 1816 - return 1; // L: 1817 - } else if (var0 == ScriptOpcodes.SOUND_JINGLE) { // L: 1819 - WorldMapCacheName.Interpreter_intStackSize -= 2; // L: 1820 - class311.method5486(Interpreter.Interpreter_intStack[WorldMapCacheName.Interpreter_intStackSize], Interpreter.Interpreter_intStack[WorldMapCacheName.Interpreter_intStackSize + 1]); // L: 1821 - return 1; // L: 1822 - } else { - int var3; - if (var0 == 3203) { // L: 1824 - var3 = Math.min(Math.max(Interpreter.Interpreter_intStack[--WorldMapCacheName.Interpreter_intStackSize], 0), 100); // L: 1825 - class23.method306(Math.round(2.55F * (float)var3)); // L: 1826 - return 1; // L: 1827 - } else if (var0 == 3204) { // L: 1829 - Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = Math.round((float)class12.clientPreferences.musicVolume / 2.55F); // L: 1830 - return 1; // L: 1831 - } else if (var0 == 3205) { // L: 1833 - var3 = Math.min(Math.max(Interpreter.Interpreter_intStack[--WorldMapCacheName.Interpreter_intStackSize], 0), 100); // L: 1834 - class20.updateSoundEffectVolume(Math.round((float)var3 * 1.27F)); // L: 1835 - return 1; // L: 1836 - } else if (var0 == 3206) { // L: 1838 - Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = Math.round((float)class12.clientPreferences.soundEffectsVolume / 1.27F); // L: 1839 - return 1; // L: 1840 - } else if (var0 == 3207) { // L: 1842 - var3 = Math.min(Math.max(Interpreter.Interpreter_intStack[--WorldMapCacheName.Interpreter_intStackSize], 0), 100); // L: 1843 - Occluder.method4088(Math.round(1.27F * (float)var3)); // L: 1844 - return 1; // L: 1845 - } else if (var0 == 3208) { // L: 1847 - Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = Math.round((float)class12.clientPreferences.areaSoundEffectsVolume / 1.27F); // L: 1848 - return 1; // L: 1849 - } else { - return 2; // L: 1851 - } - } + @Export("isBeta") + boolean isBeta() { + return (33554432 & this.properties) != 0; } - @ObfuscatedName("ky") + @ObfuscatedName("e") @ObfuscatedSignature( - descriptor = "(Liv;I)Liv;", - garbageValue = "-1947834223" + descriptor = "(B)Z", + garbageValue = "12" ) - static Widget method1731(Widget var0) { - Widget var1 = HorizontalAlignment.method2731(var0); // L: 11104 - if (var1 == null) { - var1 = var0.parent; // L: 11105 + boolean method1643() { + return (1073741824 & this.properties) != 0; + } + + @ObfuscatedName("v") + @ObfuscatedSignature( + descriptor = "(ILjava/lang/String;Ljava/lang/String;I)V", + garbageValue = "-577854303" + ) + @Export("addGameMessage") + static void addGameMessage(int var0, String var1, String var2) { + class5.addChatMessage(var0, var1, var2, (String)null); // L: 19 + } // L: 20 + + @ObfuscatedName("n") + @ObfuscatedSignature( + descriptor = "(Lcz;III)V", + garbageValue = "704254621" + ) + @Export("runScript") + static void runScript(ScriptEvent var0, int var1, int var2) { + Object[] var3 = var0.args; // L: 110 + Script var4; + int var19; + if (NPC.isWorldMapEvent(var0.type)) { // L: 112 + class69.worldMapEvent = (WorldMapEvent)var3[0]; // L: 113 + WorldMapElement var5 = class6.WorldMapElement_get(class69.worldMapEvent.mapElement); // L: 114 + var4 = class43.getWorldMapScript(var0.type, var5.objectId, var5.category); // L: 115 + } else { + var19 = (Integer)var3[0]; // L: 118 + var4 = ApproximateRouteStrategy.getScript(var19); // L: 119 } - return var1; // L: 11106 + if (var4 != null) { // L: 121 + class44.Interpreter_intStackSize = 0; // L: 124 + Interpreter.Interpreter_stringStackSize = 0; // L: 125 + var19 = -1; // L: 126 + int[] var6 = var4.opcodes; // L: 127 + int[] var7 = var4.intOperands; // L: 128 + byte var8 = -1; // L: 129 + Interpreter.Interpreter_frameDepth = 0; // L: 130 + Interpreter.field973 = false; // L: 131 + boolean var9 = false; // L: 132 + int var10 = 0; // L: 133 + + try { + int var13; + try { + class368.Interpreter_intLocals = new int[var4.localIntCount]; // L: 135 + int var11 = 0; // L: 136 + Interpreter.Interpreter_stringLocals = new String[var4.localStringCount]; // L: 137 + int var12 = 0; // L: 138 + + int var14; + String var20; + for (var13 = 1; var13 < var3.length; ++var13) { // L: 139 + if (var3[var13] instanceof Integer) { // L: 140 + var14 = (Integer)var3[var13]; // L: 141 + if (var14 == -2147483647) { // L: 142 + var14 = var0.mouseX; + } + + if (var14 == -2147483646) { // L: 143 + var14 = var0.mouseY; + } + + if (var14 == -2147483645) { // L: 144 + var14 = var0.widget != null ? var0.widget.id * 1969535585 * -1722455647 : -1; + } + + if (var14 == -2147483644) { // L: 145 + var14 = var0.opIndex; + } + + if (var14 == -2147483643) { // L: 146 + var14 = var0.widget != null ? var0.widget.childIndex * 41180389 * 1926103277 : -1; + } + + if (var14 == -2147483642) { // L: 147 + var14 = var0.dragTarget != null ? var0.dragTarget.id * 1969535585 * -1722455647 : -1; + } + + if (var14 == -2147483641) { // L: 148 + var14 = var0.dragTarget != null ? var0.dragTarget.childIndex * 41180389 * 1926103277 : -1; + } + + if (var14 == -2147483640) { // L: 149 + var14 = var0.keyTyped; + } + + if (var14 == -2147483639) { // L: 150 + var14 = var0.keyPressed; + } + + class368.Interpreter_intLocals[var11++] = var14; // L: 151 + } else if (var3[var13] instanceof String) { // L: 153 + var20 = (String)var3[var13]; // L: 154 + if (var20.equals("event_opbase")) { // L: 155 + var20 = var0.targetName; + } + + Interpreter.Interpreter_stringLocals[var12++] = var20; // L: 156 + } + } + + Interpreter.field987 = var0.field1180; // L: 160 + + while (true) { + ++var10; // L: 162 + if (var10 > var1) { // L: 163 + throw new RuntimeException(); + } + + ++var19; // L: 164 + int var31 = var6[var19]; + if (var31 >= 100) { // L: 165 + boolean var32; + if (var4.intOperands[var19] == 1) { // L: 383 + var32 = true; + } else { + var32 = false; // L: 384 + } + + var14 = IgnoreList.method5628(var31, var4, var32); // L: 385 + switch(var14) { // L: 386 + case 0: + return; + case 1: + default: + break; + case 2: + throw new IllegalStateException(); // L: 393 + } + } else if (var31 == 0) { // L: 166 + Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = var7[var19]; // L: 167 + } else if (var31 == ScriptOpcodes.GET_VARP) { // L: 170 + var13 = var7[var19]; // L: 171 + Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = Varps.Varps_main[var13]; // L: 172 + } else if (var31 == ScriptOpcodes.SET_VARP) { // L: 175 + var13 = var7[var19]; // L: 176 + Varps.Varps_main[var13] = Interpreter.Interpreter_intStack[--class44.Interpreter_intStackSize]; // L: 177 + ApproximateRouteStrategy.changeGameOptions(var13); // L: 178 + } else if (var31 == ScriptOpcodes.SCONST) { // L: 181 + Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var4.stringOperands[var19]; // L: 182 + } else if (var31 == ScriptOpcodes.JUMP) { // L: 185 + var19 += var7[var19]; // L: 186 + } else if (var31 == ScriptOpcodes.IF_ICMPNE) { // L: 189 + class44.Interpreter_intStackSize -= 2; // L: 190 + if (Interpreter.Interpreter_intStack[class44.Interpreter_intStackSize] != Interpreter.Interpreter_intStack[class44.Interpreter_intStackSize + 1]) { // L: 191 + var19 += var7[var19]; + } + } else if (var31 == ScriptOpcodes.IF_ICMPEQ) { // L: 194 + class44.Interpreter_intStackSize -= 2; // L: 195 + if (Interpreter.Interpreter_intStack[class44.Interpreter_intStackSize] == Interpreter.Interpreter_intStack[class44.Interpreter_intStackSize + 1]) { // L: 196 + var19 += var7[var19]; + } + } else if (var31 == ScriptOpcodes.IF_ICMPLT) { // L: 199 + class44.Interpreter_intStackSize -= 2; // L: 200 + if (Interpreter.Interpreter_intStack[class44.Interpreter_intStackSize] < Interpreter.Interpreter_intStack[class44.Interpreter_intStackSize + 1]) { // L: 201 + var19 += var7[var19]; + } + } else if (var31 == ScriptOpcodes.IF_ICMPGT) { // L: 204 + class44.Interpreter_intStackSize -= 2; // L: 205 + if (Interpreter.Interpreter_intStack[class44.Interpreter_intStackSize] > Interpreter.Interpreter_intStack[class44.Interpreter_intStackSize + 1]) { // L: 206 + var19 += var7[var19]; + } + } else if (var31 == ScriptOpcodes.RETURN) { // L: 209 + if (Interpreter.Interpreter_frameDepth == 0) { // L: 210 + return; // L: 417 + } + + ScriptFrame var37 = Interpreter.Interpreter_frames[--Interpreter.Interpreter_frameDepth]; // L: 211 + var4 = var37.script; // L: 212 + var6 = var4.opcodes; // L: 213 + var7 = var4.intOperands; // L: 214 + var19 = var37.pc; // L: 215 + class368.Interpreter_intLocals = var37.intLocals; // L: 216 + Interpreter.Interpreter_stringLocals = var37.stringLocals; // L: 217 + } else if (var31 == ScriptOpcodes.GET_VARBIT) { // L: 220 + var13 = var7[var19]; // L: 221 + Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = Skeleton.getVarbit(var13); // L: 222 + } else if (var31 == ScriptOpcodes.SET_VARBIT) { // L: 225 + var13 = var7[var19]; // L: 226 + Login.method1951(var13, Interpreter.Interpreter_intStack[--class44.Interpreter_intStackSize]); // L: 227 + } else if (var31 == ScriptOpcodes.IF_ICMPLE) { // L: 230 + class44.Interpreter_intStackSize -= 2; // L: 231 + if (Interpreter.Interpreter_intStack[class44.Interpreter_intStackSize] <= Interpreter.Interpreter_intStack[class44.Interpreter_intStackSize + 1]) { // L: 232 + var19 += var7[var19]; + } + } else if (var31 == ScriptOpcodes.IF_ICMPGE) { // L: 235 + class44.Interpreter_intStackSize -= 2; // L: 236 + if (Interpreter.Interpreter_intStack[class44.Interpreter_intStackSize] >= Interpreter.Interpreter_intStack[class44.Interpreter_intStackSize + 1]) { // L: 237 + var19 += var7[var19]; + } + } else if (var31 == ScriptOpcodes.ILOAD) { // L: 240 + Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = class368.Interpreter_intLocals[var7[var19]]; // L: 241 + } else if (var31 == ScriptOpcodes.ISTORE) { // L: 244 + class368.Interpreter_intLocals[var7[var19]] = Interpreter.Interpreter_intStack[--class44.Interpreter_intStackSize]; // L: 245 + } else if (var31 == ScriptOpcodes.SLOAD) { // L: 248 + Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = Interpreter.Interpreter_stringLocals[var7[var19]]; // L: 249 + } else if (var31 == ScriptOpcodes.SSTORE) { // L: 252 + Interpreter.Interpreter_stringLocals[var7[var19]] = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize]; // L: 253 + } else if (var31 == ScriptOpcodes.JOIN_STRING) { // L: 256 + var13 = var7[var19]; // L: 257 + Interpreter.Interpreter_stringStackSize -= var13; // L: 258 + var20 = BuddyRankComparator.method2484(Interpreter.Interpreter_stringStack, Interpreter.Interpreter_stringStackSize, var13); // L: 259 + Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var20; // L: 260 + } else if (var31 == ScriptOpcodes.POP_INT) { // L: 263 + --class44.Interpreter_intStackSize; // L: 264 + } else if (var31 == ScriptOpcodes.POP_STRING) { // L: 267 + --Interpreter.Interpreter_stringStackSize; // L: 268 + } else { + int var17; + if (var31 != ScriptOpcodes.INVOKE) { // L: 271 + if (var31 == ScriptOpcodes.GET_VARC_INT) { // L: 294 + Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = GrandExchangeOfferOwnWorldComparator.varcs.getInt(var7[var19]); // L: 295 + } else if (var31 == ScriptOpcodes.SET_VARC_INT) { // L: 298 + GrandExchangeOfferOwnWorldComparator.varcs.setInt(var7[var19], Interpreter.Interpreter_intStack[--class44.Interpreter_intStackSize]); // L: 299 + } else if (var31 == ScriptOpcodes.DEFINE_ARRAY) { // L: 302 + var13 = var7[var19] >> 16; // L: 303 + var14 = var7[var19] & 65535; // L: 304 + int var23 = Interpreter.Interpreter_intStack[--class44.Interpreter_intStackSize]; // L: 305 + if (var23 < 0 || var23 > 5000) { // L: 306 + throw new RuntimeException(); // L: 307 + } + + Interpreter.Interpreter_arrayLengths[var13] = var23; // L: 309 + byte var24 = -1; // L: 310 + if (var14 == 105) { // L: 311 + var24 = 0; + } + + for (var17 = 0; var17 < var23; ++var17) { // L: 312 + Interpreter.Interpreter_arrays[var13][var17] = var24; + } + } else if (var31 == ScriptOpcodes.GET_ARRAY_INT) { // L: 315 + var13 = var7[var19]; // L: 316 + var14 = Interpreter.Interpreter_intStack[--class44.Interpreter_intStackSize]; // L: 317 + if (var14 < 0 || var14 >= Interpreter.Interpreter_arrayLengths[var13]) { // L: 318 + throw new RuntimeException(); // L: 319 + } + + Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = Interpreter.Interpreter_arrays[var13][var14]; // L: 321 + } else if (var31 == ScriptOpcodes.SET_ARRAY_INT) { // L: 324 + var13 = var7[var19]; // L: 325 + class44.Interpreter_intStackSize -= 2; // L: 326 + var14 = Interpreter.Interpreter_intStack[class44.Interpreter_intStackSize]; // L: 327 + if (var14 < 0 || var14 >= Interpreter.Interpreter_arrayLengths[var13]) { // L: 328 + throw new RuntimeException(); // L: 329 + } + + Interpreter.Interpreter_arrays[var13][var14] = Interpreter.Interpreter_intStack[class44.Interpreter_intStackSize + 1]; // L: 331 + } else { + String var21; + if (var31 == ScriptOpcodes.GET_VARC_STRING_OLD) { // L: 334 + var21 = GrandExchangeOfferOwnWorldComparator.varcs.getStringOld(var7[var19]); // L: 335 + if (var21 == null) { // L: 336 + var21 = "null"; + } + + Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var21; // L: 337 + } else if (var31 == ScriptOpcodes.SET_VARC_STRING_OLD) { // L: 340 + GrandExchangeOfferOwnWorldComparator.varcs.setStringOld(var7[var19], Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize]); // L: 341 + } else if (var31 == ScriptOpcodes.GET_VARC_STRING) { // L: 344 + var21 = GrandExchangeOfferOwnWorldComparator.varcs.getString(var7[var19]); // L: 345 + Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var21; // L: 346 + } else if (var31 == ScriptOpcodes.SET_VARC_STRING) { // L: 349 + GrandExchangeOfferOwnWorldComparator.varcs.setString(var7[var19], Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize]); // L: 350 + } else if (var31 == ScriptOpcodes.SWITCH) { // L: 353 + IterableNodeHashTable var35 = var4.switches[var7[var19]]; // L: 354 + IntegerNode var34 = (IntegerNode)var35.get((long)Interpreter.Interpreter_intStack[--class44.Interpreter_intStackSize]); // L: 355 + if (var34 != null) { // L: 356 + var19 += var34.integer; + } + } else { + Integer var36; + if (var31 == 74) { // L: 359 + var36 = class26.field220.getTitleGroupValue(var7[var19]); // L: 360 + if (var36 == null) { // L: 361 + Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = -1; // L: 362 + } else { + Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = var36; // L: 365 + } + } else { + if (var31 != 76) { // L: 369 + throw new IllegalStateException(); // L: 379 + } + + var36 = class34.field254.method6014(var7[var19]); // L: 370 + if (var36 == null) { // L: 371 + Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = -1; // L: 372 + } else { + Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = var36; // L: 375 + } + } + } + } + } else { + var13 = var7[var19]; // L: 272 + Script var33 = ApproximateRouteStrategy.getScript(var13); // L: 273 + int[] var15 = new int[var33.localIntCount]; // L: 274 + String[] var16 = new String[var33.localStringCount]; // L: 275 + + for (var17 = 0; var17 < var33.intArgumentCount; ++var17) { // L: 276 + var15[var17] = Interpreter.Interpreter_intStack[var17 + (class44.Interpreter_intStackSize - var33.intArgumentCount)]; + } + + for (var17 = 0; var17 < var33.stringArgumentCount; ++var17) { // L: 277 + var16[var17] = Interpreter.Interpreter_stringStack[var17 + (Interpreter.Interpreter_stringStackSize - var33.stringArgumentCount)]; + } + + class44.Interpreter_intStackSize -= var33.intArgumentCount; // L: 278 + Interpreter.Interpreter_stringStackSize -= var33.stringArgumentCount; // L: 279 + ScriptFrame var22 = new ScriptFrame(); // L: 280 + var22.script = var4; // L: 281 + var22.pc = var19; // L: 282 + var22.intLocals = class368.Interpreter_intLocals; // L: 283 + var22.stringLocals = Interpreter.Interpreter_stringLocals; // L: 284 + Interpreter.Interpreter_frames[++Interpreter.Interpreter_frameDepth - 1] = var22; // L: 285 + var4 = var33; // L: 286 + var6 = var33.opcodes; // L: 287 + var7 = var33.intOperands; // L: 288 + var19 = -1; // L: 289 + class368.Interpreter_intLocals = var15; // L: 290 + Interpreter.Interpreter_stringLocals = var16; // L: 291 + } + } + } + } catch (Exception var29) { // L: 399 + var9 = true; // L: 400 + StringBuilder var26 = new StringBuilder(30); // L: 402 + var26.append("").append(var4.key).append(" "); // L: 403 + + for (var13 = Interpreter.Interpreter_frameDepth - 1; var13 >= 0; --var13) { // L: 404 + var26.append("").append(Interpreter.Interpreter_frames[var13].script.key).append(" "); + } + + var26.append("").append(var8); // L: 405 + class266.RunException_sendStackTrace(var26.toString(), var29); // L: 406 + } + } finally { + if (Interpreter.field973) { // L: 410 + Interpreter.field986 = true; // L: 411 + class4.method47(); // L: 412 + Interpreter.field986 = false; // L: 413 + Interpreter.field973 = false; // L: 414 + } + + if (!var9 && var2 > 0 && var10 >= var2) { // L: 416 + class266.RunException_sendStackTrace("Warning: Script " + var4.field1084 + " finished at op count " + var10 + " of max " + var1, (Throwable)null); + } + + } + } + } // L: 122 420 + + @ObfuscatedName("y") + @ObfuscatedSignature( + descriptor = "(IIIS)I", + garbageValue = "24074" + ) + public static int method1685(int var0, int var1, int var2) { + int var3 = CollisionMap.method3185(var2 - var1 + 1); // L: 51 + var3 <<= var1; // L: 52 + return var0 & ~var3; // L: 53 + } + + @ObfuscatedName("j") + @ObfuscatedSignature( + descriptor = "(II)Z", + garbageValue = "1461307480" + ) + public static boolean method1663(int var0) { + return (var0 >> 30 & 1) != 0; // L: 29 } } diff --git a/runescape-client/src/main/java/WorldMap.java b/runescape-client/src/main/java/WorldMap.java index c24dc90068..27ff1f688c 100644 --- a/runescape-client/src/main/java/WorldMap.java +++ b/runescape-client/src/main/java/WorldMap.java @@ -10,280 +10,280 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("mv") +@ObfuscatedName("mc") @Implements("WorldMap") public class WorldMap { - @ObfuscatedName("q") + @ObfuscatedName("s") @ObfuscatedSignature( - descriptor = "Lmx;" + descriptor = "Lmv;" ) @Export("fontNameVerdana11") static final FontName fontNameVerdana11; - @ObfuscatedName("i") + @ObfuscatedName("u") @ObfuscatedSignature( - descriptor = "Lmx;" + descriptor = "Lmv;" ) @Export("fontNameVerdana13") static final FontName fontNameVerdana13; - @ObfuscatedName("x") + @ObfuscatedName("l") @ObfuscatedSignature( - descriptor = "Lmx;" + descriptor = "Lmv;" ) @Export("fontNameVerdana15") static final FontName fontNameVerdana15; - @ObfuscatedName("t") + @ObfuscatedName("r") @ObfuscatedSignature( - descriptor = "Ljp;" + descriptor = "Ljv;" ) @Export("WorldMap_archive") AbstractArchive WorldMap_archive; - @ObfuscatedName("v") + @ObfuscatedName("b") @ObfuscatedSignature( - descriptor = "Ljp;" + descriptor = "Ljv;" ) @Export("WorldMap_geographyArchive") AbstractArchive WorldMap_geographyArchive; - @ObfuscatedName("b") + @ObfuscatedName("d") @ObfuscatedSignature( - descriptor = "Ljp;" + descriptor = "Ljv;" ) @Export("WorldMap_groundArchive") AbstractArchive WorldMap_groundArchive; - @ObfuscatedName("k") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "Lkc;" + descriptor = "Lkt;" ) @Export("font") Font font; - @ObfuscatedName("r") + @ObfuscatedName("c") @Export("fonts") HashMap fonts; - @ObfuscatedName("p") + @ObfuscatedName("e") @ObfuscatedSignature( - descriptor = "[Lof;" + descriptor = "[Lop;" ) @Export("mapSceneSprites") IndexedSprite[] mapSceneSprites; - @ObfuscatedName("a") + @ObfuscatedName("g") @Export("details") HashMap details; - @ObfuscatedName("e") + @ObfuscatedName("a") @ObfuscatedSignature( - descriptor = "Lfe;" + descriptor = "Lfo;" ) @Export("mainMapArea") WorldMapArea mainMapArea; - @ObfuscatedName("d") + @ObfuscatedName("k") @ObfuscatedSignature( - descriptor = "Lfe;" + descriptor = "Lfo;" ) @Export("currentMapArea") WorldMapArea currentMapArea; - @ObfuscatedName("u") - @ObfuscatedSignature( - descriptor = "Lfe;" - ) - WorldMapArea field4055; @ObfuscatedName("m") @ObfuscatedSignature( - descriptor = "Lfs;" + descriptor = "Lfo;" + ) + WorldMapArea field4005; + @ObfuscatedName("x") + @ObfuscatedSignature( + descriptor = "Lff;" ) @Export("worldMapManager") WorldMapManager worldMapManager; - @ObfuscatedName("j") + @ObfuscatedName("z") @ObfuscatedSignature( - descriptor = "Lmz;" + descriptor = "Lma;" ) @Export("cacheLoader") WorldMapArchiveLoader cacheLoader; - @ObfuscatedName("f") + @ObfuscatedName("w") @ObfuscatedGetter( - intValue = -1206646279 + intValue = 832010327 ) @Export("centerTileX") int centerTileX; - @ObfuscatedName("s") + @ObfuscatedName("t") @ObfuscatedGetter( - intValue = 277375405 + intValue = -1742821169 ) @Export("centerTileY") int centerTileY; - @ObfuscatedName("y") + @ObfuscatedName("h") @ObfuscatedGetter( - intValue = -2110522315 + intValue = -1917021433 ) @Export("worldMapTargetX") int worldMapTargetX; - @ObfuscatedName("w") + @ObfuscatedName("q") @ObfuscatedGetter( - intValue = -1311333317 + intValue = 608372165 ) @Export("worldMapTargetY") int worldMapTargetY; - @ObfuscatedName("n") + @ObfuscatedName("i") @Export("zoom") float zoom; - @ObfuscatedName("ag") + @ObfuscatedName("ae") @Export("zoomTarget") float zoomTarget; - @ObfuscatedName("ae") + @ObfuscatedName("ap") @ObfuscatedGetter( - intValue = -1940181169 + intValue = -713333301 ) @Export("worldMapDisplayWidth") int worldMapDisplayWidth; - @ObfuscatedName("ao") + @ObfuscatedName("ab") @ObfuscatedGetter( - intValue = 1063260953 + intValue = 1104674959 ) @Export("worldMapDisplayHeight") int worldMapDisplayHeight; - @ObfuscatedName("aj") + @ObfuscatedName("al") @ObfuscatedGetter( - intValue = 93512241 + intValue = -1688617501 ) @Export("worldMapDisplayX") int worldMapDisplayX; - @ObfuscatedName("aw") + @ObfuscatedName("ad") @ObfuscatedGetter( - intValue = 145201933 + intValue = -530472683 ) @Export("worldMapDisplayY") int worldMapDisplayY; - @ObfuscatedName("at") + @ObfuscatedName("ai") @ObfuscatedGetter( - intValue = 357066505 + intValue = 1572937001 ) @Export("maxFlashCount") int maxFlashCount; - @ObfuscatedName("av") + @ObfuscatedName("ar") @ObfuscatedGetter( - intValue = -682450607 + intValue = -1112417039 ) @Export("cyclesPerFlash") int cyclesPerFlash; - @ObfuscatedName("al") + @ObfuscatedName("ag") @Export("perpetualFlash") boolean perpetualFlash; - @ObfuscatedName("ap") + @ObfuscatedName("ax") @Export("flashingElements") HashSet flashingElements; - @ObfuscatedName("am") + @ObfuscatedName("as") @ObfuscatedGetter( - intValue = -1601158889 + intValue = 930560977 ) @Export("flashCount") int flashCount; - @ObfuscatedName("ax") + @ObfuscatedName("aj") @ObfuscatedGetter( - intValue = -911673787 + intValue = 1851163185 ) @Export("flashCycle") int flashCycle; - @ObfuscatedName("ak") + @ObfuscatedName("am") @ObfuscatedGetter( - intValue = -812935803 + intValue = 951497435 ) - int field4012; - @ObfuscatedName("ay") + int field4024; + @ObfuscatedName("az") @ObfuscatedGetter( - intValue = 1804429691 + intValue = 1329336223 ) - int field4036; - @ObfuscatedName("ai") + int field4025; + @ObfuscatedName("av") @ObfuscatedGetter( - intValue = -1518372797 + intValue = 1506589769 ) - int field4037; - @ObfuscatedName("aa") + int field4026; + @ObfuscatedName("ac") @ObfuscatedGetter( - intValue = 262455227 + intValue = -1142772071 ) - int field4028; - @ObfuscatedName("au") + int field4027; + @ObfuscatedName("at") @ObfuscatedGetter( - longValue = 5629024107057681543L + longValue = 5467077858169346091L ) - long field4023; - @ObfuscatedName("as") + long field4034; + @ObfuscatedName("ah") @ObfuscatedGetter( - intValue = 565985047 - ) - int field4040; - @ObfuscatedName("ad") - @ObfuscatedGetter( - intValue = 1614822327 + intValue = 1480322263 ) int field4041; - @ObfuscatedName("ac") - boolean field4030; - @ObfuscatedName("ab") + @ObfuscatedName("ao") + @ObfuscatedGetter( + intValue = -559799129 + ) + int field4022; + @ObfuscatedName("aq") + boolean field3999; + @ObfuscatedName("ak") @Export("enabledElements") HashSet enabledElements; - @ObfuscatedName("ar") + @ObfuscatedName("ay") @Export("enabledCategories") HashSet enabledCategories; - @ObfuscatedName("ah") + @ObfuscatedName("aa") @Export("enabledElementIds") HashSet enabledElementIds; - @ObfuscatedName("af") - HashSet field4046; + @ObfuscatedName("au") + HashSet field4008; @ObfuscatedName("an") @Export("elementsDisabled") boolean elementsDisabled; @ObfuscatedName("bd") @ObfuscatedGetter( - intValue = -1911375029 + intValue = -366242899 ) - int field4048; - @ObfuscatedName("bf") + int field4037; + @ObfuscatedName("bq") @Export("menuOpcodes") final int[] menuOpcodes; @ObfuscatedName("bu") - List field4024; - @ObfuscatedName("bb") + List field4039; + @ObfuscatedName("bl") @Export("iconIterator") Iterator iconIterator; - @ObfuscatedName("bk") - HashSet field4052; - @ObfuscatedName("bt") + @ObfuscatedName("bv") + HashSet field4031; + @ObfuscatedName("bm") @ObfuscatedSignature( - descriptor = "Lia;" + descriptor = "Lii;" ) @Export("mouseCoord") Coord mouseCoord; - @ObfuscatedName("by") + @ObfuscatedName("bz") @Export("showCoord") public boolean showCoord; - @ObfuscatedName("bz") + @ObfuscatedName("bh") @ObfuscatedSignature( - descriptor = "Low;" + descriptor = "Loh;" ) @Export("sprite") SpritePixels sprite; - @ObfuscatedName("br") + @ObfuscatedName("bs") @ObfuscatedGetter( - intValue = 2077953177 + intValue = -330827285 ) @Export("cachedPixelsPerTile") int cachedPixelsPerTile; - @ObfuscatedName("bm") + @ObfuscatedName("br") @ObfuscatedGetter( - intValue = 657796665 + intValue = 420522837 ) @Export("minCachedTileX") int minCachedTileX; - @ObfuscatedName("bn") + @ObfuscatedName("bf") @ObfuscatedGetter( - intValue = -1426711567 + intValue = 789017035 ) @Export("minCachedTileY") int minCachedTileY; @ObfuscatedName("ba") @ObfuscatedGetter( - intValue = 1136693433 + intValue = -451939943 ) - int field4059; + int field4006; static { fontNameVerdana11 = FontName.FontName_verdana11; // L: 46 @@ -304,30 +304,30 @@ public class WorldMap { this.flashingElements = null; // L: 71 this.flashCount = -1; // L: 72 this.flashCycle = -1; // L: 73 - this.field4012 = -1; // L: 74 - this.field4036 = -1; // L: 75 - this.field4037 = -1; // L: 76 - this.field4028 = -1; // L: 77 - this.field4030 = true; // L: 81 + this.field4024 = -1; // L: 74 + this.field4025 = -1; // L: 75 + this.field4026 = -1; // L: 76 + this.field4027 = -1; // L: 77 + this.field3999 = true; // L: 81 this.enabledElements = new HashSet(); // L: 84 this.enabledCategories = new HashSet(); // L: 85 this.enabledElementIds = new HashSet(); // L: 86 - this.field4046 = new HashSet(); // L: 87 + this.field4008 = new HashSet(); // L: 87 this.elementsDisabled = false; // L: 88 - this.field4048 = 0; // L: 89 + this.field4037 = 0; // L: 89 this.menuOpcodes = new int[]{1008, 1009, 1010, 1011, 1012}; // L: 91 - this.field4052 = new HashSet(); // L: 94 + this.field4031 = new HashSet(); // L: 94 this.mouseCoord = null; // L: 95 this.showCoord = false; // L: 96 this.minCachedTileX = -1; // L: 99 this.minCachedTileY = -1; // L: 100 - this.field4059 = -1; // L: 101 + this.field4006 = -1; // L: 101 } - @ObfuscatedName("h") + @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "(Ljp;Ljp;Ljp;Lkc;Ljava/util/HashMap;[Lof;B)V", - garbageValue = "-1" + descriptor = "(Ljv;Ljv;Ljv;Lkt;Ljava/util/HashMap;[Lop;I)V", + garbageValue = "1276633974" ) @Export("init") public void init(AbstractArchive var1, AbstractArchive var2, AbstractArchive var3, Font var4, HashMap var5, IndexedSprite[] var6) { @@ -341,7 +341,7 @@ public class WorldMap { this.fonts.put(WorldMapLabelSize.WorldMapLabelSize_medium, var5.get(fontNameVerdana13)); // L: 112 this.fonts.put(WorldMapLabelSize.WorldMapLabelSize_large, var5.get(fontNameVerdana15)); // L: 113 this.cacheLoader = new WorldMapArchiveLoader(var1); // L: 114 - int var7 = this.WorldMap_archive.getGroupId(WorldMapCacheName.field2128.name); // L: 115 + int var7 = this.WorldMap_archive.getGroupId(WorldMapCacheName.field2137.name); // L: 115 int[] var8 = this.WorldMap_archive.getGroupFileIds(var7); // L: 116 this.details = new HashMap(var8.length); // L: 117 @@ -356,22 +356,22 @@ public class WorldMap { } this.setCurrentMapArea(this.mainMapArea); // L: 127 - this.field4055 = null; // L: 128 + this.field4005 = null; // L: 128 } // L: 129 - @ObfuscatedName("c") + @ObfuscatedName("n") @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "1374549723" + descriptor = "(B)V", + garbageValue = "2" ) - public void method6124() { + public void method6100() { WorldMapRegion.WorldMapRegion_cachedSprites.demote(5); // L: 133 } // L: 135 - @ObfuscatedName("o") + @ObfuscatedName("f") @ObfuscatedSignature( descriptor = "(IIZIIIII)V", - garbageValue = "1679819972" + garbageValue = "-814941662" ) @Export("onCycle") public void onCycle(int var1, int var2, boolean var3, int var4, int var5, int var6, int var7) { @@ -381,27 +381,27 @@ public class WorldMap { if (var3) { // L: 143 int var8 = (int)Math.ceil((double)((float)var6 / this.zoom)); // L: 146 int var9 = (int)Math.ceil((double)((float)var7 / this.zoom)); // L: 147 - List var10 = this.worldMapManager.method3430(this.centerTileX - var8 / 2 - 1, this.centerTileY - var9 / 2 - 1, var8 / 2 + this.centerTileX + 1, var9 / 2 + this.centerTileY + 1, var4, var5, var6, var7, var1, var2); // L: 148 + List var10 = this.worldMapManager.method3465(this.centerTileX - var8 / 2 - 1, this.centerTileY - var9 / 2 - 1, var8 / 2 + this.centerTileX + 1, var9 / 2 + this.centerTileY + 1, var4, var5, var6, var7, var1, var2); // L: 148 HashSet var11 = new HashSet(); // L: 149 Iterator var12; AbstractWorldMapIcon var13; ScriptEvent var14; WorldMapEvent var15; - for (var12 = var10.iterator(); var12.hasNext(); class259.runScriptEvent(var14)) { // L: 150 163 + for (var12 = var10.iterator(); var12.hasNext(); PacketWriter.runScriptEvent(var14)) { // L: 150 163 var13 = (AbstractWorldMapIcon)var12.next(); // L: 151 var11.add(var13); // L: 153 var14 = new ScriptEvent(); // L: 154 var15 = new WorldMapEvent(var13.getElement(), var13.coord1, var13.coord2); // L: 155 var14.setArgs(new Object[]{var15, var1, var2}); // L: 156 - if (this.field4052.contains(var13)) { // L: 157 + if (this.field4031.contains(var13)) { // L: 157 var14.setType(17); // L: 158 } else { var14.setType(15); // L: 161 } } - var12 = this.field4052.iterator(); // L: 166 + var12 = this.field4031.iterator(); // L: 166 while (var12.hasNext()) { var13 = (AbstractWorldMapIcon)var12.next(); // L: 167 @@ -410,1033 +410,1030 @@ public class WorldMap { var15 = new WorldMapEvent(var13.getElement(), var13.coord1, var13.coord2); // L: 171 var14.setArgs(new Object[]{var15, var1, var2}); // L: 172 var14.setType(16); // L: 173 - class259.runScriptEvent(var14); // L: 174 + PacketWriter.runScriptEvent(var14); // L: 174 } } - this.field4052 = var11; // L: 178 + this.field4031 = var11; // L: 178 } } } // L: 139 144 179 - @ObfuscatedName("g") + @ObfuscatedName("y") @ObfuscatedSignature( - descriptor = "(IIZZB)V", - garbageValue = "7" + descriptor = "(IIZZI)V", + garbageValue = "-882854276" ) - public void method5953(int var1, int var2, boolean var3, boolean var4) { - long var5 = Archive.currentTimeMillis(); // L: 182 - this.method6062(var1, var2, var4, var5); // L: 183 + public void method6188(int var1, int var2, boolean var3, boolean var4) { + long var5 = ObjectComposition.currentTimeMillis(); // L: 182 + this.method6250(var1, var2, var4, var5); // L: 183 if (this.hasTarget() || !var4 && !var3) { // L: 184 - this.method5996(); // L: 198 + this.method6107(); // L: 198 } else { if (var4) { // L: 185 - this.field4037 = var1; // L: 186 - this.field4028 = var2; // L: 187 - this.field4012 = this.centerTileX; // L: 188 - this.field4036 = this.centerTileY; // L: 189 + this.field4026 = var1; // L: 186 + this.field4027 = var2; // L: 187 + this.field4024 = this.centerTileX; // L: 188 + this.field4025 = this.centerTileY; // L: 189 } - if (this.field4012 != -1) { // L: 191 - int var7 = var1 - this.field4037; // L: 192 - int var8 = var2 - this.field4028; // L: 193 - this.setWorldMapPosition(this.field4012 - (int)((float)var7 / this.zoomTarget), (int)((float)var8 / this.zoomTarget) + this.field4036, false); // L: 194 + if (this.field4024 != -1) { // L: 191 + int var7 = var1 - this.field4026; // L: 192 + int var8 = var2 - this.field4027; // L: 193 + this.setWorldMapPosition(this.field4024 - (int)((float)var7 / this.zoomTarget), (int)((float)var8 / this.zoomTarget) + this.field4025, false); // L: 194 } } if (var4) { // L: 200 - this.field4023 = var5; // L: 201 - this.field4040 = var1; // L: 202 - this.field4041 = var2; // L: 203 + this.field4034 = var5; // L: 201 + this.field4041 = var1; // L: 202 + this.field4022 = var2; // L: 203 } } // L: 205 - @ObfuscatedName("l") - void method6062(int var1, int var2, boolean var3, long var4) { + @ObfuscatedName("p") + void method6250(int var1, int var2, boolean var3, long var4) { if (this.currentMapArea != null) { // L: 208 int var6 = (int)((float)this.centerTileX + ((float)(var1 - this.worldMapDisplayX) - (float)this.getDisplayWith() * this.zoom / 2.0F) / this.zoom); // L: 209 int var7 = (int)((float)this.centerTileY - ((float)(var2 - this.worldMapDisplayY) - (float)this.getDisplayHeight() * this.zoom / 2.0F) / this.zoom); // L: 210 this.mouseCoord = this.currentMapArea.coord(var6 + this.currentMapArea.getRegionLowX() * 64, var7 + this.currentMapArea.getRegionLowY() * 64); // L: 211 if (this.mouseCoord != null && var3) { // L: 212 - boolean var8 = Client.staffModLevel >= 2; // L: 215 - if (var8 && KeyHandler.KeyHandler_pressedKeys[82] && KeyHandler.KeyHandler_pressedKeys[81]) { // L: 217 - ClientPreferences.method2239(this.mouseCoord.x, this.mouseCoord.y, this.mouseCoord.plane, false); // L: 218 + if (FontName.method6297() && KeyHandler.KeyHandler_pressedKeys[82] && KeyHandler.KeyHandler_pressedKeys[81]) { // L: 213 + class4.method50(this.mouseCoord.x, this.mouseCoord.y, this.mouseCoord.plane, false); // L: 214 } else { - boolean var9 = true; // L: 221 - if (this.field4030) { // L: 222 - int var10 = var1 - this.field4040; // L: 223 - int var11 = var2 - this.field4041; // L: 224 - if (var4 - this.field4023 > 500L || var10 < -25 || var10 > 25 || var11 < -25 || var11 > 25) { // L: 225 - var9 = false; // L: 226 + boolean var8 = true; // L: 217 + if (this.field3999) { // L: 218 + int var9 = var1 - this.field4041; // L: 219 + int var10 = var2 - this.field4022; // L: 220 + if (var4 - this.field4034 > 500L || var9 < -25 || var9 > 25 || var10 < -25 || var10 > 25) { // L: 221 + var8 = false; // L: 222 } } - if (var9) { // L: 229 - PacketBufferNode var12 = HealthBarDefinition.getPacketBufferNode(ClientPacket.field2590, Client.packetWriter.isaacCipher); // L: 230 - var12.packetBuffer.method6493(this.mouseCoord.packed()); // L: 231 - Client.packetWriter.addNode(var12); // L: 232 - this.field4023 = 0L; // L: 233 + if (var8) { // L: 225 + PacketBufferNode var11 = class21.getPacketBufferNode(ClientPacket.field2606, Client.packetWriter.isaacCipher); // L: 226 + var11.packetBuffer.method6611(this.mouseCoord.packed()); // L: 227 + Client.packetWriter.addNode(var11); // L: 228 + this.field4034 = 0L; // L: 229 } } } } else { - this.mouseCoord = null; // L: 238 + this.mouseCoord = null; // L: 234 } - } // L: 239 + } // L: 235 - @ObfuscatedName("z") + @ObfuscatedName("j") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "-2117948281" + garbageValue = "1756925450" ) @Export("smoothZoom") void smoothZoom() { - if (class18.field154 != null) { // L: 242 - this.zoom = this.zoomTarget; // L: 243 + if (UserComparator3.field1444 != null) { // L: 238 + this.zoom = this.zoomTarget; // L: 239 } else { - if (this.zoom < this.zoomTarget) { // L: 246 - this.zoom = Math.min(this.zoomTarget, this.zoom / 30.0F + this.zoom); // L: 247 + if (this.zoom < this.zoomTarget) { // L: 242 + this.zoom = Math.min(this.zoomTarget, this.zoom / 30.0F + this.zoom); // L: 243 } - if (this.zoom > this.zoomTarget) { // L: 249 - this.zoom = Math.max(this.zoomTarget, this.zoom - this.zoom / 30.0F); // L: 250 + if (this.zoom > this.zoomTarget) { // L: 245 + this.zoom = Math.max(this.zoomTarget, this.zoom - this.zoom / 30.0F); // L: 246 } } - } // L: 244 252 + } // L: 240 248 - @ObfuscatedName("t") + @ObfuscatedName("r") @ObfuscatedSignature( descriptor = "(B)V", - garbageValue = "23" + garbageValue = "110" ) @Export("scrollToTarget") void scrollToTarget() { - if (this.hasTarget()) { // L: 255 - int var1 = this.worldMapTargetX - this.centerTileX; // L: 258 - int var2 = this.worldMapTargetY - this.centerTileY; // L: 259 - if (var1 != 0) { // L: 260 - var1 /= Math.min(8, Math.abs(var1)); // L: 261 + if (this.hasTarget()) { // L: 251 + int var1 = this.worldMapTargetX - this.centerTileX; // L: 254 + int var2 = this.worldMapTargetY - this.centerTileY; // L: 255 + if (var1 != 0) { // L: 256 + var1 /= Math.min(8, Math.abs(var1)); // L: 257 } - if (var2 != 0) { // L: 263 - var2 /= Math.min(8, Math.abs(var2)); // L: 264 + if (var2 != 0) { // L: 259 + var2 /= Math.min(8, Math.abs(var2)); // L: 260 } - this.setWorldMapPosition(var1 + this.centerTileX, var2 + this.centerTileY, true); // L: 266 - if (this.worldMapTargetX == this.centerTileX && this.centerTileY == this.worldMapTargetY) { // L: 267 - this.worldMapTargetX = -1; // L: 268 - this.worldMapTargetY = -1; // L: 269 + this.setWorldMapPosition(var1 + this.centerTileX, var2 + this.centerTileY, true); // L: 262 + if (this.worldMapTargetX == this.centerTileX && this.centerTileY == this.worldMapTargetY) { // L: 263 + this.worldMapTargetX = -1; // L: 264 + this.worldMapTargetY = -1; // L: 265 } } - } // L: 256 271 - - @ObfuscatedName("v") - @ObfuscatedSignature( - descriptor = "(IIZI)V", - garbageValue = "398983767" - ) - @Export("setWorldMapPosition") - final void setWorldMapPosition(int var1, int var2, boolean var3) { - this.centerTileX = var1; // L: 274 - this.centerTileY = var2; // L: 275 - Archive.currentTimeMillis(); // L: 276 - if (var3) { - this.method5996(); // L: 277 - } - - } // L: 278 + } // L: 252 267 @ObfuscatedName("b") @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "1654982573" + descriptor = "(IIZI)V", + garbageValue = "-1122278202" ) - final void method5996() { - this.field4028 = -1; // L: 281 - this.field4037 = -1; // L: 282 - this.field4036 = -1; // L: 283 - this.field4012 = -1; // L: 284 - } // L: 285 + @Export("setWorldMapPosition") + final void setWorldMapPosition(int var1, int var2, boolean var3) { + this.centerTileX = var1; // L: 270 + this.centerTileY = var2; // L: 271 + ObjectComposition.currentTimeMillis(); // L: 272 + if (var3) { + this.method6107(); // L: 273 + } - @ObfuscatedName("q") + } // L: 274 + + @ObfuscatedName("d") @ObfuscatedSignature( - descriptor = "(S)Z", - garbageValue = "10481" + descriptor = "(B)V", + garbageValue = "-37" + ) + final void method6107() { + this.field4027 = -1; // L: 277 + this.field4026 = -1; // L: 278 + this.field4025 = -1; // L: 279 + this.field4024 = -1; // L: 280 + } // L: 281 + + @ObfuscatedName("s") + @ObfuscatedSignature( + descriptor = "(I)Z", + garbageValue = "-2015544194" ) @Export("hasTarget") boolean hasTarget() { - return this.worldMapTargetX != -1 && this.worldMapTargetY != -1; // L: 288 + return this.worldMapTargetX != -1 && this.worldMapTargetY != -1; // L: 284 } - @ObfuscatedName("i") + @ObfuscatedName("u") @ObfuscatedSignature( - descriptor = "(IIII)Lfe;", - garbageValue = "1513544583" + descriptor = "(IIII)Lfo;", + garbageValue = "-437395298" ) @Export("mapAreaAtCoord") public WorldMapArea mapAreaAtCoord(int var1, int var2, int var3) { - Iterator var4 = this.details.values().iterator(); // L: 292 + Iterator var4 = this.details.values().iterator(); // L: 288 WorldMapArea var5; do { if (!var4.hasNext()) { - return null; // L: 300 + return null; // L: 296 } - var5 = (WorldMapArea)var4.next(); // L: 293 - } while(!var5.containsCoord(var1, var2, var3)); // L: 295 + var5 = (WorldMapArea)var4.next(); // L: 289 + } while(!var5.containsCoord(var1, var2, var3)); // L: 291 - return var5; // L: 296 + return var5; // L: 292 } - @ObfuscatedName("x") + @ObfuscatedName("l") @ObfuscatedSignature( - descriptor = "(IIIZB)V", - garbageValue = "0" + descriptor = "(IIIZI)V", + garbageValue = "-1628705271" ) - public void method5961(int var1, int var2, int var3, boolean var4) { - WorldMapArea var5 = this.mapAreaAtCoord(var1, var2, var3); // L: 304 - if (var5 == null) { // L: 305 - if (!var4) { // L: 306 - return; // L: 309 + public void method6110(int var1, int var2, int var3, boolean var4) { + WorldMapArea var5 = this.mapAreaAtCoord(var1, var2, var3); // L: 300 + if (var5 == null) { // L: 301 + if (!var4) { // L: 302 + return; // L: 305 } - var5 = this.mainMapArea; // L: 307 + var5 = this.mainMapArea; // L: 303 } - boolean var6 = false; // L: 311 - if (var5 != this.field4055 || var4) { // L: 312 - this.field4055 = var5; // L: 313 - this.setCurrentMapArea(var5); // L: 314 - var6 = true; // L: 315 + boolean var6 = false; // L: 307 + if (var5 != this.field4005 || var4) { // L: 308 + this.field4005 = var5; // L: 309 + this.setCurrentMapArea(var5); // L: 310 + var6 = true; // L: 311 } - if (var6 || var4) { // L: 317 - this.jump(var1, var2, var3); // L: 318 + if (var6 || var4) { // L: 313 + this.jump(var1, var2, var3); // L: 314 } - } // L: 320 + } // L: 316 - @ObfuscatedName("k") + @ObfuscatedName("o") @ObfuscatedSignature( descriptor = "(II)V", - garbageValue = "-1789438347" + garbageValue = "-792089188" ) @Export("setCurrentMapAreaId") public void setCurrentMapAreaId(int var1) { - WorldMapArea var2 = this.getMapArea(var1); // L: 323 - if (var2 != null) { // L: 324 - this.setCurrentMapArea(var2); // L: 325 + WorldMapArea var2 = this.getMapArea(var1); // L: 319 + if (var2 != null) { // L: 320 + this.setCurrentMapArea(var2); // L: 321 } - } // L: 327 + } // L: 323 - @ObfuscatedName("r") + @ObfuscatedName("c") @ObfuscatedSignature( descriptor = "(B)I", - garbageValue = "-35" + garbageValue = "127" ) @Export("currentMapAreaId") public int currentMapAreaId() { - return this.currentMapArea == null ? -1 : this.currentMapArea.getId(); // L: 330 331 333 + return this.currentMapArea == null ? -1 : this.currentMapArea.getId(); // L: 326 327 329 } - @ObfuscatedName("p") - @ObfuscatedSignature( - descriptor = "(I)Lfe;", - garbageValue = "269941277" - ) - @Export("getCurrentMapArea") - public WorldMapArea getCurrentMapArea() { - return this.currentMapArea; // L: 337 - } - - @ObfuscatedName("a") - @ObfuscatedSignature( - descriptor = "(Lfe;B)V", - garbageValue = "-23" - ) - @Export("setCurrentMapArea") - void setCurrentMapArea(WorldMapArea var1) { - if (this.currentMapArea == null || var1 != this.currentMapArea) { // L: 341 - this.initializeWorldMapManager(var1); // L: 344 - this.jump(-1, -1, -1); // L: 345 - } - } // L: 342 346 - @ObfuscatedName("e") @ObfuscatedSignature( - descriptor = "(Lfe;I)V", - garbageValue = "1791574091" + descriptor = "(I)Lfo;", + garbageValue = "-443198878" + ) + @Export("getCurrentMapArea") + public WorldMapArea getCurrentMapArea() { + return this.currentMapArea; // L: 333 + } + + @ObfuscatedName("g") + @ObfuscatedSignature( + descriptor = "(Lfo;I)V", + garbageValue = "-652584652" + ) + @Export("setCurrentMapArea") + void setCurrentMapArea(WorldMapArea var1) { + if (this.currentMapArea == null || var1 != this.currentMapArea) { // L: 337 + this.initializeWorldMapManager(var1); // L: 340 + this.jump(-1, -1, -1); // L: 341 + } + } // L: 338 342 + + @ObfuscatedName("a") + @ObfuscatedSignature( + descriptor = "(Lfo;I)V", + garbageValue = "1690698622" ) @Export("initializeWorldMapManager") void initializeWorldMapManager(WorldMapArea var1) { - this.currentMapArea = var1; // L: 349 - this.worldMapManager = new WorldMapManager(this.mapSceneSprites, this.fonts, this.WorldMap_geographyArchive, this.WorldMap_groundArchive); // L: 350 - this.cacheLoader.reset(this.currentMapArea.getInternalName()); // L: 351 - } // L: 352 + this.currentMapArea = var1; // L: 345 + this.worldMapManager = new WorldMapManager(this.mapSceneSprites, this.fonts, this.WorldMap_geographyArchive, this.WorldMap_groundArchive); // L: 346 + this.cacheLoader.reset(this.currentMapArea.getInternalName()); // L: 347 + } // L: 348 - @ObfuscatedName("d") + @ObfuscatedName("k") @ObfuscatedSignature( - descriptor = "(Lfe;Lia;Lia;ZI)V", - garbageValue = "6716684" + descriptor = "(Lfo;Lii;Lii;ZI)V", + garbageValue = "1149896139" ) - public void method5967(WorldMapArea var1, Coord var2, Coord var3, boolean var4) { - if (var1 != null) { // L: 355 - if (this.currentMapArea == null || var1 != this.currentMapArea) { // L: 358 - this.initializeWorldMapManager(var1); // L: 359 + public void method6291(WorldMapArea var1, Coord var2, Coord var3, boolean var4) { + if (var1 != null) { // L: 351 + if (this.currentMapArea == null || var1 != this.currentMapArea) { // L: 354 + this.initializeWorldMapManager(var1); // L: 355 } - if (!var4 && this.currentMapArea.containsCoord(var2.plane, var2.x, var2.y)) { // L: 361 - this.jump(var2.plane, var2.x, var2.y); // L: 365 + if (!var4 && this.currentMapArea.containsCoord(var2.plane, var2.x, var2.y)) { // L: 357 + this.jump(var2.plane, var2.x, var2.y); // L: 361 } else { - this.jump(var3.plane, var3.x, var3.y); // L: 362 + this.jump(var3.plane, var3.x, var3.y); // L: 358 } } - } // L: 356 367 - - @ObfuscatedName("u") - @ObfuscatedSignature( - descriptor = "(IIII)V", - garbageValue = "-797232033" - ) - @Export("jump") - void jump(int var1, int var2, int var3) { - if (this.currentMapArea != null) { // L: 370 - int[] var4 = this.currentMapArea.position(var1, var2, var3); // L: 373 - if (var4 == null) { // L: 374 - var4 = this.currentMapArea.position(this.currentMapArea.getOriginPlane(), this.currentMapArea.getOriginX(), this.currentMapArea.getOriginY()); // L: 375 - } - - this.setWorldMapPosition(var4[0] - this.currentMapArea.getRegionLowX() * 64, var4[1] - this.currentMapArea.getRegionLowY() * 64, true); // L: 377 - this.worldMapTargetX = -1; // L: 378 - this.worldMapTargetY = -1; // L: 379 - this.zoom = this.getZoomFromPercentage(this.currentMapArea.getZoom()); // L: 380 - this.zoomTarget = this.zoom; // L: 381 - this.field4024 = null; // L: 382 - this.iconIterator = null; // L: 383 - this.worldMapManager.clearIcons(); // L: 384 - } - } // L: 371 385 + } // L: 352 363 @ObfuscatedName("m") + @ObfuscatedSignature( + descriptor = "(IIII)V", + garbageValue = "1764750343" + ) + @Export("jump") + void jump(int var1, int var2, int var3) { + if (this.currentMapArea != null) { // L: 366 + int[] var4 = this.currentMapArea.position(var1, var2, var3); // L: 369 + if (var4 == null) { // L: 370 + var4 = this.currentMapArea.position(this.currentMapArea.getOriginPlane(), this.currentMapArea.getOriginX(), this.currentMapArea.getOriginY()); // L: 371 + } + + this.setWorldMapPosition(var4[0] - this.currentMapArea.getRegionLowX() * 64, var4[1] - this.currentMapArea.getRegionLowY() * 64, true); // L: 373 + this.worldMapTargetX = -1; // L: 374 + this.worldMapTargetY = -1; // L: 375 + this.zoom = this.getZoomFromPercentage(this.currentMapArea.getZoom()); // L: 376 + this.zoomTarget = this.zoom; // L: 377 + this.field4039 = null; // L: 378 + this.iconIterator = null; // L: 379 + this.worldMapManager.clearIcons(); // L: 380 + } + } // L: 367 381 + + @ObfuscatedName("x") @ObfuscatedSignature( descriptor = "(IIIIII)V", - garbageValue = "2365166" + garbageValue = "-1017239320" ) @Export("draw") public void draw(int var1, int var2, int var3, int var4, int var5) { - int[] var6 = new int[4]; // L: 388 - Rasterizer2D.Rasterizer2D_getClipArray(var6); // L: 389 - Rasterizer2D.Rasterizer2D_setClip(var1, var2, var3 + var1, var2 + var4); // L: 390 - Rasterizer2D.Rasterizer2D_fillRectangle(var1, var2, var3, var4, -16777216); // L: 391 - int var7 = this.cacheLoader.getPercentLoaded(); // L: 392 - if (var7 < 100) { // L: 393 - this.drawLoading(var1, var2, var3, var4, var7); // L: 394 + int[] var6 = new int[4]; // L: 384 + Rasterizer2D.Rasterizer2D_getClipArray(var6); // L: 385 + Rasterizer2D.Rasterizer2D_setClip(var1, var2, var3 + var1, var2 + var4); // L: 386 + Rasterizer2D.Rasterizer2D_fillRectangle(var1, var2, var3, var4, -16777216); // L: 387 + int var7 = this.cacheLoader.getPercentLoaded(); // L: 388 + if (var7 < 100) { // L: 389 + this.drawLoading(var1, var2, var3, var4, var7); // L: 390 } else { - if (!this.worldMapManager.isLoaded()) { // L: 397 - this.worldMapManager.load(this.WorldMap_archive, this.currentMapArea.getInternalName(), Client.isMembersWorld); // L: 398 - if (!this.worldMapManager.isLoaded()) { // L: 399 - return; // L: 400 + if (!this.worldMapManager.isLoaded()) { // L: 393 + this.worldMapManager.load(this.WorldMap_archive, this.currentMapArea.getInternalName(), Client.isMembersWorld); // L: 394 + if (!this.worldMapManager.isLoaded()) { // L: 395 + return; // L: 396 } } - if (this.flashingElements != null) { // L: 403 - ++this.flashCycle; // L: 404 - if (this.flashCycle % this.cyclesPerFlash == 0) { // L: 405 - this.flashCycle = 0; // L: 406 - ++this.flashCount; // L: 407 + if (this.flashingElements != null) { // L: 399 + ++this.flashCycle; // L: 400 + if (this.flashCycle % this.cyclesPerFlash == 0) { // L: 401 + this.flashCycle = 0; // L: 402 + ++this.flashCount; // L: 403 } - if (this.flashCount >= this.maxFlashCount && !this.perpetualFlash) { // L: 409 - this.flashingElements = null; // L: 410 + if (this.flashCount >= this.maxFlashCount && !this.perpetualFlash) { // L: 405 + this.flashingElements = null; // L: 406 } } - int var8 = (int)Math.ceil((double)((float)var3 / this.zoom)); // L: 413 - int var9 = (int)Math.ceil((double)((float)var4 / this.zoom)); // L: 414 - this.worldMapManager.drawTiles(this.centerTileX - var8 / 2, this.centerTileY - var9 / 2, var8 / 2 + this.centerTileX, var9 / 2 + this.centerTileY, var1, var2, var3 + var1, var2 + var4); // L: 415 - boolean var10; - if (!this.elementsDisabled) { // L: 416 - var10 = false; // L: 417 - if (var5 - this.field4048 > 100) { // L: 418 - this.field4048 = var5; // L: 419 - var10 = true; // L: 420 + int var8 = (int)Math.ceil((double)((float)var3 / this.zoom)); // L: 409 + int var9 = (int)Math.ceil((double)((float)var4 / this.zoom)); // L: 410 + this.worldMapManager.drawTiles(this.centerTileX - var8 / 2, this.centerTileY - var9 / 2, var8 / 2 + this.centerTileX, var9 / 2 + this.centerTileY, var1, var2, var3 + var1, var2 + var4); // L: 411 + if (!this.elementsDisabled) { // L: 412 + boolean var10 = false; // L: 413 + if (var5 - this.field4037 > 100) { // L: 414 + this.field4037 = var5; // L: 415 + var10 = true; // L: 416 } - this.worldMapManager.drawElements(this.centerTileX - var8 / 2, this.centerTileY - var9 / 2, var8 / 2 + this.centerTileX, var9 / 2 + this.centerTileY, var1, var2, var3 + var1, var2 + var4, this.field4046, this.flashingElements, this.flashCycle, this.cyclesPerFlash, var10); // L: 422 + this.worldMapManager.drawElements(this.centerTileX - var8 / 2, this.centerTileY - var9 / 2, var8 / 2 + this.centerTileX, var9 / 2 + this.centerTileY, var1, var2, var3 + var1, var2 + var4, this.field4008, this.flashingElements, this.flashCycle, this.cyclesPerFlash, var10); // L: 418 } - this.method5971(var1, var2, var3, var4, var8, var9); // L: 424 - var10 = Client.staffModLevel >= 2; // L: 427 - if (var10 && this.showCoord && this.mouseCoord != null) { // L: 429 + this.method6120(var1, var2, var3, var4, var8, var9); // L: 420 + if (FontName.method6297() && this.showCoord && this.mouseCoord != null) { // L: 421 this.font.draw("Coord: " + this.mouseCoord, Rasterizer2D.Rasterizer2D_xClipStart + 10, Rasterizer2D.Rasterizer2D_yClipStart + 20, 16776960, -1); } - this.worldMapDisplayWidth = var8; // L: 430 - this.worldMapDisplayHeight = var9; // L: 431 - this.worldMapDisplayX = var1; // L: 432 - this.worldMapDisplayY = var2; // L: 433 - Rasterizer2D.Rasterizer2D_setClipArray(var6); // L: 434 + this.worldMapDisplayWidth = var8; // L: 422 + this.worldMapDisplayHeight = var9; // L: 423 + this.worldMapDisplayX = var1; // L: 424 + this.worldMapDisplayY = var2; // L: 425 + Rasterizer2D.Rasterizer2D_setClipArray(var6); // L: 426 } - } // L: 395 435 + } // L: 391 427 - @ObfuscatedName("j") + @ObfuscatedName("z") @ObfuscatedSignature( - descriptor = "(IIIIIIB)Z", - garbageValue = "80" + descriptor = "(IIIIIII)Z", + garbageValue = "-787270257" ) - boolean method5970(int var1, int var2, int var3, int var4, int var5, int var6) { - if (this.sprite == null) { // L: 438 + boolean method6119(int var1, int var2, int var3, int var4, int var5, int var6) { + if (this.sprite == null) { // L: 430 return true; - } else if (this.sprite.subWidth == var1 && this.sprite.subHeight == var2) { // L: 439 - if (this.worldMapManager.pixelsPerTile != this.cachedPixelsPerTile) { // L: 440 + } else if (this.sprite.subWidth == var1 && this.sprite.subHeight == var2) { // L: 431 + if (this.worldMapManager.pixelsPerTile != this.cachedPixelsPerTile) { // L: 432 return true; - } else if (this.field4059 != Client.field687) { - return true; // L: 441 - } else if (var3 <= 0 && var4 <= 0) { // L: 442 - return var3 + var1 < var5 || var2 + var4 < var6; // L: 443 + } else if (this.field4006 != Client.field717) { + return true; // L: 433 + } else if (var3 <= 0 && var4 <= 0) { // L: 434 + return var3 + var1 < var5 || var2 + var4 < var6; // L: 435 } else { - return true; // L: 444 + return true; // L: 436 } } else { return true; } } - @ObfuscatedName("f") - @ObfuscatedSignature( - descriptor = "(IIIIIII)V", - garbageValue = "-1036574719" - ) - void method5971(int var1, int var2, int var3, int var4, int var5, int var6) { - if (class18.field154 != null) { // L: 448 - int var7 = 512 / (this.worldMapManager.pixelsPerTile * 2); // L: 449 - int var8 = var3 + 512; // L: 450 - int var9 = var4 + 512; // L: 451 - float var10 = 1.0F; // L: 452 - var8 = (int)((float)var8 / var10); // L: 453 - var9 = (int)((float)var9 / var10); // L: 454 - int var11 = this.getDisplayX() - var5 / 2 - var7; // L: 455 - int var12 = this.getDisplayY() - var6 / 2 - var7; // L: 456 - int var13 = var1 - (var11 + var7 - this.minCachedTileX) * this.worldMapManager.pixelsPerTile; // L: 457 - int var14 = var2 - this.worldMapManager.pixelsPerTile * (var7 - (var12 - this.minCachedTileY)); // L: 458 - if (this.method5970(var8, var9, var13, var14, var3, var4)) { // L: 459 - if (this.sprite != null && this.sprite.subWidth == var8 && this.sprite.subHeight == var9) { // L: 460 - Arrays.fill(this.sprite.pixels, 0); // L: 463 - } else { - this.sprite = new SpritePixels(var8, var9); // L: 461 - } - - this.minCachedTileX = this.getDisplayX() - var5 / 2 - var7; // L: 464 - this.minCachedTileY = this.getDisplayY() - var6 / 2 - var7; // L: 465 - this.cachedPixelsPerTile = this.worldMapManager.pixelsPerTile; // L: 466 - class18.field154.method5039(this.minCachedTileX, this.minCachedTileY, this.sprite, (float)this.cachedPixelsPerTile / var10); // L: 467 - this.field4059 = Client.field687; // L: 468 - var13 = var1 - (var7 + var11 - this.minCachedTileX) * this.worldMapManager.pixelsPerTile; // L: 469 - var14 = var2 - this.worldMapManager.pixelsPerTile * (var7 - (var12 - this.minCachedTileY)); // L: 470 - } - - Rasterizer2D.Rasterizer2D_fillRectangleAlpha(var1, var2, var3, var4, 0, 128); // L: 472 - if (var10 == 1.0F) { // L: 473 - this.sprite.method6973(var13, var14, 192); // L: 474 - } else { - this.sprite.method6888(var13, var14, (int)((float)var8 * var10), (int)((float)var9 * var10), 192); // L: 477 - } - } - - } // L: 480 - - @ObfuscatedName("s") - @ObfuscatedSignature( - descriptor = "(IIIII)V", - garbageValue = "1668911161" - ) - @Export("drawOverview") - public void drawOverview(int var1, int var2, int var3, int var4) { - if (this.cacheLoader.isLoaded()) { // L: 483 - if (!this.worldMapManager.isLoaded()) { // L: 486 - this.worldMapManager.load(this.WorldMap_archive, this.currentMapArea.getInternalName(), Client.isMembersWorld); // L: 487 - if (!this.worldMapManager.isLoaded()) { // L: 488 - return; // L: 489 - } - } - - this.worldMapManager.drawOverview(var1, var2, var3, var4, this.flashingElements, this.flashCycle, this.cyclesPerFlash); // L: 492 - } - } // L: 484 493 - - @ObfuscatedName("y") - @ObfuscatedSignature( - descriptor = "(II)V", - garbageValue = "-1722414531" - ) - @Export("setZoomPercentage") - public void setZoomPercentage(int var1) { - this.zoomTarget = this.getZoomFromPercentage(var1); // L: 496 - } // L: 497 - @ObfuscatedName("w") + @ObfuscatedSignature( + descriptor = "(IIIIIII)V", + garbageValue = "-511459104" + ) + void method6120(int var1, int var2, int var3, int var4, int var5, int var6) { + if (UserComparator3.field1444 != null) { // L: 440 + int var7 = 512 / (this.worldMapManager.pixelsPerTile * 2); // L: 441 + int var8 = var3 + 512; // L: 442 + int var9 = var4 + 512; // L: 443 + float var10 = 1.0F; // L: 444 + var8 = (int)((float)var8 / var10); // L: 445 + var9 = (int)((float)var9 / var10); // L: 446 + int var11 = this.getDisplayX() - var5 / 2 - var7; // L: 447 + int var12 = this.getDisplayY() - var6 / 2 - var7; // L: 448 + int var13 = var1 - (var11 + var7 - this.minCachedTileX) * this.worldMapManager.pixelsPerTile; // L: 449 + int var14 = var2 - this.worldMapManager.pixelsPerTile * (var7 - (var12 - this.minCachedTileY)); // L: 450 + if (this.method6119(var8, var9, var13, var14, var3, var4)) { // L: 451 + if (this.sprite != null && this.sprite.subWidth == var8 && this.sprite.subHeight == var9) { // L: 452 + Arrays.fill(this.sprite.pixels, 0); // L: 455 + } else { + this.sprite = new SpritePixels(var8, var9); // L: 453 + } + + this.minCachedTileX = this.getDisplayX() - var5 / 2 - var7; // L: 456 + this.minCachedTileY = this.getDisplayY() - var6 / 2 - var7; // L: 457 + this.cachedPixelsPerTile = this.worldMapManager.pixelsPerTile; // L: 458 + UserComparator3.field1444.method5116(this.minCachedTileX, this.minCachedTileY, this.sprite, (float)this.cachedPixelsPerTile / var10); // L: 459 + this.field4006 = Client.field717; // L: 460 + var13 = var1 - (var7 + var11 - this.minCachedTileX) * this.worldMapManager.pixelsPerTile; // L: 461 + var14 = var2 - this.worldMapManager.pixelsPerTile * (var7 - (var12 - this.minCachedTileY)); // L: 462 + } + + Rasterizer2D.Rasterizer2D_fillRectangleAlpha(var1, var2, var3, var4, 0, 128); // L: 464 + if (1.0F == var10) { // L: 465 + this.sprite.method7002(var13, var14, 192); // L: 466 + } else { + this.sprite.method6986(var13, var14, (int)(var10 * (float)var8), (int)((float)var9 * var10), 192); // L: 469 + } + } + + } // L: 472 + + @ObfuscatedName("t") + @ObfuscatedSignature( + descriptor = "(IIIIB)V", + garbageValue = "-14" + ) + @Export("drawOverview") + public void drawOverview(int var1, int var2, int var3, int var4) { + if (this.cacheLoader.isLoaded()) { // L: 475 + if (!this.worldMapManager.isLoaded()) { // L: 478 + this.worldMapManager.load(this.WorldMap_archive, this.currentMapArea.getInternalName(), Client.isMembersWorld); // L: 479 + if (!this.worldMapManager.isLoaded()) { // L: 480 + return; // L: 481 + } + } + + this.worldMapManager.drawOverview(var1, var2, var3, var4, this.flashingElements, this.flashCycle, this.cyclesPerFlash); // L: 484 + } + } // L: 476 485 + + @ObfuscatedName("h") + @ObfuscatedSignature( + descriptor = "(IB)V", + garbageValue = "0" + ) + @Export("setZoomPercentage") + public void setZoomPercentage(int var1) { + this.zoomTarget = this.getZoomFromPercentage(var1); // L: 488 + } // L: 489 + + @ObfuscatedName("q") @ObfuscatedSignature( descriptor = "(IIIIII)V", - garbageValue = "-464538806" + garbageValue = "176616611" ) @Export("drawLoading") void drawLoading(int var1, int var2, int var3, int var4, int var5) { - byte var6 = 20; // L: 500 - int var7 = var3 / 2 + var1; // L: 501 - int var8 = var4 / 2 + var2 - 18 - var6; // L: 502 - Rasterizer2D.Rasterizer2D_fillRectangle(var1, var2, var3, var4, -16777216); // L: 503 - Rasterizer2D.Rasterizer2D_drawRectangle(var7 - 152, var8, 304, 34, -65536); // L: 504 - Rasterizer2D.Rasterizer2D_fillRectangle(var7 - 150, var8 + 2, var5 * 3, 30, -65536); // L: 505 - this.font.drawCentered("Loading...", var7, var6 + var8, -1, -1); // L: 506 - } // L: 507 + byte var6 = 20; // L: 492 + int var7 = var3 / 2 + var1; // L: 493 + int var8 = var4 / 2 + var2 - 18 - var6; // L: 494 + Rasterizer2D.Rasterizer2D_fillRectangle(var1, var2, var3, var4, -16777216); // L: 495 + Rasterizer2D.Rasterizer2D_drawRectangle(var7 - 152, var8, 304, 34, -65536); // L: 496 + Rasterizer2D.Rasterizer2D_fillRectangle(var7 - 150, var8 + 2, var5 * 3, 30, -65536); // L: 497 + this.font.drawCentered("Loading...", var7, var6 + var8, -1, -1); // L: 498 + } // L: 499 - @ObfuscatedName("n") + @ObfuscatedName("i") @ObfuscatedSignature( - descriptor = "(IS)F", - garbageValue = "255" + descriptor = "(II)F", + garbageValue = "397334458" ) @Export("getZoomFromPercentage") float getZoomFromPercentage(int var1) { - if (var1 == 25) { // L: 510 + if (var1 == 25) { // L: 502 return 1.0F; - } else if (var1 == 37) { // L: 511 + } else if (var1 == 37) { // L: 503 return 1.5F; - } else if (var1 == 50) { // L: 512 - return 2.0F; - } else if (var1 == 75) { // L: 513 + } else if (var1 == 50) { + return 2.0F; // L: 504 + } else if (var1 == 75) { // L: 505 return 3.0F; } else { - return var1 == 100 ? 4.0F : 8.0F; // L: 514 515 - } - } - - @ObfuscatedName("ag") - @ObfuscatedSignature( - descriptor = "(I)I", - garbageValue = "221583823" - ) - @Export("getZoomLevel") - public int getZoomLevel() { - if (1.0D == (double)this.zoomTarget) { // L: 519 - return 25; - } else if (1.5D == (double)this.zoomTarget) { // L: 520 - return 37; - } else if ((double)this.zoomTarget == 2.0D) { // L: 521 - return 50; - } else if ((double)this.zoomTarget == 3.0D) { - return 75; // L: 522 - } else { - return 4.0D == (double)this.zoomTarget ? 100 : 200; // L: 523 524 + return var1 == 100 ? 4.0F : 8.0F; // L: 506 507 } } @ObfuscatedName("ae") + @ObfuscatedSignature( + descriptor = "(B)I", + garbageValue = "54" + ) + @Export("getZoomLevel") + public int getZoomLevel() { + if (1.0D == (double)this.zoomTarget) { // L: 511 + return 25; + } else if ((double)this.zoomTarget == 1.5D) { // L: 512 + return 37; + } else if (2.0D == (double)this.zoomTarget) { // L: 513 + return 50; + } else if ((double)this.zoomTarget == 3.0D) { + return 75; // L: 514 + } else { + return 4.0D == (double)this.zoomTarget ? 100 : 200; // L: 515 516 + } + } + + @ObfuscatedName("ap") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "1692321344" + garbageValue = "1698217576" ) @Export("loadCache") public void loadCache() { - this.cacheLoader.load(); // L: 528 - } // L: 529 + this.cacheLoader.load(); // L: 520 + } // L: 521 - @ObfuscatedName("ao") + @ObfuscatedName("ab") @ObfuscatedSignature( - descriptor = "(B)Z", - garbageValue = "14" + descriptor = "(I)Z", + garbageValue = "-701591619" ) @Export("isCacheLoaded") public boolean isCacheLoaded() { - return this.cacheLoader.isLoaded(); // L: 532 + return this.cacheLoader.isLoaded(); // L: 524 + } + + @ObfuscatedName("al") + @ObfuscatedSignature( + descriptor = "(II)Lfo;", + garbageValue = "-861486958" + ) + @Export("getMapArea") + public WorldMapArea getMapArea(int var1) { + Iterator var2 = this.details.values().iterator(); // L: 528 + + WorldMapArea var3; + do { + if (!var2.hasNext()) { // L: 535 + return null; // L: 536 + } + + var3 = (WorldMapArea)var2.next(); // L: 529 + } while(var3.getId() != var1); // L: 531 + + return var3; // L: 532 + } + + @ObfuscatedName("ad") + @ObfuscatedSignature( + descriptor = "(III)V", + garbageValue = "704726635" + ) + @Export("setWorldMapPositionTarget") + public void setWorldMapPositionTarget(int var1, int var2) { + if (this.currentMapArea != null && this.currentMapArea.containsPosition(var1, var2)) { // L: 540 + this.worldMapTargetX = var1 - this.currentMapArea.getRegionLowX() * 64; // L: 543 + this.worldMapTargetY = var2 - this.currentMapArea.getRegionLowY() * 64; // L: 544 + } + } // L: 541 545 + + @ObfuscatedName("ai") + @ObfuscatedSignature( + descriptor = "(IIB)V", + garbageValue = "19" + ) + @Export("setWorldMapPositionTargetInstant") + public void setWorldMapPositionTargetInstant(int var1, int var2) { + if (this.currentMapArea != null) { // L: 548 + this.setWorldMapPosition(var1 - this.currentMapArea.getRegionLowX() * 64, var2 - this.currentMapArea.getRegionLowY() * 64, true); // L: 551 + this.worldMapTargetX = -1; // L: 552 + this.worldMapTargetY = -1; // L: 553 + } + } // L: 549 554 + + @ObfuscatedName("ar") + @ObfuscatedSignature( + descriptor = "(IIII)V", + garbageValue = "-2147483648" + ) + @Export("jumpToSourceCoord") + public void jumpToSourceCoord(int var1, int var2, int var3) { + if (this.currentMapArea != null) { // L: 557 + int[] var4 = this.currentMapArea.position(var1, var2, var3); // L: 560 + if (var4 != null) { // L: 561 + this.setWorldMapPositionTarget(var4[0], var4[1]); // L: 562 + } + + } + } // L: 558 564 + + @ObfuscatedName("ag") + @ObfuscatedSignature( + descriptor = "(IIII)V", + garbageValue = "1982259081" + ) + @Export("jumpToSourceCoordInstant") + public void jumpToSourceCoordInstant(int var1, int var2, int var3) { + if (this.currentMapArea != null) { // L: 567 + int[] var4 = this.currentMapArea.position(var1, var2, var3); // L: 570 + if (var4 != null) { // L: 571 + this.setWorldMapPositionTargetInstant(var4[0], var4[1]); // L: 572 + } + + } + } // L: 568 574 + + @ObfuscatedName("ax") + @ObfuscatedSignature( + descriptor = "(I)I", + garbageValue = "-1572270275" + ) + @Export("getDisplayX") + public int getDisplayX() { + return this.currentMapArea == null ? -1 : this.centerTileX + this.currentMapArea.getRegionLowX() * 64; // L: 577 578 580 + } + + @ObfuscatedName("as") + @ObfuscatedSignature( + descriptor = "(I)I", + garbageValue = "1626949316" + ) + @Export("getDisplayY") + public int getDisplayY() { + return this.currentMapArea == null ? -1 : this.centerTileY + this.currentMapArea.getRegionLowY() * 64; // L: 584 585 587 } @ObfuscatedName("aj") @ObfuscatedSignature( - descriptor = "(II)Lfe;", - garbageValue = "-1767237935" + descriptor = "(I)Lii;", + garbageValue = "-1013146399" ) - @Export("getMapArea") - public WorldMapArea getMapArea(int var1) { - Iterator var2 = this.details.values().iterator(); // L: 536 - - WorldMapArea var3; - do { - if (!var2.hasNext()) { - return null; // L: 544 - } - - var3 = (WorldMapArea)var2.next(); // L: 537 - } while(var3.getId() != var1); // L: 539 - - return var3; // L: 540 - } - - @ObfuscatedName("aw") - @ObfuscatedSignature( - descriptor = "(III)V", - garbageValue = "1583488373" - ) - @Export("setWorldMapPositionTarget") - public void setWorldMapPositionTarget(int var1, int var2) { - if (this.currentMapArea != null && this.currentMapArea.containsPosition(var1, var2)) { // L: 548 - this.worldMapTargetX = var1 - this.currentMapArea.getRegionLowX() * 64; // L: 551 - this.worldMapTargetY = var2 - this.currentMapArea.getRegionLowY() * 64; // L: 552 - } - } // L: 549 553 - - @ObfuscatedName("at") - @ObfuscatedSignature( - descriptor = "(III)V", - garbageValue = "-1261755742" - ) - @Export("setWorldMapPositionTargetInstant") - public void setWorldMapPositionTargetInstant(int var1, int var2) { - if (this.currentMapArea != null) { // L: 556 - this.setWorldMapPosition(var1 - this.currentMapArea.getRegionLowX() * 64, var2 - this.currentMapArea.getRegionLowY() * 64, true); // L: 559 - this.worldMapTargetX = -1; // L: 560 - this.worldMapTargetY = -1; // L: 561 - } - } // L: 557 562 - - @ObfuscatedName("av") - @ObfuscatedSignature( - descriptor = "(IIIB)V", - garbageValue = "19" - ) - @Export("jumpToSourceCoord") - public void jumpToSourceCoord(int var1, int var2, int var3) { - if (this.currentMapArea != null) { // L: 565 - int[] var4 = this.currentMapArea.position(var1, var2, var3); // L: 568 - if (var4 != null) { // L: 569 - this.setWorldMapPositionTarget(var4[0], var4[1]); // L: 570 - } - - } - } // L: 566 572 - - @ObfuscatedName("al") - @ObfuscatedSignature( - descriptor = "(IIIB)V", - garbageValue = "-49" - ) - @Export("jumpToSourceCoordInstant") - public void jumpToSourceCoordInstant(int var1, int var2, int var3) { - if (this.currentMapArea != null) { // L: 575 - int[] var4 = this.currentMapArea.position(var1, var2, var3); // L: 578 - if (var4 != null) { // L: 579 - this.setWorldMapPositionTargetInstant(var4[0], var4[1]); // L: 580 - } - - } - } // L: 576 582 - - @ObfuscatedName("ap") - @ObfuscatedSignature( - descriptor = "(B)I", - garbageValue = "-6" - ) - @Export("getDisplayX") - public int getDisplayX() { - return this.currentMapArea == null ? -1 : this.centerTileX + this.currentMapArea.getRegionLowX() * 64; // L: 585 586 588 + @Export("getDisplayCoord") + public Coord getDisplayCoord() { + return this.currentMapArea == null ? null : this.currentMapArea.coord(this.getDisplayX(), this.getDisplayY()); // L: 591 592 594 } @ObfuscatedName("am") @ObfuscatedSignature( descriptor = "(I)I", - garbageValue = "-2093371983" - ) - @Export("getDisplayY") - public int getDisplayY() { - return this.currentMapArea == null ? -1 : this.centerTileY + this.currentMapArea.getRegionLowY() * 64; // L: 592 593 595 - } - - @ObfuscatedName("ax") - @ObfuscatedSignature( - descriptor = "(I)Lia;", - garbageValue = "1051694927" - ) - @Export("getDisplayCoord") - public Coord getDisplayCoord() { - return this.currentMapArea == null ? null : this.currentMapArea.coord(this.getDisplayX(), this.getDisplayY()); // L: 599 600 602 - } - - @ObfuscatedName("ak") - @ObfuscatedSignature( - descriptor = "(I)I", - garbageValue = "810751784" + garbageValue = "1641590896" ) @Export("getDisplayWith") public int getDisplayWith() { - return this.worldMapDisplayWidth; // L: 606 + return this.worldMapDisplayWidth; // L: 598 } - @ObfuscatedName("ay") - @ObfuscatedSignature( - descriptor = "(B)I", - garbageValue = "5" - ) - @Export("getDisplayHeight") - public int getDisplayHeight() { - return this.worldMapDisplayHeight; // L: 610 - } - - @ObfuscatedName("ai") - @ObfuscatedSignature( - descriptor = "(IB)V", - garbageValue = "9" - ) - @Export("setMaxFlashCount") - public void setMaxFlashCount(int var1) { - if (var1 >= 1) { // L: 614 - this.maxFlashCount = var1; // L: 615 - } - - } // L: 617 - - @ObfuscatedName("aa") - @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "-1657543663" - ) - @Export("resetMaxFlashCount") - public void resetMaxFlashCount() { - this.maxFlashCount = 3; // L: 620 - } // L: 621 - - @ObfuscatedName("au") - @ObfuscatedSignature( - descriptor = "(II)V", - garbageValue = "852979255" - ) - @Export("setCyclesPerFlash") - public void setCyclesPerFlash(int var1) { - if (var1 >= 1) { // L: 624 - this.cyclesPerFlash = var1; // L: 625 - } - - } // L: 627 - - @ObfuscatedName("as") - @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "-265155627" - ) - @Export("resetCyclesPerFlash") - public void resetCyclesPerFlash() { - this.cyclesPerFlash = 50; // L: 630 - } // L: 631 - - @ObfuscatedName("ad") - @ObfuscatedSignature( - descriptor = "(ZI)V", - garbageValue = "1017245511" - ) - @Export("setPerpetualFlash") - public void setPerpetualFlash(boolean var1) { - this.perpetualFlash = var1; // L: 634 - } // L: 635 - - @ObfuscatedName("ac") - @ObfuscatedSignature( - descriptor = "(IB)V", - garbageValue = "46" - ) - @Export("flashElement") - public void flashElement(int var1) { - this.flashingElements = new HashSet(); // L: 638 - this.flashingElements.add(var1); // L: 639 - this.flashCount = 0; // L: 640 - this.flashCycle = 0; // L: 641 - } // L: 642 - @ObfuscatedName("az") @ObfuscatedSignature( - descriptor = "(II)V", - garbageValue = "965381247" + descriptor = "(I)I", + garbageValue = "-227030851" ) - @Export("flashCategory") - public void flashCategory(int var1) { - this.flashingElements = new HashSet(); // L: 645 - this.flashCount = 0; // L: 646 - this.flashCycle = 0; // L: 647 + @Export("getDisplayHeight") + public int getDisplayHeight() { + return this.worldMapDisplayHeight; // L: 602 + } - for (int var2 = 0; var2 < WorldMapElement.WorldMapElement_count; ++var2) { // L: 648 - if (WorldMapAreaData.WorldMapElement_get(var2) != null && WorldMapAreaData.WorldMapElement_get(var2).category == var1) { // L: 649 652 - this.flashingElements.add(WorldMapAreaData.WorldMapElement_get(var2).objectId); // L: 653 - } + @ObfuscatedName("av") + @ObfuscatedSignature( + descriptor = "(II)V", + garbageValue = "-1448408300" + ) + @Export("setMaxFlashCount") + public void setMaxFlashCount(int var1) { + if (var1 >= 1) { // L: 606 + this.maxFlashCount = var1; // L: 607 } - } // L: 656 + } // L: 609 - @ObfuscatedName("aq") + @ObfuscatedName("ac") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "-498276841" + garbageValue = "-502541875" ) - @Export("stopCurrentFlashes") - public void stopCurrentFlashes() { - this.flashingElements = null; // L: 659 - } // L: 660 + @Export("resetMaxFlashCount") + public void resetMaxFlashCount() { + this.maxFlashCount = 3; // L: 612 + } // L: 613 - @ObfuscatedName("ab") + @ObfuscatedName("at") @ObfuscatedSignature( - descriptor = "(ZB)V", - garbageValue = "78" + descriptor = "(IB)V", + garbageValue = "56" ) - @Export("setElementsDisabled") - public void setElementsDisabled(boolean var1) { - this.elementsDisabled = !var1; // L: 663 - } // L: 664 - - @ObfuscatedName("ar") - @ObfuscatedSignature( - descriptor = "(IZI)V", - garbageValue = "193958048" - ) - @Export("disableElement") - public void disableElement(int var1, boolean var2) { - if (!var2) { // L: 667 - this.enabledElements.add(var1); // L: 668 - } else { - this.enabledElements.remove(var1); // L: 671 + @Export("setCyclesPerFlash") + public void setCyclesPerFlash(int var1) { + if (var1 >= 1) { // L: 616 + this.cyclesPerFlash = var1; // L: 617 } - this.method6003(); // L: 673 - } // L: 674 + } // L: 619 @ObfuscatedName("ah") @ObfuscatedSignature( - descriptor = "(IZB)V", - garbageValue = "70" + descriptor = "(I)V", + garbageValue = "-1912925429" + ) + @Export("resetCyclesPerFlash") + public void resetCyclesPerFlash() { + this.cyclesPerFlash = 50; // L: 622 + } // L: 623 + + @ObfuscatedName("ao") + @ObfuscatedSignature( + descriptor = "(ZI)V", + garbageValue = "-4019536" + ) + @Export("setPerpetualFlash") + public void setPerpetualFlash(boolean var1) { + this.perpetualFlash = var1; // L: 626 + } // L: 627 + + @ObfuscatedName("aq") + @ObfuscatedSignature( + descriptor = "(II)V", + garbageValue = "-1468516539" + ) + @Export("flashElement") + public void flashElement(int var1) { + this.flashingElements = new HashSet(); // L: 630 + this.flashingElements.add(var1); // L: 631 + this.flashCount = 0; // L: 632 + this.flashCycle = 0; // L: 633 + } // L: 634 + + @ObfuscatedName("aw") + @ObfuscatedSignature( + descriptor = "(IB)V", + garbageValue = "-46" + ) + @Export("flashCategory") + public void flashCategory(int var1) { + this.flashingElements = new HashSet(); // L: 637 + this.flashCount = 0; // L: 638 + this.flashCycle = 0; // L: 639 + + for (int var2 = 0; var2 < class311.WorldMapElement_count; ++var2) { // L: 640 + if (class6.WorldMapElement_get(var2) != null && class6.WorldMapElement_get(var2).category == var1) { // L: 641 644 + this.flashingElements.add(class6.WorldMapElement_get(var2).objectId); // L: 645 + } + } + + } // L: 648 + + @ObfuscatedName("af") + @ObfuscatedSignature( + descriptor = "(I)V", + garbageValue = "-961557070" + ) + @Export("stopCurrentFlashes") + public void stopCurrentFlashes() { + this.flashingElements = null; // L: 651 + } // L: 652 + + @ObfuscatedName("ak") + @ObfuscatedSignature( + descriptor = "(ZI)V", + garbageValue = "-1424708564" + ) + @Export("setElementsDisabled") + public void setElementsDisabled(boolean var1) { + this.elementsDisabled = !var1; // L: 655 + } // L: 656 + + @ObfuscatedName("ay") + @ObfuscatedSignature( + descriptor = "(IZI)V", + garbageValue = "-898032976" + ) + @Export("disableElement") + public void disableElement(int var1, boolean var2) { + if (!var2) { // L: 659 + this.enabledElements.add(var1); // L: 660 + } else { + this.enabledElements.remove(var1); // L: 663 + } + + this.method6103(); // L: 665 + } // L: 666 + + @ObfuscatedName("aa") + @ObfuscatedSignature( + descriptor = "(IZI)V", + garbageValue = "-1754090683" ) @Export("setCategoryDisabled") public void setCategoryDisabled(int var1, boolean var2) { - if (!var2) { // L: 677 - this.enabledCategories.add(var1); // L: 678 + if (!var2) { // L: 669 + this.enabledCategories.add(var1); // L: 670 } else { - this.enabledCategories.remove(var1); // L: 681 + this.enabledCategories.remove(var1); // L: 673 } - for (int var3 = 0; var3 < WorldMapElement.WorldMapElement_count; ++var3) { // L: 683 - if (WorldMapAreaData.WorldMapElement_get(var3) != null && WorldMapAreaData.WorldMapElement_get(var3).category == var1) { // L: 684 687 - int var4 = WorldMapAreaData.WorldMapElement_get(var3).objectId; // L: 688 - if (!var2) { // L: 689 - this.enabledElementIds.add(var4); // L: 690 + for (int var3 = 0; var3 < class311.WorldMapElement_count; ++var3) { // L: 675 + if (class6.WorldMapElement_get(var3) != null && class6.WorldMapElement_get(var3).category == var1) { // L: 676 679 + int var4 = class6.WorldMapElement_get(var3).objectId; // L: 680 + if (!var2) { // L: 681 + this.enabledElementIds.add(var4); // L: 682 } else { - this.enabledElementIds.remove(var4); // L: 693 + this.enabledElementIds.remove(var4); // L: 685 } } } - this.method6003(); // L: 697 - } // L: 698 + this.method6103(); // L: 689 + } // L: 690 - @ObfuscatedName("af") + @ObfuscatedName("au") @ObfuscatedSignature( - descriptor = "(I)Z", - garbageValue = "-163091995" + descriptor = "(B)Z", + garbageValue = "-7" ) @Export("getElementsDisabled") public boolean getElementsDisabled() { - return !this.elementsDisabled; // L: 701 + return !this.elementsDisabled; // L: 693 } @ObfuscatedName("an") @ObfuscatedSignature( - descriptor = "(II)Z", - garbageValue = "-183981846" + descriptor = "(IB)Z", + garbageValue = "55" ) @Export("isElementDisabled") public boolean isElementDisabled(int var1) { - return !this.enabledElements.contains(var1); // L: 705 + return !this.enabledElements.contains(var1); // L: 697 } @ObfuscatedName("bd") @ObfuscatedSignature( descriptor = "(II)Z", - garbageValue = "-1497650966" + garbageValue = "679463737" ) @Export("isCategoryDisabled") public boolean isCategoryDisabled(int var1) { - return !this.enabledCategories.contains(var1); // L: 709 + return !this.enabledCategories.contains(var1); // L: 701 } - @ObfuscatedName("bw") + @ObfuscatedName("bt") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "2136765592" + garbageValue = "2115531770" ) - void method6003() { - this.field4046.clear(); // L: 713 - this.field4046.addAll(this.enabledElements); // L: 714 - this.field4046.addAll(this.enabledElementIds); // L: 715 - } // L: 716 + void method6103() { + this.field4008.clear(); // L: 705 + this.field4008.addAll(this.enabledElements); // L: 706 + this.field4008.addAll(this.enabledElementIds); // L: 707 + } // L: 708 - @ObfuscatedName("bf") + @ObfuscatedName("bq") @ObfuscatedSignature( descriptor = "(IIIIIII)V", - garbageValue = "738017739" + garbageValue = "-2083431744" ) @Export("addElementMenuOptions") public void addElementMenuOptions(int var1, int var2, int var3, int var4, int var5, int var6) { - if (this.cacheLoader.isLoaded()) { // L: 719 - int var7 = (int)Math.ceil((double)((float)var3 / this.zoom)); // L: 722 - int var8 = (int)Math.ceil((double)((float)var4 / this.zoom)); // L: 723 - List var9 = this.worldMapManager.method3430(this.centerTileX - var7 / 2 - 1, this.centerTileY - var8 / 2 - 1, var7 / 2 + this.centerTileX + 1, var8 / 2 + this.centerTileY + 1, var1, var2, var3, var4, var5, var6); // L: 724 - if (!var9.isEmpty()) { // L: 725 + if (this.cacheLoader.isLoaded()) { // L: 711 + int var7 = (int)Math.ceil((double)((float)var3 / this.zoom)); // L: 714 + int var8 = (int)Math.ceil((double)((float)var4 / this.zoom)); // L: 715 + List var9 = this.worldMapManager.method3465(this.centerTileX - var7 / 2 - 1, this.centerTileY - var8 / 2 - 1, var7 / 2 + this.centerTileX + 1, var8 / 2 + this.centerTileY + 1, var1, var2, var3, var4, var5, var6); // L: 716 + if (!var9.isEmpty()) { // L: 717 Iterator var10 = var9.iterator(); boolean var13; do { - if (!var10.hasNext()) { // L: 728 - return; // L: 744 + if (!var10.hasNext()) { // L: 720 + return; // L: 736 } - AbstractWorldMapIcon var11 = (AbstractWorldMapIcon)var10.next(); // L: 729 - WorldMapElement var12 = WorldMapAreaData.WorldMapElement_get(var11.getElement()); // L: 731 - var13 = false; // L: 732 + AbstractWorldMapIcon var11 = (AbstractWorldMapIcon)var10.next(); // L: 721 + WorldMapElement var12 = class6.WorldMapElement_get(var11.getElement()); // L: 723 + var13 = false; // L: 724 - for (int var14 = this.menuOpcodes.length - 1; var14 >= 0; --var14) { // L: 733 - if (var12.menuActions[var14] != null) { // L: 734 - InterfaceParent.insertMenuItemNoShift(var12.menuActions[var14], var12.menuTargetName, this.menuOpcodes[var14], var11.getElement(), var11.coord1.packed(), var11.coord2.packed()); // L: 735 - var13 = true; // L: 736 + for (int var14 = this.menuOpcodes.length - 1; var14 >= 0; --var14) { // L: 725 + if (var12.menuActions[var14] != null) { // L: 726 + Occluder.insertMenuItemNoShift(var12.menuActions[var14], var12.menuTargetName, this.menuOpcodes[var14], var11.getElement(), var11.coord1.packed(), var11.coord2.packed()); // L: 727 + var13 = true; // L: 728 } } - } while(!var13); // L: 739 + } while(!var13); // L: 731 } } - } // L: 720 726 740 + } // L: 712 718 732 @ObfuscatedName("bu") @ObfuscatedSignature( - descriptor = "(ILia;I)Lia;", - garbageValue = "-404527931" + descriptor = "(ILii;I)Lii;", + garbageValue = "-1053768057" ) - public Coord method6085(int var1, Coord var2) { - if (!this.cacheLoader.isLoaded()) { // L: 747 - return null; // L: 748 - } else if (!this.worldMapManager.isLoaded()) { // L: 750 - return null; // L: 751 - } else if (!this.currentMapArea.containsPosition(var2.x, var2.y)) { // L: 753 - return null; // L: 754 + public Coord method6153(int var1, Coord var2) { + if (!this.cacheLoader.isLoaded()) { // L: 739 + return null; // L: 740 + } else if (!this.worldMapManager.isLoaded()) { // L: 742 + return null; // L: 743 + } else if (!this.currentMapArea.containsPosition(var2.x, var2.y)) { // L: 745 + return null; // L: 746 } else { - HashMap var3 = this.worldMapManager.buildIcons(); // L: 756 - List var4 = (List)var3.get(var1); // L: 757 - if (var4 != null && !var4.isEmpty()) { // L: 758 - AbstractWorldMapIcon var5 = null; // L: 761 - int var6 = -1; // L: 762 - Iterator var7 = var4.iterator(); // L: 763 + HashMap var3 = this.worldMapManager.buildIcons(); // L: 748 + List var4 = (List)var3.get(var1); // L: 749 + if (var4 != null && !var4.isEmpty()) { // L: 750 + AbstractWorldMapIcon var5 = null; // L: 753 + int var6 = -1; // L: 754 + Iterator var7 = var4.iterator(); // L: 755 while (true) { AbstractWorldMapIcon var8; int var11; do { if (!var7.hasNext()) { - return var5.coord2; // L: 778 + return var5.coord2; // L: 770 } - var8 = (AbstractWorldMapIcon)var7.next(); // L: 764 - int var9 = var8.coord2.x - var2.x; // L: 766 - int var10 = var8.coord2.y - var2.y; // L: 767 - var11 = var9 * var9 + var10 * var10; // L: 768 - if (var11 == 0) { // L: 769 - return var8.coord2; // L: 770 + var8 = (AbstractWorldMapIcon)var7.next(); // L: 756 + int var9 = var8.coord2.x - var2.x; // L: 758 + int var10 = var8.coord2.y - var2.y; // L: 759 + var11 = var10 * var10 + var9 * var9; // L: 760 + if (var11 == 0) { // L: 761 + return var8.coord2; // L: 762 } - } while(var11 >= var6 && var5 != null); // L: 772 + } while(var11 >= var6 && var5 != null); // L: 764 - var5 = var8; // L: 773 - var6 = var11; // L: 774 + var5 = var8; // L: 765 + var6 = var11; // L: 766 } } else { - return null; // L: 759 + return null; // L: 751 } } } - @ObfuscatedName("bb") + @ObfuscatedName("bl") @ObfuscatedSignature( - descriptor = "(IILia;Lia;B)V", - garbageValue = "0" + descriptor = "(IILii;Lii;I)V", + garbageValue = "1568785181" ) @Export("worldMapMenuAction") public void worldMapMenuAction(int var1, int var2, Coord var3, Coord var4) { - ScriptEvent var5 = new ScriptEvent(); // L: 782 - WorldMapEvent var6 = new WorldMapEvent(var2, var3, var4); // L: 783 - var5.setArgs(new Object[]{var6}); // L: 784 - switch(var1) { // L: 785 + ScriptEvent var5 = new ScriptEvent(); // L: 774 + WorldMapEvent var6 = new WorldMapEvent(var2, var3, var4); // L: 775 + var5.setArgs(new Object[]{var6}); // L: 776 + switch(var1) { // L: 777 case 1008: - var5.setType(10); // L: 788 + var5.setType(10); // L: 800 break; case 1009: - var5.setType(11); // L: 803 - break; // L: 804 + var5.setType(11); // L: 790 + break; // L: 791 case 1010: - var5.setType(12); // L: 808 - break; + var5.setType(12); // L: 795 + break; // L: 796 case 1011: - var5.setType(13); // L: 798 - break; // L: 799 + var5.setType(13); // L: 785 + break; // L: 786 case 1012: - var5.setType(14); // L: 793 + var5.setType(14); // L: 780 } - class259.runScriptEvent(var5); // L: 812 - } // L: 813 + PacketWriter.runScriptEvent(var5); // L: 804 + } // L: 805 - @ObfuscatedName("bk") + @ObfuscatedName("bv") @ObfuscatedSignature( - descriptor = "(I)Lgw;", - garbageValue = "1669078406" + descriptor = "(B)Lgq;", + garbageValue = "1" ) @Export("iconStart") public AbstractWorldMapIcon iconStart() { - if (!this.cacheLoader.isLoaded()) { // L: 816 - return null; // L: 817 - } else if (!this.worldMapManager.isLoaded()) { // L: 819 - return null; // L: 820 + if (!this.cacheLoader.isLoaded()) { // L: 808 + return null; // L: 809 + } else if (!this.worldMapManager.isLoaded()) { // L: 811 + return null; // L: 812 } else { - HashMap var1 = this.worldMapManager.buildIcons(); // L: 822 - this.field4024 = new LinkedList(); // L: 823 - Iterator var2 = var1.values().iterator(); // L: 824 + HashMap var1 = this.worldMapManager.buildIcons(); // L: 814 + this.field4039 = new LinkedList(); // L: 815 + Iterator var2 = var1.values().iterator(); // L: 816 while (var2.hasNext()) { - List var3 = (List)var2.next(); // L: 825 - this.field4024.addAll(var3); // L: 827 + List var3 = (List)var2.next(); // L: 817 + this.field4039.addAll(var3); // L: 819 } - this.iconIterator = this.field4024.iterator(); // L: 830 - return this.iconNext(); // L: 831 + this.iconIterator = this.field4039.iterator(); // L: 822 + return this.iconNext(); // L: 823 } } - @ObfuscatedName("bt") + @ObfuscatedName("bm") @ObfuscatedSignature( - descriptor = "(I)Lgw;", - garbageValue = "-1103546014" + descriptor = "(I)Lgq;", + garbageValue = "558434467" ) @Export("iconNext") public AbstractWorldMapIcon iconNext() { - if (this.iconIterator == null) { // L: 835 - return null; // L: 836 + if (this.iconIterator == null) { // L: 827 + return null; // L: 828 } else { AbstractWorldMapIcon var1; do { - if (!this.iconIterator.hasNext()) { // L: 838 - return null; // L: 844 + if (!this.iconIterator.hasNext()) { // L: 830 + return null; // L: 836 } - var1 = (AbstractWorldMapIcon)this.iconIterator.next(); // L: 839 - } while(var1.getElement() == -1); // L: 840 + var1 = (AbstractWorldMapIcon)this.iconIterator.next(); // L: 831 + } while(var1.getElement() == -1); // L: 832 - return var1; // L: 841 + return var1; // L: 833 } } } diff --git a/runescape-client/src/main/java/WorldMapArchiveLoader.java b/runescape-client/src/main/java/WorldMapArchiveLoader.java index fdcc3a93d9..398cb3554d 100644 --- a/runescape-client/src/main/java/WorldMapArchiveLoader.java +++ b/runescape-client/src/main/java/WorldMapArchiveLoader.java @@ -4,30 +4,30 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("mz") +@ObfuscatedName("ma") @Implements("WorldMapArchiveLoader") public class WorldMapArchiveLoader { - @ObfuscatedName("l") + @ObfuscatedName("p") @Export("cacheName") String cacheName; - @ObfuscatedName("z") + @ObfuscatedName("j") @ObfuscatedSignature( - descriptor = "Ljp;" + descriptor = "Ljv;" ) @Export("archive") AbstractArchive archive; - @ObfuscatedName("t") + @ObfuscatedName("r") @ObfuscatedGetter( - intValue = -2128153827 + intValue = 134811513 ) @Export("percentLoaded") int percentLoaded; - @ObfuscatedName("v") + @ObfuscatedName("b") @Export("loaded") boolean loaded; @ObfuscatedSignature( - descriptor = "(Ljp;)V" + descriptor = "(Ljv;)V" ) WorldMapArchiveLoader(AbstractArchive var1) { this.percentLoaded = 0; // L: 13 @@ -35,10 +35,10 @@ public class WorldMapArchiveLoader { this.archive = var1; // L: 17 } // L: 18 - @ObfuscatedName("h") + @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "(Ljava/lang/String;I)V", - garbageValue = "1620207835" + descriptor = "(Ljava/lang/String;B)V", + garbageValue = "87" ) @Export("reset") void reset(String var1) { @@ -52,15 +52,15 @@ public class WorldMapArchiveLoader { } } // L: 22 25 31 - @ObfuscatedName("c") + @ObfuscatedName("n") @ObfuscatedSignature( - descriptor = "(I)I", - garbageValue = "-208007083" + descriptor = "(B)I", + garbageValue = "-69" ) @Export("load") int load() { if (this.percentLoaded < 33) { // L: 34 - if (!this.archive.tryLoadFileByNames(WorldMapCacheName.field2123.name, this.cacheName)) { // L: 35 + if (!this.archive.tryLoadFileByNames(WorldMapCacheName.field2132.name, this.cacheName)) { // L: 35 return this.percentLoaded; // L: 36 } @@ -68,7 +68,7 @@ public class WorldMapArchiveLoader { } if (this.percentLoaded == 33) { // L: 40 - if (this.archive.isValidFileName(WorldMapCacheName.field2124.name, this.cacheName) && !this.archive.tryLoadFileByNames(WorldMapCacheName.field2124.name, this.cacheName)) { // L: 41 42 + if (this.archive.isValidFileName(WorldMapCacheName.field2134.name, this.cacheName) && !this.archive.tryLoadFileByNames(WorldMapCacheName.field2134.name, this.cacheName)) { // L: 41 42 return this.percentLoaded; // L: 43 } @@ -76,7 +76,7 @@ public class WorldMapArchiveLoader { } if (this.percentLoaded == 66) { // L: 48 - if (!this.archive.tryLoadFileByNames(this.cacheName, WorldMapCacheName.field2126.name)) { // L: 49 + if (!this.archive.tryLoadFileByNames(this.cacheName, WorldMapCacheName.field2135.name)) { // L: 49 return this.percentLoaded; // L: 50 } @@ -87,20 +87,20 @@ public class WorldMapArchiveLoader { return this.percentLoaded; // L: 55 } - @ObfuscatedName("o") + @ObfuscatedName("f") @ObfuscatedSignature( descriptor = "(I)Z", - garbageValue = "-2026049146" + garbageValue = "1213842170" ) @Export("isLoaded") boolean isLoaded() { return this.loaded; // L: 59 } - @ObfuscatedName("g") + @ObfuscatedName("y") @ObfuscatedSignature( - descriptor = "(B)I", - garbageValue = "16" + descriptor = "(I)I", + garbageValue = "-192788125" ) @Export("getPercentLoaded") int getPercentLoaded() { diff --git a/runescape-client/src/main/java/WorldMapArea.java b/runescape-client/src/main/java/WorldMapArea.java index 4ebf7a2167..d606e2b86d 100644 --- a/runescape-client/src/main/java/WorldMapArea.java +++ b/runescape-client/src/main/java/WorldMapArea.java @@ -6,73 +6,73 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("fe") +@ObfuscatedName("fo") @Implements("WorldMapArea") public class WorldMapArea { - @ObfuscatedName("fl") + @ObfuscatedName("hb") @ObfuscatedSignature( - descriptor = "Lkc;" + descriptor = "[Loh;" ) - @Export("fontBold12") - static Font fontBold12; - @ObfuscatedName("h") + @Export("mapMarkerSprites") + static SpritePixels[] mapMarkerSprites; + @ObfuscatedName("v") @ObfuscatedGetter( - intValue = 519247697 + intValue = -1076767211 ) @Export("id") int id; - @ObfuscatedName("c") + @ObfuscatedName("n") @Export("internalName") String internalName; - @ObfuscatedName("o") + @ObfuscatedName("f") @Export("externalName") String externalName; - @ObfuscatedName("g") + @ObfuscatedName("y") @ObfuscatedGetter( - intValue = -1230995281 + intValue = -1286502133 ) @Export("backGroundColor") int backGroundColor; - @ObfuscatedName("l") + @ObfuscatedName("p") @ObfuscatedGetter( - intValue = 526581911 + intValue = -1817380147 ) @Export("zoom") int zoom; - @ObfuscatedName("z") + @ObfuscatedName("j") @ObfuscatedSignature( - descriptor = "Lia;" + descriptor = "Lii;" ) @Export("origin") Coord origin; - @ObfuscatedName("t") + @ObfuscatedName("r") @ObfuscatedGetter( - intValue = 399363655 + intValue = -214984287 ) @Export("regionLowX") int regionLowX; - @ObfuscatedName("v") + @ObfuscatedName("b") @ObfuscatedGetter( - intValue = 383400035 + intValue = 1975622015 ) @Export("regionHighX") int regionHighX; - @ObfuscatedName("b") + @ObfuscatedName("d") @ObfuscatedGetter( - intValue = -1375320443 + intValue = -1153356879 ) @Export("regionLowY") int regionLowY; - @ObfuscatedName("q") + @ObfuscatedName("s") @ObfuscatedGetter( - intValue = 2005754791 + intValue = 1020551999 ) @Export("regionHighY") int regionHighY; - @ObfuscatedName("i") + @ObfuscatedName("u") @Export("isMain") boolean isMain; - @ObfuscatedName("x") + @ObfuscatedName("l") @Export("sections") LinkedList sections; @@ -88,10 +88,10 @@ public class WorldMapArea { this.isMain = false; // L: 19 } - @ObfuscatedName("h") + @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "(Lnk;II)V", - garbageValue = "1004377036" + descriptor = "(Lnd;II)V", + garbageValue = "-1949118640" ) @Export("read") public void read(Buffer var1, int var2) { @@ -113,81 +113,82 @@ public class WorldMapArea { this.setBounds(); // L: 36 } // L: 37 - @ObfuscatedName("c") + @ObfuscatedName("n") @ObfuscatedSignature( - descriptor = "(Lnk;I)Lgl;", - garbageValue = "860405758" + descriptor = "(Lnd;I)Lgi;", + garbageValue = "2132246021" ) @Export("readWorldMapSection") WorldMapSection readWorldMapSection(Buffer var1) { int var2 = var1.readUnsignedByte(); // L: 40 - WorldMapSectionType var3 = (WorldMapSectionType)UserComparator4.findEnumerated(WorldMapSectionType.method3537(), var2); // L: 41 - Object var4 = null; // L: 42 - switch(var3.type) { // L: 43 + WorldMapSectionType[] var3 = new WorldMapSectionType[]{WorldMapSectionType.WORLDMAPSECTIONTYPE1, WorldMapSectionType.WORLDMAPSECTIONTYPE3, WorldMapSectionType.WORLDMAPSECTIONTYPE2, WorldMapSectionType.WORLDMAPSECTIONTYPE0}; // L: 43 + WorldMapSectionType var4 = (WorldMapSectionType)Messages.findEnumerated(var3, var2); // L: 45 + Object var5 = null; // L: 46 + switch(var4.type) { // L: 47 case 0: - var4 = new class169(); // L: 56 + var5 = new WorldMapSection2(); // L: 49 break; case 1: - var4 = new WorldMapSection0(); // L: 48 - break; // L: 49 + var5 = new WorldMapSection0(); // L: 55 + break; // L: 56 case 2: - var4 = new WorldMapSection2(); // L: 45 - break; + var5 = new WorldMapSection1(); // L: 52 + break; // L: 53 case 3: - var4 = new WorldMapSection1(); // L: 53 - break; + var5 = new class169(); // L: 58 + break; // L: 59 default: - throw new IllegalStateException(""); // L: 51 + throw new IllegalStateException(""); // L: 61 } - ((WorldMapSection)var4).read(var1); // L: 59 - return (WorldMapSection)var4; // L: 60 + ((WorldMapSection)var5).read(var1); // L: 63 + return (WorldMapSection)var5; // L: 64 } - @ObfuscatedName("o") + @ObfuscatedName("f") @ObfuscatedSignature( - descriptor = "(IIIB)Z", - garbageValue = "99" + descriptor = "(IIII)Z", + garbageValue = "-1800856455" ) @Export("containsCoord") public boolean containsCoord(int var1, int var2, int var3) { - Iterator var4 = this.sections.iterator(); // L: 64 + Iterator var4 = this.sections.iterator(); // L: 68 WorldMapSection var5; do { if (!var4.hasNext()) { - return false; // L: 72 + return false; // L: 76 } - var5 = (WorldMapSection)var4.next(); // L: 65 - } while(!var5.containsCoord(var1, var2, var3)); // L: 67 + var5 = (WorldMapSection)var4.next(); // L: 69 + } while(!var5.containsCoord(var1, var2, var3)); // L: 71 - return true; // L: 68 + return true; // L: 72 } - @ObfuscatedName("g") + @ObfuscatedName("y") @ObfuscatedSignature( descriptor = "(III)Z", - garbageValue = "-1146651555" + garbageValue = "621143817" ) @Export("containsPosition") public boolean containsPosition(int var1, int var2) { - int var3 = var1 / 64; // L: 76 - int var4 = var2 / 64; // L: 77 - if (var3 >= this.regionLowX && var3 <= this.regionHighX) { // L: 78 - if (var4 >= this.regionLowY && var4 <= this.regionHighY) { // L: 79 - Iterator var5 = this.sections.iterator(); // L: 80 + int var3 = var1 / 64; // L: 80 + int var4 = var2 / 64; // L: 81 + if (var3 >= this.regionLowX && var3 <= this.regionHighX) { // L: 82 + if (var4 >= this.regionLowY && var4 <= this.regionHighY) { // L: 83 + Iterator var5 = this.sections.iterator(); // L: 84 WorldMapSection var6; do { if (!var5.hasNext()) { - return false; // L: 88 + return false; // L: 92 } - var6 = (WorldMapSection)var5.next(); // L: 81 - } while(!var6.containsPosition(var1, var2)); // L: 83 + var6 = (WorldMapSection)var5.next(); // L: 85 + } while(!var6.containsPosition(var1, var2)); // L: 87 - return true; // L: 84 + return true; // L: 88 } else { return false; } @@ -196,201 +197,201 @@ public class WorldMapArea { } } - @ObfuscatedName("l") + @ObfuscatedName("p") @ObfuscatedSignature( - descriptor = "(IIII)[I", - garbageValue = "-311505931" + descriptor = "(IIIB)[I", + garbageValue = "-18" ) @Export("position") public int[] position(int var1, int var2, int var3) { - Iterator var4 = this.sections.iterator(); // L: 92 + Iterator var4 = this.sections.iterator(); // L: 96 WorldMapSection var5; do { if (!var4.hasNext()) { - return null; // L: 100 + return null; // L: 104 } - var5 = (WorldMapSection)var4.next(); // L: 93 - } while(!var5.containsCoord(var1, var2, var3)); // L: 95 + var5 = (WorldMapSection)var4.next(); // L: 97 + } while(!var5.containsCoord(var1, var2, var3)); // L: 99 - return var5.getBorderTileLengths(var1, var2, var3); // L: 96 + return var5.getBorderTileLengths(var1, var2, var3); // L: 100 } - @ObfuscatedName("z") + @ObfuscatedName("j") @ObfuscatedSignature( - descriptor = "(III)Lia;", - garbageValue = "-474140202" + descriptor = "(III)Lii;", + garbageValue = "-1073728046" ) @Export("coord") public Coord coord(int var1, int var2) { - Iterator var3 = this.sections.iterator(); // L: 104 + Iterator var3 = this.sections.iterator(); // L: 108 WorldMapSection var4; do { - if (!var3.hasNext()) { - return null; // L: 112 + if (!var3.hasNext()) { // L: 115 + return null; // L: 116 } - var4 = (WorldMapSection)var3.next(); // L: 105 - } while(!var4.containsPosition(var1, var2)); // L: 107 + var4 = (WorldMapSection)var3.next(); // L: 109 + } while(!var4.containsPosition(var1, var2)); // L: 111 - return var4.coord(var1, var2); // L: 108 - } - - @ObfuscatedName("t") - @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "2003225896" - ) - @Export("setBounds") - void setBounds() { - Iterator var1 = this.sections.iterator(); // L: 116 - - while (var1.hasNext()) { - WorldMapSection var2 = (WorldMapSection)var1.next(); // L: 117 - var2.expandBounds(this); // L: 119 - } - - } // L: 122 - - @ObfuscatedName("v") - @ObfuscatedSignature( - descriptor = "(I)I", - garbageValue = "-1745178974" - ) - @Export("getId") - public int getId() { - return this.id; // L: 125 - } - - @ObfuscatedName("b") - @ObfuscatedSignature( - descriptor = "(I)Z", - garbageValue = "-1950754805" - ) - @Export("getIsMain") - public boolean getIsMain() { - return this.isMain; // L: 129 - } - - @ObfuscatedName("q") - @ObfuscatedSignature( - descriptor = "(I)Ljava/lang/String;", - garbageValue = "725085100" - ) - @Export("getInternalName") - public String getInternalName() { - return this.internalName; // L: 133 - } - - @ObfuscatedName("i") - @ObfuscatedSignature( - descriptor = "(I)Ljava/lang/String;", - garbageValue = "1184219144" - ) - @Export("getExternalName") - public String getExternalName() { - return this.externalName; // L: 137 - } - - @ObfuscatedName("x") - @ObfuscatedSignature( - descriptor = "(I)I", - garbageValue = "-1551948679" - ) - @Export("getBackGroundColor") - int getBackGroundColor() { - return this.backGroundColor; // L: 141 - } - - @ObfuscatedName("k") - @ObfuscatedSignature( - descriptor = "(I)I", - garbageValue = "1392872851" - ) - @Export("getZoom") - public int getZoom() { - return this.zoom; // L: 145 + return var4.coord(var1, var2); // L: 112 } @ObfuscatedName("r") + @ObfuscatedSignature( + descriptor = "(I)V", + garbageValue = "-1729266298" + ) + @Export("setBounds") + void setBounds() { + Iterator var1 = this.sections.iterator(); // L: 120 + + while (var1.hasNext()) { + WorldMapSection var2 = (WorldMapSection)var1.next(); // L: 121 + var2.expandBounds(this); // L: 123 + } + + } // L: 126 + + @ObfuscatedName("b") @ObfuscatedSignature( descriptor = "(I)I", - garbageValue = "-759231934" + garbageValue = "-113246387" + ) + @Export("getId") + public int getId() { + return this.id; // L: 129 + } + + @ObfuscatedName("d") + @ObfuscatedSignature( + descriptor = "(B)Z", + garbageValue = "1" + ) + @Export("getIsMain") + public boolean getIsMain() { + return this.isMain; // L: 133 + } + + @ObfuscatedName("s") + @ObfuscatedSignature( + descriptor = "(B)Ljava/lang/String;", + garbageValue = "-62" + ) + @Export("getInternalName") + public String getInternalName() { + return this.internalName; // L: 137 + } + + @ObfuscatedName("u") + @ObfuscatedSignature( + descriptor = "(I)Ljava/lang/String;", + garbageValue = "772000133" + ) + @Export("getExternalName") + public String getExternalName() { + return this.externalName; // L: 141 + } + + @ObfuscatedName("l") + @ObfuscatedSignature( + descriptor = "(I)I", + garbageValue = "897083194" + ) + @Export("getBackGroundColor") + int getBackGroundColor() { + return this.backGroundColor; // L: 145 + } + + @ObfuscatedName("o") + @ObfuscatedSignature( + descriptor = "(I)I", + garbageValue = "-1426603184" + ) + @Export("getZoom") + public int getZoom() { + return this.zoom; // L: 149 + } + + @ObfuscatedName("c") + @ObfuscatedSignature( + descriptor = "(I)I", + garbageValue = "1057202329" ) @Export("getRegionLowX") public int getRegionLowX() { - return this.regionLowX; // L: 149 - } - - @ObfuscatedName("p") - @ObfuscatedSignature( - descriptor = "(I)I", - garbageValue = "1206209836" - ) - @Export("getRegionHighX") - public int getRegionHighX() { - return this.regionHighX; // L: 153 - } - - @ObfuscatedName("a") - @ObfuscatedSignature( - descriptor = "(B)I", - garbageValue = "96" - ) - @Export("getRegionLowY") - public int getRegionLowY() { - return this.regionLowY; // L: 157 + return this.regionLowX; // L: 153 } @ObfuscatedName("e") @ObfuscatedSignature( descriptor = "(I)I", - garbageValue = "-16776142" + garbageValue = "644199469" + ) + @Export("getRegionHighX") + public int getRegionHighX() { + return this.regionHighX; // L: 157 + } + + @ObfuscatedName("g") + @ObfuscatedSignature( + descriptor = "(B)I", + garbageValue = "-6" + ) + @Export("getRegionLowY") + public int getRegionLowY() { + return this.regionLowY; // L: 161 + } + + @ObfuscatedName("a") + @ObfuscatedSignature( + descriptor = "(I)I", + garbageValue = "494327385" ) @Export("getRegionHighY") public int getRegionHighY() { - return this.regionHighY; // L: 161 + return this.regionHighY; // L: 165 } - @ObfuscatedName("d") + @ObfuscatedName("k") @ObfuscatedSignature( descriptor = "(I)I", - garbageValue = "-804224518" + garbageValue = "1792528249" ) @Export("getOriginX") public int getOriginX() { - return this.origin.x; // L: 165 - } - - @ObfuscatedName("u") - @ObfuscatedSignature( - descriptor = "(I)I", - garbageValue = "-1864891878" - ) - @Export("getOriginPlane") - public int getOriginPlane() { - return this.origin.plane; // L: 169 + return this.origin.x; // L: 169 } @ObfuscatedName("m") @ObfuscatedSignature( - descriptor = "(B)I", - garbageValue = "-26" + descriptor = "(I)I", + garbageValue = "-1473064469" + ) + @Export("getOriginPlane") + public int getOriginPlane() { + return this.origin.plane; // L: 173 + } + + @ObfuscatedName("x") + @ObfuscatedSignature( + descriptor = "(I)I", + garbageValue = "-202586272" ) @Export("getOriginY") public int getOriginY() { - return this.origin.y; // L: 173 + return this.origin.y; // L: 177 } - @ObfuscatedName("j") + @ObfuscatedName("z") @ObfuscatedSignature( - descriptor = "(I)Lia;", - garbageValue = "-742727761" + descriptor = "(B)Lii;", + garbageValue = "-71" ) @Export("getOrigin") public Coord getOrigin() { - return new Coord(this.origin); // L: 177 + return new Coord(this.origin); // L: 181 } } diff --git a/runescape-client/src/main/java/WorldMapAreaData.java b/runescape-client/src/main/java/WorldMapAreaData.java index 0ddad27c5b..a4fafebf11 100644 --- a/runescape-client/src/main/java/WorldMapAreaData.java +++ b/runescape-client/src/main/java/WorldMapAreaData.java @@ -1,49 +1,34 @@ -import java.awt.image.BufferedImage; -import java.awt.image.PixelGrabber; -import java.io.ByteArrayInputStream; -import java.io.IOException; import java.util.HashSet; import java.util.LinkedList; import java.util.List; -import javax.imageio.ImageIO; 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("gc") +@ObfuscatedName("gz") @Implements("WorldMapAreaData") public class WorldMapAreaData extends WorldMapArea { - @ObfuscatedName("rb") - @ObfuscatedSignature( - descriptor = "Lbd;" - ) - @Export("pcmPlayer0") - static PcmPlayer pcmPlayer0; - @ObfuscatedName("ek") - @ObfuscatedSignature( - descriptor = "Lji;" - ) - @Export("archive18") - static Archive archive18; - @ObfuscatedName("k") + @ObfuscatedName("gx") + @Export("xteaKeys") + static int[][] xteaKeys; + @ObfuscatedName("o") @Export("worldMapData0Set") HashSet worldMapData0Set; - @ObfuscatedName("r") + @ObfuscatedName("c") @Export("worldMapData1Set") HashSet worldMapData1Set; - @ObfuscatedName("p") + @ObfuscatedName("e") @Export("iconList") List iconList; WorldMapAreaData() { } // L: 14 - @ObfuscatedName("bj") + @ObfuscatedName("ba") @ObfuscatedSignature( - descriptor = "(Lnk;Lnk;IZI)V", - garbageValue = "1847840337" + descriptor = "(Lnd;Lnd;IZI)V", + garbageValue = "1129445653" ) @Export("init") void init(Buffer var1, Buffer var2, int var3, boolean var4) { @@ -52,22 +37,22 @@ public class WorldMapAreaData extends WorldMapArea { this.worldMapData0Set = new HashSet(var5); // L: 19 int var6; - for (var6 = 0; var6 < var5; ++var6) { + for (var6 = 0; var6 < var5; ++var6) { // L: 20 WorldMapData_0 var7 = new WorldMapData_0(); // L: 21 try { - var7.init(var2); - } catch (IllegalStateException var12) { - continue; + var7.init(var2); // L: 23 + } catch (IllegalStateException var12) { // L: 25 + continue; // L: 26 } - this.worldMapData0Set.add(var7); + this.worldMapData0Set.add(var7); // L: 28 } - var6 = var2.readUnsignedShort(); - this.worldMapData1Set = new HashSet(var6); + var6 = var2.readUnsignedShort(); // L: 30 + this.worldMapData1Set = new HashSet(var6); // L: 31 - for (int var10 = 0; var10 < var6; ++var10) { + for (int var10 = 0; var10 < var6; ++var10) { // L: 32 WorldMapData_1 var8 = new WorldMapData_1(); // L: 33 try { @@ -84,8 +69,8 @@ public class WorldMapAreaData extends WorldMapArea { @ObfuscatedName("be") @ObfuscatedSignature( - descriptor = "(Lnk;ZI)V", - garbageValue = "-2146987999" + descriptor = "(Lnd;ZI)V", + garbageValue = "1182006206" ) @Export("initIconsList") void initIconsList(Buffer var1, boolean var2) { @@ -93,7 +78,7 @@ public class WorldMapAreaData extends WorldMapArea { int var3 = var1.readUnsignedShort(); // L: 47 for (int var4 = 0; var4 < var3; ++var4) { // L: 48 - int var5 = var1.method6464(); // L: 49 + int var5 = var1.method6583(); // L: 49 Coord var6 = new Coord(var1.readInt()); // L: 50 boolean var7 = var1.readUnsignedByte() == 1; // L: 51 if (var2 || !var7) { // L: 52 @@ -103,72 +88,494 @@ public class WorldMapAreaData extends WorldMapArea { } // L: 56 - @ObfuscatedName("h") - @ObfuscatedSignature( - descriptor = "(IB)Let;", - garbageValue = "0" - ) - @Export("WorldMapElement_get") - public static WorldMapElement WorldMapElement_get(int var0) { - return var0 >= 0 && var0 < WorldMapElement.WorldMapElement_cached.length && WorldMapElement.WorldMapElement_cached[var0] != null ? WorldMapElement.WorldMapElement_cached[var0] : new WorldMapElement(var0); // L: 44 45 - } - - @ObfuscatedName("h") - @ObfuscatedSignature( - descriptor = "([BI)Low;", - garbageValue = "633524890" - ) - @Export("convertJpgToSprite") - public static final SpritePixels convertJpgToSprite(byte[] var0) { - BufferedImage var1 = null; // L: 20 - - try { - var1 = ImageIO.read(new ByteArrayInputStream(var0)); // L: 22 - int var2 = var1.getWidth(); // L: 23 - int var3 = var1.getHeight(); // L: 24 - int[] var4 = new int[var2 * var3]; // L: 25 - PixelGrabber var5 = new PixelGrabber(var1, 0, 0, var2, var3, var4, 0, var2); // L: 26 - var5.grabPixels(); // L: 27 - return new SpritePixels(var4, var2, var3); // L: 28 - } catch (IOException var7) { // L: 30 - } catch (InterruptedException var8) { // L: 31 - } - - return new SpritePixels(0, 0); // L: 32 - } - @ObfuscatedName("j") @ObfuscatedSignature( - descriptor = "(ILci;ZI)I", - garbageValue = "995249134" + descriptor = "(Lnd;IIIIIIB)V", + garbageValue = "-20" ) - static int method3668(int var0, Script var1, boolean var2) { - Widget var3 = DevicePcmPlayerProvider.getWidget(Interpreter.Interpreter_intStack[--WorldMapCacheName.Interpreter_intStackSize]); // L: 1376 - if (var0 == ScriptOpcodes.IF_GETTARGETMASK) { // L: 1377 - Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = AttackOption.Widget_unpackTargetMask(class26.getWidgetFlags(var3)); // L: 1378 - return 1; // L: 1379 - } else if (var0 != ScriptOpcodes.IF_GETOP) { // L: 1381 - if (var0 == ScriptOpcodes.IF_GETOPBASE) { // L: 1388 - if (var3.dataText == null) { // L: 1389 - Interpreter.Interpreter_stringStack[++class13.Interpreter_stringStackSize - 1] = ""; - } else { - Interpreter.Interpreter_stringStack[++class13.Interpreter_stringStackSize - 1] = var3.dataText; // L: 1390 + @Export("loadTerrain") + static final void loadTerrain(Buffer var0, int var1, int var2, int var3, int var4, int var5, int var6) { + int var7; + if (var2 >= 0 && var2 < 104 && var3 >= 0 && var3 < 104) { // L: 126 + Tiles.Tiles_renderFlags[var1][var2][var3] = 0; // L: 127 + + while (true) { + var7 = var0.readUnsignedByte(); // L: 129 + if (var7 == 0) { // L: 130 + if (var1 == 0) { // L: 131 + int[] var14 = Tiles.Tiles_heights[0][var2]; // L: 132 + int var11 = var2 + var4 + 932731; // L: 135 + int var12 = var3 + var5 + 556238; // L: 136 + int var13 = Skeleton.method3920(var11 + 45365, var12 + 91923, 4) - 128 + (Skeleton.method3920(10294 + var11, 37821 + var12, 2) - 128 >> 1) + (Skeleton.method3920(var11, var12, 1) - 128 >> 2); // L: 138 + var13 = (int)((double)var13 * 0.3D) + 35; // L: 139 + if (var13 < 10) { // L: 140 + var13 = 10; + } else if (var13 > 60) { // L: 141 + var13 = 60; + } + + var14[var3] = -var13 * 8; // L: 144 + } else { + Tiles.Tiles_heights[var1][var2][var3] = Tiles.Tiles_heights[var1 - 1][var2][var3] - 240; // L: 146 + } + break; } - return 1; // L: 1391 - } else { - return 2; // L: 1393 + if (var7 == 1) { // L: 149 + int var8 = var0.readUnsignedByte(); // L: 150 + if (var8 == 1) { // L: 151 + var8 = 0; + } + + if (var1 == 0) { // L: 152 + Tiles.Tiles_heights[0][var2][var3] = -var8 * 8; + } else { + Tiles.Tiles_heights[var1][var2][var3] = Tiles.Tiles_heights[var1 - 1][var2][var3] - var8 * 8; // L: 153 + } + break; + } + + if (var7 <= 49) { // L: 156 + class253.field3130[var1][var2][var3] = var0.readByte(); // L: 157 + class20.field182[var1][var2][var3] = (byte)((var7 - 2) / 4); // L: 158 + DirectByteArrayCopier.field3128[var1][var2][var3] = (byte)(var7 - 2 + var6 & 3); // L: 159 + } else if (var7 <= 81) { // L: 162 + Tiles.Tiles_renderFlags[var1][var2][var3] = (byte)(var7 - 49); // L: 163 + } else { + Tiles.field1120[var1][var2][var3] = (byte)(var7 - 81); // L: 166 + } } } else { - int var4 = Interpreter.Interpreter_intStack[--WorldMapCacheName.Interpreter_intStackSize]; // L: 1382 - --var4; // L: 1383 - if (var3.actions != null && var4 < var3.actions.length && var3.actions[var4] != null) { // L: 1384 - Interpreter.Interpreter_stringStack[++class13.Interpreter_stringStackSize - 1] = var3.actions[var4]; // L: 1385 - } else { - Interpreter.Interpreter_stringStack[++class13.Interpreter_stringStackSize - 1] = ""; + while (true) { + var7 = var0.readUnsignedByte(); // L: 171 + if (var7 == 0) { // L: 172 + break; + } + + if (var7 == 1) { // L: 173 + var0.readUnsignedByte(); // L: 174 + break; + } + + if (var7 <= 49) { // L: 177 + var0.readUnsignedByte(); + } + } + } + + } // L: 180 + + @ObfuscatedName("hf") + @ObfuscatedSignature( + descriptor = "(B)V", + garbageValue = "0" + ) + static final void method3708() { + TextureProvider.method4142(false); // L: 5242 + Client.field694 = 0; // L: 5243 + boolean var0 = true; // L: 5244 + + int var1; + for (var1 = 0; var1 < class18.regionLandArchives.length; ++var1) { // L: 5245 + if (class16.regionMapArchiveIds[var1] != -1 && class18.regionLandArchives[var1] == null) { // L: 5246 5247 + class18.regionLandArchives[var1] = class247.archive5.takeFile(class16.regionMapArchiveIds[var1], 0); // L: 5248 + if (class18.regionLandArchives[var1] == null) { // L: 5249 + var0 = false; // L: 5250 + ++Client.field694; // L: 5251 + } } - return 1; // L: 1386 + if (class24.regionLandArchiveIds[var1] != -1 && class82.regionMapArchives[var1] == null) { // L: 5255 5256 + class82.regionMapArchives[var1] = class247.archive5.takeFileEncrypted(class24.regionLandArchiveIds[var1], 0, xteaKeys[var1]); // L: 5257 + if (class82.regionMapArchives[var1] == null) { // L: 5258 + var0 = false; // L: 5259 + ++Client.field694; // L: 5260 + } + } } - } + + if (!var0) { // L: 5265 + Client.field698 = 1; // L: 5266 + } else { + Client.field696 = 0; // L: 5269 + var0 = true; // L: 5270 + + int var3; + int var4; + int var9; + int var10; + int var11; + int var14; + int var15; + int var16; + int var17; + Buffer var34; + int var35; + int var36; + for (var1 = 0; var1 < class18.regionLandArchives.length; ++var1) { // L: 5271 + byte[] var39 = class82.regionMapArchives[var1]; // L: 5272 + if (var39 != null) { // L: 5273 + var3 = (PlayerComposition.regions[var1] >> 8) * 64 - VertexNormal.baseX; // L: 5274 + var4 = (PlayerComposition.regions[var1] & 255) * 64 - SoundSystem.baseY; // L: 5275 + if (Client.isInInstance) { // L: 5276 + var3 = 10; // L: 5277 + var4 = 10; // L: 5278 + } + + boolean var7 = true; // L: 5283 + var34 = new Buffer(var39); // L: 5284 + var9 = -1; // L: 5285 + + label594: + while (true) { + var10 = var34.method6560(); // L: 5287 + if (var10 == 0) { // L: 5288 + var0 &= var7; // L: 5321 + break; + } + + var9 += var10; // L: 5289 + var11 = 0; // L: 5290 + boolean var12 = false; // L: 5291 + + while (true) { + while (!var12) { // L: 5293 + var35 = var34.readUShortSmart(); // L: 5299 + if (var35 == 0) { // L: 5300 + continue label594; + } + + var11 += var35 - 1; // L: 5301 + var14 = var11 & 63; // L: 5302 + var15 = var11 >> 6 & 63; // L: 5303 + var16 = var34.readUnsignedByte() >> 2; // L: 5304 + var17 = var15 + var3; // L: 5305 + var36 = var4 + var14; // L: 5306 + if (var17 > 0 && var36 > 0 && var17 < 103 && var36 < 103) { // L: 5307 + ObjectComposition var31 = class23.getObjectDefinition(var9); // L: 5308 + if (var16 != 22 || !Client.isLowDetail || var31.int1 != 0 || var31.interactType == 1 || var31.boolean2) { // L: 5309 + if (!var31.needsModelFiles()) { // L: 5310 + ++Client.field696; // L: 5311 + var7 = false; // L: 5312 + } + + var12 = true; // L: 5314 + } + } + } + + var35 = var34.readUShortSmart(); // L: 5294 + if (var35 == 0) { // L: 5295 + break; + } + + var34.readUnsignedByte(); // L: 5296 + } + } + } + } + + if (!var0) { // L: 5324 + Client.field698 = 2; // L: 5325 + } else { + if (Client.field698 != 0) { // L: 5328 + DirectByteArrayCopier.drawLoadingMessage("Loading - please wait." + "
" + " (" + 100 + "%" + ")", true); + } + + HealthBarUpdate.playPcmPlayers(); // L: 5329 + AbstractSocket.scene.clear(); // L: 5330 + + for (var1 = 0; var1 < 4; ++var1) { // L: 5331 + Client.collisionMaps[var1].clear(); + } + + int var2; + for (var1 = 0; var1 < 4; ++var1) { // L: 5332 + for (var2 = 0; var2 < 104; ++var2) { // L: 5333 + for (var3 = 0; var3 < 104; ++var3) { // L: 5334 + Tiles.Tiles_renderFlags[var1][var2][var3] = 0; // L: 5335 + } + } + } + + HealthBarUpdate.playPcmPlayers(); // L: 5339 + class34.method327(); // L: 5340 + var1 = class18.regionLandArchives.length; // L: 5341 + WorldMapSprite.method3631(); // L: 5342 + TextureProvider.method4142(true); // L: 5343 + int var5; + int var19; + int var20; + int var21; + int var42; + if (!Client.isInInstance) { // L: 5344 + byte[] var38; + for (var2 = 0; var2 < var1; ++var2) { // L: 5345 + var3 = (PlayerComposition.regions[var2] >> 8) * 64 - VertexNormal.baseX; // L: 5346 + var4 = (PlayerComposition.regions[var2] & 255) * 64 - SoundSystem.baseY; // L: 5347 + var38 = class18.regionLandArchives[var2]; // L: 5348 + if (var38 != null) { // L: 5349 + HealthBarUpdate.playPcmPlayers(); // L: 5350 + WorldMapLabel.method3632(var38, var3, var4, GrandExchangeOfferOwnWorldComparator.field632 * 8 - 48, UserComparator4.field1427 * 8 - 48, Client.collisionMaps); // L: 5351 + } + } + + for (var2 = 0; var2 < var1; ++var2) { // L: 5354 + var3 = (PlayerComposition.regions[var2] >> 8) * 64 - VertexNormal.baseX; // L: 5355 + var4 = (PlayerComposition.regions[var2] & 255) * 64 - SoundSystem.baseY; // L: 5356 + var38 = class18.regionLandArchives[var2]; // L: 5357 + if (var38 == null && UserComparator4.field1427 < 800) { // L: 5358 + HealthBarUpdate.playPcmPlayers(); // L: 5359 + ItemComposition.method3085(var3, var4, 64, 64); // L: 5360 + } + } + + TextureProvider.method4142(true); // L: 5363 + + for (var2 = 0; var2 < var1; ++var2) { // L: 5364 + byte[] var30 = class82.regionMapArchives[var2]; // L: 5365 + if (var30 != null) { // L: 5366 + var4 = (PlayerComposition.regions[var2] >> 8) * 64 - VertexNormal.baseX; // L: 5367 + var5 = (PlayerComposition.regions[var2] & 255) * 64 - SoundSystem.baseY; // L: 5368 + HealthBarUpdate.playPcmPlayers(); // L: 5369 + Scene var32 = AbstractSocket.scene; // L: 5370 + CollisionMap[] var33 = Client.collisionMaps; // L: 5371 + var34 = new Buffer(var30); // L: 5373 + var9 = -1; // L: 5374 + + while (true) { + var10 = var34.method6560(); // L: 5376 + if (var10 == 0) { // L: 5377 + break; + } + + var9 += var10; // L: 5378 + var11 = 0; // L: 5379 + + while (true) { + var42 = var34.readUShortSmart(); // L: 5381 + if (var42 == 0) { // L: 5382 + break; + } + + var11 += var42 - 1; // L: 5383 + var35 = var11 & 63; // L: 5384 + var14 = var11 >> 6 & 63; // L: 5385 + var15 = var11 >> 12; // L: 5386 + var16 = var34.readUnsignedByte(); // L: 5387 + var17 = var16 >> 2; // L: 5388 + var36 = var16 & 3; // L: 5389 + var19 = var4 + var14; // L: 5390 + var20 = var5 + var35; // L: 5391 + if (var19 > 0 && var20 > 0 && var19 < 103 && var20 < 103) { // L: 5392 + var21 = var15; // L: 5393 + if ((Tiles.Tiles_renderFlags[1][var19][var20] & 2) == 2) { // L: 5394 + var21 = var15 - 1; + } + + CollisionMap var37 = null; // L: 5395 + if (var21 >= 0) { // L: 5396 + var37 = var33[var21]; + } + + ClanChannelMember.method89(var15, var19, var20, var9, var36, var17, var32, var37); // L: 5397 + } + } + } + } + } + } + + int var6; + int var8; + int var41; + if (Client.isInInstance) { // L: 5405 + for (var2 = 0; var2 < 4; ++var2) { // L: 5406 + HealthBarUpdate.playPcmPlayers(); // L: 5407 + + for (var3 = 0; var3 < 13; ++var3) { // L: 5408 + for (var4 = 0; var4 < 13; ++var4) { // L: 5409 + boolean var40 = false; // L: 5410 + var6 = Client.instanceChunkTemplates[var2][var3][var4]; // L: 5411 + if (var6 != -1) { // L: 5412 + var41 = var6 >> 24 & 3; // L: 5413 + var8 = var6 >> 1 & 3; // L: 5414 + var9 = var6 >> 14 & 1023; // L: 5415 + var10 = var6 >> 3 & 2047; // L: 5416 + var11 = (var9 / 8 << 8) + var10 / 8; // L: 5417 + + for (var42 = 0; var42 < PlayerComposition.regions.length; ++var42) { // L: 5418 + if (PlayerComposition.regions[var42] == var11 && class18.regionLandArchives[var42] != null) { // L: 5419 + byte[] var13 = class18.regionLandArchives[var42]; // L: 5420 + var14 = var3 * 8; // L: 5421 + var15 = var4 * 8; // L: 5422 + var16 = (var9 & 7) * 8; // L: 5423 + var17 = (var10 & 7) * 8; // L: 5424 + CollisionMap[] var18 = Client.collisionMaps; // L: 5425 + + for (var19 = 0; var19 < 8; ++var19) { // L: 5427 + for (var20 = 0; var20 < 8; ++var20) { // L: 5428 + if (var14 + var19 > 0 && var14 + var19 < 103 && var15 + var20 > 0 && var20 + var15 < 103) { // L: 5429 + int[] var10000 = var18[var2].flags[var19 + var14]; + var10000[var20 + var15] &= -16777217; + } + } + } + + Buffer var45 = new Buffer(var13); // L: 5432 + + for (var20 = 0; var20 < 4; ++var20) { // L: 5433 + for (var21 = 0; var21 < 64; ++var21) { // L: 5434 + for (int var22 = 0; var22 < 64; ++var22) { // L: 5435 + if (var41 == var20 && var21 >= var16 && var21 < var16 + 8 && var22 >= var17 && var22 < var17 + 8) { // L: 5436 + int var27 = var21 & 7; // L: 5441 + int var28 = var22 & 7; // L: 5442 + int var29 = var8 & 3; // L: 5445 + int var26; + if (var29 == 0) { // L: 5446 + var26 = var27; // L: 5447 + } else if (var29 == 1) { // L: 5450 + var26 = var28; // L: 5451 + } else if (var29 == 2) { // L: 5454 + var26 = 7 - var27; // L: 5455 + } else { + var26 = 7 - var28; // L: 5458 + } + + loadTerrain(var45, var2, var26 + var14, var15 + ClanChannelMember.method86(var21 & 7, var22 & 7, var8), 0, 0, var8); // L: 5460 + } else { + loadTerrain(var45, 0, -1, -1, 0, 0, 0); // L: 5462 + } + } + } + } + + var40 = true; // L: 5467 + break; + } + } + } + + if (!var40) { // L: 5472 + MouseRecorder.method2099(var2, var3 * 8, var4 * 8); // L: 5473 + } + } + } + } + + for (var2 = 0; var2 < 13; ++var2) { // L: 5478 + for (var3 = 0; var3 < 13; ++var3) { // L: 5479 + var4 = Client.instanceChunkTemplates[0][var2][var3]; // L: 5480 + if (var4 == -1) { // L: 5481 + ItemComposition.method3085(var2 * 8, var3 * 8, 8, 8); // L: 5482 + } + } + } + + TextureProvider.method4142(true); // L: 5486 + + for (var2 = 0; var2 < 4; ++var2) { // L: 5487 + HealthBarUpdate.playPcmPlayers(); // L: 5488 + + for (var3 = 0; var3 < 13; ++var3) { // L: 5489 + for (var4 = 0; var4 < 13; ++var4) { // L: 5490 + var5 = Client.instanceChunkTemplates[var2][var3][var4]; // L: 5491 + if (var5 != -1) { // L: 5492 + var6 = var5 >> 24 & 3; // L: 5493 + var41 = var5 >> 1 & 3; // L: 5494 + var8 = var5 >> 14 & 1023; // L: 5495 + var9 = var5 >> 3 & 2047; // L: 5496 + var10 = (var8 / 8 << 8) + var9 / 8; // L: 5497 + + for (var11 = 0; var11 < PlayerComposition.regions.length; ++var11) { // L: 5498 + if (PlayerComposition.regions[var11] == var10 && class82.regionMapArchives[var11] != null) { // L: 5499 + FontName.method6296(class82.regionMapArchives[var11], var2, var3 * 8, var4 * 8, var6, (var8 & 7) * 8, (var9 & 7) * 8, var41, AbstractSocket.scene, Client.collisionMaps); // L: 5500 + break; // L: 5501 + } + } + } + } + } + } + } + + TextureProvider.method4142(true); // L: 5509 + HealthBarUpdate.playPcmPlayers(); // L: 5510 + class17.method210(AbstractSocket.scene, Client.collisionMaps); // L: 5511 + TextureProvider.method4142(true); // L: 5512 + var2 = Tiles.Tiles_minPlane; // L: 5513 + if (var2 > class22.Client_plane) { // L: 5514 + var2 = class22.Client_plane; + } + + if (var2 < class22.Client_plane - 1) { // L: 5515 + var2 = class22.Client_plane - 1; + } + + if (Client.isLowDetail) { // L: 5516 + AbstractSocket.scene.init(Tiles.Tiles_minPlane); + } else { + AbstractSocket.scene.init(0); // L: 5517 + } + + for (var3 = 0; var3 < 104; ++var3) { // L: 5518 + for (var4 = 0; var4 < 104; ++var4) { // L: 5519 + ClanSettings.updateItemPile(var3, var4); // L: 5520 + } + } + + HealthBarUpdate.playPcmPlayers(); // L: 5523 + + for (PendingSpawn var43 = (PendingSpawn)Client.pendingSpawns.last(); var43 != null; var43 = (PendingSpawn)Client.pendingSpawns.previous()) { // L: 5525 5526 5532 + if (var43.hitpoints == -1) { // L: 5527 + var43.delay = 0; // L: 5528 + UserComparator5.method2448(var43); // L: 5529 + } else { + var43.remove(); // L: 5531 + } + } + + ObjectComposition.ObjectDefinition_cachedModelData.clear(); // L: 5535 + PacketBufferNode var44; + if (class23.client.hasFrame()) { // L: 5536 + var44 = class21.getPacketBufferNode(ClientPacket.field2583, Client.packetWriter.isaacCipher); // L: 5538 + var44.packetBuffer.writeInt(1057001181); // L: 5539 + Client.packetWriter.addNode(var44); // L: 5540 + } + + if (!Client.isInInstance) { // L: 5542 + var3 = (GrandExchangeOfferOwnWorldComparator.field632 - 6) / 8; // L: 5543 + var4 = (GrandExchangeOfferOwnWorldComparator.field632 + 6) / 8; // L: 5544 + var5 = (UserComparator4.field1427 - 6) / 8; // L: 5545 + var6 = (UserComparator4.field1427 + 6) / 8; // L: 5546 + + for (var41 = var3 - 1; var41 <= var4 + 1; ++var41) { // L: 5547 + for (var8 = var5 - 1; var8 <= var6 + 1; ++var8) { // L: 5548 + if (var41 < var3 || var41 > var4 || var8 < var5 || var8 > var6) { // L: 5549 + class247.archive5.loadRegionFromName("m" + var41 + "_" + var8); // L: 5550 + class247.archive5.loadRegionFromName("l" + var41 + "_" + var8); // L: 5551 + } + } + } + } + + class12.updateGameState(30); // L: 5555 + HealthBarUpdate.playPcmPlayers(); // L: 5556 + class34.method328(); // L: 5557 + var44 = class21.getPacketBufferNode(ClientPacket.field2669, Client.packetWriter.isaacCipher); // L: 5558 + Client.packetWriter.addNode(var44); // L: 5559 + GameEngine.clock.mark(); // L: 5561 + + for (var4 = 0; var4 < 32; ++var4) { // L: 5562 + GameEngine.graphicsTickTimes[var4] = 0L; + } + + for (var4 = 0; var4 < 32; ++var4) { // L: 5563 + GameEngine.clientTickTimes[var4] = 0L; + } + + class260.gameCyclesToDo = 0; // L: 5564 + } + } + } // L: 5267 5326 5566 } diff --git a/runescape-client/src/main/java/WorldMapCacheName.java b/runescape-client/src/main/java/WorldMapCacheName.java index 51d71ddf44..72b985348b 100644 --- a/runescape-client/src/main/java/WorldMapCacheName.java +++ b/runescape-client/src/main/java/WorldMapCacheName.java @@ -1,178 +1,62 @@ -import java.io.BufferedReader; -import java.io.IOException; -import java.io.PrintWriter; -import java.io.StringReader; -import java.io.StringWriter; 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("gb") +@ObfuscatedName("gw") @Implements("WorldMapCacheName") public class WorldMapCacheName { - @ObfuscatedName("h") + @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "Lgb;" + descriptor = "Lgw;" ) - public static final WorldMapCacheName field2128; - @ObfuscatedName("c") + public static final WorldMapCacheName field2137; + @ObfuscatedName("n") @ObfuscatedSignature( - descriptor = "Lgb;" + descriptor = "Lgw;" ) - public static final WorldMapCacheName field2123; - @ObfuscatedName("o") + public static final WorldMapCacheName field2132; + @ObfuscatedName("f") @ObfuscatedSignature( - descriptor = "Lgb;" + descriptor = "Lgw;" ) - public static final WorldMapCacheName field2124; - @ObfuscatedName("g") + public static final WorldMapCacheName field2134; + @ObfuscatedName("y") @ObfuscatedSignature( - descriptor = "Lgb;" + descriptor = "Lgw;" ) - static final WorldMapCacheName field2122; - @ObfuscatedName("l") + static final WorldMapCacheName field2131; + @ObfuscatedName("p") @ObfuscatedSignature( - descriptor = "Lgb;" + descriptor = "Lgw;" ) - public static final WorldMapCacheName field2126; - @ObfuscatedName("i") - @ObfuscatedGetter( - intValue = -159166525 - ) - @Export("Interpreter_intStackSize") - static int Interpreter_intStackSize; - @ObfuscatedName("z") + public static final WorldMapCacheName field2135; + @ObfuscatedName("j") @Export("name") public final String name; static { - field2128 = new WorldMapCacheName("details"); // L: 4 - field2123 = new WorldMapCacheName("compositemap"); // L: 5 - field2124 = new WorldMapCacheName("compositetexture"); // L: 6 - field2122 = new WorldMapCacheName("area"); // L: 7 - field2126 = new WorldMapCacheName("labels"); // L: 8 + field2137 = new WorldMapCacheName("details"); // L: 4 + field2132 = new WorldMapCacheName("compositemap"); // L: 5 + field2134 = new WorldMapCacheName("compositetexture"); // L: 6 + field2131 = new WorldMapCacheName("area"); // L: 7 + field2135 = new WorldMapCacheName("labels"); // L: 8 } WorldMapCacheName(String var1) { this.name = var1; // L: 12 } // L: 13 - @ObfuscatedName("o") + @ObfuscatedName("jb") @ObfuscatedSignature( - descriptor = "(Ljava/lang/Throwable;I)Ljava/lang/String;", - garbageValue = "-1988606956" + descriptor = "(Lio;B)V", + garbageValue = "90" ) - static String method3646(Throwable var0) throws IOException { - String var1; - if (var0 instanceof RunException) { // L: 67 - RunException var2 = (RunException)var0; // L: 68 - var1 = var2.message + " | "; // L: 69 - var0 = var2.throwable; // L: 70 - } else { - var1 = ""; // L: 72 + @Export("invalidateWidget") + static void invalidateWidget(Widget var0) { + if (var0.cycle == Client.field849) { // L: 10792 + Client.field719[var0.rootIndex] = true; // L: 10793 } - StringWriter var12 = new StringWriter(); // L: 73 - PrintWriter var3 = new PrintWriter(var12); // L: 74 - var0.printStackTrace(var3); // L: 75 - var3.close(); // L: 76 - String var4 = var12.toString(); // L: 77 - BufferedReader var5 = new BufferedReader(new StringReader(var4)); // L: 78 - String var6 = var5.readLine(); // L: 79 - - while (true) { - while (true) { - String var7 = var5.readLine(); // L: 81 - if (var7 == null) { // L: 82 - var1 = var1 + "| " + var6; // L: 100 - return var1; // L: 101 - } - - int var8 = var7.indexOf(40); // L: 83 - int var9 = var7.indexOf(41, var8 + 1); // L: 84 - if (var8 >= 0 && var9 >= 0) { // L: 85 - String var10 = var7.substring(var8 + 1, var9); // L: 86 - int var11 = var10.indexOf(".java:"); // L: 87 - if (var11 >= 0) { // L: 88 - var10 = var10.substring(0, var11) + var10.substring(var11 + 5); // L: 89 - var1 = var1 + var10 + ' '; // L: 90 - continue; // L: 91 - } - - var7 = var7.substring(0, var8); // L: 93 - } - - var7 = var7.trim(); // L: 95 - var7 = var7.substring(var7.lastIndexOf(32) + 1); // L: 96 - var7 = var7.substring(var7.lastIndexOf(9) + 1); // L: 97 - var1 = var1 + var7 + ' '; // L: 98 - } - } - } - - @ObfuscatedName("k") - @ObfuscatedSignature( - descriptor = "(B)V", - garbageValue = "97" - ) - static void method3648() { - if (PrivateChatMode.loadWorlds()) { // L: 1546 - Login.worldSelectOpen = true; // L: 1547 - Login.worldSelectPage = 0; // L: 1548 - Login.worldSelectPagesCount = 0; // L: 1549 - } - - } // L: 1551 - - @ObfuscatedName("ff") - @ObfuscatedSignature( - descriptor = "(Liv;III)V", - garbageValue = "-991343714" - ) - @Export("checkIfMinimapClicked") - static final void checkIfMinimapClicked(Widget var0, int var1, int var2) { - if (Client.minimapState == 0 || Client.minimapState == 3) { // L: 3814 - if (!Client.isMenuOpen && (MouseHandler.MouseHandler_lastButton == 1 || !class229.mouseCam && MouseHandler.MouseHandler_lastButton == 4)) { // L: 3815 - SpriteMask var3 = var0.getSpriteMask(true); // L: 3816 - if (var3 == null) { // L: 3817 - return; - } - - int var4 = MouseHandler.MouseHandler_lastPressedX - var1; // L: 3818 - int var5 = MouseHandler.MouseHandler_lastPressedY - var2; // L: 3819 - if (var3.contains(var4, var5)) { // L: 3820 - var4 -= var3.width / 2; // L: 3821 - var5 -= var3.height / 2; // L: 3822 - int var6 = Client.camAngleY & 2047; // L: 3823 - int var7 = Rasterizer3D.Rasterizer3D_sine[var6]; // L: 3824 - int var8 = Rasterizer3D.Rasterizer3D_cosine[var6]; // L: 3825 - int var9 = var7 * var5 + var4 * var8 >> 11; // L: 3826 - int var10 = var5 * var8 - var7 * var4 >> 11; // L: 3827 - int var11 = var9 + class35.localPlayer.x >> 7; // L: 3828 - int var12 = class35.localPlayer.y - var10 >> 7; // L: 3829 - PacketBufferNode var13 = HealthBarDefinition.getPacketBufferNode(ClientPacket.field2582, Client.packetWriter.isaacCipher); // L: 3831 - var13.packetBuffer.writeByte(18); // L: 3832 - var13.packetBuffer.method6610(KeyHandler.KeyHandler_pressedKeys[82] ? (KeyHandler.KeyHandler_pressedKeys[81] ? 2 : 1) : 0); // L: 3833 - var13.packetBuffer.writeShort(var12 + Messages.baseY); // L: 3834 - var13.packetBuffer.writeShort(var11 + JagexCache.baseX); // L: 3835 - var13.packetBuffer.writeByte(var4); // L: 3836 - var13.packetBuffer.writeByte(var5); // L: 3837 - var13.packetBuffer.writeShort(Client.camAngleY); // L: 3838 - var13.packetBuffer.writeByte(57); // L: 3839 - var13.packetBuffer.writeByte(0); // L: 3840 - var13.packetBuffer.writeByte(0); // L: 3841 - var13.packetBuffer.writeByte(89); // L: 3842 - var13.packetBuffer.writeShort(class35.localPlayer.x); // L: 3843 - var13.packetBuffer.writeShort(class35.localPlayer.y); // L: 3844 - var13.packetBuffer.writeByte(63); // L: 3845 - Client.packetWriter.addNode(var13); // L: 3846 - Client.destinationX = var11; // L: 3847 - Client.destinationY = var12; // L: 3848 - } - } - - } - } // L: 3851 + } // L: 10795 } diff --git a/runescape-client/src/main/java/WorldMapData_0.java b/runescape-client/src/main/java/WorldMapData_0.java index fb35c199a5..8c7aee3af5 100644 --- a/runescape-client/src/main/java/WorldMapData_0.java +++ b/runescape-client/src/main/java/WorldMapData_0.java @@ -3,21 +3,21 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("fh") +@ObfuscatedName("ft") @Implements("WorldMapData_0") public class WorldMapData_0 extends AbstractWorldMapData { WorldMapData_0() { } // L: 6 - @ObfuscatedName("h") + @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "(Lnk;B)V", - garbageValue = "0" + descriptor = "(Lnd;I)V", + garbageValue = "1254081030" ) @Export("init") void init(Buffer var1) { int var2 = var1.readUnsignedByte(); // L: 9 - if (var2 != WorldMapID.field2099.value) { // L: 10 + if (var2 != WorldMapID.field2110.value) { // L: 10 throw new IllegalStateException(""); // L: 11 } else { super.minPlane = var1.readUnsignedByte(); // L: 13 @@ -26,26 +26,26 @@ public class WorldMapData_0 extends AbstractWorldMapData { super.regionYLow = var1.readUnsignedShort(); // L: 16 super.regionX = var1.readUnsignedShort(); // L: 17 super.regionY = var1.readUnsignedShort(); // L: 18 - super.groupId = var1.method6464(); // L: 19 - super.fileId = var1.method6464(); // L: 20 + super.groupId = var1.method6583(); // L: 19 + super.fileId = var1.method6583(); // L: 20 } } // L: 21 - @ObfuscatedName("c") + @ObfuscatedName("n") @ObfuscatedSignature( - descriptor = "(Lnk;I)V", - garbageValue = "1915938242" + descriptor = "(Lnd;I)V", + garbageValue = "1223315238" ) @Export("readGeography") void readGeography(Buffer var1) { super.planes = Math.min(super.planes, 4); // L: 24 super.floorUnderlayIds = new short[1][64][64]; // L: 25 super.floorOverlayIds = new short[super.planes][64][64]; // L: 26 - super.field2063 = new byte[super.planes][64][64]; // L: 27 - super.field2064 = new byte[super.planes][64][64]; // L: 28 + super.field2067 = new byte[super.planes][64][64]; // L: 27 + super.field2065 = new byte[super.planes][64][64]; // L: 28 super.decorations = new WorldMapDecoration[super.planes][64][64][]; // L: 29 int var2 = var1.readUnsignedByte(); // L: 30 - if (var2 != class179.field2097.value) { // L: 31 + if (var2 != class179.field2100.value) { // L: 31 throw new IllegalStateException(""); // L: 32 } else { int var3 = var1.readUnsignedByte(); // L: 34 @@ -68,192 +68,11 @@ public class WorldMapData_0 extends AbstractWorldMapData { return false; // L: 48 } else { WorldMapData_0 var2 = (WorldMapData_0)var1; // L: 50 - return var2.regionX == super.regionX && super.regionY == var2.regionY; // L: 51 + return var2.regionX == super.regionX && var2.regionY == super.regionY; // L: 51 } } public int hashCode() { return super.regionX | super.regionY << 8; // L: 55 } - - @ObfuscatedName("hm") - @ObfuscatedSignature( - descriptor = "(Lcw;I)V", - garbageValue = "-1306171247" - ) - static final void method3145(PendingSpawn var0) { - long var1 = 0L; // L: 7305 - int var3 = -1; // L: 7306 - int var4 = 0; // L: 7307 - int var5 = 0; // L: 7308 - if (var0.type == 0) { // L: 7309 - var1 = class5.scene.getBoundaryObjectTag(var0.plane, var0.x, var0.y); - } - - if (var0.type == 1) { // L: 7310 - var1 = class5.scene.getWallDecorationTag(var0.plane, var0.x, var0.y); - } - - if (var0.type == 2) { // L: 7311 - var1 = class5.scene.getGameObjectTag(var0.plane, var0.x, var0.y); - } - - if (var0.type == 3) { - var1 = class5.scene.getFloorDecorationTag(var0.plane, var0.x, var0.y); // L: 7312 - } - - if (0L != var1) { // L: 7313 - int var6 = class5.scene.getObjectFlags(var0.plane, var0.x, var0.y, var1); // L: 7314 - var3 = class6.Entity_unpackID(var1); // L: 7315 - var4 = var6 & 31; // L: 7316 - var5 = var6 >> 6 & 3; // L: 7317 - } - - var0.objectId = var3; // L: 7319 - var0.field1203 = var4; // L: 7320 - var0.field1199 = var5; // L: 7321 - } // L: 7322 - - @ObfuscatedName("kc") - @ObfuscatedSignature( - descriptor = "(II)V", - garbageValue = "-1784576857" - ) - @Export("changeGameOptions") - static final void changeGameOptions(int var0) { - Script.method2014(); // L: 11215 - - for (ObjectSound var1 = (ObjectSound)ObjectSound.objectSounds.last(); var1 != null; var1 = (ObjectSound)ObjectSound.objectSounds.previous()) { // L: 11217 - if (var1.obj != null) { // L: 11218 - var1.set(); - } - } - - int var3 = MusicPatchNode.VarpDefinition_get(var0).type; // L: 11221 - if (var3 != 0) { // L: 11222 - int var2 = Varps.Varps_main[var0]; // L: 11223 - if (var3 == 1) { // L: 11224 - if (var2 == 1) { // L: 11225 - class264.method4796(0.9D); - } - - if (var2 == 2) { // L: 11226 - class264.method4796(0.8D); - } - - if (var2 == 3) { // L: 11227 - class264.method4796(0.7D); - } - - if (var2 == 4) { // L: 11228 - class264.method4796(0.6D); - } - } - - if (var3 == 3) { // L: 11230 - if (var2 == 0) { // L: 11231 - class23.method306(255); - } - - if (var2 == 1) { // L: 11232 - class23.method306(192); - } - - if (var2 == 2) { // L: 11233 - class23.method306(128); - } - - if (var2 == 3) { // L: 11234 - class23.method306(64); - } - - if (var2 == 4) { // L: 11235 - class23.method306(0); - } - } - - if (var3 == 4) { // L: 11237 - if (var2 == 0) { // L: 11238 - class20.updateSoundEffectVolume(127); - } - - if (var2 == 1) { // L: 11239 - class20.updateSoundEffectVolume(96); - } - - if (var2 == 2) { // L: 11240 - class20.updateSoundEffectVolume(64); - } - - if (var2 == 3) { // L: 11241 - class20.updateSoundEffectVolume(32); - } - - if (var2 == 4) { // L: 11242 - class20.updateSoundEffectVolume(0); - } - } - - if (var3 == 5) { // L: 11244 - Client.leftClickOpensMenu = var2; - } - - if (var3 == 6) { // L: 11245 - Client.chatEffects = var2; - } - - if (var3 == 9) { // L: 11246 - Client.field781 = var2; - } - - if (var3 == 10) { // L: 11247 - if (var2 == 0) { // L: 11248 - Occluder.method4088(127); - } - - if (var2 == 1) { // L: 11249 - Occluder.method4088(96); - } - - if (var2 == 2) { // L: 11250 - Occluder.method4088(64); - } - - if (var2 == 3) { // L: 11251 - Occluder.method4088(32); - } - - if (var2 == 4) { // L: 11252 - Occluder.method4088(0); - } - } - - if (var3 == 17) { // L: 11254 - Client.followerIndex = var2 & 65535; // L: 11255 - } - - if (var3 == 18) { // L: 11257 - Client.playerAttackOption = (AttackOption)UserComparator4.findEnumerated(Renderable.method4080(), var2); // L: 11258 - if (Client.playerAttackOption == null) { // L: 11259 - Client.playerAttackOption = AttackOption.AttackOption_dependsOnCombatLevels; - } - } - - if (var3 == 19) { // L: 11261 - if (var2 == -1) { // L: 11262 - Client.combatTargetPlayerIndex = -1; - } else { - Client.combatTargetPlayerIndex = var2 & 2047; // L: 11263 - } - } - - if (var3 == 22) { // L: 11265 - Client.npcAttackOption = (AttackOption)UserComparator4.findEnumerated(Renderable.method4080(), var2); // L: 11266 - if (Client.npcAttackOption == null) { // L: 11267 - Client.npcAttackOption = AttackOption.AttackOption_dependsOnCombatLevels; - } - } - - } - } // L: 11269 } diff --git a/runescape-client/src/main/java/WorldMapData_1.java b/runescape-client/src/main/java/WorldMapData_1.java index f69f88fa81..74c49c7868 100644 --- a/runescape-client/src/main/java/WorldMapData_1.java +++ b/runescape-client/src/main/java/WorldMapData_1.java @@ -4,30 +4,35 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ft") +@ObfuscatedName("fw") @Implements("WorldMapData_1") public class WorldMapData_1 extends AbstractWorldMapData { - @ObfuscatedName("h") + @ObfuscatedName("ee") @ObfuscatedGetter( - intValue = -1775718547 + intValue = -232137213 + ) + static int field2008; + @ObfuscatedName("v") + @ObfuscatedGetter( + intValue = -1553419655 ) @Export("chunkXLow") int chunkXLow; - @ObfuscatedName("c") + @ObfuscatedName("n") @ObfuscatedGetter( - intValue = -718044551 + intValue = 558324401 ) @Export("chunkYLow") int chunkYLow; - @ObfuscatedName("o") + @ObfuscatedName("f") @ObfuscatedGetter( - intValue = -1865335047 + intValue = 2120333981 ) @Export("chunkX") int chunkX; - @ObfuscatedName("g") + @ObfuscatedName("y") @ObfuscatedGetter( - intValue = -315592319 + intValue = -1464921775 ) @Export("chunkY") int chunkY; @@ -35,15 +40,15 @@ public class WorldMapData_1 extends AbstractWorldMapData { WorldMapData_1() { } // L: 11 - @ObfuscatedName("h") + @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "(Lnk;I)V", - garbageValue = "-2112962647" + descriptor = "(Lnd;I)V", + garbageValue = "1665401809" ) @Export("init") void init(Buffer var1) { int var2 = var1.readUnsignedByte(); // L: 14 - if (var2 != WorldMapID.field2100.value) { // L: 15 + if (var2 != WorldMapID.field2107.value) { // L: 15 throw new IllegalStateException(""); // L: 16 } else { super.minPlane = var1.readUnsignedByte(); // L: 18 @@ -56,26 +61,26 @@ public class WorldMapData_1 extends AbstractWorldMapData { super.regionY = var1.readUnsignedShort(); // L: 25 this.chunkX = var1.readUnsignedByte(); // L: 26 this.chunkY = var1.readUnsignedByte(); // L: 27 - super.groupId = var1.method6464(); // L: 28 - super.fileId = var1.method6464(); // L: 29 + super.groupId = var1.method6583(); // L: 28 + super.fileId = var1.method6583(); // L: 29 } } // L: 30 - @ObfuscatedName("c") + @ObfuscatedName("n") @ObfuscatedSignature( - descriptor = "(Lnk;I)V", - garbageValue = "1915938242" + descriptor = "(Lnd;I)V", + garbageValue = "1223315238" ) @Export("readGeography") void readGeography(Buffer var1) { super.planes = Math.min(super.planes, 4); // L: 33 super.floorUnderlayIds = new short[1][64][64]; // L: 34 - super.floorOverlayIds = new short[super.planes][64][64]; // L: 35 - super.field2063 = new byte[super.planes][64][64]; // L: 36 - super.field2064 = new byte[super.planes][64][64]; // L: 37 + super.floorOverlayIds = new short[super.planes][64][64]; + super.field2067 = new byte[super.planes][64][64]; // L: 36 + super.field2065 = new byte[super.planes][64][64]; // L: 37 super.decorations = new WorldMapDecoration[super.planes][64][64][]; // L: 38 int var2 = var1.readUnsignedByte(); // L: 39 - if (var2 != class179.field2094.value) { // L: 40 + if (var2 != class179.field2099.value) { // L: 40 throw new IllegalStateException(""); // L: 41 } else { int var3 = var1.readUnsignedByte(); // L: 43 @@ -95,40 +100,40 @@ public class WorldMapData_1 extends AbstractWorldMapData { } } // L: 55 - @ObfuscatedName("o") + @ObfuscatedName("f") @ObfuscatedSignature( - descriptor = "(B)I", - garbageValue = "1" + descriptor = "(I)I", + garbageValue = "-225746465" ) @Export("getChunkXLow") int getChunkXLow() { return this.chunkXLow; // L: 73 } - @ObfuscatedName("g") + @ObfuscatedName("y") @ObfuscatedSignature( descriptor = "(I)I", - garbageValue = "-1280673749" + garbageValue = "-528787257" ) @Export("getChunkYLow") int getChunkYLow() { return this.chunkYLow; // L: 77 } - @ObfuscatedName("l") + @ObfuscatedName("p") @ObfuscatedSignature( descriptor = "(I)I", - garbageValue = "2133417372" + garbageValue = "-20705095" ) @Export("getChunkX") int getChunkX() { return this.chunkX; // L: 81 } - @ObfuscatedName("z") + @ObfuscatedName("r") @ObfuscatedSignature( descriptor = "(I)I", - garbageValue = "-236575937" + garbageValue = "1881961313" ) @Export("getChunkY") int getChunkY() { @@ -140,8 +145,8 @@ public class WorldMapData_1 extends AbstractWorldMapData { return false; // L: 59 } else { WorldMapData_1 var2 = (WorldMapData_1)var1; // L: 61 - if (var2.regionX == super.regionX && var2.regionY == super.regionY) { // L: 62 - return var2.chunkX == this.chunkX && var2.chunkY == this.chunkY; // L: 65 + if (super.regionX == var2.regionX && super.regionY == var2.regionY) { // L: 62 + return this.chunkX == var2.chunkX && var2.chunkY == this.chunkY; // L: 65 } else { return false; // L: 63 } @@ -152,21 +157,12 @@ public class WorldMapData_1 extends AbstractWorldMapData { return super.regionX | super.regionY << 8 | this.chunkX << 16 | this.chunkY << 24; // L: 69 } - @ObfuscatedName("kw") + @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "(Liv;IIIB)V", - garbageValue = "68" + descriptor = "(I)[Ljw;", + garbageValue = "1606153053" ) - @Export("drawCompass") - static final void drawCompass(Widget var0, int var1, int var2, int var3) { - SpriteMask var4 = var0.getSpriteMask(false); // L: 11465 - if (var4 != null) { // L: 11466 - if (Client.minimapState < 3) { // L: 11467 - WorldMapRegion.compass.drawRotatedMaskedCenteredAround(var1, var2, var4.width, var4.height, 25, 25, Client.camAngleY, 256, var4.xStarts, var4.xWidths); - } else { - Rasterizer2D.Rasterizer2D_fillMaskedRectangle(var1, var2, 0, var4.xStarts, var4.xWidths); // L: 11468 - } - - } - } // L: 11469 + static class261[] method3525() { + return new class261[]{class261.field3201, class261.field3200}; // L: 35 + } } diff --git a/runescape-client/src/main/java/WorldMapDecoration.java b/runescape-client/src/main/java/WorldMapDecoration.java index f7253f7b98..0a5872f5c3 100644 --- a/runescape-client/src/main/java/WorldMapDecoration.java +++ b/runescape-client/src/main/java/WorldMapDecoration.java @@ -4,30 +4,38 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("fg") +@ObfuscatedName("fh") @Implements("WorldMapDecoration") public class WorldMapDecoration { - @ObfuscatedName("hh") + @ObfuscatedName("y") + @Export("SpriteBuffer_xOffsets") + public static int[] SpriteBuffer_xOffsets; + @ObfuscatedName("d") @ObfuscatedGetter( - intValue = -117135279 + intValue = -1317870659 ) - @Export("cameraZ") - static int cameraZ; - @ObfuscatedName("h") + static int field2082; + @ObfuscatedName("hf") + @ObfuscatedSignature( + descriptor = "[Lop;" + ) + @Export("modIconSprites") + static IndexedSprite[] modIconSprites; + @ObfuscatedName("v") @ObfuscatedGetter( - intValue = -193579243 + intValue = -1952293629 ) @Export("objectDefinitionId") final int objectDefinitionId; - @ObfuscatedName("c") + @ObfuscatedName("n") @ObfuscatedGetter( - intValue = 2117060031 + intValue = 739729953 ) @Export("decoration") final int decoration; - @ObfuscatedName("o") + @ObfuscatedName("f") @ObfuscatedGetter( - intValue = -26030581 + intValue = -184500109 ) @Export("rotation") final int rotation; @@ -38,36 +46,37 @@ public class WorldMapDecoration { this.rotation = var3; // L: 11 } // L: 12 - @ObfuscatedName("h") + @ObfuscatedName("n") @ObfuscatedSignature( - descriptor = "(Ljp;IIB)[Lof;", - garbageValue = "43" + descriptor = "(Ljava/lang/Throwable;Ljava/lang/String;)Loz;" ) - public static IndexedSprite[] method3571(AbstractArchive var0, int var1, int var2) { - if (!Username.method5711(var0, var1, var2)) { // L: 23 - return null; + @Export("newRunException") + public static RunException newRunException(Throwable var0, String var1) { + RunException var2; + if (var0 instanceof RunException) { // L: 99 + var2 = (RunException)var0; // L: 100 + var2.message = var2.message + ' ' + var1; // L: 101 } else { - IndexedSprite[] var4 = new IndexedSprite[class396.SpriteBuffer_spriteCount]; // L: 26 - - for (int var5 = 0; var5 < class396.SpriteBuffer_spriteCount; ++var5) { // L: 27 - IndexedSprite var6 = var4[var5] = new IndexedSprite(); // L: 28 - var6.width = class396.SpriteBuffer_spriteWidth; // L: 29 - var6.height = class396.SpriteBuffer_spriteHeight; // L: 30 - var6.xOffset = class243.SpriteBuffer_xOffsets[var5]; // L: 31 - var6.yOffset = class396.SpriteBuffer_yOffsets[var5]; // L: 32 - var6.subWidth = ArchiveDiskActionHandler.SpriteBuffer_spriteWidths[var5]; // L: 33 - var6.subHeight = class372.SpriteBuffer_spriteHeights[var5]; // L: 34 - var6.palette = AccessFile.SpriteBuffer_spritePalette; // L: 35 - var6.pixels = class396.SpriteBuffer_pixels[var5]; // L: 36 - } - - class243.SpriteBuffer_xOffsets = null; // L: 39 - class396.SpriteBuffer_yOffsets = null; // L: 40 - ArchiveDiskActionHandler.SpriteBuffer_spriteWidths = null; // L: 41 - class372.SpriteBuffer_spriteHeights = null; // L: 42 - AccessFile.SpriteBuffer_spritePalette = null; // L: 43 - class396.SpriteBuffer_pixels = null; // L: 44 - return var4; // L: 48 + var2 = new RunException(var0, var1); // L: 103 } + + return var2; // L: 104 + } + + @ObfuscatedName("hb") + @ObfuscatedSignature( + descriptor = "(III)I", + garbageValue = "-1091351445" + ) + static int method3627(int var0, int var1) { + int var2 = var1 - 334; // L: 5040 + if (var2 < 0) { // L: 5041 + var2 = 0; + } else if (var2 > 100) { // L: 5042 + var2 = 100; + } + + int var3 = (Client.zoomWidth - Client.zoomHeight) * var2 / 100 + Client.zoomHeight; // L: 5043 + return var0 * var3 / 256; // L: 5044 } } diff --git a/runescape-client/src/main/java/WorldMapDecorationType.java b/runescape-client/src/main/java/WorldMapDecorationType.java index 7f39f46e3e..cb8e077bc6 100644 --- a/runescape-client/src/main/java/WorldMapDecorationType.java +++ b/runescape-client/src/main/java/WorldMapDecorationType.java @@ -5,134 +5,128 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; import net.runelite.rs.ScriptOpcodes; -@ObfuscatedName("iu") +@ObfuscatedName("ix") @Implements("WorldMapDecorationType") public enum WorldMapDecorationType implements Enumerated { - @ObfuscatedName("h") - @ObfuscatedSignature( - descriptor = "Liu;" - ) - field3159(0, 0), - @ObfuscatedName("c") - @ObfuscatedSignature( - descriptor = "Liu;" - ) - field3146(1, 0), - @ObfuscatedName("o") - @ObfuscatedSignature( - descriptor = "Liu;" - ) - field3164(2, 0), - @ObfuscatedName("g") - @ObfuscatedSignature( - descriptor = "Liu;" - ) - field3148(3, 0), - @ObfuscatedName("l") - @ObfuscatedSignature( - descriptor = "Liu;" - ) - field3162(9, 2), - @ObfuscatedName("z") - @ObfuscatedSignature( - descriptor = "Liu;" - ) - field3150(4, 1), - @ObfuscatedName("t") - @ObfuscatedSignature( - descriptor = "Liu;" - ) - field3169(5, 1), @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "Liu;" + descriptor = "Lix;" ) - field3152(6, 1), - @ObfuscatedName("b") + field3149(0, 0), + @ObfuscatedName("n") @ObfuscatedSignature( - descriptor = "Liu;" + descriptor = "Lix;" ) - field3153(7, 1), - @ObfuscatedName("q") - @ObfuscatedSignature( - descriptor = "Liu;" - ) - field3154(8, 1), - @ObfuscatedName("i") - @ObfuscatedSignature( - descriptor = "Liu;" - ) - field3149(12, 2), - @ObfuscatedName("x") - @ObfuscatedSignature( - descriptor = "Liu;" - ) - field3156(13, 2), - @ObfuscatedName("k") - @ObfuscatedSignature( - descriptor = "Liu;" - ) - field3147(14, 2), - @ObfuscatedName("r") - @ObfuscatedSignature( - descriptor = "Liu;" - ) - field3158(15, 2), - @ObfuscatedName("p") - @ObfuscatedSignature( - descriptor = "Liu;" - ) - field3155(16, 2), - @ObfuscatedName("a") - @ObfuscatedSignature( - descriptor = "Liu;" - ) - field3160(17, 2), - @ObfuscatedName("e") - @ObfuscatedSignature( - descriptor = "Liu;" - ) - field3161(18, 2), - @ObfuscatedName("d") - @ObfuscatedSignature( - descriptor = "Liu;" - ) - field3166(19, 2), - @ObfuscatedName("u") - @ObfuscatedSignature( - descriptor = "Liu;" - ) - field3163(20, 2), - @ObfuscatedName("m") - @ObfuscatedSignature( - descriptor = "Liu;" - ) - field3145(21, 2), - @ObfuscatedName("j") - @ObfuscatedSignature( - descriptor = "Liu;" - ) - field3165(10, 2), + field3143(1, 0), @ObfuscatedName("f") @ObfuscatedSignature( - descriptor = "Liu;" + descriptor = "Lix;" ) - field3151(11, 2), + field3167(2, 0), + @ObfuscatedName("y") + @ObfuscatedSignature( + descriptor = "Lix;" + ) + field3145(3, 0), + @ObfuscatedName("p") + @ObfuscatedSignature( + descriptor = "Lix;" + ) + field3146(9, 2), + @ObfuscatedName("j") + @ObfuscatedSignature( + descriptor = "Lix;" + ) + field3147(4, 1), + @ObfuscatedName("r") + @ObfuscatedSignature( + descriptor = "Lix;" + ) + field3148(5, 1), + @ObfuscatedName("b") + @ObfuscatedSignature( + descriptor = "Lix;" + ) + field3164(6, 1), + @ObfuscatedName("d") + @ObfuscatedSignature( + descriptor = "Lix;" + ) + field3150(7, 1), @ObfuscatedName("s") @ObfuscatedSignature( - descriptor = "Liu;" + descriptor = "Lix;" ) - field3167(22, 3); - - @ObfuscatedName("aa") + field3151(8, 1), + @ObfuscatedName("u") @ObfuscatedSignature( - descriptor = "Loa;" + descriptor = "Lix;" ) - @Export("rasterProvider") - public static AbstractRasterProvider rasterProvider; - @ObfuscatedName("y") + field3142(12, 2), + @ObfuscatedName("l") + @ObfuscatedSignature( + descriptor = "Lix;" + ) + field3156(13, 2), + @ObfuscatedName("o") + @ObfuscatedSignature( + descriptor = "Lix;" + ) + field3163(14, 2), + @ObfuscatedName("c") + @ObfuscatedSignature( + descriptor = "Lix;" + ) + field3155(15, 2), + @ObfuscatedName("e") + @ObfuscatedSignature( + descriptor = "Lix;" + ) + field3166(16, 2), + @ObfuscatedName("g") + @ObfuscatedSignature( + descriptor = "Lix;" + ) + field3157(17, 2), + @ObfuscatedName("a") + @ObfuscatedSignature( + descriptor = "Lix;" + ) + field3158(18, 2), + @ObfuscatedName("k") + @ObfuscatedSignature( + descriptor = "Lix;" + ) + field3159(19, 2), + @ObfuscatedName("m") + @ObfuscatedSignature( + descriptor = "Lix;" + ) + field3152(20, 2), + @ObfuscatedName("x") + @ObfuscatedSignature( + descriptor = "Lix;" + ) + field3161(21, 2), + @ObfuscatedName("z") + @ObfuscatedSignature( + descriptor = "Lix;" + ) + field3162(10, 2), + @ObfuscatedName("w") + @ObfuscatedSignature( + descriptor = "Lix;" + ) + field3144(11, 2), + @ObfuscatedName("t") + @ObfuscatedSignature( + descriptor = "Lix;" + ) + field3154(22, 3); + + @ObfuscatedName("h") @ObfuscatedGetter( - intValue = 1560350533 + intValue = -2083476425 ) @Export("id") public final int id; @@ -145,122 +139,140 @@ public enum WorldMapDecorationType implements Enumerated { this.id = var3; // L: 34 } // L: 35 - @ObfuscatedName("h") + @ObfuscatedName("v") @ObfuscatedSignature( descriptor = "(I)I", - garbageValue = "-708237537" + garbageValue = "-907662946" ) @Export("rsOrdinal") public int rsOrdinal() { return this.id; // L: 38 } - @ObfuscatedName("ay") + @ObfuscatedName("y") @ObfuscatedSignature( - descriptor = "(ILci;ZI)I", - garbageValue = "-1036423743" + descriptor = "(ILcf;ZB)I", + garbageValue = "29" ) - static int method4784(int var0, Script var1, boolean var2) { - if (var0 == ScriptOpcodes.VIEWPORT_SETFOV) { // L: 3519 - WorldMapCacheName.Interpreter_intStackSize -= 2; // L: 3520 - Client.field820 = (short)WorldMapManager.method3438(Interpreter.Interpreter_intStack[WorldMapCacheName.Interpreter_intStackSize]); // L: 3521 - if (Client.field820 <= 0) { // L: 3522 - Client.field820 = 256; - } - - Client.field872 = (short)WorldMapManager.method3438(Interpreter.Interpreter_intStack[WorldMapCacheName.Interpreter_intStackSize + 1]); // L: 3523 - if (Client.field872 <= 0) { // L: 3524 - Client.field872 = 256; - } - - return 1; // L: 3525 - } else if (var0 == ScriptOpcodes.VIEWPORT_SETZOOM) { // L: 3527 - WorldMapCacheName.Interpreter_intStackSize -= 2; // L: 3528 - Client.zoomHeight = (short)Interpreter.Interpreter_intStack[WorldMapCacheName.Interpreter_intStackSize]; // L: 3529 - if (Client.zoomHeight <= 0) { // L: 3530 - Client.zoomHeight = 256; - } - - Client.zoomWidth = (short)Interpreter.Interpreter_intStack[WorldMapCacheName.Interpreter_intStackSize + 1]; // L: 3531 - if (Client.zoomWidth <= 0) { // L: 3532 - Client.zoomWidth = 320; - } - - return 1; // L: 3533 - } else if (var0 == ScriptOpcodes.VIEWPORT_CLAMPFOV) { // L: 3535 - WorldMapCacheName.Interpreter_intStackSize -= 4; // L: 3536 - Client.field875 = (short)Interpreter.Interpreter_intStack[WorldMapCacheName.Interpreter_intStackSize]; // L: 3537 - if (Client.field875 <= 0) { // L: 3538 - Client.field875 = 1; - } - - Client.field738 = (short)Interpreter.Interpreter_intStack[WorldMapCacheName.Interpreter_intStackSize + 1]; // L: 3539 - if (Client.field738 <= 0) { // L: 3540 - Client.field738 = 32767; - } else if (Client.field738 < Client.field875) { // L: 3541 - Client.field738 = Client.field875; - } - - Client.field877 = (short)Interpreter.Interpreter_intStack[WorldMapCacheName.Interpreter_intStackSize + 2]; // L: 3542 - if (Client.field877 <= 0) { // L: 3543 - Client.field877 = 1; - } - - Client.field878 = (short)Interpreter.Interpreter_intStack[WorldMapCacheName.Interpreter_intStackSize + 3]; // L: 3544 - if (Client.field878 <= 0) { // L: 3545 - Client.field878 = 32767; - } else if (Client.field878 < Client.field877) { // L: 3546 - Client.field878 = Client.field877; - } - - return 1; // L: 3547 - } else if (var0 == ScriptOpcodes.VIEWPORT_GETEFFECTIVESIZE) { // L: 3549 - if (Client.viewportWidget != null) { // L: 3550 - VarbitComposition.setViewportShape(0, 0, Client.viewportWidget.width, Client.viewportWidget.height, false); // L: 3551 - Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = Client.viewportWidth; // L: 3552 - Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = Client.viewportHeight; // L: 3553 + static int method4833(int var0, Script var1, boolean var2) { + int var4; + int var9; + if (var0 == ScriptOpcodes.CC_CREATE) { // L: 472 + class44.Interpreter_intStackSize -= 3; // L: 473 + var9 = Interpreter.Interpreter_intStack[class44.Interpreter_intStackSize]; // L: 474 + var4 = Interpreter.Interpreter_intStack[class44.Interpreter_intStackSize + 1]; // L: 475 + int var11 = Interpreter.Interpreter_intStack[class44.Interpreter_intStackSize + 2]; // L: 476 + if (var4 == 0) { // L: 477 + throw new RuntimeException(); // L: 478 } else { - Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = -1; // L: 3556 - Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = -1; // L: 3557 - } + Widget var6 = Frames.getWidget(var9); // L: 480 + if (var6.children == null) { // L: 481 + var6.children = new Widget[var11 + 1]; + } - return 1; // L: 3559 - } else if (var0 == ScriptOpcodes.VIEWPORT_GETZOOM) { // L: 3561 - Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = Client.zoomHeight; // L: 3562 - Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = Client.zoomWidth; // L: 3563 - return 1; // L: 3564 - } else if (var0 == ScriptOpcodes.VIEWPORT_GETFOV) { // L: 3566 - Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = Interpreter.method1808(Client.field820); // L: 3567 - Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = Interpreter.method1808(Client.field872); // L: 3568 - return 1; // L: 3569 - } else if (var0 == 6220) { // L: 3571 - Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = 0; // L: 3572 - return 1; // L: 3573 - } else if (var0 == 6221) { // L: 3575 - Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = 0; // L: 3576 - return 1; // L: 3577 - } else if (var0 == 6222) { // L: 3579 - Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = GameEngine.canvasWidth; // L: 3580 - return 1; // L: 3581 - } else if (var0 == 6223) { // L: 3583 - Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = HealthBarDefinition.canvasHeight; // L: 3584 - return 1; // L: 3585 + if (var6.children.length <= var11) { // L: 482 + Widget[] var7 = new Widget[var11 + 1]; // L: 483 + + for (int var8 = 0; var8 < var6.children.length; ++var8) { // L: 484 + var7[var8] = var6.children[var8]; + } + + var6.children = var7; // L: 485 + } + + if (var11 > 0 && var6.children[var11 - 1] == null) { // L: 487 + throw new RuntimeException("" + (var11 - 1)); + } else { + Widget var12 = new Widget(); // L: 488 + var12.type = var4; // L: 489 + var12.parentId = var12.id = var6.id; // L: 490 + var12.childIndex = var11; // L: 491 + var12.isIf3 = true; // L: 492 + var6.children[var11] = var12; // L: 493 + if (var2) { // L: 494 + class13.scriptDotWidget = var12; + } else { + Interpreter.scriptActiveWidget = var12; // L: 495 + } + + WorldMapCacheName.invalidateWidget(var6); // L: 496 + return 1; // L: 497 + } + } } else { - return 2; // L: 3587 + Widget var3; + if (var0 == ScriptOpcodes.CC_DELETE) { // L: 499 + var3 = var2 ? class13.scriptDotWidget : Interpreter.scriptActiveWidget; // L: 500 + Widget var10 = Frames.getWidget(var3.id); // L: 501 + var10.children[var3.childIndex] = null; // L: 502 + WorldMapCacheName.invalidateWidget(var10); // L: 503 + return 1; // L: 504 + } else if (var0 == ScriptOpcodes.CC_DELETEALL) { // L: 506 + var3 = Frames.getWidget(Interpreter.Interpreter_intStack[--class44.Interpreter_intStackSize]); // L: 507 + var3.children = null; // L: 508 + WorldMapCacheName.invalidateWidget(var3); // L: 509 + return 1; // L: 510 + } else if (var0 == 103) { // L: 512 + class44.Interpreter_intStackSize -= 3; // L: 513 + return 1; // L: 514 + } else if (var0 == 104) { // L: 516 + --class44.Interpreter_intStackSize; // L: 517 + return 1; // L: 518 + } else if (var0 != ScriptOpcodes.CC_FIND) { // L: 520 + if (var0 == ScriptOpcodes.IF_FIND) { // L: 533 + var3 = Frames.getWidget(Interpreter.Interpreter_intStack[--class44.Interpreter_intStackSize]); // L: 534 + if (var3 != null) { // L: 535 + Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = 1; // L: 536 + if (var2) { // L: 537 + class13.scriptDotWidget = var3; + } else { + Interpreter.scriptActiveWidget = var3; // L: 538 + } + } else { + Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = 0; // L: 540 + } + + return 1; // L: 541 + } else if (var0 == 202) { // L: 543 + Interpreter.Interpreter_intStack[class44.Interpreter_intStackSize + 1] = 0; // L: 544 + return 1; // L: 545 + } else if (var0 == 203) { + Interpreter.Interpreter_intStack[--class44.Interpreter_intStackSize + 1] = 0; + return 1; // L: 549 + } else { + return 2; // L: 551 + } + } else { + class44.Interpreter_intStackSize -= 2; // L: 521 + var9 = Interpreter.Interpreter_intStack[class44.Interpreter_intStackSize]; // L: 522 + var4 = Interpreter.Interpreter_intStack[class44.Interpreter_intStackSize + 1]; // L: 523 + Widget var5 = ModeWhere.getWidgetChild(var9, var4); // L: 524 + if (var5 != null && var4 != -1) { // L: 525 + Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = 1; // L: 526 + if (var2) { // L: 527 + class13.scriptDotWidget = var5; + } else { + Interpreter.scriptActiveWidget = var5; // L: 528 + } + } else { + Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = 0; // L: 530 + } + + return 1; // L: 531 + } } } - @ObfuscatedName("ar") + @ObfuscatedName("z") @ObfuscatedSignature( - descriptor = "(ILia;ZB)V", - garbageValue = "50" + descriptor = "(ZI)V", + garbageValue = "-59563077" ) - static void method4776(int var0, Coord var1, boolean var2) { - WorldMapArea var3 = GrandExchangeOfferAgeComparator.getWorldMap().getMapArea(var0); // L: 4336 - int var4 = class35.localPlayer.plane; // L: 4337 - int var5 = (class35.localPlayer.x >> 7) + JagexCache.baseX; // L: 4338 - int var6 = (class35.localPlayer.y >> 7) + Messages.baseY; // L: 4339 - Coord var7 = new Coord(var4, var5, var6); // L: 4340 - GrandExchangeOfferAgeComparator.getWorldMap().method5967(var3, var7, var1, var2); // L: 4341 - } // L: 4342 + public static void method4834(boolean var0) { + if (var0 != ItemContainer.ItemDefinition_inMembersWorld) { // L: 546 + SceneTilePaint.method4259(); // L: 547 + ItemContainer.ItemDefinition_inMembersWorld = var0; // L: 548 + } + + } // L: 550 } diff --git a/runescape-client/src/main/java/WorldMapElement.java b/runescape-client/src/main/java/WorldMapElement.java index e820354433..c6c9cf6040 100644 --- a/runescape-client/src/main/java/WorldMapElement.java +++ b/runescape-client/src/main/java/WorldMapElement.java @@ -4,121 +4,116 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("et") +@ObfuscatedName("ew") @Implements("WorldMapElement") public class WorldMapElement extends DualNode { - @ObfuscatedName("h") + @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "Ljp;" + descriptor = "Ljv;" ) @Export("WorldMapElement_archive") - public static AbstractArchive WorldMapElement_archive; - @ObfuscatedName("c") + static AbstractArchive WorldMapElement_archive; + @ObfuscatedName("n") @ObfuscatedSignature( - descriptor = "[Let;" + descriptor = "[Lew;" ) @Export("WorldMapElement_cached") - public static WorldMapElement[] WorldMapElement_cached; - @ObfuscatedName("o") - @ObfuscatedGetter( - intValue = 1429232297 - ) - @Export("WorldMapElement_count") - public static int WorldMapElement_count; - @ObfuscatedName("g") + static WorldMapElement[] WorldMapElement_cached; + @ObfuscatedName("f") @ObfuscatedSignature( - descriptor = "Lho;" + descriptor = "Ljv;" + ) + @Export("soundEffectsArchive") + public static AbstractArchive soundEffectsArchive; + @ObfuscatedName("y") + @ObfuscatedSignature( + descriptor = "Lhz;" ) @Export("WorldMapElement_cachedSprites") - static EvictingDualNodeHashTable WorldMapElement_cachedSprites; - @ObfuscatedName("am") - @ObfuscatedSignature( - descriptor = "Lle;" - ) - static Bounds field1572; - @ObfuscatedName("l") + public static EvictingDualNodeHashTable WorldMapElement_cachedSprites; + @ObfuscatedName("p") @ObfuscatedGetter( - intValue = 826174565 + intValue = -298295867 ) @Export("objectId") public final int objectId; - @ObfuscatedName("z") + @ObfuscatedName("j") @ObfuscatedGetter( - intValue = -428142715 + intValue = 300345687 ) @Export("sprite1") public int sprite1; - @ObfuscatedName("t") + @ObfuscatedName("r") @ObfuscatedGetter( - intValue = -577521577 + intValue = 1973945717 ) @Export("sprite2") int sprite2; - @ObfuscatedName("v") + @ObfuscatedName("b") @Export("name") public String name; - @ObfuscatedName("b") + @ObfuscatedName("d") @ObfuscatedGetter( - intValue = 760745591 + intValue = 1016348217 ) - public int field1570; - @ObfuscatedName("q") + public int field1557; + @ObfuscatedName("s") @ObfuscatedGetter( - intValue = -1774887539 + intValue = 945546823 ) @Export("textSize") public int textSize; - @ObfuscatedName("x") - public boolean field1557; - @ObfuscatedName("k") - public boolean field1558; - @ObfuscatedName("r") + @ObfuscatedName("l") + public boolean field1560; + @ObfuscatedName("o") + public boolean field1561; + @ObfuscatedName("c") @Export("menuActions") public String[] menuActions; - @ObfuscatedName("p") + @ObfuscatedName("e") @Export("menuTargetName") public String menuTargetName; + @ObfuscatedName("g") + int[] field1564; @ObfuscatedName("a") - int[] field1562; - @ObfuscatedName("e") @ObfuscatedGetter( - intValue = 1111331731 - ) - int field1556; - @ObfuscatedName("d") - @ObfuscatedGetter( - intValue = -2061305769 - ) - int field1564; - @ObfuscatedName("u") - @ObfuscatedGetter( - intValue = 1154115857 + intValue = 61627465 ) int field1565; + @ObfuscatedName("k") + @ObfuscatedGetter( + intValue = -1855572569 + ) + int field1574; @ObfuscatedName("m") @ObfuscatedGetter( - intValue = 1068182355 + intValue = 1059928721 ) - int field1563; - @ObfuscatedName("j") + int field1567; + @ObfuscatedName("x") + @ObfuscatedGetter( + intValue = 1980828279 + ) + int field1568; + @ObfuscatedName("z") @ObfuscatedSignature( - descriptor = "Leg;" + descriptor = "Len;" ) @Export("horizontalAlignment") public HorizontalAlignment horizontalAlignment; - @ObfuscatedName("f") + @ObfuscatedName("w") @ObfuscatedSignature( - descriptor = "Lex;" + descriptor = "Lem;" ) @Export("verticalAlignment") public VerticalAlignment verticalAlignment; - @ObfuscatedName("s") - int[] field1569; - @ObfuscatedName("y") - byte[] field1552; - @ObfuscatedName("w") + @ObfuscatedName("t") + int[] field1571; + @ObfuscatedName("h") + byte[] field1572; + @ObfuscatedName("q") @ObfuscatedGetter( - intValue = 772677055 + intValue = 41328569 ) @Export("category") public int category; @@ -127,232 +122,232 @@ public class WorldMapElement extends DualNode { WorldMapElement_cachedSprites = new EvictingDualNodeHashTable(256); // L: 16 } - public WorldMapElement(int var1) { + WorldMapElement(int var1) { this.sprite1 = -1; // L: 18 this.sprite2 = -1; // L: 19 this.textSize = 0; // L: 22 - this.field1557 = true; // L: 24 - this.field1558 = false; - this.menuActions = new String[5]; - this.field1556 = Integer.MAX_VALUE; - this.field1564 = Integer.MAX_VALUE; - this.field1565 = Integer.MIN_VALUE; - this.field1563 = Integer.MIN_VALUE; + this.field1560 = true; // L: 24 + this.field1561 = false; // L: 25 + this.menuActions = new String[5]; // L: 26 + this.field1565 = Integer.MAX_VALUE; // L: 29 + this.field1574 = Integer.MAX_VALUE; // L: 30 + this.field1567 = Integer.MIN_VALUE; // L: 31 + this.field1568 = Integer.MIN_VALUE; // L: 32 this.horizontalAlignment = HorizontalAlignment.HorizontalAlignment_centered; // L: 33 this.verticalAlignment = VerticalAlignment.VerticalAlignment_centered; // L: 34 this.category = -1; // L: 37 this.objectId = var1; // L: 40 } // L: 41 - @ObfuscatedName("c") + @ObfuscatedName("f") @ObfuscatedSignature( - descriptor = "(Lnk;I)V", - garbageValue = "112581049" + descriptor = "(Lnd;I)V", + garbageValue = "-1509060370" ) @Export("decode") - public void decode(Buffer var1) { + void decode(Buffer var1) { while (true) { - int var2 = var1.readUnsignedByte(); // L: 52 - if (var2 == 0) { // L: 53 - return; // L: 56 + int var2 = var1.readUnsignedByte(); // L: 70 + if (var2 == 0) { // L: 71 + return; // L: 74 } - this.decodeNext(var1, var2); // L: 54 + this.decodeNext(var1, var2); // L: 72 } } - @ObfuscatedName("o") + @ObfuscatedName("y") @ObfuscatedSignature( - descriptor = "(Lnk;IB)V", - garbageValue = "-20" + descriptor = "(Lnd;II)V", + garbageValue = "-1414929060" ) @Export("decodeNext") void decodeNext(Buffer var1, int var2) { - if (var2 == 1) { // L: 59 - this.sprite1 = var1.method6464(); - } else if (var2 == 2) { // L: 60 - this.sprite2 = var1.method6464(); - } else if (var2 == 3) { // L: 61 + if (var2 == 1) { // L: 77 + this.sprite1 = var1.method6583(); + } else if (var2 == 2) { // L: 78 + this.sprite2 = var1.method6583(); + } else if (var2 == 3) { // L: 79 this.name = var1.readStringCp1252NullTerminated(); - } else if (var2 == 4) { // L: 62 - this.field1570 = var1.readMedium(); - } else if (var2 == 5) { // L: 63 - var1.readMedium(); // L: 64 - } else if (var2 == 6) { // L: 66 + } else if (var2 == 4) { // L: 80 + this.field1557 = var1.readMedium(); + } else if (var2 == 5) { // L: 81 + var1.readMedium(); // L: 82 + } else if (var2 == 6) { // L: 84 this.textSize = var1.readUnsignedByte(); } else { - int var6; - if (var2 == 7) { // L: 67 - var6 = var1.readUnsignedByte(); // L: 68 - if ((var6 & 1) == 0) { // L: 69 - this.field1557 = false; + int var3; + if (var2 == 7) { // L: 85 + var3 = var1.readUnsignedByte(); // L: 86 + if ((var3 & 1) == 0) { // L: 87 + this.field1560 = false; } - if ((var6 & 2) == 2) { // L: 70 - this.field1558 = true; + if ((var3 & 2) == 2) { // L: 88 + this.field1561 = true; } - } else if (var2 == 8) { // L: 72 - var1.readUnsignedByte(); // L: 73 - } else if (var2 >= 10 && var2 <= 14) { // L: 75 + } else if (var2 == 8) { // L: 90 + var1.readUnsignedByte(); // L: 91 + } else if (var2 >= 10 && var2 <= 14) { // L: 93 this.menuActions[var2 - 10] = var1.readStringCp1252NullTerminated(); - } else if (var2 == 15) { // L: 76 - var6 = var1.readUnsignedByte(); // L: 77 - this.field1562 = new int[var6 * 2]; // L: 78 + } else if (var2 == 15) { // L: 94 + var3 = var1.readUnsignedByte(); // L: 95 + this.field1564 = new int[var3 * 2]; // L: 96 int var4; - for (var4 = 0; var4 < var6 * 2; ++var4) { // L: 79 - this.field1562[var4] = var1.readShort(); + for (var4 = 0; var4 < var3 * 2; ++var4) { // L: 97 + this.field1564[var4] = var1.readShort(); } - var1.readInt(); // L: 80 - var4 = var1.readUnsignedByte(); // L: 81 - this.field1569 = new int[var4]; // L: 82 + var1.readInt(); // L: 98 + var4 = var1.readUnsignedByte(); // L: 99 + this.field1571 = new int[var4]; // L: 100 int var5; - for (var5 = 0; var5 < this.field1569.length; ++var5) { // L: 83 - this.field1569[var5] = var1.readInt(); + for (var5 = 0; var5 < this.field1571.length; ++var5) { // L: 101 + this.field1571[var5] = var1.readInt(); } - this.field1552 = new byte[var6]; // L: 84 + this.field1572 = new byte[var3]; // L: 102 - for (var5 = 0; var5 < var6; ++var5) { // L: 85 - this.field1552[var5] = var1.readByte(); + for (var5 = 0; var5 < var3; ++var5) { // L: 103 + this.field1572[var5] = var1.readByte(); } - } else if (var2 != 16) { // L: 87 - if (var2 == 17) { // L: 88 + } else if (var2 != 16) { // L: 105 + if (var2 == 17) { // L: 106 this.menuTargetName = var1.readStringCp1252NullTerminated(); - } else if (var2 == 18) { // L: 89 - var1.method6464(); // L: 90 - } else if (var2 == 19) { // L: 92 + } else if (var2 == 18) { // L: 107 + var1.method6583(); // L: 108 + } else if (var2 == 19) { // L: 110 this.category = var1.readUnsignedShort(); - } else if (var2 == 21) { // L: 93 - var1.readInt(); // L: 94 - } else if (var2 == 22) { // L: 96 - var1.readInt(); // L: 97 - } else if (var2 == 23) { // L: 99 - var1.readUnsignedByte(); // L: 100 - var1.readUnsignedByte(); // L: 101 - var1.readUnsignedByte(); // L: 102 - } else if (var2 == 24) { // L: 104 - var1.readShort(); // L: 105 - var1.readShort(); // L: 106 - } else if (var2 == 25) { // L: 108 - var1.method6464(); // L: 109 - } else if (var2 == 28) { // L: 111 - var1.readUnsignedByte(); // L: 112 - } else if (var2 == 29) { // L: 114 - HorizontalAlignment[] var3 = new HorizontalAlignment[]{HorizontalAlignment.field1626, HorizontalAlignment.HorizontalAlignment_centered, HorizontalAlignment.field1632}; // L: 117 - this.horizontalAlignment = (HorizontalAlignment)UserComparator4.findEnumerated(var3, var1.readUnsignedByte()); // L: 119 - } else if (var2 == 30) { // L: 121 - VerticalAlignment[] var7 = new VerticalAlignment[]{VerticalAlignment.VerticalAlignment_centered, VerticalAlignment.field1676, VerticalAlignment.field1675}; // L: 124 - this.verticalAlignment = (VerticalAlignment)UserComparator4.findEnumerated(var7, var1.readUnsignedByte()); // L: 126 + } else if (var2 == 21) { // L: 111 + var1.readInt(); // L: 112 + } else if (var2 == 22) { // L: 114 + var1.readInt(); // L: 115 + } else if (var2 == 23) { // L: 117 + var1.readUnsignedByte(); // L: 118 + var1.readUnsignedByte(); // L: 119 + var1.readUnsignedByte(); // L: 120 + } else if (var2 == 24) { // L: 122 + var1.readShort(); // L: 123 + var1.readShort(); // L: 124 + } else if (var2 == 25) { // L: 126 + var1.method6583(); // L: 127 + } else if (var2 == 28) { // L: 129 + var1.readUnsignedByte(); // L: 130 + } else if (var2 == 29) { // L: 132 + this.horizontalAlignment = (HorizontalAlignment)Messages.findEnumerated(FloorOverlayDefinition.method3103(), var1.readUnsignedByte()); // L: 133 + } else if (var2 == 30) { // L: 135 + this.verticalAlignment = (VerticalAlignment)Messages.findEnumerated(MouseRecorder.method2095(), var1.readUnsignedByte()); // L: 136 } } } - } // L: 129 + } // L: 139 - @ObfuscatedName("g") + @ObfuscatedName("p") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "-1639081598" + garbageValue = "-505496297" ) - public void method2631() { - if (this.field1562 != null) { // L: 132 - for (int var1 = 0; var1 < this.field1562.length; var1 += 2) { // L: 133 - if (this.field1562[var1] < this.field1556) { // L: 134 - this.field1556 = this.field1562[var1]; - } else if (this.field1562[var1] > this.field1565) { // L: 135 - this.field1565 = this.field1562[var1]; + void method2634() { + if (this.field1564 != null) { // L: 142 + for (int var1 = 0; var1 < this.field1564.length; var1 += 2) { // L: 143 + if (this.field1564[var1] < this.field1565) { // L: 144 + this.field1565 = this.field1564[var1]; + } else if (this.field1564[var1] > this.field1567) { + this.field1567 = this.field1564[var1]; // L: 145 } - if (this.field1562[var1 + 1] < this.field1564) { // L: 136 - this.field1564 = this.field1562[var1 + 1]; - } else if (this.field1562[var1 + 1] > this.field1563) { - this.field1563 = this.field1562[var1 + 1]; // L: 137 + if (this.field1564[var1 + 1] < this.field1574) { // L: 146 + this.field1574 = this.field1564[var1 + 1]; + } else if (this.field1564[var1 + 1] > this.field1568) { + this.field1568 = this.field1564[var1 + 1]; // L: 147 } } } - } // L: 140 + } // L: 150 - @ObfuscatedName("l") + @ObfuscatedName("j") @ObfuscatedSignature( - descriptor = "(ZI)Low;", - garbageValue = "-313379641" + descriptor = "(ZI)Loh;", + garbageValue = "-2060838679" ) @Export("getSpriteBool") public SpritePixels getSpriteBool(boolean var1) { - int var2 = this.sprite1; // L: 143 - return this.getSprite(var2); // L: 144 + int var2 = this.sprite1; // L: 153 + return this.getSprite(var2); // L: 154 } - @ObfuscatedName("z") + @ObfuscatedName("r") @ObfuscatedSignature( - descriptor = "(II)Low;", - garbageValue = "-67235633" + descriptor = "(II)Loh;", + garbageValue = "2134541760" ) @Export("getSprite") SpritePixels getSprite(int var1) { - if (var1 < 0) { // L: 148 + if (var1 < 0) { // L: 158 return null; } else { - SpritePixels var2 = (SpritePixels) WorldMapElement_cachedSprites.get((long)var1); // L: 149 - if (var2 != null) { // L: 150 + SpritePixels var2 = (SpritePixels)WorldMapElement_cachedSprites.get((long)var1); // L: 159 + if (var2 != null) { // L: 160 return var2; } else { - var2 = Friend.SpriteBuffer_getSprite(WorldMapElement_archive, var1, 0); // L: 151 - if (var2 != null) { // L: 152 - WorldMapElement_cachedSprites.put(var2, (long)var1); // L: 153 + var2 = ClientPacket.SpriteBuffer_getSprite(WorldMapElement_archive, var1, 0); // L: 161 + if (var2 != null) { // L: 162 + WorldMapElement_cachedSprites.put(var2, (long)var1); // L: 163 } - return var2; // L: 155 + return var2; // L: 165 } } } - @ObfuscatedName("t") + @ObfuscatedName("b") @ObfuscatedSignature( - descriptor = "(B)I", - garbageValue = "55" + descriptor = "(I)I", + garbageValue = "1931066057" ) @Export("getObjectId") public int getObjectId() { - return this.objectId; // L: 159 + return this.objectId; // L: 169 } - @ObfuscatedName("c") + @ObfuscatedName("d") @ObfuscatedSignature( - descriptor = "(IS)Leo;", - garbageValue = "-31016" + descriptor = "(CS)Z", + garbageValue = "-28639" ) - @Export("getParamDefinition") - public static ParamComposition getParamDefinition(int var0) { - ParamComposition var1 = (ParamComposition)ParamComposition.ParamDefinition_cached.get((long)var0); // L: 25 - if (var1 != null) { // L: 26 - return var1; - } else { - byte[] var2 = ParamComposition.ParamDefinition_archive.takeFile(11, var0); // L: 27 - var1 = new ParamComposition(); // L: 28 - if (var2 != null) { // L: 29 - var1.decode(new Buffer(var2)); - } - - var1.postDecode(); // L: 30 - ParamComposition.ParamDefinition_cached.put(var1, (long)var0); // L: 31 - return var1; // L: 32 - } + @Export("isCharAlphabetic") + public static boolean isCharAlphabetic(char var0) { + return var0 >= 'A' && var0 <= 'Z' || var0 >= 'a' && var0 <= 'z'; // L: 134 } @ObfuscatedName("g") @ObfuscatedSignature( - descriptor = "(IIIB)I", - garbageValue = "54" + descriptor = "(IIII)I", + garbageValue = "-1291818540" ) - public static int method2628(int var0, int var1, int var2) { - int var3 = WorldMapLabel.method3582(var2 - var1 + 1); // L: 43 - var3 <<= var1; // L: 44 - var0 |= var3; // L: 45 - return var0; // L: 46 + @Export("hslToRgb") + static final int hslToRgb(int var0, int var1, int var2) { + if (var2 > 179) { // L: 868 + var1 /= 2; + } + + if (var2 > 192) { // L: 869 + var1 /= 2; + } + + if (var2 > 217) { // L: 870 + var1 /= 2; + } + + if (var2 > 243) { // L: 871 + var1 /= 2; + } + + int var3 = (var1 / 32 << 7) + (var0 / 4 << 10) + var2 / 2; // L: 872 + return var3; // L: 873 } } diff --git a/runescape-client/src/main/java/WorldMapEvent.java b/runescape-client/src/main/java/WorldMapEvent.java index 79ede86bef..7cfff54482 100644 --- a/runescape-client/src/main/java/WorldMapEvent.java +++ b/runescape-client/src/main/java/WorldMapEvent.java @@ -7,56 +7,31 @@ import net.runelite.mapping.ObfuscatedSignature; @ObfuscatedName("gs") @Implements("WorldMapEvent") public class WorldMapEvent { - @ObfuscatedName("k") + @ObfuscatedName("v") @ObfuscatedGetter( - intValue = 1769091939 - ) - static int field2141; - @ObfuscatedName("h") - @ObfuscatedGetter( - intValue = 2110399815 + intValue = 1617367683 ) @Export("mapElement") public int mapElement; - @ObfuscatedName("c") + @ObfuscatedName("n") @ObfuscatedSignature( - descriptor = "Lia;" + descriptor = "Lii;" ) @Export("coord1") public Coord coord1; - @ObfuscatedName("o") + @ObfuscatedName("f") @ObfuscatedSignature( - descriptor = "Lia;" + descriptor = "Lii;" ) @Export("coord2") public Coord coord2; @ObfuscatedSignature( - descriptor = "(ILia;Lia;)V" + descriptor = "(ILii;Lii;)V" ) public WorldMapEvent(int var1, Coord var2, Coord var3) { this.mapElement = var1; // L: 11 this.coord1 = var2; // L: 12 this.coord2 = var3; // L: 13 } // L: 14 - - @ObfuscatedName("z") - public static boolean method3714(long var0) { - return (int)(var0 >>> 16 & 1L) == 1; // L: 74 - } - - @ObfuscatedName("hp") - @ObfuscatedSignature( - descriptor = "(B)V", - garbageValue = "1" - ) - @Export("addCancelMenuEntry") - static void addCancelMenuEntry() { - Occluder.method4090(); // L: 7827 - Client.menuActions[0] = "Cancel"; // L: 7828 - Client.menuTargets[0] = ""; // L: 7829 - Client.menuOpcodes[0] = 1006; // L: 7830 - Client.menuShiftClick[0] = false; // L: 7831 - Client.menuOptionsCount = 1; // L: 7832 - } // L: 7833 } diff --git a/runescape-client/src/main/java/WorldMapID.java b/runescape-client/src/main/java/WorldMapID.java index 218ff5bf68..76153adeb6 100644 --- a/runescape-client/src/main/java/WorldMapID.java +++ b/runescape-client/src/main/java/WorldMapID.java @@ -4,74 +4,59 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ff") +@ObfuscatedName("fr") @Implements("WorldMapID") public class WorldMapID { - @ObfuscatedName("h") + @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "Lff;" + descriptor = "Lfr;" ) - static final WorldMapID field2099; - @ObfuscatedName("c") + static final WorldMapID field2110; + @ObfuscatedName("n") @ObfuscatedSignature( - descriptor = "Lff;" + descriptor = "Lfr;" ) - static final WorldMapID field2100; - @ObfuscatedName("o") + static final WorldMapID field2107; + @ObfuscatedName("d") + static int[] field2112; + @ObfuscatedName("be") + @ObfuscatedSignature( + descriptor = "Lop;" + ) + @Export("worldSelectRightSprite") + static IndexedSprite worldSelectRightSprite; + @ObfuscatedName("do") + @ObfuscatedSignature( + descriptor = "Lls;" + ) + @Export("js5Socket") + static AbstractSocket js5Socket; + @ObfuscatedName("f") @ObfuscatedGetter( - intValue = 1258140299 + intValue = 1539271557 ) @Export("value") final int value; static { - field2099 = new WorldMapID(0); // L: 4 - field2100 = new WorldMapID(1); // L: 5 + field2110 = new WorldMapID(0); // L: 4 + field2107 = new WorldMapID(1); // L: 5 } WorldMapID(int var1) { this.value = var1; // L: 9 } // L: 10 - @ObfuscatedName("b") + @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "(I)Z", - garbageValue = "490999200" + descriptor = "(Ljv;Ljv;Ljv;Lhp;I)Z", + garbageValue = "-670462193" ) - public static boolean method3587() { - try { - if (class232.musicPlayerStatus == 2) { // L: 110 - if (NPC.musicTrack == null) { // L: 111 - NPC.musicTrack = MusicTrack.readTrack(JagexCache.musicTrackArchive, class232.musicTrackGroupId, class232.musicTrackFileId); // L: 112 - if (NPC.musicTrack == null) { // L: 113 - return false; - } - } - - if (class268.soundCache == null) { // L: 115 - class268.soundCache = new SoundCache(UserComparator10.soundEffectsArchive, class232.musicSamplesArchive); - } - - if (class232.midiPcmStream.loadMusicTrack(NPC.musicTrack, class232.musicPatchesArchive, class268.soundCache, 22050)) { // L: 116 - class232.midiPcmStream.clearAll(); // L: 117 - class232.midiPcmStream.setPcmStreamVolume(LoginPacket.musicTrackVolume); // L: 118 - class232.midiPcmStream.setMusicTrack(NPC.musicTrack, VarpDefinition.musicTrackBoolean); // L: 119 - class232.musicPlayerStatus = 0; // L: 120 - NPC.musicTrack = null; // L: 121 - class268.soundCache = null; // L: 122 - JagexCache.musicTrackArchive = null; // L: 123 - return true; // L: 124 - } - } - } catch (Exception var1) { // L: 128 - var1.printStackTrace(); // L: 129 - class232.midiPcmStream.clear(); // L: 130 - class232.musicPlayerStatus = 0; // L: 131 - NPC.musicTrack = null; // L: 132 - class268.soundCache = null; // L: 133 - JagexCache.musicTrackArchive = null; // L: 134 - } - - return false; // L: 136 + public static boolean method3636(AbstractArchive var0, AbstractArchive var1, AbstractArchive var2, MidiPcmStream var3) { + class232.musicPatchesArchive = var0; // L: 26 + class232.musicSamplesArchive = var1; // L: 27 + WorldMapElement.soundEffectsArchive = var2; // L: 28 + class124.midiPcmStream = var3; // L: 29 + return true; // L: 30 } } diff --git a/runescape-client/src/main/java/WorldMapIcon_0.java b/runescape-client/src/main/java/WorldMapIcon_0.java index 9f086093e4..664b3318c4 100644 --- a/runescape-client/src/main/java/WorldMapIcon_0.java +++ b/runescape-client/src/main/java/WorldMapIcon_0.java @@ -4,42 +4,42 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("fk") +@ObfuscatedName("fi") @Implements("WorldMapIcon_0") public class WorldMapIcon_0 extends AbstractWorldMapIcon { - @ObfuscatedName("h") + @ObfuscatedName("v") @ObfuscatedGetter( - intValue = 931727703 + intValue = -1937738349 ) @Export("element") final int element; - @ObfuscatedName("c") + @ObfuscatedName("n") @ObfuscatedSignature( - descriptor = "Lfl;" + descriptor = "Lfv;" ) @Export("label") final WorldMapLabel label; - @ObfuscatedName("o") + @ObfuscatedName("f") @ObfuscatedGetter( - intValue = -318802111 + intValue = 520142189 ) @Export("subWidth") final int subWidth; - @ObfuscatedName("g") + @ObfuscatedName("y") @ObfuscatedGetter( - intValue = 1518104295 + intValue = 960204223 ) @Export("subHeight") final int subHeight; @ObfuscatedSignature( - descriptor = "(Lia;Lia;ILfl;)V" + descriptor = "(Lii;Lii;ILfv;)V" ) WorldMapIcon_0(Coord var1, Coord var2, int var3, WorldMapLabel var4) { super(var1, var2); // L: 14 this.element = var3; // L: 15 this.label = var4; // L: 16 - WorldMapElement var5 = WorldMapAreaData.WorldMapElement_get(this.getElement()); // L: 17 + WorldMapElement var5 = class6.WorldMapElement_get(this.getElement()); // L: 17 SpritePixels var6 = var5.getSpriteBool(false); // L: 18 if (var6 != null) { // L: 19 this.subWidth = var6.subWidth; // L: 20 @@ -51,52 +51,43 @@ public class WorldMapIcon_0 extends AbstractWorldMapIcon { } // L: 27 - @ObfuscatedName("c") + @ObfuscatedName("n") @ObfuscatedSignature( - descriptor = "(B)I", - garbageValue = "14" + descriptor = "(I)I", + garbageValue = "2145882550" ) @Export("getElement") public int getElement() { return this.element; // L: 30 } - @ObfuscatedName("o") + @ObfuscatedName("f") @ObfuscatedSignature( - descriptor = "(S)Lfl;", - garbageValue = "-7317" + descriptor = "(I)Lfv;", + garbageValue = "39460369" ) @Export("getLabel") WorldMapLabel getLabel() { return this.label; // L: 34 } - @ObfuscatedName("g") + @ObfuscatedName("y") @ObfuscatedSignature( - descriptor = "(B)I", - garbageValue = "-1" + descriptor = "(I)I", + garbageValue = "-1949510660" ) @Export("getSubWidth") int getSubWidth() { return this.subWidth; // L: 38 } - @ObfuscatedName("l") + @ObfuscatedName("p") @ObfuscatedSignature( descriptor = "(B)I", - garbageValue = "1" + garbageValue = "-85" ) @Export("getSubHeight") int getSubHeight() { return this.subHeight; // L: 42 } - - @ObfuscatedName("z") - @ObfuscatedSignature( - descriptor = "(II)Z", - garbageValue = "1744342572" - ) - public static boolean method3509(int var0) { - return (var0 >> 31 & 1) != 0; // L: 29 - } } diff --git a/runescape-client/src/main/java/WorldMapIcon_1.java b/runescape-client/src/main/java/WorldMapIcon_1.java index 9bb9530dbc..fac2da0f74 100644 --- a/runescape-client/src/main/java/WorldMapIcon_1.java +++ b/runescape-client/src/main/java/WorldMapIcon_1.java @@ -4,48 +4,53 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("fo") +@ObfuscatedName("fe") @Implements("WorldMapIcon_1") public class WorldMapIcon_1 extends AbstractWorldMapIcon { - @ObfuscatedName("h") + @ObfuscatedName("ay") @ObfuscatedGetter( - intValue = 549299511 + intValue = -1028024263 + ) + static int field1937; + @ObfuscatedName("v") + @ObfuscatedGetter( + intValue = 523010301 ) @Export("objectDefId") final int objectDefId; - @ObfuscatedName("c") + @ObfuscatedName("n") @ObfuscatedSignature( - descriptor = "Lfm;" + descriptor = "Lfq;" ) @Export("region") final WorldMapRegion region; - @ObfuscatedName("o") + @ObfuscatedName("f") @ObfuscatedGetter( - intValue = -2117222961 + intValue = 626777191 ) @Export("element") int element; - @ObfuscatedName("g") + @ObfuscatedName("y") @ObfuscatedSignature( - descriptor = "Lfl;" + descriptor = "Lfv;" ) @Export("label") WorldMapLabel label; - @ObfuscatedName("l") + @ObfuscatedName("p") @ObfuscatedGetter( - intValue = -1186749391 + intValue = 445427727 ) @Export("subWidth") int subWidth; - @ObfuscatedName("z") + @ObfuscatedName("j") @ObfuscatedGetter( - intValue = 1687767569 + intValue = 1833440401 ) @Export("subHeight") int subHeight; @ObfuscatedSignature( - descriptor = "(Lia;Lia;ILfm;)V" + descriptor = "(Lii;Lii;ILfq;)V" ) WorldMapIcon_1(Coord var1, Coord var2, int var3, WorldMapRegion var4) { super(var1, var2); // L: 17 @@ -54,96 +59,116 @@ public class WorldMapIcon_1 extends AbstractWorldMapIcon { this.init(); // L: 20 } // L: 21 - @ObfuscatedName("h") + @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "168451065" + descriptor = "(S)V", + garbageValue = "25929" ) @Export("init") void init() { - this.element = AttackOption.getObjectDefinition(this.objectDefId).transform().mapIconId; // L: 24 - this.label = this.region.createMapLabel(WorldMapAreaData.WorldMapElement_get(this.element)); // L: 25 - WorldMapElement var1 = WorldMapAreaData.WorldMapElement_get(this.getElement()); // L: 26 + this.element = class23.getObjectDefinition(this.objectDefId).transform().mapIconId; // L: 24 + this.label = this.region.createMapLabel(class6.WorldMapElement_get(this.element)); // L: 25 + WorldMapElement var1 = class6.WorldMapElement_get(this.getElement()); // L: 26 SpritePixels var2 = var1.getSpriteBool(false); // L: 27 if (var2 != null) { // L: 28 this.subWidth = var2.subWidth; // L: 29 this.subHeight = var2.subHeight; // L: 30 } else { - this.subWidth = 0; // L: 33 - this.subHeight = 0; // L: 34 + this.subWidth = 0; + this.subHeight = 0; } - } // L: 36 + } - @ObfuscatedName("c") + @ObfuscatedName("n") @ObfuscatedSignature( - descriptor = "(B)I", - garbageValue = "14" + descriptor = "(I)I", + garbageValue = "2145882550" ) @Export("getElement") public int getElement() { - return this.element; // L: 39 + return this.element; } - @ObfuscatedName("o") + @ObfuscatedName("f") @ObfuscatedSignature( - descriptor = "(S)Lfl;", - garbageValue = "-7317" + descriptor = "(I)Lfv;", + garbageValue = "39460369" ) @Export("getLabel") WorldMapLabel getLabel() { return this.label; // L: 43 } - @ObfuscatedName("g") + @ObfuscatedName("y") @ObfuscatedSignature( - descriptor = "(B)I", - garbageValue = "-1" + descriptor = "(I)I", + garbageValue = "-1949510660" ) @Export("getSubWidth") int getSubWidth() { return this.subWidth; // L: 47 } - @ObfuscatedName("l") + @ObfuscatedName("p") @ObfuscatedSignature( descriptor = "(B)I", - garbageValue = "1" + garbageValue = "-85" ) @Export("getSubHeight") int getSubHeight() { return this.subHeight; // L: 51 } - @ObfuscatedName("v") + @ObfuscatedName("n") @ObfuscatedSignature( - descriptor = "(Lnk;J)V" + descriptor = "(IB)Lel;", + garbageValue = "45" ) - static void method3181(Buffer var0, long var1) { - var1 /= 10L; // L: 63 - if (var1 < 0L) { // L: 64 - var1 = 0L; - } else if (var1 > 65535L) { // L: 65 - var1 = 65535L; + @Export("KitDefinition_get") + public static KitDefinition KitDefinition_get(int var0) { + KitDefinition var1 = (KitDefinition)KitDefinition.KitDefinition_cached.get((long)var0); // L: 33 + if (var1 != null) { // L: 34 + return var1; + } else { + byte[] var2 = class404.KitDefinition_archive.takeFile(3, var0); // L: 35 + var1 = new KitDefinition(); // L: 36 + if (var2 != null) { // L: 37 + var1.decode(new Buffer(var2)); + } + + KitDefinition.KitDefinition_cached.put(var1, (long)var0); // L: 38 + return var1; // L: 39 } + } - var0.writeShort((int)var1); // L: 66 - } // L: 67 - - @ObfuscatedName("fp") + @ObfuscatedName("gr") @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "-1619199647" + descriptor = "(Lce;I)Z", + garbageValue = "2063432840" ) - @Export("playPcmPlayers") - static final void playPcmPlayers() { - if (class93.pcmPlayer1 != null) { // L: 3677 - class93.pcmPlayer1.run(); - } + static boolean method3232(Player var0) { + if (Client.drawPlayerNames == 0) { // L: 4434 + return false; + } else if (class93.localPlayer == var0) { // L: 4435 + return MidiPcmStream.method4445(); // L: 4446 + } else { + boolean var1 = Client.method1514(); // L: 4436 + if (!var1) { // L: 4437 + boolean var2 = (Client.drawPlayerNames & 1) != 0; // L: 4440 + var1 = var2 && var0.isFriend(); // L: 4442 + } - if (WorldMapAreaData.pcmPlayer0 != null) { // L: 3678 - WorldMapAreaData.pcmPlayer0.run(); + return var1 || class44.method451() && var0.isFriendsChatMember(); // L: 4444 } + } - } // L: 3679 + @ObfuscatedName("hu") + @ObfuscatedSignature( + descriptor = "(I)Z", + garbageValue = "1393020648" + ) + static final boolean method3235() { + return Client.isMenuOpen; // L: 7614 + } } diff --git a/runescape-client/src/main/java/WorldMapLabel.java b/runescape-client/src/main/java/WorldMapLabel.java index a185ef4b19..1ddafcef1f 100644 --- a/runescape-client/src/main/java/WorldMapLabel.java +++ b/runescape-client/src/main/java/WorldMapLabel.java @@ -3,35 +3,34 @@ 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("fl") +@ObfuscatedName("fv") @Implements("WorldMapLabel") public class WorldMapLabel { - @ObfuscatedName("h") + @ObfuscatedName("v") @Export("text") String text; - @ObfuscatedName("c") + @ObfuscatedName("n") @ObfuscatedGetter( - intValue = 1379711685 + intValue = -1781114869 ) @Export("width") int width; - @ObfuscatedName("o") + @ObfuscatedName("f") @ObfuscatedGetter( - intValue = 972901429 + intValue = -733130897 ) @Export("height") int height; - @ObfuscatedName("g") + @ObfuscatedName("y") @ObfuscatedSignature( - descriptor = "Lfi;" + descriptor = "Lfp;" ) @Export("size") WorldMapLabelSize size; @ObfuscatedSignature( - descriptor = "(Ljava/lang/String;IILfi;)V" + descriptor = "(Ljava/lang/String;IILfp;)V" ) WorldMapLabel(String var1, int var2, int var3, WorldMapLabelSize var4) { this.text = var1; // L: 10 @@ -40,81 +39,34 @@ public class WorldMapLabel { this.size = var4; // L: 13 } // L: 14 - @ObfuscatedName("h") + @ObfuscatedName("y") @ObfuscatedSignature( - descriptor = "(II)I", - garbageValue = "260939477" + descriptor = "([BIIII[Lfz;I)V", + garbageValue = "1162395561" ) - public static int method3582(int var0) { - return class230.field2816[var0]; // L: 24 - } - - @ObfuscatedName("ap") - @ObfuscatedSignature( - descriptor = "(ILci;ZB)I", - garbageValue = "20" - ) - static int method3583(int var0, Script var1, boolean var2) { - int var3; - if (var0 == ScriptOpcodes.CAM_FORCEANGLE) { // L: 3463 - WorldMapCacheName.Interpreter_intStackSize -= 2; // L: 3464 - var3 = Interpreter.Interpreter_intStack[WorldMapCacheName.Interpreter_intStackSize]; // L: 3465 - int var4 = Interpreter.Interpreter_intStack[WorldMapCacheName.Interpreter_intStackSize + 1]; // L: 3466 - if (!Client.isCameraLocked) { // L: 3467 - Client.camAngleX = var3; // L: 3468 - Client.camAngleY = var4; // L: 3469 - } - - return 1; // L: 3471 - } else if (var0 == ScriptOpcodes.CAM_GETANGLE_XA) { // L: 3473 - Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = Client.camAngleX; // L: 3474 - return 1; // L: 3475 - } else if (var0 == ScriptOpcodes.CAM_GETANGLE_YA) { // L: 3477 - Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = Client.camAngleY; // L: 3478 - return 1; // L: 3479 - } else if (var0 == ScriptOpcodes.CAM_SETFOLLOWHEIGHT) { // L: 3481 - var3 = Interpreter.Interpreter_intStack[--WorldMapCacheName.Interpreter_intStackSize]; // L: 3482 - if (var3 < 0) { // L: 3483 - var3 = 0; - } - - Client.camFollowHeight = var3; // L: 3484 - return 1; // L: 3485 - } else if (var0 == ScriptOpcodes.CAM_GETFOLLOWHEIGHT) { // L: 3487 - Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = Client.camFollowHeight; // L: 3488 - return 1; // L: 3489 - } else { - return 2; // L: 3491 - } - } - - @ObfuscatedName("ga") - @ObfuscatedSignature( - descriptor = "(ZI)V", - garbageValue = "-727518714" - ) - @Export("addNpcsToScene") - static final void addNpcsToScene(boolean var0) { - for (int var1 = 0; var1 < Client.npcCount; ++var1) { // L: 4699 - NPC var2 = Client.npcs[Client.npcIndices[var1]]; // L: 4700 - if (var2 != null && var2.isVisible() && var2.definition.isVisible == var0 && var2.definition.transformIsVisible()) { // L: 4701 - int var3 = var2.x >> 7; // L: 4702 - int var4 = var2.y >> 7; // L: 4703 - if (var3 >= 0 && var3 < 104 && var4 >= 0 && var4 < 104) { // L: 4704 - if (var2.field1211 == 1 && (var2.x & 127) == 64 && (var2.y & 127) == 64) { // L: 4705 - if (Client.tileLastDrawnActor[var3][var4] == Client.viewportDrawCount) { // L: 4706 - continue; - } - - Client.tileLastDrawnActor[var3][var4] = Client.viewportDrawCount; // L: 4707 + static final void method3632(byte[] var0, int var1, int var2, int var3, int var4, CollisionMap[] var5) { + int var7; + int var8; + for (int var6 = 0; var6 < 4; ++var6) { // L: 93 + for (var7 = 0; var7 < 64; ++var7) { // L: 94 + for (var8 = 0; var8 < 64; ++var8) { // L: 95 + if (var7 + var1 > 0 && var7 + var1 < 103 && var8 + var2 > 0 && var8 + var2 < 103) { // L: 96 + int[] var10000 = var5[var6].flags[var7 + var1]; + var10000[var8 + var2] &= -16777217; } - - long var5 = class17.calculateTag(0, 0, 1, !var2.definition.isInteractable, Client.npcIndices[var1]); // L: 4709 - var2.playerCycle = Client.cycle; // L: 4710 - class5.scene.drawEntity(ParamComposition.Client_plane, var2.x, var2.y, SceneTilePaint.getTileHeight(var2.field1211 * 64 - 64 + var2.x, var2.field1211 * 64 - 64 + var2.y, ParamComposition.Client_plane), var2.field1211 * 64 - 64 + 60, var2, var2.rotation, var5, var2.isWalking); // L: 4711 } } } - } // L: 4715 + Buffer var10 = new Buffer(var0); // L: 100 + + for (var7 = 0; var7 < 4; ++var7) { // L: 101 + for (var8 = 0; var8 < 64; ++var8) { // L: 102 + for (int var9 = 0; var9 < 64; ++var9) { // L: 103 + WorldMapAreaData.loadTerrain(var10, var7, var8 + var1, var9 + var2, var3, var4, 0); // L: 104 + } + } + } + + } // L: 108 } diff --git a/runescape-client/src/main/java/WorldMapLabelSize.java b/runescape-client/src/main/java/WorldMapLabelSize.java index b82c955b5c..dc457a37ed 100644 --- a/runescape-client/src/main/java/WorldMapLabelSize.java +++ b/runescape-client/src/main/java/WorldMapLabelSize.java @@ -3,85 +3,92 @@ 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("fi") +@ObfuscatedName("fp") @Implements("WorldMapLabelSize") public class WorldMapLabelSize { - @ObfuscatedName("h") + @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "Lfi;" + descriptor = "Lfp;" ) @Export("WorldMapLabelSize_small") public static final WorldMapLabelSize WorldMapLabelSize_small; - @ObfuscatedName("c") + @ObfuscatedName("n") @ObfuscatedSignature( - descriptor = "Lfi;" + descriptor = "Lfp;" ) @Export("WorldMapLabelSize_medium") public static final WorldMapLabelSize WorldMapLabelSize_medium; - @ObfuscatedName("o") + @ObfuscatedName("f") @ObfuscatedSignature( - descriptor = "Lfi;" + descriptor = "Lfp;" ) @Export("WorldMapLabelSize_large") public static final WorldMapLabelSize WorldMapLabelSize_large; - @ObfuscatedName("g") + @ObfuscatedName("en") @ObfuscatedGetter( - intValue = -695470779 + intValue = -1635992925 ) - final int field1942; - @ObfuscatedName("l") + @Export("worldPort") + static int worldPort; + @ObfuscatedName("y") @ObfuscatedGetter( - intValue = 1100584119 + intValue = 945036671 ) - final int field1936; - @ObfuscatedName("z") + final int field1935; + @ObfuscatedName("p") @ObfuscatedGetter( - intValue = 1415767673 + intValue = -2000938127 ) - final int field1939; + final int field1933; + @ObfuscatedName("j") + @ObfuscatedGetter( + intValue = -514580693 + ) + final int field1932; static { - WorldMapLabelSize_small = new WorldMapLabelSize(1, 0, 4); // L: 7 - WorldMapLabelSize_medium = new WorldMapLabelSize(2, 1, 2); // L: 8 - WorldMapLabelSize_large = new WorldMapLabelSize(0, 2, 0); // L: 9 + WorldMapLabelSize_small = new WorldMapLabelSize(0, 0, 4); // L: 7 + WorldMapLabelSize_medium = new WorldMapLabelSize(1, 1, 2); // L: 8 + WorldMapLabelSize_large = new WorldMapLabelSize(2, 2, 0); // L: 9 } WorldMapLabelSize(int var1, int var2, int var3) { - this.field1942 = var1; // L: 19 - this.field1936 = var2; // L: 20 - this.field1939 = var3; // L: 21 + this.field1935 = var1; // L: 19 + this.field1933 = var2; // L: 20 + this.field1932 = var3; // L: 21 } // L: 22 - @ObfuscatedName("c") + @ObfuscatedName("n") @ObfuscatedSignature( descriptor = "(FI)Z", - garbageValue = "1579568903" + garbageValue = "535854948" ) - boolean method3154(float var1) { - return var1 >= (float)this.field1939; // L: 25 + boolean method3215(float var1) { + return var1 >= (float)this.field1932; // L: 25 } - @ObfuscatedName("h") + @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "(B)[Lfi;", - garbageValue = "24" + descriptor = "(I)[Lfp;", + garbageValue = "368638280" ) - static WorldMapLabelSize[] method3155() { - return new WorldMapLabelSize[]{WorldMapLabelSize_large, WorldMapLabelSize_small, WorldMapLabelSize_medium}; // L: 15 + static WorldMapLabelSize[] method3221() { + return new WorldMapLabelSize[]{WorldMapLabelSize_medium, WorldMapLabelSize_large, WorldMapLabelSize_small}; // L: 15 } - @ObfuscatedName("o") + @ObfuscatedName("f") @ObfuscatedSignature( - descriptor = "(IB)Lfi;", - garbageValue = "-4" + descriptor = "(II)Lfp;", + garbageValue = "658176697" ) - static WorldMapLabelSize method3162(int var0) { - WorldMapLabelSize[] var1 = method3155(); // L: 30 + static WorldMapLabelSize method3208(int var0) { + WorldMapLabelSize[] var1 = method3221(); // L: 30 for (int var2 = 0; var2 < var1.length; ++var2) { // L: 31 WorldMapLabelSize var3 = var1[var2]; // L: 32 - if (var0 == var3.field1936) { // L: 34 + if (var0 == var3.field1933) { // L: 34 return var3; // L: 35 } } @@ -89,102 +96,426 @@ public class WorldMapLabelSize { return null; // L: 40 } - @ObfuscatedName("o") + @ObfuscatedName("y") @ObfuscatedSignature( - descriptor = "(ILci;ZB)I", - garbageValue = "-36" + descriptor = "(CLkk;B)I", + garbageValue = "4" ) - static int method3158(int var0, Script var1, boolean var2) { - if (var0 < 1000) { // L: 423 - return GameEngine.method588(var0, var1, var2); - } else if (var0 < 1100) { // L: 424 - return DevicePcmPlayerProvider.method454(var0, var1, var2); - } else if (var0 < 1200) { // L: 425 - return class243.method4612(var0, var1, var2); - } else if (var0 < 1300) { // L: 426 - return Interpreter.method1921(var0, var1, var2); - } else if (var0 < 1400) { // L: 427 - return ScriptEvent.method2120(var0, var1, var2); - } else if (var0 < 1500) { // L: 428 - return DynamicObject.method2027(var0, var1, var2); - } else if (var0 < 1600) { // L: 429 - return class232.method4357(var0, var1, var2); - } else if (var0 < 1700) { // L: 430 - return FloorOverlayDefinition.method3049(var0, var1, var2); - } else if (var0 < 1800) { // L: 431 - return class214.method4239(var0, var1, var2); - } else if (var0 < 1900) { // L: 432 - return NetSocket.method2570(var0, var1, var2); - } else if (var0 < 2000) { // L: 433 - return class80.method1942(var0, var1, var2); - } else if (var0 < 2100) { // L: 434 - return DevicePcmPlayerProvider.method454(var0, var1, var2); - } else if (var0 < 2200) { // L: 435 - return class243.method4612(var0, var1, var2); - } else if (var0 < 2300) { // L: 436 - return Interpreter.method1921(var0, var1, var2); - } else if (var0 < 2400) { // L: 437 - return ScriptEvent.method2120(var0, var1, var2); - } else if (var0 < 2500) { - return DynamicObject.method2027(var0, var1, var2); // L: 438 - } else if (var0 < 2600) { // L: 439 - return class14.method216(var0, var1, var2); - } else if (var0 < 2700) { // L: 440 - return class80.method1939(var0, var1, var2); - } else if (var0 < 2800) { // L: 441 - return class214.method4241(var0, var1, var2); - } else if (var0 < 2900) { // L: 442 - return WorldMapAreaData.method3668(var0, var1, var2); - } else if (var0 < 3000) { // L: 443 - return class80.method1942(var0, var1, var2); - } else if (var0 < 3200) { // L: 444 - return InvDefinition.method2616(var0, var1, var2); - } else if (var0 < 3300) { // L: 445 - return World.method1713(var0, var1, var2); - } else if (var0 < 3400) { // L: 446 - return HealthBar.method2250(var0, var1, var2); - } else if (var0 < 3500) { // L: 447 - return CollisionMap.method3127(var0, var1, var2); - } else if (var0 < 3700) { // L: 448 - return class303.method5379(var0, var1, var2); - } else if (var0 < 3800) { // L: 449 - return class22.method290(var0, var1, var2); - } else if (var0 < 3900) { // L: 450 - return class286.method5056(var0, var1, var2); - } else if (var0 < 4000) { // L: 451 - return NPCComposition.method2744(var0, var1, var2); - } else if (var0 < 4100) { // L: 452 - return Player.method2179(var0, var1, var2); - } else if (var0 < 4200) { // L: 453 - return class142.method2715(var0, var1, var2); - } else if (var0 < 4300) { // L: 454 - return FriendSystem.method1795(var0, var1, var2); - } else if (var0 < 5100) { // L: 455 - return SecureRandomFuture.method2000(var0, var1, var2); - } else if (var0 < 5400) { // L: 456 - return class258.method4787(var0, var1, var2); - } else if (var0 < 5600) { // L: 457 - return WorldMapLabel.method3583(var0, var1, var2); - } else if (var0 < 5700) { // L: 458 - return class1.method16(var0, var1, var2); - } else if (var0 < 6300) { // L: 459 - return WorldMapDecorationType.method4784(var0, var1, var2); - } else if (var0 < 6600) { // L: 460 - return MouseRecorder.method2125(var0, var1, var2); - } else if (var0 < 6700) { // L: 461 - return class305.method5411(var0, var1, var2); - } else if (var0 < 6800) { // L: 462 - return class14.method215(var0, var1, var2); - } else if (var0 < 6900) { // L: 463 - return Decimator.method1111(var0, var1, var2); - } else if (var0 < 7000) { // L: 464 - return class249.method4732(var0, var1, var2); - } else if (var0 < 7100) { // L: 465 - return Renderable.method4078(var0, var1, var2); - } else if (var0 < 7200) { // L: 466 - return CollisionMap.method3110(var0, var1, var2); + @Export("lowercaseChar") + static int lowercaseChar(char var0, Language var1) { + int var2 = var0 << 4; // L: 104 + if (Character.isUpperCase(var0) || Character.isTitleCase(var0)) { // L: 105 + var0 = Character.toLowerCase(var0); // L: 106 + var2 = (var0 << 4) + 1; // L: 107 + } + + if (var0 == 241 && var1 == Language.Language_ES) { // L: 109 + var2 = 1762; + } + + return var2; // L: 110 + } + + @ObfuscatedName("p") + @ObfuscatedSignature( + descriptor = "(B)I", + garbageValue = "4" + ) + public static int method3206() { + return KeyHandler.KeyHandler_idleCycles; // L: 172 + } + + @ObfuscatedName("a") + @ObfuscatedSignature( + descriptor = "(I)V", + garbageValue = "-1934362980" + ) + static void method3218() { + Login.loginIndex = 24; // L: 1653 + class260.setLoginResponseString("", "You were disconnected from the server.", ""); // L: 1654 + } // L: 1655 + + @ObfuscatedName("q") + @ObfuscatedSignature( + descriptor = "(ILcf;ZI)I", + garbageValue = "1091146417" + ) + static int method3217(int var0, Script var1, boolean var2) { + int var3; + int var6; + int var9; + if (var0 == ScriptOpcodes.ENUM_STRING) { // L: 2001 + class44.Interpreter_intStackSize -= 2; // L: 2002 + var3 = Interpreter.Interpreter_intStack[class44.Interpreter_intStackSize]; // L: 2003 + var9 = Interpreter.Interpreter_intStack[class44.Interpreter_intStackSize + 1]; // L: 2004 + EnumComposition var10 = InterfaceParent.getEnum(var3); // L: 2005 + if (var10.outputType != 's') { // L: 2006 + } + + for (var6 = 0; var6 < var10.outputCount; ++var6) { // L: 2007 + if (var9 == var10.keys[var6]) { // L: 2008 + Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var10.strVals[var6]; // L: 2009 + var10 = null; // L: 2010 + break; + } + } + + if (var10 != null) { // L: 2014 + Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var10.defaultStr; + } + + return 1; // L: 2015 + } else if (var0 != ScriptOpcodes.ENUM) { // L: 2017 + if (var0 == ScriptOpcodes.ENUM_GETOUTPUTCOUNT) { // L: 2043 + var3 = Interpreter.Interpreter_intStack[--class44.Interpreter_intStackSize]; // L: 2044 + EnumComposition var4 = InterfaceParent.getEnum(var3); // L: 2045 + Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = var4.size(); // L: 2046 + return 1; // L: 2047 + } else { + return 2; // L: 2049 + } } else { - return var0 < 7300 ? class1.method15(var0, var1, var2) : 2; // L: 467 468 + class44.Interpreter_intStackSize -= 4; // L: 2018 + var3 = Interpreter.Interpreter_intStack[class44.Interpreter_intStackSize]; // L: 2019 + var9 = Interpreter.Interpreter_intStack[class44.Interpreter_intStackSize + 1]; // L: 2020 + int var5 = Interpreter.Interpreter_intStack[class44.Interpreter_intStackSize + 2]; // L: 2021 + var6 = Interpreter.Interpreter_intStack[class44.Interpreter_intStackSize + 3]; // L: 2022 + EnumComposition var7 = InterfaceParent.getEnum(var5); // L: 2023 + if (var3 == var7.inputType && var9 == var7.outputType) { // L: 2024 + for (int var8 = 0; var8 < var7.outputCount; ++var8) { // L: 2029 + if (var6 == var7.keys[var8]) { // L: 2030 + if (var9 == 115) { // L: 2031 + Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var7.strVals[var8]; + } else { + Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = var7.intVals[var8]; // L: 2032 + } + + var7 = null; // L: 2033 + break; + } + } + + if (var7 != null) { // L: 2037 + if (var9 == 115) { // L: 2038 + Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var7.defaultStr; + } else { + Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = var7.defaultInt; // L: 2039 + } + } + + return 1; // L: 2041 + } else { + if (var9 == 115) { // L: 2025 + Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = "null"; + } else { + Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = 0; // L: 2026 + } + + return 1; // L: 2027 + } } } + + @ObfuscatedName("ap") + @ObfuscatedSignature( + descriptor = "(ILcf;ZS)I", + garbageValue = "-12947" + ) + static int method3219(int var0, Script var1, boolean var2) { + if (var0 == 3800) { // L: 2422 + if (NPCComposition.guestClanSettings != null) { // L: 2423 + Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = 1; // L: 2424 + class26.field220 = NPCComposition.guestClanSettings; // L: 2425 + } else { + Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = 0; // L: 2427 + } + + return 1; // L: 2428 + } else { + int var3; + if (var0 == 3801) { // L: 2430 + var3 = Interpreter.Interpreter_intStack[--class44.Interpreter_intStackSize]; // L: 2431 + if (Client.currentClanSettings[var3] != null) { // L: 2432 + Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = 1; // L: 2433 + class26.field220 = Client.currentClanSettings[var3]; // L: 2434 + } else { + Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = 0; // L: 2436 + } + + return 1; // L: 2437 + } else if (var0 == 3802) { // L: 2439 + Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = class26.field220.name; // L: 2440 + return 1; // L: 2441 + } else if (var0 == 3803) { // L: 2443 + Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = class26.field220.allowGuests ? 1 : 0; // L: 2444 + return 1; // L: 2445 + } else if (var0 == 3804) { // L: 2447 + Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = class26.field220.field103; // L: 2448 + return 1; // L: 2449 + } else if (var0 == 3805) { // L: 2451 + Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = class26.field220.field113; // L: 2452 + return 1; // L: 2453 + } else if (var0 == 3806) { // L: 2455 + Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = class26.field220.field98; // L: 2456 + return 1; // L: 2457 + } else if (var0 == 3807) { // L: 2459 + Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = class26.field220.field96; // L: 2460 + return 1; // L: 2461 + } else if (var0 == 3809) { // L: 2463 + Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = class26.field220.memberCount; // L: 2464 + return 1; // L: 2465 + } else if (var0 == 3810) { // L: 2467 + var3 = Interpreter.Interpreter_intStack[--class44.Interpreter_intStackSize]; // L: 2468 + Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = class26.field220.memberNames[var3]; // L: 2469 + return 1; // L: 2470 + } else if (var0 == 3811) { // L: 2472 + var3 = Interpreter.Interpreter_intStack[--class44.Interpreter_intStackSize]; // L: 2473 + Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = class26.field220.memberRanks[var3]; // L: 2474 + return 1; // L: 2475 + } else if (var0 == 3812) { // L: 2477 + Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = class26.field220.bannedMemberCount; // L: 2478 + return 1; // L: 2479 + } else if (var0 == 3813) { // L: 2481 + var3 = Interpreter.Interpreter_intStack[--class44.Interpreter_intStackSize]; // L: 2482 + Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = class26.field220.bannedMemberNames[var3]; // L: 2483 + return 1; // L: 2484 + } else { + int var5; + int var6; + if (var0 == 3814) { // L: 2486 + class44.Interpreter_intStackSize -= 3; // L: 2487 + var3 = Interpreter.Interpreter_intStack[class44.Interpreter_intStackSize]; // L: 2488 + var6 = Interpreter.Interpreter_intStack[class44.Interpreter_intStackSize + 1]; // L: 2489 + var5 = Interpreter.Interpreter_intStack[class44.Interpreter_intStackSize + 2]; // L: 2490 + Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = class26.field220.method100(var3, var6, var5); // L: 2491 + return 1; // L: 2492 + } else if (var0 == 3815) { // L: 2494 + Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = class26.field220.currentOwner; // L: 2495 + return 1; // L: 2496 + } else if (var0 == 3816) { // L: 2498 + Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = class26.field220.field99; // L: 2499 + return 1; // L: 2500 + } else if (var0 == 3817) { // L: 2502 + Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = class26.field220.method99(Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize]); // L: 2503 + return 1; // L: 2504 + } else if (var0 == 3818) { // L: 2506 + Interpreter.Interpreter_intStack[class44.Interpreter_intStackSize - 1] = class26.field220.getSortedMembers()[Interpreter.Interpreter_intStack[class44.Interpreter_intStackSize - 1]]; // L: 2507 + return 1; // L: 2508 + } else if (var0 == 3819) { // L: 2510 + class44.Interpreter_intStackSize -= 2; // L: 2511 + var3 = Interpreter.Interpreter_intStack[class44.Interpreter_intStackSize]; // L: 2512 + var6 = Interpreter.Interpreter_intStack[class44.Interpreter_intStackSize + 1]; // L: 2513 + class305.method5533(var6, var3); // L: 2514 + return 1; // L: 2515 + } else if (var0 == 3820) { // L: 2517 + var3 = Interpreter.Interpreter_intStack[--class44.Interpreter_intStackSize]; // L: 2518 + Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = class26.field220.field101[var3]; // L: 2519 + return 1; // L: 2520 + } else { + if (var0 == 3821) { // L: 2522 + class44.Interpreter_intStackSize -= 3; // L: 2523 + var3 = Interpreter.Interpreter_intStack[class44.Interpreter_intStackSize]; // L: 2524 + boolean var4 = Interpreter.Interpreter_intStack[class44.Interpreter_intStackSize + 1] == 1; // L: 2525 + var5 = Interpreter.Interpreter_intStack[class44.Interpreter_intStackSize + 2]; // L: 2526 + class18.method216(var5, var3, var4); // L: 2527 + } + + if (var0 == 3822) { // L: 2529 + var3 = Interpreter.Interpreter_intStack[--class44.Interpreter_intStackSize]; // L: 2530 + Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = class26.field220.field108[var3] ? 1 : 0; // L: 2531 + return 1; // L: 2532 + } else if (var0 == 3850) { // L: 2534 + if (ApproximateRouteStrategy.guestClanChannel != null) { // L: 2535 + Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = 1; // L: 2536 + ArchiveLoader.field1147 = ApproximateRouteStrategy.guestClanChannel; // L: 2537 + } else { + Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = 0; // L: 2539 + } + + return 1; // L: 2540 + } else if (var0 == 3851) { // L: 2542 + var3 = Interpreter.Interpreter_intStack[--class44.Interpreter_intStackSize]; // L: 2543 + if (Client.currentClanChannels[var3] != null) { // L: 2544 + Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = 1; // L: 2545 + ArchiveLoader.field1147 = Client.currentClanChannels[var3]; // L: 2546 + Interpreter.field982 = var3; // L: 2547 + } else { + Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = 0; // L: 2549 + } + + return 1; // L: 2550 + } else if (var0 == 3852) { // L: 2552 + Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = ArchiveLoader.field1147.name; // L: 2553 + return 1; // L: 2554 + } else if (var0 == 3853) { // L: 2556 + Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = ArchiveLoader.field1147.field26; // L: 2557 + return 1; // L: 2558 + } else if (var0 == 3854) { // L: 2560 + Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = ArchiveLoader.field1147.field32; // L: 2561 + return 1; // L: 2562 + } else if (var0 == 3855) { // L: 2564 + Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = ArchiveLoader.field1147.method27(); // L: 2565 + return 1; // L: 2566 + } else if (var0 == 3856) { // L: 2568 + var3 = Interpreter.Interpreter_intStack[--class44.Interpreter_intStackSize]; // L: 2569 + Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = ((ClanChannelMember)ArchiveLoader.field1147.members.get(var3)).name; // L: 2570 + return 1; // L: 2571 + } else if (var0 == 3857) { // L: 2573 + var3 = Interpreter.Interpreter_intStack[--class44.Interpreter_intStackSize]; // L: 2574 + Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = ((ClanChannelMember)ArchiveLoader.field1147.members.get(var3)).rank; // L: 2575 + return 1; // L: 2576 + } else if (var0 == 3858) { // L: 2578 + var3 = Interpreter.Interpreter_intStack[--class44.Interpreter_intStackSize]; // L: 2579 + Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = ((ClanChannelMember)ArchiveLoader.field1147.members.get(var3)).world; // L: 2580 + return 1; // L: 2581 + } else if (var0 == 3859) { // L: 2583 + var3 = Interpreter.Interpreter_intStack[--class44.Interpreter_intStackSize]; // L: 2584 + class1.method7(Interpreter.field982, var3); // L: 2585 + return 1; // L: 2586 + } else if (var0 == 3860) { // L: 2588 + Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = ArchiveLoader.field1147.method30(Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize]); // L: 2589 + return 1; // L: 2590 + } else if (var0 == 3861) { // L: 2592 + Interpreter.Interpreter_intStack[class44.Interpreter_intStackSize - 1] = ArchiveLoader.field1147.getSortedMembers()[Interpreter.Interpreter_intStack[class44.Interpreter_intStackSize - 1]]; // L: 2593 + return 1; // L: 2594 + } else if (var0 == 3890) { // L: 2596 + Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = class34.field254 != null ? 1 : 0; // L: 2597 + return 1; // L: 2598 + } else { + return 2; // L: 2600 + } + } + } + } + } + + @ObfuscatedName("ai") + @ObfuscatedSignature( + descriptor = "(ILcf;ZB)I", + garbageValue = "-41" + ) + static int method3209(int var0, Script var1, boolean var2) { + int var6; + if (var0 == ScriptOpcodes.OC_NAME) { // L: 3120 + var6 = Interpreter.Interpreter_intStack[--class44.Interpreter_intStackSize]; // L: 3121 + Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = class260.ItemDefinition_get(var6).name; // L: 3122 + return 1; // L: 3123 + } else { + int var4; + ItemComposition var5; + if (var0 == ScriptOpcodes.OC_OP) { // L: 3125 + class44.Interpreter_intStackSize -= 2; // L: 3126 + var6 = Interpreter.Interpreter_intStack[class44.Interpreter_intStackSize]; // L: 3127 + var4 = Interpreter.Interpreter_intStack[class44.Interpreter_intStackSize + 1]; // L: 3128 + var5 = class260.ItemDefinition_get(var6); // L: 3129 + if (var4 >= 1 && var4 <= 5 && var5.groundActions[var4 - 1] != null) { // L: 3130 + Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var5.groundActions[var4 - 1]; + } else { + Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = ""; // L: 3131 + } + + return 1; // L: 3132 + } else if (var0 == ScriptOpcodes.OC_IOP) { // L: 3134 + class44.Interpreter_intStackSize -= 2; // L: 3135 + var6 = Interpreter.Interpreter_intStack[class44.Interpreter_intStackSize]; // L: 3136 + var4 = Interpreter.Interpreter_intStack[class44.Interpreter_intStackSize + 1]; // L: 3137 + var5 = class260.ItemDefinition_get(var6); // L: 3138 + if (var4 >= 1 && var4 <= 5 && var5.inventoryActions[var4 - 1] != null) { // L: 3139 + Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var5.inventoryActions[var4 - 1]; + } else { + Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = ""; // L: 3140 + } + + return 1; // L: 3141 + } else if (var0 == ScriptOpcodes.OC_COST) { // L: 3143 + var6 = Interpreter.Interpreter_intStack[--class44.Interpreter_intStackSize]; // L: 3144 + Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = class260.ItemDefinition_get(var6).price; // L: 3145 + return 1; // L: 3146 + } else if (var0 == ScriptOpcodes.OC_STACKABLE) { // L: 3148 + var6 = Interpreter.Interpreter_intStack[--class44.Interpreter_intStackSize]; // L: 3149 + Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = class260.ItemDefinition_get(var6).isStackable == 1 ? 1 : 0; // L: 3150 + return 1; // L: 3151 + } else { + ItemComposition var7; + if (var0 == ScriptOpcodes.OC_CERT) { // L: 3153 + var6 = Interpreter.Interpreter_intStack[--class44.Interpreter_intStackSize]; // L: 3154 + var7 = class260.ItemDefinition_get(var6); // L: 3155 + if (var7.noteTemplate == -1 && var7.note >= 0) { // L: 3156 + Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = var7.note; + } else { + Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = var6; // L: 3157 + } + + return 1; // L: 3158 + } else if (var0 == ScriptOpcodes.OC_UNCERT) { // L: 3160 + var6 = Interpreter.Interpreter_intStack[--class44.Interpreter_intStackSize]; // L: 3161 + var7 = class260.ItemDefinition_get(var6); // L: 3162 + if (var7.noteTemplate >= 0 && var7.note >= 0) { // L: 3163 + Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = var7.note; + } else { + Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = var6; // L: 3164 + } + + return 1; // L: 3165 + } else if (var0 == ScriptOpcodes.OC_MEMBERS) { // L: 3167 + var6 = Interpreter.Interpreter_intStack[--class44.Interpreter_intStackSize]; // L: 3168 + Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = class260.ItemDefinition_get(var6).isMembersOnly ? 1 : 0; // L: 3169 + return 1; // L: 3170 + } else if (var0 == ScriptOpcodes.OC_PLACEHOLDER) { // L: 3172 + var6 = Interpreter.Interpreter_intStack[--class44.Interpreter_intStackSize]; // L: 3173 + var7 = class260.ItemDefinition_get(var6); // L: 3174 + if (var7.placeholderTemplate == -1 && var7.placeholder >= 0) { // L: 3175 + Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = var7.placeholder; + } else { + Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = var6; // L: 3176 + } + + return 1; // L: 3177 + } else if (var0 == ScriptOpcodes.OC_UNPLACEHOLDER) { // L: 3179 + var6 = Interpreter.Interpreter_intStack[--class44.Interpreter_intStackSize]; // L: 3180 + var7 = class260.ItemDefinition_get(var6); // L: 3181 + if (var7.placeholderTemplate >= 0 && var7.placeholder >= 0) { // L: 3182 + Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = var7.placeholder; + } else { + Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = var6; // L: 3183 + } + + return 1; // L: 3184 + } else if (var0 == ScriptOpcodes.OC_FIND) { // L: 3186 + String var3 = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize]; // L: 3187 + var4 = Interpreter.Interpreter_intStack[--class44.Interpreter_intStackSize]; // L: 3188 + ObjectComposition.findItemDefinitions(var3, var4 == 1); // L: 3189 + Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = ClanSettings.foundItemIdCount; // L: 3190 + return 1; // L: 3191 + } else if (var0 != ScriptOpcodes.OC_FINDNEXT) { // L: 3193 + if (var0 == ScriptOpcodes.OC_FINDRESET) { // L: 3198 + Canvas.foundItemIndex = 0; // L: 3199 + return 1; // L: 3200 + } else { + return 2; // L: 3202 + } + } else { + if (Clock.foundItemIds != null && Canvas.foundItemIndex < ClanSettings.foundItemIdCount) { // L: 3194 + Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = Clock.foundItemIds[++Canvas.foundItemIndex - 1] & '\uffff'; // L: 3195 + } else { + Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = -1; + } + + return 1; // L: 3196 + } + } + } + } + + @ObfuscatedName("kj") + @ObfuscatedSignature( + descriptor = "(II)V", + garbageValue = "2028267498" + ) + @Export("updateSoundEffectVolume") + static final void updateSoundEffectVolume(int var0) { + var0 = Math.min(Math.max(var0, 0), 127); // L: 10920 + ObjectComposition.clientPreferences.soundEffectsVolume = var0; // L: 10921 + TileItem.savePreferences(); // L: 10922 + } // L: 10923 } diff --git a/runescape-client/src/main/java/WorldMapManager.java b/runescape-client/src/main/java/WorldMapManager.java index 66bc9eb70f..cd01111822 100644 --- a/runescape-client/src/main/java/WorldMapManager.java +++ b/runescape-client/src/main/java/WorldMapManager.java @@ -1,3 +1,9 @@ +import java.awt.Toolkit; +import java.awt.datatransfer.Clipboard; +import java.awt.datatransfer.DataFlavor; +import java.awt.datatransfer.Transferable; +import java.awt.datatransfer.UnsupportedFlavorException; +import java.io.IOException; import java.util.HashMap; import java.util.HashSet; import java.util.Iterator; @@ -9,99 +15,99 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("fs") +@ObfuscatedName("ff") @Implements("WorldMapManager") public final class WorldMapManager { - @ObfuscatedName("te") - @ObfuscatedGetter( - intValue = 46139673 + @ObfuscatedName("dp") + @ObfuscatedSignature( + descriptor = "Ljp;" ) - @Export("foundItemIndex") - static int foundItemIndex; - @ObfuscatedName("h") + @Export("archive11") + static Archive archive11; + @ObfuscatedName("v") @Export("loaded") boolean loaded; - @ObfuscatedName("c") + @ObfuscatedName("n") @Export("loadStarted") boolean loadStarted; - @ObfuscatedName("o") + @ObfuscatedName("f") @ObfuscatedSignature( - descriptor = "Lgc;" + descriptor = "Lgz;" ) @Export("mapAreaData") WorldMapAreaData mapAreaData; - @ObfuscatedName("g") + @ObfuscatedName("y") @ObfuscatedSignature( - descriptor = "Low;" + descriptor = "Loh;" ) @Export("compositeTextureSprite") SpritePixels compositeTextureSprite; - @ObfuscatedName("l") + @ObfuscatedName("p") @Export("icons") HashMap icons; - @ObfuscatedName("z") + @ObfuscatedName("j") @ObfuscatedSignature( - descriptor = "[[Lfm;" + descriptor = "[[Lfq;" ) @Export("regions") WorldMapRegion[][] regions; - @ObfuscatedName("t") + @ObfuscatedName("r") @Export("scaleHandlers") HashMap scaleHandlers; - @ObfuscatedName("v") + @ObfuscatedName("b") @ObfuscatedSignature( - descriptor = "[Lof;" + descriptor = "[Lop;" ) @Export("mapSceneSprites") IndexedSprite[] mapSceneSprites; - @ObfuscatedName("b") + @ObfuscatedName("d") @ObfuscatedSignature( - descriptor = "Ljp;" + descriptor = "Ljv;" ) @Export("geographyArchive") final AbstractArchive geographyArchive; - @ObfuscatedName("q") + @ObfuscatedName("s") @ObfuscatedSignature( - descriptor = "Ljp;" + descriptor = "Ljv;" ) @Export("groundArchive") final AbstractArchive groundArchive; - @ObfuscatedName("i") + @ObfuscatedName("u") @Export("fonts") final HashMap fonts; - @ObfuscatedName("x") + @ObfuscatedName("l") @ObfuscatedGetter( - intValue = 1845573137 + intValue = 758122357 ) @Export("tileX") int tileX; - @ObfuscatedName("k") + @ObfuscatedName("o") @ObfuscatedGetter( - intValue = -459948677 + intValue = 197299753 ) @Export("tileY") int tileY; - @ObfuscatedName("r") + @ObfuscatedName("c") @ObfuscatedGetter( - intValue = -893999221 + intValue = 274838579 ) @Export("tileWidth") int tileWidth; - @ObfuscatedName("p") + @ObfuscatedName("e") @ObfuscatedGetter( - intValue = -865810233 + intValue = 1210430205 ) @Export("tileHeight") int tileHeight; - @ObfuscatedName("a") + @ObfuscatedName("g") @ObfuscatedGetter( - intValue = -1081719921 + intValue = -978895597 ) @Export("pixelsPerTile") public int pixelsPerTile; @ObfuscatedSignature( - descriptor = "([Lof;Ljava/util/HashMap;Ljp;Ljp;)V" + descriptor = "([Lop;Ljava/util/HashMap;Ljv;Ljv;)V" ) public WorldMapManager(IndexedSprite[] var1, HashMap var2, AbstractArchive var3, AbstractArchive var4) { this.loaded = false; // L: 16 @@ -114,10 +120,10 @@ public final class WorldMapManager { this.groundArchive = var4; // L: 37 } // L: 38 - @ObfuscatedName("h") + @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "(Ljp;Ljava/lang/String;ZI)V", - garbageValue = "1799614523" + descriptor = "(Ljv;Ljava/lang/String;ZB)V", + garbageValue = "-19" ) @Export("load") public void load(AbstractArchive var1, String var2, boolean var3) { @@ -125,10 +131,10 @@ public final class WorldMapManager { this.loaded = false; // L: 44 this.loadStarted = true; // L: 45 System.nanoTime(); // L: 46 - int var4 = var1.getGroupId(WorldMapCacheName.field2128.name); // L: 47 + int var4 = var1.getGroupId(WorldMapCacheName.field2137.name); // L: 47 int var5 = var1.getFileId(var4, var2); // L: 48 - Buffer var6 = new Buffer(var1.takeFileByNames(WorldMapCacheName.field2128.name, var2)); // L: 49 - Buffer var7 = new Buffer(var1.takeFileByNames(WorldMapCacheName.field2123.name, var2)); // L: 50 + Buffer var6 = new Buffer(var1.takeFileByNames(WorldMapCacheName.field2137.name, var2)); // L: 49 + Buffer var7 = new Buffer(var1.takeFileByNames(WorldMapCacheName.field2132.name, var2)); // L: 50 System.nanoTime(); // L: 51 System.nanoTime(); // L: 52 this.mapAreaData = new WorldMapAreaData(); // L: 53 @@ -175,9 +181,9 @@ public final class WorldMapManager { System.nanoTime(); // L: 94 System.nanoTime(); // L: 95 - if (var1.isValidFileName(WorldMapCacheName.field2124.name, var2)) { // L: 96 - byte[] var20 = var1.takeFileByNames(WorldMapCacheName.field2124.name, var2); // L: 97 - this.compositeTextureSprite = WorldMapAreaData.convertJpgToSprite(var20); // L: 98 + if (var1.isValidFileName(WorldMapCacheName.field2134.name, var2)) { // L: 96 + byte[] var20 = var1.takeFileByNames(WorldMapCacheName.field2134.name, var2); // L: 97 + this.compositeTextureSprite = ParamComposition.convertJpgToSprite(var20); // L: 98 } System.nanoTime(); // L: 100 @@ -187,20 +193,20 @@ public final class WorldMapManager { } } // L: 42 104 - @ObfuscatedName("c") + @ObfuscatedName("n") @ObfuscatedSignature( - descriptor = "(B)V", - garbageValue = "53" + descriptor = "(S)V", + garbageValue = "768" ) @Export("clearIcons") public final void clearIcons() { this.icons = null; // L: 107 } // L: 108 - @ObfuscatedName("o") + @ObfuscatedName("f") @ObfuscatedSignature( - descriptor = "(IIIIIIIIB)V", - garbageValue = "-98" + descriptor = "(IIIIIIIII)V", + garbageValue = "181464110" ) @Export("drawTiles") public final void drawTiles(int var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8) { @@ -214,12 +220,12 @@ public final class WorldMapManager { int var15 = (int)Math.ceil((double)var14); // L: 118 this.pixelsPerTile = var15; // L: 119 if (!this.scaleHandlers.containsKey(var15)) { // L: 120 - WorldMapScaleHandler var16 = new WorldMapScaleHandler(var15); // L: 121 + WorldMapScaleHandler var16 = new WorldMapScaleHandler(var15); var16.init(); // L: 122 - this.scaleHandlers.put(var15, var16); // L: 123 + this.scaleHandlers.put(var15, var16); } - int var23 = var13.x + var13.width - 1; // L: 125 + int var23 = var13.width + var13.x - 1; int var17 = var13.height + var13.y - 1; // L: 126 int var18; @@ -236,42 +242,42 @@ public final class WorldMapManager { var19 = this.tileX + var1; // L: 135 int var20 = var2 + this.tileY; // L: 136 - for (int var21 = var13.x; var21 < var13.x + var13.width; ++var21) { // L: 137 - for (int var22 = var13.y; var22 < var13.y + var13.height; ++var22) { // L: 138 - this.regions[var21][var22].method3271(var5 + (this.regions[var21][var22].regionX * 64 - var19) * var18 / 64, var8 - (this.regions[var21][var22].regionY * 64 - var20 + 64) * var18 / 64, var18); // L: 139 + for (int var21 = var13.x; var21 < var13.width + var13.x; ++var21) { // L: 137 + for (int var22 = var13.y; var22 < var13.height + var13.y; ++var22) { // L: 138 + this.regions[var21][var22].method3328(var5 + (this.regions[var21][var22].regionX * 64 - var19) * var18 / 64, var8 - (this.regions[var21][var22].regionY * 64 - var20 + 64) * var18 / 64, var18); // L: 139 } } } // L: 142 - @ObfuscatedName("g") + @ObfuscatedName("y") @ObfuscatedSignature( descriptor = "(IIIIIIIILjava/util/HashSet;Ljava/util/HashSet;IIZI)V", - garbageValue = "-2114068837" + garbageValue = "-1554077956" ) @Export("drawElements") public final void drawElements(int var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8, HashSet var9, HashSet var10, int var11, int var12, boolean var13) { WorldMapRectangle var14 = this.createWorldMapRectangle(var1, var2, var3, var4); // L: 145 float var15 = this.getPixelsPerTile(var7 - var5, var3 - var1); // L: 146 - int var16 = (int)(64.0F * var15); // L: 147 + int var16 = (int)(var15 * 64.0F); // L: 147 int var17 = this.tileX + var1; // L: 148 int var18 = var2 + this.tileY; // L: 149 int var19; int var20; - for (var19 = var14.x; var19 < var14.width + var14.x; ++var19) { // L: 150 + for (var19 = var14.x; var19 < var14.x + var14.width; ++var19) { // L: 150 for (var20 = var14.y; var20 < var14.height + var14.y; ++var20) { // L: 151 if (var13) { // L: 152 this.regions[var19][var20].initWorldMapIcon1s(); // L: 153 } - this.regions[var19][var20].method3282(var5 + (this.regions[var19][var20].regionX * 64 - var17) * var16 / 64, var8 - (this.regions[var19][var20].regionY * 64 - var18 + 64) * var16 / 64, var16, var9); // L: 155 + this.regions[var19][var20].method3353(var5 + (this.regions[var19][var20].regionX * 64 - var17) * var16 / 64, var8 - (this.regions[var19][var20].regionY * 64 - var18 + 64) * var16 / 64, var16, var9); // L: 155 } } if (var10 != null && var11 > 0) { // L: 158 - for (var19 = var14.x; var19 < var14.x + var14.width; ++var19) { // L: 159 - for (var20 = var14.y; var20 < var14.y + var14.height; ++var20) { // L: 160 + for (var19 = var14.x; var19 < var14.width + var14.x; ++var19) { // L: 159 + for (var20 = var14.y; var20 < var14.height + var14.y; ++var20) { // L: 160 this.regions[var19][var20].flashElements(var10, var11, var12); // L: 161 } } @@ -279,10 +285,10 @@ public final class WorldMapManager { } // L: 165 - @ObfuscatedName("l") + @ObfuscatedName("p") @ObfuscatedSignature( descriptor = "(IIIILjava/util/HashSet;III)V", - garbageValue = "-1860707171" + garbageValue = "-397966592" ) @Export("drawOverview") public void drawOverview(int var1, int var2, int var3, int var4, HashSet var5, int var6, int var7) { @@ -306,9 +312,9 @@ public final class WorldMapManager { var10 = (List)this.icons.get(var9); // L: 181 } while(var10 == null); // L: 182 - Iterator var11 = var10.iterator(); + Iterator var11 = var10.iterator(); // L: 185 - while (var11.hasNext()) { // L: 185 + while (var11.hasNext()) { AbstractWorldMapIcon var12 = (AbstractWorldMapIcon)var11.next(); // L: 186 int var13 = var3 * (var12.coord2.x - this.tileX) / this.tileWidth; // L: 188 int var14 = var4 - (var12.coord2.y - this.tileY) * var4 / this.tileHeight; // L: 189 @@ -319,383 +325,1363 @@ public final class WorldMapManager { } } // L: 169 173 - @ObfuscatedName("z") + @ObfuscatedName("j") @ObfuscatedSignature( - descriptor = "(IIIIIIIIIIB)Ljava/util/List;", - garbageValue = "-50" + descriptor = "(IIIIIIIIIII)Ljava/util/List;", + garbageValue = "533098241" ) - public List method3430(int var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8, int var9, int var10) { + public List method3465(int var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8, int var9, int var10) { LinkedList var11 = new LinkedList(); // L: 198 if (!this.loaded) { // L: 199 return var11; // L: 200 } else { WorldMapRectangle var12 = this.createWorldMapRectangle(var1, var2, var3, var4); // L: 202 float var13 = this.getPixelsPerTile(var7, var3 - var1); // L: 203 - int var14 = (int)(var13 * 64.0F); // L: 204 - int var15 = this.tileX + var1; // L: 205 - int var16 = var2 + this.tileY; // L: 206 + int var14 = (int)(var13 * 64.0F); + int var15 = this.tileX + var1; + int var16 = var2 + this.tileY; for (int var17 = var12.x; var17 < var12.x + var12.width; ++var17) { // L: 207 - for (int var18 = var12.y; var18 < var12.height + var12.y; ++var18) { // L: 208 - List var19 = this.regions[var17][var18].method3303(var5 + (this.regions[var17][var18].regionX * 64 - var15) * var14 / 64, var8 + var6 - (this.regions[var17][var18].regionY * 64 - var16 + 64) * var14 / 64, var14, var9, var10); // L: 209 - if (!var19.isEmpty()) { // L: 210 - var11.addAll(var19); // L: 211 + for (int var18 = var12.y; var18 < var12.y + var12.height; ++var18) { + List var19 = this.regions[var17][var18].method3359(var5 + (this.regions[var17][var18].regionX * 64 - var15) * var14 / 64, var8 + var6 - (this.regions[var17][var18].regionY * 64 - var16 + 64) * var14 / 64, var14, var9, var10); + if (!var19.isEmpty()) { + var11.addAll(var19); } } } - return var11; // L: 215 + return var11; } } - @ObfuscatedName("t") + @ObfuscatedName("r") @ObfuscatedSignature( - descriptor = "(IIIII)Lfq;", - garbageValue = "-77568480" + descriptor = "(IIIIB)Lfu;", + garbageValue = "-6" ) @Export("createWorldMapRectangle") WorldMapRectangle createWorldMapRectangle(int var1, int var2, int var3, int var4) { WorldMapRectangle var5 = new WorldMapRectangle(this); // L: 219 - int var6 = this.tileX + var1; // L: 220 - int var7 = var2 + this.tileY; // L: 221 - int var8 = var3 + this.tileX; // L: 222 + int var6 = this.tileX + var1; + int var7 = var2 + this.tileY; + int var8 = var3 + this.tileX; int var9 = var4 + this.tileY; // L: 223 int var10 = var6 / 64; // L: 224 - int var11 = var7 / 64; // L: 225 - int var12 = var8 / 64; // L: 226 - int var13 = var9 / 64; // L: 227 + int var11 = var7 / 64; + int var12 = var8 / 64; + int var13 = var9 / 64; var5.width = var12 - var10 + 1; // L: 228 - var5.height = var13 - var11 + 1; // L: 229 + var5.height = var13 - var11 + 1; var5.x = var10 - this.mapAreaData.getRegionLowX(); // L: 230 var5.y = var11 - this.mapAreaData.getRegionLowY(); // L: 231 - if (var5.x < 0) { // L: 232 - var5.width += var5.x; // L: 233 + if (var5.x < 0) { + var5.width += var5.x; var5.x = 0; // L: 234 } - if (var5.x > this.regions.length - var5.width) { // L: 236 - var5.width = this.regions.length - var5.x; // L: 237 + if (var5.x > this.regions.length - var5.width) { + var5.width = this.regions.length - var5.x; } - if (var5.y < 0) { // L: 239 - var5.height += var5.y; // L: 240 + if (var5.y < 0) { + var5.height += var5.y; var5.y = 0; // L: 241 } if (var5.y > this.regions[0].length - var5.height) { // L: 243 - var5.height = this.regions[0].length - var5.y; // L: 244 + var5.height = this.regions[0].length - var5.y; } - var5.width = Math.min(var5.width, this.regions.length); // L: 246 - var5.height = Math.min(var5.height, this.regions[0].length); // L: 247 - return var5; // L: 248 + var5.width = Math.min(var5.width, this.regions.length); + var5.height = Math.min(var5.height, this.regions[0].length); + return var5; } - @ObfuscatedName("v") + @ObfuscatedName("b") @ObfuscatedSignature( descriptor = "(I)Z", - garbageValue = "1468507675" + garbageValue = "831698872" ) @Export("isLoaded") public boolean isLoaded() { return this.loaded; // L: 252 } - @ObfuscatedName("b") + @ObfuscatedName("d") @ObfuscatedSignature( - descriptor = "(B)Ljava/util/HashMap;", - garbageValue = "-114" + descriptor = "(I)Ljava/util/HashMap;", + garbageValue = "1724645516" ) @Export("buildIcons") public HashMap buildIcons() { - this.buildIcons0(); // L: 256 - return this.icons; // L: 257 + this.buildIcons0(); + return this.icons; } - @ObfuscatedName("q") + @ObfuscatedName("s") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "1232365989" + garbageValue = "582634997" ) @Export("buildIcons0") void buildIcons0() { - if (this.icons == null) { // L: 261 - this.icons = new HashMap(); // L: 262 + if (this.icons == null) { + this.icons = new HashMap(); } this.icons.clear(); // L: 264 for (int var1 = 0; var1 < this.regions.length; ++var1) { // L: 265 - for (int var2 = 0; var2 < this.regions[var1].length; ++var2) { // L: 266 + for (int var2 = 0; var2 < this.regions[var1].length; ++var2) { List var3 = this.regions[var1][var2].icons(); // L: 267 - Iterator var4 = var3.iterator(); // L: 268 + Iterator var4 = var3.iterator(); while (var4.hasNext()) { - AbstractWorldMapIcon var5 = (AbstractWorldMapIcon)var4.next(); // L: 269 - if (var5.hasValidElement()) { // L: 271 - int var6 = var5.getElement(); // L: 272 - if (!this.icons.containsKey(var6)) { // L: 273 + AbstractWorldMapIcon var5 = (AbstractWorldMapIcon)var4.next(); + if (var5.hasValidElement()) { + int var6 = var5.getElement(); + if (!this.icons.containsKey(var6)) { LinkedList var7 = new LinkedList(); // L: 274 - var7.add(var5); // L: 275 - this.icons.put(var6, var7); // L: 276 + var7.add(var5); + this.icons.put(var6, var7); } else { - List var8 = (List)this.icons.get(var6); // L: 279 - var8.add(var5); // L: 280 + List var8 = (List)this.icons.get(var6); + var8.add(var5); } } } } } - } // L: 286 + } - @ObfuscatedName("i") + @ObfuscatedName("u") @ObfuscatedSignature( - descriptor = "(III)F", - garbageValue = "2102761874" + descriptor = "(IIB)F", + garbageValue = "20" ) @Export("getPixelsPerTile") float getPixelsPerTile(int var1, int var2) { - float var3 = (float)var1 / (float)var2; // L: 289 - if (var3 > 8.0F) { // L: 290 + float var3 = (float)var1 / (float)var2; + if (var3 > 8.0F) { return 8.0F; - } else if (var3 < 1.0F) { // L: 291 + } else if (var3 < 1.0F) { return 1.0F; } else { - int var4 = Math.round(var3); // L: 292 - return Math.abs((float)var4 - var3) < 0.05F ? (float)var4 : var3; // L: 293 294 + int var4 = Math.round(var3); + return Math.abs((float)var4 - var3) < 0.05F ? (float)var4 : var3; } } - @ObfuscatedName("ax") + @ObfuscatedName("j") @ObfuscatedSignature( - descriptor = "(IB)I", - garbageValue = "100" + descriptor = "(Laf;B)V", + garbageValue = "-51" ) - static int method3438(int var0) { - return (int)Math.pow(2.0D, (double)((float)var0 / 256.0F + 7.0F)); // L: 3511 - } - - @ObfuscatedName("fq") - @ObfuscatedSignature( - descriptor = "(Lfb;IIII)V", - garbageValue = "-604667253" - ) - static void method3425(SequenceDefinition var0, int var1, int var2, int var3) { - if (Client.soundEffectCount < 50 && class12.clientPreferences.areaSoundEffectsVolume != 0) { // L: 3752 - if (var0.soundEffects != null && var1 < var0.soundEffects.length) { // L: 3753 - int var4 = var0.soundEffects[var1]; // L: 3754 - if (var4 != 0) { // L: 3755 - int var5 = var4 >> 8; // L: 3756 - int var6 = var4 >> 4 & 7; // L: 3757 - int var7 = var4 & 15; // L: 3758 - Client.soundEffectIds[Client.soundEffectCount] = var5; // L: 3759 - Client.queuedSoundEffectLoops[Client.soundEffectCount] = var6; // L: 3760 - Client.queuedSoundEffectDelays[Client.soundEffectCount] = 0; // L: 3761 - Client.soundEffects[Client.soundEffectCount] = null; // L: 3762 - int var8 = (var2 - 64) / 128; // L: 3763 - int var9 = (var3 - 64) / 128; // L: 3764 - Client.soundLocations[Client.soundEffectCount] = var7 + (var9 << 8) + (var8 << 16); // L: 3765 - ++Client.soundEffectCount; // L: 3766 - } - } - } - } // L: 3767 - - @ObfuscatedName("gw") - @ObfuscatedSignature( - descriptor = "(B)V", - garbageValue = "49" - ) - static final void method3439() { - int var0; - int var1; - int var2; - int var3; - int var4; - int var5; - if (Client.oculusOrbState == 0) { // L: 3898 - var0 = class35.localPlayer.x; // L: 3899 - var1 = class35.localPlayer.y; // L: 3900 - if (HorizontalAlignment.oculusOrbFocalPointX - var0 < -500 || HorizontalAlignment.oculusOrbFocalPointX - var0 > 500 || class280.oculusOrbFocalPointY - var1 < -500 || class280.oculusOrbFocalPointY - var1 > 500) { // L: 3901 - HorizontalAlignment.oculusOrbFocalPointX = var0; // L: 3902 - class280.oculusOrbFocalPointY = var1; // L: 3903 - } - - if (var0 != HorizontalAlignment.oculusOrbFocalPointX) { // L: 3905 - HorizontalAlignment.oculusOrbFocalPointX += (var0 - HorizontalAlignment.oculusOrbFocalPointX) / 16; - } - - if (var1 != class280.oculusOrbFocalPointY) { // L: 3906 - class280.oculusOrbFocalPointY += (var1 - class280.oculusOrbFocalPointY) / 16; - } - - var2 = HorizontalAlignment.oculusOrbFocalPointX >> 7; // L: 3907 - var3 = class280.oculusOrbFocalPointY >> 7; // L: 3908 - var4 = SceneTilePaint.getTileHeight(HorizontalAlignment.oculusOrbFocalPointX, class280.oculusOrbFocalPointY, ParamComposition.Client_plane); // L: 3909 - var5 = 0; // L: 3910 - int var6; - if (var2 > 3 && var3 > 3 && var2 < 100 && var3 < 100) { // L: 3911 - for (var6 = var2 - 4; var6 <= var2 + 4; ++var6) { // L: 3912 - for (int var7 = var3 - 4; var7 <= var3 + 4; ++var7) { // L: 3913 - int var8 = ParamComposition.Client_plane; // L: 3914 - if (var8 < 3 && (Tiles.Tiles_renderFlags[1][var6][var7] & 2) == 2) { // L: 3915 - ++var8; - } - - int var9 = var4 - Tiles.Tiles_heights[var8][var6][var7]; // L: 3916 - if (var9 > var5) { // L: 3917 - var5 = var9; - } - } - } - } - - var6 = var5 * 192; // L: 3921 - if (var6 > 98048) { // L: 3922 - var6 = 98048; - } - - if (var6 < 32768) { // L: 3923 - var6 = 32768; - } - - if (var6 > Client.field702) { // L: 3924 - Client.field702 += (var6 - Client.field702) / 24; - } else if (var6 < Client.field702) { // L: 3925 - Client.field702 += (var6 - Client.field702) / 80; - } - - Decimator.field523 = SceneTilePaint.getTileHeight(class35.localPlayer.x, class35.localPlayer.y, ParamComposition.Client_plane) - Client.camFollowHeight; // L: 3926 - } else if (Client.oculusOrbState == 1) { // L: 3928 - if (Client.field699 && class35.localPlayer != null) { // L: 3930 - var0 = class35.localPlayer.pathX[0]; // L: 3931 - var1 = class35.localPlayer.pathY[0]; // L: 3932 - if (var0 >= 0 && var1 >= 0 && var0 < 104 && var1 < 104) { // L: 3933 - HorizontalAlignment.oculusOrbFocalPointX = class35.localPlayer.x; // L: 3934 - var2 = SceneTilePaint.getTileHeight(class35.localPlayer.x, class35.localPlayer.y, ParamComposition.Client_plane) - Client.camFollowHeight; // L: 3935 - if (var2 < Decimator.field523) { // L: 3936 - Decimator.field523 = var2; - } - - class280.oculusOrbFocalPointY = class35.localPlayer.y; // L: 3937 - Client.field699 = false; // L: 3938 - } - } - - short var10 = -1; // L: 3941 - if (KeyHandler.KeyHandler_pressedKeys[33]) { // L: 3942 - var10 = 0; - } else if (KeyHandler.KeyHandler_pressedKeys[49]) { // L: 3943 - var10 = 1024; - } - - if (KeyHandler.KeyHandler_pressedKeys[48]) { // L: 3944 - if (var10 == 0) { // L: 3945 - var10 = 1792; - } else if (var10 == 1024) { // L: 3946 - var10 = 1280; - } else { - var10 = 1536; // L: 3947 - } - } else if (KeyHandler.KeyHandler_pressedKeys[50]) { // L: 3949 - if (var10 == 0) { // L: 3950 - var10 = 256; - } else if (var10 == 1024) { // L: 3951 - var10 = 768; - } else { - var10 = 512; // L: 3952 - } - } - - byte var11 = 0; // L: 3954 - if (KeyHandler.KeyHandler_pressedKeys[35]) { // L: 3955 - var11 = -1; - } else if (KeyHandler.KeyHandler_pressedKeys[51]) { // L: 3956 - var11 = 1; - } - - var2 = 0; // L: 3957 - if (var10 >= 0 || var11 != 0) { // L: 3958 - var2 = KeyHandler.KeyHandler_pressedKeys[81] ? Client.oculusOrbSlowedSpeed * 1976464923 * -217353197 : Client.oculusOrbNormalSpeed * -832411863 * 1510155545; // L: 3959 - var2 *= 16; // L: 3960 - Client.field694 = var10; // L: 3961 - Client.field695 = var11; // L: 3962 - } - - if (Client.field693 < var2) { // L: 3964 - Client.field693 += var2 / 8; // L: 3965 - if (Client.field693 > var2) { // L: 3966 - Client.field693 = var2; - } - } else if (Client.field693 > var2) { // L: 3968 - Client.field693 = Client.field693 * 9 / 10; - } - - if (Client.field693 > 0) { // L: 3969 - var3 = Client.field693 / 16; // L: 3970 - if (Client.field694 >= 0) { // L: 3971 - var0 = Client.field694 - HealthBarDefinition.cameraYaw & 2047; // L: 3972 - var4 = Rasterizer3D.Rasterizer3D_sine[var0]; // L: 3973 - var5 = Rasterizer3D.Rasterizer3D_cosine[var0]; // L: 3974 - HorizontalAlignment.oculusOrbFocalPointX += var4 * var3 / 65536; // L: 3975 - class280.oculusOrbFocalPointY += var3 * var5 / 65536; // L: 3976 - } - - if (Client.field695 != 0) { // L: 3978 - Decimator.field523 += var3 * Client.field695; // L: 3979 - if (Decimator.field523 > 0) { // L: 3980 - Decimator.field523 = 0; - } - } - } else { - Client.field694 = -1; // L: 3984 - Client.field695 = -1; // L: 3985 - } - - if (KeyHandler.KeyHandler_pressedKeys[13]) { // L: 3987 - Client.packetWriter.addNode(HealthBarDefinition.getPacketBufferNode(ClientPacket.field2601, Client.packetWriter.isaacCipher)); // L: 3989 - Client.oculusOrbState = 0; // L: 3990 - } - } - - if (MouseHandler.MouseHandler_currentButton == 4 && class229.mouseCam) { // L: 3994 - var0 = MouseHandler.MouseHandler_y - Client.mouseCamClickedY; // L: 3995 - Client.camAngleDX = var0 * 2; // L: 3996 - Client.mouseCamClickedY = var0 != -1 && var0 != 1 ? (MouseHandler.MouseHandler_y + Client.mouseCamClickedY) / 2 : MouseHandler.MouseHandler_y * -563072281 * 245940439; // L: 3997 - var1 = Client.mouseCamClickedX - MouseHandler.MouseHandler_x; // L: 3998 - Client.camAngleDY = var1 * 2; // L: 3999 - Client.mouseCamClickedX = var1 != -1 && var1 != 1 ? (Client.mouseCamClickedX + MouseHandler.MouseHandler_x) / 2 : MouseHandler.MouseHandler_x * -661389681 * -1322164113; // L: 4000 + @Export("doCycleTitle") + static void doCycleTitle(GameEngine var0) { + if (Login.worldSelectOpen) { // L: 204 + class20.method230(var0); // L: 205 } else { - if (KeyHandler.KeyHandler_pressedKeys[96]) { // L: 4003 - Client.camAngleDY += (-24 - Client.camAngleDY) / 2; - } else if (KeyHandler.KeyHandler_pressedKeys[97]) { // L: 4004 - Client.camAngleDY += (24 - Client.camAngleDY) / 2; - } else { - Client.camAngleDY /= 2; // L: 4005 + if ((MouseHandler.MouseHandler_lastButton == 1 || !Client.mouseCam && MouseHandler.MouseHandler_lastButton == 4) && MouseHandler.MouseHandler_lastPressedX >= Login.xPadding + 765 - 50 && MouseHandler.MouseHandler_lastPressedY >= 453) { // L: 208 + ObjectComposition.clientPreferences.titleMusicDisabled = !ObjectComposition.clientPreferences.titleMusicDisabled; // L: 209 + TileItem.savePreferences(); // L: 210 + if (!ObjectComposition.clientPreferences.titleMusicDisabled) { // L: 211 + Archive var1 = UrlRequest.archive6; // L: 212 + int var2 = var1.getGroupId("scape main"); // L: 214 + int var3 = var1.getFileId(var2, ""); // L: 215 + LoginScreenAnimation.method2219(var1, var2, var3, 255, false); // L: 216 + } else { + class124.midiPcmStream.clear(); // L: 220 + class232.musicPlayerStatus = 1; // L: 221 + ModelData0.musicTrackArchive = null; // L: 222 + } } - if (KeyHandler.KeyHandler_pressedKeys[98]) { // L: 4006 - Client.camAngleDX += (12 - Client.camAngleDX) / 2; - } else if (KeyHandler.KeyHandler_pressedKeys[99]) { // L: 4007 - Client.camAngleDX += (-12 - Client.camAngleDX) / 2; - } else { - Client.camAngleDX /= 2; // L: 4008 + if (Client.gameState != 5) { // L: 225 + if (Login.field1050 == -1L) { // L: 226 + Login.field1050 = ObjectComposition.currentTimeMillis() + 1000L; // L: 227 + } + + long var21 = ObjectComposition.currentTimeMillis(); // L: 229 + boolean var31; + if (Client.archiveLoaders != null && Client.archiveLoadersDone < Client.archiveLoaders.size()) { // L: 232 + while (true) { + if (Client.archiveLoadersDone >= Client.archiveLoaders.size()) { // L: 236 + var31 = true; // L: 244 + break; + } + + ArchiveLoader var4 = (ArchiveLoader)Client.archiveLoaders.get(Client.archiveLoadersDone); // L: 237 + if (!var4.isLoaded()) { // L: 238 + var31 = false; // L: 239 + break; // L: 240 + } + + ++Client.archiveLoadersDone; // L: 242 + } + } else { + var31 = true; // L: 233 + } + + if (var31 && -1L == Login.field1022) { // L: 246 247 + Login.field1022 = var21; // L: 248 + if (Login.field1022 > Login.field1050) { // L: 249 + Login.field1050 = Login.field1022; // L: 250 + } + } + + if (Client.gameState == 10 || Client.gameState == 11) { // L: 254 + int var23; + if (Language.Language_EN == class378.clientLanguage) { // L: 255 + if (MouseHandler.MouseHandler_lastButton == 1 || !Client.mouseCam && MouseHandler.MouseHandler_lastButton == 4) { // L: 256 + var23 = Login.xPadding + 5; // L: 257 + short var5 = 463; // L: 258 + byte var6 = 100; // L: 259 + byte var7 = 35; // L: 260 + if (MouseHandler.MouseHandler_lastPressedX >= var23 && MouseHandler.MouseHandler_lastPressedX <= var23 + var6 && MouseHandler.MouseHandler_lastPressedY >= var5 && MouseHandler.MouseHandler_lastPressedY <= var5 + var7) { // L: 261 + VarbitComposition.method2859(); // L: 262 + return; // L: 263 + } + } + + if (MilliClock.World_request != null) { // L: 266 + VarbitComposition.method2859(); + } + } + + var23 = MouseHandler.MouseHandler_lastButton; // L: 268 + int var32 = MouseHandler.MouseHandler_lastPressedX; // L: 269 + int var33 = MouseHandler.MouseHandler_lastPressedY; // L: 270 + if (var23 == 0) { // L: 271 + var32 = MouseHandler.MouseHandler_x; // L: 272 + var33 = MouseHandler.MouseHandler_y; // L: 273 + } + + if (!Client.mouseCam && var23 == 4) { // L: 275 + var23 = 1; + } + + short var36; + int var37; + if (Login.loginIndex == 0) { // L: 276 + boolean var41 = false; // L: 277 + + while (ClanChannelMember.isKeyDown()) { // L: 278 + if (ItemComposition.field1859 == 84) { // L: 279 + var41 = true; // L: 280 + } + } + + var37 = UserComparator4.loginBoxCenter - 80; // L: 283 + var36 = 291; // L: 284 + if (var23 == 1 && var32 >= var37 - 75 && var32 <= var37 + 75 && var33 >= var36 - 20 && var33 <= var36 + 20) { // L: 285 + Players.openURL(KitDefinition.method2705("secure", true) + "m=account-creation/g=oldscape/create_account_funnel.ws", true, false); // L: 286 + } + + var37 = UserComparator4.loginBoxCenter + 80; // L: 288 + if (var23 == 1 && var32 >= var37 - 75 && var32 <= var37 + 75 && var33 >= var36 - 20 && var33 <= var36 + 20 || var41) { // L: 289 + if ((Client.worldProperties & 33554432) != 0) { // L: 290 + Login.Login_response0 = ""; // L: 291 + Login.Login_response1 = "This is a Beta world."; // L: 292 + Login.Login_response2 = "Your normal account will not be affected."; // L: 293 + Login.Login_response3 = ""; // L: 294 + Login.loginIndex = 1; // L: 295 + if (Client.Login_isUsernameRemembered && Login.Login_username != null && Login.Login_username.length() > 0) { // L: 297 + Login.currentLoginField = 1; // L: 298 + } else { + Login.currentLoginField = 0; // L: 301 + } + } else if ((Client.worldProperties & 4) != 0) { // L: 305 + if ((Client.worldProperties & 1024) != 0) { // L: 306 + Login.Login_response1 = "This is a High Risk PvP world."; // L: 307 + Login.Login_response2 = "Players can attack each other almost everywhere"; // L: 308 + Login.Login_response3 = "and the Protect Item prayer won't work."; // L: 309 + } else { + Login.Login_response1 = "This is a PvP world."; // L: 312 + Login.Login_response2 = "Players can attack each other"; // L: 313 + Login.Login_response3 = "almost everywhere."; // L: 314 + } + + Login.Login_response0 = "Warning!"; // L: 316 + Login.loginIndex = 1; // L: 317 + if (Client.Login_isUsernameRemembered && Login.Login_username != null && Login.Login_username.length() > 0) { // L: 319 + Login.currentLoginField = 1; // L: 320 + } else { + Login.currentLoginField = 0; // L: 323 + } + } else if ((Client.worldProperties & 1024) != 0) { // L: 327 + Login.Login_response1 = "This is a High Risk world."; // L: 328 + Login.Login_response2 = "The Protect Item prayer will"; // L: 329 + Login.Login_response3 = "not work on this world."; // L: 330 + Login.Login_response0 = "Warning!"; // L: 331 + Login.loginIndex = 1; // L: 332 + if (Client.Login_isUsernameRemembered && Login.Login_username != null && Login.Login_username.length() > 0) { // L: 334 + Login.currentLoginField = 1; // L: 335 + } else { + Login.currentLoginField = 0; // L: 338 + } + } else { + ClanChannelMember.Login_promptCredentials(false); // L: 343 + } + } + } else { + short var8; + int var34; + if (Login.loginIndex == 1) { // L: 347 + while (true) { + if (!ClanChannelMember.isKeyDown()) { // L: 348 + var34 = UserComparator4.loginBoxCenter - 80; // L: 356 + var8 = 321; // L: 357 + if (var23 == 1 && var32 >= var34 - 75 && var32 <= var34 + 75 && var33 >= var8 - 20 && var33 <= var8 + 20) { // L: 358 + ClanChannelMember.Login_promptCredentials(false); // L: 359 + } + + var34 = UserComparator4.loginBoxCenter + 80; // L: 361 + if (var23 == 1 && var32 >= var34 - 75 && var32 <= var34 + 75 && var33 >= var8 - 20 && var33 <= var8 + 20) { // L: 362 + Login.loginIndex = 0; // L: 363 + } + break; + } + + if (ItemComposition.field1859 == 84) { // L: 349 + ClanChannelMember.Login_promptCredentials(false); // L: 350 + } else if (ItemComposition.field1859 == 13) { // L: 352 + Login.loginIndex = 0; // L: 353 + } + } + } else { + int var11; + short var35; + boolean var38; + if (Login.loginIndex == 2) { // L: 366 + var35 = 201; // L: 367 + var34 = var35 + 52; // L: 368 + if (var23 == 1 && var33 >= var34 - 12 && var33 < var34 + 2) { // L: 369 + Login.currentLoginField = 0; + } + + var34 += 15; // L: 370 + if (var23 == 1 && var33 >= var34 - 12 && var33 < var34 + 2) { // L: 371 + Login.currentLoginField = 1; + } + + var34 += 15; // L: 372 + var35 = 361; // L: 373 + if (DynamicObject.field1107 != null) { // L: 374 + var37 = DynamicObject.field1107.highX / 2; // L: 375 + if (var23 == 1 && var32 >= DynamicObject.field1107.lowX - var37 && var32 <= var37 + DynamicObject.field1107.lowX && var33 >= var35 - 15 && var33 < var35) { // L: 376 + switch(Login.field1039) { // L: 377 + case 1: + class260.setLoginResponseString("Please enter your username.", "If you created your account after November", "2010, this will be the creation email address."); // L: 380 + Login.loginIndex = 5; // L: 381 + return; // L: 382 + case 2: + Players.openURL("https://support.runescape.com/hc/en-gb", true, false); // L: 386 + } + } + } + + var37 = UserComparator4.loginBoxCenter - 80; // L: 392 + var36 = 321; // L: 393 + if (var23 == 1 && var32 >= var37 - 75 && var32 <= var37 + 75 && var33 >= var36 - 20 && var33 <= var36 + 20) { // L: 394 + Login.Login_username = Login.Login_username.trim(); // L: 395 + if (Login.Login_username.length() == 0) { // L: 396 + class260.setLoginResponseString("", "Please enter your username/email address.", ""); // L: 397 + return; // L: 398 + } + + if (Login.Login_password.length() == 0) { // L: 400 + class260.setLoginResponseString("", "Please enter your password.", ""); // L: 401 + return; // L: 402 + } + + class260.setLoginResponseString("", "Connecting to server...", ""); // L: 404 + VarbitComposition.method2849(false); // L: 405 + class12.updateGameState(20); // L: 406 + return; // L: 407 + } + + var37 = Login.loginBoxX + 180 + 80; // L: 409 + if (var23 == 1 && var32 >= var37 - 75 && var32 <= var37 + 75 && var33 >= var36 - 20 && var33 <= var36 + 20) { // L: 410 + Login.loginIndex = 0; // L: 411 + Login.Login_username = ""; // L: 412 + Login.Login_password = ""; // L: 413 + class5.field53 = 0; // L: 414 + Varps.otp = ""; // L: 415 + Login.field1043 = true; // L: 416 + } + + var37 = UserComparator4.loginBoxCenter + -117; // L: 418 + var36 = 277; // L: 419 + Login.field1041 = var32 >= var37 && var32 < var37 + Skeleton.field2287 && var33 >= var36 && var33 < var36 + WorldMapIcon_1.field1937; // L: 420 + if (var23 == 1 && Login.field1041) { // L: 421 + Client.Login_isUsernameRemembered = !Client.Login_isUsernameRemembered; // L: 422 + if (!Client.Login_isUsernameRemembered && ObjectComposition.clientPreferences.rememberedUsername != null) { // L: 423 + ObjectComposition.clientPreferences.rememberedUsername = null; // L: 424 + TileItem.savePreferences(); // L: 425 + } + } + + var37 = UserComparator4.loginBoxCenter + 24; // L: 428 + var36 = 277; // L: 429 + Login.field1047 = var32 >= var37 && var32 < var37 + Skeleton.field2287 && var33 >= var36 && var33 < var36 + WorldMapIcon_1.field1937; // L: 430 + if (var23 == 1 && Login.field1047) { // L: 431 + ObjectComposition.clientPreferences.hideUsername = !ObjectComposition.clientPreferences.hideUsername; // L: 432 + if (!ObjectComposition.clientPreferences.hideUsername) { // L: 433 + Login.Login_username = ""; // L: 434 + ObjectComposition.clientPreferences.rememberedUsername = null; // L: 435 + if (Client.Login_isUsernameRemembered && Login.Login_username != null && Login.Login_username.length() > 0) { // L: 437 + Login.currentLoginField = 1; // L: 438 + } else { + Login.currentLoginField = 0; // L: 441 + } + } + + TileItem.savePreferences(); // L: 445 + } + + while (true) { + int var12; + Transferable var25; + do { + while (true) { + label975: + do { + while (true) { + while (ClanChannelMember.isKeyDown()) { // L: 447 + if (ItemComposition.field1859 != 13) { // L: 448 + if (Login.currentLoginField != 0) { // L: 457 + continue label975; + } + + char var39 = class249.field3116; // L: 458 + + for (var11 = 0; var11 < "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789!\"£$%^&*()-_=+[{]};:'@#~,<.>/?\\| ".length() && var39 != "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789!\"£$%^&*()-_=+[{]};:'@#~,<.>/?\\| ".charAt(var11); ++var11) { // L: 460 461 + } + + if (ItemComposition.field1859 == 85 && Login.Login_username.length() > 0) { // L: 464 + Login.Login_username = Login.Login_username.substring(0, Login.Login_username.length() - 1); + } + + if (ItemComposition.field1859 == 84 || ItemComposition.field1859 == 80) { // L: 465 + Login.currentLoginField = 1; + } + + if (DevicePcmPlayerProvider.method385(class249.field3116) && Login.Login_username.length() < 320) { // L: 466 + Login.Login_username = Login.Login_username + class249.field3116; + } + } else { + Login.loginIndex = 0; // L: 449 + Login.Login_username = ""; // L: 450 + Login.Login_password = ""; // L: 451 + class5.field53 = 0; // L: 452 + Varps.otp = ""; // L: 453 + Login.field1043 = true; // L: 454 + } + } + + return; // L: 755 + } + } while(Login.currentLoginField != 1); // L: 468 + + if (ItemComposition.field1859 == 85 && Login.Login_password.length() > 0) { // L: 469 + Login.Login_password = Login.Login_password.substring(0, Login.Login_password.length() - 1); // L: 470 + } else if (ItemComposition.field1859 == 84 || ItemComposition.field1859 == 80) { // L: 472 + Login.currentLoginField = 0; // L: 473 + if (ItemComposition.field1859 == 84) { // L: 474 + Login.Login_username = Login.Login_username.trim(); // L: 475 + if (Login.Login_username.length() == 0) { // L: 476 + class260.setLoginResponseString("", "Please enter your username/email address.", ""); // L: 477 + return; // L: 478 + } + + if (Login.Login_password.length() == 0) { // L: 480 + class260.setLoginResponseString("", "Please enter your password.", ""); // L: 481 + return; // L: 482 + } + + class260.setLoginResponseString("", "Connecting to server...", ""); // L: 484 + VarbitComposition.method2849(false); // L: 485 + class12.updateGameState(20); // L: 486 + return; // L: 487 + } + } + + if ((KeyHandler.KeyHandler_pressedKeys[82] || KeyHandler.KeyHandler_pressedKeys[87]) && ItemComposition.field1859 == 67) { // L: 490 + Clipboard var24 = Toolkit.getDefaultToolkit().getSystemClipboard(); // L: 491 + var25 = var24.getContents(class23.client); // L: 492 + var12 = 20 - Login.Login_password.length(); // L: 493 + break; + } + + char var40 = class249.field3116; // L: 535 + if ((var40 < ' ' || var40 >= 127) && (var40 <= 127 || var40 >= 160) && (var40 <= 160 || var40 > 255)) { // L: 537 + label1187: { + if (var40 != 0) { // L: 541 + char[] var26 = class301.cp1252AsciiExtension; // L: 543 + + for (int var27 = 0; var27 < var26.length; ++var27) { // L: 544 + char var14 = var26[var27]; // L: 545 + if (var40 == var14) { // L: 547 + var38 = true; // L: 548 + break label1187; // L: 549 + } + } + } + + var38 = false; // L: 555 + } + } else { + var38 = true; // L: 538 + } + + if (var38 && DevicePcmPlayerProvider.method385(class249.field3116) && Login.Login_password.length() < 20) { // L: 557 + Login.Login_password = Login.Login_password + class249.field3116; // L: 558 + } + } + } while(var12 <= 0); // L: 494 + + try { + String var13 = (String)var25.getTransferData(DataFlavor.stringFlavor); // L: 496 + int var42 = Math.min(var12, var13.length()); // L: 497 + + for (int var15 = 0; var15 < var42; ++var15) { // L: 498 + char var17 = var13.charAt(var15); // L: 500 + boolean var16; + if ((var17 < ' ' || var17 >= 127) && (var17 <= 127 || var17 >= 160) && (var17 <= 160 || var17 > 255)) { // L: 502 + label1190: { + if (var17 != 0) { // L: 506 + char[] var18 = class301.cp1252AsciiExtension; // L: 508 + + for (int var19 = 0; var19 < var18.length; ++var19) { // L: 509 + char var20 = var18[var19]; // L: 510 + if (var20 == var17) { // L: 512 + var16 = true; // L: 513 + break label1190; // L: 514 + } + } + } + + var16 = false; // L: 520 + } + } else { + var16 = true; // L: 503 + } + + if (!var16 || !DevicePcmPlayerProvider.method385(var13.charAt(var15))) { // L: 522 + Login.loginIndex = 3; // L: 523 + return; // L: 524 + } + } + + Login.Login_password = Login.Login_password + var13.substring(0, var42); // L: 527 + } catch (UnsupportedFlavorException var29) { // L: 529 + } catch (IOException var30) { // L: 530 + } + } + } else if (Login.loginIndex == 3) { // L: 565 + var34 = Login.loginBoxX + 180; // L: 566 + var8 = 276; // L: 567 + if (var23 == 1 && var32 >= var34 - 75 && var32 <= var34 + 75 && var33 >= var8 - 20 && var33 <= var8 + 20) { // L: 568 + ClanChannelMember.Login_promptCredentials(false); // L: 569 + } + + var34 = Login.loginBoxX + 180; // L: 571 + var8 = 326; // L: 572 + if (var23 == 1 && var32 >= var34 - 75 && var32 <= var34 + 75 && var33 >= var8 - 20 && var33 <= var8 + 20) { // L: 573 + class260.setLoginResponseString("Please enter your username.", "If you created your account after November", "2010, this will be the creation email address."); // L: 574 + Login.loginIndex = 5; // L: 575 + return; // L: 576 + } + } else { + int var10; + if (Login.loginIndex == 4) { // L: 579 + var34 = Login.loginBoxX + 180 - 80; // L: 580 + var8 = 321; // L: 581 + if (var23 == 1 && var32 >= var34 - 75 && var32 <= var34 + 75 && var33 >= var8 - 20 && var33 <= var8 + 20) { // L: 582 + Varps.otp.trim(); // L: 583 + if (Varps.otp.length() != 6) { // L: 584 + class260.setLoginResponseString("", "Please enter a 6-digit PIN.", ""); // L: 585 + return; // L: 586 + } + + class5.field53 = Integer.parseInt(Varps.otp); // L: 588 + Varps.otp = ""; // L: 589 + VarbitComposition.method2849(true); // L: 590 + class260.setLoginResponseString("", "Connecting to server...", ""); // L: 591 + class12.updateGameState(20); // L: 592 + return; // L: 593 + } + + if (var23 == 1 && var32 >= Login.loginBoxX + 180 - 9 && var32 <= Login.loginBoxX + 180 + 130 && var33 >= 263 && var33 <= 296) { // L: 595 + Login.field1043 = !Login.field1043; // L: 596 + } + + if (var23 == 1 && var32 >= Login.loginBoxX + 180 - 34 && var32 <= Login.loginBoxX + 34 + 180 && var33 >= 351 && var33 <= 363) { // L: 598 + Players.openURL(KitDefinition.method2705("secure", true) + "m=totp-authenticator/disableTOTPRequest", true, false); // L: 599 + } + + var34 = Login.loginBoxX + 180 + 80; // L: 601 + if (var23 == 1 && var32 >= var34 - 75 && var32 <= var34 + 75 && var33 >= var8 - 20 && var33 <= var8 + 20) { // L: 602 + Login.loginIndex = 0; // L: 603 + Login.Login_username = ""; // L: 604 + Login.Login_password = ""; // L: 605 + class5.field53 = 0; // L: 606 + Varps.otp = ""; // L: 607 + } + + while (ClanChannelMember.isKeyDown()) { // L: 609 + boolean var9 = false; // L: 610 + + for (var10 = 0; var10 < "1234567890".length(); ++var10) { // L: 611 + if (class249.field3116 == "1234567890".charAt(var10)) { // L: 612 + var9 = true; // L: 613 + break; // L: 614 + } + } + + if (ItemComposition.field1859 == 13) { // L: 617 + Login.loginIndex = 0; // L: 618 + Login.Login_username = ""; // L: 619 + Login.Login_password = ""; // L: 620 + class5.field53 = 0; // L: 621 + Varps.otp = ""; // L: 622 + } else { + if (ItemComposition.field1859 == 85 && Varps.otp.length() > 0) { // L: 625 + Varps.otp = Varps.otp.substring(0, Varps.otp.length() - 1); + } + + if (ItemComposition.field1859 == 84) { // L: 626 + Varps.otp.trim(); // L: 627 + if (Varps.otp.length() != 6) { // L: 628 + class260.setLoginResponseString("", "Please enter a 6-digit PIN.", ""); // L: 629 + return; // L: 630 + } + + class5.field53 = Integer.parseInt(Varps.otp); // L: 632 + Varps.otp = ""; // L: 633 + VarbitComposition.method2849(true); // L: 634 + class260.setLoginResponseString("", "Connecting to server...", ""); // L: 635 + class12.updateGameState(20); // L: 636 + return; // L: 637 + } + + if (var9 && Varps.otp.length() < 6) { // L: 639 + Varps.otp = Varps.otp + class249.field3116; + } + } + } + } else if (Login.loginIndex == 5) { // L: 643 + var34 = Login.loginBoxX + 180 - 80; // L: 644 + var8 = 321; // L: 645 + if (var23 == 1 && var32 >= var34 - 75 && var32 <= var34 + 75 && var33 >= var8 - 20 && var33 <= var8 + 20) { // L: 646 + ClanMate.method5712(); // L: 647 + return; // L: 648 + } + + var34 = Login.loginBoxX + 180 + 80; // L: 650 + if (var23 == 1 && var32 >= var34 - 75 && var32 <= var34 + 75 && var33 >= var8 - 20 && var33 <= var8 + 20) { // L: 651 + ClanChannelMember.Login_promptCredentials(true); // L: 652 + } + + var36 = 361; // L: 654 + if (GrandExchangeOfferOwnWorldComparator.field631 != null) { // L: 655 + var10 = GrandExchangeOfferOwnWorldComparator.field631.highX / 2; // L: 656 + if (var23 == 1 && var32 >= GrandExchangeOfferOwnWorldComparator.field631.lowX - var10 && var32 <= var10 + GrandExchangeOfferOwnWorldComparator.field631.lowX && var33 >= var36 - 15 && var33 < var36) { // L: 657 + Players.openURL(KitDefinition.method2705("secure", true) + "m=weblogin/g=oldscape/cant_log_in", true, false); // L: 658 + } + } + + while (ClanChannelMember.isKeyDown()) { // L: 661 + var38 = false; // L: 662 + + for (var11 = 0; var11 < "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789!\"£$%^&*()-_=+[{]};:'@#~,<.>/?\\| ".length(); ++var11) { // L: 663 + if (class249.field3116 == "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789!\"£$%^&*()-_=+[{]};:'@#~,<.>/?\\| ".charAt(var11)) { // L: 664 + var38 = true; // L: 665 + break; // L: 666 + } + } + + if (ItemComposition.field1859 == 13) { // L: 669 + ClanChannelMember.Login_promptCredentials(true); // L: 670 + } else { + if (ItemComposition.field1859 == 85 && Login.Login_username.length() > 0) { // L: 673 + Login.Login_username = Login.Login_username.substring(0, Login.Login_username.length() - 1); + } + + if (ItemComposition.field1859 == 84) { // L: 674 + ClanMate.method5712(); // L: 675 + return; // L: 676 + } + + if (var38 && Login.Login_username.length() < 320) { // L: 678 + Login.Login_username = Login.Login_username + class249.field3116; + } + } + } + } else if (Login.loginIndex != 6) { // L: 682 + if (Login.loginIndex == 7) { // L: 693 + var34 = Login.loginBoxX + 180 - 80; // L: 694 + var8 = 321; // L: 695 + if (var23 == 1 && var32 >= var34 - 75 && var32 <= var34 + 75 && var33 >= var8 - 20 && var33 <= var8 + 20) { // L: 696 + Players.openURL(KitDefinition.method2705("secure", true) + "m=dob/set_dob.ws", true, false); // L: 697 + class260.setLoginResponseString("", "Page has opened in a new window.", "(Please check your popup blocker.)"); // L: 698 + Login.loginIndex = 6; // L: 699 + return; // L: 700 + } + + var34 = Login.loginBoxX + 180 + 80; // L: 702 + if (var23 == 1 && var32 >= var34 - 75 && var32 <= var34 + 75 && var33 >= var8 - 20 && var33 <= var8 + 20) { // L: 703 + ClanChannelMember.Login_promptCredentials(true); // L: 704 + } + } else if (Login.loginIndex == 8) { // L: 707 + var34 = Login.loginBoxX + 180 - 80; // L: 708 + var8 = 321; // L: 709 + if (var23 == 1 && var32 >= var34 - 75 && var32 <= var34 + 75 && var33 >= var8 - 20 && var33 <= var8 + 20) { // L: 710 + Players.openURL("https://www.jagex.com/terms/privacy", true, false); // L: 711 + class260.setLoginResponseString("", "Page has opened in a new window.", "(Please check your popup blocker.)"); // L: 712 + Login.loginIndex = 6; // L: 713 + return; // L: 714 + } + + var34 = Login.loginBoxX + 180 + 80; // L: 716 + if (var23 == 1 && var32 >= var34 - 75 && var32 <= var34 + 75 && var33 >= var8 - 20 && var33 <= var8 + 20) { // L: 717 + ClanChannelMember.Login_promptCredentials(true); // L: 718 + } + } else if (Login.loginIndex == 12) { // L: 721 + String var28 = ""; // L: 722 + switch(Login.field1032) { // L: 723 + case 0: + var28 = "https://support.runescape.com/hc/en-gb/articles/115002238729-Account-Bans"; // L: 731 + break; + case 1: + var28 = "https://support.runescape.com/hc/en-gb/articles/206103939-My-account-is-locked"; // L: 725 + break; // L: 726 + default: + ClanChannelMember.Login_promptCredentials(false); // L: 728 + } + + var37 = Login.loginBoxX + 180; // L: 734 + var36 = 276; // L: 735 + if (var23 == 1 && var32 >= var37 - 75 && var32 <= var37 + 75 && var33 >= var36 - 20 && var33 <= var36 + 20) { // L: 736 + Players.openURL(var28, true, false); // L: 737 + class260.setLoginResponseString("", "Page has opened in a new window.", "(Please check your popup blocker.)"); // L: 738 + Login.loginIndex = 6; // L: 739 + return; // L: 740 + } + + var37 = Login.loginBoxX + 180; // L: 742 + var36 = 326; // L: 743 + if (var23 == 1 && var32 >= var37 - 75 && var32 <= var37 + 75 && var33 >= var36 - 20 && var33 <= var36 + 20) { // L: 744 + ClanChannelMember.Login_promptCredentials(false); // L: 745 + } + } else if (Login.loginIndex == 24) { // L: 748 + var34 = Login.loginBoxX + 180; // L: 749 + var8 = 301; // L: 750 + if (var23 == 1 && var32 >= var34 - 75 && var32 <= var34 + 75 && var33 >= var8 - 20 && var33 <= var8 + 20) { // L: 751 + ClanChannelMember.Login_promptCredentials(false); // L: 752 + } + } + } else { + while (true) { + do { + if (!ClanChannelMember.isKeyDown()) { // L: 683 + var35 = 321; // L: 688 + if (var23 == 1 && var33 >= var35 - 20 && var33 <= var35 + 20) { // L: 689 + ClanChannelMember.Login_promptCredentials(true); // L: 690 + } + + return; + } + } while(ItemComposition.field1859 != 84 && ItemComposition.field1859 != 13); // L: 684 + + ClanChannelMember.Login_promptCredentials(true); // L: 685 + } + } + } + } + } + + } } + } + } // L: 206 - Client.mouseCamClickedY = MouseHandler.MouseHandler_y; // L: 4009 - Client.mouseCamClickedX = MouseHandler.MouseHandler_x; // L: 4010 + @ObfuscatedName("s") + @ObfuscatedSignature( + descriptor = "(Ljava/lang/String;B)V", + garbageValue = "-84" + ) + static final void method3490(String var0) { + StringBuilder var10000 = (new StringBuilder()).append(var0); + Object var10001 = null; + String var1 = var10000.append(" is already on your friend list").toString(); // L: 121 + World.addGameMessage(30, "", var1); // L: 123 + } // L: 125 + + @ObfuscatedName("jv") + @ObfuscatedSignature( + descriptor = "([Lio;IIIIIIII)V", + garbageValue = "1695957245" + ) + @Export("updateInterface") + static final void updateInterface(Widget[] var0, int var1, int var2, int var3, int var4, int var5, int var6, int var7) { + for (int var8 = 0; var8 < var0.length; ++var8) { // L: 10186 + Widget var9 = var0[var8]; // L: 10187 + if (var9 != null && var9.parentId == var1 && (!var9.isIf3 || var9.type == 0 || var9.hasListener || class21.getWidgetFlags(var9) != 0 || var9 == Client.clickedWidgetParent || var9.contentType == 1338)) { // L: 10188 10189 10190 + if (var9.isIf3) { // L: 10191 + if (HitSplatDefinition.isComponentHidden(var9)) { // L: 10192 + continue; + } + } else if (var9.type == 0 && var9 != World.mousedOverWidgetIf1 && HitSplatDefinition.isComponentHidden(var9)) { // L: 10195 + continue; + } + + int var10 = var9.x + var6; // L: 10197 + int var11 = var7 + var9.y; // L: 10198 + int var12; + int var13; + int var14; + int var15; + int var17; + int var18; + if (var9.type == 2) { // L: 10203 + var12 = var2; // L: 10204 + var13 = var3; // L: 10205 + var14 = var4; // L: 10206 + var15 = var5; // L: 10207 + } else { + int var16; + if (var9.type == 9) { // L: 10209 + var16 = var10; // L: 10210 + var17 = var11; // L: 10211 + var18 = var10 + var9.width; // L: 10212 + int var19 = var11 + var9.height; // L: 10213 + if (var18 < var10) { // L: 10214 + var16 = var18; // L: 10216 + var18 = var10; // L: 10217 + } + + if (var19 < var11) { // L: 10219 + var17 = var19; // L: 10221 + var19 = var11; // L: 10222 + } + + ++var18; // L: 10224 + ++var19; // L: 10225 + var12 = var16 > var2 ? var16 : var2; // L: 10226 + var13 = var17 > var3 ? var17 : var3; // L: 10227 + var14 = var18 < var4 ? var18 : var4; // L: 10228 + var15 = var19 < var5 ? var19 : var5; // L: 10229 + } else { + var16 = var10 + var9.width; // L: 10232 + var17 = var11 + var9.height; // L: 10233 + var12 = var10 > var2 ? var10 : var2; // L: 10234 + var13 = var11 > var3 ? var11 : var3; // L: 10235 + var14 = var16 < var4 ? var16 : var4; // L: 10236 + var15 = var17 < var5 ? var17 : var5; // L: 10237 + } + } + + if (var9 == Client.clickedWidget) { // L: 10239 + Client.field822 = true; // L: 10240 + Client.field854 = var10; // L: 10241 + Client.field804 = var11; // L: 10242 + } + + boolean var32 = false; // L: 10244 + if (var9.field3032) { // L: 10245 + switch(Client.field803) { // L: 10246 + case 0: + var32 = true; // L: 10258 + case 1: + default: + break; + case 2: + if (Client.field805 == var9.id >>> 16) { // L: 10248 + var32 = true; // L: 10249 + } + break; + case 3: + if (var9.id == Client.field805) { // L: 10253 + var32 = true; // L: 10254 + } + } + } + + if (var32 || !var9.isIf3 || var12 < var14 && var13 < var15) { // L: 10262 + if (var9.isIf3) { // L: 10263 + ScriptEvent var26; + if (var9.noClickThrough) { // L: 10264 + if (MouseHandler.MouseHandler_x >= var12 && MouseHandler.MouseHandler_y >= var13 && MouseHandler.MouseHandler_x < var14 && MouseHandler.MouseHandler_y < var15) { // L: 10265 + for (var26 = (ScriptEvent)Client.scriptEvents.last(); var26 != null; var26 = (ScriptEvent)Client.scriptEvents.previous()) { // L: 10266 + if (var26.isMouseInputEvent) { // L: 10267 + var26.remove(); // L: 10268 + var26.widget.containsMouse = false; // L: 10269 + } + } + + if (Actor.widgetDragDuration == 0) { // L: 10272 + Client.clickedWidget = null; // L: 10273 + Client.clickedWidgetParent = null; // L: 10274 + } + + if (!Client.isMenuOpen) { // L: 10276 + NetSocket.addCancelMenuEntry(); // L: 10277 + } + } + } else if (var9.noScrollThrough && MouseHandler.MouseHandler_x >= var12 && MouseHandler.MouseHandler_y >= var13 && MouseHandler.MouseHandler_x < var14 && MouseHandler.MouseHandler_y < var15) { // L: 10281 10282 + for (var26 = (ScriptEvent)Client.scriptEvents.last(); var26 != null; var26 = (ScriptEvent)Client.scriptEvents.previous()) { // L: 10283 + if (var26.isMouseInputEvent && var26.widget.onScroll == var26.args) { // L: 10284 + var26.remove(); // L: 10285 + } + } + } + } + + var17 = MouseHandler.MouseHandler_x; // L: 10291 + var18 = MouseHandler.MouseHandler_y; // L: 10292 + if (MouseHandler.MouseHandler_lastButton != 0) { // L: 10293 + var17 = MouseHandler.MouseHandler_lastPressedX; // L: 10294 + var18 = MouseHandler.MouseHandler_lastPressedY; // L: 10295 + } + + boolean var33 = var17 >= var12 && var18 >= var13 && var17 < var14 && var18 < var15; // L: 10297 + if (var9.contentType == 1337) { // L: 10298 + if (!Client.isLoading && !Client.isMenuOpen && var33) { // L: 10299 + class2.addSceneMenuOptions(var17, var18, var12, var13); + } + } else if (var9.contentType == 1338) { // L: 10302 + class69.checkIfMinimapClicked(var9, var10, var11); // L: 10303 + } else { + if (var9.contentType == 1400) { // L: 10306 + class243.worldMap.onCycle(MouseHandler.MouseHandler_x, MouseHandler.MouseHandler_y, var33, var10, var11, var9.width, var9.height); // L: 10307 + } + + if (!Client.isMenuOpen && var33) { // L: 10309 + if (var9.contentType == 1400) { // L: 10310 + class243.worldMap.addElementMenuOptions(var10, var11, var9.width, var9.height, var17, var18); // L: 10311 + } else { + HealthBarUpdate.Widget_addToMenu(var9, var17 - var10, var18 - var11); // L: 10314 + } + } + + boolean var21; + int var23; + if (var32) { // L: 10317 + for (int var20 = 0; var20 < var9.field3033.length; ++var20) { // L: 10318 + var21 = false; // L: 10319 + boolean var27 = false; // L: 10320 + if (!var21 && var9.field3033[var20] != null) { // L: 10321 + for (var23 = 0; var23 < var9.field3033[var20].length; ++var23) { // L: 10322 + boolean var24 = false; // L: 10323 + if (var9.field3012 != null) { // L: 10324 + var24 = KeyHandler.KeyHandler_pressedKeys[var9.field3033[var20][var23]]; // L: 10325 + } + + if (NPC.method2258(var9.field3033[var20][var23]) || var24) { // L: 10327 + var21 = true; // L: 10328 + if (var9.field3012 != null && var9.field3012[var20] > Client.cycle) { // L: 10329 + break; + } + + byte var31 = var9.field3034[var20][var23]; // L: 10330 + if (var31 == 0 || ((var31 & 8) == 0 || !KeyHandler.KeyHandler_pressedKeys[86] && !KeyHandler.KeyHandler_pressedKeys[82] && !KeyHandler.KeyHandler_pressedKeys[81]) && ((var31 & 2) == 0 || KeyHandler.KeyHandler_pressedKeys[86]) && ((var31 & 1) == 0 || KeyHandler.KeyHandler_pressedKeys[82]) && ((var31 & 4) == 0 || KeyHandler.KeyHandler_pressedKeys[81])) { // L: 10331 10332 10333 10334 10335 + var27 = true; // L: 10337 + break; + } + } + } + } + + if (var27) { // L: 10343 + if (var20 < 10) { // L: 10344 + class376.widgetDefaultMenuAction(var20 + 1, var9.id, var9.childIndex, var9.itemId, ""); + } else if (var20 == 10) { // L: 10345 + class5.Widget_runOnTargetLeave(); // L: 10346 + LoginScreenAnimation.selectSpell(var9.id, var9.childIndex, AttackOption.Widget_unpackTargetMask(class21.getWidgetFlags(var9)), var9.itemId); // L: 10347 + Client.selectedSpellActionName = BoundaryObject.Widget_getSpellActionName(var9); // L: 10348 + if (Client.selectedSpellActionName == null) { // L: 10349 + Client.selectedSpellActionName = "null"; + } + + Client.selectedSpellName = var9.dataText + class44.colorStartTag(16777215); // L: 10350 + } + + var23 = var9.field3035[var20]; // L: 10352 + if (var9.field3012 == null) { // L: 10353 + var9.field3012 = new int[var9.field3033.length]; + } + + if (var9.field3079 == null) { // L: 10354 + var9.field3079 = new int[var9.field3033.length]; + } + + if (var23 != 0) { // L: 10355 + if (var9.field3012[var20] == 0) { // L: 10356 + var9.field3012[var20] = var23 + Client.cycle + var9.field3079[var20]; + } else { + var9.field3012[var20] = var23 + Client.cycle; // L: 10357 + } + } else { + var9.field3012[var20] = Integer.MAX_VALUE; // L: 10359 + } + } + + if (!var21 && var9.field3012 != null) { // L: 10361 10362 + var9.field3012[var20] = 0; + } + } + } + + if (var9.isIf3) { // L: 10366 + if (MouseHandler.MouseHandler_x >= var12 && MouseHandler.MouseHandler_y >= var13 && MouseHandler.MouseHandler_x < var14 && MouseHandler.MouseHandler_y < var15) { // L: 10367 + var33 = true; + } else { + var33 = false; // L: 10368 + } + + boolean var34 = false; // L: 10369 + if ((MouseHandler.MouseHandler_currentButton == 1 || !Client.mouseCam && MouseHandler.MouseHandler_currentButton == 4) && var33) { // L: 10370 + var34 = true; + } + + var21 = false; // L: 10371 + if ((MouseHandler.MouseHandler_lastButton == 1 || !Client.mouseCam && MouseHandler.MouseHandler_lastButton == 4) && MouseHandler.MouseHandler_lastPressedX >= var12 && MouseHandler.MouseHandler_lastPressedY >= var13 && MouseHandler.MouseHandler_lastPressedX < var14 && MouseHandler.MouseHandler_lastPressedY < var15) { // L: 10372 + var21 = true; + } + + if (var21) { // L: 10373 + VarcInt.clickWidget(var9, MouseHandler.MouseHandler_lastPressedX - var10, MouseHandler.MouseHandler_lastPressedY - var11); + } + + if (var9.contentType == 1400) { // L: 10374 + class243.worldMap.method6188(var17, var18, var33 & var34, var33 & var21); // L: 10375 + } + + if (Client.clickedWidget != null && var9 != Client.clickedWidget && var33 && class170.method3552(class21.getWidgetFlags(var9))) { // L: 10377 + Client.draggedOnWidget = var9; + } + + if (var9 == Client.clickedWidgetParent) { // L: 10378 + Client.field819 = true; // L: 10379 + Client.field740 = var10; // L: 10380 + Client.field821 = var11; // L: 10381 + } + + if (var9.hasListener) { // L: 10383 + ScriptEvent var22; + if (var33 && Client.mouseWheelRotation != 0 && var9.onScroll != null) { // L: 10384 + var22 = new ScriptEvent(); // L: 10385 + var22.isMouseInputEvent = true; // L: 10386 + var22.widget = var9; // L: 10387 + var22.mouseY = Client.mouseWheelRotation; // L: 10388 + var22.args = var9.onScroll; // L: 10389 + Client.scriptEvents.addFirst(var22); // L: 10390 + } + + if (Client.clickedWidget != null || Script.dragInventoryWidget != null || Client.isMenuOpen) { // L: 10392 + var21 = false; // L: 10393 + var34 = false; // L: 10394 + var33 = false; // L: 10395 + } + + if (!var9.isClicked && var21) { // L: 10397 + var9.isClicked = true; // L: 10398 + if (var9.onClick != null) { // L: 10399 + var22 = new ScriptEvent(); // L: 10400 + var22.isMouseInputEvent = true; // L: 10401 + var22.widget = var9; // L: 10402 + var22.mouseX = MouseHandler.MouseHandler_lastPressedX - var10; // L: 10403 + var22.mouseY = MouseHandler.MouseHandler_lastPressedY - var11; // L: 10404 + var22.args = var9.onClick; // L: 10405 + Client.scriptEvents.addFirst(var22); // L: 10406 + } + } + + if (var9.isClicked && var34 && var9.onClickRepeat != null) { // L: 10409 10410 + var22 = new ScriptEvent(); // L: 10411 + var22.isMouseInputEvent = true; // L: 10412 + var22.widget = var9; // L: 10413 + var22.mouseX = MouseHandler.MouseHandler_x - var10; // L: 10414 + var22.mouseY = MouseHandler.MouseHandler_y - var11; // L: 10415 + var22.args = var9.onClickRepeat; // L: 10416 + Client.scriptEvents.addFirst(var22); // L: 10417 + } + + if (var9.isClicked && !var34) { // L: 10420 + var9.isClicked = false; // L: 10421 + if (var9.onRelease != null) { // L: 10422 + var22 = new ScriptEvent(); // L: 10423 + var22.isMouseInputEvent = true; // L: 10424 + var22.widget = var9; // L: 10425 + var22.mouseX = MouseHandler.MouseHandler_x - var10; // L: 10426 + var22.mouseY = MouseHandler.MouseHandler_y - var11; // L: 10427 + var22.args = var9.onRelease; // L: 10428 + Client.field846.addFirst(var22); // L: 10429 + } + } + + if (var34 && var9.onHold != null) { // L: 10432 10433 + var22 = new ScriptEvent(); // L: 10434 + var22.isMouseInputEvent = true; // L: 10435 + var22.widget = var9; // L: 10436 + var22.mouseX = MouseHandler.MouseHandler_x - var10; // L: 10437 + var22.mouseY = MouseHandler.MouseHandler_y - var11; // L: 10438 + var22.args = var9.onHold; // L: 10439 + Client.scriptEvents.addFirst(var22); // L: 10440 + } + + if (!var9.containsMouse && var33) { // L: 10443 + var9.containsMouse = true; // L: 10444 + if (var9.onMouseOver != null) { // L: 10445 + var22 = new ScriptEvent(); // L: 10446 + var22.isMouseInputEvent = true; // L: 10447 + var22.widget = var9; // L: 10448 + var22.mouseX = MouseHandler.MouseHandler_x - var10; // L: 10449 + var22.mouseY = MouseHandler.MouseHandler_y - var11; // L: 10450 + var22.args = var9.onMouseOver; // L: 10451 + Client.scriptEvents.addFirst(var22); // L: 10452 + } + } + + if (var9.containsMouse && var33 && var9.onMouseRepeat != null) { // L: 10455 10456 + var22 = new ScriptEvent(); // L: 10457 + var22.isMouseInputEvent = true; // L: 10458 + var22.widget = var9; // L: 10459 + var22.mouseX = MouseHandler.MouseHandler_x - var10; // L: 10460 + var22.mouseY = MouseHandler.MouseHandler_y - var11; // L: 10461 + var22.args = var9.onMouseRepeat; // L: 10462 + Client.scriptEvents.addFirst(var22); // L: 10463 + } + + if (var9.containsMouse && !var33) { // L: 10466 + var9.containsMouse = false; // L: 10467 + if (var9.onMouseLeave != null) { // L: 10468 + var22 = new ScriptEvent(); // L: 10469 + var22.isMouseInputEvent = true; // L: 10470 + var22.widget = var9; // L: 10471 + var22.mouseX = MouseHandler.MouseHandler_x - var10; // L: 10472 + var22.mouseY = MouseHandler.MouseHandler_y - var11; // L: 10473 + var22.args = var9.onMouseLeave; // L: 10474 + Client.field846.addFirst(var22); // L: 10475 + } + } + + if (var9.onTimer != null) { // L: 10478 + var22 = new ScriptEvent(); // L: 10479 + var22.widget = var9; // L: 10480 + var22.args = var9.onTimer; // L: 10481 + Client.field652.addFirst(var22); // L: 10482 + } + + ScriptEvent var25; + int var35; + int var36; + if (var9.onVarTransmit != null && Client.changedVarpCount > var9.field2990) { // L: 10484 + if (var9.varTransmitTriggers != null && Client.changedVarpCount - var9.field2990 <= 32) { // L: 10485 + label789: + for (var36 = var9.field2990; var36 < Client.changedVarpCount; ++var36) { // L: 10492 + var23 = Client.changedVarps[var36 & 31]; // L: 10493 + + for (var35 = 0; var35 < var9.varTransmitTriggers.length; ++var35) { // L: 10494 + if (var23 == var9.varTransmitTriggers[var35]) { // L: 10495 + var25 = new ScriptEvent(); // L: 10496 + var25.widget = var9; // L: 10497 + var25.args = var9.onVarTransmit; // L: 10498 + Client.scriptEvents.addFirst(var25); // L: 10499 + break label789; // L: 10500 + } + } + } + } else { + var22 = new ScriptEvent(); // L: 10486 + var22.widget = var9; // L: 10487 + var22.args = var9.onVarTransmit; // L: 10488 + Client.scriptEvents.addFirst(var22); // L: 10489 + } + + var9.field2990 = Client.changedVarpCount; // L: 10505 + } + + if (var9.onInvTransmit != null && Client.field830 > var9.field3095) { // L: 10507 + if (var9.invTransmitTriggers != null && Client.field830 - var9.field3095 <= 32) { // L: 10508 + label765: + for (var36 = var9.field3095; var36 < Client.field830; ++var36) { // L: 10515 + var23 = Client.changedItemContainers[var36 & 31]; // L: 10516 + + for (var35 = 0; var35 < var9.invTransmitTriggers.length; ++var35) { // L: 10517 + if (var23 == var9.invTransmitTriggers[var35]) { // L: 10518 + var25 = new ScriptEvent(); // L: 10519 + var25.widget = var9; // L: 10520 + var25.args = var9.onInvTransmit; // L: 10521 + Client.scriptEvents.addFirst(var25); // L: 10522 + break label765; // L: 10523 + } + } + } + } else { + var22 = new ScriptEvent(); // L: 10509 + var22.widget = var9; // L: 10510 + var22.args = var9.onInvTransmit; // L: 10511 + Client.scriptEvents.addFirst(var22); // L: 10512 + } + + var9.field3095 = Client.field830; // L: 10528 + } + + if (var9.onStatTransmit != null && Client.changedSkillsCount > var9.field3096) { // L: 10530 + if (var9.statTransmitTriggers != null && Client.changedSkillsCount - var9.field3096 <= 32) { // L: 10531 + label741: + for (var36 = var9.field3096; var36 < Client.changedSkillsCount; ++var36) { // L: 10538 + var23 = Client.changedSkills[var36 & 31]; // L: 10539 + + for (var35 = 0; var35 < var9.statTransmitTriggers.length; ++var35) { // L: 10540 + if (var23 == var9.statTransmitTriggers[var35]) { // L: 10541 + var25 = new ScriptEvent(); // L: 10542 + var25.widget = var9; // L: 10543 + var25.args = var9.onStatTransmit; // L: 10544 + Client.scriptEvents.addFirst(var25); // L: 10545 + break label741; // L: 10546 + } + } + } + } else { + var22 = new ScriptEvent(); // L: 10532 + var22.widget = var9; // L: 10533 + var22.args = var9.onStatTransmit; // L: 10534 + Client.scriptEvents.addFirst(var22); // L: 10535 + } + + var9.field3096 = Client.changedSkillsCount; // L: 10551 + } + + if (Client.chatCycle > var9.field3104 && var9.onChatTransmit != null) { // L: 10553 + var22 = new ScriptEvent(); // L: 10554 + var22.widget = var9; // L: 10555 + var22.args = var9.onChatTransmit; // L: 10556 + Client.scriptEvents.addFirst(var22); // L: 10557 + } + + if (Client.field836 > var9.field3104 && var9.onFriendTransmit != null) { // L: 10559 + var22 = new ScriptEvent(); // L: 10560 + var22.widget = var9; // L: 10561 + var22.args = var9.onFriendTransmit; // L: 10562 + Client.scriptEvents.addFirst(var22); // L: 10563 + } + + if (Client.field844 > var9.field3104 && var9.onClanTransmit != null) { // L: 10565 + var22 = new ScriptEvent(); // L: 10566 + var22.widget = var9; // L: 10567 + var22.args = var9.onClanTransmit; // L: 10568 + Client.scriptEvents.addFirst(var22); // L: 10569 + } + + if (Client.field654 > var9.field3104 && var9.field3043 != null) { // L: 10571 + var22 = new ScriptEvent(); // L: 10572 + var22.widget = var9; // L: 10573 + var22.args = var9.field3043; // L: 10574 + Client.scriptEvents.addFirst(var22); // L: 10575 + } + + if (Client.field839 > var9.field3104 && var9.field3071 != null) { // L: 10577 + var22 = new ScriptEvent(); // L: 10578 + var22.widget = var9; // L: 10579 + var22.args = var9.field3071; // L: 10580 + Client.scriptEvents.addFirst(var22); // L: 10581 + } + + if (Client.field840 > var9.field3104 && var9.onStockTransmit != null) { // L: 10583 + var22 = new ScriptEvent(); // L: 10584 + var22.widget = var9; // L: 10585 + var22.args = var9.onStockTransmit; // L: 10586 + Client.scriptEvents.addFirst(var22); // L: 10587 + } + + if (Client.field748 > var9.field3104 && var9.field3077 != null) { // L: 10589 + var22 = new ScriptEvent(); // L: 10590 + var22.widget = var9; // L: 10591 + var22.args = var9.field3077; // L: 10592 + Client.scriptEvents.addFirst(var22); // L: 10593 + } + + if (Client.field659 > var9.field3104 && var9.onMiscTransmit != null) { // L: 10595 + var22 = new ScriptEvent(); // L: 10596 + var22.widget = var9; // L: 10597 + var22.args = var9.onMiscTransmit; // L: 10598 + Client.scriptEvents.addFirst(var22); // L: 10599 + } + + var9.field3104 = Client.cycleCntr; // L: 10601 + if (var9.onKey != null) { // L: 10602 + for (var36 = 0; var36 < Client.field806; ++var36) { // L: 10603 + ScriptEvent var30 = new ScriptEvent(); // L: 10604 + var30.widget = var9; // L: 10605 + var30.keyTyped = Client.field868[var36]; // L: 10606 + var30.keyPressed = Client.field867[var36]; // L: 10607 + var30.args = var9.onKey; // L: 10608 + Client.scriptEvents.addFirst(var30); // L: 10609 + } + } + } + } + + if (!var9.isIf3) { // L: 10614 + if (Client.clickedWidget != null || Script.dragInventoryWidget != null || Client.isMenuOpen) { // L: 10615 + continue; + } + + if ((var9.mouseOverRedirect >= 0 || var9.mouseOverColor != 0) && MouseHandler.MouseHandler_x >= var12 && MouseHandler.MouseHandler_y >= var13 && MouseHandler.MouseHandler_x < var14 && MouseHandler.MouseHandler_y < var15) { // L: 10616 + if (var9.mouseOverRedirect >= 0) { // L: 10617 + World.mousedOverWidgetIf1 = var0[var9.mouseOverRedirect]; + } else { + World.mousedOverWidgetIf1 = var9; // L: 10618 + } + } + + if (var9.type == 8 && MouseHandler.MouseHandler_x >= var12 && MouseHandler.MouseHandler_y >= var13 && MouseHandler.MouseHandler_x < var14 && MouseHandler.MouseHandler_y < var15) { // L: 10620 + ReflectionCheck.field609 = var9; // L: 10621 + } + + if (var9.scrollHeight > var9.height) { // L: 10623 + class313.method5617(var9, var10 + var9.width, var11, var9.height, var9.scrollHeight, MouseHandler.MouseHandler_x, MouseHandler.MouseHandler_y); + } + } + + if (var9.type == 0) { // L: 10625 + updateInterface(var0, var9.id, var12, var13, var14, var15, var10 - var9.scrollX, var11 - var9.scrollY); // L: 10626 + if (var9.children != null) { // L: 10627 + updateInterface(var9.children, var9.id, var12, var13, var14, var15, var10 - var9.scrollX, var11 - var9.scrollY); + } + + InterfaceParent var28 = (InterfaceParent)Client.interfaceParents.get((long)var9.id); // L: 10628 + if (var28 != null) { // L: 10629 + if (var28.type == 0 && MouseHandler.MouseHandler_x >= var12 && MouseHandler.MouseHandler_y >= var13 && MouseHandler.MouseHandler_x < var14 && MouseHandler.MouseHandler_y < var15 && !Client.isMenuOpen) { // L: 10630 + for (ScriptEvent var29 = (ScriptEvent)Client.scriptEvents.last(); var29 != null; var29 = (ScriptEvent)Client.scriptEvents.previous()) { // L: 10631 + if (var29.isMouseInputEvent) { // L: 10632 + var29.remove(); // L: 10633 + var29.widget.containsMouse = false; // L: 10634 + } + } + + if (Actor.widgetDragDuration == 0) { // L: 10637 + Client.clickedWidget = null; // L: 10638 + Client.clickedWidgetParent = null; // L: 10639 + } + + if (!Client.isMenuOpen) { // L: 10641 + NetSocket.addCancelMenuEntry(); // L: 10642 + } + } + + class32.updateRootInterface(var28.group, var12, var13, var14, var15, var10, var11); // L: 10645 + } + } + } + } + } } - Client.camAngleY = Client.camAngleDY / 2 + Client.camAngleY & 2047; // L: 4012 - Client.camAngleX += Client.camAngleDX / 2; // L: 4013 - if (Client.camAngleX < 128) { // L: 4014 - Client.camAngleX = 128; - } - - if (Client.camAngleX > 383) { // L: 4015 - Client.camAngleX = 383; - } - - } // L: 4016 + } // L: 10649 } diff --git a/runescape-client/src/main/java/WorldMapRectangle.java b/runescape-client/src/main/java/WorldMapRectangle.java index 7f780562ac..cde93249bf 100644 --- a/runescape-client/src/main/java/WorldMapRectangle.java +++ b/runescape-client/src/main/java/WorldMapRectangle.java @@ -4,85 +4,43 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("fq") +@ObfuscatedName("fu") @Implements("WorldMapRectangle") public final class WorldMapRectangle { - @ObfuscatedName("i") - @ObfuscatedSignature( - descriptor = "Lee;" - ) - @Export("clock") - protected static Clock clock; - @ObfuscatedName("h") + @ObfuscatedName("v") @ObfuscatedGetter( - intValue = -127047771 + intValue = 1091176811 ) @Export("width") int width; - @ObfuscatedName("c") + @ObfuscatedName("n") @ObfuscatedGetter( - intValue = -1046559811 + intValue = 946840675 ) @Export("height") int height; - @ObfuscatedName("o") + @ObfuscatedName("f") @ObfuscatedGetter( - intValue = 1278151187 + intValue = 1906627729 ) @Export("x") int x; - @ObfuscatedName("g") + @ObfuscatedName("y") @ObfuscatedGetter( - intValue = -234126027 + intValue = -1404335247 ) @Export("y") int y; // $FF: synthetic field @ObfuscatedSignature( - descriptor = "Lfs;" + descriptor = "Lff;" ) final WorldMapManager this$0; @ObfuscatedSignature( - descriptor = "(Lfs;)V" + descriptor = "(Lff;)V" ) WorldMapRectangle(WorldMapManager var1) { this.this$0 = var1; // L: 305 } - - @ObfuscatedName("g") - @ObfuscatedSignature( - descriptor = "(II)Z", - garbageValue = "847610173" - ) - public static boolean method3569(int var0) { - return var0 >= WorldMapDecorationType.field3159.id && var0 <= WorldMapDecorationType.field3148.id || var0 == WorldMapDecorationType.field3162.id; // L: 42 - } - - @ObfuscatedName("jg") - @ObfuscatedSignature( - descriptor = "(IIIIIB)V", - garbageValue = "-116" - ) - @Export("drawScrollBar") - static final void drawScrollBar(int var0, int var1, int var2, int var3, int var4) { - GrandExchangeOfferTotalQuantityComparator.scrollBarSprites[0].drawAt(var0, var1); // L: 10138 - GrandExchangeOfferTotalQuantityComparator.scrollBarSprites[1].drawAt(var0, var3 + var1 - 16); // L: 10139 - Rasterizer2D.Rasterizer2D_fillRectangle(var0, var1 + 16, 16, var3 - 32, Client.field679); // L: 10140 - int var5 = var3 * (var3 - 32) / var4; // L: 10141 - if (var5 < 8) { // L: 10142 - var5 = 8; - } - - int var6 = (var3 - 32 - var5) * var2 / (var4 - var3); // L: 10143 - Rasterizer2D.Rasterizer2D_fillRectangle(var0, var6 + var1 + 16, 16, var5, Client.field680); // L: 10144 - Rasterizer2D.Rasterizer2D_drawVerticalLine(var0, var6 + var1 + 16, var5, Client.field658); // L: 10145 - Rasterizer2D.Rasterizer2D_drawVerticalLine(var0 + 1, var6 + var1 + 16, var5, Client.field658); // L: 10146 - Rasterizer2D.Rasterizer2D_drawHorizontalLine(var0, var6 + var1 + 16, 16, Client.field658); // L: 10147 - Rasterizer2D.Rasterizer2D_drawHorizontalLine(var0, var6 + var1 + 17, 16, Client.field658); // L: 10148 - Rasterizer2D.Rasterizer2D_drawVerticalLine(var0 + 15, var6 + var1 + 16, var5, Client.field681); // L: 10149 - Rasterizer2D.Rasterizer2D_drawVerticalLine(var0 + 14, var6 + var1 + 17, var5 - 1, Client.field681); // L: 10150 - Rasterizer2D.Rasterizer2D_drawHorizontalLine(var0, var6 + var5 + var1 + 15, 16, Client.field681); // L: 10151 - Rasterizer2D.Rasterizer2D_drawHorizontalLine(var0 + 1, var6 + var5 + var1 + 14, 15, Client.field681); // L: 10152 - } // L: 10153 } diff --git a/runescape-client/src/main/java/WorldMapRegion.java b/runescape-client/src/main/java/WorldMapRegion.java index b8e82ba802..8e54b5477a 100644 --- a/runescape-client/src/main/java/WorldMapRegion.java +++ b/runescape-client/src/main/java/WorldMapRegion.java @@ -10,153 +10,175 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("fm") +@ObfuscatedName("fq") @Implements("WorldMapRegion") public class WorldMapRegion { - @ObfuscatedName("l") + @ObfuscatedName("qf") @ObfuscatedSignature( - descriptor = "Lhl;" + descriptor = "Llt;" + ) + @Export("friendsChat") + static FriendsChat friendsChat; + @ObfuscatedName("p") + @ObfuscatedSignature( + descriptor = "Lhn;" ) @Export("WorldMapRegion_cachedSprites") public static DemotingHashTable WorldMapRegion_cachedSprites; - @ObfuscatedName("gj") - @ObfuscatedSignature( - descriptor = "Low;" - ) - @Export("compass") - static SpritePixels compass; - @ObfuscatedName("z") + @ObfuscatedName("j") @ObfuscatedGetter( - intValue = 450419663 + intValue = -1618950683 ) @Export("regionX") int regionX; - @ObfuscatedName("t") + @ObfuscatedName("r") @ObfuscatedGetter( - intValue = 1693190573 + intValue = 2001174097 ) @Export("regionY") int regionY; - @ObfuscatedName("v") + @ObfuscatedName("b") @ObfuscatedSignature( - descriptor = "Lfh;" + descriptor = "Lft;" ) @Export("worldMapData_0") WorldMapData_0 worldMapData_0; - @ObfuscatedName("b") + @ObfuscatedName("d") @Export("worldMapData1List") LinkedList worldMapData1List; - @ObfuscatedName("q") + @ObfuscatedName("s") @ObfuscatedGetter( - intValue = -384570115 + intValue = -747005213 ) @Export("backgroundColor") int backgroundColor; - @ObfuscatedName("i") + @ObfuscatedName("u") @ObfuscatedGetter( - intValue = 1826350773 + intValue = 1359138405 ) @Export("pixelsPerTile") int pixelsPerTile; - @ObfuscatedName("x") + @ObfuscatedName("l") @Export("icon0List") List icon0List; - @ObfuscatedName("k") + @ObfuscatedName("o") @Export("iconMap") HashMap iconMap; - @ObfuscatedName("r") + @ObfuscatedName("c") @Export("fonts") final HashMap fonts; static { - WorldMapRegion_cachedSprites = new DemotingHashTable(37748736, 256); // L: 26 + WorldMapRegion_cachedSprites = new DemotingHashTable(37748736, 256); } WorldMapRegion(int var1, int var2, int var3, HashMap var4) { - this.regionX = var1; - this.regionY = var2; - this.worldMapData1List = new LinkedList(); - this.icon0List = new LinkedList(); // L: 51 - this.iconMap = new HashMap(); // L: 52 - this.backgroundColor = var3 | -16777216; - this.fonts = var4; - } + this.regionX = var1; // L: 47 + this.regionY = var2; // L: 48 + this.worldMapData1List = new LinkedList(); // L: 49 + this.icon0List = new LinkedList(); // L: 50 + this.iconMap = new HashMap(); // L: 51 + this.backgroundColor = var3 | -16777216; // L: 52 + this.fonts = var4; // L: 53 + } // L: 54 - @ObfuscatedName("c") + @ObfuscatedName("n") @ObfuscatedSignature( descriptor = "(IIII)V", - garbageValue = "-923028723" + garbageValue = "125158399" ) - void method3271(int var1, int var2, int var3) { - int var5 = this.regionX; // L: 59 - int var6 = this.regionY; - int var7 = this.pixelsPerTile; - DemotingHashTable var8 = WorldMapRegion_cachedSprites; - long var9 = (long)(var7 << 16 | var5 << 8 | var6); - SpritePixels var4 = (SpritePixels)var8.get(var9); // L: 68 + void method3328(int var1, int var2, int var3) { + int var5 = this.regionX; // L: 58 + int var6 = this.regionY; // L: 59 + int var7 = this.pixelsPerTile; // L: 60 + DemotingHashTable var8 = WorldMapRegion_cachedSprites; // L: 62 + long var9 = (long)(var7 << 16 | var5 << 8 | var6); // L: 65 + SpritePixels var4 = (SpritePixels)var8.get(var9); // L: 67 if (var4 != null) { - if (var3 == this.pixelsPerTile * 64) { // L: 72 - var4.drawAt(var1, var2); // L: 73 + if (var3 == this.pixelsPerTile * 64) { // L: 71 + var4.drawAt(var1, var2); // L: 72 } else { - var4.drawScaledWorldmap(var1, var2, var3, var3); // L: 76 + var4.drawScaledWorldmap(var1, var2, var3, var3); // L: 75 } } - } // L: 71 78 + } // L: 70 77 - @ObfuscatedName("o") + @ObfuscatedName("f") @ObfuscatedSignature( - descriptor = "(Lfh;Ljava/util/List;I)V", - garbageValue = "-1532393491" + descriptor = "(Lft;Ljava/util/List;I)V", + garbageValue = "-1081431828" ) @Export("initWorldMapData0") void initWorldMapData0(WorldMapData_0 var1, List var2) { - this.iconMap.clear(); // L: 81 - this.worldMapData_0 = var1; // L: 82 - this.addAllToIconList(var2); // L: 83 - } // L: 84 + this.iconMap.clear(); // L: 80 + this.worldMapData_0 = var1; // L: 81 + this.addAllToIconList(var2); // L: 82 + } // L: 83 - @ObfuscatedName("g") + @ObfuscatedName("y") @ObfuscatedSignature( - descriptor = "(Ljava/util/HashSet;Ljava/util/List;B)V", - garbageValue = "55" + descriptor = "(Ljava/util/HashSet;Ljava/util/List;I)V", + garbageValue = "-1864841845" ) @Export("initWorldMapData1") void initWorldMapData1(HashSet var1, List var2) { - this.iconMap.clear(); // L: 87 - Iterator var3 = var1.iterator(); // L: 88 + this.iconMap.clear(); // L: 86 + Iterator var3 = var1.iterator(); // L: 87 while (var3.hasNext()) { - WorldMapData_1 var4 = (WorldMapData_1)var3.next(); // L: 89 - if (var4.getRegionX() == this.regionX && var4.getRegionY() == this.regionY) { // L: 91 - this.worldMapData1List.add(var4); // L: 92 + WorldMapData_1 var4 = (WorldMapData_1)var3.next(); // L: 88 + if (var4.getRegionX() == this.regionX && var4.getRegionY() == this.regionY) { // L: 90 + this.worldMapData1List.add(var4); // L: 91 } } - this.addAllToIconList(var2); // L: 96 - } // L: 97 + this.addAllToIconList(var2); // L: 95 + } // L: 96 - @ObfuscatedName("l") + @ObfuscatedName("p") @ObfuscatedSignature( - descriptor = "(IIIILfw;B)V", - garbageValue = "-114" + descriptor = "(IIIILfm;I)V", + garbageValue = "-1919437807" ) @Export("getIconsForTiles") void getIconsForTiles(int var1, int var2, int var3, int var4, AbstractWorldMapData var5) { - for (int var6 = var1; var6 < var3 + var1; ++var6) { // L: 100 - label49: - for (int var7 = var2; var7 < var2 + var4; ++var7) { // L: 101 - for (int var8 = 0; var8 < var5.planes; ++var8) { // L: 102 - WorldMapDecoration[] var9 = var5.decorations[var8][var6][var7]; // L: 103 - if (var9 != null && var9.length != 0) { // L: 104 - WorldMapDecoration[] var10 = var9; // L: 108 + for (int var6 = var1; var6 < var3 + var1; ++var6) { // L: 99 + label76: + for (int var7 = var2; var7 < var2 + var4; ++var7) { // L: 100 + for (int var8 = 0; var8 < var5.planes; ++var8) { // L: 101 + WorldMapDecoration[] var9 = var5.decorations[var8][var6][var7]; // L: 102 + if (var9 != null && var9.length != 0) { // L: 103 + WorldMapDecoration[] var10 = var9; // L: 107 - for (int var11 = 0; var11 < var10.length; ++var11) { // L: 109 - WorldMapDecoration var12 = var10[var11]; // L: 110 - ObjectComposition var13 = AttackOption.getObjectDefinition(var12.objectDefinitionId); // L: 112 - if (class13.method204(var13)) { // L: 113 - this.getIcon(var13, var8, var6, var7, var5); // L: 116 - continue label49; // L: 117 + for (int var11 = 0; var11 < var10.length; ++var11) { // L: 108 + ObjectComposition var13; + boolean var14; + label67: { + WorldMapDecoration var12 = var10[var11]; // L: 109 + var13 = class23.getObjectDefinition(var12.objectDefinitionId); // L: 111 + if (var13.transforms != null) { // L: 114 + int[] var15 = var13.transforms; // L: 116 + + for (int var16 = 0; var16 < var15.length; ++var16) { // L: 117 + int var17 = var15[var16]; // L: 118 + ObjectComposition var18 = class23.getObjectDefinition(var17); // L: 120 + if (var18.mapIconId != -1) { // L: 121 + var14 = true; // L: 122 + break label67; + } + } + } else if (var13.mapIconId != -1) { // L: 129 + var14 = true; // L: 130 + break label67; // L: 131 + } + + var14 = false; // L: 133 + } + + if (var14) { // L: 135 + this.getIcon(var13, var8, var6, var7, var5); // L: 138 + continue label76; // L: 139 } } } @@ -164,427 +186,504 @@ public class WorldMapRegion { } } - } // L: 124 + } // L: 146 - @ObfuscatedName("z") + @ObfuscatedName("j") @ObfuscatedSignature( - descriptor = "(Lem;IIILfw;B)V", - garbageValue = "1" + descriptor = "(Leg;IIILfm;I)V", + garbageValue = "1079929853" ) @Export("getIcon") void getIcon(ObjectComposition var1, int var2, int var3, int var4, AbstractWorldMapData var5) { - Coord var6 = new Coord(var2, var3 + this.regionX * 64, this.regionY * 64 + var4); // L: 127 - Coord var7 = null; // L: 128 - if (this.worldMapData_0 != null) { // L: 129 - var7 = new Coord(this.worldMapData_0.minPlane + var2, var3 + this.worldMapData_0.regionXLow * 64, var4 + this.worldMapData_0.regionYLow * 64); // L: 130 + Coord var6 = new Coord(var2, var3 + this.regionX * 64, this.regionY * 64 + var4); // L: 149 + Coord var7 = null; // L: 150 + if (this.worldMapData_0 != null) { // L: 151 + var7 = new Coord(this.worldMapData_0.minPlane + var2, var3 + this.worldMapData_0.regionXLow * 64, var4 + this.worldMapData_0.regionYLow * 64); // L: 152 } else { - WorldMapData_1 var8 = (WorldMapData_1)var5; // L: 133 - var7 = new Coord(var2 + var8.minPlane, var8.regionXLow * 64 + var3 + var8.getChunkXLow() * 8, var8.regionYLow * 64 + var4 + var8.getChunkYLow() * 8); // L: 134 + WorldMapData_1 var8 = (WorldMapData_1)var5; // L: 155 + var7 = new Coord(var2 + var8.minPlane, var8.regionXLow * 64 + var3 + var8.getChunkXLow() * 8, var4 + var8.regionYLow * 64 + var8.getChunkYLow() * 8); // L: 156 } WorldMapElement var9; Object var10; - if (var1.transforms != null) { // L: 137 - var10 = new WorldMapIcon_1(var7, var6, var1.id, this); // L: 138 + if (var1.transforms != null) { // L: 159 + var10 = new WorldMapIcon_1(var7, var6, var1.id, this); // L: 160 } else { - var9 = WorldMapAreaData.WorldMapElement_get(var1.mapIconId); // L: 141 - var10 = new WorldMapIcon_0(var7, var6, var9.objectId, this.createMapLabel(var9)); // L: 142 + var9 = class6.WorldMapElement_get(var1.mapIconId); // L: 163 + var10 = new WorldMapIcon_0(var7, var6, var9.objectId, this.createMapLabel(var9)); // L: 164 } - var9 = WorldMapAreaData.WorldMapElement_get(((AbstractWorldMapIcon)var10).getElement()); // L: 144 - if (var9.field1557) { // L: 145 - this.iconMap.put(new Coord(0, var3, var4), var10); // L: 146 + var9 = class6.WorldMapElement_get(((AbstractWorldMapIcon)var10).getElement()); // L: 166 + if (var9.field1560) { // L: 167 + this.iconMap.put(new Coord(0, var3, var4), var10); // L: 168 } - } // L: 148 - - @ObfuscatedName("t") - @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "-1777749852" - ) - @Export("initWorldMapIcon1s") - void initWorldMapIcon1s() { - Iterator var1 = this.iconMap.values().iterator(); // L: 151 - - while (var1.hasNext()) { - AbstractWorldMapIcon var2 = (AbstractWorldMapIcon)var1.next(); // L: 152 - if (var2 instanceof WorldMapIcon_1) { // L: 154 - ((WorldMapIcon_1)var2).init(); // L: 155 - } - } - - } // L: 159 - - @ObfuscatedName("v") - @ObfuscatedSignature( - descriptor = "(Ljava/util/List;I)V", - garbageValue = "1899161773" - ) - @Export("addAllToIconList") - void addAllToIconList(List var1) { - Iterator var2 = var1.iterator(); // L: 162 - - while (var2.hasNext()) { - WorldMapIcon_0 var3 = (WorldMapIcon_0)var2.next(); // L: 163 - if (WorldMapAreaData.WorldMapElement_get(var3.element).field1557 && var3.coord2.x >> 6 == this.regionX && var3.coord2.y >> 6 == this.regionY) { // L: 165 168 - WorldMapIcon_0 var4 = new WorldMapIcon_0(var3.coord2, var3.coord2, var3.element, this.method3283(var3.element)); // L: 169 - this.icon0List.add(var4); // L: 170 - } - } - - } // L: 174 - - @ObfuscatedName("b") - @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "-1381206848" - ) - void method3361() { - if (this.worldMapData_0 != null) { // L: 177 - this.worldMapData_0.reset(); // L: 178 - } else { - Iterator var1 = this.worldMapData1List.iterator(); // L: 181 - - while (var1.hasNext()) { - WorldMapData_1 var2 = (WorldMapData_1)var1.next(); // L: 182 - var2.reset(); // L: 184 - } - } - - } // L: 188 - - @ObfuscatedName("q") - @ObfuscatedSignature( - descriptor = "(Ljp;I)Z", - garbageValue = "1351055595" - ) - @Export("loadGeography") - boolean loadGeography(AbstractArchive var1) { - this.iconMap.clear(); // L: 191 - if (this.worldMapData_0 != null) { // L: 192 - this.worldMapData_0.loadGeography(var1); // L: 193 - if (this.worldMapData_0.isFullyLoaded()) { // L: 194 - this.getIconsForTiles(0, 0, 64, 64, this.worldMapData_0); // L: 195 - return true; // L: 196 - } else { - return false; // L: 198 - } - } else { - boolean var2 = true; // L: 201 - - Iterator var3; - WorldMapData_1 var4; - for (var3 = this.worldMapData1List.iterator(); var3.hasNext(); var2 &= var4.isFullyLoaded()) { // L: 202 206 - var4 = (WorldMapData_1)var3.next(); // L: 203 - var4.loadGeography(var1); // L: 205 - } - - if (var2) { // L: 209 - var3 = this.worldMapData1List.iterator(); // L: 210 - - while (var3.hasNext()) { - var4 = (WorldMapData_1)var3.next(); // L: 211 - this.getIconsForTiles(var4.getChunkX() * 8, var4.getChunkY() * 8, 8, 8, var4); // L: 213 - } - } - - return var2; // L: 217 - } - } - - @ObfuscatedName("i") - @ObfuscatedSignature( - descriptor = "(ILgp;[Lof;Ljp;Ljp;I)V", - garbageValue = "-1222887351" - ) - @Export("drawTile") - void drawTile(int var1, WorldMapScaleHandler var2, IndexedSprite[] var3, AbstractArchive var4, AbstractArchive var5) { - this.pixelsPerTile = var1; // L: 222 - if (this.worldMapData_0 != null || !this.worldMapData1List.isEmpty()) { // L: 223 - int var7 = this.regionX; // L: 227 - int var8 = this.regionY; // L: 228 - DemotingHashTable var9 = WorldMapRegion_cachedSprites; // L: 230 - long var10 = (long)(var1 << 16 | var7 << 8 | var8); // L: 233 - SpritePixels var6 = (SpritePixels)var9.get(var10); // L: 235 - if (var6 == null) { // L: 237 - boolean var14 = true; // L: 240 - var14 &= this.loadGeography(var4); // L: 241 - int var11; - if (this.worldMapData_0 != null) { // L: 244 - var11 = this.worldMapData_0.groupId; // L: 245 - } else { - var11 = ((AbstractWorldMapData)this.worldMapData1List.getFirst()).groupId; // L: 248 - } - - var14 &= var5.tryLoadGroup(var11); // L: 250 - if (var14) { // L: 251 - byte[] var15 = var5.takeFileFlat(var11); // L: 252 - WorldMapSprite var12 = WorldMapSectionType.method3540(var15); // L: 253 - SpritePixels var13 = new SpritePixels(this.pixelsPerTile * 64, this.pixelsPerTile * 64); // L: 254 - var13.setRaster(); // L: 255 - if (this.worldMapData_0 != null) { // L: 256 - this.method3284(var2, var3, var12); // L: 257 - } else { - this.method3285(var2, var3, var12); // L: 260 - } - - FloorOverlayDefinition.method3052(var13, this.regionX, this.regionY, this.pixelsPerTile); // L: 262 - this.method3361(); // L: 263 - } - } - } - } // L: 224 238 264 - - @ObfuscatedName("x") - @ObfuscatedSignature( - descriptor = "(IIILjava/util/HashSet;I)V", - garbageValue = "2047114965" - ) - void method3282(int var1, int var2, int var3, HashSet var4) { - if (var4 == null) { // L: 267 - var4 = new HashSet(); // L: 268 - } - - this.drawNonLinkMapIcons(var1, var2, var4, var3); // L: 270 - this.drawMapLinks(var1, var2, var4, var3); // L: 271 - } // L: 272 - - @ObfuscatedName("k") - @ObfuscatedSignature( - descriptor = "(Ljava/util/HashSet;III)V", - garbageValue = "1306417176" - ) - @Export("flashElements") - void flashElements(HashSet var1, int var2, int var3) { - Iterator var4 = this.iconMap.values().iterator(); // L: 275 - - while (var4.hasNext()) { - AbstractWorldMapIcon var5 = (AbstractWorldMapIcon)var4.next(); // L: 276 - if (var5.hasValidElement()) { // L: 278 - int var6 = var5.getElement(); // L: 279 - if (var1.contains(var6)) { // L: 280 - WorldMapElement var7 = WorldMapAreaData.WorldMapElement_get(var6); // L: 281 - this.drawBackgroundCircle(var7, var5.screenX, var5.screenY, var2, var3); // L: 282 - } - } - } - - this.method3293(var1, var2, var3); // L: 286 - } // L: 287 + } // L: 170 @ObfuscatedName("r") @ObfuscatedSignature( - descriptor = "(Lgp;[Lof;Lfu;I)V", - garbageValue = "1457996080" + descriptor = "(S)V", + garbageValue = "16083" ) - void method3284(WorldMapScaleHandler var1, IndexedSprite[] var2, WorldMapSprite var3) { + @Export("initWorldMapIcon1s") + void initWorldMapIcon1s() { + Iterator var1 = this.iconMap.values().iterator(); // L: 173 + + while (var1.hasNext()) { + AbstractWorldMapIcon var2 = (AbstractWorldMapIcon)var1.next(); // L: 174 + if (var2 instanceof WorldMapIcon_1) { // L: 176 + ((WorldMapIcon_1)var2).init(); // L: 177 + } + } + + } // L: 181 + + @ObfuscatedName("b") + @ObfuscatedSignature( + descriptor = "(Ljava/util/List;I)V", + garbageValue = "1099621062" + ) + @Export("addAllToIconList") + void addAllToIconList(List var1) { + Iterator var2 = var1.iterator(); // L: 184 + + while (var2.hasNext()) { + WorldMapIcon_0 var3 = (WorldMapIcon_0)var2.next(); // L: 185 + if (class6.WorldMapElement_get(var3.element).field1560 && var3.coord2.x >> 6 == this.regionX && var3.coord2.y >> 6 == this.regionY) { // L: 187 190 + WorldMapIcon_0 var4 = new WorldMapIcon_0(var3.coord2, var3.coord2, var3.element, this.method3357(var3.element)); // L: 191 + this.icon0List.add(var4); // L: 192 + } + } + + } // L: 196 + + @ObfuscatedName("d") + @ObfuscatedSignature( + descriptor = "(I)V", + garbageValue = "1753897051" + ) + void method3388() { + if (this.worldMapData_0 != null) { // L: 199 + this.worldMapData_0.reset(); // L: 200 + } else { + Iterator var1 = this.worldMapData1List.iterator(); // L: 203 + + while (var1.hasNext()) { + WorldMapData_1 var2 = (WorldMapData_1)var1.next(); // L: 204 + var2.reset(); // L: 206 + } + } + + } // L: 210 + + @ObfuscatedName("s") + @ObfuscatedSignature( + descriptor = "(Ljv;S)Z", + garbageValue = "27128" + ) + @Export("loadGeography") + boolean loadGeography(AbstractArchive var1) { + this.iconMap.clear(); // L: 213 + if (this.worldMapData_0 != null) { // L: 214 + this.worldMapData_0.loadGeography(var1); // L: 215 + if (this.worldMapData_0.isFullyLoaded()) { // L: 216 + this.getIconsForTiles(0, 0, 64, 64, this.worldMapData_0); // L: 217 + return true; // L: 218 + } else { + return false; // L: 220 + } + } else { + boolean var2 = true; // L: 223 + + Iterator var3; + WorldMapData_1 var4; + for (var3 = this.worldMapData1List.iterator(); var3.hasNext(); var2 &= var4.isFullyLoaded()) { // L: 224 228 + var4 = (WorldMapData_1)var3.next(); // L: 225 + var4.loadGeography(var1); // L: 227 + } + + if (var2) { // L: 231 + var3 = this.worldMapData1List.iterator(); // L: 232 + + while (var3.hasNext()) { + var4 = (WorldMapData_1)var3.next(); // L: 233 + this.getIconsForTiles(var4.getChunkX() * 8, var4.getChunkY() * 8, 8, 8, var4); // L: 235 + } + } + + return var2; // L: 239 + } + } + + @ObfuscatedName("u") + @ObfuscatedSignature( + descriptor = "(ILgb;[Lop;Ljv;Ljv;I)V", + garbageValue = "-1087727229" + ) + @Export("drawTile") + void drawTile(int var1, WorldMapScaleHandler var2, IndexedSprite[] var3, AbstractArchive var4, AbstractArchive var5) { + this.pixelsPerTile = var1; // L: 244 + if (this.worldMapData_0 != null || !this.worldMapData1List.isEmpty()) { // L: 245 + if (class7.method76(this.regionX, this.regionY, var1) == null) { // L: 248 + boolean var6 = true; // L: 251 + var6 &= this.loadGeography(var4); // L: 252 + int var8; + if (this.worldMapData_0 != null) { // L: 255 + var8 = this.worldMapData_0.groupId; // L: 256 + } else { + var8 = ((AbstractWorldMapData)this.worldMapData1List.getFirst()).groupId; // L: 259 + } + + var6 &= var5.tryLoadGroup(var8); // L: 261 + if (var6) { // L: 262 + byte[] var7 = var5.takeFileFlat(var8); // L: 263 + WorldMapSprite var9 = class82.method1909(var7); // L: 264 + SpritePixels var10 = new SpritePixels(this.pixelsPerTile * 64, this.pixelsPerTile * 64); // L: 265 + var10.setRaster(); // L: 266 + if (this.worldMapData_0 != null) { // L: 267 + this.method3340(var2, var3, var9); // L: 268 + } else { + this.method3455(var2, var3, var9); // L: 271 + } + + int var11 = this.regionX; // L: 273 + int var12 = this.regionY; // L: 274 + int var13 = this.pixelsPerTile; // L: 275 + DemotingHashTable var14 = WorldMapRegion_cachedSprites; // L: 277 + long var16 = (long)(var13 << 16 | var11 << 8 | var12); // L: 281 + var14.put(var10, var16, var10.pixels.length * 4); // L: 283 + this.method3388(); // L: 285 + } + } + } + } // L: 246 249 286 + + @ObfuscatedName("l") + @ObfuscatedSignature( + descriptor = "(IIILjava/util/HashSet;I)V", + garbageValue = "1432505674" + ) + void method3353(int var1, int var2, int var3, HashSet var4) { + if (var4 == null) { // L: 289 + var4 = new HashSet(); // L: 290 + } + + this.drawNonLinkMapIcons(var1, var2, var4, var3); // L: 292 + this.drawMapLinks(var1, var2, var4, var3); // L: 293 + } // L: 294 + + @ObfuscatedName("o") + @ObfuscatedSignature( + descriptor = "(Ljava/util/HashSet;III)V", + garbageValue = "685193317" + ) + @Export("flashElements") + void flashElements(HashSet var1, int var2, int var3) { + Iterator var4 = this.iconMap.values().iterator(); // L: 297 + + while (var4.hasNext()) { // L: 307 + AbstractWorldMapIcon var5 = (AbstractWorldMapIcon)var4.next(); // L: 298 + if (var5.hasValidElement()) { // L: 300 + int var6 = var5.getElement(); // L: 301 + if (var1.contains(var6)) { // L: 302 + WorldMapElement var7 = class6.WorldMapElement_get(var6); // L: 303 + this.drawBackgroundCircle(var7, var5.screenX, var5.screenY, var2, var3); // L: 304 + } + } + } + + this.method3349(var1, var2, var3); // L: 308 + } // L: 309 + + @ObfuscatedName("c") + @ObfuscatedSignature( + descriptor = "(Lgb;[Lop;Lfd;I)V", + garbageValue = "1016970364" + ) + void method3340(WorldMapScaleHandler var1, IndexedSprite[] var2, WorldMapSprite var3) { int var4; int var5; - for (var4 = 0; var4 < 64; ++var4) { // L: 290 - for (var5 = 0; var5 < 64; ++var5) { // L: 291 - this.drawTileGround(var4, var5, this.worldMapData_0, var1, var3); // L: 292 - this.method3356(var4, var5, this.worldMapData_0, var1); // L: 293 + for (var4 = 0; var4 < 64; ++var4) { // L: 312 + for (var5 = 0; var5 < 64; ++var5) { // L: 313 + this.drawTileGround(var4, var5, this.worldMapData_0, var1, var3); // L: 314 + this.method3344(var4, var5, this.worldMapData_0, var1); // L: 315 } } - for (var4 = 0; var4 < 64; ++var4) { // L: 296 - for (var5 = 0; var5 < 64; ++var5) { // L: 297 - this.method3286(var4, var5, this.worldMapData_0, var1, var2); // L: 298 + for (var4 = 0; var4 < 64; ++var4) { // L: 318 + for (var5 = 0; var5 < 64; ++var5) { // L: 319 + this.method3410(var4, var5, this.worldMapData_0, var1, var2); // L: 320 } } - } // L: 301 + } // L: 323 - @ObfuscatedName("p") + @ObfuscatedName("e") @ObfuscatedSignature( - descriptor = "(Lgp;[Lof;Lfu;B)V", - garbageValue = "43" + descriptor = "(Lgb;[Lop;Lfd;B)V", + garbageValue = "-39" ) - void method3285(WorldMapScaleHandler var1, IndexedSprite[] var2, WorldMapSprite var3) { - Iterator var4 = this.worldMapData1List.iterator(); // L: 304 + void method3455(WorldMapScaleHandler var1, IndexedSprite[] var2, WorldMapSprite var3) { + Iterator var4 = this.worldMapData1List.iterator(); // L: 326 WorldMapData_1 var5; int var6; int var7; while (var4.hasNext()) { - var5 = (WorldMapData_1)var4.next(); // L: 305 + var5 = (WorldMapData_1)var4.next(); // L: 327 - for (var6 = var5.getChunkX() * 8; var6 < var5.getChunkX() * 8 + 8; ++var6) { // L: 307 - for (var7 = var5.getChunkY() * 8; var7 < var5.getChunkY() * 8 + 8; ++var7) { // L: 308 - this.drawTileGround(var6, var7, var5, var1, var3); // L: 309 - this.method3356(var6, var7, var5, var1); // L: 310 + for (var6 = var5.getChunkX() * 8; var6 < var5.getChunkX() * 8 + 8; ++var6) { // L: 329 + for (var7 = var5.getChunkY() * 8; var7 < var5.getChunkY() * 8 + 8; ++var7) { // L: 330 + this.drawTileGround(var6, var7, var5, var1, var3); // L: 331 + this.method3344(var6, var7, var5, var1); // L: 332 } } } - var4 = this.worldMapData1List.iterator(); // L: 315 + var4 = this.worldMapData1List.iterator(); // L: 337 while (var4.hasNext()) { - var5 = (WorldMapData_1)var4.next(); // L: 316 + var5 = (WorldMapData_1)var4.next(); // L: 338 - for (var6 = var5.getChunkX() * 8; var6 < var5.getChunkX() * 8 + 8; ++var6) { // L: 318 - for (var7 = var5.getChunkY() * 8; var7 < var5.getChunkY() * 8 + 8; ++var7) { // L: 319 - this.method3286(var6, var7, var5, var1, var2); // L: 320 + for (var6 = var5.getChunkX() * 8; var6 < var5.getChunkX() * 8 + 8; ++var6) { // L: 340 + for (var7 = var5.getChunkY() * 8; var7 < var5.getChunkY() * 8 + 8; ++var7) { // L: 341 + this.method3410(var6, var7, var5, var1, var2); // L: 342 } } } - } // L: 325 + } // L: 347 + + @ObfuscatedName("g") + @ObfuscatedSignature( + descriptor = "(IILfm;Lgb;[Lop;B)V", + garbageValue = "27" + ) + void method3410(int var1, int var2, AbstractWorldMapData var3, WorldMapScaleHandler var4, IndexedSprite[] var5) { + this.method3347(var1, var2, var3); // L: 350 + this.method3346(var1, var2, var3, var5); // L: 351 + } // L: 352 @ObfuscatedName("a") @ObfuscatedSignature( - descriptor = "(IILfw;Lgp;[Lof;B)V", - garbageValue = "16" - ) - void method3286(int var1, int var2, AbstractWorldMapData var3, WorldMapScaleHandler var4, IndexedSprite[] var5) { - this.method3291(var1, var2, var3); // L: 328 - this.method3288(var1, var2, var3, var5); // L: 329 - } // L: 330 - - @ObfuscatedName("e") - @ObfuscatedSignature( - descriptor = "(IILfw;Lgp;Lfu;B)V", - garbageValue = "9" + descriptor = "(IILfm;Lgb;Lfd;I)V", + garbageValue = "-1821301029" ) @Export("drawTileGround") void drawTileGround(int var1, int var2, AbstractWorldMapData var3, WorldMapScaleHandler var4, WorldMapSprite var5) { - int var6 = var3.floorUnderlayIds[0][var1][var2] - 1; // L: 333 - int var7 = var3.floorOverlayIds[0][var1][var2] - 1; // L: 334 - if (var6 == -1 && var7 == -1) { // L: 335 - Rasterizer2D.Rasterizer2D_fillRectangle(this.pixelsPerTile * var1, this.pixelsPerTile * (63 - var2), this.pixelsPerTile, this.pixelsPerTile, this.backgroundColor); // L: 336 + int var6 = var3.floorUnderlayIds[0][var1][var2] - 1; // L: 355 + int var7 = var3.floorOverlayIds[0][var1][var2] - 1; // L: 356 + if (var6 == -1 && var7 == -1) { // L: 357 + Rasterizer2D.Rasterizer2D_fillRectangle(this.pixelsPerTile * var1, this.pixelsPerTile * (63 - var2), this.pixelsPerTile, this.pixelsPerTile, this.backgroundColor); // L: 358 } - int var8 = 16711935; // L: 338 - if (var7 != -1) { // L: 339 - var8 = ReflectionCheck.method1158(var7, this.backgroundColor); // L: 340 - } - - if (var7 > -1 && var3.field2063[0][var1][var2] == 0) { // L: 342 - Rasterizer2D.Rasterizer2D_fillRectangle(this.pixelsPerTile * var1, this.pixelsPerTile * (63 - var2), this.pixelsPerTile, this.pixelsPerTile, var8); // L: 343 - } else { - int var9 = this.method3289(var1, var2, var3, var5); // L: 346 - if (var7 == -1) { // L: 347 - Rasterizer2D.Rasterizer2D_fillRectangle(this.pixelsPerTile * var1, this.pixelsPerTile * (63 - var2), this.pixelsPerTile, this.pixelsPerTile, var9); // L: 348 + int var8 = 16711935; // L: 360 + int var9; + if (var7 != -1) { // L: 361 + int var10 = this.backgroundColor; // L: 363 + FloorOverlayDefinition var11 = SoundSystem.method807(var7); // L: 365 + if (var11 == null) { // L: 366 + var9 = var10; // L: 367 + } else if (var11.secondaryRgb >= 0) { // L: 370 + var9 = var11.secondaryRgb | -16777216; // L: 371 + } else if (var11.texture >= 0) { // L: 373 + int var12 = WorldMapSection0.method3590(Rasterizer3D.Rasterizer3D_textureLoader.getAverageTextureRGB(var11.texture), 96); // L: 374 + var9 = Rasterizer3D.Rasterizer3D_colorPalette[var12] | -16777216; // L: 375 + } else if (var11.primaryRgb == 16711935) { // L: 377 + var9 = var10; // L: 378 } else { - var4.method3676(this.pixelsPerTile * var1, this.pixelsPerTile * (63 - var2), var9, var8, this.pixelsPerTile, this.pixelsPerTile, var3.field2063[0][var1][var2], var3.field2064[0][var1][var2]); // L: 351 + int var13 = var11.hue; // L: 382 + int var14 = var11.saturation; // L: 383 + int var15 = var11.lightness; // L: 384 + if (var15 > 179) { // L: 386 + var14 /= 2; + } + + if (var15 > 192) { // L: 387 + var14 /= 2; + } + + if (var15 > 217) { // L: 388 + var14 /= 2; + } + + if (var15 > 243) { // L: 389 + var14 /= 2; + } + + int var16 = (var14 / 32 << 7) + var15 / 2 + (var13 / 4 << 10); // L: 390 + int var17 = WorldMapSection0.method3590(var16, 96); // L: 394 + var9 = Rasterizer3D.Rasterizer3D_colorPalette[var17] | -16777216; // L: 395 + } + + var8 = var9; // L: 398 + } + + if (var7 > -1 && var3.field2067[0][var1][var2] == 0) { // L: 400 + Rasterizer2D.Rasterizer2D_fillRectangle(this.pixelsPerTile * var1, this.pixelsPerTile * (63 - var2), this.pixelsPerTile, this.pixelsPerTile, var8); // L: 401 + } else { + var9 = this.method3345(var1, var2, var3, var5); // L: 404 + if (var7 == -1) { // L: 405 + Rasterizer2D.Rasterizer2D_fillRectangle(this.pixelsPerTile * var1, this.pixelsPerTile * (63 - var2), this.pixelsPerTile, this.pixelsPerTile, var9); // L: 406 + } else { + var4.method3719(this.pixelsPerTile * var1, this.pixelsPerTile * (63 - var2), var9, var8, this.pixelsPerTile, this.pixelsPerTile, var3.field2067[0][var1][var2], var3.field2065[0][var1][var2]); // L: 409 } } - } // L: 344 349 352 + } // L: 402 407 410 - @ObfuscatedName("d") + @ObfuscatedName("k") @ObfuscatedSignature( - descriptor = "(IILfw;Lgp;I)V", - garbageValue = "-988381059" + descriptor = "(IILfm;Lgb;B)V", + garbageValue = "16" ) - void method3356(int var1, int var2, AbstractWorldMapData var3, WorldMapScaleHandler var4) { - for (int var5 = 1; var5 < var3.planes; ++var5) { // L: 355 - int var6 = var3.floorOverlayIds[var5][var1][var2] - 1; // L: 356 - if (var6 > -1) { // L: 357 - int var7 = ReflectionCheck.method1158(var6, this.backgroundColor); // L: 358 - if (var3.field2063[var5][var1][var2] == 0) { // L: 359 - Rasterizer2D.Rasterizer2D_fillRectangle(this.pixelsPerTile * var1, this.pixelsPerTile * (63 - var2), this.pixelsPerTile, this.pixelsPerTile, var7); // L: 360 + void method3344(int var1, int var2, AbstractWorldMapData var3, WorldMapScaleHandler var4) { + for (int var5 = 1; var5 < var3.planes; ++var5) { // L: 413 + int var6 = var3.floorOverlayIds[var5][var1][var2] - 1; // L: 414 + if (var6 > -1) { // L: 415 + int var8 = this.backgroundColor; // L: 417 + FloorOverlayDefinition var9 = SoundSystem.method807(var6); // L: 419 + int var7; + if (var9 == null) { // L: 420 + var7 = var8; // L: 421 + } else if (var9.secondaryRgb >= 0) { // L: 424 + var7 = var9.secondaryRgb | -16777216; // L: 425 + } else if (var9.texture >= 0) { // L: 427 + int var10 = WorldMapSection0.method3590(Rasterizer3D.Rasterizer3D_textureLoader.getAverageTextureRGB(var9.texture), 96); // L: 428 + var7 = Rasterizer3D.Rasterizer3D_colorPalette[var10] | -16777216; // L: 429 + } else if (var9.primaryRgb == 16711935) { // L: 431 + var7 = var8; // L: 432 } else { - var4.method3676(this.pixelsPerTile * var1, this.pixelsPerTile * (63 - var2), 0, var7, this.pixelsPerTile, this.pixelsPerTile, var3.field2063[var5][var1][var2], var3.field2064[var5][var1][var2]); // L: 363 + int var11 = var9.hue; // L: 436 + int var12 = var9.saturation; // L: 437 + int var13 = var9.lightness; // L: 438 + if (var13 > 179) { // L: 440 + var12 /= 2; + } + + if (var13 > 192) { // L: 441 + var12 /= 2; + } + + if (var13 > 217) { // L: 442 + var12 /= 2; + } + + if (var13 > 243) { // L: 443 + var12 /= 2; + } + + int var14 = (var12 / 32 << 7) + var13 / 2 + (var11 / 4 << 10); // L: 444 + int var15 = WorldMapSection0.method3590(var14, 96); // L: 448 + var7 = Rasterizer3D.Rasterizer3D_colorPalette[var15] | -16777216; // L: 449 + } + + if (var3.field2067[var5][var1][var2] == 0) { // L: 453 + Rasterizer2D.Rasterizer2D_fillRectangle(this.pixelsPerTile * var1, this.pixelsPerTile * (63 - var2), this.pixelsPerTile, this.pixelsPerTile, var7); // L: 454 + } else { + var4.method3719(this.pixelsPerTile * var1, this.pixelsPerTile * (63 - var2), 0, var7, this.pixelsPerTile, this.pixelsPerTile, var3.field2067[var5][var1][var2], var3.field2065[var5][var1][var2]); // L: 457 } } } - } // L: 367 - - @ObfuscatedName("u") - @ObfuscatedSignature( - descriptor = "(IILfw;Lfu;I)I", - garbageValue = "-947933969" - ) - int method3289(int var1, int var2, AbstractWorldMapData var3, WorldMapSprite var4) { - return var3.floorUnderlayIds[0][var1][var2] == 0 ? this.backgroundColor : var4.getTileColor(var1, var2); // L: 370 371 373 - } + } // L: 461 @ObfuscatedName("m") @ObfuscatedSignature( - descriptor = "(IILfw;[Lof;I)V", - garbageValue = "2119156323" + descriptor = "(IILfm;Lfd;I)I", + garbageValue = "-404634884" ) - void method3288(int var1, int var2, AbstractWorldMapData var3, IndexedSprite[] var4) { - for (int var5 = 0; var5 < var3.planes; ++var5) { // L: 377 - WorldMapDecoration[] var6 = var3.decorations[var5][var1][var2]; // L: 378 - if (var6 != null && var6.length != 0) { // L: 379 - WorldMapDecoration[] var7 = var6; // L: 383 + int method3345(int var1, int var2, AbstractWorldMapData var3, WorldMapSprite var4) { + return var3.floorUnderlayIds[0][var1][var2] == 0 ? this.backgroundColor : var4.getTileColor(var1, var2); // L: 464 465 467 + } - for (int var8 = 0; var8 < var7.length; ++var8) { // L: 384 - WorldMapDecoration var9 = var7[var8]; // L: 385 - int var11 = var9.decoration; // L: 388 - boolean var10 = var11 >= WorldMapDecorationType.field3165.id && var11 <= WorldMapDecorationType.field3151.id; // L: 390 - if (var10 || method3399(var9.decoration)) { // L: 392 - ObjectComposition var12 = AttackOption.getObjectDefinition(var9.objectDefinitionId); // L: 393 - if (var12.mapSceneId != -1) { // L: 394 - if (var12.mapSceneId != 46 && var12.mapSceneId != 52) { // L: 395 - var4[var12.mapSceneId].method6846(this.pixelsPerTile * var1, this.pixelsPerTile * (63 - var2), this.pixelsPerTile * 2, this.pixelsPerTile * 2); // L: 399 - } else { - var4[var12.mapSceneId].method6846(this.pixelsPerTile * var1, this.pixelsPerTile * (63 - var2), this.pixelsPerTile * 2 + 1, this.pixelsPerTile * 2 + 1); // L: 396 - } + @ObfuscatedName("x") + @ObfuscatedSignature( + descriptor = "(IILfm;[Lop;I)V", + garbageValue = "1218867013" + ) + void method3346(int var1, int var2, AbstractWorldMapData var3, IndexedSprite[] var4) { + for (int var5 = 0; var5 < var3.planes; ++var5) { // L: 471 + WorldMapDecoration[] var6 = var3.decorations[var5][var1][var2]; // L: 472 + if (var6 != null && var6.length != 0) { // L: 473 + WorldMapDecoration[] var7 = var6; // L: 477 + + for (int var8 = 0; var8 < var7.length; ++var8) { // L: 478 + WorldMapDecoration var9 = var7[var8]; // L: 479 + if (!PacketBufferNode.method4367(var9.decoration)) { // L: 482 + int var11 = var9.decoration; // L: 484 + boolean var10 = var11 == WorldMapDecorationType.field3154.id; // L: 486 + if (!var10) { // L: 488 + continue; + } + } + + ObjectComposition var12 = class23.getObjectDefinition(var9.objectDefinitionId); // L: 490 + if (var12.mapSceneId != -1) { // L: 491 + if (var12.mapSceneId != 46 && var12.mapSceneId != 52) { // L: 492 + var4[var12.mapSceneId].method6958(this.pixelsPerTile * var1, this.pixelsPerTile * (63 - var2), this.pixelsPerTile * 2, this.pixelsPerTile * 2); // L: 496 + } else { + var4[var12.mapSceneId].method6958(this.pixelsPerTile * var1, this.pixelsPerTile * (63 - var2), this.pixelsPerTile * 2 + 1, this.pixelsPerTile * 2 + 1); // L: 493 } } } } } - } // L: 407 + } // L: 504 - @ObfuscatedName("j") + @ObfuscatedName("z") @ObfuscatedSignature( - descriptor = "(IILfw;I)V", - garbageValue = "994519782" + descriptor = "(IILfm;I)V", + garbageValue = "1479082417" ) - void method3291(int var1, int var2, AbstractWorldMapData var3) { - for (int var4 = 0; var4 < var3.planes; ++var4) { // L: 410 - WorldMapDecoration[] var5 = var3.decorations[var4][var1][var2]; // L: 411 - if (var5 != null && var5.length != 0) { // L: 412 - WorldMapDecoration[] var6 = var5; // L: 416 + void method3347(int var1, int var2, AbstractWorldMapData var3) { + for (int var4 = 0; var4 < var3.planes; ++var4) { // L: 507 + WorldMapDecoration[] var5 = var3.decorations[var4][var1][var2]; // L: 508 + if (var5 != null && var5.length != 0) { // L: 509 + WorldMapDecoration[] var6 = var5; // L: 513 - for (int var7 = 0; var7 < var6.length; ++var7) { // L: 417 - WorldMapDecoration var8 = var6[var7]; // L: 418 - if (WorldMapRectangle.method3569(var8.decoration)) { // L: 420 - ObjectComposition var9 = AttackOption.getObjectDefinition(var8.objectDefinitionId); // L: 421 - int var10 = var9.int1 != 0 ? -3407872 : -3355444; // L: 422 - if (var8.decoration == WorldMapDecorationType.field3159.id) { // L: 423 - this.method3305(var1, var2, var8.rotation, var10); // L: 424 + for (int var7 = 0; var7 < var6.length; ++var7) { // L: 514 + WorldMapDecoration var8 = var6[var7]; // L: 515 + if (class254.method4823(var8.decoration)) { // L: 517 + ObjectComposition var9 = class23.getObjectDefinition(var8.objectDefinitionId); // L: 518 + int var10 = var9.int1 != 0 ? -3407872 : -3355444; // L: 519 + if (var8.decoration == WorldMapDecorationType.field3149.id) { // L: 520 + this.method3361(var1, var2, var8.rotation, var10); // L: 521 } - if (var8.decoration == WorldMapDecorationType.field3164.id) { // L: 426 - this.method3305(var1, var2, var8.rotation, -3355444); // L: 427 - this.method3305(var1, var2, var8.rotation + 1, var10); // L: 428 + if (var8.decoration == WorldMapDecorationType.field3167.id) { // L: 523 + this.method3361(var1, var2, var8.rotation, -3355444); // L: 524 + this.method3361(var1, var2, var8.rotation + 1, var10); // L: 525 } - if (var8.decoration == WorldMapDecorationType.field3148.id) { // L: 430 - if (var8.rotation == 0) { // L: 431 + if (var8.decoration == WorldMapDecorationType.field3145.id) { // L: 527 + if (var8.rotation == 0) { // L: 528 Rasterizer2D.Rasterizer2D_drawHorizontalLine(this.pixelsPerTile * var1, this.pixelsPerTile * (63 - var2), 1, var10); } if (var8.rotation == 1) { - Rasterizer2D.Rasterizer2D_drawHorizontalLine(this.pixelsPerTile * var1 + this.pixelsPerTile - 1, this.pixelsPerTile * (63 - var2), 1, var10); // L: 432 + Rasterizer2D.Rasterizer2D_drawHorizontalLine(this.pixelsPerTile * var1 + this.pixelsPerTile - 1, this.pixelsPerTile * (63 - var2), 1, var10); // L: 529 } - if (var8.rotation == 2) { // L: 433 - Rasterizer2D.Rasterizer2D_drawHorizontalLine(this.pixelsPerTile * var1 + this.pixelsPerTile - 1, this.pixelsPerTile * (63 - var2) + this.pixelsPerTile - 1, 1, var10); + if (var8.rotation == 2) { // L: 530 + Rasterizer2D.Rasterizer2D_drawHorizontalLine(this.pixelsPerTile + this.pixelsPerTile * var1 - 1, this.pixelsPerTile * (63 - var2) + this.pixelsPerTile - 1, 1, var10); } - if (var8.rotation == 3) { // L: 434 + if (var8.rotation == 3) { // L: 531 Rasterizer2D.Rasterizer2D_drawHorizontalLine(this.pixelsPerTile * var1, this.pixelsPerTile * (63 - var2) + this.pixelsPerTile - 1, 1, var10); } } - if (var8.decoration == WorldMapDecorationType.field3162.id) { // L: 436 - int var11 = var8.rotation % 2; // L: 437 + if (var8.decoration == WorldMapDecorationType.field3146.id) { // L: 533 + int var11 = var8.rotation % 2; // L: 534 int var12; - if (var11 == 0) { // L: 438 - for (var12 = 0; var12 < this.pixelsPerTile; ++var12) { // L: 439 - Rasterizer2D.Rasterizer2D_drawHorizontalLine(var12 + this.pixelsPerTile * var1, (64 - var2) * this.pixelsPerTile - 1 - var12, 1, var10); // L: 440 + if (var11 == 0) { // L: 535 + for (var12 = 0; var12 < this.pixelsPerTile; ++var12) { // L: 536 + Rasterizer2D.Rasterizer2D_drawHorizontalLine(var12 + this.pixelsPerTile * var1, (64 - var2) * this.pixelsPerTile - 1 - var12, 1, var10); // L: 537 } } else { - for (var12 = 0; var12 < this.pixelsPerTile; ++var12) { // L: 444 - Rasterizer2D.Rasterizer2D_drawHorizontalLine(var12 + this.pixelsPerTile * var1, var12 + this.pixelsPerTile * (63 - var2), 1, var10); // L: 445 + for (var12 = 0; var12 < this.pixelsPerTile; ++var12) { // L: 541 + Rasterizer2D.Rasterizer2D_drawHorizontalLine(var12 + this.pixelsPerTile * var1, var12 + this.pixelsPerTile * (63 - var2), 1, var10); // L: 542 } } } @@ -593,397 +692,356 @@ public class WorldMapRegion { } } - } // L: 454 - - @ObfuscatedName("f") - @ObfuscatedSignature( - descriptor = "(IILjava/util/HashSet;II)V", - garbageValue = "1579381896" - ) - @Export("drawNonLinkMapIcons") - void drawNonLinkMapIcons(int var1, int var2, HashSet var3, int var4) { - float var5 = (float)var4 / 64.0F; // L: 457 - float var6 = var5 / 2.0F; // L: 458 - Iterator var7 = this.iconMap.entrySet().iterator(); // L: 459 - - while (var7.hasNext()) { - Entry var8 = (Entry)var7.next(); // L: 460 - Coord var9 = (Coord)var8.getKey(); // L: 462 - int var10 = (int)((float)var9.x * var5 + (float)var1 - var6); // L: 463 - int var11 = (int)((float)(var2 + var4) - (float)var9.y * var5 - var6); // L: 464 - AbstractWorldMapIcon var12 = (AbstractWorldMapIcon)var8.getValue(); // L: 465 - if (var12 != null && var12.hasValidElement()) { // L: 466 - var12.screenX = var10; // L: 467 - var12.screenY = var11; // L: 468 - WorldMapElement var13 = WorldMapAreaData.WorldMapElement_get(var12.getElement()); // L: 469 - if (!var3.contains(var13.getObjectId())) { // L: 470 - this.method3295(var12, var10, var11, var5); // L: 471 - } - } - } - - } // L: 476 - - @ObfuscatedName("s") - @ObfuscatedSignature( - descriptor = "(Ljava/util/HashSet;IIS)V", - garbageValue = "-3432" - ) - void method3293(HashSet var1, int var2, int var3) { - Iterator var4 = this.icon0List.iterator(); // L: 479 - - while (var4.hasNext()) { - AbstractWorldMapIcon var5 = (AbstractWorldMapIcon)var4.next(); // L: 480 - if (var5.hasValidElement()) { // L: 482 - WorldMapElement var6 = WorldMapAreaData.WorldMapElement_get(var5.getElement()); // L: 483 - if (var6 != null && var1.contains(var6.getObjectId())) { // L: 484 - this.drawBackgroundCircle(var6, var5.screenX, var5.screenY, var2, var3); // L: 485 - } - } - } - - } // L: 489 - - @ObfuscatedName("y") - @ObfuscatedSignature( - descriptor = "(Let;IIIII)V", - garbageValue = "-1558532242" - ) - @Export("drawBackgroundCircle") - void drawBackgroundCircle(WorldMapElement var1, int var2, int var3, int var4, int var5) { - SpritePixels var6 = var1.getSpriteBool(false); // L: 492 - if (var6 != null) { // L: 493 - var6.drawTransBgAt(var2 - var6.subWidth / 2, var3 - var6.subHeight / 2); // L: 496 - if (var4 % var5 < var5 / 2) { // L: 497 - Rasterizer2D.Rasterizer2D_drawCircleAlpha(var2, var3, 15, 16776960, 128); // L: 498 - Rasterizer2D.Rasterizer2D_drawCircleAlpha(var2, var3, 7, 16777215, 256); // L: 499 - } - - } - } // L: 494 501 + } // L: 551 @ObfuscatedName("w") @ObfuscatedSignature( - descriptor = "(Lgw;IIFI)V", - garbageValue = "-615214658" + descriptor = "(IILjava/util/HashSet;II)V", + garbageValue = "-1949332191" ) - void method3295(AbstractWorldMapIcon var1, int var2, int var3, float var4) { - WorldMapElement var5 = WorldMapAreaData.WorldMapElement_get(var1.getElement()); // L: 504 - this.method3296(var5, var2, var3); // L: 505 - this.method3297(var1, var5, var2, var3, var4); // L: 506 - } // L: 507 + @Export("drawNonLinkMapIcons") + void drawNonLinkMapIcons(int var1, int var2, HashSet var3, int var4) { + float var5 = (float)var4 / 64.0F; // L: 554 + float var6 = var5 / 2.0F; // L: 555 + Iterator var7 = this.iconMap.entrySet().iterator(); // L: 556 - @ObfuscatedName("n") - @ObfuscatedSignature( - descriptor = "(Let;IIB)V", - garbageValue = "-27" - ) - void method3296(WorldMapElement var1, int var2, int var3) { - SpritePixels var4 = var1.getSpriteBool(false); // L: 510 - if (var4 != null) { // L: 511 - int var5 = this.method3299(var4, var1.horizontalAlignment); // L: 512 - int var6 = this.method3384(var4, var1.verticalAlignment); // L: 513 - var4.drawTransBgAt(var5 + var2, var3 + var6); // L: 514 - } - - } // L: 516 - - @ObfuscatedName("ag") - @ObfuscatedSignature( - descriptor = "(Lgw;Let;IIFS)V", - garbageValue = "-25727" - ) - void method3297(AbstractWorldMapIcon var1, WorldMapElement var2, int var3, int var4, float var5) { - WorldMapLabel var6 = var1.getLabel(); // L: 519 - if (var6 != null) { // L: 520 - if (var6.size.method3154(var5)) { // L: 523 - Font var7 = (Font)this.fonts.get(var6.size); // L: 526 - var7.drawLines(var6.text, var3 - var6.width / 2, var4, var6.width, var6.height, -16777216 | var2.field1570, 0, 1, 0, var7.ascent / 2); // L: 527 + while (var7.hasNext()) { + Entry var8 = (Entry)var7.next(); // L: 557 + Coord var9 = (Coord)var8.getKey(); // L: 559 + int var10 = (int)((float)var9.x * var5 + (float)var1 - var6); // L: 560 + int var11 = (int)((float)(var2 + var4) - var5 * (float)var9.y - var6); // L: 561 + AbstractWorldMapIcon var12 = (AbstractWorldMapIcon)var8.getValue(); // L: 562 + if (var12 != null && var12.hasValidElement()) { // L: 563 + var12.screenX = var10; // L: 564 + var12.screenY = var11; // L: 565 + WorldMapElement var13 = class6.WorldMapElement_get(var12.getElement()); // L: 566 + if (!var3.contains(var13.getObjectId())) { // L: 567 + this.method3351(var12, var10, var11, var5); // L: 568 + } } } - } // L: 521 524 528 + + } // L: 573 + + @ObfuscatedName("t") + @ObfuscatedSignature( + descriptor = "(Ljava/util/HashSet;III)V", + garbageValue = "-341047508" + ) + void method3349(HashSet var1, int var2, int var3) { + Iterator var4 = this.icon0List.iterator(); // L: 576 + + while (var4.hasNext()) { // L: 585 + AbstractWorldMapIcon var5 = (AbstractWorldMapIcon)var4.next(); // L: 577 + if (var5.hasValidElement()) { // L: 579 + WorldMapElement var6 = class6.WorldMapElement_get(var5.getElement()); // L: 580 + if (var6 != null && var1.contains(var6.getObjectId())) { // L: 581 + this.drawBackgroundCircle(var6, var5.screenX, var5.screenY, var2, var3); // L: 582 + } + } + } + + } // L: 586 + + @ObfuscatedName("h") + @ObfuscatedSignature( + descriptor = "(Lew;IIIII)V", + garbageValue = "1184916583" + ) + @Export("drawBackgroundCircle") + void drawBackgroundCircle(WorldMapElement var1, int var2, int var3, int var4, int var5) { + SpritePixels var6 = var1.getSpriteBool(false); // L: 589 + if (var6 != null) { // L: 590 + var6.drawTransBgAt(var2 - var6.subWidth / 2, var3 - var6.subHeight / 2); // L: 593 + if (var4 % var5 < var5 / 2) { // L: 594 + Rasterizer2D.Rasterizer2D_drawCircleAlpha(var2, var3, 15, 16776960, 128); // L: 595 + Rasterizer2D.Rasterizer2D_drawCircleAlpha(var2, var3, 7, 16777215, 256); // L: 596 + } + + } + } // L: 591 598 + + @ObfuscatedName("q") + @ObfuscatedSignature( + descriptor = "(Lgq;IIFI)V", + garbageValue = "-266654765" + ) + void method3351(AbstractWorldMapIcon var1, int var2, int var3, float var4) { + WorldMapElement var5 = class6.WorldMapElement_get(var1.getElement()); // L: 601 + this.method3449(var5, var2, var3); // L: 602 + this.method3342(var1, var5, var2, var3, var4); // L: 603 + } // L: 604 + + @ObfuscatedName("i") + @ObfuscatedSignature( + descriptor = "(Lew;III)V", + garbageValue = "-1515500646" + ) + void method3449(WorldMapElement var1, int var2, int var3) { + SpritePixels var4 = var1.getSpriteBool(false); // L: 607 + if (var4 != null) { // L: 608 + int var5 = this.method3391(var4, var1.horizontalAlignment); // L: 609 + int var6 = this.method3356(var4, var1.verticalAlignment); // L: 610 + var4.drawTransBgAt(var5 + var2, var3 + var6); // L: 611 + } + + } // L: 613 @ObfuscatedName("ae") + @ObfuscatedSignature( + descriptor = "(Lgq;Lew;IIFS)V", + garbageValue = "-4359" + ) + void method3342(AbstractWorldMapIcon var1, WorldMapElement var2, int var3, int var4, float var5) { + WorldMapLabel var6 = var1.getLabel(); // L: 616 + if (var6 != null) { // L: 617 + if (var6.size.method3215(var5)) { // L: 620 + Font var7 = (Font)this.fonts.get(var6.size); // L: 623 + var7.drawLines(var6.text, var3 - var6.width / 2, var4, var6.width, var6.height, -16777216 | var2.field1557, 0, 1, 0, var7.ascent / 2); // L: 624 + } + } + } // L: 618 621 625 + + @ObfuscatedName("ap") @ObfuscatedSignature( descriptor = "(IILjava/util/HashSet;II)V", - garbageValue = "1464580667" + garbageValue = "-810530478" ) @Export("drawMapLinks") void drawMapLinks(int var1, int var2, HashSet var3, int var4) { - float var5 = (float)var4 / 64.0F; // L: 531 - Iterator var6 = this.icon0List.iterator(); // L: 532 + float var5 = (float)var4 / 64.0F; // L: 628 + Iterator var6 = this.icon0List.iterator(); // L: 629 while (var6.hasNext()) { - AbstractWorldMapIcon var7 = (AbstractWorldMapIcon)var6.next(); // L: 533 - if (var7.hasValidElement()) { // L: 535 - int var8 = var7.coord2.x % 64; // L: 536 - int var9 = var7.coord2.y % 64; // L: 537 - var7.screenX = (int)((float)var1 + var5 * (float)var8); // L: 538 - var7.screenY = (int)((float)var2 + (float)(63 - var9) * var5); // L: 539 - if (!var3.contains(var7.getElement())) { // L: 540 - this.method3295(var7, var7.screenX, var7.screenY, var5); // L: 543 + AbstractWorldMapIcon var7 = (AbstractWorldMapIcon)var6.next(); // L: 630 + if (var7.hasValidElement()) { // L: 632 + int var8 = var7.coord2.x % 64; // L: 633 + int var9 = var7.coord2.y % 64; // L: 634 + var7.screenX = (int)(var5 * (float)var8 + (float)var1); // L: 635 + var7.screenY = (int)((float)var2 + var5 * (float)(63 - var9)); // L: 636 + if (!var3.contains(var7.getElement())) { // L: 637 + this.method3351(var7, var7.screenX, var7.screenY, var5); // L: 640 } } } - } // L: 546 + } // L: 643 - @ObfuscatedName("ao") + @ObfuscatedName("ab") @ObfuscatedSignature( - descriptor = "(Low;Leg;I)I", - garbageValue = "866674988" + descriptor = "(Loh;Len;I)I", + garbageValue = "491939852" ) - int method3299(SpritePixels var1, HorizontalAlignment var2) { - switch(var2.value) { // L: 549 + int method3391(SpritePixels var1, HorizontalAlignment var2) { + switch(var2.value) { // L: 646 case 0: - return 0; // L: 552 + return -var1.subWidth / 2; // L: 649 case 1: - return -var1.subWidth / 2; // L: 556 + return 0; // L: 657 default: - return -var1.subWidth; // L: 560 - } - } - - @ObfuscatedName("aj") - @ObfuscatedSignature( - descriptor = "(Low;Lex;I)I", - garbageValue = "-387662899" - ) - int method3384(SpritePixels var1, VerticalAlignment var2) { - switch(var2.value) { // L: 566 - case 0: - return -var1.subHeight / 2; // L: 569 - case 1: - return 0; // L: 577 - default: - return -var1.subHeight; // L: 573 - } - } - - @ObfuscatedName("at") - @ObfuscatedSignature( - descriptor = "(II)Lfl;", - garbageValue = "1828067299" - ) - WorldMapLabel method3283(int var1) { - WorldMapElement var2 = WorldMapAreaData.WorldMapElement_get(var1); // L: 604 - return this.createMapLabel(var2); // L: 605 - } - - @ObfuscatedName("av") - @ObfuscatedSignature( - descriptor = "(Let;I)Lfl;", - garbageValue = "2136255067" - ) - @Export("createMapLabel") - WorldMapLabel createMapLabel(WorldMapElement var1) { - if (var1.name != null && this.fonts != null && this.fonts.get(WorldMapLabelSize.WorldMapLabelSize_small) != null) { // L: 609 - WorldMapLabelSize var2 = WorldMapLabelSize.method3162(var1.textSize); // L: 612 - if (var2 == null) { // L: 613 - return null; // L: 614 - } else { - Font var3 = (Font)this.fonts.get(var2); // L: 616 - if (var3 == null) { // L: 617 - return null; // L: 618 - } else { - int var4 = var3.lineCount(var1.name, 1000000); // L: 620 - String[] var5 = new String[var4]; // L: 621 - var3.breakLines(var1.name, (int[])null, var5); // L: 622 - int var6 = var5.length * var3.ascent / 2; // L: 623 - int var7 = 0; // L: 624 - String[] var8 = var5; // L: 626 - - for (int var9 = 0; var9 < var8.length; ++var9) { // L: 627 - String var10 = var8[var9]; // L: 628 - int var11 = var3.stringWidth(var10); // L: 630 - if (var11 > var7) { // L: 631 - var7 = var11; // L: 632 - } - } - - return new WorldMapLabel(var1.name, var7, var6, var2); // L: 637 - } - } - } else { - return null; // L: 610 + return -var1.subWidth; // L: 653 } } @ObfuscatedName("al") @ObfuscatedSignature( - descriptor = "(IIIIIB)Ljava/util/List;", - garbageValue = "-79" + descriptor = "(Loh;Lem;I)I", + garbageValue = "1319342568" ) - List method3303(int var1, int var2, int var3, int var4, int var5) { - LinkedList var6 = new LinkedList(); // L: 641 - if (var4 >= var1 && var5 >= var2) { // L: 642 - if (var4 < var3 + var1 && var5 < var3 + var2) { // L: 643 - Iterator var7 = this.iconMap.values().iterator(); // L: 644 + int method3356(SpritePixels var1, VerticalAlignment var2) { + switch(var2.value) { // L: 663 + case 0: + return 0; // L: 674 + case 1: + return -var1.subHeight / 2; // L: 670 + default: + return -var1.subHeight; // L: 666 + } + } + + @ObfuscatedName("ad") + @ObfuscatedSignature( + descriptor = "(II)Lfv;", + garbageValue = "1606957307" + ) + WorldMapLabel method3357(int var1) { + WorldMapElement var2 = class6.WorldMapElement_get(var1); // L: 680 + return this.createMapLabel(var2); // L: 681 + } + + @ObfuscatedName("ai") + @ObfuscatedSignature( + descriptor = "(Lew;I)Lfv;", + garbageValue = "-1759446365" + ) + @Export("createMapLabel") + WorldMapLabel createMapLabel(WorldMapElement var1) { + if (var1.name != null && this.fonts != null && this.fonts.get(WorldMapLabelSize.WorldMapLabelSize_small) != null) { // L: 685 + WorldMapLabelSize var2 = WorldMapLabelSize.method3208(var1.textSize); // L: 688 + if (var2 == null) { // L: 689 + return null; // L: 690 + } else { + Font var3 = (Font)this.fonts.get(var2); // L: 692 + if (var3 == null) { // L: 693 + return null; // L: 694 + } else { + int var4 = var3.lineCount(var1.name, 1000000); // L: 696 + String[] var5 = new String[var4]; // L: 697 + var3.breakLines(var1.name, (int[])null, var5); // L: 698 + int var6 = var5.length * var3.ascent / 2; // L: 699 + int var7 = 0; // L: 700 + String[] var8 = var5; // L: 702 + + for (int var9 = 0; var9 < var8.length; ++var9) { // L: 703 + String var10 = var8[var9]; // L: 704 + int var11 = var3.stringWidth(var10); // L: 706 + if (var11 > var7) { // L: 707 + var7 = var11; // L: 708 + } + } + + return new WorldMapLabel(var1.name, var7, var6, var2); // L: 713 + } + } + } else { + return null; // L: 686 + } + } + + @ObfuscatedName("ar") + @ObfuscatedSignature( + descriptor = "(IIIIII)Ljava/util/List;", + garbageValue = "-183202693" + ) + List method3359(int var1, int var2, int var3, int var4, int var5) { + LinkedList var6 = new LinkedList(); // L: 717 + if (var4 >= var1 && var5 >= var2) { // L: 718 + if (var4 < var3 + var1 && var5 < var3 + var2) { // L: 719 + Iterator var7 = this.iconMap.values().iterator(); // L: 720 AbstractWorldMapIcon var8; while (var7.hasNext()) { - var8 = (AbstractWorldMapIcon)var7.next(); // L: 645 - if (var8.hasValidElement() && var8.fitsScreen(var4, var5)) { // L: 647 - var6.add(var8); // L: 648 + var8 = (AbstractWorldMapIcon)var7.next(); // L: 721 + if (var8.hasValidElement() && var8.fitsScreen(var4, var5)) { // L: 723 + var6.add(var8); // L: 724 } } - var7 = this.icon0List.iterator(); // L: 652 + var7 = this.icon0List.iterator(); // L: 728 while (var7.hasNext()) { - var8 = (AbstractWorldMapIcon)var7.next(); // L: 653 - if (var8.hasValidElement() && var8.fitsScreen(var4, var5)) { // L: 655 - var6.add(var8); // L: 656 + var8 = (AbstractWorldMapIcon)var7.next(); // L: 729 + if (var8.hasValidElement() && var8.fitsScreen(var4, var5)) { // L: 731 + var6.add(var8); // L: 732 } } - return var6; // L: 660 + return var6; // L: 736 } else { - return var6; // L: 651 + return var6; // L: 727 } } else { return var6; } } - @ObfuscatedName("ap") + @ObfuscatedName("ag") @ObfuscatedSignature( - descriptor = "(B)Ljava/util/List;", - garbageValue = "0" + descriptor = "(I)Ljava/util/List;", + garbageValue = "-983336809" ) @Export("icons") List icons() { - LinkedList var1 = new LinkedList(); // L: 664 - var1.addAll(this.icon0List); // L: 665 - var1.addAll(this.iconMap.values()); // L: 666 - return var1; // L: 667 + LinkedList var1 = new LinkedList(); // L: 740 + var1.addAll(this.icon0List); // L: 741 + var1.addAll(this.iconMap.values()); // L: 742 + return var1; // L: 743 } - @ObfuscatedName("am") + @ObfuscatedName("ax") @ObfuscatedSignature( - descriptor = "(IIIIB)V", - garbageValue = "-74" + descriptor = "(IIIII)V", + garbageValue = "575857346" ) - void method3305(int var1, int var2, int var3, int var4) { - var3 %= 4; // L: 671 - if (var3 == 0) { // L: 672 + void method3361(int var1, int var2, int var3, int var4) { + var3 %= 4; // L: 747 + if (var3 == 0) { // L: 748 Rasterizer2D.Rasterizer2D_drawVerticalLine(this.pixelsPerTile * var1, this.pixelsPerTile * (63 - var2), this.pixelsPerTile, var4); } - if (var3 == 1) { // L: 673 + if (var3 == 1) { // L: 749 Rasterizer2D.Rasterizer2D_drawHorizontalLine(this.pixelsPerTile * var1, this.pixelsPerTile * (63 - var2), this.pixelsPerTile, var4); } - if (var3 == 2) { // L: 674 + if (var3 == 2) { // L: 750 Rasterizer2D.Rasterizer2D_drawVerticalLine(this.pixelsPerTile * var1 + this.pixelsPerTile - 1, this.pixelsPerTile * (63 - var2), this.pixelsPerTile, var4); } if (var3 == 3) { - Rasterizer2D.Rasterizer2D_drawHorizontalLine(this.pixelsPerTile * var1, this.pixelsPerTile * (63 - var2) + this.pixelsPerTile - 1, this.pixelsPerTile, var4); // L: 675 + Rasterizer2D.Rasterizer2D_drawHorizontalLine(this.pixelsPerTile * var1, this.pixelsPerTile * (63 - var2) + this.pixelsPerTile - 1, this.pixelsPerTile, var4); // L: 751 } - } // L: 676 + } // L: 752 - @ObfuscatedName("h") - @ObfuscatedSignature( - descriptor = "(I)[Lll;", - garbageValue = "-1392612014" - ) - static PrivateChatMode[] method3351() { - return new PrivateChatMode[]{PrivateChatMode.field3901, PrivateChatMode.field3899, PrivateChatMode.field3900}; // L: 11 - } - - @ObfuscatedName("c") - @ObfuscatedSignature( - descriptor = "(III)V", - garbageValue = "1838028405" - ) - public static void method3397(int var0, int var1) { - VarbitComposition var3 = (VarbitComposition)VarbitComposition.VarbitDefinition_cached.get((long)var0); // L: 48 - VarbitComposition var2; - if (var3 != null) { // L: 49 - var2 = var3; // L: 50 - } else { - byte[] var4 = VarbitComposition.VarbitDefinition_archive.takeFile(14, var0); // L: 53 - var3 = new VarbitComposition(); // L: 54 - if (var4 != null) { // L: 55 - var3.decode(new Buffer(var4)); - } - - VarbitComposition.VarbitDefinition_cached.put(var3, (long)var0); // L: 56 - var2 = var3; // L: 57 - } - - int var8 = var2.baseVar; // L: 60 - int var5 = var2.startBit; // L: 61 - int var6 = var2.endBit; // L: 62 - int var7 = Varps.Varps_masks[var6 - var5]; // L: 63 - if (var1 < 0 || var1 > var7) { // L: 64 - var1 = 0; - } - - var7 <<= var5; // L: 65 - Varps.Varps_main[var8] = Varps.Varps_main[var8] & ~var7 | var1 << var5 & var7; // L: 66 - } // L: 67 - - @ObfuscatedName("l") - @ObfuscatedSignature( - descriptor = "(IB)Z", - garbageValue = "4" - ) - public static boolean method3399(int var0) { - return var0 == WorldMapDecorationType.field3167.id; // L: 46 - } - - @ObfuscatedName("ij") - @ObfuscatedSignature( - descriptor = "(III)V", - garbageValue = "680595351" - ) - static void method3317(int var0, int var1) { - int var2 = WorldMapArea.fontBold12.stringWidth("Choose Option"); // L: 8027 - - int var3; - for (var3 = 0; var3 < Client.menuOptionsCount; ++var3) { // L: 8028 - Font var7 = WorldMapArea.fontBold12; // L: 8029 - String var8; - if (var3 < 0) { // L: 8032 - var8 = ""; // L: 8033 - } else if (Client.menuTargets[var3].length() > 0) { // L: 8036 - var8 = Client.menuActions[var3] + " " + Client.menuTargets[var3]; + @ObfuscatedName("v") + public static final int method3437(double var0, double var2, double var4) { + double var6 = var4; // L: 9 + double var8 = var4; // L: 10 + double var10 = var4; // L: 11 + if (0.0D != var2) { // L: 12 + double var12; + if (var4 < 0.5D) { // L: 14 + var12 = var4 * (1.0D + var2); } else { - var8 = Client.menuActions[var3]; // L: 8037 + var12 = var4 + var2 - var2 * var4; // L: 15 } - int var6 = var7.stringWidth(var8); // L: 8039 - if (var6 > var2) { // L: 8040 - var2 = var6; + double var14 = 2.0D * var4 - var12; // L: 16 + double var16 = var0 + 0.3333333333333333D; // L: 17 + if (var16 > 1.0D) { // L: 18 + --var16; + } + + double var20 = var0 - 0.3333333333333333D; // L: 20 + if (var20 < 0.0D) { // L: 21 + ++var20; + } + + if (var16 * 6.0D < 1.0D) { // L: 22 + var6 = (var12 - var14) * 6.0D * var16 + var14; + } else if (var16 * 2.0D < 1.0D) { // L: 23 + var6 = var12; + } else if (var16 * 3.0D < 2.0D) { // L: 24 + var6 = 6.0D * (var12 - var14) * (0.6666666666666666D - var16) + var14; + } else { + var6 = var14; // L: 25 + } + + if (6.0D * var0 < 1.0D) { // L: 26 + var8 = 6.0D * (var12 - var14) * var0 + var14; + } else if (2.0D * var0 < 1.0D) { // L: 27 + var8 = var12; + } else if (3.0D * var0 < 2.0D) { // L: 28 + var8 = var14 + (var12 - var14) * (0.6666666666666666D - var0) * 6.0D; + } else { + var8 = var14; // L: 29 + } + + if (var20 * 6.0D < 1.0D) { // L: 30 + var10 = var14 + (var12 - var14) * 6.0D * var20; + } else if (2.0D * var20 < 1.0D) { // L: 31 + var10 = var12; + } else if (3.0D * var20 < 2.0D) { // L: 32 + var10 = (var12 - var14) * (0.6666666666666666D - var20) * 6.0D + var14; + } else { + var10 = var14; // L: 33 } } - var2 += 8; // L: 8042 - var3 = Client.menuOptionsCount * 15 + 22; // L: 8043 - int var4 = var0 - var2 / 2; // L: 8044 - if (var4 + var2 > GameEngine.canvasWidth) { // L: 8045 - var4 = GameEngine.canvasWidth - var2; - } - - if (var4 < 0) { // L: 8046 - var4 = 0; - } - - int var5 = var1; // L: 8047 - if (var1 + var3 > HealthBarDefinition.canvasHeight) { // L: 8048 - var5 = HealthBarDefinition.canvasHeight - var3; - } - - if (var5 < 0) { // L: 8049 - var5 = 0; - } - - AbstractByteArrayCopier.menuX = var4; // L: 8050 - HitSplatDefinition.menuY = var5; // L: 8051 - SoundCache.menuWidth = var2; // L: 8052 - GrandExchangeOfferOwnWorldComparator.menuHeight = Client.menuOptionsCount * 15 + 22; // L: 8053 - } // L: 8054 + int var22 = (int)(256.0D * var6); // L: 35 + int var13 = (int)(var8 * 256.0D); // L: 36 + int var23 = (int)(256.0D * var10); // L: 37 + int var15 = var23 + (var13 << 8) + (var22 << 16); // L: 38 + return var15; // L: 39 + } } diff --git a/runescape-client/src/main/java/WorldMapScaleHandler.java b/runescape-client/src/main/java/WorldMapScaleHandler.java index 3188bfce7f..6c04e0fe20 100644 --- a/runescape-client/src/main/java/WorldMapScaleHandler.java +++ b/runescape-client/src/main/java/WorldMapScaleHandler.java @@ -4,16 +4,16 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("gp") +@ObfuscatedName("gb") @Implements("WorldMapScaleHandler") public class WorldMapScaleHandler { - @ObfuscatedName("h") + @ObfuscatedName("v") @ObfuscatedGetter( - intValue = 1398752583 + intValue = -455192265 ) @Export("pixelsPerTile") int pixelsPerTile; - @ObfuscatedName("c") + @ObfuscatedName("n") @Export("tileTemplates") byte[][][] tileTemplates; @@ -21,25 +21,25 @@ public class WorldMapScaleHandler { this.pixelsPerTile = var1; // L: 10 } // L: 11 - @ObfuscatedName("h") + @ObfuscatedName("v") @ObfuscatedSignature( descriptor = "(IIIIIIIIB)V", - garbageValue = "0" + garbageValue = "45" ) - void method3676(int var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8) { + void method3719(int var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8) { if (var7 != 0 && this.pixelsPerTile != 0 && this.tileTemplates != null) { // L: 14 - var8 = this.method3674(var8, var7); // L: 15 - var7 = this.method3692(var7); // L: 16 + var8 = this.method3731(var8, var7); // L: 15 + var7 = this.method3721(var7); // L: 16 Rasterizer2D.Rasterizer2D_drawGradientPixels(var1, var2, var5, var6, var3, var4, this.tileTemplates[var7 - 1][var8], this.pixelsPerTile); // L: 17 } } // L: 18 - @ObfuscatedName("c") + @ObfuscatedName("n") @ObfuscatedSignature( - descriptor = "(IIB)I", - garbageValue = "8" + descriptor = "(III)I", + garbageValue = "-2107942869" ) - int method3674(int var1, int var2) { + int method3731(int var1, int var2) { if (var2 == 9) { // L: 21 var1 = var1 + 1 & 3; } @@ -55,12 +55,12 @@ public class WorldMapScaleHandler { return var1; // L: 24 } - @ObfuscatedName("o") + @ObfuscatedName("f") @ObfuscatedSignature( - descriptor = "(II)I", - garbageValue = "622756612" + descriptor = "(IB)I", + garbageValue = "2" ) - int method3692(int var1) { + int method3721(int var1) { if (var1 != 9 && var1 != 10) { // L: 28 return var1 == 11 ? 8 : var1; // L: 29 } else { @@ -68,10 +68,10 @@ public class WorldMapScaleHandler { } } - @ObfuscatedName("g") + @ObfuscatedName("y") @ObfuscatedSignature( descriptor = "(B)V", - garbageValue = "0" + garbageValue = "123" ) @Export("init") void init() { @@ -88,10 +88,10 @@ public class WorldMapScaleHandler { } } // L: 35 46 - @ObfuscatedName("l") + @ObfuscatedName("p") @ObfuscatedSignature( - descriptor = "(B)V", - garbageValue = "58" + descriptor = "(I)V", + garbageValue = "1080825248" ) @Export("init0") void init0() { @@ -116,8 +116,8 @@ public class WorldMapScaleHandler { for (var3 = this.pixelsPerTile - 1; var3 >= 0; --var3) { // L: 60 for (var4 = 0; var4 < this.pixelsPerTile; ++var4) { // L: 61 - if (var4 <= var3) { // L: 62 - var1[var2] = -1; + if (var4 <= var3) { + var1[var2] = -1; // L: 62 } ++var2; // L: 63 @@ -134,7 +134,7 @@ public class WorldMapScaleHandler { var1[var2] = -1; } - ++var2; + ++var2; // L: 72 } } @@ -155,10 +155,10 @@ public class WorldMapScaleHandler { this.tileTemplates[0][3] = var1; // L: 84 } // L: 85 - @ObfuscatedName("z") + @ObfuscatedName("j") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "-1521805835" + garbageValue = "801681003" ) @Export("init1") void init1() { @@ -226,10 +226,10 @@ public class WorldMapScaleHandler { this.tileTemplates[1][3] = var1; // L: 127 } // L: 128 - @ObfuscatedName("t") + @ObfuscatedName("r") @ObfuscatedSignature( - descriptor = "(B)V", - garbageValue = "0" + descriptor = "(I)V", + garbageValue = "1431897073" ) @Export("init2") void init2() { @@ -293,10 +293,10 @@ public class WorldMapScaleHandler { this.tileTemplates[2][3] = var1; // L: 166 } // L: 167 - @ObfuscatedName("v") + @ObfuscatedName("b") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "945696539" + garbageValue = "-1131330964" ) @Export("init3") void init3() { @@ -360,10 +360,10 @@ public class WorldMapScaleHandler { this.tileTemplates[3][3] = var1; // L: 205 } // L: 206 - @ObfuscatedName("b") + @ObfuscatedName("d") @ObfuscatedSignature( - descriptor = "(B)V", - garbageValue = "-38" + descriptor = "(I)V", + garbageValue = "517266785" ) @Export("init4") void init4() { @@ -388,8 +388,8 @@ public class WorldMapScaleHandler { for (var3 = this.pixelsPerTile - 1; var3 >= 0; --var3) { // L: 220 for (var4 = 0; var4 < this.pixelsPerTile; ++var4) { // L: 221 - if (var4 <= var3 << 1) { - var1[var2] = -1; // L: 222 + if (var4 <= var3 << 1) { // L: 222 + var1[var2] = -1; } ++var2; // L: 223 @@ -427,10 +427,10 @@ public class WorldMapScaleHandler { this.tileTemplates[4][3] = var1; // L: 244 } // L: 245 - @ObfuscatedName("q") + @ObfuscatedName("s") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "-546220378" + garbageValue = "-1671132761" ) @Export("init5") void init5() { @@ -496,10 +496,10 @@ public class WorldMapScaleHandler { this.tileTemplates[5][3] = var1; // L: 285 } // L: 286 - @ObfuscatedName("i") + @ObfuscatedName("u") @ObfuscatedSignature( - descriptor = "(B)V", - garbageValue = "1" + descriptor = "(I)V", + garbageValue = "732319141" ) @Export("init6") void init6() { @@ -565,10 +565,10 @@ public class WorldMapScaleHandler { this.tileTemplates[6][3] = var1; // L: 326 } // L: 327 - @ObfuscatedName("x") + @ObfuscatedName("l") @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "-2005420471" + descriptor = "(B)V", + garbageValue = "83" ) @Export("init7") void init7() { @@ -633,24 +633,4 @@ public class WorldMapScaleHandler { this.tileTemplates[7][3] = var1; // L: 367 } // L: 368 - - @ObfuscatedName("h") - @ObfuscatedSignature( - descriptor = "(ILjava/lang/String;Ljava/lang/String;I)V", - garbageValue = "2013793571" - ) - @Export("addGameMessage") - static void addGameMessage(int var0, String var1, String var2) { - class69.addChatMessage(var0, var1, var2, (String)null); // L: 19 - } // L: 20 - - @ObfuscatedName("o") - @ObfuscatedSignature( - descriptor = "(II)[B", - garbageValue = "418315043" - ) - @Export("ByteArrayPool_getArray") - public static synchronized byte[] ByteArrayPool_getArray(int var0) { - return ByteArrayPool.ByteArrayPool_getArrayBool(var0, false); // L: 72 - } } diff --git a/runescape-client/src/main/java/WorldMapSection.java b/runescape-client/src/main/java/WorldMapSection.java index 2e04c022db..ab1d5de4f8 100644 --- a/runescape-client/src/main/java/WorldMapSection.java +++ b/runescape-client/src/main/java/WorldMapSection.java @@ -3,53 +3,53 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("gl") +@ObfuscatedName("gi") @Implements("WorldMapSection") public interface WorldMapSection { - @ObfuscatedName("h") + @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "(Lfe;I)V", - garbageValue = "-1549282997" + descriptor = "(Lfo;I)V", + garbageValue = "1120913212" ) @Export("expandBounds") void expandBounds(WorldMapArea var1); - @ObfuscatedName("c") + @ObfuscatedName("n") @ObfuscatedSignature( descriptor = "(IIII)Z", - garbageValue = "-1758075186" + garbageValue = "264048682" ) @Export("containsCoord") boolean containsCoord(int var1, int var2, int var3); - @ObfuscatedName("o") + @ObfuscatedName("f") @ObfuscatedSignature( - descriptor = "(III)Z", - garbageValue = "226487857" + descriptor = "(IIB)Z", + garbageValue = "-11" ) @Export("containsPosition") boolean containsPosition(int var1, int var2); - @ObfuscatedName("g") + @ObfuscatedName("y") @ObfuscatedSignature( - descriptor = "(IIIB)[I", - garbageValue = "118" + descriptor = "(IIII)[I", + garbageValue = "1943891890" ) @Export("getBorderTileLengths") int[] getBorderTileLengths(int var1, int var2, int var3); - @ObfuscatedName("l") + @ObfuscatedName("p") @ObfuscatedSignature( - descriptor = "(III)Lia;", - garbageValue = "-400477740" + descriptor = "(III)Lii;", + garbageValue = "691158162" ) @Export("coord") Coord coord(int var1, int var2); - @ObfuscatedName("z") + @ObfuscatedName("j") @ObfuscatedSignature( - descriptor = "(Lnk;B)V", - garbageValue = "45" + descriptor = "(Lnd;I)V", + garbageValue = "-1138667895" ) @Export("read") void read(Buffer var1); diff --git a/runescape-client/src/main/java/WorldMapSection0.java b/runescape-client/src/main/java/WorldMapSection0.java index 15e5746277..049773df0d 100644 --- a/runescape-client/src/main/java/WorldMapSection0.java +++ b/runescape-client/src/main/java/WorldMapSection0.java @@ -4,96 +4,96 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("fc") +@ObfuscatedName("fy") @Implements("WorldMapSection0") public class WorldMapSection0 implements WorldMapSection { - @ObfuscatedName("dt") + @ObfuscatedName("bv") @ObfuscatedSignature( - descriptor = "Lji;" + descriptor = "Lnc;" ) - @Export("archive5") - static Archive archive5; - @ObfuscatedName("h") + @Export("loginType") + static LoginType loginType; + @ObfuscatedName("v") @ObfuscatedGetter( - intValue = -231023039 + intValue = -1266673559 ) @Export("oldZ") int oldZ; - @ObfuscatedName("c") + @ObfuscatedName("n") @ObfuscatedGetter( - intValue = 560237143 + intValue = 36841939 ) @Export("newZ") int newZ; - @ObfuscatedName("o") + @ObfuscatedName("f") @ObfuscatedGetter( - intValue = 1956077611 + intValue = -1295466191 ) @Export("oldX") int oldX; - @ObfuscatedName("g") + @ObfuscatedName("y") @ObfuscatedGetter( - intValue = -1591640519 + intValue = -468293811 ) @Export("oldY") int oldY; - @ObfuscatedName("l") + @ObfuscatedName("p") @ObfuscatedGetter( - intValue = -1927817697 + intValue = -336136429 ) @Export("newX") int newX; - @ObfuscatedName("z") + @ObfuscatedName("j") @ObfuscatedGetter( - intValue = 1122317267 + intValue = -792173003 ) @Export("newY") int newY; - @ObfuscatedName("t") + @ObfuscatedName("r") @ObfuscatedGetter( - intValue = -755347447 + intValue = 241806671 ) @Export("oldChunkXLow") int oldChunkXLow; - @ObfuscatedName("v") + @ObfuscatedName("b") @ObfuscatedGetter( - intValue = -2112581737 + intValue = -1800377871 ) @Export("oldChunkYLow") int oldChunkYLow; - @ObfuscatedName("b") + @ObfuscatedName("d") @ObfuscatedGetter( - intValue = -1581407301 + intValue = 2078535785 ) @Export("oldChunkXHigh") int oldChunkXHigh; - @ObfuscatedName("q") + @ObfuscatedName("s") @ObfuscatedGetter( - intValue = -66476113 + intValue = 1891382951 ) @Export("oldChunkYHigh") int oldChunkYHigh; - @ObfuscatedName("i") + @ObfuscatedName("u") @ObfuscatedGetter( - intValue = 195666035 + intValue = -833437573 ) @Export("newChunkXLow") int newChunkXLow; - @ObfuscatedName("x") + @ObfuscatedName("l") @ObfuscatedGetter( - intValue = 1912029649 + intValue = -2027622395 ) @Export("newChunkYLow") int newChunkYLow; - @ObfuscatedName("k") + @ObfuscatedName("o") @ObfuscatedGetter( - intValue = -1765054251 + intValue = 1314551747 ) @Export("newChunkXHigh") int newChunkXHigh; - @ObfuscatedName("r") + @ObfuscatedName("c") @ObfuscatedGetter( - intValue = 1729991643 + intValue = -2008874357 ) @Export("newChunkYHigh") int newChunkYHigh; @@ -101,10 +101,10 @@ public class WorldMapSection0 implements WorldMapSection { WorldMapSection0() { } // L: 22 - @ObfuscatedName("h") + @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "(Lfe;I)V", - garbageValue = "-1549282997" + descriptor = "(Lfo;I)V", + garbageValue = "1120913212" ) @Export("expandBounds") public void expandBounds(WorldMapArea var1) { @@ -113,78 +113,78 @@ public class WorldMapSection0 implements WorldMapSection { } if (var1.regionHighX < this.newX) { - var1.regionHighX = this.newX; // L: 26 + var1.regionHighX = this.newX; } - if (var1.regionLowY > this.newY) { // L: 27 + if (var1.regionLowY > this.newY) { var1.regionLowY = this.newY; } - if (var1.regionHighY < this.newY) { // L: 28 + if (var1.regionHighY < this.newY) { var1.regionHighY = this.newY; } - } // L: 29 + } - @ObfuscatedName("c") + @ObfuscatedName("n") @ObfuscatedSignature( descriptor = "(IIII)Z", - garbageValue = "-1758075186" + garbageValue = "264048682" ) @Export("containsCoord") public boolean containsCoord(int var1, int var2, int var3) { - if (var1 >= this.oldZ && var1 < this.newZ + this.oldZ) { - return var2 >= (this.oldX << 6) + (this.oldChunkXLow << 3) && var2 <= (this.oldX << 6) + (this.oldChunkXHigh << 3) + 7 && var3 >= (this.oldY << 6) + (this.oldChunkYLow << 3) && var3 <= (this.oldY << 6) + (this.oldChunkYHigh << 3) + 7; + if (var1 >= this.oldZ && var1 < this.oldZ + this.newZ) { // L: 32 + return var2 >= (this.oldX << 6) + (this.oldChunkXLow << 3) && var2 <= (this.oldX << 6) + (this.oldChunkXHigh << 3) + 7 && var3 >= (this.oldY << 6) + (this.oldChunkYLow << 3) && var3 <= (this.oldY << 6) + (this.oldChunkYHigh << 3) + 7; // L: 35 } else { - return false; + return false; // L: 33 } } - @ObfuscatedName("o") + @ObfuscatedName("f") @ObfuscatedSignature( - descriptor = "(III)Z", - garbageValue = "226487857" + descriptor = "(IIB)Z", + garbageValue = "-11" ) @Export("containsPosition") public boolean containsPosition(int var1, int var2) { return var1 >= (this.newX << 6) + (this.newChunkXLow << 3) && var1 <= (this.newX << 6) + (this.newChunkXHigh << 3) + 7 && var2 >= (this.newY << 6) + (this.newChunkYLow << 3) && var2 <= (this.newY << 6) + (this.newChunkYHigh << 3) + 7; // L: 39 } - @ObfuscatedName("g") + @ObfuscatedName("y") @ObfuscatedSignature( - descriptor = "(IIIB)[I", - garbageValue = "118" + descriptor = "(IIII)[I", + garbageValue = "1943891890" ) @Export("getBorderTileLengths") public int[] getBorderTileLengths(int var1, int var2, int var3) { if (!this.containsCoord(var1, var2, var3)) { // L: 43 - return null; // L: 44 + return null; } else { - int[] var4 = new int[]{var2 + (this.newX * 64 - this.oldX * 64) + (this.newChunkXLow * 8 - this.oldChunkXLow * 8), var3 + (this.newY * 64 - this.oldY * 64) + (this.newChunkYLow * 8 - this.oldChunkYLow * 8)}; // L: 46 47 48 - return var4; // L: 49 + int[] var4 = new int[]{var2 + (this.newX * 64 - this.oldX * 64) + (this.newChunkXLow * 8 - this.oldChunkXLow * 8), var3 + (this.newY * 64 - this.oldY * 64) + (this.newChunkYLow * 8 - this.oldChunkYLow * 8)}; + return var4; } } - @ObfuscatedName("l") + @ObfuscatedName("p") @ObfuscatedSignature( - descriptor = "(III)Lia;", - garbageValue = "-400477740" + descriptor = "(III)Lii;", + garbageValue = "691158162" ) @Export("coord") public Coord coord(int var1, int var2) { if (!this.containsPosition(var1, var2)) { // L: 53 - return null; // L: 54 + return null; } else { int var3 = this.oldX * 64 - this.newX * 64 + (this.oldChunkXLow * 8 - this.newChunkXLow * 8) + var1; // L: 56 - int var4 = var2 + (this.oldY * 64 - this.newY * 64) + (this.oldChunkYLow * 8 - this.newChunkYLow * 8); // L: 57 - return new Coord(this.oldZ, var3, var4); // L: 58 + int var4 = var2 + (this.oldY * 64 - this.newY * 64) + (this.oldChunkYLow * 8 - this.newChunkYLow * 8); + return new Coord(this.oldZ, var3, var4); } } - @ObfuscatedName("z") + @ObfuscatedName("j") @ObfuscatedSignature( - descriptor = "(Lnk;B)V", - garbageValue = "45" + descriptor = "(Lnd;I)V", + garbageValue = "-1138667895" ) @Export("read") public void read(Buffer var1) { @@ -202,63 +202,81 @@ public class WorldMapSection0 implements WorldMapSection { this.newY = var1.readUnsignedShort(); // L: 73 this.newChunkYLow = var1.readUnsignedByte(); // L: 74 this.newChunkYHigh = var1.readUnsignedByte(); // L: 75 - this.postRead(); - } + this.postRead(); // L: 76 + } // L: 77 - @ObfuscatedName("t") + @ObfuscatedName("r") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "2034729306" + garbageValue = "-1517456697" ) @Export("postRead") void postRead() { } // L: 79 - @ObfuscatedName("c") + @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "(II)Ler;", - garbageValue = "-1776977881" + descriptor = "(IIS)I", + garbageValue = "12620" ) - public static FloorOverlayDefinition method3534(int var0) { - FloorOverlayDefinition var1 = (FloorOverlayDefinition)FloorOverlayDefinition.FloorOverlayDefinition_cached.get((long)var0); // L: 30 - if (var1 != null) { // L: 31 - return var1; - } else { - byte[] var2 = class288.FloorOverlayDefinition_archive.takeFile(4, var0); // L: 32 - var1 = new FloorOverlayDefinition(); // L: 33 - if (var2 != null) { // L: 34 - var1.decode(new Buffer(var2), var0); + static int method3590(int var0, int var1) { + if (var0 == -2) { // L: 15 + return 12345678; + } else if (var0 == -1) { // L: 16 + if (var1 < 0) { // L: 17 + var1 = 0; // L: 18 + } else if (var1 > 127) { // L: 20 + var1 = 127; // L: 21 } - var1.postDecode(); // L: 35 - FloorOverlayDefinition.FloorOverlayDefinition_cached.put(var1, (long)var0); // L: 36 - return var1; // L: 37 + var1 = 127 - var1; // L: 23 + return var1; // L: 24 + } else { + var1 = (var0 & 127) * var1 / 128; // L: 26 + if (var1 < 2) { // L: 27 + var1 = 2; + } else if (var1 > 126) { // L: 28 + var1 = 126; + } + + return (var0 & 65408) + var1; // L: 29 } } - @ObfuscatedName("g") + @ObfuscatedName("n") @ObfuscatedSignature( - descriptor = "([BI)V", - garbageValue = "-1844383882" + descriptor = "(Ljava/lang/CharSequence;I)Ljava/lang/String;", + garbageValue = "-2020954619" ) - @Export("ByteArrayPool_release") - public static synchronized void ByteArrayPool_release(byte[] var0) { - if (var0.length == 100 && ByteArrayPool.ByteArrayPool_smallCount < 1000) { // L: 76 - ByteArrayPool.ByteArrayPool_small[++ByteArrayPool.ByteArrayPool_smallCount - 1] = var0; // L: 77 - } else if (var0.length == 5000 && ByteArrayPool.ByteArrayPool_mediumCount < 250) { // L: 80 - ByteArrayPool.ByteArrayPool_medium[++ByteArrayPool.ByteArrayPool_mediumCount - 1] = var0; // L: 81 - } else if (var0.length == 30000 && ByteArrayPool.ByteArrayPool_largeCount < 50) { // L: 84 - ByteArrayPool.ByteArrayPool_large[++ByteArrayPool.ByteArrayPool_largeCount - 1] = var0; // L: 85 - } else { - if (ByteArrayPool.ByteArrayPool_arrays != null) { // L: 88 - for (int var1 = 0; var1 < class15.ByteArrayPool_alternativeSizes.length; ++var1) { // L: 89 - if (var0.length == class15.ByteArrayPool_alternativeSizes[var1] && class9.ByteArrayPool_altSizeArrayCounts[var1] < ByteArrayPool.ByteArrayPool_arrays[var1].length) { // L: 90 - ByteArrayPool.ByteArrayPool_arrays[var1][class9.ByteArrayPool_altSizeArrayCounts[var1]++] = var0; // L: 91 - return; // L: 92 - } - } + public static String method3589(CharSequence var0) { + long var3 = 0L; // L: 44 + int var5 = var0.length(); // L: 45 + + for (int var6 = 0; var6 < var5; ++var6) { // L: 46 + var3 *= 37L; // L: 47 + char var7 = var0.charAt(var6); // L: 48 + if (var7 >= 'A' && var7 <= 'Z') { // L: 49 + var3 += (long)(var7 + 1 - 65); + } else if (var7 >= 'a' && var7 <= 'z') { // L: 50 + var3 += (long)(var7 + 1 - 97); + } else if (var7 >= '0' && var7 <= '9') { + var3 += (long)(var7 + 27 - 48); // L: 51 } + if (var3 >= 177917621779460413L) { // L: 52 + break; + } } - } // L: 78 82 86 96 + + while (var3 % 37L == 0L && var3 != 0L) { // L: 54 + var3 /= 37L; + } + + String var8 = class258.base37DecodeLong(var3); // L: 57 + if (var8 == null) { // L: 58 + var8 = ""; + } + + return var8; // L: 59 + } } diff --git a/runescape-client/src/main/java/WorldMapSection1.java b/runescape-client/src/main/java/WorldMapSection1.java index d267fbbc63..e745588c32 100644 --- a/runescape-client/src/main/java/WorldMapSection1.java +++ b/runescape-client/src/main/java/WorldMapSection1.java @@ -4,42 +4,45 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("go") +@ObfuscatedName("gg") @Implements("WorldMapSection1") public class WorldMapSection1 implements WorldMapSection { - @ObfuscatedName("h") + @ObfuscatedName("aw") + @Export("hasFocus") + protected static boolean hasFocus; + @ObfuscatedName("v") @ObfuscatedGetter( - intValue = -1783112513 + intValue = -1722297591 ) @Export("minPlane") int minPlane; - @ObfuscatedName("c") + @ObfuscatedName("n") @ObfuscatedGetter( - intValue = -369835087 + intValue = -1533702617 ) @Export("planes") int planes; - @ObfuscatedName("o") + @ObfuscatedName("f") @ObfuscatedGetter( - intValue = -1711562029 + intValue = 51994539 ) @Export("regionStartX") int regionStartX; - @ObfuscatedName("g") + @ObfuscatedName("y") @ObfuscatedGetter( - intValue = -1629801735 + intValue = 1997271109 ) @Export("regionStartY") int regionStartY; - @ObfuscatedName("l") + @ObfuscatedName("p") @ObfuscatedGetter( - intValue = -2039956485 + intValue = -1700415935 ) @Export("regionEndX") int regionEndX; - @ObfuscatedName("z") + @ObfuscatedName("j") @ObfuscatedGetter( - intValue = 942454871 + intValue = -61887781 ) @Export("regionEndY") int regionEndY; @@ -47,10 +50,10 @@ public class WorldMapSection1 implements WorldMapSection { WorldMapSection1() { } // L: 14 - @ObfuscatedName("h") + @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "(Lfe;I)V", - garbageValue = "-1549282997" + descriptor = "(Lfo;I)V", + garbageValue = "1120913212" ) @Export("expandBounds") public void expandBounds(WorldMapArea var1) { @@ -72,10 +75,10 @@ public class WorldMapSection1 implements WorldMapSection { } // L: 21 - @ObfuscatedName("c") + @ObfuscatedName("n") @ObfuscatedSignature( descriptor = "(IIII)Z", - garbageValue = "-1758075186" + garbageValue = "264048682" ) @Export("containsCoord") public boolean containsCoord(int var1, int var2, int var3) { @@ -86,20 +89,20 @@ public class WorldMapSection1 implements WorldMapSection { } } - @ObfuscatedName("o") + @ObfuscatedName("f") @ObfuscatedSignature( - descriptor = "(III)Z", - garbageValue = "226487857" + descriptor = "(IIB)Z", + garbageValue = "-11" ) @Export("containsPosition") public boolean containsPosition(int var1, int var2) { return var1 >> 6 == this.regionEndX && var2 >> 6 == this.regionEndY; // L: 31 } - @ObfuscatedName("g") + @ObfuscatedName("y") @ObfuscatedSignature( - descriptor = "(IIIB)[I", - garbageValue = "118" + descriptor = "(IIII)[I", + garbageValue = "1943891890" ) @Export("getBorderTileLengths") public int[] getBorderTileLengths(int var1, int var2, int var3) { @@ -111,10 +114,10 @@ public class WorldMapSection1 implements WorldMapSection { } } - @ObfuscatedName("l") + @ObfuscatedName("p") @ObfuscatedSignature( - descriptor = "(III)Lia;", - garbageValue = "-400477740" + descriptor = "(III)Lii;", + garbageValue = "691158162" ) @Export("coord") public Coord coord(int var1, int var2) { @@ -127,10 +130,10 @@ public class WorldMapSection1 implements WorldMapSection { } } - @ObfuscatedName("z") + @ObfuscatedName("j") @ObfuscatedSignature( - descriptor = "(Lnk;B)V", - garbageValue = "45" + descriptor = "(Lnd;I)V", + garbageValue = "-1138667895" ) @Export("read") public void read(Buffer var1) { @@ -143,10 +146,10 @@ public class WorldMapSection1 implements WorldMapSection { this.postRead(); // L: 60 } // L: 61 - @ObfuscatedName("t") + @ObfuscatedName("r") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "-2051242411" + garbageValue = "1321456868" ) @Export("postRead") void postRead() { diff --git a/runescape-client/src/main/java/WorldMapSection2.java b/runescape-client/src/main/java/WorldMapSection2.java index 68df9f8a80..c3741f058e 100644 --- a/runescape-client/src/main/java/WorldMapSection2.java +++ b/runescape-client/src/main/java/WorldMapSection2.java @@ -3,99 +3,100 @@ 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("fz") +@ObfuscatedName("fb") @Implements("WorldMapSection2") public class WorldMapSection2 implements WorldMapSection { - @ObfuscatedName("h") + @ObfuscatedName("v") @ObfuscatedGetter( - intValue = -574544601 + intValue = -1405879659 ) @Export("minPlane") int minPlane; - @ObfuscatedName("c") + @ObfuscatedName("n") @ObfuscatedGetter( - intValue = 2082921709 + intValue = -1291885051 ) @Export("planes") int planes; - @ObfuscatedName("o") + @ObfuscatedName("f") @ObfuscatedGetter( - intValue = -825863277 + intValue = 1139978387 ) @Export("regionStartX") int regionStartX; - @ObfuscatedName("g") + @ObfuscatedName("y") @ObfuscatedGetter( - intValue = -923069469 + intValue = -1146438231 ) @Export("regionStartY") int regionStartY; - @ObfuscatedName("l") + @ObfuscatedName("p") @ObfuscatedGetter( - intValue = -584242267 + intValue = -144912345 ) @Export("regionEndX") int regionEndX; - @ObfuscatedName("z") + @ObfuscatedName("j") @ObfuscatedGetter( - intValue = 313312205 + intValue = -720689063 ) @Export("regionEndY") int regionEndY; - @ObfuscatedName("t") + @ObfuscatedName("r") @ObfuscatedGetter( - intValue = -469024903 + intValue = -18859023 ) - int field1958; - @ObfuscatedName("v") - @ObfuscatedGetter( - intValue = 1918816893 - ) - int field1960; + int field1952; @ObfuscatedName("b") @ObfuscatedGetter( - intValue = -2046543027 + intValue = -1614238823 ) - int field1957; - @ObfuscatedName("q") + int field1947; + @ObfuscatedName("d") @ObfuscatedGetter( - intValue = -2045356969 + intValue = -120763515 ) - int field1961; + int field1946; + @ObfuscatedName("s") + @ObfuscatedGetter( + intValue = 1556024609 + ) + int field1955; WorldMapSection2() { } // L: 18 - @ObfuscatedName("h") + @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "(Lfe;I)V", - garbageValue = "-1549282997" + descriptor = "(Lfo;I)V", + garbageValue = "1120913212" ) @Export("expandBounds") public void expandBounds(WorldMapArea var1) { - if (var1.regionLowX > this.field1958) { // L: 21 - var1.regionLowX = this.field1958; + if (var1.regionLowX > this.field1952) { // L: 21 + var1.regionLowX = this.field1952; } - if (var1.regionHighX < this.field1957) { - var1.regionHighX = this.field1957; // L: 22 + if (var1.regionHighX < this.field1946) { + var1.regionHighX = this.field1946; // L: 22 } - if (var1.regionLowY > this.field1960) { // L: 23 - var1.regionLowY = this.field1960; + if (var1.regionLowY > this.field1947) { // L: 23 + var1.regionLowY = this.field1947; } - if (var1.regionHighY < this.field1961) { // L: 24 - var1.regionHighY = this.field1961; + if (var1.regionHighY < this.field1955) { // L: 24 + var1.regionHighY = this.field1955; } } // L: 25 - @ObfuscatedName("c") + @ObfuscatedName("n") @ObfuscatedSignature( descriptor = "(IIII)Z", - garbageValue = "-1758075186" + garbageValue = "264048682" ) @Export("containsCoord") public boolean containsCoord(int var1, int var2, int var3) { @@ -106,51 +107,51 @@ public class WorldMapSection2 implements WorldMapSection { } } - @ObfuscatedName("o") + @ObfuscatedName("f") @ObfuscatedSignature( - descriptor = "(III)Z", - garbageValue = "226487857" + descriptor = "(IIB)Z", + garbageValue = "-11" ) @Export("containsPosition") public boolean containsPosition(int var1, int var2) { - return var1 >> 6 >= this.field1958 && var1 >> 6 <= this.field1957 && var2 >> 6 >= this.field1960 && var2 >> 6 <= this.field1961; // L: 35 + return var1 >> 6 >= this.field1952 && var1 >> 6 <= this.field1946 && var2 >> 6 >= this.field1947 && var2 >> 6 <= this.field1955; // L: 35 } - @ObfuscatedName("g") + @ObfuscatedName("y") @ObfuscatedSignature( - descriptor = "(IIIB)[I", - garbageValue = "118" + descriptor = "(IIII)[I", + garbageValue = "1943891890" ) @Export("getBorderTileLengths") public int[] getBorderTileLengths(int var1, int var2, int var3) { if (!this.containsCoord(var1, var2, var3)) { // L: 39 return null; // L: 40 } else { - int[] var4 = new int[]{var2 + (this.field1958 * 64 - this.regionStartX * 64), var3 + (this.field1960 * 64 - this.regionStartY * 64)}; // L: 42 43 44 + int[] var4 = new int[]{var2 + (this.field1952 * 64 - this.regionStartX * 64), var3 + (this.field1947 * 64 - this.regionStartY * 64)}; // L: 42 43 44 return var4; // L: 45 } } - @ObfuscatedName("l") + @ObfuscatedName("p") @ObfuscatedSignature( - descriptor = "(III)Lia;", - garbageValue = "-400477740" + descriptor = "(III)Lii;", + garbageValue = "691158162" ) @Export("coord") public Coord coord(int var1, int var2) { if (!this.containsPosition(var1, var2)) { // L: 49 return null; // L: 50 } else { - int var3 = this.regionStartX * 64 - this.field1958 * 64 + var1; // L: 52 - int var4 = var2 + (this.regionStartY * 64 - this.field1960 * 64); // L: 53 + int var3 = this.regionStartX * 64 - this.field1952 * 64 + var1; // L: 52 + int var4 = var2 + (this.regionStartY * 64 - this.field1947 * 64); // L: 53 return new Coord(this.minPlane, var3, var4); // L: 54 } } - @ObfuscatedName("z") + @ObfuscatedName("j") @ObfuscatedSignature( - descriptor = "(Lnk;B)V", - garbageValue = "45" + descriptor = "(Lnd;I)V", + garbageValue = "-1138667895" ) @Export("read") public void read(Buffer var1) { @@ -160,17 +161,17 @@ public class WorldMapSection2 implements WorldMapSection { this.regionStartY = var1.readUnsignedShort(); // L: 61 this.regionEndX = var1.readUnsignedShort(); // L: 62 this.regionEndY = var1.readUnsignedShort(); // L: 63 - this.field1958 = var1.readUnsignedShort(); // L: 64 - this.field1960 = var1.readUnsignedShort(); // L: 65 - this.field1957 = var1.readUnsignedShort(); // L: 66 - this.field1961 = var1.readUnsignedShort(); // L: 67 + this.field1952 = var1.readUnsignedShort(); // L: 64 + this.field1947 = var1.readUnsignedShort(); // L: 65 + this.field1946 = var1.readUnsignedShort(); // L: 66 + this.field1955 = var1.readUnsignedShort(); // L: 67 this.postRead(); // L: 68 } // L: 69 - @ObfuscatedName("t") + @ObfuscatedName("r") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "468309682" + garbageValue = "1294582509" ) @Export("postRead") void postRead() { @@ -178,10 +179,143 @@ public class WorldMapSection2 implements WorldMapSection { @ObfuscatedName("h") @ObfuscatedSignature( - descriptor = "(III)I", - garbageValue = "1025838705" + descriptor = "(ILcf;ZI)I", + garbageValue = "-2037016852" ) - public static int method3202(int var0, int var1) { - return (-3 - var0 << 8) + var1; // L: 13 + static int method3257(int var0, Script var1, boolean var2) { + if (var0 == ScriptOpcodes.CLIENTCLOCK) { // L: 1855 + Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = Client.cycle; // L: 1856 + return 1; // L: 1857 + } else { + int var3; + int var4; + if (var0 == ScriptOpcodes.INV_GETOBJ) { // L: 1859 + class44.Interpreter_intStackSize -= 2; // L: 1860 + var3 = Interpreter.Interpreter_intStack[class44.Interpreter_intStackSize]; // L: 1861 + var4 = Interpreter.Interpreter_intStack[class44.Interpreter_intStackSize + 1]; // L: 1862 + Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = GameEngine.method538(var3, var4); // L: 1863 + return 1; // L: 1864 + } else if (var0 == ScriptOpcodes.INV_GETNUM) { // L: 1866 + class44.Interpreter_intStackSize -= 2; // L: 1867 + var3 = Interpreter.Interpreter_intStack[class44.Interpreter_intStackSize]; // L: 1868 + var4 = Interpreter.Interpreter_intStack[class44.Interpreter_intStackSize + 1]; // L: 1869 + Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = class20.ItemContainer_getCount(var3, var4); // L: 1870 + return 1; // L: 1871 + } else if (var0 == ScriptOpcodes.INV_TOTAL) { // L: 1873 + class44.Interpreter_intStackSize -= 2; // L: 1874 + var3 = Interpreter.Interpreter_intStack[class44.Interpreter_intStackSize]; // L: 1875 + var4 = Interpreter.Interpreter_intStack[class44.Interpreter_intStackSize + 1]; // L: 1876 + Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = LoginScreenAnimation.method2235(var3, var4); // L: 1877 + return 1; // L: 1878 + } else if (var0 == ScriptOpcodes.INV_SIZE) { // L: 1880 + var3 = Interpreter.Interpreter_intStack[--class44.Interpreter_intStackSize]; // L: 1881 + Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = GrandExchangeOfferOwnWorldComparator.getInvDefinition(var3).size; // L: 1882 + return 1; // L: 1883 + } else if (var0 == ScriptOpcodes.STAT) { // L: 1885 + var3 = Interpreter.Interpreter_intStack[--class44.Interpreter_intStackSize]; // L: 1886 + Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = Client.currentLevels[var3]; // L: 1887 + return 1; // L: 1888 + } else if (var0 == ScriptOpcodes.STAT_BASE) { // L: 1890 + var3 = Interpreter.Interpreter_intStack[--class44.Interpreter_intStackSize]; // L: 1891 + Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = Client.levels[var3]; // L: 1892 + return 1; // L: 1893 + } else if (var0 == ScriptOpcodes.STAT_XP) { // L: 1895 + var3 = Interpreter.Interpreter_intStack[--class44.Interpreter_intStackSize]; // L: 1896 + Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = Client.experience[var3]; // L: 1897 + return 1; // L: 1898 + } else { + int var5; + if (var0 == ScriptOpcodes.COORD) { // L: 1900 + var3 = class22.Client_plane; // L: 1901 + var4 = (class93.localPlayer.x >> 7) + VertexNormal.baseX; // L: 1902 + var5 = (class93.localPlayer.y >> 7) + SoundSystem.baseY; // L: 1903 + Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = (var4 << 14) + var5 + (var3 << 28); // L: 1904 + return 1; // L: 1905 + } else if (var0 == ScriptOpcodes.COORDX) { // L: 1907 + var3 = Interpreter.Interpreter_intStack[--class44.Interpreter_intStackSize]; // L: 1908 + Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = var3 >> 14 & 16383; // L: 1909 + return 1; // L: 1910 + } else if (var0 == ScriptOpcodes.COORDZ) { // L: 1912 + var3 = Interpreter.Interpreter_intStack[--class44.Interpreter_intStackSize]; // L: 1913 + Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = var3 >> 28; // L: 1914 + return 1; // L: 1915 + } else if (var0 == ScriptOpcodes.COORDY) { // L: 1917 + var3 = Interpreter.Interpreter_intStack[--class44.Interpreter_intStackSize]; // L: 1918 + Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = var3 & 16383; // L: 1919 + return 1; // L: 1920 + } else if (var0 == ScriptOpcodes.MAP_MEMBERS) { // L: 1922 + Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = Client.isMembersWorld ? 1 : 0; // L: 1923 + return 1; // L: 1924 + } else if (var0 == ScriptOpcodes.INVOTHER_GETOBJ) { // L: 1926 + class44.Interpreter_intStackSize -= 2; // L: 1927 + var3 = Interpreter.Interpreter_intStack[class44.Interpreter_intStackSize] + 32768; // L: 1928 + var4 = Interpreter.Interpreter_intStack[class44.Interpreter_intStackSize + 1]; // L: 1929 + Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = GameEngine.method538(var3, var4); // L: 1930 + return 1; // L: 1931 + } else if (var0 == ScriptOpcodes.INVOTHER_GETNUM) { // L: 1933 + class44.Interpreter_intStackSize -= 2; // L: 1934 + var3 = Interpreter.Interpreter_intStack[class44.Interpreter_intStackSize] + 32768; // L: 1935 + var4 = Interpreter.Interpreter_intStack[class44.Interpreter_intStackSize + 1]; // L: 1936 + Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = class20.ItemContainer_getCount(var3, var4); // L: 1937 + return 1; // L: 1938 + } else if (var0 == ScriptOpcodes.INVOTHER_TOTAL) { // L: 1940 + class44.Interpreter_intStackSize -= 2; // L: 1941 + var3 = Interpreter.Interpreter_intStack[class44.Interpreter_intStackSize] + 32768; // L: 1942 + var4 = Interpreter.Interpreter_intStack[class44.Interpreter_intStackSize + 1]; // L: 1943 + Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = LoginScreenAnimation.method2235(var3, var4); // L: 1944 + return 1; // L: 1945 + } else if (var0 == ScriptOpcodes.STAFFMODLEVEL) { // L: 1947 + if (Client.staffModLevel >= 2) { // L: 1948 + Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = Client.staffModLevel; + } else { + Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = 0; // L: 1949 + } + + return 1; // L: 1950 + } else if (var0 == ScriptOpcodes.REBOOTTIMER) { // L: 1952 + Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = Client.rebootTimer; // L: 1953 + return 1; // L: 1954 + } else if (var0 == ScriptOpcodes.MAP_WORLD) { // L: 1956 + Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = Client.worldId; // L: 1957 + return 1; // L: 1958 + } else if (var0 == ScriptOpcodes.RUNENERGY_VISIBLE) { // L: 1960 + Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = Client.runEnergy; // L: 1961 + return 1; // L: 1962 + } else if (var0 == ScriptOpcodes.RUNWEIGHT_VISIBLE) { // L: 1964 + Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = Client.weight; // L: 1965 + return 1; // L: 1966 + } else if (var0 == ScriptOpcodes.PLAYERMOD) { // L: 1968 + if (Client.playerMod) { // L: 1969 + Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = 1; + } else { + Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = 0; // L: 1970 + } + + return 1; // L: 1971 + } else if (var0 == ScriptOpcodes.WORLDFLAGS) { // L: 1973 + Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = Client.worldProperties; // L: 1974 + return 1; // L: 1975 + } else if (var0 == ScriptOpcodes.MOVECOORD) { // L: 1977 + class44.Interpreter_intStackSize -= 4; // L: 1978 + var3 = Interpreter.Interpreter_intStack[class44.Interpreter_intStackSize]; // L: 1979 + var4 = Interpreter.Interpreter_intStack[class44.Interpreter_intStackSize + 1]; // L: 1980 + var5 = Interpreter.Interpreter_intStack[class44.Interpreter_intStackSize + 2]; // L: 1981 + int var6 = Interpreter.Interpreter_intStack[class44.Interpreter_intStackSize + 3]; // L: 1982 + var3 += var4 << 14; // L: 1983 + var3 += var5 << 28; // L: 1984 + var3 += var6; // L: 1985 + Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = var3; // L: 1986 + return 1; // L: 1987 + } else if (var0 == 3326) { // L: 1989 + Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = Client.field651; // L: 1990 + return 1; // L: 1991 + } else if (var0 == 3327) { // L: 1993 + Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = Client.field812; // L: 1994 + return 1; // L: 1995 + } else { + return 2; // L: 1997 + } + } + } } } diff --git a/runescape-client/src/main/java/WorldMapSectionType.java b/runescape-client/src/main/java/WorldMapSectionType.java index a707aa0ed2..30dca2ac15 100644 --- a/runescape-client/src/main/java/WorldMapSectionType.java +++ b/runescape-client/src/main/java/WorldMapSectionType.java @@ -4,74 +4,260 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("fp") +@ObfuscatedName("fx") @Implements("WorldMapSectionType") public enum WorldMapSectionType implements Enumerated { - @ObfuscatedName("h") + @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "Lfp;" + descriptor = "Lfx;" ) @Export("WORLDMAPSECTIONTYPE0") - WORLDMAPSECTIONTYPE0(2, (byte)0), - @ObfuscatedName("c") + WORLDMAPSECTIONTYPE0(0, (byte)0), + @ObfuscatedName("n") @ObfuscatedSignature( - descriptor = "Lfp;" + descriptor = "Lfx;" ) @Export("WORLDMAPSECTIONTYPE1") - WORLDMAPSECTIONTYPE1(3, (byte)1), - @ObfuscatedName("o") + WORLDMAPSECTIONTYPE1(2, (byte)1), + @ObfuscatedName("f") @ObfuscatedSignature( - descriptor = "Lfp;" + descriptor = "Lfx;" ) @Export("WORLDMAPSECTIONTYPE2") WORLDMAPSECTIONTYPE2(1, (byte)2), - @ObfuscatedName("g") + @ObfuscatedName("y") @ObfuscatedSignature( - descriptor = "Lfp;" + descriptor = "Lfx;" ) @Export("WORLDMAPSECTIONTYPE3") - WORLDMAPSECTIONTYPE3(0, (byte)3); + WORLDMAPSECTIONTYPE3(3, (byte)3); - @ObfuscatedName("l") + @ObfuscatedName("p") @ObfuscatedGetter( - intValue = 829502387 + intValue = -694186145 ) @Export("type") final int type; - @ObfuscatedName("z") + @ObfuscatedName("j") @Export("id") final byte id; WorldMapSectionType(int var3, byte var4) { - this.type = var3; // L: 21 - this.id = var4; // L: 22 - } // L: 23 + this.type = var3; + this.id = var4; + } - @ObfuscatedName("h") + @ObfuscatedName("v") @ObfuscatedSignature( descriptor = "(I)I", - garbageValue = "-708237537" + garbageValue = "-907662946" ) @Export("rsOrdinal") public int rsOrdinal() { - return this.id; // L: 26 + return this.id; } - @ObfuscatedName("h") + @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "([BI)Lfu;", - garbageValue = "-1740492560" + descriptor = "(ILjava/lang/String;Lkk;II)Lhq;", + garbageValue = "2062718345" ) - static WorldMapSprite method3540(byte[] var0) { - return var0 == null ? new WorldMapSprite() : new WorldMapSprite(WorldMapAreaData.convertJpgToSprite(var0).pixels); // L: 19 20 + public static PacketBufferNode method3596(int var0, String var1, Language var2, int var3) { + PacketBufferNode var4 = class21.getPacketBufferNode(ClientPacket.field2660, Client.packetWriter.isaacCipher); // L: 17 + var4.packetBuffer.writeByte(0); // L: 18 + int var5 = var4.packetBuffer.offset; // L: 19 + var4.packetBuffer.writeByte(var0); // L: 20 + String var6 = var1.toLowerCase(); + byte var7 = 0; + if (var6.startsWith("yellow:")) { + var7 = 0; + var1 = var1.substring("yellow:".length()); + } else if (var6.startsWith("red:")) { + var7 = 1; // L: 28 + var1 = var1.substring("red:".length()); // L: 29 + } else if (var6.startsWith("green:")) { // L: 31 + var7 = 2; // L: 32 + var1 = var1.substring("green:".length()); // L: 33 + } else if (var6.startsWith("cyan:")) { // L: 35 + var7 = 3; // L: 36 + var1 = var1.substring("cyan:".length()); // L: 37 + } else if (var6.startsWith("purple:")) { // L: 39 + var7 = 4; // L: 40 + var1 = var1.substring("purple:".length()); // L: 41 + } else if (var6.startsWith("white:")) { // L: 43 + var7 = 5; // L: 44 + var1 = var1.substring("white:".length()); // L: 45 + } else if (var6.startsWith("flash1:")) { // L: 47 + var7 = 6; // L: 48 + var1 = var1.substring("flash1:".length()); // L: 49 + } else if (var6.startsWith("flash2:")) { // L: 51 + var7 = 7; // L: 52 + var1 = var1.substring("flash2:".length()); // L: 53 + } else if (var6.startsWith("flash3:")) { // L: 55 + var7 = 8; // L: 56 + var1 = var1.substring("flash3:".length()); // L: 57 + } else if (var6.startsWith("glow1:")) { // L: 59 + var7 = 9; // L: 60 + var1 = var1.substring("glow1:".length()); // L: 61 + } else if (var6.startsWith("glow2:")) { // L: 63 + var7 = 10; // L: 64 + var1 = var1.substring("glow2:".length()); // L: 65 + } else if (var6.startsWith("glow3:")) { // L: 67 + var7 = 11; // L: 68 + var1 = var1.substring("glow3:".length()); // L: 69 + } else if (var2 != Language.Language_EN) { // L: 71 + if (var6.startsWith("yellow:")) { // L: 72 + var7 = 0; // L: 73 + var1 = var1.substring("yellow:".length()); // L: 74 + } else if (var6.startsWith("red:")) { // L: 76 + var7 = 1; // L: 77 + var1 = var1.substring("red:".length()); // L: 78 + } else if (var6.startsWith("green:")) { // L: 80 + var7 = 2; // L: 81 + var1 = var1.substring("green:".length()); // L: 82 + } else if (var6.startsWith("cyan:")) { // L: 84 + var7 = 3; // L: 85 + var1 = var1.substring("cyan:".length()); // L: 86 + } else if (var6.startsWith("purple:")) { // L: 88 + var7 = 4; // L: 89 + var1 = var1.substring("purple:".length()); // L: 90 + } else if (var6.startsWith("white:")) { // L: 92 + var7 = 5; // L: 93 + var1 = var1.substring("white:".length()); // L: 94 + } else if (var6.startsWith("flash1:")) { // L: 96 + var7 = 6; // L: 97 + var1 = var1.substring("flash1:".length()); // L: 98 + } else if (var6.startsWith("flash2:")) { // L: 100 + var7 = 7; // L: 101 + var1 = var1.substring("flash2:".length()); // L: 102 + } else if (var6.startsWith("flash3:")) { // L: 104 + var7 = 8; // L: 105 + var1 = var1.substring("flash3:".length()); // L: 106 + } else if (var6.startsWith("glow1:")) { // L: 108 + var7 = 9; // L: 109 + var1 = var1.substring("glow1:".length()); // L: 110 + } else if (var6.startsWith("glow2:")) { // L: 112 + var7 = 10; // L: 113 + var1 = var1.substring("glow2:".length()); // L: 114 + } else if (var6.startsWith("glow3:")) { // L: 116 + var7 = 11; // L: 117 + var1 = var1.substring("glow3:".length()); // L: 118 + } + } + + var6 = var1.toLowerCase(); // L: 121 + byte var8 = 0; // L: 122 + if (var6.startsWith("wave:")) { // L: 123 + var8 = 1; // L: 124 + var1 = var1.substring("wave:".length()); // L: 125 + } else if (var6.startsWith("wave2:")) { // L: 127 + var8 = 2; // L: 128 + var1 = var1.substring("wave2:".length()); // L: 129 + } else if (var6.startsWith("shake:")) { // L: 131 + var8 = 3; // L: 132 + var1 = var1.substring("shake:".length()); // L: 133 + } else if (var6.startsWith("scroll:")) { // L: 135 + var8 = 4; // L: 136 + var1 = var1.substring("scroll:".length()); // L: 137 + } else if (var6.startsWith("slide:")) { // L: 139 + var8 = 5; // L: 140 + var1 = var1.substring("slide:".length()); // L: 141 + } else if (var2 != Language.Language_EN) { // L: 143 + if (var6.startsWith("wave:")) { // L: 144 + var8 = 1; // L: 145 + var1 = var1.substring("wave:".length()); // L: 146 + } else if (var6.startsWith("wave2:")) { // L: 148 + var8 = 2; // L: 149 + var1 = var1.substring("wave2:".length()); // L: 150 + } else if (var6.startsWith("shake:")) { // L: 152 + var8 = 3; // L: 153 + var1 = var1.substring("shake:".length()); // L: 154 + } else if (var6.startsWith("scroll:")) { // L: 156 + var8 = 4; // L: 157 + var1 = var1.substring("scroll:".length()); // L: 158 + } else if (var6.startsWith("slide:")) { // L: 160 + var8 = 5; // L: 161 + var1 = var1.substring("slide:".length()); // L: 162 + } + } + + var4.packetBuffer.writeByte(var7); // L: 165 + var4.packetBuffer.writeByte(var8); // L: 166 + ParamComposition.method2878(var4.packetBuffer, var1); // L: 167 + if (var0 == class254.field3136.rsOrdinal()) { // L: 168 + var4.packetBuffer.writeByte(var3); // L: 169 + } + + var4.packetBuffer.writeLengthByte(var4.packetBuffer.offset - var5); // L: 171 + return var4; // L: 172 } - @ObfuscatedName("g") + @ObfuscatedName("n") @ObfuscatedSignature( - descriptor = "(I)[Lfp;", - garbageValue = "-998055644" + descriptor = "(IB)Lej;", + garbageValue = "-24" ) - static WorldMapSectionType[] method3537() { - return new WorldMapSectionType[]{WORLDMAPSECTIONTYPE1, WORLDMAPSECTIONTYPE3, WORLDMAPSECTIONTYPE0, WORLDMAPSECTIONTYPE2}; // L: 17 + public static VarcInt method3591(int var0) { + VarcInt var1 = (VarcInt)VarcInt.VarcInt_cached.get((long)var0); // L: 21 + if (var1 != null) { // L: 22 + return var1; + } else { + byte[] var2 = VarcInt.VarcInt_archive.takeFile(19, var0); // L: 23 + var1 = new VarcInt(); // L: 24 + if (var2 != null) { // L: 25 + var1.method2656(new Buffer(var2)); + } + + VarcInt.VarcInt_cached.put(var1, (long)var0); // L: 26 + return var1; // L: 27 + } } + + @ObfuscatedName("fb") + @ObfuscatedSignature( + descriptor = "(I)V", + garbageValue = "-944693216" + ) + static void method3594() { + Client.packetWriter.clearBuffer(); // L: 2507 + Client.packetWriter.packetBuffer.offset = 0; // L: 2508 + Client.packetWriter.serverPacket = null; // L: 2509 + Client.packetWriter.field1411 = null; // L: 2510 + Client.packetWriter.field1412 = null; // L: 2511 + Client.packetWriter.field1400 = null; // L: 2512 + Client.packetWriter.serverPacketLength = 0; // L: 2513 + Client.packetWriter.field1409 = 0; // L: 2514 + Client.rebootTimer = 0; // L: 2515 + class1.method11(); // L: 2516 + Client.minimapState = 0; // L: 2517 + Client.destinationX = 0; // L: 2518 + + int var0; + for (var0 = 0; var0 < 2048; ++var0) { // L: 2519 + Client.players[var0] = null; + } + + class93.localPlayer = null; // L: 2520 + + for (var0 = 0; var0 < Client.npcs.length; ++var0) { // L: 2521 + NPC var1 = Client.npcs[var0]; // L: 2522 + if (var1 != null) { // L: 2523 + var1.targetIndex = -1; // L: 2524 + var1.false0 = false; // L: 2525 + } + } + + Skeleton.method3921(); // L: 2528 + class12.updateGameState(30); // L: 2529 + + for (var0 = 0; var0 < 100; ++var0) { // L: 2530 + Client.field719[var0] = true; + } + + PacketBufferNode var2 = class21.getPacketBufferNode(ClientPacket.field2662, Client.packetWriter.isaacCipher); // L: 2533 + var2.packetBuffer.writeByte(SpotAnimationDefinition.getWindowedMode()); // L: 2534 + var2.packetBuffer.writeShort(class32.canvasWidth); // L: 2535 + var2.packetBuffer.writeShort(ReflectionCheck.canvasHeight); // L: 2536 + Client.packetWriter.addNode(var2); // L: 2537 + } // L: 2539 } diff --git a/runescape-client/src/main/java/WorldMapSprite.java b/runescape-client/src/main/java/WorldMapSprite.java index a8951682ab..ca047c14d8 100644 --- a/runescape-client/src/main/java/WorldMapSprite.java +++ b/runescape-client/src/main/java/WorldMapSprite.java @@ -3,88 +3,49 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("fu") +@ObfuscatedName("fd") @Implements("WorldMapSprite") public final class WorldMapSprite { - @ObfuscatedName("c") + @ObfuscatedName("n") @Export("tileColors") final int[] tileColors; WorldMapSprite() { - this.tileColors = new int[4096]; - } + this.tileColors = new int[4096]; // L: 11 + } // L: 12 WorldMapSprite(int[] var1) { - this.tileColors = var1; - } + this.tileColors = var1; // L: 15 + } // L: 16 - @ObfuscatedName("c") + @ObfuscatedName("n") @ObfuscatedSignature( - descriptor = "(IIB)I", - garbageValue = "0" + descriptor = "(III)I", + garbageValue = "-26460885" ) @Export("getTileColor") final int getTileColor(int var1, int var2) { - return this.tileColors[var1 + var2 * 64]; // L: 24 + return this.tileColors[var2 * 64 + var1]; // L: 24 } - @ObfuscatedName("h") + @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "(II)Lnz;", - garbageValue = "2142784840" + descriptor = "(I)V", + garbageValue = "581142439" ) - public static class374 method3581(int var0) { - int var1 = class372.field4132[var0]; // L: 11 - if (var1 == 1) { // L: 12 - return class374.field4141; // L: 13 - } else if (var1 == 2) { // L: 15 - return class374.field4136; // L: 16 - } else { - return var1 == 3 ? class374.field4135 : null; // L: 18 19 21 - } - } - - @ObfuscatedName("ks") - @ObfuscatedSignature( - descriptor = "(Liv;I)Z", - garbageValue = "418250981" - ) - static final boolean method3580(Widget var0) { - int var1 = var0.contentType; // L: 11352 - if (var1 == 205) { // L: 11353 - Client.logoutTimer = 250; // L: 11354 - return true; // L: 11355 - } else { - int var2; - int var3; - if (var1 >= 300 && var1 <= 313) { // L: 11357 - var2 = (var1 - 300) / 2; // L: 11358 - var3 = var1 & 1; // L: 11359 - Client.playerAppearance.changeAppearance(var2, var3 == 1); // L: 11360 + static void method3631() { + for (ObjectSound var0 = (ObjectSound)ObjectSound.objectSounds.last(); var0 != null; var0 = (ObjectSound)ObjectSound.objectSounds.previous()) { // L: 30 + if (var0.stream1 != null) { // L: 31 + class308.pcmStreamMixer.removeSubStream(var0.stream1); // L: 32 + var0.stream1 = null; // L: 33 } - if (var1 >= 314 && var1 <= 323) { // L: 11362 - var2 = (var1 - 314) / 2; // L: 11363 - var3 = var1 & 1; // L: 11364 - Client.playerAppearance.method4617(var2, var3 == 1); // L: 11365 - } - - if (var1 == 324) { - Client.playerAppearance.changeSex(false); // L: 11367 - } - - if (var1 == 325) { // L: 11368 - Client.playerAppearance.changeSex(true); - } - - if (var1 == 326) { // L: 11369 - PacketBufferNode var4 = HealthBarDefinition.getPacketBufferNode(ClientPacket.field2629, Client.packetWriter.isaacCipher); // L: 11371 - Client.playerAppearance.write(var4.packetBuffer); // L: 11372 - Client.packetWriter.addNode(var4); // L: 11373 - return true; // L: 11374 - } else { - return false; // L: 11376 + if (var0.stream2 != null) { // L: 35 + class308.pcmStreamMixer.removeSubStream(var0.stream2); // L: 36 + var0.stream2 = null; // L: 37 } } - } + + ObjectSound.objectSounds.clear(); // L: 40 + } // L: 41 } diff --git a/runescape-client/src/main/java/Wrapper.java b/runescape-client/src/main/java/Wrapper.java index 7f513a2f39..4af0ef671c 100644 --- a/runescape-client/src/main/java/Wrapper.java +++ b/runescape-client/src/main/java/Wrapper.java @@ -2,10 +2,10 @@ import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; -@ObfuscatedName("hx") +@ObfuscatedName("he") @Implements("Wrapper") public abstract class Wrapper extends DualNode { - @ObfuscatedName("c") + @ObfuscatedName("n") @Export("size") final int size; @@ -13,11 +13,11 @@ public abstract class Wrapper extends DualNode { this.size = var1; // L: 9 } // L: 10 - @ObfuscatedName("h") + @ObfuscatedName("v") @Export("get") abstract Object get(); - @ObfuscatedName("c") + @ObfuscatedName("n") @Export("isSoft") abstract boolean isSoft(); } diff --git a/runescape-client/src/main/java/class0.java b/runescape-client/src/main/java/class0.java index 2cf232c48a..364510c90e 100644 --- a/runescape-client/src/main/java/class0.java +++ b/runescape-client/src/main/java/class0.java @@ -3,118 +3,71 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("h") +@ObfuscatedName("v") public class class0 extends class14 { - @ObfuscatedName("rq") + @ObfuscatedName("v") @ObfuscatedGetter( - intValue = 629327497 + intValue = 1588156263 ) - static int field5; - @ObfuscatedName("da") - @ObfuscatedSignature( - descriptor = "Lji;" - ) - @Export("archive1") - static Archive archive1; - @ObfuscatedName("h") + int field3; + @ObfuscatedName("n") @ObfuscatedGetter( - intValue = 1994958491 + longValue = -2287605941349640037L ) - int field4; - @ObfuscatedName("c") - @ObfuscatedGetter( - longValue = 872492133547765079L - ) - long field3; + long field0; // $FF: synthetic field @ObfuscatedSignature( - descriptor = "Lo;" + descriptor = "Lf;" ) final class2 this$0; @ObfuscatedSignature( - descriptor = "(Lo;)V" + descriptor = "(Lf;)V" ) class0(class2 var1) { this.this$0 = var1; // L: 307 } - @ObfuscatedName("h") + @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "(Lnk;I)V", - garbageValue = "110401227" + descriptor = "(Lnd;I)V", + garbageValue = "-1281352827" ) - void vmethod339(Buffer var1) { - this.field4 = var1.readInt(); // L: 310 - this.field3 = var1.readLong(); // L: 311 + void vmethod276(Buffer var1) { + this.field3 = var1.readInt(); // L: 310 + this.field0 = var1.readLong(); // L: 311 } // L: 312 - @ObfuscatedName("c") + @ObfuscatedName("n") @ObfuscatedSignature( - descriptor = "(Lx;I)V", - garbageValue = "-1535989118" + descriptor = "(Ll;B)V", + garbageValue = "29" ) - void vmethod338(class11 var1) { - var1.method128(this.field4, this.field3); // L: 315 + void vmethod281(ClanSettings var1) { + var1.method122(this.field3, this.field0); // L: 315 } // L: 316 @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "(III)I", - garbageValue = "875989902" + descriptor = "(Lbg;I)V", + garbageValue = "1784663758" ) - static int method6(int var0, int var1) { - ItemContainer var2 = (ItemContainer)ItemContainer.itemContainers.get((long)var0); // L: 28 - if (var2 == null) { // L: 29 - return 0; - } else if (var1 == -1) { // L: 30 - return 0; - } else { - int var3 = 0; // L: 31 - - for (int var4 = 0; var4 < var2.quantities.length; ++var4) { // L: 32 - if (var2.ids[var4] == var1) { - var3 += var2.quantities[var4]; // L: 33 - } - } - - return var3; // L: 35 + @Export("changeWorld") + static void changeWorld(World var0) { + if (var0.isMembersOnly() != Client.isMembersWorld) { // L: 1619 + Client.isMembersWorld = var0.isMembersOnly(); // L: 1620 + WorldMapDecorationType.method4834(var0.isMembersOnly()); // L: 1621 } - } - @ObfuscatedName("ik") - @ObfuscatedSignature( - descriptor = "(IIB)V", - garbageValue = "14" - ) - static final void method0(int var0, int var1) { - if (Client.menuOptionsCount >= 2 || Client.isItemSelected != 0 || Client.isSpellSelected) { // L: 7836 - if (Client.showMouseOverText) { // L: 7837 - int var2 = AttackOption.method2285(); // L: 7838 - String var3; - if (Client.isItemSelected == 1 && Client.menuOptionsCount < 2) { // L: 7840 - var3 = "Use" + " " + Client.selectedItemName + " " + "->"; - } else if (Client.isSpellSelected && Client.menuOptionsCount < 2) { // L: 7841 - var3 = Client.selectedSpellActionName + " " + Client.selectedSpellName + " " + "->"; - } else { - String var4; - if (var2 < 0) { // L: 7845 - var4 = ""; // L: 7846 - } else if (Client.menuTargets[var2].length() > 0) { // L: 7849 - var4 = Client.menuActions[var2] + " " + Client.menuTargets[var2]; - } else { - var4 = Client.menuActions[var2]; // L: 7850 - } - - var3 = var4; // L: 7852 - } - - if (Client.menuOptionsCount > 2) { // L: 7854 - var3 = var3 + HorizontalAlignment.colorStartTag(16777215) + " " + '/' + " " + (Client.menuOptionsCount - 2) + " more options"; - } - - WorldMapArea.fontBold12.drawRandomAlphaAndSpacing(var3, var0 + 4, var1 + 15, 16777215, 0, Client.cycle / 1000); // L: 7855 - } + if (var0.properties != Client.worldProperties) { // L: 1623 + GrandExchangeOfferAgeComparator.method5068(GrandExchangeOfferAgeComparator.archive8, var0.properties); // L: 1624 } - } // L: 7856 + + class80.worldHost = var0.host; // L: 1626 + Client.worldId = var0.id; // L: 1627 + Client.worldProperties = var0.properties; // L: 1628 + WorldMapLabelSize.worldPort = Client.gameBuild == 0 ? 43594 : var0.id + 40000; // L: 1629 + GrandExchangeOfferTotalQuantityComparator.js5Port = Client.gameBuild == 0 ? 443 : var0.id + 50000; // L: 1630 + DesktopPlatformInfoProvider.currentPort = WorldMapLabelSize.worldPort; // L: 1631 + } // L: 1632 } diff --git a/runescape-client/src/main/java/class1.java b/runescape-client/src/main/java/class1.java index f0da2a469e..964e858e69 100644 --- a/runescape-client/src/main/java/class1.java +++ b/runescape-client/src/main/java/class1.java @@ -1,145 +1,102 @@ -import java.security.SecureRandom; -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("c") +@ObfuscatedName("n") public class class1 extends class14 { - @ObfuscatedName("sv") - @ObfuscatedSignature( - descriptor = "Llw;" - ) - @Export("masterDisk") - static ArchiveDisk masterDisk; - @ObfuscatedName("em") - @Export("secureRandom") - static SecureRandom secureRandom; - @ObfuscatedName("hm") + @ObfuscatedName("v") @ObfuscatedGetter( - intValue = 923743135 + intValue = 920679423 ) - @Export("cameraPitch") - static int cameraPitch; - @ObfuscatedName("h") + int field5; + @ObfuscatedName("n") @ObfuscatedGetter( - intValue = -1481109389 + intValue = -2074698601 ) - int field13; - @ObfuscatedName("c") + int field6; + @ObfuscatedName("f") @ObfuscatedGetter( - intValue = 2117262147 + intValue = -1666414987 + ) + int field8; + @ObfuscatedName("y") + @ObfuscatedGetter( + intValue = 1361309885 ) int field9; - @ObfuscatedName("o") - @ObfuscatedGetter( - intValue = 1231074137 - ) - int field10; - @ObfuscatedName("g") - @ObfuscatedGetter( - intValue = -1287195157 - ) - int field15; // $FF: synthetic field @ObfuscatedSignature( - descriptor = "Lo;" + descriptor = "Lf;" ) final class2 this$0; @ObfuscatedSignature( - descriptor = "(Lo;)V" + descriptor = "(Lf;)V" ) class1(class2 var1) { this.this$0 = var1; // L: 289 } - @ObfuscatedName("h") + @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "(Lnk;I)V", - garbageValue = "110401227" + descriptor = "(Lnd;I)V", + garbageValue = "-1281352827" ) - void vmethod339(Buffer var1) { - this.field13 = var1.readInt(); // L: 292 - this.field15 = var1.readInt(); // L: 293 - this.field9 = var1.readUnsignedByte(); // L: 294 - this.field10 = var1.readUnsignedByte(); // L: 295 + void vmethod276(Buffer var1) { + this.field5 = var1.readInt(); // L: 292 + this.field9 = var1.readInt(); // L: 293 + this.field6 = var1.readUnsignedByte(); // L: 294 + this.field8 = var1.readUnsignedByte(); // L: 295 } // L: 296 - @ObfuscatedName("c") + @ObfuscatedName("n") @ObfuscatedSignature( - descriptor = "(Lx;I)V", - garbageValue = "-1535989118" + descriptor = "(Ll;B)V", + garbageValue = "29" ) - void vmethod338(class11 var1) { - var1.method127(this.field13, this.field15, this.field9, this.field10); // L: 299 + void vmethod281(ClanSettings var1) { + var1.method113(this.field5, this.field9, this.field6, this.field8); // L: 299 } // L: 300 - @ObfuscatedName("h") + @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "(Ljp;Ljp;Ljp;Lhp;I)Z", - garbageValue = "-1785830430" + descriptor = "(Ljv;Ljv;B)V", + garbageValue = "10" ) - public static boolean method13(AbstractArchive var0, AbstractArchive var1, AbstractArchive var2, MidiPcmStream var3) { - class232.musicPatchesArchive = var0; // L: 26 - class232.musicSamplesArchive = var1; // L: 27 - UserComparator10.soundEffectsArchive = var2; // L: 28 - class232.midiPcmStream = var3; // L: 29 - return true; // L: 30 - } + public static void method13(AbstractArchive var0, AbstractArchive var1) { + SpotAnimationDefinition.SpotAnimationDefinition_archive = var0; // L: 32 + SpotAnimationDefinition.SpotAnimationDefinition_modelArchive = var1; // L: 33 + } // L: 34 - @ObfuscatedName("am") + @ObfuscatedName("hq") @ObfuscatedSignature( - descriptor = "(ILci;ZB)I", - garbageValue = "1" + descriptor = "(B)V", + garbageValue = "22" ) - static int method16(int var0, Script var1, boolean var2) { - if (var0 == ScriptOpcodes.LOGOUT) { // L: 3495 - Client.logoutTimer = 250; // L: 3496 - return 1; // L: 3497 - } else if (var0 != 5631 && var0 != 5633) { // L: 3499 - if (var0 == 5632) { // L: 3503 - Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = 26; // L: 3504 - return 1; // L: 3505 - } else { - return 2; // L: 3507 + static void method11() { + Client.menuOptionsCount = 0; // L: 7585 + Client.isMenuOpen = false; // L: 7586 + } // L: 7587 + + @ObfuscatedName("kf") + @ObfuscatedSignature( + descriptor = "(III)V", + garbageValue = "-375078554" + ) + static final void method7(int var0, int var1) { + ClanChannel var2 = var0 >= 0 ? Client.currentClanChannels[var0] : ApproximateRouteStrategy.guestClanChannel; // L: 11314 + if (var2 != null && var1 >= 0 && var1 < var2.method27()) { // L: 11315 + ClanChannelMember var3 = (ClanChannelMember)var2.members.get(var1); // L: 11316 + if (var3.rank == -1) { // L: 11317 + String var4 = var3.name; // L: 11318 + PacketWriter var5 = Client.packetWriter; // L: 11319 + PacketBufferNode var6 = class21.getPacketBufferNode(ClientPacket.field2651, var5.isaacCipher); // L: 11320 + var6.packetBuffer.writeByte(3 + Tiles.stringCp1252NullTerminatedByteSize(var4)); // L: 11321 + var6.packetBuffer.writeByte(var0); // L: 11322 + var6.packetBuffer.writeShort(var1); // L: 11323 + var6.packetBuffer.writeStringCp1252NullTerminated(var4); // L: 11324 + var5.addNode(var6); // L: 11325 } - } else { - class13.Interpreter_stringStackSize -= 2; // L: 3500 - return 1; // L: 3501 } - } - - @ObfuscatedName("aq") - @ObfuscatedSignature( - descriptor = "(ILci;ZI)I", - garbageValue = "-281573132" - ) - static int method15(int var0, Script var1, boolean var2) { - if (var0 >= 7200 && var0 < 7204) { // L: 4290 - WorldMapCacheName.Interpreter_intStackSize -= 5; // L: 4291 - Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = -1; // L: 4292 - return 1; // L: 4293 - } else if (var0 == 7204) { // L: 4295 - WorldMapCacheName.Interpreter_intStackSize -= 6; // L: 4296 - Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = -1; // L: 4297 - return 1; // L: 4298 - } else if (var0 >= 7205 && var0 < 7209) { // L: 4300 - Interpreter.Interpreter_intStack[WorldMapCacheName.Interpreter_intStackSize - 1] = -1; // L: 4301 - return 1; // L: 4302 - } else if (var0 == 7209) { // L: 4304 - WorldMapCacheName.Interpreter_intStackSize -= 2; // L: 4305 - Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = -1; // L: 4306 - return 1; // L: 4307 - } else if (var0 >= 7210 && var0 < 7214) { // L: 4309 - --WorldMapCacheName.Interpreter_intStackSize; // L: 4310 - return 1; // L: 4311 - } else if (var0 == 7214) { // L: 4313 - WorldMapCacheName.Interpreter_intStackSize -= 2; // L: 4314 - return 1; // L: 4315 - } else { - return 2; // L: 4317 - } - } + } // L: 11326 } diff --git a/runescape-client/src/main/java/class10.java b/runescape-client/src/main/java/class10.java index 99aac0dc05..f3a7c5f8eb 100644 --- a/runescape-client/src/main/java/class10.java +++ b/runescape-client/src/main/java/class10.java @@ -3,181 +3,54 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("i") +@ObfuscatedName("u") public class class10 extends class14 { - @ObfuscatedName("h") - @ObfuscatedGetter( - intValue = 1208789379 + @ObfuscatedName("sl") + @ObfuscatedSignature( + descriptor = "Lmy;" ) - int field84; + @Export("platformInfo") + static PlatformInfo platformInfo; + @ObfuscatedName("gc") + @ObfuscatedSignature( + descriptor = "[Lop;" + ) + @Export("mapSceneSprites") + static IndexedSprite[] mapSceneSprites; + @ObfuscatedName("v") + @ObfuscatedGetter( + intValue = -91373789 + ) + int field85; // $FF: synthetic field @ObfuscatedSignature( - descriptor = "Lo;" + descriptor = "Lf;" ) final class2 this$0; @ObfuscatedSignature( - descriptor = "(Lo;)V" + descriptor = "(Lf;)V" ) class10(class2 var1) { this.this$0 = var1; - this.field84 = -1; // L: 213 + this.field85 = -1; // L: 213 } // L: 215 - @ObfuscatedName("h") + @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "(Lnk;I)V", - garbageValue = "110401227" + descriptor = "(Lnd;I)V", + garbageValue = "-1281352827" ) - void vmethod339(Buffer var1) { - this.field84 = var1.readUnsignedShort(); // L: 218 + void vmethod276(Buffer var1) { + this.field85 = var1.readUnsignedShort(); // L: 218 } // L: 219 - @ObfuscatedName("c") + @ObfuscatedName("n") @ObfuscatedSignature( - descriptor = "(Lx;I)V", - garbageValue = "-1535989118" + descriptor = "(Ll;B)V", + garbageValue = "29" ) - void vmethod338(class11 var1) { - var1.method121(this.field84); // L: 222 + void vmethod281(ClanSettings var1) { + var1.method139(this.field85); // L: 222 } // L: 223 - - @ObfuscatedName("c") - @ObfuscatedSignature( - descriptor = "(B)V", - garbageValue = "-35" - ) - public static void method109() { - while (true) { - ArchiveDiskAction var0; - synchronized(ArchiveDiskActionHandler.ArchiveDiskActionHandler_requestQueue) { // L: 32 - var0 = (ArchiveDiskAction)ArchiveDiskActionHandler.ArchiveDiskActionHandler_responseQueue.removeLast(); // L: 33 - } // L: 34 - - if (var0 == null) { - return; // L: 35 - } - - var0.archive.load(var0.archiveDisk, (int)var0.key, var0.data, false); // L: 36 - } - } - - @ObfuscatedName("l") - @ObfuscatedSignature( - descriptor = "(II)I", - garbageValue = "-1643037220" - ) - @Export("Messages_getHistorySize") - static int Messages_getHistorySize(int var0) { - ChatChannel var1 = (ChatChannel)Messages.Messages_channels.get(var0); // L: 44 - return var1 == null ? 0 : var1.size(); // L: 45 46 - } - - @ObfuscatedName("z") - @ObfuscatedSignature( - descriptor = "(II)I", - garbageValue = "-383042377" - ) - @Export("iLog") - public static int iLog(int var0) { - int var1 = 0; // L: 60 - if (var0 < 0 || var0 >= 65536) { // L: 61 - var0 >>>= 16; // L: 62 - var1 += 16; // L: 63 - } - - if (var0 >= 256) { // L: 65 - var0 >>>= 8; // L: 66 - var1 += 8; // L: 67 - } - - if (var0 >= 16) { // L: 69 - var0 >>>= 4; // L: 70 - var1 += 4; // L: 71 - } - - if (var0 >= 4) { // L: 73 - var0 >>>= 2; // L: 74 - var1 += 2; // L: 75 - } - - if (var0 >= 1) { // L: 77 - var0 >>>= 1; // L: 78 - ++var1; // L: 79 - } - - return var0 + var1; // L: 81 - } - - @ObfuscatedName("km") - @ObfuscatedSignature( - descriptor = "(IIIILow;Lil;I)V", - garbageValue = "1938971216" - ) - @Export("drawSpriteOnMinimap") - static final void drawSpriteOnMinimap(int var0, int var1, int var2, int var3, SpritePixels var4, SpriteMask var5) { - if (var4 != null) { // L: 11490 - int var6 = Client.camAngleY & 2047; // L: 11491 - int var7 = var3 * var3 + var2 * var2; // L: 11492 - if (var7 <= 6400) { // L: 11493 - int var8 = Rasterizer3D.Rasterizer3D_sine[var6]; // L: 11494 - int var9 = Rasterizer3D.Rasterizer3D_cosine[var6]; // L: 11495 - int var10 = var9 * var2 + var3 * var8 >> 16; // L: 11496 - int var11 = var3 * var9 - var8 * var2 >> 16; // L: 11497 - if (var7 > 2500) { - var4.method6891(var10 + var5.width / 2 - var4.width / 2, var5.height / 2 - var11 - var4.height / 2, var0, var1, var5.width, var5.height, var5.xStarts, var5.xWidths); // L: 11498 - } else { - var4.drawTransBgAt(var0 + var10 + var5.width / 2 - var4.width / 2, var5.height / 2 + var1 - var11 - var4.height / 2); // L: 11499 - } - - } - } - } // L: 11500 - - @ObfuscatedName("lq") - @ObfuscatedSignature( - descriptor = "(Ljava/lang/String;ZS)V", - garbageValue = "-29054" - ) - @Export("findItemDefinitions") - static void findItemDefinitions(String var0, boolean var1) { - var0 = var0.toLowerCase(); // L: 11682 - short[] var2 = new short[16]; // L: 11683 - int var3 = 0; // L: 11684 - - for (int var4 = 0; var4 < class6.ItemDefinition_fileCount; ++var4) { // L: 11685 - ItemComposition var9 = Strings.ItemDefinition_get(var4); // L: 11686 - if ((!var1 || var9.isTradable) && var9.noteTemplate == -1 && var9.name.toLowerCase().indexOf(var0) != -1) { // L: 11687 11688 11689 - if (var3 >= 250) { // L: 11690 - class135.foundItemIdCount = -1; // L: 11691 - class179.foundItemIds = null; // L: 11692 - return; // L: 11693 - } - - if (var3 >= var2.length) { // L: 11695 - short[] var6 = new short[var2.length * 2]; // L: 11696 - - for (int var7 = 0; var7 < var3; ++var7) { // L: 11697 - var6[var7] = var2[var7]; - } - - var2 = var6; // L: 11698 - } - - var2[var3++] = (short)var4; // L: 11700 - } - } - - class179.foundItemIds = var2; // L: 11702 - WorldMapManager.foundItemIndex = 0; // L: 11703 - class135.foundItemIdCount = var3; // L: 11704 - String[] var8 = new String[class135.foundItemIdCount]; // L: 11705 - - for (int var5 = 0; var5 < class135.foundItemIdCount; ++var5) { // L: 11706 - var8[var5] = Strings.ItemDefinition_get(var2[var5]).name; - } - - short[] var10 = class179.foundItemIds; // L: 11707 - class161.sortItemsByName(var8, var10, 0, var8.length - 1); // L: 11709 - } // L: 11711 } diff --git a/runescape-client/src/main/java/class105.java b/runescape-client/src/main/java/class105.java index c16279d97f..12a6c54a09 100644 --- a/runescape-client/src/main/java/class105.java +++ b/runescape-client/src/main/java/class105.java @@ -1,25 +1,54 @@ +import net.runelite.mapping.Export; +import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("do") +@ObfuscatedName("dz") public class class105 { - @ObfuscatedName("qy") - @ObfuscatedSignature( - descriptor = "Lx;" + @ObfuscatedName("ha") + @ObfuscatedGetter( + intValue = -2115685501 ) - static class11 field1328; + @Export("cameraZ") + static int cameraZ; - @ObfuscatedName("v") + @ObfuscatedName("hw") @ObfuscatedSignature( - descriptor = "(II)I", - garbageValue = "-1917955728" + descriptor = "(IIII)I", + garbageValue = "-1492762721" ) - static int method2274(int var0) { - Message var1 = (Message)Messages.Messages_hashTable.get((long)var0); // L: 66 - if (var1 == null) { // L: 67 - return -1; + @Export("getTileHeight") + static final int getTileHeight(int var0, int var1, int var2) { + int var3 = var0 >> 7; // L: 5027 + int var4 = var1 >> 7; // L: 5028 + if (var3 >= 0 && var4 >= 0 && var3 <= 103 && var4 <= 103) { // L: 5029 + int var5 = var2; // L: 5030 + if (var2 < 3 && (Tiles.Tiles_renderFlags[1][var3][var4] & 2) == 2) { // L: 5031 + var5 = var2 + 1; + } + + int var6 = var0 & 127; // L: 5032 + int var7 = var1 & 127; // L: 5033 + int var8 = (128 - var6) * Tiles.Tiles_heights[var5][var3][var4] + Tiles.Tiles_heights[var5][var3 + 1][var4] * var6 >> 7; // L: 5034 + int var9 = Tiles.Tiles_heights[var5][var3][var4 + 1] * (128 - var6) + var6 * Tiles.Tiles_heights[var5][var3 + 1][var4 + 1] >> 7; // L: 5035 + return var9 * var7 + var8 * (128 - var7) >> 7; // L: 5036 } else { - return var1.nextDual == Messages.Messages_queue.sentinel ? -1 : ((Message)var1.nextDual).count; // L: 68 69 + return 0; } } + + @ObfuscatedName("ku") + @ObfuscatedSignature( + descriptor = "(Ljava/lang/String;I)V", + garbageValue = "1444494320" + ) + @Export("clanKickUser") + static final void clanKickUser(String var0) { + if (WorldMapRegion.friendsChat != null) { // L: 11290 + PacketBufferNode var1 = class21.getPacketBufferNode(ClientPacket.field2665, Client.packetWriter.isaacCipher); // L: 11291 + var1.packetBuffer.writeByte(Tiles.stringCp1252NullTerminatedByteSize(var0)); // L: 11292 + var1.packetBuffer.writeStringCp1252NullTerminated(var0); // L: 11293 + Client.packetWriter.addNode(var1); // L: 11294 + } + } // L: 11295 } diff --git a/runescape-client/src/main/java/class11.java b/runescape-client/src/main/java/class11.java deleted file mode 100644 index 4b23a7ce9a..0000000000 --- a/runescape-client/src/main/java/class11.java +++ /dev/null @@ -1,782 +0,0 @@ -import net.runelite.mapping.Export; -import net.runelite.mapping.ObfuscatedGetter; -import net.runelite.mapping.ObfuscatedName; -import net.runelite.mapping.ObfuscatedSignature; - -@ObfuscatedName("x") -public class class11 { - @ObfuscatedName("fg") - @ObfuscatedSignature( - descriptor = "Lkc;" - ) - @Export("fontPlain11") - static Font fontPlain11; - @ObfuscatedName("gl") - @ObfuscatedGetter( - intValue = 1120032749 - ) - static int field112; - @ObfuscatedName("c") - boolean field87; - @ObfuscatedName("o") - boolean field88; - @ObfuscatedName("g") - @ObfuscatedGetter( - longValue = 3282705810889251661L - ) - long field103; - @ObfuscatedName("l") - @ObfuscatedGetter( - intValue = 1207277285 - ) - int field90; - @ObfuscatedName("z") - public String field91; - @ObfuscatedName("t") - @ObfuscatedGetter( - intValue = -87337933 - ) - int field92; - @ObfuscatedName("v") - public boolean field93; - @ObfuscatedName("b") - public byte field111; - @ObfuscatedName("q") - public byte field95; - @ObfuscatedName("i") - public byte field96; - @ObfuscatedName("x") - public byte field113; - @ObfuscatedName("k") - @ObfuscatedGetter( - intValue = -2021066881 - ) - public int field98; - @ObfuscatedName("r") - long[] field97; - @ObfuscatedName("p") - public byte[] field100; - @ObfuscatedName("a") - int[] field99; - @ObfuscatedName("e") - int[] field102; - @ObfuscatedName("d") - public int[] field94; - @ObfuscatedName("u") - public boolean[] field104; - @ObfuscatedName("m") - @ObfuscatedGetter( - intValue = -1715642763 - ) - public int field105; - @ObfuscatedName("j") - @ObfuscatedGetter( - intValue = -267718841 - ) - public int field106; - @ObfuscatedName("f") - @ObfuscatedGetter( - intValue = 1432203507 - ) - public int field107; - @ObfuscatedName("s") - long[] field108; - @ObfuscatedName("y") - public String[] field109; - @ObfuscatedName("w") - public String[] field101; - @ObfuscatedName("n") - @ObfuscatedSignature( - descriptor = "Lmo;" - ) - IterableNodeHashTable field89; - - @ObfuscatedSignature( - descriptor = "(Lnk;)V" - ) - public class11(Buffer var1) { - this.field90 = 0; // L: 14 - this.field91 = null; // L: 15 - this.field92 = 0; // L: 16 - this.field105 = -1; // L: 29 - this.field106 = -1; // L: 30 - this.method135(var1); // L: 43 - } // L: 44 - - @ObfuscatedName("h") - @ObfuscatedSignature( - descriptor = "(II)V", - garbageValue = "241489233" - ) - void method111(int var1) { - if (this.field87) { // L: 47 - if (this.field97 != null) { // L: 48 - System.arraycopy(this.field97, 0, this.field97 = new long[var1], 0, this.field98); - } else { - this.field97 = new long[var1]; // L: 49 - } - } - - if (this.field88) { // L: 51 - if (this.field109 != null) { // L: 52 - System.arraycopy(this.field109, 0, this.field109 = new String[var1], 0, this.field98); - } else { - this.field109 = new String[var1]; // L: 53 - } - } - - if (this.field100 != null) { // L: 55 - System.arraycopy(this.field100, 0, this.field100 = new byte[var1], 0, this.field98); - } else { - this.field100 = new byte[var1]; // L: 56 - } - - if (this.field102 != null) { // L: 57 - System.arraycopy(this.field102, 0, this.field102 = new int[var1], 0, this.field98); - } else { - this.field102 = new int[var1]; // L: 58 - } - - if (this.field94 != null) { // L: 59 - System.arraycopy(this.field94, 0, this.field94 = new int[var1], 0, this.field98); - } else { - this.field94 = new int[var1]; // L: 60 - } - - if (this.field104 != null) { // L: 61 - System.arraycopy(this.field104, 0, this.field104 = new boolean[var1], 0, this.field98); - } else { - this.field104 = new boolean[var1]; // L: 62 - } - - } // L: 63 - - @ObfuscatedName("c") - @ObfuscatedSignature( - descriptor = "(IB)V", - garbageValue = "66" - ) - void method112(int var1) { - if (this.field87) { // L: 66 - if (this.field108 != null) { - System.arraycopy(this.field108, 0, this.field108 = new long[var1], 0, this.field107); // L: 67 - } else { - this.field108 = new long[var1]; // L: 68 - } - } - - if (this.field88) { // L: 70 - if (this.field101 != null) { // L: 71 - System.arraycopy(this.field101, 0, this.field101 = new String[var1], 0, this.field107); - } else { - this.field101 = new String[var1]; // L: 72 - } - } - - } // L: 74 - - @ObfuscatedName("o") - @ObfuscatedSignature( - descriptor = "(Ljava/lang/String;I)I", - garbageValue = "657242111" - ) - public int method113(String var1) { - if (var1 != null && var1.length() != 0) { // L: 77 - for (int var2 = 0; var2 < this.field98; ++var2) { // L: 78 - if (this.field109[var2].equals(var1)) { // L: 79 - return var2; - } - } - - return -1; // L: 81 - } else { - return -1; - } - } - - @ObfuscatedName("g") - @ObfuscatedSignature( - descriptor = "(IIII)I", - garbageValue = "-267718841" - ) - public int method114(int var1, int var2, int var3) { - int var4 = var3 == 31 ? -1 : (1 << var3 + 1) - 1; // L: 85 - return (this.field102[var1] & var4) >>> var2; // L: 86 - } - - @ObfuscatedName("l") - @ObfuscatedSignature( - descriptor = "(II)Ljava/lang/Integer;", - garbageValue = "-1499544998" - ) - public Integer method152(int var1) { - if (this.field89 == null) { // L: 90 - return null; - } else { - Node var2 = this.field89.get((long)var1); // L: 91 - return var2 != null && var2 instanceof IntegerNode ? new Integer(((IntegerNode)var2).integer) : null; // L: 92 93 - } - } - - @ObfuscatedName("z") - @ObfuscatedSignature( - descriptor = "(I)[I", - garbageValue = "1864900948" - ) - public int[] method167() { - if (this.field99 == null) { // L: 97 - String[] var1 = new String[this.field98]; // L: 98 - this.field99 = new int[this.field98]; // L: 99 - - for (int var2 = 0; var2 < this.field98; this.field99[var2] = var2++) { // L: 100 103 - var1[var2] = this.field109[var2]; // L: 101 - if (var1[var2] != null) { // L: 102 - var1[var2] = var1[var2].toLowerCase(); - } - } - - int[] var3 = this.field99; // L: 105 - class124.method2500(var1, var3, 0, var1.length - 1); // L: 107 - } - - return this.field99; // L: 110 - } - - @ObfuscatedName("t") - @ObfuscatedSignature( - descriptor = "(JLjava/lang/String;IB)V", - garbageValue = "61" - ) - void method117(long var1, String var3, int var4) { - if (var3 != null && var3.length() == 0) { // L: 114 - var3 = null; - } - - if (this.field87 != var1 > 0L) { // L: 115 - throw new RuntimeException(""); - } else if (this.field88 != (var3 != null)) { // L: 116 - throw new RuntimeException(""); - } else { - if (var1 > 0L && (this.field97 == null || this.field98 >= this.field97.length) || var3 != null && (this.field109 == null || this.field98 >= this.field109.length)) { // L: 117 - this.method111(this.field98 + 5); - } - - if (this.field97 != null) { // L: 118 - this.field97[this.field98] = var1; - } - - if (this.field109 != null) { // L: 119 - this.field109[this.field98] = var3; - } - - if (this.field105 == -1) { // L: 120 - this.field105 = this.field98; // L: 121 - this.field100[this.field98] = 126; // L: 122 - } else { - this.field100[this.field98] = 0; // L: 125 - } - - this.field102[this.field98] = 0; // L: 127 - this.field94[this.field98] = var4; // L: 128 - this.field104[this.field98] = false; // L: 129 - ++this.field98; // L: 130 - this.field99 = null; // L: 131 - } - } // L: 132 - - @ObfuscatedName("v") - @ObfuscatedSignature( - descriptor = "(II)V", - garbageValue = "1122092464" - ) - void method157(int var1) { - if (var1 >= 0 && var1 < this.field98) { // L: 135 - --this.field98; // L: 136 - this.field99 = null; // L: 137 - if (this.field98 == 0) { // L: 138 - this.field97 = null; // L: 139 - this.field109 = null; // L: 140 - this.field100 = null; // L: 141 - this.field102 = null; // L: 142 - this.field94 = null; // L: 143 - this.field104 = null; // L: 144 - this.field105 = -1; // L: 145 - this.field106 = -1; // L: 146 - } else { - System.arraycopy(this.field100, var1 + 1, this.field100, var1, this.field98 - var1); // L: 149 - System.arraycopy(this.field102, var1 + 1, this.field102, var1, this.field98 - var1); // L: 150 - System.arraycopy(this.field94, var1 + 1, this.field94, var1, this.field98 - var1); // L: 151 - System.arraycopy(this.field104, var1 + 1, this.field104, var1, this.field98 - var1); // L: 152 - if (this.field97 != null) { // L: 153 - System.arraycopy(this.field97, var1 + 1, this.field97, var1, this.field98 - var1); - } - - if (this.field109 != null) { // L: 154 - System.arraycopy(this.field109, var1 + 1, this.field109, var1, this.field98 - var1); - } - - this.method119(); // L: 155 - } - - } else { - throw new RuntimeException(""); - } - } // L: 157 - - @ObfuscatedName("b") - @ObfuscatedSignature( - descriptor = "(B)V", - garbageValue = "-31" - ) - void method119() { - if (this.field98 == 0) { // L: 160 - this.field105 = -1; // L: 161 - this.field106 = -1; // L: 162 - } else { - this.field105 = -1; // L: 165 - this.field106 = -1; // L: 166 - int var1 = 0; // L: 167 - byte var2 = this.field100[0]; // L: 168 - - for (int var3 = 1; var3 < this.field98; ++var3) { // L: 169 - if (this.field100[var3] > var2) { // L: 170 - if (var2 == 125) { // L: 171 - this.field106 = var1; - } - - var1 = var3; // L: 172 - var2 = this.field100[var3]; // L: 173 - } else if (this.field106 == -1 && this.field100[var3] == 125) { // L: 175 - this.field106 = var3; // L: 176 - } - } - - this.field105 = var1; // L: 179 - if (this.field105 != -1) { // L: 180 - this.field100[this.field105] = 126; - } - - } - } // L: 163 181 - - @ObfuscatedName("q") - @ObfuscatedSignature( - descriptor = "(JLjava/lang/String;B)V", - garbageValue = "63" - ) - void method120(long var1, String var3) { - if (var3 != null && var3.length() == 0) { // L: 184 - var3 = null; - } - - if (this.field87 != var1 > 0L) { // L: 185 - throw new RuntimeException(""); - } else if (var3 != null != this.field88) { // L: 186 - throw new RuntimeException(""); - } else { - if (var1 > 0L && (this.field108 == null || this.field107 >= this.field108.length) || var3 != null && (this.field101 == null || this.field107 >= this.field101.length)) { // L: 187 - this.method112(this.field107 + 5); - } - - if (this.field108 != null) { // L: 188 - this.field108[this.field107] = var1; - } - - if (this.field101 != null) { // L: 189 - this.field101[this.field107] = var3; - } - - ++this.field107; // L: 190 - } - } // L: 191 - - @ObfuscatedName("i") - @ObfuscatedSignature( - descriptor = "(II)V", - garbageValue = "1819056375" - ) - void method121(int var1) { - --this.field107; // L: 194 - if (this.field107 == 0) { // L: 195 - this.field108 = null; // L: 196 - this.field101 = null; // L: 197 - } else { - if (this.field108 != null) { // L: 200 - System.arraycopy(this.field108, var1 + 1, this.field108, var1, this.field107 - var1); - } - - if (this.field101 != null) { - System.arraycopy(this.field101, var1 + 1, this.field101, var1, this.field107 - var1); // L: 201 - } - } - - } // L: 203 - - @ObfuscatedName("x") - @ObfuscatedSignature( - descriptor = "(IBI)I", - garbageValue = "1047518039" - ) - int method191(int var1, byte var2) { - if (var2 != 126 && var2 != 127) { // L: 206 - if (this.field105 == var1 && (this.field106 == -1 || this.field100[this.field106] < 125)) { // L: 207 - return -1; - } else if (this.field100[var1] == var2) { - return -1; // L: 208 - } else { - this.field100[var1] = var2; // L: 209 - this.method119(); // L: 210 - return var1; // L: 211 - } - } else { - return -1; - } - } - - @ObfuscatedName("k") - @ObfuscatedSignature( - descriptor = "(II)Z", - garbageValue = "1333266442" - ) - boolean method123(int var1) { - if (this.field105 != var1 && this.field100[var1] != 126) { // L: 215 - this.field100[this.field105] = 125; // L: 216 - this.field106 = this.field105; // L: 217 - this.field100[var1] = 126; // L: 218 - this.field105 = var1; // L: 219 - return true; // L: 220 - } else { - return false; - } - } - - @ObfuscatedName("r") - @ObfuscatedSignature( - descriptor = "(IZI)I", - garbageValue = "1187592850" - ) - int method133(int var1, boolean var2) { - if (this.field104[var1] == var2) { // L: 224 - return -1; - } else { - this.field104[var1] = var2; // L: 225 - return var1; // L: 226 - } - } - - @ObfuscatedName("p") - @ObfuscatedSignature( - descriptor = "(IIIII)I", - garbageValue = "-1968754064" - ) - int method156(int var1, int var2, int var3, int var4) { - int var5 = (1 << var3) - 1; // L: 230 - int var6 = var4 == 31 ? -1 : (1 << var4 + 1) - 1; // L: 231 - int var7 = var6 ^ var5; // L: 232 - var2 <<= var3; // L: 233 - var2 &= var7; // L: 234 - int var8 = this.field102[var1]; // L: 235 - if ((var8 & var7) == var2) { - return -1; // L: 236 - } else { - var8 &= ~var7; // L: 237 - this.field102[var1] = var8 | var2; // L: 238 - return var1; // L: 239 - } - } - - @ObfuscatedName("a") - @ObfuscatedSignature( - descriptor = "(III)Z", - garbageValue = "1937890199" - ) - boolean method126(int var1, int var2) { - if (this.field89 != null) { // L: 243 - Node var3 = this.field89.get((long)var1); // L: 244 - if (var3 != null) { // L: 245 - if (var3 instanceof IntegerNode) { // L: 246 - IntegerNode var4 = (IntegerNode)var3; // L: 247 - if (var2 == var4.integer) { // L: 248 - return false; - } - - var4.integer = var2; // L: 249 - return true; // L: 250 - } - - var3.remove(); // L: 252 - } - } else { - this.field89 = new IterableNodeHashTable(4); // L: 255 - } - - this.field89.put(new IntegerNode(var2), (long)var1); // L: 256 - return true; // L: 257 - } - - @ObfuscatedName("e") - @ObfuscatedSignature( - descriptor = "(IIIII)Z", - garbageValue = "-1701986674" - ) - boolean method127(int var1, int var2, int var3, int var4) { - int var5 = (1 << var3) - 1; // L: 261 - int var6 = var4 == 31 ? -1 : (1 << var4 + 1) - 1; // L: 262 - int var7 = var6 ^ var5; // L: 263 - var2 <<= var3; // L: 264 - var2 &= var7; // L: 265 - if (this.field89 != null) { // L: 266 - Node var8 = this.field89.get((long)var1); // L: 267 - if (var8 != null) { // L: 268 - if (var8 instanceof IntegerNode) { // L: 269 - IntegerNode var9 = (IntegerNode)var8; // L: 270 - if ((var9.integer & var7) == var2) { // L: 271 - return false; - } - - var9.integer &= ~var7; // L: 272 - var9.integer |= var2; // L: 273 - return true; // L: 274 - } - - var8.remove(); // L: 276 - } - } else { - this.field89 = new IterableNodeHashTable(4); // L: 279 - } - - this.field89.put(new IntegerNode(var2), (long)var1); // L: 280 - return true; // L: 281 - } - - @ObfuscatedName("d") - boolean method128(int var1, long var2) { - if (this.field89 != null) { // L: 285 - Node var4 = this.field89.get((long)var1); // L: 286 - if (var4 != null) { // L: 287 - if (var4 instanceof class349) { // L: 288 - class349 var5 = (class349)var4; // L: 289 - if (var5.field3945 == var2) { // L: 290 - return false; - } - - var5.field3945 = var2; // L: 291 - return true; // L: 292 - } - - var4.remove(); // L: 294 - } - } else { - this.field89 = new IterableNodeHashTable(4); // L: 297 - } - - this.field89.put(new class349(var2), (long)var1); // L: 298 - return true; // L: 299 - } - - @ObfuscatedName("u") - @ObfuscatedSignature( - descriptor = "(ILjava/lang/String;B)Z", - garbageValue = "1" - ) - boolean method131(int var1, String var2) { - if (var2 == null) { // L: 303 - var2 = ""; - } else if (var2.length() > 80) { // L: 304 - var2 = var2.substring(0, 80); - } - - if (this.field89 != null) { // L: 305 - Node var3 = this.field89.get((long)var1); // L: 306 - if (var3 != null) { // L: 307 - if (var3 instanceof ObjectNode) { // L: 308 - ObjectNode var4 = (ObjectNode)var3; // L: 309 - if (var4.obj instanceof String) { // L: 310 - if (var2.equals(var4.obj)) { // L: 311 - return false; - } - - var4.remove(); // L: 312 - this.field89.put(new ObjectNode(var2), var4.key); // L: 313 - return true; // L: 314 - } - } - - var3.remove(); // L: 317 - } - } else { - this.field89 = new IterableNodeHashTable(4); // L: 320 - } - - this.field89.put(new ObjectNode(var2), (long)var1); // L: 321 - return true; // L: 322 - } - - @ObfuscatedName("m") - @ObfuscatedSignature( - descriptor = "(Lnk;I)V", - garbageValue = "-1322806444" - ) - void method135(Buffer var1) { - int var2 = var1.readUnsignedByte(); // L: 326 - if (var2 >= 1 && var2 <= 6) { // L: 327 - int var3 = var1.readUnsignedByte(); // L: 328 - if ((var3 & 1) != 0) { // L: 329 - this.field87 = true; - } - - if ((var3 & 2) != 0) { // L: 330 - this.field88 = true; - } - - if (!this.field87) { // L: 331 - this.field97 = null; // L: 332 - this.field108 = null; // L: 333 - } - - if (!this.field88) { // L: 335 - this.field109 = null; // L: 336 - this.field101 = null; // L: 337 - } - - this.field90 = var1.readInt(); // L: 339 - this.field92 = var1.readInt(); // L: 340 - if (var2 <= 3 && this.field92 != 0) { // L: 341 - this.field92 += 16912800; - } - - this.field98 = var1.readUnsignedShort(); // L: 342 - this.field107 = var1.readUnsignedByte(); // L: 343 - this.field91 = var1.readStringCp1252NullTerminated(); // L: 344 - if (var2 >= 4) { // L: 345 - var1.readInt(); // L: 346 - } - - this.field93 = var1.readUnsignedByte() == 1; // L: 348 - this.field111 = var1.readByte(); // L: 349 - this.field95 = var1.readByte(); // L: 350 - this.field96 = var1.readByte(); // L: 351 - this.field113 = var1.readByte(); // L: 352 - int var4; - if (this.field98 > 0) { // L: 353 - if (this.field87 && (this.field97 == null || this.field97.length < this.field98)) { // L: 354 - this.field97 = new long[this.field98]; - } - - if (this.field88 && (this.field109 == null || this.field109.length < this.field98)) { // L: 355 - this.field109 = new String[this.field98]; - } - - if (this.field100 == null || this.field100.length < this.field98) { // L: 356 - this.field100 = new byte[this.field98]; - } - - if (this.field102 == null || this.field102.length < this.field98) { // L: 357 - this.field102 = new int[this.field98]; - } - - if (this.field94 == null || this.field94.length < this.field98) { // L: 358 - this.field94 = new int[this.field98]; - } - - if (this.field104 == null || this.field104.length < this.field98) { // L: 359 - this.field104 = new boolean[this.field98]; - } - - for (var4 = 0; var4 < this.field98; ++var4) { // L: 360 - if (this.field87) { // L: 361 - this.field97[var4] = var1.readLong(); - } - - if (this.field88) { // L: 362 - this.field109[var4] = var1.readStringCp1252NullTerminatedOrNull(); - } - - this.field100[var4] = var1.readByte(); // L: 363 - if (var2 >= 2) { // L: 364 - this.field102[var4] = var1.readInt(); - } - - if (var2 >= 5) { // L: 365 - this.field94[var4] = var1.readUnsignedShort(); - } else { - this.field94[var4] = 0; // L: 366 - } - - if (var2 >= 6) { // L: 367 - this.field104[var4] = var1.readUnsignedByte() == 1; - } else { - this.field104[var4] = false; // L: 368 - } - } - - this.method119(); // L: 370 - } - - if (this.field107 > 0) { // L: 372 - if (this.field87 && (this.field108 == null || this.field108.length < this.field107)) { // L: 373 - this.field108 = new long[this.field107]; - } - - if (this.field88 && (this.field101 == null || this.field101.length < this.field107)) { // L: 374 - this.field101 = new String[this.field107]; - } - - for (var4 = 0; var4 < this.field107; ++var4) { // L: 375 - if (this.field87) { // L: 376 - this.field108[var4] = var1.readLong(); - } - - if (this.field88) { // L: 377 - this.field101[var4] = var1.readStringCp1252NullTerminatedOrNull(); - } - } - } - - if (var2 >= 3) { // L: 380 - var4 = var1.readUnsignedShort(); // L: 381 - if (var4 > 0) { // L: 382 - this.field89 = new IterableNodeHashTable(var4 < 16 ? MouseRecorder.method2126(var4) : 16); // L: 383 - - while (var4-- > 0) { // L: 384 - int var5 = var1.readInt(); // L: 385 - int var6 = var5 & 1073741823; // L: 386 - int var7 = var5 >>> 30; // L: 387 - if (var7 == 0) { // L: 388 - int var12 = var1.readInt(); // L: 389 - this.field89.put(new IntegerNode(var12), (long)var6); // L: 390 - } else if (var7 == 1) { // L: 392 - long var10 = var1.readLong(); // L: 393 - this.field89.put(new class349(var10), (long)var6); // L: 394 - } else if (var7 == 2) { // L: 396 - String var8 = var1.readStringCp1252NullTerminated(); // L: 397 - this.field89.put(new ObjectNode(var8), (long)var6); // L: 398 - } - } - } - } - - } else { - throw new RuntimeException("" + var2); - } - } // L: 403 - - @ObfuscatedName("in") - @ObfuscatedSignature( - descriptor = "(I)Z", - garbageValue = "-1465463925" - ) - static final boolean method190() { - return Client.isMenuOpen; // L: 7898 - } - - @ObfuscatedName("lm") - @ObfuscatedSignature( - descriptor = "(Liv;B)Z", - garbageValue = "117" - ) - @Export("isComponentHidden") - static boolean isComponentHidden(Widget var0) { - return var0.isHidden; // L: 11623 - } -} diff --git a/runescape-client/src/main/java/class12.java b/runescape-client/src/main/java/class12.java index cbf47eca46..70623cdb4a 100644 --- a/runescape-client/src/main/java/class12.java +++ b/runescape-client/src/main/java/class12.java @@ -1,102 +1,220 @@ -import java.awt.Component; +import java.io.File; 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("k") +@ObfuscatedName("o") public class class12 extends class16 { - @ObfuscatedName("sc") - @ObfuscatedSignature( - descriptor = "Lcv;" - ) - @Export("clientPreferences") - static ClientPreferences clientPreferences; + @ObfuscatedName("p") + @Export("cacheDir") + public static File cacheDir; @ObfuscatedName("v") - @ObfuscatedSignature( - descriptor = "Low;" - ) - @Export("rightTitleSprite") - static SpritePixels rightTitleSprite; - @ObfuscatedName("h") - String field118; - @ObfuscatedName("c") + String field125; + @ObfuscatedName("n") @ObfuscatedGetter( - intValue = -775635411 + intValue = -2090329987 ) - int field116; - @ObfuscatedName("o") - byte field115; + int field117; + @ObfuscatedName("f") + byte field118; // $FF: synthetic field @ObfuscatedSignature( - descriptor = "Lm;" + descriptor = "Lx;" ) final class19 this$0; @ObfuscatedSignature( - descriptor = "(Lm;)V" + descriptor = "(Lx;)V" ) class12(class19 var1) { this.this$0 = var1; - this.field118 = null; // L: 54 + this.field125 = null; // L: 54 } // L: 58 - @ObfuscatedName("h") + @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "(Lnk;S)V", - garbageValue = "4095" + descriptor = "(Lnd;I)V", + garbageValue = "68071115" ) - void vmethod326(Buffer var1) { + void vmethod266(Buffer var1) { if (var1.readUnsignedByte() != 255) { // L: 61 --var1.offset; // L: 62 var1.readLong(); // L: 63 } - this.field118 = var1.readStringCp1252NullTerminatedOrNull(); // L: 65 - this.field116 = var1.readUnsignedShort(); // L: 66 - this.field115 = var1.readByte(); // L: 67 + this.field125 = var1.readStringCp1252NullTerminatedOrNull(); // L: 65 + this.field117 = var1.readUnsignedShort(); // L: 66 + this.field118 = var1.readByte(); // L: 67 var1.readLong(); // L: 68 } // L: 69 - @ObfuscatedName("c") + @ObfuscatedName("n") @ObfuscatedSignature( - descriptor = "(Lg;B)V", - garbageValue = "-61" + descriptor = "(Ly;I)V", + garbageValue = "-1846892157" ) - void vmethod314(class3 var1) { - class9 var2 = new class9(); // L: 72 - var2.field73 = this.field118; // L: 73 - var2.field80 = this.field116; // L: 74 - var2.field76 = this.field115; // L: 75 - var1.method29(var2); // L: 76 + void vmethod264(ClanChannel var1) { + ClanChannelMember var2 = new ClanChannelMember(); // L: 72 + var2.name = this.field125; // L: 73 + var2.world = this.field117; // L: 74 + var2.rank = this.field118; // L: 75 + var1.addMember(var2); // L: 76 } // L: 77 - @ObfuscatedName("h") + @ObfuscatedName("j") @ObfuscatedSignature( - descriptor = "(Ljava/awt/Component;I)V", - garbageValue = "-711210303" + descriptor = "(Lbg;Lbg;IZI)I", + garbageValue = "-333331035" ) - static void method192(Component var0) { - var0.addMouseListener(MouseHandler.MouseHandler_instance); // L: 37 - var0.addMouseMotionListener(MouseHandler.MouseHandler_instance); // L: 38 - var0.addFocusListener(MouseHandler.MouseHandler_instance); // L: 39 - } // L: 40 + @Export("compareWorlds") + static int compareWorlds(World var0, World var1, int var2, boolean var3) { + if (var2 == 1) { // L: 221 + int var4 = var0.population; // L: 222 + int var5 = var1.population; // L: 223 + if (!var3) { // L: 224 + if (var4 == -1) { // L: 225 + var4 = 2001; + } - @ObfuscatedName("h") - @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "-1237759472" - ) - public static void method203() { - class69.reflectionChecks = new IterableNodeDeque(); // L: 24 - } // L: 25 + if (var5 == -1) { // L: 226 + var5 = 2001; + } + } - @ObfuscatedName("v") + return var4 - var5; // L: 228 + } else if (var2 == 2) { // L: 230 + return var0.location - var1.location; + } else if (var2 == 3) { // L: 231 + if (var0.activity.equals("-")) { // L: 232 + if (var1.activity.equals("-")) { // L: 233 + return 0; + } else { + return var3 ? -1 : 1; // L: 234 + } + } else if (var1.activity.equals("-")) { // L: 236 + return var3 ? 1 : -1; + } else { + return var0.activity.compareTo(var1.activity); // L: 237 + } + } else if (var2 == 4) { // L: 239 + return var0.method1640() ? (var1.method1640() ? 0 : 1) : (var1.method1640() ? -1 : 0); + } else if (var2 == 5) { // L: 240 + return var0.method1638() ? (var1.method1638() ? 0 : 1) : (var1.method1638() ? -1 : 0); + } else if (var2 == 6) { // L: 241 + return var0.isPvp() ? (var1.isPvp() ? 0 : 1) : (var1.isPvp() ? -1 : 0); + } else if (var2 == 7) { // L: 242 + return var0.isMembersOnly() ? (var1.isMembersOnly() ? 0 : 1) : (var1.isMembersOnly() ? -1 : 0); + } else { + return var0.id - var1.id; // L: 243 + } + } + + @ObfuscatedName("ax") @ObfuscatedSignature( - descriptor = "(B)V", - garbageValue = "54" + descriptor = "(ILcf;ZB)I", + garbageValue = "101" ) - public static void method202() { - WorldMapElement.WorldMapElement_cachedSprites.clear(); // L: 163 - } // L: 164 + static int method173(int var0, Script var1, boolean var2) { + int var3; + if (var0 == ScriptOpcodes.CAM_FORCEANGLE) { // L: 3463 + class44.Interpreter_intStackSize -= 2; // L: 3464 + var3 = Interpreter.Interpreter_intStack[class44.Interpreter_intStackSize]; // L: 3465 + int var4 = Interpreter.Interpreter_intStack[class44.Interpreter_intStackSize + 1]; // L: 3466 + if (!Client.isCameraLocked) { // L: 3467 + Client.camAngleX = var3; // L: 3468 + Client.camAngleY = var4; // L: 3469 + } + + return 1; // L: 3471 + } else if (var0 == ScriptOpcodes.CAM_GETANGLE_XA) { // L: 3473 + Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = Client.camAngleX; // L: 3474 + return 1; // L: 3475 + } else if (var0 == ScriptOpcodes.CAM_GETANGLE_YA) { // L: 3477 + Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = Client.camAngleY; // L: 3478 + return 1; // L: 3479 + } else if (var0 == ScriptOpcodes.CAM_SETFOLLOWHEIGHT) { // L: 3481 + var3 = Interpreter.Interpreter_intStack[--class44.Interpreter_intStackSize]; // L: 3482 + if (var3 < 0) { // L: 3483 + var3 = 0; + } + + Client.camFollowHeight = var3; // L: 3484 + return 1; // L: 3485 + } else if (var0 == ScriptOpcodes.CAM_GETFOLLOWHEIGHT) { // L: 3487 + Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = Client.camFollowHeight; // L: 3488 + return 1; // L: 3489 + } else { + return 2; // L: 3491 + } + } + + @ObfuscatedName("eh") + @ObfuscatedSignature( + descriptor = "(IB)V", + garbageValue = "0" + ) + @Export("updateGameState") + static void updateGameState(int var0) { + if (var0 != Client.gameState) { // L: 1117 + if (Client.gameState == 0) { // L: 1118 + class23.client.method501(); + } + + if (var0 == 20 || var0 == 40 || var0 == 45) { // L: 1119 + Client.loginState = 0; // L: 1120 + Client.field673 = 0; // L: 1121 + Client.field845 = 0; // L: 1122 + Client.timer.method5591(var0); // L: 1123 + if (var0 != 20) { // L: 1124 + VarbitComposition.method2849(false); + } + } + + if (var0 != 20 && var0 != 40 && Client.field688 != null) { // L: 1126 1127 + Client.field688.close(); // L: 1128 + Client.field688 = null; // L: 1129 + } + + if (Client.gameState == 25) { // L: 1132 + Client.field698 = 0; // L: 1133 + Client.field694 = 0; // L: 1134 + Client.field695 = 1; // L: 1135 + Client.field696 = 0; // L: 1136 + Client.field697 = 1; // L: 1137 + } + + if (var0 != 5 && var0 != 10) { // L: 1139 + if (var0 == 20) { // L: 1142 + class179.method3634(SoundCache.archive10, GrandExchangeOfferAgeComparator.archive8, true, Client.gameState == 11 ? 4 : 0); // L: 1143 + } else if (var0 == 11) { // L: 1145 + class179.method3634(SoundCache.archive10, GrandExchangeOfferAgeComparator.archive8, false, 4); // L: 1146 + } else if (Login.clearLoginScreen) { // L: 1149 + class260.titleboxSprite = null; // L: 1150 + Login.titlebuttonSprite = null; // L: 1151 + Login.runesSprite = null; // L: 1152 + Login.leftTitleSprite = null; // L: 1153 + class20.rightTitleSprite = null; // L: 1154 + Fonts.logoSprite = null; // L: 1155 + Decimator.title_muteSprite = null; // L: 1156 + FriendSystem.options_buttons_0Sprite = null; // L: 1157 + GrandExchangeOffer.options_buttons_2Sprite = null; // L: 1158 + class337.worldSelectBackSprites = null; // L: 1159 + class25.worldSelectFlagSprites = null; // L: 1160 + HitSplatDefinition.worldSelectArrows = null; // L: 1161 + class18.worldSelectStars = null; // L: 1162 + class69.field597 = null; // L: 1163 + class24.loginScreenRunesAnimation.method2202(); // L: 1164 + class159.method3192(2); // L: 1165 + StudioGame.method4847(true); // L: 1166 + Login.clearLoginScreen = false; // L: 1167 + } + } else { + class179.method3634(SoundCache.archive10, GrandExchangeOfferAgeComparator.archive8, true, 0); // L: 1140 + } + + Client.gameState = var0; // L: 1169 + } + } // L: 1170 } diff --git a/runescape-client/src/main/java/class123.java b/runescape-client/src/main/java/class123.java index dd786286f5..88728b029a 100644 --- a/runescape-client/src/main/java/class123.java +++ b/runescape-client/src/main/java/class123.java @@ -1,5 +1,5 @@ import net.runelite.mapping.ObfuscatedName; -@ObfuscatedName("dr") +@ObfuscatedName("dh") public interface class123 { } diff --git a/runescape-client/src/main/java/class124.java b/runescape-client/src/main/java/class124.java index 43e6026c53..b51e739fc2 100644 --- a/runescape-client/src/main/java/class124.java +++ b/runescape-client/src/main/java/class124.java @@ -1,74 +1,56 @@ +import java.lang.management.GarbageCollectorMXBean; import net.runelite.mapping.Export; -import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("dg") +@ObfuscatedName("dl") public class class124 implements class123 { - @ObfuscatedName("z") - @ObfuscatedGetter( - intValue = -1093598325 - ) - @Export("idxCount") - public static int idxCount; - @ObfuscatedName("az") - @Export("hasFocus") - protected static boolean hasFocus; - - @ObfuscatedName("h") + @ObfuscatedName("y") @ObfuscatedSignature( - descriptor = "(B)[Lhh;", - garbageValue = "-98" + descriptor = "Lhp;" ) - public static class225[] method2501() { - return new class225[]{class225.field2679, class225.field2674, class225.field2673, class225.field2678, class225.field2675, class225.field2687, class225.field2677, class225.field2680, class225.field2681, class225.field2682}; // L: 17 - } + @Export("midiPcmStream") + public static MidiPcmStream midiPcmStream; + @ObfuscatedName("af") + @Export("garbageCollector") + static GarbageCollectorMXBean garbageCollector; - @ObfuscatedName("c") + @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "([Ljava/lang/String;[IIIB)V", - garbageValue = "64" + descriptor = "(II)Llm;", + garbageValue = "-333681005" ) - public static void method2500(String[] var0, int[] var1, int var2, int var3) { - if (var2 < var3) { // L: 39 - int var4 = (var3 + var2) / 2; // L: 40 - int var5 = var2; // L: 41 - String var6 = var0[var4]; // L: 42 - var0[var4] = var0[var3]; // L: 43 - var0[var3] = var6; // L: 44 - int var7 = var1[var4]; // L: 45 - var1[var4] = var1[var3]; // L: 46 - var1[var3] = var7; // L: 47 + public static PrivateChatMode method2498(int var0) { + PrivateChatMode[] var1 = new PrivateChatMode[]{PrivateChatMode.field3888, PrivateChatMode.field3887, PrivateChatMode.field3889}; // L: 18 + PrivateChatMode[] var2 = var1; // L: 20 - for (int var8 = var2; var8 < var3; ++var8) { // L: 48 - if (var6 == null || var0[var8] != null && var0[var8].compareTo(var6) < (var8 & 1)) { // L: 49 - String var9 = var0[var8]; // L: 50 - var0[var8] = var0[var5]; // L: 51 - var0[var5] = var9; // L: 52 - int var10 = var1[var8]; // L: 53 - var1[var8] = var1[var5]; // L: 54 - var1[var5++] = var10; // L: 55 - } + for (int var3 = 0; var3 < var2.length; ++var3) { // L: 21 + PrivateChatMode var4 = var2[var3]; // L: 22 + if (var0 == var4.field3890) { // L: 24 + return var4; } - - var0[var3] = var0[var5]; // L: 59 - var0[var5] = var6; // L: 60 - var1[var3] = var1[var5]; // L: 61 - var1[var5] = var7; // L: 62 - method2500(var0, var1, var2, var5 - 1); // L: 63 - method2500(var0, var1, var5 + 1, var3); // L: 64 } - } // L: 66 - - @ObfuscatedName("o") - @ObfuscatedSignature( - descriptor = "(IIB)Lbv;", - garbageValue = "111" - ) - @Export("Messages_getByChannelAndID") - static Message Messages_getByChannelAndID(int var0, int var1) { - ChatChannel var2 = (ChatChannel)Messages.Messages_channels.get(var0); // L: 35 - return var2.getMessage(var1); // L: 36 + return null; // L: 28 } + + @ObfuscatedName("y") + @ObfuscatedSignature( + descriptor = "(II)Lbi;", + garbageValue = "1712316428" + ) + @Export("Messages_getMessage") + static Message Messages_getMessage(int var0) { + return (Message)Messages.Messages_hashTable.get((long)var0); // L: 40 + } + + @ObfuscatedName("kw") + @ObfuscatedSignature( + descriptor = "(B)V", + garbageValue = "90" + ) + static final void method2496() { + Client.field654 = Client.cycleCntr; // L: 11285 + class21.field190 = true; // L: 11286 + } // L: 11287 } diff --git a/runescape-client/src/main/java/class125.java b/runescape-client/src/main/java/class125.java index eebc75a07e..3b1dfa8328 100644 --- a/runescape-client/src/main/java/class125.java +++ b/runescape-client/src/main/java/class125.java @@ -3,90 +3,119 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("dv") +@ObfuscatedName("dq") public enum class125 implements Enumerated { - @ObfuscatedName("h") + @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "Ldv;" + descriptor = "Ldq;" ) - field1451(0, 0), - @ObfuscatedName("c") + field1470(2, 0), + @ObfuscatedName("n") @ObfuscatedSignature( - descriptor = "Ldv;" + descriptor = "Ldq;" ) - field1450(2, 1), - @ObfuscatedName("o") + field1469(1, 1), + @ObfuscatedName("f") @ObfuscatedSignature( - descriptor = "Ldv;" + descriptor = "Ldq;" ) - field1449(3, 2), - @ObfuscatedName("g") + field1468(0, 2), + @ObfuscatedName("y") @ObfuscatedSignature( - descriptor = "Ldv;" + descriptor = "Ldq;" ) - field1452(1, 3); + field1471(3, 3); - @ObfuscatedName("ar") - @ObfuscatedGetter( - intValue = -561913005 + @ObfuscatedName("x") + @ObfuscatedSignature( + descriptor = "Lnd;" ) - static int field1456; - @ObfuscatedName("l") - @ObfuscatedGetter( - intValue = 547368117 + @Export("NetCache_reference") + public static Buffer NetCache_reference; + @ObfuscatedName("ec") + @ObfuscatedSignature( + descriptor = "Ljp;" ) - public final int field1453; - @ObfuscatedName("z") + @Export("archive14") + static Archive archive14; + @ObfuscatedName("p") @ObfuscatedGetter( - intValue = 270011887 + intValue = 850248893 + ) + public final int field1472; + @ObfuscatedName("j") + @ObfuscatedGetter( + intValue = -1949743275 ) @Export("id") final int id; class125(int var3, int var4) { - this.field1453 = var3; // L: 16 + this.field1472 = var3; // L: 16 this.id = var4; // L: 17 } // L: 18 - @ObfuscatedName("h") + @ObfuscatedName("v") @ObfuscatedSignature( descriptor = "(I)I", - garbageValue = "-708237537" + garbageValue = "-907662946" ) @Export("rsOrdinal") public int rsOrdinal() { return this.id; // L: 21 } - @ObfuscatedName("c") + @ObfuscatedName("p") @ObfuscatedSignature( - descriptor = "(III)Z", - garbageValue = "-1218095333" + descriptor = "(IIB)I", + garbageValue = "-60" ) - public static boolean method2507(int var0, int var1) { - return (var0 >> var1 + 1 & 1) != 0; // L: 13 + static int method2502(int var0, int var1) { + long var2 = (long)((var0 << 16) + var1); // L: 114 + return BuddyRankComparator.NetCache_currentResponse != null && var2 == BuddyRankComparator.NetCache_currentResponse.key ? SoundSystem.NetCache_responseArchiveBuffer.offset * 99 / (SoundSystem.NetCache_responseArchiveBuffer.array.length - BuddyRankComparator.NetCache_currentResponse.padding) + 1 : 0; // L: 115 116 } - @ObfuscatedName("hz") + @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "1978830024" + descriptor = "(I)I", + garbageValue = "2118107095" ) - static final void method2506() { - Client.field727 = 0; // L: 5401 - int var0 = (class35.localPlayer.x >> 7) + JagexCache.baseX; // L: 5402 - int var1 = (class35.localPlayer.y >> 7) + Messages.baseY; // L: 5403 - if (var0 >= 3053 && var0 <= 3156 && var1 >= 3056 && var1 <= 3136) { // L: 5404 - Client.field727 = 1; + static final int method2504() { + return ViewportMouse.ViewportMouse_x; // L: 112 + } + + @ObfuscatedName("ja") + @ObfuscatedSignature( + descriptor = "(Lio;Leq;IIZI)V", + garbageValue = "1630446885" + ) + @Export("addWidgetItemMenuItem") + static final void addWidgetItemMenuItem(Widget var0, ItemComposition var1, int var2, int var3, boolean var4) { + String[] var5 = var1.inventoryActions; // L: 9970 + byte var6 = -1; // L: 9971 + String var7 = null; // L: 9972 + if (var5 != null && var5[var3] != null) { // L: 9973 + if (var3 == 0) { // L: 9974 + var6 = 33; + } else if (var3 == 1) { // L: 9975 + var6 = 34; + } else if (var3 == 2) { + var6 = 35; // L: 9976 + } else if (var3 == 3) { // L: 9977 + var6 = 36; + } else { + var6 = 37; // L: 9978 + } + + var7 = var5[var3]; // L: 9979 + } else if (var3 == 4) { // L: 9982 + var6 = 37; // L: 9983 + var7 = "Drop"; // L: 9984 } - if (var0 >= 3072 && var0 <= 3118 && var1 >= 9492 && var1 <= 9535) { // L: 5405 - Client.field727 = 1; + if (var6 != -1 && var7 != null) { // L: 9987 + BoundaryObject.insertMenuItem(var7, class44.colorStartTag(16748608) + var1.name, var6, var1.id, var2, var0.id, var4); // L: 9988 } - if (Client.field727 == 1 && var0 >= 3139 && var0 <= 3199 && var1 >= 3008 && var1 <= 3062) { // L: 5406 - Client.field727 = 0; - } - - } // L: 5407 + } // L: 9990 } diff --git a/runescape-client/src/main/java/class13.java b/runescape-client/src/main/java/class13.java index a5bccd896b..5135b68aac 100644 --- a/runescape-client/src/main/java/class13.java +++ b/runescape-client/src/main/java/class13.java @@ -3,129 +3,99 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("r") +@ObfuscatedName("c") public class class13 extends class14 { - @ObfuscatedName("k") - @ObfuscatedGetter( - intValue = 1404988967 + @ObfuscatedName("a") + @ObfuscatedSignature( + descriptor = "Lio;" ) - @Export("Interpreter_stringStackSize") - static int Interpreter_stringStackSize; - @ObfuscatedName("h") + @Export("scriptDotWidget") + static Widget scriptDotWidget; + @ObfuscatedName("v") @ObfuscatedGetter( - longValue = -8402859884064294097L + longValue = 2060700822682065955L ) - long field124; - @ObfuscatedName("c") - String field120; + long field129; + @ObfuscatedName("n") + String field128; // $FF: synthetic field @ObfuscatedSignature( - descriptor = "Lo;" + descriptor = "Lf;" ) final class2 this$0; @ObfuscatedSignature( - descriptor = "(Lo;)V" + descriptor = "(Lf;)V" ) class13(class2 var1) { this.this$0 = var1; - this.field124 = -1L; // L: 194 - this.field120 = null; // L: 195 + this.field129 = -1L; // L: 194 + this.field128 = null; // L: 195 } // L: 197 - @ObfuscatedName("h") + @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "(Lnk;I)V", - garbageValue = "110401227" + descriptor = "(Lnd;I)V", + garbageValue = "-1281352827" ) - void vmethod339(Buffer var1) { + void vmethod276(Buffer var1) { if (var1.readUnsignedByte() != 255) { // L: 200 --var1.offset; // L: 201 - this.field124 = var1.readLong(); // L: 202 + this.field129 = var1.readLong(); // L: 202 } - this.field120 = var1.readStringCp1252NullTerminatedOrNull(); // L: 204 + this.field128 = var1.readStringCp1252NullTerminatedOrNull(); // L: 204 } // L: 205 - @ObfuscatedName("c") + @ObfuscatedName("n") @ObfuscatedSignature( - descriptor = "(Lx;I)V", - garbageValue = "-1535989118" + descriptor = "(Ll;B)V", + garbageValue = "29" ) - void vmethod338(class11 var1) { - var1.method120(this.field124, this.field120); // L: 208 + void vmethod281(ClanSettings var1) { + var1.method106(this.field129, this.field128); // L: 208 } // L: 209 - @ObfuscatedName("c") + @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "(II)Lev;", - garbageValue = "1730592786" + descriptor = "(Ljv;B)V", + garbageValue = "-4" ) - public static VarcInt method210(int var0) { - VarcInt var1 = (VarcInt)VarcInt.VarcInt_cached.get((long)var0); // L: 21 - if (var1 != null) { // L: 22 - return var1; - } else { - byte[] var2 = VarcInt.VarcInt_archive.takeFile(19, var0); // L: 23 - var1 = new VarcInt(); // L: 24 - if (var2 != null) { // L: 25 - var1.method2659(new Buffer(var2)); + public static void method180(AbstractArchive var0) { + StructComposition.StructDefinition_archive = var0; // L: 19 + } // L: 20 + + @ObfuscatedName("n") + public static double method182(double var0, double var2, double var4) { + return MouseHandler.method620((var0 - var2) / var4) / var4; // L: 13 + } + + @ObfuscatedName("fz") + @ObfuscatedSignature( + descriptor = "(Ljp;Ljava/lang/String;I)V", + garbageValue = "-1436949198" + ) + static void method175(Archive var0, String var1) { + ArchiveLoader var2 = new ArchiveLoader(var0, var1); // L: 1492 + Client.archiveLoaders.add(var2); // L: 1493 + Client.field916 += var2.groupCount; // L: 1494 + } // L: 1495 + + @ObfuscatedName("km") + @ObfuscatedSignature( + descriptor = "(Lio;IIII)V", + garbageValue = "425709195" + ) + @Export("drawCompass") + static final void drawCompass(Widget var0, int var1, int var2, int var3) { + SpriteMask var4 = var0.getSpriteMask(false); // L: 11206 + if (var4 != null) { // L: 11207 + if (Client.minimapState < 3) { // L: 11208 + NPCComposition.compass.drawRotatedMaskedCenteredAround(var1, var2, var4.width, var4.height, 25, 25, Client.camAngleY, 256, var4.xStarts, var4.xWidths); + } else { + Rasterizer2D.Rasterizer2D_fillMaskedRectangle(var1, var2, 0, var4.xStarts, var4.xWidths); // L: 11209 } - VarcInt.VarcInt_cached.put(var1, (long)var0); // L: 26 - return var1; // L: 27 } - } - - @ObfuscatedName("b") - @ObfuscatedSignature( - descriptor = "(I)Lbc;", - garbageValue = "-97122486" - ) - @Export("getNextWorldListWorld") - static World getNextWorldListWorld() { - return World.World_listCount < World.World_count ? Messages.World_worlds[++World.World_listCount - 1] : null; // L: 242 243 - } - - @ObfuscatedName("aw") - @ObfuscatedSignature( - descriptor = "(Lem;I)Z", - garbageValue = "-2025189818" - ) - static boolean method204(ObjectComposition var0) { - if (var0.transforms != null) { // L: 583 - int[] var1 = var0.transforms; // L: 585 - - for (int var2 = 0; var2 < var1.length; ++var2) { // L: 586 - int var3 = var1[var2]; // L: 587 - ObjectComposition var4 = AttackOption.getObjectDefinition(var3); // L: 589 - if (var4.mapIconId != -1) { // L: 590 - return true; // L: 591 - } - } - } else if (var0.mapIconId != -1) { // L: 597 - return true; // L: 598 - } - - return false; // L: 600 - } - - @ObfuscatedName("er") - @ObfuscatedSignature( - descriptor = "(B)V", - garbageValue = "-24" - ) - static final void method214() { - Scene.Scene_isLowDetail = false; // L: 807 - Client.isLowDetail = false; // L: 808 - } // L: 809 - - @ObfuscatedName("jo") - @ObfuscatedSignature( - descriptor = "(B)Z", - garbageValue = "-86" - ) - static boolean method213() { - return Client.tapToDrop || KeyHandler.KeyHandler_pressedKeys[81]; // L: 10459 - } + } // L: 11210 } diff --git a/runescape-client/src/main/java/class135.java b/runescape-client/src/main/java/class135.java index 14b2ae883c..98a08c923c 100644 --- a/runescape-client/src/main/java/class135.java +++ b/runescape-client/src/main/java/class135.java @@ -1,31 +1,162 @@ -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("ea") +@ObfuscatedName("ed") public class class135 { - @ObfuscatedName("tl") - @ObfuscatedGetter( - intValue = -980191255 - ) - @Export("foundItemIdCount") - static int foundItemIdCount; - @ObfuscatedName("o") - public short[] field1527; - @ObfuscatedName("g") - public short[] field1531; + @ObfuscatedName("f") + public short[] field1537; + @ObfuscatedName("y") + public short[] field1538; - class135(int var1) { - ItemComposition var2 = Strings.ItemDefinition_get(var1); // L: 12 - if (var2.method2964()) { // L: 13 - this.field1527 = new short[var2.recolorTo.length]; // L: 14 - System.arraycopy(var2.recolorTo, 0, this.field1527, 0, this.field1527.length); // L: 15 + public class135(int var1) { + ItemComposition var2 = class260.ItemDefinition_get(var1); // L: 12 + if (var2.method3024()) { // L: 13 + this.field1537 = new short[var2.recolorTo.length]; // L: 14 + System.arraycopy(var2.recolorTo, 0, this.field1537, 0, this.field1537.length); // L: 15 } - if (var2.method2965()) { // L: 17 - this.field1531 = new short[var2.retextureTo.length]; // L: 18 - System.arraycopy(var2.retextureTo, 0, this.field1531, 0, this.field1531.length); // L: 19 + if (var2.method3025()) { // L: 17 + this.field1538 = new short[var2.retextureTo.length]; // L: 18 + System.arraycopy(var2.retextureTo, 0, this.field1538, 0, this.field1538.length); // L: 19 } } // L: 21 + + @ObfuscatedName("d") + @ObfuscatedSignature( + descriptor = "(I)V", + garbageValue = "660073374" + ) + public static void method2601() { + KitDefinition.KitDefinition_cached.clear(); // L: 136 + } // L: 137 + + @ObfuscatedName("u") + @ObfuscatedSignature( + descriptor = "(IIB)V", + garbageValue = "-54" + ) + public static final void method2599(int var0, int var1) { + ViewportMouse.ViewportMouse_x = var0; // L: 95 + ViewportMouse.ViewportMouse_y = var1; // L: 96 + ViewportMouse.ViewportMouse_isInViewport = true; // L: 97 + ViewportMouse.ViewportMouse_entityCount = 0; // L: 98 + ViewportMouse.ViewportMouse_false0 = false; // L: 99 + } // L: 100 + + @ObfuscatedName("l") + @ObfuscatedSignature( + descriptor = "(ILcf;ZI)I", + garbageValue = "1611533259" + ) + static int method2600(int var0, Script var1, boolean var2) { + Widget var3; + if (var0 >= 2000) { // L: 1007 + var0 -= 1000; // L: 1008 + var3 = Frames.getWidget(Interpreter.Interpreter_intStack[--class44.Interpreter_intStackSize]); // L: 1009 + } else { + var3 = var2 ? class13.scriptDotWidget : Interpreter.scriptActiveWidget; // L: 1011 + } + + String var4 = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize]; // L: 1012 + int[] var5 = null; // L: 1013 + if (var4.length() > 0 && var4.charAt(var4.length() - 1) == 'Y') { // L: 1014 + int var6 = Interpreter.Interpreter_intStack[--class44.Interpreter_intStackSize]; // L: 1015 + if (var6 > 0) { // L: 1016 + for (var5 = new int[var6]; var6-- > 0; var5[var6] = Interpreter.Interpreter_intStack[--class44.Interpreter_intStackSize]) { // L: 1017 1018 + } + } + + var4 = var4.substring(0, var4.length() - 1); // L: 1020 + } + + Object[] var8 = new Object[var4.length() + 1]; // L: 1022 + + int var7; + for (var7 = var8.length - 1; var7 >= 1; --var7) { // L: 1023 + if (var4.charAt(var7 - 1) == 's') { // L: 1024 + var8[var7] = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize]; + } else { + var8[var7] = new Integer(Interpreter.Interpreter_intStack[--class44.Interpreter_intStackSize]); // L: 1025 + } + } + + var7 = Interpreter.Interpreter_intStack[--class44.Interpreter_intStackSize]; // L: 1027 + if (var7 != -1) { // L: 1028 + var8[0] = new Integer(var7); + } else { + var8 = null; // L: 1029 + } + + if (var0 == ScriptOpcodes.CC_SETONCLICK) { + var3.onClick = var8; // L: 1030 + } else if (var0 == ScriptOpcodes.CC_SETONHOLD) { // L: 1031 + var3.onHold = var8; + } else if (var0 == ScriptOpcodes.CC_SETONRELEASE) { // L: 1032 + var3.onRelease = var8; + } else if (var0 == ScriptOpcodes.CC_SETONMOUSEOVER) { // L: 1033 + var3.onMouseOver = var8; + } else if (var0 == ScriptOpcodes.CC_SETONMOUSELEAVE) { // L: 1034 + var3.onMouseLeave = var8; + } else if (var0 == ScriptOpcodes.CC_SETONDRAG) { // L: 1035 + var3.onDrag = var8; + } else if (var0 == ScriptOpcodes.CC_SETONTARGETLEAVE) { // L: 1036 + var3.onTargetLeave = var8; + } else if (var0 == ScriptOpcodes.CC_SETONVARTRANSMIT) { // L: 1037 + var3.onVarTransmit = var8; // L: 1038 + var3.varTransmitTriggers = var5; // L: 1039 + } else if (var0 == ScriptOpcodes.CC_SETONTIMER) { // L: 1041 + var3.onTimer = var8; + } else if (var0 == ScriptOpcodes.CC_SETONOP) { // L: 1042 + var3.onOp = var8; + } else if (var0 == ScriptOpcodes.CC_SETONDRAGCOMPLETE) { // L: 1043 + var3.onDragComplete = var8; + } else if (var0 == ScriptOpcodes.CC_SETONCLICKREPEAT) { // L: 1044 + var3.onClickRepeat = var8; + } else if (var0 == ScriptOpcodes.CC_SETONMOUSEREPEAT) { // L: 1045 + var3.onMouseRepeat = var8; + } else if (var0 == ScriptOpcodes.CC_SETONINVTRANSMIT) { // L: 1046 + var3.onInvTransmit = var8; // L: 1047 + var3.invTransmitTriggers = var5; // L: 1048 + } else if (var0 == ScriptOpcodes.CC_SETONSTATTRANSMIT) { // L: 1050 + var3.onStatTransmit = var8; // L: 1051 + var3.statTransmitTriggers = var5; // L: 1052 + } else if (var0 == ScriptOpcodes.CC_SETONTARGETENTER) { // L: 1054 + var3.onTargetEnter = var8; + } else if (var0 == ScriptOpcodes.CC_SETONSCROLLWHEEL) { // L: 1055 + var3.onScroll = var8; + } else if (var0 == ScriptOpcodes.CC_SETONCHATTRANSMIT) { // L: 1056 + var3.onChatTransmit = var8; + } else if (var0 == ScriptOpcodes.CC_SETONKEY) { // L: 1057 + var3.onKey = var8; + } else if (var0 == ScriptOpcodes.CC_SETONFRIENDTRANSMIT) { // L: 1058 + var3.onFriendTransmit = var8; + } else if (var0 == ScriptOpcodes.CC_SETONCLANTRANSMIT) { // L: 1059 + var3.onClanTransmit = var8; + } else if (var0 == ScriptOpcodes.CC_SETONMISCTRANSMIT) { // L: 1060 + var3.onMiscTransmit = var8; + } else if (var0 == ScriptOpcodes.CC_SETONDIALOGABORT) { // L: 1061 + var3.onDialogAbort = var8; + } else if (var0 == ScriptOpcodes.CC_SETONSUBCHANGE) { // L: 1062 + var3.onSubChange = var8; + } else if (var0 == ScriptOpcodes.CC_SETONSTOCKTRANSMIT) { // L: 1063 + var3.onStockTransmit = var8; + } else if (var0 == 1426) { // L: 1064 + var3.field3077 = var8; + } else if (var0 == ScriptOpcodes.CC_SETONRESIZE) { // L: 1065 + var3.onResize = var8; + } else if (var0 == 1428) { // L: 1066 + var3.field3043 = var8; + } else { + if (var0 != 1429) { // L: 1067 + return 2; // L: 1068 + } + + var3.field3071 = var8; + } + + var3.hasListener = true; // L: 1069 + return 1; // L: 1070 + } } diff --git a/runescape-client/src/main/java/class14.java b/runescape-client/src/main/java/class14.java index 12a3c2ffac..0f80180afd 100644 --- a/runescape-client/src/main/java/class14.java +++ b/runescape-client/src/main/java/class14.java @@ -1,143 +1,66 @@ 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("p") +@ObfuscatedName("e") public abstract class class14 extends Node { - @ObfuscatedName("di") - @ObfuscatedSignature( - descriptor = "Lji;" + @ObfuscatedName("lc") + @ObfuscatedGetter( + intValue = 1812999285 ) - @Export("archive4") - static Archive archive4; - @ObfuscatedName("gh") - @ObfuscatedSignature( - descriptor = "[Low;" - ) - @Export("headIconPkSprites") - static SpritePixels[] headIconPkSprites; + @Export("menuX") + static int menuX; class14() { } // L: 68 - @ObfuscatedName("h") + @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "(Lnk;I)V", - garbageValue = "110401227" + descriptor = "(Lnd;I)V", + garbageValue = "-1281352827" ) - abstract void vmethod339(Buffer var1); + abstract void vmethod276(Buffer var1); - @ObfuscatedName("c") + @ObfuscatedName("n") @ObfuscatedSignature( - descriptor = "(Lx;I)V", - garbageValue = "-1535989118" + descriptor = "(Ll;B)V", + garbageValue = "29" ) - abstract void vmethod338(class11 var1); + abstract void vmethod281(ClanSettings var1); - @ObfuscatedName("h") + @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "(B)V", - garbageValue = "101" + descriptor = "(CB)Z", + garbageValue = "-24" ) - static void method224() { - Tiles.field1097 = null; // L: 48 - class9.field71 = null; // L: 49 - Tiles.field1088 = null; // L: 50 - Tiles.field1086 = null; // L: 51 - Tiles.field1105 = null; // L: 52 - Tiles.field1090 = null; // L: 53 - StructComposition.field1730 = null; // L: 54 - Tiles.Tiles_hue = null; // L: 55 - class280.Tiles_saturation = null; // L: 56 - Tiles.Tiles_lightness = null; // L: 57 - class20.Tiles_hueMultiplier = null; // L: 58 - AbstractByteArrayCopier.field3115 = null; // L: 59 - } // L: 60 - - @ObfuscatedName("x") - @ObfuscatedSignature( - descriptor = "(Ljava/lang/String;B)V", - garbageValue = "-5" - ) - static final void method222(String var0) { - StringBuilder var10000 = (new StringBuilder()).append(var0); - Object var10001 = null; - String var1 = var10000.append(" is already on your ignore list").toString(); // L: 180 - WorldMapScaleHandler.addGameMessage(30, "", var1); // L: 182 - } // L: 184 - - @ObfuscatedName("d") - @ObfuscatedSignature( - descriptor = "(ILci;ZB)I", - garbageValue = "-54" - ) - static int method216(int var0, Script var1, boolean var2) { - Widget var3 = DevicePcmPlayerProvider.getWidget(Interpreter.Interpreter_intStack[--WorldMapCacheName.Interpreter_intStackSize]); // L: 1252 - if (var0 == ScriptOpcodes.IF_GETX) { // L: 1253 - Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = var3.x; // L: 1254 - return 1; // L: 1255 - } else if (var0 == ScriptOpcodes.IF_GETY) { // L: 1257 - Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = var3.y; // L: 1258 - return 1; // L: 1259 - } else if (var0 == ScriptOpcodes.IF_GETWIDTH) { // L: 1261 - Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = var3.width; // L: 1262 - return 1; // L: 1263 - } else if (var0 == ScriptOpcodes.IF_GETHEIGHT) { // L: 1265 - Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = var3.height; // L: 1266 - return 1; // L: 1267 - } else if (var0 == ScriptOpcodes.IF_GETHIDE) { // L: 1269 - Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = var3.isHidden ? 1 : 0; // L: 1270 - return 1; // L: 1271 - } else if (var0 == ScriptOpcodes.IF_GETLAYER) { // L: 1273 - Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = var3.parentId; // L: 1274 - return 1; // L: 1275 + public static final boolean method188(char var0) { + if (Character.isISOControl(var0)) { // L: 16 + return false; + } else if (Login.isAlphaNumeric(var0)) { // L: 17 + return true; } else { - return 2; // L: 1277 - } - } + char[] var1 = class365.field4096; // L: 19 - @ObfuscatedName("au") - @ObfuscatedSignature( - descriptor = "(ILci;ZB)I", - garbageValue = "-112" - ) - static int method215(int var0, Script var1, boolean var2) { - if (var0 != 6700 && var0 != 6702 && var0 != 6704 && var0 != 6706 && var0 != 6708) { // L: 4158 - if (var0 != 6701 && var0 != 6703 && var0 != 6705 && var0 != 6707 && var0 != 6709) { // L: 4163 - if (var0 == 6750) { // L: 4167 - ++class13.Interpreter_stringStackSize; // L: 4168 - return 1; // L: 4169 - } else if (var0 != 6751 && var0 != 6752 && var0 != 6753) { // L: 4171 - if (var0 == 6754) { // L: 4175 - int var3 = Interpreter.Interpreter_intStack[--WorldMapCacheName.Interpreter_intStackSize]; // L: 4176 - NPCComposition var4 = class8.getNpcDefinition(var3); // L: 4177 - Interpreter.Interpreter_stringStack[++class13.Interpreter_stringStackSize - 1] = var4 != null ? var4.name : ""; // L: 4178 - return 1; // L: 4179 - } else { - return 2; // L: 4181 - } - } else { - ++WorldMapCacheName.Interpreter_intStackSize; // L: 4172 - return 1; // L: 4173 + int var2; + char var3; + for (var2 = 0; var2 < var1.length; ++var2) { // L: 20 + var3 = var1[var2]; // L: 21 + if (var0 == var3) { // L: 22 + return true; } - } else { - --WorldMapCacheName.Interpreter_intStackSize; // L: 4164 - return 1; // L: 4165 } - } else { - WorldMapCacheName.Interpreter_intStackSize -= 2; // L: 4159 - --class13.Interpreter_stringStackSize; // L: 4160 - return 1; // L: 4161 - } - } - @ObfuscatedName("hf") - @ObfuscatedSignature( - descriptor = "(I)Z", - garbageValue = "-464058040" - ) - static boolean method223() { - return (Client.drawPlayerNames & 2) != 0; // L: 4838 + var1 = class365.field4097; // L: 26 + + for (var2 = 0; var2 < var1.length; ++var2) { // L: 27 + var3 = var1[var2]; // L: 28 + if (var0 == var3) { + return true; // L: 29 + } + } + + return false; // L: 32 + } } } diff --git a/runescape-client/src/main/java/class142.java b/runescape-client/src/main/java/class142.java index ee4a21eab5..2f89c89a39 100644 --- a/runescape-client/src/main/java/class142.java +++ b/runescape-client/src/main/java/class142.java @@ -1,186 +1,42 @@ -import java.util.Date; +import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -import net.runelite.rs.ScriptOpcodes; -@ObfuscatedName("ew") +@ObfuscatedName("eb") public class class142 { - @ObfuscatedName("aw") + @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "(ILci;ZI)I", - garbageValue = "305078363" + descriptor = "Ljv;" ) - static int method2715(int var0, Script var1, boolean var2) { - String var3; - int var9; - if (var0 == ScriptOpcodes.APPEND_NUM) { // L: 2959 - var3 = Interpreter.Interpreter_stringStack[--class13.Interpreter_stringStackSize]; // L: 2960 - var9 = Interpreter.Interpreter_intStack[--WorldMapCacheName.Interpreter_intStackSize]; // L: 2961 - Interpreter.Interpreter_stringStack[++class13.Interpreter_stringStackSize - 1] = var3 + var9; // L: 2962 - return 1; // L: 2963 - } else { - String var4; - if (var0 == ScriptOpcodes.APPEND) { // L: 2965 - class13.Interpreter_stringStackSize -= 2; // L: 2966 - var3 = Interpreter.Interpreter_stringStack[class13.Interpreter_stringStackSize]; // L: 2967 - var4 = Interpreter.Interpreter_stringStack[class13.Interpreter_stringStackSize + 1]; // L: 2968 - Interpreter.Interpreter_stringStack[++class13.Interpreter_stringStackSize - 1] = var3 + var4; // L: 2969 - return 1; // L: 2970 - } else if (var0 == ScriptOpcodes.APPEND_SIGNNUM) { // L: 2972 - var3 = Interpreter.Interpreter_stringStack[--class13.Interpreter_stringStackSize]; // L: 2973 - var9 = Interpreter.Interpreter_intStack[--WorldMapCacheName.Interpreter_intStackSize]; // L: 2974 - Interpreter.Interpreter_stringStack[++class13.Interpreter_stringStackSize - 1] = var3 + PendingSpawn.intToString(var9, true); // L: 2975 - return 1; // L: 2976 - } else if (var0 == ScriptOpcodes.LOWERCASE) { // L: 2978 - var3 = Interpreter.Interpreter_stringStack[--class13.Interpreter_stringStackSize]; // L: 2979 - Interpreter.Interpreter_stringStack[++class13.Interpreter_stringStackSize - 1] = var3.toLowerCase(); // L: 2980 - return 1; // L: 2981 - } else { - int var6; - int var10; - if (var0 == ScriptOpcodes.FROMDATE) { // L: 2983 - var10 = Interpreter.Interpreter_intStack[--WorldMapCacheName.Interpreter_intStackSize]; // L: 2984 - long var13 = ((long)var10 + 11745L) * 86400000L; // L: 2985 - Interpreter.Interpreter_calendar.setTime(new Date(var13)); // L: 2986 - var6 = Interpreter.Interpreter_calendar.get(5); // L: 2987 - int var17 = Interpreter.Interpreter_calendar.get(2); // L: 2988 - int var8 = Interpreter.Interpreter_calendar.get(1); // L: 2989 - Interpreter.Interpreter_stringStack[++class13.Interpreter_stringStackSize - 1] = var6 + "-" + Interpreter.Interpreter_MONTHS[var17] + "-" + var8; // L: 2990 - return 1; // L: 2991 - } else if (var0 != ScriptOpcodes.TEXT_GENDER) { // L: 2993 - if (var0 == ScriptOpcodes.TOSTRING) { // L: 3001 - var10 = Interpreter.Interpreter_intStack[--WorldMapCacheName.Interpreter_intStackSize]; // L: 3002 - Interpreter.Interpreter_stringStack[++class13.Interpreter_stringStackSize - 1] = Integer.toString(var10); // L: 3003 - return 1; // L: 3004 - } else if (var0 == ScriptOpcodes.COMPARE) { // L: 3006 - class13.Interpreter_stringStackSize -= 2; // L: 3007 - Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = Messages.method2381(UserComparator10.compareStrings(Interpreter.Interpreter_stringStack[class13.Interpreter_stringStackSize], Interpreter.Interpreter_stringStack[class13.Interpreter_stringStackSize + 1], class7.clientLanguage)); // L: 3008 - return 1; // L: 3009 - } else { - int var5; - byte[] var11; - Font var12; - if (var0 == ScriptOpcodes.PARAHEIGHT) { // L: 3011 - var3 = Interpreter.Interpreter_stringStack[--class13.Interpreter_stringStackSize]; // L: 3012 - WorldMapCacheName.Interpreter_intStackSize -= 2; // L: 3013 - var9 = Interpreter.Interpreter_intStack[WorldMapCacheName.Interpreter_intStackSize]; // L: 3014 - var5 = Interpreter.Interpreter_intStack[WorldMapCacheName.Interpreter_intStackSize + 1]; // L: 3015 - var11 = class18.archive13.takeFile(var5, 0); // L: 3016 - var12 = new Font(var11); // L: 3017 - Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = var12.lineCount(var3, var9); // L: 3018 - return 1; // L: 3019 - } else if (var0 == ScriptOpcodes.PARAWIDTH) { // L: 3021 - var3 = Interpreter.Interpreter_stringStack[--class13.Interpreter_stringStackSize]; // L: 3022 - WorldMapCacheName.Interpreter_intStackSize -= 2; // L: 3023 - var9 = Interpreter.Interpreter_intStack[WorldMapCacheName.Interpreter_intStackSize]; // L: 3024 - var5 = Interpreter.Interpreter_intStack[WorldMapCacheName.Interpreter_intStackSize + 1]; // L: 3025 - var11 = class18.archive13.takeFile(var5, 0); // L: 3026 - var12 = new Font(var11); // L: 3027 - Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = var12.lineWidth(var3, var9); // L: 3028 - return 1; // L: 3029 - } else if (var0 == ScriptOpcodes.TEXT_SWITCH) { // L: 3031 - class13.Interpreter_stringStackSize -= 2; // L: 3032 - var3 = Interpreter.Interpreter_stringStack[class13.Interpreter_stringStackSize]; // L: 3033 - var4 = Interpreter.Interpreter_stringStack[class13.Interpreter_stringStackSize + 1]; // L: 3034 - if (Interpreter.Interpreter_intStack[--WorldMapCacheName.Interpreter_intStackSize] == 1) { // L: 3035 - Interpreter.Interpreter_stringStack[++class13.Interpreter_stringStackSize - 1] = var3; - } else { - Interpreter.Interpreter_stringStack[++class13.Interpreter_stringStackSize - 1] = var4; // L: 3036 - } + @Export("FloorOverlayDefinition_archive") + public static AbstractArchive FloorOverlayDefinition_archive; - return 1; // L: 3037 - } else if (var0 == ScriptOpcodes.ESCAPE) { // L: 3039 - var3 = Interpreter.Interpreter_stringStack[--class13.Interpreter_stringStackSize]; // L: 3040 - Interpreter.Interpreter_stringStack[++class13.Interpreter_stringStackSize - 1] = AbstractFont.escapeBrackets(var3); // L: 3041 - return 1; // L: 3042 - } else if (var0 == ScriptOpcodes.APPEND_CHAR) { // L: 3044 - var3 = Interpreter.Interpreter_stringStack[--class13.Interpreter_stringStackSize]; // L: 3045 - var9 = Interpreter.Interpreter_intStack[--WorldMapCacheName.Interpreter_intStackSize]; // L: 3046 - Interpreter.Interpreter_stringStack[++class13.Interpreter_stringStackSize - 1] = var3 + (char)var9; // L: 3047 - return 1; // L: 3048 - } else if (var0 == ScriptOpcodes.CHAR_ISPRINTABLE) { // L: 3050 - var10 = Interpreter.Interpreter_intStack[--WorldMapCacheName.Interpreter_intStackSize]; // L: 3051 - Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = TextureProvider.isCharPrintable((char)var10) ? 1 : 0; // L: 3052 - return 1; // L: 3053 - } else if (var0 == ScriptOpcodes.CHAR_ISALPHANUMERIC) { // L: 3055 - var10 = Interpreter.Interpreter_intStack[--WorldMapCacheName.Interpreter_intStackSize]; // L: 3056 - Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = class214.isAlphaNumeric((char)var10) ? 1 : 0; // L: 3057 - return 1; // L: 3058 - } else if (var0 == ScriptOpcodes.CHAR_ISALPHA) { // L: 3060 - var10 = Interpreter.Interpreter_intStack[--WorldMapCacheName.Interpreter_intStackSize]; // L: 3061 - Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = GameObject.isCharAlphabetic((char)var10) ? 1 : 0; // L: 3062 - return 1; // L: 3063 - } else if (var0 == ScriptOpcodes.CHAR_ISNUMERIC) { // L: 3065 - var10 = Interpreter.Interpreter_intStack[--WorldMapCacheName.Interpreter_intStackSize]; // L: 3066 - Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = GrandExchangeOfferWorldComparator.isDigit((char)var10) ? 1 : 0; // L: 3067 - return 1; // L: 3068 - } else if (var0 == ScriptOpcodes.STRING_LENGTH) { // L: 3070 - var3 = Interpreter.Interpreter_stringStack[--class13.Interpreter_stringStackSize]; // L: 3071 - if (var3 != null) { // L: 3072 - Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = var3.length(); - } else { - Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = 0; // L: 3073 - } + @ObfuscatedName("u") + @ObfuscatedSignature( + descriptor = "(B)[Loh;", + garbageValue = "61" + ) + static SpritePixels[] method2739() { + SpritePixels[] var0 = new SpritePixels[class396.SpriteBuffer_spriteCount]; // L: 163 - return 1; // L: 3074 - } else if (var0 == ScriptOpcodes.SUBSTRING) { // L: 3076 - var3 = Interpreter.Interpreter_stringStack[--class13.Interpreter_stringStackSize]; // L: 3077 - WorldMapCacheName.Interpreter_intStackSize -= 2; // L: 3078 - var9 = Interpreter.Interpreter_intStack[WorldMapCacheName.Interpreter_intStackSize]; // L: 3079 - var5 = Interpreter.Interpreter_intStack[WorldMapCacheName.Interpreter_intStackSize + 1]; // L: 3080 - Interpreter.Interpreter_stringStack[++class13.Interpreter_stringStackSize - 1] = var3.substring(var9, var5); // L: 3081 - return 1; // L: 3082 - } else if (var0 == ScriptOpcodes.REMOVETAGS) { // L: 3084 - var3 = Interpreter.Interpreter_stringStack[--class13.Interpreter_stringStackSize]; // L: 3085 - StringBuilder var15 = new StringBuilder(var3.length()); // L: 3086 - boolean var16 = false; // L: 3087 + for (int var1 = 0; var1 < class396.SpriteBuffer_spriteCount; ++var1) { // L: 164 + SpritePixels var2 = var0[var1] = new SpritePixels(); // L: 165 + var2.width = class396.SpriteBuffer_spriteWidth; // L: 166 + var2.height = UserComparator2.SpriteBuffer_spriteHeight; // L: 167 + var2.xOffset = WorldMapDecoration.SpriteBuffer_xOffsets[var1]; // L: 168 + var2.yOffset = Calendar.SpriteBuffer_yOffsets[var1]; // L: 169 + var2.subWidth = class396.SpriteBuffer_spriteWidths[var1]; // L: 170 + var2.subHeight = class302.SpriteBuffer_spriteHeights[var1]; // L: 171 + int var3 = var2.subWidth * var2.subHeight; // L: 172 + byte[] var4 = class396.SpriteBuffer_pixels[var1]; // L: 173 + var2.pixels = new int[var3]; // L: 174 - for (var6 = 0; var6 < var3.length(); ++var6) { // L: 3088 - char var7 = var3.charAt(var6); // L: 3089 - if (var7 == '<') { // L: 3090 - var16 = true; - } else if (var7 == '>') { // L: 3091 - var16 = false; - } else if (!var16) { // L: 3092 - var15.append(var7); - } - } - - Interpreter.Interpreter_stringStack[++class13.Interpreter_stringStackSize - 1] = var15.toString(); // L: 3094 - return 1; // L: 3095 - } else if (var0 == ScriptOpcodes.STRING_INDEXOF_CHAR) { // L: 3097 - var3 = Interpreter.Interpreter_stringStack[--class13.Interpreter_stringStackSize]; // L: 3098 - var9 = Interpreter.Interpreter_intStack[--WorldMapCacheName.Interpreter_intStackSize]; // L: 3099 - Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = var3.indexOf(var9); // L: 3100 - return 1; // L: 3101 - } else if (var0 == ScriptOpcodes.STRING_INDEXOF_STRING) { // L: 3103 - class13.Interpreter_stringStackSize -= 2; // L: 3104 - var3 = Interpreter.Interpreter_stringStack[class13.Interpreter_stringStackSize]; // L: 3105 - var4 = Interpreter.Interpreter_stringStack[class13.Interpreter_stringStackSize + 1]; // L: 3106 - var5 = Interpreter.Interpreter_intStack[--WorldMapCacheName.Interpreter_intStackSize]; // L: 3107 - Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = var3.indexOf(var4, var5); // L: 3108 - return 1; // L: 3109 - } else if (var0 == ScriptOpcodes.UPPERCASE) { // L: 3111 - var3 = Interpreter.Interpreter_stringStack[--class13.Interpreter_stringStackSize]; // L: 3112 - Interpreter.Interpreter_stringStack[++class13.Interpreter_stringStackSize - 1] = var3.toUpperCase(); // L: 3113 - return 1; // L: 3114 - } else { - return 2; // L: 3116 - } - } - } else { - class13.Interpreter_stringStackSize -= 2; // L: 2994 - var3 = Interpreter.Interpreter_stringStack[class13.Interpreter_stringStackSize]; // L: 2995 - var4 = Interpreter.Interpreter_stringStack[class13.Interpreter_stringStackSize + 1]; // L: 2996 - if (class35.localPlayer.appearance != null && class35.localPlayer.appearance.isFemale) { // L: 2997 - Interpreter.Interpreter_stringStack[++class13.Interpreter_stringStackSize - 1] = var4; - } else { - Interpreter.Interpreter_stringStack[++class13.Interpreter_stringStackSize - 1] = var3; // L: 2998 - } - - return 1; // L: 2999 - } + for (int var5 = 0; var5 < var3; ++var5) { // L: 175 + var2.pixels[var5] = MilliClock.SpriteBuffer_spritePalette[var4[var5] & 255]; } } + + MilliClock.method2587(); // L: 177 + return var0; // L: 178 } } diff --git a/runescape-client/src/main/java/class15.java b/runescape-client/src/main/java/class15.java index 9559b02265..73118cab20 100644 --- a/runescape-client/src/main/java/class15.java +++ b/runescape-client/src/main/java/class15.java @@ -3,168 +3,92 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("a") +@ObfuscatedName("g") public class class15 extends class14 { - @ObfuscatedName("t") - @Export("ByteArrayPool_alternativeSizes") - static int[] ByteArrayPool_alternativeSizes; - @ObfuscatedName("eu") + @ObfuscatedName("s") + public static short[][] field137; + @ObfuscatedName("l") @ObfuscatedGetter( - intValue = 264898961 + intValue = -49357127 ) - static int field133; - @ObfuscatedName("gx") - @Export("regionLandArchiveIds") - static int[] regionLandArchiveIds; - @ObfuscatedName("h") - String field130; + static int field140; + @ObfuscatedName("v") + String field136; // $FF: synthetic field @ObfuscatedSignature( - descriptor = "Lo;" + descriptor = "Lf;" ) final class2 this$0; @ObfuscatedSignature( - descriptor = "(Lo;)V" + descriptor = "(Lf;)V" ) class15(class2 var1) { this.this$0 = var1; // L: 229 } - @ObfuscatedName("h") + @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "(Lnk;I)V", - garbageValue = "110401227" + descriptor = "(Lnd;I)V", + garbageValue = "-1281352827" ) - void vmethod339(Buffer var1) { - this.field130 = var1.readStringCp1252NullTerminated(); // L: 232 + void vmethod276(Buffer var1) { + this.field136 = var1.readStringCp1252NullTerminated(); // L: 232 var1.readInt(); // L: 233 } // L: 234 - @ObfuscatedName("c") + @ObfuscatedName("n") @ObfuscatedSignature( - descriptor = "(Lx;I)V", - garbageValue = "-1535989118" + descriptor = "(Ll;B)V", + garbageValue = "29" ) - void vmethod338(class11 var1) { - var1.field91 = this.field130; // L: 237 + void vmethod281(ClanSettings var1) { + var1.name = this.field136; // L: 237 } // L: 238 - @ObfuscatedName("fw") + @ObfuscatedName("ff") @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "1257540454" + descriptor = "(II)V", + garbageValue = "-1672827396" ) - static final void method228() { - for (int var0 = 0; var0 < Client.soundEffectCount; ++var0) { // L: 3682 - int var10002 = Client.queuedSoundEffectDelays[var0]--; // L: 3683 - if (Client.queuedSoundEffectDelays[var0] >= -10) { // L: 3684 - SoundEffect var1 = Client.soundEffects[var0]; // L: 3696 - if (var1 == null) { // L: 3697 - Object var10000 = null; // L: 3698 - var1 = SoundEffect.readSoundEffect(class14.archive4, Client.soundEffectIds[var0], 0); - if (var1 == null) { // L: 3699 - continue; - } - - int[] var13 = Client.queuedSoundEffectDelays; // L: 3700 - var13[var0] += var1.calculateDelay(); - Client.soundEffects[var0] = var1; // L: 3701 - } - - if (Client.queuedSoundEffectDelays[var0] < 0) { // L: 3707 - int var2; - if (Client.soundLocations[var0] != 0) { // L: 3709 - int var3 = (Client.soundLocations[var0] & 255) * 128; // L: 3710 - int var4 = Client.soundLocations[var0] >> 16 & 255; // L: 3711 - int var5 = var4 * 128 + 64 - class35.localPlayer.x; // L: 3712 - if (var5 < 0) { // L: 3713 - var5 = -var5; - } - - int var6 = Client.soundLocations[var0] >> 8 & 255; // L: 3714 - int var7 = var6 * 128 + 64 - class35.localPlayer.y; // L: 3715 - if (var7 < 0) { // L: 3716 - var7 = -var7; - } - - int var8 = var5 + var7 - 128; // L: 3717 - if (var8 > var3) { // L: 3718 - Client.queuedSoundEffectDelays[var0] = -100; // L: 3719 - continue; // L: 3720 - } - - if (var8 < 0) { // L: 3722 - var8 = 0; - } - - var2 = (var3 - var8) * class12.clientPreferences.areaSoundEffectsVolume / var3; // L: 3723 - } else { - var2 = class12.clientPreferences.soundEffectsVolume; // L: 3725 - } - - if (var2 > 0) { // L: 3726 - RawSound var9 = var1.toRawSound().resample(class3.decimator); // L: 3727 - RawPcmStream var10 = RawPcmStream.createRawPcmStream(var9, 100, var2); // L: 3728 - var10.setNumLoops(Client.queuedSoundEffectLoops[var0] - 1); // L: 3729 - FloorOverlayDefinition.pcmStreamMixer.addSubStream(var10); // L: 3730 - } - - Client.queuedSoundEffectDelays[var0] = -100; // L: 3732 - } - } else { - --Client.soundEffectCount; // L: 3685 - - for (int var11 = var0; var11 < Client.soundEffectCount; ++var11) { // L: 3686 - Client.soundEffectIds[var11] = Client.soundEffectIds[var11 + 1]; // L: 3687 - Client.soundEffects[var11] = Client.soundEffects[var11 + 1]; // L: 3688 - Client.queuedSoundEffectLoops[var11] = Client.queuedSoundEffectLoops[var11 + 1]; // L: 3689 - Client.queuedSoundEffectDelays[var11] = Client.queuedSoundEffectDelays[var11 + 1]; // L: 3690 - Client.soundLocations[var11] = Client.soundLocations[var11 + 1]; // L: 3691 - } - - --var0; // L: 3693 - } + @Export("forceDisconnect") + static final void forceDisconnect(int var0) { + class7.logOut(); // L: 2671 + switch(var0) { // L: 2672 + case 1: + WorldMapLabelSize.method3218(); // L: 2675 + break; + case 2: + class170.method3551(); // L: 2680 } - if (Client.field866) { // L: 3735 - boolean var12; - if (class232.musicPlayerStatus != 0) { // L: 3738 - var12 = true; // L: 3739 - } else { - var12 = class232.midiPcmStream.isReady(); // L: 3742 - } + } // L: 2684 - if (!var12) { // L: 3744 - if (class12.clientPreferences.musicVolume != 0 && Client.currentTrackGroupId != -1) { // L: 3745 - World.method1684(class29.archive6, Client.currentTrackGroupId, 0, class12.clientPreferences.musicVolume, false); - } - - Client.field866 = false; // L: 3746 - } - } - - } // L: 3749 - - @ObfuscatedName("iv") + @ObfuscatedName("ir") @ObfuscatedSignature( - descriptor = "(B)V", - garbageValue = "1" + descriptor = "(S)V", + garbageValue = "-5074" ) - @Export("Widget_runOnTargetLeave") - static void Widget_runOnTargetLeave() { - if (Client.isSpellSelected) { // L: 8929 - Widget var0 = PacketWriter.getWidgetChild(class6.selectedSpellWidget, Client.selectedSpellChildIndex); // L: 8930 - if (var0 != null && var0.onTargetLeave != null) { // L: 8931 - ScriptEvent var1 = new ScriptEvent(); // L: 8932 - var1.widget = var0; // L: 8933 - var1.args = var0.onTargetLeave; // L: 8934 - class259.runScriptEvent(var1); // L: 8935 - } + static void method196() { + ReflectionCheck.method1126(class29.menuWidth / 2 + class14.menuX, class243.menuY); // L: 7740 + } // L: 7741 - Client.field773 = -1; // L: 8937 - Client.isSpellSelected = false; // L: 8938 - VerticalAlignment.invalidateWidget(var0); // L: 8939 + @ObfuscatedName("ly") + @ObfuscatedSignature( + descriptor = "(Ljava/lang/String;B)Ljava/lang/String;", + garbageValue = "16" + ) + static String method189(String var0) { + PlayerType[] var1 = class372.PlayerType_values(); // L: 11524 + + for (int var2 = 0; var2 < var1.length; ++var2) { // L: 11525 + PlayerType var3 = var1[var2]; // L: 11526 + if (var3.modIcon != -1 && var0.startsWith(SecureRandomFuture.method1982(var3.modIcon))) { // L: 11528 11529 + var0 = var0.substring(6 + Integer.toString(var3.modIcon).length()); // L: 11530 + break; + } } - } // L: 8940 + + return var0; // L: 11537 + } } diff --git a/runescape-client/src/main/java/class159.java b/runescape-client/src/main/java/class159.java index a838700c4b..72b5e29f06 100644 --- a/runescape-client/src/main/java/class159.java +++ b/runescape-client/src/main/java/class159.java @@ -1,34 +1,27 @@ import net.runelite.mapping.Export; -import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; +import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("fn") +@ObfuscatedName("fa") public class class159 { - @ObfuscatedName("o") + @ObfuscatedName("f") @Export("directions") - public static int[][] directions; - @ObfuscatedName("g") + static int[][] directions; + @ObfuscatedName("y") @Export("distances") - public static int[][] distances; - @ObfuscatedName("l") - @ObfuscatedGetter( - intValue = -1190800743 - ) - public static int field1920; - @ObfuscatedName("z") - @ObfuscatedGetter( - intValue = -18293283 - ) - public static int field1924; - @ObfuscatedName("v") - @Export("bufferX") - public static int[] bufferX; + static int[][] distances; @ObfuscatedName("b") + @Export("bufferX") + static int[] bufferX; + @ObfuscatedName("d") @Export("bufferY") - public static int[] bufferY; - @ObfuscatedName("gn") - @Export("regionMapArchives") - static byte[][] regionMapArchives; + static int[] bufferY; + @ObfuscatedName("ds") + @ObfuscatedSignature( + descriptor = "Leu;" + ) + @Export("js5SocketTask") + static Task js5SocketTask; static { directions = new int[128][128]; // L: 6 @@ -37,8 +30,18 @@ public class class159 { bufferY = new int[4096]; // L: 12 } - @ObfuscatedName("q") - static final void method3135(long var0) { - ViewportMouse.ViewportMouse_entityTags[++ViewportMouse.ViewportMouse_entityCount - 1] = var0; // L: 96 - } // L: 97 + @ObfuscatedName("p") + @ObfuscatedSignature( + descriptor = "(II)V", + garbageValue = "-1685265527" + ) + public static void method3192(int var0) { + class232.musicPlayerStatus = 1; // L: 60 + ModelData0.musicTrackArchive = null; // L: 61 + class32.musicTrackGroupId = -1; // L: 62 + class18.musicTrackFileId = -1; // L: 63 + class232.musicTrackVolume = 0; // L: 64 + class232.musicTrackBoolean = false; // L: 65 + class232.pcmSampleLength = var0; // L: 66 + } // L: 67 } diff --git a/runescape-client/src/main/java/class16.java b/runescape-client/src/main/java/class16.java index 864cfce8ee..ddebcc1661 100644 --- a/runescape-client/src/main/java/class16.java +++ b/runescape-client/src/main/java/class16.java @@ -2,32 +2,26 @@ import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("e") +@ObfuscatedName("a") public abstract class class16 extends Node { - @ObfuscatedName("bd") - @Export("otp") - static String otp; - @ObfuscatedName("ec") - @ObfuscatedSignature( - descriptor = "Lji;" - ) - @Export("archive15") - static Archive archive15; + @ObfuscatedName("gf") + @Export("regionMapArchiveIds") + static int[] regionMapArchiveIds; class16() { } // L: 48 - @ObfuscatedName("h") + @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "(Lnk;S)V", - garbageValue = "4095" + descriptor = "(Lnd;I)V", + garbageValue = "68071115" ) - abstract void vmethod326(Buffer var1); + abstract void vmethod266(Buffer var1); - @ObfuscatedName("c") + @ObfuscatedName("n") @ObfuscatedSignature( - descriptor = "(Lg;B)V", - garbageValue = "-61" + descriptor = "(Ly;I)V", + garbageValue = "-1846892157" ) - abstract void vmethod314(class3 var1); + abstract void vmethod264(ClanChannel var1); } diff --git a/runescape-client/src/main/java/class161.java b/runescape-client/src/main/java/class161.java index 7ef05b6073..bd9e021a27 100644 --- a/runescape-client/src/main/java/class161.java +++ b/runescape-client/src/main/java/class161.java @@ -1,229 +1,11 @@ -import net.runelite.mapping.Export; +import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; -import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("fj") +@ObfuscatedName("fs") public class class161 { - @ObfuscatedName("h") - @ObfuscatedSignature( - descriptor = "(II)Les;", - garbageValue = "-1661347291" + @ObfuscatedName("u") + @ObfuscatedGetter( + intValue = 1034667621 ) - @Export("KitDefinition_get") - public static KitDefinition KitDefinition_get(int var0) { - KitDefinition var1 = (KitDefinition)KitDefinition.KitDefinition_cached.get((long)var0); // L: 27 - if (var1 != null) { // L: 28 - return var1; - } else { - byte[] var2 = KitDefinition.KitDefinition_archive.takeFile(3, var0); - var1 = new KitDefinition(); - if (var2 != null) { - var1.decode(new Buffer(var2)); - } - - KitDefinition.KitDefinition_cached.put(var1, (long)var0); - return var1; - } - } - - @ObfuscatedName("h") - @ObfuscatedSignature( - descriptor = "([Ljava/lang/String;[SIII)V", - garbageValue = "-2066180942" - ) - @Export("sortItemsByName") - public static void sortItemsByName(String[] var0, short[] var1, int var2, int var3) { - if (var2 < var3) { // L: 9 - int var4 = (var3 + var2) / 2; // L: 10 - int var5 = var2; // L: 11 - String var6 = var0[var4]; // L: 12 - var0[var4] = var0[var3]; // L: 13 - var0[var3] = var6; // L: 14 - short var7 = var1[var4]; // L: 15 - var1[var4] = var1[var3]; // L: 16 - var1[var3] = var7; // L: 17 - - for (int var8 = var2; var8 < var3; ++var8) { // L: 18 - if (var6 == null || var0[var8] != null && var0[var8].compareTo(var6) < (var8 & 1)) { // L: 19 - String var9 = var0[var8]; // L: 20 - var0[var8] = var0[var5]; // L: 21 - var0[var5] = var9; // L: 22 - short var10 = var1[var8]; // L: 23 - var1[var8] = var1[var5]; // L: 24 - var1[var5++] = var10; // L: 25 - } - } - - var0[var3] = var0[var5]; // L: 29 - var0[var5] = var6; // L: 30 - var1[var3] = var1[var5]; // L: 31 - var1[var5] = var7; // L: 32 - sortItemsByName(var0, var1, var2, var5 - 1); // L: 33 - sortItemsByName(var0, var1, var5 + 1, var3); // L: 34 - } - - } // L: 36 - - @ObfuscatedName("jp") - @ObfuscatedSignature( - descriptor = "(Liv;II)I", - garbageValue = "-1689981377" - ) - static final int method3150(Widget var0, int var1) { - if (var0.cs1Instructions != null && var1 < var0.cs1Instructions.length) { // L: 10180 - try { - int[] var2 = var0.cs1Instructions[var1]; // L: 10182 - int var3 = 0; // L: 10183 - int var4 = 0; // L: 10184 - byte var5 = 0; // L: 10185 - - while (true) { - int var6 = var2[var4++]; // L: 10187 - int var7 = 0; // L: 10188 - byte var8 = 0; // L: 10189 - if (var6 == 0) { // L: 10190 - return var3; - } - - if (var6 == 1) { // L: 10191 - var7 = Client.currentLevels[var2[var4++]]; - } - - if (var6 == 2) { // L: 10192 - var7 = Client.levels[var2[var4++]]; - } - - if (var6 == 3) { // L: 10193 - var7 = Client.experience[var2[var4++]]; - } - - int var9; - Widget var10; - int var11; - int var12; - if (var6 == 4) { // L: 10194 - var9 = var2[var4++] << 16; // L: 10195 - var9 += var2[var4++]; // L: 10196 - var10 = DevicePcmPlayerProvider.getWidget(var9); // L: 10197 - var11 = var2[var4++]; // L: 10198 - if (var11 != -1 && (!Strings.ItemDefinition_get(var11).isMembersOnly || Client.isMembersWorld)) { // L: 10199 - for (var12 = 0; var12 < var10.itemIds.length; ++var12) { // L: 10200 - if (var11 + 1 == var10.itemIds[var12]) { // L: 10201 - var7 += var10.itemQuantities[var12]; - } - } - } - } - - if (var6 == 5) { // L: 10205 - var7 = Varps.Varps_main[var2[var4++]]; - } - - if (var6 == 6) { // L: 10206 - var7 = Skills.Skills_experienceTable[Client.levels[var2[var4++]] - 1]; - } - - if (var6 == 7) { // L: 10207 - var7 = Varps.Varps_main[var2[var4++]] * 100 / 46875; - } - - if (var6 == 8) { // L: 10208 - var7 = class35.localPlayer.combatLevel; - } - - if (var6 == 9) { // L: 10209 - for (var9 = 0; var9 < 25; ++var9) { // L: 10210 - if (Skills.Skills_enabled[var9]) { // L: 10211 - var7 += Client.levels[var9]; - } - } - } - - if (var6 == 10) { // L: 10214 - var9 = var2[var4++] << 16; // L: 10215 - var9 += var2[var4++]; // L: 10216 - var10 = DevicePcmPlayerProvider.getWidget(var9); // L: 10217 - var11 = var2[var4++]; // L: 10218 - if (var11 != -1 && (!Strings.ItemDefinition_get(var11).isMembersOnly || Client.isMembersWorld)) { // L: 10219 - for (var12 = 0; var12 < var10.itemIds.length; ++var12) { // L: 10220 - if (var11 + 1 == var10.itemIds[var12]) { // L: 10221 - var7 = 999999999; // L: 10222 - break; // L: 10223 - } - } - } - } - - if (var6 == 11) { // L: 10228 - var7 = Client.runEnergy; - } - - if (var6 == 12) { // L: 10229 - var7 = Client.weight; - } - - if (var6 == 13) { // L: 10230 - var9 = Varps.Varps_main[var2[var4++]]; // L: 10231 - int var13 = var2[var4++]; // L: 10232 - var7 = (var9 & 1 << var13) != 0 ? 1 : 0; // L: 10233 - } - - if (var6 == 14) { // L: 10235 - var9 = var2[var4++]; // L: 10236 - var7 = ObjectComposition.getVarbit(var9); // L: 10237 - } - - if (var6 == 15) { // L: 10239 - var8 = 1; - } - - if (var6 == 16) { // L: 10240 - var8 = 2; - } - - if (var6 == 17) { // L: 10241 - var8 = 3; - } - - if (var6 == 18) { // L: 10242 - var7 = (class35.localPlayer.x >> 7) + JagexCache.baseX; - } - - if (var6 == 19) { // L: 10243 - var7 = (class35.localPlayer.y >> 7) + Messages.baseY; - } - - if (var6 == 20) { // L: 10244 - var7 = var2[var4++]; - } - - if (var8 == 0) { // L: 10245 - if (var5 == 0) { // L: 10246 - var3 += var7; - } - - if (var5 == 1) { // L: 10247 - var3 -= var7; - } - - if (var5 == 2 && var7 != 0) { // L: 10248 - var3 /= var7; - } - - if (var5 == 3) { // L: 10249 - var3 *= var7; - } - - var5 = 0; // L: 10250 - } else { - var5 = var8; // L: 10252 - } - } - } catch (Exception var14) { // L: 10255 - return -1; // L: 10256 - } - } else { - return -2; - } - } + static int field1920; } diff --git a/runescape-client/src/main/java/class169.java b/runescape-client/src/main/java/class169.java index 10abecf1a8..70c17b5e61 100644 --- a/runescape-client/src/main/java/class169.java +++ b/runescape-client/src/main/java/class169.java @@ -1,270 +1,247 @@ -import java.io.IOException; import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("fy") +@ObfuscatedName("fj") public class class169 implements WorldMapSection { - @ObfuscatedName("h") - @ObfuscatedGetter( - intValue = -782257189 - ) - int field2017; - @ObfuscatedName("c") - @ObfuscatedGetter( - intValue = 909746241 - ) - int field2013; - @ObfuscatedName("o") - @ObfuscatedGetter( - intValue = 1319843895 - ) - int field2014; - @ObfuscatedName("g") - @ObfuscatedGetter( - intValue = -920944403 - ) - int field2015; - @ObfuscatedName("l") - @ObfuscatedGetter( - intValue = -1564454979 - ) - int field2019; - @ObfuscatedName("z") - @ObfuscatedGetter( - intValue = -734700081 - ) - int field2016; - @ObfuscatedName("t") - @ObfuscatedGetter( - intValue = 1538730207 - ) - int field2012; @ObfuscatedName("v") @ObfuscatedGetter( - intValue = -2021929301 + intValue = 398172859 ) int field2018; + @ObfuscatedName("n") + @ObfuscatedGetter( + intValue = -829119157 + ) + int field2011; + @ObfuscatedName("f") + @ObfuscatedGetter( + intValue = 2102107219 + ) + int field2012; + @ObfuscatedName("y") + @ObfuscatedGetter( + intValue = -620257867 + ) + int field2016; + @ObfuscatedName("p") + @ObfuscatedGetter( + intValue = 1859823215 + ) + int field2014; + @ObfuscatedName("j") + @ObfuscatedGetter( + intValue = -466083281 + ) + int field2015; + @ObfuscatedName("r") + @ObfuscatedGetter( + intValue = -558728135 + ) + int field2010; @ObfuscatedName("b") @ObfuscatedGetter( - intValue = 1236356559 + intValue = -77605471 ) - int field2020; - @ObfuscatedName("q") + int field2017; + @ObfuscatedName("d") @ObfuscatedGetter( - intValue = -86863827 + intValue = 832342515 ) - int field2021; + int field2013; + @ObfuscatedName("s") + @ObfuscatedGetter( + intValue = -701591619 + ) + int field2019; class169() { - } + } // L: 18 - @ObfuscatedName("h") + @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "(Lfe;I)V", - garbageValue = "-1549282997" + descriptor = "(Lfo;I)V", + garbageValue = "1120913212" ) @Export("expandBounds") public void expandBounds(WorldMapArea var1) { - if (var1.regionLowX > this.field2019) { // L: 21 - var1.regionLowX = this.field2019; + if (var1.regionLowX > this.field2014) { // L: 21 + var1.regionLowX = this.field2014; } - if (var1.regionHighX < this.field2019) { - var1.regionHighX = this.field2019; // L: 22 + if (var1.regionHighX < this.field2014) { + var1.regionHighX = this.field2014; // L: 22 } - if (var1.regionLowY > this.field2016) { // L: 23 - var1.regionLowY = this.field2016; + if (var1.regionLowY > this.field2015) { // L: 23 + var1.regionLowY = this.field2015; } - if (var1.regionHighY < this.field2016) { // L: 24 - var1.regionHighY = this.field2016; + if (var1.regionHighY < this.field2015) { // L: 24 + var1.regionHighY = this.field2015; } } // L: 25 - @ObfuscatedName("c") + @ObfuscatedName("n") @ObfuscatedSignature( descriptor = "(IIII)Z", - garbageValue = "-1758075186" + garbageValue = "264048682" ) @Export("containsCoord") public boolean containsCoord(int var1, int var2, int var3) { - if (var1 >= this.field2017 && var1 < this.field2013 + this.field2017) { // L: 28 - return var2 >= (this.field2014 << 6) + (this.field2012 << 3) && var2 <= (this.field2014 << 6) + (this.field2012 << 3) + 7 && var3 >= (this.field2015 << 6) + (this.field2018 << 3) && var3 <= (this.field2015 << 6) + (this.field2018 << 3) + 7; // L: 31 + if (var1 >= this.field2018 && var1 < this.field2018 + this.field2011) { // L: 28 + return var2 >= (this.field2012 << 6) + (this.field2010 << 3) && var2 <= (this.field2012 << 6) + (this.field2010 << 3) + 7 && var3 >= (this.field2016 << 6) + (this.field2017 << 3) && var3 <= (this.field2016 << 6) + (this.field2017 << 3) + 7; // L: 31 } else { return false; // L: 29 } } - @ObfuscatedName("o") + @ObfuscatedName("f") @ObfuscatedSignature( - descriptor = "(III)Z", - garbageValue = "226487857" + descriptor = "(IIB)Z", + garbageValue = "-11" ) @Export("containsPosition") public boolean containsPosition(int var1, int var2) { - return var1 >= (this.field2019 << 6) + (this.field2020 << 3) && var1 <= (this.field2019 << 6) + (this.field2020 << 3) + 7 && var2 >= (this.field2016 << 6) + (this.field2021 << 3) && var2 <= (this.field2016 << 6) + (this.field2021 << 3) + 7; // L: 35 + return var1 >= (this.field2014 << 6) + (this.field2013 << 3) && var1 <= (this.field2014 << 6) + (this.field2013 << 3) + 7 && var2 >= (this.field2015 << 6) + (this.field2019 << 3) && var2 <= (this.field2015 << 6) + (this.field2019 << 3) + 7; // L: 35 } - @ObfuscatedName("g") + @ObfuscatedName("y") @ObfuscatedSignature( - descriptor = "(IIIB)[I", - garbageValue = "118" + descriptor = "(IIII)[I", + garbageValue = "1943891890" ) @Export("getBorderTileLengths") public int[] getBorderTileLengths(int var1, int var2, int var3) { if (!this.containsCoord(var1, var2, var3)) { // L: 39 return null; // L: 40 } else { - int[] var4 = new int[]{var2 + (this.field2019 * 64 - this.field2014 * 64) + (this.field2020 * 8 - this.field2012 * 8), var3 + (this.field2016 * 64 - this.field2015 * 64) + (this.field2021 * 8 - this.field2018 * 8)}; // L: 43 44 + int[] var4 = new int[]{var2 + (this.field2014 * 64 - this.field2012 * 64) + (this.field2013 * 8 - this.field2010 * 8), var3 + (this.field2015 * 64 - this.field2016 * 64) + (this.field2019 * 8 - this.field2017 * 8)}; // L: 42 43 44 return var4; // L: 45 } } - @ObfuscatedName("l") + @ObfuscatedName("p") @ObfuscatedSignature( - descriptor = "(III)Lia;", - garbageValue = "-400477740" + descriptor = "(III)Lii;", + garbageValue = "691158162" ) @Export("coord") public Coord coord(int var1, int var2) { if (!this.containsPosition(var1, var2)) { // L: 49 return null; // L: 50 } else { - int var3 = this.field2014 * 64 - this.field2019 * 64 + (this.field2012 * 8 - this.field2020 * 8) + var1; // L: 52 - int var4 = var2 + (this.field2015 * 64 - this.field2016 * 64) + (this.field2018 * 8 - this.field2021 * 8); // L: 53 - return new Coord(this.field2017, var3, var4); // L: 54 + int var3 = this.field2012 * 64 - this.field2014 * 64 + (this.field2010 * 8 - this.field2013 * 8) + var1; // L: 52 + int var4 = var2 + (this.field2016 * 64 - this.field2015 * 64) + (this.field2017 * 8 - this.field2019 * 8); // L: 53 + return new Coord(this.field2018, var3, var4); // L: 54 } } - @ObfuscatedName("z") + @ObfuscatedName("j") @ObfuscatedSignature( - descriptor = "(Lnk;B)V", - garbageValue = "45" + descriptor = "(Lnd;I)V", + garbageValue = "-1138667895" ) @Export("read") public void read(Buffer var1) { - this.field2017 = var1.readUnsignedByte(); // L: 58 - this.field2013 = var1.readUnsignedByte(); // L: 59 - this.field2014 = var1.readUnsignedShort(); // L: 60 - this.field2012 = var1.readUnsignedByte(); // L: 61 - this.field2015 = var1.readUnsignedShort(); // L: 62 - this.field2018 = var1.readUnsignedByte(); // L: 63 - this.field2019 = var1.readUnsignedShort(); // L: 64 - this.field2020 = var1.readUnsignedByte(); // L: 65 - this.field2016 = var1.readUnsignedShort(); // L: 66 - this.field2021 = var1.readUnsignedByte(); // L: 67 - this.method3477(); // L: 68 + this.field2018 = var1.readUnsignedByte(); // L: 58 + this.field2011 = var1.readUnsignedByte(); // L: 59 + this.field2012 = var1.readUnsignedShort(); // L: 60 + this.field2010 = var1.readUnsignedByte(); // L: 61 + this.field2016 = var1.readUnsignedShort(); // L: 62 + this.field2017 = var1.readUnsignedByte(); // L: 63 + this.field2014 = var1.readUnsignedShort(); // L: 64 + this.field2013 = var1.readUnsignedByte(); // L: 65 + this.field2015 = var1.readUnsignedShort(); // L: 66 + this.field2019 = var1.readUnsignedByte(); // L: 67 + this.method3529(); // L: 68 } // L: 69 - @ObfuscatedName("t") + @ObfuscatedName("r") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "-910102378" + garbageValue = "-186236256" ) - void method3477() { + void method3529() { } // L: 71 - @ObfuscatedName("h") + @ObfuscatedName("p") @ObfuscatedSignature( - descriptor = "(II)Ljava/lang/String;", - garbageValue = "1096176570" + descriptor = "(IIIII)V", + garbageValue = "-309944500" ) - static String method3495(int var0) { - return ""; // L: 18 - } + static void method3549(int var0, int var1, int var2, int var3) { + for (ObjectSound var4 = (ObjectSound)ObjectSound.objectSounds.last(); var4 != null; var4 = (ObjectSound)ObjectSound.objectSounds.previous()) { // L: 99 + if (var4.soundEffectId != -1 || var4.soundEffectIds != null) { // L: 100 + int var5 = 0; // L: 101 + if (var1 > var4.field956) { // L: 102 + var5 += var1 - var4.field956; + } else if (var1 < var4.x) { // L: 103 + var5 += var4.x - var1; + } - @ObfuscatedName("c") - @ObfuscatedSignature( - descriptor = "(Ljp;Ljp;ZII)V", - garbageValue = "878052857" - ) - static void method3494(AbstractArchive var0, AbstractArchive var1, boolean var2, int var3) { - if (Login.clearLoginScreen) { // L: 147 - if (var3 == 4) { // L: 148 - Login.loginIndex = 4; // L: 149 - } + if (var2 > var4.field957) { // L: 104 + var5 += var2 - var4.field957; + } else if (var2 < var4.y) { // L: 105 + var5 += var4.y - var2; + } - } else { - Login.loginIndex = var3; // L: 153 - Rasterizer2D.Rasterizer2D_clear(); // L: 154 - byte[] var4 = var0.takeFileByNames("title.jpg", ""); // L: 155 - Canvas.leftTitleSprite = WorldMapAreaData.convertJpgToSprite(var4); // L: 156 - class12.rightTitleSprite = Canvas.leftTitleSprite.mirrorHorizontally(); // L: 157 - int var5 = Client.worldProperties; // L: 158 - if ((var5 & 536870912) != 0) { // L: 160 - FontName.logoSprite = MenuAction.SpriteBuffer_getIndexedSpriteByName(var1, "logo_deadman_mode", ""); // L: 161 - } else if ((var5 & 1073741824) != 0) { // L: 163 - FontName.logoSprite = MenuAction.SpriteBuffer_getIndexedSpriteByName(var1, "logo_seasonal_mode", ""); // L: 164 - } else { - FontName.logoSprite = MenuAction.SpriteBuffer_getIndexedSpriteByName(var1, "logo", ""); // L: 167 - } - - ItemContainer.titleboxSprite = MenuAction.SpriteBuffer_getIndexedSpriteByName(var1, "titlebox", ""); // L: 170 - Login.titlebuttonSprite = MenuAction.SpriteBuffer_getIndexedSpriteByName(var1, "titlebutton", ""); // L: 171 - Login.runesSprite = GameObject.method4235(var1, "runes", ""); // L: 172 - FontName.title_muteSprite = GameObject.method4235(var1, "title_mute", ""); // L: 173 - GrandExchangeOfferUnitPriceComparator.options_buttons_0Sprite = MenuAction.SpriteBuffer_getIndexedSpriteByName(var1, "options_radio_buttons,0", ""); // L: 174 - InterfaceParent.field1134 = MenuAction.SpriteBuffer_getIndexedSpriteByName(var1, "options_radio_buttons,4", ""); // L: 175 - GrandExchangeEvent.options_buttons_2Sprite = MenuAction.SpriteBuffer_getIndexedSpriteByName(var1, "options_radio_buttons,2", ""); // L: 176 - class225.field2684 = MenuAction.SpriteBuffer_getIndexedSpriteByName(var1, "options_radio_buttons,6", ""); // L: 177 - TaskHandler.field1466 = GrandExchangeOfferUnitPriceComparator.options_buttons_0Sprite.subWidth; // L: 178 - class125.field1456 = GrandExchangeOfferUnitPriceComparator.options_buttons_0Sprite.subHeight; // L: 179 - AttackOption.loginScreenRunesAnimation = new LoginScreenAnimation(Login.runesSprite); // L: 180 - if (var2) { // L: 181 - Login.Login_username = ""; // L: 182 - Login.Login_password = ""; // L: 183 - } - - PendingSpawn.field1204 = 0; // L: 185 - class16.otp = ""; // L: 186 - Login.field1008 = true; // L: 187 - Login.worldSelectOpen = false; // L: 188 - if (!class12.clientPreferences.titleMusicDisabled) { // L: 189 - Archive var6 = class29.archive6; // L: 190 - int var7 = var6.getGroupId("scape main"); // L: 192 - int var8 = var6.getFileId(var7, ""); // L: 193 - class229.method4321(2, var6, var7, var8, 255, false); // L: 194 - } else { - class390.method6744(2); // L: 197 - } - - if (NetCache.NetCache_socket != null) { // L: 199 - try { - Buffer var12 = new Buffer(4); // L: 201 - var12.writeByte(3); // L: 202 - var12.writeMedium(0); // L: 203 - NetCache.NetCache_socket.write(var12.array, 0, 4); // L: 204 - } catch (IOException var11) { - try { - NetCache.NetCache_socket.close(); // L: 208 - } catch (Exception var10) { // L: 210 + if (var5 - 64 <= var4.field958 && ObjectComposition.clientPreferences.areaSoundEffectsVolume != 0 && var0 == var4.plane) { // L: 106 + var5 -= 64; // L: 117 + if (var5 < 0) { // L: 118 + var5 = 0; } - ++NetCache.NetCache_ioExceptions; // L: 211 - NetCache.NetCache_socket = null; // L: 212 + int var6 = (var4.field958 - var5) * ObjectComposition.clientPreferences.areaSoundEffectsVolume / var4.field958; // L: 119 + if (var4.stream1 == null) { // L: 120 + if (var4.soundEffectId >= 0) { // L: 121 + SoundEffect var7 = SoundEffect.readSoundEffect(class32.archive4, var4.soundEffectId, 0); // L: 122 + if (var7 != null) { // L: 123 + RawSound var8 = var7.toRawSound().resample(TileItem.decimator); // L: 124 + RawPcmStream var9 = RawPcmStream.createRawPcmStream(var8, 100, var6); // L: 125 + var9.setNumLoops(-1); // L: 126 + class308.pcmStreamMixer.addSubStream(var9); // L: 127 + var4.stream1 = var9; // L: 128 + } + } + } else { + var4.stream1.method845(var6); // L: 132 + } + + if (var4.stream2 == null) { // L: 133 + if (var4.soundEffectIds != null && (var4.field954 -= var3) <= 0) { // L: 134 + int var11 = (int)(Math.random() * (double)var4.soundEffectIds.length); // L: 135 + SoundEffect var12 = SoundEffect.readSoundEffect(class32.archive4, var4.soundEffectIds[var11], 0); // L: 136 + if (var12 != null) { // L: 137 + RawSound var13 = var12.toRawSound().resample(TileItem.decimator); // L: 138 + RawPcmStream var10 = RawPcmStream.createRawPcmStream(var13, 100, var6); // L: 139 + var10.setNumLoops(0); // L: 140 + class308.pcmStreamMixer.addSubStream(var10); // L: 141 + var4.stream2 = var10; // L: 142 + var4.field954 = var4.field961 + (int)(Math.random() * (double)(var4.field964 - var4.field961)); // L: 143 + } + } + } else { + var4.stream2.method845(var6); // L: 148 + if (!var4.stream2.hasNext()) { // L: 149 + var4.stream2 = null; // L: 150 + } + } + } else { + if (var4.stream1 != null) { // L: 107 + class308.pcmStreamMixer.removeSubStream(var4.stream1); // L: 108 + var4.stream1 = null; // L: 109 + } + + if (var4.stream2 != null) { // L: 111 + class308.pcmStreamMixer.removeSubStream(var4.stream2); // L: 112 + var4.stream2 = null; // L: 113 + } } } - - Login.clearLoginScreen = true; // L: 215 - Login.xPadding = (GameEngine.canvasWidth - 765) / 2; // L: 216 - Login.loginBoxX = Login.xPadding + 202; // L: 217 - class21.loginBoxCenter = Login.loginBoxX + 180; // L: 218 - Canvas.leftTitleSprite.drawAt(Login.xPadding, 0); // L: 219 - class12.rightTitleSprite.drawAt(Login.xPadding + 382, 0); // L: 220 - FontName.logoSprite.drawAt(Login.xPadding + 382 - FontName.logoSprite.subWidth / 2, 18); // L: 221 } - } // L: 151 222 - @ObfuscatedName("g") - @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "-1486014533" - ) - public static void method3493() { - VarpDefinition.VarpDefinition_cached.clear(); // L: 41 - } // L: 42 + } // L: 154 } diff --git a/runescape-client/src/main/java/class17.java b/runescape-client/src/main/java/class17.java index c870939d52..bbf48244a1 100644 --- a/runescape-client/src/main/java/class17.java +++ b/runescape-client/src/main/java/class17.java @@ -1,164 +1,607 @@ import net.runelite.mapping.Export; +import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("d") +@ObfuscatedName("k") public class class17 extends class14 { - @ObfuscatedName("h") - boolean field144; - @ObfuscatedName("c") + @ObfuscatedName("ie") + @ObfuscatedGetter( + intValue = 769722653 + ) + static int field148; + @ObfuscatedName("v") + boolean field146; + @ObfuscatedName("n") byte field143; - @ObfuscatedName("o") - byte field147; - @ObfuscatedName("g") + @ObfuscatedName("f") + byte field144; + @ObfuscatedName("y") byte field145; - @ObfuscatedName("l") - byte field149; + @ObfuscatedName("p") + byte field147; // $FF: synthetic field @ObfuscatedSignature( - descriptor = "Lo;" + descriptor = "Lf;" ) final class2 this$0; @ObfuscatedSignature( - descriptor = "(Lo;)V" + descriptor = "(Lf;)V" ) class17(class2 var1) { this.this$0 = var1; // L: 248 } - @ObfuscatedName("h") - @ObfuscatedSignature( - descriptor = "(Lnk;I)V", - garbageValue = "110401227" - ) - void vmethod339(Buffer var1) { - this.field144 = var1.readUnsignedByte() == 1; // L: 251 - this.field143 = var1.readByte(); // L: 252 - this.field147 = var1.readByte(); // L: 253 - this.field145 = var1.readByte(); // L: 254 - this.field149 = var1.readByte(); // L: 255 - } // L: 256 - - @ObfuscatedName("c") - @ObfuscatedSignature( - descriptor = "(Lx;I)V", - garbageValue = "-1535989118" - ) - void vmethod338(class11 var1) { - var1.field93 = this.field144; // L: 259 - var1.field111 = this.field143; // L: 260 - var1.field95 = this.field147; // L: 261 - var1.field96 = this.field145; // L: 262 - var1.field113 = this.field149; // L: 263 - } // L: 264 - - @ObfuscatedName("g") - @ObfuscatedSignature( - descriptor = "([BIII)Ljava/lang/String;", - garbageValue = "-1388613709" - ) - @Export("decodeStringCp1252") - public static String decodeStringCp1252(byte[] var0, int var1, int var2) { - char[] var3 = new char[var2]; // L: 120 - int var4 = 0; // L: 121 - - for (int var5 = 0; var5 < var2; ++var5) { // L: 122 - int var6 = var0[var5 + var1] & 255; // L: 123 - if (var6 != 0) { // L: 124 - if (var6 >= 128 && var6 < 160) { // L: 125 - char var7 = class301.cp1252AsciiExtension[var6 - 128]; // L: 126 - if (var7 == 0) { // L: 127 - var7 = '?'; - } - - var6 = var7; // L: 128 - } - - var3[var4++] = (char)var6; // L: 130 - } - } - - return new String(var3, 0, var4); // L: 132 - } - - @ObfuscatedName("l") - @ObfuscatedSignature( - descriptor = "(B)Z", - garbageValue = "1" - ) - @Export("isKeyDown") - public static final boolean isKeyDown() { - synchronized(KeyHandler.KeyHandler_instance) { // L: 191 - if (KeyHandler.field277 == KeyHandler.field279) { // L: 192 - return false; - } else { - MenuAction.field982 = KeyHandler.field274[KeyHandler.field277]; // L: 193 - class25.field207 = KeyHandler.field255[KeyHandler.field277]; // L: 194 - KeyHandler.field277 = KeyHandler.field277 + 1 & 127; // L: 195 - return true; // L: 196 - } - } - } - @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "(IIIZII)J", - garbageValue = "423637050" + descriptor = "(Lnd;I)V", + garbageValue = "-1281352827" ) - @Export("calculateTag") - public static long calculateTag(int var0, int var1, int var2, boolean var3, int var4) { - long var5 = (long)((var0 & 127) << 0 | (var1 & 127) << 7 | (var2 & 3) << 14) | ((long)var4 & 4294967295L) << 17; // L: 82 - if (var3) { // L: 83 - var5 |= 65536L; - } + void vmethod276(Buffer var1) { + this.field146 = var1.readUnsignedByte() == 1; // L: 251 + this.field143 = var1.readByte(); // L: 252 + this.field144 = var1.readByte(); // L: 253 + this.field145 = var1.readByte(); // L: 254 + this.field147 = var1.readByte(); // L: 255 + } // L: 256 - return var5; // L: 84 + @ObfuscatedName("n") + @ObfuscatedSignature( + descriptor = "(Ll;B)V", + garbageValue = "29" + ) + void vmethod281(ClanSettings var1) { + var1.allowGuests = this.field146; // L: 259 + var1.field103 = this.field143; // L: 260 + var1.field113 = this.field144; // L: 261 + var1.field98 = this.field145; // L: 262 + var1.field96 = this.field147; // L: 263 + } // L: 264 + + @ObfuscatedName("n") + @ObfuscatedSignature( + descriptor = "(IB)Ley;", + garbageValue = "113" + ) + public static FloorUnderlayDefinition method204(int var0) { + FloorUnderlayDefinition var1 = (FloorUnderlayDefinition)FloorUnderlayDefinition.FloorUnderlayDefinition_cached.get((long)var0); // L: 25 + if (var1 != null) { // L: 26 + return var1; + } else { + byte[] var2 = FloorUnderlayDefinition.FloorUnderlayDefinition_archive.takeFile(1, var0); // L: 27 + var1 = new FloorUnderlayDefinition(); // L: 28 + if (var2 != null) { // L: 29 + var1.decode(new Buffer(var2), var0); + } + + var1.postDecode(); // L: 30 + FloorUnderlayDefinition.FloorUnderlayDefinition_cached.put(var1, (long)var0); // L: 31 + return var1; // L: 32 + } } - @ObfuscatedName("jd") + @ObfuscatedName("d") @ObfuscatedSignature( - descriptor = "(Liv;IIZB)V", - garbageValue = "1" + descriptor = "(Lgt;[Lfz;I)V", + garbageValue = "-1580902995" ) - @Export("alignWidgetSize") - static void alignWidgetSize(Widget var0, int var1, int var2, boolean var3) { - int var4 = var0.width; // L: 10071 - int var5 = var0.height; // L: 10072 - if (var0.widthAlignment == 0) { // L: 10073 - var0.width = var0.rawWidth; - } else if (var0.widthAlignment == 1) { // L: 10074 - var0.width = var1 - var0.rawWidth; - } else if (var0.widthAlignment == 2) { // L: 10075 - var0.width = var0.rawWidth * var1 >> 14; + static final void method210(Scene var0, CollisionMap[] var1) { + int var2; + int var3; + int var4; + int var5; + for (var2 = 0; var2 < 4; ++var2) { // L: 494 + for (var3 = 0; var3 < 104; ++var3) { // L: 495 + for (var4 = 0; var4 < 104; ++var4) { // L: 496 + if ((Tiles.Tiles_renderFlags[var2][var3][var4] & 1) == 1) { // L: 497 + var5 = var2; // L: 498 + if ((Tiles.Tiles_renderFlags[1][var3][var4] & 2) == 2) { // L: 499 + var5 = var2 - 1; + } + + if (var5 >= 0) { // L: 500 + var1[var5].setBlockedByFloor(var3, var4); + } + } + } + } } - if (var0.heightAlignment == 0) { // L: 10076 - var0.height = var0.rawHeight; - } else if (var0.heightAlignment == 1) { // L: 10077 - var0.height = var2 - var0.rawHeight; - } else if (var0.heightAlignment == 2) { // L: 10078 - var0.height = var2 * var0.rawHeight >> 14; + Tiles.field1130 += (int)(Math.random() * 5.0D) - 2; // L: 505 + if (Tiles.field1130 < -8) { // L: 506 + Tiles.field1130 = -8; } - if (var0.widthAlignment == 4) { // L: 10079 - var0.width = var0.height * var0.field2981 / var0.field3104; + if (Tiles.field1130 > 8) { // L: 507 + Tiles.field1130 = 8; } - if (var0.heightAlignment == 4) { // L: 10080 - var0.height = var0.width * var0.field3104 / var0.field2981; + Tiles.field1131 += (int)(Math.random() * 5.0D) - 2; // L: 508 + if (Tiles.field1131 < -16) { // L: 509 + Tiles.field1131 = -16; } - if (var0.contentType == 1337) { // L: 10081 - Client.viewportWidget = var0; + if (Tiles.field1131 > 16) { // L: 510 + Tiles.field1131 = 16; } - if (var3 && var0.onResize != null && (var4 != var0.width || var5 != var0.height)) { // L: 10082 - ScriptEvent var6 = new ScriptEvent(); // L: 10083 - var6.widget = var0; // L: 10084 - var6.args = var0.onResize; // L: 10085 - Client.scriptEvents.addFirst(var6); // L: 10086 + int var9; + int var10; + int var11; + int var12; + int var13; + int var14; + int var15; + int var16; + int[] var10000; + int var17; + int var18; + for (var2 = 0; var2 < 4; ++var2) { // L: 511 + byte[][] var42 = class372.field4123[var2]; // L: 512 + var9 = (int)Math.sqrt(5100.0D); // L: 518 + var10 = var9 * 768 >> 8; // L: 519 + + int var19; + int var20; + for (var11 = 1; var11 < 103; ++var11) { // L: 520 + for (var12 = 1; var12 < 103; ++var12) { // L: 521 + var13 = Tiles.Tiles_heights[var2][var12 + 1][var11] - Tiles.Tiles_heights[var2][var12 - 1][var11]; // L: 522 + var14 = Tiles.Tiles_heights[var2][var12][var11 + 1] - Tiles.Tiles_heights[var2][var12][var11 - 1]; // L: 523 + var15 = (int)Math.sqrt((double)(var13 * var13 + var14 * var14 + 65536)); // L: 524 + var16 = (var13 << 8) / var15; // L: 525 + var17 = 65536 / var15; // L: 526 + var18 = (var14 << 8) / var15; // L: 527 + var19 = (var18 * -50 + var16 * -50 + var17 * -10) / var10 + 96; // L: 528 + var20 = (var42[var12 - 1][var11] >> 2) + (var42[var12][var11 - 1] >> 2) + (var42[var12 + 1][var11] >> 3) + (var42[var12][var11 + 1] >> 3) + (var42[var12][var11] >> 1); // L: 529 + class229.field2813[var12][var11] = var19 - var20; // L: 530 + } + } + + for (var11 = 0; var11 < 104; ++var11) { // L: 533 + ChatChannel.Tiles_hue[var11] = 0; // L: 534 + class23.Tiles_saturation[var11] = 0; // L: 535 + Tiles.Tiles_lightness[var11] = 0; // L: 536 + ParamComposition.Tiles_hueMultiplier[var11] = 0; // L: 537 + DefaultsGroup.field3894[var11] = 0; // L: 538 + } + + for (var11 = -5; var11 < 109; ++var11) { // L: 540 + for (var12 = 0; var12 < 104; ++var12) { // L: 541 + var13 = var11 + 5; // L: 542 + int var10002; + if (var13 >= 0 && var13 < 104) { // L: 543 + var14 = Tiles.field1120[var2][var13][var12] & 255; // L: 544 + if (var14 > 0) { // L: 545 + FloorUnderlayDefinition var44 = method204(var14 - 1); // L: 546 + var10000 = ChatChannel.Tiles_hue; // L: 547 + var10000[var12] += var44.hue; + var10000 = class23.Tiles_saturation; // L: 548 + var10000[var12] += var44.saturation; + var10000 = Tiles.Tiles_lightness; // L: 549 + var10000[var12] += var44.lightness; + var10000 = ParamComposition.Tiles_hueMultiplier; // L: 550 + var10000[var12] += var44.hueMultiplier; + var10002 = DefaultsGroup.field3894[var12]++; // L: 551 + } + } + + var14 = var11 - 5; // L: 554 + if (var14 >= 0 && var14 < 104) { // L: 555 + var15 = Tiles.field1120[var2][var14][var12] & 255; // L: 556 + if (var15 > 0) { // L: 557 + FloorUnderlayDefinition var45 = method204(var15 - 1); // L: 558 + var10000 = ChatChannel.Tiles_hue; // L: 559 + var10000[var12] -= var45.hue; + var10000 = class23.Tiles_saturation; // L: 560 + var10000[var12] -= var45.saturation; + var10000 = Tiles.Tiles_lightness; // L: 561 + var10000[var12] -= var45.lightness; + var10000 = ParamComposition.Tiles_hueMultiplier; // L: 562 + var10000[var12] -= var45.hueMultiplier; + var10002 = DefaultsGroup.field3894[var12]--; // L: 563 + } + } + } + + if (var11 >= 1 && var11 < 103) { // L: 567 + var12 = 0; // L: 568 + var13 = 0; // L: 569 + var14 = 0; // L: 570 + var15 = 0; // L: 571 + var16 = 0; // L: 572 + + for (var17 = -5; var17 < 109; ++var17) { // L: 573 + var18 = var17 + 5; // L: 574 + if (var18 >= 0 && var18 < 104) { // L: 575 + var12 += ChatChannel.Tiles_hue[var18]; // L: 576 + var13 += class23.Tiles_saturation[var18]; // L: 577 + var14 += Tiles.Tiles_lightness[var18]; // L: 578 + var15 += ParamComposition.Tiles_hueMultiplier[var18]; // L: 579 + var16 += DefaultsGroup.field3894[var18]; // L: 580 + } + + var19 = var17 - 5; // L: 582 + if (var19 >= 0 && var19 < 104) { // L: 583 + var12 -= ChatChannel.Tiles_hue[var19]; // L: 584 + var13 -= class23.Tiles_saturation[var19]; // L: 585 + var14 -= Tiles.Tiles_lightness[var19]; // L: 586 + var15 -= ParamComposition.Tiles_hueMultiplier[var19]; // L: 587 + var16 -= DefaultsGroup.field3894[var19]; // L: 588 + } + + if (var17 >= 1 && var17 < 103 && (!Client.isLowDetail || (Tiles.Tiles_renderFlags[0][var11][var17] & 2) != 0 || (Tiles.Tiles_renderFlags[var2][var11][var17] & 16) == 0)) { // L: 590 591 592 593 + if (var2 < Tiles.Tiles_minPlane) { // L: 596 + Tiles.Tiles_minPlane = var2; + } + + var20 = Tiles.field1120[var2][var11][var17] & 255; // L: 597 + int var21 = class253.field3130[var2][var11][var17] & 255; // L: 598 + if (var20 > 0 || var21 > 0) { // L: 599 + int var22 = Tiles.Tiles_heights[var2][var11][var17]; // L: 600 + int var23 = Tiles.Tiles_heights[var2][var11 + 1][var17]; // L: 601 + int var24 = Tiles.Tiles_heights[var2][var11 + 1][var17 + 1]; // L: 602 + int var25 = Tiles.Tiles_heights[var2][var11][var17 + 1]; // L: 603 + int var26 = class229.field2813[var11][var17]; // L: 604 + int var27 = class229.field2813[var11 + 1][var17]; // L: 605 + int var28 = class229.field2813[var11 + 1][var17 + 1]; // L: 606 + int var29 = class229.field2813[var11][var17 + 1]; // L: 607 + int var30 = -1; // L: 608 + int var31 = -1; // L: 609 + int var32; + int var33; + if (var20 > 0) { // L: 610 + var32 = var12 * 256 / var15; // L: 611 + var33 = var13 / var16; // L: 612 + int var34 = var14 / var16; // L: 613 + var30 = WorldMapElement.hslToRgb(var32, var33, var34); // L: 614 + var32 = var32 + Tiles.field1130 & 255; // L: 615 + var34 += Tiles.field1131; // L: 616 + if (var34 < 0) { // L: 617 + var34 = 0; + } else if (var34 > 255) { // L: 618 + var34 = 255; + } + + var31 = WorldMapElement.hslToRgb(var32, var33, var34); // L: 619 + } + + if (var2 > 0) { // L: 621 + boolean var47 = true; // L: 622 + if (var20 == 0 && class20.field182[var2][var11][var17] != 0) { // L: 623 + var47 = false; + } + + if (var21 > 0 && !SoundSystem.method807(var21 - 1).hideUnderlay) { // L: 624 + var47 = false; + } + + if (var47 && var22 == var23 && var24 == var22 && var25 == var22) { // L: 625 626 + var10000 = UrlRequester.field1419[var2][var11]; + var10000[var17] |= 2340; + } + } + + var32 = 0; // L: 629 + if (var31 != -1) { // L: 630 + var32 = Rasterizer3D.Rasterizer3D_colorPalette[HealthBarDefinition.method2728(var31, 96)]; + } + + if (var21 == 0) { // L: 631 + var0.addTile(var2, var11, var17, 0, 0, -1, var22, var23, var24, var25, HealthBarDefinition.method2728(var30, var26), HealthBarDefinition.method2728(var30, var27), HealthBarDefinition.method2728(var30, var28), HealthBarDefinition.method2728(var30, var29), 0, 0, 0, 0, var32, 0); // L: 632 + } else { + var33 = class20.field182[var2][var11][var17] + 1; // L: 635 + byte var48 = DirectByteArrayCopier.field3128[var2][var11][var17]; // L: 636 + FloorOverlayDefinition var35 = SoundSystem.method807(var21 - 1); // L: 637 + int var36 = var35.texture; // L: 638 + int var37; + int var38; + int var39; + int var40; + if (var36 >= 0) { // L: 641 + var38 = Rasterizer3D.Rasterizer3D_textureLoader.getAverageTextureRGB(var36); // L: 642 + var37 = -1; // L: 643 + } else if (var35.primaryRgb == 16711935) { // L: 646 + var37 = -2; // L: 647 + var36 = -1; // L: 648 + var38 = -2; // L: 649 + } else { + var37 = WorldMapElement.hslToRgb(var35.hue, var35.saturation, var35.lightness); // L: 652 + var39 = var35.hue + Tiles.field1130 & 255; // L: 653 + var40 = var35.lightness + Tiles.field1131; // L: 654 + if (var40 < 0) { // L: 655 + var40 = 0; + } else if (var40 > 255) { // L: 656 + var40 = 255; + } + + var38 = WorldMapElement.hslToRgb(var39, var35.saturation, var40); // L: 657 + } + + var39 = 0; // L: 660 + if (var38 != -2) { // L: 661 + var39 = Rasterizer3D.Rasterizer3D_colorPalette[class26.method272(var38, 96)]; + } + + if (var35.secondaryRgb != -1) { // L: 662 + var40 = var35.secondaryHue + Tiles.field1130 & 255; // L: 663 + int var41 = var35.secondaryLightness + Tiles.field1131; // L: 664 + if (var41 < 0) { // L: 665 + var41 = 0; + } else if (var41 > 255) { // L: 666 + var41 = 255; + } + + var38 = WorldMapElement.hslToRgb(var40, var35.secondarySaturation, var41); // L: 667 + var39 = Rasterizer3D.Rasterizer3D_colorPalette[class26.method272(var38, 96)]; // L: 668 + } + + var0.addTile(var2, var11, var17, var33, var48, var36, var22, var23, var24, var25, HealthBarDefinition.method2728(var30, var26), HealthBarDefinition.method2728(var30, var27), HealthBarDefinition.method2728(var30, var28), HealthBarDefinition.method2728(var30, var29), class26.method272(var37, var26), class26.method272(var37, var27), class26.method272(var37, var28), class26.method272(var37, var29), var32, var39); // L: 670 + } + } + } + } + } + } + + for (var11 = 1; var11 < 103; ++var11) { // L: 677 + for (var12 = 1; var12 < 103; ++var12) { // L: 678 + if ((Tiles.Tiles_renderFlags[var2][var12][var11] & 8) != 0) { // L: 685 + var17 = 0; // L: 686 + } else if (var2 > 0 && (Tiles.Tiles_renderFlags[1][var12][var11] & 2) != 0) { // L: 689 + var17 = var2 - 1; // L: 690 + } else { + var17 = var2; // L: 693 + } + + var0.setTileMinPlane(var2, var12, var11, var17); // L: 695 + } + } + + Tiles.field1120[var2] = null; // L: 698 + class253.field3130[var2] = null; // L: 699 + class20.field182[var2] = null; // L: 700 + DirectByteArrayCopier.field3128[var2] = null; // L: 701 + class372.field4123[var2] = null; // L: 702 } - } // L: 10088 + var0.method3955(-50, -10, -50); // L: 704 + + for (var2 = 0; var2 < 104; ++var2) { // L: 705 + for (var3 = 0; var3 < 104; ++var3) { // L: 706 + if ((Tiles.Tiles_renderFlags[1][var2][var3] & 2) == 2) { // L: 707 + var0.setLinkBelow(var2, var3); + } + } + } + + var2 = 1; // L: 710 + var3 = 2; // L: 711 + var4 = 4; // L: 712 + + for (var5 = 0; var5 < 4; ++var5) { // L: 713 + if (var5 > 0) { // L: 714 + var2 <<= 3; // L: 715 + var3 <<= 3; // L: 716 + var4 <<= 3; // L: 717 + } + + for (int var6 = 0; var6 <= var5; ++var6) { // L: 719 + for (int var7 = 0; var7 <= 104; ++var7) { // L: 720 + for (int var8 = 0; var8 <= 104; ++var8) { // L: 721 + short var46; + if ((UrlRequester.field1419[var6][var8][var7] & var2) != 0) { // L: 722 + var9 = var7; // L: 723 + var10 = var7; // L: 724 + var11 = var6; // L: 725 + + for (var12 = var6; var9 > 0 && (UrlRequester.field1419[var6][var8][var9 - 1] & var2) != 0; --var9) { // L: 726 727 + } + + while (var10 < 104 && (UrlRequester.field1419[var6][var8][var10 + 1] & var2) != 0) { // L: 728 + ++var10; + } + + label438: + while (var11 > 0) { // L: 729 + for (var13 = var9; var13 <= var10; ++var13) { // L: 730 + if ((UrlRequester.field1419[var11 - 1][var8][var13] & var2) == 0) { + break label438; + } + } + + --var11; // L: 731 + } + + label427: + while (var12 < var5) { // L: 733 + for (var13 = var9; var13 <= var10; ++var13) { // L: 734 + if ((UrlRequester.field1419[var12 + 1][var8][var13] & var2) == 0) { + break label427; + } + } + + ++var12; // L: 735 + } + + var13 = (var10 - var9 + 1) * (var12 + 1 - var11); // L: 737 + if (var13 >= 8) { // L: 738 + var46 = 240; // L: 739 + var15 = Tiles.Tiles_heights[var12][var8][var9] - var46; // L: 740 + var16 = Tiles.Tiles_heights[var11][var8][var9]; // L: 741 + Scene.Scene_addOccluder(var5, 1, var8 * 128, var8 * 128, var9 * 128, var10 * 128 + 128, var15, var16); // L: 742 + + for (var17 = var11; var17 <= var12; ++var17) { // L: 743 + for (var18 = var9; var18 <= var10; ++var18) { // L: 744 + var10000 = UrlRequester.field1419[var17][var8]; + var10000[var18] &= ~var2; + } + } + } + } + + if ((UrlRequester.field1419[var6][var8][var7] & var3) != 0) { // L: 748 + var9 = var8; // L: 749 + var10 = var8; // L: 750 + var11 = var6; // L: 751 + + for (var12 = var6; var9 > 0 && (UrlRequester.field1419[var6][var9 - 1][var7] & var3) != 0; --var9) { // L: 752 753 + } + + while (var10 < 104 && (UrlRequester.field1419[var6][var10 + 1][var7] & var3) != 0) { // L: 754 + ++var10; + } + + label491: + while (var11 > 0) { // L: 755 + for (var13 = var9; var13 <= var10; ++var13) { // L: 756 + if ((UrlRequester.field1419[var11 - 1][var13][var7] & var3) == 0) { + break label491; + } + } + + --var11; // L: 757 + } + + label480: + while (var12 < var5) { // L: 759 + for (var13 = var9; var13 <= var10; ++var13) { // L: 760 + if ((UrlRequester.field1419[var12 + 1][var13][var7] & var3) == 0) { + break label480; + } + } + + ++var12; // L: 761 + } + + var13 = (var10 - var9 + 1) * (var12 + 1 - var11); // L: 763 + if (var13 >= 8) { // L: 764 + var46 = 240; // L: 765 + var15 = Tiles.Tiles_heights[var12][var9][var7] - var46; // L: 766 + var16 = Tiles.Tiles_heights[var11][var9][var7]; // L: 767 + Scene.Scene_addOccluder(var5, 2, var9 * 128, var10 * 128 + 128, var7 * 128, var7 * 128, var15, var16); // L: 768 + + for (var17 = var11; var17 <= var12; ++var17) { // L: 769 + for (var18 = var9; var18 <= var10; ++var18) { // L: 770 + var10000 = UrlRequester.field1419[var17][var18]; + var10000[var7] &= ~var3; + } + } + } + } + + if ((UrlRequester.field1419[var6][var8][var7] & var4) != 0) { // L: 774 + var9 = var8; // L: 775 + var10 = var8; // L: 776 + var11 = var7; // L: 777 + + for (var12 = var7; var11 > 0 && (UrlRequester.field1419[var6][var8][var11 - 1] & var4) != 0; --var11) { // L: 778 779 + } + + while (var12 < 104 && (UrlRequester.field1419[var6][var8][var12 + 1] & var4) != 0) { // L: 780 + ++var12; + } + + label544: + while (var9 > 0) { // L: 781 + for (var13 = var11; var13 <= var12; ++var13) { // L: 782 + if ((UrlRequester.field1419[var6][var9 - 1][var13] & var4) == 0) { + break label544; + } + } + + --var9; // L: 783 + } + + label533: + while (var10 < 104) { // L: 785 + for (var13 = var11; var13 <= var12; ++var13) { // L: 786 + if ((UrlRequester.field1419[var6][var10 + 1][var13] & var4) == 0) { + break label533; + } + } + + ++var10; // L: 787 + } + + if ((var10 - var9 + 1) * (var12 - var11 + 1) >= 4) { // L: 789 + var13 = Tiles.Tiles_heights[var6][var9][var11]; // L: 790 + Scene.Scene_addOccluder(var5, 4, var9 * 128, var10 * 128 + 128, var11 * 128, var12 * 128 + 128, var13, var13); // L: 791 + + for (var14 = var9; var14 <= var10; ++var14) { // L: 792 + for (var15 = var11; var15 <= var12; ++var15) { // L: 793 + var10000 = UrlRequester.field1419[var6][var14]; + var10000[var15] &= ~var4; + } + } + } + } + } + } + } + } + + } // L: 801 + + @ObfuscatedName("d") + @ObfuscatedSignature( + descriptor = "(II)I", + garbageValue = "-1692198232" + ) + @Export("Messages_getLastChatID") + static int Messages_getLastChatID(int var0) { + Message var1 = (Message)Messages.Messages_hashTable.get((long)var0); // L: 73 + if (var1 == null) { // L: 74 + return -1; + } else { + return var1.previousDual == Messages.Messages_queue.sentinel ? -1 : ((Message)var1.previousDual).count; // L: 75 76 + } + } + + @ObfuscatedName("ft") + @ObfuscatedSignature( + descriptor = "(IIB)V", + garbageValue = "12" + ) + static void method209(int var0, int var1) { + int[] var2 = new int[9]; // L: 1511 + + for (int var3 = 0; var3 < var2.length; ++var3) { // L: 1512 + int var4 = var3 * 32 + 15 + 128; // L: 1513 + int var5 = SecureRandomFuture.method1980(var4); // L: 1514 + int var6 = Rasterizer3D.Rasterizer3D_sine[var4]; // L: 1515 + var5 = WorldMapDecoration.method3627(var5, var1); // L: 1516 + var2[var3] = var6 * var5 >> 16; // L: 1517 + } + + Scene.Scene_buildVisiblityMap(var2, 500, 800, var0 * 334 / var1, 334); // L: 1519 + } // L: 1520 + + @ObfuscatedName("ka") + @ObfuscatedSignature( + descriptor = "(IIII)Lcu;", + garbageValue = "1899538302" + ) + static final InterfaceParent method208(int var0, int var1, int var2) { + InterfaceParent var3 = new InterfaceParent(); // L: 11042 + var3.group = var1; // L: 11043 + var3.type = var2; // L: 11044 + Client.interfaceParents.put(var3, (long)var0); // L: 11045 + class21.Widget_resetModelFrames(var1); // L: 11046 + Widget var4 = Frames.getWidget(var0); // L: 11047 + WorldMapCacheName.invalidateWidget(var4); // L: 11048 + if (Client.meslayerContinueWidget != null) { // L: 11049 + WorldMapCacheName.invalidateWidget(Client.meslayerContinueWidget); // L: 11050 + Client.meslayerContinueWidget = null; // L: 11051 + } + + class7.method68(); // L: 11053 + class313.revalidateWidgetScroll(Widget.Widget_interfaceComponents[var0 >> 16], var4, false); // L: 11054 + FloorDecoration.runWidgetOnLoadListener(var1); // L: 11055 + if (Client.rootInterface != -1) { // L: 11056 + Login.runIntfCloseListeners(Client.rootInterface, 1); + } + + return var3; // L: 11057 + } } diff --git a/runescape-client/src/main/java/class170.java b/runescape-client/src/main/java/class170.java index 2f99e72ff7..dc31f96ecb 100644 --- a/runescape-client/src/main/java/class170.java +++ b/runescape-client/src/main/java/class170.java @@ -1,11 +1,64 @@ -import net.runelite.mapping.ObfuscatedGetter; +import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedName; +import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("fv") +@ObfuscatedName("fg") public class class170 { - @ObfuscatedName("x") - @ObfuscatedGetter( - intValue = 1738054747 + @ObfuscatedName("hj") + @ObfuscatedSignature( + descriptor = "[Loh;" ) - static int field2023; + @Export("mapDotSprites") + static SpritePixels[] mapDotSprites; + + @ObfuscatedName("y") + @ObfuscatedSignature( + descriptor = "(II)Z", + garbageValue = "1604021821" + ) + public static boolean method3552(int var0) { + return (var0 >> 20 & 1) != 0; // L: 21 + } + + @ObfuscatedName("g") + @ObfuscatedSignature( + descriptor = "(B)V", + garbageValue = "1" + ) + static void method3551() { + Login.loginIndex = 24; // L: 1648 + class260.setLoginResponseString("The game servers are currently being updated.", "Please wait a few minutes and try again.", ""); // L: 1649 + } // L: 1650 + + @ObfuscatedName("jj") + @ObfuscatedSignature( + descriptor = "(I)V", + garbageValue = "1716136591" + ) + static void method3554() { + for (InterfaceParent var0 = (InterfaceParent)Client.interfaceParents.first(); var0 != null; var0 = (InterfaceParent)Client.interfaceParents.next()) { // L: 10798 + int var1 = var0.group; // L: 10799 + if (Clock.loadInterface(var1)) { // L: 10800 + boolean var2 = true; // L: 10801 + Widget[] var3 = Widget.Widget_interfaceComponents[var1]; // L: 10802 + + int var4; + for (var4 = 0; var4 < var3.length; ++var4) { // L: 10803 + if (var3[var4] != null) { // L: 10804 + var2 = var3[var4].isIf3; // L: 10805 + break; + } + } + + if (!var2) { // L: 10809 + var4 = (int)var0.key; // L: 10810 + Widget var5 = Frames.getWidget(var4); // L: 10811 + if (var5 != null) { // L: 10812 + WorldMapCacheName.invalidateWidget(var5); + } + } + } + } + + } // L: 10816 } diff --git a/runescape-client/src/main/java/class179.java b/runescape-client/src/main/java/class179.java index c9fb202ebf..dd0a073de8 100644 --- a/runescape-client/src/main/java/class179.java +++ b/runescape-client/src/main/java/class179.java @@ -1,909 +1,139 @@ -import java.awt.Toolkit; -import java.awt.datatransfer.Clipboard; -import java.awt.datatransfer.DataFlavor; -import java.awt.datatransfer.Transferable; -import java.awt.datatransfer.UnsupportedFlavorException; -import java.io.IOException; -import java.io.InputStream; -import java.io.OutputStreamWriter; -import java.net.URL; -import java.net.URLConnection; import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("fd") +@ObfuscatedName("fn") public class class179 { - @ObfuscatedName("tx") - @Export("foundItemIds") - static short[] foundItemIds; - @ObfuscatedName("h") + @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "Lfd;" + descriptor = "Lfn;" ) - static final class179 field2097; - @ObfuscatedName("c") + static final class179 field2100; + @ObfuscatedName("n") @ObfuscatedSignature( - descriptor = "Lfd;" + descriptor = "Lfn;" ) - static final class179 field2094; - @ObfuscatedName("o") + static final class179 field2099; + @ObfuscatedName("ek") + @ObfuscatedSignature( + descriptor = "Ljp;" + ) + @Export("archive19") + static Archive archive19; + @ObfuscatedName("f") @ObfuscatedGetter( - intValue = 243264849 + intValue = 1748165695 ) @Export("value") final int value; static { - field2097 = new class179(0); // L: 4 - field2094 = new class179(1); // L: 5 + field2100 = new class179(0); // L: 4 + field2099 = new class179(1); // L: 5 } class179(int var1) { this.value = var1; // L: 9 } // L: 10 - @ObfuscatedName("t") + @ObfuscatedName("n") @ObfuscatedSignature( - descriptor = "(Laq;S)V", - garbageValue = "11379" + descriptor = "(Ljp;II)V", + garbageValue = "-2058248289" ) - @Export("doCycleTitle") - static void doCycleTitle(GameEngine var0) { - int var4; - if (Login.worldSelectOpen) { // L: 251 - while (true) { - if (!class17.isKeyDown()) { // L: 253 - if (MouseHandler.MouseHandler_lastButton != 1 && (class229.mouseCam || MouseHandler.MouseHandler_lastButton != 4)) { // L: 269 - break; - } + static void method3633(Archive var0, int var1) { + if (class125.NetCache_reference != null) { // L: 60 + class125.NetCache_reference.offset = var1 * 8 + 5; // L: 61 + int var2 = class125.NetCache_reference.readInt(); // L: 62 + int var3 = class125.NetCache_reference.readInt(); // L: 63 + var0.loadIndex(var2, var3); // L: 64 + } else { + DirectByteArrayCopier.requestNetFile((Archive)null, 255, 255, 0, (byte)0, true); // L: 67 + NetCache.NetCache_archives[var1] = var0; // L: 68 + } + } // L: 65 69 - int var1 = Login.xPadding + 280; // L: 270 - if (MouseHandler.MouseHandler_lastPressedX >= var1 && MouseHandler.MouseHandler_lastPressedX <= var1 + 14 && MouseHandler.MouseHandler_lastPressedY >= 4 && MouseHandler.MouseHandler_lastPressedY <= 18) { // L: 271 - class303.changeWorldSelectSorting(0, 0); // L: 272 - break; // L: 273 - } - - if (MouseHandler.MouseHandler_lastPressedX >= var1 + 15 && MouseHandler.MouseHandler_lastPressedX <= var1 + 80 && MouseHandler.MouseHandler_lastPressedY >= 4 && MouseHandler.MouseHandler_lastPressedY <= 18) { // L: 275 - class303.changeWorldSelectSorting(0, 1); // L: 276 - break; // L: 277 - } - - int var2 = Login.xPadding + 390; // L: 279 - if (MouseHandler.MouseHandler_lastPressedX >= var2 && MouseHandler.MouseHandler_lastPressedX <= var2 + 14 && MouseHandler.MouseHandler_lastPressedY >= 4 && MouseHandler.MouseHandler_lastPressedY <= 18) { // L: 280 - class303.changeWorldSelectSorting(1, 0); // L: 281 - break; // L: 282 - } - - if (MouseHandler.MouseHandler_lastPressedX >= var2 + 15 && MouseHandler.MouseHandler_lastPressedX <= var2 + 80 && MouseHandler.MouseHandler_lastPressedY >= 4 && MouseHandler.MouseHandler_lastPressedY <= 18) { // L: 284 - class303.changeWorldSelectSorting(1, 1); // L: 285 - break; // L: 286 - } - - int var49 = Login.xPadding + 500; // L: 288 - if (MouseHandler.MouseHandler_lastPressedX >= var49 && MouseHandler.MouseHandler_lastPressedX <= var49 + 14 && MouseHandler.MouseHandler_lastPressedY >= 4 && MouseHandler.MouseHandler_lastPressedY <= 18) { // L: 289 - class303.changeWorldSelectSorting(2, 0); // L: 290 - break; // L: 291 - } - - if (MouseHandler.MouseHandler_lastPressedX >= var49 + 15 && MouseHandler.MouseHandler_lastPressedX <= var49 + 80 && MouseHandler.MouseHandler_lastPressedY >= 4 && MouseHandler.MouseHandler_lastPressedY <= 18) { // L: 293 - class303.changeWorldSelectSorting(2, 1); // L: 294 - break; // L: 295 - } - - var4 = Login.xPadding + 610; // L: 297 - if (MouseHandler.MouseHandler_lastPressedX >= var4 && MouseHandler.MouseHandler_lastPressedX <= var4 + 14 && MouseHandler.MouseHandler_lastPressedY >= 4 && MouseHandler.MouseHandler_lastPressedY <= 18) { // L: 298 - class303.changeWorldSelectSorting(3, 0); // L: 299 - break; // L: 300 - } - - if (MouseHandler.MouseHandler_lastPressedX >= var4 + 15 && MouseHandler.MouseHandler_lastPressedX <= var4 + 80 && MouseHandler.MouseHandler_lastPressedY >= 4 && MouseHandler.MouseHandler_lastPressedY <= 18) { // L: 302 - class303.changeWorldSelectSorting(3, 1); // L: 303 - break; // L: 304 - } - - if (MouseHandler.MouseHandler_lastPressedX >= Login.xPadding + 708 && MouseHandler.MouseHandler_lastPressedY >= 4 && MouseHandler.MouseHandler_lastPressedX <= Login.xPadding + 708 + 50 && MouseHandler.MouseHandler_lastPressedY <= 20) { // L: 306 - class69.method1151(); // L: 307 - break; // L: 308 - } - - if (Login.hoveredWorldIndex != -1) { // L: 310 - World var5 = Messages.World_worlds[Login.hoveredWorldIndex]; // L: 311 - PlatformInfo.changeWorld(var5); // L: 312 - class69.method1151(); // L: 313 - } else { - if (Login.worldSelectPage > 0 && class285.worldSelectLeftSprite != null && MouseHandler.MouseHandler_lastPressedX >= 0 && MouseHandler.MouseHandler_lastPressedX <= class285.worldSelectLeftSprite.subWidth && MouseHandler.MouseHandler_lastPressedY >= HealthBarDefinition.canvasHeight / 2 - 50 && MouseHandler.MouseHandler_lastPressedY <= HealthBarDefinition.canvasHeight / 2 + 50) { // L: 316 - --Login.worldSelectPage; // L: 317 - } - - if (Login.worldSelectPage < Login.worldSelectPagesCount && User.worldSelectRightSprite != null && MouseHandler.MouseHandler_lastPressedX >= GameEngine.canvasWidth - User.worldSelectRightSprite.subWidth - 5 && MouseHandler.MouseHandler_lastPressedX <= GameEngine.canvasWidth && MouseHandler.MouseHandler_lastPressedY >= HealthBarDefinition.canvasHeight / 2 - 50 && MouseHandler.MouseHandler_lastPressedY <= HealthBarDefinition.canvasHeight / 2 + 50) { // L: 319 - ++Login.worldSelectPage; // L: 320 - } - } - break; - } - - if (MenuAction.field982 == 13) { // L: 254 - class69.method1151(); // L: 255 - break; // L: 256 - } - - if (MenuAction.field982 == 96) { // L: 258 - if (Login.worldSelectPage > 0 && class285.worldSelectLeftSprite != null) { // L: 259 - --Login.worldSelectPage; // L: 260 - } - } else if (MenuAction.field982 == 97 && Login.worldSelectPage < Login.worldSelectPagesCount && User.worldSelectRightSprite != null) { // L: 263 264 - ++Login.worldSelectPage; // L: 265 - } + @ObfuscatedName("n") + @ObfuscatedSignature( + descriptor = "(Ljv;Ljv;ZII)V", + garbageValue = "-905944907" + ) + static void method3634(AbstractArchive var0, AbstractArchive var1, boolean var2, int var3) { + if (Login.clearLoginScreen) { // L: 128 + if (var3 == 4) { // L: 129 + Login.loginIndex = 4; // L: 130 } } else { - if ((MouseHandler.MouseHandler_lastButton == 1 || !class229.mouseCam && MouseHandler.MouseHandler_lastButton == 4) && MouseHandler.MouseHandler_lastPressedX >= Login.xPadding + 765 - 50 && MouseHandler.MouseHandler_lastPressedY >= 453) { // L: 326 - class12.clientPreferences.titleMusicDisabled = !class12.clientPreferences.titleMusicDisabled; // L: 327 - KeyHandler.savePreferences(); // L: 328 - if (!class12.clientPreferences.titleMusicDisabled) { // L: 329 - MouseRecorder.method2124(class29.archive6, "scape main", "", 255, false); - } else { - ViewportMouse.method4193(); // L: 330 - } + Login.loginIndex = var3; // L: 134 + Rasterizer2D.Rasterizer2D_clear(); // L: 135 + byte[] var4 = var0.takeFileByNames("title.jpg", ""); // L: 136 + Login.leftTitleSprite = ParamComposition.convertJpgToSprite(var4); // L: 137 + class20.rightTitleSprite = Login.leftTitleSprite.mirrorHorizontally(); // L: 138 + GrandExchangeOfferAgeComparator.method5068(var1, Client.worldProperties); // L: 139 + class260.titleboxSprite = EnumComposition.SpriteBuffer_getIndexedSpriteByName(var1, "titlebox", ""); // L: 140 + Login.titlebuttonSprite = EnumComposition.SpriteBuffer_getIndexedSpriteByName(var1, "titlebutton", ""); // L: 141 + int var6 = var1.getGroupId("runes"); // L: 144 + int var7 = var1.getFileId(var6, ""); // L: 145 + IndexedSprite[] var5 = VerticalAlignment.method2799(var1, var6, var7); // L: 146 + Login.runesSprite = var5; // L: 148 + var7 = var1.getGroupId("title_mute"); // L: 151 + int var8 = var1.getFileId(var7, ""); // L: 152 + IndexedSprite[] var9 = VerticalAlignment.method2799(var1, var7, var8); // L: 153 + Decimator.title_muteSprite = var9; // L: 155 + FriendSystem.options_buttons_0Sprite = EnumComposition.SpriteBuffer_getIndexedSpriteByName(var1, "options_radio_buttons,0", ""); // L: 156 + Decimator.field553 = EnumComposition.SpriteBuffer_getIndexedSpriteByName(var1, "options_radio_buttons,4", ""); // L: 157 + GrandExchangeOffer.options_buttons_2Sprite = EnumComposition.SpriteBuffer_getIndexedSpriteByName(var1, "options_radio_buttons,2", ""); // L: 158 + ClanChannel.field33 = EnumComposition.SpriteBuffer_getIndexedSpriteByName(var1, "options_radio_buttons,6", ""); // L: 159 + Skeleton.field2287 = FriendSystem.options_buttons_0Sprite.subWidth; // L: 160 + WorldMapIcon_1.field1937 = FriendSystem.options_buttons_0Sprite.subHeight; // L: 161 + class24.loginScreenRunesAnimation = new LoginScreenAnimation(Login.runesSprite); // L: 162 + if (var2) { // L: 163 + Login.Login_username = ""; // L: 164 + Login.Login_password = ""; // L: 165 } - if (Client.gameState != 5) { // L: 332 - if (Login.field1001 == -1L) { // L: 333 - Login.field1001 = Archive.currentTimeMillis() + 1000L; // L: 334 - } - - long var21 = Archive.currentTimeMillis(); // L: 336 - boolean var3; - if (Client.archiveLoaders != null && Client.archiveLoadersDone < Client.archiveLoaders.size()) { // L: 339 - while (true) { - if (Client.archiveLoadersDone >= Client.archiveLoaders.size()) { // L: 343 - var3 = true; // L: 351 - break; - } - - ArchiveLoader var23 = (ArchiveLoader)Client.archiveLoaders.get(Client.archiveLoadersDone); // L: 344 - if (!var23.isLoaded()) { // L: 345 - var3 = false; // L: 346 - break; // L: 347 - } - - ++Client.archiveLoadersDone; // L: 349 - } - } else { - var3 = true; // L: 340 - } - - if (var3 && Login.field1019 == -1L) { // L: 353 354 - Login.field1019 = var21; // L: 355 - if (Login.field1019 > Login.field1001) { // L: 356 - Login.field1001 = Login.field1019; // L: 357 - } - } - - if (Client.gameState == 10 || Client.gameState == 11) { // L: 361 - if (Language.Language_EN == class7.clientLanguage) { // L: 362 - if (MouseHandler.MouseHandler_lastButton == 1 || !class229.mouseCam && MouseHandler.MouseHandler_lastButton == 4) { // L: 363 - var4 = Login.xPadding + 5; // L: 364 - short var24 = 463; // L: 365 - byte var6 = 100; // L: 366 - byte var7 = 35; // L: 367 - if (MouseHandler.MouseHandler_lastPressedX >= var4 && MouseHandler.MouseHandler_lastPressedX <= var6 + var4 && MouseHandler.MouseHandler_lastPressedY >= var24 && MouseHandler.MouseHandler_lastPressedY <= var24 + var7) { // L: 368 - WorldMapCacheName.method3648(); // L: 369 - return; // L: 370 - } - } - - if (World.World_request != null) { // L: 373 - WorldMapCacheName.method3648(); - } - } - - var4 = MouseHandler.MouseHandler_lastButton; // L: 375 - int var68 = MouseHandler.MouseHandler_lastPressedX; // L: 376 - int var50 = MouseHandler.MouseHandler_lastPressedY; // L: 377 - if (var4 == 0) { // L: 378 - var68 = MouseHandler.MouseHandler_x; // L: 379 - var50 = MouseHandler.MouseHandler_y; // L: 380 - } - - if (!class229.mouseCam && var4 == 4) { // L: 382 - var4 = 1; - } - - short var53; - int var54; - if (Login.loginIndex == 0) { // L: 383 - boolean var62 = false; // L: 384 - - while (class17.isKeyDown()) { // L: 385 - if (MenuAction.field982 == 84) { // L: 386 - var62 = true; // L: 387 - } - } - - var54 = class21.loginBoxCenter - 80; // L: 390 - var53 = 291; // L: 391 - if (var4 == 1 && var68 >= var54 - 75 && var68 <= var54 + 75 && var50 >= var53 - 20 && var50 <= var53 + 20) { // L: 392 - Interpreter.openURL(class4.method57("secure", true) + "m=account-creation/g=oldscape/create_account_funnel.ws", true, false); // L: 393 - } - - var54 = class21.loginBoxCenter + 80; // L: 395 - if (var4 == 1 && var68 >= var54 - 75 && var68 <= var54 + 75 && var50 >= var53 - 20 && var50 <= var53 + 20 || var62) { // L: 396 - if ((Client.worldProperties & 33554432) != 0) { // L: 397 - Login.Login_response0 = ""; // L: 398 - Login.Login_response1 = "This is a Beta world."; // L: 399 - Login.Login_response2 = "Your normal account will not be affected."; // L: 400 - Login.Login_response3 = ""; // L: 401 - Login.loginIndex = 1; // L: 402 - GrandExchangeOfferOwnWorldComparator.method1213(); // L: 403 - } else if ((Client.worldProperties & 4) != 0) { // L: 405 - if ((Client.worldProperties & 1024) != 0) { // L: 406 - Login.Login_response1 = "This is a High Risk PvP world."; // L: 407 - Login.Login_response2 = "Players can attack each other almost everywhere"; // L: 408 - Login.Login_response3 = "and the Protect Item prayer won't work."; // L: 409 - } else { - Login.Login_response1 = "This is a PvP world."; // L: 412 - Login.Login_response2 = "Players can attack each other"; // L: 413 - Login.Login_response3 = "almost everywhere."; // L: 414 - } - - Login.Login_response0 = "Warning!"; // L: 416 - Login.loginIndex = 1; // L: 417 - GrandExchangeOfferOwnWorldComparator.method1213(); // L: 418 - } else if ((Client.worldProperties & 1024) != 0) { // L: 420 - Login.Login_response1 = "This is a High Risk world."; // L: 421 - Login.Login_response2 = "The Protect Item prayer will"; // L: 422 - Login.Login_response3 = "not work on this world."; // L: 423 - Login.Login_response0 = "Warning!"; // L: 424 - Login.loginIndex = 1; // L: 425 - GrandExchangeOfferOwnWorldComparator.method1213(); // L: 426 - } else { - BufferedSink.Login_promptCredentials(false); // L: 429 - } - } - } else { - short var8; - int var51; - if (Login.loginIndex == 1) { // L: 433 - while (true) { - if (!class17.isKeyDown()) { // L: 434 - var51 = class21.loginBoxCenter - 80; // L: 442 - var8 = 321; // L: 443 - if (var4 == 1 && var68 >= var51 - 75 && var68 <= var51 + 75 && var50 >= var8 - 20 && var50 <= var8 + 20) { // L: 444 - BufferedSink.Login_promptCredentials(false); // L: 445 - } - - var51 = class21.loginBoxCenter + 80; // L: 447 - if (var4 == 1 && var68 >= var51 - 75 && var68 <= var51 + 75 && var50 >= var8 - 20 && var50 <= var8 + 20) { // L: 448 - Login.loginIndex = 0; // L: 449 - } - break; - } - - if (MenuAction.field982 == 84) { // L: 435 - BufferedSink.Login_promptCredentials(false); // L: 436 - } else if (MenuAction.field982 == 13) { // L: 438 - Login.loginIndex = 0; // L: 439 - } - } - } else { - int var11; - int var19; - short var52; - boolean var56; - if (Login.loginIndex == 2) { // L: 452 - var52 = 201; // L: 453 - var51 = var52 + 52; // L: 454 - if (var4 == 1 && var50 >= var51 - 12 && var50 < var51 + 2) { // L: 455 - Login.currentLoginField = 0; - } - - var51 += 15; // L: 456 - if (var4 == 1 && var50 >= var51 - 12 && var50 < var51 + 2) { // L: 457 - Login.currentLoginField = 1; - } - - var51 += 15; // L: 458 - var52 = 361; // L: 459 - if (class18.field155 != null) { // L: 460 - var54 = class18.field155.highX / 2; // L: 461 - if (var4 == 1 && var68 >= class18.field155.lowX - var54 && var68 <= var54 + class18.field155.lowX && var50 >= var52 - 15 && var50 < var52) { // L: 462 - switch(Login.field997) { // L: 463 - case 1: - class44.setLoginResponseString("Please enter your username.", "If you created your account after November", "2010, this will be the creation email address."); // L: 466 - Login.loginIndex = 5; // L: 467 - return; // L: 468 - case 2: - Interpreter.openURL("https://support.runescape.com/hc/en-gb", true, false); // L: 472 - } - } - } - - var54 = class21.loginBoxCenter - 80; // L: 478 - var53 = 321; // L: 479 - if (var4 == 1 && var68 >= var54 - 75 && var68 <= var54 + 75 && var50 >= var53 - 20 && var50 <= var53 + 20) { // L: 480 - Login.Login_username = Login.Login_username.trim(); // L: 481 - if (Login.Login_username.length() == 0) { // L: 482 - class44.setLoginResponseString("", "Please enter your username/email address.", ""); // L: 483 - return; // L: 484 - } - - if (Login.Login_password.length() == 0) { // L: 486 - class44.setLoginResponseString("", "Please enter your password.", ""); // L: 487 - return; // L: 488 - } - - class44.setLoginResponseString("", "Connecting to server...", ""); // L: 490 - HealthBarUpdate.method2204(false); // L: 491 - Client.updateGameState(20); // L: 492 - return; // L: 493 - } - - var54 = Login.loginBoxX + 180 + 80; // L: 495 - if (var4 == 1 && var68 >= var54 - 75 && var68 <= var54 + 75 && var50 >= var53 - 20 && var50 <= var53 + 20) { // L: 496 - Login.loginIndex = 0; // L: 497 - Login.Login_username = ""; // L: 498 - Login.Login_password = ""; // L: 499 - PendingSpawn.field1204 = 0; // L: 500 - class16.otp = ""; // L: 501 - Login.field1008 = true; // L: 502 - } - - var54 = class21.loginBoxCenter + -117; // L: 504 - var53 = 277; // L: 505 - Login.field1006 = var68 >= var54 && var68 < var54 + TaskHandler.field1466 && var50 >= var53 && var50 < var53 + class125.field1456; // L: 506 - if (var4 == 1 && Login.field1006) { // L: 507 - Client.Login_isUsernameRemembered = !Client.Login_isUsernameRemembered; // L: 508 - if (!Client.Login_isUsernameRemembered && class12.clientPreferences.rememberedUsername != null) { // L: 509 - class12.clientPreferences.rememberedUsername = null; // L: 510 - KeyHandler.savePreferences(); // L: 511 - } - } - - var54 = class21.loginBoxCenter + 24; // L: 514 - var53 = 277; // L: 515 - Login.field1007 = var68 >= var54 && var68 < var54 + TaskHandler.field1466 && var50 >= var53 && var50 < var53 + class125.field1456; // L: 516 - if (var4 == 1 && Login.field1007) { // L: 517 - class12.clientPreferences.hideUsername = !class12.clientPreferences.hideUsername; // L: 518 - if (!class12.clientPreferences.hideUsername) { // L: 519 - Login.Login_username = ""; // L: 520 - class12.clientPreferences.rememberedUsername = null; // L: 521 - GrandExchangeOfferOwnWorldComparator.method1213(); // L: 522 - } - - KeyHandler.savePreferences(); // L: 524 - } - - label1335: - while (true) { - Transferable var26; - int var59; - do { - while (true) { - label1253: - do { - while (true) { - while (class17.isKeyDown()) { // L: 526 - if (MenuAction.field982 != 13) { // L: 527 - if (Login.currentLoginField != 0) { // L: 536 - continue label1253; - } - - char var57 = class25.field207; // L: 537 - - for (var11 = 0; var11 < "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789!\"£$%^&*()-_=+[{]};:'@#~,<.>/?\\| ".length() && var57 != "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789!\"£$%^&*()-_=+[{]};:'@#~,<.>/?\\| ".charAt(var11); ++var11) { // L: 539 540 - } - - if (MenuAction.field982 == 85 && Login.Login_username.length() > 0) { // L: 543 - Login.Login_username = Login.Login_username.substring(0, Login.Login_username.length() - 1); - } - - if (MenuAction.field982 == 84 || MenuAction.field982 == 80) { // L: 544 - Login.currentLoginField = 1; - } - - char var12 = class25.field207; // L: 546 - boolean var60 = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789!\"£$%^&*()-_=+[{]};:'@#~,<.>/?\\| ".indexOf(var12) != -1; // L: 548 - if (var60 && Login.Login_username.length() < 320) { // L: 550 - Login.Login_username = Login.Login_username + class25.field207; - } - } else { - Login.loginIndex = 0; // L: 528 - Login.Login_username = ""; // L: 529 - Login.Login_password = ""; // L: 530 - PendingSpawn.field1204 = 0; // L: 531 - class16.otp = ""; // L: 532 - Login.field1008 = true; // L: 533 - } - } - - return; // L: 980 - } - } while(Login.currentLoginField != 1); // L: 552 - - if (MenuAction.field982 == 85 && Login.Login_password.length() > 0) { // L: 553 - Login.Login_password = Login.Login_password.substring(0, Login.Login_password.length() - 1); // L: 554 - } else if (MenuAction.field982 == 84 || MenuAction.field982 == 80) { // L: 556 - Login.currentLoginField = 0; // L: 557 - if (MenuAction.field982 == 84) { // L: 558 - Login.Login_username = Login.Login_username.trim(); // L: 559 - if (Login.Login_username.length() == 0) { // L: 560 - class44.setLoginResponseString("", "Please enter your username/email address.", ""); // L: 561 - return; // L: 562 - } - - if (Login.Login_password.length() == 0) { // L: 564 - class44.setLoginResponseString("", "Please enter your password.", ""); // L: 565 - return; // L: 566 - } - - class44.setLoginResponseString("", "Connecting to server...", ""); // L: 568 - HealthBarUpdate.method2204(false); // L: 569 - Client.updateGameState(20); // L: 570 - return; // L: 571 - } - } - - if ((KeyHandler.KeyHandler_pressedKeys[82] || KeyHandler.KeyHandler_pressedKeys[87]) && MenuAction.field982 == 67) { // L: 574 - Clipboard var25 = Toolkit.getDefaultToolkit().getSystemClipboard(); // L: 575 - var26 = var25.getContents(class303.client); // L: 576 - var59 = 20 - Login.Login_password.length(); // L: 577 - break; - } - - char var63 = class25.field207; // L: 627 - if ((var63 < ' ' || var63 >= 127) && (var63 <= 127 || var63 >= 160) && (var63 <= 160 || var63 > 255)) { // L: 629 - label1464: { - if (var63 != 0) { // L: 633 - char[] var69 = class301.cp1252AsciiExtension; // L: 635 - - for (int var29 = 0; var29 < var69.length; ++var29) { // L: 636 - char var14 = var69[var29]; // L: 637 - if (var14 == var63) { // L: 639 - var56 = true; // L: 640 - break label1464; // L: 641 - } - } - } - - var56 = false; // L: 647 - } - } else { - var56 = true; // L: 630 - } - - if (var56) { // L: 649 - char var70 = class25.field207; // L: 651 - boolean var58 = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789!\"£$%^&*()-_=+[{]};:'@#~,<.>/?\\| ".indexOf(var70) != -1; // L: 653 - if (var58 && Login.Login_password.length() < 20) { // L: 655 656 - Login.Login_password = Login.Login_password + class25.field207; // L: 657 - } - } - } - } while(var59 <= 0); // L: 578 - - try { - String var61 = (String)var26.getTransferData(DataFlavor.stringFlavor); // L: 580 - int var64 = Math.min(var59, var61.length()); // L: 581 - int var15 = 0; - - while (true) { - if (var15 >= var64) { - Login.Login_password = Login.Login_password + var61.substring(0, var64); // L: 619 - continue label1335; - } - - char var65 = var61.charAt(var15); // L: 585 - boolean var16; - if ((var65 < ' ' || var65 >= 127) && (var65 <= 127 || var65 >= 160) && (var65 <= 160 || var65 > 255)) { // L: 587 - label1467: { - if (var65 != 0) { // L: 591 - char[] var66 = class301.cp1252AsciiExtension; // L: 593 - - for (var19 = 0; var19 < var66.length; ++var19) { // L: 594 - char var20 = var66[var19]; // L: 595 - if (var20 == var65) { // L: 597 - var16 = true; // L: 598 - break label1467; // L: 599 - } - } - } - - var16 = false; // L: 605 - } - } else { - var16 = true; // L: 588 - } - - if (!var16) { // L: 607 - break; - } - - char var67 = var61.charAt(var15); // L: 609 - boolean var27 = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789!\"£$%^&*()-_=+[{]};:'@#~,<.>/?\\| ".indexOf(var67) != -1; // L: 611 - if (!var27) { // L: 613 - break; - } - - ++var15; // L: 582 - } - - Login.loginIndex = 3; // L: 615 - return; // L: 616 - } catch (UnsupportedFlavorException var47) { // L: 621 - } catch (IOException var48) { // L: 622 - } - } - } else if (Login.loginIndex == 3) { // L: 666 - var51 = Login.loginBoxX + 180; // L: 667 - var8 = 276; // L: 668 - if (var4 == 1 && var68 >= var51 - 75 && var68 <= var51 + 75 && var50 >= var8 - 20 && var50 <= var8 + 20) { // L: 669 - BufferedSink.Login_promptCredentials(false); // L: 670 - } - - var51 = Login.loginBoxX + 180; // L: 672 - var8 = 326; // L: 673 - if (var4 == 1 && var68 >= var51 - 75 && var68 <= var51 + 75 && var50 >= var8 - 20 && var50 <= var8 + 20) { // L: 674 - class44.setLoginResponseString("Please enter your username.", "If you created your account after November", "2010, this will be the creation email address."); // L: 675 - Login.loginIndex = 5; // L: 676 - return; // L: 677 - } - } else { - int var10; - if (Login.loginIndex == 4) { // L: 680 - var51 = Login.loginBoxX + 180 - 80; // L: 681 - var8 = 321; // L: 682 - if (var4 == 1 && var68 >= var51 - 75 && var68 <= var51 + 75 && var50 >= var8 - 20 && var50 <= var8 + 20) { // L: 683 - class16.otp.trim(); // L: 684 - if (class16.otp.length() != 6) { // L: 685 - class44.setLoginResponseString("", "Please enter a 6-digit PIN.", ""); // L: 686 - return; // L: 687 - } - - PendingSpawn.field1204 = Integer.parseInt(class16.otp); // L: 689 - class16.otp = ""; // L: 690 - HealthBarUpdate.method2204(true); // L: 691 - class44.setLoginResponseString("", "Connecting to server...", ""); // L: 692 - Client.updateGameState(20); // L: 693 - return; // L: 694 - } - - if (var4 == 1 && var68 >= Login.loginBoxX + 180 - 9 && var68 <= Login.loginBoxX + 180 + 130 && var50 >= 263 && var50 <= 296) { // L: 696 - Login.field1008 = !Login.field1008; // L: 697 - } - - if (var4 == 1 && var68 >= Login.loginBoxX + 180 - 34 && var68 <= Login.loginBoxX + 34 + 180 && var50 >= 351 && var50 <= 363) { // L: 699 - Interpreter.openURL(class4.method57("secure", true) + "m=totp-authenticator/disableTOTPRequest", true, false); // L: 700 - } - - var51 = Login.loginBoxX + 180 + 80; // L: 702 - if (var4 == 1 && var68 >= var51 - 75 && var68 <= var51 + 75 && var50 >= var8 - 20 && var50 <= var8 + 20) { // L: 703 - Login.loginIndex = 0; // L: 704 - Login.Login_username = ""; // L: 705 - Login.Login_password = ""; // L: 706 - PendingSpawn.field1204 = 0; // L: 707 - class16.otp = ""; // L: 708 - } - - while (class17.isKeyDown()) { // L: 710 - boolean var9 = false; // L: 711 - - for (var10 = 0; var10 < "1234567890".length(); ++var10) { // L: 712 - if (class25.field207 == "1234567890".charAt(var10)) { // L: 713 - var9 = true; // L: 714 - break; // L: 715 - } - } - - if (MenuAction.field982 == 13) { // L: 718 - Login.loginIndex = 0; // L: 719 - Login.Login_username = ""; // L: 720 - Login.Login_password = ""; // L: 721 - PendingSpawn.field1204 = 0; // L: 722 - class16.otp = ""; // L: 723 - } else { - if (MenuAction.field982 == 85 && class16.otp.length() > 0) { // L: 726 - class16.otp = class16.otp.substring(0, class16.otp.length() - 1); - } - - if (MenuAction.field982 == 84) { // L: 727 - class16.otp.trim(); // L: 728 - if (class16.otp.length() != 6) { // L: 729 - class44.setLoginResponseString("", "Please enter a 6-digit PIN.", ""); // L: 730 - return; // L: 731 - } - - PendingSpawn.field1204 = Integer.parseInt(class16.otp); // L: 733 - class16.otp = ""; // L: 734 - HealthBarUpdate.method2204(true); // L: 735 - class44.setLoginResponseString("", "Connecting to server...", ""); // L: 736 - Client.updateGameState(20); // L: 737 - return; // L: 738 - } - - if (var9 && class16.otp.length() < 6) { // L: 740 - class16.otp = class16.otp + class25.field207; - } - } - } - } else if (Login.loginIndex == 5) { // L: 744 - var51 = Login.loginBoxX + 180 - 80; // L: 745 - var8 = 321; // L: 746 - if (var4 == 1 && var68 >= var51 - 75 && var68 <= var51 + 75 && var50 >= var8 - 20 && var50 <= var8 + 20) { // L: 747 - Login.Login_username = Login.Login_username.trim(); // L: 749 - if (Login.Login_username.length() == 0) { // L: 750 - class44.setLoginResponseString("Please enter your username.", "If you created your account after November", "2010, this will be the creation email address."); // L: 751 - } else { - long var33; - try { - URL var28 = new URL(class4.method57("services", false) + "m=accountappeal/login.ws"); // L: 758 - URLConnection var13 = var28.openConnection(); // L: 759 - var13.setRequestProperty("connection", "close"); // L: 760 - var13.setDoInput(true); // L: 761 - var13.setDoOutput(true); // L: 762 - var13.setConnectTimeout(5000); // L: 763 - OutputStreamWriter var71 = new OutputStreamWriter(var13.getOutputStream()); // L: 764 - var71.write("data1=req"); // L: 765 - var71.flush(); // L: 766 - InputStream var72 = var13.getInputStream(); // L: 767 - Buffer var73 = new Buffer(new byte[1000]); // L: 768 - - while (true) { - int var17 = var72.read(var73.array, var73.offset, 1000 - var73.offset); // L: 770 - if (var17 == -1) { // L: 771 - var73.offset = 0; // L: 778 - long var35 = var73.readLong(); // L: 779 - var33 = var35; // L: 780 - break; - } - - var73.offset += var17; // L: 772 - if (var73.offset >= 1000) { // L: 773 - var33 = 0L; // L: 774 - break; - } - } - } catch (Exception var45) { // L: 782 - var33 = 0L; // L: 783 - } - - int var55; - if (var33 == 0L) { // L: 787 - var55 = 5; - } else { - var55 = PendingSpawn.method2180(var33, Login.Login_username); // L: 788 - } - - switch(var55) { // L: 789 - case 2: - class44.setLoginResponseString(Strings.field3439, Strings.field3503, Strings.field3512); // L: 797 - Login.loginIndex = 6; // L: 798 - break; // L: 799 - case 3: - class44.setLoginResponseString("", "Error connecting to server.", ""); // L: 804 - break; // L: 805 - case 4: - class44.setLoginResponseString("The part of the website you are trying", "to connect to is offline at the moment.", "Please try again later."); // L: 807 - break; - case 5: - class44.setLoginResponseString("Sorry, there was an error trying to", "log you in to this part of the website.", "Please try again later."); // L: 791 - break; // L: 792 - case 6: - class44.setLoginResponseString("", "Error connecting to server.", ""); // L: 794 - break; // L: 795 - case 7: - class44.setLoginResponseString("You must enter a valid login to proceed. For accounts", "created after 24th November 2010, please use your", "email address. Otherwise please use your username."); // L: 801 - } - } - - return; // L: 811 - } - - var51 = Login.loginBoxX + 180 + 80; // L: 813 - if (var4 == 1 && var68 >= var51 - 75 && var68 <= var51 + 75 && var50 >= var8 - 20 && var50 <= var8 + 20) { // L: 814 - BufferedSink.Login_promptCredentials(true); // L: 815 - } - - var53 = 361; // L: 817 - if (WorldMapElement.field1572 != null) { // L: 818 - var10 = WorldMapElement.field1572.highX / 2; // L: 819 - if (var4 == 1 && var68 >= WorldMapElement.field1572.lowX - var10 && var68 <= var10 + WorldMapElement.field1572.lowX && var50 >= var53 - 15 && var50 < var53) { // L: 820 - Interpreter.openURL(class4.method57("secure", true) + "m=weblogin/g=oldscape/cant_log_in", true, false); // L: 821 - } - } - - while (class17.isKeyDown()) { // L: 824 - var56 = false; // L: 825 - - for (var11 = 0; var11 < "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789!\"£$%^&*()-_=+[{]};:'@#~,<.>/?\\| ".length(); ++var11) { // L: 826 - if (class25.field207 == "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789!\"£$%^&*()-_=+[{]};:'@#~,<.>/?\\| ".charAt(var11)) { // L: 827 - var56 = true; // L: 828 - break; // L: 829 - } - } - - if (MenuAction.field982 == 13) { // L: 832 - BufferedSink.Login_promptCredentials(true); // L: 833 - } else { - if (MenuAction.field982 == 85 && Login.Login_username.length() > 0) { // L: 836 - Login.Login_username = Login.Login_username.substring(0, Login.Login_username.length() - 1); - } - - if (MenuAction.field982 == 84) { // L: 837 - Login.Login_username = Login.Login_username.trim(); // L: 839 - if (Login.Login_username.length() == 0) { // L: 840 - class44.setLoginResponseString("Please enter your username.", "If you created your account after November", "2010, this will be the creation email address."); // L: 841 - } else { - long var37; - try { - URL var30 = new URL(class4.method57("services", false) + "m=accountappeal/login.ws"); // L: 848 - URLConnection var31 = var30.openConnection(); // L: 849 - var31.setRequestProperty("connection", "close"); // L: 850 - var31.setDoInput(true); // L: 851 - var31.setDoOutput(true); // L: 852 - var31.setConnectTimeout(5000); // L: 853 - OutputStreamWriter var32 = new OutputStreamWriter(var31.getOutputStream()); // L: 854 - var32.write("data1=req"); // L: 855 - var32.flush(); // L: 856 - InputStream var39 = var31.getInputStream(); // L: 857 - Buffer var18 = new Buffer(new byte[1000]); // L: 858 - - while (true) { - var19 = var39.read(var18.array, var18.offset, 1000 - var18.offset); // L: 860 - if (var19 == -1) { // L: 861 - var18.offset = 0; // L: 868 - long var40 = var18.readLong(); // L: 869 - var37 = var40; // L: 870 - break; - } - - var18.offset += var19; // L: 862 - if (var18.offset >= 1000) { // L: 863 - var37 = 0L; // L: 864 - break; - } - } - } catch (Exception var46) { // L: 872 - var37 = 0L; // L: 873 - } - - if (var37 == 0L) { // L: 877 - var11 = 5; - } else { - var11 = PendingSpawn.method2180(var37, Login.Login_username); // L: 878 - } - - switch(var11) { // L: 879 - case 2: - class44.setLoginResponseString(Strings.field3439, Strings.field3503, Strings.field3512); // L: 887 - Login.loginIndex = 6; // L: 888 - break; // L: 889 - case 3: - class44.setLoginResponseString("", "Error connecting to server.", ""); // L: 897 - break; - case 4: - class44.setLoginResponseString("The part of the website you are trying", "to connect to is offline at the moment.", "Please try again later."); // L: 881 - break; // L: 882 - case 5: - class44.setLoginResponseString("Sorry, there was an error trying to", "log you in to this part of the website.", "Please try again later."); // L: 884 - break; // L: 885 - case 6: - class44.setLoginResponseString("", "Error connecting to server.", ""); // L: 894 - break; // L: 895 - case 7: - class44.setLoginResponseString("You must enter a valid login to proceed. For accounts", "created after 24th November 2010, please use your", "email address. Otherwise please use your username."); // L: 891 - } - } - - return; // L: 901 - } - - if (var56 && Login.Login_username.length() < 320) { // L: 903 - Login.Login_username = Login.Login_username + class25.field207; - } - } - } - } else if (Login.loginIndex != 6) { // L: 907 - if (Login.loginIndex == 7) { // L: 918 - var51 = Login.loginBoxX + 180 - 80; // L: 919 - var8 = 321; // L: 920 - if (var4 == 1 && var68 >= var51 - 75 && var68 <= var51 + 75 && var50 >= var8 - 20 && var50 <= var8 + 20) { // L: 921 - Interpreter.openURL(class4.method57("secure", true) + "m=dob/set_dob.ws", true, false); // L: 922 - class44.setLoginResponseString("", "Page has opened in a new window.", "(Please check your popup blocker.)"); // L: 923 - Login.loginIndex = 6; // L: 924 - return; // L: 925 - } - - var51 = Login.loginBoxX + 180 + 80; // L: 927 - if (var4 == 1 && var68 >= var51 - 75 && var68 <= var51 + 75 && var50 >= var8 - 20 && var50 <= var8 + 20) { // L: 928 - BufferedSink.Login_promptCredentials(true); // L: 929 - } - } else if (Login.loginIndex == 8) { // L: 932 - var51 = Login.loginBoxX + 180 - 80; // L: 933 - var8 = 321; // L: 934 - if (var4 == 1 && var68 >= var51 - 75 && var68 <= var51 + 75 && var50 >= var8 - 20 && var50 <= var8 + 20) { // L: 935 - Interpreter.openURL("https://www.jagex.com/terms/privacy", true, false); // L: 936 - class44.setLoginResponseString("", "Page has opened in a new window.", "(Please check your popup blocker.)"); // L: 937 - Login.loginIndex = 6; // L: 938 - return; // L: 939 - } - - var51 = Login.loginBoxX + 180 + 80; // L: 941 - if (var4 == 1 && var68 >= var51 - 75 && var68 <= var51 + 75 && var50 >= var8 - 20 && var50 <= var8 + 20) { // L: 942 - BufferedSink.Login_promptCredentials(true); // L: 943 - } - } else if (Login.loginIndex == 12) { // L: 946 - String var44 = ""; // L: 947 - switch(Login.field996) { // L: 948 - case 0: - var44 = "https://support.runescape.com/hc/en-gb/articles/115002238729-Account-Bans"; // L: 956 - break; - case 1: - var44 = "https://support.runescape.com/hc/en-gb/articles/206103939-My-account-is-locked"; // L: 953 - break; // L: 954 - default: - BufferedSink.Login_promptCredentials(false); // L: 950 - } - - var54 = Login.loginBoxX + 180; // L: 959 - var53 = 276; // L: 960 - if (var4 == 1 && var68 >= var54 - 75 && var68 <= var54 + 75 && var50 >= var53 - 20 && var50 <= var53 + 20) { // L: 961 - Interpreter.openURL(var44, true, false); // L: 962 - class44.setLoginResponseString("", "Page has opened in a new window.", "(Please check your popup blocker.)"); // L: 963 - Login.loginIndex = 6; // L: 964 - return; // L: 965 - } - - var54 = Login.loginBoxX + 180; // L: 967 - var53 = 326; // L: 968 - if (var4 == 1 && var68 >= var54 - 75 && var68 <= var54 + 75 && var50 >= var53 - 20 && var50 <= var53 + 20) { // L: 969 - BufferedSink.Login_promptCredentials(false); // L: 970 - } - } else if (Login.loginIndex == 24) { // L: 973 - var51 = Login.loginBoxX + 180; // L: 974 - var8 = 301; // L: 975 - if (var4 == 1 && var68 >= var51 - 75 && var68 <= var51 + 75 && var50 >= var8 - 20 && var50 <= var8 + 20) { // L: 976 - BufferedSink.Login_promptCredentials(false); // L: 977 - } - } - } else { - while (true) { - do { - if (!class17.isKeyDown()) { // L: 908 - var52 = 321; // L: 913 - if (var4 == 1 && var50 >= var52 - 20 && var50 <= var52 + 20) { // L: 914 - BufferedSink.Login_promptCredentials(true); // L: 915 - } - - return; - } - } while(MenuAction.field982 != 84 && MenuAction.field982 != 13); // L: 909 - - BufferedSink.Login_promptCredentials(true); // L: 910 - } - } - } - } - } - - } + class5.field53 = 0; // L: 167 + Varps.otp = ""; // L: 168 + Login.field1043 = true; // L: 169 + Login.worldSelectOpen = false; // L: 170 + if (!ObjectComposition.clientPreferences.titleMusicDisabled) { // L: 171 + class6.method60(2, UrlRequest.archive6, "scape main", "", 255, false); + } else { + class159.method3192(2); // L: 172 } + + StudioGame.method4847(false); // L: 173 + Login.clearLoginScreen = true; // L: 174 + Login.xPadding = (class32.canvasWidth - 765) / 2; // L: 175 + Login.loginBoxX = Login.xPadding + 202; // L: 176 + UserComparator4.loginBoxCenter = Login.loginBoxX + 180; // L: 177 + Login.leftTitleSprite.drawAt(Login.xPadding, 0); // L: 178 + class20.rightTitleSprite.drawAt(Login.xPadding + 382, 0); // L: 179 + Fonts.logoSprite.drawAt(Login.xPadding + 382 - Fonts.logoSprite.subWidth / 2, 18); // L: 180 } - } // L: 324 + } // L: 132 181 - @ObfuscatedName("it") + @ObfuscatedName("n") @ObfuscatedSignature( - descriptor = "(IIIIB)V", - garbageValue = "-89" + descriptor = "(IIIIIIS)I", + garbageValue = "4030" ) - static final void method3586(int var0, int var1, int var2, int var3) { - for (int var4 = 0; var4 < Client.rootWidgetCount; ++var4) { // L: 7902 - if (Client.rootWidgetXs[var4] + Client.rootWidgetWidths[var4] > var0 && Client.rootWidgetXs[var4] < var0 + var2 && Client.rootWidgetHeights[var4] + Client.rootWidgetYs[var4] > var1 && Client.rootWidgetYs[var4] < var3 + var1) { // L: 7903 - Client.field825[var4] = true; - } + public static int method3635(int var0, int var1, int var2, int var3, int var4, int var5) { + if ((var5 & 1) == 1) { // L: 17 + int var6 = var3; // L: 18 + var3 = var4; // L: 19 + var4 = var6; // L: 20 } - } // L: 7905 + var2 &= 3; // L: 22 + if (var2 == 0) { // L: 23 + return var1; + } else if (var2 == 1) { // L: 24 + return 7 - var0 - (var3 - 1); + } else { + return var2 == 2 ? 7 - var1 - (var4 - 1) : var0; // L: 25 + } + } } diff --git a/runescape-client/src/main/java/class18.java b/runescape-client/src/main/java/class18.java index e05d024c3a..e646c4556d 100644 --- a/runescape-client/src/main/java/class18.java +++ b/runescape-client/src/main/java/class18.java @@ -3,158 +3,111 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("u") +@ObfuscatedName("m") public class class18 extends class14 { - @ObfuscatedName("tw") - @ObfuscatedSignature( - descriptor = "Ljn;" - ) - public static class285 field154; - @ObfuscatedName("rg") + @ObfuscatedName("rf") @ObfuscatedGetter( - intValue = -1740704291 + intValue = -1469899117 ) - static int field157; - @ObfuscatedName("ap") - @ObfuscatedSignature( - descriptor = "Lle;" - ) - static Bounds field155; - @ObfuscatedName("db") - @ObfuscatedSignature( - descriptor = "Lji;" - ) - @Export("archive13") - static Archive archive13; - @ObfuscatedName("h") + static int field153; + @ObfuscatedName("re") @ObfuscatedGetter( - intValue = 91445281 + intValue = 1439588607 ) - int field152; - @ObfuscatedName("c") - boolean field151; + static int field156; + @ObfuscatedName("f") + @ObfuscatedGetter( + longValue = -6310115608975141981L + ) + public static long field159; + @ObfuscatedName("b") + @ObfuscatedGetter( + intValue = 393303047 + ) + @Export("musicTrackFileId") + public static int musicTrackFileId; + @ObfuscatedName("br") + @ObfuscatedSignature( + descriptor = "[Lop;" + ) + @Export("worldSelectStars") + static IndexedSprite[] worldSelectStars; + @ObfuscatedName("gj") + @Export("regionLandArchives") + static byte[][] regionLandArchives; + @ObfuscatedName("jm") + @ObfuscatedSignature( + descriptor = "Lio;" + ) + @Export("hoveredItemContainer") + static Widget hoveredItemContainer; + @ObfuscatedName("v") + @ObfuscatedGetter( + intValue = -918629571 + ) + int field157; + @ObfuscatedName("n") + boolean field150; // $FF: synthetic field @ObfuscatedSignature( - descriptor = "Lo;" + descriptor = "Lf;" ) final class2 this$0; @ObfuscatedSignature( - descriptor = "(Lo;)V" + descriptor = "(Lf;)V" ) class18(class2 var1) { this.this$0 = var1; - this.field152 = -1; // L: 178 + this.field157 = -1; // L: 178 } // L: 181 - @ObfuscatedName("h") + @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "(Lnk;I)V", - garbageValue = "110401227" + descriptor = "(Lnd;I)V", + garbageValue = "-1281352827" ) - void vmethod339(Buffer var1) { - this.field152 = var1.readUnsignedShort(); // L: 184 - this.field151 = var1.readUnsignedByte() == 1; // L: 185 + void vmethod276(Buffer var1) { + this.field157 = var1.readUnsignedShort(); // L: 184 + this.field150 = var1.readUnsignedByte() == 1; // L: 185 } // L: 186 - @ObfuscatedName("c") + @ObfuscatedName("n") @ObfuscatedSignature( - descriptor = "(Lx;I)V", - garbageValue = "-1535989118" + descriptor = "(Ll;B)V", + garbageValue = "29" ) - void vmethod338(class11 var1) { - var1.method133(this.field152, this.field151); // L: 189 + void vmethod281(ClanSettings var1) { + var1.method110(this.field157, this.field150); // L: 189 } // L: 190 - @ObfuscatedName("l") + @ObfuscatedName("f") @ObfuscatedSignature( - descriptor = "(Ljava/lang/CharSequence;IZB)I", - garbageValue = "114" + descriptor = "(IB)I", + garbageValue = "-52" ) - static int method255(CharSequence var0, int var1, boolean var2) { - if (var1 >= 2 && var1 <= 36) { // L: 84 - boolean var3 = false; // L: 85 - boolean var4 = false; // L: 86 - int var5 = 0; // L: 87 - int var6 = var0.length(); // L: 88 - - for (int var7 = 0; var7 < var6; ++var7) { // L: 89 - char var8 = var0.charAt(var7); // L: 90 - if (var7 == 0) { // L: 91 - if (var8 == '-') { // L: 92 - var3 = true; // L: 93 - continue; - } - - if (var8 == '+') { // L: 96 - continue; - } - } - - int var10; - if (var8 >= '0' && var8 <= '9') { // L: 98 - var10 = var8 - '0'; - } else if (var8 >= 'A' && var8 <= 'Z') { // L: 99 - var10 = var8 - '7'; - } else { - if (var8 < 'a' || var8 > 'z') { // L: 100 - throw new NumberFormatException(); // L: 101 - } - - var10 = var8 - 'W'; - } - - if (var10 >= var1) { // L: 102 - throw new NumberFormatException(); - } - - if (var3) { // L: 103 - var10 = -var10; - } - - int var9 = var5 * var1 + var10; // L: 104 - if (var9 / var1 != var5) { // L: 105 - throw new NumberFormatException(); - } - - var5 = var9; // L: 106 - var4 = true; // L: 107 - } - - if (!var4) { // L: 109 - throw new NumberFormatException(); - } else { - return var5; // L: 110 - } - } else { - throw new IllegalArgumentException("" + var1); - } + public static int method213(int var0) { + return var0 >> 17 & 7; // L: 17 } - @ObfuscatedName("kv") + @ObfuscatedName("kn") @ObfuscatedSignature( - descriptor = "(Lcl;ZI)V", - garbageValue = "-1411385437" + descriptor = "(IIZB)V", + garbageValue = "-41" ) - @Export("closeInterface") - static final void closeInterface(InterfaceParent var0, boolean var1) { - int var2 = var0.group; // L: 11340 - int var3 = (int)var0.key; // L: 11341 - var0.remove(); // L: 11342 - if (var1) { // L: 11343 - WallDecoration.method4234(var2); + static final void method216(int var0, int var1, boolean var2) { + if (Client.currentClanChannels[var0] != null) { // L: 11343 + if (var1 >= 0 && var1 < Client.currentClanChannels[var0].method27()) { // L: 11344 + ClanChannelMember var3 = (ClanChannelMember)Client.currentClanChannels[var0].members.get(var1); // L: 11345 + PacketWriter var4 = Client.packetWriter; // L: 11346 + PacketBufferNode var5 = class21.getPacketBufferNode(ClientPacket.field2607, var4.isaacCipher); // L: 11347 + var5.packetBuffer.writeByte(4 + Tiles.stringCp1252NullTerminatedByteSize(var3.name)); // L: 11348 + var5.packetBuffer.writeByte(var0); // L: 11349 + var5.packetBuffer.writeShort(var1); // L: 11350 + var5.packetBuffer.writeBoolean(var2); // L: 11351 + var5.packetBuffer.writeStringCp1252NullTerminated(var3.name); // L: 11352 + var4.addNode(var5); // L: 11353 + } } - - TaskHandler.method2515(var2); // L: 11344 - Widget var4 = DevicePcmPlayerProvider.getWidget(var3); // L: 11345 - if (var4 != null) { // L: 11346 - VerticalAlignment.invalidateWidget(var4); - } - - GrandExchangeOfferOwnWorldComparator.method1212(); // L: 11347 - if (Client.rootInterface != -1) { // L: 11348 - LoginType.runIntfCloseListeners(Client.rootInterface, 1); - } - - } // L: 11349 + } // L: 11354 } diff --git a/runescape-client/src/main/java/class181.java b/runescape-client/src/main/java/class181.java deleted file mode 100644 index 715b26c673..0000000000 --- a/runescape-client/src/main/java/class181.java +++ /dev/null @@ -1,46 +0,0 @@ -import java.util.Iterator; -import net.runelite.mapping.Export; -import net.runelite.mapping.ObfuscatedName; -import net.runelite.mapping.ObfuscatedSignature; - -@ObfuscatedName("fr") -public class class181 { - @ObfuscatedName("h") - @ObfuscatedSignature( - descriptor = "(IB)Ljh;", - garbageValue = "53" - ) - public static GameBuild method3592(int var0) { - GameBuild[] var1 = new GameBuild[]{GameBuild.RC, GameBuild.WIP, GameBuild.BUILDLIVE, GameBuild.LIVE}; // L: 21 - GameBuild[] var2 = var1; // L: 23 - - for (int var3 = 0; var3 < var2.length; ++var3) { // L: 24 - GameBuild var4 = var2[var3]; // L: 25 - if (var0 == var4.buildId) { // L: 27 - return var4; - } - } - - return null; // L: 31 - } - - @ObfuscatedName("kn") - @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "-491948635" - ) - @Export("FriendSystem_invalidateIgnoreds") - static final void FriendSystem_invalidateIgnoreds() { - Iterator var0 = Messages.Messages_hashTable.iterator(); // L: 11504 - - while (var0.hasNext()) { - Message var1 = (Message)var0.next(); // L: 11505 - var1.clearIsFromIgnored(); // L: 11507 - } - - if (class25.clanChat != null) { // L: 11511 - class25.clanChat.invalidateIgnoreds(); // L: 11512 - } - - } // L: 11514 -} diff --git a/runescape-client/src/main/java/class19.java b/runescape-client/src/main/java/class19.java index 16baa790d1..388602ea50 100644 --- a/runescape-client/src/main/java/class19.java +++ b/runescape-client/src/main/java/class19.java @@ -3,54 +3,54 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("m") +@ObfuscatedName("x") public class class19 { - @ObfuscatedName("fw") + @ObfuscatedName("ba") @ObfuscatedSignature( - descriptor = "Ldz;" + descriptor = "Lop;" ) - @Export("urlRequester") - static UrlRequester urlRequester; - @ObfuscatedName("h") + @Export("worldSelectLeftSprite") + static IndexedSprite worldSelectLeftSprite; + @ObfuscatedName("v") @ObfuscatedGetter( - longValue = 5670921231287266957L + longValue = -7800373263393014969L ) - long field166; - @ObfuscatedName("c") + long field162; + @ObfuscatedName("n") @ObfuscatedGetter( - longValue = -3093921605955443203L + longValue = 2996578654687834529L ) - long field159; - @ObfuscatedName("o") + long field160; + @ObfuscatedName("f") @ObfuscatedSignature( - descriptor = "Lko;" + descriptor = "Lki;" ) - IterableNodeDeque field160; + IterableNodeDeque field163; @ObfuscatedSignature( - descriptor = "(Lnk;)V" + descriptor = "(Lnd;)V" ) public class19(Buffer var1) { - this.field159 = -1L; // L: 9 - this.field160 = new IterableNodeDeque(); // L: 10 - this.method262(var1); // L: 18 + this.field160 = -1L; // L: 9 + this.field163 = new IterableNodeDeque(); // L: 10 + this.method221(var1); // L: 18 } // L: 19 - @ObfuscatedName("h") + @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "(Lnk;I)V", - garbageValue = "-2004671532" + descriptor = "(Lnd;I)V", + garbageValue = "-1275623765" ) - void method262(Buffer var1) { - this.field166 = var1.readLong(); // L: 22 - this.field159 = var1.readLong(); // L: 23 + void method221(Buffer var1) { + this.field162 = var1.readLong(); // L: 22 + this.field160 = var1.readLong(); // L: 23 for (int var2 = var1.readUnsignedByte(); var2 != 0; var2 = var1.readUnsignedByte()) { // L: 24 25 35 Object var3; if (var2 == 1) { // L: 27 var3 = new class12(this); - } else if (var2 == 4) { - var3 = new class7(this); // L: 28 + } else if (var2 == 4) { // L: 28 + var3 = new class7(this); } else if (var2 == 3) { // L: 29 var3 = new class5(this); } else if (var2 == 2) { // L: 30 @@ -63,337 +63,35 @@ public class class19 { var3 = new class25(this); } - ((class16)var3).vmethod326(var1); // L: 33 - this.field160.addFirst((Node)var3); // L: 34 + ((class16)var3).vmethod266(var1); // L: 33 + this.field163.addFirst((Node)var3); // L: 34 } } // L: 37 - @ObfuscatedName("c") + @ObfuscatedName("n") @ObfuscatedSignature( - descriptor = "(Lg;I)V", - garbageValue = "1435583032" + descriptor = "(Ly;I)V", + garbageValue = "205429833" ) - public void method263(class3 var1) { - if (this.field166 == var1.key && this.field159 == var1.field34) { // L: 40 - for (class16 var2 = (class16)this.field160.last(); var2 != null; var2 = (class16)this.field160.previous()) { // L: 41 - var2.vmethod314(var1); // L: 42 + public void method218(ClanChannel var1) { + if (var1.key == this.field162 && var1.field29 == this.field160) { // L: 40 + for (class16 var2 = (class16)this.field163.last(); var2 != null; var2 = (class16)this.field163.previous()) { // L: 41 + var2.vmethod264(var1); // L: 42 } - ++var1.field34; // L: 44 + ++var1.field29; // L: 44 } else { throw new RuntimeException(""); } - } // L: 45 + } - @ObfuscatedName("ha") + @ObfuscatedName("h") @ObfuscatedSignature( - descriptor = "(Lhh;B)V", - garbageValue = "114" + descriptor = "(Lbh;I)V", + garbageValue = "229174712" ) - static final void method267(class225 var0) { - PacketBuffer var1 = Client.packetWriter.packetBuffer; // L: 7011 - int var3; - int var4; - int var6; - int var7; - int var9; - int var10; - int var11; - int var12; - int var13; - int var14; - if (class225.field2675 == var0) { // L: 7012 - byte var2 = var1.readByte(); // L: 7013 - var3 = var1.method6486(); // L: 7014 - var4 = var1.method6620(); // L: 7015 - byte var5 = var1.method6530(); // L: 7016 - var6 = var1.readUnsignedShort(); // L: 7017 - var7 = var1.method6620(); // L: 7018 - byte var8 = var1.method6480(); // L: 7019 - var9 = var1.method6478(); // L: 7020 - var10 = (var9 >> 4 & 7) + class7.field66; // L: 7021 - var11 = (var9 & 7) + VarpDefinition.field1542; // L: 7022 - var12 = var1.method6476(); // L: 7023 - var13 = var12 >> 2; // L: 7024 - var14 = var12 & 3; // L: 7025 - int var15 = Client.field677[var13]; // L: 7026 - byte var16 = var1.readByte(); // L: 7027 - Player var17; - if (var6 == Client.localPlayerIndex) { // L: 7029 - var17 = class35.localPlayer; - } else { - var17 = Client.players[var6]; // L: 7030 - } - - if (var17 != null) { // L: 7031 - ObjectComposition var18 = AttackOption.getObjectDefinition(var3); // L: 7032 - int var19; - int var20; - if (var14 != 1 && var14 != 3) { // L: 7035 - var19 = var18.sizeX; // L: 7040 - var20 = var18.sizeY; // L: 7041 - } else { - var19 = var18.sizeY; // L: 7036 - var20 = var18.sizeX; // L: 7037 - } - - int var21 = var10 + (var19 >> 1); // L: 7043 - int var22 = var10 + (var19 + 1 >> 1); // L: 7044 - int var23 = var11 + (var20 >> 1); // L: 7045 - int var24 = var11 + (var20 + 1 >> 1); // L: 7046 - int[][] var25 = Tiles.Tiles_heights[ParamComposition.Client_plane]; // L: 7047 - int var26 = var25[var21][var23] + var25[var22][var23] + var25[var21][var24] + var25[var22][var24] >> 2; // L: 7048 - int var27 = (var10 << 7) + (var19 << 6); // L: 7049 - int var28 = (var11 << 7) + (var20 << 6); // L: 7050 - Model var29 = var18.getModel(var13, var14, var25, var27, var26, var28); // L: 7051 - if (var29 != null) { // L: 7052 - class280.updatePendingSpawn(ParamComposition.Client_plane, var10, var11, var15, -1, 0, 0, var4 + 1, var7 + 1); // L: 7053 - var17.animationCycleStart = var4 + Client.cycle; // L: 7054 - var17.animationCycleEnd = var7 + Client.cycle; // L: 7055 - var17.model0 = var29; // L: 7056 - var17.field1174 = var19 * 64 + var10 * 128; // L: 7057 - var17.field1172 = var20 * 64 + var11 * 128; // L: 7058 - var17.tileHeight2 = var26; // L: 7059 - byte var30; - if (var16 > var5) { // L: 7060 - var30 = var16; // L: 7061 - var16 = var5; // L: 7062 - var5 = var30; // L: 7063 - } - - if (var2 > var8) { // L: 7065 - var30 = var2; // L: 7066 - var2 = var8; // L: 7067 - var8 = var30; // L: 7068 - } - - var17.minX = var10 + var16; // L: 7070 - var17.maxX = var10 + var5; // L: 7071 - var17.minY = var11 + var2; // L: 7072 - var17.maxY = var11 + var8; // L: 7073 - } - } - } - - int var37; - int var38; - int var40; - if (class225.field2681 == var0) { // L: 7077 - var37 = var1.method6620(); // L: 7078 - var3 = var1.method6478(); // L: 7079 - var4 = var3 >> 2; // L: 7080 - var38 = var3 & 3; // L: 7081 - var6 = Client.field677[var4]; // L: 7082 - var7 = var1.method6476(); // L: 7083 - var40 = (var7 >> 4 & 7) + class7.field66; // L: 7084 - var9 = (var7 & 7) + VarpDefinition.field1542; // L: 7085 - if (var40 >= 0 && var9 >= 0 && var40 < 104 && var9 < 104) { // L: 7086 - class280.updatePendingSpawn(ParamComposition.Client_plane, var40, var9, var6, var37, var4, var38, 0, -1); // L: 7087 - } - - } else if (class225.field2679 == var0) { // L: 7091 - var37 = var1.method6490(); // L: 7092 - var3 = var1.method6476() * 4; // L: 7093 - byte var39 = var1.method6526(); // L: 7094 - var38 = var1.method6477() * 4; // L: 7095 - var6 = var1.method6478(); // L: 7096 - var7 = (var6 >> 4 & 7) + class7.field66; // L: 7097 - var40 = (var6 & 7) + VarpDefinition.field1542; // L: 7098 - var9 = var1.method6478(); // L: 7099 - var10 = var1.method6486(); // L: 7100 - byte var41 = var1.method6526(); // L: 7101 - var12 = var1.method6648(); // L: 7102 - var13 = var1.readUnsignedShort(); // L: 7103 - var14 = var1.method6476(); // L: 7104 - var11 = var41 + var7; // L: 7105 - var4 = var39 + var40; // L: 7106 - if (var7 >= 0 && var40 >= 0 && var7 < 104 && var40 < 104 && var11 >= 0 && var4 >= 0 && var11 < 104 && var4 < 104 && var13 != 65535) { // L: 7107 - var7 = var7 * 128 + 64; // L: 7108 - var40 = var40 * 128 + 64; // L: 7109 - var11 = var11 * 128 + 64; // L: 7110 - var4 = var4 * 128 + 64; // L: 7111 - Projectile var36 = new Projectile(var13, ParamComposition.Client_plane, var7, var40, SceneTilePaint.getTileHeight(var7, var40, ParamComposition.Client_plane) - var3, var12 + Client.cycle, var10 + Client.cycle, var9, var14, var37, var38); // L: 7112 - var36.setDestination(var11, var4, SceneTilePaint.getTileHeight(var11, var4, ParamComposition.Client_plane) - var38, var12 + Client.cycle); // L: 7113 - Client.projectiles.addFirst(var36); // L: 7114 - } - - } else if (class225.field2674 == var0) { // L: 7118 - var37 = var1.method6620(); // L: 7119 - var3 = var1.method6486(); // L: 7120 - var4 = var1.method6620(); // L: 7121 - var38 = var1.readUnsignedByte(); // L: 7122 - var6 = (var38 >> 4 & 7) + class7.field66; // L: 7123 - var7 = (var38 & 7) + VarpDefinition.field1542; // L: 7124 - if (var6 >= 0 && var7 >= 0 && var6 < 104 && var7 < 104) { // L: 7125 - NodeDeque var42 = Client.groundItems[ParamComposition.Client_plane][var6][var7]; // L: 7126 - if (var42 != null) { // L: 7127 - for (TileItem var35 = (TileItem)var42.last(); var35 != null; var35 = (TileItem)var42.previous()) { // L: 7128 7129 7134 - if ((var4 & 32767) == var35.id && var3 == var35.quantity) { // L: 7130 - var35.quantity = var37; // L: 7131 - break; - } - } - - Varcs.updateItemPile(var6, var7); // L: 7136 - } - } - - } else { - if (class225.field2678 == var0) { // L: 7141 - var37 = var1.method6476(); // L: 7142 - var3 = (var37 >> 4 & 7) + class7.field66; // L: 7143 - var4 = (var37 & 7) + VarpDefinition.field1542; // L: 7144 - var38 = var1.method6476(); // L: 7145 - var6 = var1.readUnsignedByte(); // L: 7146 - var7 = var6 >> 4 & 15; // L: 7147 - var40 = var6 & 7; // L: 7148 - var9 = var1.method6620(); // L: 7149 - if (var3 >= 0 && var4 >= 0 && var3 < 104 && var4 < 104) { // L: 7150 - var10 = var7 + 1; // L: 7151 - if (class35.localPlayer.pathX[0] >= var3 - var10 && class35.localPlayer.pathX[0] <= var3 + var10 && class35.localPlayer.pathY[0] >= var4 - var10 && class35.localPlayer.pathY[0] <= var10 + var4 && class12.clientPreferences.areaSoundEffectsVolume != 0 && var40 > 0 && Client.soundEffectCount < 50) { // L: 7152 7153 - Client.soundEffectIds[Client.soundEffectCount] = var9; // L: 7154 - Client.queuedSoundEffectLoops[Client.soundEffectCount] = var40; // L: 7155 - Client.queuedSoundEffectDelays[Client.soundEffectCount] = var38; // L: 7156 - Client.soundEffects[Client.soundEffectCount] = null; // L: 7157 - Client.soundLocations[Client.soundEffectCount] = var7 + (var4 << 8) + (var3 << 16); // L: 7158 - ++Client.soundEffectCount; // L: 7159 - } - } - } - - if (class225.field2680 == var0) { // L: 7164 - var37 = var1.method6477(); // L: 7165 - var3 = (var37 >> 4 & 7) + class7.field66; // L: 7166 - var4 = (var37 & 7) + VarpDefinition.field1542; // L: 7167 - var38 = var1.method6648(); // L: 7168 - var6 = var1.method6478(); // L: 7169 - var7 = var6 >> 2; // L: 7170 - var40 = var6 & 3; // L: 7171 - var9 = Client.field677[var7]; // L: 7172 - if (var3 >= 0 && var4 >= 0 && var3 < 103 && var4 < 103) { // L: 7173 - if (var9 == 0) { // L: 7174 - BoundaryObject var34 = class5.scene.method3960(ParamComposition.Client_plane, var3, var4); // L: 7175 - if (var34 != null) { // L: 7176 - var11 = class6.Entity_unpackID(var34.tag); // L: 7177 - if (var7 == 2) { // L: 7178 - var34.renderable1 = new DynamicObject(var11, 2, var40 + 4, ParamComposition.Client_plane, var3, var4, var38, false, var34.renderable1); // L: 7179 - var34.renderable2 = new DynamicObject(var11, 2, var40 + 1 & 3, ParamComposition.Client_plane, var3, var4, var38, false, var34.renderable2); // L: 7180 - } else { - var34.renderable1 = new DynamicObject(var11, var7, var40, ParamComposition.Client_plane, var3, var4, var38, false, var34.renderable1); // L: 7182 - } - } - } - - if (var9 == 1) { // L: 7185 - WallDecoration var43 = class5.scene.method3924(ParamComposition.Client_plane, var3, var4); // L: 7186 - if (var43 != null) { // L: 7187 - var11 = class6.Entity_unpackID(var43.tag); // L: 7188 - if (var7 != 4 && var7 != 5) { // L: 7189 - if (var7 == 6) { // L: 7190 - var43.renderable1 = new DynamicObject(var11, 4, var40 + 4, ParamComposition.Client_plane, var3, var4, var38, false, var43.renderable1); - } else if (var7 == 7) { // L: 7191 - var43.renderable1 = new DynamicObject(var11, 4, (var40 + 2 & 3) + 4, ParamComposition.Client_plane, var3, var4, var38, false, var43.renderable1); - } else if (var7 == 8) { // L: 7192 - var43.renderable1 = new DynamicObject(var11, 4, var40 + 4, ParamComposition.Client_plane, var3, var4, var38, false, var43.renderable1); // L: 7193 - var43.renderable2 = new DynamicObject(var11, 4, (var40 + 2 & 3) + 4, ParamComposition.Client_plane, var3, var4, var38, false, var43.renderable2); // L: 7194 - } - } else { - var43.renderable1 = new DynamicObject(var11, 4, var40, ParamComposition.Client_plane, var3, var4, var38, false, var43.renderable1); - } - } - } - - if (var9 == 2) { // L: 7198 - GameObject var44 = class5.scene.method3925(ParamComposition.Client_plane, var3, var4); // L: 7199 - if (var7 == 11) { // L: 7200 - var7 = 10; - } - - if (var44 != null) { // L: 7201 - var44.renderable = new DynamicObject(class6.Entity_unpackID(var44.tag), var7, var40, ParamComposition.Client_plane, var3, var4, var38, false, var44.renderable); - } - } - - if (var9 == 3) { // L: 7203 - FloorDecoration var45 = class5.scene.getFloorDecoration(ParamComposition.Client_plane, var3, var4); // L: 7204 - if (var45 != null) { // L: 7205 - var45.renderable = new DynamicObject(class6.Entity_unpackID(var45.tag), 22, var40, ParamComposition.Client_plane, var3, var4, var38, false, var45.renderable); - } - } - } - - } else { - TileItem var32; - if (class225.field2677 == var0) { // L: 7210 - var37 = var1.method6648(); // L: 7211 - var3 = var1.readUnsignedShort(); // L: 7212 - var4 = var1.readUnsignedByte(); // L: 7213 - var38 = (var4 >> 4 & 7) + class7.field66; // L: 7214 - var6 = (var4 & 7) + VarpDefinition.field1542; // L: 7215 - if (var38 >= 0 && var6 >= 0 && var38 < 104 && var6 < 104) { // L: 7216 - var32 = new TileItem(); // L: 7217 - var32.id = var3; // L: 7218 - var32.quantity = var37; // L: 7219 - if (Client.groundItems[ParamComposition.Client_plane][var38][var6] == null) { // L: 7220 - Client.groundItems[ParamComposition.Client_plane][var38][var6] = new NodeDeque(); - } - - Client.groundItems[ParamComposition.Client_plane][var38][var6].addFirst(var32); // L: 7221 - Varcs.updateItemPile(var38, var6); // L: 7222 - } - - } else if (class225.field2673 == var0) { // L: 7226 - var37 = var1.method6476(); // L: 7227 - var3 = var37 >> 2; // L: 7228 - var4 = var37 & 3; // L: 7229 - var38 = Client.field677[var3]; // L: 7230 - var6 = var1.method6476(); // L: 7231 - var7 = (var6 >> 4 & 7) + class7.field66; // L: 7232 - var40 = (var6 & 7) + VarpDefinition.field1542; // L: 7233 - if (var7 >= 0 && var40 >= 0 && var7 < 104 && var40 < 104) { // L: 7234 - class280.updatePendingSpawn(ParamComposition.Client_plane, var7, var40, var38, -1, var3, var4, 0, -1); // L: 7235 - } - - } else if (class225.field2682 == var0) { // L: 7239 - var37 = var1.readUnsignedShort(); // L: 7240 - var3 = var1.method6476(); // L: 7241 - var4 = var1.method6476(); // L: 7242 - var38 = (var4 >> 4 & 7) + class7.field66; // L: 7243 - var6 = (var4 & 7) + VarpDefinition.field1542; // L: 7244 - var7 = var1.method6648(); // L: 7245 - if (var38 >= 0 && var6 >= 0 && var38 < 104 && var6 < 104) { // L: 7246 - var38 = var38 * 128 + 64; // L: 7247 - var6 = var6 * 128 + 64; // L: 7248 - GraphicsObject var33 = new GraphicsObject(var37, ParamComposition.Client_plane, var38, var6, SceneTilePaint.getTileHeight(var38, var6, ParamComposition.Client_plane) - var3, var7, Client.cycle); // L: 7249 - Client.graphicsObjects.addFirst(var33); // L: 7250 - } - - } else if (class225.field2687 == var0) { // L: 7254 - var37 = var1.readUnsignedShort(); // L: 7255 - var3 = var1.method6476(); // L: 7256 - var4 = (var3 >> 4 & 7) + class7.field66; // L: 7257 - var38 = (var3 & 7) + VarpDefinition.field1542; // L: 7258 - if (var4 >= 0 && var38 >= 0 && var4 < 104 && var38 < 104) { // L: 7259 - NodeDeque var31 = Client.groundItems[ParamComposition.Client_plane][var4][var38]; // L: 7260 - if (var31 != null) { // L: 7261 - for (var32 = (TileItem)var31.last(); var32 != null; var32 = (TileItem)var31.previous()) { // L: 7262 7263 7268 - if ((var37 & 32767) == var32.id) { // L: 7264 - var32.remove(); // L: 7265 - break; - } - } - - if (var31.last() == null) { // L: 7270 - Client.groundItems[ParamComposition.Client_plane][var4][var38] = null; - } - - Varcs.updateItemPile(var4, var38); // L: 7271 - } - } - - } - } - } - } // L: 7089 7116 7139 7208 7224 7237 7252 7274 7276 + public static final void method225(PlayerProvider var0) { + class26.pcmPlayerProvider = var0; // L: 45 + } // L: 46 } diff --git a/runescape-client/src/main/java/class2.java b/runescape-client/src/main/java/class2.java index 3bd4f63777..9f7a1ee51c 100644 --- a/runescape-client/src/main/java/class2.java +++ b/runescape-client/src/main/java/class2.java @@ -1,426 +1,330 @@ -import java.io.ByteArrayInputStream; -import java.io.IOException; -import java.io.InvalidClassException; -import java.io.ObjectInputStream; -import java.io.OptionalDataException; -import java.io.StreamCorruptedException; -import java.lang.reflect.Field; -import java.lang.reflect.InvocationTargetException; -import java.lang.reflect.Method; import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -import net.runelite.rs.Reflection; -@ObfuscatedName("o") +@ObfuscatedName("f") public class class2 { - @ObfuscatedName("rm") - @ObfuscatedGetter( - intValue = 1803015327 - ) - static int field18; - @ObfuscatedName("ot") + @ObfuscatedName("l") @ObfuscatedSignature( - descriptor = "Ldb;" + descriptor = "Lie;" ) - @Export("mouseWheel") - static MouseWheel mouseWheel; - @ObfuscatedName("h") + @Export("musicTrack") + public static MusicTrack musicTrack; + @ObfuscatedName("v") @ObfuscatedGetter( - longValue = -3980940730251975189L + longValue = 4932681583424374285L ) - long field23; - @ObfuscatedName("c") + long field21; + @ObfuscatedName("n") @ObfuscatedGetter( - intValue = -161660797 + intValue = -2049607965 ) - int field19; - @ObfuscatedName("o") + int field13; + @ObfuscatedName("f") @ObfuscatedSignature( - descriptor = "Lko;" + descriptor = "Lki;" ) - IterableNodeDeque field22; + IterableNodeDeque field14; @ObfuscatedSignature( - descriptor = "(Lnk;)V" + descriptor = "(Lnd;)V" ) public class2(Buffer var1) { - this.field19 = -1; // L: 9 - this.field22 = new IterableNodeDeque(); // L: 10 - this.method22(var1); // L: 28 + this.field13 = -1; // L: 9 + this.field14 = new IterableNodeDeque(); // L: 10 + this.method19(var1); // L: 28 } // L: 29 - @ObfuscatedName("h") + @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "(Lnk;I)V", - garbageValue = "2001634742" + descriptor = "(Lnd;I)V", + garbageValue = "1835710687" ) - void method22(Buffer var1) { - this.field23 = var1.readLong(); // L: 32 - this.field19 = var1.readInt(); // L: 33 + void method19(Buffer var1) { + this.field21 = var1.readLong(); // L: 32 + this.field13 = var1.readInt(); // L: 33 - for (int var2 = var1.readUnsignedByte(); var2 != 0; var2 = var1.readUnsignedByte()) { // L: 34 + for (int var2 = var1.readUnsignedByte(); var2 != 0; var2 = var1.readUnsignedByte()) { // L: 34 35 55 Object var3; - if (var2 == 3) { + if (var2 == 3) { // L: 37 var3 = new class13(this); - } else if (var2 == 1) { + } else if (var2 == 1) { // L: 38 var3 = new class8(this); - } else if (var2 == 13) { + } else if (var2 == 13) { // L: 39 var3 = new class26(this); - } else if (var2 == 4) { + } else if (var2 == 4) { // L: 40 var3 = new class17(this); } else if (var2 == 6) { - var3 = new class10(this); + var3 = new class10(this); // L: 41 } else if (var2 == 5) { // L: 42 var3 = new class22(this); } else if (var2 == 2) { // L: 43 var3 = new class23(this); } else if (var2 == 7) { // L: 44 var3 = new class21(this); - } else if (var2 == 14) { + } else if (var2 == 14) { // L: 45 var3 = new class18(this); - } else if (var2 == 8) { + } else if (var2 == 8) { // L: 46 var3 = new class6(this); - } else if (var2 == 9) { + } else if (var2 == 9) { // L: 47 var3 = new class0(this); - } else if (var2 == 10) { + } else if (var2 == 10) { // L: 48 var3 = new class4(this); - } else if (var2 == 11) { + } else if (var2 == 11) { // L: 49 var3 = new class1(this); - } else if (var2 == 12) { + } else if (var2 == 12) { // L: 50 var3 = new class15(this); } else { if (var2 != 15) { // L: 51 - throw new RuntimeException(""); + throw new RuntimeException(""); // L: 52 } var3 = new class27(this); } - ((class14)var3).vmethod339(var1); - this.field22.addFirst((Node)var3); + ((class14)var3).vmethod276(var1); // L: 53 + this.field14.addFirst((Node)var3); // L: 54 } - } + } // L: 57 - @ObfuscatedName("c") + @ObfuscatedName("n") @ObfuscatedSignature( - descriptor = "(Lx;B)V", - garbageValue = "62" + descriptor = "(Ll;I)V", + garbageValue = "-184881258" ) - public void method25(class11 var1) { - if (var1.field103 == this.field23 && this.field19 == var1.field90) { - for (class14 var2 = (class14)this.field22.last(); var2 != null; var2 = (class14)this.field22.previous()) { - var2.vmethod338(var1); // L: 62 + public void method16(ClanSettings var1) { + if (var1.field109 == this.field21 && this.field13 == var1.field94) { // L: 60 + for (class14 var2 = (class14)this.field14.last(); var2 != null; var2 = (class14)this.field14.previous()) { // L: 61 + var2.vmethod281(var1); // L: 62 } - ++var1.field90; + ++var1.field94; // L: 64 } else { throw new RuntimeException(""); } - } + } // L: 65 - @ObfuscatedName("o") + @ObfuscatedName("gg") @ObfuscatedSignature( - descriptor = "(Lnm;I)V", - garbageValue = "158273003" + descriptor = "(Lcy;B)V", + garbageValue = "0" ) - @Export("performReflectionCheck") - public static void performReflectionCheck(PacketBuffer var0) { - ReflectionCheck var1 = (ReflectionCheck)class69.reflectionChecks.last(); // L: 35 - if (var1 != null) { // L: 36 - int var2 = var0.offset; // L: 37 - var0.writeInt(var1.id); // L: 38 + static final void method21(Actor var0) { + if (var0.field1283 == Client.cycle || var0.sequence == -1 || var0.sequenceDelay != 0 || var0.sequenceFrameCycle + 1 > LoginScreenAnimation.SequenceDefinition_get(var0.sequence).frameLengths[var0.sequenceFrame]) { // L: 3647 + int var1 = var0.field1283 - var0.field1265; // L: 3648 + int var2 = Client.cycle - var0.field1265; // L: 3649 + int var3 = var0.field1239 * 64 + var0.field1278 * 128; // L: 3650 + int var4 = var0.field1239 * 64 + var0.field1280 * 128; // L: 3651 + int var5 = var0.field1239 * 64 + var0.field1269 * 128; // L: 3652 + int var6 = var0.field1239 * 64 + var0.field1238 * 128; // L: 3653 + var0.x = (var5 * var2 + var3 * (var1 - var2)) / var1; // L: 3654 + var0.y = (var2 * var6 + var4 * (var1 - var2)) / var1; // L: 3655 + } - for (int var3 = 0; var3 < var1.size; ++var3) { // L: 39 - if (var1.creationErrors[var3] != 0) { // L: 40 - var0.writeByte(var1.creationErrors[var3]); // L: 41 - } else { - try { - int var4 = var1.operations[var3]; // L: 45 - Field var5; - int var6; - if (var4 == 0) { // L: 46 - var5 = var1.fields[var3]; // L: 47 - var6 = Reflection.getInt(var5, (Object)null); // L: 48 - var0.writeByte(0); // L: 49 - var0.writeInt(var6); // L: 50 - } else if (var4 == 1) { // L: 52 - var5 = var1.fields[var3]; // L: 53 - Reflection.setInt(var5, (Object)null, var1.intReplaceValues[var3]); // L: 54 - var0.writeByte(0); // L: 55 - } else if (var4 == 2) { // L: 57 - var5 = var1.fields[var3]; // L: 58 - var6 = var5.getModifiers(); // L: 59 - var0.writeByte(0); // L: 60 - var0.writeInt(var6); // L: 61 + var0.field1294 = 0; // L: 3657 + var0.orientation = var0.field1284; // L: 3658 + var0.rotation = var0.orientation; // L: 3659 + } // L: 3660 + + @ObfuscatedName("im") + @ObfuscatedSignature( + descriptor = "(IIIII)V", + garbageValue = "-1987725219" + ) + @Export("addSceneMenuOptions") + static final void addSceneMenuOptions(int var0, int var1, int var2, int var3) { + if (Client.isItemSelected == 0 && !Client.isSpellSelected) { // L: 8855 + Occluder.insertMenuItemNoShift("Walk here", "", 23, 0, var0 - var2, var1 - var3); // L: 8856 + } + + long var4 = -1L; // L: 8859 + long var6 = -1L; // L: 8860 + + int var8; + for (var8 = 0; var8 < ItemComposition.method3084(); ++var8) { // L: 8861 + long var22 = HealthBarDefinition.method2720(var8); // L: 8862 + if (var22 != var6) { // L: 8863 + var6 = var22; // L: 8864 + int var11 = class5.method58(var8); // L: 8865 + int var12 = GrandExchangeOfferOwnWorldComparator.method1166(var8); // L: 8866 + int var13 = class261.method4842(var8); // L: 8867 + int var14 = class93.Entity_unpackID(ViewportMouse.ViewportMouse_entityTags[var8]); // L: 8870 + int var15 = var14; // L: 8872 + if (var13 == 2 && AbstractSocket.scene.getObjectFlags(class22.Client_plane, var11, var12, var22) >= 0) { // L: 8873 8874 + ObjectComposition var16 = class23.getObjectDefinition(var14); // L: 8875 + if (var16.transforms != null) { // L: 8876 + var16 = var16.transform(); + } + + if (var16 == null) { // L: 8877 + continue; + } + + if (Client.isItemSelected == 1) { // L: 8878 + Occluder.insertMenuItemNoShift("Use", Client.selectedItemName + " " + "->" + " " + class44.colorStartTag(65535) + var16.name, 1, var14, var11, var12); // L: 8879 + } else if (Client.isSpellSelected) { // L: 8882 + if ((class4.selectedSpellFlags & 4) == 4) { // L: 8883 + Occluder.insertMenuItemNoShift(Client.selectedSpellActionName, Client.selectedSpellName + " " + "->" + " " + class44.colorStartTag(65535) + var16.name, 2, var14, var11, var12); // L: 8884 + } + } else { + String[] var17 = var16.actions; // L: 8889 + if (var17 != null) { // L: 8890 + for (int var18 = 4; var18 >= 0; --var18) { // L: 8891 + if (var17[var18] != null) { // L: 8892 + short var19 = 0; // L: 8893 + if (var18 == 0) { // L: 8894 + var19 = 3; + } + + if (var18 == 1) { // L: 8895 + var19 = 4; + } + + if (var18 == 2) { // L: 8896 + var19 = 5; + } + + if (var18 == 3) { // L: 8897 + var19 = 6; + } + + if (var18 == 4) { // L: 8898 + var19 = 1001; + } + + Occluder.insertMenuItemNoShift(var17[var18], class44.colorStartTag(65535) + var16.name, var19, var15, var11, var12); // L: 8899 + } + } } - Method var25; - if (var4 != 3) { // L: 63 - if (var4 == 4) { // L: 83 - var25 = var1.methods[var3]; // L: 84 - var6 = var25.getModifiers(); // L: 85 - var0.writeByte(0); // L: 86 - var0.writeInt(var6); // L: 87 - } - } else { - var25 = var1.methods[var3]; // L: 64 - byte[][] var10 = var1.arguments[var3]; // L: 65 - Object[] var7 = new Object[var10.length]; // L: 66 - - for (int var8 = 0; var8 < var10.length; ++var8) { // L: 67 - ObjectInputStream var9 = new ObjectInputStream(new ByteArrayInputStream(var10[var8])); // L: 68 - var7[var8] = var9.readObject(); // L: 69 - } - - Object var11 = Reflection.invoke(var25, (Object)null, var7); // L: 71 - if (var11 == null) { // L: 72 - var0.writeByte(0); - } else if (var11 instanceof Number) { // L: 73 - var0.writeByte(1); // L: 74 - var0.writeLong(((Number)var11).longValue()); // L: 75 - } else if (var11 instanceof String) { // L: 77 - var0.writeByte(2); // L: 78 - var0.writeStringCp1252NullTerminated((String)var11); // L: 79 - } else { - var0.writeByte(4); // L: 81 - } - } - } catch (ClassNotFoundException var13) { // L: 90 - var0.writeByte(-10); // L: 91 - } catch (InvalidClassException var14) { // L: 93 - var0.writeByte(-11); // L: 94 - } catch (StreamCorruptedException var15) { // L: 96 - var0.writeByte(-12); // L: 97 - } catch (OptionalDataException var16) { // L: 99 - var0.writeByte(-13); // L: 100 - } catch (IllegalAccessException var17) { // L: 102 - var0.writeByte(-14); // L: 103 - } catch (IllegalArgumentException var18) { // L: 105 - var0.writeByte(-15); // L: 106 - } catch (InvocationTargetException var19) { // L: 108 - var0.writeByte(-16); // L: 109 - } catch (SecurityException var20) { // L: 111 - var0.writeByte(-17); // L: 112 - } catch (IOException var21) { // L: 114 - var0.writeByte(-18); // L: 115 - } catch (NullPointerException var22) { // L: 117 - var0.writeByte(-19); // L: 118 - } catch (Exception var23) { // L: 120 - var0.writeByte(-20); // L: 121 - } catch (Throwable var24) { // L: 123 - var0.writeByte(-21); // L: 124 + Occluder.insertMenuItemNoShift("Examine", class44.colorStartTag(65535) + var16.name, 1002, var16.id, var11, var12); // L: 8904 } } - } - var0.writeCrc(var2); // L: 127 - var1.remove(); // L: 128 - } - } // L: 129 - - @ObfuscatedName("g") - @ObfuscatedSignature( - descriptor = "(IB)Z", - garbageValue = "-56" - ) - public static boolean method28(int var0) { - return (var0 >> 20 & 1) != 0; // L: 21 - } - - @ObfuscatedName("j") - @ObfuscatedSignature( - descriptor = "(B)V", - garbageValue = "2" - ) - public static void method26() { - ItemComposition.ItemDefinition_cachedSprites.clear(); // L: 537 - } // L: 538 - - @ObfuscatedName("jw") - @ObfuscatedSignature( - descriptor = "(Liv;IIB)V", - garbageValue = "23" - ) - @Export("Widget_addToMenu") - static final void Widget_addToMenu(Widget var0, int var1, int var2) { - if (var0.buttonType == 1) { // L: 10283 - InterfaceParent.insertMenuItemNoShift(var0.buttonText, "", 24, 0, 0, var0.id); // L: 10284 - } - - String var3; - if (var0.buttonType == 2 && !Client.isSpellSelected) { // L: 10287 - var3 = UserComparator9.Widget_getSpellActionName(var0); // L: 10288 - if (var3 != null) { // L: 10289 - InterfaceParent.insertMenuItemNoShift(var3, HorizontalAlignment.colorStartTag(65280) + var0.spellName, 25, 0, -1, var0.id); // L: 10290 - } - } - - if (var0.buttonType == 3) { // L: 10294 - InterfaceParent.insertMenuItemNoShift("Close", "", 26, 0, 0, var0.id); // L: 10295 - } - - if (var0.buttonType == 4) { // L: 10298 - InterfaceParent.insertMenuItemNoShift(var0.buttonText, "", 28, 0, 0, var0.id); // L: 10299 - } - - if (var0.buttonType == 5) { // L: 10302 - InterfaceParent.insertMenuItemNoShift(var0.buttonText, "", 29, 0, 0, var0.id); // L: 10303 - } - - if (var0.buttonType == 6 && Client.meslayerContinueWidget == null) { // L: 10306 - InterfaceParent.insertMenuItemNoShift(var0.buttonText, "", 30, 0, -1, var0.id); // L: 10307 - } - - int var4; - int var13; - if (var0.type == 2) { // L: 10310 - var13 = 0; // L: 10311 - - for (var4 = 0; var4 < var0.height; ++var4) { // L: 10312 - for (int var15 = 0; var15 < var0.width; ++var15) { // L: 10313 - int var16 = (var0.paddingX + 32) * var15; // L: 10314 - int var7 = (var0.paddingY + 32) * var4; // L: 10315 - if (var13 < 20) { // L: 10316 - var16 += var0.inventoryXOffsets[var13]; // L: 10317 - var7 += var0.inventoryYOffsets[var13]; // L: 10318 + Player var20; + int var24; + NPC var25; + int var32; + int[] var33; + if (var13 == 1) { // L: 8909 + NPC var28 = Client.npcs[var15]; // L: 8910 + if (var28 == null) { // L: 8911 + continue; } - if (var1 >= var16 && var2 >= var7 && var1 < var16 + 32 && var2 < var7 + 32) { // L: 10320 - Client.dragItemSlotDestination = var13; // L: 10321 - NPCComposition.hoveredItemContainer = var0; // L: 10322 - if (var0.itemIds[var13] > 0) { // L: 10323 - ItemComposition var8 = Strings.ItemDefinition_get(var0.itemIds[var13] - 1); // L: 10324 - if (Client.isItemSelected == 1 && Varcs.method2329(class26.getWidgetFlags(var0))) { // L: 10325 - if (var0.id != class35.selectedItemWidget || var13 != UserComparator8.selectedItemSlot) { // L: 10326 - InterfaceParent.insertMenuItemNoShift("Use", Client.selectedItemName + " " + "->" + " " + HorizontalAlignment.colorStartTag(16748608) + var8.name, 31, var8.id, var13, var0.id); // L: 10327 - } - } else if (Client.isSpellSelected && Varcs.method2329(class26.getWidgetFlags(var0))) { // L: 10331 - if ((GrandExchangeOfferUnitPriceComparator.selectedSpellFlags & 16) == 16) { // L: 10332 - InterfaceParent.insertMenuItemNoShift(Client.selectedSpellActionName, Client.selectedSpellName + " " + "->" + " " + HorizontalAlignment.colorStartTag(16748608) + var8.name, 32, var8.id, var13, var0.id); // L: 10333 + if (var28.definition.size == 1 && (var28.x & 127) == 64 && (var28.y & 127) == 64) { // L: 8912 + for (var24 = 0; var24 < Client.npcCount; ++var24) { // L: 8913 + var25 = Client.npcs[Client.npcIndices[var24]]; // L: 8914 + if (var25 != null && var28 != var25 && var25.definition.size == 1 && var25.x == var28.x && var25.y == var28.y) { // L: 8915 + class35.addNpcToMenu(var25.definition, Client.npcIndices[var24], var11, var12); + } + } + + var24 = Players.Players_count; // L: 8917 + var33 = Players.Players_indices; // L: 8918 + + for (var32 = 0; var32 < var24; ++var32) { // L: 8919 + var20 = Client.players[var33[var32]]; // L: 8920 + if (var20 != null && var20.x == var28.x && var28.y == var20.y) { // L: 8921 + HitSplatDefinition.addPlayerToMenu(var20, var33[var32], var11, var12); + } + } + } + + class35.addNpcToMenu(var28.definition, var15, var11, var12); // L: 8924 + } + + if (var13 == 0) { // L: 8926 + Player var29 = Client.players[var15]; // L: 8927 + if (var29 == null) { // L: 8928 + continue; + } + + if ((var29.x & 127) == 64 && (var29.y & 127) == 64) { // L: 8929 + for (var24 = 0; var24 < Client.npcCount; ++var24) { // L: 8930 + var25 = Client.npcs[Client.npcIndices[var24]]; // L: 8931 + if (var25 != null && var25.definition.size == 1 && var29.x == var25.x && var25.y == var29.y) { // L: 8932 + class35.addNpcToMenu(var25.definition, Client.npcIndices[var24], var11, var12); + } + } + + var24 = Players.Players_count; // L: 8934 + var33 = Players.Players_indices; // L: 8935 + + for (var32 = 0; var32 < var24; ++var32) { // L: 8936 + var20 = Client.players[var33[var32]]; // L: 8937 + if (var20 != null && var20 != var29 && var29.x == var20.x && var29.y == var20.y) { // L: 8938 + HitSplatDefinition.addPlayerToMenu(var20, var33[var32], var11, var12); + } + } + } + + if (var15 != Client.combatTargetPlayerIndex) { // L: 8941 + HitSplatDefinition.addPlayerToMenu(var29, var15, var11, var12); + } else { + var4 = var22; // L: 8942 + } + } + + if (var13 == 3) { // L: 8944 + NodeDeque var31 = Client.groundItems[class22.Client_plane][var11][var12]; // L: 8945 + if (var31 != null) { // L: 8946 + for (TileItem var30 = (TileItem)var31.first(); var30 != null; var30 = (TileItem)var31.next()) { // L: 8947 8948 8981 + ItemComposition var34 = class260.ItemDefinition_get(var30.id); // L: 8949 + if (Client.isItemSelected == 1) { // L: 8950 + Occluder.insertMenuItemNoShift("Use", Client.selectedItemName + " " + "->" + " " + class44.colorStartTag(16748608) + var34.name, 16, var30.id, var11, var12); // L: 8951 + } else if (Client.isSpellSelected) { // L: 8954 + if ((class4.selectedSpellFlags & 1) == 1) { // L: 8955 + Occluder.insertMenuItemNoShift(Client.selectedSpellActionName, Client.selectedSpellName + " " + "->" + " " + class44.colorStartTag(16748608) + var34.name, 17, var30.id, var11, var12); // L: 8956 } } else { - String[] var9 = var8.inventoryActions; // L: 10338 - int var10 = -1; // L: 10339 - if (Client.shiftClickDrop && class13.method213()) { // L: 10340 - var10 = var8.getShiftClickIndex(); // L: 10341 - } + String[] var26 = var34.groundActions; // L: 8961 - int var11; - if (Varcs.method2329(class26.getWidgetFlags(var0))) { // L: 10343 - for (var11 = 4; var11 >= 3; --var11) { // L: 10344 - if (var10 != var11) { // L: 10345 - class32.addWidgetItemMenuItem(var0, var8, var13, var11, false); // L: 10346 + for (int var27 = 4; var27 >= 0; --var27) { // L: 8962 + if (var26 != null && var26[var27] != null) { // L: 8963 + byte var21 = 0; // L: 8964 + if (var27 == 0) { // L: 8965 + var21 = 18; } - } - } - if (WorldMapIcon_0.method3509(class26.getWidgetFlags(var0))) { // L: 10349 - InterfaceParent.insertMenuItemNoShift("Use", HorizontalAlignment.colorStartTag(16748608) + var8.name, 38, var8.id, var13, var0.id); // L: 10350 - } - - if (Varcs.method2329(class26.getWidgetFlags(var0))) { // L: 10353 - for (var11 = 2; var11 >= 0; --var11) { // L: 10354 - if (var10 != var11) { // L: 10355 - class32.addWidgetItemMenuItem(var0, var8, var13, var11, false); // L: 10356 + if (var27 == 1) { // L: 8966 + var21 = 19; } - } - if (var10 >= 0) { // L: 10358 - class32.addWidgetItemMenuItem(var0, var8, var13, var10, true); // L: 10359 - } - } - - var9 = var0.itemActions; // L: 10362 - if (var9 != null) { // L: 10363 - for (var11 = 4; var11 >= 0; --var11) { // L: 10364 - if (var9[var11] != null) { // L: 10365 - byte var12 = 0; // L: 10366 - if (var11 == 0) { // L: 10367 - var12 = 39; - } - - if (var11 == 1) { // L: 10368 - var12 = 40; - } - - if (var11 == 2) { // L: 10369 - var12 = 41; - } - - if (var11 == 3) { // L: 10370 - var12 = 42; - } - - if (var11 == 4) { // L: 10371 - var12 = 43; - } - - InterfaceParent.insertMenuItemNoShift(var9[var11], HorizontalAlignment.colorStartTag(16748608) + var8.name, var12, var8.id, var13, var0.id); // L: 10372 + if (var27 == 2) { // L: 8967 + var21 = 20; } + + if (var27 == 3) { // L: 8968 + var21 = 21; + } + + if (var27 == 4) { // L: 8969 + var21 = 22; + } + + Occluder.insertMenuItemNoShift(var26[var27], class44.colorStartTag(16748608) + var34.name, var21, var30.id, var11, var12); // L: 8970 + } else if (var27 == 2) { // L: 8973 + Occluder.insertMenuItemNoShift("Take", class44.colorStartTag(16748608) + var34.name, 20, var30.id, var11, var12); // L: 8974 } } - InterfaceParent.insertMenuItemNoShift("Examine", HorizontalAlignment.colorStartTag(16748608) + var8.name, 1005, var8.id, var13, var0.id); // L: 10377 + Occluder.insertMenuItemNoShift("Examine", class44.colorStartTag(16748608) + var34.name, 1004, var30.id, var11, var12); // L: 8978 } } } - - ++var13; // L: 10382 } } } - if (var0.isIf3) { // L: 10386 - if (Client.isSpellSelected) { // L: 10387 - var4 = class26.getWidgetFlags(var0); // L: 10389 - boolean var17 = (var4 >> 21 & 1) != 0; // L: 10391 - if (var17 && (GrandExchangeOfferUnitPriceComparator.selectedSpellFlags & 32) == 32) { // L: 10393 - InterfaceParent.insertMenuItemNoShift(Client.selectedSpellActionName, Client.selectedSpellName + " " + "->" + " " + var0.dataText, 58, 0, var0.childIndex, var0.id); // L: 10394 - } - } else { - for (var13 = 9; var13 >= 5; --var13) { // L: 10399 - String var14; - if (!class125.method2507(class26.getWidgetFlags(var0), var13) && var0.onOp == null) { // L: 10402 - var14 = null; // L: 10403 - } else if (var0.actions != null && var0.actions.length > var13 && var0.actions[var13] != null && var0.actions[var13].trim().length() != 0) { // L: 10406 - var14 = var0.actions[var13]; // L: 10410 - } else { - var14 = null; // L: 10407 - } - - if (var14 != null) { // L: 10413 - InterfaceParent.insertMenuItemNoShift(var14, var0.dataText, 1007, var13 + 1, var0.childIndex, var0.id); // L: 10414 - } - } - - var3 = UserComparator9.Widget_getSpellActionName(var0); // L: 10418 - if (var3 != null) { // L: 10419 - InterfaceParent.insertMenuItemNoShift(var3, var0.dataText, 25, 0, var0.childIndex, var0.id); // L: 10420 - } - - for (var4 = 4; var4 >= 0; --var4) { // L: 10423 - String var5; - if (!class125.method2507(class26.getWidgetFlags(var0), var4) && var0.onOp == null) { // L: 10426 - var5 = null; // L: 10427 - } else if (var0.actions != null && var0.actions.length > var4 && var0.actions[var4] != null && var0.actions[var4].trim().length() != 0) { // L: 10430 - var5 = var0.actions[var4]; // L: 10434 - } else { - var5 = null; // L: 10431 - } - - if (var5 != null) { // L: 10437 - class311.insertMenuItem(var5, var0.dataText, 57, var4 + 1, var0.childIndex, var0.id, var0.prioritizeMenuEntry); // L: 10438 - } - } - - if (PacketWriter.method2410(class26.getWidgetFlags(var0))) { // L: 10442 - InterfaceParent.insertMenuItemNoShift("Continue", "", 30, 0, var0.childIndex, var0.id); // L: 10443 - } - } + if (var4 != -1L) { // L: 8986 + var8 = VarpDefinition.method2630(var4); // L: 8987 + int var9 = class229.method4374(var4); // L: 8988 + Player var10 = Client.players[Client.combatTargetPlayerIndex]; // L: 8989 + HitSplatDefinition.addPlayerToMenu(var10, Client.combatTargetPlayerIndex, var8, var9); // L: 8990 } - } // L: 10448 + } // L: 8992 } diff --git a/runescape-client/src/main/java/class20.java b/runescape-client/src/main/java/class20.java index cb9c95366b..610663fc10 100644 --- a/runescape-client/src/main/java/class20.java +++ b/runescape-client/src/main/java/class20.java @@ -3,281 +3,207 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("j") +@ObfuscatedName("z") public class class20 extends class16 { - @ObfuscatedName("k") - @Export("Tiles_hueMultiplier") - static int[] Tiles_hueMultiplier; - @ObfuscatedName("hb") - @ObfuscatedGetter( - intValue = 165647913 + @ObfuscatedName("j") + static byte[][][] field182; + @ObfuscatedName("b") + @ObfuscatedSignature( + descriptor = "Loh;" ) - @Export("cameraX") - static int cameraX; - @ObfuscatedName("h") + @Export("rightTitleSprite") + static SpritePixels rightTitleSprite; + @ObfuscatedName("d") + @Export("ByteArrayPool_arrays") + static byte[][][] ByteArrayPool_arrays; + @ObfuscatedName("es") @ObfuscatedGetter( - intValue = -614436395 + intValue = -318023015 ) - int field171; - @ObfuscatedName("c") - byte field168; - @ObfuscatedName("o") + static int field184; + @ObfuscatedName("v") @ObfuscatedGetter( - intValue = -869213719 + intValue = 1112467139 ) - int field169; - @ObfuscatedName("g") - String field167; + int field178; + @ObfuscatedName("n") + byte field172; + @ObfuscatedName("f") + @ObfuscatedGetter( + intValue = 500629175 + ) + int field173; + @ObfuscatedName("y") + String field174; // $FF: synthetic field @ObfuscatedSignature( - descriptor = "Lm;" + descriptor = "Lx;" ) final class19 this$0; @ObfuscatedSignature( - descriptor = "(Lm;)V" + descriptor = "(Lx;)V" ) class20(class19 var1) { this.this$0 = var1; - this.field171 = -1; // L: 100 + this.field178 = -1; // L: 100 } // L: 105 - @ObfuscatedName("h") + @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "(Lnk;S)V", - garbageValue = "4095" + descriptor = "(Lnd;I)V", + garbageValue = "68071115" ) - void vmethod326(Buffer var1) { - this.field171 = var1.readUnsignedShort(); // L: 108 - this.field168 = var1.readByte(); // L: 109 - this.field169 = var1.readUnsignedShort(); // L: 110 + void vmethod266(Buffer var1) { + this.field178 = var1.readUnsignedShort(); // L: 108 + this.field172 = var1.readByte(); // L: 109 + this.field173 = var1.readUnsignedShort(); // L: 110 var1.readLong(); // L: 111 - this.field167 = var1.readStringCp1252NullTerminated(); // L: 112 + this.field174 = var1.readStringCp1252NullTerminated(); // L: 112 } // L: 113 - @ObfuscatedName("c") + @ObfuscatedName("n") @ObfuscatedSignature( - descriptor = "(Lg;B)V", - garbageValue = "-61" + descriptor = "(Ly;I)V", + garbageValue = "-1846892157" ) - void vmethod314(class3 var1) { - class9 var2 = (class9)var1.field32.get(this.field171); // L: 116 - var2.field76 = this.field168; // L: 117 - var2.field80 = this.field169; // L: 118 - var2.field73 = this.field167; // L: 119 + void vmethod264(ClanChannel var1) { + ClanChannelMember var2 = (ClanChannelMember)var1.members.get(this.field178); // L: 116 + var2.rank = this.field172; // L: 117 + var2.world = this.field173; // L: 118 + var2.name = this.field174; // L: 119 } // L: 120 - @ObfuscatedName("c") + @ObfuscatedName("n") @ObfuscatedSignature( - descriptor = "(Ljava/lang/Throwable;Ljava/lang/String;)Lot;" + descriptor = "(I)Z", + garbageValue = "-912438388" ) - @Export("newRunException") - public static RunException newRunException(Throwable var0, String var1) { - RunException var2; - if (var0 instanceof RunException) { // L: 57 - var2 = (RunException)var0; // L: 58 - var2.message = var2.message + ' ' + var1; // L: 59 - } else { - var2 = new RunException(var0, var1); // L: 61 - } - - return var2; // L: 62 + public static boolean method231() { + ReflectionCheck var0 = (ReflectionCheck)class69.reflectionChecks.last(); // L: 28 + return var0 != null; // L: 29 } - @ObfuscatedName("hw") + @ObfuscatedName("n") @ObfuscatedSignature( - descriptor = "(IIIII)V", - garbageValue = "975727232" + descriptor = "(Ljava/lang/CharSequence;I)Z", + garbageValue = "-253899282" ) - static final void method272(int var0, int var1, int var2, int var3) { - Client.overheadTextCount = 0; // L: 5301 - boolean var4 = false; // L: 5302 - int var5 = -1; // L: 5303 - int var6 = -1; // L: 5304 - int var7 = Players.Players_count; // L: 5305 - int[] var8 = Players.Players_indices; // L: 5306 + @Export("isNumber") + public static boolean isNumber(CharSequence var0) { + return MusicPatchNode.method4638(var0, 10, true); // L: 34 + } - int var9; - for (var9 = 0; var9 < var7 + Client.npcCount; ++var9) { // L: 5307 - Object var20; - if (var9 < var7) { // L: 5309 - var20 = Client.players[var8[var9]]; // L: 5310 - if (var8[var9] == Client.combatTargetPlayerIndex) { // L: 5311 - var4 = true; // L: 5312 - var5 = var9; // L: 5313 - continue; - } - - if (var20 == class35.localPlayer) { // L: 5316 - var6 = var9; // L: 5317 - continue; // L: 5318 - } - } else { - var20 = Client.npcs[Client.npcIndices[var9 - var7]]; // L: 5321 - } - - AbstractWorldMapIcon.drawActor2d((Actor)var20, var9, var0, var1, var2, var3); // L: 5322 - } - - if (Client.renderSelf && var6 != -1) { // L: 5324 - AbstractWorldMapIcon.drawActor2d(class35.localPlayer, var6, var0, var1, var2, var3); // L: 5325 - } - - if (var4) { // L: 5327 - AbstractWorldMapIcon.drawActor2d(Client.players[Client.combatTargetPlayerIndex], var5, var0, var1, var2, var3); // L: 5328 - } - - for (var9 = 0; var9 < Client.overheadTextCount; ++var9) { // L: 5330 - int var10 = Client.overheadTextXs[var9]; // L: 5331 - int var11 = Client.overheadTextYs[var9]; // L: 5332 - int var12 = Client.overheadTextXOffsets[var9]; // L: 5333 - int var13 = Client.overheadTextAscents[var9]; // L: 5334 - boolean var14 = true; // L: 5335 - - while (var14) { - var14 = false; // L: 5337 - - for (int var19 = 0; var19 < var9; ++var19) { // L: 5338 - if (var11 + 2 > Client.overheadTextYs[var19] - Client.overheadTextAscents[var19] && var11 - var13 < Client.overheadTextYs[var19] + 2 && var10 - var12 < Client.overheadTextXOffsets[var19] + Client.overheadTextXs[var19] && var12 + var10 > Client.overheadTextXs[var19] - Client.overheadTextXOffsets[var19] && Client.overheadTextYs[var19] - Client.overheadTextAscents[var19] < var11) { // L: 5339 5340 - var11 = Client.overheadTextYs[var19] - Client.overheadTextAscents[var19]; // L: 5341 - var14 = true; // L: 5342 - } - } - } - - Client.viewportTempX = Client.overheadTextXs[var9]; // L: 5347 - Client.viewportTempY = Client.overheadTextYs[var9] = var11; // L: 5348 - String var15 = Client.overheadText[var9]; // L: 5349 - if (Client.chatEffects == 0) { // L: 5350 - int var16 = 16776960; // L: 5351 - if (Client.overheadTextColors[var9] < 6) { // L: 5352 - var16 = Client.field651[Client.overheadTextColors[var9]]; - } - - if (Client.overheadTextColors[var9] == 6) { // L: 5353 - var16 = Client.viewportDrawCount % 20 < 10 ? 16711680 : 16776960; - } - - if (Client.overheadTextColors[var9] == 7) { // L: 5354 - var16 = Client.viewportDrawCount % 20 < 10 ? 255 : '\uffff'; - } - - if (Client.overheadTextColors[var9] == 8) { // L: 5355 - var16 = Client.viewportDrawCount % 20 < 10 ? '뀀' : 8454016; - } - - int var17; - if (Client.overheadTextColors[var9] == 9) { // L: 5356 - var17 = 150 - Client.overheadTextCyclesRemaining[var9]; // L: 5357 - if (var17 < 50) { // L: 5358 - var16 = var17 * 1280 + 16711680; - } else if (var17 < 100) { // L: 5359 - var16 = 16776960 - (var17 - 50) * 327680; - } else if (var17 < 150) { // L: 5360 - var16 = (var17 - 100) * 5 + 65280; - } - } - - if (Client.overheadTextColors[var9] == 10) { // L: 5362 - var17 = 150 - Client.overheadTextCyclesRemaining[var9]; // L: 5363 - if (var17 < 50) { // L: 5364 - var16 = var17 * 5 + 16711680; - } else if (var17 < 100) { // L: 5365 - var16 = 16711935 - (var17 - 50) * 327680; - } else if (var17 < 150) { // L: 5366 - var16 = (var17 - 100) * 327680 + 255 - (var17 - 100) * 5; - } - } - - if (Client.overheadTextColors[var9] == 11) { // L: 5368 - var17 = 150 - Client.overheadTextCyclesRemaining[var9]; // L: 5369 - if (var17 < 50) { // L: 5370 - var16 = 16777215 - var17 * 327685; - } else if (var17 < 100) { // L: 5371 - var16 = (var17 - 50) * 327685 + 65280; - } else if (var17 < 150) { // L: 5372 - var16 = 16777215 - (var17 - 100) * 327680; - } - } - - if (Client.overheadTextEffects[var9] == 0) { // L: 5374 - WorldMapArea.fontBold12.drawCentered(var15, var0 + Client.viewportTempX, Client.viewportTempY + var1, var16, 0); - } - - if (Client.overheadTextEffects[var9] == 1) { // L: 5375 - WorldMapArea.fontBold12.drawCenteredWave(var15, var0 + Client.viewportTempX, Client.viewportTempY + var1, var16, 0, Client.viewportDrawCount); - } - - if (Client.overheadTextEffects[var9] == 2) { // L: 5376 - WorldMapArea.fontBold12.drawCenteredWave2(var15, var0 + Client.viewportTempX, Client.viewportTempY + var1, var16, 0, Client.viewportDrawCount); - } - - if (Client.overheadTextEffects[var9] == 3) { // L: 5377 - WorldMapArea.fontBold12.drawCenteredShake(var15, var0 + Client.viewportTempX, Client.viewportTempY + var1, var16, 0, Client.viewportDrawCount, 150 - Client.overheadTextCyclesRemaining[var9]); - } - - if (Client.overheadTextEffects[var9] == 4) { // L: 5378 - var17 = (150 - Client.overheadTextCyclesRemaining[var9]) * (WorldMapArea.fontBold12.stringWidth(var15) + 100) / 150; // L: 5379 - Rasterizer2D.Rasterizer2D_expandClip(var0 + Client.viewportTempX - 50, var1, var0 + Client.viewportTempX + 50, var3 + var1); // L: 5380 - WorldMapArea.fontBold12.draw(var15, var0 + Client.viewportTempX + 50 - var17, Client.viewportTempY + var1, var16, 0); // L: 5381 - Rasterizer2D.Rasterizer2D_setClip(var0, var1, var0 + var2, var3 + var1); // L: 5382 - } - - if (Client.overheadTextEffects[var9] == 5) { // L: 5384 - var17 = 150 - Client.overheadTextCyclesRemaining[var9]; // L: 5385 - int var18 = 0; // L: 5386 - if (var17 < 25) { // L: 5387 - var18 = var17 - 25; - } else if (var17 > 125) { // L: 5388 - var18 = var17 - 125; - } - - Rasterizer2D.Rasterizer2D_expandClip(var0, Client.viewportTempY + var1 - WorldMapArea.fontBold12.ascent - 1, var0 + var2, Client.viewportTempY + var1 + 5); // L: 5389 - WorldMapArea.fontBold12.drawCentered(var15, var0 + Client.viewportTempX, var18 + Client.viewportTempY + var1, var16, 0); // L: 5390 - Rasterizer2D.Rasterizer2D_setClip(var0, var1, var0 + var2, var3 + var1); // L: 5391 - } - } else { - WorldMapArea.fontBold12.drawCentered(var15, var0 + Client.viewportTempX, Client.viewportTempY + var1, 16776960, 0); // L: 5395 - } - } - - } // L: 5398 - - @ObfuscatedName("kp") + @ObfuscatedName("n") @ObfuscatedSignature( - descriptor = "(IB)V", - garbageValue = "7" + descriptor = "(III)I", + garbageValue = "-192400471" ) - @Export("updateSoundEffectVolume") - static final void updateSoundEffectVolume(int var0) { - var0 = Math.min(Math.max(var0, 0), 127); // L: 11203 - class12.clientPreferences.soundEffectsVolume = var0; // L: 11204 - KeyHandler.savePreferences(); // L: 11205 - } // L: 11206 - - @ObfuscatedName("kt") - @ObfuscatedSignature( - descriptor = "(IIIILow;Lil;I)V", - garbageValue = "541660614" - ) - @Export("worldToMinimap") - static final void worldToMinimap(int var0, int var1, int var2, int var3, SpritePixels var4, SpriteMask var5) { - int var6 = var3 * var3 + var2 * var2; // L: 11472 - if (var6 > 4225 && var6 < 90000) { // L: 11473 - int var7 = Client.camAngleY & 2047; // L: 11474 - int var8 = Rasterizer3D.Rasterizer3D_sine[var7]; // L: 11475 - int var9 = Rasterizer3D.Rasterizer3D_cosine[var7]; // L: 11476 - int var10 = var9 * var2 + var3 * var8 >> 16; // L: 11477 - int var11 = var3 * var9 - var8 * var2 >> 16; // L: 11478 - double var12 = Math.atan2((double)var10, (double)var11); // L: 11479 - int var14 = var5.width / 2 - 25; // L: 11480 - int var15 = (int)(Math.sin(var12) * (double)var14); // L: 11481 - int var16 = (int)(Math.cos(var12) * (double)var14); // L: 11482 - byte var17 = 20; // L: 11483 - GrandExchangeOfferOwnWorldComparator.redHintArrowSprite.method6900(var15 + (var0 + var5.width / 2 - var17 / 2), var5.height / 2 + var1 - var17 / 2 - var16 - 10, var17, var17, 15, 15, var12, 256); // L: 11484 + @Export("ItemContainer_getCount") + static int ItemContainer_getCount(int var0, int var1) { + ItemContainer var2 = (ItemContainer)ItemContainer.itemContainers.get((long)var0); // L: 21 + if (var2 == null) { // L: 22 + return 0; } else { - class10.drawSpriteOnMinimap(var0, var1, var2, var3, var4, var5); // L: 11486 + return var1 >= 0 && var1 < var2.quantities.length ? var2.quantities[var1] : 0; // L: 23 24 + } + } + + @ObfuscatedName("l") + @ObfuscatedSignature( + descriptor = "(Laf;B)V", + garbageValue = "-93" + ) + static void method230(GameEngine var0) { + while (ClanChannelMember.isKeyDown()) { // L: 1531 + if (ItemComposition.field1859 == 13) { // L: 1532 + Login.worldSelectOpen = false; // L: 1534 + Login.leftTitleSprite.drawAt(Login.xPadding, 0); // L: 1535 + rightTitleSprite.drawAt(Login.xPadding + 382, 0); // L: 1536 + Fonts.logoSprite.drawAt(Login.xPadding + 382 - Fonts.logoSprite.subWidth / 2, 18); // L: 1537 + return; // L: 1539 + } + + if (ItemComposition.field1859 == 96) { // L: 1541 + if (Login.worldSelectPage > 0 && class19.worldSelectLeftSprite != null) { // L: 1542 + --Login.worldSelectPage; // L: 1543 + } + } else if (ItemComposition.field1859 == 97 && Login.worldSelectPage < Login.worldSelectPagesCount && WorldMapID.worldSelectRightSprite != null) { // L: 1546 1547 + ++Login.worldSelectPage; // L: 1548 + } } - } // L: 11487 + if (MouseHandler.MouseHandler_lastButton == 1 || !Client.mouseCam && MouseHandler.MouseHandler_lastButton == 4) { // L: 1552 + int var1 = Login.xPadding + 280; // L: 1553 + if (MouseHandler.MouseHandler_lastPressedX >= var1 && MouseHandler.MouseHandler_lastPressedX <= var1 + 14 && MouseHandler.MouseHandler_lastPressedY >= 4 && MouseHandler.MouseHandler_lastPressedY <= 18) { // L: 1554 + class44.changeWorldSelectSorting(0, 0); // L: 1555 + return; // L: 1556 + } + + if (MouseHandler.MouseHandler_lastPressedX >= var1 + 15 && MouseHandler.MouseHandler_lastPressedX <= var1 + 80 && MouseHandler.MouseHandler_lastPressedY >= 4 && MouseHandler.MouseHandler_lastPressedY <= 18) { // L: 1558 + class44.changeWorldSelectSorting(0, 1); // L: 1559 + return; // L: 1560 + } + + int var2 = Login.xPadding + 390; // L: 1562 + if (MouseHandler.MouseHandler_lastPressedX >= var2 && MouseHandler.MouseHandler_lastPressedX <= var2 + 14 && MouseHandler.MouseHandler_lastPressedY >= 4 && MouseHandler.MouseHandler_lastPressedY <= 18) { // L: 1563 + class44.changeWorldSelectSorting(1, 0); // L: 1564 + return; // L: 1565 + } + + if (MouseHandler.MouseHandler_lastPressedX >= var2 + 15 && MouseHandler.MouseHandler_lastPressedX <= var2 + 80 && MouseHandler.MouseHandler_lastPressedY >= 4 && MouseHandler.MouseHandler_lastPressedY <= 18) { // L: 1567 + class44.changeWorldSelectSorting(1, 1); // L: 1568 + return; // L: 1569 + } + + int var3 = Login.xPadding + 500; // L: 1571 + if (MouseHandler.MouseHandler_lastPressedX >= var3 && MouseHandler.MouseHandler_lastPressedX <= var3 + 14 && MouseHandler.MouseHandler_lastPressedY >= 4 && MouseHandler.MouseHandler_lastPressedY <= 18) { // L: 1572 + class44.changeWorldSelectSorting(2, 0); // L: 1573 + return; // L: 1574 + } + + if (MouseHandler.MouseHandler_lastPressedX >= var3 + 15 && MouseHandler.MouseHandler_lastPressedX <= var3 + 80 && MouseHandler.MouseHandler_lastPressedY >= 4 && MouseHandler.MouseHandler_lastPressedY <= 18) { // L: 1576 + class44.changeWorldSelectSorting(2, 1); // L: 1577 + return; // L: 1578 + } + + int var4 = Login.xPadding + 610; // L: 1580 + if (MouseHandler.MouseHandler_lastPressedX >= var4 && MouseHandler.MouseHandler_lastPressedX <= var4 + 14 && MouseHandler.MouseHandler_lastPressedY >= 4 && MouseHandler.MouseHandler_lastPressedY <= 18) { // L: 1581 + class44.changeWorldSelectSorting(3, 0); // L: 1582 + return; // L: 1583 + } + + if (MouseHandler.MouseHandler_lastPressedX >= var4 + 15 && MouseHandler.MouseHandler_lastPressedX <= var4 + 80 && MouseHandler.MouseHandler_lastPressedY >= 4 && MouseHandler.MouseHandler_lastPressedY <= 18) { // L: 1585 + class44.changeWorldSelectSorting(3, 1); // L: 1586 + return; // L: 1587 + } + + if (MouseHandler.MouseHandler_lastPressedX >= Login.xPadding + 708 && MouseHandler.MouseHandler_lastPressedY >= 4 && MouseHandler.MouseHandler_lastPressedX <= Login.xPadding + 708 + 50 && MouseHandler.MouseHandler_lastPressedY <= 20) { // L: 1589 + Login.worldSelectOpen = false; // L: 1591 + Login.leftTitleSprite.drawAt(Login.xPadding, 0); // L: 1592 + rightTitleSprite.drawAt(Login.xPadding + 382, 0); // L: 1593 + Fonts.logoSprite.drawAt(Login.xPadding + 382 - Fonts.logoSprite.subWidth / 2, 18); // L: 1594 + return; // L: 1596 + } + + if (Login.hoveredWorldIndex != -1) { // L: 1598 + World var5 = Tiles.World_worlds[Login.hoveredWorldIndex]; // L: 1599 + class0.changeWorld(var5); // L: 1600 + Login.worldSelectOpen = false; // L: 1602 + Login.leftTitleSprite.drawAt(Login.xPadding, 0); // L: 1603 + rightTitleSprite.drawAt(Login.xPadding + 382, 0); // L: 1604 + Fonts.logoSprite.drawAt(Login.xPadding + 382 - Fonts.logoSprite.subWidth / 2, 18); // L: 1605 + return; // L: 1607 + } + + if (Login.worldSelectPage > 0 && class19.worldSelectLeftSprite != null && MouseHandler.MouseHandler_lastPressedX >= 0 && MouseHandler.MouseHandler_lastPressedX <= class19.worldSelectLeftSprite.subWidth && MouseHandler.MouseHandler_lastPressedY >= ReflectionCheck.canvasHeight / 2 - 50 && MouseHandler.MouseHandler_lastPressedY <= ReflectionCheck.canvasHeight / 2 + 50) { // L: 1609 + --Login.worldSelectPage; // L: 1610 + } + + if (Login.worldSelectPage < Login.worldSelectPagesCount && WorldMapID.worldSelectRightSprite != null && MouseHandler.MouseHandler_lastPressedX >= class32.canvasWidth - WorldMapID.worldSelectRightSprite.subWidth - 5 && MouseHandler.MouseHandler_lastPressedX <= class32.canvasWidth && MouseHandler.MouseHandler_lastPressedY >= ReflectionCheck.canvasHeight / 2 - 50 && MouseHandler.MouseHandler_lastPressedY <= ReflectionCheck.canvasHeight / 2 + 50) { // L: 1612 + ++Login.worldSelectPage; // L: 1613 + } + } + + } // L: 1616 } diff --git a/runescape-client/src/main/java/class21.java b/runescape-client/src/main/java/class21.java index 032babded6..cee0b994db 100644 --- a/runescape-client/src/main/java/class21.java +++ b/runescape-client/src/main/java/class21.java @@ -1,107 +1,130 @@ -import java.awt.Component; import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("f") +@ObfuscatedName("w") public class class21 extends class14 { - @ObfuscatedName("p") - @ObfuscatedSignature( - descriptor = "[Lne;" - ) - @Export("JagexCache_idxFiles") - public static BufferedFile[] JagexCache_idxFiles; - @ObfuscatedName("j") + @ObfuscatedName("qi") + static boolean field190; + @ObfuscatedName("v") @ObfuscatedGetter( - intValue = -570442273 + intValue = -1525573159 ) - @Export("loginBoxCenter") - static int loginBoxCenter; - @ObfuscatedName("h") + int field192; + @ObfuscatedName("n") @ObfuscatedGetter( - intValue = 147017797 + intValue = 1941525271 ) - int field178; - @ObfuscatedName("c") + int field185; + @ObfuscatedName("f") @ObfuscatedGetter( - intValue = 1652610383 + intValue = -948599653 ) - int field176; - @ObfuscatedName("o") + int field186; + @ObfuscatedName("y") @ObfuscatedGetter( - intValue = -1956638369 + intValue = -461559247 ) - int field177; - @ObfuscatedName("g") - @ObfuscatedGetter( - intValue = -540274733 - ) - int field180; + int field187; // $FF: synthetic field @ObfuscatedSignature( - descriptor = "Lo;" + descriptor = "Lf;" ) final class2 this$0; @ObfuscatedSignature( - descriptor = "(Lo;)V" + descriptor = "(Lf;)V" ) class21(class2 var1) { this.this$0 = var1; - this.field178 = -1; // L: 158 + this.field192 = -1; // L: 158 } // L: 163 - @ObfuscatedName("h") - @ObfuscatedSignature( - descriptor = "(Lnk;I)V", - garbageValue = "110401227" - ) - void vmethod339(Buffer var1) { - this.field178 = var1.readUnsignedShort(); // L: 166 - this.field176 = var1.readInt(); // L: 167 - this.field177 = var1.readUnsignedByte(); // L: 168 - this.field180 = var1.readUnsignedByte(); // L: 169 - } // L: 170 - - @ObfuscatedName("c") - @ObfuscatedSignature( - descriptor = "(Lx;I)V", - garbageValue = "-1535989118" - ) - void vmethod338(class11 var1) { - var1.method156(this.field178, this.field176, this.field177, this.field180); // L: 173 - } // L: 174 - - @ObfuscatedName("c") - @ObfuscatedSignature( - descriptor = "(Ljava/awt/Component;I)V", - garbageValue = "-1194804583" - ) - static void method289(Component var0) { - var0.removeMouseListener(MouseHandler.MouseHandler_instance); // L: 43 - var0.removeMouseMotionListener(MouseHandler.MouseHandler_instance); // L: 44 - var0.removeFocusListener(MouseHandler.MouseHandler_instance); // L: 45 - MouseHandler.MouseHandler_currentButtonVolatile = 0; // L: 46 - } // L: 47 - @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "(I)Lbc;", - garbageValue = "1069848979" + descriptor = "(Lnd;I)V", + garbageValue = "-1281352827" ) - @Export("worldListStart") - static World worldListStart() { - World.World_listCount = 0; // L: 237 - return class13.getNextWorldListWorld(); // L: 238 + void vmethod276(Buffer var1) { + this.field192 = var1.readUnsignedShort(); // L: 166 + this.field185 = var1.readInt(); // L: 167 + this.field186 = var1.readUnsignedByte(); // L: 168 + this.field187 = var1.readUnsignedByte(); // L: 169 + } // L: 170 + + @ObfuscatedName("n") + @ObfuscatedSignature( + descriptor = "(Ll;B)V", + garbageValue = "29" + ) + void vmethod281(ClanSettings var1) { + var1.method126(this.field192, this.field185, this.field186, this.field187); // L: 173 + } // L: 174 + + @ObfuscatedName("v") + @ObfuscatedSignature( + descriptor = "(Lhs;Loy;B)Lhq;", + garbageValue = "8" + ) + @Export("getPacketBufferNode") + public static PacketBufferNode getPacketBufferNode(ClientPacket var0, IsaacCipher var1) { + PacketBufferNode var2; + if (PacketBufferNode.PacketBufferNode_packetBufferNodeCount == 0) { // L: 24 + var2 = new PacketBufferNode(); // L: 25 + } else { + var2 = PacketBufferNode.PacketBufferNode_packetBufferNodes[--PacketBufferNode.PacketBufferNode_packetBufferNodeCount]; // L: 28 + } + + var2.clientPacket = var0; // L: 31 + var2.clientPacketLength = var0.length; // L: 32 + if (var2.clientPacketLength == -1) { + var2.packetBuffer = new PacketBuffer(260); // L: 33 + } else if (var2.clientPacketLength == -2) { // L: 34 + var2.packetBuffer = new PacketBuffer(10000); + } else if (var2.clientPacketLength <= 18) { // L: 35 + var2.packetBuffer = new PacketBuffer(20); + } else if (var2.clientPacketLength <= 98) { // L: 36 + var2.packetBuffer = new PacketBuffer(100); + } else { + var2.packetBuffer = new PacketBuffer(260); // L: 37 + } + + var2.packetBuffer.setIsaacCipher(var1); // L: 38 + var2.packetBuffer.writeByteIsaac(var2.clientPacket.id); // L: 39 + var2.index = 0; // L: 40 + return var2; // L: 41 } - @ObfuscatedName("fi") + @ObfuscatedName("ju") @ObfuscatedSignature( - descriptor = "(II)I", - garbageValue = "-2096544393" + descriptor = "(II)V", + garbageValue = "993410393" ) - static int method281(int var0) { - return var0 * 3 + 600; // L: 1946 + @Export("Widget_resetModelFrames") + static final void Widget_resetModelFrames(int var0) { + if (Clock.loadInterface(var0)) { // L: 10825 + Widget[] var1 = Widget.Widget_interfaceComponents[var0]; // L: 10826 + + for (int var2 = 0; var2 < var1.length; ++var2) { // L: 10827 + Widget var3 = var1[var2]; // L: 10828 + if (var3 != null) { // L: 10829 + var3.modelFrame = 0; // L: 10830 + var3.modelFrameCycle = 0; // L: 10831 + } + } + + } + } // L: 10833 + + @ObfuscatedName("ks") + @ObfuscatedSignature( + descriptor = "(Lio;I)I", + garbageValue = "2132424043" + ) + @Export("getWidgetFlags") + static int getWidgetFlags(Widget var0) { + IntegerNode var1 = (IntegerNode)Client.widgetFlags.get((long)var0.childIndex + ((long)var0.id << 32)); // L: 11357 + return var1 != null ? var1.integer : var0.flags; // L: 11358 11359 } } diff --git a/runescape-client/src/main/java/class213.java b/runescape-client/src/main/java/class213.java index 86dd54a2ff..2bdf3cc68d 100644 --- a/runescape-client/src/main/java/class213.java +++ b/runescape-client/src/main/java/class213.java @@ -1,5 +1,5 @@ import net.runelite.mapping.ObfuscatedName; -@ObfuscatedName("hj") +@ObfuscatedName("hg") public interface class213 extends class215 { } diff --git a/runescape-client/src/main/java/class214.java b/runescape-client/src/main/java/class214.java index 0fa7027593..3ffc0daa08 100644 --- a/runescape-client/src/main/java/class214.java +++ b/runescape-client/src/main/java/class214.java @@ -1,119 +1,44 @@ -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("hi") +@ObfuscatedName("hf") public abstract class class214 implements class216 { - @ObfuscatedName("h") + @ObfuscatedName("v") @ObfuscatedGetter( - intValue = 923397577 + intValue = -1948210145 ) - protected int field2549; + protected int field2558; @ObfuscatedSignature( - descriptor = "(Ljr;Lkr;I)V" + descriptor = "(Ljd;Lkk;I)V" ) protected class214(StudioGame var1, Language var2, int var3) { - this.field2549 = var3; // L: 10 + this.field2558 = var3; // L: 10 } // L: 11 - @ObfuscatedName("q") + @ObfuscatedName("ah") @ObfuscatedSignature( - descriptor = "(CI)Z", - garbageValue = "1473655530" + descriptor = "(ILcf;ZI)I", + garbageValue = "-592432279" ) - @Export("isAlphaNumeric") - public static boolean isAlphaNumeric(char var0) { - return var0 >= '0' && var0 <= '9' || var0 >= 'A' && var0 <= 'Z' || var0 >= 'a' && var0 <= 'z'; // L: 159 - } - - @ObfuscatedName("p") - @ObfuscatedSignature( - descriptor = "(ILci;ZI)I", - garbageValue = "1877487505" - ) - static int method4239(int var0, Script var1, boolean var2) { - Widget var3 = var2 ? class308.scriptDotWidget : class24.scriptActiveWidget; // L: 1172 - if (var0 == ScriptOpcodes.CC_GETINVOBJECT) { // L: 1173 - Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = var3.itemId; // L: 1174 - return 1; // L: 1175 - } else if (var0 == ScriptOpcodes.CC_GETINVCOUNT) { // L: 1177 - if (var3.itemId != -1) { // L: 1178 - Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = var3.itemQuantity; + static int method4280(int var0, Script var1, boolean var2) { + if (var0 == 6800) { // L: 4185 + ++Interpreter.Interpreter_stringStackSize; // L: 4186 + return 1; // L: 4187 + } else if (var0 != 6801 && var0 != 6802) { // L: 4189 + if (var0 == 6850) { // L: 4193 + ++Interpreter.Interpreter_stringStackSize; // L: 4194 + return 1; // L: 4195 + } else if (var0 != 6851 && var0 != 6852) { // L: 4197 + return 2; // L: 4201 } else { - Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = 0; // L: 1179 + ++class44.Interpreter_intStackSize; // L: 4198 + return 1; // L: 4199 } - - return 1; // L: 1180 - } else if (var0 == ScriptOpcodes.CC_GETID) { // L: 1182 - Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = var3.childIndex; // L: 1183 - return 1; // L: 1184 } else { - return 2; // L: 1186 + ++class44.Interpreter_intStackSize; // L: 4190 + return 1; // L: 4191 } } - - @ObfuscatedName("m") - @ObfuscatedSignature( - descriptor = "(ILci;ZI)I", - garbageValue = "1848569122" - ) - static int method4241(int var0, Script var1, boolean var2) { - Widget var5; - if (var0 == ScriptOpcodes.IF_GETINVOBJECT) { // L: 1350 - var5 = DevicePcmPlayerProvider.getWidget(Interpreter.Interpreter_intStack[--WorldMapCacheName.Interpreter_intStackSize]); // L: 1351 - Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = var5.itemId; // L: 1352 - return 1; // L: 1353 - } else if (var0 == ScriptOpcodes.IF_GETINVCOUNT) { // L: 1355 - var5 = DevicePcmPlayerProvider.getWidget(Interpreter.Interpreter_intStack[--WorldMapCacheName.Interpreter_intStackSize]); // L: 1356 - if (var5.itemId != -1) { // L: 1357 - Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = var5.itemQuantity; - } else { - Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = 0; // L: 1358 - } - - return 1; // L: 1359 - } else if (var0 == ScriptOpcodes.IF_HASSUB) { // L: 1361 - int var3 = Interpreter.Interpreter_intStack[--WorldMapCacheName.Interpreter_intStackSize]; // L: 1362 - InterfaceParent var4 = (InterfaceParent)Client.interfaceParents.get((long)var3); // L: 1363 - if (var4 != null) { // L: 1364 - Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = 1; - } else { - Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = 0; // L: 1365 - } - - return 1; // L: 1366 - } else if (var0 == ScriptOpcodes.IF_GETTOP) { // L: 1368 - Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = Client.rootInterface; // L: 1369 - return 1; // L: 1370 - } else { - return 2; // L: 1372 - } - } - - @ObfuscatedName("jn") - @ObfuscatedSignature( - descriptor = "(Liv;III)V", - garbageValue = "1304902076" - ) - @Export("clickWidget") - static final void clickWidget(Widget var0, int var1, int var2) { - if (Client.clickedWidget == null && !Client.isMenuOpen) { // L: 10977 - if (var0 != null && World.method1731(var0) != null) { // L: 10978 - Client.clickedWidget = var0; // L: 10979 - Client.clickedWidgetParent = World.method1731(var0); // L: 10980 - Client.widgetClickX = var1; // L: 10981 - Client.widgetClickY = var2; // L: 10982 - class288.widgetDragDuration = 0; // L: 10983 - Client.isDraggingWidget = false; // L: 10984 - int var3 = AttackOption.method2285(); // L: 10985 - if (var3 != -1) { // L: 10986 - GrandExchangeOfferAgeComparator.method4989(var3); - } - - } - } - } // L: 10987 } diff --git a/runescape-client/src/main/java/class215.java b/runescape-client/src/main/java/class215.java index d15d0fcdfb..c882b98a60 100644 --- a/runescape-client/src/main/java/class215.java +++ b/runescape-client/src/main/java/class215.java @@ -1,5 +1,5 @@ import net.runelite.mapping.ObfuscatedName; -@ObfuscatedName("hu") +@ObfuscatedName("ht") public interface class215 { } diff --git a/runescape-client/src/main/java/class216.java b/runescape-client/src/main/java/class216.java index e9ebbe338a..8224f262be 100644 --- a/runescape-client/src/main/java/class216.java +++ b/runescape-client/src/main/java/class216.java @@ -1,5 +1,5 @@ import net.runelite.mapping.ObfuscatedName; -@ObfuscatedName("ht") +@ObfuscatedName("hm") public interface class216 extends Iterable { } diff --git a/runescape-client/src/main/java/class217.java b/runescape-client/src/main/java/class217.java index 9c97ff4125..6ae7c12e5c 100644 --- a/runescape-client/src/main/java/class217.java +++ b/runescape-client/src/main/java/class217.java @@ -1,7 +1,7 @@ import net.runelite.mapping.ObfuscatedName; -@ObfuscatedName("hq") +@ObfuscatedName("hh") public interface class217 { - @ObfuscatedName("h") - void method4244(Object var1); + @ObfuscatedName("v") + void method4282(Object var1); } diff --git a/runescape-client/src/main/java/class22.java b/runescape-client/src/main/java/class22.java index 3810a4fe1f..4d701e42f7 100644 --- a/runescape-client/src/main/java/class22.java +++ b/runescape-client/src/main/java/class22.java @@ -3,183 +3,83 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("s") +@ObfuscatedName("t") public class class22 extends class14 { - @ObfuscatedName("dc") - @ObfuscatedSignature( - descriptor = "Lji;" - ) - @Export("archive12") - static Archive archive12; - @ObfuscatedName("h") + @ObfuscatedName("t") + @Export("userHomeDirectory") + public static String userHomeDirectory; + @ObfuscatedName("kh") @ObfuscatedGetter( - intValue = -518379391 + intValue = 1115122599 ) - int field187; + @Export("Client_plane") + static int Client_plane; + @ObfuscatedName("v") + @ObfuscatedGetter( + intValue = 242899457 + ) + int field194; // $FF: synthetic field @ObfuscatedSignature( - descriptor = "Lo;" + descriptor = "Lf;" ) final class2 this$0; @ObfuscatedSignature( - descriptor = "(Lo;)V" + descriptor = "(Lf;)V" ) class22(class2 var1) { this.this$0 = var1; - this.field187 = -1; // L: 114 + this.field194 = -1; // L: 114 } // L: 116 - @ObfuscatedName("h") + @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "(Lnk;I)V", - garbageValue = "110401227" + descriptor = "(Lnd;I)V", + garbageValue = "-1281352827" ) - void vmethod339(Buffer var1) { - this.field187 = var1.readUnsignedShort(); // L: 119 + void vmethod276(Buffer var1) { + this.field194 = var1.readUnsignedShort(); // L: 119 } // L: 120 - @ObfuscatedName("c") + @ObfuscatedName("n") @ObfuscatedSignature( - descriptor = "(Lx;I)V", - garbageValue = "-1535989118" + descriptor = "(Ll;B)V", + garbageValue = "29" ) - void vmethod338(class11 var1) { - var1.method157(this.field187); // L: 123 + void vmethod281(ClanSettings var1) { + var1.method121(this.field194); // L: 123 } // L: 124 - @ObfuscatedName("o") + @ObfuscatedName("n") @ObfuscatedSignature( - descriptor = "(Lnk;B)Ljava/lang/String;", - garbageValue = "3" + descriptor = "(I)Lhq;", + garbageValue = "-115271413" ) - public static String method299(Buffer var0) { - return ServerPacket.method4314(var0, 32767); // L: 26 - } - - @ObfuscatedName("ag") - @ObfuscatedSignature( - descriptor = "(ILci;ZI)I", - garbageValue = "1565593981" - ) - static int method290(int var0, Script var1, boolean var2) { - if (var0 != 3700 && var0 != 3701) { // L: 2409 - if (var0 == 3702) { // L: 2414 - ++WorldMapCacheName.Interpreter_intStackSize; // L: 2415 - return 1; // L: 2416 - } else { - return 2; // L: 2418 - } + public static PacketBufferNode method247() { + PacketBufferNode var0; + if (PacketBufferNode.PacketBufferNode_packetBufferNodeCount == 0) { // L: 47 + var0 = new PacketBufferNode(); // L: 48 } else { - --WorldMapCacheName.Interpreter_intStackSize; // L: 2410 - --class13.Interpreter_stringStackSize; // L: 2411 - return 1; // L: 2412 - } - } - - @ObfuscatedName("fs") - @ObfuscatedSignature( - descriptor = "(IB)V", - garbageValue = "38" - ) - @Export("getLoginError") - static void getLoginError(int var0) { - if (var0 == -3) { // L: 2943 - class44.setLoginResponseString("Connection timed out.", "Please try using a different world.", ""); - } else if (var0 == -2) { // L: 2944 - class44.setLoginResponseString("Error connecting to server.", "Please try using a different world.", ""); - } else if (var0 == -1) { // L: 2945 - class44.setLoginResponseString("No response from server.", "Please try using a different world.", ""); - } else if (var0 == 3) { // L: 2946 - Login.loginIndex = 3; // L: 2947 - Login.field997 = 1; // L: 2948 - } else if (var0 == 4) { // L: 2950 - UserComparator7.method2455(0); // L: 2951 - } else if (var0 == 5) { // L: 2953 - Login.field997 = 2; // L: 2954 - class44.setLoginResponseString("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."); // L: 2955 - } else if (var0 != 68 && (Client.onMobile || var0 != 6)) { // L: 2957 - if (var0 == 7) { // L: 2960 - class44.setLoginResponseString("This world is full.", "Please use a different world.", ""); - } else if (var0 == 8) { // L: 2961 - class44.setLoginResponseString("Unable to connect.", "Login server offline.", ""); - } else if (var0 == 9) { // L: 2962 - class44.setLoginResponseString("Login limit exceeded.", "Too many connections from your address.", ""); - } else if (var0 == 10) { // L: 2963 - class44.setLoginResponseString("Unable to connect.", "Bad session id.", ""); - } else if (var0 == 11) { // L: 2964 - class44.setLoginResponseString("We suspect someone knows your password.", "Press 'change your password' on front page.", ""); - } else if (var0 == 12) { // L: 2965 - class44.setLoginResponseString("You need a members account to login to this world.", "Please subscribe, or use a different world.", ""); - } else if (var0 == 13) { // L: 2966 - class44.setLoginResponseString("Could not complete login.", "Please try using a different world.", ""); - } else if (var0 == 14) { // L: 2967 - class44.setLoginResponseString("The server is being updated.", "Please wait 1 minute and try again.", ""); - } else if (var0 == 16) { // L: 2968 - class44.setLoginResponseString("Too many login attempts.", "Please wait a few minutes before trying again.", ""); - } else if (var0 == 17) { // L: 2969 - class44.setLoginResponseString("You are standing in a members-only area.", "To play on this world move to a free area first", ""); - } else if (var0 == 18) { // L: 2970 - UserComparator7.method2455(1); // L: 2971 - } else if (var0 == 19) { // L: 2973 - class44.setLoginResponseString("This world is running a closed Beta.", "Sorry invited players only.", "Please use a different world."); - } else if (var0 == 20) { // L: 2974 - class44.setLoginResponseString("Invalid loginserver requested.", "Please try using a different world.", ""); - } else if (var0 == 22) { // L: 2975 - class44.setLoginResponseString("Malformed login packet.", "Please try again.", ""); - } else if (var0 == 23) { // L: 2976 - class44.setLoginResponseString("No reply from loginserver.", "Please wait 1 minute and try again.", ""); - } else if (var0 == 24) { // L: 2977 - class44.setLoginResponseString("Error loading your profile.", "Please contact customer support.", ""); - } else if (var0 == 25) { // L: 2978 - class44.setLoginResponseString("Unexpected loginserver response.", "Please try using a different world.", ""); - } else if (var0 == 26) { // L: 2979 - class44.setLoginResponseString("This computers address has been blocked", "as it was used to break our rules.", ""); - } else if (var0 == 27) { // L: 2980 - class44.setLoginResponseString("", "Service unavailable.", ""); - } else if (var0 == 31) { // L: 2981 - class44.setLoginResponseString("Your account must have a displayname set", "in order to play the game. Please set it", "via the website, or the main game."); - } else if (var0 == 32) { - class44.setLoginResponseString("Your attempt to log into your account was", "unsuccessful. Don't worry, you can sort", "this out by visiting the billing system."); // L: 2982 - } else if (var0 == 37) { // L: 2983 - class44.setLoginResponseString("Your account is currently inaccessible.", "Please try again in a few minutes.", ""); - } else if (var0 == 38) { // L: 2984 - class44.setLoginResponseString("You need to vote to play!", "Visit runescape.com and vote,", "and then come back here!"); - } else if (var0 == 55) { // L: 2985 - Login.loginIndex = 8; // L: 2986 - } else { - if (var0 == 56) { // L: 2988 - class44.setLoginResponseString("Enter the 6-digit code generated by your", "authenticator app.", ""); // L: 2989 - Client.updateGameState(11); // L: 2990 - return; // L: 2991 - } - - if (var0 == 57) { // L: 2993 - class44.setLoginResponseString("The code you entered was incorrect.", "Please try again.", ""); // L: 2994 - Client.updateGameState(11); // L: 2995 - return; // L: 2996 - } - - if (var0 == 61) { // L: 2998 - Login.loginIndex = 7; // L: 2999 - } else { - class44.setLoginResponseString("Unexpected server response", "Please try using a different world.", ""); // L: 3001 - } - } - } else { - class44.setLoginResponseString("RuneScape has been updated!", "Please reload this page.", ""); // L: 2958 + var0 = PacketBufferNode.PacketBufferNode_packetBufferNodes[--PacketBufferNode.PacketBufferNode_packetBufferNodeCount]; // L: 51 } - Client.updateGameState(10); // L: 3002 - } // L: 3003 + var0.clientPacket = null; // L: 54 + var0.clientPacketLength = 0; // L: 55 + var0.packetBuffer = new PacketBuffer(5000); // L: 56 + return var0; // L: 57 + } - @ObfuscatedName("kg") + @ObfuscatedName("ii") @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "1530715236" + descriptor = "(III)V", + garbageValue = "188298202" ) - static final void method297() { - Client.field822 = Client.cycleCntr; // L: 11522 - Script.field1055 = true; // L: 11523 - } // L: 11524 + @Export("resumePauseWidget") + static void resumePauseWidget(int var0, int var1) { + PacketBufferNode var2 = class21.getPacketBufferNode(ClientPacket.field2652, Client.packetWriter.isaacCipher); // L: 8662 + var2.packetBuffer.method6619(var1); // L: 8663 + var2.packetBuffer.writeIntME(var0); // L: 8664 + Client.packetWriter.addNode(var2); // L: 8665 + } // L: 8666 } diff --git a/runescape-client/src/main/java/class223.java b/runescape-client/src/main/java/class223.java index f9854e9a51..9f12400da7 100644 --- a/runescape-client/src/main/java/class223.java +++ b/runescape-client/src/main/java/class223.java @@ -1,5 +1,5 @@ import net.runelite.mapping.ObfuscatedName; -@ObfuscatedName("hb") +@ObfuscatedName("hr") public interface class223 { } diff --git a/runescape-client/src/main/java/class225.java b/runescape-client/src/main/java/class225.java index 137148b674..9673e0377c 100644 --- a/runescape-client/src/main/java/class225.java +++ b/runescape-client/src/main/java/class225.java @@ -1,86 +1,71 @@ -import net.runelite.mapping.ObfuscatedGetter; +import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("hh") +@ObfuscatedName("ha") public class class225 { - @ObfuscatedName("h") - @ObfuscatedSignature( - descriptor = "Lhh;" - ) - public static final class225 field2679; - @ObfuscatedName("c") - @ObfuscatedSignature( - descriptor = "Lhh;" - ) - public static final class225 field2674; - @ObfuscatedName("o") - @ObfuscatedSignature( - descriptor = "Lhh;" - ) - public static final class225 field2673; - @ObfuscatedName("g") - @ObfuscatedSignature( - descriptor = "Lhh;" - ) - public static final class225 field2678; - @ObfuscatedName("l") - @ObfuscatedSignature( - descriptor = "Lhh;" - ) - public static final class225 field2675; - @ObfuscatedName("z") - @ObfuscatedSignature( - descriptor = "Lhh;" - ) - public static final class225 field2687; - @ObfuscatedName("t") - @ObfuscatedSignature( - descriptor = "Lhh;" - ) - public static final class225 field2677; @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "Lhh;" + descriptor = "Lha;" + ) + public static final class225 field2686; + @ObfuscatedName("n") + @ObfuscatedSignature( + descriptor = "Lha;" ) public static final class225 field2680; - @ObfuscatedName("b") + @ObfuscatedName("f") @ObfuscatedSignature( - descriptor = "Lhh;" - ) - public static final class225 field2681; - @ObfuscatedName("q") - @ObfuscatedSignature( - descriptor = "Lhh;" + descriptor = "Lha;" ) public static final class225 field2682; - @ObfuscatedName("i") - @ObfuscatedGetter( - intValue = -1822029477 + @ObfuscatedName("y") + @ObfuscatedSignature( + descriptor = "Lha;" ) - static int field2686; + public static final class225 field2683; + @ObfuscatedName("p") + @ObfuscatedSignature( + descriptor = "Lha;" + ) + public static final class225 field2681; + @ObfuscatedName("j") + @ObfuscatedSignature( + descriptor = "Lha;" + ) + public static final class225 field2685; @ObfuscatedName("r") @ObfuscatedSignature( - descriptor = "Lof;" + descriptor = "Lha;" ) - static IndexedSprite field2684; - @ObfuscatedName("eh") - @ObfuscatedGetter( - intValue = 757970751 + public static final class225 field2687; + @ObfuscatedName("b") + @ObfuscatedSignature( + descriptor = "Lha;" ) - static int field2676; + public static final class225 field2684; + @ObfuscatedName("d") + @ObfuscatedSignature( + descriptor = "Lha;" + ) + public static final class225 field2688; + @ObfuscatedName("s") + @ObfuscatedSignature( + descriptor = "Lha;" + ) + public static final class225 field2689; static { - field2679 = new class225(15); // L: 5 - field2674 = new class225(7); // L: 6 - field2673 = new class225(2); // L: 7 - field2678 = new class225(5); // L: 8 - field2675 = new class225(14); // L: 9 - field2687 = new class225(3); // L: 10 - field2677 = new class225(5); // L: 11 - field2680 = new class225(4); // L: 12 - field2681 = new class225(4); // L: 13 - field2682 = new class225(6); // L: 14 + field2686 = new class225(15); // L: 5 + field2680 = new class225(7); // L: 6 + field2682 = new class225(2); // L: 7 + field2683 = new class225(5); // L: 8 + field2681 = new class225(14); // L: 9 + field2685 = new class225(3); // L: 10 + field2687 = new class225(5); // L: 11 + field2684 = new class225(4); // L: 12 + field2688 = new class225(4); // L: 13 + field2689 = new class225(6); // L: 14 } @ObfuscatedSignature( @@ -90,14 +75,30 @@ public class class225 { class225(int var1) { } // L: 20 - @ObfuscatedName("fh") + @ObfuscatedName("ia") @ObfuscatedSignature( - descriptor = "(Lji;Ljava/lang/String;I)V", - garbageValue = "-1074413035" + descriptor = "(IIIIIIIIB)V", + garbageValue = "-40" ) - static void method4300(Archive var0, String var1) { - ArchiveLoader var2 = new ArchiveLoader(var0, var1); // L: 1931 - Client.archiveLoaders.add(var2); // L: 1932 - Client.field893 += var2.groupCount; // L: 1933 - } // L: 1934 + @Export("drawWidgets") + static final void drawWidgets(int var0, int var1, int var2, int var3, int var4, int var5, int var6, int var7) { + if (Clock.loadInterface(var0)) { // L: 9193 + class4.field49 = null; // L: 9200 + class303.drawInterface(Widget.Widget_interfaceComponents[var0], -1, var1, var2, var3, var4, var5, var6, var7); // L: 9201 + if (class4.field49 != null) { // L: 9202 + class303.drawInterface(class4.field49, -1412584499, var1, var2, var3, var4, ClanChannel.field38, class82.field1020, var7); // L: 9203 + class4.field49 = null; // L: 9204 + } + + } else { + if (var7 != -1) { // L: 9194 + Client.field719[var7] = true; + } else { + for (int var8 = 0; var8 < 100; ++var8) { // L: 9196 + Client.field719[var8] = true; + } + } + + } + } // L: 9198 9206 } diff --git a/runescape-client/src/main/java/class229.java b/runescape-client/src/main/java/class229.java index 0fef282c96..4697a1f0ef 100644 --- a/runescape-client/src/main/java/class229.java +++ b/runescape-client/src/main/java/class229.java @@ -1,48 +1,12 @@ -import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedName; -import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("hr") +@ObfuscatedName("hu") public class class229 { - @ObfuscatedName("dj") - @Export("mouseCam") - static boolean mouseCam; + @ObfuscatedName("d") + static int[][] field2813; - @ObfuscatedName("c") - @ObfuscatedSignature( - descriptor = "(IB)Leb;", - garbageValue = "-2" - ) - @Export("StructDefinition_getStructDefinition") - public static StructComposition StructDefinition_getStructDefinition(int var0) { - StructComposition var1 = (StructComposition)StructComposition.StructDefinition_cached.get((long)var0); // L: 23 - if (var1 != null) { // L: 24 - return var1; - } else { - byte[] var2 = StructComposition.StructDefinition_archive.takeFile(34, var0); // L: 25 - var1 = new StructComposition(); // L: 26 - if (var2 != null) { // L: 27 - var1.decode(new Buffer(var2)); - } - - var1.postDecode(); // L: 28 - StructComposition.StructDefinition_cached.put(var1, (long)var0); // L: 29 - return var1; // L: 30 - } + @ObfuscatedName("r") + public static int method4374(long var0) { + return (int)(var0 >>> 7 & 127L); // L: 72 } - - @ObfuscatedName("z") - @ObfuscatedSignature( - descriptor = "(ILjp;IIIZI)V", - garbageValue = "-1538082454" - ) - public static void method4321(int var0, AbstractArchive var1, int var2, int var3, int var4, boolean var5) { - class232.musicPlayerStatus = 1; // L: 61 - JagexCache.musicTrackArchive = var1; // L: 62 - class232.musicTrackGroupId = var2; // L: 63 - class232.musicTrackFileId = var3; // L: 64 - LoginPacket.musicTrackVolume = var4; // L: 65 - VarpDefinition.musicTrackBoolean = var5; // L: 66 - class232.pcmSampleLength = var0; // L: 67 - } // L: 68 } diff --git a/runescape-client/src/main/java/class23.java b/runescape-client/src/main/java/class23.java index f9a9cee34c..f5b74149ea 100644 --- a/runescape-client/src/main/java/class23.java +++ b/runescape-client/src/main/java/class23.java @@ -1,805 +1,114 @@ -import java.net.MalformedURLException; -import java.net.URL; import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("y") +@ObfuscatedName("h") public class class23 extends class14 { - @ObfuscatedName("gq") + @ObfuscatedName("u") + @Export("Tiles_saturation") + static int[] Tiles_saturation; + @ObfuscatedName("au") + @Export("client") @ObfuscatedSignature( - descriptor = "[Lof;" + descriptor = "Lclient;" ) - @Export("mapSceneSprites") - static IndexedSprite[] mapSceneSprites; - @ObfuscatedName("h") + static Client client; + @ObfuscatedName("v") @ObfuscatedGetter( - intValue = -1382596605 + intValue = -1071704973 ) - int field191; - @ObfuscatedName("c") - byte field190; + int field199; + @ObfuscatedName("n") + byte field198; // $FF: synthetic field @ObfuscatedSignature( - descriptor = "Lo;" + descriptor = "Lf;" ) final class2 this$0; @ObfuscatedSignature( - descriptor = "(Lo;)V" + descriptor = "(Lf;)V" ) class23(class2 var1) { this.this$0 = var1; - this.field191 = -1; // L: 128 + this.field199 = -1; // L: 128 } // L: 131 - @ObfuscatedName("h") + @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "(Lnk;I)V", - garbageValue = "110401227" + descriptor = "(Lnd;I)V", + garbageValue = "-1281352827" ) - void vmethod339(Buffer var1) { - this.field191 = var1.readUnsignedShort(); // L: 134 - this.field190 = var1.readByte(); // L: 135 + void vmethod276(Buffer var1) { + this.field199 = var1.readUnsignedShort(); // L: 134 + this.field198 = var1.readByte(); // L: 135 } // L: 136 - @ObfuscatedName("c") + @ObfuscatedName("n") @ObfuscatedSignature( - descriptor = "(Lx;I)V", - garbageValue = "-1535989118" + descriptor = "(Ll;B)V", + garbageValue = "29" ) - void vmethod338(class11 var1) { - var1.method191(this.field191, this.field190); // L: 139 + void vmethod281(ClanSettings var1) { + var1.method112(this.field199, this.field198); // L: 139 } // L: 140 - @ObfuscatedName("h") - public static final int method309(double var0, double var2, double var4) { - double var6 = var4; // L: 9 - double var8 = var4; // L: 10 - double var10 = var4; // L: 11 - if (var2 != 0.0D) { // L: 12 - double var12; - if (var4 < 0.5D) { // L: 14 - var12 = (var2 + 1.0D) * var4; - } else { - var12 = var2 + var4 - var2 * var4; // L: 15 - } - - double var14 = var4 * 2.0D - var12; // L: 16 - double var16 = var0 + 0.3333333333333333D; // L: 17 - if (var16 > 1.0D) { // L: 18 - --var16; - } - - double var20 = var0 - 0.3333333333333333D; // L: 20 - if (var20 < 0.0D) { // L: 21 - ++var20; - } - - if (var16 * 6.0D < 1.0D) { // L: 22 - var6 = var14 + var16 * (var12 - var14) * 6.0D; - } else if (2.0D * var16 < 1.0D) { // L: 23 - var6 = var12; - } else if (3.0D * var16 < 2.0D) { - var6 = (var12 - var14) * (0.6666666666666666D - var16) * 6.0D + var14; - } else { - var6 = var14; - } - - if (6.0D * var0 < 1.0D) { - var8 = var0 * (var12 - var14) * 6.0D + var14; - } else if (var0 * 2.0D < 1.0D) { - var8 = var12; - } else if (var0 * 3.0D < 2.0D) { - var8 = 6.0D * (var12 - var14) * (0.6666666666666666D - var0) + var14; - } else { - var8 = var14; - } - - if (var20 * 6.0D < 1.0D) { - var10 = 6.0D * (var12 - var14) * var20 + var14; - } else if (var20 * 2.0D < 1.0D) { - var10 = var12; - } else if (var20 * 3.0D < 2.0D) { - var10 = 6.0D * (var12 - var14) * (0.6666666666666666D - var20) + var14; - } else { - var10 = var14; - } - } - - int var22 = (int)(256.0D * var6); - int var13 = (int)(256.0D * var8); - int var23 = (int)(256.0D * var10); - int var15 = var23 + (var13 << 8) + (var22 << 16); - return var15; // L: 39 - } - - @ObfuscatedName("h") + @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "(ILnk;I)Lea;", - garbageValue = "-344240049" + descriptor = "(II)Leg;", + garbageValue = "-1295127026" ) - public static class135 method310(int var0, Buffer var1) { - int var2 = var1.readUnsignedByte(); // L: 24 - boolean var3 = (var2 & 1) != 0; // L: 25 - boolean var4 = (var2 & 2) != 0; // L: 26 - class135 var5 = new class135(var0); // L: 27 - int var6; - int[] var7; - boolean var8; - int var9; - short var10; - if (var3) { // L: 28 - var6 = var1.readUnsignedByte(); // L: 29 - var7 = new int[]{var6 & 15, var6 >> 4 & 15}; // L: 30 31 32 - var8 = var5.field1527 != null && var7.length == var5.field1527.length; // L: 33 - - for (var9 = 0; var9 < 2; ++var9) { // L: 34 - if (var7[var9] != 15) { // L: 35 - var10 = (short)var1.readUnsignedShort(); // L: 36 - if (var8) { // L: 37 - var5.field1527[var7[var9]] = var10; // L: 38 - } - } - } - } - - if (var4) { // L: 43 - var6 = var1.readUnsignedByte(); // L: 44 - var7 = new int[]{var6 & 15, var6 >> 4 & 15}; // L: 45 46 47 - var8 = var5.field1531 != null && var7.length == var5.field1531.length; // L: 48 - - for (var9 = 0; var9 < 2; ++var9) { // L: 49 - if (var7[var9] != 15) { // L: 50 - var10 = (short)var1.readUnsignedShort(); // L: 51 - if (var8) { // L: 52 - var5.field1531[var7[var9]] = var10; // L: 53 - } - } - } - } - - return var5; // L: 58 - } - - @ObfuscatedName("c") - @ObfuscatedSignature( - descriptor = "(Ljava/lang/String;I)Z", - garbageValue = "-686734686" - ) - static boolean method308(String var0) { - if (var0 == null) { // L: 163 - return false; + @Export("getObjectDefinition") + public static ObjectComposition getObjectDefinition(int var0) { + ObjectComposition var1 = (ObjectComposition)ObjectComposition.ObjectDefinition_cached.get((long)var0); // L: 73 + if (var1 != null) { // L: 74 + return var1; } else { - try { - new URL(var0); - return true; // L: 170 - } catch (MalformedURLException var2) { // L: 167 - return false; // L: 168 + byte[] var2 = ObjectComposition.ObjectDefinition_archive.takeFile(6, var0); // L: 75 + var1 = new ObjectComposition(); // L: 76 + var1.id = var0; // L: 77 + if (var2 != null) { // L: 78 + var1.decode(new Buffer(var2)); } + + var1.postDecode(); // L: 79 + if (var1.isSolid) { // L: 80 + var1.interactType = 0; // L: 81 + var1.boolean1 = false; // L: 82 + } + + ObjectComposition.ObjectDefinition_cached.put(var1, (long)var0); // L: 84 + return var1; // L: 85 } } - @ObfuscatedName("b") + @ObfuscatedName("p") @ObfuscatedSignature( - descriptor = "(Lkc;Lkc;Lkc;B)V", - garbageValue = "46" + descriptor = "(II)I", + garbageValue = "-686141430" ) - @Export("drawTitle") - static void drawTitle(Font var0, Font var1, Font var2) { - Login.xPadding = (GameEngine.canvasWidth - 765) / 2; // L: 993 - Login.loginBoxX = Login.xPadding + 202; // L: 994 - class21.loginBoxCenter = Login.loginBoxX + 180; // L: 995 - byte var3; - int var4; - int var7; - int var8; - int var11; - int var12; - int var25; - int var33; - int var37; - if (Login.worldSelectOpen) { // L: 996 - int var46; - if (Login.worldSelectBackSprites == null) { // L: 998 - Archive var43 = class43.archive8; // L: 1000 - var46 = var43.getGroupId("sl_back"); // L: 1002 - var25 = var43.getFileId(var46, ""); // L: 1003 - SpritePixels[] var49 = class253.method4767(var43, var46, var25); // L: 1004 - Login.worldSelectBackSprites = var49; // L: 1006 - } + @Export("Messages_getHistorySize") + static int Messages_getHistorySize(int var0) { + ChatChannel var1 = (ChatChannel)Messages.Messages_channels.get(var0); // L: 44 + return var1 == null ? 0 : var1.size(); // L: 45 46 + } - if (UserComparator5.worldSelectFlagSprites == null) { // L: 1008 - UserComparator5.worldSelectFlagSprites = GameObject.method4235(class43.archive8, "sl_flags", ""); - } - - if (Login.worldSelectArrows == null) { // L: 1009 - Login.worldSelectArrows = GameObject.method4235(class43.archive8, "sl_arrows", ""); - } - - if (AbstractWorldMapIcon.worldSelectStars == null) { // L: 1010 - AbstractWorldMapIcon.worldSelectStars = GameObject.method4235(class43.archive8, "sl_stars", ""); - } - - if (class285.worldSelectLeftSprite == null) { // L: 1011 - class285.worldSelectLeftSprite = MenuAction.SpriteBuffer_getIndexedSpriteByName(class43.archive8, "leftarrow", ""); - } - - if (User.worldSelectRightSprite == null) { // L: 1012 - User.worldSelectRightSprite = MenuAction.SpriteBuffer_getIndexedSpriteByName(class43.archive8, "rightarrow", ""); - } - - Rasterizer2D.Rasterizer2D_fillRectangle(Login.xPadding, 23, 765, 480, 0); // L: 1013 - Rasterizer2D.Rasterizer2D_fillRectangleGradient(Login.xPadding, 0, 125, 23, 12425273, 9135624); // L: 1014 - Rasterizer2D.Rasterizer2D_fillRectangleGradient(Login.xPadding + 125, 0, 640, 23, 5197647, 2697513); // L: 1015 - var0.drawCentered("Select a world", Login.xPadding + 62, 15, 0, -1); // L: 1016 - if (AbstractWorldMapIcon.worldSelectStars != null) { // L: 1017 - AbstractWorldMapIcon.worldSelectStars[1].drawAt(Login.xPadding + 140, 1); // L: 1018 - var1.draw("Members only world", Login.xPadding + 152, 10, 16777215, -1); // L: 1019 - AbstractWorldMapIcon.worldSelectStars[0].drawAt(Login.xPadding + 140, 12); // L: 1020 - var1.draw("Free world", Login.xPadding + 152, 21, 16777215, -1); // L: 1021 - } - - if (Login.worldSelectArrows != null) { // L: 1023 - var33 = Login.xPadding + 280; // L: 1024 - if (World.World_sortOption1[0] == 0 && World.World_sortOption2[0] == 0) { // L: 1025 - Login.worldSelectArrows[2].drawAt(var33, 4); - } else { - Login.worldSelectArrows[0].drawAt(var33, 4); // L: 1026 - } - - if (World.World_sortOption1[0] == 0 && World.World_sortOption2[0] == 1) { // L: 1027 - Login.worldSelectArrows[3].drawAt(var33 + 15, 4); - } else { - Login.worldSelectArrows[1].drawAt(var33 + 15, 4); // L: 1028 - } - - var0.draw("World", var33 + 32, 17, 16777215, -1); // L: 1029 - var4 = Login.xPadding + 390; // L: 1030 - if (World.World_sortOption1[0] == 1 && World.World_sortOption2[0] == 0) { // L: 1031 - Login.worldSelectArrows[2].drawAt(var4, 4); - } else { - Login.worldSelectArrows[0].drawAt(var4, 4); // L: 1032 - } - - if (World.World_sortOption1[0] == 1 && World.World_sortOption2[0] == 1) { // L: 1033 - Login.worldSelectArrows[3].drawAt(var4 + 15, 4); - } else { - Login.worldSelectArrows[1].drawAt(var4 + 15, 4); // L: 1034 - } - - var0.draw("Players", var4 + 32, 17, 16777215, -1); // L: 1035 - var46 = Login.xPadding + 500; // L: 1036 - if (World.World_sortOption1[0] == 2 && World.World_sortOption2[0] == 0) { // L: 1037 - Login.worldSelectArrows[2].drawAt(var46, 4); - } else { - Login.worldSelectArrows[0].drawAt(var46, 4); // L: 1038 - } - - if (World.World_sortOption1[0] == 2 && World.World_sortOption2[0] == 1) { // L: 1039 - Login.worldSelectArrows[3].drawAt(var46 + 15, 4); - } else { - Login.worldSelectArrows[1].drawAt(var46 + 15, 4); // L: 1040 - } - - var0.draw("Location", var46 + 32, 17, 16777215, -1); // L: 1041 - var25 = Login.xPadding + 610; // L: 1042 - if (World.World_sortOption1[0] == 3 && World.World_sortOption2[0] == 0) { // L: 1043 - Login.worldSelectArrows[2].drawAt(var25, 4); - } else { - Login.worldSelectArrows[0].drawAt(var25, 4); // L: 1044 - } - - if (World.World_sortOption1[0] == 3 && World.World_sortOption2[0] == 1) { // L: 1045 - Login.worldSelectArrows[3].drawAt(var25 + 15, 4); - } else { - Login.worldSelectArrows[1].drawAt(var25 + 15, 4); // L: 1046 - } - - var0.draw("Type", var25 + 32, 17, 16777215, -1); // L: 1047 - } - - Rasterizer2D.Rasterizer2D_fillRectangle(Login.xPadding + 708, 4, 50, 16, 0); // L: 1049 - var1.drawCentered("Cancel", Login.xPadding + 708 + 25, 16, 16777215, -1); // L: 1050 - Login.hoveredWorldIndex = -1; // L: 1051 - if (Login.worldSelectBackSprites != null) { // L: 1052 - var3 = 88; // L: 1053 - byte var38 = 19; // L: 1054 - var46 = 765 / (var3 + 1) - 1; // L: 1055 - var25 = 480 / (var38 + 1); // L: 1056 - - do { - var7 = var25; // L: 1058 - var8 = var46; // L: 1059 - if (var25 * (var46 - 1) >= World.World_count) { // L: 1060 - --var46; - } - - if (var46 * (var25 - 1) >= World.World_count) { // L: 1061 - --var25; - } - - if (var46 * (var25 - 1) >= World.World_count) { // L: 1062 - --var25; - } - } while(var25 != var7 || var8 != var46); // L: 1063 - - var7 = (765 - var46 * var3) / (var46 + 1); // L: 1065 - if (var7 > 5) { // L: 1066 - var7 = 5; - } - - var8 = (480 - var25 * var38) / (var25 + 1); // L: 1067 - if (var8 > 5) { // L: 1068 - var8 = 5; - } - - var37 = (765 - var3 * var46 - var7 * (var46 - 1)) / 2; // L: 1069 - int var48 = (480 - var38 * var25 - var8 * (var25 - 1)) / 2; // L: 1070 - var11 = (var25 + World.World_count - 1) / var25; // L: 1071 - Login.worldSelectPagesCount = var11 - var46; // L: 1072 - if (class285.worldSelectLeftSprite != null && Login.worldSelectPage > 0) { // L: 1073 - class285.worldSelectLeftSprite.drawAt(8, HealthBarDefinition.canvasHeight / 2 - class285.worldSelectLeftSprite.subHeight / 2); // L: 1074 - } - - if (User.worldSelectRightSprite != null && Login.worldSelectPage < Login.worldSelectPagesCount) { // L: 1076 - User.worldSelectRightSprite.drawAt(GameEngine.canvasWidth - User.worldSelectRightSprite.subWidth - 8, HealthBarDefinition.canvasHeight / 2 - User.worldSelectRightSprite.subHeight / 2); // L: 1077 - } - - var12 = var48 + 23; // L: 1079 - int var41 = var37 + Login.xPadding; // L: 1080 - int var14 = 0; // L: 1081 - boolean var15 = false; // L: 1082 - int var16 = Login.worldSelectPage; // L: 1083 - - int var17; - for (var17 = var16 * var25; var17 < World.World_count && var16 - Login.worldSelectPage < var46; ++var17) { // L: 1084 1085 - World var18 = Messages.World_worlds[var17]; // L: 1088 - boolean var19 = true; // L: 1089 - String var20 = Integer.toString(var18.population); // L: 1090 - if (var18.population == -1) { // L: 1091 - var20 = "OFF"; // L: 1092 - var19 = false; // L: 1093 - } else if (var18.population > 1980) { // L: 1095 - var20 = "FULL"; // L: 1096 - var19 = false; // L: 1097 - } - - int var22 = 0; // L: 1100 - byte var21; - if (var18.isBeta()) { // L: 1101 - if (var18.isMembersOnly()) { // L: 1102 - var21 = 7; - } else { - var21 = 6; // L: 1103 - } - } else if (var18.isDeadman()) { // L: 1105 - var22 = 16711680; // L: 1106 - if (var18.isMembersOnly()) { // L: 1107 - var21 = 5; - } else { - var21 = 4; // L: 1108 - } - } else if (var18.method1689()) { // L: 1110 - if (var18.isMembersOnly()) { // L: 1111 - var21 = 9; - } else { - var21 = 8; // L: 1112 - } - } else if (var18.isPvp()) { // L: 1114 - if (var18.isMembersOnly()) { // L: 1115 - var21 = 3; - } else { - var21 = 2; // L: 1116 - } - } else if (var18.isMembersOnly()) { // L: 1119 - var21 = 1; - } else { - var21 = 0; // L: 1120 - } - - if (MouseHandler.MouseHandler_x >= var41 && MouseHandler.MouseHandler_y >= var12 && MouseHandler.MouseHandler_x < var41 + var3 && MouseHandler.MouseHandler_y < var12 + var38 && var19) { // L: 1122 - Login.hoveredWorldIndex = var17; // L: 1123 - Login.worldSelectBackSprites[var21].drawTransOverlayAt(var41, var12, 128, 16777215); // L: 1124 - var15 = true; // L: 1125 - } else { - Login.worldSelectBackSprites[var21].drawAt(var41, var12); // L: 1127 - } - - if (UserComparator5.worldSelectFlagSprites != null) { // L: 1128 - UserComparator5.worldSelectFlagSprites[(var18.isMembersOnly() ? 8 : 0) + var18.location].drawAt(var41 + 29, var12); - } - - var0.drawCentered(Integer.toString(var18.id), var41 + 15, var38 / 2 + var12 + 5, var22, -1); // L: 1129 - var1.drawCentered(var20, var41 + 60, var38 / 2 + var12 + 5, 268435455, -1); // L: 1130 - var12 = var12 + var38 + var8; // L: 1131 - ++var14; // L: 1132 - if (var14 >= var25) { - var12 = var48 + 23; // L: 1133 - var41 = var41 + var3 + var7; // L: 1134 - var14 = 0; // L: 1135 - ++var16; // L: 1136 - } - } - - if (var15) { // L: 1139 - var17 = var1.stringWidth(Messages.World_worlds[Login.hoveredWorldIndex].activity) + 6; // L: 1140 - int var31 = var1.ascent + 8; // L: 1141 - int var42 = MouseHandler.MouseHandler_y + 25; // L: 1142 - if (var31 + var42 > 480) { // L: 1143 - var42 = MouseHandler.MouseHandler_y - 25 - var31; // L: 1144 - } - - Rasterizer2D.Rasterizer2D_fillRectangle(MouseHandler.MouseHandler_x - var17 / 2, var42, var17, var31, 16777120); // L: 1146 - Rasterizer2D.Rasterizer2D_drawRectangle(MouseHandler.MouseHandler_x - var17 / 2, var42, var17, var31, 0); // L: 1147 - var1.drawCentered(Messages.World_worlds[Login.hoveredWorldIndex].activity, MouseHandler.MouseHandler_x, var42 + var1.ascent + 4, 0, -1); // L: 1148 - } - } - - WorldMapDecorationType.rasterProvider.drawFull(0, 0); // L: 1151 + @ObfuscatedName("u") + @ObfuscatedSignature( + descriptor = "(Lio;IB)V", + garbageValue = "-43" + ) + @Export("Widget_setKeyIgnoreHeld") + static final void Widget_setKeyIgnoreHeld(Widget var0, int var1) { + if (var0.field3033 == null) { // L: 996 + throw new RuntimeException(); // L: 997 } else { - Canvas.leftTitleSprite.drawAt(Login.xPadding, 0); // L: 1155 - class12.rightTitleSprite.drawAt(Login.xPadding + 382, 0); // L: 1156 - FontName.logoSprite.drawAt(Login.xPadding + 382 - FontName.logoSprite.subWidth / 2, 18); // L: 1157 - if (Client.gameState == 0 || Client.gameState == 5) { // L: 1158 - var3 = 20; // L: 1159 - var0.drawCentered("RuneScape is loading - please wait...", Login.loginBoxX + 180, 245 - var3, 16777215, -1); // L: 1160 - var4 = 253 - var3; // L: 1161 - Rasterizer2D.Rasterizer2D_drawRectangle(Login.loginBoxX + 180 - 152, var4, 304, 34, 9179409); // L: 1162 - Rasterizer2D.Rasterizer2D_drawRectangle(Login.loginBoxX + 180 - 151, var4 + 1, 302, 32, 0); // L: 1163 - Rasterizer2D.Rasterizer2D_fillRectangle(Login.loginBoxX + 180 - 150, var4 + 2, Login.Login_loadingPercent * 3, 30, 9179409); // L: 1164 - Rasterizer2D.Rasterizer2D_fillRectangle(Login.Login_loadingPercent * 3 + (Login.loginBoxX + 180 - 150), var4 + 2, 300 - Login.Login_loadingPercent * 3, 30, 0); // L: 1165 - var0.drawCentered(Login.Login_loadingText, Login.loginBoxX + 180, 276 - var3, 16777215, -1); // L: 1166 - } - - String var5; - String var6; - short var32; - short var34; - if (Client.gameState == 20) { // L: 1168 - ItemContainer.titleboxSprite.drawAt(Login.loginBoxX + 180 - ItemContainer.titleboxSprite.subWidth / 2, 271 - ItemContainer.titleboxSprite.subHeight / 2); // L: 1169 - var32 = 201; // L: 1170 - var0.drawCentered(Login.Login_response1, Login.loginBoxX + 180, var32, 16776960, 0); // L: 1171 - var33 = var32 + 15; // L: 1172 - var0.drawCentered(Login.Login_response2, Login.loginBoxX + 180, var33, 16776960, 0); // L: 1173 - var33 += 15; // L: 1174 - var0.drawCentered(Login.Login_response3, Login.loginBoxX + 180, var33, 16776960, 0); // L: 1175 - var33 += 15; // L: 1176 - var33 += 7; // L: 1177 - if (Login.loginIndex != 4) { // L: 1178 - var0.draw("Login: ", Login.loginBoxX + 180 - 110, var33, 16777215, 0); // L: 1179 - var34 = 200; // L: 1180 - - for (var5 = class25.method316(); var0.stringWidth(var5) > var34; var5 = var5.substring(0, var5.length() - 1)) { // L: 1181 1182 1183 - } - - var0.draw(AbstractFont.escapeBrackets(var5), Login.loginBoxX + 180 - 70, var33, 16777215, 0); // L: 1185 - var33 += 15; // L: 1186 - - for (var6 = SecureRandomCallable.method2081(Login.Login_password); var0.stringWidth(var6) > var34; var6 = var6.substring(1)) { // L: 1187 1188 1189 - } - - var0.draw("Password: " + var6, Login.loginBoxX + 180 - 108, var33, 16777215, 0); // L: 1191 - var33 += 15; // L: 1192 - } - } - - if (Client.gameState == 10 || Client.gameState == 11) { // L: 1195 - ItemContainer.titleboxSprite.drawAt(Login.loginBoxX, 171); // L: 1196 - short var23; - if (Login.loginIndex == 0) { // L: 1197 - var32 = 251; // L: 1198 - var0.drawCentered("Welcome to RuneScape", Login.loginBoxX + 180, var32, 16776960, 0); // L: 1199 - var33 = var32 + 30; // L: 1200 - var4 = Login.loginBoxX + 180 - 80; // L: 1201 - var23 = 291; // L: 1202 - Login.titlebuttonSprite.drawAt(var4 - 73, var23 - 20); // L: 1203 - var0.drawLines("New User", var4 - 73, var23 - 20, 144, 40, 16777215, 0, 1, 1, 0); // L: 1204 - var4 = Login.loginBoxX + 180 + 80; // L: 1205 - Login.titlebuttonSprite.drawAt(var4 - 73, var23 - 20); // L: 1206 - var0.drawLines("Existing User", var4 - 73, var23 - 20, 144, 40, 16777215, 0, 1, 1, 0); // L: 1207 - } else if (Login.loginIndex == 1) { // L: 1209 - var0.drawCentered(Login.Login_response0, Login.loginBoxX + 180, 201, 16776960, 0); // L: 1210 - var32 = 236; // L: 1211 - var0.drawCentered(Login.Login_response1, Login.loginBoxX + 180, var32, 16777215, 0); // L: 1212 - var33 = var32 + 15; // L: 1213 - var0.drawCentered(Login.Login_response2, Login.loginBoxX + 180, var33, 16777215, 0); // L: 1214 - var33 += 15; // L: 1215 - var0.drawCentered(Login.Login_response3, Login.loginBoxX + 180, var33, 16777215, 0); // L: 1216 - var33 += 15; // L: 1217 - var4 = Login.loginBoxX + 180 - 80; // L: 1218 - var23 = 321; // L: 1219 - Login.titlebuttonSprite.drawAt(var4 - 73, var23 - 20); // L: 1220 - var0.drawCentered("Continue", var4, var23 + 5, 16777215, 0); // L: 1221 - var4 = Login.loginBoxX + 180 + 80; // L: 1222 - Login.titlebuttonSprite.drawAt(var4 - 73, var23 - 20); // L: 1223 - var0.drawCentered("Cancel", var4, var23 + 5, 16777215, 0); // L: 1224 - } else if (Login.loginIndex == 2) { // L: 1226 - var32 = 201; // L: 1227 - var0.drawCentered(Login.Login_response1, class21.loginBoxCenter, var32, 16776960, 0); // L: 1228 - var33 = var32 + 15; // L: 1229 - var0.drawCentered(Login.Login_response2, class21.loginBoxCenter, var33, 16776960, 0); // L: 1230 - var33 += 15; // L: 1231 - var0.drawCentered(Login.Login_response3, class21.loginBoxCenter, var33, 16776960, 0); // L: 1232 - var33 += 15; // L: 1233 - var33 += 7; // L: 1234 - var0.draw("Login: ", class21.loginBoxCenter - 110, var33, 16777215, 0); // L: 1235 - var34 = 200; // L: 1236 - - for (var5 = class25.method316(); var0.stringWidth(var5) > var34; var5 = var5.substring(1)) { // L: 1237 1238 1239 - } - - var0.draw(AbstractFont.escapeBrackets(var5) + (Login.currentLoginField == 0 & Client.cycle % 40 < 20 ? HorizontalAlignment.colorStartTag(16776960) + "|" : ""), class21.loginBoxCenter - 70, var33, 16777215, 0); // L: 1241 - var33 += 15; // L: 1242 - - for (var6 = SecureRandomCallable.method2081(Login.Login_password); var0.stringWidth(var6) > var34; var6 = var6.substring(1)) { // L: 1243 1244 1245 - } - - var0.draw("Password: " + var6 + (Login.currentLoginField == 1 & Client.cycle % 40 < 20 ? HorizontalAlignment.colorStartTag(16776960) + "|" : ""), class21.loginBoxCenter - 108, var33, 16777215, 0); // L: 1247 - var33 += 15; // L: 1248 - var32 = 277; // L: 1249 - var7 = class21.loginBoxCenter + -117; // L: 1250 - boolean var9 = Client.Login_isUsernameRemembered; // L: 1252 - boolean var28 = Login.field1006; // L: 1253 - IndexedSprite var27 = var9 ? (var28 ? class225.field2684 : GrandExchangeEvent.options_buttons_2Sprite) : (var28 ? InterfaceParent.field1134 : GrandExchangeOfferUnitPriceComparator.options_buttons_0Sprite); // L: 1255 - var27.drawAt(var7, var32); // L: 1258 - var7 = var7 + var27.subWidth + 5; // L: 1259 - var1.draw("Remember username", var7, var32 + 13, 16776960, 0); // L: 1260 - var7 = class21.loginBoxCenter + 24; // L: 1261 - IndexedSprite var29 = SoundCache.method866(class12.clientPreferences.hideUsername, Login.field1007); // L: 1262 - var29.drawAt(var7, var32); // L: 1263 - var7 = var7 + var29.subWidth + 5; // L: 1264 - var1.draw("Hide username", var7, var32 + 13, 16776960, 0); // L: 1265 - var33 = var32 + 15; // L: 1266 - var12 = class21.loginBoxCenter - 80; // L: 1267 - short var13 = 321; // L: 1268 - Login.titlebuttonSprite.drawAt(var12 - 73, var13 - 20); // L: 1269 - var0.drawCentered("Login", var12, var13 + 5, 16777215, 0); // L: 1270 - var12 = class21.loginBoxCenter + 80; // L: 1271 - Login.titlebuttonSprite.drawAt(var12 - 73, var13 - 20); // L: 1272 - var0.drawCentered("Cancel", var12, var13 + 5, 16777215, 0); // L: 1273 - var32 = 357; // L: 1274 - switch(Login.field997) { // L: 1275 - case 2: - Varps.field2923 = "Having trouble logging in?"; // L: 1277 - break; - default: - Varps.field2923 = "Can't login? Click here."; // L: 1280 - } - - class18.field155 = new Bounds(class21.loginBoxCenter, var32, var1.stringWidth(Varps.field2923), 11); // L: 1283 - WorldMapElement.field1572 = new Bounds(class21.loginBoxCenter, var32, var1.stringWidth("Still having trouble logging in?"), 11); // L: 1284 - var1.drawCentered(Varps.field2923, class21.loginBoxCenter, var32, 16777215, 0); // L: 1285 - } else if (Login.loginIndex == 3) { // L: 1287 - var32 = 201; // L: 1288 - var0.drawCentered("Invalid credentials.", Login.loginBoxX + 180, var32, 16776960, 0); // L: 1289 - var33 = var32 + 20; // L: 1290 - var1.drawCentered("For accounts created after 24th November 2010, please use your", Login.loginBoxX + 180, var33, 16776960, 0); // L: 1291 - var33 += 15; // L: 1292 - var1.drawCentered("email address to login. Otherwise please login with your username.", Login.loginBoxX + 180, var33, 16776960, 0); // L: 1293 - var33 += 15; // L: 1294 - var4 = Login.loginBoxX + 180; // L: 1295 - var23 = 276; // L: 1296 - Login.titlebuttonSprite.drawAt(var4 - 73, var23 - 20); // L: 1297 - var2.drawCentered("Try again", var4, var23 + 5, 16777215, 0); // L: 1298 - var4 = Login.loginBoxX + 180; // L: 1299 - var23 = 326; // L: 1300 - Login.titlebuttonSprite.drawAt(var4 - 73, var23 - 20); // L: 1301 - var2.drawCentered("Forgotten password?", var4, var23 + 5, 16777215, 0); // L: 1302 - } else if (Login.loginIndex == 4) { // L: 1304 - var0.drawCentered("Authenticator", Login.loginBoxX + 180, 201, 16776960, 0); // L: 1305 - var32 = 236; // L: 1306 - var0.drawCentered(Login.Login_response1, Login.loginBoxX + 180, var32, 16777215, 0); // L: 1307 - var33 = var32 + 15; // L: 1308 - var0.drawCentered(Login.Login_response2, Login.loginBoxX + 180, var33, 16777215, 0); // L: 1309 - var33 += 15; // L: 1310 - var0.drawCentered(Login.Login_response3, Login.loginBoxX + 180, var33, 16777215, 0); // L: 1311 - var33 += 15; // L: 1312 - var5 = "PIN: "; // L: 1314 - String var26 = class16.otp; // L: 1316 - var37 = var26.length(); // L: 1319 - char[] var10 = new char[var37]; // L: 1321 - - for (var11 = 0; var11 < var37; ++var11) { // L: 1322 - var10[var11] = '*'; - } - - String var47 = new String(var10); // L: 1323 - var0.draw(var5 + var47 + (Client.cycle % 40 < 20 ? HorizontalAlignment.colorStartTag(16776960) + "|" : ""), Login.loginBoxX + 180 - 108, var33, 16777215, 0); // L: 1327 - var33 -= 8; // L: 1328 - var0.draw("Trust this computer", Login.loginBoxX + 180 - 9, var33, 16776960, 0); // L: 1329 - var33 += 15; // L: 1330 - var0.draw("for 30 days: ", Login.loginBoxX + 180 - 9, var33, 16776960, 0); // L: 1331 - var8 = Login.loginBoxX + 180 - 9 + var0.stringWidth("for 30 days: ") + 15; // L: 1332 - var37 = var33 - var0.ascent; // L: 1333 - IndexedSprite var39; - if (Login.field1008) { // L: 1335 - var39 = GrandExchangeEvent.options_buttons_2Sprite; // L: 1336 - } else { - var39 = GrandExchangeOfferUnitPriceComparator.options_buttons_0Sprite; // L: 1339 - } - - var39.drawAt(var8, var37); // L: 1341 - var33 += 15; // L: 1342 - var11 = Login.loginBoxX + 180 - 80; // L: 1343 - short var40 = 321; // L: 1344 - Login.titlebuttonSprite.drawAt(var11 - 73, var40 - 20); // L: 1345 - var0.drawCentered("Continue", var11, var40 + 5, 16777215, 0); // L: 1346 - var11 = Login.loginBoxX + 180 + 80; // L: 1347 - Login.titlebuttonSprite.drawAt(var11 - 73, var40 - 20); // L: 1348 - var0.drawCentered("Cancel", var11, var40 + 5, 16777215, 0); // L: 1349 - var1.drawCentered("Can't Log In?", Login.loginBoxX + 180, var40 + 36, 255, 0); // L: 1350 - } else if (Login.loginIndex == 5) { // L: 1352 - var0.drawCentered("Forgotten your password?", Login.loginBoxX + 180, 201, 16776960, 0); // L: 1353 - var32 = 221; // L: 1354 - var2.drawCentered(Login.Login_response1, Login.loginBoxX + 180, var32, 16776960, 0); // L: 1355 - var33 = var32 + 15; // L: 1356 - var2.drawCentered(Login.Login_response2, Login.loginBoxX + 180, var33, 16776960, 0); // L: 1357 - var33 += 15; // L: 1358 - var2.drawCentered(Login.Login_response3, Login.loginBoxX + 180, var33, 16776960, 0); // L: 1359 - var33 += 15; // L: 1360 - var33 += 14; // L: 1361 - var0.draw("Username/email: ", Login.loginBoxX + 180 - 145, var33, 16777215, 0); // L: 1362 - var34 = 174; // L: 1363 - - for (var5 = class25.method316(); var0.stringWidth(var5) > var34; var5 = var5.substring(1)) { // L: 1364 1365 1366 - } - - var0.draw(AbstractFont.escapeBrackets(var5) + (Client.cycle % 40 < 20 ? HorizontalAlignment.colorStartTag(16776960) + "|" : ""), Login.loginBoxX + 180 - 34, var33, 16777215, 0); // L: 1368 - var33 += 15; // L: 1369 - var25 = Login.loginBoxX + 180 - 80; // L: 1370 - short var35 = 321; // L: 1371 - Login.titlebuttonSprite.drawAt(var25 - 73, var35 - 20); // L: 1372 - var0.drawCentered("Recover", var25, var35 + 5, 16777215, 0); // L: 1373 - var25 = Login.loginBoxX + 180 + 80; // L: 1374 - Login.titlebuttonSprite.drawAt(var25 - 73, var35 - 20); // L: 1375 - var0.drawCentered("Back", var25, var35 + 5, 16777215, 0); // L: 1376 - var35 = 356; // L: 1377 - var1.drawCentered("Still having trouble logging in?", class21.loginBoxCenter, var35, 268435455, 0); // L: 1378 - } else if (Login.loginIndex == 6) { // L: 1380 - var32 = 201; // L: 1381 - var0.drawCentered(Login.Login_response1, Login.loginBoxX + 180, var32, 16776960, 0); // L: 1382 - var33 = var32 + 15; // L: 1383 - var0.drawCentered(Login.Login_response2, Login.loginBoxX + 180, var33, 16776960, 0); // L: 1384 - var33 += 15; // L: 1385 - var0.drawCentered(Login.Login_response3, Login.loginBoxX + 180, var33, 16776960, 0); // L: 1386 - var33 += 15; // L: 1387 - var4 = Login.loginBoxX + 180; // L: 1388 - var23 = 321; // L: 1389 - Login.titlebuttonSprite.drawAt(var4 - 73, var23 - 20); // L: 1390 - var0.drawCentered("Back", var4, var23 + 5, 16777215, 0); // L: 1391 - } else if (Login.loginIndex == 7) { // L: 1393 - var32 = 216; // L: 1394 - var0.drawCentered("Your date of birth isn't set.", Login.loginBoxX + 180, var32, 16776960, 0); // L: 1395 - var33 = var32 + 15; // L: 1396 - var2.drawCentered("Please verify your account status by", Login.loginBoxX + 180, var33, 16776960, 0); // L: 1397 - var33 += 15; // L: 1398 - var2.drawCentered("setting your date of birth.", Login.loginBoxX + 180, var33, 16776960, 0); // L: 1399 - var33 += 15; // L: 1400 - var4 = Login.loginBoxX + 180 - 80; // L: 1401 - var23 = 321; // L: 1402 - Login.titlebuttonSprite.drawAt(var4 - 73, var23 - 20); // L: 1403 - var0.drawCentered("Set Date of Birth", var4, var23 + 5, 16777215, 0); // L: 1404 - var4 = Login.loginBoxX + 180 + 80; // L: 1405 - Login.titlebuttonSprite.drawAt(var4 - 73, var23 - 20); // L: 1406 - var0.drawCentered("Back", var4, var23 + 5, 16777215, 0); // L: 1407 - } else if (Login.loginIndex == 8) { // L: 1409 - var32 = 216; // L: 1410 - var0.drawCentered("Sorry, but your account is not eligible to play.", Login.loginBoxX + 180, var32, 16776960, 0); // L: 1411 - var33 = var32 + 15; // L: 1412 - var2.drawCentered("For more information, please take a look at", Login.loginBoxX + 180, var33, 16776960, 0); // L: 1413 - var33 += 15; // L: 1414 - var2.drawCentered("our privacy policy.", Login.loginBoxX + 180, var33, 16776960, 0); // L: 1415 - var33 += 15; // L: 1416 - var4 = Login.loginBoxX + 180 - 80; // L: 1417 - var23 = 321; // L: 1418 - Login.titlebuttonSprite.drawAt(var4 - 73, var23 - 20); // L: 1419 - var0.drawCentered("Privacy Policy", var4, var23 + 5, 16777215, 0); // L: 1420 - var4 = Login.loginBoxX + 180 + 80; // L: 1421 - Login.titlebuttonSprite.drawAt(var4 - 73, var23 - 20); // L: 1422 - var0.drawCentered("Back", var4, var23 + 5, 16777215, 0); // L: 1423 - } else if (Login.loginIndex == 12) { // L: 1425 - var32 = 201; // L: 1426 - String var24 = ""; // L: 1427 - var5 = ""; // L: 1428 - var6 = ""; // L: 1429 - switch(Login.field996) { // L: 1430 - case 0: - var24 = "Your account has been disabled."; // L: 1433 - var5 = Strings.field3295; // L: 1434 - var6 = ""; // L: 1435 - break; - case 1: - var24 = "Account locked as we suspect it has been stolen."; // L: 1440 - var5 = Strings.field3334; // L: 1441 - var6 = ""; // L: 1442 - break; // L: 1443 - default: - BufferedSink.Login_promptCredentials(false); // L: 1447 - } - - var0.drawCentered(var24, Login.loginBoxX + 180, var32, 16776960, 0); // L: 1451 - var33 = var32 + 15; // L: 1452 - var2.drawCentered(var5, Login.loginBoxX + 180, var33, 16776960, 0); // L: 1453 - var33 += 15; // L: 1454 - var2.drawCentered(var6, Login.loginBoxX + 180, var33, 16776960, 0); // L: 1455 - var33 += 15; // L: 1456 - var7 = Login.loginBoxX + 180; // L: 1457 - short var36 = 276; // L: 1458 - Login.titlebuttonSprite.drawAt(var7 - 73, var36 - 20); // L: 1459 - var0.drawCentered("Support Page", var7, var36 + 5, 16777215, 0); // L: 1460 - var7 = Login.loginBoxX + 180; // L: 1461 - var36 = 326; // L: 1462 - Login.titlebuttonSprite.drawAt(var7 - 73, var36 - 20); // L: 1463 - var0.drawCentered("Back", var7, var36 + 5, 16777215, 0); // L: 1464 - } else if (Login.loginIndex == 24) { // L: 1466 - var32 = 221; // L: 1467 - var0.drawCentered(Login.Login_response1, Login.loginBoxX + 180, var32, 16777215, 0); // L: 1468 - var33 = var32 + 15; // L: 1469 - var0.drawCentered(Login.Login_response2, Login.loginBoxX + 180, var33, 16777215, 0); // L: 1470 - var33 += 15; // L: 1471 - var0.drawCentered(Login.Login_response3, Login.loginBoxX + 180, var33, 16777215, 0); // L: 1472 - var33 += 15; // L: 1473 - var4 = Login.loginBoxX + 180; // L: 1474 - var23 = 301; // L: 1475 - Login.titlebuttonSprite.drawAt(var4 - 73, var23 - 20); // L: 1476 - var0.drawCentered("Ok", var4, var23 + 5, 16777215, 0); // L: 1477 - } - } - - if (Client.gameState >= 10) { // L: 1480 - int[] var30 = new int[4]; // L: 1481 - Rasterizer2D.Rasterizer2D_getClipArray(var30); // L: 1482 - Rasterizer2D.Rasterizer2D_setClip(Login.xPadding, 0, Login.xPadding + 765, HealthBarDefinition.canvasHeight); // L: 1483 - AttackOption.loginScreenRunesAnimation.draw(Login.xPadding - 22, Client.cycle); // L: 1484 - AttackOption.loginScreenRunesAnimation.draw(Login.xPadding + 22 + 765 - 128, Client.cycle); // L: 1485 - Rasterizer2D.Rasterizer2D_setClipArray(var30); // L: 1486 - } - - FontName.title_muteSprite[class12.clientPreferences.titleMusicDisabled ? 1 : 0].drawAt(Login.xPadding + 765 - 40, 463); // L: 1488 - if (Client.gameState > 5 && class7.clientLanguage == Language.Language_EN) { // L: 1489 - if (class288.field3691 != null) { // L: 1490 - var33 = Login.xPadding + 5; // L: 1491 - var34 = 463; // L: 1492 - byte var44 = 100; // L: 1493 - byte var45 = 35; // L: 1494 - class288.field3691.drawAt(var33, var34); // L: 1495 - var0.drawCentered("World" + " " + Client.worldId, var44 / 2 + var33, var45 / 2 + var34 - 2, 16777215, 0); // L: 1496 - if (World.World_request != null) { // L: 1497 - var1.drawCentered("Loading...", var44 / 2 + var33, var45 / 2 + var34 + 12, 16777215, 0); - } else { - var1.drawCentered("Click to switch", var44 / 2 + var33, var45 / 2 + var34 + 12, 16777215, 0); // L: 1498 - } - } else { - class288.field3691 = MenuAction.SpriteBuffer_getIndexedSpriteByName(class43.archive8, "sl_button", ""); // L: 1501 - } + if (var0.field3012 == null) { // L: 999 + var0.field3012 = new int[var0.field3033.length]; // L: 1000 } + var0.field3012[var1] = Integer.MAX_VALUE; // L: 1002 } - } // L: 1153 1504 - - @ObfuscatedName("ki") - @ObfuscatedSignature( - descriptor = "(IB)V", - garbageValue = "90" - ) - static final void method306(int var0) { - var0 = Math.min(Math.max(var0, 0), 255); // L: 11186 - if (var0 != class12.clientPreferences.musicVolume) { // L: 11187 - if (class12.clientPreferences.musicVolume == 0 && Client.currentTrackGroupId != -1) { // L: 11188 - World.method1684(class29.archive6, Client.currentTrackGroupId, 0, var0, false); // L: 11189 - Client.field866 = false; // L: 11190 - } else if (var0 == 0) { // L: 11192 - ViewportMouse.method4193(); // L: 11193 - Client.field866 = false; // L: 11194 - } else { - FriendLoginUpdate.method5552(var0); // L: 11196 - } - - class12.clientPreferences.musicVolume = var0; // L: 11197 - KeyHandler.savePreferences(); // L: 11198 - } - - } // L: 11200 + } // L: 1003 } diff --git a/runescape-client/src/main/java/class230.java b/runescape-client/src/main/java/class230.java index 18d4b70a33..8853f51263 100644 --- a/runescape-client/src/main/java/class230.java +++ b/runescape-client/src/main/java/class230.java @@ -1,91 +1,20 @@ -import java.applet.Applet; -import java.net.URL; -import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; -import net.runelite.mapping.ObfuscatedSignature; -import netscape.javascript.JSObject; -@ObfuscatedName("hv") +@ObfuscatedName("hi") public class class230 { - @ObfuscatedName("h") - static int[] field2816; - @ObfuscatedName("nm") - @ObfuscatedGetter( - intValue = -1187192027 - ) - static int field2812; + @ObfuscatedName("v") + static int[] field2814; static { new Object(); - field2816 = new int[33]; // L: 8 - field2816[0] = 0; // L: 11 + field2814 = new int[33]; // L: 8 + field2814[0] = 0; // L: 11 int var0 = 2; // L: 12 for (int var1 = 1; var1 < 33; ++var1) { // L: 13 - field2816[var1] = var0 - 1; // L: 14 + field2814[var1] = var0 - 1; // L: 14 var0 += var0; // L: 15 } } // L: 17 - - @ObfuscatedName("o") - @ObfuscatedSignature( - descriptor = "(Ljava/lang/String;ILjava/lang/String;I)Z", - garbageValue = "-1639678169" - ) - static boolean method4348(String var0, int var1, String var2) { - if (var1 == 0) { // L: 54 - try { - if (!class44.field305.startsWith("win")) { // L: 56 - throw new Exception(); - } else if (!var0.startsWith("http://") && !var0.startsWith("https://")) { // L: 57 - throw new Exception(); - } else { - String var14 = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789?&=,.%+-_#:/*"; // L: 58 - - for (int var4 = 0; var4 < var0.length(); ++var4) { // L: 59 - if (var14.indexOf(var0.charAt(var4)) == -1) { // L: 60 - throw new Exception(); - } - } - - Runtime.getRuntime().exec("cmd /c start \"j\" \"" + var0 + "\""); // L: 62 - return true; // L: 63 - } - } catch (Throwable var8) { // L: 65 - return false; // L: 66 - } - } else if (var1 == 1) { // L: 69 - try { - Applet var7 = class44.applet; // L: 72 - Object[] var5 = new Object[]{(new URL(class44.applet.getCodeBase(), var0)).toString()}; // L: 73 - Object var13 = JSObject.getWindow(var7).call(var2, var5); // L: 76 - return var13 != null; // L: 79 - } catch (Throwable var9) { // L: 81 - return false; // L: 82 - } - } else if (var1 == 2) { // L: 85 - try { - class44.applet.getAppletContext().showDocument(new URL(class44.applet.getCodeBase(), var0), "_blank"); // L: 87 - return true; // L: 88 - } catch (Exception var10) { // L: 90 - return false; // L: 91 - } - } else if (var1 == 3) { // L: 94 - try { - Applet var3 = class44.applet; // L: 96 - JSObject.getWindow(var3).call("loggedout", (Object[])null); // L: 99 - } catch (Throwable var12) { // L: 102 - } - - try { - class44.applet.getAppletContext().showDocument(new URL(class44.applet.getCodeBase(), var0), "_top"); // L: 104 - return true; // L: 105 - } catch (Exception var11) { // L: 107 - return false; // L: 108 - } - } else { - throw new IllegalArgumentException(); // L: 111 - } - } } diff --git a/runescape-client/src/main/java/class232.java b/runescape-client/src/main/java/class232.java index 0ed86bdde4..ba35650dc4 100644 --- a/runescape-client/src/main/java/class232.java +++ b/runescape-client/src/main/java/class232.java @@ -2,90 +2,44 @@ 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("hc") +@ObfuscatedName("hx") public class class232 { - @ObfuscatedName("h") + @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "Ljp;" + descriptor = "Ljv;" ) @Export("musicPatchesArchive") - static AbstractArchive musicPatchesArchive; - @ObfuscatedName("c") + public static AbstractArchive musicPatchesArchive; + @ObfuscatedName("n") @ObfuscatedSignature( - descriptor = "Ljp;" + descriptor = "Ljv;" ) @Export("musicSamplesArchive") - static AbstractArchive musicSamplesArchive; - @ObfuscatedName("g") - @ObfuscatedSignature( - descriptor = "Lhp;" - ) - @Export("midiPcmStream") - public static MidiPcmStream midiPcmStream; - @ObfuscatedName("l") + public static AbstractArchive musicSamplesArchive; + @ObfuscatedName("p") @ObfuscatedGetter( - intValue = 459547131 + intValue = -1481365935 ) @Export("musicPlayerStatus") public static int musicPlayerStatus; - @ObfuscatedName("t") + @ObfuscatedName("d") @ObfuscatedGetter( - intValue = -557844945 + intValue = -528081795 ) - @Export("musicTrackGroupId") - static int musicTrackGroupId; - @ObfuscatedName("v") + @Export("musicTrackVolume") + public static int musicTrackVolume; + @ObfuscatedName("s") @ObfuscatedGetter( - intValue = 1204207413 - ) - @Export("musicTrackFileId") - static int musicTrackFileId; - @ObfuscatedName("q") - @ObfuscatedGetter( - intValue = -2028429341 + intValue = 974163603 ) @Export("pcmSampleLength") static int pcmSampleLength; - @ObfuscatedName("ei") - @ObfuscatedSignature( - descriptor = "Lji;" - ) - @Export("archive19") - static Archive archive19; + @ObfuscatedName("u") + @Export("musicTrackBoolean") + public static boolean musicTrackBoolean; static { musicPlayerStatus = 0; // L: 11 } - - @ObfuscatedName("k") - @ObfuscatedSignature( - descriptor = "(ILci;ZI)I", - garbageValue = "788282461" - ) - static int method4357(int var0, Script var1, boolean var2) { - Widget var3 = var2 ? class308.scriptDotWidget : class24.scriptActiveWidget; // L: 1074 - if (var0 == ScriptOpcodes.CC_GETX) { // L: 1075 - Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = var3.x; // L: 1076 - return 1; // L: 1077 - } else if (var0 == ScriptOpcodes.CC_GETY) { // L: 1079 - Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = var3.y; // L: 1080 - return 1; // L: 1081 - } else if (var0 == ScriptOpcodes.CC_GETWIDTH) { // L: 1083 - Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = var3.width; // L: 1084 - return 1; // L: 1085 - } else if (var0 == ScriptOpcodes.CC_GETHEIGHT) { // L: 1087 - Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = var3.height; // L: 1088 - return 1; // L: 1089 - } else if (var0 == ScriptOpcodes.CC_GETHIDE) { // L: 1091 - Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = var3.isHidden ? 1 : 0; // L: 1092 - return 1; // L: 1093 - } else if (var0 == ScriptOpcodes.CC_GETLAYER) { // L: 1095 - Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = var3.parentId; // L: 1096 - return 1; // L: 1097 - } else { - return 2; // L: 1099 - } - } } diff --git a/runescape-client/src/main/java/class24.java b/runescape-client/src/main/java/class24.java index 7ae43d6c07..31952ee62b 100644 --- a/runescape-client/src/main/java/class24.java +++ b/runescape-client/src/main/java/class24.java @@ -2,29 +2,400 @@ 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("w") +@ObfuscatedName("q") public class class24 { - @ObfuscatedName("a") + @ObfuscatedName("e") @ObfuscatedSignature( - descriptor = "Liv;" + descriptor = "Lca;" ) - @Export("scriptActiveWidget") - static Widget scriptActiveWidget; - @ObfuscatedName("ey") + @Export("loginScreenRunesAnimation") + static LoginScreenAnimation loginScreenRunesAnimation; + @ObfuscatedName("gu") + @Export("regionLandArchiveIds") + static int[] regionLandArchiveIds; + @ObfuscatedName("lp") @ObfuscatedGetter( - intValue = -568813485 + intValue = -1944838207 ) - @Export("js5Port") - static int js5Port; + @Export("menuHeight") + static int menuHeight; - @ObfuscatedName("ja") + @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "(ZB)V", - garbageValue = "24" + descriptor = "(I)[Lhl;", + garbageValue = "603080453" ) - @Export("setTapToDrop") - static void setTapToDrop(boolean var0) { - Client.tapToDrop = var0; // L: 10451 - } // L: 10452 + @Export("ServerPacket_values") + public static ServerPacket[] ServerPacket_values() { + return new ServerPacket[]{ServerPacket.field2780, ServerPacket.field2751, ServerPacket.field2702, ServerPacket.field2703, ServerPacket.field2704, ServerPacket.field2705, ServerPacket.field2706, ServerPacket.field2798, ServerPacket.field2708, ServerPacket.field2785, ServerPacket.field2729, ServerPacket.field2711, ServerPacket.field2748, ServerPacket.field2713, ServerPacket.field2714, ServerPacket.field2760, ServerPacket.field2716, ServerPacket.field2717, ServerPacket.field2746, ServerPacket.field2719, ServerPacket.field2709, ServerPacket.field2721, ServerPacket.field2715, ServerPacket.field2723, ServerPacket.field2724, ServerPacket.field2725, ServerPacket.field2726, ServerPacket.field2775, ServerPacket.field2756, ServerPacket.field2722, ServerPacket.field2764, ServerPacket.field2731, ServerPacket.field2712, ServerPacket.field2795, ServerPacket.field2734, ServerPacket.field2735, ServerPacket.field2700, ServerPacket.field2737, ServerPacket.field2749, ServerPacket.field2739, ServerPacket.field2740, ServerPacket.field2741, ServerPacket.field2742, ServerPacket.field2743, ServerPacket.field2744, ServerPacket.field2745, ServerPacket.field2774, ServerPacket.field2732, ServerPacket.field2773, ServerPacket.field2738, ServerPacket.field2750, ServerPacket.field2747, ServerPacket.field2752, ServerPacket.field2753, ServerPacket.field2754, ServerPacket.field2755, ServerPacket.field2757, ServerPacket.field2789, ServerPacket.field2710, ServerPacket.field2759, ServerPacket.field2793, ServerPacket.field2761, ServerPacket.field2762, ServerPacket.field2763, ServerPacket.field2787, ServerPacket.field2765, ServerPacket.field2784, ServerPacket.field2767, ServerPacket.field2730, ServerPacket.field2769, ServerPacket.field2770, ServerPacket.field2771, ServerPacket.field2772, ServerPacket.field2768, ServerPacket.field2701, ServerPacket.field2718, ServerPacket.field2776, ServerPacket.field2777, ServerPacket.field2778, ServerPacket.field2779, ServerPacket.field2794, ServerPacket.field2781, ServerPacket.field2782, ServerPacket.field2783, ServerPacket.field2727, ServerPacket.field2728, ServerPacket.field2786, ServerPacket.field2707, ServerPacket.field2788, ServerPacket.field2766, ServerPacket.field2790, ServerPacket.field2791, ServerPacket.field2792, ServerPacket.field2720, ServerPacket.field2736}; // L: 104 + } + + @ObfuscatedName("p") + @ObfuscatedSignature( + descriptor = "(Ljava/lang/CharSequence;IZB)I", + garbageValue = "-105" + ) + public static int method260(CharSequence var0, int var1, boolean var2) { + if (var1 >= 2 && var1 <= 36) { // L: 71 + boolean var3 = false; // L: 72 + boolean var4 = false; // L: 73 + int var5 = 0; // L: 74 + int var6 = var0.length(); // L: 75 + + for (int var7 = 0; var7 < var6; ++var7) { // L: 76 + char var8 = var0.charAt(var7); // L: 77 + if (var7 == 0) { // L: 78 + if (var8 == '-') { // L: 79 + var3 = true; // L: 80 + continue; + } + + if (var8 == '+') { // L: 83 + continue; + } + } + + int var10; + if (var8 >= '0' && var8 <= '9') { // L: 85 + var10 = var8 - '0'; + } else if (var8 >= 'A' && var8 <= 'Z') { // L: 86 + var10 = var8 - '7'; + } else { + if (var8 < 'a' || var8 > 'z') { // L: 87 + throw new NumberFormatException(); // L: 88 + } + + var10 = var8 - 'W'; + } + + if (var10 >= var1) { // L: 89 + throw new NumberFormatException(); + } + + if (var3) { // L: 90 + var10 = -var10; + } + + int var9 = var10 + var5 * var1; // L: 91 + if (var9 / var1 != var5) { // L: 92 + throw new NumberFormatException(); + } + + var5 = var9; // L: 93 + var4 = true; // L: 94 + } + + if (!var4) { // L: 96 + throw new NumberFormatException(); + } else { + return var5; // L: 97 + } + } else { + throw new IllegalArgumentException("" + var1); + } + } + + @ObfuscatedName("s") + @ObfuscatedSignature( + descriptor = "(S)[Lop;", + garbageValue = "-29644" + ) + static IndexedSprite[] method262() { + IndexedSprite[] var0 = new IndexedSprite[class396.SpriteBuffer_spriteCount]; // L: 146 + + for (int var1 = 0; var1 < class396.SpriteBuffer_spriteCount; ++var1) { // L: 147 + IndexedSprite var2 = var0[var1] = new IndexedSprite(); // L: 148 + var2.width = class396.SpriteBuffer_spriteWidth; // L: 149 + var2.height = UserComparator2.SpriteBuffer_spriteHeight; // L: 150 + var2.xOffset = WorldMapDecoration.SpriteBuffer_xOffsets[var1]; // L: 151 + var2.yOffset = Calendar.SpriteBuffer_yOffsets[var1]; // L: 152 + var2.subWidth = class396.SpriteBuffer_spriteWidths[var1]; // L: 153 + var2.subHeight = class302.SpriteBuffer_spriteHeights[var1]; // L: 154 + var2.palette = MilliClock.SpriteBuffer_spritePalette; // L: 155 + var2.pixels = class396.SpriteBuffer_pixels[var1]; // L: 156 + } + + MilliClock.method2587(); // L: 158 + return var0; // L: 159 + } + + @ObfuscatedName("c") + @ObfuscatedSignature( + descriptor = "(I)V", + garbageValue = "-355325275" + ) + public static void method259() { + ObjectComposition.ObjectDefinition_cached.clear(); // L: 404 + ObjectComposition.ObjectDefinition_cachedModelData.clear(); // L: 405 + ObjectComposition.ObjectDefinition_cachedEntities.clear(); // L: 406 + ObjectComposition.ObjectDefinition_cachedModels.clear(); // L: 407 + } // L: 408 + + @ObfuscatedName("ar") + @ObfuscatedSignature( + descriptor = "(ILcf;ZB)I", + garbageValue = "5" + ) + static int method261(int var0, Script var1, boolean var2) { + if (var0 == ScriptOpcodes.CHAT_GETFILTER_PUBLIC) { // L: 3206 + Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = Client.publicChatMode; // L: 3207 + return 1; // L: 3208 + } else if (var0 == ScriptOpcodes.CHAT_SETFILTER) { // L: 3210 + class44.Interpreter_intStackSize -= 3; // L: 3211 + Client.publicChatMode = Interpreter.Interpreter_intStack[class44.Interpreter_intStackSize]; // L: 3212 + ScriptEvent.privateChatMode = class124.method2498(Interpreter.Interpreter_intStack[class44.Interpreter_intStackSize + 1]); // L: 3213 + if (ScriptEvent.privateChatMode == null) { // L: 3214 + ScriptEvent.privateChatMode = PrivateChatMode.field3887; + } + + Client.tradeChatMode = Interpreter.Interpreter_intStack[class44.Interpreter_intStackSize + 2]; // L: 3215 + PacketBufferNode var13 = class21.getPacketBufferNode(ClientPacket.field2611, Client.packetWriter.isaacCipher); // L: 3217 + var13.packetBuffer.writeByte(Client.publicChatMode); // L: 3218 + var13.packetBuffer.writeByte(ScriptEvent.privateChatMode.field3890); // L: 3219 + var13.packetBuffer.writeByte(Client.tradeChatMode); // L: 3220 + Client.packetWriter.addNode(var13); // L: 3221 + return 1; // L: 3222 + } else { + PacketBufferNode var6; + int var7; + String var8; + int var9; + if (var0 == ScriptOpcodes.CHAT_SENDABUSEREPORT) { // L: 3224 + var8 = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize]; // L: 3225 + class44.Interpreter_intStackSize -= 2; // L: 3226 + var7 = Interpreter.Interpreter_intStack[class44.Interpreter_intStackSize]; // L: 3227 + var9 = Interpreter.Interpreter_intStack[class44.Interpreter_intStackSize + 1]; // L: 3228 + var6 = class21.getPacketBufferNode(ClientPacket.field2596, Client.packetWriter.isaacCipher); // L: 3230 + var6.packetBuffer.writeByte(Tiles.stringCp1252NullTerminatedByteSize(var8) + 2); // L: 3231 + var6.packetBuffer.writeStringCp1252NullTerminated(var8); // L: 3232 + var6.packetBuffer.writeByte(var7 - 1); // L: 3233 + var6.packetBuffer.writeByte(var9); // L: 3234 + Client.packetWriter.addNode(var6); // L: 3235 + return 1; // L: 3236 + } else { + int var3; + Message var5; + if (var0 == ScriptOpcodes.CHAT_GETHISTORY_BYTYPEANDLINE) { // L: 3238 + class44.Interpreter_intStackSize -= 2; // L: 3239 + var3 = Interpreter.Interpreter_intStack[class44.Interpreter_intStackSize]; // L: 3240 + var7 = Interpreter.Interpreter_intStack[class44.Interpreter_intStackSize + 1]; // L: 3241 + var5 = ClanChannelMember.Messages_getByChannelAndID(var3, var7); // L: 3242 + if (var5 != null) { // L: 3243 + Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = var5.count; // L: 3244 + Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = var5.cycle; // L: 3245 + Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var5.sender != null ? var5.sender : ""; // L: 3246 + Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var5.prefix != null ? var5.prefix : ""; // L: 3247 + Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var5.text != null ? var5.text : ""; // L: 3248 + Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = var5.isFromFriend() ? 1 : (var5.isFromIgnored() ? 2 : 0); // L: 3249 + } else { + Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = -1; // L: 3252 + Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = 0; // L: 3253 + Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = ""; // L: 3254 + Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = ""; // L: 3255 + Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = ""; // L: 3256 + Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = 0; // L: 3257 + } + + return 1; // L: 3259 + } else { + Message var4; + if (var0 == ScriptOpcodes.CHAT_GETHISTORY_BYUID) { // L: 3261 + var3 = Interpreter.Interpreter_intStack[--class44.Interpreter_intStackSize]; // L: 3262 + var4 = class124.Messages_getMessage(var3); // L: 3263 + if (var4 != null) { // L: 3264 + Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = var4.type; // L: 3265 + Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = var4.cycle; // L: 3266 + Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var4.sender != null ? var4.sender : ""; // L: 3267 + Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var4.prefix != null ? var4.prefix : ""; // L: 3268 + Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var4.text != null ? var4.text : ""; // L: 3269 + Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = var4.isFromFriend() ? 1 : (var4.isFromIgnored() ? 2 : 0); // L: 3270 + } else { + Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = -1; // L: 3273 + Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = 0; // L: 3274 + Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = ""; // L: 3275 + Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = ""; // L: 3276 + Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = ""; // L: 3277 + Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = 0; // L: 3278 + } + + return 1; // L: 3280 + } else if (var0 == ScriptOpcodes.CHAT_GETFILTER_PRIVATE) { // L: 3282 + if (ScriptEvent.privateChatMode == null) { // L: 3283 + Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = -1; + } else { + Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = ScriptEvent.privateChatMode.field3890; // L: 3284 + } + + return 1; // L: 3285 + } else { + PacketBufferNode var12; + if (var0 == ScriptOpcodes.CHAT_SENDPUBLIC) { // L: 3287 + var8 = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize]; // L: 3288 + var7 = Interpreter.Interpreter_intStack[--class44.Interpreter_intStackSize]; // L: 3289 + var12 = WorldMapSectionType.method3596(var7, var8, class378.clientLanguage, -1); // L: 3290 + Client.packetWriter.addNode(var12); // L: 3291 + return 1; // L: 3292 + } else if (var0 == ScriptOpcodes.CHAT_SENDPRIVATE) { // L: 3294 + Interpreter.Interpreter_stringStackSize -= 2; // L: 3295 + var8 = Interpreter.Interpreter_stringStack[Interpreter.Interpreter_stringStackSize]; // L: 3296 + String var11 = Interpreter.Interpreter_stringStack[Interpreter.Interpreter_stringStackSize + 1]; // L: 3297 + var12 = class21.getPacketBufferNode(ClientPacket.field2614, Client.packetWriter.isaacCipher); // L: 3299 + var12.packetBuffer.writeShort(0); // L: 3300 + int var10 = var12.packetBuffer.offset; // L: 3301 + var12.packetBuffer.writeStringCp1252NullTerminated(var8); // L: 3302 + ParamComposition.method2878(var12.packetBuffer, var11); // L: 3303 + var12.packetBuffer.writeLengthShort(var12.packetBuffer.offset - var10); // L: 3304 + Client.packetWriter.addNode(var12); // L: 3305 + return 1; // L: 3306 + } else if (var0 == 5010) { // L: 3308 + var8 = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize]; // L: 3309 + class44.Interpreter_intStackSize -= 2; // L: 3310 + var7 = Interpreter.Interpreter_intStack[class44.Interpreter_intStackSize]; // L: 3311 + var9 = Interpreter.Interpreter_intStack[class44.Interpreter_intStackSize + 1]; // L: 3312 + var6 = WorldMapSectionType.method3596(var7, var8, class378.clientLanguage, var9); // L: 3313 + Client.packetWriter.addNode(var6); // L: 3314 + return 1; // L: 3315 + } else if (var0 != ScriptOpcodes.CHAT_PLAYERNAME) { // L: 3317 + if (var0 == ScriptOpcodes.CHAT_GETFILTER_TRADE) { // L: 3324 + Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = Client.tradeChatMode; // L: 3325 + return 1; // L: 3326 + } else if (var0 == ScriptOpcodes.CHAT_GETHISTORYLENGTH) { // L: 3328 + var3 = Interpreter.Interpreter_intStack[--class44.Interpreter_intStackSize]; // L: 3329 + Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = class23.Messages_getHistorySize(var3); // L: 3330 + return 1; // L: 3331 + } else if (var0 == ScriptOpcodes.CHAT_GETNEXTUID) { // L: 3333 + var3 = Interpreter.Interpreter_intStack[--class44.Interpreter_intStackSize]; // L: 3334 + Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = class17.Messages_getLastChatID(var3); // L: 3335 + return 1; // L: 3336 + } else if (var0 == ScriptOpcodes.CHAT_GETPREVUID) { // L: 3338 + var3 = Interpreter.Interpreter_intStack[--class44.Interpreter_intStackSize]; // L: 3339 + Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = Timer.method5595(var3); // L: 3340 + return 1; // L: 3341 + } else if (var0 == ScriptOpcodes.DOCHEAT) { // L: 3343 + var8 = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize]; // L: 3344 + class302.doCheat(var8); // L: 3345 + return 1; // L: 3346 + } else if (var0 == ScriptOpcodes.CHAT_SETMESSAGEFILTER) { // L: 3348 + Client.field863 = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize].toLowerCase().trim(); // L: 3349 + return 1; // L: 3350 + } else if (var0 == ScriptOpcodes.CHAT_GETMESSAGEFILTER) { // L: 3352 + Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = Client.field863; // L: 3353 + return 1; // L: 3354 + } else if (var0 == ScriptOpcodes.DEBUGMES) { // L: 3356 + var8 = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize]; // L: 3357 + System.out.println(var8); // L: 3358 + return 1; // L: 3359 + } else if (var0 == 5024) { // L: 3361 + --class44.Interpreter_intStackSize; // L: 3362 + return 1; // L: 3363 + } else if (var0 == 5025) { // L: 3365 + ++class44.Interpreter_intStackSize; // L: 3366 + return 1; // L: 3367 + } else if (var0 == 5030) { // L: 3369 + class44.Interpreter_intStackSize -= 2; // L: 3370 + var3 = Interpreter.Interpreter_intStack[class44.Interpreter_intStackSize]; // L: 3371 + var7 = Interpreter.Interpreter_intStack[class44.Interpreter_intStackSize + 1]; // L: 3372 + var5 = ClanChannelMember.Messages_getByChannelAndID(var3, var7); // L: 3373 + if (var5 != null) { // L: 3374 + Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = var5.count; // L: 3375 + Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = var5.cycle; // L: 3376 + Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var5.sender != null ? var5.sender : ""; // L: 3377 + Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var5.prefix != null ? var5.prefix : ""; // L: 3378 + Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var5.text != null ? var5.text : ""; // L: 3379 + Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = var5.isFromFriend() ? 1 : (var5.isFromIgnored() ? 2 : 0); // L: 3380 + Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = ""; // L: 3381 + Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = 0; // L: 3382 + } else { + Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = -1; // L: 3385 + Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = 0; // L: 3386 + Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = ""; // L: 3387 + Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = ""; // L: 3388 + Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = ""; // L: 3389 + Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = 0; // L: 3390 + Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = ""; // L: 3391 + Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = 0; // L: 3392 + } + + return 1; // L: 3394 + } else if (var0 == 5031) { // L: 3396 + var3 = Interpreter.Interpreter_intStack[--class44.Interpreter_intStackSize]; // L: 3397 + var4 = class124.Messages_getMessage(var3); // L: 3398 + if (var4 != null) { // L: 3399 + Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = var4.type; // L: 3400 + Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = var4.cycle; // L: 3401 + Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var4.sender != null ? var4.sender : ""; // L: 3402 + Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var4.prefix != null ? var4.prefix : ""; // L: 3403 + Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var4.text != null ? var4.text : ""; // L: 3404 + Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = var4.isFromFriend() ? 1 : (var4.isFromIgnored() ? 2 : 0); // L: 3405 + Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = ""; // L: 3406 + Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = 0; // L: 3407 + } else { + Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = -1; // L: 3410 + Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = 0; // L: 3411 + Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = ""; // L: 3412 + Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = ""; // L: 3413 + Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = ""; // L: 3414 + Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = 0; // L: 3415 + Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = ""; // L: 3416 + Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = 0; // L: 3417 + } + + return 1; // L: 3419 + } else { + return 2; // L: 3421 + } + } else { + if (class93.localPlayer != null && class93.localPlayer.username != null) { // L: 3319 + var8 = class93.localPlayer.username.getName(); + } else { + var8 = ""; // L: 3320 + } + + Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var8; // L: 3321 + return 1; // L: 3322 + } + } + } + } + } + } + + @ObfuscatedName("jl") + @ObfuscatedSignature( + descriptor = "(Lio;III)V", + garbageValue = "-1951037780" + ) + @Export("alignWidgetPosition") + static void alignWidgetPosition(Widget var0, int var1, int var2) { + if (var0.xAlignment == 0) { // L: 9806 + var0.x = var0.rawX; + } else if (var0.xAlignment == 1) { // L: 9807 + var0.x = var0.rawX + (var1 - var0.width) / 2; + } else if (var0.xAlignment == 2) { // L: 9808 + var0.x = var1 - var0.width - var0.rawX; + } else if (var0.xAlignment == 3) { // L: 9809 + var0.x = var0.rawX * var1 >> 14; + } else if (var0.xAlignment == 4) { // L: 9810 + var0.x = (var1 - var0.width) / 2 + (var0.rawX * var1 >> 14); + } else { + var0.x = var1 - var0.width - (var0.rawX * var1 >> 14); // L: 9811 + } + + if (var0.yAlignment == 0) { // L: 9812 + var0.y = var0.rawY; + } else if (var0.yAlignment == 1) { // L: 9813 + var0.y = (var2 - var0.height) / 2 + var0.rawY; + } else if (var0.yAlignment == 2) { // L: 9814 + var0.y = var2 - var0.height - var0.rawY; + } else if (var0.yAlignment == 3) { + var0.y = var2 * var0.rawY >> 14; // L: 9815 + } else if (var0.yAlignment == 4) { // L: 9816 + var0.y = (var2 - var0.height) / 2 + (var2 * var0.rawY >> 14); + } else { + var0.y = var2 - var0.height - (var2 * var0.rawY >> 14); // L: 9817 + } + + } // L: 9818 } diff --git a/runescape-client/src/main/java/class243.java b/runescape-client/src/main/java/class243.java index 11c6ab8b48..922905d4f1 100644 --- a/runescape-client/src/main/java/class243.java +++ b/runescape-client/src/main/java/class243.java @@ -1,548 +1,56 @@ 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("ir") +@ObfuscatedName("iu") public class class243 { - @ObfuscatedName("g") - @Export("SpriteBuffer_xOffsets") - public static int[] SpriteBuffer_xOffsets; - @ObfuscatedName("e") - @Export("cacheParentPaths") - static String[] cacheParentPaths; - - @ObfuscatedName("c") + @ObfuscatedName("tz") @ObfuscatedSignature( - descriptor = "(Lcp;III)V", - garbageValue = "1435442863" + descriptor = "Lmc;" ) - @Export("runScript") - static void runScript(ScriptEvent var0, int var1, int var2) { - Object[] var3 = var0.args; // L: 110 - Script var4; - int var19; - if (class369.isWorldMapEvent(var0.type)) { // L: 112 - class257.worldMapEvent = (WorldMapEvent)var3[0]; // L: 113 - WorldMapElement var5 = WorldMapAreaData.WorldMapElement_get(class257.worldMapEvent.mapElement); // L: 114 - var4 = SceneTilePaint.getWorldMapScript(var0.type, var5.objectId, var5.category); // L: 115 - } else { - var19 = (Integer)var3[0]; // L: 118 - var4 = ItemComposition.getScript(var19); // L: 119 - } + @Export("worldMap") + static WorldMap worldMap; + @ObfuscatedName("lb") + @ObfuscatedGetter( + intValue = -334285379 + ) + @Export("menuY") + static int menuY; - if (var4 != null) { // L: 121 - WorldMapCacheName.Interpreter_intStackSize = 0; // L: 124 - class13.Interpreter_stringStackSize = 0; // L: 125 - var19 = -1; // L: 126 - int[] var6 = var4.opcodes; // L: 127 - int[] var7 = var4.intOperands; // L: 128 - byte var8 = -1; // L: 129 - Interpreter.Interpreter_frameDepth = 0; // L: 130 - Interpreter.field950 = false; // L: 131 - boolean var9 = false; // L: 132 - int var10 = 0; // L: 133 - - try { - int var13; - try { - ScriptFrame.Interpreter_intLocals = new int[var4.localIntCount]; // L: 135 - int var11 = 0; // L: 136 - Interpreter.Interpreter_stringLocals = new String[var4.localStringCount]; // L: 137 - int var12 = 0; // L: 138 - - int var14; - String var20; - for (var13 = 1; var13 < var3.length; ++var13) { // L: 139 - if (var3[var13] instanceof Integer) { // L: 140 - var14 = (Integer)var3[var13]; // L: 141 - if (var14 == -2147483647) { // L: 142 - var14 = var0.mouseX; - } - - if (var14 == -2147483646) { // L: 143 - var14 = var0.mouseY; - } - - if (var14 == -2147483645) { // L: 144 - var14 = var0.widget != null ? var0.widget.id * 1657404511 * 976969631 : -1; - } - - if (var14 == -2147483644) { // L: 145 - var14 = var0.opIndex; - } - - if (var14 == -2147483643) { // L: 146 - var14 = var0.widget != null ? var0.widget.childIndex * -698732553 * 339820999 : -1; - } - - if (var14 == -2147483642) { // L: 147 - var14 = var0.dragTarget != null ? var0.dragTarget.id * 1657404511 * 976969631 : -1; - } - - if (var14 == -2147483641) { // L: 148 - var14 = var0.dragTarget != null ? var0.dragTarget.childIndex * -698732553 * 339820999 : -1; - } - - if (var14 == -2147483640) { // L: 149 - var14 = var0.keyTyped; - } - - if (var14 == -2147483639) { // L: 150 - var14 = var0.keyPressed; - } - - ScriptFrame.Interpreter_intLocals[var11++] = var14; // L: 151 - } else if (var3[var13] instanceof String) { // L: 153 - var20 = (String)var3[var13]; // L: 154 - if (var20.equals("event_opbase")) { // L: 155 - var20 = var0.targetName; - } - - Interpreter.Interpreter_stringLocals[var12++] = var20; // L: 156 - } - } - - Interpreter.field956 = var0.field1140; // L: 160 - - while (true) { - ++var10; // L: 162 - if (var10 > var1) { // L: 163 - throw new RuntimeException(); - } - - ++var19; // L: 164 - int var31 = var6[var19]; - if (var31 >= 100) { // L: 165 - boolean var32; - if (var4.intOperands[var19] == 1) { // L: 383 - var32 = true; - } else { - var32 = false; // L: 384 - } - - var14 = WorldMapLabelSize.method3158(var31, var4, var32); // L: 385 - switch(var14) { // L: 386 - case 0: - return; - case 1: - default: - break; - case 2: - throw new IllegalStateException(); // L: 391 - } - } else if (var31 == 0) { // L: 166 - Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = var7[var19]; // L: 167 - } else if (var31 == ScriptOpcodes.GET_VARP) { // L: 170 - var13 = var7[var19]; // L: 171 - Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = Varps.Varps_main[var13]; // L: 172 - } else if (var31 == ScriptOpcodes.SET_VARP) { // L: 175 - var13 = var7[var19]; // L: 176 - Varps.Varps_main[var13] = Interpreter.Interpreter_intStack[--WorldMapCacheName.Interpreter_intStackSize]; // L: 177 - WorldMapData_0.changeGameOptions(var13); // L: 178 - } else if (var31 == ScriptOpcodes.SCONST) { // L: 181 - Interpreter.Interpreter_stringStack[++class13.Interpreter_stringStackSize - 1] = var4.stringOperands[var19]; // L: 182 - } else if (var31 == ScriptOpcodes.JUMP) { // L: 185 - var19 += var7[var19]; // L: 186 - } else if (var31 == ScriptOpcodes.IF_ICMPNE) { // L: 189 - WorldMapCacheName.Interpreter_intStackSize -= 2; // L: 190 - if (Interpreter.Interpreter_intStack[WorldMapCacheName.Interpreter_intStackSize] != Interpreter.Interpreter_intStack[WorldMapCacheName.Interpreter_intStackSize + 1]) { // L: 191 - var19 += var7[var19]; - } - } else if (var31 == ScriptOpcodes.IF_ICMPEQ) { // L: 194 - WorldMapCacheName.Interpreter_intStackSize -= 2; // L: 195 - if (Interpreter.Interpreter_intStack[WorldMapCacheName.Interpreter_intStackSize] == Interpreter.Interpreter_intStack[WorldMapCacheName.Interpreter_intStackSize + 1]) { // L: 196 - var19 += var7[var19]; - } - } else if (var31 == ScriptOpcodes.IF_ICMPLT) { // L: 199 - WorldMapCacheName.Interpreter_intStackSize -= 2; // L: 200 - if (Interpreter.Interpreter_intStack[WorldMapCacheName.Interpreter_intStackSize] < Interpreter.Interpreter_intStack[WorldMapCacheName.Interpreter_intStackSize + 1]) { // L: 201 - var19 += var7[var19]; - } - } else if (var31 == ScriptOpcodes.IF_ICMPGT) { // L: 204 - WorldMapCacheName.Interpreter_intStackSize -= 2; // L: 205 - if (Interpreter.Interpreter_intStack[WorldMapCacheName.Interpreter_intStackSize] > Interpreter.Interpreter_intStack[WorldMapCacheName.Interpreter_intStackSize + 1]) { // L: 206 - var19 += var7[var19]; - } - } else if (var31 == ScriptOpcodes.RETURN) { // L: 209 - if (Interpreter.Interpreter_frameDepth == 0) { // L: 210 - return; // L: 417 - } - - ScriptFrame var37 = Interpreter.Interpreter_frames[--Interpreter.Interpreter_frameDepth]; // L: 211 - var4 = var37.script; // L: 212 - var6 = var4.opcodes; // L: 213 - var7 = var4.intOperands; // L: 214 - var19 = var37.pc; // L: 215 - ScriptFrame.Interpreter_intLocals = var37.intLocals; // L: 216 - Interpreter.Interpreter_stringLocals = var37.stringLocals; // L: 217 - } else if (var31 == ScriptOpcodes.GET_VARBIT) { // L: 220 - var13 = var7[var19]; // L: 221 - Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = ObjectComposition.getVarbit(var13); // L: 222 - } else if (var31 == ScriptOpcodes.SET_VARBIT) { // L: 225 - var13 = var7[var19]; // L: 226 - WorldMapRegion.method3397(var13, Interpreter.Interpreter_intStack[--WorldMapCacheName.Interpreter_intStackSize]); // L: 227 - } else if (var31 == ScriptOpcodes.IF_ICMPLE) { // L: 230 - WorldMapCacheName.Interpreter_intStackSize -= 2; // L: 231 - if (Interpreter.Interpreter_intStack[WorldMapCacheName.Interpreter_intStackSize] <= Interpreter.Interpreter_intStack[WorldMapCacheName.Interpreter_intStackSize + 1]) { // L: 232 - var19 += var7[var19]; - } - } else if (var31 == ScriptOpcodes.IF_ICMPGE) { // L: 235 - WorldMapCacheName.Interpreter_intStackSize -= 2; // L: 236 - if (Interpreter.Interpreter_intStack[WorldMapCacheName.Interpreter_intStackSize] >= Interpreter.Interpreter_intStack[WorldMapCacheName.Interpreter_intStackSize + 1]) { // L: 237 - var19 += var7[var19]; - } - } else if (var31 == ScriptOpcodes.ILOAD) { // L: 240 - Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = ScriptFrame.Interpreter_intLocals[var7[var19]]; // L: 241 - } else if (var31 == ScriptOpcodes.ISTORE) { // L: 244 - ScriptFrame.Interpreter_intLocals[var7[var19]] = Interpreter.Interpreter_intStack[--WorldMapCacheName.Interpreter_intStackSize]; // L: 245 - } else if (var31 == ScriptOpcodes.SLOAD) { // L: 248 - Interpreter.Interpreter_stringStack[++class13.Interpreter_stringStackSize - 1] = Interpreter.Interpreter_stringLocals[var7[var19]]; // L: 249 - } else if (var31 == ScriptOpcodes.SSTORE) { // L: 252 - Interpreter.Interpreter_stringLocals[var7[var19]] = Interpreter.Interpreter_stringStack[--class13.Interpreter_stringStackSize]; // L: 253 - } else if (var31 == ScriptOpcodes.JOIN_STRING) { // L: 256 - var13 = var7[var19]; // L: 257 - class13.Interpreter_stringStackSize -= var13; // L: 258 - var20 = SecureRandomCallable.method2076(Interpreter.Interpreter_stringStack, class13.Interpreter_stringStackSize, var13); // L: 259 - Interpreter.Interpreter_stringStack[++class13.Interpreter_stringStackSize - 1] = var20; // L: 260 - } else if (var31 == ScriptOpcodes.POP_INT) { // L: 263 - --WorldMapCacheName.Interpreter_intStackSize; // L: 264 - } else if (var31 == ScriptOpcodes.POP_STRING) { // L: 267 - --class13.Interpreter_stringStackSize; // L: 268 - } else { - int var17; - if (var31 != ScriptOpcodes.INVOKE) { // L: 271 - if (var31 == ScriptOpcodes.GET_VARC_INT) { // L: 294 - Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = Client.varcs.getInt(var7[var19]); // L: 295 - } else if (var31 == ScriptOpcodes.SET_VARC_INT) { // L: 298 - Client.varcs.setInt(var7[var19], Interpreter.Interpreter_intStack[--WorldMapCacheName.Interpreter_intStackSize]); // L: 299 - } else if (var31 == ScriptOpcodes.DEFINE_ARRAY) { // L: 302 - var13 = var7[var19] >> 16; // L: 303 - var14 = var7[var19] & 65535; // L: 304 - int var23 = Interpreter.Interpreter_intStack[--WorldMapCacheName.Interpreter_intStackSize]; // L: 305 - if (var23 < 0 || var23 > 5000) { // L: 306 - throw new RuntimeException(); // L: 307 - } - - Interpreter.Interpreter_arrayLengths[var13] = var23; // L: 309 - byte var24 = -1; // L: 310 - if (var14 == 105) { // L: 311 - var24 = 0; - } - - for (var17 = 0; var17 < var23; ++var17) { // L: 312 - Interpreter.Interpreter_arrays[var13][var17] = var24; - } - } else if (var31 == ScriptOpcodes.GET_ARRAY_INT) { // L: 315 - var13 = var7[var19]; // L: 316 - var14 = Interpreter.Interpreter_intStack[--WorldMapCacheName.Interpreter_intStackSize]; // L: 317 - if (var14 < 0 || var14 >= Interpreter.Interpreter_arrayLengths[var13]) { // L: 318 - throw new RuntimeException(); // L: 319 - } - - Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = Interpreter.Interpreter_arrays[var13][var14]; // L: 321 - } else if (var31 == ScriptOpcodes.SET_ARRAY_INT) { // L: 324 - var13 = var7[var19]; // L: 325 - WorldMapCacheName.Interpreter_intStackSize -= 2; // L: 326 - var14 = Interpreter.Interpreter_intStack[WorldMapCacheName.Interpreter_intStackSize]; // L: 327 - if (var14 < 0 || var14 >= Interpreter.Interpreter_arrayLengths[var13]) { // L: 328 - throw new RuntimeException(); // L: 329 - } - - Interpreter.Interpreter_arrays[var13][var14] = Interpreter.Interpreter_intStack[WorldMapCacheName.Interpreter_intStackSize + 1]; // L: 331 - } else { - String var21; - if (var31 == ScriptOpcodes.GET_VARC_STRING_OLD) { // L: 334 - var21 = Client.varcs.getStringOld(var7[var19]); // L: 335 - if (var21 == null) { // L: 336 - var21 = "null"; - } - - Interpreter.Interpreter_stringStack[++class13.Interpreter_stringStackSize - 1] = var21; // L: 337 - } else if (var31 == ScriptOpcodes.SET_VARC_STRING_OLD) { // L: 340 - Client.varcs.setStringOld(var7[var19], Interpreter.Interpreter_stringStack[--class13.Interpreter_stringStackSize]); // L: 341 - } else if (var31 == ScriptOpcodes.GET_VARC_STRING) { // L: 344 - var21 = Client.varcs.getString(var7[var19]); // L: 345 - Interpreter.Interpreter_stringStack[++class13.Interpreter_stringStackSize - 1] = var21; // L: 346 - } else if (var31 == ScriptOpcodes.SET_VARC_STRING) { // L: 349 - Client.varcs.setString(var7[var19], Interpreter.Interpreter_stringStack[--class13.Interpreter_stringStackSize]); // L: 350 - } else if (var31 == ScriptOpcodes.SWITCH) { // L: 353 - IterableNodeHashTable var35 = var4.switches[var7[var19]]; // L: 354 - IntegerNode var34 = (IntegerNode)var35.get((long)Interpreter.Interpreter_intStack[--WorldMapCacheName.Interpreter_intStackSize]); // L: 355 - if (var34 != null) { // L: 356 - var19 += var34.integer; - } - } else { - Integer var36; - if (var31 == 74) { // L: 359 - var36 = ArchiveDiskActionHandler.field3575.method152(var7[var19]); // L: 360 - if (var36 == null) { // L: 361 - Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = -1; // L: 362 - } else { - Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = var36; // L: 365 - } - } else { - if (var31 != 76) { // L: 369 - throw new IllegalStateException(); // L: 379 - } - - var36 = ObjectSound.field935.method5861(var7[var19]); // L: 370 - if (var36 == null) { // L: 371 - Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = -1; // L: 372 - } else { - Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = var36; // L: 375 - } - } - } - } - } else { - var13 = var7[var19]; // L: 272 - Script var33 = ItemComposition.getScript(var13); // L: 273 - int[] var15 = new int[var33.localIntCount]; // L: 274 - String[] var16 = new String[var33.localStringCount]; // L: 275 - - for (var17 = 0; var17 < var33.intArgumentCount; ++var17) { // L: 276 - var15[var17] = Interpreter.Interpreter_intStack[var17 + (WorldMapCacheName.Interpreter_intStackSize - var33.intArgumentCount)]; - } - - for (var17 = 0; var17 < var33.stringArgumentCount; ++var17) { // L: 277 - var16[var17] = Interpreter.Interpreter_stringStack[var17 + (class13.Interpreter_stringStackSize - var33.stringArgumentCount)]; - } - - WorldMapCacheName.Interpreter_intStackSize -= var33.intArgumentCount; // L: 278 - class13.Interpreter_stringStackSize -= var33.stringArgumentCount; // L: 279 - ScriptFrame var22 = new ScriptFrame(); // L: 280 - var22.script = var4; // L: 281 - var22.pc = var19; // L: 282 - var22.intLocals = ScriptFrame.Interpreter_intLocals; // L: 283 - var22.stringLocals = Interpreter.Interpreter_stringLocals; // L: 284 - Interpreter.Interpreter_frames[++Interpreter.Interpreter_frameDepth - 1] = var22; // L: 285 - var4 = var33; // L: 286 - var6 = var33.opcodes; // L: 287 - var7 = var33.intOperands; // L: 288 - var19 = -1; // L: 289 - ScriptFrame.Interpreter_intLocals = var15; // L: 290 - Interpreter.Interpreter_stringLocals = var16; // L: 291 - } - } - } - } catch (Exception var29) { // L: 399 - var9 = true; // L: 400 - StringBuilder var26 = new StringBuilder(30); // L: 402 - var26.append("").append(var4.key).append(" "); // L: 403 - - for (var13 = Interpreter.Interpreter_frameDepth - 1; var13 >= 0; --var13) { // L: 404 - var26.append("").append(Interpreter.Interpreter_frames[var13].script.key).append(" "); - } - - var26.append("").append(var8); // L: 405 - class27.RunException_sendStackTrace(var26.toString(), var29); // L: 406 - } - } finally { - if (Interpreter.field950) { // L: 410 - Interpreter.field951 = true; // L: 411 - class80.method1943(); // L: 412 - Interpreter.field951 = false; // L: 413 - Interpreter.field950 = false; // L: 414 - } - - if (!var9 && var2 > 0 && var10 >= var2) { // L: 416 - class27.RunException_sendStackTrace("Warning: Script " + var4.field1054 + " finished at op count " + var10 + " of max " + var1, (Throwable)null); - } - - } - } - } // L: 122 420 - - @ObfuscatedName("z") + @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "(ILci;ZI)I", - garbageValue = "448922553" + descriptor = "(I)V", + garbageValue = "754026835" ) - static int method4612(int var0, Script var1, boolean var2) { - int var4 = -1; // L: 606 - Widget var3; - if (var0 >= 2000) { // L: 607 - var0 -= 1000; // L: 608 - var4 = Interpreter.Interpreter_intStack[--WorldMapCacheName.Interpreter_intStackSize]; // L: 609 - var3 = DevicePcmPlayerProvider.getWidget(var4); // L: 610 + static void method4668() { + if (TaskHandler.javaVendor.toLowerCase().indexOf("microsoft") != -1) { // L: 119 + KeyHandler.KeyHandler_keyCodes[186] = 57; // L: 120 + KeyHandler.KeyHandler_keyCodes[187] = 27; // L: 121 + KeyHandler.KeyHandler_keyCodes[188] = 71; // L: 122 + KeyHandler.KeyHandler_keyCodes[189] = 26; // L: 123 + KeyHandler.KeyHandler_keyCodes[190] = 72; // L: 124 + KeyHandler.KeyHandler_keyCodes[191] = 73; // L: 125 + KeyHandler.KeyHandler_keyCodes[192] = 58; // L: 126 + KeyHandler.KeyHandler_keyCodes[219] = 42; // L: 127 + KeyHandler.KeyHandler_keyCodes[220] = 74; // L: 128 + KeyHandler.KeyHandler_keyCodes[221] = 43; // L: 129 + KeyHandler.KeyHandler_keyCodes[222] = 59; // L: 130 + KeyHandler.KeyHandler_keyCodes[223] = 28; // L: 131 } else { - var3 = var2 ? class308.scriptDotWidget : class24.scriptActiveWidget; // L: 612 + KeyHandler.KeyHandler_keyCodes[44] = 71; // L: 134 + KeyHandler.KeyHandler_keyCodes[45] = 26; // L: 135 + KeyHandler.KeyHandler_keyCodes[46] = 72; // L: 136 + KeyHandler.KeyHandler_keyCodes[47] = 73; // L: 137 + KeyHandler.KeyHandler_keyCodes[59] = 57; // L: 138 + KeyHandler.KeyHandler_keyCodes[61] = 27; // L: 139 + KeyHandler.KeyHandler_keyCodes[91] = 42; // L: 140 + KeyHandler.KeyHandler_keyCodes[92] = 74; // L: 141 + KeyHandler.KeyHandler_keyCodes[93] = 43; // L: 142 + KeyHandler.KeyHandler_keyCodes[192] = 28; // L: 143 + KeyHandler.KeyHandler_keyCodes[222] = 58; // L: 144 + KeyHandler.KeyHandler_keyCodes[520] = 59; // L: 145 } - if (var0 == ScriptOpcodes.CC_SETSCROLLPOS) { // L: 613 - WorldMapCacheName.Interpreter_intStackSize -= 2; // L: 614 - var3.scrollX = Interpreter.Interpreter_intStack[WorldMapCacheName.Interpreter_intStackSize]; // L: 615 - if (var3.scrollX > var3.scrollWidth - var3.width) { // L: 616 - var3.scrollX = var3.scrollWidth - var3.width; - } - - if (var3.scrollX < 0) { // L: 617 - var3.scrollX = 0; - } - - var3.scrollY = Interpreter.Interpreter_intStack[WorldMapCacheName.Interpreter_intStackSize + 1]; // L: 618 - if (var3.scrollY > var3.scrollHeight - var3.height) { // L: 619 - var3.scrollY = var3.scrollHeight - var3.height; - } - - if (var3.scrollY < 0) { // L: 620 - var3.scrollY = 0; - } - - VerticalAlignment.invalidateWidget(var3); // L: 621 - return 1; // L: 622 - } else if (var0 == ScriptOpcodes.CC_SETCOLOUR) { // L: 624 - var3.color = Interpreter.Interpreter_intStack[--WorldMapCacheName.Interpreter_intStackSize]; // L: 625 - VerticalAlignment.invalidateWidget(var3); // L: 626 - return 1; // L: 627 - } else if (var0 == ScriptOpcodes.CC_SETFILL) { // L: 629 - var3.fill = Interpreter.Interpreter_intStack[--WorldMapCacheName.Interpreter_intStackSize] == 1; // L: 630 - VerticalAlignment.invalidateWidget(var3); // L: 631 - return 1; // L: 632 - } else if (var0 == ScriptOpcodes.CC_SETTRANS) { // L: 634 - var3.transparencyTop = Interpreter.Interpreter_intStack[--WorldMapCacheName.Interpreter_intStackSize]; // L: 635 - VerticalAlignment.invalidateWidget(var3); // L: 636 - return 1; // L: 637 - } else if (var0 == ScriptOpcodes.CC_SETLINEWID) { // L: 639 - var3.lineWid = Interpreter.Interpreter_intStack[--WorldMapCacheName.Interpreter_intStackSize]; // L: 640 - VerticalAlignment.invalidateWidget(var3); // L: 641 - return 1; // L: 642 - } else if (var0 == ScriptOpcodes.CC_SETGRAPHIC) { // L: 644 - var3.spriteId2 = Interpreter.Interpreter_intStack[--WorldMapCacheName.Interpreter_intStackSize]; // L: 645 - VerticalAlignment.invalidateWidget(var3); // L: 646 - return 1; // L: 647 - } else if (var0 == ScriptOpcodes.CC_SET2DANGLE) { // L: 649 - var3.spriteAngle = Interpreter.Interpreter_intStack[--WorldMapCacheName.Interpreter_intStackSize]; // L: 650 - VerticalAlignment.invalidateWidget(var3); // L: 651 - return 1; // L: 652 - } else if (var0 == ScriptOpcodes.CC_SETTILING) { // L: 654 - var3.spriteTiling = Interpreter.Interpreter_intStack[--WorldMapCacheName.Interpreter_intStackSize] == 1; // L: 655 - VerticalAlignment.invalidateWidget(var3); // L: 656 - return 1; // L: 657 - } else if (var0 == ScriptOpcodes.CC_SETMODEL) { // L: 659 - var3.modelType = 1; // L: 660 - var3.modelId = Interpreter.Interpreter_intStack[--WorldMapCacheName.Interpreter_intStackSize]; // L: 661 - VerticalAlignment.invalidateWidget(var3); // L: 662 - return 1; // L: 663 - } else if (var0 == ScriptOpcodes.CC_SETMODELANGLE) { // L: 665 - WorldMapCacheName.Interpreter_intStackSize -= 6; // L: 666 - var3.modelOffsetX = Interpreter.Interpreter_intStack[WorldMapCacheName.Interpreter_intStackSize]; // L: 667 - var3.modelOffsetY = Interpreter.Interpreter_intStack[WorldMapCacheName.Interpreter_intStackSize + 1]; // L: 668 - var3.modelAngleX = Interpreter.Interpreter_intStack[WorldMapCacheName.Interpreter_intStackSize + 2]; // L: 669 - var3.modelAngleY = Interpreter.Interpreter_intStack[WorldMapCacheName.Interpreter_intStackSize + 3]; // L: 670 - var3.modelAngleZ = Interpreter.Interpreter_intStack[WorldMapCacheName.Interpreter_intStackSize + 4]; // L: 671 - var3.modelZoom = Interpreter.Interpreter_intStack[WorldMapCacheName.Interpreter_intStackSize + 5]; // L: 672 - VerticalAlignment.invalidateWidget(var3); // L: 673 - return 1; // L: 674 - } else { - int var8; - if (var0 == ScriptOpcodes.CC_SETMODELANIM) { // L: 676 - var8 = Interpreter.Interpreter_intStack[--WorldMapCacheName.Interpreter_intStackSize]; // L: 677 - if (var8 != var3.sequenceId) { // L: 678 - var3.sequenceId = var8; // L: 679 - var3.modelFrame = 0; // L: 680 - var3.modelFrameCycle = 0; // L: 681 - VerticalAlignment.invalidateWidget(var3); // L: 682 - } - - return 1; // L: 684 - } else if (var0 == ScriptOpcodes.CC_SETMODELORTHOG) { // L: 686 - var3.modelOrthog = Interpreter.Interpreter_intStack[--WorldMapCacheName.Interpreter_intStackSize] == 1; // L: 687 - VerticalAlignment.invalidateWidget(var3); // L: 688 - return 1; // L: 689 - } else if (var0 == ScriptOpcodes.CC_SETTEXT) { // L: 691 - String var7 = Interpreter.Interpreter_stringStack[--class13.Interpreter_stringStackSize]; // L: 692 - if (!var7.equals(var3.text)) { // L: 693 - var3.text = var7; // L: 694 - VerticalAlignment.invalidateWidget(var3); // L: 695 - } - - return 1; // L: 697 - } else if (var0 == ScriptOpcodes.CC_SETTEXTFONT) { // L: 699 - var3.fontId = Interpreter.Interpreter_intStack[--WorldMapCacheName.Interpreter_intStackSize]; // L: 700 - VerticalAlignment.invalidateWidget(var3); // L: 701 - return 1; // L: 702 - } else if (var0 == ScriptOpcodes.CC_SETTEXTALIGN) { // L: 704 - WorldMapCacheName.Interpreter_intStackSize -= 3; // L: 705 - var3.textXAlignment = Interpreter.Interpreter_intStack[WorldMapCacheName.Interpreter_intStackSize]; // L: 706 - var3.textYAlignment = Interpreter.Interpreter_intStack[WorldMapCacheName.Interpreter_intStackSize + 1]; // L: 707 - var3.textLineHeight = Interpreter.Interpreter_intStack[WorldMapCacheName.Interpreter_intStackSize + 2]; // L: 708 - VerticalAlignment.invalidateWidget(var3); // L: 709 - return 1; // L: 710 - } else if (var0 == ScriptOpcodes.CC_SETTEXTSHADOW) { // L: 712 - var3.textShadowed = Interpreter.Interpreter_intStack[--WorldMapCacheName.Interpreter_intStackSize] == 1; // L: 713 - VerticalAlignment.invalidateWidget(var3); // L: 714 - return 1; // L: 715 - } else if (var0 == ScriptOpcodes.CC_SETOUTLINE) { // L: 717 - var3.outline = Interpreter.Interpreter_intStack[--WorldMapCacheName.Interpreter_intStackSize]; // L: 718 - VerticalAlignment.invalidateWidget(var3); // L: 719 - return 1; // L: 720 - } else if (var0 == ScriptOpcodes.CC_SETGRAPHICSHADOW) { // L: 722 - var3.spriteShadow = Interpreter.Interpreter_intStack[--WorldMapCacheName.Interpreter_intStackSize]; // L: 723 - VerticalAlignment.invalidateWidget(var3); // L: 724 - return 1; // L: 725 - } else if (var0 == ScriptOpcodes.CC_SETVFLIP) { // L: 727 - var3.spriteFlipV = Interpreter.Interpreter_intStack[--WorldMapCacheName.Interpreter_intStackSize] == 1; // L: 728 - VerticalAlignment.invalidateWidget(var3); // L: 729 - return 1; // L: 730 - } else if (var0 == ScriptOpcodes.CC_SETHFLIP) { // L: 732 - var3.spriteFlipH = Interpreter.Interpreter_intStack[--WorldMapCacheName.Interpreter_intStackSize] == 1; // L: 733 - VerticalAlignment.invalidateWidget(var3); // L: 734 - return 1; // L: 735 - } else if (var0 == ScriptOpcodes.CC_SETSCROLLSIZE) { // L: 737 - WorldMapCacheName.Interpreter_intStackSize -= 2; // L: 738 - var3.scrollWidth = Interpreter.Interpreter_intStack[WorldMapCacheName.Interpreter_intStackSize]; // L: 739 - var3.scrollHeight = Interpreter.Interpreter_intStack[WorldMapCacheName.Interpreter_intStackSize + 1]; // L: 740 - VerticalAlignment.invalidateWidget(var3); // L: 741 - if (var4 != -1 && var3.type == 0) { // L: 742 - ApproximateRouteStrategy.revalidateWidgetScroll(Widget.Widget_interfaceComponents[var4 >> 16], var3, false); - } - - return 1; // L: 743 - } else if (var0 == ScriptOpcodes.CC_RESUME_PAUSEBUTTON) { // L: 745 - HorizontalAlignment.resumePauseWidget(var3.id, var3.childIndex); // L: 746 - Client.meslayerContinueWidget = var3; // L: 747 - VerticalAlignment.invalidateWidget(var3); // L: 748 - return 1; // L: 749 - } else if (var0 == 1122) { // L: 751 - var3.spriteId = Interpreter.Interpreter_intStack[--WorldMapCacheName.Interpreter_intStackSize]; // L: 752 - VerticalAlignment.invalidateWidget(var3); // L: 753 - return 1; // L: 754 - } else if (var0 == ScriptOpcodes.CC_SETFILLCOLOUR) { // L: 756 - var3.color2 = Interpreter.Interpreter_intStack[--WorldMapCacheName.Interpreter_intStackSize]; // L: 757 - VerticalAlignment.invalidateWidget(var3); // L: 758 - return 1; // L: 759 - } else if (var0 == 1124) { // L: 761 - var3.transparencyBot = Interpreter.Interpreter_intStack[--WorldMapCacheName.Interpreter_intStackSize]; // L: 762 - VerticalAlignment.invalidateWidget(var3); // L: 763 - return 1; // L: 764 - } else if (var0 == ScriptOpcodes.CC_SETFILLMODE) { // L: 766 - var8 = Interpreter.Interpreter_intStack[--WorldMapCacheName.Interpreter_intStackSize]; // L: 767 - FillMode var6 = (FillMode)UserComparator4.findEnumerated(class69.FillMode_values(), var8); // L: 768 - if (var6 != null) { // L: 769 - var3.fillMode = var6; // L: 770 - VerticalAlignment.invalidateWidget(var3); // L: 771 - } - - return 1; // L: 773 - } else { - boolean var5; - if (var0 == ScriptOpcodes.CC_SETLINEDIRECTION) { // L: 775 - var5 = Interpreter.Interpreter_intStack[--WorldMapCacheName.Interpreter_intStackSize] == 1; // L: 776 - var3.field2998 = var5; // L: 777 - return 1; // L: 778 - } else if (var0 == ScriptOpcodes.CC_SETMODELTRANSPARENT) { // L: 780 - var5 = Interpreter.Interpreter_intStack[--WorldMapCacheName.Interpreter_intStackSize] == 1; // L: 781 - var3.modelTransparency = var5; // L: 782 - return 1; // L: 783 - } else if (var0 == 1128) { // L: 785 - WorldMapCacheName.Interpreter_intStackSize -= 2; // L: 786 - return 1; // L: 787 - } else { - return 2; // L: 789 - } - } - } - } + } // L: 147 } diff --git a/runescape-client/src/main/java/class245.java b/runescape-client/src/main/java/class245.java index 349b383400..e549bf356c 100644 --- a/runescape-client/src/main/java/class245.java +++ b/runescape-client/src/main/java/class245.java @@ -2,147 +2,60 @@ import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ip") +@ObfuscatedName("ig") public class class245 { - @ObfuscatedName("h") - public static final short[] field2949; - @ObfuscatedName("c") - public static final short[][] field2948; - @ObfuscatedName("o") - public static final short[] field2950; - @ObfuscatedName("g") - public static final short[][] field2951; - @ObfuscatedName("q") + @ObfuscatedName("v") + public static final short[] field2944; + @ObfuscatedName("n") + public static final short[][] field2940; + @ObfuscatedName("f") + public static final short[] field2941; + @ObfuscatedName("y") + public static final short[][] field2942; + @ObfuscatedName("u") @ObfuscatedSignature( - descriptor = "Ljp;" + descriptor = "Ljv;" ) - @Export("Widget_modelsArchive") - static AbstractArchive Widget_modelsArchive; + @Export("Widget_spritesArchive") + public static AbstractArchive Widget_spritesArchive; static { - field2949 = new short[]{6798, 8741, 25238, 4626, 4550}; // L: 4 - field2948 = new short[][]{{6798, 107, 10283, 16, 4797, 7744, 5799, 4634, -31839, 22433, 2983, -11343, 8, 5281, 10438, 3650, -27322, -21845, 200, 571, 908, 21830, 28946, -15701, -14010}, {8741, 12, -1506, -22374, 7735, 8404, 1701, -27106, 24094, 10153, -8915, 4783, 1341, 16578, -30533, 25239, 8, 5281, 10438, 3650, -27322, -21845, 200, 571, 908, 21830, 28946, -15701, -14010}, {25238, 8742, 12, -1506, -22374, 7735, 8404, 1701, -27106, 24094, 10153, -8915, 4783, 1341, 16578, -30533, 8, 5281, 10438, 3650, -27322, -21845, 200, 571, 908, 21830, 28946, -15701, -14010}, {4626, 11146, 6439, 12, 4758, 10270}, {4550, 4537, 5681, 5673, 5790, 6806, 8076, 4574, 17050, 0, 127, -31821, -17991}}; // L: 5 - field2950 = new short[]{-10304, 9104, -1, -1, -1}; // L: 12 - field2951 = new short[][]{{6554, 115, 10304, 28, 5702, 7756, 5681, 4510, -31835, 22437, 2859, -11339, 16, 5157, 10446, 3658, -27314, -21965, 472, 580, 784, 21966, 28950, -15697, -14002}, {9104, 10275, 7595, 3610, 7975, 8526, 918, -26734, 24466, 10145, -6882, 5027, 1457, 16565, -30545, 25486, 24, 5392, 10429, 3673, -27335, -21957, 192, 687, 412, 21821, 28835, -15460, -14019}, new short[0], new short[0], new short[0]}; // L: 13 + field2944 = new short[]{6798, 8741, 25238, 4626, 4550}; // L: 4 + field2940 = new short[][]{{6798, 107, 10283, 16, 4797, 7744, 5799, 4634, -31839, 22433, 2983, -11343, 8, 5281, 10438, 3650, -27322, -21845, 200, 571, 908, 21830, 28946, -15701, -14010}, {8741, 12, -1506, -22374, 7735, 8404, 1701, -27106, 24094, 10153, -8915, 4783, 1341, 16578, -30533, 25239, 8, 5281, 10438, 3650, -27322, -21845, 200, 571, 908, 21830, 28946, -15701, -14010}, {25238, 8742, 12, -1506, -22374, 7735, 8404, 1701, -27106, 24094, 10153, -8915, 4783, 1341, 16578, -30533, 8, 5281, 10438, 3650, -27322, -21845, 200, 571, 908, 21830, 28946, -15701, -14010}, {4626, 11146, 6439, 12, 4758, 10270}, {4550, 4537, 5681, 5673, 5790, 6806, 8076, 4574, 17050, 0, 127, -31821, -17991}}; // L: 5 + field2941 = new short[]{-10304, 9104, -1, -1, -1}; // L: 12 + field2942 = new short[][]{{6554, 115, 10304, 28, 5702, 7756, 5681, 4510, -31835, 22437, 2859, -11339, 16, 5157, 10446, 3658, -27314, -21965, 472, 580, 784, 21966, 28950, -15697, -14002}, {9104, 10275, 7595, 3610, 7975, 8526, 918, -26734, 24466, 10145, -6882, 5027, 1457, 16565, -30545, 25486, 24, 5392, 10429, 3673, -27335, -21957, 192, 687, 412, 21821, 28835, -15460, -14019}, new short[0], new short[0], new short[0]}; // L: 13 } - @ObfuscatedName("i") + @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "(B)Z", - garbageValue = "13" + descriptor = "(CI)Z", + garbageValue = "2146522147" ) - static final boolean method4648() { - return ViewportMouse.ViewportMouse_isInViewport; // L: 100 + @Export("isCharPrintable") + public static boolean isCharPrintable(char var0) { + if (var0 >= ' ' && var0 <= '~') { // L: 176 + return true; + } else if (var0 >= 160 && var0 <= 255) { // L: 177 + return true; + } else { + return var0 == 8364 || var0 == 338 || var0 == 8212 || var0 == 339 || var0 == 376; // L: 178 + } } - @ObfuscatedName("ix") + @ObfuscatedName("lq") @ObfuscatedSignature( - descriptor = "(IIIILjava/lang/String;I)V", - garbageValue = "-2010695069" + descriptor = "(Lnd;II)V", + garbageValue = "1292576632" ) - @Export("widgetDefaultMenuAction") - static void widgetDefaultMenuAction(int var0, int var1, int var2, int var3, String var4) { - Widget var5 = PacketWriter.getWidgetChild(var1, var2); // L: 8951 - if (var5 != null) { // L: 8952 - if (var5.onOp != null) { // L: 8953 - ScriptEvent var6 = new ScriptEvent(); // L: 8954 - var6.widget = var5; // L: 8955 - var6.opIndex = var0; // L: 8956 - var6.targetName = var4; // L: 8957 - var6.args = var5.onOp; // L: 8958 - class259.runScriptEvent(var6); // L: 8959 - } - - boolean var8 = true; // L: 8961 - if (var5.contentType > 0) { // L: 8962 - var8 = WorldMapSprite.method3580(var5); - } - - if (var8) { // L: 8963 - if (class125.method2507(class26.getWidgetFlags(var5), var0 - 1)) { // L: 8964 - PacketBufferNode var7; - if (var0 == 1) { // L: 8967 - var7 = HealthBarDefinition.getPacketBufferNode(ClientPacket.field2581, Client.packetWriter.isaacCipher); // L: 8969 - var7.packetBuffer.writeInt(var1); // L: 8970 - var7.packetBuffer.writeShort(var2); // L: 8971 - var7.packetBuffer.writeShort(var3); // L: 8972 - Client.packetWriter.addNode(var7); // L: 8973 - } - - if (var0 == 2) { // L: 8975 - var7 = HealthBarDefinition.getPacketBufferNode(ClientPacket.field2631, Client.packetWriter.isaacCipher); // L: 8977 - var7.packetBuffer.writeInt(var1); // L: 8978 - var7.packetBuffer.writeShort(var2); // L: 8979 - var7.packetBuffer.writeShort(var3); // L: 8980 - Client.packetWriter.addNode(var7); // L: 8981 - } - - if (var0 == 3) { // L: 8983 - var7 = HealthBarDefinition.getPacketBufferNode(ClientPacket.field2609, Client.packetWriter.isaacCipher); // L: 8985 - var7.packetBuffer.writeInt(var1); // L: 8986 - var7.packetBuffer.writeShort(var2); // L: 8987 - var7.packetBuffer.writeShort(var3); // L: 8988 - Client.packetWriter.addNode(var7); // L: 8989 - } - - if (var0 == 4) { // L: 8991 - var7 = HealthBarDefinition.getPacketBufferNode(ClientPacket.field2592, Client.packetWriter.isaacCipher); // L: 8993 - var7.packetBuffer.writeInt(var1); // L: 8994 - var7.packetBuffer.writeShort(var2); // L: 8995 - var7.packetBuffer.writeShort(var3); // L: 8996 - Client.packetWriter.addNode(var7); // L: 8997 - } - - if (var0 == 5) { // L: 8999 - var7 = HealthBarDefinition.getPacketBufferNode(ClientPacket.field2585, Client.packetWriter.isaacCipher); // L: 9001 - var7.packetBuffer.writeInt(var1); // L: 9002 - var7.packetBuffer.writeShort(var2); // L: 9003 - var7.packetBuffer.writeShort(var3); // L: 9004 - Client.packetWriter.addNode(var7); // L: 9005 - } - - if (var0 == 6) { // L: 9007 - var7 = HealthBarDefinition.getPacketBufferNode(ClientPacket.field2659, Client.packetWriter.isaacCipher); // L: 9009 - var7.packetBuffer.writeInt(var1); // L: 9010 - var7.packetBuffer.writeShort(var2); // L: 9011 - var7.packetBuffer.writeShort(var3); // L: 9012 - Client.packetWriter.addNode(var7); // L: 9013 - } - - if (var0 == 7) { // L: 9015 - var7 = HealthBarDefinition.getPacketBufferNode(ClientPacket.field2587, Client.packetWriter.isaacCipher); // L: 9017 - var7.packetBuffer.writeInt(var1); // L: 9018 - var7.packetBuffer.writeShort(var2); // L: 9019 - var7.packetBuffer.writeShort(var3); // L: 9020 - Client.packetWriter.addNode(var7); // L: 9021 - } - - if (var0 == 8) { // L: 9023 - var7 = HealthBarDefinition.getPacketBufferNode(ClientPacket.field2606, Client.packetWriter.isaacCipher); // L: 9025 - var7.packetBuffer.writeInt(var1); // L: 9026 - var7.packetBuffer.writeShort(var2); // L: 9027 - var7.packetBuffer.writeShort(var3); // L: 9028 - Client.packetWriter.addNode(var7); // L: 9029 - } - - if (var0 == 9) { // L: 9031 - var7 = HealthBarDefinition.getPacketBufferNode(ClientPacket.field2632, Client.packetWriter.isaacCipher); // L: 9033 - var7.packetBuffer.writeInt(var1); // L: 9034 - var7.packetBuffer.writeShort(var2); // L: 9035 - var7.packetBuffer.writeShort(var3); // L: 9036 - Client.packetWriter.addNode(var7); // L: 9037 - } - - if (var0 == 10) { // L: 9039 - var7 = HealthBarDefinition.getPacketBufferNode(ClientPacket.field2625, Client.packetWriter.isaacCipher); // L: 9041 - var7.packetBuffer.writeInt(var1); // L: 9042 - var7.packetBuffer.writeShort(var2); // L: 9043 - var7.packetBuffer.writeShort(var3); // L: 9044 - Client.packetWriter.addNode(var7); // L: 9045 - } - - } + static void method4714(Buffer var0, int var1) { + KitDefinition.method2687(var0.array, var1); // L: 11464 + if (JagexCache.JagexCache_randomDat != null) { // L: 11466 + try { + JagexCache.JagexCache_randomDat.seek(0L); // L: 11468 + JagexCache.JagexCache_randomDat.write(var0.array, var1, 24); // L: 11469 + } catch (Exception var3) { // L: 11471 } } - } // L: 8965 9047 + + } // L: 11474 } diff --git a/runescape-client/src/main/java/class247.java b/runescape-client/src/main/java/class247.java new file mode 100644 index 0000000000..58b7cbd9de --- /dev/null +++ b/runescape-client/src/main/java/class247.java @@ -0,0 +1,97 @@ +import net.runelite.mapping.Export; +import net.runelite.mapping.ObfuscatedName; +import net.runelite.mapping.ObfuscatedSignature; + +@ObfuscatedName("is") +public class class247 { + @ObfuscatedName("dt") + @ObfuscatedSignature( + descriptor = "Ljp;" + ) + @Export("archive5") + static Archive archive5; + + @ObfuscatedName("hd") + @ObfuscatedSignature( + descriptor = "(IIIIIIII)V", + garbageValue = "-1392845138" + ) + @Export("addPendingSpawnToScene") + static final void addPendingSpawnToScene(int var0, int var1, int var2, int var3, int var4, int var5, int var6) { + if (var2 >= 1 && var3 >= 1 && var2 <= 102 && var3 <= 102) { // L: 7247 + if (Client.isLowDetail && var0 != class22.Client_plane) { // L: 7248 + return; + } + + long var7 = 0L; // L: 7249 + boolean var9 = true; // L: 7250 + boolean var10 = false; // L: 7251 + boolean var11 = false; // L: 7252 + if (var1 == 0) { // L: 7253 + var7 = AbstractSocket.scene.getBoundaryObjectTag(var0, var2, var3); + } + + if (var1 == 1) { // L: 7254 + var7 = AbstractSocket.scene.getWallDecorationTag(var0, var2, var3); + } + + if (var1 == 2) { // L: 7255 + var7 = AbstractSocket.scene.getGameObjectTag(var0, var2, var3); + } + + if (var1 == 3) { // L: 7256 + var7 = AbstractSocket.scene.getFloorDecorationTag(var0, var2, var3); + } + + int var12; + if (0L != var7) { // L: 7257 + var12 = AbstractSocket.scene.getObjectFlags(var0, var2, var3, var7); // L: 7258 + int var14 = class93.Entity_unpackID(var7); // L: 7259 + int var15 = var12 & 31; // L: 7260 + int var16 = var12 >> 6 & 3; // L: 7261 + ObjectComposition var13; + if (var1 == 0) { // L: 7262 + AbstractSocket.scene.removeBoundaryObject(var0, var2, var3); // L: 7263 + var13 = class23.getObjectDefinition(var14); // L: 7264 + if (var13.interactType != 0) { // L: 7265 + Client.collisionMaps[var0].method3156(var2, var3, var15, var16, var13.boolean1); + } + } + + if (var1 == 1) { // L: 7267 + AbstractSocket.scene.removeWallDecoration(var0, var2, var3); + } + + if (var1 == 2) { // L: 7268 + AbstractSocket.scene.removeGameObject(var0, var2, var3); // L: 7269 + var13 = class23.getObjectDefinition(var14); // L: 7270 + if (var2 + var13.sizeX > 103 || var3 + var13.sizeX > 103 || var2 + var13.sizeY > 103 || var3 + var13.sizeY > 103) { // L: 7271 + return; + } + + if (var13.interactType != 0) { // L: 7272 + Client.collisionMaps[var0].setFlagOffNonSquare(var2, var3, var13.sizeX, var13.sizeY, var16, var13.boolean1); + } + } + + if (var1 == 3) { // L: 7274 + AbstractSocket.scene.removeFloorDecoration(var0, var2, var3); // L: 7275 + var13 = class23.getObjectDefinition(var14); // L: 7276 + if (var13.interactType == 1) { // L: 7277 + Client.collisionMaps[var0].method3150(var2, var3); + } + } + } + + if (var4 >= 0) { // L: 7280 + var12 = var0; // L: 7281 + if (var0 < 3 && (Tiles.Tiles_renderFlags[1][var2][var3] & 2) == 2) { // L: 7282 + var12 = var0 + 1; + } + + DevicePcmPlayerProvider.method386(var0, var12, var2, var3, var4, var5, var6, AbstractSocket.scene, Client.collisionMaps[var0]); // L: 7283 + } + } + + } // L: 7286 +} diff --git a/runescape-client/src/main/java/class249.java b/runescape-client/src/main/java/class249.java index ccf389d208..9c760cf369 100644 --- a/runescape-client/src/main/java/class249.java +++ b/runescape-client/src/main/java/class249.java @@ -1,33 +1,30 @@ import net.runelite.mapping.Export; +import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("io") +@ObfuscatedName("il") public class class249 { - @ObfuscatedName("g") + @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "(I)[Ljx;", - garbageValue = "1095870927" + descriptor = "Lid;" ) - @Export("PlayerType_values") - public static PlayerType[] PlayerType_values() { - return new PlayerType[]{PlayerType.PlayerType_jagexModerator, PlayerType.PlayerType_ultimateIronman, PlayerType.PlayerType_hardcoreIronman, PlayerType.PlayerType_normal, PlayerType.field3551, PlayerType.PlayerType_playerModerator, PlayerType.PlayerType_ironman}; // L: 20 - } + @Export("huffman") + static Huffman huffman; + @ObfuscatedName("j") + @ObfuscatedGetter( + intValue = -288783387 + ) + static int field3118; + @ObfuscatedName("cs") + public static char field3116; - @ObfuscatedName("ad") + @ObfuscatedName("n") @ObfuscatedSignature( - descriptor = "(ILci;ZB)I", - garbageValue = "59" + descriptor = "(Ljava/lang/String;IB)Z", + garbageValue = "0" ) - static int method4732(int var0, Script var1, boolean var2) { - if (var0 == 6900) { // L: 4205 - ++class13.Interpreter_stringStackSize; // L: 4206 - return 1; // L: 4207 - } else if (var0 == 6950) { // L: 4209 - ++WorldMapCacheName.Interpreter_intStackSize; // L: 4210 - return 1; // L: 4211 - } else { - return 2; // L: 4213 - } + static boolean method4792(String var0, int var1) { + return Script.method1996(var0, var1, "openjs"); // L: 50 } } diff --git a/runescape-client/src/main/java/class25.java b/runescape-client/src/main/java/class25.java index 705839161c..d8ee05f1ed 100644 --- a/runescape-client/src/main/java/class25.java +++ b/runescape-client/src/main/java/class25.java @@ -1,344 +1,68 @@ -import java.util.Arrays; import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("n") +@ObfuscatedName("i") public class class25 extends class16 { - @ObfuscatedName("qz") + @ObfuscatedName("bh") @ObfuscatedSignature( - descriptor = "Llx;" + descriptor = "[Lop;" ) - @Export("clanChat") - static ClanChat clanChat; - @ObfuscatedName("cq") - public static char field207; - @ObfuscatedName("h") + @Export("worldSelectFlagSprites") + static IndexedSprite[] worldSelectFlagSprites; + @ObfuscatedName("v") @ObfuscatedGetter( - intValue = 1205001631 + intValue = -1119027669 ) int field213; - @ObfuscatedName("c") - byte field203; - @ObfuscatedName("o") + @ObfuscatedName("n") + byte field210; + @ObfuscatedName("f") @ObfuscatedGetter( - intValue = 523989251 + intValue = 376208401 ) - int field202; - @ObfuscatedName("g") - String field215; + int field214; + @ObfuscatedName("y") + String field212; // $FF: synthetic field @ObfuscatedSignature( - descriptor = "Lm;" + descriptor = "Lx;" ) final class19 this$0; @ObfuscatedSignature( - descriptor = "(Lm;)V" + descriptor = "(Lx;)V" ) class25(class19 var1) { this.this$0 = var1; - this.field213 = -1; - } + this.field213 = -1; // L: 124 + } // L: 129 - @ObfuscatedName("h") + @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "(Lnk;S)V", - garbageValue = "4095" + descriptor = "(Lnd;I)V", + garbageValue = "68071115" ) - void vmethod326(Buffer var1) { - var1.readUnsignedByte(); - this.field213 = var1.readUnsignedShort(); - this.field203 = var1.readByte(); // L: 134 - this.field202 = var1.readUnsignedShort(); // L: 135 + void vmethod266(Buffer var1) { + var1.readUnsignedByte(); // L: 132 + this.field213 = var1.readUnsignedShort(); // L: 133 + this.field210 = var1.readByte(); // L: 134 + this.field214 = var1.readUnsignedShort(); // L: 135 var1.readLong(); // L: 136 - this.field215 = var1.readStringCp1252NullTerminated(); - var1.readUnsignedByte(); - } + this.field212 = var1.readStringCp1252NullTerminated(); // L: 137 + var1.readUnsignedByte(); // L: 138 + } // L: 139 - @ObfuscatedName("c") + @ObfuscatedName("n") @ObfuscatedSignature( - descriptor = "(Lg;B)V", - garbageValue = "-61" + descriptor = "(Ly;I)V", + garbageValue = "-1846892157" ) - void vmethod314(class3 var1) { - class9 var2 = (class9)var1.field32.get(this.field213); - var2.field76 = this.field203; - var2.field80 = this.field202; - var2.field73 = this.field215; - } - - @ObfuscatedName("h") - @ObfuscatedSignature( - descriptor = "(Ljava/lang/CharSequence;I)I", - garbageValue = "1703342087" - ) - public static int method313(CharSequence var0) { - int var1 = var0.length(); // L: 9 - int var2 = 0; // L: 10 - - for (int var3 = 0; var3 < var1; ++var3) { // L: 11 - char var4 = var0.charAt(var3); // L: 12 - if (var4 <= 127) { // L: 13 - ++var2; - } else if (var4 <= 2047) { // L: 14 - var2 += 2; - } else { - var2 += 3; // L: 15 - } - } - - return var2; // L: 17 - } - - @ObfuscatedName("o") - @ObfuscatedSignature( - descriptor = "(Lji;IIIBZS)V", - garbageValue = "-16702" - ) - @Export("requestNetFile") - static void requestNetFile(Archive var0, int var1, int var2, int var3, byte var4, boolean var5) { - long var6 = (long)((var1 << 16) + var2); // L: 259 - NetFileRequest var8 = (NetFileRequest)NetCache.NetCache_pendingPriorityWrites.get(var6); // L: 260 - if (var8 == null) { // L: 261 - var8 = (NetFileRequest)NetCache.NetCache_pendingPriorityResponses.get(var6); // L: 262 - if (var8 == null) { // L: 263 - var8 = (NetFileRequest)NetCache.NetCache_pendingWrites.get(var6); // L: 264 - if (var8 != null) { // L: 265 - if (var5) { // L: 266 - var8.removeDual(); // L: 267 - NetCache.NetCache_pendingPriorityWrites.put(var8, var6); // L: 268 - --NetCache.NetCache_pendingWritesCount; // L: 269 - ++NetCache.NetCache_pendingPriorityWritesCount; // L: 270 - } - - } else { - if (!var5) { // L: 274 - var8 = (NetFileRequest)NetCache.NetCache_pendingResponses.get(var6); // L: 275 - if (var8 != null) { // L: 276 - return; - } - } - - var8 = new NetFileRequest(); // L: 278 - var8.archive = var0; // L: 279 - var8.crc = var3; // L: 280 - var8.padding = var4; // L: 281 - if (var5) { // L: 282 - NetCache.NetCache_pendingPriorityWrites.put(var8, var6); // L: 283 - ++NetCache.NetCache_pendingPriorityWritesCount; // L: 284 - } else { - NetCache.NetCache_pendingWritesQueue.addFirst(var8); // L: 287 - NetCache.NetCache_pendingWrites.put(var8, var6); // L: 288 - ++NetCache.NetCache_pendingWritesCount; // L: 289 - } - - } - } - } - } // L: 272 291 - - @ObfuscatedName("o") - @ObfuscatedSignature( - descriptor = "([BI)Lci;", - garbageValue = "1537198206" - ) - @Export("newScript") - static Script newScript(byte[] var0) { - Script var1 = new Script(); // L: 112 - Buffer var2 = new Buffer(var0); // L: 113 - var2.offset = var2.array.length - 2; // L: 114 - int var3 = var2.readUnsignedShort(); // L: 115 - int var4 = var2.array.length - 2 - var3 - 12; // L: 116 - var2.offset = var4; // L: 117 - int var5 = var2.readInt(); // L: 118 - var1.localIntCount = var2.readUnsignedShort(); // L: 119 - var1.localStringCount = var2.readUnsignedShort(); // L: 120 - var1.intArgumentCount = var2.readUnsignedShort(); // L: 121 - var1.stringArgumentCount = var2.readUnsignedShort(); // L: 122 - int var6 = var2.readUnsignedByte(); // L: 123 - int var7; - int var8; - if (var6 > 0) { // L: 124 - var1.switches = var1.newIterableNodeHashTable(var6); // L: 125 - - for (var7 = 0; var7 < var6; ++var7) { // L: 126 - var8 = var2.readUnsignedShort(); // L: 127 - IterableNodeHashTable var9 = new IterableNodeHashTable(var8 > 0 ? MouseRecorder.method2126(var8) : 1); // L: 128 - var1.switches[var7] = var9; // L: 129 - - while (var8-- > 0) { // L: 130 - int var10 = var2.readInt(); // L: 131 - int var11 = var2.readInt(); // L: 132 - var9.put(new IntegerNode(var11), (long)var10); // L: 133 - } - } - } - - var2.offset = 0; // L: 137 - var1.field1054 = var2.readStringCp1252NullTerminatedOrNull(); // L: 138 - var1.opcodes = new int[var5]; // L: 139 - var1.intOperands = new int[var5]; // L: 140 - var1.stringOperands = new String[var5]; // L: 141 - - for (var7 = 0; var2.offset < var4; var1.opcodes[var7++] = var8) { // L: 142 143 148 - var8 = var2.readUnsignedShort(); // L: 144 - if (var8 == 3) { // L: 145 - var1.stringOperands[var7] = var2.readStringCp1252NullTerminated(); - } else if (var8 < 100 && var8 != 21 && var8 != 38 && var8 != 39) { - var1.intOperands[var7] = var2.readInt(); // L: 146 - } else { - var1.intOperands[var7] = var2.readUnsignedByte(); // L: 147 - } - } - - return var1; // L: 150 - } - - @ObfuscatedName("g") - @ObfuscatedSignature( - descriptor = "(I)Ljava/lang/String;", - garbageValue = "599751075" - ) - static String method316() { - return class12.clientPreferences.hideUsername ? SecureRandomCallable.method2081(Login.Login_username) : Login.Login_username; // L: 229 - } - - @ObfuscatedName("fm") - @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "644141113" - ) - static void method321() { - Client.mouseLastLastPressedTimeMillis = -1L; // L: 2850 - class69.mouseRecorder.index = 0; // L: 2851 - class124.hasFocus = true; // L: 2852 - Client.hadFocus = true; // L: 2853 - Client.field799 = -1L; // L: 2854 - class12.method203(); // L: 2855 - Client.packetWriter.clearBuffer(); // L: 2856 - Client.packetWriter.packetBuffer.offset = 0; // L: 2857 - Client.packetWriter.serverPacket = null; // L: 2858 - Client.packetWriter.field1386 = null; // L: 2859 - Client.packetWriter.field1387 = null; // L: 2860 - Client.packetWriter.field1391 = null; // L: 2861 - Client.packetWriter.serverPacketLength = 0; // L: 2862 - Client.packetWriter.field1384 = 0; // L: 2863 - Client.rebootTimer = 0; // L: 2864 - Client.logoutTimer = 0; // L: 2865 - Client.hintArrowType = 0; // L: 2866 - Occluder.method4090(); // L: 2867 - MouseHandler.MouseHandler_idleCycles = 0; // L: 2869 - AttackOption.method2286(); // L: 2871 - Client.isItemSelected = 0; // L: 2872 - Client.isSpellSelected = false; // L: 2873 - Client.soundEffectCount = 0; // L: 2874 - Client.camAngleY = 0; // L: 2875 - Client.oculusOrbState = 0; // L: 2876 - class18.field154 = null; // L: 2877 - Client.minimapState = 0; // L: 2878 - Client.field848 = -1; // L: 2879 - Client.destinationX = 0; // L: 2880 - Client.destinationY = 0; // L: 2881 - Client.playerAttackOption = AttackOption.AttackOption_hidden; // L: 2882 - Client.npcAttackOption = AttackOption.AttackOption_hidden; // L: 2883 - Client.npcCount = 0; // L: 2884 - Projectile.method1996(); // L: 2885 - - int var0; - for (var0 = 0; var0 < 2048; ++var0) { // L: 2886 - Client.players[var0] = null; - } - - for (var0 = 0; var0 < 32768; ++var0) { // L: 2887 - Client.npcs[var0] = null; - } - - Client.combatTargetPlayerIndex = -1; // L: 2888 - Client.projectiles.clear(); // L: 2889 - Client.graphicsObjects.clear(); // L: 2890 - - for (var0 = 0; var0 < 4; ++var0) { // L: 2891 - for (int var4 = 0; var4 < 104; ++var4) { // L: 2892 - for (int var2 = 0; var2 < 104; ++var2) { // L: 2893 - Client.groundItems[var0][var4][var2] = null; // L: 2894 - } - } - } - - Client.pendingSpawns = new NodeDeque(); // L: 2898 - GrandExchangeOfferUnitPriceComparator.friendSystem.clear(); // L: 2899 - - for (var0 = 0; var0 < class403.VarpDefinition_fileCount; ++var0) { // L: 2900 - VarpDefinition var1 = MusicPatchNode.VarpDefinition_get(var0); // L: 2901 - if (var1 != null) { // L: 2902 - Varps.Varps_temp[var0] = 0; // L: 2903 - Varps.Varps_main[var0] = 0; // L: 2904 - } - } - - Client.varcs.clearTransient(); // L: 2907 - Client.followerIndex = -1; // L: 2908 - if (Client.rootInterface != -1) { // L: 2909 - WallDecoration.method4234(Client.rootInterface); - } - - for (InterfaceParent var3 = (InterfaceParent)Client.interfaceParents.first(); var3 != null; var3 = (InterfaceParent)Client.interfaceParents.next()) { // L: 2910 - class18.closeInterface(var3, true); // L: 2911 - } - - Client.rootInterface = -1; // L: 2913 - Client.interfaceParents = new NodeHashTable(8); // L: 2914 - Client.meslayerContinueWidget = null; // L: 2915 - Occluder.method4090(); // L: 2916 - Client.playerAppearance.update((int[])null, new int[]{0, 0, 0, 0, 0}, false, -1); // L: 2917 - - for (var0 = 0; var0 < 8; ++var0) { // L: 2918 - Client.playerMenuActions[var0] = null; // L: 2919 - Client.playerOptionsPriorities[var0] = false; // L: 2920 - } - - class285.method5055(); // L: 2922 - Client.isLoading = true; // L: 2923 - - for (var0 = 0; var0 < 100; ++var0) { // L: 2924 - Client.field825[var0] = true; - } - - PacketBufferNode var5 = HealthBarDefinition.getPacketBufferNode(ClientPacket.field2655, Client.packetWriter.isaacCipher); // L: 2927 - var5.packetBuffer.writeByte(HitSplatDefinition.getWindowedMode()); // L: 2928 - var5.packetBuffer.writeShort(GameEngine.canvasWidth); // L: 2929 - var5.packetBuffer.writeShort(HealthBarDefinition.canvasHeight); // L: 2930 - Client.packetWriter.addNode(var5); // L: 2931 - clanChat = null; // L: 2933 - class105.field1328 = null; // L: 2934 - Arrays.fill(Client.field678, (Object)null); // L: 2935 - Players.field1358 = null; // L: 2936 - Arrays.fill(Client.field847, (Object)null); // L: 2937 - - for (var0 = 0; var0 < 8; ++var0) { // L: 2938 - Client.grandExchangeOffers[var0] = new GrandExchangeOffer(); - } - - class29.grandExchangeEvents = null; // L: 2939 - } // L: 2940 - - @ObfuscatedName("fy") - @ObfuscatedSignature( - descriptor = "(II)V", - garbageValue = "-1545590889" - ) - @Export("forceDisconnect") - static final void forceDisconnect(int var0) { - FileSystem.logOut(); // L: 3083 - switch(var0) { // L: 3084 - case 1: - FontName.method6157(); // L: 3092 - break; - case 2: - class26.method334(); // L: 3087 - } - - } // L: 3096 + void vmethod264(ClanChannel var1) { + ClanChannelMember var2 = (ClanChannelMember)var1.members.get(this.field213); // L: 142 + var2.rank = this.field210; // L: 143 + var2.world = this.field214; // L: 144 + var2.name = this.field212; // L: 145 + } // L: 146 } diff --git a/runescape-client/src/main/java/class253.java b/runescape-client/src/main/java/class253.java index 5adbb83905..dadaa80d7d 100644 --- a/runescape-client/src/main/java/class253.java +++ b/runescape-client/src/main/java/class253.java @@ -1,52 +1,44 @@ -import net.runelite.mapping.ObfuscatedGetter; +import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("im") +@ObfuscatedName("ia") public class class253 { - @ObfuscatedName("v") - @ObfuscatedGetter( - intValue = 1972523303 - ) - static int field3134; - @ObfuscatedName("bm") - static String field3136; + @ObfuscatedName("p") + static byte[][][] field3130; - @ObfuscatedName("o") + @ObfuscatedName("d") @ObfuscatedSignature( - descriptor = "(Ljp;IIB)[Low;", - garbageValue = "-38" + descriptor = "(Lio;I[B[BI)V", + garbageValue = "-26460885" ) - public static SpritePixels[] method4767(AbstractArchive var0, int var1, int var2) { - if (!Username.method5711(var0, var1, var2)) { // L: 57 - return null; - } else { - SpritePixels[] var4 = new SpritePixels[class396.SpriteBuffer_spriteCount]; // L: 60 - - for (int var5 = 0; var5 < class396.SpriteBuffer_spriteCount; ++var5) { // L: 61 - SpritePixels var6 = var4[var5] = new SpritePixels(); // L: 62 - var6.width = class396.SpriteBuffer_spriteWidth; // L: 63 - var6.height = class396.SpriteBuffer_spriteHeight; // L: 64 - var6.xOffset = class243.SpriteBuffer_xOffsets[var5]; // L: 65 - var6.yOffset = class396.SpriteBuffer_yOffsets[var5]; // L: 66 - var6.subWidth = ArchiveDiskActionHandler.SpriteBuffer_spriteWidths[var5]; // L: 67 - var6.subHeight = class372.SpriteBuffer_spriteHeights[var5]; // L: 68 - int var7 = var6.subWidth * var6.subHeight; // L: 69 - byte[] var8 = class396.SpriteBuffer_pixels[var5]; // L: 70 - var6.pixels = new int[var7]; // L: 71 - - for (int var9 = 0; var9 < var7; ++var9) { // L: 72 - var6.pixels[var9] = AccessFile.SpriteBuffer_spritePalette[var8[var9] & 255]; - } + @Export("Widget_setKey") + static final void Widget_setKey(Widget var0, int var1, byte[] var2, byte[] var3) { + if (var0.field3033 == null) { // L: 964 + if (var2 == null) { // L: 965 + return; // L: 971 } - class243.SpriteBuffer_xOffsets = null; // L: 75 - class396.SpriteBuffer_yOffsets = null; // L: 76 - ArchiveDiskActionHandler.SpriteBuffer_spriteWidths = null; // L: 77 - class372.SpriteBuffer_spriteHeights = null; // L: 78 - AccessFile.SpriteBuffer_spritePalette = null; // L: 79 - class396.SpriteBuffer_pixels = null; // L: 80 - return var4; // L: 84 + var0.field3033 = new byte[11][]; // L: 966 + var0.field3034 = new byte[11][]; // L: 967 + var0.field3035 = new int[11]; // L: 968 + var0.field3079 = new int[11]; // L: 969 } - } + + var0.field3033[var1] = var2; // L: 973 + if (var2 != null) { + var0.field3032 = true; // L: 974 + } else { + var0.field3032 = false; // L: 976 + + for (int var4 = 0; var4 < var0.field3033.length; ++var4) { // L: 977 + if (var0.field3033[var4] != null) { // L: 978 + var0.field3032 = true; // L: 979 + break; + } + } + } + + var0.field3034[var1] = var3; // L: 984 + } // L: 985 } diff --git a/runescape-client/src/main/java/class254.java b/runescape-client/src/main/java/class254.java index 81093a766f..4987242d04 100644 --- a/runescape-client/src/main/java/class254.java +++ b/runescape-client/src/main/java/class254.java @@ -3,51 +3,60 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("is") +@ObfuscatedName("ij") public enum class254 implements Enumerated { - @ObfuscatedName("h") + @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "Lis;" + descriptor = "Lij;" ) - field3140(0), - @ObfuscatedName("c") + field3138(0), + @ObfuscatedName("n") @ObfuscatedSignature( - descriptor = "Lis;" + descriptor = "Lij;" ) - field3137(1), - @ObfuscatedName("o") + field3134(1), + @ObfuscatedName("f") @ObfuscatedSignature( - descriptor = "Lis;" + descriptor = "Lij;" ) - field3139(2), - @ObfuscatedName("g") + field3135(2), + @ObfuscatedName("y") @ObfuscatedSignature( - descriptor = "Lis;" + descriptor = "Lij;" ) - field3144(3), - @ObfuscatedName("l") + field3136(3), + @ObfuscatedName("p") @ObfuscatedSignature( - descriptor = "Lis;" + descriptor = "Lij;" ) - field3141(4); + field3137(4); - @ObfuscatedName("z") + @ObfuscatedName("j") @ObfuscatedGetter( - intValue = -166646721 + intValue = -709027953 ) - final int field3142; + final int field3133; class254(int var3) { - this.field3142 = var3; // L: 14 + this.field3133 = var3; // L: 14 } // L: 15 - @ObfuscatedName("h") + @ObfuscatedName("v") @ObfuscatedSignature( descriptor = "(I)I", - garbageValue = "-708237537" + garbageValue = "-907662946" ) @Export("rsOrdinal") public int rsOrdinal() { - return this.field3142; // L: 18 + return this.field3133; // L: 18 + } + + @ObfuscatedName("y") + @ObfuscatedSignature( + descriptor = "(IB)Z", + garbageValue = "120" + ) + public static boolean method4823(int var0) { + return var0 >= WorldMapDecorationType.field3149.id && var0 <= WorldMapDecorationType.field3145.id || var0 == WorldMapDecorationType.field3146.id; // L: 42 } } diff --git a/runescape-client/src/main/java/class258.java b/runescape-client/src/main/java/class258.java index 75820f04b8..35b388cf37 100644 --- a/runescape-client/src/main/java/class258.java +++ b/runescape-client/src/main/java/class258.java @@ -1,71 +1,94 @@ import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -import net.runelite.rs.ScriptOpcodes; -@ObfuscatedName("ib") +@ObfuscatedName("iy") public class class258 { - @ObfuscatedName("t") - @ObfuscatedSignature( - descriptor = "(Ljava/lang/CharSequence;B)I", - garbageValue = "-76" - ) - @Export("hashString") - public static int hashString(CharSequence var0) { - int var1 = var0.length(); // L: 144 - int var2 = 0; // L: 145 - - for (int var3 = 0; var3 < var1; ++var3) { // L: 146 - var2 = (var2 << 5) - var2 + DirectByteArrayCopier.charToByteCp1252(var0.charAt(var3)); - } - - return var2; // L: 147 - } - - @ObfuscatedName("al") - @ObfuscatedSignature( - descriptor = "(ILci;ZI)I", - garbageValue = "209273359" - ) - static int method4787(int var0, Script var1, boolean var2) { - if (var0 == ScriptOpcodes.GETWINDOWMODE) { // L: 3425 - Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = HitSplatDefinition.getWindowedMode(); // L: 3426 - return 1; // L: 3427 - } else { - int var3; - if (var0 == ScriptOpcodes.SETWINDOWMODE) { // L: 3429 - var3 = Interpreter.Interpreter_intStack[--WorldMapCacheName.Interpreter_intStackSize]; // L: 3430 - if (var3 == 1 || var3 == 2) { // L: 3431 - class374.setWindowedMode(var3); - } - - return 1; // L: 3432 - } else if (var0 == ScriptOpcodes.GETDEFAULTWINDOWMODE) { // L: 3434 - Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = class12.clientPreferences.windowMode; // L: 3435 - return 1; // L: 3436 - } else if (var0 != ScriptOpcodes.SETDEFAULTWINDOWMODE) { // L: 3438 - if (var0 == 5310) { // L: 3446 - --WorldMapCacheName.Interpreter_intStackSize; // L: 3447 - return 1; // L: 3448 - } else if (var0 == 5350) { // L: 3450 - class13.Interpreter_stringStackSize -= 2; // L: 3451 - --WorldMapCacheName.Interpreter_intStackSize; // L: 3452 - return 1; // L: 3453 - } else if (var0 == 5351) { // L: 3455 - --class13.Interpreter_stringStackSize; // L: 3456 - return 1; // L: 3457 - } else { - return 2; // L: 3459 - } + @ObfuscatedName("v") + @Export("base37DecodeLong") + public static String base37DecodeLong(long var0) { + if (var0 > 0L && var0 < 6582952005840035281L) { // L: 16 + if (var0 % 37L == 0L) { // L: 17 + return null; } else { - var3 = Interpreter.Interpreter_intStack[--WorldMapCacheName.Interpreter_intStackSize]; // L: 3439 - if (var3 == 1 || var3 == 2) { // L: 3440 - class12.clientPreferences.windowMode = var3; // L: 3441 - KeyHandler.savePreferences(); // L: 3442 + int var2 = 0; // L: 18 + + for (long var3 = var0; 0L != var3; var3 /= 37L) { // L: 19 20 22 + ++var2; // L: 21 } - return 1; // L: 3444 + StringBuilder var5; + char var8; + for (var5 = new StringBuilder(var2); 0L != var0; var5.append(var8)) { // L: 24 25 34 + long var6 = var0; // L: 26 + var0 /= 37L; // L: 27 + var8 = class305.base37Table[(int)(var6 - 37L * var0)]; // L: 28 + if (var8 == '_') { // L: 29 + int var9 = var5.length() - 1; // L: 30 + var5.setCharAt(var9, Character.toUpperCase(var5.charAt(var9))); // L: 31 + var8 = 160; // L: 32 + } + } + + var5.reverse(); // L: 36 + var5.setCharAt(0, Character.toUpperCase(var5.charAt(0))); // L: 37 + return var5.toString(); // L: 38 } + } else { + return null; } } + + @ObfuscatedName("y") + @ObfuscatedSignature( + descriptor = "(I)[Ljn;", + garbageValue = "1808084531" + ) + public static class268[] method4835() { + return new class268[]{class268.field3540, class268.field3537, class268.field3538, class268.field3539}; // L: 15 + } + + @ObfuscatedName("kl") + @ObfuscatedSignature( + descriptor = "(Lio;I)V", + garbageValue = "1084146758" + ) + static final void method4836(Widget var0) { + int var1 = var0.contentType; // L: 10993 + if (var1 == 324) { // L: 10994 + if (Client.field908 == -1) { // L: 10995 + Client.field908 = var0.spriteId2; // L: 10996 + Client.field752 = var0.spriteId; // L: 10997 + } + + if (Client.playerAppearance.isFemale) { // L: 10999 + var0.spriteId2 = Client.field908; + } else { + var0.spriteId2 = Client.field752; // L: 11000 + } + + } else if (var1 == 325) { // L: 11003 + if (Client.field908 == -1) { // L: 11004 + Client.field908 = var0.spriteId2; // L: 11005 + Client.field752 = var0.spriteId; // L: 11006 + } + + if (Client.playerAppearance.isFemale) { // L: 11008 + var0.spriteId2 = Client.field752; + } else { + var0.spriteId2 = Client.field908; // L: 11009 + } + + } else if (var1 == 327) { // L: 11012 + var0.modelAngleX = 150; // L: 11013 + var0.modelAngleY = (int)(Math.sin((double)Client.cycle / 40.0D) * 256.0D) & 2047; // L: 11014 + var0.modelType = 5; // L: 11015 + var0.modelId = 0; // L: 11016 + } else if (var1 == 328) { // L: 11019 + var0.modelAngleX = 150; // L: 11020 + var0.modelAngleY = (int)(Math.sin((double)Client.cycle / 40.0D) * 256.0D) & 2047; // L: 11021 + var0.modelType = 5; // L: 11022 + var0.modelId = 1; // L: 11023 + } + } // L: 11001 11010 11017 11024 11026 } diff --git a/runescape-client/src/main/java/class259.java b/runescape-client/src/main/java/class259.java deleted file mode 100644 index 68fde86f31..0000000000 --- a/runescape-client/src/main/java/class259.java +++ /dev/null @@ -1,16 +0,0 @@ -import net.runelite.mapping.Export; -import net.runelite.mapping.ObfuscatedName; -import net.runelite.mapping.ObfuscatedSignature; - -@ObfuscatedName("iy") -public final class class259 { - @ObfuscatedName("h") - @ObfuscatedSignature( - descriptor = "(Lcp;I)V", - garbageValue = "1979127276" - ) - @Export("runScriptEvent") - public static void runScriptEvent(ScriptEvent var0) { - class243.runScript(var0, 500000, 475000); // L: 106 - } // L: 107 -} diff --git a/runescape-client/src/main/java/class26.java b/runescape-client/src/main/java/class26.java index 4c19d95118..386dda2b1b 100644 --- a/runescape-client/src/main/java/class26.java +++ b/runescape-client/src/main/java/class26.java @@ -2,102 +2,519 @@ 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("ag") +@ObfuscatedName("ae") public class class26 extends class14 { - @ObfuscatedName("eq") - @Export("worldHost") - static String worldHost; - @ObfuscatedName("h") - @ObfuscatedGetter( - longValue = -304679380423541639L - ) - long field218; - @ObfuscatedName("c") - String field217; @ObfuscatedName("o") - @ObfuscatedGetter( - intValue = -539273789 + @ObfuscatedSignature( + descriptor = "Lbh;" ) - int field216; + @Export("pcmPlayerProvider") + static PlayerProvider pcmPlayerProvider; + @ObfuscatedName("k") + @ObfuscatedSignature( + descriptor = "Ll;" + ) + static ClanSettings field220; + @ObfuscatedName("ac") + @ObfuscatedSignature( + descriptor = "Loe;" + ) + @Export("rasterProvider") + public static AbstractRasterProvider rasterProvider; + @ObfuscatedName("v") + @ObfuscatedGetter( + longValue = 1552499431731106411L + ) + long field217; + @ObfuscatedName("n") + String field218; + @ObfuscatedName("f") + @ObfuscatedGetter( + intValue = -1135955153 + ) + int field219; // $FF: synthetic field @ObfuscatedSignature( - descriptor = "Lo;" + descriptor = "Lf;" ) final class2 this$0; @ObfuscatedSignature( - descriptor = "(Lo;)V" + descriptor = "(Lf;)V" ) class26(class2 var1) { this.this$0 = var1; - this.field218 = -1L; // L: 93 - this.field217 = null; // L: 94 - this.field216 = 0; // L: 95 + this.field217 = -1L; // L: 93 + this.field218 = null; // L: 94 + this.field219 = 0; // L: 95 } // L: 97 - @ObfuscatedName("h") + @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "(Lnk;I)V", - garbageValue = "110401227" + descriptor = "(Lnd;I)V", + garbageValue = "-1281352827" ) - void vmethod339(Buffer var1) { + void vmethod276(Buffer var1) { if (var1.readUnsignedByte() != 255) { // L: 100 --var1.offset; // L: 101 - this.field218 = var1.readLong(); // L: 102 + this.field217 = var1.readLong(); // L: 102 } - this.field217 = var1.readStringCp1252NullTerminatedOrNull(); // L: 104 - this.field216 = var1.readUnsignedShort(); // L: 105 + this.field218 = var1.readStringCp1252NullTerminatedOrNull(); // L: 104 + this.field219 = var1.readUnsignedShort(); // L: 105 } // L: 106 - @ObfuscatedName("c") + @ObfuscatedName("n") @ObfuscatedSignature( - descriptor = "(Lx;I)V", - garbageValue = "-1535989118" + descriptor = "(Ll;B)V", + garbageValue = "29" ) - void vmethod338(class11 var1) { - var1.method117(this.field218, this.field217, this.field216); // L: 109 + void vmethod281(ClanSettings var1) { + var1.method103(this.field217, this.field218, this.field219); // L: 109 } // L: 110 - @ObfuscatedName("o") + @ObfuscatedName("e") @ObfuscatedSignature( - descriptor = "(CLkr;I)I", - garbageValue = "1120032749" + descriptor = "(III)I", + garbageValue = "-1494621592" ) - @Export("lowercaseChar") - static int lowercaseChar(char var0, Language var1) { - int var2 = var0 << 4; // L: 143 - if (Character.isUpperCase(var0) || Character.isTitleCase(var0)) { // L: 144 - var0 = Character.toLowerCase(var0); // L: 145 - var2 = (var0 << 4) + 1; // L: 146 - } + static final int method272(int var0, int var1) { + if (var0 == -2) { // L: 855 + return 12345678; + } else if (var0 == -1) { // L: 856 + if (var1 < 2) { + var1 = 2; // L: 857 + } else if (var1 > 126) { // L: 858 + var1 = 126; + } - if (var0 == 241 && var1 == Language.Language_ES) { // L: 148 - var2 = 1762; - } + return var1; // L: 859 + } else { + var1 = (var0 & 127) * var1 / 128; // L: 861 + if (var1 < 2) { // L: 862 + var1 = 2; + } else if (var1 > 126) { // L: 863 + var1 = 126; + } - return var2; // L: 149 + return (var0 & 65408) + var1; // L: 864 + } } - @ObfuscatedName("p") + @ObfuscatedName("a") @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "1731637540" + descriptor = "(ILcf;ZI)I", + garbageValue = "1261558074" ) - static void method334() { - Login.loginIndex = 24; // L: 1561 - class44.setLoginResponseString("The game servers are currently being updated.", "Please wait a few minutes and try again.", ""); // L: 1562 - } // L: 1563 + static int method274(int var0, Script var1, boolean var2) { + Widget var6; + if (var0 != ScriptOpcodes.CC_CALLONRESIZE && var0 != ScriptOpcodes.IF_CALLONRESIZE) { // L: 1211 + int var4; + if (var0 == 1928) { // L: 1228 + var6 = var2 ? class13.scriptDotWidget : Interpreter.scriptActiveWidget; // L: 1229 + var4 = Interpreter.Interpreter_intStack[--class44.Interpreter_intStackSize]; // L: 1230 + if (var4 >= 1 && var4 <= 10) { // L: 1231 + class376.widgetDefaultMenuAction(var4, var6.id, var6.childIndex, var6.itemId, ""); // L: 1234 + return 1; // L: 1235 + } else { + throw new RuntimeException(); // L: 1232 + } + } else if (var0 == 2928) { // L: 1237 + class44.Interpreter_intStackSize -= 3; // L: 1238 + int var3 = Interpreter.Interpreter_intStack[class44.Interpreter_intStackSize]; // L: 1239 + var4 = Interpreter.Interpreter_intStack[class44.Interpreter_intStackSize + 1]; // L: 1240 + int var5 = Interpreter.Interpreter_intStack[class44.Interpreter_intStackSize + 2]; // L: 1241 + if (var5 >= 1 && var5 <= 10) { // L: 1242 + class376.widgetDefaultMenuAction(var5, var3, var4, Frames.getWidget(var3).itemId, ""); // L: 1245 + return 1; // L: 1246 + } else { + throw new RuntimeException(); // L: 1243 + } + } else { + return 2; // L: 1248 + } + } else if (Interpreter.field987 >= 10) { // L: 1212 + throw new RuntimeException(); // L: 1213 + } else { + if (var0 >= 2000) { // L: 1216 + var6 = Frames.getWidget(Interpreter.Interpreter_intStack[--class44.Interpreter_intStackSize]); // L: 1217 + } else { + var6 = var2 ? class13.scriptDotWidget : Interpreter.scriptActiveWidget; // L: 1219 + } - @ObfuscatedName("ln") + if (var6.onResize == null) { // L: 1220 + return 0; + } else { + ScriptEvent var7 = new ScriptEvent(); // L: 1221 + var7.widget = var6; // L: 1222 + var7.args = var6.onResize; // L: 1223 + var7.field1180 = Interpreter.field987 + 1; // L: 1224 + Client.scriptEvents.addFirst(var7); // L: 1225 + return 1; // L: 1226 + } + } + } + + @ObfuscatedName("i") @ObfuscatedSignature( - descriptor = "(Liv;I)I", - garbageValue = "1598079185" + descriptor = "(ILcf;ZB)I", + garbageValue = "55" ) - @Export("getWidgetFlags") - static int getWidgetFlags(Widget var0) { - IntegerNode var1 = (IntegerNode)Client.widgetFlags.get(((long)var0.id << 32) + (long)var0.childIndex); // L: 11602 - return var1 != null ? var1.integer : var0.flags; // L: 11603 11604 + static int method273(int var0, Script var1, boolean var2) { + if (var0 == ScriptOpcodes.FRIEND_COUNT) { // L: 2053 + if (NetSocket.friendSystem.field941 == 0) { // L: 2054 + Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = -2; + } else if (NetSocket.friendSystem.field941 == 1) { // L: 2055 + Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = -1; + } else { + Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = NetSocket.friendSystem.friendsList.getSize(); // L: 2056 + } + + return 1; // L: 2057 + } else { + int var3; + if (var0 == ScriptOpcodes.FRIEND_GETNAME) { + var3 = Interpreter.Interpreter_intStack[--class44.Interpreter_intStackSize]; // L: 2060 + if (NetSocket.friendSystem.method1689() && var3 >= 0 && var3 < NetSocket.friendSystem.friendsList.getSize()) { // L: 2061 + Friend var8 = (Friend)NetSocket.friendSystem.friendsList.get(var3); // L: 2062 + Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var8.getName(); // L: 2063 + Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var8.getPreviousName(); // L: 2064 + } else { + Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = ""; // L: 2067 + Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = ""; // L: 2068 + } + + return 1; // L: 2070 + } else if (var0 == ScriptOpcodes.FRIEND_GETWORLD) { + var3 = Interpreter.Interpreter_intStack[--class44.Interpreter_intStackSize]; // L: 2073 + if (NetSocket.friendSystem.method1689() && var3 >= 0 && var3 < NetSocket.friendSystem.friendsList.getSize()) { // L: 2074 + Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = ((Buddy)NetSocket.friendSystem.friendsList.get(var3)).world; // L: 2075 + } else { + Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = 0; // L: 2077 + } + + return 1; // L: 2078 + } else if (var0 == ScriptOpcodes.FRIEND_GETRANK) { + var3 = Interpreter.Interpreter_intStack[--class44.Interpreter_intStackSize]; // L: 2081 + if (NetSocket.friendSystem.method1689() && var3 >= 0 && var3 < NetSocket.friendSystem.friendsList.getSize()) { // L: 2082 + Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = ((Buddy)NetSocket.friendSystem.friendsList.get(var3)).rank; // L: 2083 + } else { + Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = 0; // L: 2085 + } + + return 1; // L: 2086 + } else { + String var5; + if (var0 == ScriptOpcodes.FRIEND_SETRANK) { + var5 = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize]; // L: 2089 + int var6 = Interpreter.Interpreter_intStack[--class44.Interpreter_intStackSize]; // L: 2090 + VerticalAlignment.method2796(var5, var6); // L: 2091 + return 1; // L: 2092 + } else if (var0 == ScriptOpcodes.FRIEND_ADD) { + var5 = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize]; // L: 2095 + NetSocket.friendSystem.addFriend(var5); // L: 2096 + return 1; // L: 2097 + } else if (var0 == ScriptOpcodes.FRIEND_DEL) { + var5 = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize]; // L: 2100 + NetSocket.friendSystem.removeFriend(var5); // L: 2101 + return 1; // L: 2102 + } else if (var0 == ScriptOpcodes.IGNORE_ADD) { + var5 = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize]; // L: 2105 + NetSocket.friendSystem.addIgnore(var5); // L: 2106 + return 1; // L: 2107 + } else if (var0 == ScriptOpcodes.IGNORE_DEL) { + var5 = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize]; // L: 2110 + NetSocket.friendSystem.removeIgnore(var5); // L: 2111 + return 1; // L: 2112 + } else if (var0 == ScriptOpcodes.FRIEND_TEST) { + var5 = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize]; // L: 2115 + var5 = class15.method189(var5); // L: 2116 + Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = NetSocket.friendSystem.isFriended(new Username(var5, WorldMapSection0.loginType), false) ? 1 : 0; // L: 2117 + return 1; // L: 2118 + } else if (var0 == ScriptOpcodes.CLAN_GETCHATDISPLAYNAME) { + if (WorldMapRegion.friendsChat != null) { // L: 2121 + Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = WorldMapRegion.friendsChat.name; // L: 2122 + } else { + Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = ""; // L: 2124 + } + + return 1; // L: 2125 + } else if (var0 == ScriptOpcodes.CLAN_GETCHATCOUNT) { + if (WorldMapRegion.friendsChat != null) { // L: 2128 + Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = WorldMapRegion.friendsChat.getSize(); // L: 2129 + } else { + Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = 0; // L: 2131 + } + + return 1; // L: 2132 + } else if (var0 == ScriptOpcodes.CLAN_GETCHATUSERNAME) { + var3 = Interpreter.Interpreter_intStack[--class44.Interpreter_intStackSize]; // L: 2135 + if (WorldMapRegion.friendsChat != null && var3 < WorldMapRegion.friendsChat.getSize()) { // L: 2136 + Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = WorldMapRegion.friendsChat.get(var3).getUsername().getName(); // L: 2137 + } else { + Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = ""; // L: 2139 + } + + return 1; // L: 2140 + } else if (var0 == ScriptOpcodes.CLAN_GETCHATUSERWORLD) { + var3 = Interpreter.Interpreter_intStack[--class44.Interpreter_intStackSize]; // L: 2143 + if (WorldMapRegion.friendsChat != null && var3 < WorldMapRegion.friendsChat.getSize()) { // L: 2144 + Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = ((Buddy)WorldMapRegion.friendsChat.get(var3)).getWorld(); // L: 2145 + } else { + Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = 0; // L: 2147 + } + + return 1; // L: 2148 + } else if (var0 == ScriptOpcodes.CLAN_GETCHATUSERRANK) { + var3 = Interpreter.Interpreter_intStack[--class44.Interpreter_intStackSize]; // L: 2151 + if (WorldMapRegion.friendsChat != null && var3 < WorldMapRegion.friendsChat.getSize()) { // L: 2152 + Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = ((Buddy)WorldMapRegion.friendsChat.get(var3)).rank; // L: 2153 + } else { + Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = 0; // L: 2155 + } + + return 1; // L: 2156 + } else if (var0 == ScriptOpcodes.CLAN_GETCHATMINKICK) { + Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = WorldMapRegion.friendsChat != null ? WorldMapRegion.friendsChat.minKick : 0; // L: 2159 + return 1; // L: 2160 + } else if (var0 == ScriptOpcodes.CLAN_KICKUSER) { + var5 = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize]; // L: 2163 + class105.clanKickUser(var5); // L: 2164 + return 1; // L: 2165 + } else if (var0 == ScriptOpcodes.CLAN_GETCHATRANK) { + Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = WorldMapRegion.friendsChat != null ? WorldMapRegion.friendsChat.rank * -759593825 * -78473377 : 0; // L: 2168 + return 1; // L: 2169 + } else if (var0 == ScriptOpcodes.CLAN_JOINCHAT) { + var5 = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize]; // L: 2172 + NPCComposition.Clan_joinChat(var5); // L: 2173 + return 1; // L: 2174 + } else if (var0 == ScriptOpcodes.CLAN_LEAVECHAT) { + MouseHandler.Clan_leaveChat(); // L: 2177 + return 1; // L: 2178 + } else if (var0 == ScriptOpcodes.IGNORE_COUNT) { + if (!NetSocket.friendSystem.method1689()) { // L: 2181 + Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = -1; + } else { + Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = NetSocket.friendSystem.ignoreList.getSize(); // L: 2182 + } + + return 1; // L: 2183 + } else if (var0 == ScriptOpcodes.IGNORE_GETNAME) { + var3 = Interpreter.Interpreter_intStack[--class44.Interpreter_intStackSize]; // L: 2186 + if (NetSocket.friendSystem.method1689() && var3 >= 0 && var3 < NetSocket.friendSystem.ignoreList.getSize()) { // L: 2187 + Ignored var4 = (Ignored)NetSocket.friendSystem.ignoreList.get(var3); // L: 2188 + Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var4.getName(); // L: 2189 + Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var4.getPreviousName(); // L: 2190 + } else { + Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = ""; // L: 2193 + Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = ""; // L: 2194 + } + + return 1; // L: 2196 + } else if (var0 == ScriptOpcodes.IGNORE_TEST) { + var5 = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize]; // L: 2199 + var5 = class15.method189(var5); // L: 2200 + Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = NetSocket.friendSystem.isIgnored(new Username(var5, WorldMapSection0.loginType)) ? 1 : 0; // L: 2201 + return 1; // L: 2202 + } else if (var0 == ScriptOpcodes.CLAN_ISSELF) { + var3 = Interpreter.Interpreter_intStack[--class44.Interpreter_intStackSize]; // L: 2205 + if (WorldMapRegion.friendsChat != null && var3 < WorldMapRegion.friendsChat.getSize() && WorldMapRegion.friendsChat.get(var3).getUsername().equals(class93.localPlayer.username)) { // L: 2206 + Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = 1; // L: 2207 + } else { + Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = 0; // L: 2209 + } + + return 1; // L: 2210 + } else if (var0 == ScriptOpcodes.CLAN_GETCHATOWNERNAME) { + if (WorldMapRegion.friendsChat != null && WorldMapRegion.friendsChat.owner != null) { // L: 2213 + Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = WorldMapRegion.friendsChat.owner; // L: 2214 + } else { + Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = ""; // L: 2216 + } + + return 1; // L: 2217 + } else if (var0 == ScriptOpcodes.CLAN_ISFRIEND) { + var3 = Interpreter.Interpreter_intStack[--class44.Interpreter_intStackSize]; // L: 2220 + if (WorldMapRegion.friendsChat != null && var3 < WorldMapRegion.friendsChat.getSize() && ((ClanMate)WorldMapRegion.friendsChat.get(var3)).isFriend()) { // L: 2221 + Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = 1; // L: 2222 + } else { + Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = 0; // L: 2224 + } + + return 1; // L: 2225 + } else if (var0 != ScriptOpcodes.CLAN_ISIGNORE) { + if (var0 == 3628) { + NetSocket.friendSystem.friendsList.removeComparator(); // L: 2236 + return 1; // L: 2237 + } else { + boolean var7; + if (var0 == 3629) { + var7 = Interpreter.Interpreter_intStack[--class44.Interpreter_intStackSize] == 1; // L: 2240 + NetSocket.friendSystem.friendsList.addComparator(new UserComparator1(var7)); // L: 2241 + return 1; // L: 2242 + } else if (var0 == 3630) { + var7 = Interpreter.Interpreter_intStack[--class44.Interpreter_intStackSize] == 1; // L: 2245 + NetSocket.friendSystem.friendsList.addComparator(new UserComparator2(var7)); // L: 2246 + return 1; // L: 2247 + } else if (var0 == 3631) { + var7 = Interpreter.Interpreter_intStack[--class44.Interpreter_intStackSize] == 1; // L: 2250 + NetSocket.friendSystem.friendsList.addComparator(new UserComparator3(var7)); // L: 2251 + return 1; // L: 2252 + } else if (var0 == 3632) { + var7 = Interpreter.Interpreter_intStack[--class44.Interpreter_intStackSize] == 1; // L: 2255 + NetSocket.friendSystem.friendsList.addComparator(new UserComparator4(var7)); // L: 2256 + return 1; // L: 2257 + } else if (var0 == 3633) { + var7 = Interpreter.Interpreter_intStack[--class44.Interpreter_intStackSize] == 1; // L: 2260 + NetSocket.friendSystem.friendsList.addComparator(new UserComparator5(var7)); // L: 2261 + return 1; // L: 2262 + } else if (var0 == 3634) { + var7 = Interpreter.Interpreter_intStack[--class44.Interpreter_intStackSize] == 1; // L: 2265 + NetSocket.friendSystem.friendsList.addComparator(new UserComparator6(var7)); // L: 2266 + return 1; // L: 2267 + } else if (var0 == 3635) { + var7 = Interpreter.Interpreter_intStack[--class44.Interpreter_intStackSize] == 1; // L: 2270 + NetSocket.friendSystem.friendsList.addComparator(new UserComparator7(var7)); // L: 2271 + return 1; // L: 2272 + } else if (var0 == 3636) { + var7 = Interpreter.Interpreter_intStack[--class44.Interpreter_intStackSize] == 1; // L: 2275 + NetSocket.friendSystem.friendsList.addComparator(new UserComparator8(var7)); // L: 2276 + return 1; // L: 2277 + } else if (var0 == 3637) { + var7 = Interpreter.Interpreter_intStack[--class44.Interpreter_intStackSize] == 1; // L: 2280 + NetSocket.friendSystem.friendsList.addComparator(new UserComparator9(var7)); // L: 2281 + return 1; // L: 2282 + } else if (var0 == 3638) { + var7 = Interpreter.Interpreter_intStack[--class44.Interpreter_intStackSize] == 1; // L: 2285 + NetSocket.friendSystem.friendsList.addComparator(new UserComparator10(var7)); // L: 2286 + return 1; // L: 2287 + } else if (var0 == 3639) { + NetSocket.friendSystem.friendsList.sort(); // L: 2290 + return 1; // L: 2291 + } else if (var0 == 3640) { + NetSocket.friendSystem.ignoreList.removeComparator(); // L: 2294 + return 1; // L: 2295 + } else if (var0 == 3641) { + var7 = Interpreter.Interpreter_intStack[--class44.Interpreter_intStackSize] == 1; // L: 2298 + NetSocket.friendSystem.ignoreList.addComparator(new UserComparator1(var7)); // L: 2299 + return 1; // L: 2300 + } else if (var0 == 3642) { + var7 = Interpreter.Interpreter_intStack[--class44.Interpreter_intStackSize] == 1; // L: 2303 + NetSocket.friendSystem.ignoreList.addComparator(new UserComparator2(var7)); // L: 2304 + return 1; // L: 2305 + } else if (var0 == 3643) { + NetSocket.friendSystem.ignoreList.sort(); // L: 2308 + return 1; // L: 2309 + } else if (var0 == 3644) { + if (WorldMapRegion.friendsChat != null) { // L: 2312 + WorldMapRegion.friendsChat.removeComparator(); // L: 2313 + } + + return 1; // L: 2315 + } else if (var0 == 3645) { + var7 = Interpreter.Interpreter_intStack[--class44.Interpreter_intStackSize] == 1; // L: 2318 + if (WorldMapRegion.friendsChat != null) { // L: 2319 + WorldMapRegion.friendsChat.addComparator(new UserComparator1(var7)); // L: 2320 + } + + return 1; // L: 2322 + } else if (var0 == 3646) { + var7 = Interpreter.Interpreter_intStack[--class44.Interpreter_intStackSize] == 1; // L: 2325 + if (WorldMapRegion.friendsChat != null) { // L: 2326 + WorldMapRegion.friendsChat.addComparator(new UserComparator2(var7)); // L: 2327 + } + + return 1; // L: 2329 + } else if (var0 == 3647) { + var7 = Interpreter.Interpreter_intStack[--class44.Interpreter_intStackSize] == 1; // L: 2332 + if (WorldMapRegion.friendsChat != null) { // L: 2333 + WorldMapRegion.friendsChat.addComparator(new UserComparator3(var7)); // L: 2334 + } + + return 1; // L: 2336 + } else if (var0 == 3648) { + var7 = Interpreter.Interpreter_intStack[--class44.Interpreter_intStackSize] == 1; // L: 2339 + if (WorldMapRegion.friendsChat != null) { // L: 2340 + WorldMapRegion.friendsChat.addComparator(new UserComparator4(var7)); // L: 2341 + } + + return 1; // L: 2343 + } else if (var0 == 3649) { + var7 = Interpreter.Interpreter_intStack[--class44.Interpreter_intStackSize] == 1; // L: 2346 + if (WorldMapRegion.friendsChat != null) { // L: 2347 + WorldMapRegion.friendsChat.addComparator(new UserComparator5(var7)); // L: 2348 + } + + return 1; // L: 2350 + } else if (var0 == 3650) { + var7 = Interpreter.Interpreter_intStack[--class44.Interpreter_intStackSize] == 1; // L: 2353 + if (WorldMapRegion.friendsChat != null) { // L: 2354 + WorldMapRegion.friendsChat.addComparator(new UserComparator6(var7)); // L: 2355 + } + + return 1; // L: 2357 + } else if (var0 == 3651) { + var7 = Interpreter.Interpreter_intStack[--class44.Interpreter_intStackSize] == 1; // L: 2360 + if (WorldMapRegion.friendsChat != null) { // L: 2361 + WorldMapRegion.friendsChat.addComparator(new UserComparator7(var7)); // L: 2362 + } + + return 1; // L: 2364 + } else if (var0 == 3652) { + var7 = Interpreter.Interpreter_intStack[--class44.Interpreter_intStackSize] == 1; // L: 2367 + if (WorldMapRegion.friendsChat != null) { // L: 2368 + WorldMapRegion.friendsChat.addComparator(new UserComparator8(var7)); // L: 2369 + } + + return 1; // L: 2371 + } else if (var0 == 3653) { + var7 = Interpreter.Interpreter_intStack[--class44.Interpreter_intStackSize] == 1; // L: 2374 + if (WorldMapRegion.friendsChat != null) { // L: 2375 + WorldMapRegion.friendsChat.addComparator(new UserComparator9(var7)); // L: 2376 + } + + return 1; // L: 2378 + } else if (var0 == 3654) { + var7 = Interpreter.Interpreter_intStack[--class44.Interpreter_intStackSize] == 1; // L: 2381 + if (WorldMapRegion.friendsChat != null) { // L: 2382 + WorldMapRegion.friendsChat.addComparator(new UserComparator10(var7)); // L: 2383 + } + + return 1; // L: 2385 + } else if (var0 == 3655) { + if (WorldMapRegion.friendsChat != null) { // L: 2388 + WorldMapRegion.friendsChat.sort(); // L: 2389 + } + + return 1; // L: 2391 + } else if (var0 == 3656) { + var7 = Interpreter.Interpreter_intStack[--class44.Interpreter_intStackSize] == 1; // L: 2394 + NetSocket.friendSystem.friendsList.addComparator(new BuddyRankComparator(var7)); // L: 2395 + return 1; // L: 2396 + } else if (var0 == 3657) { + var7 = Interpreter.Interpreter_intStack[--class44.Interpreter_intStackSize] == 1; // L: 2399 + if (WorldMapRegion.friendsChat != null) { // L: 2400 + WorldMapRegion.friendsChat.addComparator(new BuddyRankComparator(var7)); // L: 2401 + } + + return 1; // L: 2403 + } else { + return 2; // L: 2405 + } + } + } else { + var3 = Interpreter.Interpreter_intStack[--class44.Interpreter_intStackSize]; // L: 2228 + if (WorldMapRegion.friendsChat != null && var3 < WorldMapRegion.friendsChat.getSize() && ((ClanMate)WorldMapRegion.friendsChat.get(var3)).isIgnored()) { // L: 2229 + Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = 1; // L: 2230 + } else { + Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = 0; // L: 2232 + } + + return 1; // L: 2233 + } + } + } } } diff --git a/runescape-client/src/main/java/class260.java b/runescape-client/src/main/java/class260.java index 44803b5fe8..a4431009b2 100644 --- a/runescape-client/src/main/java/class260.java +++ b/runescape-client/src/main/java/class260.java @@ -1,23 +1,97 @@ import net.runelite.mapping.Export; +import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("jk") +@ObfuscatedName("ji") public class class260 { - @ObfuscatedName("dr") + @ObfuscatedName("p") @ObfuscatedSignature( - descriptor = "Lji;" + descriptor = "Lop;" ) - @Export("archive7") - static Archive archive7; - @ObfuscatedName("fq") - @ObfuscatedSignature( - descriptor = "Lmw;" + @Export("titleboxSprite") + static IndexedSprite titleboxSprite; + @ObfuscatedName("b") + @ObfuscatedGetter( + intValue = -1644040669 ) - @Export("WorldMapElement_fonts") - static Fonts WorldMapElement_fonts; + @Export("gameCyclesToDo") + protected static int gameCyclesToDo; static { Math.sqrt(8192.0D); // L: 9 } // L: 10 + + @ObfuscatedName("v") + @ObfuscatedSignature( + descriptor = "(II)Leq;", + garbageValue = "-1090210304" + ) + @Export("ItemDefinition_get") + public static ItemComposition ItemDefinition_get(int var0) { + ItemComposition var1 = (ItemComposition)ItemComposition.ItemDefinition_cached.get((long)var0); // L: 84 + if (var1 != null) { // L: 85 + return var1; + } else { + byte[] var2 = class341.ItemDefinition_archive.takeFile(10, var0); // L: 86 + var1 = new ItemComposition(); // L: 87 + var1.id = var0; // L: 88 + if (var2 != null) { // L: 89 + var1.decode(new Buffer(var2)); + } + + var1.post(); // L: 90 + if (var1.noteTemplate != -1) { // L: 91 + var1.genCert(ItemDefinition_get(var1.noteTemplate), ItemDefinition_get(var1.note)); + } + + if (var1.notedId != -1) { // L: 92 + var1.genBought(ItemDefinition_get(var1.notedId), ItemDefinition_get(var1.unnotedId)); + } + + if (var1.placeholderTemplate != -1) { // L: 93 + var1.genPlaceholder(ItemDefinition_get(var1.placeholderTemplate), ItemDefinition_get(var1.placeholder)); + } + + if (!ItemContainer.ItemDefinition_inMembersWorld && var1.isMembersOnly) { // L: 94 + var1.name = "Members object"; // L: 95 + var1.isTradable = false; // L: 96 + var1.groundActions = null; // L: 97 + var1.inventoryActions = null; // L: 98 + var1.shiftClickIndex = -1; // L: 99 + var1.team = 0; // L: 100 + if (var1.params != null) { // L: 101 + boolean var3 = false; // L: 102 + + for (Node var4 = var1.params.first(); var4 != null; var4 = var1.params.next()) { // L: 103 + ParamComposition var5 = Varcs.getParamDefinition((int)var4.key); // L: 104 + if (var5.autoDisable) { // L: 105 + var4.remove(); + } else { + var3 = true; // L: 106 + } + } + + if (!var3) { // L: 108 + var1.params = null; + } + } + } + + ItemComposition.ItemDefinition_cached.put(var1, (long)var0); // L: 111 + return var1; // L: 112 + } + } + + @ObfuscatedName("u") + @ObfuscatedSignature( + descriptor = "(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;B)V", + garbageValue = "-60" + ) + @Export("setLoginResponseString") + static void setLoginResponseString(String var0, String var1, String var2) { + Login.Login_response1 = var0; // L: 1525 + Login.Login_response2 = var1; // L: 1526 + Login.Login_response3 = var2; // L: 1527 + } // L: 1528 } diff --git a/runescape-client/src/main/java/class261.java b/runescape-client/src/main/java/class261.java index dff8c7b245..8c6814f988 100644 --- a/runescape-client/src/main/java/class261.java +++ b/runescape-client/src/main/java/class261.java @@ -2,49 +2,47 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("jq") +@ObfuscatedName("jw") public class class261 { - @ObfuscatedName("h") + @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "Ljq;" + descriptor = "Ljw;" ) - static final class261 field3203; - @ObfuscatedName("c") + static final class261 field3201; + @ObfuscatedName("n") @ObfuscatedSignature( - descriptor = "Ljq;" + descriptor = "Ljw;" ) - static final class261 field3206; - @ObfuscatedName("o") + static final class261 field3200; + @ObfuscatedName("f") @ObfuscatedGetter( - intValue = 857756693 + intValue = 310151433 ) - final int field3205; - @ObfuscatedName("g") + final int field3199; + @ObfuscatedName("y") @ObfuscatedGetter( - intValue = -712840455 + intValue = -715016481 ) - final int field3204; + final int field3202; static { - field3203 = new class261(51, 27, 800, 0, 16, 16); // L: 33 - field3206 = new class261(25, 28, 800, 656, 40, 40); // L: 34 + field3201 = new class261(51, 27, 800, 0, 16, 16); // L: 29 + field3200 = new class261(25, 28, 800, 656, 40, 40); // L: 30 } class261(int var1, int var2, int var3, int var4, int var5, int var6) { - this.field3205 = var5; // L: 39 - this.field3204 = var6; // L: 40 + this.field3199 = var5; // L: 39 + this.field3202 = var6; // L: 40 } // L: 41 - @ObfuscatedName("k") + @ObfuscatedName("b") @ObfuscatedSignature( - descriptor = "(II)Ljava/lang/String;", - garbageValue = "1466191460" + descriptor = "(IB)I", + garbageValue = "0" ) - static final String method4790(int var0) { - if (var0 < 100000) { // L: 421 - return "" + var0 + ""; - } else { - return var0 < 10000000 ? "" + var0 / 1000 + "K" + "" : "" + var0 / 1000000 + "M" + ""; // L: 422 423 - } + public static int method4842(int var0) { + long var2 = ViewportMouse.ViewportMouse_entityTags[var0]; // L: 77 + int var1 = (int)(var2 >>> 14 & 3L); // L: 79 + return var1; // L: 81 } } diff --git a/runescape-client/src/main/java/class264.java b/runescape-client/src/main/java/class264.java deleted file mode 100644 index 98ad5e3df3..0000000000 --- a/runescape-client/src/main/java/class264.java +++ /dev/null @@ -1,18 +0,0 @@ -import net.runelite.mapping.Export; -import net.runelite.mapping.ObfuscatedName; - -@ObfuscatedName("js") -public class class264 { - @ObfuscatedName("gr") - @Export("regionMapArchiveIds") - static int[] regionMapArchiveIds; - - @ObfuscatedName("ko") - static final void method4796(double var0) { - Rasterizer3D.Rasterizer3D_setBrightness(var0); // L: 11178 - ((TextureProvider)Rasterizer3D.Rasterizer3D_textureLoader).setBrightness(var0); // L: 11179 - class2.method26(); // L: 11180 - class12.clientPreferences.field1303 = var0; // L: 11181 - KeyHandler.savePreferences(); // L: 11182 - } // L: 11183 -} diff --git a/runescape-client/src/main/java/class265.java b/runescape-client/src/main/java/class265.java new file mode 100644 index 0000000000..3921082af1 --- /dev/null +++ b/runescape-client/src/main/java/class265.java @@ -0,0 +1,14 @@ +import net.runelite.mapping.ObfuscatedName; +import net.runelite.mapping.ObfuscatedSignature; + +@ObfuscatedName("jh") +public class class265 { + @ObfuscatedName("r") + @ObfuscatedSignature( + descriptor = "(B)V", + garbageValue = "54" + ) + public static void method4848() { + FloorUnderlayDefinition.FloorUnderlayDefinition_cached.clear(); // L: 86 + } // L: 87 +} diff --git a/runescape-client/src/main/java/class266.java b/runescape-client/src/main/java/class266.java index 4aeababaf5..8a075015b2 100644 --- a/runescape-client/src/main/java/class266.java +++ b/runescape-client/src/main/java/class266.java @@ -1,29 +1,120 @@ -import java.lang.management.GarbageCollectorMXBean; +import java.io.BufferedReader; +import java.io.DataInputStream; +import java.io.PrintWriter; +import java.io.StringReader; +import java.io.StringWriter; +import java.net.URL; import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedName; +import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("jf") +@ObfuscatedName("jq") public class class266 { - @ObfuscatedName("aq") - @Export("garbageCollector") - static GarbageCollectorMXBean garbageCollector; - static { int var0 = 0; // L: 9 int var1 = 0; // L: 10 - class261[] var2 = new class261[]{class261.field3203, class261.field3206}; // L: 14 - class261[] var3 = var2; // L: 16 + class261[] var2 = WorldMapData_1.method3525(); // L: 12 - for (int var4 = 0; var4 < var3.length; ++var4) { // L: 17 - class261 var5 = var3[var4]; // L: 18 - if (var5.field3205 > var0) { // L: 20 - var0 = var5.field3205; + for (int var3 = 0; var3 < var2.length; ++var3) { // L: 13 + class261 var4 = var2[var3]; // L: 14 + if (var4.field3199 > var0) { + var0 = var4.field3199; // L: 16 } - if (var5.field3204 > var1) { // L: 21 - var1 = var5.field3204; + if (var4.field3202 > var1) { // L: 17 + var1 = var4.field3202; } } - } // L: 25 + } // L: 21 + + @ObfuscatedName("v") + @ObfuscatedSignature( + descriptor = "(Ljava/lang/String;Ljava/lang/Throwable;I)V", + garbageValue = "2070444539" + ) + @Export("RunException_sendStackTrace") + public static void RunException_sendStackTrace(String var0, Throwable var1) { + if (var1 != null) { + var1.printStackTrace(); + } else { + try { + String var2 = ""; // L: 33 + if (var1 != null) { // L: 34 + Throwable var4 = var1; // L: 36 + String var5; + if (var1 instanceof RunException) { // L: 39 + RunException var6 = (RunException)var1; // L: 40 + var5 = var6.message + " | "; // L: 41 + var4 = var6.throwable; // L: 42 + } else { + var5 = ""; // L: 44 + } + + StringWriter var18 = new StringWriter(); // L: 45 + PrintWriter var7 = new PrintWriter(var18); // L: 46 + var4.printStackTrace(var7); // L: 47 + var7.close(); // L: 48 + String var8 = var18.toString(); // L: 49 + BufferedReader var9 = new BufferedReader(new StringReader(var8)); // L: 50 + String var10 = var9.readLine(); // L: 51 + + label63: + while (true) { + while (true) { + String var11 = var9.readLine(); // L: 53 + if (var11 == null) { // L: 54 + var5 = var5 + "| " + var10; // L: 72 + var2 = var5; // L: 75 + break label63; + } + + int var12 = var11.indexOf(40); // L: 55 + int var13 = var11.indexOf(41, var12 + 1); // L: 56 + if (var12 >= 0 && var13 >= 0) { // L: 57 + String var14 = var11.substring(var12 + 1, var13); // L: 58 + int var15 = var14.indexOf(".java:"); // L: 59 + if (var15 >= 0) { // L: 60 + var14 = var14.substring(0, var15) + var14.substring(var15 + 5); // L: 61 + var5 = var5 + var14 + ' '; // L: 62 + continue; // L: 63 + } + + var11 = var11.substring(0, var12); // L: 65 + } + + var11 = var11.trim(); // L: 67 + var11 = var11.substring(var11.lastIndexOf(32) + 1); // L: 68 + var11 = var11.substring(var11.lastIndexOf(9) + 1); // L: 69 + var5 = var5 + var11 + ' '; // L: 70 + } + } + } + + if (var0 != null) { // L: 77 + if (var1 != null) { // L: 78 + var2 = var2 + " | "; + } + + var2 = var2 + var0; // L: 79 + } + + System.out.println("Error: " + var2); // L: 81 + var2 = var2.replace(':', '.'); // L: 82 + var2 = var2.replace('@', '_'); // L: 83 + var2 = var2.replace('&', '_'); // L: 84 + var2 = var2.replace('#', '_'); // L: 85 + if (RunException.RunException_applet == null) { // L: 86 + return; + } + + URL var3 = new URL(RunException.RunException_applet.getCodeBase(), "clienterror.ws?c=" + RunException.RunException_revision + "&u=" + RunException.localPlayerName + "&v1=" + TaskHandler.javaVendor + "&v2=" + TaskHandler.javaVersion + "&ct=" + RunException.clientType + "&e=" + var2); // L: 87 + DataInputStream var17 = new DataInputStream(var3.openStream()); // L: 88 + var17.read(); // L: 89 + var17.close(); // L: 90 + } catch (Exception var16) { // L: 92 + } + + } + } // L: 93 } diff --git a/runescape-client/src/main/java/class268.java b/runescape-client/src/main/java/class268.java index 2ff45aa3d6..3a9ad7fc34 100644 --- a/runescape-client/src/main/java/class268.java +++ b/runescape-client/src/main/java/class268.java @@ -3,52 +3,82 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("jd") +@ObfuscatedName("jn") public enum class268 implements Enumerated { - @ObfuscatedName("h") + @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "Ljd;" + descriptor = "Ljn;" ) - field3550(-1), - @ObfuscatedName("c") + field3537(-1), + @ObfuscatedName("n") @ObfuscatedSignature( - descriptor = "Ljd;" + descriptor = "Ljn;" ) - field3544(0), - @ObfuscatedName("o") + field3540(0), + @ObfuscatedName("f") @ObfuscatedSignature( - descriptor = "Ljd;" + descriptor = "Ljn;" ) - field3545(1), - @ObfuscatedName("g") + field3538(1), + @ObfuscatedName("y") @ObfuscatedSignature( - descriptor = "Ljd;" + descriptor = "Ljn;" ) - field3543(2); + field3539(2); - @ObfuscatedName("k") - @ObfuscatedSignature( - descriptor = "Lbu;" - ) - @Export("soundCache") - static SoundCache soundCache; - @ObfuscatedName("l") + @ObfuscatedName("p") @ObfuscatedGetter( - intValue = 163548653 + intValue = -1451177967 ) - final int field3547; + final int field3536; class268(int var3) { - this.field3547 = var3; // L: 15 - } // L: 16 + this.field3536 = var3; // L: 19 + } // L: 20 - @ObfuscatedName("h") + @ObfuscatedName("v") @ObfuscatedSignature( descriptor = "(I)I", - garbageValue = "-708237537" + garbageValue = "-907662946" ) @Export("rsOrdinal") public int rsOrdinal() { - return this.field3547; // L: 19 + return this.field3536; // L: 23 } + + @ObfuscatedName("y") + @ObfuscatedSignature( + descriptor = "(IIILeg;IB)V", + garbageValue = "2" + ) + static void method4851(int var0, int var1, int var2, ObjectComposition var3, int var4) { + ObjectSound var5 = new ObjectSound(); // L: 73 + var5.plane = var0; // L: 74 + var5.x = var1 * 128; // L: 75 + var5.y = var2 * 128; // L: 76 + int var6 = var3.sizeX; // L: 77 + int var7 = var3.sizeY; // L: 78 + if (var4 == 1 || var4 == 3) { // L: 79 + var6 = var3.sizeY; // L: 80 + var7 = var3.sizeX; // L: 81 + } + + var5.field956 = (var6 + var1) * 128; // L: 83 + var5.field957 = (var7 + var2) * 128; // L: 84 + var5.soundEffectId = var3.ambientSoundId; // L: 85 + var5.field958 = var3.int4 * 128; // L: 86 + var5.field961 = var3.int5; // L: 87 + var5.field964 = var3.int6; // L: 88 + var5.soundEffectIds = var3.soundEffectIds; // L: 89 + if (var3.transforms != null) { // L: 90 + var5.obj = var3; // L: 91 + var5.set(); // L: 92 + } + + ObjectSound.objectSounds.addFirst(var5); // L: 94 + if (var5.soundEffectIds != null) { // L: 95 + var5.field954 = var5.field961 + (int)(Math.random() * (double)(var5.field964 - var5.field961)); + } + + } // L: 96 } diff --git a/runescape-client/src/main/java/class27.java b/runescape-client/src/main/java/class27.java index 3da17c3bab..4ad068e6e7 100644 --- a/runescape-client/src/main/java/class27.java +++ b/runescape-client/src/main/java/class27.java @@ -1,89 +1,176 @@ -import java.io.DataInputStream; -import java.net.URL; import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ae") +@ObfuscatedName("ap") public class class27 extends class14 { - @ObfuscatedName("h") - @ObfuscatedGetter( - intValue = -569986119 + @ObfuscatedName("da") + @ObfuscatedSignature( + descriptor = "Ljp;" ) - int field225; + @Export("archive1") + static Archive archive1; + @ObfuscatedName("eh") + @ObfuscatedGetter( + intValue = 2057684511 + ) + static int field231; + @ObfuscatedName("v") + @ObfuscatedGetter( + intValue = 718732187 + ) + int field227; // $FF: synthetic field @ObfuscatedSignature( - descriptor = "Lo;" + descriptor = "Lf;" ) final class2 this$0; @ObfuscatedSignature( - descriptor = "(Lo;)V" + descriptor = "(Lf;)V" ) class27(class2 var1) { this.this$0 = var1; - this.field225 = -1; // L: 144 + this.field227 = -1; // L: 144 } // L: 146 - @ObfuscatedName("h") + @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "(Lnk;I)V", - garbageValue = "110401227" + descriptor = "(Lnd;I)V", + garbageValue = "-1281352827" ) - void vmethod339(Buffer var1) { - this.field225 = var1.readUnsignedShort(); // L: 149 + void vmethod276(Buffer var1) { + this.field227 = var1.readUnsignedShort(); // L: 149 } // L: 150 - @ObfuscatedName("c") + @ObfuscatedName("n") @ObfuscatedSignature( - descriptor = "(Lx;I)V", - garbageValue = "-1535989118" + descriptor = "(Ll;B)V", + garbageValue = "29" ) - void vmethod338(class11 var1) { - var1.method123(this.field225); // L: 153 + void vmethod281(ClanSettings var1) { + var1.method109(this.field227); // L: 153 } // L: 154 - @ObfuscatedName("h") + @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "(Ljava/lang/String;Ljava/lang/Throwable;I)V", - garbageValue = "-1858770079" + descriptor = "(Ljv;I)V", + garbageValue = "-1597980436" ) - @Export("RunException_sendStackTrace") - public static void RunException_sendStackTrace(String var0, Throwable var1) { - if (var1 != null) { - var1.printStackTrace(); - } else { - try { - String var2 = ""; // L: 33 - if (var1 != null) { // L: 34 - var2 = WorldMapCacheName.method3646(var1); - } + public static void method277(AbstractArchive var0) { + FloorUnderlayDefinition.FloorUnderlayDefinition_archive = var0; // L: 21 + } // L: 22 - if (var0 != null) { // L: 35 - if (var1 != null) { // L: 36 - var2 = var2 + " | "; + @ObfuscatedName("at") + @ObfuscatedSignature( + descriptor = "(ILcf;ZI)I", + garbageValue = "1927970682" + ) + static int method280(int var0, Script var1, boolean var2) { + if (var0 != 6700 && var0 != 6702 && var0 != 6704 && var0 != 6706 && var0 != 6708) { // L: 4158 + if (var0 != 6701 && var0 != 6703 && var0 != 6705 && var0 != 6707 && var0 != 6709) { // L: 4163 + if (var0 == 6750) { // L: 4167 + ++Interpreter.Interpreter_stringStackSize; // L: 4168 + return 1; // L: 4169 + } else if (var0 != 6751 && var0 != 6752 && var0 != 6753) { // L: 4171 + if (var0 == 6754) { // L: 4175 + int var3 = Interpreter.Interpreter_intStack[--class44.Interpreter_intStackSize]; // L: 4176 + NPCComposition var4 = StructComposition.getNpcDefinition(var3); // L: 4177 + Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var4 != null ? var4.name : ""; // L: 4178 + return 1; // L: 4179 + } else { + return 2; // L: 4181 } - - var2 = var2 + var0; // L: 37 + } else { + ++class44.Interpreter_intStackSize; // L: 4172 + return 1; // L: 4173 } - - System.out.println("Error: " + var2); // L: 39 - var2 = var2.replace(':', '.'); // L: 40 - var2 = var2.replace('@', '_'); // L: 41 - var2 = var2.replace('&', '_'); // L: 42 - var2 = var2.replace('#', '_'); // L: 43 - if (RunException.RunException_applet == null) { // L: 44 - return; - } - - URL var3 = new URL(RunException.RunException_applet.getCodeBase(), "clienterror.ws?c=" + TileItem.RunException_revision + "&u=" + RunException.localPlayerName + "&v1=" + TaskHandler.javaVendor + "&v2=" + TaskHandler.javaVersion + "&ct=" + RunException.clientType + "&e=" + var2); // L: 45 - DataInputStream var4 = new DataInputStream(var3.openStream()); // L: 46 - var4.read(); // L: 47 - var4.close(); // L: 48 - } catch (Exception var5) { // L: 50 + } else { + --class44.Interpreter_intStackSize; // L: 4164 + return 1; // L: 4165 } - + } else { + class44.Interpreter_intStackSize -= 2; // L: 4159 + --Interpreter.Interpreter_stringStackSize; // L: 4160 + return 1; // L: 4161 } - } // L: 51 + } + + @ObfuscatedName("fm") + @ObfuscatedSignature( + descriptor = "(IB)V", + garbageValue = "-43" + ) + @Export("playSong") + static void playSong(int var0) { + if (var0 == -1 && !Client.field881) { // L: 3387 + class124.midiPcmStream.clear(); // L: 3389 + class232.musicPlayerStatus = 1; // L: 3390 + ModelData0.musicTrackArchive = null; // L: 3391 + } else if (var0 != -1 && var0 != Client.currentTrackGroupId && ObjectComposition.clientPreferences.musicVolume != 0 && !Client.field881) { // L: 3394 + Canvas.method395(2, UrlRequest.archive6, var0, 0, ObjectComposition.clientPreferences.musicVolume, false); // L: 3395 + } + + Client.currentTrackGroupId = var0; // L: 3397 + } // L: 3398 + + @ObfuscatedName("ga") + @ObfuscatedSignature( + descriptor = "(IIIII)V", + garbageValue = "-630332055" + ) + static final void method283(int var0, int var1, int var2, int var3) { + Client.field755 = 0; // L: 4987 + int var4 = (class93.localPlayer.x >> 7) + VertexNormal.baseX; // L: 4988 + int var5 = (class93.localPlayer.y >> 7) + SoundSystem.baseY; // L: 4989 + if (var4 >= 3053 && var4 <= 3156 && var5 >= 3056 && var5 <= 3136) { // L: 4990 + Client.field755 = 1; + } + + if (var4 >= 3072 && var4 <= 3118 && var5 >= 9492 && var5 <= 9535) { // L: 4991 + Client.field755 = 1; + } + + if (Client.field755 == 1 && var4 >= 3139 && var4 <= 3199 && var5 >= 3008 && var5 <= 3062) { // L: 4992 + Client.field755 = 0; + } + + } // L: 4994 + + @ObfuscatedName("jk") + @ObfuscatedSignature( + descriptor = "([Lio;IIIZI)V", + garbageValue = "2021358420" + ) + @Export("resizeInterface") + static void resizeInterface(Widget[] var0, int var1, int var2, int var3, boolean var4) { + for (int var5 = 0; var5 < var0.length; ++var5) { // L: 9771 + Widget var6 = var0[var5]; // L: 9772 + if (var6 != null && var6.parentId == var1) { // L: 9773 9774 + Clock.alignWidgetSize(var6, var2, var3, var4); // L: 9775 + class24.alignWidgetPosition(var6, var2, var3); // L: 9776 + if (var6.scrollX > var6.scrollWidth - var6.width) { // L: 9777 + var6.scrollX = var6.scrollWidth - var6.width; + } + + if (var6.scrollX < 0) { // L: 9778 + var6.scrollX = 0; + } + + if (var6.scrollY > var6.scrollHeight - var6.height) { // L: 9779 + var6.scrollY = var6.scrollHeight - var6.height; + } + + if (var6.scrollY < 0) { // L: 9780 + var6.scrollY = 0; + } + + if (var6.type == 0) { // L: 9781 + class313.revalidateWidgetScroll(var0, var6, var4); + } + } + } + + } // L: 9783 } diff --git a/runescape-client/src/main/java/class28.java b/runescape-client/src/main/java/class28.java index e318d9b47c..ad898e7707 100644 --- a/runescape-client/src/main/java/class28.java +++ b/runescape-client/src/main/java/class28.java @@ -1,31 +1,31 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ao") +@ObfuscatedName("ab") public class class28 implements class31 { class28() { } // L: 8 - @ObfuscatedName("h") + @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "(Lnk;)Lnk;" + descriptor = "(Lnd;)Lnd;" ) - public Buffer vmethod358(Buffer var1) { + public Buffer vmethod297(Buffer var1) { Buffer var2 = new Buffer(100); // L: 11 - this.method350(var1, var2); // L: 12 + this.method285(var1, var2); // L: 12 return var2; // L: 13 } - @ObfuscatedName("c") + @ObfuscatedName("n") @ObfuscatedSignature( - descriptor = "(Lnk;Lnk;)V" + descriptor = "(Lnd;Lnd;)V" ) - void method350(Buffer var1, Buffer var2) { + void method285(Buffer var1, Buffer var2) { class36 var3 = new class36(var1); // L: 17 class33 var4 = new class33(var3); // L: 18 long var5; - for (var5 = 0L; !var4.method370(var3.method417(), var3.method411(), var5); ++var5) { // L: 19 20 21 + for (var5 = 0L; !var4.method307(var3.method346(), var3.method345(), var5); ++var5) { // L: 19 20 21 } var2.writeLong(var5); // L: 23 diff --git a/runescape-client/src/main/java/class280.java b/runescape-client/src/main/java/class280.java index c04dce1601..ba4ef43a8e 100644 --- a/runescape-client/src/main/java/class280.java +++ b/runescape-client/src/main/java/class280.java @@ -1,65 +1,28 @@ -import net.runelite.mapping.Export; -import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("je") +@ObfuscatedName("jb") public class class280 { - @ObfuscatedName("i") - @Export("Tiles_saturation") - static int[] Tiles_saturation; - @ObfuscatedName("il") - @ObfuscatedGetter( - intValue = -2114671873 - ) - @Export("oculusOrbFocalPointY") - static int oculusOrbFocalPointY; - - @ObfuscatedName("hh") + @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "(IIIIIIIIIB)V", - garbageValue = "-6" + descriptor = "(Ljv;I)V", + garbageValue = "236508743" ) - @Export("updatePendingSpawn") - static final void updatePendingSpawn(int var0, int var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8) { - PendingSpawn var9 = null; // L: 7279 + public static void method5070(AbstractArchive var0) { + VarpDefinition.VarpDefinition_archive = var0; // L: 18 + VarpDefinition.VarpDefinition_fileCount = VarpDefinition.VarpDefinition_archive.getGroupFileCount(16); // L: 19 + } // L: 20 - for (PendingSpawn var10 = (PendingSpawn)Client.pendingSpawns.last(); var10 != null; var10 = (PendingSpawn)Client.pendingSpawns.previous()) { // L: 7280 7281 7286 - if (var0 == var10.plane && var10.x == var1 && var2 == var10.y && var3 == var10.type) { // L: 7282 - var9 = var10; // L: 7283 - break; - } - } - - if (var9 == null) { // L: 7288 - var9 = new PendingSpawn(); // L: 7289 - var9.plane = var0; // L: 7290 - var9.type = var3; // L: 7291 - var9.x = var1; // L: 7292 - var9.y = var2; // L: 7293 - WorldMapData_0.method3145(var9); // L: 7294 - Client.pendingSpawns.addFirst(var9); // L: 7295 - } - - var9.id = var4; // L: 7297 - var9.field1196 = var5; // L: 7298 - var9.orientation = var6; // L: 7299 - var9.delay = var7; // L: 7300 - var9.hitpoints = var8; // L: 7301 - } // L: 7302 - - @ObfuscatedName("lv") + @ObfuscatedName("y") @ObfuscatedSignature( - descriptor = "(Ljava/lang/String;I)V", - garbageValue = "64684553" + descriptor = "(IIS)V", + garbageValue = "925" ) - @Export("clanKickUser") - static final void clanKickUser(String var0) { - if (class25.clanChat != null) { // L: 11527 - PacketBufferNode var1 = HealthBarDefinition.getPacketBufferNode(ClientPacket.field2621, Client.packetWriter.isaacCipher); // L: 11528 - var1.packetBuffer.writeByte(class4.stringCp1252NullTerminatedByteSize(var0)); // L: 11529 - var1.packetBuffer.writeStringCp1252NullTerminated(var0); // L: 11530 - Client.packetWriter.addNode(var1); // L: 11531 + static void method5071(int var0, int var1) { + long var2 = (long)((var0 << 16) + var1); // L: 107 + NetFileRequest var4 = (NetFileRequest)NetCache.NetCache_pendingWrites.get(var2); // L: 108 + if (var4 != null) { // L: 109 + NetCache.NetCache_pendingWritesQueue.addLast(var4); // L: 110 } - } // L: 11532 + } // L: 111 } diff --git a/runescape-client/src/main/java/class285.java b/runescape-client/src/main/java/class285.java index cd087742d7..fb2834ad9e 100644 --- a/runescape-client/src/main/java/class285.java +++ b/runescape-client/src/main/java/class285.java @@ -4,205 +4,208 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("jn") +@ObfuscatedName("je") public class class285 { - @ObfuscatedName("b") - static int[] field3675; - @ObfuscatedName("ba") - @ObfuscatedSignature( - descriptor = "Lof;" - ) - @Export("worldSelectLeftSprite") - static IndexedSprite worldSelectLeftSprite; - @ObfuscatedName("h") + @ObfuscatedName("v") @Export("spriteMap") final HashMap spriteMap; - @ObfuscatedName("c") + @ObfuscatedName("n") @ObfuscatedSignature( - descriptor = "Lle;" + descriptor = "Lli;" ) @Export("bounds") Bounds bounds; - @ObfuscatedName("o") - int[] field3676; - @ObfuscatedName("g") - int[] field3677; - @ObfuscatedName("l") + @ObfuscatedName("f") + int[] field3664; + @ObfuscatedName("y") + int[] field3665; + @ObfuscatedName("p") @ObfuscatedGetter( - intValue = -2117277323 + intValue = 686309897 ) - int field3678; + int field3666; public class285() { this.spriteMap = new HashMap(); // L: 10 this.bounds = new Bounds(0, 0); // L: 11 - this.field3676 = new int[2048]; // L: 12 - this.field3677 = new int[2048]; // L: 13 - this.field3678 = 0; // L: 14 - ClientPacket.method4299(); // L: 21 - } // L: 22 + this.field3664 = new int[2048]; // L: 12 + this.field3665 = new int[2048]; // L: 13 + this.field3666 = 0; // L: 14 + WorldMapID.field2112 = new int[2000]; // L: 22 + int var1 = 0; // L: 23 + int var2 = 240; // L: 24 - @ObfuscatedName("c") + int var4; + for (byte var3 = 12; var1 < 16; var2 -= var3) { // L: 25 + var4 = WorldMapRegion.method3437((double)((float)var2 / 360.0F), 0.9998999834060669D, (double)(0.075F + (float)var1 * 0.425F / 16.0F)); // L: 27 + WorldMapID.field2112[var1] = var4; // L: 28 + ++var1; // L: 26 + } + + var2 = 48; // L: 30 + + for (int var6 = var2 / 6; var1 < WorldMapID.field2112.length; var2 -= var6) { // L: 31 32 38 + var4 = var1 * 2; // L: 33 + + for (int var5 = WorldMapRegion.method3437((double)((float)var2 / 360.0F), 0.9998999834060669D, 0.5D); var1 < var4 && var1 < WorldMapID.field2112.length; ++var1) { // L: 34 35 + WorldMapID.field2112[var1] = var5; // L: 36 + } + } + + } // L: 41 + + @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "(IB)V", - garbageValue = "-70" + descriptor = "(II)V", + garbageValue = "-969189545" ) - void method5035(int var1) { - int var2 = var1 * 2 + 1; // L: 46 - double var4 = (double)((float)var1 / 3.0F); // L: 48 - int var6 = var1 * 2 + 1; // L: 50 - double[] var7 = new double[var6]; // L: 51 + void method5113(int var1) { + int var2 = var1 * 2 + 1; // L: 44 + double var4 = (double)((float)var1 / 3.0F); // L: 46 + int var6 = var1 * 2 + 1; // L: 48 + double[] var7 = new double[var6]; // L: 49 int var8 = -var1; for (int var9 = 0; var8 <= var1; ++var9) { - var7[var9] = PacketWriter.method2400((double)var8, 0.0D, var4); // L: 53 - ++var8; // L: 52 + var7[var9] = class13.method182((double)var8, 0.0D, var4); // L: 51 + ++var8; // L: 50 } - double[] var14 = var7; // L: 57 - double var15 = var7[var1] * var7[var1]; // L: 58 - int[] var17 = new int[var2 * var2]; // L: 59 - boolean var10 = false; // L: 60 + double[] var14 = var7; // L: 55 + double var15 = var7[var1] * var7[var1]; // L: 56 + int[] var17 = new int[var2 * var2]; // L: 57 + boolean var10 = false; // L: 58 - for (int var11 = 0; var11 < var2; ++var11) { // L: 61 - for (int var12 = 0; var12 < var2; ++var12) { // L: 62 - int var13 = var17[var12 + var11 * var2] = (int)(256.0D * (var14[var12] * var14[var11] / var15)); // L: 63 - if (!var10 && var13 > 0) { // L: 64 - var10 = true; // L: 65 + for (int var11 = 0; var11 < var2; ++var11) { // L: 59 + for (int var12 = 0; var12 < var2; ++var12) { // L: 60 + int var13 = var17[var12 + var11 * var2] = (int)(var14[var12] * var14[var11] / var15 * 256.0D); // L: 61 + if (!var10 && var13 > 0) { // L: 62 + var10 = true; // L: 63 } } } - SpritePixels var18 = new SpritePixels(var17, var2, var2); // L: 69 - this.spriteMap.put(var1, var18); // L: 70 - } // L: 71 + SpritePixels var18 = new SpritePixels(var17, var2, var2); // L: 67 + this.spriteMap.put(var1, var18); // L: 68 + } // L: 69 - @ObfuscatedName("o") + @ObfuscatedName("n") @ObfuscatedSignature( - descriptor = "(II)Low;", - garbageValue = "1393112133" + descriptor = "(II)Loh;", + garbageValue = "-158733567" ) - SpritePixels method5051(int var1) { - if (!this.spriteMap.containsKey(var1)) { // L: 74 - this.method5035(var1); // L: 75 + SpritePixels method5115(int var1) { + if (!this.spriteMap.containsKey(var1)) { // L: 72 + this.method5113(var1); // L: 73 } - return (SpritePixels)this.spriteMap.get(var1); // L: 77 + return (SpritePixels)this.spriteMap.get(var1); // L: 75 } - @ObfuscatedName("g") + @ObfuscatedName("f") @ObfuscatedSignature( - descriptor = "(III)V", - garbageValue = "152070039" + descriptor = "(IIB)V", + garbageValue = "14" ) - public final void method5037(int var1, int var2) { - if (this.field3678 < this.field3676.length) { // L: 81 - this.field3676[this.field3678] = var1; // L: 82 - this.field3677[this.field3678] = var2; // L: 83 - ++this.field3678; // L: 84 + public final void method5117(int var1, int var2) { + if (this.field3666 < this.field3664.length) { // L: 79 + this.field3664[this.field3666] = var1; // L: 80 + this.field3665[this.field3666] = var2; // L: 81 + ++this.field3666; // L: 82 } - } // L: 85 + } // L: 83 - @ObfuscatedName("l") + @ObfuscatedName("y") @ObfuscatedSignature( - descriptor = "(B)V", - garbageValue = "-34" + descriptor = "(I)V", + garbageValue = "-2075850075" ) - public final void method5048() { - this.field3678 = 0; // L: 88 - } // L: 89 + public final void method5126() { + this.field3666 = 0; // L: 86 + } // L: 87 - @ObfuscatedName("z") + @ObfuscatedName("p") @ObfuscatedSignature( - descriptor = "(IILow;FI)V", - garbageValue = "-2008023134" + descriptor = "(IILoh;FI)V", + garbageValue = "-7099286" ) - public final void method5039(int var1, int var2, SpritePixels var3, float var4) { - int var5 = (int)(18.0F * var4); // L: 92 - SpritePixels var6 = this.method5051(var5); // L: 93 - int var7 = var5 * 2 + 1; // L: 94 - Bounds var8 = new Bounds(0, 0, var3.subWidth, var3.subHeight); // L: 95 - Bounds var9 = new Bounds(0, 0); // L: 96 - this.bounds.setHigh(var7, var7); // L: 97 - System.nanoTime(); // L: 98 + public final void method5116(int var1, int var2, SpritePixels var3, float var4) { + int var5 = (int)(18.0F * var4); // L: 90 + SpritePixels var6 = this.method5115(var5); // L: 91 + int var7 = var5 * 2 + 1; // L: 92 + Bounds var8 = new Bounds(0, 0, var3.subWidth, var3.subHeight); // L: 93 + Bounds var9 = new Bounds(0, 0); // L: 94 + this.bounds.setHigh(var7, var7); // L: 95 + System.nanoTime(); // L: 96 int var10; int var11; int var12; - for (var10 = 0; var10 < this.field3678; ++var10) { // L: 99 - var11 = this.field3676[var10]; // L: 100 - var12 = this.field3677[var10]; // L: 101 - int var13 = (int)((float)(var11 - var1) * var4) - var5; // L: 102 - int var14 = (int)((float)var3.subHeight - (float)(var12 - var2) * var4) - var5; // L: 103 - this.bounds.setLow(var13, var14); // L: 104 - this.bounds.method5849(var8, var9); // L: 105 - this.method5040(var6, var3, var9); // L: 106 + for (var10 = 0; var10 < this.field3666; ++var10) { // L: 97 + var11 = this.field3664[var10]; // L: 98 + var12 = this.field3665[var10]; // L: 99 + int var13 = (int)((float)(var11 - var1) * var4) - var5; // L: 100 + int var14 = (int)((float)var3.subHeight - var4 * (float)(var12 - var2)) - var5; // L: 101 + this.bounds.setLow(var13, var14); // L: 102 + this.bounds.method5977(var8, var9); // L: 103 + this.method5118(var6, var3, var9); // L: 104 } - System.nanoTime(); // L: 108 - System.nanoTime(); // L: 109 + System.nanoTime(); // L: 106 + System.nanoTime(); // L: 107 - for (var10 = 0; var10 < var3.pixels.length; ++var10) { // L: 110 - if (var3.pixels[var10] == 0) { // L: 111 - var3.pixels[var10] = -16777216; // L: 112 + for (var10 = 0; var10 < var3.pixels.length; ++var10) { // L: 108 + if (var3.pixels[var10] == 0) { // L: 109 + var3.pixels[var10] = -16777216; // L: 110 } else { - var11 = (var3.pixels[var10] + 64 - 1) / 256; // L: 115 - if (var11 <= 0) { // L: 116 - var3.pixels[var10] = -16777216; // L: 117 + var11 = (var3.pixels[var10] + 64 - 1) / 256; // L: 113 + if (var11 <= 0) { // L: 114 + var3.pixels[var10] = -16777216; // L: 115 } else { - if (var11 > field3675.length) { // L: 120 - var11 = field3675.length; + if (var11 > WorldMapID.field2112.length) { // L: 118 + var11 = WorldMapID.field2112.length; } - var12 = field3675[var11 - 1]; // L: 121 - var3.pixels[var10] = -16777216 | var12; // L: 122 + var12 = WorldMapID.field2112[var11 - 1]; // L: 119 + var3.pixels[var10] = -16777216 | var12; // L: 120 } } } - System.nanoTime(); // L: 124 - } // L: 125 + System.nanoTime(); // L: 122 + } // L: 123 - @ObfuscatedName("t") + @ObfuscatedName("j") @ObfuscatedSignature( - descriptor = "(Low;Low;Lle;I)V", - garbageValue = "-159166525" + descriptor = "(Loh;Loh;Lli;I)V", + garbageValue = "1348286634" ) - void method5040(SpritePixels var1, SpritePixels var2, Bounds var3) { - if (var3.highX != 0 && var3.highY != 0) { // L: 128 - int var4 = 0; // L: 129 - int var5 = 0; // L: 130 - if (var3.lowX == 0) { // L: 131 + void method5118(SpritePixels var1, SpritePixels var2, Bounds var3) { + if (var3.highX != 0 && var3.highY != 0) { // L: 126 + int var4 = 0; // L: 127 + int var5 = 0; // L: 128 + if (var3.lowX == 0) { // L: 129 var4 = var1.subWidth - var3.highX; } - if (var3.lowY == 0) { // L: 132 + if (var3.lowY == 0) { // L: 130 var5 = var1.subHeight - var3.highY; } - int var6 = var4 + var5 * var1.subWidth; // L: 133 - int var7 = var2.subWidth * var3.lowY + var3.lowX; // L: 134 + int var6 = var4 + var5 * var1.subWidth; // L: 131 + int var7 = var2.subWidth * var3.lowY + var3.lowX; // L: 132 - for (int var8 = 0; var8 < var3.highY; ++var8) { // L: 135 - for (int var9 = 0; var9 < var3.highX; ++var9) { // L: 136 - int[] var10000 = var2.pixels; // L: 137 + for (int var8 = 0; var8 < var3.highY; ++var8) { // L: 133 + for (int var9 = 0; var9 < var3.highX; ++var9) { // L: 134 + int[] var10000 = var2.pixels; // L: 135 int var10001 = var7++; var10000[var10001] += var1.pixels[var6++]; } - var6 += var1.subWidth - var3.highX; // L: 139 - var7 += var2.subWidth - var3.highX; // L: 140 + var6 += var1.subWidth - var3.highX; // L: 137 + var7 += var2.subWidth - var3.highX; // L: 138 } } - } // L: 142 - - @ObfuscatedName("t") - @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "-1797269182" - ) - static void method5055() { - ItemContainer.itemContainers = new NodeHashTable(32); // L: 78 - } // L: 79 + } // L: 140 } diff --git a/runescape-client/src/main/java/class286.java b/runescape-client/src/main/java/class286.java index f478ac5684..44cb6bedd7 100644 --- a/runescape-client/src/main/java/class286.java +++ b/runescape-client/src/main/java/class286.java @@ -1,211 +1,30 @@ -import net.runelite.mapping.Export; -import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("kl") +@ObfuscatedName("ky") public class class286 { - @ObfuscatedName("h") + @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "Lkl;" + descriptor = "Lky;" ) - static final class286 field3684; - @ObfuscatedName("c") + static final class286 field3671; + @ObfuscatedName("n") @ObfuscatedSignature( - descriptor = "Lkl;" + descriptor = "Lky;" ) - static final class286 field3687; - @ObfuscatedName("o") + static final class286 field3668; + @ObfuscatedName("f") @ObfuscatedSignature( - descriptor = "Lkl;" + descriptor = "Lky;" ) - static final class286 field3686; - @ObfuscatedName("p") - @ObfuscatedGetter( - intValue = 1228453663 - ) - @Export("graphicsTickTimeIdx") - static int graphicsTickTimeIdx; + static final class286 field3667; static { - field3684 = new class286(); // L: 4 - field3687 = new class286(); // L: 5 - field3686 = new class286(); // L: 6 + field3671 = new class286(); // L: 4 + field3668 = new class286(); // L: 5 + field3667 = new class286(); // L: 6 } class286() { } // L: 8 - - @ObfuscatedName("ae") - @ObfuscatedSignature( - descriptor = "(ILci;ZB)I", - garbageValue = "4" - ) - static int method5056(int var0, Script var1, boolean var2) { - if (var0 == 3800) { // L: 2422 - if (class105.field1328 != null) { // L: 2423 - Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = 1; // L: 2424 - ArchiveDiskActionHandler.field3575 = class105.field1328; // L: 2425 - } else { - Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = 0; // L: 2427 - } - - return 1; // L: 2428 - } else { - int var3; - if (var0 == 3801) { // L: 2430 - var3 = Interpreter.Interpreter_intStack[--WorldMapCacheName.Interpreter_intStackSize]; // L: 2431 - if (Client.field678[var3] != null) { // L: 2432 - Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = 1; // L: 2433 - ArchiveDiskActionHandler.field3575 = Client.field678[var3]; // L: 2434 - } else { - Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = 0; // L: 2436 - } - - return 1; // L: 2437 - } else if (var0 == 3802) { // L: 2439 - Interpreter.Interpreter_stringStack[++class13.Interpreter_stringStackSize - 1] = ArchiveDiskActionHandler.field3575.field91; // L: 2440 - return 1; // L: 2441 - } else if (var0 == 3803) { // L: 2443 - Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = ArchiveDiskActionHandler.field3575.field93 ? 1 : 0; // L: 2444 - return 1; // L: 2445 - } else if (var0 == 3804) { // L: 2447 - Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = ArchiveDiskActionHandler.field3575.field111; // L: 2448 - return 1; // L: 2449 - } else if (var0 == 3805) { // L: 2451 - Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = ArchiveDiskActionHandler.field3575.field95; // L: 2452 - return 1; // L: 2453 - } else if (var0 == 3806) { // L: 2455 - Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = ArchiveDiskActionHandler.field3575.field96; // L: 2456 - return 1; // L: 2457 - } else if (var0 == 3807) { // L: 2459 - Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = ArchiveDiskActionHandler.field3575.field113; // L: 2460 - return 1; // L: 2461 - } else if (var0 == 3809) { // L: 2463 - Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = ArchiveDiskActionHandler.field3575.field98; // L: 2464 - return 1; // L: 2465 - } else if (var0 == 3810) { // L: 2467 - var3 = Interpreter.Interpreter_intStack[--WorldMapCacheName.Interpreter_intStackSize]; // L: 2468 - Interpreter.Interpreter_stringStack[++class13.Interpreter_stringStackSize - 1] = ArchiveDiskActionHandler.field3575.field109[var3]; // L: 2469 - return 1; // L: 2470 - } else if (var0 == 3811) { // L: 2472 - var3 = Interpreter.Interpreter_intStack[--WorldMapCacheName.Interpreter_intStackSize]; // L: 2473 - Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = ArchiveDiskActionHandler.field3575.field100[var3]; // L: 2474 - return 1; // L: 2475 - } else if (var0 == 3812) { // L: 2477 - Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = ArchiveDiskActionHandler.field3575.field107; // L: 2478 - return 1; // L: 2479 - } else if (var0 == 3813) { // L: 2481 - var3 = Interpreter.Interpreter_intStack[--WorldMapCacheName.Interpreter_intStackSize]; // L: 2482 - Interpreter.Interpreter_stringStack[++class13.Interpreter_stringStackSize - 1] = ArchiveDiskActionHandler.field3575.field101[var3]; // L: 2483 - return 1; // L: 2484 - } else { - int var5; - int var6; - if (var0 == 3814) { // L: 2486 - WorldMapCacheName.Interpreter_intStackSize -= 3; // L: 2487 - var3 = Interpreter.Interpreter_intStack[WorldMapCacheName.Interpreter_intStackSize]; // L: 2488 - var6 = Interpreter.Interpreter_intStack[WorldMapCacheName.Interpreter_intStackSize + 1]; // L: 2489 - var5 = Interpreter.Interpreter_intStack[WorldMapCacheName.Interpreter_intStackSize + 2]; // L: 2490 - Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = ArchiveDiskActionHandler.field3575.method114(var3, var6, var5); // L: 2491 - return 1; // L: 2492 - } else if (var0 == 3815) { // L: 2494 - Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = ArchiveDiskActionHandler.field3575.field105; // L: 2495 - return 1; // L: 2496 - } else if (var0 == 3816) { // L: 2498 - Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = ArchiveDiskActionHandler.field3575.field106; // L: 2499 - return 1; // L: 2500 - } else if (var0 == 3817) { // L: 2502 - Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = ArchiveDiskActionHandler.field3575.method113(Interpreter.Interpreter_stringStack[--class13.Interpreter_stringStackSize]); // L: 2503 - return 1; // L: 2504 - } else if (var0 == 3818) { // L: 2506 - Interpreter.Interpreter_intStack[WorldMapCacheName.Interpreter_intStackSize - 1] = ArchiveDiskActionHandler.field3575.method167()[Interpreter.Interpreter_intStack[WorldMapCacheName.Interpreter_intStackSize - 1]]; // L: 2507 - return 1; // L: 2508 - } else if (var0 == 3819) { // L: 2510 - WorldMapCacheName.Interpreter_intStackSize -= 2; // L: 2511 - var3 = Interpreter.Interpreter_intStack[WorldMapCacheName.Interpreter_intStackSize]; // L: 2512 - var6 = Interpreter.Interpreter_intStack[WorldMapCacheName.Interpreter_intStackSize + 1]; // L: 2513 - class310.method5485(var6, var3); // L: 2514 - return 1; // L: 2515 - } else if (var0 == 3820) { // L: 2517 - var3 = Interpreter.Interpreter_intStack[--WorldMapCacheName.Interpreter_intStackSize]; // L: 2518 - Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = ArchiveDiskActionHandler.field3575.field94[var3]; // L: 2519 - return 1; // L: 2520 - } else { - if (var0 == 3821) { // L: 2522 - WorldMapCacheName.Interpreter_intStackSize -= 3; // L: 2523 - var3 = Interpreter.Interpreter_intStack[WorldMapCacheName.Interpreter_intStackSize]; // L: 2524 - boolean var4 = Interpreter.Interpreter_intStack[WorldMapCacheName.Interpreter_intStackSize + 1] == 1; // L: 2525 - var5 = Interpreter.Interpreter_intStack[WorldMapCacheName.Interpreter_intStackSize + 2]; // L: 2526 - SoundCache.method869(var5, var3, var4); // L: 2527 - } - - if (var0 == 3822) { // L: 2529 - var3 = Interpreter.Interpreter_intStack[--WorldMapCacheName.Interpreter_intStackSize]; // L: 2530 - Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = ArchiveDiskActionHandler.field3575.field104[var3] ? 1 : 0; // L: 2531 - return 1; // L: 2532 - } else if (var0 == 3850) { // L: 2534 - if (Players.field1358 != null) { // L: 2535 - Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = 1; // L: 2536 - Canvas.field292 = Players.field1358; // L: 2537 - } else { - Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = 0; // L: 2539 - } - - return 1; // L: 2540 - } else if (var0 == 3851) { // L: 2542 - var3 = Interpreter.Interpreter_intStack[--WorldMapCacheName.Interpreter_intStackSize]; // L: 2543 - if (Client.field847[var3] != null) { // L: 2544 - Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = 1; // L: 2545 - Canvas.field292 = Client.field847[var3]; // L: 2546 - ModelData0.field2510 = var3; // L: 2547 - } else { - Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = 0; // L: 2549 - } - - return 1; // L: 2550 - } else if (var0 == 3852) { // L: 2552 - Interpreter.Interpreter_stringStack[++class13.Interpreter_stringStackSize - 1] = Canvas.field292.field38; // L: 2553 - return 1; // L: 2554 - } else if (var0 == 3853) { // L: 2556 - Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = Canvas.field292.field37; // L: 2557 - return 1; // L: 2558 - } else if (var0 == 3854) { // L: 2560 - Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = Canvas.field292.field36; // L: 2561 - return 1; // L: 2562 - } else if (var0 == 3855) { // L: 2564 - Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = Canvas.field292.method39(); // L: 2565 - return 1; // L: 2566 - } else if (var0 == 3856) { // L: 2568 - var3 = Interpreter.Interpreter_intStack[--WorldMapCacheName.Interpreter_intStackSize]; // L: 2569 - Interpreter.Interpreter_stringStack[++class13.Interpreter_stringStackSize - 1] = ((class9)Canvas.field292.field32.get(var3)).field73; // L: 2570 - return 1; // L: 2571 - } else if (var0 == 3857) { // L: 2573 - var3 = Interpreter.Interpreter_intStack[--WorldMapCacheName.Interpreter_intStackSize]; // L: 2574 - Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = ((class9)Canvas.field292.field32.get(var3)).field76; // L: 2575 - return 1; // L: 2576 - } else if (var0 == 3858) { // L: 2578 - var3 = Interpreter.Interpreter_intStack[--WorldMapCacheName.Interpreter_intStackSize]; // L: 2579 - Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = ((class9)Canvas.field292.field32.get(var3)).field80; // L: 2580 - return 1; // L: 2581 - } else if (var0 == 3859) { // L: 2583 - var3 = Interpreter.Interpreter_intStack[--WorldMapCacheName.Interpreter_intStackSize]; // L: 2584 - FriendLoginUpdate.method5553(ModelData0.field2510, var3); // L: 2585 - return 1; // L: 2586 - } else if (var0 == 3860) { // L: 2588 - Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = Canvas.field292.method34(Interpreter.Interpreter_stringStack[--class13.Interpreter_stringStackSize]); // L: 2589 - return 1; // L: 2590 - } else if (var0 == 3861) { // L: 2592 - Interpreter.Interpreter_intStack[WorldMapCacheName.Interpreter_intStackSize - 1] = Canvas.field292.method31()[Interpreter.Interpreter_intStack[WorldMapCacheName.Interpreter_intStackSize - 1]]; // L: 2593 - return 1; // L: 2594 - } else if (var0 == 3890) { // L: 2596 - Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = ObjectSound.field935 != null ? 1 : 0; // L: 2597 - return 1; // L: 2598 - } else { - return 2; // L: 2600 - } - } - } - } - } } diff --git a/runescape-client/src/main/java/class288.java b/runescape-client/src/main/java/class288.java index 787dd302ce..e7bd6a9480 100644 --- a/runescape-client/src/main/java/class288.java +++ b/runescape-client/src/main/java/class288.java @@ -1,28 +1,16 @@ import java.util.HashMap; import net.runelite.mapping.Export; -import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("kj") +@ObfuscatedName("kh") public class class288 { - @ObfuscatedName("h") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "Ljp;" + descriptor = "Lkt;" ) - @Export("FloorOverlayDefinition_archive") - static AbstractArchive FloorOverlayDefinition_archive; - @ObfuscatedName("bn") - @ObfuscatedSignature( - descriptor = "Lof;" - ) - static IndexedSprite field3691; - @ObfuscatedName("nr") - @ObfuscatedGetter( - intValue = 1165287201 - ) - @Export("widgetDragDuration") - static int widgetDragDuration; + @Export("ItemDefinition_fontPlain11") + public static Font ItemDefinition_fontPlain11; static { new HashMap(); diff --git a/runescape-client/src/main/java/class29.java b/runescape-client/src/main/java/class29.java index 5a4a85d31c..6e68229d9c 100644 --- a/runescape-client/src/main/java/class29.java +++ b/runescape-client/src/main/java/class29.java @@ -1,108 +1,45 @@ import java.util.concurrent.Callable; import net.runelite.mapping.Export; +import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("aj") +@ObfuscatedName("al") public class class29 implements Callable { - @ObfuscatedName("sg") - @ObfuscatedSignature( - descriptor = "Ljw;" + @ObfuscatedName("d") + public static short[] field233; + @ObfuscatedName("lt") + @ObfuscatedGetter( + intValue = 1498703923 ) - @Export("grandExchangeEvents") - static GrandExchangeEvents grandExchangeEvents; - @ObfuscatedName("df") + @Export("menuWidth") + static int menuWidth; + @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "Lji;" + descriptor = "Lnd;" ) - @Export("archive6") - static Archive archive6; - @ObfuscatedName("h") + final Buffer field238; + @ObfuscatedName("n") @ObfuscatedSignature( - descriptor = "Lnk;" + descriptor = "Lai;" ) - final Buffer field228; - @ObfuscatedName("c") - @ObfuscatedSignature( - descriptor = "Lat;" - ) - final class31 field231; + final class31 field235; // $FF: synthetic field @ObfuscatedSignature( - descriptor = "Lam;" + descriptor = "Las;" ) final class35 this$0; @ObfuscatedSignature( - descriptor = "(Lam;Lnk;Lat;)V" + descriptor = "(Las;Lnd;Lai;)V" ) class29(class35 var1, Buffer var2, class31 var3) { this.this$0 = var1; // L: 47 - this.field228 = var2; // L: 48 - this.field231 = var3; // L: 49 + this.field238 = var2; // L: 48 + this.field235 = var3; // L: 49 } // L: 50 public Object call() { - return this.field231.vmethod358(this.field228); // L: 53 + return this.field235.vmethod297(this.field238); // L: 53 } - - @ObfuscatedName("o") - @ObfuscatedSignature( - descriptor = "(B)V", - garbageValue = "11" - ) - public static void method354() { - if (KeyHandler.KeyHandler_instance != null) { // L: 156 - synchronized(KeyHandler.KeyHandler_instance) { // L: 157 - KeyHandler.KeyHandler_instance = null; // L: 158 - } // L: 159 - } - - } // L: 161 - - @ObfuscatedName("o") - @ObfuscatedSignature( - descriptor = "([BIIIIIII[Lfa;I)V", - garbageValue = "1513429119" - ) - static final void method355(byte[] var0, int var1, int var2, int var3, int var4, int var5, int var6, int var7, CollisionMap[] var8) { - int var10; - for (int var9 = 0; var9 < 8; ++var9) { // L: 77 - for (var10 = 0; var10 < 8; ++var10) { // L: 78 - if (var9 + var2 > 0 && var9 + var2 < 103 && var3 + var10 > 0 && var3 + var10 < 103) { // L: 79 - int[] var10000 = var8[var1].flags[var9 + var2]; - var10000[var3 + var10] &= -16777217; - } - } - } - - Buffer var20 = new Buffer(var0); // L: 82 - - for (var10 = 0; var10 < 4; ++var10) { // L: 83 - for (int var11 = 0; var11 < 64; ++var11) { // L: 84 - for (int var12 = 0; var12 < 64; ++var12) { // L: 85 - if (var10 == var4 && var11 >= var5 && var11 < var5 + 8 && var12 >= var6 && var12 < var6 + 8) { // L: 86 - int var17 = var11 & 7; // L: 91 - int var18 = var12 & 7; // L: 92 - int var19 = var7 & 3; // L: 95 - int var16; - if (var19 == 0) { // L: 96 - var16 = var17; // L: 97 - } else if (var19 == 1) { // L: 100 - var16 = var18; // L: 101 - } else if (var19 == 2) { // L: 104 - var16 = 7 - var17; // L: 105 - } else { - var16 = 7 - var18; // L: 108 - } - - AbstractWorldMapData.loadTerrain(var20, var1, var2 + var16, var3 + ReflectionCheck.method1159(var11 & 7, var12 & 7, var7), 0, 0, var7); // L: 110 - } else { - AbstractWorldMapData.loadTerrain(var20, 0, -1, -1, 0, 0, 0); // L: 112 - } - } - } - } - - } // L: 116 } diff --git a/runescape-client/src/main/java/class3.java b/runescape-client/src/main/java/class3.java deleted file mode 100644 index ae955865a2..0000000000 --- a/runescape-client/src/main/java/class3.java +++ /dev/null @@ -1,288 +0,0 @@ -import java.util.ArrayList; -import java.util.BitSet; -import java.util.List; -import net.runelite.mapping.Export; -import net.runelite.mapping.ObfuscatedGetter; -import net.runelite.mapping.ObfuscatedName; -import net.runelite.mapping.ObfuscatedSignature; - -@ObfuscatedName("g") -public class class3 extends Node { - @ObfuscatedName("rz") - @ObfuscatedSignature( - descriptor = "Lbg;" - ) - @Export("decimator") - static Decimator decimator; - @ObfuscatedName("h") - boolean field33; - @ObfuscatedName("c") - boolean field30; - @ObfuscatedName("o") - public List field32; - @ObfuscatedName("g") - int[] field35; - @ObfuscatedName("l") - @ObfuscatedGetter( - longValue = 2216912450870732033L - ) - long field34; - @ObfuscatedName("z") - public String field38; - @ObfuscatedName("t") - public byte field36; - @ObfuscatedName("v") - public byte field37; - - static { - new BitSet(65536); // L: 21 - } // L: 22 - - @ObfuscatedSignature( - descriptor = "(Lnk;)V" - ) - public class3(Buffer var1) { - this.field30 = true; // L: 12 - this.field38 = null; // L: 16 - this.method35(var1); // L: 25 - } - - @ObfuscatedName("h") - @ObfuscatedSignature( - descriptor = "(I)[I", - garbageValue = "1568890582" - ) - public int[] method31() { - if (this.field35 == null) { // L: 29 - String[] var1 = new String[this.field32.size()]; // L: 30 - this.field35 = new int[this.field32.size()]; // L: 31 - - for (int var2 = 0; var2 < this.field32.size(); this.field35[var2] = var2++) { // L: 32 34 - var1[var2] = ((class9)this.field32.get(var2)).field73; // L: 33 - } - - int[] var3 = this.field35; // L: 36 - class124.method2500(var1, var3, 0, var1.length - 1); // L: 38 - } - - return this.field35; // L: 41 - } - - @ObfuscatedName("c") - @ObfuscatedSignature( - descriptor = "(Lq;I)V", - garbageValue = "390115947" - ) - void method29(class9 var1) { - this.field32.add(var1); // L: 45 - this.field35 = null; // L: 46 - } // L: 47 - - @ObfuscatedName("o") - @ObfuscatedSignature( - descriptor = "(II)V", - garbageValue = "-237070101" - ) - void method33(int var1) { - this.field32.remove(var1); // L: 50 - this.field35 = null; // L: 51 - } // L: 52 - - @ObfuscatedName("g") - @ObfuscatedSignature( - descriptor = "(B)I", - garbageValue = "29" - ) - public int method39() { - return this.field32.size(); // L: 55 - } - - @ObfuscatedName("l") - @ObfuscatedSignature( - descriptor = "(Ljava/lang/String;I)I", - garbageValue = "-1935800799" - ) - public int method34(String var1) { - if (!this.field30) { // L: 59 - throw new RuntimeException("Displaynames not available"); - } else { - for (int var2 = 0; var2 < this.field32.size(); ++var2) { // L: 60 - if (((class9)this.field32.get(var2)).field73.equalsIgnoreCase(var1)) { - return var2; // L: 61 - } - } - - return -1; // L: 63 - } - } - - @ObfuscatedName("z") - @ObfuscatedSignature( - descriptor = "(Lnk;B)V", - garbageValue = "-13" - ) - void method35(Buffer var1) { - int var2 = var1.readUnsignedByte(); // L: 67 - if ((var2 & 1) != 0) { // L: 68 - this.field33 = true; - } - - if ((var2 & 2) != 0) { // L: 69 - this.field30 = true; - } - - int var3 = 2; // L: 70 - if ((var2 & 4) != 0) { // L: 71 - var3 = var1.readUnsignedByte(); - } - - super.key = var1.readLong(); // L: 72 - this.field34 = var1.readLong(); // L: 73 - this.field38 = var1.readStringCp1252NullTerminated(); // L: 74 - var1.readBoolean(); // L: 75 - this.field37 = var1.readByte(); // L: 76 - this.field36 = var1.readByte(); // L: 77 - int var4 = var1.readUnsignedShort(); // L: 78 - if (var4 > 0) { // L: 79 - this.field32 = new ArrayList(var4); // L: 80 - - for (int var5 = 0; var5 < var4; ++var5) { // L: 81 - class9 var6 = new class9(); // L: 82 - if (this.field33) { // L: 83 - var1.readLong(); // L: 84 - } - - if (this.field30) { // L: 86 - var6.field73 = var1.readStringCp1252NullTerminated(); - } - - var6.field76 = var1.readByte(); // L: 87 - var6.field80 = var1.readUnsignedShort(); // L: 88 - if (var3 >= 3) { // L: 89 - var1.readBoolean(); // L: 90 - } - - this.field32.add(var5, var6); // L: 93 - } - } - - } // L: 96 - - @ObfuscatedName("h") - @ObfuscatedSignature( - descriptor = "(IIB)Z", - garbageValue = "-106" - ) - static boolean method47(int var0, int var1) { - return var0 != 4 || var1 < 8; // L: 26 - } - - @ObfuscatedName("hr") - @ObfuscatedSignature( - descriptor = "(ZLnm;B)V", - garbageValue = "6" - ) - @Export("updateNpcs") - static final void updateNpcs(boolean var0, PacketBuffer var1) { - Client.field737 = 0; // L: 7570 - Client.field661 = 0; // L: 7571 - UserComparator9.method2477(); // L: 7572 - - int var2; - while (var1.bitsRemaining(Client.packetWriter.serverPacketLength) >= 27) { // L: 7575 - var2 = var1.readBits(15); // L: 7576 - if (var2 == 32767) { // L: 7577 - break; - } - - boolean var3 = false; // L: 7578 - if (Client.npcs[var2] == null) { // L: 7579 - Client.npcs[var2] = new NPC(); // L: 7580 - var3 = true; // L: 7581 - } - - NPC var4 = Client.npcs[var2]; // L: 7583 - Client.npcIndices[++Client.npcCount - 1] = var2; // L: 7584 - var4.npcCycle = Client.cycle; // L: 7585 - var4.definition = class8.getNpcDefinition(var1.readBits(14)); // L: 7589 - int var7; - if (var0) { // L: 7590 - var7 = var1.readBits(8); // L: 7591 - if (var7 > 127) { // L: 7592 - var7 -= 256; - } - } else { - var7 = var1.readBits(5); // L: 7595 - if (var7 > 15) { // L: 7596 - var7 -= 32; - } - } - - int var6; - if (var0) { // L: 7598 - var6 = var1.readBits(8); // L: 7599 - if (var6 > 127) { // L: 7600 - var6 -= 256; - } - } else { - var6 = var1.readBits(5); // L: 7603 - if (var6 > 15) { // L: 7604 - var6 -= 32; - } - } - - int var8 = Client.defaultRotations[var1.readBits(3)]; // L: 7606 - if (var3) { // L: 7607 - var4.orientation = var4.rotation = var8; - } - - int var9 = var1.readBits(1); // L: 7608 - if (var9 == 1) { // L: 7609 - Client.field662[++Client.field661 - 1] = var2; - } - - boolean var10 = var1.readBits(1) == 1; // L: 7610 - if (var10) { // L: 7611 - var1.readBits(32); // L: 7612 - } - - int var5 = var1.readBits(1); // L: 7614 - var4.field1211 = var4.definition.size; // L: 7615 - var4.field1261 = var4.definition.rotation; // L: 7616 - if (var4.field1261 == 0) { // L: 7617 - var4.rotation = 0; - } - - var4.walkSequence = var4.definition.walkSequence; // L: 7618 - var4.walkBackSequence = var4.definition.walkBackSequence; // L: 7619 - var4.walkLeftSequence = var4.definition.walkLeftSequence; // L: 7620 - var4.walkRightSequence = var4.definition.walkRightSequence; // L: 7621 - var4.idleSequence = var4.definition.idleSequence; // L: 7622 - var4.turnLeftSequence = var4.definition.turnLeftSequence; // L: 7623 - var4.turnRightSequence = var4.definition.turnRightSequence; // L: 7624 - var4.method2267(class35.localPlayer.pathX[0] + var6, class35.localPlayer.pathY[0] + var7, var5 == 1); // L: 7625 - } - - var1.exportIndex(); // L: 7627 - SequenceDefinition.method3086(var1); // L: 7629 - - for (var2 = 0; var2 < Client.field737; ++var2) { // L: 7630 - int var11 = Client.field614[var2]; // L: 7631 - if (Client.npcs[var11].npcCycle != Client.cycle) { // L: 7632 - Client.npcs[var11].definition = null; // L: 7633 - Client.npcs[var11] = null; // L: 7634 - } - } - - if (var1.offset != Client.packetWriter.serverPacketLength) { // L: 7637 - throw new RuntimeException(var1.offset + "," + Client.packetWriter.serverPacketLength); - } else { - for (var2 = 0; var2 < Client.npcCount; ++var2) { // L: 7638 - if (Client.npcs[Client.npcIndices[var2]] == null) { // L: 7639 - throw new RuntimeException(var2 + "," + Client.npcCount); // L: 7640 - } - } - - } - } // L: 7643 -} diff --git a/runescape-client/src/main/java/class30.java b/runescape-client/src/main/java/class30.java index 329f59c1b6..8bb4a1687d 100644 --- a/runescape-client/src/main/java/class30.java +++ b/runescape-client/src/main/java/class30.java @@ -1,5 +1,5 @@ import net.runelite.mapping.ObfuscatedName; -@ObfuscatedName("aw") +@ObfuscatedName("ad") public interface class30 { } diff --git a/runescape-client/src/main/java/class301.java b/runescape-client/src/main/java/class301.java index 7c3f214a78..f296694641 100644 --- a/runescape-client/src/main/java/class301.java +++ b/runescape-client/src/main/java/class301.java @@ -1,23 +1,13 @@ import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedName; -import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("kh") +@ObfuscatedName("kz") public class class301 { - @ObfuscatedName("h") + @ObfuscatedName("v") @Export("cp1252AsciiExtension") public static final char[] cp1252AsciiExtension; static { cp1252AsciiExtension = new char[]{'€', '\u0000', '‚', 'ƒ', '„', '…', '†', '‡', 'ˆ', '‰', 'Š', '‹', 'Œ', '\u0000', 'Ž', '\u0000', '\u0000', '‘', '’', '“', '”', '•', '–', '—', '˜', '™', 'š', '›', 'œ', '\u0000', 'ž', 'Ÿ'}; // L: 4 } - - @ObfuscatedName("o") - @ObfuscatedSignature( - descriptor = "(I)I", - garbageValue = "1721288249" - ) - public static int method5371() { - return ++MouseHandler.MouseHandler_idleCycles - 1; // L: 50 - } } diff --git a/runescape-client/src/main/java/class302.java b/runescape-client/src/main/java/class302.java index b4dc1f6391..be9708db8d 100644 --- a/runescape-client/src/main/java/class302.java +++ b/runescape-client/src/main/java/class302.java @@ -1,130 +1,155 @@ +import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("kq") +@ObfuscatedName("kd") public class class302 { - @ObfuscatedName("h") - public static char[] field3770; - @ObfuscatedName("c") - static char[] field3769; - @ObfuscatedName("o") - static char[] field3768; - @ObfuscatedName("g") - static int[] field3771; + @ObfuscatedName("v") + public static char[] field3743; + @ObfuscatedName("n") + static char[] field3742; + @ObfuscatedName("f") + static char[] field3744; + @ObfuscatedName("y") + static int[] field3746; + @ObfuscatedName("r") + @Export("SpriteBuffer_spriteHeights") + public static int[] SpriteBuffer_spriteHeights; static { - field3770 = new char[64]; // L: 7 + field3743 = new char[64]; // L: 7 int var0; for (var0 = 0; var0 < 26; ++var0) { // L: 8 - field3770[var0] = (char)(var0 + 65); + field3743[var0] = (char)(var0 + 65); } for (var0 = 26; var0 < 52; ++var0) { // L: 9 - field3770[var0] = (char)(var0 + 97 - 26); + field3743[var0] = (char)(var0 + 97 - 26); } for (var0 = 52; var0 < 62; ++var0) { // L: 10 - field3770[var0] = (char)(var0 + 48 - 52); + field3743[var0] = (char)(var0 + 48 - 52); } - field3770[62] = '+'; // L: 11 - field3770[63] = '/'; // L: 12 - field3769 = new char[64]; // L: 18 + field3743[62] = '+'; // L: 11 + field3743[63] = '/'; // L: 12 + field3742 = new char[64]; // L: 18 for (var0 = 0; var0 < 26; ++var0) { // L: 19 - field3769[var0] = (char)(var0 + 65); + field3742[var0] = (char)(var0 + 65); } for (var0 = 26; var0 < 52; ++var0) { // L: 20 - field3769[var0] = (char)(var0 + 97 - 26); + field3742[var0] = (char)(var0 + 97 - 26); } for (var0 = 52; var0 < 62; ++var0) { // L: 21 - field3769[var0] = (char)(var0 + 48 - 52); + field3742[var0] = (char)(var0 + 48 - 52); } - field3769[62] = '*'; // L: 22 - field3769[63] = '-'; // L: 23 - field3768 = new char[64]; // L: 29 + field3742[62] = '*'; // L: 22 + field3742[63] = '-'; // L: 23 + field3744 = new char[64]; // L: 29 for (var0 = 0; var0 < 26; ++var0) { // L: 30 - field3768[var0] = (char)(var0 + 65); + field3744[var0] = (char)(var0 + 65); } for (var0 = 26; var0 < 52; ++var0) { // L: 31 - field3768[var0] = (char)(var0 + 97 - 26); + field3744[var0] = (char)(var0 + 97 - 26); } for (var0 = 52; var0 < 62; ++var0) { // L: 32 - field3768[var0] = (char)(var0 + 48 - 52); + field3744[var0] = (char)(var0 + 48 - 52); } - field3768[62] = '-'; // L: 33 - field3768[63] = '_'; // L: 34 - field3771 = new int[128]; // L: 40 + field3744[62] = '-'; // L: 33 + field3744[63] = '_'; // L: 34 + field3746 = new int[128]; // L: 40 - for (var0 = 0; var0 < field3771.length; ++var0) { // L: 41 - field3771[var0] = -1; + for (var0 = 0; var0 < field3746.length; ++var0) { // L: 41 + field3746[var0] = -1; } for (var0 = 65; var0 <= 90; ++var0) { // L: 42 - field3771[var0] = var0 - 65; + field3746[var0] = var0 - 65; } for (var0 = 97; var0 <= 122; ++var0) { // L: 43 - field3771[var0] = var0 - 97 + 26; + field3746[var0] = var0 - 97 + 26; } for (var0 = 48; var0 <= 57; ++var0) { // L: 44 - field3771[var0] = var0 - 48 + 52; + field3746[var0] = var0 - 48 + 52; } - int[] var2 = field3771; // L: 45 - field3771[43] = 62; // L: 46 + int[] var2 = field3746; // L: 45 + field3746[43] = 62; // L: 46 var2[42] = 62; // L: 47 - int[] var1 = field3771; // L: 48 - field3771[47] = 63; // L: 49 + int[] var1 = field3746; // L: 48 + field3746[47] = 63; // L: 49 var1[45] = 63; // L: 50 } // L: 51 - @ObfuscatedName("gv") + @ObfuscatedName("fn") @ObfuscatedSignature( - descriptor = "(B)V", - garbageValue = "-3" + descriptor = "(Ljava/lang/String;I)V", + garbageValue = "1106369714" ) - static final void method5372() { - for (Projectile var0 = (Projectile)Client.projectiles.last(); var0 != null; var0 = (Projectile)Client.projectiles.previous()) { // L: 4718 4719 4736 - if (var0.plane == ParamComposition.Client_plane && Client.cycle <= var0.cycleEnd) { // L: 4720 - if (Client.cycle >= var0.cycleStart) { // L: 4721 - if (var0.targetIndex > 0) { // L: 4722 - NPC var1 = Client.npcs[var0.targetIndex - 1]; // L: 4723 - if (var1 != null && var1.x >= 0 && var1.x < 13312 && var1.y >= 0 && var1.y < 13312) { // L: 4724 - var0.setDestination(var1.x, var1.y, SceneTilePaint.getTileHeight(var1.x, var1.y, var0.plane) - var0.endHeight, Client.cycle); - } - } - - if (var0.targetIndex < 0) { // L: 4726 - int var2 = -var0.targetIndex - 1; // L: 4728 - Player var3; - if (var2 == Client.localPlayerIndex) { // L: 4729 - var3 = class35.localPlayer; - } else { - var3 = Client.players[var2]; // L: 4730 - } - - if (var3 != null && var3.x >= 0 && var3.x < 13312 && var3.y >= 0 && var3.y < 13312) { - var0.setDestination(var3.x, var3.y, SceneTilePaint.getTileHeight(var3.x, var3.y, var0.plane) - var0.endHeight, Client.cycle); // L: 4731 - } - } - - var0.advance(Client.field768); // L: 4733 - class5.scene.drawEntity(ParamComposition.Client_plane, (int)var0.x, (int)var0.y, (int)var0.z, 60, var0, var0.yaw, -1L, false); // L: 4734 - } + @Export("doCheat") + static final void doCheat(String var0) { + if (var0.equalsIgnoreCase("toggleroof")) { // L: 3479 + ObjectComposition.clientPreferences.roofsHidden = !ObjectComposition.clientPreferences.roofsHidden; // L: 3480 + TileItem.savePreferences(); // L: 3481 + if (ObjectComposition.clientPreferences.roofsHidden) { // L: 3482 + World.addGameMessage(99, "", "Roofs are now all hidden"); } else { - var0.remove(); + World.addGameMessage(99, "", "Roofs will only be removed selectively"); // L: 3483 } } - } // L: 4738 + if (var0.equalsIgnoreCase("displayfps")) { // L: 3485 + Client.displayFps = !Client.displayFps; + } + + if (var0.equalsIgnoreCase("renderself")) { // L: 3486 + Client.renderSelf = !Client.renderSelf; + } + + if (var0.equalsIgnoreCase("mouseovertext")) { // L: 3487 + Client.showMouseOverText = !Client.showMouseOverText; + } + + if (Client.staffModLevel >= 2) { // L: 3488 + if (var0.equalsIgnoreCase("errortest")) { // L: 3489 + throw new RuntimeException(); + } + + if (var0.equalsIgnoreCase("showcoord")) { // L: 3490 + class243.worldMap.showCoord = !class243.worldMap.showCoord; + } + + if (var0.equalsIgnoreCase("fpson")) { // L: 3491 + Client.displayFps = true; + } + + if (var0.equalsIgnoreCase("fpsoff")) { // L: 3492 + Client.displayFps = false; + } + + if (var0.equalsIgnoreCase("gc")) { // L: 3493 + System.gc(); + } + + if (var0.equalsIgnoreCase("clientdrop")) { // L: 3494 + NetFileRequest.method4912(); + } + } + + PacketBufferNode var1 = class21.getPacketBufferNode(ClientPacket.field2610, Client.packetWriter.isaacCipher); // L: 3497 + var1.packetBuffer.writeByte(var0.length() + 1); // L: 3498 + var1.packetBuffer.writeStringCp1252NullTerminated(var0); // L: 3499 + Client.packetWriter.addNode(var1); // L: 3500 + } // L: 3501 } diff --git a/runescape-client/src/main/java/class303.java b/runescape-client/src/main/java/class303.java index 3869ff7c4e..fd76e46628 100644 --- a/runescape-client/src/main/java/class303.java +++ b/runescape-client/src/main/java/class303.java @@ -1,473 +1,637 @@ import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -import net.runelite.rs.ScriptOpcodes; -@ObfuscatedName("kv") +@ObfuscatedName("kp") public final class class303 { - @ObfuscatedName("af") - @Export("client") + @ObfuscatedName("ij") @ObfuscatedSignature( - descriptor = "Lclient;" + descriptor = "([Lio;IIIIIIIII)V", + garbageValue = "-1945038256" ) - static Client client; + @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); // L: 9210 + Rasterizer3D.Rasterizer3D_setClipFromRasterizer2D(); // L: 9211 - @ObfuscatedName("c") - @ObfuscatedSignature( - descriptor = "(III)V", - garbageValue = "64684553" - ) - @Export("changeWorldSelectSorting") - static void changeWorldSelectSorting(int var0, int var1) { - int[] var2 = new int[4]; // L: 63 - int[] var3 = new int[4]; // L: 64 - var2[0] = var0; // L: 65 - var3[0] = var1; // L: 66 - int var4 = 1; // L: 67 - - for (int var5 = 0; var5 < 4; ++var5) { // L: 68 - if (World.World_sortOption1[var5] != var0) { // L: 69 - var2[var4] = World.World_sortOption1[var5]; // L: 70 - var3[var4] = World.World_sortOption2[var5]; // L: 71 - ++var4; // L: 72 - } - } - - World.World_sortOption1 = var2; // L: 75 - World.World_sortOption2 = var3; // L: 76 - VarcInt.sortWorlds(Messages.World_worlds, 0, Messages.World_worlds.length - 1, World.World_sortOption1, World.World_sortOption2); // L: 77 - } // L: 78 - - @ObfuscatedName("x") - @ObfuscatedSignature( - descriptor = "([BI)V", - garbageValue = "-120515195" - ) - @Export("SpriteBuffer_decode") - static void SpriteBuffer_decode(byte[] var0) { - Buffer var1 = new Buffer(var0); // L: 200 - var1.offset = var0.length - 2; // L: 201 - class396.SpriteBuffer_spriteCount = var1.readUnsignedShort(); // L: 202 - class243.SpriteBuffer_xOffsets = new int[class396.SpriteBuffer_spriteCount]; // L: 203 - class396.SpriteBuffer_yOffsets = new int[class396.SpriteBuffer_spriteCount]; // L: 204 - ArchiveDiskActionHandler.SpriteBuffer_spriteWidths = new int[class396.SpriteBuffer_spriteCount]; // L: 205 - class372.SpriteBuffer_spriteHeights = new int[class396.SpriteBuffer_spriteCount]; // L: 206 - class396.SpriteBuffer_pixels = new byte[class396.SpriteBuffer_spriteCount][]; // L: 207 - var1.offset = var0.length - 7 - class396.SpriteBuffer_spriteCount * 8; // L: 208 - class396.SpriteBuffer_spriteWidth = var1.readUnsignedShort(); // L: 209 - class396.SpriteBuffer_spriteHeight = var1.readUnsignedShort(); // L: 210 - int var2 = (var1.readUnsignedByte() & 255) + 1; // L: 211 - - int var3; - for (var3 = 0; var3 < class396.SpriteBuffer_spriteCount; ++var3) { // L: 212 - class243.SpriteBuffer_xOffsets[var3] = var1.readUnsignedShort(); - } - - for (var3 = 0; var3 < class396.SpriteBuffer_spriteCount; ++var3) { // L: 213 - class396.SpriteBuffer_yOffsets[var3] = var1.readUnsignedShort(); - } - - for (var3 = 0; var3 < class396.SpriteBuffer_spriteCount; ++var3) { // L: 214 - ArchiveDiskActionHandler.SpriteBuffer_spriteWidths[var3] = var1.readUnsignedShort(); - } - - for (var3 = 0; var3 < class396.SpriteBuffer_spriteCount; ++var3) { // L: 215 - class372.SpriteBuffer_spriteHeights[var3] = var1.readUnsignedShort(); - } - - var1.offset = var0.length - 7 - class396.SpriteBuffer_spriteCount * 8 - (var2 - 1) * 3; // L: 216 - AccessFile.SpriteBuffer_spritePalette = new int[var2]; // L: 217 - - for (var3 = 1; var3 < var2; ++var3) { // L: 218 - AccessFile.SpriteBuffer_spritePalette[var3] = var1.readMedium(); // L: 219 - if (AccessFile.SpriteBuffer_spritePalette[var3] == 0) { // L: 220 - AccessFile.SpriteBuffer_spritePalette[var3] = 1; - } - } - - var1.offset = 0; // L: 222 - - for (var3 = 0; var3 < class396.SpriteBuffer_spriteCount; ++var3) { // L: 223 - int var4 = ArchiveDiskActionHandler.SpriteBuffer_spriteWidths[var3]; // L: 224 - int var5 = class372.SpriteBuffer_spriteHeights[var3]; // L: 225 - int var6 = var4 * var5; // L: 226 - byte[] var7 = new byte[var6]; // L: 227 - class396.SpriteBuffer_pixels[var3] = var7; // L: 228 - int var8 = var1.readUnsignedByte(); // L: 229 - int var9; - if (var8 == 0) { // L: 230 - for (var9 = 0; var9 < var6; ++var9) { // L: 231 - var7[var9] = var1.readByte(); - } - } else if (var8 == 1) { // L: 233 - for (var9 = 0; var9 < var4; ++var9) { // L: 234 - for (int var10 = 0; var10 < var5; ++var10) { // L: 235 - var7[var9 + var10 * var4] = var1.readByte(); // L: 236 - } - } - } - } - - } // L: 241 - - @ObfuscatedName("n") - @ObfuscatedSignature( - descriptor = "(ILci;ZI)I", - garbageValue = "-1352766813" - ) - static int method5379(int var0, Script var1, boolean var2) { - if (var0 == ScriptOpcodes.FRIEND_COUNT) { // L: 2053 - if (GrandExchangeOfferUnitPriceComparator.friendSystem.field920 == 0) { // L: 2054 - Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = -2; - } else if (GrandExchangeOfferUnitPriceComparator.friendSystem.field920 == 1) { // L: 2055 - Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = -1; - } else { - Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = GrandExchangeOfferUnitPriceComparator.friendSystem.friendsList.getSize(); // L: 2056 - } - - return 1; // L: 2057 - } else { - int var3; - if (var0 == ScriptOpcodes.FRIEND_GETNAME) { - var3 = Interpreter.Interpreter_intStack[--WorldMapCacheName.Interpreter_intStackSize]; // L: 2060 - if (GrandExchangeOfferUnitPriceComparator.friendSystem.method1744() && var3 >= 0 && var3 < GrandExchangeOfferUnitPriceComparator.friendSystem.friendsList.getSize()) { // L: 2061 - Friend var8 = (Friend)GrandExchangeOfferUnitPriceComparator.friendSystem.friendsList.get(var3); // L: 2062 - Interpreter.Interpreter_stringStack[++class13.Interpreter_stringStackSize - 1] = var8.getName(); // L: 2063 - Interpreter.Interpreter_stringStack[++class13.Interpreter_stringStackSize - 1] = var8.getPreviousName(); // L: 2064 + for (int var9 = 0; var9 < var0.length; ++var9) { // L: 9212 + Widget var10 = var0[var9]; // L: 9213 + if (var10 != null && (var10.parentId == var1 || var1 == -1412584499 && var10 == Client.clickedWidget)) { // L: 9214 9215 + int var11; + if (var8 == -1) { // L: 9217 + Client.rootWidgetXs[Client.rootWidgetCount] = var10.x + var6; // L: 9218 + Client.rootWidgetYs[Client.rootWidgetCount] = var7 + var10.y; // L: 9219 + Client.rootWidgetWidths[Client.rootWidgetCount] = var10.width; // L: 9220 + Client.rootWidgetHeights[Client.rootWidgetCount] = var10.height; // L: 9221 + var11 = ++Client.rootWidgetCount - 1; // L: 9222 } else { - Interpreter.Interpreter_stringStack[++class13.Interpreter_stringStackSize - 1] = ""; // L: 2067 - Interpreter.Interpreter_stringStack[++class13.Interpreter_stringStackSize - 1] = ""; // L: 2068 + var11 = var8; // L: 9224 } - return 1; // L: 2070 - } else if (var0 == ScriptOpcodes.FRIEND_GETWORLD) { - var3 = Interpreter.Interpreter_intStack[--WorldMapCacheName.Interpreter_intStackSize]; // L: 2073 - if (GrandExchangeOfferUnitPriceComparator.friendSystem.method1744() && var3 >= 0 && var3 < GrandExchangeOfferUnitPriceComparator.friendSystem.friendsList.getSize()) { // L: 2074 - Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = ((Buddy)GrandExchangeOfferUnitPriceComparator.friendSystem.friendsList.get(var3)).world; // L: 2075 - } else { - Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = 0; // L: 2077 - } - - return 1; // L: 2078 - } else if (var0 == ScriptOpcodes.FRIEND_GETRANK) { - var3 = Interpreter.Interpreter_intStack[--WorldMapCacheName.Interpreter_intStackSize]; // L: 2081 - if (GrandExchangeOfferUnitPriceComparator.friendSystem.method1744() && var3 >= 0 && var3 < GrandExchangeOfferUnitPriceComparator.friendSystem.friendsList.getSize()) { // L: 2082 - Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = ((Buddy)GrandExchangeOfferUnitPriceComparator.friendSystem.friendsList.get(var3)).rank; // L: 2083 - } else { - Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = 0; // L: 2085 - } - - return 1; // L: 2086 - } else { - String var5; - if (var0 == ScriptOpcodes.FRIEND_SETRANK) { - var5 = Interpreter.Interpreter_stringStack[--class13.Interpreter_stringStackSize]; // L: 2089 - int var6 = Interpreter.Interpreter_intStack[--WorldMapCacheName.Interpreter_intStackSize]; // L: 2090 - ParamComposition.method2825(var5, var6); // L: 2091 - return 1; // L: 2092 - } else if (var0 == ScriptOpcodes.FRIEND_ADD) { - var5 = Interpreter.Interpreter_stringStack[--class13.Interpreter_stringStackSize]; // L: 2095 - GrandExchangeOfferUnitPriceComparator.friendSystem.addFriend(var5); // L: 2096 - return 1; // L: 2097 - } else if (var0 == ScriptOpcodes.FRIEND_DEL) { - var5 = Interpreter.Interpreter_stringStack[--class13.Interpreter_stringStackSize]; // L: 2100 - GrandExchangeOfferUnitPriceComparator.friendSystem.removeFriend(var5); // L: 2101 - return 1; // L: 2102 - } else if (var0 == ScriptOpcodes.IGNORE_ADD) { - var5 = Interpreter.Interpreter_stringStack[--class13.Interpreter_stringStackSize]; // L: 2105 - GrandExchangeOfferUnitPriceComparator.friendSystem.addIgnore(var5); // L: 2106 - return 1; // L: 2107 - } else if (var0 == ScriptOpcodes.IGNORE_DEL) { - var5 = Interpreter.Interpreter_stringStack[--class13.Interpreter_stringStackSize]; // L: 2110 - GrandExchangeOfferUnitPriceComparator.friendSystem.removeIgnore(var5); // L: 2111 - return 1; // L: 2112 - } else if (var0 == ScriptOpcodes.FRIEND_TEST) { - var5 = Interpreter.Interpreter_stringStack[--class13.Interpreter_stringStackSize]; // L: 2115 - var5 = Canvas.method468(var5); // L: 2116 - Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = GrandExchangeOfferUnitPriceComparator.friendSystem.isFriended(new Username(var5, ModeWhere.loginType), false) ? 1 : 0; // L: 2117 - return 1; // L: 2118 - } else if (var0 == ScriptOpcodes.CLAN_GETCHATDISPLAYNAME) { - if (class25.clanChat != null) { // L: 2121 - Interpreter.Interpreter_stringStack[++class13.Interpreter_stringStackSize - 1] = class25.clanChat.name; // L: 2122 - } else { - Interpreter.Interpreter_stringStack[++class13.Interpreter_stringStackSize - 1] = ""; // L: 2124 + var10.rootIndex = var11; // L: 9225 + var10.cycle = Client.cycle; // L: 9226 + if (!var10.isIf3 || !HitSplatDefinition.isComponentHidden(var10)) { // L: 9227 + if (var10.contentType > 0) { // L: 9228 + class258.method4836(var10); } - return 1; // L: 2125 - } else if (var0 == ScriptOpcodes.CLAN_GETCHATCOUNT) { - if (class25.clanChat != null) { // L: 2128 - Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = class25.clanChat.getSize(); // L: 2129 - } else { - Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = 0; // L: 2131 - } + int var12 = var10.x + var6; // L: 9229 + int var13 = var7 + var10.y; // L: 9230 + int var14 = var10.transparencyTop; // L: 9231 + int var15; + int var16; + if (var10 == Client.clickedWidget) { // L: 9232 + if (var1 != -1412584499 && !var10.isScrollBar) { // L: 9233 + class4.field49 = var0; // L: 9234 + ClanChannel.field38 = var6; // L: 9235 + class82.field1020 = var7; // L: 9236 + continue; + } - return 1; // L: 2132 - } else if (var0 == ScriptOpcodes.CLAN_GETCHATUSERNAME) { - var3 = Interpreter.Interpreter_intStack[--WorldMapCacheName.Interpreter_intStackSize]; // L: 2135 - if (class25.clanChat != null && var3 < class25.clanChat.getSize()) { // L: 2136 - Interpreter.Interpreter_stringStack[++class13.Interpreter_stringStackSize - 1] = class25.clanChat.get(var3).getUsername().getName(); // L: 2137 - } else { - Interpreter.Interpreter_stringStack[++class13.Interpreter_stringStackSize - 1] = ""; // L: 2139 - } - - return 1; // L: 2140 - } else if (var0 == ScriptOpcodes.CLAN_GETCHATUSERWORLD) { - var3 = Interpreter.Interpreter_intStack[--WorldMapCacheName.Interpreter_intStackSize]; // L: 2143 - if (class25.clanChat != null && var3 < class25.clanChat.getSize()) { // L: 2144 - Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = ((Buddy)class25.clanChat.get(var3)).getWorld(); // L: 2145 - } else { - Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = 0; // L: 2147 - } - - return 1; // L: 2148 - } else if (var0 == ScriptOpcodes.CLAN_GETCHATUSERRANK) { - var3 = Interpreter.Interpreter_intStack[--WorldMapCacheName.Interpreter_intStackSize]; // L: 2151 - if (class25.clanChat != null && var3 < class25.clanChat.getSize()) { // L: 2152 - Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = ((Buddy)class25.clanChat.get(var3)).rank; // L: 2153 - } else { - Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = 0; // L: 2155 - } - - return 1; // L: 2156 - } else if (var0 == ScriptOpcodes.CLAN_GETCHATMINKICK) { - Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = class25.clanChat != null ? class25.clanChat.minKick : 0; // L: 2159 - return 1; // L: 2160 - } else if (var0 == ScriptOpcodes.CLAN_KICKUSER) { - var5 = Interpreter.Interpreter_stringStack[--class13.Interpreter_stringStackSize]; // L: 2163 - class280.clanKickUser(var5); // L: 2164 - return 1; // L: 2165 - } else if (var0 == ScriptOpcodes.CLAN_GETCHATRANK) { - Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = class25.clanChat != null ? class25.clanChat.rank * 1163714437 * 504381773 : 0; // L: 2168 - return 1; // L: 2169 - } else if (var0 == ScriptOpcodes.CLAN_JOINCHAT) { - var5 = Interpreter.Interpreter_stringStack[--class13.Interpreter_stringStackSize]; // L: 2172 - Tiles.Clan_joinChat(var5); // L: 2173 - return 1; // L: 2174 - } else if (var0 == ScriptOpcodes.CLAN_LEAVECHAT) { - AbstractSocket.Clan_leaveChat(); // L: 2177 - return 1; // L: 2178 - } else if (var0 == ScriptOpcodes.IGNORE_COUNT) { - if (!GrandExchangeOfferUnitPriceComparator.friendSystem.method1744()) { // L: 2181 - Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = -1; - } else { - Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = GrandExchangeOfferUnitPriceComparator.friendSystem.ignoreList.getSize(); // L: 2182 - } - - return 1; // L: 2183 - } else if (var0 == ScriptOpcodes.IGNORE_GETNAME) { - var3 = Interpreter.Interpreter_intStack[--WorldMapCacheName.Interpreter_intStackSize]; // L: 2186 - if (GrandExchangeOfferUnitPriceComparator.friendSystem.method1744() && var3 >= 0 && var3 < GrandExchangeOfferUnitPriceComparator.friendSystem.ignoreList.getSize()) { // L: 2187 - Ignored var4 = (Ignored)GrandExchangeOfferUnitPriceComparator.friendSystem.ignoreList.get(var3); // L: 2188 - Interpreter.Interpreter_stringStack[++class13.Interpreter_stringStackSize - 1] = var4.getName(); // L: 2189 - Interpreter.Interpreter_stringStack[++class13.Interpreter_stringStackSize - 1] = var4.getPreviousName(); // L: 2190 - } else { - Interpreter.Interpreter_stringStack[++class13.Interpreter_stringStackSize - 1] = ""; // L: 2193 - Interpreter.Interpreter_stringStack[++class13.Interpreter_stringStackSize - 1] = ""; // L: 2194 - } - - return 1; // L: 2196 - } else if (var0 == ScriptOpcodes.IGNORE_TEST) { - var5 = Interpreter.Interpreter_stringStack[--class13.Interpreter_stringStackSize]; // L: 2199 - var5 = Canvas.method468(var5); // L: 2200 - Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = GrandExchangeOfferUnitPriceComparator.friendSystem.isIgnored(new Username(var5, ModeWhere.loginType)) ? 1 : 0; // L: 2201 - return 1; // L: 2202 - } else if (var0 == ScriptOpcodes.CLAN_ISSELF) { - var3 = Interpreter.Interpreter_intStack[--WorldMapCacheName.Interpreter_intStackSize]; // L: 2205 - if (class25.clanChat != null && var3 < class25.clanChat.getSize() && class25.clanChat.get(var3).getUsername().equals(class35.localPlayer.username)) { // L: 2206 - Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = 1; // L: 2207 - } else { - Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = 0; // L: 2209 - } - - return 1; // L: 2210 - } else if (var0 == ScriptOpcodes.CLAN_GETCHATOWNERNAME) { - if (class25.clanChat != null && class25.clanChat.owner != null) { // L: 2213 - Interpreter.Interpreter_stringStack[++class13.Interpreter_stringStackSize - 1] = class25.clanChat.owner; // L: 2214 - } else { - Interpreter.Interpreter_stringStack[++class13.Interpreter_stringStackSize - 1] = ""; // L: 2216 - } - - return 1; // L: 2217 - } else if (var0 == ScriptOpcodes.CLAN_ISFRIEND) { - var3 = Interpreter.Interpreter_intStack[--WorldMapCacheName.Interpreter_intStackSize]; // L: 2220 - if (class25.clanChat != null && var3 < class25.clanChat.getSize() && ((ClanMate)class25.clanChat.get(var3)).isFriend()) { // L: 2221 - Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = 1; // L: 2222 - } else { - Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = 0; // L: 2224 - } - - return 1; // L: 2225 - } else if (var0 != ScriptOpcodes.CLAN_ISIGNORE) { - if (var0 == 3628) { - GrandExchangeOfferUnitPriceComparator.friendSystem.friendsList.removeComparator(); // L: 2236 - return 1; // L: 2237 - } else { - boolean var7; - if (var0 == 3629) { - var7 = Interpreter.Interpreter_intStack[--WorldMapCacheName.Interpreter_intStackSize] == 1; // L: 2240 - GrandExchangeOfferUnitPriceComparator.friendSystem.friendsList.addComparator(new UserComparator1(var7)); // L: 2241 - return 1; // L: 2242 - } else if (var0 == 3630) { - var7 = Interpreter.Interpreter_intStack[--WorldMapCacheName.Interpreter_intStackSize] == 1; // L: 2245 - GrandExchangeOfferUnitPriceComparator.friendSystem.friendsList.addComparator(new UserComparator2(var7)); // L: 2246 - return 1; // L: 2247 - } else if (var0 == 3631) { - var7 = Interpreter.Interpreter_intStack[--WorldMapCacheName.Interpreter_intStackSize] == 1; // L: 2250 - GrandExchangeOfferUnitPriceComparator.friendSystem.friendsList.addComparator(new UserComparator3(var7)); // L: 2251 - return 1; // L: 2252 - } else if (var0 == 3632) { - var7 = Interpreter.Interpreter_intStack[--WorldMapCacheName.Interpreter_intStackSize] == 1; // L: 2255 - GrandExchangeOfferUnitPriceComparator.friendSystem.friendsList.addComparator(new UserComparator4(var7)); // L: 2256 - return 1; // L: 2257 - } else if (var0 == 3633) { - var7 = Interpreter.Interpreter_intStack[--WorldMapCacheName.Interpreter_intStackSize] == 1; // L: 2260 - GrandExchangeOfferUnitPriceComparator.friendSystem.friendsList.addComparator(new UserComparator5(var7)); // L: 2261 - return 1; // L: 2262 - } else if (var0 == 3634) { - var7 = Interpreter.Interpreter_intStack[--WorldMapCacheName.Interpreter_intStackSize] == 1; // L: 2265 - GrandExchangeOfferUnitPriceComparator.friendSystem.friendsList.addComparator(new UserComparator6(var7)); // L: 2266 - return 1; // L: 2267 - } else if (var0 == 3635) { - var7 = Interpreter.Interpreter_intStack[--WorldMapCacheName.Interpreter_intStackSize] == 1; // L: 2270 - GrandExchangeOfferUnitPriceComparator.friendSystem.friendsList.addComparator(new UserComparator7(var7)); // L: 2271 - return 1; // L: 2272 - } else if (var0 == 3636) { - var7 = Interpreter.Interpreter_intStack[--WorldMapCacheName.Interpreter_intStackSize] == 1; // L: 2275 - GrandExchangeOfferUnitPriceComparator.friendSystem.friendsList.addComparator(new UserComparator8(var7)); // L: 2276 - return 1; // L: 2277 - } else if (var0 == 3637) { - var7 = Interpreter.Interpreter_intStack[--WorldMapCacheName.Interpreter_intStackSize] == 1; // L: 2280 - GrandExchangeOfferUnitPriceComparator.friendSystem.friendsList.addComparator(new UserComparator9(var7)); // L: 2281 - return 1; // L: 2282 - } else if (var0 == 3638) { - var7 = Interpreter.Interpreter_intStack[--WorldMapCacheName.Interpreter_intStackSize] == 1; // L: 2285 - GrandExchangeOfferUnitPriceComparator.friendSystem.friendsList.addComparator(new UserComparator10(var7)); // L: 2286 - return 1; // L: 2287 - } else if (var0 == 3639) { - GrandExchangeOfferUnitPriceComparator.friendSystem.friendsList.sort(); // L: 2290 - return 1; // L: 2291 - } else if (var0 == 3640) { - GrandExchangeOfferUnitPriceComparator.friendSystem.ignoreList.removeComparator(); // L: 2294 - return 1; // L: 2295 - } else if (var0 == 3641) { - var7 = Interpreter.Interpreter_intStack[--WorldMapCacheName.Interpreter_intStackSize] == 1; // L: 2298 - GrandExchangeOfferUnitPriceComparator.friendSystem.ignoreList.addComparator(new UserComparator1(var7)); // L: 2299 - return 1; // L: 2300 - } else if (var0 == 3642) { - var7 = Interpreter.Interpreter_intStack[--WorldMapCacheName.Interpreter_intStackSize] == 1; // L: 2303 - GrandExchangeOfferUnitPriceComparator.friendSystem.ignoreList.addComparator(new UserComparator2(var7)); // L: 2304 - return 1; // L: 2305 - } else if (var0 == 3643) { - GrandExchangeOfferUnitPriceComparator.friendSystem.ignoreList.sort(); // L: 2308 - return 1; // L: 2309 - } else if (var0 == 3644) { - if (class25.clanChat != null) { // L: 2312 - class25.clanChat.removeComparator(); // L: 2313 + if (Client.isDraggingWidget && Client.field819) { // L: 9239 + var15 = MouseHandler.MouseHandler_x; // L: 9240 + var16 = MouseHandler.MouseHandler_y; // L: 9241 + var15 -= Client.widgetClickX; // L: 9242 + var16 -= Client.widgetClickY; // L: 9243 + if (var15 < Client.field740) { // L: 9244 + var15 = Client.field740; } - return 1; // L: 2315 - } else if (var0 == 3645) { - var7 = Interpreter.Interpreter_intStack[--WorldMapCacheName.Interpreter_intStackSize] == 1; // L: 2318 - if (class25.clanChat != null) { // L: 2319 - class25.clanChat.addComparator(new UserComparator1(var7)); // L: 2320 + if (var15 + var10.width > Client.field740 + Client.clickedWidgetParent.width) { // L: 9245 + var15 = Client.field740 + Client.clickedWidgetParent.width - var10.width; } - return 1; // L: 2322 - } else if (var0 == 3646) { - var7 = Interpreter.Interpreter_intStack[--WorldMapCacheName.Interpreter_intStackSize] == 1; // L: 2325 - if (class25.clanChat != null) { // L: 2326 - class25.clanChat.addComparator(new UserComparator2(var7)); // L: 2327 + if (var16 < Client.field821) { // L: 9246 + var16 = Client.field821; } - return 1; // L: 2329 - } else if (var0 == 3647) { - var7 = Interpreter.Interpreter_intStack[--WorldMapCacheName.Interpreter_intStackSize] == 1; // L: 2332 - if (class25.clanChat != null) { // L: 2333 - class25.clanChat.addComparator(new UserComparator3(var7)); // L: 2334 + if (var16 + var10.height > Client.field821 + Client.clickedWidgetParent.height) { // L: 9247 + var16 = Client.field821 + Client.clickedWidgetParent.height - var10.height; } - return 1; // L: 2336 - } else if (var0 == 3648) { - var7 = Interpreter.Interpreter_intStack[--WorldMapCacheName.Interpreter_intStackSize] == 1; // L: 2339 - if (class25.clanChat != null) { // L: 2340 - class25.clanChat.addComparator(new UserComparator4(var7)); // L: 2341 - } + var12 = var15; // L: 9248 + var13 = var16; // L: 9249 + } - return 1; // L: 2343 - } else if (var0 == 3649) { - var7 = Interpreter.Interpreter_intStack[--WorldMapCacheName.Interpreter_intStackSize] == 1; // L: 2346 - if (class25.clanChat != null) { // L: 2347 - class25.clanChat.addComparator(new UserComparator5(var7)); // L: 2348 - } - - return 1; // L: 2350 - } else if (var0 == 3650) { - var7 = Interpreter.Interpreter_intStack[--WorldMapCacheName.Interpreter_intStackSize] == 1; // L: 2353 - if (class25.clanChat != null) { // L: 2354 - class25.clanChat.addComparator(new UserComparator6(var7)); // L: 2355 - } - - return 1; // L: 2357 - } else if (var0 == 3651) { - var7 = Interpreter.Interpreter_intStack[--WorldMapCacheName.Interpreter_intStackSize] == 1; // L: 2360 - if (class25.clanChat != null) { // L: 2361 - class25.clanChat.addComparator(new UserComparator7(var7)); // L: 2362 - } - - return 1; // L: 2364 - } else if (var0 == 3652) { - var7 = Interpreter.Interpreter_intStack[--WorldMapCacheName.Interpreter_intStackSize] == 1; // L: 2367 - if (class25.clanChat != null) { // L: 2368 - class25.clanChat.addComparator(new UserComparator8(var7)); // L: 2369 - } - - return 1; // L: 2371 - } else if (var0 == 3653) { - var7 = Interpreter.Interpreter_intStack[--WorldMapCacheName.Interpreter_intStackSize] == 1; // L: 2374 - if (class25.clanChat != null) { // L: 2375 - class25.clanChat.addComparator(new UserComparator9(var7)); // L: 2376 - } - - return 1; // L: 2378 - } else if (var0 == 3654) { - var7 = Interpreter.Interpreter_intStack[--WorldMapCacheName.Interpreter_intStackSize] == 1; // L: 2381 - if (class25.clanChat != null) { // L: 2382 - class25.clanChat.addComparator(new UserComparator10(var7)); // L: 2383 - } - - return 1; // L: 2385 - } else if (var0 == 3655) { - if (class25.clanChat != null) { // L: 2388 - class25.clanChat.sort(); // L: 2389 - } - - return 1; // L: 2391 - } else if (var0 == 3656) { - var7 = Interpreter.Interpreter_intStack[--WorldMapCacheName.Interpreter_intStackSize] == 1; // L: 2394 - GrandExchangeOfferUnitPriceComparator.friendSystem.friendsList.addComparator(new BuddyRankComparator(var7)); // L: 2395 - return 1; // L: 2396 - } else if (var0 == 3657) { - var7 = Interpreter.Interpreter_intStack[--WorldMapCacheName.Interpreter_intStackSize] == 1; // L: 2399 - if (class25.clanChat != null) { // L: 2400 - class25.clanChat.addComparator(new BuddyRankComparator(var7)); // L: 2401 - } - - return 1; // L: 2403 - } else { - return 2; // L: 2405 + if (!var10.isScrollBar) { // L: 9251 + var14 = 128; } } - } else { - var3 = Interpreter.Interpreter_intStack[--WorldMapCacheName.Interpreter_intStackSize]; // L: 2228 - if (class25.clanChat != null && var3 < class25.clanChat.getSize() && ((ClanMate)class25.clanChat.get(var3)).isIgnored()) { // L: 2229 - Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = 1; // L: 2230 + + int var17; + int var18; + int var19; + int var20; + int var21; + int var22; + if (var10.type == 2) { // L: 9257 + var15 = var2; // L: 9258 + var16 = var3; // L: 9259 + var17 = var4; // L: 9260 + var18 = var5; // L: 9261 + } else if (var10.type == 9) { // L: 9263 + var19 = var12; // L: 9264 + var20 = var13; // L: 9265 + var21 = var12 + var10.width; // L: 9266 + var22 = var13 + var10.height; // L: 9267 + if (var21 < var12) { // L: 9268 + var19 = var21; // L: 9270 + var21 = var12; // L: 9271 + } + + if (var22 < var13) { // L: 9273 + var20 = var22; // L: 9275 + var22 = var13; // L: 9276 + } + + ++var21; // L: 9278 + ++var22; // L: 9279 + var15 = var19 > var2 ? var19 : var2; // L: 9280 + var16 = var20 > var3 ? var20 : var3; // L: 9281 + var17 = var21 < var4 ? var21 : var4; // L: 9282 + var18 = var22 < var5 ? var22 : var5; // L: 9283 } else { - Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = 0; // L: 2232 + var19 = var12 + var10.width; // L: 9286 + var20 = var13 + var10.height; // L: 9287 + var15 = var12 > var2 ? var12 : var2; // L: 9288 + var16 = var13 > var3 ? var13 : var3; // L: 9289 + var17 = var19 < var4 ? var19 : var4; // L: 9290 + var18 = var20 < var5 ? var20 : var5; // L: 9291 } - return 1; // L: 2233 + if (!var10.isIf3 || var15 < var17 && var16 < var18) { // L: 9293 + if (var10.contentType != 0) { // L: 9294 + if (var10.contentType == 1336) { // L: 9295 + if (Client.displayFps) { // L: 9296 + var13 += 15; // L: 9297 + UserComparator3.fontPlain12.drawRightAligned("Fps:" + GameEngine.fps, var12 + var10.width, var13, 16776960, -1); // L: 9298 + var13 += 15; // L: 9299 + Runtime var42 = Runtime.getRuntime(); // L: 9300 + var20 = (int)((var42.totalMemory() - var42.freeMemory()) / 1024L); // L: 9301 + var21 = 16776960; // L: 9302 + if (var20 > 327680 && !Client.isLowDetail) { // L: 9303 + var21 = 16711680; + } + + UserComparator3.fontPlain12.drawRightAligned("Mem:" + var20 + "k", var12 + var10.width, var13, var21, -1); // L: 9304 + var13 += 15; // L: 9305 + } + continue; + } + + if (var10.contentType == 1337) { // L: 9309 + Client.viewportX = var12; // L: 9310 + Client.viewportY = var13; // L: 9311 + ScriptFrame.drawEntities(var12, var13, var10.width, var10.height); // L: 9312 + Client.field719[var10.rootIndex] = true; // L: 9313 + Rasterizer2D.Rasterizer2D_setClip(var2, var3, var4, var5); // L: 9314 + continue; // L: 9315 + } + + if (var10.contentType == 1338) { // L: 9317 + ObjectSound.drawMinimap(var10, var12, var13, var11); // L: 9318 + Rasterizer2D.Rasterizer2D_setClip(var2, var3, var4, var5); // L: 9319 + continue; // L: 9320 + } + + if (var10.contentType == 1339) { // L: 9322 + class13.drawCompass(var10, var12, var13, var11); // L: 9323 + Rasterizer2D.Rasterizer2D_setClip(var2, var3, var4, var5); // L: 9324 + continue; // L: 9325 + } + + if (var10.contentType == 1400) { // L: 9327 + class243.worldMap.draw(var12, var13, var10.width, var10.height, Client.cycle); // L: 9328 + } + + if (var10.contentType == 1401) { // L: 9330 + class243.worldMap.drawOverview(var12, var13, var10.width, var10.height); // L: 9331 + } + + if (var10.contentType == 1402) { // L: 9333 + class24.loginScreenRunesAnimation.draw(var12, Client.cycle); // L: 9334 + } + } + + if (var10.type == 0) { // L: 9337 + if (!var10.isIf3 && HitSplatDefinition.isComponentHidden(var10) && var10 != World.mousedOverWidgetIf1) { // L: 9338 + continue; + } + + if (!var10.isIf3) { // L: 9339 + if (var10.scrollY > var10.scrollHeight - var10.height) { // L: 9340 + var10.scrollY = var10.scrollHeight - var10.height; + } + + if (var10.scrollY < 0) { // L: 9341 + var10.scrollY = 0; + } + } + + drawInterface(var0, var10.id, var15, var16, var17, var18, var12 - var10.scrollX, var13 - var10.scrollY, var11); // L: 9343 + if (var10.children != null) { // L: 9344 + drawInterface(var10.children, var10.id, var15, var16, var17, var18, var12 - var10.scrollX, var13 - var10.scrollY, var11); + } + + InterfaceParent var30 = (InterfaceParent)Client.interfaceParents.get((long)var10.id); // L: 9345 + if (var30 != null) { // L: 9346 + class225.drawWidgets(var30.group, var15, var16, var17, var18, var12, var13, var11); // L: 9347 + } + + Rasterizer2D.Rasterizer2D_setClip(var2, var3, var4, var5); // L: 9349 + Rasterizer3D.Rasterizer3D_setClipFromRasterizer2D(); // L: 9350 + } + + if (Client.isResizable || Client.field860[var11] || Client.gameDrawingMode > 1) { // L: 9352 + if (var10.type == 0 && !var10.isIf3 && var10.scrollHeight > var10.height) { // L: 9353 9354 + class32.drawScrollBar(var12 + var10.width, var13, var10.scrollY, var10.height, var10.scrollHeight); + } + + if (var10.type != 1) { // L: 9356 + int var23; + int var24; + int var25; + int var26; + if (var10.type == 2) { // L: 9359 + var19 = 0; // L: 9360 + + for (var20 = 0; var20 < var10.rawHeight; ++var20) { // L: 9361 + for (var21 = 0; var21 < var10.rawWidth; ++var21) { // L: 9362 + var22 = var12 + var21 * (var10.paddingX + 32); // L: 9363 + var23 = var20 * (var10.paddingY + 32) + var13; // L: 9364 + if (var19 < 20) { // L: 9365 + var22 += var10.inventoryXOffsets[var19]; // L: 9366 + var23 += var10.inventoryYOffsets[var19]; // L: 9367 + } + + if (var10.itemIds[var19] <= 0) { // L: 9369 + if (var10.inventorySprites != null && var19 < 20) { // L: 9414 + SpritePixels var46 = var10.getInventorySprite(var19); // L: 9415 + if (var46 != null) { // L: 9416 + var46.drawTransBgAt(var22, var23); + } else if (Widget.field2956) { // L: 9417 + WorldMapCacheName.invalidateWidget(var10); + } + } + } else { + boolean var37 = false; // L: 9370 + boolean var38 = false; // L: 9371 + var26 = var10.itemIds[var19] - 1; // L: 9372 + if (var22 + 32 > var2 && var22 < var4 && var23 + 32 > var3 && var23 < var5 || var10 == Script.dragInventoryWidget && var19 == Client.dragItemSlotSource) { // L: 9373 + SpritePixels var35; + if (Client.isItemSelected == 1 && var19 == ClanChannelMember.selectedItemSlot && var10.id == Player.selectedItemWidget) { // L: 9375 + var35 = ModelData0.getItemSprite(var26, var10.itemQuantities[var19], 2, 0, 2, false); + } else { + var35 = ModelData0.getItemSprite(var26, var10.itemQuantities[var19], 1, 3153952, 2, false); // L: 9376 + } + + if (var35 != null) { // L: 9377 + if (var10 == Script.dragInventoryWidget && var19 == Client.dragItemSlotSource) { // L: 9378 + var24 = MouseHandler.MouseHandler_x - Client.draggedWidgetX; // L: 9379 + var25 = MouseHandler.MouseHandler_y - Client.draggedWidgetY; // L: 9380 + if (var24 < 5 && var24 > -5) { // L: 9381 + var24 = 0; + } + + if (var25 < 5 && var25 > -5) { // L: 9382 + var25 = 0; + } + + if (Client.itemDragDuration < 5) { // L: 9383 + var24 = 0; // L: 9384 + var25 = 0; // L: 9385 + } + + var35.drawTransAt(var24 + var22, var23 + var25, 128); // L: 9387 + if (var1 != -1) { // L: 9388 + Widget var28 = var0[var1 & 65535]; // L: 9389 + int var29; + if (var23 + var25 < Rasterizer2D.Rasterizer2D_yClipStart && var28.scrollY > 0) { // L: 9390 + var29 = (Rasterizer2D.Rasterizer2D_yClipStart - var23 - var25) * Client.field913 / 3; // L: 9391 + if (var29 > Client.field913 * 10) { // L: 9392 + var29 = Client.field913 * 10; + } + + if (var29 > var28.scrollY) { // L: 9393 + var29 = var28.scrollY; + } + + var28.scrollY -= var29; // L: 9394 + Client.draggedWidgetY += var29; // L: 9395 + WorldMapCacheName.invalidateWidget(var28); // L: 9396 + } + + if (var25 + var23 + 32 > Rasterizer2D.Rasterizer2D_yClipEnd && var28.scrollY < var28.scrollHeight - var28.height) { // L: 9398 + var29 = (var23 + var25 + 32 - Rasterizer2D.Rasterizer2D_yClipEnd) * Client.field913 / 3; // L: 9399 + if (var29 > Client.field913 * 10) { // L: 9400 + var29 = Client.field913 * 10; + } + + if (var29 > var28.scrollHeight - var28.height - var28.scrollY) { // L: 9401 + var29 = var28.scrollHeight - var28.height - var28.scrollY; + } + + var28.scrollY += var29; // L: 9402 + Client.draggedWidgetY -= var29; // L: 9403 + WorldMapCacheName.invalidateWidget(var28); // L: 9404 + } + } + } else if (var10 == GrandExchangeEvents.field3626 && var19 == Client.field841) { // L: 9408 + var35.drawTransAt(var22, var23, 128); + } else { + var35.drawTransBgAt(var22, var23); // L: 9409 + } + } else { + WorldMapCacheName.invalidateWidget(var10); // L: 9411 + } + } + } + + ++var19; // L: 9419 + } + } + } else if (var10.type == 3) { // L: 9424 + if (InvDefinition.runCs1(var10)) { // L: 9426 + var19 = var10.color2; // L: 9427 + if (var10 == World.mousedOverWidgetIf1 && var10.mouseOverColor2 != 0) { // L: 9428 + var19 = var10.mouseOverColor2; + } + } else { + var19 = var10.color; // L: 9431 + if (var10 == World.mousedOverWidgetIf1 && var10.mouseOverColor != 0) { // L: 9432 + var19 = var10.mouseOverColor; + } + } + + if (var10.fill) { // L: 9434 + switch(var10.fillMode.field4230) { // L: 9435 + case 1: + Rasterizer2D.Rasterizer2D_fillRectangleGradient(var12, var13, var10.width, var10.height, var10.color, var10.color2); // L: 9437 + break; // L: 9438 + case 2: + Rasterizer2D.Rasterizer2D_fillRectangleGradientAlpha(var12, var13, var10.width, var10.height, var10.color, var10.color2, 255 - (var10.transparencyTop & 255), 255 - (var10.transparencyBot & 255)); // L: 9444 + break; // L: 9445 + default: + if (var14 == 0) { // L: 9440 + Rasterizer2D.Rasterizer2D_fillRectangle(var12, var13, var10.width, var10.height, var19); + } else { + Rasterizer2D.Rasterizer2D_fillRectangleAlpha(var12, var13, var10.width, var10.height, var19, 256 - (var14 & 255)); // L: 9441 + } + } + } else if (var14 == 0) { // L: 9449 + Rasterizer2D.Rasterizer2D_drawRectangle(var12, var13, var10.width, var10.height, var19); + } else { + Rasterizer2D.Rasterizer2D_drawRectangleAlpha(var12, var13, var10.width, var10.height, var19, 256 - (var14 & 255)); // L: 9450 + } + } else { + Font var39; + if (var10.type == 4) { // L: 9454 + var39 = var10.getFont(); // L: 9455 + if (var39 == null) { // L: 9456 + if (Widget.field2956) { // L: 9457 + WorldMapCacheName.invalidateWidget(var10); + } + } else { + String var44 = var10.text; // L: 9461 + if (InvDefinition.runCs1(var10)) { // L: 9462 + var20 = var10.color2; // L: 9463 + if (var10 == World.mousedOverWidgetIf1 && var10.mouseOverColor2 != 0) { // L: 9464 + var20 = var10.mouseOverColor2; + } + + if (var10.text2.length() > 0) { // L: 9465 + var44 = var10.text2; + } + } else { + var20 = var10.color; // L: 9468 + if (var10 == World.mousedOverWidgetIf1 && var10.mouseOverColor != 0) { // L: 9469 + var20 = var10.mouseOverColor; + } + } + + if (var10.isIf3 && var10.itemId != -1) { // L: 9471 + ItemComposition var45 = class260.ItemDefinition_get(var10.itemId); // L: 9472 + var44 = var45.name; // L: 9473 + if (var44 == null) { // L: 9474 + var44 = "null"; + } + + if ((var45.isStackable == 1 || var10.itemQuantity != 1) && var10.itemQuantity != -1) { // L: 9475 + var44 = class44.colorStartTag(16748608) + var44 + "" + " " + 'x' + UserComparator3.formatItemStacks(var10.itemQuantity); + } + } + + if (var10 == Client.meslayerContinueWidget) { // L: 9477 + var44 = "Please wait..."; // L: 9478 + var20 = var10.color; // L: 9479 + } + + if (!var10.isIf3) { // L: 9481 + var44 = JagexCache.method2540(var44, var10); + } + + var39.drawLines(var44, var12, var13, var10.width, var10.height, var20, var10.textShadowed ? 0 : -1, var10.textXAlignment, var10.textYAlignment, var10.textLineHeight); // L: 9482 + } + } else if (var10.type == 5) { // L: 9485 + SpritePixels var40; + if (!var10.isIf3) { // L: 9486 + var40 = var10.getSprite(InvDefinition.runCs1(var10)); // L: 9487 + if (var40 != null) { // L: 9488 + var40.drawTransBgAt(var12, var13); + } else if (Widget.field2956) { // L: 9489 + WorldMapCacheName.invalidateWidget(var10); + } + } else { + if (var10.itemId != -1) { // L: 9493 + var40 = ModelData0.getItemSprite(var10.itemId, var10.itemQuantity, var10.outline, var10.spriteShadow, var10.itemQuantityMode, false); + } else { + var40 = var10.getSprite(false); // L: 9494 + } + + if (var40 == null) { // L: 9495 + if (Widget.field2956) { // L: 9519 + WorldMapCacheName.invalidateWidget(var10); + } + } else { + var20 = var40.width; // L: 9496 + var21 = var40.height; // L: 9497 + if (!var10.spriteTiling) { // L: 9498 + var22 = var10.width * 4096 / var20; // L: 9512 + if (var10.spriteAngle != 0) { // L: 9513 + var40.method6991(var10.width / 2 + var12, var10.height / 2 + var13, var10.spriteAngle, var22); + } else if (var14 != 0) { // L: 9514 + var40.drawTransScaledAt(var12, var13, var10.width, var10.height, 256 - (var14 & 255)); + } else if (var20 == var10.width && var21 == var10.height) { // L: 9515 + var40.drawTransBgAt(var12, var13); // L: 9516 + } else { + var40.drawScaledAt(var12, var13, var10.width, var10.height); + } + } else { + Rasterizer2D.Rasterizer2D_expandClip(var12, var13, var12 + var10.width, var13 + var10.height); // L: 9499 + var22 = (var20 - 1 + var10.width) / var20; // L: 9500 + var23 = (var21 - 1 + var10.height) / var21; // L: 9501 + + for (var24 = 0; var24 < var22; ++var24) { // L: 9502 + for (var25 = 0; var25 < var23; ++var25) { // L: 9503 + if (var10.spriteAngle != 0) { // L: 9504 + var40.method6991(var20 / 2 + var12 + var24 * var20, var21 / 2 + var13 + var25 * var21, var10.spriteAngle, 4096); + } else if (var14 != 0) { // L: 9505 + var40.drawTransAt(var12 + var24 * var20, var13 + var21 * var25, 256 - (var14 & 255)); + } else { + var40.drawTransBgAt(var12 + var24 * var20, var13 + var21 * var25); // L: 9506 + } + } + } + + Rasterizer2D.Rasterizer2D_setClip(var2, var3, var4, var5); // L: 9509 + } + } + } + } else { + ItemComposition var33; + if (var10.type == 6) { // L: 9523 + boolean var36 = InvDefinition.runCs1(var10); // L: 9524 + if (var36) { // L: 9526 + var20 = var10.sequenceId2; + } else { + var20 = var10.sequenceId; // L: 9527 + } + + Model var41 = null; // L: 9528 + var22 = 0; // L: 9529 + if (var10.itemId != -1) { // L: 9530 + var33 = class260.ItemDefinition_get(var10.itemId); // L: 9531 + if (var33 != null) { // L: 9532 + var33 = var33.getCountObj(var10.itemQuantity); // L: 9533 + var41 = var33.getModel(1); // L: 9534 + if (var41 != null) { // L: 9535 + var41.calculateBoundsCylinder(); // L: 9536 + var22 = var41.height / 2; // L: 9537 + } else { + WorldMapCacheName.invalidateWidget(var10); // L: 9539 + } + } + } else if (var10.modelType == 5) { // L: 9542 + if (var10.modelId == 0) { // L: 9543 + var41 = Client.playerAppearance.getModel((SequenceDefinition)null, -1, (SequenceDefinition)null, -1); + } else { + var41 = class93.localPlayer.getModel(); // L: 9544 + } + } else if (var20 == -1) { // L: 9546 + var41 = var10.getModel((SequenceDefinition)null, -1, var36, class93.localPlayer.appearance); // L: 9547 + if (var41 == null && Widget.field2956) { // L: 9548 + WorldMapCacheName.invalidateWidget(var10); + } + } else { + SequenceDefinition var47 = LoginScreenAnimation.SequenceDefinition_get(var20); // L: 9551 + var41 = var10.getModel(var47, var10.modelFrame, var36, class93.localPlayer.appearance); // L: 9552 + if (var41 == null && Widget.field2956) { // L: 9553 + WorldMapCacheName.invalidateWidget(var10); + } + } + + Rasterizer3D.method3848(var10.width / 2 + var12, var10.height / 2 + var13); // L: 9555 + var23 = Rasterizer3D.Rasterizer3D_sine[var10.modelAngleX] * var10.modelZoom >> 16; // L: 9556 + var24 = Rasterizer3D.Rasterizer3D_cosine[var10.modelAngleX] * var10.modelZoom >> 16; // L: 9557 + if (var41 != null) { // L: 9558 + if (!var10.isIf3) { // L: 9559 + var41.method4217(0, var10.modelAngleY, 0, var10.modelAngleX, 0, var23, var24); + } else { + var41.calculateBoundsCylinder(); // L: 9561 + if (var10.modelOrthog) { // L: 9562 + var41.method4209(0, var10.modelAngleY, var10.modelAngleZ, var10.modelAngleX, var10.modelOffsetX, var22 + var23 + var10.modelOffsetY, var24 + var10.modelOffsetY, var10.modelZoom); + } else { + var41.method4217(0, var10.modelAngleY, var10.modelAngleZ, var10.modelAngleX, var10.modelOffsetX, var23 + var22 + var10.modelOffsetY, var24 + var10.modelOffsetY); // L: 9563 + } + } + } + + Rasterizer3D.Rasterizer3D_method3(); // L: 9566 + } else { + if (var10.type == 7) { // L: 9569 + var39 = var10.getFont(); // L: 9570 + if (var39 == null) { // L: 9571 + if (Widget.field2956) { // L: 9572 + WorldMapCacheName.invalidateWidget(var10); + } + continue; + } + + var20 = 0; // L: 9575 + + for (var21 = 0; var21 < var10.rawHeight; ++var21) { // L: 9576 + for (var22 = 0; var22 < var10.rawWidth; ++var22) { // L: 9577 + if (var10.itemIds[var20] > 0) { // L: 9578 + var33 = class260.ItemDefinition_get(var10.itemIds[var20] - 1); // L: 9579 + String var34; + if (var33.isStackable != 1 && var10.itemQuantities[var20] == 1) { // L: 9581 + var34 = class44.colorStartTag(16748608) + var33.name + ""; + } else { + var34 = class44.colorStartTag(16748608) + var33.name + "" + " " + 'x' + UserComparator3.formatItemStacks(var10.itemQuantities[var20]); // L: 9582 + } + + var25 = var22 * (var10.paddingX + 115) + var12; // L: 9583 + var26 = var21 * (var10.paddingY + 12) + var13; // L: 9584 + if (var10.textXAlignment == 0) { // L: 9585 + var39.draw(var34, var25, var26, var10.color, var10.textShadowed ? 0 : -1); + } else if (var10.textXAlignment == 1) { // L: 9586 + var39.drawCentered(var34, var10.width / 2 + var25, var26, var10.color, var10.textShadowed ? 0 : -1); + } else { + var39.drawRightAligned(var34, var25 + var10.width - 1, var26, var10.color, var10.textShadowed ? 0 : -1); // L: 9587 + } + } + + ++var20; // L: 9589 + } + } + } + + if (var10.type == 8 && var10 == ReflectionCheck.field609 && Client.field833 == Client.field792) { // L: 9593 9594 + var19 = 0; // L: 9595 + var20 = 0; // L: 9596 + Font var31 = UserComparator3.fontPlain12; // L: 9597 + String var32 = var10.text; // L: 9598 + + String var43; + for (var32 = JagexCache.method2540(var32, var10); var32.length() > 0; var20 = var20 + var31.ascent + 1) { // L: 9600 9601 9613 + var24 = var32.indexOf("
"); // L: 9602 + if (var24 != -1) { // L: 9603 + var43 = var32.substring(0, var24); // L: 9604 + var32 = var32.substring(var24 + 4); // L: 9605 + } else { + var43 = var32; // L: 9608 + var32 = ""; // L: 9609 + } + + var25 = var31.stringWidth(var43); // L: 9611 + if (var25 > var19) { // L: 9612 + var19 = var25; + } + } + + var19 += 6; // L: 9615 + var20 += 7; // L: 9616 + var24 = var12 + var10.width - 5 - var19; // L: 9617 + var25 = var13 + var10.height + 5; // L: 9618 + if (var24 < var12 + 5) { // L: 9619 + var24 = var12 + 5; + } + + if (var19 + var24 > var4) { // L: 9620 + var24 = var4 - var19; + } + + if (var25 + var20 > var5) { // L: 9621 + var25 = var5 - var20; + } + + Rasterizer2D.Rasterizer2D_fillRectangle(var24, var25, var19, var20, 16777120); // L: 9622 + Rasterizer2D.Rasterizer2D_drawRectangle(var24, var25, var19, var20, 0); // L: 9623 + var32 = var10.text; // L: 9624 + var26 = var25 + var31.ascent + 2; // L: 9625 + + for (var32 = JagexCache.method2540(var32, var10); var32.length() > 0; var26 = var26 + var31.ascent + 1) { // L: 9626 9627 9638 + int var27 = var32.indexOf("
"); // L: 9628 + if (var27 != -1) { // L: 9629 + var43 = var32.substring(0, var27); // L: 9630 + var32 = var32.substring(var27 + 4); // L: 9631 + } else { + var43 = var32; // L: 9634 + var32 = ""; // L: 9635 + } + + var31.draw(var43, var24 + 3, var26, 0, -1); // L: 9637 + } + } + + if (var10.type == 9) { // L: 9642 + if (var10.field2992) { // L: 9647 + var19 = var12; // L: 9648 + var20 = var13 + var10.height; // L: 9649 + var21 = var12 + var10.width; // L: 9650 + var22 = var13; // L: 9651 + } else { + var19 = var12; // L: 9654 + var20 = var13; // L: 9655 + var21 = var12 + var10.width; // L: 9656 + var22 = var13 + var10.height; // L: 9657 + } + + if (var10.lineWid == 1) { // L: 9659 + Rasterizer2D.Rasterizer2D_drawLine(var19, var20, var21, var22, var10.color); // L: 9660 + } else { + ClanChannel.method36(var19, var20, var21, var22, var10.color, var10.lineWid); // L: 9663 + } + } + } + } + } + } + } + } } } } - } + + } // L: 9668 } diff --git a/runescape-client/src/main/java/class304.java b/runescape-client/src/main/java/class304.java new file mode 100644 index 0000000000..5652373e5a --- /dev/null +++ b/runescape-client/src/main/java/class304.java @@ -0,0 +1,152 @@ +import net.runelite.mapping.ObfuscatedName; +import net.runelite.mapping.ObfuscatedSignature; +import net.runelite.rs.ScriptOpcodes; + +@ObfuscatedName("kw") +public class class304 { + @ObfuscatedName("ab") + @ObfuscatedSignature( + descriptor = "(ILcf;ZI)I", + garbageValue = "1682823323" + ) + static int method5528(int var0, Script var1, boolean var2) { + int var3; + if (var0 == ScriptOpcodes.STOCKMARKET_GETOFFERTYPE) { // L: 2604 + var3 = Interpreter.Interpreter_intStack[--class44.Interpreter_intStackSize]; // L: 2605 + Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = Client.grandExchangeOffers[var3].type(); // L: 2606 + return 1; // L: 2607 + } else if (var0 == ScriptOpcodes.STOCKMARKET_GETOFFERITEM) { // L: 2609 + var3 = Interpreter.Interpreter_intStack[--class44.Interpreter_intStackSize]; // L: 2610 + Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = Client.grandExchangeOffers[var3].id; // L: 2611 + return 1; // L: 2612 + } else if (var0 == ScriptOpcodes.STOCKMARKET_GETOFFERPRICE) { // L: 2614 + var3 = Interpreter.Interpreter_intStack[--class44.Interpreter_intStackSize]; // L: 2615 + Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = Client.grandExchangeOffers[var3].unitPrice; // L: 2616 + return 1; // L: 2617 + } else if (var0 == ScriptOpcodes.STOCKMARKET_GETOFFERCOUNT) { // L: 2619 + var3 = Interpreter.Interpreter_intStack[--class44.Interpreter_intStackSize]; // L: 2620 + Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = Client.grandExchangeOffers[var3].totalQuantity; // L: 2621 + return 1; // L: 2622 + } else if (var0 == ScriptOpcodes.STOCKMARKET_GETOFFERCOMPLETEDCOUNT) { // L: 2624 + var3 = Interpreter.Interpreter_intStack[--class44.Interpreter_intStackSize]; // L: 2625 + Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = Client.grandExchangeOffers[var3].currentQuantity; // L: 2626 + return 1; // L: 2627 + } else if (var0 == ScriptOpcodes.STOCKMARKET_GETOFFERCOMPLETEDGOLD) { // L: 2629 + var3 = Interpreter.Interpreter_intStack[--class44.Interpreter_intStackSize]; // L: 2630 + Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = Client.grandExchangeOffers[var3].currentPrice; // L: 2631 + return 1; // L: 2632 + } else { + int var13; + if (var0 == ScriptOpcodes.STOCKMARKET_ISOFFEREMPTY) { // L: 2634 + var3 = Interpreter.Interpreter_intStack[--class44.Interpreter_intStackSize]; // L: 2635 + var13 = Client.grandExchangeOffers[var3].status(); // L: 2636 + Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = var13 == 0 ? 1 : 0; // L: 2637 + return 1; // L: 2638 + } else if (var0 == ScriptOpcodes.STOCKMARKET_ISOFFERSTABLE) { // L: 2640 + var3 = Interpreter.Interpreter_intStack[--class44.Interpreter_intStackSize]; // L: 2641 + var13 = Client.grandExchangeOffers[var3].status(); // L: 2642 + Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = var13 == 2 ? 1 : 0; // L: 2643 + return 1; // L: 2644 + } else if (var0 == ScriptOpcodes.STOCKMARKET_ISOFFERFINISHED) { // L: 2646 + var3 = Interpreter.Interpreter_intStack[--class44.Interpreter_intStackSize]; // L: 2647 + var13 = Client.grandExchangeOffers[var3].status(); // L: 2648 + Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = var13 == 5 ? 1 : 0; // L: 2649 + return 1; // L: 2650 + } else if (var0 == ScriptOpcodes.STOCKMARKET_ISOFFERADDING) { // L: 2652 + var3 = Interpreter.Interpreter_intStack[--class44.Interpreter_intStackSize]; // L: 2653 + var13 = Client.grandExchangeOffers[var3].status(); // L: 2654 + Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = var13 == 1 ? 1 : 0; // L: 2655 + return 1; // L: 2656 + } else { + boolean var12; + if (var0 == ScriptOpcodes.TRADINGPOST_SORTBY_NAME) { // L: 2658 + var12 = Interpreter.Interpreter_intStack[--class44.Interpreter_intStackSize] == 1; // L: 2659 + if (BuddyRankComparator.grandExchangeEvents != null) { // L: 2660 + BuddyRankComparator.grandExchangeEvents.sort(GrandExchangeEvents.GrandExchangeEvents_nameComparator, var12); // L: 2661 + } + + return 1; // L: 2663 + } else if (var0 == ScriptOpcodes.TRADINGPOST_SORTBY_PRICE) { // L: 2665 + var12 = Interpreter.Interpreter_intStack[--class44.Interpreter_intStackSize] == 1; // L: 2666 + if (BuddyRankComparator.grandExchangeEvents != null) { // L: 2667 + BuddyRankComparator.grandExchangeEvents.sort(GrandExchangeEvents.GrandExchangeEvents_priceComparator, var12); // L: 2668 + } + + return 1; // L: 2670 + } else if (var0 == ScriptOpcodes.TRADINGPOST_SORTFILTERBY_WORLD) { // L: 2672 + class44.Interpreter_intStackSize -= 2; // L: 2673 + var12 = Interpreter.Interpreter_intStack[class44.Interpreter_intStackSize] == 1; // L: 2674 + boolean var11 = Interpreter.Interpreter_intStack[class44.Interpreter_intStackSize + 1] == 1; // L: 2675 + if (BuddyRankComparator.grandExchangeEvents != null) { // L: 2676 + Client.GrandExchangeEvents_worldComparator.filterWorlds = var11; // L: 2677 + BuddyRankComparator.grandExchangeEvents.sort(Client.GrandExchangeEvents_worldComparator, var12); // L: 2678 + } + + return 1; // L: 2680 + } else if (var0 == ScriptOpcodes.TRADINGPOST_SORTBY_AGE) { // L: 2682 + var12 = Interpreter.Interpreter_intStack[--class44.Interpreter_intStackSize] == 1; // L: 2683 + if (BuddyRankComparator.grandExchangeEvents != null) { // L: 2684 + BuddyRankComparator.grandExchangeEvents.sort(GrandExchangeEvents.GrandExchangeEvents_ageComparator, var12); // L: 2685 + } + + return 1; // L: 2687 + } else if (var0 == ScriptOpcodes.TRADINGPOST_SORTBY_COUNT) { // L: 2689 + var12 = Interpreter.Interpreter_intStack[--class44.Interpreter_intStackSize] == 1; // L: 2690 + if (BuddyRankComparator.grandExchangeEvents != null) { // L: 2691 + BuddyRankComparator.grandExchangeEvents.sort(GrandExchangeEvents.GrandExchangeEvents_quantityComparator, var12); // L: 2692 + } + + return 1; // L: 2694 + } else if (var0 == ScriptOpcodes.TRADINGPOST_GETTOTALOFFERS) { // L: 2696 + Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = BuddyRankComparator.grandExchangeEvents == null ? 0 : BuddyRankComparator.grandExchangeEvents.events.size(); // L: 2697 + return 1; // L: 2698 + } else { + GrandExchangeEvent var4; + if (var0 == ScriptOpcodes.TRADINGPOST_GETOFFERWORLD) { // L: 2700 + var3 = Interpreter.Interpreter_intStack[--class44.Interpreter_intStackSize]; // L: 2701 + var4 = (GrandExchangeEvent)BuddyRankComparator.grandExchangeEvents.events.get(var3); // L: 2702 + Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = var4.world; // L: 2703 + return 1; // L: 2704 + } else if (var0 == ScriptOpcodes.TRADINGPOST_GETOFFERNAME) { // L: 2706 + var3 = Interpreter.Interpreter_intStack[--class44.Interpreter_intStackSize]; // L: 2707 + var4 = (GrandExchangeEvent)BuddyRankComparator.grandExchangeEvents.events.get(var3); // L: 2708 + Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var4.getOfferName(); // L: 2709 + return 1; // L: 2710 + } else if (var0 == ScriptOpcodes.TRADINGPOST_GETOFFERPREVIOUSNAME) { // L: 2712 + var3 = Interpreter.Interpreter_intStack[--class44.Interpreter_intStackSize]; // L: 2713 + var4 = (GrandExchangeEvent)BuddyRankComparator.grandExchangeEvents.events.get(var3); // L: 2714 + Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var4.getPreviousOfferName(); // L: 2715 + return 1; // L: 2716 + } else if (var0 == ScriptOpcodes.TRADINGPOST_GETOFFERAGE) { // L: 2718 + var3 = Interpreter.Interpreter_intStack[--class44.Interpreter_intStackSize]; // L: 2719 + var4 = (GrandExchangeEvent)BuddyRankComparator.grandExchangeEvents.events.get(var3); // L: 2720 + long var5 = ObjectComposition.currentTimeMillis() - Widget.field3099 - var4.age; // L: 2721 + int var7 = (int)(var5 / 3600000L); // L: 2722 + int var8 = (int)((var5 - (long)(var7 * 3600000)) / 60000L); // L: 2723 + int var9 = (int)((var5 - (long)(var7 * 3600000) - (long)(var8 * 60000)) / 1000L); // L: 2724 + String var10 = var7 + ":" + var8 / 10 + var8 % 10 + ":" + var9 / 10 + var9 % 10; // L: 2725 + Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var10; // L: 2726 + return 1; // L: 2727 + } else if (var0 == ScriptOpcodes.TRADINGPOST_GETOFFERCOUNT) { // L: 2729 + var3 = Interpreter.Interpreter_intStack[--class44.Interpreter_intStackSize]; // L: 2730 + var4 = (GrandExchangeEvent)BuddyRankComparator.grandExchangeEvents.events.get(var3); // L: 2731 + Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = var4.grandExchangeOffer.totalQuantity; // L: 2732 + return 1; // L: 2733 + } else if (var0 == ScriptOpcodes.TRADINGPOST_GETOFFERPRICE) { // L: 2735 + var3 = Interpreter.Interpreter_intStack[--class44.Interpreter_intStackSize]; // L: 2736 + var4 = (GrandExchangeEvent)BuddyRankComparator.grandExchangeEvents.events.get(var3); // L: 2737 + Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = var4.grandExchangeOffer.unitPrice; // L: 2738 + return 1; // L: 2739 + } else if (var0 == ScriptOpcodes.TRADINGPOST_GETOFFERITEM) { // L: 2741 + var3 = Interpreter.Interpreter_intStack[--class44.Interpreter_intStackSize]; // L: 2742 + var4 = (GrandExchangeEvent)BuddyRankComparator.grandExchangeEvents.events.get(var3); // L: 2743 + Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = var4.grandExchangeOffer.id; // L: 2744 + return 1; // L: 2745 + } else { + return 2; // L: 2747 + } + } + } + } + } +} diff --git a/runescape-client/src/main/java/class305.java b/runescape-client/src/main/java/class305.java index f90de71019..c510b8df53 100644 --- a/runescape-client/src/main/java/class305.java +++ b/runescape-client/src/main/java/class305.java @@ -1,380 +1,44 @@ import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -import net.runelite.rs.ScriptOpcodes; -@ObfuscatedName("kk") +@ObfuscatedName("ku") public final class class305 { - @ObfuscatedName("h") + @ObfuscatedName("v") @Export("base37Table") public static final char[] base37Table; - @ObfuscatedName("c") - static long[] field3775; + @ObfuscatedName("n") + static long[] field3751; static { base37Table = new char[]{'_', 'a', 'b', 'c', 'd', 'e', 'f', 'g', 'h', 'i', 'j', 'k', 'l', 'm', 'n', 'o', 'p', 'q', 'r', 's', 't', 'u', 'v', 'w', 'x', 'y', 'z', '0', '1', '2', '3', '4', '5', '6', '7', '8', '9'}; // L: 4 - field3775 = new long[12]; // L: 5 + field3751 = new long[12]; // L: 5 - for (int var0 = 0; var0 < field3775.length; ++var0) { // L: 8 - field3775[var0] = (long)Math.pow(37.0D, (double)var0); + for (int var0 = 0; var0 < field3751.length; ++var0) { // L: 8 + field3751[var0] = (long)Math.pow(37.0D, (double)var0); } } // L: 9 - @ObfuscatedName("aa") + @ObfuscatedName("kv") @ObfuscatedSignature( - descriptor = "(ILci;ZI)I", - garbageValue = "-1861974997" + descriptor = "(IIB)V", + garbageValue = "28" ) - static int method5411(int var0, Script var1, boolean var2) { - int var3; - if (var0 == 6600) { // L: 3792 - var3 = ParamComposition.Client_plane; // L: 3793 - int var15 = (class35.localPlayer.x >> 7) + JagexCache.baseX; // L: 3794 - int var8 = (class35.localPlayer.y >> 7) + Messages.baseY; // L: 3795 - GrandExchangeOfferAgeComparator.getWorldMap().method5961(var3, var15, var8, true); // L: 3796 - return 1; // L: 3797 - } else { - WorldMapArea var9; - if (var0 == ScriptOpcodes.WORLDMAP_GETMAPNAME) { // L: 3799 - var3 = Interpreter.Interpreter_intStack[--WorldMapCacheName.Interpreter_intStackSize]; // L: 3800 - String var16 = ""; // L: 3801 - var9 = GrandExchangeOfferAgeComparator.getWorldMap().getMapArea(var3); // L: 3802 - if (var9 != null) { // L: 3803 - var16 = var9.getExternalName(); // L: 3804 - } - - Interpreter.Interpreter_stringStack[++class13.Interpreter_stringStackSize - 1] = var16; // L: 3806 - return 1; // L: 3807 - } else if (var0 == ScriptOpcodes.WORLDMAP_SETMAP) { // L: 3809 - var3 = Interpreter.Interpreter_intStack[--WorldMapCacheName.Interpreter_intStackSize]; // L: 3810 - GrandExchangeOfferAgeComparator.getWorldMap().setCurrentMapAreaId(var3); // L: 3811 - return 1; // L: 3812 - } else if (var0 == ScriptOpcodes.WORLDMAP_GETZOOM) { // L: 3814 - Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = GrandExchangeOfferAgeComparator.getWorldMap().getZoomLevel(); // L: 3815 - return 1; // L: 3816 - } else if (var0 == ScriptOpcodes.WORLDMAP_SETZOOM) { // L: 3818 - var3 = Interpreter.Interpreter_intStack[--WorldMapCacheName.Interpreter_intStackSize]; // L: 3819 - GrandExchangeOfferAgeComparator.getWorldMap().setZoomPercentage(var3); // L: 3820 - return 1; // L: 3821 - } else if (var0 == ScriptOpcodes.WORLDMAP_ISLOADED) { // L: 3823 - Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = GrandExchangeOfferAgeComparator.getWorldMap().isCacheLoaded() ? 1 : 0; // L: 3824 - return 1; // L: 3825 - } else { - Coord var14; - if (var0 == ScriptOpcodes.WORLDMAP_JUMPTODISPLAYCOORD) { // L: 3827 - var14 = new Coord(Interpreter.Interpreter_intStack[--WorldMapCacheName.Interpreter_intStackSize]); // L: 3828 - GrandExchangeOfferAgeComparator.getWorldMap().setWorldMapPositionTarget(var14.x, var14.y); // L: 3829 - return 1; // L: 3830 - } else if (var0 == ScriptOpcodes.WORLDMAP_JUMPTODISPLAYCOORD_INSTANT) { // L: 3832 - var14 = new Coord(Interpreter.Interpreter_intStack[--WorldMapCacheName.Interpreter_intStackSize]); // L: 3833 - GrandExchangeOfferAgeComparator.getWorldMap().setWorldMapPositionTargetInstant(var14.x, var14.y); // L: 3834 - return 1; // L: 3835 - } else if (var0 == ScriptOpcodes.WORLDMAP_JUMPTOSOURCECOORD) { // L: 3837 - var14 = new Coord(Interpreter.Interpreter_intStack[--WorldMapCacheName.Interpreter_intStackSize]); // L: 3838 - GrandExchangeOfferAgeComparator.getWorldMap().jumpToSourceCoord(var14.plane, var14.x, var14.y); // L: 3839 - return 1; // L: 3840 - } else if (var0 == ScriptOpcodes.WORLDMAP_JUMPTOSOURCECOORD_INSTANT) { // L: 3842 - var14 = new Coord(Interpreter.Interpreter_intStack[--WorldMapCacheName.Interpreter_intStackSize]); // L: 3843 - GrandExchangeOfferAgeComparator.getWorldMap().jumpToSourceCoordInstant(var14.plane, var14.x, var14.y); // L: 3844 - return 1; // L: 3845 - } else if (var0 == ScriptOpcodes.WORLDMAP_GETDISPLAYPOSITION) { // L: 3847 - Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = GrandExchangeOfferAgeComparator.getWorldMap().getDisplayX(); // L: 3848 - Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = GrandExchangeOfferAgeComparator.getWorldMap().getDisplayY(); // L: 3849 - return 1; // L: 3850 - } else { - WorldMapArea var11; - if (var0 == ScriptOpcodes.WORLDMAP_GETCONFIGORIGIN) { // L: 3852 - var3 = Interpreter.Interpreter_intStack[--WorldMapCacheName.Interpreter_intStackSize]; // L: 3853 - var11 = GrandExchangeOfferAgeComparator.getWorldMap().getMapArea(var3); // L: 3854 - if (var11 == null) { // L: 3855 - Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = 0; // L: 3856 - } else { - Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = var11.getOrigin().packed(); // L: 3859 - } - - return 1; // L: 3861 - } else if (var0 == ScriptOpcodes.WORLDMAP_GETCONFIGSIZE) { // L: 3863 - var3 = Interpreter.Interpreter_intStack[--WorldMapCacheName.Interpreter_intStackSize]; // L: 3864 - var11 = GrandExchangeOfferAgeComparator.getWorldMap().getMapArea(var3); // L: 3865 - if (var11 == null) { // L: 3866 - Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = 0; // L: 3867 - Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = 0; // L: 3868 - } else { - Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = (var11.getRegionHighX() - var11.getRegionLowX() + 1) * 64; // L: 3871 - Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = (var11.getRegionHighY() - var11.getRegionLowY() + 1) * 64; // L: 3872 - } - - return 1; // L: 3874 - } else if (var0 == ScriptOpcodes.WORLDMAP_GETCONFIGBOUNDS) { // L: 3876 - var3 = Interpreter.Interpreter_intStack[--WorldMapCacheName.Interpreter_intStackSize]; // L: 3877 - var11 = GrandExchangeOfferAgeComparator.getWorldMap().getMapArea(var3); // L: 3878 - if (var11 == null) { // L: 3879 - Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = 0; // L: 3880 - Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = 0; // L: 3881 - Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = 0; // L: 3882 - Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = 0; // L: 3883 - } else { - Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = var11.getRegionLowX() * 64; // L: 3886 - Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = var11.getRegionLowY() * 64; // L: 3887 - Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = var11.getRegionHighX() * 64 + 64 - 1; // L: 3888 - Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = var11.getRegionHighY() * 64 + 64 - 1; // L: 3889 - } - - return 1; // L: 3891 - } else if (var0 == ScriptOpcodes.WORLDMAP_GETCONFIGZOOM) { // L: 3893 - var3 = Interpreter.Interpreter_intStack[--WorldMapCacheName.Interpreter_intStackSize]; // L: 3894 - var11 = GrandExchangeOfferAgeComparator.getWorldMap().getMapArea(var3); // L: 3895 - if (var11 == null) { // L: 3896 - Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = -1; // L: 3897 - } else { - Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = var11.getZoom(); // L: 3900 - } - - return 1; // L: 3902 - } else if (var0 == 6615) { // L: 3904 - var14 = GrandExchangeOfferAgeComparator.getWorldMap().getDisplayCoord(); // L: 3905 - if (var14 == null) { // L: 3906 - Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = -1; // L: 3907 - Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = -1; // L: 3908 - } else { - Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = var14.x; // L: 3911 - Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = var14.y; // L: 3912 - } - - return 1; // L: 3914 - } else if (var0 == ScriptOpcodes.WORLDMAP_GETCURRENTMAP) { // L: 3916 - Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = GrandExchangeOfferAgeComparator.getWorldMap().currentMapAreaId(); // L: 3917 - return 1; // L: 3918 - } else if (var0 == ScriptOpcodes.WORLDMAP_GETDISPLAYCOORD) { // L: 3920 - var14 = new Coord(Interpreter.Interpreter_intStack[--WorldMapCacheName.Interpreter_intStackSize]); // L: 3921 - var11 = GrandExchangeOfferAgeComparator.getWorldMap().getCurrentMapArea(); // L: 3922 - if (var11 == null) { // L: 3923 - Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = -1; // L: 3924 - Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = -1; // L: 3925 - return 1; // L: 3926 - } else { - int[] var12 = var11.position(var14.plane, var14.x, var14.y); // L: 3928 - if (var12 == null) { // L: 3929 - Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = -1; // L: 3930 - Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = -1; // L: 3931 - } else { - Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = var12[0]; // L: 3934 - Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = var12[1]; // L: 3935 - } - - return 1; // L: 3937 - } - } else { - Coord var5; - if (var0 == 6618) { // L: 3939 - var14 = new Coord(Interpreter.Interpreter_intStack[--WorldMapCacheName.Interpreter_intStackSize]); // L: 3940 - var11 = GrandExchangeOfferAgeComparator.getWorldMap().getCurrentMapArea(); // L: 3941 - if (var11 == null) { // L: 3942 - Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = -1; // L: 3943 - Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = -1; // L: 3944 - return 1; // L: 3945 - } else { - var5 = var11.coord(var14.x, var14.y); // L: 3947 - if (var5 == null) { // L: 3948 - Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = -1; // L: 3949 - } else { - Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = var5.packed(); // L: 3952 - } - - return 1; // L: 3954 - } - } else { - Coord var10; - if (var0 == 6619) { // L: 3956 - WorldMapCacheName.Interpreter_intStackSize -= 2; // L: 3957 - var3 = Interpreter.Interpreter_intStack[WorldMapCacheName.Interpreter_intStackSize]; // L: 3958 - var10 = new Coord(Interpreter.Interpreter_intStack[WorldMapCacheName.Interpreter_intStackSize + 1]); // L: 3959 - WorldMapDecorationType.method4776(var3, var10, false); // L: 3960 - return 1; // L: 3961 - } else if (var0 == 6620) { // L: 3963 - WorldMapCacheName.Interpreter_intStackSize -= 2; // L: 3964 - var3 = Interpreter.Interpreter_intStack[WorldMapCacheName.Interpreter_intStackSize]; // L: 3965 - var10 = new Coord(Interpreter.Interpreter_intStack[WorldMapCacheName.Interpreter_intStackSize + 1]); // L: 3966 - WorldMapDecorationType.method4776(var3, var10, true); // L: 3967 - return 1; // L: 3968 - } else if (var0 == ScriptOpcodes.WORLDMAP_COORDINMAP) { // L: 3970 - WorldMapCacheName.Interpreter_intStackSize -= 2; // L: 3971 - var3 = Interpreter.Interpreter_intStack[WorldMapCacheName.Interpreter_intStackSize]; // L: 3972 - var10 = new Coord(Interpreter.Interpreter_intStack[WorldMapCacheName.Interpreter_intStackSize + 1]); // L: 3973 - var9 = GrandExchangeOfferAgeComparator.getWorldMap().getMapArea(var3); // L: 3974 - if (var9 == null) { // L: 3975 - Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = 0; // L: 3976 - return 1; // L: 3977 - } else { - Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = var9.containsCoord(var10.plane, var10.x, var10.y) ? 1 : 0; // L: 3979 - return 1; // L: 3980 - } - } else if (var0 == ScriptOpcodes.WORLDMAP_GETSIZE) { // L: 3982 - Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = GrandExchangeOfferAgeComparator.getWorldMap().getDisplayWith(); // L: 3983 - Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = GrandExchangeOfferAgeComparator.getWorldMap().getDisplayHeight(); // L: 3984 - return 1; // L: 3985 - } else if (var0 == 6623) { // L: 3987 - var14 = new Coord(Interpreter.Interpreter_intStack[--WorldMapCacheName.Interpreter_intStackSize]); // L: 3988 - var11 = GrandExchangeOfferAgeComparator.getWorldMap().mapAreaAtCoord(var14.plane, var14.x, var14.y); // L: 3989 - if (var11 == null) { // L: 3990 - Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = -1; // L: 3991 - } else { - Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = var11.getId(); // L: 3994 - } - - return 1; // L: 3996 - } else if (var0 == 6624) { // L: 3998 - GrandExchangeOfferAgeComparator.getWorldMap().setMaxFlashCount(Interpreter.Interpreter_intStack[--WorldMapCacheName.Interpreter_intStackSize]); // L: 3999 - return 1; // L: 4000 - } else if (var0 == 6625) { // L: 4002 - GrandExchangeOfferAgeComparator.getWorldMap().resetMaxFlashCount(); // L: 4003 - return 1; // L: 4004 - } else if (var0 == 6626) { // L: 4006 - GrandExchangeOfferAgeComparator.getWorldMap().setCyclesPerFlash(Interpreter.Interpreter_intStack[--WorldMapCacheName.Interpreter_intStackSize]); // L: 4007 - return 1; // L: 4008 - } else if (var0 == 6627) { // L: 4010 - GrandExchangeOfferAgeComparator.getWorldMap().resetCyclesPerFlash(); // L: 4011 - return 1; // L: 4012 - } else { - boolean var13; - if (var0 == ScriptOpcodes.WORLDMAP_PERPETUALFLASH) { // L: 4014 - var13 = Interpreter.Interpreter_intStack[--WorldMapCacheName.Interpreter_intStackSize] == 1; // L: 4015 - GrandExchangeOfferAgeComparator.getWorldMap().setPerpetualFlash(var13); // L: 4016 - return 1; // L: 4017 - } else if (var0 == ScriptOpcodes.WORLDMAP_FLASHELEMENT) { // L: 4019 - var3 = Interpreter.Interpreter_intStack[--WorldMapCacheName.Interpreter_intStackSize]; // L: 4020 - GrandExchangeOfferAgeComparator.getWorldMap().flashElement(var3); // L: 4021 - return 1; // L: 4022 - } else if (var0 == ScriptOpcodes.WORLDMAP_FLASHELEMENTCATEGORY) { // L: 4024 - var3 = Interpreter.Interpreter_intStack[--WorldMapCacheName.Interpreter_intStackSize]; // L: 4025 - GrandExchangeOfferAgeComparator.getWorldMap().flashCategory(var3); // L: 4026 - return 1; // L: 4027 - } else if (var0 == ScriptOpcodes.WORLDMAP_STOPCURRENTFLASHES) { // L: 4029 - GrandExchangeOfferAgeComparator.getWorldMap().stopCurrentFlashes(); // L: 4030 - return 1; // L: 4031 - } else if (var0 == ScriptOpcodes.WORLDMAP_DISABLEELEMENTS) { // L: 4033 - var13 = Interpreter.Interpreter_intStack[--WorldMapCacheName.Interpreter_intStackSize] == 1; // L: 4034 - GrandExchangeOfferAgeComparator.getWorldMap().setElementsDisabled(var13); // L: 4035 - return 1; // L: 4036 - } else { - boolean var7; - if (var0 == ScriptOpcodes.WORLDMAP_DISABLEELEMENT) { // L: 4038 - WorldMapCacheName.Interpreter_intStackSize -= 2; // L: 4039 - var3 = Interpreter.Interpreter_intStack[WorldMapCacheName.Interpreter_intStackSize]; // L: 4040 - var7 = Interpreter.Interpreter_intStack[WorldMapCacheName.Interpreter_intStackSize + 1] == 1; // L: 4041 - GrandExchangeOfferAgeComparator.getWorldMap().disableElement(var3, var7); // L: 4042 - return 1; // L: 4043 - } else if (var0 == ScriptOpcodes.WORLDMAP_DISABLEELEMENTCATEGORY) { // L: 4045 - WorldMapCacheName.Interpreter_intStackSize -= 2; // L: 4046 - var3 = Interpreter.Interpreter_intStack[WorldMapCacheName.Interpreter_intStackSize]; // L: 4047 - var7 = Interpreter.Interpreter_intStack[WorldMapCacheName.Interpreter_intStackSize + 1] == 1; // L: 4048 - GrandExchangeOfferAgeComparator.getWorldMap().setCategoryDisabled(var3, var7); // L: 4049 - return 1; // L: 4050 - } else if (var0 == ScriptOpcodes.WORLDMAP_GETDISABLEELEMENTS) { // L: 4052 - Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = GrandExchangeOfferAgeComparator.getWorldMap().getElementsDisabled() ? 1 : 0; // L: 4053 - return 1; // L: 4054 - } else if (var0 == ScriptOpcodes.WORLDMAP_GETDISABLEELEMENT) { // L: 4056 - var3 = Interpreter.Interpreter_intStack[--WorldMapCacheName.Interpreter_intStackSize]; // L: 4057 - Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = GrandExchangeOfferAgeComparator.getWorldMap().isElementDisabled(var3) ? 1 : 0; // L: 4058 - return 1; // L: 4059 - } else if (var0 == ScriptOpcodes.WORLDMAP_GETDISABLEELEMENTCATEGORY) { // L: 4061 - var3 = Interpreter.Interpreter_intStack[--WorldMapCacheName.Interpreter_intStackSize]; // L: 4062 - Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = GrandExchangeOfferAgeComparator.getWorldMap().isCategoryDisabled(var3) ? 1 : 0; // L: 4063 - return 1; // L: 4064 - } else if (var0 == 6638) { // L: 4066 - WorldMapCacheName.Interpreter_intStackSize -= 2; // L: 4067 - var3 = Interpreter.Interpreter_intStack[WorldMapCacheName.Interpreter_intStackSize]; // L: 4068 - var10 = new Coord(Interpreter.Interpreter_intStack[WorldMapCacheName.Interpreter_intStackSize + 1]); // L: 4069 - var5 = GrandExchangeOfferAgeComparator.getWorldMap().method6085(var3, var10); // L: 4070 - if (var5 == null) { // L: 4071 - Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = -1; // L: 4072 - } else { - Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = var5.packed(); // L: 4075 - } - - return 1; // L: 4077 - } else { - AbstractWorldMapIcon var6; - if (var0 == ScriptOpcodes.WORLDMAP_LISTELEMENT_START) { // L: 4079 - var6 = GrandExchangeOfferAgeComparator.getWorldMap().iconStart(); // L: 4080 - if (var6 == null) { // L: 4081 - Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = -1; // L: 4082 - Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = -1; // L: 4083 - } else { - Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = var6.getElement(); // L: 4086 - Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = var6.coord2.packed(); // L: 4087 - } - - return 1; // L: 4089 - } else if (var0 == ScriptOpcodes.WORLDMAP_LISTELEMENT_NEXT) { // L: 4091 - var6 = GrandExchangeOfferAgeComparator.getWorldMap().iconNext(); // L: 4092 - if (var6 == null) { // L: 4093 - Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = -1; // L: 4094 - Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = -1; // L: 4095 - } else { - Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = var6.getElement(); // L: 4098 - Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = var6.coord2.packed(); // L: 4099 - } - - return 1; // L: 4101 - } else { - WorldMapElement var4; - if (var0 == ScriptOpcodes.MEC_TEXT) { // L: 4103 - var3 = Interpreter.Interpreter_intStack[--WorldMapCacheName.Interpreter_intStackSize]; // L: 4104 - var4 = WorldMapAreaData.WorldMapElement_get(var3); // L: 4105 - if (var4.name == null) { // L: 4106 - Interpreter.Interpreter_stringStack[++class13.Interpreter_stringStackSize - 1] = ""; // L: 4107 - } else { - Interpreter.Interpreter_stringStack[++class13.Interpreter_stringStackSize - 1] = var4.name; // L: 4110 - } - - return 1; // L: 4112 - } else if (var0 == ScriptOpcodes.MEC_TEXTSIZE) { // L: 4114 - var3 = Interpreter.Interpreter_intStack[--WorldMapCacheName.Interpreter_intStackSize]; // L: 4115 - var4 = WorldMapAreaData.WorldMapElement_get(var3); // L: 4116 - Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = var4.textSize; // L: 4117 - return 1; // L: 4118 - } else if (var0 == ScriptOpcodes.MEC_CATEGORY) { // L: 4120 - var3 = Interpreter.Interpreter_intStack[--WorldMapCacheName.Interpreter_intStackSize]; // L: 4121 - var4 = WorldMapAreaData.WorldMapElement_get(var3); // L: 4122 - if (var4 == null) { // L: 4123 - Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = -1; // L: 4124 - } else { - Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = var4.category; // L: 4127 - } - - return 1; // L: 4129 - } else if (var0 == ScriptOpcodes.MEC_SPRITE) { // L: 4131 - var3 = Interpreter.Interpreter_intStack[--WorldMapCacheName.Interpreter_intStackSize]; // L: 4132 - var4 = WorldMapAreaData.WorldMapElement_get(var3); // L: 4133 - if (var4 == null) { // L: 4134 - Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = -1; // L: 4135 - } else { - Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = var4.sprite1; // L: 4138 - } - - return 1; // L: 4140 - } else if (var0 == ScriptOpcodes.WORLDMAP_ELEMENT) { // L: 4142 - Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = class257.worldMapEvent.mapElement; // L: 4143 - return 1; // L: 4144 - } else if (var0 == 6698) { // L: 4146 - Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = class257.worldMapEvent.coord1.packed(); // L: 4147 - return 1; // L: 4148 - } else if (var0 == ScriptOpcodes.WORLDMAP_ELEMENTCOORD) { // L: 4150 - Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = class257.worldMapEvent.coord2.packed(); // L: 4151 - return 1; // L: 4152 - } else { - return 2; // L: 4154 - } - } - } - } - } - } - } + static final void method5533(int var0, int var1) { + if (Client.currentClanChannels[var0] != null) { // L: 11329 + if (var1 >= 0 && var1 < Client.currentClanChannels[var0].method27()) { // L: 11330 + ClanChannelMember var2 = (ClanChannelMember)Client.currentClanChannels[var0].members.get(var1); // L: 11331 + if (var2.rank == -1) { // L: 11332 + PacketWriter var3 = Client.packetWriter; // L: 11333 + PacketBufferNode var4 = class21.getPacketBufferNode(ClientPacket.field2612, var3.isaacCipher); // L: 11334 + var4.packetBuffer.writeByte(3 + Tiles.stringCp1252NullTerminatedByteSize(var2.name)); // L: 11335 + var4.packetBuffer.writeByte(var0); // L: 11336 + var4.packetBuffer.writeShort(var1); // L: 11337 + var4.packetBuffer.writeStringCp1252NullTerminated(var2.name); // L: 11338 + var3.addNode(var4); // L: 11339 } } } - } + } // L: 11340 } diff --git a/runescape-client/src/main/java/class306.java b/runescape-client/src/main/java/class306.java index ac36084c05..ba89fe0335 100644 --- a/runescape-client/src/main/java/class306.java +++ b/runescape-client/src/main/java/class306.java @@ -1,9 +1,9 @@ import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedName; -@ObfuscatedName("kw") +@ObfuscatedName("kb") public class class306 { - @ObfuscatedName("h") + @ObfuscatedName("v") @Export("writeRandomDat") public static void writeRandomDat(byte[] var0, int var1, byte[] var2, int var3, int var4) { if (var2 == var0) { // L: 12 @@ -51,7 +51,7 @@ public class class306 { } // L: 49 - @ObfuscatedName("q") + @ObfuscatedName("s") @Export("clearIntArray") public static void clearIntArray(int[] var0, int var1, int var2) { for (var2 = var2 + var1 - 7; var1 < var2; var0[var1++] = 0) { // L: 364 365 373 diff --git a/runescape-client/src/main/java/class308.java b/runescape-client/src/main/java/class308.java index 3be00691d7..bad352e425 100644 --- a/runescape-client/src/main/java/class308.java +++ b/runescape-client/src/main/java/class308.java @@ -2,82 +2,12 @@ import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("km") +@ObfuscatedName("kf") public class class308 { - @ObfuscatedName("e") + @ObfuscatedName("qm") @ObfuscatedSignature( - descriptor = "Liv;" + descriptor = "Lay;" ) - @Export("scriptDotWidget") - static Widget scriptDotWidget; - - @ObfuscatedName("ku") - @ObfuscatedSignature( - descriptor = "([Liv;IB)V", - garbageValue = "-64" - ) - @Export("drawModelComponents") - static final void drawModelComponents(Widget[] var0, int var1) { - for (int var2 = 0; var2 < var0.length; ++var2) { // L: 11126 - Widget var3 = var0[var2]; // L: 11127 - if (var3 != null && var3.parentId == var1 && (!var3.isIf3 || !class11.isComponentHidden(var3))) { // L: 11128 11129 11130 - int var5; - if (var3.type == 0) { // L: 11131 - if (!var3.isIf3 && class11.isComponentHidden(var3) && var3 != SpriteMask.mousedOverWidgetIf1) { // L: 11132 - continue; - } - - drawModelComponents(var0, var3.id); // L: 11133 - if (var3.children != null) { // L: 11134 - drawModelComponents(var3.children, var3.id); - } - - InterfaceParent var4 = (InterfaceParent)Client.interfaceParents.get((long)var3.id); // L: 11135 - if (var4 != null) { // L: 11136 - var5 = var4.group; // L: 11137 - if (UserComparator8.loadInterface(var5)) { // L: 11139 - drawModelComponents(Widget.Widget_interfaceComponents[var5], -1); // L: 11140 - } - } - } - - if (var3.type == 6) { // L: 11144 - if (var3.sequenceId != -1 || var3.sequenceId2 != -1) { // L: 11145 - boolean var7 = class373.runCs1(var3); // L: 11146 - if (var7) { // L: 11148 - var5 = var3.sequenceId2; - } else { - var5 = var3.sequenceId; // L: 11149 - } - - if (var5 != -1) { // L: 11150 - SequenceDefinition var6 = Player.SequenceDefinition_get(var5); // L: 11151 - - for (var3.modelFrameCycle += Client.field768; var3.modelFrameCycle > var6.frameLengths[var3.modelFrame]; VerticalAlignment.invalidateWidget(var3)) { // L: 11152 11153 11160 - var3.modelFrameCycle -= var6.frameLengths[var3.modelFrame]; // L: 11154 - ++var3.modelFrame; // L: 11155 - if (var3.modelFrame >= var6.frameIds.length) { // L: 11156 - var3.modelFrame -= var6.frameCount; // L: 11157 - if (var3.modelFrame < 0 || var3.modelFrame >= var6.frameIds.length) { // L: 11158 - var3.modelFrame = 0; - } - } - } - } - } - - if (var3.field3020 != 0 && !var3.isIf3) { // L: 11164 - int var8 = var3.field3020 >> 16; // L: 11165 - var5 = var3.field3020 << 16 >> 16; // L: 11166 - var8 *= Client.field768; // L: 11167 - var5 *= Client.field768; // L: 11168 - var3.modelAngleX = var8 + var3.modelAngleX & 2047; // L: 11169 - var3.modelAngleY = var5 + var3.modelAngleY & 2047; // L: 11170 - VerticalAlignment.invalidateWidget(var3); // L: 11171 - } - } - } - } - - } // L: 11175 + @Export("pcmStreamMixer") + static PcmStreamMixer pcmStreamMixer; } diff --git a/runescape-client/src/main/java/class31.java b/runescape-client/src/main/java/class31.java index d22c800fa0..823c006af6 100644 --- a/runescape-client/src/main/java/class31.java +++ b/runescape-client/src/main/java/class31.java @@ -1,11 +1,11 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("at") +@ObfuscatedName("ai") public interface class31 { - @ObfuscatedName("h") + @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "(Lnk;)Lnk;" + descriptor = "(Lnd;)Lnd;" ) - Buffer vmethod358(Buffer var1); + Buffer vmethod297(Buffer var1); } diff --git a/runescape-client/src/main/java/class310.java b/runescape-client/src/main/java/class310.java index eadd980b71..1eb557d730 100644 --- a/runescape-client/src/main/java/class310.java +++ b/runescape-client/src/main/java/class310.java @@ -1,71 +1,13 @@ import net.runelite.mapping.Export; -import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("kf") +@ObfuscatedName("kn") public class class310 { - @ObfuscatedName("a") - @ObfuscatedGetter( - intValue = -180112901 - ) - @Export("cacheGamebuild") - static int cacheGamebuild; - - @ObfuscatedName("c") + @ObfuscatedName("f") @ObfuscatedSignature( - descriptor = "(CI)Z", - garbageValue = "-553080232" + descriptor = "Ljv;" ) - public static final boolean method5484(char var0) { - if (Character.isISOControl(var0)) { // L: 28 - return false; - } else if (class214.isAlphaNumeric(var0)) { // L: 29 - return true; - } else { - char[] var1 = class365.field4106; // L: 31 - - int var2; - char var3; - for (var2 = 0; var2 < var1.length; ++var2) { // L: 32 - var3 = var1[var2]; // L: 33 - if (var0 == var3) { // L: 34 - return true; - } - } - - var1 = class365.field4104; // L: 38 - - for (var2 = 0; var2 < var1.length; ++var2) { // L: 39 - var3 = var1[var2]; // L: 40 - if (var0 == var3) { // L: 41 - return true; - } - } - - return false; // L: 44 - } - } - - @ObfuscatedName("lu") - @ObfuscatedSignature( - descriptor = "(III)V", - garbageValue = "1609458459" - ) - static final void method5485(int var0, int var1) { - if (Client.field847[var0] != null) { // L: 11566 - if (var1 >= 0 && var1 < Client.field847[var0].method39()) { // L: 11567 - class9 var2 = (class9)Client.field847[var0].field32.get(var1); // L: 11568 - if (var2.field76 == -1) { // L: 11569 - PacketWriter var3 = Client.packetWriter; // L: 11570 - PacketBufferNode var4 = HealthBarDefinition.getPacketBufferNode(ClientPacket.field2605, var3.isaacCipher); // L: 11571 - var4.packetBuffer.writeByte(3 + class4.stringCp1252NullTerminatedByteSize(var2.field73)); // L: 11572 - var4.packetBuffer.writeByte(var0); // L: 11573 - var4.packetBuffer.writeShort(var1); // L: 11574 - var4.packetBuffer.writeStringCp1252NullTerminated(var2.field73); // L: 11575 - var3.addNode(var4); // L: 11576 - } - } - } - } // L: 11577 + @Export("ObjectDefinition_modelsArchive") + public static AbstractArchive ObjectDefinition_modelsArchive; } diff --git a/runescape-client/src/main/java/class311.java b/runescape-client/src/main/java/class311.java index 763924bac7..0911688ffa 100644 --- a/runescape-client/src/main/java/class311.java +++ b/runescape-client/src/main/java/class311.java @@ -1,41 +1,20 @@ import net.runelite.mapping.Export; +import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("kg") +@ObfuscatedName("ks") public class class311 { - @ObfuscatedName("fl") - @ObfuscatedSignature( - descriptor = "(IIB)V", - garbageValue = "17" + @ObfuscatedName("f") + @ObfuscatedGetter( + intValue = -617825071 ) - static void method5486(int var0, int var1) { - if (class12.clientPreferences.musicVolume != 0 && var0 != -1) { // L: 3795 - World.method1684(KeyHandler.archive11, var0, 0, class12.clientPreferences.musicVolume, false); // L: 3796 - Client.field866 = true; // L: 3797 - } - - } // L: 3799 - - @ObfuscatedName("ih") + @Export("WorldMapElement_count") + public static int WorldMapElement_count; + @ObfuscatedName("r") @ObfuscatedSignature( - descriptor = "(Ljava/lang/String;Ljava/lang/String;IIIIZI)V", - garbageValue = "2108216334" + descriptor = "Ljv;" ) - @Export("insertMenuItem") - static final void insertMenuItem(String var0, String var1, int var2, int var3, int var4, int var5, boolean var6) { - if (!Client.isMenuOpen) { // L: 9087 - if (Client.menuOptionsCount < 500) { // L: 9088 - Client.menuActions[Client.menuOptionsCount] = var0; // L: 9089 - Client.menuTargets[Client.menuOptionsCount] = var1; // L: 9090 - Client.menuOpcodes[Client.menuOptionsCount] = var2; // L: 9091 - Client.menuIdentifiers[Client.menuOptionsCount] = var3; // L: 9092 - Client.menuArguments1[Client.menuOptionsCount] = var4; // L: 9093 - Client.menuArguments2[Client.menuOptionsCount] = var5; // L: 9094 - Client.menuShiftClick[Client.menuOptionsCount] = var6; // L: 9095 - ++Client.menuOptionsCount; // L: 9096 - } - - } - } // L: 9098 + @Export("ItemDefinition_modelArchive") + public static AbstractArchive ItemDefinition_modelArchive; } diff --git a/runescape-client/src/main/java/class312.java b/runescape-client/src/main/java/class312.java new file mode 100644 index 0000000000..8dfcdf8723 --- /dev/null +++ b/runescape-client/src/main/java/class312.java @@ -0,0 +1,67 @@ +import net.runelite.mapping.ObfuscatedName; +import net.runelite.mapping.ObfuscatedSignature; +import net.runelite.rs.ScriptOpcodes; + +@ObfuscatedName("lr") +public class class312 { + @ObfuscatedName("p") + @ObfuscatedSignature( + descriptor = "(ILcf;ZB)I", + garbageValue = "-9" + ) + static int method5616(int var0, Script var1, boolean var2) { + int var3 = -1; // L: 555 + Widget var4; + if (var0 >= 2000) { // L: 557 + var0 -= 1000; // L: 558 + var3 = Interpreter.Interpreter_intStack[--class44.Interpreter_intStackSize]; // L: 559 + var4 = Frames.getWidget(var3); // L: 560 + } else { + var4 = var2 ? class13.scriptDotWidget : Interpreter.scriptActiveWidget; // L: 562 + } + + if (var0 == ScriptOpcodes.CC_SETPOSITION) { // L: 563 + class44.Interpreter_intStackSize -= 4; // L: 564 + var4.rawX = Interpreter.Interpreter_intStack[class44.Interpreter_intStackSize]; // L: 565 + var4.rawY = Interpreter.Interpreter_intStack[class44.Interpreter_intStackSize + 1]; // L: 566 + var4.xAlignment = Interpreter.Interpreter_intStack[class44.Interpreter_intStackSize + 2]; // L: 567 + var4.yAlignment = Interpreter.Interpreter_intStack[class44.Interpreter_intStackSize + 3]; // L: 568 + WorldMapCacheName.invalidateWidget(var4); // L: 569 + class23.client.alignWidget(var4); // L: 570 + if (var3 != -1 && var4.type == 0) { // L: 571 + class313.revalidateWidgetScroll(Widget.Widget_interfaceComponents[var3 >> 16], var4, false); + } + + return 1; // L: 572 + } else if (var0 == ScriptOpcodes.CC_SETSIZE) { // L: 574 + class44.Interpreter_intStackSize -= 4; // L: 575 + var4.rawWidth = Interpreter.Interpreter_intStack[class44.Interpreter_intStackSize]; // L: 576 + var4.rawHeight = Interpreter.Interpreter_intStack[class44.Interpreter_intStackSize + 1]; // L: 577 + var4.widthAlignment = Interpreter.Interpreter_intStack[class44.Interpreter_intStackSize + 2]; // L: 578 + var4.heightAlignment = Interpreter.Interpreter_intStack[class44.Interpreter_intStackSize + 3]; // L: 579 + WorldMapCacheName.invalidateWidget(var4); // L: 580 + class23.client.alignWidget(var4); // L: 581 + if (var3 != -1 && var4.type == 0) { // L: 582 + class313.revalidateWidgetScroll(Widget.Widget_interfaceComponents[var3 >> 16], var4, false); + } + + return 1; // L: 583 + } else if (var0 == ScriptOpcodes.CC_SETHIDE) { // L: 585 + boolean var5 = Interpreter.Interpreter_intStack[--class44.Interpreter_intStackSize] == 1; // L: 586 + if (var5 != var4.isHidden) { // L: 587 + var4.isHidden = var5; // L: 588 + WorldMapCacheName.invalidateWidget(var4); // L: 589 + } + + return 1; // L: 591 + } else if (var0 == ScriptOpcodes.CC_SETNOCLICKTHROUGH) { // L: 593 + var4.noClickThrough = Interpreter.Interpreter_intStack[--class44.Interpreter_intStackSize] == 1; // L: 594 + return 1; // L: 595 + } else if (var0 == ScriptOpcodes.CC_SETNOSCROLLTHROUGH) { // L: 597 + var4.noScrollThrough = Interpreter.Interpreter_intStack[--class44.Interpreter_intStackSize] == 1; // L: 598 + return 1; // L: 599 + } else { + return 2; // L: 601 + } + } +} diff --git a/runescape-client/src/main/java/class313.java b/runescape-client/src/main/java/class313.java index 2c0bbb7fcd..a1dde5b0cb 100644 --- a/runescape-client/src/main/java/class313.java +++ b/runescape-client/src/main/java/class313.java @@ -1,9 +1,75 @@ import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedName; +import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("lb") +@ObfuscatedName("lk") public class class313 { - @ObfuscatedName("w") - @Export("BZip2Decompressor_block") - static int[] BZip2Decompressor_block; + @ObfuscatedName("ji") + @ObfuscatedSignature( + descriptor = "([Lio;Lio;ZI)V", + garbageValue = "1078266988" + ) + @Export("revalidateWidgetScroll") + static void revalidateWidgetScroll(Widget[] var0, Widget var1, boolean var2) { + int var3 = var1.scrollWidth != 0 ? var1.scrollWidth * 1489642403 * 1932863499 : var1.width * -1921178137 * 1163271639; // L: 9756 + int var4 = var1.scrollHeight != 0 ? var1.scrollHeight * -1137939101 * 1577090123 : var1.height * 202863387 * -571887853; // L: 9757 + class27.resizeInterface(var0, var1.id, var3, var4, var2); // L: 9758 + if (var1.children != null) { // L: 9759 + class27.resizeInterface(var1.children, var1.id, var3, var4, var2); + } + + InterfaceParent var5 = (InterfaceParent)Client.interfaceParents.get((long)var1.id); // L: 9760 + if (var5 != null) { + PlayerType.method4857(var5.group, var3, var4, var2); // L: 9761 + } + + if (var1.contentType == 1337) { // L: 9762 + } + + } // L: 9763 + + @ObfuscatedName("jh") + @ObfuscatedSignature( + descriptor = "(Lio;IIIIIII)V", + garbageValue = "584848260" + ) + static final void method5617(Widget var0, int var1, int var2, int var3, int var4, int var5, int var6) { + if (Client.field708) { // L: 9821 + Client.alternativeScrollbarWidth = 32; + } else { + Client.alternativeScrollbarWidth = 0; // L: 9822 + } + + Client.field708 = false; // L: 9823 + int var7; + if (MouseHandler.MouseHandler_currentButton == 1 || !Client.mouseCam && MouseHandler.MouseHandler_currentButton == 4) { // L: 9824 + if (var5 >= var1 && var5 < var1 + 16 && var6 >= var2 && var6 < var2 + 16) { // L: 9825 + var0.scrollY -= 4; // L: 9826 + WorldMapCacheName.invalidateWidget(var0); // L: 9827 + } else if (var5 >= var1 && var5 < var1 + 16 && var6 >= var3 + var2 - 16 && var6 < var3 + var2) { // L: 9829 + var0.scrollY += 4; // L: 9830 + WorldMapCacheName.invalidateWidget(var0); // L: 9831 + } else if (var5 >= var1 - Client.alternativeScrollbarWidth && var5 < Client.alternativeScrollbarWidth + var1 + 16 && var6 >= var2 + 16 && var6 < var3 + var2 - 16) { // L: 9833 + var7 = var3 * (var3 - 32) / var4; // L: 9834 + if (var7 < 8) { // L: 9835 + var7 = 8; + } + + int var8 = var6 - var2 - 16 - var7 / 2; // L: 9836 + int var9 = var3 - 32 - var7; // L: 9837 + var0.scrollY = var8 * (var4 - var3) / var9; // L: 9838 + WorldMapCacheName.invalidateWidget(var0); // L: 9839 + Client.field708 = true; // L: 9840 + } + } + + if (Client.mouseWheelRotation != 0) { // L: 9843 + var7 = var0.width; // L: 9844 + if (var5 >= var1 - var7 && var6 >= var2 && var5 < var1 + 16 && var6 <= var3 + var2) { // L: 9845 + var0.scrollY += Client.mouseWheelRotation * 45; // L: 9846 + WorldMapCacheName.invalidateWidget(var0); // L: 9847 + } + } + + } // L: 9850 } diff --git a/runescape-client/src/main/java/class32.java b/runescape-client/src/main/java/class32.java index 5e577e99f5..9565bab18f 100644 --- a/runescape-client/src/main/java/class32.java +++ b/runescape-client/src/main/java/class32.java @@ -1,670 +1,109 @@ import net.runelite.mapping.Export; +import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("av") +@ObfuscatedName("ar") public final class class32 { @ObfuscatedName("r") - @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "1588023984" + @ObfuscatedGetter( + intValue = -812894805 ) - public static void method365() { - ObjectComposition.ObjectDefinition_cached.clear(); // L: 404 - ObjectComposition.ObjectDefinition_cachedModelData.clear(); // L: 405 - ObjectComposition.ObjectDefinition_cachedEntities.clear(); // L: 406 - ObjectComposition.ObjectDefinition_cachedModels.clear(); // L: 407 - } // L: 408 - - @ObfuscatedName("gt") - @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "-1988985171" + @Export("musicTrackGroupId") + public static int musicTrackGroupId; + @ObfuscatedName("h") + @ObfuscatedGetter( + intValue = 646214551 ) - static void method367() { - if (Client.combatTargetPlayerIndex >= 0 && Client.players[Client.combatTargetPlayerIndex] != null) { // L: 4664 - addPlayerToScene(Client.players[Client.combatTargetPlayerIndex], false); // L: 4665 - } - - } // L: 4667 - - @ObfuscatedName("gi") + @Export("canvasWidth") + public static int canvasWidth; + @ObfuscatedName("du") @ObfuscatedSignature( - descriptor = "(Lcg;ZI)V", - garbageValue = "1577475793" + descriptor = "Ljp;" ) - @Export("addPlayerToScene") - static void addPlayerToScene(Player var0, boolean var1) { - if (var0 != null && var0.isVisible() && !var0.isHidden) { // L: 4670 - var0.isUnanimated = false; // L: 4671 - if ((Client.isLowDetail && Players.Players_count > 50 || Players.Players_count > 200) && var1 && var0.movementSequence == var0.idleSequence) { // L: 4672 4673 - var0.isUnanimated = true; + @Export("archive4") + static Archive archive4; + + @ObfuscatedName("gz") + @ObfuscatedSignature( + descriptor = "(Lce;IIB)V", + garbageValue = "-92" + ) + @Export("performPlayerAnimation") + static void performPlayerAnimation(Player var0, int var1, int var2) { + if (var0.sequence == var1 && var1 != -1) { // L: 3886 + int var3 = LoginScreenAnimation.SequenceDefinition_get(var1).field1891; // L: 3887 + if (var3 == 1) { // L: 3888 + var0.sequenceFrame = 0; // L: 3889 + var0.sequenceFrameCycle = 0; // L: 3890 + var0.sequenceDelay = var2; // L: 3891 + var0.field1245 = 0; // L: 3892 } - int var2 = var0.x >> 7; // L: 4675 - int var3 = var0.y >> 7; // L: 4676 - if (var2 >= 0 && var2 < 104 && var3 >= 0 && var3 < 104) { // L: 4677 - long var4 = class17.calculateTag(0, 0, 0, false, var0.index); // L: 4678 - if (var0.model0 != null && Client.cycle >= var0.animationCycleStart && Client.cycle < var0.animationCycleEnd) { // L: 4679 - var0.isUnanimated = false; // L: 4680 - var0.tileHeight = SceneTilePaint.getTileHeight(var0.x, var0.y, ParamComposition.Client_plane); // L: 4681 - var0.playerCycle = Client.cycle; // L: 4682 - class5.scene.addNullableObject(ParamComposition.Client_plane, var0.x, var0.y, var0.tileHeight, 60, var0, var0.rotation, var4, var0.minX, var0.minY, var0.maxX, var0.maxY); // L: 4683 - } else { - if ((var0.x & 127) == 64 && (var0.y & 127) == 64) { // L: 4686 - if (Client.tileLastDrawnActor[var2][var3] == Client.viewportDrawCount) { // L: 4687 - return; - } - - Client.tileLastDrawnActor[var2][var3] = Client.viewportDrawCount; // L: 4688 - } - - var0.tileHeight = SceneTilePaint.getTileHeight(var0.x, var0.y, ParamComposition.Client_plane); // L: 4690 - var0.playerCycle = Client.cycle; // L: 4691 - class5.scene.drawEntity(ParamComposition.Client_plane, var0.x, var0.y, var0.tileHeight, 60, var0, var0.rotation, var4, var0.isWalking); // L: 4692 - } + if (var3 == 2) { // L: 3894 + var0.field1245 = 0; // L: 3895 } + } else if (var1 == -1 || var0.sequence == -1 || LoginScreenAnimation.SequenceDefinition_get(var1).field1885 >= LoginScreenAnimation.SequenceDefinition_get(var0.sequence).field1885) { // L: 3898 + var0.sequence = var1; // L: 3899 + var0.sequenceFrame = 0; // L: 3900 + var0.sequenceFrameCycle = 0; // L: 3901 + var0.sequenceDelay = var2; // L: 3902 + var0.field1245 = 0; // L: 3903 + var0.field1274 = var0.pathLength; // L: 3904 } - } // L: 4696 + } // L: 3906 - @ObfuscatedName("ju") + @ObfuscatedName("gk") @ObfuscatedSignature( - descriptor = "(Liv;Lez;IIZI)V", - garbageValue = "-1962227486" + descriptor = "(B)I", + garbageValue = "26" ) - @Export("addWidgetItemMenuItem") - static final void addWidgetItemMenuItem(Widget var0, ItemComposition var1, int var2, int var3, boolean var4) { - String[] var5 = var1.inventoryActions; // L: 10260 - byte var6 = -1; // L: 10261 - String var7 = null; // L: 10262 - if (var5 != null && var5[var3] != null) { // L: 10263 - if (var3 == 0) { // L: 10264 - var6 = 33; - } else if (var3 == 1) { // L: 10265 - var6 = 34; - } else if (var3 == 2) { - var6 = 35; // L: 10266 - } else if (var3 == 3) { // L: 10267 - var6 = 36; - } else { - var6 = 37; // L: 10268 - } - - var7 = var5[var3]; // L: 10269 - } else if (var3 == 4) { // L: 10272 - var6 = 37; // L: 10273 - var7 = "Drop"; // L: 10274 + static final int method305() { + if (ObjectComposition.clientPreferences.roofsHidden) { // L: 4409 + return class22.Client_plane; + } else { + int var0 = class105.getTileHeight(MouseHandler.cameraX, class105.cameraZ, class22.Client_plane); // L: 4410 + return var0 - SecureRandomCallable.cameraY < 800 && (Tiles.Tiles_renderFlags[class22.Client_plane][MouseHandler.cameraX >> 7][class105.cameraZ >> 7] & 4) != 0 ? class22.Client_plane : 3; // L: 4411 4412 } + } - if (var6 != -1 && var7 != null) { // L: 10277 - class311.insertMenuItem(var7, HorizontalAlignment.colorStartTag(16748608) + var1.name, var6, var1.id, var2, var0.id, var4); // L: 10278 - } - - } // L: 10280 - - @ObfuscatedName("jl") + @ObfuscatedName("jq") @ObfuscatedSignature( - descriptor = "([Liv;IIIIIIII)V", - garbageValue = "-1124545705" + descriptor = "(IIIIIB)V", + garbageValue = "126" ) - @Export("updateInterface") - static final void updateInterface(Widget[] var0, int var1, int var2, int var3, int var4, int var5, int var6, int var7) { - for (int var8 = 0; var8 < var0.length; ++var8) { // L: 10469 - Widget var9 = var0[var8]; // L: 10470 - if (var9 != null && var9.parentId == var1 && (!var9.isIf3 || var9.type == 0 || var9.hasListener || class26.getWidgetFlags(var9) != 0 || var9 == Client.clickedWidgetParent || var9.contentType == 1338)) { // L: 10471 10472 10473 - if (var9.isIf3) { // L: 10474 - if (class11.isComponentHidden(var9)) { // L: 10475 - continue; - } - } else if (var9.type == 0 && var9 != SpriteMask.mousedOverWidgetIf1 && class11.isComponentHidden(var9)) { // L: 10478 - continue; - } - - int var10 = var9.x + var6; // L: 10480 - int var11 = var7 + var9.y; // L: 10481 - int var12; - int var13; - int var14; - int var15; - int var17; - int var18; - if (var9.type == 2) { // L: 10486 - var12 = var2; // L: 10487 - var13 = var3; // L: 10488 - var14 = var4; // L: 10489 - var15 = var5; // L: 10490 - } else { - int var16; - if (var9.type == 9) { // L: 10492 - var16 = var10; // L: 10493 - var17 = var11; // L: 10494 - var18 = var10 + var9.width; // L: 10495 - int var19 = var11 + var9.height; // L: 10496 - if (var18 < var10) { // L: 10497 - var16 = var18; // L: 10499 - var18 = var10; // L: 10500 - } - - if (var19 < var11) { // L: 10502 - var17 = var19; // L: 10504 - var19 = var11; // L: 10505 - } - - ++var18; // L: 10507 - ++var19; // L: 10508 - var12 = var16 > var2 ? var16 : var2; // L: 10509 - var13 = var17 > var3 ? var17 : var3; // L: 10510 - var14 = var18 < var4 ? var18 : var4; // L: 10511 - var15 = var19 < var5 ? var19 : var5; // L: 10512 - } else { - var16 = var10 + var9.width; // L: 10515 - var17 = var11 + var9.height; // L: 10516 - var12 = var10 > var2 ? var10 : var2; // L: 10517 - var13 = var11 > var3 ? var11 : var3; // L: 10518 - var14 = var16 < var4 ? var16 : var4; // L: 10519 - var15 = var17 < var5 ? var17 : var5; // L: 10520 - } - } - - if (var9 == Client.clickedWidget) { // L: 10522 - Client.field797 = true; // L: 10523 - Client.field871 = var10; // L: 10524 - Client.field798 = var11; // L: 10525 - } - - boolean var32 = false; // L: 10527 - if (var9.field2985) { // L: 10528 - switch(Client.field778) { // L: 10529 - case 0: - var32 = true; // L: 10536 - case 1: - default: - break; - case 2: - if (Client.field779 == var9.id >>> 16) { // L: 10539 - var32 = true; // L: 10540 - } - break; - case 3: - if (var9.id == Client.field779) { // L: 10531 - var32 = true; // L: 10532 - } - } - } - - if (var32 || !var9.isIf3 || var12 < var14 && var13 < var15) { // L: 10545 - if (var9.isIf3) { // L: 10546 - ScriptEvent var26; - if (var9.noClickThrough) { // L: 10547 - if (MouseHandler.MouseHandler_x >= var12 && MouseHandler.MouseHandler_y >= var13 && MouseHandler.MouseHandler_x < var14 && MouseHandler.MouseHandler_y < var15) { // L: 10548 - for (var26 = (ScriptEvent)Client.scriptEvents.last(); var26 != null; var26 = (ScriptEvent)Client.scriptEvents.previous()) { // L: 10549 - if (var26.isMouseInputEvent) { // L: 10550 - var26.remove(); // L: 10551 - var26.widget.containsMouse = false; // L: 10552 - } - } - - if (class288.widgetDragDuration == 0) { // L: 10555 - Client.clickedWidget = null; // L: 10556 - Client.clickedWidgetParent = null; // L: 10557 - } - - if (!Client.isMenuOpen) { // L: 10559 - WorldMapEvent.addCancelMenuEntry(); // L: 10560 - } - } - } else if (var9.noScrollThrough && MouseHandler.MouseHandler_x >= var12 && MouseHandler.MouseHandler_y >= var13 && MouseHandler.MouseHandler_x < var14 && MouseHandler.MouseHandler_y < var15) { // L: 10564 10565 - for (var26 = (ScriptEvent)Client.scriptEvents.last(); var26 != null; var26 = (ScriptEvent)Client.scriptEvents.previous()) { // L: 10566 - if (var26.isMouseInputEvent && var26.widget.onScroll == var26.args) { // L: 10567 - var26.remove(); // L: 10568 - } - } - } - } - - var17 = MouseHandler.MouseHandler_x; // L: 10574 - var18 = MouseHandler.MouseHandler_y; // L: 10575 - if (MouseHandler.MouseHandler_lastButton != 0) { // L: 10576 - var17 = MouseHandler.MouseHandler_lastPressedX; // L: 10577 - var18 = MouseHandler.MouseHandler_lastPressedY; // L: 10578 - } - - boolean var33 = var17 >= var12 && var18 >= var13 && var17 < var14 && var18 < var15; // L: 10580 - if (var9.contentType == 1337) { // L: 10581 - if (!Client.isLoading && !Client.isMenuOpen && var33) { // L: 10582 - ScriptEvent.addSceneMenuOptions(var17, var18, var12, var13); - } - } else if (var9.contentType == 1338) { // L: 10585 - WorldMapCacheName.checkIfMinimapClicked(var9, var10, var11); // L: 10586 - } else { - if (var9.contentType == 1400) { // L: 10589 - NetSocket.worldMap.onCycle(MouseHandler.MouseHandler_x, MouseHandler.MouseHandler_y, var33, var10, var11, var9.width, var9.height); // L: 10590 - } - - if (!Client.isMenuOpen && var33) { // L: 10592 - if (var9.contentType == 1400) { // L: 10593 - NetSocket.worldMap.addElementMenuOptions(var10, var11, var9.width, var9.height, var17, var18); // L: 10594 - } else { - class2.Widget_addToMenu(var9, var17 - var10, var18 - var11); // L: 10597 - } - } - - boolean var21; - int var23; - if (var32) { // L: 10600 - for (int var20 = 0; var20 < var9.field3039.length; ++var20) { // L: 10601 - var21 = false; // L: 10602 - boolean var27 = false; // L: 10603 - if (!var21 && var9.field3039[var20] != null) { // L: 10604 - for (var23 = 0; var23 < var9.field3039[var20].length; ++var23) { // L: 10605 - boolean var24 = false; // L: 10606 - if (var9.field3105 != null) { // L: 10607 - var24 = KeyHandler.KeyHandler_pressedKeys[var9.field3039[var20][var23]]; // L: 10608 - } - - if (Canvas.method467(var9.field3039[var20][var23]) || var24) { // L: 10610 - var21 = true; // L: 10611 - if (var9.field3105 != null && var9.field3105[var20] > Client.cycle) { // L: 10612 - break; - } - - byte var31 = var9.field2987[var20][var23]; // L: 10613 - if (var31 == 0 || ((var31 & 8) == 0 || !KeyHandler.KeyHandler_pressedKeys[86] && !KeyHandler.KeyHandler_pressedKeys[82] && !KeyHandler.KeyHandler_pressedKeys[81]) && ((var31 & 2) == 0 || KeyHandler.KeyHandler_pressedKeys[86]) && ((var31 & 1) == 0 || KeyHandler.KeyHandler_pressedKeys[82]) && ((var31 & 4) == 0 || KeyHandler.KeyHandler_pressedKeys[81])) { // L: 10614 10615 10616 10617 10618 - var27 = true; // L: 10620 - break; - } - } - } - } - - if (var27) { // L: 10626 - if (var20 < 10) { // L: 10627 - class245.widgetDefaultMenuAction(var20 + 1, var9.id, var9.childIndex, var9.itemId, ""); - } else if (var20 == 10) { // L: 10628 - class15.Widget_runOnTargetLeave(); // L: 10629 - GrandExchangeOffer.selectSpell(var9.id, var9.childIndex, AttackOption.Widget_unpackTargetMask(class26.getWidgetFlags(var9)), var9.itemId); // L: 10630 - Client.selectedSpellActionName = UserComparator9.Widget_getSpellActionName(var9); // L: 10631 - if (Client.selectedSpellActionName == null) { // L: 10632 - Client.selectedSpellActionName = "null"; - } - - Client.selectedSpellName = var9.dataText + HorizontalAlignment.colorStartTag(16777215); // L: 10633 - } - - var23 = var9.field3070[var20]; // L: 10635 - if (var9.field3105 == null) { // L: 10636 - var9.field3105 = new int[var9.field3039.length]; - } - - if (var9.field3090 == null) { // L: 10637 - var9.field3090 = new int[var9.field3039.length]; - } - - if (var23 != 0) { // L: 10638 - if (var9.field3105[var20] == 0) { // L: 10639 - var9.field3105[var20] = var23 + Client.cycle + var9.field3090[var20]; - } else { - var9.field3105[var20] = var23 + Client.cycle; // L: 10640 - } - } else { - var9.field3105[var20] = Integer.MAX_VALUE; // L: 10642 - } - } - - if (!var21 && var9.field3105 != null) { // L: 10644 10645 - var9.field3105[var20] = 0; - } - } - } - - if (var9.isIf3) { // L: 10649 - if (MouseHandler.MouseHandler_x >= var12 && MouseHandler.MouseHandler_y >= var13 && MouseHandler.MouseHandler_x < var14 && MouseHandler.MouseHandler_y < var15) { // L: 10650 - var33 = true; - } else { - var33 = false; // L: 10651 - } - - boolean var34 = false; // L: 10652 - if ((MouseHandler.MouseHandler_currentButton == 1 || !class229.mouseCam && MouseHandler.MouseHandler_currentButton == 4) && var33) { // L: 10653 - var34 = true; - } - - var21 = false; // L: 10654 - if ((MouseHandler.MouseHandler_lastButton == 1 || !class229.mouseCam && MouseHandler.MouseHandler_lastButton == 4) && MouseHandler.MouseHandler_lastPressedX >= var12 && MouseHandler.MouseHandler_lastPressedY >= var13 && MouseHandler.MouseHandler_lastPressedX < var14 && MouseHandler.MouseHandler_lastPressedY < var15) { // L: 10655 - var21 = true; - } - - if (var21) { // L: 10656 - class214.clickWidget(var9, MouseHandler.MouseHandler_lastPressedX - var10, MouseHandler.MouseHandler_lastPressedY - var11); - } - - if (var9.contentType == 1400) { // L: 10657 - NetSocket.worldMap.method5953(var17, var18, var33 & var34, var33 & var21); // L: 10658 - } - - if (Client.clickedWidget != null && var9 != Client.clickedWidget && var33 && class2.method28(class26.getWidgetFlags(var9))) { // L: 10660 - Client.draggedOnWidget = var9; - } - - if (var9 == Client.clickedWidgetParent) { // L: 10661 - Client.field794 = true; // L: 10662 - Client.field795 = var10; // L: 10663 - Client.field785 = var11; // L: 10664 - } - - if (var9.hasListener) { // L: 10666 - ScriptEvent var22; - if (var33 && Client.mouseWheelRotation != 0 && var9.onScroll != null) { // L: 10667 - var22 = new ScriptEvent(); // L: 10668 - var22.isMouseInputEvent = true; // L: 10669 - var22.widget = var9; // L: 10670 - var22.mouseY = Client.mouseWheelRotation; // L: 10671 - var22.args = var9.onScroll; // L: 10672 - Client.scriptEvents.addFirst(var22); // L: 10673 - } - - if (Client.clickedWidget != null || class34.dragInventoryWidget != null || Client.isMenuOpen) { // L: 10675 - var21 = false; // L: 10676 - var34 = false; // L: 10677 - var33 = false; // L: 10678 - } - - if (!var9.isClicked && var21) { // L: 10680 - var9.isClicked = true; // L: 10681 - if (var9.onClick != null) { // L: 10682 - var22 = new ScriptEvent(); // L: 10683 - var22.isMouseInputEvent = true; // L: 10684 - var22.widget = var9; // L: 10685 - var22.mouseX = MouseHandler.MouseHandler_lastPressedX - var10; // L: 10686 - var22.mouseY = MouseHandler.MouseHandler_lastPressedY - var11; // L: 10687 - var22.args = var9.onClick; // L: 10688 - Client.scriptEvents.addFirst(var22); // L: 10689 - } - } - - if (var9.isClicked && var34 && var9.onClickRepeat != null) { // L: 10692 10693 - var22 = new ScriptEvent(); // L: 10694 - var22.isMouseInputEvent = true; // L: 10695 - var22.widget = var9; // L: 10696 - var22.mouseX = MouseHandler.MouseHandler_x - var10; // L: 10697 - var22.mouseY = MouseHandler.MouseHandler_y - var11; // L: 10698 - var22.args = var9.onClickRepeat; // L: 10699 - Client.scriptEvents.addFirst(var22); // L: 10700 - } - - if (var9.isClicked && !var34) { // L: 10703 - var9.isClicked = false; // L: 10704 - if (var9.onRelease != null) { // L: 10705 - var22 = new ScriptEvent(); // L: 10706 - var22.isMouseInputEvent = true; // L: 10707 - var22.widget = var9; // L: 10708 - var22.mouseX = MouseHandler.MouseHandler_x - var10; // L: 10709 - var22.mouseY = MouseHandler.MouseHandler_y - var11; // L: 10710 - var22.args = var9.onRelease; // L: 10711 - Client.field821.addFirst(var22); // L: 10712 - } - } - - if (var34 && var9.onHold != null) { // L: 10715 10716 - var22 = new ScriptEvent(); // L: 10717 - var22.isMouseInputEvent = true; // L: 10718 - var22.widget = var9; // L: 10719 - var22.mouseX = MouseHandler.MouseHandler_x - var10; // L: 10720 - var22.mouseY = MouseHandler.MouseHandler_y - var11; // L: 10721 - var22.args = var9.onHold; // L: 10722 - Client.scriptEvents.addFirst(var22); // L: 10723 - } - - if (!var9.containsMouse && var33) { // L: 10726 - var9.containsMouse = true; // L: 10727 - if (var9.onMouseOver != null) { // L: 10728 - var22 = new ScriptEvent(); // L: 10729 - var22.isMouseInputEvent = true; // L: 10730 - var22.widget = var9; // L: 10731 - var22.mouseX = MouseHandler.MouseHandler_x - var10; // L: 10732 - var22.mouseY = MouseHandler.MouseHandler_y - var11; // L: 10733 - var22.args = var9.onMouseOver; // L: 10734 - Client.scriptEvents.addFirst(var22); // L: 10735 - } - } - - if (var9.containsMouse && var33 && var9.onMouseRepeat != null) { // L: 10738 10739 - var22 = new ScriptEvent(); // L: 10740 - var22.isMouseInputEvent = true; // L: 10741 - var22.widget = var9; // L: 10742 - var22.mouseX = MouseHandler.MouseHandler_x - var10; // L: 10743 - var22.mouseY = MouseHandler.MouseHandler_y - var11; // L: 10744 - var22.args = var9.onMouseRepeat; // L: 10745 - Client.scriptEvents.addFirst(var22); // L: 10746 - } - - if (var9.containsMouse && !var33) { // L: 10749 - var9.containsMouse = false; // L: 10750 - if (var9.onMouseLeave != null) { // L: 10751 - var22 = new ScriptEvent(); // L: 10752 - var22.isMouseInputEvent = true; // L: 10753 - var22.widget = var9; // L: 10754 - var22.mouseX = MouseHandler.MouseHandler_x - var10; // L: 10755 - var22.mouseY = MouseHandler.MouseHandler_y - var11; // L: 10756 - var22.args = var9.onMouseLeave; // L: 10757 - Client.field821.addFirst(var22); // L: 10758 - } - } - - if (var9.onTimer != null) { // L: 10761 - var22 = new ScriptEvent(); // L: 10762 - var22.widget = var9; // L: 10763 - var22.args = var9.onTimer; // L: 10764 - Client.field865.addFirst(var22); // L: 10765 - } - - ScriptEvent var25; - int var35; - int var36; - if (var9.onVarTransmit != null && Client.changedVarpCount > var9.field3100) { // L: 10767 - if (var9.varTransmitTriggers != null && Client.changedVarpCount - var9.field3100 <= 32) { // L: 10768 - label791: - for (var36 = var9.field3100; var36 < Client.changedVarpCount; ++var36) { // L: 10775 - var23 = Client.changedVarps[var36 & 31]; // L: 10776 - - for (var35 = 0; var35 < var9.varTransmitTriggers.length; ++var35) { // L: 10777 - if (var23 == var9.varTransmitTriggers[var35]) { // L: 10778 - var25 = new ScriptEvent(); // L: 10779 - var25.widget = var9; // L: 10780 - var25.args = var9.onVarTransmit; // L: 10781 - Client.scriptEvents.addFirst(var25); // L: 10782 - break label791; // L: 10783 - } - } - } - } else { - var22 = new ScriptEvent(); // L: 10769 - var22.widget = var9; // L: 10770 - var22.args = var9.onVarTransmit; // L: 10771 - Client.scriptEvents.addFirst(var22); // L: 10772 - } - - var9.field3100 = Client.changedVarpCount; // L: 10788 - } - - if (var9.onInvTransmit != null && Client.field805 > var9.field3101) { // L: 10790 - if (var9.invTransmitTriggers != null && Client.field805 - var9.field3101 <= 32) { // L: 10791 - label767: - for (var36 = var9.field3101; var36 < Client.field805; ++var36) { // L: 10798 - var23 = Client.changedItemContainers[var36 & 31]; // L: 10799 - - for (var35 = 0; var35 < var9.invTransmitTriggers.length; ++var35) { // L: 10800 - if (var23 == var9.invTransmitTriggers[var35]) { // L: 10801 - var25 = new ScriptEvent(); // L: 10802 - var25.widget = var9; // L: 10803 - var25.args = var9.onInvTransmit; // L: 10804 - Client.scriptEvents.addFirst(var25); // L: 10805 - break label767; // L: 10806 - } - } - } - } else { - var22 = new ScriptEvent(); // L: 10792 - var22.widget = var9; // L: 10793 - var22.args = var9.onInvTransmit; // L: 10794 - Client.scriptEvents.addFirst(var22); // L: 10795 - } - - var9.field3101 = Client.field805; // L: 10811 - } - - if (var9.onStatTransmit != null && Client.changedSkillsCount > var9.field3049) { // L: 10813 - if (var9.statTransmitTriggers != null && Client.changedSkillsCount - var9.field3049 <= 32) { // L: 10814 - label743: - for (var36 = var9.field3049; var36 < Client.changedSkillsCount; ++var36) { // L: 10821 - var23 = Client.changedSkills[var36 & 31]; // L: 10822 - - for (var35 = 0; var35 < var9.statTransmitTriggers.length; ++var35) { // L: 10823 - if (var23 == var9.statTransmitTriggers[var35]) { // L: 10824 - var25 = new ScriptEvent(); // L: 10825 - var25.widget = var9; // L: 10826 - var25.args = var9.onStatTransmit; // L: 10827 - Client.scriptEvents.addFirst(var25); // L: 10828 - break label743; // L: 10829 - } - } - } - } else { - var22 = new ScriptEvent(); // L: 10815 - var22.widget = var9; // L: 10816 - var22.args = var9.onStatTransmit; // L: 10817 - Client.scriptEvents.addFirst(var22); // L: 10818 - } - - var9.field3049 = Client.changedSkillsCount; // L: 10834 - } - - if (Client.chatCycle > var9.field3015 && var9.onChatTransmit != null) { // L: 10836 - var22 = new ScriptEvent(); // L: 10837 - var22.widget = var9; // L: 10838 - var22.args = var9.onChatTransmit; // L: 10839 - Client.scriptEvents.addFirst(var22); // L: 10840 - } - - if (Client.field801 > var9.field3015 && var9.onFriendTransmit != null) { // L: 10842 - var22 = new ScriptEvent(); // L: 10843 - var22.widget = var9; // L: 10844 - var22.args = var9.onFriendTransmit; // L: 10845 - Client.scriptEvents.addFirst(var22); // L: 10846 - } - - if (Client.field698 > var9.field3015 && var9.onClanTransmit != null) { // L: 10848 - var22 = new ScriptEvent(); // L: 10849 - var22.widget = var9; // L: 10850 - var22.args = var9.onClanTransmit; // L: 10851 - Client.scriptEvents.addFirst(var22); // L: 10852 - } - - if (Client.field822 > var9.field3015 && var9.field3076 != null) { // L: 10854 - var22 = new ScriptEvent(); // L: 10855 - var22.widget = var9; // L: 10856 - var22.args = var9.field3076; // L: 10857 - Client.scriptEvents.addFirst(var22); // L: 10858 - } - - if (Client.field814 > var9.field3015 && var9.field2974 != null) { // L: 10860 - var22 = new ScriptEvent(); // L: 10861 - var22.widget = var9; // L: 10862 - var22.args = var9.field2974; // L: 10863 - Client.scriptEvents.addFirst(var22); // L: 10864 - } - - if (Client.field815 > var9.field3015 && var9.onStockTransmit != null) { // L: 10866 - var22 = new ScriptEvent(); // L: 10867 - var22.widget = var9; // L: 10868 - var22.args = var9.onStockTransmit; // L: 10869 - Client.scriptEvents.addFirst(var22); // L: 10870 - } - - if (Client.field816 > var9.field3015 && var9.field3004 != null) { // L: 10872 - var22 = new ScriptEvent(); // L: 10873 - var22.widget = var9; // L: 10874 - var22.args = var9.field3004; // L: 10875 - Client.scriptEvents.addFirst(var22); // L: 10876 - } - - if (Client.field731 > var9.field3015 && var9.onMiscTransmit != null) { // L: 10878 - var22 = new ScriptEvent(); // L: 10879 - var22.widget = var9; // L: 10880 - var22.args = var9.onMiscTransmit; // L: 10881 - Client.scriptEvents.addFirst(var22); // L: 10882 - } - - var9.field3015 = Client.cycleCntr; // L: 10884 - if (var9.onKey != null) { // L: 10885 - for (var36 = 0; var36 < Client.field842; ++var36) { // L: 10886 - ScriptEvent var30 = new ScriptEvent(); // L: 10887 - var30.widget = var9; // L: 10888 - var30.keyTyped = Client.field844[var36]; // L: 10889 - var30.keyPressed = Client.field746[var36]; // L: 10890 - var30.args = var9.onKey; // L: 10891 - Client.scriptEvents.addFirst(var30); // L: 10892 - } - } - } - } - - if (!var9.isIf3) { // L: 10897 - if (Client.clickedWidget != null || class34.dragInventoryWidget != null || Client.isMenuOpen) { // L: 10898 - continue; - } - - if ((var9.mouseOverRedirect >= 0 || var9.mouseOverColor != 0) && MouseHandler.MouseHandler_x >= var12 && MouseHandler.MouseHandler_y >= var13 && MouseHandler.MouseHandler_x < var14 && MouseHandler.MouseHandler_y < var15) { // L: 10899 - if (var9.mouseOverRedirect >= 0) { // L: 10900 - SpriteMask.mousedOverWidgetIf1 = var0[var9.mouseOverRedirect]; - } else { - SpriteMask.mousedOverWidgetIf1 = var9; // L: 10901 - } - } - - if (var9.type == 8 && MouseHandler.MouseHandler_x >= var12 && MouseHandler.MouseHandler_y >= var13 && MouseHandler.MouseHandler_x < var14 && MouseHandler.MouseHandler_y < var15) { // L: 10903 - class34.field241 = var9; // L: 10904 - } - - if (var9.scrollHeight > var9.height) { // L: 10906 - SpriteMask.method4580(var9, var10 + var9.width, var11, var9.height, var9.scrollHeight, MouseHandler.MouseHandler_x, MouseHandler.MouseHandler_y); - } - } - - if (var9.type == 0) { // L: 10908 - updateInterface(var0, var9.id, var12, var13, var14, var15, var10 - var9.scrollX, var11 - var9.scrollY); // L: 10909 - if (var9.children != null) { // L: 10910 - updateInterface(var9.children, var9.id, var12, var13, var14, var15, var10 - var9.scrollX, var11 - var9.scrollY); - } - - InterfaceParent var28 = (InterfaceParent)Client.interfaceParents.get((long)var9.id); // L: 10911 - if (var28 != null) { // L: 10912 - if (var28.type == 0 && MouseHandler.MouseHandler_x >= var12 && MouseHandler.MouseHandler_y >= var13 && MouseHandler.MouseHandler_x < var14 && MouseHandler.MouseHandler_y < var15 && !Client.isMenuOpen) { // L: 10913 - for (ScriptEvent var29 = (ScriptEvent)Client.scriptEvents.last(); var29 != null; var29 = (ScriptEvent)Client.scriptEvents.previous()) { // L: 10914 - if (var29.isMouseInputEvent) { // L: 10915 - var29.remove(); // L: 10916 - var29.widget.containsMouse = false; // L: 10917 - } - } - - if (class288.widgetDragDuration == 0) { // L: 10920 - Client.clickedWidget = null; // L: 10921 - Client.clickedWidgetParent = null; // L: 10922 - } - - if (!Client.isMenuOpen) { // L: 10924 - WorldMapEvent.addCancelMenuEntry(); // L: 10925 - } - } - - Clock.updateRootInterface(var28.group, var12, var13, var14, var15, var10, var11); // L: 10928 - } - } - } - } - } + @Export("drawScrollBar") + static final void drawScrollBar(int var0, int var1, int var2, int var3, int var4) { + Player.scrollBarSprites[0].drawAt(var0, var1); // L: 9853 + Player.scrollBarSprites[1].drawAt(var0, var3 + var1 - 16); // L: 9854 + Rasterizer2D.Rasterizer2D_fillRectangle(var0, var1 + 16, 16, var3 - 32, Client.field704); // L: 9855 + int var5 = var3 * (var3 - 32) / var4; // L: 9856 + if (var5 < 8) { // L: 9857 + var5 = 8; } - } // L: 10932 + int var6 = (var3 - 32 - var5) * var2 / (var4 - var3); // L: 9858 + Rasterizer2D.Rasterizer2D_fillRectangle(var0, var6 + var1 + 16, 16, var5, Client.field705); // L: 9859 + Rasterizer2D.Rasterizer2D_drawVerticalLine(var0, var6 + var1 + 16, var5, Client.field707); // L: 9860 + Rasterizer2D.Rasterizer2D_drawVerticalLine(var0 + 1, var6 + var1 + 16, var5, Client.field707); // L: 9861 + Rasterizer2D.Rasterizer2D_drawHorizontalLine(var0, var6 + var1 + 16, 16, Client.field707); // L: 9862 + Rasterizer2D.Rasterizer2D_drawHorizontalLine(var0, var6 + var1 + 17, 16, Client.field707); // L: 9863 + Rasterizer2D.Rasterizer2D_drawVerticalLine(var0 + 15, var6 + var1 + 16, var5, Client.field706); // L: 9864 + Rasterizer2D.Rasterizer2D_drawVerticalLine(var0 + 14, var6 + var1 + 17, var5 - 1, Client.field706); // L: 9865 + Rasterizer2D.Rasterizer2D_drawHorizontalLine(var0, var6 + var5 + var1 + 15, 16, Client.field706); // L: 9866 + Rasterizer2D.Rasterizer2D_drawHorizontalLine(var0 + 1, var6 + var5 + var1 + 14, 15, Client.field706); // L: 9867 + } // L: 9868 + + @ObfuscatedName("jf") + @ObfuscatedSignature( + descriptor = "(IIIIIIIB)V", + garbageValue = "-20" + ) + @Export("updateRootInterface") + static final void updateRootInterface(int var0, int var1, int var2, int var3, int var4, int var5, int var6) { + if (Clock.loadInterface(var0)) { // L: 10180 + WorldMapManager.updateInterface(Widget.Widget_interfaceComponents[var0], -1, var1, var2, var3, var4, var5, var6); // L: 10181 + } + } // L: 10182 } diff --git a/runescape-client/src/main/java/class33.java b/runescape-client/src/main/java/class33.java index 9e2eb92a34..a656255fbe 100644 --- a/runescape-client/src/main/java/class33.java +++ b/runescape-client/src/main/java/class33.java @@ -4,41 +4,41 @@ import java.security.NoSuchAlgorithmException; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("al") +@ObfuscatedName("ag") public class class33 implements class30 { - @ObfuscatedName("h") - final MessageDigest field236; + @ObfuscatedName("v") + final MessageDigest field249; @ObfuscatedSignature( - descriptor = "(Lax;)V" + descriptor = "(Laj;)V" ) class33(class36 var1) { - this.field236 = this.method384(); // L: 14 + this.field249 = this.method321(); // L: 14 } // L: 15 - @ObfuscatedName("h") - boolean method370(int var1, String var2, long var3) { - byte[] var5 = this.method372(var2, var3); // L: 18 - return method371(var5) >= var1; // L: 19 + @ObfuscatedName("v") + boolean method307(int var1, String var2, long var3) { + byte[] var5 = this.method310(var2, var3); // L: 18 + return method308(var5) >= var1; // L: 19 } - @ObfuscatedName("g") - byte[] method372(String var1, long var2) { + @ObfuscatedName("y") + byte[] method310(String var1, long var2) { StringBuilder var4 = new StringBuilder(); // L: 56 var4.append(var1).append(Long.toHexString(var2)); // L: 57 - this.field236.reset(); // L: 58 + this.field249.reset(); // L: 58 try { - this.field236.update(var4.toString().getBytes("UTF-8")); // L: 60 + this.field249.update(var4.toString().getBytes("UTF-8")); // L: 60 } catch (UnsupportedEncodingException var6) { // L: 62 var6.printStackTrace(); // L: 63 } - return this.field236.digest(); // L: 65 + return this.field249.digest(); // L: 65 } - @ObfuscatedName("l") - MessageDigest method384() { + @ObfuscatedName("p") + MessageDigest method321() { try { return MessageDigest.getInstance("SHA-256"); // L: 70 } catch (NoSuchAlgorithmException var2) { // L: 72 @@ -47,14 +47,14 @@ public class class33 implements class30 { } } - @ObfuscatedName("c") - static int method371(byte[] var0) { + @ObfuscatedName("n") + static int method308(byte[] var0) { int var1 = 0; // L: 23 byte[] var2 = var0; // L: 25 for (int var3 = 0; var3 < var2.length; ++var3) { // L: 26 byte var4 = var2[var3]; // L: 27 - int var5 = method376(var4); // L: 29 + int var5 = method309(var4); // L: 29 var1 += var5; // L: 30 if (var5 != 8) { // L: 31 break; @@ -64,8 +64,8 @@ public class class33 implements class30 { return var1; // L: 37 } - @ObfuscatedName("o") - static int method376(byte var0) { + @ObfuscatedName("f") + static int method309(byte var0) { int var1 = 0; // L: 41 if (var0 == 0) { // L: 42 var1 = 8; // L: 43 diff --git a/runescape-client/src/main/java/class337.java b/runescape-client/src/main/java/class337.java index 3c824e5307..0bdf71b1a1 100644 --- a/runescape-client/src/main/java/class337.java +++ b/runescape-client/src/main/java/class337.java @@ -1,10 +1,13 @@ -import java.util.concurrent.ScheduledExecutorService; import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedName; +import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("li") +@ObfuscatedName("ld") public class class337 { - @ObfuscatedName("v") - @Export("soundSystemExecutor") - static ScheduledExecutorService soundSystemExecutor; + @ObfuscatedName("bz") + @ObfuscatedSignature( + descriptor = "[Loh;" + ) + @Export("worldSelectBackSprites") + static SpritePixels[] worldSelectBackSprites; } diff --git a/runescape-client/src/main/java/class338.java b/runescape-client/src/main/java/class338.java index 7b88d41dab..5a69490034 100644 --- a/runescape-client/src/main/java/class338.java +++ b/runescape-client/src/main/java/class338.java @@ -3,52 +3,52 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("me") +@ObfuscatedName("mi") public enum class338 implements Enumerated { - @ObfuscatedName("h") + @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "Lme;" + descriptor = "Lmi;" ) - field3927(0, 1), - @ObfuscatedName("c") + field3917(1, 1), + @ObfuscatedName("n") @ObfuscatedSignature( - descriptor = "Lme;" + descriptor = "Lmi;" ) - field3925(1, 2), - @ObfuscatedName("o") + field3915(0, 2), + @ObfuscatedName("f") @ObfuscatedSignature( - descriptor = "Lme;" + descriptor = "Lmi;" ) - field3926(3, 3), - @ObfuscatedName("g") + field3916(3, 3), + @ObfuscatedName("y") @ObfuscatedSignature( - descriptor = "Lme;" + descriptor = "Lmi;" ) - field3928(2, 10); + field3914(2, 10); - @ObfuscatedName("l") + @ObfuscatedName("p") @ObfuscatedGetter( - intValue = -1369051619 + intValue = 1709225651 ) - final int field3924; - @ObfuscatedName("z") + final int field3918; + @ObfuscatedName("j") @ObfuscatedGetter( - intValue = 2077999929 + intValue = 1076676609 ) - final int field3929; + final int field3919; class338(int var3, int var4) { - this.field3924 = var3; // L: 20 - this.field3929 = var4; // L: 21 + this.field3918 = var3; // L: 20 + this.field3919 = var4; // L: 21 } // L: 22 - @ObfuscatedName("h") + @ObfuscatedName("v") @ObfuscatedSignature( descriptor = "(I)I", - garbageValue = "-708237537" + garbageValue = "-907662946" ) @Export("rsOrdinal") public int rsOrdinal() { - return this.field3929; // L: 25 + return this.field3919; // L: 25 } } diff --git a/runescape-client/src/main/java/class339.java b/runescape-client/src/main/java/class339.java index af2b522060..1162a992d9 100644 --- a/runescape-client/src/main/java/class339.java +++ b/runescape-client/src/main/java/class339.java @@ -1,34 +1,177 @@ +import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("mn") +@ObfuscatedName("ms") public class class339 implements class344 { - @ObfuscatedName("h") + @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "Lmj;" + descriptor = "Lmg;" ) - public final class362 field3930; + public final class362 field3921; @ObfuscatedSignature( - descriptor = "(Lmk;)V" + descriptor = "(Lmt;)V" ) class339(class363 var1) { - this.field3930 = var1; // L: 14 + this.field3921 = var1; // L: 14 } // L: 15 @ObfuscatedSignature( - descriptor = "(Lmp;)V" + descriptor = "(Lme;)V" ) public class339(class340 var1) { this(new class363(var1)); // L: 10 } // L: 11 - @ObfuscatedName("h") + @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "(IB)I", - garbageValue = "82" + descriptor = "(II)I", + garbageValue = "423690194" ) - public int method5861(int var1) { - return this.field3930.vmethod6222(var1); // L: 18 + public int method6014(int var1) { + return this.field3921.vmethod6362(var1); // L: 18 } + + @ObfuscatedName("l") + @ObfuscatedSignature( + descriptor = "(Ljv;IIB)Z", + garbageValue = "47" + ) + static boolean method6015(AbstractArchive var0, int var1, int var2) { + byte[] var3 = var0.takeFile(var1, var2); // L: 182 + if (var3 == null) { // L: 183 + return false; + } else { + ItemLayer.SpriteBuffer_decode(var3); // L: 184 + return true; // L: 185 + } + } + + @ObfuscatedName("ho") + @ObfuscatedSignature( + descriptor = "(ZLnb;I)V", + garbageValue = "-2130717093" + ) + @Export("loadRegions") + static final void loadRegions(boolean var0, PacketBuffer var1) { + Client.isInInstance = var0; // L: 5048 + int var2; + int var3; + int var5; + int var6; + int var7; + int var8; + if (!Client.isInInstance) { // L: 5049 + var2 = var1.method6605(); // L: 5050 + var3 = var1.method6603(); // L: 5051 + int var4 = var1.readUnsignedShort(); // L: 5052 + WorldMapAreaData.xteaKeys = new int[var4][4]; // L: 5053 + + for (var5 = 0; var5 < var4; ++var5) { // L: 5054 + for (var6 = 0; var6 < 4; ++var6) { // L: 5055 + WorldMapAreaData.xteaKeys[var5][var6] = var1.readInt(); // L: 5056 + } + } + + PlayerComposition.regions = new int[var4]; // L: 5059 + class16.regionMapArchiveIds = new int[var4]; // L: 5060 + class24.regionLandArchiveIds = new int[var4]; // L: 5061 + class18.regionLandArchives = new byte[var4][]; // L: 5062 + class82.regionMapArchives = new byte[var4][]; // L: 5063 + boolean var16 = false; // L: 5064 + if ((var3 / 8 == 48 || var3 / 8 == 49) && var2 / 8 == 48) { // L: 5065 + var16 = true; + } + + if (var3 / 8 == 48 && var2 / 8 == 148) { // L: 5066 + var16 = true; + } + + var4 = 0; // L: 5067 + + for (var6 = (var3 - 6) / 8; var6 <= (var3 + 6) / 8; ++var6) { // L: 5068 + for (var7 = (var2 - 6) / 8; var7 <= (var2 + 6) / 8; ++var7) { // L: 5069 + var8 = var7 + (var6 << 8); // L: 5070 + if (!var16 || var7 != 49 && var7 != 149 && var7 != 147 && var6 != 50 && (var6 != 49 || var7 != 47)) { // L: 5071 + PlayerComposition.regions[var4] = var8; // L: 5072 + class16.regionMapArchiveIds[var4] = class247.archive5.getGroupId("m" + var6 + "_" + var7); // L: 5073 + class24.regionLandArchiveIds[var4] = class247.archive5.getGroupId("l" + var6 + "_" + var7); // L: 5074 + ++var4; // L: 5075 + } + } + } + + Canvas.method391(var3, var2, true); // L: 5078 + } else { + var2 = var1.readUnsignedShort(); // L: 5081 + var3 = var1.method6603(); // L: 5082 + boolean var15 = var1.method6549() == 1; // L: 5083 + var5 = var1.readUnsignedShort(); // L: 5084 + var1.importIndex(); // L: 5085 + + int var9; + for (var6 = 0; var6 < 4; ++var6) { // L: 5086 + for (var7 = 0; var7 < 13; ++var7) { // L: 5087 + for (var8 = 0; var8 < 13; ++var8) { // L: 5088 + var9 = var1.readBits(1); // L: 5089 + if (var9 == 1) { + Client.instanceChunkTemplates[var6][var7][var8] = var1.readBits(26); // L: 5090 + } else { + Client.instanceChunkTemplates[var6][var7][var8] = -1; // L: 5091 + } + } + } + } + + var1.exportIndex(); // L: 5095 + WorldMapAreaData.xteaKeys = new int[var5][4]; // L: 5096 + + for (var6 = 0; var6 < var5; ++var6) { // L: 5097 + for (var7 = 0; var7 < 4; ++var7) { // L: 5098 + WorldMapAreaData.xteaKeys[var6][var7] = var1.readInt(); // L: 5099 + } + } + + PlayerComposition.regions = new int[var5]; // L: 5102 + class16.regionMapArchiveIds = new int[var5]; // L: 5103 + class24.regionLandArchiveIds = new int[var5]; // L: 5104 + class18.regionLandArchives = new byte[var5][]; // L: 5105 + class82.regionMapArchives = new byte[var5][]; // L: 5106 + var5 = 0; // L: 5107 + + for (var6 = 0; var6 < 4; ++var6) { // L: 5108 + for (var7 = 0; var7 < 13; ++var7) { // L: 5109 + for (var8 = 0; var8 < 13; ++var8) { // L: 5110 + var9 = Client.instanceChunkTemplates[var6][var7][var8]; // L: 5111 + if (var9 != -1) { // L: 5112 + int var10 = var9 >> 14 & 1023; // L: 5113 + int var11 = var9 >> 3 & 2047; // L: 5114 + int var12 = (var10 / 8 << 8) + var11 / 8; // L: 5115 + + int var13; + for (var13 = 0; var13 < var5; ++var13) { // L: 5116 + if (PlayerComposition.regions[var13] == var12) { + var12 = -1; // L: 5117 + break; // L: 5118 + } + } + + if (var12 != -1) { // L: 5120 + PlayerComposition.regions[var5] = var12; // L: 5121 + var13 = var12 >> 8 & 255; // L: 5122 + int var14 = var12 & 255; // L: 5123 + class16.regionMapArchiveIds[var5] = class247.archive5.getGroupId("m" + var13 + "_" + var14); // L: 5124 + class24.regionLandArchiveIds[var5] = class247.archive5.getGroupId("l" + var13 + "_" + var14); // L: 5125 + ++var5; // L: 5126 + } + } + } + } + } + + Canvas.method391(var3, var2, !var15); // L: 5132 + } + + } // L: 5134 } diff --git a/runescape-client/src/main/java/class34.java b/runescape-client/src/main/java/class34.java index f43112c350..d23de174f0 100644 --- a/runescape-client/src/main/java/class34.java +++ b/runescape-client/src/main/java/class34.java @@ -2,121 +2,84 @@ import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -import net.runelite.rs.Reflection; -@ObfuscatedName("ap") +@ObfuscatedName("ax") public enum class34 implements Enumerated { - @ObfuscatedName("h") + @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "Lap;" + descriptor = "Lax;" ) - field243(0, 0); + field256(0, 0); - @ObfuscatedName("ju") + @ObfuscatedName("oa") @ObfuscatedSignature( - descriptor = "Liv;" + descriptor = "Lms;" ) - @Export("dragInventoryWidget") - static Widget dragInventoryWidget; - @ObfuscatedName("li") - @ObfuscatedSignature( - descriptor = "Liv;" - ) - static Widget field241; - @ObfuscatedName("c") + static class339 field254; + @ObfuscatedName("n") @ObfuscatedGetter( - intValue = -320311027 + intValue = -537510065 ) - final int field238; - @ObfuscatedName("o") + final int field252; + @ObfuscatedName("f") @ObfuscatedGetter( - intValue = 1825459299 + intValue = -1586527889 ) - final int field240; + final int field253; class34(int var3, int var4) { - this.field238 = var3; - this.field240 = var4; // L: 13 + this.field252 = var3; // L: 12 + this.field253 = var4; // L: 13 } // L: 14 - @ObfuscatedName("h") + @ObfuscatedName("v") @ObfuscatedSignature( descriptor = "(I)I", - garbageValue = "-708237537" + garbageValue = "-907662946" ) @Export("rsOrdinal") public int rsOrdinal() { - return this.field240; // L: 17 + return this.field253; // L: 17 } - @ObfuscatedName("h") + @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "([BZI)Ljava/lang/Object;", - garbageValue = "1269397645" + descriptor = "(I)V", + garbageValue = "-67481948" ) - public static Object method388(byte[] var0, boolean var1) { - if (var0 == null) { // L: 7 - return null; - } else if (var0.length > 136) { // L: 8 - DirectByteArrayCopier var2 = new DirectByteArrayCopier(); // L: 10 - var2.set(var0); // L: 11 - return var2; // L: 12 - } else { - return var0; // L: 16 - } - } + static void method327() { + Tiles.Tiles_minPlane = 99; // L: 48 + Tiles.field1120 = new byte[4][104][104]; // L: 49 + class253.field3130 = new byte[4][104][104]; // L: 50 + class20.field182 = new byte[4][104][104]; // L: 51 + DirectByteArrayCopier.field3128 = new byte[4][104][104]; // L: 52 + UrlRequester.field1419 = new int[4][105][105]; // L: 53 + class372.field4123 = new byte[4][105][105]; // L: 54 + class229.field2813 = new int[105][105]; // L: 55 + ChatChannel.Tiles_hue = new int[104]; // L: 56 + class23.Tiles_saturation = new int[104]; // L: 57 + Tiles.Tiles_lightness = new int[104]; // L: 58 + ParamComposition.Tiles_hueMultiplier = new int[104]; // L: 59 + DefaultsGroup.field3894 = new int[104]; // L: 60 + } // L: 61 - @ObfuscatedName("h") + @ObfuscatedName("n") @ObfuscatedSignature( - descriptor = "(Ljp;Ljp;Ljp;Ljp;B)V", - garbageValue = "-21" + descriptor = "(B)V", + garbageValue = "0" ) - public static void method391(AbstractArchive var0, AbstractArchive var1, AbstractArchive var2, AbstractArchive var3) { - GrandExchangeOffer.Widget_archive = var0; - class245.Widget_modelsArchive = var1; - Widget.Widget_spritesArchive = var2; - FileSystem.Widget_fontsArchive = var3; - Widget.Widget_interfaceComponents = new Widget[GrandExchangeOffer.Widget_archive.getGroupCount()][]; - class5.Widget_loadedInterfaces = new boolean[GrandExchangeOffer.Widget_archive.getGroupCount()]; // L: 193 - } // L: 194 - - @ObfuscatedName("l") - @ObfuscatedSignature( - descriptor = "(Ljava/lang/String;I)Ljava/lang/Class;", - garbageValue = "-746687545" - ) - @Export("loadClassFromDescriptor") - static Class loadClassFromDescriptor(String var0) throws ClassNotFoundException { - if (var0.equals("B")) { // L: 222 - return Byte.TYPE; - } else if (var0.equals("I")) { // L: 223 - return Integer.TYPE; - } else if (var0.equals("S")) { // L: 224 - return Short.TYPE; - } else if (var0.equals("J")) { // L: 225 - return Long.TYPE; - } else if (var0.equals("Z")) { // L: 226 - return Boolean.TYPE; - } else if (var0.equals("F")) { // L: 227 - return Float.TYPE; - } else if (var0.equals("D")) { // L: 228 - return Double.TYPE; - } else if (var0.equals("C")) { // L: 229 - return Character.TYPE; - } else { - return var0.equals("void") ? Void.TYPE : Reflection.findClass(var0); // L: 230 231 - } - } - - @ObfuscatedName("k") - @ObfuscatedSignature( - descriptor = "(Ljava/lang/String;I)V", - garbageValue = "51313612" - ) - static final void method393(String var0) { - PacketBufferNode var1 = HealthBarDefinition.getPacketBufferNode(ClientPacket.field2567, Client.packetWriter.isaacCipher); // L: 188 - var1.packetBuffer.writeByte(class4.stringCp1252NullTerminatedByteSize(var0)); // L: 189 - var1.packetBuffer.writeStringCp1252NullTerminated(var0); // L: 190 - Client.packetWriter.addNode(var1); // L: 191 - } // L: 192 + static void method328() { + Tiles.field1120 = null; // L: 64 + class253.field3130 = null; // L: 65 + class20.field182 = null; // L: 66 + DirectByteArrayCopier.field3128 = null; // L: 67 + UrlRequester.field1419 = null; // L: 68 + class372.field4123 = null; // L: 69 + class229.field2813 = null; // L: 70 + ChatChannel.Tiles_hue = null; // L: 71 + class23.Tiles_saturation = null; // L: 72 + Tiles.Tiles_lightness = null; // L: 73 + ParamComposition.Tiles_hueMultiplier = null; // L: 74 + DefaultsGroup.field3894 = null; // L: 75 + } // L: 76 } diff --git a/runescape-client/src/main/java/class340.java b/runescape-client/src/main/java/class340.java index 2a8be3f777..b31a67cffe 100644 --- a/runescape-client/src/main/java/class340.java +++ b/runescape-client/src/main/java/class340.java @@ -1,61 +1,57 @@ -import java.awt.Image; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("mp") +@ObfuscatedName("me") public abstract class class340 extends class214 implements class389 { - @ObfuscatedName("ap") - static Image field3934; - @ObfuscatedSignature( - descriptor = "(Ljr;Lkr;I)V" + descriptor = "(Ljd;Lkk;I)V" ) protected class340(StudioGame var1, Language var2, int var3) { super(var1, var2, var3); // L: 15 } // L: 16 - @ObfuscatedName("h") + @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "(II)Lmi;", - garbageValue = "1012040544" + descriptor = "(II)Lml;", + garbageValue = "1996028065" ) - protected abstract class342 vmethod6308(int var1); + protected abstract class342 vmethod6434(int var1); - @ObfuscatedName("c") + @ObfuscatedName("n") @ObfuscatedSignature( descriptor = "(I)I", - garbageValue = "1225449172" + garbageValue = "-1710884845" ) - public int method5863() { - return super.field2549; // L: 19 + public int method6018() { + return super.field2558; // L: 19 } - @ObfuscatedName("o") + @ObfuscatedName("f") @ObfuscatedSignature( descriptor = "(II)Ljava/lang/Object;", - garbageValue = "-666299836" + garbageValue = "-1572379722" ) - public Object vmethod6737(int var1) { - class342 var2 = this.vmethod6308(var1); // L: 23 - return var2 != null && var2.method5881() ? var2.method5884() : null; // L: 24 25 + public Object vmethod6837(int var1) { + class342 var2 = this.vmethod6434(var1); // L: 23 + return var2 != null && var2.method6040() ? var2.method6038() : null; // L: 24 25 } - @ObfuscatedName("g") + @ObfuscatedName("y") @ObfuscatedSignature( - descriptor = "(Lnk;I)Lol;", - garbageValue = "1464292562" + descriptor = "(Lnd;B)Loc;", + garbageValue = "66" ) - public class390 method5873(Buffer var1) { + public class390 method6021(Buffer var1) { int var2 = var1.readUnsignedShort(); // L: 29 - class342 var3 = this.vmethod6308(var2); // L: 30 + class342 var3 = this.vmethod6434(var2); // L: 30 class390 var4 = new class390(var2); // L: 31 - Class var5 = var3.field3936.field4134; // L: 32 + Class var5 = var3.field3927.field4127; // L: 32 if (var5 == Integer.class) { // L: 33 - var4.field4221 = var1.readInt(); + var4.field4218 = var1.readInt(); } else if (var5 == Long.class) { - var4.field4221 = var1.readLong(); // L: 34 + var4.field4218 = var1.readLong(); // L: 34 } else if (var5 == String.class) { // L: 35 - var4.field4221 = var1.readStringCp1252NullCircumfixed(); + var4.field4218 = var1.readStringCp1252NullCircumfixed(); } else { if (!class385.class.isAssignableFrom(var5)) { // L: 36 throw new IllegalStateException(); // L: 45 @@ -63,8 +59,8 @@ public abstract class class340 extends class214 implements class389 { try { class385 var6 = (class385)var5.newInstance(); // L: 38 - var6.method6714(var1); // L: 39 - var4.field4221 = var6; // L: 40 + var6.method6815(var1); // L: 39 + var4.field4218 = var6; // L: 40 } catch (InstantiationException var7) { // L: 42 } catch (IllegalAccessException var8) { // L: 43 } diff --git a/runescape-client/src/main/java/class341.java b/runescape-client/src/main/java/class341.java index 84bca1e84b..f4b2c7e781 100644 --- a/runescape-client/src/main/java/class341.java +++ b/runescape-client/src/main/java/class341.java @@ -2,24 +2,24 @@ import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("mr") +@ObfuscatedName("mq") public class class341 extends class342 { - @ObfuscatedName("hz") + @ObfuscatedName("j") @ObfuscatedSignature( - descriptor = "[Low;" + descriptor = "Ljv;" ) - @Export("mapDotSprites") - static SpritePixels[] mapDotSprites; + @Export("ItemDefinition_archive") + public static AbstractArchive ItemDefinition_archive; public class341(int var1) { super(var1); // L: 7 } // L: 8 - @ObfuscatedName("h") + @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "(Lnk;II)V", - garbageValue = "1226667893" + descriptor = "(Lnd;II)V", + garbageValue = "-1773936298" ) - void vmethod5880(Buffer var1, int var2) { + void vmethod6036(Buffer var1, int var2) { } // L: 11 } diff --git a/runescape-client/src/main/java/class342.java b/runescape-client/src/main/java/class342.java index 6fa157b609..39c5328cfe 100644 --- a/runescape-client/src/main/java/class342.java +++ b/runescape-client/src/main/java/class342.java @@ -1,84 +1,107 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("mi") +@ObfuscatedName("ml") public abstract class class342 implements class213 { - @ObfuscatedName("h") + @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "Lnz;" + descriptor = "Lnp;" ) - class374 field3936; + class374 field3927; class342(int var1) { } // L: 13 - @ObfuscatedName("h") + @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "(Lnk;II)V", - garbageValue = "1226667893" + descriptor = "(Lnd;II)V", + garbageValue = "-1773936298" ) - abstract void vmethod5880(Buffer var1, int var2); + abstract void vmethod6036(Buffer var1, int var2); - @ObfuscatedName("g") + @ObfuscatedName("f") @ObfuscatedSignature( - descriptor = "(Lnk;I)V", - garbageValue = "-1780530418" + descriptor = "(Lnd;I)V", + garbageValue = "-1490587397" ) - public void method5879(Buffer var1) { + public void method6035(Buffer var1) { while (true) { int var2 = var1.readUnsignedByte(); // L: 17 if (var2 == 0) { // L: 18 - return; // L: 43 + return; // L: 56 } - class338 var3 = (class338)UserComparator4.findEnumerated(TriBool.method5690(), var2); // L: 19 + class338 var3 = (class338)Messages.findEnumerated(FloorDecoration.method3834(), var2); // L: 19 if (var3 != null) { // L: 20 - switch(var3.field3924) { // L: 21 + switch(var3.field3918) { // L: 21 case 0: - int var4 = var1.readUnsignedByte(); // L: 23 - this.field3936 = WorldMapSprite.method3581(var4); // L: 24 - if (this.field3936 != null) { + Messages.findEnumerated(class258.method4835(), var1.readUnsignedByte()); // L: 23 + break; + case 1: + int var4 = var1.readUnsignedByte(); // L: 29 + int var6 = class372.field4124[var4]; // L: 32 + class374 var5; + if (var6 == 1) { // L: 33 + var5 = class374.field4131; // L: 34 + } else if (var6 == 2) { // L: 37 + var5 = class374.field4129; // L: 38 + } else if (var6 == 3) { // L: 41 + var5 = class374.field4128; // L: 42 + } else { + var5 = null; // L: 45 + } + + this.field3927 = var5; // L: 47 + if (this.field3927 != null) { break; } - throw new IllegalStateException("Unknown ScriptVarType ID in VarType.decode: " + var4); // L: 25 - case 1: - class268[] var5 = new class268[]{class268.field3544, class268.field3550, class268.field3545, class268.field3543}; // L: 30 - UserComparator4.findEnumerated(var5, var1.readUnsignedByte()); // L: 32 - break; // L: 33 + throw new IllegalStateException("Unknown ScriptVarType ID in VarType.decode: " + var4); // L: 48 case 2: - var1.readStringCp1252NullCircumfixed(); // L: 37 - break; + var1.readStringCp1252NullCircumfixed(); // L: 26 + break; // L: 27 default: - throw new IllegalStateException("Unrecognised VarTypeEncodingKey - " + var3); // L: 35 + throw new IllegalStateException("Unrecognised VarTypeEncodingKey - " + var3); // L: 51 } } else { - this.vmethod5880(var1, var2); // L: 41 + this.vmethod6036(var1, var2); // L: 54 } } } - @ObfuscatedName("l") + @ObfuscatedName("y") @ObfuscatedSignature( descriptor = "(I)Z", - garbageValue = "79330910" + garbageValue = "-1118376221" ) - boolean method5881() { - return this.field3936 != null; // L: 48 + boolean method6040() { + return this.field3927 != null; // L: 61 } - @ObfuscatedName("z") + @ObfuscatedName("p") @ObfuscatedSignature( descriptor = "(I)Ljava/lang/Object;", - garbageValue = "-159166525" + garbageValue = "-334523720" ) - Object method5884() { - if (this.field3936 == class374.field4141) { // L: 52 - return 0; // L: 53 - } else if (this.field3936 == class374.field4135) { // L: 55 - return -1L; // L: 56 + Object method6038() { + if (this.field3927 == class374.field4131) { // L: 65 + return 0; // L: 66 + } else if (this.field3927 == class374.field4128) { // L: 68 + return -1L; // L: 69 } else { - return this.field3936 == class374.field4136 ? "" : null; // L: 58 59 61 + return this.field3927 == class374.field4129 ? "" : null; // L: 71 72 74 } } + + @ObfuscatedName("p") + @ObfuscatedSignature( + descriptor = "(IIII)I", + garbageValue = "15704077" + ) + public static int method6043(int var0, int var1, int var2) { + int var3 = CollisionMap.method3185(var2 - var1 + 1); // L: 57 + var3 <<= var1; // L: 58 + var0 |= var3; // L: 59 + return var0; // L: 60 + } } diff --git a/runescape-client/src/main/java/class343.java b/runescape-client/src/main/java/class343.java index 93abe23495..570901a120 100644 --- a/runescape-client/src/main/java/class343.java +++ b/runescape-client/src/main/java/class343.java @@ -1,5 +1,5 @@ import net.runelite.mapping.ObfuscatedName; -@ObfuscatedName("mh") +@ObfuscatedName("mm") public interface class343 { } diff --git a/runescape-client/src/main/java/class344.java b/runescape-client/src/main/java/class344.java index cfcf9a0a1c..c1cacf646d 100644 --- a/runescape-client/src/main/java/class344.java +++ b/runescape-client/src/main/java/class344.java @@ -1,5 +1,5 @@ import net.runelite.mapping.ObfuscatedName; -@ObfuscatedName("mq") +@ObfuscatedName("mp") public interface class344 extends class343 { } diff --git a/runescape-client/src/main/java/class349.java b/runescape-client/src/main/java/class349.java index e850b996c2..995d4a5ea6 100644 --- a/runescape-client/src/main/java/class349.java +++ b/runescape-client/src/main/java/class349.java @@ -1,11 +1,11 @@ import net.runelite.mapping.ObfuscatedName; -@ObfuscatedName("mm") +@ObfuscatedName("mx") public class class349 extends Node { - @ObfuscatedName("h") - public long field3945; + @ObfuscatedName("v") + public long field3935; public class349(long var1) { - this.field3945 = var1; // L: 7 + this.field3935 = var1; // L: 7 } // L: 8 } diff --git a/runescape-client/src/main/java/class35.java b/runescape-client/src/main/java/class35.java index f03af4b7cb..63daf5e3ea 100644 --- a/runescape-client/src/main/java/class35.java +++ b/runescape-client/src/main/java/class35.java @@ -6,354 +6,220 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("am") +@ObfuscatedName("as") public class class35 { - @ObfuscatedName("f") - @Export("operatingSystemName") - static String operatingSystemName; - @ObfuscatedName("ix") + @ObfuscatedName("ra") @ObfuscatedGetter( - intValue = 327341305 + intValue = -1989236693 ) - @Export("selectedItemWidget") - static int selectedItemWidget; - @ObfuscatedName("ky") + static int field264; + @ObfuscatedName("w") + @Export("operatingSystemName") + public static String operatingSystemName; + @ObfuscatedName("ga") @ObfuscatedSignature( - descriptor = "Lcg;" + descriptor = "[Loh;" ) - @Export("localPlayer") - static Player localPlayer; - @ObfuscatedName("h") - ExecutorService field246; - @ObfuscatedName("c") - Future field247; - @ObfuscatedName("o") + @Export("headIconPkSprites") + static SpritePixels[] headIconPkSprites; + @ObfuscatedName("v") + ExecutorService field262; + @ObfuscatedName("n") + Future field260; + @ObfuscatedName("f") @ObfuscatedSignature( - descriptor = "Lnk;" + descriptor = "Lnd;" ) - final Buffer field244; - @ObfuscatedName("g") + final Buffer field261; + @ObfuscatedName("y") @ObfuscatedSignature( - descriptor = "Lat;" + descriptor = "Lai;" ) - final class31 field245; + final class31 field268; @ObfuscatedSignature( - descriptor = "(Lnk;Lat;)V" + descriptor = "(Lnd;Lai;)V" ) public class35(Buffer var1, class31 var2) { - this.field246 = Executors.newSingleThreadExecutor(); // L: 10 - this.field244 = var1; // L: 16 - this.field245 = var2; // L: 17 - this.method399(); // L: 18 + this.field262 = Executors.newSingleThreadExecutor(); // L: 10 + this.field261 = var1; // L: 16 + this.field268 = var2; // L: 17 + this.method335(); // L: 18 } // L: 19 - @ObfuscatedName("h") + @ObfuscatedName("v") @ObfuscatedSignature( descriptor = "(B)Z", - garbageValue = "2" + garbageValue = "70" ) - public boolean method409() { - return this.field247.isDone(); // L: 22 + public boolean method342() { + return this.field260.isDone(); // L: 22 } - @ObfuscatedName("c") + @ObfuscatedName("n") @ObfuscatedSignature( - descriptor = "(S)V", - garbageValue = "20171" + descriptor = "(B)V", + garbageValue = "-47" ) - public void method397() { - this.field246.shutdown(); // L: 26 - this.field246 = null; // L: 27 + public void method332() { + this.field262.shutdown(); // L: 26 + this.field262 = null; // L: 27 } // L: 28 - @ObfuscatedName("o") + @ObfuscatedName("f") @ObfuscatedSignature( - descriptor = "(I)Lnk;", - garbageValue = "-342395493" + descriptor = "(I)Lnd;", + garbageValue = "-1675442246" ) - public Buffer method408() { + public Buffer method331() { try { - return (Buffer)this.field247.get(); // L: 32 + return (Buffer)this.field260.get(); // L: 32 } catch (Exception var2) { // L: 34 return null; // L: 35 } } - @ObfuscatedName("g") + @ObfuscatedName("y") @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "1826424495" + descriptor = "(B)V", + garbageValue = "4" ) - void method399() { - this.field247 = this.field246.submit(new class29(this, this.field244, this.field245)); // L: 40 + void method335() { + this.field260 = this.field262.submit(new class29(this, this.field261, this.field268)); // L: 40 } // L: 41 - @ObfuscatedName("g") + @ObfuscatedName("ip") @ObfuscatedSignature( - descriptor = "(Lnm;II)V", - garbageValue = "415858019" + descriptor = "(Lef;IIII)V", + garbageValue = "-336055981" ) - @Export("readPlayerUpdate") - static void readPlayerUpdate(PacketBuffer var0, int var1) { - boolean var2 = var0.readBits(1) == 1; // L: 229 - if (var2) { // L: 230 - Players.Players_pendingUpdateIndices[++Players.Players_pendingUpdateCount - 1] = var1; - } - - int var3 = var0.readBits(2); // L: 231 - Player var4 = Client.players[var1]; // L: 232 - if (var3 == 0) { // L: 233 - if (var2) { // L: 234 - var4.field1186 = false; // L: 235 - } else if (Client.localPlayerIndex == var1) { // L: 238 - throw new RuntimeException(); - } else { - Players.Players_regions[var1] = (var4.plane << 28) + (JagexCache.baseX + var4.pathX[0] >> 13 << 14) + (Messages.baseY + var4.pathY[0] >> 13); // L: 239 - if (var4.field1247 != -1) { // L: 240 - Players.Players_orientations[var1] = var4.field1247; - } else { - Players.Players_orientations[var1] = var4.orientation; // L: 241 - } - - Players.Players_targetIndices[var1] = var4.targetIndex; // L: 242 - Client.players[var1] = null; // L: 243 - if (var0.readBits(1) != 0) { // L: 244 - Tiles.updateExternalPlayer(var0, var1); - } - + @Export("addNpcToMenu") + static final void addNpcToMenu(NPCComposition var0, int var1, int var2, int var3) { + if (Client.menuOptionsCount < 400) { // L: 8995 + if (var0.transforms != null) { // L: 8996 + var0 = var0.transform(); } - } else { - int var5; - int var6; - int var7; - if (var3 == 1) { // L: 247 - var5 = var0.readBits(3); // L: 248 - var6 = var4.pathX[0]; // L: 249 - var7 = var4.pathY[0]; // L: 250 - if (var5 == 0) { // L: 251 - --var6; // L: 252 - --var7; // L: 253 - } else if (var5 == 1) { // L: 255 - --var7; - } else if (var5 == 2) { // L: 256 - ++var6; // L: 257 - --var7; // L: 258 - } else if (var5 == 3) { // L: 260 - --var6; - } else if (var5 == 4) { // L: 261 - ++var6; - } else if (var5 == 5) { // L: 262 - --var6; // L: 263 - ++var7; // L: 264 - } else if (var5 == 6) { // L: 266 - ++var7; - } else if (var5 == 7) { // L: 267 - ++var6; // L: 268 - ++var7; // L: 269 - } - if (Client.localPlayerIndex == var1 && (var4.x < 1536 || var4.y < 1536 || var4.x >= 11776 || var4.y >= 11776)) { // L: 271 - var4.resetPath(var6, var7); // L: 272 - var4.field1186 = false; // L: 273 - } else if (var2) { // L: 275 - var4.field1186 = true; // L: 276 - var4.tileX = var6; // L: 277 - var4.tileY = var7; // L: 278 - } else { - var4.field1186 = false; // L: 281 - var4.method2140(var6, var7, Players.field1345[var1]); // L: 282 - } + if (var0 != null) { // L: 8997 + if (var0.isInteractable) { // L: 8998 + if (!var0.isFollower || Client.followerIndex == var1) { // L: 8999 + String var4 = var0.name; // L: 9000 + int var7; + int var8; + if (var0.combatLevel != 0) { // L: 9001 + var7 = var0.combatLevel; // L: 9004 + var8 = class93.localPlayer.combatLevel; // L: 9005 + int var9 = var8 - var7; // L: 9007 + String var6; + if (var9 < -9) { // L: 9008 + var6 = class44.colorStartTag(16711680); // L: 9009 + } else if (var9 < -6) { // L: 9012 + var6 = class44.colorStartTag(16723968); // L: 9013 + } else if (var9 < -3) { // L: 9016 + var6 = class44.colorStartTag(16740352); // L: 9017 + } else if (var9 < 0) { // L: 9020 + var6 = class44.colorStartTag(16756736); // L: 9021 + } else if (var9 > 9) { // L: 9024 + var6 = class44.colorStartTag(65280); // L: 9025 + } else if (var9 > 6) { // L: 9028 + var6 = class44.colorStartTag(4259584); // L: 9029 + } else if (var9 > 3) { // L: 9032 + var6 = class44.colorStartTag(8453888); // L: 9033 + } else if (var9 > 0) { // L: 9036 + var6 = class44.colorStartTag(12648192); // L: 9037 + } else { + var6 = class44.colorStartTag(16776960); // L: 9040 + } - } else if (var3 == 2) { // L: 286 - var5 = var0.readBits(4); // L: 287 - var6 = var4.pathX[0]; // L: 288 - var7 = var4.pathY[0]; // L: 289 - if (var5 == 0) { // L: 290 - var6 -= 2; // L: 291 - var7 -= 2; // L: 292 - } else if (var5 == 1) { // L: 294 - --var6; // L: 295 - var7 -= 2; // L: 296 - } else if (var5 == 2) { // L: 298 - var7 -= 2; - } else if (var5 == 3) { // L: 299 - ++var6; // L: 300 - var7 -= 2; // L: 301 - } else if (var5 == 4) { // L: 303 - var6 += 2; // L: 304 - var7 -= 2; // L: 305 - } else if (var5 == 5) { // L: 307 - var6 -= 2; // L: 308 - --var7; // L: 309 - } else if (var5 == 6) { // L: 311 - var6 += 2; // L: 312 - --var7; // L: 313 - } else if (var5 == 7) { // L: 315 - var6 -= 2; - } else if (var5 == 8) { // L: 316 - var6 += 2; - } else if (var5 == 9) { // L: 317 - var6 -= 2; // L: 318 - ++var7; // L: 319 - } else if (var5 == 10) { // L: 321 - var6 += 2; // L: 322 - ++var7; // L: 323 - } else if (var5 == 11) { // L: 325 - var6 -= 2; // L: 326 - var7 += 2; // L: 327 - } else if (var5 == 12) { // L: 329 - --var6; // L: 330 - var7 += 2; // L: 331 - } else if (var5 == 13) { // L: 333 - var7 += 2; - } else if (var5 == 14) { // L: 334 - ++var6; // L: 335 - var7 += 2; // L: 336 - } else if (var5 == 15) { // L: 338 - var6 += 2; // L: 339 - var7 += 2; // L: 340 - } + var4 = var4 + var6 + " " + " (" + "level-" + var0.combatLevel + ")"; // L: 9042 + } + + if (var0.isFollower && Client.followerOpsLowPriority) { // L: 9044 + Occluder.insertMenuItemNoShift("Examine", class44.colorStartTag(16776960) + var4, 1003, var1, var2, var3); // L: 9045 + } + + if (Client.isItemSelected == 1) { // L: 9048 + Occluder.insertMenuItemNoShift("Use", Client.selectedItemName + " " + "->" + " " + class44.colorStartTag(16776960) + var4, 7, var1, var2, var3); // L: 9049 + } else if (Client.isSpellSelected) { // L: 9052 + if ((class4.selectedSpellFlags & 2) == 2) { // L: 9053 + Occluder.insertMenuItemNoShift(Client.selectedSpellActionName, Client.selectedSpellName + " " + "->" + " " + class44.colorStartTag(16776960) + var4, 8, var1, var2, var3); // L: 9054 + } + } else { + int var10 = var0.isFollower && Client.followerOpsLowPriority ? 2000 : 0; // L: 9059 + String[] var11 = var0.actions; // L: 9060 + if (var11 != null) { // L: 9061 + for (var7 = 4; var7 >= 0; --var7) { // L: 9062 + if (var11[var7] != null && !var11[var7].equalsIgnoreCase("Attack")) { // L: 9063 + var8 = 0; // L: 9064 + if (var7 == 0) { // L: 9065 + var8 = var10 + 9; + } + + if (var7 == 1) { // L: 9066 + var8 = var10 + 10; + } + + if (var7 == 2) { // L: 9067 + var8 = var10 + 11; + } + + if (var7 == 3) { // L: 9068 + var8 = var10 + 12; + } + + if (var7 == 4) { // L: 9069 + var8 = var10 + 13; + } + + Occluder.insertMenuItemNoShift(var11[var7], class44.colorStartTag(16776960) + var4, var8, var1, var2, var3); // L: 9070 + } + } + } + + if (var11 != null) { // L: 9075 + for (var7 = 4; var7 >= 0; --var7) { // L: 9076 + if (var11[var7] != null && var11[var7].equalsIgnoreCase("Attack")) { // L: 9077 + short var12 = 0; // L: 9078 + if (Client.npcAttackOption != AttackOption.AttackOption_hidden) { // L: 9079 + if (Client.npcAttackOption == AttackOption.AttackOption_alwaysRightClick || Client.npcAttackOption == AttackOption.AttackOption_dependsOnCombatLevels && var0.combatLevel > class93.localPlayer.combatLevel) { // L: 9080 + var12 = 2000; // L: 9081 + } + + var8 = 0; // L: 9083 + if (var7 == 0) { // L: 9084 + var8 = var12 + 9; + } + + if (var7 == 1) { // L: 9085 + var8 = var12 + 10; + } + + if (var7 == 2) { // L: 9086 + var8 = var12 + 11; + } + + if (var7 == 3) { // L: 9087 + var8 = var12 + 12; + } + + if (var7 == 4) { // L: 9088 + var8 = var12 + 13; + } + + Occluder.insertMenuItemNoShift(var11[var7], class44.colorStartTag(16776960) + var4, var8, var1, var2, var3); // L: 9089 + } + } + } + } + + if (!var0.isFollower || !Client.followerOpsLowPriority) { // L: 9094 + Occluder.insertMenuItemNoShift("Examine", class44.colorStartTag(16776960) + var4, 1003, var1, var2, var3); // L: 9095 + } + } - if (Client.localPlayerIndex != var1 || var4.x >= 1536 && var4.y >= 1536 && var4.x < 11776 && var4.y < 11776) { // L: 342 - if (var2) { // L: 346 - var4.field1186 = true; // L: 347 - var4.tileX = var6; // L: 348 - var4.tileY = var7; // L: 349 - } else { - var4.field1186 = false; // L: 352 - var4.method2140(var6, var7, Players.field1345[var1]); // L: 353 } - } else { - var4.resetPath(var6, var7); // L: 343 - var4.field1186 = false; // L: 344 - } - - } else { - var5 = var0.readBits(1); // L: 357 - int var8; - int var9; - int var10; - int var11; - if (var5 == 0) { // L: 358 - var6 = var0.readBits(12); // L: 359 - var7 = var6 >> 10; // L: 360 - var8 = var6 >> 5 & 31; // L: 361 - if (var8 > 15) { // L: 362 - var8 -= 32; - } - - var9 = var6 & 31; // L: 363 - if (var9 > 15) { // L: 364 - var9 -= 32; - } - - var10 = var8 + var4.pathX[0]; // L: 365 - var11 = var9 + var4.pathY[0]; // L: 366 - if (Client.localPlayerIndex == var1 && (var4.x < 1536 || var4.y < 1536 || var4.x >= 11776 || var4.y >= 11776)) { // L: 367 - var4.resetPath(var10, var11); // L: 368 - var4.field1186 = false; // L: 369 - } else if (var2) { // L: 371 - var4.field1186 = true; // L: 372 - var4.tileX = var10; // L: 373 - var4.tileY = var11; // L: 374 - } else { - var4.field1186 = false; // L: 377 - var4.method2140(var10, var11, Players.field1345[var1]); // L: 378 - } - - var4.plane = (byte)(var7 + var4.plane & 3); // L: 380 - if (Client.localPlayerIndex == var1) { // L: 381 - ParamComposition.Client_plane = var4.plane; - } - - } else { - var6 = var0.readBits(30); // L: 384 - var7 = var6 >> 28; // L: 385 - var8 = var6 >> 14 & 16383; // L: 386 - var9 = var6 & 16383; // L: 387 - var10 = (var8 + JagexCache.baseX + var4.pathX[0] & 16383) - JagexCache.baseX; // L: 388 - var11 = (var9 + Messages.baseY + var4.pathY[0] & 16383) - Messages.baseY; // L: 389 - if (Client.localPlayerIndex == var1 && (var4.x < 1536 || var4.y < 1536 || var4.x >= 11776 || var4.y >= 11776)) { // L: 390 - var4.resetPath(var10, var11); // L: 391 - var4.field1186 = false; // L: 392 - } else if (var2) { // L: 394 - var4.field1186 = true; // L: 395 - var4.tileX = var10; // L: 396 - var4.tileY = var11; // L: 397 - } else { - var4.field1186 = false; // L: 400 - var4.method2140(var10, var11, Players.field1345[var1]); // L: 401 - } - - var4.plane = (byte)(var7 + var4.plane & 3); // L: 403 - if (Client.localPlayerIndex == var1) { // L: 404 - ParamComposition.Client_plane = var4.plane; - } - } } } - } // L: 236 245 284 355 382 405 - - @ObfuscatedName("gc") - @ObfuscatedSignature( - descriptor = "(Lcj;IS)V", - garbageValue = "14935" - ) - @Export("updateActorSequence") - static final void updateActorSequence(Actor var0, int var1) { - int var2; - int var3; - int var4; - if (var0.field1254 >= Client.cycle) { // L: 4040 - var2 = Math.max(1, var0.field1254 - Client.cycle); // L: 4041 - var3 = var0.field1211 * 64 + var0.field1236 * 128; // L: 4042 - var4 = var0.field1211 * 64 + var0.field1252 * 128; // L: 4043 - var0.x += (var3 - var0.x) / var2; // L: 4044 - var0.y += (var4 - var0.y) / var2; // L: 4045 - var0.field1250 = 0; // L: 4046 - var0.orientation = var0.field1256; // L: 4047 - } else if (var0.field1237 >= Client.cycle) { // L: 4049 - if (var0.field1237 == Client.cycle || var0.sequence == -1 || var0.sequenceDelay != 0 || var0.sequenceFrameCycle + 1 > Player.SequenceDefinition_get(var0.sequence).frameLengths[var0.sequenceFrame]) { // L: 4050 - var2 = var0.field1237 - var0.field1254; // L: 4051 - var3 = Client.cycle - var0.field1254; // L: 4052 - var4 = var0.field1211 * 64 + var0.field1236 * 128; // L: 4053 - int var5 = var0.field1211 * 64 + var0.field1252 * 128; // L: 4054 - int var6 = var0.field1211 * 64 + var0.field1251 * 128; // L: 4055 - int var7 = var0.field1211 * 64 + var0.field1253 * 128; // L: 4056 - var0.x = (var3 * var6 + var4 * (var2 - var3)) / var2; // L: 4057 - var0.y = (var7 * var3 + var5 * (var2 - var3)) / var2; // L: 4058 - } - - var0.field1250 = 0; // L: 4060 - var0.orientation = var0.field1256; // L: 4061 - var0.rotation = var0.orientation; // L: 4062 - } else { - class369.method6314(var0); // L: 4064 - } - - if (var0.x < 128 || var0.y < 128 || var0.x >= 13184 || var0.y >= 13184) { // L: 4065 - var0.sequence = -1; // L: 4066 - var0.spotAnimation = -1; // L: 4067 - var0.field1254 = 0; // L: 4068 - var0.field1237 = 0; // L: 4069 - var0.x = var0.field1211 * 64 + var0.pathX[0] * 128; // L: 4070 - var0.y = var0.pathY[0] * 128 + var0.field1211 * 64; // L: 4071 - var0.method2194(); // L: 4072 - } - - if (localPlayer == var0 && (var0.x < 1536 || var0.y < 1536 || var0.x >= 11776 || var0.y >= 11776)) { // L: 4074 4075 - var0.sequence = -1; // L: 4076 - var0.spotAnimation = -1; // L: 4077 - var0.field1254 = 0; // L: 4078 - var0.field1237 = 0; // L: 4079 - var0.x = var0.pathX[0] * 128 + var0.field1211 * 64; // L: 4080 - var0.y = var0.field1211 * 64 + var0.pathY[0] * 128; // L: 4081 - var0.method2194(); // L: 4082 - } - - class7.method87(var0); // L: 4085 - class6.method71(var0); // L: 4086 - } // L: 4087 + } // L: 9099 } diff --git a/runescape-client/src/main/java/class36.java b/runescape-client/src/main/java/class36.java index d0a90120ea..5eb538b5cd 100644 --- a/runescape-client/src/main/java/class36.java +++ b/runescape-client/src/main/java/class36.java @@ -1,35 +1,35 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ax") +@ObfuscatedName("aj") public class class36 { - @ObfuscatedName("h") - final int field252; - @ObfuscatedName("c") - final int field251; - @ObfuscatedName("o") - final String field253; + @ObfuscatedName("v") + final int field271; + @ObfuscatedName("n") + final int field272; + @ObfuscatedName("f") + final String field270; @ObfuscatedSignature( - descriptor = "(Lnk;)V" + descriptor = "(Lnd;)V" ) class36(Buffer var1) { this(var1.readUnsignedByte(), var1.readUnsignedByte(), var1.readStringCp1252NullTerminated()); // L: 19 } // L: 20 class36(int var1, int var2, String var3) { - this.field252 = var1; // L: 13 - this.field251 = var2; // L: 14 - this.field253 = var3; // L: 15 + this.field271 = var1; // L: 13 + this.field272 = var2; // L: 14 + this.field270 = var3; // L: 15 } // L: 16 - @ObfuscatedName("h") - String method411() { - return Integer.toHexString(this.field252) + Integer.toHexString(this.field251) + this.field253; // L: 23 + @ObfuscatedName("v") + String method345() { + return Integer.toHexString(this.field271) + Integer.toHexString(this.field272) + this.field270; // L: 23 } - @ObfuscatedName("c") - int method417() { - return this.field251; // L: 27 + @ObfuscatedName("n") + int method346() { + return this.field272; // L: 27 } } diff --git a/runescape-client/src/main/java/class362.java b/runescape-client/src/main/java/class362.java index 54b46d57ae..4ff631031a 100644 --- a/runescape-client/src/main/java/class362.java +++ b/runescape-client/src/main/java/class362.java @@ -1,19 +1,19 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("mj") +@ObfuscatedName("mg") public interface class362 extends Iterable { - @ObfuscatedName("h") + @ObfuscatedName("v") @ObfuscatedSignature( descriptor = "(II)I", - garbageValue = "-967265307" + garbageValue = "-350566290" ) - int vmethod6222(int var1); + int vmethod6362(int var1); - @ObfuscatedName("c") + @ObfuscatedName("n") @ObfuscatedSignature( - descriptor = "(ILjava/lang/Object;S)V", - garbageValue = "22050" + descriptor = "(ILjava/lang/Object;I)V", + garbageValue = "-1681668792" ) - void vmethod6221(int var1, Object var2); + void vmethod6364(int var1, Object var2); } diff --git a/runescape-client/src/main/java/class363.java b/runescape-client/src/main/java/class363.java index c6a4367ac1..7a979e3768 100644 --- a/runescape-client/src/main/java/class363.java +++ b/runescape-client/src/main/java/class363.java @@ -5,60 +5,62 @@ import java.util.Map; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("mk") +@ObfuscatedName("mt") public class class363 implements class362 { - @ObfuscatedName("h") - Map field4092; - @ObfuscatedName("c") + @ObfuscatedName("br") + static String field4079; + @ObfuscatedName("v") + Map field4082; + @ObfuscatedName("n") @ObfuscatedSignature( - descriptor = "Lnf;" + descriptor = "Lne;" ) - final class389 field4091; + final class389 field4078; @ObfuscatedSignature( - descriptor = "(Lnf;)V" + descriptor = "(Lne;)V" ) public class363(class389 var1) { - this.field4091 = var1; // L: 15 + this.field4078 = var1; // L: 15 } // L: 16 - @ObfuscatedName("h") + @ObfuscatedName("v") @ObfuscatedSignature( descriptor = "(II)I", - garbageValue = "-967265307" + garbageValue = "-350566290" ) - public int vmethod6222(int var1) { - if (this.field4092 != null) { // L: 19 - class390 var2 = (class390)this.field4092.get(var1); // L: 20 + public int vmethod6362(int var1) { + if (this.field4082 != null) { // L: 19 + class390 var2 = (class390)this.field4082.get(var1); // L: 20 if (var2 != null) { - return (Integer)var2.field4221; // L: 21 + return (Integer)var2.field4218; // L: 21 } } - return (Integer)this.field4091.vmethod6737(var1); // L: 23 + return (Integer)this.field4078.vmethod6837(var1); // L: 23 } - @ObfuscatedName("c") + @ObfuscatedName("n") @ObfuscatedSignature( - descriptor = "(ILjava/lang/Object;S)V", - garbageValue = "22050" + descriptor = "(ILjava/lang/Object;I)V", + garbageValue = "-1681668792" ) - public void vmethod6221(int var1, Object var2) { - if (this.field4092 == null) { // L: 27 - this.field4092 = new HashMap(); // L: 28 - this.field4092.put(var1, new class390(var1, var2)); // L: 29 + public void vmethod6364(int var1, Object var2) { + if (this.field4082 == null) { // L: 27 + this.field4082 = new HashMap(); // L: 28 + this.field4082.put(var1, new class390(var1, var2)); // L: 29 } else { - class390 var3 = (class390)this.field4092.get(var1); // L: 32 + class390 var3 = (class390)this.field4082.get(var1); // L: 32 if (var3 == null) { - this.field4092.put(var1, new class390(var1, var2)); // L: 33 + this.field4082.put(var1, new class390(var1, var2)); // L: 33 } else { - var3.field4221 = var2; // L: 34 + var3.field4218 = var2; // L: 34 } } } // L: 36 public Iterator iterator() { - return this.field4092 == null ? Collections.emptyList().iterator() : this.field4092.values().iterator(); // L: 39 40 + return this.field4082 == null ? Collections.emptyList().iterator() : this.field4082.values().iterator(); // L: 39 40 } } diff --git a/runescape-client/src/main/java/class365.java b/runescape-client/src/main/java/class365.java index 3c90ad5d2b..bdd9722c6d 100644 --- a/runescape-client/src/main/java/class365.java +++ b/runescape-client/src/main/java/class365.java @@ -1,14 +1,14 @@ import net.runelite.mapping.ObfuscatedName; -@ObfuscatedName("ny") +@ObfuscatedName("nk") public class class365 { - @ObfuscatedName("o") - static final char[] field4106; - @ObfuscatedName("g") - static final char[] field4104; + @ObfuscatedName("f") + static final char[] field4096; + @ObfuscatedName("y") + static final char[] field4097; static { - field4106 = new char[]{' ', ' ', '_', '-', 'à', 'á', 'â', 'ä', 'ã', 'À', 'Á', 'Â', 'Ä', 'Ã', 'è', 'é', 'ê', 'ë', 'È', 'É', 'Ê', 'Ë', 'í', 'î', 'ï', 'Í', 'Î', 'Ï', 'ò', 'ó', 'ô', 'ö', 'õ', 'Ò', 'Ó', 'Ô', 'Ö', 'Õ', 'ù', 'ú', 'û', 'ü', 'Ù', 'Ú', 'Û', 'Ü', 'ç', 'Ç', 'ÿ', 'Ÿ', 'ñ', 'Ñ', 'ß'}; // L: 8 - field4104 = new char[]{'[', ']', '#'}; // L: 9 + field4096 = new char[]{' ', ' ', '_', '-', 'à', 'á', 'â', 'ä', 'ã', 'À', 'Á', 'Â', 'Ä', 'Ã', 'è', 'é', 'ê', 'ë', 'È', 'É', 'Ê', 'Ë', 'í', 'î', 'ï', 'Í', 'Î', 'Ï', 'ò', 'ó', 'ô', 'ö', 'õ', 'Ò', 'Ó', 'Ô', 'Ö', 'Õ', 'ù', 'ú', 'û', 'ü', 'Ù', 'Ú', 'Û', 'Ü', 'ç', 'Ç', 'ÿ', 'Ÿ', 'ñ', 'Ñ', 'ß'}; // L: 8 + field4097 = new char[]{'[', ']', '#'}; // L: 9 } } diff --git a/runescape-client/src/main/java/class368.java b/runescape-client/src/main/java/class368.java index 4c75ae8ffb..4ed3f4e03d 100644 --- a/runescape-client/src/main/java/class368.java +++ b/runescape-client/src/main/java/class368.java @@ -1,78 +1,43 @@ import java.util.Iterator; +import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("na") +@ObfuscatedName("ni") class class368 implements Iterator { - @ObfuscatedName("h") + @ObfuscatedName("j") + @Export("Interpreter_intLocals") + static int[] Interpreter_intLocals; + @ObfuscatedName("v") @ObfuscatedGetter( - intValue = -966003963 + intValue = 425017273 ) - int field4126; + int field4115; // $FF: synthetic field @ObfuscatedSignature( - descriptor = "Lno;" + descriptor = "Lnu;" ) final class369 this$0; @ObfuscatedSignature( - descriptor = "(Lno;)V" + descriptor = "(Lnu;)V" ) class368(class369 var1) { this.this$0 = var1; // L: 50 } - public boolean hasNext() { - return this.field4126 < this.this$0.method5863(); // L: 54 - } - - public Object next() { - int var1 = ++this.field4126 - 1; // L: 58 - class341 var2 = (class341)this.this$0.field4129.get((long)var1); // L: 59 - return var2 != null ? var2 : this.this$0.method6301(var1); // L: 60 61 - } - public void remove() { throw new UnsupportedOperationException(); // L: 65 } - @ObfuscatedName("h") - @ObfuscatedSignature( - descriptor = "(Ljava/lang/CharSequence;B)Ljava/lang/String;", - garbageValue = "0" - ) - public static String method6299(CharSequence var0) { - int var1 = var0.length(); // L: 11 - StringBuilder var2 = new StringBuilder(var1); // L: 12 + public Object next() { + int var1 = ++this.field4115 - 1; // L: 58 + class341 var2 = (class341)this.this$0.field4118.get((long)var1); // L: 59 + return var2 != null ? var2 : this.this$0.method6432(var1); // L: 60 61 + } - for (int var3 = 0; var3 < var1; ++var3) { // L: 13 - char var4 = var0.charAt(var3); // L: 14 - if ((var4 < 'a' || var4 > 'z') && (var4 < 'A' || var4 > 'Z') && (var4 < '0' || var4 > '9') && var4 != '.' && var4 != '-' && var4 != '*' && var4 != '_') { // L: 15 - if (var4 == ' ') { // L: 16 - var2.append('+'); - } else { - byte var5 = DirectByteArrayCopier.charToByteCp1252(var4); // L: 18 - var2.append('%'); // L: 19 - int var6 = var5 >> 4 & 15; // L: 20 - if (var6 >= 10) { // L: 21 - var2.append((char)(var6 + 55)); - } else { - var2.append((char)(var6 + 48)); // L: 22 - } - - var6 = var5 & 15; // L: 23 - if (var6 >= 10) { // L: 24 - var2.append((char)(var6 + 55)); - } else { - var2.append((char)(var6 + 48)); - } - } - } else { - var2.append(var4); // L: 25 - } - } - - return var2.toString(); // L: 28 + public boolean hasNext() { + return this.field4115 < this.this$0.method6018(); // L: 54 } } diff --git a/runescape-client/src/main/java/class369.java b/runescape-client/src/main/java/class369.java index 345ebc4681..aaf0b09369 100644 --- a/runescape-client/src/main/java/class369.java +++ b/runescape-client/src/main/java/class369.java @@ -1,77 +1,76 @@ import java.util.Iterator; -import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("no") +@ObfuscatedName("nu") public class class369 extends class340 implements class216 { - @ObfuscatedName("c") + @ObfuscatedName("n") @ObfuscatedSignature( - descriptor = "Ljp;" + descriptor = "Ljv;" ) - final AbstractArchive field4130; - @ObfuscatedName("o") + final AbstractArchive field4119; + @ObfuscatedName("f") @ObfuscatedSignature( - descriptor = "Lhl;" + descriptor = "Lhn;" ) - final DemotingHashTable field4129; - @ObfuscatedName("g") + final DemotingHashTable field4118; + @ObfuscatedName("y") @ObfuscatedGetter( - intValue = -1767645643 + intValue = 640434103 ) - final int field4128; + final int field4117; @ObfuscatedSignature( - descriptor = "(Ljr;ILkr;Ljp;)V" + descriptor = "(Ljd;ILkk;Ljv;)V" ) public class369(StudioGame var1, int var2, Language var3, AbstractArchive var4) { - super(var1, var3, var4 != null ? var4.getGroupFileCount(var2) : 0); - this.field4129 = new DemotingHashTable(64); // L: 15 - this.field4130 = var4; // L: 20 - this.field4128 = var2; // L: 21 + super(var1, var3, var4 != null ? var4.getGroupFileCount(var2) : 0); // L: 19 + this.field4118 = new DemotingHashTable(64); // L: 15 + this.field4119 = var4; // L: 20 + this.field4117 = var2; // L: 21 } // L: 22 - @ObfuscatedName("h") + @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "(II)Lmi;", - garbageValue = "1012040544" + descriptor = "(II)Lml;", + garbageValue = "1996028065" ) - protected class342 vmethod6308(int var1) { - synchronized(this.field4129) { // L: 26 - class341 var2 = (class341)this.field4129.get((long)var1); // L: 27 + protected class342 vmethod6434(int var1) { + synchronized(this.field4118) { // L: 26 + class341 var2 = (class341)this.field4118.get((long)var1); // L: 27 if (var2 == null) { // L: 28 - var2 = this.method6301(var1); // L: 29 - this.field4129.method4249(var2, (long)var1); // L: 30 + var2 = this.method6432(var1); // L: 29 + this.field4118.method4290(var2, (long)var1); // L: 30 } return var2; // L: 33 } } - @ObfuscatedName("r") + @ObfuscatedName("g") @ObfuscatedSignature( - descriptor = "(IB)Lmr;", - garbageValue = "16" + descriptor = "(II)Lmq;", + garbageValue = "1323866848" ) - class341 method6301(int var1) { - byte[] var2 = this.field4130.takeFile(this.field4128, var1); // L: 37 + class341 method6432(int var1) { + byte[] var2 = this.field4119.takeFile(this.field4117, var1); // L: 37 class341 var3 = new class341(var1); // L: 38 - if (var2 != null) { // L: 39 - var3.method5879(new Buffer(var2)); + if (var2 != null) { + var3.method6035(new Buffer(var2)); // L: 39 } return var3; // L: 40 } - @ObfuscatedName("p") + @ObfuscatedName("a") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "107737702" + garbageValue = "-174176415" ) - public void method6309() { - synchronized(this.field4129) { // L: 44 - this.field4129.clear(); // L: 45 + public void method6433() { + synchronized(this.field4118) { // L: 44 + this.field4118.clear(); // L: 45 } } // L: 47 @@ -79,174 +78,14 @@ public class class369 extends class340 implements class216 { return new class368(this); // L: 50 } - @ObfuscatedName("h") + @ObfuscatedName("r") @ObfuscatedSignature( - descriptor = "(IB)Z", - garbageValue = "76" + descriptor = "(Ljv;Ljava/lang/String;Ljava/lang/String;B)[Loh;", + garbageValue = "103" ) - @Export("isWorldMapEvent") - public static boolean isWorldMapEvent(int var0) { - return var0 == 10 || var0 == 11 || var0 == 12 || var0 == 13 || var0 == 14 || var0 == 15 || var0 == 16 || var0 == 17; // L: 19 + public static SpritePixels[] method6443(AbstractArchive var0, String var1, String var2) { + int var3 = var0.getGroupId(var1); // L: 115 + int var4 = var0.getFileId(var3, var2); // L: 116 + return ItemComposition.method3087(var0, var3, var4); // L: 117 } - - @ObfuscatedName("gp") - @ObfuscatedSignature( - descriptor = "(Lcj;I)V", - garbageValue = "-1321837262" - ) - static final void method6314(Actor var0) { - var0.movementSequence = var0.idleSequence; // L: 4090 - if (var0.pathLength == 0) { // L: 4091 - var0.field1250 = 0; // L: 4092 - } else { - if (var0.sequence != -1 && var0.sequenceDelay == 0) { // L: 4095 - SequenceDefinition var1 = Player.SequenceDefinition_get(var0.sequence); // L: 4096 - if (var0.field1215 > 0 && var1.field1886 == 0) { // L: 4097 - ++var0.field1250; // L: 4098 - return; // L: 4099 - } - - if (var0.field1215 <= 0 && var1.field1882 == 0) { // L: 4101 - ++var0.field1250; // L: 4102 - return; // L: 4103 - } - } - - int var10 = var0.x; // L: 4106 - int var2 = var0.y; // L: 4107 - int var3 = var0.field1211 * 64 + var0.pathX[var0.pathLength - 1] * 128; // L: 4108 - int var4 = var0.field1211 * 64 + var0.pathY[var0.pathLength - 1] * 128; // L: 4109 - if (var10 < var3) { // L: 4110 - if (var2 < var4) { // L: 4111 - var0.orientation = 1280; - } else if (var2 > var4) { // L: 4112 - var0.orientation = 1792; - } else { - var0.orientation = 1536; // L: 4113 - } - } else if (var10 > var3) { // L: 4115 - if (var2 < var4) { // L: 4116 - var0.orientation = 768; - } else if (var2 > var4) { // L: 4117 - var0.orientation = 256; - } else { - var0.orientation = 512; // L: 4118 - } - } else if (var2 < var4) { // L: 4120 - var0.orientation = 1024; - } else if (var2 > var4) { // L: 4121 - var0.orientation = 0; - } - - byte var5 = var0.pathTraversed[var0.pathLength - 1]; // L: 4122 - if (var3 - var10 <= 256 && var3 - var10 >= -256 && var4 - var2 <= 256 && var4 - var2 >= -256) { // L: 4123 - int var6 = var0.orientation - var0.rotation & 2047; // L: 4130 - if (var6 > 1024) { // L: 4131 - var6 -= 2048; - } - - int var7 = var0.walkBackSequence; // L: 4132 - if (var6 >= -256 && var6 <= 256) { // L: 4133 - var7 = var0.walkSequence; - } else if (var6 >= 256 && var6 < 768) { // L: 4134 - var7 = var0.walkRightSequence; - } else if (var6 >= -768 && var6 <= -256) { // L: 4135 - var7 = var0.walkLeftSequence; - } - - if (var7 == -1) { // L: 4136 - var7 = var0.walkSequence; - } - - var0.movementSequence = var7; // L: 4137 - int var8 = 4; // L: 4138 - boolean var9 = true; // L: 4139 - if (var0 instanceof NPC) { // L: 4140 - var9 = ((NPC)var0).definition.isClickable; - } - - if (var9) { // L: 4141 - if (var0.rotation != var0.orientation && var0.targetIndex == -1 && var0.field1261 != 0) { // L: 4142 - var8 = 2; - } - - if (var0.pathLength > 2) { // L: 4143 - var8 = 6; - } - - if (var0.pathLength > 3) { // L: 4144 - var8 = 8; - } - - if (var0.field1250 > 0 && var0.pathLength > 1) { // L: 4145 - var8 = 8; // L: 4146 - --var0.field1250; // L: 4147 - } - } else { - if (var0.pathLength > 1) { // L: 4151 - var8 = 6; - } - - if (var0.pathLength > 2) { // L: 4152 - var8 = 8; - } - - if (var0.field1250 > 0 && var0.pathLength > 1) { // L: 4153 - var8 = 8; // L: 4154 - --var0.field1250; // L: 4155 - } - } - - if (var5 == 2) { // L: 4158 - var8 <<= 1; - } - - if (var8 >= 8 && var0.walkSequence == var0.movementSequence && var0.runSequence != -1) { // L: 4159 - var0.movementSequence = var0.runSequence; - } - - if (var10 != var3 || var4 != var2) { // L: 4160 - if (var10 < var3) { // L: 4161 - var0.x += var8; // L: 4162 - if (var0.x > var3) { // L: 4163 - var0.x = var3; - } - } else if (var10 > var3) { // L: 4165 - var0.x -= var8; // L: 4166 - if (var0.x < var3) { // L: 4167 - var0.x = var3; - } - } - - if (var2 < var4) { // L: 4169 - var0.y += var8; // L: 4170 - if (var0.y > var4) { // L: 4171 - var0.y = var4; - } - } else if (var2 > var4) { // L: 4173 - var0.y -= var8; // L: 4174 - if (var0.y < var4) { // L: 4175 - var0.y = var4; - } - } - } - - if (var3 == var0.x && var4 == var0.y) { // L: 4178 - --var0.pathLength; // L: 4179 - if (var0.field1215 > 0) { // L: 4180 - --var0.field1215; - } - } - - } else { - var0.x = var3; // L: 4124 - var0.y = var4; // L: 4125 - --var0.pathLength; // L: 4126 - if (var0.field1215 > 0) { // L: 4127 - --var0.field1215; - } - - } - } - } // L: 4093 4128 4182 } diff --git a/runescape-client/src/main/java/class370.java b/runescape-client/src/main/java/class370.java index efafcfd736..9849bcba2c 100644 --- a/runescape-client/src/main/java/class370.java +++ b/runescape-client/src/main/java/class370.java @@ -1,19 +1,19 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("nt") +@ObfuscatedName("nv") public interface class370 { - @ObfuscatedName("h") + @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "(Ljava/lang/Object;Lnk;I)V", - garbageValue = "-2099055755" + descriptor = "(Ljava/lang/Object;Lnd;I)V", + garbageValue = "510448708" ) - void vmethod6366(Object var1, Buffer var2); + void vmethod6493(Object var1, Buffer var2); - @ObfuscatedName("c") + @ObfuscatedName("n") @ObfuscatedSignature( - descriptor = "(Lnk;I)Ljava/lang/Object;", - garbageValue = "-559339148" + descriptor = "(Lnd;I)Ljava/lang/Object;", + garbageValue = "-1954872085" ) - Object vmethod6362(Buffer var1); + Object vmethod6500(Buffer var1); } diff --git a/runescape-client/src/main/java/class371.java b/runescape-client/src/main/java/class371.java index 87c158b410..0c6063dcdc 100644 --- a/runescape-client/src/main/java/class371.java +++ b/runescape-client/src/main/java/class371.java @@ -1,73 +1,32 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("nh") +@ObfuscatedName("no") final class class371 implements class370 { - @ObfuscatedName("h") + @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "(Ljava/lang/Object;Lnk;I)V", - garbageValue = "-2099055755" + descriptor = "(Ljava/lang/Object;Lnd;I)V", + garbageValue = "510448708" ) - public void vmethod6366(Object var1, Buffer var2) { - this.method6323((Integer)var1, var2); // L: 20 + public void vmethod6493(Object var1, Buffer var2) { + this.method6452((Integer)var1, var2); // L: 20 } // L: 21 - @ObfuscatedName("c") + @ObfuscatedName("n") @ObfuscatedSignature( - descriptor = "(Lnk;I)Ljava/lang/Object;", - garbageValue = "-559339148" + descriptor = "(Lnd;I)Ljava/lang/Object;", + garbageValue = "-1954872085" ) - public Object vmethod6362(Buffer var1) { + public Object vmethod6500(Buffer var1) { return var1.readInt(); // L: 16 } - @ObfuscatedName("v") + @ObfuscatedName("b") @ObfuscatedSignature( - descriptor = "(Ljava/lang/Integer;Lnk;I)V", - garbageValue = "-121075266" + descriptor = "(Ljava/lang/Integer;Lnd;B)V", + garbageValue = "105" ) - void method6323(Integer var1, Buffer var2) { + void method6452(Integer var1, Buffer var2) { var2.writeInt(var1); // L: 12 } // L: 13 - - @ObfuscatedName("v") - @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "-1443919706" - ) - public static void method6333() { - try { - if (class232.musicPlayerStatus == 1) { // L: 82 - int var0 = class232.midiPcmStream.method4370(); // L: 83 - if (var0 > 0 && class232.midiPcmStream.isReady()) { // L: 84 - var0 -= class232.pcmSampleLength; // L: 85 - if (var0 < 0) { // L: 86 - var0 = 0; - } - - class232.midiPcmStream.setPcmStreamVolume(var0); // L: 87 - return; // L: 88 - } - - class232.midiPcmStream.clear(); // L: 90 - class232.midiPcmStream.removeAll(); // L: 91 - if (JagexCache.musicTrackArchive != null) { // L: 92 - class232.musicPlayerStatus = 2; - } else { - class232.musicPlayerStatus = 0; // L: 93 - } - - NPC.musicTrack = null; // L: 94 - class268.soundCache = null; // L: 95 - } - } catch (Exception var2) { // L: 98 - var2.printStackTrace(); // L: 99 - class232.midiPcmStream.clear(); // L: 100 - class232.musicPlayerStatus = 0; // L: 101 - NPC.musicTrack = null; // L: 102 - class268.soundCache = null; // L: 103 - JagexCache.musicTrackArchive = null; // L: 104 - } - - } // L: 106 } diff --git a/runescape-client/src/main/java/class372.java b/runescape-client/src/main/java/class372.java index 7001d69663..525c46af5a 100644 --- a/runescape-client/src/main/java/class372.java +++ b/runescape-client/src/main/java/class372.java @@ -1,15 +1,38 @@ import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedName; +import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("np") +@ObfuscatedName("nx") public class class372 { - @ObfuscatedName("h") - static final int[] field4132; - @ObfuscatedName("t") - @Export("SpriteBuffer_spriteHeights") - public static int[] SpriteBuffer_spriteHeights; + @ObfuscatedName("v") + public static final int[] field4124; + @ObfuscatedName("b") + static byte[][][] field4123; static { - field4132 = new int[]{1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 2, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 3, -1, 1, -1, 1, 1, 1, 3, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 3, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, -1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 3, 1, 1, 1, 1, 3, 3}; // L: 4 + field4124 = new int[]{1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 2, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 3, -1, 1, -1, 1, 1, 1, 3, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 3, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, -1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 3, 1, 1, 1, 1, 3, 3}; // L: 4 + } + + @ObfuscatedName("y") + @ObfuscatedSignature( + descriptor = "(B)[Lja;", + garbageValue = "5" + ) + @Export("PlayerType_values") + public static PlayerType[] PlayerType_values() { + return new PlayerType[]{PlayerType.field3548, PlayerType.PlayerType_playerModerator, PlayerType.PlayerType_hardcoreIronman, PlayerType.PlayerType_jagexModerator, PlayerType.PlayerType_ironman, PlayerType.PlayerType_ultimateIronman, PlayerType.PlayerType_normal}; // L: 20 + } + + @ObfuscatedName("ha") + @ObfuscatedSignature( + descriptor = "(III)Lfc;", + garbageValue = "-43218468" + ) + static RouteStrategy method6463(int var0, int var1) { + Client.field785.approxDestinationX = var0; // L: 7577 + Client.field785.approxDestinationY = var1; // L: 7578 + Client.field785.approxDestinationSizeX = 1; // L: 7579 + Client.field785.approxDestinationSizeY = 1; // L: 7580 + return Client.field785; // L: 7581 } } diff --git a/runescape-client/src/main/java/class373.java b/runescape-client/src/main/java/class373.java index c9c09a8f17..11273b3f4e 100644 --- a/runescape-client/src/main/java/class373.java +++ b/runescape-client/src/main/java/class373.java @@ -1,67 +1,49 @@ -import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("nb") +@ObfuscatedName("nw") final class class373 implements class370 { - @ObfuscatedName("h") + @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "(Ljava/lang/Object;Lnk;I)V", - garbageValue = "-2099055755" + descriptor = "(Ljava/lang/Object;Lnd;I)V", + garbageValue = "510448708" ) - public void vmethod6366(Object var1, Buffer var2) { - this.method6338((Long)var1, var2); // L: 33 + public void vmethod6493(Object var1, Buffer var2) { + this.method6465((Long)var1, var2); // L: 33 } // L: 34 - @ObfuscatedName("c") + @ObfuscatedName("n") @ObfuscatedSignature( - descriptor = "(Lnk;I)Ljava/lang/Object;", - garbageValue = "-559339148" + descriptor = "(Lnd;I)Ljava/lang/Object;", + garbageValue = "-1954872085" ) - public Object vmethod6362(Buffer var1) { + public Object vmethod6500(Buffer var1) { return var1.readLong(); // L: 29 } - @ObfuscatedName("v") + @ObfuscatedName("b") @ObfuscatedSignature( - descriptor = "(Ljava/lang/Long;Lnk;I)V", - garbageValue = "-1414599186" + descriptor = "(Ljava/lang/Long;Lnd;I)V", + garbageValue = "-1988673452" ) - void method6338(Long var1, Buffer var2) { + void method6465(Long var1, Buffer var2) { var2.writeLong(var1); // L: 25 } // L: 26 - @ObfuscatedName("jc") + @ObfuscatedName("ge") @ObfuscatedSignature( - descriptor = "(Liv;B)Z", - garbageValue = "0" + descriptor = "(I)V", + garbageValue = "-1793660977" ) - @Export("runCs1") - static final boolean runCs1(Widget var0) { - if (var0.cs1Comparisons == null) { // L: 10161 - return false; - } else { - for (int var1 = 0; var1 < var0.cs1Comparisons.length; ++var1) { // L: 10162 - int var2 = class161.method3150(var0, var1); // L: 10163 - int var3 = var0.cs1ComparisonValues[var1]; // L: 10164 - if (var0.cs1Comparisons[var1] == 2) { // L: 10165 - if (var2 >= var3) { // L: 10166 - return false; - } - } else if (var0.cs1Comparisons[var1] == 3) { // L: 10168 - if (var2 <= var3) { // L: 10169 - return false; - } - } else if (var0.cs1Comparisons[var1] == 4) { // L: 10171 - if (var3 == var2) { // L: 10172 - return false; - } - } else if (var2 != var3) { // L: 10174 - return false; - } - } + static void method6474() { + int var0 = Players.Players_count; // L: 4352 + int[] var1 = Players.Players_indices; // L: 4353 - return true; // L: 10176 + for (int var2 = 0; var2 < var0; ++var2) { // L: 4354 + if (var1[var2] != Client.combatTargetPlayerIndex && var1[var2] != Client.localPlayerIndex) { // L: 4355 + NetSocket.addPlayerToScene(Client.players[var1[var2]], true); // L: 4356 + } } - } + + } // L: 4358 } diff --git a/runescape-client/src/main/java/class374.java b/runescape-client/src/main/java/class374.java index c151b6940d..812cef56e8 100644 --- a/runescape-client/src/main/java/class374.java +++ b/runescape-client/src/main/java/class374.java @@ -3,170 +3,138 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("nz") +@ObfuscatedName("np") public class class374 implements Enumerated { - @ObfuscatedName("h") + @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "Lnz;" + descriptor = "Lnp;" ) - public static final class374 field4141; - @ObfuscatedName("c") + public static final class374 field4131; + @ObfuscatedName("n") @ObfuscatedSignature( - descriptor = "Lnz;" + descriptor = "Lnp;" ) - public static final class374 field4135; - @ObfuscatedName("o") + public static final class374 field4128; + @ObfuscatedName("f") @ObfuscatedSignature( - descriptor = "Lnz;" + descriptor = "Lnp;" ) - public static final class374 field4136; - @ObfuscatedName("g") + public static final class374 field4129; + @ObfuscatedName("y") @ObfuscatedGetter( - intValue = -1912726257 + intValue = -1536498237 ) - final int field4139; - @ObfuscatedName("l") + final int field4130; + @ObfuscatedName("p") @ObfuscatedGetter( - intValue = 1030005029 + intValue = 618578037 ) - public final int field4138; - @ObfuscatedName("z") - public final Class field4134; - @ObfuscatedName("t") + public final int field4135; + @ObfuscatedName("j") + public final Class field4127; + @ObfuscatedName("r") @ObfuscatedSignature( - descriptor = "Lnt;" + descriptor = "Lnv;" ) - final class370 field4137; + final class370 field4133; static { - field4141 = new class374(2, 0, Integer.class, new class371()); // L: 10 - field4135 = new class374(0, 1, Long.class, new class373()); // L: 23 - field4136 = new class374(1, 2, String.class, new class375()); // L: 36 + field4131 = new class374(2, 0, Integer.class, new class371()); // L: 10 + field4128 = new class374(0, 1, Long.class, new class373()); // L: 23 + field4129 = new class374(1, 2, String.class, new class375()); // L: 36 } @ObfuscatedSignature( - descriptor = "(IILjava/lang/Class;Lnt;)V" + descriptor = "(IILjava/lang/Class;Lnv;)V" ) class374(int var1, int var2, Class var3, class370 var4) { - this.field4139 = var1; - this.field4138 = var2; - this.field4134 = var3; // L: 61 - this.field4137 = var4; // L: 62 + this.field4130 = var1; // L: 59 + this.field4135 = var2; // L: 60 + this.field4127 = var3; // L: 61 + this.field4133 = var4; // L: 62 } // L: 63 - @ObfuscatedName("h") + @ObfuscatedName("v") @ObfuscatedSignature( descriptor = "(I)I", - garbageValue = "-708237537" + garbageValue = "-907662946" ) @Export("rsOrdinal") public int rsOrdinal() { - return this.field4138; // L: 88 + return this.field4135; // L: 90 } - @ObfuscatedName("z") + @ObfuscatedName("b") @ObfuscatedSignature( - descriptor = "(Lnk;B)Ljava/lang/Object;", - garbageValue = "-8" + descriptor = "(Lnd;I)Ljava/lang/Object;", + garbageValue = "-2104172776" ) - public Object method6351(Buffer var1) { - return this.field4137.vmethod6362(var1); // L: 92 + public Object method6480(Buffer var1) { + return this.field4133.vmethod6500(var1); // L: 94 } - @ObfuscatedName("o") + @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "(IIII)I", - garbageValue = "-225266091" + descriptor = "(Lax;B)Lai;", + garbageValue = "-46" ) - static int method6359(int var0, int var1, int var2) { - if (var2 > 179) { - var1 /= 2; + public static class31 method6477(class34 var0) { + switch(var0.field252) { // L: 9 + case 0: + return new class28(); // L: 16 + default: + throw new IllegalArgumentException(); // L: 12 } - - if (var2 > 192) { // L: 56 - var1 /= 2; - } - - if (var2 > 217) { // L: 57 - var1 /= 2; - } - - if (var2 > 243) { // L: 58 - var1 /= 2; - } - - int var3 = (var1 / 32 << 7) + (var0 / 4 << 10) + var2 / 2; // L: 59 - return var3; // L: 60 } - @ObfuscatedName("g") + @ObfuscatedName("y") @ObfuscatedSignature( - descriptor = "(I)[Lnz;", - garbageValue = "2122701602" + descriptor = "(I)[Lnp;", + garbageValue = "-72158502" ) - public static class374[] method6356() { - return new class374[]{field4141, field4136, field4135}; // L: 55 + public static class374[] method6476() { + return new class374[]{field4131, field4128, field4129}; // L: 55 } - @ObfuscatedName("l") + @ObfuscatedName("p") @ObfuscatedSignature( - descriptor = "(Ljava/lang/Class;I)Lnt;", - garbageValue = "-1426815547" + descriptor = "(Ljava/lang/Class;B)Lnp;", + garbageValue = "-16" ) - public static class370 method6350(Class var0) { - class374[] var2 = method6356(); // L: 69 - int var3 = 0; + public static class374 method6479(Class var0) { + class374[] var1 = method6476(); // L: 67 - class374 var1; - while (true) { - if (var3 >= var2.length) { - var1 = null; // L: 80 - break; + for (int var2 = 0; var2 < var1.length; ++var2) { // L: 68 + class374 var3 = var1[var2]; // L: 69 + if (var3.field4127 == var0) { + return var3; // L: 71 } - - class374 var4 = var2[var3]; // L: 71 - if (var4.field4134 == var0) { // L: 73 - var1 = var4; // L: 74 - break; - } - - ++var3; // L: 70 } - if (var1 == null) { // L: 83 - throw new IllegalArgumentException(); - } else { - return var1.field4137; // L: 84 - } + return null; // L: 75 } - @ObfuscatedName("gr") + @ObfuscatedName("j") @ObfuscatedSignature( - descriptor = "(II)V", - garbageValue = "-312092894" + descriptor = "(Ljava/lang/Object;Lnd;I)V", + garbageValue = "-926534106" ) - @Export("setWindowedMode") - static void setWindowedMode(int var0) { - Client.field833 = 0L; // L: 4340 - if (var0 >= 2) { // L: 4341 - Client.isResizable = true; + public static void method6475(Object var0, Buffer var1) { + class370 var2 = method6478(var0.getClass()); // L: 79 + var2.vmethod6493(var0, var1); // L: 80 + } // L: 81 + + @ObfuscatedName("r") + @ObfuscatedSignature( + descriptor = "(Ljava/lang/Class;S)Lnv;", + garbageValue = "-2594" + ) + static class370 method6478(Class var0) { + class374 var1 = method6479(var0); // L: 84 + if (var1 == null) { + throw new IllegalArgumentException(); // L: 85 } else { - Client.isResizable = false; // L: 4342 + return var1.field4133; // L: 86 } - - if (HitSplatDefinition.getWindowedMode() == 1) { // L: 4343 - class303.client.setMaxCanvasSize(765, 503); // L: 4344 - } else { - class303.client.setMaxCanvasSize(7680, 2160); // L: 4347 - } - - if (Client.gameState >= 25) { // L: 4349 - PacketBufferNode var1 = HealthBarDefinition.getPacketBufferNode(ClientPacket.field2655, Client.packetWriter.isaacCipher); // L: 4351 - var1.packetBuffer.writeByte(HitSplatDefinition.getWindowedMode()); // L: 4352 - var1.packetBuffer.writeShort(GameEngine.canvasWidth); // L: 4353 - var1.packetBuffer.writeShort(HealthBarDefinition.canvasHeight); // L: 4354 - Client.packetWriter.addNode(var1); // L: 4355 - } - - } // L: 4357 + } } diff --git a/runescape-client/src/main/java/class375.java b/runescape-client/src/main/java/class375.java index 9d88093c90..37f9907501 100644 --- a/runescape-client/src/main/java/class375.java +++ b/runescape-client/src/main/java/class375.java @@ -2,39 +2,36 @@ import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("nu") +@ObfuscatedName("nq") final class class375 implements class370 { - @ObfuscatedName("hf") - @ObfuscatedSignature( - descriptor = "[Low;" - ) - @Export("headIconHintSprites") - static SpritePixels[] headIconHintSprites; - - @ObfuscatedName("h") - @ObfuscatedSignature( - descriptor = "(Ljava/lang/Object;Lnk;I)V", - garbageValue = "-2099055755" - ) - public void vmethod6366(Object var1, Buffer var2) { - this.method6360((String)var1, var2); // L: 46 - } // L: 47 - - @ObfuscatedName("c") - @ObfuscatedSignature( - descriptor = "(Lnk;I)Ljava/lang/Object;", - garbageValue = "-559339148" - ) - public Object vmethod6362(Buffer var1) { - return var1.readStringCp1252NullTerminated(); // L: 42 - } + @ObfuscatedName("q") + @Export("BZip2Decompressor_block") + static int[] BZip2Decompressor_block; @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "(Ljava/lang/String;Lnk;I)V", - garbageValue = "233977802" + descriptor = "(Ljava/lang/Object;Lnd;I)V", + garbageValue = "510448708" ) - void method6360(String var1, Buffer var2) { + public void vmethod6493(Object var1, Buffer var2) { + this.method6491((String)var1, var2); // L: 46 + } // L: 47 + + @ObfuscatedName("n") + @ObfuscatedSignature( + descriptor = "(Lnd;I)Ljava/lang/Object;", + garbageValue = "-1954872085" + ) + public Object vmethod6500(Buffer var1) { + return var1.readStringCp1252NullTerminated(); // L: 42 + } + + @ObfuscatedName("b") + @ObfuscatedSignature( + descriptor = "(Ljava/lang/String;Lnd;B)V", + garbageValue = "-43" + ) + void method6491(String var1, Buffer var2) { var2.writeStringCp1252NullTerminated(var1); // L: 38 } // L: 39 } diff --git a/runescape-client/src/main/java/class376.java b/runescape-client/src/main/java/class376.java new file mode 100644 index 0000000000..829fc4cda0 --- /dev/null +++ b/runescape-client/src/main/java/class376.java @@ -0,0 +1,125 @@ +import net.runelite.mapping.Export; +import net.runelite.mapping.ObfuscatedGetter; +import net.runelite.mapping.ObfuscatedName; +import net.runelite.mapping.ObfuscatedSignature; + +@ObfuscatedName("nl") +public final class class376 { + @ObfuscatedName("hl") + @ObfuscatedGetter( + intValue = 611240317 + ) + @Export("cameraYaw") + static int cameraYaw; + + @ObfuscatedName("iu") + @ObfuscatedSignature( + descriptor = "(IIIILjava/lang/String;I)V", + garbageValue = "-537904006" + ) + @Export("widgetDefaultMenuAction") + static void widgetDefaultMenuAction(int var0, int var1, int var2, int var3, String var4) { + Widget var5 = ModeWhere.getWidgetChild(var1, var2); // L: 8669 + if (var5 != null) { // L: 8670 + if (var5.onOp != null) { // L: 8671 + ScriptEvent var6 = new ScriptEvent(); // L: 8672 + var6.widget = var5; // L: 8673 + var6.opIndex = var0; // L: 8674 + var6.targetName = var4; // L: 8675 + var6.args = var5.onOp; // L: 8676 + PacketWriter.runScriptEvent(var6); // L: 8677 + } + + boolean var8 = true; // L: 8679 + if (var5.contentType > 0) { // L: 8680 + var8 = SequenceDefinition.method3148(var5); + } + + if (var8) { // L: 8681 + if (TextureProvider.method4141(class21.getWidgetFlags(var5), var0 - 1)) { // L: 8682 + PacketBufferNode var7; + if (var0 == 1) { // L: 8685 + var7 = class21.getPacketBufferNode(ClientPacket.field2604, Client.packetWriter.isaacCipher); // L: 8687 + var7.packetBuffer.writeInt(var1); // L: 8688 + var7.packetBuffer.writeShort(var2); // L: 8689 + var7.packetBuffer.writeShort(var3); // L: 8690 + Client.packetWriter.addNode(var7); // L: 8691 + } + + if (var0 == 2) { // L: 8693 + var7 = class21.getPacketBufferNode(ClientPacket.field2603, Client.packetWriter.isaacCipher); // L: 8695 + var7.packetBuffer.writeInt(var1); // L: 8696 + var7.packetBuffer.writeShort(var2); // L: 8697 + var7.packetBuffer.writeShort(var3); // L: 8698 + Client.packetWriter.addNode(var7); // L: 8699 + } + + if (var0 == 3) { // L: 8701 + var7 = class21.getPacketBufferNode(ClientPacket.field2616, Client.packetWriter.isaacCipher); // L: 8703 + var7.packetBuffer.writeInt(var1); // L: 8704 + var7.packetBuffer.writeShort(var2); // L: 8705 + var7.packetBuffer.writeShort(var3); // L: 8706 + Client.packetWriter.addNode(var7); // L: 8707 + } + + if (var0 == 4) { // L: 8709 + var7 = class21.getPacketBufferNode(ClientPacket.field2678, Client.packetWriter.isaacCipher); // L: 8711 + var7.packetBuffer.writeInt(var1); // L: 8712 + var7.packetBuffer.writeShort(var2); // L: 8713 + var7.packetBuffer.writeShort(var3); // L: 8714 + Client.packetWriter.addNode(var7); // L: 8715 + } + + if (var0 == 5) { // L: 8717 + var7 = class21.getPacketBufferNode(ClientPacket.field2592, Client.packetWriter.isaacCipher); // L: 8719 + var7.packetBuffer.writeInt(var1); // L: 8720 + var7.packetBuffer.writeShort(var2); // L: 8721 + var7.packetBuffer.writeShort(var3); // L: 8722 + Client.packetWriter.addNode(var7); // L: 8723 + } + + if (var0 == 6) { // L: 8725 + var7 = class21.getPacketBufferNode(ClientPacket.field2650, Client.packetWriter.isaacCipher); // L: 8727 + var7.packetBuffer.writeInt(var1); // L: 8728 + var7.packetBuffer.writeShort(var2); // L: 8729 + var7.packetBuffer.writeShort(var3); // L: 8730 + Client.packetWriter.addNode(var7); // L: 8731 + } + + if (var0 == 7) { // L: 8733 + var7 = class21.getPacketBufferNode(ClientPacket.field2648, Client.packetWriter.isaacCipher); // L: 8735 + var7.packetBuffer.writeInt(var1); // L: 8736 + var7.packetBuffer.writeShort(var2); // L: 8737 + var7.packetBuffer.writeShort(var3); // L: 8738 + Client.packetWriter.addNode(var7); // L: 8739 + } + + if (var0 == 8) { // L: 8741 + var7 = class21.getPacketBufferNode(ClientPacket.field2613, Client.packetWriter.isaacCipher); // L: 8743 + var7.packetBuffer.writeInt(var1); // L: 8744 + var7.packetBuffer.writeShort(var2); // L: 8745 + var7.packetBuffer.writeShort(var3); // L: 8746 + Client.packetWriter.addNode(var7); // L: 8747 + } + + if (var0 == 9) { // L: 8749 + var7 = class21.getPacketBufferNode(ClientPacket.field2593, Client.packetWriter.isaacCipher); // L: 8751 + var7.packetBuffer.writeInt(var1); // L: 8752 + var7.packetBuffer.writeShort(var2); // L: 8753 + var7.packetBuffer.writeShort(var3); // L: 8754 + Client.packetWriter.addNode(var7); // L: 8755 + } + + if (var0 == 10) { // L: 8757 + var7 = class21.getPacketBufferNode(ClientPacket.field2632, Client.packetWriter.isaacCipher); // L: 8759 + var7.packetBuffer.writeInt(var1); // L: 8760 + var7.packetBuffer.writeShort(var2); // L: 8761 + var7.packetBuffer.writeShort(var3); // L: 8762 + Client.packetWriter.addNode(var7); // L: 8763 + } + + } + } + } + } // L: 8683 8765 +} diff --git a/runescape-client/src/main/java/class377.java b/runescape-client/src/main/java/class377.java index 96acc27be7..07bba922ad 100644 --- a/runescape-client/src/main/java/class377.java +++ b/runescape-client/src/main/java/class377.java @@ -1,13 +1,46 @@ -import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("nn") +@ObfuscatedName("nz") public class class377 { - @ObfuscatedName("c") + @ObfuscatedName("ic") @ObfuscatedSignature( - descriptor = "Lix;" + descriptor = "(I)V", + garbageValue = "1164354941" ) - @Export("huffman") - static Huffman huffman; + static final void method6509() { + boolean var0 = false; // L: 8768 + + while (!var0) { // L: 8769 + var0 = true; // L: 8770 + + for (int var1 = 0; var1 < Client.menuOptionsCount - 1; ++var1) { // L: 8771 + if (Client.menuOpcodes[var1] < 1000 && Client.menuOpcodes[var1 + 1] > 1000) { // L: 8772 + String var2 = Client.menuTargets[var1]; // L: 8773 + Client.menuTargets[var1] = Client.menuTargets[var1 + 1]; // L: 8774 + Client.menuTargets[var1 + 1] = var2; // L: 8775 + String var3 = Client.menuActions[var1]; // L: 8776 + Client.menuActions[var1] = Client.menuActions[var1 + 1]; // L: 8777 + Client.menuActions[var1 + 1] = var3; // L: 8778 + int var4 = Client.menuOpcodes[var1]; // L: 8779 + Client.menuOpcodes[var1] = Client.menuOpcodes[var1 + 1]; // L: 8780 + Client.menuOpcodes[var1 + 1] = var4; // L: 8781 + var4 = Client.menuArguments1[var1]; // L: 8782 + Client.menuArguments1[var1] = Client.menuArguments1[var1 + 1]; // L: 8783 + Client.menuArguments1[var1 + 1] = var4; // L: 8784 + var4 = Client.menuArguments2[var1]; // L: 8785 + Client.menuArguments2[var1] = Client.menuArguments2[var1 + 1]; // L: 8786 + Client.menuArguments2[var1 + 1] = var4; // L: 8787 + var4 = Client.menuIdentifiers[var1]; // L: 8788 + Client.menuIdentifiers[var1] = Client.menuIdentifiers[var1 + 1]; // L: 8789 + Client.menuIdentifiers[var1 + 1] = var4; // L: 8790 + boolean var5 = Client.menuShiftClick[var1]; // L: 8791 + Client.menuShiftClick[var1] = Client.menuShiftClick[var1 + 1]; // L: 8792 + Client.menuShiftClick[var1 + 1] = var5; // L: 8793 + var0 = false; // L: 8794 + } + } + } + + } // L: 8798 } diff --git a/runescape-client/src/main/java/class257.java b/runescape-client/src/main/java/class378.java similarity index 50% rename from runescape-client/src/main/java/class257.java rename to runescape-client/src/main/java/class378.java index bea022ed8f..17c7e2c641 100644 --- a/runescape-client/src/main/java/class257.java +++ b/runescape-client/src/main/java/class378.java @@ -2,12 +2,12 @@ import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ig") -public class class257 { - @ObfuscatedName("s") +@ObfuscatedName("nr") +public class class378 { + @ObfuscatedName("bh") @ObfuscatedSignature( - descriptor = "Lgs;" + descriptor = "Lkk;" ) - @Export("worldMapEvent") - static WorldMapEvent worldMapEvent; + @Export("clientLanguage") + static Language clientLanguage; } diff --git a/runescape-client/src/main/java/class379.java b/runescape-client/src/main/java/class379.java index 35c7a2aa82..65a233cb35 100644 --- a/runescape-client/src/main/java/class379.java +++ b/runescape-client/src/main/java/class379.java @@ -1,16 +1,16 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; -@ObfuscatedName("nv") +@ObfuscatedName("ng") public final class class379 { - @ObfuscatedName("h") + @ObfuscatedName("v") @ObfuscatedGetter( - longValue = -235735200613379957L + longValue = -7034796619104833383L ) - static long field4152; - @ObfuscatedName("c") + static long field4146; + @ObfuscatedName("n") @ObfuscatedGetter( - longValue = -1700488732446806923L + longValue = 1841679994680013491L ) - static long field4153; + static long field4147; } diff --git a/runescape-client/src/main/java/class385.java b/runescape-client/src/main/java/class385.java index f031fef32a..261fa23e75 100644 --- a/runescape-client/src/main/java/class385.java +++ b/runescape-client/src/main/java/class385.java @@ -1,11 +1,11 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("nd") +@ObfuscatedName("nn") public interface class385 { - @ObfuscatedName("h") + @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "(Lnk;B)V" + descriptor = "(Lnd;I)V" ) - void method6714(Buffer var1); + void method6815(Buffer var1); } diff --git a/runescape-client/src/main/java/class386.java b/runescape-client/src/main/java/class386.java index 4ed925f088..f57708bb42 100644 --- a/runescape-client/src/main/java/class386.java +++ b/runescape-client/src/main/java/class386.java @@ -3,80 +3,84 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("nw") +@ObfuscatedName("na") public enum class386 implements Enumerated { - @ObfuscatedName("h") - @ObfuscatedSignature( - descriptor = "Lnw;" - ) - field4213(2, 0), - @ObfuscatedName("c") - @ObfuscatedSignature( - descriptor = "Lnw;" - ) - field4210(0, 2), - @ObfuscatedName("o") - @ObfuscatedSignature( - descriptor = "Lnw;" - ) - field4211(5, 5), - @ObfuscatedName("g") - @ObfuscatedSignature( - descriptor = "Lnw;" - ) - field4215(3, 6), - @ObfuscatedName("l") - @ObfuscatedSignature( - descriptor = "Lnw;" - ) - field4212(4, 7), - @ObfuscatedName("z") - @ObfuscatedSignature( - descriptor = "Lnw;" - ) - field4214(1, 8); - - @ObfuscatedName("t") - @ObfuscatedGetter( - intValue = 2074320091 - ) - final int field4216; @ObfuscatedName("v") - @ObfuscatedGetter( - intValue = -2114016559 + @ObfuscatedSignature( + descriptor = "Lna;" ) - final int field4209; + field4210(0, 0), + @ObfuscatedName("n") + @ObfuscatedSignature( + descriptor = "Lna;" + ) + field4207(3, 2), + @ObfuscatedName("f") + @ObfuscatedSignature( + descriptor = "Lna;" + ) + field4208(5, 5), + @ObfuscatedName("y") + @ObfuscatedSignature( + descriptor = "Lna;" + ) + field4209(2, 6), + @ObfuscatedName("p") + @ObfuscatedSignature( + descriptor = "Lna;" + ) + field4213(1, 7), + @ObfuscatedName("j") + @ObfuscatedSignature( + descriptor = "Lna;" + ) + field4211(4, 8); + + @ObfuscatedName("r") + @ObfuscatedGetter( + intValue = -1819892595 + ) + final int field4212; + @ObfuscatedName("b") + @ObfuscatedGetter( + intValue = -1356390723 + ) + final int field4206; class386(int var3, int var4) { - this.field4216 = var3; // L: 18 - this.field4209 = var4; // L: 19 + this.field4212 = var3; // L: 18 + this.field4206 = var4; // L: 19 } // L: 20 - @ObfuscatedName("h") + @ObfuscatedName("v") @ObfuscatedSignature( descriptor = "(I)I", - garbageValue = "-708237537" + garbageValue = "-907662946" ) @Export("rsOrdinal") public int rsOrdinal() { - return this.field4209; // L: 23 + return this.field4206; // L: 23 } - @ObfuscatedName("ag") + @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "(Lbt;B)V", - garbageValue = "104" + descriptor = "(IIB)I", + garbageValue = "-6" ) - @Export("PcmStream_disable") - static final void PcmStream_disable(PcmStream var0) { - var0.active = false; // L: 270 - if (var0.sound != null) { // L: 271 - var0.sound.position = 0; + public static int method6818(int var0, int var1) { + int var2; + if (var1 > var0) { // L: 24 + var2 = var0; // L: 25 + var0 = var1; // L: 26 + var1 = var2; // L: 27 } - for (PcmStream var1 = var0.firstSubStream(); var1 != null; var1 = var0.nextSubStream()) { - PcmStream_disable(var1); // L: 272 + while (var1 != 0) { // L: 29 + var2 = var0 % var1; // L: 30 + var0 = var1; // L: 31 + var1 = var2; // L: 32 } - } // L: 273 + return var0; // L: 34 + } } diff --git a/runescape-client/src/main/java/class389.java b/runescape-client/src/main/java/class389.java index 6cfc2f06fc..b786a62068 100644 --- a/runescape-client/src/main/java/class389.java +++ b/runescape-client/src/main/java/class389.java @@ -1,12 +1,12 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("nf") +@ObfuscatedName("ne") public interface class389 { - @ObfuscatedName("o") + @ObfuscatedName("f") @ObfuscatedSignature( descriptor = "(II)Ljava/lang/Object;", - garbageValue = "-666299836" + garbageValue = "-1572379722" ) - Object vmethod6737(int var1); + Object vmethod6837(int var1); } diff --git a/runescape-client/src/main/java/class390.java b/runescape-client/src/main/java/class390.java index a158de2bad..d28c8b63e6 100644 --- a/runescape-client/src/main/java/class390.java +++ b/runescape-client/src/main/java/class390.java @@ -1,24 +1,28 @@ +import java.io.File; +import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; -import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ol") +@ObfuscatedName("oc") public class class390 { - @ObfuscatedName("h") + @ObfuscatedName("y") + @Export("JagexCache_locationFile") + static File JagexCache_locationFile; + @ObfuscatedName("v") @ObfuscatedGetter( - intValue = -223258731 + intValue = 1815237159 ) - public final int field4222; - @ObfuscatedName("c") - public Object field4221; + public final int field4219; + @ObfuscatedName("n") + public Object field4218; public class390(int var1) { - this.field4222 = var1; // L: 8 + this.field4219 = var1; // L: 8 } // L: 9 public class390(int var1, Object var2) { - this.field4222 = var1; // L: 12 - this.field4221 = var2; // L: 13 + this.field4219 = var1; // L: 12 + this.field4218 = var2; // L: 13 } // L: 14 public int hashCode() { @@ -30,28 +34,13 @@ public class class390 { return false; } else { class390 var2 = (class390)var1; // L: 22 - if (var2.field4221 == null && this.field4221 != null) { // L: 23 + if (var2.field4218 == null && this.field4218 != null) { // L: 23 return false; - } else if (this.field4221 == null && var2.field4221 != null) { // L: 24 + } else if (this.field4218 == null && var2.field4218 != null) { // L: 24 return false; } else { - return this.field4222 == var2.field4222 && var2.field4221.equals(this.field4221); // L: 25 + return var2.field4219 == this.field4219 && var2.field4218.equals(this.field4218); // L: 25 } } } - - @ObfuscatedName("t") - @ObfuscatedSignature( - descriptor = "(IB)V", - garbageValue = "40" - ) - public static void method6744(int var0) { - class232.musicPlayerStatus = 1; // L: 71 - JagexCache.musicTrackArchive = null; // L: 72 - class232.musicTrackGroupId = -1; // L: 73 - class232.musicTrackFileId = -1; // L: 74 - LoginPacket.musicTrackVolume = 0; // L: 75 - VarpDefinition.musicTrackBoolean = false; // L: 76 - class232.pcmSampleLength = var0; // L: 77 - } // L: 78 } diff --git a/runescape-client/src/main/java/class396.java b/runescape-client/src/main/java/class396.java index 0119ee39a0..0236418b97 100644 --- a/runescape-client/src/main/java/class396.java +++ b/runescape-client/src/main/java/class396.java @@ -2,30 +2,24 @@ import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; -@ObfuscatedName("od") +@ObfuscatedName("ox") public class class396 { - @ObfuscatedName("h") + @ObfuscatedName("v") @ObfuscatedGetter( - intValue = 97362057 + intValue = -522791973 ) @Export("SpriteBuffer_spriteCount") static int SpriteBuffer_spriteCount; - @ObfuscatedName("c") + @ObfuscatedName("n") @ObfuscatedGetter( - intValue = 1206663989 + intValue = -1099363635 ) @Export("SpriteBuffer_spriteWidth") static int SpriteBuffer_spriteWidth; - @ObfuscatedName("o") - @ObfuscatedGetter( - intValue = 1874373077 - ) - @Export("SpriteBuffer_spriteHeight") - static int SpriteBuffer_spriteHeight; - @ObfuscatedName("l") - @Export("SpriteBuffer_yOffsets") - public static int[] SpriteBuffer_yOffsets; - @ObfuscatedName("b") + @ObfuscatedName("j") + @Export("SpriteBuffer_spriteWidths") + public static int[] SpriteBuffer_spriteWidths; + @ObfuscatedName("d") @Export("SpriteBuffer_pixels") public static byte[][] SpriteBuffer_pixels; } diff --git a/runescape-client/src/main/java/class4.java b/runescape-client/src/main/java/class4.java index 7564dd2e53..81ecd84f29 100644 --- a/runescape-client/src/main/java/class4.java +++ b/runescape-client/src/main/java/class4.java @@ -3,143 +3,132 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("l") +@ObfuscatedName("p") public class class4 extends class14 { - @ObfuscatedName("h") + @ObfuscatedName("rk") @ObfuscatedGetter( - intValue = -205584469 + intValue = -1261708709 ) - int field41; - @ObfuscatedName("c") + static int field47; + @ObfuscatedName("mf") + @ObfuscatedGetter( + intValue = -2110888403 + ) + @Export("selectedSpellFlags") + static int selectedSpellFlags; + @ObfuscatedName("ng") + @ObfuscatedSignature( + descriptor = "[Lio;" + ) + static Widget[] field49; + @ObfuscatedName("v") + @ObfuscatedGetter( + intValue = 82874555 + ) + int field43; + @ObfuscatedName("n") String field40; // $FF: synthetic field @ObfuscatedSignature( - descriptor = "Lo;" + descriptor = "Lf;" ) final class2 this$0; @ObfuscatedSignature( - descriptor = "(Lo;)V" + descriptor = "(Lf;)V" ) class4(class2 var1) { this.this$0 = var1; // L: 323 } - @ObfuscatedName("h") + @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "(Lnk;I)V", - garbageValue = "110401227" + descriptor = "(Lnd;I)V", + garbageValue = "-1281352827" ) - void vmethod339(Buffer var1) { - this.field41 = var1.readInt(); // L: 326 + void vmethod276(Buffer var1) { + this.field43 = var1.readInt(); // L: 326 this.field40 = var1.readStringCp1252NullTerminated(); // L: 327 } // L: 328 - @ObfuscatedName("c") + @ObfuscatedName("n") @ObfuscatedSignature( - descriptor = "(Lx;I)V", - garbageValue = "-1535989118" + descriptor = "(Ll;B)V", + garbageValue = "29" ) - void vmethod338(class11 var1) { - var1.method131(this.field41, this.field40); // L: 331 + void vmethod281(ClanSettings var1) { + var1.method115(this.field43, this.field40); // L: 331 } // L: 332 - @ObfuscatedName("aq") + @ObfuscatedName("y") @ObfuscatedSignature( - descriptor = "(Ljava/lang/String;I)I", - garbageValue = "-1187192027" + descriptor = "(IIIII)V", + garbageValue = "-402074125" ) - @Export("stringCp1252NullTerminatedByteSize") - public static int stringCp1252NullTerminatedByteSize(String var0) { - return var0.length() + 1; // L: 115 - } + @Export("itemContainerSetItem") + static void itemContainerSetItem(int var0, int var1, int var2, int var3) { + ItemContainer var4 = (ItemContainer)ItemContainer.itemContainers.get((long)var0); // L: 39 + if (var4 == null) { // L: 40 + var4 = new ItemContainer(); // L: 41 + ItemContainer.itemContainers.put(var4, (long)var0); // L: 42 + } - @ObfuscatedName("go") + if (var4.ids.length <= var1) { // L: 44 + int[] var5 = new int[var1 + 1]; // L: 45 + int[] var6 = new int[var1 + 1]; // L: 46 + + int var7; + for (var7 = 0; var7 < var4.ids.length; ++var7) { // L: 47 + var5[var7] = var4.ids[var7]; // L: 48 + var6[var7] = var4.quantities[var7]; // L: 49 + } + + for (var7 = var4.ids.length; var7 < var1; ++var7) { // L: 51 + var5[var7] = -1; // L: 52 + var6[var7] = 0; // L: 53 + } + + var4.ids = var5; // L: 55 + var4.quantities = var6; // L: 56 + } + + var4.ids[var1] = var2; // L: 58 + var4.quantities[var1] = var3; // L: 59 + } // L: 60 + + @ObfuscatedName("kr") @ObfuscatedSignature( - descriptor = "(Ljava/lang/String;I)V", - garbageValue = "-2119138852" + descriptor = "(S)V", + garbageValue = "-23226" ) - @Export("doCheat") - static final void doCheat(String var0) { - if (var0.equalsIgnoreCase("toggleroof")) { // L: 3873 - class12.clientPreferences.roofsHidden = !class12.clientPreferences.roofsHidden; // L: 3874 - KeyHandler.savePreferences(); // L: 3875 - if (class12.clientPreferences.roofsHidden) { // L: 3876 - WorldMapScaleHandler.addGameMessage(99, "", "Roofs are now all hidden"); - } else { - WorldMapScaleHandler.addGameMessage(99, "", "Roofs will only be removed selectively"); // L: 3877 + static final void method47() { + PacketBufferNode var0 = class21.getPacketBufferNode(ClientPacket.field2594, Client.packetWriter.isaacCipher); // L: 11030 + Client.packetWriter.addNode(var0); // L: 11031 + + for (InterfaceParent var1 = (InterfaceParent)Client.interfaceParents.first(); var1 != null; var1 = (InterfaceParent)Client.interfaceParents.next()) { // L: 11032 + if (var1.type == 0 || var1.type == 3) { // L: 11033 + class43.closeInterface(var1, true); } } - if (var0.equalsIgnoreCase("displayfps")) { // L: 3879 - Client.displayFps = !Client.displayFps; + if (Client.meslayerContinueWidget != null) { // L: 11035 + WorldMapCacheName.invalidateWidget(Client.meslayerContinueWidget); // L: 11036 + Client.meslayerContinueWidget = null; // L: 11037 } - if (var0.equalsIgnoreCase("renderself")) { // L: 3880 - Client.renderSelf = !Client.renderSelf; - } + } // L: 11039 - if (var0.equalsIgnoreCase("mouseovertext")) { // L: 3881 - Client.showMouseOverText = !Client.showMouseOverText; - } - - if (Client.staffModLevel >= 2) { // L: 3882 - if (var0.equalsIgnoreCase("errortest")) { // L: 3883 - throw new RuntimeException(); - } - - if (var0.equalsIgnoreCase("showcoord")) { // L: 3884 - NetSocket.worldMap.showCoord = !NetSocket.worldMap.showCoord; - } - - if (var0.equalsIgnoreCase("fpson")) { // L: 3885 - Client.displayFps = true; - } - - if (var0.equalsIgnoreCase("fpsoff")) { // L: 3886 - Client.displayFps = false; - } - - if (var0.equalsIgnoreCase("gc")) { - System.gc(); // L: 3887 - } - - if (var0.equalsIgnoreCase("clientdrop")) { // L: 3888 - BuddyRankComparator.method2492(); - } - } - - PacketBufferNode var1 = HealthBarDefinition.getPacketBufferNode(ClientPacket.field2603, Client.packetWriter.isaacCipher); // L: 3891 - var1.packetBuffer.writeByte(var0.length() + 1); // L: 3892 - var1.packetBuffer.writeStringCp1252NullTerminated(var0); // L: 3893 - Client.packetWriter.addNode(var1); // L: 3894 - } // L: 3895 - - @ObfuscatedName("lf") + @ObfuscatedName("lx") @ObfuscatedSignature( - descriptor = "(Ljava/lang/String;ZB)Ljava/lang/String;", - garbageValue = "9" + descriptor = "(IIIZI)V", + garbageValue = "1166427642" ) - static String method57(String var0, boolean var1) { - String var2 = var1 ? "https://" : "http://"; // L: 11635 - if (Client.gameBuild == 1) { // L: 11636 - var0 = var0 + "-wtrc"; - } else if (Client.gameBuild == 2) { // L: 11637 - var0 = var0 + "-wtqa"; - } else if (Client.gameBuild == 3) { // L: 11638 - var0 = var0 + "-wtwip"; - } else if (Client.gameBuild == 5) { // L: 11639 - var0 = var0 + "-wti"; - } else if (Client.gameBuild == 4) { // L: 11640 - var0 = "local"; - } - - String var3 = ""; // L: 11641 - if (class253.field3136 != null) { // L: 11642 - var3 = "/p=" + class253.field3136; - } - - String var4 = "runescape.com"; // L: 11643 - return var2 + var0 + "." + var4 + "/l=" + class7.clientLanguage + "/a=" + class44.field310 + var3 + "/"; // L: 11644 - } + public static void method50(int var0, int var1, int var2, boolean var3) { + PacketBufferNode var4 = class21.getPacketBufferNode(ClientPacket.field2657, Client.packetWriter.isaacCipher); // L: 11482 + var4.packetBuffer.method6602(var1); // L: 11483 + var4.packetBuffer.writeInt(var3 ? Client.field723 * -315190483 * 711341221 : 0); // L: 11484 + var4.packetBuffer.writeByte(var2); // L: 11485 + var4.packetBuffer.method6619(var0); // L: 11486 + Client.packetWriter.addNode(var4); // L: 11487 + } // L: 11488 } diff --git a/runescape-client/src/main/java/class402.java b/runescape-client/src/main/java/class402.java index b02ba1f140..510ec75e3f 100644 --- a/runescape-client/src/main/java/class402.java +++ b/runescape-client/src/main/java/class402.java @@ -1,20 +1,20 @@ import net.runelite.mapping.ObfuscatedName; -@ObfuscatedName("or") +@ObfuscatedName("oo") public class class402 { - @ObfuscatedName("q") - static final int[] field4286; - @ObfuscatedName("i") - static final int[] field4287; + @ObfuscatedName("s") + static final int[] field4280; + @ObfuscatedName("u") + static final int[] field4279; static { - field4286 = new int[2048]; // L: 13 - field4287 = new int[2048]; // L: 14 + field4280 = new int[2048]; // L: 13 + field4279 = new int[2048]; // L: 14 double var0 = 0.0030679615757712823D; // L: 17 for (int var2 = 0; var2 < 2048; ++var2) { // L: 18 - field4286[var2] = (int)(65536.0D * Math.sin(var0 * (double)var2)); // L: 19 - field4287[var2] = (int)(65536.0D * Math.cos(var0 * (double)var2)); // L: 20 + field4280[var2] = (int)(65536.0D * Math.sin(var0 * (double)var2)); // L: 19 + field4279[var2] = (int)(65536.0D * Math.cos(var0 * (double)var2)); // L: 20 } } // L: 22 diff --git a/runescape-client/src/main/java/class403.java b/runescape-client/src/main/java/class403.java deleted file mode 100644 index dda9472076..0000000000 --- a/runescape-client/src/main/java/class403.java +++ /dev/null @@ -1,13 +0,0 @@ -import net.runelite.mapping.Export; -import net.runelite.mapping.ObfuscatedGetter; -import net.runelite.mapping.ObfuscatedName; - -@ObfuscatedName("ou") -public class class403 { - @ObfuscatedName("c") - @ObfuscatedGetter( - intValue = 1267176441 - ) - @Export("VarpDefinition_fileCount") - public static int VarpDefinition_fileCount; -} diff --git a/runescape-client/src/main/java/class404.java b/runescape-client/src/main/java/class404.java new file mode 100644 index 0000000000..11792bda8f --- /dev/null +++ b/runescape-client/src/main/java/class404.java @@ -0,0 +1,13 @@ +import net.runelite.mapping.Export; +import net.runelite.mapping.ObfuscatedName; +import net.runelite.mapping.ObfuscatedSignature; + +@ObfuscatedName("oa") +public class class404 { + @ObfuscatedName("v") + @ObfuscatedSignature( + descriptor = "Ljv;" + ) + @Export("KitDefinition_archive") + static AbstractArchive KitDefinition_archive; +} diff --git a/runescape-client/src/main/java/class42.java b/runescape-client/src/main/java/class42.java new file mode 100644 index 0000000000..d823729b25 --- /dev/null +++ b/runescape-client/src/main/java/class42.java @@ -0,0 +1,34 @@ +import java.applet.Applet; +import net.runelite.mapping.ObfuscatedName; +import net.runelite.mapping.ObfuscatedSignature; +import netscape.javascript.JSObject; + +@ObfuscatedName("ah") +public class class42 { + @ObfuscatedName("v") + @ObfuscatedSignature( + descriptor = "(Ljava/applet/Applet;Ljava/lang/String;I)V", + garbageValue = "-2125796670" + ) + public static void method420(Applet var0, String var1) throws Throwable { + JSObject.getWindow(var0).eval(var1); // L: 13 + } // L: 14 + + @ObfuscatedName("n") + @ObfuscatedSignature( + descriptor = "(Ljava/applet/Applet;Ljava/lang/String;I)Ljava/lang/Object;", + garbageValue = "901657187" + ) + public static Object method421(Applet var0, String var1) throws Throwable { + return JSObject.getWindow(var0).call(var1, (Object[])null); // L: 17 + } + + @ObfuscatedName("f") + @ObfuscatedSignature( + descriptor = "(Ljava/applet/Applet;Ljava/lang/String;[Ljava/lang/Object;S)Ljava/lang/Object;", + garbageValue = "-19478" + ) + public static Object method422(Applet var0, String var1, Object[] var2) throws Throwable { + return JSObject.getWindow(var0).call(var1, var2); // L: 21 + } +} diff --git a/runescape-client/src/main/java/class43.java b/runescape-client/src/main/java/class43.java index 2cfd7c1fe7..404e30b1de 100644 --- a/runescape-client/src/main/java/class43.java +++ b/runescape-client/src/main/java/class43.java @@ -1,70 +1,356 @@ +import java.lang.management.GarbageCollectorMXBean; +import java.lang.management.ManagementFactory; +import java.util.Iterator; import javax.imageio.ImageIO; 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("ad") +@ObfuscatedName("ao") public class class43 { - @ObfuscatedName("dm") - @ObfuscatedGetter( - longValue = -7524999698275254637L - ) - static long field302; - @ObfuscatedName("dg") + @ObfuscatedName("sx") @ObfuscatedSignature( - descriptor = "Lji;" + descriptor = "Llh;" ) - @Export("archive8") - static Archive archive8; + @Export("masterDisk") + static ArchiveDisk masterDisk; static { ImageIO.setUseCache(false); // L: 12 } // L: 13 - @ObfuscatedName("o") + @ObfuscatedName("n") @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "-114856401" + descriptor = "(IIIB)Lcf;", + garbageValue = "-16" ) - static void method486() { - synchronized(ArchiveDiskActionHandler.ArchiveDiskActionHandler_lock) { // L: 41 - if (ArchiveDiskActionHandler.field3574 == 0) { // L: 42 - ArchiveDiskActionHandler.ArchiveDiskActionHandler_thread = new Thread(new ArchiveDiskActionHandler()); // L: 43 - ArchiveDiskActionHandler.ArchiveDiskActionHandler_thread.setDaemon(true); // L: 44 - ArchiveDiskActionHandler.ArchiveDiskActionHandler_thread.start(); // L: 45 - ArchiveDiskActionHandler.ArchiveDiskActionHandler_thread.setPriority(5); // L: 46 - } - - ArchiveDiskActionHandler.field3574 = 600; // L: 48 - } - } // L: 50 - - @ObfuscatedName("q") - @ObfuscatedSignature( - descriptor = "(III)I", - garbageValue = "1281907235" - ) - static final int method487(int var0, int var1) { - if (var0 == -2) { // L: 500 - return 12345678; - } else if (var0 == -1) { // L: 501 - if (var1 < 2) { // L: 502 - var1 = 2; - } else if (var1 > 126) { // L: 503 - var1 = 126; - } - - return var1; // L: 504 + @Export("getWorldMapScript") + static Script getWorldMapScript(int var0, int var1, int var2) { + int var3 = (var1 << 8) + var0; // L: 40 + Script var6 = (Script)Script.Script_cached.get((long)(var3 << 16)); // L: 45 + Script var5; + if (var6 != null) { // L: 46 + var5 = var6; // L: 47 } else { - var1 = (var0 & 127) * var1 / 128; // L: 506 - if (var1 < 2) { // L: 507 - var1 = 2; - } else if (var1 > 126) { // L: 508 - var1 = 126; + String var7 = String.valueOf(var3); + int var8 = UserComparator5.archive12.getGroupId(var7); + if (var8 == -1) { + var5 = null; + } else { + label59: { + byte[] var9 = UserComparator5.archive12.takeFileFlat(var8); // L: 56 + if (var9 != null) { // L: 57 + if (var9.length <= 1) { // L: 58 + var5 = null; // L: 59 + break label59; // L: 60 + } + + var6 = UserList.newScript(var9); // L: 62 + if (var6 != null) { // L: 63 + Script.Script_cached.put(var6, (long)(var3 << 16)); // L: 64 + var5 = var6; // L: 65 + break label59; // L: 66 + } + } + + var5 = null; // L: 69 + } + } + } + + if (var5 != null) { // L: 72 + return var5; // L: 73 + } else { + int var13 = (-3 - var2 << 8) + var0; // L: 77 + Script var15 = (Script)Script.Script_cached.get((long)(var13 << 16)); // L: 82 + Script var14; + if (var15 != null) { // L: 83 + var14 = var15; // L: 84 + } else { + String var10 = String.valueOf(var13); // L: 87 + int var11 = UserComparator5.archive12.getGroupId(var10); // L: 88 + if (var11 == -1) { // L: 89 + var14 = null; // L: 90 + } else { + byte[] var12 = UserComparator5.archive12.takeFileFlat(var11); // L: 93 + if (var12 != null) { // L: 94 + if (var12.length <= 1) { // L: 95 + var14 = null; // L: 96 + return var14 != null ? var14 : null; // L: 109 112 + } + + var15 = UserList.newScript(var12); // L: 99 + if (var15 != null) { // L: 100 + Script.Script_cached.put(var15, (long)(var13 << 16)); // L: 101 + var14 = var15; // L: 102 + return var14 != null ? var14 : null; + } + } + + var14 = null; // L: 106 + } } - return (var0 & 65408) + var1; // L: 509 + return var14 != null ? var14 : null; } } + + @ObfuscatedName("j") + @ObfuscatedSignature( + descriptor = "([BIIB)Ljava/lang/String;", + garbageValue = "100" + ) + @Export("decodeStringCp1252") + public static String decodeStringCp1252(byte[] var0, int var1, int var2) { + char[] var3 = new char[var2]; // L: 141 + int var4 = 0; // L: 142 + + for (int var5 = 0; var5 < var2; ++var5) { // L: 143 + int var6 = var0[var5 + var1] & 255; // L: 144 + if (var6 != 0) { // L: 145 + if (var6 >= 128 && var6 < 160) { + char var7 = class301.cp1252AsciiExtension[var6 - 128]; + if (var7 == 0) { + var7 = '?'; + } + + var6 = var7; + } + + var3[var4++] = (char)var6; + } + } + + return new String(var3, 0, var4); + } + + @ObfuscatedName("j") + @ObfuscatedSignature( + descriptor = "(I)V", + garbageValue = "1726965771" + ) + static void method437() { + Messages.Messages_channels.clear(); // L: 50 + Messages.Messages_hashTable.clear(); // L: 51 + Messages.Messages_queue.clear(); // L: 52 + Messages.Messages_count = 0; // L: 53 + } // L: 54 + + @ObfuscatedName("r") + @ObfuscatedSignature( + descriptor = "(ILcf;ZI)I", + garbageValue = "1427864151" + ) + static int method435(int var0, Script var1, boolean var2) { + Widget var3; + if (var0 >= 2000) { // L: 794 + var0 -= 1000; // L: 795 + var3 = Frames.getWidget(Interpreter.Interpreter_intStack[--class44.Interpreter_intStackSize]); // L: 796 + } else { + var3 = var2 ? class13.scriptDotWidget : Interpreter.scriptActiveWidget; // L: 798 + } + + WorldMapCacheName.invalidateWidget(var3); // L: 799 + if (var0 != ScriptOpcodes.CC_SETOBJECT && var0 != ScriptOpcodes.CC_SETOBJECT_NONUM && var0 != ScriptOpcodes.CC_SETOBJECT_ALWAYS_NUM) { // L: 800 + if (var0 == ScriptOpcodes.CC_SETNPCHEAD) { // L: 820 + var3.modelType = 2; // L: 821 + var3.modelId = Interpreter.Interpreter_intStack[--class44.Interpreter_intStackSize]; // L: 822 + return 1; // L: 823 + } else if (var0 == ScriptOpcodes.CC_SETPLAYERHEAD_SELF) { // L: 825 + var3.modelType = 3; // L: 826 + var3.modelId = class93.localPlayer.appearance.getChatHeadId(); // L: 827 + return 1; // L: 828 + } else { + return 2; // L: 830 + } + } else { + class44.Interpreter_intStackSize -= 2; // L: 801 + int var4 = Interpreter.Interpreter_intStack[class44.Interpreter_intStackSize]; // L: 802 + int var5 = Interpreter.Interpreter_intStack[class44.Interpreter_intStackSize + 1]; // L: 803 + var3.itemId = var4; // L: 804 + var3.itemQuantity = var5; // L: 805 + ItemComposition var6 = class260.ItemDefinition_get(var4); // L: 806 + var3.modelAngleX = var6.xan2d; // L: 807 + var3.modelAngleY = var6.yan2d; // L: 808 + var3.modelAngleZ = var6.zan2d; // L: 809 + var3.modelOffsetX = var6.offsetX2d; // L: 810 + var3.modelOffsetY = var6.offsetY2d; // L: 811 + var3.modelZoom = var6.zoom2d; // L: 812 + if (var0 == ScriptOpcodes.CC_SETOBJECT_NONUM) { + var3.itemQuantityMode = 0; // L: 813 + } else if (var0 == ScriptOpcodes.CC_SETOBJECT_ALWAYS_NUM | 1 == var6.isStackable) { // L: 814 + var3.itemQuantityMode = 1; + } else { + var3.itemQuantityMode = 2; // L: 815 + } + + if (var3.field3013 > 0) { // L: 816 + var3.modelZoom = var3.modelZoom * 32 / var3.field3013; + } else if (var3.rawWidth > 0) { // L: 817 + var3.modelZoom = var3.modelZoom * 32 / var3.rawWidth; + } + + return 1; // L: 818 + } + } + + @ObfuscatedName("l") + @ObfuscatedSignature( + descriptor = "(Ljava/lang/String;I)Ljava/lang/String;", + garbageValue = "-1591980574" + ) + public static String method433(String var0) { + int var1 = var0.length(); // L: 146 + char[] var2 = new char[var1]; // L: 147 + byte var3 = 2; // L: 148 + + for (int var4 = 0; var4 < var1; ++var4) { // L: 149 + char var5 = var0.charAt(var4); // L: 150 + if (var3 == 0) { // L: 151 + var5 = Character.toLowerCase(var5); + } else if (var3 == 2 || Character.isUpperCase(var5)) { // L: 152 + var5 = Username.method5877(var5); + } + + if (Character.isLetter(var5)) { // L: 153 + var3 = 0; + } else if (var5 != '.' && var5 != '?' && var5 != '!') { // L: 154 + if (Character.isSpaceChar(var5)) { // L: 155 + if (var3 != 2) { // L: 156 + var3 = 1; + } + } else { + var3 = 1; // L: 158 + } + } else { + var3 = 2; + } + + var2[var4] = var5; // L: 159 + } + + return new String(var2); // L: 161 + } + + @ObfuscatedName("aj") + @ObfuscatedSignature( + descriptor = "(IS)I", + garbageValue = "323" + ) + static int method436(int var0) { + return (int)Math.pow(2.0D, (double)(7.0F + (float)var0 / 256.0F)); // L: 3511 + } + + @ObfuscatedName("az") + @ObfuscatedSignature( + descriptor = "(I)I", + garbageValue = "-56748890" + ) + @Export("getGcDuration") + protected static int getGcDuration() { + int var0 = 0; // L: 600 + if (class124.garbageCollector == null || !class124.garbageCollector.isValid()) { // L: 601 + try { + Iterator var1 = ManagementFactory.getGarbageCollectorMXBeans().iterator(); // L: 603 + + while (var1.hasNext()) { + GarbageCollectorMXBean var2 = (GarbageCollectorMXBean)var1.next(); // L: 604 + if (var2.isValid()) { // L: 606 + class124.garbageCollector = var2; // L: 607 + GameEngine.garbageCollectorLastCheckTimeMs = -1L; // L: 608 + GameEngine.garbageCollectorLastCollectionTime = -1L; // L: 609 + } + } + } catch (Throwable var11) { // L: 614 + } + } + + if (class124.garbageCollector != null) { // L: 616 + long var9 = ObjectComposition.currentTimeMillis(); // L: 617 + long var3 = class124.garbageCollector.getCollectionTime(); // L: 618 + if (-1L != GameEngine.garbageCollectorLastCollectionTime) { // L: 619 + long var5 = var3 - GameEngine.garbageCollectorLastCollectionTime; // L: 620 + long var7 = var9 - GameEngine.garbageCollectorLastCheckTimeMs; // L: 621 + if (0L != var7) { // L: 622 + var0 = (int)(100L * var5 / var7); + } + } + + GameEngine.garbageCollectorLastCollectionTime = var3; // L: 624 + GameEngine.garbageCollectorLastCheckTimeMs = var9; // L: 625 + } + + return var0; // L: 627 + } + + @ObfuscatedName("fc") + @ObfuscatedSignature( + descriptor = "(I)I", + garbageValue = "1248092260" + ) + static int method440() { + if (Client.archiveLoaders != null && Client.archiveLoadersDone < Client.archiveLoaders.size()) { // L: 1498 + int var0 = 0; // L: 1499 + + for (int var1 = 0; var1 <= Client.archiveLoadersDone; ++var1) { // L: 1500 + var0 += ((ArchiveLoader)Client.archiveLoaders.get(var1)).loadedCount; // L: 1501 + } + + return var0 * 10000 / Client.field916; // L: 1503 + } else { + return 10000; + } + } + + @ObfuscatedName("kx") + @ObfuscatedSignature( + descriptor = "(Lcu;ZI)V", + garbageValue = "-2095467414" + ) + @Export("closeInterface") + static final void closeInterface(InterfaceParent var0, boolean var1) { + int var2 = var0.group; // L: 11061 + int var3 = (int)var0.key; // L: 11062 + var0.remove(); // L: 11063 + if (var1 && var2 != -1 && Widget.Widget_loadedInterfaces[var2]) { // L: 11064 11065 11066 + HealthBarUpdate.Widget_archive.clearFilesGroup(var2); // L: 11067 + if (Widget.Widget_interfaceComponents[var2] != null) { // L: 11068 + boolean var4 = true; // L: 11069 + + for (int var5 = 0; var5 < Widget.Widget_interfaceComponents[var2].length; ++var5) { // L: 11070 + if (Widget.Widget_interfaceComponents[var2][var5] != null) { // L: 11071 + if (Widget.Widget_interfaceComponents[var2][var5].type != 2) { // L: 11072 + Widget.Widget_interfaceComponents[var2][var5] = null; + } else { + var4 = false; // L: 11073 + } + } + } + + if (var4) { // L: 11076 + Widget.Widget_interfaceComponents[var2] = null; + } + + Widget.Widget_loadedInterfaces[var2] = false; // L: 11077 + } + } + + for (IntegerNode var6 = (IntegerNode)Client.widgetFlags.first(); var6 != null; var6 = (IntegerNode)Client.widgetFlags.next()) { // L: 11080 + if ((var6.key >> 48 & 65535L) == (long)var2) { // L: 11081 + var6.remove(); // L: 11082 + } + } + + Widget var7 = Frames.getWidget(var3); // L: 11086 + if (var7 != null) { // L: 11087 + WorldMapCacheName.invalidateWidget(var7); + } + + class7.method68(); // L: 11088 + if (Client.rootInterface != -1) { // L: 11089 + Login.runIntfCloseListeners(Client.rootInterface, 1); + } + + } // L: 11090 } diff --git a/runescape-client/src/main/java/class44.java b/runescape-client/src/main/java/class44.java index 905b81165b..262a626687 100644 --- a/runescape-client/src/main/java/class44.java +++ b/runescape-client/src/main/java/class44.java @@ -4,869 +4,164 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ac") +@ObfuscatedName("aq") public class class44 { - @ObfuscatedName("h") + @ObfuscatedName("v") @Export("applet") public static Applet applet; - @ObfuscatedName("c") - public static String field305; - @ObfuscatedName("bn") + @ObfuscatedName("n") + public static String field318; + @ObfuscatedName("u") @ObfuscatedGetter( - intValue = 43770267 + intValue = -26460885 ) - static int field310; + @Export("Interpreter_intStackSize") + static int Interpreter_intStackSize; static { applet = null; // L: 10 - field305 = ""; // L: 11 + field318 = ""; // L: 11 } - @ObfuscatedName("l") + @ObfuscatedName("n") @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "-508196625" + descriptor = "(II)Ljava/lang/String;", + garbageValue = "-1966582053" ) - public static void method494() { - FloorUnderlayDefinition.FloorUnderlayDefinition_cached.clear(); // L: 69 - } // L: 70 - - @ObfuscatedName("q") - @ObfuscatedSignature( - descriptor = "(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;I)V", - garbageValue = "-916574148" - ) - @Export("setLoginResponseString") - static void setLoginResponseString(String var0, String var1, String var2) { - Login.Login_response1 = var0; // L: 1507 - Login.Login_response2 = var1; // L: 1508 - Login.Login_response3 = var2; // L: 1509 - } // L: 1510 - - @ObfuscatedName("gn") - @ObfuscatedSignature( - descriptor = "(IIIII)V", - garbageValue = "-1732436079" - ) - @Export("drawEntities") - static final void drawEntities(int var0, int var1, int var2, int var3) { - ++Client.viewportDrawCount; // L: 4453 - UserComparator9.method2478(); // L: 4454 - if (Client.renderSelf) { // L: 4456 - class32.addPlayerToScene(class35.localPlayer, false); // L: 4457 - } - - class32.method367(); // L: 4460 - WorldMapLabel.addNpcsToScene(true); // L: 4461 - int var4 = Players.Players_count; // L: 4463 - int[] var5 = Players.Players_indices; // L: 4464 - - int var6; - for (var6 = 0; var6 < var4; ++var6) { // L: 4465 - if (var5[var6] != Client.combatTargetPlayerIndex && var5[var6] != Client.localPlayerIndex) { // L: 4466 - class32.addPlayerToScene(Client.players[var5[var6]], true); // L: 4467 - } - } - - WorldMapLabel.addNpcsToScene(false); // L: 4470 - class302.method5372(); // L: 4471 - Tiles.method2046(); // L: 4472 - VarbitComposition.setViewportShape(var0, var1, var2, var3, true); // L: 4473 - var0 = Client.viewportOffsetX; // L: 4474 - var1 = Client.viewportOffsetY; // L: 4475 - var2 = Client.viewportWidth; // L: 4476 - var3 = Client.viewportHeight; // L: 4477 - Rasterizer2D.Rasterizer2D_setClip(var0, var1, var0 + var2, var3 + var1); // L: 4478 - Rasterizer3D.Rasterizer3D_setClipFromRasterizer2D(); // L: 4479 - int var7; - int var8; - int var9; - int var10; - int var11; - int var12; - int var14; - int var18; - if (!Client.isCameraLocked) { // L: 4480 - var4 = Client.camAngleX; // L: 4481 - if (Client.field702 / 256 > var4) { // L: 4482 - var4 = Client.field702 / 256; - } - - if (Client.field846[4] && Client.field868[4] + 128 > var4) { // L: 4483 - var4 = Client.field868[4] + 128; - } - - var18 = Client.camAngleY & 2047; // L: 4484 - var6 = HorizontalAlignment.oculusOrbFocalPointX; // L: 4485 - var7 = Decimator.field523; // L: 4486 - var8 = class280.oculusOrbFocalPointY; // L: 4487 - var9 = class21.method281(var4); // L: 4488 - var9 = PlayerComposition.method4640(var9, var3); // L: 4490 - var10 = 2048 - var4 & 2047; // L: 4491 - var11 = 2048 - var18 & 2047; // L: 4492 - var12 = 0; // L: 4493 - int var13 = 0; // L: 4494 - var14 = var9; // L: 4495 - int var15; - int var16; - int var17; - if (var10 != 0) { // L: 4496 - var15 = Rasterizer3D.Rasterizer3D_sine[var10]; // L: 4497 - var16 = Rasterizer3D.Rasterizer3D_cosine[var10]; // L: 4498 - var17 = var16 * var13 - var15 * var9 >> 16; // L: 4499 - var14 = var16 * var9 + var13 * var15 >> 16; // L: 4500 - var13 = var17; // L: 4501 - } - - if (var11 != 0) { // L: 4503 - var15 = Rasterizer3D.Rasterizer3D_sine[var11]; // L: 4504 - var16 = Rasterizer3D.Rasterizer3D_cosine[var11]; // L: 4505 - var17 = var16 * var12 + var14 * var15 >> 16; // L: 4506 - var14 = var16 * var14 - var15 * var12 >> 16; // L: 4507 - var12 = var17; // L: 4508 - } - - class20.cameraX = var6 - var12; // L: 4510 - Skeleton.cameraY = var7 - var13; // L: 4511 - WorldMapDecoration.cameraZ = var8 - var14; // L: 4512 - class1.cameraPitch = var4; // L: 4513 - HealthBarDefinition.cameraYaw = var18; // L: 4514 - if (Client.oculusOrbState == 1 && Client.staffModLevel >= 2 && Client.cycle % 50 == 0 && (HorizontalAlignment.oculusOrbFocalPointX >> 7 != class35.localPlayer.x >> 7 || class280.oculusOrbFocalPointY >> 7 != class35.localPlayer.y >> 7)) { // L: 4515 4516 - var15 = class35.localPlayer.plane; // L: 4517 - var16 = (HorizontalAlignment.oculusOrbFocalPointX >> 7) + JagexCache.baseX; // L: 4518 - var17 = (class280.oculusOrbFocalPointY >> 7) + Messages.baseY; // L: 4519 - ClientPreferences.method2239(var16, var17, var15, true); // L: 4520 - } - } - - if (!Client.isCameraLocked) { // L: 4526 - var4 = Message.method1174(); - } else { - var4 = FontName.method6161(); // L: 4527 - } - - var18 = class20.cameraX; // L: 4528 - var6 = Skeleton.cameraY; // L: 4529 - var7 = WorldMapDecoration.cameraZ; // L: 4530 - var8 = class1.cameraPitch; // L: 4531 - var9 = HealthBarDefinition.cameraYaw; // L: 4532 - - for (var10 = 0; var10 < 5; ++var10) { // L: 4533 - if (Client.field846[var10]) { // L: 4534 - var11 = (int)(Math.random() * (double)(Client.field744[var10] * 2 + 1) - (double)Client.field744[var10] + Math.sin((double)Client.field870[var10] * ((double)Client.field869[var10] / 100.0D)) * (double)Client.field868[var10]); // L: 4535 - if (var10 == 0) { // L: 4536 - class20.cameraX += var11; - } - - if (var10 == 1) { // L: 4537 - Skeleton.cameraY += var11; - } - - if (var10 == 2) { // L: 4538 - WorldMapDecoration.cameraZ += var11; - } - - if (var10 == 3) { // L: 4539 - HealthBarDefinition.cameraYaw = var11 + HealthBarDefinition.cameraYaw & 2047; - } - - if (var10 == 4) { // L: 4540 - class1.cameraPitch += var11; // L: 4541 - if (class1.cameraPitch < 128) { // L: 4542 - class1.cameraPitch = 128; - } - - if (class1.cameraPitch > 383) { // L: 4543 - class1.cameraPitch = 383; - } - } - } - } - - var10 = MouseHandler.MouseHandler_x; // L: 4547 - var11 = MouseHandler.MouseHandler_y; // L: 4548 - if (MouseHandler.MouseHandler_lastButton != 0) { // L: 4549 - var10 = MouseHandler.MouseHandler_lastPressedX; // L: 4550 - var11 = MouseHandler.MouseHandler_lastPressedY; // L: 4551 - } - - if (var10 >= var0 && var10 < var0 + var2 && var11 >= var1 && var11 < var3 + var1) { // L: 4553 - Messages.method2374(var10 - var0, var11 - var1); // L: 4554 - } else { - ViewportMouse.ViewportMouse_isInViewport = false; // L: 4558 - ViewportMouse.ViewportMouse_entityCount = 0; // L: 4559 - } - - WorldMapIcon_1.playPcmPlayers(); // L: 4562 - Rasterizer2D.Rasterizer2D_fillRectangle(var0, var1, var2, var3, 0); // L: 4563 - WorldMapIcon_1.playPcmPlayers(); // L: 4564 - var12 = Rasterizer3D.Rasterizer3D_zoom; // L: 4565 - Rasterizer3D.Rasterizer3D_zoom = Client.viewportZoom; // L: 4566 - class5.scene.draw(class20.cameraX, Skeleton.cameraY, WorldMapDecoration.cameraZ, class1.cameraPitch, HealthBarDefinition.cameraYaw, var4); // L: 4567 - Rasterizer3D.Rasterizer3D_zoom = var12; // L: 4568 - WorldMapIcon_1.playPcmPlayers(); // L: 4569 - class5.scene.clearTempGameObjects(); // L: 4570 - class20.method272(var0, var1, var2, var3); // L: 4571 - Tile.method3813(var0, var1); // L: 4572 - ((TextureProvider)Rasterizer3D.Rasterizer3D_textureLoader).animate(Client.field768); // L: 4573 - InvDefinition.method2615(var0, var1, var2, var3); // L: 4574 - class20.cameraX = var18; // L: 4575 - Skeleton.cameraY = var6; // L: 4576 - WorldMapDecoration.cameraZ = var7; // L: 4577 - class1.cameraPitch = var8; // L: 4578 - HealthBarDefinition.cameraYaw = var9; // L: 4579 - if (Client.isLoading) { // L: 4580 - byte var19 = 0; // L: 4583 - var14 = var19 + NetCache.NetCache_pendingPriorityWritesCount + NetCache.NetCache_pendingPriorityResponsesCount; // L: 4584 - if (var14 == 0) { // L: 4588 - Client.isLoading = false; - } - } - - if (Client.isLoading) { // L: 4590 - Rasterizer2D.Rasterizer2D_fillRectangle(var0, var1, var2, var3, 0); // L: 4591 - class7.drawLoadingMessage("Loading - please wait.", false); // L: 4592 - } - - } // L: 4594 - - @ObfuscatedName("is") - @ObfuscatedSignature( - descriptor = "(II)Z", - garbageValue = "-893753206" - ) - static boolean method499(int var0) { - return var0 == 57 || var0 == 58 || var0 == 1007 || var0 == 25 || var0 == 30; // L: 9128 + @Export("colorStartTag") + static String colorStartTag(int var0) { + return ""; // L: 22 } - @ObfuscatedName("iy") + @ObfuscatedName("n") @ObfuscatedSignature( - descriptor = "([Liv;IIIIIIIIS)V", - garbageValue = "27179" + descriptor = "(III)V", + garbageValue = "277125318" ) - @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); // L: 9505 - Rasterizer3D.Rasterizer3D_setClipFromRasterizer2D(); // L: 9506 + @Export("changeWorldSelectSorting") + static void changeWorldSelectSorting(int var0, int var1) { + int[] var2 = new int[4]; // L: 63 + int[] var3 = new int[4]; // L: 64 + var2[0] = var0; // L: 65 + var3[0] = var1; // L: 66 + int var4 = 1; // L: 67 - for (int var9 = 0; var9 < var0.length; ++var9) { // L: 9507 - Widget var10 = var0[var9]; // L: 9508 - if (var10 != null && (var10.parentId == var1 || var1 == -1412584499 && var10 == Client.clickedWidget)) { // L: 9509 9510 - int var11; - if (var8 == -1) { // L: 9512 - Client.rootWidgetXs[Client.rootWidgetCount] = var10.x + var6; // L: 9513 - Client.rootWidgetYs[Client.rootWidgetCount] = var7 + var10.y; // L: 9514 - Client.rootWidgetWidths[Client.rootWidgetCount] = var10.width; // L: 9515 - Client.rootWidgetHeights[Client.rootWidgetCount] = var10.height; // L: 9516 - var11 = ++Client.rootWidgetCount - 1; // L: 9517 + for (int var5 = 0; var5 < 4; ++var5) { // L: 68 + if (World.World_sortOption1[var5] != var0) { // L: 69 + var2[var4] = World.World_sortOption1[var5]; // L: 70 + var3[var4] = World.World_sortOption2[var5]; // L: 71 + ++var4; // L: 72 + } + } + + World.World_sortOption1 = var2; // L: 75 + World.World_sortOption2 = var3; // L: 76 + SoundCache.sortWorlds(Tiles.World_worlds, 0, Tiles.World_worlds.length - 1, World.World_sortOption1, World.World_sortOption2); // L: 77 + } // L: 78 + + @ObfuscatedName("gi") + @ObfuscatedSignature( + descriptor = "(Lcy;I)V", + garbageValue = "1230539063" + ) + static final void method449(Actor var0) { + var0.isWalking = false; // L: 3815 + SequenceDefinition var1; + if (var0.movementSequence != -1) { // L: 3816 + var1 = LoginScreenAnimation.SequenceDefinition_get(var0.movementSequence); // L: 3817 + if (var1 != null && var1.frameIds != null) { // L: 3818 + ++var0.movementFrameCycle; // L: 3819 + if (var0.movementFrame < var1.frameIds.length && var0.movementFrameCycle > var1.frameLengths[var0.movementFrame]) { // L: 3820 + var0.movementFrameCycle = 1; // L: 3821 + ++var0.movementFrame; // L: 3822 + Decimator.method1074(var1, var0.movementFrame, var0.x, var0.y); // L: 3823 + } + + if (var0.movementFrame >= var1.frameIds.length) { // L: 3825 + var0.movementFrameCycle = 0; // L: 3826 + var0.movementFrame = 0; // L: 3827 + Decimator.method1074(var1, var0.movementFrame, var0.x, var0.y); // L: 3828 + } + } else { + var0.movementSequence = -1; // L: 3831 + } + } + + if (var0.spotAnimation != -1 && Client.cycle >= var0.field1287) { // L: 3833 + if (var0.spotAnimationFrame < 0) { // L: 3834 + var0.spotAnimationFrame = 0; + } + + int var3 = VarcInt.SpotAnimationDefinition_get(var0.spotAnimation).sequence; // L: 3835 + if (var3 != -1) { // L: 3836 + SequenceDefinition var2 = LoginScreenAnimation.SequenceDefinition_get(var3); // L: 3837 + if (var2 != null && var2.frameIds != null) { // L: 3838 + ++var0.spotAnimationFrameCycle; // L: 3839 + if (var0.spotAnimationFrame < var2.frameIds.length && var0.spotAnimationFrameCycle > var2.frameLengths[var0.spotAnimationFrame]) { // L: 3840 + var0.spotAnimationFrameCycle = 1; // L: 3841 + ++var0.spotAnimationFrame; // L: 3842 + Decimator.method1074(var2, var0.spotAnimationFrame, var0.x, var0.y); // L: 3843 + } + + if (var0.spotAnimationFrame >= var2.frameIds.length && (var0.spotAnimationFrame < 0 || var0.spotAnimationFrame >= var2.frameIds.length)) { // L: 3845 3846 + var0.spotAnimation = -1; + } } else { - var11 = var8; // L: 9519 - } - - var10.rootIndex = var11; // L: 9520 - var10.cycle = Client.cycle; // L: 9521 - if (!var10.isIf3 || !class11.isComponentHidden(var10)) { // L: 9522 - if (var10.contentType > 0) { // L: 9523 - VarcInt.method2656(var10); - } - - int var12 = var10.x + var6; // L: 9524 - int var13 = var7 + var10.y; // L: 9525 - int var14 = var10.transparencyTop; // L: 9526 - int var15; - int var16; - if (var10 == Client.clickedWidget) { // L: 9527 - if (var1 != -1412584499 && !var10.isScrollBar) { // L: 9528 - Ignored.field3859 = var0; // L: 9529 - VarcInt.field1576 = var6; // L: 9530 - class230.field2812 = var7; // L: 9531 - continue; // L: 9532 - } - - if (Client.isDraggingWidget && Client.field794) { // L: 9534 - var15 = MouseHandler.MouseHandler_x; // L: 9535 - var16 = MouseHandler.MouseHandler_y; // L: 9536 - var15 -= Client.widgetClickX; // L: 9537 - var16 -= Client.widgetClickY; // L: 9538 - if (var15 < Client.field795) { // L: 9539 - var15 = Client.field795; - } - - if (var15 + var10.width > Client.field795 + Client.clickedWidgetParent.width) { // L: 9540 - var15 = Client.field795 + Client.clickedWidgetParent.width - var10.width; - } - - if (var16 < Client.field785) { // L: 9541 - var16 = Client.field785; - } - - if (var16 + var10.height > Client.field785 + Client.clickedWidgetParent.height) { // L: 9542 - var16 = Client.field785 + Client.clickedWidgetParent.height - var10.height; - } - - var12 = var15; // L: 9543 - var13 = var16; // L: 9544 - } - - if (!var10.isScrollBar) { // L: 9546 - var14 = 128; - } - } - - int var17; - int var18; - int var19; - int var20; - int var21; - int var22; - if (var10.type == 2) { // L: 9552 - var15 = var2; // L: 9553 - var16 = var3; // L: 9554 - var17 = var4; // L: 9555 - var18 = var5; // L: 9556 - } else if (var10.type == 9) { // L: 9558 - var19 = var12; // L: 9559 - var20 = var13; // L: 9560 - var21 = var12 + var10.width; // L: 9561 - var22 = var13 + var10.height; // L: 9562 - if (var21 < var12) { // L: 9563 - var19 = var21; // L: 9565 - var21 = var12; // L: 9566 - } - - if (var22 < var13) { // L: 9568 - var20 = var22; // L: 9570 - var22 = var13; // L: 9571 - } - - ++var21; // L: 9573 - ++var22; // L: 9574 - var15 = var19 > var2 ? var19 : var2; // L: 9575 - var16 = var20 > var3 ? var20 : var3; // L: 9576 - var17 = var21 < var4 ? var21 : var4; // L: 9577 - var18 = var22 < var5 ? var22 : var5; // L: 9578 - } else { - var19 = var12 + var10.width; // L: 9581 - var20 = var13 + var10.height; // L: 9582 - var15 = var12 > var2 ? var12 : var2; // L: 9583 - var16 = var13 > var3 ? var13 : var3; // L: 9584 - var17 = var19 < var4 ? var19 : var4; // L: 9585 - var18 = var20 < var5 ? var20 : var5; // L: 9586 - } - - if (!var10.isIf3 || var15 < var17 && var16 < var18) { // L: 9588 - if (var10.contentType != 0) { // L: 9589 - if (var10.contentType == 1336) { // L: 9590 - if (Client.displayFps) { // L: 9591 - var13 += 15; // L: 9592 - Message.fontPlain12.drawRightAligned("Fps:" + GameEngine.fps, var12 + var10.width, var13, 16776960, -1); // L: 9593 - var13 += 15; // L: 9594 - Runtime var42 = Runtime.getRuntime(); // L: 9595 - var20 = (int)((var42.totalMemory() - var42.freeMemory()) / 1024L); // L: 9596 - var21 = 16776960; // L: 9597 - if (var20 > 327680 && !Client.isLowDetail) { // L: 9598 - var21 = 16711680; - } - - Message.fontPlain12.drawRightAligned("Mem:" + var20 + "k", var12 + var10.width, var13, var21, -1); // L: 9599 - var13 += 15; // L: 9600 - } - continue; - } - - if (var10.contentType == 1337) { // L: 9604 - Client.viewportX = var12; // L: 9605 - Client.viewportY = var13; // L: 9606 - drawEntities(var12, var13, var10.width, var10.height); // L: 9607 - Client.field825[var10.rootIndex] = true; // L: 9608 - Rasterizer2D.Rasterizer2D_setClip(var2, var3, var4, var5); // L: 9609 - continue; // L: 9610 - } - - if (var10.contentType == 1338) { // L: 9612 - PacketBufferNode.drawMinimap(var10, var12, var13, var11); // L: 9613 - Rasterizer2D.Rasterizer2D_setClip(var2, var3, var4, var5); // L: 9614 - continue; // L: 9615 - } - - if (var10.contentType == 1339) { // L: 9617 - WorldMapData_1.drawCompass(var10, var12, var13, var11); // L: 9618 - Rasterizer2D.Rasterizer2D_setClip(var2, var3, var4, var5); // L: 9619 - continue; // L: 9620 - } - - if (var10.contentType == 1400) { // L: 9622 - NetSocket.worldMap.draw(var12, var13, var10.width, var10.height, Client.cycle); // L: 9623 - } - - if (var10.contentType == 1401) { // L: 9625 - NetSocket.worldMap.drawOverview(var12, var13, var10.width, var10.height); // L: 9626 - } - - if (var10.contentType == 1402) { // L: 9628 - AttackOption.loginScreenRunesAnimation.draw(var12, Client.cycle); // L: 9629 - } - } - - if (var10.type == 0) { // L: 9632 - if (!var10.isIf3 && class11.isComponentHidden(var10) && var10 != SpriteMask.mousedOverWidgetIf1) { // L: 9633 - continue; - } - - if (!var10.isIf3) { // L: 9634 - if (var10.scrollY > var10.scrollHeight - var10.height) { // L: 9635 - var10.scrollY = var10.scrollHeight - var10.height; - } - - if (var10.scrollY < 0) { // L: 9636 - var10.scrollY = 0; - } - } - - drawInterface(var0, var10.id, var15, var16, var17, var18, var12 - var10.scrollX, var13 - var10.scrollY, var11); // L: 9638 - if (var10.children != null) { // L: 9639 - drawInterface(var10.children, var10.id, var15, var16, var17, var18, var12 - var10.scrollX, var13 - var10.scrollY, var11); - } - - InterfaceParent var30 = (InterfaceParent)Client.interfaceParents.get((long)var10.id); // L: 9640 - if (var30 != null) { // L: 9641 - ModeWhere.drawWidgets(var30.group, var15, var16, var17, var18, var12, var13, var11); // L: 9642 - } - - Rasterizer2D.Rasterizer2D_setClip(var2, var3, var4, var5); // L: 9644 - Rasterizer3D.Rasterizer3D_setClipFromRasterizer2D(); // L: 9645 - } - - if (Client.isResizable || Client.field636[var11] || Client.gameDrawingMode > 1) { // L: 9647 - if (var10.type == 0 && !var10.isIf3 && var10.scrollHeight > var10.height) { // L: 9648 9649 - WorldMapRectangle.drawScrollBar(var12 + var10.width, var13, var10.scrollY, var10.height, var10.scrollHeight); - } - - if (var10.type != 1) { // L: 9651 - int var23; - int var24; - int var25; - int var26; - if (var10.type == 2) { // L: 9654 - var19 = 0; // L: 9655 - - for (var20 = 0; var20 < var10.rawHeight; ++var20) { // L: 9656 - for (var21 = 0; var21 < var10.rawWidth; ++var21) { // L: 9657 - var22 = var12 + var21 * (var10.paddingX + 32); // L: 9658 - var23 = var13 + var20 * (var10.paddingY + 32); // L: 9659 - if (var19 < 20) { // L: 9660 - var22 += var10.inventoryXOffsets[var19]; // L: 9661 - var23 += var10.inventoryYOffsets[var19]; // L: 9662 - } - - if (var10.itemIds[var19] <= 0) { // L: 9664 - if (var10.inventorySprites != null && var19 < 20) { // L: 9709 - SpritePixels var46 = var10.getInventorySprite(var19); // L: 9710 - if (var46 != null) { // L: 9711 - var46.drawTransBgAt(var22, var23); - } else if (Widget.field2962) { // L: 9712 - VerticalAlignment.invalidateWidget(var10); - } - } - } else { - boolean var37 = false; // L: 9665 - boolean var38 = false; // L: 9666 - var26 = var10.itemIds[var19] - 1; // L: 9667 - if (var22 + 32 > var2 && var22 < var4 && var23 + 32 > var3 && var23 < var5 || var10 == class34.dragInventoryWidget && var19 == Client.dragItemSlotSource) { // L: 9668 - SpritePixels var35; - if (Client.isItemSelected == 1 && var19 == UserComparator8.selectedItemSlot && var10.id == class35.selectedItemWidget) { // L: 9670 - var35 = SecureRandomFuture.getItemSprite(var26, var10.itemQuantities[var19], 2, 0, 2, false); - } else { - var35 = SecureRandomFuture.getItemSprite(var26, var10.itemQuantities[var19], 1, 3153952, 2, false); // L: 9671 - } - - if (var35 != null) { // L: 9672 - if (var10 == class34.dragInventoryWidget && var19 == Client.dragItemSlotSource) { // L: 9673 - var24 = MouseHandler.MouseHandler_x - Client.draggedWidgetX; // L: 9674 - var25 = MouseHandler.MouseHandler_y - Client.draggedWidgetY; // L: 9675 - if (var24 < 5 && var24 > -5) { // L: 9676 - var24 = 0; - } - - if (var25 < 5 && var25 > -5) { // L: 9677 - var25 = 0; - } - - if (Client.itemDragDuration < 5) { // L: 9678 - var24 = 0; // L: 9679 - var25 = 0; // L: 9680 - } - - var35.drawTransAt(var24 + var22, var25 + var23, 128); // L: 9682 - if (var1 != -1) { // L: 9683 - Widget var28 = var0[var1 & 65535]; // L: 9684 - int var29; - if (var23 + var25 < Rasterizer2D.Rasterizer2D_yClipStart && var28.scrollY > 0) { // L: 9685 - var29 = (Rasterizer2D.Rasterizer2D_yClipStart - var23 - var25) * Client.field768 / 3; // L: 9686 - if (var29 > Client.field768 * 10) { // L: 9687 - var29 = Client.field768 * 10; - } - - if (var29 > var28.scrollY) { // L: 9688 - var29 = var28.scrollY; - } - - var28.scrollY -= var29; // L: 9689 - Client.draggedWidgetY += var29; // L: 9690 - VerticalAlignment.invalidateWidget(var28); // L: 9691 - } - - if (var23 + var25 + 32 > Rasterizer2D.Rasterizer2D_yClipEnd && var28.scrollY < var28.scrollHeight - var28.height) { // L: 9693 - var29 = (var25 + var23 + 32 - Rasterizer2D.Rasterizer2D_yClipEnd) * Client.field768 / 3; // L: 9694 - if (var29 > Client.field768 * 10) { // L: 9695 - var29 = Client.field768 * 10; - } - - if (var29 > var28.scrollHeight - var28.height - var28.scrollY) { // L: 9696 - var29 = var28.scrollHeight - var28.height - var28.scrollY; - } - - var28.scrollY += var29; // L: 9697 - Client.draggedWidgetY -= var29; // L: 9698 - VerticalAlignment.invalidateWidget(var28); // L: 9699 - } - } - } else if (var10 == Projectile.field1039 && var19 == Client.field633) { // L: 9703 - var35.drawTransAt(var22, var23, 128); - } else { - var35.drawTransBgAt(var22, var23); // L: 9704 - } - } else { - VerticalAlignment.invalidateWidget(var10); // L: 9706 - } - } - } - - ++var19; // L: 9714 - } - } - } else if (var10.type == 3) { // L: 9719 - if (class373.runCs1(var10)) { // L: 9721 - var19 = var10.color2; // L: 9722 - if (var10 == SpriteMask.mousedOverWidgetIf1 && var10.mouseOverColor2 != 0) { // L: 9723 - var19 = var10.mouseOverColor2; - } - } else { - var19 = var10.color; // L: 9726 - if (var10 == SpriteMask.mousedOverWidgetIf1 && var10.mouseOverColor != 0) { // L: 9727 - var19 = var10.mouseOverColor; - } - } - - if (var10.fill) { // L: 9729 - switch(var10.fillMode.field4236) { // L: 9730 - case 1: - Rasterizer2D.Rasterizer2D_fillRectangleGradient(var12, var13, var10.width, var10.height, var10.color, var10.color2); // L: 9736 - break; // L: 9737 - case 2: - Rasterizer2D.Rasterizer2D_fillRectangleGradientAlpha(var12, var13, var10.width, var10.height, var10.color, var10.color2, 255 - (var10.transparencyTop & 255), 255 - (var10.transparencyBot & 255)); // L: 9739 - break; // L: 9740 - default: - if (var14 == 0) { // L: 9732 - Rasterizer2D.Rasterizer2D_fillRectangle(var12, var13, var10.width, var10.height, var19); - } else { - Rasterizer2D.Rasterizer2D_fillRectangleAlpha(var12, var13, var10.width, var10.height, var19, 256 - (var14 & 255)); // L: 9733 - } - } - } else if (var14 == 0) { // L: 9744 - Rasterizer2D.Rasterizer2D_drawRectangle(var12, var13, var10.width, var10.height, var19); - } else { - Rasterizer2D.Rasterizer2D_drawRectangleAlpha(var12, var13, var10.width, var10.height, var19, 256 - (var14 & 255)); // L: 9745 - } - } else { - Font var39; - if (var10.type == 4) { // L: 9749 - var39 = var10.getFont(); // L: 9750 - if (var39 == null) { // L: 9751 - if (Widget.field2962) { // L: 9752 - VerticalAlignment.invalidateWidget(var10); - } - } else { - String var44 = var10.text; // L: 9756 - if (class373.runCs1(var10)) { // L: 9757 - var20 = var10.color2; // L: 9758 - if (var10 == SpriteMask.mousedOverWidgetIf1 && var10.mouseOverColor2 != 0) { // L: 9759 - var20 = var10.mouseOverColor2; - } - - if (var10.text2.length() > 0) { // L: 9760 - var44 = var10.text2; - } - } else { - var20 = var10.color; // L: 9763 - if (var10 == SpriteMask.mousedOverWidgetIf1 && var10.mouseOverColor != 0) { // L: 9764 - var20 = var10.mouseOverColor; - } - } - - if (var10.isIf3 && var10.itemId != -1) { // L: 9766 - ItemComposition var45 = Strings.ItemDefinition_get(var10.itemId); // L: 9767 - var44 = var45.name; // L: 9768 - if (var44 == null) { // L: 9769 - var44 = "null"; - } - - if ((var45.isStackable == 1 || var10.itemQuantity != 1) && var10.itemQuantity != -1) { // L: 9770 - var44 = HorizontalAlignment.colorStartTag(16748608) + var44 + "" + " " + 'x' + Messages.formatItemStacks(var10.itemQuantity); - } - } - - if (var10 == Client.meslayerContinueWidget) { // L: 9772 - var44 = "Please wait..."; // L: 9773 - var20 = var10.color; // L: 9774 - } - - if (!var10.isIf3) { // L: 9776 - var44 = GrandExchangeOfferTotalQuantityComparator.method4979(var44, var10); - } - - var39.drawLines(var44, var12, var13, var10.width, var10.height, var20, var10.textShadowed ? 0 : -1, var10.textXAlignment, var10.textYAlignment, var10.textLineHeight); // L: 9777 - } - } else if (var10.type == 5) { // L: 9780 - SpritePixels var40; - if (!var10.isIf3) { // L: 9781 - var40 = var10.getSprite(class373.runCs1(var10)); // L: 9782 - if (var40 != null) { // L: 9783 - var40.drawTransBgAt(var12, var13); - } else if (Widget.field2962) { // L: 9784 - VerticalAlignment.invalidateWidget(var10); - } - } else { - if (var10.itemId != -1) { // L: 9788 - var40 = SecureRandomFuture.getItemSprite(var10.itemId, var10.itemQuantity, var10.outline, var10.spriteShadow, var10.itemQuantityMode, false); - } else { - var40 = var10.getSprite(false); // L: 9789 - } - - if (var40 == null) { // L: 9790 - if (Widget.field2962) { // L: 9814 - VerticalAlignment.invalidateWidget(var10); - } - } else { - var20 = var40.width; // L: 9791 - var21 = var40.height; // L: 9792 - if (!var10.spriteTiling) { // L: 9793 - var22 = var10.width * 4096 / var20; // L: 9807 - if (var10.spriteAngle != 0) { // L: 9808 - var40.method6894(var10.width / 2 + var12, var10.height / 2 + var13, var10.spriteAngle, var22); - } else if (var14 != 0) { // L: 9809 - var40.drawTransScaledAt(var12, var13, var10.width, var10.height, 256 - (var14 & 255)); - } else if (var20 == var10.width && var21 == var10.height) { // L: 9810 - var40.drawTransBgAt(var12, var13); // L: 9811 - } else { - var40.drawScaledAt(var12, var13, var10.width, var10.height); - } - } else { - Rasterizer2D.Rasterizer2D_expandClip(var12, var13, var12 + var10.width, var13 + var10.height); // L: 9794 - var22 = (var20 - 1 + var10.width) / var20; // L: 9795 - var23 = (var21 - 1 + var10.height) / var21; // L: 9796 - - for (var24 = 0; var24 < var22; ++var24) { // L: 9797 - for (var25 = 0; var25 < var23; ++var25) { // L: 9798 - if (var10.spriteAngle != 0) { // L: 9799 - var40.method6894(var20 / 2 + var12 + var24 * var20, var21 / 2 + var13 + var25 * var21, var10.spriteAngle, 4096); - } else if (var14 != 0) { // L: 9800 - var40.drawTransAt(var12 + var24 * var20, var13 + var21 * var25, 256 - (var14 & 255)); - } else { - var40.drawTransBgAt(var12 + var20 * var24, var13 + var21 * var25); // L: 9801 - } - } - } - - Rasterizer2D.Rasterizer2D_setClip(var2, var3, var4, var5); // L: 9804 - } - } - } - } else { - ItemComposition var33; - if (var10.type == 6) { // L: 9818 - boolean var36 = class373.runCs1(var10); // L: 9819 - if (var36) { // L: 9821 - var20 = var10.sequenceId2; - } else { - var20 = var10.sequenceId; // L: 9822 - } - - Model var41 = null; // L: 9823 - var22 = 0; // L: 9824 - if (var10.itemId != -1) { // L: 9825 - var33 = Strings.ItemDefinition_get(var10.itemId); // L: 9826 - if (var33 != null) { // L: 9827 - var33 = var33.getCountObj(var10.itemQuantity); // L: 9828 - var41 = var33.getModel(1); // L: 9829 - if (var41 != null) { // L: 9830 - var41.calculateBoundsCylinder(); // L: 9831 - var22 = var41.height / 2; // L: 9832 - } else { - VerticalAlignment.invalidateWidget(var10); // L: 9834 - } - } - } else if (var10.modelType == 5) { // L: 9837 - if (var10.modelId == 0) { // L: 9838 - var41 = Client.playerAppearance.getModel((SequenceDefinition)null, -1, (SequenceDefinition)null, -1); - } else { - var41 = class35.localPlayer.getModel(); // L: 9839 - } - } else if (var20 == -1) { // L: 9841 - var41 = var10.getModel((SequenceDefinition)null, -1, var36, class35.localPlayer.appearance); // L: 9842 - if (var41 == null && Widget.field2962) { // L: 9843 - VerticalAlignment.invalidateWidget(var10); - } - } else { - SequenceDefinition var47 = Player.SequenceDefinition_get(var20); // L: 9846 - var41 = var10.getModel(var47, var10.modelFrame, var36, class35.localPlayer.appearance); // L: 9847 - if (var41 == null && Widget.field2962) { // L: 9848 - VerticalAlignment.invalidateWidget(var10); - } - } - - Rasterizer3D.method3818(var10.width / 2 + var12, var10.height / 2 + var13); // L: 9850 - var23 = Rasterizer3D.Rasterizer3D_sine[var10.modelAngleX] * var10.modelZoom >> 16; // L: 9851 - var24 = Rasterizer3D.Rasterizer3D_cosine[var10.modelAngleX] * var10.modelZoom >> 16; // L: 9852 - if (var41 != null) { // L: 9853 - if (!var10.isIf3) { // L: 9854 - var41.method4136(0, var10.modelAngleY, 0, var10.modelAngleX, 0, var23, var24); - } else { - var41.calculateBoundsCylinder(); // L: 9856 - if (var10.modelOrthog) { // L: 9857 - var41.method4137(0, var10.modelAngleY, var10.modelAngleZ, var10.modelAngleX, var10.modelOffsetX, var22 + var23 + var10.modelOffsetY, var24 + var10.modelOffsetY, var10.modelZoom); - } else { - var41.method4136(0, var10.modelAngleY, var10.modelAngleZ, var10.modelAngleX, var10.modelOffsetX, var22 + var23 + var10.modelOffsetY, var24 + var10.modelOffsetY); // L: 9858 - } - } - } - - Rasterizer3D.Rasterizer3D_method3(); // L: 9861 - } else { - if (var10.type == 7) { // L: 9864 - var39 = var10.getFont(); // L: 9865 - if (var39 == null) { // L: 9866 - if (Widget.field2962) { // L: 9867 - VerticalAlignment.invalidateWidget(var10); - } - continue; - } - - var20 = 0; // L: 9870 - - for (var21 = 0; var21 < var10.rawHeight; ++var21) { // L: 9871 - for (var22 = 0; var22 < var10.rawWidth; ++var22) { // L: 9872 - if (var10.itemIds[var20] > 0) { // L: 9873 - var33 = Strings.ItemDefinition_get(var10.itemIds[var20] - 1); // L: 9874 - String var34; - if (var33.isStackable != 1 && var10.itemQuantities[var20] == 1) { // L: 9876 - var34 = HorizontalAlignment.colorStartTag(16748608) + var33.name + ""; - } else { - var34 = HorizontalAlignment.colorStartTag(16748608) + var33.name + "" + " " + 'x' + Messages.formatItemStacks(var10.itemQuantities[var20]); // L: 9877 - } - - var25 = var22 * (var10.paddingX + 115) + var12; // L: 9878 - var26 = var21 * (var10.paddingY + 12) + var13; // L: 9879 - if (var10.textXAlignment == 0) { // L: 9880 - var39.draw(var34, var25, var26, var10.color, var10.textShadowed ? 0 : -1); - } else if (var10.textXAlignment == 1) { // L: 9881 - var39.drawCentered(var34, var10.width / 2 + var25, var26, var10.color, var10.textShadowed ? 0 : -1); - } else { - var39.drawRightAligned(var34, var25 + var10.width - 1, var26, var10.color, var10.textShadowed ? 0 : -1); // L: 9882 - } - } - - ++var20; // L: 9884 - } - } - } - - if (var10.type == 8 && var10 == class34.field241 && Client.field741 == Client.field811) { // L: 9888 9889 - var19 = 0; // L: 9890 - var20 = 0; // L: 9891 - Font var31 = Message.fontPlain12; // L: 9892 - String var32 = var10.text; // L: 9893 - - String var43; - for (var32 = GrandExchangeOfferTotalQuantityComparator.method4979(var32, var10); var32.length() > 0; var20 = var20 + var31.ascent + 1) { // L: 9895 9896 9908 - var24 = var32.indexOf("
"); // L: 9897 - if (var24 != -1) { // L: 9898 - var43 = var32.substring(0, var24); // L: 9899 - var32 = var32.substring(var24 + 4); // L: 9900 - } else { - var43 = var32; // L: 9903 - var32 = ""; // L: 9904 - } - - var25 = var31.stringWidth(var43); // L: 9906 - if (var25 > var19) { // L: 9907 - var19 = var25; - } - } - - var19 += 6; // L: 9910 - var20 += 7; // L: 9911 - var24 = var12 + var10.width - 5 - var19; // L: 9912 - var25 = var13 + var10.height + 5; // L: 9913 - if (var24 < var12 + 5) { // L: 9914 - var24 = var12 + 5; - } - - if (var24 + var19 > var4) { // L: 9915 - var24 = var4 - var19; - } - - if (var20 + var25 > var5) { // L: 9916 - var25 = var5 - var20; - } - - Rasterizer2D.Rasterizer2D_fillRectangle(var24, var25, var19, var20, 16777120); // L: 9917 - Rasterizer2D.Rasterizer2D_drawRectangle(var24, var25, var19, var20, 0); // L: 9918 - var32 = var10.text; // L: 9919 - var26 = var25 + var31.ascent + 2; // L: 9920 - - for (var32 = GrandExchangeOfferTotalQuantityComparator.method4979(var32, var10); var32.length() > 0; var26 = var26 + var31.ascent + 1) { // L: 9921 9922 9933 - int var27 = var32.indexOf("
"); // L: 9923 - if (var27 != -1) { // L: 9924 - var43 = var32.substring(0, var27); // L: 9925 - var32 = var32.substring(var27 + 4); // L: 9926 - } else { - var43 = var32; // L: 9929 - var32 = ""; // L: 9930 - } - - var31.draw(var43, var24 + 3, var26, 0, -1); // L: 9932 - } - } - - if (var10.type == 9) { // L: 9937 - if (var10.field2998) { // L: 9942 - var19 = var12; // L: 9943 - var20 = var13 + var10.height; // L: 9944 - var21 = var12 + var10.width; // L: 9945 - var22 = var13; // L: 9946 - } else { - var19 = var12; // L: 9949 - var20 = var13; // L: 9950 - var21 = var12 + var10.width; // L: 9951 - var22 = var13 + var10.height; // L: 9952 - } - - if (var10.lineWid == 1) { // L: 9954 - Rasterizer2D.Rasterizer2D_drawLine(var19, var20, var21, var22, var10.color); // L: 9955 - } else { - Messages.method2378(var19, var20, var21, var22, var10.color, var10.lineWid); // L: 9958 - } - } - } - } - } - } - } - } + var0.spotAnimation = -1; // L: 3849 } + } else { + var0.spotAnimation = -1; // L: 3851 } } - } // L: 9963 + if (var0.sequence != -1 && var0.sequenceDelay <= 1) { // L: 3853 + var1 = LoginScreenAnimation.SequenceDefinition_get(var0.sequence); // L: 3854 + if (var1.field1883 == 1 && var0.field1274 > 0 && var0.field1265 <= Client.cycle && var0.field1283 < Client.cycle) { // L: 3855 3856 + var0.sequenceDelay = 1; // L: 3857 + return; // L: 3858 + } + } + + if (var0.sequence != -1 && var0.sequenceDelay == 0) { // L: 3862 + var1 = LoginScreenAnimation.SequenceDefinition_get(var0.sequence); // L: 3863 + if (var1 != null && var1.frameIds != null) { // L: 3864 + ++var0.sequenceFrameCycle; // L: 3865 + if (var0.sequenceFrame < var1.frameIds.length && var0.sequenceFrameCycle > var1.frameLengths[var0.sequenceFrame]) { // L: 3866 + var0.sequenceFrameCycle = 1; // L: 3867 + ++var0.sequenceFrame; // L: 3868 + Decimator.method1074(var1, var0.sequenceFrame, var0.x, var0.y); // L: 3869 + } + + if (var0.sequenceFrame >= var1.frameIds.length) { // L: 3871 + var0.sequenceFrame -= var1.frameCount; // L: 3872 + ++var0.field1245; // L: 3873 + if (var0.field1245 >= var1.field1888) { // L: 3874 + var0.sequence = -1; + } else if (var0.sequenceFrame >= 0 && var0.sequenceFrame < var1.frameIds.length) { // L: 3875 + Decimator.method1074(var1, var0.sequenceFrame, var0.x, var0.y); // L: 3876 + } else { + var0.sequence = -1; + } + } + + var0.isWalking = var1.field1882; // L: 3878 + } else { + var0.sequence = -1; // L: 3880 + } + } + + if (var0.sequenceDelay > 0) { // L: 3882 + --var0.sequenceDelay; + } + + } // L: 3883 + + @ObfuscatedName("gh") + @ObfuscatedSignature( + descriptor = "(B)Z", + garbageValue = "4" + ) + static boolean method451() { + return (Client.drawPlayerNames & 2) != 0; // L: 4426 + } } diff --git a/runescape-client/src/main/java/class5.java b/runescape-client/src/main/java/class5.java index ff6c52a6c9..cd76614614 100644 --- a/runescape-client/src/main/java/class5.java +++ b/runescape-client/src/main/java/class5.java @@ -1,178 +1,139 @@ -import java.util.Date; import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -import netscape.javascript.JSObject; -@ObfuscatedName("z") +@ObfuscatedName("j") public class class5 extends class16 { - @ObfuscatedName("v") - @Export("Widget_loadedInterfaces") - static boolean[] Widget_loadedInterfaces; - @ObfuscatedName("gz") - @ObfuscatedSignature( - descriptor = "Lgz;" - ) - @Export("scene") - static Scene scene; - @ObfuscatedName("h") + @ObfuscatedName("an") @ObfuscatedGetter( - intValue = 1793437277 + intValue = 1071759603 ) - int field45; + static int field53; + @ObfuscatedName("ez") + @ObfuscatedSignature( + descriptor = "Ljp;" + ) + @Export("archive20") + static Archive archive20; + @ObfuscatedName("v") + @ObfuscatedGetter( + intValue = -625073017 + ) + int field56; // $FF: synthetic field @ObfuscatedSignature( - descriptor = "Lm;" + descriptor = "Lx;" ) final class19 this$0; @ObfuscatedSignature( - descriptor = "(Lm;)V" + descriptor = "(Lx;)V" ) class5(class19 var1) { this.this$0 = var1; - this.field45 = -1; // L: 81 - } + this.field56 = -1; // L: 81 + } // L: 83 - @ObfuscatedName("h") + @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "(Lnk;S)V", - garbageValue = "4095" + descriptor = "(Lnd;I)V", + garbageValue = "68071115" ) - void vmethod326(Buffer var1) { - this.field45 = var1.readUnsignedShort(); // L: 86 + void vmethod266(Buffer var1) { + this.field56 = var1.readUnsignedShort(); // L: 86 var1.readUnsignedByte(); // L: 87 if (var1.readUnsignedByte() != 255) { // L: 88 --var1.offset; // L: 89 - var1.readLong(); + var1.readLong(); // L: 90 } } // L: 92 - @ObfuscatedName("c") + @ObfuscatedName("n") @ObfuscatedSignature( - descriptor = "(Lg;B)V", - garbageValue = "-61" + descriptor = "(Ly;I)V", + garbageValue = "-1846892157" ) - void vmethod314(class3 var1) { - var1.method33(this.field45); // L: 95 + void vmethod264(ClanChannel var1) { + var1.removeMember(this.field56); // L: 95 } // L: 96 - @ObfuscatedName("o") + @ObfuscatedName("n") @ObfuscatedSignature( - descriptor = "(CB)C", - garbageValue = "19" + descriptor = "(ILjava/lang/String;Ljava/lang/String;Ljava/lang/String;I)V", + garbageValue = "1508723564" ) - public static char method68(char var0) { - switch(var0) { // L: 48 - case ' ': - case '-': - case '_': - case ' ': - return '_'; // L: 106 - case '#': - case '[': - case ']': - return var0; // L: 74 - case 'À': - case 'Á': - case 'Â': - case 'Ã': - case 'Ä': - case 'à': - case 'á': - case 'â': - case 'ã': - case 'ä': - return 'a'; // L: 101 - case 'Ç': - case 'ç': - return 'c'; // L: 68 - case 'È': - case 'É': - case 'Ê': - case 'Ë': - case 'è': - case 'é': - case 'ê': - case 'ë': - return 'e'; // L: 83 - case 'Í': - case 'Î': - case 'Ï': - case 'í': - case 'î': - case 'ï': - return 'i'; // L: 90 - case 'Ñ': - case 'ñ': - return 'n'; // L: 51 - case 'Ò': - case 'Ó': - case 'Ô': - case 'Õ': - case 'Ö': - case 'ò': - case 'ó': - case 'ô': - case 'õ': - case 'ö': - return 'o'; // L: 117 - case 'Ù': - case 'Ú': - case 'Û': - case 'Ü': - case 'ù': - case 'ú': - case 'û': - case 'ü': - return 'u'; // L: 63 - case 'ß': - return 'b'; // L: 65 - case 'ÿ': - case 'Ÿ': - return 'y'; // L: 54 - default: - return Character.toLowerCase(var0); // L: 70 + @Export("addChatMessage") + static void addChatMessage(int var0, String var1, String var2, String var3) { + ChatChannel var4 = (ChatChannel)Messages.Messages_channels.get(var0); // L: 23 + if (var4 == null) { // L: 24 + var4 = new ChatChannel(); // L: 25 + Messages.Messages_channels.put(var0, var4); // L: 26 + } + + Message var5 = var4.addMessage(var0, var1, var2, var3); // L: 28 + Messages.Messages_hashTable.put(var5, (long)var5.count); // L: 29 + Messages.Messages_queue.add(var5); // L: 30 + Client.chatCycle = Client.cycleCntr; // L: 31 + } // L: 32 + + @ObfuscatedName("f") + @ObfuscatedSignature( + descriptor = "(IS)[B", + garbageValue = "3296" + ) + @Export("ByteArrayPool_getArray") + public static synchronized byte[] ByteArrayPool_getArray(int var0) { + return ByteArrayPool.ByteArrayPool_getArrayBool(var0, false); // L: 72 + } + + @ObfuscatedName("y") + @ObfuscatedSignature( + descriptor = "(IB)I", + garbageValue = "30" + ) + public static int method58(int var0) { + return VarpDefinition.method2630(ViewportMouse.ViewportMouse_entityTags[var0]); // L: 60 + } + + @ObfuscatedName("ih") + @ObfuscatedSignature( + descriptor = "(IB)Z", + garbageValue = "113" + ) + static final boolean method51(int var0) { + if (var0 < 0) { // L: 7764 + return false; + } else { + int var1 = Client.menuOpcodes[var0]; // L: 7765 + if (var1 >= 2000) { // L: 7766 + var1 -= 2000; + } + + return var1 == 1007; // L: 7767 } } - @ObfuscatedName("lo") + @ObfuscatedName("ik") @ObfuscatedSignature( - descriptor = "(Ljava/lang/String;I)V", - garbageValue = "-1466168379" + descriptor = "(I)V", + garbageValue = "-1850055815" ) - static void method64(String var0) { - class253.field3136 = var0; // L: 11648 - - try { - String var1 = class303.client.getParameter(Integer.toString(18)); // L: 11650 - String var2 = class303.client.getParameter(Integer.toString(13)); // L: 11651 - String var3 = var1 + "settings=" + var0 + "; version=1; path=/; domain=" + var2; // L: 11652 - String var5; - if (var0.length() == 0) { // L: 11653 - var3 = var3 + "; Expires=Thu, 01-Jan-1970 00:00:00 GMT; Max-Age=0"; - } else { - String var4 = var3 + "; Expires="; // L: 11655 - long var6 = Archive.currentTimeMillis() + 94608000000L; // L: 11657 - Calendar.Calendar_calendar.setTime(new Date(var6)); // L: 11659 - int var8 = Calendar.Calendar_calendar.get(7); // L: 11660 - int var9 = Calendar.Calendar_calendar.get(5); // L: 11661 - int var10 = Calendar.Calendar_calendar.get(2); // L: 11662 - int var11 = Calendar.Calendar_calendar.get(1); // L: 11663 - int var12 = Calendar.Calendar_calendar.get(11); // L: 11664 - int var13 = Calendar.Calendar_calendar.get(12); // L: 11665 - int var14 = Calendar.Calendar_calendar.get(13); // L: 11666 - var5 = Calendar.DAYS_OF_THE_WEEK[var8 - 1] + ", " + var9 / 10 + var9 % 10 + "-" + Calendar.MONTH_NAMES_ENGLISH_GERMAN[0][var10] + "-" + var11 + " " + var12 / 10 + var12 % 10 + ":" + var13 / 10 + var13 % 10 + ":" + var14 / 10 + var14 % 10 + " GMT"; // L: 11667 - var3 = var4 + var5 + "; Max-Age=" + 94608000L; // L: 11669 + @Export("Widget_runOnTargetLeave") + static void Widget_runOnTargetLeave() { + if (Client.isSpellSelected) { // L: 8647 + Widget var0 = ModeWhere.getWidgetChild(Decimator.selectedSpellWidget, Client.selectedSpellChildIndex); // L: 8648 + if (var0 != null && var0.onTargetLeave != null) { // L: 8649 + ScriptEvent var1 = new ScriptEvent(); // L: 8650 + var1.widget = var0; // L: 8651 + var1.args = var0.onTargetLeave; // L: 8652 + PacketWriter.runScriptEvent(var1); // L: 8653 } - Client var16 = class303.client; // L: 11671 - var5 = "document.cookie=\"" + var3 + "\""; // L: 11672 - JSObject.getWindow(var16).eval(var5); // L: 11675 - } catch (Throwable var15) { // L: 11678 + Client.field788 = -1; // L: 8655 + Client.isSpellSelected = false; // L: 8656 + WorldMapCacheName.invalidateWidget(var0); // L: 8657 } - - } // L: 11679 + } // L: 8658 } diff --git a/runescape-client/src/main/java/class6.java b/runescape-client/src/main/java/class6.java index aecf80b790..99b0b8cb69 100644 --- a/runescape-client/src/main/java/class6.java +++ b/runescape-client/src/main/java/class6.java @@ -3,162 +3,87 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("t") +@ObfuscatedName("r") public class class6 extends class14 { - @ObfuscatedName("b") + @ObfuscatedName("bs") + static String field58; + @ObfuscatedName("v") @ObfuscatedGetter( - intValue = 1741203959 + intValue = -1126650753 ) - @Export("ItemDefinition_fileCount") - public static int ItemDefinition_fileCount; - @ObfuscatedName("mh") + int field60; + @ObfuscatedName("n") @ObfuscatedGetter( - intValue = -699595077 + intValue = 910283143 ) - @Export("selectedSpellWidget") - static int selectedSpellWidget; - @ObfuscatedName("h") - @ObfuscatedGetter( - intValue = 896931621 - ) - int field52; - @ObfuscatedName("c") - @ObfuscatedGetter( - intValue = 1534263289 - ) - int field56; + int field59; // $FF: synthetic field @ObfuscatedSignature( - descriptor = "Lo;" + descriptor = "Lf;" ) final class2 this$0; @ObfuscatedSignature( - descriptor = "(Lo;)V" + descriptor = "(Lf;)V" ) class6(class2 var1) { this.this$0 = var1; // L: 271 } - @ObfuscatedName("h") + @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "(Lnk;I)V", - garbageValue = "110401227" + descriptor = "(Lnd;I)V", + garbageValue = "-1281352827" ) - void vmethod339(Buffer var1) { - this.field52 = var1.readInt(); // L: 274 - this.field56 = var1.readInt(); // L: 275 + void vmethod276(Buffer var1) { + this.field60 = var1.readInt(); // L: 274 + this.field59 = var1.readInt(); // L: 275 } // L: 276 - @ObfuscatedName("c") + @ObfuscatedName("n") @ObfuscatedSignature( - descriptor = "(Lx;I)V", - garbageValue = "-1535989118" + descriptor = "(Ll;B)V", + garbageValue = "29" ) - void vmethod338(class11 var1) { - var1.method126(this.field52, this.field56); // L: 279 + void vmethod281(ClanSettings var1) { + var1.method157(this.field60, this.field59); // L: 279 } // L: 280 - @ObfuscatedName("t") - @Export("Entity_unpackID") - public static int Entity_unpackID(long var0) { - return (int)(var0 >>> 17 & 4294967295L); // L: 78 + @ObfuscatedName("n") + @ObfuscatedSignature( + descriptor = "(II)Lew;", + garbageValue = "1647125333" + ) + @Export("WorldMapElement_get") + public static WorldMapElement WorldMapElement_get(int var0) { + return var0 >= 0 && var0 < WorldMapElement.WorldMapElement_cached.length && WorldMapElement.WorldMapElement_cached[var0] != null ? WorldMapElement.WorldMapElement_cached[var0] : new WorldMapElement(var0); // L: 62 63 } - @ObfuscatedName("gf") + @ObfuscatedName("f") @ObfuscatedSignature( - descriptor = "(Lcj;B)V", - garbageValue = "-122" + descriptor = "(ILjv;Ljava/lang/String;Ljava/lang/String;IZI)V", + garbageValue = "-908016568" ) - static final void method71(Actor var0) { - var0.isWalking = false; // L: 4242 - SequenceDefinition var1; - if (var0.movementSequence != -1) { // L: 4243 - var1 = Player.SequenceDefinition_get(var0.movementSequence); // L: 4244 - if (var1 != null && var1.frameIds != null) { // L: 4245 - ++var0.movementFrameCycle; // L: 4246 - if (var0.movementFrame < var1.frameIds.length && var0.movementFrameCycle > var1.frameLengths[var0.movementFrame]) { // L: 4247 - var0.movementFrameCycle = 1; // L: 4248 - ++var0.movementFrame; // L: 4249 - WorldMapManager.method3425(var1, var0.movementFrame, var0.x, var0.y); // L: 4250 - } + public static void method60(int var0, AbstractArchive var1, String var2, String var3, int var4, boolean var5) { + int var6 = var1.getGroupId(var2); // L: 44 + int var7 = var1.getFileId(var6, var3); // L: 45 + Canvas.method395(var0, var1, var6, var7, var4, var5); // L: 46 + } // L: 47 - if (var0.movementFrame >= var1.frameIds.length) { // L: 4252 - var0.movementFrameCycle = 0; // L: 4253 - var0.movementFrame = 0; // L: 4254 - WorldMapManager.method3425(var1, var0.movementFrame, var0.x, var0.y); // L: 4255 - } - } else { - var0.movementSequence = -1; // L: 4258 - } + @ObfuscatedName("o") + @ObfuscatedSignature( + descriptor = "(Ljava/lang/CharSequence;I)Ljava/lang/String;", + garbageValue = "-1691185672" + ) + public static String method67(CharSequence var0) { + int var2 = var0.length(); // L: 166 + char[] var3 = new char[var2]; // L: 168 + + for (int var4 = 0; var4 < var2; ++var4) { // L: 169 + var3[var4] = '*'; } - if (var0.spotAnimation != -1 && Client.cycle >= var0.field1243) { // L: 4260 - if (var0.spotAnimationFrame < 0) { // L: 4261 - var0.spotAnimationFrame = 0; - } - - int var3 = Friend.SpotAnimationDefinition_get(var0.spotAnimation).sequence; // L: 4262 - if (var3 != -1) { // L: 4263 - SequenceDefinition var2 = Player.SequenceDefinition_get(var3); // L: 4264 - if (var2 != null && var2.frameIds != null) { // L: 4265 - ++var0.spotAnimationFrameCycle; // L: 4266 - if (var0.spotAnimationFrame < var2.frameIds.length && var0.spotAnimationFrameCycle > var2.frameLengths[var0.spotAnimationFrame]) { // L: 4267 - var0.spotAnimationFrameCycle = 1; // L: 4268 - ++var0.spotAnimationFrame; // L: 4269 - WorldMapManager.method3425(var2, var0.spotAnimationFrame, var0.x, var0.y); // L: 4270 - } - - if (var0.spotAnimationFrame >= var2.frameIds.length && (var0.spotAnimationFrame < 0 || var0.spotAnimationFrame >= var2.frameIds.length)) { // L: 4272 4273 - var0.spotAnimation = -1; - } - } else { - var0.spotAnimation = -1; // L: 4276 - } - } else { - var0.spotAnimation = -1; // L: 4278 - } - } - - if (var0.sequence != -1 && var0.sequenceDelay <= 1) { // L: 4280 - var1 = Player.SequenceDefinition_get(var0.sequence); // L: 4281 - if (var1.field1886 == 1 && var0.field1215 > 0 && var0.field1254 <= Client.cycle && var0.field1237 < Client.cycle) { // L: 4282 4283 - var0.sequenceDelay = 1; // L: 4284 - return; // L: 4285 - } - } - - if (var0.sequence != -1 && var0.sequenceDelay == 0) { // L: 4289 - var1 = Player.SequenceDefinition_get(var0.sequence); // L: 4290 - if (var1 != null && var1.frameIds != null) { // L: 4291 - ++var0.sequenceFrameCycle; // L: 4292 - if (var0.sequenceFrame < var1.frameIds.length && var0.sequenceFrameCycle > var1.frameLengths[var0.sequenceFrame]) { // L: 4293 - var0.sequenceFrameCycle = 1; // L: 4294 - ++var0.sequenceFrame; // L: 4295 - WorldMapManager.method3425(var1, var0.sequenceFrame, var0.x, var0.y); // L: 4296 - } - - if (var0.sequenceFrame >= var1.frameIds.length) { // L: 4298 - var0.sequenceFrame -= var1.frameCount; // L: 4299 - ++var0.field1244; // L: 4300 - if (var0.field1244 >= var1.field1897) { // L: 4301 - var0.sequence = -1; - } else if (var0.sequenceFrame >= 0 && var0.sequenceFrame < var1.frameIds.length) { // L: 4302 - WorldMapManager.method3425(var1, var0.sequenceFrame, var0.x, var0.y); // L: 4303 - } else { - var0.sequence = -1; - } - } - - var0.isWalking = var1.field1898; // L: 4305 - } else { - var0.sequence = -1; // L: 4307 - } - } - - if (var0.sequenceDelay > 0) { // L: 4309 - --var0.sequenceDelay; - } - - } // L: 4310 + String var1 = new String(var3); // L: 170 + return var1; // L: 172 + } } diff --git a/runescape-client/src/main/java/class69.java b/runescape-client/src/main/java/class69.java index 2c13d76b12..ab5b436e90 100644 --- a/runescape-client/src/main/java/class69.java +++ b/runescape-client/src/main/java/class69.java @@ -3,127 +3,130 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("be") +@ObfuscatedName("bn") public class class69 { - @ObfuscatedName("h") + @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "Lko;" + descriptor = "Lki;" ) @Export("reflectionChecks") static IterableNodeDeque reflectionChecks; - @ObfuscatedName("ct") + @ObfuscatedName("t") @ObfuscatedSignature( - descriptor = "Lcr;" + descriptor = "Lgs;" ) - @Export("mouseRecorder") - static MouseRecorder mouseRecorder; - @ObfuscatedName("eg") + @Export("worldMapEvent") + static WorldMapEvent worldMapEvent; + @ObfuscatedName("bf") + @ObfuscatedSignature( + descriptor = "Lop;" + ) + static IndexedSprite field597; + @ObfuscatedName("gh") @ObfuscatedGetter( - intValue = 593449975 + intValue = -1125497563 ) - @Export("worldPort") - static int worldPort; + static int field596; static { reflectionChecks = new IterableNodeDeque(); // L: 17 } - @ObfuscatedName("h") + @ObfuscatedName("s") @ObfuscatedSignature( - descriptor = "(Ljp;Ljp;I)V", - garbageValue = "739362816" + descriptor = "(II)Lgd;", + garbageValue = "-910296846" ) - public static void method1153(AbstractArchive var0, AbstractArchive var1) { - SpotAnimationDefinition.SpotAnimationDefinition_archive = var0; - SpotAnimationDefinition.SpotAnimationDefinition_modelArchive = var1; // L: 33 - } // L: 34 + @Export("getFrames") + static Frames getFrames(int var0) { + Frames var1 = (Frames)SequenceDefinition.SequenceDefinition_cachedFrames.get((long)var0); // L: 181 + if (var1 != null) { // L: 182 + return var1; + } else { + AbstractArchive var3 = SequenceDefinition.SequenceDefinition_animationsArchive; // L: 184 + AbstractArchive var4 = SequenceDefinition.SequenceDefinition_skeletonsArchive; // L: 185 + boolean var5 = true; // L: 187 + int[] var6 = var3.getGroupFileIds(var0); // L: 188 - @ObfuscatedName("c") - @ObfuscatedSignature( - descriptor = "(ILjava/lang/String;Ljava/lang/String;Ljava/lang/String;B)V", - garbageValue = "0" - ) - @Export("addChatMessage") - static void addChatMessage(int var0, String var1, String var2, String var3) { - ChatChannel var4 = (ChatChannel)Messages.Messages_channels.get(var0); // L: 23 - if (var4 == null) { // L: 24 - var4 = new ChatChannel(); // L: 25 - Messages.Messages_channels.put(var0, var4); // L: 26 + for (int var7 = 0; var7 < var6.length; ++var7) { // L: 189 + byte[] var8 = var3.getFile(var0, var6[var7]); // L: 190 + if (var8 == null) { // L: 191 + var5 = false; // L: 192 + } else { + int var9 = (var8[0] & 255) << 8 | var8[1] & 255; // L: 195 + byte[] var10 = var4.getFile(var9, 0); // L: 198 + if (var10 == null) { // L: 199 + var5 = false; + } + } + } + + Frames var2; + if (!var5) { // L: 201 + var2 = null; // L: 202 + } else { + try { + var2 = new Frames(var3, var4, var0, false); // L: 206 + } catch (Exception var12) { // L: 208 + var2 = null; // L: 209 + } + } + + if (var2 != null) { // L: 213 + SequenceDefinition.SequenceDefinition_cachedFrames.put(var2, (long)var0); + } + + return var2; // L: 214 } - - Message var5 = var4.addMessage(var0, var1, var2, var3); // L: 28 - Messages.Messages_hashTable.put(var5, (long)var5.count); // L: 29 - Messages.Messages_queue.add(var5); // L: 30 - Client.chatCycle = Client.cycleCntr; // L: 31 - } // L: 32 - - @ObfuscatedName("g") - @ObfuscatedSignature( - descriptor = "(B)[Loq;", - garbageValue = "0" - ) - @Export("FillMode_values") - public static FillMode[] FillMode_values() { - return new FillMode[]{FillMode.field4234, FillMode.field4235, FillMode.SOLID}; // L: 15 } - @ObfuscatedName("r") + @ObfuscatedName("fd") @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "1229986351" + descriptor = "(Lio;III)V", + garbageValue = "1981003125" ) - static void method1151() { - Login.worldSelectOpen = false; // L: 1554 - Canvas.leftTitleSprite.drawAt(Login.xPadding, 0); // L: 1555 - class12.rightTitleSprite.drawAt(Login.xPadding + 382, 0); // L: 1556 - FontName.logoSprite.drawAt(Login.xPadding + 382 - FontName.logoSprite.subWidth / 2, 18); // L: 1557 - } // L: 1558 + @Export("checkIfMinimapClicked") + static final void checkIfMinimapClicked(Widget var0, int var1, int var2) { + if (Client.minimapState == 0 || Client.minimapState == 3) { // L: 3420 + if (!Client.isMenuOpen && (MouseHandler.MouseHandler_lastButton == 1 || !Client.mouseCam && MouseHandler.MouseHandler_lastButton == 4)) { // L: 3421 + SpriteMask var3 = var0.getSpriteMask(true); // L: 3422 + if (var3 == null) { // L: 3423 + return; + } - @ObfuscatedName("fg") - @ObfuscatedSignature( - descriptor = "(IIII)V", - garbageValue = "-1642265887" - ) - @Export("queueSoundEffect") - static void queueSoundEffect(int var0, int var1, int var2) { - if (class12.clientPreferences.soundEffectsVolume != 0 && var1 != 0 && Client.soundEffectCount < 50) { // L: 3770 - Client.soundEffectIds[Client.soundEffectCount] = var0; // L: 3771 - Client.queuedSoundEffectLoops[Client.soundEffectCount] = var1; // L: 3772 - Client.queuedSoundEffectDelays[Client.soundEffectCount] = var2; // L: 3773 - Client.soundEffects[Client.soundEffectCount] = null; // L: 3774 - Client.soundLocations[Client.soundEffectCount] = 0; // L: 3775 - ++Client.soundEffectCount; // L: 3776 - } - - } // L: 3778 - - @ObfuscatedName("gk") - @ObfuscatedSignature( - descriptor = "(Lcg;IIB)V", - garbageValue = "77" - ) - @Export("performPlayerAnimation") - static void performPlayerAnimation(Player var0, int var1, int var2) { - if (var0.sequence == var1 && var1 != -1) { // L: 4313 - int var3 = Player.SequenceDefinition_get(var1).field1900; // L: 4314 - if (var3 == 1) { // L: 4315 - var0.sequenceFrame = 0; // L: 4316 - var0.sequenceFrameCycle = 0; // L: 4317 - var0.sequenceDelay = var2; // L: 4318 - var0.field1244 = 0; // L: 4319 + int var4 = MouseHandler.MouseHandler_lastPressedX - var1; // L: 3424 + int var5 = MouseHandler.MouseHandler_lastPressedY - var2; // L: 3425 + if (var3.contains(var4, var5)) { // L: 3426 + var4 -= var3.width / 2; // L: 3427 + var5 -= var3.height / 2; // L: 3428 + int var6 = Client.camAngleY & 2047; // L: 3429 + int var7 = Rasterizer3D.Rasterizer3D_sine[var6]; // L: 3430 + int var8 = Rasterizer3D.Rasterizer3D_cosine[var6]; // L: 3431 + int var9 = var8 * var4 + var5 * var7 >> 11; // L: 3432 + int var10 = var5 * var8 - var7 * var4 >> 11; // L: 3433 + int var11 = var9 + class93.localPlayer.x >> 7; // L: 3434 + int var12 = class93.localPlayer.y - var10 >> 7; // L: 3435 + PacketBufferNode var13 = class21.getPacketBufferNode(ClientPacket.field2589, Client.packetWriter.isaacCipher); // L: 3437 + var13.packetBuffer.writeByte(18); // L: 3438 + var13.packetBuffer.method6584(KeyHandler.KeyHandler_pressedKeys[82] ? (KeyHandler.KeyHandler_pressedKeys[81] ? 2 : 1) : 0); // L: 3439 + var13.packetBuffer.writeShort(var12 + SoundSystem.baseY); // L: 3440 + var13.packetBuffer.writeShort(var11 + VertexNormal.baseX); // L: 3441 + var13.packetBuffer.writeByte(var4); // L: 3442 + var13.packetBuffer.writeByte(var5); // L: 3443 + var13.packetBuffer.writeShort(Client.camAngleY); // L: 3444 + var13.packetBuffer.writeByte(57); // L: 3445 + var13.packetBuffer.writeByte(0); // L: 3446 + var13.packetBuffer.writeByte(0); // L: 3447 + var13.packetBuffer.writeByte(89); // L: 3448 + var13.packetBuffer.writeShort(class93.localPlayer.x); // L: 3449 + var13.packetBuffer.writeShort(class93.localPlayer.y); // L: 3450 + var13.packetBuffer.writeByte(63); // L: 3451 + Client.packetWriter.addNode(var13); // L: 3452 + Client.destinationX = var11; // L: 3453 + Client.destinationY = var12; // L: 3454 + } } - if (var3 == 2) { // L: 4321 - var0.field1244 = 0; // L: 4322 - } - } else if (var1 == -1 || var0.sequence == -1 || Player.SequenceDefinition_get(var1).field1894 >= Player.SequenceDefinition_get(var0.sequence).field1894) { // L: 4325 - var0.sequence = var1; // L: 4326 - var0.sequenceFrame = 0; // L: 4327 - var0.sequenceFrameCycle = 0; // L: 4328 - var0.sequenceDelay = var2; // L: 4329 - var0.field1244 = 0; // L: 4330 - var0.field1215 = var0.pathLength; // L: 4331 } - - } // L: 4333 + } // L: 3457 } diff --git a/runescape-client/src/main/java/class7.java b/runescape-client/src/main/java/class7.java index 7055201e91..6079c43947 100644 --- a/runescape-client/src/main/java/class7.java +++ b/runescape-client/src/main/java/class7.java @@ -1,193 +1,248 @@ 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("v") +@ObfuscatedName("b") public class class7 extends class16 { - @ObfuscatedName("r") - @ObfuscatedSignature( - descriptor = "Ljc;" - ) - @Export("NetCache_currentResponse") - static NetFileRequest NetCache_currentResponse; - @ObfuscatedName("bz") - @ObfuscatedSignature( - descriptor = "Lkr;" - ) - @Export("clientLanguage") - static Language clientLanguage; - @ObfuscatedName("ga") - @ObfuscatedGetter( - intValue = 460316475 - ) - static int field66; - @ObfuscatedName("or") - @ObfuscatedSignature( - descriptor = "Lno;" - ) - static class369 field60; - @ObfuscatedName("h") - String field59; - @ObfuscatedName("c") - byte field62; - @ObfuscatedName("o") - byte field61; + @ObfuscatedName("v") + String field64; + @ObfuscatedName("n") + byte field65; + @ObfuscatedName("f") + byte field66; // $FF: synthetic field @ObfuscatedSignature( - descriptor = "Lm;" + descriptor = "Lx;" ) final class19 this$0; @ObfuscatedSignature( - descriptor = "(Lm;)V" + descriptor = "(Lx;)V" ) class7(class19 var1) { this.this$0 = var1; // L: 154 } - @ObfuscatedName("h") + @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "(Lnk;S)V", - garbageValue = "4095" + descriptor = "(Lnd;I)V", + garbageValue = "68071115" ) - void vmethod326(Buffer var1) { - this.field59 = var1.readStringCp1252NullTerminatedOrNull(); // L: 157 - if (this.field59 != null) { // L: 158 + void vmethod266(Buffer var1) { + this.field64 = var1.readStringCp1252NullTerminatedOrNull(); // L: 157 + if (this.field64 != null) { // L: 158 var1.readUnsignedByte(); // L: 159 - this.field62 = var1.readByte(); // L: 160 - this.field61 = var1.readByte(); // L: 161 + this.field65 = var1.readByte(); // L: 160 + this.field66 = var1.readByte(); // L: 161 } } // L: 163 - @ObfuscatedName("c") + @ObfuscatedName("n") @ObfuscatedSignature( - descriptor = "(Lg;B)V", - garbageValue = "-61" + descriptor = "(Ly;I)V", + garbageValue = "-1846892157" ) - void vmethod314(class3 var1) { - var1.field38 = this.field59; // L: 166 - if (this.field59 != null) { // L: 167 - var1.field36 = this.field62; // L: 168 - var1.field37 = this.field61; // L: 169 + void vmethod264(ClanChannel var1) { + var1.name = this.field64; // L: 166 + if (this.field64 != null) { // L: 167 + var1.field32 = this.field65; // L: 168 + var1.field26 = this.field66; // L: 169 } } // L: 171 - @ObfuscatedName("gs") + @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "(Lcj;I)V", - garbageValue = "2112804757" + descriptor = "(IIII)Loh;", + garbageValue = "-1133094232" ) - static final void method87(Actor var0) { - if (var0.field1261 != 0) { // L: 4185 - if (var0.targetIndex != -1) { // L: 4186 - Object var1 = null; // L: 4187 - if (var0.targetIndex < 32768) { // L: 4188 - var1 = Client.npcs[var0.targetIndex]; - } else if (var0.targetIndex >= 32768) { // L: 4189 - var1 = Client.players[var0.targetIndex - 32768]; + static SpritePixels method76(int var0, int var1, int var2) { + DemotingHashTable var3 = WorldMapRegion.WorldMapRegion_cachedSprites; // L: 38 + long var4 = (long)(var2 << 16 | var0 << 8 | var1); // L: 41 + return (SpritePixels)var3.get(var4); // L: 43 + } + + @ObfuscatedName("ag") + @ObfuscatedSignature( + descriptor = "(ILcf;ZI)I", + garbageValue = "1498995212" + ) + static int method74(int var0, Script var1, boolean var2) { + if (var0 == ScriptOpcodes.GETWINDOWMODE) { // L: 3425 + Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = SpotAnimationDefinition.getWindowedMode(); // L: 3426 + return 1; // L: 3427 + } else { + int var3; + if (var0 == ScriptOpcodes.SETWINDOWMODE) { // L: 3429 + var3 = Interpreter.Interpreter_intStack[--class44.Interpreter_intStackSize]; // L: 3430 + if (var3 == 1 || var3 == 2) { // L: 3431 + CollisionMap.setWindowedMode(var3); } - if (var1 != null) { // L: 4190 - int var2 = var0.x - ((Actor)var1).x; // L: 4191 - int var3 = var0.y - ((Actor)var1).y; // L: 4192 - if (var2 != 0 || var3 != 0) { // L: 4193 - var0.orientation = (int)(Math.atan2((double)var2, (double)var3) * 325.949D) & 2047; - } - } else if (var0.false0) { // L: 4195 - var0.targetIndex = -1; // L: 4196 - var0.false0 = false; // L: 4197 - } - } - - if (var0.field1247 != -1 && (var0.pathLength == 0 || var0.field1250 > 0)) { // L: 4200 - var0.orientation = var0.field1247; // L: 4201 - var0.field1247 = -1; // L: 4202 - } - - int var4 = var0.orientation - var0.rotation & 2047; // L: 4204 - if (var4 == 0 && var0.false0) { // L: 4205 - var0.targetIndex = -1; // L: 4206 - var0.false0 = false; // L: 4207 - } - - if (var4 != 0) { // L: 4209 - ++var0.field1248; // L: 4210 - boolean var6; - if (var4 > 1024) { // L: 4211 - var0.rotation -= var0.field1261; // L: 4212 - var6 = true; // L: 4213 - if (var4 < var0.field1261 || var4 > 2048 - var0.field1261) { // L: 4214 - var0.rotation = var0.orientation; // L: 4215 - var6 = false; // L: 4216 - } - - if (var0.movementSequence == var0.idleSequence && (var0.field1248 > 25 || var6)) { // L: 4218 - if (var0.turnLeftSequence != -1) { // L: 4219 - var0.movementSequence = var0.turnLeftSequence; - } else { - var0.movementSequence = var0.walkSequence; // L: 4220 - } - } + return 1; // L: 3432 + } else if (var0 == ScriptOpcodes.GETDEFAULTWINDOWMODE) { // L: 3434 + Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = ObjectComposition.clientPreferences.windowMode; // L: 3435 + return 1; // L: 3436 + } else if (var0 != ScriptOpcodes.SETDEFAULTWINDOWMODE) { // L: 3438 + if (var0 == 5310) { // L: 3446 + --class44.Interpreter_intStackSize; // L: 3447 + return 1; // L: 3448 + } else if (var0 == 5350) { // L: 3450 + Interpreter.Interpreter_stringStackSize -= 2; // L: 3451 + --class44.Interpreter_intStackSize; // L: 3452 + return 1; // L: 3453 + } else if (var0 == 5351) { // L: 3455 + --Interpreter.Interpreter_stringStackSize; // L: 3456 + return 1; // L: 3457 } else { - var0.rotation += var0.field1261; // L: 4224 - var6 = true; // L: 4225 - if (var4 < var0.field1261 || var4 > 2048 - var0.field1261) { // L: 4226 - var0.rotation = var0.orientation; // L: 4227 - var6 = false; // L: 4228 - } - - if (var0.movementSequence == var0.idleSequence && (var0.field1248 > 25 || var6)) { // L: 4230 - if (var0.turnRightSequence != -1) { // L: 4231 - var0.movementSequence = var0.turnRightSequence; - } else { - var0.movementSequence = var0.walkSequence; // L: 4232 - } - } + return 2; // L: 3459 + } + } else { + var3 = Interpreter.Interpreter_intStack[--class44.Interpreter_intStackSize]; // L: 3439 + if (var3 == 1 || var3 == 2) { // L: 3440 + ObjectComposition.clientPreferences.windowMode = var3; // L: 3441 + TileItem.savePreferences(); // L: 3442 } - var0.rotation &= 2047; // L: 4236 - } else { - var0.field1248 = 0; // L: 4238 + return 1; // L: 3444 } - } - } // L: 4239 + } - @ObfuscatedName("gu") + @ObfuscatedName("fq") @ObfuscatedSignature( - descriptor = "(Ljava/lang/String;ZI)V", - garbageValue = "-1389420413" + descriptor = "(B)V", + garbageValue = "57" ) - @Export("drawLoadingMessage") - static final void drawLoadingMessage(String var0, boolean var1) { - if (Client.showLoadingMessages) { // L: 4426 - byte var2 = 4; // L: 4427 - int var3 = var2 + 6; // L: 4428 - int var4 = var2 + 6; // L: 4429 - int var5 = Message.fontPlain12.lineWidth(var0, 250); // L: 4430 - int var6 = Message.fontPlain12.lineCount(var0, 250) * 13; // L: 4431 - Rasterizer2D.Rasterizer2D_fillRectangle(var3 - var2, var4 - var2, var5 + var2 + var2, var6 + var2 + var2, 0); // L: 4432 - Rasterizer2D.Rasterizer2D_drawRectangle(var3 - var2, var4 - var2, var2 + var5 + var2, var2 + var6 + var2, 16777215); // L: 4433 - Message.fontPlain12.drawLines(var0, var3, var4, var5, var6, 16777215, -1, 1, 1, 0); // L: 4434 - class179.method3586(var3 - var2, var4 - var2, var2 + var2 + var5, var2 + var6 + var2); // L: 4435 - if (var1) { // L: 4436 - WorldMapDecorationType.rasterProvider.drawFull(0, 0); // L: 4437 - } else { - int var7 = var3; // L: 4440 - int var8 = var4; // L: 4441 - int var9 = var5; // L: 4442 - int var10 = var6; // L: 4443 + @Export("logOut") + static final void logOut() { + Client.packetWriter.close(); // L: 2605 + FloorOverlayDefinition.FloorOverlayDefinition_cached.clear(); // L: 2608 + class265.method4848(); // L: 2610 + class135.method2601(); // L: 2611 + class24.method259(); // L: 2612 + NPCComposition.NpcDefinition_cached.clear(); // L: 2614 + NPCComposition.NpcDefinition_cachedModels.clear(); // L: 2615 + SceneTilePaint.method4259(); // L: 2617 + SecureRandomCallable.method2055(); // L: 2618 + SpotAnimationDefinition.SpotAnimationDefinition_cached.clear(); // L: 2620 + SpotAnimationDefinition.SpotAnimationDefinition_cachedModels.clear(); // L: 2621 + HealthBarUpdate.method2197(); // L: 2623 + VarpDefinition.VarpDefinition_cached.clear(); // L: 2625 + GrandExchangeOfferOwnWorldComparator.field634.method6433(); // L: 2627 + ViewportMouse.HitSplatDefinition_cachedSprites.method6433(); // L: 2628 + UserComparator6.method2485(); // L: 2629 + KeyHandler.method378(); // L: 2630 + StructComposition.StructDefinition_cached.clear(); // L: 2632 + FileSystem.method2548(); // L: 2634 + WorldMapElement.WorldMapElement_cachedSprites.clear(); // L: 2636 + ChatChannel.method2015(); // L: 2638 + Widget.Widget_cachedSprites.clear(); // L: 2640 + Widget.Widget_cachedModels.clear(); // L: 2641 + Widget.Widget_cachedFonts.clear(); // L: 2642 + Widget.Widget_cachedSpriteMasks.clear(); // L: 2643 + ((TextureProvider)Rasterizer3D.Rasterizer3D_textureLoader).clear(); // L: 2645 + Script.Script_cached.clear(); // L: 2646 + NetCache.archive0.clearFiles(); // L: 2647 + class27.archive1.clearFiles(); // L: 2648 + ClanChannel.archive3.clearFiles(); // L: 2649 + class32.archive4.clearFiles(); // L: 2650 + class247.archive5.clearFiles(); // L: 2651 + UrlRequest.archive6.clearFiles(); // L: 2652 + Decimator.archive7.clearFiles(); // L: 2653 + GrandExchangeOfferAgeComparator.archive8.clearFiles(); // L: 2654 + CollisionMap.archive9.clearFiles(); // L: 2655 + SoundCache.archive10.clearFiles(); // L: 2656 + WorldMapManager.archive11.clearFiles(); // L: 2657 + UserComparator5.archive12.clearFiles(); // L: 2658 + AbstractSocket.scene.clear(); // L: 2660 - for (int var11 = 0; var11 < Client.rootWidgetCount; ++var11) { // L: 4445 - if (Client.rootWidgetWidths[var11] + Client.rootWidgetXs[var11] > var7 && Client.rootWidgetXs[var11] < var7 + var9 && Client.rootWidgetYs[var11] + Client.rootWidgetHeights[var11] > var8 && Client.rootWidgetYs[var11] < var8 + var10) { // L: 4446 - Client.field826[var11] = true; + for (int var0 = 0; var0 < 4; ++var0) { // L: 2661 + Client.collisionMaps[var0].clear(); + } + + System.gc(); // L: 2662 + class159.method3192(2); // L: 2663 + Client.currentTrackGroupId = -1; // L: 2664 + Client.field881 = false; // L: 2665 + WorldMapSprite.method3631(); // L: 2666 + class12.updateGameState(10); // L: 2667 + } // L: 2668 + + @ObfuscatedName("fk") + @ObfuscatedSignature( + descriptor = "(Lcy;II)V", + garbageValue = "-354829421" + ) + @Export("updateActorSequence") + static final void updateActorSequence(Actor var0, int var1) { + if (var0.field1265 >= Client.cycle) { // L: 3611 + int var2 = Math.max(1, var0.field1265 - Client.cycle); // L: 3612 + int var3 = var0.field1239 * 64 + var0.field1278 * 128; // L: 3613 + int var4 = var0.field1239 * 64 + var0.field1280 * 128; // L: 3614 + var0.x += (var3 - var0.x) / var2; // L: 3615 + var0.y += (var4 - var0.y) / var2; // L: 3616 + var0.field1294 = 0; // L: 3617 + var0.orientation = var0.field1284; // L: 3618 + } else if (var0.field1283 >= Client.cycle) { // L: 3620 + class2.method21(var0); + } else { + InterfaceParent.method2083(var0); // L: 3621 + } + + if (var0.x < 128 || var0.y < 128 || var0.x >= 13184 || var0.y >= 13184) { // L: 3622 + var0.sequence = -1; // L: 3623 + var0.spotAnimation = -1; // L: 3624 + var0.field1265 = 0; // L: 3625 + var0.field1283 = 0; // L: 3626 + var0.x = var0.field1239 * 64 + var0.pathX[0] * 128; // L: 3627 + var0.y = var0.pathY[0] * 128 + var0.field1239 * 64; // L: 3628 + var0.method2171(); // L: 3629 + } + + if (class93.localPlayer == var0 && (var0.x < 1536 || var0.y < 1536 || var0.x >= 11776 || var0.y >= 11776)) { // L: 3631 3632 + var0.sequence = -1; // L: 3633 + var0.spotAnimation = -1; // L: 3634 + var0.field1265 = 0; // L: 3635 + var0.field1283 = 0; // L: 3636 + var0.x = var0.field1239 * 64 + var0.pathX[0] * 128; // L: 3637 + var0.y = var0.pathY[0] * 128 + var0.field1239 * 64; // L: 3638 + var0.method2171(); // L: 3639 + } + + Strings.method4850(var0); // L: 3642 + class44.method449(var0); // L: 3643 + } // L: 3644 + + @ObfuscatedName("id") + @ObfuscatedSignature( + descriptor = "(B)V", + garbageValue = "1" + ) + static void method68() { + for (int var0 = 0; var0 < Client.menuOptionsCount; ++var0) { // L: 8823 + int var2 = Client.menuOpcodes[var0]; // L: 8825 + boolean var1 = var2 == 57 || var2 == 58 || var2 == 1007 || var2 == 25 || var2 == 30; // L: 8827 + if (var1) { // L: 8829 + if (var0 < Client.menuOptionsCount - 1) { // L: 8830 + for (int var3 = var0; var3 < Client.menuOptionsCount - 1; ++var3) { // L: 8831 + Client.menuActions[var3] = Client.menuActions[var3 + 1]; // L: 8832 + Client.menuTargets[var3] = Client.menuTargets[var3 + 1]; // L: 8833 + Client.menuOpcodes[var3] = Client.menuOpcodes[var3 + 1]; // L: 8834 + Client.menuIdentifiers[var3] = Client.menuIdentifiers[var3 + 1]; // L: 8835 + Client.menuArguments1[var3] = Client.menuArguments1[var3 + 1]; // L: 8836 + Client.menuArguments2[var3] = Client.menuArguments2[var3 + 1]; // L: 8837 + Client.menuShiftClick[var3] = Client.menuShiftClick[var3 + 1]; // L: 8838 } } - } + --var0; // L: 8841 + --Client.menuOptionsCount; // L: 8842 + } } - } // L: 4450 + + class15.method196(); // L: 8845 + } // L: 8846 } diff --git a/runescape-client/src/main/java/class8.java b/runescape-client/src/main/java/class8.java index 46448fa84f..4c0badb232 100644 --- a/runescape-client/src/main/java/class8.java +++ b/runescape-client/src/main/java/class8.java @@ -3,80 +3,105 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("b") +@ObfuscatedName("d") public class class8 extends class14 { - @ObfuscatedName("iz") - @ObfuscatedGetter( - intValue = -1034378325 + @ObfuscatedName("o") + public static boolean field75; + @ObfuscatedName("dx") + @ObfuscatedSignature( + descriptor = "Ljp;" ) - @Export("selectedItemId") - static int selectedItemId; - @ObfuscatedName("h") - @ObfuscatedGetter( - longValue = 1767734013338974575L + @Export("archive2") + static Archive archive2; + @ObfuscatedName("ed") + @ObfuscatedSignature( + descriptor = "Ljp;" ) - long field69; - @ObfuscatedName("c") - String field68; + @Export("archive17") + static Archive archive17; + @ObfuscatedName("v") + @ObfuscatedGetter( + longValue = 5988895091532737889L + ) + long field77; + @ObfuscatedName("n") + String field71; // $FF: synthetic field @ObfuscatedSignature( - descriptor = "Lo;" + descriptor = "Lf;" ) final class2 this$0; @ObfuscatedSignature( - descriptor = "(Lo;)V" + descriptor = "(Lf;)V" ) class8(class2 var1) { this.this$0 = var1; - this.field69 = -1L; // L: 74 - this.field68 = null; // L: 75 + this.field77 = -1L; // L: 74 + this.field71 = null; // L: 75 } // L: 77 - @ObfuscatedName("h") + @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "(Lnk;I)V", - garbageValue = "110401227" + descriptor = "(Lnd;I)V", + garbageValue = "-1281352827" ) - void vmethod339(Buffer var1) { + void vmethod276(Buffer var1) { if (var1.readUnsignedByte() != 255) { // L: 80 --var1.offset; // L: 81 - this.field69 = var1.readLong(); // L: 82 + this.field77 = var1.readLong(); // L: 82 } - this.field68 = var1.readStringCp1252NullTerminatedOrNull(); // L: 84 + this.field71 = var1.readStringCp1252NullTerminatedOrNull(); // L: 84 } // L: 85 - @ObfuscatedName("c") + @ObfuscatedName("n") @ObfuscatedSignature( - descriptor = "(Lx;I)V", - garbageValue = "-1535989118" + descriptor = "(Ll;B)V", + garbageValue = "29" ) - void vmethod338(class11 var1) { - var1.method117(this.field69, this.field68, 0); // L: 88 + void vmethod281(ClanSettings var1) { + var1.method103(this.field77, this.field71, 0); // L: 88 } // L: 89 - @ObfuscatedName("h") + @ObfuscatedName("aw") @ObfuscatedSignature( - descriptor = "(IS)Ley;", - garbageValue = "788" + descriptor = "(ILcf;ZB)I", + garbageValue = "-51" ) - @Export("getNpcDefinition") - public static NPCComposition getNpcDefinition(int var0) { - NPCComposition var1 = (NPCComposition)NPCComposition.NpcDefinition_cached.get((long)var0); // L: 57 - if (var1 != null) { // L: 58 - return var1; - } else { - byte[] var2 = NPCComposition.NpcDefinition_archive.takeFile(9, var0); // L: 59 - var1 = new NPCComposition(); // L: 60 - var1.id = var0; // L: 61 - if (var2 != null) { // L: 62 - var1.decode(new Buffer(var2)); + static int method82(int var0, Script var1, boolean var2) { + if (var0 == 7100) { // L: 4262 + ++class44.Interpreter_intStackSize; // L: 4263 + return 1; // L: 4264 + } else if (var0 == 7101) { // L: 4266 + Interpreter.Interpreter_stringStackSize += 2; // L: 4267 + return 1; // L: 4268 + } else if (var0 != 7102 && var0 != 7103 && var0 != 7104 && var0 != 7105 && var0 != 7109) { // L: 4270 + if (var0 == 7106) { // L: 4274 + ++class44.Interpreter_intStackSize; // L: 4275 + return 1; // L: 4276 + } else if (var0 == 7107) { // L: 4278 + ++class44.Interpreter_intStackSize; // L: 4279 + return 1; // L: 4280 + } else if (var0 == 7108) { // L: 4282 + Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = WorldMapIcon_1.method3235() ? 1 : 0; // L: 4283 + return 1; // L: 4284 + } else { + return 2; // L: 4286 } - - var1.postDecode(); // L: 63 - NPCComposition.NpcDefinition_cached.put(var1, (long)var0); // L: 64 - return var1; // L: 65 + } else { + ++class44.Interpreter_intStackSize; // L: 4271 + return 1; // L: 4272 } } + + @ObfuscatedName("jp") + @ObfuscatedSignature( + descriptor = "(I)Z", + garbageValue = "-1387423967" + ) + @Export("getTapToDrop") + static boolean getTapToDrop() { + return Client.tapToDrop; // L: 10176 + } } diff --git a/runescape-client/src/main/java/class80.java b/runescape-client/src/main/java/class80.java index d8fb2fc211..9946abe188 100644 --- a/runescape-client/src/main/java/class80.java +++ b/runescape-client/src/main/java/class80.java @@ -1,153 +1,221 @@ import java.math.BigInteger; +import java.util.Date; +import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; import net.runelite.rs.ScriptOpcodes; -@ObfuscatedName("cu") +@ObfuscatedName("cv") public class class80 { - @ObfuscatedName("l") - static final BigInteger field972; - @ObfuscatedName("z") - static final BigInteger field973; + @ObfuscatedName("p") + static final BigInteger field1006; + @ObfuscatedName("j") + static final BigInteger field1007; + @ObfuscatedName("er") + @Export("worldHost") + static String worldHost; static { - field972 = new BigInteger("80782894952180643741752986186714059433953886149239752893425047584684715842049"); // L: 20 - field973 = new BigInteger("7237300117305667488707183861728052766358166655052137727439795191253340127955075499635575104901523446809299097934591732635674173519120047404024393881551683"); // L: 21 + field1006 = new BigInteger("80782894952180643741752986186714059433953886149239752893425047584684715842049"); // L: 20 + field1007 = new BigInteger("7237300117305667488707183861728052766358166655052137727439795191253340127955075499635575104901523446809299097934591732635674173519120047404024393881551683"); // L: 21 } - @ObfuscatedName("e") + @ObfuscatedName("j") @ObfuscatedSignature( - descriptor = "(ILci;ZI)I", - garbageValue = "-1294898247" + descriptor = "(IZS)Ljava/lang/String;", + garbageValue = "7104" ) - static int method1942(int var0, Script var1, boolean var2) { - Widget var6; - if (var0 != ScriptOpcodes.CC_CALLONRESIZE && var0 != ScriptOpcodes.IF_CALLONRESIZE) { // L: 1211 - int var4; - if (var0 == 1928) { // L: 1228 - var6 = var2 ? class308.scriptDotWidget : class24.scriptActiveWidget; // L: 1229 - var4 = Interpreter.Interpreter_intStack[--WorldMapCacheName.Interpreter_intStackSize]; // L: 1230 - if (var4 >= 1 && var4 <= 10) { // L: 1231 - class245.widgetDefaultMenuAction(var4, var6.id, var6.childIndex, var6.itemId, ""); // L: 1234 - return 1; // L: 1235 - } else { - throw new RuntimeException(); // L: 1232 - } - } else if (var0 == 2928) { // L: 1237 - WorldMapCacheName.Interpreter_intStackSize -= 3; // L: 1238 - int var3 = Interpreter.Interpreter_intStack[WorldMapCacheName.Interpreter_intStackSize]; // L: 1239 - var4 = Interpreter.Interpreter_intStack[WorldMapCacheName.Interpreter_intStackSize + 1]; // L: 1240 - int var5 = Interpreter.Interpreter_intStack[WorldMapCacheName.Interpreter_intStackSize + 2]; // L: 1241 - if (var5 >= 1 && var5 <= 10) { // L: 1242 - class245.widgetDefaultMenuAction(var5, var3, var4, DevicePcmPlayerProvider.getWidget(var3).itemId, ""); // L: 1245 - return 1; // L: 1246 - } else { - throw new RuntimeException(); // L: 1243 - } - } else { - return 2; // L: 1248 - } - } else if (Interpreter.field956 >= 10) { // L: 1212 - throw new RuntimeException(); // L: 1213 + @Export("intToString") + public static String intToString(int var0, boolean var1) { + return var1 && var0 >= 0 ? Script.method1998(var0, 10, var1) : Integer.toString(var0); // L: 101 102 + } + + @ObfuscatedName("l") + @ObfuscatedSignature( + descriptor = "(I)V", + garbageValue = "1650201726" + ) + public static final void method1906() { + ViewportMouse.ViewportMouse_isInViewport = false; // L: 103 + ViewportMouse.ViewportMouse_entityCount = 0; // L: 104 + } // L: 105 + + @ObfuscatedName("ad") + @ObfuscatedSignature( + descriptor = "(ILcf;ZI)I", + garbageValue = "1607858695" + ) + static int method1902(int var0, Script var1, boolean var2) { + String var3; + int var9; + if (var0 == ScriptOpcodes.APPEND_NUM) { // L: 2959 + var3 = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize]; // L: 2960 + var9 = Interpreter.Interpreter_intStack[--class44.Interpreter_intStackSize]; // L: 2961 + Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var3 + var9; // L: 2962 + return 1; // L: 2963 } else { - if (var0 >= 2000) { // L: 1216 - var6 = DevicePcmPlayerProvider.getWidget(Interpreter.Interpreter_intStack[--WorldMapCacheName.Interpreter_intStackSize]); // L: 1217 + String var4; + if (var0 == ScriptOpcodes.APPEND) { // L: 2965 + Interpreter.Interpreter_stringStackSize -= 2; // L: 2966 + var3 = Interpreter.Interpreter_stringStack[Interpreter.Interpreter_stringStackSize]; // L: 2967 + var4 = Interpreter.Interpreter_stringStack[Interpreter.Interpreter_stringStackSize + 1]; // L: 2968 + Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var3 + var4; // L: 2969 + return 1; // L: 2970 + } else if (var0 == ScriptOpcodes.APPEND_SIGNNUM) { // L: 2972 + var3 = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize]; // L: 2973 + var9 = Interpreter.Interpreter_intStack[--class44.Interpreter_intStackSize]; // L: 2974 + Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var3 + intToString(var9, true); // L: 2975 + return 1; // L: 2976 + } else if (var0 == ScriptOpcodes.LOWERCASE) { // L: 2978 + var3 = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize]; // L: 2979 + Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var3.toLowerCase(); // L: 2980 + return 1; // L: 2981 } else { - var6 = var2 ? class308.scriptDotWidget : class24.scriptActiveWidget; // L: 1219 - } + int var6; + int var10; + if (var0 == ScriptOpcodes.FROMDATE) { // L: 2983 + var10 = Interpreter.Interpreter_intStack[--class44.Interpreter_intStackSize]; // L: 2984 + long var13 = 86400000L * ((long)var10 + 11745L); // L: 2985 + Interpreter.Interpreter_calendar.setTime(new Date(var13)); // L: 2986 + var6 = Interpreter.Interpreter_calendar.get(5); // L: 2987 + int var17 = Interpreter.Interpreter_calendar.get(2); // L: 2988 + int var8 = Interpreter.Interpreter_calendar.get(1); // L: 2989 + Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var6 + "-" + Interpreter.Interpreter_MONTHS[var17] + "-" + var8; // L: 2990 + return 1; // L: 2991 + } else if (var0 != ScriptOpcodes.TEXT_GENDER) { // L: 2993 + if (var0 == ScriptOpcodes.TOSTRING) { // L: 3001 + var10 = Interpreter.Interpreter_intStack[--class44.Interpreter_intStackSize]; // L: 3002 + Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = Integer.toString(var10); // L: 3003 + return 1; // L: 3004 + } else if (var0 == ScriptOpcodes.COMPARE) { // L: 3006 + Interpreter.Interpreter_stringStackSize -= 2; // L: 3007 + Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = UserComparator10.method2474(Calendar.compareStrings(Interpreter.Interpreter_stringStack[Interpreter.Interpreter_stringStackSize], Interpreter.Interpreter_stringStack[Interpreter.Interpreter_stringStackSize + 1], class378.clientLanguage)); // L: 3008 + return 1; // L: 3009 + } else { + int var5; + byte[] var11; + Font var12; + if (var0 == ScriptOpcodes.PARAHEIGHT) { // L: 3011 + var3 = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize]; // L: 3012 + class44.Interpreter_intStackSize -= 2; // L: 3013 + var9 = Interpreter.Interpreter_intStack[class44.Interpreter_intStackSize]; // L: 3014 + var5 = Interpreter.Interpreter_intStack[class44.Interpreter_intStackSize + 1]; // L: 3015 + var11 = Decimator.archive13.takeFile(var5, 0); // L: 3016 + var12 = new Font(var11); // L: 3017 + Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = var12.lineCount(var3, var9); // L: 3018 + return 1; // L: 3019 + } else if (var0 == ScriptOpcodes.PARAWIDTH) { // L: 3021 + var3 = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize]; // L: 3022 + class44.Interpreter_intStackSize -= 2; // L: 3023 + var9 = Interpreter.Interpreter_intStack[class44.Interpreter_intStackSize]; // L: 3024 + var5 = Interpreter.Interpreter_intStack[class44.Interpreter_intStackSize + 1]; // L: 3025 + var11 = Decimator.archive13.takeFile(var5, 0); // L: 3026 + var12 = new Font(var11); // L: 3027 + Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = var12.lineWidth(var3, var9); // L: 3028 + return 1; // L: 3029 + } else if (var0 == ScriptOpcodes.TEXT_SWITCH) { // L: 3031 + Interpreter.Interpreter_stringStackSize -= 2; // L: 3032 + var3 = Interpreter.Interpreter_stringStack[Interpreter.Interpreter_stringStackSize]; // L: 3033 + var4 = Interpreter.Interpreter_stringStack[Interpreter.Interpreter_stringStackSize + 1]; // L: 3034 + if (Interpreter.Interpreter_intStack[--class44.Interpreter_intStackSize] == 1) { // L: 3035 + Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var3; + } else { + Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var4; // L: 3036 + } - if (var6.onResize == null) { // L: 1220 - return 0; - } else { - ScriptEvent var7 = new ScriptEvent(); // L: 1221 - var7.widget = var6; // L: 1222 - var7.args = var6.onResize; // L: 1223 - var7.field1140 = Interpreter.field956 + 1; // L: 1224 - Client.scriptEvents.addFirst(var7); // L: 1225 - return 1; // L: 1226 + return 1; // L: 3037 + } else if (var0 == ScriptOpcodes.ESCAPE) { // L: 3039 + var3 = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize]; // L: 3040 + Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = AbstractFont.escapeBrackets(var3); // L: 3041 + return 1; // L: 3042 + } else if (var0 == ScriptOpcodes.APPEND_CHAR) { // L: 3044 + var3 = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize]; // L: 3045 + var9 = Interpreter.Interpreter_intStack[--class44.Interpreter_intStackSize]; // L: 3046 + Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var3 + (char)var9; // L: 3047 + return 1; // L: 3048 + } else if (var0 == ScriptOpcodes.CHAR_ISPRINTABLE) { // L: 3050 + var10 = Interpreter.Interpreter_intStack[--class44.Interpreter_intStackSize]; // L: 3051 + Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = class245.isCharPrintable((char)var10) ? 1 : 0; // L: 3052 + return 1; // L: 3053 + } else if (var0 == ScriptOpcodes.CHAR_ISALPHANUMERIC) { // L: 3055 + var10 = Interpreter.Interpreter_intStack[--class44.Interpreter_intStackSize]; // L: 3056 + Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = Login.isAlphaNumeric((char)var10) ? 1 : 0; // L: 3057 + return 1; // L: 3058 + } else if (var0 == ScriptOpcodes.CHAR_ISALPHA) { // L: 3060 + var10 = Interpreter.Interpreter_intStack[--class44.Interpreter_intStackSize]; // L: 3061 + Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = WorldMapElement.isCharAlphabetic((char)var10) ? 1 : 0; // L: 3062 + return 1; // L: 3063 + } else if (var0 == ScriptOpcodes.CHAR_ISNUMERIC) { // L: 3065 + var10 = Interpreter.Interpreter_intStack[--class44.Interpreter_intStackSize]; // L: 3066 + Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = UserComparator10.isDigit((char)var10) ? 1 : 0; // L: 3067 + return 1; // L: 3068 + } else if (var0 == ScriptOpcodes.STRING_LENGTH) { // L: 3070 + var3 = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize]; // L: 3071 + if (var3 != null) { // L: 3072 + Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = var3.length(); + } else { + Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = 0; // L: 3073 + } + + return 1; // L: 3074 + } else if (var0 == ScriptOpcodes.SUBSTRING) { // L: 3076 + var3 = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize]; // L: 3077 + class44.Interpreter_intStackSize -= 2; // L: 3078 + var9 = Interpreter.Interpreter_intStack[class44.Interpreter_intStackSize]; // L: 3079 + var5 = Interpreter.Interpreter_intStack[class44.Interpreter_intStackSize + 1]; // L: 3080 + Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var3.substring(var9, var5); // L: 3081 + return 1; // L: 3082 + } else if (var0 == ScriptOpcodes.REMOVETAGS) { // L: 3084 + var3 = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize]; // L: 3085 + StringBuilder var15 = new StringBuilder(var3.length()); // L: 3086 + boolean var16 = false; // L: 3087 + + for (var6 = 0; var6 < var3.length(); ++var6) { // L: 3088 + char var7 = var3.charAt(var6); // L: 3089 + if (var7 == '<') { // L: 3090 + var16 = true; + } else if (var7 == '>') { // L: 3091 + var16 = false; + } else if (!var16) { // L: 3092 + var15.append(var7); + } + } + + Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var15.toString(); // L: 3094 + return 1; // L: 3095 + } else if (var0 == ScriptOpcodes.STRING_INDEXOF_CHAR) { // L: 3097 + var3 = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize]; // L: 3098 + var9 = Interpreter.Interpreter_intStack[--class44.Interpreter_intStackSize]; // L: 3099 + Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = var3.indexOf(var9); // L: 3100 + return 1; // L: 3101 + } else if (var0 == ScriptOpcodes.STRING_INDEXOF_STRING) { // L: 3103 + Interpreter.Interpreter_stringStackSize -= 2; // L: 3104 + var3 = Interpreter.Interpreter_stringStack[Interpreter.Interpreter_stringStackSize]; // L: 3105 + var4 = Interpreter.Interpreter_stringStack[Interpreter.Interpreter_stringStackSize + 1]; // L: 3106 + var5 = Interpreter.Interpreter_intStack[--class44.Interpreter_intStackSize]; // L: 3107 + Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = var3.indexOf(var4, var5); // L: 3108 + return 1; // L: 3109 + } else if (var0 == ScriptOpcodes.UPPERCASE) { // L: 3111 + var3 = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize]; // L: 3112 + Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var3.toUpperCase(); // L: 3113 + return 1; // L: 3114 + } else { + return 2; // L: 3116 + } + } + } else { + Interpreter.Interpreter_stringStackSize -= 2; // L: 2994 + var3 = Interpreter.Interpreter_stringStack[Interpreter.Interpreter_stringStackSize]; // L: 2995 + var4 = Interpreter.Interpreter_stringStack[Interpreter.Interpreter_stringStackSize + 1]; // L: 2996 + if (class93.localPlayer.appearance != null && class93.localPlayer.appearance.isFemale) { // L: 2997 + Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var4; + } else { + Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var3; // L: 2998 + } + + return 1; // L: 2999 + } } } } - - @ObfuscatedName("u") - @ObfuscatedSignature( - descriptor = "(ILci;ZI)I", - garbageValue = "2078983117" - ) - static int method1939(int var0, Script var1, boolean var2) { - Widget var3 = DevicePcmPlayerProvider.getWidget(Interpreter.Interpreter_intStack[--WorldMapCacheName.Interpreter_intStackSize]); // L: 1281 - if (var0 == ScriptOpcodes.IF_GETSCROLLX) { // L: 1282 - Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = var3.scrollX; // L: 1283 - return 1; // L: 1284 - } else if (var0 == ScriptOpcodes.IF_GETSCROLLY) { // L: 1286 - Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = var3.scrollY; // L: 1287 - return 1; // L: 1288 - } else if (var0 == ScriptOpcodes.IF_GETTEXT) { // L: 1290 - Interpreter.Interpreter_stringStack[++class13.Interpreter_stringStackSize - 1] = var3.text; // L: 1291 - return 1; // L: 1292 - } else if (var0 == ScriptOpcodes.IF_GETSCROLLWIDTH) { // L: 1294 - Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = var3.scrollWidth; // L: 1295 - return 1; // L: 1296 - } else if (var0 == ScriptOpcodes.IF_GETSCROLLHEIGHT) { // L: 1298 - Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = var3.scrollHeight; // L: 1299 - return 1; // L: 1300 - } else if (var0 == ScriptOpcodes.IF_GETMODELZOOM) { // L: 1302 - Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = var3.modelZoom; // L: 1303 - return 1; // L: 1304 - } else if (var0 == ScriptOpcodes.IF_GETMODELANGLE_X) { // L: 1306 - Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = var3.modelAngleX; // L: 1307 - return 1; // L: 1308 - } else if (var0 == ScriptOpcodes.IF_GETMODELANGLE_Z) { // L: 1310 - Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = var3.modelAngleZ; // L: 1311 - return 1; // L: 1312 - } else if (var0 == ScriptOpcodes.IF_GETMODELANGLE_Y) { // L: 1314 - Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = var3.modelAngleY; // L: 1315 - return 1; // L: 1316 - } else if (var0 == ScriptOpcodes.IF_GETTRANSTOP) { // L: 1318 - Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = var3.transparencyTop; // L: 1319 - return 1; // L: 1320 - } else if (var0 == ScriptOpcodes.IF_GETTRANSBOT) { // L: 1322 - Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = var3.transparencyBot; // L: 1323 - return 1; // L: 1324 - } else if (var0 == ScriptOpcodes.IF_GETCOLOUR) { // L: 1326 - Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = var3.color; // L: 1327 - return 1; // L: 1328 - } else if (var0 == ScriptOpcodes.IF_GETFILLCOLOUR) { // L: 1330 - Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = var3.color2; // L: 1331 - return 1; // L: 1332 - } else if (var0 == ScriptOpcodes.IF_GETFILLMODE) { // L: 1334 - Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = var3.fillMode.rsOrdinal(); // L: 1335 - return 1; // L: 1336 - } else if (var0 == ScriptOpcodes.IF_GETMODELTRANSPARENT) { // L: 1338 - Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = var3.modelTransparency ? 1 : 0; // L: 1339 - return 1; // L: 1340 - } else if (var0 != 2615 && var0 != 2616) { // L: 1342 - return 2; // L: 1346 - } else { - ++WorldMapCacheName.Interpreter_intStackSize; // L: 1343 - return 1; // L: 1344 - } - } - - @ObfuscatedName("kh") - @ObfuscatedSignature( - descriptor = "(B)V", - garbageValue = "-66" - ) - static final void method1943() { - PacketBufferNode var0 = HealthBarDefinition.getPacketBufferNode(ClientPacket.field2610, Client.packetWriter.isaacCipher); // L: 11309 - Client.packetWriter.addNode(var0); // L: 11310 - - for (InterfaceParent var1 = (InterfaceParent)Client.interfaceParents.first(); var1 != null; var1 = (InterfaceParent)Client.interfaceParents.next()) { // L: 11311 - if (var1.type == 0 || var1.type == 3) { // L: 11312 - class18.closeInterface(var1, true); - } - } - - if (Client.meslayerContinueWidget != null) { // L: 11314 - VerticalAlignment.invalidateWidget(Client.meslayerContinueWidget); // L: 11315 - Client.meslayerContinueWidget = null; // L: 11316 - } - - } // L: 11318 } diff --git a/runescape-client/src/main/java/class82.java b/runescape-client/src/main/java/class82.java index 4167adca71..f90e7f9859 100644 --- a/runescape-client/src/main/java/class82.java +++ b/runescape-client/src/main/java/class82.java @@ -1,28 +1,87 @@ -import java.awt.Component; +import java.io.File; +import java.io.IOException; import java.math.BigInteger; +import net.runelite.mapping.Export; +import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("cn") +@ObfuscatedName("ci") public class class82 { - @ObfuscatedName("h") - static final BigInteger field986; - @ObfuscatedName("c") - static final BigInteger field987; + @ObfuscatedName("v") + static final BigInteger field1018; + @ObfuscatedName("n") + static final BigInteger field1017; + @ObfuscatedName("ge") + @Export("regionMapArchives") + static byte[][] regionMapArchives; + @ObfuscatedName("nb") + @ObfuscatedGetter( + intValue = -1942533771 + ) + static int field1020; static { - field986 = new BigInteger("10001", 16); // L: 6 - field987 = new BigInteger("88d2b28e43dc7be8f2376826a6d810274f07f489daf46f3fc0a40ad847e6c852b10e6939d9252721d4fb8501cf1348cdabec4165b62bd8aa0dbe6ed0394524dfe2cdce9287df5cbedb0d33bc1d9df71cb2e5c67a5d05fa058b182a192ad83fa80b8ff245b45500dce1f746b9a14db36d711c889f35183243d5805cd875580975", 16); // L: 7 + field1018 = new BigInteger("10001", 16); // L: 6 + field1017 = new BigInteger("88d2b28e43dc7be8f2376826a6d810274f07f489daf46f3fc0a40ad847e6c852b10e6939d9252721d4fb8501cf1348cdabec4165b62bd8aa0dbe6ed0394524dfe2cdce9287df5cbedb0d33bc1d9df71cb2e5c67a5d05fa058b182a192ad83fa80b8ff245b45500dce1f746b9a14db36d711c889f35183243d5805cd875580975", 16); // L: 7 } - @ObfuscatedName("c") + @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "(Ljava/awt/Component;I)V", - garbageValue = "-209248744" + descriptor = "([BI)Lfd;", + garbageValue = "775453768" ) - static void method1946(Component var0) { - var0.setFocusTraversalKeysEnabled(false); // L: 150 - var0.addKeyListener(KeyHandler.KeyHandler_instance); // L: 151 - var0.addFocusListener(KeyHandler.KeyHandler_instance); // L: 152 - } // L: 153 + static WorldMapSprite method1909(byte[] var0) { + return var0 == null ? new WorldMapSprite() : new WorldMapSprite(ParamComposition.convertJpgToSprite(var0).pixels); // L: 19 20 + } + + @ObfuscatedName("f") + @ObfuscatedSignature( + descriptor = "(Ljava/lang/String;Ljava/lang/String;ZI)Lnm;", + garbageValue = "2134853227" + ) + @Export("getPreferencesFile") + public static AccessFile getPreferencesFile(String var0, String var1, boolean var2) { + File var3 = new File(class12.cacheDir, "preferences" + var0 + ".dat"); // L: 166 + if (var3.exists()) { // L: 167 + try { + AccessFile var10 = new AccessFile(var3, "rw", 10000L); // L: 169 + return var10; // L: 170 + } catch (IOException var9) { // L: 172 + } + } + + String var4 = ""; // L: 174 + if (UserComparator10.cacheGamebuild == 33) { // L: 175 + var4 = "_rc"; + } else if (UserComparator10.cacheGamebuild == 34) { // L: 176 + var4 = "_wip"; + } + + File var5 = new File(class22.userHomeDirectory, "jagex_" + var1 + "_preferences" + var0 + var4 + ".dat"); // L: 177 + AccessFile var6; + if (!var2 && var5.exists()) { // L: 178 + try { + var6 = new AccessFile(var5, "rw", 10000L); // L: 180 + return var6; // L: 181 + } catch (IOException var8) { // L: 183 + } + } + + try { + var6 = new AccessFile(var3, "rw", 10000L); // L: 186 + return var6; // L: 187 + } catch (IOException var7) { // L: 189 + throw new RuntimeException(); // L: 190 + } + } + + @ObfuscatedName("y") + @ObfuscatedSignature( + descriptor = "(Ljava/lang/CharSequence;I)I", + garbageValue = "-409366221" + ) + public static int method1908(CharSequence var0) { + return class24.method260(var0, 10, true); // L: 67 + } } diff --git a/runescape-client/src/main/java/class9.java b/runescape-client/src/main/java/class9.java deleted file mode 100644 index f3db0f23d2..0000000000 --- a/runescape-client/src/main/java/class9.java +++ /dev/null @@ -1,104 +0,0 @@ -import java.io.IOException; -import net.runelite.mapping.Export; -import net.runelite.mapping.ObfuscatedGetter; -import net.runelite.mapping.ObfuscatedName; -import net.runelite.mapping.ObfuscatedSignature; - -@ObfuscatedName("q") -public class class9 { - @ObfuscatedName("l") - static byte[][][] field71; - @ObfuscatedName("v") - @Export("ByteArrayPool_altSizeArrayCounts") - static int[] ByteArrayPool_altSizeArrayCounts; - @ObfuscatedName("aj") - @Export("fontHelvetica13") - static java.awt.Font fontHelvetica13; - @ObfuscatedName("ee") - @ObfuscatedSignature( - descriptor = "Lji;" - ) - @Export("archive20") - static Archive archive20; - @ObfuscatedName("jy") - @ObfuscatedSignature( - descriptor = "Lgv;" - ) - @Export("textureProvider") - static TextureProvider textureProvider; - @ObfuscatedName("lg") - @ObfuscatedSignature( - descriptor = "Lce;" - ) - @Export("tempMenuAction") - static MenuAction tempMenuAction; - @ObfuscatedName("h") - public byte field76; - @ObfuscatedName("c") - @ObfuscatedGetter( - intValue = 614168869 - ) - public int field80; - @ObfuscatedName("o") - public String field73; - - class9() { - } // L: 8 - - @ObfuscatedName("c") - @ObfuscatedSignature( - descriptor = "(Ljava/lang/String;IB)Z", - garbageValue = "6" - ) - static boolean method98(String var0, int var1) { - return class230.method4348(var0, var1, "openjs"); // L: 50 - } - - @ObfuscatedName("fz") - @ObfuscatedSignature( - descriptor = "(IZZZI)Lji;", - garbageValue = "-325729093" - ) - @Export("newArchive") - static Archive newArchive(int var0, boolean var1, boolean var2, boolean var3) { - ArchiveDisk var4 = null; // L: 2327 - if (JagexCache.JagexCache_dat2File != null) { // L: 2328 - var4 = new ArchiveDisk(var0, JagexCache.JagexCache_dat2File, class21.JagexCache_idxFiles[var0], 1000000); - } - - return new Archive(var4, class1.masterDisk, var0, var1, var2, var3); // L: 2329 - } - - @ObfuscatedName("ho") - @ObfuscatedSignature( - descriptor = "(ZI)V", - garbageValue = "-809914007" - ) - static final void method97(boolean var0) { - WorldMapIcon_1.playPcmPlayers(); // L: 5645 - ++Client.packetWriter.pendingWrites; // L: 5646 - if (Client.packetWriter.pendingWrites >= 50 || var0) { // L: 5647 - Client.packetWriter.pendingWrites = 0; // L: 5648 - if (!Client.hadNetworkError && Client.packetWriter.getSocket() != null) { // L: 5649 - PacketBufferNode var1 = HealthBarDefinition.getPacketBufferNode(ClientPacket.field2583, Client.packetWriter.isaacCipher); // L: 5651 - Client.packetWriter.addNode(var1); // L: 5652 - - try { - Client.packetWriter.flush(); // L: 5654 - } catch (IOException var3) { // L: 5656 - Client.hadNetworkError = true; // L: 5657 - } - } - - } - } // L: 5660 - - @ObfuscatedName("ld") - @ObfuscatedSignature( - descriptor = "(IB)V", - garbageValue = "55" - ) - static void method95(int var0) { - Client.oculusOrbState = var0; // L: 11746 - } // L: 11747 -} diff --git a/runescape-client/src/main/java/class93.java b/runescape-client/src/main/java/class93.java index f9a154d1bb..d91f14c87c 100644 --- a/runescape-client/src/main/java/class93.java +++ b/runescape-client/src/main/java/class93.java @@ -1,13 +1,64 @@ import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; +import net.runelite.rs.ScriptOpcodes; -@ObfuscatedName("cz") +@ObfuscatedName("cc") public class class93 { - @ObfuscatedName("rv") + @ObfuscatedName("e") @ObfuscatedSignature( - descriptor = "Lbd;" + descriptor = "[Lnf;" ) - @Export("pcmPlayer1") - static PcmPlayer pcmPlayer1; + @Export("JagexCache_idxFiles") + public static BufferedFile[] JagexCache_idxFiles; + @ObfuscatedName("kr") + @ObfuscatedSignature( + descriptor = "Lce;" + ) + @Export("localPlayer") + static Player localPlayer; + + @ObfuscatedName("d") + @Export("Entity_unpackID") + public static int Entity_unpackID(long var0) { + return (int)(var0 >>> 17 & 4294967295L); // L: 85 + } + + @ObfuscatedName("x") + @ObfuscatedSignature( + descriptor = "(ILcf;ZI)I", + garbageValue = "992004750" + ) + static int method2080(int var0, Script var1, boolean var2) { + Widget var5; + if (var0 == ScriptOpcodes.IF_GETINVOBJECT) { // L: 1350 + var5 = Frames.getWidget(Interpreter.Interpreter_intStack[--class44.Interpreter_intStackSize]); // L: 1351 + Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = var5.itemId; // L: 1352 + return 1; // L: 1353 + } else if (var0 == ScriptOpcodes.IF_GETINVCOUNT) { // L: 1355 + var5 = Frames.getWidget(Interpreter.Interpreter_intStack[--class44.Interpreter_intStackSize]); // L: 1356 + if (var5.itemId != -1) { // L: 1357 + Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = var5.itemQuantity; + } else { + Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = 0; // L: 1358 + } + + return 1; // L: 1359 + } else if (var0 == ScriptOpcodes.IF_HASSUB) { // L: 1361 + int var3 = Interpreter.Interpreter_intStack[--class44.Interpreter_intStackSize]; // L: 1362 + InterfaceParent var4 = (InterfaceParent)Client.interfaceParents.get((long)var3); // L: 1363 + if (var4 != null) { // L: 1364 + Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = 1; + } else { + Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = 0; // L: 1365 + } + + return 1; // L: 1366 + } else if (var0 == ScriptOpcodes.IF_GETTOP) { // L: 1368 + Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = Client.rootInterface; // L: 1369 + return 1; // L: 1370 + } else { + return 2; // L: 1372 + } + } }