From a65983261380fa577d18041d652d68e19b85aca2 Mon Sep 17 00:00:00 2001 From: SirYwell Date: Mon, 29 Jan 2024 15:04:53 +0100 Subject: [PATCH] update cloud --- .../java/com/plotsquared/core/command/Auto.java | 2 +- .../core/commands/CommandRequirement.java | 6 +++--- .../core/commands/CommonCommandRequirement.java | 2 +- .../commands/PlotSquaredCaptionProvider.java | 4 ++-- .../core/commands/PlotSquaredCommandBean.java | 6 +++--- .../core/commands/PlotSquaredCommandManager.java | 4 ++-- .../core/commands/PlotSquaredCommandMeta.java | 4 ++-- .../PlotSquaredRequirementFailureHandler.java | 2 +- .../command/setting/flag/FlagAddCommand.java | 8 ++++---- .../command/setting/flag/FlagCommandBean.java | 2 +- .../command/setting/flag/FlagInfoCommand.java | 6 +++--- .../command/setting/flag/FlagListCommand.java | 4 ++-- .../command/setting/flag/FlagRemoveCommand.java | 8 ++++---- .../command/setting/flag/FlagSetCommand.java | 8 ++++---- .../core/commands/injection/PlotInjector.java | 6 +++--- .../core/commands/parser/PlotFlagParser.java | 16 ++++++++-------- .../suggestions/FlagValueSuggestionProvider.java | 14 +++++++++----- .../caption/TranslatableCaption.java | 2 +- .../core/services/plots/AutoService.java | 2 +- gradle/libs.versions.toml | 12 ++++++------ 20 files changed, 61 insertions(+), 57 deletions(-) diff --git a/Core/src/main/java/com/plotsquared/core/command/Auto.java b/Core/src/main/java/com/plotsquared/core/command/Auto.java index 600ba96d2..8008c3b53 100644 --- a/Core/src/main/java/com/plotsquared/core/command/Auto.java +++ b/Core/src/main/java/com/plotsquared/core/command/Auto.java @@ -18,7 +18,6 @@ */ package com.plotsquared.core.command; -import cloud.commandframework.services.ServicePipeline; import com.google.inject.Inject; import com.plotsquared.core.PlotSquared; import com.plotsquared.core.configuration.Settings; @@ -49,6 +48,7 @@ import net.kyori.adventure.text.minimessage.tag.Tag; import net.kyori.adventure.text.minimessage.tag.resolver.TagResolver; import org.checkerframework.checker.nullness.qual.NonNull; import org.checkerframework.checker.nullness.qual.Nullable; +import org.incendo.cloud.services.ServicePipeline; import java.util.Collections; import java.util.Iterator; diff --git a/Core/src/main/java/com/plotsquared/core/commands/CommandRequirement.java b/Core/src/main/java/com/plotsquared/core/commands/CommandRequirement.java index e7dcf458a..e5ea95ee5 100644 --- a/Core/src/main/java/com/plotsquared/core/commands/CommandRequirement.java +++ b/Core/src/main/java/com/plotsquared/core/commands/CommandRequirement.java @@ -18,8 +18,6 @@ */ package com.plotsquared.core.commands; -import cloud.commandframework.context.CommandContext; -import cloud.commandframework.keys.CloudKey; import com.plotsquared.core.configuration.caption.TranslatableCaption; import com.plotsquared.core.permissions.Permission; import com.plotsquared.core.player.PlotPlayer; @@ -27,6 +25,8 @@ import io.leangen.geantyref.TypeToken; import net.kyori.adventure.text.minimessage.tag.Tag; import net.kyori.adventure.text.minimessage.tag.resolver.TagResolver; import org.checkerframework.checker.nullness.qual.NonNull; +import org.incendo.cloud.context.CommandContext; +import org.incendo.cloud.key.CloudKey; import org.incendo.cloud.processors.requirements.Requirement; import org.incendo.cloud.processors.requirements.Requirements; @@ -38,7 +38,7 @@ import java.util.List; public interface CommandRequirement extends Requirement, CommandRequirement> { /** - * The key used to store the requirements in the {@link cloud.commandframework.meta.CommandMeta}. + * The key used to store the requirements in the {@link org.incendo.cloud.meta.CommandMeta}. */ CloudKey, CommandRequirement>> REQUIREMENTS_KEY = CloudKey.of( "requirements", diff --git a/Core/src/main/java/com/plotsquared/core/commands/CommonCommandRequirement.java b/Core/src/main/java/com/plotsquared/core/commands/CommonCommandRequirement.java index 30914c564..8f4708bdf 100644 --- a/Core/src/main/java/com/plotsquared/core/commands/CommonCommandRequirement.java +++ b/Core/src/main/java/com/plotsquared/core/commands/CommonCommandRequirement.java @@ -18,10 +18,10 @@ */ package com.plotsquared.core.commands; -import cloud.commandframework.context.CommandContext; import com.plotsquared.core.configuration.caption.TranslatableCaption; import com.plotsquared.core.player.PlotPlayer; import org.checkerframework.checker.nullness.qual.NonNull; +import org.incendo.cloud.context.CommandContext; import java.util.Arrays; import java.util.List; diff --git a/Core/src/main/java/com/plotsquared/core/commands/PlotSquaredCaptionProvider.java b/Core/src/main/java/com/plotsquared/core/commands/PlotSquaredCaptionProvider.java index 9e1f4e6a7..737cbdc57 100644 --- a/Core/src/main/java/com/plotsquared/core/commands/PlotSquaredCaptionProvider.java +++ b/Core/src/main/java/com/plotsquared/core/commands/PlotSquaredCaptionProvider.java @@ -18,8 +18,6 @@ */ package com.plotsquared.core.commands; -import cloud.commandframework.captions.Caption; -import cloud.commandframework.captions.CaptionProvider; import com.plotsquared.core.PlotSquared; import com.plotsquared.core.configuration.caption.CaptionMap; import com.plotsquared.core.configuration.caption.TranslatableCaption; @@ -28,6 +26,8 @@ import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.checkerframework.checker.nullness.qual.NonNull; import org.checkerframework.checker.nullness.qual.Nullable; +import org.incendo.cloud.caption.Caption; +import org.incendo.cloud.caption.CaptionProvider; /** * {@link CaptionProvider} that retrieves caption values from the {@link CaptionMap caption map}. diff --git a/Core/src/main/java/com/plotsquared/core/commands/PlotSquaredCommandBean.java b/Core/src/main/java/com/plotsquared/core/commands/PlotSquaredCommandBean.java index d59bb524c..37989cba7 100644 --- a/Core/src/main/java/com/plotsquared/core/commands/PlotSquaredCommandBean.java +++ b/Core/src/main/java/com/plotsquared/core/commands/PlotSquaredCommandBean.java @@ -18,12 +18,12 @@ */ package com.plotsquared.core.commands; -import cloud.commandframework.Command; -import cloud.commandframework.CommandBean; -import cloud.commandframework.CommandProperties; import com.plotsquared.core.command.CommandCategory; import com.plotsquared.core.player.PlotPlayer; import org.checkerframework.checker.nullness.qual.NonNull; +import org.incendo.cloud.Command; +import org.incendo.cloud.bean.CommandBean; +import org.incendo.cloud.bean.CommandProperties; import org.incendo.cloud.processors.requirements.RequirementApplicable; import org.incendo.cloud.processors.requirements.Requirements; diff --git a/Core/src/main/java/com/plotsquared/core/commands/PlotSquaredCommandManager.java b/Core/src/main/java/com/plotsquared/core/commands/PlotSquaredCommandManager.java index 031413c96..ad5ec2d4e 100644 --- a/Core/src/main/java/com/plotsquared/core/commands/PlotSquaredCommandManager.java +++ b/Core/src/main/java/com/plotsquared/core/commands/PlotSquaredCommandManager.java @@ -18,8 +18,6 @@ */ package com.plotsquared.core.commands; -import cloud.commandframework.CommandManager; -import cloud.commandframework.annotations.injection.GuiceInjectionService; import com.google.inject.Inject; import com.google.inject.Injector; import com.google.inject.Key; @@ -29,6 +27,8 @@ import com.plotsquared.core.commands.injection.PlotInjector; import com.plotsquared.core.player.PlotPlayer; import com.plotsquared.core.plot.Plot; import org.checkerframework.checker.nullness.qual.NonNull; +import org.incendo.cloud.CommandManager; +import org.incendo.cloud.injection.GuiceInjectionService; import java.util.Set; diff --git a/Core/src/main/java/com/plotsquared/core/commands/PlotSquaredCommandMeta.java b/Core/src/main/java/com/plotsquared/core/commands/PlotSquaredCommandMeta.java index e219deeed..0234b2c7c 100644 --- a/Core/src/main/java/com/plotsquared/core/commands/PlotSquaredCommandMeta.java +++ b/Core/src/main/java/com/plotsquared/core/commands/PlotSquaredCommandMeta.java @@ -18,11 +18,11 @@ */ package com.plotsquared.core.commands; -import cloud.commandframework.keys.CloudKey; import com.plotsquared.core.command.CommandCategory; +import org.incendo.cloud.key.CloudKey; /** - * Shared {@link cloud.commandframework.meta.CommandMeta command meta} keys. + * Shared {@link org.incendo.cloud.meta.CommandMeta command meta} keys. */ public final class PlotSquaredCommandMeta { diff --git a/Core/src/main/java/com/plotsquared/core/commands/PlotSquaredRequirementFailureHandler.java b/Core/src/main/java/com/plotsquared/core/commands/PlotSquaredRequirementFailureHandler.java index 5db8ceecb..34605924e 100644 --- a/Core/src/main/java/com/plotsquared/core/commands/PlotSquaredRequirementFailureHandler.java +++ b/Core/src/main/java/com/plotsquared/core/commands/PlotSquaredRequirementFailureHandler.java @@ -18,9 +18,9 @@ */ package com.plotsquared.core.commands; -import cloud.commandframework.context.CommandContext; import com.plotsquared.core.player.PlotPlayer; import org.checkerframework.checker.nullness.qual.NonNull; +import org.incendo.cloud.context.CommandContext; import org.incendo.cloud.processors.requirements.RequirementFailureHandler; public final class PlotSquaredRequirementFailureHandler implements RequirementFailureHandler, CommandRequirement> { diff --git a/Core/src/main/java/com/plotsquared/core/commands/command/setting/flag/FlagAddCommand.java b/Core/src/main/java/com/plotsquared/core/commands/command/setting/flag/FlagAddCommand.java index 01d5f0f2d..3e5b53a36 100644 --- a/Core/src/main/java/com/plotsquared/core/commands/command/setting/flag/FlagAddCommand.java +++ b/Core/src/main/java/com/plotsquared/core/commands/command/setting/flag/FlagAddCommand.java @@ -18,9 +18,6 @@ */ package com.plotsquared.core.commands.command.setting.flag; -import cloud.commandframework.Command; -import cloud.commandframework.context.CommandContext; -import cloud.commandframework.keys.CloudKey; import com.google.inject.Inject; import com.plotsquared.core.commands.parser.PlotFlagParser; import com.plotsquared.core.commands.suggestions.FlagValueSuggestionProvider; @@ -38,9 +35,12 @@ import net.kyori.adventure.text.Component; import net.kyori.adventure.text.minimessage.tag.Tag; import net.kyori.adventure.text.minimessage.tag.resolver.TagResolver; import org.checkerframework.checker.nullness.qual.NonNull; +import org.incendo.cloud.Command; +import org.incendo.cloud.context.CommandContext; +import org.incendo.cloud.key.CloudKey; -import static cloud.commandframework.arguments.standard.StringParser.greedyStringParser; import static com.plotsquared.core.commands.parser.PlotFlagParser.plotFlagParser; +import static org.incendo.cloud.parser.standard.StringParser.greedyStringParser; public final class FlagAddCommand extends FlagCommandBean { diff --git a/Core/src/main/java/com/plotsquared/core/commands/command/setting/flag/FlagCommandBean.java b/Core/src/main/java/com/plotsquared/core/commands/command/setting/flag/FlagCommandBean.java index d29bdcb83..cc0435519 100644 --- a/Core/src/main/java/com/plotsquared/core/commands/command/setting/flag/FlagCommandBean.java +++ b/Core/src/main/java/com/plotsquared/core/commands/command/setting/flag/FlagCommandBean.java @@ -18,7 +18,6 @@ */ package com.plotsquared.core.commands.command.setting.flag; -import cloud.commandframework.Command; import com.plotsquared.core.PlotSquared; import com.plotsquared.core.command.CommandCategory; import com.plotsquared.core.commands.CommandRequirement; @@ -37,6 +36,7 @@ import net.kyori.adventure.text.Component; import net.kyori.adventure.text.minimessage.tag.Tag; import net.kyori.adventure.text.minimessage.tag.resolver.TagResolver; import org.checkerframework.checker.nullness.qual.NonNull; +import org.incendo.cloud.Command; import java.util.List; diff --git a/Core/src/main/java/com/plotsquared/core/commands/command/setting/flag/FlagInfoCommand.java b/Core/src/main/java/com/plotsquared/core/commands/command/setting/flag/FlagInfoCommand.java index b92722a14..019da916b 100644 --- a/Core/src/main/java/com/plotsquared/core/commands/command/setting/flag/FlagInfoCommand.java +++ b/Core/src/main/java/com/plotsquared/core/commands/command/setting/flag/FlagInfoCommand.java @@ -18,9 +18,6 @@ */ package com.plotsquared.core.commands.command.setting.flag; -import cloud.commandframework.Command; -import cloud.commandframework.context.CommandContext; -import cloud.commandframework.keys.CloudKey; import com.plotsquared.core.commands.parser.PlotFlagParser; import com.plotsquared.core.configuration.caption.TranslatableCaption; import com.plotsquared.core.player.PlotPlayer; @@ -30,6 +27,9 @@ import net.kyori.adventure.text.Component; import net.kyori.adventure.text.minimessage.tag.Tag; import net.kyori.adventure.text.minimessage.tag.resolver.TagResolver; import org.checkerframework.checker.nullness.qual.NonNull; +import org.incendo.cloud.Command; +import org.incendo.cloud.context.CommandContext; +import org.incendo.cloud.key.CloudKey; import static com.plotsquared.core.commands.parser.PlotFlagParser.plotFlagParser; diff --git a/Core/src/main/java/com/plotsquared/core/commands/command/setting/flag/FlagListCommand.java b/Core/src/main/java/com/plotsquared/core/commands/command/setting/flag/FlagListCommand.java index 703dd9981..215685b52 100644 --- a/Core/src/main/java/com/plotsquared/core/commands/command/setting/flag/FlagListCommand.java +++ b/Core/src/main/java/com/plotsquared/core/commands/command/setting/flag/FlagListCommand.java @@ -18,8 +18,6 @@ */ package com.plotsquared.core.commands.command.setting.flag; -import cloud.commandframework.Command; -import cloud.commandframework.context.CommandContext; import com.plotsquared.core.configuration.caption.StaticCaption; import com.plotsquared.core.configuration.caption.TranslatableCaption; import com.plotsquared.core.player.PlotPlayer; @@ -33,6 +31,8 @@ import net.kyori.adventure.text.minimessage.MiniMessage; import net.kyori.adventure.text.minimessage.tag.Tag; import net.kyori.adventure.text.minimessage.tag.resolver.TagResolver; import org.checkerframework.checker.nullness.qual.NonNull; +import org.incendo.cloud.Command; +import org.incendo.cloud.context.CommandContext; import java.util.ArrayList; import java.util.Collection; diff --git a/Core/src/main/java/com/plotsquared/core/commands/command/setting/flag/FlagRemoveCommand.java b/Core/src/main/java/com/plotsquared/core/commands/command/setting/flag/FlagRemoveCommand.java index b1abd2833..1245c43ea 100644 --- a/Core/src/main/java/com/plotsquared/core/commands/command/setting/flag/FlagRemoveCommand.java +++ b/Core/src/main/java/com/plotsquared/core/commands/command/setting/flag/FlagRemoveCommand.java @@ -18,9 +18,6 @@ */ package com.plotsquared.core.commands.command.setting.flag; -import cloud.commandframework.Command; -import cloud.commandframework.context.CommandContext; -import cloud.commandframework.keys.CloudKey; import com.google.inject.Inject; import com.plotsquared.core.commands.parser.PlotFlagParser; import com.plotsquared.core.commands.suggestions.FlagValueSuggestionProvider; @@ -40,13 +37,16 @@ import net.kyori.adventure.text.Component; import net.kyori.adventure.text.minimessage.tag.Tag; import net.kyori.adventure.text.minimessage.tag.resolver.TagResolver; import org.checkerframework.checker.nullness.qual.NonNull; +import org.incendo.cloud.Command; +import org.incendo.cloud.context.CommandContext; +import org.incendo.cloud.key.CloudKey; import java.util.ArrayList; import java.util.List; import java.util.Locale; -import static cloud.commandframework.arguments.standard.StringParser.greedyStringParser; import static com.plotsquared.core.commands.parser.PlotFlagParser.plotFlagParser; +import static org.incendo.cloud.parser.standard.StringParser.greedyStringParser; public final class FlagRemoveCommand extends FlagCommandBean { diff --git a/Core/src/main/java/com/plotsquared/core/commands/command/setting/flag/FlagSetCommand.java b/Core/src/main/java/com/plotsquared/core/commands/command/setting/flag/FlagSetCommand.java index b9dc711b0..b8790cde6 100644 --- a/Core/src/main/java/com/plotsquared/core/commands/command/setting/flag/FlagSetCommand.java +++ b/Core/src/main/java/com/plotsquared/core/commands/command/setting/flag/FlagSetCommand.java @@ -18,9 +18,6 @@ */ package com.plotsquared.core.commands.command.setting.flag; -import cloud.commandframework.Command; -import cloud.commandframework.context.CommandContext; -import cloud.commandframework.keys.CloudKey; import com.google.inject.Inject; import com.plotsquared.core.commands.parser.PlotFlagParser; import com.plotsquared.core.commands.suggestions.FlagValueSuggestionProvider; @@ -38,9 +35,12 @@ import net.kyori.adventure.text.Component; import net.kyori.adventure.text.minimessage.tag.Tag; import net.kyori.adventure.text.minimessage.tag.resolver.TagResolver; import org.checkerframework.checker.nullness.qual.NonNull; +import org.incendo.cloud.Command; +import org.incendo.cloud.context.CommandContext; +import org.incendo.cloud.key.CloudKey; -import static cloud.commandframework.arguments.standard.StringParser.greedyStringParser; import static com.plotsquared.core.commands.parser.PlotFlagParser.plotFlagParser; +import static org.incendo.cloud.parser.standard.StringParser.greedyStringParser; public final class FlagSetCommand extends FlagCommandBean { diff --git a/Core/src/main/java/com/plotsquared/core/commands/injection/PlotInjector.java b/Core/src/main/java/com/plotsquared/core/commands/injection/PlotInjector.java index 4c9eadab0..23a3c2e89 100644 --- a/Core/src/main/java/com/plotsquared/core/commands/injection/PlotInjector.java +++ b/Core/src/main/java/com/plotsquared/core/commands/injection/PlotInjector.java @@ -18,13 +18,13 @@ */ package com.plotsquared.core.commands.injection; -import cloud.commandframework.annotations.AnnotationAccessor; -import cloud.commandframework.annotations.injection.ParameterInjector; -import cloud.commandframework.context.CommandContext; import com.plotsquared.core.player.PlotPlayer; import com.plotsquared.core.plot.Plot; import org.checkerframework.checker.nullness.qual.NonNull; import org.checkerframework.checker.nullness.qual.Nullable; +import org.incendo.cloud.context.CommandContext; +import org.incendo.cloud.injection.ParameterInjector; +import org.incendo.cloud.util.annotation.AnnotationAccessor; /** * {@link ParameterInjector} that returns the current plot of the player. diff --git a/Core/src/main/java/com/plotsquared/core/commands/parser/PlotFlagParser.java b/Core/src/main/java/com/plotsquared/core/commands/parser/PlotFlagParser.java index 101149ba6..41077f140 100644 --- a/Core/src/main/java/com/plotsquared/core/commands/parser/PlotFlagParser.java +++ b/Core/src/main/java/com/plotsquared/core/commands/parser/PlotFlagParser.java @@ -18,14 +18,6 @@ */ package com.plotsquared.core.commands.parser; -import cloud.commandframework.arguments.parser.ArgumentParseResult; -import cloud.commandframework.arguments.parser.ArgumentParser; -import cloud.commandframework.arguments.parser.ParserDescriptor; -import cloud.commandframework.arguments.suggestion.BlockingSuggestionProvider; -import cloud.commandframework.arguments.suggestion.Suggestion; -import cloud.commandframework.context.CommandContext; -import cloud.commandframework.context.CommandInput; -import cloud.commandframework.exceptions.parsing.ParserException; import com.plotsquared.core.configuration.caption.LocaleHolder; import com.plotsquared.core.configuration.caption.TranslatableCaption; import com.plotsquared.core.player.PlotPlayer; @@ -38,6 +30,14 @@ import io.leangen.geantyref.TypeToken; import net.kyori.adventure.text.Component; import net.kyori.adventure.util.ComponentMessageThrowable; import org.checkerframework.checker.nullness.qual.NonNull; +import org.incendo.cloud.context.CommandContext; +import org.incendo.cloud.context.CommandInput; +import org.incendo.cloud.exception.parsing.ParserException; +import org.incendo.cloud.parser.ArgumentParseResult; +import org.incendo.cloud.parser.ArgumentParser; +import org.incendo.cloud.parser.ParserDescriptor; +import org.incendo.cloud.suggestion.BlockingSuggestionProvider; +import org.incendo.cloud.suggestion.Suggestion; import java.util.Collection; import java.util.function.Function; diff --git a/Core/src/main/java/com/plotsquared/core/commands/suggestions/FlagValueSuggestionProvider.java b/Core/src/main/java/com/plotsquared/core/commands/suggestions/FlagValueSuggestionProvider.java index 0c86b1ce0..2eba3716c 100644 --- a/Core/src/main/java/com/plotsquared/core/commands/suggestions/FlagValueSuggestionProvider.java +++ b/Core/src/main/java/com/plotsquared/core/commands/suggestions/FlagValueSuggestionProvider.java @@ -18,16 +18,20 @@ */ package com.plotsquared.core.commands.suggestions; -import cloud.commandframework.arguments.suggestion.BlockingSuggestionProvider; -import cloud.commandframework.context.CommandContext; -import cloud.commandframework.context.CommandInput; -import cloud.commandframework.keys.CloudKey; import com.plotsquared.core.player.PlotPlayer; import com.plotsquared.core.plot.flag.PlotFlag; import com.plotsquared.core.plot.flag.types.ListFlag; import org.checkerframework.checker.nullness.qual.NonNull; +import org.incendo.cloud.context.CommandContext; +import org.incendo.cloud.context.CommandInput; +import org.incendo.cloud.key.CloudKey; +import org.incendo.cloud.suggestion.BlockingSuggestionProvider; -import java.util.*; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Collection; +import java.util.List; +import java.util.Objects; import java.util.stream.Collectors; /** diff --git a/Core/src/main/java/com/plotsquared/core/configuration/caption/TranslatableCaption.java b/Core/src/main/java/com/plotsquared/core/configuration/caption/TranslatableCaption.java index a8193e271..28e1aec43 100644 --- a/Core/src/main/java/com/plotsquared/core/configuration/caption/TranslatableCaption.java +++ b/Core/src/main/java/com/plotsquared/core/configuration/caption/TranslatableCaption.java @@ -18,7 +18,6 @@ */ package com.plotsquared.core.configuration.caption; -import cloud.commandframework.captions.Caption; import com.google.common.base.Objects; import com.plotsquared.core.PlotSquared; import net.kyori.adventure.text.Component; @@ -26,6 +25,7 @@ import net.kyori.adventure.text.minimessage.MiniMessage; import net.kyori.adventure.text.minimessage.tag.Tag; import net.kyori.adventure.text.minimessage.tag.resolver.TagResolver; import org.checkerframework.checker.nullness.qual.NonNull; +import org.incendo.cloud.caption.Caption; import org.jetbrains.annotations.NotNull; import java.util.Locale; diff --git a/Core/src/main/java/com/plotsquared/core/services/plots/AutoService.java b/Core/src/main/java/com/plotsquared/core/services/plots/AutoService.java index b2fdb1441..4ed178e72 100644 --- a/Core/src/main/java/com/plotsquared/core/services/plots/AutoService.java +++ b/Core/src/main/java/com/plotsquared/core/services/plots/AutoService.java @@ -18,7 +18,6 @@ */ package com.plotsquared.core.services.plots; -import cloud.commandframework.services.types.Service; import com.google.common.cache.Cache; import com.google.common.cache.CacheBuilder; import com.plotsquared.core.plot.Plot; @@ -26,6 +25,7 @@ import com.plotsquared.core.plot.PlotAreaType; import com.plotsquared.core.plot.PlotId; import org.checkerframework.checker.nullness.qual.NonNull; import org.checkerframework.checker.nullness.qual.Nullable; +import org.incendo.cloud.services.type.Service; import java.util.Collections; import java.util.List; diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 50e794a30..4295d9e80 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -31,8 +31,8 @@ paperlib = "1.0.8" informative-annotations = "1.4" vault = "1.7.1" serverlib = "2.3.4" -cloud = "2.0.0-SNAPSHOT" -cloudRequirements = "1.0.0-SNAPSHOT" +cloud = "2.0.0-beta.1" +cloudRequirements = "1.0.0-beta.1" # Gradle plugins shadow = "8.1.1" @@ -68,7 +68,7 @@ faweBukkit = { group = "com.fastasyncworldedit", name = "FastAsyncWorldEdit-Bukk # Third party prtree = { group = "com.intellectualsites.prtree", name = "PRTree", version.ref = "prtree" } aopalliance = { group = "aopalliance", name = "aopalliance", version.ref = "aopalliance" } -cloudServices = { group = "cloud.commandframework", name = "cloud-services", version.ref = "cloud-services" } +cloudServices = { group = "org.incendo", name = "cloud-services", version.ref = "cloud-services" } mvdwapi = { group = "com.intellectualsites.mvdwplaceholderapi", name = "MVdWPlaceholderAPI", version.ref = "mvdwapi" } squirrelid = { group = "org.enginehub", name = "squirrelid", version.ref = "squirrelid" } arkitektonika = { group = "com.intellectualsites.arkitektonika", name = "Arkitektonika-Client", version.ref = "arkitektonika" } @@ -79,9 +79,9 @@ informativeAnnotations = { group = "com.intellectualsites.informative-annotation paperlib = { group = "io.papermc", name = "paperlib", version.ref = "paperlib" } vault = { group = "com.github.MilkBowl", name = "VaultAPI", version.ref = "vault" } serverlib = { group = "dev.notmyfault.serverlib", name = "ServerLib", version.ref = "serverlib" } -cloud = { group = "cloud.commandframework", name = "cloud-core", version.ref = "cloud" } -cloudPaper = { group = "cloud.commandframework", name = "cloud-paper", version.ref = "cloud" } -cloudMinecraftExtras = { group = "cloud.commandframework", name = "cloud-minecraft-extras", version.ref = "cloud" } +cloud = { group = "org.incendo", name = "cloud-core", version.ref = "cloud" } +cloudPaper = { group = "org.incendo", name = "cloud-paper", version.ref = "cloud" } +cloudMinecraftExtras = { group = "org.incendo", name = "cloud-minecraft-extras", version.ref = "cloud" } cloudRequirements = { group = "org.incendo", name = "cloud-processors-requirements", version.ref = "cloudRequirements" } [plugins]