Attempt to fix downloads and rearrange modpack file structure

FortuneStreetModding · Feb 13, 2024 · 2865ff4 · 2865ff4
1 parent c7350b5
commit 2865ff4
Show file tree

Hide file tree

Showing 20 changed files with 8 additions and 3 deletions.
diff --git a/.github/workflows/modpack.yml b/.github/workflows/modpack.yml
@@ -30,9 +30,10 @@ jobs:
             for d in _modpacks/*/* ; do
                 modpack_id=$(jq -r "keys[0]" $d/manifest.json)
                 resource_name=$(jq -r ".$modpack_id.resources" $d/manifest.json)
-                resource_directory="_data/modpack_common_files/$resource_name"
+                resource_directory="_modpacks/$resource_name/resources"
                 echo "$resource_directory"
                 mkdir -p $d/$modpack_id
+                cp "_data/backgrounds.yml" $d/$modpack_id/backgrounds.yml
                 cp -r $resource_directory/. $d/$modpack_id/
                 cp $d/manifest.json $build_dir/$modpack_id.json
                 cp $d/modlist.txt $d/mapList.yaml $d/manifest.json $d/$modpack_id/

diff --git a/_data/modpack_common_files/cswt/common/common_curtain.cmpres b/_data/modpack_common_files/cswt/common/common_curtain.cmpres
diff --git a/_data/modpack_common_files/cswt/common_langDE/common_curtain_DE.cmpres b/_data/modpack_common_files/cswt/common_langDE/common_curtain_DE.cmpres
diff --git a/_data/modpack_common_files/cswt/common_langEN/common_curtain_EN.cmpres b/_data/modpack_common_files/cswt/common_langEN/common_curtain_EN.cmpres
diff --git a/_data/modpack_common_files/cswt/common_langES/common_curtain_ES.cmpres b/_data/modpack_common_files/cswt/common_langES/common_curtain_ES.cmpres
diff --git a/_data/modpack_common_files/cswt/common_langFR/common_curtain_FR.cmpres b/_data/modpack_common_files/cswt/common_langFR/common_curtain_FR.cmpres
diff --git a/_data/modpack_common_files/cswt/common_langIT/common_curtain_IT.cmpres b/_data/modpack_common_files/cswt/common_langIT/common_curtain_IT.cmpres
diff --git a/_data/modpack_common_files/cswt/common_langUK/common_curtain_UK.cmpres b/_data/modpack_common_files/cswt/common_langUK/common_curtain_UK.cmpres
diff --git a/...ck_common_files/cswt/cswtpycsmm/game_sequence_title_ALL.arc/ui_corporate_ja.png b/...ck_common_files/cswt/cswtpycsmm/game_sequence_title_ALL.arc/ui_corporate_ja.png
diff --git a/...common_files/cswt/cswtpycsmm/game_sequence_title_ALL.arc/ui_itasuto_logo_ja.png b/...common_files/cswt/cswtpycsmm/game_sequence_title_ALL.arc/ui_itasuto_logo_ja.png
diff --git a/...ack_common_files/cswt/cswtpycsmm/game_sequence_title_DE.arc/ui_corporate_ja.png b/...ack_common_files/cswt/cswtpycsmm/game_sequence_title_DE.arc/ui_corporate_ja.png
diff --git a/...pack_common_files/cswt/ChangeCurtain.json → ...ks/cswt/resources/cswt/ChangeCurtain.json b/...pack_common_files/cswt/ChangeCurtain.json → ...ks/cswt/resources/cswt/ChangeCurtain.json
diff --git a/...odpack_common_files/cswt/ChangeCurtain.py → ...acks/cswt/resources/cswt/ChangeCurtain.py b/...odpack_common_files/cswt/ChangeCurtain.py → ...acks/cswt/resources/cswt/ChangeCurtain.py
diff --git a/_data/modpack_common_files/cswt/README.md → _modpacks/cswt/resources/cswt/README.md b/_data/modpack_common_files/cswt/README.md → _modpacks/cswt/resources/cswt/README.md
diff --git a/...modpack_common_files/cswt/backgrounds.yml → ...packs/cswt/resources/cswt/backgrounds.yml b/...modpack_common_files/cswt/backgrounds.yml → ...packs/cswt/resources/cswt/backgrounds.yml
diff --git a/...a/modpack_common_files/cswt/cswtpycsmm.py → _modpacks/cswt/resources/cswt/cswtpycsmm.py b/...a/modpack_common_files/cswt/cswtpycsmm.py → _modpacks/cswt/resources/cswt/cswtpycsmm.py
diff --git a/...files/cswt/cswtpycsmm/DejaVuSans-Bold.ttf → ...urces/cswt/cswtpycsmm/DejaVuSans-Bold.ttf b/...files/cswt/cswtpycsmm/DejaVuSans-Bold.ttf → ...urces/cswt/cswtpycsmm/DejaVuSans-Bold.ttf
diff --git a/..._common_files/cswt/game/game_result.brres → ...swt/resources/cswt/game/game_result.brres b/..._common_files/cswt/game/game_result.brres → ...swt/resources/cswt/game/game_result.brres
diff --git a/_data/modpack_common_files/cswt/modlist.txt → _modpacks/cswt/resources/cswt/modlist.txt b/_data/modpack_common_files/cswt/modlist.txt → _modpacks/cswt/resources/cswt/modlist.txt
diff --git a/mapsTable.html b/mapsTable.html
@@ -50,7 +50,7 @@ <h1 class="jumbotron-heading">Community Maps</h1>
       </p>
     </div>
   </section>
-  
+
   <!--- Maps -->
   <div class="album">
     <div class="container-fluid">
@@ -99,10 +99,14 @@ <h1 class="jumbotron-heading">Community Maps</h1>
               {%- capture frbFiles -%}
                 {{ map.frbFile1 }},{{map.frbFile2}}
               {%- endcapture -%}
-            {%- else -%}
+            {%- elsif map.frbFile1 -%}
               {%- capture frbFiles -%}
                 {{ map.frbFile1 }}
               {%- endcapture -%}
+            {%- elsif map.frbFiles -%}
+              {%- capture frbFiles -%}
+                {{ map.frbFiles }}
+              {%- endcapture -%}
             {%- endif -%}
             {%- assign background = site.data.backgrounds | where: "background", map.background | first %}
             <tr>