Renamed some helper functions

This commit is contained in:
Pazaz 2022-06-28 02:26:41 -04:00
parent 9694e42577
commit ad45cb829b
28 changed files with 256 additions and 256 deletions

View file

@ -32,7 +32,7 @@ public class BasTypeList {
}
@OriginalMember(owner = "client!jk", name = "e", descriptor = "(B)V")
public static void method2433() {
public static void clear() {
types.clear();
}
@ -42,7 +42,7 @@ public class BasTypeList {
}
@OriginalMember(owner = "client!di", name = "d", descriptor = "(I)V")
public static void method1172() {
public static void removeSoft() {
types.removeSoft();
}
}

View file

@ -112,7 +112,7 @@ public class Cheat {
@Pc(38) int local38;
@Pc(29) Runtime local29;
if (arg0.equalsIgnoreCase(aClass100_476)) {
client.method2380();
client.unloadSoft();
for (local18 = 0; local18 < 10; local18++) {
System.gc();
}
@ -122,7 +122,7 @@ public class Cheat {
}
@Pc(117) int local117;
if (arg0.equalsIgnoreCase(MM)) {
client.method2380();
client.unloadSoft();
for (local18 = 0; local18 < 10; local18++) {
System.gc();
}
@ -130,7 +130,7 @@ public class Cheat {
local38 = (int) ((local29.totalMemory() - local29.freeMemory()) / 1024L);
Chat.add(null, 0, JagString.concatenate(new JagString[]{aClass100_893, JagString.parseInt(local38), DEBUG_MEM_UNIT}));
Player.method501();
client.method2380();
client.unloadSoft();
for (local117 = 0; local117 < 10; local117++) {
System.gc();
}

View file

@ -7,12 +7,6 @@ import org.openrs2.deob.annotation.Pc;
import java.io.IOException;
public class ClientProt {
@OriginalMember(owner = "client!e", name = "Dc", descriptor = "Lclient!na;")
public static final JagString aClass100_363 = JagString.parse("_labels");
@OriginalMember(owner = "client!bh", name = "C", descriptor = "Lclient!na;")
public static final JagString COMPLETE_PERCENT = JagString.parse("<br>(X100(U(Y");
@OriginalMember(owner = "client!wc", name = "g", descriptor = "I")
public static int anInt5804 = 0;
@OriginalMember(owner = "client!vg", name = "a", descriptor = "(Lclient!na;IIBI)V")
public static void method4512(@OriginalArg(0) JagString arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2, @OriginalArg(4) int arg3) {
@ -168,7 +162,7 @@ public class ClientProt {
}
@OriginalMember(owner = "client!ej", name = "i", descriptor = "(I)V")
public static void method1373() {
public static void sendWindowDetails() {
Protocol.outboundBuffer.p1isaac(243);
Protocol.outboundBuffer.p1(DisplayMode.getWindowMode());
Protocol.outboundBuffer.p2(GameShell.canvasWidth);
@ -199,88 +193,4 @@ public class ClientProt {
client.audioLoop();
}
@OriginalMember(owner = "client!ac", name = "b", descriptor = "(I)V")
public static void method28() {
InterfaceList.redraw(Cs1ScriptRunner.aClass13_14);
Cs1ScriptRunner.anInt4851++;
if (InterfaceList.aBoolean83 && InterfaceList.aBoolean174) {
@Pc(30) int local30 = Mouse.lastMouseX;
local30 -= Cs1ScriptRunner.anInt5388;
if (Cs1ScriptRunner.anInt2225 > local30) {
local30 = Cs1ScriptRunner.anInt2225;
}
@Pc(41) int local41 = Mouse.lastMouseY;
if (Cs1ScriptRunner.anInt2225 + Cs1ScriptRunner.aClass13_1.width < local30 - -Cs1ScriptRunner.aClass13_14.width) {
local30 = Cs1ScriptRunner.anInt2225 + Cs1ScriptRunner.aClass13_1.width - Cs1ScriptRunner.aClass13_14.width;
}
local41 -= Cs1ScriptRunner.anInt4035;
if (local41 < InterfaceList.anInt5103) {
local41 = InterfaceList.anInt5103;
}
if (InterfaceList.anInt5103 + Cs1ScriptRunner.aClass13_1.height < local41 - -Cs1ScriptRunner.aClass13_14.height) {
local41 = InterfaceList.anInt5103 + Cs1ScriptRunner.aClass13_1.height - Cs1ScriptRunner.aClass13_14.height;
}
@Pc(109) int local109 = local41 - InterfaceList.anInt660;
@Pc(114) int local114 = local30 - InterfaceList.anInt3075;
@Pc(122) int local122 = local30 + Cs1ScriptRunner.aClass13_1.scrollX - Cs1ScriptRunner.anInt2225;
@Pc(130) int local130 = Cs1ScriptRunner.aClass13_1.scrollY + local41 - InterfaceList.anInt5103;
@Pc(133) int local133 = Cs1ScriptRunner.aClass13_14.dragDeadzone;
if (Cs1ScriptRunner.anInt4851 > Cs1ScriptRunner.aClass13_14.dragDeadtime && (local133 < local114 || -local133 > local114 || local109 > local133 || local109 < -local133)) {
Cs1ScriptRunner.aBoolean172 = true;
}
@Pc(176) HookRequest local176;
if (Cs1ScriptRunner.aClass13_14.onDragStart != null && Cs1ScriptRunner.aBoolean172) {
local176 = new HookRequest();
local176.source = Cs1ScriptRunner.aClass13_14;
local176.arguments = Cs1ScriptRunner.aClass13_14.onDragStart;
local176.mouseX = local122;
local176.mouseY = local130;
ScriptRunner.run(local176);
}
if (Mouse.pressedButton == 0) {
if (Cs1ScriptRunner.aBoolean172) {
if (Cs1ScriptRunner.aClass13_14.onDragRelease != null) {
local176 = new HookRequest();
local176.mouseY = local130;
local176.target = InterfaceList.aClass13_12;
local176.mouseX = local122;
local176.arguments = Cs1ScriptRunner.aClass13_14.onDragRelease;
local176.source = Cs1ScriptRunner.aClass13_14;
ScriptRunner.run(local176);
}
if (InterfaceList.aClass13_12 != null && InterfaceList.method938(Cs1ScriptRunner.aClass13_14) != null) {
Protocol.outboundBuffer.p1isaac(79);
Protocol.outboundBuffer.mp4(Cs1ScriptRunner.aClass13_14.id);
Protocol.outboundBuffer.ip2(InterfaceList.aClass13_12.createdComponentId);
Protocol.outboundBuffer.p4(InterfaceList.aClass13_12.id);
Protocol.outboundBuffer.ip2(Cs1ScriptRunner.aClass13_14.createdComponentId);
}
} else if ((VarpDomain.anInt2952 == 1 || MiniMenu.method4640(MiniMenu.size - 1)) && MiniMenu.size > 2) {
ScriptRunner.method3901();
} else if (MiniMenu.size > 0) {
MiniMenu.method1372();
}
Cs1ScriptRunner.aClass13_14 = null;
}
} else if (Cs1ScriptRunner.anInt4851 > 1) {
Cs1ScriptRunner.aClass13_14 = null;
}
}
@OriginalMember(owner = "client!aa", name = "a", descriptor = "(IZI)V")
public static void method10(@OriginalArg(0) int arg0, @OriginalArg(2) int arg1) {
Protocol.outboundBuffer.p1isaac(132);
Protocol.outboundBuffer.imp4(arg1);
Protocol.outboundBuffer.ip2(arg0);
}
@OriginalMember(owner = "client!g", name = "b", descriptor = "(I)V")
public static void setDefaultChunksAtmosphere() {
@Pc(9) Environment local9 = new Environment();
for (@Pc(18) int local18 = 0; local18 < 13; local18++) {
for (@Pc(25) int local25 = 0; local25 < 13; local25++) {
FogManager.chunksAtmosphere[local18][local25] = local9;
}
}
}
}

View file

@ -507,7 +507,7 @@ public final class Component {
}
@OriginalMember(owner = "client!da", name = "h", descriptor = "(B)V")
public static void method1019() {
public static void removeSoft() {
sprites.removeSoft();
models.removeSoft();
fonts.removeSoft();

View file

@ -1339,4 +1339,72 @@ public class Cs1ScriptRunner {
}
return local12;
}
@OriginalMember(owner = "client!ac", name = "b", descriptor = "(I)V")
public static void method28() {
InterfaceList.redraw(aClass13_14);
anInt4851++;
if (InterfaceList.aBoolean83 && InterfaceList.aBoolean174) {
@Pc(30) int local30 = Mouse.lastMouseX;
local30 -= anInt5388;
if (anInt2225 > local30) {
local30 = anInt2225;
}
@Pc(41) int local41 = Mouse.lastMouseY;
if (anInt2225 + aClass13_1.width < local30 - -aClass13_14.width) {
local30 = anInt2225 + aClass13_1.width - aClass13_14.width;
}
local41 -= anInt4035;
if (local41 < InterfaceList.anInt5103) {
local41 = InterfaceList.anInt5103;
}
if (InterfaceList.anInt5103 + aClass13_1.height < local41 - -aClass13_14.height) {
local41 = InterfaceList.anInt5103 + aClass13_1.height - aClass13_14.height;
}
@Pc(109) int local109 = local41 - InterfaceList.anInt660;
@Pc(114) int local114 = local30 - InterfaceList.anInt3075;
@Pc(122) int local122 = local30 + aClass13_1.scrollX - anInt2225;
@Pc(130) int local130 = aClass13_1.scrollY + local41 - InterfaceList.anInt5103;
@Pc(133) int local133 = aClass13_14.dragDeadzone;
if (anInt4851 > aClass13_14.dragDeadtime && (local133 < local114 || -local133 > local114 || local109 > local133 || local109 < -local133)) {
aBoolean172 = true;
}
@Pc(176) HookRequest local176;
if (aClass13_14.onDragStart != null && aBoolean172) {
local176 = new HookRequest();
local176.source = aClass13_14;
local176.arguments = aClass13_14.onDragStart;
local176.mouseX = local122;
local176.mouseY = local130;
ScriptRunner.run(local176);
}
if (Mouse.pressedButton == 0) {
if (aBoolean172) {
if (aClass13_14.onDragRelease != null) {
local176 = new HookRequest();
local176.mouseY = local130;
local176.target = InterfaceList.aClass13_12;
local176.mouseX = local122;
local176.arguments = aClass13_14.onDragRelease;
local176.source = aClass13_14;
ScriptRunner.run(local176);
}
if (InterfaceList.aClass13_12 != null && InterfaceList.method938(aClass13_14) != null) {
Protocol.outboundBuffer.p1isaac(79);
Protocol.outboundBuffer.mp4(aClass13_14.id);
Protocol.outboundBuffer.ip2(InterfaceList.aClass13_12.createdComponentId);
Protocol.outboundBuffer.p4(InterfaceList.aClass13_12.id);
Protocol.outboundBuffer.ip2(aClass13_14.createdComponentId);
}
} else if ((VarpDomain.anInt2952 == 1 || MiniMenu.method4640(MiniMenu.size - 1)) && MiniMenu.size > 2) {
ScriptRunner.method3901();
} else if (MiniMenu.size > 0) {
MiniMenu.method1372();
}
aClass13_14 = null;
}
} else if (anInt4851 > 1) {
aClass13_14 = null;
}
}
}

View file

@ -36,7 +36,7 @@ public class CursorTypeList {
}
@OriginalMember(owner = "client!an", name = "i", descriptor = "(I)V")
public static void method351() {
public static void clear() {
types.clear();
sprites.clear();
}
@ -48,7 +48,7 @@ public class CursorTypeList {
}
@OriginalMember(owner = "client!ca", name = "a", descriptor = "(Z)V")
public static void method741() {
public static void removeSoft() {
types.removeSoft();
sprites.removeSoft();
}

View file

@ -229,7 +229,7 @@ public final class DisplayMode {
InterfaceList.method3712(true);
}
if (Protocol.socket != null && (client.gameState == 30 || client.gameState == 25)) {
ClientProt.method1373();
ClientProt.sendWindowDetails();
}
for (@Pc(466) int local466 = 0; local466 < 100; local466++) {
InterfaceList.aBooleanArray100[local466] = true;

View file

@ -34,12 +34,12 @@ public class FloTypeList {
}
@OriginalMember(owner = "client!uh", name = "e", descriptor = "(I)V")
public static void method4301() {
public static void removeSoft() {
types.removeSoft();
}
@OriginalMember(owner = "client!wh", name = "a", descriptor = "(I)V")
public static void method4612() {
public static void clear() {
types.clear();
}

View file

@ -31,12 +31,12 @@ public class FluTypeList {
}
@OriginalMember(owner = "client!sd", name = "f", descriptor = "(B)V")
public static void method3885() {
public static void removeSoft() {
types.removeSoft();
}
@OriginalMember(owner = "client!ed", name = "c", descriptor = "(I)V")
public static void method1308() {
public static void clear() {
types.clear();
}

View file

@ -283,4 +283,14 @@ public final class FogManager {
currentLightZ = chunksAtmosphere[arg1][arg0].lightZ;
setLightPosition((float) currentLightX, (float) currentLightY, (float) currentLightZ);
}
@OriginalMember(owner = "client!g", name = "b", descriptor = "(I)V")
public static void setDefaultChunksAtmosphere() {
@Pc(9) Environment local9 = new Environment();
for (@Pc(18) int local18 = 0; local18 < 13; local18++) {
for (@Pc(25) int local25 = 0; local25 < 13; local25++) {
chunksAtmosphere[local18][local25] = local9;
}
}
}
}

View file

@ -37,12 +37,12 @@ public class IdkTypeList {
}
@OriginalMember(owner = "client!oi", name = "a", descriptor = "(I)V")
public static void method3342() {
public static void removeSoft() {
types.removeSoft();
}
@OriginalMember(owner = "client!t", name = "b", descriptor = "(I)V")
public static void method3999() {
public static void clear() {
types.clear();
}

View file

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

View file

@ -36,12 +36,12 @@ public class LightTypeList {
}
@OriginalMember(owner = "client!gd", name = "b", descriptor = "(I)V")
public static void method1695() {
public static void clear() {
types.clear();
}
@OriginalMember(owner = "client!hd", name = "a", descriptor = "(I)V")
public static void method1882() {
public static void removeSoft() {
types.removeSoft();
}
}

View file

@ -62,7 +62,7 @@ public class LocTypeList {
}
@OriginalMember(owner = "client!oe", name = "b", descriptor = "(I)V")
public static void method3323() {
public static void removeSoft() {
types.removeSoft();
aClass99_24.removeSoft();
aClass99_14.removeSoft();

View file

@ -30,6 +30,10 @@ public class LoginManager {
public static final int[] anIntArray204 = new int[]{16, 32, 64, 128};
@OriginalMember(owner = "client!rj", name = "Z", descriptor = "[I")
public static final int[] anIntArray434 = new int[64];
@OriginalMember(owner = "client!e", name = "Dc", descriptor = "Lclient!na;")
public static final JagString aClass100_363 = JagString.parse("_labels");
@OriginalMember(owner = "client!bh", name = "C", descriptor = "Lclient!na;")
public static final JagString COMPLETE_PERCENT = JagString.parse("<br>(X100(U(Y");
@OriginalMember(owner = "client!rl", name = "X", descriptor = "I")
public static int anInt4937 = 0;
@OriginalMember(owner = "client!sd", name = "X", descriptor = "Z")
@ -94,10 +98,6 @@ public class LoginManager {
public static int[] locationsMapFileIds;
@OriginalMember(owner = "client!bi", name = "Y", descriptor = "[[B")
public static byte[][] underWaterLocationsMapFilesBuffer;
@OriginalMember(owner = "client!gf", name = "R", descriptor = "I")
public static int centralZoneX;
@OriginalMember(owner = "client!eb", name = "u", descriptor = "I")
public static int centralZoneZ;
@OriginalMember(owner = "client!dc", name = "ab", descriptor = "I")
public static int centralPlane = 0;
@OriginalMember(owner = "client!mh", name = "hb", descriptor = "Lclient!bn;")
@ -110,8 +110,6 @@ public class LoginManager {
public static int mapFlagZ = 0;
@OriginalMember(owner = "client!qf", name = "M", descriptor = "I")
public static int anInt1862 = 0;
@OriginalMember(owner = "client!sj", name = "u", descriptor = "Z")
public static boolean dynamicMapRegion = false;
@OriginalMember(owner = "client!nm", name = "U", descriptor = "I")
public static int mapFilesMissingCount = 0;
@OriginalMember(owner = "client!t", name = "y", descriptor = "I")
@ -156,6 +154,8 @@ public class LoginManager {
public static int anInt3324;
@OriginalMember(owner = "client!uj", name = "E", descriptor = "I")
public static int anInt5556;
@OriginalMember(owner = "client!wc", name = "g", descriptor = "I")
public static int anInt5804 = 0;
@OriginalMember(owner = "client!dm", name = "d", descriptor = "(I)V")
public static void clear() {
@ -425,8 +425,8 @@ public class LoginManager {
buffer.pdata(Protocol.outboundBuffer.data, Protocol.outboundBuffer.offset);
Protocol.socket.write(buffer.data, buffer.offset);
Protocol.outboundBuffer.setKey(key);
for (@Pc(583) int local583 = 0; local583 < 4; local583++) {
key[local583] += 50;
for (@Pc(583) int i = 0; i < 4; i++) {
key[i] += 50;
}
Protocol.inboundBuffer.setKey(key);
step = 4;
@ -435,22 +435,22 @@ public class LoginManager {
if (Protocol.socket.available() < 1) {
return;
}
@Pc(623) int local623 = Protocol.socket.read();
if (local623 == 21) {
@Pc(623) int reply = Protocol.socket.read();
if (reply == 21) {
step = 7;
} else if (local623 == 29) {
} else if (reply == 29) {
step = 10;
} else if (local623 == 1) {
} else if (reply == 1) {
step = 5;
reply = local623;
LoginManager.reply = reply;
return;
} else if (local623 == 2) {
} else if (reply == 2) {
step = 8;
} else if (local623 == 15) {
} else if (reply == 15) {
step = 0;
reply = local623;
LoginManager.reply = reply;
return;
} else if (local623 == 23 && errors < 1) {
} else if (reply == 23 && errors < 1) {
step = 1;
errors++;
loops = 0;
@ -458,7 +458,7 @@ public class LoginManager {
Protocol.socket = null;
return;
} else {
reply = local623;
LoginManager.reply = reply;
step = 0;
Protocol.socket.close();
Protocol.socket = null;
@ -516,12 +516,12 @@ public class LoginManager {
if (playerUnderage && !parentalAdvertConsent || playerMember) {
try {
ZAP.browserControlCall(GameShell.signLink.applet);
} catch (@Pc(910) Throwable local910) {
} catch (@Pc(910) Throwable ignored) {
}
} else {
try {
UNZAP.browserControlCall(GameShell.signLink.applet);
} catch (@Pc(920) Throwable local920) {
} catch (@Pc(920) Throwable ignored) {
}
}
}
@ -538,7 +538,7 @@ public class LoginManager {
reply = 2;
step = 0;
client.method4221();
centralZoneX = -1;
SceneGraph.centralZoneX = -1;
Protocol.readRebuildPacket(false);
Protocol.opcode = -1;
}
@ -652,11 +652,11 @@ public class LoginManager {
Protocol.socket.close();
Protocol.socket = null;
}
client.method3768();
client.unload();
SceneGraph.clear();
@Pc(19) int local19;
for (local19 = 0; local19 < 4; local19++) {
PathFinder.collisionMaps[local19].clear();
@Pc(19) int i;
for (i = 0; i < 4; i++) {
PathFinder.collisionMaps[i].clear();
}
WorldMap.clear(false);
System.gc();
@ -664,27 +664,27 @@ public class LoginManager {
MidiPlayer.jingle = false;
MusicPlayer.groupId = -1;
AreaSoundManager.clear(true);
dynamicMapRegion = false;
SceneGraph.dynamicMapRegion = false;
Camera.originZ = 0;
centralZoneX = 0;
centralZoneZ = 0;
SceneGraph.centralZoneX = 0;
SceneGraph.centralZoneZ = 0;
Camera.originX = 0;
for (local19 = 0; local19 < MiniMap.hintMapMarkers.length; local19++) {
MiniMap.hintMapMarkers[local19] = null;
for (i = 0; i < MiniMap.hintMapMarkers.length; i++) {
MiniMap.hintMapMarkers[i] = null;
}
PlayerList.size = 0;
NpcList.size = 0;
for (local19 = 0; local19 < 2048; local19++) {
PlayerList.players[local19] = null;
PlayerList.appearanceCache[local19] = null;
for (i = 0; i < 2048; i++) {
PlayerList.players[i] = null;
PlayerList.appearanceCache[i] = null;
}
for (local19 = 0; local19 < 32768; local19++) {
NpcList.npcs[local19] = null;
for (i = 0; i < 32768; i++) {
NpcList.npcs[i] = null;
}
for (local19 = 0; local19 < 4; local19++) {
for (@Pc(115) int local115 = 0; local115 < 104; local115++) {
for (@Pc(122) int local122 = 0; local122 < 104; local122++) {
SceneGraph.objStacks[local19][local115][local122] = null;
for (int level = 0; level < 4; level++) {
for (@Pc(115) int x = 0; x < 104; x++) {
for (@Pc(122) int z = 0; z < 104; z++) {
SceneGraph.objStacks[level][x][z] = null;
}
}
}
@ -696,11 +696,11 @@ public class LoginManager {
@OriginalMember(owner = "client!k", name = "a", descriptor = "(IIIIZIZ)V")
public static void method2463(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2, @OriginalArg(3) int arg3, @OriginalArg(4) boolean arg4, @OriginalArg(5) int arg5) {
if (centralZoneX == arg2 && arg1 == centralZoneZ && (centralPlane == arg0 || SceneGraph.allLevelsAreVisible())) {
if (SceneGraph.centralZoneX == arg2 && arg1 == SceneGraph.centralZoneZ && (centralPlane == arg0 || SceneGraph.allLevelsAreVisible())) {
return;
}
centralZoneX = arg2;
centralZoneZ = arg1;
SceneGraph.centralZoneX = arg2;
SceneGraph.centralZoneZ = arg1;
centralPlane = arg0;
if (SceneGraph.allLevelsAreVisible()) {
centralPlane = 0;
@ -715,7 +715,7 @@ public class LoginManager {
@Pc(55) int local55 = Camera.originX;
Camera.originZ = arg1 * 8 - 48;
Camera.originX = (arg2 - 6) * 8;
map = MapList.getContainingSource(centralZoneX * 8, centralZoneZ * 8);
map = MapList.getContainingSource(SceneGraph.centralZoneX * 8, SceneGraph.centralZoneZ * 8);
@Pc(81) int local81 = Camera.originZ - local53;
@Pc(86) int local86 = Camera.originX - local55;
mapElementList = null;
@ -841,24 +841,24 @@ public class LoginManager {
Protocol.inboundBuffer.offset = 0;
anInt1862 = 0;
Protocol.opcode = -1;
@Pc(35) int local35;
for (local35 = 0; local35 < PlayerList.players.length; local35++) {
if (PlayerList.players[local35] != null) {
PlayerList.players[local35].faceEntity = -1;
@Pc(35) int i;
for (i = 0; i < PlayerList.players.length; i++) {
if (PlayerList.players[i] != null) {
PlayerList.players[i].faceEntity = -1;
}
}
for (local35 = 0; local35 < NpcList.npcs.length; local35++) {
if (NpcList.npcs[local35] != null) {
NpcList.npcs[local35].faceEntity = -1;
for (i = 0; i < NpcList.npcs.length; i++) {
if (NpcList.npcs[i] != null) {
NpcList.npcs[i].faceEntity = -1;
}
}
Inv.method2073();
Inv.clear();
Camera.cameraType = 1;
client.setGameState(30);
for (local35 = 0; local35 < 100; local35++) {
InterfaceList.aBooleanArray100[local35] = true;
for (i = 0; i < 100; i++) {
InterfaceList.aBooleanArray100[i] = true;
}
ClientProt.method1373();
ClientProt.sendWindowDetails();
}
@OriginalMember(owner = "client!ca", name = "a", descriptor = "(ZI)V")
@ -930,10 +930,10 @@ public class LoginManager {
}
if (mapElementList == null) {
if (map == null || !client.js5Archive23.isGroupNameValid(JagString.concatenate(new JagString[]{map.group, ClientProt.aClass100_363}))) {
if (map == null || !client.js5Archive23.isGroupNameValid(JagString.concatenate(new JagString[]{map.group, aClass100_363}))) {
mapElementList = new MapElementList(0);
} else if (client.js5Archive23.isGroupReady(JagString.concatenate(new JagString[]{map.group, ClientProt.aClass100_363}))) {
mapElementList = MapElementList.create(JagString.concatenate(new JagString[]{map.group, ClientProt.aClass100_363}), client.js5Archive23);
} else if (client.js5Archive23.isGroupReady(JagString.concatenate(new JagString[]{map.group, aClass100_363}))) {
mapElementList = MapElementList.create(JagString.concatenate(new JagString[]{map.group, aClass100_363}), client.js5Archive23);
} else {
fileExists = false;
mapFilesMissingCount++;
@ -945,7 +945,7 @@ public class LoginManager {
return;
}
ClientProt.anInt5804 = 0;
anInt5804 = 0;
fileExists = true;
@Pc(320) int chunkX;
@Pc(309) int chunkZ;
@ -954,7 +954,7 @@ public class LoginManager {
if (local294 != null) {
chunkZ = (regionBitPacked[id] & 0xFF) * 64 - Camera.originZ;
chunkX = (regionBitPacked[id] >> 8) * 64 - Camera.originX;
if (dynamicMapRegion) {
if (SceneGraph.dynamicMapRegion) {
chunkZ = 10;
chunkX = 10;
}
@ -965,7 +965,7 @@ public class LoginManager {
if (local294 != null) {
chunkX = (regionBitPacked[id] >> 8) * 64 - Camera.originX;
chunkZ = (regionBitPacked[id] & 0xFF) * 64 - Camera.originZ;
if (dynamicMapRegion) {
if (SceneGraph.dynamicMapRegion) {
chunkZ = 10;
chunkX = 10;
}
@ -979,11 +979,11 @@ public class LoginManager {
}
if (loadingScreenState != 0) {
Fonts.drawTextOnScreen(true, JagString.concatenate(new JagString[]{LocalizedText.LOADING, ClientProt.COMPLETE_PERCENT}));
Fonts.drawTextOnScreen(true, JagString.concatenate(new JagString[]{LocalizedText.LOADING, COMPLETE_PERCENT}));
}
client.audioLoop();
client.method3768();
client.unload();
@Pc(420) boolean hasUnderWaterMap = false;
@Pc(427) int i;
if (GlRenderer.enabled && Preferences.highWaterDetail) {
@ -1018,13 +1018,13 @@ public class LoginManager {
LightingManager.method2404();
}
if (GlRenderer.enabled) {
ClientProt.setDefaultChunksAtmosphere();
FogManager.setDefaultChunksAtmosphere();
}
client.audioLoop();
System.gc();
ClientProt.ping(true);
SceneGraph.load(false);
if (!dynamicMapRegion) {
if (!SceneGraph.dynamicMapRegion) {
method1805(false);
ClientProt.ping(true);
if (GlRenderer.enabled) {
@ -1037,7 +1037,7 @@ public class LoginManager {
decodeNpcFiles();
}
}
if (dynamicMapRegion) {
if (SceneGraph.dynamicMapRegion) {
method1835(false);
ClientProt.ping(true);
if (GlRenderer.enabled) {
@ -1047,7 +1047,7 @@ public class LoginManager {
}
method4002(false);
}
client.method3768();
client.unload();
ClientProt.ping(true);
SceneGraph.method1169(PathFinder.collisionMaps, false);
if (GlRenderer.enabled) {
@ -1069,17 +1069,17 @@ public class LoginManager {
if (GlRenderer.enabled && hasUnderWaterMap) {
SceneGraph.setUnderwater(true);
SceneGraph.load(true);
if (!dynamicMapRegion) {
if (!SceneGraph.dynamicMapRegion) {
method1805(true);
ClientProt.ping(true);
method743(true);
}
if (dynamicMapRegion) {
if (SceneGraph.dynamicMapRegion) {
method1835(true);
ClientProt.ping(true);
method4002(true);
}
client.method3768();
client.unload();
ClientProt.ping(true);
SceneGraph.method1169(PathFinder.collisionMaps, true);
ClientProt.ping(true);
@ -1101,17 +1101,17 @@ public class LoginManager {
ScriptRunner.method2218();
client.audioLoop();
ChangeLocRequest.flush();
client.method3768();
client.unload();
aBoolean252 = false;
if (GameShell.frame != null && Protocol.socket != null && client.gameState == 25) {
Protocol.outboundBuffer.p1isaac(20);
Protocol.outboundBuffer.p4(1057001181);
}
if (!dynamicMapRegion) {
@Pc(815) int local815 = (centralZoneZ + 6) / 8;
@Pc(821) int local821 = (centralZoneZ - 6) / 8;
chunkX = (centralZoneX - 6) / 8;
chunkZ = (centralZoneX + 6) / 8;
if (!SceneGraph.dynamicMapRegion) {
@Pc(815) int local815 = (SceneGraph.centralZoneZ + 6) / 8;
@Pc(821) int local821 = (SceneGraph.centralZoneZ - 6) / 8;
chunkX = (SceneGraph.centralZoneX - 6) / 8;
chunkZ = (SceneGraph.centralZoneX + 6) / 8;
for (@Pc(837) int local837 = chunkX - 1; local837 <= chunkZ + 1; local837++) {
for (@Pc(850) int local850 = local821 - 1; local850 <= local815 + 1; local850++) {
if (local837 < chunkX || local837 > chunkZ || local850 < local821 || local850 > local815) {
@ -1185,7 +1185,7 @@ public class LoginManager {
local39 = true;
if (!local95.isReady()) {
local15 = false;
ClientProt.anInt5804++;
anInt5804++;
}
}
}
@ -1866,14 +1866,14 @@ public class LoginManager {
local53 = local9[local20];
if (local53 != null) {
client.audioLoop();
method2203(PathFinder.collisionMaps, arg0, centralZoneX * 8 - 48, local49, local38, (centralZoneZ - 6) * 8, local53);
method2203(PathFinder.collisionMaps, arg0, SceneGraph.centralZoneX * 8 - 48, local49, local38, (SceneGraph.centralZoneZ - 6) * 8, local53);
}
}
for (local20 = 0; local20 < local18; local20++) {
local38 = (regionBitPacked[local20] >> 8) * 64 - Camera.originX;
local49 = (regionBitPacked[local20] & 0xFF) * 64 - Camera.originZ;
local53 = local9[local20];
if (local53 == null && centralZoneZ < 800) {
if (local53 == null && SceneGraph.centralZoneZ < 800) {
client.audioLoop();
for (@Pc(130) int local130 = 0; local130 < local7; local130++) {
method645(local130, local49, local38, 64, 64);

View file

@ -593,7 +593,7 @@ public class MiniMenu {
}
}
if (local23 == 41 && Cs1ScriptRunner.aClass13_10 == null) {
ClientProt.method10(local15, local19);
method10(local15, local19);
Cs1ScriptRunner.aClass13_10 = InterfaceList.method1418(local19, local15);
InterfaceList.redraw(Cs1ScriptRunner.aClass13_10);
}
@ -1597,4 +1597,10 @@ public class MiniMenu {
}
}
@OriginalMember(owner = "client!aa", name = "a", descriptor = "(IZI)V")
public static void method10(@OriginalArg(0) int arg0, @OriginalArg(2) int arg1) {
Protocol.outboundBuffer.p1isaac(132);
Protocol.outboundBuffer.imp4(arg1);
Protocol.outboundBuffer.ip2(arg0);
}
}

View file

@ -50,13 +50,13 @@ public class MsiTypeList {
}
@OriginalMember(owner = "client!qg", name = "h", descriptor = "(I)V")
public static void method3653() {
public static void clear() {
types.clear();
sprites.clear();
}
@OriginalMember(owner = "client!vl", name = "b", descriptor = "(I)V")
public static void method4529() {
public static void removeSoft() {
types.removeSoft();
sprites.removeSoft();
}

View file

@ -40,14 +40,14 @@ public class NpcTypeList {
}
@OriginalMember(owner = "client!t", name = "b", descriptor = "(B)V")
public static void method4001() {
public static void removeSoft() {
types.removeSoft();
models.removeSoft();
headModels.removeSoft();
}
@OriginalMember(owner = "client!qi", name = "e", descriptor = "(B)V")
public static void method3673() {
public static void clear() {
types.clear();
models.clear();
headModels.clear();

View file

@ -69,14 +69,14 @@ public class ObjTypeList {
}
@OriginalMember(owner = "client!i", name = "r", descriptor = "(I)V")
public static void method2239() {
public static void removeSoft() {
types.removeSoft();
models.removeSoft();
objectSpriteCache.removeSoft();
}
@OriginalMember(owner = "client!ob", name = "a", descriptor = "(B)V")
public static void method3302() {
public static void clear() {
types.clear();
models.clear();
objectSpriteCache.clear();
@ -93,7 +93,7 @@ public class ObjTypeList {
public static void setAllowMembers(@OriginalArg(0) boolean arg0) {
if (arg0 != aBoolean276) {
aBoolean276 = arg0;
method3302();
clear();
}
}

View file

@ -113,13 +113,13 @@ public final class PlayerAppearance {
}
@OriginalMember(owner = "client!ph", name = "b", descriptor = "(B)V")
public static void method3474() {
public static void removeSoft() {
bodyModels.removeSoft();
headModels.removeSoft();
}
@OriginalMember(owner = "client!sj", name = "c", descriptor = "(I)V")
public static void method3947() {
public static void clear() {
bodyModels.clear();
headModels.clear();
}

View file

@ -405,7 +405,7 @@ public class Protocol {
@OriginalMember(owner = "client!g", name = "a", descriptor = "(IZ)V")
public static void readRebuildPacket(@OriginalArg(1) boolean arg0) {
LoginManager.dynamicMapRegion = arg0;
SceneGraph.dynamicMapRegion = arg0;
@Pc(13) int local13;
@Pc(20) int local20;
@Pc(26) int local26;
@ -415,7 +415,7 @@ public class Protocol {
@Pc(138) int local138;
@Pc(151) int local151;
@Pc(169) int local169;
if (!LoginManager.dynamicMapRegion) {
if (!SceneGraph.dynamicMapRegion) {
local13 = inboundBuffer.g2add();
local20 = (length - inboundBuffer.offset) / 16;
LoginManager.regionsXteaKeys = new int[local20][4];
@ -2799,7 +2799,7 @@ public class Protocol {
InterfaceList.anInt3337 = 0;
}
if (Cs1ScriptRunner.aClass13_14 != null) {
ClientProt.method28();
Cs1ScriptRunner.method28();
}
if (LoginManager.staffModLevel > 0 && Keyboard.pressedKeys[Keyboard.KEY_CTRL] && Keyboard.pressedKeys[Keyboard.KEY_SHIFT] && MouseWheel.wheelRotation != 0) {
y = Player.level - MouseWheel.wheelRotation;

View file

@ -185,6 +185,12 @@ public class SceneGraph {
public static boolean aBoolean130 = false;
@OriginalMember(owner = "client!gg", name = "Z", descriptor = "I")
public static int anInt2222;
@OriginalMember(owner = "client!sj", name = "u", descriptor = "Z")
public static boolean dynamicMapRegion = false;
@OriginalMember(owner = "client!gf", name = "R", descriptor = "I")
public static int centralZoneX;
@OriginalMember(owner = "client!eb", name = "u", descriptor = "I")
public static int centralZoneZ;
@OriginalMember(owner = "client!km", name = "f", descriptor = "(I)Z")
public static boolean allLevelsAreVisible() {
@ -2788,7 +2794,7 @@ public class SceneGraph {
@OriginalMember(owner = "client!ch", name = "c", descriptor = "(I)V")
public static void method846() {
if (!allLevelsAreVisible() && LoginManager.centralPlane != Player.level) {
LoginManager.method2463(Player.level, LoginManager.centralZoneZ, LoginManager.centralZoneX, PlayerList.self.movementQueueZ[0], false, PlayerList.self.movementQueueX[0]);
LoginManager.method2463(Player.level, centralZoneZ, centralZoneX, PlayerList.self.movementQueueZ[0], false, PlayerList.self.movementQueueX[0]);
} else if (Player.level != LightingManager.anInt2875 && MiniMap.renderMap(Player.level)) {
LightingManager.anInt2875 = Player.level;
ScriptRunner.method2218();

View file

@ -51,13 +51,13 @@ public class SeqTypeList {
}
@OriginalMember(owner = "client!an", name = "a", descriptor = "(Z)V")
public static void method350() {
public static void clear() {
types.clear();
animFramesets.clear();
}
@OriginalMember(owner = "client!sg", name = "a", descriptor = "(B)V")
public static void method3903() {
public static void removeSoft() {
types.removeSoft();
animFramesets.removeSoft();
}

View file

@ -14,7 +14,7 @@ public class ShadowModelList {
}
@OriginalMember(owner = "client!ug", name = "b", descriptor = "(B)V")
public static void method4276() {
public static void removeSoft() {
SHADOWS.removeSoft();
}
@ -147,7 +147,7 @@ public class ShadowModelList {
}
@OriginalMember(owner = "client!hb", name = "a", descriptor = "(Z)V")
public static void method1857() {
public static void clear() {
SHADOWS.clear();
}
}

View file

@ -53,13 +53,13 @@ public class SpotAnimTypeList {
}
@OriginalMember(owner = "client!ub", name = "a", descriptor = "(Z)V")
public static void method4249() {
public static void clear() {
types.clear();
models.clear();
}
@OriginalMember(owner = "client!fk", name = "a", descriptor = "(B)V")
public static void method1441() {
public static void removeSoft() {
types.removeSoft();
models.removeSoft();
}

View file

@ -36,12 +36,12 @@ public class VarbitTypeList {
}
@OriginalMember(owner = "client!gd", name = "a", descriptor = "(I)V")
public static void method1694() {
public static void removeSoft() {
types.removeSoft();
}
@OriginalMember(owner = "client!ec", name = "b", descriptor = "(I)V")
public static void method1295() {
public static void clear() {
types.clear();
}

View file

@ -34,12 +34,12 @@ public class VarpTypeList {
}
@OriginalMember(owner = "client!ud", name = "d", descriptor = "(I)V")
public static void method4266() {
public static void clear() {
types.clear();
}
@OriginalMember(owner = "client!ab", name = "b", descriptor = "(B)V")
public static void method4657() {
public static void removeSoft() {
types.removeSoft();
}

View file

@ -330,7 +330,7 @@ public final class client extends GameShell {
Protocol.aClass95_4 = null;
}
if (arg0 == 25 || arg0 == 28) {
ClientProt.anInt5804 = 0;
LoginManager.anInt5804 = 0;
anInt5150 = 1;
LoginManager.loadingScreenState = 0;
anInt1196 = 1;
@ -380,55 +380,55 @@ public final class client extends GameShell {
}
@OriginalMember(owner = "client!je", name = "h", descriptor = "(I)V")
public static void method2380() {
FloTypeList.method4301();
FluTypeList.method3885();
IdkTypeList.method3342();
LocTypeList.method3323();
NpcTypeList.method4001();
ObjTypeList.method2239();
SeqTypeList.method3903();
SpotAnimTypeList.method1441();
VarbitTypeList.method1694();
VarpTypeList.method4657();
BasTypeList.method1172();
MsiTypeList.method4529();
LightTypeList.method1882();
CursorTypeList.method741();
PlayerAppearance.method3474();
Component.method1019();
public static void unloadSoft() {
FloTypeList.removeSoft();
FluTypeList.removeSoft();
IdkTypeList.removeSoft();
LocTypeList.removeSoft();
NpcTypeList.removeSoft();
ObjTypeList.removeSoft();
SeqTypeList.removeSoft();
SpotAnimTypeList.removeSoft();
VarbitTypeList.removeSoft();
VarpTypeList.removeSoft();
BasTypeList.removeSoft();
MsiTypeList.removeSoft();
LightTypeList.removeSoft();
CursorTypeList.removeSoft();
PlayerAppearance.removeSoft();
Component.removeSoft();
HintArrowManager.removeSoft();
ShadowModelList.method4276();
ShadowModelList.removeSoft();
HitBarList.hitBars.removeSoft();
FontMetricsList.fontMetrics.removeSoft();
}
@OriginalMember(owner = "client!rj", name = "f", descriptor = "(B)V")
public static void method3768() {
FloTypeList.method4612();
FluTypeList.method1308();
IdkTypeList.method3999();
public static void unload() {
FloTypeList.clear();
FluTypeList.clear();
IdkTypeList.clear();
LocTypeList.clear();
NpcTypeList.method3673();
ObjTypeList.method3302();
SeqTypeList.method350();
SpotAnimTypeList.method4249();
VarbitTypeList.method1295();
VarpTypeList.method4266();
BasTypeList.method2433();
MsiTypeList.method3653();
LightTypeList.method1695();
CursorTypeList.method351();
PlayerAppearance.method3947();
NpcTypeList.clear();
ObjTypeList.clear();
SeqTypeList.clear();
SpotAnimTypeList.clear();
VarbitTypeList.clear();
VarpTypeList.clear();
BasTypeList.clear();
MsiTypeList.clear();
LightTypeList.clear();
CursorTypeList.clear();
PlayerAppearance.clear();
Component.clear();
if (modeWhat != 0) {
for (@Pc(54) int local54 = 0; local54 < Player.aByteArrayArray8.length; local54++) {
Player.aByteArrayArray8[local54] = null;
for (@Pc(54) int i = 0; i < Player.aByteArrayArray8.length; i++) {
Player.aByteArrayArray8[i] = null;
}
Player.anInt2863 = 0;
}
HintArrowManager.clear();
ShadowModelList.method1857();
ShadowModelList.clear();
FontMetricsList.fontMetrics.clear();
if (!GlRenderer.enabled) {
((Js5GlTextureProvider) Rasteriser.textureProvider).clear();
@ -485,7 +485,7 @@ public final class client extends GameShell {
SceneGraph.clear();
MiniMap.sprite = null;
LightingManager.anInt2875 = -1;
method3768();
unload();
DeadClass.cache.clear();
LocType.aClass139_1 = new Loc_Class139();
((Js5GlTextureProvider) Rasteriser.textureProvider).clear();
@ -622,7 +622,7 @@ public final class client extends GameShell {
Player.secondaryOptions[local3506] = false;
Player.cursors[local3506] = -1;
}
Inv.method2073();
Inv.clear();
ScriptRunner.aBoolean43 = true;
for (local3506 = 0; local3506 < 100; local3506++) {
InterfaceList.aBooleanArray100[local3506] = true;
@ -648,7 +648,7 @@ public final class client extends GameShell {
aShortArray88 = aShortArray19 = aShortArray74 = aShortArray87 = new short[256];
LoginManager.method4637();
InterfaceList.aBoolean298 = false;
ClientProt.method1373();
ClientProt.sendWindowDetails();
}
@OriginalMember(owner = "client!rc", name = "d", descriptor = "(I)V")
@ -763,10 +763,10 @@ public final class client extends GameShell {
local80 = (anInt5150 - LoginManager.mapFilesMissingCount) * 50 / anInt5150;
Fonts.drawTextOnScreen(false, JagString.concatenate(new JagString[]{LocalizedText.LOADING, aClass100_974, JagString.parseInt(local80), Cs1ScriptRunner.aClass100_80}));
} else if (LoginManager.loadingScreenState == 2) {
if (anInt1196 < ClientProt.anInt5804) {
anInt1196 = ClientProt.anInt5804;
if (anInt1196 < LoginManager.anInt5804) {
anInt1196 = LoginManager.anInt5804;
}
local80 = (anInt1196 - ClientProt.anInt5804) * 50 / anInt1196 + 50;
local80 = (anInt1196 - LoginManager.anInt5804) * 50 / anInt1196 + 50;
Fonts.drawTextOnScreen(false, JagString.concatenate(new JagString[]{LocalizedText.LOADING, aClass100_974, JagString.parseInt(local80), Cs1ScriptRunner.aClass100_80}));
} else {
Fonts.drawTextOnScreen(false, LocalizedText.LOADING);
@ -1110,7 +1110,7 @@ public final class client extends GameShell {
priorityRequest = (HookRequest) InterfaceList.lowPriorityRequests.removeHead();
if (priorityRequest == null) {
if (Cs1ScriptRunner.aClass13_14 != null) {
ClientProt.method28();
Cs1ScriptRunner.method28();
}
if (Protocol.openUrlRequest != null && Protocol.openUrlRequest.status == 1) {
if (Protocol.openUrlRequest.result != null) {