Skip to content

Commit e8309b5

Browse files
JameskmongerJameskmonger
committed
refactor: move statics to Class40_Sub3
1 parent faa4c07 commit e8309b5

File tree

2 files changed

+49
-46
lines changed

2 files changed

+49
-46
lines changed

‎src/main/java/org/runejs/client/Class40_Sub3.java‎

Lines changed: 48 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,8 @@
88
import org.runejs.client.cache.media.TypeFace;
99
import org.runejs.client.cache.media.gameInterface.GameInterface;
1010
import org.runejs.client.frame.Minimap;
11+
import org.runejs.client.io.Buffer;
12+
import org.runejs.client.media.renderable.actor.Actor;
1113
import org.runejs.client.node.Node;
1214
import org.runejs.client.frame.ScreenController;
1315
import org.runejs.client.frame.console.Console;
@@ -19,12 +21,14 @@
1921
import org.runejs.client.media.renderable.Item;
2022
import org.runejs.client.media.renderable.actor.Npc;
2123
import org.runejs.client.media.renderable.actor.PlayerAppearance;
24+
import org.runejs.client.scene.GroundItemTile;
2225
import org.runejs.client.scene.Scene;
2326
import org.runejs.client.scene.tile.FloorDecoration;
2427
import org.runejs.client.scene.tile.WallDecoration;
2528
import org.runejs.client.scene.util.CollisionMap;
2629
import org.runejs.client.sound.MusicSystem;
2730
import org.runejs.client.sound.SoundSystem;
31+
import org.runejs.client.util.BitUtils;
2832

2933
public class Class40_Sub3 extends Node {
3034
public static int ticksPerLoop;
@@ -183,39 +187,39 @@ public static void startup() {
183187
else
184188
MovedStatics.mapSceneIcons = IndexedImage.getMultipleIndexedImages(CacheArchive.gameImageCacheArchive, Native.mapScene, "");
185189
if (MovedStatics.mapFunctionIcons == null)
186-
MovedStatics.mapFunctionIcons = MovedStatics.method526(CacheArchive.gameImageCacheArchive, Native.mapFunction, "");
190+
MovedStatics.mapFunctionIcons = method526(CacheArchive.gameImageCacheArchive, Native.mapFunction, "");
187191
else
188192
i++;
189193
if (AnimationSequence.aClass40_Sub5_Sub14_Sub4Array2474 != null)
190194
i++;
191195
else
192-
AnimationSequence.aClass40_Sub5_Sub14_Sub4Array2474 = MovedStatics.method526(CacheArchive.gameImageCacheArchive, Native.hitmarks, "");
196+
AnimationSequence.aClass40_Sub5_Sub14_Sub4Array2474 = method526(CacheArchive.gameImageCacheArchive, Native.hitmarks, "");
193197
if (FloorDecoration.aClass40_Sub5_Sub14_Sub4Array603 == null)
194-
FloorDecoration.aClass40_Sub5_Sub14_Sub4Array603 = MovedStatics.method526(CacheArchive.gameImageCacheArchive, Native.headiconsPK, "");
198+
FloorDecoration.aClass40_Sub5_Sub14_Sub4Array603 = method526(CacheArchive.gameImageCacheArchive, Native.headiconsPK, "");
195199
else
196200
i++;
197201
if (ProducingGraphicsBuffer_Sub1.headIconSprites != null)
198202
i++;
199203
else
200-
ProducingGraphicsBuffer_Sub1.headIconSprites = MovedStatics.method526(CacheArchive.gameImageCacheArchive, Native.headiconsPrayer, "");
204+
ProducingGraphicsBuffer_Sub1.headIconSprites = method526(CacheArchive.gameImageCacheArchive, Native.headiconsPrayer, "");
201205
if (MovedStatics.hintIconSprites == null)
202-
MovedStatics.hintIconSprites = MovedStatics.method526(CacheArchive.gameImageCacheArchive, Native.headiconsHint, "");
206+
MovedStatics.hintIconSprites = method526(CacheArchive.gameImageCacheArchive, Native.headiconsHint, "");
203207
else
204208
i++;
205209
if (LinkedList.aClass40_Sub5_Sub14_Sub4_1057 == null)
206210
LinkedList.aClass40_Sub5_Sub14_Sub4_1057 = HuffmanEncoding.method1028(CacheArchive.gameImageCacheArchive, Native.overlayMultiway, "");
207211
else
208212
i++;
209213
if (Minimap.minimapMarkers == null)
210-
Minimap.minimapMarkers = MovedStatics.method526(CacheArchive.gameImageCacheArchive, Native.mapMarker, "");
214+
Minimap.minimapMarkers = method526(CacheArchive.gameImageCacheArchive, Native.mapMarker, "");
211215
else
212216
i++;
213217
if (Class37.cursorCross != null)
214218
i++;
215219
else
216-
Class37.cursorCross = MovedStatics.method526(CacheArchive.gameImageCacheArchive, Native.cursorCross, "");
220+
Class37.cursorCross = method526(CacheArchive.gameImageCacheArchive, Native.cursorCross, "");
217221
if (Minimap.mapDots == null)
218-
Minimap.mapDots = MovedStatics.method526(CacheArchive.gameImageCacheArchive, Native.mapDots, "");
222+
Minimap.mapDots = method526(CacheArchive.gameImageCacheArchive, Native.mapDots, "");
219223
else
220224
i++;
221225
if (MovedStatics.scrollbarArrowImages == null)
@@ -300,21 +304,54 @@ public static void startup() {
300304
}
301305
}
302306

303-
public static void initializeIdentityKitDefinitionCache(CacheArchive definitionCache, CacheArchive arg2) {
307+
private static void initializeIdentityKitDefinitionCache(CacheArchive definitionCache, CacheArchive arg2) {
304308
MovedStatics.aCacheArchive_654 = arg2;
305309
Class49.definitionCache = definitionCache;
306310
PlayerAppearance.identityKitLength = Class49.definitionCache.fileLength(3);
307311
}
308312

309-
public static void initializeGameObjectDefinitionCache(CacheArchive arg1, boolean arg2, CacheArchive definitionCache) {
313+
private static void initializeGameObjectDefinitionCache(CacheArchive arg1, boolean arg2, CacheArchive definitionCache) {
310314
CacheArchive.definitionCache = definitionCache;
311315
GameObjectDefinition.count = CacheArchive.definitionCache.fileLength(6);
312316

313317
Class35.aBoolean1734 = arg2;
314318
RSString.aCacheArchive_1705 = arg1;
315319
}
316320

317-
public static int method288() {
321+
private static int method288() {
318322
return 5;
319323
}
324+
325+
private static ImageRGB[] method319() {
326+
ImageRGB[] class40_sub5_sub14_sub4s = new ImageRGB[MovedStatics.anInt2581];
327+
for(int i = 0; i < MovedStatics.anInt2581; i++) {
328+
ImageRGB class40_sub5_sub14_sub4 = class40_sub5_sub14_sub4s[i] = new ImageRGB();
329+
class40_sub5_sub14_sub4.maxWidth = ItemDefinition.imageMaxWidth;
330+
class40_sub5_sub14_sub4.maxHeight = MovedStatics.imageMaxHeight;
331+
class40_sub5_sub14_sub4.offsetX = Class57.anIntArray1347[i];
332+
class40_sub5_sub14_sub4.offsetY = Actor.anIntArray3111[i];
333+
class40_sub5_sub14_sub4.imageWidth = Class17.anIntArray456[i];
334+
class40_sub5_sub14_sub4.imageHeight = Npc.anIntArray3312[i];
335+
byte[] is = GroundItemTile.aByteArrayArray1370[i];
336+
int i_4_ = class40_sub5_sub14_sub4.imageHeight * class40_sub5_sub14_sub4.imageWidth;
337+
class40_sub5_sub14_sub4.pixels = new int[i_4_];
338+
for(int i_5_ = 0; i_5_ < i_4_; i_5_++)
339+
class40_sub5_sub14_sub4.pixels[i_5_] = Buffer.anIntArray1972[BitUtils.bitWiseAND(255, is[i_5_])];
340+
}
341+
ActorDefinition.method569();
342+
return class40_sub5_sub14_sub4s;
343+
}
344+
345+
private static ImageRGB[] method944(byte arg0, int arg1, CacheArchive arg2, int arg3) {
346+
if(!ImageRGB.spriteExists(arg3, arg1, arg2))
347+
return null;
348+
int i = -59 % ((-60 - arg0) / 34);
349+
return method319();
350+
}
351+
352+
private static ImageRGB[] method526(CacheArchive arg0, String arg2, String arg3) {
353+
int i = arg0.getHash(arg2);
354+
int i_4_ = arg0.method179(i, arg3);
355+
return method944((byte) -3, i, arg0, i_4_);
356+
}
320357
}

‎src/main/java/org/runejs/client/MovedStatics.java‎

Lines changed: 1 addition & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,6 @@
3535
import org.runejs.client.scene.util.CollisionMap;
3636
import org.runejs.client.sound.MusicSystem;
3737
import org.runejs.client.sound.SoundSystem;
38-
import org.runejs.client.util.BitUtils;
3938
import org.runejs.client.util.Signlink;
4039
import org.runejs.client.util.SignlinkNode;
4140
import org.runejs.client.cache.def.*;
@@ -574,12 +573,6 @@ public static String method204(int arg0) {
574573
return (0xff & arg0 >> 24) + Native.period + ((arg0 & 0xffca88) >> 16) + Native.period + ((0xfff8 & arg0) >> 8) + Native.period + (0xff & arg0);
575574
}
576575

577-
public static ImageRGB[] method526(CacheArchive arg0, String arg2, String arg3) {
578-
int i = arg0.getHash(arg2);
579-
int i_4_ = arg0.method179(i, arg3);
580-
return method944((byte) -3, i, arg0, i_4_);
581-
}
582-
583576
public static void method527(int currentTabId, int[] tabWidgetIds, boolean arg3, int arg4) {
584577
InteractiveObject.tabTop.prepareRasterizer();
585578
Buffer.tabTopBack.drawImage(0, 0);
@@ -1485,27 +1478,7 @@ public static void method299(int arg1) {
14851478
public static GameInterface aGameInterface_1887;
14861479
public static int duplicateClickCount = 0;
14871480

1488-
public static ImageRGB[] method319() {
1489-
ImageRGB[] class40_sub5_sub14_sub4s = new ImageRGB[anInt2581];
1490-
for(int i = 0; i < anInt2581; i++) {
1491-
ImageRGB class40_sub5_sub14_sub4 = class40_sub5_sub14_sub4s[i] = new ImageRGB();
1492-
class40_sub5_sub14_sub4.maxWidth = ItemDefinition.imageMaxWidth;
1493-
class40_sub5_sub14_sub4.maxHeight = imageMaxHeight;
1494-
class40_sub5_sub14_sub4.offsetX = Class57.anIntArray1347[i];
1495-
class40_sub5_sub14_sub4.offsetY = Actor.anIntArray3111[i];
1496-
class40_sub5_sub14_sub4.imageWidth = Class17.anIntArray456[i];
1497-
class40_sub5_sub14_sub4.imageHeight = Npc.anIntArray3312[i];
1498-
byte[] is = GroundItemTile.aByteArrayArray1370[i];
1499-
int i_4_ = class40_sub5_sub14_sub4.imageHeight * class40_sub5_sub14_sub4.imageWidth;
1500-
class40_sub5_sub14_sub4.pixels = new int[i_4_];
1501-
for(int i_5_ = 0; i_5_ < i_4_; i_5_++)
1502-
class40_sub5_sub14_sub4.pixels[i_5_] = Buffer.anIntArray1972[BitUtils.bitWiseAND(255, is[i_5_])];
1503-
}
1504-
ActorDefinition.method569();
1505-
return class40_sub5_sub14_sub4s;
1506-
}
1507-
1508-
public static void method311(Component arg1) {
1481+
public static void method311(Component arg1) {
15091482
arg1.removeKeyListener(Class59.keyFocusListener);
15101483
arg1.removeFocusListener(Class59.keyFocusListener);
15111484
}
@@ -1656,13 +1629,6 @@ private static void method344(int arg0) {
16561629
}
16571630
}
16581631

1659-
private static ImageRGB[] method944(byte arg0, int arg1, CacheArchive arg2, int arg3) {
1660-
if(!ImageRGB.spriteExists(arg3, arg1, arg2))
1661-
return null;
1662-
int i = -59 % ((-60 - arg0) / 34);
1663-
return method319();
1664-
}
1665-
16661632
private static void method945(int arg0, int arg1, int arg2, int arg3, int arg4, int arg5, int arg6, int arg7) {
16671633
if(arg5 != 103)
16681634
GenericTile.anInt1214 = -81;

0 commit comments

Comments
 (0)