mirror of
https://gitlab.com/2009scape/rt4-client.git
synced 2026-08-01 14:39:16 -06:00
Loads of refactoring, renamed Class3_Sub13 to EnumStringEntry too
This commit is contained in:
Pazaz
parent
e11ef7d372
commit
d2c6c19cb8
263 changed files with 2432 additions and 2436 deletions
|
|
@ -14,86 +14,86 @@ import org.openrs2.deob.annotation.Pc;
|
|||
public final class WorldMapFont {
|
||||
|
||||
@OriginalMember(owner = "client!fd", name = "d", descriptor = "Ljava/lang/String;")
|
||||
public static final String aString2 = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789!\"£$%^&*()-_=+[{]};:'@#~,<.>/?\\| " + String.valueOf('Ä') + 'Ë' + 'Ï' + 'Ö' + 'Ü' + 'ä' + 'ë' + 'ï' + 'ö' + 'ü' + 'ÿ' + 'ß' + 'Á' + 'À' + 'É' + 'È' + 'Í' + 'Ì' + 'Ó' + 'Ò' + 'Ú' + 'Ù' + 'á' + 'à' + 'é' + 'è' + 'í' + 'ì' + 'ó' + 'ò' + 'ú' + 'ù' + 'Â' + 'Ê' + 'Î' + 'Ô' + 'Û' + 'â' + 'ê' + 'î' + 'ô' + 'û' + 'Æ' + 'æ';
|
||||
public static final String ALPHABET = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789!\"£$%^&*()-_=+[{]};:'@#~,<.>/?\\| " + String.valueOf('Ä') + 'Ë' + 'Ï' + 'Ö' + 'Ü' + 'ä' + 'ë' + 'ï' + 'ö' + 'ü' + 'ÿ' + 'ß' + 'Á' + 'À' + 'É' + 'È' + 'Í' + 'Ì' + 'Ó' + 'Ò' + 'Ú' + 'Ù' + 'á' + 'à' + 'é' + 'è' + 'í' + 'ì' + 'ó' + 'ò' + 'ú' + 'ù' + 'Â' + 'Ê' + 'Î' + 'Ô' + 'Û' + 'â' + 'ê' + 'î' + 'ô' + 'û' + 'Æ' + 'æ';
|
||||
|
||||
@OriginalMember(owner = "client!fd", name = "f", descriptor = "[I")
|
||||
private static final int[] anIntArray155 = new int[256];
|
||||
private static final int[] CHAR_INDEXES = new int[256];
|
||||
|
||||
@OriginalMember(owner = "client!fd", name = "c", descriptor = "I")
|
||||
private int anInt1955 = 0;
|
||||
private int dataIndex = 0;
|
||||
|
||||
@OriginalMember(owner = "client!fd", name = "b", descriptor = "Z")
|
||||
private boolean aBoolean112 = false;
|
||||
private boolean grayscale = false;
|
||||
|
||||
@OriginalMember(owner = "client!fd", name = "a", descriptor = "[B")
|
||||
private byte[] aByteArray21 = new byte[100000];
|
||||
private byte[] data = new byte[100000];
|
||||
|
||||
static {
|
||||
for (@Pc(146) int local146 = 0; local146 < 256; local146++) {
|
||||
@Pc(153) int local153 = aString2.indexOf(local146);
|
||||
@Pc(153) int local153 = ALPHABET.indexOf(local146);
|
||||
if (local153 == -1) {
|
||||
local153 = 74;
|
||||
}
|
||||
anIntArray155[local146] = local153 * 9;
|
||||
CHAR_INDEXES[local146] = local153 * 9;
|
||||
}
|
||||
}
|
||||
|
||||
@OriginalMember(owner = "client!fd", name = "<init>", descriptor = "(IZLjava/awt/Component;)V")
|
||||
public WorldMapFont(@OriginalArg(0) int arg0, @OriginalArg(1) boolean arg1, @OriginalArg(2) Component arg2) {
|
||||
this.anInt1955 = Static66.anInt1956 * 9;
|
||||
this.aBoolean112 = false;
|
||||
this.dataIndex = Static66.ALPHABET_SIZE * 9;
|
||||
this.grayscale = false;
|
||||
@Pc(30) Font local30 = new Font("Helvetica", 1, arg0);
|
||||
@Pc(34) FontMetrics local34 = arg2.getFontMetrics(local30);
|
||||
@Pc(36) int local36;
|
||||
for (local36 = 0; local36 < Static66.anInt1956; local36++) {
|
||||
this.method1509(local30, local34, aString2.charAt(local36), local36, false);
|
||||
for (local36 = 0; local36 < Static66.ALPHABET_SIZE; local36++) {
|
||||
this.preRenderGlyph(local30, local34, ALPHABET.charAt(local36), local36, false);
|
||||
}
|
||||
if (this.aBoolean112) {
|
||||
this.anInt1955 = Static66.anInt1956 * 9;
|
||||
this.aBoolean112 = false;
|
||||
if (this.grayscale) {
|
||||
this.dataIndex = Static66.ALPHABET_SIZE * 9;
|
||||
this.grayscale = false;
|
||||
local30 = new Font("Helvetica", 0, arg0);
|
||||
local34 = arg2.getFontMetrics(local30);
|
||||
for (local36 = 0; local36 < Static66.anInt1956; local36++) {
|
||||
this.method1509(local30, local34, aString2.charAt(local36), local36, false);
|
||||
for (local36 = 0; local36 < Static66.ALPHABET_SIZE; local36++) {
|
||||
this.preRenderGlyph(local30, local34, ALPHABET.charAt(local36), local36, false);
|
||||
}
|
||||
if (!this.aBoolean112) {
|
||||
this.anInt1955 = Static66.anInt1956 * 9;
|
||||
this.aBoolean112 = false;
|
||||
for (local36 = 0; local36 < Static66.anInt1956; local36++) {
|
||||
this.method1509(local30, local34, aString2.charAt(local36), local36, true);
|
||||
if (!this.grayscale) {
|
||||
this.dataIndex = Static66.ALPHABET_SIZE * 9;
|
||||
this.grayscale = false;
|
||||
for (local36 = 0; local36 < Static66.ALPHABET_SIZE; local36++) {
|
||||
this.preRenderGlyph(local30, local34, ALPHABET.charAt(local36), local36, true);
|
||||
}
|
||||
}
|
||||
}
|
||||
@Pc(121) byte[] local121 = new byte[this.anInt1955];
|
||||
for (@Pc(123) int local123 = 0; local123 < this.anInt1955; local123++) {
|
||||
local121[local123] = this.aByteArray21[local123];
|
||||
@Pc(121) byte[] local121 = new byte[this.dataIndex];
|
||||
for (@Pc(123) int local123 = 0; local123 < this.dataIndex; local123++) {
|
||||
local121[local123] = this.data[local123];
|
||||
}
|
||||
this.aByteArray21 = local121;
|
||||
this.data = local121;
|
||||
}
|
||||
|
||||
@OriginalMember(owner = "client!fd", name = "a", descriptor = "(Lclient!na;IIIZ)V")
|
||||
private void method1502(@OriginalArg(0) JagString arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2, @OriginalArg(3) int arg3, @OriginalArg(4) boolean arg4) {
|
||||
if (this.aBoolean112 || arg3 == 0) {
|
||||
private void renderString(@OriginalArg(0) JagString arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2, @OriginalArg(3) int arg3, @OriginalArg(4) boolean arg4) {
|
||||
if (this.grayscale || arg3 == 0) {
|
||||
arg4 = false;
|
||||
}
|
||||
for (@Pc(8) int local8 = 0; local8 < arg0.length(); local8++) {
|
||||
@Pc(20) int local20 = anIntArray155[arg0.charAt(local8)];
|
||||
@Pc(20) int local20 = CHAR_INDEXES[arg0.charAt(local8)];
|
||||
if (arg4) {
|
||||
this.method1506(local20, arg1 + 1, arg2, 1, this.aByteArray21);
|
||||
this.method1506(local20, arg1, arg2 + 1, 1, this.aByteArray21);
|
||||
this.renderGlyph(local20, arg1 + 1, arg2, 1, this.data);
|
||||
this.renderGlyph(local20, arg1, arg2 + 1, 1, this.data);
|
||||
}
|
||||
this.method1506(local20, arg1, arg2, arg3, this.aByteArray21);
|
||||
arg1 += this.aByteArray21[local20 + 7];
|
||||
this.renderGlyph(local20, arg1, arg2, arg3, this.data);
|
||||
arg1 += this.data[local20 + 7];
|
||||
}
|
||||
}
|
||||
|
||||
@OriginalMember(owner = "client!fd", name = "a", descriptor = "()I")
|
||||
public final int method1503() {
|
||||
return this.aByteArray21[8] - 1;
|
||||
return this.data[8] - 1;
|
||||
}
|
||||
|
||||
@OriginalMember(owner = "client!fd", name = "a", descriptor = "([I[BIIIIIII)V")
|
||||
private void method1505(@OriginalArg(0) int[] arg0, @OriginalArg(1) byte[] arg1, @OriginalArg(2) int arg2, @OriginalArg(3) int arg3, @OriginalArg(4) int arg4, @OriginalArg(5) int arg5, @OriginalArg(6) int arg6, @OriginalArg(7) int arg7, @OriginalArg(8) int arg8) {
|
||||
private void renderGlyphGrayscale(@OriginalArg(0) int[] arg0, @OriginalArg(1) byte[] arg1, @OriginalArg(2) int arg2, @OriginalArg(3) int arg3, @OriginalArg(4) int arg4, @OriginalArg(5) int arg5, @OriginalArg(6) int arg6, @OriginalArg(7) int arg7, @OriginalArg(8) int arg8) {
|
||||
for (@Pc(2) int local2 = -arg6; local2 < 0; local2++) {
|
||||
for (@Pc(7) int local7 = -arg5; local7 < 0; local7++) {
|
||||
@Pc(16) int local16 = arg1[arg3++] & 0xFF;
|
||||
|
|
@ -112,7 +112,7 @@ public final class WorldMapFont {
|
|||
}
|
||||
|
||||
@OriginalMember(owner = "client!fd", name = "a", descriptor = "(IIII[B)V")
|
||||
private void method1506(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2, @OriginalArg(3) int arg3, @OriginalArg(4) byte[] arg4) {
|
||||
private void renderGlyph(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2, @OriginalArg(3) int arg3, @OriginalArg(4) byte[] arg4) {
|
||||
@Pc(7) int local7 = arg1 + arg4[arg0 + 5];
|
||||
@Pc(15) int local15 = arg2 - arg4[arg0 + 6];
|
||||
@Pc(21) int local21 = arg4[arg0 + 3];
|
||||
|
|
@ -150,15 +150,15 @@ public final class WorldMapFont {
|
|||
if (local21 <= 0 || local27 <= 0) {
|
||||
return;
|
||||
}
|
||||
if (this.aBoolean112) {
|
||||
this.method1505(Static129.pixels, arg4, arg3, local47, local53, local21, local27, local57, local59);
|
||||
if (this.grayscale) {
|
||||
this.renderGlyphGrayscale(Static129.pixels, arg4, arg3, local47, local53, local21, local27, local57, local59);
|
||||
} else {
|
||||
this.method1507(Static129.pixels, arg4, arg3, local47, local53, local21, local27, local57, local59);
|
||||
this.renderGlyphMono(Static129.pixels, arg4, arg3, local47, local53, local21, local27, local57, local59);
|
||||
}
|
||||
}
|
||||
|
||||
@OriginalMember(owner = "client!fd", name = "b", descriptor = "([I[BIIIIIII)V")
|
||||
private void method1507(@OriginalArg(0) int[] arg0, @OriginalArg(1) byte[] arg1, @OriginalArg(2) int arg2, @OriginalArg(3) int arg3, @OriginalArg(4) int arg4, @OriginalArg(5) int arg5, @OriginalArg(6) int arg6, @OriginalArg(7) int arg7, @OriginalArg(8) int arg8) {
|
||||
private void renderGlyphMono(@OriginalArg(0) int[] arg0, @OriginalArg(1) byte[] arg1, @OriginalArg(2) int arg2, @OriginalArg(3) int arg3, @OriginalArg(4) int arg4, @OriginalArg(5) int arg5, @OriginalArg(6) int arg6, @OriginalArg(7) int arg7, @OriginalArg(8) int arg8) {
|
||||
@Pc(4) int local4 = -(arg5 >> 2);
|
||||
@Pc(9) int local9 = -(arg5 & 0x3);
|
||||
for (@Pc(12) int local12 = -arg6; local12 < 0; local12++) {
|
||||
|
|
@ -198,16 +198,16 @@ public final class WorldMapFont {
|
|||
}
|
||||
|
||||
@OriginalMember(owner = "client!fd", name = "b", descriptor = "(Lclient!na;IIIZ)V")
|
||||
public final void method1508(@OriginalArg(0) JagString arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2, @OriginalArg(3) int arg3) {
|
||||
@Pc(5) int local5 = this.method1510(arg0) / 2;
|
||||
public final void renderStringCenter(@OriginalArg(0) JagString arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2, @OriginalArg(3) int arg3) {
|
||||
@Pc(5) int local5 = this.getStringWidth(arg0) / 2;
|
||||
@Pc(8) int local8 = this.method1511();
|
||||
if (arg1 - local5 <= Static129.clipRight && (arg1 + local5 >= Static129.clipLeft && (arg2 - local8 <= Static129.clipBottom && arg2 >= 0))) {
|
||||
this.method1502(arg0, arg1 - local5, arg2, arg3, true);
|
||||
this.renderString(arg0, arg1 - local5, arg2, arg3, true);
|
||||
}
|
||||
}
|
||||
|
||||
@OriginalMember(owner = "client!fd", name = "a", descriptor = "(Ljava/awt/Font;Ljava/awt/FontMetrics;CIZ)V")
|
||||
private void method1509(@OriginalArg(0) Font arg0, @OriginalArg(1) FontMetrics arg1, @OriginalArg(2) char arg2, @OriginalArg(3) int arg3, @OriginalArg(4) boolean arg4) {
|
||||
private void preRenderGlyph(@OriginalArg(0) Font arg0, @OriginalArg(1) FontMetrics arg1, @OriginalArg(2) char arg2, @OriginalArg(3) int arg3, @OriginalArg(4) boolean arg4) {
|
||||
@Pc(3) int local3 = arg1.charWidth(arg2);
|
||||
@Pc(5) int local5 = local3;
|
||||
if (arg4) {
|
||||
|
|
@ -284,28 +284,28 @@ public final class WorldMapFont {
|
|||
}
|
||||
}
|
||||
}
|
||||
this.aByteArray21[arg3 * 9] = (byte) (this.anInt1955 / 16384);
|
||||
this.aByteArray21[arg3 * 9 + 1] = (byte) (this.anInt1955 / 128 & 0x7F);
|
||||
this.aByteArray21[arg3 * 9 + 2] = (byte) (this.anInt1955 & 0x7F);
|
||||
this.aByteArray21[arg3 * 9 + 3] = (byte) (local138 - local134);
|
||||
this.aByteArray21[arg3 * 9 + 4] = (byte) (local140 - local136);
|
||||
this.aByteArray21[arg3 * 9 + 5] = (byte) local134;
|
||||
this.aByteArray21[arg3 * 9 + 6] = (byte) (local48 - local136);
|
||||
this.aByteArray21[arg3 * 9 + 7] = (byte) local5;
|
||||
this.aByteArray21[arg3 * 9 + 8] = (byte) local57;
|
||||
this.data[arg3 * 9] = (byte) (this.dataIndex / 16384);
|
||||
this.data[arg3 * 9 + 1] = (byte) (this.dataIndex / 128 & 0x7F);
|
||||
this.data[arg3 * 9 + 2] = (byte) (this.dataIndex & 0x7F);
|
||||
this.data[arg3 * 9 + 3] = (byte) (local138 - local134);
|
||||
this.data[arg3 * 9 + 4] = (byte) (local140 - local136);
|
||||
this.data[arg3 * 9 + 5] = (byte) local134;
|
||||
this.data[arg3 * 9 + 6] = (byte) (local48 - local136);
|
||||
this.data[arg3 * 9 + 7] = (byte) local5;
|
||||
this.data[arg3 * 9 + 8] = (byte) local57;
|
||||
for (local142 = local136; local142 < local140; local142++) {
|
||||
for (local147 = local134; local147 < local138; local147++) {
|
||||
local158 = local111[local147 + local142 * local3] & 0xFF;
|
||||
if (local158 > 30 && local158 < 230) {
|
||||
this.aBoolean112 = true;
|
||||
this.grayscale = true;
|
||||
}
|
||||
this.aByteArray21[this.anInt1955++] = (byte) local158;
|
||||
this.data[this.dataIndex++] = (byte) local158;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@OriginalMember(owner = "client!fd", name = "a", descriptor = "(Lclient!na;)I")
|
||||
private int method1510(@OriginalArg(0) JagString arg0) {
|
||||
private int getStringWidth(@OriginalArg(0) JagString arg0) {
|
||||
@Pc(1) int local1 = 0;
|
||||
for (@Pc(3) int local3 = 0; local3 < arg0.length(); local3++) {
|
||||
if (arg0.charAt(local3) == 64 && local3 + 4 < arg0.length() && arg0.charAt(local3 + 4) == 64) {
|
||||
|
|
@ -313,7 +313,7 @@ public final class WorldMapFont {
|
|||
} else if (arg0.charAt(local3) == 126 && local3 + 4 < arg0.length() && arg0.charAt(local3 + 4) == 126) {
|
||||
local3 += 4;
|
||||
} else {
|
||||
local1 += this.aByteArray21[anIntArray155[arg0.charAt(local3)] + 7];
|
||||
local1 += this.data[CHAR_INDEXES[arg0.charAt(local3)] + 7];
|
||||
}
|
||||
}
|
||||
return local1;
|
||||
|
|
@ -321,6 +321,6 @@ public final class WorldMapFont {
|
|||
|
||||
@OriginalMember(owner = "client!fd", name = "c", descriptor = "()I")
|
||||
public final int method1511() {
|
||||
return this.aByteArray21[6];
|
||||
return this.data[6];
|
||||
}
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue