Skip to content

Commit b5c2c20

Browse files
PazazPazaz
committed
chore: Identified sound, pix, some string methods
1 parent f83ac93 commit b5c2c20

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

47 files changed

+1295
-982
lines changed

‎src/main/java/jagex3/client/Client.java‎

Lines changed: 84 additions & 60 deletions
Large diffs are not rendered by default.

‎src/main/java/jagex3/client/RecolsRunescape.java‎

Lines changed: 14 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,13 +9,25 @@ public class RecolsRunescape {
99
public static final short[] recol1s = new short[] { 6798, 8741, 25238, 4626, 4550 };
1010

1111
@ObfuscatedName("cz.d")
12-
public static final short[][] recol1d = new short[][] { { 6798, 107, 10283, 16, 4797, 7744, 5799, 4634, -31839, 22433, 2983, -11343, 8, 5281, 10438, 3650, -27322, -21845, 200, 571, 908, 21830, 28946, -15701, -14010 }, { 8741, 12, -1506, -22374, 7735, 8404, 1701, -27106, 24094, 10153, -8915, 4783, 1341, 16578, -30533, 25239, 8, 5281, 10438, 3650, -27322, -21845, 200, 571, 908, 21830, 28946, -15701, -14010 }, { 25238, 8742, 12, -1506, -22374, 7735, 8404, 1701, -27106, 24094, 10153, -8915, 4783, 1341, 16578, -30533, 8, 5281, 10438, 3650, -27322, -21845, 200, 571, 908, 21830, 28946, -15701, -14010 }, { 4626, 11146, 6439, 12, 4758, 10270 }, { 4550, 4537, 5681, 5673, 5790, 6806, 8076, 4574 } };
12+
public static final short[][] recol1d = new short[][] {
13+
{ 6798, 107, 10283, 16, 4797, 7744, 5799, 4634, -31839, 22433, 2983, -11343, 8, 5281, 10438, 3650, -27322, -21845, 200, 571, 908, 21830, 28946, -15701, -14010 },
14+
{ 8741, 12, -1506, -22374, 7735, 8404, 1701, -27106, 24094, 10153, -8915, 4783, 1341, 16578, -30533, 25239, 8, 5281, 10438, 3650, -27322, -21845, 200, 571, 908, 21830, 28946, -15701, -14010 },
15+
{ 25238, 8742, 12, -1506, -22374, 7735, 8404, 1701, -27106, 24094, 10153, -8915, 4783, 1341, 16578, -30533, 8, 5281, 10438, 3650, -27322, -21845, 200, 571, 908, 21830, 28946, -15701, -14010 },
16+
{ 4626, 11146, 6439, 12, 4758, 10270 },
17+
{ 4550, 4537, 5681, 5673, 5790, 6806, 8076, 4574 }
18+
};
1319

1420
@ObfuscatedName("cz.l")
1521
public static final short[] recol2s = new short[] { -10304, 9104, -1, -1, -1 };
1622

1723
@ObfuscatedName("cz.m")
18-
public static final short[][] recol2d = new short[][] { { 6554, 115, 10304, 28, 5702, 7756, 5681, 4510, -31835, 22437, 2859, -11339, 16, 5157, 10446, 3658, -27314, -21965, 472, 580, 784, 21966, 28950, -15697, -14002 }, { 9104, 10275, 7595, 3610, 7975, 8526, 918, -26734, 24466, 10145, -6882, 5027, 1457, 16565, -30545, 25486, 24, 5392, 10429, 3673, -27335, -21957, 192, 687, 412, 21821, 28835, -15460, -14019 }, new short[0], new short[0], new short[0] };
24+
public static final short[][] recol2d = new short[][] {
25+
{ 6554, 115, 10304, 28, 5702, 7756, 5681, 4510, -31835, 22437, 2859, -11339, 16, 5157, 10446, 3658, -27314, -21965, 472, 580, 784, 21966, 28950, -15697, -14002 },
26+
{ 9104, 10275, 7595, 3610, 7975, 8526, 918, -26734, 24466, 10145, -6882, 5027, 1457, 16565, -30545, 25486, 24, 5392, 10429, 3673, -27335, -21957, 192, 687, 412, 21821, 28835, -15460, -14019 },
27+
new short[0],
28+
new short[0],
29+
new short[0]
30+
};
1931

2032
public RecolsRunescape() throws Throwable {
2133
throw new Error();

‎src/main/java/jagex3/client/TitleScreen.java‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -397,7 +397,7 @@ public static void loop(GameShell app) {
397397

398398
// jag::oldscape::TitleScreen::Draw
399399
@ObfuscatedName("bg.m(Lfm;Lfm;I)V")
400-
public static void draw(SoftwareFont arg0, SoftwareFont arg1) {
400+
public static void draw(PixFontGeneric arg0, PixFontGeneric arg1) {
401401
if (switchScreen) {
402402
worldSwitchRender(arg0, arg1);
403403
return;
@@ -442,7 +442,7 @@ public static void draw(SoftwareFont arg0, SoftwareFont arg1) {
442442
// todo: inlined method?
443443
String var8 = Text.PASSWORDPROMPT;
444444
String var9 = loginPass;
445-
String var10 = StringTools.method946('*', var9.length());
445+
String var10 = StringTools.getRepeatedCharacter('*', var9.length());
446446
arg0.drawString(var8 + var10, 274, y, 16777215, 0);
447447
y += 15;
448448
}
@@ -488,7 +488,7 @@ public static void draw(SoftwareFont arg0, SoftwareFont arg1) {
488488
// todo: inlined method?
489489
String var19 = Text.PASSWORDPROMPT;
490490
String var20 = loginPass;
491-
String var21 = StringTools.method946('*', var20.length());
491+
String var21 = StringTools.getRepeatedCharacter('*', var20.length());
492492
arg0.drawString(var19 + var21 + (field150 == 1 & Client.loopCycle % 40 < 20 ? StringConstants.TAG_COLOUR(16776960) + StringConstants.PIPE : ""), 274, y, 16777215, 0);
493493
y += 15;
494494

@@ -804,7 +804,7 @@ public static int merge(int arg0, int arg1, int arg2) {
804804

805805
// jag::oldscape::TitleScreen::WorldSwitchRender
806806
@ObfuscatedName("de.z(Lfm;Lfm;I)V")
807-
public static void worldSwitchRender(SoftwareFont arg0, SoftwareFont arg1) {
807+
public static void worldSwitchRender(PixFontGeneric arg0, PixFontGeneric arg1) {
808808
if (slBack == null) {
809809
slBack = PixLoader.makePix32Array(Client.sprites, "sl_back", "");
810810
}
@@ -958,7 +958,7 @@ public static void worldSwitchRender(SoftwareFont arg0, SoftwareFont arg1) {
958958

959959
if (JavaMouseProvider.mouseX >= var17 && JavaMouseProvider.mouseY >= var16 && JavaMouseProvider.mouseX < var6 + var17 && JavaMouseProvider.mouseY < var7 + var16 && var21) {
960960
slLastWorld = var19;
961-
slBack[var20.members ? 1 : 0].method2699(var17, var16, 128, 0xffffff);
961+
slBack[var20.members ? 1 : 0].litPlotSprite(var17, var16, 128, 0xffffff);
962962
} else {
963963
slBack[var20.members ? 1 : 0].quickPlotSprite(var17, var16);
964964
}

‎src/main/java/jagex3/client/ui/ClientInvCache.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ public static int invTotal(int arg0, int arg1) {
5252

5353
// jag::oldscape::ClientInvCache::Set
5454
@ObfuscatedName("fh.j(IIIII)V")
55-
public static void method2901(int arg0, int arg1, int arg2, int arg3) {
55+
public static void set(int arg0, int arg1, int arg2, int arg3) {
5656
ClientInvCache var4 = (ClientInvCache) invList.find(arg0);
5757
if (var4 == null) {
5858
var4 = new ClientInvCache();

‎src/main/java/jagex3/client/ui/IfType.java‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
import jagex3.datastruct.LruCache;
1212
import jagex3.graphics.Pix32;
1313
import jagex3.graphics.PixLoader;
14-
import jagex3.graphics.SoftwareFont;
14+
import jagex3.graphics.PixFontGeneric;
1515
import jagex3.io.Packet;
1616
import jagex3.js5.Js5;
1717
import jagex3.jstring.Text;
@@ -972,8 +972,8 @@ public Pix32 getGraphic(boolean arg0) {
972972
// todo: Inlined method (pixloader::Makepix32?)
973973
Js5 var6 = sprites;
974974
Pix32 var7;
975-
if (PixLoader.method905(var6, var2, 0)) {
976-
var7 = PixLoader.method759();
975+
if (PixLoader.depack(var6, var2, 0)) {
976+
var7 = PixLoader.makePix32();
977977
} else {
978978
var7 = null;
979979
}
@@ -1008,22 +1008,22 @@ public Pix32 getGraphic(boolean arg0) {
10081008

10091009
// jag::oldscape::rs2lib::IfType::GetFont
10101010
@ObfuscatedName("eg.w(B)Lfm;")
1011-
public SoftwareFont getFont() {
1011+
public PixFontGeneric getFont() {
10121012
loadingAsset = false;
10131013
if (this.font == -1) {
10141014
return null;
10151015
}
1016-
SoftwareFont var1 = (SoftwareFont) fontCache.find((long) this.font);
1016+
PixFontGeneric var1 = (PixFontGeneric) fontCache.find((long) this.font);
10171017
if (var1 != null) {
10181018
return var1;
10191019
}
10201020
// todo: inlined method (SoftwareFont::Load?)
10211021
Js5 var2 = sprites;
10221022
Js5 var3 = fontMetrics;
10231023
int var4 = this.font;
1024-
SoftwareFont var5;
1025-
if (PixLoader.method905(var2, var4, 0)) {
1026-
var5 = PixLoader.method260(var3.getFile(var4, 0));
1024+
PixFontGeneric var5;
1025+
if (PixLoader.depack(var2, var4, 0)) {
1026+
var5 = PixLoader.makePixFont(var3.getFile(var4, 0));
10271027
} else {
10281028
var5 = null;
10291029
}
@@ -1053,8 +1053,8 @@ public Pix32 getInvBackground(int arg0) {
10531053
// todo: Inlined method (pixloader::Makepix32?)
10541054
Js5 var4 = sprites;
10551055
Pix32 var5;
1056-
if (PixLoader.method905(var4, var2, 0)) {
1057-
var5 = PixLoader.method759();
1056+
if (PixLoader.depack(var4, var2, 0)) {
1057+
var5 = PixLoader.makePix32();
10581058
} else {
10591059
var5 = null;
10601060
}

‎src/main/java/jagex3/config/ObjType.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
import jagex3.datastruct.LruCache;
99
import jagex3.graphics.Pix2D;
1010
import jagex3.graphics.Pix32;
11-
import jagex3.graphics.SoftwareFont;
11+
import jagex3.graphics.PixFontGeneric;
1212
import jagex3.io.Packet;
1313
import jagex3.js5.Js5;
1414
import jagex3.js5.Js5Loader;
@@ -41,7 +41,7 @@ public class ObjType extends Linkable2 {
4141

4242
// jag::oldscape::configdecoder::ObjType::m_countFont
4343
@ObfuscatedName("bf.s")
44-
public static SoftwareFont countFont;
44+
public static PixFontGeneric countFont;
4545

4646
@ObfuscatedName("fj.u")
4747
public int index;
@@ -693,7 +693,7 @@ public static void resetSpriteCache() {
693693
}
694694

695695
// jag::oldscape::configdecoder::ObjType::Init
696-
public static void init(Js5Loader var32, Js5Loader var33, boolean var34, SoftwareFont var35) {
696+
public static void init(Js5Loader var32, Js5Loader var33, boolean var34, PixFontGeneric var35) {
697697
configClient = var32;
698698
models = var33;
699699
memServer = var34;

‎src/main/java/jagex3/dash3d/Texture.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@ public boolean method1571(double arg0, int arg1, Js5 arg2) {
8585
int var6 = arg1 * arg1;
8686
this.field1694 = new int[var6];
8787
for (int var7 = 0; var7 < this.field1696.length; var7++) {
88-
Pix8 var8 = PixLoader.method127(arg2, this.field1696[var7]);
88+
Pix8 var8 = PixLoader.makePix8(arg2, this.field1696[var7]);
8989
var8.trim();
9090
byte[] var9 = var8.data;
9191
int[] var10 = var8.bpal;

‎src/main/java/jagex3/dash3d/World.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1235,7 +1235,7 @@ public void fill(Square arg0, boolean arg1) {
12351235
while (true) {
12361236
while (true) {
12371237
do {
1238-
var3 = (Square) fillQueue.shift();
1238+
var3 = (Square) fillQueue.popFront();
12391239
if (var3 == null) {
12401240
return;
12411241
}

‎src/main/java/jagex3/dash3d/WorldTextureProvider.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ public int[] getTexels(int textureId) {
5757
Texture var2 = this.field719[textureId];
5858
if (var2 != null) {
5959
if (var2.field1694 != null) {
60-
this.field722.unshift(var2);
60+
this.field722.pushFront(var2);
6161
var2.field1689 = true;
6262
return var2.field1694;
6363
}
@@ -69,7 +69,7 @@ public int[] getTexels(int textureId) {
6969
} else {
7070
this.field718--;
7171
}
72-
this.field722.unshift(var2);
72+
this.field722.pushFront(var2);
7373
var2.field1689 = true;
7474
return var2.field1694;
7575
}

‎src/main/java/jagex3/datastruct/LinkList.java‎

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,6 @@ public void clear() {
2929
}
3030
}
3131

32-
// add to tail
3332
@ObfuscatedName("cg.d(Ldg;)V")
3433
public void push(Linkable node) {
3534
if (node.prev != null) {
@@ -42,9 +41,8 @@ public void push(Linkable node) {
4241
node.next.prev = node;
4342
}
4443

45-
// add to head
4644
@ObfuscatedName("cg.l(Ldg;)V")
47-
public void unshift(Linkable node) {
45+
public void pushFront(Linkable node) {
4846
if (node.prev != null) {
4947
node.unlink();
5048
}
@@ -67,9 +65,8 @@ public static void insertBefore(Linkable node1, Linkable node2) {
6765
node1.next.prev = node1;
6866
}
6967

70-
// remove from head
7168
@ObfuscatedName("cg.c()Ldg;")
72-
public Linkable shift() {
69+
public Linkable popFront() {
7370
Linkable node = this.sentinel.next;
7471
if (this.sentinel == node) {
7572
return null;
@@ -79,7 +76,6 @@ public Linkable shift() {
7976
}
8077
}
8178

82-
// remove from tail
8379
@ObfuscatedName("cg.n()Ldg;")
8480
public Linkable pop() {
8581
Linkable node = this.sentinel.prev;

0 commit comments

Comments
 (0)