diff --git a/craftbukkit/src/main/java/cc/carm/lib/configuration/craft/builder/title/TitleConfigBuilder.java b/craftbukkit/src/main/java/cc/carm/lib/configuration/craft/builder/title/TitleConfigBuilder.java index e0b14a5..1997584 100644 --- a/craftbukkit/src/main/java/cc/carm/lib/configuration/craft/builder/title/TitleConfigBuilder.java +++ b/craftbukkit/src/main/java/cc/carm/lib/configuration/craft/builder/title/TitleConfigBuilder.java @@ -30,9 +30,9 @@ public class TitleConfigBuilder extends AbstractCraftBuilder paramFormatter; @@ -61,17 +61,17 @@ public class TitleConfigBuilder extends AbstractCraftBuilder placeholders, @Nullable TitleSendConsumer sendConsumer) { if (this.line1 == null && this.line2 == null) return; diff --git a/craftbukkit/src/main/java/cc/carm/lib/configuration/craft/function/TitleSendConsumer.java b/craftbukkit/src/main/java/cc/carm/lib/configuration/craft/function/TitleSendConsumer.java index e593966..4b2ac33 100644 --- a/craftbukkit/src/main/java/cc/carm/lib/configuration/craft/function/TitleSendConsumer.java +++ b/craftbukkit/src/main/java/cc/carm/lib/configuration/craft/function/TitleSendConsumer.java @@ -18,9 +18,9 @@ public interface TitleSendConsumer { * @param line2 第二行文字 */ void send(@NotNull Player player, - @Range(from = 0L, to = Integer.MAX_VALUE) long fadeIn, - @Range(from = 0L, to = Integer.MAX_VALUE) long stay, - @Range(from = 0L, to = Integer.MAX_VALUE) long fadeOut, + @Range(from = 0L, to = Integer.MAX_VALUE) int fadeIn, + @Range(from = 0L, to = Integer.MAX_VALUE) int stay, + @Range(from = 0L, to = Integer.MAX_VALUE) int fadeOut, @NotNull String line1, @NotNull String line2); } diff --git a/craftbukkit/src/main/java/cc/carm/lib/configuration/craft/value/ConfiguredItem.java b/craftbukkit/src/main/java/cc/carm/lib/configuration/craft/value/ConfiguredItem.java index 89c6748..7129ceb 100644 --- a/craftbukkit/src/main/java/cc/carm/lib/configuration/craft/value/ConfiguredItem.java +++ b/craftbukkit/src/main/java/cc/carm/lib/configuration/craft/value/ConfiguredItem.java @@ -56,10 +56,6 @@ public class ConfiguredItem extends ConfiguredSection { return getItem(player, amount, new HashMap<>()); } - public @Nullable ItemStack getItem(@Nullable Player player, @NotNull Object... values) { - return getItem(player, 1, values); - } - public @Nullable ItemStack getItem(@Nullable Player player, int amount, @NotNull Object... values) { return getItem(player, amount, ParamsUtils.buildParams(params, values)); } diff --git a/craftbukkit/src/main/java/cc/carm/lib/configuration/craft/value/ConfiguredTitle.java b/craftbukkit/src/main/java/cc/carm/lib/configuration/craft/value/ConfiguredTitle.java index dce1bfc..1ea96c9 100644 --- a/craftbukkit/src/main/java/cc/carm/lib/configuration/craft/value/ConfiguredTitle.java +++ b/craftbukkit/src/main/java/cc/carm/lib/configuration/craft/value/ConfiguredTitle.java @@ -29,22 +29,22 @@ public class ConfiguredTitle extends ConfiguredSection { } public static ConfiguredTitle of(@Nullable String line1, @Nullable String line2, - long fadeIn, long stay, long fadeOut) { + int fadeIn, int stay, int fadeOut) { return create().defaults(line1, line2).fadeIn(fadeIn).stay(stay).fadeOut(fadeOut).build(); } protected final @NotNull TitleSendConsumer sendConsumer; protected final @NotNull String[] params; - protected final long fadeIn; - protected final long stay; - protected final long fadeOut; + protected final int fadeIn; + protected final int stay; + protected final int fadeOut; public ConfiguredTitle(@Nullable ConfigurationProvider provider, @Nullable String sectionPath, @Nullable List headerComments, @Nullable String inlineComments, @Nullable TitleConfig defaultValue, @NotNull String[] params, @NotNull TitleSendConsumer sendConsumer, - long fadeIn, long stay, long fadeOut) { + int fadeIn, int stay, int fadeOut) { super(provider, sectionPath, headerComments, inlineComments, TitleConfig.class, defaultValue, getTitleParser(), TitleConfig::serialize); this.sendConsumer = sendConsumer; this.params = params; @@ -53,18 +53,18 @@ public class ConfiguredTitle extends ConfiguredSection { this.fadeOut = fadeOut; } - @Range(from = 0L, to = Long.MAX_VALUE) - public long getFadeInTicks() { + @Range(from = 0L, to = Integer.MAX_VALUE) + public int getFadeInTicks() { return fadeIn; } - @Range(from = 0L, to = Long.MAX_VALUE) - public long getStayTicks() { + @Range(from = 0L, to = Integer.MAX_VALUE) + public int getStayTicks() { return stay; } - @Range(from = 0L, to = Long.MAX_VALUE) - public long getFadeOutTicks() { + @Range(from = 0L, to = Integer.MAX_VALUE) + public int getFadeOutTicks() { return fadeOut; }