Skip to content

Commit 84b024a

Browse files
hallowatcherhallowatcher
committed
clean up
1 parent 3080081 commit 84b024a

39 files changed

+153
-181
lines changed

‎src/main/java/com/jagex/runescape/Class13.java‎

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,7 @@
11
package com.jagex.runescape;
22

33
import com.jagex.runescape.node.Class40_Sub6;
4-
import com.jagex.runescape.node.NodeCache;
54
import com.jagex.runescape.cache.def.IdentityKit;
6-
import com.jagex.runescape.cache.def.VarbitDefinition;
75
import com.jagex.runescape.cache.media.IndexedImage;
86
import com.jagex.runescape.cache.media.gameInterface.GameInterface;
97
import com.jagex.runescape.media.renderable.GameObject;
@@ -14,7 +12,6 @@
1412
import com.jagex.runescape.scene.tile.Wall;
1513

1614
public class Class13 {
17-
public static NodeCache varPlayerConfigCache = new NodeCache(64);
1815
public static boolean[] playerArray = new boolean[5];
1916
public static IndexedImage aClass40_Sub5_Sub14_Sub2_418;
2017
public static int anInt419 = 2;
@@ -93,9 +90,9 @@ public static synchronized byte[] method246(int arg1) {
9390
Class44.aByteArrayArray1039[Main.anInt1764] = null;
9491
return is;
9592
}
96-
if(arg1 == 30000 && VarbitDefinition.anInt2359 > 0) {
97-
byte[] is = RSCanvas.aByteArrayArray47[--VarbitDefinition.anInt2359];
98-
RSCanvas.aByteArrayArray47[VarbitDefinition.anInt2359] = null;
93+
if(arg1 == 30000 && MovedStatics.anInt2359 > 0) {
94+
byte[] is = RSCanvas.aByteArrayArray47[--MovedStatics.anInt2359];
95+
RSCanvas.aByteArrayArray47[MovedStatics.anInt2359] = null;
9996
return is;
10097
}
10198
return new byte[arg1];

‎src/main/java/com/jagex/runescape/Class22.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -121,7 +121,7 @@ public static void method309(int varPlayerIndex) {
121121
do {
122122
AnimationSequence.anInt2480 = MovedStatics.pulseCycle;
123123
HuffmanEncoding.method1030((byte) 127);
124-
int varPlayerType = Npc.getVarPlayerConfig(varPlayerIndex).type;
124+
int varPlayerType = VarPlayerDefinition.getDefinition(varPlayerIndex).type;
125125
if(varPlayerType != 0) {
126126
int varPlayerValue = GroundItemTile.varPlayers[varPlayerIndex];
127127
if(varPlayerType == 1) {

‎src/main/java/com/jagex/runescape/Class22_Sub2.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ public static ImageRGB[] method319(byte arg0) {
5656
int i_4_ = class40_sub5_sub14_sub4.imageHeight * class40_sub5_sub14_sub4.imageWidth;
5757
class40_sub5_sub14_sub4.pixels = new int[i_4_];
5858
for(int i_5_ = 0; i_5_ < i_4_; i_5_++)
59-
class40_sub5_sub14_sub4.pixels[i_5_] = Buffer.anIntArray1972[HuffmanEncoding.method1021(255, is[i_5_])];
59+
class40_sub5_sub14_sub4.pixels[i_5_] = Buffer.anIntArray1972[HuffmanEncoding.bitWiseAND(255, is[i_5_])];
6060
}
6161
ActorDefinition.method569();
6262
return class40_sub5_sub14_sub4s;

‎src/main/java/com/jagex/runescape/Class24.java‎

Lines changed: 17 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
import com.jagex.runescape.cache.CacheArchive;
44
import com.jagex.runescape.cache.def.GameObjectDefinition;
55
import com.jagex.runescape.cache.def.OverlayDefinition;
6-
import com.jagex.runescape.cache.def.VarbitDefinition;
76
import com.jagex.runescape.cache.media.ImageRGB;
87
import com.jagex.runescape.cache.media.IndexedImage;
98
import com.jagex.runescape.io.Buffer;
@@ -64,7 +63,7 @@ public static void method341(int arg0, Scene arg1, int arg2, int arg3, int arg4,
6463
if(i_3_ == arg5 && arg0 <= i_4_ && i_4_ < 8 + arg0 && arg9 <= i_7_ && arg9 + 8 > i_7_) {
6564
GameObjectDefinition gameObjectDefinition = GameObjectDefinition.getDefinition(i);
6665
int i_9_ = Main.method42(arg2 ^ 0x1, i_8_, gameObjectDefinition.sizeX, i_4_ & 0x7, gameObjectDefinition.sizeY, arg4, 0x7 & i_7_) + arg10;
67-
int i_10_ = VarbitDefinition.method564(i_7_ & 0x7, gameObjectDefinition.sizeY, i_4_ & 0x7, gameObjectDefinition.sizeX, arg4, i_8_) + arg7;
66+
int i_10_ = method564(i_7_ & 0x7, gameObjectDefinition.sizeY, i_4_ & 0x7, gameObjectDefinition.sizeX, arg4, i_8_) + arg7;
6867
if(i_9_ > 0 && i_10_ > 0 && i_9_ < 103 && i_10_ < 103) {
6968
CollisionMap collisionMap = null;
7069
int i_11_ = arg3;
@@ -84,4 +83,20 @@ public static void method341(int arg0, Scene arg1, int arg2, int arg3, int arg4,
8483
break;
8584
} while(false);
8685
}
86+
87+
public static int method564(int arg0, int arg1, int arg2, int arg3, int arg4, int arg5) {
88+
arg4 &= 0x3;
89+
if((arg5 & 0x1) == 1) {
90+
int i = arg3;
91+
arg3 = arg1;
92+
arg1 = i;
93+
}
94+
if(arg4 == 0)
95+
return arg0;
96+
if(arg4 == 1)
97+
return 1 + -arg3 + 7 - arg2;
98+
if(arg4 == 2)
99+
return -arg1 + 1 + -arg0 + 7;
100+
return arg2;
101+
}
87102
}

‎src/main/java/com/jagex/runescape/Class33.java‎

Lines changed: 31 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
11
package com.jagex.runescape;
22

3+
import com.jagex.runescape.input.MouseHandler;
4+
import com.jagex.runescape.io.Buffer;
5+
import com.jagex.runescape.net.PacketBuffer;
36
import com.jagex.runescape.node.NodeCache;
47
import com.jagex.runescape.cache.CacheArchive;
58
import com.jagex.runescape.cache.def.*;
@@ -367,7 +370,7 @@ public static synchronized void method413(byte arg0) {
367370
if(MovedStatics.anInt1806 < 0)
368371
RSString.method56(Main.aBoolean1790, is, OverlayDefinition.anInt2342);
369372
else
370-
VarbitDefinition.method566(OverlayDefinition.anInt2342, Main.aBoolean1790, MovedStatics.anInt1806, is);
373+
method566(OverlayDefinition.anInt2342, Main.aBoolean1790, MovedStatics.anInt1806, is);
371374
} else
372375
Class42.method886(0, OverlayDefinition.anInt2342, Main.aBoolean1790, is, MovedStatics.anInt255);
373376
Class26.aBoolean618 = false;
@@ -393,4 +396,31 @@ public static synchronized void method414(boolean arg0, int arg1, int songid, in
393396
Class8.anInt289 = songid;
394397
}
395398
}
399+
400+
public static void method566(int arg0, boolean arg1, int arg2, byte[] arg3) {
401+
if(MovedStatics.aClass22_189 != null) {
402+
if(MouseHandler.anInt1450 >= 0) {
403+
arg2 -= 20;
404+
if(arg2 < 1)
405+
arg2 = 1;
406+
RSCanvas.anInt54 = arg2;
407+
if(MouseHandler.anInt1450 == 0)
408+
Buffer.anInt1982 = 0;
409+
else {
410+
int i = Class29.method372(113, MouseHandler.anInt1450);
411+
i -= Class39.anInt909;
412+
Buffer.anInt1982 = (-1 + arg2 + 3600 + i) / arg2;
413+
}
414+
Player.aByteArray3270 = arg3;
415+
PacketBuffer.anInt2258 = arg0;
416+
PlayerAppearance.aBoolean687 = arg1;
417+
} else if(RSCanvas.anInt54 == 0)
418+
RSString.method56(arg1, arg3, arg0);
419+
else {
420+
PacketBuffer.anInt2258 = arg0;
421+
PlayerAppearance.aBoolean687 = arg1;
422+
Player.aByteArray3270 = arg3;
423+
}
424+
}
425+
}
396426
}

‎src/main/java/com/jagex/runescape/Class37.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ public static void method434(int arg0) {
6262
MovedStatics.anInt324 = -1;
6363
Class35.anInt1728 = 0;
6464
Class49.anInt1151 = -1;
65-
VarbitDefinition.destinationX = 0;
65+
MovedStatics.destinationX = 0;
6666
MovedStatics.minimapState = 0;
6767
Class40_Sub5_Sub15.systemUpdateTime = 0;
6868
IncomingPackets.incomingPacketBuffer.currentPosition = arg0;
@@ -172,8 +172,8 @@ else if(isTeammate)
172172
}
173173
}
174174
}
175-
if(VarbitDefinition.destinationX != 0) {
176-
int flagX = 2 + VarbitDefinition.destinationX * 4 + -(Player.localPlayer.worldX / 32);
175+
if(MovedStatics.destinationX != 0) {
176+
int flagX = 2 + MovedStatics.destinationX * 4 + -(Player.localPlayer.worldX / 32);
177177
int flagY = 2 + 4 * Class55.destinationY + -(Player.localPlayer.worldY / 32);
178178
SceneTile.drawOnMinimap(flagY, flagX, Class40_Sub3.aClass40_Sub5_Sub14_Sub4Array2019[0]);
179179
}

‎src/main/java/com/jagex/runescape/Class40_Sub3.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -160,8 +160,8 @@ public static void startup(int arg0) {
160160
Class42.method885(CacheArchive.gameDefinitionsCacheArchive, Class22.membersWorld, CacheArchive.modelCacheArchive);
161161
MovedStatics.method236(CacheArchive.skinDefinitionCacheArchive, CacheArchive.gameDefinitionsCacheArchive, CacheArchive.skeletonCacheArchive);
162162
Class55.method966(arg0 ^ 0x38, CacheArchive.modelCacheArchive, CacheArchive.gameDefinitionsCacheArchive);
163-
Landscape.method936(CacheArchive.gameDefinitionsCacheArchive);
164-
Main.method43(CacheArchive.gameDefinitionsCacheArchive);
163+
VarbitDefinition.initializeVarbitDefinitionCache(CacheArchive.gameDefinitionsCacheArchive);
164+
VarPlayerDefinition.initializeVarPlayerDefinitionCache(CacheArchive.gameDefinitionsCacheArchive);
165165
GameInterface.createInterfaceMemoryBuffers();
166166
Class40_Sub5_Sub6.loadingPercent = 80;
167167
MovedStatics.anInt1607 = 60;

‎src/main/java/com/jagex/runescape/Class40_Sub5_Sub17_Sub1.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -174,7 +174,7 @@ public static void method763(Component arg0, CacheArchive arg2) {
174174
MovedStatics.minimapBackgroundImage.drawImage(0, 0);
175175
MovedStatics.tabImageProducer = Class40_Sub5_Sub13.createGraphicsBuffer(190, 261, arg0);
176176
FloorDecoration.inventoryBackgroundImage.drawImage(0, 0);
177-
VarbitDefinition.gameScreenImageProducer = Class40_Sub5_Sub13.createGraphicsBuffer(ScreenController.frameMode == ScreenMode.FIXED ? 512 : ScreenController.drawWidth, ScreenController.frameMode == ScreenMode.FIXED ? 334 : ScreenController.drawHeight, arg0);
177+
MovedStatics.gameScreenImageProducer = Class40_Sub5_Sub13.createGraphicsBuffer(ScreenController.frameMode == ScreenMode.FIXED ? 512 : ScreenController.drawWidth, ScreenController.frameMode == ScreenMode.FIXED ? 334 : ScreenController.drawHeight, arg0);
178178
Rasterizer.resetPixels();
179179
HuffmanEncoding.aProducingGraphicsBuffer_1541 = Class40_Sub5_Sub13.createGraphicsBuffer(496, 50, arg0);
180180
RSCanvas.tabBottom = Class40_Sub5_Sub13.createGraphicsBuffer(269, 37, arg0);

‎src/main/java/com/jagex/runescape/Class40_Sub5_Sub17_Sub6.java‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
package com.jagex.runescape;
22

3-
import com.jagex.runescape.cache.def.VarbitDefinition;
43
import com.jagex.runescape.cache.media.AnimationSequence;
54
import com.jagex.runescape.cache.media.SpotAnimDefinition;
65
import com.jagex.runescape.media.VertexNormal;
@@ -60,8 +59,8 @@ else if(arg1 > 126)
6059
}
6160

6261
public static void method833(int arg0, boolean arg1) {
63-
if(Player.localPlayer.worldX >> 7 == VarbitDefinition.destinationX && Player.localPlayer.worldY >> 7 == Class55.destinationY)
64-
VarbitDefinition.destinationX = 0;
62+
if(Player.localPlayer.worldX >> 7 == MovedStatics.destinationX && Player.localPlayer.worldY >> 7 == Class55.destinationY)
63+
MovedStatics.destinationX = 0;
6564
int i = Player.localPlayerCount;
6665
if(arg1)
6766
i = 1;

‎src/main/java/com/jagex/runescape/Class48.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@ public static void method922(int arg0, int arg1, Buffer arg2, int arg4, int arg5
8787
if(i <= 49) {
8888
MouseHandler.tile_overlayids[arg7][arg0][arg4] = arg2.getByte();
8989
OverlayDefinition.tile_underlay_path[arg7][arg0][arg4] = (byte) ((i + -2) / 4);
90-
Class35.tile_overlay_rotation[arg7][arg0][arg4] = (byte) HuffmanEncoding.method1021(arg1 + -2 + i, 3);
90+
Class35.tile_overlay_rotation[arg7][arg0][arg4] = (byte) HuffmanEncoding.bitWiseAND(arg1 + -2 + i, 3);
9191
} else if(i <= 81)
9292
OverlayDefinition.tile_flags[arg7][arg0][arg4] = (byte) (-49 + i);
9393
else

0 commit comments

Comments
 (0)