diff --git a/build.gradle b/build.gradle index 6e8dd9db..ae354e22 100644 --- a/build.gradle +++ b/build.gradle @@ -277,25 +277,25 @@ javadoc { project.configurations.api.canBeResolved = true shadowJar { - relocate 'co.aikar', 'com.onarandombox.acf' - relocate 'com.dumptruckman.minecraft.util.Logging', 'com.onarandombox.MultiverseCore.utils.CoreLogging' - relocate 'com.dumptruckman.minecraft.util.DebugLog', 'com.onarandombox.MultiverseCore.utils.DebugFileLogger' - relocate 'de.themoep.idconverter', 'com.onarandombox.idconverter' - relocate 'io.github.townyadvanced.commentedconfiguration', 'com.onarandombox.commentedconfiguration' - relocate 'me.main__.util', 'com.onarandombox.serializationconfig' - relocate 'org.bstats', 'com.onarandombox.bstats' - relocate 'com.sun', 'com.onarandombox.sun' - relocate 'net.minidev', 'com.onarandombox.minidev' - relocate 'org.objectweb', 'com.onarandombox.objectweb' - relocate 'io.vavr', 'com.onarandombox.vavr' - relocate 'jakarta', 'com.onarandombox.jakarta' - relocate 'javassist', 'com.onarandombox.javassist' - relocate 'org.aopalliance', 'com.onarandombox.aopalliance' - relocate 'org.glassfish', 'com.onarandombox.glassfish' - relocate 'org.jvnet', 'com.onarandombox.jvnet' - relocate 'org.intellij', 'com.onarandombox.intellij' - relocate 'org.jetbrains', 'com.onarandombox.jetbrains' - relocate 'io.papermc.lib', 'com.onarandombox.paperlib' + relocate 'co.aikar', 'org.mvplugins.multiverse.external.acf' + relocate 'com.dumptruckman.minecraft.util.Logging', 'org.mvplugins.multiverse.core.utils.CoreLogging' + relocate 'com.dumptruckman.minecraft.util.DebugLog', 'org.mvplugins.multiverse.core.utils.DebugFileLogger' + relocate 'de.themoep.idconverter', 'org.mvplugins.multiverse.external.idconverter' + relocate 'io.github.townyadvanced.commentedconfiguration', 'org.mvplugins.multiverse.external.commentedconfiguration' + relocate 'me.main__.util', 'org.mvplugins.multiverse.external.serializationconfig' + relocate 'org.bstats', 'org.mvplugins.multiverse.external.bstats' + relocate 'com.sun', 'org.mvplugins.multiverse.external.sun' + relocate 'net.minidev', 'org.mvplugins.multiverse.external.minidev' + relocate 'org.objectweb', 'org.mvplugins.multiverse.external.objectweb' + relocate 'io.vavr', 'org.mvplugins.multiverse.external.vavr' + relocate 'jakarta', 'org.mvplugins.multiverse.external.jakarta' + relocate 'javassist', 'org.mvplugins.multiverse.external.javassist' + relocate 'org.aopalliance', 'org.mvplugins.multiverse.external.aopalliance' + relocate 'org.glassfish', 'org.mvplugins.multiverse.external.glassfish' + relocate 'org.jvnet', 'org.mvplugins.multiverse.external.jvnet' + relocate 'org.intellij', 'org.mvplugins.multiverse.external.intellij' + relocate 'org.jetbrains', 'org.mvplugins.multiverse.external.jetbrains' + relocate 'io.papermc.lib', 'org.mvplugins.multiverse.external.paperlib' configurations = [project.configurations.shadowed] diff --git a/src/main/java/com/onarandombox/MultiverseCore/commandtools/context/package-info.java b/src/main/java/com/onarandombox/MultiverseCore/commandtools/context/package-info.java deleted file mode 100644 index 8121a39d..00000000 --- a/src/main/java/com/onarandombox/MultiverseCore/commandtools/context/package-info.java +++ /dev/null @@ -1 +0,0 @@ -package com.onarandombox.MultiverseCore.commandtools.context; diff --git a/src/main/java/com/onarandombox/MultiverseCore/config/package-info.java b/src/main/java/com/onarandombox/MultiverseCore/config/package-info.java deleted file mode 100644 index 4e79b289..00000000 --- a/src/main/java/com/onarandombox/MultiverseCore/config/package-info.java +++ /dev/null @@ -1 +0,0 @@ -package com.onarandombox.MultiverseCore.config; diff --git a/src/main/java/com/onarandombox/MultiverseCore/configuration/handle/package-info.java b/src/main/java/com/onarandombox/MultiverseCore/configuration/handle/package-info.java deleted file mode 100644 index 87074a78..00000000 --- a/src/main/java/com/onarandombox/MultiverseCore/configuration/handle/package-info.java +++ /dev/null @@ -1 +0,0 @@ -package com.onarandombox.MultiverseCore.configuration.handle; diff --git a/src/main/java/com/onarandombox/MultiverseCore/configuration/migration/package-info.java b/src/main/java/com/onarandombox/MultiverseCore/configuration/migration/package-info.java deleted file mode 100644 index 072ad1ec..00000000 --- a/src/main/java/com/onarandombox/MultiverseCore/configuration/migration/package-info.java +++ /dev/null @@ -1 +0,0 @@ -package com.onarandombox.MultiverseCore.configuration.migration; diff --git a/src/main/java/com/onarandombox/MultiverseCore/configuration/node/package-info.java b/src/main/java/com/onarandombox/MultiverseCore/configuration/node/package-info.java deleted file mode 100644 index 6c8851f3..00000000 --- a/src/main/java/com/onarandombox/MultiverseCore/configuration/node/package-info.java +++ /dev/null @@ -1 +0,0 @@ -package com.onarandombox.MultiverseCore.configuration.node; diff --git a/src/main/java/com/onarandombox/MultiverseCore/event/package-info.java b/src/main/java/com/onarandombox/MultiverseCore/event/package-info.java deleted file mode 100644 index d3a9daeb..00000000 --- a/src/main/java/com/onarandombox/MultiverseCore/event/package-info.java +++ /dev/null @@ -1,4 +0,0 @@ -/** - * This package contains all events. - */ -package com.onarandombox.MultiverseCore.event; diff --git a/src/main/java/com/onarandombox/MultiverseCore/exceptions/package-info.java b/src/main/java/com/onarandombox/MultiverseCore/exceptions/package-info.java deleted file mode 100644 index cd84cf4a..00000000 --- a/src/main/java/com/onarandombox/MultiverseCore/exceptions/package-info.java +++ /dev/null @@ -1,4 +0,0 @@ -/** - * This package contains all exceptions. - */ -package com.onarandombox.MultiverseCore.exceptions; diff --git a/src/main/java/com/onarandombox/MultiverseCore/inject/binder/package-info.java b/src/main/java/com/onarandombox/MultiverseCore/inject/binder/package-info.java deleted file mode 100644 index 55f80dc1..00000000 --- a/src/main/java/com/onarandombox/MultiverseCore/inject/binder/package-info.java +++ /dev/null @@ -1 +0,0 @@ -package com.onarandombox.MultiverseCore.inject.binder; diff --git a/src/main/java/com/onarandombox/MultiverseCore/inject/package-info.java b/src/main/java/com/onarandombox/MultiverseCore/inject/package-info.java deleted file mode 100644 index c41f8a81..00000000 --- a/src/main/java/com/onarandombox/MultiverseCore/inject/package-info.java +++ /dev/null @@ -1 +0,0 @@ -package com.onarandombox.MultiverseCore.inject; diff --git a/src/main/java/com/onarandombox/MultiverseCore/listeners/package-info.java b/src/main/java/com/onarandombox/MultiverseCore/listeners/package-info.java deleted file mode 100644 index c09a53a4..00000000 --- a/src/main/java/com/onarandombox/MultiverseCore/listeners/package-info.java +++ /dev/null @@ -1,4 +0,0 @@ -/** - * This package contains all listeners. - */ -package com.onarandombox.MultiverseCore.listeners; diff --git a/src/main/java/com/onarandombox/MultiverseCore/permissions/package-info.java b/src/main/java/com/onarandombox/MultiverseCore/permissions/package-info.java deleted file mode 100644 index bbd59804..00000000 --- a/src/main/java/com/onarandombox/MultiverseCore/permissions/package-info.java +++ /dev/null @@ -1 +0,0 @@ -package com.onarandombox.MultiverseCore.permissions; diff --git a/src/main/java/com/onarandombox/MultiverseCore/placeholders/package-info.java b/src/main/java/com/onarandombox/MultiverseCore/placeholders/package-info.java deleted file mode 100644 index 3af93cea..00000000 --- a/src/main/java/com/onarandombox/MultiverseCore/placeholders/package-info.java +++ /dev/null @@ -1 +0,0 @@ -package com.onarandombox.MultiverseCore.placeholders; diff --git a/src/main/java/com/onarandombox/MultiverseCore/utils/message/package-info.java b/src/main/java/com/onarandombox/MultiverseCore/utils/message/package-info.java deleted file mode 100644 index a231b22b..00000000 --- a/src/main/java/com/onarandombox/MultiverseCore/utils/message/package-info.java +++ /dev/null @@ -1 +0,0 @@ -package com.onarandombox.MultiverseCore.utils.message; diff --git a/src/main/java/com/onarandombox/MultiverseCore/utils/result/package-info.java b/src/main/java/com/onarandombox/MultiverseCore/utils/result/package-info.java deleted file mode 100644 index b4b03292..00000000 --- a/src/main/java/com/onarandombox/MultiverseCore/utils/result/package-info.java +++ /dev/null @@ -1 +0,0 @@ -package com.onarandombox.MultiverseCore.utils.result; diff --git a/src/main/java/com/onarandombox/MultiverseCore/utils/webpaste/package-info.java b/src/main/java/com/onarandombox/MultiverseCore/utils/webpaste/package-info.java deleted file mode 100644 index a0d0b87b..00000000 --- a/src/main/java/com/onarandombox/MultiverseCore/utils/webpaste/package-info.java +++ /dev/null @@ -1,4 +0,0 @@ -/** - * This package contains webpaste-utilities. - */ -package com.onarandombox.MultiverseCore.utils.webpaste; diff --git a/src/main/java/com/onarandombox/MultiverseCore/worldnew/config/package-info.java b/src/main/java/com/onarandombox/MultiverseCore/worldnew/config/package-info.java deleted file mode 100644 index 4e49a86f..00000000 --- a/src/main/java/com/onarandombox/MultiverseCore/worldnew/config/package-info.java +++ /dev/null @@ -1 +0,0 @@ -package com.onarandombox.MultiverseCore.worldnew.config; diff --git a/src/main/java/com/onarandombox/MultiverseCore/worldnew/entrycheck/package-info.java b/src/main/java/com/onarandombox/MultiverseCore/worldnew/entrycheck/package-info.java deleted file mode 100644 index c52c7e52..00000000 --- a/src/main/java/com/onarandombox/MultiverseCore/worldnew/entrycheck/package-info.java +++ /dev/null @@ -1 +0,0 @@ -package com.onarandombox.MultiverseCore.worldnew.entrycheck; diff --git a/src/main/java/com/onarandombox/MultiverseCore/worldnew/generators/package-info.java b/src/main/java/com/onarandombox/MultiverseCore/worldnew/generators/package-info.java deleted file mode 100644 index 7c4566ac..00000000 --- a/src/main/java/com/onarandombox/MultiverseCore/worldnew/generators/package-info.java +++ /dev/null @@ -1 +0,0 @@ -package com.onarandombox.MultiverseCore.worldnew.generators; diff --git a/src/main/java/com/onarandombox/MultiverseCore/worldnew/helpers/package-info.java b/src/main/java/com/onarandombox/MultiverseCore/worldnew/helpers/package-info.java deleted file mode 100644 index 0fdb7ec8..00000000 --- a/src/main/java/com/onarandombox/MultiverseCore/worldnew/helpers/package-info.java +++ /dev/null @@ -1 +0,0 @@ -package com.onarandombox.MultiverseCore.worldnew.helpers; diff --git a/src/main/java/com/onarandombox/MultiverseCore/worldnew/options/package-info.java b/src/main/java/com/onarandombox/MultiverseCore/worldnew/options/package-info.java deleted file mode 100644 index 779a61a6..00000000 --- a/src/main/java/com/onarandombox/MultiverseCore/worldnew/options/package-info.java +++ /dev/null @@ -1 +0,0 @@ -package com.onarandombox.MultiverseCore.worldnew.options; diff --git a/src/main/java/com/onarandombox/MultiverseCore/worldnew/package-info.java b/src/main/java/com/onarandombox/MultiverseCore/worldnew/package-info.java deleted file mode 100644 index 6410fbf9..00000000 --- a/src/main/java/com/onarandombox/MultiverseCore/worldnew/package-info.java +++ /dev/null @@ -1 +0,0 @@ -package com.onarandombox.MultiverseCore.worldnew; diff --git a/src/main/java/com/onarandombox/MultiverseCore/worldnew/reasons/package-info.java b/src/main/java/com/onarandombox/MultiverseCore/worldnew/reasons/package-info.java deleted file mode 100644 index d523acfe..00000000 --- a/src/main/java/com/onarandombox/MultiverseCore/worldnew/reasons/package-info.java +++ /dev/null @@ -1 +0,0 @@ -package com.onarandombox.MultiverseCore.worldnew.reasons; diff --git a/src/main/java/com/onarandombox/MultiverseCore/MultiverseCore.java b/src/main/java/org/mvplugins/multiverse/core/MultiverseCore.java similarity index 91% rename from src/main/java/com/onarandombox/MultiverseCore/MultiverseCore.java rename to src/main/java/org/mvplugins/multiverse/core/MultiverseCore.java index f099c7d9..11ffd476 100644 --- a/src/main/java/com/onarandombox/MultiverseCore/MultiverseCore.java +++ b/src/main/java/org/mvplugins/multiverse/core/MultiverseCore.java @@ -5,7 +5,7 @@ * with this project. * ******************************************************************************/ -package com.onarandombox.MultiverseCore; +package org.mvplugins.multiverse.core; import java.io.File; import java.lang.annotation.Annotation; @@ -14,24 +14,6 @@ import java.util.logging.Logger; import java.util.stream.Collectors; import com.dumptruckman.minecraft.util.Logging; -import com.onarandombox.MultiverseCore.anchor.AnchorManager; -import com.onarandombox.MultiverseCore.api.Destination; -import com.onarandombox.MultiverseCore.api.MVCore; -import com.onarandombox.MultiverseCore.commandtools.MVCommandManager; -import com.onarandombox.MultiverseCore.commandtools.MultiverseCommand; -import com.onarandombox.MultiverseCore.commandtools.PluginLocales; -import com.onarandombox.MultiverseCore.config.MVCoreConfig; -import com.onarandombox.MultiverseCore.destination.DestinationsProvider; -import com.onarandombox.MultiverseCore.economy.MVEconomist; -import com.onarandombox.MultiverseCore.inject.InjectableListener; -import com.onarandombox.MultiverseCore.inject.PluginInjection; -import com.onarandombox.MultiverseCore.placeholders.MultiverseCorePlaceholders; -import com.onarandombox.MultiverseCore.utils.TestingMode; -import com.onarandombox.MultiverseCore.utils.metrics.MetricsConfigurator; -import com.onarandombox.MultiverseCore.world.WorldProperties; -import com.onarandombox.MultiverseCore.worldnew.WorldManager; -import com.onarandombox.MultiverseCore.worldnew.config.NullLocation; -import com.onarandombox.MultiverseCore.worldnew.config.SpawnLocation; import io.vavr.control.Try; import jakarta.inject.Inject; import jakarta.inject.Provider; @@ -46,6 +28,24 @@ 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; +import org.mvplugins.multiverse.core.commandtools.MVCommandManager; +import org.mvplugins.multiverse.core.commandtools.MultiverseCommand; +import org.mvplugins.multiverse.core.commandtools.PluginLocales; +import org.mvplugins.multiverse.core.config.MVCoreConfig; +import org.mvplugins.multiverse.core.destination.DestinationsProvider; +import org.mvplugins.multiverse.core.economy.MVEconomist; +import org.mvplugins.multiverse.core.inject.InjectableListener; +import org.mvplugins.multiverse.core.inject.PluginInjection; +import org.mvplugins.multiverse.core.placeholders.MultiverseCorePlaceholders; +import org.mvplugins.multiverse.core.utils.TestingMode; +import org.mvplugins.multiverse.core.utils.metrics.MetricsConfigurator; +import org.mvplugins.multiverse.core.world.WorldProperties; +import org.mvplugins.multiverse.core.worldnew.WorldManager; +import org.mvplugins.multiverse.core.worldnew.config.NullLocation; +import org.mvplugins.multiverse.core.worldnew.config.SpawnLocation; /** * The implementation of the Multiverse-{@link MVCore}. diff --git a/src/main/java/com/onarandombox/MultiverseCore/MultiverseCorePluginBinder.java b/src/main/java/org/mvplugins/multiverse/core/MultiverseCorePluginBinder.java similarity index 76% rename from src/main/java/com/onarandombox/MultiverseCore/MultiverseCorePluginBinder.java rename to src/main/java/org/mvplugins/multiverse/core/MultiverseCorePluginBinder.java index 1f787b04..b4c80cfc 100644 --- a/src/main/java/com/onarandombox/MultiverseCore/MultiverseCorePluginBinder.java +++ b/src/main/java/org/mvplugins/multiverse/core/MultiverseCorePluginBinder.java @@ -1,9 +1,9 @@ -package com.onarandombox.MultiverseCore; +package org.mvplugins.multiverse.core; -import com.onarandombox.MultiverseCore.api.MVCore; -import com.onarandombox.MultiverseCore.inject.binder.JavaPluginBinder; 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; class MultiverseCorePluginBinder extends JavaPluginBinder { diff --git a/src/main/java/com/onarandombox/MultiverseCore/anchor/AnchorManager.java b/src/main/java/org/mvplugins/multiverse/core/anchor/AnchorManager.java similarity index 96% rename from src/main/java/com/onarandombox/MultiverseCore/anchor/AnchorManager.java rename to src/main/java/org/mvplugins/multiverse/core/anchor/AnchorManager.java index fba7e136..325098ce 100644 --- a/src/main/java/com/onarandombox/MultiverseCore/anchor/AnchorManager.java +++ b/src/main/java/org/mvplugins/multiverse/core/anchor/AnchorManager.java @@ -5,7 +5,7 @@ * with this project. * ******************************************************************************/ -package com.onarandombox.MultiverseCore.anchor; +package org.mvplugins.multiverse.core.anchor; import java.io.File; import java.io.IOException; @@ -16,9 +16,6 @@ import java.util.Map; import java.util.Set; import com.dumptruckman.minecraft.util.Logging; -import com.onarandombox.MultiverseCore.MultiverseCore; -import com.onarandombox.MultiverseCore.api.LocationManipulation; -import com.onarandombox.MultiverseCore.config.MVCoreConfig; import jakarta.inject.Inject; import org.bukkit.Location; import org.bukkit.configuration.ConfigurationSection; @@ -27,6 +24,9 @@ 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; /** * Manages anchors. diff --git a/src/main/java/com/onarandombox/MultiverseCore/anchor/package-info.java b/src/main/java/org/mvplugins/multiverse/core/anchor/package-info.java similarity index 63% rename from src/main/java/com/onarandombox/MultiverseCore/anchor/package-info.java rename to src/main/java/org/mvplugins/multiverse/core/anchor/package-info.java index 8d57b685..178ece38 100644 --- a/src/main/java/com/onarandombox/MultiverseCore/anchor/package-info.java +++ b/src/main/java/org/mvplugins/multiverse/core/anchor/package-info.java @@ -1,4 +1,4 @@ /** * this package contains the classes that are used for the anchor system. */ -package com.onarandombox.MultiverseCore.anchor; +package org.mvplugins.multiverse.core.anchor; diff --git a/src/main/java/com/onarandombox/MultiverseCore/api/BlockSafety.java b/src/main/java/org/mvplugins/multiverse/core/api/BlockSafety.java similarity index 98% rename from src/main/java/com/onarandombox/MultiverseCore/api/BlockSafety.java rename to src/main/java/org/mvplugins/multiverse/core/api/BlockSafety.java index 9ca6fc61..1c6e7921 100644 --- a/src/main/java/com/onarandombox/MultiverseCore/api/BlockSafety.java +++ b/src/main/java/org/mvplugins/multiverse/core/api/BlockSafety.java @@ -1,4 +1,4 @@ -package com.onarandombox.MultiverseCore.api; +package org.mvplugins.multiverse.core.api; import org.bukkit.Location; import org.bukkit.World; diff --git a/src/main/java/com/onarandombox/MultiverseCore/api/Destination.java b/src/main/java/org/mvplugins/multiverse/core/api/Destination.java similarity index 98% rename from src/main/java/com/onarandombox/MultiverseCore/api/Destination.java rename to src/main/java/org/mvplugins/multiverse/core/api/Destination.java index 8fd8d17f..6afa9dc3 100644 --- a/src/main/java/com/onarandombox/MultiverseCore/api/Destination.java +++ b/src/main/java/org/mvplugins/multiverse/core/api/Destination.java @@ -1,4 +1,4 @@ -package com.onarandombox.MultiverseCore.api; +package org.mvplugins.multiverse.core.api; import java.util.Collection; diff --git a/src/main/java/com/onarandombox/MultiverseCore/api/DestinationInstance.java b/src/main/java/org/mvplugins/multiverse/core/api/DestinationInstance.java similarity index 97% rename from src/main/java/com/onarandombox/MultiverseCore/api/DestinationInstance.java rename to src/main/java/org/mvplugins/multiverse/core/api/DestinationInstance.java index 485f8105..ddc9bb64 100644 --- a/src/main/java/com/onarandombox/MultiverseCore/api/DestinationInstance.java +++ b/src/main/java/org/mvplugins/multiverse/core/api/DestinationInstance.java @@ -1,4 +1,4 @@ -package com.onarandombox.MultiverseCore.api; +package org.mvplugins.multiverse.core.api; import org.bukkit.Location; import org.bukkit.entity.Entity; diff --git a/src/main/java/com/onarandombox/MultiverseCore/api/LocationManipulation.java b/src/main/java/org/mvplugins/multiverse/core/api/LocationManipulation.java similarity index 98% rename from src/main/java/com/onarandombox/MultiverseCore/api/LocationManipulation.java rename to src/main/java/org/mvplugins/multiverse/core/api/LocationManipulation.java index 78327317..86422f0d 100644 --- a/src/main/java/com/onarandombox/MultiverseCore/api/LocationManipulation.java +++ b/src/main/java/org/mvplugins/multiverse/core/api/LocationManipulation.java @@ -1,4 +1,4 @@ -package com.onarandombox.MultiverseCore.api; +package org.mvplugins.multiverse.core.api; import org.bukkit.Location; import org.bukkit.entity.Vehicle; diff --git a/src/main/java/com/onarandombox/MultiverseCore/api/MVConfig.java b/src/main/java/org/mvplugins/multiverse/core/api/MVConfig.java similarity index 96% rename from src/main/java/com/onarandombox/MultiverseCore/api/MVConfig.java rename to src/main/java/org/mvplugins/multiverse/core/api/MVConfig.java index c852a627..fea0fb2c 100644 --- a/src/main/java/com/onarandombox/MultiverseCore/api/MVConfig.java +++ b/src/main/java/org/mvplugins/multiverse/core/api/MVConfig.java @@ -1,9 +1,9 @@ -package com.onarandombox.MultiverseCore.api; +package org.mvplugins.multiverse.core.api; -import com.onarandombox.MultiverseCore.configuration.node.NodeGroup; -import com.onarandombox.MultiverseCore.placeholders.MultiverseCorePlaceholders; 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; @Contract public interface MVConfig { diff --git a/src/main/java/com/onarandombox/MultiverseCore/api/MVCore.java b/src/main/java/org/mvplugins/multiverse/core/api/MVCore.java similarity index 96% rename from src/main/java/com/onarandombox/MultiverseCore/api/MVCore.java rename to src/main/java/org/mvplugins/multiverse/core/api/MVCore.java index 22c24a3f..7c267f80 100644 --- a/src/main/java/com/onarandombox/MultiverseCore/api/MVCore.java +++ b/src/main/java/org/mvplugins/multiverse/core/api/MVCore.java @@ -5,7 +5,7 @@ * with this project. * ******************************************************************************/ -package com.onarandombox.MultiverseCore.api; +package org.mvplugins.multiverse.core.api; /** * Multiverse 2 Core API diff --git a/src/main/java/com/onarandombox/MultiverseCore/api/MVPlugin.java b/src/main/java/org/mvplugins/multiverse/core/api/MVPlugin.java similarity index 90% rename from src/main/java/com/onarandombox/MultiverseCore/api/MVPlugin.java rename to src/main/java/org/mvplugins/multiverse/core/api/MVPlugin.java index afed3f14..ef65b600 100644 --- a/src/main/java/com/onarandombox/MultiverseCore/api/MVPlugin.java +++ b/src/main/java/org/mvplugins/multiverse/core/api/MVPlugin.java @@ -5,7 +5,7 @@ * with this project. * ******************************************************************************/ -package com.onarandombox.MultiverseCore.api; +package org.mvplugins.multiverse.core.api; /** * This interface is implemented by every official Multiverse-plugin. @@ -14,7 +14,7 @@ public interface MVPlugin { /** * Gets the reference to MultiverseCore. * - * @return A valid {@link com.onarandombox.MultiverseCore}. + * @return A valid {@link org.mvplugins.multiverse.core.MultiverseCore}. */ MVCore getCore(); diff --git a/src/main/java/com/onarandombox/MultiverseCore/api/MVWorld.java b/src/main/java/org/mvplugins/multiverse/core/api/MVWorld.java similarity index 98% rename from src/main/java/com/onarandombox/MultiverseCore/api/MVWorld.java rename to src/main/java/org/mvplugins/multiverse/core/api/MVWorld.java index 0ddcd7ba..93d8f35d 100644 --- a/src/main/java/com/onarandombox/MultiverseCore/api/MVWorld.java +++ b/src/main/java/org/mvplugins/multiverse/core/api/MVWorld.java @@ -5,14 +5,10 @@ * with this project. * ******************************************************************************/ -package com.onarandombox.MultiverseCore.api; +package org.mvplugins.multiverse.core.api; import java.util.List; -import com.onarandombox.MultiverseCore.exceptions.PropertyDoesNotExistException; -import com.onarandombox.MultiverseCore.world.configuration.AddProperties; -import com.onarandombox.MultiverseCore.world.configuration.AllowedPortalType; -import com.onarandombox.MultiverseCore.world.configuration.EnglishChatColor; import org.bukkit.ChatColor; import org.bukkit.Difficulty; import org.bukkit.GameMode; @@ -22,6 +18,10 @@ 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; +import org.mvplugins.multiverse.core.world.configuration.EnglishChatColor; /** * The API for a Multiverse Handled World. diff --git a/src/main/java/com/onarandombox/MultiverseCore/api/MVWorldManager.java b/src/main/java/org/mvplugins/multiverse/core/api/MVWorldManager.java similarity index 99% rename from src/main/java/com/onarandombox/MultiverseCore/api/MVWorldManager.java rename to src/main/java/org/mvplugins/multiverse/core/api/MVWorldManager.java index c5b21f79..54d35263 100644 --- a/src/main/java/com/onarandombox/MultiverseCore/api/MVWorldManager.java +++ b/src/main/java/org/mvplugins/multiverse/core/api/MVWorldManager.java @@ -5,7 +5,7 @@ * with this project. * ******************************************************************************/ -package com.onarandombox.MultiverseCore.api; +package org.mvplugins.multiverse.core.api; import java.util.Collection; import java.util.List; diff --git a/src/main/java/com/onarandombox/MultiverseCore/api/SafeTTeleporter.java b/src/main/java/org/mvplugins/multiverse/core/api/SafeTTeleporter.java similarity index 94% rename from src/main/java/com/onarandombox/MultiverseCore/api/SafeTTeleporter.java rename to src/main/java/org/mvplugins/multiverse/core/api/SafeTTeleporter.java index 51350238..49afbae2 100644 --- a/src/main/java/com/onarandombox/MultiverseCore/api/SafeTTeleporter.java +++ b/src/main/java/org/mvplugins/multiverse/core/api/SafeTTeleporter.java @@ -1,14 +1,14 @@ -package com.onarandombox.MultiverseCore.api; +package org.mvplugins.multiverse.core.api; import java.util.concurrent.CompletableFuture; import co.aikar.commands.BukkitCommandIssuer; -import com.onarandombox.MultiverseCore.destination.ParsedDestination; -import com.onarandombox.MultiverseCore.teleportation.TeleportResult; 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; /** * Used to safely teleport people. diff --git a/src/main/java/com/onarandombox/MultiverseCore/api/Teleporter.java b/src/main/java/org/mvplugins/multiverse/core/api/Teleporter.java similarity index 85% rename from src/main/java/com/onarandombox/MultiverseCore/api/Teleporter.java rename to src/main/java/org/mvplugins/multiverse/core/api/Teleporter.java index 39795957..cf841417 100644 --- a/src/main/java/com/onarandombox/MultiverseCore/api/Teleporter.java +++ b/src/main/java/org/mvplugins/multiverse/core/api/Teleporter.java @@ -1,12 +1,12 @@ -package com.onarandombox.MultiverseCore.api; +package org.mvplugins.multiverse.core.api; import java.util.concurrent.CompletableFuture; import co.aikar.commands.BukkitCommandIssuer; -import com.onarandombox.MultiverseCore.destination.ParsedDestination; -import com.onarandombox.MultiverseCore.teleportation.TeleportResult; 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; @Contract public interface Teleporter { diff --git a/src/main/java/com/onarandombox/MultiverseCore/api/WorldPurger.java b/src/main/java/org/mvplugins/multiverse/core/api/WorldPurger.java similarity index 98% rename from src/main/java/com/onarandombox/MultiverseCore/api/WorldPurger.java rename to src/main/java/org/mvplugins/multiverse/core/api/WorldPurger.java index 17b150cf..d3c1d725 100644 --- a/src/main/java/com/onarandombox/MultiverseCore/api/WorldPurger.java +++ b/src/main/java/org/mvplugins/multiverse/core/api/WorldPurger.java @@ -1,4 +1,4 @@ -package com.onarandombox.MultiverseCore.api; +package org.mvplugins.multiverse.core.api; import java.util.List; diff --git a/src/main/java/com/onarandombox/MultiverseCore/api/package-info.java b/src/main/java/org/mvplugins/multiverse/core/api/package-info.java similarity index 75% rename from src/main/java/com/onarandombox/MultiverseCore/api/package-info.java rename to src/main/java/org/mvplugins/multiverse/core/api/package-info.java index c19d6732..4ecaef7a 100644 --- a/src/main/java/com/onarandombox/MultiverseCore/api/package-info.java +++ b/src/main/java/org/mvplugins/multiverse/core/api/package-info.java @@ -2,4 +2,4 @@ * The Multiverse-API, containing lots of interfaces that can be quite useful for other * plugins when interacting with Multiverse. */ -package com.onarandombox.MultiverseCore.api; +package org.mvplugins.multiverse.core.api; diff --git a/src/main/java/com/onarandombox/MultiverseCore/commands/CheckCommand.java b/src/main/java/org/mvplugins/multiverse/core/commands/CheckCommand.java similarity index 82% rename from src/main/java/com/onarandombox/MultiverseCore/commands/CheckCommand.java rename to src/main/java/org/mvplugins/multiverse/core/commands/CheckCommand.java index 7853ed95..70958a8e 100644 --- a/src/main/java/com/onarandombox/MultiverseCore/commands/CheckCommand.java +++ b/src/main/java/org/mvplugins/multiverse/core/commands/CheckCommand.java @@ -1,4 +1,4 @@ -package com.onarandombox.MultiverseCore.commands; +package org.mvplugins.multiverse.core.commands; import co.aikar.commands.BukkitCommandIssuer; import co.aikar.commands.annotation.CommandAlias; @@ -7,15 +7,15 @@ import co.aikar.commands.annotation.CommandPermission; import co.aikar.commands.annotation.Description; import co.aikar.commands.annotation.Subcommand; import co.aikar.commands.annotation.Syntax; -import com.onarandombox.MultiverseCore.commandtools.MVCommandManager; -import com.onarandombox.MultiverseCore.commandtools.MultiverseCommand; -import com.onarandombox.MultiverseCore.destination.DestinationsProvider; -import com.onarandombox.MultiverseCore.destination.ParsedDestination; -import com.onarandombox.MultiverseCore.utils.MVCorei18n; 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; +import org.mvplugins.multiverse.core.destination.ParsedDestination; +import org.mvplugins.multiverse.core.utils.MVCorei18n; @Service @CommandAlias("mv") diff --git a/src/main/java/com/onarandombox/MultiverseCore/commands/CloneCommand.java b/src/main/java/org/mvplugins/multiverse/core/commands/CloneCommand.java similarity index 80% rename from src/main/java/com/onarandombox/MultiverseCore/commands/CloneCommand.java rename to src/main/java/org/mvplugins/multiverse/core/commands/CloneCommand.java index 17bb67b7..bc048033 100644 --- a/src/main/java/com/onarandombox/MultiverseCore/commands/CloneCommand.java +++ b/src/main/java/org/mvplugins/multiverse/core/commands/CloneCommand.java @@ -1,4 +1,4 @@ -package com.onarandombox.MultiverseCore.commands; +package org.mvplugins.multiverse.core.commands; import co.aikar.commands.annotation.CommandAlias; import co.aikar.commands.annotation.CommandCompletion; @@ -8,19 +8,19 @@ import co.aikar.commands.annotation.Optional; import co.aikar.commands.annotation.Subcommand; import co.aikar.commands.annotation.Syntax; import com.dumptruckman.minecraft.util.Logging; -import com.onarandombox.MultiverseCore.commandtools.MVCommandIssuer; -import com.onarandombox.MultiverseCore.commandtools.MVCommandManager; -import com.onarandombox.MultiverseCore.commandtools.MultiverseCommand; -import com.onarandombox.MultiverseCore.commandtools.flags.CommandFlag; -import com.onarandombox.MultiverseCore.commandtools.flags.CommandFlagGroup; -import com.onarandombox.MultiverseCore.commandtools.flags.ParsedCommandFlags; -import com.onarandombox.MultiverseCore.utils.MVCorei18n; -import com.onarandombox.MultiverseCore.worldnew.LoadedMultiverseWorld; -import com.onarandombox.MultiverseCore.worldnew.WorldManager; -import com.onarandombox.MultiverseCore.worldnew.options.CloneWorldOptions; 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; +import org.mvplugins.multiverse.core.commandtools.flags.CommandFlag; +import org.mvplugins.multiverse.core.commandtools.flags.CommandFlagGroup; +import org.mvplugins.multiverse.core.commandtools.flags.ParsedCommandFlags; +import org.mvplugins.multiverse.core.utils.MVCorei18n; +import org.mvplugins.multiverse.core.worldnew.LoadedMultiverseWorld; +import org.mvplugins.multiverse.core.worldnew.WorldManager; +import org.mvplugins.multiverse.core.worldnew.options.CloneWorldOptions; @Service @CommandAlias("mv") diff --git a/src/main/java/com/onarandombox/MultiverseCore/commands/ConfigCommand.java b/src/main/java/org/mvplugins/multiverse/core/commands/ConfigCommand.java similarity index 84% rename from src/main/java/com/onarandombox/MultiverseCore/commands/ConfigCommand.java rename to src/main/java/org/mvplugins/multiverse/core/commands/ConfigCommand.java index 96608070..89bd258f 100644 --- a/src/main/java/com/onarandombox/MultiverseCore/commands/ConfigCommand.java +++ b/src/main/java/org/mvplugins/multiverse/core/commands/ConfigCommand.java @@ -1,4 +1,4 @@ -package com.onarandombox.MultiverseCore.commands; +package org.mvplugins.multiverse.core.commands; import co.aikar.commands.annotation.CommandAlias; import co.aikar.commands.annotation.CommandCompletion; @@ -8,16 +8,16 @@ import co.aikar.commands.annotation.Optional; import co.aikar.commands.annotation.Single; import co.aikar.commands.annotation.Subcommand; import co.aikar.commands.annotation.Syntax; -import com.onarandombox.MultiverseCore.commandtools.MVCommandIssuer; -import com.onarandombox.MultiverseCore.commandtools.MVCommandManager; -import com.onarandombox.MultiverseCore.commandtools.MultiverseCommand; -import com.onarandombox.MultiverseCore.commandtools.context.MVConfigValue; -import com.onarandombox.MultiverseCore.config.MVCoreConfig; -import com.onarandombox.MultiverseCore.exceptions.MultiverseException; 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; +import org.mvplugins.multiverse.core.commandtools.context.MVConfigValue; +import org.mvplugins.multiverse.core.config.MVCoreConfig; +import org.mvplugins.multiverse.core.exceptions.MultiverseException; @Service @CommandAlias("mv") diff --git a/src/main/java/com/onarandombox/MultiverseCore/commands/ConfirmCommand.java b/src/main/java/org/mvplugins/multiverse/core/commands/ConfirmCommand.java similarity index 81% rename from src/main/java/com/onarandombox/MultiverseCore/commands/ConfirmCommand.java rename to src/main/java/org/mvplugins/multiverse/core/commands/ConfirmCommand.java index e8deac3e..fde95dea 100644 --- a/src/main/java/com/onarandombox/MultiverseCore/commands/ConfirmCommand.java +++ b/src/main/java/org/mvplugins/multiverse/core/commands/ConfirmCommand.java @@ -1,15 +1,15 @@ -package com.onarandombox.MultiverseCore.commands; +package org.mvplugins.multiverse.core.commands; import co.aikar.commands.BukkitCommandIssuer; import co.aikar.commands.annotation.CommandAlias; import co.aikar.commands.annotation.CommandPermission; import co.aikar.commands.annotation.Description; import co.aikar.commands.annotation.Subcommand; -import com.onarandombox.MultiverseCore.commandtools.MVCommandManager; -import com.onarandombox.MultiverseCore.commandtools.MultiverseCommand; 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; @Service @CommandAlias("mv") diff --git a/src/main/java/com/onarandombox/MultiverseCore/commands/CoordinatesCommand.java b/src/main/java/org/mvplugins/multiverse/core/commands/CoordinatesCommand.java similarity index 83% rename from src/main/java/com/onarandombox/MultiverseCore/commands/CoordinatesCommand.java rename to src/main/java/org/mvplugins/multiverse/core/commands/CoordinatesCommand.java index 4531ea3a..410c3ece 100644 --- a/src/main/java/com/onarandombox/MultiverseCore/commands/CoordinatesCommand.java +++ b/src/main/java/org/mvplugins/multiverse/core/commands/CoordinatesCommand.java @@ -1,4 +1,4 @@ -package com.onarandombox.MultiverseCore.commands; +package org.mvplugins.multiverse.core.commands; import co.aikar.commands.BukkitCommandIssuer; import co.aikar.commands.annotation.CommandAlias; @@ -6,15 +6,15 @@ import co.aikar.commands.annotation.CommandPermission; import co.aikar.commands.annotation.Description; import co.aikar.commands.annotation.Flags; import co.aikar.commands.annotation.Subcommand; -import com.onarandombox.MultiverseCore.api.LocationManipulation; -import com.onarandombox.MultiverseCore.commandtools.MVCommandManager; -import com.onarandombox.MultiverseCore.commandtools.MultiverseCommand; -import com.onarandombox.MultiverseCore.utils.MVCorei18n; -import com.onarandombox.MultiverseCore.worldnew.LoadedMultiverseWorld; 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; +import org.mvplugins.multiverse.core.utils.MVCorei18n; +import org.mvplugins.multiverse.core.worldnew.LoadedMultiverseWorld; @Service @CommandAlias("mv") diff --git a/src/main/java/com/onarandombox/MultiverseCore/commands/CreateCommand.java b/src/main/java/org/mvplugins/multiverse/core/commands/CreateCommand.java similarity index 85% rename from src/main/java/com/onarandombox/MultiverseCore/commands/CreateCommand.java rename to src/main/java/org/mvplugins/multiverse/core/commands/CreateCommand.java index d9ffe695..9ac867f4 100644 --- a/src/main/java/com/onarandombox/MultiverseCore/commands/CreateCommand.java +++ b/src/main/java/org/mvplugins/multiverse/core/commands/CreateCommand.java @@ -1,4 +1,4 @@ -package com.onarandombox.MultiverseCore.commands; +package org.mvplugins.multiverse.core.commands; import java.util.Collections; import java.util.Random; @@ -11,22 +11,22 @@ import co.aikar.commands.annotation.Optional; import co.aikar.commands.annotation.Subcommand; import co.aikar.commands.annotation.Syntax; import com.dumptruckman.minecraft.util.Logging; -import com.onarandombox.MultiverseCore.commandtools.MVCommandIssuer; -import com.onarandombox.MultiverseCore.commandtools.MVCommandManager; -import com.onarandombox.MultiverseCore.commandtools.MultiverseCommand; -import com.onarandombox.MultiverseCore.commandtools.flags.CommandFlag; -import com.onarandombox.MultiverseCore.commandtools.flags.CommandFlagGroup; -import com.onarandombox.MultiverseCore.commandtools.flags.CommandValueFlag; -import com.onarandombox.MultiverseCore.commandtools.flags.ParsedCommandFlags; -import com.onarandombox.MultiverseCore.utils.MVCorei18n; -import com.onarandombox.MultiverseCore.worldnew.WorldManager; -import com.onarandombox.MultiverseCore.worldnew.generators.GeneratorProvider; -import com.onarandombox.MultiverseCore.worldnew.options.CreateWorldOptions; import jakarta.inject.Inject; 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; +import org.mvplugins.multiverse.core.commandtools.flags.CommandFlag; +import org.mvplugins.multiverse.core.commandtools.flags.CommandFlagGroup; +import org.mvplugins.multiverse.core.commandtools.flags.CommandValueFlag; +import org.mvplugins.multiverse.core.commandtools.flags.ParsedCommandFlags; +import org.mvplugins.multiverse.core.utils.MVCorei18n; +import org.mvplugins.multiverse.core.worldnew.WorldManager; +import org.mvplugins.multiverse.core.worldnew.generators.GeneratorProvider; +import org.mvplugins.multiverse.core.worldnew.options.CreateWorldOptions; @Service @CommandAlias("mv") diff --git a/src/main/java/com/onarandombox/MultiverseCore/commands/DebugCommand.java b/src/main/java/org/mvplugins/multiverse/core/commands/DebugCommand.java similarity index 86% rename from src/main/java/com/onarandombox/MultiverseCore/commands/DebugCommand.java rename to src/main/java/org/mvplugins/multiverse/core/commands/DebugCommand.java index b4500432..aebc43a0 100644 --- a/src/main/java/com/onarandombox/MultiverseCore/commands/DebugCommand.java +++ b/src/main/java/org/mvplugins/multiverse/core/commands/DebugCommand.java @@ -1,4 +1,4 @@ -package com.onarandombox.MultiverseCore.commands; +package org.mvplugins.multiverse.core.commands; import co.aikar.commands.BukkitCommandIssuer; import co.aikar.commands.annotation.CommandAlias; @@ -8,13 +8,13 @@ import co.aikar.commands.annotation.Description; import co.aikar.commands.annotation.Subcommand; import co.aikar.commands.annotation.Syntax; import com.dumptruckman.minecraft.util.Logging; -import com.onarandombox.MultiverseCore.commandtools.MVCommandManager; -import com.onarandombox.MultiverseCore.commandtools.MultiverseCommand; -import com.onarandombox.MultiverseCore.config.MVCoreConfig; -import com.onarandombox.MultiverseCore.utils.MVCorei18n; 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; +import org.mvplugins.multiverse.core.utils.MVCorei18n; @Service @CommandAlias("mv") diff --git a/src/main/java/com/onarandombox/MultiverseCore/commands/DeleteCommand.java b/src/main/java/org/mvplugins/multiverse/core/commands/DeleteCommand.java similarity index 85% rename from src/main/java/com/onarandombox/MultiverseCore/commands/DeleteCommand.java rename to src/main/java/org/mvplugins/multiverse/core/commands/DeleteCommand.java index e23c4a02..09fe5eb0 100644 --- a/src/main/java/com/onarandombox/MultiverseCore/commands/DeleteCommand.java +++ b/src/main/java/org/mvplugins/multiverse/core/commands/DeleteCommand.java @@ -1,4 +1,4 @@ -package com.onarandombox.MultiverseCore.commands; +package org.mvplugins.multiverse.core.commands; import co.aikar.commands.MessageType; import co.aikar.commands.annotation.CommandAlias; @@ -10,15 +10,15 @@ import co.aikar.commands.annotation.Single; import co.aikar.commands.annotation.Subcommand; import co.aikar.commands.annotation.Syntax; import com.dumptruckman.minecraft.util.Logging; -import com.onarandombox.MultiverseCore.commandtools.MVCommandIssuer; -import com.onarandombox.MultiverseCore.commandtools.MVCommandManager; -import com.onarandombox.MultiverseCore.commandtools.MultiverseCommand; -import com.onarandombox.MultiverseCore.commandtools.queue.QueuedCommand; -import com.onarandombox.MultiverseCore.utils.MVCorei18n; -import com.onarandombox.MultiverseCore.worldnew.WorldManager; 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; +import org.mvplugins.multiverse.core.commandtools.queue.QueuedCommand; +import org.mvplugins.multiverse.core.utils.MVCorei18n; +import org.mvplugins.multiverse.core.worldnew.WorldManager; @Service @CommandAlias("mv") diff --git a/src/main/java/com/onarandombox/MultiverseCore/commands/DumpsCommand.java b/src/main/java/org/mvplugins/multiverse/core/commands/DumpsCommand.java similarity index 89% rename from src/main/java/com/onarandombox/MultiverseCore/commands/DumpsCommand.java rename to src/main/java/org/mvplugins/multiverse/core/commands/DumpsCommand.java index 70cfc2d9..b0b64936 100644 --- a/src/main/java/com/onarandombox/MultiverseCore/commands/DumpsCommand.java +++ b/src/main/java/org/mvplugins/multiverse/core/commands/DumpsCommand.java @@ -1,7 +1,7 @@ -package com.onarandombox.MultiverseCore.commands; +package org.mvplugins.multiverse.core.commands; -import static com.onarandombox.MultiverseCore.utils.file.FileUtils.getBukkitConfig; -import static com.onarandombox.MultiverseCore.utils.file.FileUtils.getServerProperties; +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; @@ -19,26 +19,26 @@ import co.aikar.commands.annotation.Optional; import co.aikar.commands.annotation.Subcommand; import co.aikar.commands.annotation.Syntax; import com.dumptruckman.minecraft.util.Logging; -import com.onarandombox.MultiverseCore.MultiverseCore; -import com.onarandombox.MultiverseCore.commandtools.MVCommandManager; -import com.onarandombox.MultiverseCore.commandtools.MultiverseCommand; -import com.onarandombox.MultiverseCore.commandtools.flags.CommandFlag; -import com.onarandombox.MultiverseCore.commandtools.flags.CommandFlagGroup; -import com.onarandombox.MultiverseCore.commandtools.flags.CommandValueFlag; -import com.onarandombox.MultiverseCore.commandtools.flags.ParsedCommandFlags; -import com.onarandombox.MultiverseCore.event.MVVersionEvent; -import com.onarandombox.MultiverseCore.utils.MVCorei18n; -import com.onarandombox.MultiverseCore.utils.webpaste.PasteFailedException; -import com.onarandombox.MultiverseCore.utils.webpaste.PasteService; -import com.onarandombox.MultiverseCore.utils.webpaste.PasteServiceFactory; -import com.onarandombox.MultiverseCore.utils.webpaste.PasteServiceType; -import com.onarandombox.MultiverseCore.worldnew.WorldManager; import jakarta.inject.Inject; import org.apache.commons.lang.StringUtils; 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; +import org.mvplugins.multiverse.core.commandtools.flags.CommandFlag; +import org.mvplugins.multiverse.core.commandtools.flags.CommandFlagGroup; +import org.mvplugins.multiverse.core.commandtools.flags.CommandValueFlag; +import org.mvplugins.multiverse.core.commandtools.flags.ParsedCommandFlags; +import org.mvplugins.multiverse.core.event.MVVersionEvent; +import org.mvplugins.multiverse.core.utils.MVCorei18n; +import org.mvplugins.multiverse.core.utils.webpaste.PasteFailedException; +import org.mvplugins.multiverse.core.utils.webpaste.PasteService; +import org.mvplugins.multiverse.core.utils.webpaste.PasteServiceFactory; +import org.mvplugins.multiverse.core.utils.webpaste.PasteServiceType; +import org.mvplugins.multiverse.core.worldnew.WorldManager; @Service @CommandAlias("mv") diff --git a/src/main/java/com/onarandombox/MultiverseCore/commands/GameruleCommand.java b/src/main/java/org/mvplugins/multiverse/core/commands/GameruleCommand.java similarity index 88% rename from src/main/java/com/onarandombox/MultiverseCore/commands/GameruleCommand.java rename to src/main/java/org/mvplugins/multiverse/core/commands/GameruleCommand.java index 3408f506..6f3a4308 100644 --- a/src/main/java/com/onarandombox/MultiverseCore/commands/GameruleCommand.java +++ b/src/main/java/org/mvplugins/multiverse/core/commands/GameruleCommand.java @@ -1,4 +1,4 @@ -package com.onarandombox.MultiverseCore.commands; +package org.mvplugins.multiverse.core.commands; import co.aikar.commands.BukkitCommandIssuer; import co.aikar.commands.annotation.CommandAlias; @@ -8,16 +8,16 @@ import co.aikar.commands.annotation.Description; import co.aikar.commands.annotation.Flags; import co.aikar.commands.annotation.Subcommand; import co.aikar.commands.annotation.Syntax; -import com.onarandombox.MultiverseCore.commandtools.MVCommandManager; -import com.onarandombox.MultiverseCore.commandtools.MultiverseCommand; -import com.onarandombox.MultiverseCore.commandtools.context.GameRuleValue; -import com.onarandombox.MultiverseCore.utils.MVCorei18n; -import com.onarandombox.MultiverseCore.worldnew.LoadedMultiverseWorld; import jakarta.inject.Inject; 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; +import org.mvplugins.multiverse.core.utils.MVCorei18n; +import org.mvplugins.multiverse.core.worldnew.LoadedMultiverseWorld; @Service @CommandAlias("mv") diff --git a/src/main/java/com/onarandombox/MultiverseCore/commands/GamerulesCommand.java b/src/main/java/org/mvplugins/multiverse/core/commands/GamerulesCommand.java similarity index 82% rename from src/main/java/com/onarandombox/MultiverseCore/commands/GamerulesCommand.java rename to src/main/java/org/mvplugins/multiverse/core/commands/GamerulesCommand.java index 2052e7bc..de9edf26 100644 --- a/src/main/java/com/onarandombox/MultiverseCore/commands/GamerulesCommand.java +++ b/src/main/java/org/mvplugins/multiverse/core/commands/GamerulesCommand.java @@ -1,4 +1,4 @@ -package com.onarandombox.MultiverseCore.commands; +package org.mvplugins.multiverse.core.commands; import java.util.HashMap; import java.util.Map; @@ -14,25 +14,25 @@ import co.aikar.commands.annotation.Flags; import co.aikar.commands.annotation.Optional; import co.aikar.commands.annotation.Subcommand; import co.aikar.commands.annotation.Syntax; -import com.onarandombox.MultiverseCore.commandtools.MVCommandIssuer; -import com.onarandombox.MultiverseCore.commandtools.MVCommandManager; -import com.onarandombox.MultiverseCore.commandtools.MultiverseCommand; -import com.onarandombox.MultiverseCore.commandtools.flags.CommandValueFlag; -import com.onarandombox.MultiverseCore.commandtools.flags.ParsedCommandFlags; -import com.onarandombox.MultiverseCore.display.ContentDisplay; -import com.onarandombox.MultiverseCore.display.filters.ContentFilter; -import com.onarandombox.MultiverseCore.display.filters.DefaultContentFilter; -import com.onarandombox.MultiverseCore.display.filters.RegexContentFilter; -import com.onarandombox.MultiverseCore.display.handlers.PagedSendHandler; -import com.onarandombox.MultiverseCore.display.parsers.MapContentProvider; -import com.onarandombox.MultiverseCore.utils.MVCorei18n; -import com.onarandombox.MultiverseCore.worldnew.LoadedMultiverseWorld; import jakarta.inject.Inject; import org.bukkit.ChatColor; 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; +import org.mvplugins.multiverse.core.commandtools.flags.CommandValueFlag; +import org.mvplugins.multiverse.core.commandtools.flags.ParsedCommandFlags; +import org.mvplugins.multiverse.core.display.ContentDisplay; +import org.mvplugins.multiverse.core.display.filters.ContentFilter; +import org.mvplugins.multiverse.core.display.filters.DefaultContentFilter; +import org.mvplugins.multiverse.core.display.filters.RegexContentFilter; +import org.mvplugins.multiverse.core.display.handlers.PagedSendHandler; +import org.mvplugins.multiverse.core.display.parsers.MapContentProvider; +import org.mvplugins.multiverse.core.utils.MVCorei18n; +import org.mvplugins.multiverse.core.worldnew.LoadedMultiverseWorld; /** * List all gamerules in your current or specified world. diff --git a/src/main/java/com/onarandombox/MultiverseCore/commands/ImportCommand.java b/src/main/java/org/mvplugins/multiverse/core/commands/ImportCommand.java similarity index 80% rename from src/main/java/com/onarandombox/MultiverseCore/commands/ImportCommand.java rename to src/main/java/org/mvplugins/multiverse/core/commands/ImportCommand.java index 7031f8f7..8396b55c 100644 --- a/src/main/java/com/onarandombox/MultiverseCore/commands/ImportCommand.java +++ b/src/main/java/org/mvplugins/multiverse/core/commands/ImportCommand.java @@ -1,4 +1,4 @@ -package com.onarandombox.MultiverseCore.commands; +package org.mvplugins.multiverse.core.commands; import co.aikar.commands.annotation.CommandAlias; import co.aikar.commands.annotation.CommandCompletion; @@ -9,21 +9,21 @@ import co.aikar.commands.annotation.Optional; import co.aikar.commands.annotation.Subcommand; import co.aikar.commands.annotation.Syntax; import com.dumptruckman.minecraft.util.Logging; -import com.onarandombox.MultiverseCore.commandtools.MVCommandIssuer; -import com.onarandombox.MultiverseCore.commandtools.MVCommandManager; -import com.onarandombox.MultiverseCore.commandtools.MultiverseCommand; -import com.onarandombox.MultiverseCore.commandtools.flags.CommandFlag; -import com.onarandombox.MultiverseCore.commandtools.flags.CommandFlagGroup; -import com.onarandombox.MultiverseCore.commandtools.flags.CommandValueFlag; -import com.onarandombox.MultiverseCore.commandtools.flags.ParsedCommandFlags; -import com.onarandombox.MultiverseCore.utils.MVCorei18n; -import com.onarandombox.MultiverseCore.worldnew.WorldManager; -import com.onarandombox.MultiverseCore.worldnew.generators.GeneratorProvider; -import com.onarandombox.MultiverseCore.worldnew.options.ImportWorldOptions; 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; +import org.mvplugins.multiverse.core.commandtools.flags.CommandFlag; +import org.mvplugins.multiverse.core.commandtools.flags.CommandFlagGroup; +import org.mvplugins.multiverse.core.commandtools.flags.CommandValueFlag; +import org.mvplugins.multiverse.core.commandtools.flags.ParsedCommandFlags; +import org.mvplugins.multiverse.core.utils.MVCorei18n; +import org.mvplugins.multiverse.core.worldnew.WorldManager; +import org.mvplugins.multiverse.core.worldnew.generators.GeneratorProvider; +import org.mvplugins.multiverse.core.worldnew.options.ImportWorldOptions; @Service @CommandAlias("mv") diff --git a/src/main/java/com/onarandombox/MultiverseCore/commands/ListCommand.java b/src/main/java/org/mvplugins/multiverse/core/commands/ListCommand.java similarity index 80% rename from src/main/java/com/onarandombox/MultiverseCore/commands/ListCommand.java rename to src/main/java/org/mvplugins/multiverse/core/commands/ListCommand.java index b9bfdfc2..9e4b5806 100644 --- a/src/main/java/com/onarandombox/MultiverseCore/commands/ListCommand.java +++ b/src/main/java/org/mvplugins/multiverse/core/commands/ListCommand.java @@ -1,4 +1,4 @@ -package com.onarandombox.MultiverseCore.commands; +package org.mvplugins.multiverse.core.commands; import java.util.ArrayList; import java.util.List; @@ -10,27 +10,27 @@ import co.aikar.commands.annotation.CommandPermission; import co.aikar.commands.annotation.Description; import co.aikar.commands.annotation.Subcommand; import co.aikar.commands.annotation.Syntax; -import com.onarandombox.MultiverseCore.commandtools.MVCommandIssuer; -import com.onarandombox.MultiverseCore.commandtools.MVCommandManager; -import com.onarandombox.MultiverseCore.commandtools.MultiverseCommand; -import com.onarandombox.MultiverseCore.commandtools.flags.CommandFlagGroup; -import com.onarandombox.MultiverseCore.commandtools.flags.CommandValueFlag; -import com.onarandombox.MultiverseCore.commandtools.flags.ParsedCommandFlags; -import com.onarandombox.MultiverseCore.display.ContentDisplay; -import com.onarandombox.MultiverseCore.display.filters.ContentFilter; -import com.onarandombox.MultiverseCore.display.filters.DefaultContentFilter; -import com.onarandombox.MultiverseCore.display.filters.RegexContentFilter; -import com.onarandombox.MultiverseCore.display.handlers.PagedSendHandler; -import com.onarandombox.MultiverseCore.display.parsers.ListContentProvider; -import com.onarandombox.MultiverseCore.worldnew.LoadedMultiverseWorld; -import com.onarandombox.MultiverseCore.worldnew.WorldManager; -import com.onarandombox.MultiverseCore.worldnew.entrycheck.WorldEntryChecker; -import com.onarandombox.MultiverseCore.worldnew.entrycheck.WorldEntryCheckerProvider; import jakarta.inject.Inject; 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; +import org.mvplugins.multiverse.core.commandtools.flags.CommandFlagGroup; +import org.mvplugins.multiverse.core.commandtools.flags.CommandValueFlag; +import org.mvplugins.multiverse.core.commandtools.flags.ParsedCommandFlags; +import org.mvplugins.multiverse.core.display.ContentDisplay; +import org.mvplugins.multiverse.core.display.filters.ContentFilter; +import org.mvplugins.multiverse.core.display.filters.DefaultContentFilter; +import org.mvplugins.multiverse.core.display.filters.RegexContentFilter; +import org.mvplugins.multiverse.core.display.handlers.PagedSendHandler; +import org.mvplugins.multiverse.core.display.parsers.ListContentProvider; +import org.mvplugins.multiverse.core.worldnew.LoadedMultiverseWorld; +import org.mvplugins.multiverse.core.worldnew.WorldManager; +import org.mvplugins.multiverse.core.worldnew.entrycheck.WorldEntryChecker; +import org.mvplugins.multiverse.core.worldnew.entrycheck.WorldEntryCheckerProvider; @Service @CommandAlias("mv") diff --git a/src/main/java/com/onarandombox/MultiverseCore/commands/LoadCommand.java b/src/main/java/org/mvplugins/multiverse/core/commands/LoadCommand.java similarity index 83% rename from src/main/java/com/onarandombox/MultiverseCore/commands/LoadCommand.java rename to src/main/java/org/mvplugins/multiverse/core/commands/LoadCommand.java index 1c421e9d..4aa1895b 100644 --- a/src/main/java/com/onarandombox/MultiverseCore/commands/LoadCommand.java +++ b/src/main/java/org/mvplugins/multiverse/core/commands/LoadCommand.java @@ -1,4 +1,4 @@ -package com.onarandombox.MultiverseCore.commands; +package org.mvplugins.multiverse.core.commands; import co.aikar.commands.annotation.CommandAlias; import co.aikar.commands.annotation.CommandCompletion; @@ -9,14 +9,14 @@ import co.aikar.commands.annotation.Single; import co.aikar.commands.annotation.Subcommand; import co.aikar.commands.annotation.Syntax; import com.dumptruckman.minecraft.util.Logging; -import com.onarandombox.MultiverseCore.commandtools.MVCommandIssuer; -import com.onarandombox.MultiverseCore.commandtools.MVCommandManager; -import com.onarandombox.MultiverseCore.commandtools.MultiverseCommand; -import com.onarandombox.MultiverseCore.utils.MVCorei18n; -import com.onarandombox.MultiverseCore.worldnew.WorldManager; 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; +import org.mvplugins.multiverse.core.utils.MVCorei18n; +import org.mvplugins.multiverse.core.worldnew.WorldManager; @Service @CommandAlias("mv") diff --git a/src/main/java/com/onarandombox/MultiverseCore/commands/RegenCommand.java b/src/main/java/org/mvplugins/multiverse/core/commands/RegenCommand.java similarity index 81% rename from src/main/java/com/onarandombox/MultiverseCore/commands/RegenCommand.java rename to src/main/java/org/mvplugins/multiverse/core/commands/RegenCommand.java index 62c1b241..ae0021c4 100644 --- a/src/main/java/com/onarandombox/MultiverseCore/commands/RegenCommand.java +++ b/src/main/java/org/mvplugins/multiverse/core/commands/RegenCommand.java @@ -1,4 +1,4 @@ -package com.onarandombox.MultiverseCore.commands; +package org.mvplugins.multiverse.core.commands; import java.util.Collections; import java.util.Random; @@ -12,21 +12,21 @@ import co.aikar.commands.annotation.Optional; import co.aikar.commands.annotation.Subcommand; import co.aikar.commands.annotation.Syntax; import com.dumptruckman.minecraft.util.Logging; -import com.onarandombox.MultiverseCore.commandtools.MVCommandIssuer; -import com.onarandombox.MultiverseCore.commandtools.MVCommandManager; -import com.onarandombox.MultiverseCore.commandtools.MultiverseCommand; -import com.onarandombox.MultiverseCore.commandtools.flags.CommandFlag; -import com.onarandombox.MultiverseCore.commandtools.flags.CommandFlagGroup; -import com.onarandombox.MultiverseCore.commandtools.flags.CommandValueFlag; -import com.onarandombox.MultiverseCore.commandtools.flags.ParsedCommandFlags; -import com.onarandombox.MultiverseCore.commandtools.queue.QueuedCommand; -import com.onarandombox.MultiverseCore.utils.MVCorei18n; -import com.onarandombox.MultiverseCore.worldnew.LoadedMultiverseWorld; -import com.onarandombox.MultiverseCore.worldnew.WorldManager; -import com.onarandombox.MultiverseCore.worldnew.options.RegenWorldOptions; 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; +import org.mvplugins.multiverse.core.commandtools.flags.CommandFlag; +import org.mvplugins.multiverse.core.commandtools.flags.CommandFlagGroup; +import org.mvplugins.multiverse.core.commandtools.flags.CommandValueFlag; +import org.mvplugins.multiverse.core.commandtools.flags.ParsedCommandFlags; +import org.mvplugins.multiverse.core.commandtools.queue.QueuedCommand; +import org.mvplugins.multiverse.core.utils.MVCorei18n; +import org.mvplugins.multiverse.core.worldnew.LoadedMultiverseWorld; +import org.mvplugins.multiverse.core.worldnew.WorldManager; +import org.mvplugins.multiverse.core.worldnew.options.RegenWorldOptions; @Service @CommandAlias("mv") diff --git a/src/main/java/com/onarandombox/MultiverseCore/commands/ReloadCommand.java b/src/main/java/org/mvplugins/multiverse/core/commands/ReloadCommand.java similarity index 83% rename from src/main/java/com/onarandombox/MultiverseCore/commands/ReloadCommand.java rename to src/main/java/org/mvplugins/multiverse/core/commands/ReloadCommand.java index d30deb18..ff494da2 100644 --- a/src/main/java/com/onarandombox/MultiverseCore/commands/ReloadCommand.java +++ b/src/main/java/org/mvplugins/multiverse/core/commands/ReloadCommand.java @@ -1,4 +1,4 @@ -package com.onarandombox.MultiverseCore.commands; +package org.mvplugins.multiverse.core.commands; import java.util.ArrayList; import java.util.List; @@ -8,17 +8,17 @@ import co.aikar.commands.annotation.CommandAlias; import co.aikar.commands.annotation.CommandPermission; import co.aikar.commands.annotation.Description; import co.aikar.commands.annotation.Subcommand; -import com.onarandombox.MultiverseCore.anchor.AnchorManager; -import com.onarandombox.MultiverseCore.commandtools.MVCommandManager; -import com.onarandombox.MultiverseCore.commandtools.MultiverseCommand; -import com.onarandombox.MultiverseCore.config.MVCoreConfig; -import com.onarandombox.MultiverseCore.event.MVConfigReloadEvent; -import com.onarandombox.MultiverseCore.utils.MVCorei18n; -import com.onarandombox.MultiverseCore.worldnew.WorldManager; 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; +import org.mvplugins.multiverse.core.config.MVCoreConfig; +import org.mvplugins.multiverse.core.event.MVConfigReloadEvent; +import org.mvplugins.multiverse.core.utils.MVCorei18n; +import org.mvplugins.multiverse.core.worldnew.WorldManager; @Service @CommandAlias("mv") diff --git a/src/main/java/com/onarandombox/MultiverseCore/commands/RemoveCommand.java b/src/main/java/org/mvplugins/multiverse/core/commands/RemoveCommand.java similarity index 83% rename from src/main/java/com/onarandombox/MultiverseCore/commands/RemoveCommand.java rename to src/main/java/org/mvplugins/multiverse/core/commands/RemoveCommand.java index 0d600b2d..2fd1c306 100644 --- a/src/main/java/com/onarandombox/MultiverseCore/commands/RemoveCommand.java +++ b/src/main/java/org/mvplugins/multiverse/core/commands/RemoveCommand.java @@ -1,4 +1,4 @@ -package com.onarandombox.MultiverseCore.commands; +package org.mvplugins.multiverse.core.commands; import co.aikar.commands.annotation.CommandAlias; import co.aikar.commands.annotation.CommandCompletion; @@ -9,14 +9,14 @@ import co.aikar.commands.annotation.Single; import co.aikar.commands.annotation.Subcommand; import co.aikar.commands.annotation.Syntax; import com.dumptruckman.minecraft.util.Logging; -import com.onarandombox.MultiverseCore.commandtools.MVCommandIssuer; -import com.onarandombox.MultiverseCore.commandtools.MVCommandManager; -import com.onarandombox.MultiverseCore.commandtools.MultiverseCommand; -import com.onarandombox.MultiverseCore.utils.MVCorei18n; -import com.onarandombox.MultiverseCore.worldnew.WorldManager; 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; +import org.mvplugins.multiverse.core.utils.MVCorei18n; +import org.mvplugins.multiverse.core.worldnew.WorldManager; @Service @CommandAlias("mv") diff --git a/src/main/java/com/onarandombox/MultiverseCore/commands/RootCommand.java b/src/main/java/org/mvplugins/multiverse/core/commands/RootCommand.java similarity index 75% rename from src/main/java/com/onarandombox/MultiverseCore/commands/RootCommand.java rename to src/main/java/org/mvplugins/multiverse/core/commands/RootCommand.java index b42b65ec..9dd36d81 100644 --- a/src/main/java/com/onarandombox/MultiverseCore/commands/RootCommand.java +++ b/src/main/java/org/mvplugins/multiverse/core/commands/RootCommand.java @@ -1,16 +1,16 @@ -package com.onarandombox.MultiverseCore.commands; +package org.mvplugins.multiverse.core.commands; import co.aikar.commands.CommandIssuer; import co.aikar.commands.annotation.CommandAlias; -import com.onarandombox.MultiverseCore.MultiverseCore; -import com.onarandombox.MultiverseCore.commandtools.MVCommandManager; -import com.onarandombox.MultiverseCore.commandtools.MultiverseCommand; -import com.onarandombox.MultiverseCore.utils.MVCorei18n; import jakarta.inject.Inject; 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; +import org.mvplugins.multiverse.core.utils.MVCorei18n; @Service public class RootCommand extends MultiverseCommand { diff --git a/src/main/java/com/onarandombox/MultiverseCore/commands/TeleportCommand.java b/src/main/java/org/mvplugins/multiverse/core/commands/TeleportCommand.java similarity index 87% rename from src/main/java/com/onarandombox/MultiverseCore/commands/TeleportCommand.java rename to src/main/java/org/mvplugins/multiverse/core/commands/TeleportCommand.java index 30b39141..f66f39a0 100644 --- a/src/main/java/com/onarandombox/MultiverseCore/commands/TeleportCommand.java +++ b/src/main/java/org/mvplugins/multiverse/core/commands/TeleportCommand.java @@ -1,4 +1,4 @@ -package com.onarandombox.MultiverseCore.commands; +package org.mvplugins.multiverse.core.commands; import java.util.Arrays; import java.util.concurrent.CompletableFuture; @@ -12,14 +12,14 @@ import co.aikar.commands.annotation.Flags; import co.aikar.commands.annotation.Subcommand; import co.aikar.commands.annotation.Syntax; import com.dumptruckman.minecraft.util.Logging; -import com.onarandombox.MultiverseCore.commandtools.MVCommandManager; -import com.onarandombox.MultiverseCore.commandtools.MultiverseCommand; -import com.onarandombox.MultiverseCore.destination.DestinationsProvider; -import com.onarandombox.MultiverseCore.destination.ParsedDestination; -import com.onarandombox.MultiverseCore.utils.MVCorei18n; 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; +import org.mvplugins.multiverse.core.destination.ParsedDestination; +import org.mvplugins.multiverse.core.utils.MVCorei18n; @Service @CommandAlias("mv") diff --git a/src/main/java/com/onarandombox/MultiverseCore/commands/UnloadCommand.java b/src/main/java/org/mvplugins/multiverse/core/commands/UnloadCommand.java similarity index 79% rename from src/main/java/com/onarandombox/MultiverseCore/commands/UnloadCommand.java rename to src/main/java/org/mvplugins/multiverse/core/commands/UnloadCommand.java index bb599c21..d6e8d2c1 100644 --- a/src/main/java/com/onarandombox/MultiverseCore/commands/UnloadCommand.java +++ b/src/main/java/org/mvplugins/multiverse/core/commands/UnloadCommand.java @@ -1,4 +1,4 @@ -package com.onarandombox.MultiverseCore.commands; +package org.mvplugins.multiverse.core.commands; import co.aikar.commands.annotation.CommandAlias; import co.aikar.commands.annotation.CommandCompletion; @@ -8,18 +8,18 @@ import co.aikar.commands.annotation.Optional; import co.aikar.commands.annotation.Subcommand; import co.aikar.commands.annotation.Syntax; import com.dumptruckman.minecraft.util.Logging; -import com.onarandombox.MultiverseCore.commandtools.MVCommandIssuer; -import com.onarandombox.MultiverseCore.commandtools.MVCommandManager; -import com.onarandombox.MultiverseCore.commandtools.MultiverseCommand; -import com.onarandombox.MultiverseCore.commandtools.flags.CommandFlag; -import com.onarandombox.MultiverseCore.commandtools.flags.ParsedCommandFlags; -import com.onarandombox.MultiverseCore.utils.MVCorei18n; -import com.onarandombox.MultiverseCore.worldnew.LoadedMultiverseWorld; -import com.onarandombox.MultiverseCore.worldnew.WorldManager; -import com.onarandombox.MultiverseCore.worldnew.options.UnloadWorldOptions; 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; +import org.mvplugins.multiverse.core.commandtools.flags.CommandFlag; +import org.mvplugins.multiverse.core.commandtools.flags.ParsedCommandFlags; +import org.mvplugins.multiverse.core.utils.MVCorei18n; +import org.mvplugins.multiverse.core.worldnew.LoadedMultiverseWorld; +import org.mvplugins.multiverse.core.worldnew.WorldManager; +import org.mvplugins.multiverse.core.worldnew.options.UnloadWorldOptions; @Service @CommandAlias("mv") diff --git a/src/main/java/com/onarandombox/MultiverseCore/commands/UsageCommand.java b/src/main/java/org/mvplugins/multiverse/core/commands/UsageCommand.java similarity index 85% rename from src/main/java/com/onarandombox/MultiverseCore/commands/UsageCommand.java rename to src/main/java/org/mvplugins/multiverse/core/commands/UsageCommand.java index 47ba04d2..48cbb052 100644 --- a/src/main/java/com/onarandombox/MultiverseCore/commands/UsageCommand.java +++ b/src/main/java/org/mvplugins/multiverse/core/commands/UsageCommand.java @@ -1,4 +1,4 @@ -package com.onarandombox.MultiverseCore.commands; +package org.mvplugins.multiverse.core.commands; import co.aikar.commands.CommandHelp; import co.aikar.commands.annotation.CommandAlias; @@ -8,11 +8,11 @@ import co.aikar.commands.annotation.Description; import co.aikar.commands.annotation.HelpCommand; import co.aikar.commands.annotation.Subcommand; import co.aikar.commands.annotation.Syntax; -import com.onarandombox.MultiverseCore.commandtools.MVCommandManager; -import com.onarandombox.MultiverseCore.commandtools.MultiverseCommand; 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; @Service @CommandAlias("mv") diff --git a/src/main/java/com/onarandombox/MultiverseCore/commands/package-info.java b/src/main/java/org/mvplugins/multiverse/core/commands/package-info.java similarity index 58% rename from src/main/java/com/onarandombox/MultiverseCore/commands/package-info.java rename to src/main/java/org/mvplugins/multiverse/core/commands/package-info.java index 3ee6d596..351427b4 100644 --- a/src/main/java/com/onarandombox/MultiverseCore/commands/package-info.java +++ b/src/main/java/org/mvplugins/multiverse/core/commands/package-info.java @@ -1,4 +1,4 @@ /** * This package contains all the commands for Multiverse-Core. */ -package com.onarandombox.MultiverseCore.commands; +package org.mvplugins.multiverse.core.commands; diff --git a/src/main/java/com/onarandombox/MultiverseCore/commandtools/MVCommandCompletions.java b/src/main/java/org/mvplugins/multiverse/core/commandtools/MVCommandCompletions.java similarity index 92% rename from src/main/java/com/onarandombox/MultiverseCore/commandtools/MVCommandCompletions.java rename to src/main/java/org/mvplugins/multiverse/core/commandtools/MVCommandCompletions.java index 687a5ba9..f62f3604 100644 --- a/src/main/java/com/onarandombox/MultiverseCore/commandtools/MVCommandCompletions.java +++ b/src/main/java/org/mvplugins/multiverse/core/commandtools/MVCommandCompletions.java @@ -1,4 +1,4 @@ -package com.onarandombox.MultiverseCore.commandtools; +package org.mvplugins.multiverse.core.commandtools; import java.util.Arrays; import java.util.Collection; @@ -16,17 +16,17 @@ import co.aikar.commands.RegisteredCommand; import co.aikar.commands.RootCommand; import com.dumptruckman.minecraft.util.Logging; import com.google.common.collect.Sets; -import com.onarandombox.MultiverseCore.config.MVCoreConfig; -import com.onarandombox.MultiverseCore.destination.DestinationsProvider; -import com.onarandombox.MultiverseCore.destination.ParsedDestination; -import com.onarandombox.MultiverseCore.worldnew.LoadedMultiverseWorld; -import com.onarandombox.MultiverseCore.worldnew.MultiverseWorld; -import com.onarandombox.MultiverseCore.worldnew.WorldManager; import io.vavr.control.Try; 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; +import org.mvplugins.multiverse.core.worldnew.LoadedMultiverseWorld; +import org.mvplugins.multiverse.core.worldnew.MultiverseWorld; +import org.mvplugins.multiverse.core.worldnew.WorldManager; @Service public class MVCommandCompletions extends PaperCommandCompletions { diff --git a/src/main/java/com/onarandombox/MultiverseCore/commandtools/MVCommandConditions.java b/src/main/java/org/mvplugins/multiverse/core/commandtools/MVCommandConditions.java similarity index 95% rename from src/main/java/com/onarandombox/MultiverseCore/commandtools/MVCommandConditions.java rename to src/main/java/org/mvplugins/multiverse/core/commandtools/MVCommandConditions.java index 6eba7dc0..35d91779 100644 --- a/src/main/java/com/onarandombox/MultiverseCore/commandtools/MVCommandConditions.java +++ b/src/main/java/org/mvplugins/multiverse/core/commandtools/MVCommandConditions.java @@ -1,4 +1,4 @@ -package com.onarandombox.MultiverseCore.commandtools; +package org.mvplugins.multiverse.core.commandtools; import co.aikar.commands.BukkitCommandExecutionContext; import co.aikar.commands.BukkitCommandIssuer; @@ -6,9 +6,9 @@ import co.aikar.commands.BukkitConditionContext; import co.aikar.commands.CommandConditions; import co.aikar.commands.ConditionContext; import co.aikar.commands.ConditionFailedException; -import com.onarandombox.MultiverseCore.world.WorldNameChecker; -import com.onarandombox.MultiverseCore.worldnew.WorldManager; import org.jetbrains.annotations.NotNull; +import org.mvplugins.multiverse.core.world.WorldNameChecker; +import org.mvplugins.multiverse.core.worldnew.WorldManager; public class MVCommandConditions { static void load(MVCommandManager commandManager, WorldManager worldManager) { diff --git a/src/main/java/com/onarandombox/MultiverseCore/commandtools/MVCommandContexts.java b/src/main/java/org/mvplugins/multiverse/core/commandtools/MVCommandContexts.java similarity index 93% rename from src/main/java/com/onarandombox/MultiverseCore/commandtools/MVCommandContexts.java rename to src/main/java/org/mvplugins/multiverse/core/commandtools/MVCommandContexts.java index 531b29f3..f3b7b02c 100644 --- a/src/main/java/com/onarandombox/MultiverseCore/commandtools/MVCommandContexts.java +++ b/src/main/java/org/mvplugins/multiverse/core/commandtools/MVCommandContexts.java @@ -1,4 +1,4 @@ -package com.onarandombox.MultiverseCore.commandtools; +package org.mvplugins.multiverse.core.commandtools; import java.util.HashSet; import java.util.Set; @@ -9,24 +9,24 @@ import co.aikar.commands.InvalidCommandArgument; import co.aikar.commands.PaperCommandContexts; import co.aikar.commands.contexts.ContextResolver; import com.google.common.base.Strings; -import com.onarandombox.MultiverseCore.commandtools.context.GameRuleValue; -import com.onarandombox.MultiverseCore.commandtools.context.MVConfigValue; -import com.onarandombox.MultiverseCore.config.MVCoreConfig; -import com.onarandombox.MultiverseCore.configuration.node.Node; -import com.onarandombox.MultiverseCore.configuration.node.ValueNode; -import com.onarandombox.MultiverseCore.destination.DestinationsProvider; -import com.onarandombox.MultiverseCore.destination.ParsedDestination; -import com.onarandombox.MultiverseCore.display.filters.ContentFilter; -import com.onarandombox.MultiverseCore.display.filters.DefaultContentFilter; -import com.onarandombox.MultiverseCore.display.filters.RegexContentFilter; -import com.onarandombox.MultiverseCore.utils.PlayerFinder; -import com.onarandombox.MultiverseCore.worldnew.LoadedMultiverseWorld; -import com.onarandombox.MultiverseCore.worldnew.WorldManager; import io.vavr.control.Option; 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; +import org.mvplugins.multiverse.core.configuration.node.Node; +import org.mvplugins.multiverse.core.configuration.node.ValueNode; +import org.mvplugins.multiverse.core.destination.DestinationsProvider; +import org.mvplugins.multiverse.core.destination.ParsedDestination; +import org.mvplugins.multiverse.core.display.filters.ContentFilter; +import org.mvplugins.multiverse.core.display.filters.DefaultContentFilter; +import org.mvplugins.multiverse.core.display.filters.RegexContentFilter; +import org.mvplugins.multiverse.core.utils.PlayerFinder; +import org.mvplugins.multiverse.core.worldnew.LoadedMultiverseWorld; +import org.mvplugins.multiverse.core.worldnew.WorldManager; @Service public class MVCommandContexts extends PaperCommandContexts { diff --git a/src/main/java/com/onarandombox/MultiverseCore/commandtools/MVCommandIssuer.java b/src/main/java/org/mvplugins/multiverse/core/commandtools/MVCommandIssuer.java similarity index 92% rename from src/main/java/com/onarandombox/MultiverseCore/commandtools/MVCommandIssuer.java rename to src/main/java/org/mvplugins/multiverse/core/commandtools/MVCommandIssuer.java index a22c9b39..601b62a6 100644 --- a/src/main/java/com/onarandombox/MultiverseCore/commandtools/MVCommandIssuer.java +++ b/src/main/java/org/mvplugins/multiverse/core/commandtools/MVCommandIssuer.java @@ -1,11 +1,11 @@ -package com.onarandombox.MultiverseCore.commandtools; +package org.mvplugins.multiverse.core.commandtools; import co.aikar.commands.MessageType; import co.aikar.commands.OpenBukkitCommandIssuer; import co.aikar.locales.MessageKeyProvider; -import com.onarandombox.MultiverseCore.utils.message.Message; 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/com/onarandombox/MultiverseCore/commandtools/MVCommandManager.java b/src/main/java/org/mvplugins/multiverse/core/commandtools/MVCommandManager.java similarity index 92% rename from src/main/java/com/onarandombox/MultiverseCore/commandtools/MVCommandManager.java rename to src/main/java/org/mvplugins/multiverse/core/commandtools/MVCommandManager.java index 58de1ae1..c3c50ce8 100644 --- a/src/main/java/com/onarandombox/MultiverseCore/commandtools/MVCommandManager.java +++ b/src/main/java/org/mvplugins/multiverse/core/commandtools/MVCommandManager.java @@ -1,4 +1,4 @@ -package com.onarandombox.MultiverseCore.commandtools; +package org.mvplugins.multiverse.core.commandtools; import java.util.List; @@ -9,16 +9,16 @@ import co.aikar.commands.CommandContexts; import co.aikar.commands.CommandHelp; import co.aikar.commands.HelpEntry; import co.aikar.commands.PaperCommandManager; -import com.onarandombox.MultiverseCore.MultiverseCore; -import com.onarandombox.MultiverseCore.commandtools.flags.CommandFlagsManager; -import com.onarandombox.MultiverseCore.commandtools.queue.CommandQueueManager; -import com.onarandombox.MultiverseCore.worldnew.WorldManager; import jakarta.inject.Inject; import jakarta.inject.Provider; 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; +import org.mvplugins.multiverse.core.worldnew.WorldManager; /** * Main class to manage permissions. diff --git a/src/main/java/com/onarandombox/MultiverseCore/commandtools/MultiverseCommand.java b/src/main/java/org/mvplugins/multiverse/core/commandtools/MultiverseCommand.java similarity index 83% rename from src/main/java/com/onarandombox/MultiverseCore/commandtools/MultiverseCommand.java rename to src/main/java/org/mvplugins/multiverse/core/commandtools/MultiverseCommand.java index 1225319f..88ccfdf1 100644 --- a/src/main/java/com/onarandombox/MultiverseCore/commandtools/MultiverseCommand.java +++ b/src/main/java/org/mvplugins/multiverse/core/commandtools/MultiverseCommand.java @@ -1,14 +1,14 @@ -package com.onarandombox.MultiverseCore.commandtools; +package org.mvplugins.multiverse.core.commandtools; import co.aikar.commands.BaseCommand; import com.dumptruckman.minecraft.util.Logging; -import com.onarandombox.MultiverseCore.commandtools.flags.CommandFlag; -import com.onarandombox.MultiverseCore.commandtools.flags.CommandFlagGroup; -import com.onarandombox.MultiverseCore.commandtools.flags.CommandFlagsManager; -import com.onarandombox.MultiverseCore.commandtools.flags.ParsedCommandFlags; 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; +import org.mvplugins.multiverse.core.commandtools.flags.ParsedCommandFlags; @Contract public abstract class MultiverseCommand extends BaseCommand { diff --git a/src/main/java/com/onarandombox/MultiverseCore/commandtools/PluginLocales.java b/src/main/java/org/mvplugins/multiverse/core/commandtools/PluginLocales.java similarity index 92% rename from src/main/java/com/onarandombox/MultiverseCore/commandtools/PluginLocales.java rename to src/main/java/org/mvplugins/multiverse/core/commandtools/PluginLocales.java index 2db5686f..9308167e 100644 --- a/src/main/java/com/onarandombox/MultiverseCore/commandtools/PluginLocales.java +++ b/src/main/java/org/mvplugins/multiverse/core/commandtools/PluginLocales.java @@ -1,11 +1,11 @@ -package com.onarandombox.MultiverseCore.commandtools; +package org.mvplugins.multiverse.core.commandtools; import co.aikar.commands.BukkitLocales; -import com.onarandombox.MultiverseCore.utils.file.FileResClassLoader; 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; /** * Locale manager with additional methods for loading locales from plugin's locales folder. diff --git a/src/main/java/com/onarandombox/MultiverseCore/commandtools/context/GameRuleValue.java b/src/main/java/org/mvplugins/multiverse/core/commandtools/context/GameRuleValue.java similarity index 76% rename from src/main/java/com/onarandombox/MultiverseCore/commandtools/context/GameRuleValue.java rename to src/main/java/org/mvplugins/multiverse/core/commandtools/context/GameRuleValue.java index c7fa2bdd..a69d213a 100644 --- a/src/main/java/com/onarandombox/MultiverseCore/commandtools/context/GameRuleValue.java +++ b/src/main/java/org/mvplugins/multiverse/core/commandtools/context/GameRuleValue.java @@ -1,4 +1,4 @@ -package com.onarandombox.MultiverseCore.commandtools.context; +package org.mvplugins.multiverse.core.commandtools.context; public class GameRuleValue { private final Object value; diff --git a/src/main/java/com/onarandombox/MultiverseCore/commandtools/context/MVConfigValue.java b/src/main/java/org/mvplugins/multiverse/core/commandtools/context/MVConfigValue.java similarity index 76% rename from src/main/java/com/onarandombox/MultiverseCore/commandtools/context/MVConfigValue.java rename to src/main/java/org/mvplugins/multiverse/core/commandtools/context/MVConfigValue.java index 03d2c0aa..e800ca74 100644 --- a/src/main/java/com/onarandombox/MultiverseCore/commandtools/context/MVConfigValue.java +++ b/src/main/java/org/mvplugins/multiverse/core/commandtools/context/MVConfigValue.java @@ -1,4 +1,4 @@ -package com.onarandombox.MultiverseCore.commandtools.context; +package org.mvplugins.multiverse.core.commandtools.context; public class MVConfigValue { private final Object value; diff --git a/src/main/java/org/mvplugins/multiverse/core/commandtools/context/package-info.java b/src/main/java/org/mvplugins/multiverse/core/commandtools/context/package-info.java new file mode 100644 index 00000000..9d89f5d0 --- /dev/null +++ b/src/main/java/org/mvplugins/multiverse/core/commandtools/context/package-info.java @@ -0,0 +1 @@ +package org.mvplugins.multiverse.core.commandtools.context; diff --git a/src/main/java/com/onarandombox/MultiverseCore/commandtools/flags/CommandFlag.java b/src/main/java/org/mvplugins/multiverse/core/commandtools/flags/CommandFlag.java similarity index 97% rename from src/main/java/com/onarandombox/MultiverseCore/commandtools/flags/CommandFlag.java rename to src/main/java/org/mvplugins/multiverse/core/commandtools/flags/CommandFlag.java index a11582e0..f6b62bee 100644 --- a/src/main/java/com/onarandombox/MultiverseCore/commandtools/flags/CommandFlag.java +++ b/src/main/java/org/mvplugins/multiverse/core/commandtools/flags/CommandFlag.java @@ -1,4 +1,4 @@ -package com.onarandombox.MultiverseCore.commandtools.flags; +package org.mvplugins.multiverse.core.commandtools.flags; import java.util.ArrayList; import java.util.Collections; diff --git a/src/main/java/com/onarandombox/MultiverseCore/commandtools/flags/CommandFlagGroup.java b/src/main/java/org/mvplugins/multiverse/core/commandtools/flags/CommandFlagGroup.java similarity index 98% rename from src/main/java/com/onarandombox/MultiverseCore/commandtools/flags/CommandFlagGroup.java rename to src/main/java/org/mvplugins/multiverse/core/commandtools/flags/CommandFlagGroup.java index a36d23d7..df0e60d5 100644 --- a/src/main/java/com/onarandombox/MultiverseCore/commandtools/flags/CommandFlagGroup.java +++ b/src/main/java/org/mvplugins/multiverse/core/commandtools/flags/CommandFlagGroup.java @@ -1,4 +1,4 @@ -package com.onarandombox.MultiverseCore.commandtools.flags; +package org.mvplugins.multiverse.core.commandtools.flags; import java.util.ArrayList; import java.util.HashMap; diff --git a/src/main/java/com/onarandombox/MultiverseCore/commandtools/flags/CommandFlagsManager.java b/src/main/java/org/mvplugins/multiverse/core/commandtools/flags/CommandFlagsManager.java similarity index 97% rename from src/main/java/com/onarandombox/MultiverseCore/commandtools/flags/CommandFlagsManager.java rename to src/main/java/org/mvplugins/multiverse/core/commandtools/flags/CommandFlagsManager.java index bf9eadda..d7cc7a18 100644 --- a/src/main/java/com/onarandombox/MultiverseCore/commandtools/flags/CommandFlagsManager.java +++ b/src/main/java/org/mvplugins/multiverse/core/commandtools/flags/CommandFlagsManager.java @@ -1,4 +1,4 @@ -package com.onarandombox.MultiverseCore.commandtools.flags; +package org.mvplugins.multiverse.core.commandtools.flags; import java.util.ArrayList; import java.util.Collection; diff --git a/src/main/java/com/onarandombox/MultiverseCore/commandtools/flags/CommandFlagsParser.java b/src/main/java/org/mvplugins/multiverse/core/commandtools/flags/CommandFlagsParser.java similarity index 98% rename from src/main/java/com/onarandombox/MultiverseCore/commandtools/flags/CommandFlagsParser.java rename to src/main/java/org/mvplugins/multiverse/core/commandtools/flags/CommandFlagsParser.java index 4c5bde8c..9dd3287e 100644 --- a/src/main/java/com/onarandombox/MultiverseCore/commandtools/flags/CommandFlagsParser.java +++ b/src/main/java/org/mvplugins/multiverse/core/commandtools/flags/CommandFlagsParser.java @@ -1,4 +1,4 @@ -package com.onarandombox.MultiverseCore.commandtools.flags; +package org.mvplugins.multiverse.core.commandtools.flags; import co.aikar.commands.InvalidCommandArgument; diff --git a/src/main/java/com/onarandombox/MultiverseCore/commandtools/flags/CommandValueFlag.java b/src/main/java/org/mvplugins/multiverse/core/commandtools/flags/CommandValueFlag.java similarity index 99% rename from src/main/java/com/onarandombox/MultiverseCore/commandtools/flags/CommandValueFlag.java rename to src/main/java/org/mvplugins/multiverse/core/commandtools/flags/CommandValueFlag.java index 5c28ce46..0301b4ab 100644 --- a/src/main/java/com/onarandombox/MultiverseCore/commandtools/flags/CommandValueFlag.java +++ b/src/main/java/org/mvplugins/multiverse/core/commandtools/flags/CommandValueFlag.java @@ -1,4 +1,4 @@ -package com.onarandombox.MultiverseCore.commandtools.flags; +package org.mvplugins.multiverse.core.commandtools.flags; import java.util.Arrays; import java.util.Collection; diff --git a/src/main/java/com/onarandombox/MultiverseCore/commandtools/flags/ParsedCommandFlags.java b/src/main/java/org/mvplugins/multiverse/core/commandtools/flags/ParsedCommandFlags.java similarity index 98% rename from src/main/java/com/onarandombox/MultiverseCore/commandtools/flags/ParsedCommandFlags.java rename to src/main/java/org/mvplugins/multiverse/core/commandtools/flags/ParsedCommandFlags.java index 605237bd..9b124235 100644 --- a/src/main/java/com/onarandombox/MultiverseCore/commandtools/flags/ParsedCommandFlags.java +++ b/src/main/java/org/mvplugins/multiverse/core/commandtools/flags/ParsedCommandFlags.java @@ -1,4 +1,4 @@ -package com.onarandombox.MultiverseCore.commandtools.flags; +package org.mvplugins.multiverse.core.commandtools.flags; import java.util.HashMap; import java.util.Map; diff --git a/src/main/java/com/onarandombox/MultiverseCore/commandtools/flags/package-info.java b/src/main/java/org/mvplugins/multiverse/core/commandtools/flags/package-info.java similarity index 52% rename from src/main/java/com/onarandombox/MultiverseCore/commandtools/flags/package-info.java rename to src/main/java/org/mvplugins/multiverse/core/commandtools/flags/package-info.java index 0fc40258..f6616416 100644 --- a/src/main/java/com/onarandombox/MultiverseCore/commandtools/flags/package-info.java +++ b/src/main/java/org/mvplugins/multiverse/core/commandtools/flags/package-info.java @@ -2,4 +2,4 @@ * This package contains all the flags parsing classes. * */ -package com.onarandombox.MultiverseCore.commandtools.flags; +package org.mvplugins.multiverse.core.commandtools.flags; diff --git a/src/main/java/com/onarandombox/MultiverseCore/commandtools/package-info.java b/src/main/java/org/mvplugins/multiverse/core/commandtools/package-info.java similarity index 58% rename from src/main/java/com/onarandombox/MultiverseCore/commandtools/package-info.java rename to src/main/java/org/mvplugins/multiverse/core/commandtools/package-info.java index 47724003..b1174707 100644 --- a/src/main/java/com/onarandombox/MultiverseCore/commandtools/package-info.java +++ b/src/main/java/org/mvplugins/multiverse/core/commandtools/package-info.java @@ -1,4 +1,4 @@ /** * This package contains the classes that manages command handling. */ -package com.onarandombox.MultiverseCore.commandtools; +package org.mvplugins.multiverse.core.commandtools; diff --git a/src/main/java/com/onarandombox/MultiverseCore/commandtools/queue/CommandQueueManager.java b/src/main/java/org/mvplugins/multiverse/core/commandtools/queue/CommandQueueManager.java similarity index 98% rename from src/main/java/com/onarandombox/MultiverseCore/commandtools/queue/CommandQueueManager.java rename to src/main/java/org/mvplugins/multiverse/core/commandtools/queue/CommandQueueManager.java index 3b9ea879..5871e527 100644 --- a/src/main/java/com/onarandombox/MultiverseCore/commandtools/queue/CommandQueueManager.java +++ b/src/main/java/org/mvplugins/multiverse/core/commandtools/queue/CommandQueueManager.java @@ -5,13 +5,12 @@ * with this project. * ******************************************************************************/ -package com.onarandombox.MultiverseCore.commandtools.queue; +package org.mvplugins.multiverse.core.commandtools.queue; import java.util.Map; import java.util.WeakHashMap; import com.dumptruckman.minecraft.util.Logging; -import com.onarandombox.MultiverseCore.MultiverseCore; import jakarta.inject.Inject; import org.bukkit.Bukkit; import org.bukkit.ChatColor; @@ -22,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; /** *

Manages the queuing of dangerous commands that require {@code /mv confirm} before executing.

diff --git a/src/main/java/com/onarandombox/MultiverseCore/commandtools/queue/DummyCommandBlockSender.java b/src/main/java/org/mvplugins/multiverse/core/commandtools/queue/DummyCommandBlockSender.java similarity index 98% rename from src/main/java/com/onarandombox/MultiverseCore/commandtools/queue/DummyCommandBlockSender.java rename to src/main/java/org/mvplugins/multiverse/core/commandtools/queue/DummyCommandBlockSender.java index 0c31c134..f78ea62b 100644 --- a/src/main/java/com/onarandombox/MultiverseCore/commandtools/queue/DummyCommandBlockSender.java +++ b/src/main/java/org/mvplugins/multiverse/core/commandtools/queue/DummyCommandBlockSender.java @@ -1,4 +1,4 @@ -package com.onarandombox.MultiverseCore.commandtools.queue; +package org.mvplugins.multiverse.core.commandtools.queue; import java.util.Set; import java.util.UUID; diff --git a/src/main/java/com/onarandombox/MultiverseCore/commandtools/queue/QueuedCommand.java b/src/main/java/org/mvplugins/multiverse/core/commandtools/queue/QueuedCommand.java similarity index 98% rename from src/main/java/com/onarandombox/MultiverseCore/commandtools/queue/QueuedCommand.java rename to src/main/java/org/mvplugins/multiverse/core/commandtools/queue/QueuedCommand.java index d25a0ec3..4e089b6c 100644 --- a/src/main/java/com/onarandombox/MultiverseCore/commandtools/queue/QueuedCommand.java +++ b/src/main/java/org/mvplugins/multiverse/core/commandtools/queue/QueuedCommand.java @@ -5,7 +5,7 @@ * with this project. * ******************************************************************************/ -package com.onarandombox.MultiverseCore.commandtools.queue; +package org.mvplugins.multiverse.core.commandtools.queue; import co.aikar.commands.BukkitCommandIssuer; import org.bukkit.command.CommandSender; diff --git a/src/main/java/com/onarandombox/MultiverseCore/commandtools/queue/package-info.java b/src/main/java/org/mvplugins/multiverse/core/commandtools/queue/package-info.java similarity index 55% rename from src/main/java/com/onarandombox/MultiverseCore/commandtools/queue/package-info.java rename to src/main/java/org/mvplugins/multiverse/core/commandtools/queue/package-info.java index 4736130a..65b22369 100644 --- a/src/main/java/com/onarandombox/MultiverseCore/commandtools/queue/package-info.java +++ b/src/main/java/org/mvplugins/multiverse/core/commandtools/queue/package-info.java @@ -1,4 +1,4 @@ /** * Manager queuing of dangerous commands in need of confirmation. */ -package com.onarandombox.MultiverseCore.commandtools.queue; +package org.mvplugins.multiverse.core.commandtools.queue; diff --git a/src/main/java/com/onarandombox/MultiverseCore/config/MVCoreConfig.java b/src/main/java/org/mvplugins/multiverse/core/config/MVCoreConfig.java similarity index 92% rename from src/main/java/com/onarandombox/MultiverseCore/config/MVCoreConfig.java rename to src/main/java/org/mvplugins/multiverse/core/config/MVCoreConfig.java index 1e713b84..a64e35b9 100644 --- a/src/main/java/com/onarandombox/MultiverseCore/config/MVCoreConfig.java +++ b/src/main/java/org/mvplugins/multiverse/core/config/MVCoreConfig.java @@ -1,25 +1,25 @@ -package com.onarandombox.MultiverseCore.config; +package org.mvplugins.multiverse.core.config; import java.io.IOException; import java.nio.file.Files; import java.nio.file.Path; import com.dumptruckman.minecraft.util.Logging; -import com.onarandombox.MultiverseCore.MultiverseCore; -import com.onarandombox.MultiverseCore.api.MVConfig; -import com.onarandombox.MultiverseCore.configuration.handle.CommentedYamlConfigHandle; -import com.onarandombox.MultiverseCore.configuration.migration.BooleanMigratorAction; -import com.onarandombox.MultiverseCore.configuration.migration.ConfigMigrator; -import com.onarandombox.MultiverseCore.configuration.migration.IntegerMigratorAction; -import com.onarandombox.MultiverseCore.configuration.migration.InvertBoolMigratorAction; -import com.onarandombox.MultiverseCore.configuration.migration.MoveMigratorAction; -import com.onarandombox.MultiverseCore.configuration.migration.VersionMigrator; -import com.onarandombox.MultiverseCore.configuration.node.NodeGroup; import io.vavr.control.Try; 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; +import org.mvplugins.multiverse.core.configuration.migration.BooleanMigratorAction; +import org.mvplugins.multiverse.core.configuration.migration.ConfigMigrator; +import org.mvplugins.multiverse.core.configuration.migration.IntegerMigratorAction; +import org.mvplugins.multiverse.core.configuration.migration.InvertBoolMigratorAction; +import org.mvplugins.multiverse.core.configuration.migration.MoveMigratorAction; +import org.mvplugins.multiverse.core.configuration.migration.VersionMigrator; +import org.mvplugins.multiverse.core.configuration.node.NodeGroup; @Service public class MVCoreConfig implements MVConfig { diff --git a/src/main/java/com/onarandombox/MultiverseCore/config/MVCoreConfigNodes.java b/src/main/java/org/mvplugins/multiverse/core/config/MVCoreConfigNodes.java similarity index 96% rename from src/main/java/com/onarandombox/MultiverseCore/config/MVCoreConfigNodes.java rename to src/main/java/org/mvplugins/multiverse/core/config/MVCoreConfigNodes.java index 9893a588..1d2aa88a 100644 --- a/src/main/java/com/onarandombox/MultiverseCore/config/MVCoreConfigNodes.java +++ b/src/main/java/org/mvplugins/multiverse/core/config/MVCoreConfigNodes.java @@ -1,14 +1,14 @@ -package com.onarandombox.MultiverseCore.config; +package org.mvplugins.multiverse.core.config; import com.dumptruckman.minecraft.util.Logging; -import com.onarandombox.MultiverseCore.configuration.node.ConfigHeaderNode; -import com.onarandombox.MultiverseCore.configuration.node.ConfigNode; -import com.onarandombox.MultiverseCore.configuration.node.Node; -import com.onarandombox.MultiverseCore.configuration.node.NodeGroup; -import com.onarandombox.MultiverseCore.event.MVDebugModeEvent; -import com.onarandombox.MultiverseCore.exceptions.MultiverseException; 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; +import org.mvplugins.multiverse.core.configuration.node.NodeGroup; +import org.mvplugins.multiverse.core.event.MVDebugModeEvent; +import org.mvplugins.multiverse.core.exceptions.MultiverseException; class MVCoreConfigNodes { diff --git a/src/main/java/org/mvplugins/multiverse/core/config/package-info.java b/src/main/java/org/mvplugins/multiverse/core/config/package-info.java new file mode 100644 index 00000000..87558785 --- /dev/null +++ b/src/main/java/org/mvplugins/multiverse/core/config/package-info.java @@ -0,0 +1 @@ +package org.mvplugins.multiverse.core.config; diff --git a/src/main/java/com/onarandombox/MultiverseCore/configuration/handle/CommentedYamlConfigHandle.java b/src/main/java/org/mvplugins/multiverse/core/configuration/handle/CommentedYamlConfigHandle.java similarity index 90% rename from src/main/java/com/onarandombox/MultiverseCore/configuration/handle/CommentedYamlConfigHandle.java rename to src/main/java/org/mvplugins/multiverse/core/configuration/handle/CommentedYamlConfigHandle.java index a35daa88..ed5292cc 100644 --- a/src/main/java/com/onarandombox/MultiverseCore/configuration/handle/CommentedYamlConfigHandle.java +++ b/src/main/java/org/mvplugins/multiverse/core/configuration/handle/CommentedYamlConfigHandle.java @@ -1,18 +1,18 @@ -package com.onarandombox.MultiverseCore.configuration.handle; +package org.mvplugins.multiverse.core.configuration.handle; import java.io.IOException; import java.nio.file.Path; import java.util.logging.Logger; import com.dumptruckman.minecraft.util.Logging; -import com.onarandombox.MultiverseCore.configuration.migration.ConfigMigrator; -import com.onarandombox.MultiverseCore.configuration.node.CommentedNode; -import com.onarandombox.MultiverseCore.configuration.node.NodeGroup; -import com.onarandombox.MultiverseCore.configuration.node.ValueNode; 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; +import org.mvplugins.multiverse.core.configuration.node.ValueNode; /** * Configuration handle for commented YAML files. diff --git a/src/main/java/com/onarandombox/MultiverseCore/configuration/handle/ConfigurationSectionHandle.java b/src/main/java/org/mvplugins/multiverse/core/configuration/handle/ConfigurationSectionHandle.java similarity index 91% rename from src/main/java/com/onarandombox/MultiverseCore/configuration/handle/ConfigurationSectionHandle.java rename to src/main/java/org/mvplugins/multiverse/core/configuration/handle/ConfigurationSectionHandle.java index eeb79fb6..f8cc2be1 100644 --- a/src/main/java/com/onarandombox/MultiverseCore/configuration/handle/ConfigurationSectionHandle.java +++ b/src/main/java/org/mvplugins/multiverse/core/configuration/handle/ConfigurationSectionHandle.java @@ -1,13 +1,13 @@ -package com.onarandombox.MultiverseCore.configuration.handle; +package org.mvplugins.multiverse.core.configuration.handle; import java.util.logging.Logger; -import com.onarandombox.MultiverseCore.configuration.migration.ConfigMigrator; -import com.onarandombox.MultiverseCore.configuration.node.NodeGroup; 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; /** * Configuration handle for a single configuration section. diff --git a/src/main/java/com/onarandombox/MultiverseCore/configuration/handle/FileConfigHandle.java b/src/main/java/org/mvplugins/multiverse/core/configuration/handle/FileConfigHandle.java similarity index 93% rename from src/main/java/com/onarandombox/MultiverseCore/configuration/handle/FileConfigHandle.java rename to src/main/java/org/mvplugins/multiverse/core/configuration/handle/FileConfigHandle.java index 82d30dd8..877d4eee 100644 --- a/src/main/java/com/onarandombox/MultiverseCore/configuration/handle/FileConfigHandle.java +++ b/src/main/java/org/mvplugins/multiverse/core/configuration/handle/FileConfigHandle.java @@ -1,17 +1,17 @@ -package com.onarandombox.MultiverseCore.configuration.handle; +package org.mvplugins.multiverse.core.configuration.handle; import java.io.File; import java.io.IOException; import java.nio.file.Path; import java.util.logging.Logger; -import com.onarandombox.MultiverseCore.configuration.migration.ConfigMigrator; -import com.onarandombox.MultiverseCore.configuration.node.NodeGroup; import io.vavr.control.Try; 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; /** * Generic configuration handle for file based configurations. diff --git a/src/main/java/com/onarandombox/MultiverseCore/configuration/handle/GenericConfigHandle.java b/src/main/java/org/mvplugins/multiverse/core/configuration/handle/GenericConfigHandle.java similarity index 94% rename from src/main/java/com/onarandombox/MultiverseCore/configuration/handle/GenericConfigHandle.java rename to src/main/java/org/mvplugins/multiverse/core/configuration/handle/GenericConfigHandle.java index 5d35b73f..3bd8de58 100644 --- a/src/main/java/com/onarandombox/MultiverseCore/configuration/handle/GenericConfigHandle.java +++ b/src/main/java/org/mvplugins/multiverse/core/configuration/handle/GenericConfigHandle.java @@ -1,16 +1,16 @@ -package com.onarandombox.MultiverseCore.configuration.handle; +package org.mvplugins.multiverse.core.configuration.handle; import java.util.logging.Logger; -import com.onarandombox.MultiverseCore.configuration.migration.ConfigMigrator; -import com.onarandombox.MultiverseCore.configuration.node.ConfigNodeNotFoundException; -import com.onarandombox.MultiverseCore.configuration.node.NodeGroup; -import com.onarandombox.MultiverseCore.configuration.node.ValueNode; import io.vavr.control.Try; 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; +import org.mvplugins.multiverse.core.configuration.node.ValueNode; /** * Generic configuration handle for all ConfigurationSection types. diff --git a/src/main/java/com/onarandombox/MultiverseCore/configuration/handle/YamlConfigHandle.java b/src/main/java/org/mvplugins/multiverse/core/configuration/handle/YamlConfigHandle.java similarity index 89% rename from src/main/java/com/onarandombox/MultiverseCore/configuration/handle/YamlConfigHandle.java rename to src/main/java/org/mvplugins/multiverse/core/configuration/handle/YamlConfigHandle.java index edbfc82f..c77837b2 100644 --- a/src/main/java/com/onarandombox/MultiverseCore/configuration/handle/YamlConfigHandle.java +++ b/src/main/java/org/mvplugins/multiverse/core/configuration/handle/YamlConfigHandle.java @@ -1,16 +1,16 @@ -package com.onarandombox.MultiverseCore.configuration.handle; +package org.mvplugins.multiverse.core.configuration.handle; import java.io.IOException; import java.nio.file.Path; import java.util.logging.Logger; -import com.onarandombox.MultiverseCore.configuration.migration.ConfigMigrator; -import com.onarandombox.MultiverseCore.configuration.node.NodeGroup; import io.vavr.control.Try; 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; /** * Configuration handle for YAML files. diff --git a/src/main/java/org/mvplugins/multiverse/core/configuration/handle/package-info.java b/src/main/java/org/mvplugins/multiverse/core/configuration/handle/package-info.java new file mode 100644 index 00000000..23277a80 --- /dev/null +++ b/src/main/java/org/mvplugins/multiverse/core/configuration/handle/package-info.java @@ -0,0 +1 @@ +package org.mvplugins.multiverse.core.configuration.handle; diff --git a/src/main/java/com/onarandombox/MultiverseCore/configuration/migration/BooleanMigratorAction.java b/src/main/java/org/mvplugins/multiverse/core/configuration/migration/BooleanMigratorAction.java similarity index 91% rename from src/main/java/com/onarandombox/MultiverseCore/configuration/migration/BooleanMigratorAction.java rename to src/main/java/org/mvplugins/multiverse/core/configuration/migration/BooleanMigratorAction.java index 079db07f..bcca444b 100644 --- a/src/main/java/com/onarandombox/MultiverseCore/configuration/migration/BooleanMigratorAction.java +++ b/src/main/java/org/mvplugins/multiverse/core/configuration/migration/BooleanMigratorAction.java @@ -1,4 +1,4 @@ -package com.onarandombox.MultiverseCore.configuration.migration; +package org.mvplugins.multiverse.core.configuration.migration; import co.aikar.commands.ACFUtil; import com.dumptruckman.minecraft.util.Logging; diff --git a/src/main/java/com/onarandombox/MultiverseCore/configuration/migration/ConfigMigrator.java b/src/main/java/org/mvplugins/multiverse/core/configuration/migration/ConfigMigrator.java similarity index 95% rename from src/main/java/com/onarandombox/MultiverseCore/configuration/migration/ConfigMigrator.java rename to src/main/java/org/mvplugins/multiverse/core/configuration/migration/ConfigMigrator.java index b5391449..56063cdc 100644 --- a/src/main/java/com/onarandombox/MultiverseCore/configuration/migration/ConfigMigrator.java +++ b/src/main/java/org/mvplugins/multiverse/core/configuration/migration/ConfigMigrator.java @@ -1,11 +1,11 @@ -package com.onarandombox.MultiverseCore.configuration.migration; +package org.mvplugins.multiverse.core.configuration.migration; import java.util.ArrayList; import java.util.List; import com.dumptruckman.minecraft.util.Logging; -import com.onarandombox.MultiverseCore.configuration.node.ValueNode; import org.bukkit.configuration.ConfigurationSection; +import org.mvplugins.multiverse.core.configuration.node.ValueNode; /** * Helper class for migrating configs to the latest config version. diff --git a/src/main/java/com/onarandombox/MultiverseCore/configuration/migration/IntegerMigratorAction.java b/src/main/java/org/mvplugins/multiverse/core/configuration/migration/IntegerMigratorAction.java similarity index 91% rename from src/main/java/com/onarandombox/MultiverseCore/configuration/migration/IntegerMigratorAction.java rename to src/main/java/org/mvplugins/multiverse/core/configuration/migration/IntegerMigratorAction.java index fc101092..a2f6b590 100644 --- a/src/main/java/com/onarandombox/MultiverseCore/configuration/migration/IntegerMigratorAction.java +++ b/src/main/java/org/mvplugins/multiverse/core/configuration/migration/IntegerMigratorAction.java @@ -1,4 +1,4 @@ -package com.onarandombox.MultiverseCore.configuration.migration; +package org.mvplugins.multiverse.core.configuration.migration; import co.aikar.commands.ACFUtil; import com.dumptruckman.minecraft.util.Logging; diff --git a/src/main/java/com/onarandombox/MultiverseCore/configuration/migration/InvertBoolMigratorAction.java b/src/main/java/org/mvplugins/multiverse/core/configuration/migration/InvertBoolMigratorAction.java similarity index 93% rename from src/main/java/com/onarandombox/MultiverseCore/configuration/migration/InvertBoolMigratorAction.java rename to src/main/java/org/mvplugins/multiverse/core/configuration/migration/InvertBoolMigratorAction.java index ac870c64..0520c71a 100644 --- a/src/main/java/com/onarandombox/MultiverseCore/configuration/migration/InvertBoolMigratorAction.java +++ b/src/main/java/org/mvplugins/multiverse/core/configuration/migration/InvertBoolMigratorAction.java @@ -1,4 +1,4 @@ -package com.onarandombox.MultiverseCore.configuration.migration; +package org.mvplugins.multiverse.core.configuration.migration; import com.dumptruckman.minecraft.util.Logging; import org.bukkit.configuration.ConfigurationSection; diff --git a/src/main/java/com/onarandombox/MultiverseCore/configuration/migration/LongMigratorAction.java b/src/main/java/org/mvplugins/multiverse/core/configuration/migration/LongMigratorAction.java similarity index 91% rename from src/main/java/com/onarandombox/MultiverseCore/configuration/migration/LongMigratorAction.java rename to src/main/java/org/mvplugins/multiverse/core/configuration/migration/LongMigratorAction.java index 3f111423..14f76279 100644 --- a/src/main/java/com/onarandombox/MultiverseCore/configuration/migration/LongMigratorAction.java +++ b/src/main/java/org/mvplugins/multiverse/core/configuration/migration/LongMigratorAction.java @@ -1,4 +1,4 @@ -package com.onarandombox.MultiverseCore.configuration.migration; +package org.mvplugins.multiverse.core.configuration.migration; import co.aikar.commands.ACFUtil; import com.dumptruckman.minecraft.util.Logging; diff --git a/src/main/java/com/onarandombox/MultiverseCore/configuration/migration/MigratorAction.java b/src/main/java/org/mvplugins/multiverse/core/configuration/migration/MigratorAction.java similarity index 84% rename from src/main/java/com/onarandombox/MultiverseCore/configuration/migration/MigratorAction.java rename to src/main/java/org/mvplugins/multiverse/core/configuration/migration/MigratorAction.java index 2b18f422..c0596f4d 100644 --- a/src/main/java/com/onarandombox/MultiverseCore/configuration/migration/MigratorAction.java +++ b/src/main/java/org/mvplugins/multiverse/core/configuration/migration/MigratorAction.java @@ -1,4 +1,4 @@ -package com.onarandombox.MultiverseCore.configuration.migration; +package org.mvplugins.multiverse.core.configuration.migration; import org.bukkit.configuration.ConfigurationSection; diff --git a/src/main/java/com/onarandombox/MultiverseCore/configuration/migration/MoveMigratorAction.java b/src/main/java/org/mvplugins/multiverse/core/configuration/migration/MoveMigratorAction.java similarity index 95% rename from src/main/java/com/onarandombox/MultiverseCore/configuration/migration/MoveMigratorAction.java rename to src/main/java/org/mvplugins/multiverse/core/configuration/migration/MoveMigratorAction.java index 40c9da52..989d8a61 100644 --- a/src/main/java/com/onarandombox/MultiverseCore/configuration/migration/MoveMigratorAction.java +++ b/src/main/java/org/mvplugins/multiverse/core/configuration/migration/MoveMigratorAction.java @@ -1,4 +1,4 @@ -package com.onarandombox.MultiverseCore.configuration.migration; +package org.mvplugins.multiverse.core.configuration.migration; import java.util.Optional; diff --git a/src/main/java/com/onarandombox/MultiverseCore/configuration/migration/NullStringMigratorAction.java b/src/main/java/org/mvplugins/multiverse/core/configuration/migration/NullStringMigratorAction.java similarity index 92% rename from src/main/java/com/onarandombox/MultiverseCore/configuration/migration/NullStringMigratorAction.java rename to src/main/java/org/mvplugins/multiverse/core/configuration/migration/NullStringMigratorAction.java index e47657be..4d15b19b 100644 --- a/src/main/java/com/onarandombox/MultiverseCore/configuration/migration/NullStringMigratorAction.java +++ b/src/main/java/org/mvplugins/multiverse/core/configuration/migration/NullStringMigratorAction.java @@ -1,4 +1,4 @@ -package com.onarandombox.MultiverseCore.configuration.migration; +package org.mvplugins.multiverse.core.configuration.migration; import com.dumptruckman.minecraft.util.Logging; import org.bukkit.configuration.ConfigurationSection; diff --git a/src/main/java/com/onarandombox/MultiverseCore/configuration/migration/VersionMigrator.java b/src/main/java/org/mvplugins/multiverse/core/configuration/migration/VersionMigrator.java similarity index 97% rename from src/main/java/com/onarandombox/MultiverseCore/configuration/migration/VersionMigrator.java rename to src/main/java/org/mvplugins/multiverse/core/configuration/migration/VersionMigrator.java index 453f63b0..dcb2c5d3 100644 --- a/src/main/java/com/onarandombox/MultiverseCore/configuration/migration/VersionMigrator.java +++ b/src/main/java/org/mvplugins/multiverse/core/configuration/migration/VersionMigrator.java @@ -1,4 +1,4 @@ -package com.onarandombox.MultiverseCore.configuration.migration; +package org.mvplugins.multiverse.core.configuration.migration; import java.util.ArrayList; import java.util.List; diff --git a/src/main/java/org/mvplugins/multiverse/core/configuration/migration/package-info.java b/src/main/java/org/mvplugins/multiverse/core/configuration/migration/package-info.java new file mode 100644 index 00000000..73deddec --- /dev/null +++ b/src/main/java/org/mvplugins/multiverse/core/configuration/migration/package-info.java @@ -0,0 +1 @@ +package org.mvplugins.multiverse.core.configuration.migration; diff --git a/src/main/java/com/onarandombox/MultiverseCore/configuration/node/CommentedNode.java b/src/main/java/org/mvplugins/multiverse/core/configuration/node/CommentedNode.java similarity index 79% rename from src/main/java/com/onarandombox/MultiverseCore/configuration/node/CommentedNode.java rename to src/main/java/org/mvplugins/multiverse/core/configuration/node/CommentedNode.java index 80a085ed..21b3d6f0 100644 --- a/src/main/java/com/onarandombox/MultiverseCore/configuration/node/CommentedNode.java +++ b/src/main/java/org/mvplugins/multiverse/core/configuration/node/CommentedNode.java @@ -1,4 +1,4 @@ -package com.onarandombox.MultiverseCore.configuration.node; +package org.mvplugins.multiverse.core.configuration.node; import org.jetbrains.annotations.NotNull; diff --git a/src/main/java/com/onarandombox/MultiverseCore/configuration/node/ConfigHeaderNode.java b/src/main/java/org/mvplugins/multiverse/core/configuration/node/ConfigHeaderNode.java similarity index 97% rename from src/main/java/com/onarandombox/MultiverseCore/configuration/node/ConfigHeaderNode.java rename to src/main/java/org/mvplugins/multiverse/core/configuration/node/ConfigHeaderNode.java index 00b330ab..dac5b685 100644 --- a/src/main/java/com/onarandombox/MultiverseCore/configuration/node/ConfigHeaderNode.java +++ b/src/main/java/org/mvplugins/multiverse/core/configuration/node/ConfigHeaderNode.java @@ -1,4 +1,4 @@ -package com.onarandombox.MultiverseCore.configuration.node; +package org.mvplugins.multiverse.core.configuration.node; import java.util.ArrayList; import java.util.List; diff --git a/src/main/java/com/onarandombox/MultiverseCore/configuration/node/ConfigNode.java b/src/main/java/org/mvplugins/multiverse/core/configuration/node/ConfigNode.java similarity index 98% rename from src/main/java/com/onarandombox/MultiverseCore/configuration/node/ConfigNode.java rename to src/main/java/org/mvplugins/multiverse/core/configuration/node/ConfigNode.java index f9efbd22..b20b377f 100644 --- a/src/main/java/com/onarandombox/MultiverseCore/configuration/node/ConfigNode.java +++ b/src/main/java/org/mvplugins/multiverse/core/configuration/node/ConfigNode.java @@ -1,4 +1,4 @@ -package com.onarandombox.MultiverseCore.configuration.node; +package org.mvplugins.multiverse.core.configuration.node; import java.util.function.BiConsumer; import java.util.function.Function; diff --git a/src/main/java/com/onarandombox/MultiverseCore/configuration/node/ConfigNodeNotFoundException.java b/src/main/java/org/mvplugins/multiverse/core/configuration/node/ConfigNodeNotFoundException.java similarity index 50% rename from src/main/java/com/onarandombox/MultiverseCore/configuration/node/ConfigNodeNotFoundException.java rename to src/main/java/org/mvplugins/multiverse/core/configuration/node/ConfigNodeNotFoundException.java index 1bfb59bd..557fffab 100644 --- a/src/main/java/com/onarandombox/MultiverseCore/configuration/node/ConfigNodeNotFoundException.java +++ b/src/main/java/org/mvplugins/multiverse/core/configuration/node/ConfigNodeNotFoundException.java @@ -1,10 +1,10 @@ -package com.onarandombox.MultiverseCore.configuration.node; +package org.mvplugins.multiverse.core.configuration.node; -import static com.onarandombox.MultiverseCore.utils.MVCorei18n.CONFIG_NODE_NOTFOUND; -import static com.onarandombox.MultiverseCore.utils.message.MessageReplacement.replace; +import static org.mvplugins.multiverse.core.utils.MVCorei18n.CONFIG_NODE_NOTFOUND; +import static org.mvplugins.multiverse.core.utils.message.MessageReplacement.replace; -import com.onarandombox.MultiverseCore.exceptions.MultiverseException; import org.jetbrains.annotations.Nullable; +import org.mvplugins.multiverse.core.exceptions.MultiverseException; public class ConfigNodeNotFoundException extends MultiverseException { diff --git a/src/main/java/com/onarandombox/MultiverseCore/configuration/node/EnumNodeSerializer.java b/src/main/java/org/mvplugins/multiverse/core/configuration/node/EnumNodeSerializer.java similarity index 85% rename from src/main/java/com/onarandombox/MultiverseCore/configuration/node/EnumNodeSerializer.java rename to src/main/java/org/mvplugins/multiverse/core/configuration/node/EnumNodeSerializer.java index 3f08afbb..9e157412 100644 --- a/src/main/java/com/onarandombox/MultiverseCore/configuration/node/EnumNodeSerializer.java +++ b/src/main/java/org/mvplugins/multiverse/core/configuration/node/EnumNodeSerializer.java @@ -1,4 +1,4 @@ -package com.onarandombox.MultiverseCore.configuration.node; +package org.mvplugins.multiverse.core.configuration.node; public class EnumNodeSerializer> implements NodeSerializer { diff --git a/src/main/java/com/onarandombox/MultiverseCore/configuration/node/Node.java b/src/main/java/org/mvplugins/multiverse/core/configuration/node/Node.java similarity index 77% rename from src/main/java/com/onarandombox/MultiverseCore/configuration/node/Node.java rename to src/main/java/org/mvplugins/multiverse/core/configuration/node/Node.java index 790b2de4..bd1c2344 100644 --- a/src/main/java/com/onarandombox/MultiverseCore/configuration/node/Node.java +++ b/src/main/java/org/mvplugins/multiverse/core/configuration/node/Node.java @@ -1,4 +1,4 @@ -package com.onarandombox.MultiverseCore.configuration.node; +package org.mvplugins.multiverse.core.configuration.node; import org.jetbrains.annotations.NotNull; diff --git a/src/main/java/com/onarandombox/MultiverseCore/configuration/node/NodeGroup.java b/src/main/java/org/mvplugins/multiverse/core/configuration/node/NodeGroup.java similarity index 98% rename from src/main/java/com/onarandombox/MultiverseCore/configuration/node/NodeGroup.java rename to src/main/java/org/mvplugins/multiverse/core/configuration/node/NodeGroup.java index 597127f1..82e44363 100644 --- a/src/main/java/com/onarandombox/MultiverseCore/configuration/node/NodeGroup.java +++ b/src/main/java/org/mvplugins/multiverse/core/configuration/node/NodeGroup.java @@ -1,4 +1,4 @@ -package com.onarandombox.MultiverseCore.configuration.node; +package org.mvplugins.multiverse.core.configuration.node; import java.util.ArrayList; import java.util.Collection; diff --git a/src/main/java/com/onarandombox/MultiverseCore/configuration/node/NodeSerializer.java b/src/main/java/org/mvplugins/multiverse/core/configuration/node/NodeSerializer.java similarity index 69% rename from src/main/java/com/onarandombox/MultiverseCore/configuration/node/NodeSerializer.java rename to src/main/java/org/mvplugins/multiverse/core/configuration/node/NodeSerializer.java index a98a3cc6..fbcaa95f 100644 --- a/src/main/java/com/onarandombox/MultiverseCore/configuration/node/NodeSerializer.java +++ b/src/main/java/org/mvplugins/multiverse/core/configuration/node/NodeSerializer.java @@ -1,4 +1,4 @@ -package com.onarandombox.MultiverseCore.configuration.node; +package org.mvplugins.multiverse.core.configuration.node; public interface NodeSerializer { T deserialize(Object object, Class type); diff --git a/src/main/java/com/onarandombox/MultiverseCore/configuration/node/ValueNode.java b/src/main/java/org/mvplugins/multiverse/core/configuration/node/ValueNode.java similarity index 95% rename from src/main/java/com/onarandombox/MultiverseCore/configuration/node/ValueNode.java rename to src/main/java/org/mvplugins/multiverse/core/configuration/node/ValueNode.java index ffacb760..d7c2a105 100644 --- a/src/main/java/com/onarandombox/MultiverseCore/configuration/node/ValueNode.java +++ b/src/main/java/org/mvplugins/multiverse/core/configuration/node/ValueNode.java @@ -1,4 +1,4 @@ -package com.onarandombox.MultiverseCore.configuration.node; +package org.mvplugins.multiverse.core.configuration.node; import io.vavr.control.Option; import io.vavr.control.Try; diff --git a/src/main/java/org/mvplugins/multiverse/core/configuration/node/package-info.java b/src/main/java/org/mvplugins/multiverse/core/configuration/node/package-info.java new file mode 100644 index 00000000..3da94747 --- /dev/null +++ b/src/main/java/org/mvplugins/multiverse/core/configuration/node/package-info.java @@ -0,0 +1 @@ +package org.mvplugins.multiverse.core.configuration.node; diff --git a/src/main/java/com/onarandombox/MultiverseCore/destination/DestinationsProvider.java b/src/main/java/org/mvplugins/multiverse/core/destination/DestinationsProvider.java similarity index 95% rename from src/main/java/com/onarandombox/MultiverseCore/destination/DestinationsProvider.java rename to src/main/java/org/mvplugins/multiverse/core/destination/DestinationsProvider.java index cd09205a..787c32ce 100644 --- a/src/main/java/com/onarandombox/MultiverseCore/destination/DestinationsProvider.java +++ b/src/main/java/org/mvplugins/multiverse/core/destination/DestinationsProvider.java @@ -1,4 +1,4 @@ -package com.onarandombox.MultiverseCore.destination; +package org.mvplugins.multiverse.core.destination; import java.util.Collection; import java.util.HashMap; @@ -8,11 +8,6 @@ import java.util.stream.Collectors; import co.aikar.commands.BukkitCommandIssuer; import co.aikar.commands.CommandIssuer; -import com.onarandombox.MultiverseCore.api.Destination; -import com.onarandombox.MultiverseCore.api.DestinationInstance; -import com.onarandombox.MultiverseCore.api.SafeTTeleporter; -import com.onarandombox.MultiverseCore.api.Teleporter; -import com.onarandombox.MultiverseCore.teleportation.TeleportResult; import jakarta.inject.Inject; import org.bukkit.entity.Entity; import org.bukkit.entity.Player; @@ -21,6 +16,11 @@ 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; +import org.mvplugins.multiverse.core.api.Teleporter; +import org.mvplugins.multiverse.core.teleportation.TeleportResult; /** * Provides destinations for teleportation. diff --git a/src/main/java/com/onarandombox/MultiverseCore/destination/ParsedDestination.java b/src/main/java/org/mvplugins/multiverse/core/destination/ParsedDestination.java similarity index 92% rename from src/main/java/com/onarandombox/MultiverseCore/destination/ParsedDestination.java rename to src/main/java/org/mvplugins/multiverse/core/destination/ParsedDestination.java index 47b71dd4..fa706178 100644 --- a/src/main/java/com/onarandombox/MultiverseCore/destination/ParsedDestination.java +++ b/src/main/java/org/mvplugins/multiverse/core/destination/ParsedDestination.java @@ -1,11 +1,11 @@ -package com.onarandombox.MultiverseCore.destination; +package org.mvplugins.multiverse.core.destination; -import com.onarandombox.MultiverseCore.api.Destination; -import com.onarandombox.MultiverseCore.api.DestinationInstance; 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; /** * A parsed destination. diff --git a/src/main/java/com/onarandombox/MultiverseCore/destination/core/AnchorDestination.java b/src/main/java/org/mvplugins/multiverse/core/destination/core/AnchorDestination.java similarity index 87% rename from src/main/java/com/onarandombox/MultiverseCore/destination/core/AnchorDestination.java rename to src/main/java/org/mvplugins/multiverse/core/destination/core/AnchorDestination.java index c6db2fd7..e1ca18bf 100644 --- a/src/main/java/com/onarandombox/MultiverseCore/destination/core/AnchorDestination.java +++ b/src/main/java/org/mvplugins/multiverse/core/destination/core/AnchorDestination.java @@ -1,16 +1,16 @@ -package com.onarandombox.MultiverseCore.destination.core; +package org.mvplugins.multiverse.core.destination.core; import java.util.Collection; import co.aikar.commands.BukkitCommandIssuer; -import com.onarandombox.MultiverseCore.anchor.AnchorManager; -import com.onarandombox.MultiverseCore.api.Destination; -import com.onarandombox.MultiverseCore.api.Teleporter; import jakarta.inject.Inject; 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; /** * {@link Destination} implementation for anchors. diff --git a/src/main/java/com/onarandombox/MultiverseCore/destination/core/AnchorDestinationInstance.java b/src/main/java/org/mvplugins/multiverse/core/destination/core/AnchorDestinationInstance.java similarity index 91% rename from src/main/java/com/onarandombox/MultiverseCore/destination/core/AnchorDestinationInstance.java rename to src/main/java/org/mvplugins/multiverse/core/destination/core/AnchorDestinationInstance.java index ebcdb3a3..1aa9bc06 100644 --- a/src/main/java/com/onarandombox/MultiverseCore/destination/core/AnchorDestinationInstance.java +++ b/src/main/java/org/mvplugins/multiverse/core/destination/core/AnchorDestinationInstance.java @@ -1,11 +1,11 @@ -package com.onarandombox.MultiverseCore.destination.core; +package org.mvplugins.multiverse.core.destination.core; -import com.onarandombox.MultiverseCore.api.DestinationInstance; import org.bukkit.Location; 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; /** * Destination instance implementation for the {@link AnchorDestination}. diff --git a/src/main/java/com/onarandombox/MultiverseCore/destination/core/BedDestination.java b/src/main/java/org/mvplugins/multiverse/core/destination/core/BedDestination.java similarity index 88% rename from src/main/java/com/onarandombox/MultiverseCore/destination/core/BedDestination.java rename to src/main/java/org/mvplugins/multiverse/core/destination/core/BedDestination.java index 11586c64..cc80a789 100644 --- a/src/main/java/com/onarandombox/MultiverseCore/destination/core/BedDestination.java +++ b/src/main/java/org/mvplugins/multiverse/core/destination/core/BedDestination.java @@ -1,18 +1,18 @@ -package com.onarandombox.MultiverseCore.destination.core; +package org.mvplugins.multiverse.core.destination.core; import java.util.Collection; import java.util.List; import java.util.stream.Collectors; import co.aikar.commands.BukkitCommandIssuer; -import com.onarandombox.MultiverseCore.api.Destination; -import com.onarandombox.MultiverseCore.api.Teleporter; -import com.onarandombox.MultiverseCore.utils.PlayerFinder; import org.bukkit.Bukkit; 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; /** * {@link Destination} implementation for beds. diff --git a/src/main/java/com/onarandombox/MultiverseCore/destination/core/BedDestinationInstance.java b/src/main/java/org/mvplugins/multiverse/core/destination/core/BedDestinationInstance.java similarity index 92% rename from src/main/java/com/onarandombox/MultiverseCore/destination/core/BedDestinationInstance.java rename to src/main/java/org/mvplugins/multiverse/core/destination/core/BedDestinationInstance.java index edfea1dc..b5c95d0f 100644 --- a/src/main/java/com/onarandombox/MultiverseCore/destination/core/BedDestinationInstance.java +++ b/src/main/java/org/mvplugins/multiverse/core/destination/core/BedDestinationInstance.java @@ -1,12 +1,12 @@ -package com.onarandombox.MultiverseCore.destination.core; +package org.mvplugins.multiverse.core.destination.core; -import com.onarandombox.MultiverseCore.api.DestinationInstance; import org.bukkit.Location; import org.bukkit.entity.Entity; 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; /** * Destination instance implementation for the {@link BedDestination}. diff --git a/src/main/java/com/onarandombox/MultiverseCore/destination/core/CannonDestination.java b/src/main/java/org/mvplugins/multiverse/core/destination/core/CannonDestination.java similarity index 89% rename from src/main/java/com/onarandombox/MultiverseCore/destination/core/CannonDestination.java rename to src/main/java/org/mvplugins/multiverse/core/destination/core/CannonDestination.java index 4657f184..b00d9dae 100644 --- a/src/main/java/com/onarandombox/MultiverseCore/destination/core/CannonDestination.java +++ b/src/main/java/org/mvplugins/multiverse/core/destination/core/CannonDestination.java @@ -1,19 +1,19 @@ -package com.onarandombox.MultiverseCore.destination.core; +package org.mvplugins.multiverse.core.destination.core; import java.util.Collection; import java.util.Collections; import co.aikar.commands.BukkitCommandIssuer; -import com.onarandombox.MultiverseCore.api.Destination; -import com.onarandombox.MultiverseCore.api.Teleporter; -import com.onarandombox.MultiverseCore.worldnew.LoadedMultiverseWorld; -import com.onarandombox.MultiverseCore.worldnew.WorldManager; import jakarta.inject.Inject; import org.bukkit.Location; 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; +import org.mvplugins.multiverse.core.worldnew.WorldManager; /** * {@link Destination} implementation for cannons. diff --git a/src/main/java/com/onarandombox/MultiverseCore/destination/core/CannonDestinationInstance.java b/src/main/java/org/mvplugins/multiverse/core/destination/core/CannonDestinationInstance.java similarity index 94% rename from src/main/java/com/onarandombox/MultiverseCore/destination/core/CannonDestinationInstance.java rename to src/main/java/org/mvplugins/multiverse/core/destination/core/CannonDestinationInstance.java index 33c55f14..7d7b0248 100644 --- a/src/main/java/com/onarandombox/MultiverseCore/destination/core/CannonDestinationInstance.java +++ b/src/main/java/org/mvplugins/multiverse/core/destination/core/CannonDestinationInstance.java @@ -1,11 +1,11 @@ -package com.onarandombox.MultiverseCore.destination.core; +package org.mvplugins.multiverse.core.destination.core; -import com.onarandombox.MultiverseCore.api.DestinationInstance; import org.bukkit.Location; 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; /** * Destination instance implementation for the {@link CannonDestination}. diff --git a/src/main/java/com/onarandombox/MultiverseCore/destination/core/ExactDestination.java b/src/main/java/org/mvplugins/multiverse/core/destination/core/ExactDestination.java similarity index 90% rename from src/main/java/com/onarandombox/MultiverseCore/destination/core/ExactDestination.java rename to src/main/java/org/mvplugins/multiverse/core/destination/core/ExactDestination.java index 31a21efb..950a39c1 100644 --- a/src/main/java/com/onarandombox/MultiverseCore/destination/core/ExactDestination.java +++ b/src/main/java/org/mvplugins/multiverse/core/destination/core/ExactDestination.java @@ -1,19 +1,19 @@ -package com.onarandombox.MultiverseCore.destination.core; +package org.mvplugins.multiverse.core.destination.core; import java.util.Collection; import java.util.Collections; import co.aikar.commands.BukkitCommandIssuer; -import com.onarandombox.MultiverseCore.api.Destination; -import com.onarandombox.MultiverseCore.api.Teleporter; -import com.onarandombox.MultiverseCore.worldnew.LoadedMultiverseWorld; -import com.onarandombox.MultiverseCore.worldnew.WorldManager; import jakarta.inject.Inject; import org.bukkit.Location; 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; +import org.mvplugins.multiverse.core.worldnew.WorldManager; /** * {@link Destination} implementation for exact locations. diff --git a/src/main/java/com/onarandombox/MultiverseCore/destination/core/ExactDestinationInstance.java b/src/main/java/org/mvplugins/multiverse/core/destination/core/ExactDestinationInstance.java similarity index 91% rename from src/main/java/com/onarandombox/MultiverseCore/destination/core/ExactDestinationInstance.java rename to src/main/java/org/mvplugins/multiverse/core/destination/core/ExactDestinationInstance.java index 173122fe..d71ea7d5 100644 --- a/src/main/java/com/onarandombox/MultiverseCore/destination/core/ExactDestinationInstance.java +++ b/src/main/java/org/mvplugins/multiverse/core/destination/core/ExactDestinationInstance.java @@ -1,11 +1,11 @@ -package com.onarandombox.MultiverseCore.destination.core; +package org.mvplugins.multiverse.core.destination.core; -import com.onarandombox.MultiverseCore.api.DestinationInstance; import org.bukkit.Location; 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; /** * Destination instance implementation for the {@link ExactDestination}. diff --git a/src/main/java/com/onarandombox/MultiverseCore/destination/core/PlayerDestination.java b/src/main/java/org/mvplugins/multiverse/core/destination/core/PlayerDestination.java similarity index 87% rename from src/main/java/com/onarandombox/MultiverseCore/destination/core/PlayerDestination.java rename to src/main/java/org/mvplugins/multiverse/core/destination/core/PlayerDestination.java index 15803e57..084356c2 100644 --- a/src/main/java/com/onarandombox/MultiverseCore/destination/core/PlayerDestination.java +++ b/src/main/java/org/mvplugins/multiverse/core/destination/core/PlayerDestination.java @@ -1,17 +1,17 @@ -package com.onarandombox.MultiverseCore.destination.core; +package org.mvplugins.multiverse.core.destination.core; import java.util.Collection; import java.util.stream.Collectors; import co.aikar.commands.BukkitCommandIssuer; -import com.onarandombox.MultiverseCore.api.Destination; -import com.onarandombox.MultiverseCore.api.Teleporter; -import com.onarandombox.MultiverseCore.utils.PlayerFinder; import org.bukkit.Bukkit; 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; /** * {@link Destination} implementation for players.s diff --git a/src/main/java/com/onarandombox/MultiverseCore/destination/core/PlayerDestinationInstance.java b/src/main/java/org/mvplugins/multiverse/core/destination/core/PlayerDestinationInstance.java similarity index 90% rename from src/main/java/com/onarandombox/MultiverseCore/destination/core/PlayerDestinationInstance.java rename to src/main/java/org/mvplugins/multiverse/core/destination/core/PlayerDestinationInstance.java index c72c4962..be1f38ea 100644 --- a/src/main/java/com/onarandombox/MultiverseCore/destination/core/PlayerDestinationInstance.java +++ b/src/main/java/org/mvplugins/multiverse/core/destination/core/PlayerDestinationInstance.java @@ -1,12 +1,12 @@ -package com.onarandombox.MultiverseCore.destination.core; +package org.mvplugins.multiverse.core.destination.core; -import com.onarandombox.MultiverseCore.api.DestinationInstance; import org.bukkit.Location; import org.bukkit.entity.Entity; 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; /** * Destination instance implementation for the {@link PlayerDestination}. diff --git a/src/main/java/com/onarandombox/MultiverseCore/destination/core/WorldDestination.java b/src/main/java/org/mvplugins/multiverse/core/destination/core/WorldDestination.java similarity index 85% rename from src/main/java/com/onarandombox/MultiverseCore/destination/core/WorldDestination.java rename to src/main/java/org/mvplugins/multiverse/core/destination/core/WorldDestination.java index 060357fd..92585220 100644 --- a/src/main/java/com/onarandombox/MultiverseCore/destination/core/WorldDestination.java +++ b/src/main/java/org/mvplugins/multiverse/core/destination/core/WorldDestination.java @@ -1,18 +1,18 @@ -package com.onarandombox.MultiverseCore.destination.core; +package org.mvplugins.multiverse.core.destination.core; import java.util.Collection; import java.util.Collections; import co.aikar.commands.BukkitCommandIssuer; -import com.onarandombox.MultiverseCore.api.Destination; -import com.onarandombox.MultiverseCore.api.LocationManipulation; -import com.onarandombox.MultiverseCore.api.Teleporter; -import com.onarandombox.MultiverseCore.worldnew.LoadedMultiverseWorld; -import com.onarandombox.MultiverseCore.worldnew.WorldManager; 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; +import org.mvplugins.multiverse.core.worldnew.LoadedMultiverseWorld; +import org.mvplugins.multiverse.core.worldnew.WorldManager; /** * {@link Destination} implementation for exact locations. diff --git a/src/main/java/com/onarandombox/MultiverseCore/destination/core/WorldDestinationInstance.java b/src/main/java/org/mvplugins/multiverse/core/destination/core/WorldDestinationInstance.java similarity index 89% rename from src/main/java/com/onarandombox/MultiverseCore/destination/core/WorldDestinationInstance.java rename to src/main/java/org/mvplugins/multiverse/core/destination/core/WorldDestinationInstance.java index 18d92fe6..6314e18e 100644 --- a/src/main/java/com/onarandombox/MultiverseCore/destination/core/WorldDestinationInstance.java +++ b/src/main/java/org/mvplugins/multiverse/core/destination/core/WorldDestinationInstance.java @@ -1,12 +1,12 @@ -package com.onarandombox.MultiverseCore.destination.core; +package org.mvplugins.multiverse.core.destination.core; -import com.onarandombox.MultiverseCore.api.DestinationInstance; -import com.onarandombox.MultiverseCore.worldnew.LoadedMultiverseWorld; import org.bukkit.Location; 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; /** * Destination instance implementation for the {@link WorldDestination}. diff --git a/src/main/java/com/onarandombox/MultiverseCore/destination/core/package-info.java b/src/main/java/org/mvplugins/multiverse/core/destination/core/package-info.java similarity index 61% rename from src/main/java/com/onarandombox/MultiverseCore/destination/core/package-info.java rename to src/main/java/org/mvplugins/multiverse/core/destination/core/package-info.java index 48ebc056..8e2ae65a 100644 --- a/src/main/java/com/onarandombox/MultiverseCore/destination/core/package-info.java +++ b/src/main/java/org/mvplugins/multiverse/core/destination/core/package-info.java @@ -1,4 +1,4 @@ /** * This package contains the in-built implementations of the Destination interface. */ -package com.onarandombox.MultiverseCore.destination.core; +package org.mvplugins.multiverse.core.destination.core; diff --git a/src/main/java/com/onarandombox/MultiverseCore/destination/package-info.java b/src/main/java/org/mvplugins/multiverse/core/destination/package-info.java similarity index 51% rename from src/main/java/com/onarandombox/MultiverseCore/destination/package-info.java rename to src/main/java/org/mvplugins/multiverse/core/destination/package-info.java index 9c052b52..a3edd22c 100644 --- a/src/main/java/com/onarandombox/MultiverseCore/destination/package-info.java +++ b/src/main/java/org/mvplugins/multiverse/core/destination/package-info.java @@ -1,4 +1,4 @@ /** * This package contains all destination-types. */ -package com.onarandombox.MultiverseCore.destination; +package org.mvplugins.multiverse.core.destination; diff --git a/src/main/java/com/onarandombox/MultiverseCore/display/ContentDisplay.java b/src/main/java/org/mvplugins/multiverse/core/display/ContentDisplay.java similarity index 87% rename from src/main/java/com/onarandombox/MultiverseCore/display/ContentDisplay.java rename to src/main/java/org/mvplugins/multiverse/core/display/ContentDisplay.java index 373becc1..7ccb6eb5 100644 --- a/src/main/java/com/onarandombox/MultiverseCore/display/ContentDisplay.java +++ b/src/main/java/org/mvplugins/multiverse/core/display/ContentDisplay.java @@ -1,14 +1,14 @@ -package com.onarandombox.MultiverseCore.display; +package org.mvplugins.multiverse.core.display; import java.util.ArrayList; import java.util.List; import java.util.Objects; import co.aikar.commands.BukkitCommandIssuer; -import com.onarandombox.MultiverseCore.display.handlers.DefaultSendHandler; -import com.onarandombox.MultiverseCore.display.handlers.SendHandler; -import com.onarandombox.MultiverseCore.display.parsers.ContentProvider; 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; /** * Helps to display contents such as list and maps in a nicely formatted fashion. diff --git a/src/main/java/com/onarandombox/MultiverseCore/display/filters/ContentFilter.java b/src/main/java/org/mvplugins/multiverse/core/display/filters/ContentFilter.java similarity index 92% rename from src/main/java/com/onarandombox/MultiverseCore/display/filters/ContentFilter.java rename to src/main/java/org/mvplugins/multiverse/core/display/filters/ContentFilter.java index 5a3d2023..9f34e3c8 100644 --- a/src/main/java/com/onarandombox/MultiverseCore/display/filters/ContentFilter.java +++ b/src/main/java/org/mvplugins/multiverse/core/display/filters/ContentFilter.java @@ -1,4 +1,4 @@ -package com.onarandombox.MultiverseCore.display.filters; +package org.mvplugins.multiverse.core.display.filters; /** * Filter display content for it show only certain string. diff --git a/src/main/java/com/onarandombox/MultiverseCore/display/filters/DefaultContentFilter.java b/src/main/java/org/mvplugins/multiverse/core/display/filters/DefaultContentFilter.java similarity index 93% rename from src/main/java/com/onarandombox/MultiverseCore/display/filters/DefaultContentFilter.java rename to src/main/java/org/mvplugins/multiverse/core/display/filters/DefaultContentFilter.java index c0b51c8e..45eedd4f 100644 --- a/src/main/java/com/onarandombox/MultiverseCore/display/filters/DefaultContentFilter.java +++ b/src/main/java/org/mvplugins/multiverse/core/display/filters/DefaultContentFilter.java @@ -1,4 +1,4 @@ -package com.onarandombox.MultiverseCore.display.filters; +package org.mvplugins.multiverse.core.display.filters; /** * Default implementation of {@link ContentFilter} that doesn't filter anything. diff --git a/src/main/java/com/onarandombox/MultiverseCore/display/filters/RegexContentFilter.java b/src/main/java/org/mvplugins/multiverse/core/display/filters/RegexContentFilter.java similarity index 98% rename from src/main/java/com/onarandombox/MultiverseCore/display/filters/RegexContentFilter.java rename to src/main/java/org/mvplugins/multiverse/core/display/filters/RegexContentFilter.java index e3e28150..0bfdc0bc 100644 --- a/src/main/java/com/onarandombox/MultiverseCore/display/filters/RegexContentFilter.java +++ b/src/main/java/org/mvplugins/multiverse/core/display/filters/RegexContentFilter.java @@ -1,4 +1,4 @@ -package com.onarandombox.MultiverseCore.display.filters; +package org.mvplugins.multiverse.core.display.filters; import java.util.regex.Pattern; import java.util.regex.PatternSyntaxException; diff --git a/src/main/java/com/onarandombox/MultiverseCore/display/filters/package-info.java b/src/main/java/org/mvplugins/multiverse/core/display/filters/package-info.java similarity index 64% rename from src/main/java/com/onarandombox/MultiverseCore/display/filters/package-info.java rename to src/main/java/org/mvplugins/multiverse/core/display/filters/package-info.java index cd4fee12..7b81e16c 100644 --- a/src/main/java/com/onarandombox/MultiverseCore/display/filters/package-info.java +++ b/src/main/java/org/mvplugins/multiverse/core/display/filters/package-info.java @@ -1,4 +1,4 @@ /** * This package contains all the filters that can be used to choose specific data to display. */ -package com.onarandombox.MultiverseCore.display.filters; +package org.mvplugins.multiverse.core.display.filters; diff --git a/src/main/java/com/onarandombox/MultiverseCore/display/handlers/BaseSendHandler.java b/src/main/java/org/mvplugins/multiverse/core/display/handlers/BaseSendHandler.java similarity index 94% rename from src/main/java/com/onarandombox/MultiverseCore/display/handlers/BaseSendHandler.java rename to src/main/java/org/mvplugins/multiverse/core/display/handlers/BaseSendHandler.java index 415ab5b5..f0abd961 100644 --- a/src/main/java/com/onarandombox/MultiverseCore/display/handlers/BaseSendHandler.java +++ b/src/main/java/org/mvplugins/multiverse/core/display/handlers/BaseSendHandler.java @@ -1,15 +1,15 @@ -package com.onarandombox.MultiverseCore.display.handlers; +package org.mvplugins.multiverse.core.display.handlers; import java.util.List; import java.util.stream.Collectors; import co.aikar.commands.BukkitCommandIssuer; import com.google.common.base.Strings; -import com.onarandombox.MultiverseCore.display.filters.ContentFilter; -import com.onarandombox.MultiverseCore.display.filters.DefaultContentFilter; 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; /** * Base implementation of {@link SendHandler} with some common parameters. diff --git a/src/main/java/com/onarandombox/MultiverseCore/display/handlers/DefaultSendHandler.java b/src/main/java/org/mvplugins/multiverse/core/display/handlers/DefaultSendHandler.java similarity index 93% rename from src/main/java/com/onarandombox/MultiverseCore/display/handlers/DefaultSendHandler.java rename to src/main/java/org/mvplugins/multiverse/core/display/handlers/DefaultSendHandler.java index 6b37c301..54116599 100644 --- a/src/main/java/com/onarandombox/MultiverseCore/display/handlers/DefaultSendHandler.java +++ b/src/main/java/org/mvplugins/multiverse/core/display/handlers/DefaultSendHandler.java @@ -1,4 +1,4 @@ -package com.onarandombox.MultiverseCore.display.handlers; +package org.mvplugins.multiverse.core.display.handlers; import java.util.List; diff --git a/src/main/java/com/onarandombox/MultiverseCore/display/handlers/InlineSendHandler.java b/src/main/java/org/mvplugins/multiverse/core/display/handlers/InlineSendHandler.java similarity index 96% rename from src/main/java/com/onarandombox/MultiverseCore/display/handlers/InlineSendHandler.java rename to src/main/java/org/mvplugins/multiverse/core/display/handlers/InlineSendHandler.java index 568b58b5..b6c576aa 100644 --- a/src/main/java/com/onarandombox/MultiverseCore/display/handlers/InlineSendHandler.java +++ b/src/main/java/org/mvplugins/multiverse/core/display/handlers/InlineSendHandler.java @@ -1,4 +1,4 @@ -package com.onarandombox.MultiverseCore.display.handlers; +package org.mvplugins.multiverse.core.display.handlers; import java.util.List; diff --git a/src/main/java/com/onarandombox/MultiverseCore/display/handlers/PagedSendHandler.java b/src/main/java/org/mvplugins/multiverse/core/display/handlers/PagedSendHandler.java similarity index 98% rename from src/main/java/com/onarandombox/MultiverseCore/display/handlers/PagedSendHandler.java rename to src/main/java/org/mvplugins/multiverse/core/display/handlers/PagedSendHandler.java index 37a16b06..f8875f4d 100644 --- a/src/main/java/com/onarandombox/MultiverseCore/display/handlers/PagedSendHandler.java +++ b/src/main/java/org/mvplugins/multiverse/core/display/handlers/PagedSendHandler.java @@ -1,4 +1,4 @@ -package com.onarandombox.MultiverseCore.display.handlers; +package org.mvplugins.multiverse.core.display.handlers; import java.util.List; diff --git a/src/main/java/com/onarandombox/MultiverseCore/display/handlers/SendHandler.java b/src/main/java/org/mvplugins/multiverse/core/display/handlers/SendHandler.java similarity index 90% rename from src/main/java/com/onarandombox/MultiverseCore/display/handlers/SendHandler.java rename to src/main/java/org/mvplugins/multiverse/core/display/handlers/SendHandler.java index c731621f..7a0719ea 100644 --- a/src/main/java/com/onarandombox/MultiverseCore/display/handlers/SendHandler.java +++ b/src/main/java/org/mvplugins/multiverse/core/display/handlers/SendHandler.java @@ -1,4 +1,4 @@ -package com.onarandombox.MultiverseCore.display.handlers; +package org.mvplugins.multiverse.core.display.handlers; import java.util.List; diff --git a/src/main/java/com/onarandombox/MultiverseCore/display/handlers/package-info.java b/src/main/java/org/mvplugins/multiverse/core/display/handlers/package-info.java similarity index 56% rename from src/main/java/com/onarandombox/MultiverseCore/display/handlers/package-info.java rename to src/main/java/org/mvplugins/multiverse/core/display/handlers/package-info.java index 23aa5fd7..1211944d 100644 --- a/src/main/java/com/onarandombox/MultiverseCore/display/handlers/package-info.java +++ b/src/main/java/org/mvplugins/multiverse/core/display/handlers/package-info.java @@ -1,4 +1,4 @@ /** * This package contains all the handlers for the display system. */ -package com.onarandombox.MultiverseCore.display.handlers; +package org.mvplugins.multiverse.core.display.handlers; diff --git a/src/main/java/com/onarandombox/MultiverseCore/display/package-info.java b/src/main/java/org/mvplugins/multiverse/core/display/package-info.java similarity index 70% rename from src/main/java/com/onarandombox/MultiverseCore/display/package-info.java rename to src/main/java/org/mvplugins/multiverse/core/display/package-info.java index 8eb41fc0..2fa2c6ea 100644 --- a/src/main/java/com/onarandombox/MultiverseCore/display/package-info.java +++ b/src/main/java/org/mvplugins/multiverse/core/display/package-info.java @@ -1,4 +1,4 @@ /** * This package contains all the classes that are used to display nicely formatted information to the user. */ -package com.onarandombox.MultiverseCore.display; +package org.mvplugins.multiverse.core.display; diff --git a/src/main/java/com/onarandombox/MultiverseCore/display/parsers/ContentProvider.java b/src/main/java/org/mvplugins/multiverse/core/display/parsers/ContentProvider.java similarity index 90% rename from src/main/java/com/onarandombox/MultiverseCore/display/parsers/ContentProvider.java rename to src/main/java/org/mvplugins/multiverse/core/display/parsers/ContentProvider.java index b8c36e1d..3287fb46 100644 --- a/src/main/java/com/onarandombox/MultiverseCore/display/parsers/ContentProvider.java +++ b/src/main/java/org/mvplugins/multiverse/core/display/parsers/ContentProvider.java @@ -1,4 +1,4 @@ -package com.onarandombox.MultiverseCore.display.parsers; +package org.mvplugins.multiverse.core.display.parsers; import java.util.Collection; diff --git a/src/main/java/com/onarandombox/MultiverseCore/display/parsers/ListContentProvider.java b/src/main/java/org/mvplugins/multiverse/core/display/parsers/ListContentProvider.java similarity index 96% rename from src/main/java/com/onarandombox/MultiverseCore/display/parsers/ListContentProvider.java rename to src/main/java/org/mvplugins/multiverse/core/display/parsers/ListContentProvider.java index 1242ccb3..46971fad 100644 --- a/src/main/java/com/onarandombox/MultiverseCore/display/parsers/ListContentProvider.java +++ b/src/main/java/org/mvplugins/multiverse/core/display/parsers/ListContentProvider.java @@ -1,4 +1,4 @@ -package com.onarandombox.MultiverseCore.display.parsers; +package org.mvplugins.multiverse.core.display.parsers; import java.util.Collection; import java.util.List; diff --git a/src/main/java/com/onarandombox/MultiverseCore/display/parsers/MapContentProvider.java b/src/main/java/org/mvplugins/multiverse/core/display/parsers/MapContentProvider.java similarity index 98% rename from src/main/java/com/onarandombox/MultiverseCore/display/parsers/MapContentProvider.java rename to src/main/java/org/mvplugins/multiverse/core/display/parsers/MapContentProvider.java index 9d39c8f3..c460405a 100644 --- a/src/main/java/com/onarandombox/MultiverseCore/display/parsers/MapContentProvider.java +++ b/src/main/java/org/mvplugins/multiverse/core/display/parsers/MapContentProvider.java @@ -1,4 +1,4 @@ -package com.onarandombox.MultiverseCore.display.parsers; +package org.mvplugins.multiverse.core.display.parsers; import java.util.Collection; import java.util.Map; diff --git a/src/main/java/com/onarandombox/MultiverseCore/display/parsers/package-info.java b/src/main/java/org/mvplugins/multiverse/core/display/parsers/package-info.java similarity index 56% rename from src/main/java/com/onarandombox/MultiverseCore/display/parsers/package-info.java rename to src/main/java/org/mvplugins/multiverse/core/display/parsers/package-info.java index 94679903..995c4371 100644 --- a/src/main/java/com/onarandombox/MultiverseCore/display/parsers/package-info.java +++ b/src/main/java/org/mvplugins/multiverse/core/display/parsers/package-info.java @@ -1,4 +1,4 @@ /** * This package contains all the parsers for the display system. */ -package com.onarandombox.MultiverseCore.display.parsers; +package org.mvplugins.multiverse.core.display.parsers; diff --git a/src/main/java/com/onarandombox/MultiverseCore/economy/ItemEconomy.java b/src/main/java/org/mvplugins/multiverse/core/economy/ItemEconomy.java similarity index 98% rename from src/main/java/com/onarandombox/MultiverseCore/economy/ItemEconomy.java rename to src/main/java/org/mvplugins/multiverse/core/economy/ItemEconomy.java index 6b5f9b1e..cadfecdd 100644 --- a/src/main/java/com/onarandombox/MultiverseCore/economy/ItemEconomy.java +++ b/src/main/java/org/mvplugins/multiverse/core/economy/ItemEconomy.java @@ -1,4 +1,4 @@ -package com.onarandombox.MultiverseCore.economy; +package org.mvplugins.multiverse.core.economy; import java.util.HashMap; diff --git a/src/main/java/com/onarandombox/MultiverseCore/economy/MVEconomist.java b/src/main/java/org/mvplugins/multiverse/core/economy/MVEconomist.java similarity index 98% rename from src/main/java/com/onarandombox/MultiverseCore/economy/MVEconomist.java rename to src/main/java/org/mvplugins/multiverse/core/economy/MVEconomist.java index 814b6934..c2f9a3ce 100644 --- a/src/main/java/com/onarandombox/MultiverseCore/economy/MVEconomist.java +++ b/src/main/java/org/mvplugins/multiverse/core/economy/MVEconomist.java @@ -1,6 +1,5 @@ -package com.onarandombox.MultiverseCore.economy; +package org.mvplugins.multiverse.core.economy; -import com.onarandombox.MultiverseCore.worldnew.LoadedMultiverseWorld; import jakarta.inject.Inject; import org.bukkit.Material; import org.bukkit.World; @@ -8,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; /** * Multiverse's Friendly Economist. This is used to deal with external economies and also item costs for stuff in MV. diff --git a/src/main/java/com/onarandombox/MultiverseCore/economy/VaultHandler.java b/src/main/java/org/mvplugins/multiverse/core/economy/VaultHandler.java similarity index 98% rename from src/main/java/com/onarandombox/MultiverseCore/economy/VaultHandler.java rename to src/main/java/org/mvplugins/multiverse/core/economy/VaultHandler.java index a26aaf01..03069a5b 100644 --- a/src/main/java/com/onarandombox/MultiverseCore/economy/VaultHandler.java +++ b/src/main/java/org/mvplugins/multiverse/core/economy/VaultHandler.java @@ -1,4 +1,4 @@ -package com.onarandombox.MultiverseCore.economy; +package org.mvplugins.multiverse.core.economy; import com.dumptruckman.minecraft.util.Logging; import net.milkbowl.vault.economy.Economy; diff --git a/src/main/java/com/onarandombox/MultiverseCore/economy/package-info.java b/src/main/java/org/mvplugins/multiverse/core/economy/package-info.java similarity index 64% rename from src/main/java/com/onarandombox/MultiverseCore/economy/package-info.java rename to src/main/java/org/mvplugins/multiverse/core/economy/package-info.java index 6cadc414..67577271 100644 --- a/src/main/java/com/onarandombox/MultiverseCore/economy/package-info.java +++ b/src/main/java/org/mvplugins/multiverse/core/economy/package-info.java @@ -1,4 +1,4 @@ /** * This package contains the economy classes to handle external economy plugins. */ -package com.onarandombox.MultiverseCore.economy; +package org.mvplugins.multiverse.core.economy; diff --git a/src/main/java/com/onarandombox/MultiverseCore/event/MVConfigReloadEvent.java b/src/main/java/org/mvplugins/multiverse/core/event/MVConfigReloadEvent.java similarity index 97% rename from src/main/java/com/onarandombox/MultiverseCore/event/MVConfigReloadEvent.java rename to src/main/java/org/mvplugins/multiverse/core/event/MVConfigReloadEvent.java index 43bc8c2b..a80a39ee 100644 --- a/src/main/java/com/onarandombox/MultiverseCore/event/MVConfigReloadEvent.java +++ b/src/main/java/org/mvplugins/multiverse/core/event/MVConfigReloadEvent.java @@ -5,7 +5,7 @@ * with this project. * ******************************************************************************/ -package com.onarandombox.MultiverseCore.event; +package org.mvplugins.multiverse.core.event; import java.util.List; diff --git a/src/main/java/com/onarandombox/MultiverseCore/event/MVDebugModeEvent.java b/src/main/java/org/mvplugins/multiverse/core/event/MVDebugModeEvent.java similarity index 94% rename from src/main/java/com/onarandombox/MultiverseCore/event/MVDebugModeEvent.java rename to src/main/java/org/mvplugins/multiverse/core/event/MVDebugModeEvent.java index f3c3408b..0298cb6f 100644 --- a/src/main/java/com/onarandombox/MultiverseCore/event/MVDebugModeEvent.java +++ b/src/main/java/org/mvplugins/multiverse/core/event/MVDebugModeEvent.java @@ -1,4 +1,4 @@ -package com.onarandombox.MultiverseCore.event; +package org.mvplugins.multiverse.core.event; import org.bukkit.event.Event; import org.bukkit.event.HandlerList; diff --git a/src/main/java/com/onarandombox/MultiverseCore/event/MVPlayerTouchedPortalEvent.java b/src/main/java/org/mvplugins/multiverse/core/event/MVPlayerTouchedPortalEvent.java similarity index 98% rename from src/main/java/com/onarandombox/MultiverseCore/event/MVPlayerTouchedPortalEvent.java rename to src/main/java/org/mvplugins/multiverse/core/event/MVPlayerTouchedPortalEvent.java index 56ec89e3..8f04f77b 100644 --- a/src/main/java/com/onarandombox/MultiverseCore/event/MVPlayerTouchedPortalEvent.java +++ b/src/main/java/org/mvplugins/multiverse/core/event/MVPlayerTouchedPortalEvent.java @@ -5,7 +5,7 @@ * with this project. * ******************************************************************************/ -package com.onarandombox.MultiverseCore.event; +package org.mvplugins.multiverse.core.event; import org.bukkit.Location; import org.bukkit.entity.Player; diff --git a/src/main/java/com/onarandombox/MultiverseCore/event/MVRespawnEvent.java b/src/main/java/org/mvplugins/multiverse/core/event/MVRespawnEvent.java similarity index 97% rename from src/main/java/com/onarandombox/MultiverseCore/event/MVRespawnEvent.java rename to src/main/java/org/mvplugins/multiverse/core/event/MVRespawnEvent.java index 0f71cdf8..5190122d 100644 --- a/src/main/java/com/onarandombox/MultiverseCore/event/MVRespawnEvent.java +++ b/src/main/java/org/mvplugins/multiverse/core/event/MVRespawnEvent.java @@ -5,7 +5,7 @@ * with this project. * ******************************************************************************/ -package com.onarandombox.MultiverseCore.event; +package org.mvplugins.multiverse.core.event; import org.bukkit.Location; import org.bukkit.entity.Player; diff --git a/src/main/java/com/onarandombox/MultiverseCore/event/MVTeleportEvent.java b/src/main/java/org/mvplugins/multiverse/core/event/MVTeleportEvent.java similarity index 94% rename from src/main/java/com/onarandombox/MultiverseCore/event/MVTeleportEvent.java rename to src/main/java/org/mvplugins/multiverse/core/event/MVTeleportEvent.java index 67949cf4..95fcecd2 100644 --- a/src/main/java/com/onarandombox/MultiverseCore/event/MVTeleportEvent.java +++ b/src/main/java/org/mvplugins/multiverse/core/event/MVTeleportEvent.java @@ -5,16 +5,16 @@ * with this project. * ******************************************************************************/ -package com.onarandombox.MultiverseCore.event; +package org.mvplugins.multiverse.core.event; -import com.onarandombox.MultiverseCore.api.SafeTTeleporter; -import com.onarandombox.MultiverseCore.destination.ParsedDestination; import org.bukkit.Location; import org.bukkit.command.CommandSender; 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; /** * Event that gets called when a player use the /mvtp command. diff --git a/src/main/java/com/onarandombox/MultiverseCore/event/MVVersionEvent.java b/src/main/java/org/mvplugins/multiverse/core/event/MVVersionEvent.java similarity index 98% rename from src/main/java/com/onarandombox/MultiverseCore/event/MVVersionEvent.java rename to src/main/java/org/mvplugins/multiverse/core/event/MVVersionEvent.java index 443ba0a5..d6b79900 100644 --- a/src/main/java/com/onarandombox/MultiverseCore/event/MVVersionEvent.java +++ b/src/main/java/org/mvplugins/multiverse/core/event/MVVersionEvent.java @@ -1,4 +1,4 @@ -package com.onarandombox.MultiverseCore.event; +package org.mvplugins.multiverse.core.event; import java.io.BufferedReader; import java.io.File; diff --git a/src/main/java/com/onarandombox/MultiverseCore/event/MVWorldDeleteEvent.java b/src/main/java/org/mvplugins/multiverse/core/event/MVWorldDeleteEvent.java similarity index 94% rename from src/main/java/com/onarandombox/MultiverseCore/event/MVWorldDeleteEvent.java rename to src/main/java/org/mvplugins/multiverse/core/event/MVWorldDeleteEvent.java index 0abcf206..7d533753 100644 --- a/src/main/java/com/onarandombox/MultiverseCore/event/MVWorldDeleteEvent.java +++ b/src/main/java/org/mvplugins/multiverse/core/event/MVWorldDeleteEvent.java @@ -1,9 +1,9 @@ -package com.onarandombox.MultiverseCore.event; +package org.mvplugins.multiverse.core.event; -import com.onarandombox.MultiverseCore.api.MVWorld; import org.bukkit.event.Cancellable; import org.bukkit.event.Event; import org.bukkit.event.HandlerList; +import org.mvplugins.multiverse.core.api.MVWorld; /** * Called when a world is about to be deleted by Multiverse. diff --git a/src/main/java/com/onarandombox/MultiverseCore/event/MVWorldPropertyChangeEvent.java b/src/main/java/org/mvplugins/multiverse/core/event/MVWorldPropertyChangeEvent.java similarity index 97% rename from src/main/java/com/onarandombox/MultiverseCore/event/MVWorldPropertyChangeEvent.java rename to src/main/java/org/mvplugins/multiverse/core/event/MVWorldPropertyChangeEvent.java index 6e36e0ca..d95bfe79 100644 --- a/src/main/java/com/onarandombox/MultiverseCore/event/MVWorldPropertyChangeEvent.java +++ b/src/main/java/org/mvplugins/multiverse/core/event/MVWorldPropertyChangeEvent.java @@ -5,13 +5,13 @@ * with this project. * ******************************************************************************/ -package com.onarandombox.MultiverseCore.event; +package org.mvplugins.multiverse.core.event; -import com.onarandombox.MultiverseCore.api.MVWorld; 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; /** * This event is fired *before* the property is actually changed. diff --git a/src/main/java/org/mvplugins/multiverse/core/event/package-info.java b/src/main/java/org/mvplugins/multiverse/core/event/package-info.java new file mode 100644 index 00000000..106d6819 --- /dev/null +++ b/src/main/java/org/mvplugins/multiverse/core/event/package-info.java @@ -0,0 +1,4 @@ +/** + * This package contains all events. + */ +package org.mvplugins.multiverse.core.event; diff --git a/src/main/java/com/onarandombox/MultiverseCore/exceptions/MultiverseException.java b/src/main/java/org/mvplugins/multiverse/core/exceptions/MultiverseException.java similarity index 93% rename from src/main/java/com/onarandombox/MultiverseCore/exceptions/MultiverseException.java rename to src/main/java/org/mvplugins/multiverse/core/exceptions/MultiverseException.java index ee0642a5..a947cdda 100644 --- a/src/main/java/com/onarandombox/MultiverseCore/exceptions/MultiverseException.java +++ b/src/main/java/org/mvplugins/multiverse/core/exceptions/MultiverseException.java @@ -1,8 +1,8 @@ -package com.onarandombox.MultiverseCore.exceptions; +package org.mvplugins.multiverse.core.exceptions; -import com.onarandombox.MultiverseCore.commandtools.MVCommandIssuer; -import com.onarandombox.MultiverseCore.utils.message.Message; import org.jetbrains.annotations.Nullable; +import org.mvplugins.multiverse.core.commandtools.MVCommandIssuer; +import org.mvplugins.multiverse.core.utils.message.Message; /** * A base exception for Multiverse. diff --git a/src/main/java/com/onarandombox/MultiverseCore/exceptions/PropertyDoesNotExistException.java b/src/main/java/org/mvplugins/multiverse/core/exceptions/PropertyDoesNotExistException.java similarity index 93% rename from src/main/java/com/onarandombox/MultiverseCore/exceptions/PropertyDoesNotExistException.java rename to src/main/java/org/mvplugins/multiverse/core/exceptions/PropertyDoesNotExistException.java index 95a24169..ed5e7eb1 100644 --- a/src/main/java/com/onarandombox/MultiverseCore/exceptions/PropertyDoesNotExistException.java +++ b/src/main/java/org/mvplugins/multiverse/core/exceptions/PropertyDoesNotExistException.java @@ -5,7 +5,7 @@ * with this project. * ******************************************************************************/ -package com.onarandombox.MultiverseCore.exceptions; +package org.mvplugins.multiverse.core.exceptions; /** * Thrown when a world-property doesn't exist. diff --git a/src/main/java/org/mvplugins/multiverse/core/exceptions/package-info.java b/src/main/java/org/mvplugins/multiverse/core/exceptions/package-info.java new file mode 100644 index 00000000..ee7ef1c0 --- /dev/null +++ b/src/main/java/org/mvplugins/multiverse/core/exceptions/package-info.java @@ -0,0 +1,4 @@ +/** + * This package contains all exceptions. + */ +package org.mvplugins.multiverse.core.exceptions; diff --git a/src/main/java/com/onarandombox/MultiverseCore/inject/InjectableListener.java b/src/main/java/org/mvplugins/multiverse/core/inject/InjectableListener.java similarity index 75% rename from src/main/java/com/onarandombox/MultiverseCore/inject/InjectableListener.java rename to src/main/java/org/mvplugins/multiverse/core/inject/InjectableListener.java index 4a0fe1e5..6de94105 100644 --- a/src/main/java/com/onarandombox/MultiverseCore/inject/InjectableListener.java +++ b/src/main/java/org/mvplugins/multiverse/core/inject/InjectableListener.java @@ -1,4 +1,4 @@ -package com.onarandombox.MultiverseCore.inject; +package org.mvplugins.multiverse.core.inject; import org.bukkit.event.Listener; import org.jvnet.hk2.annotations.Contract; diff --git a/src/main/java/com/onarandombox/MultiverseCore/inject/PluginInjection.java b/src/main/java/org/mvplugins/multiverse/core/inject/PluginInjection.java similarity index 95% rename from src/main/java/com/onarandombox/MultiverseCore/inject/PluginInjection.java rename to src/main/java/org/mvplugins/multiverse/core/inject/PluginInjection.java index 312acb2b..d1eba938 100644 --- a/src/main/java/com/onarandombox/MultiverseCore/inject/PluginInjection.java +++ b/src/main/java/org/mvplugins/multiverse/core/inject/PluginInjection.java @@ -1,8 +1,5 @@ -package com.onarandombox.MultiverseCore.inject; +package org.mvplugins.multiverse.core.inject; -import com.onarandombox.MultiverseCore.inject.binder.JavaPluginBinder; -import com.onarandombox.MultiverseCore.inject.binder.PluginBinder; -import com.onarandombox.MultiverseCore.inject.binder.ServerBinder; import io.vavr.control.Try; import org.bukkit.plugin.Plugin; import org.glassfish.hk2.api.DynamicConfigurationService; @@ -12,6 +9,9 @@ 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; /** * Provides methods to set up dependency injection for plugins. diff --git a/src/main/java/com/onarandombox/MultiverseCore/inject/binder/JavaPluginBinder.java b/src/main/java/org/mvplugins/multiverse/core/inject/binder/JavaPluginBinder.java similarity index 92% rename from src/main/java/com/onarandombox/MultiverseCore/inject/binder/JavaPluginBinder.java rename to src/main/java/org/mvplugins/multiverse/core/inject/binder/JavaPluginBinder.java index c92a1109..f9fda45b 100644 --- a/src/main/java/com/onarandombox/MultiverseCore/inject/binder/JavaPluginBinder.java +++ b/src/main/java/org/mvplugins/multiverse/core/inject/binder/JavaPluginBinder.java @@ -1,4 +1,4 @@ -package com.onarandombox.MultiverseCore.inject.binder; +package org.mvplugins.multiverse.core.inject.binder; import org.bukkit.plugin.java.JavaPlugin; import org.glassfish.hk2.utilities.binding.ScopedBindingBuilder; diff --git a/src/main/java/com/onarandombox/MultiverseCore/inject/binder/PluginBinder.java b/src/main/java/org/mvplugins/multiverse/core/inject/binder/PluginBinder.java similarity index 95% rename from src/main/java/com/onarandombox/MultiverseCore/inject/binder/PluginBinder.java rename to src/main/java/org/mvplugins/multiverse/core/inject/binder/PluginBinder.java index 1a6ffe9e..5eee3c13 100644 --- a/src/main/java/com/onarandombox/MultiverseCore/inject/binder/PluginBinder.java +++ b/src/main/java/org/mvplugins/multiverse/core/inject/binder/PluginBinder.java @@ -1,4 +1,4 @@ -package com.onarandombox.MultiverseCore.inject.binder; +package org.mvplugins.multiverse.core.inject.binder; import java.util.logging.Logger; diff --git a/src/main/java/com/onarandombox/MultiverseCore/inject/binder/ServerBinder.java b/src/main/java/org/mvplugins/multiverse/core/inject/binder/ServerBinder.java similarity index 89% rename from src/main/java/com/onarandombox/MultiverseCore/inject/binder/ServerBinder.java rename to src/main/java/org/mvplugins/multiverse/core/inject/binder/ServerBinder.java index db075168..315e180f 100644 --- a/src/main/java/com/onarandombox/MultiverseCore/inject/binder/ServerBinder.java +++ b/src/main/java/org/mvplugins/multiverse/core/inject/binder/ServerBinder.java @@ -1,4 +1,4 @@ -package com.onarandombox.MultiverseCore.inject.binder; +package org.mvplugins.multiverse.core.inject.binder; import org.bukkit.Bukkit; import org.bukkit.Server; diff --git a/src/main/java/org/mvplugins/multiverse/core/inject/binder/package-info.java b/src/main/java/org/mvplugins/multiverse/core/inject/binder/package-info.java new file mode 100644 index 00000000..27733df4 --- /dev/null +++ b/src/main/java/org/mvplugins/multiverse/core/inject/binder/package-info.java @@ -0,0 +1 @@ +package org.mvplugins.multiverse.core.inject.binder; diff --git a/src/main/java/org/mvplugins/multiverse/core/inject/package-info.java b/src/main/java/org/mvplugins/multiverse/core/inject/package-info.java new file mode 100644 index 00000000..6e9d29d7 --- /dev/null +++ b/src/main/java/org/mvplugins/multiverse/core/inject/package-info.java @@ -0,0 +1 @@ +package org.mvplugins.multiverse.core.inject; diff --git a/src/main/java/com/onarandombox/MultiverseCore/listeners/MVChatListener.java b/src/main/java/org/mvplugins/multiverse/core/listeners/MVChatListener.java similarity index 89% rename from src/main/java/com/onarandombox/MultiverseCore/listeners/MVChatListener.java rename to src/main/java/org/mvplugins/multiverse/core/listeners/MVChatListener.java index 6823765b..48d8c1e5 100644 --- a/src/main/java/com/onarandombox/MultiverseCore/listeners/MVChatListener.java +++ b/src/main/java/org/mvplugins/multiverse/core/listeners/MVChatListener.java @@ -1,13 +1,13 @@ -package com.onarandombox.MultiverseCore.listeners; +package org.mvplugins.multiverse.core.listeners; -import com.onarandombox.MultiverseCore.config.MVCoreConfig; -import com.onarandombox.MultiverseCore.inject.InjectableListener; -import com.onarandombox.MultiverseCore.worldnew.WorldManager; import jakarta.inject.Inject; 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; /** * Multiverse's Listener for players. diff --git a/src/main/java/com/onarandombox/MultiverseCore/listeners/MVEntityListener.java b/src/main/java/org/mvplugins/multiverse/core/listeners/MVEntityListener.java similarity index 94% rename from src/main/java/com/onarandombox/MultiverseCore/listeners/MVEntityListener.java rename to src/main/java/org/mvplugins/multiverse/core/listeners/MVEntityListener.java index 6a8bea53..2b73d2ee 100644 --- a/src/main/java/com/onarandombox/MultiverseCore/listeners/MVEntityListener.java +++ b/src/main/java/org/mvplugins/multiverse/core/listeners/MVEntityListener.java @@ -5,12 +5,9 @@ * with this project. * ******************************************************************************/ -package com.onarandombox.MultiverseCore.listeners; +package org.mvplugins.multiverse.core.listeners; import com.dumptruckman.minecraft.util.Logging; -import com.onarandombox.MultiverseCore.inject.InjectableListener; -import com.onarandombox.MultiverseCore.worldnew.WorldManager; -import com.onarandombox.MultiverseCore.worldnew.WorldPurger; import jakarta.inject.Inject; import org.bukkit.entity.Player; import org.bukkit.event.EventHandler; @@ -22,6 +19,9 @@ 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; /** * Multiverse's Entity {@link Listener}. diff --git a/src/main/java/com/onarandombox/MultiverseCore/listeners/MVPlayerListener.java b/src/main/java/org/mvplugins/multiverse/core/listeners/MVPlayerListener.java similarity index 93% rename from src/main/java/com/onarandombox/MultiverseCore/listeners/MVPlayerListener.java rename to src/main/java/org/mvplugins/multiverse/core/listeners/MVPlayerListener.java index f1b3fdc3..578b55c4 100644 --- a/src/main/java/com/onarandombox/MultiverseCore/listeners/MVPlayerListener.java +++ b/src/main/java/org/mvplugins/multiverse/core/listeners/MVPlayerListener.java @@ -5,29 +5,13 @@ * with this project. * ******************************************************************************/ -package com.onarandombox.MultiverseCore.listeners; +package org.mvplugins.multiverse.core.listeners; import java.util.Map; import java.util.Optional; import java.util.concurrent.ConcurrentHashMap; import com.dumptruckman.minecraft.util.Logging; -import com.onarandombox.MultiverseCore.MultiverseCore; -import com.onarandombox.MultiverseCore.api.SafeTTeleporter; -import com.onarandombox.MultiverseCore.commandtools.MVCommandManager; -import com.onarandombox.MultiverseCore.config.MVCoreConfig; -import com.onarandombox.MultiverseCore.destination.DestinationsProvider; -import com.onarandombox.MultiverseCore.destination.ParsedDestination; -import com.onarandombox.MultiverseCore.economy.MVEconomist; -import com.onarandombox.MultiverseCore.event.MVRespawnEvent; -import com.onarandombox.MultiverseCore.inject.InjectableListener; -import com.onarandombox.MultiverseCore.permissions.CorePermissionsChecker; -import com.onarandombox.MultiverseCore.teleportation.TeleportQueue; -import com.onarandombox.MultiverseCore.utils.result.ResultChain; -import com.onarandombox.MultiverseCore.worldnew.LoadedMultiverseWorld; -import com.onarandombox.MultiverseCore.worldnew.WorldManager; -import com.onarandombox.MultiverseCore.worldnew.entrycheck.EntryFeeResult; -import com.onarandombox.MultiverseCore.worldnew.entrycheck.WorldEntryCheckerProvider; import io.vavr.control.Option; import jakarta.inject.Inject; import jakarta.inject.Provider; @@ -47,6 +31,22 @@ 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; +import org.mvplugins.multiverse.core.config.MVCoreConfig; +import org.mvplugins.multiverse.core.destination.DestinationsProvider; +import org.mvplugins.multiverse.core.destination.ParsedDestination; +import org.mvplugins.multiverse.core.economy.MVEconomist; +import org.mvplugins.multiverse.core.event.MVRespawnEvent; +import org.mvplugins.multiverse.core.inject.InjectableListener; +import org.mvplugins.multiverse.core.permissions.CorePermissionsChecker; +import org.mvplugins.multiverse.core.teleportation.TeleportQueue; +import org.mvplugins.multiverse.core.utils.result.ResultChain; +import org.mvplugins.multiverse.core.worldnew.LoadedMultiverseWorld; +import org.mvplugins.multiverse.core.worldnew.WorldManager; +import org.mvplugins.multiverse.core.worldnew.entrycheck.EntryFeeResult; +import org.mvplugins.multiverse.core.worldnew.entrycheck.WorldEntryCheckerProvider; /** * Multiverse's Listener for players. diff --git a/src/main/java/com/onarandombox/MultiverseCore/listeners/MVPortalListener.java b/src/main/java/org/mvplugins/multiverse/core/listeners/MVPortalListener.java similarity index 93% rename from src/main/java/com/onarandombox/MultiverseCore/listeners/MVPortalListener.java rename to src/main/java/org/mvplugins/multiverse/core/listeners/MVPortalListener.java index 629babef..22b2c62d 100644 --- a/src/main/java/com/onarandombox/MultiverseCore/listeners/MVPortalListener.java +++ b/src/main/java/org/mvplugins/multiverse/core/listeners/MVPortalListener.java @@ -5,13 +5,9 @@ * with this project. * ******************************************************************************/ -package com.onarandombox.MultiverseCore.listeners; +package org.mvplugins.multiverse.core.listeners; import com.dumptruckman.minecraft.util.Logging; -import com.onarandombox.MultiverseCore.config.MVCoreConfig; -import com.onarandombox.MultiverseCore.inject.InjectableListener; -import com.onarandombox.MultiverseCore.worldnew.LoadedMultiverseWorld; -import com.onarandombox.MultiverseCore.worldnew.WorldManager; import jakarta.inject.Inject; import org.bukkit.Material; import org.bukkit.PortalType; @@ -23,6 +19,10 @@ 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; +import org.mvplugins.multiverse.core.worldnew.WorldManager; /** * A custom listener for portal related events. diff --git a/src/main/java/com/onarandombox/MultiverseCore/listeners/MVWeatherListener.java b/src/main/java/org/mvplugins/multiverse/core/listeners/MVWeatherListener.java similarity index 92% rename from src/main/java/com/onarandombox/MultiverseCore/listeners/MVWeatherListener.java rename to src/main/java/org/mvplugins/multiverse/core/listeners/MVWeatherListener.java index 0da82eed..3928d1e9 100644 --- a/src/main/java/com/onarandombox/MultiverseCore/listeners/MVWeatherListener.java +++ b/src/main/java/org/mvplugins/multiverse/core/listeners/MVWeatherListener.java @@ -5,16 +5,16 @@ * with this project. * ******************************************************************************/ -package com.onarandombox.MultiverseCore.listeners; +package org.mvplugins.multiverse.core.listeners; import com.dumptruckman.minecraft.util.Logging; -import com.onarandombox.MultiverseCore.inject.InjectableListener; -import com.onarandombox.MultiverseCore.worldnew.WorldManager; import jakarta.inject.Inject; 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; /** * Multiverse's Weather Listener. diff --git a/src/main/java/com/onarandombox/MultiverseCore/listeners/MVWorldListener.java b/src/main/java/org/mvplugins/multiverse/core/listeners/MVWorldListener.java similarity index 86% rename from src/main/java/com/onarandombox/MultiverseCore/listeners/MVWorldListener.java rename to src/main/java/org/mvplugins/multiverse/core/listeners/MVWorldListener.java index 55804bd1..565ca318 100644 --- a/src/main/java/com/onarandombox/MultiverseCore/listeners/MVWorldListener.java +++ b/src/main/java/org/mvplugins/multiverse/core/listeners/MVWorldListener.java @@ -5,20 +5,20 @@ * with this project. * ******************************************************************************/ -package com.onarandombox.MultiverseCore.listeners; +package org.mvplugins.multiverse.core.listeners; import com.dumptruckman.minecraft.util.Logging; -import com.onarandombox.MultiverseCore.inject.InjectableListener; -import com.onarandombox.MultiverseCore.worldnew.WorldManager; -import com.onarandombox.MultiverseCore.worldnew.options.UnloadWorldOptions; -import com.onarandombox.MultiverseCore.worldnew.reasons.LoadFailureReason; -import com.onarandombox.MultiverseCore.worldnew.reasons.UnloadFailureReason; import jakarta.inject.Inject; import org.bukkit.event.EventHandler; 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; +import org.mvplugins.multiverse.core.worldnew.reasons.LoadFailureReason; +import org.mvplugins.multiverse.core.worldnew.reasons.UnloadFailureReason; /** * Multiverse's World Listener. diff --git a/src/main/java/com/onarandombox/MultiverseCore/listeners/MultiverseCoreListener.java b/src/main/java/org/mvplugins/multiverse/core/listeners/MultiverseCoreListener.java similarity index 77% rename from src/main/java/com/onarandombox/MultiverseCore/listeners/MultiverseCoreListener.java rename to src/main/java/org/mvplugins/multiverse/core/listeners/MultiverseCoreListener.java index e2eb6586..ccf78940 100644 --- a/src/main/java/com/onarandombox/MultiverseCore/listeners/MultiverseCoreListener.java +++ b/src/main/java/org/mvplugins/multiverse/core/listeners/MultiverseCoreListener.java @@ -5,17 +5,17 @@ * with this project. * ******************************************************************************/ -package com.onarandombox.MultiverseCore.listeners; +package org.mvplugins.multiverse.core.listeners; -import com.onarandombox.MultiverseCore.event.MVConfigReloadEvent; -import com.onarandombox.MultiverseCore.event.MVPlayerTouchedPortalEvent; -import com.onarandombox.MultiverseCore.event.MVRespawnEvent; -import com.onarandombox.MultiverseCore.event.MVTeleportEvent; -import com.onarandombox.MultiverseCore.event.MVVersionEvent; -import com.onarandombox.MultiverseCore.event.MVWorldDeleteEvent; -import com.onarandombox.MultiverseCore.event.MVWorldPropertyChangeEvent; -import com.onarandombox.MultiverseCore.inject.InjectableListener; 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; +import org.mvplugins.multiverse.core.event.MVTeleportEvent; +import org.mvplugins.multiverse.core.event.MVVersionEvent; +import org.mvplugins.multiverse.core.event.MVWorldDeleteEvent; +import org.mvplugins.multiverse.core.event.MVWorldPropertyChangeEvent; +import org.mvplugins.multiverse.core.inject.InjectableListener; /** * Subclasses of this listener can be used to conveniently listen to MultiverseCore-events. diff --git a/src/main/java/org/mvplugins/multiverse/core/listeners/package-info.java b/src/main/java/org/mvplugins/multiverse/core/listeners/package-info.java new file mode 100644 index 00000000..d3e5e899 --- /dev/null +++ b/src/main/java/org/mvplugins/multiverse/core/listeners/package-info.java @@ -0,0 +1,4 @@ +/** + * This package contains all listeners. + */ +package org.mvplugins.multiverse.core.listeners; diff --git a/src/main/java/com/onarandombox/MultiverseCore/package-info.java b/src/main/java/org/mvplugins/multiverse/core/package-info.java similarity index 66% rename from src/main/java/com/onarandombox/MultiverseCore/package-info.java rename to src/main/java/org/mvplugins/multiverse/core/package-info.java index ed08147b..d5e0f421 100644 --- a/src/main/java/com/onarandombox/MultiverseCore/package-info.java +++ b/src/main/java/org/mvplugins/multiverse/core/package-info.java @@ -1,4 +1,4 @@ /** * The "master"-package, containing everything related to Multiverse-Core. */ -package com.onarandombox.MultiverseCore; +package org.mvplugins.multiverse.core; diff --git a/src/main/java/com/onarandombox/MultiverseCore/permissions/CorePermissions.java b/src/main/java/org/mvplugins/multiverse/core/permissions/CorePermissions.java similarity index 84% rename from src/main/java/com/onarandombox/MultiverseCore/permissions/CorePermissions.java rename to src/main/java/org/mvplugins/multiverse/core/permissions/CorePermissions.java index 11cd83b0..2af85ac1 100644 --- a/src/main/java/com/onarandombox/MultiverseCore/permissions/CorePermissions.java +++ b/src/main/java/org/mvplugins/multiverse/core/permissions/CorePermissions.java @@ -1,4 +1,4 @@ -package com.onarandombox.MultiverseCore.permissions; +package org.mvplugins.multiverse.core.permissions; public class CorePermissions { public static String WORLD_ACCESS = "multiverse.access"; diff --git a/src/main/java/com/onarandombox/MultiverseCore/permissions/CorePermissionsChecker.java b/src/main/java/org/mvplugins/multiverse/core/permissions/CorePermissionsChecker.java similarity index 86% rename from src/main/java/com/onarandombox/MultiverseCore/permissions/CorePermissionsChecker.java rename to src/main/java/org/mvplugins/multiverse/core/permissions/CorePermissionsChecker.java index de26450c..a0f8eae0 100644 --- a/src/main/java/com/onarandombox/MultiverseCore/permissions/CorePermissionsChecker.java +++ b/src/main/java/org/mvplugins/multiverse/core/permissions/CorePermissionsChecker.java @@ -1,11 +1,12 @@ -package com.onarandombox.MultiverseCore.permissions; +package org.mvplugins.multiverse.core.permissions; import com.dumptruckman.minecraft.util.Logging; -import com.onarandombox.MultiverseCore.worldnew.LoadedMultiverseWorld; -import com.onarandombox.MultiverseCore.worldnew.MultiverseWorld; 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; @Service public class CorePermissionsChecker { @@ -14,7 +15,7 @@ public class CorePermissionsChecker { } @Deprecated // TODO: Remove old MVWorld - public boolean hasWorldAccessPermission(@NotNull CommandSender sender, @NotNull com.onarandombox.MultiverseCore.api.MVWorld world) { + public boolean hasWorldAccessPermission(@NotNull CommandSender sender, @NotNull MVWorld world) { return hasPermission(sender, concatPermission(CorePermissions.WORLD_ACCESS, world.getName())); } @@ -31,7 +32,7 @@ public class CorePermissionsChecker { } @Deprecated // TODO: Remove old MVWorld - public boolean hasGameModeBypassPermission(@NotNull CommandSender sender, @NotNull com.onarandombox.MultiverseCore.api.MVWorld world) { + public boolean hasGameModeBypassPermission(@NotNull CommandSender sender, @NotNull MVWorld world) { return hasPermission(sender, concatPermission(CorePermissions.GAMEMODE_BYPASS, world.getName())); } diff --git a/src/main/java/org/mvplugins/multiverse/core/permissions/package-info.java b/src/main/java/org/mvplugins/multiverse/core/permissions/package-info.java new file mode 100644 index 00000000..e4a35c26 --- /dev/null +++ b/src/main/java/org/mvplugins/multiverse/core/permissions/package-info.java @@ -0,0 +1 @@ +package org.mvplugins.multiverse.core.permissions; diff --git a/src/main/java/com/onarandombox/MultiverseCore/placeholders/MultiverseCorePlaceholders.java b/src/main/java/org/mvplugins/multiverse/core/placeholders/MultiverseCorePlaceholders.java similarity index 94% rename from src/main/java/com/onarandombox/MultiverseCore/placeholders/MultiverseCorePlaceholders.java rename to src/main/java/org/mvplugins/multiverse/core/placeholders/MultiverseCorePlaceholders.java index 8730c710..e926c929 100644 --- a/src/main/java/com/onarandombox/MultiverseCore/placeholders/MultiverseCorePlaceholders.java +++ b/src/main/java/org/mvplugins/multiverse/core/placeholders/MultiverseCorePlaceholders.java @@ -1,9 +1,5 @@ -package com.onarandombox.MultiverseCore.placeholders; +package org.mvplugins.multiverse.core.placeholders; -import com.onarandombox.MultiverseCore.MultiverseCore; -import com.onarandombox.MultiverseCore.economy.MVEconomist; -import com.onarandombox.MultiverseCore.worldnew.LoadedMultiverseWorld; -import com.onarandombox.MultiverseCore.worldnew.WorldManager; import io.vavr.control.Option; import jakarta.annotation.PostConstruct; import jakarta.inject.Inject; @@ -14,6 +10,10 @@ 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; +import org.mvplugins.multiverse.core.worldnew.WorldManager; @Service public class MultiverseCorePlaceholders extends PlaceholderExpansion { diff --git a/src/main/java/org/mvplugins/multiverse/core/placeholders/package-info.java b/src/main/java/org/mvplugins/multiverse/core/placeholders/package-info.java new file mode 100644 index 00000000..db327686 --- /dev/null +++ b/src/main/java/org/mvplugins/multiverse/core/placeholders/package-info.java @@ -0,0 +1 @@ +package org.mvplugins.multiverse.core.placeholders; diff --git a/src/main/java/com/onarandombox/MultiverseCore/teleportation/SimpleBlockSafety.java b/src/main/java/org/mvplugins/multiverse/core/teleportation/SimpleBlockSafety.java similarity index 98% rename from src/main/java/com/onarandombox/MultiverseCore/teleportation/SimpleBlockSafety.java rename to src/main/java/org/mvplugins/multiverse/core/teleportation/SimpleBlockSafety.java index f81c3735..21cbac10 100644 --- a/src/main/java/com/onarandombox/MultiverseCore/teleportation/SimpleBlockSafety.java +++ b/src/main/java/org/mvplugins/multiverse/core/teleportation/SimpleBlockSafety.java @@ -5,15 +5,13 @@ * with this project. * ******************************************************************************/ -package com.onarandombox.MultiverseCore.teleportation; +package org.mvplugins.multiverse.core.teleportation; import java.util.EnumSet; import java.util.Iterator; import java.util.Set; import com.dumptruckman.minecraft.util.Logging; -import com.onarandombox.MultiverseCore.api.BlockSafety; -import com.onarandombox.MultiverseCore.api.LocationManipulation; import jakarta.inject.Inject; import org.bukkit.Location; import org.bukkit.Material; @@ -24,6 +22,8 @@ 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; /** * The default-implementation of {@link BlockSafety}. diff --git a/src/main/java/com/onarandombox/MultiverseCore/teleportation/SimpleLocationManipulation.java b/src/main/java/org/mvplugins/multiverse/core/teleportation/SimpleLocationManipulation.java similarity index 98% rename from src/main/java/com/onarandombox/MultiverseCore/teleportation/SimpleLocationManipulation.java rename to src/main/java/org/mvplugins/multiverse/core/teleportation/SimpleLocationManipulation.java index 860a6c82..d504f47c 100644 --- a/src/main/java/com/onarandombox/MultiverseCore/teleportation/SimpleLocationManipulation.java +++ b/src/main/java/org/mvplugins/multiverse/core/teleportation/SimpleLocationManipulation.java @@ -5,7 +5,7 @@ * with this project. * ******************************************************************************/ -package com.onarandombox.MultiverseCore.teleportation; +package org.mvplugins.multiverse.core.teleportation; import java.text.DecimalFormat; import java.util.Collections; @@ -13,7 +13,6 @@ import java.util.HashMap; import java.util.Locale; import java.util.Map; -import com.onarandombox.MultiverseCore.api.LocationManipulation; import org.bukkit.Bukkit; import org.bukkit.ChatColor; import org.bukkit.Location; @@ -21,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; /** * The default-implementation of {@link LocationManipulation}. diff --git a/src/main/java/com/onarandombox/MultiverseCore/teleportation/SimpleSafeTTeleporter.java b/src/main/java/org/mvplugins/multiverse/core/teleportation/SimpleSafeTTeleporter.java similarity index 96% rename from src/main/java/com/onarandombox/MultiverseCore/teleportation/SimpleSafeTTeleporter.java rename to src/main/java/org/mvplugins/multiverse/core/teleportation/SimpleSafeTTeleporter.java index 999a3209..d19684f6 100644 --- a/src/main/java/com/onarandombox/MultiverseCore/teleportation/SimpleSafeTTeleporter.java +++ b/src/main/java/org/mvplugins/multiverse/core/teleportation/SimpleSafeTTeleporter.java @@ -5,18 +5,12 @@ * with this project. * ******************************************************************************/ -package com.onarandombox.MultiverseCore.teleportation; +package org.mvplugins.multiverse.core.teleportation; import java.util.concurrent.CompletableFuture; import co.aikar.commands.BukkitCommandIssuer; import com.dumptruckman.minecraft.util.Logging; -import com.onarandombox.MultiverseCore.MultiverseCore; -import com.onarandombox.MultiverseCore.api.BlockSafety; -import com.onarandombox.MultiverseCore.api.DestinationInstance; -import com.onarandombox.MultiverseCore.api.LocationManipulation; -import com.onarandombox.MultiverseCore.api.SafeTTeleporter; -import com.onarandombox.MultiverseCore.destination.ParsedDestination; import io.papermc.lib.PaperLib; import jakarta.inject.Inject; import org.bukkit.Bukkit; @@ -31,6 +25,12 @@ 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; +import org.mvplugins.multiverse.core.api.LocationManipulation; +import org.mvplugins.multiverse.core.api.SafeTTeleporter; +import org.mvplugins.multiverse.core.destination.ParsedDestination; /** * The default-implementation of {@link SafeTTeleporter}. diff --git a/src/main/java/com/onarandombox/MultiverseCore/teleportation/TeleportQueue.java b/src/main/java/org/mvplugins/multiverse/core/teleportation/TeleportQueue.java similarity index 96% rename from src/main/java/com/onarandombox/MultiverseCore/teleportation/TeleportQueue.java rename to src/main/java/org/mvplugins/multiverse/core/teleportation/TeleportQueue.java index dc9e69e1..c5fa68b4 100644 --- a/src/main/java/com/onarandombox/MultiverseCore/teleportation/TeleportQueue.java +++ b/src/main/java/org/mvplugins/multiverse/core/teleportation/TeleportQueue.java @@ -1,4 +1,4 @@ -package com.onarandombox.MultiverseCore.teleportation; +package org.mvplugins.multiverse.core.teleportation; import java.util.HashMap; import java.util.Map; diff --git a/src/main/java/com/onarandombox/MultiverseCore/teleportation/TeleportResult.java b/src/main/java/org/mvplugins/multiverse/core/teleportation/TeleportResult.java similarity index 94% rename from src/main/java/com/onarandombox/MultiverseCore/teleportation/TeleportResult.java rename to src/main/java/org/mvplugins/multiverse/core/teleportation/TeleportResult.java index 81fcfccc..c72992b3 100644 --- a/src/main/java/com/onarandombox/MultiverseCore/teleportation/TeleportResult.java +++ b/src/main/java/org/mvplugins/multiverse/core/teleportation/TeleportResult.java @@ -5,7 +5,7 @@ * with this project. * ******************************************************************************/ -package com.onarandombox.MultiverseCore.teleportation; +package org.mvplugins.multiverse.core.teleportation; /** * An enum containing possible teleport-results. diff --git a/src/main/java/com/onarandombox/MultiverseCore/teleportation/package-info.java b/src/main/java/org/mvplugins/multiverse/core/teleportation/package-info.java similarity index 62% rename from src/main/java/com/onarandombox/MultiverseCore/teleportation/package-info.java rename to src/main/java/org/mvplugins/multiverse/core/teleportation/package-info.java index cdee4b69..a778df7a 100644 --- a/src/main/java/com/onarandombox/MultiverseCore/teleportation/package-info.java +++ b/src/main/java/org/mvplugins/multiverse/core/teleportation/package-info.java @@ -1,4 +1,4 @@ /** * This package contains all the teleportation and location safety related classes. */ -package com.onarandombox.MultiverseCore.teleportation; +package org.mvplugins.multiverse.core.teleportation; diff --git a/src/main/java/com/onarandombox/MultiverseCore/utils/MVCorei18n.java b/src/main/java/org/mvplugins/multiverse/core/utils/MVCorei18n.java similarity index 95% rename from src/main/java/com/onarandombox/MultiverseCore/utils/MVCorei18n.java rename to src/main/java/org/mvplugins/multiverse/core/utils/MVCorei18n.java index fcfe1bea..59066225 100644 --- a/src/main/java/com/onarandombox/MultiverseCore/utils/MVCorei18n.java +++ b/src/main/java/org/mvplugins/multiverse/core/utils/MVCorei18n.java @@ -1,10 +1,10 @@ -package com.onarandombox.MultiverseCore.utils; +package org.mvplugins.multiverse.core.utils; import co.aikar.locales.MessageKey; import co.aikar.locales.MessageKeyProvider; -import com.onarandombox.MultiverseCore.utils.message.Message; -import com.onarandombox.MultiverseCore.utils.message.MessageReplacement; import org.jetbrains.annotations.NotNull; +import org.mvplugins.multiverse.core.utils.message.Message; +import org.mvplugins.multiverse.core.utils.message.MessageReplacement; public enum MVCorei18n implements MessageKeyProvider { // BEGIN CHECKSTYLE-SUPPRESSION: Javadoc diff --git a/src/main/java/com/onarandombox/MultiverseCore/utils/MaterialConverter.java b/src/main/java/org/mvplugins/multiverse/core/utils/MaterialConverter.java similarity index 96% rename from src/main/java/com/onarandombox/MultiverseCore/utils/MaterialConverter.java rename to src/main/java/org/mvplugins/multiverse/core/utils/MaterialConverter.java index 0fd19457..7310d5a4 100644 --- a/src/main/java/com/onarandombox/MultiverseCore/utils/MaterialConverter.java +++ b/src/main/java/org/mvplugins/multiverse/core/utils/MaterialConverter.java @@ -1,4 +1,4 @@ -package com.onarandombox.MultiverseCore.utils; +package org.mvplugins.multiverse.core.utils; import de.themoep.idconverter.IdMappings; import org.bukkit.Material; diff --git a/src/main/java/com/onarandombox/MultiverseCore/utils/PlayerFinder.java b/src/main/java/org/mvplugins/multiverse/core/utils/PlayerFinder.java similarity index 99% rename from src/main/java/com/onarandombox/MultiverseCore/utils/PlayerFinder.java rename to src/main/java/org/mvplugins/multiverse/core/utils/PlayerFinder.java index 30eb5a64..25637ffe 100644 --- a/src/main/java/com/onarandombox/MultiverseCore/utils/PlayerFinder.java +++ b/src/main/java/org/mvplugins/multiverse/core/utils/PlayerFinder.java @@ -1,4 +1,4 @@ -package com.onarandombox.MultiverseCore.utils; +package org.mvplugins.multiverse.core.utils; import java.util.ArrayList; import java.util.List; diff --git a/src/main/java/com/onarandombox/MultiverseCore/utils/ReflectHelper.java b/src/main/java/org/mvplugins/multiverse/core/utils/ReflectHelper.java similarity index 98% rename from src/main/java/com/onarandombox/MultiverseCore/utils/ReflectHelper.java rename to src/main/java/org/mvplugins/multiverse/core/utils/ReflectHelper.java index 9aa138c2..a006837f 100644 --- a/src/main/java/com/onarandombox/MultiverseCore/utils/ReflectHelper.java +++ b/src/main/java/org/mvplugins/multiverse/core/utils/ReflectHelper.java @@ -1,4 +1,4 @@ -package com.onarandombox.MultiverseCore.utils; +package org.mvplugins.multiverse.core.utils; import java.lang.reflect.Field; import java.lang.reflect.Method; diff --git a/src/main/java/com/onarandombox/MultiverseCore/utils/TestingMode.java b/src/main/java/org/mvplugins/multiverse/core/utils/TestingMode.java similarity index 89% rename from src/main/java/com/onarandombox/MultiverseCore/utils/TestingMode.java rename to src/main/java/org/mvplugins/multiverse/core/utils/TestingMode.java index 81bb0f6e..d7d25a62 100644 --- a/src/main/java/com/onarandombox/MultiverseCore/utils/TestingMode.java +++ b/src/main/java/org/mvplugins/multiverse/core/utils/TestingMode.java @@ -1,4 +1,4 @@ -package com.onarandombox.MultiverseCore.utils; +package org.mvplugins.multiverse.core.utils; /** * A utility class that enables automated tests to flag Multiverse for testing. This allows Multiverse to not perform diff --git a/src/main/java/com/onarandombox/MultiverseCore/utils/UnsafeCallWrapper.java b/src/main/java/org/mvplugins/multiverse/core/utils/UnsafeCallWrapper.java similarity index 94% rename from src/main/java/com/onarandombox/MultiverseCore/utils/UnsafeCallWrapper.java rename to src/main/java/org/mvplugins/multiverse/core/utils/UnsafeCallWrapper.java index 4414864e..77318822 100644 --- a/src/main/java/com/onarandombox/MultiverseCore/utils/UnsafeCallWrapper.java +++ b/src/main/java/org/mvplugins/multiverse/core/utils/UnsafeCallWrapper.java @@ -1,11 +1,11 @@ -package com.onarandombox.MultiverseCore.utils; +package org.mvplugins.multiverse.core.utils; import java.util.concurrent.Callable; import com.dumptruckman.minecraft.util.Logging; -import com.onarandombox.MultiverseCore.config.MVCoreConfig; import jakarta.inject.Inject; import org.jvnet.hk2.annotations.Service; +import org.mvplugins.multiverse.core.config.MVCoreConfig; /** * Wraps calls that could result in exceptions that are not Multiverse's fault. diff --git a/src/main/java/com/onarandombox/MultiverseCore/utils/file/FileResClassLoader.java b/src/main/java/org/mvplugins/multiverse/core/utils/file/FileResClassLoader.java similarity index 96% rename from src/main/java/com/onarandombox/MultiverseCore/utils/file/FileResClassLoader.java rename to src/main/java/org/mvplugins/multiverse/core/utils/file/FileResClassLoader.java index 3342841e..d1ee604e 100644 --- a/src/main/java/com/onarandombox/MultiverseCore/utils/file/FileResClassLoader.java +++ b/src/main/java/org/mvplugins/multiverse/core/utils/file/FileResClassLoader.java @@ -1,4 +1,4 @@ -package com.onarandombox.MultiverseCore.utils.file; +package org.mvplugins.multiverse.core.utils.file; import java.io.File; import java.io.FileInputStream; diff --git a/src/main/java/com/onarandombox/MultiverseCore/utils/file/FileUtils.java b/src/main/java/org/mvplugins/multiverse/core/utils/file/FileUtils.java similarity index 99% rename from src/main/java/com/onarandombox/MultiverseCore/utils/file/FileUtils.java rename to src/main/java/org/mvplugins/multiverse/core/utils/file/FileUtils.java index 0043378c..881ca7be 100644 --- a/src/main/java/com/onarandombox/MultiverseCore/utils/file/FileUtils.java +++ b/src/main/java/org/mvplugins/multiverse/core/utils/file/FileUtils.java @@ -5,7 +5,7 @@ * with this project. * ******************************************************************************/ -package com.onarandombox.MultiverseCore.utils.file; +package org.mvplugins.multiverse.core.utils.file; import static java.nio.file.StandardCopyOption.COPY_ATTRIBUTES; import static org.bukkit.Bukkit.getServer; diff --git a/src/main/java/com/onarandombox/MultiverseCore/utils/file/package-info.java b/src/main/java/org/mvplugins/multiverse/core/utils/file/package-info.java similarity index 60% rename from src/main/java/com/onarandombox/MultiverseCore/utils/file/package-info.java rename to src/main/java/org/mvplugins/multiverse/core/utils/file/package-info.java index f74ce7d4..2620b2e0 100644 --- a/src/main/java/com/onarandombox/MultiverseCore/utils/file/package-info.java +++ b/src/main/java/org/mvplugins/multiverse/core/utils/file/package-info.java @@ -1,4 +1,4 @@ /** * This package contains all the classes that deal with files on disk. */ -package com.onarandombox.MultiverseCore.utils.file; \ No newline at end of file +package org.mvplugins.multiverse.core.utils.file; \ No newline at end of file diff --git a/src/main/java/com/onarandombox/MultiverseCore/utils/message/LocalizedMessage.java b/src/main/java/org/mvplugins/multiverse/core/utils/message/LocalizedMessage.java similarity index 94% rename from src/main/java/com/onarandombox/MultiverseCore/utils/message/LocalizedMessage.java rename to src/main/java/org/mvplugins/multiverse/core/utils/message/LocalizedMessage.java index db07c010..1a290bb1 100644 --- a/src/main/java/com/onarandombox/MultiverseCore/utils/message/LocalizedMessage.java +++ b/src/main/java/org/mvplugins/multiverse/core/utils/message/LocalizedMessage.java @@ -1,4 +1,4 @@ -package com.onarandombox.MultiverseCore.utils.message; +package org.mvplugins.multiverse.core.utils.message; import java.util.Objects; @@ -6,9 +6,9 @@ import co.aikar.commands.ACFUtil; import co.aikar.commands.CommandIssuer; import co.aikar.locales.MessageKey; import co.aikar.locales.MessageKeyProvider; -import com.onarandombox.MultiverseCore.commandtools.PluginLocales; 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/com/onarandombox/MultiverseCore/utils/message/Message.java b/src/main/java/org/mvplugins/multiverse/core/utils/message/Message.java similarity index 97% rename from src/main/java/com/onarandombox/MultiverseCore/utils/message/Message.java rename to src/main/java/org/mvplugins/multiverse/core/utils/message/Message.java index 150a3119..2a713fb4 100644 --- a/src/main/java/com/onarandombox/MultiverseCore/utils/message/Message.java +++ b/src/main/java/org/mvplugins/multiverse/core/utils/message/Message.java @@ -1,14 +1,14 @@ -package com.onarandombox.MultiverseCore.utils.message; +package org.mvplugins.multiverse.core.utils.message; import java.util.Objects; import co.aikar.commands.ACFUtil; import co.aikar.commands.CommandIssuer; import co.aikar.locales.MessageKeyProvider; -import com.onarandombox.MultiverseCore.commandtools.PluginLocales; import org.jetbrains.annotations.Contract; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; +import org.mvplugins.multiverse.core.commandtools.PluginLocales; /** * A message that can be formatted with replacements and localized. diff --git a/src/main/java/com/onarandombox/MultiverseCore/utils/message/MessageReplacement.java b/src/main/java/org/mvplugins/multiverse/core/utils/message/MessageReplacement.java similarity index 97% rename from src/main/java/com/onarandombox/MultiverseCore/utils/message/MessageReplacement.java rename to src/main/java/org/mvplugins/multiverse/core/utils/message/MessageReplacement.java index 010dd943..9dd9af10 100644 --- a/src/main/java/com/onarandombox/MultiverseCore/utils/message/MessageReplacement.java +++ b/src/main/java/org/mvplugins/multiverse/core/utils/message/MessageReplacement.java @@ -1,4 +1,4 @@ -package com.onarandombox.MultiverseCore.utils.message; +package org.mvplugins.multiverse.core.utils.message; import io.vavr.control.Either; import org.jetbrains.annotations.Contract; diff --git a/src/main/java/org/mvplugins/multiverse/core/utils/message/package-info.java b/src/main/java/org/mvplugins/multiverse/core/utils/message/package-info.java new file mode 100644 index 00000000..5eb63de4 --- /dev/null +++ b/src/main/java/org/mvplugins/multiverse/core/utils/message/package-info.java @@ -0,0 +1 @@ +package org.mvplugins.multiverse.core.utils.message; diff --git a/src/main/java/com/onarandombox/MultiverseCore/utils/metrics/MetricsConfigurator.java b/src/main/java/org/mvplugins/multiverse/core/utils/metrics/MetricsConfigurator.java similarity index 91% rename from src/main/java/com/onarandombox/MultiverseCore/utils/metrics/MetricsConfigurator.java rename to src/main/java/org/mvplugins/multiverse/core/utils/metrics/MetricsConfigurator.java index c65d6a7b..bbd4c6f8 100644 --- a/src/main/java/com/onarandombox/MultiverseCore/utils/metrics/MetricsConfigurator.java +++ b/src/main/java/org/mvplugins/multiverse/core/utils/metrics/MetricsConfigurator.java @@ -1,18 +1,18 @@ -package com.onarandombox.MultiverseCore.utils.metrics; +package org.mvplugins.multiverse.core.utils.metrics; import java.util.Map; import java.util.function.Consumer; import com.dumptruckman.minecraft.util.Logging; -import com.onarandombox.MultiverseCore.MultiverseCore; -import com.onarandombox.MultiverseCore.worldnew.LoadedMultiverseWorld; -import com.onarandombox.MultiverseCore.worldnew.WorldManager; import jakarta.annotation.PostConstruct; import jakarta.inject.Inject; 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; @Service public class MetricsConfigurator { diff --git a/src/main/java/com/onarandombox/MultiverseCore/utils/metrics/MetricsHelper.java b/src/main/java/org/mvplugins/multiverse/core/utils/metrics/MetricsHelper.java similarity index 94% rename from src/main/java/com/onarandombox/MultiverseCore/utils/metrics/MetricsHelper.java rename to src/main/java/org/mvplugins/multiverse/core/utils/metrics/MetricsHelper.java index a604ad58..5a614d13 100644 --- a/src/main/java/com/onarandombox/MultiverseCore/utils/metrics/MetricsHelper.java +++ b/src/main/java/org/mvplugins/multiverse/core/utils/metrics/MetricsHelper.java @@ -1,4 +1,4 @@ -package com.onarandombox.MultiverseCore.utils.metrics; +package org.mvplugins.multiverse.core.utils.metrics; import java.util.HashMap; import java.util.Map; diff --git a/src/main/java/com/onarandombox/MultiverseCore/utils/metrics/package-info.java b/src/main/java/org/mvplugins/multiverse/core/utils/metrics/package-info.java similarity index 65% rename from src/main/java/com/onarandombox/MultiverseCore/utils/metrics/package-info.java rename to src/main/java/org/mvplugins/multiverse/core/utils/metrics/package-info.java index 8a152336..c9dfc6a4 100644 --- a/src/main/java/com/onarandombox/MultiverseCore/utils/metrics/package-info.java +++ b/src/main/java/org/mvplugins/multiverse/core/utils/metrics/package-info.java @@ -1,4 +1,4 @@ /** * This package contains the Metrics class, which is used to collect anonymous data for bstats. */ -package com.onarandombox.MultiverseCore.utils.metrics; +package org.mvplugins.multiverse.core.utils.metrics; diff --git a/src/main/java/com/onarandombox/MultiverseCore/utils/package-info.java b/src/main/java/org/mvplugins/multiverse/core/utils/package-info.java similarity index 53% rename from src/main/java/com/onarandombox/MultiverseCore/utils/package-info.java rename to src/main/java/org/mvplugins/multiverse/core/utils/package-info.java index e35f9681..4232a6a7 100644 --- a/src/main/java/com/onarandombox/MultiverseCore/utils/package-info.java +++ b/src/main/java/org/mvplugins/multiverse/core/utils/package-info.java @@ -1,4 +1,4 @@ /** * This package contains all Utility-clases. */ -package com.onarandombox.MultiverseCore.utils; +package org.mvplugins.multiverse.core.utils; diff --git a/src/main/java/com/onarandombox/MultiverseCore/utils/result/Attempt.java b/src/main/java/org/mvplugins/multiverse/core/utils/result/Attempt.java similarity index 98% rename from src/main/java/com/onarandombox/MultiverseCore/utils/result/Attempt.java rename to src/main/java/org/mvplugins/multiverse/core/utils/result/Attempt.java index 48ba438e..203f115e 100644 --- a/src/main/java/com/onarandombox/MultiverseCore/utils/result/Attempt.java +++ b/src/main/java/org/mvplugins/multiverse/core/utils/result/Attempt.java @@ -1,11 +1,11 @@ -package com.onarandombox.MultiverseCore.utils.result; +package org.mvplugins.multiverse.core.utils.result; import java.util.function.Consumer; import java.util.function.Function; import java.util.function.Supplier; -import com.onarandombox.MultiverseCore.utils.message.Message; -import com.onarandombox.MultiverseCore.utils.message.MessageReplacement; +import org.mvplugins.multiverse.core.utils.message.Message; +import org.mvplugins.multiverse.core.utils.message.MessageReplacement; /** * Represents an attempt to process a value that can fail with a reason that has a localized message. diff --git a/src/main/java/com/onarandombox/MultiverseCore/utils/result/FailureReason.java b/src/main/java/org/mvplugins/multiverse/core/utils/result/FailureReason.java similarity index 69% rename from src/main/java/com/onarandombox/MultiverseCore/utils/result/FailureReason.java rename to src/main/java/org/mvplugins/multiverse/core/utils/result/FailureReason.java index 96711e4f..e9c5ef50 100644 --- a/src/main/java/com/onarandombox/MultiverseCore/utils/result/FailureReason.java +++ b/src/main/java/org/mvplugins/multiverse/core/utils/result/FailureReason.java @@ -1,8 +1,8 @@ -package com.onarandombox.MultiverseCore.utils.result; +package org.mvplugins.multiverse.core.utils.result; import co.aikar.locales.MessageKey; import co.aikar.locales.MessageKeyProvider; -import com.onarandombox.MultiverseCore.utils.MVCorei18n; +import org.mvplugins.multiverse.core.utils.MVCorei18n; public interface FailureReason extends MessageKeyProvider { default MessageKey getMessageKey() { diff --git a/src/main/java/com/onarandombox/MultiverseCore/utils/result/Result.java b/src/main/java/org/mvplugins/multiverse/core/utils/result/Result.java similarity index 98% rename from src/main/java/com/onarandombox/MultiverseCore/utils/result/Result.java rename to src/main/java/org/mvplugins/multiverse/core/utils/result/Result.java index bc00c9ac..021b35db 100644 --- a/src/main/java/com/onarandombox/MultiverseCore/utils/result/Result.java +++ b/src/main/java/org/mvplugins/multiverse/core/utils/result/Result.java @@ -1,11 +1,11 @@ -package com.onarandombox.MultiverseCore.utils.result; +package org.mvplugins.multiverse.core.utils.result; import java.util.function.Consumer; import java.util.function.Function; -import com.onarandombox.MultiverseCore.utils.message.Message; -import com.onarandombox.MultiverseCore.utils.message.MessageReplacement; import org.jetbrains.annotations.NotNull; +import org.mvplugins.multiverse.core.utils.message.Message; +import org.mvplugins.multiverse.core.utils.message.MessageReplacement; /** * Represents result of an operation with a reason for success or failure that has localized messages. diff --git a/src/main/java/com/onarandombox/MultiverseCore/utils/result/ResultChain.java b/src/main/java/org/mvplugins/multiverse/core/utils/result/ResultChain.java similarity index 97% rename from src/main/java/com/onarandombox/MultiverseCore/utils/result/ResultChain.java rename to src/main/java/org/mvplugins/multiverse/core/utils/result/ResultChain.java index 1ef5d3e9..58cc5d8f 100644 --- a/src/main/java/com/onarandombox/MultiverseCore/utils/result/ResultChain.java +++ b/src/main/java/org/mvplugins/multiverse/core/utils/result/ResultChain.java @@ -1,4 +1,4 @@ -package com.onarandombox.MultiverseCore.utils.result; +package org.mvplugins.multiverse.core.utils.result; import java.util.ArrayList; import java.util.List; @@ -8,8 +8,8 @@ import java.util.function.Supplier; import java.util.stream.Collectors; import com.google.common.collect.Iterables; -import com.onarandombox.MultiverseCore.utils.message.Message; import io.vavr.control.Option; +import org.mvplugins.multiverse.core.utils.message.Message; public class ResultChain { public static Builder builder() { diff --git a/src/main/java/com/onarandombox/MultiverseCore/utils/result/SuccessReason.java b/src/main/java/org/mvplugins/multiverse/core/utils/result/SuccessReason.java similarity index 69% rename from src/main/java/com/onarandombox/MultiverseCore/utils/result/SuccessReason.java rename to src/main/java/org/mvplugins/multiverse/core/utils/result/SuccessReason.java index d32cc0b0..591fb39f 100644 --- a/src/main/java/com/onarandombox/MultiverseCore/utils/result/SuccessReason.java +++ b/src/main/java/org/mvplugins/multiverse/core/utils/result/SuccessReason.java @@ -1,8 +1,8 @@ -package com.onarandombox.MultiverseCore.utils.result; +package org.mvplugins.multiverse.core.utils.result; import co.aikar.locales.MessageKey; import co.aikar.locales.MessageKeyProvider; -import com.onarandombox.MultiverseCore.utils.MVCorei18n; +import org.mvplugins.multiverse.core.utils.MVCorei18n; public interface SuccessReason extends MessageKeyProvider { default MessageKey getMessageKey() { diff --git a/src/main/java/org/mvplugins/multiverse/core/utils/result/package-info.java b/src/main/java/org/mvplugins/multiverse/core/utils/result/package-info.java new file mode 100644 index 00000000..73cc7a9c --- /dev/null +++ b/src/main/java/org/mvplugins/multiverse/core/utils/result/package-info.java @@ -0,0 +1 @@ +package org.mvplugins.multiverse.core.utils.result; diff --git a/src/main/java/com/onarandombox/MultiverseCore/utils/webpaste/BitlyURLShortener.java b/src/main/java/org/mvplugins/multiverse/core/utils/webpaste/BitlyURLShortener.java similarity index 96% rename from src/main/java/com/onarandombox/MultiverseCore/utils/webpaste/BitlyURLShortener.java rename to src/main/java/org/mvplugins/multiverse/core/utils/webpaste/BitlyURLShortener.java index bcac458e..2bdac14c 100644 --- a/src/main/java/com/onarandombox/MultiverseCore/utils/webpaste/BitlyURLShortener.java +++ b/src/main/java/org/mvplugins/multiverse/core/utils/webpaste/BitlyURLShortener.java @@ -1,4 +1,4 @@ -package com.onarandombox.MultiverseCore.utils.webpaste; +package org.mvplugins.multiverse.core.utils.webpaste; import java.io.IOException; import java.util.Map; diff --git a/src/main/java/com/onarandombox/MultiverseCore/utils/webpaste/GitHubPasteService.java b/src/main/java/org/mvplugins/multiverse/core/utils/webpaste/GitHubPasteService.java similarity index 98% rename from src/main/java/com/onarandombox/MultiverseCore/utils/webpaste/GitHubPasteService.java rename to src/main/java/org/mvplugins/multiverse/core/utils/webpaste/GitHubPasteService.java index b7c05edb..f34b122f 100644 --- a/src/main/java/com/onarandombox/MultiverseCore/utils/webpaste/GitHubPasteService.java +++ b/src/main/java/org/mvplugins/multiverse/core/utils/webpaste/GitHubPasteService.java @@ -1,4 +1,4 @@ -package com.onarandombox.MultiverseCore.utils.webpaste; +package org.mvplugins.multiverse.core.utils.webpaste; import java.io.IOException; import java.util.HashMap; diff --git a/src/main/java/com/onarandombox/MultiverseCore/utils/webpaste/HttpAPIClient.java b/src/main/java/org/mvplugins/multiverse/core/utils/webpaste/HttpAPIClient.java similarity index 98% rename from src/main/java/com/onarandombox/MultiverseCore/utils/webpaste/HttpAPIClient.java rename to src/main/java/org/mvplugins/multiverse/core/utils/webpaste/HttpAPIClient.java index 54064ef5..c10428a2 100644 --- a/src/main/java/com/onarandombox/MultiverseCore/utils/webpaste/HttpAPIClient.java +++ b/src/main/java/org/mvplugins/multiverse/core/utils/webpaste/HttpAPIClient.java @@ -1,4 +1,4 @@ -package com.onarandombox.MultiverseCore.utils.webpaste; +package org.mvplugins.multiverse.core.utils.webpaste; import javax.net.ssl.HttpsURLConnection; import java.io.BufferedReader; diff --git a/src/main/java/com/onarandombox/MultiverseCore/utils/webpaste/McloGsPasteService.java b/src/main/java/org/mvplugins/multiverse/core/utils/webpaste/McloGsPasteService.java similarity index 96% rename from src/main/java/com/onarandombox/MultiverseCore/utils/webpaste/McloGsPasteService.java rename to src/main/java/org/mvplugins/multiverse/core/utils/webpaste/McloGsPasteService.java index 930af75f..7a7104be 100644 --- a/src/main/java/com/onarandombox/MultiverseCore/utils/webpaste/McloGsPasteService.java +++ b/src/main/java/org/mvplugins/multiverse/core/utils/webpaste/McloGsPasteService.java @@ -1,4 +1,4 @@ -package com.onarandombox.MultiverseCore.utils.webpaste; +package org.mvplugins.multiverse.core.utils.webpaste; import java.io.IOException; import java.util.Map; diff --git a/src/main/java/com/onarandombox/MultiverseCore/utils/webpaste/PasteFailedException.java b/src/main/java/org/mvplugins/multiverse/core/utils/webpaste/PasteFailedException.java similarity index 80% rename from src/main/java/com/onarandombox/MultiverseCore/utils/webpaste/PasteFailedException.java rename to src/main/java/org/mvplugins/multiverse/core/utils/webpaste/PasteFailedException.java index 82792f49..24ce6e12 100644 --- a/src/main/java/com/onarandombox/MultiverseCore/utils/webpaste/PasteFailedException.java +++ b/src/main/java/org/mvplugins/multiverse/core/utils/webpaste/PasteFailedException.java @@ -1,4 +1,4 @@ -package com.onarandombox.MultiverseCore.utils.webpaste; +package org.mvplugins.multiverse.core.utils.webpaste; /** * Thrown when pasting fails. diff --git a/src/main/java/com/onarandombox/MultiverseCore/utils/webpaste/PasteGGPasteService.java b/src/main/java/org/mvplugins/multiverse/core/utils/webpaste/PasteGGPasteService.java similarity index 97% rename from src/main/java/com/onarandombox/MultiverseCore/utils/webpaste/PasteGGPasteService.java rename to src/main/java/org/mvplugins/multiverse/core/utils/webpaste/PasteGGPasteService.java index cf54c346..e92de826 100644 --- a/src/main/java/com/onarandombox/MultiverseCore/utils/webpaste/PasteGGPasteService.java +++ b/src/main/java/org/mvplugins/multiverse/core/utils/webpaste/PasteGGPasteService.java @@ -1,4 +1,4 @@ -package com.onarandombox.MultiverseCore.utils.webpaste; +package org.mvplugins.multiverse.core.utils.webpaste; import java.io.IOException; import java.util.HashMap; diff --git a/src/main/java/com/onarandombox/MultiverseCore/utils/webpaste/PasteService.java b/src/main/java/org/mvplugins/multiverse/core/utils/webpaste/PasteService.java similarity index 96% rename from src/main/java/com/onarandombox/MultiverseCore/utils/webpaste/PasteService.java rename to src/main/java/org/mvplugins/multiverse/core/utils/webpaste/PasteService.java index a6bc15c4..95fd93f9 100644 --- a/src/main/java/com/onarandombox/MultiverseCore/utils/webpaste/PasteService.java +++ b/src/main/java/org/mvplugins/multiverse/core/utils/webpaste/PasteService.java @@ -1,4 +1,4 @@ -package com.onarandombox.MultiverseCore.utils.webpaste; +package org.mvplugins.multiverse.core.utils.webpaste; import java.util.Map; diff --git a/src/main/java/com/onarandombox/MultiverseCore/utils/webpaste/PasteServiceFactory.java b/src/main/java/org/mvplugins/multiverse/core/utils/webpaste/PasteServiceFactory.java similarity index 93% rename from src/main/java/com/onarandombox/MultiverseCore/utils/webpaste/PasteServiceFactory.java rename to src/main/java/org/mvplugins/multiverse/core/utils/webpaste/PasteServiceFactory.java index 3cc6b9e7..5d47a016 100644 --- a/src/main/java/com/onarandombox/MultiverseCore/utils/webpaste/PasteServiceFactory.java +++ b/src/main/java/org/mvplugins/multiverse/core/utils/webpaste/PasteServiceFactory.java @@ -1,4 +1,4 @@ -package com.onarandombox.MultiverseCore.utils.webpaste; +package org.mvplugins.multiverse.core.utils.webpaste; /** * Used to construct {@link PasteService}s. diff --git a/src/main/java/com/onarandombox/MultiverseCore/utils/webpaste/PasteServiceType.java b/src/main/java/org/mvplugins/multiverse/core/utils/webpaste/PasteServiceType.java similarity index 89% rename from src/main/java/com/onarandombox/MultiverseCore/utils/webpaste/PasteServiceType.java rename to src/main/java/org/mvplugins/multiverse/core/utils/webpaste/PasteServiceType.java index 2f9ace48..9d8ae50c 100644 --- a/src/main/java/com/onarandombox/MultiverseCore/utils/webpaste/PasteServiceType.java +++ b/src/main/java/org/mvplugins/multiverse/core/utils/webpaste/PasteServiceType.java @@ -1,4 +1,4 @@ -package com.onarandombox.MultiverseCore.utils.webpaste; +package org.mvplugins.multiverse.core.utils.webpaste; /** * An enum containing all known {@link PasteService}s. diff --git a/src/main/java/com/onarandombox/MultiverseCore/utils/webpaste/PastebinPasteService.java b/src/main/java/org/mvplugins/multiverse/core/utils/webpaste/PastebinPasteService.java similarity index 97% rename from src/main/java/com/onarandombox/MultiverseCore/utils/webpaste/PastebinPasteService.java rename to src/main/java/org/mvplugins/multiverse/core/utils/webpaste/PastebinPasteService.java index c44321c2..18a39c5f 100644 --- a/src/main/java/com/onarandombox/MultiverseCore/utils/webpaste/PastebinPasteService.java +++ b/src/main/java/org/mvplugins/multiverse/core/utils/webpaste/PastebinPasteService.java @@ -1,4 +1,4 @@ -package com.onarandombox.MultiverseCore.utils.webpaste; +package org.mvplugins.multiverse.core.utils.webpaste; import java.io.IOException; import java.net.URLEncoder; diff --git a/src/main/java/com/onarandombox/MultiverseCore/utils/webpaste/PastesDevPasteService.java b/src/main/java/org/mvplugins/multiverse/core/utils/webpaste/PastesDevPasteService.java similarity index 96% rename from src/main/java/com/onarandombox/MultiverseCore/utils/webpaste/PastesDevPasteService.java rename to src/main/java/org/mvplugins/multiverse/core/utils/webpaste/PastesDevPasteService.java index 42f042d0..57501345 100644 --- a/src/main/java/com/onarandombox/MultiverseCore/utils/webpaste/PastesDevPasteService.java +++ b/src/main/java/org/mvplugins/multiverse/core/utils/webpaste/PastesDevPasteService.java @@ -1,4 +1,4 @@ -package com.onarandombox.MultiverseCore.utils.webpaste; +package org.mvplugins.multiverse.core.utils.webpaste; import java.io.IOException; import java.util.Map; diff --git a/src/main/java/com/onarandombox/MultiverseCore/utils/webpaste/URLShortener.java b/src/main/java/org/mvplugins/multiverse/core/utils/webpaste/URLShortener.java similarity index 92% rename from src/main/java/com/onarandombox/MultiverseCore/utils/webpaste/URLShortener.java rename to src/main/java/org/mvplugins/multiverse/core/utils/webpaste/URLShortener.java index bde8ff1d..f440b553 100644 --- a/src/main/java/com/onarandombox/MultiverseCore/utils/webpaste/URLShortener.java +++ b/src/main/java/org/mvplugins/multiverse/core/utils/webpaste/URLShortener.java @@ -1,4 +1,4 @@ -package com.onarandombox.MultiverseCore.utils.webpaste; +package org.mvplugins.multiverse.core.utils.webpaste; /** * An interface to a web-based URL Shortener. Classes extending this should diff --git a/src/main/java/com/onarandombox/MultiverseCore/utils/webpaste/URLShortenerFactory.java b/src/main/java/org/mvplugins/multiverse/core/utils/webpaste/URLShortenerFactory.java similarity index 91% rename from src/main/java/com/onarandombox/MultiverseCore/utils/webpaste/URLShortenerFactory.java rename to src/main/java/org/mvplugins/multiverse/core/utils/webpaste/URLShortenerFactory.java index c0f3cafa..88c725e8 100644 --- a/src/main/java/com/onarandombox/MultiverseCore/utils/webpaste/URLShortenerFactory.java +++ b/src/main/java/org/mvplugins/multiverse/core/utils/webpaste/URLShortenerFactory.java @@ -1,4 +1,4 @@ -package com.onarandombox.MultiverseCore.utils.webpaste; +package org.mvplugins.multiverse.core.utils.webpaste; /** * Used to construct {@link URLShortener}s. diff --git a/src/main/java/com/onarandombox/MultiverseCore/utils/webpaste/URLShortenerType.java b/src/main/java/org/mvplugins/multiverse/core/utils/webpaste/URLShortenerType.java similarity index 78% rename from src/main/java/com/onarandombox/MultiverseCore/utils/webpaste/URLShortenerType.java rename to src/main/java/org/mvplugins/multiverse/core/utils/webpaste/URLShortenerType.java index d2c809f5..02f7ad60 100644 --- a/src/main/java/com/onarandombox/MultiverseCore/utils/webpaste/URLShortenerType.java +++ b/src/main/java/org/mvplugins/multiverse/core/utils/webpaste/URLShortenerType.java @@ -1,4 +1,4 @@ -package com.onarandombox.MultiverseCore.utils.webpaste; +package org.mvplugins.multiverse.core.utils.webpaste; /** * An enum containing all known {@link URLShortener}s. diff --git a/src/main/java/org/mvplugins/multiverse/core/utils/webpaste/package-info.java b/src/main/java/org/mvplugins/multiverse/core/utils/webpaste/package-info.java new file mode 100644 index 00000000..701646b2 --- /dev/null +++ b/src/main/java/org/mvplugins/multiverse/core/utils/webpaste/package-info.java @@ -0,0 +1,4 @@ +/** + * This package contains webpaste-utilities. + */ +package org.mvplugins.multiverse.core.utils.webpaste; diff --git a/src/main/java/com/onarandombox/MultiverseCore/world/SimpleMVWorld.java b/src/main/java/org/mvplugins/multiverse/core/world/SimpleMVWorld.java similarity index 97% rename from src/main/java/com/onarandombox/MultiverseCore/world/SimpleMVWorld.java rename to src/main/java/org/mvplugins/multiverse/core/world/SimpleMVWorld.java index 2f39b53f..e87081e9 100644 --- a/src/main/java/com/onarandombox/MultiverseCore/world/SimpleMVWorld.java +++ b/src/main/java/org/mvplugins/multiverse/core/world/SimpleMVWorld.java @@ -5,7 +5,7 @@ * with this project. * ******************************************************************************/ -package com.onarandombox.MultiverseCore.world; +package org.mvplugins.multiverse.core.world; import java.util.Collections; import java.util.List; @@ -13,20 +13,6 @@ import java.util.Map; import java.util.UUID; import com.dumptruckman.minecraft.util.Logging; -import com.onarandombox.MultiverseCore.api.BlockSafety; -import com.onarandombox.MultiverseCore.api.LocationManipulation; -import com.onarandombox.MultiverseCore.api.MVWorld; -import com.onarandombox.MultiverseCore.api.MVWorldManager; -import com.onarandombox.MultiverseCore.api.SafeTTeleporter; -import com.onarandombox.MultiverseCore.api.WorldPurger; -import com.onarandombox.MultiverseCore.config.MVCoreConfig; -import com.onarandombox.MultiverseCore.exceptions.PropertyDoesNotExistException; -import com.onarandombox.MultiverseCore.listeners.MVPlayerListener; -import com.onarandombox.MultiverseCore.world.configuration.AllowedPortalType; -import com.onarandombox.MultiverseCore.world.configuration.EnglishChatColor; -import com.onarandombox.MultiverseCore.world.configuration.SpawnSettings; -import com.onarandombox.MultiverseCore.world.configuration.WorldPropertyValidator; -import com.onarandombox.MultiverseCore.worldnew.config.SpawnLocation; import me.main__.util.SerializationConfig.ChangeDeniedException; import me.main__.util.SerializationConfig.NoSuchPropertyException; import me.main__.util.SerializationConfig.VirtualProperty; @@ -46,6 +32,20 @@ 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; +import org.mvplugins.multiverse.core.api.MVWorldManager; +import org.mvplugins.multiverse.core.api.SafeTTeleporter; +import org.mvplugins.multiverse.core.api.WorldPurger; +import org.mvplugins.multiverse.core.config.MVCoreConfig; +import org.mvplugins.multiverse.core.exceptions.PropertyDoesNotExistException; +import org.mvplugins.multiverse.core.listeners.MVPlayerListener; +import org.mvplugins.multiverse.core.world.configuration.AllowedPortalType; +import org.mvplugins.multiverse.core.world.configuration.EnglishChatColor; +import org.mvplugins.multiverse.core.world.configuration.SpawnSettings; +import org.mvplugins.multiverse.core.world.configuration.WorldPropertyValidator; +import org.mvplugins.multiverse.core.worldnew.config.SpawnLocation; /** * The implementation of a Multiverse handled world. diff --git a/src/main/java/com/onarandombox/MultiverseCore/world/SimpleMVWorldManager.java b/src/main/java/org/mvplugins/multiverse/core/world/SimpleMVWorldManager.java similarity index 97% rename from src/main/java/com/onarandombox/MultiverseCore/world/SimpleMVWorldManager.java rename to src/main/java/org/mvplugins/multiverse/core/world/SimpleMVWorldManager.java index a2356d96..6e66090e 100644 --- a/src/main/java/com/onarandombox/MultiverseCore/world/SimpleMVWorldManager.java +++ b/src/main/java/org/mvplugins/multiverse/core/world/SimpleMVWorldManager.java @@ -5,9 +5,9 @@ * with this project. * ******************************************************************************/ -package com.onarandombox.MultiverseCore.world; +package org.mvplugins.multiverse.core.world; -import static com.onarandombox.MultiverseCore.utils.file.FileUtils.getBukkitConfig; +import static org.mvplugins.multiverse.core.utils.file.FileUtils.getBukkitConfig; import java.io.File; import java.io.IOException; @@ -26,18 +26,6 @@ import java.util.concurrent.ConcurrentHashMap; import java.util.stream.Collectors; import com.dumptruckman.minecraft.util.Logging; -import com.onarandombox.MultiverseCore.MultiverseCore; -import com.onarandombox.MultiverseCore.api.BlockSafety; -import com.onarandombox.MultiverseCore.api.LocationManipulation; -import com.onarandombox.MultiverseCore.api.MVWorld; -import com.onarandombox.MultiverseCore.api.MVWorldManager; -import com.onarandombox.MultiverseCore.api.SafeTTeleporter; -import com.onarandombox.MultiverseCore.api.WorldPurger; -import com.onarandombox.MultiverseCore.config.MVCoreConfig; -import com.onarandombox.MultiverseCore.event.MVWorldDeleteEvent; -import com.onarandombox.MultiverseCore.listeners.MVPlayerListener; -import com.onarandombox.MultiverseCore.utils.UnsafeCallWrapper; -import com.onarandombox.MultiverseCore.utils.file.FileUtils; import jakarta.inject.Inject; import org.bukkit.Bukkit; import org.bukkit.GameRule; @@ -56,6 +44,18 @@ 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; +import org.mvplugins.multiverse.core.api.MVWorld; +import org.mvplugins.multiverse.core.api.MVWorldManager; +import org.mvplugins.multiverse.core.api.SafeTTeleporter; +import org.mvplugins.multiverse.core.api.WorldPurger; +import org.mvplugins.multiverse.core.config.MVCoreConfig; +import org.mvplugins.multiverse.core.event.MVWorldDeleteEvent; +import org.mvplugins.multiverse.core.listeners.MVPlayerListener; +import org.mvplugins.multiverse.core.utils.UnsafeCallWrapper; +import org.mvplugins.multiverse.core.utils.file.FileUtils; /** * Public facing API to add/remove Multiverse worlds. diff --git a/src/main/java/com/onarandombox/MultiverseCore/world/SimpleWorldPurger.java b/src/main/java/org/mvplugins/multiverse/core/world/SimpleWorldPurger.java similarity index 97% rename from src/main/java/com/onarandombox/MultiverseCore/world/SimpleWorldPurger.java rename to src/main/java/org/mvplugins/multiverse/core/world/SimpleWorldPurger.java index 897a538d..fe598879 100644 --- a/src/main/java/com/onarandombox/MultiverseCore/world/SimpleWorldPurger.java +++ b/src/main/java/org/mvplugins/multiverse/core/world/SimpleWorldPurger.java @@ -5,15 +5,13 @@ * with this project. * ******************************************************************************/ -package com.onarandombox.MultiverseCore.world; +package org.mvplugins.multiverse.core.world; import java.util.ArrayList; import java.util.Iterator; import java.util.List; import com.dumptruckman.minecraft.util.Logging; -import com.onarandombox.MultiverseCore.api.MVWorld; -import com.onarandombox.MultiverseCore.api.WorldPurger; import org.bukkit.World; import org.bukkit.command.CommandSender; import org.bukkit.entity.Animals; @@ -28,6 +26,8 @@ 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; /** * Utility class that removes animals from worlds that don't belong there. diff --git a/src/main/java/com/onarandombox/MultiverseCore/world/WorldNameChecker.java b/src/main/java/org/mvplugins/multiverse/core/world/WorldNameChecker.java similarity index 99% rename from src/main/java/com/onarandombox/MultiverseCore/world/WorldNameChecker.java rename to src/main/java/org/mvplugins/multiverse/core/world/WorldNameChecker.java index 258e03b5..5e5af646 100644 --- a/src/main/java/com/onarandombox/MultiverseCore/world/WorldNameChecker.java +++ b/src/main/java/org/mvplugins/multiverse/core/world/WorldNameChecker.java @@ -1,4 +1,4 @@ -package com.onarandombox.MultiverseCore.world; +package org.mvplugins.multiverse.core.world; import java.io.File; import java.util.Collections; diff --git a/src/main/java/com/onarandombox/MultiverseCore/world/WorldProperties.java b/src/main/java/org/mvplugins/multiverse/core/world/WorldProperties.java similarity index 96% rename from src/main/java/com/onarandombox/MultiverseCore/world/WorldProperties.java rename to src/main/java/org/mvplugins/multiverse/core/world/WorldProperties.java index d650f435..d1aa73f0 100644 --- a/src/main/java/com/onarandombox/MultiverseCore/world/WorldProperties.java +++ b/src/main/java/org/mvplugins/multiverse/core/world/WorldProperties.java @@ -1,4 +1,4 @@ -package com.onarandombox.MultiverseCore.world; +package org.mvplugins.multiverse.core.world; import java.util.ArrayList; import java.util.Collections; @@ -8,14 +8,6 @@ import java.util.Map; import java.util.regex.Matcher; import java.util.regex.Pattern; -import com.onarandombox.MultiverseCore.world.SimpleMVWorld.NullLocation; -import com.onarandombox.MultiverseCore.world.configuration.AllowedPortalType; -import com.onarandombox.MultiverseCore.world.configuration.EnglishChatColor; -import com.onarandombox.MultiverseCore.world.configuration.EnglishChatStyle; -import com.onarandombox.MultiverseCore.world.configuration.EntryFee; -import com.onarandombox.MultiverseCore.world.configuration.SpawnSettings; -import com.onarandombox.MultiverseCore.world.configuration.WorldPropertyValidator; -import com.onarandombox.MultiverseCore.worldnew.config.SpawnLocation; import me.main__.util.SerializationConfig.IllegalPropertyValueException; import me.main__.util.SerializationConfig.Property; import me.main__.util.SerializationConfig.SerializationConfig; @@ -30,6 +22,13 @@ 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; +import org.mvplugins.multiverse.core.world.configuration.EntryFee; +import org.mvplugins.multiverse.core.world.configuration.SpawnSettings; +import org.mvplugins.multiverse.core.world.configuration.WorldPropertyValidator; +import org.mvplugins.multiverse.core.worldnew.config.SpawnLocation; /* * This is a property class, I think we don't need that much javadoc. @@ -345,7 +344,7 @@ public class WorldProperties extends SerializationConfig { this.adjustSpawn = true; this.portalForm = AllowedPortalType.ALL; this.gameMode = GameMode.SURVIVAL; - this.spawnLocation = new NullLocation(); + this.spawnLocation = new SimpleMVWorld.NullLocation(); this.autoLoad = true; this.bedRespawn = true; this.worldBlacklist = new ArrayList(); diff --git a/src/main/java/com/onarandombox/MultiverseCore/world/configuration/Action.java b/src/main/java/org/mvplugins/multiverse/core/world/configuration/Action.java similarity index 93% rename from src/main/java/com/onarandombox/MultiverseCore/world/configuration/Action.java rename to src/main/java/org/mvplugins/multiverse/core/world/configuration/Action.java index 12abd84d..998d2022 100644 --- a/src/main/java/com/onarandombox/MultiverseCore/world/configuration/Action.java +++ b/src/main/java/org/mvplugins/multiverse/core/world/configuration/Action.java @@ -5,7 +5,7 @@ * with this project. * ******************************************************************************/ -package com.onarandombox.MultiverseCore.world.configuration; +package org.mvplugins.multiverse.core.world.configuration; /** * A enum containing all actions that can be used to modify world-properties. diff --git a/src/main/java/com/onarandombox/MultiverseCore/world/configuration/AddProperties.java b/src/main/java/org/mvplugins/multiverse/core/world/configuration/AddProperties.java similarity index 92% rename from src/main/java/com/onarandombox/MultiverseCore/world/configuration/AddProperties.java rename to src/main/java/org/mvplugins/multiverse/core/world/configuration/AddProperties.java index 0ee253c3..5f758238 100644 --- a/src/main/java/com/onarandombox/MultiverseCore/world/configuration/AddProperties.java +++ b/src/main/java/org/mvplugins/multiverse/core/world/configuration/AddProperties.java @@ -5,7 +5,7 @@ * with this project. * ******************************************************************************/ -package com.onarandombox.MultiverseCore.world.configuration; +package org.mvplugins.multiverse.core.world.configuration; /** * An enum containing all list-properties. diff --git a/src/main/java/com/onarandombox/MultiverseCore/world/configuration/AllowedPortalType.java b/src/main/java/org/mvplugins/multiverse/core/world/configuration/AllowedPortalType.java similarity index 96% rename from src/main/java/com/onarandombox/MultiverseCore/world/configuration/AllowedPortalType.java rename to src/main/java/org/mvplugins/multiverse/core/world/configuration/AllowedPortalType.java index 26dceeb9..7f8e1af3 100644 --- a/src/main/java/com/onarandombox/MultiverseCore/world/configuration/AllowedPortalType.java +++ b/src/main/java/org/mvplugins/multiverse/core/world/configuration/AllowedPortalType.java @@ -5,7 +5,7 @@ * with this project. * ******************************************************************************/ -package com.onarandombox.MultiverseCore.world.configuration; +package org.mvplugins.multiverse.core.world.configuration; import org.bukkit.PortalType; diff --git a/src/main/java/com/onarandombox/MultiverseCore/world/configuration/EnglishChatColor.java b/src/main/java/org/mvplugins/multiverse/core/world/configuration/EnglishChatColor.java similarity index 97% rename from src/main/java/com/onarandombox/MultiverseCore/world/configuration/EnglishChatColor.java rename to src/main/java/org/mvplugins/multiverse/core/world/configuration/EnglishChatColor.java index b8d15fe4..af94054d 100644 --- a/src/main/java/com/onarandombox/MultiverseCore/world/configuration/EnglishChatColor.java +++ b/src/main/java/org/mvplugins/multiverse/core/world/configuration/EnglishChatColor.java @@ -5,7 +5,7 @@ * with this project. * ******************************************************************************/ -package com.onarandombox.MultiverseCore.world.configuration; +package org.mvplugins.multiverse.core.world.configuration; import org.bukkit.ChatColor; diff --git a/src/main/java/com/onarandombox/MultiverseCore/world/configuration/EnglishChatStyle.java b/src/main/java/org/mvplugins/multiverse/core/world/configuration/EnglishChatStyle.java similarity index 95% rename from src/main/java/com/onarandombox/MultiverseCore/world/configuration/EnglishChatStyle.java rename to src/main/java/org/mvplugins/multiverse/core/world/configuration/EnglishChatStyle.java index f7b78e81..1211af0d 100644 --- a/src/main/java/com/onarandombox/MultiverseCore/world/configuration/EnglishChatStyle.java +++ b/src/main/java/org/mvplugins/multiverse/core/world/configuration/EnglishChatStyle.java @@ -1,4 +1,4 @@ -package com.onarandombox.MultiverseCore.world.configuration; +package org.mvplugins.multiverse.core.world.configuration; import org.bukkit.ChatColor; diff --git a/src/main/java/com/onarandombox/MultiverseCore/world/configuration/EntryFee.java b/src/main/java/org/mvplugins/multiverse/core/world/configuration/EntryFee.java similarity index 94% rename from src/main/java/com/onarandombox/MultiverseCore/world/configuration/EntryFee.java rename to src/main/java/org/mvplugins/multiverse/core/world/configuration/EntryFee.java index 32afbd1c..4e86f9ac 100644 --- a/src/main/java/com/onarandombox/MultiverseCore/world/configuration/EntryFee.java +++ b/src/main/java/org/mvplugins/multiverse/core/world/configuration/EntryFee.java @@ -1,14 +1,14 @@ -package com.onarandombox.MultiverseCore.world.configuration; +package org.mvplugins.multiverse.core.world.configuration; import java.util.Map; -import com.onarandombox.MultiverseCore.utils.MaterialConverter; import me.main__.util.SerializationConfig.Property; import me.main__.util.SerializationConfig.SerializationConfig; 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; /** * Entryfee-settings. diff --git a/src/main/java/com/onarandombox/MultiverseCore/world/configuration/SpawnSettings.java b/src/main/java/org/mvplugins/multiverse/core/world/configuration/SpawnSettings.java similarity index 94% rename from src/main/java/com/onarandombox/MultiverseCore/world/configuration/SpawnSettings.java rename to src/main/java/org/mvplugins/multiverse/core/world/configuration/SpawnSettings.java index 977c8939..f1383dc7 100644 --- a/src/main/java/com/onarandombox/MultiverseCore/world/configuration/SpawnSettings.java +++ b/src/main/java/org/mvplugins/multiverse/core/world/configuration/SpawnSettings.java @@ -1,4 +1,4 @@ -package com.onarandombox.MultiverseCore.world.configuration; +package org.mvplugins.multiverse.core.world.configuration; import java.util.Map; diff --git a/src/main/java/com/onarandombox/MultiverseCore/world/configuration/SubSpawnSettings.java b/src/main/java/org/mvplugins/multiverse/core/world/configuration/SubSpawnSettings.java similarity index 95% rename from src/main/java/com/onarandombox/MultiverseCore/world/configuration/SubSpawnSettings.java rename to src/main/java/org/mvplugins/multiverse/core/world/configuration/SubSpawnSettings.java index ee75ac96..60de09f1 100644 --- a/src/main/java/com/onarandombox/MultiverseCore/world/configuration/SubSpawnSettings.java +++ b/src/main/java/org/mvplugins/multiverse/core/world/configuration/SubSpawnSettings.java @@ -1,4 +1,4 @@ -package com.onarandombox.MultiverseCore.world.configuration; +package org.mvplugins.multiverse.core.world.configuration; import java.util.ArrayList; import java.util.List; diff --git a/src/main/java/com/onarandombox/MultiverseCore/world/configuration/WorldPropertyValidator.java b/src/main/java/org/mvplugins/multiverse/core/world/configuration/WorldPropertyValidator.java similarity index 80% rename from src/main/java/com/onarandombox/MultiverseCore/world/configuration/WorldPropertyValidator.java rename to src/main/java/org/mvplugins/multiverse/core/world/configuration/WorldPropertyValidator.java index 1b6f9d87..d2064568 100644 --- a/src/main/java/com/onarandombox/MultiverseCore/world/configuration/WorldPropertyValidator.java +++ b/src/main/java/org/mvplugins/multiverse/core/world/configuration/WorldPropertyValidator.java @@ -1,10 +1,10 @@ -package com.onarandombox.MultiverseCore.world.configuration; +package org.mvplugins.multiverse.core.world.configuration; -import com.onarandombox.MultiverseCore.event.MVWorldPropertyChangeEvent; -import com.onarandombox.MultiverseCore.world.SimpleMVWorld; 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; /** * Validates world-property-changes. diff --git a/src/main/java/com/onarandombox/MultiverseCore/world/configuration/package-info.java b/src/main/java/org/mvplugins/multiverse/core/world/configuration/package-info.java similarity index 55% rename from src/main/java/com/onarandombox/MultiverseCore/world/configuration/package-info.java rename to src/main/java/org/mvplugins/multiverse/core/world/configuration/package-info.java index a73a2e86..9afa1595 100644 --- a/src/main/java/com/onarandombox/MultiverseCore/world/configuration/package-info.java +++ b/src/main/java/org/mvplugins/multiverse/core/world/configuration/package-info.java @@ -1,4 +1,4 @@ /** * This package contains the configuration classes for the worlds. */ -package com.onarandombox.MultiverseCore.world.configuration; +package org.mvplugins.multiverse.core.world.configuration; diff --git a/src/main/java/com/onarandombox/MultiverseCore/world/package-info.java b/src/main/java/org/mvplugins/multiverse/core/world/package-info.java similarity index 66% rename from src/main/java/com/onarandombox/MultiverseCore/world/package-info.java rename to src/main/java/org/mvplugins/multiverse/core/world/package-info.java index 64806c08..65e57c1c 100644 --- a/src/main/java/com/onarandombox/MultiverseCore/world/package-info.java +++ b/src/main/java/org/mvplugins/multiverse/core/world/package-info.java @@ -1,4 +1,4 @@ /** * This package contains all the classes that are used to create and manage worlds. */ -package com.onarandombox.MultiverseCore.world; +package org.mvplugins.multiverse.core.world; diff --git a/src/main/java/com/onarandombox/MultiverseCore/worldnew/LoadedMultiverseWorld.java b/src/main/java/org/mvplugins/multiverse/core/worldnew/LoadedMultiverseWorld.java similarity index 92% rename from src/main/java/com/onarandombox/MultiverseCore/worldnew/LoadedMultiverseWorld.java rename to src/main/java/org/mvplugins/multiverse/core/worldnew/LoadedMultiverseWorld.java index a50fd96c..72a3bde6 100644 --- a/src/main/java/com/onarandombox/MultiverseCore/worldnew/LoadedMultiverseWorld.java +++ b/src/main/java/org/mvplugins/multiverse/core/worldnew/LoadedMultiverseWorld.java @@ -1,15 +1,9 @@ -package com.onarandombox.MultiverseCore.worldnew; +package org.mvplugins.multiverse.core.worldnew; import java.util.List; import java.util.UUID; import com.dumptruckman.minecraft.util.Logging; -import com.onarandombox.MultiverseCore.api.BlockSafety; -import com.onarandombox.MultiverseCore.api.LocationManipulation; -import com.onarandombox.MultiverseCore.api.SafeTTeleporter; -import com.onarandombox.MultiverseCore.worldnew.config.NullLocation; -import com.onarandombox.MultiverseCore.worldnew.config.SpawnLocation; -import com.onarandombox.MultiverseCore.worldnew.config.WorldConfig; import io.vavr.control.Option; import org.bukkit.Bukkit; import org.bukkit.Location; @@ -17,6 +11,12 @@ 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; +import org.mvplugins.multiverse.core.worldnew.config.NullLocation; +import org.mvplugins.multiverse.core.worldnew.config.SpawnLocation; +import org.mvplugins.multiverse.core.worldnew.config.WorldConfig; /** * Extension of {@link MultiverseWorld} that represents a world that is currently loaded with bukkit world object. diff --git a/src/main/java/com/onarandombox/MultiverseCore/worldnew/MultiverseWorld.java b/src/main/java/org/mvplugins/multiverse/core/worldnew/MultiverseWorld.java similarity index 99% rename from src/main/java/com/onarandombox/MultiverseCore/worldnew/MultiverseWorld.java rename to src/main/java/org/mvplugins/multiverse/core/worldnew/MultiverseWorld.java index de6f9414..2ad9627e 100644 --- a/src/main/java/com/onarandombox/MultiverseCore/worldnew/MultiverseWorld.java +++ b/src/main/java/org/mvplugins/multiverse/core/worldnew/MultiverseWorld.java @@ -1,11 +1,9 @@ -package com.onarandombox.MultiverseCore.worldnew; +package org.mvplugins.multiverse.core.worldnew; import java.util.Collection; import java.util.List; import com.google.common.base.Strings; -import com.onarandombox.MultiverseCore.world.configuration.AllowedPortalType; -import com.onarandombox.MultiverseCore.worldnew.config.WorldConfig; import io.vavr.control.Try; import org.bukkit.Bukkit; import org.bukkit.Difficulty; @@ -14,6 +12,8 @@ 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; /** * Represents a world handled by Multiverse which has all the custom properties provided by Multiverse. diff --git a/src/main/java/com/onarandombox/MultiverseCore/worldnew/WorldManager.java b/src/main/java/org/mvplugins/multiverse/core/worldnew/WorldManager.java similarity index 94% rename from src/main/java/com/onarandombox/MultiverseCore/worldnew/WorldManager.java rename to src/main/java/org/mvplugins/multiverse/core/worldnew/WorldManager.java index 56930a2e..47c43475 100644 --- a/src/main/java/com/onarandombox/MultiverseCore/worldnew/WorldManager.java +++ b/src/main/java/org/mvplugins/multiverse/core/worldnew/WorldManager.java @@ -1,8 +1,8 @@ -package com.onarandombox.MultiverseCore.worldnew; +package org.mvplugins.multiverse.core.worldnew; -import static com.onarandombox.MultiverseCore.utils.message.MessageReplacement.replace; -import static com.onarandombox.MultiverseCore.worldnew.helpers.DataStore.WorldBorderStore; -import static com.onarandombox.MultiverseCore.worldnew.helpers.DataStore.WorldConfigStore; +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; @@ -16,32 +16,6 @@ import java.util.concurrent.atomic.AtomicReference; import com.dumptruckman.minecraft.util.Logging; import com.google.common.base.Strings; -import com.onarandombox.MultiverseCore.api.BlockSafety; -import com.onarandombox.MultiverseCore.api.LocationManipulation; -import com.onarandombox.MultiverseCore.api.SafeTTeleporter; -import com.onarandombox.MultiverseCore.utils.message.MessageReplacement; -import com.onarandombox.MultiverseCore.utils.result.Attempt; -import com.onarandombox.MultiverseCore.utils.result.FailureReason; -import com.onarandombox.MultiverseCore.worldnew.config.WorldConfig; -import com.onarandombox.MultiverseCore.worldnew.config.WorldsConfigManager; -import com.onarandombox.MultiverseCore.worldnew.generators.GeneratorProvider; -import com.onarandombox.MultiverseCore.worldnew.helpers.DataStore.GameRulesStore; -import com.onarandombox.MultiverseCore.worldnew.helpers.DataTransfer; -import com.onarandombox.MultiverseCore.worldnew.helpers.FilesManipulator; -import com.onarandombox.MultiverseCore.worldnew.options.CloneWorldOptions; -import com.onarandombox.MultiverseCore.worldnew.options.CreateWorldOptions; -import com.onarandombox.MultiverseCore.worldnew.options.ImportWorldOptions; -import com.onarandombox.MultiverseCore.worldnew.options.KeepWorldSettingsOptions; -import com.onarandombox.MultiverseCore.worldnew.options.RegenWorldOptions; -import com.onarandombox.MultiverseCore.worldnew.options.UnloadWorldOptions; -import com.onarandombox.MultiverseCore.worldnew.reasons.CloneFailureReason; -import com.onarandombox.MultiverseCore.worldnew.reasons.CreateFailureReason; -import com.onarandombox.MultiverseCore.worldnew.reasons.DeleteFailureReason; -import com.onarandombox.MultiverseCore.worldnew.reasons.ImportFailureReason; -import com.onarandombox.MultiverseCore.worldnew.reasons.LoadFailureReason; -import com.onarandombox.MultiverseCore.worldnew.reasons.RegenFailureReason; -import com.onarandombox.MultiverseCore.worldnew.reasons.RemoveFailureReason; -import com.onarandombox.MultiverseCore.worldnew.reasons.UnloadFailureReason; import io.vavr.control.Option; import io.vavr.control.Try; import jakarta.inject.Inject; @@ -54,6 +28,32 @@ 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; +import org.mvplugins.multiverse.core.utils.message.MessageReplacement; +import org.mvplugins.multiverse.core.utils.result.Attempt; +import org.mvplugins.multiverse.core.utils.result.FailureReason; +import org.mvplugins.multiverse.core.worldnew.config.WorldConfig; +import org.mvplugins.multiverse.core.worldnew.config.WorldsConfigManager; +import org.mvplugins.multiverse.core.worldnew.generators.GeneratorProvider; +import org.mvplugins.multiverse.core.worldnew.helpers.DataStore.GameRulesStore; +import org.mvplugins.multiverse.core.worldnew.helpers.DataTransfer; +import org.mvplugins.multiverse.core.worldnew.helpers.FilesManipulator; +import org.mvplugins.multiverse.core.worldnew.options.CloneWorldOptions; +import org.mvplugins.multiverse.core.worldnew.options.CreateWorldOptions; +import org.mvplugins.multiverse.core.worldnew.options.ImportWorldOptions; +import org.mvplugins.multiverse.core.worldnew.options.KeepWorldSettingsOptions; +import org.mvplugins.multiverse.core.worldnew.options.RegenWorldOptions; +import org.mvplugins.multiverse.core.worldnew.options.UnloadWorldOptions; +import org.mvplugins.multiverse.core.worldnew.reasons.CloneFailureReason; +import org.mvplugins.multiverse.core.worldnew.reasons.CreateFailureReason; +import org.mvplugins.multiverse.core.worldnew.reasons.DeleteFailureReason; +import org.mvplugins.multiverse.core.worldnew.reasons.ImportFailureReason; +import org.mvplugins.multiverse.core.worldnew.reasons.LoadFailureReason; +import org.mvplugins.multiverse.core.worldnew.reasons.RegenFailureReason; +import org.mvplugins.multiverse.core.worldnew.reasons.RemoveFailureReason; +import org.mvplugins.multiverse.core.worldnew.reasons.UnloadFailureReason; /** * This manager contains all the world managing functions that your heart desires. diff --git a/src/main/java/com/onarandombox/MultiverseCore/worldnew/WorldNameChecker.java b/src/main/java/org/mvplugins/multiverse/core/worldnew/WorldNameChecker.java similarity index 98% rename from src/main/java/com/onarandombox/MultiverseCore/worldnew/WorldNameChecker.java rename to src/main/java/org/mvplugins/multiverse/core/worldnew/WorldNameChecker.java index a7bbbb80..0026c7ac 100644 --- a/src/main/java/com/onarandombox/MultiverseCore/worldnew/WorldNameChecker.java +++ b/src/main/java/org/mvplugins/multiverse/core/worldnew/WorldNameChecker.java @@ -1,4 +1,4 @@ -package com.onarandombox.MultiverseCore.worldnew; +package org.mvplugins.multiverse.core.worldnew; import java.io.File; import java.util.Set; diff --git a/src/main/java/com/onarandombox/MultiverseCore/worldnew/WorldPurger.java b/src/main/java/org/mvplugins/multiverse/core/worldnew/WorldPurger.java similarity index 99% rename from src/main/java/com/onarandombox/MultiverseCore/worldnew/WorldPurger.java rename to src/main/java/org/mvplugins/multiverse/core/worldnew/WorldPurger.java index 3fe4e535..581a65e9 100644 --- a/src/main/java/com/onarandombox/MultiverseCore/worldnew/WorldPurger.java +++ b/src/main/java/org/mvplugins/multiverse/core/worldnew/WorldPurger.java @@ -1,4 +1,4 @@ -package com.onarandombox.MultiverseCore.worldnew; +package org.mvplugins.multiverse.core.worldnew; import java.util.ArrayList; import java.util.Iterator; diff --git a/src/main/java/com/onarandombox/MultiverseCore/worldnew/config/LegacyAliasMigrator.java b/src/main/java/org/mvplugins/multiverse/core/worldnew/config/LegacyAliasMigrator.java similarity index 95% rename from src/main/java/com/onarandombox/MultiverseCore/worldnew/config/LegacyAliasMigrator.java rename to src/main/java/org/mvplugins/multiverse/core/worldnew/config/LegacyAliasMigrator.java index 32709f1a..70c018b9 100644 --- a/src/main/java/com/onarandombox/MultiverseCore/worldnew/config/LegacyAliasMigrator.java +++ b/src/main/java/org/mvplugins/multiverse/core/worldnew/config/LegacyAliasMigrator.java @@ -1,11 +1,11 @@ -package com.onarandombox.MultiverseCore.worldnew.config; +package org.mvplugins.multiverse.core.worldnew.config; import java.util.concurrent.atomic.AtomicReference; -import com.onarandombox.MultiverseCore.configuration.migration.MigratorAction; 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 { @Override diff --git a/src/main/java/com/onarandombox/MultiverseCore/worldnew/config/NullLocation.java b/src/main/java/org/mvplugins/multiverse/core/worldnew/config/NullLocation.java similarity index 92% rename from src/main/java/com/onarandombox/MultiverseCore/worldnew/config/NullLocation.java rename to src/main/java/org/mvplugins/multiverse/core/worldnew/config/NullLocation.java index 5825a3e6..5cfd1408 100644 --- a/src/main/java/com/onarandombox/MultiverseCore/worldnew/config/NullLocation.java +++ b/src/main/java/org/mvplugins/multiverse/core/worldnew/config/NullLocation.java @@ -1,13 +1,13 @@ -package com.onarandombox.MultiverseCore.worldnew.config; +package org.mvplugins.multiverse.core.worldnew.config; import java.util.Collections; import java.util.Map; -import com.onarandombox.MultiverseCore.world.SimpleMVWorld; 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; /** * Null-location. diff --git a/src/main/java/com/onarandombox/MultiverseCore/worldnew/config/SpawnLocation.java b/src/main/java/org/mvplugins/multiverse/core/worldnew/config/SpawnLocation.java similarity index 98% rename from src/main/java/com/onarandombox/MultiverseCore/worldnew/config/SpawnLocation.java rename to src/main/java/org/mvplugins/multiverse/core/worldnew/config/SpawnLocation.java index 797603c2..cd4f96e4 100644 --- a/src/main/java/com/onarandombox/MultiverseCore/worldnew/config/SpawnLocation.java +++ b/src/main/java/org/mvplugins/multiverse/core/worldnew/config/SpawnLocation.java @@ -1,4 +1,4 @@ -package com.onarandombox.MultiverseCore.worldnew.config; +package org.mvplugins.multiverse.core.worldnew.config; import java.lang.ref.Reference; import java.lang.ref.WeakReference; diff --git a/src/main/java/com/onarandombox/MultiverseCore/worldnew/config/WorldConfig.java b/src/main/java/org/mvplugins/multiverse/core/worldnew/config/WorldConfig.java similarity index 93% rename from src/main/java/com/onarandombox/MultiverseCore/worldnew/config/WorldConfig.java rename to src/main/java/org/mvplugins/multiverse/core/worldnew/config/WorldConfig.java index 349443aa..09d46dca 100644 --- a/src/main/java/com/onarandombox/MultiverseCore/worldnew/config/WorldConfig.java +++ b/src/main/java/org/mvplugins/multiverse/core/worldnew/config/WorldConfig.java @@ -1,19 +1,9 @@ -package com.onarandombox.MultiverseCore.worldnew.config; +package org.mvplugins.multiverse.core.worldnew.config; import java.util.Collection; import java.util.List; import com.dumptruckman.minecraft.util.Logging; -import com.onarandombox.MultiverseCore.configuration.handle.ConfigurationSectionHandle; -import com.onarandombox.MultiverseCore.configuration.migration.BooleanMigratorAction; -import com.onarandombox.MultiverseCore.configuration.migration.ConfigMigrator; -import com.onarandombox.MultiverseCore.configuration.migration.IntegerMigratorAction; -import com.onarandombox.MultiverseCore.configuration.migration.LongMigratorAction; -import com.onarandombox.MultiverseCore.configuration.migration.MoveMigratorAction; -import com.onarandombox.MultiverseCore.configuration.migration.NullStringMigratorAction; -import com.onarandombox.MultiverseCore.configuration.migration.VersionMigrator; -import com.onarandombox.MultiverseCore.world.configuration.AllowedPortalType; -import com.onarandombox.MultiverseCore.worldnew.LoadedMultiverseWorld; import io.vavr.control.Try; import org.bukkit.Difficulty; import org.bukkit.GameMode; @@ -23,6 +13,16 @@ 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; +import org.mvplugins.multiverse.core.configuration.migration.IntegerMigratorAction; +import org.mvplugins.multiverse.core.configuration.migration.LongMigratorAction; +import org.mvplugins.multiverse.core.configuration.migration.MoveMigratorAction; +import org.mvplugins.multiverse.core.configuration.migration.NullStringMigratorAction; +import org.mvplugins.multiverse.core.configuration.migration.VersionMigrator; +import org.mvplugins.multiverse.core.world.configuration.AllowedPortalType; +import org.mvplugins.multiverse.core.worldnew.LoadedMultiverseWorld; /** * Represents a world configuration. diff --git a/src/main/java/com/onarandombox/MultiverseCore/worldnew/config/WorldConfigNodes.java b/src/main/java/org/mvplugins/multiverse/core/worldnew/config/WorldConfigNodes.java similarity index 95% rename from src/main/java/com/onarandombox/MultiverseCore/worldnew/config/WorldConfigNodes.java rename to src/main/java/org/mvplugins/multiverse/core/worldnew/config/WorldConfigNodes.java index 940ec695..cd5db03c 100644 --- a/src/main/java/com/onarandombox/MultiverseCore/worldnew/config/WorldConfigNodes.java +++ b/src/main/java/org/mvplugins/multiverse/core/worldnew/config/WorldConfigNodes.java @@ -1,18 +1,18 @@ -package com.onarandombox.MultiverseCore.worldnew.config; +package org.mvplugins.multiverse.core.worldnew.config; import java.util.ArrayList; import java.util.List; -import com.onarandombox.MultiverseCore.configuration.node.ConfigNode; -import com.onarandombox.MultiverseCore.configuration.node.Node; -import com.onarandombox.MultiverseCore.configuration.node.NodeGroup; -import com.onarandombox.MultiverseCore.world.configuration.AllowedPortalType; -import com.onarandombox.MultiverseCore.worldnew.LoadedMultiverseWorld; import org.bukkit.Difficulty; 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; +import org.mvplugins.multiverse.core.world.configuration.AllowedPortalType; +import org.mvplugins.multiverse.core.worldnew.LoadedMultiverseWorld; /** * Represents nodes in a world configuration. diff --git a/src/main/java/com/onarandombox/MultiverseCore/worldnew/config/WorldsConfigManager.java b/src/main/java/org/mvplugins/multiverse/core/worldnew/config/WorldsConfigManager.java similarity index 98% rename from src/main/java/com/onarandombox/MultiverseCore/worldnew/config/WorldsConfigManager.java rename to src/main/java/org/mvplugins/multiverse/core/worldnew/config/WorldsConfigManager.java index 47ce1b1a..edcb21e7 100644 --- a/src/main/java/com/onarandombox/MultiverseCore/worldnew/config/WorldsConfigManager.java +++ b/src/main/java/org/mvplugins/multiverse/core/worldnew/config/WorldsConfigManager.java @@ -1,4 +1,4 @@ -package com.onarandombox.MultiverseCore.worldnew.config; +package org.mvplugins.multiverse.core.worldnew.config; import java.io.File; import java.io.IOException; @@ -10,7 +10,6 @@ import java.util.Map; import java.util.Set; import com.dumptruckman.minecraft.util.Logging; -import com.onarandombox.MultiverseCore.MultiverseCore; import io.vavr.Tuple2; import io.vavr.control.Option; import io.vavr.control.Try; @@ -20,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; /** * Manages the worlds.yml file. diff --git a/src/main/java/org/mvplugins/multiverse/core/worldnew/config/package-info.java b/src/main/java/org/mvplugins/multiverse/core/worldnew/config/package-info.java new file mode 100644 index 00000000..8788e6c6 --- /dev/null +++ b/src/main/java/org/mvplugins/multiverse/core/worldnew/config/package-info.java @@ -0,0 +1 @@ +package org.mvplugins.multiverse.core.worldnew.config; diff --git a/src/main/java/com/onarandombox/MultiverseCore/worldnew/entrycheck/BlacklistResult.java b/src/main/java/org/mvplugins/multiverse/core/worldnew/entrycheck/BlacklistResult.java similarity index 76% rename from src/main/java/com/onarandombox/MultiverseCore/worldnew/entrycheck/BlacklistResult.java rename to src/main/java/org/mvplugins/multiverse/core/worldnew/entrycheck/BlacklistResult.java index 78bb25ec..108b6eac 100644 --- a/src/main/java/com/onarandombox/MultiverseCore/worldnew/entrycheck/BlacklistResult.java +++ b/src/main/java/org/mvplugins/multiverse/core/worldnew/entrycheck/BlacklistResult.java @@ -1,10 +1,10 @@ -package com.onarandombox.MultiverseCore.worldnew.entrycheck; +package org.mvplugins.multiverse.core.worldnew.entrycheck; import co.aikar.locales.MessageKey; import co.aikar.locales.MessageKeyProvider; -import com.onarandombox.MultiverseCore.utils.MVCorei18n; -import com.onarandombox.MultiverseCore.utils.result.FailureReason; -import com.onarandombox.MultiverseCore.utils.result.SuccessReason; +import org.mvplugins.multiverse.core.utils.MVCorei18n; +import org.mvplugins.multiverse.core.utils.result.FailureReason; +import org.mvplugins.multiverse.core.utils.result.SuccessReason; /** * Result of a world blacklist check. diff --git a/src/main/java/com/onarandombox/MultiverseCore/worldnew/entrycheck/EntryFeeResult.java b/src/main/java/org/mvplugins/multiverse/core/worldnew/entrycheck/EntryFeeResult.java similarity index 78% rename from src/main/java/com/onarandombox/MultiverseCore/worldnew/entrycheck/EntryFeeResult.java rename to src/main/java/org/mvplugins/multiverse/core/worldnew/entrycheck/EntryFeeResult.java index d81bb700..2c82514b 100644 --- a/src/main/java/com/onarandombox/MultiverseCore/worldnew/entrycheck/EntryFeeResult.java +++ b/src/main/java/org/mvplugins/multiverse/core/worldnew/entrycheck/EntryFeeResult.java @@ -1,10 +1,10 @@ -package com.onarandombox.MultiverseCore.worldnew.entrycheck; +package org.mvplugins.multiverse.core.worldnew.entrycheck; import co.aikar.locales.MessageKey; import co.aikar.locales.MessageKeyProvider; -import com.onarandombox.MultiverseCore.utils.MVCorei18n; -import com.onarandombox.MultiverseCore.utils.result.FailureReason; -import com.onarandombox.MultiverseCore.utils.result.SuccessReason; +import org.mvplugins.multiverse.core.utils.MVCorei18n; +import org.mvplugins.multiverse.core.utils.result.FailureReason; +import org.mvplugins.multiverse.core.utils.result.SuccessReason; /** * Result of a world entry fee check. diff --git a/src/main/java/com/onarandombox/MultiverseCore/worldnew/entrycheck/PlayerLimitResult.java b/src/main/java/org/mvplugins/multiverse/core/worldnew/entrycheck/PlayerLimitResult.java similarity index 76% rename from src/main/java/com/onarandombox/MultiverseCore/worldnew/entrycheck/PlayerLimitResult.java rename to src/main/java/org/mvplugins/multiverse/core/worldnew/entrycheck/PlayerLimitResult.java index a76be05f..cffc5217 100644 --- a/src/main/java/com/onarandombox/MultiverseCore/worldnew/entrycheck/PlayerLimitResult.java +++ b/src/main/java/org/mvplugins/multiverse/core/worldnew/entrycheck/PlayerLimitResult.java @@ -1,10 +1,10 @@ -package com.onarandombox.MultiverseCore.worldnew.entrycheck; +package org.mvplugins.multiverse.core.worldnew.entrycheck; import co.aikar.locales.MessageKey; import co.aikar.locales.MessageKeyProvider; -import com.onarandombox.MultiverseCore.utils.MVCorei18n; -import com.onarandombox.MultiverseCore.utils.result.FailureReason; -import com.onarandombox.MultiverseCore.utils.result.SuccessReason; +import org.mvplugins.multiverse.core.utils.MVCorei18n; +import org.mvplugins.multiverse.core.utils.result.FailureReason; +import org.mvplugins.multiverse.core.utils.result.SuccessReason; /** * Result of a world player limit check. diff --git a/src/main/java/com/onarandombox/MultiverseCore/worldnew/entrycheck/WorldAccessResult.java b/src/main/java/org/mvplugins/multiverse/core/worldnew/entrycheck/WorldAccessResult.java similarity index 75% rename from src/main/java/com/onarandombox/MultiverseCore/worldnew/entrycheck/WorldAccessResult.java rename to src/main/java/org/mvplugins/multiverse/core/worldnew/entrycheck/WorldAccessResult.java index b765ac9b..84c82fc8 100644 --- a/src/main/java/com/onarandombox/MultiverseCore/worldnew/entrycheck/WorldAccessResult.java +++ b/src/main/java/org/mvplugins/multiverse/core/worldnew/entrycheck/WorldAccessResult.java @@ -1,10 +1,10 @@ -package com.onarandombox.MultiverseCore.worldnew.entrycheck; +package org.mvplugins.multiverse.core.worldnew.entrycheck; import co.aikar.locales.MessageKey; import co.aikar.locales.MessageKeyProvider; -import com.onarandombox.MultiverseCore.utils.MVCorei18n; -import com.onarandombox.MultiverseCore.utils.result.FailureReason; -import com.onarandombox.MultiverseCore.utils.result.SuccessReason; +import org.mvplugins.multiverse.core.utils.MVCorei18n; +import org.mvplugins.multiverse.core.utils.result.FailureReason; +import org.mvplugins.multiverse.core.utils.result.SuccessReason; /** * Result of a world access check. diff --git a/src/main/java/com/onarandombox/MultiverseCore/worldnew/entrycheck/WorldEntryChecker.java b/src/main/java/org/mvplugins/multiverse/core/worldnew/entrycheck/WorldEntryChecker.java similarity index 89% rename from src/main/java/com/onarandombox/MultiverseCore/worldnew/entrycheck/WorldEntryChecker.java rename to src/main/java/org/mvplugins/multiverse/core/worldnew/entrycheck/WorldEntryChecker.java index 84df53f4..0960a49e 100644 --- a/src/main/java/com/onarandombox/MultiverseCore/worldnew/entrycheck/WorldEntryChecker.java +++ b/src/main/java/org/mvplugins/multiverse/core/worldnew/entrycheck/WorldEntryChecker.java @@ -1,17 +1,9 @@ -package com.onarandombox.MultiverseCore.worldnew.entrycheck; +package org.mvplugins.multiverse.core.worldnew.entrycheck; -import static com.onarandombox.MultiverseCore.utils.message.MessageReplacement.replace; +import static org.mvplugins.multiverse.core.utils.message.MessageReplacement.replace; import java.util.Collection; -import com.onarandombox.MultiverseCore.config.MVCoreConfig; -import com.onarandombox.MultiverseCore.economy.MVEconomist; -import com.onarandombox.MultiverseCore.permissions.CorePermissionsChecker; -import com.onarandombox.MultiverseCore.utils.result.Result; -import com.onarandombox.MultiverseCore.utils.result.ResultChain; -import com.onarandombox.MultiverseCore.world.configuration.EntryFee; -import com.onarandombox.MultiverseCore.worldnew.LoadedMultiverseWorld; -import com.onarandombox.MultiverseCore.worldnew.MultiverseWorld; import org.bukkit.Material; import org.bukkit.World; import org.bukkit.command.BlockCommandSender; @@ -20,6 +12,14 @@ 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; +import org.mvplugins.multiverse.core.utils.result.Result; +import org.mvplugins.multiverse.core.utils.result.ResultChain; +import org.mvplugins.multiverse.core.world.configuration.EntryFee; +import org.mvplugins.multiverse.core.worldnew.LoadedMultiverseWorld; +import org.mvplugins.multiverse.core.worldnew.MultiverseWorld; /** * Checks if a player can enter a world. diff --git a/src/main/java/com/onarandombox/MultiverseCore/worldnew/entrycheck/WorldEntryCheckerProvider.java b/src/main/java/org/mvplugins/multiverse/core/worldnew/entrycheck/WorldEntryCheckerProvider.java similarity index 77% rename from src/main/java/com/onarandombox/MultiverseCore/worldnew/entrycheck/WorldEntryCheckerProvider.java rename to src/main/java/org/mvplugins/multiverse/core/worldnew/entrycheck/WorldEntryCheckerProvider.java index e95693a9..2eb52256 100644 --- a/src/main/java/com/onarandombox/MultiverseCore/worldnew/entrycheck/WorldEntryCheckerProvider.java +++ b/src/main/java/org/mvplugins/multiverse/core/worldnew/entrycheck/WorldEntryCheckerProvider.java @@ -1,12 +1,12 @@ -package com.onarandombox.MultiverseCore.worldnew.entrycheck; +package org.mvplugins.multiverse.core.worldnew.entrycheck; -import com.onarandombox.MultiverseCore.config.MVCoreConfig; -import com.onarandombox.MultiverseCore.economy.MVEconomist; -import com.onarandombox.MultiverseCore.permissions.CorePermissionsChecker; 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; @Service public class WorldEntryCheckerProvider { diff --git a/src/main/java/org/mvplugins/multiverse/core/worldnew/entrycheck/package-info.java b/src/main/java/org/mvplugins/multiverse/core/worldnew/entrycheck/package-info.java new file mode 100644 index 00000000..5cf06e95 --- /dev/null +++ b/src/main/java/org/mvplugins/multiverse/core/worldnew/entrycheck/package-info.java @@ -0,0 +1 @@ +package org.mvplugins.multiverse.core.worldnew.entrycheck; diff --git a/src/main/java/com/onarandombox/MultiverseCore/worldnew/generators/GeneratorPlugin.java b/src/main/java/org/mvplugins/multiverse/core/worldnew/generators/GeneratorPlugin.java similarity index 97% rename from src/main/java/com/onarandombox/MultiverseCore/worldnew/generators/GeneratorPlugin.java rename to src/main/java/org/mvplugins/multiverse/core/worldnew/generators/GeneratorPlugin.java index 824a2db4..d8bbcacb 100644 --- a/src/main/java/com/onarandombox/MultiverseCore/worldnew/generators/GeneratorPlugin.java +++ b/src/main/java/org/mvplugins/multiverse/core/worldnew/generators/GeneratorPlugin.java @@ -1,4 +1,4 @@ -package com.onarandombox.MultiverseCore.worldnew.generators; +package org.mvplugins.multiverse.core.worldnew.generators; import java.util.Collection; diff --git a/src/main/java/com/onarandombox/MultiverseCore/worldnew/generators/GeneratorProvider.java b/src/main/java/org/mvplugins/multiverse/core/worldnew/generators/GeneratorProvider.java similarity index 97% rename from src/main/java/com/onarandombox/MultiverseCore/worldnew/generators/GeneratorProvider.java rename to src/main/java/org/mvplugins/multiverse/core/worldnew/generators/GeneratorProvider.java index d2d09491..06a4f7f6 100644 --- a/src/main/java/com/onarandombox/MultiverseCore/worldnew/generators/GeneratorProvider.java +++ b/src/main/java/org/mvplugins/multiverse/core/worldnew/generators/GeneratorProvider.java @@ -1,6 +1,6 @@ -package com.onarandombox.MultiverseCore.worldnew.generators; +package org.mvplugins.multiverse.core.worldnew.generators; -import static com.onarandombox.MultiverseCore.utils.file.FileUtils.getBukkitConfig; +import static org.mvplugins.multiverse.core.utils.file.FileUtils.getBukkitConfig; import java.io.File; import java.util.ArrayList; @@ -12,7 +12,6 @@ import java.util.Map; import java.util.Set; import com.dumptruckman.minecraft.util.Logging; -import com.onarandombox.MultiverseCore.MultiverseCore; import io.vavr.control.Try; import jakarta.inject.Inject; import org.bukkit.Bukkit; @@ -28,6 +27,7 @@ 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; /** * Parse the default world generators from the bukkit config and load any generator plugins. diff --git a/src/main/java/com/onarandombox/MultiverseCore/worldnew/generators/SimpleGeneratorPlugin.java b/src/main/java/org/mvplugins/multiverse/core/worldnew/generators/SimpleGeneratorPlugin.java similarity index 94% rename from src/main/java/com/onarandombox/MultiverseCore/worldnew/generators/SimpleGeneratorPlugin.java rename to src/main/java/org/mvplugins/multiverse/core/worldnew/generators/SimpleGeneratorPlugin.java index 5c05f050..66cbb984 100644 --- a/src/main/java/com/onarandombox/MultiverseCore/worldnew/generators/SimpleGeneratorPlugin.java +++ b/src/main/java/org/mvplugins/multiverse/core/worldnew/generators/SimpleGeneratorPlugin.java @@ -1,4 +1,4 @@ -package com.onarandombox.MultiverseCore.worldnew.generators; +package org.mvplugins.multiverse.core.worldnew.generators; import java.util.Collection; import java.util.Collections; diff --git a/src/main/java/org/mvplugins/multiverse/core/worldnew/generators/package-info.java b/src/main/java/org/mvplugins/multiverse/core/worldnew/generators/package-info.java new file mode 100644 index 00000000..fb2f0204 --- /dev/null +++ b/src/main/java/org/mvplugins/multiverse/core/worldnew/generators/package-info.java @@ -0,0 +1 @@ +package org.mvplugins.multiverse.core.worldnew.generators; diff --git a/src/main/java/com/onarandombox/MultiverseCore/worldnew/helpers/DataStore.java b/src/main/java/org/mvplugins/multiverse/core/worldnew/helpers/DataStore.java similarity index 97% rename from src/main/java/com/onarandombox/MultiverseCore/worldnew/helpers/DataStore.java rename to src/main/java/org/mvplugins/multiverse/core/worldnew/helpers/DataStore.java index b39697e7..2d402f1b 100644 --- a/src/main/java/com/onarandombox/MultiverseCore/worldnew/helpers/DataStore.java +++ b/src/main/java/org/mvplugins/multiverse/core/worldnew/helpers/DataStore.java @@ -1,15 +1,15 @@ -package com.onarandombox.MultiverseCore.worldnew.helpers; +package org.mvplugins.multiverse.core.worldnew.helpers; import java.util.Arrays; import java.util.HashMap; import java.util.Map; import com.dumptruckman.minecraft.util.Logging; -import com.onarandombox.MultiverseCore.worldnew.LoadedMultiverseWorld; 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; /** * A data store for storing and restoring data from an object. diff --git a/src/main/java/com/onarandombox/MultiverseCore/worldnew/helpers/DataTransfer.java b/src/main/java/org/mvplugins/multiverse/core/worldnew/helpers/DataTransfer.java similarity index 95% rename from src/main/java/com/onarandombox/MultiverseCore/worldnew/helpers/DataTransfer.java rename to src/main/java/org/mvplugins/multiverse/core/worldnew/helpers/DataTransfer.java index d033ccc4..9a2a0d8d 100644 --- a/src/main/java/com/onarandombox/MultiverseCore/worldnew/helpers/DataTransfer.java +++ b/src/main/java/org/mvplugins/multiverse/core/worldnew/helpers/DataTransfer.java @@ -1,4 +1,4 @@ -package com.onarandombox.MultiverseCore.worldnew.helpers; +package org.mvplugins.multiverse.core.worldnew.helpers; import java.util.ArrayList; import java.util.List; diff --git a/src/main/java/com/onarandombox/MultiverseCore/worldnew/helpers/FilesManipulator.java b/src/main/java/org/mvplugins/multiverse/core/worldnew/helpers/FilesManipulator.java similarity index 98% rename from src/main/java/com/onarandombox/MultiverseCore/worldnew/helpers/FilesManipulator.java rename to src/main/java/org/mvplugins/multiverse/core/worldnew/helpers/FilesManipulator.java index 49ade635..597dd22b 100644 --- a/src/main/java/com/onarandombox/MultiverseCore/worldnew/helpers/FilesManipulator.java +++ b/src/main/java/org/mvplugins/multiverse/core/worldnew/helpers/FilesManipulator.java @@ -1,4 +1,4 @@ -package com.onarandombox.MultiverseCore.worldnew.helpers; +package org.mvplugins.multiverse.core.worldnew.helpers; import static java.nio.file.StandardCopyOption.COPY_ATTRIBUTES; diff --git a/src/main/java/org/mvplugins/multiverse/core/worldnew/helpers/package-info.java b/src/main/java/org/mvplugins/multiverse/core/worldnew/helpers/package-info.java new file mode 100644 index 00000000..0d262369 --- /dev/null +++ b/src/main/java/org/mvplugins/multiverse/core/worldnew/helpers/package-info.java @@ -0,0 +1 @@ +package org.mvplugins.multiverse.core.worldnew.helpers; diff --git a/src/main/java/com/onarandombox/MultiverseCore/worldnew/options/CloneWorldOptions.java b/src/main/java/org/mvplugins/multiverse/core/worldnew/options/CloneWorldOptions.java similarity index 96% rename from src/main/java/com/onarandombox/MultiverseCore/worldnew/options/CloneWorldOptions.java rename to src/main/java/org/mvplugins/multiverse/core/worldnew/options/CloneWorldOptions.java index d99d14eb..e23a15b5 100644 --- a/src/main/java/com/onarandombox/MultiverseCore/worldnew/options/CloneWorldOptions.java +++ b/src/main/java/org/mvplugins/multiverse/core/worldnew/options/CloneWorldOptions.java @@ -1,7 +1,7 @@ -package com.onarandombox.MultiverseCore.worldnew.options; +package org.mvplugins.multiverse.core.worldnew.options; -import com.onarandombox.MultiverseCore.worldnew.LoadedMultiverseWorld; import org.jetbrains.annotations.NotNull; +import org.mvplugins.multiverse.core.worldnew.LoadedMultiverseWorld; /** * Options for customizing the cloning of a world. diff --git a/src/main/java/com/onarandombox/MultiverseCore/worldnew/options/CreateWorldOptions.java b/src/main/java/org/mvplugins/multiverse/core/worldnew/options/CreateWorldOptions.java similarity index 98% rename from src/main/java/com/onarandombox/MultiverseCore/worldnew/options/CreateWorldOptions.java rename to src/main/java/org/mvplugins/multiverse/core/worldnew/options/CreateWorldOptions.java index f769bbeb..d9bcde80 100644 --- a/src/main/java/com/onarandombox/MultiverseCore/worldnew/options/CreateWorldOptions.java +++ b/src/main/java/org/mvplugins/multiverse/core/worldnew/options/CreateWorldOptions.java @@ -1,4 +1,4 @@ -package com.onarandombox.MultiverseCore.worldnew.options; +package org.mvplugins.multiverse.core.worldnew.options; import java.util.Random; diff --git a/src/main/java/com/onarandombox/MultiverseCore/worldnew/options/ImportWorldOptions.java b/src/main/java/org/mvplugins/multiverse/core/worldnew/options/ImportWorldOptions.java similarity index 98% rename from src/main/java/com/onarandombox/MultiverseCore/worldnew/options/ImportWorldOptions.java rename to src/main/java/org/mvplugins/multiverse/core/worldnew/options/ImportWorldOptions.java index 24d4883e..95fdd404 100644 --- a/src/main/java/com/onarandombox/MultiverseCore/worldnew/options/ImportWorldOptions.java +++ b/src/main/java/org/mvplugins/multiverse/core/worldnew/options/ImportWorldOptions.java @@ -1,4 +1,4 @@ -package com.onarandombox.MultiverseCore.worldnew.options; +package org.mvplugins.multiverse.core.worldnew.options; import org.bukkit.World; import org.jetbrains.annotations.NotNull; diff --git a/src/main/java/com/onarandombox/MultiverseCore/worldnew/options/KeepWorldSettingsOptions.java b/src/main/java/org/mvplugins/multiverse/core/worldnew/options/KeepWorldSettingsOptions.java similarity index 96% rename from src/main/java/com/onarandombox/MultiverseCore/worldnew/options/KeepWorldSettingsOptions.java rename to src/main/java/org/mvplugins/multiverse/core/worldnew/options/KeepWorldSettingsOptions.java index 181771af..81729a17 100644 --- a/src/main/java/com/onarandombox/MultiverseCore/worldnew/options/KeepWorldSettingsOptions.java +++ b/src/main/java/org/mvplugins/multiverse/core/worldnew/options/KeepWorldSettingsOptions.java @@ -1,4 +1,4 @@ -package com.onarandombox.MultiverseCore.worldnew.options; +package org.mvplugins.multiverse.core.worldnew.options; import org.jetbrains.annotations.NotNull; diff --git a/src/main/java/com/onarandombox/MultiverseCore/worldnew/options/RegenWorldOptions.java b/src/main/java/org/mvplugins/multiverse/core/worldnew/options/RegenWorldOptions.java similarity index 97% rename from src/main/java/com/onarandombox/MultiverseCore/worldnew/options/RegenWorldOptions.java rename to src/main/java/org/mvplugins/multiverse/core/worldnew/options/RegenWorldOptions.java index 600796f0..be72e08d 100644 --- a/src/main/java/com/onarandombox/MultiverseCore/worldnew/options/RegenWorldOptions.java +++ b/src/main/java/org/mvplugins/multiverse/core/worldnew/options/RegenWorldOptions.java @@ -1,10 +1,10 @@ -package com.onarandombox.MultiverseCore.worldnew.options; +package org.mvplugins.multiverse.core.worldnew.options; import java.util.Random; -import com.onarandombox.MultiverseCore.worldnew.LoadedMultiverseWorld; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; +import org.mvplugins.multiverse.core.worldnew.LoadedMultiverseWorld; /** * Options for customizing the regeneration of a world. diff --git a/src/main/java/com/onarandombox/MultiverseCore/worldnew/options/UnloadWorldOptions.java b/src/main/java/org/mvplugins/multiverse/core/worldnew/options/UnloadWorldOptions.java similarity index 94% rename from src/main/java/com/onarandombox/MultiverseCore/worldnew/options/UnloadWorldOptions.java rename to src/main/java/org/mvplugins/multiverse/core/worldnew/options/UnloadWorldOptions.java index d30513d1..27824c3b 100644 --- a/src/main/java/com/onarandombox/MultiverseCore/worldnew/options/UnloadWorldOptions.java +++ b/src/main/java/org/mvplugins/multiverse/core/worldnew/options/UnloadWorldOptions.java @@ -1,6 +1,6 @@ -package com.onarandombox.MultiverseCore.worldnew.options; +package org.mvplugins.multiverse.core.worldnew.options; -import com.onarandombox.MultiverseCore.worldnew.LoadedMultiverseWorld; +import org.mvplugins.multiverse.core.worldnew.LoadedMultiverseWorld; /** * Options for customizing the unloading of a world. diff --git a/src/main/java/org/mvplugins/multiverse/core/worldnew/options/package-info.java b/src/main/java/org/mvplugins/multiverse/core/worldnew/options/package-info.java new file mode 100644 index 00000000..af757ae0 --- /dev/null +++ b/src/main/java/org/mvplugins/multiverse/core/worldnew/options/package-info.java @@ -0,0 +1 @@ +package org.mvplugins.multiverse.core.worldnew.options; diff --git a/src/main/java/org/mvplugins/multiverse/core/worldnew/package-info.java b/src/main/java/org/mvplugins/multiverse/core/worldnew/package-info.java new file mode 100644 index 00000000..91c9ebd6 --- /dev/null +++ b/src/main/java/org/mvplugins/multiverse/core/worldnew/package-info.java @@ -0,0 +1 @@ +package org.mvplugins.multiverse.core.worldnew; diff --git a/src/main/java/com/onarandombox/MultiverseCore/worldnew/reasons/CloneFailureReason.java b/src/main/java/org/mvplugins/multiverse/core/worldnew/reasons/CloneFailureReason.java similarity index 86% rename from src/main/java/com/onarandombox/MultiverseCore/worldnew/reasons/CloneFailureReason.java rename to src/main/java/org/mvplugins/multiverse/core/worldnew/reasons/CloneFailureReason.java index d642d41c..d054223a 100644 --- a/src/main/java/com/onarandombox/MultiverseCore/worldnew/reasons/CloneFailureReason.java +++ b/src/main/java/org/mvplugins/multiverse/core/worldnew/reasons/CloneFailureReason.java @@ -1,9 +1,9 @@ -package com.onarandombox.MultiverseCore.worldnew.reasons; +package org.mvplugins.multiverse.core.worldnew.reasons; import co.aikar.locales.MessageKey; import co.aikar.locales.MessageKeyProvider; -import com.onarandombox.MultiverseCore.utils.MVCorei18n; -import com.onarandombox.MultiverseCore.utils.result.FailureReason; +import org.mvplugins.multiverse.core.utils.MVCorei18n; +import org.mvplugins.multiverse.core.utils.result.FailureReason; /** * Result of a world clone operation. diff --git a/src/main/java/com/onarandombox/MultiverseCore/worldnew/reasons/CreateFailureReason.java b/src/main/java/org/mvplugins/multiverse/core/worldnew/reasons/CreateFailureReason.java similarity index 85% rename from src/main/java/com/onarandombox/MultiverseCore/worldnew/reasons/CreateFailureReason.java rename to src/main/java/org/mvplugins/multiverse/core/worldnew/reasons/CreateFailureReason.java index 13759ff9..13f0a2d0 100644 --- a/src/main/java/com/onarandombox/MultiverseCore/worldnew/reasons/CreateFailureReason.java +++ b/src/main/java/org/mvplugins/multiverse/core/worldnew/reasons/CreateFailureReason.java @@ -1,9 +1,9 @@ -package com.onarandombox.MultiverseCore.worldnew.reasons; +package org.mvplugins.multiverse.core.worldnew.reasons; import co.aikar.locales.MessageKey; import co.aikar.locales.MessageKeyProvider; -import com.onarandombox.MultiverseCore.utils.MVCorei18n; -import com.onarandombox.MultiverseCore.utils.result.FailureReason; +import org.mvplugins.multiverse.core.utils.MVCorei18n; +import org.mvplugins.multiverse.core.utils.result.FailureReason; /** * Result of a world creation operation. diff --git a/src/main/java/com/onarandombox/MultiverseCore/worldnew/reasons/DeleteFailureReason.java b/src/main/java/org/mvplugins/multiverse/core/worldnew/reasons/DeleteFailureReason.java similarity index 84% rename from src/main/java/com/onarandombox/MultiverseCore/worldnew/reasons/DeleteFailureReason.java rename to src/main/java/org/mvplugins/multiverse/core/worldnew/reasons/DeleteFailureReason.java index 18e4caf3..c93064c4 100644 --- a/src/main/java/com/onarandombox/MultiverseCore/worldnew/reasons/DeleteFailureReason.java +++ b/src/main/java/org/mvplugins/multiverse/core/worldnew/reasons/DeleteFailureReason.java @@ -1,9 +1,9 @@ -package com.onarandombox.MultiverseCore.worldnew.reasons; +package org.mvplugins.multiverse.core.worldnew.reasons; import co.aikar.locales.MessageKey; import co.aikar.locales.MessageKeyProvider; -import com.onarandombox.MultiverseCore.utils.MVCorei18n; -import com.onarandombox.MultiverseCore.utils.result.FailureReason; +import org.mvplugins.multiverse.core.utils.MVCorei18n; +import org.mvplugins.multiverse.core.utils.result.FailureReason; /** * Result of a world deletion operation. diff --git a/src/main/java/com/onarandombox/MultiverseCore/worldnew/reasons/ImportFailureReason.java b/src/main/java/org/mvplugins/multiverse/core/worldnew/reasons/ImportFailureReason.java similarity index 85% rename from src/main/java/com/onarandombox/MultiverseCore/worldnew/reasons/ImportFailureReason.java rename to src/main/java/org/mvplugins/multiverse/core/worldnew/reasons/ImportFailureReason.java index ece78d08..9417742b 100644 --- a/src/main/java/com/onarandombox/MultiverseCore/worldnew/reasons/ImportFailureReason.java +++ b/src/main/java/org/mvplugins/multiverse/core/worldnew/reasons/ImportFailureReason.java @@ -1,9 +1,9 @@ -package com.onarandombox.MultiverseCore.worldnew.reasons; +package org.mvplugins.multiverse.core.worldnew.reasons; import co.aikar.locales.MessageKey; import co.aikar.locales.MessageKeyProvider; -import com.onarandombox.MultiverseCore.utils.MVCorei18n; -import com.onarandombox.MultiverseCore.utils.result.FailureReason; +import org.mvplugins.multiverse.core.utils.MVCorei18n; +import org.mvplugins.multiverse.core.utils.result.FailureReason; /** * Result of a world import operation. diff --git a/src/main/java/com/onarandombox/MultiverseCore/worldnew/reasons/LoadFailureReason.java b/src/main/java/org/mvplugins/multiverse/core/worldnew/reasons/LoadFailureReason.java similarity index 85% rename from src/main/java/com/onarandombox/MultiverseCore/worldnew/reasons/LoadFailureReason.java rename to src/main/java/org/mvplugins/multiverse/core/worldnew/reasons/LoadFailureReason.java index 12cb8755..4c131b43 100644 --- a/src/main/java/com/onarandombox/MultiverseCore/worldnew/reasons/LoadFailureReason.java +++ b/src/main/java/org/mvplugins/multiverse/core/worldnew/reasons/LoadFailureReason.java @@ -1,9 +1,9 @@ -package com.onarandombox.MultiverseCore.worldnew.reasons; +package org.mvplugins.multiverse.core.worldnew.reasons; import co.aikar.locales.MessageKey; import co.aikar.locales.MessageKeyProvider; -import com.onarandombox.MultiverseCore.utils.MVCorei18n; -import com.onarandombox.MultiverseCore.utils.result.FailureReason; +import org.mvplugins.multiverse.core.utils.MVCorei18n; +import org.mvplugins.multiverse.core.utils.result.FailureReason; /** * Result of a world loading operation. diff --git a/src/main/java/com/onarandombox/MultiverseCore/worldnew/reasons/RegenFailureReason.java b/src/main/java/org/mvplugins/multiverse/core/worldnew/reasons/RegenFailureReason.java similarity index 77% rename from src/main/java/com/onarandombox/MultiverseCore/worldnew/reasons/RegenFailureReason.java rename to src/main/java/org/mvplugins/multiverse/core/worldnew/reasons/RegenFailureReason.java index 6a0a4dba..fdfec41b 100644 --- a/src/main/java/com/onarandombox/MultiverseCore/worldnew/reasons/RegenFailureReason.java +++ b/src/main/java/org/mvplugins/multiverse/core/worldnew/reasons/RegenFailureReason.java @@ -1,9 +1,9 @@ -package com.onarandombox.MultiverseCore.worldnew.reasons; +package org.mvplugins.multiverse.core.worldnew.reasons; import co.aikar.locales.MessageKey; import co.aikar.locales.MessageKeyProvider; -import com.onarandombox.MultiverseCore.utils.MVCorei18n; -import com.onarandombox.MultiverseCore.utils.result.FailureReason; +import org.mvplugins.multiverse.core.utils.MVCorei18n; +import org.mvplugins.multiverse.core.utils.result.FailureReason; /** * Result of a world regeneration operation. diff --git a/src/main/java/com/onarandombox/MultiverseCore/worldnew/reasons/RemoveFailureReason.java b/src/main/java/org/mvplugins/multiverse/core/worldnew/reasons/RemoveFailureReason.java similarity index 78% rename from src/main/java/com/onarandombox/MultiverseCore/worldnew/reasons/RemoveFailureReason.java rename to src/main/java/org/mvplugins/multiverse/core/worldnew/reasons/RemoveFailureReason.java index b82afffd..bb997ab2 100644 --- a/src/main/java/com/onarandombox/MultiverseCore/worldnew/reasons/RemoveFailureReason.java +++ b/src/main/java/org/mvplugins/multiverse/core/worldnew/reasons/RemoveFailureReason.java @@ -1,9 +1,9 @@ -package com.onarandombox.MultiverseCore.worldnew.reasons; +package org.mvplugins.multiverse.core.worldnew.reasons; import co.aikar.locales.MessageKey; import co.aikar.locales.MessageKeyProvider; -import com.onarandombox.MultiverseCore.utils.MVCorei18n; -import com.onarandombox.MultiverseCore.utils.result.FailureReason; +import org.mvplugins.multiverse.core.utils.MVCorei18n; +import org.mvplugins.multiverse.core.utils.result.FailureReason; /** * Result of a world removal operation. diff --git a/src/main/java/com/onarandombox/MultiverseCore/worldnew/reasons/UnloadFailureReason.java b/src/main/java/org/mvplugins/multiverse/core/worldnew/reasons/UnloadFailureReason.java similarity index 83% rename from src/main/java/com/onarandombox/MultiverseCore/worldnew/reasons/UnloadFailureReason.java rename to src/main/java/org/mvplugins/multiverse/core/worldnew/reasons/UnloadFailureReason.java index 2828ad56..14f5865a 100644 --- a/src/main/java/com/onarandombox/MultiverseCore/worldnew/reasons/UnloadFailureReason.java +++ b/src/main/java/org/mvplugins/multiverse/core/worldnew/reasons/UnloadFailureReason.java @@ -1,9 +1,9 @@ -package com.onarandombox.MultiverseCore.worldnew.reasons; +package org.mvplugins.multiverse.core.worldnew.reasons; import co.aikar.locales.MessageKey; import co.aikar.locales.MessageKeyProvider; -import com.onarandombox.MultiverseCore.utils.MVCorei18n; -import com.onarandombox.MultiverseCore.utils.result.FailureReason; +import org.mvplugins.multiverse.core.utils.MVCorei18n; +import org.mvplugins.multiverse.core.utils.result.FailureReason; /** * Result of a world unloading operation. diff --git a/src/main/java/org/mvplugins/multiverse/core/worldnew/reasons/package-info.java b/src/main/java/org/mvplugins/multiverse/core/worldnew/reasons/package-info.java new file mode 100644 index 00000000..99eb225a --- /dev/null +++ b/src/main/java/org/mvplugins/multiverse/core/worldnew/reasons/package-info.java @@ -0,0 +1 @@ +package org.mvplugins.multiverse.core.worldnew.reasons; diff --git a/src/main/resources/plugin.yml b/src/main/resources/plugin.yml index 0681cc4c..8a26e307 100644 --- a/src/main/resources/plugin.yml +++ b/src/main/resources/plugin.yml @@ -1,5 +1,5 @@ name: Multiverse-Core -main: com.onarandombox.MultiverseCore.MultiverseCore +main: org.mvplugins.multiverse.core.MultiverseCore authors: ['dumptruckman', 'Rigby', 'fernferret', 'lithium3141', 'main--'] website: 'https://dev.bukkit.org/projects/multiverse-core' softdepend: ['Vault', 'PlaceholderAPI'] diff --git a/src/old-test/java/com/onarandombox/MultiverseCore/TestDebugMode.java b/src/old-test/java/org/mvplugins/multiverse/core/TestDebugMode.java similarity index 94% rename from src/old-test/java/com/onarandombox/MultiverseCore/TestDebugMode.java rename to src/old-test/java/org/mvplugins/multiverse/core/TestDebugMode.java index 5c5357a2..6aed6d20 100644 --- a/src/old-test/java/com/onarandombox/MultiverseCore/TestDebugMode.java +++ b/src/old-test/java/org/mvplugins/multiverse/core/TestDebugMode.java @@ -5,7 +5,7 @@ * with this project. * ******************************************************************************/ -package com.onarandombox.MultiverseCore; +package org.mvplugins.multiverse.core; import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertTrue; @@ -14,8 +14,6 @@ import static org.mockito.Mockito.when; import java.io.File; -import com.onarandombox.MultiverseCore.api.MVCore; -import com.onarandombox.MultiverseCore.utils.TestInstanceCreator; import org.bukkit.Server; import org.bukkit.command.Command; import org.bukkit.command.CommandSender; @@ -23,6 +21,8 @@ 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; public class TestDebugMode { TestInstanceCreator creator; diff --git a/src/old-test/java/com/onarandombox/MultiverseCore/TestEntitySpawnRules.java b/src/old-test/java/org/mvplugins/multiverse/core/TestEntitySpawnRules.java similarity index 94% rename from src/old-test/java/com/onarandombox/MultiverseCore/TestEntitySpawnRules.java rename to src/old-test/java/org/mvplugins/multiverse/core/TestEntitySpawnRules.java index a5a8e824..b6d3c5fe 100644 --- a/src/old-test/java/com/onarandombox/MultiverseCore/TestEntitySpawnRules.java +++ b/src/old-test/java/org/mvplugins/multiverse/core/TestEntitySpawnRules.java @@ -1,4 +1,4 @@ -package com.onarandombox.MultiverseCore; +package org.mvplugins.multiverse.core; import static org.junit.Assert.assertTrue; import static org.mockito.Mockito.anyBoolean; @@ -13,11 +13,6 @@ import java.util.Arrays; import java.util.Collections; import java.util.List; -import com.onarandombox.MultiverseCore.api.MVWorld; -import com.onarandombox.MultiverseCore.api.MVWorldManager; -import com.onarandombox.MultiverseCore.listeners.MVEntityListener; -import com.onarandombox.MultiverseCore.utils.MockWorldFactory; -import com.onarandombox.MultiverseCore.utils.TestInstanceCreator; import org.bukkit.World; import org.bukkit.WorldType; import org.bukkit.entity.EntityType; @@ -29,6 +24,11 @@ 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; public class TestEntitySpawnRules { TestInstanceCreator creator; diff --git a/src/old-test/java/com/onarandombox/MultiverseCore/TestEntryFeeConversion.java b/src/old-test/java/org/mvplugins/multiverse/core/TestEntryFeeConversion.java similarity index 90% rename from src/old-test/java/com/onarandombox/MultiverseCore/TestEntryFeeConversion.java rename to src/old-test/java/org/mvplugins/multiverse/core/TestEntryFeeConversion.java index dd7a1d3f..d654e751 100644 --- a/src/old-test/java/com/onarandombox/MultiverseCore/TestEntryFeeConversion.java +++ b/src/old-test/java/org/mvplugins/multiverse/core/TestEntryFeeConversion.java @@ -1,4 +1,4 @@ -package com.onarandombox.MultiverseCore; +package org.mvplugins.multiverse.core; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNull; @@ -7,12 +7,12 @@ import static org.junit.Assert.assertTrue; import java.util.HashMap; import java.util.Map; -import com.onarandombox.MultiverseCore.utils.TestInstanceCreator; -import com.onarandombox.MultiverseCore.world.WorldProperties; 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; public class TestEntryFeeConversion { diff --git a/src/old-test/java/com/onarandombox/MultiverseCore/TestModifyCommand.java b/src/old-test/java/org/mvplugins/multiverse/core/TestModifyCommand.java similarity index 93% rename from src/old-test/java/com/onarandombox/MultiverseCore/TestModifyCommand.java rename to src/old-test/java/org/mvplugins/multiverse/core/TestModifyCommand.java index f324ddae..42475308 100644 --- a/src/old-test/java/com/onarandombox/MultiverseCore/TestModifyCommand.java +++ b/src/old-test/java/org/mvplugins/multiverse/core/TestModifyCommand.java @@ -1,16 +1,16 @@ -package com.onarandombox.MultiverseCore; +package org.mvplugins.multiverse.core; import static org.junit.Assert.assertTrue; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; -import com.onarandombox.MultiverseCore.utils.TestInstanceCreator; 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; public class TestModifyCommand { TestInstanceCreator creator; diff --git a/src/old-test/java/com/onarandombox/MultiverseCore/TestWorldProperties.java b/src/old-test/java/org/mvplugins/multiverse/core/TestWorldProperties.java similarity index 98% rename from src/old-test/java/com/onarandombox/MultiverseCore/TestWorldProperties.java rename to src/old-test/java/org/mvplugins/multiverse/core/TestWorldProperties.java index b36aec3b..5705edd9 100644 --- a/src/old-test/java/com/onarandombox/MultiverseCore/TestWorldProperties.java +++ b/src/old-test/java/org/mvplugins/multiverse/core/TestWorldProperties.java @@ -5,7 +5,7 @@ * with this project. * ******************************************************************************/ -package com.onarandombox.MultiverseCore; +package org.mvplugins.multiverse.core; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; @@ -14,9 +14,6 @@ import static org.mockito.Mockito.times; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; -import com.onarandombox.MultiverseCore.api.MVWorld; -import com.onarandombox.MultiverseCore.utils.MockWorldFactory; -import com.onarandombox.MultiverseCore.utils.TestInstanceCreator; import org.bukkit.ChatColor; import org.bukkit.Location; import org.bukkit.World; @@ -36,6 +33,9 @@ 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; public class TestWorldProperties { private TestInstanceCreator creator; diff --git a/src/old-test/java/com/onarandombox/MultiverseCore/TestWorldPurger.java b/src/old-test/java/org/mvplugins/multiverse/core/TestWorldPurger.java similarity index 94% rename from src/old-test/java/com/onarandombox/MultiverseCore/TestWorldPurger.java rename to src/old-test/java/org/mvplugins/multiverse/core/TestWorldPurger.java index fb0f5088..72e1479b 100644 --- a/src/old-test/java/com/onarandombox/MultiverseCore/TestWorldPurger.java +++ b/src/old-test/java/org/mvplugins/multiverse/core/TestWorldPurger.java @@ -1,4 +1,4 @@ -package com.onarandombox.MultiverseCore; +package org.mvplugins.multiverse.core; import static org.junit.Assert.assertTrue; import static org.mockito.Mockito.mock; @@ -8,9 +8,6 @@ import static org.mockito.Mockito.when; import java.util.Arrays; -import com.onarandombox.MultiverseCore.api.MVWorld; -import com.onarandombox.MultiverseCore.api.WorldPurger; -import com.onarandombox.MultiverseCore.utils.TestInstanceCreator; import org.bukkit.World; import org.bukkit.entity.EntityType; import org.bukkit.entity.Sheep; @@ -18,6 +15,9 @@ 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; public class TestWorldPurger { TestInstanceCreator creator; diff --git a/src/old-test/java/com/onarandombox/MultiverseCore/TestWorldStuff.java b/src/old-test/java/org/mvplugins/multiverse/core/TestWorldStuff.java similarity index 98% rename from src/old-test/java/com/onarandombox/MultiverseCore/TestWorldStuff.java rename to src/old-test/java/org/mvplugins/multiverse/core/TestWorldStuff.java index 04367c04..16602626 100644 --- a/src/old-test/java/com/onarandombox/MultiverseCore/TestWorldStuff.java +++ b/src/old-test/java/org/mvplugins/multiverse/core/TestWorldStuff.java @@ -5,7 +5,7 @@ * with this project. * ******************************************************************************/ -package com.onarandombox.MultiverseCore; +package org.mvplugins.multiverse.core; import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertTrue; @@ -16,8 +16,6 @@ import static org.mockito.Mockito.when; import java.io.File; -import com.onarandombox.MultiverseCore.utils.MockWorldFactory; -import com.onarandombox.MultiverseCore.utils.TestInstanceCreator; import org.bukkit.ChatColor; import org.bukkit.Server; import org.bukkit.command.Command; @@ -26,6 +24,8 @@ 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; public class TestWorldStuff { diff --git a/src/old-test/java/com/onarandombox/MultiverseCore/utils/FileUtilsTest.java b/src/old-test/java/org/mvplugins/multiverse/core/utils/FileUtilsTest.java similarity index 98% rename from src/old-test/java/com/onarandombox/MultiverseCore/utils/FileUtilsTest.java rename to src/old-test/java/org/mvplugins/multiverse/core/utils/FileUtilsTest.java index e125d882..714ae202 100644 --- a/src/old-test/java/com/onarandombox/MultiverseCore/utils/FileUtilsTest.java +++ b/src/old-test/java/org/mvplugins/multiverse/core/utils/FileUtilsTest.java @@ -1,4 +1,4 @@ -package com.onarandombox.MultiverseCore.utils; +package org.mvplugins.multiverse.core.utils; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertTrue; @@ -10,10 +10,10 @@ import java.util.ArrayList; import java.util.Arrays; import java.util.List; -import com.onarandombox.MultiverseCore.utils.file.FileUtils; import org.junit.After; import org.junit.Before; import org.junit.Test; +import org.mvplugins.multiverse.core.utils.file.FileUtils; public class FileUtilsTest { diff --git a/src/old-test/java/com/onarandombox/MultiverseCore/utils/MVTestLogFormatter.java b/src/old-test/java/org/mvplugins/multiverse/core/utils/MVTestLogFormatter.java similarity index 97% rename from src/old-test/java/com/onarandombox/MultiverseCore/utils/MVTestLogFormatter.java rename to src/old-test/java/org/mvplugins/multiverse/core/utils/MVTestLogFormatter.java index 8828275d..270a75de 100644 --- a/src/old-test/java/com/onarandombox/MultiverseCore/utils/MVTestLogFormatter.java +++ b/src/old-test/java/org/mvplugins/multiverse/core/utils/MVTestLogFormatter.java @@ -5,7 +5,7 @@ * with this project. * ******************************************************************************/ -package com.onarandombox.MultiverseCore.utils; +package org.mvplugins.multiverse.core.utils; import java.io.PrintWriter; import java.io.StringWriter; diff --git a/src/old-test/java/com/onarandombox/MultiverseCore/utils/MockWorldFactory.java b/src/old-test/java/org/mvplugins/multiverse/core/utils/MockWorldFactory.java similarity index 99% rename from src/old-test/java/com/onarandombox/MultiverseCore/utils/MockWorldFactory.java rename to src/old-test/java/org/mvplugins/multiverse/core/utils/MockWorldFactory.java index 60d6ff76..cf89b180 100644 --- a/src/old-test/java/com/onarandombox/MultiverseCore/utils/MockWorldFactory.java +++ b/src/old-test/java/org/mvplugins/multiverse/core/utils/MockWorldFactory.java @@ -5,7 +5,7 @@ * with this project. * ******************************************************************************/ -package com.onarandombox.MultiverseCore.utils; +package org.mvplugins.multiverse.core.utils; import static org.mockito.Mockito.any; import static org.mockito.Mockito.anyBoolean; diff --git a/src/old-test/java/com/onarandombox/MultiverseCore/utils/TestInstanceCreator.java b/src/old-test/java/org/mvplugins/multiverse/core/utils/TestInstanceCreator.java similarity index 98% rename from src/old-test/java/com/onarandombox/MultiverseCore/utils/TestInstanceCreator.java rename to src/old-test/java/org/mvplugins/multiverse/core/utils/TestInstanceCreator.java index cd135da1..3b9d9727 100644 --- a/src/old-test/java/com/onarandombox/MultiverseCore/utils/TestInstanceCreator.java +++ b/src/old-test/java/org/mvplugins/multiverse/core/utils/TestInstanceCreator.java @@ -5,7 +5,7 @@ * with this project. * ******************************************************************************/ -package com.onarandombox.MultiverseCore.utils; +package org.mvplugins.multiverse.core.utils; import static org.junit.Assert.assertTrue; import static org.mockito.Mockito.any; @@ -27,8 +27,6 @@ import java.util.UUID; import java.util.logging.Level; import java.util.logging.Logger; -import com.onarandombox.MultiverseCore.MultiverseCore; -import com.onarandombox.MultiverseCore.utils.file.FileUtils; import junit.framework.Assert; import org.bukkit.Bukkit; import org.bukkit.ChatColor; @@ -46,6 +44,8 @@ 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; public class TestInstanceCreator { private MultiverseCore core; diff --git a/src/old-test/java/com/onarandombox/MultiverseCore/utils/Util.java b/src/old-test/java/org/mvplugins/multiverse/core/utils/Util.java similarity index 97% rename from src/old-test/java/com/onarandombox/MultiverseCore/utils/Util.java rename to src/old-test/java/org/mvplugins/multiverse/core/utils/Util.java index dd00e021..e8c2c7e7 100644 --- a/src/old-test/java/com/onarandombox/MultiverseCore/utils/Util.java +++ b/src/old-test/java/org/mvplugins/multiverse/core/utils/Util.java @@ -5,7 +5,7 @@ * with this project. * ******************************************************************************/ -package com.onarandombox.MultiverseCore.utils; +package org.mvplugins.multiverse.core.utils; import java.util.logging.ConsoleHandler; import java.util.logging.Handler; diff --git a/src/old-test/java/com/onarandombox/MultiverseCore/utils/WorldCreatorMatcher.java b/src/old-test/java/org/mvplugins/multiverse/core/utils/WorldCreatorMatcher.java similarity index 97% rename from src/old-test/java/com/onarandombox/MultiverseCore/utils/WorldCreatorMatcher.java rename to src/old-test/java/org/mvplugins/multiverse/core/utils/WorldCreatorMatcher.java index 3a13bb36..897897da 100644 --- a/src/old-test/java/com/onarandombox/MultiverseCore/utils/WorldCreatorMatcher.java +++ b/src/old-test/java/org/mvplugins/multiverse/core/utils/WorldCreatorMatcher.java @@ -5,7 +5,7 @@ * with this project. * ******************************************************************************/ -package com.onarandombox.MultiverseCore.utils; +package org.mvplugins.multiverse.core.utils; import org.bukkit.WorldCreator; import org.mockito.ArgumentMatcher; diff --git a/src/test/java/org/mvplugins/multiverse/core/TestWithMockBukkit.kt b/src/test/java/org/mvplugins/multiverse/core/TestWithMockBukkit.kt index c5fd0a00..ed978c1d 100644 --- a/src/test/java/org/mvplugins/multiverse/core/TestWithMockBukkit.kt +++ b/src/test/java/org/mvplugins/multiverse/core/TestWithMockBukkit.kt @@ -2,8 +2,7 @@ package org.mvplugins.multiverse.core import be.seeseemelk.mockbukkit.MockBukkit import be.seeseemelk.mockbukkit.ServerMock -import com.onarandombox.MultiverseCore.MultiverseCore -import com.onarandombox.MultiverseCore.utils.TestingMode +import org.mvplugins.multiverse.core.utils.TestingMode import kotlin.test.AfterTest import kotlin.test.BeforeTest diff --git a/src/test/java/org/mvplugins/multiverse/core/commandtools/LocalizationTest.kt b/src/test/java/org/mvplugins/multiverse/core/commandtools/LocalizationTest.kt index f466c14c..a8327b9f 100644 --- a/src/test/java/org/mvplugins/multiverse/core/commandtools/LocalizationTest.kt +++ b/src/test/java/org/mvplugins/multiverse/core/commandtools/LocalizationTest.kt @@ -3,12 +3,6 @@ package org.mvplugins.multiverse.core.commandtools import com.natpryce.hamkrest.assertion.assertThat import com.natpryce.hamkrest.containsSubstring import com.natpryce.hamkrest.endsWith -import com.onarandombox.MultiverseCore.commandtools.MVCommandIssuer -import com.onarandombox.MultiverseCore.commandtools.MVCommandManager -import com.onarandombox.MultiverseCore.commandtools.PluginLocales -import com.onarandombox.MultiverseCore.utils.MVCorei18n -import com.onarandombox.MultiverseCore.utils.message.Message -import com.onarandombox.MultiverseCore.utils.message.MessageReplacement.replace import org.bukkit.Bukkit import org.bukkit.command.CommandSender import org.junit.jupiter.api.DisplayName @@ -17,6 +11,9 @@ import org.mockito.kotlin.argumentCaptor import org.mockito.kotlin.spy import org.mockito.kotlin.verify import org.mvplugins.multiverse.core.TestWithMockBukkit +import org.mvplugins.multiverse.core.utils.MVCorei18n +import org.mvplugins.multiverse.core.utils.message.Message +import org.mvplugins.multiverse.core.utils.message.MessageReplacement.replace import kotlin.test.* class LocalizationTest : TestWithMockBukkit() { diff --git a/src/test/java/org/mvplugins/multiverse/core/config/ConfigTest.kt b/src/test/java/org/mvplugins/multiverse/core/config/ConfigTest.kt index 55f1f5a8..cc30ecbc 100644 --- a/src/test/java/org/mvplugins/multiverse/core/config/ConfigTest.kt +++ b/src/test/java/org/mvplugins/multiverse/core/config/ConfigTest.kt @@ -1,6 +1,5 @@ package org.mvplugins.multiverse.core.config -import com.onarandombox.MultiverseCore.config.MVCoreConfig import org.mvplugins.multiverse.core.TestWithMockBukkit import java.io.File import java.nio.file.Path diff --git a/src/test/java/org/mvplugins/multiverse/core/inject/InjectionTest.kt b/src/test/java/org/mvplugins/multiverse/core/inject/InjectionTest.kt index bbe27068..ca818c3a 100644 --- a/src/test/java/org/mvplugins/multiverse/core/inject/InjectionTest.kt +++ b/src/test/java/org/mvplugins/multiverse/core/inject/InjectionTest.kt @@ -1,24 +1,24 @@ package org.mvplugins.multiverse.core.inject -import com.onarandombox.MultiverseCore.anchor.AnchorManager -import com.onarandombox.MultiverseCore.api.BlockSafety -import com.onarandombox.MultiverseCore.api.Destination -import com.onarandombox.MultiverseCore.api.LocationManipulation -import com.onarandombox.MultiverseCore.api.SafeTTeleporter -import com.onarandombox.MultiverseCore.commandtools.MVCommandManager -import com.onarandombox.MultiverseCore.commandtools.MultiverseCommand -import com.onarandombox.MultiverseCore.commandtools.PluginLocales -import com.onarandombox.MultiverseCore.config.MVCoreConfig -import com.onarandombox.MultiverseCore.economy.MVEconomist -import com.onarandombox.MultiverseCore.listeners.* -import com.onarandombox.MultiverseCore.teleportation.SimpleBlockSafety -import com.onarandombox.MultiverseCore.teleportation.SimpleLocationManipulation -import com.onarandombox.MultiverseCore.teleportation.SimpleSafeTTeleporter -import com.onarandombox.MultiverseCore.teleportation.TeleportQueue -import com.onarandombox.MultiverseCore.utils.UnsafeCallWrapper -import com.onarandombox.MultiverseCore.utils.metrics.MetricsConfigurator -import com.onarandombox.MultiverseCore.worldnew.WorldManager import org.mvplugins.multiverse.core.TestWithMockBukkit +import org.mvplugins.multiverse.core.anchor.AnchorManager +import org.mvplugins.multiverse.core.api.BlockSafety +import org.mvplugins.multiverse.core.api.Destination +import org.mvplugins.multiverse.core.api.LocationManipulation +import org.mvplugins.multiverse.core.api.SafeTTeleporter +import org.mvplugins.multiverse.core.commandtools.MVCommandManager +import org.mvplugins.multiverse.core.commandtools.MultiverseCommand +import org.mvplugins.multiverse.core.commandtools.PluginLocales +import org.mvplugins.multiverse.core.config.MVCoreConfig +import org.mvplugins.multiverse.core.economy.MVEconomist +import org.mvplugins.multiverse.core.listeners.* +import org.mvplugins.multiverse.core.teleportation.SimpleBlockSafety +import org.mvplugins.multiverse.core.teleportation.SimpleLocationManipulation +import org.mvplugins.multiverse.core.teleportation.SimpleSafeTTeleporter +import org.mvplugins.multiverse.core.teleportation.TeleportQueue +import org.mvplugins.multiverse.core.utils.UnsafeCallWrapper +import org.mvplugins.multiverse.core.utils.metrics.MetricsConfigurator +import org.mvplugins.multiverse.core.worldnew.WorldManager import kotlin.test.* class InjectionTest : TestWithMockBukkit() { diff --git a/src/test/java/org/mvplugins/multiverse/core/world/WorldConfigMangerTest.kt b/src/test/java/org/mvplugins/multiverse/core/world/WorldConfigMangerTest.kt index 67421209..718effe3 100644 --- a/src/test/java/org/mvplugins/multiverse/core/world/WorldConfigMangerTest.kt +++ b/src/test/java/org/mvplugins/multiverse/core/world/WorldConfigMangerTest.kt @@ -1,11 +1,11 @@ package org.mvplugins.multiverse.core.world -import com.onarandombox.MultiverseCore.worldnew.config.SpawnLocation -import com.onarandombox.MultiverseCore.worldnew.config.WorldsConfigManager import org.bukkit.World.Environment import org.junit.jupiter.api.Assertions.assertEquals import org.junit.jupiter.api.Assertions.assertTrue import org.mvplugins.multiverse.core.TestWithMockBukkit +import org.mvplugins.multiverse.core.worldnew.config.SpawnLocation +import org.mvplugins.multiverse.core.worldnew.config.WorldsConfigManager import java.io.File import java.nio.file.Path import kotlin.io.path.absolutePathString diff --git a/src/test/java/org/mvplugins/multiverse/core/world/WorldConfigTest.kt b/src/test/java/org/mvplugins/multiverse/core/world/WorldConfigTest.kt index 0cde8102..02dbc248 100644 --- a/src/test/java/org/mvplugins/multiverse/core/world/WorldConfigTest.kt +++ b/src/test/java/org/mvplugins/multiverse/core/world/WorldConfigTest.kt @@ -1,8 +1,8 @@ package org.mvplugins.multiverse.core.world -import com.onarandombox.MultiverseCore.worldnew.config.WorldConfig -import com.onarandombox.MultiverseCore.worldnew.config.WorldsConfigManager import org.mvplugins.multiverse.core.TestWithMockBukkit +import org.mvplugins.multiverse.core.worldnew.config.WorldConfig +import org.mvplugins.multiverse.core.worldnew.config.WorldsConfigManager import java.io.File import java.nio.file.Path import kotlin.io.path.absolutePathString diff --git a/src/test/java/org/mvplugins/multiverse/core/world/WorldManagerTest.kt b/src/test/java/org/mvplugins/multiverse/core/world/WorldManagerTest.kt index 6ef0d3f7..65cb97cf 100644 --- a/src/test/java/org/mvplugins/multiverse/core/world/WorldManagerTest.kt +++ b/src/test/java/org/mvplugins/multiverse/core/world/WorldManagerTest.kt @@ -1,11 +1,11 @@ package org.mvplugins.multiverse.core.world -import com.onarandombox.MultiverseCore.worldnew.LoadedMultiverseWorld -import com.onarandombox.MultiverseCore.worldnew.WorldManager -import com.onarandombox.MultiverseCore.worldnew.options.CreateWorldOptions import org.bukkit.World import org.bukkit.WorldType import org.mvplugins.multiverse.core.TestWithMockBukkit +import org.mvplugins.multiverse.core.worldnew.LoadedMultiverseWorld +import org.mvplugins.multiverse.core.worldnew.WorldManager +import org.mvplugins.multiverse.core.worldnew.options.CreateWorldOptions import kotlin.test.* class WorldManagerTest : TestWithMockBukkit() {