From 5dc07650d60e72afde21e900cc944d4b144c572c Mon Sep 17 00:00:00 2001 From: Wolf2323 Date: Mon, 20 Jan 2025 14:52:42 +0100 Subject: [PATCH] moved QuestException from exception package to api.quest --- src/main/java/org/betonquest/betonquest/Backpack.java | 2 +- src/main/java/org/betonquest/betonquest/BetonQuest.java | 2 +- src/main/java/org/betonquest/betonquest/CustomDropListener.java | 2 +- src/main/java/org/betonquest/betonquest/Journal.java | 2 +- src/main/java/org/betonquest/betonquest/api/Condition.java | 2 +- .../java/org/betonquest/betonquest/api/CountingObjective.java | 2 +- .../java/org/betonquest/betonquest/api/ForceSyncHandler.java | 2 +- src/main/java/org/betonquest/betonquest/api/Objective.java | 2 +- src/main/java/org/betonquest/betonquest/api/QuestEvent.java | 2 +- src/main/java/org/betonquest/betonquest/api/Variable.java | 2 +- .../betonquest/api/common/function/QuestCallable.java | 2 +- .../betonquest/api/common/function/QuestConsumer.java | 2 +- .../betonquest/api/common/function/QuestFunction.java | 2 +- .../org/betonquest/betonquest/api/common/function/Selector.java | 2 +- .../betonquest/betonquest/api/common/function/Selectors.java | 2 +- .../org/betonquest/betonquest/api/quest/PlayerQuestFactory.java | 1 - .../betonquest/betonquest/api/quest/PlayerlessQuestFactory.java | 1 - .../betonquest/{exception => api/quest}/QuestException.java | 2 +- .../betonquest/api/quest/condition/PlayerCondition.java | 2 +- .../betonquest/api/quest/condition/PlayerConditionFactory.java | 2 +- .../betonquest/api/quest/condition/PlayerlessCondition.java | 2 +- .../api/quest/condition/PlayerlessConditionFactory.java | 2 +- .../api/quest/condition/nullable/NullableCondition.java | 2 +- .../api/quest/condition/nullable/NullableConditionAdapter.java | 2 +- .../betonquest/api/quest/condition/online/OnlineCondition.java | 2 +- .../api/quest/condition/online/OnlineConditionAdapter.java | 2 +- .../java/org/betonquest/betonquest/api/quest/event/Event.java | 2 +- .../org/betonquest/betonquest/api/quest/event/EventFactory.java | 2 +- .../org/betonquest/betonquest/api/quest/event/StaticEvent.java | 2 +- .../betonquest/api/quest/event/StaticEventFactory.java | 2 +- .../betonquest/api/quest/event/nullable/NullableEvent.java | 2 +- .../api/quest/event/nullable/NullableEventAdapter.java | 2 +- .../betonquest/api/quest/event/online/OnlineEvent.java | 2 +- .../betonquest/api/quest/event/online/OnlineEventAdapter.java | 2 +- .../betonquest/api/quest/variable/PlayerVariable.java | 2 +- .../betonquest/api/quest/variable/PlayerVariableFactory.java | 2 +- .../betonquest/api/quest/variable/PlayerlessVariable.java | 2 +- .../api/quest/variable/PlayerlessVariableFactory.java | 2 +- .../api/quest/variable/nullable/NullableVariable.java | 2 +- .../api/quest/variable/nullable/NullableVariableAdapter.java | 2 +- .../betonquest/api/quest/variable/online/OnlineVariable.java | 2 +- .../api/quest/variable/online/OnlineVariableAdapter.java | 2 +- .../org/betonquest/betonquest/api/schedule/CronSchedule.java | 2 +- .../java/org/betonquest/betonquest/api/schedule/Schedule.java | 2 +- .../java/org/betonquest/betonquest/bstats/BStatsMetrics.java | 2 +- .../java/org/betonquest/betonquest/command/LangCommand.java | 2 +- .../java/org/betonquest/betonquest/command/QuestCommand.java | 2 +- .../compatibility/auraskills/AuraSkillsExperienceEvent.java | 2 +- .../compatibility/auraskills/AuraSkillsLevelCondition.java | 2 +- .../compatibility/auraskills/AuraSkillsStatsCondition.java | 2 +- .../betonquest/compatibility/brewery/DrunkCondition.java | 2 +- .../betonquest/compatibility/brewery/DrunkQualityCondition.java | 2 +- .../betonquest/compatibility/brewery/GiveBrewEvent.java | 2 +- .../betonquest/compatibility/brewery/HasBrewCondition.java | 2 +- .../betonquest/compatibility/brewery/TakeBrewEvent.java | 2 +- .../compatibility/citizens/CitizensConversationStarter.java | 2 +- .../betonquest/compatibility/citizens/CitizensHologramLoop.java | 2 +- .../citizens/condition/distance/NPCDistanceCondition.java | 2 +- .../condition/distance/NPCDistanceConditionFactory.java | 2 +- .../citizens/condition/location/NPCLocationCondition.java | 2 +- .../condition/location/NPCLocationConditionFactory.java | 2 +- .../citizens/condition/region/NPCRegionCondition.java | 2 +- .../citizens/condition/region/NPCRegionConditionFactory.java | 2 +- .../citizens/event/move/CitizensMoveController.java | 2 +- .../compatibility/citizens/event/move/CitizensMoveEvent.java | 2 +- .../citizens/event/move/CitizensMoveEventFactory.java | 2 +- .../compatibility/citizens/event/move/CitizensStopEvent.java | 2 +- .../citizens/event/move/CitizensStopEventFactory.java | 2 +- .../compatibility/citizens/event/teleport/NPCTeleportEvent.java | 2 +- .../citizens/event/teleport/NPCTeleportEventFactory.java | 2 +- .../compatibility/citizens/objective/NPCInteractObjective.java | 2 +- .../compatibility/citizens/objective/NPCKillObjective.java | 2 +- .../compatibility/citizens/objective/NPCRangeObjective.java | 2 +- .../compatibility/citizens/variable/npc/CitizensVariable.java | 2 +- .../citizens/variable/npc/CitizensVariableFactory.java | 2 +- .../compatibility/denizen/DenizenTaskScriptEvent.java | 2 +- .../compatibility/effectlib/EffectLibParticleManager.java | 2 +- .../betonquest/compatibility/effectlib/EffectLibRunnable.java | 2 +- .../betonquest/compatibility/effectlib/event/ParticleEvent.java | 2 +- .../compatibility/effectlib/event/ParticleEventFactory.java | 2 +- .../betonquest/compatibility/fabled/FabledClassCondition.java | 2 +- .../betonquest/compatibility/fabled/FabledLevelCondition.java | 2 +- .../compatibility/fakeblock/FakeBlockEventFactory.java | 2 +- .../betonquest/compatibility/fakeblock/HideGroupEvent.java | 2 +- .../betonquest/compatibility/fakeblock/ShowGroupEvent.java | 2 +- .../compatibility/heroes/HeroesAttributeCondition.java | 2 +- .../betonquest/compatibility/heroes/HeroesClassCondition.java | 2 +- .../betonquest/compatibility/heroes/HeroesExperienceEvent.java | 2 +- .../betonquest/compatibility/heroes/HeroesSkillCondition.java | 2 +- .../betonquest/compatibility/holograms/HologramLoop.java | 2 +- .../compatibility/holograms/LocationHologramLoop.java | 2 +- .../holograms/decentholograms/DecentHologramsIntegrator.java | 2 +- .../holographicdisplays/HologramGlobalPlaceholder.java | 2 +- .../holograms/holographicdisplays/HologramPlaceholder.java | 2 +- .../holographicdisplays/HolographicDisplaysIntegrator.java | 2 +- .../betonquest/compatibility/jobsreborn/ConditionCanLevel.java | 2 +- .../betonquest/compatibility/jobsreborn/ConditionHasJob.java | 2 +- .../betonquest/compatibility/jobsreborn/ConditionJobFull.java | 2 +- .../betonquest/compatibility/jobsreborn/ConditionJobLevel.java | 2 +- .../betonquest/compatibility/jobsreborn/EventAddExp.java | 2 +- .../betonquest/compatibility/jobsreborn/EventAddLevel.java | 2 +- .../betonquest/compatibility/jobsreborn/EventDelLevel.java | 2 +- .../betonquest/compatibility/jobsreborn/EventJoinJob.java | 2 +- .../betonquest/compatibility/jobsreborn/EventLeaveJob.java | 2 +- .../betonquest/compatibility/jobsreborn/EventSetLevel.java | 2 +- .../betonquest/compatibility/jobsreborn/ObjectiveJoinJob.java | 2 +- .../betonquest/compatibility/jobsreborn/ObjectiveLeaveJob.java | 2 +- .../compatibility/jobsreborn/ObjectiveLevelUpEvent.java | 2 +- .../compatibility/jobsreborn/ObjectivePaymentEvent.java | 2 +- .../luckperms/permission/LuckPermsEventFactory.java | 2 +- .../luckperms/permission/LuckPermsNodeBuilder.java | 2 +- .../luckperms/permission/LuckPermsPermissionEvent.java | 2 +- .../betonquest/compatibility/magic/WandCondition.java | 2 +- .../betonquest/compatibility/mcmmo/McMMOAddExpEvent.java | 2 +- .../compatibility/mcmmo/McMMOSkillLevelCondition.java | 2 +- .../mmogroup/mmocore/MMOCoreAttributeCondition.java | 2 +- .../mmogroup/mmocore/MMOCoreAttributePointsEvent.java | 2 +- .../mmocore/MMOCoreAttributeReallocationPointsEvent.java | 2 +- .../mmogroup/mmocore/MMOCoreBreakCustomBlockObjective.java | 2 +- .../mmogroup/mmocore/MMOCoreChangeClassObjective.java | 2 +- .../compatibility/mmogroup/mmocore/MMOCoreClassCondition.java | 2 +- .../mmogroup/mmocore/MMOCoreClassExperienceEvent.java | 2 +- .../compatibility/mmogroup/mmocore/MMOCoreClassPointsEvent.java | 2 +- .../mmogroup/mmocore/MMOCoreProfessionExperienceEvent.java | 2 +- .../mmogroup/mmocore/MMOCoreProfessionLevelCondition.java | 2 +- .../mmogroup/mmocore/MMOCoreProfessionObjective.java | 2 +- .../compatibility/mmogroup/mmocore/MMOCoreSkillPointsEvent.java | 2 +- .../betonquest/compatibility/mmogroup/mmocore/MMOCoreUtils.java | 2 +- .../mmogroup/mmoitems/MMOItemsApplyGemObjective.java | 2 +- .../compatibility/mmogroup/mmoitems/MMOItemsCraftObjective.java | 2 +- .../compatibility/mmogroup/mmoitems/MMOItemsGiveEvent.java | 2 +- .../compatibility/mmogroup/mmoitems/MMOItemsHandCondition.java | 2 +- .../compatibility/mmogroup/mmoitems/MMOItemsItemCondition.java | 2 +- .../mmogroup/mmoitems/MMOItemsUpgradeObjective.java | 2 +- .../compatibility/mmogroup/mmoitems/MMOItemsUtils.java | 2 +- .../compatibility/mmogroup/mmoitems/take/MMOItemsTakeEvent.java | 2 +- .../mmogroup/mmoitems/take/MMOItemsTakeEventFactory.java | 2 +- .../compatibility/mmogroup/mmolib/MythicLibSkillObjective.java | 2 +- .../compatibility/mmogroup/mmolib/MythicLibStatCondition.java | 2 +- .../compatibility/mythicmobs/MythicMobKillObjective.java | 2 +- .../mythicmobs/conditions/MythicMobDistanceCondition.java | 2 +- .../conditions/MythicMobDistanceConditionFactory.java | 2 +- .../compatibility/mythicmobs/events/MythicSpawnMobEvent.java | 2 +- .../mythicmobs/events/MythicSpawnMobEventFactory.java | 2 +- .../compatibility/placeholderapi/BetonQuestPlaceholder.java | 2 +- .../betonquest/compatibility/protocollib/FreezeEvent.java | 2 +- .../protocollib/hider/UpdateVisibilityNowEvent.java | 2 +- .../betonquest/compatibility/quests/QuestsCondition.java | 2 +- .../betonquest/betonquest/compatibility/quests/QuestsEvent.java | 2 +- .../compatibility/shopkeepers/HavingShopCondition.java | 2 +- .../betonquest/compatibility/shopkeepers/OpenShopEvent.java | 2 +- .../betonquest/compatibility/skript/BQEventSkript.java | 2 +- .../betonquest/compatibility/traincarts/TrainCartsUtils.java | 2 +- .../traincarts/conditions/TrainCartsRideCondition.java | 2 +- .../traincarts/conditions/TrainCartsRideConditionFactory.java | 2 +- .../traincarts/objectives/TrainCartsExitObjective.java | 2 +- .../traincarts/objectives/TrainCartsLocationObjective.java | 2 +- .../traincarts/objectives/TrainCartsRideObjective.java | 2 +- .../compatibility/vault/condition/MoneyCondition.java | 2 +- .../compatibility/vault/condition/MoneyConditionFactory.java | 2 +- .../betonquest/compatibility/vault/event/MoneyEvent.java | 2 +- .../betonquest/compatibility/vault/event/MoneyEventFactory.java | 2 +- .../betonquest/compatibility/vault/event/PermissionEvent.java | 2 +- .../compatibility/vault/event/PermissionEventFactory.java | 2 +- .../betonquest/compatibility/vault/variable/MoneyVariable.java | 2 +- .../compatibility/vault/variable/MoneyVariableFactory.java | 2 +- .../betonquest/compatibility/worldedit/PasteSchematicEvent.java | 2 +- .../betonquest/compatibility/worldguard/RegionCondition.java | 2 +- .../betonquest/compatibility/worldguard/RegionObjective.java | 2 +- src/main/java/org/betonquest/betonquest/config/Config.java | 2 +- .../java/org/betonquest/betonquest/config/QuestCanceler.java | 2 +- .../org/betonquest/betonquest/conversation/Conversation.java | 2 +- .../betonquest/betonquest/conversation/ConversationData.java | 2 +- .../betonquest/conversation/ConversationOptionResolver.java | 2 +- .../betonquest/betonquest/conversation/SimpleInterceptor.java | 2 +- .../java/org/betonquest/betonquest/database/PlayerData.java | 2 +- .../java/org/betonquest/betonquest/instruction/Instruction.java | 2 +- src/main/java/org/betonquest/betonquest/instruction/Item.java | 2 +- .../betonquest/betonquest/instruction/argument/Argument.java | 2 +- .../betonquest/instruction/argument/VariableArgument.java | 2 +- .../betonquest/instruction/argument/parser/ArgumentParser.java | 2 +- .../instruction/argument/parser/CollectionParser.java | 2 +- .../betonquest/instruction/argument/parser/EnumParser.java | 2 +- .../betonquest/instruction/argument/parser/IDParser.java | 2 +- .../betonquest/instruction/argument/parser/ItemParser.java | 2 +- .../betonquest/instruction/argument/parser/NumberParser.java | 2 +- .../betonquest/instruction/argument/parser/Parser.java | 2 +- .../betonquest/betonquest/instruction/variable/Variable.java | 2 +- .../betonquest/instruction/variable/VariableNumber.java | 2 +- .../betonquest/instruction/variable/VariableString.java | 2 +- .../instruction/variable/location/VariableLocation.java | 2 +- .../instruction/variable/location/VariableVector.java | 2 +- .../betonquest/instruction/variable/location/VariableWorld.java | 2 +- src/main/java/org/betonquest/betonquest/item/QuestItem.java | 2 +- .../org/betonquest/betonquest/item/typehandler/BookHandler.java | 2 +- .../betonquest/betonquest/item/typehandler/ColorHandler.java | 2 +- .../betonquest/item/typehandler/CustomModelDataHandler.java | 2 +- .../betonquest/item/typehandler/DurabilityHandler.java | 2 +- .../betonquest/item/typehandler/EnchantmentsHandler.java | 2 +- .../betonquest/item/typehandler/FireworkEffectHandler.java | 2 +- .../betonquest/betonquest/item/typehandler/FireworkHandler.java | 2 +- .../org/betonquest/betonquest/item/typehandler/FlagHandler.java | 2 +- .../org/betonquest/betonquest/item/typehandler/HandlerUtil.java | 2 +- .../org/betonquest/betonquest/item/typehandler/HeadHandler.java | 2 +- .../betonquest/betonquest/item/typehandler/ItemMetaHandler.java | 2 +- .../org/betonquest/betonquest/item/typehandler/LoreHandler.java | 2 +- .../org/betonquest/betonquest/item/typehandler/NameHandler.java | 2 +- .../betonquest/betonquest/item/typehandler/PotionHandler.java | 2 +- .../betonquest/item/typehandler/UnbreakableHandler.java | 2 +- .../java/org/betonquest/betonquest/menu/ItemDescription.java | 2 +- src/main/java/org/betonquest/betonquest/menu/Menu.java | 2 +- src/main/java/org/betonquest/betonquest/menu/MenuItem.java | 2 +- .../betonquest/betonquest/menu/betonquest/MenuCondition.java | 2 +- .../betonquest/betonquest/menu/betonquest/MenuObjective.java | 2 +- .../betonquest/betonquest/menu/betonquest/MenuQuestEvent.java | 2 +- .../org/betonquest/betonquest/menu/betonquest/MenuVariable.java | 2 +- .../org/betonquest/betonquest/notify/ActionBarNotifyIO.java | 2 +- .../org/betonquest/betonquest/notify/AdvancementNotifyIO.java | 2 +- .../java/org/betonquest/betonquest/notify/BossBarNotifyIO.java | 2 +- .../java/org/betonquest/betonquest/notify/ChatNotifyIO.java | 2 +- src/main/java/org/betonquest/betonquest/notify/Notify.java | 2 +- src/main/java/org/betonquest/betonquest/notify/NotifyIO.java | 2 +- src/main/java/org/betonquest/betonquest/notify/NotifySound.java | 2 +- src/main/java/org/betonquest/betonquest/notify/SoundIO.java | 2 +- .../java/org/betonquest/betonquest/notify/SubTitleNotifyIO.java | 2 +- .../java/org/betonquest/betonquest/notify/SuppressNotifyIO.java | 2 +- .../java/org/betonquest/betonquest/notify/TitleNotifyIO.java | 2 +- .../java/org/betonquest/betonquest/notify/TotemNotifyIO.java | 2 +- .../betonquest/objective/AbstractLocationObjective.java | 2 +- .../org/betonquest/betonquest/objective/ActionObjective.java | 2 +- .../betonquest/betonquest/objective/ArrowShootObjective.java | 2 +- .../org/betonquest/betonquest/objective/BlockObjective.java | 2 +- .../org/betonquest/betonquest/objective/BreedObjective.java | 2 +- .../java/org/betonquest/betonquest/objective/BrewObjective.java | 2 +- .../org/betonquest/betonquest/objective/ChestPutObjective.java | 2 +- .../org/betonquest/betonquest/objective/CommandObjective.java | 2 +- .../org/betonquest/betonquest/objective/ConsumeObjective.java | 2 +- .../org/betonquest/betonquest/objective/CraftingObjective.java | 2 +- .../org/betonquest/betonquest/objective/DelayObjective.java | 2 +- .../java/org/betonquest/betonquest/objective/DieObjective.java | 2 +- .../org/betonquest/betonquest/objective/EnchantObjective.java | 2 +- .../betonquest/objective/EntityInteractObjective.java | 2 +- .../org/betonquest/betonquest/objective/EquipItemObjective.java | 2 +- .../betonquest/betonquest/objective/ExperienceObjective.java | 2 +- .../java/org/betonquest/betonquest/objective/FishObjective.java | 2 +- .../java/org/betonquest/betonquest/objective/JumpObjective.java | 2 +- .../betonquest/betonquest/objective/KillPlayerObjective.java | 2 +- .../org/betonquest/betonquest/objective/LocationObjective.java | 2 +- .../org/betonquest/betonquest/objective/LoginObjective.java | 2 +- .../org/betonquest/betonquest/objective/LogoutObjective.java | 2 +- .../org/betonquest/betonquest/objective/MobKillObjective.java | 2 +- .../org/betonquest/betonquest/objective/PasswordObjective.java | 2 +- .../org/betonquest/betonquest/objective/PickupObjective.java | 2 +- .../betonquest/betonquest/objective/ResourcePackObjective.java | 2 +- .../java/org/betonquest/betonquest/objective/RideObjective.java | 2 +- .../org/betonquest/betonquest/objective/ShearObjective.java | 2 +- .../org/betonquest/betonquest/objective/SmeltingObjective.java | 2 +- .../org/betonquest/betonquest/objective/StageObjective.java | 2 +- .../java/org/betonquest/betonquest/objective/StepObjective.java | 2 +- .../java/org/betonquest/betonquest/objective/TameObjective.java | 2 +- .../org/betonquest/betonquest/objective/VariableObjective.java | 2 +- .../java/org/betonquest/betonquest/playerhider/PlayerHider.java | 2 +- .../betonquest/betonquest/quest/PrimaryServerThreadType.java | 2 +- .../quest/condition/PrimaryServerThreadPlayerCondition.java | 2 +- .../quest/condition/PrimaryServerThreadPlayerlessCondition.java | 2 +- .../quest/condition/ThrowExceptionPlayerlessCondition.java | 2 +- .../quest/condition/advancement/AdvancementCondition.java | 2 +- .../condition/advancement/AdvancementConditionFactory.java | 2 +- .../betonquest/quest/condition/armor/ArmorCondition.java | 2 +- .../betonquest/quest/condition/armor/ArmorConditionFactory.java | 2 +- .../betonquest/quest/condition/armor/ArmorRatingCondition.java | 2 +- .../quest/condition/armor/ArmorRatingConditionFactory.java | 2 +- .../betonquest/quest/condition/biome/BiomeCondition.java | 2 +- .../betonquest/quest/condition/biome/BiomeConditionFactory.java | 2 +- .../betonquest/quest/condition/block/BlockCondition.java | 2 +- .../betonquest/quest/condition/block/BlockConditionFactory.java | 2 +- .../betonquest/quest/condition/burning/BurningCondition.java | 2 +- .../quest/condition/burning/BurningConditionFactory.java | 2 +- .../betonquest/quest/condition/check/CheckCondition.java | 2 +- .../betonquest/quest/condition/check/CheckConditionFactory.java | 2 +- .../betonquest/quest/condition/chest/ChestItemCondition.java | 2 +- .../quest/condition/chest/ChestItemConditionFactory.java | 2 +- .../quest/condition/conversation/ConversationCondition.java | 2 +- .../condition/conversation/ConversationConditionFactory.java | 2 +- .../quest/condition/conversation/InConversationCondition.java | 2 +- .../condition/conversation/InConversationConditionFactory.java | 2 +- .../betonquest/quest/condition/effect/EffectCondition.java | 2 +- .../quest/condition/effect/EffectConditionFactory.java | 2 +- .../betonquest/quest/condition/entity/EntityCondition.java | 2 +- .../quest/condition/entity/EntityConditionFactory.java | 2 +- .../quest/condition/experience/ExperienceCondition.java | 2 +- .../quest/condition/experience/ExperienceConditionFactory.java | 2 +- .../betonquest/quest/condition/facing/FacingCondition.java | 2 +- .../quest/condition/facing/FacingConditionFactory.java | 2 +- .../betonquest/quest/condition/flying/FlyingCondition.java | 2 +- .../quest/condition/flying/FlyingConditionFactory.java | 2 +- .../betonquest/quest/condition/gamemode/GameModeCondition.java | 2 +- .../quest/condition/gamemode/GameModeConditionFactory.java | 2 +- .../betonquest/quest/condition/hand/HandCondition.java | 2 +- .../betonquest/quest/condition/hand/HandConditionFactory.java | 2 +- .../betonquest/quest/condition/health/HealthCondition.java | 2 +- .../quest/condition/health/HealthConditionFactory.java | 2 +- .../betonquest/quest/condition/height/HeightCondition.java | 2 +- .../quest/condition/height/HeightConditionFactory.java | 2 +- .../betonquest/quest/condition/hunger/HungerCondition.java | 2 +- .../quest/condition/hunger/HungerConditionFactory.java | 2 +- .../betonquest/quest/condition/item/ItemCondition.java | 2 +- .../betonquest/quest/condition/item/ItemConditionFactory.java | 2 +- .../quest/condition/item/ItemDurabilityCondition.java | 2 +- .../quest/condition/item/ItemDurabilityConditionFactory.java | 2 +- .../betonquest/quest/condition/journal/JournalCondition.java | 2 +- .../quest/condition/journal/JournalConditionFactory.java | 2 +- .../betonquest/quest/condition/language/LanguageCondition.java | 2 +- .../quest/condition/language/LanguageConditionFactory.java | 2 +- .../betonquest/quest/condition/location/LocationCondition.java | 2 +- .../quest/condition/location/LocationConditionFactory.java | 2 +- .../betonquest/quest/condition/logik/AlternativeCondition.java | 2 +- .../quest/condition/logik/AlternativeConditionFactory.java | 2 +- .../betonquest/quest/condition/logik/ConjunctionCondition.java | 2 +- .../quest/condition/logik/ConjunctionConditionFactory.java | 2 +- .../betonquest/quest/condition/looking/LookingAtCondition.java | 2 +- .../quest/condition/looking/LookingAtConditionFactory.java | 2 +- .../betonquest/quest/condition/moon/MoonCycleCondition.java | 2 +- .../quest/condition/moon/MoonCycleConditionFactory.java | 2 +- .../quest/condition/number/NumberCompareCondition.java | 2 +- .../quest/condition/number/NumberCompareConditionFactory.java | 2 +- .../betonquest/betonquest/quest/condition/number/Operation.java | 2 +- .../quest/condition/objective/ObjectiveCondition.java | 2 +- .../quest/condition/objective/ObjectiveConditionFactory.java | 2 +- .../betonquest/quest/condition/party/PartyCondition.java | 2 +- .../betonquest/quest/condition/party/PartyConditionFactory.java | 2 +- .../quest/condition/permission/PermissionCondition.java | 2 +- .../quest/condition/permission/PermissionConditionFactory.java | 2 +- .../betonquest/quest/condition/point/GlobalPointCondition.java | 2 +- .../quest/condition/point/GlobalPointConditionFactory.java | 2 +- .../betonquest/quest/condition/point/PointCondition.java | 2 +- .../betonquest/quest/condition/point/PointConditionFactory.java | 2 +- .../betonquest/quest/condition/random/RandomCondition.java | 2 +- .../quest/condition/random/RandomConditionFactory.java | 2 +- .../betonquest/quest/condition/ride/RideCondition.java | 2 +- .../betonquest/quest/condition/ride/RideConditionFactory.java | 2 +- .../condition/scoreboard/ScoreboardObjectiveCondition.java | 2 +- .../scoreboard/ScoreboardObjectiveConditionFactory.java | 2 +- .../quest/condition/scoreboard/ScoreboardTagCondition.java | 2 +- .../condition/scoreboard/ScoreboardTagConditionFactory.java | 2 +- .../betonquest/quest/condition/slots/EmptySlotsCondition.java | 2 +- .../quest/condition/slots/EmptySlotsConditionFactory.java | 2 +- .../betonquest/quest/condition/sneak/SneakCondition.java | 2 +- .../betonquest/quest/condition/sneak/SneakConditionFactory.java | 2 +- .../betonquest/quest/condition/stage/StageCondition.java | 2 +- .../betonquest/quest/condition/stage/StageConditionFactory.java | 2 +- .../betonquest/quest/condition/tag/GlobalTagCondition.java | 2 +- .../quest/condition/tag/GlobalTagConditionFactory.java | 2 +- .../betonquest/betonquest/quest/condition/tag/TagCondition.java | 2 +- .../betonquest/quest/condition/tag/TagConditionFactory.java | 2 +- .../org/betonquest/betonquest/quest/condition/time/Time.java | 2 +- .../betonquest/betonquest/quest/condition/time/TimeFrame.java | 2 +- .../betonquest/quest/condition/time/ingame/TimeCondition.java | 2 +- .../quest/condition/time/ingame/TimeConditionFactory.java | 2 +- .../quest/condition/time/real/DayOfWeekCondition.java | 2 +- .../quest/condition/time/real/DayOfWeekConditionFactory.java | 2 +- .../quest/condition/time/real/PartialDateConditionFactory.java | 2 +- .../betonquest/quest/condition/time/real/RealTimeCondition.java | 2 +- .../quest/condition/time/real/RealTimeConditionFactory.java | 2 +- .../betonquest/quest/condition/time/real/TimeInterval.java | 2 +- .../betonquest/quest/condition/variable/VariableCondition.java | 2 +- .../quest/condition/variable/VariableConditionFactory.java | 2 +- .../betonquest/quest/condition/weather/WeatherCondition.java | 2 +- .../quest/condition/weather/WeatherConditionFactory.java | 2 +- .../betonquest/quest/condition/world/WorldCondition.java | 2 +- .../betonquest/quest/condition/world/WorldConditionFactory.java | 2 +- .../betonquest/quest/event/CallStaticEventAdapter.java | 2 +- .../betonquest/quest/event/DatabaseSaverStaticEvent.java | 2 +- .../betonquest/quest/event/IngameNotificationSender.java | 2 +- .../quest/event/OnlineProfileGroupStaticEventAdapter.java | 2 +- .../betonquest/betonquest/quest/event/OpPlayerEventAdapter.java | 2 +- .../betonquest/quest/event/PrimaryServerThreadEvent.java | 2 +- .../betonquest/quest/event/PrimaryServerThreadStaticEvent.java | 2 +- .../betonquest/quest/event/SequentialStaticEvent.java | 2 +- .../org/betonquest/betonquest/quest/event/burn/BurnEvent.java | 2 +- .../betonquest/quest/event/burn/BurnEventFactory.java | 2 +- .../betonquest/betonquest/quest/event/cancel/CancelEvent.java | 2 +- .../betonquest/quest/event/cancel/CancelEventFactory.java | 2 +- .../org/betonquest/betonquest/quest/event/chat/ChatEvent.java | 2 +- .../betonquest/quest/event/chat/ChatEventFactory.java | 2 +- .../betonquest/quest/event/chest/AbstractChestEvent.java | 2 +- .../betonquest/quest/event/chest/ChestClearEvent.java | 2 +- .../betonquest/quest/event/chest/ChestClearEventFactory.java | 2 +- .../betonquest/betonquest/quest/event/chest/ChestGiveEvent.java | 2 +- .../betonquest/quest/event/chest/ChestGiveEventFactory.java | 2 +- .../betonquest/betonquest/quest/event/chest/ChestTakeEvent.java | 2 +- .../betonquest/quest/event/chest/ChestTakeEventFactory.java | 2 +- .../betonquest/quest/event/command/BaseCommandEventFactory.java | 2 +- .../betonquest/betonquest/quest/event/command/CommandEvent.java | 2 +- .../betonquest/quest/event/command/CommandEventFactory.java | 2 +- .../betonquest/quest/event/command/OpSudoEventFactory.java | 2 +- .../betonquest/betonquest/quest/event/command/SudoEvent.java | 2 +- .../betonquest/quest/event/command/SudoEventFactory.java | 2 +- .../betonquest/betonquest/quest/event/compass/CompassEvent.java | 2 +- .../betonquest/quest/event/compass/CompassEventFactory.java | 2 +- .../quest/event/conversation/CancelConversationEvent.java | 2 +- .../event/conversation/CancelConversationEventFactory.java | 2 +- .../betonquest/quest/event/conversation/ConversationEvent.java | 2 +- .../quest/event/conversation/ConversationEventFactory.java | 2 +- .../betonquest/betonquest/quest/event/damage/DamageEvent.java | 2 +- .../betonquest/quest/event/damage/DamageEventFactory.java | 2 +- .../org/betonquest/betonquest/quest/event/door/DoorEvent.java | 2 +- .../betonquest/quest/event/door/DoorEventFactory.java | 2 +- .../org/betonquest/betonquest/quest/event/drop/DropEvent.java | 2 +- .../betonquest/quest/event/drop/DropEventFactory.java | 2 +- .../betonquest/quest/event/effect/DeleteEffectEvent.java | 2 +- .../betonquest/quest/event/effect/DeleteEffectEventFactory.java | 2 +- .../betonquest/betonquest/quest/event/effect/EffectEvent.java | 2 +- .../betonquest/quest/event/effect/EffectEventFactory.java | 2 +- .../betonquest/quest/event/entity/RemoveEntityEvent.java | 2 +- .../betonquest/quest/event/entity/RemoveEntityEventFactory.java | 2 +- .../betonquest/quest/event/experience/ExperienceEvent.java | 2 +- .../quest/event/experience/ExperienceEventFactory.java | 2 +- .../betonquest/quest/event/explosion/ExplosionEvent.java | 2 +- .../betonquest/quest/event/explosion/ExplosionEventFactory.java | 2 +- .../betonquest/betonquest/quest/event/folder/FolderEvent.java | 2 +- .../betonquest/quest/event/folder/FolderEventFactory.java | 2 +- .../org/betonquest/betonquest/quest/event/give/GiveEvent.java | 2 +- .../betonquest/quest/event/give/GiveEventFactory.java | 2 +- .../betonquest/betonquest/quest/event/hunger/HungerEvent.java | 2 +- .../betonquest/quest/event/hunger/HungerEventFactory.java | 2 +- .../betonquest/quest/event/item/ItemDurabilityEvent.java | 2 +- .../betonquest/quest/event/item/ItemDurabilityEventFactory.java | 2 +- .../betonquest/quest/event/journal/GiveJournalEvent.java | 2 +- .../betonquest/quest/event/journal/GiveJournalEventFactory.java | 2 +- .../betonquest/quest/event/journal/JournalEventFactory.java | 2 +- .../org/betonquest/betonquest/quest/event/kill/KillEvent.java | 2 +- .../betonquest/quest/event/kill/KillEventFactory.java | 2 +- .../betonquest/quest/event/language/LanguageEvent.java | 2 +- .../betonquest/quest/event/language/LanguageEventFactory.java | 2 +- .../org/betonquest/betonquest/quest/event/lever/LeverEvent.java | 2 +- .../betonquest/quest/event/lever/LeverEventFactory.java | 2 +- .../betonquest/quest/event/lightning/LightningEvent.java | 2 +- .../betonquest/quest/event/lightning/LightningEventFactory.java | 2 +- .../org/betonquest/betonquest/quest/event/log/LogEvent.java | 2 +- .../betonquest/betonquest/quest/event/log/LogEventFactory.java | 2 +- .../org/betonquest/betonquest/quest/event/logic/FirstEvent.java | 2 +- .../betonquest/quest/event/logic/FirstEventFactory.java | 2 +- .../betonquest/betonquest/quest/event/logic/IfElseEvent.java | 2 +- .../betonquest/quest/event/logic/IfElseEventFactory.java | 2 +- .../betonquest/quest/event/notify/NotifyAllEventFactory.java | 2 +- .../betonquest/betonquest/quest/event/notify/NotifyEvent.java | 2 +- .../betonquest/quest/event/notify/NotifyEventFactory.java | 2 +- .../betonquest/quest/event/objective/ObjectiveEvent.java | 2 +- .../betonquest/quest/event/objective/ObjectiveEventFactory.java | 2 +- .../org/betonquest/betonquest/quest/event/party/PartyEvent.java | 2 +- .../betonquest/quest/event/party/PartyEventFactory.java | 2 +- .../betonquest/quest/event/point/DeleteGlobalPointEvent.java | 2 +- .../quest/event/point/DeleteGlobalPointEventFactory.java | 2 +- .../betonquest/quest/event/point/DeletePointEvent.java | 2 +- .../betonquest/quest/event/point/DeletePointEventFactory.java | 2 +- .../betonquest/quest/event/point/GlobalPointEvent.java | 2 +- .../betonquest/quest/event/point/GlobalPointEventFactory.java | 2 +- .../org/betonquest/betonquest/quest/event/point/PointEvent.java | 2 +- .../betonquest/quest/event/point/PointEventFactory.java | 2 +- .../betonquest/quest/event/random/PickRandomEvent.java | 2 +- .../betonquest/quest/event/random/PickRandomEventFactory.java | 2 +- .../betonquest/betonquest/quest/event/random/RandomEvent.java | 2 +- .../org/betonquest/betonquest/quest/event/run/RunEvent.java | 2 +- .../betonquest/betonquest/quest/event/run/RunEventFactory.java | 2 +- .../betonquest/betonquest/quest/event/run/RunForAllEvent.java | 2 +- .../betonquest/quest/event/run/RunForAllEventFactory.java | 2 +- .../betonquest/quest/event/run/RunIndependentEvent.java | 2 +- .../betonquest/quest/event/run/RunIndependentEventFactory.java | 2 +- .../quest/event/scoreboard/ScoreboardObjectiveEvent.java | 2 +- .../quest/event/scoreboard/ScoreboardObjectiveEventFactory.java | 2 +- .../betonquest/quest/event/scoreboard/ScoreboardTagEvent.java | 2 +- .../quest/event/scoreboard/ScoreboardTagEventFactory.java | 2 +- .../betonquest/quest/event/setblock/SetBlockEvent.java | 2 +- .../betonquest/quest/event/setblock/SetBlockEventFactory.java | 2 +- .../org/betonquest/betonquest/quest/event/spawn/Equipment.java | 2 +- .../betonquest/betonquest/quest/event/spawn/SpawnMobEvent.java | 2 +- .../betonquest/quest/event/spawn/SpawnMobEventFactory.java | 2 +- .../org/betonquest/betonquest/quest/event/stage/StageEvent.java | 2 +- .../betonquest/quest/event/stage/StageEventFactory.java | 2 +- .../betonquest/quest/event/tag/TagGlobalEventFactory.java | 2 +- .../betonquest/quest/event/tag/TagPlayerEventFactory.java | 2 +- .../betonquest/quest/event/take/AbstractTakeEventFactory.java | 2 +- .../org/betonquest/betonquest/quest/event/take/TakeEvent.java | 2 +- .../betonquest/quest/event/take/TakeEventFactory.java | 2 +- .../betonquest/quest/event/teleport/TeleportEvent.java | 2 +- .../betonquest/quest/event/teleport/TeleportEventFactory.java | 2 +- .../org/betonquest/betonquest/quest/event/time/TimeEvent.java | 2 +- .../betonquest/quest/event/time/TimeEventFactory.java | 2 +- .../betonquest/quest/event/variable/VariableEvent.java | 2 +- .../betonquest/quest/event/variable/VariableEventFactory.java | 2 +- .../betonquest/quest/event/velocity/VelocityEvent.java | 2 +- .../betonquest/quest/event/velocity/VelocityEventFactory.java | 2 +- .../org/betonquest/betonquest/quest/event/weather/Weather.java | 2 +- .../betonquest/betonquest/quest/event/weather/WeatherEvent.java | 2 +- .../betonquest/quest/event/weather/WeatherEventFactory.java | 2 +- .../betonquest/quest/legacy/FromClassLegacyTypeFactory.java | 2 +- .../betonquest/quest/legacy/LegacyConditionAdapter.java | 2 +- .../betonquest/quest/legacy/LegacyFactoryAdapter.java | 2 +- .../betonquest/betonquest/quest/legacy/LegacyTypeFactory.java | 2 +- .../betonquest/quest/legacy/LegacyVariableAdapter.java | 2 +- .../betonquest/betonquest/quest/legacy/QuestEventAdapter.java | 2 +- .../betonquest/quest/legacy/QuestEventFactoryAdapter.java | 2 +- .../betonquest/quest/registry/processor/CancellerProcessor.java | 2 +- .../betonquest/quest/registry/processor/ConditionProcessor.java | 2 +- .../quest/registry/processor/ConversationProcessor.java | 2 +- .../betonquest/quest/registry/processor/EventProcessor.java | 2 +- .../betonquest/quest/registry/processor/ObjectiveProcessor.java | 2 +- .../quest/registry/processor/TypedQuestProcessor.java | 2 +- .../betonquest/quest/registry/processor/VariableProcessor.java | 2 +- .../quest/variable/condition/ConditionVariableFactory.java | 2 +- .../betonquest/betonquest/quest/variable/eval/EvalVariable.java | 2 +- .../betonquest/quest/variable/eval/EvalVariableFactory.java | 2 +- .../betonquest/quest/variable/item/ItemDurabilityVariable.java | 2 +- .../quest/variable/item/ItemDurabilityVariableFactory.java | 2 +- .../betonquest/betonquest/quest/variable/item/ItemVariable.java | 2 +- .../betonquest/quest/variable/item/ItemVariableFactory.java | 2 +- .../quest/variable/location/LocationFormationMode.java | 2 +- .../betonquest/quest/variable/location/LocationVariable.java | 2 +- .../quest/variable/location/LocationVariableFactory.java | 2 +- .../betonquest/quest/variable/name/PlayerNameType.java | 2 +- .../betonquest/quest/variable/name/PlayerNameVariable.java | 2 +- .../quest/variable/name/PlayerNameVariableFactory.java | 2 +- .../quest/variable/point/AbstractPointVariableFactory.java | 2 +- .../quest/variable/point/GlobalPointVariableFactory.java | 2 +- .../betonquest/quest/variable/point/PointVariableFactory.java | 2 +- .../betonquest/quest/variable/tag/GlobalTagVariable.java | 2 +- .../betonquest/quest/variable/tag/GlobalTagVariableFactory.java | 2 +- .../betonquest/betonquest/quest/variable/tag/TagVariable.java | 2 +- .../betonquest/quest/variable/tag/TagVariableFactory.java | 2 +- .../org/betonquest/betonquest/schedule/EventScheduling.java | 2 +- .../schedule/impl/realtime/cron/RealtimeCronSchedule.java | 2 +- .../schedule/impl/realtime/daily/RealtimeDailySchedule.java | 2 +- src/main/java/org/betonquest/betonquest/util/BlockSelector.java | 2 +- src/main/java/org/betonquest/betonquest/util/Utils.java | 2 +- .../betonquest/betonquest/util/location/CompoundLocation.java | 2 +- src/main/java/org/betonquest/betonquest/util/math/Operator.java | 2 +- .../java/org/betonquest/betonquest/util/math/Tokenizer.java | 2 +- .../betonquest/betonquest/util/math/tokens/AbsoluteValue.java | 2 +- .../org/betonquest/betonquest/util/math/tokens/Negation.java | 2 +- .../org/betonquest/betonquest/util/math/tokens/Operation.java | 2 +- .../org/betonquest/betonquest/util/math/tokens/Parenthesis.java | 2 +- .../java/org/betonquest/betonquest/util/math/tokens/Token.java | 2 +- .../org/betonquest/betonquest/util/math/tokens/Variable.java | 2 +- .../java/org/betonquest/betonquest/variables/MathVariable.java | 2 +- .../betonquest/variables/ObjectivePropertyVariable.java | 2 +- .../betonquest/betonquest/variables/RandomNumberVariable.java | 2 +- .../org/betonquest/betonquest/variables/VersionVariable.java | 2 +- .../org/betonquest/betonquest/web/updater/UpdateDownloader.java | 2 +- .../java/org/betonquest/betonquest/web/updater/Updater.java | 2 +- .../betonquest/api/schedule/AbstractScheduleTest.java | 2 +- .../betonquest/api/schedule/CronRebootScheduleTest.java | 2 +- .../betonquest/api/schedule/CronScheduleBaseTest.java | 2 +- .../betonquest/betonquest/api/schedule/ScheduleBaseTest.java | 2 +- .../betonquest/instruction/VariableInstructionTest.java | 2 +- .../betonquest/quest/event/DatabaseSaverStaticEventTest.java | 2 +- .../betonquest/quest/event/IngameNotificationSenderTest.java | 2 +- .../quest/event/OnlineProfileGroupStaticEventAdapterTest.java | 2 +- .../betonquest/quest/event/SequentialStaticEventTest.java | 2 +- .../quest/event/journal/JournalEventFactoryIntegrationTest.java | 2 +- .../quest/event/tag/TagGlobalEventFactoryIntegrationTest.java | 2 +- .../quest/event/tag/TagPlayerEventFactoryIntegrationTest.java | 2 +- .../org/betonquest/betonquest/schedule/EventSchedulingTest.java | 2 +- .../org/betonquest/betonquest/schedule/ScheduleTypeTest.java | 2 +- .../schedule/impl/realtime/cron/RealtimeCronScheduleTest.java | 2 +- .../schedule/impl/realtime/daily/RealtimeDailyScheduleTest.java | 2 +- .../java/org/betonquest/betonquest/util/math/TokenizerTest.java | 2 +- .../betonquest/betonquest/web/updater/UpdateDownloaderTest.java | 2 +- .../java/org/betonquest/betonquest/web/updater/UpdaterTest.java | 2 +- 569 files changed, 567 insertions(+), 569 deletions(-) rename src/main/java/org/betonquest/betonquest/{exception => api/quest}/QuestException.java (95%) diff --git a/src/main/java/org/betonquest/betonquest/Backpack.java b/src/main/java/org/betonquest/betonquest/Backpack.java index 8e0959e1a6..5dcdb14e07 100644 --- a/src/main/java/org/betonquest/betonquest/Backpack.java +++ b/src/main/java/org/betonquest/betonquest/Backpack.java @@ -5,11 +5,11 @@ import org.betonquest.betonquest.api.config.quest.QuestPackage; import org.betonquest.betonquest.api.logger.BetonQuestLogger; import org.betonquest.betonquest.api.profile.OnlineProfile; +import org.betonquest.betonquest.api.quest.QuestException; import org.betonquest.betonquest.config.Config; import org.betonquest.betonquest.config.QuestCanceler; import org.betonquest.betonquest.database.PlayerData; import org.betonquest.betonquest.exception.ObjectNotFoundException; -import org.betonquest.betonquest.exception.QuestException; import org.betonquest.betonquest.id.ItemID; import org.betonquest.betonquest.instruction.variable.location.VariableLocation; import org.betonquest.betonquest.item.QuestItem; diff --git a/src/main/java/org/betonquest/betonquest/BetonQuest.java b/src/main/java/org/betonquest/betonquest/BetonQuest.java index ddd1c60296..535173c545 100644 --- a/src/main/java/org/betonquest/betonquest/BetonQuest.java +++ b/src/main/java/org/betonquest/betonquest/BetonQuest.java @@ -20,6 +20,7 @@ import org.betonquest.betonquest.api.profile.Profile; import org.betonquest.betonquest.api.quest.PlayerQuestFactory; import org.betonquest.betonquest.api.quest.PlayerlessQuestFactory; +import org.betonquest.betonquest.api.quest.QuestException; import org.betonquest.betonquest.api.quest.event.EventFactory; import org.betonquest.betonquest.api.quest.event.StaticEventFactory; import org.betonquest.betonquest.api.schedule.Schedule; @@ -59,7 +60,6 @@ import org.betonquest.betonquest.database.MySQL; import org.betonquest.betonquest.database.SQLite; import org.betonquest.betonquest.database.Saver; -import org.betonquest.betonquest.exception.QuestException; import org.betonquest.betonquest.id.ConditionID; import org.betonquest.betonquest.id.ConversationID; import org.betonquest.betonquest.id.EventID; diff --git a/src/main/java/org/betonquest/betonquest/CustomDropListener.java b/src/main/java/org/betonquest/betonquest/CustomDropListener.java index 90a7cba012..803a3fa235 100644 --- a/src/main/java/org/betonquest/betonquest/CustomDropListener.java +++ b/src/main/java/org/betonquest/betonquest/CustomDropListener.java @@ -1,8 +1,8 @@ package org.betonquest.betonquest; import org.betonquest.betonquest.api.logger.BetonQuestLogger; +import org.betonquest.betonquest.api.quest.QuestException; import org.betonquest.betonquest.exception.ObjectNotFoundException; -import org.betonquest.betonquest.exception.QuestException; import org.betonquest.betonquest.id.ItemID; import org.betonquest.betonquest.item.QuestItem; import org.bukkit.NamespacedKey; diff --git a/src/main/java/org/betonquest/betonquest/Journal.java b/src/main/java/org/betonquest/betonquest/Journal.java index 20e59d08f1..9bd66776d2 100644 --- a/src/main/java/org/betonquest/betonquest/Journal.java +++ b/src/main/java/org/betonquest/betonquest/Journal.java @@ -9,11 +9,11 @@ import org.betonquest.betonquest.api.logger.BetonQuestLogger; import org.betonquest.betonquest.api.profile.OnlineProfile; import org.betonquest.betonquest.api.profile.Profile; +import org.betonquest.betonquest.api.quest.QuestException; import org.betonquest.betonquest.config.Config; import org.betonquest.betonquest.database.Saver.Record; import org.betonquest.betonquest.database.UpdateType; import org.betonquest.betonquest.exception.ObjectNotFoundException; -import org.betonquest.betonquest.exception.QuestException; import org.betonquest.betonquest.id.ConditionID; import org.betonquest.betonquest.instruction.variable.VariableString; import org.betonquest.betonquest.util.Utils; diff --git a/src/main/java/org/betonquest/betonquest/api/Condition.java b/src/main/java/org/betonquest/betonquest/api/Condition.java index f1e6e1728c..3da641c7e2 100644 --- a/src/main/java/org/betonquest/betonquest/api/Condition.java +++ b/src/main/java/org/betonquest/betonquest/api/Condition.java @@ -2,7 +2,7 @@ import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; import org.betonquest.betonquest.api.profile.Profile; -import org.betonquest.betonquest.exception.QuestException; +import org.betonquest.betonquest.api.quest.QuestException; import org.betonquest.betonquest.id.ID; import org.betonquest.betonquest.instruction.Instruction; diff --git a/src/main/java/org/betonquest/betonquest/api/CountingObjective.java b/src/main/java/org/betonquest/betonquest/api/CountingObjective.java index 000245b618..04327af797 100644 --- a/src/main/java/org/betonquest/betonquest/api/CountingObjective.java +++ b/src/main/java/org/betonquest/betonquest/api/CountingObjective.java @@ -3,7 +3,7 @@ import org.betonquest.betonquest.BetonQuest; import org.betonquest.betonquest.api.logger.BetonQuestLogger; import org.betonquest.betonquest.api.profile.Profile; -import org.betonquest.betonquest.exception.QuestException; +import org.betonquest.betonquest.api.quest.QuestException; import org.betonquest.betonquest.instruction.Instruction; import org.betonquest.betonquest.instruction.variable.VariableNumber; import org.jetbrains.annotations.Nullable; diff --git a/src/main/java/org/betonquest/betonquest/api/ForceSyncHandler.java b/src/main/java/org/betonquest/betonquest/api/ForceSyncHandler.java index c4643a4ca8..deae06ccf9 100644 --- a/src/main/java/org/betonquest/betonquest/api/ForceSyncHandler.java +++ b/src/main/java/org/betonquest/betonquest/api/ForceSyncHandler.java @@ -2,7 +2,7 @@ import org.betonquest.betonquest.BetonQuest; import org.betonquest.betonquest.api.profile.Profile; -import org.betonquest.betonquest.exception.QuestException; +import org.betonquest.betonquest.api.quest.QuestException; import org.bukkit.Bukkit; import org.bukkit.plugin.Plugin; import org.jetbrains.annotations.Nullable; diff --git a/src/main/java/org/betonquest/betonquest/api/Objective.java b/src/main/java/org/betonquest/betonquest/api/Objective.java index 6d35ab55ef..c73e02b98f 100644 --- a/src/main/java/org/betonquest/betonquest/api/Objective.java +++ b/src/main/java/org/betonquest/betonquest/api/Objective.java @@ -7,12 +7,12 @@ import org.betonquest.betonquest.api.logger.BetonQuestLogger; import org.betonquest.betonquest.api.profile.OnlineProfile; import org.betonquest.betonquest.api.profile.Profile; +import org.betonquest.betonquest.api.quest.QuestException; import org.betonquest.betonquest.config.Config; import org.betonquest.betonquest.database.PlayerData; import org.betonquest.betonquest.database.Saver; import org.betonquest.betonquest.database.UpdateType; import org.betonquest.betonquest.exception.ObjectNotFoundException; -import org.betonquest.betonquest.exception.QuestException; import org.betonquest.betonquest.id.ConditionID; import org.betonquest.betonquest.id.EventID; import org.betonquest.betonquest.id.ObjectiveID; diff --git a/src/main/java/org/betonquest/betonquest/api/QuestEvent.java b/src/main/java/org/betonquest/betonquest/api/QuestEvent.java index 1c639aa197..e796b521de 100644 --- a/src/main/java/org/betonquest/betonquest/api/QuestEvent.java +++ b/src/main/java/org/betonquest/betonquest/api/QuestEvent.java @@ -3,10 +3,10 @@ import org.betonquest.betonquest.BetonQuest; import org.betonquest.betonquest.api.logger.BetonQuestLogger; import org.betonquest.betonquest.api.profile.Profile; +import org.betonquest.betonquest.api.quest.QuestException; import org.betonquest.betonquest.api.quest.event.EventFactory; import org.betonquest.betonquest.api.quest.event.StaticEventFactory; import org.betonquest.betonquest.exception.ObjectNotFoundException; -import org.betonquest.betonquest.exception.QuestException; import org.betonquest.betonquest.id.ConditionID; import org.betonquest.betonquest.instruction.Instruction; import org.jetbrains.annotations.Nullable; diff --git a/src/main/java/org/betonquest/betonquest/api/Variable.java b/src/main/java/org/betonquest/betonquest/api/Variable.java index de1b6aebec..7e16c5f52a 100644 --- a/src/main/java/org/betonquest/betonquest/api/Variable.java +++ b/src/main/java/org/betonquest/betonquest/api/Variable.java @@ -1,7 +1,7 @@ package org.betonquest.betonquest.api; import org.betonquest.betonquest.api.profile.Profile; -import org.betonquest.betonquest.exception.QuestException; +import org.betonquest.betonquest.api.quest.QuestException; import org.betonquest.betonquest.instruction.Instruction; import org.jetbrains.annotations.Nullable; diff --git a/src/main/java/org/betonquest/betonquest/api/common/function/QuestCallable.java b/src/main/java/org/betonquest/betonquest/api/common/function/QuestCallable.java index ca11f0fc08..dd338f5646 100644 --- a/src/main/java/org/betonquest/betonquest/api/common/function/QuestCallable.java +++ b/src/main/java/org/betonquest/betonquest/api/common/function/QuestCallable.java @@ -1,6 +1,6 @@ package org.betonquest.betonquest.api.common.function; -import org.betonquest.betonquest.exception.QuestException; +import org.betonquest.betonquest.api.quest.QuestException; /** * A {@link java.util.concurrent.Callable} that may throw a {@link QuestException}. diff --git a/src/main/java/org/betonquest/betonquest/api/common/function/QuestConsumer.java b/src/main/java/org/betonquest/betonquest/api/common/function/QuestConsumer.java index 0fc6c9e5df..a8c5c4e7c5 100644 --- a/src/main/java/org/betonquest/betonquest/api/common/function/QuestConsumer.java +++ b/src/main/java/org/betonquest/betonquest/api/common/function/QuestConsumer.java @@ -1,6 +1,6 @@ package org.betonquest.betonquest.api.common.function; -import org.betonquest.betonquest.exception.QuestException; +import org.betonquest.betonquest.api.quest.QuestException; /** * A simple {@link org.bukkit.util.Consumer} that can throw a {@link QuestException}. diff --git a/src/main/java/org/betonquest/betonquest/api/common/function/QuestFunction.java b/src/main/java/org/betonquest/betonquest/api/common/function/QuestFunction.java index 7aa721384d..f65f0bd230 100644 --- a/src/main/java/org/betonquest/betonquest/api/common/function/QuestFunction.java +++ b/src/main/java/org/betonquest/betonquest/api/common/function/QuestFunction.java @@ -1,6 +1,6 @@ package org.betonquest.betonquest.api.common.function; -import org.betonquest.betonquest.exception.QuestException; +import org.betonquest.betonquest.api.quest.QuestException; /** * A simple {@link java.util.function.Function} that can throw a {@link QuestException}. diff --git a/src/main/java/org/betonquest/betonquest/api/common/function/Selector.java b/src/main/java/org/betonquest/betonquest/api/common/function/Selector.java index 6c510385ec..1bf354a93a 100644 --- a/src/main/java/org/betonquest/betonquest/api/common/function/Selector.java +++ b/src/main/java/org/betonquest/betonquest/api/common/function/Selector.java @@ -1,7 +1,7 @@ package org.betonquest.betonquest.api.common.function; import org.betonquest.betonquest.api.profile.Profile; -import org.betonquest.betonquest.exception.QuestException; +import org.betonquest.betonquest.api.quest.QuestException; import org.jetbrains.annotations.Nullable; /** diff --git a/src/main/java/org/betonquest/betonquest/api/common/function/Selectors.java b/src/main/java/org/betonquest/betonquest/api/common/function/Selectors.java index 13cb14228e..85edc5a85f 100644 --- a/src/main/java/org/betonquest/betonquest/api/common/function/Selectors.java +++ b/src/main/java/org/betonquest/betonquest/api/common/function/Selectors.java @@ -1,7 +1,7 @@ package org.betonquest.betonquest.api.common.function; import org.betonquest.betonquest.api.profile.OnlineProfile; -import org.betonquest.betonquest.exception.QuestException; +import org.betonquest.betonquest.api.quest.QuestException; import org.bukkit.OfflinePlayer; import org.bukkit.entity.Player; diff --git a/src/main/java/org/betonquest/betonquest/api/quest/PlayerQuestFactory.java b/src/main/java/org/betonquest/betonquest/api/quest/PlayerQuestFactory.java index 737a04c90e..3123f5ab62 100644 --- a/src/main/java/org/betonquest/betonquest/api/quest/PlayerQuestFactory.java +++ b/src/main/java/org/betonquest/betonquest/api/quest/PlayerQuestFactory.java @@ -1,6 +1,5 @@ package org.betonquest.betonquest.api.quest; -import org.betonquest.betonquest.exception.QuestException; import org.betonquest.betonquest.instruction.Instruction; /** diff --git a/src/main/java/org/betonquest/betonquest/api/quest/PlayerlessQuestFactory.java b/src/main/java/org/betonquest/betonquest/api/quest/PlayerlessQuestFactory.java index 28a65e7cc1..ddfcd06d0c 100644 --- a/src/main/java/org/betonquest/betonquest/api/quest/PlayerlessQuestFactory.java +++ b/src/main/java/org/betonquest/betonquest/api/quest/PlayerlessQuestFactory.java @@ -1,6 +1,5 @@ package org.betonquest.betonquest.api.quest; -import org.betonquest.betonquest.exception.QuestException; import org.betonquest.betonquest.instruction.Instruction; /** diff --git a/src/main/java/org/betonquest/betonquest/exception/QuestException.java b/src/main/java/org/betonquest/betonquest/api/quest/QuestException.java similarity index 95% rename from src/main/java/org/betonquest/betonquest/exception/QuestException.java rename to src/main/java/org/betonquest/betonquest/api/quest/QuestException.java index bf39c898d7..f235c2881e 100644 --- a/src/main/java/org/betonquest/betonquest/exception/QuestException.java +++ b/src/main/java/org/betonquest/betonquest/api/quest/QuestException.java @@ -1,4 +1,4 @@ -package org.betonquest.betonquest.exception; +package org.betonquest.betonquest.api.quest; import org.jetbrains.annotations.Nullable; diff --git a/src/main/java/org/betonquest/betonquest/api/quest/condition/PlayerCondition.java b/src/main/java/org/betonquest/betonquest/api/quest/condition/PlayerCondition.java index 5e70fc9a85..f9983cb85b 100644 --- a/src/main/java/org/betonquest/betonquest/api/quest/condition/PlayerCondition.java +++ b/src/main/java/org/betonquest/betonquest/api/quest/condition/PlayerCondition.java @@ -1,7 +1,7 @@ package org.betonquest.betonquest.api.quest.condition; import org.betonquest.betonquest.api.profile.Profile; -import org.betonquest.betonquest.exception.QuestException; +import org.betonquest.betonquest.api.quest.QuestException; /** * Interface for quest-conditions that are checked for a profile. It represents the normal condition as described in the diff --git a/src/main/java/org/betonquest/betonquest/api/quest/condition/PlayerConditionFactory.java b/src/main/java/org/betonquest/betonquest/api/quest/condition/PlayerConditionFactory.java index 9e8ac5b8ce..65504a0d93 100644 --- a/src/main/java/org/betonquest/betonquest/api/quest/condition/PlayerConditionFactory.java +++ b/src/main/java/org/betonquest/betonquest/api/quest/condition/PlayerConditionFactory.java @@ -1,7 +1,7 @@ package org.betonquest.betonquest.api.quest.condition; import org.betonquest.betonquest.api.quest.PlayerQuestFactory; -import org.betonquest.betonquest.exception.QuestException; +import org.betonquest.betonquest.api.quest.QuestException; import org.betonquest.betonquest.instruction.Instruction; /** diff --git a/src/main/java/org/betonquest/betonquest/api/quest/condition/PlayerlessCondition.java b/src/main/java/org/betonquest/betonquest/api/quest/condition/PlayerlessCondition.java index 07e9946407..450453f8f5 100644 --- a/src/main/java/org/betonquest/betonquest/api/quest/condition/PlayerlessCondition.java +++ b/src/main/java/org/betonquest/betonquest/api/quest/condition/PlayerlessCondition.java @@ -1,6 +1,6 @@ package org.betonquest.betonquest.api.quest.condition; -import org.betonquest.betonquest.exception.QuestException; +import org.betonquest.betonquest.api.quest.QuestException; /** * Interface for playerless quest-conditions. diff --git a/src/main/java/org/betonquest/betonquest/api/quest/condition/PlayerlessConditionFactory.java b/src/main/java/org/betonquest/betonquest/api/quest/condition/PlayerlessConditionFactory.java index 2c4bf796cf..0f4b89bb92 100644 --- a/src/main/java/org/betonquest/betonquest/api/quest/condition/PlayerlessConditionFactory.java +++ b/src/main/java/org/betonquest/betonquest/api/quest/condition/PlayerlessConditionFactory.java @@ -1,7 +1,7 @@ package org.betonquest.betonquest.api.quest.condition; import org.betonquest.betonquest.api.quest.PlayerlessQuestFactory; -import org.betonquest.betonquest.exception.QuestException; +import org.betonquest.betonquest.api.quest.QuestException; import org.betonquest.betonquest.instruction.Instruction; /** diff --git a/src/main/java/org/betonquest/betonquest/api/quest/condition/nullable/NullableCondition.java b/src/main/java/org/betonquest/betonquest/api/quest/condition/nullable/NullableCondition.java index 8cb0cd85e5..ee740e06c5 100644 --- a/src/main/java/org/betonquest/betonquest/api/quest/condition/nullable/NullableCondition.java +++ b/src/main/java/org/betonquest/betonquest/api/quest/condition/nullable/NullableCondition.java @@ -1,7 +1,7 @@ package org.betonquest.betonquest.api.quest.condition.nullable; import org.betonquest.betonquest.api.profile.Profile; -import org.betonquest.betonquest.exception.QuestException; +import org.betonquest.betonquest.api.quest.QuestException; import org.jetbrains.annotations.Nullable; /** diff --git a/src/main/java/org/betonquest/betonquest/api/quest/condition/nullable/NullableConditionAdapter.java b/src/main/java/org/betonquest/betonquest/api/quest/condition/nullable/NullableConditionAdapter.java index 393dfb6b0f..7659f6d009 100644 --- a/src/main/java/org/betonquest/betonquest/api/quest/condition/nullable/NullableConditionAdapter.java +++ b/src/main/java/org/betonquest/betonquest/api/quest/condition/nullable/NullableConditionAdapter.java @@ -1,9 +1,9 @@ package org.betonquest.betonquest.api.quest.condition.nullable; import org.betonquest.betonquest.api.profile.Profile; +import org.betonquest.betonquest.api.quest.QuestException; import org.betonquest.betonquest.api.quest.condition.PlayerCondition; import org.betonquest.betonquest.api.quest.condition.PlayerlessCondition; -import org.betonquest.betonquest.exception.QuestException; /** * An adapter to handle both the {@link PlayerCondition} and {@link PlayerlessCondition} diff --git a/src/main/java/org/betonquest/betonquest/api/quest/condition/online/OnlineCondition.java b/src/main/java/org/betonquest/betonquest/api/quest/condition/online/OnlineCondition.java index 4d08f405d2..598ee6d107 100644 --- a/src/main/java/org/betonquest/betonquest/api/quest/condition/online/OnlineCondition.java +++ b/src/main/java/org/betonquest/betonquest/api/quest/condition/online/OnlineCondition.java @@ -1,7 +1,7 @@ package org.betonquest.betonquest.api.quest.condition.online; import org.betonquest.betonquest.api.profile.OnlineProfile; -import org.betonquest.betonquest.exception.QuestException; +import org.betonquest.betonquest.api.quest.QuestException; /** * Quest condition that needs an online profile to function correctly. diff --git a/src/main/java/org/betonquest/betonquest/api/quest/condition/online/OnlineConditionAdapter.java b/src/main/java/org/betonquest/betonquest/api/quest/condition/online/OnlineConditionAdapter.java index 997ddcf30a..2fe24327eb 100644 --- a/src/main/java/org/betonquest/betonquest/api/quest/condition/online/OnlineConditionAdapter.java +++ b/src/main/java/org/betonquest/betonquest/api/quest/condition/online/OnlineConditionAdapter.java @@ -4,8 +4,8 @@ import org.betonquest.betonquest.api.logger.BetonQuestLogger; import org.betonquest.betonquest.api.profile.OnlineProfile; import org.betonquest.betonquest.api.profile.Profile; +import org.betonquest.betonquest.api.quest.QuestException; import org.betonquest.betonquest.api.quest.condition.PlayerCondition; -import org.betonquest.betonquest.exception.QuestException; import java.util.Optional; diff --git a/src/main/java/org/betonquest/betonquest/api/quest/event/Event.java b/src/main/java/org/betonquest/betonquest/api/quest/event/Event.java index b2daf1963f..f792597c03 100644 --- a/src/main/java/org/betonquest/betonquest/api/quest/event/Event.java +++ b/src/main/java/org/betonquest/betonquest/api/quest/event/Event.java @@ -1,7 +1,7 @@ package org.betonquest.betonquest.api.quest.event; import org.betonquest.betonquest.api.profile.Profile; -import org.betonquest.betonquest.exception.QuestException; +import org.betonquest.betonquest.api.quest.QuestException; /** * Interface for quest-events that are executed for a profile. It represents the normal event as described in the diff --git a/src/main/java/org/betonquest/betonquest/api/quest/event/EventFactory.java b/src/main/java/org/betonquest/betonquest/api/quest/event/EventFactory.java index b48eb63e9f..3ac07671ed 100644 --- a/src/main/java/org/betonquest/betonquest/api/quest/event/EventFactory.java +++ b/src/main/java/org/betonquest/betonquest/api/quest/event/EventFactory.java @@ -1,7 +1,7 @@ package org.betonquest.betonquest.api.quest.event; import org.betonquest.betonquest.api.quest.PlayerQuestFactory; -import org.betonquest.betonquest.exception.QuestException; +import org.betonquest.betonquest.api.quest.QuestException; import org.betonquest.betonquest.instruction.Instruction; /** diff --git a/src/main/java/org/betonquest/betonquest/api/quest/event/StaticEvent.java b/src/main/java/org/betonquest/betonquest/api/quest/event/StaticEvent.java index 6ba4b39999..8a0b856e8b 100644 --- a/src/main/java/org/betonquest/betonquest/api/quest/event/StaticEvent.java +++ b/src/main/java/org/betonquest/betonquest/api/quest/event/StaticEvent.java @@ -1,6 +1,6 @@ package org.betonquest.betonquest.api.quest.event; -import org.betonquest.betonquest.exception.QuestException; +import org.betonquest.betonquest.api.quest.QuestException; /** * Interface for "static" quest-events. diff --git a/src/main/java/org/betonquest/betonquest/api/quest/event/StaticEventFactory.java b/src/main/java/org/betonquest/betonquest/api/quest/event/StaticEventFactory.java index ef9a4bfa75..9967f93057 100644 --- a/src/main/java/org/betonquest/betonquest/api/quest/event/StaticEventFactory.java +++ b/src/main/java/org/betonquest/betonquest/api/quest/event/StaticEventFactory.java @@ -1,7 +1,7 @@ package org.betonquest.betonquest.api.quest.event; import org.betonquest.betonquest.api.quest.PlayerlessQuestFactory; -import org.betonquest.betonquest.exception.QuestException; +import org.betonquest.betonquest.api.quest.QuestException; import org.betonquest.betonquest.instruction.Instruction; /** diff --git a/src/main/java/org/betonquest/betonquest/api/quest/event/nullable/NullableEvent.java b/src/main/java/org/betonquest/betonquest/api/quest/event/nullable/NullableEvent.java index 68e6586da1..38ff241ad6 100644 --- a/src/main/java/org/betonquest/betonquest/api/quest/event/nullable/NullableEvent.java +++ b/src/main/java/org/betonquest/betonquest/api/quest/event/nullable/NullableEvent.java @@ -1,7 +1,7 @@ package org.betonquest.betonquest.api.quest.event.nullable; import org.betonquest.betonquest.api.profile.Profile; -import org.betonquest.betonquest.exception.QuestException; +import org.betonquest.betonquest.api.quest.QuestException; import org.jetbrains.annotations.Nullable; /** diff --git a/src/main/java/org/betonquest/betonquest/api/quest/event/nullable/NullableEventAdapter.java b/src/main/java/org/betonquest/betonquest/api/quest/event/nullable/NullableEventAdapter.java index 30d07d621b..bdd8420d05 100644 --- a/src/main/java/org/betonquest/betonquest/api/quest/event/nullable/NullableEventAdapter.java +++ b/src/main/java/org/betonquest/betonquest/api/quest/event/nullable/NullableEventAdapter.java @@ -1,9 +1,9 @@ package org.betonquest.betonquest.api.quest.event.nullable; import org.betonquest.betonquest.api.profile.Profile; +import org.betonquest.betonquest.api.quest.QuestException; import org.betonquest.betonquest.api.quest.event.Event; import org.betonquest.betonquest.api.quest.event.StaticEvent; -import org.betonquest.betonquest.exception.QuestException; /** * An adapter to handle both the {@link Event} and {@link StaticEvent} with one diff --git a/src/main/java/org/betonquest/betonquest/api/quest/event/online/OnlineEvent.java b/src/main/java/org/betonquest/betonquest/api/quest/event/online/OnlineEvent.java index b04868cc17..7bdb75ac77 100644 --- a/src/main/java/org/betonquest/betonquest/api/quest/event/online/OnlineEvent.java +++ b/src/main/java/org/betonquest/betonquest/api/quest/event/online/OnlineEvent.java @@ -1,7 +1,7 @@ package org.betonquest.betonquest.api.quest.event.online; import org.betonquest.betonquest.api.profile.OnlineProfile; -import org.betonquest.betonquest.exception.QuestException; +import org.betonquest.betonquest.api.quest.QuestException; /** * Quest event that needs an online profile to function correctly. diff --git a/src/main/java/org/betonquest/betonquest/api/quest/event/online/OnlineEventAdapter.java b/src/main/java/org/betonquest/betonquest/api/quest/event/online/OnlineEventAdapter.java index 8a138ad2ed..b3b5b2a5cf 100644 --- a/src/main/java/org/betonquest/betonquest/api/quest/event/online/OnlineEventAdapter.java +++ b/src/main/java/org/betonquest/betonquest/api/quest/event/online/OnlineEventAdapter.java @@ -4,8 +4,8 @@ import org.betonquest.betonquest.api.logger.BetonQuestLogger; import org.betonquest.betonquest.api.profile.OnlineProfile; import org.betonquest.betonquest.api.profile.Profile; +import org.betonquest.betonquest.api.quest.QuestException; import org.betonquest.betonquest.api.quest.event.Event; -import org.betonquest.betonquest.exception.QuestException; import java.util.Optional; diff --git a/src/main/java/org/betonquest/betonquest/api/quest/variable/PlayerVariable.java b/src/main/java/org/betonquest/betonquest/api/quest/variable/PlayerVariable.java index 0fc2d8e1db..881bbe1df8 100644 --- a/src/main/java/org/betonquest/betonquest/api/quest/variable/PlayerVariable.java +++ b/src/main/java/org/betonquest/betonquest/api/quest/variable/PlayerVariable.java @@ -1,7 +1,7 @@ package org.betonquest.betonquest.api.quest.variable; import org.betonquest.betonquest.api.profile.Profile; -import org.betonquest.betonquest.exception.QuestException; +import org.betonquest.betonquest.api.quest.QuestException; /** * Interface for quest-variables that are checked for a profile. It represents the normal variable as described in the diff --git a/src/main/java/org/betonquest/betonquest/api/quest/variable/PlayerVariableFactory.java b/src/main/java/org/betonquest/betonquest/api/quest/variable/PlayerVariableFactory.java index fab81cd6f9..314828fc30 100644 --- a/src/main/java/org/betonquest/betonquest/api/quest/variable/PlayerVariableFactory.java +++ b/src/main/java/org/betonquest/betonquest/api/quest/variable/PlayerVariableFactory.java @@ -1,7 +1,7 @@ package org.betonquest.betonquest.api.quest.variable; import org.betonquest.betonquest.api.quest.PlayerQuestFactory; -import org.betonquest.betonquest.exception.QuestException; +import org.betonquest.betonquest.api.quest.QuestException; import org.betonquest.betonquest.instruction.Instruction; /** diff --git a/src/main/java/org/betonquest/betonquest/api/quest/variable/PlayerlessVariable.java b/src/main/java/org/betonquest/betonquest/api/quest/variable/PlayerlessVariable.java index c9f8f74ac6..e1324d58a4 100644 --- a/src/main/java/org/betonquest/betonquest/api/quest/variable/PlayerlessVariable.java +++ b/src/main/java/org/betonquest/betonquest/api/quest/variable/PlayerlessVariable.java @@ -1,6 +1,6 @@ package org.betonquest.betonquest.api.quest.variable; -import org.betonquest.betonquest.exception.QuestException; +import org.betonquest.betonquest.api.quest.QuestException; /** * Interface for "static" quest-variables. diff --git a/src/main/java/org/betonquest/betonquest/api/quest/variable/PlayerlessVariableFactory.java b/src/main/java/org/betonquest/betonquest/api/quest/variable/PlayerlessVariableFactory.java index 1690a84b13..cfa21f29c3 100644 --- a/src/main/java/org/betonquest/betonquest/api/quest/variable/PlayerlessVariableFactory.java +++ b/src/main/java/org/betonquest/betonquest/api/quest/variable/PlayerlessVariableFactory.java @@ -1,7 +1,7 @@ package org.betonquest.betonquest.api.quest.variable; import org.betonquest.betonquest.api.quest.PlayerlessQuestFactory; -import org.betonquest.betonquest.exception.QuestException; +import org.betonquest.betonquest.api.quest.QuestException; import org.betonquest.betonquest.instruction.Instruction; /** diff --git a/src/main/java/org/betonquest/betonquest/api/quest/variable/nullable/NullableVariable.java b/src/main/java/org/betonquest/betonquest/api/quest/variable/nullable/NullableVariable.java index d898c659c0..95f28ef5ab 100644 --- a/src/main/java/org/betonquest/betonquest/api/quest/variable/nullable/NullableVariable.java +++ b/src/main/java/org/betonquest/betonquest/api/quest/variable/nullable/NullableVariable.java @@ -1,7 +1,7 @@ package org.betonquest.betonquest.api.quest.variable.nullable; import org.betonquest.betonquest.api.profile.Profile; -import org.betonquest.betonquest.exception.QuestException; +import org.betonquest.betonquest.api.quest.QuestException; import org.jetbrains.annotations.Nullable; /** diff --git a/src/main/java/org/betonquest/betonquest/api/quest/variable/nullable/NullableVariableAdapter.java b/src/main/java/org/betonquest/betonquest/api/quest/variable/nullable/NullableVariableAdapter.java index ed4fd23900..f0da8f8e27 100644 --- a/src/main/java/org/betonquest/betonquest/api/quest/variable/nullable/NullableVariableAdapter.java +++ b/src/main/java/org/betonquest/betonquest/api/quest/variable/nullable/NullableVariableAdapter.java @@ -1,9 +1,9 @@ package org.betonquest.betonquest.api.quest.variable.nullable; import org.betonquest.betonquest.api.profile.Profile; +import org.betonquest.betonquest.api.quest.QuestException; import org.betonquest.betonquest.api.quest.variable.PlayerVariable; import org.betonquest.betonquest.api.quest.variable.PlayerlessVariable; -import org.betonquest.betonquest.exception.QuestException; /** * An adapter to handle both the {@link PlayerVariable} and {@link PlayerlessVariable} diff --git a/src/main/java/org/betonquest/betonquest/api/quest/variable/online/OnlineVariable.java b/src/main/java/org/betonquest/betonquest/api/quest/variable/online/OnlineVariable.java index cf29a9dee9..8bc2aa252c 100644 --- a/src/main/java/org/betonquest/betonquest/api/quest/variable/online/OnlineVariable.java +++ b/src/main/java/org/betonquest/betonquest/api/quest/variable/online/OnlineVariable.java @@ -1,7 +1,7 @@ package org.betonquest.betonquest.api.quest.variable.online; import org.betonquest.betonquest.api.profile.OnlineProfile; -import org.betonquest.betonquest.exception.QuestException; +import org.betonquest.betonquest.api.quest.QuestException; /** * Player Variable that needs an online profile to function correctly. diff --git a/src/main/java/org/betonquest/betonquest/api/quest/variable/online/OnlineVariableAdapter.java b/src/main/java/org/betonquest/betonquest/api/quest/variable/online/OnlineVariableAdapter.java index 582b987449..3483ec84a7 100644 --- a/src/main/java/org/betonquest/betonquest/api/quest/variable/online/OnlineVariableAdapter.java +++ b/src/main/java/org/betonquest/betonquest/api/quest/variable/online/OnlineVariableAdapter.java @@ -2,8 +2,8 @@ import org.betonquest.betonquest.api.profile.OnlineProfile; import org.betonquest.betonquest.api.profile.Profile; +import org.betonquest.betonquest.api.quest.QuestException; import org.betonquest.betonquest.api.quest.variable.PlayerVariable; -import org.betonquest.betonquest.exception.QuestException; import java.util.Optional; diff --git a/src/main/java/org/betonquest/betonquest/api/schedule/CronSchedule.java b/src/main/java/org/betonquest/betonquest/api/schedule/CronSchedule.java index fd82ccb5a4..3e27636498 100644 --- a/src/main/java/org/betonquest/betonquest/api/schedule/CronSchedule.java +++ b/src/main/java/org/betonquest/betonquest/api/schedule/CronSchedule.java @@ -6,7 +6,7 @@ import com.cronutils.model.definition.CronDefinitionBuilder; import com.cronutils.model.time.ExecutionTime; import com.cronutils.parser.CronParser; -import org.betonquest.betonquest.exception.QuestException; +import org.betonquest.betonquest.api.quest.QuestException; import org.betonquest.betonquest.schedule.ScheduleID; import org.bukkit.configuration.ConfigurationSection; diff --git a/src/main/java/org/betonquest/betonquest/api/schedule/Schedule.java b/src/main/java/org/betonquest/betonquest/api/schedule/Schedule.java index 001d544586..9020d563fa 100644 --- a/src/main/java/org/betonquest/betonquest/api/schedule/Schedule.java +++ b/src/main/java/org/betonquest/betonquest/api/schedule/Schedule.java @@ -1,7 +1,7 @@ package org.betonquest.betonquest.api.schedule; +import org.betonquest.betonquest.api.quest.QuestException; import org.betonquest.betonquest.exception.ObjectNotFoundException; -import org.betonquest.betonquest.exception.QuestException; import org.betonquest.betonquest.id.EventID; import org.betonquest.betonquest.schedule.ScheduleID; import org.bukkit.configuration.ConfigurationSection; diff --git a/src/main/java/org/betonquest/betonquest/bstats/BStatsMetrics.java b/src/main/java/org/betonquest/betonquest/bstats/BStatsMetrics.java index f988ce4bb8..516122fdf0 100644 --- a/src/main/java/org/betonquest/betonquest/bstats/BStatsMetrics.java +++ b/src/main/java/org/betonquest/betonquest/bstats/BStatsMetrics.java @@ -1,8 +1,8 @@ package org.betonquest.betonquest.bstats; import org.betonquest.betonquest.BetonQuest; +import org.betonquest.betonquest.api.quest.QuestException; import org.betonquest.betonquest.compatibility.Compatibility; -import org.betonquest.betonquest.exception.QuestException; import org.betonquest.betonquest.id.ID; import org.bstats.bukkit.Metrics; import org.bstats.charts.AdvancedPie; diff --git a/src/main/java/org/betonquest/betonquest/command/LangCommand.java b/src/main/java/org/betonquest/betonquest/command/LangCommand.java index 4935c2ab42..5ea0537338 100644 --- a/src/main/java/org/betonquest/betonquest/command/LangCommand.java +++ b/src/main/java/org/betonquest/betonquest/command/LangCommand.java @@ -4,10 +4,10 @@ import org.betonquest.betonquest.Journal; import org.betonquest.betonquest.api.logger.BetonQuestLogger; import org.betonquest.betonquest.api.profile.OnlineProfile; +import org.betonquest.betonquest.api.quest.QuestException; import org.betonquest.betonquest.config.Config; import org.betonquest.betonquest.data.PlayerDataStorage; import org.betonquest.betonquest.database.PlayerData; -import org.betonquest.betonquest.exception.QuestException; import org.betonquest.betonquest.util.PlayerConverter; import org.bukkit.command.Command; import org.bukkit.command.CommandExecutor; diff --git a/src/main/java/org/betonquest/betonquest/command/QuestCommand.java b/src/main/java/org/betonquest/betonquest/command/QuestCommand.java index 0f417b12bd..bbd1aa04f7 100644 --- a/src/main/java/org/betonquest/betonquest/command/QuestCommand.java +++ b/src/main/java/org/betonquest/betonquest/command/QuestCommand.java @@ -17,6 +17,7 @@ import org.betonquest.betonquest.api.logger.BetonQuestLoggerFactory; import org.betonquest.betonquest.api.profile.OnlineProfile; import org.betonquest.betonquest.api.profile.Profile; +import org.betonquest.betonquest.api.quest.QuestException; import org.betonquest.betonquest.api.quest.event.online.OnlineEvent; import org.betonquest.betonquest.compatibility.Compatibility; import org.betonquest.betonquest.config.Config; @@ -26,7 +27,6 @@ import org.betonquest.betonquest.database.Saver.Record; import org.betonquest.betonquest.database.UpdateType; import org.betonquest.betonquest.exception.ObjectNotFoundException; -import org.betonquest.betonquest.exception.QuestException; import org.betonquest.betonquest.id.ConditionID; import org.betonquest.betonquest.id.EventID; import org.betonquest.betonquest.id.ItemID; diff --git a/src/main/java/org/betonquest/betonquest/compatibility/auraskills/AuraSkillsExperienceEvent.java b/src/main/java/org/betonquest/betonquest/compatibility/auraskills/AuraSkillsExperienceEvent.java index fb0019a2fc..ec43751230 100644 --- a/src/main/java/org/betonquest/betonquest/compatibility/auraskills/AuraSkillsExperienceEvent.java +++ b/src/main/java/org/betonquest/betonquest/compatibility/auraskills/AuraSkillsExperienceEvent.java @@ -6,7 +6,7 @@ import dev.aurelium.auraskills.api.user.SkillsUser; import org.betonquest.betonquest.api.QuestEvent; import org.betonquest.betonquest.api.profile.Profile; -import org.betonquest.betonquest.exception.QuestException; +import org.betonquest.betonquest.api.quest.QuestException; import org.betonquest.betonquest.instruction.Instruction; import org.betonquest.betonquest.instruction.variable.VariableNumber; import org.betonquest.betonquest.util.Utils; diff --git a/src/main/java/org/betonquest/betonquest/compatibility/auraskills/AuraSkillsLevelCondition.java b/src/main/java/org/betonquest/betonquest/compatibility/auraskills/AuraSkillsLevelCondition.java index aaebc5f948..d37b455ffc 100644 --- a/src/main/java/org/betonquest/betonquest/compatibility/auraskills/AuraSkillsLevelCondition.java +++ b/src/main/java/org/betonquest/betonquest/compatibility/auraskills/AuraSkillsLevelCondition.java @@ -6,7 +6,7 @@ import dev.aurelium.auraskills.api.user.SkillsUser; import org.betonquest.betonquest.api.Condition; import org.betonquest.betonquest.api.profile.Profile; -import org.betonquest.betonquest.exception.QuestException; +import org.betonquest.betonquest.api.quest.QuestException; import org.betonquest.betonquest.instruction.Instruction; import org.betonquest.betonquest.instruction.variable.VariableNumber; import org.betonquest.betonquest.util.Utils; diff --git a/src/main/java/org/betonquest/betonquest/compatibility/auraskills/AuraSkillsStatsCondition.java b/src/main/java/org/betonquest/betonquest/compatibility/auraskills/AuraSkillsStatsCondition.java index adde71ceb2..894feb1de8 100644 --- a/src/main/java/org/betonquest/betonquest/compatibility/auraskills/AuraSkillsStatsCondition.java +++ b/src/main/java/org/betonquest/betonquest/compatibility/auraskills/AuraSkillsStatsCondition.java @@ -6,7 +6,7 @@ import dev.aurelium.auraskills.api.user.SkillsUser; import org.betonquest.betonquest.api.Condition; import org.betonquest.betonquest.api.profile.Profile; -import org.betonquest.betonquest.exception.QuestException; +import org.betonquest.betonquest.api.quest.QuestException; import org.betonquest.betonquest.instruction.Instruction; import org.betonquest.betonquest.instruction.variable.VariableNumber; import org.betonquest.betonquest.util.Utils; diff --git a/src/main/java/org/betonquest/betonquest/compatibility/brewery/DrunkCondition.java b/src/main/java/org/betonquest/betonquest/compatibility/brewery/DrunkCondition.java index 4be1a11d69..b4856f150a 100644 --- a/src/main/java/org/betonquest/betonquest/compatibility/brewery/DrunkCondition.java +++ b/src/main/java/org/betonquest/betonquest/compatibility/brewery/DrunkCondition.java @@ -3,7 +3,7 @@ import com.dre.brewery.BPlayer; import org.betonquest.betonquest.api.Condition; import org.betonquest.betonquest.api.profile.Profile; -import org.betonquest.betonquest.exception.QuestException; +import org.betonquest.betonquest.api.quest.QuestException; import org.betonquest.betonquest.instruction.Instruction; @SuppressWarnings("PMD.CommentRequired") diff --git a/src/main/java/org/betonquest/betonquest/compatibility/brewery/DrunkQualityCondition.java b/src/main/java/org/betonquest/betonquest/compatibility/brewery/DrunkQualityCondition.java index f451af3e20..4d9927ba8c 100644 --- a/src/main/java/org/betonquest/betonquest/compatibility/brewery/DrunkQualityCondition.java +++ b/src/main/java/org/betonquest/betonquest/compatibility/brewery/DrunkQualityCondition.java @@ -3,7 +3,7 @@ import com.dre.brewery.BPlayer; import org.betonquest.betonquest.api.Condition; import org.betonquest.betonquest.api.profile.Profile; -import org.betonquest.betonquest.exception.QuestException; +import org.betonquest.betonquest.api.quest.QuestException; import org.betonquest.betonquest.instruction.Instruction; @SuppressWarnings("PMD.CommentRequired") diff --git a/src/main/java/org/betonquest/betonquest/compatibility/brewery/GiveBrewEvent.java b/src/main/java/org/betonquest/betonquest/compatibility/brewery/GiveBrewEvent.java index 8a52eb7876..dff890ff78 100644 --- a/src/main/java/org/betonquest/betonquest/compatibility/brewery/GiveBrewEvent.java +++ b/src/main/java/org/betonquest/betonquest/compatibility/brewery/GiveBrewEvent.java @@ -3,7 +3,7 @@ import com.dre.brewery.recipe.BRecipe; import org.betonquest.betonquest.api.QuestEvent; import org.betonquest.betonquest.api.profile.Profile; -import org.betonquest.betonquest.exception.QuestException; +import org.betonquest.betonquest.api.quest.QuestException; import org.betonquest.betonquest.instruction.Instruction; import org.bukkit.entity.Player; import org.bukkit.inventory.ItemStack; diff --git a/src/main/java/org/betonquest/betonquest/compatibility/brewery/HasBrewCondition.java b/src/main/java/org/betonquest/betonquest/compatibility/brewery/HasBrewCondition.java index e3f598a1d7..3ff3862ff3 100644 --- a/src/main/java/org/betonquest/betonquest/compatibility/brewery/HasBrewCondition.java +++ b/src/main/java/org/betonquest/betonquest/compatibility/brewery/HasBrewCondition.java @@ -4,7 +4,7 @@ import com.dre.brewery.recipe.BRecipe; import org.betonquest.betonquest.api.Condition; import org.betonquest.betonquest.api.profile.Profile; -import org.betonquest.betonquest.exception.QuestException; +import org.betonquest.betonquest.api.quest.QuestException; import org.betonquest.betonquest.instruction.Instruction; import org.bukkit.entity.Player; import org.bukkit.inventory.ItemStack; diff --git a/src/main/java/org/betonquest/betonquest/compatibility/brewery/TakeBrewEvent.java b/src/main/java/org/betonquest/betonquest/compatibility/brewery/TakeBrewEvent.java index 942c35316e..b67ead7aca 100644 --- a/src/main/java/org/betonquest/betonquest/compatibility/brewery/TakeBrewEvent.java +++ b/src/main/java/org/betonquest/betonquest/compatibility/brewery/TakeBrewEvent.java @@ -4,7 +4,7 @@ import com.dre.brewery.recipe.BRecipe; import org.betonquest.betonquest.api.QuestEvent; import org.betonquest.betonquest.api.profile.Profile; -import org.betonquest.betonquest.exception.QuestException; +import org.betonquest.betonquest.api.quest.QuestException; import org.betonquest.betonquest.instruction.Instruction; import org.bukkit.entity.Player; import org.bukkit.inventory.ItemStack; diff --git a/src/main/java/org/betonquest/betonquest/compatibility/citizens/CitizensConversationStarter.java b/src/main/java/org/betonquest/betonquest/compatibility/citizens/CitizensConversationStarter.java index 5a6a7f9966..faed709c5e 100644 --- a/src/main/java/org/betonquest/betonquest/compatibility/citizens/CitizensConversationStarter.java +++ b/src/main/java/org/betonquest/betonquest/compatibility/citizens/CitizensConversationStarter.java @@ -9,11 +9,11 @@ import org.betonquest.betonquest.api.logger.BetonQuestLogger; import org.betonquest.betonquest.api.logger.BetonQuestLoggerFactory; import org.betonquest.betonquest.api.profile.OnlineProfile; +import org.betonquest.betonquest.api.quest.QuestException; import org.betonquest.betonquest.compatibility.citizens.event.move.CitizensMoveController; import org.betonquest.betonquest.config.Config; import org.betonquest.betonquest.conversation.CombatTagger; import org.betonquest.betonquest.exception.ObjectNotFoundException; -import org.betonquest.betonquest.exception.QuestException; import org.betonquest.betonquest.id.ConversationID; import org.betonquest.betonquest.util.PlayerConverter; import org.bukkit.Bukkit; diff --git a/src/main/java/org/betonquest/betonquest/compatibility/citizens/CitizensHologramLoop.java b/src/main/java/org/betonquest/betonquest/compatibility/citizens/CitizensHologramLoop.java index ff2767b782..64fa36f572 100644 --- a/src/main/java/org/betonquest/betonquest/compatibility/citizens/CitizensHologramLoop.java +++ b/src/main/java/org/betonquest/betonquest/compatibility/citizens/CitizensHologramLoop.java @@ -10,11 +10,11 @@ import org.betonquest.betonquest.api.config.quest.QuestPackage; import org.betonquest.betonquest.api.logger.BetonQuestLogger; import org.betonquest.betonquest.api.logger.BetonQuestLoggerFactory; +import org.betonquest.betonquest.api.quest.QuestException; import org.betonquest.betonquest.compatibility.holograms.BetonHologram; import org.betonquest.betonquest.compatibility.holograms.HologramLoop; import org.betonquest.betonquest.compatibility.holograms.HologramProvider; import org.betonquest.betonquest.compatibility.holograms.HologramWrapper; -import org.betonquest.betonquest.exception.QuestException; import org.betonquest.betonquest.instruction.variable.location.VariableVector; import org.betonquest.betonquest.variables.GlobalVariableResolver; import org.bukkit.Bukkit; diff --git a/src/main/java/org/betonquest/betonquest/compatibility/citizens/condition/distance/NPCDistanceCondition.java b/src/main/java/org/betonquest/betonquest/compatibility/citizens/condition/distance/NPCDistanceCondition.java index fa87147ec8..eeef7acc68 100644 --- a/src/main/java/org/betonquest/betonquest/compatibility/citizens/condition/distance/NPCDistanceCondition.java +++ b/src/main/java/org/betonquest/betonquest/compatibility/citizens/condition/distance/NPCDistanceCondition.java @@ -3,8 +3,8 @@ import net.citizensnpcs.api.CitizensAPI; import net.citizensnpcs.api.npc.NPC; import org.betonquest.betonquest.api.profile.OnlineProfile; +import org.betonquest.betonquest.api.quest.QuestException; import org.betonquest.betonquest.api.quest.condition.online.OnlineCondition; -import org.betonquest.betonquest.exception.QuestException; import org.betonquest.betonquest.instruction.variable.VariableNumber; import org.bukkit.entity.Player; diff --git a/src/main/java/org/betonquest/betonquest/compatibility/citizens/condition/distance/NPCDistanceConditionFactory.java b/src/main/java/org/betonquest/betonquest/compatibility/citizens/condition/distance/NPCDistanceConditionFactory.java index 2030151cef..281468c8c4 100644 --- a/src/main/java/org/betonquest/betonquest/compatibility/citizens/condition/distance/NPCDistanceConditionFactory.java +++ b/src/main/java/org/betonquest/betonquest/compatibility/citizens/condition/distance/NPCDistanceConditionFactory.java @@ -1,10 +1,10 @@ package org.betonquest.betonquest.compatibility.citizens.condition.distance; import org.betonquest.betonquest.api.logger.BetonQuestLoggerFactory; +import org.betonquest.betonquest.api.quest.QuestException; import org.betonquest.betonquest.api.quest.condition.PlayerCondition; import org.betonquest.betonquest.api.quest.condition.PlayerConditionFactory; import org.betonquest.betonquest.api.quest.condition.online.OnlineConditionAdapter; -import org.betonquest.betonquest.exception.QuestException; import org.betonquest.betonquest.instruction.Instruction; import org.betonquest.betonquest.instruction.variable.VariableNumber; import org.betonquest.betonquest.quest.PrimaryServerThreadData; diff --git a/src/main/java/org/betonquest/betonquest/compatibility/citizens/condition/location/NPCLocationCondition.java b/src/main/java/org/betonquest/betonquest/compatibility/citizens/condition/location/NPCLocationCondition.java index 28413e0e02..2a8f9f69af 100644 --- a/src/main/java/org/betonquest/betonquest/compatibility/citizens/condition/location/NPCLocationCondition.java +++ b/src/main/java/org/betonquest/betonquest/compatibility/citizens/condition/location/NPCLocationCondition.java @@ -3,8 +3,8 @@ import net.citizensnpcs.api.CitizensAPI; import net.citizensnpcs.api.npc.NPC; import org.betonquest.betonquest.api.profile.Profile; +import org.betonquest.betonquest.api.quest.QuestException; import org.betonquest.betonquest.api.quest.condition.nullable.NullableCondition; -import org.betonquest.betonquest.exception.QuestException; import org.betonquest.betonquest.instruction.variable.VariableNumber; import org.betonquest.betonquest.instruction.variable.location.VariableLocation; import org.bukkit.Location; diff --git a/src/main/java/org/betonquest/betonquest/compatibility/citizens/condition/location/NPCLocationConditionFactory.java b/src/main/java/org/betonquest/betonquest/compatibility/citizens/condition/location/NPCLocationConditionFactory.java index 846e26a3c2..096ef45dee 100644 --- a/src/main/java/org/betonquest/betonquest/compatibility/citizens/condition/location/NPCLocationConditionFactory.java +++ b/src/main/java/org/betonquest/betonquest/compatibility/citizens/condition/location/NPCLocationConditionFactory.java @@ -1,11 +1,11 @@ package org.betonquest.betonquest.compatibility.citizens.condition.location; +import org.betonquest.betonquest.api.quest.QuestException; import org.betonquest.betonquest.api.quest.condition.PlayerCondition; import org.betonquest.betonquest.api.quest.condition.PlayerConditionFactory; import org.betonquest.betonquest.api.quest.condition.PlayerlessCondition; import org.betonquest.betonquest.api.quest.condition.PlayerlessConditionFactory; import org.betonquest.betonquest.api.quest.condition.nullable.NullableConditionAdapter; -import org.betonquest.betonquest.exception.QuestException; import org.betonquest.betonquest.instruction.Instruction; import org.betonquest.betonquest.instruction.variable.VariableNumber; import org.betonquest.betonquest.instruction.variable.location.VariableLocation; diff --git a/src/main/java/org/betonquest/betonquest/compatibility/citizens/condition/region/NPCRegionCondition.java b/src/main/java/org/betonquest/betonquest/compatibility/citizens/condition/region/NPCRegionCondition.java index 6e4ea10d8a..75e6c74629 100644 --- a/src/main/java/org/betonquest/betonquest/compatibility/citizens/condition/region/NPCRegionCondition.java +++ b/src/main/java/org/betonquest/betonquest/compatibility/citizens/condition/region/NPCRegionCondition.java @@ -2,9 +2,9 @@ import net.citizensnpcs.api.CitizensAPI; import net.citizensnpcs.api.npc.NPC; +import org.betonquest.betonquest.api.quest.QuestException; import org.betonquest.betonquest.api.quest.condition.PlayerlessCondition; import org.betonquest.betonquest.compatibility.worldguard.WorldGuardIntegrator; -import org.betonquest.betonquest.exception.QuestException; /** * Checks if a npc is inside a WorldGuard region. diff --git a/src/main/java/org/betonquest/betonquest/compatibility/citizens/condition/region/NPCRegionConditionFactory.java b/src/main/java/org/betonquest/betonquest/compatibility/citizens/condition/region/NPCRegionConditionFactory.java index 762f8da0cf..175bf9bba2 100644 --- a/src/main/java/org/betonquest/betonquest/compatibility/citizens/condition/region/NPCRegionConditionFactory.java +++ b/src/main/java/org/betonquest/betonquest/compatibility/citizens/condition/region/NPCRegionConditionFactory.java @@ -1,8 +1,8 @@ package org.betonquest.betonquest.compatibility.citizens.condition.region; +import org.betonquest.betonquest.api.quest.QuestException; import org.betonquest.betonquest.api.quest.condition.PlayerlessCondition; import org.betonquest.betonquest.api.quest.condition.PlayerlessConditionFactory; -import org.betonquest.betonquest.exception.QuestException; import org.betonquest.betonquest.instruction.Instruction; import org.betonquest.betonquest.quest.PrimaryServerThreadData; import org.betonquest.betonquest.quest.condition.PrimaryServerThreadPlayerlessCondition; diff --git a/src/main/java/org/betonquest/betonquest/compatibility/citizens/event/move/CitizensMoveController.java b/src/main/java/org/betonquest/betonquest/compatibility/citizens/event/move/CitizensMoveController.java index fcb612a43e..82fe828f62 100644 --- a/src/main/java/org/betonquest/betonquest/compatibility/citizens/event/move/CitizensMoveController.java +++ b/src/main/java/org/betonquest/betonquest/compatibility/citizens/event/move/CitizensMoveController.java @@ -11,8 +11,8 @@ import org.betonquest.betonquest.api.config.quest.QuestPackage; import org.betonquest.betonquest.api.logger.BetonQuestLogger; import org.betonquest.betonquest.api.profile.Profile; +import org.betonquest.betonquest.api.quest.QuestException; import org.betonquest.betonquest.compatibility.citizens.CitizensWalkingListener; -import org.betonquest.betonquest.exception.QuestException; import org.betonquest.betonquest.id.EventID; import org.betonquest.betonquest.instruction.variable.location.VariableLocation; import org.bukkit.Location; diff --git a/src/main/java/org/betonquest/betonquest/compatibility/citizens/event/move/CitizensMoveEvent.java b/src/main/java/org/betonquest/betonquest/compatibility/citizens/event/move/CitizensMoveEvent.java index 36387c8dab..8463623173 100644 --- a/src/main/java/org/betonquest/betonquest/compatibility/citizens/event/move/CitizensMoveEvent.java +++ b/src/main/java/org/betonquest/betonquest/compatibility/citizens/event/move/CitizensMoveEvent.java @@ -3,8 +3,8 @@ import net.citizensnpcs.api.CitizensAPI; import net.citizensnpcs.api.npc.NPC; import org.betonquest.betonquest.api.profile.Profile; +import org.betonquest.betonquest.api.quest.QuestException; import org.betonquest.betonquest.api.quest.event.Event; -import org.betonquest.betonquest.exception.QuestException; /** * Moves the NPC to a specified location, optionally firing doneEvents when it's done. diff --git a/src/main/java/org/betonquest/betonquest/compatibility/citizens/event/move/CitizensMoveEventFactory.java b/src/main/java/org/betonquest/betonquest/compatibility/citizens/event/move/CitizensMoveEventFactory.java index 3551d184ac..d065ade25a 100644 --- a/src/main/java/org/betonquest/betonquest/compatibility/citizens/event/move/CitizensMoveEventFactory.java +++ b/src/main/java/org/betonquest/betonquest/compatibility/citizens/event/move/CitizensMoveEventFactory.java @@ -1,8 +1,8 @@ package org.betonquest.betonquest.compatibility.citizens.event.move; +import org.betonquest.betonquest.api.quest.QuestException; import org.betonquest.betonquest.api.quest.event.Event; import org.betonquest.betonquest.api.quest.event.EventFactory; -import org.betonquest.betonquest.exception.QuestException; import org.betonquest.betonquest.id.EventID; import org.betonquest.betonquest.instruction.Instruction; import org.betonquest.betonquest.instruction.variable.location.VariableLocation; diff --git a/src/main/java/org/betonquest/betonquest/compatibility/citizens/event/move/CitizensStopEvent.java b/src/main/java/org/betonquest/betonquest/compatibility/citizens/event/move/CitizensStopEvent.java index f576dac610..96ab95dac2 100644 --- a/src/main/java/org/betonquest/betonquest/compatibility/citizens/event/move/CitizensStopEvent.java +++ b/src/main/java/org/betonquest/betonquest/compatibility/citizens/event/move/CitizensStopEvent.java @@ -2,8 +2,8 @@ import net.citizensnpcs.api.CitizensAPI; import net.citizensnpcs.api.npc.NPC; +import org.betonquest.betonquest.api.quest.QuestException; import org.betonquest.betonquest.api.quest.event.StaticEvent; -import org.betonquest.betonquest.exception.QuestException; /** * Stop the NPC when he is walking. diff --git a/src/main/java/org/betonquest/betonquest/compatibility/citizens/event/move/CitizensStopEventFactory.java b/src/main/java/org/betonquest/betonquest/compatibility/citizens/event/move/CitizensStopEventFactory.java index 9453a354b2..082817187d 100644 --- a/src/main/java/org/betonquest/betonquest/compatibility/citizens/event/move/CitizensStopEventFactory.java +++ b/src/main/java/org/betonquest/betonquest/compatibility/citizens/event/move/CitizensStopEventFactory.java @@ -1,8 +1,8 @@ package org.betonquest.betonquest.compatibility.citizens.event.move; +import org.betonquest.betonquest.api.quest.QuestException; import org.betonquest.betonquest.api.quest.event.StaticEvent; import org.betonquest.betonquest.api.quest.event.StaticEventFactory; -import org.betonquest.betonquest.exception.QuestException; import org.betonquest.betonquest.instruction.Instruction; import org.betonquest.betonquest.quest.PrimaryServerThreadData; import org.betonquest.betonquest.quest.event.PrimaryServerThreadStaticEvent; diff --git a/src/main/java/org/betonquest/betonquest/compatibility/citizens/event/teleport/NPCTeleportEvent.java b/src/main/java/org/betonquest/betonquest/compatibility/citizens/event/teleport/NPCTeleportEvent.java index 109d3f20cb..52ba0cd53e 100644 --- a/src/main/java/org/betonquest/betonquest/compatibility/citizens/event/teleport/NPCTeleportEvent.java +++ b/src/main/java/org/betonquest/betonquest/compatibility/citizens/event/teleport/NPCTeleportEvent.java @@ -4,9 +4,9 @@ import net.citizensnpcs.api.event.SpawnReason; import net.citizensnpcs.api.npc.NPC; import org.betonquest.betonquest.api.profile.Profile; +import org.betonquest.betonquest.api.quest.QuestException; import org.betonquest.betonquest.api.quest.event.nullable.NullableEvent; import org.betonquest.betonquest.compatibility.citizens.CitizensIntegrator; -import org.betonquest.betonquest.exception.QuestException; import org.betonquest.betonquest.instruction.variable.location.VariableLocation; import org.bukkit.event.player.PlayerTeleportEvent; import org.jetbrains.annotations.Nullable; diff --git a/src/main/java/org/betonquest/betonquest/compatibility/citizens/event/teleport/NPCTeleportEventFactory.java b/src/main/java/org/betonquest/betonquest/compatibility/citizens/event/teleport/NPCTeleportEventFactory.java index 442b651988..6dbb252387 100644 --- a/src/main/java/org/betonquest/betonquest/compatibility/citizens/event/teleport/NPCTeleportEventFactory.java +++ b/src/main/java/org/betonquest/betonquest/compatibility/citizens/event/teleport/NPCTeleportEventFactory.java @@ -1,11 +1,11 @@ package org.betonquest.betonquest.compatibility.citizens.event.teleport; +import org.betonquest.betonquest.api.quest.QuestException; import org.betonquest.betonquest.api.quest.event.Event; import org.betonquest.betonquest.api.quest.event.EventFactory; import org.betonquest.betonquest.api.quest.event.StaticEvent; import org.betonquest.betonquest.api.quest.event.StaticEventFactory; import org.betonquest.betonquest.api.quest.event.nullable.NullableEventAdapter; -import org.betonquest.betonquest.exception.QuestException; import org.betonquest.betonquest.instruction.Instruction; import org.betonquest.betonquest.instruction.variable.location.VariableLocation; import org.betonquest.betonquest.quest.PrimaryServerThreadData; diff --git a/src/main/java/org/betonquest/betonquest/compatibility/citizens/objective/NPCInteractObjective.java b/src/main/java/org/betonquest/betonquest/compatibility/citizens/objective/NPCInteractObjective.java index 3e28378054..63c6c7f99d 100644 --- a/src/main/java/org/betonquest/betonquest/compatibility/citizens/objective/NPCInteractObjective.java +++ b/src/main/java/org/betonquest/betonquest/compatibility/citizens/objective/NPCInteractObjective.java @@ -7,7 +7,7 @@ import org.betonquest.betonquest.api.Objective; import org.betonquest.betonquest.api.profile.OnlineProfile; import org.betonquest.betonquest.api.profile.Profile; -import org.betonquest.betonquest.exception.QuestException; +import org.betonquest.betonquest.api.quest.QuestException; import org.betonquest.betonquest.instruction.Instruction; import org.betonquest.betonquest.objective.EntityInteractObjective.Interaction; import org.betonquest.betonquest.util.PlayerConverter; diff --git a/src/main/java/org/betonquest/betonquest/compatibility/citizens/objective/NPCKillObjective.java b/src/main/java/org/betonquest/betonquest/compatibility/citizens/objective/NPCKillObjective.java index 59e0612c7b..29b13add90 100644 --- a/src/main/java/org/betonquest/betonquest/compatibility/citizens/objective/NPCKillObjective.java +++ b/src/main/java/org/betonquest/betonquest/compatibility/citizens/objective/NPCKillObjective.java @@ -6,7 +6,7 @@ import org.betonquest.betonquest.api.CountingObjective; import org.betonquest.betonquest.api.MobKillNotifier.MobKilledEvent; import org.betonquest.betonquest.api.profile.OnlineProfile; -import org.betonquest.betonquest.exception.QuestException; +import org.betonquest.betonquest.api.quest.QuestException; import org.betonquest.betonquest.instruction.Instruction; import org.betonquest.betonquest.instruction.argument.VariableArgument; import org.bukkit.Bukkit; diff --git a/src/main/java/org/betonquest/betonquest/compatibility/citizens/objective/NPCRangeObjective.java b/src/main/java/org/betonquest/betonquest/compatibility/citizens/objective/NPCRangeObjective.java index 29b272c546..75121cc4a1 100644 --- a/src/main/java/org/betonquest/betonquest/compatibility/citizens/objective/NPCRangeObjective.java +++ b/src/main/java/org/betonquest/betonquest/compatibility/citizens/objective/NPCRangeObjective.java @@ -6,7 +6,7 @@ import org.betonquest.betonquest.api.Objective; import org.betonquest.betonquest.api.profile.OnlineProfile; import org.betonquest.betonquest.api.profile.Profile; -import org.betonquest.betonquest.exception.QuestException; +import org.betonquest.betonquest.api.quest.QuestException; import org.betonquest.betonquest.instruction.Instruction; import org.betonquest.betonquest.instruction.variable.VariableNumber; import org.betonquest.betonquest.util.PlayerConverter; diff --git a/src/main/java/org/betonquest/betonquest/compatibility/citizens/variable/npc/CitizensVariable.java b/src/main/java/org/betonquest/betonquest/compatibility/citizens/variable/npc/CitizensVariable.java index e9449bfddd..16fcf0d67c 100644 --- a/src/main/java/org/betonquest/betonquest/compatibility/citizens/variable/npc/CitizensVariable.java +++ b/src/main/java/org/betonquest/betonquest/compatibility/citizens/variable/npc/CitizensVariable.java @@ -2,8 +2,8 @@ import net.citizensnpcs.api.CitizensAPI; import net.citizensnpcs.api.npc.NPC; +import org.betonquest.betonquest.api.quest.QuestException; import org.betonquest.betonquest.api.quest.variable.PlayerlessVariable; -import org.betonquest.betonquest.exception.QuestException; import org.betonquest.betonquest.quest.variable.location.LocationFormationMode; import org.jetbrains.annotations.Nullable; diff --git a/src/main/java/org/betonquest/betonquest/compatibility/citizens/variable/npc/CitizensVariableFactory.java b/src/main/java/org/betonquest/betonquest/compatibility/citizens/variable/npc/CitizensVariableFactory.java index 9ede68b5c6..b35dd12b04 100644 --- a/src/main/java/org/betonquest/betonquest/compatibility/citizens/variable/npc/CitizensVariableFactory.java +++ b/src/main/java/org/betonquest/betonquest/compatibility/citizens/variable/npc/CitizensVariableFactory.java @@ -1,8 +1,8 @@ package org.betonquest.betonquest.compatibility.citizens.variable.npc; +import org.betonquest.betonquest.api.quest.QuestException; import org.betonquest.betonquest.api.quest.variable.PlayerlessVariable; import org.betonquest.betonquest.api.quest.variable.PlayerlessVariableFactory; -import org.betonquest.betonquest.exception.QuestException; import org.betonquest.betonquest.instruction.Instruction; import org.betonquest.betonquest.quest.variable.location.LocationFormationMode; diff --git a/src/main/java/org/betonquest/betonquest/compatibility/denizen/DenizenTaskScriptEvent.java b/src/main/java/org/betonquest/betonquest/compatibility/denizen/DenizenTaskScriptEvent.java index bcc4929984..b5a03cffae 100644 --- a/src/main/java/org/betonquest/betonquest/compatibility/denizen/DenizenTaskScriptEvent.java +++ b/src/main/java/org/betonquest/betonquest/compatibility/denizen/DenizenTaskScriptEvent.java @@ -6,7 +6,7 @@ import com.denizenscript.denizencore.scripts.containers.core.TaskScriptContainer; import org.betonquest.betonquest.api.QuestEvent; import org.betonquest.betonquest.api.profile.Profile; -import org.betonquest.betonquest.exception.QuestException; +import org.betonquest.betonquest.api.quest.QuestException; import org.betonquest.betonquest.instruction.Instruction; /** diff --git a/src/main/java/org/betonquest/betonquest/compatibility/effectlib/EffectLibParticleManager.java b/src/main/java/org/betonquest/betonquest/compatibility/effectlib/EffectLibParticleManager.java index 0883757419..7d46ac460a 100644 --- a/src/main/java/org/betonquest/betonquest/compatibility/effectlib/EffectLibParticleManager.java +++ b/src/main/java/org/betonquest/betonquest/compatibility/effectlib/EffectLibParticleManager.java @@ -5,10 +5,10 @@ import org.betonquest.betonquest.api.config.quest.QuestPackage; import org.betonquest.betonquest.api.logger.BetonQuestLogger; import org.betonquest.betonquest.api.logger.BetonQuestLoggerFactory; +import org.betonquest.betonquest.api.quest.QuestException; import org.betonquest.betonquest.compatibility.Compatibility; import org.betonquest.betonquest.config.Config; import org.betonquest.betonquest.exception.ObjectNotFoundException; -import org.betonquest.betonquest.exception.QuestException; import org.betonquest.betonquest.id.ConditionID; import org.betonquest.betonquest.instruction.variable.location.VariableLocation; import org.betonquest.betonquest.variables.GlobalVariableResolver; diff --git a/src/main/java/org/betonquest/betonquest/compatibility/effectlib/EffectLibRunnable.java b/src/main/java/org/betonquest/betonquest/compatibility/effectlib/EffectLibRunnable.java index b920068316..e2cdba0428 100644 --- a/src/main/java/org/betonquest/betonquest/compatibility/effectlib/EffectLibRunnable.java +++ b/src/main/java/org/betonquest/betonquest/compatibility/effectlib/EffectLibRunnable.java @@ -7,8 +7,8 @@ import org.betonquest.betonquest.BetonQuest; import org.betonquest.betonquest.api.logger.BetonQuestLogger; import org.betonquest.betonquest.api.profile.OnlineProfile; +import org.betonquest.betonquest.api.quest.QuestException; import org.betonquest.betonquest.compatibility.protocollib.hider.NPCHider; -import org.betonquest.betonquest.exception.QuestException; import org.betonquest.betonquest.instruction.variable.location.VariableLocation; import org.betonquest.betonquest.util.PlayerConverter; import org.bukkit.Bukkit; diff --git a/src/main/java/org/betonquest/betonquest/compatibility/effectlib/event/ParticleEvent.java b/src/main/java/org/betonquest/betonquest/compatibility/effectlib/event/ParticleEvent.java index 6fba32c450..9a400e7f36 100644 --- a/src/main/java/org/betonquest/betonquest/compatibility/effectlib/event/ParticleEvent.java +++ b/src/main/java/org/betonquest/betonquest/compatibility/effectlib/event/ParticleEvent.java @@ -3,8 +3,8 @@ import de.slikey.effectlib.EffectManager; import de.slikey.effectlib.util.DynamicLocation; import org.betonquest.betonquest.api.profile.OnlineProfile; +import org.betonquest.betonquest.api.quest.QuestException; import org.betonquest.betonquest.api.quest.event.online.OnlineEvent; -import org.betonquest.betonquest.exception.QuestException; import org.betonquest.betonquest.instruction.variable.location.VariableLocation; import org.bukkit.Location; import org.bukkit.configuration.ConfigurationSection; diff --git a/src/main/java/org/betonquest/betonquest/compatibility/effectlib/event/ParticleEventFactory.java b/src/main/java/org/betonquest/betonquest/compatibility/effectlib/event/ParticleEventFactory.java index b80f862efe..0398a06c65 100644 --- a/src/main/java/org/betonquest/betonquest/compatibility/effectlib/event/ParticleEventFactory.java +++ b/src/main/java/org/betonquest/betonquest/compatibility/effectlib/event/ParticleEventFactory.java @@ -2,10 +2,10 @@ import de.slikey.effectlib.EffectManager; import org.betonquest.betonquest.api.logger.BetonQuestLoggerFactory; +import org.betonquest.betonquest.api.quest.QuestException; import org.betonquest.betonquest.api.quest.event.Event; import org.betonquest.betonquest.api.quest.event.EventFactory; import org.betonquest.betonquest.api.quest.event.online.OnlineEventAdapter; -import org.betonquest.betonquest.exception.QuestException; import org.betonquest.betonquest.instruction.Instruction; import org.betonquest.betonquest.instruction.variable.location.VariableLocation; import org.betonquest.betonquest.quest.PrimaryServerThreadData; diff --git a/src/main/java/org/betonquest/betonquest/compatibility/fabled/FabledClassCondition.java b/src/main/java/org/betonquest/betonquest/compatibility/fabled/FabledClassCondition.java index a100abba22..2c41db0ae9 100644 --- a/src/main/java/org/betonquest/betonquest/compatibility/fabled/FabledClassCondition.java +++ b/src/main/java/org/betonquest/betonquest/compatibility/fabled/FabledClassCondition.java @@ -2,7 +2,7 @@ import org.betonquest.betonquest.api.Condition; import org.betonquest.betonquest.api.profile.Profile; -import org.betonquest.betonquest.exception.QuestException; +import org.betonquest.betonquest.api.quest.QuestException; import org.betonquest.betonquest.instruction.Instruction; import studio.magemonkey.fabled.Fabled; import studio.magemonkey.fabled.api.player.PlayerData; diff --git a/src/main/java/org/betonquest/betonquest/compatibility/fabled/FabledLevelCondition.java b/src/main/java/org/betonquest/betonquest/compatibility/fabled/FabledLevelCondition.java index bf8a445a3e..b2ee4c6427 100644 --- a/src/main/java/org/betonquest/betonquest/compatibility/fabled/FabledLevelCondition.java +++ b/src/main/java/org/betonquest/betonquest/compatibility/fabled/FabledLevelCondition.java @@ -2,7 +2,7 @@ import org.betonquest.betonquest.api.Condition; import org.betonquest.betonquest.api.profile.Profile; -import org.betonquest.betonquest.exception.QuestException; +import org.betonquest.betonquest.api.quest.QuestException; import org.betonquest.betonquest.instruction.Instruction; import org.betonquest.betonquest.instruction.variable.VariableNumber; import studio.magemonkey.fabled.Fabled; diff --git a/src/main/java/org/betonquest/betonquest/compatibility/fakeblock/FakeBlockEventFactory.java b/src/main/java/org/betonquest/betonquest/compatibility/fakeblock/FakeBlockEventFactory.java index 1cf0157a36..87cfbb2e2d 100644 --- a/src/main/java/org/betonquest/betonquest/compatibility/fakeblock/FakeBlockEventFactory.java +++ b/src/main/java/org/betonquest/betonquest/compatibility/fakeblock/FakeBlockEventFactory.java @@ -2,9 +2,9 @@ import com.briarcraft.fakeblock.api.service.GroupService; import com.briarcraft.fakeblock.api.service.PlayerGroupService; +import org.betonquest.betonquest.api.quest.QuestException; import org.betonquest.betonquest.api.quest.event.Event; import org.betonquest.betonquest.api.quest.event.EventFactory; -import org.betonquest.betonquest.exception.QuestException; import org.betonquest.betonquest.instruction.Instruction; import org.betonquest.betonquest.quest.PrimaryServerThreadData; import org.betonquest.betonquest.quest.event.PrimaryServerThreadEvent; diff --git a/src/main/java/org/betonquest/betonquest/compatibility/fakeblock/HideGroupEvent.java b/src/main/java/org/betonquest/betonquest/compatibility/fakeblock/HideGroupEvent.java index f2c6d99639..eba0a48537 100644 --- a/src/main/java/org/betonquest/betonquest/compatibility/fakeblock/HideGroupEvent.java +++ b/src/main/java/org/betonquest/betonquest/compatibility/fakeblock/HideGroupEvent.java @@ -2,8 +2,8 @@ import com.briarcraft.fakeblock.api.service.PlayerGroupService; import org.betonquest.betonquest.api.profile.Profile; +import org.betonquest.betonquest.api.quest.QuestException; import org.betonquest.betonquest.api.quest.event.Event; -import org.betonquest.betonquest.exception.QuestException; import org.bukkit.plugin.RegisteredServiceProvider; import java.util.List; diff --git a/src/main/java/org/betonquest/betonquest/compatibility/fakeblock/ShowGroupEvent.java b/src/main/java/org/betonquest/betonquest/compatibility/fakeblock/ShowGroupEvent.java index 11fef49a0e..99c920f612 100644 --- a/src/main/java/org/betonquest/betonquest/compatibility/fakeblock/ShowGroupEvent.java +++ b/src/main/java/org/betonquest/betonquest/compatibility/fakeblock/ShowGroupEvent.java @@ -2,8 +2,8 @@ import com.briarcraft.fakeblock.api.service.PlayerGroupService; import org.betonquest.betonquest.api.profile.Profile; +import org.betonquest.betonquest.api.quest.QuestException; import org.betonquest.betonquest.api.quest.event.Event; -import org.betonquest.betonquest.exception.QuestException; import org.bukkit.plugin.RegisteredServiceProvider; import java.util.List; diff --git a/src/main/java/org/betonquest/betonquest/compatibility/heroes/HeroesAttributeCondition.java b/src/main/java/org/betonquest/betonquest/compatibility/heroes/HeroesAttributeCondition.java index 37dcd7559e..8eb58e395c 100644 --- a/src/main/java/org/betonquest/betonquest/compatibility/heroes/HeroesAttributeCondition.java +++ b/src/main/java/org/betonquest/betonquest/compatibility/heroes/HeroesAttributeCondition.java @@ -5,7 +5,7 @@ import com.herocraftonline.heroes.characters.Hero; import org.betonquest.betonquest.api.Condition; import org.betonquest.betonquest.api.profile.Profile; -import org.betonquest.betonquest.exception.QuestException; +import org.betonquest.betonquest.api.quest.QuestException; import org.betonquest.betonquest.instruction.Instruction; import org.betonquest.betonquest.instruction.variable.VariableNumber; diff --git a/src/main/java/org/betonquest/betonquest/compatibility/heroes/HeroesClassCondition.java b/src/main/java/org/betonquest/betonquest/compatibility/heroes/HeroesClassCondition.java index e7e1667749..a43cdc6add 100644 --- a/src/main/java/org/betonquest/betonquest/compatibility/heroes/HeroesClassCondition.java +++ b/src/main/java/org/betonquest/betonquest/compatibility/heroes/HeroesClassCondition.java @@ -5,7 +5,7 @@ import com.herocraftonline.heroes.characters.classes.HeroClass; import org.betonquest.betonquest.api.Condition; import org.betonquest.betonquest.api.profile.Profile; -import org.betonquest.betonquest.exception.QuestException; +import org.betonquest.betonquest.api.quest.QuestException; import org.betonquest.betonquest.instruction.Instruction; import org.betonquest.betonquest.instruction.variable.VariableNumber; import org.jetbrains.annotations.Nullable; diff --git a/src/main/java/org/betonquest/betonquest/compatibility/heroes/HeroesExperienceEvent.java b/src/main/java/org/betonquest/betonquest/compatibility/heroes/HeroesExperienceEvent.java index f85b178501..b27953b7b8 100644 --- a/src/main/java/org/betonquest/betonquest/compatibility/heroes/HeroesExperienceEvent.java +++ b/src/main/java/org/betonquest/betonquest/compatibility/heroes/HeroesExperienceEvent.java @@ -4,7 +4,7 @@ import com.herocraftonline.heroes.characters.Hero; import org.betonquest.betonquest.api.QuestEvent; import org.betonquest.betonquest.api.profile.Profile; -import org.betonquest.betonquest.exception.QuestException; +import org.betonquest.betonquest.api.quest.QuestException; import org.betonquest.betonquest.instruction.Instruction; import org.betonquest.betonquest.instruction.variable.VariableNumber; diff --git a/src/main/java/org/betonquest/betonquest/compatibility/heroes/HeroesSkillCondition.java b/src/main/java/org/betonquest/betonquest/compatibility/heroes/HeroesSkillCondition.java index 349437ebe2..69c587a438 100644 --- a/src/main/java/org/betonquest/betonquest/compatibility/heroes/HeroesSkillCondition.java +++ b/src/main/java/org/betonquest/betonquest/compatibility/heroes/HeroesSkillCondition.java @@ -4,7 +4,7 @@ import com.herocraftonline.heroes.characters.Hero; import org.betonquest.betonquest.api.Condition; import org.betonquest.betonquest.api.profile.Profile; -import org.betonquest.betonquest.exception.QuestException; +import org.betonquest.betonquest.api.quest.QuestException; import org.betonquest.betonquest.instruction.Instruction; /** diff --git a/src/main/java/org/betonquest/betonquest/compatibility/holograms/HologramLoop.java b/src/main/java/org/betonquest/betonquest/compatibility/holograms/HologramLoop.java index 7e745a26a0..43f5ff2b04 100644 --- a/src/main/java/org/betonquest/betonquest/compatibility/holograms/HologramLoop.java +++ b/src/main/java/org/betonquest/betonquest/compatibility/holograms/HologramLoop.java @@ -4,6 +4,7 @@ import org.betonquest.betonquest.api.config.quest.QuestPackage; import org.betonquest.betonquest.api.logger.BetonQuestLogger; import org.betonquest.betonquest.api.logger.BetonQuestLoggerFactory; +import org.betonquest.betonquest.api.quest.QuestException; import org.betonquest.betonquest.compatibility.holograms.lines.AbstractLine; import org.betonquest.betonquest.compatibility.holograms.lines.ItemLine; import org.betonquest.betonquest.compatibility.holograms.lines.TextLine; @@ -11,7 +12,6 @@ import org.betonquest.betonquest.compatibility.holograms.lines.TopXObject; import org.betonquest.betonquest.config.Config; import org.betonquest.betonquest.exception.ObjectNotFoundException; -import org.betonquest.betonquest.exception.QuestException; import org.betonquest.betonquest.id.ConditionID; import org.betonquest.betonquest.id.ItemID; import org.betonquest.betonquest.instruction.variable.VariableNumber; diff --git a/src/main/java/org/betonquest/betonquest/compatibility/holograms/LocationHologramLoop.java b/src/main/java/org/betonquest/betonquest/compatibility/holograms/LocationHologramLoop.java index ccb2b2b8c6..91660e1a05 100644 --- a/src/main/java/org/betonquest/betonquest/compatibility/holograms/LocationHologramLoop.java +++ b/src/main/java/org/betonquest/betonquest/compatibility/holograms/LocationHologramLoop.java @@ -4,7 +4,7 @@ import org.betonquest.betonquest.api.config.quest.QuestPackage; import org.betonquest.betonquest.api.logger.BetonQuestLogger; import org.betonquest.betonquest.api.logger.BetonQuestLoggerFactory; -import org.betonquest.betonquest.exception.QuestException; +import org.betonquest.betonquest.api.quest.QuestException; import org.betonquest.betonquest.instruction.variable.location.VariableLocation; import org.betonquest.betonquest.variables.GlobalVariableResolver; import org.bukkit.Location; diff --git a/src/main/java/org/betonquest/betonquest/compatibility/holograms/decentholograms/DecentHologramsIntegrator.java b/src/main/java/org/betonquest/betonquest/compatibility/holograms/decentholograms/DecentHologramsIntegrator.java index a5c5387e47..538e59a0a5 100644 --- a/src/main/java/org/betonquest/betonquest/compatibility/holograms/decentholograms/DecentHologramsIntegrator.java +++ b/src/main/java/org/betonquest/betonquest/compatibility/holograms/decentholograms/DecentHologramsIntegrator.java @@ -6,11 +6,11 @@ import org.betonquest.betonquest.api.Variable; import org.betonquest.betonquest.api.config.quest.QuestPackage; import org.betonquest.betonquest.api.logger.BetonQuestLogger; +import org.betonquest.betonquest.api.quest.QuestException; import org.betonquest.betonquest.compatibility.holograms.BetonHologram; import org.betonquest.betonquest.compatibility.holograms.HologramIntegrator; import org.betonquest.betonquest.compatibility.holograms.HologramProvider; import org.betonquest.betonquest.exception.HookException; -import org.betonquest.betonquest.exception.QuestException; import org.betonquest.betonquest.instruction.Instruction; import org.bukkit.Bukkit; import org.bukkit.Location; diff --git a/src/main/java/org/betonquest/betonquest/compatibility/holograms/holographicdisplays/HologramGlobalPlaceholder.java b/src/main/java/org/betonquest/betonquest/compatibility/holograms/holographicdisplays/HologramGlobalPlaceholder.java index 53e30d4614..8f7094f095 100644 --- a/src/main/java/org/betonquest/betonquest/compatibility/holograms/holographicdisplays/HologramGlobalPlaceholder.java +++ b/src/main/java/org/betonquest/betonquest/compatibility/holograms/holographicdisplays/HologramGlobalPlaceholder.java @@ -2,7 +2,7 @@ import me.filoghost.holographicdisplays.api.placeholder.GlobalPlaceholder; import org.betonquest.betonquest.api.logger.BetonQuestLogger; -import org.betonquest.betonquest.exception.QuestException; +import org.betonquest.betonquest.api.quest.QuestException; import org.betonquest.betonquest.quest.registry.processor.VariableProcessor; import org.jetbrains.annotations.Nullable; diff --git a/src/main/java/org/betonquest/betonquest/compatibility/holograms/holographicdisplays/HologramPlaceholder.java b/src/main/java/org/betonquest/betonquest/compatibility/holograms/holographicdisplays/HologramPlaceholder.java index d737890e13..de448509cb 100644 --- a/src/main/java/org/betonquest/betonquest/compatibility/holograms/holographicdisplays/HologramPlaceholder.java +++ b/src/main/java/org/betonquest/betonquest/compatibility/holograms/holographicdisplays/HologramPlaceholder.java @@ -3,7 +3,7 @@ import me.filoghost.holographicdisplays.api.placeholder.IndividualPlaceholder; import org.betonquest.betonquest.api.logger.BetonQuestLogger; import org.betonquest.betonquest.api.profile.Profile; -import org.betonquest.betonquest.exception.QuestException; +import org.betonquest.betonquest.api.quest.QuestException; import org.betonquest.betonquest.quest.registry.processor.VariableProcessor; import org.betonquest.betonquest.util.PlayerConverter; import org.bukkit.entity.Player; diff --git a/src/main/java/org/betonquest/betonquest/compatibility/holograms/holographicdisplays/HolographicDisplaysIntegrator.java b/src/main/java/org/betonquest/betonquest/compatibility/holograms/holographicdisplays/HolographicDisplaysIntegrator.java index 21ccfe13ce..b2bd4339b3 100644 --- a/src/main/java/org/betonquest/betonquest/compatibility/holograms/holographicdisplays/HolographicDisplaysIntegrator.java +++ b/src/main/java/org/betonquest/betonquest/compatibility/holograms/holographicdisplays/HolographicDisplaysIntegrator.java @@ -8,11 +8,11 @@ import org.betonquest.betonquest.api.config.quest.QuestPackage; import org.betonquest.betonquest.api.logger.BetonQuestLogger; import org.betonquest.betonquest.api.logger.BetonQuestLoggerFactory; +import org.betonquest.betonquest.api.quest.QuestException; import org.betonquest.betonquest.compatibility.holograms.BetonHologram; import org.betonquest.betonquest.compatibility.holograms.HologramIntegrator; import org.betonquest.betonquest.compatibility.holograms.HologramProvider; import org.betonquest.betonquest.exception.HookException; -import org.betonquest.betonquest.exception.QuestException; import org.betonquest.betonquest.instruction.Instruction; import org.bukkit.Bukkit; import org.bukkit.Location; diff --git a/src/main/java/org/betonquest/betonquest/compatibility/jobsreborn/ConditionCanLevel.java b/src/main/java/org/betonquest/betonquest/compatibility/jobsreborn/ConditionCanLevel.java index 9d2763438c..f30978e2cd 100644 --- a/src/main/java/org/betonquest/betonquest/compatibility/jobsreborn/ConditionCanLevel.java +++ b/src/main/java/org/betonquest/betonquest/compatibility/jobsreborn/ConditionCanLevel.java @@ -5,7 +5,7 @@ import com.gamingmesh.jobs.container.JobProgression; import org.betonquest.betonquest.api.Condition; import org.betonquest.betonquest.api.profile.Profile; -import org.betonquest.betonquest.exception.QuestException; +import org.betonquest.betonquest.api.quest.QuestException; import org.betonquest.betonquest.instruction.Instruction; import java.util.List; diff --git a/src/main/java/org/betonquest/betonquest/compatibility/jobsreborn/ConditionHasJob.java b/src/main/java/org/betonquest/betonquest/compatibility/jobsreborn/ConditionHasJob.java index 0f07ce4a11..993499275f 100644 --- a/src/main/java/org/betonquest/betonquest/compatibility/jobsreborn/ConditionHasJob.java +++ b/src/main/java/org/betonquest/betonquest/compatibility/jobsreborn/ConditionHasJob.java @@ -5,7 +5,7 @@ import com.gamingmesh.jobs.container.JobProgression; import org.betonquest.betonquest.api.Condition; import org.betonquest.betonquest.api.profile.Profile; -import org.betonquest.betonquest.exception.QuestException; +import org.betonquest.betonquest.api.quest.QuestException; import org.betonquest.betonquest.instruction.Instruction; import java.util.List; diff --git a/src/main/java/org/betonquest/betonquest/compatibility/jobsreborn/ConditionJobFull.java b/src/main/java/org/betonquest/betonquest/compatibility/jobsreborn/ConditionJobFull.java index 058fb640b6..bc24a80edc 100644 --- a/src/main/java/org/betonquest/betonquest/compatibility/jobsreborn/ConditionJobFull.java +++ b/src/main/java/org/betonquest/betonquest/compatibility/jobsreborn/ConditionJobFull.java @@ -4,7 +4,7 @@ import com.gamingmesh.jobs.container.Job; import org.betonquest.betonquest.api.Condition; import org.betonquest.betonquest.api.profile.Profile; -import org.betonquest.betonquest.exception.QuestException; +import org.betonquest.betonquest.api.quest.QuestException; import org.betonquest.betonquest.instruction.Instruction; @SuppressWarnings("PMD.CommentRequired") diff --git a/src/main/java/org/betonquest/betonquest/compatibility/jobsreborn/ConditionJobLevel.java b/src/main/java/org/betonquest/betonquest/compatibility/jobsreborn/ConditionJobLevel.java index 675a5dd207..9fcf32489b 100644 --- a/src/main/java/org/betonquest/betonquest/compatibility/jobsreborn/ConditionJobLevel.java +++ b/src/main/java/org/betonquest/betonquest/compatibility/jobsreborn/ConditionJobLevel.java @@ -5,7 +5,7 @@ import com.gamingmesh.jobs.container.JobProgression; import org.betonquest.betonquest.api.Condition; import org.betonquest.betonquest.api.profile.Profile; -import org.betonquest.betonquest.exception.QuestException; +import org.betonquest.betonquest.api.quest.QuestException; import org.betonquest.betonquest.instruction.Instruction; import java.util.List; diff --git a/src/main/java/org/betonquest/betonquest/compatibility/jobsreborn/EventAddExp.java b/src/main/java/org/betonquest/betonquest/compatibility/jobsreborn/EventAddExp.java index 44e04bb197..b351992805 100644 --- a/src/main/java/org/betonquest/betonquest/compatibility/jobsreborn/EventAddExp.java +++ b/src/main/java/org/betonquest/betonquest/compatibility/jobsreborn/EventAddExp.java @@ -5,7 +5,7 @@ import com.gamingmesh.jobs.container.JobProgression; import org.betonquest.betonquest.api.QuestEvent; import org.betonquest.betonquest.api.profile.Profile; -import org.betonquest.betonquest.exception.QuestException; +import org.betonquest.betonquest.api.quest.QuestException; import org.betonquest.betonquest.instruction.Instruction; import java.util.List; diff --git a/src/main/java/org/betonquest/betonquest/compatibility/jobsreborn/EventAddLevel.java b/src/main/java/org/betonquest/betonquest/compatibility/jobsreborn/EventAddLevel.java index 67e5d4ef49..af66ffc074 100644 --- a/src/main/java/org/betonquest/betonquest/compatibility/jobsreborn/EventAddLevel.java +++ b/src/main/java/org/betonquest/betonquest/compatibility/jobsreborn/EventAddLevel.java @@ -5,7 +5,7 @@ import com.gamingmesh.jobs.container.JobProgression; import org.betonquest.betonquest.api.QuestEvent; import org.betonquest.betonquest.api.profile.Profile; -import org.betonquest.betonquest.exception.QuestException; +import org.betonquest.betonquest.api.quest.QuestException; import org.betonquest.betonquest.instruction.Instruction; import java.util.List; diff --git a/src/main/java/org/betonquest/betonquest/compatibility/jobsreborn/EventDelLevel.java b/src/main/java/org/betonquest/betonquest/compatibility/jobsreborn/EventDelLevel.java index ba64b19c80..637543bf34 100644 --- a/src/main/java/org/betonquest/betonquest/compatibility/jobsreborn/EventDelLevel.java +++ b/src/main/java/org/betonquest/betonquest/compatibility/jobsreborn/EventDelLevel.java @@ -5,7 +5,7 @@ import com.gamingmesh.jobs.container.JobProgression; import org.betonquest.betonquest.api.QuestEvent; import org.betonquest.betonquest.api.profile.Profile; -import org.betonquest.betonquest.exception.QuestException; +import org.betonquest.betonquest.api.quest.QuestException; import org.betonquest.betonquest.instruction.Instruction; import java.util.List; diff --git a/src/main/java/org/betonquest/betonquest/compatibility/jobsreborn/EventJoinJob.java b/src/main/java/org/betonquest/betonquest/compatibility/jobsreborn/EventJoinJob.java index 53391ec9a2..589b6ae142 100644 --- a/src/main/java/org/betonquest/betonquest/compatibility/jobsreborn/EventJoinJob.java +++ b/src/main/java/org/betonquest/betonquest/compatibility/jobsreborn/EventJoinJob.java @@ -4,7 +4,7 @@ import com.gamingmesh.jobs.container.Job; import org.betonquest.betonquest.api.QuestEvent; import org.betonquest.betonquest.api.profile.Profile; -import org.betonquest.betonquest.exception.QuestException; +import org.betonquest.betonquest.api.quest.QuestException; import org.betonquest.betonquest.instruction.Instruction; @SuppressWarnings("PMD.CommentRequired") diff --git a/src/main/java/org/betonquest/betonquest/compatibility/jobsreborn/EventLeaveJob.java b/src/main/java/org/betonquest/betonquest/compatibility/jobsreborn/EventLeaveJob.java index 64742e668b..20558e321c 100644 --- a/src/main/java/org/betonquest/betonquest/compatibility/jobsreborn/EventLeaveJob.java +++ b/src/main/java/org/betonquest/betonquest/compatibility/jobsreborn/EventLeaveJob.java @@ -4,7 +4,7 @@ import com.gamingmesh.jobs.container.Job; import org.betonquest.betonquest.api.QuestEvent; import org.betonquest.betonquest.api.profile.Profile; -import org.betonquest.betonquest.exception.QuestException; +import org.betonquest.betonquest.api.quest.QuestException; import org.betonquest.betonquest.instruction.Instruction; @SuppressWarnings("PMD.CommentRequired") diff --git a/src/main/java/org/betonquest/betonquest/compatibility/jobsreborn/EventSetLevel.java b/src/main/java/org/betonquest/betonquest/compatibility/jobsreborn/EventSetLevel.java index d288feff1d..302886eba6 100644 --- a/src/main/java/org/betonquest/betonquest/compatibility/jobsreborn/EventSetLevel.java +++ b/src/main/java/org/betonquest/betonquest/compatibility/jobsreborn/EventSetLevel.java @@ -5,7 +5,7 @@ import com.gamingmesh.jobs.container.JobProgression; import org.betonquest.betonquest.api.QuestEvent; import org.betonquest.betonquest.api.profile.Profile; -import org.betonquest.betonquest.exception.QuestException; +import org.betonquest.betonquest.api.quest.QuestException; import org.betonquest.betonquest.instruction.Instruction; import java.util.List; diff --git a/src/main/java/org/betonquest/betonquest/compatibility/jobsreborn/ObjectiveJoinJob.java b/src/main/java/org/betonquest/betonquest/compatibility/jobsreborn/ObjectiveJoinJob.java index ee7052ab94..bea7e57bad 100644 --- a/src/main/java/org/betonquest/betonquest/compatibility/jobsreborn/ObjectiveJoinJob.java +++ b/src/main/java/org/betonquest/betonquest/compatibility/jobsreborn/ObjectiveJoinJob.java @@ -7,7 +7,7 @@ import org.betonquest.betonquest.api.Objective; import org.betonquest.betonquest.api.profile.OnlineProfile; import org.betonquest.betonquest.api.profile.Profile; -import org.betonquest.betonquest.exception.QuestException; +import org.betonquest.betonquest.api.quest.QuestException; import org.betonquest.betonquest.instruction.Instruction; import org.betonquest.betonquest.util.PlayerConverter; import org.bukkit.Bukkit; diff --git a/src/main/java/org/betonquest/betonquest/compatibility/jobsreborn/ObjectiveLeaveJob.java b/src/main/java/org/betonquest/betonquest/compatibility/jobsreborn/ObjectiveLeaveJob.java index c0b04a16f0..0ea60d83fc 100644 --- a/src/main/java/org/betonquest/betonquest/compatibility/jobsreborn/ObjectiveLeaveJob.java +++ b/src/main/java/org/betonquest/betonquest/compatibility/jobsreborn/ObjectiveLeaveJob.java @@ -7,7 +7,7 @@ import org.betonquest.betonquest.api.Objective; import org.betonquest.betonquest.api.profile.OnlineProfile; import org.betonquest.betonquest.api.profile.Profile; -import org.betonquest.betonquest.exception.QuestException; +import org.betonquest.betonquest.api.quest.QuestException; import org.betonquest.betonquest.instruction.Instruction; import org.betonquest.betonquest.util.PlayerConverter; import org.bukkit.Bukkit; diff --git a/src/main/java/org/betonquest/betonquest/compatibility/jobsreborn/ObjectiveLevelUpEvent.java b/src/main/java/org/betonquest/betonquest/compatibility/jobsreborn/ObjectiveLevelUpEvent.java index 070ac84cf9..ebd753bd2d 100644 --- a/src/main/java/org/betonquest/betonquest/compatibility/jobsreborn/ObjectiveLevelUpEvent.java +++ b/src/main/java/org/betonquest/betonquest/compatibility/jobsreborn/ObjectiveLevelUpEvent.java @@ -6,7 +6,7 @@ import org.betonquest.betonquest.BetonQuest; import org.betonquest.betonquest.api.Objective; import org.betonquest.betonquest.api.profile.Profile; -import org.betonquest.betonquest.exception.QuestException; +import org.betonquest.betonquest.api.quest.QuestException; import org.betonquest.betonquest.instruction.Instruction; import org.betonquest.betonquest.util.PlayerConverter; import org.bukkit.Bukkit; diff --git a/src/main/java/org/betonquest/betonquest/compatibility/jobsreborn/ObjectivePaymentEvent.java b/src/main/java/org/betonquest/betonquest/compatibility/jobsreborn/ObjectivePaymentEvent.java index 17e1c97fcd..4bb24c0e7d 100644 --- a/src/main/java/org/betonquest/betonquest/compatibility/jobsreborn/ObjectivePaymentEvent.java +++ b/src/main/java/org/betonquest/betonquest/compatibility/jobsreborn/ObjectivePaymentEvent.java @@ -5,7 +5,7 @@ import org.betonquest.betonquest.BetonQuest; import org.betonquest.betonquest.api.Objective; import org.betonquest.betonquest.api.profile.Profile; -import org.betonquest.betonquest.exception.QuestException; +import org.betonquest.betonquest.api.quest.QuestException; import org.betonquest.betonquest.instruction.Instruction; import org.betonquest.betonquest.instruction.argument.VariableArgument; import org.betonquest.betonquest.instruction.variable.VariableNumber; diff --git a/src/main/java/org/betonquest/betonquest/compatibility/luckperms/permission/LuckPermsEventFactory.java b/src/main/java/org/betonquest/betonquest/compatibility/luckperms/permission/LuckPermsEventFactory.java index f35ba802dc..df2983425e 100644 --- a/src/main/java/org/betonquest/betonquest/compatibility/luckperms/permission/LuckPermsEventFactory.java +++ b/src/main/java/org/betonquest/betonquest/compatibility/luckperms/permission/LuckPermsEventFactory.java @@ -2,9 +2,9 @@ import net.luckperms.api.LuckPerms; import net.luckperms.api.model.data.NodeMap; +import org.betonquest.betonquest.api.quest.QuestException; import org.betonquest.betonquest.api.quest.event.Event; import org.betonquest.betonquest.api.quest.event.EventFactory; -import org.betonquest.betonquest.exception.QuestException; import org.betonquest.betonquest.instruction.Instruction; import org.betonquest.betonquest.instruction.argument.VariableArgument; import org.betonquest.betonquest.instruction.variable.VariableNumber; diff --git a/src/main/java/org/betonquest/betonquest/compatibility/luckperms/permission/LuckPermsNodeBuilder.java b/src/main/java/org/betonquest/betonquest/compatibility/luckperms/permission/LuckPermsNodeBuilder.java index 2a1dbb225d..3080579813 100644 --- a/src/main/java/org/betonquest/betonquest/compatibility/luckperms/permission/LuckPermsNodeBuilder.java +++ b/src/main/java/org/betonquest/betonquest/compatibility/luckperms/permission/LuckPermsNodeBuilder.java @@ -3,7 +3,7 @@ import net.luckperms.api.context.MutableContextSet; import net.luckperms.api.node.Node; import org.betonquest.betonquest.api.profile.Profile; -import org.betonquest.betonquest.exception.QuestException; +import org.betonquest.betonquest.api.quest.QuestException; import org.betonquest.betonquest.instruction.variable.VariableNumber; import org.betonquest.betonquest.instruction.variable.VariableString; import org.jetbrains.annotations.NotNull; diff --git a/src/main/java/org/betonquest/betonquest/compatibility/luckperms/permission/LuckPermsPermissionEvent.java b/src/main/java/org/betonquest/betonquest/compatibility/luckperms/permission/LuckPermsPermissionEvent.java index ee9a12a5ba..dedf73360c 100644 --- a/src/main/java/org/betonquest/betonquest/compatibility/luckperms/permission/LuckPermsPermissionEvent.java +++ b/src/main/java/org/betonquest/betonquest/compatibility/luckperms/permission/LuckPermsPermissionEvent.java @@ -7,8 +7,8 @@ import net.luckperms.api.node.Node; import net.luckperms.api.node.types.PermissionNode; import org.betonquest.betonquest.api.profile.Profile; +import org.betonquest.betonquest.api.quest.QuestException; import org.betonquest.betonquest.api.quest.event.Event; -import org.betonquest.betonquest.exception.QuestException; import org.bukkit.OfflinePlayer; import java.util.List; diff --git a/src/main/java/org/betonquest/betonquest/compatibility/magic/WandCondition.java b/src/main/java/org/betonquest/betonquest/compatibility/magic/WandCondition.java index e4c7eeff80..2f51e56e11 100644 --- a/src/main/java/org/betonquest/betonquest/compatibility/magic/WandCondition.java +++ b/src/main/java/org/betonquest/betonquest/compatibility/magic/WandCondition.java @@ -6,7 +6,7 @@ import org.betonquest.betonquest.api.Condition; import org.betonquest.betonquest.api.config.quest.QuestPackage; import org.betonquest.betonquest.api.profile.Profile; -import org.betonquest.betonquest.exception.QuestException; +import org.betonquest.betonquest.api.quest.QuestException; import org.betonquest.betonquest.instruction.Instruction; import org.betonquest.betonquest.instruction.variable.VariableNumber; import org.betonquest.betonquest.util.Utils; diff --git a/src/main/java/org/betonquest/betonquest/compatibility/mcmmo/McMMOAddExpEvent.java b/src/main/java/org/betonquest/betonquest/compatibility/mcmmo/McMMOAddExpEvent.java index 786cea2493..d318951ff5 100644 --- a/src/main/java/org/betonquest/betonquest/compatibility/mcmmo/McMMOAddExpEvent.java +++ b/src/main/java/org/betonquest/betonquest/compatibility/mcmmo/McMMOAddExpEvent.java @@ -4,7 +4,7 @@ import com.gmail.nossr50.api.SkillAPI; import org.betonquest.betonquest.api.QuestEvent; import org.betonquest.betonquest.api.profile.Profile; -import org.betonquest.betonquest.exception.QuestException; +import org.betonquest.betonquest.api.quest.QuestException; import org.betonquest.betonquest.instruction.Instruction; import org.betonquest.betonquest.instruction.variable.VariableNumber; diff --git a/src/main/java/org/betonquest/betonquest/compatibility/mcmmo/McMMOSkillLevelCondition.java b/src/main/java/org/betonquest/betonquest/compatibility/mcmmo/McMMOSkillLevelCondition.java index 9c824cd1ed..3054f66657 100644 --- a/src/main/java/org/betonquest/betonquest/compatibility/mcmmo/McMMOSkillLevelCondition.java +++ b/src/main/java/org/betonquest/betonquest/compatibility/mcmmo/McMMOSkillLevelCondition.java @@ -5,7 +5,7 @@ import com.gmail.nossr50.datatypes.skills.PrimarySkillType; import org.betonquest.betonquest.api.Condition; import org.betonquest.betonquest.api.profile.Profile; -import org.betonquest.betonquest.exception.QuestException; +import org.betonquest.betonquest.api.quest.QuestException; import org.betonquest.betonquest.instruction.Instruction; import org.betonquest.betonquest.instruction.variable.VariableNumber; diff --git a/src/main/java/org/betonquest/betonquest/compatibility/mmogroup/mmocore/MMOCoreAttributeCondition.java b/src/main/java/org/betonquest/betonquest/compatibility/mmogroup/mmocore/MMOCoreAttributeCondition.java index 86624162c8..1efaf18a24 100644 --- a/src/main/java/org/betonquest/betonquest/compatibility/mmogroup/mmocore/MMOCoreAttributeCondition.java +++ b/src/main/java/org/betonquest/betonquest/compatibility/mmogroup/mmocore/MMOCoreAttributeCondition.java @@ -2,7 +2,7 @@ import org.betonquest.betonquest.api.Condition; import org.betonquest.betonquest.api.profile.Profile; -import org.betonquest.betonquest.exception.QuestException; +import org.betonquest.betonquest.api.quest.QuestException; import org.betonquest.betonquest.instruction.Instruction; import org.betonquest.betonquest.instruction.variable.VariableNumber; diff --git a/src/main/java/org/betonquest/betonquest/compatibility/mmogroup/mmocore/MMOCoreAttributePointsEvent.java b/src/main/java/org/betonquest/betonquest/compatibility/mmogroup/mmocore/MMOCoreAttributePointsEvent.java index 46adef1ae7..afde12bb99 100644 --- a/src/main/java/org/betonquest/betonquest/compatibility/mmogroup/mmocore/MMOCoreAttributePointsEvent.java +++ b/src/main/java/org/betonquest/betonquest/compatibility/mmogroup/mmocore/MMOCoreAttributePointsEvent.java @@ -3,7 +3,7 @@ import net.Indyuce.mmocore.api.player.PlayerData; import org.betonquest.betonquest.api.QuestEvent; import org.betonquest.betonquest.api.profile.Profile; -import org.betonquest.betonquest.exception.QuestException; +import org.betonquest.betonquest.api.quest.QuestException; import org.betonquest.betonquest.instruction.Instruction; import org.betonquest.betonquest.instruction.variable.VariableNumber; diff --git a/src/main/java/org/betonquest/betonquest/compatibility/mmogroup/mmocore/MMOCoreAttributeReallocationPointsEvent.java b/src/main/java/org/betonquest/betonquest/compatibility/mmogroup/mmocore/MMOCoreAttributeReallocationPointsEvent.java index 1112af44b2..3c5eceb88b 100644 --- a/src/main/java/org/betonquest/betonquest/compatibility/mmogroup/mmocore/MMOCoreAttributeReallocationPointsEvent.java +++ b/src/main/java/org/betonquest/betonquest/compatibility/mmogroup/mmocore/MMOCoreAttributeReallocationPointsEvent.java @@ -3,7 +3,7 @@ import net.Indyuce.mmocore.api.player.PlayerData; import org.betonquest.betonquest.api.QuestEvent; import org.betonquest.betonquest.api.profile.Profile; -import org.betonquest.betonquest.exception.QuestException; +import org.betonquest.betonquest.api.quest.QuestException; import org.betonquest.betonquest.instruction.Instruction; import org.betonquest.betonquest.instruction.variable.VariableNumber; diff --git a/src/main/java/org/betonquest/betonquest/compatibility/mmogroup/mmocore/MMOCoreBreakCustomBlockObjective.java b/src/main/java/org/betonquest/betonquest/compatibility/mmogroup/mmocore/MMOCoreBreakCustomBlockObjective.java index 5518b6bf93..4fda3be924 100644 --- a/src/main/java/org/betonquest/betonquest/compatibility/mmogroup/mmocore/MMOCoreBreakCustomBlockObjective.java +++ b/src/main/java/org/betonquest/betonquest/compatibility/mmogroup/mmocore/MMOCoreBreakCustomBlockObjective.java @@ -8,7 +8,7 @@ import org.betonquest.betonquest.BetonQuest; import org.betonquest.betonquest.api.CountingObjective; import org.betonquest.betonquest.api.profile.OnlineProfile; -import org.betonquest.betonquest.exception.QuestException; +import org.betonquest.betonquest.api.quest.QuestException; import org.betonquest.betonquest.instruction.Instruction; import org.betonquest.betonquest.instruction.argument.VariableArgument; import org.betonquest.betonquest.util.PlayerConverter; diff --git a/src/main/java/org/betonquest/betonquest/compatibility/mmogroup/mmocore/MMOCoreChangeClassObjective.java b/src/main/java/org/betonquest/betonquest/compatibility/mmogroup/mmocore/MMOCoreChangeClassObjective.java index e788656b92..1ab360cd2b 100644 --- a/src/main/java/org/betonquest/betonquest/compatibility/mmogroup/mmocore/MMOCoreChangeClassObjective.java +++ b/src/main/java/org/betonquest/betonquest/compatibility/mmogroup/mmocore/MMOCoreChangeClassObjective.java @@ -5,7 +5,7 @@ import org.betonquest.betonquest.api.Objective; import org.betonquest.betonquest.api.profile.OnlineProfile; import org.betonquest.betonquest.api.profile.Profile; -import org.betonquest.betonquest.exception.QuestException; +import org.betonquest.betonquest.api.quest.QuestException; import org.betonquest.betonquest.instruction.Instruction; import org.betonquest.betonquest.util.PlayerConverter; import org.bukkit.Bukkit; diff --git a/src/main/java/org/betonquest/betonquest/compatibility/mmogroup/mmocore/MMOCoreClassCondition.java b/src/main/java/org/betonquest/betonquest/compatibility/mmogroup/mmocore/MMOCoreClassCondition.java index 4eb87d877b..c2bc97e318 100644 --- a/src/main/java/org/betonquest/betonquest/compatibility/mmogroup/mmocore/MMOCoreClassCondition.java +++ b/src/main/java/org/betonquest/betonquest/compatibility/mmogroup/mmocore/MMOCoreClassCondition.java @@ -3,7 +3,7 @@ import net.Indyuce.mmocore.api.player.PlayerData; import org.betonquest.betonquest.api.Condition; import org.betonquest.betonquest.api.profile.Profile; -import org.betonquest.betonquest.exception.QuestException; +import org.betonquest.betonquest.api.quest.QuestException; import org.betonquest.betonquest.instruction.Instruction; import org.betonquest.betonquest.instruction.variable.VariableNumber; import org.jetbrains.annotations.Nullable; diff --git a/src/main/java/org/betonquest/betonquest/compatibility/mmogroup/mmocore/MMOCoreClassExperienceEvent.java b/src/main/java/org/betonquest/betonquest/compatibility/mmogroup/mmocore/MMOCoreClassExperienceEvent.java index f138fe424a..d8dd5c59ac 100644 --- a/src/main/java/org/betonquest/betonquest/compatibility/mmogroup/mmocore/MMOCoreClassExperienceEvent.java +++ b/src/main/java/org/betonquest/betonquest/compatibility/mmogroup/mmocore/MMOCoreClassExperienceEvent.java @@ -4,7 +4,7 @@ import net.Indyuce.mmocore.experience.EXPSource; import org.betonquest.betonquest.api.QuestEvent; import org.betonquest.betonquest.api.profile.Profile; -import org.betonquest.betonquest.exception.QuestException; +import org.betonquest.betonquest.api.quest.QuestException; import org.betonquest.betonquest.instruction.Instruction; import org.betonquest.betonquest.instruction.variable.VariableNumber; diff --git a/src/main/java/org/betonquest/betonquest/compatibility/mmogroup/mmocore/MMOCoreClassPointsEvent.java b/src/main/java/org/betonquest/betonquest/compatibility/mmogroup/mmocore/MMOCoreClassPointsEvent.java index c2086fed3e..ca0b0d895e 100644 --- a/src/main/java/org/betonquest/betonquest/compatibility/mmogroup/mmocore/MMOCoreClassPointsEvent.java +++ b/src/main/java/org/betonquest/betonquest/compatibility/mmogroup/mmocore/MMOCoreClassPointsEvent.java @@ -3,7 +3,7 @@ import net.Indyuce.mmocore.api.player.PlayerData; import org.betonquest.betonquest.api.QuestEvent; import org.betonquest.betonquest.api.profile.Profile; -import org.betonquest.betonquest.exception.QuestException; +import org.betonquest.betonquest.api.quest.QuestException; import org.betonquest.betonquest.instruction.Instruction; import org.betonquest.betonquest.instruction.variable.VariableNumber; diff --git a/src/main/java/org/betonquest/betonquest/compatibility/mmogroup/mmocore/MMOCoreProfessionExperienceEvent.java b/src/main/java/org/betonquest/betonquest/compatibility/mmogroup/mmocore/MMOCoreProfessionExperienceEvent.java index 08aae24717..33efe797b4 100644 --- a/src/main/java/org/betonquest/betonquest/compatibility/mmogroup/mmocore/MMOCoreProfessionExperienceEvent.java +++ b/src/main/java/org/betonquest/betonquest/compatibility/mmogroup/mmocore/MMOCoreProfessionExperienceEvent.java @@ -6,7 +6,7 @@ import net.Indyuce.mmocore.experience.Profession; import org.betonquest.betonquest.api.QuestEvent; import org.betonquest.betonquest.api.profile.Profile; -import org.betonquest.betonquest.exception.QuestException; +import org.betonquest.betonquest.api.quest.QuestException; import org.betonquest.betonquest.instruction.Instruction; import org.betonquest.betonquest.instruction.variable.VariableNumber; diff --git a/src/main/java/org/betonquest/betonquest/compatibility/mmogroup/mmocore/MMOCoreProfessionLevelCondition.java b/src/main/java/org/betonquest/betonquest/compatibility/mmogroup/mmocore/MMOCoreProfessionLevelCondition.java index e4cc719359..0a37e2d8c2 100644 --- a/src/main/java/org/betonquest/betonquest/compatibility/mmogroup/mmocore/MMOCoreProfessionLevelCondition.java +++ b/src/main/java/org/betonquest/betonquest/compatibility/mmogroup/mmocore/MMOCoreProfessionLevelCondition.java @@ -3,7 +3,7 @@ import net.Indyuce.mmocore.api.player.PlayerData; import org.betonquest.betonquest.api.Condition; import org.betonquest.betonquest.api.profile.Profile; -import org.betonquest.betonquest.exception.QuestException; +import org.betonquest.betonquest.api.quest.QuestException; import org.betonquest.betonquest.instruction.Instruction; import org.betonquest.betonquest.instruction.variable.VariableNumber; diff --git a/src/main/java/org/betonquest/betonquest/compatibility/mmogroup/mmocore/MMOCoreProfessionObjective.java b/src/main/java/org/betonquest/betonquest/compatibility/mmogroup/mmocore/MMOCoreProfessionObjective.java index c68e927d26..0e12e436db 100644 --- a/src/main/java/org/betonquest/betonquest/compatibility/mmogroup/mmocore/MMOCoreProfessionObjective.java +++ b/src/main/java/org/betonquest/betonquest/compatibility/mmogroup/mmocore/MMOCoreProfessionObjective.java @@ -6,7 +6,7 @@ import org.betonquest.betonquest.api.Objective; import org.betonquest.betonquest.api.profile.OnlineProfile; import org.betonquest.betonquest.api.profile.Profile; -import org.betonquest.betonquest.exception.QuestException; +import org.betonquest.betonquest.api.quest.QuestException; import org.betonquest.betonquest.instruction.Instruction; import org.betonquest.betonquest.instruction.variable.VariableNumber; import org.betonquest.betonquest.util.PlayerConverter; diff --git a/src/main/java/org/betonquest/betonquest/compatibility/mmogroup/mmocore/MMOCoreSkillPointsEvent.java b/src/main/java/org/betonquest/betonquest/compatibility/mmogroup/mmocore/MMOCoreSkillPointsEvent.java index e6bb1033cb..3e2056bf78 100644 --- a/src/main/java/org/betonquest/betonquest/compatibility/mmogroup/mmocore/MMOCoreSkillPointsEvent.java +++ b/src/main/java/org/betonquest/betonquest/compatibility/mmogroup/mmocore/MMOCoreSkillPointsEvent.java @@ -3,7 +3,7 @@ import net.Indyuce.mmocore.api.player.PlayerData; import org.betonquest.betonquest.api.QuestEvent; import org.betonquest.betonquest.api.profile.Profile; -import org.betonquest.betonquest.exception.QuestException; +import org.betonquest.betonquest.api.quest.QuestException; import org.betonquest.betonquest.instruction.Instruction; import org.betonquest.betonquest.instruction.variable.VariableNumber; diff --git a/src/main/java/org/betonquest/betonquest/compatibility/mmogroup/mmocore/MMOCoreUtils.java b/src/main/java/org/betonquest/betonquest/compatibility/mmogroup/mmocore/MMOCoreUtils.java index ba6c4a37dc..a936e86032 100644 --- a/src/main/java/org/betonquest/betonquest/compatibility/mmogroup/mmocore/MMOCoreUtils.java +++ b/src/main/java/org/betonquest/betonquest/compatibility/mmogroup/mmocore/MMOCoreUtils.java @@ -3,7 +3,7 @@ import net.Indyuce.mmocore.api.player.PlayerData; import net.Indyuce.mmocore.api.player.attribute.PlayerAttribute; import net.Indyuce.mmocore.api.player.attribute.PlayerAttributes; -import org.betonquest.betonquest.exception.QuestException; +import org.betonquest.betonquest.api.quest.QuestException; import org.bukkit.Bukkit; import org.bukkit.configuration.Configuration; import org.bukkit.configuration.file.YamlConfiguration; diff --git a/src/main/java/org/betonquest/betonquest/compatibility/mmogroup/mmoitems/MMOItemsApplyGemObjective.java b/src/main/java/org/betonquest/betonquest/compatibility/mmogroup/mmoitems/MMOItemsApplyGemObjective.java index e5e997da30..ef45e2d87c 100644 --- a/src/main/java/org/betonquest/betonquest/compatibility/mmogroup/mmoitems/MMOItemsApplyGemObjective.java +++ b/src/main/java/org/betonquest/betonquest/compatibility/mmogroup/mmoitems/MMOItemsApplyGemObjective.java @@ -6,7 +6,7 @@ import org.betonquest.betonquest.api.Objective; import org.betonquest.betonquest.api.profile.OnlineProfile; import org.betonquest.betonquest.api.profile.Profile; -import org.betonquest.betonquest.exception.QuestException; +import org.betonquest.betonquest.api.quest.QuestException; import org.betonquest.betonquest.instruction.Instruction; import org.betonquest.betonquest.util.PlayerConverter; import org.bukkit.Bukkit; diff --git a/src/main/java/org/betonquest/betonquest/compatibility/mmogroup/mmoitems/MMOItemsCraftObjective.java b/src/main/java/org/betonquest/betonquest/compatibility/mmogroup/mmoitems/MMOItemsCraftObjective.java index b985af4751..77bdacf0c0 100644 --- a/src/main/java/org/betonquest/betonquest/compatibility/mmogroup/mmoitems/MMOItemsCraftObjective.java +++ b/src/main/java/org/betonquest/betonquest/compatibility/mmogroup/mmoitems/MMOItemsCraftObjective.java @@ -10,7 +10,7 @@ import org.betonquest.betonquest.BetonQuest; import org.betonquest.betonquest.api.CountingObjective; import org.betonquest.betonquest.api.profile.OnlineProfile; -import org.betonquest.betonquest.exception.QuestException; +import org.betonquest.betonquest.api.quest.QuestException; import org.betonquest.betonquest.instruction.Instruction; import org.betonquest.betonquest.instruction.argument.VariableArgument; import org.betonquest.betonquest.util.PlayerConverter; diff --git a/src/main/java/org/betonquest/betonquest/compatibility/mmogroup/mmoitems/MMOItemsGiveEvent.java b/src/main/java/org/betonquest/betonquest/compatibility/mmogroup/mmoitems/MMOItemsGiveEvent.java index d697aa18c1..29e72487ab 100644 --- a/src/main/java/org/betonquest/betonquest/compatibility/mmogroup/mmoitems/MMOItemsGiveEvent.java +++ b/src/main/java/org/betonquest/betonquest/compatibility/mmogroup/mmoitems/MMOItemsGiveEvent.java @@ -7,8 +7,8 @@ import org.betonquest.betonquest.api.QuestEvent; import org.betonquest.betonquest.api.logger.BetonQuestLogger; import org.betonquest.betonquest.api.profile.Profile; +import org.betonquest.betonquest.api.quest.QuestException; import org.betonquest.betonquest.config.Config; -import org.betonquest.betonquest.exception.QuestException; import org.betonquest.betonquest.instruction.Instruction; import org.betonquest.betonquest.instruction.variable.VariableNumber; import org.betonquest.betonquest.util.Utils; diff --git a/src/main/java/org/betonquest/betonquest/compatibility/mmogroup/mmoitems/MMOItemsHandCondition.java b/src/main/java/org/betonquest/betonquest/compatibility/mmogroup/mmoitems/MMOItemsHandCondition.java index 25b8d6f5ff..2ecda6400e 100644 --- a/src/main/java/org/betonquest/betonquest/compatibility/mmogroup/mmoitems/MMOItemsHandCondition.java +++ b/src/main/java/org/betonquest/betonquest/compatibility/mmogroup/mmoitems/MMOItemsHandCondition.java @@ -4,7 +4,7 @@ import net.Indyuce.mmoitems.api.Type; import org.betonquest.betonquest.api.Condition; import org.betonquest.betonquest.api.profile.Profile; -import org.betonquest.betonquest.exception.QuestException; +import org.betonquest.betonquest.api.quest.QuestException; import org.betonquest.betonquest.instruction.Instruction; import org.betonquest.betonquest.instruction.variable.VariableNumber; import org.bukkit.inventory.ItemStack; diff --git a/src/main/java/org/betonquest/betonquest/compatibility/mmogroup/mmoitems/MMOItemsItemCondition.java b/src/main/java/org/betonquest/betonquest/compatibility/mmogroup/mmoitems/MMOItemsItemCondition.java index 467340f00d..5455d8409e 100644 --- a/src/main/java/org/betonquest/betonquest/compatibility/mmogroup/mmoitems/MMOItemsItemCondition.java +++ b/src/main/java/org/betonquest/betonquest/compatibility/mmogroup/mmoitems/MMOItemsItemCondition.java @@ -5,7 +5,7 @@ import org.betonquest.betonquest.api.Condition; import org.betonquest.betonquest.api.profile.OnlineProfile; import org.betonquest.betonquest.api.profile.Profile; -import org.betonquest.betonquest.exception.QuestException; +import org.betonquest.betonquest.api.quest.QuestException; import org.betonquest.betonquest.instruction.Instruction; import org.betonquest.betonquest.instruction.variable.VariableNumber; import org.bukkit.inventory.ItemStack; diff --git a/src/main/java/org/betonquest/betonquest/compatibility/mmogroup/mmoitems/MMOItemsUpgradeObjective.java b/src/main/java/org/betonquest/betonquest/compatibility/mmogroup/mmoitems/MMOItemsUpgradeObjective.java index 57536d752c..27e7c3caf0 100644 --- a/src/main/java/org/betonquest/betonquest/compatibility/mmogroup/mmoitems/MMOItemsUpgradeObjective.java +++ b/src/main/java/org/betonquest/betonquest/compatibility/mmogroup/mmoitems/MMOItemsUpgradeObjective.java @@ -6,7 +6,7 @@ import org.betonquest.betonquest.api.Objective; import org.betonquest.betonquest.api.profile.OnlineProfile; import org.betonquest.betonquest.api.profile.Profile; -import org.betonquest.betonquest.exception.QuestException; +import org.betonquest.betonquest.api.quest.QuestException; import org.betonquest.betonquest.instruction.Instruction; import org.betonquest.betonquest.util.PlayerConverter; import org.bukkit.Bukkit; diff --git a/src/main/java/org/betonquest/betonquest/compatibility/mmogroup/mmoitems/MMOItemsUtils.java b/src/main/java/org/betonquest/betonquest/compatibility/mmogroup/mmoitems/MMOItemsUtils.java index 97340358e3..4271f14083 100644 --- a/src/main/java/org/betonquest/betonquest/compatibility/mmogroup/mmoitems/MMOItemsUtils.java +++ b/src/main/java/org/betonquest/betonquest/compatibility/mmogroup/mmoitems/MMOItemsUtils.java @@ -5,7 +5,7 @@ import net.Indyuce.mmoitems.api.Type; import net.Indyuce.mmoitems.api.item.mmoitem.MMOItem; import net.Indyuce.mmoitems.manager.ItemManager; -import org.betonquest.betonquest.exception.QuestException; +import org.betonquest.betonquest.api.quest.QuestException; import org.betonquest.betonquest.util.Utils; import org.bukkit.inventory.ItemStack; import org.jetbrains.annotations.Nullable; diff --git a/src/main/java/org/betonquest/betonquest/compatibility/mmogroup/mmoitems/take/MMOItemsTakeEvent.java b/src/main/java/org/betonquest/betonquest/compatibility/mmogroup/mmoitems/take/MMOItemsTakeEvent.java index 52225de99f..32e50c574b 100644 --- a/src/main/java/org/betonquest/betonquest/compatibility/mmogroup/mmoitems/take/MMOItemsTakeEvent.java +++ b/src/main/java/org/betonquest/betonquest/compatibility/mmogroup/mmoitems/take/MMOItemsTakeEvent.java @@ -3,8 +3,8 @@ import net.Indyuce.mmoitems.api.Type; import org.betonquest.betonquest.api.profile.OnlineProfile; import org.betonquest.betonquest.api.profile.Profile; +import org.betonquest.betonquest.api.quest.QuestException; import org.betonquest.betonquest.compatibility.mmogroup.mmoitems.MMOItemsUtils; -import org.betonquest.betonquest.exception.QuestException; import org.betonquest.betonquest.instruction.variable.VariableNumber; import org.betonquest.betonquest.quest.event.NotificationSender; import org.betonquest.betonquest.quest.event.take.AbstractTakeEvent; diff --git a/src/main/java/org/betonquest/betonquest/compatibility/mmogroup/mmoitems/take/MMOItemsTakeEventFactory.java b/src/main/java/org/betonquest/betonquest/compatibility/mmogroup/mmoitems/take/MMOItemsTakeEventFactory.java index 1983c2882b..b7c6c5acb1 100644 --- a/src/main/java/org/betonquest/betonquest/compatibility/mmogroup/mmoitems/take/MMOItemsTakeEventFactory.java +++ b/src/main/java/org/betonquest/betonquest/compatibility/mmogroup/mmoitems/take/MMOItemsTakeEventFactory.java @@ -3,10 +3,10 @@ import net.Indyuce.mmoitems.api.Type; import org.betonquest.betonquest.api.logger.BetonQuestLogger; import org.betonquest.betonquest.api.logger.BetonQuestLoggerFactory; +import org.betonquest.betonquest.api.quest.QuestException; import org.betonquest.betonquest.api.quest.event.Event; import org.betonquest.betonquest.api.quest.event.online.OnlineEventAdapter; import org.betonquest.betonquest.compatibility.mmogroup.mmoitems.MMOItemsUtils; -import org.betonquest.betonquest.exception.QuestException; import org.betonquest.betonquest.instruction.Instruction; import org.betonquest.betonquest.instruction.variable.VariableNumber; import org.betonquest.betonquest.quest.event.NotificationSender; diff --git a/src/main/java/org/betonquest/betonquest/compatibility/mmogroup/mmolib/MythicLibSkillObjective.java b/src/main/java/org/betonquest/betonquest/compatibility/mmogroup/mmolib/MythicLibSkillObjective.java index 2574a5082d..eeb64a3eb2 100644 --- a/src/main/java/org/betonquest/betonquest/compatibility/mmogroup/mmolib/MythicLibSkillObjective.java +++ b/src/main/java/org/betonquest/betonquest/compatibility/mmogroup/mmolib/MythicLibSkillObjective.java @@ -6,7 +6,7 @@ import org.betonquest.betonquest.api.Objective; import org.betonquest.betonquest.api.profile.OnlineProfile; import org.betonquest.betonquest.api.profile.Profile; -import org.betonquest.betonquest.exception.QuestException; +import org.betonquest.betonquest.api.quest.QuestException; import org.betonquest.betonquest.instruction.Instruction; import org.betonquest.betonquest.util.PlayerConverter; import org.bukkit.Bukkit; diff --git a/src/main/java/org/betonquest/betonquest/compatibility/mmogroup/mmolib/MythicLibStatCondition.java b/src/main/java/org/betonquest/betonquest/compatibility/mmogroup/mmolib/MythicLibStatCondition.java index 25c7732a06..896bfea189 100644 --- a/src/main/java/org/betonquest/betonquest/compatibility/mmogroup/mmolib/MythicLibStatCondition.java +++ b/src/main/java/org/betonquest/betonquest/compatibility/mmogroup/mmolib/MythicLibStatCondition.java @@ -3,7 +3,7 @@ import io.lumine.mythic.lib.api.player.MMOPlayerData; import org.betonquest.betonquest.api.Condition; import org.betonquest.betonquest.api.profile.Profile; -import org.betonquest.betonquest.exception.QuestException; +import org.betonquest.betonquest.api.quest.QuestException; import org.betonquest.betonquest.instruction.Instruction; /** diff --git a/src/main/java/org/betonquest/betonquest/compatibility/mythicmobs/MythicMobKillObjective.java b/src/main/java/org/betonquest/betonquest/compatibility/mythicmobs/MythicMobKillObjective.java index 4e13566aae..d2e2385d93 100644 --- a/src/main/java/org/betonquest/betonquest/compatibility/mythicmobs/MythicMobKillObjective.java +++ b/src/main/java/org/betonquest/betonquest/compatibility/mythicmobs/MythicMobKillObjective.java @@ -6,7 +6,7 @@ import org.betonquest.betonquest.BetonQuest; import org.betonquest.betonquest.api.CountingObjective; import org.betonquest.betonquest.api.profile.OnlineProfile; -import org.betonquest.betonquest.exception.QuestException; +import org.betonquest.betonquest.api.quest.QuestException; import org.betonquest.betonquest.instruction.Instruction; import org.betonquest.betonquest.instruction.argument.VariableArgument; import org.betonquest.betonquest.instruction.variable.VariableNumber; diff --git a/src/main/java/org/betonquest/betonquest/compatibility/mythicmobs/conditions/MythicMobDistanceCondition.java b/src/main/java/org/betonquest/betonquest/compatibility/mythicmobs/conditions/MythicMobDistanceCondition.java index c7d32f914e..3329d14663 100644 --- a/src/main/java/org/betonquest/betonquest/compatibility/mythicmobs/conditions/MythicMobDistanceCondition.java +++ b/src/main/java/org/betonquest/betonquest/compatibility/mythicmobs/conditions/MythicMobDistanceCondition.java @@ -2,8 +2,8 @@ import io.lumine.mythic.bukkit.BukkitAPIHelper; import org.betonquest.betonquest.api.profile.Profile; +import org.betonquest.betonquest.api.quest.QuestException; import org.betonquest.betonquest.api.quest.condition.PlayerCondition; -import org.betonquest.betonquest.exception.QuestException; import org.betonquest.betonquest.instruction.variable.VariableNumber; import org.bukkit.entity.Player; diff --git a/src/main/java/org/betonquest/betonquest/compatibility/mythicmobs/conditions/MythicMobDistanceConditionFactory.java b/src/main/java/org/betonquest/betonquest/compatibility/mythicmobs/conditions/MythicMobDistanceConditionFactory.java index 43e65b8772..54c8f63ad9 100644 --- a/src/main/java/org/betonquest/betonquest/compatibility/mythicmobs/conditions/MythicMobDistanceConditionFactory.java +++ b/src/main/java/org/betonquest/betonquest/compatibility/mythicmobs/conditions/MythicMobDistanceConditionFactory.java @@ -1,9 +1,9 @@ package org.betonquest.betonquest.compatibility.mythicmobs.conditions; import io.lumine.mythic.bukkit.BukkitAPIHelper; +import org.betonquest.betonquest.api.quest.QuestException; import org.betonquest.betonquest.api.quest.condition.PlayerCondition; import org.betonquest.betonquest.api.quest.condition.PlayerConditionFactory; -import org.betonquest.betonquest.exception.QuestException; import org.betonquest.betonquest.instruction.Instruction; import org.betonquest.betonquest.instruction.variable.VariableNumber; import org.betonquest.betonquest.quest.PrimaryServerThreadData; diff --git a/src/main/java/org/betonquest/betonquest/compatibility/mythicmobs/events/MythicSpawnMobEvent.java b/src/main/java/org/betonquest/betonquest/compatibility/mythicmobs/events/MythicSpawnMobEvent.java index 94f7a72b54..444d7c3c29 100644 --- a/src/main/java/org/betonquest/betonquest/compatibility/mythicmobs/events/MythicSpawnMobEvent.java +++ b/src/main/java/org/betonquest/betonquest/compatibility/mythicmobs/events/MythicSpawnMobEvent.java @@ -6,10 +6,10 @@ import io.lumine.mythic.core.mobs.ActiveMob; import org.betonquest.betonquest.BetonQuest; import org.betonquest.betonquest.api.profile.Profile; +import org.betonquest.betonquest.api.quest.QuestException; import org.betonquest.betonquest.api.quest.event.Event; import org.betonquest.betonquest.api.quest.event.StaticEvent; import org.betonquest.betonquest.compatibility.protocollib.hider.MythicHider; -import org.betonquest.betonquest.exception.QuestException; import org.betonquest.betonquest.instruction.variable.VariableNumber; import org.betonquest.betonquest.instruction.variable.VariableString; import org.betonquest.betonquest.instruction.variable.location.VariableLocation; diff --git a/src/main/java/org/betonquest/betonquest/compatibility/mythicmobs/events/MythicSpawnMobEventFactory.java b/src/main/java/org/betonquest/betonquest/compatibility/mythicmobs/events/MythicSpawnMobEventFactory.java index 326015e8af..4b55eb4ae3 100644 --- a/src/main/java/org/betonquest/betonquest/compatibility/mythicmobs/events/MythicSpawnMobEventFactory.java +++ b/src/main/java/org/betonquest/betonquest/compatibility/mythicmobs/events/MythicSpawnMobEventFactory.java @@ -1,12 +1,12 @@ package org.betonquest.betonquest.compatibility.mythicmobs.events; import io.lumine.mythic.bukkit.BukkitAPIHelper; +import org.betonquest.betonquest.api.quest.QuestException; import org.betonquest.betonquest.api.quest.event.Event; import org.betonquest.betonquest.api.quest.event.EventFactory; import org.betonquest.betonquest.api.quest.event.StaticEvent; import org.betonquest.betonquest.api.quest.event.StaticEventFactory; import org.betonquest.betonquest.compatibility.Compatibility; -import org.betonquest.betonquest.exception.QuestException; import org.betonquest.betonquest.instruction.Instruction; import org.betonquest.betonquest.instruction.argument.VariableArgument; import org.betonquest.betonquest.instruction.variable.VariableNumber; diff --git a/src/main/java/org/betonquest/betonquest/compatibility/placeholderapi/BetonQuestPlaceholder.java b/src/main/java/org/betonquest/betonquest/compatibility/placeholderapi/BetonQuestPlaceholder.java index a3c48baacb..f472d67776 100644 --- a/src/main/java/org/betonquest/betonquest/compatibility/placeholderapi/BetonQuestPlaceholder.java +++ b/src/main/java/org/betonquest/betonquest/compatibility/placeholderapi/BetonQuestPlaceholder.java @@ -4,7 +4,7 @@ import me.clip.placeholderapi.expansion.PlaceholderExpansion; import org.betonquest.betonquest.api.logger.BetonQuestLogger; import org.betonquest.betonquest.api.profile.Profile; -import org.betonquest.betonquest.exception.QuestException; +import org.betonquest.betonquest.api.quest.QuestException; import org.betonquest.betonquest.quest.registry.processor.VariableProcessor; import org.betonquest.betonquest.util.PlayerConverter; import org.bukkit.entity.Player; diff --git a/src/main/java/org/betonquest/betonquest/compatibility/protocollib/FreezeEvent.java b/src/main/java/org/betonquest/betonquest/compatibility/protocollib/FreezeEvent.java index 3af9adfcb0..01824cc6fb 100644 --- a/src/main/java/org/betonquest/betonquest/compatibility/protocollib/FreezeEvent.java +++ b/src/main/java/org/betonquest/betonquest/compatibility/protocollib/FreezeEvent.java @@ -7,7 +7,7 @@ import org.betonquest.betonquest.api.QuestEvent; import org.betonquest.betonquest.api.profile.OnlineProfile; import org.betonquest.betonquest.api.profile.Profile; -import org.betonquest.betonquest.exception.QuestException; +import org.betonquest.betonquest.api.quest.QuestException; import org.betonquest.betonquest.instruction.Instruction; import org.betonquest.betonquest.instruction.variable.VariableNumber; import org.bukkit.Bukkit; diff --git a/src/main/java/org/betonquest/betonquest/compatibility/protocollib/hider/UpdateVisibilityNowEvent.java b/src/main/java/org/betonquest/betonquest/compatibility/protocollib/hider/UpdateVisibilityNowEvent.java index 0ed324ec69..5fef68836d 100644 --- a/src/main/java/org/betonquest/betonquest/compatibility/protocollib/hider/UpdateVisibilityNowEvent.java +++ b/src/main/java/org/betonquest/betonquest/compatibility/protocollib/hider/UpdateVisibilityNowEvent.java @@ -2,7 +2,7 @@ import org.betonquest.betonquest.api.QuestEvent; import org.betonquest.betonquest.api.profile.Profile; -import org.betonquest.betonquest.exception.QuestException; +import org.betonquest.betonquest.api.quest.QuestException; import org.betonquest.betonquest.instruction.Instruction; @SuppressWarnings("PMD.CommentRequired") diff --git a/src/main/java/org/betonquest/betonquest/compatibility/quests/QuestsCondition.java b/src/main/java/org/betonquest/betonquest/compatibility/quests/QuestsCondition.java index e990847908..cd6f0b594d 100644 --- a/src/main/java/org/betonquest/betonquest/compatibility/quests/QuestsCondition.java +++ b/src/main/java/org/betonquest/betonquest/compatibility/quests/QuestsCondition.java @@ -3,7 +3,7 @@ import me.pikamug.quests.quests.Quest; import org.betonquest.betonquest.api.Condition; import org.betonquest.betonquest.api.profile.Profile; -import org.betonquest.betonquest.exception.QuestException; +import org.betonquest.betonquest.api.quest.QuestException; import org.betonquest.betonquest.instruction.Instruction; import java.util.Set; diff --git a/src/main/java/org/betonquest/betonquest/compatibility/quests/QuestsEvent.java b/src/main/java/org/betonquest/betonquest/compatibility/quests/QuestsEvent.java index 233d103481..c1a293644c 100644 --- a/src/main/java/org/betonquest/betonquest/compatibility/quests/QuestsEvent.java +++ b/src/main/java/org/betonquest/betonquest/compatibility/quests/QuestsEvent.java @@ -5,7 +5,7 @@ import org.betonquest.betonquest.api.QuestEvent; import org.betonquest.betonquest.api.logger.BetonQuestLogger; import org.betonquest.betonquest.api.profile.Profile; -import org.betonquest.betonquest.exception.QuestException; +import org.betonquest.betonquest.api.quest.QuestException; import org.betonquest.betonquest.instruction.Instruction; /** diff --git a/src/main/java/org/betonquest/betonquest/compatibility/shopkeepers/HavingShopCondition.java b/src/main/java/org/betonquest/betonquest/compatibility/shopkeepers/HavingShopCondition.java index b897b81ccf..82218e0edf 100644 --- a/src/main/java/org/betonquest/betonquest/compatibility/shopkeepers/HavingShopCondition.java +++ b/src/main/java/org/betonquest/betonquest/compatibility/shopkeepers/HavingShopCondition.java @@ -5,7 +5,7 @@ import com.nisovin.shopkeepers.api.shopkeeper.player.PlayerShopkeeper; import org.betonquest.betonquest.api.Condition; import org.betonquest.betonquest.api.profile.Profile; -import org.betonquest.betonquest.exception.QuestException; +import org.betonquest.betonquest.api.quest.QuestException; import org.betonquest.betonquest.instruction.Instruction; import org.betonquest.betonquest.instruction.variable.VariableNumber; diff --git a/src/main/java/org/betonquest/betonquest/compatibility/shopkeepers/OpenShopEvent.java b/src/main/java/org/betonquest/betonquest/compatibility/shopkeepers/OpenShopEvent.java index ee19623ee5..2c58919a05 100644 --- a/src/main/java/org/betonquest/betonquest/compatibility/shopkeepers/OpenShopEvent.java +++ b/src/main/java/org/betonquest/betonquest/compatibility/shopkeepers/OpenShopEvent.java @@ -4,7 +4,7 @@ import com.nisovin.shopkeepers.api.shopkeeper.Shopkeeper; import org.betonquest.betonquest.api.QuestEvent; import org.betonquest.betonquest.api.profile.Profile; -import org.betonquest.betonquest.exception.QuestException; +import org.betonquest.betonquest.api.quest.QuestException; import org.betonquest.betonquest.instruction.Instruction; import org.betonquest.betonquest.util.Utils; diff --git a/src/main/java/org/betonquest/betonquest/compatibility/skript/BQEventSkript.java b/src/main/java/org/betonquest/betonquest/compatibility/skript/BQEventSkript.java index 6ae6a1e806..a9d7b7ca65 100644 --- a/src/main/java/org/betonquest/betonquest/compatibility/skript/BQEventSkript.java +++ b/src/main/java/org/betonquest/betonquest/compatibility/skript/BQEventSkript.java @@ -3,7 +3,7 @@ import org.betonquest.betonquest.api.QuestEvent; import org.betonquest.betonquest.api.bukkit.event.ProfileEvent; import org.betonquest.betonquest.api.profile.Profile; -import org.betonquest.betonquest.exception.QuestException; +import org.betonquest.betonquest.api.quest.QuestException; import org.betonquest.betonquest.instruction.Instruction; import org.bukkit.Bukkit; import org.bukkit.event.HandlerList; diff --git a/src/main/java/org/betonquest/betonquest/compatibility/traincarts/TrainCartsUtils.java b/src/main/java/org/betonquest/betonquest/compatibility/traincarts/TrainCartsUtils.java index df875975f8..eb8bffbd7c 100644 --- a/src/main/java/org/betonquest/betonquest/compatibility/traincarts/TrainCartsUtils.java +++ b/src/main/java/org/betonquest/betonquest/compatibility/traincarts/TrainCartsUtils.java @@ -5,7 +5,7 @@ import org.betonquest.betonquest.api.config.quest.QuestPackage; import org.betonquest.betonquest.api.logger.BetonQuestLogger; import org.betonquest.betonquest.api.profile.OnlineProfile; -import org.betonquest.betonquest.exception.QuestException; +import org.betonquest.betonquest.api.quest.QuestException; import org.betonquest.betonquest.id.ID; import org.betonquest.betonquest.instruction.variable.VariableString; import org.bukkit.entity.Entity; diff --git a/src/main/java/org/betonquest/betonquest/compatibility/traincarts/conditions/TrainCartsRideCondition.java b/src/main/java/org/betonquest/betonquest/compatibility/traincarts/conditions/TrainCartsRideCondition.java index c16d52e896..691ad2917c 100644 --- a/src/main/java/org/betonquest/betonquest/compatibility/traincarts/conditions/TrainCartsRideCondition.java +++ b/src/main/java/org/betonquest/betonquest/compatibility/traincarts/conditions/TrainCartsRideCondition.java @@ -1,9 +1,9 @@ package org.betonquest.betonquest.compatibility.traincarts.conditions; import org.betonquest.betonquest.api.profile.OnlineProfile; +import org.betonquest.betonquest.api.quest.QuestException; import org.betonquest.betonquest.api.quest.condition.online.OnlineCondition; import org.betonquest.betonquest.compatibility.traincarts.TrainCartsUtils; -import org.betonquest.betonquest.exception.QuestException; /** * The TrainCarts ride condition checks if a player is currently riding a train from TrainCarts. diff --git a/src/main/java/org/betonquest/betonquest/compatibility/traincarts/conditions/TrainCartsRideConditionFactory.java b/src/main/java/org/betonquest/betonquest/compatibility/traincarts/conditions/TrainCartsRideConditionFactory.java index 8639ce4363..843ab36f9b 100644 --- a/src/main/java/org/betonquest/betonquest/compatibility/traincarts/conditions/TrainCartsRideConditionFactory.java +++ b/src/main/java/org/betonquest/betonquest/compatibility/traincarts/conditions/TrainCartsRideConditionFactory.java @@ -2,10 +2,10 @@ import org.betonquest.betonquest.api.logger.BetonQuestLogger; import org.betonquest.betonquest.api.logger.BetonQuestLoggerFactory; +import org.betonquest.betonquest.api.quest.QuestException; import org.betonquest.betonquest.api.quest.condition.PlayerCondition; import org.betonquest.betonquest.api.quest.condition.PlayerConditionFactory; import org.betonquest.betonquest.api.quest.condition.online.OnlineConditionAdapter; -import org.betonquest.betonquest.exception.QuestException; import org.betonquest.betonquest.instruction.Instruction; import org.betonquest.betonquest.quest.PrimaryServerThreadData; import org.betonquest.betonquest.quest.condition.PrimaryServerThreadPlayerCondition; diff --git a/src/main/java/org/betonquest/betonquest/compatibility/traincarts/objectives/TrainCartsExitObjective.java b/src/main/java/org/betonquest/betonquest/compatibility/traincarts/objectives/TrainCartsExitObjective.java index 9cada6869d..bed3b3d1b3 100644 --- a/src/main/java/org/betonquest/betonquest/compatibility/traincarts/objectives/TrainCartsExitObjective.java +++ b/src/main/java/org/betonquest/betonquest/compatibility/traincarts/objectives/TrainCartsExitObjective.java @@ -6,8 +6,8 @@ import org.betonquest.betonquest.api.logger.BetonQuestLogger; import org.betonquest.betonquest.api.profile.OnlineProfile; import org.betonquest.betonquest.api.profile.Profile; +import org.betonquest.betonquest.api.quest.QuestException; import org.betonquest.betonquest.compatibility.traincarts.TrainCartsUtils; -import org.betonquest.betonquest.exception.QuestException; import org.betonquest.betonquest.instruction.Instruction; import org.betonquest.betonquest.instruction.variable.VariableString; import org.betonquest.betonquest.util.PlayerConverter; diff --git a/src/main/java/org/betonquest/betonquest/compatibility/traincarts/objectives/TrainCartsLocationObjective.java b/src/main/java/org/betonquest/betonquest/compatibility/traincarts/objectives/TrainCartsLocationObjective.java index 024714f3c3..c731d3df43 100644 --- a/src/main/java/org/betonquest/betonquest/compatibility/traincarts/objectives/TrainCartsLocationObjective.java +++ b/src/main/java/org/betonquest/betonquest/compatibility/traincarts/objectives/TrainCartsLocationObjective.java @@ -3,8 +3,8 @@ import org.betonquest.betonquest.BetonQuest; import org.betonquest.betonquest.api.profile.OnlineProfile; import org.betonquest.betonquest.api.profile.Profile; +import org.betonquest.betonquest.api.quest.QuestException; import org.betonquest.betonquest.compatibility.traincarts.TrainCartsUtils; -import org.betonquest.betonquest.exception.QuestException; import org.betonquest.betonquest.instruction.Instruction; import org.betonquest.betonquest.instruction.argument.VariableArgument; import org.betonquest.betonquest.instruction.variable.VariableNumber; diff --git a/src/main/java/org/betonquest/betonquest/compatibility/traincarts/objectives/TrainCartsRideObjective.java b/src/main/java/org/betonquest/betonquest/compatibility/traincarts/objectives/TrainCartsRideObjective.java index 2dd4e863b0..3d3e35acd1 100644 --- a/src/main/java/org/betonquest/betonquest/compatibility/traincarts/objectives/TrainCartsRideObjective.java +++ b/src/main/java/org/betonquest/betonquest/compatibility/traincarts/objectives/TrainCartsRideObjective.java @@ -8,8 +8,8 @@ import org.betonquest.betonquest.api.logger.BetonQuestLogger; import org.betonquest.betonquest.api.profile.OnlineProfile; import org.betonquest.betonquest.api.profile.Profile; +import org.betonquest.betonquest.api.quest.QuestException; import org.betonquest.betonquest.compatibility.traincarts.TrainCartsUtils; -import org.betonquest.betonquest.exception.QuestException; import org.betonquest.betonquest.instruction.Instruction; import org.betonquest.betonquest.instruction.argument.VariableArgument; import org.betonquest.betonquest.instruction.variable.VariableString; diff --git a/src/main/java/org/betonquest/betonquest/compatibility/vault/condition/MoneyCondition.java b/src/main/java/org/betonquest/betonquest/compatibility/vault/condition/MoneyCondition.java index f1cb1f2d75..97f2142cce 100644 --- a/src/main/java/org/betonquest/betonquest/compatibility/vault/condition/MoneyCondition.java +++ b/src/main/java/org/betonquest/betonquest/compatibility/vault/condition/MoneyCondition.java @@ -2,8 +2,8 @@ import net.milkbowl.vault.economy.Economy; import org.betonquest.betonquest.api.profile.Profile; +import org.betonquest.betonquest.api.quest.QuestException; import org.betonquest.betonquest.api.quest.condition.PlayerCondition; -import org.betonquest.betonquest.exception.QuestException; import org.betonquest.betonquest.instruction.variable.VariableNumber; /** diff --git a/src/main/java/org/betonquest/betonquest/compatibility/vault/condition/MoneyConditionFactory.java b/src/main/java/org/betonquest/betonquest/compatibility/vault/condition/MoneyConditionFactory.java index 8ec29473b2..b0d8506a70 100644 --- a/src/main/java/org/betonquest/betonquest/compatibility/vault/condition/MoneyConditionFactory.java +++ b/src/main/java/org/betonquest/betonquest/compatibility/vault/condition/MoneyConditionFactory.java @@ -1,9 +1,9 @@ package org.betonquest.betonquest.compatibility.vault.condition; import net.milkbowl.vault.economy.Economy; +import org.betonquest.betonquest.api.quest.QuestException; import org.betonquest.betonquest.api.quest.condition.PlayerCondition; import org.betonquest.betonquest.api.quest.condition.PlayerConditionFactory; -import org.betonquest.betonquest.exception.QuestException; import org.betonquest.betonquest.instruction.Instruction; import org.betonquest.betonquest.instruction.argument.VariableArgument; import org.betonquest.betonquest.instruction.variable.VariableNumber; diff --git a/src/main/java/org/betonquest/betonquest/compatibility/vault/event/MoneyEvent.java b/src/main/java/org/betonquest/betonquest/compatibility/vault/event/MoneyEvent.java index 29cd12045d..363580a71a 100644 --- a/src/main/java/org/betonquest/betonquest/compatibility/vault/event/MoneyEvent.java +++ b/src/main/java/org/betonquest/betonquest/compatibility/vault/event/MoneyEvent.java @@ -2,8 +2,8 @@ import net.milkbowl.vault.economy.Economy; import org.betonquest.betonquest.api.profile.Profile; +import org.betonquest.betonquest.api.quest.QuestException; import org.betonquest.betonquest.api.quest.event.Event; -import org.betonquest.betonquest.exception.QuestException; import org.betonquest.betonquest.instruction.variable.VariableNumber; import org.betonquest.betonquest.quest.event.IngameNotificationSender; import org.bukkit.OfflinePlayer; diff --git a/src/main/java/org/betonquest/betonquest/compatibility/vault/event/MoneyEventFactory.java b/src/main/java/org/betonquest/betonquest/compatibility/vault/event/MoneyEventFactory.java index fa2381dbf3..359e4d6e0c 100644 --- a/src/main/java/org/betonquest/betonquest/compatibility/vault/event/MoneyEventFactory.java +++ b/src/main/java/org/betonquest/betonquest/compatibility/vault/event/MoneyEventFactory.java @@ -4,9 +4,9 @@ import org.betonquest.betonquest.api.config.quest.QuestPackage; import org.betonquest.betonquest.api.logger.BetonQuestLogger; import org.betonquest.betonquest.api.logger.BetonQuestLoggerFactory; +import org.betonquest.betonquest.api.quest.QuestException; import org.betonquest.betonquest.api.quest.event.Event; import org.betonquest.betonquest.api.quest.event.EventFactory; -import org.betonquest.betonquest.exception.QuestException; import org.betonquest.betonquest.instruction.Instruction; import org.betonquest.betonquest.instruction.variable.VariableNumber; import org.betonquest.betonquest.quest.PrimaryServerThreadData; diff --git a/src/main/java/org/betonquest/betonquest/compatibility/vault/event/PermissionEvent.java b/src/main/java/org/betonquest/betonquest/compatibility/vault/event/PermissionEvent.java index b8704a73c9..f8c6207b12 100644 --- a/src/main/java/org/betonquest/betonquest/compatibility/vault/event/PermissionEvent.java +++ b/src/main/java/org/betonquest/betonquest/compatibility/vault/event/PermissionEvent.java @@ -2,8 +2,8 @@ import net.milkbowl.vault.permission.Permission; import org.betonquest.betonquest.api.profile.Profile; +import org.betonquest.betonquest.api.quest.QuestException; import org.betonquest.betonquest.api.quest.event.Event; -import org.betonquest.betonquest.exception.QuestException; import org.jetbrains.annotations.Nullable; /** diff --git a/src/main/java/org/betonquest/betonquest/compatibility/vault/event/PermissionEventFactory.java b/src/main/java/org/betonquest/betonquest/compatibility/vault/event/PermissionEventFactory.java index 75367d77f1..a18d2063e5 100644 --- a/src/main/java/org/betonquest/betonquest/compatibility/vault/event/PermissionEventFactory.java +++ b/src/main/java/org/betonquest/betonquest/compatibility/vault/event/PermissionEventFactory.java @@ -1,9 +1,9 @@ package org.betonquest.betonquest.compatibility.vault.event; import net.milkbowl.vault.permission.Permission; +import org.betonquest.betonquest.api.quest.QuestException; import org.betonquest.betonquest.api.quest.event.Event; import org.betonquest.betonquest.api.quest.event.EventFactory; -import org.betonquest.betonquest.exception.QuestException; import org.betonquest.betonquest.instruction.Instruction; import org.betonquest.betonquest.quest.PrimaryServerThreadData; import org.betonquest.betonquest.quest.event.PrimaryServerThreadEvent; diff --git a/src/main/java/org/betonquest/betonquest/compatibility/vault/variable/MoneyVariable.java b/src/main/java/org/betonquest/betonquest/compatibility/vault/variable/MoneyVariable.java index 9e18a01be2..cebfd5d962 100644 --- a/src/main/java/org/betonquest/betonquest/compatibility/vault/variable/MoneyVariable.java +++ b/src/main/java/org/betonquest/betonquest/compatibility/vault/variable/MoneyVariable.java @@ -2,8 +2,8 @@ import org.betonquest.betonquest.api.common.function.QuestFunction; import org.betonquest.betonquest.api.profile.Profile; +import org.betonquest.betonquest.api.quest.QuestException; import org.betonquest.betonquest.api.quest.variable.PlayerVariable; -import org.betonquest.betonquest.exception.QuestException; /** * Resolves to amount of money. diff --git a/src/main/java/org/betonquest/betonquest/compatibility/vault/variable/MoneyVariableFactory.java b/src/main/java/org/betonquest/betonquest/compatibility/vault/variable/MoneyVariableFactory.java index 52bf28b113..a3a7983adb 100644 --- a/src/main/java/org/betonquest/betonquest/compatibility/vault/variable/MoneyVariableFactory.java +++ b/src/main/java/org/betonquest/betonquest/compatibility/vault/variable/MoneyVariableFactory.java @@ -3,9 +3,9 @@ import net.milkbowl.vault.economy.Economy; import org.betonquest.betonquest.api.common.function.QuestFunction; import org.betonquest.betonquest.api.profile.Profile; +import org.betonquest.betonquest.api.quest.QuestException; import org.betonquest.betonquest.api.quest.variable.PlayerVariable; import org.betonquest.betonquest.api.quest.variable.PlayerVariableFactory; -import org.betonquest.betonquest.exception.QuestException; import org.betonquest.betonquest.instruction.Instruction; import org.betonquest.betonquest.instruction.variable.VariableNumber; diff --git a/src/main/java/org/betonquest/betonquest/compatibility/worldedit/PasteSchematicEvent.java b/src/main/java/org/betonquest/betonquest/compatibility/worldedit/PasteSchematicEvent.java index f1c99a7874..48fcd399f4 100644 --- a/src/main/java/org/betonquest/betonquest/compatibility/worldedit/PasteSchematicEvent.java +++ b/src/main/java/org/betonquest/betonquest/compatibility/worldedit/PasteSchematicEvent.java @@ -17,7 +17,7 @@ import org.betonquest.betonquest.api.QuestEvent; import org.betonquest.betonquest.api.logger.BetonQuestLogger; import org.betonquest.betonquest.api.profile.Profile; -import org.betonquest.betonquest.exception.QuestException; +import org.betonquest.betonquest.api.quest.QuestException; import org.betonquest.betonquest.instruction.Instruction; import org.betonquest.betonquest.instruction.variable.VariableNumber; import org.betonquest.betonquest.instruction.variable.location.VariableLocation; diff --git a/src/main/java/org/betonquest/betonquest/compatibility/worldguard/RegionCondition.java b/src/main/java/org/betonquest/betonquest/compatibility/worldguard/RegionCondition.java index 6232ac2b9d..f6e6648077 100644 --- a/src/main/java/org/betonquest/betonquest/compatibility/worldguard/RegionCondition.java +++ b/src/main/java/org/betonquest/betonquest/compatibility/worldguard/RegionCondition.java @@ -2,7 +2,7 @@ import org.betonquest.betonquest.api.Condition; import org.betonquest.betonquest.api.profile.Profile; -import org.betonquest.betonquest.exception.QuestException; +import org.betonquest.betonquest.api.quest.QuestException; import org.betonquest.betonquest.instruction.Instruction; /** diff --git a/src/main/java/org/betonquest/betonquest/compatibility/worldguard/RegionObjective.java b/src/main/java/org/betonquest/betonquest/compatibility/worldguard/RegionObjective.java index d41639e126..8e4ce348f8 100644 --- a/src/main/java/org/betonquest/betonquest/compatibility/worldguard/RegionObjective.java +++ b/src/main/java/org/betonquest/betonquest/compatibility/worldguard/RegionObjective.java @@ -3,7 +3,7 @@ import org.betonquest.betonquest.BetonQuest; import org.betonquest.betonquest.api.profile.OnlineProfile; import org.betonquest.betonquest.api.profile.Profile; -import org.betonquest.betonquest.exception.QuestException; +import org.betonquest.betonquest.api.quest.QuestException; import org.betonquest.betonquest.instruction.Instruction; import org.betonquest.betonquest.instruction.variable.VariableString; import org.betonquest.betonquest.objective.AbstractLocationObjective; diff --git a/src/main/java/org/betonquest/betonquest/config/Config.java b/src/main/java/org/betonquest/betonquest/config/Config.java index 6ff399daea..2a775642d3 100644 --- a/src/main/java/org/betonquest/betonquest/config/Config.java +++ b/src/main/java/org/betonquest/betonquest/config/Config.java @@ -10,8 +10,8 @@ import org.betonquest.betonquest.api.logger.BetonQuestLogger; import org.betonquest.betonquest.api.logger.BetonQuestLoggerFactory; import org.betonquest.betonquest.api.profile.OnlineProfile; +import org.betonquest.betonquest.api.quest.QuestException; import org.betonquest.betonquest.database.PlayerData; -import org.betonquest.betonquest.exception.QuestException; import org.betonquest.betonquest.instruction.variable.VariableString; import org.betonquest.betonquest.notify.Notify; import org.bukkit.ChatColor; diff --git a/src/main/java/org/betonquest/betonquest/config/QuestCanceler.java b/src/main/java/org/betonquest/betonquest/config/QuestCanceler.java index 4f3a1e98fd..bd1023d2b4 100644 --- a/src/main/java/org/betonquest/betonquest/config/QuestCanceler.java +++ b/src/main/java/org/betonquest/betonquest/config/QuestCanceler.java @@ -7,9 +7,9 @@ import org.betonquest.betonquest.api.logger.BetonQuestLogger; import org.betonquest.betonquest.api.profile.OnlineProfile; import org.betonquest.betonquest.api.profile.Profile; +import org.betonquest.betonquest.api.quest.QuestException; import org.betonquest.betonquest.database.PlayerData; import org.betonquest.betonquest.exception.ObjectNotFoundException; -import org.betonquest.betonquest.exception.QuestException; import org.betonquest.betonquest.id.ConditionID; import org.betonquest.betonquest.id.EventID; import org.betonquest.betonquest.id.ID; diff --git a/src/main/java/org/betonquest/betonquest/conversation/Conversation.java b/src/main/java/org/betonquest/betonquest/conversation/Conversation.java index fb41d5b79f..a06417ac32 100644 --- a/src/main/java/org/betonquest/betonquest/conversation/Conversation.java +++ b/src/main/java/org/betonquest/betonquest/conversation/Conversation.java @@ -11,12 +11,12 @@ import org.betonquest.betonquest.api.logger.BetonQuestLogger; import org.betonquest.betonquest.api.profile.OnlineProfile; import org.betonquest.betonquest.api.profile.Profile; +import org.betonquest.betonquest.api.quest.QuestException; import org.betonquest.betonquest.config.Config; import org.betonquest.betonquest.conversation.ConversationData.OptionType; import org.betonquest.betonquest.database.Saver.Record; import org.betonquest.betonquest.database.UpdateType; import org.betonquest.betonquest.exception.ObjectNotFoundException; -import org.betonquest.betonquest.exception.QuestException; import org.betonquest.betonquest.id.ConditionID; import org.betonquest.betonquest.id.ConversationID; import org.betonquest.betonquest.id.EventID; diff --git a/src/main/java/org/betonquest/betonquest/conversation/ConversationData.java b/src/main/java/org/betonquest/betonquest/conversation/ConversationData.java index ddd55c59fa..63adb9c4e6 100644 --- a/src/main/java/org/betonquest/betonquest/conversation/ConversationData.java +++ b/src/main/java/org/betonquest/betonquest/conversation/ConversationData.java @@ -5,9 +5,9 @@ import org.betonquest.betonquest.api.config.quest.QuestPackage; import org.betonquest.betonquest.api.logger.BetonQuestLogger; import org.betonquest.betonquest.api.profile.Profile; +import org.betonquest.betonquest.api.quest.QuestException; import org.betonquest.betonquest.config.Config; import org.betonquest.betonquest.exception.ObjectNotFoundException; -import org.betonquest.betonquest.exception.QuestException; import org.betonquest.betonquest.id.ConditionID; import org.betonquest.betonquest.id.ConversationID; import org.betonquest.betonquest.id.EventID; diff --git a/src/main/java/org/betonquest/betonquest/conversation/ConversationOptionResolver.java b/src/main/java/org/betonquest/betonquest/conversation/ConversationOptionResolver.java index 85f62b8a7e..a199f8bba2 100644 --- a/src/main/java/org/betonquest/betonquest/conversation/ConversationOptionResolver.java +++ b/src/main/java/org/betonquest/betonquest/conversation/ConversationOptionResolver.java @@ -2,8 +2,8 @@ import org.betonquest.betonquest.BetonQuest; import org.betonquest.betonquest.api.config.quest.QuestPackage; +import org.betonquest.betonquest.api.quest.QuestException; import org.betonquest.betonquest.exception.ObjectNotFoundException; -import org.betonquest.betonquest.exception.QuestException; import org.betonquest.betonquest.id.ConversationID; import org.jetbrains.annotations.Nullable; diff --git a/src/main/java/org/betonquest/betonquest/conversation/SimpleInterceptor.java b/src/main/java/org/betonquest/betonquest/conversation/SimpleInterceptor.java index 9c251c8d1c..61005650a1 100644 --- a/src/main/java/org/betonquest/betonquest/conversation/SimpleInterceptor.java +++ b/src/main/java/org/betonquest/betonquest/conversation/SimpleInterceptor.java @@ -4,7 +4,7 @@ import net.md_5.bungee.api.chat.TextComponent; import org.betonquest.betonquest.BetonQuest; import org.betonquest.betonquest.api.profile.OnlineProfile; -import org.betonquest.betonquest.exception.QuestException; +import org.betonquest.betonquest.api.quest.QuestException; import org.bukkit.Bukkit; import org.bukkit.entity.Player; import org.bukkit.event.EventHandler; diff --git a/src/main/java/org/betonquest/betonquest/database/PlayerData.java b/src/main/java/org/betonquest/betonquest/database/PlayerData.java index a8239df6e9..214a06288e 100644 --- a/src/main/java/org/betonquest/betonquest/database/PlayerData.java +++ b/src/main/java/org/betonquest/betonquest/database/PlayerData.java @@ -11,11 +11,11 @@ import org.betonquest.betonquest.api.bukkit.event.PlayerUpdatePointEvent; import org.betonquest.betonquest.api.logger.BetonQuestLogger; import org.betonquest.betonquest.api.profile.Profile; +import org.betonquest.betonquest.api.quest.QuestException; import org.betonquest.betonquest.config.Config; import org.betonquest.betonquest.conversation.PlayerConversationState; import org.betonquest.betonquest.database.Saver.Record; import org.betonquest.betonquest.exception.ObjectNotFoundException; -import org.betonquest.betonquest.exception.QuestException; import org.betonquest.betonquest.id.ObjectiveID; import org.betonquest.betonquest.item.QuestItem; import org.bukkit.inventory.ItemStack; diff --git a/src/main/java/org/betonquest/betonquest/instruction/Instruction.java b/src/main/java/org/betonquest/betonquest/instruction/Instruction.java index bd6f89a768..b4cae931c5 100644 --- a/src/main/java/org/betonquest/betonquest/instruction/Instruction.java +++ b/src/main/java/org/betonquest/betonquest/instruction/Instruction.java @@ -3,8 +3,8 @@ import org.betonquest.betonquest.BetonQuest; import org.betonquest.betonquest.api.config.quest.QuestPackage; import org.betonquest.betonquest.api.logger.BetonQuestLogger; +import org.betonquest.betonquest.api.quest.QuestException; import org.betonquest.betonquest.exception.ObjectNotFoundException; -import org.betonquest.betonquest.exception.QuestException; import org.betonquest.betonquest.id.ID; import org.betonquest.betonquest.id.ItemID; import org.betonquest.betonquest.id.NoID; diff --git a/src/main/java/org/betonquest/betonquest/instruction/Item.java b/src/main/java/org/betonquest/betonquest/instruction/Item.java index b6a5ff8da5..462d327f3d 100644 --- a/src/main/java/org/betonquest/betonquest/instruction/Item.java +++ b/src/main/java/org/betonquest/betonquest/instruction/Item.java @@ -1,7 +1,7 @@ package org.betonquest.betonquest.instruction; import org.betonquest.betonquest.api.profile.Profile; -import org.betonquest.betonquest.exception.QuestException; +import org.betonquest.betonquest.api.quest.QuestException; import org.betonquest.betonquest.id.ItemID; import org.betonquest.betonquest.instruction.variable.VariableNumber; import org.betonquest.betonquest.item.QuestItem; diff --git a/src/main/java/org/betonquest/betonquest/instruction/argument/Argument.java b/src/main/java/org/betonquest/betonquest/instruction/argument/Argument.java index 0a67d82b5f..9e03a7cfb2 100644 --- a/src/main/java/org/betonquest/betonquest/instruction/argument/Argument.java +++ b/src/main/java/org/betonquest/betonquest/instruction/argument/Argument.java @@ -1,7 +1,7 @@ package org.betonquest.betonquest.instruction.argument; import org.betonquest.betonquest.api.common.function.QuestFunction; -import org.betonquest.betonquest.exception.QuestException; +import org.betonquest.betonquest.api.quest.QuestException; /** * Objectified parser for the Instruction to get a {@link T} from string. diff --git a/src/main/java/org/betonquest/betonquest/instruction/argument/VariableArgument.java b/src/main/java/org/betonquest/betonquest/instruction/argument/VariableArgument.java index a8450503a2..8d94c871f1 100644 --- a/src/main/java/org/betonquest/betonquest/instruction/argument/VariableArgument.java +++ b/src/main/java/org/betonquest/betonquest/instruction/argument/VariableArgument.java @@ -1,7 +1,7 @@ package org.betonquest.betonquest.instruction.argument; import org.betonquest.betonquest.api.config.quest.QuestPackage; -import org.betonquest.betonquest.exception.QuestException; +import org.betonquest.betonquest.api.quest.QuestException; import org.betonquest.betonquest.instruction.variable.VariableNumber; import org.betonquest.betonquest.instruction.variable.VariableString; import org.betonquest.betonquest.quest.registry.processor.VariableProcessor; diff --git a/src/main/java/org/betonquest/betonquest/instruction/argument/parser/ArgumentParser.java b/src/main/java/org/betonquest/betonquest/instruction/argument/parser/ArgumentParser.java index 2641c6405d..24d30d99b8 100644 --- a/src/main/java/org/betonquest/betonquest/instruction/argument/parser/ArgumentParser.java +++ b/src/main/java/org/betonquest/betonquest/instruction/argument/parser/ArgumentParser.java @@ -1,6 +1,6 @@ package org.betonquest.betonquest.instruction.argument.parser; -import org.betonquest.betonquest.exception.QuestException; +import org.betonquest.betonquest.api.quest.QuestException; import org.betonquest.betonquest.instruction.argument.Argument; import org.betonquest.betonquest.instruction.argument.VariableArgument; import org.jetbrains.annotations.Contract; diff --git a/src/main/java/org/betonquest/betonquest/instruction/argument/parser/CollectionParser.java b/src/main/java/org/betonquest/betonquest/instruction/argument/parser/CollectionParser.java index 8fce5f4523..3c6af98d67 100644 --- a/src/main/java/org/betonquest/betonquest/instruction/argument/parser/CollectionParser.java +++ b/src/main/java/org/betonquest/betonquest/instruction/argument/parser/CollectionParser.java @@ -1,6 +1,6 @@ package org.betonquest.betonquest.instruction.argument.parser; -import org.betonquest.betonquest.exception.QuestException; +import org.betonquest.betonquest.api.quest.QuestException; import org.betonquest.betonquest.instruction.argument.Argument; import org.betonquest.betonquest.instruction.argument.VariableArgument; import org.jetbrains.annotations.Nullable; diff --git a/src/main/java/org/betonquest/betonquest/instruction/argument/parser/EnumParser.java b/src/main/java/org/betonquest/betonquest/instruction/argument/parser/EnumParser.java index f48b175e8c..b89a0094fd 100644 --- a/src/main/java/org/betonquest/betonquest/instruction/argument/parser/EnumParser.java +++ b/src/main/java/org/betonquest/betonquest/instruction/argument/parser/EnumParser.java @@ -1,6 +1,6 @@ package org.betonquest.betonquest.instruction.argument.parser; -import org.betonquest.betonquest.exception.QuestException; +import org.betonquest.betonquest.api.quest.QuestException; import org.jetbrains.annotations.Contract; import org.jetbrains.annotations.Nullable; diff --git a/src/main/java/org/betonquest/betonquest/instruction/argument/parser/IDParser.java b/src/main/java/org/betonquest/betonquest/instruction/argument/parser/IDParser.java index dd79bd4087..cd16a0ed2f 100644 --- a/src/main/java/org/betonquest/betonquest/instruction/argument/parser/IDParser.java +++ b/src/main/java/org/betonquest/betonquest/instruction/argument/parser/IDParser.java @@ -1,6 +1,6 @@ package org.betonquest.betonquest.instruction.argument.parser; -import org.betonquest.betonquest.exception.QuestException; +import org.betonquest.betonquest.api.quest.QuestException; import org.betonquest.betonquest.id.ID; import org.betonquest.betonquest.instruction.argument.IDArgument; import org.jetbrains.annotations.Contract; diff --git a/src/main/java/org/betonquest/betonquest/instruction/argument/parser/ItemParser.java b/src/main/java/org/betonquest/betonquest/instruction/argument/parser/ItemParser.java index 74cc99f2db..fd80d5851f 100644 --- a/src/main/java/org/betonquest/betonquest/instruction/argument/parser/ItemParser.java +++ b/src/main/java/org/betonquest/betonquest/instruction/argument/parser/ItemParser.java @@ -1,6 +1,6 @@ package org.betonquest.betonquest.instruction.argument.parser; -import org.betonquest.betonquest.exception.QuestException; +import org.betonquest.betonquest.api.quest.QuestException; import org.betonquest.betonquest.id.ItemID; import org.betonquest.betonquest.instruction.Item; import org.betonquest.betonquest.item.QuestItem; diff --git a/src/main/java/org/betonquest/betonquest/instruction/argument/parser/NumberParser.java b/src/main/java/org/betonquest/betonquest/instruction/argument/parser/NumberParser.java index dc2c8dd258..df84cc9ea1 100644 --- a/src/main/java/org/betonquest/betonquest/instruction/argument/parser/NumberParser.java +++ b/src/main/java/org/betonquest/betonquest/instruction/argument/parser/NumberParser.java @@ -1,6 +1,6 @@ package org.betonquest.betonquest.instruction.argument.parser; -import org.betonquest.betonquest.exception.QuestException; +import org.betonquest.betonquest.api.quest.QuestException; import org.betonquest.betonquest.instruction.argument.Argument; import org.jetbrains.annotations.Nullable; diff --git a/src/main/java/org/betonquest/betonquest/instruction/argument/parser/Parser.java b/src/main/java/org/betonquest/betonquest/instruction/argument/parser/Parser.java index 48491ee70b..10cd3556b1 100644 --- a/src/main/java/org/betonquest/betonquest/instruction/argument/parser/Parser.java +++ b/src/main/java/org/betonquest/betonquest/instruction/argument/parser/Parser.java @@ -1,7 +1,7 @@ package org.betonquest.betonquest.instruction.argument.parser; import org.apache.commons.lang3.StringUtils; -import org.betonquest.betonquest.exception.QuestException; +import org.betonquest.betonquest.api.quest.QuestException; import org.jetbrains.annotations.Contract; import org.jetbrains.annotations.Nullable; diff --git a/src/main/java/org/betonquest/betonquest/instruction/variable/Variable.java b/src/main/java/org/betonquest/betonquest/instruction/variable/Variable.java index f00abbad56..efe0c0a03d 100644 --- a/src/main/java/org/betonquest/betonquest/instruction/variable/Variable.java +++ b/src/main/java/org/betonquest/betonquest/instruction/variable/Variable.java @@ -3,7 +3,7 @@ import org.betonquest.betonquest.api.common.function.QuestFunction; import org.betonquest.betonquest.api.config.quest.QuestPackage; import org.betonquest.betonquest.api.profile.Profile; -import org.betonquest.betonquest.exception.QuestException; +import org.betonquest.betonquest.api.quest.QuestException; import org.betonquest.betonquest.quest.registry.processor.VariableProcessor; import org.jetbrains.annotations.Nullable; diff --git a/src/main/java/org/betonquest/betonquest/instruction/variable/VariableNumber.java b/src/main/java/org/betonquest/betonquest/instruction/variable/VariableNumber.java index 92e9d471b0..5a982fa123 100644 --- a/src/main/java/org/betonquest/betonquest/instruction/variable/VariableNumber.java +++ b/src/main/java/org/betonquest/betonquest/instruction/variable/VariableNumber.java @@ -3,7 +3,7 @@ import org.betonquest.betonquest.BetonQuest; import org.betonquest.betonquest.api.config.quest.QuestPackage; import org.betonquest.betonquest.api.profile.Profile; -import org.betonquest.betonquest.exception.QuestException; +import org.betonquest.betonquest.api.quest.QuestException; import org.betonquest.betonquest.quest.registry.processor.VariableProcessor; import org.jetbrains.annotations.Nullable; diff --git a/src/main/java/org/betonquest/betonquest/instruction/variable/VariableString.java b/src/main/java/org/betonquest/betonquest/instruction/variable/VariableString.java index df50d7ce55..4aa2af39b9 100644 --- a/src/main/java/org/betonquest/betonquest/instruction/variable/VariableString.java +++ b/src/main/java/org/betonquest/betonquest/instruction/variable/VariableString.java @@ -3,7 +3,7 @@ import org.betonquest.betonquest.BetonQuest; import org.betonquest.betonquest.api.config.quest.QuestPackage; import org.betonquest.betonquest.api.profile.Profile; -import org.betonquest.betonquest.exception.QuestException; +import org.betonquest.betonquest.api.quest.QuestException; import org.betonquest.betonquest.quest.registry.processor.VariableProcessor; import org.jetbrains.annotations.Nullable; diff --git a/src/main/java/org/betonquest/betonquest/instruction/variable/location/VariableLocation.java b/src/main/java/org/betonquest/betonquest/instruction/variable/location/VariableLocation.java index 838f3d0134..e669b7d4f3 100644 --- a/src/main/java/org/betonquest/betonquest/instruction/variable/location/VariableLocation.java +++ b/src/main/java/org/betonquest/betonquest/instruction/variable/location/VariableLocation.java @@ -2,7 +2,7 @@ import org.betonquest.betonquest.api.config.quest.QuestPackage; import org.betonquest.betonquest.api.profile.Profile; -import org.betonquest.betonquest.exception.QuestException; +import org.betonquest.betonquest.api.quest.QuestException; import org.betonquest.betonquest.instruction.variable.Variable; import org.betonquest.betonquest.quest.registry.processor.VariableProcessor; import org.bukkit.Location; diff --git a/src/main/java/org/betonquest/betonquest/instruction/variable/location/VariableVector.java b/src/main/java/org/betonquest/betonquest/instruction/variable/location/VariableVector.java index b2b90b37de..855dbbd913 100644 --- a/src/main/java/org/betonquest/betonquest/instruction/variable/location/VariableVector.java +++ b/src/main/java/org/betonquest/betonquest/instruction/variable/location/VariableVector.java @@ -2,7 +2,7 @@ import org.betonquest.betonquest.api.config.quest.QuestPackage; import org.betonquest.betonquest.api.profile.Profile; -import org.betonquest.betonquest.exception.QuestException; +import org.betonquest.betonquest.api.quest.QuestException; import org.betonquest.betonquest.instruction.variable.Variable; import org.betonquest.betonquest.quest.registry.processor.VariableProcessor; import org.bukkit.util.Vector; diff --git a/src/main/java/org/betonquest/betonquest/instruction/variable/location/VariableWorld.java b/src/main/java/org/betonquest/betonquest/instruction/variable/location/VariableWorld.java index aad7876924..87d2373847 100644 --- a/src/main/java/org/betonquest/betonquest/instruction/variable/location/VariableWorld.java +++ b/src/main/java/org/betonquest/betonquest/instruction/variable/location/VariableWorld.java @@ -1,7 +1,7 @@ package org.betonquest.betonquest.instruction.variable.location; import org.betonquest.betonquest.api.config.quest.QuestPackage; -import org.betonquest.betonquest.exception.QuestException; +import org.betonquest.betonquest.api.quest.QuestException; import org.betonquest.betonquest.instruction.variable.Variable; import org.betonquest.betonquest.quest.registry.processor.VariableProcessor; import org.bukkit.Bukkit; diff --git a/src/main/java/org/betonquest/betonquest/item/QuestItem.java b/src/main/java/org/betonquest/betonquest/item/QuestItem.java index bc5ccb9dbc..c17d4c57be 100644 --- a/src/main/java/org/betonquest/betonquest/item/QuestItem.java +++ b/src/main/java/org/betonquest/betonquest/item/QuestItem.java @@ -1,7 +1,7 @@ package org.betonquest.betonquest.item; import org.betonquest.betonquest.api.profile.Profile; -import org.betonquest.betonquest.exception.QuestException; +import org.betonquest.betonquest.api.quest.QuestException; import org.betonquest.betonquest.id.ItemID; import org.betonquest.betonquest.instruction.Instruction; import org.betonquest.betonquest.item.typehandler.BookHandler; diff --git a/src/main/java/org/betonquest/betonquest/item/typehandler/BookHandler.java b/src/main/java/org/betonquest/betonquest/item/typehandler/BookHandler.java index 913760aec4..8ea015f287 100644 --- a/src/main/java/org/betonquest/betonquest/item/typehandler/BookHandler.java +++ b/src/main/java/org/betonquest/betonquest/item/typehandler/BookHandler.java @@ -1,7 +1,7 @@ package org.betonquest.betonquest.item.typehandler; +import org.betonquest.betonquest.api.quest.QuestException; import org.betonquest.betonquest.config.Config; -import org.betonquest.betonquest.exception.QuestException; import org.betonquest.betonquest.util.Utils; import org.bukkit.ChatColor; import org.bukkit.inventory.meta.BookMeta; diff --git a/src/main/java/org/betonquest/betonquest/item/typehandler/ColorHandler.java b/src/main/java/org/betonquest/betonquest/item/typehandler/ColorHandler.java index 924724e13c..82d8843196 100644 --- a/src/main/java/org/betonquest/betonquest/item/typehandler/ColorHandler.java +++ b/src/main/java/org/betonquest/betonquest/item/typehandler/ColorHandler.java @@ -1,6 +1,6 @@ package org.betonquest.betonquest.item.typehandler; -import org.betonquest.betonquest.exception.QuestException; +import org.betonquest.betonquest.api.quest.QuestException; import org.betonquest.betonquest.util.Utils; import org.bukkit.Bukkit; import org.bukkit.Color; diff --git a/src/main/java/org/betonquest/betonquest/item/typehandler/CustomModelDataHandler.java b/src/main/java/org/betonquest/betonquest/item/typehandler/CustomModelDataHandler.java index 567f5ea7a7..5e9c8ead26 100644 --- a/src/main/java/org/betonquest/betonquest/item/typehandler/CustomModelDataHandler.java +++ b/src/main/java/org/betonquest/betonquest/item/typehandler/CustomModelDataHandler.java @@ -1,6 +1,6 @@ package org.betonquest.betonquest.item.typehandler; -import org.betonquest.betonquest.exception.QuestException; +import org.betonquest.betonquest.api.quest.QuestException; import org.bukkit.inventory.meta.ItemMeta; import org.jetbrains.annotations.Nullable; diff --git a/src/main/java/org/betonquest/betonquest/item/typehandler/DurabilityHandler.java b/src/main/java/org/betonquest/betonquest/item/typehandler/DurabilityHandler.java index 3a8979725e..6cc8be52e0 100644 --- a/src/main/java/org/betonquest/betonquest/item/typehandler/DurabilityHandler.java +++ b/src/main/java/org/betonquest/betonquest/item/typehandler/DurabilityHandler.java @@ -1,6 +1,6 @@ package org.betonquest.betonquest.item.typehandler; -import org.betonquest.betonquest.exception.QuestException; +import org.betonquest.betonquest.api.quest.QuestException; import org.bukkit.inventory.meta.Damageable; import org.jetbrains.annotations.Nullable; diff --git a/src/main/java/org/betonquest/betonquest/item/typehandler/EnchantmentsHandler.java b/src/main/java/org/betonquest/betonquest/item/typehandler/EnchantmentsHandler.java index 2b1f288e8a..d6025727d0 100644 --- a/src/main/java/org/betonquest/betonquest/item/typehandler/EnchantmentsHandler.java +++ b/src/main/java/org/betonquest/betonquest/item/typehandler/EnchantmentsHandler.java @@ -1,6 +1,6 @@ package org.betonquest.betonquest.item.typehandler; -import org.betonquest.betonquest.exception.QuestException; +import org.betonquest.betonquest.api.quest.QuestException; import org.betonquest.betonquest.util.Utils; import org.bukkit.enchantments.Enchantment; import org.bukkit.inventory.meta.EnchantmentStorageMeta; diff --git a/src/main/java/org/betonquest/betonquest/item/typehandler/FireworkEffectHandler.java b/src/main/java/org/betonquest/betonquest/item/typehandler/FireworkEffectHandler.java index e664cadb57..6bdf42fb0b 100644 --- a/src/main/java/org/betonquest/betonquest/item/typehandler/FireworkEffectHandler.java +++ b/src/main/java/org/betonquest/betonquest/item/typehandler/FireworkEffectHandler.java @@ -1,6 +1,6 @@ package org.betonquest.betonquest.item.typehandler; -import org.betonquest.betonquest.exception.QuestException; +import org.betonquest.betonquest.api.quest.QuestException; import org.betonquest.betonquest.util.Utils; import org.bukkit.Color; import org.bukkit.DyeColor; diff --git a/src/main/java/org/betonquest/betonquest/item/typehandler/FireworkHandler.java b/src/main/java/org/betonquest/betonquest/item/typehandler/FireworkHandler.java index f212eea55b..26b3935ce7 100644 --- a/src/main/java/org/betonquest/betonquest/item/typehandler/FireworkHandler.java +++ b/src/main/java/org/betonquest/betonquest/item/typehandler/FireworkHandler.java @@ -1,7 +1,7 @@ package org.betonquest.betonquest.item.typehandler; import org.betonquest.betonquest.api.profile.Profile; -import org.betonquest.betonquest.exception.QuestException; +import org.betonquest.betonquest.api.quest.QuestException; import org.bukkit.Color; import org.bukkit.DyeColor; import org.bukkit.FireworkEffect; diff --git a/src/main/java/org/betonquest/betonquest/item/typehandler/FlagHandler.java b/src/main/java/org/betonquest/betonquest/item/typehandler/FlagHandler.java index 1321b42531..a407197c79 100644 --- a/src/main/java/org/betonquest/betonquest/item/typehandler/FlagHandler.java +++ b/src/main/java/org/betonquest/betonquest/item/typehandler/FlagHandler.java @@ -1,6 +1,6 @@ package org.betonquest.betonquest.item.typehandler; -import org.betonquest.betonquest.exception.QuestException; +import org.betonquest.betonquest.api.quest.QuestException; import org.bukkit.inventory.ItemFlag; import org.bukkit.inventory.meta.ItemMeta; import org.jetbrains.annotations.Nullable; diff --git a/src/main/java/org/betonquest/betonquest/item/typehandler/HandlerUtil.java b/src/main/java/org/betonquest/betonquest/item/typehandler/HandlerUtil.java index 2b09b75d64..fb48ad004c 100644 --- a/src/main/java/org/betonquest/betonquest/item/typehandler/HandlerUtil.java +++ b/src/main/java/org/betonquest/betonquest/item/typehandler/HandlerUtil.java @@ -1,6 +1,6 @@ package org.betonquest.betonquest.item.typehandler; -import org.betonquest.betonquest.exception.QuestException; +import org.betonquest.betonquest.api.quest.QuestException; import org.betonquest.betonquest.util.Utils; import org.intellij.lang.annotations.Language; import org.jetbrains.annotations.Nullable; diff --git a/src/main/java/org/betonquest/betonquest/item/typehandler/HeadHandler.java b/src/main/java/org/betonquest/betonquest/item/typehandler/HeadHandler.java index 7e8f03b40a..ff175959f2 100644 --- a/src/main/java/org/betonquest/betonquest/item/typehandler/HeadHandler.java +++ b/src/main/java/org/betonquest/betonquest/item/typehandler/HeadHandler.java @@ -3,7 +3,7 @@ import io.papermc.lib.PaperLib; import org.betonquest.betonquest.BetonQuest; import org.betonquest.betonquest.api.profile.Profile; -import org.betonquest.betonquest.exception.QuestException; +import org.betonquest.betonquest.api.quest.QuestException; import org.betonquest.betonquest.util.PlayerConverter; import org.bukkit.Bukkit; import org.bukkit.OfflinePlayer; diff --git a/src/main/java/org/betonquest/betonquest/item/typehandler/ItemMetaHandler.java b/src/main/java/org/betonquest/betonquest/item/typehandler/ItemMetaHandler.java index 42df054d97..e1c6ccfefc 100644 --- a/src/main/java/org/betonquest/betonquest/item/typehandler/ItemMetaHandler.java +++ b/src/main/java/org/betonquest/betonquest/item/typehandler/ItemMetaHandler.java @@ -1,7 +1,7 @@ package org.betonquest.betonquest.item.typehandler; import org.betonquest.betonquest.api.profile.Profile; -import org.betonquest.betonquest.exception.QuestException; +import org.betonquest.betonquest.api.quest.QuestException; import org.bukkit.inventory.meta.ItemMeta; import org.jetbrains.annotations.Nullable; diff --git a/src/main/java/org/betonquest/betonquest/item/typehandler/LoreHandler.java b/src/main/java/org/betonquest/betonquest/item/typehandler/LoreHandler.java index 7bdd41f472..b29bd4b07f 100644 --- a/src/main/java/org/betonquest/betonquest/item/typehandler/LoreHandler.java +++ b/src/main/java/org/betonquest/betonquest/item/typehandler/LoreHandler.java @@ -1,6 +1,6 @@ package org.betonquest.betonquest.item.typehandler; -import org.betonquest.betonquest.exception.QuestException; +import org.betonquest.betonquest.api.quest.QuestException; import org.bukkit.inventory.meta.ItemMeta; import org.jetbrains.annotations.Nullable; diff --git a/src/main/java/org/betonquest/betonquest/item/typehandler/NameHandler.java b/src/main/java/org/betonquest/betonquest/item/typehandler/NameHandler.java index 4c967c9152..fa08cf1db7 100644 --- a/src/main/java/org/betonquest/betonquest/item/typehandler/NameHandler.java +++ b/src/main/java/org/betonquest/betonquest/item/typehandler/NameHandler.java @@ -1,6 +1,6 @@ package org.betonquest.betonquest.item.typehandler; -import org.betonquest.betonquest.exception.QuestException; +import org.betonquest.betonquest.api.quest.QuestException; import org.bukkit.inventory.meta.ItemMeta; import org.jetbrains.annotations.Nullable; diff --git a/src/main/java/org/betonquest/betonquest/item/typehandler/PotionHandler.java b/src/main/java/org/betonquest/betonquest/item/typehandler/PotionHandler.java index 79704d9aa9..c1555aa493 100644 --- a/src/main/java/org/betonquest/betonquest/item/typehandler/PotionHandler.java +++ b/src/main/java/org/betonquest/betonquest/item/typehandler/PotionHandler.java @@ -2,7 +2,7 @@ import io.papermc.lib.PaperLib; import org.betonquest.betonquest.BetonQuest; -import org.betonquest.betonquest.exception.QuestException; +import org.betonquest.betonquest.api.quest.QuestException; import org.betonquest.betonquest.util.Utils; import org.bukkit.Keyed; import org.bukkit.inventory.meta.PotionMeta; diff --git a/src/main/java/org/betonquest/betonquest/item/typehandler/UnbreakableHandler.java b/src/main/java/org/betonquest/betonquest/item/typehandler/UnbreakableHandler.java index 30bfae691e..f72dc2f7c2 100644 --- a/src/main/java/org/betonquest/betonquest/item/typehandler/UnbreakableHandler.java +++ b/src/main/java/org/betonquest/betonquest/item/typehandler/UnbreakableHandler.java @@ -1,6 +1,6 @@ package org.betonquest.betonquest.item.typehandler; -import org.betonquest.betonquest.exception.QuestException; +import org.betonquest.betonquest.api.quest.QuestException; import org.bukkit.inventory.meta.ItemMeta; import org.jetbrains.annotations.Nullable; diff --git a/src/main/java/org/betonquest/betonquest/menu/ItemDescription.java b/src/main/java/org/betonquest/betonquest/menu/ItemDescription.java index 6276d61e60..ea07c26377 100644 --- a/src/main/java/org/betonquest/betonquest/menu/ItemDescription.java +++ b/src/main/java/org/betonquest/betonquest/menu/ItemDescription.java @@ -2,7 +2,7 @@ import org.betonquest.betonquest.api.config.quest.QuestPackage; import org.betonquest.betonquest.api.profile.Profile; -import org.betonquest.betonquest.exception.QuestException; +import org.betonquest.betonquest.api.quest.QuestException; import org.betonquest.betonquest.instruction.variable.VariableString; import org.bukkit.ChatColor; import org.jetbrains.annotations.Nullable; diff --git a/src/main/java/org/betonquest/betonquest/menu/Menu.java b/src/main/java/org/betonquest/betonquest/menu/Menu.java index 8aff02c381..08f8253f86 100644 --- a/src/main/java/org/betonquest/betonquest/menu/Menu.java +++ b/src/main/java/org/betonquest/betonquest/menu/Menu.java @@ -6,8 +6,8 @@ import org.betonquest.betonquest.api.logger.BetonQuestLoggerFactory; import org.betonquest.betonquest.api.profile.OnlineProfile; import org.betonquest.betonquest.api.profile.Profile; +import org.betonquest.betonquest.api.quest.QuestException; import org.betonquest.betonquest.exception.ObjectNotFoundException; -import org.betonquest.betonquest.exception.QuestException; import org.betonquest.betonquest.id.ConditionID; import org.betonquest.betonquest.id.EventID; import org.betonquest.betonquest.id.ItemID; diff --git a/src/main/java/org/betonquest/betonquest/menu/MenuItem.java b/src/main/java/org/betonquest/betonquest/menu/MenuItem.java index 79a0b725a2..c515f06ae5 100644 --- a/src/main/java/org/betonquest/betonquest/menu/MenuItem.java +++ b/src/main/java/org/betonquest/betonquest/menu/MenuItem.java @@ -5,9 +5,9 @@ import org.betonquest.betonquest.api.logger.BetonQuestLogger; import org.betonquest.betonquest.api.profile.OnlineProfile; import org.betonquest.betonquest.api.profile.Profile; +import org.betonquest.betonquest.api.quest.QuestException; import org.betonquest.betonquest.config.Config; import org.betonquest.betonquest.exception.ObjectNotFoundException; -import org.betonquest.betonquest.exception.QuestException; import org.betonquest.betonquest.id.ConditionID; import org.betonquest.betonquest.id.EventID; import org.betonquest.betonquest.id.ItemID; diff --git a/src/main/java/org/betonquest/betonquest/menu/betonquest/MenuCondition.java b/src/main/java/org/betonquest/betonquest/menu/betonquest/MenuCondition.java index 7e5912cd78..59de192bec 100644 --- a/src/main/java/org/betonquest/betonquest/menu/betonquest/MenuCondition.java +++ b/src/main/java/org/betonquest/betonquest/menu/betonquest/MenuCondition.java @@ -2,8 +2,8 @@ import org.betonquest.betonquest.api.Condition; import org.betonquest.betonquest.api.profile.Profile; +import org.betonquest.betonquest.api.quest.QuestException; import org.betonquest.betonquest.exception.ObjectNotFoundException; -import org.betonquest.betonquest.exception.QuestException; import org.betonquest.betonquest.instruction.Instruction; import org.betonquest.betonquest.menu.MenuID; import org.betonquest.betonquest.menu.RPGMenu; diff --git a/src/main/java/org/betonquest/betonquest/menu/betonquest/MenuObjective.java b/src/main/java/org/betonquest/betonquest/menu/betonquest/MenuObjective.java index bf3ffc434c..6e6a6ccb75 100644 --- a/src/main/java/org/betonquest/betonquest/menu/betonquest/MenuObjective.java +++ b/src/main/java/org/betonquest/betonquest/menu/betonquest/MenuObjective.java @@ -4,8 +4,8 @@ import org.betonquest.betonquest.api.Objective; import org.betonquest.betonquest.api.logger.BetonQuestLogger; import org.betonquest.betonquest.api.profile.Profile; +import org.betonquest.betonquest.api.quest.QuestException; import org.betonquest.betonquest.exception.ObjectNotFoundException; -import org.betonquest.betonquest.exception.QuestException; import org.betonquest.betonquest.instruction.Instruction; import org.betonquest.betonquest.menu.Menu; import org.betonquest.betonquest.menu.MenuID; diff --git a/src/main/java/org/betonquest/betonquest/menu/betonquest/MenuQuestEvent.java b/src/main/java/org/betonquest/betonquest/menu/betonquest/MenuQuestEvent.java index 987b034815..5111d5cd6c 100644 --- a/src/main/java/org/betonquest/betonquest/menu/betonquest/MenuQuestEvent.java +++ b/src/main/java/org/betonquest/betonquest/menu/betonquest/MenuQuestEvent.java @@ -4,8 +4,8 @@ import org.betonquest.betonquest.api.QuestEvent; import org.betonquest.betonquest.api.profile.OnlineProfile; import org.betonquest.betonquest.api.profile.Profile; +import org.betonquest.betonquest.api.quest.QuestException; import org.betonquest.betonquest.exception.ObjectNotFoundException; -import org.betonquest.betonquest.exception.QuestException; import org.betonquest.betonquest.instruction.Instruction; import org.betonquest.betonquest.menu.MenuID; import org.betonquest.betonquest.menu.RPGMenu; diff --git a/src/main/java/org/betonquest/betonquest/menu/betonquest/MenuVariable.java b/src/main/java/org/betonquest/betonquest/menu/betonquest/MenuVariable.java index c0a1ada466..174d746bf1 100644 --- a/src/main/java/org/betonquest/betonquest/menu/betonquest/MenuVariable.java +++ b/src/main/java/org/betonquest/betonquest/menu/betonquest/MenuVariable.java @@ -2,7 +2,7 @@ import org.betonquest.betonquest.api.Variable; import org.betonquest.betonquest.api.profile.Profile; -import org.betonquest.betonquest.exception.QuestException; +import org.betonquest.betonquest.api.quest.QuestException; import org.betonquest.betonquest.instruction.Instruction; import org.betonquest.betonquest.menu.OpenedMenu; import org.jetbrains.annotations.Nullable; diff --git a/src/main/java/org/betonquest/betonquest/notify/ActionBarNotifyIO.java b/src/main/java/org/betonquest/betonquest/notify/ActionBarNotifyIO.java index f4b5f17bcf..01b9e64b61 100644 --- a/src/main/java/org/betonquest/betonquest/notify/ActionBarNotifyIO.java +++ b/src/main/java/org/betonquest/betonquest/notify/ActionBarNotifyIO.java @@ -5,7 +5,7 @@ import net.md_5.bungee.api.chat.TextComponent; import org.betonquest.betonquest.api.config.quest.QuestPackage; import org.betonquest.betonquest.api.profile.OnlineProfile; -import org.betonquest.betonquest.exception.QuestException; +import org.betonquest.betonquest.api.quest.QuestException; import java.util.Map; diff --git a/src/main/java/org/betonquest/betonquest/notify/AdvancementNotifyIO.java b/src/main/java/org/betonquest/betonquest/notify/AdvancementNotifyIO.java index 0f7e721bce..9c16429f40 100644 --- a/src/main/java/org/betonquest/betonquest/notify/AdvancementNotifyIO.java +++ b/src/main/java/org/betonquest/betonquest/notify/AdvancementNotifyIO.java @@ -6,7 +6,7 @@ import org.betonquest.betonquest.BetonQuest; import org.betonquest.betonquest.api.config.quest.QuestPackage; import org.betonquest.betonquest.api.profile.OnlineProfile; -import org.betonquest.betonquest.exception.QuestException; +import org.betonquest.betonquest.api.quest.QuestException; import org.bukkit.Bukkit; import org.bukkit.NamespacedKey; import org.bukkit.advancement.Advancement; diff --git a/src/main/java/org/betonquest/betonquest/notify/BossBarNotifyIO.java b/src/main/java/org/betonquest/betonquest/notify/BossBarNotifyIO.java index 125be95814..d342a5225c 100644 --- a/src/main/java/org/betonquest/betonquest/notify/BossBarNotifyIO.java +++ b/src/main/java/org/betonquest/betonquest/notify/BossBarNotifyIO.java @@ -4,7 +4,7 @@ import org.betonquest.betonquest.api.config.quest.QuestPackage; import org.betonquest.betonquest.api.logger.BetonQuestLogger; import org.betonquest.betonquest.api.profile.OnlineProfile; -import org.betonquest.betonquest.exception.QuestException; +import org.betonquest.betonquest.api.quest.QuestException; import org.betonquest.betonquest.instruction.variable.VariableNumber; import org.bukkit.Bukkit; import org.bukkit.boss.BarColor; diff --git a/src/main/java/org/betonquest/betonquest/notify/ChatNotifyIO.java b/src/main/java/org/betonquest/betonquest/notify/ChatNotifyIO.java index dd1b5c1a47..806a4e7b8d 100644 --- a/src/main/java/org/betonquest/betonquest/notify/ChatNotifyIO.java +++ b/src/main/java/org/betonquest/betonquest/notify/ChatNotifyIO.java @@ -2,8 +2,8 @@ import org.betonquest.betonquest.api.config.quest.QuestPackage; import org.betonquest.betonquest.api.profile.OnlineProfile; +import org.betonquest.betonquest.api.quest.QuestException; import org.betonquest.betonquest.conversation.Conversation; -import org.betonquest.betonquest.exception.QuestException; import java.util.Map; diff --git a/src/main/java/org/betonquest/betonquest/notify/Notify.java b/src/main/java/org/betonquest/betonquest/notify/Notify.java index 2df4f17c0c..ce9691a8a2 100644 --- a/src/main/java/org/betonquest/betonquest/notify/Notify.java +++ b/src/main/java/org/betonquest/betonquest/notify/Notify.java @@ -4,8 +4,8 @@ import org.betonquest.betonquest.api.config.ConfigurationFile; import org.betonquest.betonquest.api.config.quest.QuestPackage; import org.betonquest.betonquest.api.logger.BetonQuestLogger; +import org.betonquest.betonquest.api.quest.QuestException; import org.betonquest.betonquest.config.Config; -import org.betonquest.betonquest.exception.QuestException; import org.bukkit.configuration.ConfigurationSection; import org.jetbrains.annotations.Nullable; diff --git a/src/main/java/org/betonquest/betonquest/notify/NotifyIO.java b/src/main/java/org/betonquest/betonquest/notify/NotifyIO.java index 7eb1e92036..ff4bad27f8 100644 --- a/src/main/java/org/betonquest/betonquest/notify/NotifyIO.java +++ b/src/main/java/org/betonquest/betonquest/notify/NotifyIO.java @@ -2,7 +2,7 @@ import org.betonquest.betonquest.api.config.quest.QuestPackage; import org.betonquest.betonquest.api.profile.OnlineProfile; -import org.betonquest.betonquest.exception.QuestException; +import org.betonquest.betonquest.api.quest.QuestException; import org.betonquest.betonquest.instruction.variable.VariableNumber; import org.betonquest.betonquest.util.PlayerConverter; import org.betonquest.betonquest.util.Utils; diff --git a/src/main/java/org/betonquest/betonquest/notify/NotifySound.java b/src/main/java/org/betonquest/betonquest/notify/NotifySound.java index c41653fe3f..cda56e55b2 100644 --- a/src/main/java/org/betonquest/betonquest/notify/NotifySound.java +++ b/src/main/java/org/betonquest/betonquest/notify/NotifySound.java @@ -5,7 +5,7 @@ import org.betonquest.betonquest.api.config.quest.QuestPackage; import org.betonquest.betonquest.api.profile.OnlineProfile; import org.betonquest.betonquest.api.profile.Profile; -import org.betonquest.betonquest.exception.QuestException; +import org.betonquest.betonquest.api.quest.QuestException; import org.betonquest.betonquest.instruction.variable.location.VariableLocation; import org.betonquest.betonquest.instruction.variable.location.VariableVector; import org.bukkit.Location; diff --git a/src/main/java/org/betonquest/betonquest/notify/SoundIO.java b/src/main/java/org/betonquest/betonquest/notify/SoundIO.java index c800c04363..7e1ee9d3d8 100644 --- a/src/main/java/org/betonquest/betonquest/notify/SoundIO.java +++ b/src/main/java/org/betonquest/betonquest/notify/SoundIO.java @@ -2,7 +2,7 @@ import org.betonquest.betonquest.api.config.quest.QuestPackage; import org.betonquest.betonquest.api.profile.OnlineProfile; -import org.betonquest.betonquest.exception.QuestException; +import org.betonquest.betonquest.api.quest.QuestException; import java.util.Map; diff --git a/src/main/java/org/betonquest/betonquest/notify/SubTitleNotifyIO.java b/src/main/java/org/betonquest/betonquest/notify/SubTitleNotifyIO.java index 1a1791e0c4..a9c794b936 100644 --- a/src/main/java/org/betonquest/betonquest/notify/SubTitleNotifyIO.java +++ b/src/main/java/org/betonquest/betonquest/notify/SubTitleNotifyIO.java @@ -2,7 +2,7 @@ import org.betonquest.betonquest.api.config.quest.QuestPackage; import org.betonquest.betonquest.api.profile.OnlineProfile; -import org.betonquest.betonquest.exception.QuestException; +import org.betonquest.betonquest.api.quest.QuestException; import java.util.Map; diff --git a/src/main/java/org/betonquest/betonquest/notify/SuppressNotifyIO.java b/src/main/java/org/betonquest/betonquest/notify/SuppressNotifyIO.java index 44a1df4e52..d3ea446b08 100644 --- a/src/main/java/org/betonquest/betonquest/notify/SuppressNotifyIO.java +++ b/src/main/java/org/betonquest/betonquest/notify/SuppressNotifyIO.java @@ -2,7 +2,7 @@ import org.betonquest.betonquest.api.config.quest.QuestPackage; import org.betonquest.betonquest.api.profile.OnlineProfile; -import org.betonquest.betonquest.exception.QuestException; +import org.betonquest.betonquest.api.quest.QuestException; import java.util.HashMap; import java.util.Map; diff --git a/src/main/java/org/betonquest/betonquest/notify/TitleNotifyIO.java b/src/main/java/org/betonquest/betonquest/notify/TitleNotifyIO.java index 2643c50211..d2949eb480 100644 --- a/src/main/java/org/betonquest/betonquest/notify/TitleNotifyIO.java +++ b/src/main/java/org/betonquest/betonquest/notify/TitleNotifyIO.java @@ -2,7 +2,7 @@ import org.betonquest.betonquest.api.config.quest.QuestPackage; import org.betonquest.betonquest.api.profile.OnlineProfile; -import org.betonquest.betonquest.exception.QuestException; +import org.betonquest.betonquest.api.quest.QuestException; import java.util.Map; diff --git a/src/main/java/org/betonquest/betonquest/notify/TotemNotifyIO.java b/src/main/java/org/betonquest/betonquest/notify/TotemNotifyIO.java index c98837b4db..96b2215f89 100644 --- a/src/main/java/org/betonquest/betonquest/notify/TotemNotifyIO.java +++ b/src/main/java/org/betonquest/betonquest/notify/TotemNotifyIO.java @@ -5,7 +5,7 @@ import org.betonquest.betonquest.BetonQuest; import org.betonquest.betonquest.api.config.quest.QuestPackage; import org.betonquest.betonquest.api.profile.OnlineProfile; -import org.betonquest.betonquest.exception.QuestException; +import org.betonquest.betonquest.api.quest.QuestException; import org.bukkit.Bukkit; import org.bukkit.Material; import org.bukkit.Sound; diff --git a/src/main/java/org/betonquest/betonquest/objective/AbstractLocationObjective.java b/src/main/java/org/betonquest/betonquest/objective/AbstractLocationObjective.java index 101dd5a884..55a4b039d3 100644 --- a/src/main/java/org/betonquest/betonquest/objective/AbstractLocationObjective.java +++ b/src/main/java/org/betonquest/betonquest/objective/AbstractLocationObjective.java @@ -3,7 +3,7 @@ import org.betonquest.betonquest.api.Objective; import org.betonquest.betonquest.api.logger.BetonQuestLogger; import org.betonquest.betonquest.api.profile.OnlineProfile; -import org.betonquest.betonquest.exception.QuestException; +import org.betonquest.betonquest.api.quest.QuestException; import org.betonquest.betonquest.instruction.Instruction; import org.betonquest.betonquest.util.PlayerConverter; import org.bukkit.Location; diff --git a/src/main/java/org/betonquest/betonquest/objective/ActionObjective.java b/src/main/java/org/betonquest/betonquest/objective/ActionObjective.java index e1dd54f726..aac9c52f84 100644 --- a/src/main/java/org/betonquest/betonquest/objective/ActionObjective.java +++ b/src/main/java/org/betonquest/betonquest/objective/ActionObjective.java @@ -5,7 +5,7 @@ import org.betonquest.betonquest.api.logger.BetonQuestLogger; import org.betonquest.betonquest.api.profile.OnlineProfile; import org.betonquest.betonquest.api.profile.Profile; -import org.betonquest.betonquest.exception.QuestException; +import org.betonquest.betonquest.api.quest.QuestException; import org.betonquest.betonquest.instruction.Instruction; import org.betonquest.betonquest.instruction.variable.VariableNumber; import org.betonquest.betonquest.instruction.variable.location.VariableLocation; diff --git a/src/main/java/org/betonquest/betonquest/objective/ArrowShootObjective.java b/src/main/java/org/betonquest/betonquest/objective/ArrowShootObjective.java index a221c19d2a..c70d6ff3b7 100644 --- a/src/main/java/org/betonquest/betonquest/objective/ArrowShootObjective.java +++ b/src/main/java/org/betonquest/betonquest/objective/ArrowShootObjective.java @@ -5,7 +5,7 @@ import org.betonquest.betonquest.api.logger.BetonQuestLogger; import org.betonquest.betonquest.api.profile.OnlineProfile; import org.betonquest.betonquest.api.profile.Profile; -import org.betonquest.betonquest.exception.QuestException; +import org.betonquest.betonquest.api.quest.QuestException; import org.betonquest.betonquest.instruction.Instruction; import org.betonquest.betonquest.instruction.variable.VariableNumber; import org.betonquest.betonquest.instruction.variable.location.VariableLocation; diff --git a/src/main/java/org/betonquest/betonquest/objective/BlockObjective.java b/src/main/java/org/betonquest/betonquest/objective/BlockObjective.java index 05be57302f..87ede7ebe9 100644 --- a/src/main/java/org/betonquest/betonquest/objective/BlockObjective.java +++ b/src/main/java/org/betonquest/betonquest/objective/BlockObjective.java @@ -5,7 +5,7 @@ import org.betonquest.betonquest.api.logger.BetonQuestLogger; import org.betonquest.betonquest.api.profile.OnlineProfile; import org.betonquest.betonquest.api.profile.Profile; -import org.betonquest.betonquest.exception.QuestException; +import org.betonquest.betonquest.api.quest.QuestException; import org.betonquest.betonquest.instruction.Instruction; import org.betonquest.betonquest.instruction.variable.VariableNumber; import org.betonquest.betonquest.instruction.variable.location.VariableLocation; diff --git a/src/main/java/org/betonquest/betonquest/objective/BreedObjective.java b/src/main/java/org/betonquest/betonquest/objective/BreedObjective.java index d9a30a44f8..b4ee616a51 100644 --- a/src/main/java/org/betonquest/betonquest/objective/BreedObjective.java +++ b/src/main/java/org/betonquest/betonquest/objective/BreedObjective.java @@ -3,7 +3,7 @@ import org.betonquest.betonquest.BetonQuest; import org.betonquest.betonquest.api.CountingObjective; import org.betonquest.betonquest.api.profile.OnlineProfile; -import org.betonquest.betonquest.exception.QuestException; +import org.betonquest.betonquest.api.quest.QuestException; import org.betonquest.betonquest.instruction.Instruction; import org.betonquest.betonquest.instruction.argument.VariableArgument; import org.betonquest.betonquest.util.PlayerConverter; diff --git a/src/main/java/org/betonquest/betonquest/objective/BrewObjective.java b/src/main/java/org/betonquest/betonquest/objective/BrewObjective.java index e0c2174071..dddecdf67b 100644 --- a/src/main/java/org/betonquest/betonquest/objective/BrewObjective.java +++ b/src/main/java/org/betonquest/betonquest/objective/BrewObjective.java @@ -4,7 +4,7 @@ import org.betonquest.betonquest.api.CountingObjective; import org.betonquest.betonquest.api.profile.OnlineProfile; import org.betonquest.betonquest.api.profile.Profile; -import org.betonquest.betonquest.exception.QuestException; +import org.betonquest.betonquest.api.quest.QuestException; import org.betonquest.betonquest.instruction.Instruction; import org.betonquest.betonquest.instruction.argument.VariableArgument; import org.betonquest.betonquest.item.QuestItem; diff --git a/src/main/java/org/betonquest/betonquest/objective/ChestPutObjective.java b/src/main/java/org/betonquest/betonquest/objective/ChestPutObjective.java index bc9f2e5e78..3b739fcf5f 100644 --- a/src/main/java/org/betonquest/betonquest/objective/ChestPutObjective.java +++ b/src/main/java/org/betonquest/betonquest/objective/ChestPutObjective.java @@ -6,9 +6,9 @@ import org.betonquest.betonquest.api.logger.BetonQuestLoggerFactory; import org.betonquest.betonquest.api.profile.OnlineProfile; import org.betonquest.betonquest.api.profile.Profile; +import org.betonquest.betonquest.api.quest.QuestException; import org.betonquest.betonquest.api.quest.condition.nullable.NullableCondition; import org.betonquest.betonquest.config.Config; -import org.betonquest.betonquest.exception.QuestException; import org.betonquest.betonquest.instruction.Instruction; import org.betonquest.betonquest.instruction.Item; import org.betonquest.betonquest.instruction.variable.location.VariableLocation; diff --git a/src/main/java/org/betonquest/betonquest/objective/CommandObjective.java b/src/main/java/org/betonquest/betonquest/objective/CommandObjective.java index 51b4f599ac..52d4e3636b 100644 --- a/src/main/java/org/betonquest/betonquest/objective/CommandObjective.java +++ b/src/main/java/org/betonquest/betonquest/objective/CommandObjective.java @@ -5,7 +5,7 @@ import org.betonquest.betonquest.api.Objective; import org.betonquest.betonquest.api.profile.OnlineProfile; import org.betonquest.betonquest.api.profile.Profile; -import org.betonquest.betonquest.exception.QuestException; +import org.betonquest.betonquest.api.quest.QuestException; import org.betonquest.betonquest.id.EventID; import org.betonquest.betonquest.instruction.Instruction; import org.betonquest.betonquest.instruction.argument.VariableArgument; diff --git a/src/main/java/org/betonquest/betonquest/objective/ConsumeObjective.java b/src/main/java/org/betonquest/betonquest/objective/ConsumeObjective.java index da28be21bb..5fe29468d8 100644 --- a/src/main/java/org/betonquest/betonquest/objective/ConsumeObjective.java +++ b/src/main/java/org/betonquest/betonquest/objective/ConsumeObjective.java @@ -3,7 +3,7 @@ import org.betonquest.betonquest.BetonQuest; import org.betonquest.betonquest.api.CountingObjective; import org.betonquest.betonquest.api.profile.OnlineProfile; -import org.betonquest.betonquest.exception.QuestException; +import org.betonquest.betonquest.api.quest.QuestException; import org.betonquest.betonquest.instruction.Instruction; import org.betonquest.betonquest.instruction.argument.VariableArgument; import org.betonquest.betonquest.item.QuestItem; diff --git a/src/main/java/org/betonquest/betonquest/objective/CraftingObjective.java b/src/main/java/org/betonquest/betonquest/objective/CraftingObjective.java index 42643801e6..2975c3c725 100644 --- a/src/main/java/org/betonquest/betonquest/objective/CraftingObjective.java +++ b/src/main/java/org/betonquest/betonquest/objective/CraftingObjective.java @@ -3,7 +3,7 @@ import org.betonquest.betonquest.BetonQuest; import org.betonquest.betonquest.api.CountingObjective; import org.betonquest.betonquest.api.profile.OnlineProfile; -import org.betonquest.betonquest.exception.QuestException; +import org.betonquest.betonquest.api.quest.QuestException; import org.betonquest.betonquest.instruction.Instruction; import org.betonquest.betonquest.instruction.argument.VariableArgument; import org.betonquest.betonquest.item.QuestItem; diff --git a/src/main/java/org/betonquest/betonquest/objective/DelayObjective.java b/src/main/java/org/betonquest/betonquest/objective/DelayObjective.java index c95620c2f8..bf43e8d6e1 100644 --- a/src/main/java/org/betonquest/betonquest/objective/DelayObjective.java +++ b/src/main/java/org/betonquest/betonquest/objective/DelayObjective.java @@ -4,8 +4,8 @@ import org.betonquest.betonquest.api.Objective; import org.betonquest.betonquest.api.logger.BetonQuestLogger; import org.betonquest.betonquest.api.profile.Profile; +import org.betonquest.betonquest.api.quest.QuestException; import org.betonquest.betonquest.config.Config; -import org.betonquest.betonquest.exception.QuestException; import org.betonquest.betonquest.instruction.Instruction; import org.betonquest.betonquest.instruction.argument.VariableArgument; import org.betonquest.betonquest.instruction.variable.VariableNumber; diff --git a/src/main/java/org/betonquest/betonquest/objective/DieObjective.java b/src/main/java/org/betonquest/betonquest/objective/DieObjective.java index 433c944972..ab19cac5da 100644 --- a/src/main/java/org/betonquest/betonquest/objective/DieObjective.java +++ b/src/main/java/org/betonquest/betonquest/objective/DieObjective.java @@ -5,7 +5,7 @@ import org.betonquest.betonquest.api.logger.BetonQuestLogger; import org.betonquest.betonquest.api.profile.OnlineProfile; import org.betonquest.betonquest.api.profile.Profile; -import org.betonquest.betonquest.exception.QuestException; +import org.betonquest.betonquest.api.quest.QuestException; import org.betonquest.betonquest.instruction.Instruction; import org.betonquest.betonquest.instruction.variable.location.VariableLocation; import org.betonquest.betonquest.util.PlayerConverter; diff --git a/src/main/java/org/betonquest/betonquest/objective/EnchantObjective.java b/src/main/java/org/betonquest/betonquest/objective/EnchantObjective.java index 4dd65b8d86..1e25f88317 100644 --- a/src/main/java/org/betonquest/betonquest/objective/EnchantObjective.java +++ b/src/main/java/org/betonquest/betonquest/objective/EnchantObjective.java @@ -3,7 +3,7 @@ import org.betonquest.betonquest.BetonQuest; import org.betonquest.betonquest.api.CountingObjective; import org.betonquest.betonquest.api.profile.OnlineProfile; -import org.betonquest.betonquest.exception.QuestException; +import org.betonquest.betonquest.api.quest.QuestException; import org.betonquest.betonquest.instruction.Instruction; import org.betonquest.betonquest.instruction.argument.VariableArgument; import org.betonquest.betonquest.item.QuestItem; diff --git a/src/main/java/org/betonquest/betonquest/objective/EntityInteractObjective.java b/src/main/java/org/betonquest/betonquest/objective/EntityInteractObjective.java index abdd162c64..938cf18684 100644 --- a/src/main/java/org/betonquest/betonquest/objective/EntityInteractObjective.java +++ b/src/main/java/org/betonquest/betonquest/objective/EntityInteractObjective.java @@ -5,7 +5,7 @@ import org.betonquest.betonquest.api.logger.BetonQuestLogger; import org.betonquest.betonquest.api.profile.OnlineProfile; import org.betonquest.betonquest.api.profile.Profile; -import org.betonquest.betonquest.exception.QuestException; +import org.betonquest.betonquest.api.quest.QuestException; import org.betonquest.betonquest.instruction.Instruction; import org.betonquest.betonquest.instruction.argument.VariableArgument; import org.betonquest.betonquest.instruction.variable.VariableNumber; diff --git a/src/main/java/org/betonquest/betonquest/objective/EquipItemObjective.java b/src/main/java/org/betonquest/betonquest/objective/EquipItemObjective.java index 1d5d20be35..dbfac8bc1b 100644 --- a/src/main/java/org/betonquest/betonquest/objective/EquipItemObjective.java +++ b/src/main/java/org/betonquest/betonquest/objective/EquipItemObjective.java @@ -6,7 +6,7 @@ import org.betonquest.betonquest.api.Objective; import org.betonquest.betonquest.api.profile.OnlineProfile; import org.betonquest.betonquest.api.profile.Profile; -import org.betonquest.betonquest.exception.QuestException; +import org.betonquest.betonquest.api.quest.QuestException; import org.betonquest.betonquest.instruction.Instruction; import org.betonquest.betonquest.item.QuestItem; import org.betonquest.betonquest.util.PlayerConverter; diff --git a/src/main/java/org/betonquest/betonquest/objective/ExperienceObjective.java b/src/main/java/org/betonquest/betonquest/objective/ExperienceObjective.java index 9c916f6ea7..b1820b9240 100644 --- a/src/main/java/org/betonquest/betonquest/objective/ExperienceObjective.java +++ b/src/main/java/org/betonquest/betonquest/objective/ExperienceObjective.java @@ -4,7 +4,7 @@ import org.betonquest.betonquest.api.Objective; import org.betonquest.betonquest.api.profile.OnlineProfile; import org.betonquest.betonquest.api.profile.Profile; -import org.betonquest.betonquest.exception.QuestException; +import org.betonquest.betonquest.api.quest.QuestException; import org.betonquest.betonquest.instruction.Instruction; import org.betonquest.betonquest.instruction.variable.VariableNumber; import org.betonquest.betonquest.util.PlayerConverter; diff --git a/src/main/java/org/betonquest/betonquest/objective/FishObjective.java b/src/main/java/org/betonquest/betonquest/objective/FishObjective.java index 397a85b57a..6895a01733 100644 --- a/src/main/java/org/betonquest/betonquest/objective/FishObjective.java +++ b/src/main/java/org/betonquest/betonquest/objective/FishObjective.java @@ -5,7 +5,7 @@ import org.betonquest.betonquest.api.logger.BetonQuestLogger; import org.betonquest.betonquest.api.profile.OnlineProfile; import org.betonquest.betonquest.api.profile.Profile; -import org.betonquest.betonquest.exception.QuestException; +import org.betonquest.betonquest.api.quest.QuestException; import org.betonquest.betonquest.instruction.Instruction; import org.betonquest.betonquest.instruction.argument.VariableArgument; import org.betonquest.betonquest.instruction.variable.VariableNumber; diff --git a/src/main/java/org/betonquest/betonquest/objective/JumpObjective.java b/src/main/java/org/betonquest/betonquest/objective/JumpObjective.java index bddbf5b453..fbf49b3cd1 100644 --- a/src/main/java/org/betonquest/betonquest/objective/JumpObjective.java +++ b/src/main/java/org/betonquest/betonquest/objective/JumpObjective.java @@ -4,7 +4,7 @@ import org.betonquest.betonquest.BetonQuest; import org.betonquest.betonquest.api.CountingObjective; import org.betonquest.betonquest.api.profile.OnlineProfile; -import org.betonquest.betonquest.exception.QuestException; +import org.betonquest.betonquest.api.quest.QuestException; import org.betonquest.betonquest.instruction.Instruction; import org.betonquest.betonquest.instruction.argument.VariableArgument; import org.betonquest.betonquest.util.PlayerConverter; diff --git a/src/main/java/org/betonquest/betonquest/objective/KillPlayerObjective.java b/src/main/java/org/betonquest/betonquest/objective/KillPlayerObjective.java index 63b67ab1e8..a4bec29e16 100644 --- a/src/main/java/org/betonquest/betonquest/objective/KillPlayerObjective.java +++ b/src/main/java/org/betonquest/betonquest/objective/KillPlayerObjective.java @@ -3,7 +3,7 @@ import org.betonquest.betonquest.BetonQuest; import org.betonquest.betonquest.api.CountingObjective; import org.betonquest.betonquest.api.profile.OnlineProfile; -import org.betonquest.betonquest.exception.QuestException; +import org.betonquest.betonquest.api.quest.QuestException; import org.betonquest.betonquest.id.ConditionID; import org.betonquest.betonquest.instruction.Instruction; import org.betonquest.betonquest.instruction.argument.VariableArgument; diff --git a/src/main/java/org/betonquest/betonquest/objective/LocationObjective.java b/src/main/java/org/betonquest/betonquest/objective/LocationObjective.java index bb5f9055cc..7d6d0114b6 100644 --- a/src/main/java/org/betonquest/betonquest/objective/LocationObjective.java +++ b/src/main/java/org/betonquest/betonquest/objective/LocationObjective.java @@ -3,7 +3,7 @@ import org.betonquest.betonquest.BetonQuest; import org.betonquest.betonquest.api.profile.OnlineProfile; import org.betonquest.betonquest.api.profile.Profile; -import org.betonquest.betonquest.exception.QuestException; +import org.betonquest.betonquest.api.quest.QuestException; import org.betonquest.betonquest.instruction.Instruction; import org.betonquest.betonquest.instruction.variable.VariableNumber; import org.betonquest.betonquest.instruction.variable.location.VariableLocation; diff --git a/src/main/java/org/betonquest/betonquest/objective/LoginObjective.java b/src/main/java/org/betonquest/betonquest/objective/LoginObjective.java index d028698e12..d87b60fde6 100644 --- a/src/main/java/org/betonquest/betonquest/objective/LoginObjective.java +++ b/src/main/java/org/betonquest/betonquest/objective/LoginObjective.java @@ -4,7 +4,7 @@ import org.betonquest.betonquest.api.Objective; import org.betonquest.betonquest.api.profile.OnlineProfile; import org.betonquest.betonquest.api.profile.Profile; -import org.betonquest.betonquest.exception.QuestException; +import org.betonquest.betonquest.api.quest.QuestException; import org.betonquest.betonquest.instruction.Instruction; import org.betonquest.betonquest.util.PlayerConverter; import org.bukkit.Bukkit; diff --git a/src/main/java/org/betonquest/betonquest/objective/LogoutObjective.java b/src/main/java/org/betonquest/betonquest/objective/LogoutObjective.java index 0cad768e85..1811c82958 100644 --- a/src/main/java/org/betonquest/betonquest/objective/LogoutObjective.java +++ b/src/main/java/org/betonquest/betonquest/objective/LogoutObjective.java @@ -4,7 +4,7 @@ import org.betonquest.betonquest.api.Objective; import org.betonquest.betonquest.api.profile.OnlineProfile; import org.betonquest.betonquest.api.profile.Profile; -import org.betonquest.betonquest.exception.QuestException; +import org.betonquest.betonquest.api.quest.QuestException; import org.betonquest.betonquest.instruction.Instruction; import org.betonquest.betonquest.util.PlayerConverter; import org.bukkit.Bukkit; diff --git a/src/main/java/org/betonquest/betonquest/objective/MobKillObjective.java b/src/main/java/org/betonquest/betonquest/objective/MobKillObjective.java index 9abb151362..7f1f6c91aa 100644 --- a/src/main/java/org/betonquest/betonquest/objective/MobKillObjective.java +++ b/src/main/java/org/betonquest/betonquest/objective/MobKillObjective.java @@ -4,7 +4,7 @@ import org.betonquest.betonquest.api.CountingObjective; import org.betonquest.betonquest.api.MobKillNotifier.MobKilledEvent; import org.betonquest.betonquest.api.profile.OnlineProfile; -import org.betonquest.betonquest.exception.QuestException; +import org.betonquest.betonquest.api.quest.QuestException; import org.betonquest.betonquest.instruction.Instruction; import org.betonquest.betonquest.instruction.argument.VariableArgument; import org.betonquest.betonquest.instruction.variable.VariableString; diff --git a/src/main/java/org/betonquest/betonquest/objective/PasswordObjective.java b/src/main/java/org/betonquest/betonquest/objective/PasswordObjective.java index f1dba30a84..35c8c416d0 100644 --- a/src/main/java/org/betonquest/betonquest/objective/PasswordObjective.java +++ b/src/main/java/org/betonquest/betonquest/objective/PasswordObjective.java @@ -4,8 +4,8 @@ import org.betonquest.betonquest.api.Objective; import org.betonquest.betonquest.api.profile.OnlineProfile; import org.betonquest.betonquest.api.profile.Profile; +import org.betonquest.betonquest.api.quest.QuestException; import org.betonquest.betonquest.config.Config; -import org.betonquest.betonquest.exception.QuestException; import org.betonquest.betonquest.id.EventID; import org.betonquest.betonquest.instruction.Instruction; import org.betonquest.betonquest.util.PlayerConverter; diff --git a/src/main/java/org/betonquest/betonquest/objective/PickupObjective.java b/src/main/java/org/betonquest/betonquest/objective/PickupObjective.java index 8968924567..6d742e3cac 100644 --- a/src/main/java/org/betonquest/betonquest/objective/PickupObjective.java +++ b/src/main/java/org/betonquest/betonquest/objective/PickupObjective.java @@ -3,7 +3,7 @@ import org.betonquest.betonquest.BetonQuest; import org.betonquest.betonquest.api.CountingObjective; import org.betonquest.betonquest.api.profile.OnlineProfile; -import org.betonquest.betonquest.exception.QuestException; +import org.betonquest.betonquest.api.quest.QuestException; import org.betonquest.betonquest.instruction.Instruction; import org.betonquest.betonquest.instruction.Item; import org.betonquest.betonquest.instruction.argument.VariableArgument; diff --git a/src/main/java/org/betonquest/betonquest/objective/ResourcePackObjective.java b/src/main/java/org/betonquest/betonquest/objective/ResourcePackObjective.java index 1ac79cc5ed..ec86617902 100644 --- a/src/main/java/org/betonquest/betonquest/objective/ResourcePackObjective.java +++ b/src/main/java/org/betonquest/betonquest/objective/ResourcePackObjective.java @@ -4,7 +4,7 @@ import org.betonquest.betonquest.api.Objective; import org.betonquest.betonquest.api.profile.OnlineProfile; import org.betonquest.betonquest.api.profile.Profile; -import org.betonquest.betonquest.exception.QuestException; +import org.betonquest.betonquest.api.quest.QuestException; import org.betonquest.betonquest.instruction.Instruction; import org.betonquest.betonquest.instruction.variable.VariableString; import org.betonquest.betonquest.util.PlayerConverter; diff --git a/src/main/java/org/betonquest/betonquest/objective/RideObjective.java b/src/main/java/org/betonquest/betonquest/objective/RideObjective.java index 776beb458d..abd9fbb52e 100644 --- a/src/main/java/org/betonquest/betonquest/objective/RideObjective.java +++ b/src/main/java/org/betonquest/betonquest/objective/RideObjective.java @@ -4,7 +4,7 @@ import org.betonquest.betonquest.api.Objective; import org.betonquest.betonquest.api.profile.OnlineProfile; import org.betonquest.betonquest.api.profile.Profile; -import org.betonquest.betonquest.exception.QuestException; +import org.betonquest.betonquest.api.quest.QuestException; import org.betonquest.betonquest.instruction.Instruction; import org.betonquest.betonquest.util.PlayerConverter; import org.bukkit.Bukkit; diff --git a/src/main/java/org/betonquest/betonquest/objective/ShearObjective.java b/src/main/java/org/betonquest/betonquest/objective/ShearObjective.java index e199e0bebc..4c211ba02d 100644 --- a/src/main/java/org/betonquest/betonquest/objective/ShearObjective.java +++ b/src/main/java/org/betonquest/betonquest/objective/ShearObjective.java @@ -3,7 +3,7 @@ import org.betonquest.betonquest.BetonQuest; import org.betonquest.betonquest.api.CountingObjective; import org.betonquest.betonquest.api.profile.OnlineProfile; -import org.betonquest.betonquest.exception.QuestException; +import org.betonquest.betonquest.api.quest.QuestException; import org.betonquest.betonquest.instruction.Instruction; import org.betonquest.betonquest.instruction.argument.VariableArgument; import org.betonquest.betonquest.util.PlayerConverter; diff --git a/src/main/java/org/betonquest/betonquest/objective/SmeltingObjective.java b/src/main/java/org/betonquest/betonquest/objective/SmeltingObjective.java index aed05e09b5..c0fa464c76 100644 --- a/src/main/java/org/betonquest/betonquest/objective/SmeltingObjective.java +++ b/src/main/java/org/betonquest/betonquest/objective/SmeltingObjective.java @@ -3,7 +3,7 @@ import org.betonquest.betonquest.BetonQuest; import org.betonquest.betonquest.api.CountingObjective; import org.betonquest.betonquest.api.profile.OnlineProfile; -import org.betonquest.betonquest.exception.QuestException; +import org.betonquest.betonquest.api.quest.QuestException; import org.betonquest.betonquest.instruction.Instruction; import org.betonquest.betonquest.instruction.argument.VariableArgument; import org.betonquest.betonquest.item.QuestItem; diff --git a/src/main/java/org/betonquest/betonquest/objective/StageObjective.java b/src/main/java/org/betonquest/betonquest/objective/StageObjective.java index 64afca8dcb..2bb640202b 100644 --- a/src/main/java/org/betonquest/betonquest/objective/StageObjective.java +++ b/src/main/java/org/betonquest/betonquest/objective/StageObjective.java @@ -6,7 +6,7 @@ import org.betonquest.betonquest.api.Objective; import org.betonquest.betonquest.api.logger.BetonQuestLogger; import org.betonquest.betonquest.api.profile.Profile; -import org.betonquest.betonquest.exception.QuestException; +import org.betonquest.betonquest.api.quest.QuestException; import org.betonquest.betonquest.instruction.Instruction; import java.util.List; diff --git a/src/main/java/org/betonquest/betonquest/objective/StepObjective.java b/src/main/java/org/betonquest/betonquest/objective/StepObjective.java index 65f112feee..b9b7ec39de 100644 --- a/src/main/java/org/betonquest/betonquest/objective/StepObjective.java +++ b/src/main/java/org/betonquest/betonquest/objective/StepObjective.java @@ -5,7 +5,7 @@ import org.betonquest.betonquest.api.logger.BetonQuestLogger; import org.betonquest.betonquest.api.profile.OnlineProfile; import org.betonquest.betonquest.api.profile.Profile; -import org.betonquest.betonquest.exception.QuestException; +import org.betonquest.betonquest.api.quest.QuestException; import org.betonquest.betonquest.instruction.Instruction; import org.betonquest.betonquest.instruction.variable.location.VariableLocation; import org.betonquest.betonquest.util.BlockSelector; diff --git a/src/main/java/org/betonquest/betonquest/objective/TameObjective.java b/src/main/java/org/betonquest/betonquest/objective/TameObjective.java index e6d00cc347..d0f913af22 100644 --- a/src/main/java/org/betonquest/betonquest/objective/TameObjective.java +++ b/src/main/java/org/betonquest/betonquest/objective/TameObjective.java @@ -3,7 +3,7 @@ import org.betonquest.betonquest.BetonQuest; import org.betonquest.betonquest.api.CountingObjective; import org.betonquest.betonquest.api.profile.OnlineProfile; -import org.betonquest.betonquest.exception.QuestException; +import org.betonquest.betonquest.api.quest.QuestException; import org.betonquest.betonquest.instruction.Instruction; import org.betonquest.betonquest.instruction.argument.VariableArgument; import org.betonquest.betonquest.util.PlayerConverter; diff --git a/src/main/java/org/betonquest/betonquest/objective/VariableObjective.java b/src/main/java/org/betonquest/betonquest/objective/VariableObjective.java index 5c44bd1813..1215c89393 100644 --- a/src/main/java/org/betonquest/betonquest/objective/VariableObjective.java +++ b/src/main/java/org/betonquest/betonquest/objective/VariableObjective.java @@ -4,7 +4,7 @@ import org.betonquest.betonquest.api.Objective; import org.betonquest.betonquest.api.profile.OnlineProfile; import org.betonquest.betonquest.api.profile.Profile; -import org.betonquest.betonquest.exception.QuestException; +import org.betonquest.betonquest.api.quest.QuestException; import org.betonquest.betonquest.instruction.Instruction; import org.betonquest.betonquest.util.PlayerConverter; import org.bukkit.Bukkit; diff --git a/src/main/java/org/betonquest/betonquest/playerhider/PlayerHider.java b/src/main/java/org/betonquest/betonquest/playerhider/PlayerHider.java index ef54ef86ac..62bfdc06f9 100644 --- a/src/main/java/org/betonquest/betonquest/playerhider/PlayerHider.java +++ b/src/main/java/org/betonquest/betonquest/playerhider/PlayerHider.java @@ -4,9 +4,9 @@ import org.betonquest.betonquest.api.config.quest.QuestPackage; import org.betonquest.betonquest.api.profile.OnlineProfile; import org.betonquest.betonquest.api.profile.Profile; +import org.betonquest.betonquest.api.quest.QuestException; import org.betonquest.betonquest.config.Config; import org.betonquest.betonquest.exception.ObjectNotFoundException; -import org.betonquest.betonquest.exception.QuestException; import org.betonquest.betonquest.id.ConditionID; import org.betonquest.betonquest.util.PlayerConverter; import org.bukkit.Bukkit; diff --git a/src/main/java/org/betonquest/betonquest/quest/PrimaryServerThreadType.java b/src/main/java/org/betonquest/betonquest/quest/PrimaryServerThreadType.java index 4e1c76ef38..3d429b0da2 100644 --- a/src/main/java/org/betonquest/betonquest/quest/PrimaryServerThreadType.java +++ b/src/main/java/org/betonquest/betonquest/quest/PrimaryServerThreadType.java @@ -1,7 +1,7 @@ package org.betonquest.betonquest.quest; import org.betonquest.betonquest.api.common.function.QuestCallable; -import org.betonquest.betonquest.exception.QuestException; +import org.betonquest.betonquest.api.quest.QuestException; import org.bukkit.Server; import org.bukkit.plugin.Plugin; import org.bukkit.scheduler.BukkitScheduler; diff --git a/src/main/java/org/betonquest/betonquest/quest/condition/PrimaryServerThreadPlayerCondition.java b/src/main/java/org/betonquest/betonquest/quest/condition/PrimaryServerThreadPlayerCondition.java index 07f8330ffa..dd7379d8ca 100644 --- a/src/main/java/org/betonquest/betonquest/quest/condition/PrimaryServerThreadPlayerCondition.java +++ b/src/main/java/org/betonquest/betonquest/quest/condition/PrimaryServerThreadPlayerCondition.java @@ -1,8 +1,8 @@ package org.betonquest.betonquest.quest.condition; import org.betonquest.betonquest.api.profile.Profile; +import org.betonquest.betonquest.api.quest.QuestException; import org.betonquest.betonquest.api.quest.condition.PlayerCondition; -import org.betonquest.betonquest.exception.QuestException; import org.betonquest.betonquest.quest.PrimaryServerThreadData; import org.betonquest.betonquest.quest.PrimaryServerThreadType; import org.bukkit.Server; diff --git a/src/main/java/org/betonquest/betonquest/quest/condition/PrimaryServerThreadPlayerlessCondition.java b/src/main/java/org/betonquest/betonquest/quest/condition/PrimaryServerThreadPlayerlessCondition.java index d546336fba..734751c8fa 100644 --- a/src/main/java/org/betonquest/betonquest/quest/condition/PrimaryServerThreadPlayerlessCondition.java +++ b/src/main/java/org/betonquest/betonquest/quest/condition/PrimaryServerThreadPlayerlessCondition.java @@ -1,7 +1,7 @@ package org.betonquest.betonquest.quest.condition; +import org.betonquest.betonquest.api.quest.QuestException; import org.betonquest.betonquest.api.quest.condition.PlayerlessCondition; -import org.betonquest.betonquest.exception.QuestException; import org.betonquest.betonquest.quest.PrimaryServerThreadData; import org.betonquest.betonquest.quest.PrimaryServerThreadType; import org.bukkit.Server; diff --git a/src/main/java/org/betonquest/betonquest/quest/condition/ThrowExceptionPlayerlessCondition.java b/src/main/java/org/betonquest/betonquest/quest/condition/ThrowExceptionPlayerlessCondition.java index f43dc5c31d..79a8054ef3 100644 --- a/src/main/java/org/betonquest/betonquest/quest/condition/ThrowExceptionPlayerlessCondition.java +++ b/src/main/java/org/betonquest/betonquest/quest/condition/ThrowExceptionPlayerlessCondition.java @@ -1,7 +1,7 @@ package org.betonquest.betonquest.quest.condition; +import org.betonquest.betonquest.api.quest.QuestException; import org.betonquest.betonquest.api.quest.condition.PlayerlessCondition; -import org.betonquest.betonquest.exception.QuestException; /** * A playerless condition placeholder that throws an exception when checked. diff --git a/src/main/java/org/betonquest/betonquest/quest/condition/advancement/AdvancementCondition.java b/src/main/java/org/betonquest/betonquest/quest/condition/advancement/AdvancementCondition.java index 6826e59bd4..aa77a512d7 100644 --- a/src/main/java/org/betonquest/betonquest/quest/condition/advancement/AdvancementCondition.java +++ b/src/main/java/org/betonquest/betonquest/quest/condition/advancement/AdvancementCondition.java @@ -1,8 +1,8 @@ package org.betonquest.betonquest.quest.condition.advancement; import org.betonquest.betonquest.api.profile.OnlineProfile; +import org.betonquest.betonquest.api.quest.QuestException; import org.betonquest.betonquest.api.quest.condition.online.OnlineCondition; -import org.betonquest.betonquest.exception.QuestException; import org.bukkit.advancement.Advancement; import org.bukkit.advancement.AdvancementProgress; diff --git a/src/main/java/org/betonquest/betonquest/quest/condition/advancement/AdvancementConditionFactory.java b/src/main/java/org/betonquest/betonquest/quest/condition/advancement/AdvancementConditionFactory.java index 826885e246..7f8ba1072a 100644 --- a/src/main/java/org/betonquest/betonquest/quest/condition/advancement/AdvancementConditionFactory.java +++ b/src/main/java/org/betonquest/betonquest/quest/condition/advancement/AdvancementConditionFactory.java @@ -1,10 +1,10 @@ package org.betonquest.betonquest.quest.condition.advancement; import org.betonquest.betonquest.api.logger.BetonQuestLoggerFactory; +import org.betonquest.betonquest.api.quest.QuestException; import org.betonquest.betonquest.api.quest.condition.PlayerCondition; import org.betonquest.betonquest.api.quest.condition.PlayerConditionFactory; import org.betonquest.betonquest.api.quest.condition.online.OnlineConditionAdapter; -import org.betonquest.betonquest.exception.QuestException; import org.betonquest.betonquest.instruction.Instruction; import org.betonquest.betonquest.quest.PrimaryServerThreadData; import org.betonquest.betonquest.quest.condition.PrimaryServerThreadPlayerCondition; diff --git a/src/main/java/org/betonquest/betonquest/quest/condition/armor/ArmorCondition.java b/src/main/java/org/betonquest/betonquest/quest/condition/armor/ArmorCondition.java index 6f290aff9f..98ee5d4cc1 100644 --- a/src/main/java/org/betonquest/betonquest/quest/condition/armor/ArmorCondition.java +++ b/src/main/java/org/betonquest/betonquest/quest/condition/armor/ArmorCondition.java @@ -1,8 +1,8 @@ package org.betonquest.betonquest.quest.condition.armor; import org.betonquest.betonquest.api.profile.OnlineProfile; +import org.betonquest.betonquest.api.quest.QuestException; import org.betonquest.betonquest.api.quest.condition.online.OnlineCondition; -import org.betonquest.betonquest.exception.QuestException; import org.betonquest.betonquest.item.QuestItem; import org.bukkit.inventory.ItemStack; diff --git a/src/main/java/org/betonquest/betonquest/quest/condition/armor/ArmorConditionFactory.java b/src/main/java/org/betonquest/betonquest/quest/condition/armor/ArmorConditionFactory.java index 2d3943cce6..99e0570197 100644 --- a/src/main/java/org/betonquest/betonquest/quest/condition/armor/ArmorConditionFactory.java +++ b/src/main/java/org/betonquest/betonquest/quest/condition/armor/ArmorConditionFactory.java @@ -2,10 +2,10 @@ import org.betonquest.betonquest.api.logger.BetonQuestLogger; import org.betonquest.betonquest.api.logger.BetonQuestLoggerFactory; +import org.betonquest.betonquest.api.quest.QuestException; import org.betonquest.betonquest.api.quest.condition.PlayerCondition; import org.betonquest.betonquest.api.quest.condition.PlayerConditionFactory; import org.betonquest.betonquest.api.quest.condition.online.OnlineConditionAdapter; -import org.betonquest.betonquest.exception.QuestException; import org.betonquest.betonquest.id.ItemID; import org.betonquest.betonquest.instruction.Instruction; import org.betonquest.betonquest.item.QuestItem; diff --git a/src/main/java/org/betonquest/betonquest/quest/condition/armor/ArmorRatingCondition.java b/src/main/java/org/betonquest/betonquest/quest/condition/armor/ArmorRatingCondition.java index cf634b705f..299b998775 100644 --- a/src/main/java/org/betonquest/betonquest/quest/condition/armor/ArmorRatingCondition.java +++ b/src/main/java/org/betonquest/betonquest/quest/condition/armor/ArmorRatingCondition.java @@ -1,8 +1,8 @@ package org.betonquest.betonquest.quest.condition.armor; import org.betonquest.betonquest.api.profile.OnlineProfile; +import org.betonquest.betonquest.api.quest.QuestException; import org.betonquest.betonquest.api.quest.condition.online.OnlineCondition; -import org.betonquest.betonquest.exception.QuestException; import org.betonquest.betonquest.instruction.variable.VariableNumber; import org.bukkit.attribute.Attribute; import org.bukkit.attribute.AttributeInstance; diff --git a/src/main/java/org/betonquest/betonquest/quest/condition/armor/ArmorRatingConditionFactory.java b/src/main/java/org/betonquest/betonquest/quest/condition/armor/ArmorRatingConditionFactory.java index 0da5057d43..cbd49f9941 100644 --- a/src/main/java/org/betonquest/betonquest/quest/condition/armor/ArmorRatingConditionFactory.java +++ b/src/main/java/org/betonquest/betonquest/quest/condition/armor/ArmorRatingConditionFactory.java @@ -2,10 +2,10 @@ import org.betonquest.betonquest.api.logger.BetonQuestLogger; import org.betonquest.betonquest.api.logger.BetonQuestLoggerFactory; +import org.betonquest.betonquest.api.quest.QuestException; import org.betonquest.betonquest.api.quest.condition.PlayerCondition; import org.betonquest.betonquest.api.quest.condition.PlayerConditionFactory; import org.betonquest.betonquest.api.quest.condition.online.OnlineConditionAdapter; -import org.betonquest.betonquest.exception.QuestException; import org.betonquest.betonquest.instruction.Instruction; import org.betonquest.betonquest.instruction.variable.VariableNumber; import org.betonquest.betonquest.quest.PrimaryServerThreadData; diff --git a/src/main/java/org/betonquest/betonquest/quest/condition/biome/BiomeCondition.java b/src/main/java/org/betonquest/betonquest/quest/condition/biome/BiomeCondition.java index 9430556bf1..6ab2a96772 100644 --- a/src/main/java/org/betonquest/betonquest/quest/condition/biome/BiomeCondition.java +++ b/src/main/java/org/betonquest/betonquest/quest/condition/biome/BiomeCondition.java @@ -1,8 +1,8 @@ package org.betonquest.betonquest.quest.condition.biome; import org.betonquest.betonquest.api.profile.OnlineProfile; +import org.betonquest.betonquest.api.quest.QuestException; import org.betonquest.betonquest.api.quest.condition.online.OnlineCondition; -import org.betonquest.betonquest.exception.QuestException; import org.bukkit.block.Biome; /** diff --git a/src/main/java/org/betonquest/betonquest/quest/condition/biome/BiomeConditionFactory.java b/src/main/java/org/betonquest/betonquest/quest/condition/biome/BiomeConditionFactory.java index b552381a72..4d725a4982 100644 --- a/src/main/java/org/betonquest/betonquest/quest/condition/biome/BiomeConditionFactory.java +++ b/src/main/java/org/betonquest/betonquest/quest/condition/biome/BiomeConditionFactory.java @@ -2,10 +2,10 @@ import org.betonquest.betonquest.api.logger.BetonQuestLogger; import org.betonquest.betonquest.api.logger.BetonQuestLoggerFactory; +import org.betonquest.betonquest.api.quest.QuestException; import org.betonquest.betonquest.api.quest.condition.PlayerCondition; import org.betonquest.betonquest.api.quest.condition.PlayerConditionFactory; import org.betonquest.betonquest.api.quest.condition.online.OnlineConditionAdapter; -import org.betonquest.betonquest.exception.QuestException; import org.betonquest.betonquest.instruction.Instruction; import org.betonquest.betonquest.quest.PrimaryServerThreadData; import org.betonquest.betonquest.quest.condition.PrimaryServerThreadPlayerCondition; diff --git a/src/main/java/org/betonquest/betonquest/quest/condition/block/BlockCondition.java b/src/main/java/org/betonquest/betonquest/quest/condition/block/BlockCondition.java index efc7da8d5a..4885e67342 100644 --- a/src/main/java/org/betonquest/betonquest/quest/condition/block/BlockCondition.java +++ b/src/main/java/org/betonquest/betonquest/quest/condition/block/BlockCondition.java @@ -1,8 +1,8 @@ package org.betonquest.betonquest.quest.condition.block; import org.betonquest.betonquest.api.profile.Profile; +import org.betonquest.betonquest.api.quest.QuestException; import org.betonquest.betonquest.api.quest.condition.nullable.NullableCondition; -import org.betonquest.betonquest.exception.QuestException; import org.betonquest.betonquest.instruction.variable.location.VariableLocation; import org.betonquest.betonquest.util.BlockSelector; import org.bukkit.block.Block; diff --git a/src/main/java/org/betonquest/betonquest/quest/condition/block/BlockConditionFactory.java b/src/main/java/org/betonquest/betonquest/quest/condition/block/BlockConditionFactory.java index ade1aec95b..f9f0b03885 100644 --- a/src/main/java/org/betonquest/betonquest/quest/condition/block/BlockConditionFactory.java +++ b/src/main/java/org/betonquest/betonquest/quest/condition/block/BlockConditionFactory.java @@ -1,11 +1,11 @@ package org.betonquest.betonquest.quest.condition.block; +import org.betonquest.betonquest.api.quest.QuestException; import org.betonquest.betonquest.api.quest.condition.PlayerCondition; import org.betonquest.betonquest.api.quest.condition.PlayerConditionFactory; import org.betonquest.betonquest.api.quest.condition.PlayerlessCondition; import org.betonquest.betonquest.api.quest.condition.PlayerlessConditionFactory; import org.betonquest.betonquest.api.quest.condition.nullable.NullableConditionAdapter; -import org.betonquest.betonquest.exception.QuestException; import org.betonquest.betonquest.instruction.Instruction; import org.betonquest.betonquest.instruction.variable.location.VariableLocation; import org.betonquest.betonquest.quest.PrimaryServerThreadData; diff --git a/src/main/java/org/betonquest/betonquest/quest/condition/burning/BurningCondition.java b/src/main/java/org/betonquest/betonquest/quest/condition/burning/BurningCondition.java index 50237aea18..bc2fb70d0c 100644 --- a/src/main/java/org/betonquest/betonquest/quest/condition/burning/BurningCondition.java +++ b/src/main/java/org/betonquest/betonquest/quest/condition/burning/BurningCondition.java @@ -1,8 +1,8 @@ package org.betonquest.betonquest.quest.condition.burning; import org.betonquest.betonquest.api.profile.OnlineProfile; +import org.betonquest.betonquest.api.quest.QuestException; import org.betonquest.betonquest.api.quest.condition.online.OnlineCondition; -import org.betonquest.betonquest.exception.QuestException; /** * Checks if the player is burning. diff --git a/src/main/java/org/betonquest/betonquest/quest/condition/burning/BurningConditionFactory.java b/src/main/java/org/betonquest/betonquest/quest/condition/burning/BurningConditionFactory.java index d191c42507..34047e0322 100644 --- a/src/main/java/org/betonquest/betonquest/quest/condition/burning/BurningConditionFactory.java +++ b/src/main/java/org/betonquest/betonquest/quest/condition/burning/BurningConditionFactory.java @@ -2,10 +2,10 @@ import org.betonquest.betonquest.api.logger.BetonQuestLogger; import org.betonquest.betonquest.api.logger.BetonQuestLoggerFactory; +import org.betonquest.betonquest.api.quest.QuestException; import org.betonquest.betonquest.api.quest.condition.PlayerCondition; import org.betonquest.betonquest.api.quest.condition.PlayerConditionFactory; import org.betonquest.betonquest.api.quest.condition.online.OnlineConditionAdapter; -import org.betonquest.betonquest.exception.QuestException; import org.betonquest.betonquest.instruction.Instruction; import org.betonquest.betonquest.quest.PrimaryServerThreadData; import org.betonquest.betonquest.quest.condition.PrimaryServerThreadPlayerCondition; diff --git a/src/main/java/org/betonquest/betonquest/quest/condition/check/CheckCondition.java b/src/main/java/org/betonquest/betonquest/quest/condition/check/CheckCondition.java index 18a4fd31db..62b3361857 100644 --- a/src/main/java/org/betonquest/betonquest/quest/condition/check/CheckCondition.java +++ b/src/main/java/org/betonquest/betonquest/quest/condition/check/CheckCondition.java @@ -2,8 +2,8 @@ import org.betonquest.betonquest.api.Condition; import org.betonquest.betonquest.api.profile.Profile; +import org.betonquest.betonquest.api.quest.QuestException; import org.betonquest.betonquest.api.quest.condition.nullable.NullableCondition; -import org.betonquest.betonquest.exception.QuestException; import org.jetbrains.annotations.Nullable; import java.util.List; diff --git a/src/main/java/org/betonquest/betonquest/quest/condition/check/CheckConditionFactory.java b/src/main/java/org/betonquest/betonquest/quest/condition/check/CheckConditionFactory.java index 0c7b395afd..467adaf61b 100644 --- a/src/main/java/org/betonquest/betonquest/quest/condition/check/CheckConditionFactory.java +++ b/src/main/java/org/betonquest/betonquest/quest/condition/check/CheckConditionFactory.java @@ -4,13 +4,13 @@ import org.betonquest.betonquest.api.Condition; import org.betonquest.betonquest.api.config.quest.QuestPackage; import org.betonquest.betonquest.api.logger.BetonQuestLogger; +import org.betonquest.betonquest.api.quest.QuestException; import org.betonquest.betonquest.api.quest.condition.PlayerCondition; import org.betonquest.betonquest.api.quest.condition.PlayerConditionFactory; import org.betonquest.betonquest.api.quest.condition.PlayerlessCondition; import org.betonquest.betonquest.api.quest.condition.PlayerlessConditionFactory; import org.betonquest.betonquest.api.quest.condition.nullable.NullableConditionAdapter; import org.betonquest.betonquest.exception.ObjectNotFoundException; -import org.betonquest.betonquest.exception.QuestException; import org.betonquest.betonquest.id.NoID; import org.betonquest.betonquest.instruction.Instruction; import org.betonquest.betonquest.quest.legacy.LegacyTypeFactory; diff --git a/src/main/java/org/betonquest/betonquest/quest/condition/chest/ChestItemCondition.java b/src/main/java/org/betonquest/betonquest/quest/condition/chest/ChestItemCondition.java index 01440aff60..1d0a2db63c 100644 --- a/src/main/java/org/betonquest/betonquest/quest/condition/chest/ChestItemCondition.java +++ b/src/main/java/org/betonquest/betonquest/quest/condition/chest/ChestItemCondition.java @@ -1,8 +1,8 @@ package org.betonquest.betonquest.quest.condition.chest; import org.betonquest.betonquest.api.profile.Profile; +import org.betonquest.betonquest.api.quest.QuestException; import org.betonquest.betonquest.api.quest.condition.nullable.NullableCondition; -import org.betonquest.betonquest.exception.QuestException; import org.betonquest.betonquest.instruction.Item; import org.betonquest.betonquest.instruction.variable.location.VariableLocation; import org.bukkit.block.Block; diff --git a/src/main/java/org/betonquest/betonquest/quest/condition/chest/ChestItemConditionFactory.java b/src/main/java/org/betonquest/betonquest/quest/condition/chest/ChestItemConditionFactory.java index c93c26240b..2ab996bb25 100644 --- a/src/main/java/org/betonquest/betonquest/quest/condition/chest/ChestItemConditionFactory.java +++ b/src/main/java/org/betonquest/betonquest/quest/condition/chest/ChestItemConditionFactory.java @@ -1,11 +1,11 @@ package org.betonquest.betonquest.quest.condition.chest; +import org.betonquest.betonquest.api.quest.QuestException; import org.betonquest.betonquest.api.quest.condition.PlayerCondition; import org.betonquest.betonquest.api.quest.condition.PlayerConditionFactory; import org.betonquest.betonquest.api.quest.condition.PlayerlessCondition; import org.betonquest.betonquest.api.quest.condition.PlayerlessConditionFactory; import org.betonquest.betonquest.api.quest.condition.nullable.NullableConditionAdapter; -import org.betonquest.betonquest.exception.QuestException; import org.betonquest.betonquest.instruction.Instruction; import org.betonquest.betonquest.instruction.Item; import org.betonquest.betonquest.instruction.variable.location.VariableLocation; diff --git a/src/main/java/org/betonquest/betonquest/quest/condition/conversation/ConversationCondition.java b/src/main/java/org/betonquest/betonquest/quest/condition/conversation/ConversationCondition.java index 55f685edc4..86afafc66d 100644 --- a/src/main/java/org/betonquest/betonquest/quest/condition/conversation/ConversationCondition.java +++ b/src/main/java/org/betonquest/betonquest/quest/condition/conversation/ConversationCondition.java @@ -2,10 +2,10 @@ import org.betonquest.betonquest.BetonQuest; import org.betonquest.betonquest.api.profile.Profile; +import org.betonquest.betonquest.api.quest.QuestException; import org.betonquest.betonquest.api.quest.condition.PlayerCondition; import org.betonquest.betonquest.conversation.ConversationData; import org.betonquest.betonquest.exception.ObjectNotFoundException; -import org.betonquest.betonquest.exception.QuestException; import org.betonquest.betonquest.id.ConversationID; /** diff --git a/src/main/java/org/betonquest/betonquest/quest/condition/conversation/ConversationConditionFactory.java b/src/main/java/org/betonquest/betonquest/quest/condition/conversation/ConversationConditionFactory.java index 33159f1834..45bc456c9c 100644 --- a/src/main/java/org/betonquest/betonquest/quest/condition/conversation/ConversationConditionFactory.java +++ b/src/main/java/org/betonquest/betonquest/quest/condition/conversation/ConversationConditionFactory.java @@ -1,9 +1,9 @@ package org.betonquest.betonquest.quest.condition.conversation; +import org.betonquest.betonquest.api.quest.QuestException; import org.betonquest.betonquest.api.quest.condition.PlayerCondition; import org.betonquest.betonquest.api.quest.condition.PlayerConditionFactory; import org.betonquest.betonquest.exception.ObjectNotFoundException; -import org.betonquest.betonquest.exception.QuestException; import org.betonquest.betonquest.id.ConversationID; import org.betonquest.betonquest.instruction.Instruction; diff --git a/src/main/java/org/betonquest/betonquest/quest/condition/conversation/InConversationCondition.java b/src/main/java/org/betonquest/betonquest/quest/condition/conversation/InConversationCondition.java index 343521acff..c6412aa457 100644 --- a/src/main/java/org/betonquest/betonquest/quest/condition/conversation/InConversationCondition.java +++ b/src/main/java/org/betonquest/betonquest/quest/condition/conversation/InConversationCondition.java @@ -1,9 +1,9 @@ package org.betonquest.betonquest.quest.condition.conversation; import org.betonquest.betonquest.api.profile.Profile; +import org.betonquest.betonquest.api.quest.QuestException; import org.betonquest.betonquest.api.quest.condition.PlayerCondition; import org.betonquest.betonquest.conversation.Conversation; -import org.betonquest.betonquest.exception.QuestException; import org.betonquest.betonquest.id.ConversationID; import org.jetbrains.annotations.Nullable; diff --git a/src/main/java/org/betonquest/betonquest/quest/condition/conversation/InConversationConditionFactory.java b/src/main/java/org/betonquest/betonquest/quest/condition/conversation/InConversationConditionFactory.java index 6da9bc1701..66acba57a7 100644 --- a/src/main/java/org/betonquest/betonquest/quest/condition/conversation/InConversationConditionFactory.java +++ b/src/main/java/org/betonquest/betonquest/quest/condition/conversation/InConversationConditionFactory.java @@ -1,9 +1,9 @@ package org.betonquest.betonquest.quest.condition.conversation; +import org.betonquest.betonquest.api.quest.QuestException; import org.betonquest.betonquest.api.quest.condition.PlayerCondition; import org.betonquest.betonquest.api.quest.condition.PlayerConditionFactory; import org.betonquest.betonquest.exception.ObjectNotFoundException; -import org.betonquest.betonquest.exception.QuestException; import org.betonquest.betonquest.id.ConversationID; import org.betonquest.betonquest.instruction.Instruction; diff --git a/src/main/java/org/betonquest/betonquest/quest/condition/effect/EffectCondition.java b/src/main/java/org/betonquest/betonquest/quest/condition/effect/EffectCondition.java index 3fa61f5e6f..70d1d2f01e 100644 --- a/src/main/java/org/betonquest/betonquest/quest/condition/effect/EffectCondition.java +++ b/src/main/java/org/betonquest/betonquest/quest/condition/effect/EffectCondition.java @@ -1,8 +1,8 @@ package org.betonquest.betonquest.quest.condition.effect; import org.betonquest.betonquest.api.profile.OnlineProfile; +import org.betonquest.betonquest.api.quest.QuestException; import org.betonquest.betonquest.api.quest.condition.online.OnlineCondition; -import org.betonquest.betonquest.exception.QuestException; import org.bukkit.potion.PotionEffectType; /** diff --git a/src/main/java/org/betonquest/betonquest/quest/condition/effect/EffectConditionFactory.java b/src/main/java/org/betonquest/betonquest/quest/condition/effect/EffectConditionFactory.java index 5a3bf5ec53..ac29658a98 100644 --- a/src/main/java/org/betonquest/betonquest/quest/condition/effect/EffectConditionFactory.java +++ b/src/main/java/org/betonquest/betonquest/quest/condition/effect/EffectConditionFactory.java @@ -2,10 +2,10 @@ import org.betonquest.betonquest.api.logger.BetonQuestLogger; import org.betonquest.betonquest.api.logger.BetonQuestLoggerFactory; +import org.betonquest.betonquest.api.quest.QuestException; import org.betonquest.betonquest.api.quest.condition.PlayerCondition; import org.betonquest.betonquest.api.quest.condition.PlayerConditionFactory; import org.betonquest.betonquest.api.quest.condition.online.OnlineConditionAdapter; -import org.betonquest.betonquest.exception.QuestException; import org.betonquest.betonquest.instruction.Instruction; import org.betonquest.betonquest.quest.PrimaryServerThreadData; import org.betonquest.betonquest.quest.condition.PrimaryServerThreadPlayerCondition; diff --git a/src/main/java/org/betonquest/betonquest/quest/condition/entity/EntityCondition.java b/src/main/java/org/betonquest/betonquest/quest/condition/entity/EntityCondition.java index 9532983ca2..4f1f035024 100644 --- a/src/main/java/org/betonquest/betonquest/quest/condition/entity/EntityCondition.java +++ b/src/main/java/org/betonquest/betonquest/quest/condition/entity/EntityCondition.java @@ -1,8 +1,8 @@ package org.betonquest.betonquest.quest.condition.entity; import org.betonquest.betonquest.api.profile.Profile; +import org.betonquest.betonquest.api.quest.QuestException; import org.betonquest.betonquest.api.quest.condition.nullable.NullableCondition; -import org.betonquest.betonquest.exception.QuestException; import org.betonquest.betonquest.instruction.variable.VariableNumber; import org.betonquest.betonquest.instruction.variable.VariableString; import org.betonquest.betonquest.instruction.variable.location.VariableLocation; diff --git a/src/main/java/org/betonquest/betonquest/quest/condition/entity/EntityConditionFactory.java b/src/main/java/org/betonquest/betonquest/quest/condition/entity/EntityConditionFactory.java index c11b22fa35..7bb8da5b74 100644 --- a/src/main/java/org/betonquest/betonquest/quest/condition/entity/EntityConditionFactory.java +++ b/src/main/java/org/betonquest/betonquest/quest/condition/entity/EntityConditionFactory.java @@ -1,11 +1,11 @@ package org.betonquest.betonquest.quest.condition.entity; +import org.betonquest.betonquest.api.quest.QuestException; import org.betonquest.betonquest.api.quest.condition.PlayerCondition; import org.betonquest.betonquest.api.quest.condition.PlayerConditionFactory; import org.betonquest.betonquest.api.quest.condition.PlayerlessCondition; import org.betonquest.betonquest.api.quest.condition.PlayerlessConditionFactory; import org.betonquest.betonquest.api.quest.condition.nullable.NullableConditionAdapter; -import org.betonquest.betonquest.exception.QuestException; import org.betonquest.betonquest.instruction.Instruction; import org.betonquest.betonquest.instruction.variable.VariableNumber; import org.betonquest.betonquest.instruction.variable.VariableString; diff --git a/src/main/java/org/betonquest/betonquest/quest/condition/experience/ExperienceCondition.java b/src/main/java/org/betonquest/betonquest/quest/condition/experience/ExperienceCondition.java index e837950705..9cb29133c5 100644 --- a/src/main/java/org/betonquest/betonquest/quest/condition/experience/ExperienceCondition.java +++ b/src/main/java/org/betonquest/betonquest/quest/condition/experience/ExperienceCondition.java @@ -1,8 +1,8 @@ package org.betonquest.betonquest.quest.condition.experience; import org.betonquest.betonquest.api.profile.OnlineProfile; +import org.betonquest.betonquest.api.quest.QuestException; import org.betonquest.betonquest.api.quest.condition.online.OnlineCondition; -import org.betonquest.betonquest.exception.QuestException; import org.betonquest.betonquest.instruction.variable.VariableNumber; /** diff --git a/src/main/java/org/betonquest/betonquest/quest/condition/experience/ExperienceConditionFactory.java b/src/main/java/org/betonquest/betonquest/quest/condition/experience/ExperienceConditionFactory.java index 04e8affc25..48b88be1c9 100644 --- a/src/main/java/org/betonquest/betonquest/quest/condition/experience/ExperienceConditionFactory.java +++ b/src/main/java/org/betonquest/betonquest/quest/condition/experience/ExperienceConditionFactory.java @@ -2,10 +2,10 @@ import org.betonquest.betonquest.api.logger.BetonQuestLogger; import org.betonquest.betonquest.api.logger.BetonQuestLoggerFactory; +import org.betonquest.betonquest.api.quest.QuestException; import org.betonquest.betonquest.api.quest.condition.PlayerCondition; import org.betonquest.betonquest.api.quest.condition.PlayerConditionFactory; import org.betonquest.betonquest.api.quest.condition.online.OnlineConditionAdapter; -import org.betonquest.betonquest.exception.QuestException; import org.betonquest.betonquest.instruction.Instruction; import org.betonquest.betonquest.instruction.variable.VariableNumber; import org.betonquest.betonquest.quest.PrimaryServerThreadData; diff --git a/src/main/java/org/betonquest/betonquest/quest/condition/facing/FacingCondition.java b/src/main/java/org/betonquest/betonquest/quest/condition/facing/FacingCondition.java index 137d83ed8a..ee5a1bd1c5 100644 --- a/src/main/java/org/betonquest/betonquest/quest/condition/facing/FacingCondition.java +++ b/src/main/java/org/betonquest/betonquest/quest/condition/facing/FacingCondition.java @@ -1,8 +1,8 @@ package org.betonquest.betonquest.quest.condition.facing; import org.betonquest.betonquest.api.profile.OnlineProfile; +import org.betonquest.betonquest.api.quest.QuestException; import org.betonquest.betonquest.api.quest.condition.online.OnlineCondition; -import org.betonquest.betonquest.exception.QuestException; import org.bukkit.Location; /** diff --git a/src/main/java/org/betonquest/betonquest/quest/condition/facing/FacingConditionFactory.java b/src/main/java/org/betonquest/betonquest/quest/condition/facing/FacingConditionFactory.java index cf80247595..47625a3340 100644 --- a/src/main/java/org/betonquest/betonquest/quest/condition/facing/FacingConditionFactory.java +++ b/src/main/java/org/betonquest/betonquest/quest/condition/facing/FacingConditionFactory.java @@ -2,10 +2,10 @@ import org.betonquest.betonquest.api.logger.BetonQuestLogger; import org.betonquest.betonquest.api.logger.BetonQuestLoggerFactory; +import org.betonquest.betonquest.api.quest.QuestException; import org.betonquest.betonquest.api.quest.condition.PlayerCondition; import org.betonquest.betonquest.api.quest.condition.PlayerConditionFactory; import org.betonquest.betonquest.api.quest.condition.online.OnlineConditionAdapter; -import org.betonquest.betonquest.exception.QuestException; import org.betonquest.betonquest.instruction.Instruction; import org.betonquest.betonquest.quest.PrimaryServerThreadData; import org.betonquest.betonquest.quest.condition.PrimaryServerThreadPlayerCondition; diff --git a/src/main/java/org/betonquest/betonquest/quest/condition/flying/FlyingCondition.java b/src/main/java/org/betonquest/betonquest/quest/condition/flying/FlyingCondition.java index eed5704d56..55e0aab2ce 100644 --- a/src/main/java/org/betonquest/betonquest/quest/condition/flying/FlyingCondition.java +++ b/src/main/java/org/betonquest/betonquest/quest/condition/flying/FlyingCondition.java @@ -1,8 +1,8 @@ package org.betonquest.betonquest.quest.condition.flying; import org.betonquest.betonquest.api.profile.OnlineProfile; +import org.betonquest.betonquest.api.quest.QuestException; import org.betonquest.betonquest.api.quest.condition.online.OnlineCondition; -import org.betonquest.betonquest.exception.QuestException; /** * Checks if the player is gliding with elytra. diff --git a/src/main/java/org/betonquest/betonquest/quest/condition/flying/FlyingConditionFactory.java b/src/main/java/org/betonquest/betonquest/quest/condition/flying/FlyingConditionFactory.java index a1fd8cee9e..833563ff4e 100644 --- a/src/main/java/org/betonquest/betonquest/quest/condition/flying/FlyingConditionFactory.java +++ b/src/main/java/org/betonquest/betonquest/quest/condition/flying/FlyingConditionFactory.java @@ -2,10 +2,10 @@ import org.betonquest.betonquest.api.logger.BetonQuestLogger; import org.betonquest.betonquest.api.logger.BetonQuestLoggerFactory; +import org.betonquest.betonquest.api.quest.QuestException; import org.betonquest.betonquest.api.quest.condition.PlayerCondition; import org.betonquest.betonquest.api.quest.condition.PlayerConditionFactory; import org.betonquest.betonquest.api.quest.condition.online.OnlineConditionAdapter; -import org.betonquest.betonquest.exception.QuestException; import org.betonquest.betonquest.instruction.Instruction; import org.betonquest.betonquest.quest.PrimaryServerThreadData; import org.betonquest.betonquest.quest.condition.PrimaryServerThreadPlayerCondition; diff --git a/src/main/java/org/betonquest/betonquest/quest/condition/gamemode/GameModeCondition.java b/src/main/java/org/betonquest/betonquest/quest/condition/gamemode/GameModeCondition.java index 7209f6c975..a589181a28 100644 --- a/src/main/java/org/betonquest/betonquest/quest/condition/gamemode/GameModeCondition.java +++ b/src/main/java/org/betonquest/betonquest/quest/condition/gamemode/GameModeCondition.java @@ -1,8 +1,8 @@ package org.betonquest.betonquest.quest.condition.gamemode; import org.betonquest.betonquest.api.profile.OnlineProfile; +import org.betonquest.betonquest.api.quest.QuestException; import org.betonquest.betonquest.api.quest.condition.online.OnlineCondition; -import org.betonquest.betonquest.exception.QuestException; import org.bukkit.GameMode; /** diff --git a/src/main/java/org/betonquest/betonquest/quest/condition/gamemode/GameModeConditionFactory.java b/src/main/java/org/betonquest/betonquest/quest/condition/gamemode/GameModeConditionFactory.java index 7d3189efe9..18f7995d1e 100644 --- a/src/main/java/org/betonquest/betonquest/quest/condition/gamemode/GameModeConditionFactory.java +++ b/src/main/java/org/betonquest/betonquest/quest/condition/gamemode/GameModeConditionFactory.java @@ -2,10 +2,10 @@ import org.betonquest.betonquest.api.logger.BetonQuestLogger; import org.betonquest.betonquest.api.logger.BetonQuestLoggerFactory; +import org.betonquest.betonquest.api.quest.QuestException; import org.betonquest.betonquest.api.quest.condition.PlayerCondition; import org.betonquest.betonquest.api.quest.condition.PlayerConditionFactory; import org.betonquest.betonquest.api.quest.condition.online.OnlineConditionAdapter; -import org.betonquest.betonquest.exception.QuestException; import org.betonquest.betonquest.instruction.Instruction; import org.betonquest.betonquest.quest.PrimaryServerThreadData; import org.betonquest.betonquest.quest.condition.PrimaryServerThreadPlayerCondition; diff --git a/src/main/java/org/betonquest/betonquest/quest/condition/hand/HandCondition.java b/src/main/java/org/betonquest/betonquest/quest/condition/hand/HandCondition.java index c460ef502d..fbfdc45e4a 100644 --- a/src/main/java/org/betonquest/betonquest/quest/condition/hand/HandCondition.java +++ b/src/main/java/org/betonquest/betonquest/quest/condition/hand/HandCondition.java @@ -1,8 +1,8 @@ package org.betonquest.betonquest.quest.condition.hand; import org.betonquest.betonquest.api.profile.OnlineProfile; +import org.betonquest.betonquest.api.quest.QuestException; import org.betonquest.betonquest.api.quest.condition.online.OnlineCondition; -import org.betonquest.betonquest.exception.QuestException; import org.betonquest.betonquest.item.QuestItem; import org.bukkit.inventory.PlayerInventory; diff --git a/src/main/java/org/betonquest/betonquest/quest/condition/hand/HandConditionFactory.java b/src/main/java/org/betonquest/betonquest/quest/condition/hand/HandConditionFactory.java index 927be89910..52d04b9ca6 100644 --- a/src/main/java/org/betonquest/betonquest/quest/condition/hand/HandConditionFactory.java +++ b/src/main/java/org/betonquest/betonquest/quest/condition/hand/HandConditionFactory.java @@ -2,10 +2,10 @@ import org.betonquest.betonquest.api.logger.BetonQuestLogger; import org.betonquest.betonquest.api.logger.BetonQuestLoggerFactory; +import org.betonquest.betonquest.api.quest.QuestException; import org.betonquest.betonquest.api.quest.condition.PlayerCondition; import org.betonquest.betonquest.api.quest.condition.PlayerConditionFactory; import org.betonquest.betonquest.api.quest.condition.online.OnlineConditionAdapter; -import org.betonquest.betonquest.exception.QuestException; import org.betonquest.betonquest.id.ItemID; import org.betonquest.betonquest.instruction.Instruction; import org.betonquest.betonquest.item.QuestItem; diff --git a/src/main/java/org/betonquest/betonquest/quest/condition/health/HealthCondition.java b/src/main/java/org/betonquest/betonquest/quest/condition/health/HealthCondition.java index 4c529b0273..d9f4a94738 100644 --- a/src/main/java/org/betonquest/betonquest/quest/condition/health/HealthCondition.java +++ b/src/main/java/org/betonquest/betonquest/quest/condition/health/HealthCondition.java @@ -1,8 +1,8 @@ package org.betonquest.betonquest.quest.condition.health; import org.betonquest.betonquest.api.profile.OnlineProfile; +import org.betonquest.betonquest.api.quest.QuestException; import org.betonquest.betonquest.api.quest.condition.online.OnlineCondition; -import org.betonquest.betonquest.exception.QuestException; import org.betonquest.betonquest.instruction.variable.VariableNumber; /** diff --git a/src/main/java/org/betonquest/betonquest/quest/condition/health/HealthConditionFactory.java b/src/main/java/org/betonquest/betonquest/quest/condition/health/HealthConditionFactory.java index d83ddae062..54693a3128 100644 --- a/src/main/java/org/betonquest/betonquest/quest/condition/health/HealthConditionFactory.java +++ b/src/main/java/org/betonquest/betonquest/quest/condition/health/HealthConditionFactory.java @@ -2,10 +2,10 @@ import org.betonquest.betonquest.api.logger.BetonQuestLogger; import org.betonquest.betonquest.api.logger.BetonQuestLoggerFactory; +import org.betonquest.betonquest.api.quest.QuestException; import org.betonquest.betonquest.api.quest.condition.PlayerCondition; import org.betonquest.betonquest.api.quest.condition.PlayerConditionFactory; import org.betonquest.betonquest.api.quest.condition.online.OnlineConditionAdapter; -import org.betonquest.betonquest.exception.QuestException; import org.betonquest.betonquest.instruction.Instruction; import org.betonquest.betonquest.instruction.variable.VariableNumber; import org.betonquest.betonquest.quest.PrimaryServerThreadData; diff --git a/src/main/java/org/betonquest/betonquest/quest/condition/height/HeightCondition.java b/src/main/java/org/betonquest/betonquest/quest/condition/height/HeightCondition.java index 5deed9385a..f8e23cb3db 100644 --- a/src/main/java/org/betonquest/betonquest/quest/condition/height/HeightCondition.java +++ b/src/main/java/org/betonquest/betonquest/quest/condition/height/HeightCondition.java @@ -1,8 +1,8 @@ package org.betonquest.betonquest.quest.condition.height; import org.betonquest.betonquest.api.profile.OnlineProfile; +import org.betonquest.betonquest.api.quest.QuestException; import org.betonquest.betonquest.api.quest.condition.online.OnlineCondition; -import org.betonquest.betonquest.exception.QuestException; import org.betonquest.betonquest.instruction.variable.Variable; /** diff --git a/src/main/java/org/betonquest/betonquest/quest/condition/height/HeightConditionFactory.java b/src/main/java/org/betonquest/betonquest/quest/condition/height/HeightConditionFactory.java index e5729f2663..f1262af109 100644 --- a/src/main/java/org/betonquest/betonquest/quest/condition/height/HeightConditionFactory.java +++ b/src/main/java/org/betonquest/betonquest/quest/condition/height/HeightConditionFactory.java @@ -2,10 +2,10 @@ import org.betonquest.betonquest.api.logger.BetonQuestLogger; import org.betonquest.betonquest.api.logger.BetonQuestLoggerFactory; +import org.betonquest.betonquest.api.quest.QuestException; import org.betonquest.betonquest.api.quest.condition.PlayerCondition; import org.betonquest.betonquest.api.quest.condition.PlayerConditionFactory; import org.betonquest.betonquest.api.quest.condition.online.OnlineConditionAdapter; -import org.betonquest.betonquest.exception.QuestException; import org.betonquest.betonquest.instruction.Instruction; import org.betonquest.betonquest.instruction.variable.Variable; import org.betonquest.betonquest.instruction.variable.location.VariableLocation; diff --git a/src/main/java/org/betonquest/betonquest/quest/condition/hunger/HungerCondition.java b/src/main/java/org/betonquest/betonquest/quest/condition/hunger/HungerCondition.java index e5b19a95bf..d0c27f7ce0 100644 --- a/src/main/java/org/betonquest/betonquest/quest/condition/hunger/HungerCondition.java +++ b/src/main/java/org/betonquest/betonquest/quest/condition/hunger/HungerCondition.java @@ -1,8 +1,8 @@ package org.betonquest.betonquest.quest.condition.hunger; import org.betonquest.betonquest.api.profile.OnlineProfile; +import org.betonquest.betonquest.api.quest.QuestException; import org.betonquest.betonquest.api.quest.condition.online.OnlineCondition; -import org.betonquest.betonquest.exception.QuestException; import org.betonquest.betonquest.instruction.variable.VariableNumber; /** diff --git a/src/main/java/org/betonquest/betonquest/quest/condition/hunger/HungerConditionFactory.java b/src/main/java/org/betonquest/betonquest/quest/condition/hunger/HungerConditionFactory.java index 25012021f6..873fcb0463 100644 --- a/src/main/java/org/betonquest/betonquest/quest/condition/hunger/HungerConditionFactory.java +++ b/src/main/java/org/betonquest/betonquest/quest/condition/hunger/HungerConditionFactory.java @@ -2,10 +2,10 @@ import org.betonquest.betonquest.api.logger.BetonQuestLogger; import org.betonquest.betonquest.api.logger.BetonQuestLoggerFactory; +import org.betonquest.betonquest.api.quest.QuestException; import org.betonquest.betonquest.api.quest.condition.PlayerCondition; import org.betonquest.betonquest.api.quest.condition.PlayerConditionFactory; import org.betonquest.betonquest.api.quest.condition.online.OnlineConditionAdapter; -import org.betonquest.betonquest.exception.QuestException; import org.betonquest.betonquest.instruction.Instruction; import org.betonquest.betonquest.instruction.variable.VariableNumber; import org.betonquest.betonquest.quest.PrimaryServerThreadData; diff --git a/src/main/java/org/betonquest/betonquest/quest/condition/item/ItemCondition.java b/src/main/java/org/betonquest/betonquest/quest/condition/item/ItemCondition.java index 91519fb6af..d0cb456ebc 100644 --- a/src/main/java/org/betonquest/betonquest/quest/condition/item/ItemCondition.java +++ b/src/main/java/org/betonquest/betonquest/quest/condition/item/ItemCondition.java @@ -1,9 +1,9 @@ package org.betonquest.betonquest.quest.condition.item; import org.betonquest.betonquest.api.profile.OnlineProfile; +import org.betonquest.betonquest.api.quest.QuestException; import org.betonquest.betonquest.api.quest.condition.online.OnlineCondition; import org.betonquest.betonquest.data.PlayerDataStorage; -import org.betonquest.betonquest.exception.QuestException; import org.betonquest.betonquest.instruction.Item; import org.bukkit.inventory.ItemStack; diff --git a/src/main/java/org/betonquest/betonquest/quest/condition/item/ItemConditionFactory.java b/src/main/java/org/betonquest/betonquest/quest/condition/item/ItemConditionFactory.java index 92a624ee14..58c0e5f515 100644 --- a/src/main/java/org/betonquest/betonquest/quest/condition/item/ItemConditionFactory.java +++ b/src/main/java/org/betonquest/betonquest/quest/condition/item/ItemConditionFactory.java @@ -2,11 +2,11 @@ import org.betonquest.betonquest.api.logger.BetonQuestLogger; import org.betonquest.betonquest.api.logger.BetonQuestLoggerFactory; +import org.betonquest.betonquest.api.quest.QuestException; import org.betonquest.betonquest.api.quest.condition.PlayerCondition; import org.betonquest.betonquest.api.quest.condition.PlayerConditionFactory; import org.betonquest.betonquest.api.quest.condition.online.OnlineConditionAdapter; import org.betonquest.betonquest.data.PlayerDataStorage; -import org.betonquest.betonquest.exception.QuestException; import org.betonquest.betonquest.instruction.Instruction; import org.betonquest.betonquest.instruction.Item; import org.betonquest.betonquest.quest.PrimaryServerThreadData; diff --git a/src/main/java/org/betonquest/betonquest/quest/condition/item/ItemDurabilityCondition.java b/src/main/java/org/betonquest/betonquest/quest/condition/item/ItemDurabilityCondition.java index 47b09a8b81..ac34f04536 100644 --- a/src/main/java/org/betonquest/betonquest/quest/condition/item/ItemDurabilityCondition.java +++ b/src/main/java/org/betonquest/betonquest/quest/condition/item/ItemDurabilityCondition.java @@ -1,8 +1,8 @@ package org.betonquest.betonquest.quest.condition.item; import org.betonquest.betonquest.api.profile.OnlineProfile; +import org.betonquest.betonquest.api.quest.QuestException; import org.betonquest.betonquest.api.quest.condition.online.OnlineCondition; -import org.betonquest.betonquest.exception.QuestException; import org.betonquest.betonquest.instruction.variable.VariableNumber; import org.bukkit.inventory.EquipmentSlot; import org.bukkit.inventory.ItemStack; diff --git a/src/main/java/org/betonquest/betonquest/quest/condition/item/ItemDurabilityConditionFactory.java b/src/main/java/org/betonquest/betonquest/quest/condition/item/ItemDurabilityConditionFactory.java index 13c1c3f35b..32fdfa3a29 100644 --- a/src/main/java/org/betonquest/betonquest/quest/condition/item/ItemDurabilityConditionFactory.java +++ b/src/main/java/org/betonquest/betonquest/quest/condition/item/ItemDurabilityConditionFactory.java @@ -2,10 +2,10 @@ import org.betonquest.betonquest.api.logger.BetonQuestLogger; import org.betonquest.betonquest.api.logger.BetonQuestLoggerFactory; +import org.betonquest.betonquest.api.quest.QuestException; import org.betonquest.betonquest.api.quest.condition.PlayerCondition; import org.betonquest.betonquest.api.quest.condition.PlayerConditionFactory; import org.betonquest.betonquest.api.quest.condition.online.OnlineConditionAdapter; -import org.betonquest.betonquest.exception.QuestException; import org.betonquest.betonquest.instruction.Instruction; import org.betonquest.betonquest.instruction.variable.VariableNumber; import org.betonquest.betonquest.quest.PrimaryServerThreadData; diff --git a/src/main/java/org/betonquest/betonquest/quest/condition/journal/JournalCondition.java b/src/main/java/org/betonquest/betonquest/quest/condition/journal/JournalCondition.java index cc4b519261..bf9cda6438 100644 --- a/src/main/java/org/betonquest/betonquest/quest/condition/journal/JournalCondition.java +++ b/src/main/java/org/betonquest/betonquest/quest/condition/journal/JournalCondition.java @@ -2,9 +2,9 @@ import org.betonquest.betonquest.Pointer; import org.betonquest.betonquest.api.profile.OnlineProfile; +import org.betonquest.betonquest.api.quest.QuestException; import org.betonquest.betonquest.api.quest.condition.online.OnlineCondition; import org.betonquest.betonquest.data.PlayerDataStorage; -import org.betonquest.betonquest.exception.QuestException; /** * A condition to check if a player has a specified pointer in his journal. diff --git a/src/main/java/org/betonquest/betonquest/quest/condition/journal/JournalConditionFactory.java b/src/main/java/org/betonquest/betonquest/quest/condition/journal/JournalConditionFactory.java index f5c3f02e81..8480d0fa10 100644 --- a/src/main/java/org/betonquest/betonquest/quest/condition/journal/JournalConditionFactory.java +++ b/src/main/java/org/betonquest/betonquest/quest/condition/journal/JournalConditionFactory.java @@ -2,11 +2,11 @@ import org.betonquest.betonquest.api.logger.BetonQuestLogger; import org.betonquest.betonquest.api.logger.BetonQuestLoggerFactory; +import org.betonquest.betonquest.api.quest.QuestException; import org.betonquest.betonquest.api.quest.condition.PlayerCondition; import org.betonquest.betonquest.api.quest.condition.PlayerConditionFactory; import org.betonquest.betonquest.api.quest.condition.online.OnlineConditionAdapter; import org.betonquest.betonquest.data.PlayerDataStorage; -import org.betonquest.betonquest.exception.QuestException; import org.betonquest.betonquest.instruction.Instruction; import org.betonquest.betonquest.util.Utils; diff --git a/src/main/java/org/betonquest/betonquest/quest/condition/language/LanguageCondition.java b/src/main/java/org/betonquest/betonquest/quest/condition/language/LanguageCondition.java index 20abd6e468..71ffc64a02 100644 --- a/src/main/java/org/betonquest/betonquest/quest/condition/language/LanguageCondition.java +++ b/src/main/java/org/betonquest/betonquest/quest/condition/language/LanguageCondition.java @@ -1,9 +1,9 @@ package org.betonquest.betonquest.quest.condition.language; import org.betonquest.betonquest.api.profile.Profile; +import org.betonquest.betonquest.api.quest.QuestException; import org.betonquest.betonquest.api.quest.condition.PlayerCondition; import org.betonquest.betonquest.data.PlayerDataStorage; -import org.betonquest.betonquest.exception.QuestException; import java.util.Set; diff --git a/src/main/java/org/betonquest/betonquest/quest/condition/language/LanguageConditionFactory.java b/src/main/java/org/betonquest/betonquest/quest/condition/language/LanguageConditionFactory.java index 6f07fddfe3..9665e1aae9 100644 --- a/src/main/java/org/betonquest/betonquest/quest/condition/language/LanguageConditionFactory.java +++ b/src/main/java/org/betonquest/betonquest/quest/condition/language/LanguageConditionFactory.java @@ -1,10 +1,10 @@ package org.betonquest.betonquest.quest.condition.language; +import org.betonquest.betonquest.api.quest.QuestException; import org.betonquest.betonquest.api.quest.condition.PlayerCondition; import org.betonquest.betonquest.api.quest.condition.PlayerConditionFactory; import org.betonquest.betonquest.config.Config; import org.betonquest.betonquest.data.PlayerDataStorage; -import org.betonquest.betonquest.exception.QuestException; import org.betonquest.betonquest.instruction.Instruction; import java.util.Arrays; diff --git a/src/main/java/org/betonquest/betonquest/quest/condition/location/LocationCondition.java b/src/main/java/org/betonquest/betonquest/quest/condition/location/LocationCondition.java index aa6163ac57..271592d789 100644 --- a/src/main/java/org/betonquest/betonquest/quest/condition/location/LocationCondition.java +++ b/src/main/java/org/betonquest/betonquest/quest/condition/location/LocationCondition.java @@ -1,8 +1,8 @@ package org.betonquest.betonquest.quest.condition.location; import org.betonquest.betonquest.api.profile.OnlineProfile; +import org.betonquest.betonquest.api.quest.QuestException; import org.betonquest.betonquest.api.quest.condition.online.OnlineCondition; -import org.betonquest.betonquest.exception.QuestException; import org.betonquest.betonquest.instruction.variable.VariableNumber; import org.betonquest.betonquest.instruction.variable.location.VariableLocation; import org.bukkit.Location; diff --git a/src/main/java/org/betonquest/betonquest/quest/condition/location/LocationConditionFactory.java b/src/main/java/org/betonquest/betonquest/quest/condition/location/LocationConditionFactory.java index 2d16d249ff..822c6b9476 100644 --- a/src/main/java/org/betonquest/betonquest/quest/condition/location/LocationConditionFactory.java +++ b/src/main/java/org/betonquest/betonquest/quest/condition/location/LocationConditionFactory.java @@ -2,10 +2,10 @@ import org.betonquest.betonquest.api.logger.BetonQuestLogger; import org.betonquest.betonquest.api.logger.BetonQuestLoggerFactory; +import org.betonquest.betonquest.api.quest.QuestException; import org.betonquest.betonquest.api.quest.condition.PlayerCondition; import org.betonquest.betonquest.api.quest.condition.PlayerConditionFactory; import org.betonquest.betonquest.api.quest.condition.online.OnlineConditionAdapter; -import org.betonquest.betonquest.exception.QuestException; import org.betonquest.betonquest.instruction.Instruction; import org.betonquest.betonquest.instruction.variable.VariableNumber; import org.betonquest.betonquest.instruction.variable.location.VariableLocation; diff --git a/src/main/java/org/betonquest/betonquest/quest/condition/logik/AlternativeCondition.java b/src/main/java/org/betonquest/betonquest/quest/condition/logik/AlternativeCondition.java index fa44c1ec17..a2fdc42256 100644 --- a/src/main/java/org/betonquest/betonquest/quest/condition/logik/AlternativeCondition.java +++ b/src/main/java/org/betonquest/betonquest/quest/condition/logik/AlternativeCondition.java @@ -4,8 +4,8 @@ import org.betonquest.betonquest.api.config.quest.QuestPackage; import org.betonquest.betonquest.api.logger.BetonQuestLogger; import org.betonquest.betonquest.api.profile.Profile; +import org.betonquest.betonquest.api.quest.QuestException; import org.betonquest.betonquest.api.quest.condition.nullable.NullableCondition; -import org.betonquest.betonquest.exception.QuestException; import org.betonquest.betonquest.id.ConditionID; import org.bukkit.Bukkit; import org.jetbrains.annotations.Nullable; diff --git a/src/main/java/org/betonquest/betonquest/quest/condition/logik/AlternativeConditionFactory.java b/src/main/java/org/betonquest/betonquest/quest/condition/logik/AlternativeConditionFactory.java index ca474b18e0..1c169168eb 100644 --- a/src/main/java/org/betonquest/betonquest/quest/condition/logik/AlternativeConditionFactory.java +++ b/src/main/java/org/betonquest/betonquest/quest/condition/logik/AlternativeConditionFactory.java @@ -2,12 +2,12 @@ import org.betonquest.betonquest.api.logger.BetonQuestLogger; import org.betonquest.betonquest.api.logger.BetonQuestLoggerFactory; +import org.betonquest.betonquest.api.quest.QuestException; import org.betonquest.betonquest.api.quest.condition.PlayerCondition; import org.betonquest.betonquest.api.quest.condition.PlayerConditionFactory; import org.betonquest.betonquest.api.quest.condition.PlayerlessCondition; import org.betonquest.betonquest.api.quest.condition.PlayerlessConditionFactory; import org.betonquest.betonquest.api.quest.condition.nullable.NullableConditionAdapter; -import org.betonquest.betonquest.exception.QuestException; import org.betonquest.betonquest.id.ConditionID; import org.betonquest.betonquest.instruction.Instruction; diff --git a/src/main/java/org/betonquest/betonquest/quest/condition/logik/ConjunctionCondition.java b/src/main/java/org/betonquest/betonquest/quest/condition/logik/ConjunctionCondition.java index 294befc142..f85af5cbc0 100644 --- a/src/main/java/org/betonquest/betonquest/quest/condition/logik/ConjunctionCondition.java +++ b/src/main/java/org/betonquest/betonquest/quest/condition/logik/ConjunctionCondition.java @@ -2,8 +2,8 @@ import org.betonquest.betonquest.BetonQuest; import org.betonquest.betonquest.api.profile.Profile; +import org.betonquest.betonquest.api.quest.QuestException; import org.betonquest.betonquest.api.quest.condition.nullable.NullableCondition; -import org.betonquest.betonquest.exception.QuestException; import org.betonquest.betonquest.id.ConditionID; import org.jetbrains.annotations.Nullable; diff --git a/src/main/java/org/betonquest/betonquest/quest/condition/logik/ConjunctionConditionFactory.java b/src/main/java/org/betonquest/betonquest/quest/condition/logik/ConjunctionConditionFactory.java index 32a773e451..60d710bd22 100644 --- a/src/main/java/org/betonquest/betonquest/quest/condition/logik/ConjunctionConditionFactory.java +++ b/src/main/java/org/betonquest/betonquest/quest/condition/logik/ConjunctionConditionFactory.java @@ -1,11 +1,11 @@ package org.betonquest.betonquest.quest.condition.logik; +import org.betonquest.betonquest.api.quest.QuestException; import org.betonquest.betonquest.api.quest.condition.PlayerCondition; import org.betonquest.betonquest.api.quest.condition.PlayerConditionFactory; import org.betonquest.betonquest.api.quest.condition.PlayerlessCondition; import org.betonquest.betonquest.api.quest.condition.PlayerlessConditionFactory; import org.betonquest.betonquest.api.quest.condition.nullable.NullableConditionAdapter; -import org.betonquest.betonquest.exception.QuestException; import org.betonquest.betonquest.id.ConditionID; import org.betonquest.betonquest.instruction.Instruction; diff --git a/src/main/java/org/betonquest/betonquest/quest/condition/looking/LookingAtCondition.java b/src/main/java/org/betonquest/betonquest/quest/condition/looking/LookingAtCondition.java index e338f51bc8..f103273d39 100644 --- a/src/main/java/org/betonquest/betonquest/quest/condition/looking/LookingAtCondition.java +++ b/src/main/java/org/betonquest/betonquest/quest/condition/looking/LookingAtCondition.java @@ -1,8 +1,8 @@ package org.betonquest.betonquest.quest.condition.looking; import org.betonquest.betonquest.api.profile.OnlineProfile; +import org.betonquest.betonquest.api.quest.QuestException; import org.betonquest.betonquest.api.quest.condition.online.OnlineCondition; -import org.betonquest.betonquest.exception.QuestException; import org.betonquest.betonquest.instruction.variable.location.VariableLocation; import org.betonquest.betonquest.util.BlockSelector; import org.bukkit.Location; diff --git a/src/main/java/org/betonquest/betonquest/quest/condition/looking/LookingAtConditionFactory.java b/src/main/java/org/betonquest/betonquest/quest/condition/looking/LookingAtConditionFactory.java index a60bc207f9..afee6370c8 100644 --- a/src/main/java/org/betonquest/betonquest/quest/condition/looking/LookingAtConditionFactory.java +++ b/src/main/java/org/betonquest/betonquest/quest/condition/looking/LookingAtConditionFactory.java @@ -2,10 +2,10 @@ import org.betonquest.betonquest.api.logger.BetonQuestLogger; import org.betonquest.betonquest.api.logger.BetonQuestLoggerFactory; +import org.betonquest.betonquest.api.quest.QuestException; import org.betonquest.betonquest.api.quest.condition.PlayerCondition; import org.betonquest.betonquest.api.quest.condition.PlayerConditionFactory; import org.betonquest.betonquest.api.quest.condition.online.OnlineConditionAdapter; -import org.betonquest.betonquest.exception.QuestException; import org.betonquest.betonquest.instruction.Instruction; import org.betonquest.betonquest.instruction.variable.location.VariableLocation; import org.betonquest.betonquest.quest.PrimaryServerThreadData; diff --git a/src/main/java/org/betonquest/betonquest/quest/condition/moon/MoonCycleCondition.java b/src/main/java/org/betonquest/betonquest/quest/condition/moon/MoonCycleCondition.java index f658763407..ca0b03fa27 100644 --- a/src/main/java/org/betonquest/betonquest/quest/condition/moon/MoonCycleCondition.java +++ b/src/main/java/org/betonquest/betonquest/quest/condition/moon/MoonCycleCondition.java @@ -1,8 +1,8 @@ package org.betonquest.betonquest.quest.condition.moon; import org.betonquest.betonquest.api.profile.Profile; +import org.betonquest.betonquest.api.quest.QuestException; import org.betonquest.betonquest.api.quest.condition.nullable.NullableCondition; -import org.betonquest.betonquest.exception.QuestException; import org.betonquest.betonquest.instruction.variable.VariableNumber; import org.betonquest.betonquest.instruction.variable.location.VariableWorld; import org.bukkit.World; diff --git a/src/main/java/org/betonquest/betonquest/quest/condition/moon/MoonCycleConditionFactory.java b/src/main/java/org/betonquest/betonquest/quest/condition/moon/MoonCycleConditionFactory.java index 0b3d532724..71d6555012 100644 --- a/src/main/java/org/betonquest/betonquest/quest/condition/moon/MoonCycleConditionFactory.java +++ b/src/main/java/org/betonquest/betonquest/quest/condition/moon/MoonCycleConditionFactory.java @@ -1,11 +1,11 @@ package org.betonquest.betonquest.quest.condition.moon; +import org.betonquest.betonquest.api.quest.QuestException; import org.betonquest.betonquest.api.quest.condition.PlayerCondition; import org.betonquest.betonquest.api.quest.condition.PlayerConditionFactory; import org.betonquest.betonquest.api.quest.condition.PlayerlessCondition; import org.betonquest.betonquest.api.quest.condition.PlayerlessConditionFactory; import org.betonquest.betonquest.api.quest.condition.nullable.NullableConditionAdapter; -import org.betonquest.betonquest.exception.QuestException; import org.betonquest.betonquest.instruction.Instruction; import org.betonquest.betonquest.instruction.variable.VariableNumber; import org.betonquest.betonquest.instruction.variable.location.VariableWorld; diff --git a/src/main/java/org/betonquest/betonquest/quest/condition/number/NumberCompareCondition.java b/src/main/java/org/betonquest/betonquest/quest/condition/number/NumberCompareCondition.java index e3acfc2f7a..64c2dd3ac4 100644 --- a/src/main/java/org/betonquest/betonquest/quest/condition/number/NumberCompareCondition.java +++ b/src/main/java/org/betonquest/betonquest/quest/condition/number/NumberCompareCondition.java @@ -1,8 +1,8 @@ package org.betonquest.betonquest.quest.condition.number; import org.betonquest.betonquest.api.profile.Profile; +import org.betonquest.betonquest.api.quest.QuestException; import org.betonquest.betonquest.api.quest.condition.nullable.NullableCondition; -import org.betonquest.betonquest.exception.QuestException; import org.betonquest.betonquest.instruction.variable.VariableNumber; import org.jetbrains.annotations.Nullable; diff --git a/src/main/java/org/betonquest/betonquest/quest/condition/number/NumberCompareConditionFactory.java b/src/main/java/org/betonquest/betonquest/quest/condition/number/NumberCompareConditionFactory.java index 625c01c1f4..979ddc63f3 100644 --- a/src/main/java/org/betonquest/betonquest/quest/condition/number/NumberCompareConditionFactory.java +++ b/src/main/java/org/betonquest/betonquest/quest/condition/number/NumberCompareConditionFactory.java @@ -1,11 +1,11 @@ package org.betonquest.betonquest.quest.condition.number; +import org.betonquest.betonquest.api.quest.QuestException; import org.betonquest.betonquest.api.quest.condition.PlayerCondition; import org.betonquest.betonquest.api.quest.condition.PlayerConditionFactory; import org.betonquest.betonquest.api.quest.condition.PlayerlessCondition; import org.betonquest.betonquest.api.quest.condition.PlayerlessConditionFactory; import org.betonquest.betonquest.api.quest.condition.nullable.NullableConditionAdapter; -import org.betonquest.betonquest.exception.QuestException; import org.betonquest.betonquest.instruction.Instruction; import org.betonquest.betonquest.instruction.variable.VariableNumber; diff --git a/src/main/java/org/betonquest/betonquest/quest/condition/number/Operation.java b/src/main/java/org/betonquest/betonquest/quest/condition/number/Operation.java index 90ceb00b0c..dc9cab1a79 100644 --- a/src/main/java/org/betonquest/betonquest/quest/condition/number/Operation.java +++ b/src/main/java/org/betonquest/betonquest/quest/condition/number/Operation.java @@ -1,6 +1,6 @@ package org.betonquest.betonquest.quest.condition.number; -import org.betonquest.betonquest.exception.QuestException; +import org.betonquest.betonquest.api.quest.QuestException; /** * The type of compare. diff --git a/src/main/java/org/betonquest/betonquest/quest/condition/objective/ObjectiveCondition.java b/src/main/java/org/betonquest/betonquest/quest/condition/objective/ObjectiveCondition.java index daa1b04105..712847551f 100644 --- a/src/main/java/org/betonquest/betonquest/quest/condition/objective/ObjectiveCondition.java +++ b/src/main/java/org/betonquest/betonquest/quest/condition/objective/ObjectiveCondition.java @@ -3,8 +3,8 @@ import org.betonquest.betonquest.BetonQuest; import org.betonquest.betonquest.api.Objective; import org.betonquest.betonquest.api.profile.Profile; +import org.betonquest.betonquest.api.quest.QuestException; import org.betonquest.betonquest.api.quest.condition.PlayerCondition; -import org.betonquest.betonquest.exception.QuestException; import org.betonquest.betonquest.id.ObjectiveID; /** diff --git a/src/main/java/org/betonquest/betonquest/quest/condition/objective/ObjectiveConditionFactory.java b/src/main/java/org/betonquest/betonquest/quest/condition/objective/ObjectiveConditionFactory.java index f111b35b51..3a12a80d2d 100644 --- a/src/main/java/org/betonquest/betonquest/quest/condition/objective/ObjectiveConditionFactory.java +++ b/src/main/java/org/betonquest/betonquest/quest/condition/objective/ObjectiveConditionFactory.java @@ -1,9 +1,9 @@ package org.betonquest.betonquest.quest.condition.objective; import org.betonquest.betonquest.BetonQuest; +import org.betonquest.betonquest.api.quest.QuestException; import org.betonquest.betonquest.api.quest.condition.PlayerCondition; import org.betonquest.betonquest.api.quest.condition.PlayerConditionFactory; -import org.betonquest.betonquest.exception.QuestException; import org.betonquest.betonquest.id.ObjectiveID; import org.betonquest.betonquest.instruction.Instruction; diff --git a/src/main/java/org/betonquest/betonquest/quest/condition/party/PartyCondition.java b/src/main/java/org/betonquest/betonquest/quest/condition/party/PartyCondition.java index d1995e98ed..83a158ef62 100644 --- a/src/main/java/org/betonquest/betonquest/quest/condition/party/PartyCondition.java +++ b/src/main/java/org/betonquest/betonquest/quest/condition/party/PartyCondition.java @@ -3,8 +3,8 @@ import org.betonquest.betonquest.BetonQuest; import org.betonquest.betonquest.api.profile.OnlineProfile; import org.betonquest.betonquest.api.profile.Profile; +import org.betonquest.betonquest.api.quest.QuestException; import org.betonquest.betonquest.api.quest.condition.nullable.NullableCondition; -import org.betonquest.betonquest.exception.QuestException; import org.betonquest.betonquest.id.ConditionID; import org.betonquest.betonquest.instruction.variable.VariableNumber; import org.betonquest.betonquest.instruction.variable.location.VariableLocation; diff --git a/src/main/java/org/betonquest/betonquest/quest/condition/party/PartyConditionFactory.java b/src/main/java/org/betonquest/betonquest/quest/condition/party/PartyConditionFactory.java index b892656111..01bcb2f0ad 100644 --- a/src/main/java/org/betonquest/betonquest/quest/condition/party/PartyConditionFactory.java +++ b/src/main/java/org/betonquest/betonquest/quest/condition/party/PartyConditionFactory.java @@ -1,11 +1,11 @@ package org.betonquest.betonquest.quest.condition.party; +import org.betonquest.betonquest.api.quest.QuestException; import org.betonquest.betonquest.api.quest.condition.PlayerCondition; import org.betonquest.betonquest.api.quest.condition.PlayerConditionFactory; import org.betonquest.betonquest.api.quest.condition.PlayerlessCondition; import org.betonquest.betonquest.api.quest.condition.PlayerlessConditionFactory; import org.betonquest.betonquest.api.quest.condition.nullable.NullableConditionAdapter; -import org.betonquest.betonquest.exception.QuestException; import org.betonquest.betonquest.id.ConditionID; import org.betonquest.betonquest.instruction.Instruction; import org.betonquest.betonquest.instruction.variable.VariableNumber; diff --git a/src/main/java/org/betonquest/betonquest/quest/condition/permission/PermissionCondition.java b/src/main/java/org/betonquest/betonquest/quest/condition/permission/PermissionCondition.java index efb7ce1238..8bb7dc2be3 100644 --- a/src/main/java/org/betonquest/betonquest/quest/condition/permission/PermissionCondition.java +++ b/src/main/java/org/betonquest/betonquest/quest/condition/permission/PermissionCondition.java @@ -1,8 +1,8 @@ package org.betonquest.betonquest.quest.condition.permission; import org.betonquest.betonquest.api.profile.OnlineProfile; +import org.betonquest.betonquest.api.quest.QuestException; import org.betonquest.betonquest.api.quest.condition.online.OnlineCondition; -import org.betonquest.betonquest.exception.QuestException; import org.betonquest.betonquest.instruction.variable.VariableString; /** diff --git a/src/main/java/org/betonquest/betonquest/quest/condition/permission/PermissionConditionFactory.java b/src/main/java/org/betonquest/betonquest/quest/condition/permission/PermissionConditionFactory.java index db900b76ae..8a375b11a6 100644 --- a/src/main/java/org/betonquest/betonquest/quest/condition/permission/PermissionConditionFactory.java +++ b/src/main/java/org/betonquest/betonquest/quest/condition/permission/PermissionConditionFactory.java @@ -2,10 +2,10 @@ import org.betonquest.betonquest.api.logger.BetonQuestLogger; import org.betonquest.betonquest.api.logger.BetonQuestLoggerFactory; +import org.betonquest.betonquest.api.quest.QuestException; import org.betonquest.betonquest.api.quest.condition.PlayerCondition; import org.betonquest.betonquest.api.quest.condition.PlayerConditionFactory; import org.betonquest.betonquest.api.quest.condition.online.OnlineConditionAdapter; -import org.betonquest.betonquest.exception.QuestException; import org.betonquest.betonquest.instruction.Instruction; import org.betonquest.betonquest.instruction.variable.VariableString; import org.betonquest.betonquest.quest.PrimaryServerThreadData; diff --git a/src/main/java/org/betonquest/betonquest/quest/condition/point/GlobalPointCondition.java b/src/main/java/org/betonquest/betonquest/quest/condition/point/GlobalPointCondition.java index 544b902dae..3532a98456 100644 --- a/src/main/java/org/betonquest/betonquest/quest/condition/point/GlobalPointCondition.java +++ b/src/main/java/org/betonquest/betonquest/quest/condition/point/GlobalPointCondition.java @@ -2,9 +2,9 @@ import org.betonquest.betonquest.Point; import org.betonquest.betonquest.api.profile.Profile; +import org.betonquest.betonquest.api.quest.QuestException; import org.betonquest.betonquest.api.quest.condition.nullable.NullableCondition; import org.betonquest.betonquest.database.GlobalData; -import org.betonquest.betonquest.exception.QuestException; import org.betonquest.betonquest.instruction.variable.VariableNumber; import org.jetbrains.annotations.Nullable; diff --git a/src/main/java/org/betonquest/betonquest/quest/condition/point/GlobalPointConditionFactory.java b/src/main/java/org/betonquest/betonquest/quest/condition/point/GlobalPointConditionFactory.java index 5e917f2463..9e2d166d49 100644 --- a/src/main/java/org/betonquest/betonquest/quest/condition/point/GlobalPointConditionFactory.java +++ b/src/main/java/org/betonquest/betonquest/quest/condition/point/GlobalPointConditionFactory.java @@ -1,12 +1,12 @@ package org.betonquest.betonquest.quest.condition.point; +import org.betonquest.betonquest.api.quest.QuestException; import org.betonquest.betonquest.api.quest.condition.PlayerCondition; import org.betonquest.betonquest.api.quest.condition.PlayerConditionFactory; import org.betonquest.betonquest.api.quest.condition.PlayerlessCondition; import org.betonquest.betonquest.api.quest.condition.PlayerlessConditionFactory; import org.betonquest.betonquest.api.quest.condition.nullable.NullableConditionAdapter; import org.betonquest.betonquest.database.GlobalData; -import org.betonquest.betonquest.exception.QuestException; import org.betonquest.betonquest.instruction.Instruction; import org.betonquest.betonquest.instruction.variable.VariableNumber; import org.betonquest.betonquest.util.Utils; diff --git a/src/main/java/org/betonquest/betonquest/quest/condition/point/PointCondition.java b/src/main/java/org/betonquest/betonquest/quest/condition/point/PointCondition.java index e9efe2b011..e61a738af4 100644 --- a/src/main/java/org/betonquest/betonquest/quest/condition/point/PointCondition.java +++ b/src/main/java/org/betonquest/betonquest/quest/condition/point/PointCondition.java @@ -1,9 +1,9 @@ package org.betonquest.betonquest.quest.condition.point; import org.betonquest.betonquest.api.profile.Profile; +import org.betonquest.betonquest.api.quest.QuestException; import org.betonquest.betonquest.api.quest.condition.PlayerCondition; import org.betonquest.betonquest.data.PlayerDataStorage; -import org.betonquest.betonquest.exception.QuestException; import org.betonquest.betonquest.instruction.variable.VariableNumber; import java.util.Optional; diff --git a/src/main/java/org/betonquest/betonquest/quest/condition/point/PointConditionFactory.java b/src/main/java/org/betonquest/betonquest/quest/condition/point/PointConditionFactory.java index 443f552e2f..d7c834b5c9 100644 --- a/src/main/java/org/betonquest/betonquest/quest/condition/point/PointConditionFactory.java +++ b/src/main/java/org/betonquest/betonquest/quest/condition/point/PointConditionFactory.java @@ -1,9 +1,9 @@ package org.betonquest.betonquest.quest.condition.point; +import org.betonquest.betonquest.api.quest.QuestException; import org.betonquest.betonquest.api.quest.condition.PlayerCondition; import org.betonquest.betonquest.api.quest.condition.PlayerConditionFactory; import org.betonquest.betonquest.data.PlayerDataStorage; -import org.betonquest.betonquest.exception.QuestException; import org.betonquest.betonquest.instruction.Instruction; import org.betonquest.betonquest.instruction.variable.VariableNumber; import org.betonquest.betonquest.util.Utils; diff --git a/src/main/java/org/betonquest/betonquest/quest/condition/random/RandomCondition.java b/src/main/java/org/betonquest/betonquest/quest/condition/random/RandomCondition.java index 97d229602a..6d46ad6023 100644 --- a/src/main/java/org/betonquest/betonquest/quest/condition/random/RandomCondition.java +++ b/src/main/java/org/betonquest/betonquest/quest/condition/random/RandomCondition.java @@ -1,8 +1,8 @@ package org.betonquest.betonquest.quest.condition.random; import org.betonquest.betonquest.api.profile.Profile; +import org.betonquest.betonquest.api.quest.QuestException; import org.betonquest.betonquest.api.quest.condition.nullable.NullableCondition; -import org.betonquest.betonquest.exception.QuestException; import org.betonquest.betonquest.instruction.variable.VariableNumber; import org.jetbrains.annotations.Nullable; diff --git a/src/main/java/org/betonquest/betonquest/quest/condition/random/RandomConditionFactory.java b/src/main/java/org/betonquest/betonquest/quest/condition/random/RandomConditionFactory.java index ffc5ad42f0..0490392897 100644 --- a/src/main/java/org/betonquest/betonquest/quest/condition/random/RandomConditionFactory.java +++ b/src/main/java/org/betonquest/betonquest/quest/condition/random/RandomConditionFactory.java @@ -1,11 +1,11 @@ package org.betonquest.betonquest.quest.condition.random; +import org.betonquest.betonquest.api.quest.QuestException; import org.betonquest.betonquest.api.quest.condition.PlayerCondition; import org.betonquest.betonquest.api.quest.condition.PlayerConditionFactory; import org.betonquest.betonquest.api.quest.condition.PlayerlessCondition; import org.betonquest.betonquest.api.quest.condition.PlayerlessConditionFactory; import org.betonquest.betonquest.api.quest.condition.nullable.NullableConditionAdapter; -import org.betonquest.betonquest.exception.QuestException; import org.betonquest.betonquest.instruction.Instruction; import org.betonquest.betonquest.instruction.variable.VariableNumber; import org.betonquest.betonquest.quest.registry.processor.VariableProcessor; diff --git a/src/main/java/org/betonquest/betonquest/quest/condition/ride/RideCondition.java b/src/main/java/org/betonquest/betonquest/quest/condition/ride/RideCondition.java index 88d53be4cb..95fdbe36f1 100644 --- a/src/main/java/org/betonquest/betonquest/quest/condition/ride/RideCondition.java +++ b/src/main/java/org/betonquest/betonquest/quest/condition/ride/RideCondition.java @@ -1,8 +1,8 @@ package org.betonquest.betonquest.quest.condition.ride; import org.betonquest.betonquest.api.profile.OnlineProfile; +import org.betonquest.betonquest.api.quest.QuestException; import org.betonquest.betonquest.api.quest.condition.online.OnlineCondition; -import org.betonquest.betonquest.exception.QuestException; import org.bukkit.entity.Entity; import org.bukkit.entity.EntityType; import org.jetbrains.annotations.Nullable; diff --git a/src/main/java/org/betonquest/betonquest/quest/condition/ride/RideConditionFactory.java b/src/main/java/org/betonquest/betonquest/quest/condition/ride/RideConditionFactory.java index e87e0597f5..9865d9f83a 100644 --- a/src/main/java/org/betonquest/betonquest/quest/condition/ride/RideConditionFactory.java +++ b/src/main/java/org/betonquest/betonquest/quest/condition/ride/RideConditionFactory.java @@ -2,10 +2,10 @@ import org.betonquest.betonquest.api.logger.BetonQuestLogger; import org.betonquest.betonquest.api.logger.BetonQuestLoggerFactory; +import org.betonquest.betonquest.api.quest.QuestException; import org.betonquest.betonquest.api.quest.condition.PlayerCondition; import org.betonquest.betonquest.api.quest.condition.PlayerConditionFactory; import org.betonquest.betonquest.api.quest.condition.online.OnlineConditionAdapter; -import org.betonquest.betonquest.exception.QuestException; import org.betonquest.betonquest.instruction.Instruction; import org.betonquest.betonquest.quest.PrimaryServerThreadData; import org.betonquest.betonquest.quest.condition.PrimaryServerThreadPlayerCondition; diff --git a/src/main/java/org/betonquest/betonquest/quest/condition/scoreboard/ScoreboardObjectiveCondition.java b/src/main/java/org/betonquest/betonquest/quest/condition/scoreboard/ScoreboardObjectiveCondition.java index 13d7b11289..d28ae2bb1b 100644 --- a/src/main/java/org/betonquest/betonquest/quest/condition/scoreboard/ScoreboardObjectiveCondition.java +++ b/src/main/java/org/betonquest/betonquest/quest/condition/scoreboard/ScoreboardObjectiveCondition.java @@ -1,8 +1,8 @@ package org.betonquest.betonquest.quest.condition.scoreboard; import org.betonquest.betonquest.api.profile.Profile; +import org.betonquest.betonquest.api.quest.QuestException; import org.betonquest.betonquest.api.quest.condition.PlayerCondition; -import org.betonquest.betonquest.exception.QuestException; import org.betonquest.betonquest.instruction.variable.VariableNumber; import org.bukkit.Bukkit; import org.bukkit.scoreboard.Objective; diff --git a/src/main/java/org/betonquest/betonquest/quest/condition/scoreboard/ScoreboardObjectiveConditionFactory.java b/src/main/java/org/betonquest/betonquest/quest/condition/scoreboard/ScoreboardObjectiveConditionFactory.java index 2e63a810c6..73e1e5fd26 100644 --- a/src/main/java/org/betonquest/betonquest/quest/condition/scoreboard/ScoreboardObjectiveConditionFactory.java +++ b/src/main/java/org/betonquest/betonquest/quest/condition/scoreboard/ScoreboardObjectiveConditionFactory.java @@ -1,8 +1,8 @@ package org.betonquest.betonquest.quest.condition.scoreboard; +import org.betonquest.betonquest.api.quest.QuestException; import org.betonquest.betonquest.api.quest.condition.PlayerCondition; import org.betonquest.betonquest.api.quest.condition.PlayerConditionFactory; -import org.betonquest.betonquest.exception.QuestException; import org.betonquest.betonquest.instruction.Instruction; import org.betonquest.betonquest.instruction.variable.VariableNumber; import org.betonquest.betonquest.quest.PrimaryServerThreadData; diff --git a/src/main/java/org/betonquest/betonquest/quest/condition/scoreboard/ScoreboardTagCondition.java b/src/main/java/org/betonquest/betonquest/quest/condition/scoreboard/ScoreboardTagCondition.java index 04fb09ee21..df7f9d0f33 100644 --- a/src/main/java/org/betonquest/betonquest/quest/condition/scoreboard/ScoreboardTagCondition.java +++ b/src/main/java/org/betonquest/betonquest/quest/condition/scoreboard/ScoreboardTagCondition.java @@ -1,8 +1,8 @@ package org.betonquest.betonquest.quest.condition.scoreboard; import org.betonquest.betonquest.api.profile.OnlineProfile; +import org.betonquest.betonquest.api.quest.QuestException; import org.betonquest.betonquest.api.quest.condition.online.OnlineCondition; -import org.betonquest.betonquest.exception.QuestException; /** * A condition that checks if a player has a certain scoreboard tag. diff --git a/src/main/java/org/betonquest/betonquest/quest/condition/scoreboard/ScoreboardTagConditionFactory.java b/src/main/java/org/betonquest/betonquest/quest/condition/scoreboard/ScoreboardTagConditionFactory.java index dfa40ebc97..a64dca7854 100644 --- a/src/main/java/org/betonquest/betonquest/quest/condition/scoreboard/ScoreboardTagConditionFactory.java +++ b/src/main/java/org/betonquest/betonquest/quest/condition/scoreboard/ScoreboardTagConditionFactory.java @@ -2,10 +2,10 @@ import org.betonquest.betonquest.api.logger.BetonQuestLogger; import org.betonquest.betonquest.api.logger.BetonQuestLoggerFactory; +import org.betonquest.betonquest.api.quest.QuestException; import org.betonquest.betonquest.api.quest.condition.PlayerCondition; import org.betonquest.betonquest.api.quest.condition.PlayerConditionFactory; import org.betonquest.betonquest.api.quest.condition.online.OnlineConditionAdapter; -import org.betonquest.betonquest.exception.QuestException; import org.betonquest.betonquest.instruction.Instruction; import org.betonquest.betonquest.quest.PrimaryServerThreadData; import org.betonquest.betonquest.quest.condition.PrimaryServerThreadPlayerCondition; diff --git a/src/main/java/org/betonquest/betonquest/quest/condition/slots/EmptySlotsCondition.java b/src/main/java/org/betonquest/betonquest/quest/condition/slots/EmptySlotsCondition.java index 749b74155f..f7908a02db 100644 --- a/src/main/java/org/betonquest/betonquest/quest/condition/slots/EmptySlotsCondition.java +++ b/src/main/java/org/betonquest/betonquest/quest/condition/slots/EmptySlotsCondition.java @@ -1,8 +1,8 @@ package org.betonquest.betonquest.quest.condition.slots; import org.betonquest.betonquest.api.profile.OnlineProfile; +import org.betonquest.betonquest.api.quest.QuestException; import org.betonquest.betonquest.api.quest.condition.online.OnlineCondition; -import org.betonquest.betonquest.exception.QuestException; import org.betonquest.betonquest.instruction.variable.VariableNumber; import org.bukkit.inventory.ItemStack; diff --git a/src/main/java/org/betonquest/betonquest/quest/condition/slots/EmptySlotsConditionFactory.java b/src/main/java/org/betonquest/betonquest/quest/condition/slots/EmptySlotsConditionFactory.java index 539db0aa3d..0e9bf9bdd7 100644 --- a/src/main/java/org/betonquest/betonquest/quest/condition/slots/EmptySlotsConditionFactory.java +++ b/src/main/java/org/betonquest/betonquest/quest/condition/slots/EmptySlotsConditionFactory.java @@ -2,10 +2,10 @@ import org.betonquest.betonquest.api.logger.BetonQuestLogger; import org.betonquest.betonquest.api.logger.BetonQuestLoggerFactory; +import org.betonquest.betonquest.api.quest.QuestException; import org.betonquest.betonquest.api.quest.condition.PlayerCondition; import org.betonquest.betonquest.api.quest.condition.PlayerConditionFactory; import org.betonquest.betonquest.api.quest.condition.online.OnlineConditionAdapter; -import org.betonquest.betonquest.exception.QuestException; import org.betonquest.betonquest.instruction.Instruction; import org.betonquest.betonquest.instruction.variable.VariableNumber; import org.betonquest.betonquest.quest.PrimaryServerThreadData; diff --git a/src/main/java/org/betonquest/betonquest/quest/condition/sneak/SneakCondition.java b/src/main/java/org/betonquest/betonquest/quest/condition/sneak/SneakCondition.java index 1de68d9ef7..2cdbb41c78 100644 --- a/src/main/java/org/betonquest/betonquest/quest/condition/sneak/SneakCondition.java +++ b/src/main/java/org/betonquest/betonquest/quest/condition/sneak/SneakCondition.java @@ -1,8 +1,8 @@ package org.betonquest.betonquest.quest.condition.sneak; import org.betonquest.betonquest.api.profile.OnlineProfile; +import org.betonquest.betonquest.api.quest.QuestException; import org.betonquest.betonquest.api.quest.condition.online.OnlineCondition; -import org.betonquest.betonquest.exception.QuestException; /** * Returns true if the player is sneaking. diff --git a/src/main/java/org/betonquest/betonquest/quest/condition/sneak/SneakConditionFactory.java b/src/main/java/org/betonquest/betonquest/quest/condition/sneak/SneakConditionFactory.java index 8568160eaf..58730fb4a7 100644 --- a/src/main/java/org/betonquest/betonquest/quest/condition/sneak/SneakConditionFactory.java +++ b/src/main/java/org/betonquest/betonquest/quest/condition/sneak/SneakConditionFactory.java @@ -2,10 +2,10 @@ import org.betonquest.betonquest.api.logger.BetonQuestLogger; import org.betonquest.betonquest.api.logger.BetonQuestLoggerFactory; +import org.betonquest.betonquest.api.quest.QuestException; import org.betonquest.betonquest.api.quest.condition.PlayerCondition; import org.betonquest.betonquest.api.quest.condition.PlayerConditionFactory; import org.betonquest.betonquest.api.quest.condition.online.OnlineConditionAdapter; -import org.betonquest.betonquest.exception.QuestException; import org.betonquest.betonquest.instruction.Instruction; import org.betonquest.betonquest.quest.PrimaryServerThreadData; import org.betonquest.betonquest.quest.condition.PrimaryServerThreadPlayerCondition; diff --git a/src/main/java/org/betonquest/betonquest/quest/condition/stage/StageCondition.java b/src/main/java/org/betonquest/betonquest/quest/condition/stage/StageCondition.java index c5a1a770cc..4a76fe4943 100644 --- a/src/main/java/org/betonquest/betonquest/quest/condition/stage/StageCondition.java +++ b/src/main/java/org/betonquest/betonquest/quest/condition/stage/StageCondition.java @@ -2,8 +2,8 @@ import org.betonquest.betonquest.BetonQuest; import org.betonquest.betonquest.api.profile.Profile; +import org.betonquest.betonquest.api.quest.QuestException; import org.betonquest.betonquest.api.quest.condition.PlayerCondition; -import org.betonquest.betonquest.exception.QuestException; import org.betonquest.betonquest.id.ObjectiveID; import org.betonquest.betonquest.instruction.variable.VariableString; import org.betonquest.betonquest.objective.StageObjective; diff --git a/src/main/java/org/betonquest/betonquest/quest/condition/stage/StageConditionFactory.java b/src/main/java/org/betonquest/betonquest/quest/condition/stage/StageConditionFactory.java index b0fcd349dc..77320067ea 100644 --- a/src/main/java/org/betonquest/betonquest/quest/condition/stage/StageConditionFactory.java +++ b/src/main/java/org/betonquest/betonquest/quest/condition/stage/StageConditionFactory.java @@ -1,9 +1,9 @@ package org.betonquest.betonquest.quest.condition.stage; import org.betonquest.betonquest.BetonQuest; +import org.betonquest.betonquest.api.quest.QuestException; import org.betonquest.betonquest.api.quest.condition.PlayerCondition; import org.betonquest.betonquest.api.quest.condition.PlayerConditionFactory; -import org.betonquest.betonquest.exception.QuestException; import org.betonquest.betonquest.id.ObjectiveID; import org.betonquest.betonquest.instruction.Instruction; import org.betonquest.betonquest.instruction.variable.VariableString; diff --git a/src/main/java/org/betonquest/betonquest/quest/condition/tag/GlobalTagCondition.java b/src/main/java/org/betonquest/betonquest/quest/condition/tag/GlobalTagCondition.java index 5885f4992f..43932ce7a2 100644 --- a/src/main/java/org/betonquest/betonquest/quest/condition/tag/GlobalTagCondition.java +++ b/src/main/java/org/betonquest/betonquest/quest/condition/tag/GlobalTagCondition.java @@ -1,8 +1,8 @@ package org.betonquest.betonquest.quest.condition.tag; +import org.betonquest.betonquest.api.quest.QuestException; import org.betonquest.betonquest.api.quest.condition.PlayerlessCondition; import org.betonquest.betonquest.database.GlobalData; -import org.betonquest.betonquest.exception.QuestException; /** * A condition that checks if a player has a certain tag. diff --git a/src/main/java/org/betonquest/betonquest/quest/condition/tag/GlobalTagConditionFactory.java b/src/main/java/org/betonquest/betonquest/quest/condition/tag/GlobalTagConditionFactory.java index 496076dbed..1638a17bac 100644 --- a/src/main/java/org/betonquest/betonquest/quest/condition/tag/GlobalTagConditionFactory.java +++ b/src/main/java/org/betonquest/betonquest/quest/condition/tag/GlobalTagConditionFactory.java @@ -1,9 +1,9 @@ package org.betonquest.betonquest.quest.condition.tag; +import org.betonquest.betonquest.api.quest.QuestException; import org.betonquest.betonquest.api.quest.condition.PlayerlessCondition; import org.betonquest.betonquest.api.quest.condition.PlayerlessConditionFactory; import org.betonquest.betonquest.database.GlobalData; -import org.betonquest.betonquest.exception.QuestException; import org.betonquest.betonquest.instruction.Instruction; import org.betonquest.betonquest.util.Utils; diff --git a/src/main/java/org/betonquest/betonquest/quest/condition/tag/TagCondition.java b/src/main/java/org/betonquest/betonquest/quest/condition/tag/TagCondition.java index 65e36a52f2..200f6fc880 100644 --- a/src/main/java/org/betonquest/betonquest/quest/condition/tag/TagCondition.java +++ b/src/main/java/org/betonquest/betonquest/quest/condition/tag/TagCondition.java @@ -1,9 +1,9 @@ package org.betonquest.betonquest.quest.condition.tag; import org.betonquest.betonquest.api.profile.Profile; +import org.betonquest.betonquest.api.quest.QuestException; import org.betonquest.betonquest.api.quest.condition.PlayerCondition; import org.betonquest.betonquest.data.PlayerDataStorage; -import org.betonquest.betonquest.exception.QuestException; /** * A condition that checks if a player has a certain tag. diff --git a/src/main/java/org/betonquest/betonquest/quest/condition/tag/TagConditionFactory.java b/src/main/java/org/betonquest/betonquest/quest/condition/tag/TagConditionFactory.java index 021d41f6a8..5b52297da5 100644 --- a/src/main/java/org/betonquest/betonquest/quest/condition/tag/TagConditionFactory.java +++ b/src/main/java/org/betonquest/betonquest/quest/condition/tag/TagConditionFactory.java @@ -1,9 +1,9 @@ package org.betonquest.betonquest.quest.condition.tag; +import org.betonquest.betonquest.api.quest.QuestException; import org.betonquest.betonquest.api.quest.condition.PlayerCondition; import org.betonquest.betonquest.api.quest.condition.PlayerConditionFactory; import org.betonquest.betonquest.data.PlayerDataStorage; -import org.betonquest.betonquest.exception.QuestException; import org.betonquest.betonquest.instruction.Instruction; import org.betonquest.betonquest.util.Utils; diff --git a/src/main/java/org/betonquest/betonquest/quest/condition/time/Time.java b/src/main/java/org/betonquest/betonquest/quest/condition/time/Time.java index 6b22701c87..df1f677fa8 100644 --- a/src/main/java/org/betonquest/betonquest/quest/condition/time/Time.java +++ b/src/main/java/org/betonquest/betonquest/quest/condition/time/Time.java @@ -1,6 +1,6 @@ package org.betonquest.betonquest.quest.condition.time; -import org.betonquest.betonquest.exception.QuestException; +import org.betonquest.betonquest.api.quest.QuestException; /** * A time with an hour and minute. diff --git a/src/main/java/org/betonquest/betonquest/quest/condition/time/TimeFrame.java b/src/main/java/org/betonquest/betonquest/quest/condition/time/TimeFrame.java index 3705c2a210..acbc50a963 100644 --- a/src/main/java/org/betonquest/betonquest/quest/condition/time/TimeFrame.java +++ b/src/main/java/org/betonquest/betonquest/quest/condition/time/TimeFrame.java @@ -1,6 +1,6 @@ package org.betonquest.betonquest.quest.condition.time; -import org.betonquest.betonquest.exception.QuestException; +import org.betonquest.betonquest.api.quest.QuestException; import org.jetbrains.annotations.NotNull; /** diff --git a/src/main/java/org/betonquest/betonquest/quest/condition/time/ingame/TimeCondition.java b/src/main/java/org/betonquest/betonquest/quest/condition/time/ingame/TimeCondition.java index 24a6802dc0..2a8f7e1a93 100644 --- a/src/main/java/org/betonquest/betonquest/quest/condition/time/ingame/TimeCondition.java +++ b/src/main/java/org/betonquest/betonquest/quest/condition/time/ingame/TimeCondition.java @@ -1,8 +1,8 @@ package org.betonquest.betonquest.quest.condition.time.ingame; import org.betonquest.betonquest.api.profile.Profile; +import org.betonquest.betonquest.api.quest.QuestException; import org.betonquest.betonquest.api.quest.condition.nullable.NullableCondition; -import org.betonquest.betonquest.exception.QuestException; import org.betonquest.betonquest.instruction.variable.location.VariableWorld; import org.betonquest.betonquest.quest.condition.time.Time; import org.betonquest.betonquest.quest.condition.time.TimeFrame; diff --git a/src/main/java/org/betonquest/betonquest/quest/condition/time/ingame/TimeConditionFactory.java b/src/main/java/org/betonquest/betonquest/quest/condition/time/ingame/TimeConditionFactory.java index 54fe44aad8..48a78575b4 100644 --- a/src/main/java/org/betonquest/betonquest/quest/condition/time/ingame/TimeConditionFactory.java +++ b/src/main/java/org/betonquest/betonquest/quest/condition/time/ingame/TimeConditionFactory.java @@ -1,11 +1,11 @@ package org.betonquest.betonquest.quest.condition.time.ingame; +import org.betonquest.betonquest.api.quest.QuestException; import org.betonquest.betonquest.api.quest.condition.PlayerCondition; import org.betonquest.betonquest.api.quest.condition.PlayerConditionFactory; import org.betonquest.betonquest.api.quest.condition.PlayerlessCondition; import org.betonquest.betonquest.api.quest.condition.PlayerlessConditionFactory; import org.betonquest.betonquest.api.quest.condition.nullable.NullableConditionAdapter; -import org.betonquest.betonquest.exception.QuestException; import org.betonquest.betonquest.instruction.Instruction; import org.betonquest.betonquest.instruction.variable.location.VariableWorld; import org.betonquest.betonquest.quest.PrimaryServerThreadData; diff --git a/src/main/java/org/betonquest/betonquest/quest/condition/time/real/DayOfWeekCondition.java b/src/main/java/org/betonquest/betonquest/quest/condition/time/real/DayOfWeekCondition.java index dc41a01350..d62328af4c 100644 --- a/src/main/java/org/betonquest/betonquest/quest/condition/time/real/DayOfWeekCondition.java +++ b/src/main/java/org/betonquest/betonquest/quest/condition/time/real/DayOfWeekCondition.java @@ -1,7 +1,7 @@ package org.betonquest.betonquest.quest.condition.time.real; +import org.betonquest.betonquest.api.quest.QuestException; import org.betonquest.betonquest.api.quest.condition.PlayerlessCondition; -import org.betonquest.betonquest.exception.QuestException; import java.time.DayOfWeek; import java.util.Calendar; diff --git a/src/main/java/org/betonquest/betonquest/quest/condition/time/real/DayOfWeekConditionFactory.java b/src/main/java/org/betonquest/betonquest/quest/condition/time/real/DayOfWeekConditionFactory.java index e255970a7a..9c1d3e619a 100644 --- a/src/main/java/org/betonquest/betonquest/quest/condition/time/real/DayOfWeekConditionFactory.java +++ b/src/main/java/org/betonquest/betonquest/quest/condition/time/real/DayOfWeekConditionFactory.java @@ -1,9 +1,9 @@ package org.betonquest.betonquest.quest.condition.time.real; import org.betonquest.betonquest.api.logger.BetonQuestLogger; +import org.betonquest.betonquest.api.quest.QuestException; import org.betonquest.betonquest.api.quest.condition.PlayerlessCondition; import org.betonquest.betonquest.api.quest.condition.PlayerlessConditionFactory; -import org.betonquest.betonquest.exception.QuestException; import org.betonquest.betonquest.instruction.Instruction; import java.time.DateTimeException; diff --git a/src/main/java/org/betonquest/betonquest/quest/condition/time/real/PartialDateConditionFactory.java b/src/main/java/org/betonquest/betonquest/quest/condition/time/real/PartialDateConditionFactory.java index 01428281d7..0f10bdb6c4 100644 --- a/src/main/java/org/betonquest/betonquest/quest/condition/time/real/PartialDateConditionFactory.java +++ b/src/main/java/org/betonquest/betonquest/quest/condition/time/real/PartialDateConditionFactory.java @@ -1,8 +1,8 @@ package org.betonquest.betonquest.quest.condition.time.real; +import org.betonquest.betonquest.api.quest.QuestException; import org.betonquest.betonquest.api.quest.condition.PlayerlessCondition; import org.betonquest.betonquest.api.quest.condition.PlayerlessConditionFactory; -import org.betonquest.betonquest.exception.QuestException; import org.betonquest.betonquest.instruction.Instruction; import java.util.List; diff --git a/src/main/java/org/betonquest/betonquest/quest/condition/time/real/RealTimeCondition.java b/src/main/java/org/betonquest/betonquest/quest/condition/time/real/RealTimeCondition.java index f00146c204..8f39c89d7c 100644 --- a/src/main/java/org/betonquest/betonquest/quest/condition/time/real/RealTimeCondition.java +++ b/src/main/java/org/betonquest/betonquest/quest/condition/time/real/RealTimeCondition.java @@ -1,7 +1,7 @@ package org.betonquest.betonquest.quest.condition.time.real; +import org.betonquest.betonquest.api.quest.QuestException; import org.betonquest.betonquest.api.quest.condition.PlayerlessCondition; -import org.betonquest.betonquest.exception.QuestException; import org.betonquest.betonquest.quest.condition.time.Time; import org.betonquest.betonquest.quest.condition.time.TimeFrame; diff --git a/src/main/java/org/betonquest/betonquest/quest/condition/time/real/RealTimeConditionFactory.java b/src/main/java/org/betonquest/betonquest/quest/condition/time/real/RealTimeConditionFactory.java index ba1e8e88fc..d7f171465c 100644 --- a/src/main/java/org/betonquest/betonquest/quest/condition/time/real/RealTimeConditionFactory.java +++ b/src/main/java/org/betonquest/betonquest/quest/condition/time/real/RealTimeConditionFactory.java @@ -1,8 +1,8 @@ package org.betonquest.betonquest.quest.condition.time.real; +import org.betonquest.betonquest.api.quest.QuestException; import org.betonquest.betonquest.api.quest.condition.PlayerlessCondition; import org.betonquest.betonquest.api.quest.condition.PlayerlessConditionFactory; -import org.betonquest.betonquest.exception.QuestException; import org.betonquest.betonquest.instruction.Instruction; import org.betonquest.betonquest.quest.condition.time.TimeFrame; diff --git a/src/main/java/org/betonquest/betonquest/quest/condition/time/real/TimeInterval.java b/src/main/java/org/betonquest/betonquest/quest/condition/time/real/TimeInterval.java index 7482c447bc..7a71427a01 100644 --- a/src/main/java/org/betonquest/betonquest/quest/condition/time/real/TimeInterval.java +++ b/src/main/java/org/betonquest/betonquest/quest/condition/time/real/TimeInterval.java @@ -1,6 +1,6 @@ package org.betonquest.betonquest.quest.condition.time.real; -import org.betonquest.betonquest.exception.QuestException; +import org.betonquest.betonquest.api.quest.QuestException; import org.jetbrains.annotations.Nullable; import java.util.ArrayList; diff --git a/src/main/java/org/betonquest/betonquest/quest/condition/variable/VariableCondition.java b/src/main/java/org/betonquest/betonquest/quest/condition/variable/VariableCondition.java index 6a5e445ad0..75a1241d4c 100644 --- a/src/main/java/org/betonquest/betonquest/quest/condition/variable/VariableCondition.java +++ b/src/main/java/org/betonquest/betonquest/quest/condition/variable/VariableCondition.java @@ -2,8 +2,8 @@ import org.betonquest.betonquest.api.logger.BetonQuestLogger; import org.betonquest.betonquest.api.profile.Profile; +import org.betonquest.betonquest.api.quest.QuestException; import org.betonquest.betonquest.api.quest.condition.nullable.NullableCondition; -import org.betonquest.betonquest.exception.QuestException; import org.betonquest.betonquest.instruction.variable.VariableString; import org.jetbrains.annotations.Nullable; diff --git a/src/main/java/org/betonquest/betonquest/quest/condition/variable/VariableConditionFactory.java b/src/main/java/org/betonquest/betonquest/quest/condition/variable/VariableConditionFactory.java index 4fcdf0628a..368653eb6b 100644 --- a/src/main/java/org/betonquest/betonquest/quest/condition/variable/VariableConditionFactory.java +++ b/src/main/java/org/betonquest/betonquest/quest/condition/variable/VariableConditionFactory.java @@ -2,12 +2,12 @@ import org.betonquest.betonquest.api.logger.BetonQuestLogger; import org.betonquest.betonquest.api.logger.BetonQuestLoggerFactory; +import org.betonquest.betonquest.api.quest.QuestException; import org.betonquest.betonquest.api.quest.condition.PlayerCondition; import org.betonquest.betonquest.api.quest.condition.PlayerConditionFactory; import org.betonquest.betonquest.api.quest.condition.PlayerlessCondition; import org.betonquest.betonquest.api.quest.condition.PlayerlessConditionFactory; import org.betonquest.betonquest.api.quest.condition.nullable.NullableConditionAdapter; -import org.betonquest.betonquest.exception.QuestException; import org.betonquest.betonquest.instruction.Instruction; import org.betonquest.betonquest.instruction.argument.VariableArgument; import org.betonquest.betonquest.instruction.variable.VariableString; diff --git a/src/main/java/org/betonquest/betonquest/quest/condition/weather/WeatherCondition.java b/src/main/java/org/betonquest/betonquest/quest/condition/weather/WeatherCondition.java index 86b131e019..d92691d0d8 100644 --- a/src/main/java/org/betonquest/betonquest/quest/condition/weather/WeatherCondition.java +++ b/src/main/java/org/betonquest/betonquest/quest/condition/weather/WeatherCondition.java @@ -1,8 +1,8 @@ package org.betonquest.betonquest.quest.condition.weather; import org.betonquest.betonquest.api.profile.Profile; +import org.betonquest.betonquest.api.quest.QuestException; import org.betonquest.betonquest.api.quest.condition.nullable.NullableCondition; -import org.betonquest.betonquest.exception.QuestException; import org.betonquest.betonquest.instruction.variable.location.VariableWorld; import org.betonquest.betonquest.quest.event.weather.Weather; import org.bukkit.World; diff --git a/src/main/java/org/betonquest/betonquest/quest/condition/weather/WeatherConditionFactory.java b/src/main/java/org/betonquest/betonquest/quest/condition/weather/WeatherConditionFactory.java index adab782843..cfae63b9ea 100644 --- a/src/main/java/org/betonquest/betonquest/quest/condition/weather/WeatherConditionFactory.java +++ b/src/main/java/org/betonquest/betonquest/quest/condition/weather/WeatherConditionFactory.java @@ -1,11 +1,11 @@ package org.betonquest.betonquest.quest.condition.weather; +import org.betonquest.betonquest.api.quest.QuestException; import org.betonquest.betonquest.api.quest.condition.PlayerCondition; import org.betonquest.betonquest.api.quest.condition.PlayerConditionFactory; import org.betonquest.betonquest.api.quest.condition.PlayerlessCondition; import org.betonquest.betonquest.api.quest.condition.PlayerlessConditionFactory; import org.betonquest.betonquest.api.quest.condition.nullable.NullableConditionAdapter; -import org.betonquest.betonquest.exception.QuestException; import org.betonquest.betonquest.instruction.Instruction; import org.betonquest.betonquest.instruction.variable.location.VariableWorld; import org.betonquest.betonquest.quest.PrimaryServerThreadData; diff --git a/src/main/java/org/betonquest/betonquest/quest/condition/world/WorldCondition.java b/src/main/java/org/betonquest/betonquest/quest/condition/world/WorldCondition.java index f4751bf0f1..b1f76850a1 100644 --- a/src/main/java/org/betonquest/betonquest/quest/condition/world/WorldCondition.java +++ b/src/main/java/org/betonquest/betonquest/quest/condition/world/WorldCondition.java @@ -1,8 +1,8 @@ package org.betonquest.betonquest.quest.condition.world; import org.betonquest.betonquest.api.profile.OnlineProfile; +import org.betonquest.betonquest.api.quest.QuestException; import org.betonquest.betonquest.api.quest.condition.online.OnlineCondition; -import org.betonquest.betonquest.exception.QuestException; import org.betonquest.betonquest.instruction.variable.location.VariableWorld; import org.bukkit.World; diff --git a/src/main/java/org/betonquest/betonquest/quest/condition/world/WorldConditionFactory.java b/src/main/java/org/betonquest/betonquest/quest/condition/world/WorldConditionFactory.java index b7c71eae38..5af62edc3f 100644 --- a/src/main/java/org/betonquest/betonquest/quest/condition/world/WorldConditionFactory.java +++ b/src/main/java/org/betonquest/betonquest/quest/condition/world/WorldConditionFactory.java @@ -2,10 +2,10 @@ import org.betonquest.betonquest.api.logger.BetonQuestLogger; import org.betonquest.betonquest.api.logger.BetonQuestLoggerFactory; +import org.betonquest.betonquest.api.quest.QuestException; import org.betonquest.betonquest.api.quest.condition.PlayerCondition; import org.betonquest.betonquest.api.quest.condition.PlayerConditionFactory; import org.betonquest.betonquest.api.quest.condition.online.OnlineConditionAdapter; -import org.betonquest.betonquest.exception.QuestException; import org.betonquest.betonquest.instruction.Instruction; import org.betonquest.betonquest.instruction.variable.location.VariableWorld; import org.betonquest.betonquest.quest.PrimaryServerThreadData; diff --git a/src/main/java/org/betonquest/betonquest/quest/event/CallStaticEventAdapter.java b/src/main/java/org/betonquest/betonquest/quest/event/CallStaticEventAdapter.java index e433e4dbf2..3d71f021ac 100644 --- a/src/main/java/org/betonquest/betonquest/quest/event/CallStaticEventAdapter.java +++ b/src/main/java/org/betonquest/betonquest/quest/event/CallStaticEventAdapter.java @@ -1,9 +1,9 @@ package org.betonquest.betonquest.quest.event; import org.betonquest.betonquest.api.profile.Profile; +import org.betonquest.betonquest.api.quest.QuestException; import org.betonquest.betonquest.api.quest.event.Event; import org.betonquest.betonquest.api.quest.event.StaticEvent; -import org.betonquest.betonquest.exception.QuestException; /** * Adapter to allow executing a "static" event with the API of a normal event. diff --git a/src/main/java/org/betonquest/betonquest/quest/event/DatabaseSaverStaticEvent.java b/src/main/java/org/betonquest/betonquest/quest/event/DatabaseSaverStaticEvent.java index 8e3f912ad3..c6d59659ab 100644 --- a/src/main/java/org/betonquest/betonquest/quest/event/DatabaseSaverStaticEvent.java +++ b/src/main/java/org/betonquest/betonquest/quest/event/DatabaseSaverStaticEvent.java @@ -1,8 +1,8 @@ package org.betonquest.betonquest.quest.event; +import org.betonquest.betonquest.api.quest.QuestException; import org.betonquest.betonquest.api.quest.event.StaticEvent; import org.betonquest.betonquest.database.Saver; -import org.betonquest.betonquest.exception.QuestException; import java.util.function.Supplier; diff --git a/src/main/java/org/betonquest/betonquest/quest/event/IngameNotificationSender.java b/src/main/java/org/betonquest/betonquest/quest/event/IngameNotificationSender.java index a09863c92c..905c7fc2ea 100644 --- a/src/main/java/org/betonquest/betonquest/quest/event/IngameNotificationSender.java +++ b/src/main/java/org/betonquest/betonquest/quest/event/IngameNotificationSender.java @@ -3,8 +3,8 @@ import org.betonquest.betonquest.api.config.quest.QuestPackage; import org.betonquest.betonquest.api.logger.BetonQuestLogger; import org.betonquest.betonquest.api.profile.Profile; +import org.betonquest.betonquest.api.quest.QuestException; import org.betonquest.betonquest.config.Config; -import org.betonquest.betonquest.exception.QuestException; /** * Notification sender that sends ingame chat notifications to the player if they are online. diff --git a/src/main/java/org/betonquest/betonquest/quest/event/OnlineProfileGroupStaticEventAdapter.java b/src/main/java/org/betonquest/betonquest/quest/event/OnlineProfileGroupStaticEventAdapter.java index 46bded580d..4993acb632 100644 --- a/src/main/java/org/betonquest/betonquest/quest/event/OnlineProfileGroupStaticEventAdapter.java +++ b/src/main/java/org/betonquest/betonquest/quest/event/OnlineProfileGroupStaticEventAdapter.java @@ -1,9 +1,9 @@ package org.betonquest.betonquest.quest.event; import org.betonquest.betonquest.api.profile.OnlineProfile; +import org.betonquest.betonquest.api.quest.QuestException; import org.betonquest.betonquest.api.quest.event.Event; import org.betonquest.betonquest.api.quest.event.StaticEvent; -import org.betonquest.betonquest.exception.QuestException; import org.bukkit.entity.Player; import java.util.function.Supplier; diff --git a/src/main/java/org/betonquest/betonquest/quest/event/OpPlayerEventAdapter.java b/src/main/java/org/betonquest/betonquest/quest/event/OpPlayerEventAdapter.java index 8fd3a423e8..81e4d19c36 100644 --- a/src/main/java/org/betonquest/betonquest/quest/event/OpPlayerEventAdapter.java +++ b/src/main/java/org/betonquest/betonquest/quest/event/OpPlayerEventAdapter.java @@ -1,8 +1,8 @@ package org.betonquest.betonquest.quest.event; import org.betonquest.betonquest.api.profile.OnlineProfile; +import org.betonquest.betonquest.api.quest.QuestException; import org.betonquest.betonquest.api.quest.event.online.OnlineEvent; -import org.betonquest.betonquest.exception.QuestException; import org.bukkit.entity.Player; /** diff --git a/src/main/java/org/betonquest/betonquest/quest/event/PrimaryServerThreadEvent.java b/src/main/java/org/betonquest/betonquest/quest/event/PrimaryServerThreadEvent.java index 8904b1205a..d79e4d26f4 100644 --- a/src/main/java/org/betonquest/betonquest/quest/event/PrimaryServerThreadEvent.java +++ b/src/main/java/org/betonquest/betonquest/quest/event/PrimaryServerThreadEvent.java @@ -1,8 +1,8 @@ package org.betonquest.betonquest.quest.event; import org.betonquest.betonquest.api.profile.Profile; +import org.betonquest.betonquest.api.quest.QuestException; import org.betonquest.betonquest.api.quest.event.Event; -import org.betonquest.betonquest.exception.QuestException; import org.betonquest.betonquest.quest.PrimaryServerThreadData; import org.betonquest.betonquest.quest.PrimaryServerThreadType; import org.bukkit.Server; diff --git a/src/main/java/org/betonquest/betonquest/quest/event/PrimaryServerThreadStaticEvent.java b/src/main/java/org/betonquest/betonquest/quest/event/PrimaryServerThreadStaticEvent.java index 6cda47b8cb..b7cc190082 100644 --- a/src/main/java/org/betonquest/betonquest/quest/event/PrimaryServerThreadStaticEvent.java +++ b/src/main/java/org/betonquest/betonquest/quest/event/PrimaryServerThreadStaticEvent.java @@ -1,7 +1,7 @@ package org.betonquest.betonquest.quest.event; +import org.betonquest.betonquest.api.quest.QuestException; import org.betonquest.betonquest.api.quest.event.StaticEvent; -import org.betonquest.betonquest.exception.QuestException; import org.betonquest.betonquest.quest.PrimaryServerThreadData; import org.betonquest.betonquest.quest.PrimaryServerThreadType; import org.bukkit.Server; diff --git a/src/main/java/org/betonquest/betonquest/quest/event/SequentialStaticEvent.java b/src/main/java/org/betonquest/betonquest/quest/event/SequentialStaticEvent.java index fc5341c391..571539dcf5 100644 --- a/src/main/java/org/betonquest/betonquest/quest/event/SequentialStaticEvent.java +++ b/src/main/java/org/betonquest/betonquest/quest/event/SequentialStaticEvent.java @@ -1,7 +1,7 @@ package org.betonquest.betonquest.quest.event; +import org.betonquest.betonquest.api.quest.QuestException; import org.betonquest.betonquest.api.quest.event.StaticEvent; -import org.betonquest.betonquest.exception.QuestException; import java.util.Arrays; diff --git a/src/main/java/org/betonquest/betonquest/quest/event/burn/BurnEvent.java b/src/main/java/org/betonquest/betonquest/quest/event/burn/BurnEvent.java index f8df77645d..24bc5e2230 100644 --- a/src/main/java/org/betonquest/betonquest/quest/event/burn/BurnEvent.java +++ b/src/main/java/org/betonquest/betonquest/quest/event/burn/BurnEvent.java @@ -1,8 +1,8 @@ package org.betonquest.betonquest.quest.event.burn; import org.betonquest.betonquest.api.profile.OnlineProfile; +import org.betonquest.betonquest.api.quest.QuestException; import org.betonquest.betonquest.api.quest.event.online.OnlineEvent; -import org.betonquest.betonquest.exception.QuestException; import org.betonquest.betonquest.instruction.variable.VariableNumber; /** diff --git a/src/main/java/org/betonquest/betonquest/quest/event/burn/BurnEventFactory.java b/src/main/java/org/betonquest/betonquest/quest/event/burn/BurnEventFactory.java index 93730911cd..7e5932e524 100644 --- a/src/main/java/org/betonquest/betonquest/quest/event/burn/BurnEventFactory.java +++ b/src/main/java/org/betonquest/betonquest/quest/event/burn/BurnEventFactory.java @@ -1,10 +1,10 @@ package org.betonquest.betonquest.quest.event.burn; import org.betonquest.betonquest.api.logger.BetonQuestLoggerFactory; +import org.betonquest.betonquest.api.quest.QuestException; import org.betonquest.betonquest.api.quest.event.Event; import org.betonquest.betonquest.api.quest.event.EventFactory; import org.betonquest.betonquest.api.quest.event.online.OnlineEventAdapter; -import org.betonquest.betonquest.exception.QuestException; import org.betonquest.betonquest.instruction.Instruction; import org.betonquest.betonquest.instruction.variable.VariableNumber; import org.betonquest.betonquest.quest.PrimaryServerThreadData; diff --git a/src/main/java/org/betonquest/betonquest/quest/event/cancel/CancelEvent.java b/src/main/java/org/betonquest/betonquest/quest/event/cancel/CancelEvent.java index 809f87375a..1bf5e68337 100644 --- a/src/main/java/org/betonquest/betonquest/quest/event/cancel/CancelEvent.java +++ b/src/main/java/org/betonquest/betonquest/quest/event/cancel/CancelEvent.java @@ -1,9 +1,9 @@ package org.betonquest.betonquest.quest.event.cancel; import org.betonquest.betonquest.api.profile.OnlineProfile; +import org.betonquest.betonquest.api.quest.QuestException; import org.betonquest.betonquest.api.quest.event.online.OnlineEvent; import org.betonquest.betonquest.config.QuestCanceler; -import org.betonquest.betonquest.exception.QuestException; /** * The cancel event. diff --git a/src/main/java/org/betonquest/betonquest/quest/event/cancel/CancelEventFactory.java b/src/main/java/org/betonquest/betonquest/quest/event/cancel/CancelEventFactory.java index 7b88a97874..8e9c31b3de 100644 --- a/src/main/java/org/betonquest/betonquest/quest/event/cancel/CancelEventFactory.java +++ b/src/main/java/org/betonquest/betonquest/quest/event/cancel/CancelEventFactory.java @@ -3,12 +3,12 @@ import org.betonquest.betonquest.BetonQuest; import org.betonquest.betonquest.api.config.quest.QuestPackage; import org.betonquest.betonquest.api.logger.BetonQuestLoggerFactory; +import org.betonquest.betonquest.api.quest.QuestException; import org.betonquest.betonquest.api.quest.event.Event; import org.betonquest.betonquest.api.quest.event.EventFactory; import org.betonquest.betonquest.api.quest.event.online.OnlineEventAdapter; import org.betonquest.betonquest.config.QuestCanceler; import org.betonquest.betonquest.exception.ObjectNotFoundException; -import org.betonquest.betonquest.exception.QuestException; import org.betonquest.betonquest.id.QuestCancelerID; import org.betonquest.betonquest.instruction.Instruction; diff --git a/src/main/java/org/betonquest/betonquest/quest/event/chat/ChatEvent.java b/src/main/java/org/betonquest/betonquest/quest/event/chat/ChatEvent.java index 283cc85c76..70298145d3 100644 --- a/src/main/java/org/betonquest/betonquest/quest/event/chat/ChatEvent.java +++ b/src/main/java/org/betonquest/betonquest/quest/event/chat/ChatEvent.java @@ -1,8 +1,8 @@ package org.betonquest.betonquest.quest.event.chat; import org.betonquest.betonquest.api.profile.OnlineProfile; +import org.betonquest.betonquest.api.quest.QuestException; import org.betonquest.betonquest.api.quest.event.online.OnlineEvent; -import org.betonquest.betonquest.exception.QuestException; import org.bukkit.entity.Player; /** diff --git a/src/main/java/org/betonquest/betonquest/quest/event/chat/ChatEventFactory.java b/src/main/java/org/betonquest/betonquest/quest/event/chat/ChatEventFactory.java index 18786c4db2..483174922e 100644 --- a/src/main/java/org/betonquest/betonquest/quest/event/chat/ChatEventFactory.java +++ b/src/main/java/org/betonquest/betonquest/quest/event/chat/ChatEventFactory.java @@ -1,10 +1,10 @@ package org.betonquest.betonquest.quest.event.chat; import org.betonquest.betonquest.api.logger.BetonQuestLoggerFactory; +import org.betonquest.betonquest.api.quest.QuestException; import org.betonquest.betonquest.api.quest.event.Event; import org.betonquest.betonquest.api.quest.event.EventFactory; import org.betonquest.betonquest.api.quest.event.online.OnlineEventAdapter; -import org.betonquest.betonquest.exception.QuestException; import org.betonquest.betonquest.instruction.Instruction; import org.betonquest.betonquest.quest.PrimaryServerThreadData; import org.betonquest.betonquest.quest.event.PrimaryServerThreadEvent; diff --git a/src/main/java/org/betonquest/betonquest/quest/event/chest/AbstractChestEvent.java b/src/main/java/org/betonquest/betonquest/quest/event/chest/AbstractChestEvent.java index d4c3a42cc0..ff825682ae 100644 --- a/src/main/java/org/betonquest/betonquest/quest/event/chest/AbstractChestEvent.java +++ b/src/main/java/org/betonquest/betonquest/quest/event/chest/AbstractChestEvent.java @@ -1,8 +1,8 @@ package org.betonquest.betonquest.quest.event.chest; import org.betonquest.betonquest.api.profile.Profile; +import org.betonquest.betonquest.api.quest.QuestException; import org.betonquest.betonquest.api.quest.event.nullable.NullableEvent; -import org.betonquest.betonquest.exception.QuestException; import org.betonquest.betonquest.instruction.variable.location.VariableLocation; import org.bukkit.block.Block; import org.bukkit.inventory.InventoryHolder; diff --git a/src/main/java/org/betonquest/betonquest/quest/event/chest/ChestClearEvent.java b/src/main/java/org/betonquest/betonquest/quest/event/chest/ChestClearEvent.java index 13418d8feb..be9aaaffce 100644 --- a/src/main/java/org/betonquest/betonquest/quest/event/chest/ChestClearEvent.java +++ b/src/main/java/org/betonquest/betonquest/quest/event/chest/ChestClearEvent.java @@ -1,7 +1,7 @@ package org.betonquest.betonquest.quest.event.chest; import org.betonquest.betonquest.api.profile.Profile; -import org.betonquest.betonquest.exception.QuestException; +import org.betonquest.betonquest.api.quest.QuestException; import org.betonquest.betonquest.instruction.variable.location.VariableLocation; import org.bukkit.inventory.InventoryHolder; import org.jetbrains.annotations.Nullable; diff --git a/src/main/java/org/betonquest/betonquest/quest/event/chest/ChestClearEventFactory.java b/src/main/java/org/betonquest/betonquest/quest/event/chest/ChestClearEventFactory.java index 4dab0b5d7f..6774db9572 100644 --- a/src/main/java/org/betonquest/betonquest/quest/event/chest/ChestClearEventFactory.java +++ b/src/main/java/org/betonquest/betonquest/quest/event/chest/ChestClearEventFactory.java @@ -1,11 +1,11 @@ package org.betonquest.betonquest.quest.event.chest; +import org.betonquest.betonquest.api.quest.QuestException; import org.betonquest.betonquest.api.quest.event.Event; import org.betonquest.betonquest.api.quest.event.EventFactory; import org.betonquest.betonquest.api.quest.event.StaticEvent; import org.betonquest.betonquest.api.quest.event.StaticEventFactory; import org.betonquest.betonquest.api.quest.event.nullable.NullableEventAdapter; -import org.betonquest.betonquest.exception.QuestException; import org.betonquest.betonquest.instruction.Instruction; import org.betonquest.betonquest.instruction.variable.location.VariableLocation; import org.betonquest.betonquest.quest.PrimaryServerThreadData; diff --git a/src/main/java/org/betonquest/betonquest/quest/event/chest/ChestGiveEvent.java b/src/main/java/org/betonquest/betonquest/quest/event/chest/ChestGiveEvent.java index e64b7df137..238c13512e 100644 --- a/src/main/java/org/betonquest/betonquest/quest/event/chest/ChestGiveEvent.java +++ b/src/main/java/org/betonquest/betonquest/quest/event/chest/ChestGiveEvent.java @@ -1,8 +1,8 @@ package org.betonquest.betonquest.quest.event.chest; import org.betonquest.betonquest.api.profile.Profile; +import org.betonquest.betonquest.api.quest.QuestException; import org.betonquest.betonquest.api.quest.event.nullable.NullableEvent; -import org.betonquest.betonquest.exception.QuestException; import org.betonquest.betonquest.instruction.Item; import org.betonquest.betonquest.instruction.variable.location.VariableLocation; import org.betonquest.betonquest.item.QuestItem; diff --git a/src/main/java/org/betonquest/betonquest/quest/event/chest/ChestGiveEventFactory.java b/src/main/java/org/betonquest/betonquest/quest/event/chest/ChestGiveEventFactory.java index db97927aa2..a37536a066 100644 --- a/src/main/java/org/betonquest/betonquest/quest/event/chest/ChestGiveEventFactory.java +++ b/src/main/java/org/betonquest/betonquest/quest/event/chest/ChestGiveEventFactory.java @@ -1,11 +1,11 @@ package org.betonquest.betonquest.quest.event.chest; +import org.betonquest.betonquest.api.quest.QuestException; import org.betonquest.betonquest.api.quest.event.Event; import org.betonquest.betonquest.api.quest.event.EventFactory; import org.betonquest.betonquest.api.quest.event.StaticEvent; import org.betonquest.betonquest.api.quest.event.StaticEventFactory; import org.betonquest.betonquest.api.quest.event.nullable.NullableEventAdapter; -import org.betonquest.betonquest.exception.QuestException; import org.betonquest.betonquest.instruction.Instruction; import org.betonquest.betonquest.instruction.variable.location.VariableLocation; import org.betonquest.betonquest.quest.PrimaryServerThreadData; diff --git a/src/main/java/org/betonquest/betonquest/quest/event/chest/ChestTakeEvent.java b/src/main/java/org/betonquest/betonquest/quest/event/chest/ChestTakeEvent.java index 112c41220b..7d71691be0 100644 --- a/src/main/java/org/betonquest/betonquest/quest/event/chest/ChestTakeEvent.java +++ b/src/main/java/org/betonquest/betonquest/quest/event/chest/ChestTakeEvent.java @@ -1,7 +1,7 @@ package org.betonquest.betonquest.quest.event.chest; import org.betonquest.betonquest.api.profile.Profile; -import org.betonquest.betonquest.exception.QuestException; +import org.betonquest.betonquest.api.quest.QuestException; import org.betonquest.betonquest.instruction.Item; import org.betonquest.betonquest.instruction.variable.location.VariableLocation; import org.betonquest.betonquest.item.QuestItem; diff --git a/src/main/java/org/betonquest/betonquest/quest/event/chest/ChestTakeEventFactory.java b/src/main/java/org/betonquest/betonquest/quest/event/chest/ChestTakeEventFactory.java index 1c5a6a3c52..d10adc2976 100644 --- a/src/main/java/org/betonquest/betonquest/quest/event/chest/ChestTakeEventFactory.java +++ b/src/main/java/org/betonquest/betonquest/quest/event/chest/ChestTakeEventFactory.java @@ -1,11 +1,11 @@ package org.betonquest.betonquest.quest.event.chest; +import org.betonquest.betonquest.api.quest.QuestException; import org.betonquest.betonquest.api.quest.event.Event; import org.betonquest.betonquest.api.quest.event.EventFactory; import org.betonquest.betonquest.api.quest.event.StaticEvent; import org.betonquest.betonquest.api.quest.event.StaticEventFactory; import org.betonquest.betonquest.api.quest.event.nullable.NullableEventAdapter; -import org.betonquest.betonquest.exception.QuestException; import org.betonquest.betonquest.instruction.Instruction; import org.betonquest.betonquest.instruction.Item; import org.betonquest.betonquest.instruction.variable.location.VariableLocation; diff --git a/src/main/java/org/betonquest/betonquest/quest/event/command/BaseCommandEventFactory.java b/src/main/java/org/betonquest/betonquest/quest/event/command/BaseCommandEventFactory.java index 5df93afe59..d631e33277 100644 --- a/src/main/java/org/betonquest/betonquest/quest/event/command/BaseCommandEventFactory.java +++ b/src/main/java/org/betonquest/betonquest/quest/event/command/BaseCommandEventFactory.java @@ -1,8 +1,8 @@ package org.betonquest.betonquest.quest.event.command; import org.betonquest.betonquest.api.logger.BetonQuestLoggerFactory; +import org.betonquest.betonquest.api.quest.QuestException; import org.betonquest.betonquest.api.quest.event.EventFactory; -import org.betonquest.betonquest.exception.QuestException; import org.betonquest.betonquest.instruction.Instruction; import org.betonquest.betonquest.instruction.variable.VariableString; import org.betonquest.betonquest.quest.PrimaryServerThreadData; diff --git a/src/main/java/org/betonquest/betonquest/quest/event/command/CommandEvent.java b/src/main/java/org/betonquest/betonquest/quest/event/command/CommandEvent.java index f8458e9527..6524920a18 100644 --- a/src/main/java/org/betonquest/betonquest/quest/event/command/CommandEvent.java +++ b/src/main/java/org/betonquest/betonquest/quest/event/command/CommandEvent.java @@ -2,8 +2,8 @@ import org.betonquest.betonquest.api.bukkit.command.SilentConsoleCommandSender; import org.betonquest.betonquest.api.profile.Profile; +import org.betonquest.betonquest.api.quest.QuestException; import org.betonquest.betonquest.api.quest.event.nullable.NullableEvent; -import org.betonquest.betonquest.exception.QuestException; import org.betonquest.betonquest.instruction.variable.VariableString; import org.bukkit.Server; import org.bukkit.command.CommandSender; diff --git a/src/main/java/org/betonquest/betonquest/quest/event/command/CommandEventFactory.java b/src/main/java/org/betonquest/betonquest/quest/event/command/CommandEventFactory.java index cef12334b8..da0e31166f 100644 --- a/src/main/java/org/betonquest/betonquest/quest/event/command/CommandEventFactory.java +++ b/src/main/java/org/betonquest/betonquest/quest/event/command/CommandEventFactory.java @@ -3,11 +3,11 @@ import org.betonquest.betonquest.api.bukkit.command.SilentCommandSender; import org.betonquest.betonquest.api.bukkit.command.SilentConsoleCommandSender; import org.betonquest.betonquest.api.logger.BetonQuestLoggerFactory; +import org.betonquest.betonquest.api.quest.QuestException; import org.betonquest.betonquest.api.quest.event.Event; import org.betonquest.betonquest.api.quest.event.StaticEvent; import org.betonquest.betonquest.api.quest.event.StaticEventFactory; import org.betonquest.betonquest.api.quest.event.nullable.NullableEventAdapter; -import org.betonquest.betonquest.exception.QuestException; import org.betonquest.betonquest.instruction.Instruction; import org.betonquest.betonquest.quest.PrimaryServerThreadData; import org.betonquest.betonquest.quest.event.PrimaryServerThreadEvent; diff --git a/src/main/java/org/betonquest/betonquest/quest/event/command/OpSudoEventFactory.java b/src/main/java/org/betonquest/betonquest/quest/event/command/OpSudoEventFactory.java index c75f12eb72..fa862ef7f1 100644 --- a/src/main/java/org/betonquest/betonquest/quest/event/command/OpSudoEventFactory.java +++ b/src/main/java/org/betonquest/betonquest/quest/event/command/OpSudoEventFactory.java @@ -1,9 +1,9 @@ package org.betonquest.betonquest.quest.event.command; import org.betonquest.betonquest.api.logger.BetonQuestLoggerFactory; +import org.betonquest.betonquest.api.quest.QuestException; import org.betonquest.betonquest.api.quest.event.Event; import org.betonquest.betonquest.api.quest.event.online.OnlineEventAdapter; -import org.betonquest.betonquest.exception.QuestException; import org.betonquest.betonquest.instruction.Instruction; import org.betonquest.betonquest.quest.PrimaryServerThreadData; import org.betonquest.betonquest.quest.event.OpPlayerEventAdapter; diff --git a/src/main/java/org/betonquest/betonquest/quest/event/command/SudoEvent.java b/src/main/java/org/betonquest/betonquest/quest/event/command/SudoEvent.java index 3c73501d6d..fab9264159 100644 --- a/src/main/java/org/betonquest/betonquest/quest/event/command/SudoEvent.java +++ b/src/main/java/org/betonquest/betonquest/quest/event/command/SudoEvent.java @@ -1,8 +1,8 @@ package org.betonquest.betonquest.quest.event.command; import org.betonquest.betonquest.api.profile.OnlineProfile; +import org.betonquest.betonquest.api.quest.QuestException; import org.betonquest.betonquest.api.quest.event.online.OnlineEvent; -import org.betonquest.betonquest.exception.QuestException; import org.betonquest.betonquest.instruction.variable.VariableString; import org.bukkit.entity.Player; diff --git a/src/main/java/org/betonquest/betonquest/quest/event/command/SudoEventFactory.java b/src/main/java/org/betonquest/betonquest/quest/event/command/SudoEventFactory.java index e04eb0eabe..b9d6056820 100644 --- a/src/main/java/org/betonquest/betonquest/quest/event/command/SudoEventFactory.java +++ b/src/main/java/org/betonquest/betonquest/quest/event/command/SudoEventFactory.java @@ -1,9 +1,9 @@ package org.betonquest.betonquest.quest.event.command; import org.betonquest.betonquest.api.logger.BetonQuestLoggerFactory; +import org.betonquest.betonquest.api.quest.QuestException; import org.betonquest.betonquest.api.quest.event.Event; import org.betonquest.betonquest.api.quest.event.online.OnlineEventAdapter; -import org.betonquest.betonquest.exception.QuestException; import org.betonquest.betonquest.instruction.Instruction; import org.betonquest.betonquest.quest.PrimaryServerThreadData; import org.betonquest.betonquest.quest.event.PrimaryServerThreadEvent; diff --git a/src/main/java/org/betonquest/betonquest/quest/event/compass/CompassEvent.java b/src/main/java/org/betonquest/betonquest/quest/event/compass/CompassEvent.java index 2aad07ee66..24e32ee6a1 100644 --- a/src/main/java/org/betonquest/betonquest/quest/event/compass/CompassEvent.java +++ b/src/main/java/org/betonquest/betonquest/quest/event/compass/CompassEvent.java @@ -4,9 +4,9 @@ import org.betonquest.betonquest.api.config.quest.QuestPackage; import org.betonquest.betonquest.api.logger.BetonQuestLogger; import org.betonquest.betonquest.api.profile.Profile; +import org.betonquest.betonquest.api.quest.QuestException; import org.betonquest.betonquest.api.quest.event.Event; import org.betonquest.betonquest.data.PlayerDataStorage; -import org.betonquest.betonquest.exception.QuestException; import org.betonquest.betonquest.instruction.variable.location.VariableLocation; import org.betonquest.betonquest.quest.event.tag.AddTagChanger; import org.betonquest.betonquest.quest.event.tag.DeleteTagChanger; diff --git a/src/main/java/org/betonquest/betonquest/quest/event/compass/CompassEventFactory.java b/src/main/java/org/betonquest/betonquest/quest/event/compass/CompassEventFactory.java index 0b5fb20571..f84eec8b0f 100644 --- a/src/main/java/org/betonquest/betonquest/quest/event/compass/CompassEventFactory.java +++ b/src/main/java/org/betonquest/betonquest/quest/event/compass/CompassEventFactory.java @@ -4,11 +4,11 @@ import org.betonquest.betonquest.api.config.quest.QuestPackage; import org.betonquest.betonquest.api.logger.BetonQuestLogger; import org.betonquest.betonquest.api.logger.BetonQuestLoggerFactory; +import org.betonquest.betonquest.api.quest.QuestException; import org.betonquest.betonquest.api.quest.event.Event; import org.betonquest.betonquest.api.quest.event.EventFactory; import org.betonquest.betonquest.config.Config; import org.betonquest.betonquest.data.PlayerDataStorage; -import org.betonquest.betonquest.exception.QuestException; import org.betonquest.betonquest.instruction.Instruction; import org.betonquest.betonquest.instruction.variable.location.VariableLocation; import org.betonquest.betonquest.quest.PrimaryServerThreadData; diff --git a/src/main/java/org/betonquest/betonquest/quest/event/conversation/CancelConversationEvent.java b/src/main/java/org/betonquest/betonquest/quest/event/conversation/CancelConversationEvent.java index 55ebd7c3cc..ce8eea6bd7 100644 --- a/src/main/java/org/betonquest/betonquest/quest/event/conversation/CancelConversationEvent.java +++ b/src/main/java/org/betonquest/betonquest/quest/event/conversation/CancelConversationEvent.java @@ -1,9 +1,9 @@ package org.betonquest.betonquest.quest.event.conversation; import org.betonquest.betonquest.api.profile.OnlineProfile; +import org.betonquest.betonquest.api.quest.QuestException; import org.betonquest.betonquest.api.quest.event.online.OnlineEvent; import org.betonquest.betonquest.conversation.Conversation; -import org.betonquest.betonquest.exception.QuestException; /** * Cancels the conversation. diff --git a/src/main/java/org/betonquest/betonquest/quest/event/conversation/CancelConversationEventFactory.java b/src/main/java/org/betonquest/betonquest/quest/event/conversation/CancelConversationEventFactory.java index 0b768726d1..282c6c4c6d 100644 --- a/src/main/java/org/betonquest/betonquest/quest/event/conversation/CancelConversationEventFactory.java +++ b/src/main/java/org/betonquest/betonquest/quest/event/conversation/CancelConversationEventFactory.java @@ -1,10 +1,10 @@ package org.betonquest.betonquest.quest.event.conversation; import org.betonquest.betonquest.api.logger.BetonQuestLoggerFactory; +import org.betonquest.betonquest.api.quest.QuestException; import org.betonquest.betonquest.api.quest.event.Event; import org.betonquest.betonquest.api.quest.event.EventFactory; import org.betonquest.betonquest.api.quest.event.online.OnlineEventAdapter; -import org.betonquest.betonquest.exception.QuestException; import org.betonquest.betonquest.instruction.Instruction; /** diff --git a/src/main/java/org/betonquest/betonquest/quest/event/conversation/ConversationEvent.java b/src/main/java/org/betonquest/betonquest/quest/event/conversation/ConversationEvent.java index 3b50c253b9..748582be12 100644 --- a/src/main/java/org/betonquest/betonquest/quest/event/conversation/ConversationEvent.java +++ b/src/main/java/org/betonquest/betonquest/quest/event/conversation/ConversationEvent.java @@ -3,9 +3,9 @@ import org.betonquest.betonquest.api.logger.BetonQuestLogger; import org.betonquest.betonquest.api.logger.BetonQuestLoggerFactory; import org.betonquest.betonquest.api.profile.OnlineProfile; +import org.betonquest.betonquest.api.quest.QuestException; import org.betonquest.betonquest.api.quest.event.online.OnlineEvent; import org.betonquest.betonquest.conversation.Conversation; -import org.betonquest.betonquest.exception.QuestException; import org.betonquest.betonquest.id.ConversationID; import org.jetbrains.annotations.Nullable; diff --git a/src/main/java/org/betonquest/betonquest/quest/event/conversation/ConversationEventFactory.java b/src/main/java/org/betonquest/betonquest/quest/event/conversation/ConversationEventFactory.java index 783a902a04..923b0ed4e5 100644 --- a/src/main/java/org/betonquest/betonquest/quest/event/conversation/ConversationEventFactory.java +++ b/src/main/java/org/betonquest/betonquest/quest/event/conversation/ConversationEventFactory.java @@ -1,11 +1,11 @@ package org.betonquest.betonquest.quest.event.conversation; import org.betonquest.betonquest.api.logger.BetonQuestLoggerFactory; +import org.betonquest.betonquest.api.quest.QuestException; import org.betonquest.betonquest.api.quest.event.Event; import org.betonquest.betonquest.api.quest.event.EventFactory; import org.betonquest.betonquest.api.quest.event.online.OnlineEventAdapter; import org.betonquest.betonquest.exception.ObjectNotFoundException; -import org.betonquest.betonquest.exception.QuestException; import org.betonquest.betonquest.id.ConversationID; import org.betonquest.betonquest.instruction.Instruction; import org.betonquest.betonquest.quest.PrimaryServerThreadData; diff --git a/src/main/java/org/betonquest/betonquest/quest/event/damage/DamageEvent.java b/src/main/java/org/betonquest/betonquest/quest/event/damage/DamageEvent.java index b0104db88c..82f18cb315 100644 --- a/src/main/java/org/betonquest/betonquest/quest/event/damage/DamageEvent.java +++ b/src/main/java/org/betonquest/betonquest/quest/event/damage/DamageEvent.java @@ -1,8 +1,8 @@ package org.betonquest.betonquest.quest.event.damage; import org.betonquest.betonquest.api.profile.OnlineProfile; +import org.betonquest.betonquest.api.quest.QuestException; import org.betonquest.betonquest.api.quest.event.online.OnlineEvent; -import org.betonquest.betonquest.exception.QuestException; import org.betonquest.betonquest.instruction.variable.VariableNumber; /** diff --git a/src/main/java/org/betonquest/betonquest/quest/event/damage/DamageEventFactory.java b/src/main/java/org/betonquest/betonquest/quest/event/damage/DamageEventFactory.java index f619ce1b38..1a573eb178 100644 --- a/src/main/java/org/betonquest/betonquest/quest/event/damage/DamageEventFactory.java +++ b/src/main/java/org/betonquest/betonquest/quest/event/damage/DamageEventFactory.java @@ -1,10 +1,10 @@ package org.betonquest.betonquest.quest.event.damage; import org.betonquest.betonquest.api.logger.BetonQuestLoggerFactory; +import org.betonquest.betonquest.api.quest.QuestException; import org.betonquest.betonquest.api.quest.event.Event; import org.betonquest.betonquest.api.quest.event.EventFactory; import org.betonquest.betonquest.api.quest.event.online.OnlineEventAdapter; -import org.betonquest.betonquest.exception.QuestException; import org.betonquest.betonquest.instruction.Instruction; import org.betonquest.betonquest.instruction.variable.VariableNumber; import org.betonquest.betonquest.quest.PrimaryServerThreadData; diff --git a/src/main/java/org/betonquest/betonquest/quest/event/door/DoorEvent.java b/src/main/java/org/betonquest/betonquest/quest/event/door/DoorEvent.java index ed9457a8f3..81cf942512 100644 --- a/src/main/java/org/betonquest/betonquest/quest/event/door/DoorEvent.java +++ b/src/main/java/org/betonquest/betonquest/quest/event/door/DoorEvent.java @@ -1,8 +1,8 @@ package org.betonquest.betonquest.quest.event.door; import org.betonquest.betonquest.api.profile.Profile; +import org.betonquest.betonquest.api.quest.QuestException; import org.betonquest.betonquest.api.quest.event.nullable.NullableEvent; -import org.betonquest.betonquest.exception.QuestException; import org.betonquest.betonquest.instruction.variable.location.VariableLocation; import org.bukkit.Location; import org.bukkit.block.Block; diff --git a/src/main/java/org/betonquest/betonquest/quest/event/door/DoorEventFactory.java b/src/main/java/org/betonquest/betonquest/quest/event/door/DoorEventFactory.java index e344bcc3c2..245dea4de7 100644 --- a/src/main/java/org/betonquest/betonquest/quest/event/door/DoorEventFactory.java +++ b/src/main/java/org/betonquest/betonquest/quest/event/door/DoorEventFactory.java @@ -1,11 +1,11 @@ package org.betonquest.betonquest.quest.event.door; +import org.betonquest.betonquest.api.quest.QuestException; import org.betonquest.betonquest.api.quest.event.Event; import org.betonquest.betonquest.api.quest.event.EventFactory; import org.betonquest.betonquest.api.quest.event.StaticEvent; import org.betonquest.betonquest.api.quest.event.StaticEventFactory; import org.betonquest.betonquest.api.quest.event.nullable.NullableEventAdapter; -import org.betonquest.betonquest.exception.QuestException; import org.betonquest.betonquest.instruction.Instruction; import org.betonquest.betonquest.instruction.variable.location.VariableLocation; import org.betonquest.betonquest.quest.PrimaryServerThreadData; diff --git a/src/main/java/org/betonquest/betonquest/quest/event/drop/DropEvent.java b/src/main/java/org/betonquest/betonquest/quest/event/drop/DropEvent.java index a9ec0ad5cc..dd18eed35d 100644 --- a/src/main/java/org/betonquest/betonquest/quest/event/drop/DropEvent.java +++ b/src/main/java/org/betonquest/betonquest/quest/event/drop/DropEvent.java @@ -2,8 +2,8 @@ import org.betonquest.betonquest.api.common.function.Selector; import org.betonquest.betonquest.api.profile.Profile; +import org.betonquest.betonquest.api.quest.QuestException; import org.betonquest.betonquest.api.quest.event.nullable.NullableEvent; -import org.betonquest.betonquest.exception.QuestException; import org.betonquest.betonquest.instruction.Item; import org.bukkit.Location; import org.bukkit.inventory.ItemStack; diff --git a/src/main/java/org/betonquest/betonquest/quest/event/drop/DropEventFactory.java b/src/main/java/org/betonquest/betonquest/quest/event/drop/DropEventFactory.java index a414cf6ebf..aa19809f66 100644 --- a/src/main/java/org/betonquest/betonquest/quest/event/drop/DropEventFactory.java +++ b/src/main/java/org/betonquest/betonquest/quest/event/drop/DropEventFactory.java @@ -2,12 +2,12 @@ import org.betonquest.betonquest.api.common.function.Selector; import org.betonquest.betonquest.api.common.function.Selectors; +import org.betonquest.betonquest.api.quest.QuestException; import org.betonquest.betonquest.api.quest.event.Event; import org.betonquest.betonquest.api.quest.event.EventFactory; import org.betonquest.betonquest.api.quest.event.StaticEvent; import org.betonquest.betonquest.api.quest.event.StaticEventFactory; import org.betonquest.betonquest.api.quest.event.nullable.NullableEventAdapter; -import org.betonquest.betonquest.exception.QuestException; import org.betonquest.betonquest.instruction.Instruction; import org.betonquest.betonquest.instruction.Item; import org.betonquest.betonquest.instruction.variable.location.VariableLocation; diff --git a/src/main/java/org/betonquest/betonquest/quest/event/effect/DeleteEffectEvent.java b/src/main/java/org/betonquest/betonquest/quest/event/effect/DeleteEffectEvent.java index 827a0961e0..e691b6a84e 100644 --- a/src/main/java/org/betonquest/betonquest/quest/event/effect/DeleteEffectEvent.java +++ b/src/main/java/org/betonquest/betonquest/quest/event/effect/DeleteEffectEvent.java @@ -1,8 +1,8 @@ package org.betonquest.betonquest.quest.event.effect; import org.betonquest.betonquest.api.profile.OnlineProfile; +import org.betonquest.betonquest.api.quest.QuestException; import org.betonquest.betonquest.api.quest.event.online.OnlineEvent; -import org.betonquest.betonquest.exception.QuestException; import org.bukkit.entity.Player; import org.bukkit.potion.PotionEffectType; diff --git a/src/main/java/org/betonquest/betonquest/quest/event/effect/DeleteEffectEventFactory.java b/src/main/java/org/betonquest/betonquest/quest/event/effect/DeleteEffectEventFactory.java index a17bcd358d..f1e18c14aa 100644 --- a/src/main/java/org/betonquest/betonquest/quest/event/effect/DeleteEffectEventFactory.java +++ b/src/main/java/org/betonquest/betonquest/quest/event/effect/DeleteEffectEventFactory.java @@ -1,10 +1,10 @@ package org.betonquest.betonquest.quest.event.effect; import org.betonquest.betonquest.api.logger.BetonQuestLoggerFactory; +import org.betonquest.betonquest.api.quest.QuestException; import org.betonquest.betonquest.api.quest.event.Event; import org.betonquest.betonquest.api.quest.event.EventFactory; import org.betonquest.betonquest.api.quest.event.online.OnlineEventAdapter; -import org.betonquest.betonquest.exception.QuestException; import org.betonquest.betonquest.instruction.Instruction; import org.betonquest.betonquest.quest.PrimaryServerThreadData; import org.betonquest.betonquest.quest.event.PrimaryServerThreadEvent; diff --git a/src/main/java/org/betonquest/betonquest/quest/event/effect/EffectEvent.java b/src/main/java/org/betonquest/betonquest/quest/event/effect/EffectEvent.java index d2667a3645..b3684104d5 100644 --- a/src/main/java/org/betonquest/betonquest/quest/event/effect/EffectEvent.java +++ b/src/main/java/org/betonquest/betonquest/quest/event/effect/EffectEvent.java @@ -1,8 +1,8 @@ package org.betonquest.betonquest.quest.event.effect; import org.betonquest.betonquest.api.profile.OnlineProfile; +import org.betonquest.betonquest.api.quest.QuestException; import org.betonquest.betonquest.api.quest.event.online.OnlineEvent; -import org.betonquest.betonquest.exception.QuestException; import org.betonquest.betonquest.instruction.variable.VariableNumber; import org.bukkit.potion.PotionEffect; import org.bukkit.potion.PotionEffectType; diff --git a/src/main/java/org/betonquest/betonquest/quest/event/effect/EffectEventFactory.java b/src/main/java/org/betonquest/betonquest/quest/event/effect/EffectEventFactory.java index ad1d804ec9..799d85b445 100644 --- a/src/main/java/org/betonquest/betonquest/quest/event/effect/EffectEventFactory.java +++ b/src/main/java/org/betonquest/betonquest/quest/event/effect/EffectEventFactory.java @@ -1,10 +1,10 @@ package org.betonquest.betonquest.quest.event.effect; import org.betonquest.betonquest.api.logger.BetonQuestLoggerFactory; +import org.betonquest.betonquest.api.quest.QuestException; import org.betonquest.betonquest.api.quest.event.Event; import org.betonquest.betonquest.api.quest.event.EventFactory; import org.betonquest.betonquest.api.quest.event.online.OnlineEventAdapter; -import org.betonquest.betonquest.exception.QuestException; import org.betonquest.betonquest.instruction.Instruction; import org.betonquest.betonquest.instruction.variable.VariableNumber; import org.betonquest.betonquest.quest.PrimaryServerThreadData; diff --git a/src/main/java/org/betonquest/betonquest/quest/event/entity/RemoveEntityEvent.java b/src/main/java/org/betonquest/betonquest/quest/event/entity/RemoveEntityEvent.java index cebe54cde6..4738c71488 100644 --- a/src/main/java/org/betonquest/betonquest/quest/event/entity/RemoveEntityEvent.java +++ b/src/main/java/org/betonquest/betonquest/quest/event/entity/RemoveEntityEvent.java @@ -1,8 +1,8 @@ package org.betonquest.betonquest.quest.event.entity; import org.betonquest.betonquest.api.profile.Profile; +import org.betonquest.betonquest.api.quest.QuestException; import org.betonquest.betonquest.api.quest.event.nullable.NullableEvent; -import org.betonquest.betonquest.exception.QuestException; import org.betonquest.betonquest.instruction.variable.VariableNumber; import org.betonquest.betonquest.instruction.variable.VariableString; import org.betonquest.betonquest.instruction.variable.location.VariableLocation; diff --git a/src/main/java/org/betonquest/betonquest/quest/event/entity/RemoveEntityEventFactory.java b/src/main/java/org/betonquest/betonquest/quest/event/entity/RemoveEntityEventFactory.java index fb520ec64d..df225d2bca 100644 --- a/src/main/java/org/betonquest/betonquest/quest/event/entity/RemoveEntityEventFactory.java +++ b/src/main/java/org/betonquest/betonquest/quest/event/entity/RemoveEntityEventFactory.java @@ -1,11 +1,11 @@ package org.betonquest.betonquest.quest.event.entity; +import org.betonquest.betonquest.api.quest.QuestException; import org.betonquest.betonquest.api.quest.event.Event; import org.betonquest.betonquest.api.quest.event.EventFactory; import org.betonquest.betonquest.api.quest.event.StaticEvent; import org.betonquest.betonquest.api.quest.event.StaticEventFactory; import org.betonquest.betonquest.api.quest.event.nullable.NullableEventAdapter; -import org.betonquest.betonquest.exception.QuestException; import org.betonquest.betonquest.instruction.Instruction; import org.betonquest.betonquest.instruction.argument.VariableArgument; import org.betonquest.betonquest.instruction.variable.VariableNumber; diff --git a/src/main/java/org/betonquest/betonquest/quest/event/experience/ExperienceEvent.java b/src/main/java/org/betonquest/betonquest/quest/event/experience/ExperienceEvent.java index ef3f44de20..bd34baf4c8 100644 --- a/src/main/java/org/betonquest/betonquest/quest/event/experience/ExperienceEvent.java +++ b/src/main/java/org/betonquest/betonquest/quest/event/experience/ExperienceEvent.java @@ -1,8 +1,8 @@ package org.betonquest.betonquest.quest.event.experience; import org.betonquest.betonquest.api.profile.OnlineProfile; +import org.betonquest.betonquest.api.quest.QuestException; import org.betonquest.betonquest.api.quest.event.online.OnlineEvent; -import org.betonquest.betonquest.exception.QuestException; import org.betonquest.betonquest.instruction.variable.VariableNumber; /** diff --git a/src/main/java/org/betonquest/betonquest/quest/event/experience/ExperienceEventFactory.java b/src/main/java/org/betonquest/betonquest/quest/event/experience/ExperienceEventFactory.java index f5624f12d3..7344cbd017 100644 --- a/src/main/java/org/betonquest/betonquest/quest/event/experience/ExperienceEventFactory.java +++ b/src/main/java/org/betonquest/betonquest/quest/event/experience/ExperienceEventFactory.java @@ -1,10 +1,10 @@ package org.betonquest.betonquest.quest.event.experience; import org.betonquest.betonquest.api.logger.BetonQuestLoggerFactory; +import org.betonquest.betonquest.api.quest.QuestException; import org.betonquest.betonquest.api.quest.event.Event; import org.betonquest.betonquest.api.quest.event.EventFactory; import org.betonquest.betonquest.api.quest.event.online.OnlineEventAdapter; -import org.betonquest.betonquest.exception.QuestException; import org.betonquest.betonquest.instruction.Instruction; import org.betonquest.betonquest.instruction.variable.VariableNumber; import org.betonquest.betonquest.quest.PrimaryServerThreadData; diff --git a/src/main/java/org/betonquest/betonquest/quest/event/explosion/ExplosionEvent.java b/src/main/java/org/betonquest/betonquest/quest/event/explosion/ExplosionEvent.java index 5d26f2b046..25d405b072 100644 --- a/src/main/java/org/betonquest/betonquest/quest/event/explosion/ExplosionEvent.java +++ b/src/main/java/org/betonquest/betonquest/quest/event/explosion/ExplosionEvent.java @@ -1,8 +1,8 @@ package org.betonquest.betonquest.quest.event.explosion; import org.betonquest.betonquest.api.profile.Profile; +import org.betonquest.betonquest.api.quest.QuestException; import org.betonquest.betonquest.api.quest.event.nullable.NullableEvent; -import org.betonquest.betonquest.exception.QuestException; import org.betonquest.betonquest.instruction.variable.VariableNumber; import org.betonquest.betonquest.instruction.variable.location.VariableLocation; import org.bukkit.Location; diff --git a/src/main/java/org/betonquest/betonquest/quest/event/explosion/ExplosionEventFactory.java b/src/main/java/org/betonquest/betonquest/quest/event/explosion/ExplosionEventFactory.java index 424bae5fc2..187fd6dc04 100644 --- a/src/main/java/org/betonquest/betonquest/quest/event/explosion/ExplosionEventFactory.java +++ b/src/main/java/org/betonquest/betonquest/quest/event/explosion/ExplosionEventFactory.java @@ -1,11 +1,11 @@ package org.betonquest.betonquest.quest.event.explosion; +import org.betonquest.betonquest.api.quest.QuestException; import org.betonquest.betonquest.api.quest.event.Event; import org.betonquest.betonquest.api.quest.event.EventFactory; import org.betonquest.betonquest.api.quest.event.StaticEvent; import org.betonquest.betonquest.api.quest.event.StaticEventFactory; import org.betonquest.betonquest.api.quest.event.nullable.NullableEventAdapter; -import org.betonquest.betonquest.exception.QuestException; import org.betonquest.betonquest.instruction.Instruction; import org.betonquest.betonquest.instruction.variable.VariableNumber; import org.betonquest.betonquest.instruction.variable.location.VariableLocation; diff --git a/src/main/java/org/betonquest/betonquest/quest/event/folder/FolderEvent.java b/src/main/java/org/betonquest/betonquest/quest/event/folder/FolderEvent.java index 16bb46dab2..eb9fa77f7e 100644 --- a/src/main/java/org/betonquest/betonquest/quest/event/folder/FolderEvent.java +++ b/src/main/java/org/betonquest/betonquest/quest/event/folder/FolderEvent.java @@ -3,8 +3,8 @@ import org.betonquest.betonquest.BetonQuest; import org.betonquest.betonquest.api.logger.BetonQuestLogger; import org.betonquest.betonquest.api.profile.Profile; +import org.betonquest.betonquest.api.quest.QuestException; import org.betonquest.betonquest.api.quest.event.nullable.NullableEvent; -import org.betonquest.betonquest.exception.QuestException; import org.betonquest.betonquest.id.ConditionID; import org.betonquest.betonquest.id.EventID; import org.betonquest.betonquest.instruction.variable.VariableNumber; diff --git a/src/main/java/org/betonquest/betonquest/quest/event/folder/FolderEventFactory.java b/src/main/java/org/betonquest/betonquest/quest/event/folder/FolderEventFactory.java index b13fdf9b1f..8b2c5ba35f 100644 --- a/src/main/java/org/betonquest/betonquest/quest/event/folder/FolderEventFactory.java +++ b/src/main/java/org/betonquest/betonquest/quest/event/folder/FolderEventFactory.java @@ -2,12 +2,12 @@ import org.betonquest.betonquest.BetonQuest; import org.betonquest.betonquest.api.logger.BetonQuestLoggerFactory; +import org.betonquest.betonquest.api.quest.QuestException; import org.betonquest.betonquest.api.quest.event.Event; import org.betonquest.betonquest.api.quest.event.EventFactory; import org.betonquest.betonquest.api.quest.event.StaticEvent; import org.betonquest.betonquest.api.quest.event.StaticEventFactory; import org.betonquest.betonquest.api.quest.event.nullable.NullableEventAdapter; -import org.betonquest.betonquest.exception.QuestException; import org.betonquest.betonquest.id.ConditionID; import org.betonquest.betonquest.id.EventID; import org.betonquest.betonquest.instruction.Instruction; diff --git a/src/main/java/org/betonquest/betonquest/quest/event/give/GiveEvent.java b/src/main/java/org/betonquest/betonquest/quest/event/give/GiveEvent.java index bbb7eaaf79..a488c8a26c 100644 --- a/src/main/java/org/betonquest/betonquest/quest/event/give/GiveEvent.java +++ b/src/main/java/org/betonquest/betonquest/quest/event/give/GiveEvent.java @@ -1,9 +1,9 @@ package org.betonquest.betonquest.quest.event.give; import org.betonquest.betonquest.api.profile.OnlineProfile; +import org.betonquest.betonquest.api.quest.QuestException; import org.betonquest.betonquest.api.quest.event.online.OnlineEvent; import org.betonquest.betonquest.data.PlayerDataStorage; -import org.betonquest.betonquest.exception.QuestException; import org.betonquest.betonquest.instruction.Item; import org.betonquest.betonquest.item.QuestItem; import org.betonquest.betonquest.quest.event.NotificationSender; diff --git a/src/main/java/org/betonquest/betonquest/quest/event/give/GiveEventFactory.java b/src/main/java/org/betonquest/betonquest/quest/event/give/GiveEventFactory.java index 9a57579d40..7c06d41d8d 100644 --- a/src/main/java/org/betonquest/betonquest/quest/event/give/GiveEventFactory.java +++ b/src/main/java/org/betonquest/betonquest/quest/event/give/GiveEventFactory.java @@ -2,11 +2,11 @@ import org.betonquest.betonquest.api.logger.BetonQuestLogger; import org.betonquest.betonquest.api.logger.BetonQuestLoggerFactory; +import org.betonquest.betonquest.api.quest.QuestException; import org.betonquest.betonquest.api.quest.event.Event; import org.betonquest.betonquest.api.quest.event.EventFactory; import org.betonquest.betonquest.api.quest.event.online.OnlineEventAdapter; import org.betonquest.betonquest.data.PlayerDataStorage; -import org.betonquest.betonquest.exception.QuestException; import org.betonquest.betonquest.instruction.Instruction; import org.betonquest.betonquest.quest.PrimaryServerThreadData; import org.betonquest.betonquest.quest.event.IngameNotificationSender; diff --git a/src/main/java/org/betonquest/betonquest/quest/event/hunger/HungerEvent.java b/src/main/java/org/betonquest/betonquest/quest/event/hunger/HungerEvent.java index 4110ceb4f7..4222c9b4e9 100644 --- a/src/main/java/org/betonquest/betonquest/quest/event/hunger/HungerEvent.java +++ b/src/main/java/org/betonquest/betonquest/quest/event/hunger/HungerEvent.java @@ -1,8 +1,8 @@ package org.betonquest.betonquest.quest.event.hunger; import org.betonquest.betonquest.api.profile.OnlineProfile; +import org.betonquest.betonquest.api.quest.QuestException; import org.betonquest.betonquest.api.quest.event.online.OnlineEvent; -import org.betonquest.betonquest.exception.QuestException; import org.betonquest.betonquest.instruction.variable.VariableNumber; import org.bukkit.entity.Player; diff --git a/src/main/java/org/betonquest/betonquest/quest/event/hunger/HungerEventFactory.java b/src/main/java/org/betonquest/betonquest/quest/event/hunger/HungerEventFactory.java index 63f0281b22..04719ba3c8 100644 --- a/src/main/java/org/betonquest/betonquest/quest/event/hunger/HungerEventFactory.java +++ b/src/main/java/org/betonquest/betonquest/quest/event/hunger/HungerEventFactory.java @@ -1,10 +1,10 @@ package org.betonquest.betonquest.quest.event.hunger; import org.betonquest.betonquest.api.logger.BetonQuestLoggerFactory; +import org.betonquest.betonquest.api.quest.QuestException; import org.betonquest.betonquest.api.quest.event.Event; import org.betonquest.betonquest.api.quest.event.EventFactory; import org.betonquest.betonquest.api.quest.event.online.OnlineEventAdapter; -import org.betonquest.betonquest.exception.QuestException; import org.betonquest.betonquest.instruction.Instruction; import org.betonquest.betonquest.instruction.variable.VariableNumber; import org.betonquest.betonquest.quest.PrimaryServerThreadData; diff --git a/src/main/java/org/betonquest/betonquest/quest/event/item/ItemDurabilityEvent.java b/src/main/java/org/betonquest/betonquest/quest/event/item/ItemDurabilityEvent.java index 8e556ee537..ef09534915 100644 --- a/src/main/java/org/betonquest/betonquest/quest/event/item/ItemDurabilityEvent.java +++ b/src/main/java/org/betonquest/betonquest/quest/event/item/ItemDurabilityEvent.java @@ -1,8 +1,8 @@ package org.betonquest.betonquest.quest.event.item; import org.betonquest.betonquest.api.profile.OnlineProfile; +import org.betonquest.betonquest.api.quest.QuestException; import org.betonquest.betonquest.api.quest.event.online.OnlineEvent; -import org.betonquest.betonquest.exception.QuestException; import org.betonquest.betonquest.instruction.variable.VariableNumber; import org.betonquest.betonquest.quest.event.point.Point; import org.bukkit.Bukkit; diff --git a/src/main/java/org/betonquest/betonquest/quest/event/item/ItemDurabilityEventFactory.java b/src/main/java/org/betonquest/betonquest/quest/event/item/ItemDurabilityEventFactory.java index d4326ee84d..778b1772a4 100644 --- a/src/main/java/org/betonquest/betonquest/quest/event/item/ItemDurabilityEventFactory.java +++ b/src/main/java/org/betonquest/betonquest/quest/event/item/ItemDurabilityEventFactory.java @@ -2,10 +2,10 @@ import org.betonquest.betonquest.api.logger.BetonQuestLogger; import org.betonquest.betonquest.api.logger.BetonQuestLoggerFactory; +import org.betonquest.betonquest.api.quest.QuestException; import org.betonquest.betonquest.api.quest.event.Event; import org.betonquest.betonquest.api.quest.event.EventFactory; import org.betonquest.betonquest.api.quest.event.online.OnlineEventAdapter; -import org.betonquest.betonquest.exception.QuestException; import org.betonquest.betonquest.instruction.Instruction; import org.betonquest.betonquest.instruction.variable.VariableNumber; import org.betonquest.betonquest.quest.PrimaryServerThreadData; diff --git a/src/main/java/org/betonquest/betonquest/quest/event/journal/GiveJournalEvent.java b/src/main/java/org/betonquest/betonquest/quest/event/journal/GiveJournalEvent.java index bf7ba7805d..d17de959c9 100644 --- a/src/main/java/org/betonquest/betonquest/quest/event/journal/GiveJournalEvent.java +++ b/src/main/java/org/betonquest/betonquest/quest/event/journal/GiveJournalEvent.java @@ -1,9 +1,9 @@ package org.betonquest.betonquest.quest.event.journal; import org.betonquest.betonquest.api.profile.OnlineProfile; +import org.betonquest.betonquest.api.quest.QuestException; import org.betonquest.betonquest.api.quest.event.online.OnlineEvent; import org.betonquest.betonquest.database.PlayerData; -import org.betonquest.betonquest.exception.QuestException; import java.util.function.Function; diff --git a/src/main/java/org/betonquest/betonquest/quest/event/journal/GiveJournalEventFactory.java b/src/main/java/org/betonquest/betonquest/quest/event/journal/GiveJournalEventFactory.java index 70b0ed6e4f..cbd39a228b 100644 --- a/src/main/java/org/betonquest/betonquest/quest/event/journal/GiveJournalEventFactory.java +++ b/src/main/java/org/betonquest/betonquest/quest/event/journal/GiveJournalEventFactory.java @@ -1,11 +1,11 @@ package org.betonquest.betonquest.quest.event.journal; import org.betonquest.betonquest.api.logger.BetonQuestLoggerFactory; +import org.betonquest.betonquest.api.quest.QuestException; import org.betonquest.betonquest.api.quest.event.Event; import org.betonquest.betonquest.api.quest.event.EventFactory; import org.betonquest.betonquest.api.quest.event.online.OnlineEventAdapter; import org.betonquest.betonquest.data.PlayerDataStorage; -import org.betonquest.betonquest.exception.QuestException; import org.betonquest.betonquest.instruction.Instruction; import org.betonquest.betonquest.quest.PrimaryServerThreadData; import org.betonquest.betonquest.quest.event.PrimaryServerThreadEvent; diff --git a/src/main/java/org/betonquest/betonquest/quest/event/journal/JournalEventFactory.java b/src/main/java/org/betonquest/betonquest/quest/event/journal/JournalEventFactory.java index 4eb68be7c8..4d4d25431a 100644 --- a/src/main/java/org/betonquest/betonquest/quest/event/journal/JournalEventFactory.java +++ b/src/main/java/org/betonquest/betonquest/quest/event/journal/JournalEventFactory.java @@ -1,6 +1,7 @@ package org.betonquest.betonquest.quest.event.journal; import org.betonquest.betonquest.api.logger.BetonQuestLoggerFactory; +import org.betonquest.betonquest.api.quest.QuestException; import org.betonquest.betonquest.api.quest.event.Event; import org.betonquest.betonquest.api.quest.event.EventFactory; import org.betonquest.betonquest.api.quest.event.StaticEvent; @@ -8,7 +9,6 @@ import org.betonquest.betonquest.data.PlayerDataStorage; import org.betonquest.betonquest.database.Saver; import org.betonquest.betonquest.database.UpdateType; -import org.betonquest.betonquest.exception.QuestException; import org.betonquest.betonquest.instruction.Instruction; import org.betonquest.betonquest.quest.event.DatabaseSaverStaticEvent; import org.betonquest.betonquest.quest.event.DoNothingStaticEvent; diff --git a/src/main/java/org/betonquest/betonquest/quest/event/kill/KillEvent.java b/src/main/java/org/betonquest/betonquest/quest/event/kill/KillEvent.java index af5d1b9526..ac6d4499aa 100644 --- a/src/main/java/org/betonquest/betonquest/quest/event/kill/KillEvent.java +++ b/src/main/java/org/betonquest/betonquest/quest/event/kill/KillEvent.java @@ -1,8 +1,8 @@ package org.betonquest.betonquest.quest.event.kill; import org.betonquest.betonquest.api.profile.OnlineProfile; +import org.betonquest.betonquest.api.quest.QuestException; import org.betonquest.betonquest.api.quest.event.online.OnlineEvent; -import org.betonquest.betonquest.exception.QuestException; /** * Kills the player. diff --git a/src/main/java/org/betonquest/betonquest/quest/event/kill/KillEventFactory.java b/src/main/java/org/betonquest/betonquest/quest/event/kill/KillEventFactory.java index b397247864..35b9b2e3ba 100644 --- a/src/main/java/org/betonquest/betonquest/quest/event/kill/KillEventFactory.java +++ b/src/main/java/org/betonquest/betonquest/quest/event/kill/KillEventFactory.java @@ -1,10 +1,10 @@ package org.betonquest.betonquest.quest.event.kill; import org.betonquest.betonquest.api.logger.BetonQuestLoggerFactory; +import org.betonquest.betonquest.api.quest.QuestException; import org.betonquest.betonquest.api.quest.event.Event; import org.betonquest.betonquest.api.quest.event.EventFactory; import org.betonquest.betonquest.api.quest.event.online.OnlineEventAdapter; -import org.betonquest.betonquest.exception.QuestException; import org.betonquest.betonquest.instruction.Instruction; import org.betonquest.betonquest.quest.PrimaryServerThreadData; import org.betonquest.betonquest.quest.event.PrimaryServerThreadEvent; diff --git a/src/main/java/org/betonquest/betonquest/quest/event/language/LanguageEvent.java b/src/main/java/org/betonquest/betonquest/quest/event/language/LanguageEvent.java index 449edd63f8..ef2ec3a91e 100644 --- a/src/main/java/org/betonquest/betonquest/quest/event/language/LanguageEvent.java +++ b/src/main/java/org/betonquest/betonquest/quest/event/language/LanguageEvent.java @@ -1,9 +1,9 @@ package org.betonquest.betonquest.quest.event.language; import org.betonquest.betonquest.api.profile.Profile; +import org.betonquest.betonquest.api.quest.QuestException; import org.betonquest.betonquest.api.quest.event.Event; import org.betonquest.betonquest.data.PlayerDataStorage; -import org.betonquest.betonquest.exception.QuestException; /** * Changes player's language. diff --git a/src/main/java/org/betonquest/betonquest/quest/event/language/LanguageEventFactory.java b/src/main/java/org/betonquest/betonquest/quest/event/language/LanguageEventFactory.java index 179d358690..45fc948820 100644 --- a/src/main/java/org/betonquest/betonquest/quest/event/language/LanguageEventFactory.java +++ b/src/main/java/org/betonquest/betonquest/quest/event/language/LanguageEventFactory.java @@ -1,9 +1,9 @@ package org.betonquest.betonquest.quest.event.language; +import org.betonquest.betonquest.api.quest.QuestException; import org.betonquest.betonquest.api.quest.event.Event; import org.betonquest.betonquest.api.quest.event.EventFactory; import org.betonquest.betonquest.data.PlayerDataStorage; -import org.betonquest.betonquest.exception.QuestException; import org.betonquest.betonquest.instruction.Instruction; /** diff --git a/src/main/java/org/betonquest/betonquest/quest/event/lever/LeverEvent.java b/src/main/java/org/betonquest/betonquest/quest/event/lever/LeverEvent.java index ad6b935231..072df61225 100644 --- a/src/main/java/org/betonquest/betonquest/quest/event/lever/LeverEvent.java +++ b/src/main/java/org/betonquest/betonquest/quest/event/lever/LeverEvent.java @@ -1,8 +1,8 @@ package org.betonquest.betonquest.quest.event.lever; import org.betonquest.betonquest.api.profile.Profile; +import org.betonquest.betonquest.api.quest.QuestException; import org.betonquest.betonquest.api.quest.event.nullable.NullableEvent; -import org.betonquest.betonquest.exception.QuestException; import org.betonquest.betonquest.instruction.variable.location.VariableLocation; import org.bukkit.Material; import org.bukkit.block.Block; diff --git a/src/main/java/org/betonquest/betonquest/quest/event/lever/LeverEventFactory.java b/src/main/java/org/betonquest/betonquest/quest/event/lever/LeverEventFactory.java index 9d7cb7f339..9bbfd90738 100644 --- a/src/main/java/org/betonquest/betonquest/quest/event/lever/LeverEventFactory.java +++ b/src/main/java/org/betonquest/betonquest/quest/event/lever/LeverEventFactory.java @@ -1,11 +1,11 @@ package org.betonquest.betonquest.quest.event.lever; +import org.betonquest.betonquest.api.quest.QuestException; import org.betonquest.betonquest.api.quest.event.Event; import org.betonquest.betonquest.api.quest.event.EventFactory; import org.betonquest.betonquest.api.quest.event.StaticEvent; import org.betonquest.betonquest.api.quest.event.StaticEventFactory; import org.betonquest.betonquest.api.quest.event.nullable.NullableEventAdapter; -import org.betonquest.betonquest.exception.QuestException; import org.betonquest.betonquest.instruction.Instruction; import org.betonquest.betonquest.instruction.variable.location.VariableLocation; import org.betonquest.betonquest.quest.PrimaryServerThreadData; diff --git a/src/main/java/org/betonquest/betonquest/quest/event/lightning/LightningEvent.java b/src/main/java/org/betonquest/betonquest/quest/event/lightning/LightningEvent.java index fb969695fc..c6e8d57500 100644 --- a/src/main/java/org/betonquest/betonquest/quest/event/lightning/LightningEvent.java +++ b/src/main/java/org/betonquest/betonquest/quest/event/lightning/LightningEvent.java @@ -1,8 +1,8 @@ package org.betonquest.betonquest.quest.event.lightning; import org.betonquest.betonquest.api.profile.Profile; +import org.betonquest.betonquest.api.quest.QuestException; import org.betonquest.betonquest.api.quest.event.nullable.NullableEvent; -import org.betonquest.betonquest.exception.QuestException; import org.betonquest.betonquest.instruction.variable.location.VariableLocation; import org.bukkit.Location; import org.bukkit.World; diff --git a/src/main/java/org/betonquest/betonquest/quest/event/lightning/LightningEventFactory.java b/src/main/java/org/betonquest/betonquest/quest/event/lightning/LightningEventFactory.java index 9fe1b0b7a8..3f60fbc25e 100644 --- a/src/main/java/org/betonquest/betonquest/quest/event/lightning/LightningEventFactory.java +++ b/src/main/java/org/betonquest/betonquest/quest/event/lightning/LightningEventFactory.java @@ -1,11 +1,11 @@ package org.betonquest.betonquest.quest.event.lightning; +import org.betonquest.betonquest.api.quest.QuestException; import org.betonquest.betonquest.api.quest.event.Event; import org.betonquest.betonquest.api.quest.event.EventFactory; import org.betonquest.betonquest.api.quest.event.StaticEvent; import org.betonquest.betonquest.api.quest.event.StaticEventFactory; import org.betonquest.betonquest.api.quest.event.nullable.NullableEventAdapter; -import org.betonquest.betonquest.exception.QuestException; import org.betonquest.betonquest.instruction.Instruction; import org.betonquest.betonquest.instruction.variable.location.VariableLocation; import org.betonquest.betonquest.quest.PrimaryServerThreadData; diff --git a/src/main/java/org/betonquest/betonquest/quest/event/log/LogEvent.java b/src/main/java/org/betonquest/betonquest/quest/event/log/LogEvent.java index f95d2269d4..4858404308 100644 --- a/src/main/java/org/betonquest/betonquest/quest/event/log/LogEvent.java +++ b/src/main/java/org/betonquest/betonquest/quest/event/log/LogEvent.java @@ -2,8 +2,8 @@ import org.betonquest.betonquest.api.logger.BetonQuestLogger; import org.betonquest.betonquest.api.profile.Profile; +import org.betonquest.betonquest.api.quest.QuestException; import org.betonquest.betonquest.api.quest.event.nullable.NullableEvent; -import org.betonquest.betonquest.exception.QuestException; import org.betonquest.betonquest.instruction.variable.VariableString; import org.jetbrains.annotations.Nullable; diff --git a/src/main/java/org/betonquest/betonquest/quest/event/log/LogEventFactory.java b/src/main/java/org/betonquest/betonquest/quest/event/log/LogEventFactory.java index 68868add4c..8394409c2c 100644 --- a/src/main/java/org/betonquest/betonquest/quest/event/log/LogEventFactory.java +++ b/src/main/java/org/betonquest/betonquest/quest/event/log/LogEventFactory.java @@ -2,12 +2,12 @@ import org.betonquest.betonquest.api.logger.BetonQuestLogger; import org.betonquest.betonquest.api.logger.BetonQuestLoggerFactory; +import org.betonquest.betonquest.api.quest.QuestException; import org.betonquest.betonquest.api.quest.event.Event; import org.betonquest.betonquest.api.quest.event.EventFactory; import org.betonquest.betonquest.api.quest.event.StaticEvent; import org.betonquest.betonquest.api.quest.event.StaticEventFactory; import org.betonquest.betonquest.api.quest.event.nullable.NullableEventAdapter; -import org.betonquest.betonquest.exception.QuestException; import org.betonquest.betonquest.instruction.Instruction; import org.betonquest.betonquest.instruction.variable.VariableString; diff --git a/src/main/java/org/betonquest/betonquest/quest/event/logic/FirstEvent.java b/src/main/java/org/betonquest/betonquest/quest/event/logic/FirstEvent.java index e42db8c3b6..f63f121b14 100644 --- a/src/main/java/org/betonquest/betonquest/quest/event/logic/FirstEvent.java +++ b/src/main/java/org/betonquest/betonquest/quest/event/logic/FirstEvent.java @@ -2,8 +2,8 @@ import org.betonquest.betonquest.BetonQuest; import org.betonquest.betonquest.api.profile.Profile; +import org.betonquest.betonquest.api.quest.QuestException; import org.betonquest.betonquest.api.quest.event.nullable.NullableEvent; -import org.betonquest.betonquest.exception.QuestException; import org.betonquest.betonquest.id.EventID; import org.jetbrains.annotations.Nullable; diff --git a/src/main/java/org/betonquest/betonquest/quest/event/logic/FirstEventFactory.java b/src/main/java/org/betonquest/betonquest/quest/event/logic/FirstEventFactory.java index 13fab8012f..c5ac32cbc8 100644 --- a/src/main/java/org/betonquest/betonquest/quest/event/logic/FirstEventFactory.java +++ b/src/main/java/org/betonquest/betonquest/quest/event/logic/FirstEventFactory.java @@ -1,11 +1,11 @@ package org.betonquest.betonquest.quest.event.logic; +import org.betonquest.betonquest.api.quest.QuestException; import org.betonquest.betonquest.api.quest.event.Event; import org.betonquest.betonquest.api.quest.event.EventFactory; import org.betonquest.betonquest.api.quest.event.StaticEvent; import org.betonquest.betonquest.api.quest.event.StaticEventFactory; import org.betonquest.betonquest.api.quest.event.nullable.NullableEventAdapter; -import org.betonquest.betonquest.exception.QuestException; import org.betonquest.betonquest.id.EventID; import org.betonquest.betonquest.instruction.Instruction; diff --git a/src/main/java/org/betonquest/betonquest/quest/event/logic/IfElseEvent.java b/src/main/java/org/betonquest/betonquest/quest/event/logic/IfElseEvent.java index 08b4a94c7d..d7a9480e97 100644 --- a/src/main/java/org/betonquest/betonquest/quest/event/logic/IfElseEvent.java +++ b/src/main/java/org/betonquest/betonquest/quest/event/logic/IfElseEvent.java @@ -2,8 +2,8 @@ import org.betonquest.betonquest.BetonQuest; import org.betonquest.betonquest.api.profile.Profile; +import org.betonquest.betonquest.api.quest.QuestException; import org.betonquest.betonquest.api.quest.event.nullable.NullableEvent; -import org.betonquest.betonquest.exception.QuestException; import org.betonquest.betonquest.id.ConditionID; import org.betonquest.betonquest.id.EventID; import org.jetbrains.annotations.Nullable; diff --git a/src/main/java/org/betonquest/betonquest/quest/event/logic/IfElseEventFactory.java b/src/main/java/org/betonquest/betonquest/quest/event/logic/IfElseEventFactory.java index ba64ffbd21..fe1d3d1ab1 100644 --- a/src/main/java/org/betonquest/betonquest/quest/event/logic/IfElseEventFactory.java +++ b/src/main/java/org/betonquest/betonquest/quest/event/logic/IfElseEventFactory.java @@ -1,11 +1,11 @@ package org.betonquest.betonquest.quest.event.logic; +import org.betonquest.betonquest.api.quest.QuestException; import org.betonquest.betonquest.api.quest.event.Event; import org.betonquest.betonquest.api.quest.event.EventFactory; import org.betonquest.betonquest.api.quest.event.StaticEvent; import org.betonquest.betonquest.api.quest.event.StaticEventFactory; import org.betonquest.betonquest.api.quest.event.nullable.NullableEventAdapter; -import org.betonquest.betonquest.exception.QuestException; import org.betonquest.betonquest.id.ConditionID; import org.betonquest.betonquest.id.EventID; import org.betonquest.betonquest.instruction.Instruction; diff --git a/src/main/java/org/betonquest/betonquest/quest/event/notify/NotifyAllEventFactory.java b/src/main/java/org/betonquest/betonquest/quest/event/notify/NotifyAllEventFactory.java index bcc14170b8..778aa9b3bc 100644 --- a/src/main/java/org/betonquest/betonquest/quest/event/notify/NotifyAllEventFactory.java +++ b/src/main/java/org/betonquest/betonquest/quest/event/notify/NotifyAllEventFactory.java @@ -1,12 +1,12 @@ package org.betonquest.betonquest.quest.event.notify; import org.betonquest.betonquest.api.logger.BetonQuestLoggerFactory; +import org.betonquest.betonquest.api.quest.QuestException; import org.betonquest.betonquest.api.quest.event.Event; import org.betonquest.betonquest.api.quest.event.EventFactory; import org.betonquest.betonquest.api.quest.event.StaticEvent; import org.betonquest.betonquest.api.quest.event.StaticEventFactory; import org.betonquest.betonquest.data.PlayerDataStorage; -import org.betonquest.betonquest.exception.QuestException; import org.betonquest.betonquest.instruction.Instruction; import org.betonquest.betonquest.quest.PrimaryServerThreadData; import org.betonquest.betonquest.quest.event.CallStaticEventAdapter; diff --git a/src/main/java/org/betonquest/betonquest/quest/event/notify/NotifyEvent.java b/src/main/java/org/betonquest/betonquest/quest/event/notify/NotifyEvent.java index 8ed63c8460..9c72333d6b 100644 --- a/src/main/java/org/betonquest/betonquest/quest/event/notify/NotifyEvent.java +++ b/src/main/java/org/betonquest/betonquest/quest/event/notify/NotifyEvent.java @@ -1,11 +1,11 @@ package org.betonquest.betonquest.quest.event.notify; import org.betonquest.betonquest.api.profile.OnlineProfile; +import org.betonquest.betonquest.api.quest.QuestException; import org.betonquest.betonquest.api.quest.event.Event; import org.betonquest.betonquest.api.quest.event.online.OnlineEvent; import org.betonquest.betonquest.config.Config; import org.betonquest.betonquest.data.PlayerDataStorage; -import org.betonquest.betonquest.exception.QuestException; import org.betonquest.betonquest.instruction.variable.VariableString; import org.betonquest.betonquest.notify.NotifyIO; diff --git a/src/main/java/org/betonquest/betonquest/quest/event/notify/NotifyEventFactory.java b/src/main/java/org/betonquest/betonquest/quest/event/notify/NotifyEventFactory.java index c7fbe7f83f..33b06b0567 100644 --- a/src/main/java/org/betonquest/betonquest/quest/event/notify/NotifyEventFactory.java +++ b/src/main/java/org/betonquest/betonquest/quest/event/notify/NotifyEventFactory.java @@ -1,12 +1,12 @@ package org.betonquest.betonquest.quest.event.notify; import org.betonquest.betonquest.api.logger.BetonQuestLoggerFactory; +import org.betonquest.betonquest.api.quest.QuestException; import org.betonquest.betonquest.api.quest.event.Event; import org.betonquest.betonquest.api.quest.event.EventFactory; import org.betonquest.betonquest.api.quest.event.online.OnlineEventAdapter; import org.betonquest.betonquest.config.Config; import org.betonquest.betonquest.data.PlayerDataStorage; -import org.betonquest.betonquest.exception.QuestException; import org.betonquest.betonquest.instruction.Instruction; import org.betonquest.betonquest.instruction.variable.VariableString; import org.betonquest.betonquest.notify.Notify; diff --git a/src/main/java/org/betonquest/betonquest/quest/event/objective/ObjectiveEvent.java b/src/main/java/org/betonquest/betonquest/quest/event/objective/ObjectiveEvent.java index 40f09fdb28..aa533631a8 100644 --- a/src/main/java/org/betonquest/betonquest/quest/event/objective/ObjectiveEvent.java +++ b/src/main/java/org/betonquest/betonquest/quest/event/objective/ObjectiveEvent.java @@ -5,11 +5,11 @@ import org.betonquest.betonquest.api.config.quest.QuestPackage; import org.betonquest.betonquest.api.logger.BetonQuestLogger; import org.betonquest.betonquest.api.profile.Profile; +import org.betonquest.betonquest.api.quest.QuestException; import org.betonquest.betonquest.api.quest.event.nullable.NullableEvent; import org.betonquest.betonquest.database.PlayerData; import org.betonquest.betonquest.database.Saver; import org.betonquest.betonquest.database.UpdateType; -import org.betonquest.betonquest.exception.QuestException; import org.betonquest.betonquest.id.ObjectiveID; import org.betonquest.betonquest.util.PlayerConverter; import org.bukkit.Bukkit; diff --git a/src/main/java/org/betonquest/betonquest/quest/event/objective/ObjectiveEventFactory.java b/src/main/java/org/betonquest/betonquest/quest/event/objective/ObjectiveEventFactory.java index f9e7938839..5b01f09929 100644 --- a/src/main/java/org/betonquest/betonquest/quest/event/objective/ObjectiveEventFactory.java +++ b/src/main/java/org/betonquest/betonquest/quest/event/objective/ObjectiveEventFactory.java @@ -2,12 +2,12 @@ import org.betonquest.betonquest.BetonQuest; import org.betonquest.betonquest.api.logger.BetonQuestLoggerFactory; +import org.betonquest.betonquest.api.quest.QuestException; import org.betonquest.betonquest.api.quest.event.Event; import org.betonquest.betonquest.api.quest.event.EventFactory; import org.betonquest.betonquest.api.quest.event.StaticEvent; import org.betonquest.betonquest.api.quest.event.StaticEventFactory; import org.betonquest.betonquest.api.quest.event.nullable.NullableEventAdapter; -import org.betonquest.betonquest.exception.QuestException; import org.betonquest.betonquest.id.ObjectiveID; import org.betonquest.betonquest.instruction.Instruction; diff --git a/src/main/java/org/betonquest/betonquest/quest/event/party/PartyEvent.java b/src/main/java/org/betonquest/betonquest/quest/event/party/PartyEvent.java index 44c35c296d..9879d4fad9 100644 --- a/src/main/java/org/betonquest/betonquest/quest/event/party/PartyEvent.java +++ b/src/main/java/org/betonquest/betonquest/quest/event/party/PartyEvent.java @@ -2,8 +2,8 @@ import org.betonquest.betonquest.BetonQuest; import org.betonquest.betonquest.api.profile.OnlineProfile; +import org.betonquest.betonquest.api.quest.QuestException; import org.betonquest.betonquest.api.quest.event.online.OnlineEvent; -import org.betonquest.betonquest.exception.QuestException; import org.betonquest.betonquest.id.ConditionID; import org.betonquest.betonquest.id.EventID; import org.betonquest.betonquest.instruction.variable.VariableNumber; diff --git a/src/main/java/org/betonquest/betonquest/quest/event/party/PartyEventFactory.java b/src/main/java/org/betonquest/betonquest/quest/event/party/PartyEventFactory.java index 1748ee9687..d84b1f7eb0 100644 --- a/src/main/java/org/betonquest/betonquest/quest/event/party/PartyEventFactory.java +++ b/src/main/java/org/betonquest/betonquest/quest/event/party/PartyEventFactory.java @@ -1,10 +1,10 @@ package org.betonquest.betonquest.quest.event.party; import org.betonquest.betonquest.api.logger.BetonQuestLoggerFactory; +import org.betonquest.betonquest.api.quest.QuestException; import org.betonquest.betonquest.api.quest.event.Event; import org.betonquest.betonquest.api.quest.event.EventFactory; import org.betonquest.betonquest.api.quest.event.online.OnlineEventAdapter; -import org.betonquest.betonquest.exception.QuestException; import org.betonquest.betonquest.id.ConditionID; import org.betonquest.betonquest.id.EventID; import org.betonquest.betonquest.instruction.Instruction; diff --git a/src/main/java/org/betonquest/betonquest/quest/event/point/DeleteGlobalPointEvent.java b/src/main/java/org/betonquest/betonquest/quest/event/point/DeleteGlobalPointEvent.java index fdc4500b8a..8b30506fe1 100644 --- a/src/main/java/org/betonquest/betonquest/quest/event/point/DeleteGlobalPointEvent.java +++ b/src/main/java/org/betonquest/betonquest/quest/event/point/DeleteGlobalPointEvent.java @@ -1,9 +1,9 @@ package org.betonquest.betonquest.quest.event.point; import org.betonquest.betonquest.BetonQuest; +import org.betonquest.betonquest.api.quest.QuestException; import org.betonquest.betonquest.api.quest.event.StaticEvent; import org.betonquest.betonquest.database.GlobalData; -import org.betonquest.betonquest.exception.QuestException; /** * Deletes a category from the global points. diff --git a/src/main/java/org/betonquest/betonquest/quest/event/point/DeleteGlobalPointEventFactory.java b/src/main/java/org/betonquest/betonquest/quest/event/point/DeleteGlobalPointEventFactory.java index ec8cd7b633..c9007ce093 100644 --- a/src/main/java/org/betonquest/betonquest/quest/event/point/DeleteGlobalPointEventFactory.java +++ b/src/main/java/org/betonquest/betonquest/quest/event/point/DeleteGlobalPointEventFactory.java @@ -1,8 +1,8 @@ package org.betonquest.betonquest.quest.event.point; +import org.betonquest.betonquest.api.quest.QuestException; import org.betonquest.betonquest.api.quest.event.StaticEvent; import org.betonquest.betonquest.api.quest.event.StaticEventFactory; -import org.betonquest.betonquest.exception.QuestException; import org.betonquest.betonquest.instruction.Instruction; import org.betonquest.betonquest.util.Utils; diff --git a/src/main/java/org/betonquest/betonquest/quest/event/point/DeletePointEvent.java b/src/main/java/org/betonquest/betonquest/quest/event/point/DeletePointEvent.java index 768ce8aa5f..3f4356a107 100644 --- a/src/main/java/org/betonquest/betonquest/quest/event/point/DeletePointEvent.java +++ b/src/main/java/org/betonquest/betonquest/quest/event/point/DeletePointEvent.java @@ -1,9 +1,9 @@ package org.betonquest.betonquest.quest.event.point; import org.betonquest.betonquest.api.profile.Profile; +import org.betonquest.betonquest.api.quest.QuestException; import org.betonquest.betonquest.api.quest.event.Event; import org.betonquest.betonquest.database.PlayerData; -import org.betonquest.betonquest.exception.QuestException; import java.util.function.Function; diff --git a/src/main/java/org/betonquest/betonquest/quest/event/point/DeletePointEventFactory.java b/src/main/java/org/betonquest/betonquest/quest/event/point/DeletePointEventFactory.java index 393ba359aa..0a6b2d87ec 100644 --- a/src/main/java/org/betonquest/betonquest/quest/event/point/DeletePointEventFactory.java +++ b/src/main/java/org/betonquest/betonquest/quest/event/point/DeletePointEventFactory.java @@ -1,5 +1,6 @@ package org.betonquest.betonquest.quest.event.point; +import org.betonquest.betonquest.api.quest.QuestException; import org.betonquest.betonquest.api.quest.event.Event; import org.betonquest.betonquest.api.quest.event.EventFactory; import org.betonquest.betonquest.api.quest.event.StaticEvent; @@ -7,7 +8,6 @@ import org.betonquest.betonquest.data.PlayerDataStorage; import org.betonquest.betonquest.database.Saver; import org.betonquest.betonquest.database.UpdateType; -import org.betonquest.betonquest.exception.QuestException; import org.betonquest.betonquest.instruction.Instruction; import org.betonquest.betonquest.quest.event.DatabaseSaverStaticEvent; import org.betonquest.betonquest.quest.event.OnlineProfileGroupStaticEventAdapter; diff --git a/src/main/java/org/betonquest/betonquest/quest/event/point/GlobalPointEvent.java b/src/main/java/org/betonquest/betonquest/quest/event/point/GlobalPointEvent.java index fe38c482c7..69f74eba73 100644 --- a/src/main/java/org/betonquest/betonquest/quest/event/point/GlobalPointEvent.java +++ b/src/main/java/org/betonquest/betonquest/quest/event/point/GlobalPointEvent.java @@ -2,9 +2,9 @@ import org.betonquest.betonquest.BetonQuest; import org.betonquest.betonquest.api.profile.Profile; +import org.betonquest.betonquest.api.quest.QuestException; import org.betonquest.betonquest.api.quest.event.nullable.NullableEvent; import org.betonquest.betonquest.database.GlobalData; -import org.betonquest.betonquest.exception.QuestException; import org.betonquest.betonquest.instruction.variable.VariableNumber; import org.jetbrains.annotations.Nullable; diff --git a/src/main/java/org/betonquest/betonquest/quest/event/point/GlobalPointEventFactory.java b/src/main/java/org/betonquest/betonquest/quest/event/point/GlobalPointEventFactory.java index dce2e362a7..b843d77e91 100644 --- a/src/main/java/org/betonquest/betonquest/quest/event/point/GlobalPointEventFactory.java +++ b/src/main/java/org/betonquest/betonquest/quest/event/point/GlobalPointEventFactory.java @@ -1,11 +1,11 @@ package org.betonquest.betonquest.quest.event.point; +import org.betonquest.betonquest.api.quest.QuestException; import org.betonquest.betonquest.api.quest.event.Event; import org.betonquest.betonquest.api.quest.event.EventFactory; import org.betonquest.betonquest.api.quest.event.StaticEvent; import org.betonquest.betonquest.api.quest.event.StaticEventFactory; import org.betonquest.betonquest.api.quest.event.nullable.NullableEventAdapter; -import org.betonquest.betonquest.exception.QuestException; import org.betonquest.betonquest.instruction.Instruction; import org.betonquest.betonquest.instruction.variable.VariableNumber; import org.betonquest.betonquest.quest.registry.processor.VariableProcessor; diff --git a/src/main/java/org/betonquest/betonquest/quest/event/point/PointEvent.java b/src/main/java/org/betonquest/betonquest/quest/event/point/PointEvent.java index 8603c1d50f..dfafa20646 100644 --- a/src/main/java/org/betonquest/betonquest/quest/event/point/PointEvent.java +++ b/src/main/java/org/betonquest/betonquest/quest/event/point/PointEvent.java @@ -1,10 +1,10 @@ package org.betonquest.betonquest.quest.event.point; import org.betonquest.betonquest.api.profile.Profile; +import org.betonquest.betonquest.api.quest.QuestException; import org.betonquest.betonquest.api.quest.event.Event; import org.betonquest.betonquest.data.PlayerDataStorage; import org.betonquest.betonquest.database.PlayerData; -import org.betonquest.betonquest.exception.QuestException; import org.betonquest.betonquest.instruction.variable.VariableNumber; import org.betonquest.betonquest.quest.event.NotificationSender; diff --git a/src/main/java/org/betonquest/betonquest/quest/event/point/PointEventFactory.java b/src/main/java/org/betonquest/betonquest/quest/event/point/PointEventFactory.java index b82f9ba8cb..30f28a9ca7 100644 --- a/src/main/java/org/betonquest/betonquest/quest/event/point/PointEventFactory.java +++ b/src/main/java/org/betonquest/betonquest/quest/event/point/PointEventFactory.java @@ -1,10 +1,10 @@ package org.betonquest.betonquest.quest.event.point; import org.betonquest.betonquest.api.logger.BetonQuestLoggerFactory; +import org.betonquest.betonquest.api.quest.QuestException; import org.betonquest.betonquest.api.quest.event.Event; import org.betonquest.betonquest.api.quest.event.EventFactory; import org.betonquest.betonquest.data.PlayerDataStorage; -import org.betonquest.betonquest.exception.QuestException; import org.betonquest.betonquest.instruction.Instruction; import org.betonquest.betonquest.instruction.variable.VariableNumber; import org.betonquest.betonquest.quest.event.IngameNotificationSender; diff --git a/src/main/java/org/betonquest/betonquest/quest/event/random/PickRandomEvent.java b/src/main/java/org/betonquest/betonquest/quest/event/random/PickRandomEvent.java index 2811abc195..67a655b655 100644 --- a/src/main/java/org/betonquest/betonquest/quest/event/random/PickRandomEvent.java +++ b/src/main/java/org/betonquest/betonquest/quest/event/random/PickRandomEvent.java @@ -2,8 +2,8 @@ import org.betonquest.betonquest.BetonQuest; import org.betonquest.betonquest.api.profile.Profile; +import org.betonquest.betonquest.api.quest.QuestException; import org.betonquest.betonquest.api.quest.event.nullable.NullableEvent; -import org.betonquest.betonquest.exception.QuestException; import org.betonquest.betonquest.instruction.variable.VariableNumber; import org.jetbrains.annotations.Nullable; diff --git a/src/main/java/org/betonquest/betonquest/quest/event/random/PickRandomEventFactory.java b/src/main/java/org/betonquest/betonquest/quest/event/random/PickRandomEventFactory.java index 7896e6e709..022a3765e2 100644 --- a/src/main/java/org/betonquest/betonquest/quest/event/random/PickRandomEventFactory.java +++ b/src/main/java/org/betonquest/betonquest/quest/event/random/PickRandomEventFactory.java @@ -1,12 +1,12 @@ package org.betonquest.betonquest.quest.event.random; +import org.betonquest.betonquest.api.quest.QuestException; import org.betonquest.betonquest.api.quest.event.Event; import org.betonquest.betonquest.api.quest.event.EventFactory; import org.betonquest.betonquest.api.quest.event.StaticEvent; import org.betonquest.betonquest.api.quest.event.StaticEventFactory; import org.betonquest.betonquest.api.quest.event.nullable.NullableEventAdapter; import org.betonquest.betonquest.exception.ObjectNotFoundException; -import org.betonquest.betonquest.exception.QuestException; import org.betonquest.betonquest.id.EventID; import org.betonquest.betonquest.instruction.Instruction; import org.betonquest.betonquest.instruction.variable.VariableNumber; diff --git a/src/main/java/org/betonquest/betonquest/quest/event/random/RandomEvent.java b/src/main/java/org/betonquest/betonquest/quest/event/random/RandomEvent.java index 11f4b8f56c..ba6a6ec260 100644 --- a/src/main/java/org/betonquest/betonquest/quest/event/random/RandomEvent.java +++ b/src/main/java/org/betonquest/betonquest/quest/event/random/RandomEvent.java @@ -1,7 +1,7 @@ package org.betonquest.betonquest.quest.event.random; import org.betonquest.betonquest.api.profile.Profile; -import org.betonquest.betonquest.exception.QuestException; +import org.betonquest.betonquest.api.quest.QuestException; import org.betonquest.betonquest.id.EventID; import org.betonquest.betonquest.instruction.variable.VariableNumber; import org.jetbrains.annotations.Nullable; diff --git a/src/main/java/org/betonquest/betonquest/quest/event/run/RunEvent.java b/src/main/java/org/betonquest/betonquest/quest/event/run/RunEvent.java index 9dd6ae4c47..b57278045b 100644 --- a/src/main/java/org/betonquest/betonquest/quest/event/run/RunEvent.java +++ b/src/main/java/org/betonquest/betonquest/quest/event/run/RunEvent.java @@ -2,8 +2,8 @@ import org.betonquest.betonquest.api.QuestEvent; import org.betonquest.betonquest.api.profile.Profile; +import org.betonquest.betonquest.api.quest.QuestException; import org.betonquest.betonquest.api.quest.event.nullable.NullableEvent; -import org.betonquest.betonquest.exception.QuestException; import org.jetbrains.annotations.Nullable; import java.util.List; diff --git a/src/main/java/org/betonquest/betonquest/quest/event/run/RunEventFactory.java b/src/main/java/org/betonquest/betonquest/quest/event/run/RunEventFactory.java index f7a41215ec..8b5c518c3a 100644 --- a/src/main/java/org/betonquest/betonquest/quest/event/run/RunEventFactory.java +++ b/src/main/java/org/betonquest/betonquest/quest/event/run/RunEventFactory.java @@ -3,12 +3,12 @@ import org.betonquest.betonquest.BetonQuest; import org.betonquest.betonquest.api.QuestEvent; import org.betonquest.betonquest.api.config.quest.QuestPackage; +import org.betonquest.betonquest.api.quest.QuestException; import org.betonquest.betonquest.api.quest.event.Event; import org.betonquest.betonquest.api.quest.event.EventFactory; import org.betonquest.betonquest.api.quest.event.StaticEvent; import org.betonquest.betonquest.api.quest.event.StaticEventFactory; import org.betonquest.betonquest.api.quest.event.nullable.NullableEventAdapter; -import org.betonquest.betonquest.exception.QuestException; import org.betonquest.betonquest.instruction.Instruction; import org.betonquest.betonquest.item.typehandler.HandlerUtil; import org.betonquest.betonquest.quest.legacy.LegacyTypeFactory; diff --git a/src/main/java/org/betonquest/betonquest/quest/event/run/RunForAllEvent.java b/src/main/java/org/betonquest/betonquest/quest/event/run/RunForAllEvent.java index a84612d78c..c1bc3404c8 100644 --- a/src/main/java/org/betonquest/betonquest/quest/event/run/RunForAllEvent.java +++ b/src/main/java/org/betonquest/betonquest/quest/event/run/RunForAllEvent.java @@ -2,8 +2,8 @@ import org.betonquest.betonquest.BetonQuest; import org.betonquest.betonquest.api.profile.Profile; +import org.betonquest.betonquest.api.quest.QuestException; import org.betonquest.betonquest.api.quest.event.StaticEvent; -import org.betonquest.betonquest.exception.QuestException; import org.betonquest.betonquest.id.ConditionID; import org.betonquest.betonquest.id.EventID; diff --git a/src/main/java/org/betonquest/betonquest/quest/event/run/RunForAllEventFactory.java b/src/main/java/org/betonquest/betonquest/quest/event/run/RunForAllEventFactory.java index 33e33481d5..317aef9dd3 100644 --- a/src/main/java/org/betonquest/betonquest/quest/event/run/RunForAllEventFactory.java +++ b/src/main/java/org/betonquest/betonquest/quest/event/run/RunForAllEventFactory.java @@ -1,8 +1,8 @@ package org.betonquest.betonquest.quest.event.run; +import org.betonquest.betonquest.api.quest.QuestException; import org.betonquest.betonquest.api.quest.event.StaticEvent; import org.betonquest.betonquest.api.quest.event.StaticEventFactory; -import org.betonquest.betonquest.exception.QuestException; import org.betonquest.betonquest.id.ConditionID; import org.betonquest.betonquest.id.EventID; import org.betonquest.betonquest.instruction.Instruction; diff --git a/src/main/java/org/betonquest/betonquest/quest/event/run/RunIndependentEvent.java b/src/main/java/org/betonquest/betonquest/quest/event/run/RunIndependentEvent.java index bb68af0a1f..8ddcac9b79 100644 --- a/src/main/java/org/betonquest/betonquest/quest/event/run/RunIndependentEvent.java +++ b/src/main/java/org/betonquest/betonquest/quest/event/run/RunIndependentEvent.java @@ -1,8 +1,8 @@ package org.betonquest.betonquest.quest.event.run; import org.betonquest.betonquest.BetonQuest; +import org.betonquest.betonquest.api.quest.QuestException; import org.betonquest.betonquest.api.quest.event.StaticEvent; -import org.betonquest.betonquest.exception.QuestException; import org.betonquest.betonquest.id.EventID; import org.betonquest.betonquest.quest.event.CallStaticEventAdapter; diff --git a/src/main/java/org/betonquest/betonquest/quest/event/run/RunIndependentEventFactory.java b/src/main/java/org/betonquest/betonquest/quest/event/run/RunIndependentEventFactory.java index 3bc542c9de..7f960170b0 100644 --- a/src/main/java/org/betonquest/betonquest/quest/event/run/RunIndependentEventFactory.java +++ b/src/main/java/org/betonquest/betonquest/quest/event/run/RunIndependentEventFactory.java @@ -1,8 +1,8 @@ package org.betonquest.betonquest.quest.event.run; +import org.betonquest.betonquest.api.quest.QuestException; import org.betonquest.betonquest.api.quest.event.StaticEvent; import org.betonquest.betonquest.api.quest.event.StaticEventFactory; -import org.betonquest.betonquest.exception.QuestException; import org.betonquest.betonquest.id.EventID; import org.betonquest.betonquest.instruction.Instruction; diff --git a/src/main/java/org/betonquest/betonquest/quest/event/scoreboard/ScoreboardObjectiveEvent.java b/src/main/java/org/betonquest/betonquest/quest/event/scoreboard/ScoreboardObjectiveEvent.java index 8c80a3a961..f5461671a3 100644 --- a/src/main/java/org/betonquest/betonquest/quest/event/scoreboard/ScoreboardObjectiveEvent.java +++ b/src/main/java/org/betonquest/betonquest/quest/event/scoreboard/ScoreboardObjectiveEvent.java @@ -1,8 +1,8 @@ package org.betonquest.betonquest.quest.event.scoreboard; import org.betonquest.betonquest.api.profile.Profile; +import org.betonquest.betonquest.api.quest.QuestException; import org.betonquest.betonquest.api.quest.event.Event; -import org.betonquest.betonquest.exception.QuestException; import org.betonquest.betonquest.instruction.variable.VariableNumber; import org.bukkit.Bukkit; import org.bukkit.scoreboard.Objective; diff --git a/src/main/java/org/betonquest/betonquest/quest/event/scoreboard/ScoreboardObjectiveEventFactory.java b/src/main/java/org/betonquest/betonquest/quest/event/scoreboard/ScoreboardObjectiveEventFactory.java index 93c970ec8b..013e367316 100644 --- a/src/main/java/org/betonquest/betonquest/quest/event/scoreboard/ScoreboardObjectiveEventFactory.java +++ b/src/main/java/org/betonquest/betonquest/quest/event/scoreboard/ScoreboardObjectiveEventFactory.java @@ -1,8 +1,8 @@ package org.betonquest.betonquest.quest.event.scoreboard; +import org.betonquest.betonquest.api.quest.QuestException; import org.betonquest.betonquest.api.quest.event.Event; import org.betonquest.betonquest.api.quest.event.EventFactory; -import org.betonquest.betonquest.exception.QuestException; import org.betonquest.betonquest.instruction.Instruction; import org.betonquest.betonquest.instruction.variable.VariableNumber; import org.betonquest.betonquest.quest.PrimaryServerThreadData; diff --git a/src/main/java/org/betonquest/betonquest/quest/event/scoreboard/ScoreboardTagEvent.java b/src/main/java/org/betonquest/betonquest/quest/event/scoreboard/ScoreboardTagEvent.java index 4c53c00c80..e98e9afe2f 100644 --- a/src/main/java/org/betonquest/betonquest/quest/event/scoreboard/ScoreboardTagEvent.java +++ b/src/main/java/org/betonquest/betonquest/quest/event/scoreboard/ScoreboardTagEvent.java @@ -1,8 +1,8 @@ package org.betonquest.betonquest.quest.event.scoreboard; import org.betonquest.betonquest.api.profile.OnlineProfile; +import org.betonquest.betonquest.api.quest.QuestException; import org.betonquest.betonquest.api.quest.event.online.OnlineEvent; -import org.betonquest.betonquest.exception.QuestException; /** * Adds or removes a scoreboard tag. diff --git a/src/main/java/org/betonquest/betonquest/quest/event/scoreboard/ScoreboardTagEventFactory.java b/src/main/java/org/betonquest/betonquest/quest/event/scoreboard/ScoreboardTagEventFactory.java index 65055ea4b9..51e65ae142 100644 --- a/src/main/java/org/betonquest/betonquest/quest/event/scoreboard/ScoreboardTagEventFactory.java +++ b/src/main/java/org/betonquest/betonquest/quest/event/scoreboard/ScoreboardTagEventFactory.java @@ -2,10 +2,10 @@ import org.betonquest.betonquest.api.logger.BetonQuestLogger; import org.betonquest.betonquest.api.logger.BetonQuestLoggerFactory; +import org.betonquest.betonquest.api.quest.QuestException; import org.betonquest.betonquest.api.quest.event.Event; import org.betonquest.betonquest.api.quest.event.EventFactory; import org.betonquest.betonquest.api.quest.event.online.OnlineEventAdapter; -import org.betonquest.betonquest.exception.QuestException; import org.betonquest.betonquest.instruction.Instruction; import org.betonquest.betonquest.quest.PrimaryServerThreadData; import org.betonquest.betonquest.quest.event.PrimaryServerThreadEvent; diff --git a/src/main/java/org/betonquest/betonquest/quest/event/setblock/SetBlockEvent.java b/src/main/java/org/betonquest/betonquest/quest/event/setblock/SetBlockEvent.java index 51fdc5d4e4..05fe66dd30 100644 --- a/src/main/java/org/betonquest/betonquest/quest/event/setblock/SetBlockEvent.java +++ b/src/main/java/org/betonquest/betonquest/quest/event/setblock/SetBlockEvent.java @@ -1,8 +1,8 @@ package org.betonquest.betonquest.quest.event.setblock; import org.betonquest.betonquest.api.profile.Profile; +import org.betonquest.betonquest.api.quest.QuestException; import org.betonquest.betonquest.api.quest.event.nullable.NullableEvent; -import org.betonquest.betonquest.exception.QuestException; import org.betonquest.betonquest.instruction.variable.location.VariableLocation; import org.betonquest.betonquest.util.BlockSelector; import org.bukkit.Location; diff --git a/src/main/java/org/betonquest/betonquest/quest/event/setblock/SetBlockEventFactory.java b/src/main/java/org/betonquest/betonquest/quest/event/setblock/SetBlockEventFactory.java index 7cefad18f7..9cd1b00c5b 100644 --- a/src/main/java/org/betonquest/betonquest/quest/event/setblock/SetBlockEventFactory.java +++ b/src/main/java/org/betonquest/betonquest/quest/event/setblock/SetBlockEventFactory.java @@ -1,11 +1,11 @@ package org.betonquest.betonquest.quest.event.setblock; +import org.betonquest.betonquest.api.quest.QuestException; import org.betonquest.betonquest.api.quest.event.Event; import org.betonquest.betonquest.api.quest.event.EventFactory; import org.betonquest.betonquest.api.quest.event.StaticEvent; import org.betonquest.betonquest.api.quest.event.StaticEventFactory; import org.betonquest.betonquest.api.quest.event.nullable.NullableEventAdapter; -import org.betonquest.betonquest.exception.QuestException; import org.betonquest.betonquest.instruction.Instruction; import org.betonquest.betonquest.instruction.variable.location.VariableLocation; import org.betonquest.betonquest.quest.PrimaryServerThreadData; diff --git a/src/main/java/org/betonquest/betonquest/quest/event/spawn/Equipment.java b/src/main/java/org/betonquest/betonquest/quest/event/spawn/Equipment.java index 8d21a1d87e..da1f40fb5e 100644 --- a/src/main/java/org/betonquest/betonquest/quest/event/spawn/Equipment.java +++ b/src/main/java/org/betonquest/betonquest/quest/event/spawn/Equipment.java @@ -2,7 +2,7 @@ import org.betonquest.betonquest.BetonQuest; import org.betonquest.betonquest.api.profile.Profile; -import org.betonquest.betonquest.exception.QuestException; +import org.betonquest.betonquest.api.quest.QuestException; import org.betonquest.betonquest.instruction.Item; import org.betonquest.betonquest.item.QuestItem; import org.bukkit.NamespacedKey; diff --git a/src/main/java/org/betonquest/betonquest/quest/event/spawn/SpawnMobEvent.java b/src/main/java/org/betonquest/betonquest/quest/event/spawn/SpawnMobEvent.java index 0d23d83066..4609b4b33c 100644 --- a/src/main/java/org/betonquest/betonquest/quest/event/spawn/SpawnMobEvent.java +++ b/src/main/java/org/betonquest/betonquest/quest/event/spawn/SpawnMobEvent.java @@ -2,8 +2,8 @@ import org.betonquest.betonquest.BetonQuest; import org.betonquest.betonquest.api.profile.Profile; +import org.betonquest.betonquest.api.quest.QuestException; import org.betonquest.betonquest.api.quest.event.nullable.NullableEvent; -import org.betonquest.betonquest.exception.QuestException; import org.betonquest.betonquest.instruction.variable.VariableNumber; import org.betonquest.betonquest.instruction.variable.VariableString; import org.betonquest.betonquest.instruction.variable.location.VariableLocation; diff --git a/src/main/java/org/betonquest/betonquest/quest/event/spawn/SpawnMobEventFactory.java b/src/main/java/org/betonquest/betonquest/quest/event/spawn/SpawnMobEventFactory.java index 040e70ac85..ae95f182be 100644 --- a/src/main/java/org/betonquest/betonquest/quest/event/spawn/SpawnMobEventFactory.java +++ b/src/main/java/org/betonquest/betonquest/quest/event/spawn/SpawnMobEventFactory.java @@ -1,11 +1,11 @@ package org.betonquest.betonquest.quest.event.spawn; +import org.betonquest.betonquest.api.quest.QuestException; import org.betonquest.betonquest.api.quest.event.Event; import org.betonquest.betonquest.api.quest.event.EventFactory; import org.betonquest.betonquest.api.quest.event.StaticEvent; import org.betonquest.betonquest.api.quest.event.StaticEventFactory; import org.betonquest.betonquest.api.quest.event.nullable.NullableEventAdapter; -import org.betonquest.betonquest.exception.QuestException; import org.betonquest.betonquest.id.ItemID; import org.betonquest.betonquest.instruction.Instruction; import org.betonquest.betonquest.instruction.Item; diff --git a/src/main/java/org/betonquest/betonquest/quest/event/stage/StageEvent.java b/src/main/java/org/betonquest/betonquest/quest/event/stage/StageEvent.java index e08acaf87b..984093db7f 100644 --- a/src/main/java/org/betonquest/betonquest/quest/event/stage/StageEvent.java +++ b/src/main/java/org/betonquest/betonquest/quest/event/stage/StageEvent.java @@ -2,8 +2,8 @@ import org.betonquest.betonquest.api.common.function.QuestConsumer; import org.betonquest.betonquest.api.profile.Profile; +import org.betonquest.betonquest.api.quest.QuestException; import org.betonquest.betonquest.api.quest.event.Event; -import org.betonquest.betonquest.exception.QuestException; /** * The StageEvent class to make changes to a player's stage. diff --git a/src/main/java/org/betonquest/betonquest/quest/event/stage/StageEventFactory.java b/src/main/java/org/betonquest/betonquest/quest/event/stage/StageEventFactory.java index f8c34b43b1..167e2012f2 100644 --- a/src/main/java/org/betonquest/betonquest/quest/event/stage/StageEventFactory.java +++ b/src/main/java/org/betonquest/betonquest/quest/event/stage/StageEventFactory.java @@ -2,9 +2,9 @@ import org.betonquest.betonquest.BetonQuest; import org.betonquest.betonquest.api.profile.Profile; +import org.betonquest.betonquest.api.quest.QuestException; import org.betonquest.betonquest.api.quest.event.Event; import org.betonquest.betonquest.api.quest.event.EventFactory; -import org.betonquest.betonquest.exception.QuestException; import org.betonquest.betonquest.id.ObjectiveID; import org.betonquest.betonquest.instruction.Instruction; import org.betonquest.betonquest.instruction.variable.VariableNumber; diff --git a/src/main/java/org/betonquest/betonquest/quest/event/tag/TagGlobalEventFactory.java b/src/main/java/org/betonquest/betonquest/quest/event/tag/TagGlobalEventFactory.java index 1bd64dd388..7b17f18051 100644 --- a/src/main/java/org/betonquest/betonquest/quest/event/tag/TagGlobalEventFactory.java +++ b/src/main/java/org/betonquest/betonquest/quest/event/tag/TagGlobalEventFactory.java @@ -1,11 +1,11 @@ package org.betonquest.betonquest.quest.event.tag; import org.betonquest.betonquest.BetonQuest; +import org.betonquest.betonquest.api.quest.QuestException; import org.betonquest.betonquest.api.quest.event.Event; import org.betonquest.betonquest.api.quest.event.EventFactory; import org.betonquest.betonquest.api.quest.event.StaticEvent; import org.betonquest.betonquest.api.quest.event.StaticEventFactory; -import org.betonquest.betonquest.exception.QuestException; import org.betonquest.betonquest.instruction.Instruction; import org.betonquest.betonquest.util.Utils; diff --git a/src/main/java/org/betonquest/betonquest/quest/event/tag/TagPlayerEventFactory.java b/src/main/java/org/betonquest/betonquest/quest/event/tag/TagPlayerEventFactory.java index 17983cf186..940765d35b 100644 --- a/src/main/java/org/betonquest/betonquest/quest/event/tag/TagPlayerEventFactory.java +++ b/src/main/java/org/betonquest/betonquest/quest/event/tag/TagPlayerEventFactory.java @@ -1,5 +1,6 @@ package org.betonquest.betonquest.quest.event.tag; +import org.betonquest.betonquest.api.quest.QuestException; import org.betonquest.betonquest.api.quest.event.Event; import org.betonquest.betonquest.api.quest.event.EventFactory; import org.betonquest.betonquest.api.quest.event.StaticEvent; @@ -7,7 +8,6 @@ import org.betonquest.betonquest.data.PlayerDataStorage; import org.betonquest.betonquest.database.Saver; import org.betonquest.betonquest.database.UpdateType; -import org.betonquest.betonquest.exception.QuestException; import org.betonquest.betonquest.instruction.Instruction; import org.betonquest.betonquest.quest.event.DatabaseSaverStaticEvent; import org.betonquest.betonquest.quest.event.DoNothingStaticEvent; diff --git a/src/main/java/org/betonquest/betonquest/quest/event/take/AbstractTakeEventFactory.java b/src/main/java/org/betonquest/betonquest/quest/event/take/AbstractTakeEventFactory.java index 33ce2149a5..0b0cb109c5 100644 --- a/src/main/java/org/betonquest/betonquest/quest/event/take/AbstractTakeEventFactory.java +++ b/src/main/java/org/betonquest/betonquest/quest/event/take/AbstractTakeEventFactory.java @@ -2,8 +2,8 @@ import org.betonquest.betonquest.api.logger.BetonQuestLogger; import org.betonquest.betonquest.api.logger.BetonQuestLoggerFactory; +import org.betonquest.betonquest.api.quest.QuestException; import org.betonquest.betonquest.api.quest.event.EventFactory; -import org.betonquest.betonquest.exception.QuestException; import org.betonquest.betonquest.instruction.Instruction; import org.betonquest.betonquest.quest.event.IngameNotificationSender; import org.betonquest.betonquest.quest.event.NoNotificationSender; diff --git a/src/main/java/org/betonquest/betonquest/quest/event/take/TakeEvent.java b/src/main/java/org/betonquest/betonquest/quest/event/take/TakeEvent.java index 682231a0b2..6ed4fd00e8 100644 --- a/src/main/java/org/betonquest/betonquest/quest/event/take/TakeEvent.java +++ b/src/main/java/org/betonquest/betonquest/quest/event/take/TakeEvent.java @@ -3,7 +3,7 @@ import org.apache.commons.lang3.tuple.Pair; import org.betonquest.betonquest.api.profile.OnlineProfile; import org.betonquest.betonquest.api.profile.Profile; -import org.betonquest.betonquest.exception.QuestException; +import org.betonquest.betonquest.api.quest.QuestException; import org.betonquest.betonquest.instruction.Item; import org.betonquest.betonquest.item.QuestItem; import org.betonquest.betonquest.quest.event.NotificationSender; diff --git a/src/main/java/org/betonquest/betonquest/quest/event/take/TakeEventFactory.java b/src/main/java/org/betonquest/betonquest/quest/event/take/TakeEventFactory.java index 1f302697e6..5c8784ebbb 100644 --- a/src/main/java/org/betonquest/betonquest/quest/event/take/TakeEventFactory.java +++ b/src/main/java/org/betonquest/betonquest/quest/event/take/TakeEventFactory.java @@ -2,9 +2,9 @@ import org.betonquest.betonquest.api.logger.BetonQuestLogger; import org.betonquest.betonquest.api.logger.BetonQuestLoggerFactory; +import org.betonquest.betonquest.api.quest.QuestException; import org.betonquest.betonquest.api.quest.event.Event; import org.betonquest.betonquest.api.quest.event.online.OnlineEventAdapter; -import org.betonquest.betonquest.exception.QuestException; import org.betonquest.betonquest.instruction.Instruction; import org.betonquest.betonquest.instruction.Item; import org.betonquest.betonquest.quest.event.NotificationSender; diff --git a/src/main/java/org/betonquest/betonquest/quest/event/teleport/TeleportEvent.java b/src/main/java/org/betonquest/betonquest/quest/event/teleport/TeleportEvent.java index 6abf0f485c..cab59dbc42 100644 --- a/src/main/java/org/betonquest/betonquest/quest/event/teleport/TeleportEvent.java +++ b/src/main/java/org/betonquest/betonquest/quest/event/teleport/TeleportEvent.java @@ -1,9 +1,9 @@ package org.betonquest.betonquest.quest.event.teleport; import org.betonquest.betonquest.api.profile.OnlineProfile; +import org.betonquest.betonquest.api.quest.QuestException; import org.betonquest.betonquest.api.quest.event.online.OnlineEvent; import org.betonquest.betonquest.conversation.Conversation; -import org.betonquest.betonquest.exception.QuestException; import org.betonquest.betonquest.instruction.variable.location.VariableLocation; import org.bukkit.Location; diff --git a/src/main/java/org/betonquest/betonquest/quest/event/teleport/TeleportEventFactory.java b/src/main/java/org/betonquest/betonquest/quest/event/teleport/TeleportEventFactory.java index 684dfb4c30..63d1e17001 100644 --- a/src/main/java/org/betonquest/betonquest/quest/event/teleport/TeleportEventFactory.java +++ b/src/main/java/org/betonquest/betonquest/quest/event/teleport/TeleportEventFactory.java @@ -1,10 +1,10 @@ package org.betonquest.betonquest.quest.event.teleport; import org.betonquest.betonquest.api.logger.BetonQuestLoggerFactory; +import org.betonquest.betonquest.api.quest.QuestException; import org.betonquest.betonquest.api.quest.event.Event; import org.betonquest.betonquest.api.quest.event.EventFactory; import org.betonquest.betonquest.api.quest.event.online.OnlineEventAdapter; -import org.betonquest.betonquest.exception.QuestException; import org.betonquest.betonquest.instruction.Instruction; import org.betonquest.betonquest.instruction.variable.location.VariableLocation; import org.betonquest.betonquest.quest.PrimaryServerThreadData; diff --git a/src/main/java/org/betonquest/betonquest/quest/event/time/TimeEvent.java b/src/main/java/org/betonquest/betonquest/quest/event/time/TimeEvent.java index 880eb1cc5e..1841e870c9 100644 --- a/src/main/java/org/betonquest/betonquest/quest/event/time/TimeEvent.java +++ b/src/main/java/org/betonquest/betonquest/quest/event/time/TimeEvent.java @@ -2,8 +2,8 @@ import org.betonquest.betonquest.api.common.function.Selector; import org.betonquest.betonquest.api.profile.Profile; +import org.betonquest.betonquest.api.quest.QuestException; import org.betonquest.betonquest.api.quest.event.nullable.NullableEvent; -import org.betonquest.betonquest.exception.QuestException; import org.betonquest.betonquest.instruction.variable.VariableNumber; import org.bukkit.World; import org.jetbrains.annotations.Nullable; diff --git a/src/main/java/org/betonquest/betonquest/quest/event/time/TimeEventFactory.java b/src/main/java/org/betonquest/betonquest/quest/event/time/TimeEventFactory.java index ab0b2f9c1e..21fc38c2fd 100644 --- a/src/main/java/org/betonquest/betonquest/quest/event/time/TimeEventFactory.java +++ b/src/main/java/org/betonquest/betonquest/quest/event/time/TimeEventFactory.java @@ -4,12 +4,12 @@ import org.betonquest.betonquest.api.common.function.Selector; import org.betonquest.betonquest.api.common.function.Selectors; import org.betonquest.betonquest.api.config.quest.QuestPackage; +import org.betonquest.betonquest.api.quest.QuestException; import org.betonquest.betonquest.api.quest.event.Event; import org.betonquest.betonquest.api.quest.event.EventFactory; import org.betonquest.betonquest.api.quest.event.StaticEvent; import org.betonquest.betonquest.api.quest.event.StaticEventFactory; import org.betonquest.betonquest.api.quest.event.nullable.NullableEventAdapter; -import org.betonquest.betonquest.exception.QuestException; import org.betonquest.betonquest.instruction.Instruction; import org.betonquest.betonquest.instruction.variable.VariableNumber; import org.betonquest.betonquest.quest.PrimaryServerThreadData; diff --git a/src/main/java/org/betonquest/betonquest/quest/event/variable/VariableEvent.java b/src/main/java/org/betonquest/betonquest/quest/event/variable/VariableEvent.java index 9d38bf5cc1..b00896ed17 100644 --- a/src/main/java/org/betonquest/betonquest/quest/event/variable/VariableEvent.java +++ b/src/main/java/org/betonquest/betonquest/quest/event/variable/VariableEvent.java @@ -3,8 +3,8 @@ import org.betonquest.betonquest.BetonQuest; import org.betonquest.betonquest.api.Objective; import org.betonquest.betonquest.api.profile.Profile; +import org.betonquest.betonquest.api.quest.QuestException; import org.betonquest.betonquest.api.quest.event.Event; -import org.betonquest.betonquest.exception.QuestException; import org.betonquest.betonquest.id.ObjectiveID; import org.betonquest.betonquest.instruction.variable.VariableString; import org.betonquest.betonquest.objective.VariableObjective; diff --git a/src/main/java/org/betonquest/betonquest/quest/event/variable/VariableEventFactory.java b/src/main/java/org/betonquest/betonquest/quest/event/variable/VariableEventFactory.java index d94bc4ad92..d843b2fe2b 100644 --- a/src/main/java/org/betonquest/betonquest/quest/event/variable/VariableEventFactory.java +++ b/src/main/java/org/betonquest/betonquest/quest/event/variable/VariableEventFactory.java @@ -1,9 +1,9 @@ package org.betonquest.betonquest.quest.event.variable; import org.betonquest.betonquest.BetonQuest; +import org.betonquest.betonquest.api.quest.QuestException; import org.betonquest.betonquest.api.quest.event.Event; import org.betonquest.betonquest.api.quest.event.EventFactory; -import org.betonquest.betonquest.exception.QuestException; import org.betonquest.betonquest.id.ObjectiveID; import org.betonquest.betonquest.instruction.Instruction; import org.betonquest.betonquest.instruction.argument.VariableArgument; diff --git a/src/main/java/org/betonquest/betonquest/quest/event/velocity/VelocityEvent.java b/src/main/java/org/betonquest/betonquest/quest/event/velocity/VelocityEvent.java index 824b559b3b..f17c579457 100644 --- a/src/main/java/org/betonquest/betonquest/quest/event/velocity/VelocityEvent.java +++ b/src/main/java/org/betonquest/betonquest/quest/event/velocity/VelocityEvent.java @@ -1,8 +1,8 @@ package org.betonquest.betonquest.quest.event.velocity; import org.betonquest.betonquest.api.profile.OnlineProfile; +import org.betonquest.betonquest.api.quest.QuestException; import org.betonquest.betonquest.api.quest.event.online.OnlineEvent; -import org.betonquest.betonquest.exception.QuestException; import org.betonquest.betonquest.instruction.variable.location.VariableVector; import org.bukkit.entity.Player; import org.bukkit.util.Vector; diff --git a/src/main/java/org/betonquest/betonquest/quest/event/velocity/VelocityEventFactory.java b/src/main/java/org/betonquest/betonquest/quest/event/velocity/VelocityEventFactory.java index 9bf003fc55..6b52302e78 100644 --- a/src/main/java/org/betonquest/betonquest/quest/event/velocity/VelocityEventFactory.java +++ b/src/main/java/org/betonquest/betonquest/quest/event/velocity/VelocityEventFactory.java @@ -2,10 +2,10 @@ import org.betonquest.betonquest.BetonQuest; import org.betonquest.betonquest.api.logger.BetonQuestLoggerFactory; +import org.betonquest.betonquest.api.quest.QuestException; import org.betonquest.betonquest.api.quest.event.Event; import org.betonquest.betonquest.api.quest.event.EventFactory; import org.betonquest.betonquest.api.quest.event.online.OnlineEventAdapter; -import org.betonquest.betonquest.exception.QuestException; import org.betonquest.betonquest.instruction.Instruction; import org.betonquest.betonquest.instruction.variable.location.VariableVector; import org.betonquest.betonquest.quest.PrimaryServerThreadData; diff --git a/src/main/java/org/betonquest/betonquest/quest/event/weather/Weather.java b/src/main/java/org/betonquest/betonquest/quest/event/weather/Weather.java index d4a99b4ae0..bb3a64bdc6 100644 --- a/src/main/java/org/betonquest/betonquest/quest/event/weather/Weather.java +++ b/src/main/java/org/betonquest/betonquest/quest/event/weather/Weather.java @@ -1,6 +1,6 @@ package org.betonquest.betonquest.quest.event.weather; -import org.betonquest.betonquest.exception.QuestException; +import org.betonquest.betonquest.api.quest.QuestException; import org.bukkit.World; import java.util.Locale; diff --git a/src/main/java/org/betonquest/betonquest/quest/event/weather/WeatherEvent.java b/src/main/java/org/betonquest/betonquest/quest/event/weather/WeatherEvent.java index 9b04b506cf..590c6caa30 100644 --- a/src/main/java/org/betonquest/betonquest/quest/event/weather/WeatherEvent.java +++ b/src/main/java/org/betonquest/betonquest/quest/event/weather/WeatherEvent.java @@ -2,8 +2,8 @@ import org.betonquest.betonquest.api.common.function.Selector; import org.betonquest.betonquest.api.profile.Profile; +import org.betonquest.betonquest.api.quest.QuestException; import org.betonquest.betonquest.api.quest.event.nullable.NullableEvent; -import org.betonquest.betonquest.exception.QuestException; import org.betonquest.betonquest.instruction.variable.VariableNumber; import org.bukkit.World; import org.jetbrains.annotations.Nullable; diff --git a/src/main/java/org/betonquest/betonquest/quest/event/weather/WeatherEventFactory.java b/src/main/java/org/betonquest/betonquest/quest/event/weather/WeatherEventFactory.java index 7cba8d93de..4ddbec803f 100644 --- a/src/main/java/org/betonquest/betonquest/quest/event/weather/WeatherEventFactory.java +++ b/src/main/java/org/betonquest/betonquest/quest/event/weather/WeatherEventFactory.java @@ -4,13 +4,13 @@ import org.betonquest.betonquest.api.common.function.Selector; import org.betonquest.betonquest.api.common.function.Selectors; import org.betonquest.betonquest.api.logger.BetonQuestLoggerFactory; +import org.betonquest.betonquest.api.quest.QuestException; import org.betonquest.betonquest.api.quest.event.Event; import org.betonquest.betonquest.api.quest.event.EventFactory; import org.betonquest.betonquest.api.quest.event.StaticEvent; import org.betonquest.betonquest.api.quest.event.StaticEventFactory; import org.betonquest.betonquest.api.quest.event.nullable.NullableEventAdapter; import org.betonquest.betonquest.api.quest.event.online.OnlineEventAdapter; -import org.betonquest.betonquest.exception.QuestException; import org.betonquest.betonquest.instruction.Instruction; import org.betonquest.betonquest.instruction.variable.VariableNumber; import org.betonquest.betonquest.quest.PrimaryServerThreadData; diff --git a/src/main/java/org/betonquest/betonquest/quest/legacy/FromClassLegacyTypeFactory.java b/src/main/java/org/betonquest/betonquest/quest/legacy/FromClassLegacyTypeFactory.java index 12da102484..2aa2cd013b 100644 --- a/src/main/java/org/betonquest/betonquest/quest/legacy/FromClassLegacyTypeFactory.java +++ b/src/main/java/org/betonquest/betonquest/quest/legacy/FromClassLegacyTypeFactory.java @@ -1,8 +1,8 @@ package org.betonquest.betonquest.quest.legacy; import org.betonquest.betonquest.api.logger.BetonQuestLogger; +import org.betonquest.betonquest.api.quest.QuestException; import org.betonquest.betonquest.api.quest.event.EventFactory; -import org.betonquest.betonquest.exception.QuestException; import org.betonquest.betonquest.instruction.Instruction; import java.lang.reflect.InvocationTargetException; diff --git a/src/main/java/org/betonquest/betonquest/quest/legacy/LegacyConditionAdapter.java b/src/main/java/org/betonquest/betonquest/quest/legacy/LegacyConditionAdapter.java index f745462a3a..7b6cec15db 100644 --- a/src/main/java/org/betonquest/betonquest/quest/legacy/LegacyConditionAdapter.java +++ b/src/main/java/org/betonquest/betonquest/quest/legacy/LegacyConditionAdapter.java @@ -1,10 +1,10 @@ package org.betonquest.betonquest.quest.legacy; import org.betonquest.betonquest.api.profile.Profile; +import org.betonquest.betonquest.api.quest.QuestException; import org.betonquest.betonquest.api.quest.condition.PlayerCondition; import org.betonquest.betonquest.api.quest.condition.PlayerlessCondition; import org.betonquest.betonquest.api.quest.event.Event; -import org.betonquest.betonquest.exception.QuestException; import org.betonquest.betonquest.instruction.Instruction; import org.jetbrains.annotations.Nullable; diff --git a/src/main/java/org/betonquest/betonquest/quest/legacy/LegacyFactoryAdapter.java b/src/main/java/org/betonquest/betonquest/quest/legacy/LegacyFactoryAdapter.java index 4d3cd69f7b..da606c2954 100644 --- a/src/main/java/org/betonquest/betonquest/quest/legacy/LegacyFactoryAdapter.java +++ b/src/main/java/org/betonquest/betonquest/quest/legacy/LegacyFactoryAdapter.java @@ -2,7 +2,7 @@ import org.betonquest.betonquest.api.quest.PlayerQuestFactory; import org.betonquest.betonquest.api.quest.PlayerlessQuestFactory; -import org.betonquest.betonquest.exception.QuestException; +import org.betonquest.betonquest.api.quest.QuestException; import org.betonquest.betonquest.instruction.Instruction; import org.jetbrains.annotations.Nullable; diff --git a/src/main/java/org/betonquest/betonquest/quest/legacy/LegacyTypeFactory.java b/src/main/java/org/betonquest/betonquest/quest/legacy/LegacyTypeFactory.java index 1c8b727046..46f3b5b3f8 100644 --- a/src/main/java/org/betonquest/betonquest/quest/legacy/LegacyTypeFactory.java +++ b/src/main/java/org/betonquest/betonquest/quest/legacy/LegacyTypeFactory.java @@ -1,6 +1,6 @@ package org.betonquest.betonquest.quest.legacy; -import org.betonquest.betonquest.exception.QuestException; +import org.betonquest.betonquest.api.quest.QuestException; import org.betonquest.betonquest.instruction.Instruction; /** diff --git a/src/main/java/org/betonquest/betonquest/quest/legacy/LegacyVariableAdapter.java b/src/main/java/org/betonquest/betonquest/quest/legacy/LegacyVariableAdapter.java index 7d1943989d..d43f217725 100644 --- a/src/main/java/org/betonquest/betonquest/quest/legacy/LegacyVariableAdapter.java +++ b/src/main/java/org/betonquest/betonquest/quest/legacy/LegacyVariableAdapter.java @@ -2,9 +2,9 @@ import org.betonquest.betonquest.api.logger.BetonQuestLogger; import org.betonquest.betonquest.api.profile.Profile; +import org.betonquest.betonquest.api.quest.QuestException; import org.betonquest.betonquest.api.quest.variable.PlayerVariable; import org.betonquest.betonquest.api.quest.variable.PlayerlessVariable; -import org.betonquest.betonquest.exception.QuestException; import org.betonquest.betonquest.instruction.Instruction; import org.jetbrains.annotations.Nullable; diff --git a/src/main/java/org/betonquest/betonquest/quest/legacy/QuestEventAdapter.java b/src/main/java/org/betonquest/betonquest/quest/legacy/QuestEventAdapter.java index ea66bf31bb..600ac18ed4 100644 --- a/src/main/java/org/betonquest/betonquest/quest/legacy/QuestEventAdapter.java +++ b/src/main/java/org/betonquest/betonquest/quest/legacy/QuestEventAdapter.java @@ -2,9 +2,9 @@ import org.betonquest.betonquest.api.QuestEvent; import org.betonquest.betonquest.api.profile.Profile; +import org.betonquest.betonquest.api.quest.QuestException; import org.betonquest.betonquest.api.quest.event.Event; import org.betonquest.betonquest.api.quest.event.StaticEvent; -import org.betonquest.betonquest.exception.QuestException; import org.betonquest.betonquest.instruction.Instruction; import org.jetbrains.annotations.Nullable; diff --git a/src/main/java/org/betonquest/betonquest/quest/legacy/QuestEventFactoryAdapter.java b/src/main/java/org/betonquest/betonquest/quest/legacy/QuestEventFactoryAdapter.java index 3529446525..58efc7e16e 100644 --- a/src/main/java/org/betonquest/betonquest/quest/legacy/QuestEventFactoryAdapter.java +++ b/src/main/java/org/betonquest/betonquest/quest/legacy/QuestEventFactoryAdapter.java @@ -3,11 +3,11 @@ import org.betonquest.betonquest.api.QuestEvent; import org.betonquest.betonquest.api.quest.PlayerQuestFactory; import org.betonquest.betonquest.api.quest.PlayerlessQuestFactory; +import org.betonquest.betonquest.api.quest.QuestException; import org.betonquest.betonquest.api.quest.event.Event; import org.betonquest.betonquest.api.quest.event.EventFactory; import org.betonquest.betonquest.api.quest.event.StaticEvent; import org.betonquest.betonquest.api.quest.event.StaticEventFactory; -import org.betonquest.betonquest.exception.QuestException; import org.betonquest.betonquest.instruction.Instruction; import org.jetbrains.annotations.Nullable; diff --git a/src/main/java/org/betonquest/betonquest/quest/registry/processor/CancellerProcessor.java b/src/main/java/org/betonquest/betonquest/quest/registry/processor/CancellerProcessor.java index adbf534fd0..a4374a43ab 100644 --- a/src/main/java/org/betonquest/betonquest/quest/registry/processor/CancellerProcessor.java +++ b/src/main/java/org/betonquest/betonquest/quest/registry/processor/CancellerProcessor.java @@ -2,9 +2,9 @@ import org.betonquest.betonquest.api.config.quest.QuestPackage; import org.betonquest.betonquest.api.logger.BetonQuestLogger; +import org.betonquest.betonquest.api.quest.QuestException; import org.betonquest.betonquest.config.QuestCanceler; import org.betonquest.betonquest.exception.ObjectNotFoundException; -import org.betonquest.betonquest.exception.QuestException; import org.betonquest.betonquest.id.QuestCancelerID; import org.bukkit.configuration.ConfigurationSection; diff --git a/src/main/java/org/betonquest/betonquest/quest/registry/processor/ConditionProcessor.java b/src/main/java/org/betonquest/betonquest/quest/registry/processor/ConditionProcessor.java index f0c5b329aa..1907163d64 100644 --- a/src/main/java/org/betonquest/betonquest/quest/registry/processor/ConditionProcessor.java +++ b/src/main/java/org/betonquest/betonquest/quest/registry/processor/ConditionProcessor.java @@ -5,8 +5,8 @@ import org.betonquest.betonquest.api.config.quest.QuestPackage; import org.betonquest.betonquest.api.logger.BetonQuestLogger; import org.betonquest.betonquest.api.profile.Profile; +import org.betonquest.betonquest.api.quest.QuestException; import org.betonquest.betonquest.exception.ObjectNotFoundException; -import org.betonquest.betonquest.exception.QuestException; import org.betonquest.betonquest.id.ConditionID; import org.betonquest.betonquest.quest.registry.type.ConditionTypeRegistry; import org.bukkit.Bukkit; diff --git a/src/main/java/org/betonquest/betonquest/quest/registry/processor/ConversationProcessor.java b/src/main/java/org/betonquest/betonquest/quest/registry/processor/ConversationProcessor.java index 149e963673..2da8da5a11 100644 --- a/src/main/java/org/betonquest/betonquest/quest/registry/processor/ConversationProcessor.java +++ b/src/main/java/org/betonquest/betonquest/quest/registry/processor/ConversationProcessor.java @@ -3,9 +3,9 @@ import org.betonquest.betonquest.BetonQuest; import org.betonquest.betonquest.api.config.quest.QuestPackage; import org.betonquest.betonquest.api.logger.BetonQuestLogger; +import org.betonquest.betonquest.api.quest.QuestException; import org.betonquest.betonquest.conversation.ConversationData; import org.betonquest.betonquest.exception.ObjectNotFoundException; -import org.betonquest.betonquest.exception.QuestException; import org.betonquest.betonquest.id.ConversationID; import org.bukkit.configuration.ConfigurationSection; import org.jetbrains.annotations.Nullable; diff --git a/src/main/java/org/betonquest/betonquest/quest/registry/processor/EventProcessor.java b/src/main/java/org/betonquest/betonquest/quest/registry/processor/EventProcessor.java index 8f210449dc..d3a299715e 100644 --- a/src/main/java/org/betonquest/betonquest/quest/registry/processor/EventProcessor.java +++ b/src/main/java/org/betonquest/betonquest/quest/registry/processor/EventProcessor.java @@ -4,8 +4,8 @@ import org.betonquest.betonquest.api.config.quest.QuestPackage; import org.betonquest.betonquest.api.logger.BetonQuestLogger; import org.betonquest.betonquest.api.profile.Profile; +import org.betonquest.betonquest.api.quest.QuestException; import org.betonquest.betonquest.exception.ObjectNotFoundException; -import org.betonquest.betonquest.exception.QuestException; import org.betonquest.betonquest.id.EventID; import org.betonquest.betonquest.quest.registry.type.EventTypeRegistry; import org.jetbrains.annotations.Nullable; diff --git a/src/main/java/org/betonquest/betonquest/quest/registry/processor/ObjectiveProcessor.java b/src/main/java/org/betonquest/betonquest/quest/registry/processor/ObjectiveProcessor.java index c04b8914d5..949bd9d49c 100644 --- a/src/main/java/org/betonquest/betonquest/quest/registry/processor/ObjectiveProcessor.java +++ b/src/main/java/org/betonquest/betonquest/quest/registry/processor/ObjectiveProcessor.java @@ -4,9 +4,9 @@ import org.betonquest.betonquest.api.config.quest.QuestPackage; import org.betonquest.betonquest.api.logger.BetonQuestLogger; import org.betonquest.betonquest.api.profile.Profile; +import org.betonquest.betonquest.api.quest.QuestException; import org.betonquest.betonquest.bstats.CompositeInstructionMetricsSupplier; import org.betonquest.betonquest.exception.ObjectNotFoundException; -import org.betonquest.betonquest.exception.QuestException; import org.betonquest.betonquest.id.ObjectiveID; import org.betonquest.betonquest.instruction.Instruction; import org.bukkit.configuration.ConfigurationSection; diff --git a/src/main/java/org/betonquest/betonquest/quest/registry/processor/TypedQuestProcessor.java b/src/main/java/org/betonquest/betonquest/quest/registry/processor/TypedQuestProcessor.java index dea8d4b739..df69abbbbf 100644 --- a/src/main/java/org/betonquest/betonquest/quest/registry/processor/TypedQuestProcessor.java +++ b/src/main/java/org/betonquest/betonquest/quest/registry/processor/TypedQuestProcessor.java @@ -2,9 +2,9 @@ import org.betonquest.betonquest.api.config.quest.QuestPackage; import org.betonquest.betonquest.api.logger.BetonQuestLogger; +import org.betonquest.betonquest.api.quest.QuestException; import org.betonquest.betonquest.bstats.CompositeInstructionMetricsSupplier; import org.betonquest.betonquest.exception.ObjectNotFoundException; -import org.betonquest.betonquest.exception.QuestException; import org.betonquest.betonquest.id.ID; import org.betonquest.betonquest.quest.legacy.LegacyTypeFactory; import org.betonquest.betonquest.quest.registry.type.QuestTypeRegistry; diff --git a/src/main/java/org/betonquest/betonquest/quest/registry/processor/VariableProcessor.java b/src/main/java/org/betonquest/betonquest/quest/registry/processor/VariableProcessor.java index ca4a1e6c2a..25a9de1dab 100644 --- a/src/main/java/org/betonquest/betonquest/quest/registry/processor/VariableProcessor.java +++ b/src/main/java/org/betonquest/betonquest/quest/registry/processor/VariableProcessor.java @@ -5,9 +5,9 @@ import org.betonquest.betonquest.api.logger.BetonQuestLogger; import org.betonquest.betonquest.api.logger.BetonQuestLoggerFactory; import org.betonquest.betonquest.api.profile.Profile; +import org.betonquest.betonquest.api.quest.QuestException; import org.betonquest.betonquest.config.Config; import org.betonquest.betonquest.exception.ObjectNotFoundException; -import org.betonquest.betonquest.exception.QuestException; import org.betonquest.betonquest.id.VariableID; import org.betonquest.betonquest.instruction.Instruction; import org.betonquest.betonquest.quest.legacy.LegacyTypeFactory; diff --git a/src/main/java/org/betonquest/betonquest/quest/variable/condition/ConditionVariableFactory.java b/src/main/java/org/betonquest/betonquest/quest/variable/condition/ConditionVariableFactory.java index 1c3c238270..c262be0f53 100644 --- a/src/main/java/org/betonquest/betonquest/quest/variable/condition/ConditionVariableFactory.java +++ b/src/main/java/org/betonquest/betonquest/quest/variable/condition/ConditionVariableFactory.java @@ -1,9 +1,9 @@ package org.betonquest.betonquest.quest.variable.condition; +import org.betonquest.betonquest.api.quest.QuestException; import org.betonquest.betonquest.api.quest.variable.PlayerVariable; import org.betonquest.betonquest.api.quest.variable.PlayerVariableFactory; import org.betonquest.betonquest.data.PlayerDataStorage; -import org.betonquest.betonquest.exception.QuestException; import org.betonquest.betonquest.id.ConditionID; import org.betonquest.betonquest.instruction.Instruction; diff --git a/src/main/java/org/betonquest/betonquest/quest/variable/eval/EvalVariable.java b/src/main/java/org/betonquest/betonquest/quest/variable/eval/EvalVariable.java index 5a2f42b52a..3046daf8b3 100644 --- a/src/main/java/org/betonquest/betonquest/quest/variable/eval/EvalVariable.java +++ b/src/main/java/org/betonquest/betonquest/quest/variable/eval/EvalVariable.java @@ -2,8 +2,8 @@ import org.betonquest.betonquest.api.config.quest.QuestPackage; import org.betonquest.betonquest.api.profile.Profile; +import org.betonquest.betonquest.api.quest.QuestException; import org.betonquest.betonquest.api.quest.variable.nullable.NullableVariable; -import org.betonquest.betonquest.exception.QuestException; import org.betonquest.betonquest.instruction.variable.VariableString; import org.betonquest.betonquest.quest.registry.processor.VariableProcessor; import org.jetbrains.annotations.Nullable; diff --git a/src/main/java/org/betonquest/betonquest/quest/variable/eval/EvalVariableFactory.java b/src/main/java/org/betonquest/betonquest/quest/variable/eval/EvalVariableFactory.java index b9fe025582..c370a4b677 100644 --- a/src/main/java/org/betonquest/betonquest/quest/variable/eval/EvalVariableFactory.java +++ b/src/main/java/org/betonquest/betonquest/quest/variable/eval/EvalVariableFactory.java @@ -1,12 +1,12 @@ package org.betonquest.betonquest.quest.variable.eval; import org.betonquest.betonquest.api.config.quest.QuestPackage; +import org.betonquest.betonquest.api.quest.QuestException; import org.betonquest.betonquest.api.quest.variable.PlayerVariable; import org.betonquest.betonquest.api.quest.variable.PlayerVariableFactory; import org.betonquest.betonquest.api.quest.variable.PlayerlessVariable; import org.betonquest.betonquest.api.quest.variable.PlayerlessVariableFactory; import org.betonquest.betonquest.api.quest.variable.nullable.NullableVariableAdapter; -import org.betonquest.betonquest.exception.QuestException; import org.betonquest.betonquest.instruction.Instruction; import org.betonquest.betonquest.instruction.variable.VariableString; import org.betonquest.betonquest.quest.registry.processor.VariableProcessor; diff --git a/src/main/java/org/betonquest/betonquest/quest/variable/item/ItemDurabilityVariable.java b/src/main/java/org/betonquest/betonquest/quest/variable/item/ItemDurabilityVariable.java index 51aa800206..2b0c6c0471 100644 --- a/src/main/java/org/betonquest/betonquest/quest/variable/item/ItemDurabilityVariable.java +++ b/src/main/java/org/betonquest/betonquest/quest/variable/item/ItemDurabilityVariable.java @@ -1,8 +1,8 @@ package org.betonquest.betonquest.quest.variable.item; import org.betonquest.betonquest.api.profile.OnlineProfile; +import org.betonquest.betonquest.api.quest.QuestException; import org.betonquest.betonquest.api.quest.variable.online.OnlineVariable; -import org.betonquest.betonquest.exception.QuestException; import org.bukkit.inventory.EquipmentSlot; import org.bukkit.inventory.ItemStack; import org.bukkit.inventory.meta.Damageable; diff --git a/src/main/java/org/betonquest/betonquest/quest/variable/item/ItemDurabilityVariableFactory.java b/src/main/java/org/betonquest/betonquest/quest/variable/item/ItemDurabilityVariableFactory.java index 993a24202b..4133dd652d 100644 --- a/src/main/java/org/betonquest/betonquest/quest/variable/item/ItemDurabilityVariableFactory.java +++ b/src/main/java/org/betonquest/betonquest/quest/variable/item/ItemDurabilityVariableFactory.java @@ -1,9 +1,9 @@ package org.betonquest.betonquest.quest.variable.item; +import org.betonquest.betonquest.api.quest.QuestException; import org.betonquest.betonquest.api.quest.variable.PlayerVariable; import org.betonquest.betonquest.api.quest.variable.PlayerVariableFactory; import org.betonquest.betonquest.api.quest.variable.online.OnlineVariableAdapter; -import org.betonquest.betonquest.exception.QuestException; import org.betonquest.betonquest.instruction.Instruction; import org.bukkit.inventory.EquipmentSlot; diff --git a/src/main/java/org/betonquest/betonquest/quest/variable/item/ItemVariable.java b/src/main/java/org/betonquest/betonquest/quest/variable/item/ItemVariable.java index ecd3bc37c4..dea90352be 100644 --- a/src/main/java/org/betonquest/betonquest/quest/variable/item/ItemVariable.java +++ b/src/main/java/org/betonquest/betonquest/quest/variable/item/ItemVariable.java @@ -3,8 +3,8 @@ import org.betonquest.betonquest.BetonQuest; import org.betonquest.betonquest.api.profile.OnlineProfile; import org.betonquest.betonquest.api.profile.Profile; +import org.betonquest.betonquest.api.quest.QuestException; import org.betonquest.betonquest.api.quest.variable.nullable.NullableVariable; -import org.betonquest.betonquest.exception.QuestException; import org.betonquest.betonquest.item.QuestItem; import org.bukkit.ChatColor; import org.bukkit.entity.Player; diff --git a/src/main/java/org/betonquest/betonquest/quest/variable/item/ItemVariableFactory.java b/src/main/java/org/betonquest/betonquest/quest/variable/item/ItemVariableFactory.java index 8e0f6eb5b7..b63bdf0aac 100644 --- a/src/main/java/org/betonquest/betonquest/quest/variable/item/ItemVariableFactory.java +++ b/src/main/java/org/betonquest/betonquest/quest/variable/item/ItemVariableFactory.java @@ -1,12 +1,12 @@ package org.betonquest.betonquest.quest.variable.item; import org.apache.commons.lang3.tuple.Pair; +import org.betonquest.betonquest.api.quest.QuestException; import org.betonquest.betonquest.api.quest.variable.PlayerVariable; import org.betonquest.betonquest.api.quest.variable.PlayerVariableFactory; import org.betonquest.betonquest.api.quest.variable.PlayerlessVariable; import org.betonquest.betonquest.api.quest.variable.PlayerlessVariableFactory; import org.betonquest.betonquest.api.quest.variable.nullable.NullableVariableAdapter; -import org.betonquest.betonquest.exception.QuestException; import org.betonquest.betonquest.instruction.Instruction; import org.betonquest.betonquest.item.QuestItem; diff --git a/src/main/java/org/betonquest/betonquest/quest/variable/location/LocationFormationMode.java b/src/main/java/org/betonquest/betonquest/quest/variable/location/LocationFormationMode.java index af5b0b2de3..4760c70914 100644 --- a/src/main/java/org/betonquest/betonquest/quest/variable/location/LocationFormationMode.java +++ b/src/main/java/org/betonquest/betonquest/quest/variable/location/LocationFormationMode.java @@ -1,6 +1,6 @@ package org.betonquest.betonquest.quest.variable.location; -import org.betonquest.betonquest.exception.QuestException; +import org.betonquest.betonquest.api.quest.QuestException; import org.bukkit.Location; import java.math.RoundingMode; diff --git a/src/main/java/org/betonquest/betonquest/quest/variable/location/LocationVariable.java b/src/main/java/org/betonquest/betonquest/quest/variable/location/LocationVariable.java index 0254c24ed6..b41ad6c8c0 100644 --- a/src/main/java/org/betonquest/betonquest/quest/variable/location/LocationVariable.java +++ b/src/main/java/org/betonquest/betonquest/quest/variable/location/LocationVariable.java @@ -1,8 +1,8 @@ package org.betonquest.betonquest.quest.variable.location; import org.betonquest.betonquest.api.profile.OnlineProfile; +import org.betonquest.betonquest.api.quest.QuestException; import org.betonquest.betonquest.api.quest.variable.online.OnlineVariable; -import org.betonquest.betonquest.exception.QuestException; /** * Provides information about a Player's Location. diff --git a/src/main/java/org/betonquest/betonquest/quest/variable/location/LocationVariableFactory.java b/src/main/java/org/betonquest/betonquest/quest/variable/location/LocationVariableFactory.java index 06f0253c70..8454e3e96e 100644 --- a/src/main/java/org/betonquest/betonquest/quest/variable/location/LocationVariableFactory.java +++ b/src/main/java/org/betonquest/betonquest/quest/variable/location/LocationVariableFactory.java @@ -1,9 +1,9 @@ package org.betonquest.betonquest.quest.variable.location; +import org.betonquest.betonquest.api.quest.QuestException; import org.betonquest.betonquest.api.quest.variable.PlayerVariable; import org.betonquest.betonquest.api.quest.variable.PlayerVariableFactory; import org.betonquest.betonquest.api.quest.variable.online.OnlineVariableAdapter; -import org.betonquest.betonquest.exception.QuestException; import org.betonquest.betonquest.instruction.Instruction; /** diff --git a/src/main/java/org/betonquest/betonquest/quest/variable/name/PlayerNameType.java b/src/main/java/org/betonquest/betonquest/quest/variable/name/PlayerNameType.java index 74bbb95b58..86425a7844 100644 --- a/src/main/java/org/betonquest/betonquest/quest/variable/name/PlayerNameType.java +++ b/src/main/java/org/betonquest/betonquest/quest/variable/name/PlayerNameType.java @@ -2,7 +2,7 @@ import org.betonquest.betonquest.api.common.function.QuestFunction; import org.betonquest.betonquest.api.profile.Profile; -import org.betonquest.betonquest.exception.QuestException; +import org.betonquest.betonquest.api.quest.QuestException; /** * The type of the {@link PlayerNameVariable}. diff --git a/src/main/java/org/betonquest/betonquest/quest/variable/name/PlayerNameVariable.java b/src/main/java/org/betonquest/betonquest/quest/variable/name/PlayerNameVariable.java index 10dacb20c6..a609362b41 100644 --- a/src/main/java/org/betonquest/betonquest/quest/variable/name/PlayerNameVariable.java +++ b/src/main/java/org/betonquest/betonquest/quest/variable/name/PlayerNameVariable.java @@ -1,8 +1,8 @@ package org.betonquest.betonquest.quest.variable.name; import org.betonquest.betonquest.api.profile.Profile; +import org.betonquest.betonquest.api.quest.QuestException; import org.betonquest.betonquest.api.quest.variable.PlayerVariable; -import org.betonquest.betonquest.exception.QuestException; /** * This variable resolves into the player's name. It can have optional "display" diff --git a/src/main/java/org/betonquest/betonquest/quest/variable/name/PlayerNameVariableFactory.java b/src/main/java/org/betonquest/betonquest/quest/variable/name/PlayerNameVariableFactory.java index 89a4411ffa..180fc8db82 100644 --- a/src/main/java/org/betonquest/betonquest/quest/variable/name/PlayerNameVariableFactory.java +++ b/src/main/java/org/betonquest/betonquest/quest/variable/name/PlayerNameVariableFactory.java @@ -1,8 +1,8 @@ package org.betonquest.betonquest.quest.variable.name; +import org.betonquest.betonquest.api.quest.QuestException; import org.betonquest.betonquest.api.quest.variable.PlayerVariable; import org.betonquest.betonquest.api.quest.variable.PlayerVariableFactory; -import org.betonquest.betonquest.exception.QuestException; import org.betonquest.betonquest.instruction.Instruction; /** diff --git a/src/main/java/org/betonquest/betonquest/quest/variable/point/AbstractPointVariableFactory.java b/src/main/java/org/betonquest/betonquest/quest/variable/point/AbstractPointVariableFactory.java index 8c6469e677..a8e7b9675a 100644 --- a/src/main/java/org/betonquest/betonquest/quest/variable/point/AbstractPointVariableFactory.java +++ b/src/main/java/org/betonquest/betonquest/quest/variable/point/AbstractPointVariableFactory.java @@ -2,8 +2,8 @@ import org.apache.commons.lang3.tuple.Triple; import org.betonquest.betonquest.api.logger.BetonQuestLogger; +import org.betonquest.betonquest.api.quest.QuestException; import org.betonquest.betonquest.exception.ObjectNotFoundException; -import org.betonquest.betonquest.exception.QuestException; import org.betonquest.betonquest.id.ID; import org.betonquest.betonquest.instruction.Instruction; diff --git a/src/main/java/org/betonquest/betonquest/quest/variable/point/GlobalPointVariableFactory.java b/src/main/java/org/betonquest/betonquest/quest/variable/point/GlobalPointVariableFactory.java index f47f1714f8..9dcd597615 100644 --- a/src/main/java/org/betonquest/betonquest/quest/variable/point/GlobalPointVariableFactory.java +++ b/src/main/java/org/betonquest/betonquest/quest/variable/point/GlobalPointVariableFactory.java @@ -2,10 +2,10 @@ import org.apache.commons.lang3.tuple.Triple; import org.betonquest.betonquest.api.logger.BetonQuestLogger; +import org.betonquest.betonquest.api.quest.QuestException; import org.betonquest.betonquest.api.quest.variable.PlayerlessVariable; import org.betonquest.betonquest.api.quest.variable.PlayerlessVariableFactory; import org.betonquest.betonquest.database.GlobalData; -import org.betonquest.betonquest.exception.QuestException; import org.betonquest.betonquest.instruction.Instruction; /** diff --git a/src/main/java/org/betonquest/betonquest/quest/variable/point/PointVariableFactory.java b/src/main/java/org/betonquest/betonquest/quest/variable/point/PointVariableFactory.java index af5aa6106f..39c009e776 100644 --- a/src/main/java/org/betonquest/betonquest/quest/variable/point/PointVariableFactory.java +++ b/src/main/java/org/betonquest/betonquest/quest/variable/point/PointVariableFactory.java @@ -2,10 +2,10 @@ import org.apache.commons.lang3.tuple.Triple; import org.betonquest.betonquest.api.logger.BetonQuestLogger; +import org.betonquest.betonquest.api.quest.QuestException; import org.betonquest.betonquest.api.quest.variable.PlayerVariable; import org.betonquest.betonquest.api.quest.variable.PlayerVariableFactory; import org.betonquest.betonquest.data.PlayerDataStorage; -import org.betonquest.betonquest.exception.QuestException; import org.betonquest.betonquest.instruction.Instruction; /** diff --git a/src/main/java/org/betonquest/betonquest/quest/variable/tag/GlobalTagVariable.java b/src/main/java/org/betonquest/betonquest/quest/variable/tag/GlobalTagVariable.java index 852c6cd0b2..21348887d0 100644 --- a/src/main/java/org/betonquest/betonquest/quest/variable/tag/GlobalTagVariable.java +++ b/src/main/java/org/betonquest/betonquest/quest/variable/tag/GlobalTagVariable.java @@ -1,9 +1,9 @@ package org.betonquest.betonquest.quest.variable.tag; import org.betonquest.betonquest.api.config.quest.QuestPackage; +import org.betonquest.betonquest.api.quest.QuestException; import org.betonquest.betonquest.api.quest.variable.PlayerlessVariable; import org.betonquest.betonquest.database.GlobalData; -import org.betonquest.betonquest.exception.QuestException; /** * Exposes the presence of global tags as a variable. diff --git a/src/main/java/org/betonquest/betonquest/quest/variable/tag/GlobalTagVariableFactory.java b/src/main/java/org/betonquest/betonquest/quest/variable/tag/GlobalTagVariableFactory.java index 1a80beafe5..cb211c7af6 100644 --- a/src/main/java/org/betonquest/betonquest/quest/variable/tag/GlobalTagVariableFactory.java +++ b/src/main/java/org/betonquest/betonquest/quest/variable/tag/GlobalTagVariableFactory.java @@ -1,9 +1,9 @@ package org.betonquest.betonquest.quest.variable.tag; +import org.betonquest.betonquest.api.quest.QuestException; import org.betonquest.betonquest.api.quest.variable.PlayerlessVariable; import org.betonquest.betonquest.api.quest.variable.PlayerlessVariableFactory; import org.betonquest.betonquest.database.GlobalData; -import org.betonquest.betonquest.exception.QuestException; import org.betonquest.betonquest.instruction.Instruction; /** diff --git a/src/main/java/org/betonquest/betonquest/quest/variable/tag/TagVariable.java b/src/main/java/org/betonquest/betonquest/quest/variable/tag/TagVariable.java index e82499490d..847f4565f2 100644 --- a/src/main/java/org/betonquest/betonquest/quest/variable/tag/TagVariable.java +++ b/src/main/java/org/betonquest/betonquest/quest/variable/tag/TagVariable.java @@ -2,9 +2,9 @@ import org.betonquest.betonquest.api.config.quest.QuestPackage; import org.betonquest.betonquest.api.profile.Profile; +import org.betonquest.betonquest.api.quest.QuestException; import org.betonquest.betonquest.api.quest.variable.PlayerVariable; import org.betonquest.betonquest.data.PlayerDataStorage; -import org.betonquest.betonquest.exception.QuestException; /** * Exposes the presence of tags as a variable. diff --git a/src/main/java/org/betonquest/betonquest/quest/variable/tag/TagVariableFactory.java b/src/main/java/org/betonquest/betonquest/quest/variable/tag/TagVariableFactory.java index e9e901298f..d42f062820 100644 --- a/src/main/java/org/betonquest/betonquest/quest/variable/tag/TagVariableFactory.java +++ b/src/main/java/org/betonquest/betonquest/quest/variable/tag/TagVariableFactory.java @@ -1,9 +1,9 @@ package org.betonquest.betonquest.quest.variable.tag; +import org.betonquest.betonquest.api.quest.QuestException; import org.betonquest.betonquest.api.quest.variable.PlayerVariable; import org.betonquest.betonquest.api.quest.variable.PlayerVariableFactory; import org.betonquest.betonquest.data.PlayerDataStorage; -import org.betonquest.betonquest.exception.QuestException; import org.betonquest.betonquest.instruction.Instruction; /** diff --git a/src/main/java/org/betonquest/betonquest/schedule/EventScheduling.java b/src/main/java/org/betonquest/betonquest/schedule/EventScheduling.java index 77dc84fa34..5cad705e7a 100644 --- a/src/main/java/org/betonquest/betonquest/schedule/EventScheduling.java +++ b/src/main/java/org/betonquest/betonquest/schedule/EventScheduling.java @@ -3,10 +3,10 @@ import org.betonquest.betonquest.api.bukkit.config.custom.unmodifiable.UnmodifiableConfigurationSection; import org.betonquest.betonquest.api.config.quest.QuestPackage; import org.betonquest.betonquest.api.logger.BetonQuestLogger; +import org.betonquest.betonquest.api.quest.QuestException; import org.betonquest.betonquest.api.schedule.Schedule; import org.betonquest.betonquest.api.schedule.Scheduler; import org.betonquest.betonquest.exception.ObjectNotFoundException; -import org.betonquest.betonquest.exception.QuestException; import org.bukkit.configuration.ConfigurationSection; import java.lang.reflect.InvocationTargetException; diff --git a/src/main/java/org/betonquest/betonquest/schedule/impl/realtime/cron/RealtimeCronSchedule.java b/src/main/java/org/betonquest/betonquest/schedule/impl/realtime/cron/RealtimeCronSchedule.java index 76bf4e1c40..4149fac7be 100644 --- a/src/main/java/org/betonquest/betonquest/schedule/impl/realtime/cron/RealtimeCronSchedule.java +++ b/src/main/java/org/betonquest/betonquest/schedule/impl/realtime/cron/RealtimeCronSchedule.java @@ -1,7 +1,7 @@ package org.betonquest.betonquest.schedule.impl.realtime.cron; +import org.betonquest.betonquest.api.quest.QuestException; import org.betonquest.betonquest.api.schedule.CronSchedule; -import org.betonquest.betonquest.exception.QuestException; import org.betonquest.betonquest.schedule.ScheduleID; import org.bukkit.configuration.ConfigurationSection; diff --git a/src/main/java/org/betonquest/betonquest/schedule/impl/realtime/daily/RealtimeDailySchedule.java b/src/main/java/org/betonquest/betonquest/schedule/impl/realtime/daily/RealtimeDailySchedule.java index 5aa323b513..b21031a25a 100644 --- a/src/main/java/org/betonquest/betonquest/schedule/impl/realtime/daily/RealtimeDailySchedule.java +++ b/src/main/java/org/betonquest/betonquest/schedule/impl/realtime/daily/RealtimeDailySchedule.java @@ -1,7 +1,7 @@ package org.betonquest.betonquest.schedule.impl.realtime.daily; +import org.betonquest.betonquest.api.quest.QuestException; import org.betonquest.betonquest.api.schedule.Schedule; -import org.betonquest.betonquest.exception.QuestException; import org.betonquest.betonquest.schedule.ScheduleID; import org.bukkit.configuration.ConfigurationSection; diff --git a/src/main/java/org/betonquest/betonquest/util/BlockSelector.java b/src/main/java/org/betonquest/betonquest/util/BlockSelector.java index d059888874..2319bd73cc 100644 --- a/src/main/java/org/betonquest/betonquest/util/BlockSelector.java +++ b/src/main/java/org/betonquest/betonquest/util/BlockSelector.java @@ -2,7 +2,7 @@ import org.betonquest.betonquest.BetonQuest; import org.betonquest.betonquest.api.logger.BetonQuestLogger; -import org.betonquest.betonquest.exception.QuestException; +import org.betonquest.betonquest.api.quest.QuestException; import org.bukkit.Bukkit; import org.bukkit.Material; import org.bukkit.NamespacedKey; diff --git a/src/main/java/org/betonquest/betonquest/util/Utils.java b/src/main/java/org/betonquest/betonquest/util/Utils.java index 479c4794a4..cc40705088 100644 --- a/src/main/java/org/betonquest/betonquest/util/Utils.java +++ b/src/main/java/org/betonquest/betonquest/util/Utils.java @@ -7,10 +7,10 @@ import org.betonquest.betonquest.api.config.quest.QuestPackage; import org.betonquest.betonquest.api.logger.BetonQuestLogger; import org.betonquest.betonquest.api.profile.OnlineProfile; +import org.betonquest.betonquest.api.quest.QuestException; import org.betonquest.betonquest.config.Config; import org.betonquest.betonquest.config.Zipper; import org.betonquest.betonquest.database.Backup; -import org.betonquest.betonquest.exception.QuestException; import org.betonquest.betonquest.id.ConditionID; import org.bukkit.ChatColor; import org.bukkit.Color; diff --git a/src/main/java/org/betonquest/betonquest/util/location/CompoundLocation.java b/src/main/java/org/betonquest/betonquest/util/location/CompoundLocation.java index df7de5ba53..454384dbbb 100644 --- a/src/main/java/org/betonquest/betonquest/util/location/CompoundLocation.java +++ b/src/main/java/org/betonquest/betonquest/util/location/CompoundLocation.java @@ -3,8 +3,8 @@ import org.betonquest.betonquest.BetonQuest; import org.betonquest.betonquest.api.Variable; import org.betonquest.betonquest.api.config.quest.QuestPackage; +import org.betonquest.betonquest.api.quest.QuestException; import org.betonquest.betonquest.config.Config; -import org.betonquest.betonquest.exception.QuestException; import org.betonquest.betonquest.instruction.variable.location.VariableLocation; import org.betonquest.betonquest.quest.registry.processor.VariableProcessor; import org.bukkit.Location; diff --git a/src/main/java/org/betonquest/betonquest/util/math/Operator.java b/src/main/java/org/betonquest/betonquest/util/math/Operator.java index 3eb7419508..a209c9a96e 100644 --- a/src/main/java/org/betonquest/betonquest/util/math/Operator.java +++ b/src/main/java/org/betonquest/betonquest/util/math/Operator.java @@ -1,6 +1,6 @@ package org.betonquest.betonquest.util.math; -import org.betonquest.betonquest.exception.QuestException; +import org.betonquest.betonquest.api.quest.QuestException; import java.util.Arrays; diff --git a/src/main/java/org/betonquest/betonquest/util/math/Tokenizer.java b/src/main/java/org/betonquest/betonquest/util/math/Tokenizer.java index cca2fa6445..b765c47ef1 100644 --- a/src/main/java/org/betonquest/betonquest/util/math/Tokenizer.java +++ b/src/main/java/org/betonquest/betonquest/util/math/Tokenizer.java @@ -1,7 +1,7 @@ package org.betonquest.betonquest.util.math; import org.betonquest.betonquest.api.config.quest.QuestPackage; -import org.betonquest.betonquest.exception.QuestException; +import org.betonquest.betonquest.api.quest.QuestException; import org.betonquest.betonquest.instruction.variable.VariableNumber; import org.betonquest.betonquest.quest.registry.processor.VariableProcessor; import org.betonquest.betonquest.util.math.tokens.AbsoluteValue; diff --git a/src/main/java/org/betonquest/betonquest/util/math/tokens/AbsoluteValue.java b/src/main/java/org/betonquest/betonquest/util/math/tokens/AbsoluteValue.java index 2addc5737a..22019b5c42 100644 --- a/src/main/java/org/betonquest/betonquest/util/math/tokens/AbsoluteValue.java +++ b/src/main/java/org/betonquest/betonquest/util/math/tokens/AbsoluteValue.java @@ -1,7 +1,7 @@ package org.betonquest.betonquest.util.math.tokens; import org.betonquest.betonquest.api.profile.Profile; -import org.betonquest.betonquest.exception.QuestException; +import org.betonquest.betonquest.api.quest.QuestException; import org.jetbrains.annotations.Nullable; /** diff --git a/src/main/java/org/betonquest/betonquest/util/math/tokens/Negation.java b/src/main/java/org/betonquest/betonquest/util/math/tokens/Negation.java index 6cffdf4f5b..87b08935c2 100644 --- a/src/main/java/org/betonquest/betonquest/util/math/tokens/Negation.java +++ b/src/main/java/org/betonquest/betonquest/util/math/tokens/Negation.java @@ -1,7 +1,7 @@ package org.betonquest.betonquest.util.math.tokens; import org.betonquest.betonquest.api.profile.Profile; -import org.betonquest.betonquest.exception.QuestException; +import org.betonquest.betonquest.api.quest.QuestException; import org.jetbrains.annotations.Nullable; /** diff --git a/src/main/java/org/betonquest/betonquest/util/math/tokens/Operation.java b/src/main/java/org/betonquest/betonquest/util/math/tokens/Operation.java index d3fc9ec92d..cb40da3b53 100644 --- a/src/main/java/org/betonquest/betonquest/util/math/tokens/Operation.java +++ b/src/main/java/org/betonquest/betonquest/util/math/tokens/Operation.java @@ -1,7 +1,7 @@ package org.betonquest.betonquest.util.math.tokens; import org.betonquest.betonquest.api.profile.Profile; -import org.betonquest.betonquest.exception.QuestException; +import org.betonquest.betonquest.api.quest.QuestException; import org.betonquest.betonquest.util.math.Operator; import org.jetbrains.annotations.Nullable; diff --git a/src/main/java/org/betonquest/betonquest/util/math/tokens/Parenthesis.java b/src/main/java/org/betonquest/betonquest/util/math/tokens/Parenthesis.java index 2642546ecf..e1bb298703 100644 --- a/src/main/java/org/betonquest/betonquest/util/math/tokens/Parenthesis.java +++ b/src/main/java/org/betonquest/betonquest/util/math/tokens/Parenthesis.java @@ -1,7 +1,7 @@ package org.betonquest.betonquest.util.math.tokens; import org.betonquest.betonquest.api.profile.Profile; -import org.betonquest.betonquest.exception.QuestException; +import org.betonquest.betonquest.api.quest.QuestException; import org.jetbrains.annotations.Nullable; /** diff --git a/src/main/java/org/betonquest/betonquest/util/math/tokens/Token.java b/src/main/java/org/betonquest/betonquest/util/math/tokens/Token.java index 6a6dc591a2..8eed98317c 100644 --- a/src/main/java/org/betonquest/betonquest/util/math/tokens/Token.java +++ b/src/main/java/org/betonquest/betonquest/util/math/tokens/Token.java @@ -1,7 +1,7 @@ package org.betonquest.betonquest.util.math.tokens; import org.betonquest.betonquest.api.profile.Profile; -import org.betonquest.betonquest.exception.QuestException; +import org.betonquest.betonquest.api.quest.QuestException; import org.jetbrains.annotations.Nullable; /** diff --git a/src/main/java/org/betonquest/betonquest/util/math/tokens/Variable.java b/src/main/java/org/betonquest/betonquest/util/math/tokens/Variable.java index eee04096ff..bec39338a0 100644 --- a/src/main/java/org/betonquest/betonquest/util/math/tokens/Variable.java +++ b/src/main/java/org/betonquest/betonquest/util/math/tokens/Variable.java @@ -1,7 +1,7 @@ package org.betonquest.betonquest.util.math.tokens; import org.betonquest.betonquest.api.profile.Profile; -import org.betonquest.betonquest.exception.QuestException; +import org.betonquest.betonquest.api.quest.QuestException; import org.betonquest.betonquest.instruction.variable.VariableNumber; import org.jetbrains.annotations.Nullable; diff --git a/src/main/java/org/betonquest/betonquest/variables/MathVariable.java b/src/main/java/org/betonquest/betonquest/variables/MathVariable.java index ba4c7631bf..daca8b219a 100644 --- a/src/main/java/org/betonquest/betonquest/variables/MathVariable.java +++ b/src/main/java/org/betonquest/betonquest/variables/MathVariable.java @@ -4,7 +4,7 @@ import org.betonquest.betonquest.api.Variable; import org.betonquest.betonquest.api.logger.BetonQuestLogger; import org.betonquest.betonquest.api.profile.Profile; -import org.betonquest.betonquest.exception.QuestException; +import org.betonquest.betonquest.api.quest.QuestException; import org.betonquest.betonquest.instruction.Instruction; import org.betonquest.betonquest.quest.registry.processor.VariableProcessor; import org.betonquest.betonquest.util.math.Tokenizer; diff --git a/src/main/java/org/betonquest/betonquest/variables/ObjectivePropertyVariable.java b/src/main/java/org/betonquest/betonquest/variables/ObjectivePropertyVariable.java index 89c0f1ab32..a29418c386 100644 --- a/src/main/java/org/betonquest/betonquest/variables/ObjectivePropertyVariable.java +++ b/src/main/java/org/betonquest/betonquest/variables/ObjectivePropertyVariable.java @@ -4,8 +4,8 @@ import org.betonquest.betonquest.api.Objective; import org.betonquest.betonquest.api.Variable; import org.betonquest.betonquest.api.profile.Profile; +import org.betonquest.betonquest.api.quest.QuestException; import org.betonquest.betonquest.exception.ObjectNotFoundException; -import org.betonquest.betonquest.exception.QuestException; import org.betonquest.betonquest.id.ObjectiveID; import org.betonquest.betonquest.instruction.Instruction; import org.jetbrains.annotations.Nullable; diff --git a/src/main/java/org/betonquest/betonquest/variables/RandomNumberVariable.java b/src/main/java/org/betonquest/betonquest/variables/RandomNumberVariable.java index 17e0b956d4..a9f3c950a3 100644 --- a/src/main/java/org/betonquest/betonquest/variables/RandomNumberVariable.java +++ b/src/main/java/org/betonquest/betonquest/variables/RandomNumberVariable.java @@ -2,7 +2,7 @@ import org.betonquest.betonquest.api.Variable; import org.betonquest.betonquest.api.profile.Profile; -import org.betonquest.betonquest.exception.QuestException; +import org.betonquest.betonquest.api.quest.QuestException; import org.betonquest.betonquest.instruction.Instruction; import org.betonquest.betonquest.instruction.variable.VariableNumber; import org.jetbrains.annotations.Nullable; diff --git a/src/main/java/org/betonquest/betonquest/variables/VersionVariable.java b/src/main/java/org/betonquest/betonquest/variables/VersionVariable.java index 30714d5fd5..30c8148c19 100644 --- a/src/main/java/org/betonquest/betonquest/variables/VersionVariable.java +++ b/src/main/java/org/betonquest/betonquest/variables/VersionVariable.java @@ -3,7 +3,7 @@ import org.betonquest.betonquest.BetonQuest; import org.betonquest.betonquest.api.Variable; import org.betonquest.betonquest.api.profile.Profile; -import org.betonquest.betonquest.exception.QuestException; +import org.betonquest.betonquest.api.quest.QuestException; import org.betonquest.betonquest.instruction.Instruction; import org.betonquest.betonquest.util.Utils; import org.bukkit.Bukkit; diff --git a/src/main/java/org/betonquest/betonquest/web/updater/UpdateDownloader.java b/src/main/java/org/betonquest/betonquest/web/updater/UpdateDownloader.java index acbf552c0a..2ab84f1ae0 100644 --- a/src/main/java/org/betonquest/betonquest/web/updater/UpdateDownloader.java +++ b/src/main/java/org/betonquest/betonquest/web/updater/UpdateDownloader.java @@ -1,6 +1,6 @@ package org.betonquest.betonquest.web.updater; -import org.betonquest.betonquest.exception.QuestException; +import org.betonquest.betonquest.api.quest.QuestException; import org.betonquest.betonquest.web.DownloadSource; import java.io.File; diff --git a/src/main/java/org/betonquest/betonquest/web/updater/Updater.java b/src/main/java/org/betonquest/betonquest/web/updater/Updater.java index b215079661..232d05f223 100644 --- a/src/main/java/org/betonquest/betonquest/web/updater/Updater.java +++ b/src/main/java/org/betonquest/betonquest/web/updater/Updater.java @@ -4,7 +4,7 @@ import org.betonquest.betonquest.BetonQuest; import org.betonquest.betonquest.api.config.ConfigurationFile; import org.betonquest.betonquest.api.logger.BetonQuestLogger; -import org.betonquest.betonquest.exception.QuestException; +import org.betonquest.betonquest.api.quest.QuestException; import org.betonquest.betonquest.versioning.Version; import org.bukkit.ChatColor; import org.bukkit.command.CommandSender; diff --git a/src/test/java/org/betonquest/betonquest/api/schedule/AbstractScheduleTest.java b/src/test/java/org/betonquest/betonquest/api/schedule/AbstractScheduleTest.java index a98f887064..8a15be13b9 100644 --- a/src/test/java/org/betonquest/betonquest/api/schedule/AbstractScheduleTest.java +++ b/src/test/java/org/betonquest/betonquest/api/schedule/AbstractScheduleTest.java @@ -1,7 +1,7 @@ package org.betonquest.betonquest.api.schedule; import org.betonquest.betonquest.api.config.quest.QuestPackage; -import org.betonquest.betonquest.exception.QuestException; +import org.betonquest.betonquest.api.quest.QuestException; import org.betonquest.betonquest.schedule.ScheduleID; import org.bukkit.configuration.ConfigurationSection; import org.junit.jupiter.api.BeforeEach; diff --git a/src/test/java/org/betonquest/betonquest/api/schedule/CronRebootScheduleTest.java b/src/test/java/org/betonquest/betonquest/api/schedule/CronRebootScheduleTest.java index f69d6061ac..a0f7bf517d 100644 --- a/src/test/java/org/betonquest/betonquest/api/schedule/CronRebootScheduleTest.java +++ b/src/test/java/org/betonquest/betonquest/api/schedule/CronRebootScheduleTest.java @@ -1,7 +1,7 @@ package org.betonquest.betonquest.api.schedule; import com.cronutils.model.Cron; -import org.betonquest.betonquest.exception.QuestException; +import org.betonquest.betonquest.api.quest.QuestException; import org.junit.jupiter.api.Test; import java.time.ZonedDateTime; diff --git a/src/test/java/org/betonquest/betonquest/api/schedule/CronScheduleBaseTest.java b/src/test/java/org/betonquest/betonquest/api/schedule/CronScheduleBaseTest.java index 1907ae053d..6e93b0f276 100644 --- a/src/test/java/org/betonquest/betonquest/api/schedule/CronScheduleBaseTest.java +++ b/src/test/java/org/betonquest/betonquest/api/schedule/CronScheduleBaseTest.java @@ -2,7 +2,7 @@ import com.cronutils.builder.CronBuilder; import com.cronutils.model.Cron; -import org.betonquest.betonquest.exception.QuestException; +import org.betonquest.betonquest.api.quest.QuestException; import org.junit.jupiter.api.Test; import java.time.ZonedDateTime; diff --git a/src/test/java/org/betonquest/betonquest/api/schedule/ScheduleBaseTest.java b/src/test/java/org/betonquest/betonquest/api/schedule/ScheduleBaseTest.java index f9bb47ef07..62b25161ca 100644 --- a/src/test/java/org/betonquest/betonquest/api/schedule/ScheduleBaseTest.java +++ b/src/test/java/org/betonquest/betonquest/api/schedule/ScheduleBaseTest.java @@ -1,7 +1,7 @@ package org.betonquest.betonquest.api.schedule; +import org.betonquest.betonquest.api.quest.QuestException; import org.betonquest.betonquest.exception.ObjectNotFoundException; -import org.betonquest.betonquest.exception.QuestException; import org.betonquest.betonquest.logger.util.BetonQuestLoggerService; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; diff --git a/src/test/java/org/betonquest/betonquest/instruction/VariableInstructionTest.java b/src/test/java/org/betonquest/betonquest/instruction/VariableInstructionTest.java index a25bd00355..350053ca85 100644 --- a/src/test/java/org/betonquest/betonquest/instruction/VariableInstructionTest.java +++ b/src/test/java/org/betonquest/betonquest/instruction/VariableInstructionTest.java @@ -3,8 +3,8 @@ import org.betonquest.betonquest.api.config.quest.QuestPackage; import org.betonquest.betonquest.api.logger.BetonQuestLogger; import org.betonquest.betonquest.api.logger.BetonQuestLoggerFactory; +import org.betonquest.betonquest.api.quest.QuestException; import org.betonquest.betonquest.exception.ObjectNotFoundException; -import org.betonquest.betonquest.exception.QuestException; import org.betonquest.betonquest.id.VariableID; import org.betonquest.betonquest.logger.util.BetonQuestLoggerService; import org.junit.jupiter.api.Test; diff --git a/src/test/java/org/betonquest/betonquest/quest/event/DatabaseSaverStaticEventTest.java b/src/test/java/org/betonquest/betonquest/quest/event/DatabaseSaverStaticEventTest.java index 25819343fd..5873036466 100644 --- a/src/test/java/org/betonquest/betonquest/quest/event/DatabaseSaverStaticEventTest.java +++ b/src/test/java/org/betonquest/betonquest/quest/event/DatabaseSaverStaticEventTest.java @@ -1,8 +1,8 @@ package org.betonquest.betonquest.quest.event; +import org.betonquest.betonquest.api.quest.QuestException; import org.betonquest.betonquest.database.Saver; import org.betonquest.betonquest.database.UpdateType; -import org.betonquest.betonquest.exception.QuestException; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; import org.mockito.Mock; diff --git a/src/test/java/org/betonquest/betonquest/quest/event/IngameNotificationSenderTest.java b/src/test/java/org/betonquest/betonquest/quest/event/IngameNotificationSenderTest.java index 046887b116..1c10edb29d 100644 --- a/src/test/java/org/betonquest/betonquest/quest/event/IngameNotificationSenderTest.java +++ b/src/test/java/org/betonquest/betonquest/quest/event/IngameNotificationSenderTest.java @@ -4,8 +4,8 @@ import org.betonquest.betonquest.api.logger.BetonQuestLogger; import org.betonquest.betonquest.api.profile.OnlineProfile; import org.betonquest.betonquest.api.profile.Profile; +import org.betonquest.betonquest.api.quest.QuestException; import org.betonquest.betonquest.config.Config; -import org.betonquest.betonquest.exception.QuestException; import org.betonquest.betonquest.logger.util.BetonQuestLoggerService; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; diff --git a/src/test/java/org/betonquest/betonquest/quest/event/OnlineProfileGroupStaticEventAdapterTest.java b/src/test/java/org/betonquest/betonquest/quest/event/OnlineProfileGroupStaticEventAdapterTest.java index b917d51096..485238245d 100644 --- a/src/test/java/org/betonquest/betonquest/quest/event/OnlineProfileGroupStaticEventAdapterTest.java +++ b/src/test/java/org/betonquest/betonquest/quest/event/OnlineProfileGroupStaticEventAdapterTest.java @@ -1,8 +1,8 @@ package org.betonquest.betonquest.quest.event; import org.betonquest.betonquest.api.profile.OnlineProfile; +import org.betonquest.betonquest.api.quest.QuestException; import org.betonquest.betonquest.api.quest.event.Event; -import org.betonquest.betonquest.exception.QuestException; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; import org.junit.jupiter.params.ParameterizedTest; diff --git a/src/test/java/org/betonquest/betonquest/quest/event/SequentialStaticEventTest.java b/src/test/java/org/betonquest/betonquest/quest/event/SequentialStaticEventTest.java index fe07b74b78..790da01ae7 100644 --- a/src/test/java/org/betonquest/betonquest/quest/event/SequentialStaticEventTest.java +++ b/src/test/java/org/betonquest/betonquest/quest/event/SequentialStaticEventTest.java @@ -1,7 +1,7 @@ package org.betonquest.betonquest.quest.event; +import org.betonquest.betonquest.api.quest.QuestException; import org.betonquest.betonquest.api.quest.event.StaticEvent; -import org.betonquest.betonquest.exception.QuestException; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; import org.mockito.InOrder; diff --git a/src/test/java/org/betonquest/betonquest/quest/event/journal/JournalEventFactoryIntegrationTest.java b/src/test/java/org/betonquest/betonquest/quest/event/journal/JournalEventFactoryIntegrationTest.java index 94e5dbf02a..cfd51612c8 100644 --- a/src/test/java/org/betonquest/betonquest/quest/event/journal/JournalEventFactoryIntegrationTest.java +++ b/src/test/java/org/betonquest/betonquest/quest/event/journal/JournalEventFactoryIntegrationTest.java @@ -3,12 +3,12 @@ import org.betonquest.betonquest.api.config.quest.QuestPackage; import org.betonquest.betonquest.api.logger.BetonQuestLogger; import org.betonquest.betonquest.api.logger.SingletonLoggerFactory; +import org.betonquest.betonquest.api.quest.QuestException; import org.betonquest.betonquest.config.DefaultConfigAccessorFactory; import org.betonquest.betonquest.config.quest.QuestPackageImpl; import org.betonquest.betonquest.data.PlayerDataStorage; import org.betonquest.betonquest.database.Saver; import org.betonquest.betonquest.exception.ObjectNotFoundException; -import org.betonquest.betonquest.exception.QuestException; import org.betonquest.betonquest.id.NoID; import org.betonquest.betonquest.instruction.Instruction; import org.betonquest.betonquest.logger.util.BetonQuestLoggerService; diff --git a/src/test/java/org/betonquest/betonquest/quest/event/tag/TagGlobalEventFactoryIntegrationTest.java b/src/test/java/org/betonquest/betonquest/quest/event/tag/TagGlobalEventFactoryIntegrationTest.java index 4a14f0c6dd..879a6a7122 100644 --- a/src/test/java/org/betonquest/betonquest/quest/event/tag/TagGlobalEventFactoryIntegrationTest.java +++ b/src/test/java/org/betonquest/betonquest/quest/event/tag/TagGlobalEventFactoryIntegrationTest.java @@ -3,9 +3,9 @@ import org.betonquest.betonquest.BetonQuest; import org.betonquest.betonquest.api.config.quest.QuestPackage; import org.betonquest.betonquest.api.logger.BetonQuestLogger; +import org.betonquest.betonquest.api.quest.QuestException; import org.betonquest.betonquest.config.DefaultConfigAccessorFactory; import org.betonquest.betonquest.config.quest.QuestPackageImpl; -import org.betonquest.betonquest.exception.QuestException; import org.betonquest.betonquest.instruction.Instruction; import org.betonquest.betonquest.logger.util.BetonQuestLoggerService; import org.bukkit.configuration.InvalidConfigurationException; diff --git a/src/test/java/org/betonquest/betonquest/quest/event/tag/TagPlayerEventFactoryIntegrationTest.java b/src/test/java/org/betonquest/betonquest/quest/event/tag/TagPlayerEventFactoryIntegrationTest.java index b49db1319f..02a1db98e0 100644 --- a/src/test/java/org/betonquest/betonquest/quest/event/tag/TagPlayerEventFactoryIntegrationTest.java +++ b/src/test/java/org/betonquest/betonquest/quest/event/tag/TagPlayerEventFactoryIntegrationTest.java @@ -2,11 +2,11 @@ import org.betonquest.betonquest.api.config.quest.QuestPackage; import org.betonquest.betonquest.api.logger.BetonQuestLogger; +import org.betonquest.betonquest.api.quest.QuestException; import org.betonquest.betonquest.config.DefaultConfigAccessorFactory; import org.betonquest.betonquest.config.quest.QuestPackageImpl; import org.betonquest.betonquest.data.PlayerDataStorage; import org.betonquest.betonquest.database.Saver; -import org.betonquest.betonquest.exception.QuestException; import org.betonquest.betonquest.instruction.Instruction; import org.betonquest.betonquest.logger.util.BetonQuestLoggerService; import org.bukkit.configuration.InvalidConfigurationException; diff --git a/src/test/java/org/betonquest/betonquest/schedule/EventSchedulingTest.java b/src/test/java/org/betonquest/betonquest/schedule/EventSchedulingTest.java index a84f463364..2a7517d1cf 100644 --- a/src/test/java/org/betonquest/betonquest/schedule/EventSchedulingTest.java +++ b/src/test/java/org/betonquest/betonquest/schedule/EventSchedulingTest.java @@ -6,10 +6,10 @@ import org.betonquest.betonquest.api.bukkit.config.custom.multi.MultiSectionConfiguration; import org.betonquest.betonquest.api.config.quest.QuestPackage; import org.betonquest.betonquest.api.logger.BetonQuestLogger; +import org.betonquest.betonquest.api.quest.QuestException; import org.betonquest.betonquest.api.schedule.FictiveTime; import org.betonquest.betonquest.api.schedule.Schedule; import org.betonquest.betonquest.api.schedule.Scheduler; -import org.betonquest.betonquest.exception.QuestException; import org.betonquest.betonquest.schedule.EventScheduling.ScheduleType; import org.bukkit.configuration.ConfigurationSection; import org.bukkit.configuration.file.YamlConfiguration; diff --git a/src/test/java/org/betonquest/betonquest/schedule/ScheduleTypeTest.java b/src/test/java/org/betonquest/betonquest/schedule/ScheduleTypeTest.java index d17d944484..42463f4008 100644 --- a/src/test/java/org/betonquest/betonquest/schedule/ScheduleTypeTest.java +++ b/src/test/java/org/betonquest/betonquest/schedule/ScheduleTypeTest.java @@ -1,10 +1,10 @@ package org.betonquest.betonquest.schedule; import org.betonquest.betonquest.api.config.quest.QuestPackage; +import org.betonquest.betonquest.api.quest.QuestException; import org.betonquest.betonquest.api.schedule.FictiveTime; import org.betonquest.betonquest.api.schedule.Schedule; import org.betonquest.betonquest.api.schedule.Scheduler; -import org.betonquest.betonquest.exception.QuestException; import org.betonquest.betonquest.logger.util.BetonQuestLoggerService; import org.betonquest.betonquest.schedule.EventScheduling.ScheduleType; import org.bukkit.configuration.ConfigurationSection; diff --git a/src/test/java/org/betonquest/betonquest/schedule/impl/realtime/cron/RealtimeCronScheduleTest.java b/src/test/java/org/betonquest/betonquest/schedule/impl/realtime/cron/RealtimeCronScheduleTest.java index 1e171cc64b..c737a424ea 100644 --- a/src/test/java/org/betonquest/betonquest/schedule/impl/realtime/cron/RealtimeCronScheduleTest.java +++ b/src/test/java/org/betonquest/betonquest/schedule/impl/realtime/cron/RealtimeCronScheduleTest.java @@ -1,7 +1,7 @@ package org.betonquest.betonquest.schedule.impl.realtime.cron; +import org.betonquest.betonquest.api.quest.QuestException; import org.betonquest.betonquest.api.schedule.CronRebootScheduleTest; -import org.betonquest.betonquest.exception.QuestException; /** * Tests for realtime cron schedule. diff --git a/src/test/java/org/betonquest/betonquest/schedule/impl/realtime/daily/RealtimeDailyScheduleTest.java b/src/test/java/org/betonquest/betonquest/schedule/impl/realtime/daily/RealtimeDailyScheduleTest.java index b2cf8356c4..dee1aafe3a 100644 --- a/src/test/java/org/betonquest/betonquest/schedule/impl/realtime/daily/RealtimeDailyScheduleTest.java +++ b/src/test/java/org/betonquest/betonquest/schedule/impl/realtime/daily/RealtimeDailyScheduleTest.java @@ -1,7 +1,7 @@ package org.betonquest.betonquest.schedule.impl.realtime.daily; +import org.betonquest.betonquest.api.quest.QuestException; import org.betonquest.betonquest.api.schedule.ScheduleBaseTest; -import org.betonquest.betonquest.exception.QuestException; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; import org.mockito.junit.jupiter.MockitoExtension; diff --git a/src/test/java/org/betonquest/betonquest/util/math/TokenizerTest.java b/src/test/java/org/betonquest/betonquest/util/math/TokenizerTest.java index fb6eccc116..60ca108230 100644 --- a/src/test/java/org/betonquest/betonquest/util/math/TokenizerTest.java +++ b/src/test/java/org/betonquest/betonquest/util/math/TokenizerTest.java @@ -3,7 +3,7 @@ import org.betonquest.betonquest.api.Variable; import org.betonquest.betonquest.api.config.quest.QuestPackage; import org.betonquest.betonquest.api.profile.Profile; -import org.betonquest.betonquest.exception.QuestException; +import org.betonquest.betonquest.api.quest.QuestException; import org.betonquest.betonquest.logger.util.BetonQuestLoggerService; import org.betonquest.betonquest.quest.registry.processor.VariableProcessor; import org.betonquest.betonquest.util.math.tokens.Token; diff --git a/src/test/java/org/betonquest/betonquest/web/updater/UpdateDownloaderTest.java b/src/test/java/org/betonquest/betonquest/web/updater/UpdateDownloaderTest.java index 5c13bb2648..d8556e6de1 100644 --- a/src/test/java/org/betonquest/betonquest/web/updater/UpdateDownloaderTest.java +++ b/src/test/java/org/betonquest/betonquest/web/updater/UpdateDownloaderTest.java @@ -1,6 +1,6 @@ package org.betonquest.betonquest.web.updater; -import org.betonquest.betonquest.exception.QuestException; +import org.betonquest.betonquest.api.quest.QuestException; import org.betonquest.betonquest.web.DownloadSource; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.io.TempDir; diff --git a/src/test/java/org/betonquest/betonquest/web/updater/UpdaterTest.java b/src/test/java/org/betonquest/betonquest/web/updater/UpdaterTest.java index f5242bbdef..eb6ddb3baf 100644 --- a/src/test/java/org/betonquest/betonquest/web/updater/UpdaterTest.java +++ b/src/test/java/org/betonquest/betonquest/web/updater/UpdaterTest.java @@ -3,7 +3,7 @@ import org.apache.commons.lang3.tuple.Pair; import org.betonquest.betonquest.BetonQuest; import org.betonquest.betonquest.api.logger.BetonQuestLogger; -import org.betonquest.betonquest.exception.QuestException; +import org.betonquest.betonquest.api.quest.QuestException; import org.betonquest.betonquest.util.scheduler.BukkitSchedulerMock; import org.betonquest.betonquest.versioning.Version; import org.bukkit.entity.Player;