mirror of
https://gitlab.com/2009scape/rt4-client.git
synced 2026-08-21 18:35:14 -06:00
Moved around more static methods, nothing final
Some of these are "incorrect" - I wanted to decrease the # of static classes first by grouping them if they're slightly related. Then I'll do a second pass in each class to reorganize later.
This commit is contained in:
Pazaz
parent
c988509e8e
commit
ba4debb0d3
150 changed files with 2805 additions and 3034 deletions
|
|
@ -1,7 +1,5 @@
|
|||
package rt4;
|
||||
|
||||
import java.nio.charset.StandardCharsets;
|
||||
|
||||
import org.openrs2.deob.annotation.OriginalArg;
|
||||
import org.openrs2.deob.annotation.OriginalMember;
|
||||
import org.openrs2.deob.annotation.Pc;
|
||||
|
|
@ -31,193 +29,135 @@ public final class Static127 {
|
|||
@OriginalMember(owner = "client!k", name = "m", descriptor = "Z")
|
||||
public static boolean neverRemoveRoofs = false;
|
||||
|
||||
@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) {
|
||||
return SpriteLoader.decode(arg1, 0, arg0) ? Font.method799(arg2.getFile(arg0, 0)) : null;
|
||||
}
|
||||
|
||||
@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 (Static80.centralZoneX == arg2 && arg1 == Static52.anInt1695 && (Static41.anInt1316 == arg0 || SceneGraph.allLevelsAreVisible())) {
|
||||
return;
|
||||
}
|
||||
Static80.centralZoneX = arg2;
|
||||
Static52.anInt1695 = arg1;
|
||||
Static41.anInt1316 = arg0;
|
||||
if (SceneGraph.allLevelsAreVisible()) {
|
||||
Static41.anInt1316 = 0;
|
||||
}
|
||||
if (arg4) {
|
||||
client.setGameState(28);
|
||||
} else {
|
||||
client.setGameState(25);
|
||||
}
|
||||
Static114.drawTextOnScreen(true, LocalizedText.LOADING);
|
||||
@Pc(53) int local53 = Camera.originZ;
|
||||
@Pc(55) int local55 = Camera.originX;
|
||||
Camera.originZ = arg1 * 8 - 48;
|
||||
Camera.originX = (arg2 - 6) * 8;
|
||||
Static158.aClass3_Sub2_Sub4_3 = MapList.getContainingSource(Static80.centralZoneX * 8, Static52.anInt1695 * 8);
|
||||
@Pc(81) int local81 = Camera.originZ - local53;
|
||||
@Pc(86) int local86 = Camera.originX - local55;
|
||||
Static235.mapElementList = null;
|
||||
@Pc(96) int local96;
|
||||
@Pc(103) Npc local103;
|
||||
@Pc(109) int local109;
|
||||
if (arg4) {
|
||||
NpcList.size = 0;
|
||||
for (local96 = 0; local96 < 32768; local96++) {
|
||||
local103 = NpcList.npcs[local96];
|
||||
if (local103 != null) {
|
||||
local103.xFine -= local86 * 128;
|
||||
local103.zFine -= local81 * 128;
|
||||
if (local103.xFine >= 0 && local103.xFine <= 13184 && local103.zFine >= 0 && local103.zFine <= 13184) {
|
||||
for (local109 = 0; local109 < 10; local109++) {
|
||||
local103.movementQueueX[local109] -= local86;
|
||||
local103.movementQueueZ[local109] -= local81;
|
||||
}
|
||||
NpcList.ids[NpcList.size++] = local96;
|
||||
} else {
|
||||
NpcList.npcs[local96].setNpcType(null);
|
||||
NpcList.npcs[local96] = null;
|
||||
}
|
||||
}
|
||||
}
|
||||
} else {
|
||||
for (local96 = 0; local96 < 32768; local96++) {
|
||||
local103 = NpcList.npcs[local96];
|
||||
if (local103 != null) {
|
||||
for (local109 = 0; local109 < 10; local109++) {
|
||||
local103.movementQueueX[local109] -= local86;
|
||||
local103.movementQueueZ[local109] -= local81;
|
||||
}
|
||||
local103.xFine -= local86 * 128;
|
||||
local103.zFine -= local81 * 128;
|
||||
}
|
||||
}
|
||||
}
|
||||
for (local96 = 0; local96 < 2048; local96++) {
|
||||
@Pc(265) Player local265 = PlayerList.players[local96];
|
||||
if (local265 != null) {
|
||||
for (local109 = 0; local109 < 10; local109++) {
|
||||
local265.movementQueueX[local109] -= local86;
|
||||
local265.movementQueueZ[local109] -= local81;
|
||||
}
|
||||
local265.xFine -= local86 * 128;
|
||||
local265.zFine -= local81 * 128;
|
||||
}
|
||||
}
|
||||
Player.level = arg0;
|
||||
PlayerList.self.teleport(arg5, false, arg3);
|
||||
@Pc(322) byte local322 = 104;
|
||||
@Pc(324) byte local324 = 0;
|
||||
@Pc(326) byte local326 = 0;
|
||||
@Pc(328) byte local328 = 1;
|
||||
@Pc(330) byte local330 = 104;
|
||||
@Pc(332) byte local332 = 1;
|
||||
if (local81 < 0) {
|
||||
local328 = -1;
|
||||
local330 = -1;
|
||||
local326 = 103;
|
||||
}
|
||||
if (local86 < 0) {
|
||||
local332 = -1;
|
||||
local324 = 103;
|
||||
local322 = -1;
|
||||
}
|
||||
for (@Pc(358) int local358 = local324; local358 != local322; local358 += local332) {
|
||||
for (@Pc(367) int local367 = local326; local367 != local330; local367 += local328) {
|
||||
@Pc(378) int local378 = local86 + local358;
|
||||
@Pc(382) int local382 = local367 + local81;
|
||||
for (@Pc(384) int local384 = 0; local384 < 4; local384++) {
|
||||
if (local378 >= 0 && local382 >= 0 && local378 < 104 && local382 < 104) {
|
||||
SceneGraph.objStacks[local384][local358][local367] = SceneGraph.objStacks[local384][local378][local382];
|
||||
} else {
|
||||
SceneGraph.objStacks[local384][local358][local367] = null;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
for (@Pc(451) SceneryStack local451 = (SceneryStack) Static26.sceneryList.head(); local451 != null; local451 = (SceneryStack) Static26.sceneryList.next()) {
|
||||
local451.z -= local81;
|
||||
local451.x -= local86;
|
||||
if (local451.x < 0 || local451.z < 0 || local451.x >= 104 || local451.z >= 104) {
|
||||
local451.unlink();
|
||||
}
|
||||
}
|
||||
if (arg4) {
|
||||
Camera.renderX -= local86 * 128;
|
||||
Camera.renderZ -= local81 * 128;
|
||||
Static248.anInt4232 -= local81;
|
||||
Static251.anInt5449 -= local86;
|
||||
Static265.anInt5765 -= local81;
|
||||
Static245.anInt5375 -= local86;
|
||||
} else {
|
||||
Camera.cameraType = 1;
|
||||
}
|
||||
SoundPlayer.anInt4451 = 0;
|
||||
if (Static115.mapFlagX != 0) {
|
||||
Static84.anInt2255 -= local81;
|
||||
Static115.mapFlagX -= local86;
|
||||
}
|
||||
if (GlRenderer.enabled && arg4 && (Math.abs(local86) > 104 || Math.abs(local81) > 104)) {
|
||||
Static103.setInstantFade();
|
||||
}
|
||||
Static107.anInt2875 = -1;
|
||||
Static99.aClass69_64.clear();
|
||||
Static217.aClass69_116.clear();
|
||||
}
|
||||
|
||||
@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) {
|
||||
if (arg1.indexOf(PERCENT_SIGN) == -1) {
|
||||
return arg1;
|
||||
}
|
||||
while (true) {
|
||||
@Pc(14) int local14 = arg1.indexOf(aClass100_133);
|
||||
if (local14 == -1) {
|
||||
while (true) {
|
||||
local14 = arg1.indexOf(aClass100_1097);
|
||||
if (local14 == -1) {
|
||||
while (true) {
|
||||
local14 = arg1.indexOf(aClass100_761);
|
||||
if (local14 == -1) {
|
||||
while (true) {
|
||||
local14 = arg1.indexOf(aClass100_520);
|
||||
if (local14 == -1) {
|
||||
while (true) {
|
||||
local14 = arg1.indexOf(aClass100_1002);
|
||||
if (local14 == -1) {
|
||||
while (true) {
|
||||
local14 = arg1.indexOf(aClass100_591);
|
||||
if (local14 == -1) {
|
||||
return arg1;
|
||||
}
|
||||
@Pc(246) JagString local246 = JagString.EMPTY;
|
||||
if (Player.lastLogAddress != null) {
|
||||
local246 = JagString.formatIp(Player.lastLogAddress.intArg2);
|
||||
if (Player.lastLogAddress.result != null) {
|
||||
@Pc(265) byte[] local265 = ((String) Player.lastLogAddress.result).getBytes(StandardCharsets.ISO_8859_1);
|
||||
local246 = JagString.decodeString(local265, local265.length, 0);
|
||||
}
|
||||
}
|
||||
arg1 = JagString.concatenate(new JagString[] { arg1.substring(local14, 0), local246, arg1.substring(local14 + 4) });
|
||||
}
|
||||
}
|
||||
arg1 = JagString.concatenate(new JagString[] { arg1.substring(local14, 0), Static262.method4510(Static273.method3212(4, arg0)), arg1.substring(local14 + 2) });
|
||||
}
|
||||
}
|
||||
arg1 = JagString.concatenate(new JagString[] { arg1.substring(local14, 0), Static262.method4510(Static273.method3212(3, arg0)), arg1.substring(local14 + 2) });
|
||||
}
|
||||
}
|
||||
arg1 = JagString.concatenate(new JagString[] { arg1.substring(local14, 0), Static262.method4510(Static273.method3212(2, arg0)), arg1.substring(local14 + 2) });
|
||||
}
|
||||
}
|
||||
arg1 = JagString.concatenate(new JagString[] { arg1.substring(local14, 0), Static262.method4510(Static273.method3212(1, arg0)), arg1.substring(local14 + 2) });
|
||||
}
|
||||
}
|
||||
arg1 = JagString.concatenate(new JagString[] { arg1.substring(local14, 0), Static262.method4510(Static273.method3212(0, arg0)), arg1.substring(local14 + 2) });
|
||||
}
|
||||
}
|
||||
|
||||
@OriginalMember(owner = "client!we", name = "a", descriptor = "(BILclient!be;)I")
|
||||
public static int method3212(@OriginalArg(1) int arg0, @OriginalArg(2) Component arg1) {
|
||||
if (arg1.anIntArrayArray4 == null || arg0 >= arg1.anIntArrayArray4.length) {
|
||||
return -2;
|
||||
}
|
||||
try {
|
||||
@Pc(33) int[] local33 = arg1.anIntArrayArray4[arg0];
|
||||
@Pc(35) byte local35 = 0;
|
||||
@Pc(37) int local37 = 0;
|
||||
@Pc(39) int local39 = 0;
|
||||
while (true) {
|
||||
@Pc(41) int local41 = 0;
|
||||
@Pc(46) int local46 = local33[local39++];
|
||||
@Pc(48) byte local48 = 0;
|
||||
if (local46 == 0) {
|
||||
return local37;
|
||||
}
|
||||
if (local46 == 15) {
|
||||
local48 = 1;
|
||||
}
|
||||
if (local46 == 16) {
|
||||
local48 = 2;
|
||||
}
|
||||
if (local46 == 1) {
|
||||
local41 = PlayerSkillXpTable.boostedLevels[local33[local39++]];
|
||||
}
|
||||
if (local46 == 17) {
|
||||
local48 = 3;
|
||||
}
|
||||
if (local46 == 2) {
|
||||
local41 = PlayerSkillXpTable.baseLevels[local33[local39++]];
|
||||
}
|
||||
if (local46 == 3) {
|
||||
local41 = PlayerSkillXpTable.experience[local33[local39++]];
|
||||
}
|
||||
@Pc(124) int local124;
|
||||
@Pc(135) Component local135;
|
||||
@Pc(140) int local140;
|
||||
@Pc(152) int local152;
|
||||
if (local46 == 4) {
|
||||
local124 = local33[local39++] << 16;
|
||||
@Pc(131) int local131 = local124 + local33[local39++];
|
||||
local135 = InterfaceList.getComponent(local131);
|
||||
local140 = local33[local39++];
|
||||
if (local140 != -1 && (!ObjTypeList.get(local140).members || LoginManager.mapMembers)) {
|
||||
for (local152 = 0; local152 < local135.objTypes.length; local152++) {
|
||||
if (local140 + 1 == local135.objTypes[local152]) {
|
||||
local41 += local135.objCounts[local152];
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
if (local46 == 5) {
|
||||
local41 = VarpDomain.activeVarps[local33[local39++]];
|
||||
}
|
||||
if (local46 == 6) {
|
||||
local41 = PlayerSkillXpTable.xpLevelLookup[PlayerSkillXpTable.baseLevels[local33[local39++]] - 1];
|
||||
}
|
||||
if (local46 == 7) {
|
||||
local41 = VarpDomain.activeVarps[local33[local39++]] * 100 / 46875;
|
||||
}
|
||||
if (local46 == 8) {
|
||||
local41 = PlayerList.self.combatLevel;
|
||||
}
|
||||
if (local46 == 9) {
|
||||
for (local124 = 0; local124 < 25; local124++) {
|
||||
if (Static182.aBooleanArray97[local124]) {
|
||||
local41 += PlayerSkillXpTable.baseLevels[local124];
|
||||
}
|
||||
}
|
||||
}
|
||||
if (local46 == 10) {
|
||||
local124 = local33[local39++] << 16;
|
||||
local124 += local33[local39++];
|
||||
local135 = InterfaceList.getComponent(local124);
|
||||
local140 = local33[local39++];
|
||||
if (local140 != -1 && (!ObjTypeList.get(local140).members || LoginManager.mapMembers)) {
|
||||
for (local152 = 0; local152 < local135.objTypes.length; local152++) {
|
||||
if (local135.objTypes[local152] == local140 + 1) {
|
||||
local41 = 999999999;
|
||||
break;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
if (local46 == 11) {
|
||||
local41 = Player.runEnergy;
|
||||
}
|
||||
if (local46 == 12) {
|
||||
local41 = Player.weight;
|
||||
}
|
||||
if (local46 == 13) {
|
||||
local124 = VarpDomain.activeVarps[local33[local39++]];
|
||||
@Pc(353) int local353 = local33[local39++];
|
||||
local41 = (0x1 << local353 & local124) == 0 ? 0 : 1;
|
||||
}
|
||||
if (local46 == 14) {
|
||||
local124 = local33[local39++];
|
||||
local41 = VarpDomain.getVarbit(local124);
|
||||
}
|
||||
if (local46 == 18) {
|
||||
local41 = (PlayerList.self.xFine >> 7) + Camera.originX;
|
||||
}
|
||||
if (local46 == 19) {
|
||||
local41 = (PlayerList.self.zFine >> 7) + Camera.originZ;
|
||||
}
|
||||
if (local46 == 20) {
|
||||
local41 = local33[local39++];
|
||||
}
|
||||
if (local48 == 0) {
|
||||
if (local35 == 0) {
|
||||
local37 += local41;
|
||||
}
|
||||
if (local35 == 1) {
|
||||
local37 -= local41;
|
||||
}
|
||||
if (local35 == 2 && local41 != 0) {
|
||||
local37 /= local41;
|
||||
}
|
||||
if (local35 == 3) {
|
||||
local37 *= local41;
|
||||
}
|
||||
local35 = 0;
|
||||
} else {
|
||||
local35 = local48;
|
||||
}
|
||||
}
|
||||
} catch (@Pc(464) Exception local464) {
|
||||
return -1;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue