Skip to content

Commit dc6d5a5

Browse files
JameskmongerJameskmonger
committed
refactor: move statics from scene.tile.*
1 parent 93a8e72 commit dc6d5a5

31 files changed

+294
-362
lines changed

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@
1313
import org.runejs.client.media.renderable.actor.PlayerAppearance;
1414
import org.runejs.client.scene.Point2d;
1515
import org.runejs.client.scene.SceneCluster;
16-
import org.runejs.client.scene.tile.FloorDecoration;
1716

1817
public class Class33 {
1918
public static int[] selectedMenuActions = new int[500];
@@ -63,7 +62,7 @@ else if(i < Player.localPlayerCount)
6362

6463
if (screenPos != null) {
6564
if(targetPlayer.isSkulled != -1) {
66-
FloorDecoration.aClass40_Sub5_Sub14_Sub4Array603[targetPlayer.isSkulled].drawImage(screenPos.x - 12, screenPos.y - drawHeight);
65+
MovedStatics.aClass40_Sub5_Sub14_Sub4Array603[targetPlayer.isSkulled].drawImage(screenPos.x - 12, screenPos.y - drawHeight);
6766
drawHeight += 25;
6867
}
6968
if(targetPlayer.headIcon != -1) {

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@
55
import org.runejs.client.media.renderable.actor.Player;
66
import org.runejs.client.net.IncomingPackets;
77
import org.runejs.client.scene.SceneCluster;
8-
import org.runejs.client.scene.tile.FloorDecoration;
98

109
public class Class37 {
1110
public static int anInt876 = 0;
@@ -44,7 +43,7 @@ public static boolean method438(int areaId, int arg1) {
4443
// (Jameskmonger) something to do with right clicking
4544
if(areaId == 0 && arg1 == MovedStatics.anInt573)
4645
return true;
47-
if(areaId == 1 && FloorDecoration.anInt614 == arg1)
46+
if(areaId == 1 && MovedStatics.anInt614 == arg1)
4847
return true;
4948
if((areaId == 2 || areaId == 3) && MovedStatics.anInt1586 == arg1)
5049
return true;

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

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,6 @@
2323
import org.runejs.client.media.renderable.actor.PlayerAppearance;
2424
import org.runejs.client.scene.GroundItemTile;
2525
import org.runejs.client.scene.Scene;
26-
import org.runejs.client.scene.tile.FloorDecoration;
27-
import org.runejs.client.scene.tile.WallDecoration;
2826
import org.runejs.client.scene.util.CollisionMap;
2927
import org.runejs.client.sound.MusicSystem;
3028
import org.runejs.client.sound.SoundSystem;
@@ -123,10 +121,10 @@ public static void startup() {
123121
i++;
124122
else
125123
TypeFace.fontSmall = TypeFace.loadTypeFace(CacheArchive.gameImageCacheArchive, "", Native.fontP11Full);
126-
if (WallDecoration.fontNormal != null)
124+
if (MovedStatics.fontNormal != null)
127125
i++;
128126
else
129-
WallDecoration.fontNormal = TypeFace.loadTypeFace(CacheArchive.gameImageCacheArchive, "", Native.fontP12Full);
127+
MovedStatics.fontNormal = TypeFace.loadTypeFace(CacheArchive.gameImageCacheArchive, "", Native.fontP12Full);
130128
if (TypeFace.fontBold != null)
131129
i++;
132130
else
@@ -194,8 +192,8 @@ public static void startup() {
194192
i++;
195193
else
196194
AnimationSequence.aClass40_Sub5_Sub14_Sub4Array2474 = method526(CacheArchive.gameImageCacheArchive, Native.hitmarks, "");
197-
if (FloorDecoration.aClass40_Sub5_Sub14_Sub4Array603 == null)
198-
FloorDecoration.aClass40_Sub5_Sub14_Sub4Array603 = method526(CacheArchive.gameImageCacheArchive, Native.headiconsPK, "");
195+
if (MovedStatics.aClass40_Sub5_Sub14_Sub4Array603 == null)
196+
MovedStatics.aClass40_Sub5_Sub14_Sub4Array603 = method526(CacheArchive.gameImageCacheArchive, Native.headiconsPK, "");
199197
else
200198
i++;
201199
if (ProducingGraphicsBuffer_Sub1.headIconSprites != null)
@@ -328,7 +326,7 @@ private static ImageRGB[] method319() {
328326
ImageRGB class40_sub5_sub14_sub4 = class40_sub5_sub14_sub4s[i] = new ImageRGB();
329327
class40_sub5_sub14_sub4.maxWidth = MovedStatics.imageMaxWidth;
330328
class40_sub5_sub14_sub4.maxHeight = MovedStatics.imageMaxHeight;
331-
class40_sub5_sub14_sub4.offsetX = Class57.anIntArray1347[i];
329+
class40_sub5_sub14_sub4.offsetX = MovedStatics.anIntArray1347[i];
332330
class40_sub5_sub14_sub4.offsetY = Actor.anIntArray3111[i];
333331
class40_sub5_sub14_sub4.imageWidth = Class17.anIntArray456[i];
334332
class40_sub5_sub14_sub4.imageHeight = Npc.anIntArray3312[i];

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

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,6 @@
1414
import org.runejs.client.media.renderable.Item;
1515
import org.runejs.client.media.renderable.actor.Player;
1616
import org.runejs.client.scene.InteractiveObject;
17-
import org.runejs.client.scene.tile.FloorDecoration;
18-
import org.runejs.client.scene.tile.SceneTile;
1917
import org.runejs.client.scene.util.CollisionMap;
2018

2119
public class Class43 {
@@ -60,7 +58,7 @@ else if(ScreenController.frameMode == ScreenMode.FIXED)
6058

6159

6260
public static void processRightClick() {
63-
if(SceneTile.activeInterfaceType == 0) {
61+
if(MovedStatics.activeInterfaceType == 0) {
6462
Landscape.menuActionTexts[0] = English.cancel;
6563
MovedStatics.menuActionTypes[0] = ActionRowType.CANCEL.getId();
6664
MovedStatics.menuActionRow = 1;
@@ -97,8 +95,8 @@ public static void processRightClick() {
9795
CollisionMap.currentHoveredWidgetChildId = MovedStatics.hoveredWidgetChildId;
9896
}
9997
MovedStatics.hoveredWidgetChildId = -1;
100-
if(Item.anInt3065 != FloorDecoration.anInt614) {
101-
FloorDecoration.anInt614 = Item.anInt3065;
98+
if(Item.anInt3065 != MovedStatics.anInt614) {
99+
MovedStatics.anInt614 = Item.anInt3065;
102100
GameInterface.redrawTabArea = true;
103101
}
104102
Item.anInt3065 = -1;

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

Lines changed: 0 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,5 @@
11
package org.runejs.client;
22

3-
import org.runejs.client.cache.def.ActorDefinition;
4-
import org.runejs.client.cache.media.gameInterface.GameInterface;
5-
import org.runejs.client.frame.ChatBox;
6-
import org.runejs.client.media.Rasterizer;
7-
import org.runejs.client.media.renderable.actor.Player;
8-
import org.runejs.client.scene.tile.GenericTile;
9-
import org.runejs.client.scene.tile.WallDecoration;
10-
113
import java.awt.event.KeyEvent;
124

135
public class Class51 {
@@ -26,37 +18,6 @@ public static int getKeyChar(KeyEvent arg1) {
2618
}
2719

2820

29-
30-
public static void method940(String arg1, boolean arg2, String arg3) {
31-
if(MovedStatics.clearScreen) {
32-
MovedStatics.clearScreen = false;
33-
MovedStatics.drawWelcomeScreenGraphics();
34-
LinkedList.drawChatBoxGraphics();
35-
Class55.drawTabGraphics();
36-
ActorDefinition.drawMapBack();
37-
GenericTile.method943(ChatBox.tradeMode, WallDecoration.fontNormal, ChatBox.privateChatMode, ChatBox.publicChatMode);
38-
MovedStatics.method527(Player.currentTabId, Player.tabWidgetIds, GameInterface.tabAreaInterfaceId == -1, -1);
39-
MovedStatics.showSidePanelRedrawnText = true;
40-
Class40_Sub3.showIconsRedrawnText = true;
41-
MovedStatics.showChatPanelRedrawnText = true;
42-
}
43-
int i = 151;
44-
Class65.method1018();
45-
i -= 3;
46-
WallDecoration.fontNormal.drawStringLeft(arg1, 257, i, 0);
47-
WallDecoration.fontNormal.drawStringLeft(arg1, 256, i + -1, 16777215);
48-
if(arg3 != null) {
49-
i += 15;
50-
if(arg2) {
51-
int i_0_ = 4 + WallDecoration.fontNormal.getStringWidth(arg3);
52-
Rasterizer.drawFilledRectangle(257 - i_0_ / 2, -11 + i, i_0_, 11, 0);
53-
}
54-
WallDecoration.fontNormal.drawStringLeft(arg3, 257, i, 0);
55-
WallDecoration.fontNormal.drawStringLeft(arg3, 256, i - 1, 16777215);
56-
}
57-
Player.drawGameScreenGraphics();
58-
}
59-
6021
public static void clearModelCache() {
6122
MovedStatics.modelCache.clear();
6223
}

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

Lines changed: 0 additions & 9 deletions
This file was deleted.

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

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@
2020
import org.runejs.client.net.UpdateServer;
2121
import org.runejs.client.scene.InteractiveObject;
2222
import org.runejs.client.scene.SceneCluster;
23-
import org.runejs.client.scene.tile.SceneTile;
2423
import org.runejs.client.scene.util.CollisionMap;
2524
import org.runejs.client.sound.MusicSystem;
2625
import org.runejs.Configuration;
@@ -607,11 +606,11 @@ public static void renderLoginScreen(Component arg0, CacheArchive huffmanCacheAr
607606
MovedStatics.aClass40_Sub5_Sub14_Sub2Array535 = IndexedImage.getMultipleIndexedImages(gameImageCacheArchive, Native.runes, "");
608607

609608
Class39.aClass40_Sub5_Sub14_Sub4_918 = new ImageRGB(128, 265);
610-
SceneTile.aClass40_Sub5_Sub14_Sub4_2043 = new ImageRGB(128, 265);
609+
MovedStatics.aClass40_Sub5_Sub14_Sub4_2043 = new ImageRGB(128, 265);
611610
for (int i = 0; i < 33920; i++)
612611
Class39.aClass40_Sub5_Sub14_Sub4_918.pixels[i] = MovedStatics.flameLeftBackground.pixels[i];
613612
for (int i = 0; i < 33920; i++)
614-
SceneTile.aClass40_Sub5_Sub14_Sub4_2043.pixels[i] = GameObject.flameRightBackground.pixels[i];
613+
MovedStatics.aClass40_Sub5_Sub14_Sub4_2043.pixels[i] = GameObject.flameRightBackground.pixels[i];
615614
Class51.anIntArray1198 = new int[256];
616615
for (int i = 0; i < 64; i++)
617616
Class51.anIntArray1198[i] = i * 262144;

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ public static void loadRegion() {
8888
}
8989
if(bool) {
9090
if(ProducingGraphicsBuffer.anInt1634 != 0)
91-
Class51.method940(English.loadingPleaseWait, true, Native.percent100Parentheses);
91+
MovedStatics.method940(English.loadingPleaseWait, true, Native.percent100Parentheses);
9292
RSCanvas.clearCaches();
9393
Npc.currentScene.initToNull();
9494
System.gc();

0 commit comments

Comments
 (0)