Skip to content

Commit 57f80cb

Browse files
RezzedUpRezzedUp
committed
Update dependencies.
1 parent 2a57b23 commit 57f80cb

6 files changed

Lines changed: 36 additions & 74 deletions

File tree

‎config-values-bukkit/src/main/java/community/leaf/configvalues/bukkit/YamlAccessor.java‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
*/
88
package community.leaf.configvalues.bukkit;
99

10+
import com.rezzedup.util.valuables.Adapter;
1011
import com.rezzedup.util.valuables.KeyGetter;
1112
import com.rezzedup.util.valuables.KeySetter;
1213
import org.bukkit.configuration.ConfigurationSection;
@@ -17,7 +18,7 @@
1718

1819
public interface YamlAccessor<V> extends KeyGetter<ConfigurationSection, String, V>, KeySetter<ConfigurationSection, String, V>
1920
{
20-
static <V> YamlAccessor<V> adapts(YamlAdapter<V> adapter)
21+
static <V> YamlAccessor<V> of(Adapter<Object, V> adapter)
2122
{
2223
Objects.requireNonNull(adapter, "adapter");
2324

@@ -37,7 +38,7 @@ public void set(ConfigurationSection storage, String key, @NullOr V updated)
3738
};
3839
}
3940

40-
static <V> YamlAccessor<V> directly(KeyGetter<ConfigurationSection, String, V> getter, KeySetter<ConfigurationSection, String, V> setter)
41+
static <V> YamlAccessor<V> of(KeyGetter<ConfigurationSection, String, V> getter, KeySetter<ConfigurationSection, String, V> setter)
4142
{
4243
Objects.requireNonNull(getter, "getter");
4344
Objects.requireNonNull(setter, "setter");

‎config-values-bukkit/src/main/java/community/leaf/configvalues/bukkit/YamlAccessors.java‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -15,21 +15,21 @@ final class YamlAccessors
1515
{
1616
private YamlAccessors() {}
1717

18-
static final YamlAccessor<String> STRING = YamlAccessor.adapts(YamlAdapters.STRING);
18+
static final YamlAccessor<String> STRING = YamlAccessor.of(YamlAdapters.STRING);
1919

20-
static final YamlAccessor<Boolean> BOOLEAN = YamlAccessor.adapts(YamlAdapters.BOOLEAN);
20+
static final YamlAccessor<Boolean> BOOLEAN = YamlAccessor.of(YamlAdapters.BOOLEAN);
2121

22-
static final YamlAccessor<Integer> INTEGER = YamlAccessor.adapts(YamlAdapters.INTEGER);
22+
static final YamlAccessor<Integer> INTEGER = YamlAccessor.of(YamlAdapters.INTEGER);
2323

24-
static final YamlAccessor<Long> LONG = YamlAccessor.adapts(YamlAdapters.LONG);
24+
static final YamlAccessor<Long> LONG = YamlAccessor.of(YamlAdapters.LONG);
2525

26-
static final YamlAccessor<Float> FLOAT = YamlAccessor.adapts(YamlAdapters.FLOAT);
26+
static final YamlAccessor<Float> FLOAT = YamlAccessor.of(YamlAdapters.FLOAT);
2727

28-
static final YamlAccessor<Double> DOUBLE = YamlAccessor.adapts(YamlAdapters.DOUBLE);
28+
static final YamlAccessor<Double> DOUBLE = YamlAccessor.of(YamlAdapters.DOUBLE);
2929

30-
static final YamlAccessor<List<String>> STRING_LIST = YamlAccessor.adapts(YamlAdapters.STRING_LIST);
30+
static final YamlAccessor<List<String>> STRING_LIST = YamlAccessor.of(YamlAdapters.STRING_LIST);
3131

32-
static final YamlAccessor<List<Map<?, ?>>> MAP_LIST = YamlAccessor.adapts(YamlAdapters.MAP_LIST);
32+
static final YamlAccessor<List<Map<?, ?>>> MAP_LIST = YamlAccessor.of(YamlAdapters.MAP_LIST);
3333

34-
static final YamlAccessor<UUID> U_UID = YamlAccessor.adapts(YamlAdapters.U_UID);
34+
static final YamlAccessor<UUID> U_UID = YamlAccessor.of(YamlAdapters.U_UID);
3535
}

‎config-values-bukkit/src/main/java/community/leaf/configvalues/bukkit/YamlAdapter.java‎

Lines changed: 0 additions & 39 deletions
This file was deleted.

‎config-values-bukkit/src/main/java/community/leaf/configvalues/bukkit/YamlAdapters.java‎

Lines changed: 15 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
package community.leaf.configvalues.bukkit;
99

1010
import com.rezzedup.util.constants.types.Primitives;
11+
import com.rezzedup.util.valuables.Adapter;
1112
import com.rezzedup.util.valuables.Deserializer;
1213
import com.rezzedup.util.valuables.Serializer;
1314
import pl.tlinkowski.annotation.basic.NullOr;
@@ -23,35 +24,35 @@ final class YamlAdapters
2324
{
2425
private YamlAdapters() { throw new UnsupportedOperationException(); }
2526

26-
static final YamlAdapter<String> STRING =
27+
static final Adapter<Object, String> STRING =
2728
simple(serialized -> Optional.of(String.valueOf(serialized)));
2829

29-
static final YamlAdapter<Boolean> BOOLEAN =
30+
static final Adapter<Object, Boolean> BOOLEAN =
3031
simple(serialized ->
3132
(serialized instanceof Boolean)
3233
? Optional.of((Boolean) serialized)
3334
: Optional.empty()
3435
);
3536

36-
static final YamlAdapter<Integer> INTEGER = number(Number::intValue);
37+
static final Adapter<Object, Integer> INTEGER = number(Number::intValue);
3738

38-
static final YamlAdapter<Long> LONG = number(Number::longValue);
39+
static final Adapter<Object, Long> LONG = number(Number::longValue);
3940

40-
static final YamlAdapter<Float> FLOAT = number(Number::floatValue);
41+
static final Adapter<Object, Float> FLOAT = number(Number::floatValue);
4142

42-
static final YamlAdapter<Double> DOUBLE = number(Number::doubleValue);
43+
static final Adapter<Object, Double> DOUBLE = number(Number::doubleValue);
4344

44-
static final YamlAdapter<List<String>> STRING_LIST =
45+
static final Adapter<Object, List<String>> STRING_LIST =
4546
list(serialized ->
4647
(serialized instanceof String || Primitives.isBoxed(serialized))
4748
? String.valueOf(serialized)
4849
: null
4950
);
5051

51-
static final YamlAdapter<List<Map<?, ?>>> MAP_LIST =
52+
static final Adapter<Object, List<Map<?, ?>>> MAP_LIST =
5253
list(serialized -> (serialized instanceof Map<?, ?>) ? (Map<?, ?>) serialized : null);
5354

54-
static final YamlAdapter<UUID> U_UID =
55+
static final Adapter<Object, UUID> U_UID =
5556
convert(
5657
serialized -> {
5758
try { return Optional.of(UUID.fromString(String.valueOf(serialized))); }
@@ -64,17 +65,17 @@ final class YamlAdapters
6465
// Factories
6566
//
6667

67-
static <V> YamlAdapter<V> convert(Deserializer<Object, V> deserializer, Serializer<V, Object> serializer)
68+
static <V> Adapter<Object, V> convert(Deserializer<Object, V> deserializer, Serializer<V, Object> serializer)
6869
{
69-
return YamlAdapter.adapts(deserializer, serializer);
70+
return Adapter.of(deserializer, serializer);
7071
}
7172

72-
static <V> YamlAdapter<V> simple(Deserializer<Object, V> deserializer)
73+
static <V> Adapter<Object, V> simple(Deserializer<Object, V> deserializer)
7374
{
7475
return convert(deserializer, Optional::of);
7576
}
7677

77-
static <V extends Number> YamlAdapter<V> number(Function<Number, V> conversion)
78+
static <V extends Number> Adapter<Object, V> number(Function<Number, V> conversion)
7879
{
7980
return simple(val ->
8081
(val instanceof Number)
@@ -83,7 +84,7 @@ static <V extends Number> YamlAdapter<V> number(Function<Number, V> conversion)
8384
);
8485
}
8586

86-
static <V> YamlAdapter<List<V>> list(Function<Object, @NullOr V> conversion)
87+
static <V> Adapter<Object, List<V>> list(Function<Object, @NullOr V> conversion)
8788
{
8889
return simple(serialized ->
8990
{

‎examples/config-values-example-bukkit/src/main/java/community/leaf/examples/configvalues/bukkit/Config.java‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package community.leaf.examples.configvalues.bukkit;
22

33
import com.rezzedup.util.constants.Aggregates;
4-
import com.rezzedup.util.constants.annotations.Aggregated;
4+
import com.rezzedup.util.constants.annotations.AggregatedResult;
55
import community.leaf.configvalues.bukkit.DefaultYamlValue;
66
import community.leaf.configvalues.bukkit.migrations.Migration;
77
import community.leaf.configvalues.bukkit.YamlValue;
@@ -25,9 +25,8 @@ public class Config extends YamlDataFile
2525
)
2626
.defaults("Hello world.");
2727

28-
@Aggregated.Result
29-
private static final List<YamlValue<?>> VALUES =
30-
Aggregates.list(Config.class, YamlValue.type(), Aggregates.matching().all());
28+
@AggregatedResult
29+
private static final List<YamlValue<?>> VALUES = Aggregates.list(Config.class, YamlValue.type());
3130

3231
public Config(ExampleConfigPlugin plugin)
3332
{

‎pom.xml‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@
5353
<license.header.url>https://github.com/LeafCommunity/ConfigValues</license.header.url>
5454

5555
<!-- Dependency versions -->
56-
<versions.minecraft.spigot>1.16.5-R0.1-SNAPSHOT</versions.minecraft.spigot>
56+
<versions.minecraft.spigot>1.17.1-R0.1-SNAPSHOT</versions.minecraft.spigot>
5757
</properties>
5858

5959
<repositories>
@@ -75,17 +75,17 @@
7575
<version>0.2.0</version>
7676
<!-- Note: scope must be visible to dependent projects otherwise nullness annotations will not work as intended -->
7777
</dependency>
78-
<!-- Constants (via jitpack.io, temporarily) -->
78+
<!-- Constants (via maven-central) -->
7979
<dependency>
80-
<groupId>com.github.rezzedup</groupId>
80+
<groupId>com.rezzedup.util</groupId>
8181
<artifactId>constants</artifactId>
82-
<version>f5cf30443b</version>
82+
<version>0.1.0</version>
8383
</dependency>
84-
<!-- Valuables (via sonatype ossrh snapshots, temporarily) -->
84+
<!-- Valuables (via maven-central) -->
8585
<dependency>
8686
<groupId>com.rezzedup.util</groupId>
8787
<artifactId>valuables</artifactId>
88-
<version>0.0.1-SNAPSHOT</version>
88+
<version>0.1.0</version>
8989
</dependency>
9090
</dependencies>
9191

0 commit comments

Comments
 (0)