Skip to content

Commit

Permalink
moved QuestException from exception package to api.quest
Browse files Browse the repository at this point in the history
  • Loading branch information
Wolf2323 committed Jan 20, 2025
1 parent e36df9f commit 5dc0765
Show file tree
Hide file tree
Showing 569 changed files with 567 additions and 569 deletions.
2 changes: 1 addition & 1 deletion src/main/java/org/betonquest/betonquest/Backpack.java
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/org/betonquest/betonquest/BetonQuest.java
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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;
Expand Down
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/org/betonquest/betonquest/Journal.java
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/org/betonquest/betonquest/api/Condition.java
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/org/betonquest/betonquest/api/Objective.java
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/org/betonquest/betonquest/api/Variable.java
Original file line number Diff line number Diff line change
@@ -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;

Expand Down
Original file line number Diff line number Diff line change
@@ -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}.
Expand Down
Original file line number Diff line number Diff line change
@@ -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}.
Expand Down
Original file line number Diff line number Diff line change
@@ -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}.
Expand Down
Original file line number Diff line number Diff line change
@@ -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;

/**
Expand Down
Original file line number Diff line number Diff line change
@@ -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;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
package org.betonquest.betonquest.api.quest;

import org.betonquest.betonquest.exception.QuestException;
import org.betonquest.betonquest.instruction.Instruction;

/**
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
package org.betonquest.betonquest.api.quest;

import org.betonquest.betonquest.exception.QuestException;
import org.betonquest.betonquest.instruction.Instruction;

/**
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package org.betonquest.betonquest.exception;
package org.betonquest.betonquest.api.quest;

import org.jetbrains.annotations.Nullable;

Expand Down
Original file line number Diff line number Diff line change
@@ -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
Expand Down
Original file line number Diff line number Diff line change
@@ -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;

/**
Expand Down
Original file line number Diff line number Diff line change
@@ -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.
Expand Down
Original file line number Diff line number Diff line change
@@ -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;

/**
Expand Down
Original file line number Diff line number Diff line change
@@ -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;

/**
Expand Down
Original file line number Diff line number Diff line change
@@ -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}
Expand Down
Original file line number Diff line number Diff line change
@@ -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.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down
Original file line number Diff line number Diff line change
@@ -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
Expand Down
Original file line number Diff line number Diff line change
@@ -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;

/**
Expand Down
Original file line number Diff line number Diff line change
@@ -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.
Expand Down
Original file line number Diff line number Diff line change
@@ -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;

/**
Expand Down
Original file line number Diff line number Diff line change
@@ -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;

/**
Expand Down
Original file line number Diff line number Diff line change
@@ -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
Expand Down
Original file line number Diff line number Diff line change
@@ -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.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down
Original file line number Diff line number Diff line change
@@ -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
Expand Down
Original file line number Diff line number Diff line change
@@ -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;

/**
Expand Down
Original file line number Diff line number Diff line change
@@ -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.
Expand Down
Original file line number Diff line number Diff line change
@@ -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;

/**
Expand Down
Original file line number Diff line number Diff line change
@@ -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;

/**
Expand Down
Original file line number Diff line number Diff line change
@@ -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}
Expand Down
Original file line number Diff line number Diff line change
@@ -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.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down
Loading

0 comments on commit 5dc0765

Please sign in to comment.