mirror of
https://github.com/CarmJos/MineConfiguration.git
synced 2026-06-05 06:51:49 +08:00
Compare commits
10 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| e44e74a512 | |||
| 051049eee2 | |||
| c4010bb642 | |||
| 420eb93366 | |||
| b346fc7600 | |||
| f354258593 | |||
| e859722a85 | |||
| adf26baf59 | |||
| 3d814baa8f | |||
| c5c93d836f |
@@ -29,59 +29,13 @@ jobs:
|
||||
gpg-private-key: ${{ secrets.MAVEN_GPG_PRIVATE_KEY }} # Value of the GPG private key to import
|
||||
gpg-passphrase: MAVEN_GPG_PASSPHRASE # env variable for GPG private key passphrase
|
||||
|
||||
- name: "Maven Deploy With Javadoc"
|
||||
- name: "Maven Deploy"
|
||||
run: mvn -B -Pgithub deploy --file pom.xml -DskipTests
|
||||
env:
|
||||
MAVEN_USERNAME: ${{ github.repository_owner }}
|
||||
MAVEN_TOKEN: ${{secrets.GITHUB_TOKEN}}
|
||||
MAVEN_GPG_PASSPHRASE: ${{ secrets.MAVEN_GPG_PASSPHRASE }}
|
||||
|
||||
- name: "Copy Javadoc to Location"
|
||||
run: |
|
||||
rm -rf docs
|
||||
mkdir -vp docs
|
||||
cp -vrf core/target/reports/apidocs/* docs/
|
||||
cp -vrf .doc/JAVADOC-README.md docs/README.md
|
||||
|
||||
- name: "Generate the Javadoc sitemap"
|
||||
id: sitemap
|
||||
uses: cicirello/generate-sitemap@v1
|
||||
with:
|
||||
base-url-path: https://CarmJos.github.io/EasyConfiguration
|
||||
path-to-root: docs
|
||||
|
||||
- name: "Output stats"
|
||||
run: |
|
||||
echo "sitemap-path = ${{ steps.sitemap.outputs.sitemap-path }}"
|
||||
echo "url-count = ${{ steps.sitemap.outputs.url-count }}"
|
||||
echo "excluded-count = ${{ steps.sitemap.outputs.excluded-count }}"
|
||||
|
||||
- name: "Configure Git"
|
||||
env:
|
||||
DEPLOY_PRI: ${{secrets.DEPLOY_PRI}}
|
||||
run: |
|
||||
sudo timedatectl set-timezone "Asia/Shanghai"
|
||||
mkdir -p ~/.ssh/
|
||||
echo "$DEPLOY_PRI" > ~/.ssh/id_rsa
|
||||
chmod 600 ~/.ssh/id_rsa
|
||||
ssh-keyscan github.com >> ~/.ssh/known_hosts
|
||||
git config --global user.name 'CarmJos'
|
||||
git config --global user.email 'carm@carm.cc'
|
||||
|
||||
- name: "Commit documentations"
|
||||
run: |
|
||||
cd docs
|
||||
git init
|
||||
git remote add origin git@github.com:CarmJos/EasyConfiguration.git
|
||||
git checkout -b gh-pages
|
||||
git add -A
|
||||
git commit -m "API Document generated."
|
||||
|
||||
- name: "Push javadocs"
|
||||
run: |
|
||||
cd docs
|
||||
git push origin HEAD:gh-pages --force
|
||||
|
||||
central-deploy:
|
||||
name: "Deploy Project (Central Repository)"
|
||||
runs-on: ubuntu-latest
|
||||
|
||||
+9
-9
@@ -5,7 +5,7 @@
|
||||
<parent>
|
||||
<artifactId>mineconfiguration-parent</artifactId>
|
||||
<groupId>cc.carm.lib</groupId>
|
||||
<version>3.0.1</version>
|
||||
<version>3.1.1</version>
|
||||
</parent>
|
||||
<modelVersion>4.0.0</modelVersion>
|
||||
<properties>
|
||||
@@ -23,29 +23,29 @@
|
||||
|
||||
<dependency>
|
||||
<groupId>cc.carm.lib</groupId>
|
||||
<artifactId>easyconfiguration-core</artifactId>
|
||||
<version>${deps.easyconfifuration.version}</version>
|
||||
<artifactId>configured-core</artifactId>
|
||||
<version>${deps.configured.version}</version>
|
||||
<scope>compile</scope>
|
||||
</dependency>
|
||||
|
||||
<dependency>
|
||||
<groupId>cc.carm.lib</groupId>
|
||||
<artifactId>easyconfiguration-feature-commentable</artifactId>
|
||||
<version>${deps.easyconfifuration.version}</version>
|
||||
<artifactId>configured-feature-commentable</artifactId>
|
||||
<version>${deps.configured.version}</version>
|
||||
<scope>compile</scope>
|
||||
</dependency>
|
||||
|
||||
<dependency>
|
||||
<groupId>cc.carm.lib</groupId>
|
||||
<artifactId>easyconfiguration-feature-file</artifactId>
|
||||
<version>${deps.easyconfifuration.version}</version>
|
||||
<artifactId>configured-feature-file</artifactId>
|
||||
<version>${deps.configured.version}</version>
|
||||
<scope>compile</scope>
|
||||
</dependency>
|
||||
|
||||
<dependency>
|
||||
<groupId>cc.carm.lib</groupId>
|
||||
<artifactId>easyconfiguration-feature-text</artifactId>
|
||||
<version>${deps.easyconfifuration.version}</version>
|
||||
<artifactId>configured-feature-text</artifactId>
|
||||
<version>${deps.configured.version}</version>
|
||||
<scope>compile</scope>
|
||||
</dependency>
|
||||
|
||||
|
||||
@@ -5,7 +5,7 @@
|
||||
<parent>
|
||||
<artifactId>mineconfiguration-parent</artifactId>
|
||||
<groupId>cc.carm.lib</groupId>
|
||||
<version>3.0.1</version>
|
||||
<version>3.1.1</version>
|
||||
<relativePath>../../pom.xml</relativePath>
|
||||
</parent>
|
||||
<modelVersion>4.0.0</modelVersion>
|
||||
@@ -40,7 +40,7 @@
|
||||
<dependency>
|
||||
<groupId>com.github.cryptomorin</groupId>
|
||||
<artifactId>XSeries</artifactId>
|
||||
<version>13.0.0</version>
|
||||
<version>13.1.0</version>
|
||||
<scope>compile</scope>
|
||||
</dependency>
|
||||
|
||||
|
||||
+60
-13
@@ -6,19 +6,20 @@ import org.jetbrains.annotations.NotNull;
|
||||
import org.jetbrains.annotations.Nullable;
|
||||
import org.jetbrains.annotations.UnmodifiableView;
|
||||
|
||||
import java.util.Map;
|
||||
import java.util.Set;
|
||||
import java.util.*;
|
||||
|
||||
public class BukkitSection implements ConfigureSection {
|
||||
|
||||
protected final @NotNull BukkitSource source;
|
||||
protected final @Nullable BukkitSection parent;
|
||||
protected final @NotNull String path;
|
||||
protected final @NotNull ConfigurationSection data;
|
||||
|
||||
public BukkitSection(@NotNull BukkitSource source, @Nullable BukkitSection parent,
|
||||
@NotNull ConfigurationSection data) {
|
||||
@NotNull String path, @NotNull ConfigurationSection data) {
|
||||
this.source = source;
|
||||
this.parent = parent;
|
||||
this.path = path;
|
||||
this.data = data;
|
||||
}
|
||||
|
||||
@@ -31,6 +32,11 @@ public class BukkitSection implements ConfigureSection {
|
||||
return this.parent;
|
||||
}
|
||||
|
||||
@Override
|
||||
public @NotNull String path() {
|
||||
return this.path;
|
||||
}
|
||||
|
||||
public @NotNull ConfigurationSection data() {
|
||||
return this.data;
|
||||
}
|
||||
@@ -42,11 +48,55 @@ public class BukkitSection implements ConfigureSection {
|
||||
|
||||
@Override
|
||||
public @NotNull @UnmodifiableView Map<String, Object> getValues(boolean deep) {
|
||||
return data().getValues(deep);
|
||||
|
||||
Map<String, Object> original = data().getValues(deep);
|
||||
// wrap all ConfigurationSection
|
||||
for (Map.Entry<String, Object> entry : original.entrySet()) {
|
||||
if (entry.getValue() instanceof ConfigurationSection) {
|
||||
original.put(entry.getKey(), createSection(entry.getKey(), (ConfigurationSection) entry.getValue()));
|
||||
}
|
||||
}
|
||||
|
||||
return Collections.unmodifiableMap(original);
|
||||
}
|
||||
|
||||
public Map<String, Object> toMap(ConfigurationSection section) {
|
||||
Map<String, Object> map = new LinkedHashMap<>();
|
||||
for (String key : section.getKeys(false)) {
|
||||
Object value = section.get(key);
|
||||
if (value instanceof ConfigurationSection) {
|
||||
map.put(key, toMap((ConfigurationSection) value));
|
||||
} else if (value instanceof BukkitSection) {
|
||||
map.put(key, toMap(((BukkitSection) value).data()));
|
||||
} else if (value instanceof List<?>) {
|
||||
List<Object> list = new ArrayList<>();
|
||||
for (Object o : (List<?>) value) {
|
||||
if (o instanceof ConfigurationSection) {
|
||||
list.add(toMap((ConfigurationSection) o));
|
||||
} else if (o instanceof BukkitSection) {
|
||||
list.add(toMap(((BukkitSection) o).data()));
|
||||
} else {
|
||||
list.add(o);
|
||||
}
|
||||
}
|
||||
map.put(key, list);
|
||||
} else {
|
||||
map.put(key, value);
|
||||
}
|
||||
}
|
||||
return map;
|
||||
}
|
||||
|
||||
@Override
|
||||
public @NotNull @UnmodifiableView Map<String, Object> asMap() {
|
||||
return toMap(data());
|
||||
}
|
||||
|
||||
@Override
|
||||
public void set(@NotNull String path, @Nullable Object value) {
|
||||
if (value instanceof BukkitSection) { // unwrap
|
||||
value = ((BukkitSection) value).data();
|
||||
}
|
||||
data().set(path, value);
|
||||
}
|
||||
|
||||
@@ -60,27 +110,24 @@ public class BukkitSection implements ConfigureSection {
|
||||
Object value = get(path);
|
||||
if (value instanceof ConfigureSection) {
|
||||
return (ConfigureSection) value;
|
||||
} else if (value instanceof ConfigurationSection) {
|
||||
return new BukkitSection(source(), this, (ConfigurationSection) value);
|
||||
}
|
||||
return null;
|
||||
}
|
||||
|
||||
@Override
|
||||
public @NotNull ConfigureSection createSection(@NotNull Map<?, ?> data) {
|
||||
throw new UnsupportedOperationException("BukkitSection does not support this operation");
|
||||
public @NotNull BukkitSection createSection(@NotNull String path, @NotNull ConfigurationSection section) {
|
||||
return new BukkitSection(source(), this, path, section);
|
||||
}
|
||||
|
||||
@Override
|
||||
public @NotNull ConfigureSection computeSection(@NotNull String path) {
|
||||
return new BukkitSection(source(), this, data.createSection(path));
|
||||
public @NotNull BukkitSection createSection(@NotNull String path, @NotNull Map<?, ?> data) {
|
||||
return createSection(path, data().createSection(path, data));
|
||||
}
|
||||
|
||||
@Override
|
||||
public @Nullable Object get(@NotNull String path) {
|
||||
Object value = data().get(path);
|
||||
if (value instanceof ConfigurationSection) {
|
||||
return new BukkitSection(source(), this, (ConfigurationSection) value);
|
||||
if (value instanceof ConfigurationSection) { // wrap
|
||||
return createSection(path, (ConfigurationSection) value);
|
||||
}
|
||||
return value;
|
||||
}
|
||||
|
||||
+2
-2
@@ -38,7 +38,7 @@ public class BukkitSource extends FileConfigSource<BukkitSection, YamlConfigurat
|
||||
}
|
||||
|
||||
@Override
|
||||
protected BukkitSource self() {
|
||||
protected @NotNull BukkitSource self() {
|
||||
return this;
|
||||
}
|
||||
|
||||
@@ -68,7 +68,7 @@ public class BukkitSource extends FileConfigSource<BukkitSection, YamlConfigurat
|
||||
@Override
|
||||
protected void onReload() throws Exception {
|
||||
YamlConfiguration configuration = fileReader(YamlConfiguration::loadConfiguration);
|
||||
this.rootSection = new BukkitSection(this, null, configuration);
|
||||
this.rootSection = new BukkitSection(this, null, "", configuration);
|
||||
}
|
||||
|
||||
@Override
|
||||
|
||||
+2
-2
@@ -38,7 +38,7 @@ public class ConfiguredMessage<M> extends ConfiguredText<M, CommandSender> {
|
||||
return asString().defaults(messages).build();
|
||||
}
|
||||
|
||||
public ConfiguredMessage(@NotNull ValueManifest<TextContents> manifest,
|
||||
public ConfiguredMessage(@NotNull ValueManifest<TextContents, TextContents> manifest,
|
||||
@NotNull BiFunction<CommandSender, String, String> parser,
|
||||
@NotNull BiFunction<CommandSender, String, M> compiler,
|
||||
@NotNull BiConsumer<CommandSender, List<M>> dispatcher,
|
||||
@@ -46,7 +46,7 @@ public class ConfiguredMessage<M> extends ConfiguredText<M, CommandSender> {
|
||||
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));
|
||||
}
|
||||
|
||||
|
||||
+2
-2
@@ -55,7 +55,7 @@ public class ConfiguredSound extends ConfiguredValue<SoundConfig> {
|
||||
}
|
||||
);
|
||||
|
||||
public ConfiguredSound(@NotNull ValueManifest<SoundConfig> manifest, @NotNull ValueAdapter<SoundConfig> adapter) {
|
||||
public ConfiguredSound(@NotNull ValueManifest<SoundConfig, SoundConfig> manifest, @NotNull ValueAdapter<SoundConfig> adapter) {
|
||||
super(manifest, adapter);
|
||||
}
|
||||
|
||||
@@ -83,7 +83,7 @@ public class ConfiguredSound extends ConfiguredValue<SoundConfig> {
|
||||
Optional.ofNullable(get()).ifPresent(s -> s.playAt(location));
|
||||
}
|
||||
|
||||
public static class Builder extends AbstractConfigBuilder<SoundConfig, ConfiguredSound, ConfigurationHolder<?>, Builder> {
|
||||
public static class Builder extends AbstractConfigBuilder<SoundConfig, SoundConfig, ConfiguredSound, ConfigurationHolder<?>, Builder> {
|
||||
|
||||
protected @NotNull ValueAdapter<SoundConfig> adapter = SOUND_ADAPTER;
|
||||
|
||||
|
||||
+2
-2
@@ -55,7 +55,7 @@ public class ConfiguredTitle extends ConfiguredValue<TitleConfig> {
|
||||
protected final @NotNull UnaryOperator<String> paramBuilder;
|
||||
protected final @NotNull String[] params;
|
||||
|
||||
public ConfiguredTitle(@NotNull ValueManifest<TitleConfig> manifest, ValueAdapter<TitleConfig> adapter,
|
||||
public ConfiguredTitle(@NotNull ValueManifest<TitleConfig, TitleConfig> manifest, ValueAdapter<TitleConfig> adapter,
|
||||
@NotNull UnaryOperator<String> paramBuilder, @NotNull String[] params,
|
||||
@NotNull ConfiguredTitle.TitleConsumer sendConsumer) {
|
||||
super(manifest, adapter);
|
||||
@@ -150,7 +150,7 @@ public class ConfiguredTitle extends ConfiguredValue<TitleConfig> {
|
||||
|
||||
}
|
||||
|
||||
public static class Builder extends AbstractConfigBuilder<TitleConfig, ConfiguredTitle, ConfigurationHolder<?>, Builder> {
|
||||
public static class Builder extends AbstractConfigBuilder<TitleConfig, TitleConfig, ConfiguredTitle, ConfigurationHolder<?>, Builder> {
|
||||
|
||||
protected @NotNull ValueAdapter<TitleConfig> adapter = TITLE_ADAPTER;
|
||||
protected @NotNull TitleConfig title = TitleConfig.of(null, null);
|
||||
|
||||
+15
-15
@@ -4,12 +4,12 @@ import cc.carm.lib.configuration.adapter.ValueAdapter;
|
||||
import cc.carm.lib.configuration.adapter.ValueType;
|
||||
import cc.carm.lib.configuration.builder.AbstractConfigBuilder;
|
||||
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;
|
||||
import org.bukkit.configuration.ConfigurationSection;
|
||||
import org.bukkit.enchantments.Enchantment;
|
||||
import org.bukkit.entity.Player;
|
||||
import org.bukkit.inventory.ItemFlag;
|
||||
@@ -19,8 +19,8 @@ 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;
|
||||
|
||||
public class ConfiguredItem extends ConfiguredValue<ItemStack> {
|
||||
|
||||
@@ -32,18 +32,18 @@ public class ConfiguredItem extends ConfiguredValue<ItemStack> {
|
||||
public static final ValueAdapter<ItemStack> ITEM_ADAPTER = new ValueAdapter<>(ITEM_TYPE,
|
||||
(holder, type, value) -> XItemStack.serialize(value),
|
||||
(holder, type, value) -> {
|
||||
ConfigurationSection section = (ConfigurationSection) value;
|
||||
return XItemStack.deserialize(section);
|
||||
ConfigureSection section = (ConfigureSection) value;
|
||||
return XItemStack.deserialize(section.asMap());
|
||||
}
|
||||
);
|
||||
|
||||
protected final @NotNull UnaryOperator<String> paramBuilder;
|
||||
protected final @NotNull BiFunction<Player, String, String> parser;
|
||||
protected final @NotNull String[] params;
|
||||
|
||||
public ConfiguredItem(@NotNull ValueManifest<ItemStack> manifest, ValueAdapter<ItemStack> adapter,
|
||||
@NotNull UnaryOperator<String> paramBuilder, @NotNull String[] params) {
|
||||
public ConfiguredItem(@NotNull ValueManifest<ItemStack, ItemStack> manifest, ValueAdapter<ItemStack> adapter,
|
||||
@NotNull BiFunction<Player, String, String> parser, @NotNull String[] params) {
|
||||
super(manifest, adapter);
|
||||
this.paramBuilder = paramBuilder;
|
||||
this.parser = parser;
|
||||
this.params = params;
|
||||
}
|
||||
|
||||
@@ -82,7 +82,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) {
|
||||
@@ -114,11 +114,11 @@ public class ConfiguredItem extends ConfiguredValue<ItemStack> {
|
||||
}
|
||||
|
||||
|
||||
public static class Builder extends AbstractConfigBuilder<ItemStack, ConfiguredItem, ConfigurationHolder<?>, Builder> {
|
||||
public static class Builder extends AbstractConfigBuilder<ItemStack, ItemStack, ConfiguredItem, ConfigurationHolder<?>, Builder> {
|
||||
|
||||
protected @Nullable ItemStack item = null;
|
||||
protected @NotNull String[] params = new String[0];
|
||||
protected @NotNull UnaryOperator<String> paramFormatter = ContentHandler.DEFAULT_PARAM_BUILDER;
|
||||
protected @NotNull BiFunction<Player, String, String> parser = (player, message) -> ColorParser.parse(message);
|
||||
|
||||
public Builder() {
|
||||
super(ConfigurationHolder.class, ITEM_TYPE);
|
||||
@@ -186,8 +186,8 @@ public class ConfiguredItem extends ConfiguredValue<ItemStack> {
|
||||
return defaultFlags(new LinkedHashSet<>(Arrays.asList(flags)));
|
||||
}
|
||||
|
||||
public Builder formatParam(@NotNull UnaryOperator<String> paramFormatter) {
|
||||
this.paramFormatter = paramFormatter;
|
||||
public Builder parser(@NotNull BiFunction<Player, String, String> parser) {
|
||||
this.parser = parser;
|
||||
return self();
|
||||
}
|
||||
|
||||
@@ -208,7 +208,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, params);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
+1
-4
@@ -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<S extends ItemModifier<S, R>, R>
|
||||
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 @NotNull BiConsumer<ItemStack, Player> itemConsumer;
|
||||
|
||||
+1
-1
@@ -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;
|
||||
|
||||
|
||||
+2
-2
@@ -40,7 +40,7 @@ public class ConfiguredNotify extends ConfiguredList<NotifyConfig> {
|
||||
protected final @NotNull UnaryOperator<String> paramBuilder;
|
||||
protected final @NotNull String[] params;
|
||||
|
||||
public ConfiguredNotify(@NotNull ValueManifest<List<NotifyConfig>> manifest,
|
||||
public ConfiguredNotify(@NotNull ValueManifest<List<NotifyConfig>, NotifyConfig> manifest,
|
||||
@NotNull ValueAdapter<NotifyConfig> adapter,
|
||||
@NotNull UnaryOperator<String> paramBuilder, @NotNull String[] params) {
|
||||
super(manifest, ArrayList::new, adapter);
|
||||
@@ -65,7 +65,7 @@ public class ConfiguredNotify extends ConfiguredList<NotifyConfig> {
|
||||
}
|
||||
|
||||
|
||||
public static class NotifyBuilder extends AbstractConfigBuilder<List<NotifyConfig>, ConfiguredNotify, ConfigurationHolder<?>, NotifyBuilder> {
|
||||
public static class NotifyBuilder extends AbstractConfigBuilder<List<NotifyConfig>, NotifyConfig, ConfiguredNotify, ConfigurationHolder<?>, NotifyBuilder> {
|
||||
|
||||
protected final @NotNull List<NotifyConfig> notifications = new ArrayList<>();
|
||||
|
||||
|
||||
@@ -5,7 +5,7 @@
|
||||
<parent>
|
||||
<artifactId>mineconfiguration-parent</artifactId>
|
||||
<groupId>cc.carm.lib</groupId>
|
||||
<version>3.0.1</version>
|
||||
<version>3.1.1</version>
|
||||
<relativePath>../../pom.xml</relativePath>
|
||||
</parent>
|
||||
<modelVersion>4.0.0</modelVersion>
|
||||
@@ -32,8 +32,8 @@
|
||||
|
||||
<dependency>
|
||||
<groupId>cc.carm.lib</groupId>
|
||||
<artifactId>easyconfiguration-yaml</artifactId>
|
||||
<version>${deps.easyconfifuration.version}</version>
|
||||
<artifactId>configured-yaml</artifactId>
|
||||
<version>${deps.configured.version}</version>
|
||||
<scope>compile</scope>
|
||||
</dependency>
|
||||
|
||||
|
||||
+1
-1
@@ -25,7 +25,7 @@ public class ConfiguredMessage extends ConfiguredText<BaseComponent[], CommandSe
|
||||
return create().defaults(messages).build();
|
||||
}
|
||||
|
||||
public ConfiguredMessage(@NotNull ValueManifest<TextContents> manifest,
|
||||
public ConfiguredMessage(@NotNull ValueManifest<TextContents, TextContents> manifest,
|
||||
@NotNull BiFunction<CommandSender, String, String> parser,
|
||||
@NotNull BiFunction<CommandSender, String, BaseComponent[]> compiler,
|
||||
@NotNull BiConsumer<CommandSender, List<BaseComponent[]>> dispatcher,
|
||||
|
||||
@@ -5,7 +5,7 @@
|
||||
<parent>
|
||||
<artifactId>mineconfiguration-parent</artifactId>
|
||||
<groupId>cc.carm.lib</groupId>
|
||||
<version>3.0.1</version>
|
||||
<version>3.1.1</version>
|
||||
<relativePath>../../pom.xml</relativePath>
|
||||
</parent>
|
||||
<modelVersion>4.0.0</modelVersion>
|
||||
@@ -32,8 +32,8 @@
|
||||
|
||||
<dependency>
|
||||
<groupId>cc.carm.lib</groupId>
|
||||
<artifactId>easyconfiguration-yaml</artifactId>
|
||||
<version>${deps.easyconfifuration.version}</version>
|
||||
<artifactId>configured-yaml</artifactId>
|
||||
<version>${deps.configured.version}</version>
|
||||
<scope>compile</scope>
|
||||
</dependency>
|
||||
|
||||
|
||||
+1
-1
@@ -23,7 +23,7 @@ public class ConfiguredMessage extends ConfiguredText<Component, Audience> {
|
||||
return create().defaults(messages).build();
|
||||
}
|
||||
|
||||
public ConfiguredMessage(@NotNull ValueManifest<TextContents> manifest,
|
||||
public ConfiguredMessage(@NotNull ValueManifest<TextContents, TextContents> manifest,
|
||||
@NotNull BiFunction<Audience, String, String> parser,
|
||||
@NotNull BiFunction<Audience, String, Component> compiler,
|
||||
@NotNull BiConsumer<Audience, List<Component>> dispatcher,
|
||||
|
||||
@@ -10,14 +10,14 @@
|
||||
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
|
||||
<maven.compiler.encoding>UTF-8</maven.compiler.encoding>
|
||||
|
||||
<deps.easyconfifuration.version>4.0.6</deps.easyconfifuration.version>
|
||||
<deps.yamlcommentwriter.version>1.2.0</deps.yamlcommentwriter.version>
|
||||
<deps.configured.version>4.1.3</deps.configured.version>
|
||||
<deps.yamlcommentwriter.version>1.2.1</deps.yamlcommentwriter.version>
|
||||
<deps.easyplugin.version>1.5.12</deps.easyplugin.version>
|
||||
</properties>
|
||||
|
||||
<groupId>cc.carm.lib</groupId>
|
||||
<artifactId>mineconfiguration-parent</artifactId>
|
||||
<version>3.0.1</version>
|
||||
<version>3.1.1</version>
|
||||
<packaging>pom</packaging>
|
||||
<modules>
|
||||
<module>common</module>
|
||||
@@ -167,7 +167,7 @@
|
||||
<plugin>
|
||||
<groupId>org.apache.maven.plugins</groupId>
|
||||
<artifactId>maven-compiler-plugin</artifactId>
|
||||
<version>3.13.0</version>
|
||||
<version>3.14.0</version>
|
||||
<configuration>
|
||||
<source>${project.jdk.version}</source>
|
||||
<target>${project.jdk.version}</target>
|
||||
|
||||
Reference in New Issue
Block a user