diff --git a/src/main/java/vazkii/botania/common/block/BlockCacophonium.java b/src/main/java/vazkii/botania/common/block/BlockCacophonium.java index 4499839ef..0acf89dcc 100644 --- a/src/main/java/vazkii/botania/common/block/BlockCacophonium.java +++ b/src/main/java/vazkii/botania/common/block/BlockCacophonium.java @@ -18,6 +18,7 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.Blocks; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.NonNullList; import net.minecraft.util.math.BlockPos; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; @@ -101,11 +102,8 @@ public class BlockCacophonium extends BlockMod { world.setBlockToAir(pos); } - @Nonnull @Override - public List getDrops(IBlockAccess world, BlockPos pos, @Nonnull IBlockState state, int fortune) { - ArrayList stacks = new ArrayList<>(); - + public void getDrops(NonNullList stacks, IBlockAccess world, BlockPos pos, @Nonnull IBlockState state, int fortune) { TileEntity tile = world.getTileEntity(pos); if(tile != null && tile instanceof TileCacophonium) { stacks.add(new ItemStack(Blocks.NOTEBLOCK)); @@ -113,8 +111,6 @@ public class BlockCacophonium extends BlockMod { if(!thingy.isEmpty()) stacks.add(thingy.copy()); } - - return stacks; } @Override diff --git a/src/main/java/vazkii/botania/common/block/BlockCell.java b/src/main/java/vazkii/botania/common/block/BlockCell.java index 1520ca048..62caf1f43 100644 --- a/src/main/java/vazkii/botania/common/block/BlockCell.java +++ b/src/main/java/vazkii/botania/common/block/BlockCell.java @@ -14,10 +14,11 @@ import net.minecraft.block.SoundType; import net.minecraft.block.material.Material; import net.minecraft.block.state.IBlockState; import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.init.Items; +import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.math.BlockPos; -import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; import vazkii.botania.api.lexicon.ILexiconable; import vazkii.botania.api.lexicon.LexiconEntry; @@ -26,8 +27,7 @@ import vazkii.botania.common.lexicon.LexiconData; import vazkii.botania.common.lib.LibBlockNames; import javax.annotation.Nonnull; -import java.util.ArrayList; -import java.util.List; +import java.util.Random; public class BlockCell extends BlockMod implements ILexiconable { @@ -38,8 +38,8 @@ public class BlockCell extends BlockMod implements ILexiconable { @Nonnull @Override - public List getDrops(IBlockAccess world, BlockPos pos, @Nonnull IBlockState state, int fortune) { - return new ArrayList<>(); + public Item getItemDropped(IBlockState state, @Nonnull Random rand, int fortune) { + return Items.AIR; } @Override diff --git a/src/main/java/vazkii/botania/common/block/BlockCocoon.java b/src/main/java/vazkii/botania/common/block/BlockCocoon.java index 8c86edca2..88f8eed69 100644 --- a/src/main/java/vazkii/botania/common/block/BlockCocoon.java +++ b/src/main/java/vazkii/botania/common/block/BlockCocoon.java @@ -34,8 +34,7 @@ import vazkii.botania.common.lexicon.LexiconData; import vazkii.botania.common.lib.LibBlockNames; import javax.annotation.Nonnull; -import java.util.ArrayList; -import java.util.List; +import java.util.Random; public class BlockCocoon extends BlockMod implements ILexiconable { @@ -99,8 +98,8 @@ public class BlockCocoon extends BlockMod implements ILexiconable { @Nonnull @Override - public List getDrops(IBlockAccess world, BlockPos pos, @Nonnull IBlockState state, int fortune) { - return new ArrayList<>(); + public Item getItemDropped(IBlockState state, @Nonnull Random rand, int fortune) { + return Items.AIR; } @Override diff --git a/src/main/java/vazkii/botania/common/block/BlockFakeAir.java b/src/main/java/vazkii/botania/common/block/BlockFakeAir.java index e868888bf..3cc9942cc 100644 --- a/src/main/java/vazkii/botania/common/block/BlockFakeAir.java +++ b/src/main/java/vazkii/botania/common/block/BlockFakeAir.java @@ -10,13 +10,13 @@ */ package vazkii.botania.common.block; -import com.google.common.collect.ImmutableList; import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.block.state.IBlockState; import net.minecraft.entity.Entity; import net.minecraft.init.Blocks; -import net.minecraft.item.ItemStack; +import net.minecraft.init.Items; +import net.minecraft.item.Item; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.EnumBlockRenderType; import net.minecraft.util.math.AxisAlignedBB; @@ -28,7 +28,6 @@ import vazkii.botania.common.block.tile.TileFakeAir; import vazkii.botania.common.lib.LibBlockNames; import javax.annotation.Nonnull; -import java.util.List; import java.util.Random; public class BlockFakeAir extends BlockMod { @@ -110,8 +109,8 @@ public class BlockFakeAir extends BlockMod { @Nonnull @Override - public List getDrops(IBlockAccess world, BlockPos pos, @Nonnull IBlockState state, int fortune) { - return ImmutableList.of(); + public Item getItemDropped(IBlockState state, @Nonnull Random rand, int fortune) { + return Items.AIR; } @Override diff --git a/src/main/java/vazkii/botania/common/block/BlockFloatingSpecialFlower.java b/src/main/java/vazkii/botania/common/block/BlockFloatingSpecialFlower.java index 6d19c3c33..d78c8f3cb 100644 --- a/src/main/java/vazkii/botania/common/block/BlockFloatingSpecialFlower.java +++ b/src/main/java/vazkii/botania/common/block/BlockFloatingSpecialFlower.java @@ -154,10 +154,8 @@ public class BlockFloatingSpecialFlower extends BlockFloatingFlower implements I world.setBlockToAir(pos); } - @Nonnull @Override - public List getDrops(IBlockAccess world, BlockPos pos, @Nonnull IBlockState state, int fortune) { - ArrayList list = new ArrayList<>(); + public void getDrops(NonNullList list, IBlockAccess world, BlockPos pos, @Nonnull IBlockState state, int fortune) { TileEntity tile = world.getTileEntity(pos); if(tile != null) { @@ -165,8 +163,6 @@ public class BlockFloatingSpecialFlower extends BlockFloatingFlower implements I list.add(ItemBlockSpecialFlower.ofType(new ItemStack(state.getBlock()), name)); ((TileSpecialFlower) tile).getDrops(list); } - - return list; } @Override diff --git a/src/main/java/vazkii/botania/common/block/BlockGaiaHead.java b/src/main/java/vazkii/botania/common/block/BlockGaiaHead.java index 82c3e98bd..a5f634be6 100644 --- a/src/main/java/vazkii/botania/common/block/BlockGaiaHead.java +++ b/src/main/java/vazkii/botania/common/block/BlockGaiaHead.java @@ -18,6 +18,7 @@ import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; import net.minecraft.tileentity.TileEntitySkull; +import net.minecraft.util.NonNullList; import net.minecraft.util.ResourceLocation; import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.RayTraceResult; @@ -51,21 +52,15 @@ public class BlockGaiaHead extends BlockSkull implements IModelRegister { return new ItemStack(ModItems.gaiaHead); } - @Nonnull @Override - public List getDrops(@Nonnull IBlockAccess world, @Nonnull BlockPos pos, IBlockState state, int fortune) { - ArrayList ret = new ArrayList<>(); - + public void getDrops(NonNullList ret, @Nonnull IBlockAccess world, @Nonnull BlockPos pos, IBlockState state, int fortune) { if(!state.getValue(NODROP)) { ItemStack itemstack = new ItemStack(ModItems.gaiaHead, 1); TileEntitySkull tileentityskull = (TileEntitySkull)world.getTileEntity(pos); - if(tileentityskull == null) - return ret; - - ret.add(itemstack); + if(tileentityskull != null) + ret.add(itemstack); } - return ret; } @Nonnull diff --git a/src/main/java/vazkii/botania/common/block/BlockModDoubleFlower.java b/src/main/java/vazkii/botania/common/block/BlockModDoubleFlower.java index 2b723ca12..33073bf87 100644 --- a/src/main/java/vazkii/botania/common/block/BlockModDoubleFlower.java +++ b/src/main/java/vazkii/botania/common/block/BlockModDoubleFlower.java @@ -161,12 +161,6 @@ public abstract class BlockModDoubleFlower extends BlockDoublePlant implements I return ret; } - @Nonnull - @Override - public List getDrops(IBlockAccess world, BlockPos pos, @Nonnull IBlockState state, int fortune) { - return ImmutableList.of(); - } - @Override public void getSubBlocks(CreativeTabs tab, @Nonnull NonNullList stacks) { for(int i = 0; i < COUNT; ++i) diff --git a/src/main/java/vazkii/botania/common/block/BlockSpecialFlower.java b/src/main/java/vazkii/botania/common/block/BlockSpecialFlower.java index 56b37e77e..eec3efed3 100644 --- a/src/main/java/vazkii/botania/common/block/BlockSpecialFlower.java +++ b/src/main/java/vazkii/botania/common/block/BlockSpecialFlower.java @@ -260,10 +260,8 @@ public class BlockSpecialFlower extends BlockFlower implements ISpecialFlower, I world.setBlockToAir(pos); } - @Nonnull @Override - public List getDrops(IBlockAccess world, BlockPos pos, @Nonnull IBlockState state, int fortune) { - ArrayList list = new ArrayList<>(); + public void getDrops(NonNullList list, IBlockAccess world, BlockPos pos, @Nonnull IBlockState state, int fortune) { TileEntity tile = world.getTileEntity(pos); if(tile != null) { @@ -271,8 +269,6 @@ public class BlockSpecialFlower extends BlockFlower implements ISpecialFlower, I list.add(ItemBlockSpecialFlower.ofType(name)); ((TileSpecialFlower) tile).getDrops(list); } - - return list; } @Override diff --git a/src/main/java/vazkii/botania/common/block/decor/BlockManaFlame.java b/src/main/java/vazkii/botania/common/block/decor/BlockManaFlame.java index 7c3da581b..d5d06ddc3 100644 --- a/src/main/java/vazkii/botania/common/block/decor/BlockManaFlame.java +++ b/src/main/java/vazkii/botania/common/block/decor/BlockManaFlame.java @@ -10,12 +10,12 @@ */ package vazkii.botania.common.block.decor; -import com.google.common.collect.ImmutableList; import net.minecraft.block.SoundType; import net.minecraft.block.material.Material; import net.minecraft.block.state.IBlockState; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.Blocks; +import net.minecraft.init.Items; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; @@ -38,7 +38,7 @@ import vazkii.botania.common.lib.LibBlockNames; import vazkii.botania.common.world.WorldTypeSkyblock; import javax.annotation.Nonnull; -import java.util.List; +import java.util.Random; public class BlockManaFlame extends BlockMod implements ILexiconable { @@ -113,8 +113,8 @@ public class BlockManaFlame extends BlockMod implements ILexiconable { @Nonnull @Override - public List getDrops(IBlockAccess world, BlockPos pos, @Nonnull IBlockState state, int fortune) { - return ImmutableList.of(); + public Item getItemDropped(IBlockState state, @Nonnull Random rand, int fortune) { + return Items.AIR; } @Override diff --git a/src/main/java/vazkii/botania/common/block/decor/BlockTinyPotato.java b/src/main/java/vazkii/botania/common/block/decor/BlockTinyPotato.java index e9a1e417c..0194f2585 100644 --- a/src/main/java/vazkii/botania/common/block/decor/BlockTinyPotato.java +++ b/src/main/java/vazkii/botania/common/block/decor/BlockTinyPotato.java @@ -21,6 +21,7 @@ import net.minecraft.util.EnumBlockRenderType; import net.minecraft.util.EnumFacing; import net.minecraft.util.EnumHand; import net.minecraft.util.EnumParticleTypes; +import net.minecraft.util.NonNullList; import net.minecraft.util.math.AxisAlignedBB; import net.minecraft.util.math.BlockPos; import net.minecraft.world.IBlockAccess; @@ -138,10 +139,8 @@ public class BlockTinyPotato extends BlockMod implements ILexiconable { world.setBlockToAir(pos); } - @Nonnull @Override - public List getDrops(IBlockAccess world, BlockPos pos, @Nonnull IBlockState state, int fortune) { - ArrayList list = new ArrayList<>(); + public void getDrops(NonNullList list, IBlockAccess world, BlockPos pos, @Nonnull IBlockState state, int fortune) { TileEntity tile = world.getTileEntity(pos); if(tile != null) { @@ -151,8 +150,6 @@ public class BlockTinyPotato extends BlockMod implements ILexiconable { stack.setStackDisplayName(name); list.add(stack); } - - return list; } @Override diff --git a/src/main/java/vazkii/botania/common/block/mana/BlockPool.java b/src/main/java/vazkii/botania/common/block/mana/BlockPool.java index 8671fb4d8..d2cc39228 100644 --- a/src/main/java/vazkii/botania/common/block/mana/BlockPool.java +++ b/src/main/java/vazkii/botania/common/block/mana/BlockPool.java @@ -124,15 +124,10 @@ public class BlockPool extends BlockMod implements IWandHUD, IWandable, ILexicon super.breakBlock(world, pos, state); } - @Nonnull @Override - public List getDrops(IBlockAccess world, BlockPos pos, @Nonnull IBlockState state, int fortune) { - ArrayList drops = new ArrayList<>(); - + public void getDrops(NonNullList drops, IBlockAccess world, BlockPos pos, @Nonnull IBlockState state, int fortune) { if(!lastFragile) drops.add(new ItemStack(this, 1, state.getBlock().getMetaFromState(state))); - - return drops; } @SideOnly(Side.CLIENT) diff --git a/src/main/java/vazkii/botania/common/item/ItemGrassHorn.java b/src/main/java/vazkii/botania/common/item/ItemGrassHorn.java index 17f4c9044..b1787cbd9 100644 --- a/src/main/java/vazkii/botania/common/item/ItemGrassHorn.java +++ b/src/main/java/vazkii/botania/common/item/ItemGrassHorn.java @@ -129,7 +129,8 @@ public class ItemGrassHorn extends ItemMod { BlockPos currCoords = coords.get(i); IBlockState state = world.getBlockState(currCoords); Block block = state.getBlock(); - List items = block.getDrops(world, currCoords, state, 0); + NonNullList items = NonNullList.create(); + block.getDrops(items, world, currCoords, state, 0); if(block instanceof IHornHarvestable && ((IHornHarvestable) block).hasSpecialHornHarvest(world, currCoords, stack, type)) ((IHornHarvestable) block).harvestByHorn(world, currCoords, stack, type); diff --git a/src/main/java/vazkii/botania/common/item/lens/LensMine.java b/src/main/java/vazkii/botania/common/item/lens/LensMine.java index 95eac1cb2..304fa5b9f 100644 --- a/src/main/java/vazkii/botania/common/item/lens/LensMine.java +++ b/src/main/java/vazkii/botania/common/item/lens/LensMine.java @@ -17,6 +17,7 @@ import net.minecraft.entity.projectile.EntityThrowable; import net.minecraft.init.Blocks; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.NonNullList; import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.RayTraceResult; import net.minecraft.world.World; @@ -58,9 +59,8 @@ public class LensMine extends Lens { BlockPos coords = burst.getBurstSourceBlockPos(); if(!coords.equals(pos.getBlockPos()) && !(tile instanceof IManaBlock) && neededHarvestLevel <= harvestLevel && hardness != -1 && hardness < 50F && (burst.isFake() || mana >= 24)) { - List items = new ArrayList<>(); - - items.addAll(block.getDrops(world, pos_, world.getBlockState(pos_), 0)); + NonNullList items = NonNullList.create(); + block.getDrops(items, world, pos_, world.getBlockState(pos_), 0); if(!burst.hasAlreadyCollidedAt(pos_)) { if(!burst.isFake() && !entity.world.isRemote) { diff --git a/src/main/java/vazkii/botania/common/item/rod/ItemExchangeRod.java b/src/main/java/vazkii/botania/common/item/rod/ItemExchangeRod.java index a317a3253..c3be8feee 100644 --- a/src/main/java/vazkii/botania/common/item/rod/ItemExchangeRod.java +++ b/src/main/java/vazkii/botania/common/item/rod/ItemExchangeRod.java @@ -25,6 +25,7 @@ import net.minecraft.tileentity.TileEntity; import net.minecraft.util.EnumActionResult; import net.minecraft.util.EnumFacing; import net.minecraft.util.EnumHand; +import net.minecraft.util.NonNullList; import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.RayTraceResult; import net.minecraft.util.text.TextFormatting; @@ -224,7 +225,8 @@ public class ItemExchangeRod extends ItemMod implements IManaUsingItem, IWirefra if(!blockAt.isAir(world.getBlockState(pos), world, pos) && stateAt.getPlayerRelativeBlockHardness(player, world, pos) > 0 && stateAt != state) { if(!world.isRemote) { if(!player.capabilities.isCreativeMode) { - List drops = blockAt.getDrops(world, pos, stateAt, 0); + NonNullList drops = NonNullList.create(); + blockAt.getDrops(drops, world, pos, stateAt, 0); for(ItemStack drop : drops) world.spawnEntity(new EntityItem(world, pos.getX() + 0.5, pos.getY() + 0.5, pos.getZ() + 0.5, drop)); removeFromInventory(player, stack, state.getBlock(), state.getBlock().getMetaFromState(state), true);