Skip to content

Implement kits placing items in specific slots #5794

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
TiagoFar78 wants to merge 1 commit into
base: 2.x
Choose a base branch
from
Open

Implement kits placing items in specific slots #5794

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
32 changes: 27 additions & 5 deletions Essentials/src/main/java/com/earth2me/essentials/Kit.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@
import java.util.GregorianCalendar;
import java.util.List;
import java.util.Map;
import java.util.HashMap;
import java.util.logging.Level;

import static com.earth2me.essentials.I18n.tlLiteral;
Expand Down Expand Up @@ -174,10 +175,11 @@ public boolean expandItems(final User user, final List<String> items) throws Exc
final boolean allowUnsafe = ess.getSettings().allowUnsafeEnchantments();
final boolean autoEquip = ess.getSettings().isKitAutoEquip();
final List<ItemStack> itemList = new ArrayList<>();
final Map<Integer, ItemStack> itemsWithSlot = new HashMap<>();
final List<String> commandQueue = new ArrayList<>();
final List<String> moneyQueue = new ArrayList<>();
final String currencySymbol = ess.getSettings().getCurrencySymbol().isEmpty() ? "$" : ess.getSettings().getCurrencySymbol();
for (final String kitItem : output.getLines()) {
for (String kitItem : output.getLines()) {
if (kitItem.startsWith("$") || kitItem.startsWith(currencySymbol)) {
moneyQueue.add(NumberUtil.sanitizeCurrencyString(kitItem, ess));
continue;
Expand All @@ -191,6 +193,13 @@ public boolean expandItems(final User user, final List<String> items) throws Exc
continue;
}

int itemSlot = -1;
if (kitItem.startsWith("slot:")) {
final String slotStr = kitItem.substring("slot:".length(), kitItem.indexOf(" "));
itemSlot = NumberUtil.isInt(slotStr) ? Integer.parseInt(slotStr) : -1;
kitItem = kitItem.substring(kitItem.indexOf(" ") + 1);
}

final ItemStack stack;
final SerializationProvider serializationProvider = ess.provider(SerializationProvider.class);

Expand Down Expand Up @@ -218,7 +227,11 @@ public boolean expandItems(final User user, final List<String> items) throws Exc
stack = metaStack.getItemStack();
}

itemList.add(stack);
if (itemSlot == -1 || itemsWithSlot.containsKey(itemSlot)) {
itemList.add(stack);
} else {
itemsWithSlot.put(itemSlot, stack);
}
}

final int maxStackSize = user.isAuthorized("essentials.oversizedstacks") ? ess.getSettings().getOversizedStackSize() : 0;
Expand All @@ -227,13 +240,22 @@ public boolean expandItems(final User user, final List<String> items) throws Exc
final KitPreExpandItemsEvent itemsEvent = new KitPreExpandItemsEvent(user, kitName, itemList);
Bukkit.getPluginManager().callEvent(itemsEvent);

final ItemStack[] itemArray = itemList.toArray(new ItemStack[0]);

if (!isDropItemsIfFull && !Inventories.hasSpace(user.getBase(), maxStackSize, autoEquip, itemArray)) {
final List<ItemStack> totalItems = new ArrayList<>(itemList);
totalItems.addAll(itemsWithSlot.values());
final ItemStack[] totalItemsArray = totalItems.toArray(new ItemStack[0]);
if (!isDropItemsIfFull && !Inventories.hasSpace(user.getBase(), maxStackSize, autoEquip, totalItemsArray)) {
user.sendTl("kitInvFullNoDrop");
return false;
}

for (Map.Entry<Integer, ItemStack> itemWithSlot : itemsWithSlot.entrySet()) {
final ItemStack leftover = Inventories.addItem(user.getBase(), maxStackSize, itemWithSlot.getValue(), itemWithSlot.getKey());
if (leftover != null) {
itemList.add(leftover);
}
}

final ItemStack[] itemArray = itemList.toArray(new ItemStack[0]);
final Map<Integer, ItemStack> leftover = Inventories.addItem(user.getBase(), maxStackSize, autoEquip, itemArray);
if (!isDropItemsIfFull && !leftover.isEmpty()) {
// Inventories#hasSpace should prevent this state from EVER being reached; If it does, something has gone terribly wrong, and we should just give up and hope people report it :(
Expand Down
7 changes: 4 additions & 3 deletions Essentials/src/main/java/com/earth2me/essentials/commands/Commandcreatekit.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,13 +51,14 @@ public void run(final Server server, final User user, final String commandLabel,
useSerializationProvider = false;
}

for (ItemStack is : items) {
for (int i = 0; i < items.length; i++) {
final ItemStack is = items[i];
if (is != null && is.getType() != null && is.getType() != Material.AIR) {
final String serialized;
if (useSerializationProvider) {
serialized = "@" + Base64Coder.encodeLines(serializationProvider.serializeItem(is));
serialized = "slot:" + i + " @" + Base64Coder.encodeLines(serializationProvider.serializeItem(is));
} else {
serialized = ess.getItemDb().serialize(is);
serialized = "slot:" + i + " " + ess.getItemDb().serialize(is);
}
list.add(serialized);
}
Expand Down
29 changes: 29 additions & 0 deletions Essentials/src/main/java/com/earth2me/essentials/craftbukkit/Inventories.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -142,6 +142,35 @@ public static Map<Integer, ItemStack> addItem(final Player player, final int max
return addItem(player, maxStack, false, items);
}

public static ItemStack addItem(final Player player, final int maxStack, ItemStack item, int slot) {
final int itemMax = Math.max(maxStack, item.getMaxStackSize());

ItemStack existing = player.getInventory().getItem(slot);
final int existingAmount;
if (isEmpty(existing)) {
existing = item.clone();
existingAmount = 0;
} else {
existingAmount = existing.getAmount();
}

if (!item.isSimilar(existing)) {
return item;
}

final int amount = item.getAmount();
if (amount + existingAmount <= itemMax) {
existing.setAmount(amount + existingAmount);
player.getInventory().setItem(slot, existing);
return null;
}

existing.setAmount(itemMax);
player.getInventory().setItem(slot, existing);
item.setAmount(amount + existingAmount - itemMax);
return item;
}

public static Map<Integer, ItemStack> addItem(final Player player, final int maxStack, final boolean allowArmor, ItemStack... items) {
items = normalizeItems(cloneItems(items));
final Map<Integer, ItemStack> leftover = new HashMap<>();
Expand Down
Loading