diff --git a/bukkit/loader/src/main/resources/translations/en.yml b/bukkit/loader/src/main/resources/translations/en.yml
index e853d70f7..a7c5bbf3e 100644
--- a/bukkit/loader/src/main/resources/translations/en.yml
+++ b/bukkit/loader/src/main/resources/translations/en.yml
@@ -61,7 +61,7 @@ command.resource.disable.failure.unknown: "Unknown resource "
command.resource.list: "Enabled resources(): Disabled resources(): "
command.upload.failure.not_supported: "Current hosting method '' doesn't support uploading resource packs."
command.upload.on_progress: "Started uploading progress. Check the console for more information."
-command.send_resource_pack.success: "Send resource pack completed"
+command.send_resource_pack.success: "Send resource packs to players"
warning.config.image.duplicated: "Issue found in file - Duplicated image ''."
warning.config.image.lack_height: "Issue found in file - The image '' is missing the required 'height' argument."
warning.config.image.height_smaller_than_ascent: "Issue found in file - The image '' violates the bitmap image rule: 'height' should be no lower than 'ascent'."
diff --git a/bukkit/loader/src/main/resources/translations/zh_cn.yml b/bukkit/loader/src/main/resources/translations/zh_cn.yml
index 58f7a89aa..0bc743c37 100644
--- a/bukkit/loader/src/main/resources/translations/zh_cn.yml
+++ b/bukkit/loader/src/main/resources/translations/zh_cn.yml
@@ -61,7 +61,7 @@ command.resource.disable.failure.unknown: "未知资源 "
command.resource.list: "启用的资源(): 禁用的资源(): "
command.upload.failure.not_supported: "当前托管模式 '' 不支持上传资源包."
command.upload.on_progress: "已开始上传进程. 检查控制台以获取详细信息."
-command.send_resource_pack.success: "发送资源包完成"
+command.send_resource_pack.success: "发送资源包给 个玩家"
warning.config.image.duplicated: "在文件 中发现问题 - 图片 '' 重复定义"
warning.config.image.lack_height: "在文件 中发现问题 - 图片 '' 缺少必要的 'height' 高度参数"
warning.config.image.height_smaller_than_ascent: "在文件 中发现问题 - 图片 '' 违反位图规则:'height' 高度值不应小于 'ascent' 基准线高度"
diff --git a/bukkit/src/main/java/net/momirealms/craftengine/bukkit/plugin/command/feature/SendResourcePackCommand.java b/bukkit/src/main/java/net/momirealms/craftengine/bukkit/plugin/command/feature/SendResourcePackCommand.java
index 4f8db290a..149e10702 100644
--- a/bukkit/src/main/java/net/momirealms/craftengine/bukkit/plugin/command/feature/SendResourcePackCommand.java
+++ b/bukkit/src/main/java/net/momirealms/craftengine/bukkit/plugin/command/feature/SendResourcePackCommand.java
@@ -1,5 +1,6 @@
package net.momirealms.craftengine.bukkit.plugin.command.feature;
+import net.kyori.adventure.text.Component;
import net.momirealms.craftengine.bukkit.plugin.BukkitCraftEngine;
import net.momirealms.craftengine.bukkit.plugin.command.BukkitCommandFeature;
import net.momirealms.craftengine.bukkit.plugin.user.BukkitServerPlayer;
@@ -35,7 +36,7 @@ public class SendResourcePackCommand extends BukkitCommandFeature
if (bukkitServerPlayer == null) continue;
BukkitCraftEngine.instance().packManager().sendResourcePack(bukkitServerPlayer);
}
- handleFeedback(context, MessageConstants.COMMAND_SEND_RESOURCE_PACK_SUCCESS);
+ handleFeedback(context, MessageConstants.COMMAND_SEND_RESOURCE_PACK_SUCCESS, Component.text(players.size()));
});
}
diff --git a/core/src/main/java/net/momirealms/craftengine/core/pack/host/impl/AlistHost.java b/core/src/main/java/net/momirealms/craftengine/core/pack/host/impl/AlistHost.java
index 106e294ae..615cd4f05 100644
--- a/core/src/main/java/net/momirealms/craftengine/core/pack/host/impl/AlistHost.java
+++ b/core/src/main/java/net/momirealms/craftengine/core/pack/host/impl/AlistHost.java
@@ -290,23 +290,20 @@ public class AlistHost implements ResourcePackHost {
@Override
public ResourcePackHost create(Map arguments) {
- boolean useEnv = (boolean) arguments.getOrDefault("use-env", false);
+ boolean useEnv = (boolean) arguments.getOrDefault("use-environment-variables", false);
String apiUrl = (String) arguments.get("api-url");
if (apiUrl == null || apiUrl.isEmpty()) {
throw new IllegalArgumentException("'api-url' cannot be empty for Alist host");
}
- String userName = (String) arguments.get("username");
- if (useEnv) userName = System.getenv("CE_ALIST_USERNAME");
+ String userName = useEnv ? System.getenv("CE_ALIST_USERNAME") : (String) arguments.get("username");
if (userName == null || userName.isEmpty()) {
throw new IllegalArgumentException("'username' cannot be empty for Alist host");
}
- String password = (String) arguments.get("password");
- if (useEnv) password = System.getenv("CE_ALIST_PASSWORD");
+ String password = useEnv ? System.getenv("CE_ALIST_PASSWORD") : (String) arguments.get("password");
if (password == null || password.isEmpty()) {
throw new IllegalArgumentException("'password' cannot be empty for Alist host");
}
- String filePassword = (String) arguments.getOrDefault("file-password", "");
- if (useEnv) filePassword = System.getenv("CE_ALIST_FILE_PASSWORD");
+ String filePassword = useEnv ? System.getenv("CE_ALIST_FILE_PASSWORD") : (String) arguments.getOrDefault("file-password", "");
String otpCode = (String) arguments.get("otp-code");
Duration jwtTokenExpiration = Duration.ofHours((int) arguments.getOrDefault("jwt-token-expiration", 48));
String uploadPath = (String) arguments.get("upload-path");
diff --git a/core/src/main/java/net/momirealms/craftengine/core/pack/host/impl/DropboxHost.java b/core/src/main/java/net/momirealms/craftengine/core/pack/host/impl/DropboxHost.java
index 20f8bd4e7..814244b9b 100644
--- a/core/src/main/java/net/momirealms/craftengine/core/pack/host/impl/DropboxHost.java
+++ b/core/src/main/java/net/momirealms/craftengine/core/pack/host/impl/DropboxHost.java
@@ -250,19 +250,16 @@ public class DropboxHost implements ResourcePackHost {
public static class Factory implements ResourcePackHostFactory {
@Override
public ResourcePackHost create(Map arguments) {
- boolean useEnv = (boolean) arguments.getOrDefault("use-env", false);
- String appKey = (String) arguments.get("app-key");
- if (useEnv) appKey = System.getenv("CE_DROPBOX_APP_KEY");
+ boolean useEnv = (boolean) arguments.getOrDefault("use-environment-variables", false);
+ String appKey = useEnv ? System.getenv("CE_DROPBOX_APP_KEY") : (String) arguments.get("app-key");
if (appKey == null || appKey.isEmpty()) {
throw new IllegalArgumentException("Missing required 'app-key' configuration");
}
- String appSecret = (String) arguments.get("app-secret");
- if (useEnv) appSecret = System.getenv("CE_DROPBOX_APP_SECRET");
+ String appSecret = useEnv ? System.getenv("CE_DROPBOX_APP_SECRET") : (String) arguments.get("app-secret");
if (appSecret == null || appSecret.isEmpty()) {
throw new IllegalArgumentException("Missing required 'app-secret' configuration");
}
- String refreshToken = (String) arguments.get("refresh-token");
- if (useEnv) refreshToken = System.getenv("CE_DROPBOX_REFRESH_TOKEN");
+ String refreshToken = useEnv ? System.getenv("CE_DROPBOX_REFRESH_TOKEN") : (String) arguments.get("refresh-token");
if (refreshToken == null || refreshToken.isEmpty()) {
throw new IllegalArgumentException("Missing required 'refresh-token' configuration");
}
diff --git a/core/src/main/java/net/momirealms/craftengine/core/pack/host/impl/LobFileHost.java b/core/src/main/java/net/momirealms/craftengine/core/pack/host/impl/LobFileHost.java
index f68c3dccb..116eac469 100644
--- a/core/src/main/java/net/momirealms/craftengine/core/pack/host/impl/LobFileHost.java
+++ b/core/src/main/java/net/momirealms/craftengine/core/pack/host/impl/LobFileHost.java
@@ -270,9 +270,8 @@ public class LobFileHost implements ResourcePackHost {
@Override
public ResourcePackHost create(Map arguments) {
- boolean useEnv = (boolean) arguments.getOrDefault("use-env", false);
- String apiKey = (String) arguments.get("api-key");
- if (useEnv) apiKey = System.getenv("CE_LOBFILE_API_KEY");
+ boolean useEnv = (boolean) arguments.getOrDefault("use-environment-variables", false);
+ String apiKey = useEnv ? System.getenv("CE_LOBFILE_API_KEY") : (String) arguments.get("api-key");
if (apiKey == null || apiKey.isEmpty()) {
throw new RuntimeException("Missing 'api-key' for LobFileHost");
}
diff --git a/core/src/main/java/net/momirealms/craftengine/core/pack/host/impl/OneDriveHost.java b/core/src/main/java/net/momirealms/craftengine/core/pack/host/impl/OneDriveHost.java
index 521058e40..3ef7e3002 100644
--- a/core/src/main/java/net/momirealms/craftengine/core/pack/host/impl/OneDriveHost.java
+++ b/core/src/main/java/net/momirealms/craftengine/core/pack/host/impl/OneDriveHost.java
@@ -230,19 +230,16 @@ public class OneDriveHost implements ResourcePackHost {
@Override
public ResourcePackHost create(Map arguments) {
- boolean useEnv = (boolean) arguments.getOrDefault("use-env", false);
- String clientId = (String) arguments.get("client-id");
- if (useEnv) clientId = System.getenv("CE_ONEDRIVE_CLIENT_ID");
+ boolean useEnv = (boolean) arguments.getOrDefault("use-environment-variables", false);
+ String clientId = useEnv ? System.getenv("CE_ONEDRIVE_CLIENT_ID") : (String) arguments.get("client-id");
if (clientId == null || clientId.isEmpty()) {
throw new IllegalArgumentException("Missing required 'client-id' configuration");
}
- String clientSecret = (String) arguments.get("client-secret");
- if (useEnv) clientSecret = System.getenv("CE_ONEDRIVE_CLIENT_SECRET");
+ String clientSecret = useEnv ? System.getenv("CE_ONEDRIVE_CLIENT_SECRET") : (String) arguments.get("client-secret");
if (clientSecret == null || clientSecret.isEmpty()) {
throw new IllegalArgumentException("Missing required 'client-secret' configuration");
}
- String refreshToken = (String) arguments.get("refresh-token");
- if (useEnv) refreshToken = System.getenv("CE_ONEDRIVE_REFRESH_TOKEN");
+ String refreshToken = useEnv ? System.getenv("CE_ONEDRIVE_REFRESH_TOKEN") : (String) arguments.get("refresh-token");
if (refreshToken == null || refreshToken.isEmpty()) {
throw new IllegalArgumentException("Missing required 'refresh-token' configuration");
}
diff --git a/core/src/main/java/net/momirealms/craftengine/core/pack/host/impl/S3Host.java b/core/src/main/java/net/momirealms/craftengine/core/pack/host/impl/S3Host.java
index 473a97bf6..8c2137e2a 100644
--- a/core/src/main/java/net/momirealms/craftengine/core/pack/host/impl/S3Host.java
+++ b/core/src/main/java/net/momirealms/craftengine/core/pack/host/impl/S3Host.java
@@ -156,7 +156,7 @@ public class S3Host implements ResourcePackHost {
@Override
@SuppressWarnings("deprecation")
public ResourcePackHost create(Map arguments) {
- boolean useEnv = (boolean) arguments.getOrDefault("use-env", false);
+ boolean useEnv = (boolean) arguments.getOrDefault("use-environment-variables", false);
String endpoint = (String) arguments.get("endpoint");
if (endpoint == null || endpoint.isEmpty()) {
throw new IllegalArgumentException("'endpoint' cannot be empty for S3 host");
@@ -168,13 +168,11 @@ public class S3Host implements ResourcePackHost {
throw new IllegalArgumentException("'bucket' cannot be empty for S3 host");
}
String region = (String) arguments.getOrDefault("region", "auto");
- String accessKeyId = (String) arguments.get("access-key-id");
- if (useEnv) accessKeyId = System.getenv("CE_S3_ACCESS_KEY_ID");
+ String accessKeyId = useEnv ? System.getenv("CE_S3_ACCESS_KEY_ID") : (String) arguments.get("access-key-id");
if (accessKeyId == null || accessKeyId.isEmpty()) {
throw new IllegalArgumentException("'access-key-id' cannot be empty for S3 host");
}
- String accessKeySecret = (String) arguments.get("access-key-secret");
- if (useEnv) accessKeySecret = System.getenv("CE_S3_ACCESS_KEY_SECRET");
+ String accessKeySecret = useEnv ? System.getenv("CE_S3_ACCESS_KEY_SECRET") : (String) arguments.get("access-key-secret");
if (accessKeySecret == null || accessKeySecret.isEmpty()) {
throw new IllegalArgumentException("'access-key-secret' cannot be empty for S3 host");
}