From 578ed9a205e99aa70a57e8a54cd7f9a450e398c0 Mon Sep 17 00:00:00 2001 From: Graham Date: Sun, 13 Sep 2020 17:23:48 +0100 Subject: [PATCH] Add initial ScriptRunner refactor Signed-off-by: Graham --- share/deob/map/client.yaml | 157 ++++++++++++++++++------------------- 1 file changed, 78 insertions(+), 79 deletions(-) diff --git a/share/deob/map/client.yaml b/share/deob/map/client.yaml index 5ec9031626..61b549b76b 100644 --- a/share/deob/map/client.yaml +++ b/share/deob/map/client.yaml @@ -259,7 +259,7 @@ classes: client!ue: "GameShell" client!ug: "Class172" client!uh: "Class173" - client!ui: "Class174" + client!ui: "StackFrame" client!uj: "Class4_Sub3_Sub14" client!uk: "SecondaryLinkedList" client!ul: "Js5NetRequest" @@ -1671,8 +1671,8 @@ fields: owner: "Text" name: "CHATCOL2" client!df.g [Ljava/lang/String;: - owner: "Static2" - name: "aStringArray5" + owner: "ScriptRunner" + name: "stringStack" client!df.h I: owner: "Static2" name: "anInt959" @@ -2523,8 +2523,8 @@ fields: owner: "Static2" name: "anInt5734" client!fd.nb I: - owner: "Static2" - name: "anInt5739" + owner: "ScriptRunner" + name: "fp" client!fd.t [Ljava/lang/String;: owner: "Static2" name: "aStringArray40" @@ -3324,8 +3324,8 @@ fields: owner: "Static3" name: "anInt2142" client!hb.f [[I: - owner: "Static3" - name: "anIntArrayArray17" + owner: "ScriptRunner" + name: "arrays" client!hb.h [Lclient!ub;: owner: "Static3" name: "aClass169Array1" @@ -4962,8 +4962,8 @@ fields: owner: "Static4" name: "anInt2959" client!kn.D [Ljava/lang/String;: - owner: "Static4" - name: "aStringArray21" + owner: "ScriptRunner" + name: "stringLocals" client!kn.E I: owner: "Static4" name: "anInt2974" @@ -5058,8 +5058,8 @@ fields: owner: "Class108" name: "aClass20_Sub2_1" client!lb.j [I: - owner: "Static4" - name: "anIntArray272" + owner: "ScriptRunner" + name: "intLocals" client!lb.k Lclient!f;: owner: "Static4" name: "aClass53_Sub1_Sub1_2" @@ -9936,8 +9936,8 @@ fields: owner: "ImageProducerFrameBuffer" name: "consumer" client!tm.O [I: - owner: "Static7" - name: "anIntArray571" + owner: "ScriptRunner" + name: "intStack" client!tn.a I: owner: "AbstractWorld" name: "flags" @@ -10434,20 +10434,20 @@ fields: owner: "Static7" name: "anIntArray612" client!ui.a Lclient!jl;: - owner: "Class174" - name: "aClass4_Sub3_Sub13_1" + owner: "StackFrame" + name: "script" client!ui.c [Ljava/lang/String;: - owner: "Class174" - name: "aStringArray36" + owner: "StackFrame" + name: "stringLocals" client!ui.f I: - owner: "Class174" - name: "anInt5353" + owner: "StackFrame" + name: "pc" client!ui.g [[S: owner: "Static7" name: "aShortArrayArray8" client!ui.h [I: - owner: "Class174" - name: "anIntArray613" + owner: "StackFrame" + name: "intLocals" client!ui.j Ljava/lang/String;: owner: "Text" name: "CHATCOL7" @@ -10527,8 +10527,8 @@ fields: owner: "Static7" name: "anIntArray616" client!un.w [I: - owner: "Static7" - name: "anIntArray617" + owner: "ScriptRunner" + name: "arrayLengths" client!un.x I: owner: "Static7" name: "anInt5412" @@ -10569,8 +10569,8 @@ fields: owner: "GameShell" name: "killTime" client!va.c [Lclient!ui;: - owner: "Static7" - name: "aClass174Array1" + owner: "ScriptRunner" + name: "callStack" client!va.d [[I: owner: "Static7" name: "anIntArrayArray48" @@ -14438,7 +14438,7 @@ methods: 2: "arg1" locals: {} client!cc.a (Lclient!io;ZI)V: - owner: "Static11" + owner: "ScriptRunner" name: "method519" arguments: 0: "arg0" @@ -19838,52 +19838,51 @@ methods: 44: "local44" 46: "local46" client!gb.a (IILclient!jl;)V: - owner: "Static16" - name: "method1551" + owner: "ScriptRunner" + name: "run" arguments: - 0: "arg0" - 2: "arg1" + 2: "script" + 0: "maxCycles" locals: - 5: "local5" - 11: "local11" - 13: "local13" - 16: "local16" - 23: "local23" - 25: "local25" - 27: "local27" - 45: "local45" + 5: "isp" + 11: "pc" + 13: "ssp" + 16: "opcodes" + 23: "intOperands" + 25: "opcode" + 27: "cycles" 70: "local70" 89: "local89" - 242: "local242" + 242: "frame" 270: "local270" 287: "local287" - 367: "local367" - 399: "local399" - 413: "local413" - 417: "local417" - 423: "local423" - 457: "local457" - 461: "local461" - 465: "local465" - 469: "local469" - 471: "local471" - 496: "local496" - 534: "local534" + 367: "local" + 399: "local" + 413: "len" + 417: "ssp2" + 423: "value" + 457: "scriptId" + 461: "callee" + 465: "calleeIntLocals" + 469: "calleeStringLocals" + 471: "i" + 496: "i" + 534: "frame" 605: "local605" - 627: "local627" - 633: "local633" - 638: "local638" - 651: "local651" - 664: "local664" - 690: "local690" - 692: "local692" - 695: "local695" - 730: "local730" - 735: "local735" + 627: "type" + 633: "id" + 638: "len" + 651: "defaultValue" + 664: "i" + 690: "id" + 692: "isp2" + 695: "index" + 730: "id" + 735: "index" 771: "local771" 790: "local790" - 814: "local814" - 826: "local826" + 814: "table" + 826: "node" 846: "local846" 885: "local885" 919: "local919" @@ -20533,8 +20532,8 @@ methods: 15022: "local15022" 15025: "local15025" 15031: "local15031" - 15060: "local15060" - 15069: "local15069" + 15060: "ex" + 15069: "buffer" 15080: "local15080" 15103: "local15103" client!gb.a (Z)Lclient!rf;: @@ -29354,7 +29353,7 @@ methods: 22: "local22" 29: "local29" client!mg.a (IIII)V: - owner: "Static24" + owner: "ScriptRunner" name: "method2710" arguments: 0: "arg0" @@ -45440,21 +45439,21 @@ methods: 55: "local55" 66: "local66" client!wd.a (Z[Ljava/lang/String;II)Ljava/lang/String;: - owner: "Static37" - name: "method4715" + owner: "StringUtils" + name: "join" arguments: - 1: "arg0" - 2: "arg1" - 3: "arg2" + 1: "array" + 2: "off" + 3: "len" locals: - 23: "local23" - 33: "local33" - 37: "local37" - 39: "local39" - 46: "local46" - 65: "local65" - 67: "local67" - 78: "local78" + 23: "s" + 33: "bufferSize" + 37: "end" + 39: "i" + 46: "s" + 65: "buffer" + 67: "i" + 78: "s" client!wd.b (II)[[I: owner: "Class4_Sub1_Sub21_Sub1" name: "method4695"