From f9eaa0891d897e17ed32990bb0d5530accc0e7ff Mon Sep 17 00:00:00 2001 From: XiaoMoMi Date: Tue, 30 Dec 2025 23:03:31 +0800 Subject: [PATCH] =?UTF-8?q?=E6=95=B0=E5=AD=97=E7=B1=BB=E5=9E=8B=E8=AF=AD?= =?UTF-8?q?=E8=A8=80=E6=96=87=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- common-files/src/main/resources/translations/en.yml | 7 +++++++ .../core/plugin/context/number/GaussianNumberProvider.java | 3 ++- .../plugin/context/number/LogNormalNumberProvider.java | 4 ++-- .../plugin/context/number/SkewNormalNumberProvider.java | 4 ++-- 4 files changed, 13 insertions(+), 5 deletions(-) diff --git a/common-files/src/main/resources/translations/en.yml b/common-files/src/main/resources/translations/en.yml index 96f1ed3ab..35fc62070 100644 --- a/common-files/src/main/resources/translations/en.yml +++ b/common-files/src/main/resources/translations/en.yml @@ -153,6 +153,13 @@ warning.config.number.gaussian.missing_min: "Issue found in file warning.config.number.gaussian.missing_max: "Issue found in file - The config '' is missing the required 'max' argument for 'gaussian' number." warning.config.number.binomial.missing_extra: "Issue found in file - The config '' is missing the required 'extra' argument for 'binomial' number." warning.config.number.binomial.missing_probability: "Issue found in file - The config '' is missing the required 'probability' argument for 'binomial' number." +warning.config.number.log_normal.missing_min: "Issue found in file - The config '' is missing the required 'min' argument for 'log_normal' number." +warning.config.number.log_normal.missing_max: "Issue found in file - The config '' is missing the required 'max' argument for 'log_normal' number." +warning.config.number.skew_normal.missing_min: "Issue found in file - The config '' is missing the required 'min' argument for 'skew_normal' number." +warning.config.number.skew_normal.missing_max: "Issue found in file - The config '' is missing the required 'max' argument for 'skew_normal' number." +warning.config.number.triangle.missing_min: "Issue found in file - The config '' is missing the required 'min' argument for 'triangle' number." +warning.config.number.triangle.missing_max: "Issue found in file - The config '' is missing the required 'max' argument for 'triangle' number." +warning.config.number.exponential.missing_lambda: "Issue found in file - The config '' is missing the required 'lambda' argument for 'exponential' number." warning.config.condition.all_of.missing_terms: "Issue found in file - The config '' is missing the required 'terms' argument for 'all_of' condition." warning.config.condition.all_of.invalid_terms_type: "Issue found in file - The config '' has a misconfigured 'all_of' condition, 'terms' should be a map list, current type: ''." warning.config.condition.any_of.missing_terms: "Issue found in file - The config '' is missing the required 'terms' argument for 'any_of' condition." diff --git a/core/src/main/java/net/momirealms/craftengine/core/plugin/context/number/GaussianNumberProvider.java b/core/src/main/java/net/momirealms/craftengine/core/plugin/context/number/GaussianNumberProvider.java index 1aa700f68..b42ef5c0e 100644 --- a/core/src/main/java/net/momirealms/craftengine/core/plugin/context/number/GaussianNumberProvider.java +++ b/core/src/main/java/net/momirealms/craftengine/core/plugin/context/number/GaussianNumberProvider.java @@ -3,6 +3,7 @@ package net.momirealms.craftengine.core.plugin.context.number; import net.momirealms.craftengine.core.plugin.context.Context; import net.momirealms.craftengine.core.util.MiscUtils; import net.momirealms.craftengine.core.util.ResourceConfigUtils; +import org.jetbrains.annotations.NotNull; import java.util.Map; import java.util.Random; @@ -65,7 +66,7 @@ public record GaussianNumberProvider(double min, double max, double mean, double } @Override - public String toString() { + public @NotNull String toString() { return String.format("GaussianNumberProvider{min=%.2f, max=%.2f, mean=%.2f, stdDev=%.2f, maxAttempts=%d}", min, max, mean, stdDev, maxAttempts); } diff --git a/core/src/main/java/net/momirealms/craftengine/core/plugin/context/number/LogNormalNumberProvider.java b/core/src/main/java/net/momirealms/craftengine/core/plugin/context/number/LogNormalNumberProvider.java index f79214f48..e37f6426c 100644 --- a/core/src/main/java/net/momirealms/craftengine/core/plugin/context/number/LogNormalNumberProvider.java +++ b/core/src/main/java/net/momirealms/craftengine/core/plugin/context/number/LogNormalNumberProvider.java @@ -128,11 +128,11 @@ public record LogNormalNumberProvider( public LogNormalNumberProvider create(Map arguments) { double rawMin = ResourceConfigUtils.getAsDouble( ResourceConfigUtils.requireNonNullOrThrow(arguments.get("min"), - "warning.config.number.log-normal.missing_min"), "min"); + "warning.config.number.log_normal.missing_min"), "min"); double max = ResourceConfigUtils.getAsDouble( ResourceConfigUtils.requireNonNullOrThrow(arguments.get("max"), - "warning.config.number.log-normal.missing_max"), "max"); + "warning.config.number.log_normal.missing_max"), "max"); // 自动修正 min <= 0 的情况，防止 Log(0) 崩溃 // 如果用户配置 min=0，我们将其修正为一个极小的正数 diff --git a/core/src/main/java/net/momirealms/craftengine/core/plugin/context/number/SkewNormalNumberProvider.java b/core/src/main/java/net/momirealms/craftengine/core/plugin/context/number/SkewNormalNumberProvider.java index 022f6003d..dce536d59 100644 --- a/core/src/main/java/net/momirealms/craftengine/core/plugin/context/number/SkewNormalNumberProvider.java +++ b/core/src/main/java/net/momirealms/craftengine/core/plugin/context/number/SkewNormalNumberProvider.java @@ -171,11 +171,11 @@ public final class SkewNormalNumberProvider implements NumberProvider { public SkewNormalNumberProvider create(Map arguments) { double min = ResourceConfigUtils.getAsDouble( ResourceConfigUtils.requireNonNullOrThrow(arguments.get("min"), - "warning.config.number.skewed.missing_min"), "min"); + "warning.config.number.skew_normal.missing_min"), "min"); double max = ResourceConfigUtils.getAsDouble( ResourceConfigUtils.requireNonNullOrThrow(arguments.get("max"), - "warning.config.number.skewed.missing_max"), "max"); + "warning.config.number.skew_normal.missing_max"), "max"); double defaultMean = (min + max) / 2.0; double mean = ResourceConfigUtils.getAsDouble(