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 03:39:46 +08:00
parent 051049eee2
commit e44e74a512
8 changed files with 10 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files
common/pom.xml
+1 -1
View File
@@ -5,7 +5,7 @@
<parent> <parent>
<artifactId>mineconfiguration-parent</artifactId> <artifactId>mineconfiguration-parent</artifactId>
<groupId>cc.carm.lib</groupId> <groupId>cc.carm.lib</groupId>
<version>3.1.0</version> <version>3.1.1</version>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<properties> <properties>
platform/bukkit/pom.xml
+1 -1
View File
@@ -5,7 +5,7 @@
<parent> <parent>
<artifactId>mineconfiguration-parent</artifactId> <artifactId>mineconfiguration-parent</artifactId>
<groupId>cc.carm.lib</groupId> <groupId>cc.carm.lib</groupId>
<version>3.1.0</version> <version>3.1.1</version>
<relativePath>../../pom.xml</relativePath> <relativePath>../../pom.xml</relativePath>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
platform/bukkit/src/main/java/cc/carm/lib/mineconfiguration/bukkit/value/ConfiguredMessage.java
+1 -1
View File
@@ -46,7 +46,7 @@ public class ConfiguredMessage<M> extends ConfiguredText<M, CommandSender> {
super(manifest, parser, compiler, dispatcher, params); super(manifest, parser, compiler, dispatcher, params);
} }
public void sendActionBar(Player player, Object... values) { public void sendActionBar(@NotNull Player player, Object... values) {
ActionBar.sendActionBar(player, prepare(values).parseLine(player, (sender, message) -> message)); ActionBar.sendActionBar(player, prepare(values).parseLine(player, (sender, message) -> message));
} }
platform/bukkit/src/main/java/cc/carm/lib/mineconfiguration/bukkit/value/item/ConfiguredItem.java
+2 -13
View File
@@ -7,7 +7,6 @@ import cc.carm.lib.configuration.source.ConfigurationHolder;
import cc.carm.lib.configuration.source.section.ConfigureSection; import cc.carm.lib.configuration.source.section.ConfigureSection;
import cc.carm.lib.configuration.value.ValueManifest; import cc.carm.lib.configuration.value.ValueManifest;
import cc.carm.lib.configuration.value.standard.ConfiguredValue; 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 cc.carm.lib.easyplugin.utils.ColorParser;
import com.cryptomorin.xseries.XItemStack; import com.cryptomorin.xseries.XItemStack;
import org.bukkit.Material; import org.bukkit.Material;
@@ -22,7 +21,6 @@ import org.jetbrains.annotations.Nullable;
import java.util.*; import java.util.*;
import java.util.function.BiFunction; import java.util.function.BiFunction;
import java.util.function.Consumer; import java.util.function.Consumer;
import java.util.function.UnaryOperator;
public class ConfiguredItem extends ConfiguredValue<ItemStack> { public class ConfiguredItem extends ConfiguredValue<ItemStack> {
@@ -40,15 +38,12 @@ public class ConfiguredItem extends ConfiguredValue<ItemStack> {
); );
protected final @NotNull BiFunction<Player, String, String> parser; protected final @NotNull BiFunction<Player, String, String> parser;
protected final @NotNull UnaryOperator<String> paramBuilder;
protected final @NotNull String[] params; protected final @NotNull String[] params;
public ConfiguredItem(@NotNull ValueManifest<ItemStack, ItemStack> manifest, ValueAdapter<ItemStack> adapter, public ConfiguredItem(@NotNull ValueManifest<ItemStack, ItemStack> manifest, ValueAdapter<ItemStack> adapter,
@NotNull BiFunction<Player, String, String> parser, @NotNull BiFunction<Player, String, String> parser, @NotNull String[] params) {
@NotNull UnaryOperator<String> paramBuilder, @NotNull String[] params) {
super(manifest, adapter); super(manifest, adapter);
this.parser = parser; this.parser = parser;
this.paramBuilder = paramBuilder;
this.params = params; this.params = params;
} }
@@ -124,7 +119,6 @@ public class ConfiguredItem extends ConfiguredValue<ItemStack> {
protected @Nullable ItemStack item = null; protected @Nullable ItemStack item = null;
protected @NotNull String[] params = new String[0]; protected @NotNull String[] params = new String[0];
protected @NotNull BiFunction<Player, String, String> parser = (player, message) -> ColorParser.parse(message); protected @NotNull BiFunction<Player, String, String> parser = (player, message) -> ColorParser.parse(message);
protected @NotNull UnaryOperator<String> paramFormatter = ContentHandler.DEFAULT_PARAM_BUILDER;
public Builder() { public Builder() {
super(ConfigurationHolder.class, ITEM_TYPE); super(ConfigurationHolder.class, ITEM_TYPE);
@@ -197,11 +191,6 @@ public class ConfiguredItem extends ConfiguredValue<ItemStack> {
return self(); return self();
} }
public Builder formatParam(@NotNull UnaryOperator<String> paramFormatter) {
this.paramFormatter = paramFormatter;
return self();
}
public Builder params(@NotNull String... params) { public Builder params(@NotNull String... params) {
this.params = params; this.params = params;
return self(); return self();
@@ -219,7 +208,7 @@ public class ConfiguredItem extends ConfiguredValue<ItemStack> {
@Override @Override
public @NotNull ConfiguredItem build() { public @NotNull ConfiguredItem build() {
return new ConfiguredItem(buildManifest(), ITEM_ADAPTER, parser, paramFormatter, params); return new ConfiguredItem(buildManifest(), ITEM_ADAPTER, parser, params);
} }
} }
platform/bukkit/src/main/java/cc/carm/lib/mineconfiguration/bukkit/value/item/ItemModifier.java
-3
View File
@@ -20,13 +20,10 @@ import java.util.List;
import java.util.UUID; import java.util.UUID;
import java.util.function.BiConsumer; import java.util.function.BiConsumer;
import java.util.function.Function; import java.util.function.Function;
import java.util.regex.Pattern;
public abstract class ItemModifier<S extends ItemModifier<S, R>, R> public abstract class ItemModifier<S extends ItemModifier<S, R>, R>
extends ContentHandler<Player, S> { extends ContentHandler<Player, S> {
public static final @NotNull Pattern LORE_INSERT_PATTERN = Pattern.compile("^(?:\\{(.*)})?#(.*)#(?:\\{(-?\\d+)(?:,(-?\\d+))?})?$");
protected final @NotNull Function<@NotNull Player, @Nullable ItemStack> itemProvider; protected final @NotNull Function<@NotNull Player, @Nullable ItemStack> itemProvider;
protected @NotNull BiConsumer<ItemStack, Player> itemConsumer; protected @NotNull BiConsumer<ItemStack, Player> itemConsumer;
platform/bungee/pom.xml
+1 -1
View File
@@ -5,7 +5,7 @@
<parent> <parent>
<artifactId>mineconfiguration-parent</artifactId> <artifactId>mineconfiguration-parent</artifactId>
<groupId>cc.carm.lib</groupId> <groupId>cc.carm.lib</groupId>
<version>3.1.0</version> <version>3.1.1</version>
<relativePath>../../pom.xml</relativePath> <relativePath>../../pom.xml</relativePath>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
platform/velocity/pom.xml
+1 -1
View File
@@ -5,7 +5,7 @@
<parent> <parent>
<artifactId>mineconfiguration-parent</artifactId> <artifactId>mineconfiguration-parent</artifactId>
<groupId>cc.carm.lib</groupId> <groupId>cc.carm.lib</groupId>
<version>3.1.0</version> <version>3.1.1</version>
<relativePath>../../pom.xml</relativePath> <relativePath>../../pom.xml</relativePath>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
pom.xml
+2 -2
View File
@@ -10,14 +10,14 @@
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<maven.compiler.encoding>UTF-8</maven.compiler.encoding> <maven.compiler.encoding>UTF-8</maven.compiler.encoding>
<deps.configured.version>4.1.2</deps.configured.version> <deps.configured.version>4.1.3</deps.configured.version>
<deps.yamlcommentwriter.version>1.2.1</deps.yamlcommentwriter.version> <deps.yamlcommentwriter.version>1.2.1</deps.yamlcommentwriter.version>
<deps.easyplugin.version>1.5.12</deps.easyplugin.version> <deps.easyplugin.version>1.5.12</deps.easyplugin.version>
</properties> </properties>
<groupId>cc.carm.lib</groupId> <groupId>cc.carm.lib</groupId>
<artifactId>mineconfiguration-parent</artifactId> <artifactId>mineconfiguration-parent</artifactId>
<version>3.1.0</version> <version>3.1.1</version>
<packaging>pom</packaging> <packaging>pom</packaging>
<modules> <modules>
<module>common</module> <module>common</module>