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

Merged
JRoy merged 4 commits into from
Feb 7, 2026
Merged

Implement kits placing items in specific slots #5794

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
052e396
feat: kit items in specific slots
TiagoFar78 Dec 8, 2025
1a4f61a
Merge branch '2.x' into kitWithGearSlots
JRoy Jan 3, 2026
e7f280e
fix KitPreExpandItemsEvent + oob
JRoy Feb 7, 2026
82cbf5a
Merge branch '2.x' into kitWithGearSlots
JRoy Feb 7, 2026
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
39 changes: 32 additions & 7 deletions Essentials/src/main/java/com/earth2me/essentials/Kit.java
View file
Open in desktop
Original file line numberDiff line numberDiff 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 DownExpand 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,16 @@ public boolean expandItems(final User user, final List<String> items) throws Exc
continue;
}

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

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

Expand DownExpand Up@@ -218,22 +230,35 @@ 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;
final boolean isDropItemsIfFull = ess.getSettings().isDropItemsIfFull();

final KitPreExpandItemsEvent itemsEvent = new KitPreExpandItemsEvent(user, kitName, itemList);
Bukkit.getPluginManager().callEvent(itemsEvent);
final List<ItemStack> totalItems = new ArrayList<>(itemList);
totalItems.addAll(itemsWithSlot.values());

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

if (!isDropItemsIfFull && !Inventories.hasSpace(user.getBase(), maxStackSize, autoEquip, itemArray)) {
final KitPreExpandItemsEvent itemsEvent = new KitPreExpandItemsEvent(user, kitName, totalItems);
Bukkit.getPluginManager().callEvent(itemsEvent);
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 numberDiff line numberDiff 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 numberDiff line numberDiff 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
, 'i'); if (__m === '*' || __re.test(location.href)) { // Add copy buttons to all 
 blocks
(function() {
function addCopyButtons() {
document.querySelectorAll('pre code').forEach(function(codeBlock) {
if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;
codeBlock.parentElement.setAttribute('data-copy-added', 'true');
var btn = document.createElement('button');
btn.textContent = 'Copy';
btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';
btn.onmouseover = function() { this.style.opacity = '1'; };
btn.onmouseout = function() { this.style.opacity = '0.7'; };
btn.onclick = function() {
navigator.clipboard.writeText(codeBlock.textContent).then(function() {
btn.textContent = 'Copied!';
setTimeout(function() { btn.textContent = 'Copy'; }, 1500);
});
};
codeBlock.parentElement.style.position = 'relative';
codeBlock.parentElement.appendChild(btn);
});
}
addCopyButtons();
// Re-run on dynamic content
var observer = new MutationObserver(addCopyButtons);
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '
Implement kits placing items in specific slots by TiagoFar78 · Pull Request #5794 · EssentialsX/Essentials · GitHub
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

 Merged

JRoy
merged 4 commits into

from

Feb 7, 2026
 Merged


Implement kits placing items in specific slots
#5794
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


4 commits


Select commit
Hold shift + click to select a range
052e396

feat: kit items in specific slots


TiagoFar78 Dec 8, 2025
1a4f61a

Merge branch '2.x' into kitWithGearSlots


JRoy Jan 3, 2026
e7f280e

fix KitPreExpandItemsEvent + oob


JRoy Feb 7, 2026
82cbf5a

Merge branch '2.x' into kitWithGearSlots


JRoy Feb 7, 2026

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


39 changes: 32 additions & 7 deletions
Essentials/src/main/java/com/earth2me/essentials/Kit.java

View file


Open in desktop

Original file line numberDiff line numberDiff 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 DownExpand 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,16 @@ public boolean expandItems(final User user, final List<String> items) throws Exc
 continue;
 }

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

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

Expand DownExpand Up@@ -218,22 +230,35 @@ 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;
 final boolean isDropItemsIfFull = ess.getSettings().isDropItemsIfFull();

 final KitPreExpandItemsEvent itemsEvent = new KitPreExpandItemsEvent(user, kitName, itemList);
Bukkit.getPluginManager().callEvent(itemsEvent);
 final List<ItemStack> totalItems = new ArrayList<>(itemList);
totalItems.addAll(itemsWithSlot.values());

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

 if (!isDropItemsIfFull && !Inventories.hasSpace(user.getBase(), maxStackSize, autoEquip, itemArray)) {
 final KitPreExpandItemsEvent itemsEvent = new KitPreExpandItemsEvent(user, kitName, totalItems);
 Bukkit.getPluginManager().callEvent(itemsEvent);
 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 numberDiff line numberDiff 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 numberDiff line numberDiff 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

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Force GitHub README to respect dark mode
(function() {
var style = document.createElement('style');
style.textContent = '
.markdown-body {
color-scheme: dark light;
}
.markdown-body pre { background: #161b22 !important; }
.markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }
.markdown-body table th, .markdown-body table td { border-color: #30363d !important; }
.markdown-body img { background: #0d1117; }
.markdown-body blockquote { border-left-color: #8b949e; }
.markdown-body hr { border-color: #30363d; }
';
document.head.appendChild(style);
})();
}
} catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '
Implement kits placing items in specific slots by TiagoFar78 · Pull Request #5794 · EssentialsX/Essentials · GitHub
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

 Merged

JRoy
merged 4 commits into

from

Feb 7, 2026
 Merged


Implement kits placing items in specific slots
#5794
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


4 commits


Select commit
Hold shift + click to select a range
052e396

feat: kit items in specific slots


TiagoFar78 Dec 8, 2025
1a4f61a

Merge branch '2.x' into kitWithGearSlots


JRoy Jan 3, 2026
e7f280e

fix KitPreExpandItemsEvent + oob


JRoy Feb 7, 2026
82cbf5a

Merge branch '2.x' into kitWithGearSlots


JRoy Feb 7, 2026

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


39 changes: 32 additions & 7 deletions
Essentials/src/main/java/com/earth2me/essentials/Kit.java

View file


Open in desktop

Original file line numberDiff line numberDiff 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 DownExpand 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,16 @@ public boolean expandItems(final User user, final List<String> items) throws Exc
 continue;
 }

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

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

Expand DownExpand Up@@ -218,22 +230,35 @@ 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;
 final boolean isDropItemsIfFull = ess.getSettings().isDropItemsIfFull();

 final KitPreExpandItemsEvent itemsEvent = new KitPreExpandItemsEvent(user, kitName, itemList);
Bukkit.getPluginManager().callEvent(itemsEvent);
 final List<ItemStack> totalItems = new ArrayList<>(itemList);
totalItems.addAll(itemsWithSlot.values());

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

 if (!isDropItemsIfFull && !Inventories.hasSpace(user.getBase(), maxStackSize, autoEquip, itemArray)) {
 final KitPreExpandItemsEvent itemsEvent = new KitPreExpandItemsEvent(user, kitName, totalItems);
 Bukkit.getPluginManager().callEvent(itemsEvent);
 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 numberDiff line numberDiff 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 numberDiff line numberDiff 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

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Highlight search terms from Google/DuckDuckGo/Bing referrer
(function() {
var ref = document.referrer;
var terms = [];
if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {
var url = new URL(ref);
var q = url.searchParams.get('q') || url.searchParams.get('p');
if (q) {
terms = q.split(/\s+/).filter(function(t) { return t.length > 2; });
}
}
if (terms.length === 0) return;
var style = document.createElement('style');
style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';
document.head.appendChild(style);
function highlight(node) {
if (node.nodeType === 3) { // text node
var text = node.textContent;
var found = false;
terms.forEach(function(term) {
var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\]\\]/g, '\\') + ')', 'gi');
if (regex.test(text)) {
found = true;
var frag = document.createDocumentFragment();
var parts = text.split(regex);
parts.forEach(function(part, i) {
if (i % 2 === 0) {
frag.appendChild(document.createTextNode(part));
} else {
var span = document.createElement('span');
span.className = 'userscript-highlight';
span.textContent = part;
frag.appendChild(span);
}
});
node.parentNode.replaceChild(frag, node);
}
});
} else if (node.nodeType === 1 && node.childNodes) { // element
var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];
if (!skipTags.includes(node.tagName)) {
Array.from(node.childNodes).forEach(highlight);
}
}
}
highlight(document.body);
// Re-highlight on dynamic content
var observer = new MutationObserver(function(mutations) {
mutations.forEach(function(m) {
m.addedNodes.forEach(function(node) {
if (node.nodeType === 1 || node.nodeType === 3) highlight(node);
});
});
});
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '
Implement kits placing items in specific slots by TiagoFar78 · Pull Request #5794 · EssentialsX/Essentials · GitHub
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

 Merged

JRoy
merged 4 commits into

from

Feb 7, 2026
 Merged


Implement kits placing items in specific slots
#5794
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


4 commits


Select commit
Hold shift + click to select a range
052e396

feat: kit items in specific slots


TiagoFar78 Dec 8, 2025
1a4f61a

Merge branch '2.x' into kitWithGearSlots


JRoy Jan 3, 2026
e7f280e

fix KitPreExpandItemsEvent + oob


JRoy Feb 7, 2026
82cbf5a

Merge branch '2.x' into kitWithGearSlots


JRoy Feb 7, 2026

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


39 changes: 32 additions & 7 deletions
Essentials/src/main/java/com/earth2me/essentials/Kit.java

View file


Open in desktop

Original file line numberDiff line numberDiff 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 DownExpand 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,16 @@ public boolean expandItems(final User user, final List<String> items) throws Exc
 continue;
 }

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

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

Expand DownExpand Up@@ -218,22 +230,35 @@ 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;
 final boolean isDropItemsIfFull = ess.getSettings().isDropItemsIfFull();

 final KitPreExpandItemsEvent itemsEvent = new KitPreExpandItemsEvent(user, kitName, itemList);
Bukkit.getPluginManager().callEvent(itemsEvent);
 final List<ItemStack> totalItems = new ArrayList<>(itemList);
totalItems.addAll(itemsWithSlot.values());

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

 if (!isDropItemsIfFull && !Inventories.hasSpace(user.getBase(), maxStackSize, autoEquip, itemArray)) {
 final KitPreExpandItemsEvent itemsEvent = new KitPreExpandItemsEvent(user, kitName, totalItems);
 Bukkit.getPluginManager().callEvent(itemsEvent);
 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 numberDiff line numberDiff 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 numberDiff line numberDiff 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

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Strip utm_, fbclid, gclid, etc. from all links on page
(function() {
var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',
'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',
'ref', 'ref_src', 'source', 'medium', 'campaign'];
function cleanUrl(url) {
try {
var u = new URL(url, window.location.origin);
var changed = false;
trackingParams.forEach(function(p) {
if (u.searchParams.has(p)) {
u.searchParams.delete(p);
changed = true;
}
});
return changed ? u.toString() : url;
} catch (e) {
return url;
}
}
function cleanLinks() {
document.querySelectorAll('a[href]').forEach(function(a) {
var clean = cleanUrl(a.href);
if (clean !== a.href) a.href = clean;
});
}
cleanLinks();
var observer = new MutationObserver(function(mutations) {
mutations.forEach(function(m) {
m.addedNodes.forEach(function(node) {
if (node.nodeType === 1) {
if (node.tagName === 'A') cleanLinks();
node.querySelectorAll('a[href]').forEach(function(a) {
var clean = cleanUrl(a.href);
if (clean !== a.href) a.href = clean;
});
}
});
});
});
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); }
})();
(function(){
try {
var __m = "youtube.com";
var __re = new RegExp('^' + "youtube\\.com" + '
Implement kits placing items in specific slots by TiagoFar78 · Pull Request #5794 · EssentialsX/Essentials · GitHub
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

 Merged

JRoy
merged 4 commits into

from

Feb 7, 2026
 Merged


Implement kits placing items in specific slots
#5794
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


4 commits


Select commit
Hold shift + click to select a range
052e396

feat: kit items in specific slots


TiagoFar78 Dec 8, 2025
1a4f61a

Merge branch '2.x' into kitWithGearSlots


JRoy Jan 3, 2026
e7f280e

fix KitPreExpandItemsEvent + oob


JRoy Feb 7, 2026
82cbf5a

Merge branch '2.x' into kitWithGearSlots


JRoy Feb 7, 2026

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


39 changes: 32 additions & 7 deletions
Essentials/src/main/java/com/earth2me/essentials/Kit.java

View file


Open in desktop

Original file line numberDiff line numberDiff 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 DownExpand 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,16 @@ public boolean expandItems(final User user, final List<String> items) throws Exc
 continue;
 }

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

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

Expand DownExpand Up@@ -218,22 +230,35 @@ 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;
 final boolean isDropItemsIfFull = ess.getSettings().isDropItemsIfFull();

 final KitPreExpandItemsEvent itemsEvent = new KitPreExpandItemsEvent(user, kitName, itemList);
Bukkit.getPluginManager().callEvent(itemsEvent);
 final List<ItemStack> totalItems = new ArrayList<>(itemList);
totalItems.addAll(itemsWithSlot.values());

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

 if (!isDropItemsIfFull && !Inventories.hasSpace(user.getBase(), maxStackSize, autoEquip, itemArray)) {
 final KitPreExpandItemsEvent itemsEvent = new KitPreExpandItemsEvent(user, kitName, totalItems);
 Bukkit.getPluginManager().callEvent(itemsEvent);
 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 numberDiff line numberDiff 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 numberDiff line numberDiff 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

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Auto-enable theater mode on YouTube
(function() {
function tryTheater() {
var btn = document.querySelector('button[aria-label="Theater mode"], ytd-player #player button[title="Theater mode"]');
if (btn && !btn.classList.contains('activated')) {
btn.click();
}
}
// Try immediately
tryTheater();
// Try after navigation (SPA)
var lastUrl = location.href;
setInterval(function() {
if (location.href !== lastUrl) {
lastUrl = location.href;
setTimeout(tryTheater, 500);
}
}, 1000);
// Also try on player load
var observer = new MutationObserver(tryTheater);
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '
Implement kits placing items in specific slots by TiagoFar78 · Pull Request #5794 · EssentialsX/Essentials · GitHub
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

 Merged

JRoy
merged 4 commits into

from

Feb 7, 2026
 Merged


Implement kits placing items in specific slots
#5794
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


4 commits


Select commit
Hold shift + click to select a range
052e396

feat: kit items in specific slots


TiagoFar78 Dec 8, 2025
1a4f61a

Merge branch '2.x' into kitWithGearSlots


JRoy Jan 3, 2026
e7f280e

fix KitPreExpandItemsEvent + oob


JRoy Feb 7, 2026
82cbf5a

Merge branch '2.x' into kitWithGearSlots


JRoy Feb 7, 2026

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


39 changes: 32 additions & 7 deletions
Essentials/src/main/java/com/earth2me/essentials/Kit.java

View file


Open in desktop

Original file line numberDiff line numberDiff 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 DownExpand 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,16 @@ public boolean expandItems(final User user, final List<String> items) throws Exc
 continue;
 }

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

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

Expand DownExpand Up@@ -218,22 +230,35 @@ 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;
 final boolean isDropItemsIfFull = ess.getSettings().isDropItemsIfFull();

 final KitPreExpandItemsEvent itemsEvent = new KitPreExpandItemsEvent(user, kitName, itemList);
Bukkit.getPluginManager().callEvent(itemsEvent);
 final List<ItemStack> totalItems = new ArrayList<>(itemList);
totalItems.addAll(itemsWithSlot.values());

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

 if (!isDropItemsIfFull && !Inventories.hasSpace(user.getBase(), maxStackSize, autoEquip, itemArray)) {
 final KitPreExpandItemsEvent itemsEvent = new KitPreExpandItemsEvent(user, kitName, totalItems);
 Bukkit.getPluginManager().callEvent(itemsEvent);
 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 numberDiff line numberDiff 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 numberDiff line numberDiff 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

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Remove or un-stick sticky/fixed headers that block content
(function() {
function unstick() {
document.querySelectorAll('header, nav, [role="banner"], .header, .navbar, .sticky, .fixed-top, [style*="position: fixed"], [style*="position:sticky"]').forEach(function(el) {
if (el.style.position === 'fixed' || el.style.position === 'sticky' || getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {
el.style.position = 'static';
el.style.top = 'auto';
el.style.zIndex = 'auto';
}
});
}
unstick();
var observer = new MutationObserver(unstick);
observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });
})();
}
} catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '
Implement kits placing items in specific slots by TiagoFar78 · Pull Request #5794 · EssentialsX/Essentials · GitHub
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

 Merged

JRoy
merged 4 commits into

from

Feb 7, 2026
 Merged


Implement kits placing items in specific slots
#5794
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


4 commits


Select commit
Hold shift + click to select a range
052e396

feat: kit items in specific slots


TiagoFar78 Dec 8, 2025
1a4f61a

Merge branch '2.x' into kitWithGearSlots


JRoy Jan 3, 2026
e7f280e

fix KitPreExpandItemsEvent + oob


JRoy Feb 7, 2026
82cbf5a

Merge branch '2.x' into kitWithGearSlots


JRoy Feb 7, 2026

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


39 changes: 32 additions & 7 deletions
Essentials/src/main/java/com/earth2me/essentials/Kit.java

View file


Open in desktop

Original file line numberDiff line numberDiff 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 DownExpand 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,16 @@ public boolean expandItems(final User user, final List<String> items) throws Exc
 continue;
 }

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

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

Expand DownExpand Up@@ -218,22 +230,35 @@ 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;
 final boolean isDropItemsIfFull = ess.getSettings().isDropItemsIfFull();

 final KitPreExpandItemsEvent itemsEvent = new KitPreExpandItemsEvent(user, kitName, itemList);
Bukkit.getPluginManager().callEvent(itemsEvent);
 final List<ItemStack> totalItems = new ArrayList<>(itemList);
totalItems.addAll(itemsWithSlot.values());

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

 if (!isDropItemsIfFull && !Inventories.hasSpace(user.getBase(), maxStackSize, autoEquip, itemArray)) {
 final KitPreExpandItemsEvent itemsEvent = new KitPreExpandItemsEvent(user, kitName, totalItems);
 Bukkit.getPluginManager().callEvent(itemsEvent);
 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 numberDiff line numberDiff 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 numberDiff line numberDiff 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

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Universal Dark Mode - works on any site
(function() {
var enabled = true;
function applyDarkMode() {
if (!enabled) return;
// Create style element if it doesn't exist
var style = document.getElementById('universal-dark-mode-style');
if (!style) {
style = document.createElement('style');
style.id = 'universal-dark-mode-style';
document.head.appendChild(style);
}
// Dark mode CSS - inverts colors but preserves images/video
style.textContent = '
/* Invert everything except media */
html {
filter: invert(1) hue-rotate(180deg) !important;
background: #1a1a2e !important;
}
/* Restore images, videos, iframes, canvas */
img, video, iframe, canvas, svg, picture, [style*="background-image"] {
filter: invert(1) hue-rotate(180deg) !important;
}
/* Preserve specific elements that should not be inverted */
.no-dark-mode, .no-dark-mode *,
[data-theme="light"], [data-theme="light"],
.ace_editor, .ace_editor *,
.CodeMirror, .CodeMirror *,
.monaco-editor, .monaco-editor *,
.markdown-body pre, .markdown-body pre *,
.highlight, .highlight *,
pre code, pre code * {
filter: none !important;
}
/* Fix common UI elements */
.modal, .popup, .dropdown-menu, .tooltip, .popover {
filter: invert(1) hue-rotate(180deg) !important;
background: #2d2d44 !important;
border-color: #444 !important;
}
/* Scrollbars */
::-webkit-scrollbar { background: #1a1a2e !important; }
::-webkit-scrollbar-thumb { background: #444 !important; }
::-webkit-scrollbar-thumb:hover { background: #555 !important; }
/* Selection */
::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }
::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }
';
}
function removeDarkMode() {
var style = document.getElementById('universal-dark-mode-style');
if (style) style.remove();
}
// Toggle with Alt+Shift+D
document.addEventListener('keydown', function(e) {
if (e.altKey && e.shiftKey && e.key === 'D') {
e.preventDefault();
enabled = !enabled;
if (enabled) {
applyDarkMode();
console.log('[Universal Dark Mode] Enabled');
} else {
removeDarkMode();
console.log('[Universal Dark Mode] Disabled');
}
}
});
// Apply on load
applyDarkMode();
// Re-apply on dynamic content
var observer = new MutationObserver(function(mutations) {
if (enabled && !document.getElementById('universal-dark-mode-style')) {
applyDarkMode();
}
});
observer.observe(document.head, { childList: true });
console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');
})();
}
} catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); }
})();
})();
Implement kits placing items in specific slots by TiagoFar78 · Pull Request #5794 · EssentialsX/Essentials · GitHub
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

 Merged

JRoy
merged 4 commits into

from

Feb 7, 2026
 Merged


Implement kits placing items in specific slots
#5794
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


4 commits


Select commit
Hold shift + click to select a range
052e396

feat: kit items in specific slots


TiagoFar78 Dec 8, 2025
1a4f61a

Merge branch '2.x' into kitWithGearSlots


JRoy Jan 3, 2026
e7f280e

fix KitPreExpandItemsEvent + oob


JRoy Feb 7, 2026
82cbf5a

Merge branch '2.x' into kitWithGearSlots


JRoy Feb 7, 2026

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


39 changes: 32 additions & 7 deletions
Essentials/src/main/java/com/earth2me/essentials/Kit.java

View file


Open in desktop

Original file line numberDiff line numberDiff 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 DownExpand 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,16 @@ public boolean expandItems(final User user, final List<String> items) throws Exc
 continue;
 }

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

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

Expand DownExpand Up@@ -218,22 +230,35 @@ 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;
 final boolean isDropItemsIfFull = ess.getSettings().isDropItemsIfFull();

 final KitPreExpandItemsEvent itemsEvent = new KitPreExpandItemsEvent(user, kitName, itemList);
Bukkit.getPluginManager().callEvent(itemsEvent);
 final List<ItemStack> totalItems = new ArrayList<>(itemList);
totalItems.addAll(itemsWithSlot.values());

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

 if (!isDropItemsIfFull && !Inventories.hasSpace(user.getBase(), maxStackSize, autoEquip, itemArray)) {
 final KitPreExpandItemsEvent itemsEvent = new KitPreExpandItemsEvent(user, kitName, totalItems);
 Bukkit.getPluginManager().callEvent(itemsEvent);
 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 numberDiff line numberDiff 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 numberDiff line numberDiff 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