From 84a38a9aa8cfd2c96024d8a9a71690998739ac65 Mon Sep 17 00:00:00 2001 From: HappyPikachu Date: Mon, 5 Jan 2015 19:41:04 -0500 Subject: [PATCH] Soft-depend PhatLoots --- src/main/java/me/blackvein/quests/Quest.java | 7 ++-- .../quests/prompts/RequirementsPrompt.java | 36 ++++++++++------ .../quests/prompts/RewardsPrompt.java | 42 +++++++++++++------ src/main/resources/plugin.yml | 2 +- 4 files changed, 57 insertions(+), 30 deletions(-) diff --git a/src/main/java/me/blackvein/quests/Quest.java b/src/main/java/me/blackvein/quests/Quest.java index 73686cfa7..55f05df67 100644 --- a/src/main/java/me/blackvein/quests/Quest.java +++ b/src/main/java/me/blackvein/quests/Quest.java @@ -8,8 +8,8 @@ import com.gmail.nossr50.util.player.UserManager; import com.herocraftonline.heroes.characters.Hero; import com.sk89q.worldguard.protection.ApplicableRegionSet; import com.sk89q.worldguard.protection.regions.ProtectedRegion; -import java.util.HashMap; +import java.util.HashMap; import java.util.Iterator; import java.util.LinkedList; import java.util.List; @@ -280,7 +280,8 @@ public class Quest { } - public void completeQuest(Quester q) { + @SuppressWarnings("deprecation") + public void completeQuest(Quester q) { Player player = plugin.getServer().getPlayer(q.id); q.hardQuit(this); @@ -339,7 +340,6 @@ public class Quest { LinkedList phatLootItems = new LinkedList(); int phatLootExp = 0; - int phatLootMoney = 0; LinkedList phatLootMessages = new LinkedList(); @@ -353,7 +353,6 @@ public class Quest { } if (lb.getMoney() > 0) { - phatLootMoney += lb.getMoney(); Quests.economy.depositPlayer(player.getName(), lb.getMoney()); } diff --git a/src/main/java/me/blackvein/quests/prompts/RequirementsPrompt.java b/src/main/java/me/blackvein/quests/prompts/RequirementsPrompt.java index 788c08487..47a84a0d8 100644 --- a/src/main/java/me/blackvein/quests/prompts/RequirementsPrompt.java +++ b/src/main/java/me/blackvein/quests/prompts/RequirementsPrompt.java @@ -2,14 +2,15 @@ package me.blackvein.quests.prompts; import com.gmail.nossr50.datatypes.skills.SkillType; import com.herocraftonline.heroes.characters.classes.HeroClass; + import java.util.Arrays; import java.util.Collections; import java.util.Comparator; import java.util.LinkedList; import java.util.List; import java.util.Map; -import me.blackvein.quests.CustomRequirement; +import me.blackvein.quests.CustomRequirement; import me.blackvein.quests.util.ColorUtil; import me.blackvein.quests.Quest; import me.blackvein.quests.QuestFactory; @@ -39,7 +40,8 @@ public class RequirementsPrompt extends FixedSetPrompt implements ColorUtil { } - @Override + @SuppressWarnings("unchecked") + @Override public String getPromptText(ConversationContext context) { String text; @@ -433,7 +435,8 @@ public class RequirementsPrompt extends FixedSetPrompt implements ColorUtil { } - @Override + @SuppressWarnings("unchecked") + @Override protected Prompt acceptValidatedInput(ConversationContext context, String input) { if (input.equalsIgnoreCase("1")) { @@ -478,11 +481,13 @@ public class RequirementsPrompt extends FixedSetPrompt implements ColorUtil { } - private List getItems(ConversationContext context) { + @SuppressWarnings("unchecked") + private List getItems(ConversationContext context) { return (List) context.getSessionData(CK.REQ_ITEMS); } - private List getRemoveItems(ConversationContext context) { + @SuppressWarnings("unchecked") + private List getRemoveItems(ConversationContext context) { return (List) context.getSessionData(CK.REQ_ITEMS_REMOVE); } } @@ -569,7 +574,8 @@ public class RequirementsPrompt extends FixedSetPrompt implements ColorUtil { return text + YELLOW + Lang.get("reqCustomPrompt"); } - @Override + @SuppressWarnings("unchecked") + @Override public Prompt acceptInput(ConversationContext context, String input) { if (input.equalsIgnoreCase(Lang.get("cmdCancel")) == false && input.equalsIgnoreCase(Lang.get("cmdClear")) == false) { @@ -642,7 +648,8 @@ public class RequirementsPrompt extends FixedSetPrompt implements ColorUtil { private class RequirementCustomDataListPrompt extends StringPrompt { - @Override + @SuppressWarnings("unchecked") + @Override public String getPromptText(ConversationContext context) { String text = BOLD + "" + AQUA + "- "; @@ -683,7 +690,8 @@ public class RequirementsPrompt extends FixedSetPrompt implements ColorUtil { @Override public Prompt acceptInput(ConversationContext context, String input) { - LinkedList> datamapList = (LinkedList>) context.getSessionData(CK.REQ_CUSTOM_DATA); + @SuppressWarnings("unchecked") + LinkedList> datamapList = (LinkedList>) context.getSessionData(CK.REQ_CUSTOM_DATA); Map datamap = datamapList.getLast(); int numInput; @@ -731,7 +739,8 @@ public class RequirementsPrompt extends FixedSetPrompt implements ColorUtil { public String getPromptText(ConversationContext context) { String text = ""; String temp = (String) context.getSessionData(CK.REQ_CUSTOM_DATA_TEMP); - Map descriptions = (Map) context.getSessionData(CK.REQ_CUSTOM_DATA_DESCRIPTIONS); + @SuppressWarnings("unchecked") + Map descriptions = (Map) context.getSessionData(CK.REQ_CUSTOM_DATA_DESCRIPTIONS); if (descriptions.get(temp) != null) { text += GOLD + descriptions.get(temp) + "\n"; } @@ -744,7 +753,8 @@ public class RequirementsPrompt extends FixedSetPrompt implements ColorUtil { @Override public Prompt acceptInput(ConversationContext context, String input) { - LinkedList> datamapList = (LinkedList>) context.getSessionData(CK.REQ_CUSTOM_DATA); + @SuppressWarnings("unchecked") + LinkedList> datamapList = (LinkedList>) context.getSessionData(CK.REQ_CUSTOM_DATA); Map datamap = datamapList.getLast(); datamap.put((String) context.getSessionData(CK.REQ_CUSTOM_DATA_TEMP), input); context.setSessionData(CK.REQ_CUSTOM_DATA_TEMP, null); @@ -767,7 +777,8 @@ public class RequirementsPrompt extends FixedSetPrompt implements ColorUtil { text += BOLD + "" + GREEN + "1" + RESET + GREEN + " - " + Lang.get("reqSetSkills") + "(" + Lang.get("noneSet") + ")\n"; } else { text += BOLD + "" + GREEN + "1" + RESET + GREEN + " - " + Lang.get("reqSetSkills") + "\n"; - LinkedList skills = (LinkedList) cc.getSessionData(CK.REQ_MCMMO_SKILLS); + @SuppressWarnings("unchecked") + LinkedList skills = (LinkedList) cc.getSessionData(CK.REQ_MCMMO_SKILLS); for (String skill : skills) { text += GRAY + " - " + AQUA + skill + "\n"; } @@ -777,7 +788,8 @@ public class RequirementsPrompt extends FixedSetPrompt implements ColorUtil { text += BOLD + "" + GREEN + "2" + RESET + GREEN + " - " + Lang.get("reqSetSkillAmounts") + " (" + Lang.get("noneSet") + ")\n"; } else { text += BOLD + "" + GREEN + "2" + RESET + GREEN + " - " + Lang.get("reqSetSkillAmounts") + "\n"; - LinkedList amounts = (LinkedList) cc.getSessionData(CK.REQ_MCMMO_SKILL_AMOUNTS); + @SuppressWarnings("unchecked") + LinkedList amounts = (LinkedList) cc.getSessionData(CK.REQ_MCMMO_SKILL_AMOUNTS); for (int i : amounts) { text += GRAY + " - " + AQUA + i + "\n"; } diff --git a/src/main/java/me/blackvein/quests/prompts/RewardsPrompt.java b/src/main/java/me/blackvein/quests/prompts/RewardsPrompt.java index d8cc6ec13..5293a200c 100644 --- a/src/main/java/me/blackvein/quests/prompts/RewardsPrompt.java +++ b/src/main/java/me/blackvein/quests/prompts/RewardsPrompt.java @@ -4,11 +4,13 @@ import com.codisimus.plugins.phatloots.PhatLoot; import com.codisimus.plugins.phatloots.PhatLootsAPI; import com.gmail.nossr50.datatypes.skills.SkillType; import com.herocraftonline.heroes.characters.classes.HeroClass; + import java.util.Arrays; import java.util.Collections; import java.util.LinkedList; import java.util.List; import java.util.Map; + import me.blackvein.quests.CustomReward; import me.blackvein.quests.util.ColorUtil; import me.blackvein.quests.QuestFactory; @@ -17,6 +19,7 @@ import me.blackvein.quests.Quests; import me.blackvein.quests.util.CK; import me.blackvein.quests.util.ItemUtil; import me.blackvein.quests.util.Lang; + import org.bukkit.conversations.ConversationContext; import org.bukkit.conversations.FixedSetPrompt; import org.bukkit.conversations.NumericPrompt; @@ -38,7 +41,8 @@ public class RewardsPrompt extends FixedSetPrompt implements ColorUtil { } - @Override + @SuppressWarnings("unchecked") + @Override public String getPromptText(ConversationContext context) { String text; @@ -369,7 +373,8 @@ public class RewardsPrompt extends FixedSetPrompt implements ColorUtil { } - private List getItems(ConversationContext context) { + @SuppressWarnings("unchecked") + private List getItems(ConversationContext context) { return (List) context.getSessionData(CK.REW_ITEMS); } @@ -491,7 +496,8 @@ public class RewardsPrompt extends FixedSetPrompt implements ColorUtil { } - @Override + @SuppressWarnings("unchecked") + @Override protected Prompt acceptValidatedInput(ConversationContext context, String input) { if (input.equalsIgnoreCase("1")) { @@ -536,11 +542,13 @@ public class RewardsPrompt extends FixedSetPrompt implements ColorUtil { } - private List getSkills(ConversationContext context) { + @SuppressWarnings("unchecked") + private List getSkills(ConversationContext context) { return (List) context.getSessionData(CK.REW_MCMMO_SKILLS); } - private List getSkillAmounts(ConversationContext context) { + @SuppressWarnings("unchecked") + private List getSkillAmounts(ConversationContext context) { return (List) context.getSessionData(CK.REW_MCMMO_AMOUNTS); } @@ -690,7 +698,8 @@ public class RewardsPrompt extends FixedSetPrompt implements ColorUtil { } - @Override + @SuppressWarnings("unchecked") + @Override protected Prompt acceptValidatedInput(ConversationContext context, String input) { if (input.equalsIgnoreCase("1")) { @@ -735,11 +744,13 @@ public class RewardsPrompt extends FixedSetPrompt implements ColorUtil { } - private List getClasses(ConversationContext context) { + @SuppressWarnings("unchecked") + private List getClasses(ConversationContext context) { return (List) context.getSessionData(CK.REW_HEROES_CLASSES); } - private List getClassAmounts(ConversationContext context) { + @SuppressWarnings("unchecked") + private List getClassAmounts(ConversationContext context) { return (List) context.getSessionData(CK.REW_HEROES_AMOUNTS); } @@ -924,7 +935,8 @@ public class RewardsPrompt extends FixedSetPrompt implements ColorUtil { return text + YELLOW + Lang.get("rewCustomRewardPrompt"); } - @Override + @SuppressWarnings("unchecked") + @Override public Prompt acceptInput(ConversationContext context, String input) { if (input.equalsIgnoreCase(Lang.get("cmdCancel")) == false && input.equalsIgnoreCase(Lang.get("cmdClear")) == false) { @@ -997,7 +1009,8 @@ public class RewardsPrompt extends FixedSetPrompt implements ColorUtil { private class RewardCustomDataListPrompt extends StringPrompt { - @Override + @SuppressWarnings("unchecked") + @Override public String getPromptText(ConversationContext context) { String text = BOLD + "" + AQUA + "- "; @@ -1038,7 +1051,8 @@ public class RewardsPrompt extends FixedSetPrompt implements ColorUtil { @Override public Prompt acceptInput(ConversationContext context, String input) { - LinkedList> datamapList = (LinkedList>) context.getSessionData(CK.REW_CUSTOM_DATA); + @SuppressWarnings("unchecked") + LinkedList> datamapList = (LinkedList>) context.getSessionData(CK.REW_CUSTOM_DATA); Map datamap = datamapList.getLast(); int numInput; @@ -1086,7 +1100,8 @@ public class RewardsPrompt extends FixedSetPrompt implements ColorUtil { public String getPromptText(ConversationContext context) { String text = ""; String temp = (String) context.getSessionData(CK.REW_CUSTOM_DATA_TEMP); - Map descriptions = (Map) context.getSessionData(CK.REW_CUSTOM_DATA_DESCRIPTIONS); + @SuppressWarnings("unchecked") + Map descriptions = (Map) context.getSessionData(CK.REW_CUSTOM_DATA_DESCRIPTIONS); if (descriptions.get(temp) != null) { text += GOLD + descriptions.get(temp) + "\n"; } @@ -1099,7 +1114,8 @@ public class RewardsPrompt extends FixedSetPrompt implements ColorUtil { @Override public Prompt acceptInput(ConversationContext context, String input) { - LinkedList> datamapList = (LinkedList>) context.getSessionData(CK.REW_CUSTOM_DATA); + @SuppressWarnings("unchecked") + LinkedList> datamapList = (LinkedList>) context.getSessionData(CK.REW_CUSTOM_DATA); Map datamap = datamapList.getLast(); datamap.put((String) context.getSessionData(CK.REW_CUSTOM_DATA_TEMP), input); context.setSessionData(CK.REW_CUSTOM_DATA_TEMP, null); diff --git a/src/main/resources/plugin.yml b/src/main/resources/plugin.yml index 13ea3cf7e..3bb79ee68 100644 --- a/src/main/resources/plugin.yml +++ b/src/main/resources/plugin.yml @@ -5,7 +5,7 @@ description: Player questing system website: http://dev.bukkit.org/server-mods/quests/ dev-url: https://github.com/Blackvein/Quests/ authors: [Blackvein] -softdepend: [Citizens, Vault] +softdepend: [Citizens, PhatLoots, Vault] permissions: quests.quest: description: View current Quest objectives