2009Scape/rt4-client
1
0
Fork 0
mirror of https://gitlab.com/2009scape/rt4-client.git synced 2025-12-11 09:00:26 -07:00
Code Issues Projects Releases Packages Wiki Activity

Consolidated a bunch of static classes

Browse source
This commit is contained in:
Pazaz 2022-05-04 01:49:55 -04:00
parent cf6a86e926
commit 774d382816
260 changed files with 4163 additions and 4536 deletions
Download patch file Download diff file Expand all files Collapse all files

15
client/src/main/java/rt4/AudioChannel.java
View file

@ -126,7 +126,18 @@ public class AudioChannel {
} }
} }
@OriginalMember(owner = "client!vh", name = "a", descriptor = "()V") @OriginalMember(owner = "client!nd", name = "a", descriptor = "(ZLclient!qb;)V")
public static void setInactive(@OriginalArg(1) PcmStream arg0) {
if (arg0.aClass3_Sub16_5 != null) {
arg0.aClass3_Sub16_5.anInt3313 = 0;
}
arg0.aBoolean292 = false;
for (@Pc(14) PcmStream local14 = arg0.method4406(); local14 != null; local14 = arg0.method4409()) {
setInactive(local14);
}
}
@OriginalMember(owner = "client!vh", name = "a", descriptor = "()V")
protected void write() throws Exception { protected void write() throws Exception {
} }
@ -148,7 +159,7 @@ public class AudioChannel {
this.anInt4638 -= 256; this.anInt4638 -= 256;
if (this.stream != null && this.anInt4638 <= 0) { if (this.stream != null && this.anInt4638 <= 0) {
this.anInt4638 += sampleRate >> 4; this.anInt4638 += sampleRate >> 4;
Static167.setInactive(this.stream); setInactive(this.stream);
this.method3567(this.stream, this.stream.method4407()); this.method3567(this.stream, this.stream.method4407());
@Pc(45) int local45 = 0; @Pc(45) int local45 = 0;
@Pc(47) int local47 = 255; @Pc(47) int local47 = 255;

5
client/src/main/java/rt4/Base37.java
View file

@ -5,6 +5,9 @@ import org.openrs2.deob.annotation.OriginalMember;
import org.openrs2.deob.annotation.Pc; import org.openrs2.deob.annotation.Pc;
public class Base37 { public class Base37 {
@OriginalMember(owner = "client!ch", name = "v", descriptor = "[B")
public static final byte[] aByteArray12 = new byte[] { 95, 97, 98, 99, 100, 101, 102, 103, 104, 105, 106, 107, 108, 109, 110, 111, 112, 113, 114, 115, 116, 117, 118, 119, 120, 121, 122, 48, 49, 50, 51, 52, 53, 54, 55, 56, 57 };
@OriginalMember(owner = "client!ge", name = "a", descriptor = "(IJ)Lclient!na;") @OriginalMember(owner = "client!ge", name = "a", descriptor = "(IJ)Lclient!na;")
public static JagString decode37(@OriginalArg(1) long arg0) { public static JagString decode37(@OriginalArg(1) long arg0) {
if (arg0 <= 0L || arg0 >= 6582952005840035281L) { if (arg0 <= 0L || arg0 >= 6582952005840035281L) {
@ -23,7 +26,7 @@ public class Base37 {
@Pc(65) long local65 = arg0; @Pc(65) long local65 = arg0;
arg0 /= 37L; arg0 /= 37L;
local32--; local32--;
local48[local32] = Static31.aByteArray12[(int) (local65 - arg0 * 37L)]; local48[local32] = aByteArray12[(int) (local65 - arg0 * 37L)];
} }
@Pc(88) JagString local88 = new JagString(); @Pc(88) JagString local88 = new JagString();
local88.chars = local48; local88.chars = local48;

22
client/src/main/java/rt4/Buffer.java
View file

@ -66,7 +66,21 @@ public class Buffer extends Node {
return arg0.length() + 1; return arg0.length() + 1;
} }
@OriginalMember(owner = "client!wa", name = "c", descriptor = "(I)I") @OriginalMember(owner = "client!nf", name = "a", descriptor = "(II[BB)I")
public static int crc32(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(2) byte[] arg2) {
@Pc(5) int local5 = -1;
for (@Pc(15) int local15 = arg0; local15 < arg1; local15++) {
local5 = local5 >>> 8 ^ HuffmanCodec.anIntArray175[(local5 ^ arg2[local15]) & 0xFF];
}
return ~local5;
}
@OriginalMember(owner = "client!fk", name = "a", descriptor = "([BIZ)I")
public static int crc32(@OriginalArg(0) byte[] arg0, @OriginalArg(1) int arg1) {
return crc32(0, arg1, arg0);
}
@OriginalMember(owner = "client!wa", name = "c", descriptor = "(I)I")
public final int g2() { public final int g2() {
this.offset += 2; this.offset += 2;
return ((this.data[this.offset - 2] & 0xFF) << 8) + (this.data[this.offset - 1] & 0xFF); return ((this.data[this.offset - 2] & 0xFF) << 8) + (this.data[this.offset - 1] & 0xFF);
@ -235,7 +249,7 @@ public class Buffer extends Node {
@Pc(32) int off = this.offset; @Pc(32) int off = this.offset;
while (this.data[this.offset++] != 0) { while (this.data[this.offset++] != 0) {
} }
return Static10.decodeString(this.data, this.offset - off - 1, off); return JagString.decodeString(this.data, this.offset - off - 1, off);
} }
@OriginalMember(owner = "client!wa", name = "a", descriptor = "(FB)V") @OriginalMember(owner = "client!wa", name = "a", descriptor = "(FB)V")
@ -370,7 +384,7 @@ public class Buffer extends Node {
@Pc(12) int start = this.offset; @Pc(12) int start = this.offset;
while (this.data[this.offset++] != 0) { while (this.data[this.offset++] != 0) {
} }
return Static10.decodeString(this.data, this.offset - start - 1, start); return JagString.decodeString(this.data, this.offset - start - 1, start);
} }
@OriginalMember(owner = "client!wa", name = "f", descriptor = "(Z)I") @OriginalMember(owner = "client!wa", name = "f", descriptor = "(Z)I")
@ -465,7 +479,7 @@ public class Buffer extends Node {
@OriginalMember(owner = "client!wa", name = "c", descriptor = "(BI)I") @OriginalMember(owner = "client!wa", name = "c", descriptor = "(BI)I")
public final int pCrc32(@OriginalArg(1) int off) { public final int pCrc32(@OriginalArg(1) int off) {
@Pc(16) int checksum = Static169.crc32(off, this.offset, this.data); @Pc(16) int checksum = crc32(off, this.offset, this.data);
this.p4(checksum); this.p4(checksum);
return checksum; return checksum;
} }

11
client/src/main/java/rt4/Camera.java
View file

@ -13,6 +13,11 @@ public class Camera {
@OriginalMember(owner = "client!ef", name = "i", descriptor = "I") @OriginalMember(owner = "client!ef", name = "i", descriptor = "I")
public static double pitchAccel = 0; public static double pitchAccel = 0;
@OriginalMember(owner = "client!ii", name = "a", descriptor = "I")
public static int cameraZ;
@OriginalMember(owner = "client!gg", name = "bb", descriptor = "I")
public static int cameraX;
public static double mod(double a, double b) { public static double mod(double a, double b) {
return ((a % b) + b) % b; return ((a % b) + b) % b;
} }
@ -26,9 +31,9 @@ public class Camera {
pitchTarget = 383; pitchTarget = 383;
} }
yawTarget = mod(yawTarget, 2047.0d); yawTarget = mod(yawTarget, 2047.0d);
@Pc(33) int local33 = Static81.cameraX >> 7; @Pc(33) int local33 = cameraX >> 7;
@Pc(37) int local37 = Static111.cameraZ >> 7; @Pc(37) int local37 = cameraZ >> 7;
@Pc(43) int local43 = SceneGraph.getTileHeight(Player.level, Static81.cameraX, Static111.cameraZ); @Pc(43) int local43 = SceneGraph.getTileHeight(Player.level, cameraX, cameraZ);
@Pc(45) int local45 = 0; @Pc(45) int local45 = 0;
@Pc(64) int local64; @Pc(64) int local64;
if (local33 > 3 && local37 > 3 && local33 < 100 && local37 < 100) { if (local33 > 3 && local37 > 3 && local33 < 100 && local37 < 100) {

44
client/src/main/java/rt4/Cheat.java
View file

@ -75,6 +75,20 @@ public class Cheat {
public static final JagString aClass100_476 = JagString.parse("::gc"); public static final JagString aClass100_476 = JagString.parse("::gc");
@OriginalMember(owner = "client!wk", name = "u", descriptor = "Lclient!na;") @OriginalMember(owner = "client!wk", name = "u", descriptor = "Lclient!na;")
public static final JagString CLIENTJS5DROP = JagString.parse("::clientjs5drop"); public static final JagString CLIENTJS5DROP = JagString.parse("::clientjs5drop");
@OriginalMember(owner = "client!id", name = "c", descriptor = "Lclient!na;")
public static final JagString FPSON = JagString.parse("::fpson");
@OriginalMember(owner = "client!md", name = "Q", descriptor = "Lclient!na;")
public static final JagString MM = JagString.parse("::mm");
@OriginalMember(owner = "client!j", name = "M", descriptor = "Lclient!na;")
public static final JagString REPLACECANVAS = JagString.parse("::replacecanvas");
@OriginalMember(owner = "client!li", name = "p", descriptor = "Lclient!na;")
public static final JagString REBUILD = JagString.parse("::rebuild");
@OriginalMember(owner = "client!oi", name = "j", descriptor = "Lclient!na;")
public static final JagString WM1 = JagString.parse("::wm1");
@OriginalMember(owner = "client!ql", name = "i", descriptor = "Lclient!na;")
public static final JagString WM2 = JagString.parse("::wm2");
@OriginalMember(owner = "client!hk", name = "db", descriptor = "Lclient!na;")
public static final JagString WM3 = JagString.parse("::wm3");
@OriginalMember(owner = "client!dg", name = "f", descriptor = "Z") @OriginalMember(owner = "client!dg", name = "f", descriptor = "Z")
public static boolean displayFps = false; public static boolean displayFps = false;
@OriginalMember(owner = "client!nj", name = "a", descriptor = "Z") @OriginalMember(owner = "client!nj", name = "a", descriptor = "Z")
@ -84,7 +98,7 @@ public class Cheat {
@OriginalMember(owner = "client!en", name = "a", descriptor = "(IIIB)V") @OriginalMember(owner = "client!en", name = "a", descriptor = "(IIIB)V")
public static void teleport(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2) { public static void teleport(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2) {
@Pc(66) JagString local66 = JagString.concatenate(new JagString[] { aClass100_521, Static123.parseInt(arg2), Static159.aClass100_760, Static123.parseInt(arg0 >> 6), Static159.aClass100_760, Static123.parseInt(arg1 >> 6), Static159.aClass100_760, Static123.parseInt(arg0 & 0x3F), Static159.aClass100_760, Static123.parseInt(arg1 & 0x3F) }); @Pc(66) JagString local66 = JagString.concatenate(new JagString[] { aClass100_521, JagString.parseInt(arg2), Static70.aClass100_760, JagString.parseInt(arg0 >> 6), Static70.aClass100_760, JagString.parseInt(arg1 >> 6), Static70.aClass100_760, JagString.parseInt(arg0 & 0x3F), Static70.aClass100_760, JagString.parseInt(arg1 & 0x3F) });
local66.print(); local66.print();
execute(local66); execute(local66);
} }
@ -102,27 +116,27 @@ public class Cheat {
} }
local29 = Runtime.getRuntime(); local29 = Runtime.getRuntime();
local38 = (int) ((local29.totalMemory() - local29.freeMemory()) / 1024L); local38 = (int) ((local29.totalMemory() - local29.freeMemory()) / 1024L);
Chat.add(null, 0, JagString.concatenate(new JagString[] { aClass100_892, Static123.parseInt(local38), DEBUG_MEM_UNIT})); Chat.add(null, 0, JagString.concatenate(new JagString[] { aClass100_892, JagString.parseInt(local38), DEBUG_MEM_UNIT}));
} }
@Pc(117) int local117; @Pc(117) int local117;
if (arg0.equalsIgnoreCase(Static154.MM)) { if (arg0.equalsIgnoreCase(MM)) {
client.method2380(); client.method2380();
for (local18 = 0; local18 < 10; local18++) { for (local18 = 0; local18 < 10; local18++) {
System.gc(); System.gc();
} }
local29 = Runtime.getRuntime(); local29 = Runtime.getRuntime();
local38 = (int) ((local29.totalMemory() - local29.freeMemory()) / 1024L); local38 = (int) ((local29.totalMemory() - local29.freeMemory()) / 1024L);
Chat.add(null, 0, JagString.concatenate(new JagString[] { aClass100_893, Static123.parseInt(local38), DEBUG_MEM_UNIT})); Chat.add(null, 0, JagString.concatenate(new JagString[] { aClass100_893, JagString.parseInt(local38), DEBUG_MEM_UNIT}));
Static16.method501(); Static16.method501();
client.method2380(); client.method2380();
for (local117 = 0; local117 < 10; local117++) { for (local117 = 0; local117 < 10; local117++) {
System.gc(); System.gc();
} }
local38 = (int) ((local29.totalMemory() - local29.freeMemory()) / 1024L); local38 = (int) ((local29.totalMemory() - local29.freeMemory()) / 1024L);
Chat.add(null, 0, JagString.concatenate(new JagString[] {aClass100_1093, Static123.parseInt(local38), DEBUG_MEM_UNIT})); Chat.add(null, 0, JagString.concatenate(new JagString[] {aClass100_1093, JagString.parseInt(local38), DEBUG_MEM_UNIT}));
} }
if (arg0.equalsIgnoreCase(PCACHESIZE)) { if (arg0.equalsIgnoreCase(PCACHESIZE)) {
Chat.add(null, 0, JagString.concatenate(new JagString[] { aClass100_335, Static123.parseInt(Static198.method1029()) })); Chat.add(null, 0, JagString.concatenate(new JagString[] { aClass100_335, JagString.parseInt(Static198.method1029()) }));
} }
if (GlRenderer.enabled && arg0.equalsIgnoreCase(CARDMEM)) { if (GlRenderer.enabled && arg0.equalsIgnoreCase(CARDMEM)) {
System.out.println("oncard_geometry:" + GlCleaner.onCardGeometry); System.out.println("oncard_geometry:" + GlCleaner.onCardGeometry);
@ -136,20 +150,20 @@ public class Cheat {
client.js5NetQueue.quit(); client.js5NetQueue.quit();
} }
if (arg0.equalsIgnoreCase(JS5DROP)) { if (arg0.equalsIgnoreCase(JS5DROP)) {
client.js5NetQueue.method2319(); client.js5NetQueue.drop();
} }
if (arg0.equalsIgnoreCase(BREAKCON)) { if (arg0.equalsIgnoreCase(BREAKCON)) {
GameShell.signLink.breakConnection(); GameShell.signLink.breakConnection();
Protocol.socket.breakConnection(); Protocol.socket.breakConnection();
client.js5NetQueue.method2323(); client.js5NetQueue.breakConnection();
} }
if (arg0.equalsIgnoreCase(Static114.REPLACECANVAS)) { if (arg0.equalsIgnoreCase(REPLACECANVAS)) {
GameShell.replaceCanvas = true; GameShell.replaceCanvas = true;
} }
if (arg0.equalsIgnoreCase(Static148.REBUILD)) { if (arg0.equalsIgnoreCase(REBUILD)) {
client.setGameState(25); client.setGameState(25);
} }
if (arg0.equalsIgnoreCase(Static107.FPSON)) { if (arg0.equalsIgnoreCase(FPSON)) {
displayFps = true; displayFps = true;
} }
if (arg0.equalsIgnoreCase(FPSOFF)) { if (arg0.equalsIgnoreCase(FPSOFF)) {
@ -158,13 +172,13 @@ public class Cheat {
if (arg0.equalsIgnoreCase(WM0)) { if (arg0.equalsIgnoreCase(WM0)) {
Static241.setWindowMode(false, 0, -1, -1); Static241.setWindowMode(false, 0, -1, -1);
} }
if (arg0.equalsIgnoreCase(Static181.WM1)) { if (arg0.equalsIgnoreCase(WM1)) {
Static241.setWindowMode(false, 1, -1, -1); Static241.setWindowMode(false, 1, -1, -1);
} }
if (arg0.equalsIgnoreCase(Static207.WM2)) { if (arg0.equalsIgnoreCase(WM2)) {
Static241.setWindowMode(false, 2, -1, -1); Static241.setWindowMode(false, 2, -1, -1);
} }
if (arg0.equalsIgnoreCase(Static99.WM3)) { if (arg0.equalsIgnoreCase(WM3)) {
Static241.setWindowMode(false, 3, 1024, 768); Static241.setWindowMode(false, 3, 1024, 768);
} }
if (arg0.equalsIgnoreCase(NOCLIP)) { if (arg0.equalsIgnoreCase(NOCLIP)) {
@ -189,7 +203,7 @@ public class Cheat {
} }
if (arg0.startsWith(RECT_DEBUG)) { if (arg0.startsWith(RECT_DEBUG)) {
rectDebug = arg0.substring(12).trim().parseInt(); rectDebug = arg0.substring(12).trim().parseInt();
Chat.add(null, 0, JagString.concatenate(new JagString[] { RECT_DEBUG_EQUALS, Static123.parseInt(rectDebug) })); Chat.add(null, 0, JagString.concatenate(new JagString[] { RECT_DEBUG_EQUALS, JagString.parseInt(rectDebug) }));
} }
if (arg0.equalsIgnoreCase(QA_OP_TEST)) { if (arg0.equalsIgnoreCase(QA_OP_TEST)) {
Static121.aBoolean154 = true; Static121.aBoolean154 = true;

22
client/src/main/java/rt4/ClientProt.java
View file

@ -309,7 +309,7 @@ public class ClientProt {
} }
} }
if (GlRenderer.enabled) { if (GlRenderer.enabled) {
Static120.method2404(); LightingManager.method2404();
} }
if (GlRenderer.enabled) { if (GlRenderer.enabled) {
Static75.setDefaultChunksAtmosphere(); Static75.setDefaultChunksAtmosphere();
@ -317,7 +317,7 @@ public class ClientProt {
client.audioLoop(); client.audioLoop();
System.gc(); System.gc();
ping(true); ping(true);
Static196.method3535(false); SceneGraph.method3535(false);
if (!Static230.dynamicMapRegion) { if (!Static230.dynamicMapRegion) {
Static87.method1805(false); Static87.method1805(false);
ping(true); ping(true);
@ -345,10 +345,10 @@ public class ClientProt {
ping(true); ping(true);
Static45.method1169(PathFinder.collisionMaps, false); Static45.method1169(PathFinder.collisionMaps, false);
if (GlRenderer.enabled) { if (GlRenderer.enabled) {
Static120.method2395(); LightingManager.method2395();
} }
ping(true); ping(true);
i = Static146.anInt3508; i = SceneGraph.firstVisibleLevel;
if (i > Player.level) { if (i > Player.level) {
i = Player.level; i = Player.level;
} }
@ -357,12 +357,12 @@ public class ClientProt {
if (SceneGraph.allLevelsAreVisible()) { if (SceneGraph.allLevelsAreVisible()) {
Static146.method2750(0); Static146.method2750(0);
} else { } else {
Static146.method2750(Static146.anInt3508); Static146.method2750(SceneGraph.firstVisibleLevel);
} }
Static105.method2255(); SceneGraph.method2255();
if (GlRenderer.enabled && hasUnderWaterMap) { if (GlRenderer.enabled && hasUnderWaterMap) {
Static278.setRenderTiles(true); Static278.setRenderTiles(true);
Static196.method3535(true); SceneGraph.method3535(true);
if (!Static230.dynamicMapRegion) { if (!Static230.dynamicMapRegion) {
Static87.method1805(true); Static87.method1805(true);
ping(true); ping(true);
@ -377,7 +377,7 @@ public class ClientProt {
ping(true); ping(true);
Static45.method1169(PathFinder.collisionMaps, true); Static45.method1169(PathFinder.collisionMaps, true);
ping(true); ping(true);
Static105.method2255(); SceneGraph.method2255();
Static278.setRenderTiles(false); Static278.setRenderTiles(false);
} }
if (GlRenderer.enabled) { if (GlRenderer.enabled) {
@ -409,8 +409,8 @@ public class ClientProt {
for (@Pc(837) int local837 = chunkX - 1; local837 <= chunkZ + 1; local837++) { for (@Pc(837) int local837 = chunkX - 1; local837 <= chunkZ + 1; local837++) {
for (@Pc(850) int local850 = local821 - 1; local850 <= local815 + 1; local850++) { for (@Pc(850) int local850 = local821 - 1; local850 <= local815 + 1; local850++) {
if (local837 < chunkX || local837 > chunkZ || local850 < local821 || local850 > local815) { if (local837 < chunkX || local837 > chunkZ || local850 < local821 || local850 > local815) {
client.js5Archive5.method4486(JagString.concatenate(new JagString[] { Static103.aClass100_558, Static123.parseInt(local837), Static86.aClass100_488, Static123.parseInt(local850) })); client.js5Archive5.method4486(JagString.concatenate(new JagString[] { Static103.aClass100_558, JagString.parseInt(local837), Static86.aClass100_488, JagString.parseInt(local850) }));
client.js5Archive5.method4486(JagString.concatenate(new JagString[] { Static270.aClass100_1090, Static123.parseInt(local837), Static86.aClass100_488, Static123.parseInt(local850) })); client.js5Archive5.method4486(JagString.concatenate(new JagString[] { Static270.aClass100_1090, JagString.parseInt(local837), Static86.aClass100_488, JagString.parseInt(local850) }));
} }
} }
} }
@ -423,7 +423,7 @@ public class ClientProt {
Protocol.outboundBuffer.p1isaac(110); Protocol.outboundBuffer.p1isaac(110);
} }
} }
Static141.method2720(); WorldMap.method2720();
client.audioLoop(); client.audioLoop();
GameShell.resetTimer(); GameShell.resetTimer();
} }

2
client/src/main/java/rt4/ColorImageCache.java
View file

@ -69,7 +69,7 @@ public final class ColorImageCache {
local29 = new ColorImageCacheEntry(row, this.size); local29 = new ColorImageCacheEntry(row, this.size);
this.size++; this.size++;
} else { } else {
@Pc(66) ColorImageCacheEntry local66 = (ColorImageCacheEntry) this.recentlyUsed.method2279(); @Pc(66) ColorImageCacheEntry local66 = (ColorImageCacheEntry) this.recentlyUsed.tail();
local29 = new ColorImageCacheEntry(row, local66.index); local29 = new ColorImageCacheEntry(row, local66.index);
this.entries[local66.row] = null; this.entries[local66.row] = null;
local66.unlink(); local66.unlink();

2
client/src/main/java/rt4/Component.java
View file

@ -954,7 +954,7 @@ public final class Component {
} }
@Pc(85) SoftwareSprite local85; @Pc(85) SoftwareSprite local85;
if (this.aBoolean18) { if (this.aBoolean18) {
local85 = Static80.loadSoftwareAlphaSprite(InterfaceList.aClass153_12, local12); local85 = SoftwareSprite.loadSoftwareAlphaSprite(InterfaceList.aClass153_12, local12);
} else { } else {
local85 = SpriteLoader.loadSoftwareSprite(0, InterfaceList.aClass153_12, local12); local85 = SpriteLoader.loadSoftwareSprite(0, InterfaceList.aClass153_12, local12);
} }

2
client/src/main/java/rt4/CursorType.java
View file

@ -23,7 +23,7 @@ public final class CursorType {
if (local7 != null) { if (local7 != null) {
return local7; return local7;
} }
local7 = Static80.loadSoftwareAlphaSprite(CursorTypeList.spritesArchive, this.spriteId); local7 = SoftwareSprite.loadSoftwareAlphaSprite(CursorTypeList.spritesArchive, this.spriteId);
if (local7 != null) { if (local7 != null) {
CursorTypeList.sprites.put(local7, (long) this.spriteId); CursorTypeList.sprites.put(local7, (long) this.spriteId);
} }

100
client/src/main/java/rt4/DelayedStateChange.java
View file

@ -141,6 +141,106 @@ public final class DelayedStateChange extends SecondaryNode {
return local13; return local13;
} }
@OriginalMember(owner = "client!wc", name = "a", descriptor = "(ZI)V")
public static void method4600(@OriginalArg(1) int arg0) {
@Pc(8) DelayedStateChange local8 = create(4, arg0);
local8.pushClient();
}
@OriginalMember(owner = "client!jd", name = "a", descriptor = "(IB)V")
public static void method2353(@OriginalArg(0) int arg0) {
@Pc(12) DelayedStateChange local12 = create(12, arg0);
local12.pushClient();
}
@OriginalMember(owner = "client!k", name = "a", descriptor = "(B)Lclient!da;")
public static DelayedStateChange poll() {
@Pc(10) DelayedStateChange local10 = (DelayedStateChange) serverQueue.method795();
if (local10 != null) {
local10.unlink();
local10.method4365();
return local10;
}
do {
local10 = (DelayedStateChange) clientQueue.method795();
if (local10 == null) {
return null;
}
if (local10.getTime() > MonotonicClock.currentTimeMillis()) {
return null;
}
local10.unlink();
local10.method4365();
} while ((Long.MIN_VALUE & local10.secondaryKey) == 0L);
return local10;
}
@OriginalMember(owner = "client!lf", name = "a", descriptor = "(IIIIB)V")
public static void method2745(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2, @OriginalArg(3) int arg3) {
@Pc(8) DelayedStateChange local8 = create(10, arg0);
local8.pushServer();
local8.intArg3 = arg2;
local8.intArg1 = arg3;
local8.intArg2 = arg1;
}
@OriginalMember(owner = "client!n", name = "a", descriptor = "(II)V")
public static void method3096(@OriginalArg(0) int arg0) {
@Pc(8) DelayedStateChange local8 = create(3, arg0);
local8.pushClient();
}
@OriginalMember(owner = "client!oi", name = "b", descriptor = "(II)V")
public static void method3345(@OriginalArg(0) int arg0) {
@Pc(8) DelayedStateChange local8 = create(5, arg0);
local8.pushClient();
}
@OriginalMember(owner = "client!ra", name = "a", descriptor = "(BIII)V")
public static void method3707(@OriginalArg(1) int arg0, @OriginalArg(2) int arg1, @OriginalArg(3) int arg2) {
@Pc(12) DelayedStateChange local12 = create(9, arg0);
local12.pushServer();
local12.intArg1 = arg2;
local12.intArg3 = arg1;
}
@OriginalMember(owner = "client!si", name = "b", descriptor = "(IIB)V")
public static void method3938(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1) {
@Pc(16) DelayedStateChange local16 = create(12, arg1);
local16.pushServer();
local16.intArg1 = arg0;
}
@OriginalMember(owner = "client!tm", name = "a", descriptor = "(II)V")
public static void method4224(@OriginalArg(0) int arg0) {
@Pc(16) DelayedStateChange local16 = create(6, arg0);
local16.pushClient();
}
@OriginalMember(owner = "client!wl", name = "a", descriptor = "(II)V")
public static void method4675(@OriginalArg(1) int arg0) {
@Pc(17) DelayedStateChange local17 = create(11, arg0);
local17.pushClient();
}
@OriginalMember(owner = "client!ac", name = "a", descriptor = "(BI)V")
public static void method24(@OriginalArg(1) int arg0) {
@Pc(16) DelayedStateChange local16 = create(1, arg0);
local16.pushClient();
}
@OriginalMember(owner = "client!ha", name = "b", descriptor = "(II)V")
public static void method1840(@OriginalArg(1) int arg0) {
@Pc(8) DelayedStateChange local8 = create(2, arg0);
local8.pushClient();
}
@OriginalMember(owner = "client!he", name = "c", descriptor = "(II)V")
public static void method1906(@OriginalArg(1) int arg0) {
@Pc(12) DelayedStateChange local12 = create(7, arg0);
local12.pushClient();
}
@OriginalMember(owner = "client!da", name = "a", descriptor = "(Z)V") @OriginalMember(owner = "client!da", name = "a", descriptor = "(Z)V")
public final void pushClient() { public final void pushClient() {
this.secondaryKey = MonotonicClock.currentTimeMillis() + 500L | Long.MIN_VALUE & this.secondaryKey; this.secondaryKey = MonotonicClock.currentTimeMillis() + 500L | Long.MIN_VALUE & this.secondaryKey;

11
client/src/main/java/rt4/FloType.java
View file

@ -40,7 +40,12 @@ public final class FloType {
@OriginalMember(owner = "client!wl", name = "m", descriptor = "I") @OriginalMember(owner = "client!wl", name = "m", descriptor = "I")
public int anInt5889 = 1190717; public int anInt5889 = 1190717;
@OriginalMember(owner = "client!wl", name = "a", descriptor = "(ILclient!wa;I)V") @OriginalMember(owner = "client!be", name = "a", descriptor = "(II)I")
public static int method492(@OriginalArg(1) int arg0) {
return arg0 == 16711935 ? -1 : ColorUtils.rgbToHsl(arg0);
}
@OriginalMember(owner = "client!wl", name = "a", descriptor = "(ILclient!wa;I)V")
public final void decode(@OriginalArg(1) Buffer arg0, @OriginalArg(2) int arg1) { public final void decode(@OriginalArg(1) Buffer arg0, @OriginalArg(2) int arg1) {
while (true) { while (true) {
@Pc(5) int local5 = arg0.g1(); @Pc(5) int local5 = arg0.g1();
@ -54,7 +59,7 @@ public final class FloType {
@OriginalMember(owner = "client!wl", name = "a", descriptor = "(IILclient!wa;I)V") @OriginalMember(owner = "client!wl", name = "a", descriptor = "(IILclient!wa;I)V")
private void method4674(@OriginalArg(1) int arg0, @OriginalArg(2) Buffer arg1, @OriginalArg(3) int arg2) { private void method4674(@OriginalArg(1) int arg0, @OriginalArg(2) Buffer arg1, @OriginalArg(3) int arg2) {
if (arg0 == 1) { if (arg0 == 1) {
this.anInt5899 = Static15.method492(arg1.g3()); this.anInt5899 = method492(arg1.g3());
} else if (arg0 == 2) { } else if (arg0 == 2) {
this.texture = arg1.g1(); this.texture = arg1.g1();
} else if (arg0 == 3) { } else if (arg0 == 3) {
@ -65,7 +70,7 @@ public final class FloType {
} else if (arg0 == 5) { } else if (arg0 == 5) {
this.aBoolean312 = false; this.aBoolean312 = false;
} else if (arg0 == 7) { } else if (arg0 == 7) {
this.anInt5894 = Static15.method492(arg1.g3()); this.anInt5894 = method492(arg1.g3());
} else if (arg0 == 8) { } else if (arg0 == 8) {
anInt865 = arg2; anInt865 = arg2;
} else if (arg0 == 9) { } else if (arg0 == 9) {

17
client/src/main/java/rt4/Font.java
View file

@ -198,7 +198,22 @@ public abstract class Font extends SecondaryNode {
return -local37; return -local37;
} }
@OriginalMember(owner = "client!rk", name = "a", descriptor = "(Lclient!na;IIIIIIIII)I") @OriginalMember(owner = "client!ce", name = "a", descriptor = "(I[B)Lclient!rk;")
public static Font method799(@OriginalArg(1) byte[] arg0) {
if (arg0 == null) {
return null;
}
@Pc(27) Font local27;
if (GlRenderer.enabled) {
local27 = new GlFont(arg0, SpriteLoader.xOffsets, SpriteLoader.yOffsets, SpriteLoader.innerWidths, SpriteLoader.innerHeights, SpriteLoader.pixels);
} else {
local27 = new SoftwareFont(arg0, SpriteLoader.xOffsets, SpriteLoader.yOffsets, SpriteLoader.innerWidths, SpriteLoader.innerHeights, SpriteLoader.pixels);
}
SpriteLoader.clear();
return local27;
}
@OriginalMember(owner = "client!rk", name = "a", descriptor = "(Lclient!na;IIIIIIIII)I")
public final int method2852(@OriginalArg(0) JagString 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) { public final int method2852(@OriginalArg(0) JagString 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) {
return this.renderParagraphAlpha(arg0, arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8, arg9); return this.renderParagraphAlpha(arg0, arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8, arg9);
} }

6
client/src/main/java/rt4/FriendsList.java
View file

@ -15,6 +15,8 @@ public class FriendsList {
public static final int[] worlds = new int[200]; public static final int[] worlds = new int[200];
@OriginalMember(owner = "client!jh", name = "b", descriptor = "[Lclient!na;") @OriginalMember(owner = "client!jh", name = "b", descriptor = "[Lclient!na;")
public static final JagString[] usernames = new JagString[200]; public static final JagString[] usernames = new JagString[200];
@OriginalMember(owner = "client!ab", name = "c", descriptor = "[Z")
public static final boolean[] aBooleanArray135 = new boolean[200];
@OriginalMember(owner = "client!p", name = "d", descriptor = "I") @OriginalMember(owner = "client!p", name = "d", descriptor = "I")
public static int transmitAt = 0; public static int transmitAt = 0;
@OriginalMember(owner = "client!nc", name = "m", descriptor = "I") @OriginalMember(owner = "client!nc", name = "m", descriptor = "I")
@ -71,7 +73,7 @@ public class FriendsList {
worlds[size] = 0; worlds[size] = 0;
worldNames[size] = JagString.EMPTY; worldNames[size] = JagString.EMPTY;
ranks[size] = 0; ranks[size] = 0;
Static3.aBooleanArray135[size] = false; aBooleanArray135[size] = false;
size++; size++;
transmitAt = InterfaceList.transmitTimer; transmitAt = InterfaceList.transmitTimer;
Protocol.outboundBuffer.p1isaac(120); Protocol.outboundBuffer.p1isaac(120);
@ -92,7 +94,7 @@ public class FriendsList {
worldNames[local41] = worldNames[local41 + 1]; worldNames[local41] = worldNames[local41 + 1];
encodedUsernames[local41] = encodedUsernames[local41 + 1]; encodedUsernames[local41] = encodedUsernames[local41 + 1];
ranks[local41] = ranks[local41 + 1]; ranks[local41] = ranks[local41 + 1];
Static3.aBooleanArray135[local41] = Static3.aBooleanArray135[local41 + 1]; aBooleanArray135[local41] = aBooleanArray135[local41 + 1];
} }
transmitAt = InterfaceList.transmitTimer; transmitAt = InterfaceList.transmitTimer;
Protocol.outboundBuffer.p1isaac(57); Protocol.outboundBuffer.p1isaac(57);

2
client/src/main/java/rt4/GlModel.java
View file

@ -710,7 +710,7 @@ public final class GlModel extends Model {
@OriginalMember(owner = "client!td", name = "a", descriptor = "(ISIB)I") @OriginalMember(owner = "client!td", name = "a", descriptor = "(ISIB)I")
public static int method4096(@OriginalArg(0) int arg0, @OriginalArg(1) short arg1, @OriginalArg(2) int arg2, @OriginalArg(3) byte arg3) { public static int method4096(@OriginalArg(0) int arg0, @OriginalArg(1) short arg1, @OriginalArg(2) int arg2, @OriginalArg(3) byte arg3) {
@Pc(5) int local5 = Rasteriser.palette[Static268.method4585(arg0, arg2)]; @Pc(5) int local5 = Rasteriser.palette[SoftwareModel.method4585(arg0, arg2)];
if (arg1 != -1) { if (arg1 != -1) {
@Pc(15) int local15 = Rasteriser.textureProvider.method3238(arg1 & 0xFFFF); @Pc(15) int local15 = Rasteriser.textureProvider.method3238(arg1 & 0xFFFF);
@Pc(21) int local21; @Pc(21) int local21;

2
client/src/main/java/rt4/GlRaster.java
View file

@ -236,7 +236,7 @@ public final class GlRaster {
} }
@OriginalMember(owner = "client!dj", name = "d", descriptor = "(IIII)V") @OriginalMember(owner = "client!dj", name = "d", descriptor = "(IIII)V")
public static void method1187(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2, @OriginalArg(3) int arg3) { public static void setClip(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2, @OriginalArg(3) int arg3) {
if (arg0 < 0) { if (arg0 < 0) {
arg0 = 0; arg0 = 0;
} }

8
client/src/main/java/rt4/GlRenderer.java
View file

@ -129,7 +129,7 @@ public final class GlRenderer {
private static JagString method4147(@OriginalArg(0) String arg0) { private static JagString method4147(@OriginalArg(0) String arg0) {
@Pc(3) byte[] local3; @Pc(3) byte[] local3;
local3 = arg0.getBytes(StandardCharsets.ISO_8859_1); local3 = arg0.getBytes(StandardCharsets.ISO_8859_1);
return Static10.decodeString(local3, local3.length, 0); return JagString.decodeString(local3, local3.length, 0);
} }
@OriginalMember(owner = "client!tf", name = "a", descriptor = "(IIII)V") @OriginalMember(owner = "client!tf", name = "a", descriptor = "(IIII)V")
@ -271,7 +271,7 @@ public final class GlRenderer {
gl.glMatrixMode(GL2.GL_MODELVIEW); gl.glMatrixMode(GL2.GL_MODELVIEW);
gl.glLoadIdentity(); gl.glLoadIdentity();
Static161.method3065(); Static161.method3065();
Static120.method2400(); // LightingManager LightingManager.method2400(); // LightingManager
} }
@OriginalMember(owner = "client!tf", name = "g", descriptor = "()V") @OriginalMember(owner = "client!tf", name = "g", descriptor = "()V")
@ -511,7 +511,7 @@ public final class GlRenderer {
gl = null; gl = null;
context = null; context = null;
drawable = null; drawable = null;
Static120.method2398(); // LightingManager LightingManager.method2398(); // LightingManager
enabled = false; enabled = false;
} }
@ -808,7 +808,7 @@ public final class GlRenderer {
anInt5328 = local2[0]; anInt5328 = local2[0];
gl.glBindTexture(GL2.GL_TEXTURE_2D, anInt5328); gl.glBindTexture(GL2.GL_TEXTURE_2D, anInt5328);
gl.glTexImage2D(GL2.GL_TEXTURE_2D, 0, 4, 1, 1, 0, GL2.GL_RGBA, GL2.GL_UNSIGNED_BYTE, IntBuffer.wrap(new int[] { -1 })); gl.glTexImage2D(GL2.GL_TEXTURE_2D, 0, 4, 1, 1, 0, GL2.GL_RGBA, GL2.GL_UNSIGNED_BYTE, IntBuffer.wrap(new int[] { -1 }));
Static120.method2401(); LightingManager.method2401();
MaterialManager.init(); MaterialManager.init();
} }
} }

4
client/src/main/java/rt4/GlSprite.java
View file

@ -145,7 +145,7 @@ public class GlSprite extends Sprite {
} }
@OriginalMember(owner = "client!cf", name = "a", descriptor = "(IIIIIIIILclient!cf;)V") @OriginalMember(owner = "client!cf", name = "a", descriptor = "(IIIIIIIILclient!cf;)V")
public final void method1427(@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) GlSprite arg8) { public final void renderRotatedTransparent(@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) GlSprite arg8) {
if (arg8 == null) { if (arg8 == null) {
return; return;
} }
@ -232,7 +232,7 @@ public class GlSprite extends Sprite {
@OriginalMember(owner = "client!cf", name = "e", descriptor = "(II)V") @OriginalMember(owner = "client!cf", name = "e", descriptor = "(II)V")
@Override @Override
public final void method1423(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1) { public final void renderTransparent(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1) {
GlRenderer.method4149(); GlRenderer.method4149();
@Pc(5) int local5 = arg0 + this.anInt1863; @Pc(5) int local5 = arg0 + this.anInt1863;
@Pc(10) int local10 = arg1 + this.anInt1861; @Pc(10) int local10 = arg1 + this.anInt1861;

2
client/src/main/java/rt4/GroundDecor.java
View file

@ -16,7 +16,7 @@ public final class GroundDecor {
public int anInt733; public int anInt733;
@OriginalMember(owner = "client!bm", name = "m", descriptor = "J") @OriginalMember(owner = "client!bm", name = "m", descriptor = "J")
public long aLong26; public long key;
@OriginalMember(owner = "client!bm", name = "o", descriptor = "I") @OriginalMember(owner = "client!bm", name = "o", descriptor = "I")
public int anInt736; public int anInt736;

8
client/src/main/java/rt4/IgnoreList.java
View file

@ -7,6 +7,8 @@ import org.openrs2.deob.annotation.Pc;
public class IgnoreList { public class IgnoreList {
@OriginalMember(owner = "client!pf", name = "h", descriptor = "[J") @OriginalMember(owner = "client!pf", name = "h", descriptor = "[J")
public static final long[] encodedUsernames = new long[100]; public static final long[] encodedUsernames = new long[100];
@OriginalMember(owner = "client!pi", name = "V", descriptor = "[Lclient!na;")
public static final JagString[] aClass100Array134 = new JagString[100];
@OriginalMember(owner = "client!cl", name = "Z", descriptor = "I") @OriginalMember(owner = "client!cl", name = "Z", descriptor = "I")
public static int size = 0; public static int size = 0;
@ -16,7 +18,7 @@ public class IgnoreList {
return false; return false;
} }
for (@Pc(11) int local11 = 0; local11 < size; local11++) { for (@Pc(11) int local11 = 0; local11 < size; local11++) {
if (arg0.equalsIgnoreCase(Static193.aClass100Array134[local11])) { if (arg0.equalsIgnoreCase(aClass100Array134[local11])) {
return true; return true;
} }
} }
@ -51,7 +53,7 @@ public class IgnoreList {
return; return;
} }
encodedUsernames[size] = arg0; encodedUsernames[size] = arg0;
Static193.aClass100Array134[size++] = Base37.decode37(arg0); aClass100Array134[size++] = Base37.decode37(arg0);
FriendsList.transmitAt = InterfaceList.transmitTimer; FriendsList.transmitAt = InterfaceList.transmitTimer;
Protocol.outboundBuffer.p1isaac(34); Protocol.outboundBuffer.p1isaac(34);
Protocol.outboundBuffer.p8(arg0); Protocol.outboundBuffer.p8(arg0);
@ -67,7 +69,7 @@ public class IgnoreList {
size--; size--;
for (@Pc(36) int local36 = local12; local36 < size; local36++) { for (@Pc(36) int local36 = local12; local36 < size; local36++) {
encodedUsernames[local36] = encodedUsernames[local36 + 1]; encodedUsernames[local36] = encodedUsernames[local36 + 1];
Static193.aClass100Array134[local36] = Static193.aClass100Array134[local36 + 1]; aClass100Array134[local36] = aClass100Array134[local36 + 1];
} }
FriendsList.transmitAt = InterfaceList.transmitTimer; FriendsList.transmitAt = InterfaceList.transmitTimer;
Protocol.outboundBuffer.p1isaac(213); Protocol.outboundBuffer.p1isaac(213);

2
client/src/main/java/rt4/InterfaceList.java
View file

@ -185,7 +185,7 @@ public class InterfaceList {
if (!getServerActiveProperties(arg0).method503(arg1) && arg0.anObjectArray29 == null) { if (!getServerActiveProperties(arg0).method503(arg1) && arg0.anObjectArray29 == null) {
return null; return null;
} else if (arg0.ops == null || arg0.ops.length <= arg1 || arg0.ops[arg1] == null || arg0.ops[arg1].trim().length() == 0) { } else if (arg0.ops == null || arg0.ops.length <= arg1 || arg0.ops[arg1] == null || arg0.ops[arg1].trim().length() == 0) {
return Static121.aBoolean154 ? JagString.concatenate(new JagString[] { Static207.aClass100_903, Static123.parseInt(arg1) }) : null; return Static121.aBoolean154 ? JagString.concatenate(new JagString[] { Static207.aClass100_903, JagString.parseInt(arg1) }) : null;
} else { } else {
return arg0.ops[arg1]; return arg0.ops[arg1];
} }

14
client/src/main/java/rt4/Inv.java
View file

@ -12,6 +12,8 @@ public final class Inv extends Node {
public static final int[] updatedInventories = new int[32]; public static final int[] updatedInventories = new int[32];
@OriginalMember(owner = "client!ii", name = "c", descriptor = "I") @OriginalMember(owner = "client!ii", name = "c", descriptor = "I")
public static int updatedInventoriesWriterIndex = 0; public static int updatedInventoriesWriterIndex = 0;
@OriginalMember(owner = "client!bj", name = "v", descriptor = "Lclient!sc;")
public static HashTable objectContainerCache = new HashTable(32);
@OriginalMember(owner = "client!qe", name = "p", descriptor = "[I") @OriginalMember(owner = "client!qe", name = "p", descriptor = "[I")
public int[] objectIds = new int[] { -1 }; public int[] objectIds = new int[] { -1 };
@ -23,7 +25,7 @@ public final class Inv extends Node {
if (arg0 < 0) { if (arg0 < 0) {
return 0; return 0;
} }
@Pc(17) Inv local17 = (Inv) Static20.objectContainerCache.get((long) arg0); @Pc(17) Inv local17 = (Inv) objectContainerCache.get((long) arg0);
if (local17 == null) { if (local17 == null) {
return InvTypeList.list(arg0).size; return InvTypeList.list(arg0).size;
} }
@ -38,7 +40,7 @@ public final class Inv extends Node {
@OriginalMember(owner = "client!od", name = "a", descriptor = "(IZII)I") @OriginalMember(owner = "client!od", name = "a", descriptor = "(IZII)I")
public static int getTotalParam(@OriginalArg(1) boolean arg0, @OriginalArg(2) int arg1, @OriginalArg(3) int arg2) { public static int getTotalParam(@OriginalArg(1) boolean arg0, @OriginalArg(2) int arg1, @OriginalArg(3) int arg2) {
@Pc(19) Inv local19 = (Inv) Static20.objectContainerCache.get((long) arg1); @Pc(19) Inv local19 = (Inv) objectContainerCache.get((long) arg1);
if (local19 == null) { if (local19 == null) {
return 0; return 0;
} }
@ -63,7 +65,7 @@ public final class Inv extends Node {
@OriginalMember(owner = "client!wj", name = "a", descriptor = "(BII)I") @OriginalMember(owner = "client!wj", name = "a", descriptor = "(BII)I")
public static int getSlotTotal(@OriginalArg(1) int arg0, @OriginalArg(2) int arg1) { public static int getSlotTotal(@OriginalArg(1) int arg0, @OriginalArg(2) int arg1) {
@Pc(8) Inv local8 = (Inv) Static20.objectContainerCache.get((long) arg0); @Pc(8) Inv local8 = (Inv) objectContainerCache.get((long) arg0);
if (local8 == null) { if (local8 == null) {
return 0; return 0;
} else if (arg1 == -1) { } else if (arg1 == -1) {
@ -81,7 +83,7 @@ public final class Inv extends Node {
@OriginalMember(owner = "client!bm", name = "a", descriptor = "(III)I") @OriginalMember(owner = "client!bm", name = "a", descriptor = "(III)I")
public static int getItemCount(@OriginalArg(1) int arg0, @OriginalArg(2) int arg1) { public static int getItemCount(@OriginalArg(1) int arg0, @OriginalArg(2) int arg1) {
@Pc(10) Inv local10 = (Inv) Static20.objectContainerCache.get((long) arg0); @Pc(10) Inv local10 = (Inv) objectContainerCache.get((long) arg0);
if (local10 == null) { if (local10 == null) {
return 0; return 0;
} else if (arg1 >= 0 && arg1 < local10.anIntArray422.length) { } else if (arg1 >= 0 && arg1 < local10.anIntArray422.length) {
@ -93,7 +95,7 @@ public final class Inv extends Node {
@OriginalMember(owner = "client!be", name = "a", descriptor = "(III)I") @OriginalMember(owner = "client!be", name = "a", descriptor = "(III)I")
public static int getItemType(@OriginalArg(0) int arg0, @OriginalArg(2) int arg1) { public static int getItemType(@OriginalArg(0) int arg0, @OriginalArg(2) int arg1) {
@Pc(10) Inv local10 = (Inv) Static20.objectContainerCache.get((long) arg0); @Pc(10) Inv local10 = (Inv) objectContainerCache.get((long) arg0);
if (local10 == null) { if (local10 == null) {
return -1; return -1;
} else if (arg1 >= 0 && arg1 < local10.objectIds.length) { } else if (arg1 >= 0 && arg1 < local10.objectIds.length) {
@ -105,7 +107,7 @@ public final class Inv extends Node {
@OriginalMember(owner = "client!bc", name = "d", descriptor = "(II)V") @OriginalMember(owner = "client!bc", name = "d", descriptor = "(II)V")
public static void delete(@OriginalArg(0) int arg0) { public static void delete(@OriginalArg(0) int arg0) {
@Pc(14) Inv local14 = (Inv) Static20.objectContainerCache.get((long) arg0); @Pc(14) Inv local14 = (Inv) objectContainerCache.get((long) arg0);
if (local14 != null) { if (local14 != null) {
local14.unlink(); local14.unlink();
} }

72
client/src/main/java/rt4/JagString.java
View file

@ -18,7 +18,9 @@ public final class JagString implements StringInterface {
@OriginalMember(owner = "client!pa", name = "O", descriptor = "Lclient!na;") @OriginalMember(owner = "client!pa", name = "O", descriptor = "Lclient!na;")
public static final JagString EMPTY = parse(""); public static final JagString EMPTY = parse("");
@OriginalMember(owner = "client!na", name = "T", descriptor = "[B") @OriginalMember(owner = "client!pi", name = "Q", descriptor = "Lclient!na;")
public static final JagString aClass100_853 = parse("null");
@OriginalMember(owner = "client!na", name = "T", descriptor = "[B")
public byte[] chars; public byte[] chars;
@OriginalMember(owner = "client!na", name = "lb", descriptor = "I") @OriginalMember(owner = "client!na", name = "lb", descriptor = "I")
@ -40,7 +42,7 @@ public final class JagString implements StringInterface {
@Pc(5) int local5 = 0; @Pc(5) int local5 = 0;
for (@Pc(7) int local7 = 0; local7 < arg1; local7++) { for (@Pc(7) int local7 = 0; local7 < arg1; local7++) {
if (arg2[arg0 + local7] == null) { if (arg2[arg0 + local7] == null) {
arg2[local7 + arg0] = Static193.aClass100_853; arg2[local7 + arg0] = aClass100_853;
} }
local5 += arg2[local7 + arg0].length; local5 += arg2[local7 + arg0].length;
} }
@ -128,7 +130,65 @@ public final class JagString implements StringInterface {
return local13.method3151(); return local13.method3151();
} }
@OriginalMember(owner = "client!na", name = "a", descriptor = "(Z)Ljava/net/URL;") @OriginalMember(owner = "client!jj", name = "b", descriptor = "(BI)Lclient!na;")
public static JagString parseInt(@OriginalArg(1) int arg0) {
return parseInt(false, arg0);
}
@OriginalMember(owner = "client!q", name = "a", descriptor = "(BZII)Lclient!na;")
public static JagString parseInt(@OriginalArg(1) boolean arg0, @OriginalArg(3) int arg1) {
@Pc(23) int local23 = 1;
@Pc(27) int local27 = arg1 / 10;
while (local27 != 0) {
local27 /= 10;
local23++;
}
@Pc(38) int local38 = local23;
if (arg1 < 0 || arg0) {
local38 = local23 + 1;
}
@Pc(46) byte[] local46 = new byte[local38];
if (arg1 < 0) {
local46[0] = 45;
} else if (arg0) {
local46[0] = 43;
}
for (@Pc(61) int local61 = 0; local61 < local23; local61++) {
@Pc(68) int local68 = arg1 % 10;
if (local68 < 0) {
local68 = -local68;
}
if (local68 > 9) {
local68 += 39;
}
local46[local38 - local61 - 1] = (byte) (local68 + 48);
arg1 /= 10;
}
@Pc(112) JagString local112 = new JagString();
local112.chars = local46;
local112.length = local38;
return local112;
}
@OriginalMember(owner = "client!an", name = "a", descriptor = "([BIII)Lclient!na;")
public static JagString decodeString(@OriginalArg(0) byte[] arg0, @OriginalArg(2) int arg1, @OriginalArg(3) int arg2) {
@Pc(7) JagString local7 = new JagString();
local7.chars = new byte[arg1];
local7.length = 0;
for (@Pc(22) int local22 = arg2; local22 < arg1 + arg2; local22++) {
if (arg0[local22] != 0) {
local7.chars[local7.length++] = arg0[local22];
}
}
return local7;
}
@OriginalMember(owner = "client!bg", name = "d", descriptor = "(II)Z")
public static boolean method530(@OriginalArg(0) int arg0) {
return arg0 == 198 || arg0 == 230 || arg0 == 156 || arg0 == 140 || arg0 == 223;
}
@OriginalMember(owner = "client!na", name = "a", descriptor = "(Z)Ljava/net/URL;")
public final URL method3107() throws MalformedURLException { public final URL method3107() throws MalformedURLException {
return new URL(new String(this.chars, 0, this.length)); return new URL(new String(this.chars, 0, this.length));
} }
@ -389,7 +449,7 @@ public final class JagString implements StringInterface {
local12 = this.chars[local28] & 0xFF; local12 = this.chars[local28] & 0xFF;
local28++; local28++;
} }
if (Static17.method530(local12)) { if (method530(local12)) {
local23++; local23++;
} else { } else {
local20--; local20--;
@ -404,7 +464,7 @@ public final class JagString implements StringInterface {
local14 = arg0.chars[local30] & 0xFF; local14 = arg0.chars[local30] & 0xFF;
local30++; local30++;
} }
if (Static17.method530(local14)) { if (method530(local14)) {
local26++; local26++;
} else { } else {
local17--; local17--;
@ -888,7 +948,7 @@ public final class JagString implements StringInterface {
@Pc(17) Object local17 = BrowserControl.call(local12, arg0); @Pc(17) Object local17 = BrowserControl.call(local12, arg0);
if (local17 instanceof String) { if (local17 instanceof String) {
@Pc(24) byte[] local24 = ((String) local17).getBytes(); @Pc(24) byte[] local24 = ((String) local17).getBytes();
local17 = Static10.decodeString(local24, local24.length, 0); local17 = decodeString(local24, local24.length, 0);
} }
return local17; return local17;
} }

12
client/src/main/java/rt4/JavaAudioChannel.java
View file

@ -29,6 +29,16 @@ public final class JavaAudioChannel extends AudioChannel {
@OriginalMember(owner = "client!qa", name = "N", descriptor = "Z") @OriginalMember(owner = "client!qa", name = "N", descriptor = "Z")
private boolean aBoolean230 = false; private boolean aBoolean230 = false;
@OriginalMember(owner = "client!uc", name = "a", descriptor = "(II)I")
public static int method3289(@OriginalArg(0) int arg0) {
@Pc(9) int local9 = (arg0 >>> 1 & 0xD5555555) + (arg0 & 0x55555555);
@Pc(19) int local19 = (local9 >>> 2 & 0x33333333) + (local9 & 0x33333333);
@Pc(31) int local31 = (local19 >>> 4) + local19 & 0xF0F0F0F;
@Pc(37) int local37 = local31 + (local31 >>> 8);
@Pc(43) int local43 = local37 + (local37 >>> 16);
return local43 & 0xFF;
}
@OriginalMember(owner = "client!qa", name = "d", descriptor = "()V") @OriginalMember(owner = "client!qa", name = "d", descriptor = "()V")
@Override @Override
protected final void flush() { protected final void flush() {
@ -67,7 +77,7 @@ public final class JavaAudioChannel extends AudioChannel {
this.aSourceDataLine1.start(); this.aSourceDataLine1.start();
this.anInt4645 = arg0; this.anInt4645 = arg0;
} catch (@Pc(36) LineUnavailableException local36) { } catch (@Pc(36) LineUnavailableException local36) {
if (Static248.method3289(arg0) == 1) { if (method3289(arg0) == 1) {
this.aSourceDataLine1 = null; this.aSourceDataLine1 = null;
throw local36; throw local36;
} else { } else {

25
client/src/main/java/rt4/Js5.java
View file

@ -48,6 +48,23 @@ public final class Js5 {
} }
} }
@OriginalMember(owner = "client!cj", name = "a", descriptor = "(ZI[B)Ljava/lang/Object;")
public static Object method869(@OriginalArg(2) byte[] arg0) {
if (arg0 == null) {
return null;
}
if (arg0.length > 136 && !Static84.aBoolean127) {
try {
@Pc(27) ByteArray local27 = new DirectByteArray();
local27.set(arg0);
return local27;
} catch (@Pc(34) Throwable local34) {
Static84.aBoolean127 = true;
}
}
return arg0;
}
@OriginalMember(owner = "client!ve", name = "a", descriptor = "(B)Z") @OriginalMember(owner = "client!ve", name = "a", descriptor = "(B)Z")
public final boolean fetchAll() { public final boolean fetchAll() {
if (!this.method4484()) { if (!this.method4484()) {
@ -305,7 +322,7 @@ public final class Js5 {
try { try {
local140 = Js5Compression.uncompress(local114); local140 = Js5Compression.uncompress(local114);
} catch (@Pc(142) RuntimeException local142) { } catch (@Pc(142) RuntimeException local142) {
System.out.println("T3 - " + (arg1 != null) + "," + arg0 + "," + local114.length + "," + Static71.method1442(local114, local114.length) + "," + Static71.method1442(local114, local114.length - 2) + "," + this.aClass70_2.anIntArray268[arg0] + "," + this.aClass70_2.anInt2911); System.out.println("T3 - " + (arg1 != null) + "," + arg0 + "," + local114.length + "," + Buffer.crc32(local114, local114.length) + "," + Buffer.crc32(local114, local114.length - 2) + "," + this.aClass70_2.anIntArray268[arg0] + "," + this.aClass70_2.anInt2911);
local140 = new byte[] { 0 }; local140 = new byte[] { 0 };
} }
if (this.discardPacked) { if (this.discardPacked) {
@ -357,7 +374,7 @@ public final class Js5 {
if (this.discardUnpacked) { if (this.discardUnpacked) {
local53[local320] = local282[local252]; local53[local320] = local282[local252];
} else { } else {
local53[local320] = Static33.method869(local282[local252]); local53[local320] = method869(local282[local252]);
} }
} }
} else { } else {
@ -369,7 +386,7 @@ public final class Js5 {
if (this.discardUnpacked) { if (this.discardUnpacked) {
local53[local213] = local140; local53[local213] = local140;
} else { } else {
local53[local213] = Static33.method869(local140); local53[local213] = method869(local140);
} }
} }
return true; return true;
@ -386,7 +403,7 @@ public final class Js5 {
if (this.discardPacked) { if (this.discardPacked) {
this.anObjectArray32[arg0] = this.provider.method525(arg0); this.anObjectArray32[arg0] = this.provider.method525(arg0);
} else { } else {
this.anObjectArray32[arg0] = Static33.method869(this.provider.method525(arg0)); this.anObjectArray32[arg0] = method869(this.provider.method525(arg0));
} }
} }

2
client/src/main/java/rt4/Js5Index.java
View file

@ -52,7 +52,7 @@ public final class Js5Index {
@OriginalMember(owner = "client!ii", name = "<init>", descriptor = "([BI)V") @OriginalMember(owner = "client!ii", name = "<init>", descriptor = "([BI)V")
public Js5Index(@OriginalArg(0) byte[] arg0, @OriginalArg(1) int arg1) { public Js5Index(@OriginalArg(0) byte[] arg0, @OriginalArg(1) int arg1) {
this.anInt2911 = Static71.method1442(arg0, arg0.length); this.anInt2911 = Buffer.crc32(arg0, arg0.length);
if (arg1 != this.anInt2911) { if (arg1 != this.anInt2911) {
throw new RuntimeException(); throw new RuntimeException();
} }

4
client/src/main/java/rt4/Js5NetQueue.java
View file

@ -199,7 +199,7 @@ public final class Js5NetQueue {
} }
@OriginalMember(owner = "client!jb", name = "a", descriptor = "(Z)V") @OriginalMember(owner = "client!jb", name = "a", descriptor = "(Z)V")
public final void method2319() { public final void drop() {
if (this.aClass95_1 == null) { if (this.aClass95_1 == null) {
return; return;
} }
@ -246,7 +246,7 @@ public final class Js5NetQueue {
} }
@OriginalMember(owner = "client!jb", name = "c", descriptor = "(I)V") @OriginalMember(owner = "client!jb", name = "c", descriptor = "(I)V")
public final void method2323() { public final void breakConnection() {
if (this.aClass95_1 != null) { if (this.aClass95_1 != null) {
this.aClass95_1.breakConnection(); this.aClass95_1.breakConnection();
} }

8
client/src/main/java/rt4/Light.java
View file

@ -8,7 +8,9 @@ import org.openrs2.deob.annotation.Pc;
@OriginalClass("client!gi") @OriginalClass("client!gi")
public final class Light { public final class Light {
@OriginalMember(owner = "client!gi", name = "a", descriptor = "Z") @OriginalMember(owner = "client!f", name = "P", descriptor = "[I")
public static int[] anIntArray150;
@OriginalMember(owner = "client!gi", name = "a", descriptor = "Z")
public final boolean aBoolean124; public final boolean aBoolean124;
@OriginalMember(owner = "client!gi", name = "d", descriptor = "I") @OriginalMember(owner = "client!gi", name = "d", descriptor = "I")
@ -70,7 +72,7 @@ public final class Light {
@OriginalMember(owner = "client!gi", name = "<init>", descriptor = "(Lclient!wa;)V") @OriginalMember(owner = "client!gi", name = "<init>", descriptor = "(Lclient!wa;)V")
public Light(@OriginalArg(0) Buffer arg0) { public Light(@OriginalArg(0) Buffer arg0) {
if (Static62.anIntArray150 == null) { if (anIntArray150 == null) {
Static84.method1771(); Static84.method1771();
} }
this.anInt2241 = arg0.g1(); this.anInt2241 = arg0.g1();
@ -118,7 +120,7 @@ public final class Light {
if (local29 == 1) { if (local29 == 1) {
local62 = (MathUtils.sin[local26] >> 6) + 1024; local62 = (MathUtils.sin[local26] >> 6) + 1024;
} else if (local29 == 3) { } else if (local29 == 3) {
local62 = Static62.anIntArray150[local26] >> 1; local62 = anIntArray150[local26] >> 1;
} else if (local29 == 4) { } else if (local29 == 4) {
local62 = local26 >> 10 << 11; local62 = local26 >> 10 << 11;
} else if (local29 == 2) { } else if (local29 == 2) {

438
client/src/main/java/rt4/LightingManager.java
View file

@ -1,10 +1,448 @@
package rt4; package rt4;
import com.jogamp.opengl.GL2;
import org.openrs2.deob.annotation.OriginalArg;
import org.openrs2.deob.annotation.OriginalMember; import org.openrs2.deob.annotation.OriginalMember;
import org.openrs2.deob.annotation.Pc;
public class LightingManager { public class LightingManager {
@OriginalMember(owner = "client!jf", name = "b", descriptor = "[F")
private static final float[] aFloatArray17 = new float[] { 0.0F, 0.0F, 0.0F, 1.0F };
@OriginalMember(owner = "client!jf", name = "l", descriptor = "I") @OriginalMember(owner = "client!jf", name = "l", descriptor = "I")
public static int lightCount = 0; public static int lightCount = 0;
@OriginalMember(owner = "client!jf", name = "a", descriptor = "[Lclient!gi;") @OriginalMember(owner = "client!jf", name = "a", descriptor = "[Lclient!gi;")
public static Light[] lights; public static Light[] lights;
@OriginalMember(owner = "client!jf", name = "c", descriptor = "[I")
private static int[] anIntArray283;
@OriginalMember(owner = "client!jf", name = "d", descriptor = "I")
private static int anInt3029;
@OriginalMember(owner = "client!jf", name = "e", descriptor = "I")
private static int anInt3030;
@OriginalMember(owner = "client!jf", name = "f", descriptor = "[Z")
private static boolean[] aBooleanArray65;
@OriginalMember(owner = "client!jf", name = "g", descriptor = "[[[I")
private static int[][][] anIntArrayArrayArray11;
@OriginalMember(owner = "client!jf", name = "h", descriptor = "[I")
private static int[] anIntArray284;
@OriginalMember(owner = "client!jf", name = "i", descriptor = "I")
private static int anInt3031;
@OriginalMember(owner = "client!jf", name = "j", descriptor = "I")
private static int anInt3032;
@OriginalMember(owner = "client!jf", name = "k", descriptor = "I")
private static int anInt3033;
@OriginalMember(owner = "client!jf", name = "m", descriptor = "[Z")
private static boolean[] aBooleanArray66;
@OriginalMember(owner = "client!jf", name = "n", descriptor = "I")
private static int anInt3035;
@OriginalMember(owner = "client!jf", name = "o", descriptor = "I")
private static int anInt3036;
@OriginalMember(owner = "client!jf", name = "p", descriptor = "I")
private static int anInt3037;
@OriginalMember(owner = "client!jf", name = "a", descriptor = "(IIIIIII)V")
public static void method2388(@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) {
if (!Preferences.highDetailLighting) {
return;
}
if (arg0 == 1 && arg5 > 0) {
method2393(arg1, arg2, arg3, arg4, arg5 - 1, arg6);
} else if (arg0 == 4 && arg5 < anInt3037 - 1) {
method2393(arg1, arg2, arg3, arg4, arg5 + 1, arg6);
} else if (arg0 == 8 && arg6 > 0) {
method2393(arg1, arg2, arg3, arg4, arg5, arg6 - 1);
} else if (arg0 == 2 && arg6 < anInt3036 - 1) {
method2393(arg1, arg2, arg3, arg4, arg5, arg6 + 1);
} else if (arg0 == 16 && arg5 > 0 && arg6 < anInt3036 - 1) {
method2393(arg1, arg2, arg3, arg4, arg5 - 1, arg6 + 1);
} else if (arg0 == 32 && arg5 < anInt3037 - 1 && arg6 < anInt3036 - 1) {
method2393(arg1, arg2, arg3, arg4, arg5 + 1, arg6 + 1);
} else if (arg0 == 128 && arg5 > 0 && arg6 > 0) {
method2393(arg1, arg2, arg3, arg4, arg5 - 1, arg6 - 1);
} else if (arg0 == 64 && arg5 < anInt3037 - 1 && arg6 > 0) {
method2393(arg1, arg2, arg3, arg4, arg5 + 1, arg6 - 1);
}
}
@OriginalMember(owner = "client!jf", name = "a", descriptor = "(Lclient!gi;)V")
public static void method2389(@OriginalArg(0) Light arg0) {
if (lightCount >= 255) {
System.out.println("Number of lights added exceeds maximum!");
} else {
lights[lightCount++] = arg0;
}
}
@OriginalMember(owner = "client!jf", name = "a", descriptor = "()V")
public static void method2390() {
for (@Pc(1) int local1 = 0; local1 < 4; local1++) {
anIntArray284[local1] = -1;
method2396(local1);
}
}
@OriginalMember(owner = "client!jf", name = "a", descriptor = "(IIIIIIII)V")
public static void method2391(@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) {
if (!Preferences.highDetailLighting || anInt3031 == arg3 && anInt3033 == arg4 && anInt3029 == arg5 && anInt3035 == arg6 && anInt3030 == arg7) {
return;
}
@Pc(20) int local20;
for (local20 = 0; local20 < 4; local20++) {
aBooleanArray66[local20] = false;
}
local20 = 0;
@Pc(33) int local33 = 0;
@Pc(35) int local35;
@Pc(40) int local40;
label112: for (local35 = arg4; local35 <= arg6; local35++) {
label110: for (local40 = arg5; local40 <= arg7; local40++) {
@Pc(51) int local51 = anIntArrayArrayArray11[arg3][local35][local40];
while (true) {
while (true) {
label96: while (true) {
if (local51 == 0) {
continue label110;
}
@Pc(59) int local59 = (local51 & 0xFF) - 1;
local51 >>>= 0x8;
@Pc(65) int local65;
for (local65 = 0; local65 < local33; local65++) {
if (local59 == anIntArray283[local65]) {
continue label96;
}
}
for (local65 = 0; local65 < 4; local65++) {
if (local59 == anIntArray284[local65]) {
if (!aBooleanArray66[local65]) {
aBooleanArray66[local65] = true;
local20++;
if (local20 == 4) {
break label112;
}
}
continue label96;
}
}
anIntArray283[local33++] = local59;
local20++;
if (local20 == 4) {
break label112;
}
}
}
}
}
}
for (local35 = 0; local35 < local33; local35++) {
for (local40 = 0; local40 < 4; local40++) {
if (!aBooleanArray66[local40]) {
anIntArray284[local40] = anIntArray283[local35];
aBooleanArray66[local40] = true;
method2403(local40, lights[anIntArray283[local35]], arg0, arg1, arg2);
break;
}
}
}
for (local35 = 0; local35 < 4; local35++) {
if (!aBooleanArray66[local35]) {
anIntArray284[local35] = -1;
method2396(local35);
}
}
anInt3031 = arg3;
anInt3033 = arg4;
anInt3029 = arg5;
anInt3035 = arg6;
anInt3030 = arg7;
}
@OriginalMember(owner = "client!jf", name = "a", descriptor = "(III)V")
public static void method2392() {
anInt3032 = 4;
anInt3037 = 104;
anInt3036 = 104;
anIntArrayArrayArray11 = new int[anInt3032][anInt3037][anInt3036];
}
@OriginalMember(owner = "client!jf", name = "a", descriptor = "(IIIIII)V")
public static void method2393(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2, @OriginalArg(3) int arg3, @OriginalArg(4) int arg4, @OriginalArg(5) int arg5) {
if (!Preferences.highDetailLighting || anInt3031 == arg3 && anInt3033 == arg4 && anInt3029 == arg5 && anInt3035 == arg4 && anInt3030 == arg5) {
return;
}
@Pc(20) int local20;
for (local20 = 0; local20 < 4; local20++) {
aBooleanArray66[local20] = false;
}
local20 = 0;
@Pc(39) int local39 = anIntArrayArrayArray11[arg3][arg4][arg5];
while (true) {
@Pc(47) int local47;
@Pc(53) int local53;
label72: while (local39 != 0) {
local47 = (local39 & 0xFF) - 1;
local39 >>>= 0x8;
for (local53 = 0; local53 < 4; local53++) {
if (local47 == anIntArray284[local53]) {
aBooleanArray66[local53] = true;
continue label72;
}
}
anIntArray283[local20++] = local47;
}
for (local47 = 0; local47 < local20; local47++) {
for (local53 = 0; local53 < 4; local53++) {
if (!aBooleanArray66[local53]) {
anIntArray284[local53] = anIntArray283[local47];
aBooleanArray66[local53] = true;
method2403(local53, lights[anIntArray283[local47]], arg0, arg1, arg2);
break;
}
}
}
for (local47 = 0; local47 < 4; local47++) {
if (!aBooleanArray66[local47]) {
anIntArray284[local47] = -1;
method2396(local47);
}
}
anInt3031 = arg3;
anInt3033 = arg4;
anInt3029 = arg5;
anInt3035 = arg4;
anInt3030 = arg5;
return;
}
}
@OriginalMember(owner = "client!jf", name = "a", descriptor = "(IZ)V")
public static void method2394(@OriginalArg(0) int arg0, @OriginalArg(1) boolean arg1) {
for (@Pc(1) int local1 = 0; local1 < lightCount; local1++) {
lights[local1].method1765(arg1, arg0);
}
anInt3031 = -1;
anInt3033 = -1;
anInt3029 = -1;
anInt3035 = -1;
anInt3030 = -1;
}
@OriginalMember(owner = "client!jf", name = "b", descriptor = "()V")
public static void method2395() {
for (@Pc(1) int local1 = 0; local1 < lightCount; local1++) {
@Pc(8) Light local8 = lights[local1];
@Pc(11) int local11 = local8.anInt2241;
if (local8.aBoolean124) {
local11 = 0;
}
@Pc(19) int local19 = local8.anInt2241;
if (local8.aBoolean126) {
local19 = 3;
}
for (@Pc(26) int local26 = local11; local26 <= local19; local26++) {
@Pc(31) int local31 = 0;
@Pc(39) int local39 = (local8.anInt2245 >> 7) - local8.anInt2236;
if (local39 < 0) {
local31 = -local39;
local39 = 0;
}
@Pc(55) int local55 = (local8.anInt2245 >> 7) + local8.anInt2236;
if (local55 > anInt3036 - 1) {
local55 = anInt3036 - 1;
}
for (@Pc(66) int local66 = local39; local66 <= local55; local66++) {
@Pc(75) short local75 = local8.aShortArray30[local31++];
@Pc(87) int local87 = (local8.anInt2240 >> 7) + (local75 >> 8) - local8.anInt2236;
@Pc(95) int local95 = local87 + (local75 & 0xFF) - 1;
if (local87 < 0) {
local87 = 0;
}
if (local95 > anInt3037 - 1) {
local95 = anInt3037 - 1;
}
for (@Pc(110) int local110 = local87; local110 <= local95; local110++) {
@Pc(121) int local121 = anIntArrayArrayArray11[local26][local110][local66];
if ((local121 & 0xFF) == 0) {
anIntArrayArrayArray11[local26][local110][local66] = local121 | local1 + 1;
} else if ((local121 & 0xFF00) == 0) {
anIntArrayArrayArray11[local26][local110][local66] = local121 | local1 + 1 << 8;
} else if ((local121 & 0xFF0000) == 0) {
anIntArrayArrayArray11[local26][local110][local66] = local121 | local1 + 1 << 16;
} else if ((local121 & 0xFF000000) == 0) {
anIntArrayArrayArray11[local26][local110][local66] = local121 | local1 + 1 << 24;
}
}
}
}
}
}
@OriginalMember(owner = "client!jf", name = "a", descriptor = "(I)V")
private static void method2396(@OriginalArg(0) int arg0) {
if (aBooleanArray65[arg0]) {
aBooleanArray65[arg0] = false;
@Pc(14) int local14 = arg0 + 16384 + 4;
@Pc(16) GL2 local16 = GlRenderer.gl;
local16.glDisable(local14);
}
}
@OriginalMember(owner = "client!jf", name = "a", descriptor = "(IIIII)V")
public static void method2397(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2, @OriginalArg(3) int arg3, @OriginalArg(4) int arg4) {
if (!Preferences.highDetailLighting) {
return;
}
label43: for (@Pc(4) int local4 = 0; local4 < 4; local4++) {
if (anIntArray284[local4] != -1) {
@Pc(20) int local20 = anIntArrayArrayArray11[arg0][arg1][arg2];
@Pc(28) int local28;
while (local20 != 0) {
local28 = (local20 & 0xFF) - 1;
local20 >>>= 0x8;
if (local28 == anIntArray284[local4]) {
continue label43;
}
}
local20 = anIntArrayArrayArray11[arg0][arg3][arg4];
while (local20 != 0) {
local28 = (local20 & 0xFF) - 1;
local20 >>>= 0x8;
if (local28 == anIntArray284[local4]) {
continue label43;
}
}
}
anIntArray284[local4] = -1;
method2396(local4);
}
}
@OriginalMember(owner = "client!jf", name = "c", descriptor = "()V")
public static void method2398() {
lights = null;
anIntArray284 = null;
aBooleanArray65 = null;
anIntArray283 = null;
aBooleanArray66 = null;
anIntArrayArrayArray11 = null;
}
@OriginalMember(owner = "client!jf", name = "e", descriptor = "()V")
public static void method2400() {
@Pc(1) GL2 local1 = GlRenderer.gl;
@Pc(3) int local3;
for (local3 = 0; local3 < 4; local3++) {
@Pc(10) int local10 = local3 + 16388;
local1.glLightfv(local10, GL2.GL_AMBIENT, new float[] { 0.0F, 0.0F, 0.0F, 1.0F }, 0);
local1.glLightf(local10, GL2.GL_LINEAR_ATTENUATION, 0.0F);
local1.glLightf(local10, GL2.GL_CONSTANT_ATTENUATION, 0.0F);
}
for (local3 = 0; local3 < 4; local3++) {
anIntArray284[local3] = -1;
method2396(local3);
}
}
@OriginalMember(owner = "client!jf", name = "f", descriptor = "()V")
public static void method2401() {
lights = new Light[255];
anIntArray284 = new int[4];
aBooleanArray65 = new boolean[4];
anIntArray283 = new int[4];
aBooleanArray66 = new boolean[4];
anIntArrayArrayArray11 = new int[anInt3032][anInt3037][anInt3036];
}
@OriginalMember(owner = "client!jf", name = "a", descriptor = "(II[[[Lclient!bj;)V")
public static void method2402(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(2) Tile[][][] arg2) {
if (!Preferences.highDetailLighting) {
return;
}
@Pc(4) GL2 local4 = GlRenderer.gl;
MaterialManager.setMaterial(0, 0);
GlRenderer.setTextureCombineRgbMode(0);
GlRenderer.resetTextureMatrix();
GlRenderer.setTextureId(GlRenderer.anInt5328);
local4.glDepthMask(false);
GlRenderer.setLightingEnabled(false);
local4.glBlendFunc(GL2.GL_DST_COLOR, GL2.GL_ONE);
local4.glFogfv(GL2.GL_FOG_COLOR, new float[] { 0.0F, 0.0F, 0.0F, 0.0F }, 0);
local4.glTexEnvi(GL2.GL_TEXTURE_ENV, GL2.GL_SRC0_RGB, GL2.GL_CONSTANT);
local4.glTexEnvi(GL2.GL_TEXTURE_ENV, GL2.GL_OPERAND0_RGB, GL2.GL_SRC_ALPHA);
label71: for (@Pc(56) int local56 = 0; local56 < lightCount; local56++) {
@Pc(63) Light local63 = lights[local56];
@Pc(66) int local66 = local63.anInt2241;
if (local63.aBoolean125) {
local66--;
}
if (local63.aClass45_1 != null) {
@Pc(76) int local76 = 0;
@Pc(84) int local84 = (local63.anInt2245 >> 7) - local63.anInt2236;
@Pc(92) int local92 = (local63.anInt2245 >> 7) + local63.anInt2236;
if (local92 >= Static215.anInt4866) {
local92 = Static215.anInt4866 - 1;
}
if (local84 < Static80.anInt4698) {
local76 = Static80.anInt4698 - local84;
local84 = Static80.anInt4698;
}
for (@Pc(112) int local112 = local84; local112 <= local92; local112++) {
@Pc(121) short local121 = local63.aShortArray30[local76++];
@Pc(133) int local133 = (local63.anInt2240 >> 7) + (local121 >> 8) - local63.anInt2236;
@Pc(141) int local141 = local133 + (local121 & 0xFF) - 1;
if (local133 < Static31.anInt987) {
local133 = Static31.anInt987;
}
if (local141 >= Static2.anInt15) {
local141 = Static2.anInt15 - 1;
}
for (@Pc(155) int local155 = local133; local155 <= local141; local155++) {
@Pc(160) Tile local160 = null;
if (local66 >= 0) {
local160 = arg2[local66][local155][local112];
}
if (local66 < 0 || local160 != null && local160.aBoolean45) {
GlRenderer.method4159(201.5F - (float) local63.anInt2241 * 50.0F - 1.5F);
local4.glTexEnvfv(GL2.GL_TEXTURE_ENV, GL2.GL_TEXTURE_ENV_COLOR, new float[] { 0.0F, 0.0F, 0.0F, local63.aFloat8 }, 0);
local63.aClass45_1.method1556();
continue label71;
}
}
}
}
}
local4.glTexEnvi(GL2.GL_TEXTURE_ENV, GL2.GL_SRC0_RGB, GL2.GL_TEXTURE);
local4.glTexEnvi(GL2.GL_TEXTURE_ENV, GL2.GL_OPERAND0_RGB, GL2.GL_SRC_COLOR);
local4.glBlendFunc(GL2.GL_SRC_ALPHA, GL2.GL_ONE_MINUS_SRC_ALPHA);
local4.glDepthMask(true);
local4.glFogfv(GL2.GL_FOG_COLOR, Static161.fogColor, 0);
local4.glEnableClientState(GL2.GL_TEXTURE_COORD_ARRAY);
GlRenderer.method4173();
}
@OriginalMember(owner = "client!jf", name = "a", descriptor = "(ILclient!gi;III)V")
private static void method2403(@OriginalArg(0) int arg0, @OriginalArg(1) Light arg1, @OriginalArg(2) int arg2, @OriginalArg(3) int arg3, @OriginalArg(4) int arg4) {
@Pc(5) int local5 = arg0 + 16384 + 4;
@Pc(7) GL2 local7 = GlRenderer.gl;
if (!aBooleanArray65[arg0]) {
local7.glEnable(local5);
aBooleanArray65[arg0] = true;
}
local7.glLightf(local5, GL2.GL_QUADRATIC_ATTENUATION, arg1.aFloat9);
local7.glLightfv(local5, GL2.GL_DIFFUSE, arg1.aFloatArray3, 0);
aFloatArray17[0] = arg1.anInt2240 - arg2;
aFloatArray17[1] = arg1.anInt2235 - arg3;
aFloatArray17[2] = arg1.anInt2245 - arg4;
local7.glLightfv(local5, GL2.GL_POSITION, aFloatArray17, 0);
}
@OriginalMember(owner = "client!jf", name = "g", descriptor = "()V")
public static void method2404() {
lightCount = 0;
for (@Pc(3) int local3 = 0; local3 < anInt3032; local3++) {
for (@Pc(8) int local8 = 0; local8 < anInt3037; local8++) {
for (@Pc(13) int local13 = 0; local13 < anInt3036; local13++) {
anIntArrayArrayArray11[local3][local8][local13] = 0;
}
}
}
}
} }

4
client/src/main/java/rt4/LinkedList.java
View file

@ -33,7 +33,7 @@ public final class LinkedList {
} }
@OriginalMember(owner = "client!ih", name = "b", descriptor = "(I)Lclient!ab;") @OriginalMember(owner = "client!ih", name = "b", descriptor = "(I)Lclient!ab;")
public final Node method2279() { public final Node tail() {
@Pc(7) Node local7 = this.aClass3_109.aClass3_223; @Pc(7) Node local7 = this.aClass3_109.aClass3_223;
if (this.aClass3_109 == local7) { if (this.aClass3_109 == local7) {
this.aClass3_110 = null; this.aClass3_110 = null;
@ -67,7 +67,7 @@ public final class LinkedList {
} }
@OriginalMember(owner = "client!ih", name = "d", descriptor = "(I)Lclient!ab;") @OriginalMember(owner = "client!ih", name = "d", descriptor = "(I)Lclient!ab;")
public final Node method2286() { public final Node prev() {
@Pc(13) Node local13 = this.aClass3_110; @Pc(13) Node local13 = this.aClass3_110;
if (this.aClass3_109 == local13) { if (this.aClass3_109 == local13) {
this.aClass3_110 = null; this.aClass3_110 = null;

12
client/src/main/java/rt4/LoadingBarAwt.java
View file

@ -10,6 +10,8 @@ import java.awt.Font;
public class LoadingBarAwt { public class LoadingBarAwt {
@OriginalMember(owner = "client!tg", name = "a", descriptor = "Ljava/awt/FontMetrics;") @OriginalMember(owner = "client!tg", name = "a", descriptor = "Ljava/awt/FontMetrics;")
public static FontMetrics aFontMetrics1; public static FontMetrics aFontMetrics1;
@OriginalMember(owner = "client!lj", name = "y", descriptor = "Ljava/awt/Image;")
public static Image anImage3;
@OriginalMember(owner = "client!bc", name = "a", descriptor = "(Ljava/awt/Color;ZZLclient!na;I)V") @OriginalMember(owner = "client!bc", name = "a", descriptor = "(Ljava/awt/Color;ZZLclient!na;I)V")
public static void render(@OriginalArg(0) Color arg0, @OriginalArg(2) boolean arg1, @OriginalArg(3) JagString arg2, @OriginalArg(4) int arg3) { public static void render(@OriginalArg(0) Color arg0, @OriginalArg(2) boolean arg1, @OriginalArg(3) JagString arg2, @OriginalArg(4) int arg3) {
@ -27,10 +29,10 @@ public class LoadingBarAwt {
arg0 = new Color(140, 17, 17); arg0 = new Color(140, 17, 17);
} }
try { try {
if (Static149.anImage3 == null) { if (anImage3 == null) {
Static149.anImage3 = GameShell.canvas.createImage(304, 34); anImage3 = GameShell.canvas.createImage(304, 34);
} }
@Pc(56) Graphics local56 = Static149.anImage3.getGraphics(); @Pc(56) Graphics local56 = anImage3.getGraphics();
local56.setColor(arg0); local56.setColor(arg0);
local56.drawRect(0, 0, 303, 33); local56.drawRect(0, 0, 303, 33);
local56.fillRect(2, 2, arg3 * 3, 30); local56.fillRect(2, 2, arg3 * 3, 30);
@ -40,7 +42,7 @@ public class LoadingBarAwt {
local56.setFont(Static222.aFont1); local56.setFont(Static222.aFont1);
local56.setColor(Color.white); local56.setColor(Color.white);
arg2.method3112(22, (304 - arg2.method3155(aFontMetrics1)) / 2, local56); arg2.method3112(22, (304 - arg2.method3155(aFontMetrics1)) / 2, local56);
local6.drawImage(Static149.anImage3, GameShell.canvasWidth / 2 - 152, GameShell.canvasHeight / 2 + -18, null); local6.drawImage(anImage3, GameShell.canvasWidth / 2 - 152, GameShell.canvasHeight / 2 + -18, null);
} catch (@Pc(134) Exception local134) { } catch (@Pc(134) Exception local134) {
@Pc(140) int local140 = GameShell.canvasWidth / 2 - 152; @Pc(140) int local140 = GameShell.canvasWidth / 2 - 152;
@Pc(146) int local146 = GameShell.canvasHeight / 2 - 18; @Pc(146) int local146 = GameShell.canvasHeight / 2 - 18;
@ -68,6 +70,6 @@ public class LoadingBarAwt {
public static void clear() { public static void clear() {
aFontMetrics1 = null; aFontMetrics1 = null;
Static222.aFont1 = null; Static222.aFont1 = null;
Static149.anImage3 = null; anImage3 = null;
} }
} }

52
client/src/main/java/rt4/Loc.java
View file

@ -93,7 +93,7 @@ public final class Loc extends Entity {
local67 = local67.getMultiLoc(); local67 = local67.getMultiLoc();
} }
if (local67 != null) { if (local67 != null) {
Static9.method181(local67, 0, this.anInt1295, 0, this.anInt1307, this.anInt1308, this.anInt1300, this.anInt1303); method181(local67, 0, this.anInt1295, 0, this.anInt1307, this.anInt1308, this.anInt1300, this.anInt1303);
} }
} }
} }
@ -141,7 +141,55 @@ public final class Loc extends Entity {
} }
} }
@OriginalMember(owner = "client!dc", name = "a", descriptor = "(IIIII)V") @OriginalMember(owner = "client!al", name = "a", descriptor = "(Lclient!pb;BIIIIIII)V")
public static void method181(@OriginalArg(0) LocType arg0, @OriginalArg(2) int arg1, @OriginalArg(3) int arg2, @OriginalArg(4) int arg3, @OriginalArg(5) int arg4, @OriginalArg(6) int arg5, @OriginalArg(7) int arg6, @OriginalArg(8) int arg7) {
@Pc(5) int local5 = arg2 & 0x3;
@Pc(28) int local28;
@Pc(31) int local31;
if (local5 == 1 || local5 == 3) {
local28 = arg0.length;
local31 = arg0.width;
} else {
local31 = arg0.length;
local28 = arg0.width;
}
@Pc(53) int local53;
@Pc(51) int local51;
if (arg6 + local31 > 104) {
local51 = arg6 + 1;
local53 = arg6;
} else {
local53 = arg6 + (local31 >> 1);
local51 = arg6 + (local31 + 1 >> 1);
}
@Pc(80) int local80 = (arg5 << 7) + (local28 << 6);
@Pc(88) int local88 = (arg6 << 7) + (local31 << 6);
@Pc(96) int local96;
@Pc(100) int local100;
if (arg5 + local28 > 104) {
local96 = arg5;
local100 = arg5 + 1;
} else {
local96 = arg5 + (local28 >> 1);
local100 = (local28 + 1 >> 1) + arg5;
}
@Pc(120) int[][] local120 = SceneGraph.tileHeights[arg7];
@Pc(122) int local122 = 0;
@Pc(148) int local148 = local120[local96][local51] + local120[local96][local53] + local120[local100][local53] + local120[local100][local51] >> 2;
@Pc(158) int[][] local158;
if (arg7 != 0) {
local158 = SceneGraph.tileHeights[0];
local122 = local148 - (local158[local96][local51] + local158[local100][local53] + local158[local96][local53] + local158[local100][local51] >> 2);
}
local158 = null;
if (arg7 < 3) {
local158 = SceneGraph.tileHeights[arg7 + 1];
}
@Pc(215) Loc_Class139 local215 = arg0.method3428(arg2, local80, local120, arg4, local148, local158, false, null, true, local88);
Static242.method4207(local215.aClass36_Sub1_3, local80 - arg3, local122, local88 - arg1);
}
@OriginalMember(owner = "client!dc", name = "a", descriptor = "(IIIII)V")
@Override @Override
public final void method4545(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2, @OriginalArg(3) int arg3, @OriginalArg(4) int arg4) { public final void method4545(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2, @OriginalArg(3) int arg3, @OriginalArg(4) int arg4) {
if (GlRenderer.enabled) { if (GlRenderer.enabled) {

38
client/src/main/java/rt4/LocType.java
View file

@ -10,6 +10,8 @@ public final class LocType {
@OriginalMember(owner = "client!wf", name = "o", descriptor = "[Lclient!gb;") @OriginalMember(owner = "client!wf", name = "o", descriptor = "[Lclient!gb;")
public static final RawModel[] tempModels = new RawModel[4]; public static final RawModel[] tempModels = new RawModel[4];
@OriginalMember(owner = "client!ni", name = "n", descriptor = "Lclient!sm;")
public static Loc_Class139 aClass139_1 = new Loc_Class139();
@OriginalMember(owner = "client!pb", name = "a", descriptor = "[S") @OriginalMember(owner = "client!pb", name = "a", descriptor = "[S")
private short[] retextureSource; private short[] retextureSource;
@ -58,8 +60,10 @@ public final class LocType {
@OriginalMember(owner = "client!pb", name = "u", descriptor = "I") @OriginalMember(owner = "client!pb", name = "u", descriptor = "I")
private int anInt4407 = 0; private int anInt4407 = 0;
@OriginalMember(owner = "client!gg", name = "W", descriptor = "Lclient!na;")
public static final JagString aClass100_475 = JagString.parse("null");
@OriginalMember(owner = "client!pb", name = "E", descriptor = "Lclient!na;") @OriginalMember(owner = "client!pb", name = "E", descriptor = "Lclient!na;")
public JagString name = Static81.aClass100_475; public JagString name = aClass100_475;
@OriginalMember(owner = "client!pb", name = "D", descriptor = "Z") @OriginalMember(owner = "client!pb", name = "D", descriptor = "Z")
public boolean aBoolean212 = true; public boolean aBoolean212 = true;
@ -749,9 +753,9 @@ public final class LocType {
if (local225 == null) { if (local225 == null) {
local235 = this.method3427(arg0, false, arg3); local235 = this.method3427(arg0, false, arg3);
if (local235 == null) { if (local235 == null) {
Static171.aClass139_1.aClass8_10 = null; aClass139_1.aClass8_10 = null;
Static171.aClass139_1.aClass36_Sub1_3 = null; aClass139_1.aClass36_Sub1_3 = null;
return Static171.aClass139_1; return aClass139_1;
} }
if (arg3 == 10 && arg0 > 3) { if (arg3 == 10 && arg0 > 3) {
local235.method4554(256); local235.method4554(256);
@ -775,10 +779,10 @@ public final class LocType {
local330.method4110(this.aByte15, this.aShort26, local235, arg2, arg5, arg1, arg4, arg9); local330.method4110(this.aByte15, this.aShort26, local235, arg2, arg5, arg1, arg4, arg9);
} }
local330.method4111(this.anInt4429 == 0 && !this.aBoolean214, true, true, this.anInt4429 == 0, true, false); local330.method4111(this.anInt4429 == 0 && !this.aBoolean214, true, true, this.anInt4429 == 0, true, false);
Static171.aClass139_1.aClass8_10 = local330; aClass139_1.aClass8_10 = local330;
local330.aBoolean259 = local298; local330.aBoolean259 = local298;
Static171.aClass139_1.aClass36_Sub1_3 = local265; aClass139_1.aClass36_Sub1_3 = local265;
return Static171.aClass139_1; return aClass139_1;
} }
if (this.shapes == null) { if (this.shapes == null) {
local29 = (this.id << 10) + arg0; local29 = (this.id << 10) + arg0;
@ -796,8 +800,8 @@ public final class LocType {
if (local60 == null) { if (local60 == null) {
@Pc(69) RawModel local69 = this.method3418(arg0, arg3); @Pc(69) RawModel local69 = this.method3418(arg0, arg3);
if (local69 == null) { if (local69 == null) {
Static171.aClass139_1.aClass8_10 = null; aClass139_1.aClass8_10 = null;
return Static171.aClass139_1; return aClass139_1;
} }
local69.method1681(); local69.method1681();
if (arg3 == 10 && arg0 > 3) { if (arg3 == 10 && arg0 > 3) {
@ -823,8 +827,8 @@ public final class LocType {
local60 = ((RawModel) local60).method1670(this.aByte15, this.aShort26, arg2, arg5, arg1, arg4, arg9); local60 = ((RawModel) local60).method1670(this.aByte15, this.aShort26, arg2, arg5, arg1, arg4, arg9);
} }
} }
Static171.aClass139_1.aClass8_10 = local60; aClass139_1.aClass8_10 = local60;
return Static171.aClass139_1; return aClass139_1;
} }
@OriginalMember(owner = "client!pb", name = "a", descriptor = "(IILclient!ek;ILclient!tk;I[[IZII[[IIII)Lclient!sm;") @OriginalMember(owner = "client!pb", name = "a", descriptor = "(IILclient!ek;ILclient!tk;I[[IZII[[IIII)Lclient!sm;")
@ -863,8 +867,8 @@ public final class LocType {
} }
local195 = local195.method4586(this.aByte15, this.aShort26, arg6, arg9, arg1, arg3, arg0, false); local195 = local195.method4586(this.aByte15, this.aShort26, arg6, arg9, arg1, arg3, arg0, false);
} }
Static171.aClass139_1.aClass8_10 = local195; aClass139_1.aClass8_10 = local195;
return Static171.aClass139_1; return aClass139_1;
} }
if (this.shapes == null) { if (this.shapes == null) {
local30 = arg5 + (this.id << 10); local30 = arg5 + (this.id << 10);
@ -895,9 +899,9 @@ public final class LocType {
local82.method4554(256); local82.method4554(256);
} }
if (arg7) { if (arg7) {
Static171.aClass139_1.aClass36_Sub1_3 = local82.method4124(arg2); aClass139_1.aClass36_Sub1_3 = local82.method4124(arg2);
} else { } else {
Static171.aClass139_1.aClass36_Sub1_3 = null; aClass139_1.aClass36_Sub1_3 = null;
} }
if (this.aByte15 != 0) { if (this.aByte15 != 0) {
if (!local80) { if (!local80) {
@ -905,8 +909,8 @@ public final class LocType {
} }
local82.method4110(this.aByte15, this.aShort26, local46, arg6, arg9, arg1, arg3, arg0); local82.method4110(this.aByte15, this.aShort26, local46, arg6, arg9, arg1, arg3, arg0);
} }
Static171.aClass139_1.aClass8_10 = local82; aClass139_1.aClass8_10 = local82;
return Static171.aClass139_1; return aClass139_1;
} }
@OriginalMember(owner = "client!pb", name = "a", descriptor = "(Lclient!na;II)Lclient!na;") @OriginalMember(owner = "client!pb", name = "a", descriptor = "(Lclient!na;II)Lclient!na;")

12
client/src/main/java/rt4/MidiInstrument.java
View file

@ -290,7 +290,7 @@ public final class MidiInstrument extends Node {
local734 += 2; local734 += 2;
local1014 = (local995 - local954) * local958 + (local995 - local954) / 2; local1014 = (local995 - local954) * local958 + (local995 - local954) / 2;
for (local1016 = local954; local1016 < local995; local1016++) { for (local1016 = local954; local1016 < local995; local1016++) {
local1031 = Static222.method3825(local1014, local995 - local954); local1031 = method3825(local1014, local995 - local954);
local1014 += local1001 - local958; local1014 += local1001 - local958;
this.aByteArray45[local1016] = (byte) (local1031 * this.aByteArray45[local1016] + 32 >> 6); this.aByteArray45[local1016] = (byte) (local1031 * this.aByteArray45[local1016] + 32 >> 6);
} }
@ -328,7 +328,7 @@ public final class MidiInstrument extends Node {
local1207 = local327[local734 + 1] << 1; local1207 = local327[local734 + 1] << 1;
local734 += 2; local734 += 2;
for (local1016 = local954; local1016 < local995; local1016++) { for (local1016 = local954; local1016 < local995; local1016++) {
local1031 = Static222.method3825(local1014, local995 - local954); local1031 = method3825(local1014, local995 - local954);
local1014 += local1207 - local1133; local1014 += local1207 - local1133;
@Pc(1237) int local1237 = local1031 + (this.aByteArray43[local1016] & 0xFF); @Pc(1237) int local1237 = local1031 + (this.aByteArray43[local1016] & 0xFF);
if (local1237 < 0) { if (local1237 < 0) {
@ -385,7 +385,13 @@ public final class MidiInstrument extends Node {
} }
} }
@OriginalMember(owner = "client!jk", name = "d", descriptor = "(B)V") @OriginalMember(owner = "client!sa", name = "c", descriptor = "(III)I")
public static int method3825(@OriginalArg(0) int arg0, @OriginalArg(2) int arg1) {
@Pc(12) int local12 = arg0 >>> 31;
return (arg0 + local12) / arg1 - local12;
}
@OriginalMember(owner = "client!jk", name = "d", descriptor = "(B)V")
public final void method2432() { public final void method2432() {
this.anIntArray289 = null; this.anIntArray289 = null;
} }

2
client/src/main/java/rt4/MidiPcmStream.java
View file

@ -265,7 +265,7 @@ public final class MidiPcmStream extends PcmStream {
private void method4427(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(3) int arg2) { private void method4427(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(3) int arg2) {
this.method4434(arg2, 64, arg1); this.method4434(arg2, 64, arg1);
if ((this.anIntArray508[arg1] & 0x2) != 0) { if ((this.anIntArray508[arg1] & 0x2) != 0) {
for (@Pc(28) MidiNote local28 = (MidiNote) this.aClass3_Sub3_Sub3_1.aClass69_126.method2279(); local28 != null; local28 = (MidiNote) this.aClass3_Sub3_Sub3_1.aClass69_126.method2286()) { for (@Pc(28) MidiNote local28 = (MidiNote) this.aClass3_Sub3_Sub3_1.aClass69_126.tail(); local28 != null; local28 = (MidiNote) this.aClass3_Sub3_Sub3_1.aClass69_126.prev()) {
if (arg1 == local28.anInt3773 && local28.anInt3767 < 0) { if (arg1 == local28.anInt3773 && local28.anInt3767 < 0) {
this.aClass3_Sub25ArrayArray1[arg1][local28.anInt3779] = null; this.aClass3_Sub25ArrayArray1[arg1][local28.anInt3779] = null;
this.aClass3_Sub25ArrayArray1[arg1][arg2] = local28; this.aClass3_Sub25ArrayArray1[arg1][arg2] = local28;

38
client/src/main/java/rt4/MidiPlayer.java
View file

@ -13,13 +13,23 @@ public class MidiPlayer {
public static int anInt441 = 0; public static int anInt441 = 0;
@OriginalMember(owner = "client!uh", name = "P", descriptor = "Lclient!ve;") @OriginalMember(owner = "client!uh", name = "P", descriptor = "Lclient!ve;")
public static Js5 aClass153_103; public static Js5 aClass153_103;
@OriginalMember(owner = "client!ui", name = "R", descriptor = "I")
public static int anInt5527;
@OriginalMember(owner = "client!wi", name = "ab", descriptor = "I")
public static int anInt5853;
@OriginalMember(owner = "client!eg", name = "t", descriptor = "I")
public static int anInt1757;
@OriginalMember(owner = "client!fl", name = "u", descriptor = "Z")
public static boolean aBoolean116;
@OriginalMember(owner = "client!rb", name = "f", descriptor = "Lclient!ve;")
public static Js5 aClass153_87;
@OriginalMember(owner = "client!km", name = "c", descriptor = "(Z)Z") @OriginalMember(owner = "client!km", name = "c", descriptor = "(Z)Z")
public static boolean method2699() { public static boolean method2699() {
try { try {
if (anInt441 == 2) { if (anInt441 == 2) {
if (Static144.aClass3_Sub29_1 == null) { if (Static144.aClass3_Sub29_1 == null) {
Static144.aClass3_Sub29_1 = Song.create(Static172.aClass153_70, Static277.anInt5853, Static226.anInt5085); Static144.aClass3_Sub29_1 = Song.create(Static172.aClass153_70, anInt5853, Static226.anInt5085);
if (Static144.aClass3_Sub29_1 == null) { if (Static144.aClass3_Sub29_1 == null) {
return false; return false;
} }
@ -27,10 +37,10 @@ public class MidiPlayer {
if (aClass89_1 == null) { if (aClass89_1 == null) {
aClass89_1 = new SoundBank(Static78.aClass153_32, aClass153_103); aClass89_1 = new SoundBank(Static78.aClass153_32, aClass153_103);
} }
if (Static172.aClass3_Sub3_Sub4_2.method4411(Static144.aClass3_Sub29_1, Static210.aClass153_87, aClass89_1)) { if (Static172.aClass3_Sub3_Sub4_2.method4411(Static144.aClass3_Sub29_1, aClass153_87, aClass89_1)) {
Static172.aClass3_Sub3_Sub4_2.method4412(); Static172.aClass3_Sub3_Sub4_2.method4412();
Static172.aClass3_Sub3_Sub4_2.method4447(Static253.anInt5527); Static172.aClass3_Sub3_Sub4_2.method4447(anInt5527);
Static172.aClass3_Sub3_Sub4_2.method4431(Static72.aBoolean116, Static144.aClass3_Sub29_1); Static172.aClass3_Sub3_Sub4_2.method4431(aBoolean116, Static144.aClass3_Sub29_1);
anInt441 = 0; anInt441 = 0;
Static144.aClass3_Sub29_1 = null; Static144.aClass3_Sub29_1 = null;
aClass89_1 = null; aClass89_1 = null;
@ -51,29 +61,29 @@ public class MidiPlayer {
@OriginalMember(owner = "client!ce", name = "a", descriptor = "(II)V") @OriginalMember(owner = "client!ce", name = "a", descriptor = "(II)V")
public static void method801() { public static void method801() {
Static253.anInt5527 = 0; anInt5527 = 0;
Static226.anInt5085 = -1; Static226.anInt5085 = -1;
anInt441 = 1; anInt441 = 1;
Static57.anInt1757 = 2; anInt1757 = 2;
Static72.aBoolean116 = false; aBoolean116 = false;
Static172.aClass153_70 = null; Static172.aClass153_70 = null;
Static277.anInt5853 = -1; anInt5853 = -1;
} }
@OriginalMember(owner = "client!v", name = "a", descriptor = "(ZIILclient!ve;ZII)V") @OriginalMember(owner = "client!v", name = "a", descriptor = "(ZIILclient!ve;ZII)V")
public static void playFadeOut(@OriginalArg(1) int arg0, @OriginalArg(3) Js5 arg1, @OriginalArg(5) int arg2) { public static void playFadeOut(@OriginalArg(1) int arg0, @OriginalArg(3) Js5 arg1, @OriginalArg(5) int arg2) {
Static172.aClass153_70 = arg1; Static172.aClass153_70 = arg1;
Static226.anInt5085 = 0; Static226.anInt5085 = 0;
Static277.anInt5853 = arg0; anInt5853 = arg0;
Static72.aBoolean116 = false; aBoolean116 = false;
anInt441 = 1; anInt441 = 1;
Static57.anInt1757 = 2; anInt1757 = 2;
Static253.anInt5527 = arg2; anInt5527 = arg2;
} }
@OriginalMember(owner = "client!ck", name = "a", descriptor = "(ILclient!va;Lclient!ve;Lclient!ve;Lclient!ve;)Z") @OriginalMember(owner = "client!ck", name = "a", descriptor = "(ILclient!va;Lclient!ve;Lclient!ve;Lclient!ve;)Z")
public static boolean init(@OriginalArg(1) MidiPcmStream arg0, @OriginalArg(2) Js5 arg1, @OriginalArg(3) Js5 arg2, @OriginalArg(4) Js5 arg3) { public static boolean init(@OriginalArg(1) MidiPcmStream arg0, @OriginalArg(2) Js5 arg1, @OriginalArg(3) Js5 arg2, @OriginalArg(4) Js5 arg3) {
Static210.aClass153_87 = arg1; aClass153_87 = arg1;
Static78.aClass153_32 = arg3; Static78.aClass153_32 = arg3;
aClass153_103 = arg2; aClass153_103 = arg2;
Static172.aClass3_Sub3_Sub4_2 = arg0; Static172.aClass3_Sub3_Sub4_2 = arg0;
@ -86,7 +96,7 @@ public class MidiPlayer {
if (anInt441 == 1) { if (anInt441 == 1) {
@Pc(16) int local16 = Static172.aClass3_Sub3_Sub4_2.method4440(); @Pc(16) int local16 = Static172.aClass3_Sub3_Sub4_2.method4440();
if (local16 > 0 && Static172.aClass3_Sub3_Sub4_2.method4414()) { if (local16 > 0 && Static172.aClass3_Sub3_Sub4_2.method4414()) {
local16 -= Static57.anInt1757; local16 -= anInt1757;
if (local16 < 0) { if (local16 < 0) {
local16 = 0; local16 = 0;
} }

218
client/src/main/java/rt4/MiniMap.java
View file

@ -21,6 +21,10 @@ public class MiniMap {
public static Sprite sprite; public static Sprite sprite;
@OriginalMember(owner = "client!ug", name = "m", descriptor = "I") @OriginalMember(owner = "client!ug", name = "m", descriptor = "I")
public static int locs = 0; public static int locs = 0;
@OriginalMember(owner = "client!wb", name = "d", descriptor = "I")
public static int state = 0;
@OriginalMember(owner = "client!we", name = "w", descriptor = "I")
public static int anInt4130 = 0;
@OriginalMember(owner = "client!ma", name = "a", descriptor = "([IIIIII)V") @OriginalMember(owner = "client!ma", name = "a", descriptor = "([IIIIII)V")
public static void renderTile(@OriginalArg(0) int[] pixels, @OriginalArg(1) int index, @OriginalArg(3) int arg2, @OriginalArg(4) int arg3, @OriginalArg(5) int arg4) { public static void renderTile(@OriginalArg(0) int[] pixels, @OriginalArg(1) int index, @OriginalArg(3) int arg2, @OriginalArg(4) int arg3, @OriginalArg(5) int arg4) {
@ -114,7 +118,7 @@ public class MiniMap {
locs = 0; locs = 0;
for (local37 = 0; local37 < 104; local37++) { for (local37 = 0; local37 < 104; local37++) {
for (local76 = 0; local76 < 104; local76++) { for (local76 = 0; local76 < 104; local76++) {
@Pc(169) long local169 = Static20.method602(Player.level, local37 + 0, local76); @Pc(169) long local169 = SceneGraph.method602(Player.level, local37 + 0, local76);
if (local169 != 0L) { if (local169 != 0L) {
@Pc(184) LocType local184 = LocTypeList.get((int) (local169 >>> 32) & Integer.MAX_VALUE); @Pc(184) LocType local184 = LocTypeList.get((int) (local169 >>> 32) & Integer.MAX_VALUE);
@Pc(187) int local187 = local184.mapElement; @Pc(187) int local187 = local184.mapElement;
@ -203,4 +207,216 @@ public class MiniMap {
softwareSprite = null; softwareSprite = null;
return true; return true;
} }
@OriginalMember(owner = "client!ed", name = "a", descriptor = "(IBIILclient!be;)V")
public static void render(@OriginalArg(0) int arg0, @OriginalArg(2) int arg1, @OriginalArg(3) int arg2, @OriginalArg(4) Component arg3) {
client.audioLoop();
if (GlRenderer.enabled) {
GlRaster.setClip(arg2, arg1, arg2 + arg3.anInt445, arg1 + arg3.anInt459);
} else {
SoftwareRaster.setClip(arg2, arg1, arg2 + arg3.anInt445, arg1 + arg3.anInt459);
}
if (state != 2 && state != 5 && sprite != null) {
@Pc(48) int local48 = Static59.anInt1814 + (int)Camera.yawTarget & 0x7FF;
@Pc(57) int local57 = PlayerList.self.xFine / 32 + 48;
@Pc(67) int local67 = 464 - PlayerList.self.zFine / 32;
if (GlRenderer.enabled) {
((GlSprite) sprite).renderRotatedTransparent(arg2, arg1, arg3.anInt445, arg3.anInt459, local57, local67, local48, anInt4130 + 256, (GlSprite) arg3.method489(false));
} else {
((SoftwareSprite) sprite).renderRotatedTransparent(arg2, arg1, arg3.anInt445, arg3.anInt459, local57, local67, local48, anInt4130 + 256, arg3.anIntArray37, arg3.anIntArray45);
}
@Pc(146) int local146;
@Pc(181) int local181;
@Pc(150) int local150;
@Pc(154) int local154;
@Pc(231) int local231;
@Pc(200) int local200;
@Pc(239) int local239;
@Pc(271) int local271;
if (Static235.mapElementList != null) {
for (@Pc(117) int local117 = 0; local117 < Static235.mapElementList.anInt5074; local117++) {
if (Static235.mapElementList.method3892(local117)) {
local146 = (Static235.mapElementList.aShortArray73[local117] - Static225.originX) * 4 + 2 - PlayerList.self.xFine / 32;
local150 = MathUtils.sin[local48];
local154 = MathUtils.cos[local48];
@Pc(156) Font local156 = Fonts.p11Full;
@Pc(164) int local164 = local150 * 256 / (anInt4130 + 256);
local181 = (Static235.mapElementList.aShortArray72[local117] - Static142.originZ) * 4 + 2 - PlayerList.self.zFine / 32;
@Pc(189) int local189 = local154 * 256 / (anInt4130 + 256);
local200 = local181 * local189 - local146 * local164 >> 16;
if (Static235.mapElementList.method3894(local117) == 1) {
local156 = Fonts.p12Full;
}
if (Static235.mapElementList.method3894(local117) == 2) {
local156 = Fonts.b12Full;
}
local231 = local164 * local181 + local189 * local146 >> 16;
local239 = local156.method2856(Static235.mapElementList.aClass100Array153[local117], 100);
@Pc(245) int local245 = local231 - local239 / 2;
if (local245 >= -arg3.anInt445 && local245 <= arg3.anInt445 && local200 >= -arg3.anInt459 && local200 <= arg3.anInt459) {
local271 = 16777215;
if (Static235.mapElementList.anIntArray444[local117] != -1) {
local271 = Static235.mapElementList.anIntArray444[local117];
}
if (GlRenderer.enabled) {
GlFont.method1188((GlSprite) arg3.method489(false));
} else {
SoftwareRaster.method2486(arg3.anIntArray37, arg3.anIntArray45);
}
local156.renderParagraphAlpha(Static235.mapElementList.aClass100Array153[local117], arg2 + local245 + arg3.anInt445 / 2, arg1 + arg3.anInt459 / 2 + -local200, local239, 50, local271, 0, 1, 0, 0);
if (GlRenderer.enabled) {
GlFont.method1173();
} else {
SoftwareRaster.method2482();
}
}
}
}
}
for (local146 = 0; local146 < locs; local146++) {
local181 = locX[local146] * 4 + 2 - PlayerList.self.xFine / 32;
local150 = locZ[local146] * 4 + 2 - PlayerList.self.zFine / 32;
@Pc(382) LocType local382 = LocTypeList.get(locId[local146]);
if (local382.multiLocs != null) {
local382 = local382.getMultiLoc();
if (local382 == null || local382.mapElement == -1) {
continue;
}
}
method1446(arg3, Static67.mapfuncs[local382.mapElement], local150, local181, arg1, arg2);
}
for (local146 = 0; local146 < 104; local146++) {
for (local181 = 0; local181 < 104; local181++) {
@Pc(439) LinkedList local439 = Static159.objStacks[Player.level][local146][local181];
if (local439 != null) {
local154 = local146 * 4 + 2 - PlayerList.self.xFine / 32;
local231 = local181 * 4 + 2 - PlayerList.self.zFine / 32;
method1446(arg3, Sprites.mapdots[0], local231, local154, arg1, arg2);
}
}
}
for (local146 = 0; local146 < NpcList.size; local146++) {
@Pc(498) Npc local498 = NpcList.npcs[NpcList.ids[local146]];
if (local498 != null && local498.method2682()) {
@Pc(507) NpcType local507 = local498.type;
if (local507 != null && local507.multiNpcs != null) {
local507 = local507.getMultiNpc();
}
if (local507 != null && local507.aBoolean184 && local507.aBoolean183) {
local154 = local498.xFine / 32 - PlayerList.self.xFine / 32;
local231 = local498.zFine / 32 - PlayerList.self.zFine / 32;
if (local507.anInt3739 == -1) {
method1446(arg3, Sprites.mapdots[1], local231, local154, arg1, arg2);
} else {
method1446(arg3, Static67.mapfuncs[local507.anInt3739], local231, local154, arg1, arg2);
}
}
}
}
for (local146 = 0; local146 < PlayerList.size; local146++) {
@Pc(591) Player local591 = PlayerList.players[PlayerList.ids[local146]];
if (local591 != null && local591.method2682()) {
local154 = local591.zFine / 32 - PlayerList.self.zFine / 32;
local150 = local591.xFine / 32 - PlayerList.self.xFine / 32;
@Pc(624) long local624 = local591.username.encode37();
@Pc(626) boolean local626 = false;
for (local239 = 0; local239 < FriendsList.size; local239++) {
if (local624 == FriendsList.encodedUsernames[local239] && FriendsList.worlds[local239] != 0) {
local626 = true;
break;
}
}
@Pc(660) boolean local660 = false;
for (local271 = 0; local271 < ClanChat.size; local271++) {
if (local624 == ClanChat.members[local271].key) {
local660 = true;
break;
}
}
@Pc(682) boolean local682 = false;
if (PlayerList.self.anInt1650 != 0 && local591.anInt1650 != 0 && local591.anInt1650 == PlayerList.self.anInt1650) {
local682 = true;
}
if (local626) {
method1446(arg3, Sprites.mapdots[3], local154, local150, arg1, arg2);
} else if (local660) {
method1446(arg3, Sprites.mapdots[5], local154, local150, arg1, arg2);
} else if (local682) {
method1446(arg3, Sprites.mapdots[4], local154, local150, arg1, arg2);
} else {
method1446(arg3, Sprites.mapdots[2], local154, local150, arg1, arg2);
}
}
}
@Pc(756) MapMarker[] local756 = Static143.hintMapMarkers;
for (local181 = 0; local181 < local756.length; local181++) {
@Pc(770) MapMarker local770 = local756[local181];
if (local770 != null && local770.type != 0 && client.loop % 20 < 10) {
if (local770.type == 1 && local770.actorTargetId >= 0 && local770.actorTargetId < NpcList.npcs.length) {
@Pc(804) Npc local804 = NpcList.npcs[local770.actorTargetId];
if (local804 != null) {
local231 = local804.xFine / 32 - PlayerList.self.xFine / 32;
local200 = local804.zFine / 32 - PlayerList.self.zFine / 32;
Static97.method1960(local770.anInt4048, arg1, arg2, local231, local200, arg3);
}
}
if (local770.type == 2) {
local154 = (local770.targetX - Static225.originX) * 4 + 2 - PlayerList.self.xFine / 32;
local231 = (-Static142.originZ + local770.anInt4046) * 4 + 2 - PlayerList.self.zFine / 32;
Static97.method1960(local770.anInt4048, arg1, arg2, local154, local231, arg3);
}
if (local770.type == 10 && local770.actorTargetId >= 0 && PlayerList.players.length > local770.actorTargetId) {
@Pc(905) Player local905 = PlayerList.players[local770.actorTargetId];
if (local905 != null) {
local200 = local905.zFine / 32 - PlayerList.self.zFine / 32;
local231 = local905.xFine / 32 - PlayerList.self.xFine / 32;
Static97.method1960(local770.anInt4048, arg1, arg2, local231, local200, arg3);
}
}
}
}
if (Static115.mapFlagX != 0) {
local146 = Static115.mapFlagX * 4 + 2 - PlayerList.self.xFine / 32;
local181 = Static84.anInt2255 * 4 + 2 - PlayerList.self.zFine / 32;
method1446(arg3, Sprites.mapflags, local181, local146, arg1, arg2);
}
if (GlRenderer.enabled) {
GlRaster.method1186(arg2 + arg3.anInt445 / 2 - 1, arg1 + -1 - -(arg3.anInt459 / 2), 3, 3, 16777215);
} else {
SoftwareRaster.fillRect(arg3.anInt445 / 2 + arg2 - 1, arg3.anInt459 / 2 + -1 + arg1, 3, 3, 16777215);
}
} else if (GlRenderer.enabled) {
@Pc(1041) Sprite local1041 = arg3.method489(false);
if (local1041 != null) {
local1041.renderTransparent(arg2, arg1);
}
} else {
SoftwareRaster.method2504(arg2, arg1, arg3.anIntArray37, arg3.anIntArray45);
}
InterfaceList.rectangleRedraw[arg0] = true;
}
@OriginalMember(owner = "client!em", name = "a", descriptor = "(Lclient!be;Lclient!qf;IIIBI)V")
public static void method1446(@OriginalArg(0) Component arg0, @OriginalArg(1) Sprite arg1, @OriginalArg(2) int arg2, @OriginalArg(3) int arg3, @OriginalArg(4) int arg4, @OriginalArg(6) int arg5) {
if (arg1 == null) {
return;
}
@Pc(21) int local21 = arg3 * arg3 + arg2 * arg2;
@Pc(27) int local27 = Static59.anInt1814 + (int)Camera.yawTarget & 0x7FF;
@Pc(39) int local39 = Math.max(arg0.anInt445 / 2, arg0.anInt459 / 2) + 10;
if (local39 * local39 < local21) {
return;
}
@Pc(50) int local50 = MathUtils.sin[local27];
@Pc(58) int local58 = local50 * 256 / (anInt4130 + 256);
@Pc(62) int local62 = MathUtils.cos[local27];
@Pc(70) int local70 = local62 * 256 / (anInt4130 + 256);
@Pc(81) int local81 = local58 * arg2 + arg3 * local70 >> 16;
@Pc(92) int local92 = local70 * arg2 - arg3 * local58 >> 16;
if (GlRenderer.enabled) {
((GlSprite) arg1).method1425(arg0.anInt445 / 2 + arg5 + local81 - arg1.anInt1860 / 2, arg0.anInt459 / 2 + arg4 - (local92 + arg1.anInt1866 / 2), (GlSprite) arg0.method489(false));
} else {
((SoftwareSprite) arg1).method312(arg0.anInt445 / 2 + arg5 + local81 - arg1.anInt1860 / 2, -(arg1.anInt1866 / 2) + arg0.anInt459 / 2 + arg4 + -local92, arg0.anIntArray37, arg0.anIntArray45);
}
}
} }

603
client/src/main/java/rt4/MiniMenu.java
View file

@ -39,12 +39,56 @@ public class MiniMenu {
public static final JagString aClass100_965 = JagString.parse("<col=ffff00>"); public static final JagString aClass100_965 = JagString.parse("<col=ffff00>");
@OriginalMember(owner = "client!vg", name = "f", descriptor = "Lclient!na;") @OriginalMember(owner = "client!vg", name = "f", descriptor = "Lclient!na;")
public static final JagString aClass100_1081 = JagString.parse("<col=80ff00>"); public static final JagString aClass100_1081 = JagString.parse("<col=80ff00>");
@OriginalMember(owner = "client!r", name = "d", descriptor = "Z")
public static final boolean aBoolean237 = false;
@OriginalMember(owner = "client!se", name = "m", descriptor = "Lclient!na;")
public static final JagString aClass100_961 = JagString.parse(" )2>");
@OriginalMember(owner = "client!a", name = "j", descriptor = "Lclient!na;")
public static final JagString aClass100_2 = JagString.parse("<col=ffffff> )4 ");
@OriginalMember(owner = "client!cb", name = "fb", descriptor = "Lclient!na;")
public static final JagString aClass100_168 = JagString.parse(": ");
@OriginalMember(owner = "client!qf", name = "Q", descriptor = "Lclient!na;")
public static final JagString aClass100_407 = JagString.parse(" )2> <col=ffff00>");
@OriginalMember(owner = "client!qf", name = "R", descriptor = "Lclient!na;")
public static final JagString aClass100_408 = JagString.parse(" )2> ");
@OriginalMember(owner = "client!aj", name = "R", descriptor = "Lclient!na;")
public static final JagString aClass100_32 = JagString.parse("<col=ff9040>");
@OriginalMember(owner = "client!fl", name = "V", descriptor = "Lclient!na;")
public static final JagString aClass100_448 = JagString.parse("(Y");
@OriginalMember(owner = "client!ck", name = "D", descriptor = "Lclient!na;") @OriginalMember(owner = "client!ck", name = "D", descriptor = "Lclient!na;")
public static JagString aClass100_203 = null; public static JagString aClass100_203 = null;
@OriginalMember(owner = "client!hn", name = "W", descriptor = "Lclient!na;") @OriginalMember(owner = "client!hn", name = "W", descriptor = "Lclient!na;")
public static JagString aClass100_545 = null; public static JagString aClass100_545 = null;
@OriginalMember(owner = "client!sk", name = "kb", descriptor = "I") @OriginalMember(owner = "client!sk", name = "kb", descriptor = "I")
public static int size = 0; public static int size = 0;
@OriginalMember(owner = "client!v", name = "b", descriptor = "Lclient!be;")
public static Component aClass13_7;
@OriginalMember(owner = "client!gd", name = "i", descriptor = "Lclient!na;")
public static JagString aClass100_466 = null;
@OriginalMember(owner = "client!vd", name = "C", descriptor = "I")
public static int anInt5014 = 0;
@OriginalMember(owner = "client!wf", name = "f", descriptor = "I")
public static int anInt4999;
@OriginalMember(owner = "client!wf", name = "d", descriptor = "I")
public static int anInt4997;
@OriginalMember(owner = "client!be", name = "Ec", descriptor = "I")
public static int anInt506 = -1;
@OriginalMember(owner = "client!fl", name = "P", descriptor = "I")
public static int anInt2043 = 0;
@OriginalMember(owner = "client!hj", name = "e", descriptor = "I")
public static int anInt2512;
@OriginalMember(owner = "client!mh", name = "Y", descriptor = "Z")
public static boolean aBoolean187 = false;
@OriginalMember(owner = "client!mj", name = "i", descriptor = "I")
public static int anInt3902 = 0;
@OriginalMember(owner = "client!ha", name = "q", descriptor = "I")
public static int anInt2388 = 0;
@OriginalMember(owner = "client!kd", name = "zb", descriptor = "I")
public static int anInt3259 = 0;
@OriginalMember(owner = "client!ef", name = "g", descriptor = "I")
public static int anInt1742 = -1;
@OriginalMember(owner = "client!jb", name = "p", descriptor = "I")
public static int anInt2954 = -1;
@OriginalMember(owner = "client!va", name = "a", descriptor = "(IZILclient!be;)V") @OriginalMember(owner = "client!va", name = "a", descriptor = "(IZILclient!be;)V")
public static void addComponentEntries(@OriginalArg(0) int arg0, @OriginalArg(2) int arg1, @OriginalArg(3) Component component) { public static void addComponentEntries(@OriginalArg(0) int arg0, @OriginalArg(2) int arg1, @OriginalArg(3) Component component) {
@ -88,19 +132,19 @@ public class MiniMenu {
if (component.objTypes[local171] > 0) { if (component.objTypes[local171] > 0) {
@Pc(267) ServerActiveProperties local267 = InterfaceList.getServerActiveProperties(component); @Pc(267) ServerActiveProperties local267 = InterfaceList.getServerActiveProperties(component);
@Pc(276) ObjType local276 = ObjTypeList.get(component.objTypes[local171] - 1); @Pc(276) ObjType local276 = ObjTypeList.get(component.objTypes[local171] - 1);
if (Static260.anInt5014 == 1 && local267.isObjOpsEnabled()) { if (anInt5014 == 1 && local267.isObjOpsEnabled()) {
if (Static224.anInt5062 != component.id || Static185.anInt4370 != local171) { if (Static224.anInt5062 != component.id || Static185.anInt4370 != local171) {
add(-1, (long) local276.anInt2354, JagString.concatenate(new JagString[] { aClass100_203, aClass100_947, local276.name}), local171, (short) 40, LocalizedText.USE, component.id); add(-1, (long) local276.anInt2354, JagString.concatenate(new JagString[] { aClass100_203, aClass100_947, local276.name}), local171, (short) 40, LocalizedText.USE, component.id);
} }
} else if (Static241.aBoolean302 && local267.isObjOpsEnabled()) { } else if (Static241.aBoolean302 && local267.isObjOpsEnabled()) {
@Pc(596) ParamType local596 = Static121.anInt3039 == -1 ? null : ParamTypeList.get(Static121.anInt3039); @Pc(596) ParamType local596 = Static121.anInt3039 == -1 ? null : ParamTypeList.get(Static121.anInt3039);
if ((Static274.anInt4999 & 0x10) != 0 && (local596 == null || local276.getParam(local596.defaultInt, Static121.anInt3039) != local596.defaultInt)) { if ((anInt4999 & 0x10) != 0 && (local596 == null || local276.getParam(local596.defaultInt, Static121.anInt3039) != local596.defaultInt)) {
add(Static246.anInt5393, (long) local276.anInt2354, JagString.concatenate(new JagString[] { Static78.aClass100_466, aClass100_947, local276.name}), local171, (short) 3, aClass100_545, component.id); add(Static246.anInt5393, (long) local276.anInt2354, JagString.concatenate(new JagString[] { aClass100_466, aClass100_947, local276.name}), local171, (short) 3, aClass100_545, component.id);
} }
} else { } else {
@Pc(296) JagString[] local296 = local276.inventoryOps; @Pc(296) JagString[] local296 = local276.inventoryOps;
if (Static208.aBoolean237) { if (aBoolean237) {
local296 = Static279.method4664(local296); local296 = annotateOps(local296);
} }
@Pc(309) int local309; @Pc(309) int local309;
@Pc(334) byte local334; @Pc(334) byte local334;
@ -112,12 +156,12 @@ public class MiniMenu {
} else { } else {
local334 = 58; local334 = 58;
} }
add(-1, (long) local276.anInt2354, JagString.concatenate(new JagString[] { Static8.aClass100_32, local276.name}), local171, local334, local296[local309], component.id); add(-1, (long) local276.anInt2354, JagString.concatenate(new JagString[] { aClass100_32, local276.name}), local171, local334, local296[local309], component.id);
} }
} }
} }
if (local267.method507()) { if (local267.method507()) {
add(Static169.anInt4075, (long) local276.anInt2354, JagString.concatenate(new JagString[] { Static8.aClass100_32, local276.name}), local171, (short) 22, LocalizedText.USE, component.id); add(Static169.anInt4075, (long) local276.anInt2354, JagString.concatenate(new JagString[] { aClass100_32, local276.name}), local171, (short) 22, LocalizedText.USE, component.id);
} }
if (local267.isObjOpsEnabled() && local296 != null) { if (local267.isObjOpsEnabled() && local296 != null) {
for (local309 = 2; local309 >= 0; local309--) { for (local309 = 2; local309 >= 0; local309--) {
@ -132,13 +176,13 @@ public class MiniMenu {
if (local309 == 2) { if (local309 == 2) {
local334 = 43; local334 = 43;
} }
add(-1, (long) local276.anInt2354, JagString.concatenate(new JagString[] { Static8.aClass100_32, local276.name}), local171, local334, local296[local309], component.id); add(-1, (long) local276.anInt2354, JagString.concatenate(new JagString[] { aClass100_32, local276.name}), local171, local334, local296[local309], component.id);
} }
} }
} }
local296 = component.aClass100Array19; local296 = component.aClass100Array19;
if (Static208.aBoolean237) { if (aBoolean237) {
local296 = Static279.method4664(local296); local296 = annotateOps(local296);
} }
if (local296 != null) { if (local296 != null) {
for (local309 = 4; local309 >= 0; local309--) { for (local309 = 4; local309 >= 0; local309--) {
@ -159,11 +203,11 @@ public class MiniMenu {
if (local309 == 4) { if (local309 == 4) {
local334 = 13; local334 = 13;
} }
add(-1, (long) local276.anInt2354, JagString.concatenate(new JagString[] { Static8.aClass100_32, local276.name}), local171, local334, local296[local309], component.id); add(-1, (long) local276.anInt2354, JagString.concatenate(new JagString[] { aClass100_32, local276.name}), local171, local334, local296[local309], component.id);
} }
} }
} }
add(Static225.anInt5073, (long) local276.anInt2354, JagString.concatenate(new JagString[] { Static8.aClass100_32, local276.name}), local171, (short) 1006, LocalizedText.EXAMINE, component.id); add(Static225.anInt5073, (long) local276.anInt2354, JagString.concatenate(new JagString[] { aClass100_32, local276.name}), local171, (short) 1006, LocalizedText.EXAMINE, component.id);
} }
} }
} }
@ -178,7 +222,7 @@ public class MiniMenu {
for (local171 = 9; local171 >= 5; local171--) { for (local171 = 9; local171 >= 5; local171--) {
@Pc(765) JagString local765 = InterfaceList.getOp(component, local171); @Pc(765) JagString local765 = InterfaceList.getOp(component, local171);
if (local765 != null) { if (local765 != null) {
add(Static8.getOpCursor(local171, component), (long) (local171 + 1), component.opBase, component.createdComponentId, (short) 1003, local765, component.id); add(getOpCursor(local171, component), (long) (local171 + 1), component.opBase, component.createdComponentId, (short) 1003, local765, component.id);
} }
} }
local47 = Static97.getTargetVerb(component); local47 = Static97.getTargetVerb(component);
@ -188,14 +232,14 @@ public class MiniMenu {
for (local173 = 4; local173 >= 0; local173--) { for (local173 = 4; local173 >= 0; local173--) {
@Pc(828) JagString local828 = InterfaceList.getOp(component, local173); @Pc(828) JagString local828 = InterfaceList.getOp(component, local173);
if (local828 != null) { if (local828 != null) {
add(Static8.getOpCursor(local173, component), (long) (local173 + 1), component.opBase, component.createdComponentId, (short) 9, local828, component.id); add(getOpCursor(local173, component), (long) (local173 + 1), component.opBase, component.createdComponentId, (short) 9, local828, component.id);
} }
} }
if (InterfaceList.getServerActiveProperties(component).method506()) { if (InterfaceList.getServerActiveProperties(component).method506()) {
add(-1, 0L, JagString.EMPTY, component.createdComponentId, (short) 41, LocalizedText.CONTINUE, component.id); add(-1, 0L, JagString.EMPTY, component.createdComponentId, (short) 41, LocalizedText.CONTINUE, component.id);
} }
} else if (InterfaceList.getServerActiveProperties(component).method508() && (Static274.anInt4999 & 0x20) != 0) { } else if (InterfaceList.getServerActiveProperties(component).method508() && (anInt4999 & 0x20) != 0) {
add(Static246.anInt5393, 0L, JagString.concatenate(new JagString[] { Static78.aClass100_466, Static201.aClass100_408, component.opBase}), component.createdComponentId, (short) 12, aClass100_545, component.id); add(Static246.anInt5393, 0L, JagString.concatenate(new JagString[] { aClass100_466, aClass100_408, component.opBase}), component.createdComponentId, (short) 12, aClass100_545, component.id);
} }
} }
@ -307,10 +351,10 @@ public class MiniMenu {
Protocol.outboundBuffer.p4le2(local19); Protocol.outboundBuffer.p4le2(local19);
Protocol.outboundBuffer.p2le(local15); Protocol.outboundBuffer.p2le(local15);
Protocol.outboundBuffer.p4le2(Static224.anInt5062); Protocol.outboundBuffer.p4le2(Static224.anInt5062);
Protocol.outboundBuffer.p2leadd(Static274.anInt4997); Protocol.outboundBuffer.p2leadd(anInt4997);
Protocol.outboundBuffer.p2leadd(local36); Protocol.outboundBuffer.p2leadd(local36);
Static72.anInt2043 = 0; anInt2043 = 0;
Static257.aClass13_7 = InterfaceList.getComponent(local19); aClass13_7 = InterfaceList.getComponent(local19);
Static250.anInt5444 = local15; Static250.anInt5444 = local15;
} }
@Pc(192) Npc local192; @Pc(192) Npc local192;
@ -355,8 +399,8 @@ public class MiniMenu {
Protocol.outboundBuffer.p2add(local36); Protocol.outboundBuffer.p2add(local36);
Protocol.outboundBuffer.p2add(local15); Protocol.outboundBuffer.p2add(local15);
Protocol.outboundBuffer.p4me(local19); Protocol.outboundBuffer.p4me(local19);
Static72.anInt2043 = 0; anInt2043 = 0;
Static257.aClass13_7 = InterfaceList.getComponent(local19); aClass13_7 = InterfaceList.getComponent(local19);
Static250.anInt5444 = local15; Static250.anInt5444 = local15;
} }
if (local23 == 42) { if (local23 == 42) {
@ -378,8 +422,8 @@ public class MiniMenu {
Cross.milliseconds = 0; Cross.milliseconds = 0;
Cross.y = Mouse.clickY; Cross.y = Mouse.clickY;
Protocol.outboundBuffer.p1isaac(239); Protocol.outboundBuffer.p1isaac(239);
Protocol.outboundBuffer.p4le2(Static98.anInt2512); Protocol.outboundBuffer.p4le2(anInt2512);
Protocol.outboundBuffer.p2add(Static15.anInt506); Protocol.outboundBuffer.p2add(anInt506);
Protocol.outboundBuffer.p2leadd(local36); Protocol.outboundBuffer.p2leadd(local36);
} }
} }
@ -424,15 +468,15 @@ public class MiniMenu {
Protocol.outboundBuffer.p1isaac(92); Protocol.outboundBuffer.p1isaac(92);
Protocol.outboundBuffer.p2leadd(local36); Protocol.outboundBuffer.p2leadd(local36);
} else { } else {
Chat.add(JagString.EMPTY, 0, JagString.concatenate(new JagString[] { Static123.parseInt(local693.objCounts[local15]), Static249.aClass100_1039, ObjTypeList.get(local36).name})); Chat.add(JagString.EMPTY, 0, JagString.concatenate(new JagString[] { JagString.parseInt(local693.objCounts[local15]), Static249.aClass100_1039, ObjTypeList.get(local36).name}));
} }
Static72.anInt2043 = 0; anInt2043 = 0;
Static257.aClass13_7 = InterfaceList.getComponent(local19); aClass13_7 = InterfaceList.getComponent(local19);
Static250.anInt5444 = local15; Static250.anInt5444 = local15;
} }
if (local23 == 60) { if (local23 == 60) {
if (local36 == 0) { if (local36 == 0) {
Static113.method3556(Player.level, local15, local19); method3556(Player.level, local15, local19);
} else if (local36 == 1) { } else if (local36 == 1) {
if (LoginManager.staffModLevel > 0 && Keyboard.pressedKeys[Keyboard.KEY_CTRL] && Keyboard.pressedKeys[Keyboard.KEY_SHIFT]) { if (LoginManager.staffModLevel > 0 && Keyboard.pressedKeys[Keyboard.KEY_CTRL] && Keyboard.pressedKeys[Keyboard.KEY_SHIFT]) {
Cheat.teleport(Static225.originX + local15, Static142.originZ + local19, Player.level); Cheat.teleport(Static225.originX + local15, Static142.originZ + local19, Player.level);
@ -442,7 +486,7 @@ public class MiniMenu {
Protocol.outboundBuffer.p2((int)Camera.yawTarget); Protocol.outboundBuffer.p2((int)Camera.yawTarget);
Protocol.outboundBuffer.p1(57); Protocol.outboundBuffer.p1(57);
Protocol.outboundBuffer.p1(Static59.anInt1814); Protocol.outboundBuffer.p1(Static59.anInt1814);
Protocol.outboundBuffer.p1(Static273.anInt4130); Protocol.outboundBuffer.p1(MiniMap.anInt4130);
Protocol.outboundBuffer.p1(89); Protocol.outboundBuffer.p1(89);
Protocol.outboundBuffer.p2(PlayerList.self.xFine); Protocol.outboundBuffer.p2(PlayerList.self.xFine);
Protocol.outboundBuffer.p2(PlayerList.self.zFine); Protocol.outboundBuffer.p2(PlayerList.self.zFine);
@ -473,19 +517,19 @@ public class MiniMenu {
Protocol.outboundBuffer.p2leadd(local15); Protocol.outboundBuffer.p2leadd(local15);
Protocol.outboundBuffer.p2add(local36); Protocol.outboundBuffer.p2add(local36);
Protocol.outboundBuffer.p4le2(local19); Protocol.outboundBuffer.p4le2(local19);
Static72.anInt2043 = 0; anInt2043 = 0;
Static257.aClass13_7 = InterfaceList.getComponent(local19); aClass13_7 = InterfaceList.getComponent(local19);
Static250.anInt5444 = local15; Static250.anInt5444 = local15;
} }
if (local23 == 3) { if (local23 == 3) {
Protocol.outboundBuffer.p1isaac(253); Protocol.outboundBuffer.p1isaac(253);
Protocol.outboundBuffer.p4le2(Static98.anInt2512); Protocol.outboundBuffer.p4le2(anInt2512);
Protocol.outboundBuffer.p2leadd(local15); Protocol.outboundBuffer.p2leadd(local15);
Protocol.outboundBuffer.p4le2(local19); Protocol.outboundBuffer.p4le2(local19);
Protocol.outboundBuffer.p2add(local36); Protocol.outboundBuffer.p2add(local36);
Protocol.outboundBuffer.p2le(Static15.anInt506); Protocol.outboundBuffer.p2le(anInt506);
Static72.anInt2043 = 0; anInt2043 = 0;
Static257.aClass13_7 = InterfaceList.getComponent(local19); aClass13_7 = InterfaceList.getComponent(local19);
Static250.anInt5444 = local15; Static250.anInt5444 = local15;
} }
if (local23 == 10) { if (local23 == 10) {
@ -517,14 +561,14 @@ public class MiniMenu {
Protocol.outboundBuffer.p2add(local36); Protocol.outboundBuffer.p2add(local36);
Protocol.outboundBuffer.p2le(local15); Protocol.outboundBuffer.p2le(local15);
Protocol.outboundBuffer.p4le2(local19); Protocol.outboundBuffer.p4le2(local19);
Static72.anInt2043 = 0; anInt2043 = 0;
Static257.aClass13_7 = InterfaceList.getComponent(local19); aClass13_7 = InterfaceList.getComponent(local19);
Static250.anInt5444 = local15; Static250.anInt5444 = local15;
} }
if (local23 == 14 && PathFinder.findPathToLoc(local31, local19, local15)) { if (local23 == 14 && PathFinder.findPathToLoc(local31, local19, local15)) {
Protocol.outboundBuffer.p1isaac(134); Protocol.outboundBuffer.p1isaac(134);
Protocol.outboundBuffer.p2add(Static225.originX + local15); Protocol.outboundBuffer.p2add(Static225.originX + local15);
Protocol.outboundBuffer.p2(Static274.anInt4997); Protocol.outboundBuffer.p2(anInt4997);
Protocol.outboundBuffer.p2le(local19 + Static142.originZ); Protocol.outboundBuffer.p2le(local19 + Static142.originZ);
Protocol.outboundBuffer.p2(Static185.anInt4370); Protocol.outboundBuffer.p2(Static185.anInt4370);
Protocol.outboundBuffer.p4me(Static224.anInt5062); Protocol.outboundBuffer.p4me(Static224.anInt5062);
@ -550,8 +594,8 @@ public class MiniMenu {
Protocol.outboundBuffer.p2le(local36); Protocol.outboundBuffer.p2le(local36);
Protocol.outboundBuffer.p2add(local15); Protocol.outboundBuffer.p2add(local15);
Protocol.outboundBuffer.p4rme(local19); Protocol.outboundBuffer.p4rme(local19);
Static72.anInt2043 = 0; anInt2043 = 0;
Static257.aClass13_7 = InterfaceList.getComponent(local19); aClass13_7 = InterfaceList.getComponent(local19);
Static250.anInt5444 = local15; Static250.anInt5444 = local15;
} }
if (local23 == 21) { if (local23 == 21) {
@ -590,15 +634,15 @@ public class MiniMenu {
Static53.method1294(); Static53.method1294();
@Pc(1493) ServerActiveProperties local1493 = InterfaceList.getServerActiveProperties(local693); @Pc(1493) ServerActiveProperties local1493 = InterfaceList.getServerActiveProperties(local693);
Static247.method4246(local19, local15, local1493.getTargetMask(), local1493.anInt540, local693.anInt499, local693.anInt484); Static247.method4246(local19, local15, local1493.getTargetMask(), local1493.anInt540, local693.anInt499, local693.anInt484);
Static260.anInt5014 = 0; anInt5014 = 0;
aClass100_545 = Static97.getTargetVerb(local693); aClass100_545 = Static97.getTargetVerb(local693);
if (aClass100_545 == null) { if (aClass100_545 == null) {
aClass100_545 = Static250.aClass100_1042; aClass100_545 = Static250.aClass100_1042;
} }
if (local693.usingScripts) { if (local693.usingScripts) {
Static78.aClass100_466 = JagString.concatenate(new JagString[] { local693.opBase, Static204.aClass100_896 }); aClass100_466 = JagString.concatenate(new JagString[] { local693.opBase, Static204.aClass100_896 });
} else { } else {
Static78.aClass100_466 = JagString.concatenate(new JagString[] {COLOR_GREEN, local693.aClass100_85, Static204.aClass100_896 }); aClass100_466 = JagString.concatenate(new JagString[] {COLOR_GREEN, local693.aClass100_85, Static204.aClass100_896 });
} }
} }
return; return;
@ -620,8 +664,8 @@ public class MiniMenu {
Protocol.outboundBuffer.p4le2(local19); Protocol.outboundBuffer.p4le2(local19);
Protocol.outboundBuffer.p2leadd(local36); Protocol.outboundBuffer.p2leadd(local36);
Protocol.outboundBuffer.p2leadd(local15); Protocol.outboundBuffer.p2leadd(local15);
Static72.anInt2043 = 0; anInt2043 = 0;
Static257.aClass13_7 = InterfaceList.getComponent(local19); aClass13_7 = InterfaceList.getComponent(local19);
Static250.anInt5444 = local15; Static250.anInt5444 = local15;
} }
if (local23 == 15) { if (local23 == 15) {
@ -633,8 +677,8 @@ public class MiniMenu {
Cross.x = Mouse.clickX; Cross.x = Mouse.clickX;
Cross.y = Mouse.clickY; Cross.y = Mouse.clickY;
Protocol.outboundBuffer.p1isaac(195); Protocol.outboundBuffer.p1isaac(195);
Protocol.outboundBuffer.p2add(Static15.anInt506); Protocol.outboundBuffer.p2add(anInt506);
Protocol.outboundBuffer.p4le2(Static98.anInt2512); Protocol.outboundBuffer.p4le2(anInt2512);
Protocol.outboundBuffer.p2leadd(local36); Protocol.outboundBuffer.p2leadd(local36);
} }
} }
@ -661,8 +705,8 @@ public class MiniMenu {
Protocol.outboundBuffer.p2add(local15); Protocol.outboundBuffer.p2add(local15);
Protocol.outboundBuffer.p2(local36); Protocol.outboundBuffer.p2(local36);
Protocol.outboundBuffer.p4rme(local19); Protocol.outboundBuffer.p4rme(local19);
Static72.anInt2043 = 0; anInt2043 = 0;
Static257.aClass13_7 = InterfaceList.getComponent(local19); aClass13_7 = InterfaceList.getComponent(local19);
Static250.anInt5444 = local15; Static250.anInt5444 = local15;
} }
if (local23 == 2) { if (local23 == 2) {
@ -702,7 +746,7 @@ public class MiniMenu {
Protocol.outboundBuffer.p4me(Static224.anInt5062); Protocol.outboundBuffer.p4me(Static224.anInt5062);
Protocol.outboundBuffer.p2le(Static185.anInt4370); Protocol.outboundBuffer.p2le(Static185.anInt4370);
Protocol.outboundBuffer.p2le(local36); Protocol.outboundBuffer.p2le(local36);
Protocol.outboundBuffer.p2leadd(Static274.anInt4997); Protocol.outboundBuffer.p2leadd(anInt4997);
} }
} }
if (local23 == 59) { if (local23 == 59) {
@ -727,7 +771,7 @@ public class MiniMenu {
Protocol.outboundBuffer.p1isaac(101); Protocol.outboundBuffer.p1isaac(101);
Protocol.outboundBuffer.p2leadd(local15 + Static225.originX); Protocol.outboundBuffer.p2leadd(local15 + Static225.originX);
Protocol.outboundBuffer.p2le(Static185.anInt4370); Protocol.outboundBuffer.p2le(Static185.anInt4370);
Protocol.outboundBuffer.p2le(Static274.anInt4997); Protocol.outboundBuffer.p2le(anInt4997);
Protocol.outboundBuffer.p2le(local36); Protocol.outboundBuffer.p2le(local36);
Protocol.outboundBuffer.p2leadd(Static142.originZ + local19); Protocol.outboundBuffer.p2leadd(Static142.originZ + local19);
Protocol.outboundBuffer.p4me(Static224.anInt5062); Protocol.outboundBuffer.p4me(Static224.anInt5062);
@ -743,12 +787,12 @@ public class MiniMenu {
if (local23 == 11) { if (local23 == 11) {
if (local36 == 0) { if (local36 == 0) {
Static125.anInt3096 = 1; Static125.anInt3096 = 1;
Static113.method3556(Player.level, local15, local19); method3556(Player.level, local15, local19);
} else if (local36 == 1) { } else if (local36 == 1) {
Protocol.outboundBuffer.p1isaac(131); Protocol.outboundBuffer.p1isaac(131);
Protocol.outboundBuffer.p4me(Static98.anInt2512); Protocol.outboundBuffer.p4me(anInt2512);
Protocol.outboundBuffer.p2add(Static225.originX + local15); Protocol.outboundBuffer.p2add(Static225.originX + local15);
Protocol.outboundBuffer.p2leadd(Static15.anInt506); Protocol.outboundBuffer.p2leadd(anInt506);
Protocol.outboundBuffer.p2add(local19 + Static142.originZ); Protocol.outboundBuffer.p2add(local19 + Static142.originZ);
} }
} }
@ -773,7 +817,7 @@ public class MiniMenu {
Cross.x = Mouse.clickX; Cross.x = Mouse.clickX;
Protocol.outboundBuffer.p1isaac(248); Protocol.outboundBuffer.p1isaac(248);
Protocol.outboundBuffer.p2leadd(local36); Protocol.outboundBuffer.p2leadd(local36);
Protocol.outboundBuffer.p2(Static274.anInt4997); Protocol.outboundBuffer.p2(anInt4997);
Protocol.outboundBuffer.p2(Static185.anInt4370); Protocol.outboundBuffer.p2(Static185.anInt4370);
Protocol.outboundBuffer.p4me(Static224.anInt5062); Protocol.outboundBuffer.p4me(Static224.anInt5062);
} }
@ -783,8 +827,8 @@ public class MiniMenu {
Protocol.outboundBuffer.p4rme(local19); Protocol.outboundBuffer.p4rme(local19);
Protocol.outboundBuffer.p2(local15); Protocol.outboundBuffer.p2(local15);
Protocol.outboundBuffer.p2add(local36); Protocol.outboundBuffer.p2add(local36);
Static72.anInt2043 = 0; anInt2043 = 0;
Static257.aClass13_7 = InterfaceList.getComponent(local19); aClass13_7 = InterfaceList.getComponent(local19);
Static250.anInt5444 = local15; Static250.anInt5444 = local15;
} }
if (local23 == 24) { if (local23 == 24) {
@ -809,8 +853,8 @@ public class MiniMenu {
Protocol.outboundBuffer.p1isaac(233); Protocol.outboundBuffer.p1isaac(233);
Protocol.outboundBuffer.p2leadd(local19 + Static142.originZ); Protocol.outboundBuffer.p2leadd(local19 + Static142.originZ);
Protocol.outboundBuffer.p2add(Static225.originX + local15); Protocol.outboundBuffer.p2add(Static225.originX + local15);
Protocol.outboundBuffer.p2leadd(Static15.anInt506); Protocol.outboundBuffer.p2leadd(anInt506);
Protocol.outboundBuffer.p4rme(Static98.anInt2512); Protocol.outboundBuffer.p4rme(anInt2512);
Protocol.outboundBuffer.p2add((int) (local31 >>> 32) & Integer.MAX_VALUE); Protocol.outboundBuffer.p2add((int) (local31 >>> 32) & Integer.MAX_VALUE);
} }
if (local23 == 13) { if (local23 == 13) {
@ -818,8 +862,8 @@ public class MiniMenu {
Protocol.outboundBuffer.p4(local19); Protocol.outboundBuffer.p4(local19);
Protocol.outboundBuffer.p2add(local15); Protocol.outboundBuffer.p2add(local15);
Protocol.outboundBuffer.p2le(local36); Protocol.outboundBuffer.p2le(local36);
Static72.anInt2043 = 0; anInt2043 = 0;
Static257.aClass13_7 = InterfaceList.getComponent(local19); aClass13_7 = InterfaceList.getComponent(local19);
Static250.anInt5444 = local15; Static250.anInt5444 = local15;
} }
if (local23 == 57) { if (local23 == 57) {
@ -839,10 +883,10 @@ public class MiniMenu {
local693 = InterfaceList.getComponent(local19); local693 = InterfaceList.getComponent(local19);
Static224.anInt5062 = local19; Static224.anInt5062 = local19;
Static185.anInt4370 = local15; Static185.anInt4370 = local15;
Static260.anInt5014 = 1; anInt5014 = 1;
Static274.anInt4997 = local36; anInt4997 = local36;
InterfaceList.redraw(local693); InterfaceList.redraw(local693);
aClass100_203 = JagString.concatenate(new JagString[] { Static8.aClass100_32, ObjTypeList.get(local36).name, Static204.aClass100_896 }); aClass100_203 = JagString.concatenate(new JagString[] { aClass100_32, ObjTypeList.get(local36).name, Static204.aClass100_896 });
if (aClass100_203 == null) { if (aClass100_203 == null) {
aClass100_203 = Static92.NULL; aClass100_203 = Static92.NULL;
} }
@ -860,8 +904,8 @@ public class MiniMenu {
Protocol.outboundBuffer.p2le(local15); Protocol.outboundBuffer.p2le(local15);
Protocol.outboundBuffer.p4rme(local19); Protocol.outboundBuffer.p4rme(local19);
Protocol.outboundBuffer.p2leadd(local36); Protocol.outboundBuffer.p2leadd(local36);
Static72.anInt2043 = 0; anInt2043 = 0;
Static257.aClass13_7 = InterfaceList.getComponent(local19); aClass13_7 = InterfaceList.getComponent(local19);
Static250.anInt5444 = local15; Static250.anInt5444 = local15;
} }
if (local23 == 30) { if (local23 == 30) {
@ -881,8 +925,8 @@ public class MiniMenu {
Protocol.outboundBuffer.p4le2(local19); Protocol.outboundBuffer.p4le2(local19);
Protocol.outboundBuffer.p2le(local15); Protocol.outboundBuffer.p2le(local15);
Protocol.outboundBuffer.p2le(local36); Protocol.outboundBuffer.p2le(local36);
Static72.anInt2043 = 0; anInt2043 = 0;
Static257.aClass13_7 = InterfaceList.getComponent(local19); aClass13_7 = InterfaceList.getComponent(local19);
Static250.anInt5444 = local15; Static250.anInt5444 = local15;
} }
if (local23 == 39) { if (local23 == 39) {
@ -895,23 +939,23 @@ public class MiniMenu {
Cross.type = 2; Cross.type = 2;
Cross.milliseconds = 0; Cross.milliseconds = 0;
Protocol.outboundBuffer.p1isaac(73); Protocol.outboundBuffer.p1isaac(73);
Protocol.outboundBuffer.p4rme(Static98.anInt2512); Protocol.outboundBuffer.p4rme(anInt2512);
Protocol.outboundBuffer.p2(Static142.originZ + local19); Protocol.outboundBuffer.p2(Static142.originZ + local19);
Protocol.outboundBuffer.p2leadd(local36); Protocol.outboundBuffer.p2leadd(local36);
Protocol.outboundBuffer.p2leadd(local15 + Static225.originX); Protocol.outboundBuffer.p2leadd(local15 + Static225.originX);
Protocol.outboundBuffer.p2le(Static15.anInt506); Protocol.outboundBuffer.p2le(anInt506);
} }
if (local23 == 12) { if (local23 == 12) {
Protocol.outboundBuffer.p1isaac(82); Protocol.outboundBuffer.p1isaac(82);
Protocol.outboundBuffer.p2(Static15.anInt506); Protocol.outboundBuffer.p2(anInt506);
Protocol.outboundBuffer.p4rme(local19); Protocol.outboundBuffer.p4rme(local19);
Protocol.outboundBuffer.p4(Static98.anInt2512); Protocol.outboundBuffer.p4(anInt2512);
Protocol.outboundBuffer.p2leadd(local15); Protocol.outboundBuffer.p2leadd(local15);
} }
if (local23 == 36) { if (local23 == 36) {
if (local36 == 0) { if (local36 == 0) {
Static187.anInt4422 = 1; Static187.anInt4422 = 1;
Static113.method3556(Player.level, local15, local19); method3556(Player.level, local15, local19);
} else if (LoginManager.staffModLevel > 0 && Keyboard.pressedKeys[Keyboard.KEY_CTRL] && Keyboard.pressedKeys[Keyboard.KEY_SHIFT]) { } else if (LoginManager.staffModLevel > 0 && Keyboard.pressedKeys[Keyboard.KEY_CTRL] && Keyboard.pressedKeys[Keyboard.KEY_SHIFT]) {
Cheat.teleport(local15 + Static225.originX, Static142.originZ - -local19, Player.level); Cheat.teleport(local15 + Static225.originX, Static142.originZ - -local19, Player.level);
} else { } else {
@ -962,15 +1006,15 @@ public class MiniMenu {
Protocol.outboundBuffer.p2leadd(local36); Protocol.outboundBuffer.p2leadd(local36);
} }
} }
if (Static260.anInt5014 != 0) { if (anInt5014 != 0) {
Static260.anInt5014 = 0; anInt5014 = 0;
InterfaceList.redraw(InterfaceList.getComponent(Static224.anInt5062)); InterfaceList.redraw(InterfaceList.getComponent(Static224.anInt5062));
} }
if (Static241.aBoolean302) { if (Static241.aBoolean302) {
Static53.method1294(); Static53.method1294();
} }
if (Static257.aClass13_7 != null && Static72.anInt2043 == 0) { if (aClass13_7 != null && anInt2043 == 0) {
InterfaceList.redraw(Static257.aClass13_7); InterfaceList.redraw(aClass13_7);
} }
} }
@ -995,4 +1039,411 @@ public class MiniMenu {
return aClass100_1081; return aClass100_1081;
} }
} }
@OriginalMember(owner = "client!ob", name = "a", descriptor = "(IIIIIIB)V")
public static void addEntries(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2, @OriginalArg(3) int arg3, @OriginalArg(4) int arg4, @OriginalArg(5) int arg5) {
@Pc(15) int local15;
@Pc(47) int x;
if (anInt5014 == 0) {
@Pc(13) int local13 = Static148.screenUpperY;
local15 = Static1.screenLowerY;
@Pc(17) int local17 = Static247.screenUpperX;
@Pc(19) int local19 = Static240.screenLowerX;
@Pc(33) int local33 = (arg5 - arg3) * (local17 - local19) / arg1 + local19;
x = local15 + (local13 - local15) * (arg4 - arg0) / arg2;
if (Static241.aBoolean302 && (anInt4999 & 0x40) != 0) {
@Pc(61) Component local61 = Static201.method1418(anInt2512, anInt506);
if (local61 == null) {
Static53.method1294();
} else {
add(Static246.anInt5393, 0L, aClass100_961, local33, (short) 11, aClass100_545, x);
}
} else {
if (client.game == 1) {
add(-1, 0L, JagString.EMPTY, local33, (short) 36, LocalizedText.FACEHERE, x);
}
add(-1, 0L, JagString.EMPTY, local33, (short) 60, Static195.walkText, x);
}
}
@Pc(112) long local112 = -1L;
for (local15 = 0; local15 < Static2.anInt7; local15++) {
@Pc(121) long local121 = Static259.aLongArray11[local15];
x = (int) local121 & 0x7F;
@Pc(133) int local133 = (int) local121 >> 29 & 0x3;
@Pc(140) int local140 = (int) (local121 >>> 32) & Integer.MAX_VALUE;
@Pc(147) int z = (int) local121 >> 7 & 0x7F;
if (local121 != local112) {
local112 = local121;
@Pc(240) int local240;
if (local133 == 2 && SceneGraph.isLocValid(Player.level, x, z, local121)) {
@Pc(172) LocType local172 = LocTypeList.get(local140);
if (local172.multiLocs != null) {
local172 = local172.getMultiLoc();
}
if (local172 == null) {
continue;
}
if (anInt5014 == 1) {
add(Static169.anInt4075, local121, JagString.concatenate(new JagString[] {aClass100_203, Static27.aClass100_164, local172.name}), x, (short) 14, LocalizedText.USE, z);
} else if (Static241.aBoolean302) {
@Pc(363) ParamType local363 = Static121.anInt3039 == -1 ? null : ParamTypeList.get(Static121.anInt3039);
if ((anInt4999 & 0x4) != 0 && (local363 == null || local172.getParam(local363.defaultInt, Static121.anInt3039) != local363.defaultInt)) {
add(Static246.anInt5393, local121, JagString.concatenate(new JagString[] { aClass100_466, Static27.aClass100_164, local172.name}), x, (short) 38, aClass100_545, z);
}
} else {
@Pc(228) JagString[] local228 = local172.ops;
if (aBoolean237) {
local228 = annotateOps(local228);
}
if (local228 != null) {
for (local240 = 4; local240 >= 0; local240--) {
if (local228[local240] != null) {
@Pc(254) short local254 = 0;
if (local240 == 0) {
local254 = 42;
}
if (local240 == 1) {
local254 = 50;
}
@Pc(268) int local268 = -1;
if (local240 == 2) {
local254 = 49;
}
if (local172.cursor1Op == local240) {
local268 = local172.cursor1;
}
if (local240 == 3) {
local254 = 46;
}
if (local240 == local172.cursor2Op) {
local268 = local172.cursor2;
}
if (local240 == 4) {
local254 = 1001;
}
add(local268, local121, JagString.concatenate(new JagString[] { Static240.aClass100_1008, local172.name}), x, local254, local228[local240], z);
}
}
}
add(Static225.anInt5073, (long) local172.id, JagString.concatenate(new JagString[] { Static240.aClass100_1008, local172.name}), x, (short) 1004, LocalizedText.EXAMINE, z);
}
}
@Pc(514) int local514;
@Pc(526) int local526;
@Pc(479) int local479;
@Pc(493) int local493;
@Pc(502) Npc local502;
@Pc(597) Player local597;
if (local133 == 1) {
@Pc(421) Npc local421 = NpcList.npcs[local140];
if ((local421.type.size & 0x1) == 0 && (local421.xFine & 0x7F) == 0 && (local421.zFine & 0x7F) == 0 || (local421.type.size & 0x1) == 1 && (local421.xFine & 0x7F) == 64 && (local421.zFine & 0x7F) == 64) {
local479 = local421.xFine + 64 - local421.type.size * 64;
local240 = local421.zFine - (local421.type.size - 1) * 64;
for (local493 = 0; local493 < NpcList.size; local493++) {
local502 = NpcList.npcs[NpcList.ids[local493]];
local514 = local502.xFine + 64 - local502.type.size * 64;
local526 = local502.zFine + 64 - local502.type.size * 64;
if (local502 != null && local421 != local502 && local514 >= local479 && local421.type.size - (local514 - local479 >> 7) >= local502.type.size && local240 <= local526 && local502.type.size <= local421.type.size - (local526 - local240 >> 7)) {
addNpcEntries(local502.type, x, NpcList.ids[local493], z);
}
}
for (local493 = 0; local493 < PlayerList.size; local493++) {
local597 = PlayerList.players[PlayerList.ids[local493]];
local514 = local597.xFine + 64 - local597.getSize() * 64;
local526 = local597.zFine + 64 - local597.getSize() * 64;
if (local597 != null && local514 >= local479 && local597.getSize() <= local421.type.size - (local514 - local479 >> 7) && local526 >= local240 && local597.getSize() <= local421.type.size - (local526 - local240 >> 7)) {
addPlayerEntries(PlayerList.ids[local493], z, local597, x);
}
}
}
addNpcEntries(local421.type, x, local140, z);
}
if (local133 == 0) {
@Pc(688) Player player = PlayerList.players[local140];
if ((player.xFine & 0x7F) == 64 && (player.zFine & 0x7F) == 64) {
local479 = player.xFine - (player.getSize() - 1) * 64;
local240 = player.zFine + 64 - player.getSize() * 64;
for (local493 = 0; local493 < NpcList.size; local493++) {
local502 = NpcList.npcs[NpcList.ids[local493]];
local514 = local502.xFine + 64 - local502.type.size * 64;
local526 = local502.zFine + 64 - local502.type.size * 64;
if (local502 != null && local514 >= local479 && local502.type.size <= player.getSize() - (local514 - local479 >> 7) && local526 >= local240 && local502.type.size <= player.getSize() - (local526 - local240 >> 7)) {
addNpcEntries(local502.type, x, NpcList.ids[local493], z);
}
}
for (local493 = 0; local493 < PlayerList.size; local493++) {
local597 = PlayerList.players[PlayerList.ids[local493]];
local514 = local597.xFine - (local597.getSize() - 1) * 64;
local526 = local597.zFine + 64 - local597.getSize() * 64;
if (local597 != null && local597 != player && local479 <= local514 && local597.getSize() <= player.getSize() - (local514 - local479 >> 7) && local526 >= local240 && local597.getSize() <= player.getSize() - (local526 - local240 >> 7)) {
addPlayerEntries(PlayerList.ids[local493], z, local597, x);
}
}
}
addPlayerEntries(local140, z, player, x);
}
if (local133 == 3) {
@Pc(931) LinkedList objStacks = Static159.objStacks[Player.level][x][z];
if (objStacks != null) {
for (@Pc(940) ObjStackNode node = (ObjStackNode) objStacks.tail(); node != null; node = (ObjStackNode) objStacks.prev()) {
local240 = node.value.type;
@Pc(951) ObjType local951 = ObjTypeList.get(local240);
if (anInt5014 == 1) {
add(Static169.anInt4075, (long) local240, JagString.concatenate(new JagString[] { aClass100_203, aClass100_947, local951.name }), x, (short) 33, LocalizedText.USE, z);
} else if (Static241.aBoolean302) {
@Pc(1142) ParamType local1142 = Static121.anInt3039 == -1 ? null : ParamTypeList.get(Static121.anInt3039);
if ((anInt4999 & 0x1) != 0 && (local1142 == null || local951.getParam(local1142.defaultInt, Static121.anInt3039) != local1142.defaultInt)) {
add(Static246.anInt5393, (long) local240, JagString.concatenate(new JagString[] { aClass100_466, aClass100_947, local951.name }), x, (short) 39, aClass100_545, z);
}
} else {
@Pc(997) JagString[] local997 = local951.ops;
if (aBoolean237) {
local997 = annotateOps(local997);
}
for (local514 = 4; local514 >= 0; local514--) {
if (local997 != null && local997[local514] != null) {
@Pc(1025) byte local1025 = 0;
if (local514 == 0) {
local1025 = 21;
}
if (local514 == 1) {
local1025 = 34;
}
@Pc(1041) int local1041 = -1;
if (local514 == local951.cursor1Op) {
local1041 = local951.cursor1;
}
if (local514 == 2) {
local1025 = 18;
}
if (local951.cursor2Op == local514) {
local1041 = local951.cursor2;
}
if (local514 == 3) {
local1025 = 20;
}
if (local514 == 4) {
local1025 = 24;
}
add(local1041, (long) local240, JagString.concatenate(new JagString[] { aClass100_32, local951.name}), x, local1025, local997[local514], z);
}
}
add(Static225.anInt5073, (long) local240, JagString.concatenate(new JagString[] { aClass100_32, local951.name}), x, (short) 1002, LocalizedText.EXAMINE, z);
}
}
}
}
}
}
}
@OriginalMember(owner = "client!bc", name = "f", descriptor = "(B)Lclient!na;")
public static JagString method471() {
@Pc(32) JagString local32;
if (anInt5014 == 1 && size < 2) {
local32 = JagString.concatenate(new JagString[] { LocalizedText.USE, LocalizedText.MINISEPARATOR, aClass100_203, aClass100_961});
} else if (Static241.aBoolean302 && size < 2) {
local32 = JagString.concatenate(new JagString[] { aClass100_545, LocalizedText.MINISEPARATOR, aClass100_466, aClass100_961});
} else if (Cheat.shiftClick && Keyboard.pressedKeys[Keyboard.KEY_SHIFT] && size > 2) {
local32 = getOp(size - 2);
} else {
local32 = getOp(size - 1);
}
if (size > 2) {
local32 = JagString.concatenate(new JagString[] { local32, aClass100_2, JagString.parseInt(size - 2), LocalizedText.MOREOPTIONS});
}
return local32;
}
@OriginalMember(owner = "client!wk", name = "a", descriptor = "(I[Lclient!na;)[Lclient!na;")
public static JagString[] annotateOps(@OriginalArg(1) JagString[] ops) {
@Pc(8) JagString[] annotatedOps = new JagString[5];
for (@Pc(15) int i = 0; i < 5; i++) {
annotatedOps[i] = JagString.concatenate(new JagString[] { JagString.parseInt(i), aClass100_168 });
if (ops != null && ops[i] != null) {
annotatedOps[i] = JagString.concatenate(new JagString[] { annotatedOps[i], ops[i] });
}
}
return annotatedOps;
}
@OriginalMember(owner = "client!u", name = "a", descriptor = "(Lclient!me;IIII)V")
public static void addNpcEntries(@OriginalArg(0) NpcType arg0, @OriginalArg(1) int arg1, @OriginalArg(3) int arg2, @OriginalArg(4) int arg3) {
if (size >= 400) {
return;
}
if (arg0.multiNpcs != null) {
arg0 = arg0.getMultiNpc();
}
if (arg0 == null || !arg0.aBoolean183) {
return;
}
@Pc(35) JagString local35 = arg0.name;
if (arg0.combatLevel != 0) {
@Pc(47) JagString local47 = client.game == 1 ? LocalizedText.RATING : LocalizedText.LEVEL;
local35 = JagString.concatenate(new JagString[] { local35, getCombatLevelColor(arg0.combatLevel, PlayerList.self.combatLevel), Static70.aClass100_593, local47, JagString.parseInt(arg0.combatLevel), aClass100_448 });
}
if (anInt5014 == 1) {
add(Static169.anInt4075, (long) arg2, JagString.concatenate(new JagString[] {aClass100_203, aClass100_407, local35 }), arg1, (short) 26, LocalizedText.USE, arg3);
} else if (Static241.aBoolean302) {
@Pc(378) ParamType local378 = Static121.anInt3039 == -1 ? null : ParamTypeList.get(Static121.anInt3039);
if ((anInt4999 & 0x2) != 0 && (local378 == null || arg0.getParam(Static121.anInt3039, local378.defaultInt) != local378.defaultInt)) {
add(Static246.anInt5393, (long) arg2, JagString.concatenate(new JagString[] {aClass100_466, aClass100_407, local35 }), arg1, (short) 45, aClass100_545, arg3);
}
} else {
@Pc(129) JagString[] local129 = arg0.ops;
if (aBoolean237) {
local129 = annotateOps(local129);
}
@Pc(140) int local140;
if (local129 != null) {
for (local140 = 4; local140 >= 0; local140--) {
if (local129[local140] != null && (client.game != 0 || !local129[local140].equalsIgnoreCase(LocalizedText.ATTACK))) {
@Pc(161) byte local161 = 0;
if (local140 == 0) {
local161 = 17;
}
if (local140 == 1) {
local161 = 16;
}
@Pc(176) int local176 = -1;
if (local140 == 2) {
local161 = 4;
}
if (local140 == 3) {
local161 = 19;
}
if (arg0.cursor1Op == local140) {
local176 = arg0.cursor1;
}
if (local140 == arg0.cursor2Op) {
local176 = arg0.cursor2;
}
if (local140 == 4) {
local161 = 2;
}
add(local176, (long) arg2, JagString.concatenate(new JagString[] {aClass100_965, local35 }), arg1, local161, local129[local140], arg3);
}
}
}
if (client.game == 0 && local129 != null) {
for (local140 = 4; local140 >= 0; local140--) {
if (local129[local140] != null && local129[local140].equalsIgnoreCase(LocalizedText.ATTACK)) {
@Pc(271) short local271 = 0;
if (arg0.combatLevel > PlayerList.self.combatLevel) {
local271 = 2000;
}
@Pc(281) short local281 = 0;
if (local140 == 0) {
local281 = 17;
}
if (local140 == 1) {
local281 = 16;
}
if (local140 == 2) {
local281 = 4;
}
if (local140 == 3) {
local281 = 19;
}
if (local140 == 4) {
local281 = 2;
}
if (local281 != 0) {
local281 += local271;
}
add(arg0.anInt3752, (long) arg2, JagString.concatenate(new JagString[] {aClass100_965, local35 }), arg1, local281, local129[local140], arg3);
}
}
}
add(Static225.anInt5073, (long) arg2, JagString.concatenate(new JagString[] {aClass100_965, local35 }), arg1, (short) 1007, LocalizedText.EXAMINE, arg3);
}
}
@OriginalMember(owner = "client!rj", name = "a", descriptor = "(IIILclient!e;I)V")
public static void addPlayerEntries(@OriginalArg(0) int arg0, @OriginalArg(2) int arg1, @OriginalArg(3) Player arg2, @OriginalArg(4) int arg3) {
if (PlayerList.self == arg2 || size >= 400) {
return;
}
@Pc(158) JagString local158;
if (arg2.anInt1671 == 0) {
@Pc(22) boolean local22 = true;
if (PlayerList.self.anInt1667 != -1 && arg2.anInt1667 != -1) {
@Pc(43) int local43 = arg2.combatLevel < PlayerList.self.combatLevel ? PlayerList.self.combatLevel : arg2.combatLevel;
@Pc(58) int local58 = PlayerList.self.anInt1667 < arg2.anInt1667 ? PlayerList.self.anInt1667 : arg2.anInt1667;
@Pc(69) int local69 = local43 * 10 / 100 + local58 + 5;
@Pc(76) int local76 = PlayerList.self.combatLevel - arg2.combatLevel;
if (local76 < 0) {
local76 = -local76;
}
if (local69 < local76) {
local22 = false;
}
}
@Pc(95) JagString local95 = client.game == 1 ? LocalizedText.RATING : LocalizedText.LEVEL;
if (arg2.combatLevel < arg2.anInt1656) {
local158 = JagString.concatenate(new JagString[] { arg2.getName(), local22 ? getCombatLevelColor(arg2.combatLevel, PlayerList.self.combatLevel) : Static204.aClass100_896, Static70.aClass100_593, local95, JagString.parseInt(arg2.combatLevel), Static78.aClass100_465, JagString.parseInt(arg2.anInt1656 - arg2.combatLevel), aClass100_448 });
} else {
local158 = JagString.concatenate(new JagString[] { arg2.getName(), local22 ? getCombatLevelColor(arg2.combatLevel, PlayerList.self.combatLevel) : Static204.aClass100_896, Static70.aClass100_593, local95, JagString.parseInt(arg2.combatLevel), aClass100_448 });
}
} else {
local158 = JagString.concatenate(new JagString[] { arg2.getName(), Static70.aClass100_593, LocalizedText.SKILL, JagString.parseInt(arg2.anInt1671), aClass100_448 });
}
@Pc(275) int local275;
if (anInt5014 == 1) {
add(Static169.anInt4075, (long) arg0, JagString.concatenate(new JagString[] {aClass100_203, Static105.aClass100_561, local158 }), arg3, (short) 1, LocalizedText.USE, arg1);
} else if (!Static241.aBoolean302) {
for (local275 = 7; local275 >= 0; local275--) {
if (Player.options[local275] != null) {
@Pc(291) short local291 = 0;
if (client.game == 0 && Player.options[local275].equalsIgnoreCase(LocalizedText.ATTACK)) {
if (arg2.combatLevel > PlayerList.self.combatLevel) {
local291 = 2000;
}
if (PlayerList.self.anInt1650 != 0 && arg2.anInt1650 != 0) {
if (PlayerList.self.anInt1650 == arg2.anInt1650) {
local291 = 2000;
} else {
local291 = 0;
}
}
} else if (Player.secondaryOptions[local275]) {
local291 = 2000;
}
@Pc(353) short local353 = Static5.aShortArray2[local275];
@Pc(358) short local358 = (short) (local353 + local291);
add(Player.cursors[local275], (long) arg0, JagString.concatenate(new JagString[] { Static204.aClass100_896, local158 }), arg3, local358, Player.options[local275], arg1);
}
}
} else if ((anInt4999 & 0x8) != 0) {
add(Static246.anInt5393, (long) arg0, JagString.concatenate(new JagString[] {aClass100_466, Static105.aClass100_561, local158 }), arg3, (short) 15, aClass100_545, arg1);
}
for (local275 = 0; local275 < size; local275++) {
if (actions[local275] == 60) {
opBases[local275] = JagString.concatenate(new JagString[] { Static204.aClass100_896, local158 });
break;
}
}
}
@OriginalMember(owner = "client!aj", name = "a", descriptor = "(BILclient!be;)I")
public static int getOpCursor(@OriginalArg(1) int arg0, @OriginalArg(2) Component arg1) {
if (!InterfaceList.getServerActiveProperties(arg1).method503(arg0) && arg1.anObjectArray29 == null) {
return -1;
} else if (arg1.anIntArray39 == null || arg0 >= arg1.anIntArray39.length) {
return -1;
} else {
return arg1.anIntArray39[arg0];
}
}
@OriginalMember(owner = "client!il", name = "a", descriptor = "(III)V")
public static void method3556(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2) {
aBoolean187 = true;
anInt3902 = arg0;
anInt2388 = arg1;
anInt3259 = arg2;
anInt1742 = -1;
anInt2954 = -1;
}
} }

13
client/src/main/java/rt4/MixerPcmStream.java
View file

@ -20,6 +20,17 @@ public final class MixerPcmStream extends PcmStream {
@OriginalMember(owner = "client!ei", name = "w", descriptor = "I") @OriginalMember(owner = "client!ei", name = "w", descriptor = "I")
private int anInt1781 = -1; private int anInt1781 = -1;
@OriginalMember(owner = "client!ok", name = "a", descriptor = "(Lclient!ab;Lclient!ab;I)V")
public static void method3331(@OriginalArg(0) Node arg0, @OriginalArg(1) Node arg1) {
if (arg0.aClass3_223 != null) {
arg0.unlink();
}
arg0.aClass3_222 = arg1;
arg0.aClass3_223 = arg1.aClass3_223;
arg0.aClass3_223.aClass3_222 = arg0;
arg0.aClass3_222.aClass3_223 = arg0;
}
@OriginalMember(owner = "client!ei", name = "a", descriptor = "(Lclient!cc;)V") @OriginalMember(owner = "client!ei", name = "a", descriptor = "(Lclient!cc;)V")
private void method1342(@OriginalArg(0) MixerListener arg0) { private void method1342(@OriginalArg(0) MixerListener arg0) {
arg0.unlink(); arg0.unlink();
@ -156,7 +167,7 @@ public final class MixerPcmStream extends PcmStream {
while (arg0 != this.aClass69_44.aClass3_109 && ((MixerListener) arg0).anInt905 <= arg1.anInt905) { while (arg0 != this.aClass69_44.aClass3_109 && ((MixerListener) arg0).anInt905 <= arg1.anInt905) {
arg0 = arg0.aClass3_222; arg0 = arg0.aClass3_222;
} }
Static183.method3331(arg1, arg0); method3331(arg1, arg0);
this.anInt1781 = ((MixerListener) this.aClass69_44.aClass3_109.aClass3_222).anInt905; this.anInt1781 = ((MixerListener) this.aClass69_44.aClass3_109.aClass3_222).anInt905;
} }
} }

18
client/src/main/java/rt4/MonochromeImageCache.java
View file

@ -13,6 +13,8 @@ public final class MonochromeImageCache {
@OriginalMember(owner = "client!a", name = "b", descriptor = "[I") @OriginalMember(owner = "client!a", name = "b", descriptor = "[I")
public static final int[] anIntArray1 = new int[4096]; public static final int[] anIntArray1 = new int[4096];
@OriginalMember(owner = "client!bc", name = "N", descriptor = "Lclient!lb;")
public static final MonochromeImageCache_Class3_Sub23 aClass3_Sub23_1 = new MonochromeImageCache_Class3_Sub23(0, 0);
@OriginalMember(owner = "client!nd", name = "f", descriptor = "I") @OriginalMember(owner = "client!nd", name = "f", descriptor = "I")
private int anInt4062 = -1; private int anInt4062 = -1;
@ -47,7 +49,7 @@ public final class MonochromeImageCache {
} }
for (@Pc(4) int local4 = 0; local4 < 4096; local4++) { for (@Pc(4) int local4 = 0; local4 < 4096; local4++) {
anIntArray1[local4] = Static273.method3211(local4); anIntArray1[local4] = method3211(local4);
} }
} }
@ -59,13 +61,21 @@ public final class MonochromeImageCache {
this.anIntArrayArrayArray13 = new int[this.anInt4064][3][arg2]; this.anIntArrayArrayArray13 = new int[this.anInt4064][3][arg2];
} }
@OriginalMember(owner = "client!we", name = "a", descriptor = "(BI)I")
public static int method3211(@OriginalArg(1) int arg0) {
@Pc(13) int local13 = arg0 * (arg0 * arg0 >> 12) >> 12;
@Pc(26) int local26 = arg0 * 6 - 61440;
@Pc(34) int local34 = (arg0 * local26 >> 12) + 40960;
return local13 * local34 >> 12;
}
@OriginalMember(owner = "client!nd", name = "a", descriptor = "(B)[[[I") @OriginalMember(owner = "client!nd", name = "a", descriptor = "(B)[[[I")
public final int[][][] method3168() { public final int[][][] method3168() {
if (this.anInt4067 != this.anInt4064) { if (this.anInt4067 != this.anInt4064) {
throw new RuntimeException("Can only retrieve a full image cache"); throw new RuntimeException("Can only retrieve a full image cache");
} }
for (@Pc(27) int local27 = 0; local27 < this.anInt4064; local27++) { for (@Pc(27) int local27 = 0; local27 < this.anInt4064; local27++) {
this.aClass3_Sub23Array1[local27] = Static13.aClass3_Sub23_1; this.aClass3_Sub23Array1[local27] = aClass3_Sub23_1;
} }
return this.anIntArrayArrayArray13; return this.anIntArrayArrayArray13;
} }
@ -88,7 +98,7 @@ public final class MonochromeImageCache {
public final int[][] method3173(@OriginalArg(1) int arg0) { public final int[][] method3173(@OriginalArg(1) int arg0) {
if (this.anInt4064 == this.anInt4067) { if (this.anInt4064 == this.anInt4067) {
this.aBoolean195 = this.aClass3_Sub23Array1[arg0] == null; this.aBoolean195 = this.aClass3_Sub23Array1[arg0] == null;
this.aClass3_Sub23Array1[arg0] = Static13.aClass3_Sub23_1; this.aClass3_Sub23Array1[arg0] = aClass3_Sub23_1;
return this.anIntArrayArrayArray13[arg0]; return this.anIntArrayArrayArray13[arg0];
} else if (this.anInt4064 == 1) { } else if (this.anInt4064 == 1) {
this.aBoolean195 = this.anInt4062 != arg0; this.aBoolean195 = this.anInt4062 != arg0;
@ -102,7 +112,7 @@ public final class MonochromeImageCache {
local44 = new MonochromeImageCache_Class3_Sub23(arg0, this.anInt4066); local44 = new MonochromeImageCache_Class3_Sub23(arg0, this.anInt4066);
this.anInt4066++; this.anInt4066++;
} else { } else {
@Pc(80) MonochromeImageCache_Class3_Sub23 local80 = (MonochromeImageCache_Class3_Sub23) this.aClass69_96.method2279(); @Pc(80) MonochromeImageCache_Class3_Sub23 local80 = (MonochromeImageCache_Class3_Sub23) this.aClass69_96.tail();
local44 = new MonochromeImageCache_Class3_Sub23(arg0, local80.anInt3468); local44 = new MonochromeImageCache_Class3_Sub23(arg0, local80.anInt3468);
this.aClass3_Sub23Array1[local80.anInt3476] = null; this.aClass3_Sub23Array1[local80.anInt3476] = null;
local80.unlink(); local80.unlink();

8
client/src/main/java/rt4/Mouse.java
View file

@ -97,6 +97,14 @@ public final class Mouse implements MouseListener, MouseMotionListener, FocusLis
return anInt2467; return anInt2467;
} }
@OriginalMember(owner = "client!dl", name = "a", descriptor = "(II)V")
public static void setIdleLoops(@OriginalArg(1) int arg0) {
@Pc(10) Mouse local10 = instance;
synchronized (instance) {
anInt2467 = arg0;
}
}
@OriginalMember(owner = "client!ug", name = "mouseMoved", descriptor = "(Ljava/awt/event/MouseEvent;)V") @OriginalMember(owner = "client!ug", name = "mouseMoved", descriptor = "(Ljava/awt/event/MouseEvent;)V")
@Override @Override
public final synchronized void mouseMoved(@OriginalArg(0) MouseEvent arg0) { public final synchronized void mouseMoved(@OriginalArg(0) MouseEvent arg0) {

2
client/src/main/java/rt4/MouseRecorder.java
View file

@ -11,6 +11,8 @@ public final class MouseRecorder implements Runnable {
public static MouseRecorder instance; public static MouseRecorder instance;
@OriginalMember(owner = "client!tm", name = "e", descriptor = "Z") @OriginalMember(owner = "client!tm", name = "e", descriptor = "Z")
public static boolean enabled = false; public static boolean enabled = false;
@OriginalMember(owner = "client!oe", name = "a", descriptor = "I")
public static int mouseRecorderPrevY = 0;
@OriginalMember(owner = "client!jd", name = "e", descriptor = "Z") @OriginalMember(owner = "client!jd", name = "e", descriptor = "Z")
public boolean running = true; public boolean running = true;

4
client/src/main/java/rt4/NpcList.java
View file

@ -5,4 +5,8 @@ import org.openrs2.deob.annotation.OriginalMember;
public class NpcList { public class NpcList {
@OriginalMember(owner = "client!nm", name = "S", descriptor = "[Lclient!km;") @OriginalMember(owner = "client!nm", name = "S", descriptor = "[Lclient!km;")
public static final Npc[] npcs = new Npc[32768]; public static final Npc[] npcs = new Npc[32768];
@OriginalMember(owner = "client!cj", name = "i", descriptor = "[I")
public static final int[] ids = new int[32768];
@OriginalMember(owner = "client!wd", name = "g", descriptor = "I")
public static int size = 0;
} }

4
client/src/main/java/rt4/ObjStack.java
View file

@ -12,7 +12,7 @@ public final class ObjStack extends Entity {
public int anInt5550; public int anInt5550;
@OriginalMember(owner = "client!uj", name = "D", descriptor = "I") @OriginalMember(owner = "client!uj", name = "D", descriptor = "I")
public int anInt5555; public int type;
@OriginalMember(owner = "client!uj", name = "z", descriptor = "I") @OriginalMember(owner = "client!uj", name = "z", descriptor = "I")
private int anInt5553 = -32768; private int anInt5553 = -32768;
@ -25,7 +25,7 @@ public final class ObjStack extends Entity {
@OriginalMember(owner = "client!uj", name = "a", descriptor = "(IIIIIIIIJILclient!ga;)V") @OriginalMember(owner = "client!uj", name = "a", descriptor = "(IIIIIIIIJILclient!ga;)V")
@Override @Override
public final void render(@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) long arg8, @OriginalArg(9) int arg9, @OriginalArg(10) ParticleSystem arg10) { public final void render(@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) long arg8, @OriginalArg(9) int arg9, @OriginalArg(10) ParticleSystem arg10) {
@Pc(16) Model local16 = ObjTypeList.get(this.anInt5555).getModel(-1, 0, null, this.anInt5550, 0); @Pc(16) Model local16 = ObjTypeList.get(this.type).getModel(-1, 0, null, this.anInt5550, 0);
if (local16 != null) { if (local16 != null) {
local16.render(arg0, arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8, arg9, arg10); local16.render(arg0, arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8, arg9, arg10);
this.anInt5553 = local16.getMaxY(); this.anInt5553 = local16.getMaxY();

4
client/src/main/java/rt4/ObjStackNode.java
View file

@ -8,10 +8,10 @@ import org.openrs2.deob.annotation.OriginalMember;
public final class ObjStackNode extends SecondaryNode { public final class ObjStackNode extends SecondaryNode {
@OriginalMember(owner = "client!pa", name = "T", descriptor = "Lclient!uj;") @OriginalMember(owner = "client!pa", name = "T", descriptor = "Lclient!uj;")
public final ObjStack aClass8_Sub7_1; public final ObjStack value;
@OriginalMember(owner = "client!pa", name = "<init>", descriptor = "(Lclient!uj;)V") @OriginalMember(owner = "client!pa", name = "<init>", descriptor = "(Lclient!uj;)V")
public ObjStackNode(@OriginalArg(0) ObjStack arg0) { public ObjStackNode(@OriginalArg(0) ObjStack arg0) {
this.aClass8_Sub7_1 = arg0; this.value = arg0;
} }
} }

4
client/src/main/java/rt4/OverheadChat.java
View file

@ -22,8 +22,8 @@ public class OverheadChat {
} }
} }
} }
for (local11 = 0; local11 < Static272.anInt5214; local11++) { for (local11 = 0; local11 < NpcList.size; local11++) {
@Pc(68) int local68 = Static33.anIntArray79[local11]; @Pc(68) int local68 = NpcList.ids[local11];
@Pc(72) Npc local72 = NpcList.npcs[local68]; @Pc(72) Npc local72 = NpcList.npcs[local68];
if (local72 != null && local72.chatLoops > 0) { if (local72 != null && local72.chatLoops > 0) {
local72.chatLoops--; local72.chatLoops--;

6
client/src/main/java/rt4/PathingEntity.java
View file

@ -10,7 +10,9 @@ public abstract class PathingEntity extends Entity {
@OriginalMember(owner = "client!ef", name = "a", descriptor = "[I") @OriginalMember(owner = "client!ef", name = "a", descriptor = "[I")
public static final int[] ANGLES = new int[] { 768, 1024, 1280, 512, 1536, 256, 0, 1792 }; public static final int[] ANGLES = new int[] { 768, 1024, 1280, 512, 1536, 256, 0, 1792 };
@OriginalMember(owner = "client!fe", name = "A", descriptor = "I") @OriginalMember(owner = "client!ac", name = "l", descriptor = "Lclient!ck;")
public static final BasType aClass20_1 = new BasType();
@OriginalMember(owner = "client!fe", name = "A", descriptor = "I")
public int spotAnimStart; public int spotAnimStart;
@OriginalMember(owner = "client!fe", name = "S", descriptor = "I") @OriginalMember(owner = "client!fe", name = "S", descriptor = "I")
@ -259,7 +261,7 @@ public abstract class PathingEntity extends Entity {
@OriginalMember(owner = "client!fe", name = "b", descriptor = "(Z)Lclient!ck;") @OriginalMember(owner = "client!fe", name = "b", descriptor = "(Z)Lclient!ck;")
public final BasType getBasType() { public final BasType getBasType() {
@Pc(7) int local7 = this.method2688(); @Pc(7) int local7 = this.method2688();
return local7 == -1 ? Static4.aClass20_1 : BasTypeList.get(local7); return local7 == -1 ? aClass20_1 : BasTypeList.get(local7);
} }
@OriginalMember(owner = "client!fe", name = "a", descriptor = "(B)Z") @OriginalMember(owner = "client!fe", name = "a", descriptor = "(B)Z")

16
client/src/main/java/rt4/Player.java
View file

@ -177,6 +177,22 @@ public final class Player extends PathingEntity {
return local14; return local14;
} }
@OriginalMember(owner = "client!um", name = "a", descriptor = "(Z)V")
public static void setTutorialIsland() {
inTutorialIsland = 0;
@Pc(17) int local17 = Static225.originX + (PlayerList.self.xFine >> 7);
@Pc(25) int local25 = (PlayerList.self.zFine >> 7) + Static142.originZ;
if (local17 >= 3053 && local17 <= 3156 && local25 >= 3056 && local25 <= 3136) {
inTutorialIsland = 1;
}
if (local17 >= 3072 && local17 <= 3118 && local25 >= 9492 && local25 <= 9535) {
inTutorialIsland = 1;
}
if (inTutorialIsland == 1 && local17 >= 3139 && local17 <= 3199 && local25 >= 3008 && local25 <= 3062) {
inTutorialIsland = 0;
}
}
@OriginalMember(owner = "client!e", name = "c", descriptor = "(B)I") @OriginalMember(owner = "client!e", name = "c", descriptor = "(B)I")
@Override @Override
public final int getSize() { public final int getSize() {

176
client/src/main/java/rt4/Protocol.java
View file

@ -19,6 +19,12 @@ public class Protocol {
public static final int[] extendedIds = new int[2048]; public static final int[] extendedIds = new int[2048];
@OriginalMember(owner = "client!ta", name = "z", descriptor = "[I") @OriginalMember(owner = "client!ta", name = "z", descriptor = "[I")
public static final int[] PACKET_LENGTHS = new int[] { -1, 0, 8, 0, 2, 0, 0, 0, 0, 12, 0, 1, 0, 3, 7, 0, 15, 6, 0, 0, 4, 7, -2, -1, 2, 0, 2, 8, 0, 0, 0, 0, -2, 5, 0, 0, 8, 3, 6, 0, 0, 0, -1, 0, -1, 0, 0, 6, -2, 0, 12, 0, 0, 0, -1, -2, 10, 0, 0, 0, 3, 0, -1, 0, 0, 5, 6, 0, 0, 8, -1, -1, 0, 8, 0, 0, 0, 0, 0, 0, 0, -1, 0, 0, 6, 2, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 5, 0, 0, 0, 0, 5, 0, 0, -2, 0, 0, 0, 0, 0, 12, 2, 0, -2, -2, 20, 0, 0, 10, 0, 15, 0, -1, 0, 8, -2, 0, 0, 0, 8, 0, 12, 0, 0, 7, 0, 0, 0, 0, 0, -1, -1, 0, 4, 5, 0, 0, 0, 6, 0, 0, 0, 0, 8, 9, 0, 0, 0, 2, -1, 0, -2, 0, 4, 14, 0, 0, 0, 24, 0, -2, 5, 0, 0, 0, 10, 0, 0, 4, 0, 0, 0, 0, 0, 0, 0, 6, 0, 0, 0, 2, 1, 0, 0, 2, -1, 1, 0, 0, 0, 0, 14, 0, 0, 0, 0, 10, 5, 0, 0, 0, 0, 0, -2, 0, 0, 9, 0, 0, 8, 0, 0, 0, 0, -2, 6, 0, 0, 0, -2, 0, 3, 0, 1, 7, 0, 0, 0, 0, 3, 0, 0, 0, 0, 0, 0, -1, 0, 0, 0, 0, 0, 3, 0, 0 }; public static final int[] PACKET_LENGTHS = new int[] { -1, 0, 8, 0, 2, 0, 0, 0, 0, 12, 0, 1, 0, 3, 7, 0, 15, 6, 0, 0, 4, 7, -2, -1, 2, 0, 2, 8, 0, 0, 0, 0, -2, 5, 0, 0, 8, 3, 6, 0, 0, 0, -1, 0, -1, 0, 0, 6, -2, 0, 12, 0, 0, 0, -1, -2, 10, 0, 0, 0, 3, 0, -1, 0, 0, 5, 6, 0, 0, 8, -1, -1, 0, 8, 0, 0, 0, 0, 0, 0, 0, -1, 0, 0, 6, 2, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 5, 0, 0, 0, 0, 5, 0, 0, -2, 0, 0, 0, 0, 0, 12, 2, 0, -2, -2, 20, 0, 0, 10, 0, 15, 0, -1, 0, 8, -2, 0, 0, 0, 8, 0, 12, 0, 0, 7, 0, 0, 0, 0, 0, -1, -1, 0, 4, 5, 0, 0, 0, 6, 0, 0, 0, 0, 8, 9, 0, 0, 0, 2, -1, 0, -2, 0, 4, 14, 0, 0, 0, 24, 0, -2, 5, 0, 0, 0, 10, 0, 0, 4, 0, 0, 0, 0, 0, 0, 0, 6, 0, 0, 0, 2, 1, 0, 0, 2, -1, 1, 0, 0, 0, 0, 14, 0, 0, 0, 0, 10, 5, 0, 0, 0, 0, 0, -2, 0, 0, 9, 0, 0, 8, 0, 0, 0, 0, -2, 6, 0, 0, 0, -2, 0, 3, 0, 1, 7, 0, 0, 0, 0, 3, 0, 0, 0, 0, 0, 0, -1, 0, 0, 0, 0, 0, 3, 0, 0 };
@OriginalMember(owner = "client!tl", name = "f", descriptor = "Lclient!na;")
public static final JagString ASSIST = JagString.parse(":assist:");
@OriginalMember(owner = "client!pl", name = "f", descriptor = "Lclient!na;")
public static final JagString TRADEREQ = JagString.parse(":tradereq:");
@OriginalMember(owner = "client!lb", name = "s", descriptor = "Lclient!na;")
public static final JagString CLAN = JagString.parse(":clan:");
@OriginalMember(owner = "client!jk", name = "B", descriptor = "Lclient!ma;") @OriginalMember(owner = "client!jk", name = "B", descriptor = "Lclient!ma;")
public static BufferedSocket socket; public static BufferedSocket socket;
@OriginalMember(owner = "client!fl", name = "C", descriptor = "Lsignlink!im;") @OriginalMember(owner = "client!fl", name = "C", descriptor = "Lsignlink!im;")
@ -66,11 +72,11 @@ public class Protocol {
if (local19 >= 0 && local27 >= 0 && local19 < 104 && local27 < 104) { if (local19 >= 0 && local27 >= 0 && local19 < 104 && local27 < 104) {
@Pc(122) ObjStack local122 = new ObjStack(); @Pc(122) ObjStack local122 = new ObjStack();
local122.anInt5550 = local31; local122.anInt5550 = local31;
local122.anInt5555 = local15; local122.type = local15;
if (Static159.aClass69ArrayArrayArray1[Player.level][local19][local27] == null) { if (Static159.objStacks[Player.level][local19][local27] == null) {
Static159.aClass69ArrayArrayArray1[Player.level][local19][local27] = new LinkedList(); Static159.objStacks[Player.level][local19][local27] = new LinkedList();
} }
Static159.aClass69ArrayArrayArray1[Player.level][local19][local27].addTail(new ObjStackNode(local122)); Static159.objStacks[Player.level][local19][local27].addTail(new ObjStackNode(local122));
Static220.spawnGroundObject(local27, local19); Static220.spawnGroundObject(local27, local19);
} }
} else if (opcode == ServerProt.LOCATION_PACKET_121) { } else if (opcode == ServerProt.LOCATION_PACKET_121) {
@ -163,11 +169,11 @@ public class Protocol {
int local31 = inboundBuffer.g2(); int local31 = inboundBuffer.g2();
int local39 = inboundBuffer.g2(); int local39 = inboundBuffer.g2();
if (local23 >= 0 && local19 >= 0 && local23 < 104 && local19 < 104) { if (local23 >= 0 && local19 >= 0 && local23 < 104 && local19 < 104) {
@Pc(710) LinkedList local710 = Static159.aClass69ArrayArrayArray1[Player.level][local23][local19]; @Pc(710) LinkedList local710 = Static159.objStacks[Player.level][local23][local19];
if (local710 != null) { if (local710 != null) {
for (@Pc(718) ObjStackNode local718 = (ObjStackNode) local710.head(); local718 != null; local718 = (ObjStackNode) local710.next()) { for (@Pc(718) ObjStackNode local718 = (ObjStackNode) local710.head(); local718 != null; local718 = (ObjStackNode) local710.next()) {
@Pc(723) ObjStack local723 = local718.aClass8_Sub7_1; @Pc(723) ObjStack local723 = local718.value;
if ((local27 & 0x7FFF) == local723.anInt5555 && local31 == local723.anInt5550) { if ((local27 & 0x7FFF) == local723.type && local31 == local723.anInt5550) {
local723.anInt5550 = local39; local723.anInt5550 = local39;
break; break;
} }
@ -185,11 +191,11 @@ public class Protocol {
if (local19 >= 0 && local27 >= 0 && local19 < 104 && local27 < 104 && PlayerList.selfId != local15) { if (local19 >= 0 && local27 >= 0 && local19 < 104 && local27 < 104 && PlayerList.selfId != local15) {
@Pc(812) ObjStack local812 = new ObjStack(); @Pc(812) ObjStack local812 = new ObjStack();
local812.anInt5550 = local31; local812.anInt5550 = local31;
local812.anInt5555 = local39; local812.type = local39;
if (Static159.aClass69ArrayArrayArray1[Player.level][local19][local27] == null) { if (Static159.objStacks[Player.level][local19][local27] == null) {
Static159.aClass69ArrayArrayArray1[Player.level][local19][local27] = new LinkedList(); Static159.objStacks[Player.level][local19][local27] = new LinkedList();
} }
Static159.aClass69ArrayArrayArray1[Player.level][local19][local27].addTail(new ObjStackNode(local812)); Static159.objStacks[Player.level][local19][local27].addTail(new ObjStackNode(local812));
Static220.spawnGroundObject(local27, local19); Static220.spawnGroundObject(local27, local19);
} }
} else if (opcode == ServerProt.LOCATION_PACKET_16) { } else if (opcode == ServerProt.LOCATION_PACKET_16) {
@ -309,16 +315,16 @@ public class Protocol {
int local23 = (local15 >> 4 & 0x7) + Static115.currentChunkX; int local23 = (local15 >> 4 & 0x7) + Static115.currentChunkX;
int local27 = inboundBuffer.g2(); int local27 = inboundBuffer.g2();
if (local23 >= 0 && local19 >= 0 && local23 < 104 && local19 < 104) { if (local23 >= 0 && local19 >= 0 && local23 < 104 && local19 < 104) {
@Pc(1565) LinkedList local1565 = Static159.aClass69ArrayArrayArray1[Player.level][local23][local19]; @Pc(1565) LinkedList local1565 = Static159.objStacks[Player.level][local23][local19];
if (local1565 != null) { if (local1565 != null) {
for (@Pc(1572) ObjStackNode local1572 = (ObjStackNode) local1565.head(); local1572 != null; local1572 = (ObjStackNode) local1565.next()) { for (@Pc(1572) ObjStackNode local1572 = (ObjStackNode) local1565.head(); local1572 != null; local1572 = (ObjStackNode) local1565.next()) {
if (local1572.aClass8_Sub7_1.anInt5555 == (local27 & 0x7FFF)) { if (local1572.value.type == (local27 & 0x7FFF)) {
local1572.unlink(); local1572.unlink();
break; break;
} }
} }
if (local1565.head() == null) { if (local1565.head() == null) {
Static159.aClass69ArrayArrayArray1[Player.level][local23][local19] = null; Static159.objStacks[Player.level][local23][local19] = null;
} }
Static220.spawnGroundObject(local19, local23); Static220.spawnGroundObject(local19, local23);
} }
@ -381,10 +387,10 @@ public class Protocol {
Static35.underWaterLocationsMapFileIds[local20] = -1; Static35.underWaterLocationsMapFileIds[local20] = -1;
} else { } else {
Static238.regionBitPacked[local20] = local169; Static238.regionBitPacked[local20] = local169;
Static36.mapFileIds[local20] = client.js5Archive5.getGroupId(JagString.concatenate(new JagString[] { Static103.aClass100_558, Static123.parseInt(local138), Static86.aClass100_488, Static123.parseInt(local151) })); Static36.mapFileIds[local20] = client.js5Archive5.getGroupId(JagString.concatenate(new JagString[] { Static103.aClass100_558, JagString.parseInt(local138), Static86.aClass100_488, JagString.parseInt(local151) }));
Static172.locationsMapFileIds[local20] = client.js5Archive5.getGroupId(JagString.concatenate(new JagString[] { Static270.aClass100_1090, Static123.parseInt(local138), Static86.aClass100_488, Static123.parseInt(local151) })); Static172.locationsMapFileIds[local20] = client.js5Archive5.getGroupId(JagString.concatenate(new JagString[] { Static270.aClass100_1090, JagString.parseInt(local138), Static86.aClass100_488, JagString.parseInt(local151) }));
Static99.underWaterMapFileIds[local20] = client.js5Archive5.getGroupId(JagString.concatenate(new JagString[] { Static165.aClass100_772, Static123.parseInt(local138), Static86.aClass100_488, Static123.parseInt(local151) })); Static99.underWaterMapFileIds[local20] = client.js5Archive5.getGroupId(JagString.concatenate(new JagString[] { Static165.aClass100_772, JagString.parseInt(local138), Static86.aClass100_488, JagString.parseInt(local151) }));
Static35.underWaterLocationsMapFileIds[local20] = client.js5Archive5.getGroupId(JagString.concatenate(new JagString[] { Static278.aClass100_1103, Static123.parseInt(local138), Static86.aClass100_488, Static123.parseInt(local151) })); Static35.underWaterLocationsMapFileIds[local20] = client.js5Archive5.getGroupId(JagString.concatenate(new JagString[] { Static278.aClass100_1103, JagString.parseInt(local138), Static86.aClass100_488, JagString.parseInt(local151) }));
} }
local20++; local20++;
} }
@ -450,10 +456,10 @@ public class Protocol {
Static238.regionBitPacked[local60] = local571; Static238.regionBitPacked[local60] = local571;
@Pc(609) int local609 = local571 & 0xFF; @Pc(609) int local609 = local571 & 0xFF;
local573 = local571 >> 8 & 0xFF; local573 = local571 >> 8 & 0xFF;
Static36.mapFileIds[local60] = client.js5Archive5.getGroupId(JagString.concatenate(new JagString[] { Static103.aClass100_558, Static123.parseInt(local573), Static86.aClass100_488, Static123.parseInt(local609) })); Static36.mapFileIds[local60] = client.js5Archive5.getGroupId(JagString.concatenate(new JagString[] { Static103.aClass100_558, JagString.parseInt(local573), Static86.aClass100_488, JagString.parseInt(local609) }));
Static172.locationsMapFileIds[local60] = client.js5Archive5.getGroupId(JagString.concatenate(new JagString[] { Static270.aClass100_1090, Static123.parseInt(local573), Static86.aClass100_488, Static123.parseInt(local609) })); Static172.locationsMapFileIds[local60] = client.js5Archive5.getGroupId(JagString.concatenate(new JagString[] { Static270.aClass100_1090, JagString.parseInt(local573), Static86.aClass100_488, JagString.parseInt(local609) }));
Static99.underWaterMapFileIds[local60] = client.js5Archive5.getGroupId(JagString.concatenate(new JagString[] { Static165.aClass100_772, Static123.parseInt(local573), Static86.aClass100_488, Static123.parseInt(local609) })); Static99.underWaterMapFileIds[local60] = client.js5Archive5.getGroupId(JagString.concatenate(new JagString[] { Static165.aClass100_772, JagString.parseInt(local573), Static86.aClass100_488, JagString.parseInt(local609) }));
Static35.underWaterLocationsMapFileIds[local60] = client.js5Archive5.getGroupId(JagString.concatenate(new JagString[] { Static278.aClass100_1103, Static123.parseInt(local573), Static86.aClass100_488, Static123.parseInt(local609) })); Static35.underWaterLocationsMapFileIds[local60] = client.js5Archive5.getGroupId(JagString.concatenate(new JagString[] { Static278.aClass100_1103, JagString.parseInt(local573), Static86.aClass100_488, JagString.parseInt(local609) }));
local60++; local60++;
} }
} }
@ -895,7 +901,7 @@ public class Protocol {
return true; return true;
} else if (opcode == ServerProt.MESSAGE_GAME) { } else if (opcode == ServerProt.MESSAGE_GAME) {
@Pc(245) JagString message = inboundBuffer.gjstr(); @Pc(245) JagString message = inboundBuffer.gjstr();
if (message.endsWith(Static196.TRADEREQ)) { if (message.endsWith(TRADEREQ)) {
JagString name = message.substring(message.indexOf(Static264.COLON), 0); JagString name = message.substring(message.indexOf(Static264.COLON), 0);
long name37 = name.encode37(); long name37 = name.encode37();
boolean ignored = false; boolean ignored = false;
@ -935,16 +941,16 @@ public class Protocol {
if (!ignored && Player.inTutorialIsland == 0) { if (!ignored && Player.inTutorialIsland == 0) {
Chat.add(name, 10, JagString.EMPTY); Chat.add(name, 10, JagString.EMPTY);
} }
} else if (message.endsWith(Static141.CLAN)) { } else if (message.endsWith(CLAN)) {
JagString name = message.substring(message.indexOf(Static141.CLAN), 0); JagString name = message.substring(message.indexOf(CLAN), 0);
Chat.add(JagString.EMPTY, 11, name); Chat.add(JagString.EMPTY, 11, name);
} else if (message.endsWith(Static138.TRADE)) { } else if (message.endsWith(Static138.TRADE)) {
JagString name = message.substring(message.indexOf(Static138.TRADE), 0); JagString name = message.substring(message.indexOf(Static138.TRADE), 0);
if (Player.inTutorialIsland == 0) { if (Player.inTutorialIsland == 0) {
Chat.add(JagString.EMPTY, 12, name); Chat.add(JagString.EMPTY, 12, name);
} }
} else if (message.endsWith(Static244.ASSIST)) { } else if (message.endsWith(ASSIST)) {
JagString name = message.substring(message.indexOf(Static244.ASSIST), 0); JagString name = message.substring(message.indexOf(ASSIST), 0);
if (Player.inTutorialIsland == 0) { if (Player.inTutorialIsland == 0) {
Chat.add(JagString.EMPTY, 13, name); Chat.add(JagString.EMPTY, 13, name);
} }
@ -1032,7 +1038,7 @@ public class Protocol {
int pos = inboundBuffer.g2le(); int pos = inboundBuffer.g2le();
int tracknum = inboundBuffer.g2(); int tracknum = inboundBuffer.g2();
setVerifyId(tracknum); setVerifyId(tracknum);
Static229.method3938(pos, id); DelayedStateChange.method3938(pos, id);
opcode = -1; opcode = -1;
return true; return true;
} else if (opcode == ServerProt.CLAN_QUICK_CHAT) { } else if (opcode == ServerProt.CLAN_QUICK_CHAT) {
@ -1198,7 +1204,7 @@ public class Protocol {
int tracknum = inboundBuffer.g2leadd(); int tracknum = inboundBuffer.g2leadd();
setVerifyId(tracknum); setVerifyId(tracknum);
if (reset == 2) { if (reset == 2) {
Static5.resetWorldMap(); WorldMap.reset();
} }
InterfaceList.topLevelInterface = parent; InterfaceList.topLevelInterface = parent;
Static81.method1753(parent); Static81.method1753(parent);
@ -1229,7 +1235,7 @@ public class Protocol {
opcode = -1; opcode = -1;
return true; return true;
} else if (opcode == ServerProt.RESET_CLIENT_VARCACHE) { } else if (opcode == ServerProt.RESET_CLIENT_VARCACHE) {
Static8.resetTransientVars(); VarpDomain.reset();
InterfaceList.redrawActiveInterfaces(); InterfaceList.redrawActiveInterfaces();
VarpDomain.updatedVarpsWriterIndex += 32; VarpDomain.updatedVarpsWriterIndex += 32;
opcode = -1; opcode = -1;
@ -1438,8 +1444,8 @@ public class Protocol {
Static180.currentChunkZ = inboundBuffer.g1neg(); Static180.currentChunkZ = inboundBuffer.g1neg();
for (int x = Static115.currentChunkX; x < Static115.currentChunkX + 8; x++) { for (int x = Static115.currentChunkX; x < Static115.currentChunkX + 8; x++) {
for (int z = Static180.currentChunkZ; z < Static180.currentChunkZ + 8; z++) { for (int z = Static180.currentChunkZ; z < Static180.currentChunkZ + 8; z++) {
if (Static159.aClass69ArrayArrayArray1[Player.level][x][z] != null) { if (Static159.objStacks[Player.level][x][z] != null) {
Static159.aClass69ArrayArrayArray1[Player.level][x][z] = null; Static159.objStacks[Player.level][x][z] = null;
Static220.spawnGroundObject(z, x); Static220.spawnGroundObject(z, x);
} }
} }
@ -1473,7 +1479,7 @@ public class Protocol {
opcode = -1; opcode = -1;
return true; return true;
} else if (opcode == ServerProt.SET_MINIMAP_STATE) { } else if (opcode == ServerProt.SET_MINIMAP_STATE) {
Static270.minimapState = inboundBuffer.g1(); MiniMap.state = inboundBuffer.g1();
opcode = -1; opcode = -1;
return true; return true;
} else if (opcode == ServerProt.TELEPORT_LOCAL_PLAYER) { } else if (opcode == ServerProt.TELEPORT_LOCAL_PLAYER) {
@ -1512,7 +1518,7 @@ public class Protocol {
FriendsList.worldNames[i] = worldName; FriendsList.worldNames[i] = worldName;
FriendsList.ranks[i] = x; FriendsList.ranks[i] = x;
name = null; name = null;
Static3.aBooleanArray135[i] = ignored; FriendsList.aBooleanArray135[i] = ignored;
break; break;
} }
} }
@ -1522,7 +1528,7 @@ public class Protocol {
FriendsList.worlds[FriendsList.size] = worldId; FriendsList.worlds[FriendsList.size] = worldId;
FriendsList.worldNames[FriendsList.size] = worldName; FriendsList.worldNames[FriendsList.size] = worldName;
FriendsList.ranks[FriendsList.size] = x; FriendsList.ranks[FriendsList.size] = x;
Static3.aBooleanArray135[FriendsList.size] = ignored; FriendsList.aBooleanArray135[FriendsList.size] = ignored;
FriendsList.size++; FriendsList.size++;
} }
FriendsList.transmitAt = InterfaceList.transmitTimer; FriendsList.transmitAt = InterfaceList.transmitTimer;
@ -1548,9 +1554,9 @@ public class Protocol {
@Pc(3074) int local3074 = FriendsList.ranks[i]; @Pc(3074) int local3074 = FriendsList.ranks[i];
FriendsList.ranks[i] = FriendsList.ranks[i + 1]; FriendsList.ranks[i] = FriendsList.ranks[i + 1];
FriendsList.ranks[i + 1] = local3074; FriendsList.ranks[i + 1] = local3074;
@Pc(3092) boolean local3092 = Static3.aBooleanArray135[i]; @Pc(3092) boolean local3092 = FriendsList.aBooleanArray135[i];
Static3.aBooleanArray135[i] = Static3.aBooleanArray135[i + 1]; FriendsList.aBooleanArray135[i] = FriendsList.aBooleanArray135[i + 1];
Static3.aBooleanArray135[i + 1] = local3092; FriendsList.aBooleanArray135[i + 1] = local3092;
} }
} }
if (sorting) { if (sorting) {
@ -1690,7 +1696,7 @@ public class Protocol {
InterfaceList.miscTransmitAt = InterfaceList.transmitTimer; InterfaceList.miscTransmitAt = InterfaceList.transmitTimer;
return true; return true;
} else if (opcode == ServerProt.REFLECTION_CHEAT_CHECK) { } else if (opcode == ServerProt.REFLECTION_CHEAT_CHECK) {
Static202.method3654(GameShell.signLink, inboundBuffer, length); ReflectionCheck.method3654(GameShell.signLink, inboundBuffer, length);
opcode = -1; opcode = -1;
return true; return true;
} else if (opcode == ServerProt.CLIENT_SETVARC_SMALL) { } else if (opcode == ServerProt.CLIENT_SETVARC_SMALL) {
@ -1747,7 +1753,7 @@ public class Protocol {
} }
@Pc(3848) byte[] data = new byte[length]; @Pc(3848) byte[] data = new byte[length];
inboundBuffer.gBytesIsaac(data, length); inboundBuffer.gBytesIsaac(data, length);
JagString url = Static10.decodeString(data, length, 0); JagString url = JagString.decodeString(data, length, 0);
if (GameShell.frame == null && (SignLink.anInt5928 == 3 || !SignLink.osName.startsWith("win") || client.haveIe6)) { if (GameShell.frame == null && (SignLink.anInt5928 == 3 || !SignLink.osName.startsWith("win") || client.haveIe6)) {
Static169.openUrl(url, true); Static169.openUrl(url, true);
} else { } else {
@ -1847,7 +1853,7 @@ public class Protocol {
IgnoreList.size = length / 8; IgnoreList.size = length / 8;
for (int i = 0; i < IgnoreList.size; i++) { for (int i = 0; i < IgnoreList.size; i++) {
IgnoreList.encodedUsernames[i] = inboundBuffer.g8(); IgnoreList.encodedUsernames[i] = inboundBuffer.g8();
Static193.aClass100Array134[i] = Base37.decode37(IgnoreList.encodedUsernames[i]); IgnoreList.aClass100Array134[i] = Base37.decode37(IgnoreList.encodedUsernames[i]);
} }
FriendsList.transmitAt = InterfaceList.transmitTimer; FriendsList.transmitAt = InterfaceList.transmitTimer;
opcode = -1; opcode = -1;
@ -2199,10 +2205,10 @@ public class Protocol {
@Pc(5603) Component component = InterfaceList.getComponent(id); @Pc(5603) Component component = InterfaceList.getComponent(id);
@Pc(5615) ObjType objType; @Pc(5615) ObjType objType;
if (component.usingScripts) { if (component.usingScripts) {
Static209.method3707(id, slot, itemId); DelayedStateChange.method3707(id, slot, itemId);
objType = ObjTypeList.get(itemId); objType = ObjTypeList.get(itemId);
DelayedStateChange.updateView(objType.zoom2d, id, objType.yAngle2d, objType.xAngle2d); DelayedStateChange.updateView(objType.zoom2d, id, objType.yAngle2d, objType.xAngle2d);
Static145.method2745(id, objType.zAngle2d, objType.yOffset2d, objType.xOffset2d); DelayedStateChange.method2745(id, objType.zAngle2d, objType.yOffset2d, objType.xOffset2d);
} else if (itemId == -1) { } else if (itemId == -1) {
component.modelType = 0; component.modelType = 0;
opcode = -1; opcode = -1;
@ -2365,11 +2371,11 @@ public class Protocol {
y = -1; y = -1;
x = -1; x = -1;
} }
if (Static264.mouseRecorderPrevX != x || y != Static179.mouseRecorderPrevY) { if (Static264.mouseRecorderPrevX != x || y != MouseRecorder.mouseRecorderPrevY) {
dx = x - Static264.mouseRecorderPrevX; dx = x - Static264.mouseRecorderPrevX;
Static264.mouseRecorderPrevX = x; Static264.mouseRecorderPrevX = x;
dy = y - Static179.mouseRecorderPrevY; dy = y - MouseRecorder.mouseRecorderPrevY;
Static179.mouseRecorderPrevY = y; MouseRecorder.mouseRecorderPrevY = y;
if (anInt4762 < 8 && dx >= -32 && dx <= 31 && dy >= -32 && dy <= 31) { if (anInt4762 < 8 && dx >= -32 && dx <= 31 && dy >= -32 && dy <= 31) {
dy += 32; dy += 32;
dx += 32; dx += 32;
@ -2493,7 +2499,7 @@ public class Protocol {
Static109.method2274(); Static109.method2274();
OverheadChat.loop(); OverheadChat.loop();
if (WorldMap.component != null) { if (WorldMap.component != null) {
Static12.method447(); WorldMap.method447();
} }
// VarpDomain // VarpDomain
for (i = Static38.poll(true); i != -1; i = Static38.poll(false)) { for (i = Static38.poll(true); i != -1; i = Static38.poll(false)) {
@ -2502,7 +2508,7 @@ public class Protocol {
} }
@Pc(782) int modelId; @Pc(782) int modelId;
// DelayedStateChange // DelayedStateChange
for (@Pc(709) DelayedStateChange change = Static127.poll(); change != null; change = Static127.poll()) { for (@Pc(709) DelayedStateChange change = DelayedStateChange.poll(); change != null; change = DelayedStateChange.poll()) {
type = change.getType(); type = change.getType();
i = change.getId(); i = change.getId();
if (type == 1) { if (type == 1) {
@ -2622,11 +2628,11 @@ public class Protocol {
} }
} }
Static178.anInt4247++; Static178.anInt4247++;
if (Static257.aClass13_7 != null) { if (MiniMenu.aClass13_7 != null) {
Static72.anInt2043++; MiniMenu.anInt2043++;
if (Static72.anInt2043 >= 15) { if (MiniMenu.anInt2043 >= 15) {
InterfaceList.redraw(Static257.aClass13_7); InterfaceList.redraw(MiniMenu.aClass13_7);
Static257.aClass13_7 = null; MiniMenu.aClass13_7 = null;
} }
} }
@Pc(1361) Component local1361; @Pc(1361) Component local1361;
@ -2681,7 +2687,7 @@ public class Protocol {
Static59.method1372(); Static59.method1372();
} }
Mouse.clickButton = 0; Mouse.clickButton = 0;
Static72.anInt2043 = 10; MiniMenu.anInt2043 = 10;
Static118.aClass13_15 = null; Static118.aClass13_15 = null;
} }
} }
@ -2735,18 +2741,18 @@ public class Protocol {
Cheat.teleport(PlayerList.self.movementQueueX[0] + Static225.originX, PlayerList.self.movementQueueZ[0] + Static142.originZ, y); Cheat.teleport(PlayerList.self.movementQueueX[0] + Static225.originX, PlayerList.self.movementQueueZ[0] + Static142.originZ, y);
} }
if (LoginManager.staffModLevel > 0 && Keyboard.pressedKeys[Keyboard.KEY_CTRL] && Keyboard.pressedKeys[Keyboard.KEY_SHIFT]) { if (LoginManager.staffModLevel > 0 && Keyboard.pressedKeys[Keyboard.KEY_CTRL] && Keyboard.pressedKeys[Keyboard.KEY_SHIFT]) {
if (Static56.anInt1742 != -1) { if (MiniMenu.anInt1742 != -1) {
Cheat.teleport(Static225.originX + Static56.anInt1742, Static142.originZ - -Static116.anInt2954, Player.level); Cheat.teleport(Static225.originX + MiniMenu.anInt1742, Static142.originZ - -MiniMenu.anInt2954, Player.level);
} }
Static187.anInt4422 = 0; Static187.anInt4422 = 0;
Static125.anInt3096 = 0; Static125.anInt3096 = 0;
} else if (Static125.anInt3096 == 2) { } else if (Static125.anInt3096 == 2) {
if (Static56.anInt1742 != -1) { if (MiniMenu.anInt1742 != -1) {
outboundBuffer.p1isaac(131); outboundBuffer.p1isaac(131);
outboundBuffer.p4me(Static98.anInt2512); outboundBuffer.p4me(MiniMenu.anInt2512);
outboundBuffer.p2add(Static225.originX + Static56.anInt1742); outboundBuffer.p2add(Static225.originX + MiniMenu.anInt1742);
outboundBuffer.p2leadd(Static15.anInt506); outboundBuffer.p2leadd(MiniMenu.anInt506);
outboundBuffer.p2add(Static116.anInt2954 + Static142.originZ); outboundBuffer.p2add(MiniMenu.anInt2954 + Static142.originZ);
Cross.type = 1; Cross.type = 1;
Cross.milliseconds = 0; Cross.milliseconds = 0;
Cross.y = Mouse.clickY; Cross.y = Mouse.clickY;
@ -2754,18 +2760,18 @@ public class Protocol {
} }
Static125.anInt3096 = 0; Static125.anInt3096 = 0;
} else if (Static187.anInt4422 == 2) { } else if (Static187.anInt4422 == 2) {
if (Static56.anInt1742 != -1) { if (MiniMenu.anInt1742 != -1) {
outboundBuffer.p1isaac(179); outboundBuffer.p1isaac(179);
outboundBuffer.p2(Static142.originZ + Static116.anInt2954); outboundBuffer.p2(Static142.originZ + MiniMenu.anInt2954);
outboundBuffer.p2(Static56.anInt1742 + Static225.originX); outboundBuffer.p2(MiniMenu.anInt1742 + Static225.originX);
Cross.milliseconds = 0; Cross.milliseconds = 0;
Cross.type = 1; Cross.type = 1;
Cross.x = Mouse.clickX; Cross.x = Mouse.clickX;
Cross.y = Mouse.clickY; Cross.y = Mouse.clickY;
} }
Static187.anInt4422 = 0; Static187.anInt4422 = 0;
} else if (Static56.anInt1742 != -1 && Static125.anInt3096 == 0 && Static187.anInt4422 == 0) { } else if (MiniMenu.anInt1742 != -1 && Static125.anInt3096 == 0 && Static187.anInt4422 == 0) {
@Pc(1871) boolean local1871 = PathFinder.findPath(PlayerList.self.movementQueueZ[0], 0, 0, true, 0, Static56.anInt1742, 0, 0, 0, Static116.anInt2954, PlayerList.self.movementQueueX[0]); @Pc(1871) boolean local1871 = PathFinder.findPath(PlayerList.self.movementQueueZ[0], 0, 0, true, 0, MiniMenu.anInt1742, 0, 0, 0, MiniMenu.anInt2954, PlayerList.self.movementQueueX[0]);
if (local1871) { if (local1871) {
Cross.y = Mouse.clickY; Cross.y = Mouse.clickY;
Cross.milliseconds = 0; Cross.milliseconds = 0;
@ -2773,7 +2779,7 @@ public class Protocol {
Cross.type = 1; Cross.type = 1;
} }
} }
Static56.anInt1742 = -1; MiniMenu.anInt1742 = -1;
Static7.method843(); Static7.method843();
if (Static180.aClass13_22 != local1361) { if (Static180.aClass13_22 != local1361) {
if (local1361 != null) { if (local1361 != null) {
@ -2815,7 +2821,7 @@ public class Protocol {
x = Keyboard.getIdleLoops(); x = Keyboard.getIdleLoops();
if (y > 15000 && x > 15000) { if (y > 15000 && x > 15000) {
Static267.anInt5775 = 250; Static267.anInt5775 = 250;
Static48.setIdleLoops(14500); Mouse.setIdleLoops(14500);
outboundBuffer.p1isaac(245); outboundBuffer.p1isaac(245);
} }
if (Static33.openUrlRequest != null && Static33.openUrlRequest.status == 1) { if (Static33.openUrlRequest != null && Static33.openUrlRequest.status == 1) {
@ -2849,7 +2855,7 @@ public class Protocol {
Static59.anInt1814 += Static263.anInt5755; Static59.anInt1814 += Static263.anInt5755;
} }
if ((modelId & 0x2) == 2) { if ((modelId & 0x2) == 2) {
Static273.anInt4130 += Static179.anInt4262; MiniMap.anInt4130 += Static179.anInt4262;
} }
} }
if (Static132.anInt3291 < -50) { if (Static132.anInt3291 < -50) {
@ -2858,7 +2864,7 @@ public class Protocol {
if (Static59.anInt1814 < -60) { if (Static59.anInt1814 < -60) {
Static263.anInt5755 = 2; Static263.anInt5755 = 2;
} }
if (Static273.anInt4130 < -20) { if (MiniMap.anInt4130 < -20) {
Static179.anInt4262 = 1; Static179.anInt4262 = 1;
} }
if (Static206.anInt4774 < -55) { if (Static206.anInt4774 < -55) {
@ -2876,7 +2882,7 @@ public class Protocol {
if (Static230.anInt5161 > 40) { if (Static230.anInt5161 > 40) {
Static220.anInt4941 = -1; Static220.anInt4941 = -1;
} }
if (Static273.anInt4130 > 10) { if (MiniMap.anInt4130 > 10) {
Static179.anInt4262 = -1; Static179.anInt4262 = -1;
} }
if (Static59.anInt1814 > 60) { if (Static59.anInt1814 > 60) {
@ -3055,9 +3061,9 @@ public class Protocol {
if (length != inboundBuffer.offset) { if (length != inboundBuffer.offset) {
throw new RuntimeException("gnp1 pos:" + inboundBuffer.offset + " psize:" + length); throw new RuntimeException("gnp1 pos:" + inboundBuffer.offset + " psize:" + length);
} }
for (local19 = 0; local19 < Static272.anInt5214; local19++) { for (local19 = 0; local19 < NpcList.size; local19++) {
if (NpcList.npcs[Static33.anIntArray79[local19]] == null) { if (NpcList.npcs[NpcList.ids[local19]] == null) {
throw new RuntimeException("gnp2 pos:" + local19 + " size:" + Static272.anInt5214); throw new RuntimeException("gnp2 pos:" + local19 + " size:" + NpcList.size);
} }
} }
} }
@ -3067,33 +3073,33 @@ public class Protocol {
inboundBuffer.accessBits(); inboundBuffer.accessBits();
@Pc(13) int local13 = inboundBuffer.gBits(8); @Pc(13) int local13 = inboundBuffer.gBits(8);
@Pc(22) int local22; @Pc(22) int local22;
if (Static272.anInt5214 > local13) { if (NpcList.size > local13) {
for (local22 = local13; local22 < Static272.anInt5214; local22++) { for (local22 = local13; local22 < NpcList.size; local22++) {
removedIds[removedCount++] = Static33.anIntArray79[local22]; removedIds[removedCount++] = NpcList.ids[local22];
} }
} }
if (Static272.anInt5214 < local13) { if (NpcList.size < local13) {
throw new RuntimeException("gnpov1"); throw new RuntimeException("gnpov1");
} }
Static272.anInt5214 = 0; NpcList.size = 0;
for (local22 = 0; local22 < local13; local22++) { for (local22 = 0; local22 < local13; local22++) {
@Pc(61) int local61 = Static33.anIntArray79[local22]; @Pc(61) int local61 = NpcList.ids[local22];
@Pc(65) Npc local65 = NpcList.npcs[local61]; @Pc(65) Npc local65 = NpcList.npcs[local61];
@Pc(70) int local70 = inboundBuffer.gBits(1); @Pc(70) int local70 = inboundBuffer.gBits(1);
if (local70 == 0) { if (local70 == 0) {
Static33.anIntArray79[Static272.anInt5214++] = local61; NpcList.ids[NpcList.size++] = local61;
local65.lastSeenLoop = client.loop; local65.lastSeenLoop = client.loop;
} else { } else {
@Pc(92) int local92 = inboundBuffer.gBits(2); @Pc(92) int local92 = inboundBuffer.gBits(2);
if (local92 == 0) { if (local92 == 0) {
Static33.anIntArray79[Static272.anInt5214++] = local61; NpcList.ids[NpcList.size++] = local61;
local65.lastSeenLoop = client.loop; local65.lastSeenLoop = client.loop;
extendedIds[extendedCount++] = local61; extendedIds[extendedCount++] = local61;
} else { } else {
@Pc(139) int local139; @Pc(139) int local139;
@Pc(149) int local149; @Pc(149) int local149;
if (local92 == 1) { if (local92 == 1) {
Static33.anIntArray79[Static272.anInt5214++] = local61; NpcList.ids[NpcList.size++] = local61;
local65.lastSeenLoop = client.loop; local65.lastSeenLoop = client.loop;
local139 = inboundBuffer.gBits(3); local139 = inboundBuffer.gBits(3);
local65.move(1, local139); local65.move(1, local139);
@ -3102,7 +3108,7 @@ public class Protocol {
extendedIds[extendedCount++] = local61; extendedIds[extendedCount++] = local61;
} }
} else if (local92 == 2) { } else if (local92 == 2) {
Static33.anIntArray79[Static272.anInt5214++] = local61; NpcList.ids[NpcList.size++] = local61;
local65.lastSeenLoop = client.loop; local65.lastSeenLoop = client.loop;
if (inboundBuffer.gBits(1) == 1) { if (inboundBuffer.gBits(1) == 1) {
local139 = inboundBuffer.gBits(3); local139 = inboundBuffer.gBits(3);
@ -3137,7 +3143,7 @@ public class Protocol {
NpcList.npcs[local14] = new Npc(); NpcList.npcs[local14] = new Npc();
} }
@Pc(37) Npc local37 = NpcList.npcs[local14]; @Pc(37) Npc local37 = NpcList.npcs[local14];
Static33.anIntArray79[Static272.anInt5214++] = local14; NpcList.ids[NpcList.size++] = local14;
local37.lastSeenLoop = client.loop; local37.lastSeenLoop = client.loop;
if (local37.type != null && local37.type.hasAreaSound()) { if (local37.type != null && local37.type.hasAreaSound()) {
AreaSoundManager.remove(local37); AreaSoundManager.remove(local37);

11
client/src/main/java/rt4/QuickChatCatType.java
View file

@ -23,7 +23,12 @@ public final class QuickChatCatType extends SecondaryNode {
@OriginalMember(owner = "client!bc", name = "ab", descriptor = "[I") @OriginalMember(owner = "client!bc", name = "ab", descriptor = "[I")
public int[] phrases; public int[] phrases;
@OriginalMember(owner = "client!bc", name = "d", descriptor = "(I)V") @OriginalMember(owner = "client!si", name = "a", descriptor = "(ZB)I")
public static int method3933(@OriginalArg(1) byte arg0) {
return arg0 & 0xFF;
}
@OriginalMember(owner = "client!bc", name = "d", descriptor = "(I)V")
public final void method465() { public final void method465() {
@Pc(8) int local8; @Pc(8) int local8;
if (this.phrases != null) { if (this.phrases != null) {
@ -65,7 +70,7 @@ public final class QuickChatCatType extends SecondaryNode {
this.subcategoryShortcuts = new int[local28]; this.subcategoryShortcuts = new int[local28];
for (local38 = 0; local38 < local28; local38++) { for (local38 = 0; local38 < local28; local38++) {
this.subcategories[local38] = arg0.g2(); this.subcategories[local38] = arg0.g2();
this.subcategoryShortcuts[local38] = Static229.method3933(arg0.g1s()); this.subcategoryShortcuts[local38] = method3933(arg0.g1s());
} }
} else if (arg1 == 3) { } else if (arg1 == 3) {
local28 = arg0.g1(); local28 = arg0.g1();
@ -73,7 +78,7 @@ public final class QuickChatCatType extends SecondaryNode {
this.phraseShortcuts = new int[local28]; this.phraseShortcuts = new int[local28];
for (local38 = 0; local38 < local28; local38++) { for (local38 = 0; local38 < local28; local38++) {
this.phrases[local38] = arg0.g2(); this.phrases[local38] = arg0.g2();
this.phraseShortcuts[local38] = Static229.method3933(arg0.g1s()); this.phraseShortcuts[local38] = method3933(arg0.g1s());
} }
} else if (arg1 == 4) { } else if (arg1 == 4) {
} }

14
client/src/main/java/rt4/QuickChatPhraseType.java
View file

@ -10,7 +10,13 @@ public final class QuickChatPhraseType extends SecondaryNode {
@OriginalMember(owner = "client!ld", name = "a", descriptor = "[I") @OriginalMember(owner = "client!ld", name = "a", descriptor = "[I")
public static final int[] DYNAMIC_COMMAND_ENCODE_BYTES = new int[] { 2, 2, 4, 0, 1, 8, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0 }; public static final int[] DYNAMIC_COMMAND_ENCODE_BYTES = new int[] { 2, 2, 4, 0, 1, 8, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0 };
@OriginalMember(owner = "client!cb", name = "L", descriptor = "[I") @OriginalMember(owner = "client!rc", name = "I", descriptor = "Lclient!na;")
public static final JagString aClass100_231 = JagString.parse(")3)3)3");
@OriginalMember(owner = "client!bf", name = "C", descriptor = "[I")
public static final int[] anIntArray51 = new int[] { 2, 2, 4, 2, 1, 8, 4, 1, 4, 4, 2, 1, 1, 1, 4, 1 };
@OriginalMember(owner = "client!qg", name = "U", descriptor = "Lclient!na;")
public static final JagString aClass100_891 = JagString.parse("");
@OriginalMember(owner = "client!cb", name = "L", descriptor = "[I")
private int[] anIntArray71; private int[] anIntArray71;
@OriginalMember(owner = "client!cb", name = "M", descriptor = "[I") @OriginalMember(owner = "client!cb", name = "M", descriptor = "[I")
@ -114,11 +120,11 @@ public final class QuickChatPhraseType extends SecondaryNode {
public final JagString getText() { public final JagString getText() {
@Pc(15) JagString local15 = Static87.allocate(80); @Pc(15) JagString local15 = Static87.allocate(80);
if (this.aClass100Array35 == null) { if (this.aClass100Array35 == null) {
return Static202.aClass100_891; return aClass100_891;
} }
local15.method3113(this.aClass100Array35[0]); local15.method3113(this.aClass100Array35[0]);
for (@Pc(31) int local31 = 1; local31 < this.aClass100Array35.length; local31++) { for (@Pc(31) int local31 = 1; local31 < this.aClass100Array35.length; local31++) {
local15.method3113(Static211.aClass100_231); local15.method3113(aClass100_231);
local15.method3113(this.aClass100Array35[local31]); local15.method3113(this.aClass100Array35[local31]);
} }
return local15.method3156(); return local15.method3156();
@ -130,7 +136,7 @@ public final class QuickChatPhraseType extends SecondaryNode {
if (this.anIntArray71 != null) { if (this.anIntArray71 != null) {
for (@Pc(22) int local22 = 0; local22 < this.anIntArray71.length; local22++) { for (@Pc(22) int local22 = 0; local22 < this.anIntArray71.length; local22++) {
local17.method3113(this.aClass100Array35[local22]); local17.method3113(this.aClass100Array35[local22]);
local17.method3113(Static89.method1838(this.anIntArrayArray5[local22], arg0.gVarLong(Static16.anIntArray51[this.anIntArray71[local22]]), this.anIntArray71[local22])); local17.method3113(Static89.method1838(this.anIntArrayArray5[local22], arg0.gVarLong(anIntArray51[this.anIntArray71[local22]]), this.anIntArray71[local22]));
} }
} }
local17.method3113(this.aClass100Array35[this.aClass100Array35.length - 1]); local17.method3113(this.aClass100Array35[this.aClass100Array35.length - 1]);

67
client/src/main/java/rt4/ReflectionCheck.java
View file

@ -153,4 +153,71 @@ public final class ReflectionCheck extends Node {
local18.unlink(); local18.unlink();
} }
} }
@OriginalMember(owner = "client!qg", name = "a", descriptor = "(Lsignlink!ll;Lclient!wa;IB)V")
public static void method3654(@OriginalArg(0) SignLink arg0, @OriginalArg(1) Buffer arg1, @OriginalArg(2) int arg2) {
@Pc(17) ReflectionCheck local17 = new ReflectionCheck();
local17.anInt1725 = arg1.g1();
local17.anInt1732 = arg1.g4();
local17.aClass212Array1 = new PrivilegedRequest[local17.anInt1725];
local17.anIntArray138 = new int[local17.anInt1725];
local17.aByteArrayArrayArray6 = new byte[local17.anInt1725][][];
local17.aClass212Array2 = new PrivilegedRequest[local17.anInt1725];
local17.anIntArray139 = new int[local17.anInt1725];
local17.anIntArray137 = new int[local17.anInt1725];
for (@Pc(59) int local59 = 0; local59 < local17.anInt1725; local59++) {
try {
@Pc(71) int local71 = arg1.g1();
@Pc(93) String local93;
@Pc(104) String local104;
@Pc(95) int local95;
if (local71 == 0 || local71 == 1 || local71 == 2) {
local93 = new String(arg1.gjstr().method3148());
local95 = 0;
local104 = new String(arg1.gjstr().method3148());
if (local71 == 1) {
local95 = arg1.g4();
}
local17.anIntArray139[local59] = local71;
local17.anIntArray137[local59] = local95;
local17.aClass212Array2[local59] = arg0.getDeclaredField(local104, Static6.method85(local93));
} else if (local71 == 3 || local71 == 4) {
local93 = new String(arg1.gjstr().method3148());
local104 = new String(arg1.gjstr().method3148());
local95 = arg1.g1();
@Pc(171) String[] local171 = new String[local95];
for (@Pc(173) int local173 = 0; local173 < local95; local173++) {
local171[local173] = new String(arg1.gjstr().method3148());
}
@Pc(193) byte[][] local193 = new byte[local95][];
@Pc(210) int local210;
if (local71 == 3) {
for (@Pc(199) int local199 = 0; local199 < local95; local199++) {
local210 = arg1.g4();
local193[local199] = new byte[local210];
arg1.gBytes(local210, local193[local199]);
}
}
local17.anIntArray139[local59] = local71;
@Pc(234) Class[] local234 = new Class[local95];
for (local210 = 0; local210 < local95; local210++) {
local234[local210] = Static6.method85(local171[local210]);
}
local17.aClass212Array1[local59] = arg0.getDeclaredMethod(Static6.method85(local93), local234, local104);
local17.aByteArrayArrayArray6[local59] = local193;
}
} catch (@Pc(269) ClassNotFoundException local269) {
local17.anIntArray138[local59] = -1;
} catch (@Pc(276) SecurityException local276) {
local17.anIntArray138[local59] = -2;
} catch (@Pc(283) NullPointerException local283) {
local17.anIntArray138[local59] = -3;
} catch (@Pc(290) Exception local290) {
local17.anIntArray138[local59] = -4;
} catch (@Pc(297) Throwable local297) {
local17.anIntArray138[local59] = -5;
}
}
Static204.aClass69_113.addTail(local17);
}
} }

237
client/src/main/java/rt4/SceneGraph.java
View file

@ -22,6 +22,48 @@ public class SceneGraph {
public static byte[][][] tileAngles; public static byte[][][] tileAngles;
@OriginalMember(owner = "client!ui", name = "eb", descriptor = "[[[B") @OriginalMember(owner = "client!ui", name = "eb", descriptor = "[[[B")
public static byte[][][] tileUnderlays; public static byte[][][] tileUnderlays;
@OriginalMember(owner = "client!em", name = "t", descriptor = "[[[I")
public static int[][][] anIntArrayArrayArray6;
@OriginalMember(owner = "client!ka", name = "r", descriptor = "[I")
public static int[] anIntArray293;
@OriginalMember(owner = "client!lg", name = "k", descriptor = "I")
public static int firstVisibleLevel = 99;
@OriginalMember(owner = "client!ug", name = "d", descriptor = "[I")
public static int[] anIntArray479;
@OriginalMember(owner = "client!l", name = "l", descriptor = "[I")
public static int[] anIntArray325;
@OriginalMember(owner = "client!s", name = "i", descriptor = "[I")
public static int[] anIntArray376;
@OriginalMember(owner = "client!jd", name = "d", descriptor = "[[[B")
public static byte[][][] aByteArrayArrayArray9;
@OriginalMember(owner = "client!wk", name = "v", descriptor = "[I")
public static int[] anIntArray568;
@OriginalMember(owner = "client!ub", name = "h", descriptor = "[Lclient!pe;")
public static Class120[] aClass120Array2;
@OriginalMember(owner = "client!rh", name = "k", descriptor = "I")
public static int anInt4870 = 0;
@OriginalMember(owner = "client!bl", name = "T", descriptor = "I")
public static int anInt726 = 0;
@OriginalMember(owner = "client!pm", name = "cb", descriptor = "[[[Lclient!bj;")
public static Tile[][][] surfaceGroundTiles;
@OriginalMember(owner = "client!client", name = "kb", descriptor = "[[Lclient!hg;")
public static GlTile[][] surfaceHdTiles;
@OriginalMember(owner = "client!wh", name = "c", descriptor = "[[[Lclient!bj;")
public static Tile[][][] underWaterGroundTiles;
@OriginalMember(owner = "client!pk", name = "R", descriptor = "[[Lclient!hg;")
public static GlTile[][] underWaterHdTiles;
@OriginalMember(owner = "client!hc", name = "O", descriptor = "[Lclient!pe;")
public static Class120[] aClass120Array1;
@OriginalMember(owner = "client!ma", name = "i", descriptor = "I")
public static int mapSizeX;
@OriginalMember(owner = "client!hk", name = "Y", descriptor = "I")
public static int mapSizeZ;
@OriginalMember(owner = "client!cd", name = "s", descriptor = "I")
public static int anInt917;
@OriginalMember(owner = "client!tk", name = "D", descriptor = "[Lclient!ec;")
public static Scenery[] aClass31Array3;
@OriginalMember(owner = "client!c", name = "bb", descriptor = "[Lclient!ec;")
public static Scenery[] aClass31Array2;
@OriginalMember(owner = "client!km", name = "f", descriptor = "(I)Z") @OriginalMember(owner = "client!km", name = "f", descriptor = "(I)Z")
public static boolean allLevelsAreVisible() { public static boolean allLevelsAreVisible() {
@ -55,8 +97,8 @@ public class SceneGraph {
if (local7 == null) { if (local7 == null) {
return null; return null;
} else { } else {
@Pc(14) Wall local14 = local7.aClass77_1; @Pc(14) Wall local14 = local7.wall;
local7.aClass77_1 = null; local7.wall = null;
return local14; return local14;
} }
} }
@ -66,41 +108,41 @@ public class SceneGraph {
@Pc(3) int local3; @Pc(3) int local3;
@Pc(9) int local9; @Pc(9) int local9;
@Pc(14) int local14; @Pc(14) int local14;
if (Static197.surfaceGroundTiles != null) { if (surfaceGroundTiles != null) {
for (local3 = 0; local3 < Static197.surfaceGroundTiles.length; local3++) { for (local3 = 0; local3 < surfaceGroundTiles.length; local3++) {
for (local9 = 0; local9 < Static152.mapSizeX; local9++) { for (local9 = 0; local9 < mapSizeX; local9++) {
for (local14 = 0; local14 < Static99.mapSizeZ; local14++) { for (local14 = 0; local14 < mapSizeZ; local14++) {
Static197.surfaceGroundTiles[local3][local9][local14] = null; surfaceGroundTiles[local3][local9][local14] = null;
} }
} }
} }
} }
Static36.surfaceHdTiles = null; surfaceHdTiles = null;
if (Static276.underWaterGroundTiles != null) { if (underWaterGroundTiles != null) {
for (local3 = 0; local3 < Static276.underWaterGroundTiles.length; local3++) { for (local3 = 0; local3 < underWaterGroundTiles.length; local3++) {
for (local9 = 0; local9 < Static152.mapSizeX; local9++) { for (local9 = 0; local9 < mapSizeX; local9++) {
for (local14 = 0; local14 < Static99.mapSizeZ; local14++) { for (local14 = 0; local14 < mapSizeZ; local14++) {
Static276.underWaterGroundTiles[local3][local9][local14] = null; underWaterGroundTiles[local3][local9][local14] = null;
} }
} }
} }
} }
Static195.underWaterHdTiles = null; underWaterHdTiles = null;
Static28.anInt917 = 0; anInt917 = 0;
if (Static91.aClass120Array1 != null) { if (aClass120Array1 != null) {
for (local3 = 0; local3 < Static28.anInt917; local3++) { for (local3 = 0; local3 < anInt917; local3++) {
Static91.aClass120Array1[local3] = null; aClass120Array1[local3] = null;
} }
} }
if (Static243.aClass31Array3 != null) { if (aClass31Array3 != null) {
for (local3 = 0; local3 < Static22.anInt726; local3++) { for (local3 = 0; local3 < anInt726; local3++) {
Static243.aClass31Array3[local3] = null; aClass31Array3[local3] = null;
} }
Static22.anInt726 = 0; anInt726 = 0;
} }
if (Static25.aClass31Array2 != null) { if (aClass31Array2 != null) {
for (local3 = 0; local3 < Static25.aClass31Array2.length; local3++) { for (local3 = 0; local3 < aClass31Array2.length; local3++) {
Static25.aClass31Array2[local3] = null; aClass31Array2[local3] = null;
} }
} }
} }
@ -108,13 +150,13 @@ public class SceneGraph {
@OriginalMember(owner = "client!vf", name = "a", descriptor = "(III)Lclient!jh;") @OriginalMember(owner = "client!vf", name = "a", descriptor = "(III)Lclient!jh;")
public static Wall getWall(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2) { public static Wall getWall(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2) {
@Pc(7) Tile local7 = tiles[arg0][arg1][arg2]; @Pc(7) Tile local7 = tiles[arg0][arg1][arg2];
return local7 == null ? null : local7.aClass77_1; return local7 == null ? null : local7.wall;
} }
@OriginalMember(owner = "client!gj", name = "a", descriptor = "(III)Lclient!df;") @OriginalMember(owner = "client!gj", name = "a", descriptor = "(III)Lclient!df;")
public static WallDecor getWallDecor(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2) { public static WallDecor getWallDecor(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2) {
@Pc(7) Tile local7 = tiles[arg0][arg1][arg2]; @Pc(7) Tile local7 = tiles[arg0][arg1][arg2];
return local7 == null ? null : local7.aClass24_1; return local7 == null ? null : local7.wallDecor;
} }
@OriginalMember(owner = "client!kf", name = "b", descriptor = "(III)Lclient!ec;") @OriginalMember(owner = "client!kf", name = "b", descriptor = "(III)Lclient!ec;")
@ -123,9 +165,9 @@ public class SceneGraph {
if (local7 == null) { if (local7 == null) {
return null; return null;
} }
for (@Pc(13) int local13 = 0; local13 < local7.anInt662; local13++) { for (@Pc(13) int local13 = 0; local13 < local7.sceneryLen; local13++) {
@Pc(22) Scenery local22 = local7.aClass31Array1[local13]; @Pc(22) Scenery local22 = local7.scenery[local13];
if ((local22.aLong56 >> 29 & 0x3L) == 2L && local22.anInt1701 == arg1 && local22.anInt1696 == arg2) { if ((local22.key >> 29 & 0x3L) == 2L && local22.anInt1701 == arg1 && local22.anInt1696 == arg2) {
return local22; return local22;
} }
} }
@ -135,6 +177,139 @@ public class SceneGraph {
@OriginalMember(owner = "client!wa", name = "a", descriptor = "(III)Lclient!bm;") @OriginalMember(owner = "client!wa", name = "a", descriptor = "(III)Lclient!bm;")
public static GroundDecor getGroundDecor(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2) { public static GroundDecor getGroundDecor(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2) {
@Pc(7) Tile local7 = tiles[arg0][arg1][arg2]; @Pc(7) Tile local7 = tiles[arg0][arg1][arg2];
return local7 == null || local7.aClass15_1 == null ? null : local7.aClass15_1; return local7 == null || local7.groundDecor == null ? null : local7.groundDecor;
} }
@OriginalMember(owner = "client!v", name = "a", descriptor = "(IIIJ)Z")
public static boolean isLocValid(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2, @OriginalArg(3) long arg3) {
@Pc(7) Tile tile = tiles[arg0][arg1][arg2];
if (tile == null) {
return false;
} else if (tile.wall != null && tile.wall.key == arg3) {
return true;
} else if (tile.wallDecor != null && tile.wallDecor.key == arg3) {
return true;
} else if (tile.groundDecor != null && tile.groundDecor.key == arg3) {
return true;
} else {
for (@Pc(46) int local46 = 0; local46 < tile.sceneryLen; local46++) {
if (tile.scenery[local46].key == arg3) {
return true;
}
}
return false;
}
}
@OriginalMember(owner = "client!pl", name = "a", descriptor = "(ZI)V")
public static void method3535(@OriginalArg(0) boolean arg0) {
anIntArray376 = new int[104];
anIntArray325 = new int[104];
firstVisibleLevel = 99;
anIntArray479 = new int[104];
@Pc(14) byte plane;
if (arg0) {
plane = 1;
} else {
plane = 4;
}
tileShapes = new byte[plane][104][104];
anIntArray293 = new int[104];
anIntArrayArrayArray6 = new int[plane][105][105];
aByteArrayArrayArray9 = new byte[plane][105][105];
tileOverlays = new byte[plane][104][104];
anIntArray568 = new int[104];
tileAngles = new byte[plane][104][104];
tileUnderlays = new byte[plane][104][104];
}
@OriginalMember(owner = "client!ib", name = "b", descriptor = "(I)V")
public static void method2255() {
anIntArray479 = null;
anIntArrayArrayArray6 = null;
anIntArray293 = null;
tileShapes = null;
tileAngles = null;
aByteArrayArrayArray9 = null;
tileOverlays = null;
tileUnderlays = null;
anIntArray325 = null;
anIntArray376 = null;
anIntArray568 = null;
}
@OriginalMember(owner = "client!um", name = "c", descriptor = "(III)Z")
public static boolean method4394(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2) {
for (@Pc(1) int local1 = 0; local1 < anInt4870; local1++) {
@Pc(8) Class120 local8 = aClass120Array2[local1];
@Pc(17) int local17;
@Pc(29) int local29;
@Pc(39) int local39;
@Pc(49) int local49;
@Pc(59) int local59;
if (local8.anInt4462 == 1) {
local17 = local8.anInt4460 - arg0;
if (local17 > 0) {
local29 = local8.anInt4458 + (local8.anInt4454 * local17 >> 8);
local39 = local8.anInt4449 + (local8.anInt4450 * local17 >> 8);
local49 = local8.anInt4444 + (local8.anInt4459 * local17 >> 8);
local59 = local8.anInt4447 + (local8.anInt4463 * local17 >> 8);
if (arg2 >= local29 && arg2 <= local39 && arg1 >= local49 && arg1 <= local59) {
return true;
}
}
} else if (local8.anInt4462 == 2) {
local17 = arg0 - local8.anInt4460;
if (local17 > 0) {
local29 = local8.anInt4458 + (local8.anInt4454 * local17 >> 8);
local39 = local8.anInt4449 + (local8.anInt4450 * local17 >> 8);
local49 = local8.anInt4444 + (local8.anInt4459 * local17 >> 8);
local59 = local8.anInt4447 + (local8.anInt4463 * local17 >> 8);
if (arg2 >= local29 && arg2 <= local39 && arg1 >= local49 && arg1 <= local59) {
return true;
}
}
} else if (local8.anInt4462 == 3) {
local17 = local8.anInt4458 - arg2;
if (local17 > 0) {
local29 = local8.anInt4460 + (local8.anInt4448 * local17 >> 8);
local39 = local8.anInt4445 + (local8.anInt4456 * local17 >> 8);
local49 = local8.anInt4444 + (local8.anInt4459 * local17 >> 8);
local59 = local8.anInt4447 + (local8.anInt4463 * local17 >> 8);
if (arg0 >= local29 && arg0 <= local39 && arg1 >= local49 && arg1 <= local59) {
return true;
}
}
} else if (local8.anInt4462 == 4) {
local17 = arg2 - local8.anInt4458;
if (local17 > 0) {
local29 = local8.anInt4460 + (local8.anInt4448 * local17 >> 8);
local39 = local8.anInt4445 + (local8.anInt4456 * local17 >> 8);
local49 = local8.anInt4444 + (local8.anInt4459 * local17 >> 8);
local59 = local8.anInt4447 + (local8.anInt4463 * local17 >> 8);
if (arg0 >= local29 && arg0 <= local39 && arg1 >= local49 && arg1 <= local59) {
return true;
}
}
} else if (local8.anInt4462 == 5) {
local17 = arg1 - local8.anInt4444;
if (local17 > 0) {
local29 = local8.anInt4460 + (local8.anInt4448 * local17 >> 8);
local39 = local8.anInt4445 + (local8.anInt4456 * local17 >> 8);
local49 = local8.anInt4458 + (local8.anInt4454 * local17 >> 8);
local59 = local8.anInt4449 + (local8.anInt4450 * local17 >> 8);
if (arg0 >= local29 && arg0 <= local39 && arg2 >= local49 && arg2 <= local59) {
return true;
}
}
}
}
return false;
}
@OriginalMember(owner = "client!bj", name = "a", descriptor = "(III)J")
public static long method602(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2) {
@Pc(7) Tile local7 = tiles[arg0][arg1][arg2];
return local7 == null || local7.groundDecor == null ? 0L : local7.groundDecor.key;
}
} }

2
client/src/main/java/rt4/Scenery.java
View file

@ -43,5 +43,5 @@ public final class Scenery {
public int anInt1714; public int anInt1714;
@OriginalMember(owner = "client!ec", name = "A", descriptor = "J") @OriginalMember(owner = "client!ec", name = "A", descriptor = "J")
public long aLong56 = 0L; public long key = 0L;
} }

129
client/src/main/java/rt4/ScriptRunner.java
View file

@ -14,8 +14,24 @@ public final class ScriptRunner {
public static final int[] intStack = new int[1000]; public static final int[] intStack = new int[1000];
@OriginalMember(owner = "client!fl", name = "Q", descriptor = "Lclient!na;") @OriginalMember(owner = "client!fl", name = "Q", descriptor = "Lclient!na;")
public static final JagString EMPTY_STRING = JagString.parse(""); public static final JagString EMPTY_STRING = JagString.parse("");
@OriginalMember(owner = "client!bb", name = "A", descriptor = "Lclient!na;")
public static final JagString aClass100_74 = JagString.parse("::");
@OriginalMember(owner = "client!be", name = "ib", descriptor = "Lclient!na;")
public static final JagString EVENT_OPBASE = JagString.parse("event_opbase");
@OriginalMember(owner = "client!da", name = "O", descriptor = "Lclient!na;")
public static final JagString aClass100_253 = JagString.parse("(U0a )2 via: ");
@OriginalMember(owner = "client!fl", name = "H", descriptor = "Lclient!na;")
public static final JagString aClass100_446 = JagString.parse("<img=0>");
@OriginalMember(owner = "client!nd", name = "b", descriptor = "Lclient!na;")
public static final JagString aClass100_780 = JagString.parse("Clientscript error in: ");
@OriginalMember(owner = "client!jh", name = "n", descriptor = "Lclient!bd;") @OriginalMember(owner = "client!jh", name = "n", descriptor = "Lclient!bd;")
public static QuickChatPhrase activePhrase; public static QuickChatPhrase activePhrase;
@OriginalMember(owner = "client!wf", name = "j", descriptor = "Lclient!be;")
public static Component staticActiveComponent1;
@OriginalMember(owner = "client!sg", name = "i", descriptor = "Lclient!be;")
public static Component staticActiveComponent2;
@OriginalMember(owner = "client!og", name = "g", descriptor = "[Lclient!na;")
public static JagString[] stringLocals;
@OriginalMember(owner = "client!h", name = "a", descriptor = "(BILclient!jl;)V") @OriginalMember(owner = "client!h", name = "a", descriptor = "(BILclient!jl;)V")
public static void run(@OriginalArg(1) int maxCycles, @OriginalArg(2) HookRequest request) { public static void run(@OriginalArg(1) int maxCycles, @OriginalArg(2) HookRequest request) {
@ -36,7 +52,7 @@ public final class ScriptRunner {
try { try {
Static215.intLocals = new int[script.anInt4667]; Static215.intLocals = new int[script.anInt4667];
@Pc(50) int intLocalIndex = 0; @Pc(50) int intLocalIndex = 0;
Static180.stringLocals = new JagString[script.anInt4671]; stringLocals = new JagString[script.anInt4671];
@Pc(56) int stringLocalIndex = 0; @Pc(56) int stringLocalIndex = 0;
@Pc(77) int id; @Pc(77) int id;
@Pc(194) JagString value; @Pc(194) JagString value;
@ -73,10 +89,10 @@ public final class ScriptRunner {
Static215.intLocals[intLocalIndex++] = id; Static215.intLocals[intLocalIndex++] = id;
} else if (local4[cycles] instanceof JagString) { } else if (local4[cycles] instanceof JagString) {
value = (JagString) local4[cycles]; value = (JagString) local4[cycles];
if (value.strEquals(Static15.EVENT_OPBASE)) { if (value.strEquals(EVENT_OPBASE)) {
value = request.opBase; value = request.opBase;
} }
Static180.stringLocals[stringLocalIndex++] = value; stringLocals[stringLocalIndex++] = value;
} }
} }
cycles = 0; cycles = 0;
@ -152,7 +168,7 @@ public final class ScriptRunner {
Static215.intLocals = frame.intLocals; Static215.intLocals = frame.intLocals;
opcodes = script.opcodes; opcodes = script.opcodes;
pc = frame.pc; pc = frame.pc;
Static180.stringLocals = frame.stringLocals; stringLocals = frame.stringLocals;
intOperands = script.intOperands; intOperands = script.intOperands;
continue; continue;
} }
@ -193,13 +209,13 @@ public final class ScriptRunner {
continue; continue;
} }
if (opcode == 35) { if (opcode == 35) {
stringStack[ssp++] = Static180.stringLocals[intOperands[pc]]; stringStack[ssp++] = stringLocals[intOperands[pc]];
continue; continue;
} }
if (opcode == 36) { if (opcode == 36) {
local = intOperands[pc]; local = intOperands[pc];
ssp--; ssp--;
Static180.stringLocals[local] = stringStack[ssp]; stringLocals[local] = stringStack[ssp];
continue; continue;
} }
if (opcode == 37) { if (opcode == 37) {
@ -231,7 +247,7 @@ public final class ScriptRunner {
isp -= local642.anInt4665; isp -= local642.anInt4665;
ssp -= local642.anInt4669; ssp -= local642.anInt4669;
@Pc(705) GoSubFrame local705 = new GoSubFrame(); @Pc(705) GoSubFrame local705 = new GoSubFrame();
local705.stringLocals = Static180.stringLocals; local705.stringLocals = stringLocals;
local705.intLocals = Static215.intLocals; local705.intLocals = Static215.intLocals;
local705.pc = pc; local705.pc = pc;
local705.script = script; local705.script = script;
@ -244,7 +260,7 @@ public final class ScriptRunner {
Static215.intLocals = local646; Static215.intLocals = local646;
intOperands = local642.intOperands; intOperands = local642.intOperands;
opcodes = local642.opcodes; opcodes = local642.opcodes;
Static180.stringLocals = local650; stringLocals = local650;
continue; continue;
} }
if (opcode == 42) { if (opcode == 42) {
@ -255,7 +271,7 @@ public final class ScriptRunner {
id = intOperands[pc]; id = intOperands[pc];
isp--; isp--;
VarcDomain.varcs[id] = intStack[isp]; VarcDomain.varcs[id] = intStack[isp];
Static4.method24(id); DelayedStateChange.method24(id);
continue; continue;
} }
if (opcode == 44) { if (opcode == 44) {
@ -312,7 +328,7 @@ public final class ScriptRunner {
id = intOperands[pc]; id = intOperands[pc];
ssp--; ssp--;
VarcDomain.varcstrs[id] = stringStack[ssp]; VarcDomain.varcstrs[id] = stringStack[ssp];
Static89.method1840(id); DelayedStateChange.method1840(id);
continue; continue;
} }
if (opcode == 51) { if (opcode == 51) {
@ -364,9 +380,9 @@ public final class ScriptRunner {
local1137.type = int3; local1137.type = int3;
local1063.createdComponents[int2] = local1137; local1063.createdComponents[int2] = local1137;
if (local1020) { if (local1020) {
Static274.staticActiveComponent1 = local1137; staticActiveComponent1 = local1137;
} else { } else {
Static227.staticActiveComponent2 = local1137; staticActiveComponent2 = local1137;
} }
InterfaceList.redraw(local1063); InterfaceList.redraw(local1063);
continue; continue;
@ -375,7 +391,7 @@ public final class ScriptRunner {
} }
@Pc(1204) Component local1204; @Pc(1204) Component local1204;
if (opcode == 101) { if (opcode == 101) {
component = local1020 ? Static274.staticActiveComponent1 : Static227.staticActiveComponent2; component = local1020 ? staticActiveComponent1 : staticActiveComponent2;
if (component.createdComponentId == -1) { if (component.createdComponentId == -1) {
if (!local1020) { if (!local1020) {
throw new RuntimeException("Tried to cc_delete static active-component!"); throw new RuntimeException("Tried to cc_delete static active-component!");
@ -402,9 +418,9 @@ public final class ScriptRunner {
if (local1256 != null && int3 != -1) { if (local1256 != null && int3 != -1) {
intStack[isp++] = 1; intStack[isp++] = 1;
if (local1020) { if (local1020) {
Static274.staticActiveComponent1 = local1256; staticActiveComponent1 = local1256;
} else { } else {
Static227.staticActiveComponent2 = local1256; staticActiveComponent2 = local1256;
} }
continue; continue;
} }
@ -420,9 +436,9 @@ public final class ScriptRunner {
} else { } else {
intStack[isp++] = 1; intStack[isp++] = 1;
if (local1020) { if (local1020) {
Static274.staticActiveComponent1 = local1204; staticActiveComponent1 = local1204;
} else { } else {
Static227.staticActiveComponent2 = local1204; staticActiveComponent2 = local1204;
} }
} }
continue; continue;
@ -471,7 +487,7 @@ public final class ScriptRunner {
@Pc(2522) JagString local2522; @Pc(2522) JagString local2522;
if (opcode >= 1100 && opcode < 1200 || !(opcode < 2100 || opcode >= 2200)) { if (opcode >= 1100 && opcode < 1200 || !(opcode < 2100 || opcode >= 2200)) {
if (opcode < 2000) { if (opcode < 2000) {
component = local1020 ? Static274.staticActiveComponent1 : Static227.staticActiveComponent2; component = local1020 ? staticActiveComponent1 : staticActiveComponent2;
} else { } else {
opcode -= 1000; opcode -= 1000;
isp--; isp--;
@ -495,7 +511,7 @@ public final class ScriptRunner {
} }
InterfaceList.redraw(component); InterfaceList.redraw(component);
if (component.createdComponentId == -1) { if (component.createdComponentId == -1) {
Static118.method2353(component.id); DelayedStateChange.method2353(component.id);
} }
continue; continue;
} }
@ -504,7 +520,7 @@ public final class ScriptRunner {
component.color = intStack[isp]; component.color = intStack[isp];
InterfaceList.redraw(component); InterfaceList.redraw(component);
if (component.createdComponentId == -1) { if (component.createdComponentId == -1) {
Static245.method4224(component.id); DelayedStateChange.method4224(component.id);
} }
continue; continue;
} }
@ -550,7 +566,7 @@ public final class ScriptRunner {
component.modelId = intStack[isp]; component.modelId = intStack[isp];
InterfaceList.redraw(component); InterfaceList.redraw(component);
if (component.createdComponentId == -1) { if (component.createdComponentId == -1) {
Static271.method4600(component.id); DelayedStateChange.method4600(component.id);
} }
continue; continue;
} }
@ -580,7 +596,7 @@ public final class ScriptRunner {
InterfaceList.redraw(component); InterfaceList.redraw(component);
} }
if (component.createdComponentId == -1) { if (component.createdComponentId == -1) {
Static181.method3345(component.id); DelayedStateChange.method3345(component.id);
} }
continue; continue;
} }
@ -598,7 +614,7 @@ public final class ScriptRunner {
InterfaceList.redraw(component); InterfaceList.redraw(component);
} }
if (component.createdComponentId == -1) { if (component.createdComponentId == -1) {
Static163.method3096(component.id); DelayedStateChange.method3096(component.id);
} }
continue; continue;
} }
@ -680,7 +696,7 @@ public final class ScriptRunner {
} }
} else if (opcode >= 1200 && opcode < 1300 || !(opcode < 2200 || opcode >= 2300)) { } else if (opcode >= 1200 && opcode < 1300 || !(opcode < 2200 || opcode >= 2300)) {
if (opcode < 2000) { if (opcode < 2000) {
component = local1020 ? Static274.staticActiveComponent1 : Static227.staticActiveComponent2; component = local1020 ? staticActiveComponent1 : staticActiveComponent2;
} else { } else {
isp--; isp--;
component = InterfaceList.getComponent(intStack[isp]); component = InterfaceList.getComponent(intStack[isp]);
@ -728,7 +744,7 @@ public final class ScriptRunner {
isp--; isp--;
component.modelId = intStack[isp]; component.modelId = intStack[isp];
if (component.createdComponentId == -1) { if (component.createdComponentId == -1) {
Static271.method4600(component.id); DelayedStateChange.method4600(component.id);
} }
continue; continue;
} }
@ -736,7 +752,7 @@ public final class ScriptRunner {
component.modelType = 3; component.modelType = 3;
component.modelId = PlayerList.self.appearance.method1952(); component.modelId = PlayerList.self.appearance.method1952();
if (component.createdComponentId == -1) { if (component.createdComponentId == -1) {
Static271.method4600(component.id); DelayedStateChange.method4600(component.id);
} }
continue; continue;
} }
@ -745,7 +761,7 @@ public final class ScriptRunner {
isp--; isp--;
component.modelId = intStack[isp]; component.modelId = intStack[isp];
if (component.createdComponentId == -1) { if (component.createdComponentId == -1) {
Static271.method4600(component.id); DelayedStateChange.method4600(component.id);
} }
continue; continue;
} }
@ -754,7 +770,7 @@ public final class ScriptRunner {
isp--; isp--;
component.modelId = intStack[isp]; component.modelId = intStack[isp];
if (component.createdComponentId == -1) { if (component.createdComponentId == -1) {
Static271.method4600(component.id); DelayedStateChange.method4600(component.id);
} }
continue; continue;
} }
@ -764,7 +780,7 @@ public final class ScriptRunner {
component = InterfaceList.getComponent(intStack[isp]); component = InterfaceList.getComponent(intStack[isp]);
opcode -= 1000; opcode -= 1000;
} else { } else {
component = local1020 ? Static274.staticActiveComponent1 : Static227.staticActiveComponent2; component = local1020 ? staticActiveComponent1 : staticActiveComponent2;
} }
if (opcode == 1300) { if (opcode == 1300) {
isp--; isp--;
@ -834,7 +850,7 @@ public final class ScriptRunner {
@Pc(4859) int c; @Pc(4859) int c;
if (opcode >= 1400 && opcode < 1500 || opcode >= 2400 && opcode < 2500) { if (opcode >= 1400 && opcode < 1500 || opcode >= 2400 && opcode < 2500) {
if (opcode < 2000) { if (opcode < 2000) {
component = local1020 ? Static274.staticActiveComponent1 : Static227.staticActiveComponent2; component = local1020 ? staticActiveComponent1 : staticActiveComponent2;
} else { } else {
opcode -= 1000; opcode -= 1000;
isp--; isp--;
@ -940,7 +956,7 @@ public final class ScriptRunner {
continue; continue;
} }
if (opcode < 1600) { if (opcode < 1600) {
component = local1020 ? Static274.staticActiveComponent1 : Static227.staticActiveComponent2; component = local1020 ? staticActiveComponent1 : staticActiveComponent2;
if (opcode == 1500) { if (opcode == 1500) {
intStack[isp++] = component.x; intStack[isp++] = component.x;
continue; continue;
@ -966,7 +982,7 @@ public final class ScriptRunner {
continue; continue;
} }
} else if (opcode < 1700) { } else if (opcode < 1700) {
component = local1020 ? Static274.staticActiveComponent1 : Static227.staticActiveComponent2; component = local1020 ? staticActiveComponent1 : staticActiveComponent2;
if (opcode == 1600) { if (opcode == 1600) {
intStack[isp++] = component.anInt489; intStack[isp++] = component.anInt489;
continue; continue;
@ -1020,7 +1036,7 @@ public final class ScriptRunner {
continue; continue;
} }
} else if (opcode < 1800) { } else if (opcode < 1800) {
component = local1020 ? Static274.staticActiveComponent1 : Static227.staticActiveComponent2; component = local1020 ? staticActiveComponent1 : staticActiveComponent2;
if (opcode == 1700) { if (opcode == 1700) {
intStack[isp++] = component.objId; intStack[isp++] = component.objId;
continue; continue;
@ -1038,7 +1054,7 @@ public final class ScriptRunner {
continue; continue;
} }
} else if (opcode < 1900) { } else if (opcode < 1900) {
component = local1020 ? Static274.staticActiveComponent1 : Static227.staticActiveComponent2; component = local1020 ? staticActiveComponent1 : staticActiveComponent2;
if (opcode == 1800) { if (opcode == 1800) {
intStack[isp++] = InterfaceList.getServerActiveProperties(component).getTargetMask(); intStack[isp++] = InterfaceList.getServerActiveProperties(component).getTargetMask();
continue; continue;
@ -1289,7 +1305,7 @@ public final class ScriptRunner {
if (opcode == 3109) { if (opcode == 3109) {
isp -= 2; isp -= 2;
int1 = intStack[isp]; int1 = intStack[isp];
local1256 = local1020 ? Static274.staticActiveComponent1 : Static227.staticActiveComponent2; local1256 = local1020 ? staticActiveComponent1 : staticActiveComponent2;
int3 = intStack[isp + 1]; int3 = intStack[isp + 1];
Static40.method1015(int3, int1, local1256); Static40.method1015(int3, int1, local1256);
continue; continue;
@ -1663,7 +1679,7 @@ public final class ScriptRunner {
if (opcode == 3609) { if (opcode == 3609) {
ssp--; ssp--;
string = stringStack[ssp]; string = stringStack[ssp];
if (string.startsWith(Static72.aClass100_446) || string.startsWith(Static101.aClass100_537)) { if (string.startsWith(aClass100_446) || string.startsWith(Static101.aClass100_537)) {
string = string.substring(7); string = string.substring(7);
} }
intStack[isp++] = FriendsList.contains(string) ? 1 : 0; intStack[isp++] = FriendsList.contains(string) ? 1 : 0;
@ -1770,7 +1786,7 @@ public final class ScriptRunner {
if (opcode == 3623) { if (opcode == 3623) {
ssp--; ssp--;
string = stringStack[ssp]; string = stringStack[ssp];
if (string.startsWith(Static72.aClass100_446) || string.startsWith(Static101.aClass100_537)) { if (string.startsWith(aClass100_446) || string.startsWith(Static101.aClass100_537)) {
string = string.substring(7); string = string.substring(7);
} }
intStack[isp++] = IgnoreList.contains(string) ? 1 : 0; intStack[isp++] = IgnoreList.contains(string) ? 1 : 0;
@ -1808,7 +1824,7 @@ public final class ScriptRunner {
isp--; isp--;
int1 = intStack[isp]; int1 = intStack[isp];
if (FriendsList.state == 2 && int1 >= 0 && int1 < FriendsList.size) { if (FriendsList.state == 2 && int1 >= 0 && int1 < FriendsList.size) {
intStack[isp++] = Static3.aBooleanArray135[int1] ? 1 : 0; intStack[isp++] = FriendsList.aBooleanArray135[int1] ? 1 : 0;
continue; continue;
} }
intStack[isp++] = 0; intStack[isp++] = 0;
@ -1817,7 +1833,7 @@ public final class ScriptRunner {
if (opcode == 3628) { if (opcode == 3628) {
ssp--; ssp--;
string = stringStack[ssp]; string = stringStack[ssp];
if (string.startsWith(Static72.aClass100_446) || string.startsWith(Static101.aClass100_537)) { if (string.startsWith(aClass100_446) || string.startsWith(Static101.aClass100_537)) {
string = string.substring(7); string = string.substring(7);
} }
intStack[isp++] = Static4.method25(string); intStack[isp++] = Static4.method25(string);
@ -2221,7 +2237,7 @@ public final class ScriptRunner {
if (opcode == 5008) { if (opcode == 5008) {
ssp--; ssp--;
string = stringStack[ssp]; string = stringStack[ssp];
if (!string.startsWith(Static12.aClass100_74)) { if (!string.startsWith(aClass100_74)) {
if (LoginManager.staffModLevel == 0 && (LoginManager.playerUnderage && !LoginManager.parentalChatConsent || LoginManager.mapQuickChat)) { if (LoginManager.staffModLevel == 0 && (LoginManager.playerUnderage && !LoginManager.parentalChatConsent || LoginManager.mapQuickChat)) {
continue; continue;
} }
@ -2962,7 +2978,7 @@ public final class ScriptRunner {
try { try {
if (Player.lastLogAddress.result != null) { if (Player.lastLogAddress.result != null) {
@Pc(8281) byte[] local8281 = ((String) Player.lastLogAddress.result).getBytes("ISO-8859-1"); @Pc(8281) byte[] local8281 = ((String) Player.lastLogAddress.result).getBytes("ISO-8859-1");
string = Static10.decodeString(local8281, local8281.length, 0); string = JagString.decodeString(local8281, local8281.length, 0);
} }
} catch (@Pc(8290) UnsupportedEncodingException local8290) { } catch (@Pc(8290) UnsupportedEncodingException local8290) {
} }
@ -3822,7 +3838,7 @@ public final class ScriptRunner {
string = stringStack[ssp]; string = stringStack[ssp];
isp--; isp--;
int3 = intStack[isp]; int3 = intStack[isp];
stringStack[ssp++] = JagString.concatenate(new JagString[] { string, Static123.parseInt(int3) }); stringStack[ssp++] = JagString.concatenate(new JagString[] { string, JagString.parseInt(int3) });
continue; continue;
} }
if (opcode == 4101) { if (opcode == 4101) {
@ -3854,7 +3870,7 @@ public final class ScriptRunner {
local652 = Static102.aCalendar2.get(5); local652 = Static102.aCalendar2.get(5);
c = Static102.aCalendar2.get(2); c = Static102.aCalendar2.get(2);
local1087 = Static102.aCalendar2.get(1); local1087 = Static102.aCalendar2.get(1);
stringStack[ssp++] = JagString.concatenate(new JagString[] { Static123.parseInt(local652), Static163.aClass100_767, Static34.aClass100Array40[c], Static163.aClass100_767, Static123.parseInt(local1087) }); stringStack[ssp++] = JagString.concatenate(new JagString[] { JagString.parseInt(local652), Static163.aClass100_767, Static34.aClass100Array40[c], Static163.aClass100_767, JagString.parseInt(local1087) });
continue; continue;
} }
if (opcode == 4105) { if (opcode == 4105) {
@ -3871,7 +3887,7 @@ public final class ScriptRunner {
if (opcode == 4106) { if (opcode == 4106) {
isp--; isp--;
int1 = intStack[isp]; int1 = intStack[isp];
stringStack[ssp++] = Static123.parseInt(int1); stringStack[ssp++] = JagString.parseInt(int1);
continue; continue;
} }
if (opcode == 4107) { if (opcode == 4107) {
@ -3929,7 +3945,7 @@ public final class ScriptRunner {
if (opcode == 4113) { if (opcode == 4113) {
isp--; isp--;
int1 = intStack[isp]; int1 = intStack[isp];
intStack[isp++] = Static273.method3213(int1) ? 1 : 0; intStack[isp++] = method3213(int1) ? 1 : 0;
continue; continue;
} }
if (opcode == 4114) { if (opcode == 4114) {
@ -4030,7 +4046,7 @@ public final class ScriptRunner {
} }
} else { } else {
if (opcode < 2000) { if (opcode < 2000) {
component = local1020 ? Static274.staticActiveComponent1 : Static227.staticActiveComponent2; component = local1020 ? staticActiveComponent1 : staticActiveComponent2;
} else { } else {
isp--; isp--;
component = InterfaceList.getComponent(intStack[isp]); component = InterfaceList.getComponent(intStack[isp]);
@ -4057,7 +4073,7 @@ public final class ScriptRunner {
InterfaceList.redraw(component); InterfaceList.redraw(component);
Static74.update(component); Static74.update(component);
if (component.createdComponentId == -1) { if (component.createdComponentId == -1) {
Static280.method4675(component.id); DelayedStateChange.method4675(component.id);
} }
continue; continue;
} }
@ -4096,7 +4112,7 @@ public final class ScriptRunner {
InterfaceList.redraw(component); InterfaceList.redraw(component);
} }
if (component.createdComponentId == -1) { if (component.createdComponentId == -1) {
Static93.method1906(component.id); DelayedStateChange.method1906(component.id);
} }
continue; continue;
} }
@ -4131,14 +4147,14 @@ public final class ScriptRunner {
@Pc(14385) JagString str = Static87.allocate(30); @Pc(14385) JagString str = Static87.allocate(30);
str.method3113(Static219.aClass100_928).method3113(script.name); str.method3113(Static219.aClass100_928).method3113(script.name);
for (cycles = Static138.fp - 1; cycles >= 0; cycles--) { for (cycles = Static138.fp - 1; cycles >= 0; cycles--) {
str.method3113(Static40.aClass100_253).method3113(Static67.callStack[cycles].script.name); str.method3113(aClass100_253).method3113(Static67.callStack[cycles].script.name);
} }
if (op == 40) { if (op == 40) {
cycles = intOperands[pc]; cycles = intOperands[pc];
str.method3113(Static176.aClass100_802).method3113(Static123.parseInt(cycles)); str.method3113(Static176.aClass100_802).method3113(JagString.parseInt(cycles));
} }
if (client.modeWhere != 0) { if (client.modeWhere != 0) {
Chat.add(EMPTY_STRING, 0, JagString.concatenate(new JagString[] { Static167.aClass100_780, script.name})); Chat.add(EMPTY_STRING, 0, JagString.concatenate(new JagString[] { aClass100_780, script.name}));
} }
TracingException.report("CS2 - scr:" + script.key + " op:" + op + new String(str.method3148()), ex); TracingException.report("CS2 - scr:" + script.key + " op:" + op + new String(str.method3148()), ex);
} }
@ -4149,4 +4165,15 @@ public final class ScriptRunner {
public static void run(@OriginalArg(1) HookRequest request) { public static void run(@OriginalArg(1) HookRequest request) {
run(200000, request); run(200000, request);
} }
@OriginalMember(owner = "client!we", name = "b", descriptor = "(II)Z")
public static boolean method3213(@OriginalArg(1) int arg0) {
if (arg0 >= 32 && arg0 <= 126) {
return true;
} else if (arg0 >= 160 && arg0 <= 255) {
return true;
} else {
return arg0 == 128 || arg0 == 140 || arg0 == 151 || arg0 == 156 || arg0 == 159;
}
}
} }

8
client/src/main/java/rt4/ShapedTile.java
View file

@ -8,6 +8,10 @@ import org.openrs2.deob.annotation.Pc;
@OriginalClass("client!fg") @OriginalClass("client!fg")
public final class ShapedTile { public final class ShapedTile {
@OriginalMember(owner = "client!fg", name = "i", descriptor = "[[I")
public static final int[][] anIntArrayArray12 = new int[][] { { 1, 3, 5, 7 }, { 1, 3, 5, 7 }, { 1, 3, 5, 7 }, { 1, 3, 5, 7, 6 }, { 1, 3, 5, 7, 6 }, { 1, 3, 5, 7, 6 }, { 1, 3, 5, 7, 6 }, { 1, 3, 5, 7, 2, 6 }, { 1, 3, 5, 7, 2, 8 }, { 1, 3, 5, 7, 2, 8 }, { 1, 3, 5, 7, 11, 12 }, { 1, 3, 5, 7, 11, 12 }, { 1, 3, 5, 7, 13, 14 } };
@OriginalMember(owner = "client!fg", name = "j", descriptor = "[[I")
public static final int[][] anIntArrayArray13 = new int[][] { { 0, 1, 2, 3, 0, 0, 1, 3 }, { 1, 1, 2, 3, 1, 0, 1, 3 }, { 0, 1, 2, 3, 1, 0, 1, 3 }, { 0, 0, 1, 2, 0, 0, 2, 4, 1, 0, 4, 3 }, { 0, 0, 1, 4, 0, 0, 4, 3, 1, 1, 2, 4 }, { 0, 0, 4, 3, 1, 0, 1, 2, 1, 0, 2, 4 }, { 0, 1, 2, 4, 1, 0, 1, 4, 1, 0, 4, 3 }, { 0, 4, 1, 2, 0, 4, 2, 5, 1, 0, 4, 5, 1, 0, 5, 3 }, { 0, 4, 1, 2, 0, 4, 2, 3, 0, 4, 3, 5, 1, 0, 4, 5 }, { 0, 0, 4, 5, 1, 4, 1, 2, 1, 4, 2, 3, 1, 4, 3, 5 }, { 0, 0, 1, 5, 0, 1, 4, 5, 0, 1, 2, 4, 1, 0, 5, 3, 1, 5, 4, 3, 1, 4, 2, 3 }, { 1, 0, 1, 5, 1, 1, 4, 5, 1, 1, 2, 4, 0, 0, 5, 3, 0, 5, 4, 3, 0, 4, 2, 3 }, { 1, 0, 5, 4, 1, 0, 1, 5, 0, 0, 4, 3, 0, 4, 5, 3, 0, 5, 2, 3, 0, 1, 2, 5 } };
@OriginalMember(owner = "client!fg", name = "s", descriptor = "Z") @OriginalMember(owner = "client!fg", name = "s", descriptor = "Z")
public boolean aBoolean113 = true; public boolean aBoolean113 = true;
@ -66,7 +70,7 @@ public final class ShapedTile {
@Pc(34) int local34 = local30 / 2; @Pc(34) int local34 = local30 / 2;
@Pc(38) int local38 = local30 / 4; @Pc(38) int local38 = local30 / 4;
@Pc(44) int local44 = local30 * 3 / 4; @Pc(44) int local44 = local30 * 3 / 4;
@Pc(48) int[] local48 = Static68.anIntArrayArray12[arg0]; @Pc(48) int[] local48 = anIntArrayArray12[arg0];
@Pc(51) int local51 = local48.length; @Pc(51) int local51 = local48.length;
this.anIntArray168 = new int[local51]; this.anIntArray168 = new int[local51];
this.anIntArray160 = new int[local51]; this.anIntArray160 = new int[local51];
@ -195,7 +199,7 @@ public final class ShapedTile {
local66[local79] = local148; local66[local79] = local148;
local69[local79] = local150; local69[local79] = local150;
} }
@Pc(534) int[] local534 = Static68.anIntArrayArray13[arg0]; @Pc(534) int[] local534 = anIntArrayArray13[arg0];
local86 = local534.length / 4; local86 = local534.length / 4;
this.anIntArray166 = new int[local86]; this.anIntArray166 = new int[local86];
this.anIntArray162 = new int[local86]; this.anIntArray162 = new int[local86];

6
client/src/main/java/rt4/SoftwareAlphaSprite.java
View file

@ -144,7 +144,7 @@ public final class SoftwareAlphaSprite extends SoftwareSprite {
@OriginalMember(owner = "client!am", name = "e", descriptor = "(II)V") @OriginalMember(owner = "client!am", name = "e", descriptor = "(II)V")
@Override @Override
public final void method1423(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1) { public final void renderTransparent(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1) {
arg0 += this.anInt1863; arg0 += this.anInt1863;
arg1 += this.anInt1861; arg1 += this.anInt1861;
@Pc(15) int local15 = arg0 + arg1 * SoftwareRaster.width; @Pc(15) int local15 = arg0 + arg1 * SoftwareRaster.width;
@ -670,7 +670,7 @@ public final class SoftwareAlphaSprite extends SoftwareSprite {
@OriginalMember(owner = "client!am", name = "a", descriptor = "(IIIIIIII[I[I)V") @OriginalMember(owner = "client!am", name = "a", descriptor = "(IIIIIIII[I[I)V")
@Override @Override
public final void drawMinimapRegion(@OriginalArg(0) int x, @OriginalArg(1) int y, @OriginalArg(2) int w, @OriginalArg(3) int h, @OriginalArg(4) int anchorX, @OriginalArg(5) int anchorY, @OriginalArg(6) int theta, @OriginalArg(7) int zoom, @OriginalArg(8) int[] lineStarts, @OriginalArg(9) int[] arg9) { public final void renderRotatedTransparent(@OriginalArg(0) int x, @OriginalArg(1) int y, @OriginalArg(2) int w, @OriginalArg(3) int h, @OriginalArg(4) int anchorX, @OriginalArg(5) int anchorY, @OriginalArg(6) int theta, @OriginalArg(7) int zoom, @OriginalArg(8) int[] lineStarts, @OriginalArg(9) int[] arg9) {
try { try {
@Pc(4) int local4 = -w / 2; @Pc(4) int local4 = -w / 2;
@Pc(9) int local9 = -h / 2; @Pc(9) int local9 = -h / 2;
@ -705,7 +705,7 @@ public final class SoftwareAlphaSprite extends SoftwareSprite {
@OriginalMember(owner = "client!am", name = "b", descriptor = "(IIIIIIII[I[I)V") @OriginalMember(owner = "client!am", name = "b", descriptor = "(IIIIIIII[I[I)V")
@Override @Override
public final void drawCompass(@OriginalArg(0) int x, @OriginalArg(1) int y, @OriginalArg(2) int w, @OriginalArg(3) int h, @OriginalArg(4) int anchorX, @OriginalArg(5) int anchorY, @OriginalArg(6) int theta, @OriginalArg(8) int[] lineStart, @OriginalArg(9) int[] lineWidth) { public final void renderRotatedTransparent(@OriginalArg(0) int x, @OriginalArg(1) int y, @OriginalArg(2) int w, @OriginalArg(3) int h, @OriginalArg(4) int anchorX, @OriginalArg(5) int anchorY, @OriginalArg(6) int theta, @OriginalArg(8) int[] lineStart, @OriginalArg(9) int[] lineWidth) {
try { try {
@Pc(4) int local4 = -w / 2; @Pc(4) int local4 = -w / 2;
@Pc(9) int local9 = -h / 2; @Pc(9) int local9 = -h / 2;

803
client/src/main/java/rt4/SoftwareModel.java
View file

File diff suppressed because it is too large Load diff

4
client/src/main/java/rt4/SoftwareRaster.java
View file

@ -156,7 +156,7 @@ public final class SoftwareRaster {
pixels = arg0; pixels = arg0;
width = arg1; width = arg1;
height = arg2; height = arg2;
method2496(0, 0, arg1, arg2); setClip(0, 0, arg1, arg2);
} }
@OriginalMember(owner = "client!kb", name = "b", descriptor = "()V") @OriginalMember(owner = "client!kb", name = "b", descriptor = "()V")
@ -278,7 +278,7 @@ public final class SoftwareRaster {
} }
@OriginalMember(owner = "client!kb", name = "c", descriptor = "(IIII)V") @OriginalMember(owner = "client!kb", name = "c", descriptor = "(IIII)V")
public static void method2496(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2, @OriginalArg(3) int arg3) { public static void setClip(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2, @OriginalArg(3) int arg3) {
if (arg0 < 0) { if (arg0 < 0) {
arg0 = 0; arg0 = 0;
} }

13
client/src/main/java/rt4/SoftwareSprite.java
View file

@ -201,7 +201,12 @@ public class SoftwareSprite extends Sprite {
} }
} }
@OriginalMember(owner = "client!mm", name = "d", descriptor = "(I)V") @OriginalMember(owner = "client!gf", name = "a", descriptor = "(Lclient!ve;IIB)Lclient!mm;")
public static SoftwareSprite loadSoftwareAlphaSprite(@OriginalArg(0) Js5 arg0, @OriginalArg(2) int arg1) {
return SpriteLoader.decode(arg0, 0, arg1) ? Static102.method2071() : null;
}
@OriginalMember(owner = "client!mm", name = "d", descriptor = "(I)V")
public final void method298(@OriginalArg(0) int arg0) { public final void method298(@OriginalArg(0) int arg0) {
if (this.width == this.anInt1860 && this.height == this.anInt1866) { if (this.width == this.anInt1860 && this.height == this.anInt1866) {
return; return;
@ -901,7 +906,7 @@ public class SoftwareSprite extends Sprite {
@OriginalMember(owner = "client!mm", name = "e", descriptor = "(II)V") @OriginalMember(owner = "client!mm", name = "e", descriptor = "(II)V")
@Override @Override
public void method1423(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1) { public void renderTransparent(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1) {
arg0 += this.anInt1863; arg0 += this.anInt1863;
arg1 += this.anInt1861; arg1 += this.anInt1861;
@Pc(15) int local15 = arg0 + arg1 * SoftwareRaster.width; @Pc(15) int local15 = arg0 + arg1 * SoftwareRaster.width;
@ -955,7 +960,7 @@ public class SoftwareSprite extends Sprite {
} }
@OriginalMember(owner = "client!mm", name = "a", descriptor = "(IIIIIIII[I[I)V") @OriginalMember(owner = "client!mm", name = "a", descriptor = "(IIIIIIII[I[I)V")
public void drawMinimapRegion(@OriginalArg(0) int x, @OriginalArg(1) int y, @OriginalArg(2) int w, @OriginalArg(3) int h, @OriginalArg(4) int anchorX, @OriginalArg(5) int anchorY, @OriginalArg(6) int theta, @OriginalArg(7) int zoom, @OriginalArg(8) int[] lineStarts, @OriginalArg(9) int[] arg9) { public void renderRotatedTransparent(@OriginalArg(0) int x, @OriginalArg(1) int y, @OriginalArg(2) int w, @OriginalArg(3) int h, @OriginalArg(4) int anchorX, @OriginalArg(5) int anchorY, @OriginalArg(6) int theta, @OriginalArg(7) int zoom, @OriginalArg(8) int[] lineStarts, @OriginalArg(9) int[] arg9) {
try { try {
@Pc(4) int centerX = -w / 2; @Pc(4) int centerX = -w / 2;
@Pc(9) int centerY = -h / 2; @Pc(9) int centerY = -h / 2;
@ -1113,7 +1118,7 @@ public class SoftwareSprite extends Sprite {
} }
@OriginalMember(owner = "client!mm", name = "b", descriptor = "(IIIIIIII[I[I)V") @OriginalMember(owner = "client!mm", name = "b", descriptor = "(IIIIIIII[I[I)V")
public void drawCompass(@OriginalArg(0) int x, @OriginalArg(1) int y, @OriginalArg(2) int w, @OriginalArg(3) int h, @OriginalArg(4) int anchorX, @OriginalArg(5) int anchorY, @OriginalArg(6) int theta, @OriginalArg(8) int[] lineStart, @OriginalArg(9) int[] lineWidth) { public void renderRotatedTransparent(@OriginalArg(0) int x, @OriginalArg(1) int y, @OriginalArg(2) int w, @OriginalArg(3) int h, @OriginalArg(4) int anchorX, @OriginalArg(5) int anchorY, @OriginalArg(6) int theta, @OriginalArg(8) int[] lineStart, @OriginalArg(9) int[] lineWidth) {
try { try {
@Pc(4) int centerX = -w / 2; @Pc(4) int centerX = -w / 2;
@Pc(9) int centerY = -h / 2; @Pc(9) int centerY = -h / 2;

2
client/src/main/java/rt4/SoundBank.java
View file

@ -72,7 +72,7 @@ public final class SoundBank {
} else if (arg1 == null || arg1[0] > 0) { } else if (arg1 == null || arg1[0] > 0) {
@Pc(53) VorbisSound local53 = (VorbisSound) this.aClass133_11.get(local26); @Pc(53) VorbisSound local53 = (VorbisSound) this.aClass133_11.get(local26);
if (local53 == null) { if (local53 == null) {
local53 = Static117.method2345(this.aClass153_53, arg0, arg2); local53 = VorbisSound.method2345(this.aClass153_53, arg0, arg2);
if (local53 == null) { if (local53 == null) {
return null; return null;
} }

2
client/src/main/java/rt4/Sprite.java
View file

@ -58,5 +58,5 @@ public abstract class Sprite extends SecondaryNode {
public abstract void method1422(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2, @OriginalArg(3) int arg3, @OriginalArg(4) int arg4); public abstract void method1422(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2, @OriginalArg(3) int arg3, @OriginalArg(4) int arg4);
@OriginalMember(owner = "client!qf", name = "e", descriptor = "(II)V") @OriginalMember(owner = "client!qf", name = "e", descriptor = "(II)V")
public abstract void method1423(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1); public abstract void renderTransparent(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1);
} }

9
client/src/main/java/rt4/Static1.java
View file

@ -18,10 +18,7 @@ public final class Static1 {
@OriginalMember(owner = "client!a", name = "i", descriptor = "I") @OriginalMember(owner = "client!a", name = "i", descriptor = "I")
public static int anInt6 = 0; public static int anInt6 = 0;
@OriginalMember(owner = "client!a", name = "j", descriptor = "Lclient!na;") @OriginalMember(owner = "client!a", name = "a", descriptor = "([[F[[F[[II[[F[[B[[II[[B[[B[[B[[[B)[Lclient!hg;")
public static final JagString aClass100_2 = JagString.parse("<col=ffffff> )4 ");
@OriginalMember(owner = "client!a", name = "a", descriptor = "([[F[[F[[II[[F[[B[[II[[B[[B[[B[[[B)[Lclient!hg;")
public static GlTile[] method2(@OriginalArg(0) float[][] arg0, @OriginalArg(1) float[][] arg1, @OriginalArg(2) int[][] arg2, @OriginalArg(3) int arg3, @OriginalArg(4) float[][] arg4, @OriginalArg(5) byte[][] arg5, @OriginalArg(6) int[][] arg6, @OriginalArg(8) byte[][] arg7, @OriginalArg(9) byte[][] arg8, @OriginalArg(10) byte[][] arg9, @OriginalArg(11) byte[][][] arg10) { public static GlTile[] method2(@OriginalArg(0) float[][] arg0, @OriginalArg(1) float[][] arg1, @OriginalArg(2) int[][] arg2, @OriginalArg(3) int arg3, @OriginalArg(4) float[][] arg4, @OriginalArg(5) byte[][] arg5, @OriginalArg(6) int[][] arg6, @OriginalArg(8) byte[][] arg7, @OriginalArg(9) byte[][] arg8, @OriginalArg(10) byte[][] arg9, @OriginalArg(11) byte[][][] arg10) {
@Pc(10) HashTable local10 = new HashTable(128); @Pc(10) HashTable local10 = new HashTable(128);
@Pc(12) int local12; @Pc(12) int local12;
@ -530,10 +527,10 @@ public final class Static1 {
@OriginalMember(owner = "client!a", name = "a", descriptor = "(IIIII)V") @OriginalMember(owner = "client!a", name = "a", descriptor = "(IIIII)V")
public static void method4(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2, @OriginalArg(4) int arg3) { public static void method4(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2, @OriginalArg(4) int arg3) {
if (GlRenderer.enabled) { if (GlRenderer.enabled) {
GlRaster.method1187(arg0, arg3, arg2 + arg0, arg1 + arg3); GlRaster.setClip(arg0, arg3, arg2 + arg0, arg1 + arg3);
GlRaster.method1186(arg0, arg3, arg2, arg1, 0); GlRaster.method1186(arg0, arg3, arg2, arg1, 0);
} else { } else {
SoftwareRaster.method2496(arg0, arg3, arg2 + arg0, arg3 + arg1); SoftwareRaster.setClip(arg0, arg3, arg2 + arg0, arg3 + arg1);
SoftwareRaster.fillRect(arg0, arg3, arg2, arg1, 0); SoftwareRaster.fillRect(arg0, arg3, arg2, arg1, 0);
} }
if (WorldMap.loadPercentage < 100) { if (WorldMap.loadPercentage < 100) {

13
client/src/main/java/rt4/Static10.java
View file

@ -9,19 +9,6 @@ public final class Static10 {
@OriginalMember(owner = "client!an", name = "db", descriptor = "S") @OriginalMember(owner = "client!an", name = "db", descriptor = "S")
public static short aShort9 = 205; public static short aShort9 = 205;
@OriginalMember(owner = "client!an", name = "a", descriptor = "([BIII)Lclient!na;")
public static JagString decodeString(@OriginalArg(0) byte[] arg0, @OriginalArg(2) int arg1, @OriginalArg(3) int arg2) {
@Pc(7) JagString local7 = new JagString();
local7.chars = new byte[arg1];
local7.length = 0;
for (@Pc(22) int local22 = arg2; local22 < arg1 + arg2; local22++) {
if (arg0[local22] != 0) {
local7.chars[local7.length++] = arg0[local22];
}
}
return local7;
}
@OriginalMember(owner = "client!an", name = "c", descriptor = "(III)V") @OriginalMember(owner = "client!an", name = "c", descriptor = "(III)V")
public static void method348(@OriginalArg(1) int arg0, @OriginalArg(2) int arg1) { public static void method348(@OriginalArg(1) int arg0, @OriginalArg(2) int arg1) {
if (Static189.anInt4457 != arg1) { if (Static189.anInt4457 != arg1) {

2
client/src/main/java/rt4/Static102.java
View file

@ -38,7 +38,7 @@ public final class Static102 {
@OriginalMember(owner = "client!hn", name = "f", descriptor = "(B)V") @OriginalMember(owner = "client!hn", name = "f", descriptor = "(B)V")
public static void method2073() { public static void method2073() {
Static20.objectContainerCache = new HashTable(32); Inv.objectContainerCache = new HashTable(32);
} }
} }

34
client/src/main/java/rt4/Static105.java
View file

@ -15,30 +15,12 @@ public final class Static105 {
@OriginalMember(owner = "client!ib", name = "e", descriptor = "Lclient!be;") @OriginalMember(owner = "client!ib", name = "e", descriptor = "Lclient!be;")
public static Component aClass13_14 = null; public static Component aClass13_14 = null;
@OriginalMember(owner = "client!ib", name = "g", descriptor = "Lclient!na;") @OriginalMember(owner = "client!ib", name = "k", descriptor = "Lclient!na;")
public static final JagString aClass100_559 = JagString.parse("<col=ffff00>");
@OriginalMember(owner = "client!ib", name = "k", descriptor = "Lclient!na;")
public static final JagString aClass100_561 = JagString.parse(" )2> <col=ffffff>"); public static final JagString aClass100_561 = JagString.parse(" )2> <col=ffffff>");
@OriginalMember(owner = "client!ib", name = "l", descriptor = "I") @OriginalMember(owner = "client!ib", name = "l", descriptor = "I")
public static int anInt2863 = 0; public static int anInt2863 = 0;
@OriginalMember(owner = "client!ib", name = "b", descriptor = "(I)V")
public static void method2255() {
Static251.anIntArray479 = null;
Static60.anIntArrayArrayArray6 = null;
Static128.anIntArray293 = null;
SceneGraph.tileShapes = null;
SceneGraph.tileAngles = null;
Static118.aByteArrayArrayArray9 = null;
SceneGraph.tileOverlays = null;
SceneGraph.tileUnderlays = null;
Static139.anIntArray325 = null;
Static221.anIntArray376 = null;
Static279.anIntArray568 = null;
}
@OriginalMember(owner = "client!ib", name = "a", descriptor = "(IIIIIIIILclient!th;IZJ)Z") @OriginalMember(owner = "client!ib", name = "a", descriptor = "(IIIIIIIILclient!th;IZJ)Z")
public static boolean method2256(@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) Entity arg8, @OriginalArg(9) int arg9, @OriginalArg(10) boolean arg10, @OriginalArg(11) long arg11) { public static boolean method2256(@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) Entity arg8, @OriginalArg(9) int arg9, @OriginalArg(10) boolean arg10, @OriginalArg(11) long arg11) {
@Pc(6) boolean local6 = SceneGraph.tileHeights == Static80.underWaterTileHeightMap; @Pc(6) boolean local6 = SceneGraph.tileHeights == Static80.underWaterTileHeightMap;
@ -46,17 +28,17 @@ public final class Static105 {
@Pc(17) int local17; @Pc(17) int local17;
for (@Pc(10) int local10 = arg1; local10 < arg1 + arg3; local10++) { for (@Pc(10) int local10 = arg1; local10 < arg1 + arg3; local10++) {
for (local17 = arg2; local17 < arg2 + arg4; local17++) { for (local17 = arg2; local17 < arg2 + arg4; local17++) {
if (local10 < 0 || local17 < 0 || local10 >= Static152.mapSizeX || local17 >= Static99.mapSizeZ) { if (local10 < 0 || local17 < 0 || local10 >= SceneGraph.mapSizeX || local17 >= SceneGraph.mapSizeZ) {
return false; return false;
} }
@Pc(42) Tile local42 = SceneGraph.tiles[arg0][local10][local17]; @Pc(42) Tile local42 = SceneGraph.tiles[arg0][local10][local17];
if (local42 != null && local42.anInt662 >= 5) { if (local42 != null && local42.sceneryLen >= 5) {
return false; return false;
} }
} }
} }
@Pc(58) Scenery local58 = new Scenery(); @Pc(58) Scenery local58 = new Scenery();
local58.aLong56 = arg11; local58.key = arg11;
local58.anInt1709 = arg0; local58.anInt1709 = arg0;
local58.anInt1699 = arg5; local58.anInt1699 = arg5;
local58.anInt1703 = arg6; local58.anInt1703 = arg6;
@ -89,10 +71,10 @@ public final class Static105 {
} }
} }
@Pc(174) Tile local174 = SceneGraph.tiles[arg0][local17][local108]; @Pc(174) Tile local174 = SceneGraph.tiles[arg0][local17][local108];
local174.aClass31Array1[local174.anInt662] = local58; local174.scenery[local174.sceneryLen] = local58;
local174.anIntArray59[local174.anInt662] = local115; local174.anIntArray59[local174.sceneryLen] = local115;
local174.anInt664 |= local115; local174.anInt664 |= local115;
local174.anInt662++; local174.sceneryLen++;
if (local6 && Static62.anIntArrayArray11[local17][local108] != 0) { if (local6 && Static62.anIntArrayArray11[local17][local108] != 0) {
local8 = Static62.anIntArrayArray11[local17][local108]; local8 = Static62.anIntArrayArray11[local17][local108];
} }
@ -108,7 +90,7 @@ public final class Static105 {
} }
} }
if (arg10) { if (arg10) {
Static243.aClass31Array3[Static22.anInt726++] = local58; SceneGraph.aClass31Array3[SceneGraph.anInt726++] = local58;
} }
return true; return true;
} }

3
client/src/main/java/rt4/Static107.java
View file

@ -10,9 +10,6 @@ public final class Static107 {
@OriginalMember(owner = "client!id", name = "b", descriptor = "I") @OriginalMember(owner = "client!id", name = "b", descriptor = "I")
public static int anInt2875 = -1; public static int anInt2875 = -1;
@OriginalMember(owner = "client!id", name = "c", descriptor = "Lclient!na;")
public static final JagString FPSON = JagString.parse("::fpson");
@OriginalMember(owner = "client!id", name = "d", descriptor = "[[[I") @OriginalMember(owner = "client!id", name = "d", descriptor = "[[[I")
public static final int[][][] anIntArrayArrayArray9 = new int[2][][]; public static final int[][][] anIntArrayArrayArray9 = new int[2][][];

50
client/src/main/java/rt4/Static108.java
View file

@ -1,50 +0,0 @@
package rt4;
import org.openrs2.deob.annotation.OriginalArg;
import org.openrs2.deob.annotation.OriginalMember;
import org.openrs2.deob.annotation.Pc;
public final class Static108 {
@OriginalMember(owner = "client!ie", name = "b", descriptor = "[Z")
public static boolean[] aBooleanArray60;
@OriginalMember(owner = "client!ie", name = "h", descriptor = "[I")
public static int[] anIntArray264;
@OriginalMember(owner = "client!ie", name = "j", descriptor = "[I")
public static int[] anIntArray266;
@OriginalMember(owner = "client!ie", name = "k", descriptor = "[I")
public static final int[] anIntArray267 = new int[] { 256, 128, 86, 64 };
@OriginalMember(owner = "client!ie", name = "a", descriptor = "([II)I")
public static int method2268(@OriginalArg(0) int[] arg0, @OriginalArg(1) int arg1) {
@Pc(3) int local3 = arg0[arg1];
@Pc(5) int local5 = -1;
@Pc(7) int local7 = Integer.MIN_VALUE;
for (@Pc(9) int local9 = 0; local9 < arg1; local9++) {
@Pc(16) int local16 = arg0[local9];
if (local16 < local3 && local16 > local7) {
local5 = local9;
local7 = local16;
}
}
return local5;
}
@OriginalMember(owner = "client!ie", name = "b", descriptor = "([II)I")
public static int method2270(@OriginalArg(0) int[] arg0, @OriginalArg(1) int arg1) {
@Pc(3) int local3 = arg0[arg1];
@Pc(5) int local5 = -1;
@Pc(7) int local7 = Integer.MAX_VALUE;
for (@Pc(9) int local9 = 0; local9 < arg1; local9++) {
@Pc(16) int local16 = arg0[local9];
if (local16 > local3 && local16 < local7) {
local5 = local9;
local7 = local16;
}
}
return local5;
}
}

4
client/src/main/java/rt4/Static109.java
View file

@ -19,8 +19,8 @@ public final class Static109 {
@OriginalMember(owner = "client!ig", name = "a", descriptor = "(I)V") @OriginalMember(owner = "client!ig", name = "a", descriptor = "(I)V")
public static void method2274() { public static void method2274() {
for (@Pc(7) int local7 = 0; local7 < Static272.anInt5214; local7++) { for (@Pc(7) int local7 = 0; local7 < NpcList.size; local7++) {
@Pc(18) int local18 = Static33.anIntArray79[local7]; @Pc(18) int local18 = NpcList.ids[local7];
@Pc(22) Npc local22 = NpcList.npcs[local18]; @Pc(22) Npc local22 = NpcList.npcs[local18];
if (local22 != null) { if (local22 != null) {
Static263.method4514(local22.type.size, local22); Static263.method4514(local22.type.size, local22);

2
client/src/main/java/rt4/Static110.java
View file

@ -12,6 +12,6 @@ public final class Static110 {
@OriginalMember(owner = "client!ih", name = "a", descriptor = "(ZII)Lclient!na;") @OriginalMember(owner = "client!ih", name = "a", descriptor = "(ZII)Lclient!na;")
public static JagString method2285(@OriginalArg(2) int arg0) { public static JagString method2285(@OriginalArg(2) int arg0) {
return Static198.method1025(true, arg0); return JagString.parseInt(true, arg0);
} }
} }

6
client/src/main/java/rt4/Static111.java
View file

@ -5,15 +5,9 @@ import org.openrs2.deob.annotation.OriginalMember;
public final class Static111 { public final class Static111 {
@OriginalMember(owner = "client!ii", name = "a", descriptor = "I")
public static int cameraZ;
@OriginalMember(owner = "client!ii", name = "y", descriptor = "I") @OriginalMember(owner = "client!ii", name = "y", descriptor = "I")
public static int anInt2910; public static int anInt2910;
@OriginalMember(owner = "client!ii", name = "e", descriptor = "Lclient!na;")
public static final JagString aClass100_570 = JagString.parse(")2");
@OriginalMember(owner = "client!ii", name = "a", descriptor = "(Lclient!be;III)V") @OriginalMember(owner = "client!ii", name = "a", descriptor = "(Lclient!be;III)V")
public static void method2291(@OriginalArg(0) Component arg0, @OriginalArg(2) int arg1, @OriginalArg(3) int arg2) { public static void method2291(@OriginalArg(0) Component arg0, @OriginalArg(2) int arg1, @OriginalArg(3) int arg2) {
if (arg0.xMode == 0) { if (arg0.xMode == 0) {

20
client/src/main/java/rt4/Static112.java
View file

@ -16,8 +16,8 @@ public final class Static112 {
@Pc(13) int local13 = Static24.anInt761; @Pc(13) int local13 = Static24.anInt761;
if (Static39.aClass3_Sub2_Sub1_1 == null || Static181.aClass3_Sub2_Sub1_9 == null) { if (Static39.aClass3_Sub2_Sub1_1 == null || Static181.aClass3_Sub2_Sub1_9 == null) {
if (client.js5Archive8.isFileReady(Static55.anInt1736) && client.js5Archive8.isFileReady(Static169.anInt4073)) { if (client.js5Archive8.isFileReady(Static55.anInt1736) && client.js5Archive8.isFileReady(Static169.anInt4073)) {
Static39.aClass3_Sub2_Sub1_1 = Static80.loadSoftwareAlphaSprite(client.js5Archive8, Static55.anInt1736); Static39.aClass3_Sub2_Sub1_1 = SoftwareSprite.loadSoftwareAlphaSprite(client.js5Archive8, Static55.anInt1736);
Static181.aClass3_Sub2_Sub1_9 = Static80.loadSoftwareAlphaSprite(client.js5Archive8, Static169.anInt4073); Static181.aClass3_Sub2_Sub1_9 = SoftwareSprite.loadSoftwareAlphaSprite(client.js5Archive8, Static169.anInt4073);
if (GlRenderer.enabled) { if (GlRenderer.enabled) {
if (Static39.aClass3_Sub2_Sub1_1 instanceof SoftwareAlphaSprite) { if (Static39.aClass3_Sub2_Sub1_1 instanceof SoftwareAlphaSprite) {
Static39.aClass3_Sub2_Sub1_1 = new GlAlphaSprite((SoftwareSprite) Static39.aClass3_Sub2_Sub1_1); Static39.aClass3_Sub2_Sub1_1 = new GlAlphaSprite((SoftwareSprite) Static39.aClass3_Sub2_Sub1_1);
@ -41,9 +41,9 @@ public final class Static112 {
if (Static39.aClass3_Sub2_Sub1_1 != null && Static181.aClass3_Sub2_Sub1_9 != null) { if (Static39.aClass3_Sub2_Sub1_1 != null && Static181.aClass3_Sub2_Sub1_9 != null) {
local112 = local13 / Static39.aClass3_Sub2_Sub1_1.width; local112 = local13 / Static39.aClass3_Sub2_Sub1_1.width;
for (local114 = 0; local114 < local112; local114++) { for (local114 = 0; local114 < local112; local114++) {
Static39.aClass3_Sub2_Sub1_1.method1423(local114 * Static39.aClass3_Sub2_Sub1_1.width + local3, local9); Static39.aClass3_Sub2_Sub1_1.renderTransparent(local114 * Static39.aClass3_Sub2_Sub1_1.width + local3, local9);
} }
Static181.aClass3_Sub2_Sub1_9.method1423(local3, local9); Static181.aClass3_Sub2_Sub1_9.renderTransparent(local3, local9);
Static181.aClass3_Sub2_Sub1_9.method1421(local3 + local13 - Static181.aClass3_Sub2_Sub1_9.width, local9); Static181.aClass3_Sub2_Sub1_9.method1421(local3 + local13 - Static181.aClass3_Sub2_Sub1_9.width, local9);
} }
Fonts.b12Full.method2857(LocalizedText.CHOOSE_OPTION, local3 + 3, local9 + 14, Static195.anInt4581, -1); Fonts.b12Full.method2857(LocalizedText.CHOOSE_OPTION, local3 + 3, local9 + 14, Static195.anInt4581, -1);
@ -67,9 +67,9 @@ public final class Static112 {
} }
} }
if ((Static165.aClass3_Sub2_Sub1_8 == null || Static92.aClass3_Sub2_Sub1_6 == null || Static204.aClass3_Sub2_Sub1_10 == null) && client.js5Archive8.isFileReady(Static85.anInt2261) && client.js5Archive8.isFileReady(Static136.anInt3324) && client.js5Archive8.isFileReady(Static254.anInt5556)) { if ((Static165.aClass3_Sub2_Sub1_8 == null || Static92.aClass3_Sub2_Sub1_6 == null || Static204.aClass3_Sub2_Sub1_10 == null) && client.js5Archive8.isFileReady(Static85.anInt2261) && client.js5Archive8.isFileReady(Static136.anInt3324) && client.js5Archive8.isFileReady(Static254.anInt5556)) {
Static165.aClass3_Sub2_Sub1_8 = Static80.loadSoftwareAlphaSprite(client.js5Archive8, Static85.anInt2261); Static165.aClass3_Sub2_Sub1_8 = SoftwareSprite.loadSoftwareAlphaSprite(client.js5Archive8, Static85.anInt2261);
Static92.aClass3_Sub2_Sub1_6 = Static80.loadSoftwareAlphaSprite(client.js5Archive8, Static136.anInt3324); Static92.aClass3_Sub2_Sub1_6 = SoftwareSprite.loadSoftwareAlphaSprite(client.js5Archive8, Static136.anInt3324);
Static204.aClass3_Sub2_Sub1_10 = Static80.loadSoftwareAlphaSprite(client.js5Archive8, Static254.anInt5556); Static204.aClass3_Sub2_Sub1_10 = SoftwareSprite.loadSoftwareAlphaSprite(client.js5Archive8, Static254.anInt5556);
if (GlRenderer.enabled) { if (GlRenderer.enabled) {
if (Static165.aClass3_Sub2_Sub1_8 instanceof SoftwareAlphaSprite) { if (Static165.aClass3_Sub2_Sub1_8 instanceof SoftwareAlphaSprite) {
Static165.aClass3_Sub2_Sub1_8 = new GlAlphaSprite((SoftwareSprite) Static165.aClass3_Sub2_Sub1_8); Static165.aClass3_Sub2_Sub1_8 = new GlAlphaSprite((SoftwareSprite) Static165.aClass3_Sub2_Sub1_8);
@ -92,14 +92,14 @@ public final class Static112 {
if (Static165.aClass3_Sub2_Sub1_8 != null && Static92.aClass3_Sub2_Sub1_6 != null && Static204.aClass3_Sub2_Sub1_10 != null) { if (Static165.aClass3_Sub2_Sub1_8 != null && Static92.aClass3_Sub2_Sub1_6 != null && Static204.aClass3_Sub2_Sub1_10 != null) {
local203 = local13 / Static165.aClass3_Sub2_Sub1_8.width; local203 = local13 / Static165.aClass3_Sub2_Sub1_8.width;
for (local219 = 0; local219 < local203; local219++) { for (local219 = 0; local219 < local203; local219++) {
Static165.aClass3_Sub2_Sub1_8.method1423(local3 + Static165.aClass3_Sub2_Sub1_8.width * local219, local11 + local9 + -Static165.aClass3_Sub2_Sub1_8.height); Static165.aClass3_Sub2_Sub1_8.renderTransparent(local3 + Static165.aClass3_Sub2_Sub1_8.width * local219, local11 + local9 + -Static165.aClass3_Sub2_Sub1_8.height);
} }
local219 = (local11 - 20) / Static92.aClass3_Sub2_Sub1_6.height; local219 = (local11 - 20) / Static92.aClass3_Sub2_Sub1_6.height;
for (local418 = 0; local418 < local219; local418++) { for (local418 = 0; local418 < local219; local418++) {
Static92.aClass3_Sub2_Sub1_6.method1423(local3, local9 + local418 * Static92.aClass3_Sub2_Sub1_6.height + 20); Static92.aClass3_Sub2_Sub1_6.renderTransparent(local3, local9 + local418 * Static92.aClass3_Sub2_Sub1_6.height + 20);
Static92.aClass3_Sub2_Sub1_6.method1421(local3 + local13 - Static92.aClass3_Sub2_Sub1_6.width, local9 + 20 + local418 * Static92.aClass3_Sub2_Sub1_6.height); Static92.aClass3_Sub2_Sub1_6.method1421(local3 + local13 - Static92.aClass3_Sub2_Sub1_6.width, local9 + 20 + local418 * Static92.aClass3_Sub2_Sub1_6.height);
} }
Static204.aClass3_Sub2_Sub1_10.method1423(local3, local11 + local9 - Static204.aClass3_Sub2_Sub1_10.height); Static204.aClass3_Sub2_Sub1_10.renderTransparent(local3, local11 + local9 - Static204.aClass3_Sub2_Sub1_10.height);
Static204.aClass3_Sub2_Sub1_10.method1421(local3 + local13 - Static204.aClass3_Sub2_Sub1_10.width, local9 - -local11 + -Static204.aClass3_Sub2_Sub1_10.height); Static204.aClass3_Sub2_Sub1_10.method1421(local3 + local13 - Static204.aClass3_Sub2_Sub1_10.width, local9 - -local11 + -Static204.aClass3_Sub2_Sub1_10.height);
} }
for (local203 = 0; local203 < MiniMenu.size; local203++) { for (local203 = 0; local203 < MiniMenu.size; local203++) {

10
client/src/main/java/rt4/Static113.java
View file

@ -9,16 +9,6 @@ public final class Static113 {
@OriginalMember(owner = "client!il", name = "O", descriptor = "I") @OriginalMember(owner = "client!il", name = "O", descriptor = "I")
public static int anInt4612; public static int anInt4612;
@OriginalMember(owner = "client!il", name = "a", descriptor = "(III)V")
public static void method3556(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2) {
Static158.aBoolean187 = true;
Static160.anInt3902 = arg0;
Static89.anInt2388 = arg1;
Static131.anInt3259 = arg2;
Static56.anInt1742 = -1;
Static116.anInt2954 = -1;
}
@OriginalMember(owner = "client!il", name = "a", descriptor = "(BII)Z") @OriginalMember(owner = "client!il", name = "a", descriptor = "(BII)Z")
public static boolean method3557(@OriginalArg(1) int arg0, @OriginalArg(2) int arg1) { public static boolean method3557(@OriginalArg(1) int arg0, @OriginalArg(2) int arg1) {
if (arg1 == 11) { if (arg1 == 11) {

5
client/src/main/java/rt4/Static114.java
View file

@ -10,10 +10,7 @@ public final class Static114 {
@OriginalMember(owner = "client!j", name = "K", descriptor = "I") @OriginalMember(owner = "client!j", name = "K", descriptor = "I")
public static int anInt5843 = 0; public static int anInt5843 = 0;
@OriginalMember(owner = "client!j", name = "M", descriptor = "Lclient!na;") @OriginalMember(owner = "client!j", name = "O", descriptor = "[I")
public static final JagString REPLACECANVAS = JagString.parse("::replacecanvas");
@OriginalMember(owner = "client!j", name = "O", descriptor = "[I")
public static final int[] anIntArray565 = new int[] { 1, -1, -1, 1 }; public static final int[] anIntArray565 = new int[] { 1, -1, -1, 1 };
@OriginalMember(owner = "client!j", name = "c", descriptor = "(I)V") @OriginalMember(owner = "client!j", name = "c", descriptor = "(I)V")

6
client/src/main/java/rt4/Static115.java
View file

@ -38,12 +38,12 @@ public final class Static115 {
@OriginalMember(owner = "client!ja", name = "a", descriptor = "(IIIIB)V") @OriginalMember(owner = "client!ja", name = "a", descriptor = "(IIIIB)V")
public static void method2310(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2, @OriginalArg(3) int arg3) { public static void method2310(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2, @OriginalArg(3) int arg3) {
if (Cross.type == 1) { if (Cross.type == 1) {
Sprites.crosses[Cross.milliseconds / 100].method1423(Cross.x - 8, Cross.y + -8); Sprites.crosses[Cross.milliseconds / 100].renderTransparent(Cross.x - 8, Cross.y + -8);
} }
if (Cross.type == 2) { if (Cross.type == 2) {
Sprites.crosses[Cross.milliseconds / 100 + 4].method1423(Cross.x - 8, Cross.y + -8); Sprites.crosses[Cross.milliseconds / 100 + 4].renderTransparent(Cross.x - 8, Cross.y + -8);
} }
Static256.method4392(); Player.setTutorialIsland();
} }
@OriginalMember(owner = "client!ja", name = "a", descriptor = "(IIIIIZ)V") @OriginalMember(owner = "client!ja", name = "a", descriptor = "(IIIIIZ)V")

8
client/src/main/java/rt4/Static116.java
View file

@ -6,15 +6,9 @@ import org.openrs2.deob.annotation.Pc;
public final class Static116 { public final class Static116 {
@OriginalMember(owner = "client!jb", name = "c", descriptor = "Lclient!na;") @OriginalMember(owner = "client!jb", name = "n", descriptor = "I")
public static final JagString aClass100_583 = JagString.parse("(Y<)4col>");
@OriginalMember(owner = "client!jb", name = "n", descriptor = "I")
public static int anInt2952 = 0; public static int anInt2952 = 0;
@OriginalMember(owner = "client!jb", name = "p", descriptor = "I")
public static int anInt2954 = -1;
@OriginalMember(owner = "client!jb", name = "a", descriptor = "(ILclient!ve;I)Lclient!jk;") @OriginalMember(owner = "client!jb", name = "a", descriptor = "(ILclient!ve;I)Lclient!jk;")
public static MidiInstrument method2320(@OriginalArg(1) Js5 arg0, @OriginalArg(2) int arg1) { public static MidiInstrument method2320(@OriginalArg(1) Js5 arg0, @OriginalArg(2) int arg1) {
@Pc(9) byte[] local9 = arg0.method4500(arg1); @Pc(9) byte[] local9 = arg0.method4500(arg1);

227
client/src/main/java/rt4/Static117.java
View file

@ -1,227 +0,0 @@
package rt4;
import org.openrs2.deob.annotation.OriginalArg;
import org.openrs2.deob.annotation.OriginalMember;
import org.openrs2.deob.annotation.Pc;
public final class Static117 {
@OriginalMember(owner = "client!jc", name = "p", descriptor = "[F")
public static float[] aFloatArray9;
@OriginalMember(owner = "client!jc", name = "q", descriptor = "[F")
public static float[] aFloatArray10;
@OriginalMember(owner = "client!jc", name = "t", descriptor = "[I")
public static int[] anIntArray276;
@OriginalMember(owner = "client!jc", name = "u", descriptor = "[Lclient!vb;")
public static VorbisResidue[] aClass152Array1;
@OriginalMember(owner = "client!jc", name = "v", descriptor = "[Z")
public static boolean[] aBooleanArray63;
@OriginalMember(owner = "client!jc", name = "y", descriptor = "I")
public static int anInt2975;
@OriginalMember(owner = "client!jc", name = "A", descriptor = "[Lclient!uk;")
public static VorbisMapping[] aClass151Array1;
@OriginalMember(owner = "client!jc", name = "B", descriptor = "[F")
public static float[] aFloatArray12;
@OriginalMember(owner = "client!jc", name = "C", descriptor = "[F")
public static float[] aFloatArray13;
@OriginalMember(owner = "client!jc", name = "E", descriptor = "I")
public static int anInt2978;
@OriginalMember(owner = "client!jc", name = "F", descriptor = "[F")
public static float[] aFloatArray14;
@OriginalMember(owner = "client!jc", name = "G", descriptor = "I")
private static int anInt2979;
@OriginalMember(owner = "client!jc", name = "I", descriptor = "[Lclient!ji;")
public static VorbisCodebook[] aClass78Array1;
@OriginalMember(owner = "client!jc", name = "J", descriptor = "[Lclient!ie;")
public static VorbisRange[] aClass67Array1;
@OriginalMember(owner = "client!jc", name = "L", descriptor = "[I")
public static int[] anIntArray277;
@OriginalMember(owner = "client!jc", name = "P", descriptor = "[F")
public static float[] aFloatArray15;
@OriginalMember(owner = "client!jc", name = "Q", descriptor = "I")
private static int anInt2982;
@OriginalMember(owner = "client!jc", name = "S", descriptor = "[F")
public static float[] aFloatArray16;
@OriginalMember(owner = "client!jc", name = "T", descriptor = "[B")
private static byte[] aByteArray42;
@OriginalMember(owner = "client!jc", name = "W", descriptor = "[I")
public static int[] anIntArray278;
@OriginalMember(owner = "client!jc", name = "H", descriptor = "Z")
private static boolean aBoolean149 = false;
@OriginalMember(owner = "client!jc", name = "c", descriptor = "(I)F")
public static float method2340(@OriginalArg(0) int arg0) {
@Pc(3) int local3 = arg0 & 0x1FFFFF;
@Pc(7) int local7 = arg0 & Integer.MIN_VALUE;
@Pc(13) int local13 = arg0 >> 21 & 0x3FF;
if (local7 != 0) {
local3 = -local3;
}
return (float) ((double) local3 * Math.pow(2.0D, (double) (local13 - 788)));
}
@OriginalMember(owner = "client!jc", name = "a", descriptor = "(Lclient!ve;)Z")
private static boolean method2344(@OriginalArg(0) Js5 arg0) {
if (!aBoolean149) {
@Pc(7) byte[] local7 = arg0.getFile(0, 0);
if (local7 == null) {
return false;
}
method2349(local7);
aBoolean149 = true;
}
return true;
}
@OriginalMember(owner = "client!jc", name = "a", descriptor = "(Lclient!ve;II)Lclient!jc;")
public static VorbisSound method2345(@OriginalArg(0) Js5 arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2) {
if (method2344(arg0)) {
@Pc(16) byte[] local16 = arg0.getFile(arg1, arg2);
return local16 == null ? null : new VorbisSound(local16);
} else {
arg0.isFileReady(arg2, arg1);
return null;
}
}
@OriginalMember(owner = "client!jc", name = "b", descriptor = "()I")
public static int method2346() {
@Pc(7) int local7 = aByteArray42[anInt2979] >> anInt2982 & 0x1;
anInt2982++;
anInt2979 += anInt2982 >> 3;
anInt2982 &= 0x7;
return local7;
}
@OriginalMember(owner = "client!jc", name = "a", descriptor = "([BI)V")
public static void method2347(@OriginalArg(0) byte[] arg0) {
aByteArray42 = arg0;
anInt2979 = 0;
anInt2982 = 0;
}
@OriginalMember(owner = "client!jc", name = "b", descriptor = "([B)V")
private static void method2349(@OriginalArg(0) byte[] arg0) {
method2347(arg0);
anInt2978 = 0x1 << method2350(4);
anInt2975 = 0x1 << method2350(4);
aFloatArray14 = new float[anInt2975];
@Pc(17) int local17;
@Pc(26) int local26;
@Pc(30) int local30;
@Pc(34) int local34;
@Pc(38) int local38;
for (local17 = 0; local17 < 2; local17++) {
local26 = local17 == 0 ? anInt2978 : anInt2975;
local30 = local26 >> 1;
local34 = local26 >> 2;
local38 = local26 >> 3;
@Pc(41) float[] local41 = new float[local30];
for (@Pc(43) int local43 = 0; local43 < local34; local43++) {
local41[local43 * 2] = (float) Math.cos((double) (local43 * 4) * 3.141592653589793D / (double) local26);
local41[local43 * 2 + 1] = -((float) Math.sin((double) (local43 * 4) * 3.141592653589793D / (double) local26));
}
@Pc(86) float[] local86 = new float[local30];
for (@Pc(88) int local88 = 0; local88 < local34; local88++) {
local86[local88 * 2] = (float) Math.cos((double) (local88 * 2 + 1) * 3.141592653589793D / (double) (local26 * 2));
local86[local88 * 2 + 1] = (float) Math.sin((double) (local88 * 2 + 1) * 3.141592653589793D / (double) (local26 * 2));
}
@Pc(138) float[] local138 = new float[local34];
for (@Pc(140) int local140 = 0; local140 < local38; local140++) {
local138[local140 * 2] = (float) Math.cos((double) (local140 * 4 + 2) * 3.141592653589793D / (double) local26);
local138[local140 * 2 + 1] = -((float) Math.sin((double) (local140 * 4 + 2) * 3.141592653589793D / (double) local26));
}
@Pc(187) int[] local187 = new int[local38];
@Pc(193) int local193 = Static204.method3674(local38 - 1);
for (@Pc(195) int local195 = 0; local195 < local38; local195++) {
local187[local195] = Static24.method667(local193, local195);
}
if (local17 == 0) {
aFloatArray13 = local41;
aFloatArray15 = local86;
aFloatArray16 = local138;
anIntArray276 = local187;
} else {
aFloatArray12 = local41;
aFloatArray9 = local86;
aFloatArray10 = local138;
anIntArray277 = local187;
}
}
local17 = method2350(8) + 1;
aClass78Array1 = new VorbisCodebook[local17];
for (local26 = 0; local26 < local17; local26++) {
aClass78Array1[local26] = new VorbisCodebook();
}
local26 = method2350(6) + 1;
for (local30 = 0; local30 < local26; local30++) {
method2350(16);
}
local26 = method2350(6) + 1;
aClass67Array1 = new VorbisRange[local26];
for (local30 = 0; local30 < local26; local30++) {
aClass67Array1[local30] = new VorbisRange();
}
local30 = method2350(6) + 1;
aClass152Array1 = new VorbisResidue[local30];
for (local34 = 0; local34 < local30; local34++) {
aClass152Array1[local34] = new VorbisResidue();
}
local34 = method2350(6) + 1;
aClass151Array1 = new VorbisMapping[local34];
for (local38 = 0; local38 < local34; local38++) {
aClass151Array1[local38] = new VorbisMapping();
}
local38 = method2350(6) + 1;
aBooleanArray63 = new boolean[local38];
anIntArray278 = new int[local38];
for (@Pc(340) int local340 = 0; local340 < local38; local340++) {
aBooleanArray63[local340] = method2346() != 0;
method2350(16);
method2350(16);
anIntArray278[local340] = method2350(8);
}
}
@OriginalMember(owner = "client!jc", name = "e", descriptor = "(I)I")
public static int method2350(@OriginalArg(0) int arg0) {
@Pc(1) int local1 = 0;
@Pc(3) int local3 = 0;
@Pc(12) int local12;
while (arg0 >= 8 - anInt2982) {
local12 = 8 - anInt2982;
@Pc(18) int local18 = (0x1 << local12) - 1;
local1 += (aByteArray42[anInt2979] >> anInt2982 & local18) << local3;
anInt2982 = 0;
anInt2979++;
local3 += local12;
arg0 -= local12;
}
if (arg0 > 0) {
local12 = (0x1 << arg0) - 1;
local1 += (aByteArray42[anInt2979] >> anInt2982 & local12) << local3;
anInt2982 += arg0;
}
return local1;
}
}

11
client/src/main/java/rt4/Static118.java
View file

@ -6,10 +6,7 @@ import org.openrs2.deob.annotation.Pc;
public final class Static118 { public final class Static118 {
@OriginalMember(owner = "client!jd", name = "d", descriptor = "[[[B") @OriginalMember(owner = "client!jd", name = "i", descriptor = "Lclient!be;")
public static byte[][][] aByteArrayArrayArray9;
@OriginalMember(owner = "client!jd", name = "i", descriptor = "Lclient!be;")
public static Component aClass13_15; public static Component aClass13_15;
@OriginalMember(owner = "client!jd", name = "a", descriptor = "(B)I") @OriginalMember(owner = "client!jd", name = "a", descriptor = "(B)I")
@ -18,12 +15,6 @@ public final class Static118 {
return Static119.method2385(); return Static119.method2385();
} }
@OriginalMember(owner = "client!jd", name = "a", descriptor = "(IB)V")
public static void method2353(@OriginalArg(0) int arg0) {
@Pc(12) DelayedStateChange local12 = DelayedStateChange.create(12, arg0);
local12.pushClient();
}
@OriginalMember(owner = "client!jd", name = "a", descriptor = "(II[Lclient!be;)V") @OriginalMember(owner = "client!jd", name = "a", descriptor = "(II[Lclient!be;)V")
public static void method2354(@OriginalArg(1) int arg0, @OriginalArg(2) Component[] arg1) { public static void method2354(@OriginalArg(1) int arg0, @OriginalArg(2) Component[] arg1) {
for (@Pc(7) int local7 = 0; local7 < arg1.length; local7++) { for (@Pc(7) int local7 = 0; local7 < arg1.length; local7++) {

8
client/src/main/java/rt4/Static119.java
View file

@ -7,13 +7,7 @@ public final class Static119 {
@OriginalMember(owner = "client!je", name = "eb", descriptor = "[I") @OriginalMember(owner = "client!je", name = "eb", descriptor = "[I")
public static int[] anIntArray282; public static int[] anIntArray282;
@OriginalMember(owner = "client!je", name = "U", descriptor = "Lclient!na;") @OriginalMember(owner = "client!je", name = "j", descriptor = "(I)I")
public static final JagString aClass100_588 = JagString.parse("showingVideoAd");
@OriginalMember(owner = "client!je", name = "db", descriptor = "Lclient!na;")
public static final JagString aClass100_589 = JagString.parse(" <col=ffffff>");
@OriginalMember(owner = "client!je", name = "j", descriptor = "(I)I")
public static int method2385() { public static int method2385() {
if (WorldMap.labels == null) { if (WorldMap.labels == null) {
return -1; return -1;

39
client/src/main/java/rt4/Static12.java
View file

@ -1,7 +1,6 @@
package rt4; package rt4;
import org.openrs2.deob.annotation.OriginalMember; import org.openrs2.deob.annotation.OriginalMember;
import org.openrs2.deob.annotation.Pc;
public final class Static12 { public final class Static12 {
@ -11,42 +10,4 @@ public final class Static12 {
@OriginalMember(owner = "client!bb", name = "t", descriptor = "[[B") @OriginalMember(owner = "client!bb", name = "t", descriptor = "[[B")
public static final byte[][] aByteArrayArray2 = new byte[250][]; public static final byte[][] aByteArrayArray2 = new byte[250][];
@OriginalMember(owner = "client!bb", name = "A", descriptor = "Lclient!na;")
public static final JagString aClass100_74 = JagString.parse("::");
@OriginalMember(owner = "client!bb", name = "a", descriptor = "(I)V")
public static void method447() {
if (WorldMap.zoom < WorldMap.targetZoom) {
WorldMap.zoom = (float) ((double) WorldMap.zoom + (double) WorldMap.zoom / 30.0D);
if (WorldMap.targetZoom < WorldMap.zoom) {
WorldMap.zoom = WorldMap.targetZoom;
}
WorldMap.method965();
} else if (WorldMap.targetZoom < WorldMap.zoom) {
WorldMap.zoom = (float) ((double) WorldMap.zoom - (double) WorldMap.zoom / 30.0D);
if (WorldMap.targetZoom > WorldMap.zoom) {
WorldMap.zoom = WorldMap.targetZoom;
}
WorldMap.method965();
}
if (WorldMap.anInt3482 == -1 || WorldMap.anInt4901 == -1) {
return;
}
@Pc(60) int local60 = WorldMap.anInt3482 - WorldMap.anInt435;
if (local60 < 2 || local60 > 2) {
local60 >>= 0x4;
}
@Pc(78) int local78 = WorldMap.anInt4901 - WorldMap.anInt919;
if (local78 < 2 || local78 > 2) {
local78 >>= 0x4;
}
WorldMap.anInt919 -= -local78;
WorldMap.anInt435 += local60;
if (local60 == 0 && local78 == 0) {
WorldMap.anInt3482 = -1;
WorldMap.anInt4901 = -1;
}
WorldMap.method965();
}
} }

458
client/src/main/java/rt4/Static120.java
View file

@ -1,458 +0,0 @@
package rt4;
import com.jogamp.opengl.*;
import org.openrs2.deob.annotation.OriginalArg;
import org.openrs2.deob.annotation.OriginalMember;
import org.openrs2.deob.annotation.Pc;
public final class Static120 {
@OriginalMember(owner = "client!jf", name = "c", descriptor = "[I")
private static int[] anIntArray283;
@OriginalMember(owner = "client!jf", name = "d", descriptor = "I")
private static int anInt3029;
@OriginalMember(owner = "client!jf", name = "e", descriptor = "I")
private static int anInt3030;
@OriginalMember(owner = "client!jf", name = "f", descriptor = "[Z")
private static boolean[] aBooleanArray65;
@OriginalMember(owner = "client!jf", name = "g", descriptor = "[[[I")
private static int[][][] anIntArrayArrayArray11;
@OriginalMember(owner = "client!jf", name = "h", descriptor = "[I")
private static int[] anIntArray284;
@OriginalMember(owner = "client!jf", name = "i", descriptor = "I")
private static int anInt3031;
@OriginalMember(owner = "client!jf", name = "j", descriptor = "I")
private static int anInt3032;
@OriginalMember(owner = "client!jf", name = "k", descriptor = "I")
private static int anInt3033;
@OriginalMember(owner = "client!jf", name = "m", descriptor = "[Z")
private static boolean[] aBooleanArray66;
@OriginalMember(owner = "client!jf", name = "n", descriptor = "I")
private static int anInt3035;
@OriginalMember(owner = "client!jf", name = "o", descriptor = "I")
private static int anInt3036;
@OriginalMember(owner = "client!jf", name = "p", descriptor = "I")
private static int anInt3037;
@OriginalMember(owner = "client!jf", name = "b", descriptor = "[F")
private static final float[] aFloatArray17 = new float[] { 0.0F, 0.0F, 0.0F, 1.0F };
@OriginalMember(owner = "client!jf", name = "a", descriptor = "(IIIIIII)V")
public static void method2388(@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) {
if (!Preferences.highDetailLighting) {
return;
}
if (arg0 == 1 && arg5 > 0) {
method2393(arg1, arg2, arg3, arg4, arg5 - 1, arg6);
} else if (arg0 == 4 && arg5 < anInt3037 - 1) {
method2393(arg1, arg2, arg3, arg4, arg5 + 1, arg6);
} else if (arg0 == 8 && arg6 > 0) {
method2393(arg1, arg2, arg3, arg4, arg5, arg6 - 1);
} else if (arg0 == 2 && arg6 < anInt3036 - 1) {
method2393(arg1, arg2, arg3, arg4, arg5, arg6 + 1);
} else if (arg0 == 16 && arg5 > 0 && arg6 < anInt3036 - 1) {
method2393(arg1, arg2, arg3, arg4, arg5 - 1, arg6 + 1);
} else if (arg0 == 32 && arg5 < anInt3037 - 1 && arg6 < anInt3036 - 1) {
method2393(arg1, arg2, arg3, arg4, arg5 + 1, arg6 + 1);
} else if (arg0 == 128 && arg5 > 0 && arg6 > 0) {
method2393(arg1, arg2, arg3, arg4, arg5 - 1, arg6 - 1);
} else if (arg0 == 64 && arg5 < anInt3037 - 1 && arg6 > 0) {
method2393(arg1, arg2, arg3, arg4, arg5 + 1, arg6 - 1);
}
}
@OriginalMember(owner = "client!jf", name = "a", descriptor = "(Lclient!gi;)V")
public static void method2389(@OriginalArg(0) Light arg0) {
if (LightingManager.lightCount >= 255) {
System.out.println("Number of lights added exceeds maximum!");
} else {
LightingManager.lights[LightingManager.lightCount++] = arg0;
}
}
@OriginalMember(owner = "client!jf", name = "a", descriptor = "()V")
public static void method2390() {
for (@Pc(1) int local1 = 0; local1 < 4; local1++) {
anIntArray284[local1] = -1;
method2396(local1);
}
}
@OriginalMember(owner = "client!jf", name = "a", descriptor = "(IIIIIIII)V")
public static void method2391(@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) {
if (!Preferences.highDetailLighting || anInt3031 == arg3 && anInt3033 == arg4 && anInt3029 == arg5 && anInt3035 == arg6 && anInt3030 == arg7) {
return;
}
@Pc(20) int local20;
for (local20 = 0; local20 < 4; local20++) {
aBooleanArray66[local20] = false;
}
local20 = 0;
@Pc(33) int local33 = 0;
@Pc(35) int local35;
@Pc(40) int local40;
label112: for (local35 = arg4; local35 <= arg6; local35++) {
label110: for (local40 = arg5; local40 <= arg7; local40++) {
@Pc(51) int local51 = anIntArrayArrayArray11[arg3][local35][local40];
while (true) {
while (true) {
label96: while (true) {
if (local51 == 0) {
continue label110;
}
@Pc(59) int local59 = (local51 & 0xFF) - 1;
local51 >>>= 0x8;
@Pc(65) int local65;
for (local65 = 0; local65 < local33; local65++) {
if (local59 == anIntArray283[local65]) {
continue label96;
}
}
for (local65 = 0; local65 < 4; local65++) {
if (local59 == anIntArray284[local65]) {
if (!aBooleanArray66[local65]) {
aBooleanArray66[local65] = true;
local20++;
if (local20 == 4) {
break label112;
}
}
continue label96;
}
}
anIntArray283[local33++] = local59;
local20++;
if (local20 == 4) {
break label112;
}
}
}
}
}
}
for (local35 = 0; local35 < local33; local35++) {
for (local40 = 0; local40 < 4; local40++) {
if (!aBooleanArray66[local40]) {
anIntArray284[local40] = anIntArray283[local35];
aBooleanArray66[local40] = true;
method2403(local40, LightingManager.lights[anIntArray283[local35]], arg0, arg1, arg2);
break;
}
}
}
for (local35 = 0; local35 < 4; local35++) {
if (!aBooleanArray66[local35]) {
anIntArray284[local35] = -1;
method2396(local35);
}
}
anInt3031 = arg3;
anInt3033 = arg4;
anInt3029 = arg5;
anInt3035 = arg6;
anInt3030 = arg7;
}
@OriginalMember(owner = "client!jf", name = "a", descriptor = "(III)V")
public static void method2392() {
anInt3032 = 4;
anInt3037 = 104;
anInt3036 = 104;
anIntArrayArrayArray11 = new int[anInt3032][anInt3037][anInt3036];
}
@OriginalMember(owner = "client!jf", name = "a", descriptor = "(IIIIII)V")
public static void method2393(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2, @OriginalArg(3) int arg3, @OriginalArg(4) int arg4, @OriginalArg(5) int arg5) {
if (!Preferences.highDetailLighting || anInt3031 == arg3 && anInt3033 == arg4 && anInt3029 == arg5 && anInt3035 == arg4 && anInt3030 == arg5) {
return;
}
@Pc(20) int local20;
for (local20 = 0; local20 < 4; local20++) {
aBooleanArray66[local20] = false;
}
local20 = 0;
@Pc(39) int local39 = anIntArrayArrayArray11[arg3][arg4][arg5];
while (true) {
@Pc(47) int local47;
@Pc(53) int local53;
label72: while (local39 != 0) {
local47 = (local39 & 0xFF) - 1;
local39 >>>= 0x8;
for (local53 = 0; local53 < 4; local53++) {
if (local47 == anIntArray284[local53]) {
aBooleanArray66[local53] = true;
continue label72;
}
}
anIntArray283[local20++] = local47;
}
for (local47 = 0; local47 < local20; local47++) {
for (local53 = 0; local53 < 4; local53++) {
if (!aBooleanArray66[local53]) {
anIntArray284[local53] = anIntArray283[local47];
aBooleanArray66[local53] = true;
method2403(local53, LightingManager.lights[anIntArray283[local47]], arg0, arg1, arg2);
break;
}
}
}
for (local47 = 0; local47 < 4; local47++) {
if (!aBooleanArray66[local47]) {
anIntArray284[local47] = -1;
method2396(local47);
}
}
anInt3031 = arg3;
anInt3033 = arg4;
anInt3029 = arg5;
anInt3035 = arg4;
anInt3030 = arg5;
return;
}
}
@OriginalMember(owner = "client!jf", name = "a", descriptor = "(IZ)V")
public static void method2394(@OriginalArg(0) int arg0, @OriginalArg(1) boolean arg1) {
for (@Pc(1) int local1 = 0; local1 < LightingManager.lightCount; local1++) {
LightingManager.lights[local1].method1765(arg1, arg0);
}
anInt3031 = -1;
anInt3033 = -1;
anInt3029 = -1;
anInt3035 = -1;
anInt3030 = -1;
}
@OriginalMember(owner = "client!jf", name = "b", descriptor = "()V")
public static void method2395() {
for (@Pc(1) int local1 = 0; local1 < LightingManager.lightCount; local1++) {
@Pc(8) Light local8 = LightingManager.lights[local1];
@Pc(11) int local11 = local8.anInt2241;
if (local8.aBoolean124) {
local11 = 0;
}
@Pc(19) int local19 = local8.anInt2241;
if (local8.aBoolean126) {
local19 = 3;
}
for (@Pc(26) int local26 = local11; local26 <= local19; local26++) {
@Pc(31) int local31 = 0;
@Pc(39) int local39 = (local8.anInt2245 >> 7) - local8.anInt2236;
if (local39 < 0) {
local31 = -local39;
local39 = 0;
}
@Pc(55) int local55 = (local8.anInt2245 >> 7) + local8.anInt2236;
if (local55 > anInt3036 - 1) {
local55 = anInt3036 - 1;
}
for (@Pc(66) int local66 = local39; local66 <= local55; local66++) {
@Pc(75) short local75 = local8.aShortArray30[local31++];
@Pc(87) int local87 = (local8.anInt2240 >> 7) + (local75 >> 8) - local8.anInt2236;
@Pc(95) int local95 = local87 + (local75 & 0xFF) - 1;
if (local87 < 0) {
local87 = 0;
}
if (local95 > anInt3037 - 1) {
local95 = anInt3037 - 1;
}
for (@Pc(110) int local110 = local87; local110 <= local95; local110++) {
@Pc(121) int local121 = anIntArrayArrayArray11[local26][local110][local66];
if ((local121 & 0xFF) == 0) {
anIntArrayArrayArray11[local26][local110][local66] = local121 | local1 + 1;
} else if ((local121 & 0xFF00) == 0) {
anIntArrayArrayArray11[local26][local110][local66] = local121 | local1 + 1 << 8;
} else if ((local121 & 0xFF0000) == 0) {
anIntArrayArrayArray11[local26][local110][local66] = local121 | local1 + 1 << 16;
} else if ((local121 & 0xFF000000) == 0) {
anIntArrayArrayArray11[local26][local110][local66] = local121 | local1 + 1 << 24;
}
}
}
}
}
}
@OriginalMember(owner = "client!jf", name = "a", descriptor = "(I)V")
private static void method2396(@OriginalArg(0) int arg0) {
if (aBooleanArray65[arg0]) {
aBooleanArray65[arg0] = false;
@Pc(14) int local14 = arg0 + 16384 + 4;
@Pc(16) GL2 local16 = GlRenderer.gl;
local16.glDisable(local14);
}
}
@OriginalMember(owner = "client!jf", name = "a", descriptor = "(IIIII)V")
public static void method2397(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2, @OriginalArg(3) int arg3, @OriginalArg(4) int arg4) {
if (!Preferences.highDetailLighting) {
return;
}
label43: for (@Pc(4) int local4 = 0; local4 < 4; local4++) {
if (anIntArray284[local4] != -1) {
@Pc(20) int local20 = anIntArrayArrayArray11[arg0][arg1][arg2];
@Pc(28) int local28;
while (local20 != 0) {
local28 = (local20 & 0xFF) - 1;
local20 >>>= 0x8;
if (local28 == anIntArray284[local4]) {
continue label43;
}
}
local20 = anIntArrayArrayArray11[arg0][arg3][arg4];
while (local20 != 0) {
local28 = (local20 & 0xFF) - 1;
local20 >>>= 0x8;
if (local28 == anIntArray284[local4]) {
continue label43;
}
}
}
anIntArray284[local4] = -1;
method2396(local4);
}
}
@OriginalMember(owner = "client!jf", name = "c", descriptor = "()V")
public static void method2398() {
LightingManager.lights = null;
anIntArray284 = null;
aBooleanArray65 = null;
anIntArray283 = null;
aBooleanArray66 = null;
anIntArrayArrayArray11 = null;
}
@OriginalMember(owner = "client!jf", name = "e", descriptor = "()V")
public static void method2400() {
@Pc(1) GL2 local1 = GlRenderer.gl;
@Pc(3) int local3;
for (local3 = 0; local3 < 4; local3++) {
@Pc(10) int local10 = local3 + 16388;
local1.glLightfv(local10, GL2.GL_AMBIENT, new float[] { 0.0F, 0.0F, 0.0F, 1.0F }, 0);
local1.glLightf(local10, GL2.GL_LINEAR_ATTENUATION, 0.0F);
local1.glLightf(local10, GL2.GL_CONSTANT_ATTENUATION, 0.0F);
}
for (local3 = 0; local3 < 4; local3++) {
anIntArray284[local3] = -1;
method2396(local3);
}
}
@OriginalMember(owner = "client!jf", name = "f", descriptor = "()V")
public static void method2401() {
LightingManager.lights = new Light[255];
anIntArray284 = new int[4];
aBooleanArray65 = new boolean[4];
anIntArray283 = new int[4];
aBooleanArray66 = new boolean[4];
anIntArrayArrayArray11 = new int[anInt3032][anInt3037][anInt3036];
}
@OriginalMember(owner = "client!jf", name = "a", descriptor = "(II[[[Lclient!bj;)V")
public static void method2402(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(2) Tile[][][] arg2) {
if (!Preferences.highDetailLighting) {
return;
}
@Pc(4) GL2 local4 = GlRenderer.gl;
MaterialManager.setMaterial(0, 0);
GlRenderer.setTextureCombineRgbMode(0);
GlRenderer.resetTextureMatrix();
GlRenderer.setTextureId(GlRenderer.anInt5328);
local4.glDepthMask(false);
GlRenderer.setLightingEnabled(false);
local4.glBlendFunc(GL2.GL_DST_COLOR, GL2.GL_ONE);
local4.glFogfv(GL2.GL_FOG_COLOR, new float[] { 0.0F, 0.0F, 0.0F, 0.0F }, 0);
local4.glTexEnvi(GL2.GL_TEXTURE_ENV, GL2.GL_SRC0_RGB, GL2.GL_CONSTANT);
local4.glTexEnvi(GL2.GL_TEXTURE_ENV, GL2.GL_OPERAND0_RGB, GL2.GL_SRC_ALPHA);
label71: for (@Pc(56) int local56 = 0; local56 < LightingManager.lightCount; local56++) {
@Pc(63) Light local63 = LightingManager.lights[local56];
@Pc(66) int local66 = local63.anInt2241;
if (local63.aBoolean125) {
local66--;
}
if (local63.aClass45_1 != null) {
@Pc(76) int local76 = 0;
@Pc(84) int local84 = (local63.anInt2245 >> 7) - local63.anInt2236;
@Pc(92) int local92 = (local63.anInt2245 >> 7) + local63.anInt2236;
if (local92 >= Static215.anInt4866) {
local92 = Static215.anInt4866 - 1;
}
if (local84 < Static80.anInt4698) {
local76 = Static80.anInt4698 - local84;
local84 = Static80.anInt4698;
}
for (@Pc(112) int local112 = local84; local112 <= local92; local112++) {
@Pc(121) short local121 = local63.aShortArray30[local76++];
@Pc(133) int local133 = (local63.anInt2240 >> 7) + (local121 >> 8) - local63.anInt2236;
@Pc(141) int local141 = local133 + (local121 & 0xFF) - 1;
if (local133 < Static31.anInt987) {
local133 = Static31.anInt987;
}
if (local141 >= Static2.anInt15) {
local141 = Static2.anInt15 - 1;
}
for (@Pc(155) int local155 = local133; local155 <= local141; local155++) {
@Pc(160) Tile local160 = null;
if (local66 >= 0) {
local160 = arg2[local66][local155][local112];
}
if (local66 < 0 || local160 != null && local160.aBoolean45) {
GlRenderer.method4159(201.5F - (float) local63.anInt2241 * 50.0F - 1.5F);
local4.glTexEnvfv(GL2.GL_TEXTURE_ENV, GL2.GL_TEXTURE_ENV_COLOR, new float[] { 0.0F, 0.0F, 0.0F, local63.aFloat8 }, 0);
local63.aClass45_1.method1556();
continue label71;
}
}
}
}
}
local4.glTexEnvi(GL2.GL_TEXTURE_ENV, GL2.GL_SRC0_RGB, GL2.GL_TEXTURE);
local4.glTexEnvi(GL2.GL_TEXTURE_ENV, GL2.GL_OPERAND0_RGB, GL2.GL_SRC_COLOR);
local4.glBlendFunc(GL2.GL_SRC_ALPHA, GL2.GL_ONE_MINUS_SRC_ALPHA);
local4.glDepthMask(true);
local4.glFogfv(GL2.GL_FOG_COLOR, Static161.fogColor, 0);
local4.glEnableClientState(GL2.GL_TEXTURE_COORD_ARRAY);
GlRenderer.method4173();
}
@OriginalMember(owner = "client!jf", name = "a", descriptor = "(ILclient!gi;III)V")
private static void method2403(@OriginalArg(0) int arg0, @OriginalArg(1) Light arg1, @OriginalArg(2) int arg2, @OriginalArg(3) int arg3, @OriginalArg(4) int arg4) {
@Pc(5) int local5 = arg0 + 16384 + 4;
@Pc(7) GL2 local7 = GlRenderer.gl;
if (!aBooleanArray65[arg0]) {
local7.glEnable(local5);
aBooleanArray65[arg0] = true;
}
local7.glLightf(local5, GL2.GL_QUADRATIC_ATTENUATION, arg1.aFloat9);
local7.glLightfv(local5, GL2.GL_DIFFUSE, arg1.aFloatArray3, 0);
aFloatArray17[0] = arg1.anInt2240 - arg2;
aFloatArray17[1] = arg1.anInt2235 - arg3;
aFloatArray17[2] = arg1.anInt2245 - arg4;
local7.glLightfv(local5, GL2.GL_POSITION, aFloatArray17, 0);
}
@OriginalMember(owner = "client!jf", name = "g", descriptor = "()V")
public static void method2404() {
LightingManager.lightCount = 0;
for (@Pc(3) int local3 = 0; local3 < anInt3032; local3++) {
for (@Pc(8) int local8 = 0; local8 < anInt3037; local8++) {
for (@Pc(13) int local13 = 0; local13 < anInt3036; local13++) {
anIntArrayArrayArray11[local3][local8][local13] = 0;
}
}
}
}
}

8
client/src/main/java/rt4/Static122.java
View file

@ -12,11 +12,11 @@ public final class Static122 {
public static void method2410(@OriginalArg(0) Js5 arg0, @OriginalArg(2) int arg1, @OriginalArg(5) int arg2) { public static void method2410(@OriginalArg(0) Js5 arg0, @OriginalArg(2) int arg1, @OriginalArg(5) int arg2) {
Static172.aClass153_70 = arg0; Static172.aClass153_70 = arg0;
MidiPlayer.anInt441 = 1; MidiPlayer.anInt441 = 1;
Static253.anInt5527 = arg2; MidiPlayer.anInt5527 = arg2;
Static226.anInt5085 = 0; Static226.anInt5085 = 0;
Static277.anInt5853 = arg1; MidiPlayer.anInt5853 = arg1;
Static72.aBoolean116 = false; MidiPlayer.aBoolean116 = false;
Static57.anInt1757 = 10000; MidiPlayer.anInt1757 = 10000;
} }
@OriginalMember(owner = "client!jh", name = "a", descriptor = "(IILclient!ve;Lclient!ve;I)Lclient!dd;") @OriginalMember(owner = "client!jh", name = "a", descriptor = "(IILclient!ve;Lclient!ve;I)Lclient!dd;")

24
client/src/main/java/rt4/Static123.java
View file

@ -1,6 +1,5 @@
package rt4; package rt4;
import org.openrs2.deob.annotation.OriginalArg;
import org.openrs2.deob.annotation.OriginalMember; import org.openrs2.deob.annotation.OriginalMember;
import org.openrs2.deob.annotation.Pc; import org.openrs2.deob.annotation.Pc;
@ -9,14 +8,9 @@ public final class Static123 {
@OriginalMember(owner = "client!jj", name = "e", descriptor = "I") @OriginalMember(owner = "client!jj", name = "e", descriptor = "I")
public static int anInt3058 = 0; public static int anInt3058 = 0;
@OriginalMember(owner = "client!jj", name = "g", descriptor = "Lclient!na;") @OriginalMember(owner = "client!jj", name = "j", descriptor = "Z")
public static final JagString aClass100_593 = JagString.parse(" (X");
@OriginalMember(owner = "client!jj", name = "j", descriptor = "Z")
public static boolean aBoolean155 = false; public static boolean aBoolean155 = false;
@OriginalMember(owner = "client!jj", name = "m", descriptor = "Lclient!na;")
public static final JagString aClass100_594 = JagString.parse("<)4col>");
@OriginalMember(owner = "client!ml", name = "K", descriptor = "I") @OriginalMember(owner = "client!ml", name = "K", descriptor = "I")
public static int anInt3947; public static int anInt3947;
@ -32,9 +26,9 @@ public final class Static123 {
@OriginalMember(owner = "client!jj", name = "a", descriptor = "()V") @OriginalMember(owner = "client!jj", name = "a", descriptor = "()V")
public static void method2419() { public static void method2419() {
Static215.anInt4870 = 0; SceneGraph.anInt4870 = 0;
label194: for (@Pc(3) int local3 = 0; local3 < Static28.anInt917; local3++) { label194: for (@Pc(3) int local3 = 0; local3 < SceneGraph.anInt917; local3++) {
@Pc(10) Class120 local10 = Static91.aClass120Array1[local3]; @Pc(10) Class120 local10 = SceneGraph.aClass120Array1[local3];
@Pc(14) int local14; @Pc(14) int local14;
if (Static8.anIntArray8 != null) { if (Static8.anIntArray8 != null) {
for (local14 = 0; local14 < Static8.anIntArray8.length; local14++) { for (local14 = 0; local14 < Static8.anIntArray8.length; local14++) {
@ -80,7 +74,7 @@ public final class Static123 {
local10.anInt4450 = (local10.anInt4449 - Static217.anInt4903 << 8) / local158; local10.anInt4450 = (local10.anInt4449 - Static217.anInt4903 << 8) / local158;
local10.anInt4459 = (local10.anInt4444 - anInt3947 << 8) / local158; local10.anInt4459 = (local10.anInt4444 - anInt3947 << 8) / local158;
local10.anInt4463 = (local10.anInt4447 - anInt3947 << 8) / local158; local10.anInt4463 = (local10.anInt4447 - anInt3947 << 8) / local158;
Static247.aClass120Array2[Static215.anInt4870++] = local10; SceneGraph.aClass120Array2[SceneGraph.anInt4870++] = local10;
} }
} }
} else if (local10.anInt4453 == 2) { } else if (local10.anInt4453 == 2) {
@ -116,7 +110,7 @@ public final class Static123 {
local10.anInt4456 = (local10.anInt4445 - Static149.anInt3555 << 8) / local158; local10.anInt4456 = (local10.anInt4445 - Static149.anInt3555 << 8) / local158;
local10.anInt4459 = (local10.anInt4444 - anInt3947 << 8) / local158; local10.anInt4459 = (local10.anInt4444 - anInt3947 << 8) / local158;
local10.anInt4463 = (local10.anInt4447 - anInt3947 << 8) / local158; local10.anInt4463 = (local10.anInt4447 - anInt3947 << 8) / local158;
Static247.aClass120Array2[Static215.anInt4870++] = local10; SceneGraph.aClass120Array2[SceneGraph.anInt4870++] = local10;
} }
} }
} else if (local10.anInt4453 == 4) { } else if (local10.anInt4453 == 4) {
@ -154,7 +148,7 @@ public final class Static123 {
local10.anInt4456 = (local10.anInt4445 - Static149.anInt3555 << 8) / local14; local10.anInt4456 = (local10.anInt4445 - Static149.anInt3555 << 8) / local14;
local10.anInt4454 = (local10.anInt4458 - Static217.anInt4903 << 8) / local14; local10.anInt4454 = (local10.anInt4458 - Static217.anInt4903 << 8) / local14;
local10.anInt4450 = (local10.anInt4449 - Static217.anInt4903 << 8) / local14; local10.anInt4450 = (local10.anInt4449 - Static217.anInt4903 << 8) / local14;
Static247.aClass120Array2[Static215.anInt4870++] = local10; SceneGraph.aClass120Array2[SceneGraph.anInt4870++] = local10;
} }
} }
} }
@ -162,8 +156,4 @@ public final class Static123 {
} }
} }
@OriginalMember(owner = "client!jj", name = "b", descriptor = "(BI)Lclient!na;")
public static JagString parseInt(@OriginalArg(1) int arg0) {
return Static198.method1025(false, arg0);
}
} }

2
client/src/main/java/rt4/Static125.java
View file

@ -72,7 +72,7 @@ public final class Static125 {
} }
local9 = Static265.anInt5765 * 128 + 64; local9 = Static265.anInt5765 * 128 + 64;
local15 = Static251.anInt5449 * 128 + 64; local15 = Static251.anInt5449 * 128 + 64;
local23 = SceneGraph.getTileHeight(Player.level, local15, local9) - Static57.anInt1744; local23 = SceneGraph.getTileHeight(Player.level, local15, local9) - Static260.anInt1744;
@Pc(236) int local236 = local23 - Static5.anInt40; @Pc(236) int local236 = local23 - Static5.anInt40;
@Pc(241) int local241 = local9 - Static134.renderZ; @Pc(241) int local241 = local9 - Static134.renderZ;
@Pc(246) int local246 = local15 - Static138.renderX; @Pc(246) int local246 = local15 - Static138.renderX;

38
client/src/main/java/rt4/Static127.java
View file

@ -7,6 +7,8 @@ import org.openrs2.deob.annotation.Pc;
public final class Static127 { public final class Static127 {
@OriginalMember(owner = "client!hh", name = "a", descriptor = "Lclient!na;")
public static final JagString aClass100_520 = JagString.parse("(U4");
@OriginalMember(owner = "client!k", name = "j", descriptor = "I") @OriginalMember(owner = "client!k", name = "j", descriptor = "I")
public static int anInt3126; public static int anInt3126;
@ -21,7 +23,7 @@ public final class Static127 {
@OriginalMember(owner = "client!k", name = "a", descriptor = "(IIBLclient!ve;Lclient!ve;)Lclient!rk;") @OriginalMember(owner = "client!k", name = "a", descriptor = "(IIBLclient!ve;Lclient!ve;)Lclient!rk;")
public static Font method2462(@OriginalArg(1) int arg0, @OriginalArg(3) Js5 arg1, @OriginalArg(4) Js5 arg2) { public static Font method2462(@OriginalArg(1) int arg0, @OriginalArg(3) Js5 arg1, @OriginalArg(4) Js5 arg2) {
return SpriteLoader.decode(arg1, 0, arg0) ? Static29.method799(arg2.getFile(arg0, 0)) : null; return SpriteLoader.decode(arg1, 0, arg0) ? Font.method799(arg2.getFile(arg0, 0)) : null;
} }
@OriginalMember(owner = "client!k", name = "a", descriptor = "(IIIIZIZ)V") @OriginalMember(owner = "client!k", name = "a", descriptor = "(IIIIZIZ)V")
@ -53,7 +55,7 @@ public final class Static127 {
@Pc(103) Npc local103; @Pc(103) Npc local103;
@Pc(109) int local109; @Pc(109) int local109;
if (arg4) { if (arg4) {
Static272.anInt5214 = 0; NpcList.size = 0;
for (local96 = 0; local96 < 32768; local96++) { for (local96 = 0; local96 < 32768; local96++) {
local103 = NpcList.npcs[local96]; local103 = NpcList.npcs[local96];
if (local103 != null) { if (local103 != null) {
@ -64,7 +66,7 @@ public final class Static127 {
local103.movementQueueX[local109] -= local86; local103.movementQueueX[local109] -= local86;
local103.movementQueueZ[local109] -= local81; local103.movementQueueZ[local109] -= local81;
} }
Static33.anIntArray79[Static272.anInt5214++] = local96; NpcList.ids[NpcList.size++] = local96;
} else { } else {
NpcList.npcs[local96].setNpcType(null); NpcList.npcs[local96].setNpcType(null);
NpcList.npcs[local96] = null; NpcList.npcs[local96] = null;
@ -119,9 +121,9 @@ public final class Static127 {
@Pc(382) int local382 = local367 + local81; @Pc(382) int local382 = local367 + local81;
for (@Pc(384) int local384 = 0; local384 < 4; local384++) { for (@Pc(384) int local384 = 0; local384 < 4; local384++) {
if (local378 >= 0 && local382 >= 0 && local378 < 104 && local382 < 104) { if (local378 >= 0 && local382 >= 0 && local378 < 104 && local382 < 104) {
Static159.aClass69ArrayArrayArray1[local384][local358][local367] = Static159.aClass69ArrayArrayArray1[local384][local378][local382]; Static159.objStacks[local384][local358][local367] = Static159.objStacks[local384][local378][local382];
} else { } else {
Static159.aClass69ArrayArrayArray1[local384][local358][local367] = null; Static159.objStacks[local384][local358][local367] = null;
} }
} }
} }
@ -156,28 +158,6 @@ public final class Static127 {
Static217.aClass69_116.clear(); Static217.aClass69_116.clear();
} }
@OriginalMember(owner = "client!k", name = "a", descriptor = "(B)Lclient!da;")
public static DelayedStateChange poll() {
@Pc(10) DelayedStateChange local10 = (DelayedStateChange) DelayedStateChange.serverQueue.method795();
if (local10 != null) {
local10.unlink();
local10.method4365();
return local10;
}
do {
local10 = (DelayedStateChange) DelayedStateChange.clientQueue.method795();
if (local10 == null) {
return null;
}
if (local10.getTime() > MonotonicClock.currentTimeMillis()) {
return null;
}
local10.unlink();
local10.method4365();
} while ((Long.MIN_VALUE & local10.secondaryKey) == 0L);
return local10;
}
@OriginalMember(owner = "client!k", name = "a", descriptor = "(Lclient!be;Lclient!na;I)Lclient!na;") @OriginalMember(owner = "client!k", name = "a", descriptor = "(Lclient!be;Lclient!na;I)Lclient!na;")
public static JagString method2465(@OriginalArg(0) Component arg0, @OriginalArg(1) JagString arg1) { public static JagString method2465(@OriginalArg(0) Component arg0, @OriginalArg(1) JagString arg1) {
if (arg1.indexOf(Static49.PERCENT_SIGN) == -1) { if (arg1.indexOf(Static49.PERCENT_SIGN) == -1) {
@ -193,7 +173,7 @@ public final class Static127 {
local14 = arg1.indexOf(Static160.aClass100_761); local14 = arg1.indexOf(Static160.aClass100_761);
if (local14 == -1) { if (local14 == -1) {
while (true) { while (true) {
local14 = arg1.indexOf(Static96.aClass100_520); local14 = arg1.indexOf(aClass100_520);
if (local14 == -1) { if (local14 == -1) {
while (true) { while (true) {
local14 = arg1.indexOf(Static235.aClass100_1002); local14 = arg1.indexOf(Static235.aClass100_1002);
@ -209,7 +189,7 @@ public final class Static127 {
try { try {
if (Player.lastLogAddress.result != null) { if (Player.lastLogAddress.result != null) {
@Pc(265) byte[] local265 = ((String) Player.lastLogAddress.result).getBytes("ISO-8859-1"); @Pc(265) byte[] local265 = ((String) Player.lastLogAddress.result).getBytes("ISO-8859-1");
local246 = Static10.decodeString(local265, local265.length, 0); local246 = JagString.decodeString(local265, local265.length, 0);
} }
} catch (@Pc(274) UnsupportedEncodingException local274) { } catch (@Pc(274) UnsupportedEncodingException local274) {
} }

3
client/src/main/java/rt4/Static128.java
View file

@ -4,9 +4,6 @@ import org.openrs2.deob.annotation.OriginalMember;
public final class Static128 { public final class Static128 {
@OriginalMember(owner = "client!ka", name = "r", descriptor = "[I")
public static int[] anIntArray293;
@OriginalMember(owner = "client!ka", name = "t", descriptor = "[I") @OriginalMember(owner = "client!ka", name = "t", descriptor = "[I")
public static final int[] anIntArray294 = new int[] { 0, 0, 2, 0, 0, 2, 1, 1, 0 }; public static final int[] anIntArray294 = new int[] { 0, 0, 2, 0, 0, 2, 1, 1, 0 };

22
client/src/main/java/rt4/Static13.java
View file

@ -1,7 +1,6 @@
package rt4; package rt4;
import org.openrs2.deob.annotation.OriginalMember; import org.openrs2.deob.annotation.OriginalMember;
import org.openrs2.deob.annotation.Pc;
public final class Static13 { public final class Static13 {
@ -14,25 +13,4 @@ public final class Static13 {
@OriginalMember(owner = "client!bc", name = "I", descriptor = "Z") @OriginalMember(owner = "client!bc", name = "I", descriptor = "Z")
public static boolean aBoolean16 = false; public static boolean aBoolean16 = false;
@OriginalMember(owner = "client!bc", name = "N", descriptor = "Lclient!lb;")
public static final MonochromeImageCache_Class3_Sub23 aClass3_Sub23_1 = new MonochromeImageCache_Class3_Sub23(0, 0);
@OriginalMember(owner = "client!bc", name = "f", descriptor = "(B)Lclient!na;")
public static JagString method471() {
@Pc(32) JagString local32;
if (Static260.anInt5014 == 1 && MiniMenu.size < 2) {
local32 = JagString.concatenate(new JagString[] { LocalizedText.USE, LocalizedText.MINISEPARATOR, MiniMenu.aClass100_203, Static225.aClass100_961 });
} else if (Static241.aBoolean302 && MiniMenu.size < 2) {
local32 = JagString.concatenate(new JagString[] { MiniMenu.aClass100_545, LocalizedText.MINISEPARATOR, Static78.aClass100_466, Static225.aClass100_961 });
} else if (Cheat.shiftClick && Keyboard.pressedKeys[Keyboard.KEY_SHIFT] && MiniMenu.size > 2) {
local32 = MiniMenu.getOp(MiniMenu.size - 2);
} else {
local32 = MiniMenu.getOp(MiniMenu.size - 1);
}
if (MiniMenu.size > 2) {
local32 = JagString.concatenate(new JagString[] { local32, Static1.aClass100_2, Static123.parseInt(MiniMenu.size - 2), LocalizedText.MOREOPTIONS});
}
return local32;
}
} }

5
client/src/main/java/rt4/Static131.java
View file

@ -22,10 +22,7 @@ public final class Static131 {
@OriginalMember(owner = "client!kd", name = "yb", descriptor = "S") @OriginalMember(owner = "client!kd", name = "yb", descriptor = "S")
public static short aShort21 = 32767; public static short aShort21 = 32767;
@OriginalMember(owner = "client!kd", name = "zb", descriptor = "I") @OriginalMember(owner = "client!kd", name = "Bb", descriptor = "I")
public static int anInt3259 = 0;
@OriginalMember(owner = "client!kd", name = "Bb", descriptor = "I")
public static int anInt3260 = -1; public static int anInt3260 = -1;
@OriginalMember(owner = "client!kd", name = "a", descriptor = "([IIIII)V") @OriginalMember(owner = "client!kd", name = "a", descriptor = "([IIIII)V")

12
client/src/main/java/rt4/Static132.java
View file

@ -127,9 +127,9 @@ public final class Static132 {
Rasteriser.alpha = 0; Rasteriser.alpha = 0;
@Pc(475) int local475; @Pc(475) int local475;
if ((local307 - local323) * (local299 - local331) - (local315 - local331) * (local291 - local323) > 0) { if ((local307 - local323) * (local299 - local331) - (local315 - local331) * (local291 - local323) > 0) {
if (Static158.aBoolean187 && Static19.method583(Static89.anInt2388 + Rasteriser.centerX, Static131.anInt3259 + Rasteriser.centerY, local315, local331, local299, local307, local323, local291)) { if (MiniMenu.aBoolean187 && Static19.method583(MiniMenu.anInt2388 + Rasteriser.centerX, MiniMenu.anInt3259 + Rasteriser.centerY, local315, local331, local299, local307, local323, local291)) {
Static56.anInt1742 = arg6; MiniMenu.anInt1742 = arg6;
Static116.anInt2954 = arg7; MiniMenu.anInt2954 = arg7;
} }
if (!GlRenderer.enabled && !arg8) { if (!GlRenderer.enabled && !arg8) {
Rasteriser.testX = false; Rasteriser.testX = false;
@ -153,9 +153,9 @@ public final class Static132 {
if ((local275 - local291) * (local331 - local299) - (local283 - local299) * (local323 - local291) <= 0) { if ((local275 - local291) * (local331 - local299) - (local283 - local299) * (local323 - local291) <= 0) {
return; return;
} }
if (Static158.aBoolean187 && Static19.method583(Static89.anInt2388 + Rasteriser.centerX, Static131.anInt3259 + Rasteriser.centerY, local283, local299, local331, local275, local291, local323)) { if (MiniMenu.aBoolean187 && Static19.method583(MiniMenu.anInt2388 + Rasteriser.centerX, MiniMenu.anInt3259 + Rasteriser.centerY, local283, local299, local331, local275, local291, local323)) {
Static56.anInt1742 = arg6; MiniMenu.anInt1742 = arg6;
Static116.anInt2954 = arg7; MiniMenu.anInt2954 = arg7;
} }
if (GlRenderer.enabled || arg8) { if (GlRenderer.enabled || arg8) {
return; return;

3
client/src/main/java/rt4/Static137.java
View file

@ -8,9 +8,6 @@ public final class Static137 {
@OriginalMember(owner = "client!kl", name = "s", descriptor = "I") @OriginalMember(owner = "client!kl", name = "s", descriptor = "I")
public static int anInt3337 = 0; public static int anInt3337 = 0;
@OriginalMember(owner = "client!kl", name = "u", descriptor = "Lclient!na;")
public static final JagString aClass100_637 = JagString.parse("<col=ffffff>");
@OriginalMember(owner = "client!kl", name = "a", descriptor = "(Lclient!wa;B)Lclient!kc;") @OriginalMember(owner = "client!kl", name = "a", descriptor = "(Lclient!wa;B)Lclient!kc;")
public static TextureOp29SubOp2 method2664(@OriginalArg(0) Buffer arg0) { public static TextureOp29SubOp2 method2664(@OriginalArg(0) Buffer arg0) {
return new TextureOp29SubOp2(arg0.g2s(), arg0.g2s(), arg0.g2s(), arg0.g2s(), arg0.g3(), arg0.g3(), arg0.g1()); return new TextureOp29SubOp2(arg0.g2s(), arg0.g2s(), arg0.g2s(), arg0.g2s(), arg0.g3(), arg0.g3(), arg0.g1());

5
client/src/main/java/rt4/Static139.java
View file

@ -10,16 +10,13 @@ import org.openrs2.deob.annotation.Pc;
public final class Static139 { public final class Static139 {
@OriginalMember(owner = "client!l", name = "l", descriptor = "[I")
public static int[] anIntArray325;
@OriginalMember(owner = "client!l", name = "d", descriptor = "Lclient!na;") @OriginalMember(owner = "client!l", name = "d", descriptor = "Lclient!na;")
public static final JagString aClass100_659 = JagString.parse(")4j"); public static final JagString aClass100_659 = JagString.parse(")4j");
@OriginalMember(owner = "client!l", name = "a", descriptor = "(III)J") @OriginalMember(owner = "client!l", name = "a", descriptor = "(III)J")
public static long method2703(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2) { public static long method2703(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2) {
@Pc(7) Tile local7 = SceneGraph.tiles[arg0][arg1][arg2]; @Pc(7) Tile local7 = SceneGraph.tiles[arg0][arg1][arg2];
return local7 == null || local7.aClass24_1 == null ? 0L : local7.aClass24_1.key; return local7 == null || local7.wallDecor == null ? 0L : local7.wallDecor.key;
} }
@OriginalMember(owner = "client!l", name = "b", descriptor = "(I)V") @OriginalMember(owner = "client!l", name = "b", descriptor = "(I)V")

2
client/src/main/java/rt4/Static14.java
View file

@ -11,7 +11,7 @@ public final class Static14 {
@OriginalMember(owner = "client!bd", name = "a", descriptor = "(BI)V") @OriginalMember(owner = "client!bd", name = "a", descriptor = "(BI)V")
public static void method475(@OriginalArg(1) int arg0) { public static void method475(@OriginalArg(1) int arg0) {
@Pc(8) Inv local8 = (Inv) Static20.objectContainerCache.get((long) arg0); @Pc(8) Inv local8 = (Inv) Inv.objectContainerCache.get((long) arg0);
if (local8 != null) { if (local8 != null) {
for (@Pc(24) int local24 = 0; local24 < local8.objectIds.length; local24++) { for (@Pc(24) int local24 = 0; local24 < local8.objectIds.length; local24++) {
local8.objectIds[local24] = -1; local8.objectIds[local24] = -1;

11
client/src/main/java/rt4/Static141.java
View file

@ -8,17 +8,6 @@ public final class Static141 {
@OriginalMember(owner = "client!lb", name = "z", descriptor = "I") @OriginalMember(owner = "client!lb", name = "z", descriptor = "I")
public static int anInt3473; public static int anInt3473;
@OriginalMember(owner = "client!lb", name = "s", descriptor = "Lclient!na;")
public static final JagString CLAN = JagString.parse(":clan:");
@OriginalMember(owner = "client!lb", name = "d", descriptor = "(B)V")
public static void method2720() {
if (WorldMap.aClass100_724 != null) {
WorldMap.method1853(WorldMap.aClass100_724);
WorldMap.aClass100_724 = null;
}
}
@OriginalMember(owner = "client!lb", name = "a", descriptor = "(ZIIIBII)V") @OriginalMember(owner = "client!lb", name = "a", descriptor = "(ZIIIBII)V")
public static void method2722(@OriginalArg(0) boolean arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2, @OriginalArg(3) int arg3, @OriginalArg(5) int arg4, @OriginalArg(6) int arg5) { public static void method2722(@OriginalArg(0) boolean arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2, @OriginalArg(3) int arg3, @OriginalArg(5) int arg4, @OriginalArg(6) int arg5) {
Static113.anInt4612 = arg3; Static113.anInt4612 = arg3;

299
client/src/main/java/rt4/Static142.java
View file

@ -1,309 +1,10 @@
package rt4; package rt4;
import org.openrs2.deob.annotation.OriginalArg;
import org.openrs2.deob.annotation.OriginalMember; import org.openrs2.deob.annotation.OriginalMember;
import org.openrs2.deob.annotation.Pc;
public final class Static142 { public final class Static142 {
@OriginalMember(owner = "client!lc", name = "n", descriptor = "I") @OriginalMember(owner = "client!lc", name = "n", descriptor = "I")
public static int originZ; public static int originZ;
@OriginalMember(owner = "client!lc", name = "a", descriptor = "(IIIIIII)V")
public static void method2726(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2, @OriginalArg(3) int arg3, @OriginalArg(4) int arg4, @OriginalArg(5) int arg5) {
Static277.anInt5854 = 0;
@Pc(5) int local5;
@Pc(642) int local642;
@Pc(74) int local74;
@Pc(265) int local265;
@Pc(310) int local310;
@Pc(359) int local359;
@Pc(639) int local639;
for (local5 = -1; local5 < PlayerList.size + Static272.anInt5214; local5++) {
@Pc(17) PathingEntity local17;
if (local5 == -1) {
local17 = PlayerList.self;
} else if (PlayerList.size > local5) {
local17 = PlayerList.players[PlayerList.ids[local5]];
} else {
local17 = NpcList.npcs[Static33.anIntArray79[local5 - PlayerList.size]];
}
if (local17 != null && local17.method2682()) {
@Pc(58) NpcType local58;
if (local17 instanceof Npc) {
local58 = ((Npc) local17).type;
if (local58.multiNpcs != null) {
local58 = local58.getMultiNpc();
}
if (local58 == null) {
continue;
}
}
@Pc(161) int local161;
if (local5 >= PlayerList.size) {
local58 = ((Npc) local17).type;
if (local58.multiNpcs != null) {
local58 = local58.getMultiNpc();
}
if (local58.prayerIcon >= 0 && Sprites.headiconPrayers.length > local58.prayerIcon) {
if (local58.anInt3730 == -1) {
local265 = local17.method2691() + 15;
} else {
local265 = local58.anInt3730 + 15;
}
Static180.method3326(arg4 >> 1, arg3, local17, arg5, local265, arg1 >> 1);
if (Static65.anInt1951 > -1) {
Sprites.headiconPrayers[local58.prayerIcon].method1423(arg2 + Static65.anInt1951 - 12, arg0 + -30 - -Static16.anInt548);
}
}
@Pc(308) MapMarker[] local308 = Static143.hintMapMarkers;
for (local310 = 0; local310 < local308.length; local310++) {
@Pc(322) MapMarker local322 = local308[local310];
if (local322 != null && local322.type == 1 && local322.actorTargetId == Static33.anIntArray79[local5 - PlayerList.size] && client.loop % 20 < 10) {
if (local58.anInt3730 == -1) {
local359 = local17.method2691() + 15;
} else {
local359 = local58.anInt3730 + 15;
}
Static180.method3326(arg4 >> 1, arg3, local17, arg5, local359, arg1 >> 1);
if (Static65.anInt1951 > -1) {
Sprites.headhints[local322.anInt4048].method1423(arg2 + Static65.anInt1951 - 12, Static16.anInt548 + -28 + arg0);
}
}
}
} else {
local74 = 30;
@Pc(77) Player local77 = (Player) local17;
if (local77.anInt1669 != -1 || local77.anInt1649 != -1) {
Static180.method3326(arg4 >> 1, arg3, local17, arg5, local17.method2691() + 15, arg1 >> 1);
if (Static65.anInt1951 > -1) {
if (local77.anInt1669 != -1) {
Sprites.headiconPks[local77.anInt1669].method1423(Static65.anInt1951 + arg2 - 12, arg0 + -30 + Static16.anInt548);
local74 += 25;
}
if (local77.anInt1649 != -1) {
Sprites.headiconPrayers[local77.anInt1649].method1423(arg2 + Static65.anInt1951 - 12, arg0 - (-Static16.anInt548 + local74));
local74 += 25;
}
}
}
if (local5 >= 0) {
@Pc(159) MapMarker[] local159 = Static143.hintMapMarkers;
for (local161 = 0; local161 < local159.length; local161++) {
@Pc(173) MapMarker local173 = local159[local161];
if (local173 != null && local173.type == 10 && PlayerList.ids[local5] == local173.actorTargetId) {
Static180.method3326(arg4 >> 1, arg3, local17, arg5, local17.method2691() + 15, arg1 >> 1);
if (Static65.anInt1951 > -1) {
Sprites.headhints[local173.anInt4048].method1423(arg2 + Static65.anInt1951 - 12, arg0 + (Static16.anInt548 - local74));
}
}
}
}
}
if (local17.chatMessage != null && (local5 >= PlayerList.size || Chat.publicFilter == 0 || Chat.publicFilter == 3 || Chat.publicFilter == 1 && FriendsList.contains(((Player) local17).username))) {
Static180.method3326(arg4 >> 1, arg3, local17, arg5, local17.method2691(), arg1 >> 1);
if (Static65.anInt1951 > -1 && Static277.anInt5854 < Static191.anInt4506) {
Static191.anIntArray389[Static277.anInt5854] = Fonts.b12Full.getStringWidth(local17.chatMessage) / 2;
Static191.anIntArray387[Static277.anInt5854] = Fonts.b12Full.lineHeight;
Static191.anIntArray385[Static277.anInt5854] = Static65.anInt1951;
Static191.anIntArray392[Static277.anInt5854] = Static16.anInt548;
Static191.anIntArray390[Static277.anInt5854] = local17.chatColor;
Static191.anIntArray391[Static277.anInt5854] = local17.chatEffect;
Static191.anIntArray384[Static277.anInt5854] = local17.chatLoops;
Static191.aClass100Array132[Static277.anInt5854] = local17.chatMessage;
Static277.anInt5854++;
}
}
if (local17.hitpointsBarVisibleUntil > client.loop) {
@Pc(508) Sprite local508 = Sprites.hitbars[0];
@Pc(512) Sprite local512 = Sprites.hitbars[1];
if (local17 instanceof Npc) {
@Pc(518) Npc local518 = (Npc) local17;
@Pc(528) Sprite[] local528 = (Sprite[]) HitBarList.hitBars.get((long) local518.type.hitBarId);
if (local528 == null) {
local528 = SpriteLoader.loadAlphaSprites(local518.type.hitBarId, client.js5Archive8);
if (local528 != null) {
HitBarList.hitBars.put(local528, (long) local518.type.hitBarId);
}
}
if (local528 != null && local528.length == 2) {
local512 = local528[1];
local508 = local528[0];
}
@Pc(571) NpcType local571 = local518.type;
if (local571.anInt3730 == -1) {
local310 = local17.method2691();
} else {
local310 = local571.anInt3730;
}
} else {
local310 = local17.method2691();
}
Static180.method3326(arg4 >> 1, arg3, local17, arg5, local508.height + local310 + 10, arg1 >> 1);
if (Static65.anInt1951 > -1) {
local161 = Static65.anInt1951 + arg2 - (local508.width >> 1);
local359 = Static16.anInt548 + arg0 - 3;
local508.method1423(local161, local359);
local639 = local508.width * local17.hitpointsBar / 255;
local642 = local508.height;
if (GlRenderer.enabled) {
GlRaster.method1183(local161, local359, local161 + local639, local359 + local642);
} else {
SoftwareRaster.method2498(local161, local359, local161 + local639, local642 + local359);
}
local512.method1423(local161, local359);
if (GlRenderer.enabled) {
GlRaster.method1187(arg2, arg0, arg1 + arg2, arg0 - -arg4);
} else {
SoftwareRaster.method2496(arg2, arg0, arg1 + arg2, arg4 + arg0);
}
}
}
for (local74 = 0; local74 < 4; local74++) {
if (local17.anIntArray319[local74] > client.loop) {
if (local17 instanceof Npc) {
@Pc(725) Npc local725 = (Npc) local17;
@Pc(728) NpcType local728 = local725.type;
if (local728.anInt3730 == -1) {
local265 = local17.method2691() / 2;
} else {
local265 = local728.anInt3730 / 2;
}
} else {
local265 = local17.method2691() / 2;
}
Static180.method3326(arg4 >> 1, arg3, local17, arg5, local265, arg1 >> 1);
if (Static65.anInt1951 > -1) {
if (local74 == 1) {
Static16.anInt548 -= 20;
}
if (local74 == 2) {
Static16.anInt548 -= 10;
Static65.anInt1951 -= 15;
}
if (local74 == 3) {
Static16.anInt548 -= 10;
Static65.anInt1951 += 15;
}
Sprites.hitmarks[local17.anIntArray321[local74]].method1423(arg2 + Static65.anInt1951 - 12, arg0 + Static16.anInt548 - 12);
Fonts.p11Full.renderCenter(Static123.parseInt(local17.anIntArray322[local74]), Static65.anInt1951 + arg2 - 1, Static16.anInt548 + 3 + arg0, 16777215, 0);
}
}
}
}
}
for (local5 = 0; local5 < Static277.anInt5854; local5++) {
local74 = Static191.anIntArray392[local5];
@Pc(859) int local859 = Static191.anIntArray385[local5];
local310 = Static191.anIntArray387[local5];
local265 = Static191.anIntArray389[local5];
@Pc(869) boolean local869 = true;
while (local869) {
local869 = false;
for (local359 = 0; local359 < local5; local359++) {
if (Static191.anIntArray392[local359] - Static191.anIntArray387[local359] < local74 + 2 && local74 - local310 < Static191.anIntArray392[local359] - -2 && local859 - local265 < Static191.anIntArray385[local359] + Static191.anIntArray389[local359] && Static191.anIntArray385[local359] - Static191.anIntArray389[local359] < local265 + local859 && Static191.anIntArray392[local359] - Static191.anIntArray387[local359] < local74) {
local74 = Static191.anIntArray392[local359] - Static191.anIntArray387[local359];
local869 = true;
}
}
}
Static65.anInt1951 = Static191.anIntArray385[local5];
Static16.anInt548 = Static191.anIntArray392[local5] = local74;
@Pc(962) JagString local962 = Static191.aClass100Array132[local5];
if (Static79.anInt2157 == 0) {
local639 = 16776960;
if (Static191.anIntArray390[local5] < 6) {
local639 = Static16.anIntArray52[Static191.anIntArray390[local5]];
}
if (Static191.anIntArray390[local5] == 6) {
local639 = Static136.anInt3325 % 20 >= 10 ? 16776960 : 16711680;
}
if (Static191.anIntArray390[local5] == 7) {
local639 = Static136.anInt3325 % 20 < 10 ? 255 : 65535;
}
if (Static191.anIntArray390[local5] == 8) {
local639 = Static136.anInt3325 % 20 >= 10 ? 8454016 : 45056;
}
if (Static191.anIntArray390[local5] == 9) {
local642 = 150 - Static191.anIntArray384[local5];
if (local642 < 50) {
local639 = local642 * 1280 + 16711680;
} else if (local642 < 100) {
local639 = 16776960 + 16384000 - local642 * 327680;
} else if (local642 < 150) {
local639 = local642 * 5 + 65280 - 500;
}
}
if (Static191.anIntArray390[local5] == 10) {
local642 = 150 - Static191.anIntArray384[local5];
if (local642 < 50) {
local639 = local642 * 5 + 16711680;
} else if (local642 < 100) {
local639 = 16711935 - (local642 - 50) * 327680;
} else if (local642 < 150) {
local639 = local642 * 327680 + 255 + 500 - local642 * 5 - 32768000;
}
}
if (Static191.anIntArray390[local5] == 11) {
local642 = 150 - Static191.anIntArray384[local5];
if (local642 < 50) {
local639 = 16777215 - local642 * 327685;
} else if (local642 < 100) {
local639 = local642 * 327685 + 65280 - 16384250;
} else if (local642 < 150) {
local639 = 16777215 + 32768000 - local642 * 327680;
}
}
if (Static191.anIntArray391[local5] == 0) {
Fonts.b12Full.renderCenter(local962, Static65.anInt1951 + arg2, arg0 + Static16.anInt548, local639, 0);
}
if (Static191.anIntArray391[local5] == 1) {
Fonts.b12Full.renderWave(local962, arg2 + Static65.anInt1951, Static16.anInt548 + arg0, local639, Static136.anInt3325);
}
if (Static191.anIntArray391[local5] == 2) {
Fonts.b12Full.renderWave2(local962, arg2 + Static65.anInt1951, arg0 - -Static16.anInt548, local639, Static136.anInt3325);
}
if (Static191.anIntArray391[local5] == 3) {
Fonts.b12Full.renderShake(local962, arg2 + Static65.anInt1951, Static16.anInt548 + arg0, local639, Static136.anInt3325, 150 - Static191.anIntArray384[local5]);
}
if (Static191.anIntArray391[local5] == 4) {
local642 = (150 - Static191.anIntArray384[local5]) * (Fonts.b12Full.getStringWidth(local962) + 100) / 150;
if (GlRenderer.enabled) {
GlRaster.method1183(Static65.anInt1951 + arg2 - 50, arg0, Static65.anInt1951 + arg2 + 50, arg4 + arg0);
} else {
SoftwareRaster.method2498(arg2 + Static65.anInt1951 - 50, arg0, Static65.anInt1951 + arg2 + 50, arg4 + arg0);
}
Fonts.b12Full.method2857(local962, arg2 + Static65.anInt1951 + 50 - local642, arg0 + Static16.anInt548, local639, 0);
if (GlRenderer.enabled) {
GlRaster.method1187(arg2, arg0, arg1 + arg2, arg4 + arg0);
} else {
SoftwareRaster.method2496(arg2, arg0, arg2 + arg1, arg0 + arg4);
}
}
if (Static191.anIntArray391[local5] == 5) {
@Pc(1372) int local1372 = 0;
local642 = 150 - Static191.anIntArray384[local5];
if (GlRenderer.enabled) {
GlRaster.method1183(arg2, Static16.anInt548 + arg0 - Fonts.b12Full.lineHeight - 1, arg1 + arg2, arg0 + Static16.anInt548 + 5);
} else {
SoftwareRaster.method2498(arg2, Static16.anInt548 + arg0 - Fonts.b12Full.lineHeight - 1, arg2 + arg1, Static16.anInt548 + arg0 + 5);
}
if (local642 < 25) {
local1372 = local642 - 25;
} else if (local642 > 125) {
local1372 = local642 - 125;
}
Fonts.b12Full.renderCenter(local962, Static65.anInt1951 + arg2, local1372 + arg0 + Static16.anInt548, local639, 0);
if (GlRenderer.enabled) {
GlRaster.method1187(arg2, arg0, arg2 + arg1, arg0 + arg4);
} else {
SoftwareRaster.method2496(arg2, arg0, arg2 + arg1, arg0 + arg4);
}
}
} else {
Fonts.b12Full.renderCenter(local962, arg2 + Static65.anInt1951, arg0 + Static16.anInt548, 16776960, 0);
}
}
}
} }

9
client/src/main/java/rt4/Static145.java
View file

@ -81,13 +81,4 @@ public final class Static145 {
Static121.method2407(Static183.anInt4271, Static229.anInt5138, Static13.anInt436, Static24.anInt761); Static121.method2407(Static183.anInt4271, Static229.anInt5138, Static13.anInt436, Static24.anInt761);
} }
@OriginalMember(owner = "client!lf", name = "a", descriptor = "(IIIIB)V")
public static void method2745(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2, @OriginalArg(3) int arg3) {
@Pc(8) DelayedStateChange local8 = DelayedStateChange.create(10, arg0);
local8.pushServer();
local8.intArg3 = arg2;
local8.intArg1 = arg3;
local8.intArg2 = arg1;
}
} }

7
client/src/main/java/rt4/Static146.java
View file

@ -15,9 +15,6 @@ public final class Static146 {
@OriginalMember(owner = "client!lg", name = "c", descriptor = "[Lclient!tk;") @OriginalMember(owner = "client!lg", name = "c", descriptor = "[Lclient!tk;")
public static final SeqType[] aClass144Array1 = new SeqType[14]; public static final SeqType[] aClass144Array1 = new SeqType[14];
@OriginalMember(owner = "client!lg", name = "k", descriptor = "I")
public static int anInt3508 = 99;
@OriginalMember(owner = "client!lg", name = "a", descriptor = "(ZLclient!wa;Lclient!na;)I") @OriginalMember(owner = "client!lg", name = "a", descriptor = "(ZLclient!wa;Lclient!na;)I")
public static int method2748(@OriginalArg(1) Buffer arg0, @OriginalArg(2) JagString arg1) { public static int method2748(@OriginalArg(1) Buffer arg0, @OriginalArg(2) JagString arg1) {
@Pc(6) int local6 = arg0.offset; @Pc(6) int local6 = arg0.offset;
@ -30,8 +27,8 @@ public final class Static146 {
@OriginalMember(owner = "client!lg", name = "a", descriptor = "(I)V") @OriginalMember(owner = "client!lg", name = "a", descriptor = "(I)V")
public static void method2750(@OriginalArg(0) int arg0) { public static void method2750(@OriginalArg(0) int arg0) {
Static235.anInt5276 = arg0; Static235.anInt5276 = arg0;
for (@Pc(3) int local3 = 0; local3 < Static152.mapSizeX; local3++) { for (@Pc(3) int local3 = 0; local3 < SceneGraph.mapSizeX; local3++) {
for (@Pc(8) int local8 = 0; local8 < Static99.mapSizeZ; local8++) { for (@Pc(8) int local8 = 0; local8 < SceneGraph.mapSizeZ; local8++) {
if (SceneGraph.tiles[arg0][local3][local8] == null) { if (SceneGraph.tiles[arg0][local3][local8] == null) {
SceneGraph.tiles[arg0][local3][local8] = new Tile(arg0, local3, local8); SceneGraph.tiles[arg0][local3][local8] = new Tile(arg0, local3, local8);
} }

6
client/src/main/java/rt4/Static147.java
View file

@ -56,9 +56,9 @@ public final class Static147 {
@Pc(160) int local160 = Static68.anIntArray164[local22]; @Pc(160) int local160 = Static68.anIntArray164[local22];
@Pc(164) int local164 = Static68.anIntArray164[local29]; @Pc(164) int local164 = Static68.anIntArray164[local29];
if ((local39 - local148) * (local164 - local160) - (local156 - local160) * (local152 - local148) > 0) { if ((local39 - local148) * (local164 - local160) - (local156 - local160) * (local152 - local148) > 0) {
if (Static158.aBoolean187 && Static19.method583(Static89.anInt2388 + Rasteriser.centerX, Static131.anInt3259 + Rasteriser.centerY, local156, local160, local164, local39, local148, local152)) { if (MiniMenu.aBoolean187 && Static19.method583(MiniMenu.anInt2388 + Rasteriser.centerX, MiniMenu.anInt3259 + Rasteriser.centerY, local156, local160, local164, local39, local148, local152)) {
Static56.anInt1742 = arg5; MiniMenu.anInt1742 = arg5;
Static116.anInt2954 = arg6; MiniMenu.anInt2954 = arg6;
} }
if (!GlRenderer.enabled && !arg7) { if (!GlRenderer.enabled && !arg7) {
Rasteriser.testX = false; Rasteriser.testX = false;

9
client/src/main/java/rt4/Static148.java
View file

@ -15,16 +15,13 @@ public final class Static148 {
@OriginalMember(owner = "client!li", name = "x", descriptor = "I") @OriginalMember(owner = "client!li", name = "x", descriptor = "I")
public static int screenUpperY; public static int screenUpperY;
@OriginalMember(owner = "client!li", name = "p", descriptor = "Lclient!na;") @OriginalMember(owner = "client!li", name = "a", descriptor = "(III)V")
public static final JagString REBUILD = JagString.parse("::rebuild");
@OriginalMember(owner = "client!li", name = "a", descriptor = "(III)V")
public static void method2766(@OriginalArg(0) int arg0, @OriginalArg(2) int arg1) { public static void method2766(@OriginalArg(0) int arg0, @OriginalArg(2) int arg1) {
VarpDomain.activeVarps[arg0] = arg1; VarpDomain.activeVarps[arg0] = arg1;
@Pc(21) LongNode local21 = (LongNode) Static199.aClass133_20.get((long) arg0); @Pc(21) LongNode local21 = (LongNode) VarpDomain.aClass133_20.get((long) arg0);
if (local21 == null) { if (local21 == null) {
local21 = new LongNode(MonotonicClock.currentTimeMillis() + 500L); local21 = new LongNode(MonotonicClock.currentTimeMillis() + 500L);
Static199.aClass133_20.put(local21, (long) arg0); VarpDomain.aClass133_20.put(local21, (long) arg0);
} else { } else {
local21.value = MonotonicClock.currentTimeMillis() + 500L; local21.value = MonotonicClock.currentTimeMillis() + 500L;
} }

4
client/src/main/java/rt4/Static149.java
View file

@ -1,13 +1,9 @@
package rt4; package rt4;
import java.awt.Image;
import org.openrs2.deob.annotation.OriginalMember; import org.openrs2.deob.annotation.OriginalMember;
public final class Static149 { public final class Static149 {
@OriginalMember(owner = "client!lj", name = "y", descriptor = "Ljava/awt/Image;")
public static Image anImage3;
@OriginalMember(owner = "client!lj", name = "B", descriptor = "I") @OriginalMember(owner = "client!lj", name = "B", descriptor = "I")
public static int anInt3555; public static int anInt3555;

33
client/src/main/java/rt4/Static15.java
View file

@ -1,35 +1,38 @@
package rt4; package rt4;
import org.openrs2.deob.annotation.OriginalArg;
import org.openrs2.deob.annotation.OriginalMember; import org.openrs2.deob.annotation.OriginalMember;
import org.openrs2.deob.annotation.Pc; import org.openrs2.deob.annotation.Pc;
public final class Static15 { public final class Static15 {
@OriginalMember(owner = "client!dc", name = "M", descriptor = "Lclient!na;")
public static final JagString aClass100_268 = JagString.parse(")4");
@OriginalMember(owner = "client!he", name = "gb", descriptor = "Lclient!na;")
public static final JagString aClass100_518 = JagString.parse("www");
@OriginalMember(owner = "client!e", name = "Tc", descriptor = "Lclient!na;")
public static final JagString aClass100_365 = JagString.parse("www)2wtqa");
@OriginalMember(owner = "client!lk", name = "J", descriptor = "Lclient!na;")
public static final JagString aClass100_687 = JagString.parse(")4p=");
@OriginalMember(owner = "client!en", name = "x", descriptor = "Lclient!na;")
public static final JagString aClass100_424 = JagString.parse("http:)4)4");
@OriginalMember(owner = "client!gf", name = "I", descriptor = "Lclient!na;")
public static final JagString aClass100_886 = JagString.parse(")3runescape)3com)4l=");
@OriginalMember(owner = "client!v", name = "a", descriptor = "Lclient!na;")
public static final JagString aClass100_98 = JagString.parse(")4a=");
@OriginalMember(owner = "client!be", name = "Vb", descriptor = "F") @OriginalMember(owner = "client!be", name = "Vb", descriptor = "F")
public static float aFloat4; public static float aFloat4;
@OriginalMember(owner = "client!be", name = "ib", descriptor = "Lclient!na;")
public static final JagString EVENT_OPBASE = JagString.parse("event_opbase");
@OriginalMember(owner = "client!be", name = "Ec", descriptor = "I")
public static int anInt506 = -1;
@OriginalMember(owner = "client!be", name = "a", descriptor = "(Z)Lclient!na;") @OriginalMember(owner = "client!be", name = "a", descriptor = "(Z)Lclient!na;")
public static JagString method479() { public static JagString method479() {
@Pc(8) JagString local8 = Static93.aClass100_518; @Pc(8) JagString local8 = aClass100_518;
@Pc(10) JagString local10 = JagString.EMPTY; @Pc(10) JagString local10 = JagString.EMPTY;
if (client.modeWhere != 0) { if (client.modeWhere != 0) {
local8 = Static50.aClass100_365; local8 = aClass100_365;
} }
if (client.settings != null) { if (client.settings != null) {
local10 = JagString.concatenate(new JagString[] { Static150.aClass100_687, client.settings}); local10 = JagString.concatenate(new JagString[] { aClass100_687, client.settings});
} }
return JagString.concatenate(new JagString[] { Static61.aClass100_424, local8, Static80.aClass100_886, Static123.parseInt(client.language), Static257.aClass100_98, Static123.parseInt(client.affiliate), local10, Static41.aClass100_268 }); return JagString.concatenate(new JagString[] { aClass100_424, local8, aClass100_886, JagString.parseInt(client.language), aClass100_98, JagString.parseInt(client.affiliate), local10, aClass100_268 });
} }
@OriginalMember(owner = "client!be", name = "a", descriptor = "(II)I")
public static int method492(@OriginalArg(1) int arg0) {
return arg0 == 16711935 ? -1 : ColorUtils.rgbToHsl(arg0);
}
} }

3
client/src/main/java/rt4/Static150.java
View file

@ -6,9 +6,6 @@ import org.openrs2.deob.annotation.Pc;
public final class Static150 { public final class Static150 {
@OriginalMember(owner = "client!lk", name = "J", descriptor = "Lclient!na;")
public static final JagString aClass100_687 = JagString.parse(")4p=");
@OriginalMember(owner = "client!lk", name = "V", descriptor = "I") @OriginalMember(owner = "client!lk", name = "V", descriptor = "I")
public static int anInt3582 = 0; public static int anInt3582 = 0;

Some files were not shown because too many files have changed in this diff Show more