Merge branch 'WaspScripts:main' into main

Author: Pauwelz

.github/workflows/hash-files.yml

@@ -31,7 +31,7 @@ jobs:
           Remove-Item -Path $outputFile -Force
 
       - name: Checkout repository
-        uses: actions/checkout@v4.2.2
+        uses: actions/checkout@v5
         with:
           path: ./wasp-data
           fetch-depth: 2
@@ -63,18 +63,14 @@ jobs:
         shell: bash
         run: |
           cd ./wasp-data
-          find . -type f \
-            ! -path "*/.git/*" \
-            ! -path "./.git/*" \
-            ! -path "./.github/*" \
-            ! -name ".gitignore" \
-            ! -name ".gitattributes" \
-            ! -name "LICENSE" \
-            ! -name "README.md" \
-            ! -name "*.simba" \
-            ! -name "preferences.dat" \
-            ! -name "preferences2.dat" \
-          | while read file; do
+          while IFS= read -r file; do
+            # Skip empty lines
+            [ -z "$file" ] && continue
+            # Make sure the file exists
+            if [ ! -f "$file" ]; then
+              echo "File not found: $file"
+              continue
+            fi
             remote_path="${file#./}"
             mime_type=$(file --mime-type -b "$file")
             echo "→ Uploading $remote_path ($mime_type)"
@@ -83,7 +79,7 @@ jobs:
               -H "Content-Type: $mime_type" \
               --data-binary @"$file"
             echo ""
-          done
+          done < ./tools/whitelist.txt
 
   notification:
     if: ${{ github.repository_owner == 'WaspScripts' && github.ref == 'refs/heads/main' }}

data/items.zip

@@ -1,34 +1,26 @@
 {
-  "data\\items.zip" : "E8AAA65A",
-  "data\\monsters.txt" : "81455CA5",
-  "data\\monsters.zip" : "83299037",
-  "finders\\house_layout.zip" : "D6FF199D",
-  "finders\\items\\data\\hash.txt" : "565AC9F0",
-  "finders\\items\\data\\id.txt" : "6F6873B9",
-  "finders\\items\\data\\item.txt" : "FD7CC2CD",
-  "finders\\items\\items-imgs.zip" : "C8FCA1E6",
-  "finders\\items\\items.bin" : "E297819A",
-  "finders\\items\\items.zip" : "68B9D040",
-  "finders\\overheads.zip" : "1F4D08DA",
-  "finders\\prayer.zip" : "0ADB50ED",
-  "finders\\spells.zip" : "1D959BB3",
-  "fonts\\fonts.zip" : "AF078AAF",
-  "images\\equipment.png" : "862F4199",
-  "images\\gametab.png" : "01E8D551",
-  "images\\mm_fixed_mask.png" : "A3215DDA",
-  "images\\mm_resizable_mask.png" : "34785F87",
-  "jsons\\consumables.json" : "5F2994A1",
-  "jsons\\gear.json" : "82CE8D4A",
-  "jsons\\item-definitions.zip" : "F53A2FEB",
-  "jsons\\monsters" : "E4AC5B2E",
-  "jsons\\monsters.zip" : "83299037",
-  "jsons\\weapons.json" : "670C3284",
-  "map\\collision.zip" : "2A5B3BF7",
-  "map\\heightmap.zip" : "6E49A0AC",
-  "map\\map.zip" : "52E4A07B",
-  "map\\npcs.zip" : "6C6B1FE2",
-  "map\\npcs_helper.zip" : "B2D4F5EE",
-  "map\\objects.zip" : "85FEE5AA",
-  "tools\\preferences\\preferences.dat" : "E848042E",
-  "tools\\preferences\\preferences2.dat" : "329C0448"
+  "finders/house_layout.zip" : "D6FF199D",
+  "finders/items/data/hash.txt" : "565AC9F0",
+  "finders/items/data/id.txt" : "6F6873B9",
+  "finders/items/data/item.txt" : "FD7CC2CD",
+  "finders/items/items.zip" : "68B9D040",
+  "finders/overheads.zip" : "1F4D08DA",
+  "finders/prayer.zip" : "0ADB50ED",
+  "finders/spells.zip" : "1D959BB3",
+  "fonts/fonts.zip" : "AF078AAF",
+  "images/equipment.png" : "862F4199",
+  "images/gametab.png" : "01E8D551",
+  "images/mm_fixed_mask.png" : "A3215DDA",
+  "images/mm_resizable_mask.png" : "34785F87",
+  "jsons/consumables.json" : "5F2994A1",
+  "jsons/gear.json" : "82CE8D4A",
+  "jsons/item-definitions.zip" : "F53A2FEB",
+  "jsons/monsters" : "E4AC5B2E",
+  "jsons/monsters.zip" : "83299037",
+  "jsons/weapons.json" : "670C3284",
+  "map/collision.zip" : "2A5B3BF7",
+  "map/heightmap.zip" : "6E49A0AC",
+  "map/map.zip" : "52E4A07B",
+  "map/npcs.zip" : "6C6B1FE2",
+  "map/objects.zip" : "85FEE5AA"
 }

finders/items/items-imgs.zip

@@ -1,6 +1,5 @@
 var
   path: String = {$macro DIR} + '..' + PATH_SEP;
-  skip: TStringArray;
   files: TStringArray;
   i: Integer;
   hash: String;
@@ -9,27 +8,17 @@ begin
   path := PathNormalize(path);
   WriteLn path;
 
-  files := DirList(path, True);
-  skip := [path + 'LICENSE', path + 'README.md', path + 'hashes.json'];
+  files := FileReadLines(path + 'tools' + PATH_SEP + 'whitelist.txt');
 
   FileDelete(path + 'hashes.json');
 
   json := new TJSONParser();
 
   for i := 0 to High(files) do
   begin
-    if PathIsDirectory(files[i]) then
-      Continue;
-    if files[i].StartsWith(path + '.git') then
-      Continue;
-    if files[i].EndsWith('.simba') then
-      Continue;
-    if SKIP.Contains(files[i]) then
-      Continue;
-
-    hash := HashFile(EHashAlgo.CRC32, files[i]);
+    hash := HashFile(EHashAlgo.CRC32, path + files[i]);
     WriteLn('File: ', files[i], ' Hash: ', hash);
-    json.AddString(files[i].After(path), hash);
+    json.AddString(files[i], hash);
   end;
 
   WriteLn json.Format();

hashes.json

@@ -0,0 +1,24 @@
+finders/house_layout.zip
+finders/items/data/hash.txt
+finders/items/data/id.txt
+finders/items/data/item.txt
+finders/items/items.zip
+finders/overheads.zip
+finders/prayer.zip
+finders/spells.zip
+fonts/fonts.zip
+images/equipment.png
+images/gametab.png
+images/mm_fixed_mask.png
+images/mm_resizable_mask.png
+jsons/consumables.json
+jsons/gear.json
+jsons/item-definitions.zip
+jsons/monsters
+jsons/monsters.zip
+jsons/weapons.json
+map/collision.zip
+map/heightmap.zip
+map/map.zip
+map/npcs.zip
+map/objects.zip