From 87c247e6545f96b4239b9f7616729c12876788c8 Mon Sep 17 00:00:00 2001
From: Villermen <villermen@gmail.com>
Date: Tue, 15 Jun 2021 13:08:34 +0200
Subject: [PATCH] Increase loading requirements and index count

---
 .../Cache/Downloader/TcpFileDownloader.cs      | 18 +++++++++---------
 .../Test/Cache/CacheTests.cs                   |  6 +++---
 .../Test/Cache/DownloaderCacheTests.cs         |  2 +-
 3 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/RuneScapeCacheTools/Cache/Downloader/TcpFileDownloader.cs b/RuneScapeCacheTools/Cache/Downloader/TcpFileDownloader.cs
index 19ad6a5..ec319a7 100644
--- a/RuneScapeCacheTools/Cache/Downloader/TcpFileDownloader.cs
+++ b/RuneScapeCacheTools/Cache/Downloader/TcpFileDownloader.cs
@@ -288,7 +288,7 @@ private void Connect()
 
             var contentReader = new BinaryReader(this._contentClient.GetStream());
             // Loading requirements. Whatever that might mean:
-            // 00 00 0c e5
+            // 00 00 0c eb
             // 00 01 10 a3
             // 00 00 a2 b3
             // 00 00 8c 1a
@@ -296,14 +296,14 @@ private void Connect()
             // 00 42 d4 96
             // 00 00 ad 57
             // 00 00 47 3f
-            // 00 01 18 f2
-            // 00 07 18 2b 00 14 1d 3a 00 0a 20 38 00 0a dc 75
-            // 00 14 28 e2 00 16 0a fd 00 00 a5 76 00 14 5a e2
-            // 00 00 5f ab 00 00 98 2b 00 00 04 dc 00 01 74 d5
-            // 00 00 09 20 00 00 00 77 00 13 46 c0 00 52 72 03
-            // 00 00 ab ee 00 00 61 e7 00 02 34 41 00 00 ae 95
-            // 00 07 b8 ba
-            var loadingRequirements = contentReader.ReadBytesExactly(30 * 4);
+            // 00 01 20 5a
+            // 00 07 57 09 00 14 2e 29 00 0a 38 83 00 0a f4 c6
+            // 00 14 4c 86 00 16 2c ef 00 00 a6 2e 00 14 5a d9
+            // 00 00 69 de 00 00 98 cd 00 00 04 dc 00 01 76 b0
+            // 00 00 09 20 00 00 00 77 00 13 4e 8a 00 53 8e 33
+            // 00 00 ac 18 00 00 61 e7 00 02 35 ce 00 00 bc 2a
+            // 00 07 b8 ba 00 00 02 b5
+            var loadingRequirements = contentReader.ReadBytesExactly(31 * 4);
 
             // Send the initial connection status and login packets to the server. I don't know what the individual
             // writes mean but they do the trick.
diff --git a/RuneScapeCacheToolsTest/Test/Cache/CacheTests.cs b/RuneScapeCacheToolsTest/Test/Cache/CacheTests.cs
index 71b39b9..0431089 100644
--- a/RuneScapeCacheToolsTest/Test/Cache/CacheTests.cs
+++ b/RuneScapeCacheToolsTest/Test/Cache/CacheTests.cs
@@ -25,7 +25,7 @@ public CacheTests(TestCacheFixture fixture)
         [Theory]
         [InlineData(typeof(JavaClientCache))]
         [InlineData(typeof(FlatFileCache))]
-        [InlineData(typeof(DownloaderCache), Skip = "Downloader machine broke.")]
+        [InlineData(typeof(DownloaderCache))]
         [InlineData(typeof(NxtClientCache))]
         public void TestGetFile(Type cacheType)
         {
@@ -47,7 +47,7 @@ public void TestGetFile(Type cacheType)
         [InlineData(typeof(JavaClientCache), CacheIndex.Music)]
         [InlineData(typeof(JavaClientCache), CacheIndex.Enums)]
         [InlineData(typeof(JavaClientCache), CacheIndex.ClientScripts)]
-        [InlineData(typeof(DownloaderCache), CacheIndex.Enums, Skip = "Downloader machine broke.")]
+        [InlineData(typeof(DownloaderCache), CacheIndex.Enums)]
         [InlineData(typeof(NxtClientCache), CacheIndex.Enums)]
         public void TestGetReferenceTableFile(Type cacheType, CacheIndex index)
         {
@@ -85,7 +85,7 @@ public void TestPutFile(Type cacheType, CacheIndex index, int fileId)
         [InlineData(typeof(JavaClientCache), 7)]
         [InlineData(typeof(FlatFileCache), 7)]
         [InlineData(typeof(NxtClientCache), 7)]
-        [InlineData(typeof(DownloaderCache), 42, Skip = "Downloader machine broke.")]
+        [InlineData(typeof(DownloaderCache), 46)]
         public void TestGetIndexes(Type cacheType, int amountOfIndexes)
         {
             var indexes = this._fixture.Caches[cacheType].GetAvailableIndexes();
diff --git a/RuneScapeCacheToolsTest/Test/Cache/DownloaderCacheTests.cs b/RuneScapeCacheToolsTest/Test/Cache/DownloaderCacheTests.cs
index ec450da..f637ad5 100644
--- a/RuneScapeCacheToolsTest/Test/Cache/DownloaderCacheTests.cs
+++ b/RuneScapeCacheToolsTest/Test/Cache/DownloaderCacheTests.cs
@@ -28,7 +28,7 @@ public void TestDownloadReferenceTable()
         }
 
         [Theory]
-        [InlineData(60, 45)]
+        [InlineData(61, 46)]
         public void TestDownloadMasterReferenceTable(int expectedTableCount, int expectedAvailableTableCount)
         {
             var masterReferenceTable = this.Fixture.DownloaderCache.GetMasterReferenceTable();