Upstream/mmocore
1
0
Fork 1
mirror of https://gitlab.com/phoenix-dvpmt/mmocore.git synced 2024-11-24 00:15:16 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

!Moved SmartGive to MMOLib

Browse Source
This commit is contained in:
Indyuce 2020-04-08 16:53:52 +02:00
parent 1cb8f01a07
commit 187587a0d4
8 changed files with 5 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
lib/MMOItems.jar
View File

Binary file not shown.

BIN
lib/MMOLib.jar
View File

Binary file not shown.

2
src/main/java/net/Indyuce/mmocore/api/eco/Withdraw.java
View File

@ -18,7 +18,7 @@ import org.bukkit.inventory.ItemStack;
import net.Indyuce.mmocore.MMOCore; import net.Indyuce.mmocore.MMOCore;
import net.Indyuce.mmocore.api.util.item.CurrencyItem; import net.Indyuce.mmocore.api.util.item.CurrencyItem;
import net.Indyuce.mmocore.api.util.item.SmartGive; import net.mmogroup.mmolib.api.util.SmartGive;
public class Withdraw implements Listener { public class Withdraw implements Listener {
private static final Set<UUID> withdrawing = new HashSet<>(); private static final Set<UUID> withdrawing = new HashSet<>();

2
src/main/java/net/Indyuce/mmocore/api/quest/trigger/ItemTrigger.java
View File

@ -4,8 +4,8 @@ import org.bukkit.Material;
import org.bukkit.inventory.ItemStack; import org.bukkit.inventory.ItemStack;
import net.Indyuce.mmocore.api.player.PlayerData; import net.Indyuce.mmocore.api.player.PlayerData;
import net.Indyuce.mmocore.api.util.item.SmartGive;
import net.mmogroup.mmolib.api.MMOLineConfig; import net.mmogroup.mmolib.api.MMOLineConfig;
import net.mmogroup.mmolib.api.util.SmartGive;
public class ItemTrigger extends Trigger { public class ItemTrigger extends Trigger {
private final Material material; private final Material material;

32
src/main/java/net/Indyuce/mmocore/api/util/item/SmartGive.java
View File

@ -1,32 +0,0 @@
package net.Indyuce.mmocore.api.util.item;
import java.util.List;
import org.bukkit.Location;
import org.bukkit.entity.Player;
import org.bukkit.inventory.Inventory;
import org.bukkit.inventory.ItemStack;
public class SmartGive {
private final Inventory inv;
private final Location loc;
public SmartGive(Player player) {
inv = player.getInventory();
loc = player.getLocation();
}
/*
* either give directly the item to the player or drops it on the ground if
* there is not enough space in the player inventory.
*/
public void give(ItemStack... item) {
for (ItemStack drop : inv.addItem(item).values())
loc.getWorld().dropItem(loc, drop);
}
public void give(List<ItemStack> item) {
for (ItemStack drop : inv.addItem(item.toArray(new ItemStack[item.size()])).values())
loc.getWorld().dropItem(loc, drop);
}
}

2
src/main/java/net/Indyuce/mmocore/command/rpg/CoinsCommandMap.java
View File

@ -6,10 +6,10 @@ import org.bukkit.command.CommandSender;
import org.bukkit.entity.Player; import org.bukkit.entity.Player;
import net.Indyuce.mmocore.api.util.item.CurrencyItem; import net.Indyuce.mmocore.api.util.item.CurrencyItem;
import net.Indyuce.mmocore.api.util.item.SmartGive;
import net.Indyuce.mmocore.command.api.CommandEnd; import net.Indyuce.mmocore.command.api.CommandEnd;
import net.Indyuce.mmocore.command.api.CommandMap; import net.Indyuce.mmocore.command.api.CommandMap;
import net.Indyuce.mmocore.command.api.Parameter; import net.Indyuce.mmocore.command.api.Parameter;
import net.mmogroup.mmolib.api.util.SmartGive;
public class CoinsCommandMap extends CommandEnd { public class CoinsCommandMap extends CommandEnd {
public CoinsCommandMap(CommandMap parent) { public CoinsCommandMap(CommandMap parent) {

2
src/main/java/net/Indyuce/mmocore/command/rpg/NoteCommandMap.java
View File

@ -8,10 +8,10 @@ import org.bukkit.command.CommandSender;
import org.bukkit.entity.Player; import org.bukkit.entity.Player;
import net.Indyuce.mmocore.api.util.item.CurrencyItem; import net.Indyuce.mmocore.api.util.item.CurrencyItem;
import net.Indyuce.mmocore.api.util.item.SmartGive;
import net.Indyuce.mmocore.command.api.CommandEnd; import net.Indyuce.mmocore.command.api.CommandEnd;
import net.Indyuce.mmocore.command.api.CommandMap; import net.Indyuce.mmocore.command.api.CommandMap;
import net.Indyuce.mmocore.command.api.Parameter; import net.Indyuce.mmocore.command.api.Parameter;
import net.mmogroup.mmolib.api.util.SmartGive;
public class NoteCommandMap extends CommandEnd { public class NoteCommandMap extends CommandEnd {
public NoteCommandMap(CommandMap parent) { public NoteCommandMap(CommandMap parent) {

2
src/main/java/net/Indyuce/mmocore/gui/eco/DepositMenu.java
View File

@ -13,9 +13,9 @@ import org.bukkit.scheduler.BukkitRunnable;
import net.Indyuce.mmocore.MMOCore; import net.Indyuce.mmocore.MMOCore;
import net.Indyuce.mmocore.api.util.MMOCoreUtils; import net.Indyuce.mmocore.api.util.MMOCoreUtils;
import net.Indyuce.mmocore.api.util.item.ConfigItem; import net.Indyuce.mmocore.api.util.item.ConfigItem;
import net.Indyuce.mmocore.api.util.item.SmartGive;
import net.Indyuce.mmocore.gui.api.PluginInventory; import net.Indyuce.mmocore.gui.api.PluginInventory;
import net.mmogroup.mmolib.api.item.NBTItem; import net.mmogroup.mmolib.api.item.NBTItem;
import net.mmogroup.mmolib.api.util.SmartGive;
public class DepositMenu extends PluginInventory { public class DepositMenu extends PluginInventory {
private ItemStack depositItem; private ItemStack depositItem;