+ betterdays with 90 minutes day and 3 minutes night

+ sync server script
* fix and optimize shelve when sync pakku
This commit is contained in:
2026-02-26 16:58:43 +03:00
parent 3941a2c841
commit 1f3867eeec
8 changed files with 178 additions and 79 deletions

33
bash/sync-serverpack.sh Executable file
View File

@ -0,0 +1,33 @@
#!/bin/bash
set -euo pipefail
pakku() { pakku-mc "$@"; }
# Определяем директории
SCRIPT_DIR=$(cd -- "$(dirname -- "${BASH_SOURCE[0]}")" &> /dev/null && pwd)
REPO_ROOT="${SCRIPT_DIR}/.."
SOURCE_ZIP="${REPO_ROOT}/build/serverpack/*.zip"
TARGET_DIR="/home/dimti/Seafile/minecraft/installers/m2110/"
cd "${REPO_ROOT}" || exit 1
pakku export
# Проверяем, существует ли архив
if ls ${SOURCE_ZIP} 1> /dev/null 2>&1; then
echo "Нашел архив серверной сборки: ${SOURCE_ZIP}"
else
echo "Ошибка: Архив серверной сборки не найден в ${SOURCE_ZIP}"
exit 1
fi
# Очищаем целевые папки mods и config
echo "Очистка папок mods и config в ${TARGET_DIR}..."
rm -rf "${TARGET_DIR}/mods"
rm -rf "${TARGET_DIR}/config"
# Распаковываем архив в целевую директорию
echo "Распаковка архива в ${TARGET_DIR}..."
unzip -o ${SOURCE_ZIP} -d "${TARGET_DIR}"
echo "Синхронизация завершена успешно."

View File

@ -5,8 +5,41 @@ SCRIPT_DIR=$(cd -- "$(dirname -- "${BASH_SOURCE[0]}")" &> /dev/null && pwd)
REPO_ROOT="${SCRIPT_DIR}/.."
cd "${REPO_ROOT}" || exit 1
# Массив ключевых слов для идентификации кастомных модов
CUSTOM_MOD_KEYWORDS=(
"advanced-xray"
"easy-install"
"mobility"
)
# Папка для временного хранения кастомных модов
SHELF_DIR=".pakku/shelf"
mkdir -p "${SHELF_DIR}"
# Функция для перемещения кастомных модов в карман
shelve_custom_mods() {
for keyword in "${CUSTOM_MOD_KEYWORDS[@]}"; do
find mods -name "*${keyword}*" -type f -exec mv -v {} "${SHELF_DIR}" \;
done
}
# Функция для возврата кастомных модов обратно
restore_custom_mods() {
for keyword in "${CUSTOM_MOD_KEYWORDS[@]}"; do
find "${SHELF_DIR}" -name "*${keyword}*" -type f -exec mv -v {} mods \;
done
}
# Перемещаем кастомные моды в карман перед синхронизацией
shelve_custom_mods
# Это не решает проблемы того, что некоторые моду могут быть добавлены или обновлены лаунчером Freesm
pakku fetch --shelve
# pakku fetch --shelve
pakku sync
mv .pakku/shelf/* mods/
# Возвращаем кастомные моды обратно
restore_custom_mods
# Перемещаем оставшиеся моды из кармана pakku
mv .pakku/shelf/* mods/ 2>/dev/null || true

View File

@ -1,17 +0,0 @@
filename = 'advanced-xray-fabric-21.9.2.jar'
name = 'Advanced XRay (Fabric Edition)'
side = 'both'
x-prismlauncher-loaders = [ 'fabric' ]
x-prismlauncher-mc-versions = [ '1.21.10', '1.21.9' ]
x-prismlauncher-release-type = 'release'
x-prismlauncher-version-number = '[FABRIC] Advanced XRay 21.9.2'
[download]
hash = 'f29ca7e05e2a2c832ef8e9e28e3e759c489e189e'
hash-format = 'sha1'
mode = 'metadata:curseforge'
url = ''
[update.curseforge]
file-id = 7210419
project-id = 444663

View File

@ -0,0 +1,17 @@
filename = 'betterdays-1.21.10-3.3.6.2-FABRIC.jar'
name = 'Better Days'
side = ''
x-prismlauncher-loaders = [ 'fabric' ]
x-prismlauncher-mc-versions = [ '1.21.10', '1.21.9' ]
x-prismlauncher-release-type = 'release'
x-prismlauncher-version-number = 'Fabric 1.21.10-3.3.6.2-FABRIC'
[download]
hash = '4c24fddf887732d704db80776b9839336a6751e7'
hash-format = 'sha1'
mode = 'metadata:curseforge'
url = ''
[update.curseforge]
file-id = 7294222
project-id = 895618

View File

@ -1,17 +0,0 @@
filename = 'easy-install-fabric-1.1.7.jar'
name = 'Easy Install'
side = 'client'
x-prismlauncher-loaders = [ 'quilt', 'fabric' ]
x-prismlauncher-mc-versions = [ '1.21.10', '1.21.9' ]
x-prismlauncher-release-type = 'release'
x-prismlauncher-version-number = '1.1.7'
[download]
hash = '2fd2f65cc6e75a2f5d5fe851958e4925ac75cb59682066e6e078979a33b4ef2b192a86e009b8bf47e1497adf63bd09a8e296a1a1da826246d25b2969a714fe1e'
hash-format = 'sha512'
mode = 'url'
url = 'https://cdn.modrinth.com/data/VlPGqnKZ/versions/mEPrhw9n/easy-install-fabric-1.1.7.jar'
[update.modrinth]
mod-id = 'VlPGqnKZ'
version = 'mEPrhw9n'

View File

@ -1,17 +0,0 @@
filename = 'mobility-1.10.2.jar'
name = "Frostbyte's Maximum Mobility"
side = 'client'
x-prismlauncher-loaders = [ 'fabric' ]
x-prismlauncher-mc-versions = [ '1.21.10' ]
x-prismlauncher-release-type = 'release'
x-prismlauncher-version-number = '1.10.2 (Fabric 1.21.10)'
[download]
hash = '48ffddeac44ae3a0c0a99f5f472ab4b31aa7e7ec'
hash-format = 'sha1'
mode = 'metadata:curseforge'
url = ''
[update.curseforge]
file-id = 7145312
project-id = 846818

Binary file not shown.

View File

@ -282,6 +282,73 @@
]
},
{
"pakku_id": "2CL3yKuhYX0RzCpt",
"type": "MOD",
"side": "BOTH",
"slug": {
"curseforge": "betterdays",
"modrinth": "betterdays"
},
"name": {
"curseforge": "Better Days",
"modrinth": "Better Days"
},
"id": {
"curseforge": "895618",
"modrinth": "tPLE214j"
},
"files": [
{
"type": "modrinth",
"file_name": "betterdays-1.21.10-3.3.6.2-FABRIC.jar",
"mc_versions": [
"1.21.9",
"1.21.10"
],
"loaders": [
"fabric"
],
"release_type": "release",
"url": "https://cdn.modrinth.com/data/tPLE214j/versions/ZZ8gbfVy/betterdays-1.21.10-3.3.6.2-FABRIC.jar",
"id": "ZZ8gbfVy",
"parent_id": "tPLE214j",
"hashes": {
"sha512": "dd603c6e3af76ff0e7ea0653fb63d881d2ae5bab6abf6fd3c94cf430ac3dabbca10eb86e3fab88aa8d8316d8a48d512e938e135fb1ac010ade66446014cf8b7b",
"sha1": "4c24fddf887732d704db80776b9839336a6751e7"
},
"required_dependencies": [
"P7dR8mSH"
],
"size": 983745,
"date_published": "2025-12-04T17:17:09.958400Z"
},
{
"type": "curseforge",
"file_name": "betterdays-1.21.10-3.3.6.2-FABRIC.jar",
"mc_versions": [
"1.21.9",
"1.21.10"
],
"loaders": [
"fabric"
],
"release_type": "release",
"url": "https://edge.forgecdn.net/files/7294/222/betterdays-1.21.10-3.3.6.2-FABRIC.jar",
"id": "7294222",
"parent_id": "895618",
"hashes": {
"sha1": "4c24fddf887732d704db80776b9839336a6751e7",
"md5": "5c238747d54c37f76ff6e7106bb9231a"
},
"required_dependencies": [
"306612"
],
"size": 983745,
"date_published": "2025-12-04T17:17:08.560Z"
}
]
},
{
"pakku_id": "1sWgWGqJBaAyI16l",
"type": "MOD",
"side": "CLIENT",
@ -962,7 +1029,7 @@
]
},
{
"pakku_id": "U3BDvO0rYx0rhySY",
"pakku_id": "qyCCELEbZqM9AoxI",
"type": "MOD",
"side": "BOTH",
"slug": {
@ -980,7 +1047,7 @@
"files": [
{
"type": "modrinth",
"file_name": "fabric-language-kotlin-1.13.8+kotlin.2.3.0.jar",
"file_name": "fabric-language-kotlin-1.13.9+kotlin.2.3.10.jar",
"mc_versions": [
"1.14",
"1.14.1",
@ -1030,16 +1097,16 @@
"fabric"
],
"release_type": "release",
"url": "https://cdn.modrinth.com/data/Ha28R6CL/versions/N6D3uiZF/fabric-language-kotlin-1.13.8+kotlin.2.3.0.jar",
"id": "N6D3uiZF",
"url": "https://cdn.modrinth.com/data/Ha28R6CL/versions/ViT4gucI/fabric-language-kotlin-1.13.9+kotlin.2.3.10.jar",
"id": "ViT4gucI",
"parent_id": "Ha28R6CL",
"hashes": {
"sha512": "90bf59f810ea62363bdd7b2ce85a6268b7db67d6d4ce5ae6555204bc7eff0446a6e17d60ef51ad41bf85e92ca430043a8f7c21157cbaee9279733304605cc4d0",
"sha1": "05fe02fe61232c4ddea4059e8103281424d5a2bd"
"sha512": "498672ee88cf703685026e74f82a85e30d980c62a1c8cc14744cb73add09a857db8d585b405e19f558ec490613642750eb00e09d8ef5a3c9578bc52b53568d51",
"sha1": "20b2200961e11994595ebb2d5f6624f232d13751"
},
"required_dependencies": [],
"size": 7618852,
"date_published": "2025-12-16T16:56:52.260887Z"
"size": 7642216,
"date_published": "2026-02-06T09:24:24.664865Z"
},
{
"type": "curseforge",
@ -2756,7 +2823,7 @@
]
},
{
"pakku_id": "RvjpAE3WONPjIrTL",
"pakku_id": "waxq3aWcKPiqXicx",
"type": "MOD",
"side": "CLIENT",
"slug": {
@ -2774,7 +2841,7 @@
"files": [
{
"type": "modrinth",
"file_name": "xaerominimap-fabric-1.21.10-25.3.5.jar",
"file_name": "xaerominimap-fabric-1.21.10-25.3.9.jar",
"mc_versions": [
"1.21.10"
],
@ -2783,18 +2850,18 @@
"quilt"
],
"release_type": "release",
"url": "https://cdn.modrinth.com/data/1bokaNcj/versions/mqs9c3ae/xaerominimap-fabric-1.21.10-25.3.5.jar",
"id": "mqs9c3ae",
"url": "https://cdn.modrinth.com/data/1bokaNcj/versions/G8CFwR66/xaerominimap-fabric-1.21.10-25.3.9.jar",
"id": "G8CFwR66",
"parent_id": "1bokaNcj",
"hashes": {
"sha512": "237b8016d8657ecefdff51bcb0f439e791b6be8574ec0f299e84a2f6d399741fa8fffcbdd817608aa5255303c1a83298e2b7be16bdabd7d72286ee42f5483c2f",
"sha1": "1dfcb91b69c59d1fe53f6f1f3006b2251ef064b0"
"sha512": "707add7cb090a28b52c4e8f6396c841ed0026514b8e9a8eb76e5ae5ea7aa37962807eba05e42620232b75e820fbc8194d4d12af2d53274d478b59854d184a329",
"sha1": "2ca71075187b31e510848108e37ee4450a4c71dc"
},
"required_dependencies": [
"P7dR8mSH"
],
"size": 2130418,
"date_published": "2026-01-03T14:15:04.972510Z"
"size": 2147955,
"date_published": "2026-02-06T10:08:17.187133Z"
},
{
"type": "curseforge",
@ -2957,7 +3024,7 @@
]
},
{
"pakku_id": "dmv4thWjJf4fHA9X",
"pakku_id": "PAH9iBnBAl1ogNAR",
"type": "MOD",
"side": "CLIENT",
"slug": {
@ -2975,7 +3042,7 @@
"files": [
{
"type": "modrinth",
"file_name": "zoomify-2.15.1+1.21.9.jar",
"file_name": "zoomify-2.15.2+1.21.9.jar",
"mc_versions": [
"1.21.9",
"1.21.10"
@ -2984,20 +3051,20 @@
"fabric"
],
"release_type": "release",
"url": "https://cdn.modrinth.com/data/w7ThoJFB/versions/luy40xRK/zoomify-2.15.1+1.21.9.jar",
"id": "luy40xRK",
"url": "https://cdn.modrinth.com/data/w7ThoJFB/versions/Vdx09fu6/zoomify-2.15.2+1.21.9.jar",
"id": "Vdx09fu6",
"parent_id": "w7ThoJFB",
"hashes": {
"sha512": "c17ee7511b88c4f40feaf1b0640dc6cc4a8cf4870cac7d39153affe35395b487b61728b8018dff2a451687f888701e5f610e390fec3437d444172fed779c5002",
"sha1": "e51c0100460792d3eb132c9118c36d81ec7f3e72"
"sha512": "cfd7c0e4b203df445c72462bf653ee0980ea61e043e94434943e6aace329099d20dab76bcdbcfd6f27671aa65b7f427e952b3af0573f6eb5538e1ed51721e605",
"sha1": "874bae4867d0a2782857e3ee20b5045f36a3eda2"
},
"required_dependencies": [
"Ha28R6CL",
"1eAoo2KR",
"P7dR8mSH",
"1eAoo2KR"
"Ha28R6CL"
],
"size": 874700,
"date_published": "2026-01-15T11:13:17.403265Z"
"size": 873244,
"date_published": "2026-02-08T02:09:20.239845Z"
},
{
"type": "curseforge",