Compare commits

...

5 Commits

Author SHA1 Message Date
KingRainbow44
f9d46ace7f
misc(gradle): Update plugin versions 2024-07-06 23:09:12 -04:00
github-actions
36346f87f9 Update languages [skip actions] 2024-07-07 03:04:15 +00:00
KingRainbow44
ea84789c47
Merge remote-tracking branch 'origin/unstable' into unstable 2024-07-06 23:04:06 -04:00
KingRainbow44
85719b9aeb
fix(ci): Upgrade GitHub Actions to Java 21 2024-07-06 23:02:44 -04:00
KingRainbow44
e5b3d65916
fix(lang): Add language key for password crypto failure
this was copilot generated lmfao
2024-07-06 23:01:18 -04:00
14 changed files with 27 additions and 16 deletions

View File

@ -25,7 +25,7 @@ jobs:
uses: actions/setup-java@v3 uses: actions/setup-java@v3
with: with:
distribution: temurin distribution: temurin
java-version: '17' java-version: '21'
- name: Cache gradle files - name: Cache gradle files
uses: actions/cache@v2 uses: actions/cache@v2
with: with:

View File

@ -26,7 +26,7 @@ jobs:
uses: actions/setup-java@v3 uses: actions/setup-java@v3
with: with:
distribution: temurin distribution: temurin
java-version: '17' java-version: '21'
- name: Cache gradle files - name: Cache gradle files
uses: actions/cache@v2 uses: actions/cache@v2
with: with:

View File

@ -23,7 +23,7 @@ plugins {
id 'java-library' // Apply the java-library plugin for API and implementation separation. id 'java-library' // Apply the java-library plugin for API and implementation separation.
id 'application' // Apply the application plugin to add support for building a CLI application id 'application' // Apply the application plugin to add support for building a CLI application
id 'com.google.protobuf' version '0.8.18' // Apply the protobuf auto generator id 'com.google.protobuf' version '0.8.18' // Apply the protobuf auto generator
id 'com.diffplug.spotless' version '6.11.0' // Apply the Spotless linter plugin. id 'com.diffplug.spotless' version '6.25.0' // Apply the Spotless linter plugin.
id 'eclipse' // Eclipse Support id 'eclipse' // Eclipse Support
id 'idea' // IntelliJ Support id 'idea' // IntelliJ Support
@ -31,7 +31,7 @@ plugins {
id 'maven-publish' // Support for publishing to Maven repositories. id 'maven-publish' // Support for publishing to Maven repositories.
id 'signing' // Support for signing build artifacts. id 'signing' // Support for signing build artifacts.
id 'io.freefair.lombok' version '6.6.1' // Lombok for delombok'ification id 'io.freefair.lombok' version '8.6' // Lombok for delombok'ification
} }
spotless { spotless {
@ -43,7 +43,7 @@ spotless {
} }
importOrder('io.grasscutter', '', 'java', 'javax', '\\#java', '\\#') // Configure import order. importOrder('io.grasscutter', '', 'java', 'javax', '\\#java', '\\#') // Configure import order.
googleJavaFormat('1.15.0') // Use Google's Java formatter. googleJavaFormat('1.17.0') // Use Google's Java formatter.
formatAnnotations() // Reformat annotations. formatAnnotations() // Reformat annotations.
endWithNewline() // Ensure files end with a newline. endWithNewline() // Ensure files end with a newline.
indentWithTabs(2); indentWithSpaces(4) // Use 4 spaces for indentation. indentWithTabs(2); indentWithSpaces(4) // Use 4 spaces for indentation.

View File

@ -44,7 +44,8 @@
"password_error": "Invalid Password", "password_error": "Invalid Password",
"password_length_error": "Password length must be greater then or equal to 8", "password_length_error": "Password length must be greater then or equal to 8",
"password_storage_error": "You don't have a password for your account. Please contact an administrator.", "password_storage_error": "You don't have a password for your account. Please contact an administrator.",
"server_max_player_limit": "The number of online players has reached the limit" "server_max_player_limit": "The number of online players has reached the limit",
"password_crypto_error": "Unable to decrypt the client's given password. Are you using the right version of the game?"
}, },
"router_error": "[Dispatch] Unable to attach router." "router_error": "[Dispatch] Unable to attach router."
}, },

View File

@ -44,7 +44,8 @@
"password_error": "Contraseña no válida", "password_error": "Contraseña no válida",
"password_length_error": "La longitud de la contraseña debe ser mayor o igual a 8", "password_length_error": "La longitud de la contraseña debe ser mayor o igual a 8",
"password_storage_error": "No tienes contraseña para tu cuenta. Por favor contacta a un administrador.", "password_storage_error": "No tienes contraseña para tu cuenta. Por favor contacta a un administrador.",
"server_max_player_limit": "Se ha alcanzado el límite de jugadores activos" "server_max_player_limit": "Se ha alcanzado el límite de jugadores activos",
"password_crypto_error": "🇺🇸Unable to decrypt the client's given password. Are you using the right version of the game?"
}, },
"router_error": "[Dispatch] No se ha podido vincular el router." "router_error": "[Dispatch] No se ha podido vincular el router."
}, },

View File

@ -44,7 +44,8 @@
"password_error": "Mot de passe invalide", "password_error": "Mot de passe invalide",
"password_length_error": "La longueur du mot de passe doit être supérieure a 8", "password_length_error": "La longueur du mot de passe doit être supérieure a 8",
"password_storage_error": "Vous n'avez pas de mot de passe pour votre compte. Veuillez contacter un administrateur.", "password_storage_error": "Vous n'avez pas de mot de passe pour votre compte. Veuillez contacter un administrateur.",
"server_max_player_limit": "Le nombre de joueurs maximum est atteint." "server_max_player_limit": "Le nombre de joueurs maximum est atteint.",
"password_crypto_error": "🇺🇸Unable to decrypt the client's given password. Are you using the right version of the game?"
}, },
"router_error": "[Dispatch] Impossible d'attacher le routeur." "router_error": "[Dispatch] Impossible d'attacher le routeur."
}, },

View File

@ -44,7 +44,8 @@
"password_error": "Password non valida", "password_error": "Password non valida",
"password_length_error": "La lunghezza della password deve essere maggiore o uguale a 8", "password_length_error": "La lunghezza della password deve essere maggiore o uguale a 8",
"password_storage_error": "Non hai una password per il tuo account. Contatta un amministratore.", "password_storage_error": "Non hai una password per il tuo account. Contatta un amministratore.",
"server_max_player_limit": "Il numero di giocatori online ha raggiunto il limite" "server_max_player_limit": "Il numero di giocatori online ha raggiunto il limite",
"password_crypto_error": "🇺🇸Unable to decrypt the client's given password. Are you using the right version of the game?"
}, },
"router_error": "[Dispatch] Impossibile collegare il router." "router_error": "[Dispatch] Impossibile collegare il router."
}, },

View File

@ -44,7 +44,8 @@
"password_error": "無効なパスワード", "password_error": "無効なパスワード",
"password_length_error": "パスワードの長さは8文字以上でなければなりません", "password_length_error": "パスワードの長さは8文字以上でなければなりません",
"password_storage_error": "アカウントのパスワードがありません。 管理者に連絡してください。", "password_storage_error": "アカウントのパスワードがありません。 管理者に連絡してください。",
"server_max_player_limit": "オンライン プレイヤーの数が上限に達しました" "server_max_player_limit": "オンライン プレイヤーの数が上限に達しました",
"password_crypto_error": "🇺🇸Unable to decrypt the client's given password. Are you using the right version of the game?"
}, },
"router_error": "[Dispatch] ルーターを接続できません。" "router_error": "[Dispatch] ルーターを接続できません。"
}, },

View File

@ -44,7 +44,8 @@
"password_error": "암호가 올바르지 않습니다", "password_error": "암호가 올바르지 않습니다",
"password_length_error": "암호의 길이는 8자리보다 크거나 같아야합니다.", "password_length_error": "암호의 길이는 8자리보다 크거나 같아야합니다.",
"password_storage_error": "계정에 암호가 없습니다. 관리자에게 문의하십시오.", "password_storage_error": "계정에 암호가 없습니다. 관리자에게 문의하십시오.",
"server_max_player_limit": "온라인 플레이어 수가 최대에 도달했습니다." "server_max_player_limit": "온라인 플레이어 수가 최대에 도달했습니다.",
"password_crypto_error": "🇺🇸Unable to decrypt the client's given password. Are you using the right version of the game?"
}, },
"router_error": "[Dispatch] 라우터에 연결할 수 없습니다." "router_error": "[Dispatch] 라우터에 연결할 수 없습니다."
}, },

View File

@ -44,7 +44,8 @@
"password_error": "Nieprawidłowe hasło", "password_error": "Nieprawidłowe hasło",
"password_length_error": "Długość hasła musi być większa niż równa 8 znaków", "password_length_error": "Długość hasła musi być większa niż równa 8 znaków",
"password_storage_error": "Nie posiadasz hasła do tego konta. Proszę skontaktować się z Administratorem.", "password_storage_error": "Nie posiadasz hasła do tego konta. Proszę skontaktować się z Administratorem.",
"server_max_player_limit": "Liczba graczy online osiągnęła swój limit." "server_max_player_limit": "Liczba graczy online osiągnęła swój limit.",
"password_crypto_error": "🇺🇸Unable to decrypt the client's given password. Are you using the right version of the game?"
}, },
"router_error": "[Dispatch] Wystąpił błąd podczas tworzenia routera." "router_error": "[Dispatch] Wystąpił błąd podczas tworzenia routera."
}, },

View File

@ -44,7 +44,8 @@
"password_error": "🇺🇸Invalid Password", "password_error": "🇺🇸Invalid Password",
"password_length_error": "🇺🇸Password length must be greater then or equal to 8", "password_length_error": "🇺🇸Password length must be greater then or equal to 8",
"password_storage_error": "🇺🇸You don't have a password for your account. Please contact an administrator.", "password_storage_error": "🇺🇸You don't have a password for your account. Please contact an administrator.",
"server_max_player_limit": "Numărul de jucători online a ajuns la limită." "server_max_player_limit": "Numărul de jucători online a ajuns la limită.",
"password_crypto_error": "🇺🇸Unable to decrypt the client's given password. Are you using the right version of the game?"
}, },
"router_error": "[Dispatch] Nu se poate atașa routerul." "router_error": "[Dispatch] Nu se poate atașa routerul."
}, },

View File

@ -44,7 +44,8 @@
"password_error": "Некорректный пароль", "password_error": "Некорректный пароль",
"password_length_error": "Длина пароля должна быть не менее 8 символов", "password_length_error": "Длина пароля должна быть не менее 8 символов",
"password_storage_error": "У вашего аккаунта отсутствует пароль. Свяжитесь с администратором.", "password_storage_error": "У вашего аккаунта отсутствует пароль. Свяжитесь с администратором.",
"server_max_player_limit": "Число игроков в сети достигло предела" "server_max_player_limit": "Число игроков в сети достигло предела",
"password_crypto_error": "🇺🇸Unable to decrypt the client's given password. Are you using the right version of the game?"
}, },
"router_error": "[Dispatch] Не удалось присоединить маршрутизатор." "router_error": "[Dispatch] Не удалось присоединить маршрутизатор."
}, },

View File

@ -44,7 +44,8 @@
"password_error": "登录失败,请确认账号/密码是否正确", "password_error": "登录失败,请确认账号/密码是否正确",
"password_length_error": "密码必须大于或等于 8 位", "password_length_error": "密码必须大于或等于 8 位",
"password_storage_error": "你没有密码,请联系管理员", "password_storage_error": "你没有密码,请联系管理员",
"server_max_player_limit": "服务器在线人数已满" "server_max_player_limit": "服务器在线人数已满",
"password_crypto_error": "🇺🇸Unable to decrypt the client's given password. Are you using the right version of the game?"
}, },
"router_error": "[Dispatch] 无法连接路由" "router_error": "[Dispatch] 无法连接路由"
}, },

View File

@ -44,7 +44,8 @@
"password_error": "密碼無效", "password_error": "密碼無效",
"password_length_error": "密碼長度必須大於或等於 8", "password_length_error": "密碼長度必須大於或等於 8",
"password_storage_error": "您的帳號沒有設定密碼,請聯繫管理員。", "password_storage_error": "您的帳號沒有設定密碼,請聯繫管理員。",
"server_max_player_limit": "伺服器線上人數已滿" "server_max_player_limit": "伺服器線上人數已滿",
"password_crypto_error": "🇺🇸Unable to decrypt the client's given password. Are you using the right version of the game?"
}, },
"router_error": "[Dispatch] 無法附加路由。" "router_error": "[Dispatch] 無法附加路由。"
}, },