Upstream/Minestom
1
0
Fork 0
mirror of https://github.com/Minestom/Minestom.git synced 2024-11-16 15:45:21 +01:00
Code Issues Projects Releases Wiki Activity

Reduce code duplication

Browse Source
This commit is contained in:
themode 2021-04-03 00:03:36 +02:00
parent d3fb364a7a
commit 9abbef35ae
4 changed files with 66 additions and 52 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
src/main/java/net/minestom/server/inventory/Inventory.java
View File

@ -10,7 +10,6 @@ import net.minestom.server.inventory.click.InventoryClickProcessor;
import net.minestom.server.inventory.click.InventoryClickResult;
import net.minestom.server.inventory.condition.InventoryCondition;
import net.minestom.server.item.ItemStack;
import net.minestom.server.item.StackingRule;
import net.minestom.server.network.packet.server.play.OpenWindowPacket;
import net.minestom.server.network.packet.server.play.SetSlotPacket;
import net.minestom.server.network.packet.server.play.WindowItemsPacket;
@ -149,30 +148,14 @@ public class Inventory implements InventoryModifier, InventoryClickHandler, View
@Override
public synchronized boolean addItemStack(@NotNull ItemStack itemStack) {
final StackingRule stackingRule = itemStack.getStackingRule();
for (int i = 0; i < getSize(); i++) {
ItemStack item = getItemStack(i);
final StackingRule itemStackingRule = item.getStackingRule();
if (itemStackingRule.canBeStacked(itemStack, item)) {
final int itemAmount = itemStackingRule.getAmount(item);
if (itemAmount == stackingRule.getMaxSize())
continue;
final int itemStackAmount = itemStackingRule.getAmount(itemStack);
final int totalAmount = itemStackAmount + itemAmount;
if (!stackingRule.canApply(itemStack, totalAmount)) {
item = itemStackingRule.apply(item, itemStackingRule.getMaxSize());
setItemStack(i, item);
itemStack = stackingRule.apply(itemStack, totalAmount - stackingRule.getMaxSize());
} else {
setItemStack(i, item.withAmount(totalAmount));
return true;
}
} else if (item.isAir()) {
setItemStack(i, itemStack);
return true;
}
}
return false;
// Make the method synchronized
return InventoryModifier.super.addItemStack(itemStack);
}
@Override
public synchronized boolean addItemStack(@NotNull ItemStack itemStack, int startSlot, int endSlot) {
// Make the method synchronized
return InventoryModifier.super.addItemStack(itemStack, startSlot, endSlot);
}
@Override

47
src/main/java/net/minestom/server/inventory/InventoryModifier.java
View File

@ -1,7 +1,10 @@
package net.minestom.server.inventory;
import it.unimi.dsi.fastutil.ints.Int2ObjectMap;
import it.unimi.dsi.fastutil.ints.Int2ObjectOpenHashMap;
import net.minestom.server.inventory.condition.InventoryCondition;
import net.minestom.server.item.ItemStack;
import net.minestom.server.item.StackingRule;
import net.minestom.server.utils.validate.Check;
import org.jetbrains.annotations.NotNull;
@ -28,7 +31,49 @@ public interface InventoryModifier {
* @param itemStack the item to add
* @return true if the item has been successfully fully added, false otherwise
*/
boolean addItemStack(@NotNull ItemStack itemStack);
default boolean addItemStack(@NotNull ItemStack itemStack) {
return addItemStack(itemStack, 0, getSize());
}
default boolean addItemStack(@NotNull ItemStack itemStack, int startSlot, int endSlot) {
Int2ObjectMap<ItemStack> itemChangesMap = new Int2ObjectOpenHashMap<>();
final StackingRule stackingRule = itemStack.getStackingRule();
for (int i = startSlot; i < endSlot; i++) {
ItemStack inventoryItem = getItemStack(i);
if (stackingRule.canBeStacked(itemStack, inventoryItem)) {
final int itemAmount = stackingRule.getAmount(inventoryItem);
if (itemAmount == stackingRule.getMaxSize())
continue;
final int itemStackAmount = stackingRule.getAmount(itemStack);
final int totalAmount = itemStackAmount + itemAmount;
if (!stackingRule.canApply(itemStack, totalAmount)) {
// Slot cannot accept the whole item, reduce amount to 'itemStack'
itemChangesMap.put(i, stackingRule.apply(inventoryItem, stackingRule.getMaxSize()));
itemStack = stackingRule.apply(itemStack, totalAmount - stackingRule.getMaxSize());
} else {
// Slot can accept the whole item
itemChangesMap.put(i, inventoryItem.withAmount(totalAmount));
itemStack = ItemStack.AIR;
break;
}
} else if (inventoryItem.isAir()) {
// Fill the slot
itemChangesMap.put(i, itemStack);
itemStack = ItemStack.AIR;
break;
}
}
if (itemStack.isAir()) {
// Item can be fully placed inside the inventory, do so
itemChangesMap.forEach(this::setItemStack);
return true;
} else {
// Inventory cannot accept the item fully
return false;
}
}
/**
* Clears the inventory and send relevant update to the viewer(s).

36
src/main/java/net/minestom/server/inventory/PlayerInventory.java
View File

@ -12,7 +12,6 @@ import net.minestom.server.inventory.click.InventoryClickProcessor;
import net.minestom.server.inventory.click.InventoryClickResult;
import net.minestom.server.inventory.condition.InventoryCondition;
import net.minestom.server.item.ItemStack;
import net.minestom.server.item.StackingRule;
import net.minestom.server.network.packet.server.play.EntityEquipmentPacket;
import net.minestom.server.network.packet.server.play.SetSlotPacket;
import net.minestom.server.network.packet.server.play.WindowItemsPacket;
@ -93,31 +92,18 @@ public class PlayerInventory implements InventoryModifier, InventoryClickHandler
return false;
itemStack = addItemStackEvent.getItemStack();
return InventoryModifier.super.addItemStack(itemStack, 0, getSize() - 10);
}
final StackingRule stackingRule = itemStack.getStackingRule();
for (int i = 0; i < items.length - 10; i++) {
ItemStack item = items[i];
final StackingRule itemStackingRule = item.getStackingRule();
if (itemStackingRule.canBeStacked(itemStack, item)) {
final int itemAmount = itemStackingRule.getAmount(item);
if (itemAmount == stackingRule.getMaxSize())
continue;
final int itemStackAmount = itemStackingRule.getAmount(itemStack);
final int totalAmount = itemStackAmount + itemAmount;
if (!stackingRule.canApply(itemStack, totalAmount)) {
item = itemStackingRule.apply(item, itemStackingRule.getMaxSize());
setItemStack(i, item);
itemStack = stackingRule.apply(itemStack, totalAmount - stackingRule.getMaxSize());
} else {
setItemStack(i, item.withAmount(totalAmount));
return true;
}
} else if (item.isAir()) {
safeItemInsert(i, itemStack);
return true;
}
}
return false;
@Override
public synchronized boolean addItemStack(@NotNull ItemStack itemStack, int startSlot, int endSlot) {
PlayerAddItemStackEvent addItemStackEvent = new PlayerAddItemStackEvent(player, itemStack);
player.callEvent(PlayerAddItemStackEvent.class, addItemStackEvent);
if (addItemStackEvent.isCancelled())
return false;
itemStack = addItemStackEvent.getItemStack();
return InventoryModifier.super.addItemStack(itemStack, startSlot, endSlot);
}
@Override

2
src/main/java/net/minestom/server/item/ItemStack.java
View File

@ -128,7 +128,7 @@ public class ItemStack {
@Contract(pure = true)
public boolean isAir() {
return equals(AIR);
return material.equals(Material.AIR);
}
@Contract(pure = true)