From ffeb7a584d6a897ce496df214a3f3013235e1217 Mon Sep 17 00:00:00 2001 From: broccoli Date: Sat, 3 Aug 2024 21:37:38 +0100 Subject: [PATCH] chore(paper): move simple sender mapper to util --- .../cloud/paper/{ => util}/sender/ConsoleSource.java | 2 +- .../cloud/paper/{ => util}/sender/EntitySource.java | 2 +- .../cloud/paper/{ => util}/sender/GenericSource.java | 2 +- .../paper/{ => util}/sender/PaperSimpleSenderMapper.java | 2 +- .../cloud/paper/{ => util}/sender/PlayerSource.java | 2 +- .../org/incendo/cloud/paper/{ => util}/sender/Source.java | 2 +- .../cloud/paper/{ => util}/sender/package-info.java | 2 +- .../org/incendo/cloud/examples/paper/PaperPlugin.java | 2 +- .../org/incendo/cloud/examples/paper/PluginBootstrap.java | 8 ++++---- 9 files changed, 12 insertions(+), 12 deletions(-) rename cloud-paper/src/main/java/org/incendo/cloud/paper/{ => util}/sender/ConsoleSource.java (97%) rename cloud-paper/src/main/java/org/incendo/cloud/paper/{ => util}/sender/EntitySource.java (97%) rename cloud-paper/src/main/java/org/incendo/cloud/paper/{ => util}/sender/GenericSource.java (97%) rename cloud-paper/src/main/java/org/incendo/cloud/paper/{ => util}/sender/PaperSimpleSenderMapper.java (98%) rename cloud-paper/src/main/java/org/incendo/cloud/paper/{ => util}/sender/PlayerSource.java (97%) rename cloud-paper/src/main/java/org/incendo/cloud/paper/{ => util}/sender/Source.java (97%) rename cloud-paper/src/main/java/org/incendo/cloud/paper/{ => util}/sender/package-info.java (57%) diff --git a/cloud-paper/src/main/java/org/incendo/cloud/paper/sender/ConsoleSource.java b/cloud-paper/src/main/java/org/incendo/cloud/paper/util/sender/ConsoleSource.java similarity index 97% rename from cloud-paper/src/main/java/org/incendo/cloud/paper/sender/ConsoleSource.java rename to cloud-paper/src/main/java/org/incendo/cloud/paper/util/sender/ConsoleSource.java index e64a95ae..93ffe1b2 100644 --- a/cloud-paper/src/main/java/org/incendo/cloud/paper/sender/ConsoleSource.java +++ b/cloud-paper/src/main/java/org/incendo/cloud/paper/util/sender/ConsoleSource.java @@ -21,7 +21,7 @@ // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE // SOFTWARE. // -package org.incendo.cloud.paper.sender; +package org.incendo.cloud.paper.util.sender; import io.papermc.paper.command.brigadier.CommandSourceStack; import org.bukkit.command.ConsoleCommandSender; diff --git a/cloud-paper/src/main/java/org/incendo/cloud/paper/sender/EntitySource.java b/cloud-paper/src/main/java/org/incendo/cloud/paper/util/sender/EntitySource.java similarity index 97% rename from cloud-paper/src/main/java/org/incendo/cloud/paper/sender/EntitySource.java rename to cloud-paper/src/main/java/org/incendo/cloud/paper/util/sender/EntitySource.java index 08a56ba0..b0e48542 100644 --- a/cloud-paper/src/main/java/org/incendo/cloud/paper/sender/EntitySource.java +++ b/cloud-paper/src/main/java/org/incendo/cloud/paper/util/sender/EntitySource.java @@ -21,7 +21,7 @@ // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE // SOFTWARE. // -package org.incendo.cloud.paper.sender; +package org.incendo.cloud.paper.util.sender; import io.papermc.paper.command.brigadier.CommandSourceStack; import org.bukkit.entity.Entity; diff --git a/cloud-paper/src/main/java/org/incendo/cloud/paper/sender/GenericSource.java b/cloud-paper/src/main/java/org/incendo/cloud/paper/util/sender/GenericSource.java similarity index 97% rename from cloud-paper/src/main/java/org/incendo/cloud/paper/sender/GenericSource.java rename to cloud-paper/src/main/java/org/incendo/cloud/paper/util/sender/GenericSource.java index bb5d39c1..2274590e 100644 --- a/cloud-paper/src/main/java/org/incendo/cloud/paper/sender/GenericSource.java +++ b/cloud-paper/src/main/java/org/incendo/cloud/paper/util/sender/GenericSource.java @@ -21,7 +21,7 @@ // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE // SOFTWARE. // -package org.incendo.cloud.paper.sender; +package org.incendo.cloud.paper.util.sender; import io.papermc.paper.command.brigadier.CommandSourceStack; import net.kyori.adventure.audience.Audience; diff --git a/cloud-paper/src/main/java/org/incendo/cloud/paper/sender/PaperSimpleSenderMapper.java b/cloud-paper/src/main/java/org/incendo/cloud/paper/util/sender/PaperSimpleSenderMapper.java similarity index 98% rename from cloud-paper/src/main/java/org/incendo/cloud/paper/sender/PaperSimpleSenderMapper.java rename to cloud-paper/src/main/java/org/incendo/cloud/paper/util/sender/PaperSimpleSenderMapper.java index 89241d84..8b7f6b8b 100644 --- a/cloud-paper/src/main/java/org/incendo/cloud/paper/sender/PaperSimpleSenderMapper.java +++ b/cloud-paper/src/main/java/org/incendo/cloud/paper/util/sender/PaperSimpleSenderMapper.java @@ -21,7 +21,7 @@ // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE // SOFTWARE. // -package org.incendo.cloud.paper.sender; +package org.incendo.cloud.paper.util.sender; import io.papermc.paper.command.brigadier.CommandSourceStack; import org.bukkit.command.CommandSender; diff --git a/cloud-paper/src/main/java/org/incendo/cloud/paper/sender/PlayerSource.java b/cloud-paper/src/main/java/org/incendo/cloud/paper/util/sender/PlayerSource.java similarity index 97% rename from cloud-paper/src/main/java/org/incendo/cloud/paper/sender/PlayerSource.java rename to cloud-paper/src/main/java/org/incendo/cloud/paper/util/sender/PlayerSource.java index 50dea2eb..2239d766 100644 --- a/cloud-paper/src/main/java/org/incendo/cloud/paper/sender/PlayerSource.java +++ b/cloud-paper/src/main/java/org/incendo/cloud/paper/util/sender/PlayerSource.java @@ -21,7 +21,7 @@ // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE // SOFTWARE. // -package org.incendo.cloud.paper.sender; +package org.incendo.cloud.paper.util.sender; import io.papermc.paper.command.brigadier.CommandSourceStack; import org.bukkit.entity.Player; diff --git a/cloud-paper/src/main/java/org/incendo/cloud/paper/sender/Source.java b/cloud-paper/src/main/java/org/incendo/cloud/paper/util/sender/Source.java similarity index 97% rename from cloud-paper/src/main/java/org/incendo/cloud/paper/sender/Source.java rename to cloud-paper/src/main/java/org/incendo/cloud/paper/util/sender/Source.java index 408e8f96..95f757ad 100644 --- a/cloud-paper/src/main/java/org/incendo/cloud/paper/sender/Source.java +++ b/cloud-paper/src/main/java/org/incendo/cloud/paper/util/sender/Source.java @@ -21,7 +21,7 @@ // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE // SOFTWARE. // -package org.incendo.cloud.paper.sender; +package org.incendo.cloud.paper.util.sender; import io.papermc.paper.command.brigadier.CommandSourceStack; import net.kyori.adventure.audience.Audience; diff --git a/cloud-paper/src/main/java/org/incendo/cloud/paper/sender/package-info.java b/cloud-paper/src/main/java/org/incendo/cloud/paper/util/sender/package-info.java similarity index 57% rename from cloud-paper/src/main/java/org/incendo/cloud/paper/sender/package-info.java rename to cloud-paper/src/main/java/org/incendo/cloud/paper/util/sender/package-info.java index a37709aa..bf23f0cd 100644 --- a/cloud-paper/src/main/java/org/incendo/cloud/paper/sender/package-info.java +++ b/cloud-paper/src/main/java/org/incendo/cloud/paper/util/sender/package-info.java @@ -1,4 +1,4 @@ /** * Built in CommandSender mappings for Modern Paper. */ -package org.incendo.cloud.paper.sender; +package org.incendo.cloud.paper.util.sender; diff --git a/examples/example-paper/src/main/java/org/incendo/cloud/examples/paper/PaperPlugin.java b/examples/example-paper/src/main/java/org/incendo/cloud/examples/paper/PaperPlugin.java index 69bb9792..e2061c3b 100644 --- a/examples/example-paper/src/main/java/org/incendo/cloud/examples/paper/PaperPlugin.java +++ b/examples/example-paper/src/main/java/org/incendo/cloud/examples/paper/PaperPlugin.java @@ -27,7 +27,7 @@ import org.checkerframework.checker.nullness.qual.NonNull; import org.checkerframework.framework.qual.DefaultQualifier; import org.incendo.cloud.paper.PaperCommandManager; -import org.incendo.cloud.paper.sender.Source; +import org.incendo.cloud.paper.util.sender.Source; @DefaultQualifier(NonNull.class) public final class PaperPlugin extends JavaPlugin { diff --git a/examples/example-paper/src/main/java/org/incendo/cloud/examples/paper/PluginBootstrap.java b/examples/example-paper/src/main/java/org/incendo/cloud/examples/paper/PluginBootstrap.java index e09a05c6..175ab573 100644 --- a/examples/example-paper/src/main/java/org/incendo/cloud/examples/paper/PluginBootstrap.java +++ b/examples/example-paper/src/main/java/org/incendo/cloud/examples/paper/PluginBootstrap.java @@ -33,10 +33,10 @@ import org.checkerframework.framework.qual.DefaultQualifier; import org.incendo.cloud.execution.ExecutionCoordinator; import org.incendo.cloud.paper.PaperCommandManager; -import org.incendo.cloud.paper.sender.ConsoleSource; -import org.incendo.cloud.paper.sender.PaperSimpleSenderMapper; -import org.incendo.cloud.paper.sender.PlayerSource; -import org.incendo.cloud.paper.sender.Source; +import org.incendo.cloud.paper.util.sender.ConsoleSource; +import org.incendo.cloud.paper.util.sender.PaperSimpleSenderMapper; +import org.incendo.cloud.paper.util.sender.PlayerSource; +import org.incendo.cloud.paper.util.sender.Source; import org.incendo.cloud.setting.ManagerSetting; import static org.incendo.cloud.parser.standard.StringParser.stringParser;