From 339f2e5d964c01a2124bdc8ee19e4b68c405b382 Mon Sep 17 00:00:00 2001 From: Xikaro <0regon.end@gmail.com> Date: Thu, 14 Dec 2023 09:32:24 +0500 Subject: [PATCH] workflows --- .github/buildtools/modpack/mods/better-ping-display.pw.toml | 2 +- .github/buildtools/modpack/mods/better-third-person.pw.toml | 2 +- .github/buildtools/modpack/mods/blur-forge.pw.toml | 2 +- .github/buildtools/modpack/mods/cherished-worlds.pw.toml | 2 +- .github/buildtools/modpack/mods/client-tweaks.pw.toml | 2 +- .github/buildtools/modpack/mods/craftpresence.pw.toml | 2 +- .github/buildtools/modpack/mods/cupboard.pw.toml | 2 +- .../buildtools/modpack/mods/drippy-loading-screen.pw.toml | 2 +- .../buildtools/modpack/mods/dynamiclights-reforged.pw.toml | 2 +- .github/buildtools/modpack/mods/embeddium.pw.toml | 2 +- .github/buildtools/modpack/mods/entityculling.pw.toml | 2 +- .github/buildtools/modpack/mods/fancymenu-forge.pw.toml | 2 +- .github/buildtools/modpack/mods/farsight.pw.toml | 2 +- .github/buildtools/modpack/mods/inventory-hud-forge.pw.toml | 2 +- .github/buildtools/modpack/mods/itemphysic-lite.pw.toml | 2 +- .github/buildtools/modpack/mods/konkrete.pw.toml | 2 +- .github/buildtools/modpack/mods/mouse-tweaks.pw.toml | 2 +- .../buildtools/modpack/mods/not-enough-animations.pw.toml | 2 +- .github/buildtools/modpack/mods/oculus.pw.toml | 2 +- .github/workflows/preview.yml | 5 +++-- 20 files changed, 22 insertions(+), 21 deletions(-) diff --git a/.github/buildtools/modpack/mods/better-ping-display.pw.toml b/.github/buildtools/modpack/mods/better-ping-display.pw.toml index 56585aeec..47bb3506b 100644 --- a/.github/buildtools/modpack/mods/better-ping-display.pw.toml +++ b/.github/buildtools/modpack/mods/better-ping-display.pw.toml @@ -1,6 +1,6 @@ name = "Better Ping Display" filename = "BetterPingDisplay-1.20.1-1.1.jar" -side = "both" +side = "client" [download] hash-format = "sha1" diff --git a/.github/buildtools/modpack/mods/better-third-person.pw.toml b/.github/buildtools/modpack/mods/better-third-person.pw.toml index 1ddd0c52f..5f7263725 100644 --- a/.github/buildtools/modpack/mods/better-third-person.pw.toml +++ b/.github/buildtools/modpack/mods/better-third-person.pw.toml @@ -1,6 +1,6 @@ name = "Better Third Person" filename = "BetterThirdPerson-Forge-1.20-1.9.0.jar" -side = "both" +side = "client" [download] hash-format = "sha1" diff --git a/.github/buildtools/modpack/mods/blur-forge.pw.toml b/.github/buildtools/modpack/mods/blur-forge.pw.toml index 1f9e13266..b4c2faf5d 100644 --- a/.github/buildtools/modpack/mods/blur-forge.pw.toml +++ b/.github/buildtools/modpack/mods/blur-forge.pw.toml @@ -1,6 +1,6 @@ name = "Blur (Forge)" filename = "blur-forge-3.1.1.jar" -side = "both" +side = "client" [download] hash-format = "sha1" diff --git a/.github/buildtools/modpack/mods/cherished-worlds.pw.toml b/.github/buildtools/modpack/mods/cherished-worlds.pw.toml index 9e537ed2b..5f01e02e5 100644 --- a/.github/buildtools/modpack/mods/cherished-worlds.pw.toml +++ b/.github/buildtools/modpack/mods/cherished-worlds.pw.toml @@ -1,6 +1,6 @@ name = "Cherished Worlds (Fabric/Forge/Quilt)" filename = "cherishedworlds-forge-6.1.4+1.20.1.jar" -side = "both" +side = "client" [download] hash-format = "sha1" diff --git a/.github/buildtools/modpack/mods/client-tweaks.pw.toml b/.github/buildtools/modpack/mods/client-tweaks.pw.toml index 70fbb6afd..3c11be029 100644 --- a/.github/buildtools/modpack/mods/client-tweaks.pw.toml +++ b/.github/buildtools/modpack/mods/client-tweaks.pw.toml @@ -1,6 +1,6 @@ name = "Client Tweaks" filename = "clienttweaks-forge-1.20-11.1.0.jar" -side = "both" +side = "client" [download] hash-format = "sha1" diff --git a/.github/buildtools/modpack/mods/craftpresence.pw.toml b/.github/buildtools/modpack/mods/craftpresence.pw.toml index 5efcfceee..285a2b4f9 100644 --- a/.github/buildtools/modpack/mods/craftpresence.pw.toml +++ b/.github/buildtools/modpack/mods/craftpresence.pw.toml @@ -1,6 +1,6 @@ name = "CraftPresence" filename = "CraftPresence-2.2.5+1.20.1.jar" -side = "both" +side = "client" [download] hash-format = "sha1" diff --git a/.github/buildtools/modpack/mods/cupboard.pw.toml b/.github/buildtools/modpack/mods/cupboard.pw.toml index 0a9a2c9f8..ccff86b52 100644 --- a/.github/buildtools/modpack/mods/cupboard.pw.toml +++ b/.github/buildtools/modpack/mods/cupboard.pw.toml @@ -1,6 +1,6 @@ name = "Cupboard" filename = "cupboard-1.20.1-2.1.jar" -side = "both" +side = "client" [download] hash-format = "sha1" diff --git a/.github/buildtools/modpack/mods/drippy-loading-screen.pw.toml b/.github/buildtools/modpack/mods/drippy-loading-screen.pw.toml index eea98058e..83df18269 100644 --- a/.github/buildtools/modpack/mods/drippy-loading-screen.pw.toml +++ b/.github/buildtools/modpack/mods/drippy-loading-screen.pw.toml @@ -1,6 +1,6 @@ name = "Drippy Loading Screen [Forge]" filename = "drippyloadingscreen_forge_2.2.4_MC_1.20.1.jar" -side = "both" +side = "client" [download] hash-format = "sha1" diff --git a/.github/buildtools/modpack/mods/dynamiclights-reforged.pw.toml b/.github/buildtools/modpack/mods/dynamiclights-reforged.pw.toml index 88d410433..1cf00c9f7 100644 --- a/.github/buildtools/modpack/mods/dynamiclights-reforged.pw.toml +++ b/.github/buildtools/modpack/mods/dynamiclights-reforged.pw.toml @@ -1,6 +1,6 @@ name = "Magnesium/Rubidium Dynamic Lights" filename = "dynamiclightsreforged-1.20.1_v1.6.0.jar" -side = "both" +side = "client" [download] hash-format = "sha1" diff --git a/.github/buildtools/modpack/mods/embeddium.pw.toml b/.github/buildtools/modpack/mods/embeddium.pw.toml index c2ad4b9aa..20ace9609 100644 --- a/.github/buildtools/modpack/mods/embeddium.pw.toml +++ b/.github/buildtools/modpack/mods/embeddium.pw.toml @@ -1,6 +1,6 @@ name = "Embeddium" filename = "embeddium-0.2.13+mc1.20.1.jar" -side = "both" +side = "client" [download] hash-format = "sha1" diff --git a/.github/buildtools/modpack/mods/entityculling.pw.toml b/.github/buildtools/modpack/mods/entityculling.pw.toml index 6b0e1be9d..18bb3ef99 100644 --- a/.github/buildtools/modpack/mods/entityculling.pw.toml +++ b/.github/buildtools/modpack/mods/entityculling.pw.toml @@ -1,6 +1,6 @@ name = "Entity Culling Fabric/Forge" filename = "entityculling-forge-1.6.2-mc1.20.1.jar" -side = "both" +side = "client" [download] hash-format = "sha1" diff --git a/.github/buildtools/modpack/mods/fancymenu-forge.pw.toml b/.github/buildtools/modpack/mods/fancymenu-forge.pw.toml index 6d0da592b..1ef84e099 100644 --- a/.github/buildtools/modpack/mods/fancymenu-forge.pw.toml +++ b/.github/buildtools/modpack/mods/fancymenu-forge.pw.toml @@ -1,6 +1,6 @@ name = "FancyMenu [Forge]" filename = "fancymenu_forge_2.14.9-3_MC_1.20.1.jar" -side = "both" +side = "client" [download] hash-format = "sha1" diff --git a/.github/buildtools/modpack/mods/farsight.pw.toml b/.github/buildtools/modpack/mods/farsight.pw.toml index 87285a513..9f48c078c 100644 --- a/.github/buildtools/modpack/mods/farsight.pw.toml +++ b/.github/buildtools/modpack/mods/farsight.pw.toml @@ -1,6 +1,6 @@ name = "Farsight [Forge]" filename = "farsight-1.20.1-3.6.jar" -side = "both" +side = "client" [download] hash-format = "sha1" diff --git a/.github/buildtools/modpack/mods/inventory-hud-forge.pw.toml b/.github/buildtools/modpack/mods/inventory-hud-forge.pw.toml index 5266066d2..db55dc913 100644 --- a/.github/buildtools/modpack/mods/inventory-hud-forge.pw.toml +++ b/.github/buildtools/modpack/mods/inventory-hud-forge.pw.toml @@ -1,6 +1,6 @@ name = "Inventory HUD+" filename = "invhud.forge.1.20.1-3.4.18.jar" -side = "both" +side = "client" [download] hash-format = "sha1" diff --git a/.github/buildtools/modpack/mods/itemphysic-lite.pw.toml b/.github/buildtools/modpack/mods/itemphysic-lite.pw.toml index cebd94d95..7bca285ce 100644 --- a/.github/buildtools/modpack/mods/itemphysic-lite.pw.toml +++ b/.github/buildtools/modpack/mods/itemphysic-lite.pw.toml @@ -1,6 +1,6 @@ name = "ItemPhysic Lite" filename = "ItemPhysicLite_FORGE_v1.6.1_mc1.20.jar" -side = "both" +side = "client" [download] hash-format = "sha1" diff --git a/.github/buildtools/modpack/mods/konkrete.pw.toml b/.github/buildtools/modpack/mods/konkrete.pw.toml index 6078ccb8d..146b1b04b 100644 --- a/.github/buildtools/modpack/mods/konkrete.pw.toml +++ b/.github/buildtools/modpack/mods/konkrete.pw.toml @@ -1,6 +1,6 @@ name = "Konkrete [Forge]" filename = "konkrete_forge_1.6.1-2_MC_1.20.jar" -side = "both" +side = "client" [download] hash-format = "sha1" diff --git a/.github/buildtools/modpack/mods/mouse-tweaks.pw.toml b/.github/buildtools/modpack/mods/mouse-tweaks.pw.toml index 2ed699ca4..771400717 100644 --- a/.github/buildtools/modpack/mods/mouse-tweaks.pw.toml +++ b/.github/buildtools/modpack/mods/mouse-tweaks.pw.toml @@ -1,6 +1,6 @@ name = "Mouse Tweaks" filename = "MouseTweaks-forge-mc1.20-2.25.jar" -side = "both" +side = "client" [download] hash-format = "sha1" diff --git a/.github/buildtools/modpack/mods/not-enough-animations.pw.toml b/.github/buildtools/modpack/mods/not-enough-animations.pw.toml index 41acd685d..708f2512e 100644 --- a/.github/buildtools/modpack/mods/not-enough-animations.pw.toml +++ b/.github/buildtools/modpack/mods/not-enough-animations.pw.toml @@ -1,6 +1,6 @@ name = "Not Enough Animations" filename = "notenoughanimations-forge-1.6.4-mc1.20.jar" -side = "both" +side = "client" [download] hash-format = "sha1" diff --git a/.github/buildtools/modpack/mods/oculus.pw.toml b/.github/buildtools/modpack/mods/oculus.pw.toml index 9a982935b..ab0290c0f 100644 --- a/.github/buildtools/modpack/mods/oculus.pw.toml +++ b/.github/buildtools/modpack/mods/oculus.pw.toml @@ -1,6 +1,6 @@ name = "Oculus" filename = "oculus-mc1.20.1-1.6.13.jar" -side = "both" +side = "client" [download] hash-format = "sha1" diff --git a/.github/workflows/preview.yml b/.github/workflows/preview.yml index fac363ec4..61ba24274 100644 --- a/.github/workflows/preview.yml +++ b/.github/workflows/preview.yml @@ -39,10 +39,11 @@ jobs: - name: Archive CF run: | cd ./ - packwiz curseforge export + packwiz curseforge export -o TerraFirmaGreg-1.20.x-${{ steps.get_version.outputs.version }}-cf.zip - name: Archive MMC run: | + git submodule init mkdir -p .minecraft cp -r ./{config,defaultconfigs,kubejs,mods,.github/buildtools/modpack/mmc-pack.json,.github/buildtools/modpack/instance.cfg} .minecraft/ zip -r ./TerraFirmaGreg-1.20.x-${{ steps.get_version.outputs.version }}-mmc.zip .minecraft/ @@ -63,6 +64,6 @@ jobs: name: Release ${{ steps.changelog.outputs.version }} body: ${{ steps.changelog.outputs.description }} files: | - ./TerraFirmaGreg-1.20.x-${{ steps.get_version.outputs.version }}.zip + ./TerraFirmaGreg-1.20.x-${{ steps.get_version.outputs.version }}-cf.zip ./TerraFirmaGreg-1.20.x-${{ steps.get_version.outputs.version }}-mmc.zip ./TerraFirmaGreg-1.20.x-${{ steps.get_version.outputs.version }}-server.zip