From b486ea27448fd37cc8b77661d47d1820f1d4779d Mon Sep 17 00:00:00 2001 From: GDCloud <93287602+GDCloudstrike@users.noreply.github.com> Date: Tue, 2 Apr 2024 00:19:36 +0200 Subject: [PATCH] Allow stacks of essence berries to be consumed at once (#114) * consume stacks at once * address review --- .../tconstruct/world/items/OreBerries.java | 25 +++++++++++++------ 1 file changed, 17 insertions(+), 8 deletions(-) diff --git a/src/main/java/tconstruct/world/items/OreBerries.java b/src/main/java/tconstruct/world/items/OreBerries.java index 2f59541a..6111765d 100644 --- a/src/main/java/tconstruct/world/items/OreBerries.java +++ b/src/main/java/tconstruct/world/items/OreBerries.java @@ -52,14 +52,23 @@ public class OreBerries extends CraftingItem { @Override public ItemStack onItemRightClick(ItemStack stack, World world, EntityPlayer player) { if (stack.getItemDamage() == 5) { - EntityXPOrb entity = new EntityXPOrb( - world, - player.posX, - player.posY + 1, - player.posZ, - itemRand.nextInt(14) + 6); - spawnEntity(player.posX, player.posY + 1, player.posZ, entity, world, player); - if (!player.capabilities.isCreativeMode) stack.stackSize--; + if (!player.isSneaking()) { + EntityXPOrb entity = new EntityXPOrb( + world, + player.posX, + player.posY + 1, + player.posZ, + itemRand.nextInt(14) + 6); + spawnEntity(player.posX, player.posY + 1, player.posZ, entity, world, player); + if (!player.capabilities.isCreativeMode) stack.stackSize--; + } else { + int xpToAdd = 0; + for (int i = stack.stackSize; i > 0; i--) { + xpToAdd += itemRand.nextInt(14) + 6; + } + player.addExperience(xpToAdd); + if (!player.capabilities.isCreativeMode) stack.stackSize = 0; + } } return stack; }