From 29d25b6ae9c8054b6d2c20951a35fcacb55c2af5 Mon Sep 17 00:00:00 2001 From: BuildTools Date: Mon, 11 Dec 2023 22:12:24 -0600 Subject: [PATCH] Refactor project structure --- .../me/adriianhdev/plutotems/PluTotems.kt | 2 +- .../conf => configuration}/ConfigLoader.kt | 16 +++++++------- .../conf => configuration}/ConfigManager.kt | 2 +- .../internal => core}/command/TotemCommand.kt | 4 ++-- .../internal => core}/command/TotemHelper.kt | 2 +- .../command/impl/GetCommand.kt | 6 ++--- .../command/impl/GiveCommand.kt | 8 +++---- .../command/impl/ReloadCommand.kt | 4 ++-- .../command/impl/RemoveCommand.kt | 6 ++--- .../command/impl/SchematicCommand.kt | 4 ++-- .../event/BlockPlaceEvent.kt | 14 ++++++------ .../internal => core}/event/EntityEvent.kt | 6 ++--- .../event/ItemConsumeEvent.kt | 14 ++++++------ .../internal => core}/event/ItemDropEvent.kt | 12 +++++----- .../event/ItemEffectEvent.kt | 4 ++-- .../event/ItemInteractEvent.kt | 12 +++++----- .../event/ItemPickupEvent.kt | 12 +++++----- .../event/PlayerDamageEvent.kt | 4 ++-- .../event/PlayerResurrectEvent.kt | 4 ++-- .../internal => core}/task/EffectTask.kt | 8 +++---- .../{module/conf => core}/totem/Totem.kt | 8 +++---- .../conf => core}/totem/TotemManager.kt | 2 +- .../conf => core}/totem/TotemScript.kt | 2 +- .../conf => core}/totem/action/Action.kt | 2 +- .../totem/action/ActionManager.kt | 4 ++-- .../totem/action/impl/ActionBar.kt | 6 ++--- .../totem/action/impl/ActionBossbar.kt | 6 ++--- .../totem/action/impl/ActionBroadcast.kt | 6 ++--- .../totem/action/impl/ActionCommand.kt | 4 ++-- .../totem/action/impl/ActionConsole.kt | 4 ++-- .../totem/action/impl/ActionEffect.kt | 4 ++-- .../totem/action/impl/ActionFire.kt | 4 ++-- .../totem/action/impl/ActionFrozen.kt | 4 ++-- .../totem/action/impl/ActionLang.kt | 4 ++-- .../totem/action/impl/ActionMessage.kt | 6 ++--- .../totem/action/impl/ActionMiniMessage.kt | 8 +++---- .../totem/action/impl/ActionParticle.kt | 4 ++-- .../totem/action/impl/ActionScript.kt | 6 ++--- .../totem/action/impl/ActionSkill.kt | 4 ++-- .../totem/action/impl/ActionSound.kt | 4 ++-- .../totem/action/impl/ActionTellraw.kt | 4 ++-- .../totem/action/impl/ActionTitle.kt | 6 ++--- .../totem/action/impl/kether/ActionCast.kt | 4 ++-- .../conf => core}/totem/effect/Effect.kt | 2 +- .../{common => }/plugin/PluTotemsLoader.kt | 12 +++++----- .../plutotems/{common => }/util/ConfigUtil.kt | 8 +++---- .../{common => }/util/CooldownUtil.kt | 2 +- .../plutotems/{common => }/util/EntityUtil.kt | 8 +++---- .../{common => }/util/ExecutorUtils.kt | 22 +++++++++---------- .../plutotems/{common => }/util/KetherUtil.kt | 2 +- .../plutotems/{common => }/util/PlayerUtil.kt | 6 ++--- .../{common => }/util/SchematicUtil.kt | 4 ++-- .../plutotems/{common => }/util/StringUtil.kt | 6 ++--- .../plutotems/{common => }/util/TotemUtil.kt | 12 +++++----- .../{common => }/util/color/HexUtil.kt | 2 +- 55 files changed, 168 insertions(+), 168 deletions(-) rename src/main/kotlin/me/adriianhdev/plutotems/{module/conf => configuration}/ConfigLoader.kt (81%) rename src/main/kotlin/me/adriianhdev/plutotems/{module/conf => configuration}/ConfigManager.kt (89%) rename src/main/kotlin/me/adriianhdev/plutotems/{module/internal => core}/command/TotemCommand.kt (96%) rename src/main/kotlin/me/adriianhdev/plutotems/{module/internal => core}/command/TotemHelper.kt (63%) rename src/main/kotlin/me/adriianhdev/plutotems/{module/internal => core}/command/impl/GetCommand.kt (87%) rename src/main/kotlin/me/adriianhdev/plutotems/{module/internal => core}/command/impl/GiveCommand.kt (88%) rename src/main/kotlin/me/adriianhdev/plutotems/{module/internal => core}/command/impl/ReloadCommand.kt (79%) rename src/main/kotlin/me/adriianhdev/plutotems/{module/internal => core}/command/impl/RemoveCommand.kt (86%) rename src/main/kotlin/me/adriianhdev/plutotems/{module/internal => core}/command/impl/SchematicCommand.kt (92%) rename src/main/kotlin/me/adriianhdev/plutotems/{module/internal => core}/event/BlockPlaceEvent.kt (78%) rename src/main/kotlin/me/adriianhdev/plutotems/{module/internal => core}/event/EntityEvent.kt (92%) rename src/main/kotlin/me/adriianhdev/plutotems/{module/internal => core}/event/ItemConsumeEvent.kt (79%) rename src/main/kotlin/me/adriianhdev/plutotems/{module/internal => core}/event/ItemDropEvent.kt (79%) rename src/main/kotlin/me/adriianhdev/plutotems/{module/internal => core}/event/ItemEffectEvent.kt (89%) rename src/main/kotlin/me/adriianhdev/plutotems/{module/internal => core}/event/ItemInteractEvent.kt (82%) rename src/main/kotlin/me/adriianhdev/plutotems/{module/internal => core}/event/ItemPickupEvent.kt (83%) rename src/main/kotlin/me/adriianhdev/plutotems/{module/internal => core}/event/PlayerDamageEvent.kt (81%) rename src/main/kotlin/me/adriianhdev/plutotems/{module/internal => core}/event/PlayerResurrectEvent.kt (87%) rename src/main/kotlin/me/adriianhdev/plutotems/{module/internal => core}/task/EffectTask.kt (85%) rename src/main/kotlin/me/adriianhdev/plutotems/{module/conf => core}/totem/Totem.kt (91%) rename src/main/kotlin/me/adriianhdev/plutotems/{module/conf => core}/totem/TotemManager.kt (88%) rename src/main/kotlin/me/adriianhdev/plutotems/{module/conf => core}/totem/TotemScript.kt (86%) rename src/main/kotlin/me/adriianhdev/plutotems/{module/conf => core}/totem/action/Action.kt (68%) rename src/main/kotlin/me/adriianhdev/plutotems/{module/conf => core}/totem/action/ActionManager.kt (90%) rename src/main/kotlin/me/adriianhdev/plutotems/{module/conf => core}/totem/action/impl/ActionBar.kt (59%) rename src/main/kotlin/me/adriianhdev/plutotems/{module/conf => core}/totem/action/impl/ActionBossbar.kt (81%) rename src/main/kotlin/me/adriianhdev/plutotems/{module/conf => core}/totem/action/impl/ActionBroadcast.kt (63%) rename src/main/kotlin/me/adriianhdev/plutotems/{module/conf => core}/totem/action/impl/ActionCommand.kt (66%) rename src/main/kotlin/me/adriianhdev/plutotems/{module/conf => core}/totem/action/impl/ActionConsole.kt (71%) rename src/main/kotlin/me/adriianhdev/plutotems/{module/conf => core}/totem/action/impl/ActionEffect.kt (67%) rename src/main/kotlin/me/adriianhdev/plutotems/{module/conf => core}/totem/action/impl/ActionFire.kt (66%) rename src/main/kotlin/me/adriianhdev/plutotems/{module/conf => core}/totem/action/impl/ActionFrozen.kt (67%) rename src/main/kotlin/me/adriianhdev/plutotems/{module/conf => core}/totem/action/impl/ActionLang.kt (65%) rename src/main/kotlin/me/adriianhdev/plutotems/{module/conf => core}/totem/action/impl/ActionMessage.kt (54%) rename src/main/kotlin/me/adriianhdev/plutotems/{module/conf => core}/totem/action/impl/ActionMiniMessage.kt (50%) rename src/main/kotlin/me/adriianhdev/plutotems/{module/conf => core}/totem/action/impl/ActionParticle.kt (92%) rename src/main/kotlin/me/adriianhdev/plutotems/{module/conf => core}/totem/action/impl/ActionScript.kt (54%) rename src/main/kotlin/me/adriianhdev/plutotems/{module/conf => core}/totem/action/impl/ActionSkill.kt (65%) rename src/main/kotlin/me/adriianhdev/plutotems/{module/conf => core}/totem/action/impl/ActionSound.kt (84%) rename src/main/kotlin/me/adriianhdev/plutotems/{module/conf => core}/totem/action/impl/ActionTellraw.kt (63%) rename src/main/kotlin/me/adriianhdev/plutotems/{module/conf => core}/totem/action/impl/ActionTitle.kt (75%) rename src/main/kotlin/me/adriianhdev/plutotems/{module/conf => core}/totem/action/impl/kether/ActionCast.kt (91%) rename src/main/kotlin/me/adriianhdev/plutotems/{module/conf => core}/totem/effect/Effect.kt (93%) rename src/main/kotlin/me/adriianhdev/plutotems/{common => }/plugin/PluTotemsLoader.kt (87%) rename src/main/kotlin/me/adriianhdev/plutotems/{common => }/util/ConfigUtil.kt (95%) rename src/main/kotlin/me/adriianhdev/plutotems/{common => }/util/CooldownUtil.kt (93%) rename src/main/kotlin/me/adriianhdev/plutotems/{common => }/util/EntityUtil.kt (97%) rename src/main/kotlin/me/adriianhdev/plutotems/{common => }/util/ExecutorUtils.kt (90%) rename src/main/kotlin/me/adriianhdev/plutotems/{common => }/util/KetherUtil.kt (96%) rename src/main/kotlin/me/adriianhdev/plutotems/{common => }/util/PlayerUtil.kt (91%) rename src/main/kotlin/me/adriianhdev/plutotems/{common => }/util/SchematicUtil.kt (98%) rename src/main/kotlin/me/adriianhdev/plutotems/{common => }/util/StringUtil.kt (83%) rename src/main/kotlin/me/adriianhdev/plutotems/{common => }/util/TotemUtil.kt (90%) rename src/main/kotlin/me/adriianhdev/plutotems/{common => }/util/color/HexUtil.kt (99%) diff --git a/src/main/kotlin/me/adriianhdev/plutotems/PluTotems.kt b/src/main/kotlin/me/adriianhdev/plutotems/PluTotems.kt index 45ed6a4..6968ca6 100644 --- a/src/main/kotlin/me/adriianhdev/plutotems/PluTotems.kt +++ b/src/main/kotlin/me/adriianhdev/plutotems/PluTotems.kt @@ -1,6 +1,6 @@ package me.adriianhdev.plutotems -import me.adriianhdev.plutotems.common.plugin.PluTotemsLoader +import me.adriianhdev.plutotems.plugin.PluTotemsLoader import taboolib.common.platform.Plugin import taboolib.platform.BukkitPlugin diff --git a/src/main/kotlin/me/adriianhdev/plutotems/module/conf/ConfigLoader.kt b/src/main/kotlin/me/adriianhdev/plutotems/configuration/ConfigLoader.kt similarity index 81% rename from src/main/kotlin/me/adriianhdev/plutotems/module/conf/ConfigLoader.kt rename to src/main/kotlin/me/adriianhdev/plutotems/configuration/ConfigLoader.kt index 0422ef7..90cd511 100644 --- a/src/main/kotlin/me/adriianhdev/plutotems/module/conf/ConfigLoader.kt +++ b/src/main/kotlin/me/adriianhdev/plutotems/configuration/ConfigLoader.kt @@ -1,12 +1,12 @@ -package me.adriianhdev.plutotems.module.conf +package me.adriianhdev.plutotems.configuration -import me.adriianhdev.plutotems.common.util.getConditions -import me.adriianhdev.plutotems.common.util.getOptions -import me.adriianhdev.plutotems.common.util.getTotemItem -import me.adriianhdev.plutotems.common.util.getTypes -import me.adriianhdev.plutotems.module.conf.totem.Totem -import me.adriianhdev.plutotems.module.conf.totem.TotemManager -import me.adriianhdev.plutotems.module.conf.totem.TotemScript +import me.adriianhdev.plutotems.core.totem.Totem +import me.adriianhdev.plutotems.core.totem.TotemManager +import me.adriianhdev.plutotems.core.totem.TotemScript +import me.adriianhdev.plutotems.util.getConditions +import me.adriianhdev.plutotems.util.getOptions +import me.adriianhdev.plutotems.util.getTotemItem +import me.adriianhdev.plutotems.util.getTypes import taboolib.common.LifeCycle import taboolib.common.platform.Awake import taboolib.common.platform.function.getDataFolder diff --git a/src/main/kotlin/me/adriianhdev/plutotems/module/conf/ConfigManager.kt b/src/main/kotlin/me/adriianhdev/plutotems/configuration/ConfigManager.kt similarity index 89% rename from src/main/kotlin/me/adriianhdev/plutotems/module/conf/ConfigManager.kt rename to src/main/kotlin/me/adriianhdev/plutotems/configuration/ConfigManager.kt index b342b1d..2152c34 100644 --- a/src/main/kotlin/me/adriianhdev/plutotems/module/conf/ConfigManager.kt +++ b/src/main/kotlin/me/adriianhdev/plutotems/configuration/ConfigManager.kt @@ -1,4 +1,4 @@ -package me.adriianhdev.plutotems.module.conf +package me.adriianhdev.plutotems.configuration import taboolib.module.configuration.Config import taboolib.module.configuration.Configuration diff --git a/src/main/kotlin/me/adriianhdev/plutotems/module/internal/command/TotemCommand.kt b/src/main/kotlin/me/adriianhdev/plutotems/core/command/TotemCommand.kt similarity index 96% rename from src/main/kotlin/me/adriianhdev/plutotems/module/internal/command/TotemCommand.kt rename to src/main/kotlin/me/adriianhdev/plutotems/core/command/TotemCommand.kt index fa2ad2e..9375181 100644 --- a/src/main/kotlin/me/adriianhdev/plutotems/module/internal/command/TotemCommand.kt +++ b/src/main/kotlin/me/adriianhdev/plutotems/core/command/TotemCommand.kt @@ -1,7 +1,7 @@ -package me.adriianhdev.plutotems.module.internal.command +package me.adriianhdev.plutotems.core.command import me.adriianhdev.plutotems.PluTotems -import me.adriianhdev.plutotems.module.internal.command.impl.* +import me.adriianhdev.plutotems.core.command.impl.* import org.bukkit.command.CommandSender import taboolib.common.platform.command.CommandBody import taboolib.common.platform.command.CommandHeader diff --git a/src/main/kotlin/me/adriianhdev/plutotems/module/internal/command/TotemHelper.kt b/src/main/kotlin/me/adriianhdev/plutotems/core/command/TotemHelper.kt similarity index 63% rename from src/main/kotlin/me/adriianhdev/plutotems/module/internal/command/TotemHelper.kt rename to src/main/kotlin/me/adriianhdev/plutotems/core/command/TotemHelper.kt index 559d904..8333de7 100644 --- a/src/main/kotlin/me/adriianhdev/plutotems/module/internal/command/TotemHelper.kt +++ b/src/main/kotlin/me/adriianhdev/plutotems/core/command/TotemHelper.kt @@ -1,4 +1,4 @@ -package me.adriianhdev.plutotems.module.internal.command +package me.adriianhdev.plutotems.core.command @Target(AnnotationTarget.FIELD) @Retention(AnnotationRetention.RUNTIME) diff --git a/src/main/kotlin/me/adriianhdev/plutotems/module/internal/command/impl/GetCommand.kt b/src/main/kotlin/me/adriianhdev/plutotems/core/command/impl/GetCommand.kt similarity index 87% rename from src/main/kotlin/me/adriianhdev/plutotems/module/internal/command/impl/GetCommand.kt rename to src/main/kotlin/me/adriianhdev/plutotems/core/command/impl/GetCommand.kt index 4bdcb01..8aab25f 100644 --- a/src/main/kotlin/me/adriianhdev/plutotems/module/internal/command/impl/GetCommand.kt +++ b/src/main/kotlin/me/adriianhdev/plutotems/core/command/impl/GetCommand.kt @@ -1,7 +1,7 @@ -package me.adriianhdev.plutotems.module.internal.command.impl +package me.adriianhdev.plutotems.core.command.impl -import me.adriianhdev.plutotems.common.util.PlayerUtil -import me.adriianhdev.plutotems.module.conf.totem.TotemManager +import me.adriianhdev.plutotems.core.totem.TotemManager +import me.adriianhdev.plutotems.util.PlayerUtil import org.bukkit.entity.Player import taboolib.common.platform.command.subCommand import taboolib.platform.util.sendLang diff --git a/src/main/kotlin/me/adriianhdev/plutotems/module/internal/command/impl/GiveCommand.kt b/src/main/kotlin/me/adriianhdev/plutotems/core/command/impl/GiveCommand.kt similarity index 88% rename from src/main/kotlin/me/adriianhdev/plutotems/module/internal/command/impl/GiveCommand.kt rename to src/main/kotlin/me/adriianhdev/plutotems/core/command/impl/GiveCommand.kt index 8427339..c3878f5 100644 --- a/src/main/kotlin/me/adriianhdev/plutotems/module/internal/command/impl/GiveCommand.kt +++ b/src/main/kotlin/me/adriianhdev/plutotems/core/command/impl/GiveCommand.kt @@ -1,8 +1,8 @@ -package me.adriianhdev.plutotems.module.internal.command.impl +package me.adriianhdev.plutotems.core.command.impl -import me.adriianhdev.plutotems.common.util.PlayerUtil -import me.adriianhdev.plutotems.module.conf.totem.Totem -import me.adriianhdev.plutotems.module.conf.totem.TotemManager +import me.adriianhdev.plutotems.core.totem.Totem +import me.adriianhdev.plutotems.core.totem.TotemManager +import me.adriianhdev.plutotems.util.PlayerUtil import org.bukkit.Bukkit import org.bukkit.command.CommandSender import org.bukkit.entity.Player diff --git a/src/main/kotlin/me/adriianhdev/plutotems/module/internal/command/impl/ReloadCommand.kt b/src/main/kotlin/me/adriianhdev/plutotems/core/command/impl/ReloadCommand.kt similarity index 79% rename from src/main/kotlin/me/adriianhdev/plutotems/module/internal/command/impl/ReloadCommand.kt rename to src/main/kotlin/me/adriianhdev/plutotems/core/command/impl/ReloadCommand.kt index 7e5d335..19b51b4 100644 --- a/src/main/kotlin/me/adriianhdev/plutotems/module/internal/command/impl/ReloadCommand.kt +++ b/src/main/kotlin/me/adriianhdev/plutotems/core/command/impl/ReloadCommand.kt @@ -1,6 +1,6 @@ -package me.adriianhdev.plutotems.module.internal.command.impl +package me.adriianhdev.plutotems.core.command.impl -import me.adriianhdev.plutotems.common.plugin.PluTotemsLoader +import me.adriianhdev.plutotems.plugin.PluTotemsLoader import org.bukkit.command.CommandSender import taboolib.common.platform.command.subCommand import taboolib.platform.util.sendLang diff --git a/src/main/kotlin/me/adriianhdev/plutotems/module/internal/command/impl/RemoveCommand.kt b/src/main/kotlin/me/adriianhdev/plutotems/core/command/impl/RemoveCommand.kt similarity index 86% rename from src/main/kotlin/me/adriianhdev/plutotems/module/internal/command/impl/RemoveCommand.kt rename to src/main/kotlin/me/adriianhdev/plutotems/core/command/impl/RemoveCommand.kt index d0d9bf8..bf5d40d 100644 --- a/src/main/kotlin/me/adriianhdev/plutotems/module/internal/command/impl/RemoveCommand.kt +++ b/src/main/kotlin/me/adriianhdev/plutotems/core/command/impl/RemoveCommand.kt @@ -1,7 +1,7 @@ -package me.adriianhdev.plutotems.module.internal.command.impl +package me.adriianhdev.plutotems.core.command.impl -import me.adriianhdev.plutotems.common.util.PlayerUtil -import me.adriianhdev.plutotems.module.conf.totem.TotemManager +import me.adriianhdev.plutotems.core.totem.TotemManager +import me.adriianhdev.plutotems.util.PlayerUtil import org.bukkit.Bukkit import org.bukkit.command.CommandSender import org.bukkit.entity.Player diff --git a/src/main/kotlin/me/adriianhdev/plutotems/module/internal/command/impl/SchematicCommand.kt b/src/main/kotlin/me/adriianhdev/plutotems/core/command/impl/SchematicCommand.kt similarity index 92% rename from src/main/kotlin/me/adriianhdev/plutotems/module/internal/command/impl/SchematicCommand.kt rename to src/main/kotlin/me/adriianhdev/plutotems/core/command/impl/SchematicCommand.kt index 2ced066..3f6dbfc 100644 --- a/src/main/kotlin/me/adriianhdev/plutotems/module/internal/command/impl/SchematicCommand.kt +++ b/src/main/kotlin/me/adriianhdev/plutotems/core/command/impl/SchematicCommand.kt @@ -1,6 +1,6 @@ -package me.adriianhdev.plutotems.module.internal.command.impl +package me.adriianhdev.plutotems.core.command.impl -import me.adriianhdev.plutotems.common.util.SchematicUtil +import me.adriianhdev.plutotems.util.SchematicUtil import org.bukkit.entity.Player import taboolib.common.platform.command.CommandBody import taboolib.common.platform.command.CommandHeader diff --git a/src/main/kotlin/me/adriianhdev/plutotems/module/internal/event/BlockPlaceEvent.kt b/src/main/kotlin/me/adriianhdev/plutotems/core/event/BlockPlaceEvent.kt similarity index 78% rename from src/main/kotlin/me/adriianhdev/plutotems/module/internal/event/BlockPlaceEvent.kt rename to src/main/kotlin/me/adriianhdev/plutotems/core/event/BlockPlaceEvent.kt index 624701e..8cce807 100644 --- a/src/main/kotlin/me/adriianhdev/plutotems/module/internal/event/BlockPlaceEvent.kt +++ b/src/main/kotlin/me/adriianhdev/plutotems/core/event/BlockPlaceEvent.kt @@ -1,11 +1,11 @@ -package me.adriianhdev.plutotems.module.internal.event +package me.adriianhdev.plutotems.core.event -import me.adriianhdev.plutotems.common.util.ExecutorUtils.checkCondition -import me.adriianhdev.plutotems.common.util.ExecutorUtils.checkEffects -import me.adriianhdev.plutotems.common.util.ExecutorUtils.run -import me.adriianhdev.plutotems.common.util.PlayerUtil -import me.adriianhdev.plutotems.common.util.TotemUtil -import me.adriianhdev.plutotems.common.util.TotemUtil.checkType +import me.adriianhdev.plutotems.util.ExecutorUtils.checkCondition +import me.adriianhdev.plutotems.util.ExecutorUtils.checkEffects +import me.adriianhdev.plutotems.util.ExecutorUtils.run +import me.adriianhdev.plutotems.util.PlayerUtil +import me.adriianhdev.plutotems.util.TotemUtil +import me.adriianhdev.plutotems.util.TotemUtil.checkType import org.bukkit.event.block.BlockPlaceEvent import taboolib.common.platform.event.SubscribeEvent import taboolib.platform.util.sendLang diff --git a/src/main/kotlin/me/adriianhdev/plutotems/module/internal/event/EntityEvent.kt b/src/main/kotlin/me/adriianhdev/plutotems/core/event/EntityEvent.kt similarity index 92% rename from src/main/kotlin/me/adriianhdev/plutotems/module/internal/event/EntityEvent.kt rename to src/main/kotlin/me/adriianhdev/plutotems/core/event/EntityEvent.kt index 887658e..037b141 100644 --- a/src/main/kotlin/me/adriianhdev/plutotems/module/internal/event/EntityEvent.kt +++ b/src/main/kotlin/me/adriianhdev/plutotems/core/event/EntityEvent.kt @@ -1,7 +1,7 @@ -package me.adriianhdev.plutotems.module.internal.event +package me.adriianhdev.plutotems.core.event -import me.adriianhdev.plutotems.common.util.ExecutorUtils -import me.adriianhdev.plutotems.common.util.TotemUtil +import me.adriianhdev.plutotems.util.ExecutorUtils +import me.adriianhdev.plutotems.util.TotemUtil import org.bukkit.entity.EntityType import org.bukkit.entity.LivingEntity import org.bukkit.entity.Player diff --git a/src/main/kotlin/me/adriianhdev/plutotems/module/internal/event/ItemConsumeEvent.kt b/src/main/kotlin/me/adriianhdev/plutotems/core/event/ItemConsumeEvent.kt similarity index 79% rename from src/main/kotlin/me/adriianhdev/plutotems/module/internal/event/ItemConsumeEvent.kt rename to src/main/kotlin/me/adriianhdev/plutotems/core/event/ItemConsumeEvent.kt index 7606e44..364548e 100644 --- a/src/main/kotlin/me/adriianhdev/plutotems/module/internal/event/ItemConsumeEvent.kt +++ b/src/main/kotlin/me/adriianhdev/plutotems/core/event/ItemConsumeEvent.kt @@ -1,11 +1,11 @@ -package me.adriianhdev.plutotems.module.internal.event +package me.adriianhdev.plutotems.core.event -import me.adriianhdev.plutotems.common.util.ExecutorUtils -import me.adriianhdev.plutotems.common.util.ExecutorUtils.checkEffects -import me.adriianhdev.plutotems.common.util.ExecutorUtils.run -import me.adriianhdev.plutotems.common.util.PlayerUtil -import me.adriianhdev.plutotems.common.util.TotemUtil -import me.adriianhdev.plutotems.common.util.TotemUtil.checkType +import me.adriianhdev.plutotems.util.ExecutorUtils +import me.adriianhdev.plutotems.util.ExecutorUtils.checkEffects +import me.adriianhdev.plutotems.util.ExecutorUtils.run +import me.adriianhdev.plutotems.util.PlayerUtil +import me.adriianhdev.plutotems.util.TotemUtil +import me.adriianhdev.plutotems.util.TotemUtil.checkType import org.bukkit.event.player.PlayerItemConsumeEvent import taboolib.common.platform.event.SubscribeEvent import taboolib.platform.util.sendLang diff --git a/src/main/kotlin/me/adriianhdev/plutotems/module/internal/event/ItemDropEvent.kt b/src/main/kotlin/me/adriianhdev/plutotems/core/event/ItemDropEvent.kt similarity index 79% rename from src/main/kotlin/me/adriianhdev/plutotems/module/internal/event/ItemDropEvent.kt rename to src/main/kotlin/me/adriianhdev/plutotems/core/event/ItemDropEvent.kt index ceea368..c4b753d 100644 --- a/src/main/kotlin/me/adriianhdev/plutotems/module/internal/event/ItemDropEvent.kt +++ b/src/main/kotlin/me/adriianhdev/plutotems/core/event/ItemDropEvent.kt @@ -1,10 +1,10 @@ -package me.adriianhdev.plutotems.module.internal.event +package me.adriianhdev.plutotems.core.event -import me.adriianhdev.plutotems.common.util.ExecutorUtils.checkCondition -import me.adriianhdev.plutotems.common.util.ExecutorUtils.checkEffects -import me.adriianhdev.plutotems.common.util.ExecutorUtils.run -import me.adriianhdev.plutotems.common.util.TotemUtil -import me.adriianhdev.plutotems.common.util.TotemUtil.checkType +import me.adriianhdev.plutotems.util.ExecutorUtils.checkCondition +import me.adriianhdev.plutotems.util.ExecutorUtils.checkEffects +import me.adriianhdev.plutotems.util.ExecutorUtils.run +import me.adriianhdev.plutotems.util.TotemUtil +import me.adriianhdev.plutotems.util.TotemUtil.checkType import org.bukkit.event.player.PlayerDropItemEvent import taboolib.common.platform.event.SubscribeEvent diff --git a/src/main/kotlin/me/adriianhdev/plutotems/module/internal/event/ItemEffectEvent.kt b/src/main/kotlin/me/adriianhdev/plutotems/core/event/ItemEffectEvent.kt similarity index 89% rename from src/main/kotlin/me/adriianhdev/plutotems/module/internal/event/ItemEffectEvent.kt rename to src/main/kotlin/me/adriianhdev/plutotems/core/event/ItemEffectEvent.kt index 373154d..5d0ed8e 100644 --- a/src/main/kotlin/me/adriianhdev/plutotems/module/internal/event/ItemEffectEvent.kt +++ b/src/main/kotlin/me/adriianhdev/plutotems/core/event/ItemEffectEvent.kt @@ -1,6 +1,6 @@ -package me.adriianhdev.plutotems.module.internal.event +package me.adriianhdev.plutotems.core.event -import me.adriianhdev.plutotems.common.util.ExecutorUtils.checkEffects +import me.adriianhdev.plutotems.util.ExecutorUtils.checkEffects import org.bukkit.entity.Player import org.bukkit.event.inventory.InventoryClickEvent import org.bukkit.event.inventory.InventoryType diff --git a/src/main/kotlin/me/adriianhdev/plutotems/module/internal/event/ItemInteractEvent.kt b/src/main/kotlin/me/adriianhdev/plutotems/core/event/ItemInteractEvent.kt similarity index 82% rename from src/main/kotlin/me/adriianhdev/plutotems/module/internal/event/ItemInteractEvent.kt rename to src/main/kotlin/me/adriianhdev/plutotems/core/event/ItemInteractEvent.kt index 3a00106..70164a0 100644 --- a/src/main/kotlin/me/adriianhdev/plutotems/module/internal/event/ItemInteractEvent.kt +++ b/src/main/kotlin/me/adriianhdev/plutotems/core/event/ItemInteractEvent.kt @@ -1,10 +1,10 @@ -package me.adriianhdev.plutotems.module.internal.event +package me.adriianhdev.plutotems.core.event -import me.adriianhdev.plutotems.common.util.ExecutorUtils.checkCondition -import me.adriianhdev.plutotems.common.util.ExecutorUtils.checkEffects -import me.adriianhdev.plutotems.common.util.ExecutorUtils.run -import me.adriianhdev.plutotems.common.util.TotemUtil -import me.adriianhdev.plutotems.common.util.TotemUtil.checkType +import me.adriianhdev.plutotems.util.ExecutorUtils.checkCondition +import me.adriianhdev.plutotems.util.ExecutorUtils.checkEffects +import me.adriianhdev.plutotems.util.ExecutorUtils.run +import me.adriianhdev.plutotems.util.TotemUtil +import me.adriianhdev.plutotems.util.TotemUtil.checkType import org.bukkit.event.player.PlayerInteractEvent import taboolib.common.platform.event.EventPriority import taboolib.common.platform.event.SubscribeEvent diff --git a/src/main/kotlin/me/adriianhdev/plutotems/module/internal/event/ItemPickupEvent.kt b/src/main/kotlin/me/adriianhdev/plutotems/core/event/ItemPickupEvent.kt similarity index 83% rename from src/main/kotlin/me/adriianhdev/plutotems/module/internal/event/ItemPickupEvent.kt rename to src/main/kotlin/me/adriianhdev/plutotems/core/event/ItemPickupEvent.kt index 4184939..88cd1b7 100644 --- a/src/main/kotlin/me/adriianhdev/plutotems/module/internal/event/ItemPickupEvent.kt +++ b/src/main/kotlin/me/adriianhdev/plutotems/core/event/ItemPickupEvent.kt @@ -1,10 +1,10 @@ -package me.adriianhdev.plutotems.module.internal.event +package me.adriianhdev.plutotems.core.event -import me.adriianhdev.plutotems.common.util.ExecutorUtils.checkCondition -import me.adriianhdev.plutotems.common.util.ExecutorUtils.checkEffects -import me.adriianhdev.plutotems.common.util.ExecutorUtils.run -import me.adriianhdev.plutotems.common.util.TotemUtil -import me.adriianhdev.plutotems.common.util.TotemUtil.checkType +import me.adriianhdev.plutotems.util.ExecutorUtils.checkCondition +import me.adriianhdev.plutotems.util.ExecutorUtils.checkEffects +import me.adriianhdev.plutotems.util.ExecutorUtils.run +import me.adriianhdev.plutotems.util.TotemUtil +import me.adriianhdev.plutotems.util.TotemUtil.checkType import org.bukkit.entity.Player import org.bukkit.event.entity.EntityPickupItemEvent import taboolib.common.platform.event.SubscribeEvent diff --git a/src/main/kotlin/me/adriianhdev/plutotems/module/internal/event/PlayerDamageEvent.kt b/src/main/kotlin/me/adriianhdev/plutotems/core/event/PlayerDamageEvent.kt similarity index 81% rename from src/main/kotlin/me/adriianhdev/plutotems/module/internal/event/PlayerDamageEvent.kt rename to src/main/kotlin/me/adriianhdev/plutotems/core/event/PlayerDamageEvent.kt index 816207e..9aeefff 100644 --- a/src/main/kotlin/me/adriianhdev/plutotems/module/internal/event/PlayerDamageEvent.kt +++ b/src/main/kotlin/me/adriianhdev/plutotems/core/event/PlayerDamageEvent.kt @@ -1,6 +1,6 @@ -package me.adriianhdev.plutotems.module.internal.event +package me.adriianhdev.plutotems.core.event -import me.adriianhdev.plutotems.common.util.ExecutorUtils.handleAction +import me.adriianhdev.plutotems.util.ExecutorUtils.handleAction import org.bukkit.entity.Player import org.bukkit.event.entity.EntityDamageEvent import taboolib.common.platform.event.EventPriority diff --git a/src/main/kotlin/me/adriianhdev/plutotems/module/internal/event/PlayerResurrectEvent.kt b/src/main/kotlin/me/adriianhdev/plutotems/core/event/PlayerResurrectEvent.kt similarity index 87% rename from src/main/kotlin/me/adriianhdev/plutotems/module/internal/event/PlayerResurrectEvent.kt rename to src/main/kotlin/me/adriianhdev/plutotems/core/event/PlayerResurrectEvent.kt index 2c5754b..f0f838f 100644 --- a/src/main/kotlin/me/adriianhdev/plutotems/module/internal/event/PlayerResurrectEvent.kt +++ b/src/main/kotlin/me/adriianhdev/plutotems/core/event/PlayerResurrectEvent.kt @@ -1,6 +1,6 @@ -package me.adriianhdev.plutotems.module.internal.event +package me.adriianhdev.plutotems.core.event -import me.adriianhdev.plutotems.module.conf.ConfigManager +import me.adriianhdev.plutotems.configuration.ConfigManager import org.bukkit.entity.Player import org.bukkit.event.entity.EntityResurrectEvent import taboolib.common.platform.event.EventPriority diff --git a/src/main/kotlin/me/adriianhdev/plutotems/module/internal/task/EffectTask.kt b/src/main/kotlin/me/adriianhdev/plutotems/core/task/EffectTask.kt similarity index 85% rename from src/main/kotlin/me/adriianhdev/plutotems/module/internal/task/EffectTask.kt rename to src/main/kotlin/me/adriianhdev/plutotems/core/task/EffectTask.kt index 5932340..ab1ab24 100644 --- a/src/main/kotlin/me/adriianhdev/plutotems/module/internal/task/EffectTask.kt +++ b/src/main/kotlin/me/adriianhdev/plutotems/core/task/EffectTask.kt @@ -1,8 +1,8 @@ -package me.adriianhdev.plutotems.module.internal.task +package me.adriianhdev.plutotems.core.task -import me.adriianhdev.plutotems.common.util.TotemUtil -import me.adriianhdev.plutotems.common.util.TotemUtil.isAirOrNull -import me.adriianhdev.plutotems.module.conf.totem.effect.Effect +import me.adriianhdev.plutotems.core.totem.effect.Effect +import me.adriianhdev.plutotems.util.TotemUtil +import me.adriianhdev.plutotems.util.TotemUtil.isAirOrNull import org.bukkit.Bukkit import org.bukkit.entity.Player import org.bukkit.inventory.ItemStack diff --git a/src/main/kotlin/me/adriianhdev/plutotems/module/conf/totem/Totem.kt b/src/main/kotlin/me/adriianhdev/plutotems/core/totem/Totem.kt similarity index 91% rename from src/main/kotlin/me/adriianhdev/plutotems/module/conf/totem/Totem.kt rename to src/main/kotlin/me/adriianhdev/plutotems/core/totem/Totem.kt index d22e2f2..08c7801 100644 --- a/src/main/kotlin/me/adriianhdev/plutotems/module/conf/totem/Totem.kt +++ b/src/main/kotlin/me/adriianhdev/plutotems/core/totem/Totem.kt @@ -1,8 +1,8 @@ -package me.adriianhdev.plutotems.module.conf.totem +package me.adriianhdev.plutotems.core.totem -import me.adriianhdev.plutotems.common.util.TotemEntity -import me.adriianhdev.plutotems.common.util.TotemSchematic -import me.adriianhdev.plutotems.module.conf.ConfigManager +import me.adriianhdev.plutotems.configuration.ConfigManager +import me.adriianhdev.plutotems.util.TotemEntity +import me.adriianhdev.plutotems.util.TotemSchematic import org.bukkit.entity.Player import org.bukkit.inventory.ItemStack import taboolib.common.platform.function.adaptPlayer diff --git a/src/main/kotlin/me/adriianhdev/plutotems/module/conf/totem/TotemManager.kt b/src/main/kotlin/me/adriianhdev/plutotems/core/totem/TotemManager.kt similarity index 88% rename from src/main/kotlin/me/adriianhdev/plutotems/module/conf/totem/TotemManager.kt rename to src/main/kotlin/me/adriianhdev/plutotems/core/totem/TotemManager.kt index 5e77994..b0d99fb 100644 --- a/src/main/kotlin/me/adriianhdev/plutotems/module/conf/totem/TotemManager.kt +++ b/src/main/kotlin/me/adriianhdev/plutotems/core/totem/TotemManager.kt @@ -1,4 +1,4 @@ -package me.adriianhdev.plutotems.module.conf.totem +package me.adriianhdev.plutotems.core.totem import org.bukkit.inventory.ItemStack diff --git a/src/main/kotlin/me/adriianhdev/plutotems/module/conf/totem/TotemScript.kt b/src/main/kotlin/me/adriianhdev/plutotems/core/totem/TotemScript.kt similarity index 86% rename from src/main/kotlin/me/adriianhdev/plutotems/module/conf/totem/TotemScript.kt rename to src/main/kotlin/me/adriianhdev/plutotems/core/totem/TotemScript.kt index c496173..079792f 100644 --- a/src/main/kotlin/me/adriianhdev/plutotems/module/conf/totem/TotemScript.kt +++ b/src/main/kotlin/me/adriianhdev/plutotems/core/totem/TotemScript.kt @@ -1,4 +1,4 @@ -package me.adriianhdev.plutotems.module.conf.totem +package me.adriianhdev.plutotems.core.totem import org.bukkit.inventory.ItemStack diff --git a/src/main/kotlin/me/adriianhdev/plutotems/module/conf/totem/action/Action.kt b/src/main/kotlin/me/adriianhdev/plutotems/core/totem/action/Action.kt similarity index 68% rename from src/main/kotlin/me/adriianhdev/plutotems/module/conf/totem/action/Action.kt rename to src/main/kotlin/me/adriianhdev/plutotems/core/totem/action/Action.kt index 4df1c58..93d312d 100644 --- a/src/main/kotlin/me/adriianhdev/plutotems/module/conf/totem/action/Action.kt +++ b/src/main/kotlin/me/adriianhdev/plutotems/core/totem/action/Action.kt @@ -1,4 +1,4 @@ -package me.adriianhdev.plutotems.module.conf.totem.action +package me.adriianhdev.plutotems.core.totem.action import org.bukkit.entity.Player diff --git a/src/main/kotlin/me/adriianhdev/plutotems/module/conf/totem/action/ActionManager.kt b/src/main/kotlin/me/adriianhdev/plutotems/core/totem/action/ActionManager.kt similarity index 90% rename from src/main/kotlin/me/adriianhdev/plutotems/module/conf/totem/action/ActionManager.kt rename to src/main/kotlin/me/adriianhdev/plutotems/core/totem/action/ActionManager.kt index 37e4e9b..62df24b 100644 --- a/src/main/kotlin/me/adriianhdev/plutotems/module/conf/totem/action/ActionManager.kt +++ b/src/main/kotlin/me/adriianhdev/plutotems/core/totem/action/ActionManager.kt @@ -1,6 +1,6 @@ -package me.adriianhdev.plutotems.module.conf.totem.action +package me.adriianhdev.plutotems.core.totem.action -import me.adriianhdev.plutotems.module.conf.totem.action.impl.* +import me.adriianhdev.plutotems.core.totem.action.impl.* import org.bukkit.entity.Player import taboolib.common.platform.function.warning import java.util.* diff --git a/src/main/kotlin/me/adriianhdev/plutotems/module/conf/totem/action/impl/ActionBar.kt b/src/main/kotlin/me/adriianhdev/plutotems/core/totem/action/impl/ActionBar.kt similarity index 59% rename from src/main/kotlin/me/adriianhdev/plutotems/module/conf/totem/action/impl/ActionBar.kt rename to src/main/kotlin/me/adriianhdev/plutotems/core/totem/action/impl/ActionBar.kt index 2bc59e9..81cf128 100644 --- a/src/main/kotlin/me/adriianhdev/plutotems/module/conf/totem/action/impl/ActionBar.kt +++ b/src/main/kotlin/me/adriianhdev/plutotems/core/totem/action/impl/ActionBar.kt @@ -1,7 +1,7 @@ -package me.adriianhdev.plutotems.module.conf.totem.action.impl +package me.adriianhdev.plutotems.core.totem.action.impl -import me.adriianhdev.plutotems.common.util.color.colorify -import me.adriianhdev.plutotems.module.conf.totem.action.Action +import me.adriianhdev.plutotems.core.totem.action.Action +import me.adriianhdev.plutotems.util.color.colorify import org.bukkit.entity.Player import taboolib.platform.util.sendActionBar diff --git a/src/main/kotlin/me/adriianhdev/plutotems/module/conf/totem/action/impl/ActionBossbar.kt b/src/main/kotlin/me/adriianhdev/plutotems/core/totem/action/impl/ActionBossbar.kt similarity index 81% rename from src/main/kotlin/me/adriianhdev/plutotems/module/conf/totem/action/impl/ActionBossbar.kt rename to src/main/kotlin/me/adriianhdev/plutotems/core/totem/action/impl/ActionBossbar.kt index 09895cf..b2a3bad 100644 --- a/src/main/kotlin/me/adriianhdev/plutotems/module/conf/totem/action/impl/ActionBossbar.kt +++ b/src/main/kotlin/me/adriianhdev/plutotems/core/totem/action/impl/ActionBossbar.kt @@ -1,7 +1,7 @@ -package me.adriianhdev.plutotems.module.conf.totem.action.impl +package me.adriianhdev.plutotems.core.totem.action.impl -import me.adriianhdev.plutotems.common.util.color.colorify -import me.adriianhdev.plutotems.module.conf.totem.action.Action +import me.adriianhdev.plutotems.core.totem.action.Action +import me.adriianhdev.plutotems.util.color.colorify import org.bukkit.Bukkit import org.bukkit.boss.BarColor import org.bukkit.boss.BarStyle diff --git a/src/main/kotlin/me/adriianhdev/plutotems/module/conf/totem/action/impl/ActionBroadcast.kt b/src/main/kotlin/me/adriianhdev/plutotems/core/totem/action/impl/ActionBroadcast.kt similarity index 63% rename from src/main/kotlin/me/adriianhdev/plutotems/module/conf/totem/action/impl/ActionBroadcast.kt rename to src/main/kotlin/me/adriianhdev/plutotems/core/totem/action/impl/ActionBroadcast.kt index 9d1c6b2..850fb6d 100644 --- a/src/main/kotlin/me/adriianhdev/plutotems/module/conf/totem/action/impl/ActionBroadcast.kt +++ b/src/main/kotlin/me/adriianhdev/plutotems/core/totem/action/impl/ActionBroadcast.kt @@ -1,7 +1,7 @@ -package me.adriianhdev.plutotems.module.conf.totem.action.impl +package me.adriianhdev.plutotems.core.totem.action.impl -import me.adriianhdev.plutotems.common.util.color.colorify -import me.adriianhdev.plutotems.module.conf.totem.action.Action +import me.adriianhdev.plutotems.core.totem.action.Action +import me.adriianhdev.plutotems.util.color.colorify import org.bukkit.entity.Player object ActionBroadcast : Action { diff --git a/src/main/kotlin/me/adriianhdev/plutotems/module/conf/totem/action/impl/ActionCommand.kt b/src/main/kotlin/me/adriianhdev/plutotems/core/totem/action/impl/ActionCommand.kt similarity index 66% rename from src/main/kotlin/me/adriianhdev/plutotems/module/conf/totem/action/impl/ActionCommand.kt rename to src/main/kotlin/me/adriianhdev/plutotems/core/totem/action/impl/ActionCommand.kt index 58d5452..a4fb3c8 100644 --- a/src/main/kotlin/me/adriianhdev/plutotems/module/conf/totem/action/impl/ActionCommand.kt +++ b/src/main/kotlin/me/adriianhdev/plutotems/core/totem/action/impl/ActionCommand.kt @@ -1,6 +1,6 @@ -package me.adriianhdev.plutotems.module.conf.totem.action.impl +package me.adriianhdev.plutotems.core.totem.action.impl -import me.adriianhdev.plutotems.module.conf.totem.action.Action +import me.adriianhdev.plutotems.core.totem.action.Action import org.bukkit.entity.Player object ActionCommand : Action { diff --git a/src/main/kotlin/me/adriianhdev/plutotems/module/conf/totem/action/impl/ActionConsole.kt b/src/main/kotlin/me/adriianhdev/plutotems/core/totem/action/impl/ActionConsole.kt similarity index 71% rename from src/main/kotlin/me/adriianhdev/plutotems/module/conf/totem/action/impl/ActionConsole.kt rename to src/main/kotlin/me/adriianhdev/plutotems/core/totem/action/impl/ActionConsole.kt index 2ba1f07..04d4b46 100644 --- a/src/main/kotlin/me/adriianhdev/plutotems/module/conf/totem/action/impl/ActionConsole.kt +++ b/src/main/kotlin/me/adriianhdev/plutotems/core/totem/action/impl/ActionConsole.kt @@ -1,6 +1,6 @@ -package me.adriianhdev.plutotems.module.conf.totem.action.impl +package me.adriianhdev.plutotems.core.totem.action.impl -import me.adriianhdev.plutotems.module.conf.totem.action.Action +import me.adriianhdev.plutotems.core.totem.action.Action import org.bukkit.Bukkit import org.bukkit.entity.Player diff --git a/src/main/kotlin/me/adriianhdev/plutotems/module/conf/totem/action/impl/ActionEffect.kt b/src/main/kotlin/me/adriianhdev/plutotems/core/totem/action/impl/ActionEffect.kt similarity index 67% rename from src/main/kotlin/me/adriianhdev/plutotems/module/conf/totem/action/impl/ActionEffect.kt rename to src/main/kotlin/me/adriianhdev/plutotems/core/totem/action/impl/ActionEffect.kt index 15a9467..8675c52 100644 --- a/src/main/kotlin/me/adriianhdev/plutotems/module/conf/totem/action/impl/ActionEffect.kt +++ b/src/main/kotlin/me/adriianhdev/plutotems/core/totem/action/impl/ActionEffect.kt @@ -1,6 +1,6 @@ -package me.adriianhdev.plutotems.module.conf.totem.action.impl +package me.adriianhdev.plutotems.core.totem.action.impl -import me.adriianhdev.plutotems.module.conf.totem.action.Action +import me.adriianhdev.plutotems.core.totem.action.Action import org.bukkit.EntityEffect import org.bukkit.entity.Player diff --git a/src/main/kotlin/me/adriianhdev/plutotems/module/conf/totem/action/impl/ActionFire.kt b/src/main/kotlin/me/adriianhdev/plutotems/core/totem/action/impl/ActionFire.kt similarity index 66% rename from src/main/kotlin/me/adriianhdev/plutotems/module/conf/totem/action/impl/ActionFire.kt rename to src/main/kotlin/me/adriianhdev/plutotems/core/totem/action/impl/ActionFire.kt index 13c16d2..562f937 100644 --- a/src/main/kotlin/me/adriianhdev/plutotems/module/conf/totem/action/impl/ActionFire.kt +++ b/src/main/kotlin/me/adriianhdev/plutotems/core/totem/action/impl/ActionFire.kt @@ -1,6 +1,6 @@ -package me.adriianhdev.plutotems.module.conf.totem.action.impl +package me.adriianhdev.plutotems.core.totem.action.impl -import me.adriianhdev.plutotems.module.conf.totem.action.Action +import me.adriianhdev.plutotems.core.totem.action.Action import org.bukkit.entity.Player object ActionFire : Action { diff --git a/src/main/kotlin/me/adriianhdev/plutotems/module/conf/totem/action/impl/ActionFrozen.kt b/src/main/kotlin/me/adriianhdev/plutotems/core/totem/action/impl/ActionFrozen.kt similarity index 67% rename from src/main/kotlin/me/adriianhdev/plutotems/module/conf/totem/action/impl/ActionFrozen.kt rename to src/main/kotlin/me/adriianhdev/plutotems/core/totem/action/impl/ActionFrozen.kt index 3019802..60246b6 100644 --- a/src/main/kotlin/me/adriianhdev/plutotems/module/conf/totem/action/impl/ActionFrozen.kt +++ b/src/main/kotlin/me/adriianhdev/plutotems/core/totem/action/impl/ActionFrozen.kt @@ -1,6 +1,6 @@ -package me.adriianhdev.plutotems.module.conf.totem.action.impl +package me.adriianhdev.plutotems.core.totem.action.impl -import me.adriianhdev.plutotems.module.conf.totem.action.Action +import me.adriianhdev.plutotems.core.totem.action.Action import org.bukkit.entity.Player object ActionFrozen : Action { diff --git a/src/main/kotlin/me/adriianhdev/plutotems/module/conf/totem/action/impl/ActionLang.kt b/src/main/kotlin/me/adriianhdev/plutotems/core/totem/action/impl/ActionLang.kt similarity index 65% rename from src/main/kotlin/me/adriianhdev/plutotems/module/conf/totem/action/impl/ActionLang.kt rename to src/main/kotlin/me/adriianhdev/plutotems/core/totem/action/impl/ActionLang.kt index 5b590f2..431d913 100644 --- a/src/main/kotlin/me/adriianhdev/plutotems/module/conf/totem/action/impl/ActionLang.kt +++ b/src/main/kotlin/me/adriianhdev/plutotems/core/totem/action/impl/ActionLang.kt @@ -1,6 +1,6 @@ -package me.adriianhdev.plutotems.module.conf.totem.action.impl +package me.adriianhdev.plutotems.core.totem.action.impl -import me.adriianhdev.plutotems.module.conf.totem.action.Action +import me.adriianhdev.plutotems.core.totem.action.Action import org.bukkit.entity.Player import taboolib.platform.util.sendLang diff --git a/src/main/kotlin/me/adriianhdev/plutotems/module/conf/totem/action/impl/ActionMessage.kt b/src/main/kotlin/me/adriianhdev/plutotems/core/totem/action/impl/ActionMessage.kt similarity index 54% rename from src/main/kotlin/me/adriianhdev/plutotems/module/conf/totem/action/impl/ActionMessage.kt rename to src/main/kotlin/me/adriianhdev/plutotems/core/totem/action/impl/ActionMessage.kt index 2d715d0..faf67a8 100644 --- a/src/main/kotlin/me/adriianhdev/plutotems/module/conf/totem/action/impl/ActionMessage.kt +++ b/src/main/kotlin/me/adriianhdev/plutotems/core/totem/action/impl/ActionMessage.kt @@ -1,7 +1,7 @@ -package me.adriianhdev.plutotems.module.conf.totem.action.impl +package me.adriianhdev.plutotems.core.totem.action.impl -import me.adriianhdev.plutotems.common.util.color.colorify -import me.adriianhdev.plutotems.module.conf.totem.action.Action +import me.adriianhdev.plutotems.core.totem.action.Action +import me.adriianhdev.plutotems.util.color.colorify import org.bukkit.entity.Player object ActionMessage : Action { diff --git a/src/main/kotlin/me/adriianhdev/plutotems/module/conf/totem/action/impl/ActionMiniMessage.kt b/src/main/kotlin/me/adriianhdev/plutotems/core/totem/action/impl/ActionMiniMessage.kt similarity index 50% rename from src/main/kotlin/me/adriianhdev/plutotems/module/conf/totem/action/impl/ActionMiniMessage.kt rename to src/main/kotlin/me/adriianhdev/plutotems/core/totem/action/impl/ActionMiniMessage.kt index 1491772..b34a376 100644 --- a/src/main/kotlin/me/adriianhdev/plutotems/module/conf/totem/action/impl/ActionMiniMessage.kt +++ b/src/main/kotlin/me/adriianhdev/plutotems/core/totem/action/impl/ActionMiniMessage.kt @@ -1,8 +1,8 @@ -package me.adriianhdev.plutotems.module.conf.totem.action.impl +package me.adriianhdev.plutotems.core.totem.action.impl -import me.adriianhdev.plutotems.common.plugin.PluTotemsLoader.adventure -import me.adriianhdev.plutotems.common.util.StringUtil.toMiniMessage -import me.adriianhdev.plutotems.module.conf.totem.action.Action +import me.adriianhdev.plutotems.core.totem.action.Action +import me.adriianhdev.plutotems.plugin.PluTotemsLoader.adventure +import me.adriianhdev.plutotems.util.StringUtil.toMiniMessage import org.bukkit.entity.Player object ActionMiniMessage : Action { diff --git a/src/main/kotlin/me/adriianhdev/plutotems/module/conf/totem/action/impl/ActionParticle.kt b/src/main/kotlin/me/adriianhdev/plutotems/core/totem/action/impl/ActionParticle.kt similarity index 92% rename from src/main/kotlin/me/adriianhdev/plutotems/module/conf/totem/action/impl/ActionParticle.kt rename to src/main/kotlin/me/adriianhdev/plutotems/core/totem/action/impl/ActionParticle.kt index 9b9ee50..4cbbab2 100644 --- a/src/main/kotlin/me/adriianhdev/plutotems/module/conf/totem/action/impl/ActionParticle.kt +++ b/src/main/kotlin/me/adriianhdev/plutotems/core/totem/action/impl/ActionParticle.kt @@ -1,6 +1,6 @@ -package me.adriianhdev.plutotems.module.conf.totem.action.impl +package me.adriianhdev.plutotems.core.totem.action.impl -import me.adriianhdev.plutotems.module.conf.totem.action.Action +import me.adriianhdev.plutotems.core.totem.action.Action import org.bukkit.Material import org.bukkit.entity.Player import taboolib.library.xseries.parseToItemStack diff --git a/src/main/kotlin/me/adriianhdev/plutotems/module/conf/totem/action/impl/ActionScript.kt b/src/main/kotlin/me/adriianhdev/plutotems/core/totem/action/impl/ActionScript.kt similarity index 54% rename from src/main/kotlin/me/adriianhdev/plutotems/module/conf/totem/action/impl/ActionScript.kt rename to src/main/kotlin/me/adriianhdev/plutotems/core/totem/action/impl/ActionScript.kt index 30a5839..0161369 100644 --- a/src/main/kotlin/me/adriianhdev/plutotems/module/conf/totem/action/impl/ActionScript.kt +++ b/src/main/kotlin/me/adriianhdev/plutotems/core/totem/action/impl/ActionScript.kt @@ -1,7 +1,7 @@ -package me.adriianhdev.plutotems.module.conf.totem.action.impl +package me.adriianhdev.plutotems.core.totem.action.impl -import me.adriianhdev.plutotems.common.util.KetherUtil -import me.adriianhdev.plutotems.module.conf.totem.action.Action +import me.adriianhdev.plutotems.core.totem.action.Action +import me.adriianhdev.plutotems.util.KetherUtil import org.bukkit.entity.Player object ActionScript : Action { diff --git a/src/main/kotlin/me/adriianhdev/plutotems/module/conf/totem/action/impl/ActionSkill.kt b/src/main/kotlin/me/adriianhdev/plutotems/core/totem/action/impl/ActionSkill.kt similarity index 65% rename from src/main/kotlin/me/adriianhdev/plutotems/module/conf/totem/action/impl/ActionSkill.kt rename to src/main/kotlin/me/adriianhdev/plutotems/core/totem/action/impl/ActionSkill.kt index 3e88447..992f916 100644 --- a/src/main/kotlin/me/adriianhdev/plutotems/module/conf/totem/action/impl/ActionSkill.kt +++ b/src/main/kotlin/me/adriianhdev/plutotems/core/totem/action/impl/ActionSkill.kt @@ -1,7 +1,7 @@ -package me.adriianhdev.plutotems.module.conf.totem.action.impl +package me.adriianhdev.plutotems.core.totem.action.impl import ink.ptms.um.Mythic -import me.adriianhdev.plutotems.module.conf.totem.action.Action +import me.adriianhdev.plutotems.core.totem.action.Action import org.bukkit.entity.Player object ActionSkill : Action { diff --git a/src/main/kotlin/me/adriianhdev/plutotems/module/conf/totem/action/impl/ActionSound.kt b/src/main/kotlin/me/adriianhdev/plutotems/core/totem/action/impl/ActionSound.kt similarity index 84% rename from src/main/kotlin/me/adriianhdev/plutotems/module/conf/totem/action/impl/ActionSound.kt rename to src/main/kotlin/me/adriianhdev/plutotems/core/totem/action/impl/ActionSound.kt index 3c11a50..97c2392 100644 --- a/src/main/kotlin/me/adriianhdev/plutotems/module/conf/totem/action/impl/ActionSound.kt +++ b/src/main/kotlin/me/adriianhdev/plutotems/core/totem/action/impl/ActionSound.kt @@ -1,6 +1,6 @@ -package me.adriianhdev.plutotems.module.conf.totem.action.impl +package me.adriianhdev.plutotems.core.totem.action.impl -import me.adriianhdev.plutotems.module.conf.totem.action.Action +import me.adriianhdev.plutotems.core.totem.action.Action import org.bukkit.entity.Player import taboolib.library.xseries.XSound import taboolib.platform.util.sendLang diff --git a/src/main/kotlin/me/adriianhdev/plutotems/module/conf/totem/action/impl/ActionTellraw.kt b/src/main/kotlin/me/adriianhdev/plutotems/core/totem/action/impl/ActionTellraw.kt similarity index 63% rename from src/main/kotlin/me/adriianhdev/plutotems/module/conf/totem/action/impl/ActionTellraw.kt rename to src/main/kotlin/me/adriianhdev/plutotems/core/totem/action/impl/ActionTellraw.kt index 88c76c3..6a0f619 100644 --- a/src/main/kotlin/me/adriianhdev/plutotems/module/conf/totem/action/impl/ActionTellraw.kt +++ b/src/main/kotlin/me/adriianhdev/plutotems/core/totem/action/impl/ActionTellraw.kt @@ -1,6 +1,6 @@ -package me.adriianhdev.plutotems.module.conf.totem.action.impl +package me.adriianhdev.plutotems.core.totem.action.impl -import me.adriianhdev.plutotems.module.conf.totem.action.Action +import me.adriianhdev.plutotems.core.totem.action.Action import org.bukkit.entity.Player object ActionTellraw : Action { diff --git a/src/main/kotlin/me/adriianhdev/plutotems/module/conf/totem/action/impl/ActionTitle.kt b/src/main/kotlin/me/adriianhdev/plutotems/core/totem/action/impl/ActionTitle.kt similarity index 75% rename from src/main/kotlin/me/adriianhdev/plutotems/module/conf/totem/action/impl/ActionTitle.kt rename to src/main/kotlin/me/adriianhdev/plutotems/core/totem/action/impl/ActionTitle.kt index ff039cb..60aed0d 100644 --- a/src/main/kotlin/me/adriianhdev/plutotems/module/conf/totem/action/impl/ActionTitle.kt +++ b/src/main/kotlin/me/adriianhdev/plutotems/core/totem/action/impl/ActionTitle.kt @@ -1,7 +1,7 @@ -package me.adriianhdev.plutotems.module.conf.totem.action.impl +package me.adriianhdev.plutotems.core.totem.action.impl -import me.adriianhdev.plutotems.common.util.color.colorify -import me.adriianhdev.plutotems.module.conf.totem.action.Action +import me.adriianhdev.plutotems.core.totem.action.Action +import me.adriianhdev.plutotems.util.color.colorify import org.bukkit.entity.Player object ActionTitle : Action { diff --git a/src/main/kotlin/me/adriianhdev/plutotems/module/conf/totem/action/impl/kether/ActionCast.kt b/src/main/kotlin/me/adriianhdev/plutotems/core/totem/action/impl/kether/ActionCast.kt similarity index 91% rename from src/main/kotlin/me/adriianhdev/plutotems/module/conf/totem/action/impl/kether/ActionCast.kt rename to src/main/kotlin/me/adriianhdev/plutotems/core/totem/action/impl/kether/ActionCast.kt index 73de707..7ead162 100644 --- a/src/main/kotlin/me/adriianhdev/plutotems/module/conf/totem/action/impl/kether/ActionCast.kt +++ b/src/main/kotlin/me/adriianhdev/plutotems/core/totem/action/impl/kether/ActionCast.kt @@ -1,8 +1,8 @@ -package me.adriianhdev.plutotems.module.conf.totem.action.impl.kether +package me.adriianhdev.plutotems.core.totem.action.impl.kether import ink.ptms.um.Mythic import ink.ptms.um.Skill -import me.adriianhdev.plutotems.common.util.KetherUtil.getBukkitPlayer +import me.adriianhdev.plutotems.util.KetherUtil.getBukkitPlayer import taboolib.common.platform.function.submit import taboolib.module.kether.* import java.util.concurrent.CompletableFuture diff --git a/src/main/kotlin/me/adriianhdev/plutotems/module/conf/totem/effect/Effect.kt b/src/main/kotlin/me/adriianhdev/plutotems/core/totem/effect/Effect.kt similarity index 93% rename from src/main/kotlin/me/adriianhdev/plutotems/module/conf/totem/effect/Effect.kt rename to src/main/kotlin/me/adriianhdev/plutotems/core/totem/effect/Effect.kt index 0fa0509..bcd3837 100644 --- a/src/main/kotlin/me/adriianhdev/plutotems/module/conf/totem/effect/Effect.kt +++ b/src/main/kotlin/me/adriianhdev/plutotems/core/totem/effect/Effect.kt @@ -1,4 +1,4 @@ -package me.adriianhdev.plutotems.module.conf.totem.effect +package me.adriianhdev.plutotems.core.totem.effect import org.bukkit.entity.Player import org.bukkit.potion.PotionEffect diff --git a/src/main/kotlin/me/adriianhdev/plutotems/common/plugin/PluTotemsLoader.kt b/src/main/kotlin/me/adriianhdev/plutotems/plugin/PluTotemsLoader.kt similarity index 87% rename from src/main/kotlin/me/adriianhdev/plutotems/common/plugin/PluTotemsLoader.kt rename to src/main/kotlin/me/adriianhdev/plutotems/plugin/PluTotemsLoader.kt index 7894040..7a23170 100644 --- a/src/main/kotlin/me/adriianhdev/plutotems/common/plugin/PluTotemsLoader.kt +++ b/src/main/kotlin/me/adriianhdev/plutotems/plugin/PluTotemsLoader.kt @@ -1,11 +1,11 @@ -package me.adriianhdev.plutotems.common.plugin +package me.adriianhdev.plutotems.plugin import me.adriianhdev.plutotems.PluTotems -import me.adriianhdev.plutotems.common.util.EntityUtil -import me.adriianhdev.plutotems.common.util.SchematicUtil -import me.adriianhdev.plutotems.module.conf.ConfigLoader -import me.adriianhdev.plutotems.module.conf.ConfigManager -import me.adriianhdev.plutotems.module.internal.task.EffectTask +import me.adriianhdev.plutotems.configuration.ConfigLoader +import me.adriianhdev.plutotems.configuration.ConfigManager +import me.adriianhdev.plutotems.core.task.EffectTask +import me.adriianhdev.plutotems.util.EntityUtil +import me.adriianhdev.plutotems.util.SchematicUtil import net.kyori.adventure.platform.bukkit.BukkitAudiences import org.bukkit.Bukkit import taboolib.common.platform.function.info diff --git a/src/main/kotlin/me/adriianhdev/plutotems/common/util/ConfigUtil.kt b/src/main/kotlin/me/adriianhdev/plutotems/util/ConfigUtil.kt similarity index 95% rename from src/main/kotlin/me/adriianhdev/plutotems/common/util/ConfigUtil.kt rename to src/main/kotlin/me/adriianhdev/plutotems/util/ConfigUtil.kt index 10b25fb..66026fb 100644 --- a/src/main/kotlin/me/adriianhdev/plutotems/common/util/ConfigUtil.kt +++ b/src/main/kotlin/me/adriianhdev/plutotems/util/ConfigUtil.kt @@ -1,9 +1,9 @@ -package me.adriianhdev.plutotems.common.util +package me.adriianhdev.plutotems.util import com.cryptomorin.xseries.XItemStack -import me.adriianhdev.plutotems.common.util.EntityUtil.getPoseVector -import me.adriianhdev.plutotems.common.util.color.colorify -import me.adriianhdev.plutotems.module.conf.totem.* +import me.adriianhdev.plutotems.core.totem.* +import me.adriianhdev.plutotems.util.EntityUtil.getPoseVector +import me.adriianhdev.plutotems.util.color.colorify import org.bukkit.inventory.ItemStack import org.bukkit.util.Vector import taboolib.module.configuration.Configuration diff --git a/src/main/kotlin/me/adriianhdev/plutotems/common/util/CooldownUtil.kt b/src/main/kotlin/me/adriianhdev/plutotems/util/CooldownUtil.kt similarity index 93% rename from src/main/kotlin/me/adriianhdev/plutotems/common/util/CooldownUtil.kt rename to src/main/kotlin/me/adriianhdev/plutotems/util/CooldownUtil.kt index b7868af..eac5c05 100644 --- a/src/main/kotlin/me/adriianhdev/plutotems/common/util/CooldownUtil.kt +++ b/src/main/kotlin/me/adriianhdev/plutotems/util/CooldownUtil.kt @@ -1,4 +1,4 @@ -package me.adriianhdev.plutotems.common.util +package me.adriianhdev.plutotems.util import org.bukkit.entity.Player import java.util.* diff --git a/src/main/kotlin/me/adriianhdev/plutotems/common/util/EntityUtil.kt b/src/main/kotlin/me/adriianhdev/plutotems/util/EntityUtil.kt similarity index 97% rename from src/main/kotlin/me/adriianhdev/plutotems/common/util/EntityUtil.kt rename to src/main/kotlin/me/adriianhdev/plutotems/util/EntityUtil.kt index 8504231..acac1ff 100644 --- a/src/main/kotlin/me/adriianhdev/plutotems/common/util/EntityUtil.kt +++ b/src/main/kotlin/me/adriianhdev/plutotems/util/EntityUtil.kt @@ -1,12 +1,12 @@ -package me.adriianhdev.plutotems.common.util +package me.adriianhdev.plutotems.util import de.eldoria.eldoutilities.entities.EntityBuilder import io.lumine.mythic.bukkit.BukkitAdapter import io.lumine.mythic.bukkit.MythicBukkit import me.adriianhdev.plutotems.PluTotems -import me.adriianhdev.plutotems.common.util.StringUtil.toVector -import me.adriianhdev.plutotems.common.util.color.colorify -import me.adriianhdev.plutotems.module.conf.totem.Totem +import me.adriianhdev.plutotems.core.totem.Totem +import me.adriianhdev.plutotems.util.StringUtil.toVector +import me.adriianhdev.plutotems.util.color.colorify import org.bukkit.Location import org.bukkit.entity.* import org.bukkit.inventory.ItemStack diff --git a/src/main/kotlin/me/adriianhdev/plutotems/common/util/ExecutorUtils.kt b/src/main/kotlin/me/adriianhdev/plutotems/util/ExecutorUtils.kt similarity index 90% rename from src/main/kotlin/me/adriianhdev/plutotems/common/util/ExecutorUtils.kt rename to src/main/kotlin/me/adriianhdev/plutotems/util/ExecutorUtils.kt index e38fc4e..865df4f 100644 --- a/src/main/kotlin/me/adriianhdev/plutotems/common/util/ExecutorUtils.kt +++ b/src/main/kotlin/me/adriianhdev/plutotems/util/ExecutorUtils.kt @@ -1,14 +1,14 @@ -package me.adriianhdev.plutotems.common.util - -import me.adriianhdev.plutotems.common.util.EntityUtil.spawnEntity -import me.adriianhdev.plutotems.common.util.KetherUtil.eval -import me.adriianhdev.plutotems.common.util.SchematicUtil.paste -import me.adriianhdev.plutotems.common.util.TotemUtil.getCooldown -import me.adriianhdev.plutotems.common.util.TotemUtil.hasCooldown -import me.adriianhdev.plutotems.common.util.TotemUtil.isAirOrNull -import me.adriianhdev.plutotems.module.conf.totem.Totem -import me.adriianhdev.plutotems.module.conf.totem.action.ActionManager -import me.adriianhdev.plutotems.module.conf.totem.effect.Effect +package me.adriianhdev.plutotems.util + +import me.adriianhdev.plutotems.core.totem.Totem +import me.adriianhdev.plutotems.core.totem.action.ActionManager +import me.adriianhdev.plutotems.core.totem.effect.Effect +import me.adriianhdev.plutotems.util.EntityUtil.spawnEntity +import me.adriianhdev.plutotems.util.KetherUtil.eval +import me.adriianhdev.plutotems.util.SchematicUtil.paste +import me.adriianhdev.plutotems.util.TotemUtil.getCooldown +import me.adriianhdev.plutotems.util.TotemUtil.hasCooldown +import me.adriianhdev.plutotems.util.TotemUtil.isAirOrNull import org.bukkit.EntityEffect import org.bukkit.attribute.Attribute import org.bukkit.entity.Player diff --git a/src/main/kotlin/me/adriianhdev/plutotems/common/util/KetherUtil.kt b/src/main/kotlin/me/adriianhdev/plutotems/util/KetherUtil.kt similarity index 96% rename from src/main/kotlin/me/adriianhdev/plutotems/common/util/KetherUtil.kt rename to src/main/kotlin/me/adriianhdev/plutotems/util/KetherUtil.kt index e7aef7d..909f378 100644 --- a/src/main/kotlin/me/adriianhdev/plutotems/common/util/KetherUtil.kt +++ b/src/main/kotlin/me/adriianhdev/plutotems/util/KetherUtil.kt @@ -1,4 +1,4 @@ -package me.adriianhdev.plutotems.common.util +package me.adriianhdev.plutotems.util import org.bukkit.entity.Player import taboolib.common.platform.function.adaptPlayer diff --git a/src/main/kotlin/me/adriianhdev/plutotems/common/util/PlayerUtil.kt b/src/main/kotlin/me/adriianhdev/plutotems/util/PlayerUtil.kt similarity index 91% rename from src/main/kotlin/me/adriianhdev/plutotems/common/util/PlayerUtil.kt rename to src/main/kotlin/me/adriianhdev/plutotems/util/PlayerUtil.kt index 3ac9029..bad6032 100644 --- a/src/main/kotlin/me/adriianhdev/plutotems/common/util/PlayerUtil.kt +++ b/src/main/kotlin/me/adriianhdev/plutotems/util/PlayerUtil.kt @@ -1,7 +1,7 @@ -package me.adriianhdev.plutotems.common.util +package me.adriianhdev.plutotems.util -import me.adriianhdev.plutotems.common.util.StringUtil.replaceVar -import me.adriianhdev.plutotems.module.conf.totem.Totem +import me.adriianhdev.plutotems.core.totem.Totem +import me.adriianhdev.plutotems.util.StringUtil.replaceVar import org.bukkit.entity.Player import taboolib.library.xseries.XItemStack diff --git a/src/main/kotlin/me/adriianhdev/plutotems/common/util/SchematicUtil.kt b/src/main/kotlin/me/adriianhdev/plutotems/util/SchematicUtil.kt similarity index 98% rename from src/main/kotlin/me/adriianhdev/plutotems/common/util/SchematicUtil.kt rename to src/main/kotlin/me/adriianhdev/plutotems/util/SchematicUtil.kt index db1b25a..4ea3fce 100644 --- a/src/main/kotlin/me/adriianhdev/plutotems/common/util/SchematicUtil.kt +++ b/src/main/kotlin/me/adriianhdev/plutotems/util/SchematicUtil.kt @@ -1,4 +1,4 @@ -package me.adriianhdev.plutotems.common.util +package me.adriianhdev.plutotems.util import com.fastasyncworldedit.core.FaweAPI import com.sk89q.worldedit.EditSession @@ -13,7 +13,7 @@ import com.sk89q.worldedit.math.BlockVector3 import com.sk89q.worldedit.math.transform.AffineTransform import com.sk89q.worldedit.session.ClipboardHolder import me.adriianhdev.plutotems.PluTotems -import me.adriianhdev.plutotems.module.conf.totem.Totem +import me.adriianhdev.plutotems.core.totem.Totem import org.bukkit.entity.Player import org.bukkit.scheduler.BukkitRunnable import taboolib.common.platform.function.getDataFolder diff --git a/src/main/kotlin/me/adriianhdev/plutotems/common/util/StringUtil.kt b/src/main/kotlin/me/adriianhdev/plutotems/util/StringUtil.kt similarity index 83% rename from src/main/kotlin/me/adriianhdev/plutotems/common/util/StringUtil.kt rename to src/main/kotlin/me/adriianhdev/plutotems/util/StringUtil.kt index 6240328..15da0e3 100644 --- a/src/main/kotlin/me/adriianhdev/plutotems/common/util/StringUtil.kt +++ b/src/main/kotlin/me/adriianhdev/plutotems/util/StringUtil.kt @@ -1,7 +1,7 @@ -package me.adriianhdev.plutotems.common.util +package me.adriianhdev.plutotems.util -import me.adriianhdev.plutotems.common.util.color.colorify -import me.adriianhdev.plutotems.module.conf.totem.Totem +import me.adriianhdev.plutotems.core.totem.Totem +import me.adriianhdev.plutotems.util.color.colorify import net.kyori.adventure.text.Component import net.kyori.adventure.text.minimessage.MiniMessage import org.bukkit.util.Vector diff --git a/src/main/kotlin/me/adriianhdev/plutotems/common/util/TotemUtil.kt b/src/main/kotlin/me/adriianhdev/plutotems/util/TotemUtil.kt similarity index 90% rename from src/main/kotlin/me/adriianhdev/plutotems/common/util/TotemUtil.kt rename to src/main/kotlin/me/adriianhdev/plutotems/util/TotemUtil.kt index 91ee6e9..db1614c 100644 --- a/src/main/kotlin/me/adriianhdev/plutotems/common/util/TotemUtil.kt +++ b/src/main/kotlin/me/adriianhdev/plutotems/util/TotemUtil.kt @@ -1,11 +1,11 @@ -package me.adriianhdev.plutotems.common.util +package me.adriianhdev.plutotems.util import me.adriianhdev.plutotems.PluTotems -import me.adriianhdev.plutotems.common.util.CooldownUtil.Companion.DEFAULT_COOLDOWN -import me.adriianhdev.plutotems.common.util.ExecutorUtils.checkEffects -import me.adriianhdev.plutotems.common.util.ExecutorUtils.runType -import me.adriianhdev.plutotems.module.conf.totem.Totem -import me.adriianhdev.plutotems.module.conf.totem.TotemManager +import me.adriianhdev.plutotems.core.totem.Totem +import me.adriianhdev.plutotems.core.totem.TotemManager +import me.adriianhdev.plutotems.util.CooldownUtil.Companion.DEFAULT_COOLDOWN +import me.adriianhdev.plutotems.util.ExecutorUtils.checkEffects +import me.adriianhdev.plutotems.util.ExecutorUtils.runType import org.bukkit.Material import org.bukkit.NamespacedKey import org.bukkit.entity.Entity diff --git a/src/main/kotlin/me/adriianhdev/plutotems/common/util/color/HexUtil.kt b/src/main/kotlin/me/adriianhdev/plutotems/util/color/HexUtil.kt similarity index 99% rename from src/main/kotlin/me/adriianhdev/plutotems/common/util/color/HexUtil.kt rename to src/main/kotlin/me/adriianhdev/plutotems/util/color/HexUtil.kt index dfadd71..2d64f21 100644 --- a/src/main/kotlin/me/adriianhdev/plutotems/common/util/color/HexUtil.kt +++ b/src/main/kotlin/me/adriianhdev/plutotems/util/color/HexUtil.kt @@ -1,4 +1,4 @@ -package me.adriianhdev.plutotems.common.util.color +package me.adriianhdev.plutotems.util.color import net.kyori.adventure.text.Component import net.kyori.adventure.text.minimessage.MiniMessage