Remove all uses of @Nonnull because it's stupid anyways.

ACTUALLY closes #97.
This commit is contained in:
Ellpeck 2016-05-29 23:49:35 +02:00
parent 79660f3f6f
commit 4e0082ed7d
172 changed files with 470 additions and 474 deletions

View file

@ -97,14 +97,14 @@ public class BlockAtomicReconstructor extends BlockContainerBase implements IHud
return true;
}
@Nonnull
@Override
public TileEntity createNewTileEntity(@Nonnull World world, int i){
public TileEntity createNewTileEntity(World world, int i){
return new TileEntityAtomicReconstructor();
}
@Override
public void breakBlock(World world, @Nonnull BlockPos pos, @Nonnull IBlockState state){
public void breakBlock(World world, BlockPos pos, IBlockState state){
this.dropInventory(world, pos);
super.breakBlock(world, pos, state);
}
@ -163,7 +163,7 @@ public class BlockAtomicReconstructor extends BlockContainerBase implements IHud
this.setMaxDamage(0);
}
@Nonnull
@Override
public String getUnlocalizedName(ItemStack stack){
return this.getUnlocalizedName();
@ -175,7 +175,7 @@ public class BlockAtomicReconstructor extends BlockContainerBase implements IHud
}
@Override
public void addInformation(@Nonnull ItemStack stack, @Nonnull EntityPlayer player, @Nonnull List<String> list, boolean bool){
public void addInformation(ItemStack stack, EntityPlayer player, List<String> list, boolean bool){
long sysTime = System.currentTimeMillis();
if(this.lastSysTime+3000 < sysTime){

View file

@ -64,7 +64,7 @@ public class BlockBookletStand extends BlockContainerBase implements IHudDisplay
}
@SuppressWarnings("deprecation")
@Nonnull
@Override
public AxisAlignedBB getBoundingBox(IBlockState state, IBlockAccess source, BlockPos pos){
int meta = this.getMetaFromState(state);
@ -133,9 +133,9 @@ public class BlockBookletStand extends BlockContainerBase implements IHudDisplay
super.onBlockPlacedBy(world, pos, state, player, stack);
}
@Nonnull
@Override
public TileEntity createNewTileEntity(@Nonnull World world, int par2){
public TileEntity createNewTileEntity(World world, int par2){
return new TileEntityBookletStand();
}

View file

@ -48,9 +48,9 @@ public class BlockBreaker extends BlockContainerBase{
this.setSoundType(SoundType.STONE);
}
@Nonnull
@Override
public TileEntity createNewTileEntity(@Nonnull World world, int par2){
public TileEntity createNewTileEntity(World world, int par2){
return this.isPlacer ? new TileEntityPlacer() : new TileEntityBreaker();
}
@ -88,7 +88,7 @@ public class BlockBreaker extends BlockContainerBase{
}
@Override
public void breakBlock(World world, @Nonnull BlockPos pos, @Nonnull IBlockState state){
public void breakBlock(World world, BlockPos pos, IBlockState state){
this.dropInventory(world, pos);
super.breakBlock(world, pos, state);
}

View file

@ -38,9 +38,9 @@ public class BlockCanolaPress extends BlockContainerBase{
this.setSoundType(SoundType.STONE);
}
@Nonnull
@Override
public TileEntity createNewTileEntity(@Nonnull World world, int par2){
public TileEntity createNewTileEntity(World world, int par2){
return new TileEntityCanolaPress();
}
@ -64,7 +64,7 @@ public class BlockCanolaPress extends BlockContainerBase{
}
@Override
public void breakBlock(World world, @Nonnull BlockPos pos, @Nonnull IBlockState state){
public void breakBlock(World world, BlockPos pos, IBlockState state){
this.dropInventory(world, pos);
super.breakBlock(world, pos, state);
}

View file

@ -49,9 +49,9 @@ public class BlockCoalGenerator extends BlockContainerBase{
this.setTickRandomly(true);
}
@Nonnull
@Override
public TileEntity createNewTileEntity(@Nonnull World world, int par2){
public TileEntity createNewTileEntity(World world, int par2){
return new TileEntityCoalGenerator();
}
@ -90,7 +90,7 @@ public class BlockCoalGenerator extends BlockContainerBase{
}
@Override
public void breakBlock(World world, @Nonnull BlockPos pos, @Nonnull IBlockState state){
public void breakBlock(World world, BlockPos pos, IBlockState state){
this.dropInventory(world, pos);
super.breakBlock(world, pos, state);
}

View file

@ -49,7 +49,7 @@ public class BlockCoffeeMachine extends BlockContainerBase{
}
@SuppressWarnings("deprecation")
@Nonnull
@Override
public AxisAlignedBB getBoundingBox(IBlockState state, IBlockAccess source, BlockPos pos){
return AABB;
@ -81,14 +81,14 @@ public class BlockCoffeeMachine extends BlockContainerBase{
return true;
}
@Nonnull
@Override
public TileEntity createNewTileEntity(@Nonnull World world, int meta){
public TileEntity createNewTileEntity(World world, int meta){
return new TileEntityCoffeeMachine();
}
@Override
public void breakBlock(World world, @Nonnull BlockPos pos, @Nonnull IBlockState state){
public void breakBlock(World world, BlockPos pos, IBlockState state){
this.dropInventory(world, pos);
super.breakBlock(world, pos, state);
}

View file

@ -101,7 +101,7 @@ public class BlockColoredLamp extends BlockBase{
}
@Override
public ItemStack createStackedBlock(@Nonnull IBlockState state){
public ItemStack createStackedBlock(IBlockState state){
return new ItemStack(InitBlocks.blockColoredLamp, 1, this.getMetaFromState(state));
}
@ -114,7 +114,7 @@ public class BlockColoredLamp extends BlockBase{
}
@Override
public int getLightValue(@Nonnull IBlockState state, IBlockAccess world, @Nonnull BlockPos pos){
public int getLightValue(IBlockState state, IBlockAccess world, BlockPos pos){
return this.isOn ? 15 : 0;
}
@ -148,16 +148,16 @@ public class BlockColoredLamp extends BlockBase{
this.setMaxDamage(0);
}
@Nonnull
@Override
public String getItemStackDisplayName(@Nonnull ItemStack stack){
public String getItemStackDisplayName(ItemStack stack){
if(stack.getItemDamage() >= allLampTypes.length){
return StringUtil.BUGGED_ITEM_NAME;
}
return StringUtil.localize(this.getUnlocalizedName(stack)+".name")+(((BlockColoredLamp)this.block).isOn ? " ("+StringUtil.localize("tooltip."+ModUtil.MOD_ID+".onSuffix.desc")+")" : "");
}
@Nonnull
@Override
public String getUnlocalizedName(ItemStack stack){
return InitBlocks.blockColoredLamp.getUnlocalizedName()+allLampTypes[stack.getItemDamage()].name;

View file

@ -58,7 +58,7 @@ public class BlockCompost extends BlockContainerBase implements IHudDisplay{
}
@SuppressWarnings("deprecation")
@Nonnull
@Override
public AxisAlignedBB getBoundingBox(IBlockState state, IBlockAccess source, BlockPos pos){
return AABB;
@ -66,7 +66,7 @@ public class BlockCompost extends BlockContainerBase implements IHudDisplay{
@SuppressWarnings("deprecation")
@Override
public void addCollisionBoxToList(IBlockState state, @Nonnull World worldIn, @Nonnull BlockPos pos, @Nonnull AxisAlignedBB entityBox, @Nonnull List<AxisAlignedBB> collidingBoxes, Entity entityIn){
public void addCollisionBoxToList(IBlockState state, World worldIn, BlockPos pos, AxisAlignedBB entityBox, List<AxisAlignedBB> collidingBoxes, Entity entityIn){
addCollisionBoxToList(pos, entityBox, collidingBoxes, AABB_LEGS);
addCollisionBoxToList(pos, entityBox, collidingBoxes, AABB_WALL_WEST);
addCollisionBoxToList(pos, entityBox, collidingBoxes, AABB_WALL_NORTH);
@ -144,14 +144,14 @@ public class BlockCompost extends BlockContainerBase implements IHudDisplay{
return false;
}
@Nonnull
@Override
public TileEntity createNewTileEntity(@Nonnull World world, int meta){
public TileEntity createNewTileEntity(World world, int meta){
return new TileEntityCompost();
}
@Override
public void breakBlock(World world, @Nonnull BlockPos pos, @Nonnull IBlockState state){
public void breakBlock(World world, BlockPos pos, IBlockState state){
this.dropInventory(world, pos);
super.breakBlock(world, pos, state);
}

View file

@ -85,7 +85,7 @@ public class BlockCrystal extends BlockBase{
this.setMaxDamage(0);
}
@Nonnull
@Override
public String getUnlocalizedName(ItemStack stack){
return stack.getItemDamage() >= allCrystals.length ? StringUtil.BUGGED_ITEM_NAME : this.getUnlocalizedName()+allCrystals[stack.getItemDamage()].name;

View file

@ -45,9 +45,9 @@ public class BlockDirectionalBreaker extends BlockContainerBase{
this.setSoundType(SoundType.STONE);
}
@Nonnull
@Override
public TileEntity createNewTileEntity(@Nonnull World world, int par2){
public TileEntity createNewTileEntity(World world, int par2){
return new TileEntityDirectionalBreaker();
}
@ -85,7 +85,7 @@ public class BlockDirectionalBreaker extends BlockContainerBase{
}
@Override
public void breakBlock(World world, @Nonnull BlockPos pos, @Nonnull IBlockState state){
public void breakBlock(World world, BlockPos pos, IBlockState state){
this.dropInventory(world, pos);
super.breakBlock(world, pos, state);
}

View file

@ -44,9 +44,9 @@ public class BlockDropper extends BlockContainerBase{
this.setSoundType(SoundType.STONE);
}
@Nonnull
@Override
public TileEntity createNewTileEntity(@Nonnull World world, int par2){
public TileEntity createNewTileEntity(World world, int par2){
return new TileEntityDropper();
}
@ -84,7 +84,7 @@ public class BlockDropper extends BlockContainerBase{
}
@Override
public void breakBlock(World world, @Nonnull BlockPos pos, @Nonnull IBlockState state){
public void breakBlock(World world, BlockPos pos, IBlockState state){
this.dropInventory(world, pos);
super.breakBlock(world, pos, state);
}

View file

@ -42,9 +42,9 @@ public class BlockEnergizer extends BlockContainerBase{
this.setSoundType(SoundType.STONE);
}
@Nonnull
@Override
public TileEntity createNewTileEntity(@Nonnull World world, int par2){
public TileEntity createNewTileEntity(World world, int par2){
return this.isEnergizer ? new TileEntityEnergizer() : new TileEntityEnervator();
}
@ -74,7 +74,7 @@ public class BlockEnergizer extends BlockContainerBase{
}
@Override
public void breakBlock(World world, @Nonnull BlockPos pos, @Nonnull IBlockState state){
public void breakBlock(World world, BlockPos pos, IBlockState state){
this.dropInventory(world, pos);
super.breakBlock(world, pos, state);
}

View file

@ -38,9 +38,9 @@ public class BlockFeeder extends BlockContainerBase{
this.setSoundType(SoundType.STONE);
}
@Nonnull
@Override
public TileEntity createNewTileEntity(@Nonnull World world, int par2){
public TileEntity createNewTileEntity(World world, int par2){
return new TileEntityFeeder();
}
@ -62,7 +62,7 @@ public class BlockFeeder extends BlockContainerBase{
}
@Override
public void breakBlock(World world, @Nonnull BlockPos pos, @Nonnull IBlockState state){
public void breakBlock(World world, BlockPos pos, IBlockState state){
this.dropInventory(world, pos);
super.breakBlock(world, pos, state);
}

View file

@ -38,14 +38,14 @@ public class BlockFermentingBarrel extends BlockContainerBase{
this.setSoundType(SoundType.WOOD);
}
@Nonnull
@Override
public TileEntity createNewTileEntity(@Nonnull World world, int par2){
public TileEntity createNewTileEntity(World world, int par2){
return new TileEntityFermentingBarrel();
}
@Override
public void breakBlock(World world, @Nonnull BlockPos pos, @Nonnull IBlockState state){
public void breakBlock(World world, BlockPos pos, IBlockState state){
this.dropInventory(world, pos);
super.breakBlock(world, pos, state);
}

View file

@ -37,9 +37,9 @@ public class BlockFireworkBox extends BlockContainerBase{
this.setSoundType(SoundType.STONE);
}
@Nonnull
@Override
public TileEntity createNewTileEntity(@Nonnull World world, int par2){
public TileEntity createNewTileEntity(World world, int par2){
return new TileEntityFireworkBox();
}
@ -54,7 +54,7 @@ public class BlockFireworkBox extends BlockContainerBase{
}
@Override
public void breakBlock(World world, @Nonnull BlockPos pos, @Nonnull IBlockState state){
public void breakBlock(World world, BlockPos pos, IBlockState state){
this.dropInventory(world, pos);
super.breakBlock(world, pos, state);
}

View file

@ -38,15 +38,15 @@ public class BlockFishingNet extends BlockContainerBase{
}
@SuppressWarnings("deprecation")
@Nonnull
@Override
public AxisAlignedBB getBoundingBox(IBlockState state, IBlockAccess source, BlockPos pos){
return AABB;
}
@Nonnull
@Override
public TileEntity createNewTileEntity(@Nonnull World world, int par2){
public TileEntity createNewTileEntity(World world, int par2){
return new TileEntityFishingNet();
}

View file

@ -49,9 +49,9 @@ public class BlockFluidCollector extends BlockContainerBase{
this.setSoundType(SoundType.STONE);
}
@Nonnull
@Override
public TileEntity createNewTileEntity(@Nonnull World world, int par2){
public TileEntity createNewTileEntity(World world, int par2){
return this.isPlacer ? new TileEntityFluidPlacer() : new TileEntityFluidCollector();
}
@ -91,7 +91,7 @@ public class BlockFluidCollector extends BlockContainerBase{
}
@Override
public void breakBlock(World world, @Nonnull BlockPos pos, @Nonnull IBlockState state){
public void breakBlock(World world, BlockPos pos, IBlockState state){
this.dropInventory(world, pos);
super.breakBlock(world, pos, state);
}

View file

@ -51,9 +51,9 @@ public class BlockFurnaceDouble extends BlockContainerBase{
this.setTickRandomly(true);
}
@Nonnull
@Override
public TileEntity createNewTileEntity(@Nonnull World world, int par2){
public TileEntity createNewTileEntity(World world, int par2){
return new TileEntityFurnaceDouble();
}
@ -105,7 +105,7 @@ public class BlockFurnaceDouble extends BlockContainerBase{
}
@Override
public int getLightValue(@Nonnull IBlockState state, IBlockAccess world, @Nonnull BlockPos pos){
public int getLightValue(IBlockState state, IBlockAccess world, BlockPos pos){
return PosUtil.getMetadata(state) > 3 ? 12 : 0;
}
@ -140,7 +140,7 @@ public class BlockFurnaceDouble extends BlockContainerBase{
}
@Override
public void breakBlock(World world, @Nonnull BlockPos pos, @Nonnull IBlockState state){
public void breakBlock(World world, BlockPos pos, IBlockState state){
this.dropInventory(world, pos);
super.breakBlock(world, pos, state);
}

View file

@ -38,15 +38,15 @@ public class BlockFurnaceSolar extends BlockContainerBase{
}
@SuppressWarnings("deprecation")
@Nonnull
@Override
public AxisAlignedBB getBoundingBox(IBlockState state, IBlockAccess source, BlockPos pos){
return AABB;
}
@Nonnull
@Override
public TileEntity createNewTileEntity(@Nonnull World world, int par2){
public TileEntity createNewTileEntity(World world, int par2){
return new TileEntityFurnaceSolar();
}

View file

@ -45,9 +45,9 @@ public class BlockGiantChest extends BlockContainerBase{
this.setSoundType(SoundType.WOOD);
}
@Nonnull
@Override
public TileEntity createNewTileEntity(@Nonnull World world, int par2){
public TileEntity createNewTileEntity(World world, int par2){
return new TileEntityGiantChest();
}
@ -85,9 +85,9 @@ public class BlockGiantChest extends BlockContainerBase{
super.onBlockPlacedBy(world, pos, state, entity, stack);
}
@Nonnull
@Override
public ArrayList<ItemStack> getDrops(IBlockAccess world, BlockPos pos, @Nonnull IBlockState state, int fortune){
public ArrayList<ItemStack> getDrops(IBlockAccess world, BlockPos pos, IBlockState state, int fortune){
ArrayList<ItemStack> drops = super.getDrops(world, pos, state, fortune);
TileEntity tile = world.getTileEntity(pos);
@ -121,7 +121,7 @@ public class BlockGiantChest extends BlockContainerBase{
}
@Override
public void breakBlock(World world, @Nonnull BlockPos pos, @Nonnull IBlockState state){
public void breakBlock(World world, BlockPos pos, IBlockState state){
TileEntity tile = world.getTileEntity(pos);
if(tile instanceof TileEntityGiantChest){
if(!ItemUtil.contains(((TileEntityGiantChest)tile).slots, new ItemStack(InitItems.itemCrateKeeper), false)){

View file

@ -48,7 +48,7 @@ public class BlockGreenhouseGlass extends BlockContainerBase{
@SuppressWarnings("deprecation")
@Override
@SideOnly(Side.CLIENT)
public boolean shouldSideBeRendered(IBlockState state, @Nonnull IBlockAccess worldIn, @Nonnull BlockPos pos, EnumFacing side){
public boolean shouldSideBeRendered(IBlockState state, IBlockAccess worldIn, BlockPos pos, EnumFacing side){
Block block = state.getBlock();
return worldIn.getBlockState(pos.offset(side.getOpposite())) != state || block != this && block != this && super.shouldSideBeRendered(state, worldIn, pos, side);
@ -60,7 +60,7 @@ public class BlockGreenhouseGlass extends BlockContainerBase{
return false;
}
@Nonnull
@Override
@SideOnly(Side.CLIENT)
public BlockRenderLayer getBlockLayer(){
@ -72,9 +72,9 @@ public class BlockGreenhouseGlass extends BlockContainerBase{
return EnumRarity.EPIC;
}
@Nonnull
@Override
public TileEntity createNewTileEntity(@Nonnull World world, int par2){
public TileEntity createNewTileEntity(World world, int par2){
return new TileEntityGreenhouseGlass();
}
}

View file

@ -52,9 +52,9 @@ public class BlockGrinder extends BlockContainerBase{
this.setTickRandomly(true);
}
@Nonnull
@Override
public TileEntity createNewTileEntity(@Nonnull World world, int par2){
public TileEntity createNewTileEntity(World world, int par2){
return this.isDouble ? new TileEntityGrinderDouble() : new TileEntityGrinder();
}
@ -86,7 +86,7 @@ public class BlockGrinder extends BlockContainerBase{
}
@Override
public int getLightValue(@Nonnull IBlockState state, IBlockAccess world, @Nonnull BlockPos pos){
public int getLightValue(IBlockState state, IBlockAccess world, BlockPos pos){
return PosUtil.getMetadata(pos, world) == 1 ? 12 : 0;
}
@ -101,7 +101,7 @@ public class BlockGrinder extends BlockContainerBase{
}
@Override
public void breakBlock(World world, @Nonnull BlockPos pos, @Nonnull IBlockState state){
public void breakBlock(World world, BlockPos pos, IBlockState state){
this.dropInventory(world, pos);
super.breakBlock(world, pos, state);
}

View file

@ -31,9 +31,9 @@ public class BlockHeatCollector extends BlockContainerBase{
this.setSoundType(SoundType.STONE);
}
@Nonnull
@Override
public TileEntity createNewTileEntity(@Nonnull World world, int par2){
public TileEntity createNewTileEntity(World world, int par2){
return new TileEntityHeatCollector();
}

View file

@ -52,9 +52,9 @@ public class BlockInputter extends BlockContainerBase{
this.isAdvanced = isAdvanced;
}
@Nonnull
@Override
public TileEntity createNewTileEntity(@Nonnull World world, int par2){
public TileEntity createNewTileEntity(World world, int par2){
return this.isAdvanced ? new TileEntityInputterAdvanced() : new TileEntityInputter();
}
@ -71,7 +71,7 @@ public class BlockInputter extends BlockContainerBase{
}
@Override
public void breakBlock(World world, @Nonnull BlockPos pos, @Nonnull IBlockState state){
public void breakBlock(World world, BlockPos pos, IBlockState state){
if(!world.isRemote){
TileEntity aTile = world.getTileEntity(pos);
if(aTile instanceof TileEntityInventoryBase){
@ -103,7 +103,7 @@ public class BlockInputter extends BlockContainerBase{
this.setMaxDamage(0);
}
@Nonnull
@Override
public String getUnlocalizedName(ItemStack stack){
return this.getUnlocalizedName();
@ -114,9 +114,9 @@ public class BlockInputter extends BlockContainerBase{
return damage;
}
@Nonnull
@Override
public String getItemStackDisplayName(@Nonnull ItemStack stack){
public String getItemStackDisplayName(ItemStack stack){
long sysTime = System.currentTimeMillis();
if(this.lastSysTime+5000 < sysTime){

View file

@ -42,9 +42,9 @@ public class BlockItemRepairer extends BlockContainerBase{
this.setTickRandomly(true);
}
@Nonnull
@Override
public TileEntity createNewTileEntity(@Nonnull World world, int par2){
public TileEntity createNewTileEntity(World world, int par2){
return new TileEntityItemRepairer();
}
@ -61,7 +61,7 @@ public class BlockItemRepairer extends BlockContainerBase{
}
@Override
public int getLightValue(@Nonnull IBlockState state, IBlockAccess world, @Nonnull BlockPos pos){
public int getLightValue(IBlockState state, IBlockAccess world, BlockPos pos){
return PosUtil.getMetadata(pos, world) == 1 ? 12 : 0;
}
@ -71,7 +71,7 @@ public class BlockItemRepairer extends BlockContainerBase{
}
@Override
public void breakBlock(World world, @Nonnull BlockPos pos, @Nonnull IBlockState state){
public void breakBlock(World world, BlockPos pos, IBlockState state){
this.dropInventory(world, pos);
super.breakBlock(world, pos, state);
}

View file

@ -31,9 +31,9 @@ public class BlockItemViewer extends BlockContainerBase{
this.setSoundType(SoundType.STONE);
}
@Nonnull
@Override
public TileEntity createNewTileEntity(@Nonnull World worldIn, int meta){
public TileEntity createNewTileEntity(World worldIn, int meta){
return new TileEntityItemViewer();
}

View file

@ -60,7 +60,7 @@ public class BlockLaserRelay extends BlockContainerBase{
return false;
}
@Nonnull
@Override
public IBlockState onBlockPlaced(World world, BlockPos pos, EnumFacing side, float hitX, float hitY, float hitZ, int meta, EntityLivingBase base){
return this.getStateFromMeta(side.ordinal());
@ -90,9 +90,9 @@ public class BlockLaserRelay extends BlockContainerBase{
return false;
}
@Nonnull
@Override
public TileEntity createNewTileEntity(@Nonnull World world, int i){
public TileEntity createNewTileEntity(World world, int i){
switch(this.type){
case ITEM:
return new TileEntityLaserRelayItem();

View file

@ -40,9 +40,9 @@ public class BlockLavaFactoryController extends BlockContainerBase implements IH
this.setSoundType(SoundType.STONE);
}
@Nonnull
@Override
public TileEntity createNewTileEntity(@Nonnull World world, int par2){
public TileEntity createNewTileEntity(World world, int par2){
return new TileEntityLavaFactoryController();
}

View file

@ -33,9 +33,9 @@ public class BlockLeafGenerator extends BlockContainerBase{
this.setSoundType(SoundType.METAL);
}
@Nonnull
@Override
public TileEntity createNewTileEntity(@Nonnull World world, int par2){
public TileEntity createNewTileEntity(World world, int par2){
return new TileEntityLeafGenerator();
}
@ -45,7 +45,7 @@ public class BlockLeafGenerator extends BlockContainerBase{
}
@Override
public void breakBlock(World world, @Nonnull BlockPos pos, @Nonnull IBlockState state){
public void breakBlock(World world, BlockPos pos, IBlockState state){
this.dropInventory(world, pos);
super.breakBlock(world, pos, state);
}

View file

@ -68,14 +68,14 @@ public class BlockMiner extends BlockContainerBase implements IHudDisplay{
return EnumRarity.RARE;
}
@Nonnull
@Override
public TileEntity createNewTileEntity(@Nonnull World world, int i){
public TileEntity createNewTileEntity(World world, int i){
return new TileEntityMiner();
}
@Override
public void breakBlock(World world, @Nonnull BlockPos pos, @Nonnull IBlockState state){
public void breakBlock(World world, BlockPos pos, IBlockState state){
this.dropInventory(world, pos);
super.breakBlock(world, pos, state);
}

View file

@ -85,7 +85,7 @@ public class BlockMisc extends BlockBase{
this.setMaxDamage(0);
}
@Nonnull
@Override
public String getUnlocalizedName(ItemStack stack){
return stack.getItemDamage() >= ALL_MISC_BLOCKS.length ? StringUtil.BUGGED_ITEM_NAME : this.getUnlocalizedName()+ALL_MISC_BLOCKS[stack.getItemDamage()].name;

View file

@ -49,9 +49,9 @@ public class BlockOilGenerator extends BlockContainerBase{
this.setTickRandomly(true);
}
@Nonnull
@Override
public TileEntity createNewTileEntity(@Nonnull World world, int par2){
public TileEntity createNewTileEntity(World world, int par2){
return new TileEntityOilGenerator();
}
@ -90,7 +90,7 @@ public class BlockOilGenerator extends BlockContainerBase{
}
@Override
public void breakBlock(World world, @Nonnull BlockPos pos, @Nonnull IBlockState state){
public void breakBlock(World world, BlockPos pos, IBlockState state){
this.dropInventory(world, pos);
super.breakBlock(world, pos, state);
}

View file

@ -85,16 +85,16 @@ public class BlockPhantom extends BlockContainerBase implements IHudDisplay{
}
@Override
public void breakBlock(World world, @Nonnull BlockPos pos, @Nonnull IBlockState state){
public void breakBlock(World world, BlockPos pos, IBlockState state){
if(this.type == Type.PLACER || this.type == Type.BREAKER){
this.dropInventory(world, pos);
}
super.breakBlock(world, pos, state);
}
@Nonnull
@Override
public TileEntity createNewTileEntity(@Nonnull World world, int par2){
public TileEntity createNewTileEntity(World world, int par2){
switch(this.type){
case PLACER:
return new TileEntityPhantomPlacer();

View file

@ -38,7 +38,7 @@ public class BlockPhantomBooster extends BlockContainerBase{
}
@SuppressWarnings("deprecation")
@Nonnull
@Override
public AxisAlignedBB getBoundingBox(IBlockState state, IBlockAccess source, BlockPos pos){
return AABB;
@ -61,9 +61,9 @@ public class BlockPhantomBooster extends BlockContainerBase{
return EnumRarity.EPIC;
}
@Nonnull
@Override
public TileEntity createNewTileEntity(@Nonnull World world, int i){
public TileEntity createNewTileEntity(World world, int i){
return new TileEntityPhantomBooster();
}
}

View file

@ -38,9 +38,9 @@ public class BlockRangedCollector extends BlockContainerBase{
this.setSoundType(SoundType.STONE);
}
@Nonnull
@Override
public TileEntity createNewTileEntity(@Nonnull World world, int par2){
public TileEntity createNewTileEntity(World world, int par2){
return new TileEntityRangedCollector();
}
@ -62,7 +62,7 @@ public class BlockRangedCollector extends BlockContainerBase{
}
@Override
public void breakBlock(World world, @Nonnull BlockPos pos, @Nonnull IBlockState state){
public void breakBlock(World world, BlockPos pos, IBlockState state){
if(!world.isRemote){
TileEntity aTile = world.getTileEntity(pos);
if(aTile instanceof TileEntityRangedCollector){

View file

@ -80,7 +80,7 @@ public class BlockSlabs extends BlockBase{
return false;
}
@Nonnull
@Override
public IBlockState onBlockPlaced(World world, BlockPos pos, EnumFacing facing, float hitX, float hitY, float hitZ, int meta, EntityLivingBase placer){
if(facing.ordinal() == 1){
@ -93,7 +93,7 @@ public class BlockSlabs extends BlockBase{
}
@SuppressWarnings("deprecation")
@Nonnull
@Override
public AxisAlignedBB getBoundingBox(IBlockState state, IBlockAccess source, BlockPos pos){
return state.getValue(META) == 1 ? AABB_TOP_HALF : AABB_BOTTOM_HALF;
@ -123,9 +123,9 @@ public class BlockSlabs extends BlockBase{
}
@SuppressWarnings("deprecation")
@Nonnull
@Override
public EnumActionResult onItemUse(ItemStack stack, @Nonnull EntityPlayer playerIn, World worldIn, @Nonnull BlockPos pos, EnumHand hand, @Nonnull EnumFacing facing, float hitX, float hitY, float hitZ){
public EnumActionResult onItemUse(ItemStack stack, EntityPlayer playerIn, World worldIn, BlockPos pos, EnumHand hand, EnumFacing facing, float hitX, float hitY, float hitZ){
if(stack.stackSize != 0 && playerIn.canPlayerEdit(pos.offset(facing), facing, stack)){
IBlockState state = worldIn.getBlockState(pos);
@ -154,7 +154,7 @@ public class BlockSlabs extends BlockBase{
@Override
@SideOnly(Side.CLIENT)
public boolean canPlaceBlockOnSide(World worldIn, @Nonnull BlockPos pos, @Nonnull EnumFacing side, EntityPlayer player, @Nonnull ItemStack stack){
public boolean canPlaceBlockOnSide(World worldIn, BlockPos pos, EnumFacing side, EntityPlayer player, ItemStack stack){
IBlockState state = worldIn.getBlockState(pos);
if(state.getBlock() == this.block){
@ -187,7 +187,7 @@ public class BlockSlabs extends BlockBase{
return false;
}
@Nonnull
@Override
public String getUnlocalizedName(ItemStack stack){
return this.getUnlocalizedName();

View file

@ -89,14 +89,14 @@ public class BlockSmileyCloud extends BlockContainerBase{
return true;
}
@Nonnull
@Override
public TileEntity createNewTileEntity(@Nonnull World world, int meta){
public TileEntity createNewTileEntity(World world, int meta){
return new TileEntitySmileyCloud();
}
@Override
public void breakBlock(World world, @Nonnull BlockPos pos, @Nonnull IBlockState state){
public void breakBlock(World world, BlockPos pos, IBlockState state){
this.dropInventory(world, pos);
super.breakBlock(world, pos, state);
}

View file

@ -98,7 +98,7 @@ public class BlockTreasureChest extends BlockBase{
}
@Override
public boolean canSilkHarvest(World world, BlockPos pos, @Nonnull IBlockState state, EntityPlayer player){
public boolean canSilkHarvest(World world, BlockPos pos, IBlockState state, EntityPlayer player){
return false;
}

View file

@ -80,9 +80,9 @@ public class BlockWallAA extends BlockBase{
}
@SuppressWarnings("deprecation")
@Nonnull
@Override
public IBlockState getActualState(@Nonnull IBlockState state, IBlockAccess worldIn, BlockPos pos){
public IBlockState getActualState(IBlockState state, IBlockAccess worldIn, BlockPos pos){
boolean flag = this.canConnectTo(worldIn, pos.north());
boolean flag1 = this.canConnectTo(worldIn, pos.east());
boolean flag2 = this.canConnectTo(worldIn, pos.south());
@ -105,12 +105,12 @@ public class BlockWallAA extends BlockBase{
@SuppressWarnings("deprecation")
@Override
@SideOnly(Side.CLIENT)
public boolean shouldSideBeRendered(IBlockState blockState, @Nonnull IBlockAccess blockAccess, @Nonnull BlockPos pos, EnumFacing side){
public boolean shouldSideBeRendered(IBlockState blockState, IBlockAccess blockAccess, BlockPos pos, EnumFacing side){
return side != EnumFacing.DOWN || super.shouldSideBeRendered(blockState, blockAccess, pos, side);
}
@SuppressWarnings("deprecation")
@Nonnull
@Override
public AxisAlignedBB getBoundingBox(IBlockState state, IBlockAccess source, BlockPos pos){
state = this.getActualState(state, source, pos);
@ -119,7 +119,7 @@ public class BlockWallAA extends BlockBase{
@SuppressWarnings("deprecation")
@Override
public AxisAlignedBB getCollisionBoundingBox(IBlockState blockState, @Nonnull World worldIn, @Nonnull BlockPos pos){
public AxisAlignedBB getCollisionBoundingBox(IBlockState blockState, World worldIn, BlockPos pos){
blockState = this.getActualState(blockState, worldIn, pos);
return CLIP_AABB_BY_INDEX[yesThisIsCopyPastedFromBlockWallAndIHaveNoIdeaWhatThisMethodDoes(blockState)];
}
@ -138,7 +138,7 @@ public class BlockWallAA extends BlockBase{
@SuppressWarnings("unchecked")
@Override
@SideOnly(Side.CLIENT)
public void getSubBlocks(@Nonnull Item item, CreativeTabs tab, List list){
public void getSubBlocks(Item item, CreativeTabs tab, List list){
list.add(new ItemStack(item, 1, 0));
}
@ -149,7 +149,7 @@ public class BlockWallAA extends BlockBase{
return block != Blocks.BARRIER && (!(block != this && !(block instanceof BlockFenceGate)) || ((block.getMaterial(state).isOpaque() && block.isFullCube(state)) && block.getMaterial(state) != Material.GOURD));
}
@Nonnull
@Override
public IBlockState getStateFromMeta(int meta){
return this.getDefaultState();
@ -160,7 +160,7 @@ public class BlockWallAA extends BlockBase{
return 0;
}
@Nonnull
@Override
protected BlockStateContainer createBlockState(){
return new BlockStateContainer(this, BlockWall.UP, BlockWall.NORTH, BlockWall.EAST, BlockWall.WEST, BlockWall.SOUTH);

View file

@ -56,10 +56,10 @@ public class BlockWildPlant extends BlockBushBase{
return PosUtil.getMetadata(state) == TheWildPlants.RICE.ordinal() ? PosUtil.getMaterial(offset, world) == Material.WATER : PosUtil.getBlock(offset, world).canSustainPlant(world.getBlockState(offset), world, offset, EnumFacing.UP, this);
}
@Nonnull
@Override
@SideOnly(Side.CLIENT)
public ItemStack getPickBlock(@Nonnull IBlockState state, RayTraceResult target, @Nonnull World world, @Nonnull BlockPos pos, EntityPlayer player){
public ItemStack getPickBlock(IBlockState state, RayTraceResult target, World world, BlockPos pos, EntityPlayer player){
int metadata = PosUtil.getMetadata(pos, world);
return metadata >= allWildPlants.length ? null : new ItemStack(((BlockPlant)allWildPlants[metadata].wildVersionOf).seedItem);
}
@ -73,15 +73,15 @@ public class BlockWildPlant extends BlockBushBase{
}
@SuppressWarnings("deprecation")
@Nonnull
@Override
public List<ItemStack> getDrops(IBlockAccess world, BlockPos pos, @Nonnull IBlockState state, int fortune){
public List<ItemStack> getDrops(IBlockAccess world, BlockPos pos, IBlockState state, int fortune){
int metadata = PosUtil.getMetadata(state);
return metadata >= allWildPlants.length ? null : allWildPlants[metadata].wildVersionOf.getDrops(world, pos, allWildPlants[metadata].wildVersionOf.getStateFromMeta(7), fortune);
}
@Override
public boolean canSilkHarvest(World world, BlockPos pos, @Nonnull IBlockState state, EntityPlayer player){
public boolean canSilkHarvest(World world, BlockPos pos, IBlockState state, EntityPlayer player){
return false;
}
@ -120,7 +120,7 @@ public class BlockWildPlant extends BlockBushBase{
this.setMaxDamage(0);
}
@Nonnull
@Override
public String getUnlocalizedName(ItemStack stack){
return stack.getItemDamage() >= allWildPlants.length ? StringUtil.BUGGED_ITEM_NAME : this.getUnlocalizedName()+allWildPlants[stack.getItemDamage()].name;

View file

@ -48,9 +48,9 @@ public class BlockXPSolidifier extends BlockContainerBase{
this.setSoundType(SoundType.STONE);
}
@Nonnull
@Override
public TileEntity createNewTileEntity(@Nonnull World world, int par2){
public TileEntity createNewTileEntity(World world, int par2){
return new TileEntityXPSolidifier();
}
@ -97,7 +97,7 @@ public class BlockXPSolidifier extends BlockContainerBase{
}
@Override
public void breakBlock(World world, @Nonnull BlockPos pos, @Nonnull IBlockState state){
public void breakBlock(World world, BlockPos pos, IBlockState state){
this.dropInventory(world, pos);
TileEntity tile = world.getTileEntity(pos);
if(tile instanceof TileEntityXPSolidifier){

View file

@ -61,7 +61,7 @@ public class BlockBase extends Block{
}
@SuppressWarnings("deprecation")
@Nonnull
@Override
public IBlockState getStateFromMeta(int meta){
return this.getMetaProperty() == null ? super.getStateFromMeta(meta) : this.getDefaultState().withProperty(this.getMetaProperty(), meta);
@ -72,7 +72,7 @@ public class BlockBase extends Block{
return this.getMetaProperty() == null ? super.getMetaFromState(state) : state.getValue(this.getMetaProperty());
}
@Nonnull
@Override
protected BlockStateContainer createBlockState(){
return this.getMetaProperty() == null ? super.createBlockState() : new BlockStateContainer(this, this.getMetaProperty());

View file

@ -61,7 +61,7 @@ public class BlockBushBase extends BlockBush{
}
@SuppressWarnings("deprecation")
@Nonnull
@Override
public IBlockState getStateFromMeta(int meta){
return this.getMetaProperty() == null ? super.getStateFromMeta(meta) : this.getDefaultState().withProperty(this.getMetaProperty(), meta);
@ -72,7 +72,7 @@ public class BlockBushBase extends BlockBush{
return this.getMetaProperty() == null ? super.getMetaFromState(state) : state.getValue(this.getMetaProperty());
}
@Nonnull
@Override
protected BlockStateContainer createBlockState(){
return this.getMetaProperty() == null ? super.createBlockState() : new BlockStateContainer(this, this.getMetaProperty());

View file

@ -130,7 +130,7 @@ public abstract class BlockContainerBase extends BlockContainer{
}
@SuppressWarnings("deprecation")
@Nonnull
@Override
public IBlockState getStateFromMeta(int meta){
return this.getMetaProperty() == null ? super.getStateFromMeta(meta) : this.getDefaultState().withProperty(this.getMetaProperty(), meta);
@ -241,15 +241,15 @@ public abstract class BlockContainerBase extends BlockContainer{
return 0;
}
@Nonnull
@Override
protected BlockStateContainer createBlockState(){
return this.getMetaProperty() == null ? super.createBlockState() : new BlockStateContainer(this, this.getMetaProperty());
}
@Nonnull
@Override
public ArrayList<ItemStack> getDrops(IBlockAccess world, BlockPos pos, @Nonnull IBlockState state, int fortune){
public ArrayList<ItemStack> getDrops(IBlockAccess world, BlockPos pos, IBlockState state, int fortune){
ArrayList<ItemStack> drops = new ArrayList<ItemStack>();
TileEntity tile = world.getTileEntity(pos);
@ -295,7 +295,7 @@ public abstract class BlockContainerBase extends BlockContainer{
return null;
}
@Nonnull
@Override
public EnumBlockRenderType getRenderType(IBlockState state){
return EnumBlockRenderType.MODEL;

View file

@ -73,7 +73,7 @@ public class BlockPlant extends BlockCrops{
return EnumRarity.RARE;
}
@Nonnull
@Override
public EnumPlantType getPlantType(IBlockAccess world, BlockPos pos){
return EnumPlantType.Crop;
@ -112,18 +112,18 @@ public class BlockPlant extends BlockCrops{
return false;
}
@Nonnull
@Override
public Item getSeed(){
return this.seedItem;
}
@Override
public int quantityDropped(IBlockState state, int fortune, @Nonnull Random random){
public int quantityDropped(IBlockState state, int fortune, Random random){
return this.getMetaFromState(state) >= 7 ? random.nextInt(this.addDropAmount)+this.minDropAmount : super.quantityDropped(state, fortune, random);
}
@Nonnull
@Override
public Item getCrop(){
return this.returnItem;
@ -131,7 +131,7 @@ public class BlockPlant extends BlockCrops{
@Override
public Item getItemDropped(@Nonnull IBlockState state, Random rand, int par3){
public Item getItemDropped(IBlockState state, Random rand, int par3){
return this.getMetaFromState(state) >= 7 ? this.getCrop() : this.getSeed();
}

View file

@ -26,7 +26,7 @@ public class ItemBlockBase extends ItemBlock{
this.setMaxDamage(0);
}
@Nonnull
@Override
public String getUnlocalizedName(ItemStack stack){
return this.getUnlocalizedName();
@ -37,7 +37,7 @@ public class ItemBlockBase extends ItemBlock{
return damage;
}
@Nonnull
@Override
public EnumRarity getRarity(ItemStack stack){
if(this.block instanceof BlockBase){

View file

@ -26,7 +26,7 @@ import javax.annotation.Nonnull;
public class RenderCompost extends TileEntitySpecialRenderer{
@Override
public void renderTileEntityAt(@Nonnull TileEntity te, double x, double y, double z, float partialTicks, int destroyStage){
public void renderTileEntityAt(TileEntity te, double x, double y, double z, float partialTicks, int destroyStage){
if(te instanceof TileEntityCompost){
TileEntityCompost compost = (TileEntityCompost)te;
ItemStack slot = compost.getStackInSlot(0);

View file

@ -25,7 +25,7 @@ import javax.annotation.Nonnull;
public class RenderReconstructorLens extends TileEntitySpecialRenderer{
@Override
public void renderTileEntityAt(@Nonnull TileEntity tile, double x, double y, double z, float par5, int par6){
public void renderTileEntityAt(TileEntity tile, double x, double y, double z, float par5, int par6){
if(!(tile instanceof TileEntityAtomicReconstructor)){
return;
}

View file

@ -27,7 +27,7 @@ import java.util.Locale;
public class RenderSmileyCloud extends TileEntitySpecialRenderer{
@Override
public void renderTileEntityAt(@Nonnull TileEntity tile, double x, double y, double z, float par5, int partial){
public void renderTileEntityAt(TileEntity tile, double x, double y, double z, float par5, int partial){
if(tile instanceof TileEntitySmileyCloud){
TileEntitySmileyCloud theCloud = (TileEntitySmileyCloud)tile;

View file

@ -200,7 +200,7 @@ public class GuiBooklet extends GuiScreen implements IBookletGui{
}
@Override
public void drawHoveringText(@Nonnull List list, int x, int y){
public void drawHoveringText(List list, int x, int y){
super.drawHoveringText(list, x, y);
}

View file

@ -54,7 +54,7 @@ public class GuiBookletStand extends GuiBooklet{
this.buttonSetPage = new GuiButton(-100, this.guiLeft+this.xSize+10, this.guiTop+10, 100, 20, "Set Page"){
@Override
public void drawButton(@Nonnull Minecraft mc, int x, int y){
public void drawButton(Minecraft mc, int x, int y){
boolean unicodeBefore = mc.fontRendererObj.getUnicodeFlag();
mc.fontRendererObj.setUnicodeFlag(false);
super.drawButton(mc, x, y);

View file

@ -54,7 +54,7 @@ public class BookmarkButton extends GuiButton{
}
@Override
public void drawButton(@Nonnull Minecraft minecraft, int x, int y){
public void drawButton(Minecraft minecraft, int x, int y){
if(this.visible){
minecraft.getTextureManager().bindTexture(GuiBooklet.resLoc);
GlStateManager.color(1.0F, 1.0F, 1.0F, 1.0F);

View file

@ -34,7 +34,7 @@ public class IndexButton extends GuiButton{
}
@Override
public void drawButton(@Nonnull Minecraft minecraft, int mouseX, int mouseY){
public void drawButton(Minecraft minecraft, int mouseX, int mouseY){
if(this.visible){
GlStateManager.color(1.0F, 1.0F, 1.0F, 1.0F);
this.hovered = mouseX >= this.xPosition && mouseY >= this.yPosition && mouseX < this.xPosition+this.width && mouseY < this.yPosition+this.height;

View file

@ -44,7 +44,7 @@ public class TexturedButton extends GuiButton{
}
@Override
public void drawButton(@Nonnull Minecraft minecraft, int x, int y){
public void drawButton(Minecraft minecraft, int x, int y){
if(this.visible){
minecraft.getTextureManager().bindTexture(GuiBooklet.resLoc);
GlStateManager.color(1.0F, 1.0F, 1.0F, 1.0F);

View file

@ -37,13 +37,13 @@ public class CreativeTab extends CreativeTabs{
super(ModUtil.MOD_ID);
}
@Nonnull
@Override
public ItemStack getIconItemStack(){
return new ItemStack(this.getTabIconItem());
}
@Nonnull
@Override
public Item getTabIconItem(){
return InitItems.itemBooklet;
@ -51,7 +51,7 @@ public class CreativeTab extends CreativeTabs{
@Override
@SideOnly(Side.CLIENT)
public void displayAllRelevantItems(@Nonnull List<ItemStack> list){
public void displayAllRelevantItems(List<ItemStack> list){
this.list = list;
this.add(InitItems.itemBooklet);

View file

@ -49,7 +49,7 @@ public class VillageComponentCustomCropField extends StructureVillagePieces.Hous
}
@Override
public boolean addComponentParts(@Nonnull World world, @Nonnull Random rand, @Nonnull StructureBoundingBox sbb){
public boolean addComponentParts(World world, Random rand, StructureBoundingBox sbb){
if(this.averageGroundLevel < 0){
this.averageGroundLevel = this.getAverageGroundLevel(world, sbb);
if(this.averageGroundLevel < 0){

View file

@ -47,7 +47,7 @@ public class VillageComponentJamHouse extends StructureVillagePieces.House1{
}
@Override
public boolean addComponentParts(@Nonnull World world, @Nonnull Random rand, @Nonnull StructureBoundingBox sbb){
public boolean addComponentParts(World world, Random rand, StructureBoundingBox sbb){
if(this.averageGroundLevel < 0){
this.averageGroundLevel = this.getAverageGroundLevel(world, sbb);
if(this.averageGroundLevel < 0){

View file

@ -29,7 +29,7 @@ import java.util.Random;
public class WorldGenLushCaves extends WorldGenerator{
@Override
public boolean generate(@Nonnull World world, @Nonnull Random rand, @Nonnull BlockPos position){
public boolean generate(World world, Random rand, BlockPos position){
this.generateCave(world, position, rand);
return true;
}

View file

@ -94,7 +94,7 @@ public class ContainerBreaker extends Container{
}
@Override
public boolean canInteractWith(@Nonnull EntityPlayer player){
public boolean canInteractWith(EntityPlayer player){
return this.breaker.isUseableByPlayer(player);
}
}

View file

@ -97,7 +97,7 @@ public class ContainerCanolaPress extends Container{
}
@Override
public boolean canInteractWith(@Nonnull EntityPlayer player){
public boolean canInteractWith(EntityPlayer player){
return this.press.isUseableByPlayer(player);
}
}

View file

@ -96,7 +96,7 @@ public class ContainerCoalGenerator extends Container{
}
@Override
public boolean canInteractWith(@Nonnull EntityPlayer player){
public boolean canInteractWith(EntityPlayer player){
return this.generator.isUseableByPlayer(player);
}
}

View file

@ -124,7 +124,7 @@ public class ContainerCoffeeMachine extends Container{
}
@Override
public boolean canInteractWith(@Nonnull EntityPlayer player){
public boolean canInteractWith(EntityPlayer player){
return this.machine.isUseableByPlayer(player);
}
}

View file

@ -112,7 +112,7 @@ public class ContainerCrafter extends Container{
}
@Override
public boolean canInteractWith(@Nonnull EntityPlayer player){
public boolean canInteractWith(EntityPlayer player){
return true;
}
}

View file

@ -95,7 +95,7 @@ public class ContainerDirectionalBreaker extends Container{
}
@Override
public boolean canInteractWith(@Nonnull EntityPlayer player){
public boolean canInteractWith(EntityPlayer player){
return this.breaker.isUseableByPlayer(player);
}
}

View file

@ -145,7 +145,7 @@ public class ContainerDrill extends Container{
}
@Override
public boolean canInteractWith(@Nonnull EntityPlayer player){
public boolean canInteractWith(EntityPlayer player){
return this.drillInventory.isUseableByPlayer(player);
}
@ -153,7 +153,7 @@ public class ContainerDrill extends Container{
public ItemStack[] slots = new ItemStack[SLOT_AMOUNT];
@Nonnull
@Override
public String getName(){
return "drill";
@ -170,22 +170,22 @@ public class ContainerDrill extends Container{
}
@Override
public boolean isUseableByPlayer(@Nonnull EntityPlayer player){
public boolean isUseableByPlayer(EntityPlayer player){
return true;
}
@Override
public void openInventory(@Nonnull EntityPlayer player){
public void openInventory(EntityPlayer player){
}
@Override
public void closeInventory(@Nonnull EntityPlayer player){
public void closeInventory(EntityPlayer player){
}
@Override
public boolean isItemValidForSlot(int index, @Nonnull ItemStack stack){
public boolean isItemValidForSlot(int index, ItemStack stack){
return true;
}
@ -263,7 +263,7 @@ public class ContainerDrill extends Container{
return false;
}
@Nonnull
@Override
public ITextComponent getDisplayName(){
return new TextComponentTranslation(this.getName());

View file

@ -95,7 +95,7 @@ public class ContainerDropper extends Container{
}
@Override
public boolean canInteractWith(@Nonnull EntityPlayer player){
public boolean canInteractWith(EntityPlayer player){
return this.dropper.isUseableByPlayer(player);
}
}

View file

@ -132,7 +132,7 @@ public class ContainerEnergizer extends Container{
}
@Override
public boolean canInteractWith(@Nonnull EntityPlayer player){
public boolean canInteractWith(EntityPlayer player){
return this.energizer.isUseableByPlayer(player);
}
}

View file

@ -131,7 +131,7 @@ public class ContainerEnervator extends Container{
}
@Override
public boolean canInteractWith(@Nonnull EntityPlayer player){
public boolean canInteractWith(EntityPlayer player){
return this.enervator.isUseableByPlayer(player);
}
}

View file

@ -90,7 +90,7 @@ public class ContainerFeeder extends Container{
}
@Override
public boolean canInteractWith(@Nonnull EntityPlayer player){
public boolean canInteractWith(EntityPlayer player){
return this.tileFeeder.isUseableByPlayer(player);
}
}

View file

@ -85,7 +85,7 @@ public class ContainerFermentingBarrel extends Container{
}
@Override
public boolean canInteractWith(@Nonnull EntityPlayer player){
public boolean canInteractWith(EntityPlayer player){
return this.barrel.canPlayerUse(player);
}
}

View file

@ -92,7 +92,7 @@ public class ContainerFluidCollector extends Container{
}
@Override
public boolean canInteractWith(@Nonnull EntityPlayer player){
public boolean canInteractWith(EntityPlayer player){
return this.collector.canPlayerUse(player);
}
}

View file

@ -109,7 +109,7 @@ public class ContainerFurnaceDouble extends Container{
}
@Override
public boolean canInteractWith(@Nonnull EntityPlayer player){
public boolean canInteractWith(EntityPlayer player){
return this.tileFurnace.isUseableByPlayer(player);
}
}

View file

@ -93,7 +93,7 @@ public class ContainerGiantChest extends Container{
}
@Override
public boolean canInteractWith(@Nonnull EntityPlayer player){
public boolean canInteractWith(EntityPlayer player){
return this.tileChest.isUseableByPlayer(player);
}
}

View file

@ -120,7 +120,7 @@ public class ContainerGrinder extends Container{
}
@Override
public boolean canInteractWith(@Nonnull EntityPlayer player){
public boolean canInteractWith(EntityPlayer player){
return this.tileGrinder.isUseableByPlayer(player);
}
}

View file

@ -118,7 +118,7 @@ public class ContainerInputter extends Container{
}
@Override
public boolean canInteractWith(@Nonnull EntityPlayer player){
public boolean canInteractWith(EntityPlayer player){
return this.tileInputter.isUseableByPlayer(player);
}
}

View file

@ -106,7 +106,7 @@ public class ContainerLaserRelayItemWhitelist extends Container{
}
@Override
public boolean canInteractWith(@Nonnull EntityPlayer player){
public boolean canInteractWith(EntityPlayer player){
return this.tile.canPlayerUse(player);
}
}

View file

@ -95,7 +95,7 @@ public class ContainerMiner extends Container{
}
@Override
public boolean canInteractWith(@Nonnull EntityPlayer player){
public boolean canInteractWith(EntityPlayer player){
return this.miner.isUseableByPlayer(player);
}
}

View file

@ -83,7 +83,7 @@ public class ContainerOilGenerator extends Container{
}
@Override
public boolean canInteractWith(@Nonnull EntityPlayer player){
public boolean canInteractWith(EntityPlayer player){
return this.generator.canPlayerUse(player);
}
}

View file

@ -95,7 +95,7 @@ public class ContainerPhantomPlacer extends Container{
}
@Override
public boolean canInteractWith(@Nonnull EntityPlayer player){
public boolean canInteractWith(EntityPlayer player){
return this.placer.isUseableByPlayer(player);
}
}

View file

@ -113,7 +113,7 @@ public class ContainerRangedCollector extends Container{
}
@Override
public boolean canInteractWith(@Nonnull EntityPlayer player){
public boolean canInteractWith(EntityPlayer player){
return this.collector.isUseableByPlayer(player);
}
}

View file

@ -97,7 +97,7 @@ public class ContainerRepairer extends Container{
}
@Override
public boolean canInteractWith(@Nonnull EntityPlayer player){
public boolean canInteractWith(EntityPlayer player){
return this.tileRepairer.isUseableByPlayer(player);
}
}

View file

@ -24,7 +24,7 @@ public class ContainerSmileyCloud extends Container{
}
@Override
public boolean canInteractWith(@Nonnull EntityPlayer player){
public boolean canInteractWith(EntityPlayer player){
return true;
}
}

View file

@ -88,7 +88,7 @@ public class ContainerXPSolidifier extends Container{
}
@Override
public boolean canInteractWith(@Nonnull EntityPlayer player){
public boolean canInteractWith(EntityPlayer player){
return this.solidifier.isUseableByPlayer(player);
}
}

View file

@ -279,7 +279,7 @@ public class GuiInputter extends GuiContainer{
}
@Override
public void drawButton(@Nonnull Minecraft mc, int x, int y){
public void drawButton(Minecraft mc, int x, int y){
if(this.visible){
mc.getTextureManager().bindTexture(this.resLoc);
GlStateManager.color(1.0F, 1.0F, 1.0F, 1.0F);
@ -316,7 +316,7 @@ public class GuiInputter extends GuiContainer{
}
@Override
public void drawButton(@Nonnull Minecraft mc, int x, int y){
public void drawButton(Minecraft mc, int x, int y){
if(this.visible){
mc.getTextureManager().bindTexture(this.resLoc);
GlStateManager.color(1.0F, 1.0F, 1.0F, 1.0F);

View file

@ -33,7 +33,7 @@ public class SlotImmovable extends Slot{
}
@Nonnull
@Override
public ItemStack decrStackSize(int i){
return null;

View file

@ -59,7 +59,7 @@ public class ItemAllToolAA extends ItemToolAA implements IColorProvidingItem{
ActuallyAdditions.proxy.addRenderRegister(new ItemStack(this), new ModelResourceLocation(resLoc, "inventory"));
}
@Nonnull
@Override
public EnumActionResult onItemUse(ItemStack stack, EntityPlayer playerIn, World worldIn, BlockPos pos, EnumHand hand, EnumFacing side, float hitX, float hitY, float hitZ){
return Items.IRON_HOE.onItemUse(stack, playerIn, worldIn, pos, hand, side, hitX, hitY, hitZ);
@ -67,7 +67,7 @@ public class ItemAllToolAA extends ItemToolAA implements IColorProvidingItem{
@SuppressWarnings("deprecation")
@Override
public boolean canHarvestBlock(@Nonnull IBlockState state, ItemStack stack){
public boolean canHarvestBlock(IBlockState state, ItemStack stack){
return this.hasExtraWhitelist(state.getBlock()) || state.getBlock().getMaterial(state).isToolNotRequired() || (state.getBlock() == Blocks.SNOW_LAYER || state.getBlock() == Blocks.SNOW || (state.getBlock() == Blocks.OBSIDIAN ? this.toolMaterial.getHarvestLevel() >= 3 : (state.getBlock() != Blocks.DIAMOND_BLOCK && state.getBlock() != Blocks.DIAMOND_ORE ? (state.getBlock() != Blocks.EMERALD_ORE && state.getBlock() != Blocks.EMERALD_BLOCK ? (state.getBlock() != Blocks.GOLD_BLOCK && state.getBlock() != Blocks.GOLD_ORE ? (state.getBlock() != Blocks.IRON_BLOCK && state.getBlock() != Blocks.IRON_ORE ? (state.getBlock() != Blocks.LAPIS_BLOCK && state.getBlock() != Blocks.LAPIS_ORE ? (state.getBlock() != Blocks.REDSTONE_ORE && state.getBlock() != Blocks.LIT_REDSTONE_ORE ? (state.getBlock().getMaterial(state) == Material.ROCK || (state.getBlock().getMaterial(state) == Material.IRON || state.getBlock().getMaterial(state) == Material.ANVIL)) : this.toolMaterial.getHarvestLevel() >= 2) : this.toolMaterial.getHarvestLevel() >= 1) : this.toolMaterial.getHarvestLevel() >= 1) : this.toolMaterial.getHarvestLevel() >= 2) : this.toolMaterial.getHarvestLevel() >= 2) : this.toolMaterial.getHarvestLevel() >= 2)));
}
@ -84,7 +84,7 @@ public class ItemAllToolAA extends ItemToolAA implements IColorProvidingItem{
return false;
}
@Nonnull
@Override
public Set<String> getToolClasses(ItemStack stack){
HashSet<String> hashSet = new HashSet<String>();
@ -95,7 +95,7 @@ public class ItemAllToolAA extends ItemToolAA implements IColorProvidingItem{
}
@Override
public float getStrVsBlock(@Nonnull ItemStack stack, IBlockState state){
public float getStrVsBlock(ItemStack stack, IBlockState state){
return this.hasExtraWhitelist(state.getBlock()) || state.getBlock().getHarvestTool(state) == null || state.getBlock().getHarvestTool(state).isEmpty() || this.getToolClasses(stack).contains(state.getBlock().getHarvestTool(state)) ? this.efficiencyOnProperMaterial : 1.0F;
}
@ -104,7 +104,7 @@ public class ItemAllToolAA extends ItemToolAA implements IColorProvidingItem{
public IItemColor getColor(){
return new IItemColor(){
@Override
public int getColorFromItemstack(@Nonnull ItemStack stack, int pass){
public int getColorFromItemstack(ItemStack stack, int pass){
return pass > 0 ? ItemAllToolAA.this.color : 0xFFFFFF;
}
};

View file

@ -36,7 +36,7 @@ public class ItemAxeAA extends ItemToolAA{
}
@Override
public float getStrVsBlock(@Nonnull ItemStack stack, IBlockState state){
public float getStrVsBlock(ItemStack stack, IBlockState state){
Material material = state.getMaterial();
return material != Material.WOOD && material != Material.PLANTS && material != Material.VINE ? super.getStrVsBlock(stack, state) : this.efficiencyOnProperMaterial;
}

View file

@ -23,7 +23,7 @@ public class ItemBattery extends ItemEnergy{
this.setMaxStackSize(1);
}
@Nonnull
@Override
public EnumRarity getRarity(ItemStack stack){
return EnumRarity.RARE;

View file

@ -56,7 +56,7 @@ public class ItemBooklet extends ItemBase implements IHudDisplay{
this.setMaxDamage(0);
}
@Nonnull
@Override
public EnumActionResult onItemUse(ItemStack stack, EntityPlayer player, World world, BlockPos pos, EnumHand hand, EnumFacing face, float hitX, float hitY, float hitZ){
if(player.isSneaking()){
@ -74,9 +74,9 @@ public class ItemBooklet extends ItemBase implements IHudDisplay{
return EnumActionResult.FAIL;
}
@Nonnull
@Override
public ActionResult<ItemStack> onItemRightClick(@Nonnull ItemStack stack, World world, EntityPlayer player, EnumHand hand){
public ActionResult<ItemStack> onItemRightClick(ItemStack stack, World world, EntityPlayer player, EnumHand hand){
player.openGui(ActuallyAdditions.instance, GuiHandler.GuiTypes.BOOK.ordinal(), world, (int)player.posX, (int)player.posY, (int)player.posZ);
if(!world.isRemote){
@ -91,7 +91,7 @@ public class ItemBooklet extends ItemBase implements IHudDisplay{
list.add(StringUtil.localize("tooltip."+ModUtil.MOD_ID+"."+this.getBaseName()+".desc"));
}
@Nonnull
@Override
public EnumRarity getRarity(ItemStack stack){
return EnumRarity.EPIC;

View file

@ -36,7 +36,7 @@ public class ItemChestToCrateUpgrade extends ItemBase{
super(name);
}
@Nonnull
@Override
public EnumActionResult onItemUse(ItemStack heldStack, EntityPlayer player, World world, BlockPos pos, EnumHand hand, EnumFacing facing, float par8, float par9, float par10){
if(player.isSneaking()){
@ -86,7 +86,7 @@ public class ItemChestToCrateUpgrade extends ItemBase{
return super.onItemUse(heldStack, player, world, pos, hand, facing, par8, par9, par10);
}
@Nonnull
@Override
public EnumRarity getRarity(ItemStack stack){
return EnumRarity.RARE;

View file

@ -83,7 +83,7 @@ public class ItemCoffee extends ItemFoodBase{
}
@Override
public ItemStack onItemUseFinish(ItemStack stack, @Nonnull World world, EntityLivingBase player){
public ItemStack onItemUseFinish(ItemStack stack, World world, EntityLivingBase player){
ItemStack theStack = stack.copy();
super.onItemUseFinish(stack, world, player);
applyPotionEffectsFromStack(stack, player);
@ -96,7 +96,7 @@ public class ItemCoffee extends ItemFoodBase{
}
}
@Nonnull
@Override
public EnumAction getItemUseAction(ItemStack stack){
return EnumAction.DRINK;
@ -126,7 +126,7 @@ public class ItemCoffee extends ItemFoodBase{
}
}
@Nonnull
@Override
public EnumRarity getRarity(ItemStack stack){
return EnumRarity.RARE;

View file

@ -23,7 +23,7 @@ public class ItemCoffeeBean extends ItemFoodBase{
this.setMaxDamage(0);
}
@Nonnull
@Override
public EnumRarity getRarity(ItemStack stack){
return EnumRarity.RARE;

View file

@ -30,16 +30,16 @@ public class ItemCrafterOnAStick extends ItemBase{
this.setMaxStackSize(1);
}
@Nonnull
@Override
public ActionResult<ItemStack> onItemRightClick(@Nonnull ItemStack stack, World world, EntityPlayer player, EnumHand hand){
public ActionResult<ItemStack> onItemRightClick(ItemStack stack, World world, EntityPlayer player, EnumHand hand){
if(!world.isRemote){
player.openGui(ActuallyAdditions.instance, GuiHandler.GuiTypes.CRAFTER.ordinal(), world, (int)player.posX, (int)player.posY, (int)player.posZ);
}
return new ActionResult<ItemStack>(EnumActionResult.SUCCESS, stack);
}
@Nonnull
@Override
public EnumRarity getRarity(ItemStack stack){
return EnumRarity.EPIC;

View file

@ -38,13 +38,13 @@ public class ItemCrystal extends ItemBase{
return damage;
}
@Nonnull
@Override
public String getUnlocalizedName(ItemStack stack){
return stack.getItemDamage() >= BlockCrystal.allCrystals.length ? StringUtil.BUGGED_ITEM_NAME : this.getUnlocalizedName()+BlockCrystal.allCrystals[stack.getItemDamage()].name;
}
@Nonnull
@Override
public EnumRarity getRarity(ItemStack stack){
return stack.getItemDamage() >= BlockCrystal.allCrystals.length ? EnumRarity.COMMON : BlockCrystal.allCrystals[stack.getItemDamage()].rarity;

View file

@ -76,7 +76,7 @@ public class ItemDrill extends ItemEnergy{
this.setHarvestLevel("pickaxe", HARVEST_LEVEL);
}
@Nonnull
@Override
//Places Blocks if the Placing Upgrade is installed
public EnumActionResult onItemUse(ItemStack stack, EntityPlayer player, World world, BlockPos pos, EnumHand hand, EnumFacing side, float hitX, float hitY, float hitZ){
@ -159,9 +159,9 @@ public class ItemDrill extends ItemEnergy{
return slots;
}
@Nonnull
@Override
public ActionResult<ItemStack> onItemRightClick(@Nonnull ItemStack stack, World world, EntityPlayer player, EnumHand hand){
public ActionResult<ItemStack> onItemRightClick(ItemStack stack, World world, EntityPlayer player, EnumHand hand){
if(!world.isRemote && player.isSneaking()){
player.openGui(ActuallyAdditions.instance, GuiHandler.GuiTypes.DRILL.ordinal(), world, (int)player.posX, (int)player.posY, (int)player.posZ);
}
@ -204,15 +204,15 @@ public class ItemDrill extends ItemEnergy{
}
}
@Nonnull
@Override
public EnumRarity getRarity(ItemStack stack){
return EnumRarity.EPIC;
}
@Nonnull
@Override
public Multimap<String, AttributeModifier> getAttributeModifiers(@Nonnull EntityEquipmentSlot slot, ItemStack stack){
public Multimap<String, AttributeModifier> getAttributeModifiers(EntityEquipmentSlot slot, ItemStack stack){
Multimap<String, AttributeModifier> map = super.getAttributeModifiers(slot, stack);
if(slot == EntityEquipmentSlot.MAINHAND){
@ -265,13 +265,13 @@ public class ItemDrill extends ItemEnergy{
@SuppressWarnings("deprecation")
@Override
public boolean canHarvestBlock(@Nonnull IBlockState state, ItemStack stack){
public boolean canHarvestBlock(IBlockState state, ItemStack stack){
int harvestLevel = this.getHarvestLevel(stack, "");
Block block = state.getBlock();
return this.getEnergyStored(stack) >= this.getEnergyUsePerBlock(stack) && (this.hasExtraWhitelist(block) || block.getMaterial(state).isToolNotRequired() || (block == Blocks.SNOW_LAYER || block == Blocks.SNOW || (block == Blocks.OBSIDIAN ? harvestLevel >= 3 : (block != Blocks.DIAMOND_BLOCK && block != Blocks.DIAMOND_ORE ? (block != Blocks.EMERALD_ORE && block != Blocks.EMERALD_BLOCK ? (block != Blocks.GOLD_BLOCK && block != Blocks.GOLD_ORE ? (block != Blocks.IRON_BLOCK && block != Blocks.IRON_ORE ? (block != Blocks.LAPIS_BLOCK && block != Blocks.LAPIS_ORE ? (block != Blocks.REDSTONE_ORE && block != Blocks.LIT_REDSTONE_ORE ? (block.getMaterial(state) == Material.ROCK || (block.getMaterial(state) == Material.IRON || block.getMaterial(state) == Material.ANVIL)) : harvestLevel >= 2) : harvestLevel >= 1) : harvestLevel >= 1) : harvestLevel >= 2) : harvestLevel >= 2) : harvestLevel >= 2))));
}
@Nonnull
@Override
public Set<String> getToolClasses(ItemStack stack){
HashSet<String> hashSet = new HashSet<String>();
@ -281,7 +281,7 @@ public class ItemDrill extends ItemEnergy{
}
@Override
public int getHarvestLevel(ItemStack stack, @Nonnull String toolClass){
public int getHarvestLevel(ItemStack stack, String toolClass){
return HARVEST_LEVEL;
}
@ -351,7 +351,7 @@ public class ItemDrill extends ItemEnergy{
@Override
@SuppressWarnings("unchecked")
@SideOnly(Side.CLIENT)
public void getSubItems(@Nonnull Item item, CreativeTabs tabs, List list){
public void getSubItems(Item item, CreativeTabs tabs, List list){
for(int i = 0; i < 16; i++){
this.addDrillStack(list, i);
}

View file

@ -39,9 +39,9 @@ public class ItemDrillUpgrade extends ItemBase{
return -1;
}
@Nonnull
@Override
public ActionResult<ItemStack> onItemRightClick(@Nonnull ItemStack stack, World world, EntityPlayer player, EnumHand hand){
public ActionResult<ItemStack> onItemRightClick(ItemStack stack, World world, EntityPlayer player, EnumHand hand){
if(!world.isRemote && this.type == UpgradeType.PLACER){
this.setSlotToPlaceFrom(stack, player.inventory.currentItem);
return new ActionResult<ItemStack>(EnumActionResult.SUCCESS, stack);

View file

@ -41,13 +41,13 @@ public class ItemDust extends ItemBase implements IColorProvidingItem{
return damage;
}
@Nonnull
@Override
public String getUnlocalizedName(ItemStack stack){
return stack.getItemDamage() >= allDusts.length ? StringUtil.BUGGED_ITEM_NAME : this.getUnlocalizedName()+allDusts[stack.getItemDamage()].name;
}
@Nonnull
@Override
public EnumRarity getRarity(ItemStack stack){
return stack.getItemDamage() >= allDusts.length ? EnumRarity.COMMON : allDusts[stack.getItemDamage()].rarity;
@ -73,7 +73,7 @@ public class ItemDust extends ItemBase implements IColorProvidingItem{
public IItemColor getColor(){
return new IItemColor(){
@Override
public int getColorFromItemstack(@Nonnull ItemStack stack, int pass){
public int getColorFromItemstack(ItemStack stack, int pass){
return stack.getItemDamage() >= allDusts.length ? 0xFFFFFF : allDusts[stack.getItemDamage()].color;
}
};

View file

@ -33,7 +33,7 @@ public class ItemFertilizer extends ItemBase{
BlockDispenser.DISPENSE_BEHAVIOR_REGISTRY.putObject(this, new DispenserHandlerFertilize());
}
@Nonnull
@Override
public EnumActionResult onItemUse(ItemStack stack, EntityPlayer player, World world, BlockPos pos, EnumHand hand, EnumFacing side, float par8, float par9, float par10){
if(ItemDye.applyBonemeal(stack, world, pos, player)){
@ -45,7 +45,7 @@ public class ItemFertilizer extends ItemBase{
return super.onItemUse(stack, player, world, pos, hand, side, par8, par9, par10);
}
@Nonnull
@Override
public EnumRarity getRarity(ItemStack stack){
return EnumRarity.RARE;

View file

@ -42,7 +42,7 @@ public class ItemFoods extends ItemFoodBase{
}
@Override
public ItemStack onItemUseFinish(ItemStack stack, @Nonnull World world, EntityLivingBase player){
public ItemStack onItemUseFinish(ItemStack stack, World world, EntityLivingBase player){
ItemStack stackToReturn = super.onItemUseFinish(stack, world, player);
ItemStack returnItem = stack.getItemDamage() >= allFoods.length ? null : allFoods[stack.getItemDamage()].returnItem;
if(returnItem != null && player instanceof EntityPlayer){
@ -62,7 +62,7 @@ public class ItemFoods extends ItemFoodBase{
return stack.getItemDamage() >= allFoods.length ? 0 : allFoods[stack.getItemDamage()].useDuration;
}
@Nonnull
@Override
public EnumAction getItemUseAction(ItemStack stack){
return stack.getItemDamage() >= allFoods.length ? EnumAction.EAT : (allFoods[stack.getItemDamage()].getsDrunken ? EnumAction.DRINK : EnumAction.EAT);
@ -83,13 +83,13 @@ public class ItemFoods extends ItemFoodBase{
return damage;
}
@Nonnull
@Override
public String getUnlocalizedName(ItemStack stack){
return stack.getItemDamage() >= allFoods.length ? StringUtil.BUGGED_ITEM_NAME : this.getUnlocalizedName()+allFoods[stack.getItemDamage()].name;
}
@Nonnull
@Override
public EnumRarity getRarity(ItemStack stack){
return stack.getItemDamage() >= allFoods.length ? EnumRarity.COMMON : allFoods[stack.getItemDamage()].rarity;

View file

@ -23,7 +23,7 @@ public class ItemGeneric extends ItemBase{
this.setMaxDamage(0);
}
@Nonnull
@Override
public EnumRarity getRarity(ItemStack stack){
return EnumRarity.UNCOMMON;

Some files were not shown because too many files have changed in this diff Show more