carm/MineConfiguration
1
Fork 0
mirror of https://github.com/CarmJos/MineConfiguration.git synced 2026-06-04 13:55:03 +08:00
Code Issues Releases Activity

feat(deps): Update with EasyConfiguration

Browse Source
This commit is contained in:
Carm Jos
2025-03-21 02:39:46 +08:00
parent c4010bb642
commit 051049eee2
3 changed files with 15 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/bukkit/src/main/java/cc/carm/lib/mineconfiguration/bukkit/value/item/ConfiguredItem.java
+13 -2
View File
@@ -8,6 +8,7 @@ import cc.carm.lib.configuration.source.section.ConfigureSection;
import cc.carm.lib.configuration.value.ValueManifest;
import cc.carm.lib.configuration.value.standard.ConfiguredValue;
import cc.carm.lib.configuration.value.text.function.ContentHandler;
import cc.carm.lib.easyplugin.utils.ColorParser;
import com.cryptomorin.xseries.XItemStack;
import org.bukkit.Material;
import org.bukkit.enchantments.Enchantment;
@@ -19,6 +20,7 @@ import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import java.util.*;
import java.util.function.BiFunction;
import java.util.function.Consumer;
import java.util.function.UnaryOperator;
@@ -37,12 +39,15 @@ public class ConfiguredItem extends ConfiguredValue<ItemStack> {
}
);
protected final @NotNull BiFunction<Player, String, String> parser;
protected final @NotNull UnaryOperator<String> paramBuilder;
protected final @NotNull String[] params;
public ConfiguredItem(@NotNull ValueManifest<ItemStack, ItemStack> manifest, ValueAdapter<ItemStack> adapter,
@NotNull BiFunction<Player, String, String> parser,
@NotNull UnaryOperator<String> paramBuilder, @NotNull String[] params) {
super(manifest, adapter);
this.parser = parser;
this.paramBuilder = paramBuilder;
this.params = params;
}
@@ -82,7 +87,7 @@ public class ConfiguredItem extends ConfiguredValue<ItemStack> {
}
public @NotNull PreparedItem prepare(@NotNull Object... values) {
return PreparedItem.of(player -> get()).params(params).placeholders(values);
return PreparedItem.of(player -> get()).parser(parser).params(params).placeholders(values);
}
public void modifyItem(Consumer<ItemStack> modifier) {
@@ -118,6 +123,7 @@ public class ConfiguredItem extends ConfiguredValue<ItemStack> {
protected @Nullable ItemStack item = null;
protected @NotNull String[] params = new String[0];
protected @NotNull BiFunction<Player, String, String> parser = (player, message) -> ColorParser.parse(message);
protected @NotNull UnaryOperator<String> paramFormatter = ContentHandler.DEFAULT_PARAM_BUILDER;
public Builder() {
@@ -186,6 +192,11 @@ public class ConfiguredItem extends ConfiguredValue<ItemStack> {
return defaultFlags(new LinkedHashSet<>(Arrays.asList(flags)));
}
public Builder parser(@NotNull BiFunction<Player, String, String> parser) {
this.parser = parser;
return self();
}
public Builder formatParam(@NotNull UnaryOperator<String> paramFormatter) {
this.paramFormatter = paramFormatter;
return self();
@@ -208,7 +219,7 @@ public class ConfiguredItem extends ConfiguredValue<ItemStack> {
@Override
public @NotNull ConfiguredItem build() {
return new ConfiguredItem(buildManifest(), ITEM_ADAPTER, paramFormatter, params);
return new ConfiguredItem(buildManifest(), ITEM_ADAPTER, parser, paramFormatter, params);
}
}
platform/bukkit/src/main/java/cc/carm/lib/mineconfiguration/bukkit/value/item/PreparedItem.java
+1 -1
View File
@@ -22,7 +22,7 @@ public class PreparedItem extends ItemModifier<PreparedItem, ItemStack> {
super(itemProvider);
}
public @Nullable ItemStack get(Player player) {
public @Nullable ItemStack get(@Nullable Player player) {
@Nullable ItemStack item = itemProvider.apply(player);
if (item == null) return null;