diff --git a/api/src/main/java/me/blackvein/quests/CustomRequirement.java b/api/src/main/java/me/blackvein/quests/CustomRequirement.java index 95dbf3357..4b6d67d9a 100644 --- a/api/src/main/java/me/blackvein/quests/CustomRequirement.java +++ b/api/src/main/java/me/blackvein/quests/CustomRequirement.java @@ -70,6 +70,7 @@ public abstract class CustomRequirement { /** * @deprecated Use {@link #setItem(String, short)} */ + @Deprecated public void addItem(final String type, final short durability) { setItem(type, durability); } diff --git a/api/src/main/java/me/blackvein/quests/CustomReward.java b/api/src/main/java/me/blackvein/quests/CustomReward.java index e54be845f..b2525927f 100644 --- a/api/src/main/java/me/blackvein/quests/CustomReward.java +++ b/api/src/main/java/me/blackvein/quests/CustomReward.java @@ -70,6 +70,7 @@ public abstract class CustomReward { /** * @deprecated Use {@link #setItem(String, short)} */ + @Deprecated public void addItem(final String type, final short durability) { setItem(type, durability); } diff --git a/core/src/main/java/me/blackvein/quests/CustomObjective.java b/core/src/main/java/me/blackvein/quests/CustomObjective.java index e12bb967f..22ecd341e 100644 --- a/core/src/main/java/me/blackvein/quests/CustomObjective.java +++ b/core/src/main/java/me/blackvein/quests/CustomObjective.java @@ -168,6 +168,7 @@ public class CustomObjective implements ICustomObjective, Listener { /** * @deprecated Do not use */ + @Deprecated public Map getDataForPlayerTemp(final Player player, final ICustomObjective customObj, final IQuest quest) { final IQuester quester = plugin.getQuester(player.getUniqueId()); @@ -208,6 +209,7 @@ public class CustomObjective implements ICustomObjective, Listener { /** * @deprecated Do not use */ + @Deprecated public void incrementObjectiveTemp(final Player player, final ICustomObjective obj, final int count, final IQuest quest) { final Quester quester = plugin.getQuester(player.getUniqueId()); diff --git a/core/src/main/java/me/blackvein/quests/Quester.java b/core/src/main/java/me/blackvein/quests/Quester.java index 89a59d830..037963830 100644 --- a/core/src/main/java/me/blackvein/quests/Quester.java +++ b/core/src/main/java/me/blackvein/quests/Quester.java @@ -875,7 +875,7 @@ public class Quester implements IQuester { if (settings.canConfirmAbandon()) { final ConversationFactory cf = new ConversationFactory(plugin).withModality(false) .withPrefix(context -> ChatColor.GRAY.toString()) - .withFirstPrompt(new QuestAbandonPrompt()).withTimeout(settings.getAcceptTimeout()) + .withFirstPrompt(new QuestAbandonPrompt(plugin)).withTimeout(settings.getAcceptTimeout()) .thatExcludesNonPlayersWithMessage("Console may not perform this conversation!") .addConversationAbandonedListener(plugin.getConvoListener()); cf.buildConversation(getPlayer()).begin(); diff --git a/core/src/main/java/me/blackvein/quests/convo/misc/QuestAbandonPrompt.java b/core/src/main/java/me/blackvein/quests/convo/misc/QuestAbandonPrompt.java index 076e50a52..f0608fa00 100644 --- a/core/src/main/java/me/blackvein/quests/convo/misc/QuestAbandonPrompt.java +++ b/core/src/main/java/me/blackvein/quests/convo/misc/QuestAbandonPrompt.java @@ -18,11 +18,20 @@ public class QuestAbandonPrompt extends MiscStringPrompt { private ConversationContext context; private final Quests plugin; + /** + * @deprecated + */ + @Deprecated public QuestAbandonPrompt() { super(null); plugin = null; } + public QuestAbandonPrompt(Quests plugin) { + super(null); + this.plugin = plugin; + } + public QuestAbandonPrompt(final ConversationContext context) { super(context); plugin = (Quests)context.getPlugin(); @@ -75,7 +84,7 @@ public class QuestAbandonPrompt extends MiscStringPrompt { public @NotNull String getPromptText(final @NotNull ConversationContext context) { this.context = context; if (plugin == null) { - return ChatColor.YELLOW + Lang.get("unknownError"); + return ChatColor.YELLOW + Lang.get("itemCreateCriticalError"); } final MiscPostQuestAbandonEvent event = new MiscPostQuestAbandonEvent(context, this);