fix: new assets management system

Torwent · Torwent · commit 1c72f9107798 · 2025-10-05T20:35:13.000+02:00
- now all file hashes are stored in a single file, this reduces http requests from 30+ to just one to check file hashes.
- asset files are now mirrored to my database and that's the default source, if that fails we fallback to github, if that fails we use whatever we had before and hope things run
diff --git a/osrs/data/data.simba b/osrs/data/data.simba
@@ -179,7 +179,7 @@ begin
   path := Self.CacheDir  + 'items' + PATH_SEP;
   filename := path + itemID + '.json';
   if not FileExists(filename) then
-    if not ZipExtractEntry(WLAssets.ItemDefinitions.Path, itemID +'.json', path) then
+    if not ZipExtractEntry(WLEnv.AssetsDir + 'jsons' + PATH_SEP + 'item-definitions.zip', itemID +'.json', path) then
       raise  GetDebugLn('ItemData', 'Couldn''t find ' + itemID + '.json');
 
   Result := new TJSONParser();
@@ -376,7 +376,7 @@ procedure TGearData.Setup();
 begin
   if Self.Data <> nil then Exit;
   Self.Data := new TJSONParser();
-  TJSONParser(Self.Data).Load(WLAssets.Gear.Path);
+  TJSONParser(Self.Data).Load(WLEnv.AssetsDir + 'jsons' + PATH_SEP + 'gear.json');
 end;
 
 (*
diff --git a/osrs/finders/house_layout_finder.simba b/osrs/finders/house_layout_finder.simba
@@ -34,7 +34,7 @@ procedure TRSHouseLayoutFinder.Setup();
 var
   path, tmp: String;
 begin
-  Self.Version := WLAssets.HouseLayoutFinder.Hash;
+  Self.Version := WLAssets.JSON.Item['finders\house_layout.zip'].AsString;
   Self.CacheDir := WLEnv.CacheDir + 'houselayoutfinder' + PATH_SEP;
 
   //Delete old cache files if they exist
@@ -81,7 +81,7 @@ begin
   path := Self.CacheDir + name;
 
   if not FileExists(path) then
-    ZipExtractEntry(WLAssets.HouseLayoutFinder.Path, name, Self.CacheDir);
+    ZipExtractEntry(WLEnv.AssetsDir + 'finders' + PATH_SEP + 'house_layout.zip', name, Self.CacheDir);
 
   Self.RoomImages[room] += new TImage(path);
 
diff --git a/osrs/finders/itemfinder.simba b/osrs/finders/itemfinder.simba
@@ -144,8 +144,12 @@ var
   path, tmp: String;
 begin
   if Self.IsSetup then Exit;
-  Self.Version := WLAssets.ItemFinder[3].Hash;
-  Self.Database.Setup('ItemFinder', ['id', 'item', 'hash'], WLAssets.ITEMFINDER_DATA, Self.Version);
+  Self.Version := WLAssets.JSON.Item['finders\items\items.zip'].AsString;
+  Self.Database.Setup(
+    'ItemFinder', ['id', 'item', 'hash'],
+    WLEnv.AssetsDir + 'finders' + PATH_SEP + 'items' + PATH_SEP + 'data' + PATH_SEP,
+    Self.Version
+  );
 
   Self.CacheDir := WLEnv.CacheDir + 'itemfinder' + PATH_SEP;
 
@@ -179,7 +183,10 @@ begin
 
   Self.Unzipping := True;
   Self.Timeout.Start(60 * ONE_SECOND);
-  Async.FileUnZip(WLAssets.ItemFinder[3].Path, Self.CacheDir, @Self._UnzipFinished);
+  Async.FileUnZip(
+    WLEnv.AssetsDir + 'finders' + PATH_SEP + 'items' + PATH_SEP + 'items.zip',
+    Self.CacheDir, @Self._UnzipFinished
+  );
 end;
 
 
diff --git a/osrs/finders/overheadfinder.simba b/osrs/finders/overheadfinder.simba
@@ -94,7 +94,7 @@ procedure TRSOverheadFinder.Setup();
 var
   path, tmp: String;
 begin
-  Self.Version := WLAssets.OverheadFinder.Hash;
+  Self.Version := WLAssets.JSON.Item['finders\overheads.zip'].AsString;
   Self.CacheDir := WLEnv.CacheDir + 'overheadfinder' + PATH_SEP;
 
   //Delete old cache files if they exist
@@ -139,7 +139,7 @@ begin
   name := ToStr(overhead).ToLower().After('.') + '.png';
   path := Self.CacheDir + name;
 
-  if not (FileExists(path) or ZipExtractEntry(WLAssets.OverheadFinder.Path, name, Self.CacheDir)) then
+  if not (FileExists(path) or ZipExtractEntry(WLEnv.AssetsDir + 'finders' + PATH_SEP + 'overheads.zip', name, Self.CacheDir)) then
     raise GetDebugLn('OverheadFinder', Format('Failed to unzip overhead image %s', [name]));
 
   Result := Self.Images[overhead] := new TImage(path);
diff --git a/osrs/finders/prayerfinder.simba b/osrs/finders/prayerfinder.simba
@@ -81,7 +81,7 @@ procedure TRSPrayerFinder.Setup();
 var
   path, tmp: String;
 begin
-  Self.Version := WLAssets.PrayerFinder.Hash;
+  Self.Version := WLAssets.JSON.Item['finders\prayer.zip'].AsString;
   Self.CacheDir := WLEnv.CacheDir + 'prayerfinder' + PATH_SEP;
 
   //Delete old cache files if they exist
@@ -128,7 +128,7 @@ begin
   path := Self.CacheDir + name;
 
   if not FileExists(path) then
-    ZipExtractEntry(WLAssets.PrayerFinder.Path, name, Self.CacheDir);
+    ZipExtractEntry(WLEnv.AssetsDir + 'finders' + PATH_SEP + 'prayer.zip', name, Self.CacheDir);
 
   Self.PrayerImages[prayer] := new TImage(path);
 
diff --git a/osrs/finders/spellfinder.simba b/osrs/finders/spellfinder.simba
@@ -33,7 +33,7 @@ procedure TRSSpellFinder.Setup();
 var
   path, tmp: String;
 begin
-  Self.Version := WLAssets.SpellFinder.Hash;
+  Self.Version := WLAssets.JSON.Item['finders\spells.zip'].AsString;
   Self.CacheDir := WLEnv.CacheDir + 'spellfinder' + PATH_SEP;
 
   //Delete old cache files if they exist
@@ -70,7 +70,7 @@ begin
     path := Self.CacheDir + name;
 
     if not FileExists(path) then
-      ZipExtractEntry(WLAssets.SpellFinder.Path, name, Self.CacheDir);
+      ZipExtractEntry(WLEnv.AssetsDir + 'finders' + PATH_SEP + 'spells.zip', name, Self.CacheDir);
 
     Self.SpellImages[spell][i] := new TImage(path);
   end;
diff --git a/osrs/interfaces/handlers/consumables.simba b/osrs/interfaces/handlers/consumables.simba
@@ -267,12 +267,12 @@ begin
     Self.CooldownTimers[consumableType].Start(0);
 
   json := new TJSONParser();
-  json.Load(WLAssets.Consumables.Path);
+  json.Load(WLEnv.AssetsDir + 'jsons' + PATH_SEP + 'consumables.json');
 
   Self.Consumables := Self.LoadFromJSON(json);
   if Length(Self.Consumables) = 0 then
   begin
-    FileDelete(WLEnv.AssetsDir + 'consumables' + PATH_SEP + 'consumables.json');
+    FileDelete(WLEnv.AssetsDir + 'jsons' + PATH_SEP + 'consumables.json');
     Logger.Exception('Failed to parse consumables configuration');
   end;
 
diff --git a/osrs/interfaces/handlers/gear_form.simba b/osrs/interfaces/handlers/gear_form.simba
@@ -56,7 +56,7 @@ begin
   Self.Config.Setup('gearlayouts' + PATH_SEP + ToStr(ProfileIndex));
   SetLength(Self.Sets, Self.Config.Data.Count);
 
-  Self.BackgroundImg := new TImage(WLAssets.Images[1].Path);
+  Self.BackgroundImg := new TImage(WLEnv.AssetsDir + 'images' + PATH_SEP + 'equipment.png');
 
   try
     for i := 0 to Self.Config.Data.Count-1 do
diff --git a/osrs/interfaces/handlers/inventory_form.simba b/osrs/interfaces/handlers/inventory_form.simba
@@ -53,7 +53,7 @@ begin
   Self.Config.Setup('inventorylayouts' + PATH_SEP + ToStr(ProfileIndex));
   SetLength(Self.Layouts, Self.Config.Data.Count);
 
-  Self.BackgroundImg := new TImage(WLAssets.Images[0].Path);
+  Self.BackgroundImg := new TImage(WLEnv.AssetsDir + 'images' + PATH_SEP + 'gametab.png');
 
   try
     for i := 0 to Self.Config.Data.Count-1 do
diff --git a/osrs/interfaces/minimap.simba b/osrs/interfaces/minimap.simba
@@ -80,7 +80,7 @@ begin
   case RSClient.Mode of
     ERSMode.RESIZABLE, ERSMode.MODERN_COMPACT, ERSMode.MODERN_WIDE:
     begin
-      img := new TImage(WLAssets.Images[3].Path);
+      img := new TImage(WLEnv.AssetsDir + 'images' + PATH_SEP + 'mm_resizable_mask.png');
       Self.Mask := img.FindColor($0, 0).Invert().Grow(3).ExtractBox([0, 0, img.Width-1, img.Height-1]);
 
       with RSClient.Bounds do
@@ -96,7 +96,7 @@ begin
 
     ERSMode.FIXED:
     begin
-      img := new TImage(WLAssets.Images[2].Path);
+      img := new TImage(WLEnv.AssetsDir + 'images' + PATH_SEP + 'mm_fixed_mask.png');
       Self.Mask := img.FindColor($0, 0).Invert().Grow(3).ExtractBox([0, 0, img.Width-1, img.Height-1]);
 
       with RSClient.Bounds do
diff --git a/osrs/interfaces/setup.simba b/osrs/interfaces/setup.simba
@@ -108,11 +108,10 @@ begin
   if not DirCreate(WLEnv.AssetsDir) then
     raise GetDebugLn('WaspLib', 'Failed to create path: ' + WLEnv.AssetsDir);
 
-  WLAssets.Setup();
+  WaspClient.Setup();
   WLAssets.Update();
   Map.Loader.Init();
 
-  WaspClient.Setup();
   Target.AddEvent(ETargetEvent.TARGET_RESIZE, @TargetResized);
   FormUtils.Setup();
   RSFonts.Setup();
diff --git a/osrs/position/map/maploader.simba b/osrs/position/map/maploader.simba
@@ -232,10 +232,12 @@ procedure TRSMapLoader.Init();
 var
   path, tmp: String;
 begin
-  Self.Version := HashString(EHashAlgo.CRC32,
-    WLAssets.Map[0].Hash + WLAssets.Map[1].Hash + WLAssets.Map[2].Hash +
-    WLAssets.Map[3].Hash + WLAssets.Map[4].Hash
-  );
+  with WLAssets.JSON do
+    Self.Version := HashString(EHashAlgo.CRC32,
+      Item['map\map.zip'].AsString + Item['map\heightmap.zip'].AsString +
+      Item['map\collision.zip'].AsString + Item['map\objects.zip'].AsString +
+      Item['map\npcs.zip'].AsString
+    );
 
   Self.CacheDir := WLEnv.CacheDir + 'map' + PATH_SEP;
 
diff --git a/utils.simba b/utils.simba
@@ -6,7 +6,9 @@
 {$IFNDEF WL_VECTOR_INCLUDED}          {$INCLUDE_ONCE utils/math/vector.simba}
 {$IFNDEF WL_TIME_INCLUDED}            {$INCLUDE_ONCE utils/time.simba}
 {$IFNDEF WL_LOGGER_INCLUDED}          {$INCLUDE_ONCE utils/logger.simba}
-{$IFNDEF WL_PROGRESS_REPORT_INCLUDED} {$INCLUDE_ONCE utils/progressreport.simba}
+{$IFNDEF WL_PROGRESS_REPORT_INCLUDED} {$INCLUDE_ONCE utils/progressreport.simba} 
+{$IFNDEF WL_STRINGS_INCLUDED}         {$INCLUDE_ONCE utils/strings.simba}
+{$IFNDEF WL_WASPCLIENT_INCLUDED}      {$INCLUDE_ONCE utils/waspclient.simba}
 {$IFNDEF WL_ASSETS_INCLUDED}          {$INCLUDE_ONCE utils/assets.simba}
 {$IFNDEF WL_MISC_INCLUDED}            {$INCLUDE_ONCE utils/misc.simba}
 {$IFNDEF WL_MOUSE_INCLUDED}           {$INCLUDE_ONCE utils/input/mouse.simba}
@@ -20,8 +22,6 @@
 {$IFNDEF WL_WEBGRAPHGEN_INCLUDED}     {$INCLUDE_ONCE utils/webgraphgen.simba}
 {$IFNDEF WL_RSCHUNKS_INCLUDED}        {$INCLUDE_ONCE utils/rschunks.simba}
 {$IFNDEF WL_CONFIG_INCLUDED}          {$INCLUDE_ONCE utils/config.simba}
-{$IFNDEF WL_STRINGS_INCLUDED}         {$INCLUDE_ONCE utils/strings.simba}
-{$IFNDEF WL_WASPCLIENT_INCLUDED}      {$INCLUDE_ONCE utils/waspclient.simba}
 {$IFNDEF WL_FORMUTILS_INCLUDED}       {$INCLUDE_ONCE utils/forms/formutils.simba}
 {$IFNDEF WL_DISCORD_INCLUDED}         {$INCLUDE_ONCE utils/discord.simba}
 {$IFNDEF WL_WORLDFETCHER_INCLUDED}    {$INCLUDE_ONCE WaspLib/utils/worldfetcher.simba}
diff --git a/utils/assets.simba b/utils/assets.simba
diff --git a/utils/ocr.simba b/utils/ocr.simba
diff --git a/utils/waspclient.simba b/utils/waspclient.simba
