diff --git a/common/pom.xml b/common/pom.xml
index f425a23..f2ac9c9 100644
--- a/common/pom.xml
+++ b/common/pom.xml
@@ -5,7 +5,7 @@
mineconfiguration-parent
cc.carm.lib
- 3.1.0
+ 3.1.1
4.0.0
diff --git a/platform/bukkit/pom.xml b/platform/bukkit/pom.xml
index 435c345..66fb591 100644
--- a/platform/bukkit/pom.xml
+++ b/platform/bukkit/pom.xml
@@ -5,7 +5,7 @@
mineconfiguration-parent
cc.carm.lib
- 3.1.0
+ 3.1.1
../../pom.xml
4.0.0
diff --git a/platform/bukkit/src/main/java/cc/carm/lib/mineconfiguration/bukkit/value/ConfiguredMessage.java b/platform/bukkit/src/main/java/cc/carm/lib/mineconfiguration/bukkit/value/ConfiguredMessage.java
index 6587727..7fab4b4 100644
--- a/platform/bukkit/src/main/java/cc/carm/lib/mineconfiguration/bukkit/value/ConfiguredMessage.java
+++ b/platform/bukkit/src/main/java/cc/carm/lib/mineconfiguration/bukkit/value/ConfiguredMessage.java
@@ -46,7 +46,7 @@ public class ConfiguredMessage extends ConfiguredText {
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));
}
diff --git a/platform/bukkit/src/main/java/cc/carm/lib/mineconfiguration/bukkit/value/item/ConfiguredItem.java b/platform/bukkit/src/main/java/cc/carm/lib/mineconfiguration/bukkit/value/item/ConfiguredItem.java
index 9553d00..5568f96 100644
--- a/platform/bukkit/src/main/java/cc/carm/lib/mineconfiguration/bukkit/value/item/ConfiguredItem.java
+++ b/platform/bukkit/src/main/java/cc/carm/lib/mineconfiguration/bukkit/value/item/ConfiguredItem.java
@@ -7,7 +7,6 @@ import cc.carm.lib.configuration.source.ConfigurationHolder;
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;
@@ -22,7 +21,6 @@ import org.jetbrains.annotations.Nullable;
import java.util.*;
import java.util.function.BiFunction;
import java.util.function.Consumer;
-import java.util.function.UnaryOperator;
public class ConfiguredItem extends ConfiguredValue {
@@ -40,15 +38,12 @@ public class ConfiguredItem extends ConfiguredValue {
);
protected final @NotNull BiFunction parser;
- protected final @NotNull UnaryOperator paramBuilder;
protected final @NotNull String[] params;
public ConfiguredItem(@NotNull ValueManifest manifest, ValueAdapter adapter,
- @NotNull BiFunction parser,
- @NotNull UnaryOperator paramBuilder, @NotNull String[] params) {
+ @NotNull BiFunction parser, @NotNull String[] params) {
super(manifest, adapter);
this.parser = parser;
- this.paramBuilder = paramBuilder;
this.params = params;
}
@@ -124,7 +119,6 @@ public class ConfiguredItem extends ConfiguredValue {
protected @Nullable ItemStack item = null;
protected @NotNull String[] params = new String[0];
protected @NotNull BiFunction parser = (player, message) -> ColorParser.parse(message);
- protected @NotNull UnaryOperator paramFormatter = ContentHandler.DEFAULT_PARAM_BUILDER;
public Builder() {
super(ConfigurationHolder.class, ITEM_TYPE);
@@ -197,11 +191,6 @@ public class ConfiguredItem extends ConfiguredValue {
return self();
}
- public Builder formatParam(@NotNull UnaryOperator paramFormatter) {
- this.paramFormatter = paramFormatter;
- return self();
- }
-
public Builder params(@NotNull String... params) {
this.params = params;
return self();
@@ -219,7 +208,7 @@ public class ConfiguredItem extends ConfiguredValue {
@Override
public @NotNull ConfiguredItem build() {
- return new ConfiguredItem(buildManifest(), ITEM_ADAPTER, parser, paramFormatter, params);
+ return new ConfiguredItem(buildManifest(), ITEM_ADAPTER, parser, params);
}
}
diff --git a/platform/bukkit/src/main/java/cc/carm/lib/mineconfiguration/bukkit/value/item/ItemModifier.java b/platform/bukkit/src/main/java/cc/carm/lib/mineconfiguration/bukkit/value/item/ItemModifier.java
index 8239b3e..e986318 100644
--- a/platform/bukkit/src/main/java/cc/carm/lib/mineconfiguration/bukkit/value/item/ItemModifier.java
+++ b/platform/bukkit/src/main/java/cc/carm/lib/mineconfiguration/bukkit/value/item/ItemModifier.java
@@ -20,13 +20,10 @@ import java.util.List;
import java.util.UUID;
import java.util.function.BiConsumer;
import java.util.function.Function;
-import java.util.regex.Pattern;
public abstract class ItemModifier, R>
extends ContentHandler {
-
- public static final @NotNull Pattern LORE_INSERT_PATTERN = Pattern.compile("^(?:\\{(.*)})?#(.*)#(?:\\{(-?\\d+)(?:,(-?\\d+))?})?$");
-
+
protected final @NotNull Function<@NotNull Player, @Nullable ItemStack> itemProvider;
protected @NotNull BiConsumer itemConsumer;
diff --git a/platform/bungee/pom.xml b/platform/bungee/pom.xml
index 852f7da..9f9903a 100644
--- a/platform/bungee/pom.xml
+++ b/platform/bungee/pom.xml
@@ -5,7 +5,7 @@
mineconfiguration-parent
cc.carm.lib
- 3.1.0
+ 3.1.1
../../pom.xml
4.0.0
diff --git a/platform/velocity/pom.xml b/platform/velocity/pom.xml
index e6c5cb0..30a6cbb 100644
--- a/platform/velocity/pom.xml
+++ b/platform/velocity/pom.xml
@@ -5,7 +5,7 @@
mineconfiguration-parent
cc.carm.lib
- 3.1.0
+ 3.1.1
../../pom.xml
4.0.0
diff --git a/pom.xml b/pom.xml
index 308a5cf..4a97691 100644
--- a/pom.xml
+++ b/pom.xml
@@ -10,14 +10,14 @@
UTF-8
UTF-8
- 4.1.2
+ 4.1.3
1.2.1
1.5.12
cc.carm.lib
mineconfiguration-parent
- 3.1.0
+ 3.1.1
pom
common