diff --git a/mudclient/src/main/java/MudClient.java b/mudclient/src/main/java/MudClient.java index 52b8472..7fd920f 100644 --- a/mudclient/src/main/java/MudClient.java +++ b/mudclient/src/main/java/MudClient.java @@ -1310,11 +1310,11 @@ private void method496() { this.errorLoading = true; return; } - @Pc(48) byte[] local48 = Tools.readJag("fragmentsenc.txt", 0, local37); - @Pc(53) byte[] local53 = Tools.readJag("badenc.txt", 0, local37); - @Pc(58) byte[] local58 = Tools.readJag("hostenc.txt", 0, local37); - @Pc(63) byte[] local63 = Tools.readJag("tldlist.txt", 0, local37); - WordFilter.method321(new Packet(local48), new Packet(local53), new Packet(local58), new Packet(local63)); + @Pc(48) byte[] fragments = Tools.readJag("fragmentsenc.txt", 0, local37); + @Pc(53) byte[] bad = Tools.readJag("badenc.txt", 0, local37); + @Pc(58) byte[] host = Tools.readJag("hostenc.txt", 0, local37); + @Pc(63) byte[] tld = Tools.readJag("tldlist.txt", 0, local37); + WordFilter.read(new Packet(fragments), new Packet(bad), new Packet(host), new Packet(tld)); } @OriginalMember(owner = "mudclient!mudclient", name = "v", descriptor = "()V") @@ -1971,9 +1971,9 @@ private void method511() { this.drawArea.method368(26, local15, 460, 60, 0); this.drawArea.method369(26, local15, 460, 60, 16777215); @Pc(32) int local32 = local15 + 22; - this.drawArea.drawString("Please enter your question", 256, local32, 4, 16777215); + this.drawArea.drawStringCenter("Please enter your question", 256, local32, 4, 16777215); @Pc(41) int local41 = local32 + 25; - this.drawArea.drawString(super.aString27 + "*", 256, local41, 4, 16777215); + this.drawArea.drawStringCenter(super.aString27 + "*", 256, local41, 4, 16777215); } this.drawArea.method383(0, this.anInt386, this.anInt388 + 22); this.drawArea.method363(this.aGraphics5, 0, 0); @@ -2669,7 +2669,7 @@ protected void method486(@OriginalArg(0) String arg0, @OriginalArg(1) String arg @OriginalMember(owner = "mudclient!mudclient", name = "r", descriptor = "()V") @Override - protected void method490() { + protected void tryLogout() { this.anInt509 = 0; this.message("@cya@Sorry, you can't logout at the moment", 3); } @@ -3049,7 +3049,7 @@ private void method523() { local96 = WordPack.method353(local1307); this.method484(WordPack.aByteArray17, local96); local1307 = WordPack.method352(WordPack.aByteArray17, 0, local96); - local1307 = WordFilter.method327(local1307); + local1307 = WordFilter.filter(local1307); this.localPlayer.anInt300 = 150; this.localPlayer.aString21 = local1307; this.message(this.localPlayer.aString20 + ": " + local1307, 2); @@ -3669,7 +3669,7 @@ protected void method492(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @Or local1243 = arg2[local34]; local34++; if (local1214 != null) { - local1252 = WordFilter.method327(WordPack.method352(arg2, local34, local1243)); + local1252 = WordFilter.filter(WordPack.method352(arg2, local34, local1243)); @Pc(1254) boolean local1254 = false; for (local148 = 0; local148 < super.anInt365; local148++) { if (super.ignoreName37[local148] == local1214.aLong3) { @@ -4596,7 +4596,7 @@ private void method529() { private void method530() { if (this.anInt511 != 0) { this.drawArea.method373(); - this.drawArea.drawString("Oh dear! You are dead...", this.anInt385 / 2, this.anInt386 / 2, 7, 16711680); + this.drawArea.drawStringCenter("Oh dear! You are dead...", this.anInt385 / 2, this.anInt386 / 2, 7, 16711680); this.method532(); this.drawArea.method363(this.aGraphics5, 0, 0); } else if (this.aBoolean103) { @@ -4608,26 +4608,26 @@ private void method530() { } else if (this.aBoolean104) { this.drawArea.method373(); if (Math.random() < 0.15D) { - this.drawArea.drawString("ZZZ", (int) (Math.random() * 80.0D), (int) (Math.random() * 334.0D), 5, (int) (Math.random() * 1.6777215E7D)); + this.drawArea.drawStringCenter("ZZZ", (int) (Math.random() * 80.0D), (int) (Math.random() * 334.0D), 5, (int) (Math.random() * 1.6777215E7D)); } if (Math.random() < 0.15D) { - this.drawArea.drawString("ZZZ", 512 - (int) (Math.random() * 80.0D), (int) (Math.random() * 334.0D), 5, (int) (Math.random() * 1.6777215E7D)); + this.drawArea.drawStringCenter("ZZZ", 512 - (int) (Math.random() * 80.0D), (int) (Math.random() * 334.0D), 5, (int) (Math.random() * 1.6777215E7D)); } this.drawArea.method368(this.anInt385 / 2 - 100, 160, 200, 40, 0); - this.drawArea.drawString("You are sleeping", this.anInt385 / 2, 50, 7, 16776960); - this.drawArea.drawString("Fatigue: " + this.anInt448 * 100 / 750 + "%", this.anInt385 / 2, 90, 7, 16776960); - this.drawArea.drawString("When you want to wake up just use your", this.anInt385 / 2, 140, 5, 16777215); - this.drawArea.drawString("keyboard to type the word in the box below", this.anInt385 / 2, 160, 5, 16777215); - this.drawArea.drawString(super.aString25 + "*", this.anInt385 / 2, 180, 5, 65535); + this.drawArea.drawStringCenter("You are sleeping", this.anInt385 / 2, 50, 7, 16776960); + this.drawArea.drawStringCenter("Fatigue: " + this.anInt448 * 100 / 750 + "%", this.anInt385 / 2, 90, 7, 16776960); + this.drawArea.drawStringCenter("When you want to wake up just use your", this.anInt385 / 2, 140, 5, 16777215); + this.drawArea.drawStringCenter("keyboard to type the word in the box below", this.anInt385 / 2, 160, 5, 16777215); + this.drawArea.drawStringCenter(super.aString25 + "*", this.anInt385 / 2, 180, 5, 65535); if (this.aString43 == null) { this.drawArea.method383(this.anInt385 / 2 - 127, 230, this.anInt392 + 1); } else { - this.drawArea.drawString(this.aString43, this.anInt385 / 2, 260, 5, 16711680); + this.drawArea.drawStringCenter(this.aString43, this.anInt385 / 2, 260, 5, 16711680); } this.drawArea.method369(this.anInt385 / 2 - 128, 229, 257, 42, 16777215); this.method532(); - this.drawArea.drawString("If you can't read the word", this.anInt385 / 2, 290, 1, 16777215); - this.drawArea.drawString("@yel@click here@whi@ to get a different one", this.anInt385 / 2, 305, 1, 16777215); + this.drawArea.drawStringCenter("If you can't read the word", this.anInt385 / 2, 290, 1, 16777215); + this.drawArea.drawStringCenter("@yel@click here@whi@ to get a different one", this.anInt385 / 2, 305, 1, 16777215); this.drawArea.method363(this.aGraphics5, 0, 0); } else if (this.world.aBoolean55) { for (@Pc(271) int local271 = 0; local271 < 64; local271++) { @@ -4838,8 +4838,8 @@ private void method530() { if (local667 > 0) { local756 = local667 / 6 + 1; this.drawArea.method383(453, this.anInt386 - 56, this.anInt388 + 13); - this.drawArea.drawString("Wilderness", 465, this.anInt386 - 20, 1, 16776960); - this.drawArea.drawString("Level: " + local756, 465, this.anInt386 - 7, 1, 16776960); + this.drawArea.drawStringCenter("Wilderness", 465, this.anInt386 - 20, 1, 16776960); + this.drawArea.drawStringCenter("Level: " + local756, 465, this.anInt386 - 7, 1, 16776960); if (this.anInt512 == 0) { this.anInt512 = 2; } @@ -4852,7 +4852,7 @@ private void method530() { for (local667 = 0; local667 < this.anInt474; local667++) { if (this.anIntArray200[local667] > 0) { @Pc(1447) String local1447 = this.aStringArray35[local667]; - this.drawArea.drawStringTaggable(local1447, 7, this.anInt386 - local667 * 12 - 18, 1, 16776960); + this.drawArea.drawString(local1447, 7, this.anInt386 - local667 * 12 - 18, 1, 16776960); } } } @@ -4907,7 +4907,7 @@ private void method532() { if (this.anInt465 % 30 > 15) { local16 = PixMap.method375(255, 50, 50); } - this.drawArea.drawString("All messages", 54, this.anInt386 + 6, 0, local16); + this.drawArea.drawStringCenter("All messages", 54, this.anInt386 + 6, 0, local16); local16 = PixMap.method375(200, 200, 255); if (this.anInt473 == 1) { local16 = PixMap.method375(255, 200, 50); @@ -4915,7 +4915,7 @@ private void method532() { if (this.anInt466 % 30 > 15) { local16 = PixMap.method375(255, 50, 50); } - this.drawArea.drawString("Chat history", 155, this.anInt386 + 6, 0, local16); + this.drawArea.drawStringCenter("Chat history", 155, this.anInt386 + 6, 0, local16); local16 = PixMap.method375(200, 200, 255); if (this.anInt473 == 2) { local16 = PixMap.method375(255, 200, 50); @@ -4923,7 +4923,7 @@ private void method532() { if (this.anInt467 % 30 > 15) { local16 = PixMap.method375(255, 50, 50); } - this.drawArea.drawString("Quest history", 255, this.anInt386 + 6, 0, local16); + this.drawArea.drawStringCenter("Quest history", 255, this.anInt386 + 6, 0, local16); local16 = PixMap.method375(200, 200, 255); if (this.anInt473 == 3) { local16 = PixMap.method375(255, 200, 50); @@ -4931,8 +4931,8 @@ private void method532() { if (this.anInt468 % 30 > 15) { local16 = PixMap.method375(255, 50, 50); } - this.drawArea.drawString("Private history", 355, this.anInt386 + 6, 0, local16); - this.drawArea.drawString("Report abuse", 457, this.anInt386 + 6, 0, 16777215); + this.drawArea.drawStringCenter("Private history", 355, this.anInt386 + 6, 0, local16); + this.drawArea.drawStringCenter("Report abuse", 457, this.anInt386 + 6, 0, 16777215); } @OriginalMember(owner = "mudclient!mudclient", name = "a", descriptor = "(IIIIIII)V") @@ -5022,11 +5022,11 @@ public void method535(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @Origi } } if (local6.anInt300 > 0) { - this.anIntArray233[this.anInt558] = this.drawArea.method412(local6.aString21, 1) / 2; + this.anIntArray233[this.anInt558] = this.drawArea.stringWidth(local6.aString21, 1) / 2; if (this.anIntArray233[this.anInt558] > 150) { this.anIntArray233[this.anInt558] = 150; } - this.anIntArray234[this.anInt558] = this.drawArea.method412(local6.aString21, 1) / 300 * this.drawArea.method411(1); + this.anIntArray234[this.anInt558] = this.drawArea.stringWidth(local6.aString21, 1) / 300 * this.drawArea.method411(1); this.anIntArray231[this.anInt558] = arg0 + arg2 / 2; this.anIntArray232[this.anInt558] = arg1; this.aStringArray38[this.anInt558++] = local6.aString21; @@ -5056,7 +5056,7 @@ public void method535(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @Origi local155 = arg0 + arg6 * 10 / 100; } this.drawArea.method383(local155 + arg2 / 2 - 12, arg1 + arg3 / 2 - 12, this.anInt388 + 12); - this.drawArea.drawString(String.valueOf(local6.anInt303), local155 + arg2 / 2 - 1, arg1 + arg3 / 2 + 5, 3, 16777215); + this.drawArea.drawStringCenter(String.valueOf(local6.anInt303), local155 + arg2 / 2 - 1, arg1 + arg3 / 2 + 5, 3, 16777215); } @OriginalMember(owner = "mudclient!mudclient", name = "d", descriptor = "(IIIIIII)V") @@ -5151,11 +5151,11 @@ public void method536(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @Origi } } if (local6.anInt300 > 0) { - this.anIntArray233[this.anInt558] = this.drawArea.method412(local6.aString21, 1) / 2; + this.anIntArray233[this.anInt558] = this.drawArea.stringWidth(local6.aString21, 1) / 2; if (this.anIntArray233[this.anInt558] > 150) { this.anIntArray233[this.anInt558] = 150; } - this.anIntArray234[this.anInt558] = this.drawArea.method412(local6.aString21, 1) / 300 * this.drawArea.method411(1); + this.anIntArray234[this.anInt558] = this.drawArea.stringWidth(local6.aString21, 1) / 300 * this.drawArea.method411(1); this.anIntArray231[this.anInt558] = arg0 + arg2 / 2; this.anIntArray232[this.anInt558] = arg1; this.aStringArray38[this.anInt558++] = local6.aString21; @@ -5187,7 +5187,7 @@ public void method536(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @Origi local143 = arg0 + arg6 * 10 / 100; } this.drawArea.method383(local143 + arg2 / 2 - 12, arg1 + arg3 / 2 - 12, this.anInt388 + 11); - this.drawArea.drawString(String.valueOf(local6.anInt303), local143 + arg2 / 2 - 1, arg1 + arg3 / 2 + 5, 3, 16777215); + this.drawArea.drawStringCenter(String.valueOf(local6.anInt303), local143 + arg2 / 2 - 1, arg1 + arg3 / 2 + 5, 3, 16777215); } } if (local6.anInt317 != 1 || local6.anInt302 != 0) { @@ -5229,7 +5229,7 @@ private void method537() { } } this.anIntArray232[local3] = local20; - this.drawArea.method407(this.aStringArray38[local3], local15, local20, 1, 16776960, 300); + this.drawArea.centerParagraph(this.aStringArray38[local3], local15, local20, 1, 16776960, 300); } for (local10 = 0; local10 < this.anInt559; local10++) { local15 = this.anIntArray235[local10]; @@ -5398,7 +5398,7 @@ private boolean method547(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1) { this.world.aBoolean55 = true; return false; } - this.drawArea.drawString("Loading... Please wait", 256, 192, 1, 16777215); + this.drawArea.drawStringCenter("Loading... Please wait", 256, 192, 1, 16777215); this.method532(); this.drawArea.method363(this.aGraphics5, 0, 0); @Pc(70) int local70 = this.anInt410; @@ -5616,15 +5616,15 @@ private void method550() { if (this.anInt374 == 0) { for (local6 = 0; local6 < this.anInt499; local6++) { @Pc(65) int local65 = 65535; - if (super.mouseX < this.drawArea.method412(this.aStringArray36[local6], 1) && super.mouseY > local6 * 12 && super.mouseY < local6 * 12 + 12) { + if (super.mouseX < this.drawArea.stringWidth(this.aStringArray36[local6], 1) && super.mouseY > local6 * 12 && super.mouseY < local6 * 12 + 12) { local65 = 16711680; } - this.drawArea.drawStringTaggable(this.aStringArray36[local6], 6, local6 * 12 + 12, 1, local65); + this.drawArea.drawString(this.aStringArray36[local6], 6, local6 * 12 + 12, 1, local65); } return; } for (local6 = 0; local6 < this.anInt499; local6++) { - if (super.mouseX < this.drawArea.method412(this.aStringArray36[local6], 1) && super.mouseY > local6 * 12 && super.mouseY < local6 * 12 + 12) { + if (super.mouseX < this.drawArea.stringWidth(this.aStringArray36[local6], 1) && super.mouseY > local6 * 12 && super.mouseY < local6 * 12 + 12) { super.stream.p1spooky(237, 3); super.stream.p1(local6); super.stream.encryptPacket(); @@ -5662,11 +5662,11 @@ private void method551() { this.drawArea.method370(local3, local5 + local12 * 20, local7, 0); this.drawArea.method370(local3, local5 + local12 * 20 + 20, local7, 0); } - this.drawArea.drawString("Select combat style", local3 + local7 / 2, local5 + 16, 3, 16777215); - this.drawArea.drawString("Controlled (+1 of each)", local3 + local7 / 2, local5 + 36, 3, 0); - this.drawArea.drawString("Aggressive (+3 strength)", local3 + local7 / 2, local5 + 56, 3, 0); - this.drawArea.drawString("Accurate (+3 attack)", local3 + local7 / 2, local5 + 76, 3, 0); - this.drawArea.drawString("Defensive (+3 defense)", local3 + local7 / 2, local5 + 96, 3, 0); + this.drawArea.drawStringCenter("Select combat style", local3 + local7 / 2, local5 + 16, 3, 16777215); + this.drawArea.drawStringCenter("Controlled (+1 of each)", local3 + local7 / 2, local5 + 36, 3, 0); + this.drawArea.drawStringCenter("Aggressive (+3 strength)", local3 + local7 / 2, local5 + 56, 3, 0); + this.drawArea.drawStringCenter("Accurate (+3 attack)", local3 + local7 / 2, local5 + 76, 3, 0); + this.drawArea.drawStringCenter("Defensive (+3 defense)", local3 + local7 / 2, local5 + 96, 3, 0); } @OriginalMember(owner = "mudclient!mudclient", name = "bd", descriptor = "()V") @@ -5681,7 +5681,7 @@ private void method552() { this.drawArea.method368(56, 167 - local6 / 2, 400, local6, 0); this.drawArea.method369(56, 167 - local6 / 2, 400, local6, 16777215); @Pc(41) int local41 = local16 + 20; - this.drawArea.drawString("Welcome to RuneScape " + this.aString41, 256, local41, 4, 16776960); + this.drawArea.drawStringCenter("Welcome to RuneScape " + this.aString41, 256, local41, 4, 16776960); @Pc(57) int local57 = local41 + 30; @Pc(62) String local62; if (this.anInt506 <= 0) { @@ -5691,12 +5691,12 @@ private void method552() { } else { local62 = this.anInt506 + " days ago"; } - this.drawArea.drawString("You last logged in " + local62, 256, local57, 1, 16777215); + this.drawArea.drawStringCenter("You last logged in " + local62, 256, local57, 1, 16777215); local16 = local57 + 15; if (this.aString37 == null) { this.aString37 = this.getHostName(this.anInt505); } - this.drawArea.drawString("from: " + this.aString37, 256, local16, 1, 16777215); + this.drawArea.drawStringCenter("from: " + this.aString37, 256, local16, 1, 16777215); local16 += 15; local16 += 15; @Pc(191) int local191; @@ -5708,18 +5708,18 @@ private void method552() { } else { local62 = 14 - this.anInt507 + " days ago"; } - this.drawArea.drawString(local62 + " you changed your recovery questions", 256, local16, 1, 16744448); + this.drawArea.drawStringCenter(local62 + " you changed your recovery questions", 256, local16, 1, 16744448); local16 += 15; - this.drawArea.drawString("If you do not remember making this change then", 256, local16, 1, 16744448); + this.drawArea.drawStringCenter("If you do not remember making this change then", 256, local16, 1, 16744448); local16 += 15; - this.drawArea.drawString("cancel it and change your password immediately!", 256, local16, 1, 16744448); + this.drawArea.drawStringCenter("cancel it and change your password immediately!", 256, local16, 1, 16744448); local16 += 15; local16 += 15; local191 = 16777215; if (super.mouseY > local16 - 12 && super.mouseY <= local16 && super.mouseX > 106 && super.mouseX < 406) { local191 = 16711680; } - this.drawArea.drawString("No that wasn't me - Cancel the request!", 256, local16, 1, local191); + this.drawArea.drawStringCenter("No that wasn't me - Cancel the request!", 256, local16, 1, local191); if (local191 == 16711680 && this.anInt374 == 1) { super.stream.p1spooky(196, 651); super.stream.encryptPacket(); @@ -5730,7 +5730,7 @@ private void method552() { if (super.mouseY > local16 - 12 && super.mouseY <= local16 && super.mouseX > 106 && super.mouseX < 406) { local191 = 16711680; } - this.drawArea.drawString("That's ok, activate the new questions in " + this.anInt507 + " days time.", 256, local16, 1, local191); + this.drawArea.drawStringCenter("That's ok, activate the new questions in " + this.anInt507 + " days time.", 256, local16, 1, local191); if (local191 == 16711680 && this.anInt374 == 1) { this.aBoolean96 = false; } @@ -5739,7 +5739,7 @@ private void method552() { if (super.mouseY > local16 - 12 && super.mouseY <= local16 && super.mouseX > 106 && super.mouseX < 406) { local191 = 16711680; } - this.drawArea.drawString("Click here to close window", 256, local16, 1, local191); + this.drawArea.drawStringCenter("Click here to close window", 256, local16, 1, local191); if (this.anInt374 == 1) { if (local191 == 16711680) { this.aBoolean96 = false; @@ -5761,13 +5761,13 @@ private void method553() { } this.drawArea.method368(256 - local1 / 2, 167 - local3 / 2, local1, local3, 0); this.drawArea.method369(256 - local1 / 2, 167 - local3 / 2, local1, local3, 16777215); - this.drawArea.method407(this.aString38, 256, 167 + 20 - local3 / 2, 1, 16777215, local1 - 40); + this.drawArea.centerParagraph(this.aString38, 256, 167 + 20 - local3 / 2, 1, 16777215, local1 - 40); @Pc(66) int local66 = local3 / 2 + 157; @Pc(68) int local68 = 16777215; if (super.mouseY > local66 - 12 && super.mouseY <= local66 && super.mouseX > 106 && super.mouseX < 406) { local68 = 16711680; } - this.drawArea.drawString("Click here to close window", 256, local66, 1, local68); + this.drawArea.drawStringCenter("Click here to close window", 256, local66, 1, local68); if (this.anInt374 == 1) { if (local68 == 16711680) { this.aBoolean98 = false; @@ -5783,7 +5783,7 @@ private void method553() { private void method554() { this.drawArea.method368(126, 137, 260, 60, 0); this.drawArea.method369(126, 137, 260, 60, 16777215); - this.drawArea.drawString("Logging out...", 256, 173, 5, 16777215); + this.drawArea.drawStringCenter("Logging out...", 256, 173, 5, 16777215); } @OriginalMember(owner = "mudclient!mudclient", name = "bg", descriptor = "()V") @@ -5791,27 +5791,27 @@ private void method555() { @Pc(1) byte local1 = 97; this.drawArea.method368(86, 77, 340, 180, 0); this.drawArea.method369(86, 77, 340, 180, 16777215); - this.drawArea.drawString("Warning! Proceed with caution", 256, local1, 4, 16711680); + this.drawArea.drawStringCenter("Warning! Proceed with caution", 256, local1, 4, 16711680); @Pc(26) int local26 = local1 + 26; - this.drawArea.drawString("If you go much further north you will enter the", 256, local26, 1, 16777215); + this.drawArea.drawStringCenter("If you go much further north you will enter the", 256, local26, 1, 16777215); @Pc(35) int local35 = local26 + 13; - this.drawArea.drawString("wilderness. This a very dangerous area where", 256, local35, 1, 16777215); + this.drawArea.drawStringCenter("wilderness. This a very dangerous area where", 256, local35, 1, 16777215); @Pc(44) int local44 = local35 + 13; - this.drawArea.drawString("other players can attack you!", 256, local44, 1, 16777215); + this.drawArea.drawStringCenter("other players can attack you!", 256, local44, 1, 16777215); @Pc(53) int local53 = local44 + 22; - this.drawArea.drawString("The further north you go the more dangerous it", 256, local53, 1, 16777215); + this.drawArea.drawStringCenter("The further north you go the more dangerous it", 256, local53, 1, 16777215); @Pc(62) int local62 = local53 + 13; - this.drawArea.drawString("becomes, but the more treasure you will find.", 256, local62, 1, 16777215); + this.drawArea.drawStringCenter("becomes, but the more treasure you will find.", 256, local62, 1, 16777215); @Pc(71) int local71 = local62 + 22; - this.drawArea.drawString("In the wilderness an indicator at the bottom-right", 256, local71, 1, 16777215); + this.drawArea.drawStringCenter("In the wilderness an indicator at the bottom-right", 256, local71, 1, 16777215); @Pc(80) int local80 = local71 + 13; - this.drawArea.drawString("of the screen will show the current level of danger", 256, local80, 1, 16777215); + this.drawArea.drawStringCenter("of the screen will show the current level of danger", 256, local80, 1, 16777215); @Pc(89) int local89 = local80 + 22; @Pc(91) int local91 = 16777215; if (super.mouseY > local89 - 12 && super.mouseY <= local89 && super.mouseX > 181 && super.mouseX < 331) { local91 = 16711680; } - this.drawArea.drawString("Click here to close window", 256, local89, 1, local91); + this.drawArea.drawStringCenter("Click here to close window", 256, local89, 1, local91); if (this.anInt374 == 0) { return; } @@ -5864,16 +5864,16 @@ private void method556() { this.drawArea.method368(56, 35, 400, 290, 0); this.drawArea.method369(56, 35, 400, 290, 16777215); @Pc(145) byte local145 = 50; - this.drawArea.drawString("This form sends a snapshot of the last 60 secs of trade/chat", 256, local145, 1, 16777215); + this.drawArea.drawStringCenter("This form sends a snapshot of the last 60 secs of trade/chat", 256, local145, 1, 16777215); local29 = local145 + 15; - this.drawArea.drawString("to customer support. Please only use this for serious abuse", 256, local29, 1, 16777215); + this.drawArea.drawStringCenter("to customer support. Please only use this for serious abuse", 256, local29, 1, 16777215); local29 += 15; - this.drawArea.drawString("If you misuse this form, you will be banned.", 256, local29, 1, 16744448); + this.drawArea.drawStringCenter("If you misuse this form, you will be banned.", 256, local29, 1, 16744448); local29 += 15; - this.drawArea.drawString("Do not report abuse unless you were genuinely offended", 256, local29, 1, 16744448); + this.drawArea.drawStringCenter("Do not report abuse unless you were genuinely offended", 256, local29, 1, 16744448); local29 += 15; local29 += 15; - this.drawArea.drawString("First indicate the type of abuse", 256, local29, 1, 16776960); + this.drawArea.drawStringCenter("First indicate the type of abuse", 256, local29, 1, 16776960); local29 += 15; if (this.anInt503 == 0) { this.drawArea.method369(66, local29 - 12, 380, 15, 16777215); @@ -5881,7 +5881,7 @@ private void method556() { } else { local31 = 16777215; } - this.drawArea.drawString("Non-vulgar insult such as 'idiot', 'noob', 'loser', etc...", 256, local29, 1, local31); + this.drawArea.drawStringCenter("Non-vulgar insult such as 'idiot', 'noob', 'loser', etc...", 256, local29, 1, local31); local29 += 15; if (this.anInt503 == 1) { this.drawArea.method369(66, local29 - 12, 380, 15, 16777215); @@ -5889,7 +5889,7 @@ private void method556() { } else { local31 = 16777215; } - this.drawArea.drawString("Swearing, profanity, or racial abuse directed at me personally", 256, local29, 1, local31); + this.drawArea.drawStringCenter("Swearing, profanity, or racial abuse directed at me personally", 256, local29, 1, local31); local29 += 15; if (this.anInt503 == 2) { this.drawArea.method369(66, local29 - 12, 380, 15, 16777215); @@ -5897,7 +5897,7 @@ private void method556() { } else { local31 = 16777215; } - this.drawArea.drawString("I overheard the player being abusive to someone else", 256, local29, 1, local31); + this.drawArea.drawStringCenter("I overheard the player being abusive to someone else", 256, local29, 1, local31); local29 += 15; if (this.anInt503 == 3) { this.drawArea.method369(66, local29 - 12, 380, 15, 16777215); @@ -5905,7 +5905,7 @@ private void method556() { } else { local31 = 16777215; } - this.drawArea.drawString("Trade scam - lied about trade to steal items from me", 256, local29, 1, local31); + this.drawArea.drawStringCenter("Trade scam - lied about trade to steal items from me", 256, local29, 1, local31); local29 += 15; if (this.anInt503 == 4) { this.drawArea.method369(66, local29 - 12, 380, 15, 16777215); @@ -5913,7 +5913,7 @@ private void method556() { } else { local31 = 16777215; } - this.drawArea.drawString("Asking players for their password / trying to steal accounts", 256, local29, 1, local31); + this.drawArea.drawStringCenter("Asking players for their password / trying to steal accounts", 256, local29, 1, local31); local29 += 15; if (this.anInt503 == 5) { this.drawArea.method369(66, local29 - 12, 380, 15, 16777215); @@ -5921,7 +5921,7 @@ private void method556() { } else { local31 = 16777215; } - this.drawArea.drawString("Attempting to buy/sell a RuneScape account", 256, local29, 1, local31); + this.drawArea.drawStringCenter("Attempting to buy/sell a RuneScape account", 256, local29, 1, local31); local29 += 15; if (this.anInt503 == 6) { this.drawArea.method369(66, local29 - 12, 380, 15, 16777215); @@ -5929,7 +5929,7 @@ private void method556() { } else { local31 = 16777215; } - this.drawArea.drawString("Impersonating Jagex staff", 256, local29, 1, local31); + this.drawArea.drawStringCenter("Impersonating Jagex staff", 256, local29, 1, local31); local29 += 15; if (this.anInt503 == 7) { this.drawArea.method369(66, local29 - 12, 380, 15, 16777215); @@ -5937,7 +5937,7 @@ private void method556() { } else { local31 = 16777215; } - this.drawArea.drawString("Advertising scam website", 256, local29, 1, local31); + this.drawArea.drawStringCenter("Advertising scam website", 256, local29, 1, local31); local29 += 15; if (this.anInt503 == 8) { this.drawArea.method369(66, local29 - 12, 380, 15, 16777215); @@ -5945,18 +5945,18 @@ private void method556() { } else { local31 = 16777215; } - this.drawArea.drawString("Other", 256, local29, 1, local31); + this.drawArea.drawStringCenter("Other", 256, local29, 1, local31); local29 += 15; local29 += 11; - this.drawArea.drawString("Then type the name of the offending player, and press enter", 256, local29, 1, 16776960); + this.drawArea.drawStringCenter("Then type the name of the offending player, and press enter", 256, local29, 1, 16776960); local29 += 15; - this.drawArea.drawString("Name: " + super.aString25 + "*", 256, local29, 4, 16777215); + this.drawArea.drawStringCenter("Name: " + super.aString25 + "*", 256, local29, 4, 16777215); local29 += 19; local31 = 16777215; if (super.mouseX > 196 && super.mouseX < 316 && super.mouseY > local29 - 15 && super.mouseY < local29 + 5) { local31 = 16776960; } - this.drawArea.drawString("Click here to cancel", 256, local29, 1, local31); + this.drawArea.drawStringCenter("Click here to cancel", 256, local29, 1, local31); } @OriginalMember(owner = "mudclient!mudclient", name = "bi", descriptor = "()V") @@ -5975,13 +5975,13 @@ private void method557() { @Pc(61) String local61; @Pc(63) int local63; if (this.anInt504 == 6) { - this.drawArea.drawString("Please enter your current password", 256, local46, 4, 16777215); + this.drawArea.drawStringCenter("Please enter your current password", 256, local46, 4, 16777215); local46 += 25; local61 = "*"; for (local63 = 0; local63 < super.aString25.length(); local63++) { local61 = "X" + local61; } - this.drawArea.drawString(local61, 256, local46, 4, 16777215); + this.drawArea.drawStringCenter(local61, 256, local46, 4, 16777215); if (super.aString26.length() > 0) { this.aString35 = super.aString26; super.aString25 = ""; @@ -5990,13 +5990,13 @@ private void method557() { return; } } else if (this.anInt504 == 1) { - this.drawArea.drawString("Please enter your new password", 256, local46, 4, 16777215); + this.drawArea.drawStringCenter("Please enter your new password", 256, local46, 4, 16777215); local46 += 25; local61 = "*"; for (local63 = 0; local63 < super.aString25.length(); local63++) { local61 = "X" + local61; } - this.drawArea.drawString(local61, 256, local46, 4, 16777215); + this.drawArea.drawStringCenter(local61, 256, local46, 4, 16777215); if (super.aString26.length() > 0) { this.aString36 = super.aString26; super.aString25 = ""; @@ -6011,13 +6011,13 @@ private void method557() { } } } else if (this.anInt504 == 2) { - this.drawArea.drawString("Enter password again to confirm", 256, local46, 4, 16777215); + this.drawArea.drawStringCenter("Enter password again to confirm", 256, local46, 4, 16777215); local46 += 25; local61 = "*"; for (local63 = 0; local63 < super.aString25.length(); local63++) { local61 = "X" + local61; } - this.drawArea.drawString(local61, 256, local46, 4, 16777215); + this.drawArea.drawStringCenter(local61, 256, local46, 4, 16777215); if (super.aString26.length() > 0) { if (super.aString26.equalsIgnoreCase(this.aString36)) { this.anInt504 = 4; @@ -6028,24 +6028,24 @@ private void method557() { return; } } else if (this.anInt504 == 3) { - this.drawArea.drawString("Passwords do not match!", 256, local46, 4, 16777215); + this.drawArea.drawStringCenter("Passwords do not match!", 256, local46, 4, 16777215); local46 += 25; - this.drawArea.drawString("Press any key to close", 256, local46, 4, 16777215); + this.drawArea.drawStringCenter("Press any key to close", 256, local46, 4, 16777215); return; } else if (this.anInt504 == 4) { - this.drawArea.drawString("Ok, your request has been sent", 256, local46, 4, 16777215); + this.drawArea.drawStringCenter("Ok, your request has been sent", 256, local46, 4, 16777215); local46 += 25; - this.drawArea.drawString("Press any key to close", 256, local46, 4, 16777215); + this.drawArea.drawStringCenter("Press any key to close", 256, local46, 4, 16777215); return; } else if (this.anInt504 == 5) { - this.drawArea.drawString("Password must be at", 256, local46, 4, 16777215); + this.drawArea.drawStringCenter("Password must be at", 256, local46, 4, 16777215); local46 += 25; - this.drawArea.drawString("least 5 letters long", 256, local46, 4, 16777215); + this.drawArea.drawStringCenter("least 5 letters long", 256, local46, 4, 16777215); return; } else if (this.anInt504 == 7) { - this.drawArea.drawString("Your password must not be", 256, local46, 4, 16777215); + this.drawArea.drawStringCenter("Your password must not be", 256, local46, 4, 16777215); local46 += 25; - this.drawArea.drawString("the same as your username", 256, local46, 4, 16777215); + this.drawArea.drawStringCenter("the same as your username", 256, local46, 4, 16777215); } } @@ -6079,9 +6079,9 @@ private void method558() { this.drawArea.method368(106, local99, 300, 70, 0); this.drawArea.method369(106, local99, 300, 70, 16777215); local99 += 20; - this.drawArea.drawString("Enter name to add to friends list", 256, local99, 4, 16777215); + this.drawArea.drawStringCenter("Enter name to add to friends list", 256, local99, 4, 16777215); local99 += 20; - this.drawArea.drawString(super.aString25 + "*", 256, local99, 4, 16777215); + this.drawArea.drawStringCenter(super.aString25 + "*", 256, local99, 4, 16777215); if (super.aString26.length() > 0) { local153 = super.aString26.trim(); super.aString25 = ""; @@ -6096,9 +6096,9 @@ private void method558() { this.drawArea.method368(6, local99, 500, 70, 0); this.drawArea.method369(6, local99, 500, 70, 16777215); local99 += 20; - this.drawArea.drawString("Enter message to send to " + Tools.fromBase37(this.aLong5), 256, local99, 4, 16777215); + this.drawArea.drawStringCenter("Enter message to send to " + Tools.fromBase37(this.aLong5), 256, local99, 4, 16777215); local99 += 20; - this.drawArea.drawString(super.aString27 + "*", 256, local99, 4, 16777215); + this.drawArea.drawStringCenter(super.aString27 + "*", 256, local99, 4, 16777215); if (super.aString28.length() > 0) { local153 = super.aString28; super.aString27 = ""; @@ -6107,7 +6107,7 @@ private void method558() { @Pc(248) int local248 = WordPack.method353(local153); this.method483(this.aLong5, WordPack.aByteArray17, local248); local153 = WordPack.method352(WordPack.aByteArray17, 0, local248); - local153 = WordFilter.method327(local153); + local153 = WordFilter.filter(local153); this.method493("@pri@You tell " + Tools.fromBase37(this.aLong5) + ": " + local153); } } @@ -6115,9 +6115,9 @@ private void method558() { this.drawArea.method368(106, local99, 300, 70, 0); this.drawArea.method369(106, local99, 300, 70, 16777215); local99 += 20; - this.drawArea.drawString("Enter name to add to ignore list", 256, local99, 4, 16777215); + this.drawArea.drawStringCenter("Enter name to add to ignore list", 256, local99, 4, 16777215); local99 += 20; - this.drawArea.drawString(super.aString25 + "*", 256, local99, 4, 16777215); + this.drawArea.drawStringCenter(super.aString25 + "*", 256, local99, 4, 16777215); if (super.aString26.length() > 0) { local153 = super.aString26.trim(); super.aString25 = ""; @@ -6132,7 +6132,7 @@ private void method558() { if (super.mouseX > 236 && super.mouseX < 276 && super.mouseY > 193 && super.mouseY < 213) { local355 = 16776960; } - this.drawArea.drawString("Cancel", 256, 208, 1, local355); + this.drawArea.drawStringCenter("Cancel", 256, 208, 1, local355); } @OriginalMember(owner = "mudclient!mudclient", name = "bk", descriptor = "()V") @@ -6287,7 +6287,7 @@ private void method559() { this.drawArea.method366(local81, local90 + 29, 8, 204, local106, 160); this.drawArea.method366(local81 + 399, local90 + 29, 9, 204, local106, 160); this.drawArea.method366(local81, local90 + 233, 408, 47, local106, 160); - this.drawArea.drawStringTaggable("Bank", local81 + 1, local90 + 10, 1, 16777215); + this.drawArea.drawString("Bank", local81 + 1, local90 + 10, 1, 16777215); local108 = 50; if (this.anInt494 > 48) { local112 = 16777215; @@ -6296,7 +6296,7 @@ private void method559() { } else if (super.mouseX > local81 + local108 && super.mouseY >= local90 && super.mouseX < local81 + local108 + 65 && super.mouseY < local90 + 12) { local112 = 16776960; } - this.drawArea.drawStringTaggable("", local81 + local108, local90 + 10, 1, local112); + this.drawArea.drawString("", local81 + local108, local90 + 10, 1, local112); local108 += 65; local112 = 16777215; if (this.anInt498 == 1) { @@ -6304,7 +6304,7 @@ private void method559() { } else if (super.mouseX > local81 + local108 && super.mouseY >= local90 && super.mouseX < local81 + local108 + 65 && super.mouseY < local90 + 12) { local112 = 16776960; } - this.drawArea.drawStringTaggable("", local81 + local108, local90 + 10, 1, local112); + this.drawArea.drawString("", local81 + local108, local90 + 10, 1, local112); local108 += 65; } if (this.anInt494 > 96) { @@ -6314,7 +6314,7 @@ private void method559() { } else if (super.mouseX > local81 + local108 && super.mouseY >= local90 && super.mouseX < local81 + local108 + 65 && super.mouseY < local90 + 12) { local112 = 16776960; } - this.drawArea.drawStringTaggable("", local81 + local108, local90 + 10, 1, local112); + this.drawArea.drawString("", local81 + local108, local90 + 10, 1, local112); local108 += 65; } if (this.anInt494 > 144) { @@ -6324,16 +6324,16 @@ private void method559() { } else if (super.mouseX > local81 + local108 && super.mouseY >= local90 && super.mouseX < local81 + local108 + 65 && super.mouseY < local90 + 12) { local112 = 16776960; } - this.drawArea.drawStringTaggable("", local81 + local108, local90 + 10, 1, local112); + this.drawArea.drawString("", local81 + local108, local90 + 10, 1, local112); local108 += 65; } local112 = 16777215; if (super.mouseX > local81 + 320 && super.mouseY >= local90 && super.mouseX < local81 + 408 && super.mouseY < local90 + 12) { local112 = 16711680; } - this.drawArea.method405("Close window", local81 + 406, local90 + 10, 1, local112); - this.drawArea.drawStringTaggable("Number in bank in green", local81 + 7, local90 + 24, 1, 65280); - this.drawArea.drawStringTaggable("Number held in blue", local81 + 289, local90 + 24, 1, 65535); + this.drawArea.drawStringRight("Close window", local81 + 406, local90 + 10, 1, local112); + this.drawArea.drawString("Number in bank in green", local81 + 7, local90 + 24, 1, 65280); + this.drawArea.drawString("Number held in blue", local81 + 289, local90 + 24, 1, 65535); local120 = 13684944; local126 = this.anInt498 * 48; @Pc(1192) int local1192; @@ -6349,15 +6349,15 @@ private void method559() { this.drawArea.method369(local1202, local1210, 50, 35, 0); if (local126 < this.anInt494 && this.anIntArray222[local126] != -1) { this.drawArea.method399(local1202, local1210, 48, 32, this.anInt390 + ClientConfig.objSprite[this.anIntArray222[local126]], ClientConfig.objSpriteMask[this.anIntArray222[local126]], 0, 0, false); - this.drawArea.drawStringTaggable(String.valueOf(this.anIntArray223[local126]), local1202 + 1, local1210 + 10, 1, 65280); - this.drawArea.method405(String.valueOf(this.method538(this.anIntArray222[local126])), local1202 + 47, local1210 + 29, 1, 65535); + this.drawArea.drawString(String.valueOf(this.anIntArray223[local126]), local1202 + 1, local1210 + 10, 1, 65280); + this.drawArea.drawStringRight(String.valueOf(this.method538(this.anIntArray222[local126])), local1202 + 47, local1210 + 29, 1, 65535); } local126++; } } this.drawArea.method370(local81 + 5, local90 + 256, 398, 0); if (this.anInt495 == -1) { - this.drawArea.drawString("Select an object to withdraw or deposit", local81 + 204, local90 + 248, 3, 16776960); + this.drawArea.drawStringCenter("Select an object to withdraw or deposit", local81 + 204, local90 + 248, 3, 16776960); return; } if (this.anInt495 < 0) { @@ -6373,84 +6373,84 @@ private void method559() { local126 = 1; } if (local126 > 0) { - this.drawArea.drawStringTaggable("Withdraw " + ClientConfig.objName[local1192], local81 + 2, local90 + 248, 1, 16777215); + this.drawArea.drawString("Withdraw " + ClientConfig.objName[local1192], local81 + 2, local90 + 248, 1, 16777215); local112 = 16777215; if (super.mouseX >= local81 + 220 && super.mouseY >= local90 + 238 && super.mouseX < local81 + 250 && super.mouseY <= local90 + 249) { local112 = 16711680; } - this.drawArea.drawStringTaggable("One", local81 + 222, local90 + 248, 1, local112); + this.drawArea.drawString("One", local81 + 222, local90 + 248, 1, local112); if (local126 >= 5) { local112 = 16777215; if (super.mouseX >= local81 + 250 && super.mouseY >= local90 + 238 && super.mouseX < local81 + 280 && super.mouseY <= local90 + 249) { local112 = 16711680; } - this.drawArea.drawStringTaggable("Five", local81 + 252, local90 + 248, 1, local112); + this.drawArea.drawString("Five", local81 + 252, local90 + 248, 1, local112); } if (local126 >= 25) { local112 = 16777215; if (super.mouseX >= local81 + 280 && super.mouseY >= local90 + 238 && super.mouseX < local81 + 305 && super.mouseY <= local90 + 249) { local112 = 16711680; } - this.drawArea.drawStringTaggable("25", local81 + 282, local90 + 248, 1, local112); + this.drawArea.drawString("25", local81 + 282, local90 + 248, 1, local112); } if (local126 >= 100) { local112 = 16777215; if (super.mouseX >= local81 + 305 && super.mouseY >= local90 + 238 && super.mouseX < local81 + 335 && super.mouseY <= local90 + 249) { local112 = 16711680; } - this.drawArea.drawStringTaggable("100", local81 + 307, local90 + 248, 1, local112); + this.drawArea.drawString("100", local81 + 307, local90 + 248, 1, local112); } if (local126 >= 500) { local112 = 16777215; if (super.mouseX >= local81 + 335 && super.mouseY >= local90 + 238 && super.mouseX < local81 + 368 && super.mouseY <= local90 + 249) { local112 = 16711680; } - this.drawArea.drawStringTaggable("500", local81 + 337, local90 + 248, 1, local112); + this.drawArea.drawString("500", local81 + 337, local90 + 248, 1, local112); } if (local126 >= 2500) { local112 = 16777215; if (super.mouseX >= local81 + 370 && super.mouseY >= local90 + 238 && super.mouseX < local81 + 400 && super.mouseY <= local90 + 249) { local112 = 16711680; } - this.drawArea.drawStringTaggable("2500", local81 + 370, local90 + 248, 1, local112); + this.drawArea.drawString("2500", local81 + 370, local90 + 248, 1, local112); } } if (this.method538(local1192) <= 0) { return; } - this.drawArea.drawStringTaggable("Deposit " + ClientConfig.objName[local1192], local81 + 2, local90 + 273, 1, 16777215); + this.drawArea.drawString("Deposit " + ClientConfig.objName[local1192], local81 + 2, local90 + 273, 1, 16777215); local112 = 16777215; if (super.mouseX >= local81 + 220 && super.mouseY >= local90 + 263 && super.mouseX < local81 + 250 && super.mouseY <= local90 + 274) { local112 = 16711680; } - this.drawArea.drawStringTaggable("One", local81 + 222, local90 + 273, 1, local112); + this.drawArea.drawString("One", local81 + 222, local90 + 273, 1, local112); if (this.method538(local1192) >= 5) { local112 = 16777215; if (super.mouseX >= local81 + 250 && super.mouseY >= local90 + 263 && super.mouseX < local81 + 280 && super.mouseY <= local90 + 274) { local112 = 16711680; } - this.drawArea.drawStringTaggable("Five", local81 + 252, local90 + 273, 1, local112); + this.drawArea.drawString("Five", local81 + 252, local90 + 273, 1, local112); } if (this.method538(local1192) >= 25) { local112 = 16777215; if (super.mouseX >= local81 + 280 && super.mouseY >= local90 + 263 && super.mouseX < local81 + 305 && super.mouseY <= local90 + 274) { local112 = 16711680; } - this.drawArea.drawStringTaggable("25", local81 + 282, local90 + 273, 1, local112); + this.drawArea.drawString("25", local81 + 282, local90 + 273, 1, local112); } if (this.method538(local1192) >= 100) { local112 = 16777215; if (super.mouseX >= local81 + 305 && super.mouseY >= local90 + 263 && super.mouseX < local81 + 335 && super.mouseY <= local90 + 274) { local112 = 16711680; } - this.drawArea.drawStringTaggable("100", local81 + 307, local90 + 273, 1, local112); + this.drawArea.drawString("100", local81 + 307, local90 + 273, 1, local112); } if (this.method538(local1192) >= 500) { local112 = 16777215; if (super.mouseX >= local81 + 335 && super.mouseY >= local90 + 263 && super.mouseX < local81 + 368 && super.mouseY <= local90 + 274) { local112 = 16711680; } - this.drawArea.drawStringTaggable("500", local81 + 337, local90 + 273, 1, local112); + this.drawArea.drawString("500", local81 + 337, local90 + 273, 1, local112); } if (this.method538(local1192) < 2500) { return; @@ -6459,7 +6459,7 @@ private void method559() { if (super.mouseX >= local81 + 370 && super.mouseY >= local90 + 263 && super.mouseX < local81 + 400 && super.mouseY <= local90 + 274) { local112 = 16711680; } - this.drawArea.drawStringTaggable("2500", local81 + 370, local90 + 273, 1, local112); + this.drawArea.drawString("2500", local81 + 370, local90 + 273, 1, local112); } @OriginalMember(owner = "mudclient!mudclient", name = "bl", descriptor = "()V") @@ -6527,15 +6527,15 @@ private void method560() { this.drawArea.method366(local236, local238 + 29, 8, 170, local30, 160); this.drawArea.method366(local236 + 399, local238 + 29, 9, 170, local30, 160); this.drawArea.method366(local236, local238 + 199, 408, 47, local30, 160); - this.drawArea.drawStringTaggable("Buying and selling items", local236 + 1, local238 + 10, 1, 16777215); + this.drawArea.drawString("Buying and selling items", local236 + 1, local238 + 10, 1, 16777215); local32 = 16777215; if (super.mouseX > local236 + 320 && super.mouseY >= local238 && super.mouseX < local236 + 408 && super.mouseY < local238 + 12) { local32 = 16711680; } - this.drawArea.method405("Close window", local236 + 406, local238 + 10, 1, local32); - this.drawArea.drawStringTaggable("Shops stock in green", local236 + 2, local238 + 24, 1, 65280); - this.drawArea.drawStringTaggable("Number you own in blue", local236 + 135, local238 + 24, 1, 65535); - this.drawArea.drawStringTaggable("Your money: " + this.method538(10) + "gp", local236 + 280, local238 + 24, 1, 16776960); + this.drawArea.drawStringRight("Close window", local236 + 406, local238 + 10, 1, local32); + this.drawArea.drawString("Shops stock in green", local236 + 2, local238 + 24, 1, 65280); + this.drawArea.drawString("Number you own in blue", local236 + 135, local238 + 24, 1, 65535); + this.drawArea.drawString("Your money: " + this.method538(10) + "gp", local236 + 280, local238 + 24, 1, 16776960); local36 = 13684944; local44 = 0; @Pc(400) int local400; @@ -6553,15 +6553,15 @@ private void method560() { this.drawArea.method369(local410, local418, 50, 35, 0); if (this.anIntArray217[local44] != -1) { this.drawArea.method399(local410, local418, 48, 32, this.anInt390 + ClientConfig.objSprite[this.anIntArray217[local44]], ClientConfig.objSpriteMask[this.anIntArray217[local44]], 0, 0, false); - this.drawArea.drawStringTaggable(String.valueOf(this.anIntArray218[local44]), local410 + 1, local418 + 10, 1, 65280); - this.drawArea.method405(String.valueOf(this.method538(this.anIntArray217[local44])), local410 + 47, local418 + 10, 1, 65535); + this.drawArea.drawString(String.valueOf(this.anIntArray218[local44]), local410 + 1, local418 + 10, 1, 65280); + this.drawArea.drawStringRight(String.valueOf(this.method538(this.anIntArray217[local44])), local410 + 47, local418 + 10, 1, 65535); } local44++; } } this.drawArea.method370(local236 + 5, local238 + 222, 398, 0); if (this.anInt491 == -1) { - this.drawArea.drawString("Select an object to buy or sell", local236 + 204, local238 + 214, 3, 16776960); + this.drawArea.drawStringCenter("Select an object to buy or sell", local236 + 204, local238 + 214, 3, 16776960); return; } local400 = this.anIntArray217[this.anInt491]; @@ -6574,14 +6574,14 @@ private void method560() { local410 = 10; } local418 = local410 * ClientConfig.objCost[local400] / 100; - this.drawArea.drawStringTaggable("Buy a new " + ClientConfig.objName[local400] + " for " + local418 + "gp", local236 + 2, local238 + 214, 1, 16776960); + this.drawArea.drawString("Buy a new " + ClientConfig.objName[local400] + " for " + local418 + "gp", local236 + 2, local238 + 214, 1, 16776960); local32 = 16777215; if (super.mouseX > local236 + 298 && super.mouseY >= local238 + 204 && super.mouseX < local236 + 408 && super.mouseY <= local238 + 215) { local32 = 16711680; } - this.drawArea.method405("Click here to buy", local236 + 405, local238 + 214, 3, local32); + this.drawArea.drawStringRight("Click here to buy", local236 + 405, local238 + 214, 3, local32); } else { - this.drawArea.drawString("This item is not currently available to buy", local236 + 204, local238 + 214, 3, 16776960); + this.drawArea.drawStringCenter("This item is not currently available to buy", local236 + 204, local238 + 214, 3, 16776960); } if (this.method538(local400) > 0) { local410 = this.anInt489 + this.anIntArray219[this.anInt491]; @@ -6589,15 +6589,15 @@ private void method560() { local410 = 10; } local418 = local410 * ClientConfig.objCost[local400] / 100; - this.drawArea.method405("Sell your " + ClientConfig.objName[local400] + " for " + local418 + "gp", local236 + 405, local238 + 239, 1, 16776960); + this.drawArea.drawStringRight("Sell your " + ClientConfig.objName[local400] + " for " + local418 + "gp", local236 + 405, local238 + 239, 1, 16776960); local32 = 16777215; if (super.mouseX > local236 + 2 && super.mouseY >= local238 + 229 && super.mouseX < local236 + 112 && super.mouseY <= local238 + 240) { local32 = 16711680; } - this.drawArea.drawStringTaggable("Click here to sell", local236 + 2, local238 + 239, 3, local32); + this.drawArea.drawString("Click here to sell", local236 + 2, local238 + 239, 3, local32); return; } - this.drawArea.drawString("You do not have any of this item to sell", local236 + 204, local238 + 239, 3, 16776960); + this.drawArea.drawStringCenter("You do not have any of this item to sell", local236 + 204, local238 + 239, 3, 16776960); } @OriginalMember(owner = "mudclient!mudclient", name = "bm", descriptor = "()V") @@ -6607,34 +6607,34 @@ private void method561() { this.drawArea.method368(local3, local5, 468, 16, 192); @Pc(15) int local15 = 10000536; this.drawArea.method366(local3, local5 + 16, 468, 246, local15, 160); - this.drawArea.drawString("Please confirm your trade with @yel@" + Tools.fromBase37(this.aLong7), local3 + 234, local5 + 12, 1, 16777215); - this.drawArea.drawString("You are about to give:", local3 + 117, local5 + 30, 1, 16776960); + this.drawArea.drawStringCenter("Please confirm your trade with @yel@" + Tools.fromBase37(this.aLong7), local3 + 234, local5 + 12, 1, 16777215); + this.drawArea.drawStringCenter("You are about to give:", local3 + 117, local5 + 30, 1, 16776960); for (@Pc(60) int local60 = 0; local60 < this.anInt487; local60++) { @Pc(69) String local69 = ClientConfig.objName[this.anIntArray213[local60]]; if (ClientConfig.objStackable[this.anIntArray213[local60]] == 0) { local69 = local69 + " (" + this.anIntArray214[local60] + ")"; } - this.drawArea.drawString(local69, local3 + 117, local5 + 42 + local60 * 12, 1, 16777215); + this.drawArea.drawStringCenter(local69, local3 + 117, local5 + 42 + local60 * 12, 1, 16777215); } if (this.anInt487 == 0) { - this.drawArea.drawString("Nothing!", local3 + 117, local5 + 42, 1, 16777215); + this.drawArea.drawStringCenter("Nothing!", local3 + 117, local5 + 42, 1, 16777215); } - this.drawArea.drawString("In return you will receive:", local3 + 351, local5 + 30, 1, 16776960); + this.drawArea.drawStringCenter("In return you will receive:", local3 + 351, local5 + 30, 1, 16776960); for (@Pc(142) int local142 = 0; local142 < this.anInt488; local142++) { @Pc(151) String local151 = ClientConfig.objName[this.anIntArray215[local142]]; if (ClientConfig.objStackable[this.anIntArray215[local142]] == 0) { local151 = local151 + " (" + this.anIntArray216[local142] + ")"; } - this.drawArea.drawString(local151, local3 + 351, local5 + 42 + local142 * 12, 1, 16777215); + this.drawArea.drawStringCenter(local151, local3 + 351, local5 + 42 + local142 * 12, 1, 16777215); } if (this.anInt488 == 0) { - this.drawArea.drawString("Nothing!", local3 + 351, local5 + 42, 1, 16777215); + this.drawArea.drawStringCenter("Nothing!", local3 + 351, local5 + 42, 1, 16777215); } - this.drawArea.drawString("Are you sure you want to do this?", local3 + 234, local5 + 200, 4, 65535); - this.drawArea.drawString("There is NO WAY to reverse a trade if you change your mind.", local3 + 234, local5 + 215, 1, 16777215); - this.drawArea.drawString("Remember that not all players are trustworthy", local3 + 234, local5 + 230, 1, 16777215); + this.drawArea.drawStringCenter("Are you sure you want to do this?", local3 + 234, local5 + 200, 4, 65535); + this.drawArea.drawStringCenter("There is NO WAY to reverse a trade if you change your mind.", local3 + 234, local5 + 215, 1, 16777215); + this.drawArea.drawStringCenter("Remember that not all players are trustworthy", local3 + 234, local5 + 230, 1, 16777215); if (this.aBoolean91) { - this.drawArea.drawString("Waiting for other player...", local3 + 234, local5 + 250, 1, 16776960); + this.drawArea.drawStringCenter("Waiting for other player...", local3 + 234, local5 + 250, 1, 16776960); } else { this.drawArea.method383(local3 + 118 - 35, local5 + 238, this.anInt388 + 25); this.drawArea.method383(local3 + 352 - 35, local5 + 238, this.anInt388 + 26); @@ -6803,21 +6803,21 @@ private void method562() { } this.drawArea.method371(local434 + local90 * 49 + 216, local436 + 30, 205, 0); } - this.drawArea.drawStringTaggable("Trading with: " + this.aString34, local434 + 1, local436 + 10, 1, 16777215); - this.drawArea.drawStringTaggable("Your Offer", local434 + 9, local436 + 27, 4, 16777215); - this.drawArea.drawStringTaggable("Opponent's Offer", local434 + 9, local436 + 152, 4, 16777215); - this.drawArea.drawStringTaggable("Your Inventory", local434 + 216, local436 + 27, 4, 16777215); + this.drawArea.drawString("Trading with: " + this.aString34, local434 + 1, local436 + 10, 1, 16777215); + this.drawArea.drawString("Your Offer", local434 + 9, local436 + 27, 4, 16777215); + this.drawArea.drawString("Opponent's Offer", local434 + 9, local436 + 152, 4, 16777215); + this.drawArea.drawString("Your Inventory", local434 + 216, local436 + 27, 4, 16777215); if (!this.aBoolean89) { this.drawArea.method383(local434 + 217, local436 + 238, this.anInt388 + 25); } this.drawArea.method383(local434 + 394, local436 + 238, this.anInt388 + 26); if (this.aBoolean88) { - this.drawArea.drawString("Other player", local434 + 341, local436 + 246, 1, 16777215); - this.drawArea.drawString("has accepted", local434 + 341, local436 + 256, 1, 16777215); + this.drawArea.drawStringCenter("Other player", local434 + 341, local436 + 246, 1, 16777215); + this.drawArea.drawStringCenter("has accepted", local434 + 341, local436 + 256, 1, 16777215); } if (this.aBoolean89) { - this.drawArea.drawString("Waiting for", local434 + 217 + 35, local436 + 246, 1, 16777215); - this.drawArea.drawString("other player", local434 + 217 + 35, local436 + 256, 1, 16777215); + this.drawArea.drawStringCenter("Waiting for", local434 + 217 + 35, local436 + 246, 1, 16777215); + this.drawArea.drawStringCenter("other player", local434 + 217 + 35, local436 + 256, 1, 16777215); } @Pc(858) int local858; @Pc(868) int local868; @@ -6826,7 +6826,7 @@ private void method562() { local868 = local436 + local846 / 5 * 34 + 31; this.drawArea.method399(local858, local868, 48, 32, this.anInt390 + ClientConfig.objSprite[this.anIntArray185[local846]], ClientConfig.objSpriteMask[this.anIntArray185[local846]], 0, 0, false); if (ClientConfig.objStackable[this.anIntArray185[local846]] == 0) { - this.drawArea.drawStringTaggable(String.valueOf(this.anIntArray186[local846]), local858 + 1, local868 + 10, 1, 16776960); + this.drawArea.drawString(String.valueOf(this.anIntArray186[local846]), local858 + 1, local868 + 10, 1, 16776960); } } @Pc(945) int local945; @@ -6835,10 +6835,10 @@ private void method562() { local945 = local436 + local858 / 4 * 34 + 31; this.drawArea.method399(local868, local945, 48, 32, this.anInt390 + ClientConfig.objSprite[this.anIntArray209[local858]], ClientConfig.objSpriteMask[this.anIntArray209[local858]], 0, 0, false); if (ClientConfig.objStackable[this.anIntArray209[local858]] == 0) { - this.drawArea.drawStringTaggable(String.valueOf(this.anIntArray210[local858]), local868 + 1, local945 + 10, 1, 16776960); + this.drawArea.drawString(String.valueOf(this.anIntArray210[local858]), local868 + 1, local945 + 10, 1, 16776960); } if (super.mouseX > local868 && super.mouseX < local868 + 48 && super.mouseY > local945 && super.mouseY < local945 + 32) { - this.drawArea.drawStringTaggable(ClientConfig.objName[this.anIntArray209[local858]] + ": @whi@" + ClientConfig.objDesc[this.anIntArray209[local858]], local434 + 8, local436 + 273, 1, 16776960); + this.drawArea.drawString(ClientConfig.objName[this.anIntArray209[local858]] + ": @whi@" + ClientConfig.objDesc[this.anIntArray209[local858]], local434 + 8, local436 + 273, 1, 16776960); } } for (local868 = 0; local868 < this.anInt484; local868++) { @@ -6846,10 +6846,10 @@ private void method562() { @Pc(1073) int local1073 = local436 + local868 / 4 * 34 + 156; this.drawArea.method399(local945, local1073, 48, 32, this.anInt390 + ClientConfig.objSprite[this.anIntArray211[local868]], ClientConfig.objSpriteMask[this.anIntArray211[local868]], 0, 0, false); if (ClientConfig.objStackable[this.anIntArray211[local868]] == 0) { - this.drawArea.drawStringTaggable(String.valueOf(this.anIntArray212[local868]), local945 + 1, local1073 + 10, 1, 16776960); + this.drawArea.drawString(String.valueOf(this.anIntArray212[local868]), local945 + 1, local1073 + 10, 1, 16776960); } if (super.mouseX > local945 && super.mouseX < local945 + 48 && super.mouseY > local1073 && super.mouseY < local1073 + 32) { - this.drawArea.drawStringTaggable(ClientConfig.objName[this.anIntArray211[local868]] + ": @whi@" + ClientConfig.objDesc[this.anIntArray211[local868]], local434 + 8, local436 + 273, 1, 16776960); + this.drawArea.drawString(ClientConfig.objName[this.anIntArray211[local868]] + ": @whi@" + ClientConfig.objDesc[this.anIntArray211[local868]], local434 + 8, local436 + 273, 1, 16776960); } } } @@ -6861,52 +6861,52 @@ private void method563() { this.drawArea.method368(local3, local5, 468, 16, 192); @Pc(15) int local15 = 10000536; this.drawArea.method366(local3, local5 + 16, 468, 246, local15, 160); - this.drawArea.drawString("Please confirm your duel with @yel@" + Tools.fromBase37(this.aLong6), local3 + 234, local5 + 12, 1, 16777215); - this.drawArea.drawString("Your stake:", local3 + 117, local5 + 30, 1, 16776960); + this.drawArea.drawStringCenter("Please confirm your duel with @yel@" + Tools.fromBase37(this.aLong6), local3 + 234, local5 + 12, 1, 16777215); + this.drawArea.drawStringCenter("Your stake:", local3 + 117, local5 + 30, 1, 16776960); for (@Pc(60) int local60 = 0; local60 < this.anInt477; local60++) { @Pc(69) String local69 = ClientConfig.objName[this.anIntArray205[local60]]; if (ClientConfig.objStackable[this.anIntArray205[local60]] == 0) { local69 = local69 + " (" + this.anIntArray206[local60] + ")"; } - this.drawArea.drawString(local69, local3 + 117, local5 + 42 + local60 * 12, 1, 16777215); + this.drawArea.drawStringCenter(local69, local3 + 117, local5 + 42 + local60 * 12, 1, 16777215); } if (this.anInt477 == 0) { - this.drawArea.drawString("Nothing!", local3 + 117, local5 + 42, 1, 16777215); + this.drawArea.drawStringCenter("Nothing!", local3 + 117, local5 + 42, 1, 16777215); } - this.drawArea.drawString("Your opponent's stake:", local3 + 351, local5 + 30, 1, 16776960); + this.drawArea.drawStringCenter("Your opponent's stake:", local3 + 351, local5 + 30, 1, 16776960); for (@Pc(142) int local142 = 0; local142 < this.anInt478; local142++) { @Pc(151) String local151 = ClientConfig.objName[this.anIntArray207[local142]]; if (ClientConfig.objStackable[this.anIntArray207[local142]] == 0) { local151 = local151 + " (" + this.anIntArray208[local142] + ")"; } - this.drawArea.drawString(local151, local3 + 351, local5 + 42 + local142 * 12, 1, 16777215); + this.drawArea.drawStringCenter(local151, local3 + 351, local5 + 42 + local142 * 12, 1, 16777215); } if (this.anInt478 == 0) { - this.drawArea.drawString("Nothing!", local3 + 351, local5 + 42, 1, 16777215); + this.drawArea.drawStringCenter("Nothing!", local3 + 351, local5 + 42, 1, 16777215); } if (this.anInt479 == 0) { - this.drawArea.drawString("You can retreat from this duel", local3 + 234, local5 + 180, 1, 65280); + this.drawArea.drawStringCenter("You can retreat from this duel", local3 + 234, local5 + 180, 1, 65280); } else { - this.drawArea.drawString("No retreat is possible!", local3 + 234, local5 + 180, 1, 16711680); + this.drawArea.drawStringCenter("No retreat is possible!", local3 + 234, local5 + 180, 1, 16711680); } if (this.anInt480 == 0) { - this.drawArea.drawString("Magic may be used", local3 + 234, local5 + 192, 1, 65280); + this.drawArea.drawStringCenter("Magic may be used", local3 + 234, local5 + 192, 1, 65280); } else { - this.drawArea.drawString("Magic cannot be used", local3 + 234, local5 + 192, 1, 16711680); + this.drawArea.drawStringCenter("Magic cannot be used", local3 + 234, local5 + 192, 1, 16711680); } if (this.anInt481 == 0) { - this.drawArea.drawString("Prayer may be used", local3 + 234, local5 + 204, 1, 65280); + this.drawArea.drawStringCenter("Prayer may be used", local3 + 234, local5 + 204, 1, 65280); } else { - this.drawArea.drawString("Prayer cannot be used", local3 + 234, local5 + 204, 1, 16711680); + this.drawArea.drawStringCenter("Prayer cannot be used", local3 + 234, local5 + 204, 1, 16711680); } if (this.anInt482 == 0) { - this.drawArea.drawString("Weapons may be used", local3 + 234, local5 + 216, 1, 65280); + this.drawArea.drawStringCenter("Weapons may be used", local3 + 234, local5 + 216, 1, 65280); } else { - this.drawArea.drawString("Weapons cannot be used", local3 + 234, local5 + 216, 1, 16711680); + this.drawArea.drawStringCenter("Weapons cannot be used", local3 + 234, local5 + 216, 1, 16711680); } - this.drawArea.drawString("If you are sure click 'Accept' to begin the duel", local3 + 234, local5 + 230, 1, 16777215); + this.drawArea.drawStringCenter("If you are sure click 'Accept' to begin the duel", local3 + 234, local5 + 230, 1, 16777215); if (this.aBoolean86) { - this.drawArea.drawString("Waiting for other player...", local3 + 234, local5 + 250, 1, 16776960); + this.drawArea.drawStringCenter("Waiting for other player...", local3 + 234, local5 + 250, 1, 16776960); } else { this.drawArea.method383(local3 + 118 - 35, local5 + 238, this.anInt388 + 25); this.drawArea.method383(local3 + 352 - 35, local5 + 238, this.anInt388 + 26); @@ -7108,15 +7108,15 @@ private void method564() { this.drawArea.method370(local576 + 8, local578 + 257, 197, 0); this.drawArea.method371(local576 + 8, local578 + 215, 43, 0); this.drawArea.method371(local576 + 204, local578 + 215, 43, 0); - this.drawArea.drawStringTaggable("Preparing to duel with: " + this.aString33, local576 + 1, local578 + 10, 1, 16777215); - this.drawArea.drawStringTaggable("Your Stake", local576 + 9, local578 + 27, 4, 16777215); - this.drawArea.drawStringTaggable("Opponent's Stake", local576 + 9, local578 + 120, 4, 16777215); - this.drawArea.drawStringTaggable("Duel Options", local576 + 9, local578 + 212, 4, 16777215); - this.drawArea.drawStringTaggable("Your Inventory", local576 + 216, local578 + 27, 4, 16777215); - this.drawArea.drawStringTaggable("No retreating", local576 + 8 + 1, local578 + 215 + 16, 3, 16776960); - this.drawArea.drawStringTaggable("No magic", local576 + 8 + 1, local578 + 215 + 35, 3, 16776960); - this.drawArea.drawStringTaggable("No prayer", local576 + 8 + 102, local578 + 215 + 16, 3, 16776960); - this.drawArea.drawStringTaggable("No weapons", local576 + 8 + 102, local578 + 215 + 35, 3, 16776960); + this.drawArea.drawString("Preparing to duel with: " + this.aString33, local576 + 1, local578 + 10, 1, 16777215); + this.drawArea.drawString("Your Stake", local576 + 9, local578 + 27, 4, 16777215); + this.drawArea.drawString("Opponent's Stake", local576 + 9, local578 + 120, 4, 16777215); + this.drawArea.drawString("Duel Options", local576 + 9, local578 + 212, 4, 16777215); + this.drawArea.drawString("Your Inventory", local576 + 216, local578 + 27, 4, 16777215); + this.drawArea.drawString("No retreating", local576 + 8 + 1, local578 + 215 + 16, 3, 16776960); + this.drawArea.drawString("No magic", local576 + 8 + 1, local578 + 215 + 35, 3, 16776960); + this.drawArea.drawString("No prayer", local576 + 8 + 102, local578 + 215 + 16, 3, 16776960); + this.drawArea.drawString("No weapons", local576 + 8 + 102, local578 + 215 + 35, 3, 16776960); this.drawArea.method369(local576 + 93, local578 + 215 + 6, 11, 11, 16776960); if (this.aBoolean81) { this.drawArea.method368(local576 + 95, local578 + 215 + 8, 7, 7, 16776960); @@ -7138,12 +7138,12 @@ private void method564() { } this.drawArea.method383(local576 + 394, local578 + 238, this.anInt388 + 26); if (this.aBoolean79) { - this.drawArea.drawString("Other player", local576 + 341, local578 + 246, 1, 16777215); - this.drawArea.drawString("has accepted", local576 + 341, local578 + 256, 1, 16777215); + this.drawArea.drawStringCenter("Other player", local576 + 341, local578 + 246, 1, 16777215); + this.drawArea.drawStringCenter("has accepted", local576 + 341, local578 + 256, 1, 16777215); } if (this.aBoolean80) { - this.drawArea.drawString("Waiting for", local576 + 217 + 35, local578 + 246, 1, 16777215); - this.drawArea.drawString("other player", local576 + 217 + 35, local578 + 256, 1, 16777215); + this.drawArea.drawStringCenter("Waiting for", local576 + 217 + 35, local578 + 246, 1, 16777215); + this.drawArea.drawStringCenter("other player", local576 + 217 + 35, local578 + 256, 1, 16777215); } @Pc(1270) int local1270; @Pc(1280) int local1280; @@ -7152,7 +7152,7 @@ private void method564() { local1280 = local578 + local1258 / 5 * 34 + 31; this.drawArea.method399(local1270, local1280, 48, 32, this.anInt390 + ClientConfig.objSprite[this.anIntArray185[local1258]], ClientConfig.objSpriteMask[this.anIntArray185[local1258]], 0, 0, false); if (ClientConfig.objStackable[this.anIntArray185[local1258]] == 0) { - this.drawArea.drawStringTaggable(String.valueOf(this.anIntArray186[local1258]), local1270 + 1, local1280 + 10, 1, 16776960); + this.drawArea.drawString(String.valueOf(this.anIntArray186[local1258]), local1270 + 1, local1280 + 10, 1, 16776960); } } @Pc(1357) int local1357; @@ -7161,10 +7161,10 @@ private void method564() { local1357 = local578 + local1270 / 4 * 34 + 31; this.drawArea.method399(local1280, local1357, 48, 32, this.anInt390 + ClientConfig.objSprite[this.anIntArray201[local1270]], ClientConfig.objSpriteMask[this.anIntArray201[local1270]], 0, 0, false); if (ClientConfig.objStackable[this.anIntArray201[local1270]] == 0) { - this.drawArea.drawStringTaggable(String.valueOf(this.anIntArray202[local1270]), local1280 + 1, local1357 + 10, 1, 16776960); + this.drawArea.drawString(String.valueOf(this.anIntArray202[local1270]), local1280 + 1, local1357 + 10, 1, 16776960); } if (super.mouseX > local1280 && super.mouseX < local1280 + 48 && super.mouseY > local1357 && super.mouseY < local1357 + 32) { - this.drawArea.drawStringTaggable(ClientConfig.objName[this.anIntArray201[local1270]] + ": @whi@" + ClientConfig.objDesc[this.anIntArray201[local1270]], local576 + 8, local578 + 273, 1, 16776960); + this.drawArea.drawString(ClientConfig.objName[this.anIntArray201[local1270]] + ": @whi@" + ClientConfig.objDesc[this.anIntArray201[local1270]], local576 + 8, local578 + 273, 1, 16776960); } } for (local1280 = 0; local1280 < this.anInt476; local1280++) { @@ -7172,10 +7172,10 @@ private void method564() { @Pc(1485) int local1485 = local578 + local1280 / 4 * 34 + 124; this.drawArea.method399(local1357, local1485, 48, 32, this.anInt390 + ClientConfig.objSprite[this.anIntArray203[local1280]], ClientConfig.objSpriteMask[this.anIntArray203[local1280]], 0, 0, false); if (ClientConfig.objStackable[this.anIntArray203[local1280]] == 0) { - this.drawArea.drawStringTaggable(String.valueOf(this.anIntArray204[local1280]), local1357 + 1, local1485 + 10, 1, 16776960); + this.drawArea.drawString(String.valueOf(this.anIntArray204[local1280]), local1357 + 1, local1485 + 10, 1, 16776960); } if (super.mouseX > local1357 && super.mouseX < local1357 + 48 && super.mouseY > local1485 && super.mouseY < local1485 + 32) { - this.drawArea.drawStringTaggable(ClientConfig.objName[this.anIntArray203[local1280]] + ": @whi@" + ClientConfig.objDesc[this.anIntArray203[local1280]], local576 + 8, local578 + 273, 1, 16776960); + this.drawArea.drawString(ClientConfig.objName[this.anIntArray203[local1280]] + ": @whi@" + ClientConfig.objDesc[this.anIntArray203[local1280]], local576 + 8, local578 + 273, 1, 16776960); } } } @@ -7253,7 +7253,7 @@ private void method566(@OriginalArg(0) boolean arg0) { if (local18 < this.anInt443) { this.drawArea.method399(local28, local36, 48, 32, this.anInt390 + ClientConfig.objSprite[this.anIntArray185[local18]], ClientConfig.objSpriteMask[this.anIntArray185[local18]], 0, 0, false); if (ClientConfig.objStackable[this.anIntArray185[local18]] == 0) { - this.drawArea.drawStringTaggable(String.valueOf(this.anIntArray186[local18]), local28 + 1, local36 + 10, 1, 16776960); + this.drawArea.drawString(String.valueOf(this.anIntArray186[local18]), local28 + 1, local36 + 10, 1, 16776960); } } } @@ -7446,13 +7446,13 @@ private void method568(@OriginalArg(0) boolean arg0) { this.drawArea.method366(local7, local9 + 24, local22, local24 - 24, PixMap.method375(220, 220, 220), 128); this.drawArea.method370(local7, local9 + 24, local22, 0); this.drawArea.method371(local7 + local22 / 2, local9, 24, 0); - this.drawArea.drawString("Stats", local7 + local22 / 4, local9 + 16, 4, 0); - this.drawArea.drawString("Quests", local7 + local22 / 4 + local22 / 2, local9 + 16, 4, 0); + this.drawArea.drawStringCenter("Stats", local7 + local22 / 4, local9 + 16, 4, 0); + this.drawArea.drawStringCenter("Quests", local7 + local22 / 4 + local22 / 2, local9 + 16, 4, 0); @Pc(158) int local158; if (this.anInt457 == 0) { @Pc(145) byte local145 = 72; @Pc(147) int local147 = -1; - this.drawArea.drawStringTaggable("Skills", local7 + 5, local145, 3, 16776960); + this.drawArea.drawString("Skills", local7 + 5, local145, 3, 16776960); local158 = local145 + 13; @Pc(164) int local164; for (@Pc(160) int local160 = 0; local160 < 9; local160++) { @@ -7461,25 +7461,25 @@ private void method568(@OriginalArg(0) boolean arg0) { local164 = 16711680; local147 = local160; } - this.drawArea.drawStringTaggable(this.OVERVIEW_STATS[local160] + ":@yel@" + this.anIntArray189[local160] + "/" + this.anIntArray190[local160], local7 + 5, local158, 1, local164); + this.drawArea.drawString(this.OVERVIEW_STATS[local160] + ":@yel@" + this.anIntArray189[local160] + "/" + this.anIntArray190[local160], local7 + 5, local158, 1, local164); local164 = 16777215; if (super.mouseX >= local7 + 90 && super.mouseY >= local158 - 13 - 11 && super.mouseY < local158 + 2 - 13 && super.mouseX < local7 + 196) { local164 = 16711680; local147 = local160 + 9; } - this.drawArea.drawStringTaggable(this.OVERVIEW_STATS[local160 + 9] + ":@yel@" + this.anIntArray189[local160 + 9] + "/" + this.anIntArray190[local160 + 9], local7 + local22 / 2 - 5, local158 - 13, 1, local164); + this.drawArea.drawString(this.OVERVIEW_STATS[local160 + 9] + ":@yel@" + this.anIntArray189[local160 + 9] + "/" + this.anIntArray190[local160 + 9], local7 + local22 / 2 - 5, local158 - 13, 1, local164); local158 += 13; } - this.drawArea.drawStringTaggable("Quest Points:@yel@" + this.anInt446, local7 + local22 / 2 - 5, local158 - 13, 1, 16777215); + this.drawArea.drawString("Quest Points:@yel@" + this.anInt446, local7 + local22 / 2 - 5, local158 - 13, 1, 16777215); local158 += 12; - this.drawArea.drawStringTaggable("Fatigue: @yel@" + this.anInt447 * 100 / 750 + "%", local7 + 5, local158 - 13, 1, 16777215); + this.drawArea.drawString("Fatigue: @yel@" + this.anInt447 * 100 / 750 + "%", local7 + 5, local158 - 13, 1, 16777215); local158 += 8; - this.drawArea.drawStringTaggable("Equipment Status", local7 + 5, local158, 3, 16776960); + this.drawArea.drawString("Equipment Status", local7 + 5, local158, 3, 16776960); local158 += 12; for (local164 = 0; local164 < 3; local164++) { - this.drawArea.drawStringTaggable(this.BONUSES[local164] + ":@yel@" + this.anIntArray192[local164], local7 + 5, local158, 1, 16777215); + this.drawArea.drawString(this.BONUSES[local164] + ":@yel@" + this.anIntArray192[local164], local7 + 5, local158, 1, 16777215); if (local164 < 2) { - this.drawArea.drawStringTaggable(this.BONUSES[local164 + 3] + ":@yel@" + this.anIntArray192[local164 + 3], local7 + local22 / 2 + 25, local158, 1, 16777215); + this.drawArea.drawString(this.BONUSES[local164 + 3] + ":@yel@" + this.anIntArray192[local164 + 3], local7 + local22 / 2 + 25, local158, 1, 16777215); } local158 += 13; } @@ -7488,18 +7488,18 @@ private void method568(@OriginalArg(0) boolean arg0) { @Pc(479) int local479; @Pc(481) int local481; if (local147 == -1) { - this.drawArea.drawStringTaggable("Overall levels", local7 + 5, local158, 1, 16776960); + this.drawArea.drawString("Overall levels", local7 + 5, local158, 1, 16776960); local158 += 12; local479 = 0; for (local481 = 0; local481 < 18; local481++) { local479 += this.anIntArray190[local481]; } - this.drawArea.drawStringTaggable("Skill total: " + local479, local7 + 5, local158, 1, 16777215); + this.drawArea.drawString("Skill total: " + local479, local7 + 5, local158, 1, 16777215); local158 += 12; - this.drawArea.drawStringTaggable("Combat level: " + this.localPlayer.combatLevel, local7 + 5, local158, 1, 16777215); + this.drawArea.drawString("Combat level: " + this.localPlayer.combatLevel, local7 + 5, local158, 1, 16777215); local158 += 12; } else { - this.drawArea.drawStringTaggable(this.STATS_NAMES[local147] + " skill", local7 + 5, local158, 1, 16776960); + this.drawArea.drawString(this.STATS_NAMES[local147] + " skill", local7 + 5, local158, 1, 16776960); local158 += 12; local479 = this.skillBaseLevel[0]; for (local481 = 0; local481 < 98; local481++) { @@ -7507,9 +7507,9 @@ private void method568(@OriginalArg(0) boolean arg0) { local479 = this.skillBaseLevel[local481 + 1]; } } - this.drawArea.drawStringTaggable("Total xp: " + this.skillExperience[local147] / 4, local7 + 5, local158, 1, 16777215); + this.drawArea.drawString("Total xp: " + this.skillExperience[local147] / 4, local7 + 5, local158, 1, 16777215); local158 += 12; - this.drawArea.drawStringTaggable("Next level at: " + local479 / 4, local7 + 5, local158, 1, 16777215); + this.drawArea.drawString("Next level at: " + local479 / 4, local7 + 5, local158, 1, 16777215); } } if (this.anInt457 == 1) { @@ -7564,8 +7564,8 @@ private void method569(@OriginalArg(0) boolean arg0) { this.drawArea.method370(local7, local9 + 24, local22, 0); this.drawArea.method371(local7 + local22 / 2, local9, 24, 0); this.drawArea.method370(local7, local9 + 113, local22, 0); - this.drawArea.drawString("Magic", local7 + local22 / 4, local9 + 16, 4, 0); - this.drawArea.drawString("Prayers", local7 + local22 / 4 + local22 / 2, local9 + 16, 4, 0); + this.drawArea.drawStringCenter("Magic", local7 + local22 / 4, local9 + 16, 4, 0); + this.drawArea.drawStringCenter("Prayers", local7 + local22 / 4 + local22 / 2, local9 + 16, 4, 0); @Pc(177) int local177; @Pc(179) int local179; @Pc(183) String local183; @@ -7593,10 +7593,10 @@ private void method569(@OriginalArg(0) boolean arg0) { this.aGui1.method75(); local262 = this.aGui1.method110(this.anInt451); if (local262 == -1) { - this.drawArea.drawStringTaggable("Point at a spell for a description", local7 + 2, local9 + 124, 1, 0); + this.drawArea.drawString("Point at a spell for a description", local7 + 2, local9 + 124, 1, 0); } else { - this.drawArea.drawStringTaggable("Level " + ClientConfig.spellLevel[local262] + ": " + ClientConfig.spellName[local262], local7 + 2, local9 + 124, 1, 16776960); - this.drawArea.drawStringTaggable(ClientConfig.spellDesc[local262], local7 + 2, local9 + 136, 0, 16777215); + this.drawArea.drawString("Level " + ClientConfig.spellLevel[local262] + ": " + ClientConfig.spellName[local262], local7 + 2, local9 + 124, 1, 16776960); + this.drawArea.drawString(ClientConfig.spellDesc[local262], local7 + 2, local9 + 136, 0, 16777215); for (local185 = 0; local185 < ClientConfig.spellRunesRequired[local262]; local185++) { local193 = ClientConfig.spellRunes[local262][local185]; this.drawArea.method383(local7 + local185 * 44 + 2, local9 + 150, this.anInt390 + ClientConfig.objSprite[local193]); @@ -7606,7 +7606,7 @@ private void method569(@OriginalArg(0) boolean arg0) { if (this.method539(local193, local344)) { local346 = "@gre@"; } - this.drawArea.drawStringTaggable(local346 + local338 + "/" + local344, local7 + local185 * 44 + 2, local9 + 150, 1, 16777215); + this.drawArea.drawString(local346 + local338 + "/" + local344, local7 + local185 * 44 + 2, local9 + 150, 1, 16777215); } } } @@ -7626,11 +7626,11 @@ private void method569(@OriginalArg(0) boolean arg0) { this.aGui1.method75(); local262 = this.aGui1.method110(this.anInt451); if (local262 == -1) { - this.drawArea.drawStringTaggable("Point at a prayer for a description", local7 + 2, local9 + 124, 1, 0); + this.drawArea.drawString("Point at a prayer for a description", local7 + 2, local9 + 124, 1, 0); } else { - this.drawArea.drawString("Level " + ClientConfig.prayerLevel[local262] + ": " + ClientConfig.prayerName[local262], local7 + local22 / 2, local9 + 130, 1, 16776960); - this.drawArea.drawString(ClientConfig.prayerDesc[local262], local7 + local22 / 2, local9 + 145, 0, 16777215); - this.drawArea.drawString("Drain rate: " + ClientConfig.prayerDrain[local262], local7 + local22 / 2, local9 + 160, 1, 0); + this.drawArea.drawStringCenter("Level " + ClientConfig.prayerLevel[local262] + ": " + ClientConfig.prayerName[local262], local7 + local22 / 2, local9 + 130, 1, 16776960); + this.drawArea.drawStringCenter(ClientConfig.prayerDesc[local262], local7 + local22 / 2, local9 + 145, 0, 16777215); + this.drawArea.drawStringCenter("Drain rate: " + ClientConfig.prayerDrain[local262], local7 + local22 / 2, local9 + 160, 1, 0); } } if (!arg0) { @@ -7719,8 +7719,8 @@ private void method570(@OriginalArg(0) boolean arg0) { this.drawArea.method370(local7, local9 + 24, local22, 0); this.drawArea.method371(local7 + local22 / 2, local9, 24, 0); this.drawArea.method370(local7, local9 + local24 - 16, local22, 0); - this.drawArea.drawString("Friends", local7 + local22 / 4, local9 + 16, 4, 0); - this.drawArea.drawString("Ignore", local7 + local22 / 4 + local22 / 2, local9 + 16, 4, 0); + this.drawArea.drawStringCenter("Friends", local7 + local22 / 4, local9 + 16, 4, 0); + this.drawArea.drawStringCenter("Ignore", local7 + local22 / 4 + local22 / 2, local9 + 16, 4, 0); this.aGui2.method100(this.anInt454); @Pc(161) int local161; if (this.anInt455 == 0) { @@ -7746,36 +7746,36 @@ private void method570(@OriginalArg(0) boolean arg0) { if (this.anInt455 == 0) { local161 = this.aGui2.method110(this.anInt454); if (local161 < 0 || super.mouseX >= 489) { - this.drawArea.drawString("Click a name to send a message", local7 + local22 / 2, local9 + 35, 1, 16777215); + this.drawArea.drawStringCenter("Click a name to send a message", local7 + local22 / 2, local9 + 35, 1, 16777215); } else if (super.mouseX > 429) { - this.drawArea.drawString("Click to remove " + Tools.fromBase37(super.friendName37[local161]), local7 + local22 / 2, local9 + 35, 1, 16777215); + this.drawArea.drawStringCenter("Click to remove " + Tools.fromBase37(super.friendName37[local161]), local7 + local22 / 2, local9 + 35, 1, 16777215); } else if (super.friendWorld[local161] == 99) { - this.drawArea.drawString("Click to message " + Tools.fromBase37(super.friendName37[local161]), local7 + local22 / 2, local9 + 35, 1, 16777215); + this.drawArea.drawStringCenter("Click to message " + Tools.fromBase37(super.friendName37[local161]), local7 + local22 / 2, local9 + 35, 1, 16777215); } else if (super.friendWorld[local161] > 0) { - this.drawArea.drawString(Tools.fromBase37(super.friendName37[local161]) + " is on world " + super.friendWorld[local161], local7 + local22 / 2, local9 + 35, 1, 16777215); + this.drawArea.drawStringCenter(Tools.fromBase37(super.friendName37[local161]) + " is on world " + super.friendWorld[local161], local7 + local22 / 2, local9 + 35, 1, 16777215); } else { - this.drawArea.drawString(Tools.fromBase37(super.friendName37[local161]) + " is offline", local7 + local22 / 2, local9 + 35, 1, 16777215); + this.drawArea.drawStringCenter(Tools.fromBase37(super.friendName37[local161]) + " is offline", local7 + local22 / 2, local9 + 35, 1, 16777215); } if (super.mouseX > local7 && super.mouseX < local7 + local22 && super.mouseY > local9 + local24 - 16 && super.mouseY < local9 + local24) { local425 = 16776960; } else { local425 = 16777215; } - this.drawArea.drawString("Click here to add a friend", local7 + local22 / 2, local9 + local24 - 3, 1, local425); + this.drawArea.drawStringCenter("Click here to add a friend", local7 + local22 / 2, local9 + local24 - 3, 1, local425); } if (this.anInt455 == 1) { local161 = this.aGui2.method110(this.anInt454); if (local161 < 0 || super.mouseX >= 489 || super.mouseX <= 429) { - this.drawArea.drawString("Blocking messages from:", local7 + local22 / 2, local9 + 35, 1, 16777215); + this.drawArea.drawStringCenter("Blocking messages from:", local7 + local22 / 2, local9 + 35, 1, 16777215); } else if (super.mouseX > 429) { - this.drawArea.drawString("Click to remove " + Tools.fromBase37(super.ignoreName37[local161]), local7 + local22 / 2, local9 + 35, 1, 16777215); + this.drawArea.drawStringCenter("Click to remove " + Tools.fromBase37(super.ignoreName37[local161]), local7 + local22 / 2, local9 + 35, 1, 16777215); } if (super.mouseX > local7 && super.mouseX < local7 + local22 && super.mouseY > local9 + local24 - 16 && super.mouseY < local9 + local24) { local425 = 16776960; } else { local425 = 16777215; } - this.drawArea.drawString("Click here to add a name", local7 + local22 / 2, local9 + local24 - 3, 1, local425); + this.drawArea.drawStringCenter("Click here to add a name", local7 + local22 / 2, local9 + local24 - 3, 1, local425); } if (!arg0) { return; @@ -7839,88 +7839,88 @@ private void method571(@OriginalArg(0) boolean arg0) { this.drawArea.method366(local7, 261, local22, 40, PixMap.method375(201, 201, 201), 160); @Pc(74) int local74 = local7 + 3; @Pc(78) int local78 = local9 + 15; - this.drawArea.drawStringTaggable("Game options - click to toggle", local74, local78, 1, 0); + this.drawArea.drawString("Game options - click to toggle", local74, local78, 1, 0); @Pc(87) int local87 = local78 + 15; if (this.cameraAngleMode) { - this.drawArea.drawStringTaggable("Camera angle mode - @gre@Auto", local74, local87, 1, 16777215); + this.drawArea.drawString("Camera angle mode - @gre@Auto", local74, local87, 1, 16777215); } else { - this.drawArea.drawStringTaggable("Camera angle mode - @red@Manual", local74, local87, 1, 16777215); + this.drawArea.drawString("Camera angle mode - @red@Manual", local74, local87, 1, 16777215); } local78 = local87 + 15; if (this.mouseButtonsMode) { - this.drawArea.drawStringTaggable("Mouse buttons - @red@One", local74, local78, 1, 16777215); + this.drawArea.drawString("Mouse buttons - @red@One", local74, local78, 1, 16777215); } else { - this.drawArea.drawStringTaggable("Mouse buttons - @gre@Two", local74, local78, 1, 16777215); + this.drawArea.drawString("Mouse buttons - @gre@Two", local74, local78, 1, 16777215); } local78 += 15; if (this.worldMembers) { if (this.soundEffectsMode) { - this.drawArea.drawStringTaggable("Sound effects - @red@off", local74, local78, 1, 16777215); + this.drawArea.drawString("Sound effects - @red@off", local74, local78, 1, 16777215); } else { - this.drawArea.drawStringTaggable("Sound effects - @gre@on", local74, local78, 1, 16777215); + this.drawArea.drawString("Sound effects - @gre@on", local74, local78, 1, 16777215); } } local78 += 15; local78 += 5; - this.drawArea.drawStringTaggable("Security settings", local74, local78, 1, 0); + this.drawArea.drawString("Security settings", local74, local78, 1, 0); local78 += 15; @Pc(168) int local168 = 16777215; if (super.mouseX > local74 && super.mouseX < local74 + local22 && super.mouseY > local78 - 12 && super.mouseY < local78 + 4) { local168 = 16776960; } - this.drawArea.drawStringTaggable("Change password", local74, local78, 1, local168); + this.drawArea.drawString("Change password", local74, local78, 1, local168); local78 += 15; local168 = 16777215; if (super.mouseX > local74 && super.mouseX < local74 + local22 && super.mouseY > local78 - 12 && super.mouseY < local78 + 4) { local168 = 16776960; } - this.drawArea.drawStringTaggable("Change recovery questions", local74, local78, 1, local168); + this.drawArea.drawString("Change recovery questions", local74, local78, 1, local168); local78 += 15; local168 = 16777215; if (super.mouseX > local74 && super.mouseX < local74 + local22 && super.mouseY > local78 - 12 && super.mouseY < local78 + 4) { local168 = 16776960; } - this.drawArea.drawStringTaggable("Change contact details", local74, local78, 1, local168); + this.drawArea.drawString("Change contact details", local74, local78, 1, local168); local78 += 15; local78 += 5; - this.drawArea.drawStringTaggable("Privacy settings. Will be applied to", local7 + 3, local78, 1, 0); + this.drawArea.drawString("Privacy settings. Will be applied to", local7 + 3, local78, 1, 0); local78 += 15; - this.drawArea.drawStringTaggable("all people not on your friends list", local7 + 3, local78, 1, 0); + this.drawArea.drawString("all people not on your friends list", local7 + 3, local78, 1, 0); local78 += 15; if (super.chatMessagesMode == 0) { - this.drawArea.drawStringTaggable("Block chat messages: @red@", local7 + 3, local78, 1, 16777215); + this.drawArea.drawString("Block chat messages: @red@", local7 + 3, local78, 1, 16777215); } else { - this.drawArea.drawStringTaggable("Block chat messages: @gre@", local7 + 3, local78, 1, 16777215); + this.drawArea.drawString("Block chat messages: @gre@", local7 + 3, local78, 1, 16777215); } local78 += 15; if (super.privateMessagesMode == 0) { - this.drawArea.drawStringTaggable("Block private messages: @red@", local7 + 3, local78, 1, 16777215); + this.drawArea.drawString("Block private messages: @red@", local7 + 3, local78, 1, 16777215); } else { - this.drawArea.drawStringTaggable("Block private messages: @gre@", local7 + 3, local78, 1, 16777215); + this.drawArea.drawString("Block private messages: @gre@", local7 + 3, local78, 1, 16777215); } local78 += 15; if (super.tradeRequestsMode == 0) { - this.drawArea.drawStringTaggable("Block trade requests: @red@", local7 + 3, local78, 1, 16777215); + this.drawArea.drawString("Block trade requests: @red@", local7 + 3, local78, 1, 16777215); } else { - this.drawArea.drawStringTaggable("Block trade requests: @gre@", local7 + 3, local78, 1, 16777215); + this.drawArea.drawString("Block trade requests: @gre@", local7 + 3, local78, 1, 16777215); } local78 += 15; if (this.worldMembers) { if (super.duelRequestsMode == 0) { - this.drawArea.drawStringTaggable("Block duel requests: @red@", local7 + 3, local78, 1, 16777215); + this.drawArea.drawString("Block duel requests: @red@", local7 + 3, local78, 1, 16777215); } else { - this.drawArea.drawStringTaggable("Block duel requests: @gre@", local7 + 3, local78, 1, 16777215); + this.drawArea.drawString("Block duel requests: @gre@", local7 + 3, local78, 1, 16777215); } } local78 += 15; local78 += 5; - this.drawArea.drawStringTaggable("Always logout when you finish", local74, local78, 1, 0); + this.drawArea.drawString("Always logout when you finish", local74, local78, 1, 0); local78 += 15; local168 = 16777215; if (super.mouseX > local74 && super.mouseX < local74 + local22 && super.mouseY > local78 - 12 && super.mouseY < local78 + 4) { local168 = 16776960; } - this.drawArea.drawStringTaggable("Click here to logout", local7 + 3, local78, 1, local168); + this.drawArea.drawString("Click here to logout", local7 + 3, local78, 1, local168); if (!arg0) { return; } @@ -8410,7 +8410,7 @@ private void method573() { this.aBoolean77 = false; } else if (super.mouseX >= this.anInt459 - 10 && super.mouseY >= this.anInt460 - 10 && super.mouseX <= this.anInt459 + this.anInt461 + 10 && super.mouseY <= this.anInt460 + this.anInt462 + 10) { this.drawArea.method366(this.anInt459, this.anInt460, this.anInt461, this.anInt462, 13684944, 160); - this.drawArea.drawStringTaggable("Choose option", this.anInt459 + 2, this.anInt460 + 12, 1, 65535); + this.drawArea.drawString("Choose option", this.anInt459 + 2, this.anInt460 + 12, 1, 65535); for (local6 = 0; local6 < this.menuSize; local6++) { local13 = this.anInt459 + 2; local22 = this.anInt460 + local6 * 15 + 27; @@ -8418,7 +8418,7 @@ private void method573() { if (super.mouseX > local13 - 2 && super.mouseY > local22 - 12 && super.mouseY < local22 + 4 && super.mouseX < local13 + this.anInt461 - 3) { local154 = 16776960; } - this.drawArea.drawStringTaggable(this.menuOptionType[this.menuParamD[local6]] + " " + this.menuOptionTarget[this.menuParamD[local6]], local13, local22, 1, local154); + this.drawArea.drawString(this.menuOptionType[this.menuParamD[local6]] + " " + this.menuOptionTarget[this.menuParamD[local6]], local13, local22, 1, local154); } } else { this.aBoolean77 = false; @@ -8480,7 +8480,7 @@ private void method574() { local143 = local143 + "@whi@ / " + (this.menuSize - 1) + " more options"; } if (local143 != null) { - this.drawArea.drawStringTaggable(local143, 6, 14, 1, 16776960); + this.drawArea.drawString(local143, 6, 14, 1, 16776960); } if (!this.mouseButtonsMode && this.anInt374 == 1 || this.mouseButtonsMode && this.anInt374 == 1 && this.menuSize == 1) { this.method575(this.menuParamD[0]); @@ -8491,9 +8491,9 @@ private void method574() { return; } this.anInt462 = (this.menuSize + 1) * 15; - this.anInt461 = this.drawArea.method412("Choose option", 1) + 5; + this.anInt461 = this.drawArea.stringWidth("Choose option", 1) + 5; for (@Pc(325) int local325 = 0; local325 < this.menuSize; local325++) { - @Pc(350) int local350 = this.drawArea.method412(this.menuOptionType[local325] + " " + this.menuOptionTarget[local325], 1) + 5; + @Pc(350) int local350 = this.drawArea.stringWidth(this.menuOptionType[local325] + " " + this.menuOptionTarget[local325], 1) + 5; if (local350 > this.anInt461) { this.anInt461 = local350; } diff --git a/mudclient/src/main/java/jagex/WordFilter.java b/mudclient/src/main/java/jagex/WordFilter.java index 826028a..9b62c89 100644 --- a/mudclient/src/main/java/jagex/WordFilter.java +++ b/mudclient/src/main/java/jagex/WordFilter.java @@ -9,311 +9,351 @@ public final class WordFilter { @OriginalMember(owner = "mudclient!a/g", name = "a", descriptor = "Z") - private static boolean aBoolean46; + private static boolean VERBOSE; @OriginalMember(owner = "mudclient!a/g", name = "b", descriptor = "Z") - private static boolean aBoolean47; + private static boolean DEBUG; @OriginalMember(owner = "mudclient!a/g", name = "e", descriptor = "[I") - private static int[] anIntArray96; + private static int[] fragments; @OriginalMember(owner = "mudclient!a/g", name = "f", descriptor = "[[C") - private static char[][] aCharArrayArray1; + private static char[][] badWords; @OriginalMember(owner = "mudclient!a/g", name = "g", descriptor = "[[[B") - private static byte[][][] aByteArrayArrayArray1; + private static byte[][][] badCombinations; @OriginalMember(owner = "mudclient!a/g", name = "h", descriptor = "[[C") - private static char[][] aCharArrayArray2; + private static char[][] hosts; @OriginalMember(owner = "mudclient!a/g", name = "i", descriptor = "[[[B") - private static byte[][][] aByteArrayArrayArray2; + private static byte[][][] hostCombinations; @OriginalMember(owner = "mudclient!a/g", name = "j", descriptor = "[[C") - private static char[][] aCharArrayArray3; + private static char[][] tlds; @OriginalMember(owner = "mudclient!a/g", name = "k", descriptor = "[I") - private static int[] anIntArray97; + private static int[] tldType; @OriginalMember(owner = "mudclient!a/g", name = "c", descriptor = "Z") - private static boolean aBoolean48 = true; + private static boolean POST_FILTER = true; @OriginalMember(owner = "mudclient!a/g", name = "d", descriptor = "I") private static int anInt273 = 3; @OriginalMember(owner = "mudclient!a/g", name = "l", descriptor = "[Ljava/lang/String;") - private static String[] aStringArray3 = new String[] { "cook", "cook's", "cooks", "seeks", "sheet" }; + private static String[] ALLOWLIST = new String[] { "cook", "cook's", "cooks", "seeks", "sheet" }; @OriginalMember(owner = "mudclient!a/g", name = "a", descriptor = "(Lmudclient!a/d;Lmudclient!a/d;Lmudclient!a/d;Lmudclient!a/d;)V") - public static void method321(@OriginalArg(0) Packet arg0, @OriginalArg(1) Packet arg1, @OriginalArg(2) Packet arg2, @OriginalArg(3) Packet arg3) { - method323(arg1); - method324(arg2); - method325(arg0); - method322(arg3); + public static void read(@OriginalArg(0) Packet fragments, @OriginalArg(1) Packet bad, @OriginalArg(2) Packet host, @OriginalArg(3) Packet tld) { + readBadWords(bad); + readHosts(host); + readFragments(fragments); + readTld(tld); } @OriginalMember(owner = "mudclient!a/g", name = "a", descriptor = "(Lmudclient!a/d;)V") - private static void method322(@OriginalArg(0) Packet arg0) { - @Pc(4) int local4 = arg0.g4(); - aCharArrayArray3 = new char[local4][]; - anIntArray97 = new int[local4]; - for (@Pc(12) int local12 = 0; local12 < local4; local12++) { - anIntArray97[local12] = arg0.g1(); - @Pc(23) char[] local23 = new char[arg0.g1()]; - for (@Pc(25) int local25 = 0; local25 < local23.length; local25++) { - local23[local25] = (char) arg0.g1(); + private static void readTld(@OriginalArg(0) Packet buf) { + @Pc(4) int count = buf.g4(); + tlds = new char[count][]; + tldType = new int[count]; + + for (@Pc(12) int i = 0; i < count; i++) { + tldType[i] = buf.g1(); + + @Pc(23) char[] tld = new char[buf.g1()]; + for (@Pc(25) int j = 0; j < tld.length; j++) { + tld[j] = (char) buf.g1(); } - aCharArrayArray3[local12] = local23; + + tlds[i] = tld; } } @OriginalMember(owner = "mudclient!a/g", name = "b", descriptor = "(Lmudclient!a/d;)V") - private static void method323(@OriginalArg(0) Packet arg0) { - @Pc(2) int local2 = arg0.g4(); - aCharArrayArray1 = new char[local2][]; - aByteArrayArrayArray1 = new byte[local2][][]; - method326(arg0, aCharArrayArray1, aByteArrayArrayArray1); + private static void readBadWords(@OriginalArg(0) Packet buf) { + @Pc(2) int count = buf.g4(); + badWords = new char[count][]; + badCombinations = new byte[count][][]; + readCombinations(buf, badWords, badCombinations); } @OriginalMember(owner = "mudclient!a/g", name = "c", descriptor = "(Lmudclient!a/d;)V") - private static void method324(@OriginalArg(0) Packet arg0) { - @Pc(2) int local2 = arg0.g4(); - aCharArrayArray2 = new char[local2][]; - aByteArrayArrayArray2 = new byte[local2][][]; - method326(arg0, aCharArrayArray2, aByteArrayArrayArray2); + private static void readHosts(@OriginalArg(0) Packet buf) { + @Pc(2) int count = buf.g4(); + hosts = new char[count][]; + hostCombinations = new byte[count][][]; + readCombinations(buf, hosts, hostCombinations); } @OriginalMember(owner = "mudclient!a/g", name = "d", descriptor = "(Lmudclient!a/d;)V") - private static void method325(@OriginalArg(0) Packet arg0) { - anIntArray96 = new int[arg0.g4()]; - for (@Pc(5) int local5 = 0; local5 < anIntArray96.length; local5++) { - anIntArray96[local5] = arg0.g2(); + private static void readFragments(@OriginalArg(0) Packet buf) { + fragments = new int[buf.g4()]; + for (@Pc(5) int i = 0; i < fragments.length; i++) { + fragments[i] = buf.g2(); } } @OriginalMember(owner = "mudclient!a/g", name = "a", descriptor = "(Lmudclient!a/d;[[C[[[B)V") - private static void method326(@OriginalArg(0) Packet arg0, @OriginalArg(1) char[][] arg1, @OriginalArg(2) byte[][][] arg2) { - for (@Pc(3) int local3 = 0; local3 < arg1.length; local3++) { - @Pc(9) char[] local9 = new char[arg0.g1()]; - for (@Pc(11) int local11 = 0; local11 < local9.length; local11++) { - local9[local11] = (char) arg0.g1(); + private static void readCombinations(@OriginalArg(0) Packet buf, @OriginalArg(1) char[][] words, @OriginalArg(2) byte[][][] combinations) { + for (@Pc(3) int i = 0; i < words.length; i++) { + @Pc(9) char[] word = new char[buf.g1()]; + for (@Pc(11) int j = 0; j < word.length; j++) { + word[j] = (char) buf.g1(); } - arg1[local3] = local9; - @Pc(33) byte[][] local33 = new byte[arg0.g4()][2]; - for (@Pc(35) int local35 = 0; local35 < local33.length; local35++) { - local33[local35][0] = (byte) arg0.g1(); - local33[local35][1] = (byte) arg0.g1(); + + words[i] = word; + + @Pc(33) byte[][] combination = new byte[buf.g4()][2]; + for (@Pc(35) int j = 0; j < combination.length; j++) { + combination[j][0] = (byte) buf.g1(); + combination[j][1] = (byte) buf.g1(); } - if (local33.length > 0) { - arg2[local3] = local33; + + if (combination.length > 0) { + combinations[i] = combination; } } } @OriginalMember(owner = "mudclient!a/g", name = "a", descriptor = "(Ljava/lang/String;)Ljava/lang/String;") - public static String method327(@OriginalArg(0) String arg0) { - @Pc(5) char[] local5 = arg0.toLowerCase().toCharArray(); - method332(local5); - method330(local5); - method331(local5); - method341(local5); - for (@Pc(15) int local15 = 0; local15 < aStringArray3.length; local15++) { - @Pc(19) int local19 = -1; - while ((local19 = arg0.indexOf(aStringArray3[local15], local19 + 1)) != -1) { - @Pc(26) char[] local26 = aStringArray3[local15].toCharArray(); - for (@Pc(28) int local28 = 0; local28 < local26.length; local28++) { - local5[local28 + local19] = local26[local28]; + public static String filter(@OriginalArg(0) String str) { + @Pc(5) char[] chars = str.toLowerCase().toCharArray(); + + filterTld(chars); + filterBad(chars); + filterHost(chars); + filterFragments(chars); + + for (@Pc(15) int i = 0; i < ALLOWLIST.length; i++) { + @Pc(19) int allowedIndex = -1; + + while ((allowedIndex = str.indexOf(ALLOWLIST[i], allowedIndex + 1)) != -1) { + @Pc(26) char[] allowed = ALLOWLIST[i].toCharArray(); + + for (@Pc(28) int j = 0; j < allowed.length; j++) { + chars[j + allowedIndex] = allowed[j]; } } } - if (aBoolean48) { - method328(arg0.toCharArray(), local5); - method329(local5); + + if (POST_FILTER) { + replaceUpperCase(str.toCharArray(), chars); + formatUpperCase(chars); } - return new String(local5); + + return new String(chars); } @OriginalMember(owner = "mudclient!a/g", name = "a", descriptor = "([C[C)V") - private static void method328(@OriginalArg(0) char[] arg0, @OriginalArg(1) char[] arg1) { - for (@Pc(1) int local1 = 0; local1 < arg0.length; local1++) { - if (arg1[local1] != '*' && method349(arg0[local1])) { - arg1[local1] = arg0[local1]; + private static void replaceUpperCase(@OriginalArg(0) char[] unfiltered, @OriginalArg(1) char[] input) { + for (@Pc(1) int i = 0; i < unfiltered.length; i++) { + if (input[i] != '*' && isUpperCase(unfiltered[i])) { + input[i] = unfiltered[i]; } } } @OriginalMember(owner = "mudclient!a/g", name = "a", descriptor = "([C)V") - private static void method329(@OriginalArg(0) char[] arg0) { - @Pc(3) boolean local3 = true; - for (@Pc(5) int local5 = 0; local5 < arg0.length; local5++) { - @Pc(11) char local11 = arg0[local5]; - if (!method346(local11)) { - local3 = true; - } else if (local3) { - if (method348(local11)) { - local3 = false; + private static void formatUpperCase(@OriginalArg(0) char[] arg0) { + @Pc(3) boolean upper = true; + for (@Pc(5) int i = 0; i < arg0.length; i++) { + @Pc(11) char c = arg0[i]; + + if (!isAlpha(c)) { + upper = true; + } else if (upper) { + if (isLowerCase(c)) { + upper = false; } - } else if (method349(local11)) { - arg0[local5] = (char) (local11 + 'a' - 65); + } else if (isUpperCase(c)) { + arg0[i] = (char) (c + 'a' - 65); } } } @OriginalMember(owner = "mudclient!a/g", name = "b", descriptor = "([C)V") - private static void method330(@OriginalArg(0) char[] arg0) { - for (@Pc(3) int local3 = 0; local3 < 2; local3++) { - for (@Pc(10) int local10 = aCharArrayArray1.length - 1; local10 >= 0; local10--) { - method336(arg0, aCharArrayArray1[local10], aByteArrayArrayArray1[local10]); + private static void filterBad(@OriginalArg(0) char[] input) { + for (@Pc(3) int passes = 0; passes < 2; passes++) { + for (@Pc(10) int i = badWords.length - 1; i >= 0; i--) { + filter(input, badWords[i], badCombinations[i]); } } } @OriginalMember(owner = "mudclient!a/g", name = "c", descriptor = "([C)V") - private static void method331(@OriginalArg(0) char[] arg0) { - for (@Pc(4) int local4 = aCharArrayArray2.length - 1; local4 >= 0; local4--) { - method336(arg0, aCharArrayArray2[local4], aByteArrayArrayArray2[local4]); + private static void filterHost(@OriginalArg(0) char[] input) { + for (@Pc(4) int i = hosts.length - 1; i >= 0; i--) { + filter(input, hosts[i], hostCombinations[i]); } } @OriginalMember(owner = "mudclient!a/g", name = "d", descriptor = "([C)V") - private static void method332(@OriginalArg(0) char[] arg0) { - @Pc(3) char[] local3 = (char[]) arg0.clone(); - @Pc(18) char[] local18 = new char[] { 'd', 'o', 't' }; - method336(local3, local18, null); - @Pc(26) char[] local26 = (char[]) arg0.clone(); - @Pc(49) char[] local49 = new char[] { 's', 'l', 'a', 's', 'h' }; - method336(local26, local49, null); - for (@Pc(55) int local55 = 0; local55 < aCharArrayArray3.length; local55++) { - method333(arg0, local3, local26, aCharArrayArray3[local55], anIntArray97[local55]); + private static void filterTld(@OriginalArg(0) char[] input) { + @Pc(3) char[] filteredDot = input.clone(); + @Pc(18) char[] dot = new char[] { 'd', 'o', 't' }; + filter(filteredDot, dot, null); + + @Pc(26) char[] filteredSlash = input.clone(); + @Pc(49) char[] slash = new char[] { 's', 'l', 'a', 's', 'h' }; + filter(filteredSlash, slash, null); + + for (@Pc(55) int i = 0; i < tlds.length; i++) { + filterTld(input, filteredDot, filteredSlash, tlds[i], tldType[i]); } } @OriginalMember(owner = "mudclient!a/g", name = "a", descriptor = "([C[C[C[CI)V") - private static void method333(@OriginalArg(0) char[] arg0, @OriginalArg(1) char[] arg1, @OriginalArg(2) char[] arg2, @OriginalArg(3) char[] arg3, @OriginalArg(4) int arg4) { - if (arg3.length > arg0.length) { + private static void filterTld(@OriginalArg(0) char[] chars, @OriginalArg(1) char[] arg1, @OriginalArg(2) char[] arg2, @OriginalArg(3) char[] tld, @OriginalArg(4) int type) { + if (tld.length > chars.length) { return; } - for (@Pc(9) int local9 = 0; local9 <= arg0.length - arg3.length; local9++) { - @Pc(13) int local13 = local9; - @Pc(15) int local15 = 0; + + for (@Pc(9) int start = 0; start <= chars.length - tld.length; start++) { + @Pc(13) int end = start; + @Pc(15) int offset = 0; + label120: while (true) { while (true) { - if (local13 >= arg0.length) { + if (end >= chars.length) { break label120; } - @Pc(23) char local23 = arg0[local13]; - @Pc(25) char local25 = 0; - if (local13 + 1 < arg0.length) { - local25 = arg0[local13 + 1]; + + @Pc(23) char b = chars[end]; + @Pc(25) char c = 0; + + if (end + 1 < chars.length) { + c = chars[end + 1]; } - @Pc(49) int local49; - if (local15 < arg3.length && (local49 = method338(arg3[local15], local23, local25)) > 0) { - local13 += local49; - local15++; + + @Pc(49) int charLen; + if (offset < tld.length && (charLen = getEmulatedDomainCharSize(tld[offset], b, c)) > 0) { + end += charLen; + offset++; } else { - if (local15 == 0) { + if (offset == 0) { break label120; } - @Pc(69) int local69; - if ((local69 = method338(arg3[local15 - 1], local23, local25)) > 0) { - local13 += local69; + + @Pc(69) int charLen2; + if ((charLen2 = getEmulatedDomainCharSize(tld[offset - 1], b, c)) > 0) { + end += charLen2; } else { - if (local15 >= arg3.length || !method344(local23)) { + if (offset >= tld.length || !isSymbol(b)) { break label120; } - local13++; + + end++; } } } } - if (local15 >= arg3.length) { - @Pc(95) boolean local95 = false; - @Pc(100) int local100 = method334(arg0, arg1, local9); - @Pc(107) int local107 = method335(arg0, arg2, local13 - 1); - if (aBoolean46) { - System.out.println("Potential tld: " + arg3 + " at char " + local9 + " (type=" + arg4 + ", startmatch=" + local100 + ", endmatch=" + local107 + ")"); + + if (offset >= tld.length) { + @Pc(95) boolean match = false; + @Pc(100) int startMatch = getTldDotFilterStatus(chars, arg1, start); + @Pc(107) int endMatch = getTldSlashFilterStatus(chars, arg2, end - 1); + + if (VERBOSE) { + System.out.println("Potential tld: " + tld + " at char " + start + " (type=" + type + ", startmatch=" + startMatch + ", endmatch=" + endMatch + ")"); } - if (arg4 == 1 && local100 > 0 && local107 > 0) { - local95 = true; + + if (type == 1 && startMatch > 0 && endMatch > 0) { + match = true; } - if (arg4 == 2 && (local100 > 2 && local107 > 0 || local100 > 0 && local107 > 2)) { - local95 = true; + + if (type == 2 && (startMatch > 2 && endMatch > 0 || startMatch > 0 && endMatch > 2)) { + match = true; } - if (arg4 == 3 && local100 > 0 && local107 > 2) { - local95 = true; + + if (type == 3 && startMatch > 0 && endMatch > 2) { + match = true; } - @Pc(179) boolean local179; - if (arg4 == 3 && local100 > 2 && local107 > 0) { - local179 = true; + + @Pc(179) boolean lastCheck; + if (type == 3 && startMatch > 2 && endMatch > 0) { + lastCheck = true; } else { - local179 = false; + lastCheck = false; } - if (local95) { - if (aBoolean46) { - System.out.println("Filtered tld: " + arg3 + " at char " + local9); - } - @Pc(201) int local201 = local9; - @Pc(205) int local205 = local13 - 1; - @Pc(213) boolean local213; - @Pc(217) int local217; - if (local100 > 2) { - if (local100 == 4) { - local213 = false; - for (local217 = local9 - 1; local217 >= 0; local217--) { - if (local213) { - if (arg1[local217] != '*') { + + if (match) { + if (VERBOSE) { + System.out.println("Filtered tld: " + tld + " at char " + start); + } + + @Pc(201) int first = start; + @Pc(205) int last = end - 1; + @Pc(213) boolean findStart; + @Pc(217) int i; + + if (startMatch > 2) { + if (startMatch == 4) { + findStart = false; + + for (i = start - 1; i >= 0; i--) { + if (findStart) { + if (arg1[i] != '*') { break; } - local201 = local217; - } else if (arg1[local217] == '*') { - local201 = local217; - local213 = true; + + first = i; + } else if (arg1[i] == '*') { + first = i; + findStart = true; } } } - local213 = false; - for (local217 = local201 - 1; local217 >= 0; local217--) { - if (local213) { - if (method344(arg0[local217])) { + + findStart = false; + for (i = first - 1; i >= 0; i--) { + if (findStart) { + if (isSymbol(chars[i])) { break; } - local201 = local217; - } else if (!method344(arg0[local217])) { - local213 = true; - local201 = local217; + + first = i; + } else if (!isSymbol(chars[i])) { + findStart = true; + first = i; } } } - if (local107 > 2) { - if (local107 == 4) { - local213 = false; - for (local217 = local205 + 1; local217 < arg0.length; local217++) { - if (local213) { - if (arg2[local217] != '*') { + + if (endMatch > 2) { + if (endMatch == 4) { + findStart = false; + for (i = last + 1; i < chars.length; i++) { + if (findStart) { + if (arg2[i] != '*') { break; } - local205 = local217; - } else if (arg2[local217] == '*') { - local205 = local217; - local213 = true; + + last = i; + } else if (arg2[i] == '*') { + last = i; + findStart = true; } } } - local213 = false; - for (local217 = local205 + 1; local217 < arg0.length; local217++) { - if (local213) { - if (method344(arg0[local217])) { + + findStart = false; + for (i = last + 1; i < chars.length; i++) { + if (findStart) { + if (isSymbol(chars[i])) { break; } - local205 = local217; - } else if (!method344(arg0[local217])) { - local213 = true; - local205 = local217; + + last = i; + } else if (!isSymbol(chars[i])) { + findStart = true; + last = i; } } } - for (@Pc(347) int local347 = local201; local347 <= local205; local347++) { - arg0[local347] = '*'; + + for (@Pc(347) int j = first; j <= last; j++) { + chars[j] = '*'; } } } @@ -321,174 +361,209 @@ private static void method333(@OriginalArg(0) char[] arg0, @OriginalArg(1) char[ } @OriginalMember(owner = "mudclient!a/g", name = "a", descriptor = "([C[CI)I") - private static int method334(@OriginalArg(0) char[] arg0, @OriginalArg(1) char[] arg1, @OriginalArg(2) int arg2) { - if (arg2 == 0) { + private static int getTldDotFilterStatus(@OriginalArg(0) char[] a, @OriginalArg(1) char[] b, @OriginalArg(2) int start) { + if (start == 0) { return 2; } - @Pc(9) int local9 = arg2 - 1; + + @Pc(9) int cur = start - 1; while (true) { - if (local9 >= 0 && method344(arg0[local9])) { - if (arg0[local9] != ',' && arg0[local9] != '.') { - local9--; + if (cur >= 0 && isSymbol(a[cur])) { + if (a[cur] != ',' && a[cur] != '.') { + cur--; continue; } return 3; } - @Pc(33) int local33 = 0; - for (@Pc(37) int local37 = arg2 - 1; local37 >= 0 && method344(arg1[local37]); local37--) { - if (arg1[local37] == '*') { - local33++; + + @Pc(33) int asteriskCount = 0; + for (@Pc(37) int i = start - 1; i >= 0 && isSymbol(b[i]); i--) { + if (b[i] == '*') { + asteriskCount++; } } - if (local33 >= 3) { + + if (asteriskCount >= 3) { return 4; } - if (method344(arg0[arg2 - 1])) { + + if (isSymbol(a[start - 1])) { return 1; } + return 0; } } @OriginalMember(owner = "mudclient!a/g", name = "b", descriptor = "([C[CI)I") - private static int method335(@OriginalArg(0) char[] arg0, @OriginalArg(1) char[] arg1, @OriginalArg(2) int arg2) { - if (arg2 + 1 == arg0.length) { + private static int getTldSlashFilterStatus(@OriginalArg(0) char[] a, @OriginalArg(1) char[] b, @OriginalArg(2) int end) { + if (end + 1 == a.length) { return 2; } - @Pc(13) int local13 = arg2 + 1; + + @Pc(13) int cur = end + 1; while (true) { - if (local13 < arg0.length && method344(arg0[local13])) { - if (arg0[local13] != '\\' && arg0[local13] != '/') { - local13++; + if (cur < a.length && isSymbol(a[cur])) { + if (a[cur] != '\\' && a[cur] != '/') { + cur++; continue; } + return 3; } - @Pc(39) int local39 = 0; - for (@Pc(43) int local43 = arg2 + 1; local43 < arg0.length && method344(arg1[local43]); local43++) { - if (arg1[local43] == '*') { - local39++; + + @Pc(39) int asteriskCount = 0; + for (@Pc(43) int i = end + 1; i < a.length && isSymbol(b[i]); i++) { + if (b[i] == '*') { + asteriskCount++; } } - if (local39 >= 5) { + + if (asteriskCount >= 5) { return 4; } - if (method344(arg0[arg2 + 1])) { + + if (isSymbol(a[end + 1])) { return 1; } + return 0; } } @OriginalMember(owner = "mudclient!a/g", name = "a", descriptor = "([C[C[[B)V") - private static void method336(@OriginalArg(0) char[] arg0, @OriginalArg(1) char[] arg1, @OriginalArg(2) byte[][] arg2) { - if (arg1.length > arg0.length) { + private static void filter(@OriginalArg(0) char[] input, @OriginalArg(1) char[] fragment, @OriginalArg(2) byte[][] badCombinations) { + if (fragment.length > input.length) { return; } - for (@Pc(9) int local9 = 0; local9 <= arg0.length - arg1.length; local9++) { - @Pc(13) int local13 = local9; - @Pc(15) int local15 = 0; - @Pc(17) boolean local17 = false; - @Pc(25) char var8; - @Pc(27) char var9; + + for (@Pc(9) int start = 0; start <= input.length - fragment.length; start++) { + @Pc(13) int end = start; + @Pc(15) int fragOff = 0; + @Pc(17) boolean bad = false; + @Pc(25) char b; + @Pc(27) char c; + label118: while (true) { while (true) { - if (local13 >= arg0.length) { + if (end >= input.length) { break label118; } - var8 = arg0[local13]; - var9 = '\u0000'; - if (local13 + 1 < arg0.length) { - var9 = arg0[local13 + 1]; + + b = input[end]; + c = '\u0000'; + if (end + 1 < input.length) { + c = input[end + 1]; } - @Pc(51) int local51; - if (local15 < arg1.length && (local51 = method339(arg1[local15], var8, var9)) > 0) { - local13 += local51; - local15++; + + @Pc(51) int charLen; + if (fragOff < fragment.length && (charLen = getEmulatedSize(fragment[fragOff], b, c)) > 0) { + end += charLen; + fragOff++; } else { - if (local15 == 0) { + if (fragOff == 0) { break label118; } - @Pc(71) int local71; - if ((local71 = method339(arg1[local15 - 1], var8, var9)) > 0) { - local13 += local71; + + @Pc(71) int charLen2; + if ((charLen2 = getEmulatedSize(fragment[fragOff - 1], b, c)) > 0) { + end += charLen2; } else { - if (local15 >= arg1.length || !method345(var8)) { + if (fragOff >= fragment.length || !isLowerCaseAlpha(b)) { break label118; } - if (method344(var8) && var8 != '\'') { - local17 = true; + + if (isSymbol(b) && b != '\'') { + bad = true; } - local13++; + + end++; } } } } - if (local15 >= arg1.length) { - @Pc(105) boolean local105 = true; - if (aBoolean46) { - System.out.println("Potential word: " + arg1 + " at char " + local9); + + if (fragOff >= fragment.length) { + @Pc(105) boolean isSymbol = true; + if (VERBOSE) { + System.out.println("Potential word: " + fragment + " at char " + start); } - if (local17) { - @Pc(163) boolean local163 = false; - @Pc(165) boolean local165 = false; - if (local9 - 1 < 0 || method344(arg0[local9 - 1]) && arg0[local9 - 1] != '\'') { - local163 = true; - } - if (local13 >= arg0.length || method344(arg0[local13]) && arg0[local13] != '\'') { - local165 = true; - } - if (!local163 || !local165) { - @Pc(207) boolean local207 = false; - @Pc(211) int local211 = local9 - 2; - if (local163) { - local211 = local9; + + if (bad) { + @Pc(163) boolean badCurrent = false; + @Pc(165) boolean badNext = false; + + if (start - 1 < 0 || isSymbol(input[start - 1]) && input[start - 1] != '\'') { + badCurrent = true; + } + + if (end >= input.length || isSymbol(input[end]) && input[end] != '\'') { + badNext = true; + } + + if (!badCurrent || !badNext) { + @Pc(207) boolean good = false; + @Pc(211) int cur = start - 2; + if (badCurrent) { + cur = start; } - while (!local207 && local211 < local13) { - if (local211 >= 0 && (!method344(arg0[local211]) || arg0[local211] == '\'')) { - @Pc(232) char[] local232 = new char[3]; - @Pc(234) int local234; - for (local234 = 0; local234 < 3 && local211 + local234 < arg0.length && (!method344(arg0[local211 + local234]) || arg0[local211 + local234] == '\''); local234++) { - local232[local234] = arg0[local211 + local234]; + + while (!good && cur < end) { + if (cur >= 0 && (!isSymbol(input[cur]) || input[cur] == '\'')) { + @Pc(232) char[] frag = new char[3]; + + @Pc(234) int off; + for (off = 0; off < 3 && cur + off < input.length && (!isSymbol(input[cur + off]) || input[cur + off] == '\''); off++) { + frag[off] = input[cur + off]; } - @Pc(271) boolean local271 = true; - if (local234 == 0) { - local271 = false; + + @Pc(271) boolean valid = true; + + if (off == 0) { + valid = false; } - if (local234 < 3 && local211 - 1 >= 0 && (!method344(arg0[local211 - 1]) || arg0[local211 - 1] == '\'')) { - local271 = false; + + if (off < 3 && cur - 1 >= 0 && (!isSymbol(input[cur - 1]) || input[cur - 1] == '\'')) { + valid = false; } - if (local271 && !method350(local232)) { - local207 = true; + + if (valid && !isBadFragment(frag)) { + good = true; } } - local211++; + cur++; } - if (!local207) { - local105 = false; + + if (!good) { + isSymbol = false; } } } else { - var8 = ' '; - if (local9 - 1 >= 0) { - var8 = arg0[local9 - 1]; + b = ' '; + if (start - 1 >= 0) { + b = input[start - 1]; } - var9 = ' '; - if (local13 < arg0.length) { - var9 = arg0[local13]; + + c = ' '; + if (end < input.length) { + c = input[end]; } - @Pc(147) byte local147 = method340(var8); - @Pc(150) byte local150 = method340(var9); - if (arg2 != null && method337(arg2, local147, local150)) { - local105 = false; + + @Pc(147) byte bIndex = getIndex(b); + @Pc(150) byte cIndex = getIndex(c); + + if (badCombinations != null && comboMatches(badCombinations, bIndex, cIndex)) { + isSymbol = false; } } - if (local105) { - if (aBoolean47) { - System.out.println("Filtered word: " + arg1 + " at char " + local9); + + if (isSymbol) { + if (DEBUG) { + System.out.println("Filtered word: " + fragment + " at char " + start); } - for (@Pc(334) int local334 = local9; local334 < local13; local334++) { - arg0[local334] = '*'; + + for (@Pc(334) int i = start; i < end; i++) { + input[i] = '*'; } } } @@ -496,48 +571,52 @@ private static void method336(@OriginalArg(0) char[] arg0, @OriginalArg(1) char[ } @OriginalMember(owner = "mudclient!a/g", name = "a", descriptor = "([[BBB)Z") - private static boolean method337(@OriginalArg(0) byte[][] arg0, @OriginalArg(1) byte arg1, @OriginalArg(2) byte arg2) { - @Pc(1) int local1 = 0; - if (arg0[local1][0] == arg1 && arg0[local1][1] == arg2) { + private static boolean comboMatches(@OriginalArg(0) byte[][] combo, @OriginalArg(1) byte a, @OriginalArg(2) byte b) { + @Pc(1) int first = 0; + if (combo[first][0] == a && combo[first][1] == b) { return true; } - @Pc(22) int local22 = arg0.length - 1; - if (arg0[local22][0] == arg1 && arg0[local22][1] == arg2) { + + @Pc(22) int last = combo.length - 1; + if (combo[last][0] == a && combo[last][1] == b) { return true; } + do { - @Pc(44) int local44 = (local1 + local22) / 2; - if (arg0[local44][0] == arg1 && arg0[local44][1] == arg2) { + @Pc(44) int middle = (first + last) / 2; + if (combo[middle][0] == a && combo[middle][1] == b) { return true; } - if (arg1 < arg0[local44][0] || arg1 == arg0[local44][0] && arg2 < arg0[local44][1]) { - local22 = local44; + + if (a < combo[middle][0] || a == combo[middle][0] && b < combo[middle][1]) { + last = middle; } else { - local1 = local44; + first = middle; } - } while (local1 != local22 && local1 + 1 != local22); + } while (first != last && first + 1 != last); + return false; } @OriginalMember(owner = "mudclient!a/g", name = "a", descriptor = "(CCC)I") - private static int method338(@OriginalArg(0) char arg0, @OriginalArg(1) char arg1, @OriginalArg(2) char arg2) { - if (arg0 == arg1) { + private static int getEmulatedDomainCharSize(@OriginalArg(0) char a, @OriginalArg(1) char b, @OriginalArg(2) char c) { + if (a == b) { return 1; - } else if (arg0 == 'e' && arg1 == '3') { + } else if (a == 'e' && b == '3') { return 1; - } else if (arg0 == 't' && (arg1 == '7' || arg1 == '+')) { + } else if (a == 't' && (b == '7' || b == '+')) { return 1; - } else if (arg0 == 'a' && (arg1 == '4' || arg1 == '@')) { + } else if (a == 'a' && (b == '4' || b == '@')) { return 1; - } else if (arg0 == 'o' && arg1 == '0') { + } else if (a == 'o' && b == '0') { return 1; - } else if (arg0 == 'i' && arg1 == '1') { + } else if (a == 'i' && b == '1') { return 1; - } else if (arg0 == 's' && arg1 == '5') { + } else if (a == 's' && b == '5') { return 1; - } else if (arg0 == 'f' && arg1 == 'p' && arg2 == 'h') { + } else if (a == 'f' && b == 'p' && c == 'h') { return 2; - } else if (arg0 == 'g' && arg1 == '9') { + } else if (a == 'g' && b == '9') { return 1; } else { return 0; @@ -545,366 +624,371 @@ private static int method338(@OriginalArg(0) char arg0, @OriginalArg(1) char arg } @OriginalMember(owner = "mudclient!a/g", name = "b", descriptor = "(CCC)I") - private static int method339(@OriginalArg(0) char arg0, @OriginalArg(1) char arg1, @OriginalArg(2) char arg2) { - if (arg0 == '*') { + private static int getEmulatedSize(@OriginalArg(0) char a, @OriginalArg(1) char b, @OriginalArg(2) char c) { + if (a == '*') { return 0; - } else if (arg0 == arg1) { + } else if (a == b) { return 1; } else { - if (arg0 >= 'a' && arg0 <= 'z') { - if (arg0 == 'e') { - if (arg1 == '3') { + if (a >= 'a' && a <= 'z') { + if (a == 'e') { + if (b == '3') { return 1; } + return 0; - } - if (arg0 == 't') { - if (arg1 == '7') { + } else if (a == 't') { + if (b == '7') { return 1; } + return 0; - } - if (arg0 == 'a') { - if (arg1 != '4' && arg1 != '@') { + } else if (a == 'a') { + if (b != '4' && b != '@') { return 0; } + return 1; - } - if (arg0 == 'o') { - if (arg1 != '0' && arg1 != '*') { - if (arg1 == '(' && arg2 == ')') { + } else if (a == 'o') { + if (b != '0' && b != '*') { + if (b == '(' && c == ')') { return 2; } + return 0; } + return 1; - } - if (arg0 == 'i') { - if (arg1 != 'y' && arg1 != 'l' && arg1 != 'j' && arg1 != '1' && arg1 != '!' && arg1 != ':' && arg1 != ';') { + } else if (a == 'i') { + if (b != 'y' && b != 'l' && b != 'j' && b != '1' && b != '!' && b != ':' && b != ';') { return 0; } + return 1; - } - if (arg0 == 'n') { + } else if (a == 'n') { return 0; - } - if (arg0 == 's') { - if (arg1 != '5' && arg1 != 'z' && arg1 != '$') { + } else if (a == 's') { + if (b != '5' && b != 'z' && b != '$') { return 0; } + return 1; - } - if (arg0 == 'r') { + } else if (a == 'r') { return 0; - } - if (arg0 == 'h') { + } else if (a == 'h') { return 0; - } - if (arg0 == 'l') { - if (arg1 == '1') { + } else if (a == 'l') { + if (b == '1') { return 1; } + return 0; - } - if (arg0 == 'd') { + } else if (a == 'd') { return 0; - } - if (arg0 == 'c') { - if (arg1 == '(') { + } else if (a == 'c') { + if (b == '(') { return 1; } + return 0; - } - if (arg0 == 'u') { - if (arg1 == 'v') { + } else if (a == 'u') { + if (b == 'v') { return 1; } + return 0; - } - if (arg0 == 'm') { + } else if (a == 'm') { return 0; - } - if (arg0 == 'f') { - if (arg1 == 'p' && arg2 == 'h') { + } else if (a == 'f') { + if (b == 'p' && c == 'h') { return 2; } + return 0; - } - if (arg0 == 'p') { + } else if (a == 'p') { return 0; - } - if (arg0 == 'g') { - if (arg1 != '9' && arg1 != '6') { + } else if (a == 'g') { + if (b != '9' && b != '6') { return 0; } + return 1; - } - if (arg0 == 'w') { - if (arg1 == 'v' && arg2 == 'v') { + } else if (a == 'w') { + if (b == 'v' && c == 'v') { return 2; } + return 0; - } - if (arg0 == 'y') { + } else if (a == 'y') { return 0; - } - if (arg0 == 'b') { - if (arg1 == '1' && arg2 == '3') { + } else if (a == 'b') { + if (b == '1' && c == '3') { return 2; } + return 0; - } - if (arg0 == 'v') { + } else if (a == 'v') { return 0; - } - if (arg0 == 'k') { + } else if (a == 'k') { return 0; - } - if (arg0 == 'x') { - if (arg1 == ')' && arg2 == '(') { + } else if (a == 'x') { + if (b == ')' && c == '(') { return 2; } + return 0; - } - if (arg0 == 'j') { + } else if (a == 'j') { return 0; - } - if (arg0 == 'q') { + } else if (a == 'q') { return 0; - } - if (arg0 == 'z') { + } else if (a == 'z') { return 0; } - } - if (arg0 >= '0' && arg0 <= '9') { - if (arg0 == '0') { - if (arg1 != 'o' && arg1 != 'O') { - if (arg1 == '(' && arg2 == ')') { + } else if (a >= '0' && a <= '9') { + if (a == '0') { + if (b != 'o' && b != 'O') { + if (b == '(' && c == ')') { return 2; } return 0; } return 1; - } - if (arg0 == '1') { - if (arg1 == 'l') { + } else if (a == '1') { + if (b == 'l') { return 1; } + return 0; - } - if (arg0 == '2') { + } else if (a == '2') { return 0; - } - if (arg0 == '3') { + } else if (a == '3') { return 0; - } - if (arg0 == '4') { + } else if (a == '4') { return 0; - } - if (arg0 == '5') { + } else if (a == '5') { return 0; - } - if (arg0 == '6') { + } else if (a == '6') { return 0; - } - if (arg0 == '7') { + } else if (a == '7') { return 0; - } - if (arg0 == '8') { + } else if (a == '8') { return 0; - } - if (arg0 == '9') { + } else if (a == '9') { return 0; } } - if (arg0 == '-') { + + if (a == '-') { return 0; - } else if (arg0 == ',') { - return arg1 == '.' ? 1 : 0; - } else if (arg0 == '.') { - return arg1 == ',' ? 1 : 0; - } else if (arg0 == '(') { + } else if (a == ',') { + return b == '.' ? 1 : 0; + } else if (a == '.') { + return b == ',' ? 1 : 0; + } else if (a == '(') { return 0; - } else if (arg0 == ')') { + } else if (a == ')') { return 0; - } else if (arg0 == '!') { - return arg1 == 'i' ? 1 : 0; - } else if (arg0 == '\'') { + } else if (a == '!') { + return b == 'i' ? 1 : 0; + } else if (a == '\'') { return 0; } else { - if (aBoolean47) { - System.out.println("Letter=" + arg0 + " not matched"); + if (DEBUG) { + System.out.println("Letter=" + a + " not matched"); } + return 0; } } } @OriginalMember(owner = "mudclient!a/g", name = "a", descriptor = "(C)B") - private static byte method340(@OriginalArg(0) char arg0) { - if (arg0 >= 'a' && arg0 <= 'z') { - return (byte) (arg0 + 1 - 'a'); - } else if (arg0 == '\'') { + private static byte getIndex(@OriginalArg(0) char c) { + if (c >= 'a' && c <= 'z') { + return (byte) (c + 1 - 'a'); + } else if (c == '\'') { return 28; - } else if (arg0 >= '0' && arg0 <= '9') { - return (byte) (arg0 + 29 - '0'); + } else if (c >= '0' && c <= '9') { + return (byte) (c + 29 - '0'); } else { return 27; } } @OriginalMember(owner = "mudclient!a/g", name = "e", descriptor = "([C)V") - private static void method341(@OriginalArg(0) char[] arg0) { - @Pc(5) int local5 = 0; - @Pc(7) int local7 = 0; - @Pc(9) int local9 = 0; + private static void filterFragments(@OriginalArg(0) char[] input) { + @Pc(5) int end = 0; + @Pc(7) int count = 0; + @Pc(9) int start = 0; + while (true) { do { - @Pc(104) int local104; - if ((local104 = method342(arg0, local5)) == -1) { + @Pc(104) int index; + if ((index = indexOfNumber(input, end)) == -1) { return; } - @Pc(13) boolean local13 = false; - for (@Pc(15) int local15 = local5; local15 >= 0 && local15 < local104 && !local13; local15++) { - if (!method344(arg0[local15]) && !method345(arg0[local15])) { - local13 = true; + + @Pc(13) boolean foundLowercase = false; + for (@Pc(15) int i = end; i >= 0 && i < index && !foundLowercase; i++) { + if (!isSymbol(input[i]) && !isLowerCaseAlpha(input[i])) { + foundLowercase = true; } } - if (local13) { - local7 = 0; + + if (foundLowercase) { + count = 0; } - if (local7 == 0) { - local9 = local104; + + if (count == 0) { + start = index; } - local5 = method343(arg0, local104); - @Pc(51) int local51 = 0; - for (@Pc(53) int local53 = local104; local53 < local5; local53++) { - local51 = local51 * 10 + arg0[local53] - 48; + + end = indexOfNonNumber(input, index); + @Pc(51) int hash = 0; + for (@Pc(53) int i = index; i < end; i++) { + hash = hash * 10 + input[i] - 48; } - if (local51 <= 255 && local5 - local104 <= 8) { - local7++; + + if (hash <= 255 && end - index <= 8) { + count++; } else { - local7 = 0; + count = 0; } - } while (local7 != 4); - for (@Pc(87) int local87 = local9; local87 < local5; local87++) { - arg0[local87] = '*'; + } while (count != 4); + + for (@Pc(87) int i = start; i < end; i++) { + input[i] = '*'; } - local7 = 0; + + count = 0; } } @OriginalMember(owner = "mudclient!a/g", name = "a", descriptor = "([CI)I") - private static int method342(@OriginalArg(0) char[] arg0, @OriginalArg(1) int arg1) { - for (@Pc(1) int local1 = arg1; local1 < arg0.length && local1 >= 0; local1++) { - if (arg0[local1] >= '0' && arg0[local1] <= '9') { - return local1; + private static int indexOfNumber(@OriginalArg(0) char[] input, @OriginalArg(1) int off) { + for (@Pc(1) int i = off; i < input.length && i >= 0; i++) { + if (input[i] >= '0' && input[i] <= '9') { + return i; } } + return -1; } @OriginalMember(owner = "mudclient!a/g", name = "b", descriptor = "([CI)I") - private static int method343(@OriginalArg(0) char[] arg0, @OriginalArg(1) int arg1) { - @Pc(1) int local1 = arg1; + private static int indexOfNonNumber(@OriginalArg(0) char[] input, @OriginalArg(1) int off) { + @Pc(1) int i = off; + while (true) { - if (local1 < arg0.length && local1 >= 0) { - if (arg0[local1] >= '0' && arg0[local1] <= '9') { - local1++; + if (i < input.length && i >= 0) { + if (input[i] >= '0' && input[i] <= '9') { + i++; continue; } - return local1; + + return i; } - return arg0.length; + + return input.length; } } @OriginalMember(owner = "mudclient!a/g", name = "b", descriptor = "(C)Z") - private static boolean method344(@OriginalArg(0) char arg0) { - return !method346(arg0) && !method347(arg0); + private static boolean isSymbol(@OriginalArg(0) char c) { + return !isAlpha(c) && !isNumber(c); } @OriginalMember(owner = "mudclient!a/g", name = "c", descriptor = "(C)Z") - private static boolean method345(@OriginalArg(0) char arg0) { - if (arg0 >= 'a' && arg0 <= 'z') { - return arg0 == 'v' || arg0 == 'x' || arg0 == 'j' || arg0 == 'q' || arg0 == 'z'; + private static boolean isLowerCaseAlpha(@OriginalArg(0) char c) { + if (c >= 'a' && c <= 'z') { + return c == 'v' || c == 'x' || c == 'j' || c == 'q' || c == 'z'; } else { return true; } } @OriginalMember(owner = "mudclient!a/g", name = "d", descriptor = "(C)Z") - private static boolean method346(@OriginalArg(0) char arg0) { - return arg0 >= 'a' && arg0 <= 'z' || arg0 >= 'A' && arg0 <= 'Z'; + private static boolean isAlpha(@OriginalArg(0) char c) { + return c >= 'a' && c <= 'z' || c >= 'A' && c <= 'Z'; } @OriginalMember(owner = "mudclient!a/g", name = "e", descriptor = "(C)Z") - private static boolean method347(@OriginalArg(0) char arg0) { - return arg0 >= '0' && arg0 <= '9'; + private static boolean isNumber(@OriginalArg(0) char c) { + return c >= '0' && c <= '9'; } @OriginalMember(owner = "mudclient!a/g", name = "f", descriptor = "(C)Z") - private static boolean method348(@OriginalArg(0) char arg0) { - return arg0 >= 'a' && arg0 <= 'z'; + private static boolean isLowerCase(@OriginalArg(0) char c) { + return c >= 'a' && c <= 'z'; } @OriginalMember(owner = "mudclient!a/g", name = "g", descriptor = "(C)Z") - private static boolean method349(@OriginalArg(0) char arg0) { - return arg0 >= 'A' && arg0 <= 'Z'; + private static boolean isUpperCase(@OriginalArg(0) char c) { + return c >= 'A' && c <= 'Z'; } @OriginalMember(owner = "mudclient!a/g", name = "f", descriptor = "([C)Z") - private static boolean method350(@OriginalArg(0) char[] arg0) { - @Pc(3) boolean local3 = true; - for (@Pc(5) int local5 = 0; local5 < arg0.length; local5++) { - if (!method347(arg0[local5]) && arg0[local5] != '\u0000') { - local3 = false; + private static boolean isBadFragment(@OriginalArg(0) char[] input) { + @Pc(3) boolean skip = true; + for (@Pc(5) int i = 0; i < input.length; i++) { + if (!isNumber(input[i]) && input[i] != '\u0000') { + skip = false; } } - if (local3) { + + if (skip) { return true; } - @Pc(30) int local30 = method351(arg0); - @Pc(32) int local32 = 0; - @Pc(37) int local37 = anIntArray96.length - 1; - if (local30 == anIntArray96[local32] || local30 == anIntArray96[local37]) { + + @Pc(30) int hash = word2hash(input); + @Pc(32) int start = 0; + @Pc(37) int end = fragments.length - 1; + + if (hash == fragments[start] || hash == fragments[end]) { return true; } + do { - @Pc(55) int local55 = (local32 + local37) / 2; - if (local30 == anIntArray96[local55]) { + @Pc(55) int middle = (start + end) / 2; + if (hash == fragments[middle]) { return true; } - if (local30 < anIntArray96[local55]) { - local37 = local55; + + if (hash < fragments[middle]) { + end = middle; } else { - local32 = local55; + start = middle; } - } while (local32 != local37 && local32 + 1 != local37); + } while (start != end && start + 1 != end); + return false; } @OriginalMember(owner = "mudclient!a/g", name = "g", descriptor = "([C)I") - private static int method351(@OriginalArg(0) char[] arg0) { - if (arg0.length > 6) { + private static int word2hash(@OriginalArg(0) char[] input) { + if (input.length > 6) { return 0; } - @Pc(9) int local9 = 0; - for (@Pc(11) int local11 = 0; local11 < arg0.length; local11++) { - @Pc(22) char local22 = arg0[arg0.length - local11 - 1]; - if (local22 >= 'a' && local22 <= 'z') { - local9 = local9 * 38 + local22 + 1 - 'a'; - } else if (local22 == '\'') { - local9 = local9 * 38 + 27; - } else if (local22 >= '0' && local22 <= '9') { - local9 = local9 * 38 + local22 + 28 - '0'; - } else if (local22 != '\u0000') { - if (aBoolean47) { - System.out.println("word2hash failed on " + new String(arg0)); + + @Pc(9) int value = 0; + for (@Pc(11) int i = 0; i < input.length; i++) { + @Pc(22) char c = input[input.length - i - 1]; + + if (c >= 'a' && c <= 'z') { + value = value * 38 + c + 1 - 'a'; + } else if (c == '\'') { + value = value * 38 + 27; + } else if (c >= '0' && c <= '9') { + value = value * 38 + c + 28 - '0'; + } else if (c != '\u0000') { + if (DEBUG) { + System.out.println("word2hash failed on " + new String(input)); } + return 0; } } - return local9; + + return value; } } diff --git a/mudclient/src/main/java/jagex/client/Client.java b/mudclient/src/main/java/jagex/client/Client.java index 1de976a..2cb8902 100644 --- a/mudclient/src/main/java/jagex/client/Client.java +++ b/mudclient/src/main/java/jagex/client/Client.java @@ -406,7 +406,7 @@ private void method475(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1) { this.method470(); } if (local7 == 10) { - this.method490(); + this.tryLogout(); return; } @Pc(46) int local46; @@ -453,7 +453,7 @@ private void method475(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1) { this.duelRequestsMode = this.in[4]; } else if (local7 == 28) { local89 = Tools.g8(this.in, 1); - @Pc(270) String local270 = WordFilter.method327(WordPack.method352(this.in, 9, arg1 - 9)); + @Pc(270) String local270 = WordFilter.filter(WordPack.method352(this.in, 9, arg1 - 9)); this.method493("@pri@" + Tools.fromBase37(local89) + ": tells you " + local270); } else { this.method492(local7, arg1, this.in); @@ -598,7 +598,7 @@ protected void method489() { } @OriginalMember(owner = "mudclient!a/a/b", name = "r", descriptor = "()V") - protected void method490() { + protected void tryLogout() { } @OriginalMember(owner = "mudclient!a/a/b", name = "s", descriptor = "()V") diff --git a/mudclient/src/main/java/jagex/client/Gui.java b/mudclient/src/main/java/jagex/client/Gui.java index 9eeb9f7..33acaf6 100644 --- a/mudclient/src/main/java/jagex/client/Gui.java +++ b/mudclient/src/main/java/jagex/client/Gui.java @@ -276,7 +276,7 @@ public void method75() { if (this.anIntArray9[local3] == 0) { this.method77(local3, this.anIntArray7[local3], this.anIntArray8[local3], this.aStringArray2[local3], this.anIntArray13[local3]); } else if (this.anIntArray9[local3] == 1) { - this.method77(local3, this.anIntArray7[local3] - this.aPixMap_1.method412(this.aStringArray2[local3], this.anIntArray13[local3]) / 2, this.anIntArray8[local3], this.aStringArray2[local3], this.anIntArray13[local3]); + this.method77(local3, this.anIntArray7[local3] - this.aPixMap_1.stringWidth(this.aStringArray2[local3], this.anIntArray13[local3]) / 2, this.anIntArray8[local3], this.aStringArray2[local3], this.anIntArray13[local3]); } else if (this.anIntArray9[local3] == 2) { this.method80(this.anIntArray7[local3], this.anIntArray8[local3], this.anIntArray10[local3], this.anIntArray11[local3]); } else if (this.anIntArray9[local3] == 3) { @@ -332,7 +332,7 @@ private void method78(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @Origi } else { local6 = 0; } - this.aPixMap_1.drawStringTaggable(arg3, arg1, arg2, arg4, local6); + this.aPixMap_1.drawString(arg3, arg1, arg2, arg4, local6); } @OriginalMember(owner = "mudclient!a/a/e", name = "a", descriptor = "(IIIIILjava/lang/String;I)V") @@ -353,7 +353,7 @@ private void method79(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @Origi if (this.anInt57 == 1 && this.anInt55 >= arg1 - arg3 / 2 && this.anInt56 >= arg2 - arg4 / 2 && this.anInt55 <= arg1 + arg3 / 2 && this.anInt56 <= arg2 + arg4 / 2) { this.anInt59 = arg0; } - arg1 -= this.aPixMap_1.method412(arg5, arg6) / 2; + arg1 -= this.aPixMap_1.stringWidth(arg5, arg6) / 2; } if (this.anInt59 == arg0) { arg5 = arg5 + "*"; @@ -485,9 +485,9 @@ private void method86(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @Origi @Pc(3) int local3 = 0; @Pc(6) int local6 = arg4.length; for (@Pc(8) int local8 = 0; local8 < local6; local8++) { - local3 += this.aPixMap_1.method412(arg4[local8], arg3); + local3 += this.aPixMap_1.stringWidth(arg4[local8], arg3); if (local8 < local6 - 1) { - local3 += this.aPixMap_1.method412(" ", arg3); + local3 += this.aPixMap_1.stringWidth(" ", arg3); } } @Pc(43) int local43 = arg1 - local3 / 2; @@ -499,7 +499,7 @@ private void method86(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @Origi } else { local63 = 0; } - if (this.anInt55 >= local43 && this.anInt55 <= local43 + this.aPixMap_1.method412(arg4[local54], arg3) && this.anInt56 <= local52 && this.anInt56 > local52 - this.aPixMap_1.method411(arg3)) { + if (this.anInt55 >= local43 && this.anInt55 <= local43 + this.aPixMap_1.stringWidth(arg4[local54], arg3) && this.anInt56 <= local52 && this.anInt56 > local52 - this.aPixMap_1.method411(arg3)) { if (this.aBooleanArray5[arg0]) { local63 = 8421504; } else { @@ -517,8 +517,8 @@ private void method86(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @Origi local63 = 12582912; } } - this.aPixMap_1.drawStringTaggable(arg4[local54], local43, local52, arg3, local63); - local43 += this.aPixMap_1.method412(arg4[local54] + " ", arg3); + this.aPixMap_1.drawString(arg4[local54], local43, local52, arg3, local63); + local43 += this.aPixMap_1.stringWidth(arg4[local54] + " ", arg3); } } @@ -533,7 +533,7 @@ private void method87(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @Origi } else { local28 = 0; } - @Pc(40) int local40 = this.aPixMap_1.method412(arg4[local19], arg3); + @Pc(40) int local40 = this.aPixMap_1.stringWidth(arg4[local19], arg3); if (this.anInt55 >= arg1 - local40 / 2 && this.anInt55 <= arg1 + local40 / 2 && this.anInt56 - 2 <= local17 && this.anInt56 - 2 > local17 - this.aPixMap_1.method411(arg3)) { if (this.aBooleanArray5[arg0]) { local28 = 8421504; @@ -552,7 +552,7 @@ private void method87(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @Origi local28 = 12582912; } } - this.aPixMap_1.drawStringTaggable(arg4[local19], arg1 - local40 / 2, local17, arg3, local28); + this.aPixMap_1.drawString(arg4[local19], arg1 - local40 / 2, local17, arg3, local28); local17 += this.aPixMap_1.method411(arg3); } } @@ -608,7 +608,7 @@ private void method88(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @Origi } else { local155 = 0; } - if (this.anInt55 >= arg1 + 2 && this.anInt55 <= arg1 + this.aPixMap_1.method412(arg6[local200], arg5) + 2 && this.anInt56 - 2 <= local25 && this.anInt56 - 2 > local25 - this.aPixMap_1.method411(arg5)) { + if (this.anInt55 >= arg1 + 2 && this.anInt55 <= arg1 + this.aPixMap_1.stringWidth(arg6[local200], arg5) + 2 && this.anInt56 - 2 <= local25 && this.anInt56 - 2 > local25 - this.aPixMap_1.method411(arg5)) { if (this.aBooleanArray5[arg0]) { local155 = 8421504; } else { @@ -623,7 +623,7 @@ private void method88(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @Origi if (this.anIntArray5[arg0] == local200 && this.aBoolean23) { local155 = 16711680; } - this.aPixMap_1.drawStringTaggable(arg6[local200], arg1 + 2, local25, arg5, local155); + this.aPixMap_1.drawString(arg6[local200], arg1 + 2, local25, arg5, local155); local25 += this.aPixMap_1.method411(arg5); if (local25 >= arg2 + arg4) { return; diff --git a/mudclient/src/main/java/jagex/client/PixMap.java b/mudclient/src/main/java/jagex/client/PixMap.java index 89f923c..22c5051 100644 --- a/mudclient/src/main/java/jagex/client/PixMap.java +++ b/mudclient/src/main/java/jagex/client/PixMap.java @@ -870,7 +870,7 @@ public final void method384(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, arg3--; } } - this.method390(this.anIntArray148, this.anIntArrayArray16[arg4], 0, local11, local13, local35, local40, arg2, arg3, local19, local25, local4, local267); + this.plot_scale(this.anIntArray148, this.anIntArrayArray16[arg4], 0, local11, local13, local35, local40, arg2, arg3, local19, local25, local4, local267); } catch (@Pc(313) Exception local313) { System.out.println("error in sprite clipping routine"); } @@ -997,7 +997,7 @@ public final void method386(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, arg3--; } } - this.method393(this.anIntArray148, this.anIntArrayArray16[arg4], 0, local11, local13, local35, local40, arg2, arg3, local19, local25, local4, local267, arg5); + this.tran_scale(this.anIntArray148, this.anIntArrayArray16[arg4], 0, local11, local13, local35, local40, arg2, arg3, local19, local25, local4, local267, arg5); } catch (@Pc(314) Exception local314) { System.out.println("error in sprite clipping routine"); } @@ -1066,7 +1066,7 @@ public final void method387(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, arg3--; } } - this.method394(this.anIntArray148, this.anIntArrayArray16[arg4], 0, local11, local13, local35, local40, arg2, arg3, local19, local25, local4, local267, arg5); + this.plot_scale(this.anIntArray148, this.anIntArrayArray16[arg4], 0, local11, local13, local35, local40, arg2, arg3, local19, local25, local4, local267, arg5); } catch (@Pc(314) Exception local314) { System.out.println("error in sprite clipping routine"); } @@ -1162,7 +1162,7 @@ private void method389(@OriginalArg(0) int[] arg0, @OriginalArg(1) byte[] arg1, } @OriginalMember(owner = "mudclient!a/a/g", name = "a", descriptor = "([I[IIIIIIIIIIII)V") - private void method390(@OriginalArg(0) int[] arg0, @OriginalArg(1) int[] 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, @OriginalArg(9) int arg9, @OriginalArg(10) int arg10, @OriginalArg(11) int arg11, @OriginalArg(12) int arg12) { + private void plot_scale(@OriginalArg(0) int[] arg0, @OriginalArg(1) int[] 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, @OriginalArg(9) int arg9, @OriginalArg(10) int arg10, @OriginalArg(11) int arg11, @OriginalArg(12) int arg12) { try { @Pc(3) int local3 = arg3; for (@Pc(6) int local6 = -arg8; local6 < 0; local6 += arg12) { @@ -1223,7 +1223,7 @@ private void method392(@OriginalArg(0) int[] arg0, @OriginalArg(1) byte[] arg1, } @OriginalMember(owner = "mudclient!a/a/g", name = "a", descriptor = "([I[IIIIIIIIIIIII)V") - private void method393(@OriginalArg(0) int[] arg0, @OriginalArg(1) int[] 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, @OriginalArg(9) int arg9, @OriginalArg(10) int arg10, @OriginalArg(11) int arg11, @OriginalArg(12) int arg12, @OriginalArg(13) int arg13) { + private void tran_scale(@OriginalArg(0) int[] arg0, @OriginalArg(1) int[] 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, @OriginalArg(9) int arg9, @OriginalArg(10) int arg10, @OriginalArg(11) int arg11, @OriginalArg(12) int arg12, @OriginalArg(13) int arg13) { @Pc(5) int local5 = 256 - arg13; try { @Pc(7) int local7 = arg3; @@ -1249,7 +1249,7 @@ private void method393(@OriginalArg(0) int[] arg0, @OriginalArg(1) int[] arg1, @ } @OriginalMember(owner = "mudclient!a/a/g", name = "b", descriptor = "([I[IIIIIIIIIIIII)V") - private void method394(@OriginalArg(0) int[] arg0, @OriginalArg(1) int[] 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, @OriginalArg(9) int arg9, @OriginalArg(10) int arg10, @OriginalArg(11) int arg11, @OriginalArg(12) int arg12, @OriginalArg(13) int arg13) { + private void plot_scale(@OriginalArg(0) int[] arg0, @OriginalArg(1) int[] 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, @OriginalArg(9) int arg9, @OriginalArg(10) int arg10, @OriginalArg(11) int arg11, @OriginalArg(12) int arg12, @OriginalArg(13) int arg13) { @Pc(7) int local7 = arg13 >> 16 & 0xFF; @Pc(13) int local13 = arg13 >> 8 & 0xFF; @Pc(17) int local17 = arg13 & 0xFF; @@ -1867,17 +1867,17 @@ private void method403(@OriginalArg(0) int[] arg0, @OriginalArg(1) byte[] arg1, } @OriginalMember(owner = "mudclient!a/a/g", name = "a", descriptor = "(Ljava/lang/String;IIII)V") - public final void method405(@OriginalArg(0) String arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2, @OriginalArg(3) int arg3, @OriginalArg(4) int arg4) { - this.drawStringTaggable(arg0, arg1 - this.method412(arg0, arg3), arg2, arg3, arg4); + public final void drawStringRight(@OriginalArg(0) String arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2, @OriginalArg(3) int arg3, @OriginalArg(4) int arg4) { + this.drawString(arg0, arg1 - this.stringWidth(arg0, arg3), arg2, arg3, arg4); } @OriginalMember(owner = "mudclient!a/a/g", name = "b", descriptor = "(Ljava/lang/String;IIII)V") - public final void drawString(@OriginalArg(0) String arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2, @OriginalArg(3) int arg3, @OriginalArg(4) int arg4) { - this.drawStringTaggable(arg0, arg1 - this.method412(arg0, arg3) / 2, arg2, arg3, arg4); + public final void drawStringCenter(@OriginalArg(0) String arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2, @OriginalArg(3) int arg3, @OriginalArg(4) int arg4) { + this.drawString(arg0, arg1 - this.stringWidth(arg0, arg3) / 2, arg2, arg3, arg4); } @OriginalMember(owner = "mudclient!a/a/g", name = "a", descriptor = "(Ljava/lang/String;IIIII)V") - public final void method407(@OriginalArg(0) String arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2, @OriginalArg(3) int arg3, @OriginalArg(4) int arg4, @OriginalArg(5) int arg5) { + public final void centerParagraph(@OriginalArg(0) String arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2, @OriginalArg(3) int arg3, @OriginalArg(4) int arg4, @OriginalArg(5) int arg5) { try { @Pc(3) int local3 = 0; @Pc(7) byte[] local7 = aByteArrayArray6[arg3]; @@ -1902,14 +1902,14 @@ public final void method407(@OriginalArg(0) String arg0, @OriginalArg(1) int arg if (local11 <= local9) { local11 = local13; } - this.drawString(arg0.substring(local9, local11), arg1, arg2, arg3, arg4); + this.drawStringCenter(arg0.substring(local9, local11), arg1, arg2, arg3, arg4); local3 = 0; local9 = local13 = local11 + 1; arg2 += this.method411(arg3); } } if (local3 > 0) { - this.drawString(arg0.substring(local9), arg1, arg2, arg3, arg4); + this.drawStringCenter(arg0.substring(local9), arg1, arg2, arg3, arg4); return; } } catch (@Pc(135) Exception local135) { @@ -1919,7 +1919,7 @@ public final void method407(@OriginalArg(0) String arg0, @OriginalArg(1) int arg } @OriginalMember(owner = "mudclient!a/a/g", name = "c", descriptor = "(Ljava/lang/String;IIII)V") - public final void drawStringTaggable(@OriginalArg(0) String arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2, @OriginalArg(3) int arg3, @OriginalArg(4) int arg4) { + public final void drawString(@OriginalArg(0) String arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2, @OriginalArg(3) int arg3, @OriginalArg(4) int arg4) { try { @Pc(5) byte[] local5 = aByteArrayArray6[arg3]; for (@Pc(7) int local7 = 0; local7 < arg0.length(); local7++) { @@ -2025,12 +2025,12 @@ private void method409(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @Orig local59 += local70; } if (local21 > 0 && local27 > 0) { - this.method410(this.anIntArray148, arg4, arg3, local47, local54, local21, local27, local59, local61); + this.plotLetter(this.anIntArray148, arg4, arg3, local47, local54, local21, local27, local59, local61); } } @OriginalMember(owner = "mudclient!a/a/g", name = "a", descriptor = "([I[BIIIIIII)V") - private void method410(@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 plotLetter(@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) { try { @Pc(6) int local6 = -(arg5 >> 2); @Pc(11) int local11 = -(arg5 & 0x3); @@ -2079,7 +2079,7 @@ public final int method411(@OriginalArg(0) int arg0) { } @OriginalMember(owner = "mudclient!a/a/g", name = "a", descriptor = "(Ljava/lang/String;I)I") - public final int method412(@OriginalArg(0) String arg0, @OriginalArg(1) int arg1) { + public final int stringWidth(@OriginalArg(0) String arg0, @OriginalArg(1) int arg1) { @Pc(3) int local3 = 0; @Pc(7) byte[] local7 = aByteArrayArray6[arg1]; for (@Pc(9) int local9 = 0; local9 < arg0.length(); local9++) {