diff --git a/api/build.gradle.kts b/api/build.gradle.kts index 3c759eb..14cbb98 100644 --- a/api/build.gradle.kts +++ b/api/build.gradle.kts @@ -18,19 +18,20 @@ repositories { maven("https://repo.thenextlvl.net/releases") maven("https://repo.thenextlvl.net/snapshots") maven("https://repo.papermc.io/repository/maven-public/") + maven("https://s01.oss.sonatype.org/content/repositories/snapshots/") } dependencies { - compileOnly("org.projectlombok:lombok:1.18.30") + compileOnly("org.projectlombok:lombok:1.18.32") compileOnly("net.thenextlvl.core:annotations:2.0.1") compileOnly("com.fastasyncworldedit:FastAsyncWorldEdit-Core") compileOnly("com.fastasyncworldedit:FastAsyncWorldEdit-Bukkit") { isTransitive = false } - compileOnly("io.papermc.paper:paper-api:1.20.4-R0.1-SNAPSHOT") + compileOnly("io.papermc.paper:paper-api:1.20.6-R0.1-SNAPSHOT") implementation("net.thenextlvl.core:files:1.0.5-pre2") implementation(platform("com.intellectualsites.bom:bom-newest:1.43")) - annotationProcessor("org.projectlombok:lombok:1.18.30") + annotationProcessor("org.projectlombok:lombok:1.18.32") } publishing { diff --git a/plugin/build.gradle.kts b/plugin/build.gradle.kts index 39d84c8..9a6ae15 100644 --- a/plugin/build.gradle.kts +++ b/plugin/build.gradle.kts @@ -28,24 +28,24 @@ repositories { } dependencies { - compileOnly("org.projectlombok:lombok:1.18.30") + compileOnly("org.projectlombok:lombok:1.18.32") compileOnly("net.thenextlvl.core:annotations:2.0.1") compileOnly("com.fastasyncworldedit:FastAsyncWorldEdit-Core") compileOnly("com.fastasyncworldedit:FastAsyncWorldEdit-Bukkit") { isTransitive = false } compileOnly("io.papermc.paper:paper-api:1.20.6-R0.1-SNAPSHOT") implementation("org.bstats:bstats-bukkit:3.0.2") - implementation("org.incendo:cloud-paper:2.0.0-beta.2") - implementation("org.incendo:cloud-minecraft-extras:2.0.0-beta.2") + implementation("org.incendo:cloud-paper:2.0.0-beta.5") + implementation("org.incendo:cloud-minecraft-extras:2.0.0-beta.5") implementation(platform("com.intellectualsites.bom:bom-newest:1.43")) implementation(project(":api")) - implementation("net.thenextlvl.core:i18n:1.0.14") + implementation("net.thenextlvl.core:i18n:1.0.15") implementation("net.thenextlvl.core:files:1.0.5-pre2") - implementation("net.thenextlvl.core:paper:1.2.6") - implementation("net.thenextlvl.core:adapters:1.0.8") + implementation("net.thenextlvl.core:paper:1.3.0-pre1") + implementation("net.thenextlvl.core:adapters:1.0.9") - annotationProcessor("org.projectlombok:lombok:1.18.30") + annotationProcessor("org.projectlombok:lombok:1.18.32") } tasks.shadowJar { diff --git a/plugin/src/main/java/net/thenextlvl/protect/command/AreaDeleteCommand.java b/plugin/src/main/java/net/thenextlvl/protect/command/AreaDeleteCommand.java index e183f96..5150a6f 100644 --- a/plugin/src/main/java/net/thenextlvl/protect/command/AreaDeleteCommand.java +++ b/plugin/src/main/java/net/thenextlvl/protect/command/AreaDeleteCommand.java @@ -30,7 +30,7 @@ Command.Builder create() { SuggestionProvider.blocking((context, input) -> plugin.areaProvider().getAreas() .filter(area -> area instanceof RegionizedArea) .map(Area::getName) - .map(Suggestion::simple) + .map(Suggestion::suggestion) .toList())) .handler(this::execute); } diff --git a/plugin/src/main/java/net/thenextlvl/protect/command/AreaFlagCommand.java b/plugin/src/main/java/net/thenextlvl/protect/command/AreaFlagCommand.java index 8eb6cbf..1b54457 100644 --- a/plugin/src/main/java/net/thenextlvl/protect/command/AreaFlagCommand.java +++ b/plugin/src/main/java/net/thenextlvl/protect/command/AreaFlagCommand.java @@ -57,7 +57,7 @@ Command.Builder create() { NamespacedKeyParser.namespacedKeyParser(), SuggestionProvider.blocking((context, input) -> plugin.flagRegistry().getFlags().stream() .map(flag -> flag.key().asString()) - .map(Suggestion::simple) + .map(Suggestion::suggestion) .toList())) .optional("area", StringParser.greedyStringParser(), @@ -67,7 +67,7 @@ Command.Builder create() { }), SuggestionProvider.blocking((context, input) -> plugin.areaProvider().getAreas() .map(Area::getName) - .map(Suggestion::simple) + .map(Suggestion::suggestion) .toList())) .handler(this::execute); } @@ -103,7 +103,7 @@ Command.Builder create() { SuggestionProvider.blocking((context, input) -> plugin.flagRegistry().getRegistry() .keySet().stream() .map(Plugin::getName) - .map(Suggestion::simple) + .map(Suggestion::suggestion) .toList())) .handler(this::execute); } @@ -150,7 +150,7 @@ Command.Builder create() { NamespacedKeyParser.namespacedKeyParser(), SuggestionProvider.blocking((context, input) -> plugin.flagRegistry().getFlags().stream() .map(flag -> flag.key().asString()) - .map(Suggestion::simple) + .map(Suggestion::suggestion) .toList())) .required("value", StringParser.greedyStringParser(), @@ -159,22 +159,22 @@ Command.Builder create() { var flag = plugin.flagRegistry().getFlag(key).orElse(null); if (flag == null) return java.util.List.of(); if (flag.type().equals(Boolean.class)) return Stream.of("true", "false") - .map(Suggestion::simple).toList(); + .map(Suggestion::suggestion).toList(); else if (flag.type().equals(Integer.class)) return IntStream.rangeClosed(0, 100).mapToObj(Integer::toString) - .map(Suggestion::simple).toList(); + .map(Suggestion::suggestion).toList(); else if (flag.type().equals(Double.class)) return IntStream.rangeClosed(0, 100).mapToObj(Double::toString) - .map(Suggestion::simple).toList(); + .map(Suggestion::suggestion).toList(); else if (flag.type().equals(Float.class)) return IntStream.rangeClosed(0, 100).mapToObj(Float::toString) - .map(Suggestion::simple).toList(); + .map(Suggestion::suggestion).toList(); else if (flag.type().equals(Long.class)) return IntStream.rangeClosed(0, 100).mapToObj(Long::toString) - .map(Suggestion::simple).toList(); + .map(Suggestion::suggestion).toList(); else if (flag.type().isEnum()) return Arrays.stream(flag.type().getEnumConstants()).map(String::valueOf) - .map(Suggestion::simple).toList(); + .map(Suggestion::suggestion).toList(); return java.util.List.of(); })) .optional("area", @@ -185,7 +185,7 @@ else if (flag.type().isEnum()) }), SuggestionProvider.blocking((context, input) -> plugin.areaProvider().getAreas() .map(Area::getName) - .map(Suggestion::simple) + .map(Suggestion::suggestion) .toList())) .handler(this::execute); } @@ -250,7 +250,7 @@ Command.Builder create() { NamespacedKeyParser.namespacedKeyParser(), SuggestionProvider.blocking((context, input) -> plugin.flagRegistry().getFlags().stream() .map(flag -> flag.key().asString()) - .map(Suggestion::simple) + .map(Suggestion::suggestion) .toList())) .optional("area", StringParser.greedyStringParser(), @@ -260,7 +260,7 @@ Command.Builder create() { }), SuggestionProvider.blocking((context, input) -> plugin.areaProvider().getAreas() .map(Area::getName) - .map(Suggestion::simple) + .map(Suggestion::suggestion) .toList())) .handler(this::execute); } diff --git a/plugin/src/main/java/net/thenextlvl/protect/command/AreaInfoCommand.java b/plugin/src/main/java/net/thenextlvl/protect/command/AreaInfoCommand.java index a2d81e8..61d1812 100644 --- a/plugin/src/main/java/net/thenextlvl/protect/command/AreaInfoCommand.java +++ b/plugin/src/main/java/net/thenextlvl/protect/command/AreaInfoCommand.java @@ -36,7 +36,7 @@ Command.Builder create() { }), SuggestionProvider.blocking((context, input) -> plugin.areaProvider().getAreas() .map(Area::getName) - .map(Suggestion::simple) + .map(Suggestion::suggestion) .toList())) .handler(this::execute); } diff --git a/plugin/src/main/java/net/thenextlvl/protect/command/AreaPriorityCommand.java b/plugin/src/main/java/net/thenextlvl/protect/command/AreaPriorityCommand.java index fe3c8f4..6092ed1 100644 --- a/plugin/src/main/java/net/thenextlvl/protect/command/AreaPriorityCommand.java +++ b/plugin/src/main/java/net/thenextlvl/protect/command/AreaPriorityCommand.java @@ -35,7 +35,7 @@ Command.Builder create() { }), SuggestionProvider.blocking((context, input) -> plugin.areaProvider().getAreas() .map(Area::getName) - .map(Suggestion::simple) + .map(Suggestion::suggestion) .toList())) .handler(this::execute); } diff --git a/plugin/src/main/java/net/thenextlvl/protect/command/AreaRedefineCommand.java b/plugin/src/main/java/net/thenextlvl/protect/command/AreaRedefineCommand.java index 7330e46..c960032 100644 --- a/plugin/src/main/java/net/thenextlvl/protect/command/AreaRedefineCommand.java +++ b/plugin/src/main/java/net/thenextlvl/protect/command/AreaRedefineCommand.java @@ -37,7 +37,7 @@ Command.Builder create() { SuggestionProvider.blocking((context, input) -> plugin.areaProvider().getAreas() .filter(area -> area instanceof SchematicHolder) .map(Area::getName) - .map(Suggestion::simple) + .map(Suggestion::suggestion) .toList())) .senderType(Player.class) .handler(this::execute); diff --git a/plugin/src/main/java/net/thenextlvl/protect/command/AreaSchematicCommand.java b/plugin/src/main/java/net/thenextlvl/protect/command/AreaSchematicCommand.java index 4e70ee8..81d44de 100644 --- a/plugin/src/main/java/net/thenextlvl/protect/command/AreaSchematicCommand.java +++ b/plugin/src/main/java/net/thenextlvl/protect/command/AreaSchematicCommand.java @@ -57,7 +57,7 @@ Command.Builder create() { .filter(area -> area instanceof SchematicHolder holder && holder.getSchematic().isFile()) .map(Area::getName) - .map(Suggestion::simple) + .map(Suggestion::suggestion) .toList())) .handler(this::execute); } @@ -89,7 +89,7 @@ Command.Builder create() { .filter(area -> area instanceof SchematicHolder holder && holder.getSchematic().isFile()) .map(Area::getName) - .map(Suggestion::simple) + .map(Suggestion::suggestion) .toList())) .handler(this::execute); } @@ -127,7 +127,7 @@ Command.Builder create() { SuggestionProvider.blocking((context, input) -> plugin.areaProvider().getAreas() .filter(area -> area instanceof SchematicHolder) .map(Area::getName) - .map(Suggestion::simple) + .map(Suggestion::suggestion) .toList())) .handler(this::execute); } diff --git a/plugin/src/main/java/net/thenextlvl/protect/command/AreaSelectCommand.java b/plugin/src/main/java/net/thenextlvl/protect/command/AreaSelectCommand.java index 8ef1e76..ce37c41 100644 --- a/plugin/src/main/java/net/thenextlvl/protect/command/AreaSelectCommand.java +++ b/plugin/src/main/java/net/thenextlvl/protect/command/AreaSelectCommand.java @@ -37,7 +37,7 @@ Command.Builder create() { SuggestionProvider.blocking((context, input) -> plugin.areaProvider().getAreas() .filter(area -> area instanceof RegionizedArea) .map(Area::getName) - .map(Suggestion::simple) + .map(Suggestion::suggestion) .toList())) .handler(this::execute); } diff --git a/plugin/src/main/java/net/thenextlvl/protect/command/AreaTeleportCommand.java b/plugin/src/main/java/net/thenextlvl/protect/command/AreaTeleportCommand.java index f008257..3e9d21b 100644 --- a/plugin/src/main/java/net/thenextlvl/protect/command/AreaTeleportCommand.java +++ b/plugin/src/main/java/net/thenextlvl/protect/command/AreaTeleportCommand.java @@ -32,7 +32,7 @@ Command.Builder create() { SuggestionProvider.blocking((context, input) -> plugin.areaProvider().getAreas() .filter(area -> area instanceof RegionizedArea) .map(Area::getName) - .map(Suggestion::simple) + .map(Suggestion::suggestion) .toList())) .senderType(Player.class) .handler(this::execute);