From f6ba48c5f27cb26668a4a4801d6608e4bc9d287b Mon Sep 17 00:00:00 2001 From: Ben Woo <30431861+benwoo1110@users.noreply.github.com> Date: Tue, 12 Sep 2023 10:24:58 +0800 Subject: [PATCH] Apply new import order changes --- .../multiverse/core/MultiverseCore.java | 1 + .../core/MultiverseCorePluginBinder.java | 1 + .../multiverse/core/anchor/AnchorManager.java | 1 + .../multiverse/core/api/MVConfig.java | 1 + .../multiverse/core/api/MVWorld.java | 1 + .../multiverse/core/api/SafeTTeleporter.java | 1 + .../multiverse/core/api/Teleporter.java | 1 + .../core/commands/CheckCommand.java | 1 + .../core/commands/CloneCommand.java | 1 + .../core/commands/ConfigCommand.java | 1 + .../core/commands/ConfirmCommand.java | 1 + .../core/commands/CoordinatesCommand.java | 1 + .../core/commands/CreateCommand.java | 1 + .../core/commands/DebugCommand.java | 1 + .../core/commands/DeleteCommand.java | 1 + .../core/commands/DumpsCommand.java | 7 +++--- .../core/commands/GameruleCommand.java | 1 + .../core/commands/GamerulesCommand.java | 1 + .../core/commands/ImportCommand.java | 1 + .../multiverse/core/commands/ListCommand.java | 1 + .../multiverse/core/commands/LoadCommand.java | 1 + .../core/commands/RegenCommand.java | 1 + .../core/commands/ReloadCommand.java | 1 + .../core/commands/RemoveCommand.java | 1 + .../multiverse/core/commands/RootCommand.java | 1 + .../core/commands/TeleportCommand.java | 1 + .../core/commands/UnloadCommand.java | 1 + .../core/commands/UsageCommand.java | 1 + .../commandtools/MVCommandCompletions.java | 1 + .../commandtools/MVCommandConditions.java | 1 + .../core/commandtools/MVCommandContexts.java | 1 + .../core/commandtools/MVCommandIssuer.java | 1 + .../core/commandtools/MVCommandManager.java | 1 + .../core/commandtools/MultiverseCommand.java | 1 + .../core/commandtools/PluginLocales.java | 1 + .../queue/CommandQueueManager.java | 1 + .../multiverse/core/config/MVCoreConfig.java | 1 + .../core/config/MVCoreConfigNodes.java | 1 + .../handle/CommentedYamlConfigHandle.java | 1 + .../handle/ConfigurationSectionHandle.java | 1 + .../handle/FileConfigHandle.java | 1 + .../handle/GenericConfigHandle.java | 1 + .../handle/YamlConfigHandle.java | 1 + .../migration/ConfigMigrator.java | 1 + .../node/ConfigNodeNotFoundException.java | 7 +++--- .../destination/DestinationsProvider.java | 1 + .../core/destination/ParsedDestination.java | 1 + .../destination/core/AnchorDestination.java | 1 + .../core/AnchorDestinationInstance.java | 1 + .../core/destination/core/BedDestination.java | 1 + .../core/BedDestinationInstance.java | 1 + .../destination/core/CannonDestination.java | 1 + .../core/CannonDestinationInstance.java | 1 + .../destination/core/ExactDestination.java | 1 + .../core/ExactDestinationInstance.java | 1 + .../destination/core/PlayerDestination.java | 1 + .../core/PlayerDestinationInstance.java | 1 + .../destination/core/WorldDestination.java | 1 + .../core/WorldDestinationInstance.java | 1 + .../core/display/ContentDisplay.java | 1 + .../display/handlers/BaseSendHandler.java | 1 + .../multiverse/core/economy/MVEconomist.java | 1 + .../core/event/MVTeleportEvent.java | 1 + .../core/event/MVWorldDeleteEvent.java | 1 + .../event/MVWorldPropertyChangeEvent.java | 1 + .../core/exceptions/MultiverseException.java | 1 + .../core/inject/PluginInjection.java | 1 + .../core/listeners/MVChatListener.java | 1 + .../core/listeners/MVEntityListener.java | 1 + .../core/listeners/MVPlayerListener.java | 1 + .../core/listeners/MVPortalListener.java | 1 + .../core/listeners/MVWeatherListener.java | 1 + .../core/listeners/MVWorldListener.java | 1 + .../listeners/MultiverseCoreListener.java | 1 + .../permissions/CorePermissionsChecker.java | 1 + .../MultiverseCorePlaceholders.java | 1 + .../core/teleportation/SimpleBlockSafety.java | 1 + .../SimpleLocationManipulation.java | 1 + .../teleportation/SimpleSafeTTeleporter.java | 1 + .../multiverse/core/utils/MVCorei18n.java | 1 + .../core/utils/UnsafeCallWrapper.java | 1 + .../multiverse/core/utils/file/FileUtils.java | 6 ++--- .../core/utils/message/LocalizedMessage.java | 1 + .../core/utils/message/Message.java | 1 + .../utils/metrics/MetricsConfigurator.java | 1 + .../core/utils/result/FailureReason.java | 1 + .../multiverse/core/utils/result/Result.java | 1 + .../core/utils/result/ResultChain.java | 1 + .../core/utils/result/SuccessReason.java | 1 + .../core/utils/webpaste/HttpAPIClient.java | 3 ++- .../multiverse/core/world/SimpleMVWorld.java | 1 + .../core/world/SimpleMVWorldManager.java | 5 ++-- .../core/world/SimpleWorldPurger.java | 1 + .../core/world/WorldProperties.java | 1 + .../core/world/configuration/EntryFee.java | 1 + .../configuration/WorldPropertyValidator.java | 1 + .../core/worldnew/LoadedMultiverseWorld.java | 1 + .../core/worldnew/MultiverseWorld.java | 1 + .../core/worldnew/WorldManager.java | 9 ++++--- .../worldnew/config/LegacyAliasMigrator.java | 1 + .../core/worldnew/config/NullLocation.java | 1 + .../core/worldnew/config/WorldConfig.java | 1 + .../worldnew/config/WorldConfigNodes.java | 1 + .../worldnew/config/WorldsConfigManager.java | 1 + .../worldnew/entrycheck/BlacklistResult.java | 1 + .../worldnew/entrycheck/EntryFeeResult.java | 1 + .../entrycheck/PlayerLimitResult.java | 1 + .../entrycheck/WorldAccessResult.java | 1 + .../entrycheck/WorldEntryChecker.java | 5 ++-- .../entrycheck/WorldEntryCheckerProvider.java | 1 + .../generators/GeneratorProvider.java | 5 ++-- .../core/worldnew/helpers/DataStore.java | 1 + .../worldnew/helpers/FilesManipulator.java | 4 +-- .../worldnew/options/CloneWorldOptions.java | 1 + .../worldnew/options/RegenWorldOptions.java | 1 + .../worldnew/reasons/CloneFailureReason.java | 1 + .../worldnew/reasons/CreateFailureReason.java | 1 + .../worldnew/reasons/DeleteFailureReason.java | 1 + .../worldnew/reasons/ImportFailureReason.java | 1 + .../worldnew/reasons/LoadFailureReason.java | 1 + .../worldnew/reasons/RegenFailureReason.java | 1 + .../worldnew/reasons/RemoveFailureReason.java | 1 + .../worldnew/reasons/UnloadFailureReason.java | 1 + .../multiverse/core/TestDebugMode.java | 11 ++++---- .../multiverse/core/TestEntitySpawnRules.java | 17 +++++++------ .../core/TestEntryFeeConversion.java | 9 ++++--- .../multiverse/core/TestModifyCommand.java | 9 ++++--- .../multiverse/core/TestWorldProperties.java | 15 +++++------ .../multiverse/core/TestWorldPurger.java | 13 +++++----- .../multiverse/core/TestWorldStuff.java | 15 +++++------ .../multiverse/core/utils/FileUtilsTest.java | 7 +++--- .../core/utils/MockWorldFactory.java | 12 ++++----- .../core/utils/TestInstanceCreator.java | 25 ++++++++++--------- 133 files changed, 214 insertions(+), 84 deletions(-) diff --git a/src/main/java/org/mvplugins/multiverse/core/MultiverseCore.java b/src/main/java/org/mvplugins/multiverse/core/MultiverseCore.java index 11ffd476..4bac4134 100644 --- a/src/main/java/org/mvplugins/multiverse/core/MultiverseCore.java +++ b/src/main/java/org/mvplugins/multiverse/core/MultiverseCore.java @@ -28,6 +28,7 @@ import org.glassfish.hk2.api.ServiceLocator; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.jvnet.hk2.annotations.Service; + import org.mvplugins.multiverse.core.anchor.AnchorManager; import org.mvplugins.multiverse.core.api.Destination; import org.mvplugins.multiverse.core.api.MVCore; diff --git a/src/main/java/org/mvplugins/multiverse/core/MultiverseCorePluginBinder.java b/src/main/java/org/mvplugins/multiverse/core/MultiverseCorePluginBinder.java index b4c80cfc..55eeea6a 100644 --- a/src/main/java/org/mvplugins/multiverse/core/MultiverseCorePluginBinder.java +++ b/src/main/java/org/mvplugins/multiverse/core/MultiverseCorePluginBinder.java @@ -2,6 +2,7 @@ package org.mvplugins.multiverse.core; import org.glassfish.hk2.utilities.binding.ScopedBindingBuilder; import org.jetbrains.annotations.NotNull; + import org.mvplugins.multiverse.core.api.MVCore; import org.mvplugins.multiverse.core.inject.binder.JavaPluginBinder; diff --git a/src/main/java/org/mvplugins/multiverse/core/anchor/AnchorManager.java b/src/main/java/org/mvplugins/multiverse/core/anchor/AnchorManager.java index 325098ce..84c9f31c 100644 --- a/src/main/java/org/mvplugins/multiverse/core/anchor/AnchorManager.java +++ b/src/main/java/org/mvplugins/multiverse/core/anchor/AnchorManager.java @@ -24,6 +24,7 @@ import org.bukkit.configuration.file.YamlConfiguration; import org.bukkit.entity.Player; import org.bukkit.plugin.Plugin; import org.jvnet.hk2.annotations.Service; + import org.mvplugins.multiverse.core.MultiverseCore; import org.mvplugins.multiverse.core.api.LocationManipulation; import org.mvplugins.multiverse.core.config.MVCoreConfig; diff --git a/src/main/java/org/mvplugins/multiverse/core/api/MVConfig.java b/src/main/java/org/mvplugins/multiverse/core/api/MVConfig.java index fea0fb2c..dd7233da 100644 --- a/src/main/java/org/mvplugins/multiverse/core/api/MVConfig.java +++ b/src/main/java/org/mvplugins/multiverse/core/api/MVConfig.java @@ -2,6 +2,7 @@ package org.mvplugins.multiverse.core.api; import io.vavr.control.Try; import org.jvnet.hk2.annotations.Contract; + import org.mvplugins.multiverse.core.configuration.node.NodeGroup; import org.mvplugins.multiverse.core.placeholders.MultiverseCorePlaceholders; diff --git a/src/main/java/org/mvplugins/multiverse/core/api/MVWorld.java b/src/main/java/org/mvplugins/multiverse/core/api/MVWorld.java index 93d8f35d..f577b56b 100644 --- a/src/main/java/org/mvplugins/multiverse/core/api/MVWorld.java +++ b/src/main/java/org/mvplugins/multiverse/core/api/MVWorld.java @@ -18,6 +18,7 @@ import org.bukkit.World; import org.bukkit.WorldType; import org.bukkit.permissions.Permission; import org.jetbrains.annotations.Nullable; + import org.mvplugins.multiverse.core.exceptions.PropertyDoesNotExistException; import org.mvplugins.multiverse.core.world.configuration.AddProperties; import org.mvplugins.multiverse.core.world.configuration.AllowedPortalType; diff --git a/src/main/java/org/mvplugins/multiverse/core/api/SafeTTeleporter.java b/src/main/java/org/mvplugins/multiverse/core/api/SafeTTeleporter.java index 49afbae2..8702c835 100644 --- a/src/main/java/org/mvplugins/multiverse/core/api/SafeTTeleporter.java +++ b/src/main/java/org/mvplugins/multiverse/core/api/SafeTTeleporter.java @@ -7,6 +7,7 @@ import org.bukkit.Location; import org.bukkit.command.CommandSender; import org.bukkit.entity.Entity; import org.jvnet.hk2.annotations.Contract; + import org.mvplugins.multiverse.core.destination.ParsedDestination; import org.mvplugins.multiverse.core.teleportation.TeleportResult; diff --git a/src/main/java/org/mvplugins/multiverse/core/api/Teleporter.java b/src/main/java/org/mvplugins/multiverse/core/api/Teleporter.java index cf841417..bb950e5d 100644 --- a/src/main/java/org/mvplugins/multiverse/core/api/Teleporter.java +++ b/src/main/java/org/mvplugins/multiverse/core/api/Teleporter.java @@ -5,6 +5,7 @@ import java.util.concurrent.CompletableFuture; import co.aikar.commands.BukkitCommandIssuer; import org.bukkit.entity.Entity; import org.jvnet.hk2.annotations.Contract; + import org.mvplugins.multiverse.core.destination.ParsedDestination; import org.mvplugins.multiverse.core.teleportation.TeleportResult; diff --git a/src/main/java/org/mvplugins/multiverse/core/commands/CheckCommand.java b/src/main/java/org/mvplugins/multiverse/core/commands/CheckCommand.java index 70958a8e..9e6aea01 100644 --- a/src/main/java/org/mvplugins/multiverse/core/commands/CheckCommand.java +++ b/src/main/java/org/mvplugins/multiverse/core/commands/CheckCommand.java @@ -11,6 +11,7 @@ import jakarta.inject.Inject; import org.bukkit.entity.Player; import org.jetbrains.annotations.NotNull; import org.jvnet.hk2.annotations.Service; + import org.mvplugins.multiverse.core.commandtools.MVCommandManager; import org.mvplugins.multiverse.core.commandtools.MultiverseCommand; import org.mvplugins.multiverse.core.destination.DestinationsProvider; diff --git a/src/main/java/org/mvplugins/multiverse/core/commands/CloneCommand.java b/src/main/java/org/mvplugins/multiverse/core/commands/CloneCommand.java index bc048033..ecdbedbc 100644 --- a/src/main/java/org/mvplugins/multiverse/core/commands/CloneCommand.java +++ b/src/main/java/org/mvplugins/multiverse/core/commands/CloneCommand.java @@ -11,6 +11,7 @@ import com.dumptruckman.minecraft.util.Logging; import jakarta.inject.Inject; import org.jetbrains.annotations.NotNull; import org.jvnet.hk2.annotations.Service; + import org.mvplugins.multiverse.core.commandtools.MVCommandIssuer; import org.mvplugins.multiverse.core.commandtools.MVCommandManager; import org.mvplugins.multiverse.core.commandtools.MultiverseCommand; diff --git a/src/main/java/org/mvplugins/multiverse/core/commands/ConfigCommand.java b/src/main/java/org/mvplugins/multiverse/core/commands/ConfigCommand.java index 89bd258f..c464962c 100644 --- a/src/main/java/org/mvplugins/multiverse/core/commands/ConfigCommand.java +++ b/src/main/java/org/mvplugins/multiverse/core/commands/ConfigCommand.java @@ -12,6 +12,7 @@ import io.vavr.control.Option; import jakarta.inject.Inject; import org.jetbrains.annotations.NotNull; import org.jvnet.hk2.annotations.Service; + import org.mvplugins.multiverse.core.commandtools.MVCommandIssuer; import org.mvplugins.multiverse.core.commandtools.MVCommandManager; import org.mvplugins.multiverse.core.commandtools.MultiverseCommand; diff --git a/src/main/java/org/mvplugins/multiverse/core/commands/ConfirmCommand.java b/src/main/java/org/mvplugins/multiverse/core/commands/ConfirmCommand.java index fde95dea..fae2d74d 100644 --- a/src/main/java/org/mvplugins/multiverse/core/commands/ConfirmCommand.java +++ b/src/main/java/org/mvplugins/multiverse/core/commands/ConfirmCommand.java @@ -8,6 +8,7 @@ import co.aikar.commands.annotation.Subcommand; import jakarta.inject.Inject; import org.jetbrains.annotations.NotNull; import org.jvnet.hk2.annotations.Service; + import org.mvplugins.multiverse.core.commandtools.MVCommandManager; import org.mvplugins.multiverse.core.commandtools.MultiverseCommand; diff --git a/src/main/java/org/mvplugins/multiverse/core/commands/CoordinatesCommand.java b/src/main/java/org/mvplugins/multiverse/core/commands/CoordinatesCommand.java index 410c3ece..2f316ec4 100644 --- a/src/main/java/org/mvplugins/multiverse/core/commands/CoordinatesCommand.java +++ b/src/main/java/org/mvplugins/multiverse/core/commands/CoordinatesCommand.java @@ -10,6 +10,7 @@ import jakarta.inject.Inject; import org.bukkit.entity.Player; import org.jetbrains.annotations.NotNull; import org.jvnet.hk2.annotations.Service; + import org.mvplugins.multiverse.core.api.LocationManipulation; import org.mvplugins.multiverse.core.commandtools.MVCommandManager; import org.mvplugins.multiverse.core.commandtools.MultiverseCommand; diff --git a/src/main/java/org/mvplugins/multiverse/core/commands/CreateCommand.java b/src/main/java/org/mvplugins/multiverse/core/commands/CreateCommand.java index 9ac867f4..8d85b97a 100644 --- a/src/main/java/org/mvplugins/multiverse/core/commands/CreateCommand.java +++ b/src/main/java/org/mvplugins/multiverse/core/commands/CreateCommand.java @@ -16,6 +16,7 @@ import org.bukkit.World; import org.bukkit.WorldType; import org.jetbrains.annotations.NotNull; import org.jvnet.hk2.annotations.Service; + import org.mvplugins.multiverse.core.commandtools.MVCommandIssuer; import org.mvplugins.multiverse.core.commandtools.MVCommandManager; import org.mvplugins.multiverse.core.commandtools.MultiverseCommand; diff --git a/src/main/java/org/mvplugins/multiverse/core/commands/DebugCommand.java b/src/main/java/org/mvplugins/multiverse/core/commands/DebugCommand.java index aebc43a0..68185a50 100644 --- a/src/main/java/org/mvplugins/multiverse/core/commands/DebugCommand.java +++ b/src/main/java/org/mvplugins/multiverse/core/commands/DebugCommand.java @@ -11,6 +11,7 @@ import com.dumptruckman.minecraft.util.Logging; import jakarta.inject.Inject; import org.jetbrains.annotations.NotNull; import org.jvnet.hk2.annotations.Service; + import org.mvplugins.multiverse.core.commandtools.MVCommandManager; import org.mvplugins.multiverse.core.commandtools.MultiverseCommand; import org.mvplugins.multiverse.core.config.MVCoreConfig; diff --git a/src/main/java/org/mvplugins/multiverse/core/commands/DeleteCommand.java b/src/main/java/org/mvplugins/multiverse/core/commands/DeleteCommand.java index 09fe5eb0..da028dd8 100644 --- a/src/main/java/org/mvplugins/multiverse/core/commands/DeleteCommand.java +++ b/src/main/java/org/mvplugins/multiverse/core/commands/DeleteCommand.java @@ -13,6 +13,7 @@ import com.dumptruckman.minecraft.util.Logging; import jakarta.inject.Inject; import org.jetbrains.annotations.NotNull; import org.jvnet.hk2.annotations.Service; + import org.mvplugins.multiverse.core.commandtools.MVCommandIssuer; import org.mvplugins.multiverse.core.commandtools.MVCommandManager; import org.mvplugins.multiverse.core.commandtools.MultiverseCommand; diff --git a/src/main/java/org/mvplugins/multiverse/core/commands/DumpsCommand.java b/src/main/java/org/mvplugins/multiverse/core/commands/DumpsCommand.java index b0b64936..cbcb75d8 100644 --- a/src/main/java/org/mvplugins/multiverse/core/commands/DumpsCommand.java +++ b/src/main/java/org/mvplugins/multiverse/core/commands/DumpsCommand.java @@ -1,8 +1,5 @@ package org.mvplugins.multiverse.core.commands; -import static org.mvplugins.multiverse.core.utils.file.FileUtils.getBukkitConfig; -import static org.mvplugins.multiverse.core.utils.file.FileUtils.getServerProperties; - import java.io.File; import java.io.IOException; import java.nio.charset.StandardCharsets; @@ -25,6 +22,7 @@ import org.bukkit.scheduler.BukkitRunnable; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.jvnet.hk2.annotations.Service; + import org.mvplugins.multiverse.core.MultiverseCore; import org.mvplugins.multiverse.core.commandtools.MVCommandManager; import org.mvplugins.multiverse.core.commandtools.MultiverseCommand; @@ -40,6 +38,9 @@ import org.mvplugins.multiverse.core.utils.webpaste.PasteServiceFactory; import org.mvplugins.multiverse.core.utils.webpaste.PasteServiceType; import org.mvplugins.multiverse.core.worldnew.WorldManager; +import static org.mvplugins.multiverse.core.utils.file.FileUtils.getBukkitConfig; +import static org.mvplugins.multiverse.core.utils.file.FileUtils.getServerProperties; + @Service @CommandAlias("mv") public class DumpsCommand extends MultiverseCommand { diff --git a/src/main/java/org/mvplugins/multiverse/core/commands/GameruleCommand.java b/src/main/java/org/mvplugins/multiverse/core/commands/GameruleCommand.java index 6f3a4308..919023cc 100644 --- a/src/main/java/org/mvplugins/multiverse/core/commands/GameruleCommand.java +++ b/src/main/java/org/mvplugins/multiverse/core/commands/GameruleCommand.java @@ -13,6 +13,7 @@ import org.bukkit.GameRule; import org.bukkit.World; import org.jetbrains.annotations.NotNull; import org.jvnet.hk2.annotations.Service; + import org.mvplugins.multiverse.core.commandtools.MVCommandManager; import org.mvplugins.multiverse.core.commandtools.MultiverseCommand; import org.mvplugins.multiverse.core.commandtools.context.GameRuleValue; diff --git a/src/main/java/org/mvplugins/multiverse/core/commands/GamerulesCommand.java b/src/main/java/org/mvplugins/multiverse/core/commands/GamerulesCommand.java index de9edf26..7856b9bd 100644 --- a/src/main/java/org/mvplugins/multiverse/core/commands/GamerulesCommand.java +++ b/src/main/java/org/mvplugins/multiverse/core/commands/GamerulesCommand.java @@ -20,6 +20,7 @@ import org.bukkit.GameRule; import org.bukkit.World; import org.jetbrains.annotations.NotNull; import org.jvnet.hk2.annotations.Service; + import org.mvplugins.multiverse.core.commandtools.MVCommandIssuer; import org.mvplugins.multiverse.core.commandtools.MVCommandManager; import org.mvplugins.multiverse.core.commandtools.MultiverseCommand; diff --git a/src/main/java/org/mvplugins/multiverse/core/commands/ImportCommand.java b/src/main/java/org/mvplugins/multiverse/core/commands/ImportCommand.java index 8396b55c..715a470a 100644 --- a/src/main/java/org/mvplugins/multiverse/core/commands/ImportCommand.java +++ b/src/main/java/org/mvplugins/multiverse/core/commands/ImportCommand.java @@ -13,6 +13,7 @@ import jakarta.inject.Inject; import org.bukkit.World; import org.jetbrains.annotations.NotNull; import org.jvnet.hk2.annotations.Service; + import org.mvplugins.multiverse.core.commandtools.MVCommandIssuer; import org.mvplugins.multiverse.core.commandtools.MVCommandManager; import org.mvplugins.multiverse.core.commandtools.MultiverseCommand; diff --git a/src/main/java/org/mvplugins/multiverse/core/commands/ListCommand.java b/src/main/java/org/mvplugins/multiverse/core/commands/ListCommand.java index 9e4b5806..64e2d1f6 100644 --- a/src/main/java/org/mvplugins/multiverse/core/commands/ListCommand.java +++ b/src/main/java/org/mvplugins/multiverse/core/commands/ListCommand.java @@ -15,6 +15,7 @@ import org.bukkit.ChatColor; import org.bukkit.World; import org.jetbrains.annotations.NotNull; import org.jvnet.hk2.annotations.Service; + import org.mvplugins.multiverse.core.commandtools.MVCommandIssuer; import org.mvplugins.multiverse.core.commandtools.MVCommandManager; import org.mvplugins.multiverse.core.commandtools.MultiverseCommand; diff --git a/src/main/java/org/mvplugins/multiverse/core/commands/LoadCommand.java b/src/main/java/org/mvplugins/multiverse/core/commands/LoadCommand.java index 4aa1895b..016163ac 100644 --- a/src/main/java/org/mvplugins/multiverse/core/commands/LoadCommand.java +++ b/src/main/java/org/mvplugins/multiverse/core/commands/LoadCommand.java @@ -12,6 +12,7 @@ import com.dumptruckman.minecraft.util.Logging; import jakarta.inject.Inject; import org.jetbrains.annotations.NotNull; import org.jvnet.hk2.annotations.Service; + import org.mvplugins.multiverse.core.commandtools.MVCommandIssuer; import org.mvplugins.multiverse.core.commandtools.MVCommandManager; import org.mvplugins.multiverse.core.commandtools.MultiverseCommand; diff --git a/src/main/java/org/mvplugins/multiverse/core/commands/RegenCommand.java b/src/main/java/org/mvplugins/multiverse/core/commands/RegenCommand.java index ae0021c4..51a25e29 100644 --- a/src/main/java/org/mvplugins/multiverse/core/commands/RegenCommand.java +++ b/src/main/java/org/mvplugins/multiverse/core/commands/RegenCommand.java @@ -15,6 +15,7 @@ import com.dumptruckman.minecraft.util.Logging; import jakarta.inject.Inject; import org.jetbrains.annotations.NotNull; import org.jvnet.hk2.annotations.Service; + import org.mvplugins.multiverse.core.commandtools.MVCommandIssuer; import org.mvplugins.multiverse.core.commandtools.MVCommandManager; import org.mvplugins.multiverse.core.commandtools.MultiverseCommand; diff --git a/src/main/java/org/mvplugins/multiverse/core/commands/ReloadCommand.java b/src/main/java/org/mvplugins/multiverse/core/commands/ReloadCommand.java index ff494da2..68bfc944 100644 --- a/src/main/java/org/mvplugins/multiverse/core/commands/ReloadCommand.java +++ b/src/main/java/org/mvplugins/multiverse/core/commands/ReloadCommand.java @@ -12,6 +12,7 @@ import jakarta.inject.Inject; import org.bukkit.plugin.PluginManager; import org.jetbrains.annotations.NotNull; import org.jvnet.hk2.annotations.Service; + import org.mvplugins.multiverse.core.anchor.AnchorManager; import org.mvplugins.multiverse.core.commandtools.MVCommandManager; import org.mvplugins.multiverse.core.commandtools.MultiverseCommand; diff --git a/src/main/java/org/mvplugins/multiverse/core/commands/RemoveCommand.java b/src/main/java/org/mvplugins/multiverse/core/commands/RemoveCommand.java index 2fd1c306..92bae812 100644 --- a/src/main/java/org/mvplugins/multiverse/core/commands/RemoveCommand.java +++ b/src/main/java/org/mvplugins/multiverse/core/commands/RemoveCommand.java @@ -12,6 +12,7 @@ import com.dumptruckman.minecraft.util.Logging; import jakarta.inject.Inject; import org.jetbrains.annotations.NotNull; import org.jvnet.hk2.annotations.Service; + import org.mvplugins.multiverse.core.commandtools.MVCommandIssuer; import org.mvplugins.multiverse.core.commandtools.MVCommandManager; import org.mvplugins.multiverse.core.commandtools.MultiverseCommand; diff --git a/src/main/java/org/mvplugins/multiverse/core/commands/RootCommand.java b/src/main/java/org/mvplugins/multiverse/core/commands/RootCommand.java index 9dd36d81..5cc31057 100644 --- a/src/main/java/org/mvplugins/multiverse/core/commands/RootCommand.java +++ b/src/main/java/org/mvplugins/multiverse/core/commands/RootCommand.java @@ -7,6 +7,7 @@ import org.bukkit.plugin.Plugin; import org.bukkit.plugin.PluginDescriptionFile; import org.jetbrains.annotations.NotNull; import org.jvnet.hk2.annotations.Service; + import org.mvplugins.multiverse.core.MultiverseCore; import org.mvplugins.multiverse.core.commandtools.MVCommandManager; import org.mvplugins.multiverse.core.commandtools.MultiverseCommand; diff --git a/src/main/java/org/mvplugins/multiverse/core/commands/TeleportCommand.java b/src/main/java/org/mvplugins/multiverse/core/commands/TeleportCommand.java index f66f39a0..391e7489 100644 --- a/src/main/java/org/mvplugins/multiverse/core/commands/TeleportCommand.java +++ b/src/main/java/org/mvplugins/multiverse/core/commands/TeleportCommand.java @@ -15,6 +15,7 @@ import com.dumptruckman.minecraft.util.Logging; import jakarta.inject.Inject; import org.bukkit.entity.Player; import org.jvnet.hk2.annotations.Service; + import org.mvplugins.multiverse.core.commandtools.MVCommandManager; import org.mvplugins.multiverse.core.commandtools.MultiverseCommand; import org.mvplugins.multiverse.core.destination.DestinationsProvider; diff --git a/src/main/java/org/mvplugins/multiverse/core/commands/UnloadCommand.java b/src/main/java/org/mvplugins/multiverse/core/commands/UnloadCommand.java index d6e8d2c1..e82120f6 100644 --- a/src/main/java/org/mvplugins/multiverse/core/commands/UnloadCommand.java +++ b/src/main/java/org/mvplugins/multiverse/core/commands/UnloadCommand.java @@ -11,6 +11,7 @@ import com.dumptruckman.minecraft.util.Logging; import jakarta.inject.Inject; import org.jetbrains.annotations.NotNull; import org.jvnet.hk2.annotations.Service; + import org.mvplugins.multiverse.core.commandtools.MVCommandIssuer; import org.mvplugins.multiverse.core.commandtools.MVCommandManager; import org.mvplugins.multiverse.core.commandtools.MultiverseCommand; diff --git a/src/main/java/org/mvplugins/multiverse/core/commands/UsageCommand.java b/src/main/java/org/mvplugins/multiverse/core/commands/UsageCommand.java index 48cbb052..93c4b7a6 100644 --- a/src/main/java/org/mvplugins/multiverse/core/commands/UsageCommand.java +++ b/src/main/java/org/mvplugins/multiverse/core/commands/UsageCommand.java @@ -11,6 +11,7 @@ import co.aikar.commands.annotation.Syntax; import jakarta.inject.Inject; import org.jetbrains.annotations.NotNull; import org.jvnet.hk2.annotations.Service; + import org.mvplugins.multiverse.core.commandtools.MVCommandManager; import org.mvplugins.multiverse.core.commandtools.MultiverseCommand; diff --git a/src/main/java/org/mvplugins/multiverse/core/commandtools/MVCommandCompletions.java b/src/main/java/org/mvplugins/multiverse/core/commandtools/MVCommandCompletions.java index f62f3604..a12e62ca 100644 --- a/src/main/java/org/mvplugins/multiverse/core/commandtools/MVCommandCompletions.java +++ b/src/main/java/org/mvplugins/multiverse/core/commandtools/MVCommandCompletions.java @@ -21,6 +21,7 @@ import jakarta.inject.Inject; import org.bukkit.GameRule; import org.jetbrains.annotations.NotNull; import org.jvnet.hk2.annotations.Service; + import org.mvplugins.multiverse.core.config.MVCoreConfig; import org.mvplugins.multiverse.core.destination.DestinationsProvider; import org.mvplugins.multiverse.core.destination.ParsedDestination; diff --git a/src/main/java/org/mvplugins/multiverse/core/commandtools/MVCommandConditions.java b/src/main/java/org/mvplugins/multiverse/core/commandtools/MVCommandConditions.java index 35d91779..44a2dea4 100644 --- a/src/main/java/org/mvplugins/multiverse/core/commandtools/MVCommandConditions.java +++ b/src/main/java/org/mvplugins/multiverse/core/commandtools/MVCommandConditions.java @@ -7,6 +7,7 @@ import co.aikar.commands.CommandConditions; import co.aikar.commands.ConditionContext; import co.aikar.commands.ConditionFailedException; import org.jetbrains.annotations.NotNull; + import org.mvplugins.multiverse.core.world.WorldNameChecker; import org.mvplugins.multiverse.core.worldnew.WorldManager; diff --git a/src/main/java/org/mvplugins/multiverse/core/commandtools/MVCommandContexts.java b/src/main/java/org/mvplugins/multiverse/core/commandtools/MVCommandContexts.java index f3b7b02c..25fc8b67 100644 --- a/src/main/java/org/mvplugins/multiverse/core/commandtools/MVCommandContexts.java +++ b/src/main/java/org/mvplugins/multiverse/core/commandtools/MVCommandContexts.java @@ -14,6 +14,7 @@ import jakarta.inject.Inject; import org.bukkit.GameRule; import org.bukkit.entity.Player; import org.jvnet.hk2.annotations.Service; + import org.mvplugins.multiverse.core.commandtools.context.GameRuleValue; import org.mvplugins.multiverse.core.commandtools.context.MVConfigValue; import org.mvplugins.multiverse.core.config.MVCoreConfig; diff --git a/src/main/java/org/mvplugins/multiverse/core/commandtools/MVCommandIssuer.java b/src/main/java/org/mvplugins/multiverse/core/commandtools/MVCommandIssuer.java index 601b62a6..2025bb8f 100644 --- a/src/main/java/org/mvplugins/multiverse/core/commandtools/MVCommandIssuer.java +++ b/src/main/java/org/mvplugins/multiverse/core/commandtools/MVCommandIssuer.java @@ -5,6 +5,7 @@ import co.aikar.commands.OpenBukkitCommandIssuer; import co.aikar.locales.MessageKeyProvider; import org.bukkit.command.CommandSender; import org.jetbrains.annotations.NotNull; + import org.mvplugins.multiverse.core.utils.message.Message; public class MVCommandIssuer extends OpenBukkitCommandIssuer { diff --git a/src/main/java/org/mvplugins/multiverse/core/commandtools/MVCommandManager.java b/src/main/java/org/mvplugins/multiverse/core/commandtools/MVCommandManager.java index c3c50ce8..296795e1 100644 --- a/src/main/java/org/mvplugins/multiverse/core/commandtools/MVCommandManager.java +++ b/src/main/java/org/mvplugins/multiverse/core/commandtools/MVCommandManager.java @@ -15,6 +15,7 @@ import org.bukkit.Bukkit; import org.bukkit.command.CommandSender; import org.jetbrains.annotations.NotNull; import org.jvnet.hk2.annotations.Service; + import org.mvplugins.multiverse.core.MultiverseCore; import org.mvplugins.multiverse.core.commandtools.flags.CommandFlagsManager; import org.mvplugins.multiverse.core.commandtools.queue.CommandQueueManager; diff --git a/src/main/java/org/mvplugins/multiverse/core/commandtools/MultiverseCommand.java b/src/main/java/org/mvplugins/multiverse/core/commandtools/MultiverseCommand.java index 88ccfdf1..dfd06383 100644 --- a/src/main/java/org/mvplugins/multiverse/core/commandtools/MultiverseCommand.java +++ b/src/main/java/org/mvplugins/multiverse/core/commandtools/MultiverseCommand.java @@ -5,6 +5,7 @@ import com.dumptruckman.minecraft.util.Logging; import jakarta.annotation.PostConstruct; import org.jetbrains.annotations.NotNull; import org.jvnet.hk2.annotations.Contract; + import org.mvplugins.multiverse.core.commandtools.flags.CommandFlag; import org.mvplugins.multiverse.core.commandtools.flags.CommandFlagGroup; import org.mvplugins.multiverse.core.commandtools.flags.CommandFlagsManager; diff --git a/src/main/java/org/mvplugins/multiverse/core/commandtools/PluginLocales.java b/src/main/java/org/mvplugins/multiverse/core/commandtools/PluginLocales.java index 9308167e..39f21638 100644 --- a/src/main/java/org/mvplugins/multiverse/core/commandtools/PluginLocales.java +++ b/src/main/java/org/mvplugins/multiverse/core/commandtools/PluginLocales.java @@ -5,6 +5,7 @@ import jakarta.inject.Inject; import org.bukkit.plugin.Plugin; import org.jetbrains.annotations.NotNull; import org.jvnet.hk2.annotations.Service; + import org.mvplugins.multiverse.core.utils.file.FileResClassLoader; /** diff --git a/src/main/java/org/mvplugins/multiverse/core/commandtools/queue/CommandQueueManager.java b/src/main/java/org/mvplugins/multiverse/core/commandtools/queue/CommandQueueManager.java index 5871e527..afc0382c 100644 --- a/src/main/java/org/mvplugins/multiverse/core/commandtools/queue/CommandQueueManager.java +++ b/src/main/java/org/mvplugins/multiverse/core/commandtools/queue/CommandQueueManager.java @@ -21,6 +21,7 @@ import org.bukkit.plugin.Plugin; import org.bukkit.scheduler.BukkitTask; import org.jetbrains.annotations.NotNull; import org.jvnet.hk2.annotations.Service; + import org.mvplugins.multiverse.core.MultiverseCore; /** diff --git a/src/main/java/org/mvplugins/multiverse/core/config/MVCoreConfig.java b/src/main/java/org/mvplugins/multiverse/core/config/MVCoreConfig.java index a64e35b9..6587f3a9 100644 --- a/src/main/java/org/mvplugins/multiverse/core/config/MVCoreConfig.java +++ b/src/main/java/org/mvplugins/multiverse/core/config/MVCoreConfig.java @@ -10,6 +10,7 @@ import jakarta.inject.Inject; import org.bukkit.plugin.PluginManager; import org.jetbrains.annotations.NotNull; import org.jvnet.hk2.annotations.Service; + import org.mvplugins.multiverse.core.MultiverseCore; import org.mvplugins.multiverse.core.api.MVConfig; import org.mvplugins.multiverse.core.configuration.handle.CommentedYamlConfigHandle; diff --git a/src/main/java/org/mvplugins/multiverse/core/config/MVCoreConfigNodes.java b/src/main/java/org/mvplugins/multiverse/core/config/MVCoreConfigNodes.java index 1d2aa88a..b6785acb 100644 --- a/src/main/java/org/mvplugins/multiverse/core/config/MVCoreConfigNodes.java +++ b/src/main/java/org/mvplugins/multiverse/core/config/MVCoreConfigNodes.java @@ -3,6 +3,7 @@ package org.mvplugins.multiverse.core.config; import com.dumptruckman.minecraft.util.Logging; import io.vavr.control.Try; import org.bukkit.plugin.PluginManager; + import org.mvplugins.multiverse.core.configuration.node.ConfigHeaderNode; import org.mvplugins.multiverse.core.configuration.node.ConfigNode; import org.mvplugins.multiverse.core.configuration.node.Node; diff --git a/src/main/java/org/mvplugins/multiverse/core/configuration/handle/CommentedYamlConfigHandle.java b/src/main/java/org/mvplugins/multiverse/core/configuration/handle/CommentedYamlConfigHandle.java index ed5292cc..d6590a9b 100644 --- a/src/main/java/org/mvplugins/multiverse/core/configuration/handle/CommentedYamlConfigHandle.java +++ b/src/main/java/org/mvplugins/multiverse/core/configuration/handle/CommentedYamlConfigHandle.java @@ -9,6 +9,7 @@ import io.github.townyadvanced.commentedconfiguration.CommentedConfiguration; import io.vavr.control.Try; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; + import org.mvplugins.multiverse.core.configuration.migration.ConfigMigrator; import org.mvplugins.multiverse.core.configuration.node.CommentedNode; import org.mvplugins.multiverse.core.configuration.node.NodeGroup; diff --git a/src/main/java/org/mvplugins/multiverse/core/configuration/handle/ConfigurationSectionHandle.java b/src/main/java/org/mvplugins/multiverse/core/configuration/handle/ConfigurationSectionHandle.java index f8cc2be1..ec9052e5 100644 --- a/src/main/java/org/mvplugins/multiverse/core/configuration/handle/ConfigurationSectionHandle.java +++ b/src/main/java/org/mvplugins/multiverse/core/configuration/handle/ConfigurationSectionHandle.java @@ -6,6 +6,7 @@ import io.vavr.control.Try; import org.bukkit.configuration.ConfigurationSection; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; + import org.mvplugins.multiverse.core.configuration.migration.ConfigMigrator; import org.mvplugins.multiverse.core.configuration.node.NodeGroup; diff --git a/src/main/java/org/mvplugins/multiverse/core/configuration/handle/FileConfigHandle.java b/src/main/java/org/mvplugins/multiverse/core/configuration/handle/FileConfigHandle.java index 877d4eee..3aeecd4b 100644 --- a/src/main/java/org/mvplugins/multiverse/core/configuration/handle/FileConfigHandle.java +++ b/src/main/java/org/mvplugins/multiverse/core/configuration/handle/FileConfigHandle.java @@ -10,6 +10,7 @@ import org.bukkit.configuration.InvalidConfigurationException; import org.bukkit.configuration.file.FileConfiguration; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; + import org.mvplugins.multiverse.core.configuration.migration.ConfigMigrator; import org.mvplugins.multiverse.core.configuration.node.NodeGroup; diff --git a/src/main/java/org/mvplugins/multiverse/core/configuration/handle/GenericConfigHandle.java b/src/main/java/org/mvplugins/multiverse/core/configuration/handle/GenericConfigHandle.java index 3bd8de58..8e98f402 100644 --- a/src/main/java/org/mvplugins/multiverse/core/configuration/handle/GenericConfigHandle.java +++ b/src/main/java/org/mvplugins/multiverse/core/configuration/handle/GenericConfigHandle.java @@ -7,6 +7,7 @@ import org.bukkit.configuration.ConfigurationSection; import org.bukkit.plugin.Plugin; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; + import org.mvplugins.multiverse.core.configuration.migration.ConfigMigrator; import org.mvplugins.multiverse.core.configuration.node.ConfigNodeNotFoundException; import org.mvplugins.multiverse.core.configuration.node.NodeGroup; diff --git a/src/main/java/org/mvplugins/multiverse/core/configuration/handle/YamlConfigHandle.java b/src/main/java/org/mvplugins/multiverse/core/configuration/handle/YamlConfigHandle.java index c77837b2..f80f79ad 100644 --- a/src/main/java/org/mvplugins/multiverse/core/configuration/handle/YamlConfigHandle.java +++ b/src/main/java/org/mvplugins/multiverse/core/configuration/handle/YamlConfigHandle.java @@ -9,6 +9,7 @@ import org.bukkit.configuration.InvalidConfigurationException; import org.bukkit.configuration.file.YamlConfiguration; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; + import org.mvplugins.multiverse.core.configuration.migration.ConfigMigrator; import org.mvplugins.multiverse.core.configuration.node.NodeGroup; diff --git a/src/main/java/org/mvplugins/multiverse/core/configuration/migration/ConfigMigrator.java b/src/main/java/org/mvplugins/multiverse/core/configuration/migration/ConfigMigrator.java index 56063cdc..e8e491e5 100644 --- a/src/main/java/org/mvplugins/multiverse/core/configuration/migration/ConfigMigrator.java +++ b/src/main/java/org/mvplugins/multiverse/core/configuration/migration/ConfigMigrator.java @@ -5,6 +5,7 @@ import java.util.List; import com.dumptruckman.minecraft.util.Logging; import org.bukkit.configuration.ConfigurationSection; + import org.mvplugins.multiverse.core.configuration.node.ValueNode; /** diff --git a/src/main/java/org/mvplugins/multiverse/core/configuration/node/ConfigNodeNotFoundException.java b/src/main/java/org/mvplugins/multiverse/core/configuration/node/ConfigNodeNotFoundException.java index 557fffab..d4c2db23 100644 --- a/src/main/java/org/mvplugins/multiverse/core/configuration/node/ConfigNodeNotFoundException.java +++ b/src/main/java/org/mvplugins/multiverse/core/configuration/node/ConfigNodeNotFoundException.java @@ -1,11 +1,12 @@ package org.mvplugins.multiverse.core.configuration.node; +import org.jetbrains.annotations.Nullable; + +import org.mvplugins.multiverse.core.exceptions.MultiverseException; + import static org.mvplugins.multiverse.core.utils.MVCorei18n.CONFIG_NODE_NOTFOUND; import static org.mvplugins.multiverse.core.utils.message.MessageReplacement.replace; -import org.jetbrains.annotations.Nullable; -import org.mvplugins.multiverse.core.exceptions.MultiverseException; - public class ConfigNodeNotFoundException extends MultiverseException { public ConfigNodeNotFoundException(@Nullable String nodeName) { diff --git a/src/main/java/org/mvplugins/multiverse/core/destination/DestinationsProvider.java b/src/main/java/org/mvplugins/multiverse/core/destination/DestinationsProvider.java index 787c32ce..158a26da 100644 --- a/src/main/java/org/mvplugins/multiverse/core/destination/DestinationsProvider.java +++ b/src/main/java/org/mvplugins/multiverse/core/destination/DestinationsProvider.java @@ -16,6 +16,7 @@ import org.bukkit.plugin.PluginManager; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.jvnet.hk2.annotations.Service; + import org.mvplugins.multiverse.core.api.Destination; import org.mvplugins.multiverse.core.api.DestinationInstance; import org.mvplugins.multiverse.core.api.SafeTTeleporter; diff --git a/src/main/java/org/mvplugins/multiverse/core/destination/ParsedDestination.java b/src/main/java/org/mvplugins/multiverse/core/destination/ParsedDestination.java index fa706178..5bf1894e 100644 --- a/src/main/java/org/mvplugins/multiverse/core/destination/ParsedDestination.java +++ b/src/main/java/org/mvplugins/multiverse/core/destination/ParsedDestination.java @@ -4,6 +4,7 @@ import org.bukkit.Location; import org.bukkit.entity.Entity; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; + import org.mvplugins.multiverse.core.api.Destination; import org.mvplugins.multiverse.core.api.DestinationInstance; diff --git a/src/main/java/org/mvplugins/multiverse/core/destination/core/AnchorDestination.java b/src/main/java/org/mvplugins/multiverse/core/destination/core/AnchorDestination.java index e1ca18bf..477d11c3 100644 --- a/src/main/java/org/mvplugins/multiverse/core/destination/core/AnchorDestination.java +++ b/src/main/java/org/mvplugins/multiverse/core/destination/core/AnchorDestination.java @@ -8,6 +8,7 @@ import org.bukkit.Location; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.jvnet.hk2.annotations.Service; + import org.mvplugins.multiverse.core.anchor.AnchorManager; import org.mvplugins.multiverse.core.api.Destination; import org.mvplugins.multiverse.core.api.Teleporter; diff --git a/src/main/java/org/mvplugins/multiverse/core/destination/core/AnchorDestinationInstance.java b/src/main/java/org/mvplugins/multiverse/core/destination/core/AnchorDestinationInstance.java index 1aa9bc06..e96d6878 100644 --- a/src/main/java/org/mvplugins/multiverse/core/destination/core/AnchorDestinationInstance.java +++ b/src/main/java/org/mvplugins/multiverse/core/destination/core/AnchorDestinationInstance.java @@ -5,6 +5,7 @@ import org.bukkit.entity.Entity; import org.bukkit.util.Vector; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; + import org.mvplugins.multiverse.core.api.DestinationInstance; /** diff --git a/src/main/java/org/mvplugins/multiverse/core/destination/core/BedDestination.java b/src/main/java/org/mvplugins/multiverse/core/destination/core/BedDestination.java index cc80a789..b88932d1 100644 --- a/src/main/java/org/mvplugins/multiverse/core/destination/core/BedDestination.java +++ b/src/main/java/org/mvplugins/multiverse/core/destination/core/BedDestination.java @@ -10,6 +10,7 @@ import org.bukkit.entity.Player; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.jvnet.hk2.annotations.Service; + import org.mvplugins.multiverse.core.api.Destination; import org.mvplugins.multiverse.core.api.Teleporter; import org.mvplugins.multiverse.core.utils.PlayerFinder; diff --git a/src/main/java/org/mvplugins/multiverse/core/destination/core/BedDestinationInstance.java b/src/main/java/org/mvplugins/multiverse/core/destination/core/BedDestinationInstance.java index b5c95d0f..d73c2ad6 100644 --- a/src/main/java/org/mvplugins/multiverse/core/destination/core/BedDestinationInstance.java +++ b/src/main/java/org/mvplugins/multiverse/core/destination/core/BedDestinationInstance.java @@ -6,6 +6,7 @@ import org.bukkit.entity.Player; import org.bukkit.util.Vector; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; + import org.mvplugins.multiverse.core.api.DestinationInstance; /** diff --git a/src/main/java/org/mvplugins/multiverse/core/destination/core/CannonDestination.java b/src/main/java/org/mvplugins/multiverse/core/destination/core/CannonDestination.java index b00d9dae..d19a784b 100644 --- a/src/main/java/org/mvplugins/multiverse/core/destination/core/CannonDestination.java +++ b/src/main/java/org/mvplugins/multiverse/core/destination/core/CannonDestination.java @@ -10,6 +10,7 @@ import org.bukkit.World; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.jvnet.hk2.annotations.Service; + import org.mvplugins.multiverse.core.api.Destination; import org.mvplugins.multiverse.core.api.Teleporter; import org.mvplugins.multiverse.core.worldnew.LoadedMultiverseWorld; diff --git a/src/main/java/org/mvplugins/multiverse/core/destination/core/CannonDestinationInstance.java b/src/main/java/org/mvplugins/multiverse/core/destination/core/CannonDestinationInstance.java index 7d7b0248..41205ac6 100644 --- a/src/main/java/org/mvplugins/multiverse/core/destination/core/CannonDestinationInstance.java +++ b/src/main/java/org/mvplugins/multiverse/core/destination/core/CannonDestinationInstance.java @@ -5,6 +5,7 @@ import org.bukkit.entity.Entity; import org.bukkit.util.Vector; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; + import org.mvplugins.multiverse.core.api.DestinationInstance; /** diff --git a/src/main/java/org/mvplugins/multiverse/core/destination/core/ExactDestination.java b/src/main/java/org/mvplugins/multiverse/core/destination/core/ExactDestination.java index 950a39c1..a61cd6b8 100644 --- a/src/main/java/org/mvplugins/multiverse/core/destination/core/ExactDestination.java +++ b/src/main/java/org/mvplugins/multiverse/core/destination/core/ExactDestination.java @@ -10,6 +10,7 @@ import org.bukkit.World; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.jvnet.hk2.annotations.Service; + import org.mvplugins.multiverse.core.api.Destination; import org.mvplugins.multiverse.core.api.Teleporter; import org.mvplugins.multiverse.core.worldnew.LoadedMultiverseWorld; diff --git a/src/main/java/org/mvplugins/multiverse/core/destination/core/ExactDestinationInstance.java b/src/main/java/org/mvplugins/multiverse/core/destination/core/ExactDestinationInstance.java index d71ea7d5..24882ded 100644 --- a/src/main/java/org/mvplugins/multiverse/core/destination/core/ExactDestinationInstance.java +++ b/src/main/java/org/mvplugins/multiverse/core/destination/core/ExactDestinationInstance.java @@ -5,6 +5,7 @@ import org.bukkit.entity.Entity; import org.bukkit.util.Vector; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; + import org.mvplugins.multiverse.core.api.DestinationInstance; /** diff --git a/src/main/java/org/mvplugins/multiverse/core/destination/core/PlayerDestination.java b/src/main/java/org/mvplugins/multiverse/core/destination/core/PlayerDestination.java index 084356c2..670c3feb 100644 --- a/src/main/java/org/mvplugins/multiverse/core/destination/core/PlayerDestination.java +++ b/src/main/java/org/mvplugins/multiverse/core/destination/core/PlayerDestination.java @@ -9,6 +9,7 @@ import org.bukkit.entity.Player; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.jvnet.hk2.annotations.Service; + import org.mvplugins.multiverse.core.api.Destination; import org.mvplugins.multiverse.core.api.Teleporter; import org.mvplugins.multiverse.core.utils.PlayerFinder; diff --git a/src/main/java/org/mvplugins/multiverse/core/destination/core/PlayerDestinationInstance.java b/src/main/java/org/mvplugins/multiverse/core/destination/core/PlayerDestinationInstance.java index be1f38ea..fd67f737 100644 --- a/src/main/java/org/mvplugins/multiverse/core/destination/core/PlayerDestinationInstance.java +++ b/src/main/java/org/mvplugins/multiverse/core/destination/core/PlayerDestinationInstance.java @@ -6,6 +6,7 @@ import org.bukkit.entity.Player; import org.bukkit.util.Vector; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; + import org.mvplugins.multiverse.core.api.DestinationInstance; /** diff --git a/src/main/java/org/mvplugins/multiverse/core/destination/core/WorldDestination.java b/src/main/java/org/mvplugins/multiverse/core/destination/core/WorldDestination.java index 92585220..5610fa48 100644 --- a/src/main/java/org/mvplugins/multiverse/core/destination/core/WorldDestination.java +++ b/src/main/java/org/mvplugins/multiverse/core/destination/core/WorldDestination.java @@ -8,6 +8,7 @@ import jakarta.inject.Inject; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.jvnet.hk2.annotations.Service; + import org.mvplugins.multiverse.core.api.Destination; import org.mvplugins.multiverse.core.api.LocationManipulation; import org.mvplugins.multiverse.core.api.Teleporter; diff --git a/src/main/java/org/mvplugins/multiverse/core/destination/core/WorldDestinationInstance.java b/src/main/java/org/mvplugins/multiverse/core/destination/core/WorldDestinationInstance.java index 6314e18e..80571b8c 100644 --- a/src/main/java/org/mvplugins/multiverse/core/destination/core/WorldDestinationInstance.java +++ b/src/main/java/org/mvplugins/multiverse/core/destination/core/WorldDestinationInstance.java @@ -5,6 +5,7 @@ import org.bukkit.entity.Entity; import org.bukkit.util.Vector; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; + import org.mvplugins.multiverse.core.api.DestinationInstance; import org.mvplugins.multiverse.core.worldnew.LoadedMultiverseWorld; diff --git a/src/main/java/org/mvplugins/multiverse/core/display/ContentDisplay.java b/src/main/java/org/mvplugins/multiverse/core/display/ContentDisplay.java index 7ccb6eb5..eef8a134 100644 --- a/src/main/java/org/mvplugins/multiverse/core/display/ContentDisplay.java +++ b/src/main/java/org/mvplugins/multiverse/core/display/ContentDisplay.java @@ -6,6 +6,7 @@ import java.util.Objects; import co.aikar.commands.BukkitCommandIssuer; import org.jetbrains.annotations.NotNull; + import org.mvplugins.multiverse.core.display.handlers.DefaultSendHandler; import org.mvplugins.multiverse.core.display.handlers.SendHandler; import org.mvplugins.multiverse.core.display.parsers.ContentProvider; diff --git a/src/main/java/org/mvplugins/multiverse/core/display/handlers/BaseSendHandler.java b/src/main/java/org/mvplugins/multiverse/core/display/handlers/BaseSendHandler.java index f0abd961..8767594b 100644 --- a/src/main/java/org/mvplugins/multiverse/core/display/handlers/BaseSendHandler.java +++ b/src/main/java/org/mvplugins/multiverse/core/display/handlers/BaseSendHandler.java @@ -8,6 +8,7 @@ import com.google.common.base.Strings; import org.bukkit.ChatColor; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; + import org.mvplugins.multiverse.core.display.filters.ContentFilter; import org.mvplugins.multiverse.core.display.filters.DefaultContentFilter; diff --git a/src/main/java/org/mvplugins/multiverse/core/economy/MVEconomist.java b/src/main/java/org/mvplugins/multiverse/core/economy/MVEconomist.java index c2f9a3ce..ff779a68 100644 --- a/src/main/java/org/mvplugins/multiverse/core/economy/MVEconomist.java +++ b/src/main/java/org/mvplugins/multiverse/core/economy/MVEconomist.java @@ -7,6 +7,7 @@ import org.bukkit.entity.Player; import org.bukkit.plugin.Plugin; import org.jetbrains.annotations.Nullable; import org.jvnet.hk2.annotations.Service; + import org.mvplugins.multiverse.core.worldnew.LoadedMultiverseWorld; /** diff --git a/src/main/java/org/mvplugins/multiverse/core/event/MVTeleportEvent.java b/src/main/java/org/mvplugins/multiverse/core/event/MVTeleportEvent.java index 95fcecd2..ccf7f3f3 100644 --- a/src/main/java/org/mvplugins/multiverse/core/event/MVTeleportEvent.java +++ b/src/main/java/org/mvplugins/multiverse/core/event/MVTeleportEvent.java @@ -13,6 +13,7 @@ import org.bukkit.entity.Player; import org.bukkit.event.Cancellable; import org.bukkit.event.Event; import org.bukkit.event.HandlerList; + import org.mvplugins.multiverse.core.api.SafeTTeleporter; import org.mvplugins.multiverse.core.destination.ParsedDestination; diff --git a/src/main/java/org/mvplugins/multiverse/core/event/MVWorldDeleteEvent.java b/src/main/java/org/mvplugins/multiverse/core/event/MVWorldDeleteEvent.java index 7d533753..cc2292fb 100644 --- a/src/main/java/org/mvplugins/multiverse/core/event/MVWorldDeleteEvent.java +++ b/src/main/java/org/mvplugins/multiverse/core/event/MVWorldDeleteEvent.java @@ -3,6 +3,7 @@ package org.mvplugins.multiverse.core.event; import org.bukkit.event.Cancellable; import org.bukkit.event.Event; import org.bukkit.event.HandlerList; + import org.mvplugins.multiverse.core.api.MVWorld; /** diff --git a/src/main/java/org/mvplugins/multiverse/core/event/MVWorldPropertyChangeEvent.java b/src/main/java/org/mvplugins/multiverse/core/event/MVWorldPropertyChangeEvent.java index d95bfe79..b2cf5d5a 100644 --- a/src/main/java/org/mvplugins/multiverse/core/event/MVWorldPropertyChangeEvent.java +++ b/src/main/java/org/mvplugins/multiverse/core/event/MVWorldPropertyChangeEvent.java @@ -11,6 +11,7 @@ import org.bukkit.command.CommandSender; import org.bukkit.event.Cancellable; import org.bukkit.event.Event; import org.bukkit.event.HandlerList; + import org.mvplugins.multiverse.core.api.MVWorld; /** diff --git a/src/main/java/org/mvplugins/multiverse/core/exceptions/MultiverseException.java b/src/main/java/org/mvplugins/multiverse/core/exceptions/MultiverseException.java index a947cdda..536b2388 100644 --- a/src/main/java/org/mvplugins/multiverse/core/exceptions/MultiverseException.java +++ b/src/main/java/org/mvplugins/multiverse/core/exceptions/MultiverseException.java @@ -1,6 +1,7 @@ package org.mvplugins.multiverse.core.exceptions; import org.jetbrains.annotations.Nullable; + import org.mvplugins.multiverse.core.commandtools.MVCommandIssuer; import org.mvplugins.multiverse.core.utils.message.Message; diff --git a/src/main/java/org/mvplugins/multiverse/core/inject/PluginInjection.java b/src/main/java/org/mvplugins/multiverse/core/inject/PluginInjection.java index d1eba938..4a7f3911 100644 --- a/src/main/java/org/mvplugins/multiverse/core/inject/PluginInjection.java +++ b/src/main/java/org/mvplugins/multiverse/core/inject/PluginInjection.java @@ -9,6 +9,7 @@ import org.glassfish.hk2.internal.ServiceLocatorFactoryImpl; import org.glassfish.hk2.utilities.ClasspathDescriptorFileFinder; import org.glassfish.hk2.utilities.ServiceLocatorUtilities; import org.jetbrains.annotations.NotNull; + import org.mvplugins.multiverse.core.inject.binder.JavaPluginBinder; import org.mvplugins.multiverse.core.inject.binder.PluginBinder; import org.mvplugins.multiverse.core.inject.binder.ServerBinder; diff --git a/src/main/java/org/mvplugins/multiverse/core/listeners/MVChatListener.java b/src/main/java/org/mvplugins/multiverse/core/listeners/MVChatListener.java index 48d8c1e5..f124b466 100644 --- a/src/main/java/org/mvplugins/multiverse/core/listeners/MVChatListener.java +++ b/src/main/java/org/mvplugins/multiverse/core/listeners/MVChatListener.java @@ -5,6 +5,7 @@ import org.bukkit.ChatColor; import org.bukkit.event.EventHandler; import org.bukkit.event.player.AsyncPlayerChatEvent; import org.jvnet.hk2.annotations.Service; + import org.mvplugins.multiverse.core.config.MVCoreConfig; import org.mvplugins.multiverse.core.inject.InjectableListener; import org.mvplugins.multiverse.core.worldnew.WorldManager; diff --git a/src/main/java/org/mvplugins/multiverse/core/listeners/MVEntityListener.java b/src/main/java/org/mvplugins/multiverse/core/listeners/MVEntityListener.java index 2b73d2ee..b0fd3f6c 100644 --- a/src/main/java/org/mvplugins/multiverse/core/listeners/MVEntityListener.java +++ b/src/main/java/org/mvplugins/multiverse/core/listeners/MVEntityListener.java @@ -19,6 +19,7 @@ import org.bukkit.event.entity.EntityRegainHealthEvent.RegainReason; import org.bukkit.event.entity.FoodLevelChangeEvent; import org.jetbrains.annotations.NotNull; import org.jvnet.hk2.annotations.Service; + import org.mvplugins.multiverse.core.inject.InjectableListener; import org.mvplugins.multiverse.core.worldnew.WorldManager; import org.mvplugins.multiverse.core.worldnew.WorldPurger; diff --git a/src/main/java/org/mvplugins/multiverse/core/listeners/MVPlayerListener.java b/src/main/java/org/mvplugins/multiverse/core/listeners/MVPlayerListener.java index 578b55c4..33389626 100644 --- a/src/main/java/org/mvplugins/multiverse/core/listeners/MVPlayerListener.java +++ b/src/main/java/org/mvplugins/multiverse/core/listeners/MVPlayerListener.java @@ -31,6 +31,7 @@ import org.bukkit.event.player.PlayerRespawnEvent; import org.bukkit.event.player.PlayerTeleportEvent; import org.bukkit.plugin.Plugin; import org.jvnet.hk2.annotations.Service; + import org.mvplugins.multiverse.core.MultiverseCore; import org.mvplugins.multiverse.core.api.SafeTTeleporter; import org.mvplugins.multiverse.core.commandtools.MVCommandManager; diff --git a/src/main/java/org/mvplugins/multiverse/core/listeners/MVPortalListener.java b/src/main/java/org/mvplugins/multiverse/core/listeners/MVPortalListener.java index 22b2c62d..f51ab40f 100644 --- a/src/main/java/org/mvplugins/multiverse/core/listeners/MVPortalListener.java +++ b/src/main/java/org/mvplugins/multiverse/core/listeners/MVPortalListener.java @@ -19,6 +19,7 @@ import org.bukkit.event.player.PlayerInteractEvent; import org.bukkit.event.world.PortalCreateEvent; import org.jetbrains.annotations.NotNull; import org.jvnet.hk2.annotations.Service; + import org.mvplugins.multiverse.core.config.MVCoreConfig; import org.mvplugins.multiverse.core.inject.InjectableListener; import org.mvplugins.multiverse.core.worldnew.LoadedMultiverseWorld; diff --git a/src/main/java/org/mvplugins/multiverse/core/listeners/MVWeatherListener.java b/src/main/java/org/mvplugins/multiverse/core/listeners/MVWeatherListener.java index 3928d1e9..5f0a3c2e 100644 --- a/src/main/java/org/mvplugins/multiverse/core/listeners/MVWeatherListener.java +++ b/src/main/java/org/mvplugins/multiverse/core/listeners/MVWeatherListener.java @@ -13,6 +13,7 @@ import org.bukkit.event.EventHandler; import org.bukkit.event.weather.ThunderChangeEvent; import org.bukkit.event.weather.WeatherChangeEvent; import org.jvnet.hk2.annotations.Service; + import org.mvplugins.multiverse.core.inject.InjectableListener; import org.mvplugins.multiverse.core.worldnew.WorldManager; diff --git a/src/main/java/org/mvplugins/multiverse/core/listeners/MVWorldListener.java b/src/main/java/org/mvplugins/multiverse/core/listeners/MVWorldListener.java index 565ca318..2dea585b 100644 --- a/src/main/java/org/mvplugins/multiverse/core/listeners/MVWorldListener.java +++ b/src/main/java/org/mvplugins/multiverse/core/listeners/MVWorldListener.java @@ -14,6 +14,7 @@ import org.bukkit.event.EventPriority; import org.bukkit.event.world.WorldLoadEvent; import org.bukkit.event.world.WorldUnloadEvent; import org.jvnet.hk2.annotations.Service; + import org.mvplugins.multiverse.core.inject.InjectableListener; import org.mvplugins.multiverse.core.worldnew.WorldManager; import org.mvplugins.multiverse.core.worldnew.options.UnloadWorldOptions; diff --git a/src/main/java/org/mvplugins/multiverse/core/listeners/MultiverseCoreListener.java b/src/main/java/org/mvplugins/multiverse/core/listeners/MultiverseCoreListener.java index ccf78940..be002f3a 100644 --- a/src/main/java/org/mvplugins/multiverse/core/listeners/MultiverseCoreListener.java +++ b/src/main/java/org/mvplugins/multiverse/core/listeners/MultiverseCoreListener.java @@ -8,6 +8,7 @@ package org.mvplugins.multiverse.core.listeners; import org.bukkit.event.EventHandler; + import org.mvplugins.multiverse.core.event.MVConfigReloadEvent; import org.mvplugins.multiverse.core.event.MVPlayerTouchedPortalEvent; import org.mvplugins.multiverse.core.event.MVRespawnEvent; diff --git a/src/main/java/org/mvplugins/multiverse/core/permissions/CorePermissionsChecker.java b/src/main/java/org/mvplugins/multiverse/core/permissions/CorePermissionsChecker.java index a0f8eae0..be6b1a31 100644 --- a/src/main/java/org/mvplugins/multiverse/core/permissions/CorePermissionsChecker.java +++ b/src/main/java/org/mvplugins/multiverse/core/permissions/CorePermissionsChecker.java @@ -4,6 +4,7 @@ import com.dumptruckman.minecraft.util.Logging; import org.bukkit.command.CommandSender; import org.jetbrains.annotations.NotNull; import org.jvnet.hk2.annotations.Service; + import org.mvplugins.multiverse.core.api.MVWorld; import org.mvplugins.multiverse.core.worldnew.LoadedMultiverseWorld; import org.mvplugins.multiverse.core.worldnew.MultiverseWorld; diff --git a/src/main/java/org/mvplugins/multiverse/core/placeholders/MultiverseCorePlaceholders.java b/src/main/java/org/mvplugins/multiverse/core/placeholders/MultiverseCorePlaceholders.java index e926c929..e2c9a82d 100644 --- a/src/main/java/org/mvplugins/multiverse/core/placeholders/MultiverseCorePlaceholders.java +++ b/src/main/java/org/mvplugins/multiverse/core/placeholders/MultiverseCorePlaceholders.java @@ -10,6 +10,7 @@ import org.bukkit.entity.Player; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.jvnet.hk2.annotations.Service; + import org.mvplugins.multiverse.core.MultiverseCore; import org.mvplugins.multiverse.core.economy.MVEconomist; import org.mvplugins.multiverse.core.worldnew.LoadedMultiverseWorld; diff --git a/src/main/java/org/mvplugins/multiverse/core/teleportation/SimpleBlockSafety.java b/src/main/java/org/mvplugins/multiverse/core/teleportation/SimpleBlockSafety.java index 21cbac10..e6031815 100644 --- a/src/main/java/org/mvplugins/multiverse/core/teleportation/SimpleBlockSafety.java +++ b/src/main/java/org/mvplugins/multiverse/core/teleportation/SimpleBlockSafety.java @@ -22,6 +22,7 @@ import org.bukkit.block.data.type.Bed; import org.bukkit.entity.Minecart; import org.bukkit.entity.Vehicle; import org.jvnet.hk2.annotations.Service; + import org.mvplugins.multiverse.core.api.BlockSafety; import org.mvplugins.multiverse.core.api.LocationManipulation; diff --git a/src/main/java/org/mvplugins/multiverse/core/teleportation/SimpleLocationManipulation.java b/src/main/java/org/mvplugins/multiverse/core/teleportation/SimpleLocationManipulation.java index d504f47c..0d78cbbf 100644 --- a/src/main/java/org/mvplugins/multiverse/core/teleportation/SimpleLocationManipulation.java +++ b/src/main/java/org/mvplugins/multiverse/core/teleportation/SimpleLocationManipulation.java @@ -20,6 +20,7 @@ import org.bukkit.World; import org.bukkit.entity.Vehicle; import org.bukkit.util.Vector; import org.jvnet.hk2.annotations.Service; + import org.mvplugins.multiverse.core.api.LocationManipulation; /** diff --git a/src/main/java/org/mvplugins/multiverse/core/teleportation/SimpleSafeTTeleporter.java b/src/main/java/org/mvplugins/multiverse/core/teleportation/SimpleSafeTTeleporter.java index d19684f6..8e319953 100644 --- a/src/main/java/org/mvplugins/multiverse/core/teleportation/SimpleSafeTTeleporter.java +++ b/src/main/java/org/mvplugins/multiverse/core/teleportation/SimpleSafeTTeleporter.java @@ -25,6 +25,7 @@ import org.bukkit.entity.Player; import org.bukkit.entity.Vehicle; import org.bukkit.util.Vector; import org.jvnet.hk2.annotations.Service; + import org.mvplugins.multiverse.core.MultiverseCore; import org.mvplugins.multiverse.core.api.BlockSafety; import org.mvplugins.multiverse.core.api.DestinationInstance; diff --git a/src/main/java/org/mvplugins/multiverse/core/utils/MVCorei18n.java b/src/main/java/org/mvplugins/multiverse/core/utils/MVCorei18n.java index 59066225..c1eed20d 100644 --- a/src/main/java/org/mvplugins/multiverse/core/utils/MVCorei18n.java +++ b/src/main/java/org/mvplugins/multiverse/core/utils/MVCorei18n.java @@ -3,6 +3,7 @@ package org.mvplugins.multiverse.core.utils; import co.aikar.locales.MessageKey; import co.aikar.locales.MessageKeyProvider; import org.jetbrains.annotations.NotNull; + import org.mvplugins.multiverse.core.utils.message.Message; import org.mvplugins.multiverse.core.utils.message.MessageReplacement; diff --git a/src/main/java/org/mvplugins/multiverse/core/utils/UnsafeCallWrapper.java b/src/main/java/org/mvplugins/multiverse/core/utils/UnsafeCallWrapper.java index 77318822..2620452f 100644 --- a/src/main/java/org/mvplugins/multiverse/core/utils/UnsafeCallWrapper.java +++ b/src/main/java/org/mvplugins/multiverse/core/utils/UnsafeCallWrapper.java @@ -5,6 +5,7 @@ import java.util.concurrent.Callable; import com.dumptruckman.minecraft.util.Logging; import jakarta.inject.Inject; import org.jvnet.hk2.annotations.Service; + import org.mvplugins.multiverse.core.config.MVCoreConfig; /** diff --git a/src/main/java/org/mvplugins/multiverse/core/utils/file/FileUtils.java b/src/main/java/org/mvplugins/multiverse/core/utils/file/FileUtils.java index 881ca7be..64d0a113 100644 --- a/src/main/java/org/mvplugins/multiverse/core/utils/file/FileUtils.java +++ b/src/main/java/org/mvplugins/multiverse/core/utils/file/FileUtils.java @@ -7,9 +7,6 @@ package org.mvplugins.multiverse.core.utils.file; -import static java.nio.file.StandardCopyOption.COPY_ATTRIBUTES; -import static org.bukkit.Bukkit.getServer; - import java.io.File; import java.io.IOException; import java.nio.file.FileVisitResult; @@ -24,6 +21,9 @@ import java.util.stream.Stream; import com.dumptruckman.minecraft.util.Logging; import org.jetbrains.annotations.Nullable; +import static java.nio.file.StandardCopyOption.COPY_ATTRIBUTES; +import static org.bukkit.Bukkit.getServer; + /** * File-utilities. */ diff --git a/src/main/java/org/mvplugins/multiverse/core/utils/message/LocalizedMessage.java b/src/main/java/org/mvplugins/multiverse/core/utils/message/LocalizedMessage.java index 1a290bb1..377967c8 100644 --- a/src/main/java/org/mvplugins/multiverse/core/utils/message/LocalizedMessage.java +++ b/src/main/java/org/mvplugins/multiverse/core/utils/message/LocalizedMessage.java @@ -8,6 +8,7 @@ import co.aikar.locales.MessageKey; import co.aikar.locales.MessageKeyProvider; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; + import org.mvplugins.multiverse.core.commandtools.PluginLocales; final class LocalizedMessage extends Message implements MessageKeyProvider { diff --git a/src/main/java/org/mvplugins/multiverse/core/utils/message/Message.java b/src/main/java/org/mvplugins/multiverse/core/utils/message/Message.java index 2a713fb4..42c601ba 100644 --- a/src/main/java/org/mvplugins/multiverse/core/utils/message/Message.java +++ b/src/main/java/org/mvplugins/multiverse/core/utils/message/Message.java @@ -8,6 +8,7 @@ import co.aikar.locales.MessageKeyProvider; import org.jetbrains.annotations.Contract; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; + import org.mvplugins.multiverse.core.commandtools.PluginLocales; /** diff --git a/src/main/java/org/mvplugins/multiverse/core/utils/metrics/MetricsConfigurator.java b/src/main/java/org/mvplugins/multiverse/core/utils/metrics/MetricsConfigurator.java index bbd4c6f8..238436d0 100644 --- a/src/main/java/org/mvplugins/multiverse/core/utils/metrics/MetricsConfigurator.java +++ b/src/main/java/org/mvplugins/multiverse/core/utils/metrics/MetricsConfigurator.java @@ -10,6 +10,7 @@ import org.apache.commons.lang.WordUtils; import org.bstats.bukkit.Metrics; import org.bukkit.World; import org.jvnet.hk2.annotations.Service; + import org.mvplugins.multiverse.core.MultiverseCore; import org.mvplugins.multiverse.core.worldnew.LoadedMultiverseWorld; import org.mvplugins.multiverse.core.worldnew.WorldManager; diff --git a/src/main/java/org/mvplugins/multiverse/core/utils/result/FailureReason.java b/src/main/java/org/mvplugins/multiverse/core/utils/result/FailureReason.java index e9c5ef50..363e9dd3 100644 --- a/src/main/java/org/mvplugins/multiverse/core/utils/result/FailureReason.java +++ b/src/main/java/org/mvplugins/multiverse/core/utils/result/FailureReason.java @@ -2,6 +2,7 @@ package org.mvplugins.multiverse.core.utils.result; import co.aikar.locales.MessageKey; import co.aikar.locales.MessageKeyProvider; + import org.mvplugins.multiverse.core.utils.MVCorei18n; public interface FailureReason extends MessageKeyProvider { diff --git a/src/main/java/org/mvplugins/multiverse/core/utils/result/Result.java b/src/main/java/org/mvplugins/multiverse/core/utils/result/Result.java index 021b35db..18d846be 100644 --- a/src/main/java/org/mvplugins/multiverse/core/utils/result/Result.java +++ b/src/main/java/org/mvplugins/multiverse/core/utils/result/Result.java @@ -4,6 +4,7 @@ import java.util.function.Consumer; import java.util.function.Function; import org.jetbrains.annotations.NotNull; + import org.mvplugins.multiverse.core.utils.message.Message; import org.mvplugins.multiverse.core.utils.message.MessageReplacement; diff --git a/src/main/java/org/mvplugins/multiverse/core/utils/result/ResultChain.java b/src/main/java/org/mvplugins/multiverse/core/utils/result/ResultChain.java index 58cc5d8f..913eedc6 100644 --- a/src/main/java/org/mvplugins/multiverse/core/utils/result/ResultChain.java +++ b/src/main/java/org/mvplugins/multiverse/core/utils/result/ResultChain.java @@ -9,6 +9,7 @@ import java.util.stream.Collectors; import com.google.common.collect.Iterables; import io.vavr.control.Option; + import org.mvplugins.multiverse.core.utils.message.Message; public class ResultChain { diff --git a/src/main/java/org/mvplugins/multiverse/core/utils/result/SuccessReason.java b/src/main/java/org/mvplugins/multiverse/core/utils/result/SuccessReason.java index 591fb39f..0f29ed0a 100644 --- a/src/main/java/org/mvplugins/multiverse/core/utils/result/SuccessReason.java +++ b/src/main/java/org/mvplugins/multiverse/core/utils/result/SuccessReason.java @@ -2,6 +2,7 @@ package org.mvplugins.multiverse.core.utils.result; import co.aikar.locales.MessageKey; import co.aikar.locales.MessageKeyProvider; + import org.mvplugins.multiverse.core.utils.MVCorei18n; public interface SuccessReason extends MessageKeyProvider { diff --git a/src/main/java/org/mvplugins/multiverse/core/utils/webpaste/HttpAPIClient.java b/src/main/java/org/mvplugins/multiverse/core/utils/webpaste/HttpAPIClient.java index c10428a2..69672a7b 100644 --- a/src/main/java/org/mvplugins/multiverse/core/utils/webpaste/HttpAPIClient.java +++ b/src/main/java/org/mvplugins/multiverse/core/utils/webpaste/HttpAPIClient.java @@ -1,6 +1,5 @@ package org.mvplugins.multiverse.core.utils.webpaste; -import javax.net.ssl.HttpsURLConnection; import java.io.BufferedReader; import java.io.IOException; import java.io.InputStreamReader; @@ -9,6 +8,8 @@ import java.net.URL; import java.nio.charset.StandardCharsets; import java.util.Map; +import javax.net.ssl.HttpsURLConnection; + /** * HTTP API-client. */ diff --git a/src/main/java/org/mvplugins/multiverse/core/world/SimpleMVWorld.java b/src/main/java/org/mvplugins/multiverse/core/world/SimpleMVWorld.java index e87081e9..018de867 100644 --- a/src/main/java/org/mvplugins/multiverse/core/world/SimpleMVWorld.java +++ b/src/main/java/org/mvplugins/multiverse/core/world/SimpleMVWorld.java @@ -32,6 +32,7 @@ import org.bukkit.permissions.Permission; import org.bukkit.permissions.PermissionDefault; import org.bukkit.util.Vector; import org.jetbrains.annotations.Nullable; + import org.mvplugins.multiverse.core.api.BlockSafety; import org.mvplugins.multiverse.core.api.LocationManipulation; import org.mvplugins.multiverse.core.api.MVWorld; diff --git a/src/main/java/org/mvplugins/multiverse/core/world/SimpleMVWorldManager.java b/src/main/java/org/mvplugins/multiverse/core/world/SimpleMVWorldManager.java index 6e66090e..c77a26ba 100644 --- a/src/main/java/org/mvplugins/multiverse/core/world/SimpleMVWorldManager.java +++ b/src/main/java/org/mvplugins/multiverse/core/world/SimpleMVWorldManager.java @@ -7,8 +7,6 @@ package org.mvplugins.multiverse.core.world; -import static org.mvplugins.multiverse.core.utils.file.FileUtils.getBukkitConfig; - import java.io.File; import java.io.IOException; import java.util.ArrayList; @@ -44,6 +42,7 @@ import org.bukkit.permissions.Permission; import org.bukkit.permissions.PermissionDefault; import org.bukkit.plugin.Plugin; import org.jvnet.hk2.annotations.Service; + import org.mvplugins.multiverse.core.MultiverseCore; import org.mvplugins.multiverse.core.api.BlockSafety; import org.mvplugins.multiverse.core.api.LocationManipulation; @@ -57,6 +56,8 @@ import org.mvplugins.multiverse.core.listeners.MVPlayerListener; import org.mvplugins.multiverse.core.utils.UnsafeCallWrapper; import org.mvplugins.multiverse.core.utils.file.FileUtils; +import static org.mvplugins.multiverse.core.utils.file.FileUtils.getBukkitConfig; + /** * Public facing API to add/remove Multiverse worlds. */ diff --git a/src/main/java/org/mvplugins/multiverse/core/world/SimpleWorldPurger.java b/src/main/java/org/mvplugins/multiverse/core/world/SimpleWorldPurger.java index fe598879..3c97dc18 100644 --- a/src/main/java/org/mvplugins/multiverse/core/world/SimpleWorldPurger.java +++ b/src/main/java/org/mvplugins/multiverse/core/world/SimpleWorldPurger.java @@ -26,6 +26,7 @@ import org.bukkit.entity.Projectile; import org.bukkit.entity.Slime; import org.bukkit.entity.Squid; import org.jvnet.hk2.annotations.Service; + import org.mvplugins.multiverse.core.api.MVWorld; import org.mvplugins.multiverse.core.api.WorldPurger; diff --git a/src/main/java/org/mvplugins/multiverse/core/world/WorldProperties.java b/src/main/java/org/mvplugins/multiverse/core/world/WorldProperties.java index d1aa73f0..2ceb38ba 100644 --- a/src/main/java/org/mvplugins/multiverse/core/world/WorldProperties.java +++ b/src/main/java/org/mvplugins/multiverse/core/world/WorldProperties.java @@ -22,6 +22,7 @@ import org.bukkit.Material; import org.bukkit.World.Environment; import org.bukkit.configuration.serialization.SerializableAs; import org.jetbrains.annotations.Nullable; + import org.mvplugins.multiverse.core.world.configuration.AllowedPortalType; import org.mvplugins.multiverse.core.world.configuration.EnglishChatColor; import org.mvplugins.multiverse.core.world.configuration.EnglishChatStyle; diff --git a/src/main/java/org/mvplugins/multiverse/core/world/configuration/EntryFee.java b/src/main/java/org/mvplugins/multiverse/core/world/configuration/EntryFee.java index 4e86f9ac..381bbac3 100644 --- a/src/main/java/org/mvplugins/multiverse/core/world/configuration/EntryFee.java +++ b/src/main/java/org/mvplugins/multiverse/core/world/configuration/EntryFee.java @@ -8,6 +8,7 @@ import me.main__.util.SerializationConfig.Serializor; import org.bukkit.Material; import org.bukkit.configuration.serialization.SerializableAs; import org.jetbrains.annotations.Nullable; + import org.mvplugins.multiverse.core.utils.MaterialConverter; /** diff --git a/src/main/java/org/mvplugins/multiverse/core/world/configuration/WorldPropertyValidator.java b/src/main/java/org/mvplugins/multiverse/core/world/configuration/WorldPropertyValidator.java index d2064568..e8eb0ced 100644 --- a/src/main/java/org/mvplugins/multiverse/core/world/configuration/WorldPropertyValidator.java +++ b/src/main/java/org/mvplugins/multiverse/core/world/configuration/WorldPropertyValidator.java @@ -3,6 +3,7 @@ package org.mvplugins.multiverse.core.world.configuration; import me.main__.util.SerializationConfig.ChangeDeniedException; import me.main__.util.SerializationConfig.ObjectUsingValidator; import org.bukkit.Bukkit; + import org.mvplugins.multiverse.core.event.MVWorldPropertyChangeEvent; import org.mvplugins.multiverse.core.world.SimpleMVWorld; diff --git a/src/main/java/org/mvplugins/multiverse/core/worldnew/LoadedMultiverseWorld.java b/src/main/java/org/mvplugins/multiverse/core/worldnew/LoadedMultiverseWorld.java index 72a3bde6..d8a12a94 100644 --- a/src/main/java/org/mvplugins/multiverse/core/worldnew/LoadedMultiverseWorld.java +++ b/src/main/java/org/mvplugins/multiverse/core/worldnew/LoadedMultiverseWorld.java @@ -11,6 +11,7 @@ import org.bukkit.World; import org.bukkit.WorldType; import org.bukkit.entity.Player; import org.jetbrains.annotations.NotNull; + import org.mvplugins.multiverse.core.api.BlockSafety; import org.mvplugins.multiverse.core.api.LocationManipulation; import org.mvplugins.multiverse.core.api.SafeTTeleporter; diff --git a/src/main/java/org/mvplugins/multiverse/core/worldnew/MultiverseWorld.java b/src/main/java/org/mvplugins/multiverse/core/worldnew/MultiverseWorld.java index 2ad9627e..9f0530c3 100644 --- a/src/main/java/org/mvplugins/multiverse/core/worldnew/MultiverseWorld.java +++ b/src/main/java/org/mvplugins/multiverse/core/worldnew/MultiverseWorld.java @@ -12,6 +12,7 @@ import org.bukkit.Location; import org.bukkit.Material; import org.bukkit.World; import org.jetbrains.annotations.Nullable; + import org.mvplugins.multiverse.core.world.configuration.AllowedPortalType; import org.mvplugins.multiverse.core.worldnew.config.WorldConfig; diff --git a/src/main/java/org/mvplugins/multiverse/core/worldnew/WorldManager.java b/src/main/java/org/mvplugins/multiverse/core/worldnew/WorldManager.java index 47c43475..2ec269c2 100644 --- a/src/main/java/org/mvplugins/multiverse/core/worldnew/WorldManager.java +++ b/src/main/java/org/mvplugins/multiverse/core/worldnew/WorldManager.java @@ -1,9 +1,5 @@ package org.mvplugins.multiverse.core.worldnew; -import static org.mvplugins.multiverse.core.utils.message.MessageReplacement.replace; -import static org.mvplugins.multiverse.core.worldnew.helpers.DataStore.WorldBorderStore; -import static org.mvplugins.multiverse.core.worldnew.helpers.DataStore.WorldConfigStore; - import java.io.File; import java.util.ArrayList; import java.util.Arrays; @@ -28,6 +24,7 @@ import org.bukkit.entity.Player; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.jvnet.hk2.annotations.Service; + import org.mvplugins.multiverse.core.api.BlockSafety; import org.mvplugins.multiverse.core.api.LocationManipulation; import org.mvplugins.multiverse.core.api.SafeTTeleporter; @@ -55,6 +52,10 @@ import org.mvplugins.multiverse.core.worldnew.reasons.RegenFailureReason; import org.mvplugins.multiverse.core.worldnew.reasons.RemoveFailureReason; import org.mvplugins.multiverse.core.worldnew.reasons.UnloadFailureReason; +import static org.mvplugins.multiverse.core.utils.message.MessageReplacement.replace; +import static org.mvplugins.multiverse.core.worldnew.helpers.DataStore.WorldBorderStore; +import static org.mvplugins.multiverse.core.worldnew.helpers.DataStore.WorldConfigStore; + /** * This manager contains all the world managing functions that your heart desires. */ diff --git a/src/main/java/org/mvplugins/multiverse/core/worldnew/config/LegacyAliasMigrator.java b/src/main/java/org/mvplugins/multiverse/core/worldnew/config/LegacyAliasMigrator.java index 70c018b9..e6b66aaf 100644 --- a/src/main/java/org/mvplugins/multiverse/core/worldnew/config/LegacyAliasMigrator.java +++ b/src/main/java/org/mvplugins/multiverse/core/worldnew/config/LegacyAliasMigrator.java @@ -5,6 +5,7 @@ import java.util.concurrent.atomic.AtomicReference; import io.vavr.control.Try; import org.bukkit.ChatColor; import org.bukkit.configuration.ConfigurationSection; + import org.mvplugins.multiverse.core.configuration.migration.MigratorAction; class LegacyAliasMigrator implements MigratorAction { diff --git a/src/main/java/org/mvplugins/multiverse/core/worldnew/config/NullLocation.java b/src/main/java/org/mvplugins/multiverse/core/worldnew/config/NullLocation.java index 5cfd1408..b240e07b 100644 --- a/src/main/java/org/mvplugins/multiverse/core/worldnew/config/NullLocation.java +++ b/src/main/java/org/mvplugins/multiverse/core/worldnew/config/NullLocation.java @@ -7,6 +7,7 @@ import org.bukkit.Location; import org.bukkit.configuration.serialization.SerializableAs; import org.bukkit.util.Vector; import org.jetbrains.annotations.NotNull; + import org.mvplugins.multiverse.core.world.SimpleMVWorld; /** diff --git a/src/main/java/org/mvplugins/multiverse/core/worldnew/config/WorldConfig.java b/src/main/java/org/mvplugins/multiverse/core/worldnew/config/WorldConfig.java index 09d46dca..332ffbe6 100644 --- a/src/main/java/org/mvplugins/multiverse/core/worldnew/config/WorldConfig.java +++ b/src/main/java/org/mvplugins/multiverse/core/worldnew/config/WorldConfig.java @@ -13,6 +13,7 @@ import org.bukkit.World; import org.bukkit.configuration.ConfigurationSection; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; + import org.mvplugins.multiverse.core.configuration.handle.ConfigurationSectionHandle; import org.mvplugins.multiverse.core.configuration.migration.BooleanMigratorAction; import org.mvplugins.multiverse.core.configuration.migration.ConfigMigrator; diff --git a/src/main/java/org/mvplugins/multiverse/core/worldnew/config/WorldConfigNodes.java b/src/main/java/org/mvplugins/multiverse/core/worldnew/config/WorldConfigNodes.java index cd5db03c..e4538fa2 100644 --- a/src/main/java/org/mvplugins/multiverse/core/worldnew/config/WorldConfigNodes.java +++ b/src/main/java/org/mvplugins/multiverse/core/worldnew/config/WorldConfigNodes.java @@ -8,6 +8,7 @@ import org.bukkit.GameMode; import org.bukkit.Location; import org.bukkit.Material; import org.bukkit.World; + import org.mvplugins.multiverse.core.configuration.node.ConfigNode; import org.mvplugins.multiverse.core.configuration.node.Node; import org.mvplugins.multiverse.core.configuration.node.NodeGroup; diff --git a/src/main/java/org/mvplugins/multiverse/core/worldnew/config/WorldsConfigManager.java b/src/main/java/org/mvplugins/multiverse/core/worldnew/config/WorldsConfigManager.java index edcb21e7..22fdb299 100644 --- a/src/main/java/org/mvplugins/multiverse/core/worldnew/config/WorldsConfigManager.java +++ b/src/main/java/org/mvplugins/multiverse/core/worldnew/config/WorldsConfigManager.java @@ -19,6 +19,7 @@ import org.bukkit.configuration.InvalidConfigurationException; import org.bukkit.configuration.file.YamlConfiguration; import org.jetbrains.annotations.NotNull; import org.jvnet.hk2.annotations.Service; + import org.mvplugins.multiverse.core.MultiverseCore; /** diff --git a/src/main/java/org/mvplugins/multiverse/core/worldnew/entrycheck/BlacklistResult.java b/src/main/java/org/mvplugins/multiverse/core/worldnew/entrycheck/BlacklistResult.java index 108b6eac..71c697a6 100644 --- a/src/main/java/org/mvplugins/multiverse/core/worldnew/entrycheck/BlacklistResult.java +++ b/src/main/java/org/mvplugins/multiverse/core/worldnew/entrycheck/BlacklistResult.java @@ -2,6 +2,7 @@ package org.mvplugins.multiverse.core.worldnew.entrycheck; import co.aikar.locales.MessageKey; import co.aikar.locales.MessageKeyProvider; + import org.mvplugins.multiverse.core.utils.MVCorei18n; import org.mvplugins.multiverse.core.utils.result.FailureReason; import org.mvplugins.multiverse.core.utils.result.SuccessReason; diff --git a/src/main/java/org/mvplugins/multiverse/core/worldnew/entrycheck/EntryFeeResult.java b/src/main/java/org/mvplugins/multiverse/core/worldnew/entrycheck/EntryFeeResult.java index 2c82514b..0b562a54 100644 --- a/src/main/java/org/mvplugins/multiverse/core/worldnew/entrycheck/EntryFeeResult.java +++ b/src/main/java/org/mvplugins/multiverse/core/worldnew/entrycheck/EntryFeeResult.java @@ -2,6 +2,7 @@ package org.mvplugins.multiverse.core.worldnew.entrycheck; import co.aikar.locales.MessageKey; import co.aikar.locales.MessageKeyProvider; + import org.mvplugins.multiverse.core.utils.MVCorei18n; import org.mvplugins.multiverse.core.utils.result.FailureReason; import org.mvplugins.multiverse.core.utils.result.SuccessReason; diff --git a/src/main/java/org/mvplugins/multiverse/core/worldnew/entrycheck/PlayerLimitResult.java b/src/main/java/org/mvplugins/multiverse/core/worldnew/entrycheck/PlayerLimitResult.java index cffc5217..3a2e2b31 100644 --- a/src/main/java/org/mvplugins/multiverse/core/worldnew/entrycheck/PlayerLimitResult.java +++ b/src/main/java/org/mvplugins/multiverse/core/worldnew/entrycheck/PlayerLimitResult.java @@ -2,6 +2,7 @@ package org.mvplugins.multiverse.core.worldnew.entrycheck; import co.aikar.locales.MessageKey; import co.aikar.locales.MessageKeyProvider; + import org.mvplugins.multiverse.core.utils.MVCorei18n; import org.mvplugins.multiverse.core.utils.result.FailureReason; import org.mvplugins.multiverse.core.utils.result.SuccessReason; diff --git a/src/main/java/org/mvplugins/multiverse/core/worldnew/entrycheck/WorldAccessResult.java b/src/main/java/org/mvplugins/multiverse/core/worldnew/entrycheck/WorldAccessResult.java index 84c82fc8..ea7b2982 100644 --- a/src/main/java/org/mvplugins/multiverse/core/worldnew/entrycheck/WorldAccessResult.java +++ b/src/main/java/org/mvplugins/multiverse/core/worldnew/entrycheck/WorldAccessResult.java @@ -2,6 +2,7 @@ package org.mvplugins.multiverse.core.worldnew.entrycheck; import co.aikar.locales.MessageKey; import co.aikar.locales.MessageKeyProvider; + import org.mvplugins.multiverse.core.utils.MVCorei18n; import org.mvplugins.multiverse.core.utils.result.FailureReason; import org.mvplugins.multiverse.core.utils.result.SuccessReason; diff --git a/src/main/java/org/mvplugins/multiverse/core/worldnew/entrycheck/WorldEntryChecker.java b/src/main/java/org/mvplugins/multiverse/core/worldnew/entrycheck/WorldEntryChecker.java index 0960a49e..7798eb17 100644 --- a/src/main/java/org/mvplugins/multiverse/core/worldnew/entrycheck/WorldEntryChecker.java +++ b/src/main/java/org/mvplugins/multiverse/core/worldnew/entrycheck/WorldEntryChecker.java @@ -1,7 +1,5 @@ package org.mvplugins.multiverse.core.worldnew.entrycheck; -import static org.mvplugins.multiverse.core.utils.message.MessageReplacement.replace; - import java.util.Collection; import org.bukkit.Material; @@ -12,6 +10,7 @@ import org.bukkit.command.ConsoleCommandSender; import org.bukkit.entity.Player; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; + import org.mvplugins.multiverse.core.config.MVCoreConfig; import org.mvplugins.multiverse.core.economy.MVEconomist; import org.mvplugins.multiverse.core.permissions.CorePermissionsChecker; @@ -21,6 +20,8 @@ import org.mvplugins.multiverse.core.world.configuration.EntryFee; import org.mvplugins.multiverse.core.worldnew.LoadedMultiverseWorld; import org.mvplugins.multiverse.core.worldnew.MultiverseWorld; +import static org.mvplugins.multiverse.core.utils.message.MessageReplacement.replace; + /** * Checks if a player can enter a world. */ diff --git a/src/main/java/org/mvplugins/multiverse/core/worldnew/entrycheck/WorldEntryCheckerProvider.java b/src/main/java/org/mvplugins/multiverse/core/worldnew/entrycheck/WorldEntryCheckerProvider.java index 2eb52256..91910dad 100644 --- a/src/main/java/org/mvplugins/multiverse/core/worldnew/entrycheck/WorldEntryCheckerProvider.java +++ b/src/main/java/org/mvplugins/multiverse/core/worldnew/entrycheck/WorldEntryCheckerProvider.java @@ -4,6 +4,7 @@ import jakarta.inject.Inject; import org.bukkit.command.CommandSender; import org.jetbrains.annotations.NotNull; import org.jvnet.hk2.annotations.Service; + import org.mvplugins.multiverse.core.config.MVCoreConfig; import org.mvplugins.multiverse.core.economy.MVEconomist; import org.mvplugins.multiverse.core.permissions.CorePermissionsChecker; diff --git a/src/main/java/org/mvplugins/multiverse/core/worldnew/generators/GeneratorProvider.java b/src/main/java/org/mvplugins/multiverse/core/worldnew/generators/GeneratorProvider.java index 06a4f7f6..e57682a3 100644 --- a/src/main/java/org/mvplugins/multiverse/core/worldnew/generators/GeneratorProvider.java +++ b/src/main/java/org/mvplugins/multiverse/core/worldnew/generators/GeneratorProvider.java @@ -1,7 +1,5 @@ package org.mvplugins.multiverse.core.worldnew.generators; -import static org.mvplugins.multiverse.core.utils.file.FileUtils.getBukkitConfig; - import java.io.File; import java.util.ArrayList; import java.util.Arrays; @@ -27,8 +25,11 @@ import org.bukkit.plugin.Plugin; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.jvnet.hk2.annotations.Service; + import org.mvplugins.multiverse.core.MultiverseCore; +import static org.mvplugins.multiverse.core.utils.file.FileUtils.getBukkitConfig; + /** * Parse the default world generators from the bukkit config and load any generator plugins. * Helps in suggesting and validating generator strings. diff --git a/src/main/java/org/mvplugins/multiverse/core/worldnew/helpers/DataStore.java b/src/main/java/org/mvplugins/multiverse/core/worldnew/helpers/DataStore.java index 2d402f1b..a86251ea 100644 --- a/src/main/java/org/mvplugins/multiverse/core/worldnew/helpers/DataStore.java +++ b/src/main/java/org/mvplugins/multiverse/core/worldnew/helpers/DataStore.java @@ -9,6 +9,7 @@ import io.vavr.control.Try; import org.bukkit.GameRule; import org.bukkit.World; import org.jvnet.hk2.annotations.Service; + import org.mvplugins.multiverse.core.worldnew.LoadedMultiverseWorld; /** diff --git a/src/main/java/org/mvplugins/multiverse/core/worldnew/helpers/FilesManipulator.java b/src/main/java/org/mvplugins/multiverse/core/worldnew/helpers/FilesManipulator.java index 597dd22b..5cc3464c 100644 --- a/src/main/java/org/mvplugins/multiverse/core/worldnew/helpers/FilesManipulator.java +++ b/src/main/java/org/mvplugins/multiverse/core/worldnew/helpers/FilesManipulator.java @@ -1,7 +1,5 @@ package org.mvplugins.multiverse.core.worldnew.helpers; -import static java.nio.file.StandardCopyOption.COPY_ATTRIBUTES; - import java.io.File; import java.io.IOException; import java.nio.file.FileVisitResult; @@ -19,6 +17,8 @@ import io.vavr.control.Try; import org.jetbrains.annotations.NotNull; import org.jvnet.hk2.annotations.Service; +import static java.nio.file.StandardCopyOption.COPY_ATTRIBUTES; + /** * A helper class for manipulating files and folders. */ diff --git a/src/main/java/org/mvplugins/multiverse/core/worldnew/options/CloneWorldOptions.java b/src/main/java/org/mvplugins/multiverse/core/worldnew/options/CloneWorldOptions.java index e23a15b5..8a18da36 100644 --- a/src/main/java/org/mvplugins/multiverse/core/worldnew/options/CloneWorldOptions.java +++ b/src/main/java/org/mvplugins/multiverse/core/worldnew/options/CloneWorldOptions.java @@ -1,6 +1,7 @@ package org.mvplugins.multiverse.core.worldnew.options; import org.jetbrains.annotations.NotNull; + import org.mvplugins.multiverse.core.worldnew.LoadedMultiverseWorld; /** diff --git a/src/main/java/org/mvplugins/multiverse/core/worldnew/options/RegenWorldOptions.java b/src/main/java/org/mvplugins/multiverse/core/worldnew/options/RegenWorldOptions.java index be72e08d..ac49460a 100644 --- a/src/main/java/org/mvplugins/multiverse/core/worldnew/options/RegenWorldOptions.java +++ b/src/main/java/org/mvplugins/multiverse/core/worldnew/options/RegenWorldOptions.java @@ -4,6 +4,7 @@ import java.util.Random; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; + import org.mvplugins.multiverse.core.worldnew.LoadedMultiverseWorld; /** diff --git a/src/main/java/org/mvplugins/multiverse/core/worldnew/reasons/CloneFailureReason.java b/src/main/java/org/mvplugins/multiverse/core/worldnew/reasons/CloneFailureReason.java index d054223a..3dff3919 100644 --- a/src/main/java/org/mvplugins/multiverse/core/worldnew/reasons/CloneFailureReason.java +++ b/src/main/java/org/mvplugins/multiverse/core/worldnew/reasons/CloneFailureReason.java @@ -2,6 +2,7 @@ package org.mvplugins.multiverse.core.worldnew.reasons; import co.aikar.locales.MessageKey; import co.aikar.locales.MessageKeyProvider; + import org.mvplugins.multiverse.core.utils.MVCorei18n; import org.mvplugins.multiverse.core.utils.result.FailureReason; diff --git a/src/main/java/org/mvplugins/multiverse/core/worldnew/reasons/CreateFailureReason.java b/src/main/java/org/mvplugins/multiverse/core/worldnew/reasons/CreateFailureReason.java index 13f0a2d0..876b20ce 100644 --- a/src/main/java/org/mvplugins/multiverse/core/worldnew/reasons/CreateFailureReason.java +++ b/src/main/java/org/mvplugins/multiverse/core/worldnew/reasons/CreateFailureReason.java @@ -2,6 +2,7 @@ package org.mvplugins.multiverse.core.worldnew.reasons; import co.aikar.locales.MessageKey; import co.aikar.locales.MessageKeyProvider; + import org.mvplugins.multiverse.core.utils.MVCorei18n; import org.mvplugins.multiverse.core.utils.result.FailureReason; diff --git a/src/main/java/org/mvplugins/multiverse/core/worldnew/reasons/DeleteFailureReason.java b/src/main/java/org/mvplugins/multiverse/core/worldnew/reasons/DeleteFailureReason.java index c93064c4..83149944 100644 --- a/src/main/java/org/mvplugins/multiverse/core/worldnew/reasons/DeleteFailureReason.java +++ b/src/main/java/org/mvplugins/multiverse/core/worldnew/reasons/DeleteFailureReason.java @@ -2,6 +2,7 @@ package org.mvplugins.multiverse.core.worldnew.reasons; import co.aikar.locales.MessageKey; import co.aikar.locales.MessageKeyProvider; + import org.mvplugins.multiverse.core.utils.MVCorei18n; import org.mvplugins.multiverse.core.utils.result.FailureReason; diff --git a/src/main/java/org/mvplugins/multiverse/core/worldnew/reasons/ImportFailureReason.java b/src/main/java/org/mvplugins/multiverse/core/worldnew/reasons/ImportFailureReason.java index 9417742b..45927aa4 100644 --- a/src/main/java/org/mvplugins/multiverse/core/worldnew/reasons/ImportFailureReason.java +++ b/src/main/java/org/mvplugins/multiverse/core/worldnew/reasons/ImportFailureReason.java @@ -2,6 +2,7 @@ package org.mvplugins.multiverse.core.worldnew.reasons; import co.aikar.locales.MessageKey; import co.aikar.locales.MessageKeyProvider; + import org.mvplugins.multiverse.core.utils.MVCorei18n; import org.mvplugins.multiverse.core.utils.result.FailureReason; diff --git a/src/main/java/org/mvplugins/multiverse/core/worldnew/reasons/LoadFailureReason.java b/src/main/java/org/mvplugins/multiverse/core/worldnew/reasons/LoadFailureReason.java index 4c131b43..30657fd5 100644 --- a/src/main/java/org/mvplugins/multiverse/core/worldnew/reasons/LoadFailureReason.java +++ b/src/main/java/org/mvplugins/multiverse/core/worldnew/reasons/LoadFailureReason.java @@ -2,6 +2,7 @@ package org.mvplugins.multiverse.core.worldnew.reasons; import co.aikar.locales.MessageKey; import co.aikar.locales.MessageKeyProvider; + import org.mvplugins.multiverse.core.utils.MVCorei18n; import org.mvplugins.multiverse.core.utils.result.FailureReason; diff --git a/src/main/java/org/mvplugins/multiverse/core/worldnew/reasons/RegenFailureReason.java b/src/main/java/org/mvplugins/multiverse/core/worldnew/reasons/RegenFailureReason.java index fdfec41b..d904c00e 100644 --- a/src/main/java/org/mvplugins/multiverse/core/worldnew/reasons/RegenFailureReason.java +++ b/src/main/java/org/mvplugins/multiverse/core/worldnew/reasons/RegenFailureReason.java @@ -2,6 +2,7 @@ package org.mvplugins.multiverse.core.worldnew.reasons; import co.aikar.locales.MessageKey; import co.aikar.locales.MessageKeyProvider; + import org.mvplugins.multiverse.core.utils.MVCorei18n; import org.mvplugins.multiverse.core.utils.result.FailureReason; diff --git a/src/main/java/org/mvplugins/multiverse/core/worldnew/reasons/RemoveFailureReason.java b/src/main/java/org/mvplugins/multiverse/core/worldnew/reasons/RemoveFailureReason.java index bb997ab2..810d93fe 100644 --- a/src/main/java/org/mvplugins/multiverse/core/worldnew/reasons/RemoveFailureReason.java +++ b/src/main/java/org/mvplugins/multiverse/core/worldnew/reasons/RemoveFailureReason.java @@ -2,6 +2,7 @@ package org.mvplugins.multiverse.core.worldnew.reasons; import co.aikar.locales.MessageKey; import co.aikar.locales.MessageKeyProvider; + import org.mvplugins.multiverse.core.utils.MVCorei18n; import org.mvplugins.multiverse.core.utils.result.FailureReason; diff --git a/src/main/java/org/mvplugins/multiverse/core/worldnew/reasons/UnloadFailureReason.java b/src/main/java/org/mvplugins/multiverse/core/worldnew/reasons/UnloadFailureReason.java index 14f5865a..759ecd5c 100644 --- a/src/main/java/org/mvplugins/multiverse/core/worldnew/reasons/UnloadFailureReason.java +++ b/src/main/java/org/mvplugins/multiverse/core/worldnew/reasons/UnloadFailureReason.java @@ -2,6 +2,7 @@ package org.mvplugins.multiverse.core.worldnew.reasons; import co.aikar.locales.MessageKey; import co.aikar.locales.MessageKeyProvider; + import org.mvplugins.multiverse.core.utils.MVCorei18n; import org.mvplugins.multiverse.core.utils.result.FailureReason; diff --git a/src/old-test/java/org/mvplugins/multiverse/core/TestDebugMode.java b/src/old-test/java/org/mvplugins/multiverse/core/TestDebugMode.java index 6aed6d20..0ee6e319 100644 --- a/src/old-test/java/org/mvplugins/multiverse/core/TestDebugMode.java +++ b/src/old-test/java/org/mvplugins/multiverse/core/TestDebugMode.java @@ -7,11 +7,6 @@ package org.mvplugins.multiverse.core; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertTrue; -import static org.mockito.Mockito.mock; -import static org.mockito.Mockito.when; - import java.io.File; import org.bukkit.Server; @@ -21,9 +16,15 @@ import org.bukkit.plugin.Plugin; import org.junit.After; import org.junit.Before; import org.junit.Test; + import org.mvplugins.multiverse.core.api.MVCore; import org.mvplugins.multiverse.core.utils.TestInstanceCreator; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertTrue; +import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.when; + public class TestDebugMode { TestInstanceCreator creator; Server mockServer; diff --git a/src/old-test/java/org/mvplugins/multiverse/core/TestEntitySpawnRules.java b/src/old-test/java/org/mvplugins/multiverse/core/TestEntitySpawnRules.java index b6d3c5fe..b09faafb 100644 --- a/src/old-test/java/org/mvplugins/multiverse/core/TestEntitySpawnRules.java +++ b/src/old-test/java/org/mvplugins/multiverse/core/TestEntitySpawnRules.java @@ -1,13 +1,5 @@ package org.mvplugins.multiverse.core; -import static org.junit.Assert.assertTrue; -import static org.mockito.Mockito.anyBoolean; -import static org.mockito.Mockito.anyString; -import static org.mockito.Mockito.mock; -import static org.mockito.Mockito.never; -import static org.mockito.Mockito.verify; -import static org.mockito.Mockito.when; - import java.lang.reflect.Field; import java.util.Arrays; import java.util.Collections; @@ -24,12 +16,21 @@ import org.bukkit.event.entity.CreatureSpawnEvent.SpawnReason; import org.junit.After; import org.junit.Before; import org.junit.Test; + import org.mvplugins.multiverse.core.api.MVWorld; import org.mvplugins.multiverse.core.api.MVWorldManager; import org.mvplugins.multiverse.core.listeners.MVEntityListener; import org.mvplugins.multiverse.core.utils.MockWorldFactory; import org.mvplugins.multiverse.core.utils.TestInstanceCreator; +import static org.junit.Assert.assertTrue; +import static org.mockito.Mockito.anyBoolean; +import static org.mockito.Mockito.anyString; +import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.never; +import static org.mockito.Mockito.verify; +import static org.mockito.Mockito.when; + public class TestEntitySpawnRules { TestInstanceCreator creator; MultiverseCore core; diff --git a/src/old-test/java/org/mvplugins/multiverse/core/TestEntryFeeConversion.java b/src/old-test/java/org/mvplugins/multiverse/core/TestEntryFeeConversion.java index d654e751..0d114555 100644 --- a/src/old-test/java/org/mvplugins/multiverse/core/TestEntryFeeConversion.java +++ b/src/old-test/java/org/mvplugins/multiverse/core/TestEntryFeeConversion.java @@ -1,9 +1,5 @@ package org.mvplugins.multiverse.core; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNull; -import static org.junit.Assert.assertTrue; - import java.util.HashMap; import java.util.Map; @@ -11,9 +7,14 @@ import org.bukkit.Material; import org.junit.After; import org.junit.Before; import org.junit.Test; + import org.mvplugins.multiverse.core.utils.TestInstanceCreator; import org.mvplugins.multiverse.core.world.WorldProperties; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNull; +import static org.junit.Assert.assertTrue; + public class TestEntryFeeConversion { private TestInstanceCreator creator; diff --git a/src/old-test/java/org/mvplugins/multiverse/core/TestModifyCommand.java b/src/old-test/java/org/mvplugins/multiverse/core/TestModifyCommand.java index 42475308..6fd3e058 100644 --- a/src/old-test/java/org/mvplugins/multiverse/core/TestModifyCommand.java +++ b/src/old-test/java/org/mvplugins/multiverse/core/TestModifyCommand.java @@ -1,17 +1,18 @@ package org.mvplugins.multiverse.core; -import static org.junit.Assert.assertTrue; -import static org.mockito.Mockito.mock; -import static org.mockito.Mockito.when; - import org.bukkit.Server; import org.bukkit.command.Command; import org.bukkit.command.CommandSender; import org.junit.After; import org.junit.Before; import org.junit.Test; + import org.mvplugins.multiverse.core.utils.TestInstanceCreator; +import static org.junit.Assert.assertTrue; +import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.when; + public class TestModifyCommand { TestInstanceCreator creator; Server mockServer; diff --git a/src/old-test/java/org/mvplugins/multiverse/core/TestWorldProperties.java b/src/old-test/java/org/mvplugins/multiverse/core/TestWorldProperties.java index 5705edd9..62ecb265 100644 --- a/src/old-test/java/org/mvplugins/multiverse/core/TestWorldProperties.java +++ b/src/old-test/java/org/mvplugins/multiverse/core/TestWorldProperties.java @@ -7,13 +7,6 @@ package org.mvplugins.multiverse.core; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertTrue; -import static org.mockito.Mockito.mock; -import static org.mockito.Mockito.times; -import static org.mockito.Mockito.verify; -import static org.mockito.Mockito.when; - import org.bukkit.ChatColor; import org.bukkit.Location; import org.bukkit.World; @@ -33,10 +26,18 @@ import org.bukkit.event.weather.WeatherChangeEvent; import org.junit.After; import org.junit.Before; import org.junit.Test; + import org.mvplugins.multiverse.core.api.MVWorld; import org.mvplugins.multiverse.core.utils.MockWorldFactory; import org.mvplugins.multiverse.core.utils.TestInstanceCreator; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertTrue; +import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.times; +import static org.mockito.Mockito.verify; +import static org.mockito.Mockito.when; + public class TestWorldProperties { private TestInstanceCreator creator; private MultiverseCore core; diff --git a/src/old-test/java/org/mvplugins/multiverse/core/TestWorldPurger.java b/src/old-test/java/org/mvplugins/multiverse/core/TestWorldPurger.java index 72e1479b..9c031b7e 100644 --- a/src/old-test/java/org/mvplugins/multiverse/core/TestWorldPurger.java +++ b/src/old-test/java/org/mvplugins/multiverse/core/TestWorldPurger.java @@ -1,11 +1,5 @@ package org.mvplugins.multiverse.core; -import static org.junit.Assert.assertTrue; -import static org.mockito.Mockito.mock; -import static org.mockito.Mockito.never; -import static org.mockito.Mockito.verify; -import static org.mockito.Mockito.when; - import java.util.Arrays; import org.bukkit.World; @@ -15,10 +9,17 @@ import org.bukkit.entity.Zombie; import org.junit.After; import org.junit.Before; import org.junit.Test; + import org.mvplugins.multiverse.core.api.MVWorld; import org.mvplugins.multiverse.core.api.WorldPurger; import org.mvplugins.multiverse.core.utils.TestInstanceCreator; +import static org.junit.Assert.assertTrue; +import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.never; +import static org.mockito.Mockito.verify; +import static org.mockito.Mockito.when; + public class TestWorldPurger { TestInstanceCreator creator; MultiverseCore core; diff --git a/src/old-test/java/org/mvplugins/multiverse/core/TestWorldStuff.java b/src/old-test/java/org/mvplugins/multiverse/core/TestWorldStuff.java index 16602626..21379c7f 100644 --- a/src/old-test/java/org/mvplugins/multiverse/core/TestWorldStuff.java +++ b/src/old-test/java/org/mvplugins/multiverse/core/TestWorldStuff.java @@ -7,13 +7,6 @@ package org.mvplugins.multiverse.core; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertTrue; -import static org.mockito.Mockito.mock; -import static org.mockito.Mockito.times; -import static org.mockito.Mockito.verify; -import static org.mockito.Mockito.when; - import java.io.File; import org.bukkit.ChatColor; @@ -24,9 +17,17 @@ import org.bukkit.plugin.Plugin; import org.junit.After; import org.junit.Before; import org.junit.Test; + import org.mvplugins.multiverse.core.utils.MockWorldFactory; import org.mvplugins.multiverse.core.utils.TestInstanceCreator; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertTrue; +import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.times; +import static org.mockito.Mockito.verify; +import static org.mockito.Mockito.when; + public class TestWorldStuff { private TestInstanceCreator creator; diff --git a/src/old-test/java/org/mvplugins/multiverse/core/utils/FileUtilsTest.java b/src/old-test/java/org/mvplugins/multiverse/core/utils/FileUtilsTest.java index 714ae202..aeb86e0c 100644 --- a/src/old-test/java/org/mvplugins/multiverse/core/utils/FileUtilsTest.java +++ b/src/old-test/java/org/mvplugins/multiverse/core/utils/FileUtilsTest.java @@ -1,8 +1,5 @@ package org.mvplugins.multiverse.core.utils; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertTrue; - import java.io.IOException; import java.nio.file.Files; import java.nio.file.Path; @@ -13,8 +10,12 @@ import java.util.List; import org.junit.After; import org.junit.Before; import org.junit.Test; + import org.mvplugins.multiverse.core.utils.file.FileUtils; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertTrue; + public class FileUtilsTest { private Path tempDir; diff --git a/src/old-test/java/org/mvplugins/multiverse/core/utils/MockWorldFactory.java b/src/old-test/java/org/mvplugins/multiverse/core/utils/MockWorldFactory.java index cf89b180..f1c297b0 100644 --- a/src/old-test/java/org/mvplugins/multiverse/core/utils/MockWorldFactory.java +++ b/src/old-test/java/org/mvplugins/multiverse/core/utils/MockWorldFactory.java @@ -7,12 +7,6 @@ package org.mvplugins.multiverse.core.utils; -import static org.mockito.Mockito.any; -import static org.mockito.Mockito.anyBoolean; -import static org.mockito.Mockito.doAnswer; -import static org.mockito.Mockito.mock; -import static org.mockito.Mockito.when; - import java.io.File; import java.io.IOException; import java.util.ArrayList; @@ -33,6 +27,12 @@ import org.bukkit.generator.ChunkGenerator; import org.mockito.invocation.InvocationOnMock; import org.mockito.stubbing.Answer; +import static org.mockito.Mockito.any; +import static org.mockito.Mockito.anyBoolean; +import static org.mockito.Mockito.doAnswer; +import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.when; + public class MockWorldFactory { private static final Map createdWorlds = new LinkedHashMap(); diff --git a/src/old-test/java/org/mvplugins/multiverse/core/utils/TestInstanceCreator.java b/src/old-test/java/org/mvplugins/multiverse/core/utils/TestInstanceCreator.java index 3b9d9727..f354e0f9 100644 --- a/src/old-test/java/org/mvplugins/multiverse/core/utils/TestInstanceCreator.java +++ b/src/old-test/java/org/mvplugins/multiverse/core/utils/TestInstanceCreator.java @@ -7,18 +7,6 @@ package org.mvplugins.multiverse.core.utils; -import static org.junit.Assert.assertTrue; -import static org.mockito.Mockito.any; -import static org.mockito.Mockito.anyBoolean; -import static org.mockito.Mockito.anyLong; -import static org.mockito.Mockito.anyString; -import static org.mockito.Mockito.doAnswer; -import static org.mockito.Mockito.doReturn; -import static org.mockito.Mockito.isA; -import static org.mockito.Mockito.mock; -import static org.mockito.Mockito.spy; -import static org.mockito.Mockito.when; - import java.io.File; import java.lang.reflect.Field; import java.util.ArrayList; @@ -44,9 +32,22 @@ import org.bukkit.scheduler.BukkitScheduler; import org.mockito.internal.util.reflection.ReflectionMemberAccessor; import org.mockito.invocation.InvocationOnMock; import org.mockito.stubbing.Answer; + import org.mvplugins.multiverse.core.MultiverseCore; import org.mvplugins.multiverse.core.utils.file.FileUtils; +import static org.junit.Assert.assertTrue; +import static org.mockito.Mockito.any; +import static org.mockito.Mockito.anyBoolean; +import static org.mockito.Mockito.anyLong; +import static org.mockito.Mockito.anyString; +import static org.mockito.Mockito.doAnswer; +import static org.mockito.Mockito.doReturn; +import static org.mockito.Mockito.isA; +import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.spy; +import static org.mockito.Mockito.when; + public class TestInstanceCreator { private MultiverseCore core; private Server mockServer;