From 485ea2621c252e0d33b779c7aa0bf270732f51c6 Mon Sep 17 00:00:00 2001 From: Graham Date: Fri, 18 Sep 2020 11:27:48 +0100 Subject: [PATCH] Refactor WorldMapFont Signed-off-by: Graham --- share/deob/map/client.yaml | 266 ++++++++++++++++++------------------- 1 file changed, 133 insertions(+), 133 deletions(-) diff --git a/share/deob/map/client.yaml b/share/deob/map/client.yaml index f3047387..0f2ae816 100644 --- a/share/deob/map/client.yaml +++ b/share/deob/map/client.yaml @@ -126,7 +126,7 @@ classes: client!kh: "SoftReferenceNode" client!ki: "DirectByteArray" client!kj: "TextureProvider" - client!kk: "Class106" + client!kk: "WorldMapFont" client!kl: "TextureOp38" client!km: "TextureOp29" client!l: "Class4_Sub15" @@ -4914,20 +4914,20 @@ fields: owner: "DirectByteArray" name: "buffer" client!kk.a [B: - owner: "Class106" - name: "aByteArray30" + owner: "WorldMapFont" + name: "data" client!kk.b Z: - owner: "Class106" - name: "aBoolean201" + owner: "WorldMapFont" + name: "grayscale" client!kk.c I: - owner: "Class106" - name: "anInt2887" + owner: "WorldMapFont" + name: "dataIndex" client!kk.d I: - owner: "Static4" - name: "anInt2888" + owner: "WorldMapFont" + name: "ALPHABET_SIZE" client!kk.e [I: - owner: "Class106" - name: "anIntArray258" + owner: "WorldMapFont" + name: "CHAR_INDEXES" client!kl.S I: owner: "TextureOp38" name: "anInt2914" @@ -26408,163 +26408,163 @@ methods: 0: "id" locals: {} client!kk. (IZLjava/awt/Component;)V: - owner: "Class106" + owner: "WorldMapFont" name: "" arguments: - 0: "arg0" + 0: "size" 1: "arg1" - 2: "arg2" + 2: "component" locals: - 30: "local30" - 34: "local34" - 36: "local36" - 70: "local70" - 74: "local74" - 76: "local76" - 103: "local103" - 121: "local121" - 123: "local123" + 30: "bold" + 34: "boldMetrics" + 36: "i" + 70: "plain" + 74: "plainMetrics" + 76: "i" + 103: "i" + 121: "data" + 123: "i" client!kk.a ()I: - owner: "Class106" + owner: "WorldMapFont" name: "method2328" arguments: {} locals: {} client!kk.a (IIII[B)V: - owner: "Class106" - name: "method2327" + owner: "WorldMapFont" + name: "renderGlyph" arguments: - 0: "arg0" - 1: "arg1" - 2: "arg2" - 3: "arg3" - 4: "arg4" + 0: "index" + 1: "x" + 2: "y" + 3: "color" + 4: "src" locals: 7: "local7" 15: "local15" - 21: "local21" - 27: "local27" - 47: "local47" - 53: "local53" - 57: "local57" - 59: "local59" + 21: "width" + 27: "height" + 47: "srcIndex" + 53: "destIndex" + 57: "destStride" + 59: "srcStride" 66: "local66" 106: "local106" 141: "local141" client!kk.a (Ljava/awt/Font;Ljava/awt/FontMetrics;CIZ)V: - owner: "Class106" - name: "method2334" + owner: "WorldMapFont" + name: "preRenderGlyph" arguments: - 0: "arg0" - 1: "arg1" - 2: "arg2" - 3: "arg3" - 4: "arg4" + 0: "font" + 1: "metrics" + 2: "c" + 3: "id" + 4: "shadow" locals: - 3: "local3" - 5: "local5" - 45: "local45" - 48: "local48" - 54: "local54" - 57: "local57" - 62: "local62" - 65: "local65" - 111: "local111" - 123: "local123" - 128: "local128" - 134: "local134" - 136: "local136" - 138: "local138" - 140: "local140" - 142: "local142" - 147: "local147" - 158: "local158" - 171: "local171" - 176: "local176" - 187: "local187" - 202: "local202" - 206: "local206" - 217: "local217" - 234: "local234" - 238: "local238" - 249: "local249" - 371: "local371" - 376: "local376" - 389: "local389" + 3: "imageWidth" + 5: "width" + 45: "ex" + 48: "maxAscent" + 54: "imageHeight" + 57: "height" + 62: "image" + 65: "graphics" + 111: "pixels" + 123: "grabber" + 128: "ex" + 134: "x0" + 136: "y0" + 138: "x1" + 140: "y1" + 142: "y" + 147: "x" + 158: "color" + 171: "x" + 176: "y" + 187: "color" + 202: "y" + 206: "x" + 217: "color" + 234: "x" + 238: "y" + 249: "color" + 371: "y" + 376: "x" + 389: "blue" client!kk.a (Ljava/lang/String;)I: - owner: "Class106" - name: "method2326" + owner: "WorldMapFont" + name: "getStringWidth" arguments: - 0: "arg0" + 0: "s" locals: - 1: "local1" - 3: "local3" + 1: "width" + 3: "i" client!kk.a (Ljava/lang/String;IIIZ)V: - owner: "Class106" - name: "method2330" + owner: "WorldMapFont" + name: "renderStringCenter" arguments: - 0: "arg0" - 1: "arg1" - 2: "arg2" - 3: "arg3" + 0: "s" + 1: "x" + 2: "y" + 3: "color" locals: - 5: "local5" + 5: "halfWidth" 8: "local8" client!kk.a ([I[BIIIIIII)V: - owner: "Class106" - name: "method2331" + owner: "WorldMapFont" + name: "renderGlyphMono" arguments: - 0: "arg0" - 1: "arg1" - 2: "arg2" - 3: "arg3" - 4: "arg4" - 5: "arg5" - 6: "arg6" - 7: "arg7" - 8: "arg8" - locals: - 4: "local4" - 12: "local12" - 16: "local16" - 21: "local21" - 26: "local26" - 33: "local33" - 38: "local38" - 45: "local45" - 50: "local50" - 70: "local70" + 0: "dest" + 1: "src" + 2: "color" + 3: "srcIndex" + 4: "destIndex" + 5: "width" + 6: "height" + 7: "destStride" + 8: "srcStride" + locals: + 4: "roundedWidth" + 12: "y" + 16: "x" + 21: "srcIndex2" + 26: "destIndex2" + 33: "srcIndex3" + 38: "destIndex3" + 45: "srcIndex4" + 50: "destIndex4" + 70: "x" client!kk.b (Ljava/lang/String;IIIZ)V: - owner: "Class106" - name: "method2333" + owner: "WorldMapFont" + name: "renderString" arguments: - 0: "arg0" - 1: "arg1" - 2: "arg2" - 3: "arg3" - 4: "arg4" + 0: "s" + 1: "x" + 2: "y" + 3: "color" + 4: "shadow" locals: - 8: "local8" - 18: "local18" + 8: "i" + 18: "index" client!kk.b ([I[BIIIIIII)V: - owner: "Class106" - name: "method2335" + owner: "WorldMapFont" + name: "renderGlyphGrayscale" arguments: - 0: "arg0" - 1: "arg1" - 2: "arg2" - 3: "arg3" - 4: "arg4" - 5: "arg5" - 6: "arg6" - 7: "arg7" - 8: "arg8" + 0: "dest" + 1: "src" + 2: "color" + 3: "srcIndex" + 4: "destIndex" + 5: "width" + 6: "height" + 7: "destStride" + 8: "srcStride" locals: - 2: "local2" - 7: "local7" - 16: "local16" - 32: "local32" + 2: "y" + 7: "x" + 16: "intensity" + 32: "backgroundColor" client!kk.c ()I: - owner: "Class106" + owner: "WorldMapFont" name: "method2332" arguments: {} locals: {}