Get rid of all the nullable-nonnull stuff, warning huge diff

This commit is contained in:
Vincent Lee committed 2016-05-18 21:03:12 -05:00
1 parent bdf51cbc8b
commit 8fb3b886a8
344 files changed
+1603 -582

No files matched your search

@@ -50,6 +50,7 @@ import vazkii.botania.common.item.rod.ItemWaterRod;
import vazkii.botania.common.lexicon.LexiconData;
import vazkii.botania.common.lib.LibBlockNames;
import javax.annotation.Nonnull;
import java.util.List;
import java.util.Random;
@@ -68,11 +69,13 @@ public class BlockAltar extends BlockMod implements ILexiconable {
);
}
@Nonnull
@Override
public AxisAlignedBB getBoundingBox(IBlockState state, IBlockAccess world, BlockPos pos) {
return AABB;
}
@Nonnull
@Override
public BlockStateContainer createBlockState() {
return new BlockStateContainer(this, BotaniaStateProps.ALTAR_VARIANT);
@@ -83,6 +86,7 @@ public class BlockAltar extends BlockMod implements ILexiconable {
return state.getValue(BotaniaStateProps.ALTAR_VARIANT).ordinal();
}
@Nonnull
@Override
public IBlockState getStateFromMeta(int meta) {
if (meta < 0 || meta >= AltarVariant.values().length ) {
@@ -91,8 +95,9 @@ public class BlockAltar extends BlockMod implements ILexiconable {
return getDefaultState().withProperty(BotaniaStateProps.ALTAR_VARIANT, AltarVariant.values()[meta]);
}
@Nonnull
@Override
public IBlockState getActualState(IBlockState state, IBlockAccess worldIn, BlockPos pos) {
public IBlockState getActualState(@Nonnull IBlockState state, IBlockAccess worldIn, BlockPos pos) {
TileEntity te = worldIn.getTileEntity(pos);
if (te instanceof TileAltar) {
TileAltar altar = ((TileAltar) te);
@@ -104,6 +109,7 @@ public class BlockAltar extends BlockMod implements ILexiconable {
return state;
}
@Nonnull
@Override
public BlockRenderLayer getBlockLayer() {
return BlockRenderLayer.CUTOUT;
@@ -115,7 +121,7 @@ public class BlockAltar extends BlockMod implements ILexiconable {
}
@Override
public void getSubBlocks(Item item, CreativeTabs tab, List<ItemStack> list) {
public void getSubBlocks(@Nonnull Item item, CreativeTabs tab, List<ItemStack> list) {
for(int i = 0; i < 9; i++)
list.add(new ItemStack(item, 1, i));
}
@@ -130,7 +136,7 @@ public class BlockAltar extends BlockMod implements ILexiconable {
}
@Override
public int getLightValue(IBlockState state, IBlockAccess world, BlockPos pos) {
public int getLightValue(@Nonnull IBlockState state, IBlockAccess world, @Nonnull BlockPos pos) {
if(world.getBlockState(pos).getBlock() != this)
return world.getBlockState(pos).getLightValue(world, pos);
TileAltar tile = (TileAltar) world.getTileEntity(pos);
@@ -260,13 +266,14 @@ public class BlockAltar extends BlockMod implements ILexiconable {
return true;
}
@Nonnull
@Override
public TileEntity createTileEntity(World world, IBlockState state) {
public TileEntity createTileEntity(@Nonnull World world, @Nonnull IBlockState state) {
return new TileAltar();
}
@Override
public void breakBlock(World par1World, BlockPos pos, IBlockState state) {
public void breakBlock(@Nonnull World par1World, @Nonnull BlockPos pos, @Nonnull IBlockState state) {
TileSimpleInventory inv = (TileSimpleInventory) par1World.getTileEntity(pos);
if (inv != null) {