mirror of
https://github.com/GTNewHorizons/Botania.git
synced 2026-11-19 03:39:17 +00:00
More assorted stack fixes and cleanups
This commit is contained in:
21 files changed
+46
-85
No files matched your search
@@ -45,6 +45,7 @@ import net.minecraftforge.fluids.capability.IFluidHandlerItem;
|
||||
import net.minecraftforge.fml.common.registry.GameRegistry;
|
||||
import net.minecraftforge.fml.relauncher.Side;
|
||||
import net.minecraftforge.fml.relauncher.SideOnly;
|
||||
import net.minecraftforge.items.ItemHandlerHelper;
|
||||
import vazkii.botania.api.internal.VanillaPacketDispatcher;
|
||||
import vazkii.botania.api.lexicon.ILexiconable;
|
||||
import vazkii.botania.api.lexicon.LexiconEntry;
|
||||
@@ -192,8 +193,7 @@ public class BlockAltar extends BlockMod implements ILexiconable {
|
||||
if(stack.getCount() == 1)
|
||||
player.setHeldItem(hand, bucket);
|
||||
else {
|
||||
if(!player.inventory.addItemStackToInventory(bucket))
|
||||
player.dropItem(bucket, false);
|
||||
ItemHandlerHelper.giveItemToPlayer(player, bucket);
|
||||
stack.shrink(1);
|
||||
}
|
||||
|
||||
|
||||
@@ -33,6 +33,7 @@ import net.minecraftforge.client.ForgeHooksClient;
|
||||
import net.minecraftforge.client.model.ModelLoader;
|
||||
import net.minecraftforge.fml.relauncher.Side;
|
||||
import net.minecraftforge.fml.relauncher.SideOnly;
|
||||
import net.minecraftforge.items.ItemHandlerHelper;
|
||||
import vazkii.botania.api.item.IAvatarWieldable;
|
||||
import vazkii.botania.api.lexicon.ILexiconable;
|
||||
import vazkii.botania.api.lexicon.LexiconEntry;
|
||||
@@ -94,15 +95,11 @@ public class BlockAvatar extends BlockMod implements ILexiconable {
|
||||
ItemStack stackOnAvatar = avatar.getItemHandler().getStackInSlot(0);
|
||||
ItemStack stackOnPlayer = player.getHeldItem(hand);
|
||||
if(!stackOnAvatar.isEmpty()) {
|
||||
ItemStack copyStack = stackOnAvatar.copy();
|
||||
avatar.getItemHandler().setStackInSlot(0, ItemStack.EMPTY);
|
||||
if(!player.inventory.addItemStackToInventory(copyStack))
|
||||
player.dropItem(copyStack, true);
|
||||
ItemHandlerHelper.giveItemToPlayer(player, stackOnAvatar);
|
||||
return true;
|
||||
} else if(!stackOnPlayer.isEmpty() && stackOnPlayer.getItem() instanceof IAvatarWieldable) {
|
||||
ItemStack copyStack = stackOnPlayer.copy();
|
||||
avatar.getItemHandler().setStackInSlot(0, copyStack);
|
||||
stackOnPlayer.shrink(1);
|
||||
avatar.getItemHandler().setStackInSlot(0, stackOnPlayer.splitStack(1));
|
||||
return true;
|
||||
}
|
||||
|
||||
|
||||
@@ -37,6 +37,7 @@ import net.minecraftforge.client.ForgeHooksClient;
|
||||
import net.minecraftforge.client.model.ModelLoader;
|
||||
import net.minecraftforge.fml.relauncher.Side;
|
||||
import net.minecraftforge.fml.relauncher.SideOnly;
|
||||
import net.minecraftforge.items.ItemHandlerHelper;
|
||||
import vazkii.botania.api.internal.IManaBurst;
|
||||
import vazkii.botania.api.lexicon.ILexiconable;
|
||||
import vazkii.botania.api.lexicon.LexiconEntry;
|
||||
@@ -110,9 +111,7 @@ public class BlockHourglass extends BlockMod implements IManaTrigger, IWandable,
|
||||
stack.setCount(0);
|
||||
return true;
|
||||
} else if(!hgStack.isEmpty()) {
|
||||
ItemStack copy = hgStack.copy();
|
||||
if(!player.inventory.addItemStackToInventory(copy))
|
||||
player.dropItem(copy, false);
|
||||
ItemHandlerHelper.giveItemToPlayer(player, hgStack);
|
||||
hourglass.getItemHandler().setStackInSlot(0, ItemStack.EMPTY);
|
||||
hourglass.markDirty();
|
||||
return true;
|
||||
|
||||
@@ -27,6 +27,7 @@ import net.minecraft.util.math.AxisAlignedBB;
|
||||
import net.minecraft.util.math.BlockPos;
|
||||
import net.minecraft.world.IBlockAccess;
|
||||
import net.minecraft.world.World;
|
||||
import net.minecraftforge.items.ItemHandlerHelper;
|
||||
import vazkii.botania.api.internal.VanillaPacketDispatcher;
|
||||
import vazkii.botania.api.lexicon.ILexiconable;
|
||||
import vazkii.botania.api.lexicon.LexiconEntry;
|
||||
@@ -91,9 +92,7 @@ public class BlockIncensePlate extends BlockMod implements ILexiconable {
|
||||
stack.damageItem(1, player);
|
||||
did = true;
|
||||
} else {
|
||||
ItemStack addStack = plateStack.copy();
|
||||
if(!player.inventory.addItemStackToInventory(addStack))
|
||||
player.dropItem(addStack, false);
|
||||
ItemHandlerHelper.giveItemToPlayer(player, plateStack);
|
||||
plate.getItemHandler().setStackInSlot(0, ItemStack.EMPTY);
|
||||
|
||||
did = true;
|
||||
|
||||
@@ -26,6 +26,7 @@ import net.minecraft.util.math.AxisAlignedBB;
|
||||
import net.minecraft.util.math.BlockPos;
|
||||
import net.minecraft.world.IBlockAccess;
|
||||
import net.minecraft.world.World;
|
||||
import net.minecraftforge.items.ItemHandlerHelper;
|
||||
import vazkii.botania.api.lexicon.ILexiconable;
|
||||
import vazkii.botania.api.lexicon.LexiconEntry;
|
||||
import vazkii.botania.api.state.BotaniaStateProps;
|
||||
@@ -111,18 +112,13 @@ public class BlockSparkChanger extends BlockMod implements ILexiconable {
|
||||
changer.getItemHandler().setStackInSlot(0, ItemStack.EMPTY);
|
||||
world.updateComparatorOutputLevel(pos, this);
|
||||
changer.markDirty();
|
||||
if(!player.inventory.addItemStackToInventory(cstack))
|
||||
player.dropItem(cstack, false);
|
||||
ItemHandlerHelper.giveItemToPlayer(player, cstack);
|
||||
return true;
|
||||
} else if(!pstack.isEmpty() && pstack.getItem() == ModItems.sparkUpgrade) {
|
||||
changer.getItemHandler().setStackInSlot(0, pstack.copy().splitStack(1));
|
||||
changer.getItemHandler().setStackInSlot(0, pstack.splitStack(1));
|
||||
world.updateComparatorOutputLevel(pos, this);
|
||||
changer.markDirty();
|
||||
|
||||
pstack.shrink(1);
|
||||
if(pstack.isEmpty())
|
||||
player.setHeldItem(hand, ItemStack.EMPTY);
|
||||
|
||||
return true;
|
||||
}
|
||||
|
||||
|
||||
@@ -32,6 +32,7 @@ import net.minecraft.util.math.BlockPos;
|
||||
import net.minecraft.world.IBlockAccess;
|
||||
import net.minecraft.world.World;
|
||||
import net.minecraftforge.fml.common.Optional;
|
||||
import net.minecraftforge.items.ItemHandlerHelper;
|
||||
import vazkii.botania.api.lexicon.ILexiconable;
|
||||
import vazkii.botania.api.lexicon.LexiconEntry;
|
||||
import vazkii.botania.common.block.BlockMod;
|
||||
@@ -101,10 +102,10 @@ public class BlockManaFlame extends BlockMod implements ILexiconable {
|
||||
if(WorldTypeSkyblock.isWorldSkyblock(world)) {
|
||||
ItemStack stack = player.getHeldItem(hand);
|
||||
if(!stack.isEmpty() && stack.getItem() == Item.getItemFromBlock(Blocks.SAPLING) && !player.inventory.hasItemStack(new ItemStack(ModItems.lexicon))) {
|
||||
if(!world.isRemote)
|
||||
if(!world.isRemote) {
|
||||
stack.shrink(1);
|
||||
if(!player.inventory.addItemStackToInventory(new ItemStack(ModItems.lexicon)))
|
||||
player.dropItem(new ItemStack(ModItems.lexicon), false);
|
||||
ItemHandlerHelper.giveItemToPlayer(player, new ItemStack(ModItems.lexicon));
|
||||
}
|
||||
return true;
|
||||
}
|
||||
|
||||
|
||||
@@ -31,6 +31,7 @@ import net.minecraft.world.IBlockAccess;
|
||||
import net.minecraft.world.World;
|
||||
import net.minecraftforge.fml.relauncher.Side;
|
||||
import net.minecraftforge.fml.relauncher.SideOnly;
|
||||
import net.minecraftforge.items.ItemHandlerHelper;
|
||||
import vazkii.botania.api.internal.IManaBurst;
|
||||
import vazkii.botania.api.lexicon.ILexiconable;
|
||||
import vazkii.botania.api.lexicon.LexiconEntry;
|
||||
@@ -131,9 +132,7 @@ public class BlockPrism extends BlockMod implements IManaTrigger, ILexiconable,
|
||||
prism.markDirty();
|
||||
world.setBlockState(pos, state.withProperty(BotaniaStateProps.HAS_LENS, true), 1 | 2);
|
||||
} else if(!lens.isEmpty()) {
|
||||
ItemStack add = lens.copy();
|
||||
if(!player.inventory.addItemStackToInventory(add))
|
||||
player.dropItem(add, false);
|
||||
ItemHandlerHelper.giveItemToPlayer(player, lens);
|
||||
prism.getItemHandler().setStackInSlot(0, ItemStack.EMPTY);
|
||||
prism.markDirty();
|
||||
world.setBlockState(pos, state.withProperty(BotaniaStateProps.HAS_LENS, false), 1 | 2);
|
||||
|
||||
@@ -38,6 +38,7 @@ import net.minecraft.world.World;
|
||||
import net.minecraftforge.fml.common.registry.GameRegistry;
|
||||
import net.minecraftforge.fml.relauncher.Side;
|
||||
import net.minecraftforge.fml.relauncher.SideOnly;
|
||||
import net.minecraftforge.items.ItemHandlerHelper;
|
||||
import vazkii.botania.api.lexicon.ILexiconable;
|
||||
import vazkii.botania.api.lexicon.LexiconEntry;
|
||||
import vazkii.botania.api.mana.ILens;
|
||||
@@ -171,9 +172,7 @@ public class BlockSpreader extends BlockMod implements IWandable, IWandHUD, ILex
|
||||
spreader.getItemHandler().setStackInSlot(0, heldItem.copy());
|
||||
spreader.markDirty();
|
||||
} else if(!lens.isEmpty() && !wool) {
|
||||
ItemStack add = lens.copy();
|
||||
if(!player.inventory.addItemStackToInventory(add))
|
||||
player.dropItem(add, false);
|
||||
ItemHandlerHelper.giveItemToPlayer(player, lens);
|
||||
spreader.getItemHandler().setStackInSlot(0, ItemStack.EMPTY);
|
||||
spreader.markDirty();
|
||||
}
|
||||
@@ -185,8 +184,7 @@ public class BlockSpreader extends BlockMod implements IWandable, IWandHUD, ILex
|
||||
player.setHeldItem(hand, ItemStack.EMPTY);
|
||||
} else if(heldItem.isEmpty() && spreader.paddingColor != -1 && lens.isEmpty()) {
|
||||
ItemStack pad = new ItemStack(Blocks.WOOL, 1, spreader.paddingColor);
|
||||
if(!player.inventory.addItemStackToInventory(pad))
|
||||
player.dropItem(pad, false);
|
||||
ItemHandlerHelper.giveItemToPlayer(player, pad);
|
||||
spreader.paddingColor = -1;
|
||||
spreader.markDirty();
|
||||
}
|
||||
|
||||
@@ -56,19 +56,13 @@ public class BlockTerraPlate extends BlockMod implements ILexiconable {
|
||||
public boolean onBlockActivated(World world, BlockPos pos, IBlockState state, EntityPlayer player, EnumHand hand, EnumFacing s, float xs, float ys, float zs) {
|
||||
ItemStack stack = player.getHeldItem(hand);
|
||||
if(!stack.isEmpty() && stack.getItem() == ModItems.manaResource && stack.getItemDamage() < 3) {
|
||||
if(player == null || !player.capabilities.isCreativeMode) {
|
||||
stack.shrink(1);
|
||||
if(stack.isEmpty() && player != null)
|
||||
player.setHeldItem(hand, ItemStack.EMPTY);
|
||||
}
|
||||
|
||||
ItemStack target = stack.copy();
|
||||
target.setCount(1);
|
||||
EntityItem item = new EntityItem(world, pos.getX() + 0.5, pos.getY() + 0.5, pos.getZ() + 0.5, target);
|
||||
item.setPickupDelay(40);
|
||||
item.motionX = item.motionY = item.motionZ = 0;
|
||||
if(!world.isRemote)
|
||||
if(!world.isRemote) {
|
||||
ItemStack target = stack.splitStack(1);
|
||||
EntityItem item = new EntityItem(world, pos.getX() + 0.5, pos.getY() + 0.5, pos.getZ() + 0.5, target);
|
||||
item.setPickupDelay(40);
|
||||
item.motionX = item.motionY = item.motionZ = 0;
|
||||
world.spawnEntity(item);
|
||||
}
|
||||
|
||||
return true;
|
||||
}
|
||||
|
||||
@@ -62,17 +62,13 @@ public class TileRuneAltar extends TileSimpleInventory implements IManaReceiver
|
||||
return false;
|
||||
|
||||
if(stack.getItem() == Item.getItemFromBlock(ModBlocks.livingrock) && stack.getItemDamage() == 0) {
|
||||
if(player == null || !player.capabilities.isCreativeMode) {
|
||||
stack.shrink(1);
|
||||
if(stack.isEmpty() && player != null)
|
||||
player.setHeldItem(hand, ItemStack.EMPTY);
|
||||
}
|
||||
|
||||
EntityItem item = new EntityItem(world, getPos().getX() + 0.5, getPos().getY() + 1, getPos().getZ() + 0.5, new ItemStack(ModBlocks.livingrock));
|
||||
item.setPickupDelay(40);
|
||||
item.motionX = item.motionY = item.motionZ = 0;
|
||||
if(!world.isRemote)
|
||||
if(!world.isRemote) {
|
||||
ItemStack toSpawn = player != null && player.capabilities.isCreativeMode ? stack.copy().splitStack(1) : stack.splitStack(1);
|
||||
EntityItem item = new EntityItem(world, getPos().getX() + 0.5, getPos().getY() + 1, getPos().getZ() + 0.5, toSpawn);
|
||||
item.setPickupDelay(40);
|
||||
item.motionX = item.motionY = item.motionZ = 0;
|
||||
world.spawnEntity(item);
|
||||
}
|
||||
|
||||
return true;
|
||||
}
|
||||
@@ -91,8 +87,6 @@ public class TileRuneAltar extends TileSimpleInventory implements IManaReceiver
|
||||
|
||||
if(player == null || !player.capabilities.isCreativeMode) {
|
||||
stack.shrink(1);
|
||||
if(stack.isEmpty() && player != null)
|
||||
player.inventory.setInventorySlotContents(player.inventory.currentItem, ItemStack.EMPTY);
|
||||
}
|
||||
|
||||
break;
|
||||
|
||||
@@ -18,6 +18,7 @@ import net.minecraft.util.EnumFacing;
|
||||
import net.minecraft.util.EnumHand;
|
||||
import net.minecraft.util.SoundCategory;
|
||||
import net.minecraft.util.text.TextComponentString;
|
||||
import net.minecraftforge.items.ItemHandlerHelper;
|
||||
import vazkii.botania.api.sound.BotaniaSoundEvents;
|
||||
import vazkii.botania.common.block.ModBlocks;
|
||||
|
||||
@@ -37,15 +38,12 @@ public class TileTinyPotato extends TileSimpleInventory {
|
||||
player.setHeldItem(hand, stackAt);
|
||||
getItemHandler().setStackInSlot(index, ItemStack.EMPTY);
|
||||
} else if(!stack.isEmpty()) {
|
||||
ItemStack copy = stack.copy();
|
||||
copy.setCount(1);
|
||||
stack.shrink(1);
|
||||
ItemStack copy = stack.splitStack(1);
|
||||
|
||||
if(stack.isEmpty())
|
||||
player.setHeldItem(hand, stackAt);
|
||||
else if(!stackAt.isEmpty()) {
|
||||
if(!player.inventory.addItemStackToInventory(stackAt))
|
||||
player.dropItem(stackAt, false);
|
||||
ItemHandlerHelper.giveItemToPlayer(player, stackAt);
|
||||
}
|
||||
|
||||
getItemHandler().setStackInSlot(index, copy);
|
||||
|
||||
@@ -135,9 +135,6 @@ public class ItemAstrolabe extends ItemMod {
|
||||
ItemStack stackInSlot = player.inventory.getStackInSlot(i);
|
||||
if(!stackInSlot.isEmpty() && stackInSlot.getItem() == blockToPlace.getItem() && stackInSlot.getItemDamage() == blockToPlace.getItemDamage()) {
|
||||
stackInSlot.shrink(1);
|
||||
if(stackInSlot.isEmpty())
|
||||
player.inventory.setInventorySlotContents(i, ItemStack.EMPTY);
|
||||
|
||||
return;
|
||||
}
|
||||
|
||||
|
||||
@@ -186,8 +186,7 @@ public class ItemCraftingHalo extends ItemMod implements ICraftAchievement {
|
||||
|
||||
private static void doCraft(EntityPlayer player, ItemStack[] recipe, boolean particles) {
|
||||
consumeRecipeIngredients(recipe, player.getCapability(CapabilityItemHandler.ITEM_HANDLER_CAPABILITY, EnumFacing.UP), player);
|
||||
if(!player.inventory.addItemStackToInventory(recipe[9]))
|
||||
player.dropItem(recipe[9], false);
|
||||
ItemHandlerHelper.giveItemToPlayer(player, recipe[9]);
|
||||
|
||||
if(!particles)
|
||||
return;
|
||||
|
||||
@@ -95,9 +95,9 @@ public class ItemLaputaShard extends ItemMod implements ILensEffect, ITinyPlanet
|
||||
world.playSound(null, pos, BotaniaSoundEvents.laputaStart, SoundCategory.BLOCKS, 1.0F + world.rand.nextFloat(), world.rand.nextFloat() * 0.7F + 1.3F);
|
||||
ItemStack stack = player.getHeldItem(hand);
|
||||
spawnBurstFirst(world, pos, stack);
|
||||
stack.shrink(1);
|
||||
if(stack.getItemDamage() == 19)
|
||||
player.addStat(ModAchievements.l20ShardUse, 1);
|
||||
stack.shrink(1);
|
||||
}
|
||||
|
||||
return EnumActionResult.SUCCESS;
|
||||
|
||||
@@ -44,8 +44,8 @@ public class ItemSpark extends ItemMod implements ICraftAchievement, IManaGiving
|
||||
ISparkAttachable attach = (ISparkAttachable) tile;
|
||||
ItemStack stack = player.getHeldItem(hand);
|
||||
if(attach.canAttachSpark(stack) && attach.getAttachedSpark() == null) {
|
||||
stack.shrink(1);
|
||||
if(!world.isRemote) {
|
||||
stack.shrink(1);
|
||||
EntitySpark spark = new EntitySpark(world);
|
||||
spark.setPosition(pos.getX() + 0.5, pos.getY() + 1.5, pos.getZ() + 0.5);
|
||||
world.spawnEntity(spark);
|
||||
|
||||
@@ -141,8 +141,8 @@ public class ItemSpawnerMover extends ItemMod {
|
||||
|
||||
if (placeBlockAt(itemstack, player, world, pos, side, xOffset, yOffset, zOffset, iblockstate1)) {
|
||||
world.playSound(null, pos, Blocks.MOB_SPAWNER.getSoundType().getPlaceSound(), SoundCategory.BLOCKS, (Blocks.MOB_SPAWNER.getSoundType().getVolume() + 1.0F) / 2.0F, Blocks.MOB_SPAWNER.getSoundType().getPitch() * 0.8F);
|
||||
itemstack.shrink(1);
|
||||
player.renderBrokenItemStack(itemstack);
|
||||
itemstack.shrink(1);
|
||||
player.addStat(ModAchievements.spawnerMoverUse, 1);
|
||||
for(int i = 0; i < 100; i++)
|
||||
Botania.proxy.sparkleFX(pos.getX() + Math.random(), pos.getY() + Math.random(), pos.getZ() + Math.random(), (float) Math.random(), (float) Math.random(), (float) Math.random(), 0.45F + 0.2F * (float) Math.random(), 6);
|
||||
|
||||
@@ -101,9 +101,7 @@ public abstract class ItemBrewBase extends ItemMod implements IBrewItem, IPickup
|
||||
if(!((EntityPlayer) living).inventory.addItemStackToInventory(baseItem.copy()))
|
||||
return baseItem.copy();
|
||||
else {
|
||||
ItemStack copy = stack.copy();
|
||||
copy.setCount(0);
|
||||
return copy;
|
||||
return ItemStack.EMPTY;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -65,8 +65,7 @@ public abstract class ItemBauble extends ItemMod implements IBauble, ICosmeticAt
|
||||
if(!EntityDoppleganger.isTruePlayer(player))
|
||||
return ActionResult.newResult(EnumActionResult.FAIL, stack);
|
||||
|
||||
ItemStack toEquip = stack.copy();
|
||||
toEquip.setCount(1);
|
||||
ItemStack toEquip = stack.splitStack(1);
|
||||
|
||||
if(canEquip(toEquip, player)) {
|
||||
IItemHandlerModifiable baubles = BaublesApi.getBaublesHandler(player);
|
||||
@@ -77,7 +76,6 @@ public abstract class ItemBauble extends ItemMod implements IBauble, ICosmeticAt
|
||||
if(stackInSlot.isEmpty() || ((IBauble) stackInSlot.getItem()).canUnequip(stackInSlot, player)) {
|
||||
if(!world.isRemote) {
|
||||
baubles.setStackInSlot(i, toEquip);
|
||||
stack.shrink(1);
|
||||
}
|
||||
|
||||
if(!stackInSlot.isEmpty()) {
|
||||
|
||||
@@ -35,6 +35,7 @@ import net.minecraftforge.event.entity.player.PlayerInteractEvent;
|
||||
import net.minecraftforge.fml.common.eventhandler.SubscribeEvent;
|
||||
import net.minecraftforge.fml.relauncher.Side;
|
||||
import net.minecraftforge.fml.relauncher.SideOnly;
|
||||
import net.minecraftforge.items.ItemHandlerHelper;
|
||||
import vazkii.botania.api.item.IPetalApothecary;
|
||||
import vazkii.botania.api.recipe.IElvenItem;
|
||||
import vazkii.botania.api.recipe.IFlowerComponent;
|
||||
@@ -70,15 +71,9 @@ public class ItemManaResource extends ItemMod implements IFlowerComponent, IElve
|
||||
ItemStack stack1 = new ItemStack(this, 1, 15);
|
||||
event.getEntityPlayer().addStat(ModAchievements.enderAirMake, 1);
|
||||
|
||||
if(!event.getEntityPlayer().inventory.addItemStackToInventory(stack1)) {
|
||||
event.getEntityPlayer().dropItem(stack1, true);
|
||||
} else {
|
||||
event.getEntityPlayer().openContainer.detectAndSendChanges();
|
||||
}
|
||||
ItemHandlerHelper.giveItemToPlayer(event.getEntityPlayer(), stack1);
|
||||
|
||||
stack.shrink(1);
|
||||
if(stack.isEmpty())
|
||||
event.getEntityPlayer().setHeldItem(event.getHand(), ItemStack.EMPTY);
|
||||
|
||||
event.getWorld().playSound(null, event.getPos(), SoundEvents.ENTITY_ITEM_PICKUP, SoundCategory.PLAYERS, 0.5F, 1F);
|
||||
event.setCanceled(true);
|
||||
|
||||
@@ -259,8 +259,6 @@ public class ItemExchangeRod extends ItemMod implements IManaUsingItem, IWirefra
|
||||
ItemStack retStack = invStack.copy();
|
||||
if(doit) {
|
||||
invStack.shrink(1);
|
||||
if(invStack.isEmpty())
|
||||
inv.setInventorySlotContents(i, ItemStack.EMPTY);
|
||||
}
|
||||
return retStack;
|
||||
}
|
||||
|
||||
@@ -30,6 +30,7 @@ import net.minecraftforge.event.entity.living.LivingEvent.LivingUpdateEvent;
|
||||
import net.minecraftforge.event.entity.player.PlayerInteractEvent;
|
||||
import net.minecraftforge.event.world.BlockEvent;
|
||||
import net.minecraftforge.fml.common.eventhandler.SubscribeEvent;
|
||||
import net.minecraftforge.items.ItemHandlerHelper;
|
||||
import vazkii.botania.common.block.ModBlocks;
|
||||
import vazkii.botania.common.block.tile.TileManaFlame;
|
||||
import vazkii.botania.common.item.ModItems;
|
||||
@@ -93,7 +94,7 @@ public final class SkyblockWorldEvents {
|
||||
|
||||
if(equipped.isEmpty())
|
||||
event.getEntityPlayer().setHeldItem(event.getHand(), new ItemStack(ModItems.waterBowl));
|
||||
else event.getEntityPlayer().dropItem(new ItemStack(ModItems.waterBowl), false);
|
||||
else ItemHandlerHelper.giveItemToPlayer(event.getEntityPlayer(), new ItemStack(ModItems.waterBowl));
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
Reference in new issue
Block a user