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

Renamed more of ObjType

Browse source
This commit is contained in:
Pazaz 2022-06-15 14:07:35 -04:00
parent bcb88470f8
commit 694fc3b9dc
24 changed files with 477 additions and 425 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -36,7 +36,7 @@ public class ClientScriptList {
local12.aClass133Array1 = new HashTable[local98];
for (local107 = 0; local107 < local98; local107++) {
local114 = local42.g2();
@Pc(121) HashTable local121 = new HashTable(Static165.clp2(local114));
@Pc(121) HashTable local121 = new HashTable(IntUtils.clp2(local114));
local12.aClass133Array1[local107] = local121;
while (local114-- > 0) {
@Pc(136) int local136 = local42.g4();

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

@ -38,7 +38,7 @@ public final class EnumType extends SecondaryNode {
this.defaultInt = arg1.g4();
} else if (arg0 == 5 || arg0 == 6) {
@Pc(41) int size = arg1.g2();
this.table = new HashTable(Static165.clp2(size));
this.table = new HashTable(IntUtils.clp2(size));
for (@Pc(51) int local51 = 0; local51 < size; local51++) {
@Pc(58) int local58 = arg1.g4();
@Pc(70) Node local70;

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

@ -14,7 +14,7 @@ public class Equipment {
@Pc(12) int local12;
for (local12 = 0; local12 < ObjTypeList.anInt3245; local12++) {
@Pc(19) ObjType local19 = ObjTypeList.get(local12);
if (local19.manWear1 >= 0 || local19.womanWear1 >= 0) {
if (local19.manwear >= 0 || local19.womanwear >= 0) {
local8[local10++] = local12;
}
}

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

@ -54,7 +54,7 @@ public class Find {
@Pc(14) int local14 = 0;
for (@Pc(16) int local16 = 0; local16 < ObjTypeList.anInt3245; local16++) {
@Pc(27) ObjType local27 = ObjTypeList.get(local16);
if ((!arg0 || local27.stockMarket) && local27.certificateTemplate == -1 && local27.lentTemplate == -1 && local27.dummyItem == 0 && local27.name.toLowerCase().indexOf(local12) != -1) {
if ((!arg0 || local27.stockMarket) && local27.certtemplate == -1 && local27.lentTemplate == -1 && local27.dummyItem == 0 && local27.name.toLowerCase().indexOf(local12) != -1) {
if (local14 >= 250) {
results = null;
index = -1;

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

@ -23,8 +23,8 @@ public final class GlAlphaSprite extends GlSprite {
@OriginalMember(owner = "client!el", name = "a", descriptor = "([I)V")
@Override
protected final void method1430(@OriginalArg(0) int[] arg0) {
this.powerOfTwoWidth = Static165.clp2(this.width);
this.powerOfTwoHeight = Static165.clp2(this.height);
this.powerOfTwoWidth = IntUtils.clp2(this.width);
this.powerOfTwoHeight = IntUtils.clp2(this.height);
@Pc(20) byte[] local20 = new byte[this.powerOfTwoWidth * this.powerOfTwoHeight * 4];
@Pc(22) int local22 = 0;
@Pc(24) int local24 = 0;

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

@ -174,7 +174,7 @@ public final class GlFont extends Font {
}
}
this.powerOfTwoSize *= 16;
this.powerOfTwoSize = Static165.clp2(this.powerOfTwoSize);
this.powerOfTwoSize = IntUtils.clp2(this.powerOfTwoSize);
int glyphSize = this.powerOfTwoSize / 16;
@Pc(66) byte[] dest = new byte[this.powerOfTwoSize * this.powerOfTwoSize * 2];
for (@Pc(68) int i = 0; i < 256; i++) {

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

@ -45,8 +45,8 @@ public final class GlIndexedSprite extends IndexedSprite {
@OriginalMember(owner = "client!oh", name = "a", descriptor = "([B[I)V")
private void method3337(@OriginalArg(0) byte[] arg0, @OriginalArg(1) int[] arg1) {
this.anInt4287 = Static165.clp2(this.width);
this.anInt4286 = Static165.clp2(this.height);
this.anInt4287 = IntUtils.clp2(this.width);
this.anInt4286 = IntUtils.clp2(this.height);
@Pc(20) byte[] local20 = new byte[this.anInt4287 * this.anInt4286 * 4];
@Pc(22) int local22 = 0;
@Pc(24) int local24 = 0;

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

@ -443,8 +443,8 @@ public class GlSprite extends Sprite {
@OriginalMember(owner = "client!cf", name = "a", descriptor = "([I)V")
protected void method1430(@OriginalArg(0) int[] arg0) {
this.powerOfTwoWidth = Static165.clp2(this.width);
this.powerOfTwoHeight = Static165.clp2(this.height);
this.powerOfTwoWidth = IntUtils.clp2(this.width);
this.powerOfTwoHeight = IntUtils.clp2(this.height);
@Pc(20) byte[] local20 = new byte[this.powerOfTwoWidth * this.powerOfTwoHeight * 4];
@Pc(22) int local22 = 0;
@Pc(24) int local24 = 0;

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

@ -136,7 +136,7 @@ public final class GlTile extends Node {
this.anIntArray227 = new int[this.anInt2484];
this.anIntArray231 = new int[this.anInt2484];
this.anIntArrayArray17 = new int[this.anInt2484][];
this.aClass133_8 = new HashTable(Static165.clp2(this.anInt2482));
this.aClass133_8 = new HashTable(IntUtils.clp2(this.anInt2482));
if (this.blend) {
this.anIntArrayArray18 = new int[this.anInt2484][];
this.aBooleanArray54 = new boolean[this.anInt2484];

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

@ -21,4 +21,15 @@ public class IntUtils {
return local15;
}
}
@OriginalMember(owner = "client!nb", name = "a", descriptor = "(BI)I")
public static int clp2(@OriginalArg(1) int arg0) {
@Pc(0) int local0 = arg0 - 1;
@Pc(6) int local6 = local0 | local0 >>> 1;
@Pc(22) int local22 = local6 | local6 >>> 2;
@Pc(28) int local28 = local22 | local22 >>> 4;
@Pc(34) int local34 = local28 | local28 >>> 8;
@Pc(40) int local40 = local34 | local34 >>> 16;
return local40 + 1;
}
}

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

@ -165,11 +165,11 @@ public final class Inv extends Node {
@OriginalMember(owner = "client!na", name = "a", descriptor = "(IBZIZIIZ)Lclient!qf;")
public static Sprite renderObjectSprite(@OriginalArg(0) int shadow, @OriginalArg(2) boolean linked, @OriginalArg(3) int id, @OriginalArg(4) boolean drawText, @OriginalArg(5) int state, @OriginalArg(6) int stack, @OriginalArg(7) boolean cert) {
@Pc(5) ObjType objType = ObjTypeList.get(id);
if (stack > 1 && objType.countObj != null) {
if (stack > 1 && objType.countobj != null) {
@Pc(15) int stackId = -1;
for (@Pc(17) int i = 0; i < 10; i++) {
if (stack >= objType.countCount[i] && objType.countCount[i] != 0) {
stackId = objType.countObj[i];
if (stack >= objType.countco[i] && objType.countco[i] != 0) {
stackId = objType.countobj[i];
}
}
if (stackId != -1) {
@ -183,8 +183,8 @@ public final class Inv extends Node {
}
@Pc(71) SoftwareSprite linkedSprite = null;
if (objType.certificateTemplate != -1) {
linkedSprite = (SoftwareSprite) renderObjectSprite(0, true, objType.certificateLink, false, 1, 10, true);
if (objType.certtemplate != -1) {
linkedSprite = (SoftwareSprite) renderObjectSprite(0, true, objType.certlink, false, 1, 10, true);
if (linkedSprite == null) {
return null;
}
@ -217,9 +217,9 @@ public final class Inv extends Node {
zoom = (int) ((double) zoom * 1.04D);
}
@Pc(176) int pitchcos = MathUtils.cos[objType.xAngle2d] * zoom >> 16;
@Pc(185) int pitchsin = MathUtils.sin[objType.xAngle2d] * zoom >> 16;
model.setCamera(objType.yAngle2d, objType.zAngle2d, objType.xAngle2d, objType.xOffset2d, pitchsin + objType.yOffset2d - model.getMinY() / 2, objType.yOffset2d + pitchcos, -1L);
@Pc(176) int pitchcos = MathUtils.cos[objType.xAngle2D] * zoom >> 16;
@Pc(185) int pitchsin = MathUtils.sin[objType.xAngle2D] * zoom >> 16;
model.setCamera(objType.yAngle2D, objType.zAngle2D, objType.xAngle2D, objType.xOffset2D, pitchsin + objType.yOffset2D - model.getMinY() / 2, objType.yOffset2D + pitchcos, -1L);
if (state >= 1) {
canvas.drawOutline(1);
@ -233,7 +233,7 @@ public final class Inv extends Node {
canvas.drawShadow(shadow);
}
if (objType.certificateTemplate != -1) {
if (objType.certtemplate != -1) {
linkedSprite.render(0, 0);
} else if (objType.lentTemplate != -1) {
SoftwareRaster.setSize(linkedSprite.pixels, canvasWidth, canvasHeight);

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

@ -81,7 +81,7 @@ public final class JavaAudioChannel extends AudioChannel {
this.aSourceDataLine1 = null;
throw local36;
} else {
this.open(Static165.clp2(arg0));
this.open(IntUtils.clp2(arg0));
}
}
}

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

@ -178,7 +178,7 @@ public final class Light_Class45 {
this.aByteArray25 = new byte[this.anInt2019];
this.aByteArray23 = new byte[this.anInt2019];
this.aByteArray24 = new byte[this.anInt2019];
this.aClass133_4 = new HashTable(Static165.clp2(this.anInt2019));
this.aClass133_4 = new HashTable(IntUtils.clp2(this.anInt2019));
}
@OriginalMember(owner = "client!fj", name = "c", descriptor = "()V")

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

@ -593,7 +593,7 @@ public final class LocType {
} else if (arg1 == 249) {
defaultMultiLoc = arg0.g1();
if (this.params == null) {
len = Static165.clp2(defaultMultiLoc);
len = IntUtils.clp2(defaultMultiLoc);
this.params = new HashTable(len);
}
for (len = 0; len < defaultMultiLoc; len++) {

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

@ -158,15 +158,15 @@ public class MiniMenu {
@Pc(276) ObjType local276 = ObjTypeList.get(component.objTypes[local171] - 1);
if (anInt5014 == 1 && local267.isObjOpsEnabled()) {
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.id, JagString.concatenate(new JagString[] { aClass100_203, aClass100_947, local276.name}), local171, (short) 40, LocalizedText.USE, component.id);
}
} else if (Static241.aBoolean302 && local267.isObjOpsEnabled()) {
@Pc(596) ParamType local596 = Static121.anInt3039 == -1 ? null : ParamTypeList.get(Static121.anInt3039);
if ((anInt4999 & 0x10) != 0 && (local596 == null || local276.getParam(local596.defaultInt, Static121.anInt3039) != local596.defaultInt)) {
add(anInt5393, (long) local276.anInt2354, JagString.concatenate(new JagString[] { aClass100_466, aClass100_947, local276.name}), local171, (short) 3, aClass100_545, component.id);
add(anInt5393, (long) local276.id, JagString.concatenate(new JagString[] { aClass100_466, aClass100_947, local276.name}), local171, (short) 3, aClass100_545, component.id);
}
} else {
@Pc(296) JagString[] local296 = local276.inventoryOps;
@Pc(296) JagString[] local296 = local276.iops;
if (aBoolean237) {
local296 = annotateOps(local296);
}
@ -180,12 +180,12 @@ public class MiniMenu {
} else {
local334 = 58;
}
add(-1, (long) local276.anInt2354, JagString.concatenate(new JagString[] { aClass100_32, local276.name}), local171, local334, local296[local309], component.id);
add(-1, (long) local276.id, JagString.concatenate(new JagString[] { aClass100_32, local276.name}), local171, local334, local296[local309], component.id);
}
}
}
if (local267.method507()) {
add(Static169.anInt4075, (long) local276.anInt2354, JagString.concatenate(new JagString[] { aClass100_32, local276.name}), local171, (short) 22, LocalizedText.USE, component.id);
add(Static169.anInt4075, (long) local276.id, JagString.concatenate(new JagString[] { aClass100_32, local276.name}), local171, (short) 22, LocalizedText.USE, component.id);
}
if (local267.isObjOpsEnabled() && local296 != null) {
for (local309 = 2; local309 >= 0; local309--) {
@ -200,7 +200,7 @@ public class MiniMenu {
if (local309 == 2) {
local334 = 43;
}
add(-1, (long) local276.anInt2354, JagString.concatenate(new JagString[] { aClass100_32, local276.name}), local171, local334, local296[local309], component.id);
add(-1, (long) local276.id, JagString.concatenate(new JagString[] { aClass100_32, local276.name}), local171, local334, local296[local309], component.id);
}
}
}
@ -227,11 +227,11 @@ public class MiniMenu {
if (local309 == 4) {
local334 = 13;
}
add(-1, (long) local276.anInt2354, JagString.concatenate(new JagString[] { aClass100_32, local276.name}), local171, local334, local296[local309], component.id);
add(-1, (long) local276.id, JagString.concatenate(new JagString[] { aClass100_32, local276.name}), local171, local334, local296[local309], component.id);
}
}
}
add(Static225.anInt5073, (long) local276.anInt2354, JagString.concatenate(new JagString[] { aClass100_32, local276.name}), local171, (short) 1006, LocalizedText.EXAMINE, component.id);
add(Static225.anInt5073, (long) local276.id, JagString.concatenate(new JagString[] { aClass100_32, local276.name}), local171, (short) 1006, LocalizedText.EXAMINE, component.id);
}
}
}

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

@ -732,7 +732,7 @@ public final class NpcType {
} else if (arg0 == 249) {
count = arg1.g1();
if (this.params == null) {
local18 = Static165.clp2(count);
local18 = IntUtils.clp2(count);
this.params = new HashTable(local18);
}
for (local18 = 0; local18 < count; local18++) {

750
client/src/main/java/rt4/ObjType.java
View file

File diff suppressed because it is too large Load diff

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

@ -46,21 +46,21 @@ public class ObjTypeList {
}
@Pc(25) byte[] local25 = archive.fetchFile(Static18.method554(arg0), Static247.method4247(arg0));
local6 = new ObjType();
local6.anInt2354 = arg0;
local6.id = arg0;
if (local25 != null) {
local6.decode(new Buffer(local25));
}
local6.method1826();
if (local6.certificateTemplate != -1) {
local6.generateCertificate(get(local6.certificateLink), get(local6.certificateTemplate));
local6.postDecode();
if (local6.certtemplate != -1) {
local6.generateCertificate(get(local6.certlink), get(local6.certtemplate));
}
if (local6.lentTemplate != -1) {
local6.method1823(get(local6.lentLink), get(local6.lentTemplate));
local6.generateLent(get(local6.lentLink), get(local6.lentTemplate));
}
if (!aBoolean276 && local6.members) {
local6.name = LocalizedText.MEMBERS_OBJECT;
local6.team = 0;
local6.inventoryOps = aClass100Array104;
local6.iops = aClass100Array104;
local6.stockMarket = false;
local6.ops = aClass100Array87;
}

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

@ -1,18 +1,36 @@
package rt4;
import org.openrs2.deob.annotation.OriginalMember;
import org.openrs2.deob.annotation.Pc;
public class PlayerSkillXpTable {
@OriginalMember(owner = "client!ud", name = "T", descriptor = "[I")
public static final int[] updatedStats = new int[32];
@OriginalMember(owner = "client!lb", name = "p", descriptor = "[I")
public static final int[] baseLevels = new int[25];
@OriginalMember(owner = "client!hk", name = "fb", descriptor = "[I")
public static final int[] boostedLevels = new int[25];
@OriginalMember(owner = "client!sg", name = "b", descriptor = "[I")
public static final int[] experience = new int[25];
@OriginalMember(owner = "client!h", name = "S", descriptor = "[I")
public static final int[] xpLevelLookup = new int[99];
@OriginalMember(owner = "client!ha", name = "m", descriptor = "I")
public static int updatedStatsWriterIndex = 0;
static {
@Pc(4) int local4 = 0;
for (@Pc(6) int local6 = 0; local6 < 99; local6++) {
@Pc(13) int local13 = local6 + 1;
@Pc(26) int local26 = (int) (Math.pow(2.0D, (double) local13 / 7.0D) * 300.0D + (double) local13);
local4 += local26;
PlayerSkillXpTable.xpLevelLookup[local6] = local4 / 4;
}
}
}

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

@ -2203,19 +2203,19 @@ public class Protocol {
if (component.if3) {
DelayedStateChange.method3707(id, slot, itemId);
objType = ObjTypeList.get(itemId);
DelayedStateChange.updateView(objType.zoom2d, id, objType.yAngle2d, objType.xAngle2d);
DelayedStateChange.method2745(id, objType.zAngle2d, objType.yOffset2d, objType.xOffset2d);
DelayedStateChange.updateView(objType.zoom2d, id, objType.yAngle2D, objType.xAngle2D);
DelayedStateChange.method2745(id, objType.zAngle2D, objType.yOffset2D, objType.xOffset2D);
} else if (itemId == -1) {
component.modelType = 0;
opcode = -1;
return true;
} else {
objType = ObjTypeList.get(itemId);
component.modelXAngle = objType.xAngle2d;
component.modelXAngle = objType.xAngle2D;
component.modelZoom = objType.zoom2d * 100 / slot;
component.modelType = 4;
component.modelId = itemId;
component.modelYAngle = objType.yAngle2d;
component.modelYAngle = objType.yAngle2D;
InterfaceList.redraw(component);
}
opcode = -1;

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

@ -3246,7 +3246,7 @@ public final class Rasteriser {
height = bottom - top;
prepareOffsets();
if (offsets.length < height) {
offsets = new int[Static165.clp2(height)];
offsets = new int[IntUtils.clp2(height)];
}
@Pc(23) int x = top * SoftwareRaster.width + left;
for (@Pc(25) int y = 0; y < height; y++) {

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

@ -1055,11 +1055,11 @@ public final class ScriptRunner {
component.objId = int3;
component.objCount = int2;
@Pc(13416) ObjType local13416 = ObjTypeList.get(int3);
component.modelYOffset = local13416.zAngle2d;
component.modelXOffset = local13416.xOffset2d;
component.modelXAngle = local13416.xAngle2d;
component.modelZOffset = local13416.yOffset2d;
component.modelYAngle = local13416.yAngle2d;
component.modelYOffset = local13416.zAngle2D;
component.modelXOffset = local13416.xOffset2D;
component.modelXAngle = local13416.xAngle2D;
component.modelZOffset = local13416.yOffset2D;
component.modelYAngle = local13416.yAngle2D;
component.modelZoom = local13416.zoom2d;
if (component.anInt451 > 0) {
component.modelZoom = component.modelZoom * 32 / component.anInt451;
@ -2418,8 +2418,8 @@ public final class ScriptRunner {
int1 = intStack[isp];
int3 = intStack[isp + 1];
local11269 = ObjTypeList.get(int1);
if (int3 >= 1 && int3 <= 5 && local11269.inventoryOps[int3 - 1] != null) {
stringStack[ssp++] = local11269.inventoryOps[int3 - 1];
if (int3 >= 1 && int3 <= 5 && local11269.iops[int3 - 1] != null) {
stringStack[ssp++] = local11269.iops[int3 - 1];
continue;
}
stringStack[ssp++] = EMPTY_STRING;
@ -2442,8 +2442,8 @@ public final class ScriptRunner {
isp--;
int1 = intStack[isp];
local11417 = ObjTypeList.get(int1);
if (local11417.certificateTemplate == -1 && local11417.certificateLink >= 0) {
intStack[isp++] = local11417.certificateLink;
if (local11417.certtemplate == -1 && local11417.certlink >= 0) {
intStack[isp++] = local11417.certlink;
continue;
}
intStack[isp++] = int1;
@ -2453,8 +2453,8 @@ public final class ScriptRunner {
isp--;
int1 = intStack[isp];
local11417 = ObjTypeList.get(int1);
if (local11417.certificateTemplate >= 0 && local11417.certificateLink >= 0) {
intStack[isp++] = local11417.certificateLink;
if (local11417.certtemplate >= 0 && local11417.certlink >= 0) {
intStack[isp++] = local11417.certlink;
continue;
}
intStack[isp++] = int1;

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

@ -63,17 +63,6 @@ public final class Static165 {
}
}
@OriginalMember(owner = "client!nb", name = "a", descriptor = "(BI)I")
public static int clp2(@OriginalArg(1) int arg0) {
@Pc(0) int local0 = arg0 - 1;
@Pc(6) int local6 = local0 | local0 >>> 1;
@Pc(22) int local22 = local6 | local6 >>> 2;
@Pc(28) int local28 = local22 | local22 >>> 4;
@Pc(34) int local34 = local28 | local28 >>> 8;
@Pc(40) int local40 = local34 | local34 >>> 16;
return local40 + 1;
}
@OriginalMember(owner = "client!nb", name = "a", descriptor = "(II)Lclient!na;")
public static JagString method3165() {
@Pc(21) JagString local21 = new JagString();

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

@ -29,7 +29,7 @@ public final class StructType extends SecondaryNode {
@Pc(17) int local17 = arg0.g1();
@Pc(25) int local25;
if (this.params == null) {
local25 = Static165.clp2(local17);
local25 = IntUtils.clp2(local17);
this.params = new HashTable(local25);
}
for (local25 = 0; local25 < local17; local25++) {