mirror of
https://github.com/PikaMug/Quests.git
synced 2024-11-15 07:05:51 +01:00
Create separate utility class for inventory
This commit is contained in:
PikaMug
parent
6ded1e3fdf
commit
8a2704c2b0
@ -42,6 +42,7 @@ import me.blackvein.quests.events.quester.QuesterPreCompleteQuestEvent;
|
||||
import me.blackvein.quests.events.quester.QuesterPreFailQuestEvent;
|
||||
import me.blackvein.quests.exceptions.InvalidStageException;
|
||||
import me.blackvein.quests.util.ConfigUtil;
|
||||
import me.blackvein.quests.util.InventoryUtil;
|
||||
import me.blackvein.quests.util.ItemUtil;
|
||||
import me.blackvein.quests.util.Lang;
|
||||
import me.clip.placeholderapi.PlaceholderAPI;
|
||||
@ -450,7 +451,7 @@ public class Quest {
|
||||
}
|
||||
for (ItemStack i : rews.getItems()) {
|
||||
try {
|
||||
Quests.addItem(player, i);
|
||||
InventoryUtil.addItem(player, i);
|
||||
} catch (Exception e) {
|
||||
plugin.getLogger().severe("Unable to add null reward item to inventory of "
|
||||
+ player.getName() + " upon completion of quest " + name);
|
||||
@ -514,7 +515,7 @@ public class Quest {
|
||||
phatLootItems.addAll(lb.getItemList());
|
||||
for (ItemStack is : lb.getItemList()) {
|
||||
try {
|
||||
Quests.addItem(player, is);
|
||||
InventoryUtil.addItem(player, is);
|
||||
} catch (Exception e) {
|
||||
plugin.getLogger().severe("Unable to add PhatLoots item to inventory of " + player.getName()
|
||||
+ " upon completion of quest " + name);
|
||||
|
||||
@ -56,6 +56,7 @@ import me.blackvein.quests.events.quester.QuesterPostStartQuestEvent;
|
||||
import me.blackvein.quests.events.quester.QuesterPreStartQuestEvent;
|
||||
import me.blackvein.quests.timers.StageTimer;
|
||||
import me.blackvein.quests.util.ConfigUtil;
|
||||
import me.blackvein.quests.util.InventoryUtil;
|
||||
import me.blackvein.quests.util.ItemUtil;
|
||||
import me.blackvein.quests.util.Lang;
|
||||
import me.blackvein.quests.util.LocaleQuery;
|
||||
@ -495,7 +496,7 @@ public class Quester {
|
||||
}
|
||||
for (ItemStack is : reqs.getItems()) {
|
||||
if (reqs.getRemoveItems().get(reqs.getItems().indexOf(is)) == true) {
|
||||
Quests.removeItem(player.getInventory(), is);
|
||||
InventoryUtil.removeItem(player.getInventory(), is);
|
||||
}
|
||||
}
|
||||
String accepted = Lang.get(getPlayer(), "questAccepted");
|
||||
|
||||
@ -67,7 +67,6 @@ import org.bukkit.entity.Tameable;
|
||||
import org.bukkit.event.HandlerList;
|
||||
import org.bukkit.inventory.Inventory;
|
||||
import org.bukkit.inventory.ItemStack;
|
||||
import org.bukkit.inventory.PlayerInventory;
|
||||
import org.bukkit.permissions.PermissionAttachmentInfo;
|
||||
import org.bukkit.plugin.java.JavaPlugin;
|
||||
|
||||
@ -85,6 +84,7 @@ import me.blackvein.quests.listeners.PartiesListener;
|
||||
import me.blackvein.quests.listeners.PlayerListener;
|
||||
import me.blackvein.quests.prompts.QuestOfferPrompt;
|
||||
import me.blackvein.quests.util.ConfigUtil;
|
||||
import me.blackvein.quests.util.InventoryUtil;
|
||||
import me.blackvein.quests.util.ItemUtil;
|
||||
import me.blackvein.quests.util.Lang;
|
||||
import me.blackvein.quests.util.LocaleQuery;
|
||||
@ -1649,7 +1649,7 @@ public class Quests extends JavaPlugin implements ConversationAbandonedListener
|
||||
if (config.contains("quests." + questKey + ".rewards.items")) {
|
||||
LinkedList<ItemStack> temp = new LinkedList<ItemStack>(); // TODO - should maybe be = rews.getItems() ?
|
||||
List<ItemStack> stackList = (List<ItemStack>) config.get("quests." + questKey + ".rewards.items");
|
||||
if (Quests.checkList(stackList, ItemStack.class)) {
|
||||
if (ConfigUtil.checkList(stackList, ItemStack.class)) {
|
||||
for (ItemStack stack : stackList) {
|
||||
if (stack != null) {
|
||||
temp.add(stack);
|
||||
@ -1657,7 +1657,7 @@ public class Quests extends JavaPlugin implements ConversationAbandonedListener
|
||||
}
|
||||
} else {
|
||||
// Legacy
|
||||
if (Quests.checkList(stackList, String.class)) {
|
||||
if (ConfigUtil.checkList(stackList, String.class)) {
|
||||
List<String> items = config.getStringList("quests." + questKey + ".rewards.items");
|
||||
for (String item : items) {
|
||||
try {
|
||||
@ -1691,14 +1691,14 @@ public class Quests extends JavaPlugin implements ConversationAbandonedListener
|
||||
}
|
||||
}
|
||||
if (config.contains("quests." + questKey + ".rewards.commands")) {
|
||||
if (Quests.checkList(config.getList("quests." + questKey + ".rewards.commands"), String.class)) {
|
||||
if (ConfigUtil.checkList(config.getList("quests." + questKey + ".rewards.commands"), String.class)) {
|
||||
rews.setCommands(config.getStringList("quests." + questKey + ".rewards.commands"));
|
||||
} else {
|
||||
skipQuestProcess("commands: Reward in Quest " + quest.getName() + " is not a list of commands!");
|
||||
}
|
||||
}
|
||||
if (config.contains("quests." + questKey + ".rewards.commands-override-display")) {
|
||||
if (Quests.checkList(config.getList("quests." + questKey + ".rewards.commands-override-display"),
|
||||
if (ConfigUtil.checkList(config.getList("quests." + questKey + ".rewards.commands-override-display"),
|
||||
String.class)) {
|
||||
rews.setCommandsOverrideDisplay(config.getStringList("quests." + questKey
|
||||
+ ".rewards.commands-override-display"));
|
||||
@ -1708,7 +1708,7 @@ public class Quests extends JavaPlugin implements ConversationAbandonedListener
|
||||
}
|
||||
}
|
||||
if (config.contains("quests." + questKey + ".rewards.permissions")) {
|
||||
if (Quests.checkList(config.getList("quests." + questKey + ".rewards.permissions"), String.class)) {
|
||||
if (ConfigUtil.checkList(config.getList("quests." + questKey + ".rewards.permissions"), String.class)) {
|
||||
rews.setPermissions(config.getStringList("quests." + questKey + ".rewards.permissions"));
|
||||
} else {
|
||||
skipQuestProcess("permissions: Reward in Quest " + quest.getName() + " is not a list of permissions!");
|
||||
@ -1723,9 +1723,10 @@ public class Quests extends JavaPlugin implements ConversationAbandonedListener
|
||||
}
|
||||
if (depends.isPluginAvailable("mcMMO")) {
|
||||
if (config.contains("quests." + questKey + ".rewards.mcmmo-skills")) {
|
||||
if (Quests.checkList(config.getList("quests." + questKey + ".rewards.mcmmo-skills"), String.class)) {
|
||||
if (ConfigUtil.checkList(config.getList("quests." + questKey + ".rewards.mcmmo-skills"),
|
||||
String.class)) {
|
||||
if (config.contains("quests." + questKey + ".rewards.mcmmo-levels")) {
|
||||
if (Quests.checkList(config.getList("quests." + questKey + ".rewards.mcmmo-levels"),
|
||||
if (ConfigUtil.checkList(config.getList("quests." + questKey + ".rewards.mcmmo-levels"),
|
||||
Integer.class)) {
|
||||
for (String skill : config.getStringList("quests." + questKey + ".rewards.mcmmo-skills")) {
|
||||
if (depends.getMcmmoClassic() == null) {
|
||||
@ -1753,10 +1754,10 @@ public class Quests extends JavaPlugin implements ConversationAbandonedListener
|
||||
}
|
||||
if (depends.isPluginAvailable("Heroes")) {
|
||||
if (config.contains("quests." + questKey + ".rewards.heroes-exp-classes")) {
|
||||
if (Quests.checkList(config.getList("quests." + questKey + ".rewards.heroes-exp-classes"),
|
||||
if (ConfigUtil.checkList(config.getList("quests." + questKey + ".rewards.heroes-exp-classes"),
|
||||
String.class)) {
|
||||
if (config.contains("quests." + questKey + ".rewards.heroes-exp-amounts")) {
|
||||
if (Quests.checkList(config.getList("quests." + questKey + ".rewards.heroes-exp-amounts"),
|
||||
if (ConfigUtil.checkList(config.getList("quests." + questKey + ".rewards.heroes-exp-amounts"),
|
||||
Double.class)) {
|
||||
for (String heroClass : config.getStringList("quests." + questKey
|
||||
+ ".rewards.heroes-exp-classes")) {
|
||||
@ -1787,7 +1788,7 @@ public class Quests extends JavaPlugin implements ConversationAbandonedListener
|
||||
}
|
||||
if (depends.isPluginAvailable("PhatLoots")) {
|
||||
if (config.contains("quests." + questKey + ".rewards.phat-loots")) {
|
||||
if (Quests.checkList(config.getList("quests." + questKey + ".rewards.phat-loots"), String.class)) {
|
||||
if (ConfigUtil.checkList(config.getList("quests." + questKey + ".rewards.phat-loots"), String.class)) {
|
||||
for (String loot : config.getStringList("quests." + questKey + ".rewards.phat-loots")) {
|
||||
if (depends.getPhatLoots() == null) {
|
||||
skipQuestProcess("" + loot + " in phat-loots: Reward in Quest " + quest.getName()
|
||||
@ -1844,7 +1845,7 @@ public class Quests extends JavaPlugin implements ConversationAbandonedListener
|
||||
}
|
||||
}
|
||||
if (config.contains("quests." + questKey + ".requirements.remove-items")) {
|
||||
if (Quests.checkList(config.getList("quests." + questKey + ".requirements.remove-items"),
|
||||
if (ConfigUtil.checkList(config.getList("quests." + questKey + ".requirements.remove-items"),
|
||||
Boolean.class)) {
|
||||
reqs.setRemoveItems(config.getBooleanList("quests." + questKey + ".requirements.remove-items"));
|
||||
} else {
|
||||
@ -1870,7 +1871,8 @@ public class Quests extends JavaPlugin implements ConversationAbandonedListener
|
||||
}
|
||||
}
|
||||
if (config.contains("quests." + questKey + ".requirements.quest-blocks")) {
|
||||
if (Quests.checkList(config.getList("quests." + questKey + ".requirements.quest-blocks"), String.class)) {
|
||||
if (ConfigUtil.checkList(config.getList("quests." + questKey + ".requirements.quest-blocks"),
|
||||
String.class)) {
|
||||
List<String> names = config.getStringList("quests." + questKey + ".requirements.quest-blocks");
|
||||
boolean failed = false;
|
||||
String failedQuest = "NULL";
|
||||
@ -1902,7 +1904,7 @@ public class Quests extends JavaPlugin implements ConversationAbandonedListener
|
||||
}
|
||||
}
|
||||
if (config.contains("quests." + questKey + ".requirements.quests")) {
|
||||
if (Quests.checkList(config.getList("quests." + questKey + ".requirements.quests"), String.class)) {
|
||||
if (ConfigUtil.checkList(config.getList("quests." + questKey + ".requirements.quests"), String.class)) {
|
||||
List<String> names = config.getStringList("quests." + questKey + ".requirements.quests");
|
||||
boolean failed = false;
|
||||
String failedQuest = "NULL";
|
||||
@ -1932,7 +1934,8 @@ public class Quests extends JavaPlugin implements ConversationAbandonedListener
|
||||
}
|
||||
}
|
||||
if (config.contains("quests." + questKey + ".requirements.permissions")) {
|
||||
if (Quests.checkList(config.getList("quests." + questKey + ".requirements.permissions"), String.class)) {
|
||||
if (ConfigUtil.checkList(config.getList("quests." + questKey + ".requirements.permissions"),
|
||||
String.class)) {
|
||||
reqs.setPermissions(config.getStringList("quests." + questKey + ".requirements.permissions"));
|
||||
} else {
|
||||
skipQuestProcess("permissions: Requirement for Quest " + quest.getName()
|
||||
@ -1940,9 +1943,10 @@ public class Quests extends JavaPlugin implements ConversationAbandonedListener
|
||||
}
|
||||
}
|
||||
if (config.contains("quests." + questKey + ".requirements.mcmmo-skills")) {
|
||||
if (Quests.checkList(config.getList("quests." + questKey + ".requirements.mcmmo-skills"), String.class)) {
|
||||
if (ConfigUtil.checkList(config.getList("quests." + questKey + ".requirements.mcmmo-skills"),
|
||||
String.class)) {
|
||||
if (config.contains("quests." + questKey + ".requirements.mcmmo-amounts")) {
|
||||
if (Quests.checkList(config.getList("quests." + questKey + ".requirements.mcmmo-amounts"),
|
||||
if (ConfigUtil.checkList(config.getList("quests." + questKey + ".requirements.mcmmo-amounts"),
|
||||
Integer.class)) {
|
||||
List<String> skills = config.getStringList("quests." + questKey + ".requirements.mcmmo-skills");
|
||||
List<Integer> amounts = config.getIntegerList("quests." + questKey
|
||||
@ -2427,8 +2431,8 @@ public class Quests extends JavaPlugin implements ConversationAbandonedListener
|
||||
}
|
||||
}
|
||||
if (config.contains("quests." + questKey + ".stages.ordered." + s2 + ".enchantments")) {
|
||||
if (ConfigUtil.checkList(config.getList("quests." + questKey + ".stages.ordered." + s2 + ".enchantments"),
|
||||
String.class)) {
|
||||
if (ConfigUtil.checkList(config.getList("quests." + questKey + ".stages.ordered." + s2
|
||||
+ ".enchantments"), String.class)) {
|
||||
for (String enchant : config.getStringList("quests." + questKey + ".stages.ordered." + s2
|
||||
+ ".enchantments")) {
|
||||
Enchantment e = ItemUtil.getEnchantmentFromProperName(enchant);
|
||||
@ -2691,7 +2695,7 @@ public class Quests extends JavaPlugin implements ConversationAbandonedListener
|
||||
+ " is not a list of mob names!");
|
||||
}
|
||||
if (config.contains("quests." + questKey + ".stages.ordered." + s2 + ".mob-amounts")) {
|
||||
if (Quests.checkList(config.getList("quests." + questKey + ".stages.ordered." + s2
|
||||
if (ConfigUtil.checkList(config.getList("quests." + questKey + ".stages.ordered." + s2
|
||||
+ ".mob-amounts"), Integer.class)) {
|
||||
for (int i : config.getIntegerList("quests." + questKey + ".stages.ordered." + s2
|
||||
+ ".mob-amounts")) {
|
||||
@ -3374,32 +3378,23 @@ public class Quests extends JavaPlugin implements ConversationAbandonedListener
|
||||
/**
|
||||
* Adds item to player's inventory. If full, item is dropped at player's location.
|
||||
*
|
||||
* @deprecated Use InventoryUtil.addItem(Player, ItemStack)
|
||||
* @throws NullPointerException when ItemStack is null
|
||||
*/
|
||||
public static void addItem(Player p, ItemStack i) throws Exception {
|
||||
if (i == null) {
|
||||
throw new NullPointerException("Null item while trying to add to inventory of " + p.getName());
|
||||
}
|
||||
PlayerInventory inv = p.getInventory();
|
||||
if (i != null) {
|
||||
HashMap<Integer, ItemStack> leftover = inv.addItem(i);
|
||||
if (leftover != null) {
|
||||
if (leftover.isEmpty() == false) {
|
||||
for (ItemStack i2 : leftover.values()) {
|
||||
p.getWorld().dropItem(p.getLocation(), i2);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
InventoryUtil.addItem(p, i);
|
||||
}
|
||||
|
||||
/**
|
||||
* @deprecated
|
||||
* @deprecated Use Dependencies.getCurrency(boolean)
|
||||
*/
|
||||
public String getCurrency(boolean plural) {
|
||||
return depends.getCurrency(plural);
|
||||
}
|
||||
|
||||
/**
|
||||
* @deprecated Use InventoryUtil.removeItem(Inventory, ItemStack)
|
||||
*/
|
||||
public static boolean removeItem(Inventory inventory, ItemStack is) {
|
||||
int amount = is.getAmount();
|
||||
HashMap<Integer, ? extends ItemStack> allItems = inventory.all(is.getType());
|
||||
|
||||
@ -39,6 +39,7 @@ import me.blackvein.quests.Quester;
|
||||
import me.blackvein.quests.Quests;
|
||||
import me.blackvein.quests.timers.ActionTimer;
|
||||
import me.blackvein.quests.util.ConfigUtil;
|
||||
import me.blackvein.quests.util.InventoryUtil;
|
||||
import me.blackvein.quests.util.ItemUtil;
|
||||
import me.blackvein.quests.util.Lang;
|
||||
import me.blackvein.quests.util.MiscUtil;
|
||||
@ -290,7 +291,7 @@ public class Action {
|
||||
if (items.isEmpty() == false) {
|
||||
for (ItemStack is : items) {
|
||||
try {
|
||||
Quests.addItem(player, is);
|
||||
InventoryUtil.addItem(player, is);
|
||||
} catch (Exception e) {
|
||||
plugin.getLogger().severe("Unable to add null item to inventory of "
|
||||
+ player.getName() + " during quest " + quest.getName() + " event " + name);
|
||||
|
||||
@ -0,0 +1,87 @@
|
||||
/*******************************************************************************************************
|
||||
* Continued by PikaMug (formerly HappyPikachu) with permission from _Blackvein_. All rights reserved.
|
||||
*
|
||||
* THIS SOFTWARE IS PROVIDED "AS IS" AND ANY EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
|
||||
* TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN
|
||||
* NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
|
||||
* EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
|
||||
* OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
|
||||
* OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
|
||||
* ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
||||
*******************************************************************************************************/
|
||||
|
||||
package me.blackvein.quests.util;
|
||||
|
||||
import java.util.HashMap;
|
||||
import java.util.Map;
|
||||
|
||||
import org.bukkit.entity.Player;
|
||||
import org.bukkit.inventory.Inventory;
|
||||
import org.bukkit.inventory.ItemStack;
|
||||
import org.bukkit.inventory.PlayerInventory;
|
||||
|
||||
public class InventoryUtil {
|
||||
|
||||
/**
|
||||
* Adds item to player's inventory. If full, item is dropped at player's location.
|
||||
*
|
||||
* @throws NullPointerException when ItemStack is null
|
||||
*/
|
||||
public static void addItem(Player p, ItemStack i) throws Exception {
|
||||
if (i == null) {
|
||||
throw new NullPointerException("Null item while trying to add to inventory of " + p.getName());
|
||||
}
|
||||
PlayerInventory inv = p.getInventory();
|
||||
if (i != null) {
|
||||
HashMap<Integer, ItemStack> leftover = inv.addItem(i);
|
||||
if (leftover != null) {
|
||||
if (leftover.isEmpty() == false) {
|
||||
for (ItemStack i2 : leftover.values()) {
|
||||
p.getWorld().dropItem(p.getLocation(), i2);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Removes item from player's inventory
|
||||
*
|
||||
* @param inventory Inventory to remove from
|
||||
* @param is Item with amount to remove
|
||||
* @return true if successful
|
||||
*/
|
||||
public static boolean removeItem(Inventory inventory, ItemStack is) {
|
||||
int amount = is.getAmount();
|
||||
HashMap<Integer, ? extends ItemStack> allItems = inventory.all(is.getType());
|
||||
HashMap<Integer, Integer> removeFrom = new HashMap<Integer, Integer>();
|
||||
int foundAmount = 0;
|
||||
for (Map.Entry<Integer, ? extends ItemStack> item : allItems.entrySet()) {
|
||||
if (ItemUtil.compareItems(is, item.getValue(), true) == 0) {
|
||||
if (item.getValue().getAmount() >= amount - foundAmount) {
|
||||
removeFrom.put(item.getKey(), amount - foundAmount);
|
||||
foundAmount = amount;
|
||||
} else {
|
||||
foundAmount += item.getValue().getAmount();
|
||||
removeFrom.put(item.getKey(), item.getValue().getAmount());
|
||||
}
|
||||
if (foundAmount >= amount) {
|
||||
break;
|
||||
}
|
||||
}
|
||||
}
|
||||
if (foundAmount == amount) {
|
||||
for (Map.Entry<Integer, Integer> toRemove : removeFrom.entrySet()) {
|
||||
ItemStack item = inventory.getItem(toRemove.getKey());
|
||||
if (item.getAmount() - toRemove.getValue() <= 0) {
|
||||
inventory.clear(toRemove.getKey());
|
||||
} else {
|
||||
item.setAmount(item.getAmount() - toRemove.getValue());
|
||||
inventory.setItem(toRemove.getKey(), item);
|
||||
}
|
||||
}
|
||||
return true;
|
||||
}
|
||||
return false;
|
||||
}
|
||||
}
|
||||
Loading…
Reference in New Issue
Block a user