From e3a2bf4f6db77b657d45919d0855f53753b4c2df Mon Sep 17 00:00:00 2001 From: JeremyStarTM Date: Wed, 9 Oct 2024 10:51:52 +0200 Subject: [PATCH] Move PSSE code into package pickshadow.extension --- .../pickshadow/{ => extension}/Extension.java | 14 +++++++------- .../{ => extension}/ExtensionConfiguration.java | 4 ++-- .../{ => extension}/ExtensionInformation.java | 4 +--- .../{ => extension}/api/command/CommandBase.java | 6 +++--- .../api/command/TabCompletion.java | 2 +- .../command/completion/StaticTabCompletion.java | 6 +++--- .../command/completion/StubTabCompletion.java | 4 ++-- .../api/command/completion/package-info.java | 4 ++-- .../api/command/package-info.java | 2 +- .../api/entity/player/PlayerData.java | 4 ++-- .../api/entity/player/PlayerDataFactory.java | 2 +- .../{ => extension}/api/package-info.java | 2 +- .../api/translation/LanguageString.java | 2 +- .../api/translation/TranslationManager.java | 2 +- .../api/translation/package-info.java | 2 +- .../command/general/AnnounceCommand.java | 12 ++++++------ .../command/general/ClearChatCommand.java | 12 ++++++------ .../command/general/ExtensionCommand.java | 16 ++++++++-------- .../command/general/LinkCommand.java | 12 ++++++------ .../command/general/MessageCommand.java | 12 ++++++------ .../command/general/ToggleDownfallCommand.java | 12 ++++++------ .../command/general/TrollCommand.java | 14 +++++++------- .../command/general/package-info.java | 2 +- .../{ => extension}/command/package-info.java | 2 +- .../command/survival/HomeCommand.java | 12 ++++++------ .../command/survival/package-info.java | 2 +- .../{ => extension}/listener/ChatListener.java | 6 +++--- .../listener/ConnectionListener.java | 12 ++++++------ .../{ => extension}/listener/package-info.java | 2 +- .../{ => extension}/misc/TabListHandler.java | 6 +++--- .../pickshadow/{ => extension}/package-info.java | 2 +- extension/src/main/resources/plugin.yml | 2 +- 32 files changed, 98 insertions(+), 100 deletions(-) rename extension/src/main/java/de/jeremystartm/pickshadow/{ => extension}/Extension.java (89%) rename extension/src/main/java/de/jeremystartm/pickshadow/{ => extension}/ExtensionConfiguration.java (96%) rename extension/src/main/java/de/jeremystartm/pickshadow/{ => extension}/ExtensionInformation.java (98%) rename extension/src/main/java/de/jeremystartm/pickshadow/{ => extension}/api/command/CommandBase.java (94%) rename extension/src/main/java/de/jeremystartm/pickshadow/{ => extension}/api/command/TabCompletion.java (95%) rename extension/src/main/java/de/jeremystartm/pickshadow/{ => extension}/api/command/completion/StaticTabCompletion.java (97%) rename extension/src/main/java/de/jeremystartm/pickshadow/{ => extension}/api/command/completion/StubTabCompletion.java (92%) rename extension/src/main/java/de/jeremystartm/pickshadow/{ => extension}/api/command/completion/package-info.java (83%) rename extension/src/main/java/de/jeremystartm/pickshadow/{ => extension}/api/command/package-info.java (93%) rename extension/src/main/java/de/jeremystartm/pickshadow/{ => extension}/api/entity/player/PlayerData.java (97%) rename extension/src/main/java/de/jeremystartm/pickshadow/{ => extension}/api/entity/player/PlayerDataFactory.java (98%) rename extension/src/main/java/de/jeremystartm/pickshadow/{ => extension}/api/package-info.java (95%) rename extension/src/main/java/de/jeremystartm/pickshadow/{ => extension}/api/translation/LanguageString.java (97%) rename extension/src/main/java/de/jeremystartm/pickshadow/{ => extension}/api/translation/TranslationManager.java (99%) rename extension/src/main/java/de/jeremystartm/pickshadow/{ => extension}/api/translation/package-info.java (93%) rename extension/src/main/java/de/jeremystartm/pickshadow/{ => extension}/command/general/AnnounceCommand.java (87%) rename extension/src/main/java/de/jeremystartm/pickshadow/{ => extension}/command/general/ClearChatCommand.java (89%) rename extension/src/main/java/de/jeremystartm/pickshadow/{ => extension}/command/general/ExtensionCommand.java (89%) rename extension/src/main/java/de/jeremystartm/pickshadow/{ => extension}/command/general/LinkCommand.java (85%) rename extension/src/main/java/de/jeremystartm/pickshadow/{ => extension}/command/general/MessageCommand.java (91%) rename extension/src/main/java/de/jeremystartm/pickshadow/{ => extension}/command/general/ToggleDownfallCommand.java (88%) rename extension/src/main/java/de/jeremystartm/pickshadow/{ => extension}/command/general/TrollCommand.java (94%) rename extension/src/main/java/de/jeremystartm/pickshadow/{ => extension}/command/general/package-info.java (93%) rename extension/src/main/java/de/jeremystartm/pickshadow/{ => extension}/command/package-info.java (94%) rename extension/src/main/java/de/jeremystartm/pickshadow/{ => extension}/command/survival/HomeCommand.java (84%) rename extension/src/main/java/de/jeremystartm/pickshadow/{ => extension}/command/survival/package-info.java (93%) rename extension/src/main/java/de/jeremystartm/pickshadow/{ => extension}/listener/ChatListener.java (92%) rename extension/src/main/java/de/jeremystartm/pickshadow/{ => extension}/listener/ConnectionListener.java (90%) rename extension/src/main/java/de/jeremystartm/pickshadow/{ => extension}/listener/package-info.java (94%) rename extension/src/main/java/de/jeremystartm/pickshadow/{ => extension}/misc/TabListHandler.java (95%) rename extension/src/main/java/de/jeremystartm/pickshadow/{ => extension}/package-info.java (95%) diff --git a/extension/src/main/java/de/jeremystartm/pickshadow/Extension.java b/extension/src/main/java/de/jeremystartm/pickshadow/extension/Extension.java similarity index 89% rename from extension/src/main/java/de/jeremystartm/pickshadow/Extension.java rename to extension/src/main/java/de/jeremystartm/pickshadow/extension/Extension.java index d2bf320..a1d2353 100644 --- a/extension/src/main/java/de/jeremystartm/pickshadow/Extension.java +++ b/extension/src/main/java/de/jeremystartm/pickshadow/extension/Extension.java @@ -17,14 +17,14 @@ * along with this program. If not, see . */ -package de.jeremystartm.pickshadow; +package de.jeremystartm.pickshadow.extension; -import de.jeremystartm.pickshadow.api.entity.player.PlayerDataFactory; -import de.jeremystartm.pickshadow.api.translation.TranslationManager; -import de.jeremystartm.pickshadow.command.general.*; -import de.jeremystartm.pickshadow.command.survival.HomeCommand; -import de.jeremystartm.pickshadow.listener.ChatListener; -import de.jeremystartm.pickshadow.listener.ConnectionListener; +import de.jeremystartm.pickshadow.extension.api.entity.player.PlayerDataFactory; +import de.jeremystartm.pickshadow.extension.api.translation.TranslationManager; +import de.jeremystartm.pickshadow.extension.command.general.*; +import de.jeremystartm.pickshadow.extension.command.survival.HomeCommand; +import de.jeremystartm.pickshadow.extension.listener.ChatListener; +import de.jeremystartm.pickshadow.extension.listener.ConnectionListener; import de.staropensource.sosengine.base.logging.LoggerInstance; import de.staropensource.sosengine.base.utility.Miscellaneous; import lombok.Getter; diff --git a/extension/src/main/java/de/jeremystartm/pickshadow/ExtensionConfiguration.java b/extension/src/main/java/de/jeremystartm/pickshadow/extension/ExtensionConfiguration.java similarity index 96% rename from extension/src/main/java/de/jeremystartm/pickshadow/ExtensionConfiguration.java rename to extension/src/main/java/de/jeremystartm/pickshadow/extension/ExtensionConfiguration.java index 6ce179d..08c7eb4 100644 --- a/extension/src/main/java/de/jeremystartm/pickshadow/ExtensionConfiguration.java +++ b/extension/src/main/java/de/jeremystartm/pickshadow/extension/ExtensionConfiguration.java @@ -17,9 +17,9 @@ * along with this program. If not, see . */ -package de.jeremystartm.pickshadow; +package de.jeremystartm.pickshadow.extension; -import de.jeremystartm.pickshadow.api.command.completion.StaticTabCompletion; +import de.jeremystartm.pickshadow.extension.api.command.completion.StaticTabCompletion; import de.staropensource.sosengine.base.implementable.Configuration; import de.staropensource.sosengine.base.utility.PropertiesReader; import lombok.Getter; diff --git a/extension/src/main/java/de/jeremystartm/pickshadow/ExtensionInformation.java b/extension/src/main/java/de/jeremystartm/pickshadow/extension/ExtensionInformation.java similarity index 98% rename from extension/src/main/java/de/jeremystartm/pickshadow/ExtensionInformation.java rename to extension/src/main/java/de/jeremystartm/pickshadow/extension/ExtensionInformation.java index 872b46f..894eca6 100644 --- a/extension/src/main/java/de/jeremystartm/pickshadow/ExtensionInformation.java +++ b/extension/src/main/java/de/jeremystartm/pickshadow/extension/ExtensionInformation.java @@ -17,13 +17,11 @@ * along with this program. If not, see . */ -package de.jeremystartm.pickshadow; +package de.jeremystartm.pickshadow.extension; -import de.staropensource.sosengine.base.Engine; import de.staropensource.sosengine.base.logging.LoggerInstance; import de.staropensource.sosengine.base.type.VersionType; -import de.staropensource.sosengine.base.utility.Miscellaneous; import de.staropensource.sosengine.base.utility.PropertiesReader; import lombok.Getter; import org.jetbrains.annotations.NotNull; diff --git a/extension/src/main/java/de/jeremystartm/pickshadow/api/command/CommandBase.java b/extension/src/main/java/de/jeremystartm/pickshadow/extension/api/command/CommandBase.java similarity index 94% rename from extension/src/main/java/de/jeremystartm/pickshadow/api/command/CommandBase.java rename to extension/src/main/java/de/jeremystartm/pickshadow/extension/api/command/CommandBase.java index 34b8f70..a9c5abb 100644 --- a/extension/src/main/java/de/jeremystartm/pickshadow/api/command/CommandBase.java +++ b/extension/src/main/java/de/jeremystartm/pickshadow/extension/api/command/CommandBase.java @@ -17,10 +17,10 @@ * along with this program. If not, see . */ -package de.jeremystartm.pickshadow.api.command; +package de.jeremystartm.pickshadow.extension.api.command; -import de.jeremystartm.pickshadow.api.translation.LanguageString; -import de.jeremystartm.pickshadow.api.translation.TranslationManager; +import de.jeremystartm.pickshadow.extension.api.translation.LanguageString; +import de.jeremystartm.pickshadow.extension.api.translation.TranslationManager; import org.bukkit.Bukkit; import org.bukkit.command.*; import org.bukkit.util.StringUtil; diff --git a/extension/src/main/java/de/jeremystartm/pickshadow/api/command/TabCompletion.java b/extension/src/main/java/de/jeremystartm/pickshadow/extension/api/command/TabCompletion.java similarity index 95% rename from extension/src/main/java/de/jeremystartm/pickshadow/api/command/TabCompletion.java rename to extension/src/main/java/de/jeremystartm/pickshadow/extension/api/command/TabCompletion.java index 7f8d80c..95e069c 100644 --- a/extension/src/main/java/de/jeremystartm/pickshadow/api/command/TabCompletion.java +++ b/extension/src/main/java/de/jeremystartm/pickshadow/extension/api/command/TabCompletion.java @@ -17,7 +17,7 @@ * along with this program. If not, see . */ -package de.jeremystartm.pickshadow.api.command; +package de.jeremystartm.pickshadow.extension.api.command; import org.bukkit.command.CommandSender; import org.jetbrains.annotations.NotNull; diff --git a/extension/src/main/java/de/jeremystartm/pickshadow/api/command/completion/StaticTabCompletion.java b/extension/src/main/java/de/jeremystartm/pickshadow/extension/api/command/completion/StaticTabCompletion.java similarity index 97% rename from extension/src/main/java/de/jeremystartm/pickshadow/api/command/completion/StaticTabCompletion.java rename to extension/src/main/java/de/jeremystartm/pickshadow/extension/api/command/completion/StaticTabCompletion.java index 640e8fa..524566c 100644 --- a/extension/src/main/java/de/jeremystartm/pickshadow/api/command/completion/StaticTabCompletion.java +++ b/extension/src/main/java/de/jeremystartm/pickshadow/extension/api/command/completion/StaticTabCompletion.java @@ -17,10 +17,10 @@ * along with this program. If not, see . */ -package de.jeremystartm.pickshadow.api.command.completion; +package de.jeremystartm.pickshadow.extension.api.command.completion; -import de.jeremystartm.pickshadow.ExtensionConfiguration; -import de.jeremystartm.pickshadow.api.command.TabCompletion; +import de.jeremystartm.pickshadow.extension.ExtensionConfiguration; +import de.jeremystartm.pickshadow.extension.api.command.TabCompletion; import de.staropensource.sosengine.base.logging.LoggerInstance; import org.bukkit.Bukkit; import org.bukkit.command.CommandSender; diff --git a/extension/src/main/java/de/jeremystartm/pickshadow/api/command/completion/StubTabCompletion.java b/extension/src/main/java/de/jeremystartm/pickshadow/extension/api/command/completion/StubTabCompletion.java similarity index 92% rename from extension/src/main/java/de/jeremystartm/pickshadow/api/command/completion/StubTabCompletion.java rename to extension/src/main/java/de/jeremystartm/pickshadow/extension/api/command/completion/StubTabCompletion.java index ce4c2d4..712c504 100644 --- a/extension/src/main/java/de/jeremystartm/pickshadow/api/command/completion/StubTabCompletion.java +++ b/extension/src/main/java/de/jeremystartm/pickshadow/extension/api/command/completion/StubTabCompletion.java @@ -17,9 +17,9 @@ * along with this program. If not, see . */ -package de.jeremystartm.pickshadow.api.command.completion; +package de.jeremystartm.pickshadow.extension.api.command.completion; -import de.jeremystartm.pickshadow.api.command.TabCompletion; +import de.jeremystartm.pickshadow.extension.api.command.TabCompletion; import org.bukkit.command.CommandSender; import org.jetbrains.annotations.NotNull; diff --git a/extension/src/main/java/de/jeremystartm/pickshadow/api/command/completion/package-info.java b/extension/src/main/java/de/jeremystartm/pickshadow/extension/api/command/completion/package-info.java similarity index 83% rename from extension/src/main/java/de/jeremystartm/pickshadow/api/command/completion/package-info.java rename to extension/src/main/java/de/jeremystartm/pickshadow/extension/api/command/completion/package-info.java index 43b897e..1ac2b77 100644 --- a/extension/src/main/java/de/jeremystartm/pickshadow/api/command/completion/package-info.java +++ b/extension/src/main/java/de/jeremystartm/pickshadow/extension/api/command/completion/package-info.java @@ -18,8 +18,8 @@ */ /** - * Houses implementations of {@link de.jeremystartm.pickshadow.api.command.TabCompletion}. + * Houses implementations of {@link de.jeremystartm.pickshadow.extension.api.command.TabCompletion}. * * @since v1-release0 */ -package de.jeremystartm.pickshadow.api.command.completion; +package de.jeremystartm.pickshadow.extension.api.command.completion; diff --git a/extension/src/main/java/de/jeremystartm/pickshadow/api/command/package-info.java b/extension/src/main/java/de/jeremystartm/pickshadow/extension/api/command/package-info.java similarity index 93% rename from extension/src/main/java/de/jeremystartm/pickshadow/api/command/package-info.java rename to extension/src/main/java/de/jeremystartm/pickshadow/extension/api/command/package-info.java index 0d1d6e9..082b430 100644 --- a/extension/src/main/java/de/jeremystartm/pickshadow/api/command/package-info.java +++ b/extension/src/main/java/de/jeremystartm/pickshadow/extension/api/command/package-info.java @@ -22,4 +22,4 @@ * * @since v1-release0 */ -package de.jeremystartm.pickshadow.api.command; +package de.jeremystartm.pickshadow.extension.api.command; diff --git a/extension/src/main/java/de/jeremystartm/pickshadow/api/entity/player/PlayerData.java b/extension/src/main/java/de/jeremystartm/pickshadow/extension/api/entity/player/PlayerData.java similarity index 97% rename from extension/src/main/java/de/jeremystartm/pickshadow/api/entity/player/PlayerData.java rename to extension/src/main/java/de/jeremystartm/pickshadow/extension/api/entity/player/PlayerData.java index 849bcfa..7dea5ce 100644 --- a/extension/src/main/java/de/jeremystartm/pickshadow/api/entity/player/PlayerData.java +++ b/extension/src/main/java/de/jeremystartm/pickshadow/extension/api/entity/player/PlayerData.java @@ -17,13 +17,13 @@ * along with this program. If not, see . */ -package de.jeremystartm.pickshadow.api.entity.player; +package de.jeremystartm.pickshadow.extension.api.entity.player; import com.google.gson.Gson; import com.google.gson.JsonSyntaxException; import com.google.gson.reflect.TypeToken; -import de.jeremystartm.pickshadow.misc.TabListHandler; +import de.jeremystartm.pickshadow.extension.misc.TabListHandler; import de.staropensource.sosengine.base.logging.LoggerInstance; import fr.mrmicky.fastboard.adventure.FastBoard; import lombok.AccessLevel; diff --git a/extension/src/main/java/de/jeremystartm/pickshadow/api/entity/player/PlayerDataFactory.java b/extension/src/main/java/de/jeremystartm/pickshadow/extension/api/entity/player/PlayerDataFactory.java similarity index 98% rename from extension/src/main/java/de/jeremystartm/pickshadow/api/entity/player/PlayerDataFactory.java rename to extension/src/main/java/de/jeremystartm/pickshadow/extension/api/entity/player/PlayerDataFactory.java index cdb9620..6b60916 100644 --- a/extension/src/main/java/de/jeremystartm/pickshadow/api/entity/player/PlayerDataFactory.java +++ b/extension/src/main/java/de/jeremystartm/pickshadow/extension/api/entity/player/PlayerDataFactory.java @@ -17,7 +17,7 @@ * along with this program. If not, see . */ -package de.jeremystartm.pickshadow.api.entity.player; +package de.jeremystartm.pickshadow.extension.api.entity.player; import de.staropensource.sosengine.base.logging.LoggerInstance; import lombok.Getter; diff --git a/extension/src/main/java/de/jeremystartm/pickshadow/api/package-info.java b/extension/src/main/java/de/jeremystartm/pickshadow/extension/api/package-info.java similarity index 95% rename from extension/src/main/java/de/jeremystartm/pickshadow/api/package-info.java rename to extension/src/main/java/de/jeremystartm/pickshadow/extension/api/package-info.java index 33d5a84..a453622 100644 --- a/extension/src/main/java/de/jeremystartm/pickshadow/api/package-info.java +++ b/extension/src/main/java/de/jeremystartm/pickshadow/extension/api/package-info.java @@ -24,4 +24,4 @@ * * @since v1-release0 */ -package de.jeremystartm.pickshadow.api; +package de.jeremystartm.pickshadow.extension.api; diff --git a/extension/src/main/java/de/jeremystartm/pickshadow/api/translation/LanguageString.java b/extension/src/main/java/de/jeremystartm/pickshadow/extension/api/translation/LanguageString.java similarity index 97% rename from extension/src/main/java/de/jeremystartm/pickshadow/api/translation/LanguageString.java rename to extension/src/main/java/de/jeremystartm/pickshadow/extension/api/translation/LanguageString.java index f0ef487..23706df 100644 --- a/extension/src/main/java/de/jeremystartm/pickshadow/api/translation/LanguageString.java +++ b/extension/src/main/java/de/jeremystartm/pickshadow/extension/api/translation/LanguageString.java @@ -17,7 +17,7 @@ * along with this program. If not, see . */ -package de.jeremystartm.pickshadow.api.translation; +package de.jeremystartm.pickshadow.extension.api.translation; /** * Contains all language strings which can be translated. diff --git a/extension/src/main/java/de/jeremystartm/pickshadow/api/translation/TranslationManager.java b/extension/src/main/java/de/jeremystartm/pickshadow/extension/api/translation/TranslationManager.java similarity index 99% rename from extension/src/main/java/de/jeremystartm/pickshadow/api/translation/TranslationManager.java rename to extension/src/main/java/de/jeremystartm/pickshadow/extension/api/translation/TranslationManager.java index 443c890..2cfeff3 100644 --- a/extension/src/main/java/de/jeremystartm/pickshadow/api/translation/TranslationManager.java +++ b/extension/src/main/java/de/jeremystartm/pickshadow/extension/api/translation/TranslationManager.java @@ -17,7 +17,7 @@ * along with this program. If not, see . */ -package de.jeremystartm.pickshadow.api.translation; +package de.jeremystartm.pickshadow.extension.api.translation; import com.google.gson.Gson; import com.google.gson.JsonSyntaxException; diff --git a/extension/src/main/java/de/jeremystartm/pickshadow/api/translation/package-info.java b/extension/src/main/java/de/jeremystartm/pickshadow/extension/api/translation/package-info.java similarity index 93% rename from extension/src/main/java/de/jeremystartm/pickshadow/api/translation/package-info.java rename to extension/src/main/java/de/jeremystartm/pickshadow/extension/api/translation/package-info.java index 446a9ec..80240a4 100644 --- a/extension/src/main/java/de/jeremystartm/pickshadow/api/translation/package-info.java +++ b/extension/src/main/java/de/jeremystartm/pickshadow/extension/api/translation/package-info.java @@ -22,4 +22,4 @@ * * @since v1-release0 */ -package de.jeremystartm.pickshadow.api.translation; +package de.jeremystartm.pickshadow.extension.api.translation; diff --git a/extension/src/main/java/de/jeremystartm/pickshadow/command/general/AnnounceCommand.java b/extension/src/main/java/de/jeremystartm/pickshadow/extension/command/general/AnnounceCommand.java similarity index 87% rename from extension/src/main/java/de/jeremystartm/pickshadow/command/general/AnnounceCommand.java rename to extension/src/main/java/de/jeremystartm/pickshadow/extension/command/general/AnnounceCommand.java index f77dd8a..0c3d24d 100644 --- a/extension/src/main/java/de/jeremystartm/pickshadow/command/general/AnnounceCommand.java +++ b/extension/src/main/java/de/jeremystartm/pickshadow/extension/command/general/AnnounceCommand.java @@ -17,13 +17,13 @@ * along with this program. If not, see . */ -package de.jeremystartm.pickshadow.command.general; +package de.jeremystartm.pickshadow.extension.command.general; -import de.jeremystartm.pickshadow.api.command.CommandBase; -import de.jeremystartm.pickshadow.api.command.completion.StaticTabCompletion; -import de.jeremystartm.pickshadow.api.command.TabCompletion; -import de.jeremystartm.pickshadow.api.translation.LanguageString; -import de.jeremystartm.pickshadow.api.translation.TranslationManager; +import de.jeremystartm.pickshadow.extension.api.command.CommandBase; +import de.jeremystartm.pickshadow.extension.api.command.completion.StaticTabCompletion; +import de.jeremystartm.pickshadow.extension.api.command.TabCompletion; +import de.jeremystartm.pickshadow.extension.api.translation.LanguageString; +import de.jeremystartm.pickshadow.extension.api.translation.TranslationManager; import de.staropensource.sosengine.base.utility.PlaceholderEngine; import lombok.Getter; import net.kyori.adventure.text.minimessage.MiniMessage; diff --git a/extension/src/main/java/de/jeremystartm/pickshadow/command/general/ClearChatCommand.java b/extension/src/main/java/de/jeremystartm/pickshadow/extension/command/general/ClearChatCommand.java similarity index 89% rename from extension/src/main/java/de/jeremystartm/pickshadow/command/general/ClearChatCommand.java rename to extension/src/main/java/de/jeremystartm/pickshadow/extension/command/general/ClearChatCommand.java index 2e9db1d..2170830 100644 --- a/extension/src/main/java/de/jeremystartm/pickshadow/command/general/ClearChatCommand.java +++ b/extension/src/main/java/de/jeremystartm/pickshadow/extension/command/general/ClearChatCommand.java @@ -17,13 +17,13 @@ * along with this program. If not, see . */ -package de.jeremystartm.pickshadow.command.general; +package de.jeremystartm.pickshadow.extension.command.general; -import de.jeremystartm.pickshadow.api.command.CommandBase; -import de.jeremystartm.pickshadow.api.command.completion.StaticTabCompletion; -import de.jeremystartm.pickshadow.api.command.TabCompletion; -import de.jeremystartm.pickshadow.api.translation.LanguageString; -import de.jeremystartm.pickshadow.api.translation.TranslationManager; +import de.jeremystartm.pickshadow.extension.api.command.CommandBase; +import de.jeremystartm.pickshadow.extension.api.command.completion.StaticTabCompletion; +import de.jeremystartm.pickshadow.extension.api.command.TabCompletion; +import de.jeremystartm.pickshadow.extension.api.translation.LanguageString; +import de.jeremystartm.pickshadow.extension.api.translation.TranslationManager; import lombok.Getter; import org.bukkit.Bukkit; import org.bukkit.command.Command; diff --git a/extension/src/main/java/de/jeremystartm/pickshadow/command/general/ExtensionCommand.java b/extension/src/main/java/de/jeremystartm/pickshadow/extension/command/general/ExtensionCommand.java similarity index 89% rename from extension/src/main/java/de/jeremystartm/pickshadow/command/general/ExtensionCommand.java rename to extension/src/main/java/de/jeremystartm/pickshadow/extension/command/general/ExtensionCommand.java index 3afa29b..6d5abe8 100644 --- a/extension/src/main/java/de/jeremystartm/pickshadow/command/general/ExtensionCommand.java +++ b/extension/src/main/java/de/jeremystartm/pickshadow/extension/command/general/ExtensionCommand.java @@ -17,15 +17,15 @@ * along with this program. If not, see . */ -package de.jeremystartm.pickshadow.command.general; +package de.jeremystartm.pickshadow.extension.command.general; -import de.jeremystartm.pickshadow.ExtensionInformation; -import de.jeremystartm.pickshadow.api.command.CommandBase; -import de.jeremystartm.pickshadow.api.command.completion.StaticTabCompletion; -import de.jeremystartm.pickshadow.api.command.TabCompletion; -import de.jeremystartm.pickshadow.api.entity.player.PlayerDataFactory; -import de.jeremystartm.pickshadow.api.translation.LanguageString; -import de.jeremystartm.pickshadow.api.translation.TranslationManager; +import de.jeremystartm.pickshadow.extension.ExtensionInformation; +import de.jeremystartm.pickshadow.extension.api.command.CommandBase; +import de.jeremystartm.pickshadow.extension.api.command.completion.StaticTabCompletion; +import de.jeremystartm.pickshadow.extension.api.command.TabCompletion; +import de.jeremystartm.pickshadow.extension.api.entity.player.PlayerDataFactory; +import de.jeremystartm.pickshadow.extension.api.translation.LanguageString; +import de.jeremystartm.pickshadow.extension.api.translation.TranslationManager; import lombok.Getter; import org.bukkit.command.Command; import org.bukkit.command.CommandSender; diff --git a/extension/src/main/java/de/jeremystartm/pickshadow/command/general/LinkCommand.java b/extension/src/main/java/de/jeremystartm/pickshadow/extension/command/general/LinkCommand.java similarity index 85% rename from extension/src/main/java/de/jeremystartm/pickshadow/command/general/LinkCommand.java rename to extension/src/main/java/de/jeremystartm/pickshadow/extension/command/general/LinkCommand.java index 9355b4f..341ccc3 100644 --- a/extension/src/main/java/de/jeremystartm/pickshadow/command/general/LinkCommand.java +++ b/extension/src/main/java/de/jeremystartm/pickshadow/extension/command/general/LinkCommand.java @@ -17,13 +17,13 @@ * along with this program. If not, see . */ -package de.jeremystartm.pickshadow.command.general; +package de.jeremystartm.pickshadow.extension.command.general; -import de.jeremystartm.pickshadow.api.command.CommandBase; -import de.jeremystartm.pickshadow.api.command.completion.StubTabCompletion; -import de.jeremystartm.pickshadow.api.command.TabCompletion; -import de.jeremystartm.pickshadow.api.translation.LanguageString; -import de.jeremystartm.pickshadow.api.translation.TranslationManager; +import de.jeremystartm.pickshadow.extension.api.command.CommandBase; +import de.jeremystartm.pickshadow.extension.api.command.completion.StubTabCompletion; +import de.jeremystartm.pickshadow.extension.api.command.TabCompletion; +import de.jeremystartm.pickshadow.extension.api.translation.LanguageString; +import de.jeremystartm.pickshadow.extension.api.translation.TranslationManager; import lombok.Getter; import org.bukkit.command.Command; import org.bukkit.command.CommandSender; diff --git a/extension/src/main/java/de/jeremystartm/pickshadow/command/general/MessageCommand.java b/extension/src/main/java/de/jeremystartm/pickshadow/extension/command/general/MessageCommand.java similarity index 91% rename from extension/src/main/java/de/jeremystartm/pickshadow/command/general/MessageCommand.java rename to extension/src/main/java/de/jeremystartm/pickshadow/extension/command/general/MessageCommand.java index 8034738..ca24a2a 100644 --- a/extension/src/main/java/de/jeremystartm/pickshadow/command/general/MessageCommand.java +++ b/extension/src/main/java/de/jeremystartm/pickshadow/extension/command/general/MessageCommand.java @@ -17,13 +17,13 @@ * along with this program. If not, see . */ -package de.jeremystartm.pickshadow.command.general; +package de.jeremystartm.pickshadow.extension.command.general; -import de.jeremystartm.pickshadow.api.command.CommandBase; -import de.jeremystartm.pickshadow.api.command.completion.StaticTabCompletion; -import de.jeremystartm.pickshadow.api.command.TabCompletion; -import de.jeremystartm.pickshadow.api.translation.LanguageString; -import de.jeremystartm.pickshadow.api.translation.TranslationManager; +import de.jeremystartm.pickshadow.extension.api.command.CommandBase; +import de.jeremystartm.pickshadow.extension.api.command.completion.StaticTabCompletion; +import de.jeremystartm.pickshadow.extension.api.command.TabCompletion; +import de.jeremystartm.pickshadow.extension.api.translation.LanguageString; +import de.jeremystartm.pickshadow.extension.api.translation.TranslationManager; import lombok.Getter; import org.bukkit.Bukkit; import org.bukkit.command.Command; diff --git a/extension/src/main/java/de/jeremystartm/pickshadow/command/general/ToggleDownfallCommand.java b/extension/src/main/java/de/jeremystartm/pickshadow/extension/command/general/ToggleDownfallCommand.java similarity index 88% rename from extension/src/main/java/de/jeremystartm/pickshadow/command/general/ToggleDownfallCommand.java rename to extension/src/main/java/de/jeremystartm/pickshadow/extension/command/general/ToggleDownfallCommand.java index 678ebfa..fe074e5 100644 --- a/extension/src/main/java/de/jeremystartm/pickshadow/command/general/ToggleDownfallCommand.java +++ b/extension/src/main/java/de/jeremystartm/pickshadow/extension/command/general/ToggleDownfallCommand.java @@ -17,13 +17,13 @@ * along with this program. If not, see . */ -package de.jeremystartm.pickshadow.command.general; +package de.jeremystartm.pickshadow.extension.command.general; -import de.jeremystartm.pickshadow.api.command.CommandBase; -import de.jeremystartm.pickshadow.api.command.completion.StubTabCompletion; -import de.jeremystartm.pickshadow.api.command.TabCompletion; -import de.jeremystartm.pickshadow.api.translation.LanguageString; -import de.jeremystartm.pickshadow.api.translation.TranslationManager; +import de.jeremystartm.pickshadow.extension.api.command.CommandBase; +import de.jeremystartm.pickshadow.extension.api.command.completion.StubTabCompletion; +import de.jeremystartm.pickshadow.extension.api.command.TabCompletion; +import de.jeremystartm.pickshadow.extension.api.translation.LanguageString; +import de.jeremystartm.pickshadow.extension.api.translation.TranslationManager; import lombok.Getter; import net.minecraft.server.MinecraftServer; import net.minecraft.server.level.ServerLevel; diff --git a/extension/src/main/java/de/jeremystartm/pickshadow/command/general/TrollCommand.java b/extension/src/main/java/de/jeremystartm/pickshadow/extension/command/general/TrollCommand.java similarity index 94% rename from extension/src/main/java/de/jeremystartm/pickshadow/command/general/TrollCommand.java rename to extension/src/main/java/de/jeremystartm/pickshadow/extension/command/general/TrollCommand.java index 7eeea1a..688bcd5 100644 --- a/extension/src/main/java/de/jeremystartm/pickshadow/command/general/TrollCommand.java +++ b/extension/src/main/java/de/jeremystartm/pickshadow/extension/command/general/TrollCommand.java @@ -17,14 +17,14 @@ * along with this program. If not, see . */ -package de.jeremystartm.pickshadow.command.general; +package de.jeremystartm.pickshadow.extension.command.general; -import de.jeremystartm.pickshadow.Extension; -import de.jeremystartm.pickshadow.api.command.CommandBase; -import de.jeremystartm.pickshadow.api.command.completion.StaticTabCompletion; -import de.jeremystartm.pickshadow.api.command.TabCompletion; -import de.jeremystartm.pickshadow.api.translation.LanguageString; -import de.jeremystartm.pickshadow.api.translation.TranslationManager; +import de.jeremystartm.pickshadow.extension.Extension; +import de.jeremystartm.pickshadow.extension.api.command.CommandBase; +import de.jeremystartm.pickshadow.extension.api.command.completion.StaticTabCompletion; +import de.jeremystartm.pickshadow.extension.api.command.TabCompletion; +import de.jeremystartm.pickshadow.extension.api.translation.LanguageString; +import de.jeremystartm.pickshadow.extension.api.translation.TranslationManager; import lombok.Getter; import net.kyori.adventure.key.Key; import net.kyori.adventure.sound.Sound; diff --git a/extension/src/main/java/de/jeremystartm/pickshadow/command/general/package-info.java b/extension/src/main/java/de/jeremystartm/pickshadow/extension/command/general/package-info.java similarity index 93% rename from extension/src/main/java/de/jeremystartm/pickshadow/command/general/package-info.java rename to extension/src/main/java/de/jeremystartm/pickshadow/extension/command/general/package-info.java index 7dd9569..4828063 100644 --- a/extension/src/main/java/de/jeremystartm/pickshadow/command/general/package-info.java +++ b/extension/src/main/java/de/jeremystartm/pickshadow/extension/command/general/package-info.java @@ -22,4 +22,4 @@ * * @since v1-release0 */ -package de.jeremystartm.pickshadow.command.general; +package de.jeremystartm.pickshadow.extension.command.general; diff --git a/extension/src/main/java/de/jeremystartm/pickshadow/command/package-info.java b/extension/src/main/java/de/jeremystartm/pickshadow/extension/command/package-info.java similarity index 94% rename from extension/src/main/java/de/jeremystartm/pickshadow/command/package-info.java rename to extension/src/main/java/de/jeremystartm/pickshadow/extension/command/package-info.java index 1d86d9e..10caa23 100644 --- a/extension/src/main/java/de/jeremystartm/pickshadow/command/package-info.java +++ b/extension/src/main/java/de/jeremystartm/pickshadow/extension/command/package-info.java @@ -22,4 +22,4 @@ * * @since v1-release0 */ -package de.jeremystartm.pickshadow.command; +package de.jeremystartm.pickshadow.extension.command; diff --git a/extension/src/main/java/de/jeremystartm/pickshadow/command/survival/HomeCommand.java b/extension/src/main/java/de/jeremystartm/pickshadow/extension/command/survival/HomeCommand.java similarity index 84% rename from extension/src/main/java/de/jeremystartm/pickshadow/command/survival/HomeCommand.java rename to extension/src/main/java/de/jeremystartm/pickshadow/extension/command/survival/HomeCommand.java index 6b53208..cb0abeb 100644 --- a/extension/src/main/java/de/jeremystartm/pickshadow/command/survival/HomeCommand.java +++ b/extension/src/main/java/de/jeremystartm/pickshadow/extension/command/survival/HomeCommand.java @@ -17,13 +17,13 @@ * along with this program. If not, see . */ -package de.jeremystartm.pickshadow.command.survival; +package de.jeremystartm.pickshadow.extension.command.survival; -import de.jeremystartm.pickshadow.api.command.CommandBase; -import de.jeremystartm.pickshadow.api.command.completion.StubTabCompletion; -import de.jeremystartm.pickshadow.api.command.TabCompletion; -import de.jeremystartm.pickshadow.api.translation.LanguageString; -import de.jeremystartm.pickshadow.api.translation.TranslationManager; +import de.jeremystartm.pickshadow.extension.api.command.CommandBase; +import de.jeremystartm.pickshadow.extension.api.command.completion.StubTabCompletion; +import de.jeremystartm.pickshadow.extension.api.command.TabCompletion; +import de.jeremystartm.pickshadow.extension.api.translation.LanguageString; +import de.jeremystartm.pickshadow.extension.api.translation.TranslationManager; import lombok.Getter; import org.bukkit.command.Command; import org.bukkit.command.CommandSender; diff --git a/extension/src/main/java/de/jeremystartm/pickshadow/command/survival/package-info.java b/extension/src/main/java/de/jeremystartm/pickshadow/extension/command/survival/package-info.java similarity index 93% rename from extension/src/main/java/de/jeremystartm/pickshadow/command/survival/package-info.java rename to extension/src/main/java/de/jeremystartm/pickshadow/extension/command/survival/package-info.java index 3e3cd9a..9c67d8a 100644 --- a/extension/src/main/java/de/jeremystartm/pickshadow/command/survival/package-info.java +++ b/extension/src/main/java/de/jeremystartm/pickshadow/extension/command/survival/package-info.java @@ -22,4 +22,4 @@ * * @since v1-release0 */ -package de.jeremystartm.pickshadow.command.survival; +package de.jeremystartm.pickshadow.extension.command.survival; diff --git a/extension/src/main/java/de/jeremystartm/pickshadow/listener/ChatListener.java b/extension/src/main/java/de/jeremystartm/pickshadow/extension/listener/ChatListener.java similarity index 92% rename from extension/src/main/java/de/jeremystartm/pickshadow/listener/ChatListener.java rename to extension/src/main/java/de/jeremystartm/pickshadow/extension/listener/ChatListener.java index 133f340..5182aee 100644 --- a/extension/src/main/java/de/jeremystartm/pickshadow/listener/ChatListener.java +++ b/extension/src/main/java/de/jeremystartm/pickshadow/extension/listener/ChatListener.java @@ -17,10 +17,10 @@ * along with this program. If not, see . */ -package de.jeremystartm.pickshadow.listener; +package de.jeremystartm.pickshadow.extension.listener; -import de.jeremystartm.pickshadow.api.translation.LanguageString; -import de.jeremystartm.pickshadow.api.translation.TranslationManager; +import de.jeremystartm.pickshadow.extension.api.translation.LanguageString; +import de.jeremystartm.pickshadow.extension.api.translation.TranslationManager; import io.papermc.paper.event.player.AsyncChatEvent; import net.kyori.adventure.text.minimessage.MiniMessage; import org.bukkit.Bukkit; diff --git a/extension/src/main/java/de/jeremystartm/pickshadow/listener/ConnectionListener.java b/extension/src/main/java/de/jeremystartm/pickshadow/extension/listener/ConnectionListener.java similarity index 90% rename from extension/src/main/java/de/jeremystartm/pickshadow/listener/ConnectionListener.java rename to extension/src/main/java/de/jeremystartm/pickshadow/extension/listener/ConnectionListener.java index 18bff92..2456c8a 100644 --- a/extension/src/main/java/de/jeremystartm/pickshadow/listener/ConnectionListener.java +++ b/extension/src/main/java/de/jeremystartm/pickshadow/extension/listener/ConnectionListener.java @@ -17,13 +17,13 @@ * along with this program. If not, see . */ -package de.jeremystartm.pickshadow.listener; +package de.jeremystartm.pickshadow.extension.listener; -import de.jeremystartm.pickshadow.Extension; -import de.jeremystartm.pickshadow.api.entity.player.PlayerDataFactory; -import de.jeremystartm.pickshadow.api.translation.LanguageString; -import de.jeremystartm.pickshadow.api.translation.TranslationManager; -import de.jeremystartm.pickshadow.command.general.ClearChatCommand; +import de.jeremystartm.pickshadow.extension.Extension; +import de.jeremystartm.pickshadow.extension.api.entity.player.PlayerDataFactory; +import de.jeremystartm.pickshadow.extension.api.translation.LanguageString; +import de.jeremystartm.pickshadow.extension.api.translation.TranslationManager; +import de.jeremystartm.pickshadow.extension.command.general.ClearChatCommand; import net.kyori.adventure.text.minimessage.MiniMessage; import org.bukkit.Bukkit; import org.bukkit.entity.Player; diff --git a/extension/src/main/java/de/jeremystartm/pickshadow/listener/package-info.java b/extension/src/main/java/de/jeremystartm/pickshadow/extension/listener/package-info.java similarity index 94% rename from extension/src/main/java/de/jeremystartm/pickshadow/listener/package-info.java rename to extension/src/main/java/de/jeremystartm/pickshadow/extension/listener/package-info.java index 2923afd..169d458 100644 --- a/extension/src/main/java/de/jeremystartm/pickshadow/listener/package-info.java +++ b/extension/src/main/java/de/jeremystartm/pickshadow/extension/listener/package-info.java @@ -22,4 +22,4 @@ * * @since v1-release0 */ -package de.jeremystartm.pickshadow.listener; +package de.jeremystartm.pickshadow.extension.listener; diff --git a/extension/src/main/java/de/jeremystartm/pickshadow/misc/TabListHandler.java b/extension/src/main/java/de/jeremystartm/pickshadow/extension/misc/TabListHandler.java similarity index 95% rename from extension/src/main/java/de/jeremystartm/pickshadow/misc/TabListHandler.java rename to extension/src/main/java/de/jeremystartm/pickshadow/extension/misc/TabListHandler.java index e20b508..1797f4a 100644 --- a/extension/src/main/java/de/jeremystartm/pickshadow/misc/TabListHandler.java +++ b/extension/src/main/java/de/jeremystartm/pickshadow/extension/misc/TabListHandler.java @@ -17,10 +17,10 @@ * along with this program. If not, see . */ -package de.jeremystartm.pickshadow.misc; +package de.jeremystartm.pickshadow.extension.misc; -import de.jeremystartm.pickshadow.Extension; -import de.jeremystartm.pickshadow.api.entity.player.PlayerData; +import de.jeremystartm.pickshadow.extension.Extension; +import de.jeremystartm.pickshadow.extension.api.entity.player.PlayerData; import de.staropensource.sosengine.base.logging.LoggerInstance; import fr.mrmicky.fastboard.adventure.FastBoard; import net.kyori.adventure.text.minimessage.MiniMessage; diff --git a/extension/src/main/java/de/jeremystartm/pickshadow/package-info.java b/extension/src/main/java/de/jeremystartm/pickshadow/extension/package-info.java similarity index 95% rename from extension/src/main/java/de/jeremystartm/pickshadow/package-info.java rename to extension/src/main/java/de/jeremystartm/pickshadow/extension/package-info.java index 32513c2..230eef5 100644 --- a/extension/src/main/java/de/jeremystartm/pickshadow/package-info.java +++ b/extension/src/main/java/de/jeremystartm/pickshadow/extension/package-info.java @@ -22,4 +22,4 @@ * * @since v1-release0 */ -package de.jeremystartm.pickshadow; +package de.jeremystartm.pickshadow.extension; diff --git a/extension/src/main/resources/plugin.yml b/extension/src/main/resources/plugin.yml index 3900cfe..162df6d 100644 --- a/extension/src/main/resources/plugin.yml +++ b/extension/src/main/resources/plugin.yml @@ -1,6 +1,6 @@ name: "PSSE" version: "${version}" -main: "de.jeremystartm.pickshadow.Extension" +main: "de.jeremystartm.pickshadow.extension.Extension" description: "Manages PickShadow's subservers" author: "PickShadow Server Extension Authors" website: "https://git.staropensource.de/JeremyStarTM/PSSE"