From 05bcad92497005fdbdea6c1cc1cdbeb3eae3637d Mon Sep 17 00:00:00 2001 From: William Date: Sun, 27 Oct 2024 16:13:43 +0000 Subject: [PATCH] feat: Support Minecraft 1.21.3 on Fabric (#707) * feat: start database refactor Adds database migrations * feat: support Fabric 1.21.3 * build: target adventure_platform_mod 6.1.0 * Revert "feat: start database refactor" This reverts commit 010a8103 * docs: document server rejoining as a FAQ * locales: improve home privacy UX consistency * feat: fully update to Minecraft 1.21.3 --------- Co-authored-by: will27528@gmail.com --- .github/workflows/ci.yml | 12 +++++++----- .github/workflows/release.yml | 12 +++++++----- build.gradle | 2 +- common/src/main/resources/locales/bg-bg.yml | 4 ++-- common/src/main/resources/locales/de-de.yml | 4 ++-- common/src/main/resources/locales/en-gb.yml | 4 ++-- common/src/main/resources/locales/es-es.yml | 4 ++-- common/src/main/resources/locales/fr-fr.yml | 4 ++-- common/src/main/resources/locales/it-it.yml | 4 ++-- common/src/main/resources/locales/ja-jp.yml | 4 ++-- common/src/main/resources/locales/ko-kr.yml | 4 ++-- common/src/main/resources/locales/pl-pl.yml | 4 ++-- common/src/main/resources/locales/pt-br.yml | 4 ++-- common/src/main/resources/locales/ru-ru.yml | 4 ++-- common/src/main/resources/locales/tr-tr.yml | 4 ++-- common/src/main/resources/locales/uk-ua.yml | 4 ++-- common/src/main/resources/locales/vi-vn.yml | 4 ++-- common/src/main/resources/locales/zh-cn.yml | 4 ++-- common/src/main/resources/locales/zh-tw.yml | 4 ++-- docs/FAQs.md | 9 +++++++++ docs/Home.md | 1 + docs/_Sidebar.md | 1 + fabric/build.gradle | 7 ++++++- .../william278/huskhomes/FabricHuskHomes.java | 6 +++--- .../william278/huskhomes/user/FabricUser.java | 2 +- gradle.properties | 16 ++++++++-------- gradle/wrapper/gradle-wrapper.properties | 2 +- gradlew | 2 +- paper/build.gradle | 2 +- 29 files changed, 79 insertions(+), 59 deletions(-) create mode 100644 docs/FAQs.md diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 92c2a7e82..fd91f6c8d 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -54,7 +54,7 @@ jobs: distro-names: | paper sponge-10 - fabric-1.21.1 + fabric-1.21.3 distro-groups: | paper sponge @@ -62,11 +62,11 @@ jobs: distro-descriptions: | Paper Sponge API 10 - Fabric 1.21.1 + Fabric 1.21.3 files: | target/HuskHomes-Paper-${{ env.version_name }}.jar target/HuskHomes-Sponge-${{ env.version_name }}.jar - target/HuskHomes-Fabric-${{ env.version_name }}+mc.1.21.1.jar + target/HuskHomes-Fabric-${{ env.version_name }}+mc.1.21.3.jar - name: 'Spigot: Publish to Modrinth & Hangar 🚰' uses: WiIIiam278/mc-publish@hangar with: @@ -109,6 +109,8 @@ jobs: 1.20.6 1.21 1.21.1 + 1.21.2 + 1.21.3 java: 17 - name: 'Sponge: Publish to Modrinth 🧽' uses: WiIIiam278/mc-publish@hangar @@ -148,7 +150,7 @@ jobs: plan | suggests | * impactor | suggests | * placeholder-api | suggests | * - files-primary: target/HuskHomes-Fabric-${{ env.version_name }}+mc.1.21.1.jar + files-primary: target/HuskHomes-Fabric-${{ env.version_name }}+mc.1.21.3.jar name: HuskHomes (Fabric) v${{ env.version_name }} version: ${{ env.version_name }} version-type: alpha @@ -156,5 +158,5 @@ jobs: loaders: | fabric game-versions: | - 1.21.1 + 1.21.3 java: 21 \ No newline at end of file diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 4e541ee3b..a62742c7c 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -43,7 +43,7 @@ jobs: distro-names: | paper sponge-10 - fabric-1.21.1 + fabric-1.21.3 distro-groups: | paper sponge @@ -51,11 +51,11 @@ jobs: distro-descriptions: | Paper Sponge API 10 - Fabric 1.21.1 + Fabric 1.21.3 files: | target/HuskHomes-Paper-${{ github.event.release.tag_name }}.jar target/HuskHomes-Sponge-${{ github.event.release.tag_name }}.jar - target/HuskHomes-Fabric-${{ github.event.release.tag_name }}+mc.1.21.1.jar + target/HuskHomes-Fabric-${{ github.event.release.tag_name }}+mc.1.21.3.jar - name: 'Spigot: Publish to Modrinth & Hangar 🚰' uses: WiIIiam278/mc-publish@hangar with: @@ -97,6 +97,8 @@ jobs: 1.20.6 1.21 1.21.1 + 1.21.2 + 1.21.3 java: 17 - name: 'Sponge: Publish to Modrinth 🧽' uses: WiIIiam278/mc-publish@hangar @@ -134,7 +136,7 @@ jobs: plan | suggests | * impactor | suggests | * placeholder-api | suggests | * - files-primary: target/HuskHomes-Fabric-${{ github.event.release.tag_name }}+mc.1.21.1.jar + files-primary: target/HuskHomes-Fabric-${{ github.event.release.tag_name }}+mc.1.21.3.jar name: HuskHomes (Fabric) v${{ github.event.release.tag_name }} version: ${{ github.event.release.tag_name }} version-type: release @@ -142,5 +144,5 @@ jobs: loaders: | fabric game-versions: | - 1.21.1 + 1.21.3 java: 21 \ No newline at end of file diff --git a/build.gradle b/build.gradle index abbde310a..8dca525b7 100644 --- a/build.gradle +++ b/build.gradle @@ -222,7 +222,7 @@ def versionMetadata() { // If unclean, return the last commit hash with -indev if (!grgit.status().clean) { - return '-' + grgit.head().abbreviatedId + '-indev' + return '-' + grgit.head().abbreviatedId + '-indev' } // Otherwise if this matches a tag, return nothing diff --git a/common/src/main/resources/locales/bg-bg.yml b/common/src/main/resources/locales/bg-bg.yml index 0c3fc083d..446351511 100644 --- a/common/src/main/resources/locales/bg-bg.yml +++ b/common/src/main/resources/locales/bg-bg.yml @@ -66,8 +66,8 @@ locales: command_list_title: '[HuskHomes](#00fb9a bold) [| Command List](#00fb9a)\n' home_list_item: '[[%1%]](show_text=�fb9a&%1%\n&7ℹ %3% run_command=/huskhomes:edithome %2%)' public_home_list_item: '[[%1%]](show_text=�fb9a&%1%\n&7☻ %3%\n&7ℹ %4% run_command=/huskhomes:phome %2%)' - home_is_public: '�fb9a&Обществен' - home_is_private: 'ïe6f&Частно' + home_is_public: 'fff00&☀ Обществен' + home_is_private: '&#ff9f0f&∅ Частно' warp_list_item: '[[%1%]](show_text=�fb9a&%1%\n&7ℹ %3% run_command=/huskhomes:warp %2%)' command_list_item: '[/%1%](#00fb9a show_text=&7Click to suggest command suggest_command=/%1%) [%2%](gray show_text=�fb9a&/%1%\n&7%3%)' list_item_divider: ' [•](gray) ' diff --git a/common/src/main/resources/locales/de-de.yml b/common/src/main/resources/locales/de-de.yml index eee9d2127..d46358397 100644 --- a/common/src/main/resources/locales/de-de.yml +++ b/common/src/main/resources/locales/de-de.yml @@ -66,8 +66,8 @@ locales: command_list_title: '[HuskHomes](#00fb9a bold) [| Befehlsliste](#00fb9a)\n' home_list_item: '[[%1%]](show_text=�fb9a&%1%\n&7Status: %3%\n&7ℹ %4% run_command=/huskhomes:edithome %2%)' public_home_list_item: '[[%1%]](show_text=�fb9a&%1%\n&7☻ %3%\n&7ℹ %4% run_command=/huskhomes:phome %2%)' - home_is_public: '�fb9a&Öffentlich' - home_is_private: 'ïe6f&Privat' + home_is_public: 'fff00&☀ Öffentlich' + home_is_private: '&#ff9f0f&∅ Privat' warp_list_item: '[[%1%]](show_text=�fb9a&%1%\n&7ℹ %3% run_command=/huskhomes:warp %2%)' command_list_item: '[/%1%](#00fb9a show_text=&7Klicke, um den Befehl im Chat einzufügen command suggest_command=/%1%) [%2%](gray show_text=�fb9a&/%1%\n&7%3%)' list_item_divider: ' [•](gray) ' diff --git a/common/src/main/resources/locales/en-gb.yml b/common/src/main/resources/locales/en-gb.yml index 5b0d7fda2..e192e78e8 100644 --- a/common/src/main/resources/locales/en-gb.yml +++ b/common/src/main/resources/locales/en-gb.yml @@ -66,8 +66,8 @@ locales: command_list_title: '[HuskHomes](#00fb9a bold) [| Command List](#00fb9a)\n' home_list_item: '[[%1%]](show_text=�fb9a&%1%\n&7Status: %3%\n&7ℹ %4% run_command=/huskhomes:edithome %2%)' public_home_list_item: '[[%1%]](show_text=�fb9a&%1%\n&7☻ %3%\n&7ℹ %4% run_command=/huskhomes:phome %2%)' - home_is_public: '�fb9a&Public' - home_is_private: 'ïe6f&Private' + home_is_public: 'fff00&☀ Public' + home_is_private: '&#ff9f0f&∅ Private' warp_list_item: '[[%1%]](show_text=�fb9a&%1%\n&7ℹ %3% run_command=/huskhomes:warp %2%)' command_list_item: '[/%1%](#00fb9a show_text=&7Click to suggest command suggest_command=/%1%) [%2%](gray show_text=�fb9a&/%1%\n&7%3%)' list_item_divider: ' [•](gray) ' diff --git a/common/src/main/resources/locales/es-es.yml b/common/src/main/resources/locales/es-es.yml index e549f69e5..af96473e7 100644 --- a/common/src/main/resources/locales/es-es.yml +++ b/common/src/main/resources/locales/es-es.yml @@ -66,8 +66,8 @@ locales: command_list_title: '[GreenShield](#green bold) [| lista de comandos](#00fb9a)\n' home_list_item: '[[%1%]](show_text=�fb9a&%1%\n&7ℹ %3% run_command=/huskhomes:edithome %2%)' public_home_list_item: '[[%1%]](show_text=�fb9a&%1%\n&7☻ %3%\n&7ℹ %4% run_command=/huskhomes:phome %2%)' - home_is_public: '�fb9a&Pública' - home_is_private: 'ïe6f&Privada' + home_is_public: 'fff00&☀ Pública' + home_is_private: '&#ff9f0f&∅ Privada' warp_list_item: '[[%1%]](show_text=�fb9a&%1%\n&7Estado: %3%\n&7ℹ %4% run_command=/huskhomes:warp %2%)' command_list_item: '[/%1%](#00fb9a show_text=&7Clic para sugerir el comando suggest_command=/%1%) [%2%](gray show_text=�fb9a&/%1%\n&7%3%)' list_item_divider: ' [•](gray) ' diff --git a/common/src/main/resources/locales/fr-fr.yml b/common/src/main/resources/locales/fr-fr.yml index d6a1c0575..23f5cc157 100644 --- a/common/src/main/resources/locales/fr-fr.yml +++ b/common/src/main/resources/locales/fr-fr.yml @@ -66,8 +66,8 @@ locales: command_list_title: '[HuskHomes](#00fb9a bold) [| Liste des commandes](#00fb9a)\n' home_list_item: '[[%1%]](show_text=�fb9a&%1%\n&7Statut: %3%\n&7ℹ %4% run_command=/huskhomes:edithome %2%)' public_home_list_item: '[[%1%]](show_text=�fb9a&%1%\n&7☻ %3%\n&7ℹ %4% run_command=/huskhomes:phome %2%)' - home_is_public: '�fb9a&Publique' - home_is_private: 'ïe6f&Privée' + home_is_public: 'fff00&☀ Publique' + home_is_private: '&#ff9f0f&∅ Privée' warp_list_item: '[[%1%]](show_text=�fb9a&%1%\n&7ℹ %3% run_command=/huskhomes:warp %2%)' command_list_item: '[/%1%](#00fb9a show_text=&7Cliquez pour suggérer la commande command suggest_command=/%1%) [%2%](gray show_text=�fb9a&/%1%\n&7%3%)' list_item_divider: ' [•](gray) ' diff --git a/common/src/main/resources/locales/it-it.yml b/common/src/main/resources/locales/it-it.yml index f24a6a295..695598991 100644 --- a/common/src/main/resources/locales/it-it.yml +++ b/common/src/main/resources/locales/it-it.yml @@ -66,8 +66,8 @@ locales: command_list_title: '[HuskHomes](#00fb9a bold) [| Lista comandi](#00fb9a)\n' home_list_item: '[[%1%]](show_text=�fb9a&%1%\n&7Stato: %3%\n&7ℹ %4% run_command=/huskhomes:edithome %2%)' public_home_list_item: '[[%1%]](show_text=�fb9a&%1%\n&7☻ %3%\n&7ℹ %4% run_command=/huskhomes:phome %2%)' - home_is_public: '�fb9a&Pubblica' - home_is_private: 'ïe6f&Privato' + home_is_public: 'fff00&☀ Pubblica' + home_is_private: '&#ff9f0f&∅ Privato' warp_list_item: '[[%1%]](show_text=�fb9a&%1%\n&7ℹ %3% run_command=/huskhomes:warp %2%)' command_list_item: '[/%1%](#00fb9a show_text=&7Clicca per usare il comando suggest_command=/%1%) [%2%](gray show_text=�fb9a&/%1%\n&7%3%)' list_item_divider: ' [•](gray) ' diff --git a/common/src/main/resources/locales/ja-jp.yml b/common/src/main/resources/locales/ja-jp.yml index 0ca13592c..ec3eea4a8 100644 --- a/common/src/main/resources/locales/ja-jp.yml +++ b/common/src/main/resources/locales/ja-jp.yml @@ -66,8 +66,8 @@ locales: command_list_title: '[HuskHomes](#00fb9a bold) [| コマンドリスト](#00fb9a)\n' home_list_item: '[[%1%]](show_text=�fb9a&%1%\n&7状態: %3%\n&7ℹ %4% run_command=/huskhomes:edithome %2%)' public_home_list_item: '[[%1%]](show_text=�fb9a&%1%\n&7☻ %3%\n&7ℹ %4% run_command=/huskhomes:phome %2%)' - home_is_public: '�fb9a&公共' - home_is_private: 'ïe6f&プライベート' + home_is_public: 'fff00&☀ 公共' + home_is_private: '&#ff9f0f&∅ プライベート' warp_list_item: '[[%1%]](show_text=�fb9a&%1%\n&7ℹ %3% run_command=/huskhomes:warp %2%)' command_list_item: '[/%1%](#00fb9a show_text=&7Click to suggest command suggest_command=/%1%) [%2%](gray show_text=�fb9a&/%1%\n&7%3%)' list_item_divider: ' [•](gray) ' diff --git a/common/src/main/resources/locales/ko-kr.yml b/common/src/main/resources/locales/ko-kr.yml index d0550c8b5..da98630c7 100644 --- a/common/src/main/resources/locales/ko-kr.yml +++ b/common/src/main/resources/locales/ko-kr.yml @@ -66,8 +66,8 @@ locales: command_list_title: '[HuskHomes](#00fb9a bold) [| 명령어 목록](#00fb9a)\n' home_list_item: '[[%1%]](show_text=�fb9a&%1%\n\n&7상태: %3%\n&7ℹ %4% run_command=/huskhomes:edithome %2%)' public_home_list_item: '[[%1%]](show_text=�fb9a&%1%\n&7☻ %3%\n&7ℹ %4% run_command=/huskhomes:phome %2%)' - home_is_public: '�fb9a&공공의' - home_is_private: 'ïe6f&사적인' + home_is_public: 'fff00&☀ 공공의' + home_is_private: '&#ff9f0f&∅ 사적인' warp_list_item: '[[%1%]](show_text=�fb9a&%1%\n&7ℹ %3% run_command=/huskhomes:warp %2%)' command_list_item: '[/%1%](#00fb9a show_text=&7클릭하여 명령어를 입력할 수 있습니다 suggest_command=/%1%) [%2%](gray show_text=�fb9a&/%1%\n&7%3%)' list_item_divider: ' [•](gray) ' diff --git a/common/src/main/resources/locales/pl-pl.yml b/common/src/main/resources/locales/pl-pl.yml index b2ff76ee0..170818b31 100644 --- a/common/src/main/resources/locales/pl-pl.yml +++ b/common/src/main/resources/locales/pl-pl.yml @@ -66,8 +66,8 @@ locales: command_list_title: '[HuskHomes](#00fb9a bold) [| Lista Komend](#00fb9a)\n' home_list_item: '[[%1%]](show_text=�fb9a&%1%\n&7Status: %3%\n&7ℹ %4% run_command=/huskhomes:edithome %2%)' public_home_list_item: '[[%1%]](show_text=�fb9a&%1%\n&7☻ %3%\n&7ℹ %4% run_command=/huskhomes:phome %2%)' - home_is_public: '�fb9a&Publiczny' - home_is_private: 'ïe6f&Prywatny' + home_is_public: 'fff00&☀ Publiczny' + home_is_private: '&#ff9f0f&∅ Prywatny' warp_list_item: '[[%1%]](show_text=�fb9a&%1%\n&7ℹ %3% run_command=/huskhomes:warp %2%)' command_list_item: '[/%1%](#00fb9a show_text=&7Kliknij, aby sugerować komendę suggest_command=/%1%) [%2%](gray show_text=�fb9a&/%1%\n&7%3%)' list_item_divider: ' [•](gray) ' diff --git a/common/src/main/resources/locales/pt-br.yml b/common/src/main/resources/locales/pt-br.yml index ecc69519e..ca545bffb 100644 --- a/common/src/main/resources/locales/pt-br.yml +++ b/common/src/main/resources/locales/pt-br.yml @@ -66,8 +66,8 @@ locales: command_list_title: '[HuskHomes](#00fb9a bold) [| Lista de Comandos](#00fb9a)\n' home_list_item: '[[%1%]](show_text=�fb9a&%1%\n&7Status: %3%\n&7ℹ %4% run_command=/huskhomes:edithome %2%)' public_home_list_item: '[[%1%]](show_text=�fb9a&%1%\n&7☻ %3%\n&7ℹ %4% run_command=/huskhomes:phome %2%)' - home_is_public: '�fb9a&Pública' - home_is_private: 'ïe6f&Privada' + home_is_public: 'fff00&☀ Pública' + home_is_private: '&#ff9f0f&∅ Privada' warp_list_item: '[[%1%]](show_text=�fb9a&%1%\n&7ℹ %3% run_command=/huskhomes:warp %2%)' command_list_item: '[/%1%](#00fb9a show_text=&7Clique para sugerir comando suggest_command=/%1%) [%2%](gray show_text=�fb9a&/%1%\n&7%3%)' list_item_divider: ' [•](gray) ' diff --git a/common/src/main/resources/locales/ru-ru.yml b/common/src/main/resources/locales/ru-ru.yml index 081fbcaae..29e34f3bc 100644 --- a/common/src/main/resources/locales/ru-ru.yml +++ b/common/src/main/resources/locales/ru-ru.yml @@ -66,8 +66,8 @@ locales: command_list_title: '[HuskHomes](#00fb9a bold) [| Список команд](#00fb9a)\n' home_list_item: '[[%1%]](show_text=�fb9a&%1%\n&7Положение дел: %3%\n&7ℹ %4% run_command=/huskhomes:edithome %2%)' public_home_list_item: '[[%1%]](show_text=�fb9a&%1%\n&7☻ %3%\n&7ℹ %4% run_command=/huskhomes:phome %2%)' - home_is_public: '�fb9a&Общественный' - home_is_private: 'ïe6f&Частный' + home_is_public: 'fff00&☀ Общественный' + home_is_private: '&#ff9f0f&∅ Частный' warp_list_item: '[[%1%]](show_text=�fb9a&%1%\n&7ℹ %3% run_command=/huskhomes:warp %2%)' command_list_item: '[/%1%](#00fb9a show_text=&7Нажмите, чтобы предложить команду suggest_command=/%1%) [%2%](gray show_text=�fb9a&/%1%\n&7%3%)' list_item_divider: ' [•](gray) ' diff --git a/common/src/main/resources/locales/tr-tr.yml b/common/src/main/resources/locales/tr-tr.yml index 794ac1554..de27762d3 100644 --- a/common/src/main/resources/locales/tr-tr.yml +++ b/common/src/main/resources/locales/tr-tr.yml @@ -66,8 +66,8 @@ locales: command_list_title: '[HuskHomes](#00fb9a bold) [| Komut Listesi](#00fb9a)\n' home_list_item: '[[%1%]](show_text=�fb9a&%1%\n&7Durum: %3%\n&7ℹ %4% run_command=/huskhomes:edithome %2%)' public_home_list_item: '[[%1%]](show_text=�fb9a&%1%\n&7☻ %3%\n&7ℹ %4% run_command=/huskhomes:phome %2%)' - home_is_public: '�fb9a&Halk' - home_is_private: 'ïe6f&Özel' + home_is_public: 'fff00&☀ Halk' + home_is_private: '&#ff9f0f&∅ Özel' warp_list_item: '[[%1%]](show_text=�fb9a&%1%\n&7ℹ %3% run_command=/huskhomes:warp %2%)' command_list_item: '[/%1%](#00fb9a show_text=&7Komut önermek için tıklayın suggest_command=/%1%) [%2%](gray show_text=�fb9a&/%1%\n&7%3%)' list_item_divider: ' [•](gray) ' diff --git a/common/src/main/resources/locales/uk-ua.yml b/common/src/main/resources/locales/uk-ua.yml index 3b9af1981..16cb89f21 100644 --- a/common/src/main/resources/locales/uk-ua.yml +++ b/common/src/main/resources/locales/uk-ua.yml @@ -66,8 +66,8 @@ locales: command_list_title: '[HuskHomes](#00fb9a bold) [| Command List](#00fb9a)\n' home_list_item: '[[%1%]](show_text=�fb9a&%1%\n&7Статус: %3%\n&7ℹ %4% run_command=/huskhomes:edithome %2%)' public_home_list_item: '[[%1%]](show_text=�fb9a&%1%\n&7☻ %3%\n&7ℹ %4% run_command=/huskhomes:phome %2%)' - home_is_public: '�fb9a&Громадський' - home_is_private: 'ïe6f&Приватний' + home_is_public: 'fff00&☀ Громадський' + home_is_private: '&#ff9f0f&∅ Приватний' warp_list_item: '[[%1%]](show_text=�fb9a&%1%\n&7ℹ %3% run_command=/huskhomes:warp %2%)' command_list_item: '[/%1%](#00fb9a show_text=&7Click to suggest command suggest_command=/%1%) [%2%](gray show_text=�fb9a&/%1%\n&7%3%)' list_item_divider: ' [•](gray) ' diff --git a/common/src/main/resources/locales/vi-vn.yml b/common/src/main/resources/locales/vi-vn.yml index 978b408b8..b8bf0f310 100644 --- a/common/src/main/resources/locales/vi-vn.yml +++ b/common/src/main/resources/locales/vi-vn.yml @@ -66,8 +66,8 @@ locales: command_list_title: '[HuskHomes](#00fb9a bold) [| Danh sách Lệnh](#00fb9a)\n' home_list_item: '[[%1%]](show_text=�fb9a&%1%\n&7Trạng thái: %3%\n&7ℹ %4% run_command=/huskhomes:edithome %2%)' public_home_list_item: '[[%1%]](show_text=�fb9a&%1%\n&7☻ %3%\n&7ℹ %4% run_command=/huskhomes:phome %2%)' - home_is_public: '�fb9a&Public' - home_is_private: 'ïe6f&Private' + home_is_public: 'fff00&☀ Public' + home_is_private: '&#ff9f0f&∅ Private' warp_list_item: '[[%1%]](show_text=�fb9a&%1%\n&7ℹ %3% run_command=/huskhomes:warp %2%)' command_list_item: '[/%1%](#00fb9a show_text=&7Bấm để gợi ý lệnh suggest_command=/%1%) [%2%](gray show_text=�fb9a&/%1%\n&7%3%)' list_item_divider: ' [•](gray) ' diff --git a/common/src/main/resources/locales/zh-cn.yml b/common/src/main/resources/locales/zh-cn.yml index fcae944b3..f03c523bd 100644 --- a/common/src/main/resources/locales/zh-cn.yml +++ b/common/src/main/resources/locales/zh-cn.yml @@ -66,8 +66,8 @@ locales: command_list_title: '[HuskHomes](#00fb9a bold) [| 命令列表](#00fb9a)\n' home_list_item: '[[%1%]](show_text=�fb9a&%1%\n&7状态: %3%\n&7ℹ %4% run_command=/huskhomes:edithome %2%)' public_home_list_item: '[[%1%]](show_text=�fb9a&%1%\n&7☻ %3%\n&7ℹ %4% run_command=/huskhomes:phome %2%)' - home_is_public: '�fb9a&公共' - home_is_private: 'ïe6f&私有' + home_is_public: 'fff00&☀ 公共' + home_is_private: '&#ff9f0f&∅ 私有' warp_list_item: '[[%1%]](show_text=�fb9a&%1%\n&7ℹ %3% run_command=/huskhomes:warp %2%)' command_list_item: '[/%1%](#00fb9a show_text=&7点击使用命令 suggest_command=/%1%) [%2%](gray show_text=�fb9a&/%1%\n&7%3%)' list_item_divider: ' [•](gray) ' diff --git a/common/src/main/resources/locales/zh-tw.yml b/common/src/main/resources/locales/zh-tw.yml index 6dc905bb4..c6b476c52 100644 --- a/common/src/main/resources/locales/zh-tw.yml +++ b/common/src/main/resources/locales/zh-tw.yml @@ -66,8 +66,8 @@ locales: command_list_title: '[HuskHomes](#00fb9a bold) [| 指令列表](#00fb9a)\n' home_list_item: '[[%1%]](show_text=�fb9a&%1%\n&7隱私狀態: %3%\n&7ℹ %4% run_command=/huskhomes:edithome %2%)' public_home_list_item: '[[%1%]](show_text=�fb9a&%1%\n&7☻ %3%\n&7ℹ %4% run_command=/huskhomes:phome %2%)' - home_is_public: '�fb9a&公開' - home_is_private: 'ïe6f&私人的' + home_is_public: 'fff00&☀ 公開' + home_is_private: '&#ff9f0f&∅ 私人的' warp_list_item: '[[%1%]](show_text=�fb9a&%1%\n&7ℹ %3% run_command=/huskhomes:warp %2%)' command_list_item: '[/%1%](#00fb9a show_text=&7點擊使用指令 suggest_command=/%1%) [%2%](gray show_text=�fb9a&/%1%\n&7%3%)' list_item_divider: ' [•](gray) ' diff --git a/docs/FAQs.md b/docs/FAQs.md new file mode 100644 index 000000000..0b479ff3f --- /dev/null +++ b/docs/FAQs.md @@ -0,0 +1,9 @@ +This page addresses a number of frequently asked questions. + +## How do I make it so players always rejoin the last server they left from? +In other words, you'd like it so that when players disconnect from your proxy network, that when they reconnect they are put on the same server as the one they were on when they disconnected, rather than your lobby/fallback server. This feature isn't controlled by HuskHomes, but rather on your proxy. + +* On Velocity proxies: Install and configure [Yunfaremember](https://modrinth.com/plugin/yunfaremember). +* On BungeeCord proxies: Ensure `force_default_server` is disabled, and that your server is able to write the necessary player server cache file(s) to disk. + +If this isn't working, make sure you've not configured priority servers which can override this. \ No newline at end of file diff --git a/docs/Home.md b/docs/Home.md index 9184375b8..8a0281c6a 100644 --- a/docs/Home.md +++ b/docs/Home.md @@ -8,6 +8,7 @@ Welcome to the plugin documentation for HuskHomes v4.x+, the powerful & intuitiv * ⛔ [[Managing Access]] * 🖥️ [[Commands]] * 📜 [[Command Conflicts]] +* ❓ [[FAQs]] ## Documentation * 📁 [[Database]] diff --git a/docs/_Sidebar.md b/docs/_Sidebar.md index 93181a0d0..e3ff2c265 100644 --- a/docs/_Sidebar.md +++ b/docs/_Sidebar.md @@ -5,6 +5,7 @@ * ⛔ [[Managing Access]] * 🖥️ [[Commands]] * 📜 [[Command Conflicts]] +* ❓ [[FAQs]] ## Documentation * 📁 [[Database]] diff --git a/fabric/build.gradle b/fabric/build.gradle index 671e651df..198fc8c5a 100644 --- a/fabric/build.gradle +++ b/fabric/build.gradle @@ -6,6 +6,11 @@ apply plugin: 'fabric-loom' loom.serverOnlyMinecraftJar() repositories { + maven { + url 'https://s01.oss.sonatype.org/content/repositories/snapshots/' + mavenContent { snapshotsOnly() } + } + maven { url 'https://maven.impactdev.net/repository/development/' } maven { url 'https://maven.nucleoid.xyz/' } } @@ -33,7 +38,7 @@ dependencies { annotationProcessor 'org.projectlombok:lombok:1.18.34' - shadow project(path: ":common") + implementation project(path: ":common") } shadowJar { diff --git a/fabric/src/main/java/net/william278/huskhomes/FabricHuskHomes.java b/fabric/src/main/java/net/william278/huskhomes/FabricHuskHomes.java index d2ffb689b..9b90689f7 100644 --- a/fabric/src/main/java/net/william278/huskhomes/FabricHuskHomes.java +++ b/fabric/src/main/java/net/william278/huskhomes/FabricHuskHomes.java @@ -33,7 +33,7 @@ import net.fabricmc.loader.api.FabricLoader; import net.fabricmc.loader.api.ModContainer; import net.kyori.adventure.audience.Audience; -import net.kyori.adventure.platform.fabric.FabricServerAudiences; +import net.kyori.adventure.platform.modcommon.MinecraftServerAudiences; import net.minecraft.entity.Entity; import net.minecraft.registry.RegistryKey; import net.minecraft.registry.RegistryKeys; @@ -123,7 +123,7 @@ public class FabricHuskHomes implements DedicatedServerModInitializer, HuskHomes private Server server; @Nullable private Broker broker; - private FabricServerAudiences audiences; + private MinecraftServerAudiences audiences; @Override public void onInitializeServer() { @@ -145,7 +145,7 @@ public void onInitializeServer() { private void onEnable() { // Create adventure audience - this.audiences = FabricServerAudiences.of(minecraftServer); + this.audiences = MinecraftServerAudiences.of(minecraftServer); // Initialize the database final Database.Type type = getSettings().getDatabase().getType(); diff --git a/fabric/src/main/java/net/william278/huskhomes/user/FabricUser.java b/fabric/src/main/java/net/william278/huskhomes/user/FabricUser.java index a79cb891e..8c07675de 100644 --- a/fabric/src/main/java/net/william278/huskhomes/user/FabricUser.java +++ b/fabric/src/main/java/net/william278/huskhomes/user/FabricUser.java @@ -154,7 +154,7 @@ public void sendPluginMessage(byte[] message) { @Override public boolean isMoving() { - return player.isTouchingWater() || player.isFallFlying() || player.isSprinting() || player.isSneaking(); + return player.isTouchingWater() || player.isGliding() || player.isSprinting() || player.isSneaking(); } @Override diff --git a/gradle.properties b/gradle.properties index f8ef558f3..c935ddf6b 100644 --- a/gradle.properties +++ b/gradle.properties @@ -18,12 +18,12 @@ postgresql_driver_version=42.7.3 commons_pool_version=2.12.0 # Fabric settings -fabric_loom_version=1.7-SNAPSHOT -fabric_minecraft_version=1.21.1 -fabric_loader_version=0.16.2 -fabric_yarn_mappings=1.21.1+build.3 -fabric_api_version=0.102.1+1.21.1 -fabric_permissions_api_version=0.3.1 -adventure_platform_fabric_version=5.14.1 +fabric_loom_version=1.8-SNAPSHOT +fabric_minecraft_version=1.21.3 +fabric_loader_version=0.16.7 +fabric_yarn_mappings=1.21.3+build.2 +fabric_api_version=0.107.0+1.21.3 +fabric_permissions_api_version=0.3.2 +adventure_platform_fabric_version=6.1.0-SNAPSHOT fabric_impactor_api_version=5.2.4-SNAPSHOT -fabric_placeholder_api_version=2.4.1+1.21 \ No newline at end of file +fabric_placeholder_api_version=2.5.0+1.21.2 \ No newline at end of file diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index a4413138c..9355b4155 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.8-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.10-bin.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME diff --git a/gradlew b/gradlew index 1aa94a426..b740cf133 100755 --- a/gradlew +++ b/gradlew @@ -55,7 +55,7 @@ # Darwin, MinGW, and NonStop. # # (3) This script is generated from the Groovy template -# https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt +# https://github.com/gradle/gradle/blob/HEAD/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt # within the Gradle project. # # You can find Gradle at https://github.com/gradle/gradle/. diff --git a/paper/build.gradle b/paper/build.gradle index 336819fe9..d2c252e6e 100644 --- a/paper/build.gradle +++ b/paper/build.gradle @@ -45,7 +45,7 @@ shadowJar { tasks { runServer { - minecraftVersion('1.21.1') + minecraftVersion('1.21.3') downloadPlugins { url("https://download.luckperms.net/1554/bukkit/loader/LuckPerms-Bukkit-5.4.139.jar")