From 4e0082ed7df81f51f5a770f23946418100d32e6c Mon Sep 17 00:00:00 2001 From: Ellpeck Date: Sun, 29 May 2016 23:49:35 +0200 Subject: [PATCH] Remove all uses of @Nonnull because it's stupid anyways. ACTUALLY closes #97. --- .../mod/blocks/BlockAtomicReconstructor.java | 10 +++---- .../mod/blocks/BlockBookletStand.java | 6 ++-- .../mod/blocks/BlockBreaker.java | 6 ++-- .../mod/blocks/BlockCanolaPress.java | 6 ++-- .../mod/blocks/BlockCoalGenerator.java | 6 ++-- .../mod/blocks/BlockCoffeeMachine.java | 8 ++--- .../mod/blocks/BlockColoredLamp.java | 10 +++---- .../mod/blocks/BlockCompost.java | 10 +++---- .../mod/blocks/BlockCrystal.java | 2 +- .../mod/blocks/BlockDirectionalBreaker.java | 6 ++-- .../mod/blocks/BlockDropper.java | 6 ++-- .../mod/blocks/BlockEnergizer.java | 6 ++-- .../mod/blocks/BlockFeeder.java | 6 ++-- .../mod/blocks/BlockFermentingBarrel.java | 6 ++-- .../mod/blocks/BlockFireworkBox.java | 6 ++-- .../mod/blocks/BlockFishingNet.java | 6 ++-- .../mod/blocks/BlockFluidCollector.java | 6 ++-- .../mod/blocks/BlockFurnaceDouble.java | 8 ++--- .../mod/blocks/BlockFurnaceSolar.java | 6 ++-- .../mod/blocks/BlockGiantChest.java | 10 +++---- .../mod/blocks/BlockGreenhouseGlass.java | 8 ++--- .../mod/blocks/BlockGrinder.java | 8 ++--- .../mod/blocks/BlockHeatCollector.java | 4 +-- .../mod/blocks/BlockInputter.java | 12 ++++---- .../mod/blocks/BlockItemRepairer.java | 8 ++--- .../mod/blocks/BlockItemViewer.java | 4 +-- .../mod/blocks/BlockLaserRelay.java | 6 ++-- .../blocks/BlockLavaFactoryController.java | 4 +-- .../mod/blocks/BlockLeafGenerator.java | 6 ++-- .../mod/blocks/BlockMiner.java | 6 ++-- .../mod/blocks/BlockMisc.java | 2 +- .../mod/blocks/BlockOilGenerator.java | 6 ++-- .../mod/blocks/BlockPhantom.java | 6 ++-- .../mod/blocks/BlockPhantomBooster.java | 6 ++-- .../mod/blocks/BlockRangedCollector.java | 6 ++-- .../mod/blocks/BlockSlabs.java | 12 ++++---- .../mod/blocks/BlockSmileyCloud.java | 6 ++-- .../mod/blocks/BlockTreasureChest.java | 2 +- .../mod/blocks/BlockWallAA.java | 16 +++++----- .../mod/blocks/BlockWildPlant.java | 12 ++++---- .../mod/blocks/BlockXPSolidifier.java | 6 ++-- .../mod/blocks/base/BlockBase.java | 4 +-- .../mod/blocks/base/BlockBushBase.java | 4 +-- .../mod/blocks/base/BlockContainerBase.java | 10 +++---- .../mod/blocks/base/BlockPlant.java | 10 +++---- .../mod/blocks/base/ItemBlockBase.java | 4 +-- .../mod/blocks/render/RenderCompost.java | 2 +- .../render/RenderReconstructorLens.java | 2 +- .../mod/blocks/render/RenderSmileyCloud.java | 2 +- .../mod/booklet/GuiBooklet.java | 2 +- .../mod/booklet/GuiBookletStand.java | 2 +- .../mod/booklet/button/BookmarkButton.java | 2 +- .../mod/booklet/button/IndexButton.java | 2 +- .../mod/booklet/button/TexturedButton.java | 2 +- .../mod/creative/CreativeTab.java | 6 ++-- .../gen/VillageComponentCustomCropField.java | 2 +- .../mod/gen/VillageComponentJamHouse.java | 2 +- .../mod/gen/WorldGenLushCaves.java | 2 +- .../mod/inventory/ContainerBreaker.java | 2 +- .../mod/inventory/ContainerCanolaPress.java | 2 +- .../mod/inventory/ContainerCoalGenerator.java | 2 +- .../mod/inventory/ContainerCoffeeMachine.java | 2 +- .../mod/inventory/ContainerCrafter.java | 2 +- .../ContainerDirectionalBreaker.java | 2 +- .../mod/inventory/ContainerDrill.java | 14 ++++----- .../mod/inventory/ContainerDropper.java | 2 +- .../mod/inventory/ContainerEnergizer.java | 2 +- .../mod/inventory/ContainerEnervator.java | 2 +- .../mod/inventory/ContainerFeeder.java | 2 +- .../inventory/ContainerFermentingBarrel.java | 2 +- .../inventory/ContainerFluidCollector.java | 2 +- .../mod/inventory/ContainerFurnaceDouble.java | 2 +- .../mod/inventory/ContainerGiantChest.java | 2 +- .../mod/inventory/ContainerGrinder.java | 2 +- .../mod/inventory/ContainerInputter.java | 2 +- .../ContainerLaserRelayItemWhitelist.java | 2 +- .../mod/inventory/ContainerMiner.java | 2 +- .../mod/inventory/ContainerOilGenerator.java | 2 +- .../mod/inventory/ContainerPhantomPlacer.java | 2 +- .../inventory/ContainerRangedCollector.java | 2 +- .../mod/inventory/ContainerRepairer.java | 2 +- .../mod/inventory/ContainerSmileyCloud.java | 2 +- .../mod/inventory/ContainerXPSolidifier.java | 2 +- .../mod/inventory/gui/GuiInputter.java | 4 +-- .../mod/inventory/slot/SlotImmovable.java | 2 +- .../mod/items/ItemAllToolAA.java | 10 +++---- .../mod/items/ItemAxeAA.java | 2 +- .../mod/items/ItemBattery.java | 2 +- .../mod/items/ItemBooklet.java | 8 ++--- .../mod/items/ItemChestToCrateUpgrade.java | 4 +-- .../mod/items/ItemCoffee.java | 6 ++-- .../mod/items/ItemCoffeeBean.java | 2 +- .../mod/items/ItemCrafterOnAStick.java | 6 ++-- .../mod/items/ItemCrystal.java | 4 +-- .../mod/items/ItemDrill.java | 20 ++++++------- .../mod/items/ItemDrillUpgrade.java | 4 +-- .../actuallyadditions/mod/items/ItemDust.java | 6 ++-- .../mod/items/ItemFertilizer.java | 4 +-- .../mod/items/ItemFoods.java | 8 ++--- .../mod/items/ItemGeneric.java | 2 +- .../mod/items/ItemGrowthRing.java | 2 +- .../mod/items/ItemHairyBall.java | 6 ++-- .../actuallyadditions/mod/items/ItemJams.java | 8 ++--- .../mod/items/ItemKnife.java | 10 +++---- .../mod/items/ItemLaserWrench.java | 4 +-- .../mod/items/ItemLeafBlower.java | 8 ++--- .../mod/items/ItemMagnetRing.java | 2 +- .../actuallyadditions/mod/items/ItemMisc.java | 4 +-- .../mod/items/ItemPhantomConnector.java | 4 +-- .../mod/items/ItemPickaxeAA.java | 2 +- .../mod/items/ItemPotionRing.java | 10 +++---- .../items/ItemRarmorModuleReconstructor.java | 2 +- .../mod/items/ItemResonantRice.java | 6 ++-- .../mod/items/ItemShovelAA.java | 2 +- .../mod/items/ItemSolidifiedExperience.java | 6 ++-- .../mod/items/ItemSpawnerChanger.java | 2 +- .../mod/items/ItemTeleStaff.java | 6 ++-- .../mod/items/ItemWaterRemovalRing.java | 2 +- .../mod/items/ItemWingsOfTheBats.java | 2 +- .../mod/items/base/ItemArmorAA.java | 2 +- .../mod/items/base/ItemEnergy.java | 2 +- .../mod/items/base/ItemHoeAA.java | 2 +- .../mod/items/base/ItemSeed.java | 4 +-- .../mod/items/base/ItemSwordAA.java | 4 +-- .../mod/items/base/ItemToolAA.java | 4 +-- .../mod/items/lens/ItemLens.java | 2 +- .../mod/jei/JEIActuallyAdditionsPlugin.java | 4 +-- .../mod/jei/RecipeWrapperWithButton.java | 2 +- .../jei/booklet/BookletRecipeCategory.java | 12 ++++---- .../mod/jei/booklet/BookletRecipeHandler.java | 10 +++---- .../mod/jei/booklet/BookletRecipeWrapper.java | 6 ++-- .../coffee/CoffeeMachineRecipeCategory.java | 12 ++++---- .../coffee/CoffeeMachineRecipeHandler.java | 10 +++---- .../coffee/CoffeeMachineRecipeWrapper.java | 6 ++-- .../jei/crusher/CrusherRecipeCategory.java | 12 ++++---- .../mod/jei/crusher/CrusherRecipeHandler.java | 10 +++---- .../mod/jei/crusher/CrusherRecipeWrapper.java | 6 ++-- .../ReconstructorRecipeCategory.java | 12 ++++---- .../ReconstructorRecipeHandler.java | 10 +++---- .../ReconstructorRecipeWrapper.java | 6 ++-- .../mod/misc/DamageSources.java | 2 +- .../mod/misc/DispenserHandlerFertilize.java | 2 +- .../actuallyadditions/mod/misc/WorldData.java | 6 ++-- .../mod/proxy/ClientProxy.java | 2 +- .../tile/TileEntityAtomicReconstructor.java | 6 ++-- .../mod/tile/TileEntityBase.java | 6 ++-- .../mod/tile/TileEntityBreaker.java | 6 ++-- .../mod/tile/TileEntityCanolaPress.java | 6 ++-- .../mod/tile/TileEntityCoalGenerator.java | 6 ++-- .../mod/tile/TileEntityCoffeeMachine.java | 6 ++-- .../mod/tile/TileEntityCompost.java | 6 ++-- .../tile/TileEntityDirectionalBreaker.java | 6 ++-- .../mod/tile/TileEntityDropper.java | 6 ++-- .../mod/tile/TileEntityEnergizer.java | 6 ++-- .../mod/tile/TileEntityEnervator.java | 6 ++-- .../mod/tile/TileEntityFeeder.java | 6 ++-- .../mod/tile/TileEntityFurnaceDouble.java | 6 ++-- .../mod/tile/TileEntityGiantChest.java | 6 ++-- .../mod/tile/TileEntityGrinder.java | 6 ++-- .../mod/tile/TileEntityInputter.java | 6 ++-- .../mod/tile/TileEntityInventoryBase.java | 30 ++++++++----------- .../mod/tile/TileEntityItemRepairer.java | 6 ++-- .../mod/tile/TileEntityItemViewer.java | 8 ++--- .../mod/tile/TileEntityLaserRelay.java | 2 +- .../TileEntityLaserRelayItemWhitelist.java | 12 ++++---- .../mod/tile/TileEntityMiner.java | 6 ++-- .../mod/tile/TileEntityPhantomItemface.java | 16 +++++----- .../mod/tile/TileEntityPhantomPlacer.java | 6 ++-- .../mod/tile/TileEntityPhantomface.java | 6 ++-- .../mod/tile/TileEntityRangedCollector.java | 6 ++-- .../mod/tile/TileEntityXPSolidifier.java | 6 ++-- .../mod/util/FluidStateMapper.java | 8 ++--- 172 files changed, 470 insertions(+), 474 deletions(-) diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockAtomicReconstructor.java b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockAtomicReconstructor.java index fe8b8abf0..28582ae4f 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockAtomicReconstructor.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockAtomicReconstructor.java @@ -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 list, boolean bool){ + public void addInformation(ItemStack stack, EntityPlayer player, List list, boolean bool){ long sysTime = System.currentTimeMillis(); if(this.lastSysTime+3000 < sysTime){ diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockBookletStand.java b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockBookletStand.java index ea52adbb7..a59e8c76b 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockBookletStand.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockBookletStand.java @@ -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(); } diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockBreaker.java b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockBreaker.java index 072a50315..f425a036a 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockBreaker.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockBreaker.java @@ -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); } diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockCanolaPress.java b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockCanolaPress.java index 96fdadc62..2614a7432 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockCanolaPress.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockCanolaPress.java @@ -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); } diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockCoalGenerator.java b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockCoalGenerator.java index d9c14ff0b..5d0b6888e 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockCoalGenerator.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockCoalGenerator.java @@ -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); } diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockCoffeeMachine.java b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockCoffeeMachine.java index 1cc9f8d0b..7cf0671da 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockCoffeeMachine.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockCoffeeMachine.java @@ -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); } diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockColoredLamp.java b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockColoredLamp.java index 103204861..45eb885ed 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockColoredLamp.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockColoredLamp.java @@ -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; diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockCompost.java b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockCompost.java index 9ed630b50..77924b729 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockCompost.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockCompost.java @@ -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 collidingBoxes, Entity entityIn){ + public void addCollisionBoxToList(IBlockState state, World worldIn, BlockPos pos, AxisAlignedBB entityBox, List 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); } diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockCrystal.java b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockCrystal.java index 9572745d7..22909b0f5 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockCrystal.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockCrystal.java @@ -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; diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockDirectionalBreaker.java b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockDirectionalBreaker.java index b7fc191d3..9718183c5 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockDirectionalBreaker.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockDirectionalBreaker.java @@ -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); } diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockDropper.java b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockDropper.java index aae3d739b..56b8e97d0 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockDropper.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockDropper.java @@ -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); } diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockEnergizer.java b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockEnergizer.java index 337333a5c..86da9415c 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockEnergizer.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockEnergizer.java @@ -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); } diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockFeeder.java b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockFeeder.java index 80d2d63ef..98b46ca3e 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockFeeder.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockFeeder.java @@ -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); } diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockFermentingBarrel.java b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockFermentingBarrel.java index b6a6e8910..8adeba061 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockFermentingBarrel.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockFermentingBarrel.java @@ -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); } diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockFireworkBox.java b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockFireworkBox.java index b8471edb9..16c75b664 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockFireworkBox.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockFireworkBox.java @@ -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); } diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockFishingNet.java b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockFishingNet.java index eafef688f..e265ecb17 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockFishingNet.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockFishingNet.java @@ -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(); } diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockFluidCollector.java b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockFluidCollector.java index dbecd1b7b..297478819 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockFluidCollector.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockFluidCollector.java @@ -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); } diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockFurnaceDouble.java b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockFurnaceDouble.java index 638c4061e..bedd187d3 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockFurnaceDouble.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockFurnaceDouble.java @@ -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); } diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockFurnaceSolar.java b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockFurnaceSolar.java index 92cfac5f8..6b60b59a6 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockFurnaceSolar.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockFurnaceSolar.java @@ -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(); } diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockGiantChest.java b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockGiantChest.java index d27503e1e..0af027460 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockGiantChest.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockGiantChest.java @@ -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 getDrops(IBlockAccess world, BlockPos pos, @Nonnull IBlockState state, int fortune){ + public ArrayList getDrops(IBlockAccess world, BlockPos pos, IBlockState state, int fortune){ ArrayList 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)){ diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockGreenhouseGlass.java b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockGreenhouseGlass.java index e3018a2bc..9b5943d13 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockGreenhouseGlass.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockGreenhouseGlass.java @@ -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(); } } diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockGrinder.java b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockGrinder.java index 3f0a01a51..4a9f78bfa 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockGrinder.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockGrinder.java @@ -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); } diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockHeatCollector.java b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockHeatCollector.java index 9bf8b2f9f..2127f5939 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockHeatCollector.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockHeatCollector.java @@ -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(); } diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockInputter.java b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockInputter.java index 9a9631089..c52559bec 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockInputter.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockInputter.java @@ -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){ diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockItemRepairer.java b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockItemRepairer.java index cf4573ea9..dc1684794 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockItemRepairer.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockItemRepairer.java @@ -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); } diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockItemViewer.java b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockItemViewer.java index d732577a6..988362dbb 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockItemViewer.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockItemViewer.java @@ -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(); } diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockLaserRelay.java b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockLaserRelay.java index 66ba5c923..388ec7a1d 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockLaserRelay.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockLaserRelay.java @@ -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(); diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockLavaFactoryController.java b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockLavaFactoryController.java index 51f851185..af0c323f9 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockLavaFactoryController.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockLavaFactoryController.java @@ -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(); } diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockLeafGenerator.java b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockLeafGenerator.java index d788ea5ef..dd10226b1 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockLeafGenerator.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockLeafGenerator.java @@ -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); } diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockMiner.java b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockMiner.java index a6f4921a6..5d478f291 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockMiner.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockMiner.java @@ -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); } diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockMisc.java b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockMisc.java index f8f803efb..0fc517d3e 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockMisc.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockMisc.java @@ -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; diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockOilGenerator.java b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockOilGenerator.java index e2fb09a1c..2f5792001 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockOilGenerator.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockOilGenerator.java @@ -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); } diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockPhantom.java b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockPhantom.java index e3840ba91..b38bf8de2 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockPhantom.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockPhantom.java @@ -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(); diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockPhantomBooster.java b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockPhantomBooster.java index 99c925a60..6b235fa5d 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockPhantomBooster.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockPhantomBooster.java @@ -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(); } } \ No newline at end of file diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockRangedCollector.java b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockRangedCollector.java index b616b5416..f576249d9 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockRangedCollector.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockRangedCollector.java @@ -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){ diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockSlabs.java b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockSlabs.java index 43ed42f91..3a54d6830 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockSlabs.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockSlabs.java @@ -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(); diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockSmileyCloud.java b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockSmileyCloud.java index 5e3dd1f74..c8c287201 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockSmileyCloud.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockSmileyCloud.java @@ -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); } diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockTreasureChest.java b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockTreasureChest.java index f3b9f64f9..038876caf 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockTreasureChest.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockTreasureChest.java @@ -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; } diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockWallAA.java b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockWallAA.java index 04b95d5a6..07150301c 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockWallAA.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockWallAA.java @@ -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); diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockWildPlant.java b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockWildPlant.java index 9cd7d369b..64f34b1e4 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockWildPlant.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockWildPlant.java @@ -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 getDrops(IBlockAccess world, BlockPos pos, @Nonnull IBlockState state, int fortune){ + public List 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; diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockXPSolidifier.java b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockXPSolidifier.java index 4dc6b850b..010d76add 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockXPSolidifier.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockXPSolidifier.java @@ -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){ diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/base/BlockBase.java b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/base/BlockBase.java index 81d30e727..9cc617dca 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/base/BlockBase.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/base/BlockBase.java @@ -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()); diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/base/BlockBushBase.java b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/base/BlockBushBase.java index 0fb821ef4..ba55ea587 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/base/BlockBushBase.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/base/BlockBushBase.java @@ -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()); diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/base/BlockContainerBase.java b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/base/BlockContainerBase.java index ae63288b4..19d84e0fb 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/base/BlockContainerBase.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/base/BlockContainerBase.java @@ -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 getDrops(IBlockAccess world, BlockPos pos, @Nonnull IBlockState state, int fortune){ + public ArrayList getDrops(IBlockAccess world, BlockPos pos, IBlockState state, int fortune){ ArrayList drops = new ArrayList(); 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; diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/base/BlockPlant.java b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/base/BlockPlant.java index 10df827ff..9ab300ebe 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/base/BlockPlant.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/base/BlockPlant.java @@ -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(); } diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/base/ItemBlockBase.java b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/base/ItemBlockBase.java index 6f28797d5..924a1aebc 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/base/ItemBlockBase.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/base/ItemBlockBase.java @@ -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){ diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/render/RenderCompost.java b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/render/RenderCompost.java index ade2f73fb..e54d4494c 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/render/RenderCompost.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/render/RenderCompost.java @@ -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); diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/render/RenderReconstructorLens.java b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/render/RenderReconstructorLens.java index 70b76ec27..fa5217cfe 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/render/RenderReconstructorLens.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/render/RenderReconstructorLens.java @@ -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; } diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/render/RenderSmileyCloud.java b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/render/RenderSmileyCloud.java index da67629aa..79f79cae7 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/render/RenderSmileyCloud.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/render/RenderSmileyCloud.java @@ -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; diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/booklet/GuiBooklet.java b/src/main/java/de/ellpeck/actuallyadditions/mod/booklet/GuiBooklet.java index 12464f28f..50da85c4f 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/booklet/GuiBooklet.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/booklet/GuiBooklet.java @@ -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); } diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/booklet/GuiBookletStand.java b/src/main/java/de/ellpeck/actuallyadditions/mod/booklet/GuiBookletStand.java index 186621476..ef9d5718d 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/booklet/GuiBookletStand.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/booklet/GuiBookletStand.java @@ -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); diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/booklet/button/BookmarkButton.java b/src/main/java/de/ellpeck/actuallyadditions/mod/booklet/button/BookmarkButton.java index 658f5dd65..7f1ea9d80 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/booklet/button/BookmarkButton.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/booklet/button/BookmarkButton.java @@ -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); diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/booklet/button/IndexButton.java b/src/main/java/de/ellpeck/actuallyadditions/mod/booklet/button/IndexButton.java index 5228f43b4..2ec0a145e 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/booklet/button/IndexButton.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/booklet/button/IndexButton.java @@ -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; diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/booklet/button/TexturedButton.java b/src/main/java/de/ellpeck/actuallyadditions/mod/booklet/button/TexturedButton.java index 9f1eb03a0..e034c1476 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/booklet/button/TexturedButton.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/booklet/button/TexturedButton.java @@ -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); diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/creative/CreativeTab.java b/src/main/java/de/ellpeck/actuallyadditions/mod/creative/CreativeTab.java index 46cb04a13..94d0be0a6 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/creative/CreativeTab.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/creative/CreativeTab.java @@ -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 list){ + public void displayAllRelevantItems(List list){ this.list = list; this.add(InitItems.itemBooklet); diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/gen/VillageComponentCustomCropField.java b/src/main/java/de/ellpeck/actuallyadditions/mod/gen/VillageComponentCustomCropField.java index 573a65249..9a1c4174f 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/gen/VillageComponentCustomCropField.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/gen/VillageComponentCustomCropField.java @@ -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){ diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/gen/VillageComponentJamHouse.java b/src/main/java/de/ellpeck/actuallyadditions/mod/gen/VillageComponentJamHouse.java index d114b9d26..258fa93fa 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/gen/VillageComponentJamHouse.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/gen/VillageComponentJamHouse.java @@ -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){ diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/gen/WorldGenLushCaves.java b/src/main/java/de/ellpeck/actuallyadditions/mod/gen/WorldGenLushCaves.java index 81b53e59f..2d49feace 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/gen/WorldGenLushCaves.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/gen/WorldGenLushCaves.java @@ -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; } diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/ContainerBreaker.java b/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/ContainerBreaker.java index ec94a585f..43edacc2d 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/ContainerBreaker.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/ContainerBreaker.java @@ -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); } } \ No newline at end of file diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/ContainerCanolaPress.java b/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/ContainerCanolaPress.java index d0020e9fb..99c35e162 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/ContainerCanolaPress.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/ContainerCanolaPress.java @@ -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); } } \ No newline at end of file diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/ContainerCoalGenerator.java b/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/ContainerCoalGenerator.java index 596638fd0..c59aff1f2 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/ContainerCoalGenerator.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/ContainerCoalGenerator.java @@ -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); } } \ No newline at end of file diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/ContainerCoffeeMachine.java b/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/ContainerCoffeeMachine.java index 235f4b4b4..2809d25f3 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/ContainerCoffeeMachine.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/ContainerCoffeeMachine.java @@ -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); } } \ No newline at end of file diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/ContainerCrafter.java b/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/ContainerCrafter.java index e6b37aef7..27f216f4b 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/ContainerCrafter.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/ContainerCrafter.java @@ -112,7 +112,7 @@ public class ContainerCrafter extends Container{ } @Override - public boolean canInteractWith(@Nonnull EntityPlayer player){ + public boolean canInteractWith(EntityPlayer player){ return true; } } \ No newline at end of file diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/ContainerDirectionalBreaker.java b/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/ContainerDirectionalBreaker.java index 1faf5652c..37591b74e 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/ContainerDirectionalBreaker.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/ContainerDirectionalBreaker.java @@ -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); } } \ No newline at end of file diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/ContainerDrill.java b/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/ContainerDrill.java index 1304dab0b..c5deef69d 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/ContainerDrill.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/ContainerDrill.java @@ -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()); diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/ContainerDropper.java b/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/ContainerDropper.java index ab732dce6..b530768a7 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/ContainerDropper.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/ContainerDropper.java @@ -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); } } \ No newline at end of file diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/ContainerEnergizer.java b/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/ContainerEnergizer.java index 875f78e28..f4148b48d 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/ContainerEnergizer.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/ContainerEnergizer.java @@ -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); } } \ No newline at end of file diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/ContainerEnervator.java b/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/ContainerEnervator.java index 7587010ef..cffd8b22c 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/ContainerEnervator.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/ContainerEnervator.java @@ -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); } } \ No newline at end of file diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/ContainerFeeder.java b/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/ContainerFeeder.java index 6f610228d..8fbcc5c3e 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/ContainerFeeder.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/ContainerFeeder.java @@ -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); } } \ No newline at end of file diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/ContainerFermentingBarrel.java b/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/ContainerFermentingBarrel.java index 6b56d6a9e..71f5e1d09 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/ContainerFermentingBarrel.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/ContainerFermentingBarrel.java @@ -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); } } \ No newline at end of file diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/ContainerFluidCollector.java b/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/ContainerFluidCollector.java index 38197a535..174b4224e 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/ContainerFluidCollector.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/ContainerFluidCollector.java @@ -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); } } \ No newline at end of file diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/ContainerFurnaceDouble.java b/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/ContainerFurnaceDouble.java index ea521c6ac..56571fe9b 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/ContainerFurnaceDouble.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/ContainerFurnaceDouble.java @@ -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); } } \ No newline at end of file diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/ContainerGiantChest.java b/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/ContainerGiantChest.java index e0af7f20c..6885814f9 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/ContainerGiantChest.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/ContainerGiantChest.java @@ -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); } } \ No newline at end of file diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/ContainerGrinder.java b/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/ContainerGrinder.java index fac800ed5..c08de37d2 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/ContainerGrinder.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/ContainerGrinder.java @@ -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); } } \ No newline at end of file diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/ContainerInputter.java b/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/ContainerInputter.java index 40fbea503..887bdafef 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/ContainerInputter.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/ContainerInputter.java @@ -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); } } \ No newline at end of file diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/ContainerLaserRelayItemWhitelist.java b/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/ContainerLaserRelayItemWhitelist.java index 51989f663..9125fbdcc 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/ContainerLaserRelayItemWhitelist.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/ContainerLaserRelayItemWhitelist.java @@ -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); } } \ No newline at end of file diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/ContainerMiner.java b/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/ContainerMiner.java index 5f8b29ba8..2d5bc6634 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/ContainerMiner.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/ContainerMiner.java @@ -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); } } \ No newline at end of file diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/ContainerOilGenerator.java b/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/ContainerOilGenerator.java index 316bf28f2..4d0114ae0 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/ContainerOilGenerator.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/ContainerOilGenerator.java @@ -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); } } \ No newline at end of file diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/ContainerPhantomPlacer.java b/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/ContainerPhantomPlacer.java index a794e235f..6d5d2165f 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/ContainerPhantomPlacer.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/ContainerPhantomPlacer.java @@ -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); } } \ No newline at end of file diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/ContainerRangedCollector.java b/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/ContainerRangedCollector.java index 9da06b3be..39c1505e0 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/ContainerRangedCollector.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/ContainerRangedCollector.java @@ -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); } } \ No newline at end of file diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/ContainerRepairer.java b/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/ContainerRepairer.java index f3acb4d93..654a96c2d 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/ContainerRepairer.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/ContainerRepairer.java @@ -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); } } \ No newline at end of file diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/ContainerSmileyCloud.java b/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/ContainerSmileyCloud.java index 6feb5dbfd..98c6e2f44 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/ContainerSmileyCloud.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/ContainerSmileyCloud.java @@ -24,7 +24,7 @@ public class ContainerSmileyCloud extends Container{ } @Override - public boolean canInteractWith(@Nonnull EntityPlayer player){ + public boolean canInteractWith(EntityPlayer player){ return true; } } \ No newline at end of file diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/ContainerXPSolidifier.java b/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/ContainerXPSolidifier.java index 636407cd3..136bc51aa 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/ContainerXPSolidifier.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/ContainerXPSolidifier.java @@ -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); } } \ No newline at end of file diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiInputter.java b/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiInputter.java index 9dbd61e46..2948b7383 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiInputter.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiInputter.java @@ -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); diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/slot/SlotImmovable.java b/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/slot/SlotImmovable.java index fe79dbde8..8cac76c9a 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/slot/SlotImmovable.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/slot/SlotImmovable.java @@ -33,7 +33,7 @@ public class SlotImmovable extends Slot{ } - @Nonnull + @Override public ItemStack decrStackSize(int i){ return null; diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemAllToolAA.java b/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemAllToolAA.java index f05193bf0..680bce855 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemAllToolAA.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemAllToolAA.java @@ -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 getToolClasses(ItemStack stack){ HashSet hashSet = new HashSet(); @@ -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; } }; diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemAxeAA.java b/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemAxeAA.java index a97265193..e5aa57222 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemAxeAA.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemAxeAA.java @@ -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; } diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemBattery.java b/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemBattery.java index 88ae14cbc..480287f51 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemBattery.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemBattery.java @@ -23,7 +23,7 @@ public class ItemBattery extends ItemEnergy{ this.setMaxStackSize(1); } - @Nonnull + @Override public EnumRarity getRarity(ItemStack stack){ return EnumRarity.RARE; diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemBooklet.java b/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemBooklet.java index f55f9aafc..011f6eaa8 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemBooklet.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemBooklet.java @@ -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 onItemRightClick(@Nonnull ItemStack stack, World world, EntityPlayer player, EnumHand hand){ + public ActionResult 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; diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemChestToCrateUpgrade.java b/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemChestToCrateUpgrade.java index c638ce7d5..6acc0af22 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemChestToCrateUpgrade.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemChestToCrateUpgrade.java @@ -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; diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemCoffee.java b/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemCoffee.java index 4d9534e5f..48340c230 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemCoffee.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemCoffee.java @@ -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; diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemCoffeeBean.java b/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemCoffeeBean.java index 12a2e8f30..1076ab477 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemCoffeeBean.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemCoffeeBean.java @@ -23,7 +23,7 @@ public class ItemCoffeeBean extends ItemFoodBase{ this.setMaxDamage(0); } - @Nonnull + @Override public EnumRarity getRarity(ItemStack stack){ return EnumRarity.RARE; diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemCrafterOnAStick.java b/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemCrafterOnAStick.java index 96bf818ad..ad1c4898d 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemCrafterOnAStick.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemCrafterOnAStick.java @@ -30,16 +30,16 @@ public class ItemCrafterOnAStick extends ItemBase{ this.setMaxStackSize(1); } - @Nonnull + @Override - public ActionResult onItemRightClick(@Nonnull ItemStack stack, World world, EntityPlayer player, EnumHand hand){ + public ActionResult 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(EnumActionResult.SUCCESS, stack); } - @Nonnull + @Override public EnumRarity getRarity(ItemStack stack){ return EnumRarity.EPIC; diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemCrystal.java b/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemCrystal.java index 5532a481b..c6b6b6393 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemCrystal.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemCrystal.java @@ -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; diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemDrill.java b/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemDrill.java index f80a7e323..a0615544d 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemDrill.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemDrill.java @@ -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 onItemRightClick(@Nonnull ItemStack stack, World world, EntityPlayer player, EnumHand hand){ + public ActionResult 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 getAttributeModifiers(@Nonnull EntityEquipmentSlot slot, ItemStack stack){ + public Multimap getAttributeModifiers(EntityEquipmentSlot slot, ItemStack stack){ Multimap 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 getToolClasses(ItemStack stack){ HashSet hashSet = new HashSet(); @@ -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); } diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemDrillUpgrade.java b/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemDrillUpgrade.java index 4cfd8d04b..99f747e32 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemDrillUpgrade.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemDrillUpgrade.java @@ -39,9 +39,9 @@ public class ItemDrillUpgrade extends ItemBase{ return -1; } - @Nonnull + @Override - public ActionResult onItemRightClick(@Nonnull ItemStack stack, World world, EntityPlayer player, EnumHand hand){ + public ActionResult 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(EnumActionResult.SUCCESS, stack); diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemDust.java b/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemDust.java index ca7b5c4aa..38fcbdcae 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemDust.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemDust.java @@ -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; } }; diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemFertilizer.java b/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemFertilizer.java index b6fee157a..2a2df1dd3 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemFertilizer.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemFertilizer.java @@ -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; diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemFoods.java b/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemFoods.java index 9cbee76c7..8769c1ded 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemFoods.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemFoods.java @@ -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; diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemGeneric.java b/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemGeneric.java index a3f45c0b9..08188b743 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemGeneric.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemGeneric.java @@ -23,7 +23,7 @@ public class ItemGeneric extends ItemBase{ this.setMaxDamage(0); } - @Nonnull + @Override public EnumRarity getRarity(ItemStack stack){ return EnumRarity.UNCOMMON; diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemGrowthRing.java b/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemGrowthRing.java index f171bf602..d862772a7 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemGrowthRing.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemGrowthRing.java @@ -93,7 +93,7 @@ public class ItemGrowthRing extends ItemEnergy{ } } - @Nonnull + @Override public EnumRarity getRarity(ItemStack stack){ return EnumRarity.EPIC; diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemHairyBall.java b/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemHairyBall.java index 2ddc3edd9..1ad25d0a2 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemHairyBall.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemHairyBall.java @@ -29,9 +29,9 @@ public class ItemHairyBall extends ItemBase{ super(name); } - @Nonnull + @Override - public ActionResult onItemRightClick(@Nonnull ItemStack stack, World world, EntityPlayer player, EnumHand hand){ + public ActionResult onItemRightClick(ItemStack stack, World world, EntityPlayer player, EnumHand hand){ if(!world.isRemote){ ItemStack returnItem = this.getRandomReturnItem(); if(!player.inventory.addItemStackToInventory(returnItem)){ @@ -50,7 +50,7 @@ public class ItemHairyBall extends ItemBase{ return WeightedRandom.getRandomItem(Util.RANDOM, ActuallyAdditionsAPI.BALL_OF_FUR_RETURN_ITEMS).returnItem.copy(); } - @Nonnull + @Override public EnumRarity getRarity(ItemStack stack){ return EnumRarity.EPIC; diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemJams.java b/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemJams.java index 6c9f2732b..de74ae6ed 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemJams.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemJams.java @@ -50,13 +50,13 @@ public class ItemJams extends ItemFoodBase implements IColorProvidingItem{ return damage; } - @Nonnull + @Override public String getUnlocalizedName(ItemStack stack){ return stack.getItemDamage() >= allJams.length ? StringUtil.BUGGED_ITEM_NAME : this.getUnlocalizedName()+allJams[stack.getItemDamage()].name; } - @Nonnull + @Override public EnumRarity getRarity(ItemStack stack){ return stack.getItemDamage() >= allJams.length ? EnumRarity.COMMON : allJams[stack.getItemDamage()].rarity; @@ -71,7 +71,7 @@ public class ItemJams extends ItemFoodBase implements IColorProvidingItem{ } @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); if(player instanceof EntityPlayer && !world.isRemote && stack.getItemDamage() < allJams.length){ @@ -113,7 +113,7 @@ public class ItemJams extends ItemFoodBase 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 ? (stack.getItemDamage() >= allJams.length ? 0xFFFFFF : allJams[stack.getItemDamage()].color) : 0xFFFFFF; } }; diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemKnife.java b/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemKnife.java index d4567c059..15e57af53 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemKnife.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemKnife.java @@ -35,16 +35,16 @@ public class ItemKnife extends ItemBase{ return true; } - @Nonnull + @Override public EnumRarity getRarity(ItemStack stack){ return EnumRarity.EPIC; } - @Nonnull + @SuppressWarnings("unchecked") @Override - public Multimap getAttributeModifiers(@Nonnull EntityEquipmentSlot slot, ItemStack stack){ + public Multimap getAttributeModifiers(EntityEquipmentSlot slot, ItemStack stack){ Multimap map = super.getAttributeModifiers(slot, stack); if(slot == EntityEquipmentSlot.MAINHAND){ map.put(SharedMonsterAttributes.ATTACK_DAMAGE.getAttributeUnlocalizedName(), new AttributeModifier(ATTACK_DAMAGE_MODIFIER, "Knife Modifier", 3, 0)); @@ -52,9 +52,9 @@ public class ItemKnife extends ItemBase{ return map; } - @Nonnull + @Override - public ItemStack getContainerItem(@Nonnull ItemStack stack){ + public ItemStack getContainerItem(ItemStack stack){ ItemStack theStack = stack.copy(); theStack.setItemDamage(theStack.getItemDamage()+1); theStack.stackSize = 1; diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemLaserWrench.java b/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemLaserWrench.java index 8044a357d..372020353 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemLaserWrench.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemLaserWrench.java @@ -41,7 +41,7 @@ public class ItemLaserWrench extends ItemBase{ this.setMaxStackSize(1); } - @Nonnull + @Override public EnumActionResult onItemUse(ItemStack stack, EntityPlayer player, World world, BlockPos pos, EnumHand hand, EnumFacing par7, float par8, float par9, float par10){ if(!world.isRemote){ @@ -101,7 +101,7 @@ public class ItemLaserWrench extends ItemBase{ } } - @Nonnull + @Override public EnumRarity getRarity(ItemStack stack){ return EnumRarity.EPIC; diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemLeafBlower.java b/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemLeafBlower.java index d9c29a587..182498435 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemLeafBlower.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemLeafBlower.java @@ -44,14 +44,14 @@ public class ItemLeafBlower extends ItemBase{ this.setMaxStackSize(1); } - @Nonnull + @Override - public ActionResult onItemRightClick(@Nonnull ItemStack stack, World world, EntityPlayer player, EnumHand hand){ + public ActionResult onItemRightClick(ItemStack stack, World world, EntityPlayer player, EnumHand hand){ player.setActiveHand(hand); return new ActionResult(EnumActionResult.SUCCESS, stack); } - @Nonnull + @Override public EnumAction getItemUseAction(ItemStack stack){ return EnumAction.BOW; @@ -63,7 +63,7 @@ public class ItemLeafBlower extends ItemBase{ return Integer.MAX_VALUE; } - @Nonnull + @Override public EnumRarity getRarity(ItemStack stack){ return this.isAdvanced ? EnumRarity.EPIC : EnumRarity.RARE; diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemMagnetRing.java b/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemMagnetRing.java index eac4fd8e8..74a9947e3 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemMagnetRing.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemMagnetRing.java @@ -65,7 +65,7 @@ public class ItemMagnetRing extends ItemEnergy{ } } - @Nonnull + @Override public EnumRarity getRarity(ItemStack stack){ return EnumRarity.EPIC; diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemMisc.java b/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemMisc.java index a6fa6f604..0467df77c 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemMisc.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemMisc.java @@ -39,13 +39,13 @@ public class ItemMisc extends ItemBase{ return damage; } - @Nonnull + @Override public String getUnlocalizedName(ItemStack stack){ return stack.getItemDamage() >= allMiscItems.length ? StringUtil.BUGGED_ITEM_NAME : this.getUnlocalizedName()+allMiscItems[stack.getItemDamage()].name; } - @Nonnull + @Override public EnumRarity getRarity(ItemStack stack){ return stack.getItemDamage() >= allMiscItems.length ? EnumRarity.COMMON : allMiscItems[stack.getItemDamage()].rarity; diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemPhantomConnector.java b/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemPhantomConnector.java index 487dcf517..31535f4f0 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemPhantomConnector.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemPhantomConnector.java @@ -82,7 +82,7 @@ public class ItemPhantomConnector extends ItemBase{ stack.setTagCompound(tag); } - @Nonnull + @Override public EnumActionResult onItemUse(ItemStack stack, EntityPlayer player, World world, BlockPos pos, EnumHand hand, EnumFacing par7, float par8, float par9, float par10){ if(!world.isRemote){ @@ -149,7 +149,7 @@ public class ItemPhantomConnector extends ItemBase{ } } - @Nonnull + @Override public EnumRarity getRarity(ItemStack stack){ return EnumRarity.EPIC; diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemPickaxeAA.java b/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemPickaxeAA.java index 0e0d0d9b6..5e0aebc53 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemPickaxeAA.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemPickaxeAA.java @@ -77,7 +77,7 @@ public class ItemPickaxeAA 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.IRON && material != Material.ANVIL && material != Material.ROCK ? super.getStrVsBlock(stack, state) : this.efficiencyOnProperMaterial; } diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemPotionRing.java b/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemPotionRing.java index 231b968ad..709d53785 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemPotionRing.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemPotionRing.java @@ -50,7 +50,7 @@ public class ItemPotionRing extends ItemBase implements IColorProvidingItem{ return damage; } - @Nonnull + @Override public String getUnlocalizedName(ItemStack stack){ return stack.getItemDamage() >= allRings.length ? StringUtil.BUGGED_ITEM_NAME : this.getUnlocalizedName()+allRings[stack.getItemDamage()].name; @@ -82,9 +82,9 @@ public class ItemPotionRing extends ItemBase implements IColorProvidingItem{ } } - @Nonnull + @Override - public String getItemStackDisplayName(@Nonnull ItemStack stack){ + public String getItemStackDisplayName(ItemStack stack){ String standardName = StringUtil.localize(this.getUnlocalizedName()+".name"); if(stack.getItemDamage() < allRings.length){ String effect = StringUtil.localize(allRings[stack.getItemDamage()].name); @@ -93,7 +93,7 @@ public class ItemPotionRing extends ItemBase implements IColorProvidingItem{ return standardName; } - @Nonnull + @Override public EnumRarity getRarity(ItemStack stack){ return stack.getItemDamage() >= allRings.length ? EnumRarity.COMMON : allRings[stack.getItemDamage()].rarity; @@ -119,7 +119,7 @@ public class ItemPotionRing extends ItemBase implements IColorProvidingItem{ public IItemColor getColor(){ return new IItemColor(){ @Override - public int getColorFromItemstack(@Nonnull ItemStack stack, int tintIndex){ + public int getColorFromItemstack(ItemStack stack, int tintIndex){ return stack.getItemDamage() >= allRings.length ? 0xFFFFFF : allRings[stack.getItemDamage()].color; } }; diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemRarmorModuleReconstructor.java b/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemRarmorModuleReconstructor.java index 8088ac7a7..244487342 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemRarmorModuleReconstructor.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemRarmorModuleReconstructor.java @@ -48,7 +48,7 @@ public class ItemRarmorModuleReconstructor extends ItemBase implements IRarmorMo return this.getRegistryName().toString(); } - @Nonnull + @Override public EnumRarity getRarity(ItemStack stack){ return EnumRarity.RARE; diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemResonantRice.java b/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemResonantRice.java index 68a78938b..1be420914 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemResonantRice.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemResonantRice.java @@ -27,9 +27,9 @@ public class ItemResonantRice extends ItemBase{ super(name); } - @Nonnull + @Override - public ActionResult onItemRightClick(@Nonnull ItemStack stack, World world, EntityPlayer player, EnumHand hand){ + public ActionResult onItemRightClick(ItemStack stack, World world, EntityPlayer player, EnumHand hand){ if(!world.isRemote){ stack.stackSize--; world.createExplosion(null, player.posX, player.posY, player.posZ, 0.5F, true); @@ -37,7 +37,7 @@ public class ItemResonantRice extends ItemBase{ return new ActionResult(EnumActionResult.SUCCESS, stack); } - @Nonnull + @Override public EnumRarity getRarity(ItemStack stack){ return EnumRarity.EPIC; diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemShovelAA.java b/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemShovelAA.java index c47d7a5b0..8dbe59b21 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemShovelAA.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemShovelAA.java @@ -47,7 +47,7 @@ public class ItemShovelAA extends ItemToolAA{ return block == Blocks.SNOW_LAYER || block == Blocks.SNOW; } - @Nonnull + @Override public EnumActionResult onItemUse(ItemStack stack, EntityPlayer playerIn, World worldIn, BlockPos pos, EnumHand hand, EnumFacing facing, float hitX, float hitY, float hitZ){ return Items.IRON_HOE.onItemUse(stack, playerIn, worldIn, pos, hand, facing, hitX, hitY, hitZ); diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemSolidifiedExperience.java b/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemSolidifiedExperience.java index 09e8ec70e..f862c6a07 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemSolidifiedExperience.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemSolidifiedExperience.java @@ -30,9 +30,9 @@ public class ItemSolidifiedExperience extends ItemBase{ super(name); } - @Nonnull + @Override - public ActionResult onItemRightClick(@Nonnull ItemStack stack, World world, EntityPlayer player, EnumHand hand){ + public ActionResult onItemRightClick(ItemStack stack, World world, EntityPlayer player, EnumHand hand){ if(!world.isRemote){ if(!player.isSneaking()){ world.spawnEntityInWorld(new EntityXPOrb(world, player.posX+0.5, player.posY+0.5, player.posZ+0.5, SOLID_XP_AMOUNT)); @@ -50,7 +50,7 @@ public class ItemSolidifiedExperience extends ItemBase{ return new ActionResult(EnumActionResult.SUCCESS, stack); } - @Nonnull + @Override public EnumRarity getRarity(ItemStack stack){ return EnumRarity.UNCOMMON; diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemSpawnerChanger.java b/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemSpawnerChanger.java index b87452aec..4e11dcf13 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemSpawnerChanger.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemSpawnerChanger.java @@ -42,7 +42,7 @@ public class ItemSpawnerChanger extends ItemBase{ this.setMaxStackSize(1); } - @Nonnull + @Override public EnumActionResult onItemUse(ItemStack aStack, EntityPlayer player, World world, BlockPos pos, EnumHand hand, EnumFacing facing, float hitX, float hitY, float hitZ){ if(!world.isRemote){ diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemTeleStaff.java b/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemTeleStaff.java index cb5c304c7..1dc818b6f 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemTeleStaff.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemTeleStaff.java @@ -35,9 +35,9 @@ public class ItemTeleStaff extends ItemEnergy{ super(500000, 10000, name); } - @Nonnull + @Override - public ActionResult onItemRightClick(@Nonnull ItemStack stack, World world, EntityPlayer player, EnumHand hand){ + public ActionResult onItemRightClick(ItemStack stack, World world, EntityPlayer player, EnumHand hand){ if(!world.isRemote){ if(this.getWaitTime(stack) <= 0){ RayTraceResult pos = WorldUtil.getNearestPositionWithAir(world, player, 100); @@ -75,7 +75,7 @@ public class ItemTeleStaff extends ItemEnergy{ } } - @Nonnull + @Override public EnumRarity getRarity(ItemStack stack){ return EnumRarity.EPIC; diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemWaterRemovalRing.java b/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemWaterRemovalRing.java index d8595e27f..e4c6718f5 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemWaterRemovalRing.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemWaterRemovalRing.java @@ -76,7 +76,7 @@ public class ItemWaterRemovalRing extends ItemEnergy{ } } - @Nonnull + @Override public EnumRarity getRarity(ItemStack stack){ return EnumRarity.EPIC; diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemWingsOfTheBats.java b/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemWingsOfTheBats.java index 179be6801..ebf855e1a 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemWingsOfTheBats.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemWingsOfTheBats.java @@ -88,7 +88,7 @@ public class ItemWingsOfTheBats extends ItemBase{ return null; } - @Nonnull + @Override public EnumRarity getRarity(ItemStack stack){ return EnumRarity.EPIC; diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/items/base/ItemArmorAA.java b/src/main/java/de/ellpeck/actuallyadditions/mod/items/base/ItemArmorAA.java index a263a9d81..0825e854c 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/items/base/ItemArmorAA.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/items/base/ItemArmorAA.java @@ -57,7 +57,7 @@ public class ItemArmorAA extends ItemArmor{ ActuallyAdditions.proxy.addRenderRegister(new ItemStack(this), new ModelResourceLocation(this.getRegistryName(), "inventory")); } - @Nonnull + @Override public EnumRarity getRarity(ItemStack stack){ return this.rarity; diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/items/base/ItemEnergy.java b/src/main/java/de/ellpeck/actuallyadditions/mod/items/base/ItemEnergy.java index 52c421c00..23c997f5a 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/items/base/ItemEnergy.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/items/base/ItemEnergy.java @@ -82,7 +82,7 @@ public abstract class ItemEnergy extends ItemEnergyContainer{ @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){ ItemStack stackFull = new ItemStack(this); this.setEnergy(stackFull, this.getMaxEnergyStored(stackFull)); list.add(stackFull); diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/items/base/ItemHoeAA.java b/src/main/java/de/ellpeck/actuallyadditions/mod/items/base/ItemHoeAA.java index 7ef31d5a6..040e02d11 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/items/base/ItemHoeAA.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/items/base/ItemHoeAA.java @@ -54,7 +54,7 @@ public class ItemHoeAA extends ItemHoe{ ActuallyAdditions.proxy.addRenderRegister(new ItemStack(this), new ModelResourceLocation(this.getRegistryName(), "inventory")); } - @Nonnull + @Override public EnumRarity getRarity(ItemStack stack){ return this.rarity; diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/items/base/ItemSeed.java b/src/main/java/de/ellpeck/actuallyadditions/mod/items/base/ItemSeed.java index b1e72b4e9..34ae47a20 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/items/base/ItemSeed.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/items/base/ItemSeed.java @@ -65,13 +65,13 @@ public class ItemSeed extends ItemSeeds{ ActuallyAdditions.proxy.addRenderRegister(new ItemStack(this), new ModelResourceLocation(this.getRegistryName(), "inventory")); } - @Nonnull + @Override public EnumRarity getRarity(ItemStack stack){ return EnumRarity.RARE; } - @Nonnull + @Override public IBlockState getPlant(IBlockAccess world, BlockPos pos){ return this.plant.getDefaultState(); diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/items/base/ItemSwordAA.java b/src/main/java/de/ellpeck/actuallyadditions/mod/items/base/ItemSwordAA.java index 8f6232fd4..f3ba6768e 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/items/base/ItemSwordAA.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/items/base/ItemSwordAA.java @@ -59,11 +59,11 @@ public class ItemSwordAA extends ItemSword{ } @Override - public boolean getIsRepairable(ItemStack itemToRepair, @Nonnull ItemStack stack){ + public boolean getIsRepairable(ItemStack itemToRepair, ItemStack stack){ return ItemUtil.areItemsEqual(this.repairItem, stack, false); } - @Nonnull + @Override public EnumRarity getRarity(ItemStack stack){ return this.rarity; diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/items/base/ItemToolAA.java b/src/main/java/de/ellpeck/actuallyadditions/mod/items/base/ItemToolAA.java index efbc0d478..91f82f34b 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/items/base/ItemToolAA.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/items/base/ItemToolAA.java @@ -62,14 +62,14 @@ public class ItemToolAA extends ItemTool{ ActuallyAdditions.proxy.addRenderRegister(new ItemStack(this), new ModelResourceLocation(this.getRegistryName(), "inventory")); } - @Nonnull + @Override public EnumRarity getRarity(ItemStack stack){ return this.rarity; } @Override - public boolean getIsRepairable(ItemStack itemToRepair, @Nonnull ItemStack stack){ + public boolean getIsRepairable(ItemStack itemToRepair, ItemStack stack){ if(this.repairItem != null){ return ItemUtil.areItemsEqual(this.repairItem, stack, false); } diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/items/lens/ItemLens.java b/src/main/java/de/ellpeck/actuallyadditions/mod/items/lens/ItemLens.java index 2ee39211e..32b001858 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/items/lens/ItemLens.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/items/lens/ItemLens.java @@ -29,7 +29,7 @@ public class ItemLens extends ItemBase implements ILensItem{ this.setMaxStackSize(1); } - @Nonnull + @Override public EnumRarity getRarity(ItemStack stack){ return EnumRarity.UNCOMMON; diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/jei/JEIActuallyAdditionsPlugin.java b/src/main/java/de/ellpeck/actuallyadditions/mod/jei/JEIActuallyAdditionsPlugin.java index e7acc24df..f0f6accb5 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/jei/JEIActuallyAdditionsPlugin.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/jei/JEIActuallyAdditionsPlugin.java @@ -40,7 +40,7 @@ import javax.annotation.Nonnull; public class JEIActuallyAdditionsPlugin implements IModPlugin{ @Override - public void register(@Nonnull IModRegistry registry){ + public void register(IModRegistry registry){ IJeiHelpers helpers = registry.getJeiHelpers(); registry.addRecipeCategories( @@ -100,7 +100,7 @@ public class JEIActuallyAdditionsPlugin implements IModPlugin{ } @Override - public void onRuntimeAvailable(@Nonnull IJeiRuntime jeiRuntime){ + public void onRuntimeAvailable(IJeiRuntime jeiRuntime){ } } diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/jei/RecipeWrapperWithButton.java b/src/main/java/de/ellpeck/actuallyadditions/mod/jei/RecipeWrapperWithButton.java index 3b52ca52b..5573aa920 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/jei/RecipeWrapperWithButton.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/jei/RecipeWrapperWithButton.java @@ -28,7 +28,7 @@ public abstract class RecipeWrapperWithButton{ public RecipeWrapperWithButton(){ this.theButton = new TexturedButton(23782, this.getButtonX(), this.getButtonY(), 146, 154, 20, 20){ @Override - public void drawButton(@Nonnull Minecraft minecraft, int x, int y){ + public void drawButton(Minecraft minecraft, int x, int y){ super.drawButton(minecraft, x, y); if(this.visible && this.hovered){ String text = StringUtil.localize("booklet."+ModUtil.MOD_ID+".clickToSeeRecipe"); diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/jei/booklet/BookletRecipeCategory.java b/src/main/java/de/ellpeck/actuallyadditions/mod/jei/booklet/BookletRecipeCategory.java index 467e9c4bb..e23905a16 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/jei/booklet/BookletRecipeCategory.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/jei/booklet/BookletRecipeCategory.java @@ -30,36 +30,36 @@ public class BookletRecipeCategory implements IRecipeCategory{ this.background = helper.createBlankDrawable(160, 100); } - @Nonnull + @Override public String getUid(){ return NEIBookletRecipe.NAME; } - @Nonnull + @Override public String getTitle(){ return StringUtil.localize("container.nei."+NEIBookletRecipe.NAME+".name"); } - @Nonnull + @Override public IDrawable getBackground(){ return this.background; } @Override - public void drawExtras(@Nonnull Minecraft minecraft){ + public void drawExtras(Minecraft minecraft){ } @Override - public void drawAnimations(@Nonnull Minecraft minecraft){ + public void drawAnimations(Minecraft minecraft){ } @Override - public void setRecipe(@Nonnull IRecipeLayout recipeLayout, @Nonnull IRecipeWrapper recipeWrapper){ + public void setRecipe(IRecipeLayout recipeLayout, IRecipeWrapper recipeWrapper){ if(recipeWrapper instanceof BookletRecipeWrapper){ BookletRecipeWrapper wrapper = (BookletRecipeWrapper)recipeWrapper; recipeLayout.getItemStacks().init(0, true, 70, -4); diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/jei/booklet/BookletRecipeHandler.java b/src/main/java/de/ellpeck/actuallyadditions/mod/jei/booklet/BookletRecipeHandler.java index a61b1ff7d..f2153130b 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/jei/booklet/BookletRecipeHandler.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/jei/booklet/BookletRecipeHandler.java @@ -19,26 +19,26 @@ import javax.annotation.Nonnull; public class BookletRecipeHandler implements IRecipeHandler{ - @Nonnull + @Override public Class getRecipeClass(){ return BookletPage.class; } - @Nonnull + @Override public String getRecipeCategoryUid(){ return NEIBookletRecipe.NAME; } - @Nonnull + @Override - public IRecipeWrapper getRecipeWrapper(@Nonnull BookletPage recipe){ + public IRecipeWrapper getRecipeWrapper(BookletPage recipe){ return new BookletRecipeWrapper(recipe); } @Override - public boolean isRecipeValid(@Nonnull BookletPage recipe){ + public boolean isRecipeValid(BookletPage recipe){ return true; } } diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/jei/booklet/BookletRecipeWrapper.java b/src/main/java/de/ellpeck/actuallyadditions/mod/jei/booklet/BookletRecipeWrapper.java index 41ec53f08..87f6897cb 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/jei/booklet/BookletRecipeWrapper.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/jei/booklet/BookletRecipeWrapper.java @@ -56,7 +56,7 @@ public class BookletRecipeWrapper extends RecipeWrapperWithButton implements IRe } @Override - public void drawInfo(@Nonnull Minecraft minecraft, int recipeWidth, int recipeHeight, int mouseX, int mouseY){ + public void drawInfo(Minecraft minecraft, int recipeWidth, int recipeHeight, int mouseX, int mouseY){ List header = minecraft.fontRendererObj.listFormattedStringToWidth(StringUtil.localize("container.nei."+ModUtil.MOD_ID+".booklet.header").replaceAll("", TextFormatting.BLUE+"").replaceAll("", TextFormatting.BLACK+""), 150); for(int i = 0; i < header.size(); i++){ minecraft.fontRendererObj.drawString((String)header.get(i), 0, 17+i*(minecraft.fontRendererObj.FONT_HEIGHT+1), 0, false); @@ -76,7 +76,7 @@ public class BookletRecipeWrapper extends RecipeWrapperWithButton implements IRe } @Override - public void drawAnimations(@Nonnull Minecraft minecraft, int recipeWidth, int recipeHeight){ + public void drawAnimations(Minecraft minecraft, int recipeWidth, int recipeHeight){ } @@ -87,7 +87,7 @@ public class BookletRecipeWrapper extends RecipeWrapperWithButton implements IRe } @Override - public boolean handleClick(@Nonnull Minecraft minecraft, int mouseX, int mouseY, int mouseButton){ + public boolean handleClick(Minecraft minecraft, int mouseX, int mouseY, int mouseButton){ return this.handleClick(minecraft, mouseX, mouseY); } diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/jei/coffee/CoffeeMachineRecipeCategory.java b/src/main/java/de/ellpeck/actuallyadditions/mod/jei/coffee/CoffeeMachineRecipeCategory.java index bdfae76f7..8336b0e0c 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/jei/coffee/CoffeeMachineRecipeCategory.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/jei/coffee/CoffeeMachineRecipeCategory.java @@ -30,36 +30,36 @@ public class CoffeeMachineRecipeCategory implements IRecipeCategory{ this.background = helper.createDrawable(AssetUtil.getGuiLocation("guiNEICoffeeMachine"), 0, 0, 126, 88); } - @Nonnull + @Override public String getUid(){ return NEICoffeeMachineRecipe.NAME; } - @Nonnull + @Override public String getTitle(){ return StringUtil.localize("container.nei."+NEICoffeeMachineRecipe.NAME+".name"); } - @Nonnull + @Override public IDrawable getBackground(){ return this.background; } @Override - public void drawExtras(@Nonnull Minecraft minecraft){ + public void drawExtras(Minecraft minecraft){ } @Override - public void drawAnimations(@Nonnull Minecraft minecraft){ + public void drawAnimations(Minecraft minecraft){ } @Override - public void setRecipe(@Nonnull IRecipeLayout recipeLayout, @Nonnull IRecipeWrapper recipeWrapper){ + public void setRecipe(IRecipeLayout recipeLayout, IRecipeWrapper recipeWrapper){ if(recipeWrapper instanceof CoffeeMachineRecipeWrapper){ CoffeeMachineRecipeWrapper wrapper = (CoffeeMachineRecipeWrapper)recipeWrapper; diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/jei/coffee/CoffeeMachineRecipeHandler.java b/src/main/java/de/ellpeck/actuallyadditions/mod/jei/coffee/CoffeeMachineRecipeHandler.java index fe575fc22..6a94c9d04 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/jei/coffee/CoffeeMachineRecipeHandler.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/jei/coffee/CoffeeMachineRecipeHandler.java @@ -19,26 +19,26 @@ import javax.annotation.Nonnull; public class CoffeeMachineRecipeHandler implements IRecipeHandler{ - @Nonnull + @Override public Class getRecipeClass(){ return CoffeeIngredient.class; } - @Nonnull + @Override public String getRecipeCategoryUid(){ return NEICoffeeMachineRecipe.NAME; } - @Nonnull + @Override - public IRecipeWrapper getRecipeWrapper(@Nonnull CoffeeIngredient recipe){ + public IRecipeWrapper getRecipeWrapper(CoffeeIngredient recipe){ return new CoffeeMachineRecipeWrapper(recipe); } @Override - public boolean isRecipeValid(@Nonnull CoffeeIngredient recipe){ + public boolean isRecipeValid(CoffeeIngredient recipe){ return true; } } diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/jei/coffee/CoffeeMachineRecipeWrapper.java b/src/main/java/de/ellpeck/actuallyadditions/mod/jei/coffee/CoffeeMachineRecipeWrapper.java index 3a08622ec..7f34bed5e 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/jei/coffee/CoffeeMachineRecipeWrapper.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/jei/coffee/CoffeeMachineRecipeWrapper.java @@ -70,7 +70,7 @@ public class CoffeeMachineRecipeWrapper extends RecipeWrapperWithButton implemen } @Override - public void drawInfo(@Nonnull Minecraft minecraft, int recipeWidth, int recipeHeight, int mouseX, int mouseY){ + public void drawInfo(Minecraft minecraft, int recipeWidth, int recipeHeight, int mouseX, int mouseY){ this.updateButton(minecraft, mouseX, mouseY); if(this.theIngredient.getExtraText() != null){ @@ -84,7 +84,7 @@ public class CoffeeMachineRecipeWrapper extends RecipeWrapperWithButton implemen } @Override - public void drawAnimations(@Nonnull Minecraft minecraft, int recipeWidth, int recipeHeight){ + public void drawAnimations(Minecraft minecraft, int recipeWidth, int recipeHeight){ } @@ -95,7 +95,7 @@ public class CoffeeMachineRecipeWrapper extends RecipeWrapperWithButton implemen } @Override - public boolean handleClick(@Nonnull Minecraft minecraft, int mouseX, int mouseY, int mouseButton){ + public boolean handleClick(Minecraft minecraft, int mouseX, int mouseY, int mouseButton){ return this.handleClick(minecraft, mouseX, mouseY); } diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/jei/crusher/CrusherRecipeCategory.java b/src/main/java/de/ellpeck/actuallyadditions/mod/jei/crusher/CrusherRecipeCategory.java index 6476d5a39..0705474c8 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/jei/crusher/CrusherRecipeCategory.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/jei/crusher/CrusherRecipeCategory.java @@ -33,36 +33,36 @@ public class CrusherRecipeCategory implements IRecipeCategory{ this.background = helper.createDrawable(AssetUtil.getGuiLocation("guiGrinder"), 60, 13, 56, 79); } - @Nonnull + @Override public String getUid(){ return NAME; } - @Nonnull + @Override public String getTitle(){ return StringUtil.localize("container.nei."+NAME+".name"); } - @Nonnull + @Override public IDrawable getBackground(){ return this.background; } @Override - public void drawExtras(@Nonnull Minecraft minecraft){ + public void drawExtras(Minecraft minecraft){ } @Override - public void drawAnimations(@Nonnull Minecraft minecraft){ + public void drawAnimations(Minecraft minecraft){ } @Override - public void setRecipe(@Nonnull IRecipeLayout recipeLayout, @Nonnull IRecipeWrapper recipeWrapper){ + public void setRecipe(IRecipeLayout recipeLayout, IRecipeWrapper recipeWrapper){ if(recipeWrapper instanceof CrusherRecipeWrapper){ CrusherRecipeWrapper wrapper = (CrusherRecipeWrapper)recipeWrapper; diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/jei/crusher/CrusherRecipeHandler.java b/src/main/java/de/ellpeck/actuallyadditions/mod/jei/crusher/CrusherRecipeHandler.java index 690024479..f5a6a385e 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/jei/crusher/CrusherRecipeHandler.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/jei/crusher/CrusherRecipeHandler.java @@ -18,26 +18,26 @@ import javax.annotation.Nonnull; public class CrusherRecipeHandler implements IRecipeHandler{ - @Nonnull + @Override public Class getRecipeClass(){ return CrusherRecipe.class; } - @Nonnull + @Override public String getRecipeCategoryUid(){ return CrusherRecipeCategory.NAME; } - @Nonnull + @Override - public IRecipeWrapper getRecipeWrapper(@Nonnull CrusherRecipe recipe){ + public IRecipeWrapper getRecipeWrapper(CrusherRecipe recipe){ return new CrusherRecipeWrapper(recipe); } @Override - public boolean isRecipeValid(@Nonnull CrusherRecipe recipe){ + public boolean isRecipeValid(CrusherRecipe recipe){ return true; } } diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/jei/crusher/CrusherRecipeWrapper.java b/src/main/java/de/ellpeck/actuallyadditions/mod/jei/crusher/CrusherRecipeWrapper.java index 16d92fe1e..1178cd431 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/jei/crusher/CrusherRecipeWrapper.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/jei/crusher/CrusherRecipeWrapper.java @@ -63,7 +63,7 @@ public class CrusherRecipeWrapper extends RecipeWrapperWithButton implements IRe } @Override - public void drawInfo(@Nonnull Minecraft minecraft, int recipeWidth, int recipeHeight, int mouseX, int mouseY){ + public void drawInfo(Minecraft minecraft, int recipeWidth, int recipeHeight, int mouseX, int mouseY){ this.updateButton(minecraft, mouseX, mouseY); List outputTwos = this.theRecipe.getRecipeOutputTwos(); @@ -73,7 +73,7 @@ public class CrusherRecipeWrapper extends RecipeWrapperWithButton implements IRe } @Override - public void drawAnimations(@Nonnull Minecraft minecraft, int recipeWidth, int recipeHeight){ + public void drawAnimations(Minecraft minecraft, int recipeWidth, int recipeHeight){ } @@ -84,7 +84,7 @@ public class CrusherRecipeWrapper extends RecipeWrapperWithButton implements IRe } @Override - public boolean handleClick(@Nonnull Minecraft minecraft, int mouseX, int mouseY, int mouseButton){ + public boolean handleClick(Minecraft minecraft, int mouseX, int mouseY, int mouseButton){ return this.handleClick(minecraft, mouseX, mouseY); } diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/jei/reconstructor/ReconstructorRecipeCategory.java b/src/main/java/de/ellpeck/actuallyadditions/mod/jei/reconstructor/ReconstructorRecipeCategory.java index 88e48b9c2..0f36a237a 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/jei/reconstructor/ReconstructorRecipeCategory.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/jei/reconstructor/ReconstructorRecipeCategory.java @@ -33,36 +33,36 @@ public class ReconstructorRecipeCategory implements IRecipeCategory{ this.background = helper.createDrawable(AssetUtil.getGuiLocation("guiNEIAtomicReconstructor"), 0, 0, 96, 60); } - @Nonnull + @Override public String getUid(){ return NEIReconstructorRecipe.NAME; } - @Nonnull + @Override public String getTitle(){ return StringUtil.localize("container.nei."+NEIReconstructorRecipe.NAME+".name"); } - @Nonnull + @Override public IDrawable getBackground(){ return this.background; } @Override - public void drawExtras(@Nonnull Minecraft minecraft){ + public void drawExtras(Minecraft minecraft){ AssetUtil.renderStackToGui(RECONSTRUCTOR, 34, 19, 1.0F); } @Override - public void drawAnimations(@Nonnull Minecraft minecraft){ + public void drawAnimations(Minecraft minecraft){ } @Override - public void setRecipe(@Nonnull IRecipeLayout recipeLayout, @Nonnull IRecipeWrapper recipeWrapper){ + public void setRecipe(IRecipeLayout recipeLayout, IRecipeWrapper recipeWrapper){ if(recipeWrapper instanceof ReconstructorRecipeWrapper){ ReconstructorRecipeWrapper wrapper = (ReconstructorRecipeWrapper)recipeWrapper; diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/jei/reconstructor/ReconstructorRecipeHandler.java b/src/main/java/de/ellpeck/actuallyadditions/mod/jei/reconstructor/ReconstructorRecipeHandler.java index fb6ed5630..7f586f6c3 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/jei/reconstructor/ReconstructorRecipeHandler.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/jei/reconstructor/ReconstructorRecipeHandler.java @@ -19,26 +19,26 @@ import javax.annotation.Nonnull; public class ReconstructorRecipeHandler implements IRecipeHandler{ - @Nonnull + @Override public Class getRecipeClass(){ return LensConversionRecipe.class; } - @Nonnull + @Override public String getRecipeCategoryUid(){ return NEIReconstructorRecipe.NAME; } - @Nonnull + @Override - public IRecipeWrapper getRecipeWrapper(@Nonnull LensConversionRecipe recipe){ + public IRecipeWrapper getRecipeWrapper(LensConversionRecipe recipe){ return new ReconstructorRecipeWrapper(recipe); } @Override - public boolean isRecipeValid(@Nonnull LensConversionRecipe recipe){ + public boolean isRecipeValid(LensConversionRecipe recipe){ return true; } } diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/jei/reconstructor/ReconstructorRecipeWrapper.java b/src/main/java/de/ellpeck/actuallyadditions/mod/jei/reconstructor/ReconstructorRecipeWrapper.java index 7e396da08..738d10057 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/jei/reconstructor/ReconstructorRecipeWrapper.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/jei/reconstructor/ReconstructorRecipeWrapper.java @@ -54,12 +54,12 @@ public class ReconstructorRecipeWrapper extends RecipeWrapperWithButton implemen } @Override - public void drawInfo(@Nonnull Minecraft minecraft, int recipeWidth, int recipeHeight, int mouseX, int mouseY){ + public void drawInfo(Minecraft minecraft, int recipeWidth, int recipeHeight, int mouseX, int mouseY){ this.updateButton(minecraft, mouseX, mouseY); } @Override - public void drawAnimations(@Nonnull Minecraft minecraft, int recipeWidth, int recipeHeight){ + public void drawAnimations(Minecraft minecraft, int recipeWidth, int recipeHeight){ } @@ -70,7 +70,7 @@ public class ReconstructorRecipeWrapper extends RecipeWrapperWithButton implemen } @Override - public boolean handleClick(@Nonnull Minecraft minecraft, int mouseX, int mouseY, int mouseButton){ + public boolean handleClick(Minecraft minecraft, int mouseX, int mouseY, int mouseButton){ return this.handleClick(minecraft, mouseX, mouseY); } diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/misc/DamageSources.java b/src/main/java/de/ellpeck/actuallyadditions/mod/misc/DamageSources.java index 076da6eaa..52a6a46a9 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/misc/DamageSources.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/misc/DamageSources.java @@ -32,7 +32,7 @@ public class DamageSources extends DamageSource{ this.messageCount = messageCount; } - @Nonnull + @Override public ITextComponent getDeathMessage(EntityLivingBase entity){ String locTag = "death."+ModUtil.MOD_ID+"."+this.damageType+"."+(Util.RANDOM.nextInt(this.messageCount)+1); diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/misc/DispenserHandlerFertilize.java b/src/main/java/de/ellpeck/actuallyadditions/mod/misc/DispenserHandlerFertilize.java index a8ad69a67..630c74608 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/misc/DispenserHandlerFertilize.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/misc/DispenserHandlerFertilize.java @@ -23,7 +23,7 @@ import javax.annotation.Nonnull; public class DispenserHandlerFertilize extends BehaviorDefaultDispenseItem{ - @Nonnull + @Override public ItemStack dispenseStack(IBlockSource source, ItemStack stack){ EnumFacing facing = BlockDispenser.getFacing(source.getBlockMetadata()); diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/misc/WorldData.java b/src/main/java/de/ellpeck/actuallyadditions/mod/misc/WorldData.java index f188da725..d20e1ca67 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/misc/WorldData.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/misc/WorldData.java @@ -72,7 +72,7 @@ public class WorldData extends WorldSavedData{ } @Override - public void readFromNBT(@Nonnull NBTTagCompound compound){ + public void readFromNBT(NBTTagCompound compound){ //Laser World Data NBTTagList networkList = compound.getTagList("Networks", 10); for(int i = 0; i < networkList.tagCount(); i++){ @@ -88,9 +88,9 @@ public class WorldData extends WorldSavedData{ } } - @Nonnull + @Override - public NBTTagCompound writeToNBT(@Nonnull NBTTagCompound compound){ + public NBTTagCompound writeToNBT(NBTTagCompound compound){ //Laser World Data NBTTagList networkList = new NBTTagList(); for(LaserRelayConnectionHandler.Network network : LaserRelayConnectionHandler.getInstance().networks){ diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/proxy/ClientProxy.java b/src/main/java/de/ellpeck/actuallyadditions/mod/proxy/ClientProxy.java index ffd5df5d3..9ceaa0fac 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/proxy/ClientProxy.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/proxy/ClientProxy.java @@ -134,7 +134,7 @@ public class ClientProxy implements IProxy{ if(manager instanceof IReloadableResourceManager){ ((IReloadableResourceManager)manager).registerReloadListener(new IResourceManagerReloadListener(){ @Override - public void onResourceManagerReload(@Nonnull IResourceManager resourceManager){ + public void onResourceManagerReload(IResourceManager resourceManager){ countBookletWords(); } }); diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityAtomicReconstructor.java b/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityAtomicReconstructor.java index 18382eb31..239297de9 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityAtomicReconstructor.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityAtomicReconstructor.java @@ -158,7 +158,7 @@ public class TileEntityAtomicReconstructor extends TileEntityInventoryBase imple } @Override - public boolean isItemValidForSlot(int i, @Nonnull ItemStack stack){ + public boolean isItemValidForSlot(int i, ItemStack stack){ return stack != null && stack.getItem() instanceof ILensItem; } @@ -189,12 +189,12 @@ public class TileEntityAtomicReconstructor extends TileEntityInventoryBase imple } @Override - public boolean canInsertItem(int slot, @Nonnull ItemStack stack, @Nonnull EnumFacing side){ + public boolean canInsertItem(int slot, ItemStack stack, EnumFacing side){ return this.isItemValidForSlot(slot, stack); } @Override - public boolean canExtractItem(int slot, @Nonnull ItemStack stack, @Nonnull EnumFacing side){ + public boolean canExtractItem(int slot, ItemStack stack, EnumFacing side){ return true; } diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityBase.java b/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityBase.java index da328faed..992c47aa9 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityBase.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityBase.java @@ -96,7 +96,7 @@ public abstract class TileEntityBase extends TileEntity implements ITickable{ this.readSyncableNBT(compound, false); } - @Nonnull + @Override public NBTTagCompound writeToNBT(NBTTagCompound compound){ compound = super.writeToNBT(compound); @@ -123,7 +123,7 @@ public abstract class TileEntityBase extends TileEntity implements ITickable{ } @Override - public boolean shouldRefresh(World world, BlockPos pos, @Nonnull IBlockState oldState, @Nonnull IBlockState newState){ + public boolean shouldRefresh(World world, BlockPos pos, IBlockState oldState, IBlockState newState){ return !(oldState.getBlock().isAssociatedBlock(newState.getBlock())); } @@ -131,7 +131,7 @@ public abstract class TileEntityBase extends TileEntity implements ITickable{ this.readSyncableNBT(compound, true); } - @Nonnull + @Override public NBTTagCompound getUpdateTag(){ NBTTagCompound tag = super.getUpdateTag(); diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityBreaker.java b/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityBreaker.java index 58c697949..852d08be7 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityBreaker.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityBreaker.java @@ -74,7 +74,7 @@ public class TileEntityBreaker extends TileEntityInventoryBase implements IRedst } @Override - public boolean isItemValidForSlot(int i, @Nonnull ItemStack stack){ + public boolean isItemValidForSlot(int i, ItemStack stack){ return this.isPlacer; } @@ -110,12 +110,12 @@ public class TileEntityBreaker extends TileEntityInventoryBase implements IRedst } @Override - public boolean canInsertItem(int slot, @Nonnull ItemStack stack, @Nonnull EnumFacing side){ + public boolean canInsertItem(int slot, ItemStack stack, EnumFacing side){ return this.isItemValidForSlot(slot, stack); } @Override - public boolean canExtractItem(int slot, @Nonnull ItemStack stack, @Nonnull EnumFacing side){ + public boolean canExtractItem(int slot, ItemStack stack, EnumFacing side){ return true; } diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityCanolaPress.java b/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityCanolaPress.java index 39985ff11..c397cebad 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityCanolaPress.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityCanolaPress.java @@ -118,7 +118,7 @@ public class TileEntityCanolaPress extends TileEntityInventoryBase implements IE } @Override - public boolean isItemValidForSlot(int i, @Nonnull ItemStack stack){ + public boolean isItemValidForSlot(int i, ItemStack stack){ return (i == 0 && stack.getItem() == InitItems.itemMisc && stack.getItemDamage() == TheMiscItems.CANOLA.ordinal()); } @@ -127,12 +127,12 @@ public class TileEntityCanolaPress extends TileEntityInventoryBase implements IE } @Override - public boolean canInsertItem(int slot, @Nonnull ItemStack stack, @Nonnull EnumFacing side){ + public boolean canInsertItem(int slot, ItemStack stack, EnumFacing side){ return this.isItemValidForSlot(slot, stack); } @Override - public boolean canExtractItem(int slot, @Nonnull ItemStack stack, @Nonnull EnumFacing side){ + public boolean canExtractItem(int slot, ItemStack stack, EnumFacing side){ return false; } diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityCoalGenerator.java b/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityCoalGenerator.java index 4eea61833..83234e197 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityCoalGenerator.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityCoalGenerator.java @@ -112,17 +112,17 @@ public class TileEntityCoalGenerator extends TileEntityInventoryBase implements } @Override - public boolean isItemValidForSlot(int i, @Nonnull ItemStack stack){ + public boolean isItemValidForSlot(int i, ItemStack stack){ return TileEntityFurnace.getItemBurnTime(stack) > 0; } @Override - public boolean canInsertItem(int slot, @Nonnull ItemStack stack, @Nonnull EnumFacing side){ + public boolean canInsertItem(int slot, ItemStack stack, EnumFacing side){ return this.isItemValidForSlot(slot, stack); } @Override - public boolean canExtractItem(int slot, @Nonnull ItemStack stack, @Nonnull EnumFacing side){ + public boolean canExtractItem(int slot, ItemStack stack, EnumFacing side){ return false; } diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityCoffeeMachine.java b/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityCoffeeMachine.java index 5f2b573d2..f0c3010bb 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityCoffeeMachine.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityCoffeeMachine.java @@ -112,7 +112,7 @@ public class TileEntityCoffeeMachine extends TileEntityInventoryBase implements } @Override - public boolean isItemValidForSlot(int i, @Nonnull ItemStack stack){ + public boolean isItemValidForSlot(int i, ItemStack stack){ return (i >= 3 && ItemCoffee.getIngredientFromStack(stack) != null) || (i == SLOT_COFFEE_BEANS && stack.getItem() == InitItems.itemCoffeeBean) || (i == SLOT_INPUT && stack.getItem() == InitItems.itemMisc && stack.getItemDamage() == TheMiscItems.CUP.ordinal()); } @@ -172,12 +172,12 @@ public class TileEntityCoffeeMachine extends TileEntityInventoryBase implements } @Override - public boolean canInsertItem(int slot, @Nonnull ItemStack stack, @Nonnull EnumFacing side){ + public boolean canInsertItem(int slot, ItemStack stack, EnumFacing side){ return this.isItemValidForSlot(slot, stack); } @Override - public boolean canExtractItem(int slot, @Nonnull ItemStack stack, @Nonnull EnumFacing side){ + public boolean canExtractItem(int slot, ItemStack stack, EnumFacing side){ return slot == SLOT_OUTPUT || (slot >= 3 && slot < this.slots.length-2 && ItemCoffee.getIngredientFromStack(stack) == null); } diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityCompost.java b/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityCompost.java index 328b889ae..2f0da7452 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityCompost.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityCompost.java @@ -71,7 +71,7 @@ public class TileEntityCompost extends TileEntityInventoryBase{ } @Override - public boolean isItemValidForSlot(int i, @Nonnull ItemStack stack){ + public boolean isItemValidForSlot(int i, ItemStack stack){ return getRecipeForInput(stack) != null; } @@ -82,12 +82,12 @@ public class TileEntityCompost extends TileEntityInventoryBase{ } @Override - public boolean canInsertItem(int slot, @Nonnull ItemStack stack, @Nonnull EnumFacing side){ + public boolean canInsertItem(int slot, ItemStack stack, EnumFacing side){ return this.isItemValidForSlot(slot, stack); } @Override - public boolean canExtractItem(int slot, @Nonnull ItemStack stack, @Nonnull EnumFacing side){ + public boolean canExtractItem(int slot, ItemStack stack, EnumFacing side){ return getRecipeForInput(stack) == null; } diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityDirectionalBreaker.java b/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityDirectionalBreaker.java index 3721c8497..176cb9177 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityDirectionalBreaker.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityDirectionalBreaker.java @@ -108,7 +108,7 @@ public class TileEntityDirectionalBreaker extends TileEntityInventoryBase implem } @Override - public boolean isItemValidForSlot(int i, @Nonnull ItemStack stack){ + public boolean isItemValidForSlot(int i, ItemStack stack){ return false; } @@ -118,12 +118,12 @@ public class TileEntityDirectionalBreaker extends TileEntityInventoryBase implem } @Override - public boolean canInsertItem(int slot, @Nonnull ItemStack stack, @Nonnull EnumFacing side){ + public boolean canInsertItem(int slot, ItemStack stack, EnumFacing side){ return this.isItemValidForSlot(slot, stack); } @Override - public boolean canExtractItem(int slot, @Nonnull ItemStack stack, @Nonnull EnumFacing side){ + public boolean canExtractItem(int slot, ItemStack stack, EnumFacing side){ return true; } diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityDropper.java b/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityDropper.java index 7612f7722..9e18d5741 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityDropper.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityDropper.java @@ -59,7 +59,7 @@ public class TileEntityDropper extends TileEntityInventoryBase implements IRedst } @Override - public boolean isItemValidForSlot(int i, @Nonnull ItemStack stack){ + public boolean isItemValidForSlot(int i, ItemStack stack){ return true; } @@ -88,12 +88,12 @@ public class TileEntityDropper extends TileEntityInventoryBase implements IRedst } @Override - public boolean canInsertItem(int slot, @Nonnull ItemStack stack, @Nonnull EnumFacing side){ + public boolean canInsertItem(int slot, ItemStack stack, EnumFacing side){ return this.isItemValidForSlot(slot, stack); } @Override - public boolean canExtractItem(int slot, @Nonnull ItemStack stack, @Nonnull EnumFacing side){ + public boolean canExtractItem(int slot, ItemStack stack, EnumFacing side){ return true; } diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityEnergizer.java b/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityEnergizer.java index 835419b2e..cd30443f6 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityEnergizer.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityEnergizer.java @@ -68,17 +68,17 @@ public class TileEntityEnergizer extends TileEntityInventoryBase implements IEne } @Override - public boolean isItemValidForSlot(int i, @Nonnull ItemStack stack){ + public boolean isItemValidForSlot(int i, ItemStack stack){ return i == 0 && stack.getItem() instanceof IEnergyContainerItem; } @Override - public boolean canInsertItem(int slot, @Nonnull ItemStack stack, @Nonnull EnumFacing side){ + public boolean canInsertItem(int slot, ItemStack stack, EnumFacing side){ return this.isItemValidForSlot(slot, stack); } @Override - public boolean canExtractItem(int slot, @Nonnull ItemStack stack, @Nonnull EnumFacing side){ + public boolean canExtractItem(int slot, ItemStack stack, EnumFacing side){ return slot == 1; } diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityEnervator.java b/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityEnervator.java index 605f8edb8..8c1d4a5f8 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityEnervator.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityEnervator.java @@ -73,7 +73,7 @@ public class TileEntityEnervator extends TileEntityInventoryBase implements IEne } @Override - public boolean isItemValidForSlot(int i, @Nonnull ItemStack stack){ + public boolean isItemValidForSlot(int i, ItemStack stack){ return i == 0 && stack.getItem() instanceof IEnergyContainerItem; } @@ -103,12 +103,12 @@ public class TileEntityEnervator extends TileEntityInventoryBase implements IEne } @Override - public boolean canInsertItem(int slot, @Nonnull ItemStack stack, @Nonnull EnumFacing side){ + public boolean canInsertItem(int slot, ItemStack stack, EnumFacing side){ return this.isItemValidForSlot(slot, stack); } @Override - public boolean canExtractItem(int slot, @Nonnull ItemStack stack, @Nonnull EnumFacing side){ + public boolean canExtractItem(int slot, ItemStack stack, EnumFacing side){ return slot == 1; } diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityFeeder.java b/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityFeeder.java index 3babe3ee3..123a2a8b5 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityFeeder.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityFeeder.java @@ -111,7 +111,7 @@ public class TileEntityFeeder extends TileEntityInventoryBase{ } @Override - public boolean isItemValidForSlot(int i, @Nonnull ItemStack stack){ + public boolean isItemValidForSlot(int i, ItemStack stack){ return true; } @@ -126,12 +126,12 @@ public class TileEntityFeeder extends TileEntityInventoryBase{ } @Override - public boolean canInsertItem(int slot, @Nonnull ItemStack stack, @Nonnull EnumFacing side){ + public boolean canInsertItem(int slot, ItemStack stack, EnumFacing side){ return this.isItemValidForSlot(slot, stack); } @Override - public boolean canExtractItem(int slot, @Nonnull ItemStack stack, @Nonnull EnumFacing side){ + public boolean canExtractItem(int slot, ItemStack stack, EnumFacing side){ return false; } } diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityFurnaceDouble.java b/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityFurnaceDouble.java index d16b15409..89d1e7349 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityFurnaceDouble.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityFurnaceDouble.java @@ -117,7 +117,7 @@ public class TileEntityFurnaceDouble extends TileEntityInventoryBase implements } @Override - public boolean isItemValidForSlot(int i, @Nonnull ItemStack stack){ + public boolean isItemValidForSlot(int i, ItemStack stack){ return (i == SLOT_INPUT_1 || i == SLOT_INPUT_2) && FurnaceRecipes.instance().getSmeltingResult(stack) != null; } @@ -166,12 +166,12 @@ public class TileEntityFurnaceDouble extends TileEntityInventoryBase implements } @Override - public boolean canInsertItem(int slot, @Nonnull ItemStack stack, @Nonnull EnumFacing side){ + public boolean canInsertItem(int slot, ItemStack stack, EnumFacing side){ return this.isItemValidForSlot(slot, stack); } @Override - public boolean canExtractItem(int slot, @Nonnull ItemStack stack, @Nonnull EnumFacing side){ + public boolean canExtractItem(int slot, ItemStack stack, EnumFacing side){ return slot == SLOT_OUTPUT_1 || slot == SLOT_OUTPUT_2; } diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityGiantChest.java b/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityGiantChest.java index df76e72a7..733922d66 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityGiantChest.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityGiantChest.java @@ -23,17 +23,17 @@ public class TileEntityGiantChest extends TileEntityInventoryBase{ } @Override - public boolean canInsertItem(int slot, @Nonnull ItemStack stack, @Nonnull EnumFacing side){ + public boolean canInsertItem(int slot, ItemStack stack, EnumFacing side){ return this.isItemValidForSlot(slot, stack); } @Override - public boolean isItemValidForSlot(int i, @Nonnull ItemStack stack){ + public boolean isItemValidForSlot(int i, ItemStack stack){ return true; } @Override - public boolean canExtractItem(int slot, @Nonnull ItemStack stack, @Nonnull EnumFacing side){ + public boolean canExtractItem(int slot, ItemStack stack, EnumFacing side){ return true; } } diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityGrinder.java b/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityGrinder.java index 1cc9564cb..f0c869be1 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityGrinder.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityGrinder.java @@ -167,7 +167,7 @@ public class TileEntityGrinder extends TileEntityInventoryBase implements IEnerg } @Override - public boolean isItemValidForSlot(int i, @Nonnull ItemStack stack){ + public boolean isItemValidForSlot(int i, ItemStack stack){ return (i == SLOT_INPUT_1 || i == SLOT_INPUT_2) && CrusherRecipeRegistry.getRecipeFromInput(stack) != null; } @@ -256,12 +256,12 @@ public class TileEntityGrinder extends TileEntityInventoryBase implements IEnerg } @Override - public boolean canInsertItem(int slot, @Nonnull ItemStack stack, @Nonnull EnumFacing side){ + public boolean canInsertItem(int slot, ItemStack stack, EnumFacing side){ return this.isItemValidForSlot(slot, stack); } @Override - public boolean canExtractItem(int slot, @Nonnull ItemStack stack, @Nonnull EnumFacing side){ + public boolean canExtractItem(int slot, ItemStack stack, EnumFacing side){ return slot == SLOT_OUTPUT_1_1 || slot == SLOT_OUTPUT_1_2 || slot == SLOT_OUTPUT_2_1 || slot == SLOT_OUTPUT_2_2; } diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityInputter.java b/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityInputter.java index ea4371936..027f703f2 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityInputter.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityInputter.java @@ -427,17 +427,17 @@ public class TileEntityInputter extends TileEntityInventoryBase implements IButt } @Override - public boolean isItemValidForSlot(int i, @Nonnull ItemStack stack){ + public boolean isItemValidForSlot(int i, ItemStack stack){ return i == 0; } @Override - public boolean canInsertItem(int slot, @Nonnull ItemStack stack, @Nonnull EnumFacing side){ + public boolean canInsertItem(int slot, ItemStack stack, EnumFacing side){ return this.isItemValidForSlot(slot, stack); } @Override - public boolean canExtractItem(int slot, @Nonnull ItemStack stack, @Nonnull EnumFacing side){ + public boolean canExtractItem(int slot, ItemStack stack, EnumFacing side){ return slot == 0; } } \ No newline at end of file diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityInventoryBase.java b/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityInventoryBase.java index 884deb7c9..99a8afc90 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityInventoryBase.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityInventoryBase.java @@ -95,9 +95,9 @@ public abstract class TileEntityInventoryBase extends TileEntityBase implements } } - @Nonnull + @Override - public int[] getSlotsForFace(@Nonnull EnumFacing side){ + public int[] getSlotsForFace(EnumFacing side){ int invSize = this.getSizeInventory(); if(invSize > 0){ int[] theInt = new int[invSize]; @@ -117,22 +117,22 @@ public abstract class TileEntityInventoryBase extends TileEntityBase implements } @Override - public boolean isUseableByPlayer(@Nonnull EntityPlayer player){ + public boolean isUseableByPlayer(EntityPlayer player){ return this.canPlayerUse(player); } @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 false; } @@ -204,7 +204,7 @@ public abstract class TileEntityInventoryBase extends TileEntityBase implements return stack; } - @Nonnull + @Override public String getName(){ return this.name; @@ -215,21 +215,21 @@ public abstract class TileEntityInventoryBase extends TileEntityBase implements return false; } - @Nonnull + @Override public ITextComponent getDisplayName(){ return new TextComponentTranslation(this.getName()); } @Override - public boolean hasCapability(@Nonnull Capability capability, @Nonnull EnumFacing facing){ - return this.canHandleCapability(capability) || super.hasCapability(capability, facing); + public boolean hasCapability(Capability capability, EnumFacing facing){ + return this.getCapability(capability, facing) != null; } - @Nonnull + @Override - public T getCapability(@Nonnull Capability capability, @Nonnull EnumFacing facing){ - if(this.canHandleCapability(capability)){ + public T getCapability(Capability capability, EnumFacing facing){ + if(this.hasInvWrapperCapabilities() && capability == CapabilityItemHandler.ITEM_HANDLER_CAPABILITY){ return (T)this.invWrappers[facing.ordinal()]; } else{ @@ -237,10 +237,6 @@ public abstract class TileEntityInventoryBase extends TileEntityBase implements } } - private boolean canHandleCapability(Capability capability){ - return this.hasInvWrapperCapabilities() && capability == CapabilityItemHandler.ITEM_HANDLER_CAPABILITY; - } - public boolean hasInvWrapperCapabilities(){ return true; } diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityItemRepairer.java b/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityItemRepairer.java index a55ce3bb2..8a2cc4005 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityItemRepairer.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityItemRepairer.java @@ -104,7 +104,7 @@ public class TileEntityItemRepairer extends TileEntityInventoryBase implements I } @Override - public boolean isItemValidForSlot(int i, @Nonnull ItemStack stack){ + public boolean isItemValidForSlot(int i, ItemStack stack){ return i == SLOT_INPUT; } @@ -122,12 +122,12 @@ public class TileEntityItemRepairer extends TileEntityInventoryBase implements I } @Override - public boolean canInsertItem(int slot, @Nonnull ItemStack stack, @Nonnull EnumFacing side){ + public boolean canInsertItem(int slot, ItemStack stack, EnumFacing side){ return this.isItemValidForSlot(slot, stack); } @Override - public boolean canExtractItem(int slot, @Nonnull ItemStack stack, @Nonnull EnumFacing side){ + public boolean canExtractItem(int slot, ItemStack stack, EnumFacing side){ return slot == SLOT_OUTPUT; } diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityItemViewer.java b/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityItemViewer.java index b4b17aae9..dc8b26896 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityItemViewer.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityItemViewer.java @@ -84,12 +84,12 @@ public class TileEntityItemViewer extends TileEntityInventoryBase{ } @Override - public boolean canInsertItem(int index, @Nonnull ItemStack stack, @Nonnull EnumFacing direction){ + public boolean canInsertItem(int index, ItemStack stack, EnumFacing direction){ return this.isItemValidForSlot(index, stack); } @Override - public boolean canExtractItem(int index, @Nonnull ItemStack stack, @Nonnull EnumFacing direction){ + public boolean canExtractItem(int index, ItemStack stack, EnumFacing direction){ SpecificItemHandlerInfo handler = this.getSwitchedIndexHandler(index); if(handler != null){ if(this.isWhitelisted(handler, stack)){ @@ -114,7 +114,7 @@ public class TileEntityItemViewer extends TileEntityInventoryBase{ } @Override - public boolean isItemValidForSlot(int index, @Nonnull ItemStack stack){ + public boolean isItemValidForSlot(int index, ItemStack stack){ SpecificItemHandlerInfo handler = this.getSwitchedIndexHandler(index); if(handler != null){ if(this.isWhitelisted(handler, stack)){ @@ -236,7 +236,7 @@ public class TileEntityItemViewer extends TileEntityInventoryBase{ } @Override - public int compareTo(@Nonnull GenericItemHandlerInfo other){ + public int compareTo(GenericItemHandlerInfo other){ boolean thisWhitelist = this.relayInQuestion instanceof TileEntityLaserRelayItemWhitelist; boolean otherWhitelist = other.relayInQuestion instanceof TileEntityLaserRelayItemWhitelist; diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityLaserRelay.java b/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityLaserRelay.java index d83eccabb..924c88a00 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityLaserRelay.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityLaserRelay.java @@ -55,7 +55,7 @@ public abstract class TileEntityLaserRelay extends TileEntityBase{ super.receiveSyncCompound(compound); } - @Nonnull + @Override public NBTTagCompound getUpdateTag(){ NBTTagCompound compound = super.getUpdateTag(); diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityLaserRelayItemWhitelist.java b/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityLaserRelayItemWhitelist.java index ecdd6b98f..074994d1b 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityLaserRelayItemWhitelist.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityLaserRelayItemWhitelist.java @@ -46,7 +46,7 @@ public class TileEntityLaserRelayItemWhitelist extends TileEntityLaserRelayItem return this; } - @Nonnull + @Override public String getName(){ return this.tile.name; @@ -63,17 +63,17 @@ public class TileEntityLaserRelayItemWhitelist extends TileEntityLaserRelayItem } @Override - public boolean isUseableByPlayer(@Nonnull EntityPlayer player){ + public boolean isUseableByPlayer(EntityPlayer player){ return this.tile.canPlayerUse(player); } @Override - public void openInventory(@Nonnull EntityPlayer player){ + public void openInventory(EntityPlayer player){ } @Override - public void closeInventory(@Nonnull EntityPlayer player){ + public void closeInventory(EntityPlayer player){ } @@ -151,14 +151,14 @@ public class TileEntityLaserRelayItemWhitelist extends TileEntityLaserRelayItem return false; } - @Nonnull + @Override public ITextComponent getDisplayName(){ return new TextComponentTranslation(this.getName()); } @Override - public boolean isItemValidForSlot(int index, @Nonnull ItemStack stack){ + public boolean isItemValidForSlot(int index, ItemStack stack){ return false; } }.setTile(this); diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityMiner.java b/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityMiner.java index 5ae1537b7..db51b3faf 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityMiner.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityMiner.java @@ -181,7 +181,7 @@ public class TileEntityMiner extends TileEntityInventoryBase implements IEnergyR } @Override - public boolean isItemValidForSlot(int slot, @Nonnull ItemStack stack){ + public boolean isItemValidForSlot(int slot, ItemStack stack){ return false; } @@ -206,12 +206,12 @@ public class TileEntityMiner extends TileEntityInventoryBase implements IEnergyR } @Override - public boolean canInsertItem(int slot, @Nonnull ItemStack stack, @Nonnull EnumFacing side){ + public boolean canInsertItem(int slot, ItemStack stack, EnumFacing side){ return this.isItemValidForSlot(slot, stack); } @Override - public boolean canExtractItem(int slot, @Nonnull ItemStack stack, @Nonnull EnumFacing side){ + public boolean canExtractItem(int slot, ItemStack stack, EnumFacing side){ return true; } diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityPhantomItemface.java b/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityPhantomItemface.java index 640885e50..bfc25ab8a 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityPhantomItemface.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityPhantomItemface.java @@ -27,9 +27,9 @@ public class TileEntityPhantomItemface extends TileEntityPhantomface{ this.type = BlockPhantom.Type.FACE; } - @Nonnull + @Override - public int[] getSlotsForFace(@Nonnull EnumFacing side){ + public int[] getSlotsForFace(EnumFacing side){ if(this.isBoundThingInRange()){ if(this.getSided() != null){ return this.getSided().getSlotsForFace(side); @@ -103,7 +103,7 @@ public class TileEntityPhantomItemface extends TileEntityPhantomface{ } @Override - public boolean isItemValidForSlot(int i, @Nonnull ItemStack stack){ + public boolean isItemValidForSlot(int i, ItemStack stack){ return this.isBoundThingInRange() && this.getInventory().isItemValidForSlot(i, stack); } @@ -113,23 +113,23 @@ public class TileEntityPhantomItemface extends TileEntityPhantomface{ } @Override - public boolean canInsertItem(int slot, @Nonnull ItemStack stack, @Nonnull EnumFacing side){ + public boolean canInsertItem(int slot, ItemStack stack, EnumFacing side){ return this.isBoundThingInRange() && (this.getSided() == null || this.getSided().canInsertItem(slot, stack, side)); } @Override - public boolean canExtractItem(int slot, @Nonnull ItemStack stack, @Nonnull EnumFacing side){ + public boolean canExtractItem(int slot, ItemStack stack, EnumFacing side){ return this.isBoundThingInRange() && (this.getSided() == null || this.getSided().canExtractItem(slot, stack, side)); } @Override - public boolean hasCapability(@Nonnull Capability capability, @Nonnull EnumFacing facing){ + public boolean hasCapability(Capability capability, EnumFacing facing){ return this.isBoundThingInRange() ? this.worldObj.getTileEntity(this.boundPosition).hasCapability(capability, facing) : super.hasCapability(capability, facing); } - @Nonnull + @Override - public T getCapability(@Nonnull Capability capability, @Nonnull EnumFacing facing){ + public T getCapability(Capability capability, EnumFacing facing){ return this.isBoundThingInRange() ? this.worldObj.getTileEntity(this.boundPosition).getCapability(capability, facing) : super.getCapability(capability, facing); } } diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityPhantomPlacer.java b/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityPhantomPlacer.java index 9fc282b62..25a796790 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityPhantomPlacer.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityPhantomPlacer.java @@ -194,17 +194,17 @@ public class TileEntityPhantomPlacer extends TileEntityInventoryBase implements } @Override - public boolean isItemValidForSlot(int i, @Nonnull ItemStack stack){ + public boolean isItemValidForSlot(int i, ItemStack stack){ return !this.isBreaker; } @Override - public boolean canInsertItem(int slot, @Nonnull ItemStack stack, @Nonnull EnumFacing side){ + public boolean canInsertItem(int slot, ItemStack stack, EnumFacing side){ return this.isItemValidForSlot(slot, stack); } @Override - public boolean canExtractItem(int slot, @Nonnull ItemStack stack, @Nonnull EnumFacing side){ + public boolean canExtractItem(int slot, ItemStack stack, EnumFacing side){ return this.isBreaker; } diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityPhantomface.java b/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityPhantomface.java index abd92bfbd..039248b12 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityPhantomface.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityPhantomface.java @@ -118,7 +118,7 @@ public class TileEntityPhantomface extends TileEntityInventoryBase implements IP } @Override - public boolean isItemValidForSlot(int slot, @Nonnull ItemStack stack){ + public boolean isItemValidForSlot(int slot, ItemStack stack){ return false; } @@ -179,12 +179,12 @@ public class TileEntityPhantomface extends TileEntityInventoryBase implements IP } @Override - public boolean canInsertItem(int slot, @Nonnull ItemStack stack, @Nonnull EnumFacing side){ + public boolean canInsertItem(int slot, ItemStack stack, EnumFacing side){ return false; } @Override - public boolean canExtractItem(int slot, @Nonnull ItemStack stack, @Nonnull EnumFacing side){ + public boolean canExtractItem(int slot, ItemStack stack, EnumFacing side){ return false; } diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityRangedCollector.java b/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityRangedCollector.java index 1b9e893fd..ab71037c1 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityRangedCollector.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityRangedCollector.java @@ -87,17 +87,17 @@ public class TileEntityRangedCollector extends TileEntityInventoryBase implement } @Override - public boolean isItemValidForSlot(int i, @Nonnull ItemStack stack){ + public boolean isItemValidForSlot(int i, ItemStack stack){ return false; } @Override - public boolean canInsertItem(int slot, @Nonnull ItemStack stack, @Nonnull EnumFacing side){ + public boolean canInsertItem(int slot, ItemStack stack, EnumFacing side){ return this.isItemValidForSlot(slot, stack); } @Override - public boolean canExtractItem(int slot, @Nonnull ItemStack stack, @Nonnull EnumFacing side){ + public boolean canExtractItem(int slot, ItemStack stack, EnumFacing side){ return slot < WHITELIST_START; } diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityXPSolidifier.java b/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityXPSolidifier.java index 7b04ab089..56131a83a 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityXPSolidifier.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityXPSolidifier.java @@ -68,17 +68,17 @@ public class TileEntityXPSolidifier extends TileEntityInventoryBase implements I } @Override - public boolean isItemValidForSlot(int i, @Nonnull ItemStack stack){ + public boolean isItemValidForSlot(int i, ItemStack stack){ return false; } @Override - public boolean canInsertItem(int slot, @Nonnull ItemStack stack, @Nonnull EnumFacing side){ + public boolean canInsertItem(int slot, ItemStack stack, EnumFacing side){ return this.isItemValidForSlot(slot, stack); } @Override - public boolean canExtractItem(int slot, @Nonnull ItemStack stack, @Nonnull EnumFacing side){ + public boolean canExtractItem(int slot, ItemStack stack, EnumFacing side){ return true; } diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/util/FluidStateMapper.java b/src/main/java/de/ellpeck/actuallyadditions/mod/util/FluidStateMapper.java index b1f9fef3e..8e0041fc5 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/util/FluidStateMapper.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/util/FluidStateMapper.java @@ -37,15 +37,15 @@ public class FluidStateMapper extends StateMapperBase implements ItemMeshDefinit this.location = new ModelResourceLocation(new ResourceLocation(ModUtil.MOD_ID, "fluids"), fluid.getName()); } - @Nonnull + @Override - protected ModelResourceLocation getModelResourceLocation(@Nonnull IBlockState state){ + protected ModelResourceLocation getModelResourceLocation(IBlockState state){ return this.location; } - @Nonnull + @Override - public ModelResourceLocation getModelLocation(@Nonnull ItemStack stack){ + public ModelResourceLocation getModelLocation(ItemStack stack){ return this.location; } }