Skip to content

Commit 0a070ac

Browse files
PazazPazaz
committed
feat: Refactor check in
1 parent 9355d20 commit 0a070ac

32 files changed

+1866
-1866
lines changed

‎src/main/java/jagex2/client/client.java‎

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

‎src/main/java/jagex2/config/Component.java‎

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

‎src/main/java/jagex2/config/IdkType.java‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,10 @@
99
public class IdkType {
1010

1111
@ObfuscatedName("lc.a")
12-
public static boolean field1098 = true;
12+
public static boolean _flowObfuscator1 = true;
1313

1414
@ObfuscatedName("lc.b")
15-
public int field1099 = -949;
15+
public int _flowObfuscator2 = -949;
1616

1717
@ObfuscatedName("lc.c")
1818
public static int count;
@@ -41,7 +41,7 @@ public class IdkType {
4141
@ObfuscatedName("lc.a(Lyb;B)V")
4242
public static void unpack(Jagfile arg0, byte arg1) {
4343
if (arg1 != 127) {
44-
field1098 = !field1098;
44+
_flowObfuscator1 = !_flowObfuscator1;
4545
}
4646
Packet var2 = new Packet((byte) -109, arg0.read("idk.dat", null));
4747
count = var2.g2();
@@ -89,7 +89,7 @@ public void decode(int arg0, Packet arg1) {
8989
}
9090

9191
@ObfuscatedName("lc.a(I)Z")
92-
public boolean method377(int arg0) {
92+
public boolean validate(int arg0) {
9393
if (arg0 != 6) {
9494
throw new NullPointerException();
9595
} else if (this.models == null) {
@@ -106,7 +106,7 @@ public boolean method377(int arg0) {
106106
}
107107

108108
@ObfuscatedName("lc.b(I)Lfb;")
109-
public Model method378(int arg0) {
109+
public Model getModel(int arg0) {
110110
if (this.models == null) {
111111
return null;
112112
}
@@ -131,10 +131,10 @@ public Model method378(int arg0) {
131131
}
132132

133133
@ObfuscatedName("lc.c(I)Z")
134-
public boolean method379(int arg0) {
134+
public boolean validateHeadModel(int arg0) {
135135
boolean var2 = true;
136136
if (arg0 < 8 || arg0 > 8) {
137-
this.field1099 = 223;
137+
this._flowObfuscator2 = 223;
138138
}
139139
for (int var3 = 0; var3 < 5; var3++) {
140140
if (this.heads[var3] != -1 && !Model.validate(this.heads[var3])) {
@@ -145,7 +145,7 @@ public boolean method379(int arg0) {
145145
}
146146

147147
@ObfuscatedName("lc.d(I)Lfb;")
148-
public Model method380(int arg0) {
148+
public Model getHeadModel(int arg0) {
149149
Model[] var2 = new Model[5];
150150
int var3 = 0;
151151
for (int var4 = 0; var4 < 5; var4++) {
@@ -155,7 +155,7 @@ public Model method380(int arg0) {
155155
}
156156
Model var5 = new Model(var3, 652, var2);
157157
if (arg0 >= 0) {
158-
this.field1099 = -459;
158+
this._flowObfuscator2 = -459;
159159
}
160160
for (int var6 = 0; var6 < 6 && this.recol_s[var6] != 0; var6++) {
161161
var5.recolour(this.recol_s[var6], this.recol_d[var6]);

‎src/main/java/jagex2/config/LocType.java‎

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -11,19 +11,19 @@
1111
public class LocType {
1212

1313
@ObfuscatedName("ec.a")
14-
public int field935 = 2;
14+
public int _flowObfuscator1 = 2;
1515

1616
@ObfuscatedName("ec.b")
17-
public static boolean field936;
17+
public static boolean _flowObfuscator2;
1818

1919
@ObfuscatedName("ec.c")
20-
public int field937;
20+
public int _flowObfuscator3;
2121

2222
@ObfuscatedName("ec.d")
23-
public int field938 = 679;
23+
public int _flowObfuscator4 = 679;
2424

2525
@ObfuscatedName("ec.e")
26-
public boolean field939 = true;
26+
public boolean _flowObfuscator5 = true;
2727

2828
@ObfuscatedName("ec.f")
2929
public static boolean field940;
@@ -169,7 +169,7 @@ public static final void unpack(Jagfile arg0) {
169169
public static final void unload(byte arg0) {
170170
modelCacheStatic = null;
171171
if (arg0 != 9) {
172-
field936 = !field936;
172+
_flowObfuscator2 = !_flowObfuscator2;
173173
}
174174
modelCacheDynamic = null;
175175
idx = null;
@@ -178,7 +178,7 @@ public static final void unload(byte arg0) {
178178
}
179179

180180
@ObfuscatedName("ec.a(I)Lec;")
181-
public static final LocType method333(int arg0) {
181+
public static final LocType get(int arg0) {
182182
for (int var1 = 0; var1 < 10; var1++) {
183183
if (types[var1].id == arg0) {
184184
return types[var1];
@@ -232,7 +232,7 @@ public final void reset() {
232232
@ObfuscatedName("ec.a(ILmb;)V")
233233
public final void decode(int arg0, Packet arg1) {
234234
if (arg0 <= 0) {
235-
this.field939 = !this.field939;
235+
this._flowObfuscator5 = !this._flowObfuscator5;
236236
}
237237
int var3 = -1;
238238
while (true) {
@@ -344,7 +344,7 @@ public final void decode(int arg0, Packet arg1) {
344344
}
345345

346346
@ObfuscatedName("ec.a(II)Z")
347-
public final boolean method336(int arg0, int arg1) {
347+
public final boolean validate(int arg0, int arg1) {
348348
int var3 = -1;
349349
for (int var4 = 0; var4 < this.shapes.length; var4++) {
350350
if (this.shapes[var4] == arg1) {
@@ -365,10 +365,10 @@ public final boolean method336(int arg0, int arg1) {
365365
}
366366

367367
@ObfuscatedName("ec.b(I)Z")
368-
public final boolean method337(int arg0) {
368+
public final boolean validate(int arg0) {
369369
boolean var2 = true;
370370
if (arg0 != 0) {
371-
this.field938 = -413;
371+
this._flowObfuscator4 = -413;
372372
}
373373
if (this.models == null) {
374374
return true;
@@ -383,23 +383,23 @@ public final boolean method337(int arg0) {
383383
}
384384

385385
@ObfuscatedName("ec.a(ILvb;)V")
386-
public final void method338(int arg0, OnDemand arg1) {
386+
public final void prefetch(int arg0, OnDemand arg1) {
387387
while (arg0 >= 0) {
388-
this.field935 = -234;
388+
this._flowObfuscator1 = -234;
389389
}
390390
if (this.models == null) {
391391
return;
392392
}
393393
for (int var3 = 0; var3 < this.models.length; var3++) {
394394
int var4 = this.models[var3];
395395
if (var4 != -1) {
396-
arg1.method293(0, var4 & 0xFFFF, -938);
396+
arg1.prefetch(0, var4 & 0xFFFF, -938);
397397
}
398398
}
399399
}
400400

401401
@ObfuscatedName("ec.a(IIIIIII)Lfb;")
402-
public final Model method339(int arg0, int arg1, int arg2, int arg3, int arg4, int arg5, int arg6) {
402+
public final Model getModel(int arg0, int arg1, int arg2, int arg3, int arg4, int arg5, int arg6) {
403403
int var8 = -1;
404404
for (int var9 = 0; var9 < this.shapes.length; var9++) {
405405
if (this.shapes[var9] == arg0) {
@@ -452,8 +452,8 @@ public final Model method339(int arg0, int arg1, int arg2, int arg3, int arg4, i
452452
}
453453
Model var25 = new Model(var22, this.recol_s == null, arg1 == 0 && arg6 == -1 && !var23 && !var24, !this.animHasAlpha, -796);
454454
if (arg6 != -1) {
455-
var25.method145(-591);
456-
var25.method146(arg6, 13056);
455+
var25.createLabelReferences(-591);
456+
var25.applyTransform(arg6, 13056);
457457
var25.labelFaces = null;
458458
var25.labelVertices = null;
459459
}
@@ -477,7 +477,7 @@ public final Model method339(int arg0, int arg1, int arg2, int arg3, int arg4, i
477477
}
478478
modelCacheDynamic.put(var25, var10, 39399);
479479
if (this.hillskew || this.sharelight) {
480-
var25 = new Model(this.field937, this.sharelight, this.hillskew, var25);
480+
var25 = new Model(this._flowObfuscator3, this.sharelight, this.hillskew, var25);
481481
}
482482
if (this.hillskew) {
483483
int var27 = (arg2 + arg3 + arg4 + arg5) / 4;
@@ -496,7 +496,7 @@ public final Model method339(int arg0, int arg1, int arg2, int arg3, int arg4, i
496496
return var12;
497497
} else {
498498
if (this.hillskew || this.sharelight) {
499-
var12 = new Model(this.field937, this.sharelight, this.hillskew, var12);
499+
var12 = new Model(this._flowObfuscator3, this.sharelight, this.hillskew, var12);
500500
}
501501
if (this.hillskew) {
502502
int var13 = (arg2 + arg3 + arg4 + arg5) / 4;

‎src/main/java/jagex2/config/NpcType.java‎

Lines changed: 23 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
public class NpcType {
1111

1212
@ObfuscatedName("gc.a")
13-
public static int field987;
13+
public static int _flowObfuscator1;
1414

1515
@ObfuscatedName("gc.b")
1616
public static int count;
@@ -40,7 +40,7 @@ public class NpcType {
4040
public byte size = 1;
4141

4242
@ObfuscatedName("gc.k")
43-
public int[] field997;
43+
public int[] models;
4444

4545
@ObfuscatedName("gc.l")
4646
public int[] heads;
@@ -100,7 +100,7 @@ public class NpcType {
100100
public int headicon = -1;
101101

102102
@ObfuscatedName("gc.G")
103-
public static LruCache field1019 = new LruCache(30, 1);
103+
public static LruCache modelCacheStatic = new LruCache(30, 1);
104104

105105
@ObfuscatedName("gc.D")
106106
public int ambient;
@@ -127,19 +127,19 @@ public static final void unpack(Jagfile arg0) {
127127

128128
@ObfuscatedName("gc.a(B)V")
129129
public static final void unload(byte arg0) {
130-
field1019 = null;
130+
modelCacheStatic = null;
131131
idx = null;
132132
types = null;
133133
if (arg0 == 9) {
134134
boolean var1 = false;
135135
} else {
136-
field987 = 11;
136+
_flowObfuscator1 = 11;
137137
}
138138
data = null;
139139
}
140140

141141
@ObfuscatedName("gc.a(I)Lgc;")
142-
public static final NpcType method342(int arg0) {
142+
public static final NpcType get(int arg0) {
143143
for (int var1 = 0; var1 < 20; var1++) {
144144
if ((long) arg0 == types[var1].id) {
145145
return types[var1];
@@ -164,9 +164,9 @@ public final void decode(int arg0, Packet arg1) {
164164
}
165165
if (var4 == 1) {
166166
int var5 = arg1.g1();
167-
this.field997 = new int[var5];
167+
this.models = new int[var5];
168168
for (int var6 = 0; var6 < var5; var6++) {
169-
this.field997[var6] = arg1.g2();
169+
this.models[var6] = arg1.g2();
170170
}
171171
} else if (var4 == 2) {
172172
this.name = arg1.gjstr();
@@ -235,8 +235,8 @@ public final void decode(int arg0, Packet arg1) {
235235
}
236236

237237
@ObfuscatedName("gc.a(BII[I)Lfb;")
238-
public final Model method344(byte arg0, int arg1, int arg2, int[] arg3) {
239-
Model var5 = (Model) field1019.get(this.id);
238+
public final Model getModel(byte arg0, int arg1, int arg2, int[] arg3) {
239+
Model var5 = (Model) modelCacheStatic.get(this.id);
240240
if (arg0 == 0) {
241241
boolean var6 = false;
242242
} else {
@@ -245,17 +245,17 @@ public final Model method344(byte arg0, int arg1, int arg2, int[] arg3) {
245245
}
246246
if (var5 == null) {
247247
boolean var8 = false;
248-
for (int var9 = 0; var9 < this.field997.length; var9++) {
249-
if (!Model.validate(this.field997[var9])) {
248+
for (int var9 = 0; var9 < this.models.length; var9++) {
249+
if (!Model.validate(this.models[var9])) {
250250
var8 = true;
251251
}
252252
}
253253
if (var8) {
254254
return null;
255255
}
256-
Model[] var10 = new Model[this.field997.length];
257-
for (int var11 = 0; var11 < this.field997.length; var11++) {
258-
var10[var11] = Model.tryGet(this.field997[var11], -404);
256+
Model[] var10 = new Model[this.models.length];
257+
for (int var11 = 0; var11 < this.models.length; var11++) {
258+
var10[var11] = Model.tryGet(this.models[var11], -404);
259259
}
260260
if (var10.length == 1) {
261261
var5 = var10[0];
@@ -267,31 +267,31 @@ public final Model method344(byte arg0, int arg1, int arg2, int[] arg3) {
267267
var5.recolour(this.recol_s[var12], this.recol_d[var12]);
268268
}
269269
}
270-
var5.method145(-591);
270+
var5.createLabelReferences(-591);
271271
var5.calculateNormals(this.ambient + 64, this.contrast + 850, -30, -50, -30, true);
272-
field1019.put(var5, this.id, 39399);
272+
modelCacheStatic.put(var5, this.id, 39399);
273273
}
274-
Model var13 = Model.field538;
274+
Model var13 = Model.empty;
275275
var13.set(!this.animHasAlpha, var5, true);
276276
if (arg1 != -1 && arg2 != -1) {
277-
var13.method147((byte) 74, arg1, arg2, arg3);
277+
var13.applyTransforms((byte) 74, arg1, arg2, arg3);
278278
} else if (arg1 != -1) {
279-
var13.method146(arg1, 13056);
279+
var13.applyTransform(arg1, 13056);
280280
}
281281
if (this.resizeh != 128 || this.resizev != 128) {
282282
var13.scale(this.resizev, this.resizeh, 4, this.resizeh);
283283
}
284-
var13.method142(true);
284+
var13.calculateBoundsCylinder(true);
285285
var13.labelFaces = null;
286286
var13.labelVertices = null;
287287
if (this.size == 1) {
288-
var13.field576 = true;
288+
var13.picking = true;
289289
}
290290
return var13;
291291
}
292292

293293
@ObfuscatedName("gc.a(Z)Lfb;")
294-
public final Model method345(boolean arg0) {
294+
public final Model getHeadModel(boolean arg0) {
295295
if (!arg0) {
296296
for (int var2 = 1; var2 > 0; var2++) {
297297
}

0 commit comments

Comments
 (0)