ra/runelite
1
0
Fork 0
Code Issues Pull Requests Actions 3 Packages Projects Releases Wiki Activity

more RSClient refactoring

Browse Source
This commit is contained in:
Lucas
2019-07-08 17:46:10 +02:00
parent a32c667251
commit 112a2bcba7
87 changed files with 1384 additions and 1323 deletions
Download Patch File Download Diff File Expand all files Collapse all files

114
runescape-client/src/main/java/class171.java
View File

@@ -99,26 +99,26 @@ public class class171 {
Login.Login_loadingPercent = 10;
Client.titleLoadingStage = 30;
} else if (Client.titleLoadingStage == 30) {
AbstractArchive.archive0 = class22.newArchive(0, false, true, true);
Skeleton.archive1 = class22.newArchive(1, false, true, true);
ObjectSound.archive2 = class22.newArchive(2, true, false, true);
WorldMapIcon1.archive3 = class22.newArchive(3, false, true, true);
WorldMapDecoration.archive4 = class22.newArchive(4, false, true, true);
SecureRandomFuture.archive5 = class22.newArchive(5, true, true, true);
UserComparator3.archive6 = class22.newArchive(6, true, true, true);
class40.archive7 = class22.newArchive(7, false, true, true);
WorldMapSection3.archive8 = class22.newArchive(8, false, true, true);
class238.archive9 = class22.newArchive(9, false, true, true);
class16.archive10 = class22.newArchive(10, false, true, true);
Login.archive11 = class22.newArchive(11, false, true, true);
Formatting.archive12 = class22.newArchive(12, false, true, true);
ByteArrayPool.archive13 = class22.newArchive(13, true, false, true);
class2.archive14 = class22.newArchive(14, false, true, true);
WorldMapSection1.archive15 = class22.newArchive(15, false, true, true);
class22.archive16 = class22.newArchive(17, true, true, true);
WorldMapLabelSize.field1040 = class22.newArchive(18, false, true, true);
ItemContainer.field434 = class22.newArchive(19, false, true, true);
AbstractByteArrayCopier.field0 = class22.newArchive(20, false, true, true);
AbstractArchive.archive0 = WorldMapRectangle.newArchive(0, false, true, true);
Skeleton.archive1 = WorldMapRectangle.newArchive(1, false, true, true);
ObjectSound.archive2 = WorldMapRectangle.newArchive(2, true, false, true);
WorldMapIcon1.archive3 = WorldMapRectangle.newArchive(3, false, true, true);
WorldMapDecoration.archive4 = WorldMapRectangle.newArchive(4, false, true, true);
SecureRandomFuture.archive5 = WorldMapRectangle.newArchive(5, true, true, true);
UserComparator3.archive6 = WorldMapRectangle.newArchive(6, true, true, true);
class40.archive7 = WorldMapRectangle.newArchive(7, false, true, true);
WorldMapSection1.archive8 = WorldMapRectangle.newArchive(8, false, true, true);
class238.archive9 = WorldMapRectangle.newArchive(9, false, true, true);
class16.archive10 = WorldMapRectangle.newArchive(10, false, true, true);
Login.archive11 = WorldMapRectangle.newArchive(11, false, true, true);
Formatting.archive12 = WorldMapRectangle.newArchive(12, false, true, true);
ByteArrayPool.archive13 = WorldMapRectangle.newArchive(13, true, false, true);
class2.archive14 = WorldMapRectangle.newArchive(14, false, true, true);
WorldMapSection2.archive15 = WorldMapRectangle.newArchive(15, false, true, true);
WorldMapRectangle.archive16 = WorldMapRectangle.newArchive(17, true, true, true);
WorldMapLabelSize.field1040 = WorldMapRectangle.newArchive(18, false, true, true);
ItemContainer.field434 = WorldMapRectangle.newArchive(19, false, true, true);
AbstractByteArrayCopier.field0 = WorldMapRectangle.newArchive(20, false, true, true);
Login.Login_loadingText = "Connecting to update server";
Login.Login_loadingPercent = 20;
Client.titleLoadingStage = 40;
@@ -132,18 +132,18 @@ public class class171 {
var0 += SecureRandomFuture.archive5.percentage() * 4 / 100;
var0 += UserComparator3.archive6.percentage() * 2 / 100;
var0 += class40.archive7.percentage() * 56 / 100;
var0 += WorldMapSection3.archive8.percentage() * 2 / 100;
var0 += WorldMapSection1.archive8.percentage() * 2 / 100;
var0 += class238.archive9.percentage() * 2 / 100;
var0 += class16.archive10.percentage() * 2 / 100;
var0 += Login.archive11.percentage() * 2 / 100;
var0 += Formatting.archive12.percentage() * 2 / 100;
var0 += ByteArrayPool.archive13.percentage() * 2 / 100;
var0 += class2.archive14.percentage() * 2 / 100;
var0 += WorldMapSection1.archive15.percentage() * 2 / 100;
var0 += WorldMapSection2.archive15.percentage() * 2 / 100;
var0 += ItemContainer.field434.percentage() / 100;
var0 += WorldMapLabelSize.field1040.percentage() / 100;
var0 += AbstractByteArrayCopier.field0.percentage() / 100;
var0 += class22.archive16.method130() && class22.archive16.method2() ? 1 : 0;
var0 += WorldMapRectangle.archive16.method130() && WorldMapRectangle.archive16.method2() ? 1 : 0;
if (var0 != 100) {
if (var0 != 0) {
Login.Login_loadingText = "Checking for updates - " + var0 + "%";
@@ -157,15 +157,15 @@ public class class171 {
AbstractWorldMapIcon.method625(SecureRandomFuture.archive5, "Maps");
AbstractWorldMapIcon.method625(UserComparator3.archive6, "Music Tracks");
AbstractWorldMapIcon.method625(class40.archive7, "Models");
AbstractWorldMapIcon.method625(WorldMapSection3.archive8, "Sprites");
AbstractWorldMapIcon.method625(WorldMapSection1.archive8, "Sprites");
AbstractWorldMapIcon.method625(Login.archive11, "Music Jingles");
AbstractWorldMapIcon.method625(class2.archive14, "Music Samples");
AbstractWorldMapIcon.method625(WorldMapSection1.archive15, "Music Patches");
AbstractWorldMapIcon.method625(WorldMapSection2.archive15, "Music Patches");
AbstractWorldMapIcon.method625(ItemContainer.field434, "World Map");
AbstractWorldMapIcon.method625(WorldMapLabelSize.field1040, "World Map Geography");
AbstractWorldMapIcon.method625(AbstractByteArrayCopier.field0, "World Map Ground");
class211.spriteIds = new GraphicsDefaults();
class211.spriteIds.decode(class22.archive16);
Calendar.spriteIds = new GraphicsDefaults();
Calendar.spriteIds.decode(WorldMapRectangle.archive16);
Login.Login_loadingText = "Loaded update list";
Login.Login_loadingPercent = 30;
Client.titleLoadingStage = 45;
@@ -176,7 +176,7 @@ public class class171 {
var28.method174(9, 128);
WorldMapCacheName.pcmPlayer0 = Players.newPcmPlayer(GameShell.taskHandler, 0, 22050);
WorldMapCacheName.pcmPlayer0.setStream(var28);
NetSocket.method3537(WorldMapSection1.archive15, class2.archive14, WorldMapDecoration.archive4, var28);
NetSocket.method3537(WorldMapSection2.archive15, class2.archive14, WorldMapDecoration.archive4, var28);
AbstractArchive.pcmPlayer1 = Players.newPcmPlayer(GameShell.taskHandler, 1, 2048);
TaskHandler.pcmStreamMixer = new PcmStreamMixer();
AbstractArchive.pcmPlayer1.setStream(TaskHandler.pcmStreamMixer);
@@ -184,13 +184,13 @@ public class class171 {
Login.Login_loadingText = "Prepared sound engine";
Login.Login_loadingPercent = 35;
Client.titleLoadingStage = 50;
WorldMapElement.fonts = new Fonts(WorldMapSection3.archive8, ByteArrayPool.archive13);
WorldMapElement.WorldMapElement_fonts = new Fonts(WorldMapSection1.archive8, ByteArrayPool.archive13);
} else {
int var29;
if (Client.titleLoadingStage == 50) {
FontName[] var2 = new FontName[]{FontName.FontName_verdana15, FontName.FontName_bold12, FontName.FontName_plain12, FontName.FontName_verdana11, FontName.FontName_plain11, FontName.FontName_verdana13};
var29 = var2.length;
Fonts var3 = WorldMapElement.fonts;
Fonts var3 = WorldMapElement.WorldMapElement_fonts;
FontName[] var4 = new FontName[]{FontName.FontName_verdana15, FontName.FontName_bold12, FontName.FontName_plain12, FontName.FontName_verdana11, FontName.FontName_plain11, FontName.FontName_verdana13};
Client.fontsMap = var3.createMap(var4);
if (Client.fontsMap.size() < var29) {
@@ -206,7 +206,7 @@ public class class171 {
Client.titleLoadingStage = 60;
}
} else if (Client.titleLoadingStage == 60) {
var0 = FloorDecoration.method2853(class16.archive10, WorldMapSection3.archive8);
var0 = FloorDecoration.method2853(class16.archive10, WorldMapSection1.archive8);
var29 = class3.method36();
if (var0 < var29) {
Login.Login_loadingText = "Loading title screen - " + var0 * 100 / var29 + "%";
@@ -260,7 +260,7 @@ public class class171 {
VarpDefinition.field944 = VarpDefinition.field943.method4(16);
Archive var15 = WorldMapIcon1.archive3;
Archive var16 = class40.archive7;
Archive var17 = WorldMapSection3.archive8;
Archive var17 = WorldMapSection1.archive8;
Archive var18 = ByteArrayPool.archive13;
Widget.Widget_archive = var15;
BufferedSource.field54 = var16;
@@ -269,20 +269,20 @@ public class class171 {
Widget.interfaceComponents = new Widget[Widget.Widget_archive.method5()][];
Widget.loadedInterfaces = new boolean[Widget.Widget_archive.method5()];
Archive var19 = ObjectSound.archive2;
class4.field1158 = var19;
class4.InvDefinition_archive = var19;
Archive var20 = ObjectSound.archive2;
EnumDefinition.EnumDefinition_archive = var20;
Frames.method3241(ObjectSound.archive2);
Archive var21 = ObjectSound.archive2;
ParamDefinition.ParamDefinition_archive = var21;
class196.varcs = new Varcs();
class60.method1172(ObjectSound.archive2, WorldMapSection3.archive8, ByteArrayPool.archive13);
class60.method1172(ObjectSound.archive2, WorldMapSection1.archive8, ByteArrayPool.archive13);
Archive var22 = ObjectSound.archive2;
Archive var23 = WorldMapSection3.archive8;
Archive var23 = WorldMapSection1.archive8;
HealthBarDefinition.field379 = var22;
HealthBarDefinition.field380 = var23;
Archive var24 = ObjectSound.archive2;
Archive var25 = WorldMapSection3.archive8;
Archive var25 = WorldMapSection1.archive8;
WorldMapElement.WorldMapElement_archive = var25;
if (var24.method2()) {
UserComparator4.WorldMapElement_count = var24.method4(35);
@@ -305,13 +305,13 @@ public class class171 {
} else if (Client.titleLoadingStage == 80) {
var0 = 0;
if (GrandExchangeOfferUnitPriceComparator.compass == null) {
GrandExchangeOfferUnitPriceComparator.compass = class322.readSprite(WorldMapSection3.archive8, class211.spriteIds.field878, 0);
GrandExchangeOfferUnitPriceComparator.compass = class322.readSprite(WorldMapSection1.archive8, Calendar.spriteIds.field878, 0);
} else {
++var0;
}
if (FaceNormal.field345 == null) {
FaceNormal.field345 = class322.readSprite(WorldMapSection3.archive8, class211.spriteIds.field879, 0);
FaceNormal.field345 = class322.readSprite(WorldMapSection1.archive8, Calendar.spriteIds.field879, 0);
} else {
++var0;
}
@@ -319,8 +319,8 @@ public class class171 {
IndexedSprite[] var32;
int var34;
if (class192.mapSceneSprites == null) {
var30 = WorldMapSection3.archive8;
var34 = class211.spriteIds.mapScenes;
var30 = WorldMapSection1.archive8;
var34 = Calendar.spriteIds.mapScenes;
if (!SpriteMask.loadSprite(var30, var34, 0)) {
var32 = null;
} else {
@@ -334,8 +334,8 @@ public class class171 {
Sprite[] var35;
if (class15.headIconPkSprites == null) {
var30 = WorldMapSection3.archive8;
var34 = class211.spriteIds.headIconsPk;
var30 = WorldMapSection1.archive8;
var34 = Calendar.spriteIds.headIconsPk;
if (!SpriteMask.loadSprite(var30, var34, 0)) {
var35 = null;
} else {
@@ -348,8 +348,8 @@ public class class171 {
}
if (ClientPreferences.headIconPrayerSprites == null) {
var30 = WorldMapSection3.archive8;
var34 = class211.spriteIds.headIconsPrayer;
var30 = WorldMapSection1.archive8;
var34 = Calendar.spriteIds.headIconsPrayer;
if (!SpriteMask.loadSprite(var30, var34, 0)) {
var35 = null;
} else {
@@ -362,8 +362,8 @@ public class class171 {
}
if (Player.headIconHintSprites == null) {
var30 = WorldMapSection3.archive8;
var34 = class211.spriteIds.headIconsHint;
var30 = WorldMapSection1.archive8;
var34 = Calendar.spriteIds.headIconsHint;
if (!SpriteMask.loadSprite(var30, var34, 0)) {
var35 = null;
} else {
@@ -376,8 +376,8 @@ public class class171 {
}
if (class16.mapMarkerSprites == null) {
var30 = WorldMapSection3.archive8;
var34 = class211.spriteIds.mapMarkers;
var30 = WorldMapSection1.archive8;
var34 = Calendar.spriteIds.mapMarkers;
if (!SpriteMask.loadSprite(var30, var34, 0)) {
var35 = null;
} else {
@@ -390,8 +390,8 @@ public class class171 {
}
if (KeyHandler.crossSprites == null) {
var30 = WorldMapSection3.archive8;
var34 = class211.spriteIds.crosses;
var30 = WorldMapSection1.archive8;
var34 = Calendar.spriteIds.crosses;
if (!SpriteMask.loadSprite(var30, var34, 0)) {
var35 = null;
} else {
@@ -404,8 +404,8 @@ public class class171 {
}
if (class39.mapDotSprites == null) {
var30 = WorldMapSection3.archive8;
var34 = class211.spriteIds.mapDots;
var30 = WorldMapSection1.archive8;
var34 = Calendar.spriteIds.mapDots;
if (!SpriteMask.loadSprite(var30, var34, 0)) {
var35 = null;
} else {
@@ -418,8 +418,8 @@ public class class171 {
}
if (class32.scrollBarSprites == null) {
var30 = WorldMapSection3.archive8;
var34 = class211.spriteIds.scrollBars;
var30 = WorldMapSection1.archive8;
var34 = Calendar.spriteIds.scrollBars;
if (!SpriteMask.loadSprite(var30, var34, 0)) {
var32 = null;
} else {
@@ -432,8 +432,8 @@ public class class171 {
}
if (WorldMapSectionType.modIconSprites == null) {
var30 = WorldMapSection3.archive8;
var34 = class211.spriteIds.modIcons;
var30 = WorldMapSection1.archive8;
var34 = Calendar.spriteIds.modIcons;
if (!SpriteMask.loadSprite(var30, var34, 0)) {
var32 = null;
} else {
@@ -465,7 +465,7 @@ public class class171 {
Login.Login_loadingText = "Loading textures - 0%";
Login.Login_loadingPercent = 90;
} else {
SecureRandomFuture.textureProvider = new TextureProvider(class238.archive9, WorldMapSection3.archive8, 20, 0.8D, Client.isLowDetail ? 64 : 128);
SecureRandomFuture.textureProvider = new TextureProvider(class238.archive9, WorldMapSection1.archive8, 20, 0.8D, Client.isLowDetail ? 64 : 128);
Rasterizer3D.Rasterizer3D_setTextureLoader(SecureRandomFuture.textureProvider);
Rasterizer3D.Rasterizer3D_setBrightness(0.8D);
Client.titleLoadingStage = 100;