From 8fb3b886a809da1d406cbac7086e2f70ebfe9f21 Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Wed, 18 May 2016 21:03:12 -0500 Subject: [PATCH] Get rid of all the nullable-nonnull stuff, warning huge diff --- build.gradle | 2 +- build.properties | 2 +- .../java/buildcraft/api/core/EnumColor.java | 3 ++ .../java/vazkii/botania/api/BotaniaAPI.java | 39 ++++++++++++------- .../botania/api/lexicon/LexiconCategory.java | 3 +- .../botania/api/lexicon/LexiconEntry.java | 3 +- .../core/handler/BaubleRenderHandler.java | 4 +- .../client/core/handler/ColorHandler.java | 11 +++--- .../handler/ContributorFancinessHandler.java | 3 +- .../handler/CorporeaAutoCompleteHandler.java | 3 +- .../client/core/handler/ModelHandler.java | 4 +- .../core/handler/MultiblockBlockAccess.java | 19 +++++---- .../client/gui/bag/ContainerFlowerBag.java | 4 +- .../client/gui/bag/InventoryFlowerBag.java | 11 ++++-- .../client/gui/box/ContainerBaubleBox.java | 4 +- .../client/gui/box/InventoryBaubleBox.java | 11 ++++-- .../gui/crafting/ContainerCraftingHalo.java | 4 +- .../lexicon/button/GuiButtonAchievement.java | 3 +- .../gui/lexicon/button/GuiButtonBack.java | 3 +- .../gui/lexicon/button/GuiButtonBookmark.java | 3 +- .../gui/lexicon/button/GuiButtonCategory.java | 4 +- .../button/GuiButtonChallengeIcon.java | 3 +- .../button/GuiButtonChallengeInfo.java | 3 +- .../lexicon/button/GuiButtonChallenges.java | 3 +- .../gui/lexicon/button/GuiButtonDoot.java | 3 +- .../gui/lexicon/button/GuiButtonHistory.java | 3 +- .../lexicon/button/GuiButtonInvisible.java | 4 +- .../gui/lexicon/button/GuiButtonNotes.java | 3 +- .../gui/lexicon/button/GuiButtonOptions.java | 3 +- .../gui/lexicon/button/GuiButtonPage.java | 3 +- .../gui/lexicon/button/GuiButtonShare.java | 3 +- .../button/GuiButtonUpdateWarning.java | 3 +- .../lexicon/button/GuiButtonViewOnline.java | 3 +- .../client/model/FloatingFlowerModel.java | 14 ++++++- .../botania/client/model/LexiconModel.java | 5 +++ .../botania/client/model/PlatformModel.java | 22 +++++++---- .../client/model/SpecialFlowerModel.java | 10 ++++- .../model/armor/ModelArmorElementium.java | 4 +- .../model/armor/ModelArmorManasteel.java | 4 +- .../model/armor/ModelArmorManaweave.java | 4 +- .../model/armor/ModelArmorTerrasteel.java | 4 +- .../render/entity/RenderBabylonWeapon.java | 6 ++- .../render/entity/RenderDoppleganger.java | 7 +++- .../client/render/entity/RenderManaStorm.java | 7 +++- .../render/entity/RenderPinkWither.java | 3 ++ .../client/render/entity/RenderPixie.java | 7 +++- .../render/entity/RenderPoolMinecart.java | 4 +- .../render/entity/RenderSnowballStack.java | 3 ++ .../client/render/entity/RenderSparkBase.java | 6 ++- .../render/entity/RenderThornChakram.java | 7 +++- .../render/tile/RenderTileAlfPortal.java | 4 +- .../client/render/tile/RenderTileAltar.java | 4 +- .../client/render/tile/RenderTileAvatar.java | 4 +- .../client/render/tile/RenderTileBellows.java | 4 +- .../client/render/tile/RenderTileBrewery.java | 4 +- .../client/render/tile/RenderTileCocoon.java | 4 +- .../tile/RenderTileCorporeaCrystalCube.java | 4 +- .../render/tile/RenderTileCorporeaIndex.java | 4 +- .../render/tile/RenderTileEnchanter.java | 4 +- .../render/tile/RenderTileFloatingFlower.java | 3 +- .../render/tile/RenderTileHourglass.java | 3 +- .../render/tile/RenderTileIncensePlate.java | 3 +- .../render/tile/RenderTileLightRelay.java | 4 +- .../client/render/tile/RenderTilePool.java | 3 +- .../client/render/tile/RenderTilePrism.java | 4 +- .../client/render/tile/RenderTilePylon.java | 3 +- .../render/tile/RenderTileRuneAltar.java | 4 +- .../render/tile/RenderTileSparkChanger.java | 4 +- .../render/tile/RenderTileSpreader.java | 3 +- .../render/tile/RenderTileStarfield.java | 3 +- .../render/tile/RenderTileTerraPlate.java | 4 +- .../render/tile/RenderTileTeruTeruBozu.java | 3 +- .../render/tile/RenderTileTinyPotato.java | 4 +- .../botania/common/block/BlockAlfPortal.java | 9 ++++- .../botania/common/block/BlockAltGrass.java | 12 ++++-- .../botania/common/block/BlockAltar.java | 17 +++++--- .../botania/common/block/BlockAvatar.java | 10 ++++- .../botania/common/block/BlockBifrost.java | 12 ++++-- .../common/block/BlockBifrostPerm.java | 4 +- .../common/block/BlockCacophonium.java | 15 ++++--- .../botania/common/block/BlockCell.java | 7 +++- .../botania/common/block/BlockCocoon.java | 11 ++++-- .../common/block/BlockEnchantedSoil.java | 5 ++- .../botania/common/block/BlockEnderEye.java | 7 +++- .../botania/common/block/BlockFakeAir.java | 11 ++++-- .../botania/common/block/BlockFelPumpkin.java | 4 ++ .../block/BlockFloatingSpecialFlower.java | 22 +++++++---- .../botania/common/block/BlockForestEye.java | 6 ++- .../botania/common/block/BlockGaiaHead.java | 10 +++-- .../botania/common/block/BlockGhostRail.java | 5 +++ .../botania/common/block/BlockHourglass.java | 10 ++++- .../common/block/BlockIncensePlate.java | 8 +++- .../common/block/BlockLightLauncher.java | 4 ++ .../botania/common/block/BlockLightRelay.java | 12 ++++-- .../botania/common/block/BlockLivingrock.java | 8 +++- .../botania/common/block/BlockLivingwood.java | 10 +++-- .../vazkii/botania/common/block/BlockMod.java | 3 ++ .../common/block/BlockModDoubleFlower.java | 28 ++++++++----- .../common/block/BlockModDoubleFlower1.java | 4 ++ .../common/block/BlockModDoubleFlower2.java | 4 ++ .../botania/common/block/BlockModFlower.java | 17 +++++--- .../botania/common/block/BlockOpenCrate.java | 13 +++++-- .../common/block/BlockPistonRelay.java | 10 +++-- .../botania/common/block/BlockPlatform.java | 15 ++++--- .../botania/common/block/BlockPylon.java | 10 ++++- .../botania/common/block/BlockRoot.java | 4 +- .../botania/common/block/BlockSolidVines.java | 6 ++- .../common/block/BlockSparkChanger.java | 9 ++++- .../common/block/BlockSpecialFlower.java | 26 +++++++++---- .../botania/common/block/BlockStorage.java | 5 ++- .../common/block/BlockTeruTeruBozu.java | 7 +++- .../botania/common/block/BlockTinyPlanet.java | 6 ++- .../block/corporea/BlockCorporeaBase.java | 3 +- .../corporea/BlockCorporeaCrystalCube.java | 11 +++++- .../block/corporea/BlockCorporeaFunnel.java | 7 +++- .../block/corporea/BlockCorporeaIndex.java | 6 ++- .../corporea/BlockCorporeaInterceptor.java | 6 ++- .../block/corporea/BlockCorporeaRetainer.java | 7 +++- .../common/block/decor/Block18Stone.java | 8 +++- .../common/block/decor/BlockBuriedPetals.java | 5 ++- .../common/block/decor/BlockCustomBrick.java | 8 +++- .../common/block/decor/BlockDirtPath.java | 10 +++-- .../block/decor/BlockEndStoneBrick.java | 8 +++- .../block/decor/BlockFloatingFlower.java | 15 +++++-- .../common/block/decor/BlockManaBeacon.java | 9 ++++- .../common/block/decor/BlockManaFlame.java | 13 +++++-- .../common/block/decor/BlockManaGlass.java | 5 ++- .../common/block/decor/BlockModMushroom.java | 11 ++++-- .../common/block/decor/BlockPavement.java | 8 +++- .../common/block/decor/BlockPetalBlock.java | 5 ++- .../common/block/decor/BlockPrismarine.java | 8 +++- .../common/block/decor/BlockReeds.java | 5 +++ .../common/block/decor/BlockSeaLamp.java | 4 +- .../common/block/decor/BlockShinyFlower.java | 6 ++- .../common/block/decor/BlockStarfield.java | 9 ++++- .../common/block/decor/BlockTinyPotato.java | 15 +++++-- .../common/block/decor/BlockUnstable.java | 6 ++- .../decor/biomestone/BlockBiomeStone.java | 6 ++- .../decor/biomestone/BlockBiomeStoneA.java | 4 ++ .../decor/biomestone/BlockBiomeStoneB.java | 4 ++ .../block/decor/panes/BlockAlfglassPane.java | 3 ++ .../block/decor/panes/BlockBifrostPane.java | 3 ++ .../block/decor/panes/BlockManaglassPane.java | 3 ++ .../block/decor/panes/BlockModPane.java | 4 +- .../decor/quartz/BlockSpecialQuartz.java | 8 +++- .../decor/quartz/BlockSpecialQuartzSlab.java | 6 ++- .../block/decor/slabs/BlockModSlab.java | 16 ++++++-- .../block/decor/walls/Block18StoneWall.java | 5 ++- .../decor/walls/BlockBiomeStoneWall.java | 5 ++- .../block/decor/walls/BlockModWall.java | 8 +++- .../block/dispenser/BehaviourFelPumpkin.java | 3 ++ .../dispenser/BehaviourPoolMinecart.java | 3 ++ .../block/dispenser/BehaviourSeeds.java | 3 ++ .../common/block/dispenser/BehaviourWand.java | 3 ++ .../common/block/mana/BlockBellows.java | 9 ++++- .../common/block/mana/BlockBrewery.java | 10 ++++- .../common/block/mana/BlockDistributor.java | 5 ++- .../common/block/mana/BlockEnchanter.java | 8 +++- .../common/block/mana/BlockForestDrum.java | 6 ++- .../common/block/mana/BlockManaDetector.java | 8 +++- .../common/block/mana/BlockManaVoid.java | 5 ++- .../botania/common/block/mana/BlockPool.java | 22 +++++++---- .../botania/common/block/mana/BlockPrism.java | 12 ++++-- .../botania/common/block/mana/BlockPump.java | 11 +++++- .../common/block/mana/BlockRFGenerator.java | 5 ++- .../common/block/mana/BlockRuneAltar.java | 7 +++- .../common/block/mana/BlockSpawnerClaw.java | 7 +++- .../common/block/mana/BlockSpreader.java | 11 ++++-- .../common/block/mana/BlockTerraPlate.java | 6 ++- .../common/block/mana/BlockTurntable.java | 5 ++- .../common/block/string/BlockRedString.java | 4 ++ .../string/BlockRedStringComparator.java | 5 ++- .../block/string/BlockRedStringContainer.java | 5 ++- .../block/string/BlockRedStringDispenser.java | 7 +++- .../string/BlockRedStringFertilizer.java | 10 +++-- .../string/BlockRedStringInterceptor.java | 6 ++- .../block/string/BlockRedStringRelay.java | 5 ++- .../common/block/tile/TileAlfPortal.java | 3 ++ .../common/block/tile/TileBifrost.java | 3 ++ .../common/block/tile/TileBrewery.java | 2 + .../common/block/tile/TileCraftCrate.java | 3 +- .../common/block/tile/TileEnchanter.java | 2 + .../common/block/tile/TileFakeAir.java | 3 ++ .../common/block/tile/TileLightRelay.java | 7 ++-- .../botania/common/block/tile/TileMod.java | 5 ++- .../common/block/tile/TileOpenCrate.java | 4 +- .../common/block/tile/TileRuneAltar.java | 2 + .../block/tile/TileSimpleInventory.java | 7 +++- .../corporea/TileCorporeaCrystalCube.java | 6 ++- .../common/block/tile/mana/TilePool.java | 3 +- .../common/block/tile/mana/TilePump.java | 7 +++- .../common/block/tile/mana/TileSpreader.java | 3 +- .../block/tile/string/TileRedString.java | 3 ++ .../tile/string/TileRedStringContainer.java | 6 ++- .../common/brew/potion/PotionClear.java | 4 +- .../common/core/BotaniaCreativeTab.java | 4 +- .../core/command/CommandDownloadLatest.java | 8 +++- .../common/core/command/CommandOpen.java | 8 +++- .../common/core/command/CommandShare.java | 8 +++- .../core/command/CommandSkyblockSpread.java | 8 +++- .../common/core/helper/InventoryHelper.java | 11 ++++-- .../botania/common/core/loot/BindUuid.java | 9 +++-- .../common/core/loot/EnableRelics.java | 8 ++-- .../common/core/loot/TrueGuardianKiller.java | 8 ++-- .../crafting/recipe/AesirRingRecipe.java | 8 ++-- .../crafting/recipe/AncientWillRecipe.java | 9 +++-- .../BlackHoleTalismanExtractRecipe.java | 9 +++-- .../crafting/recipe/CompositeLensRecipe.java | 9 +++-- .../crafting/recipe/CosmeticAttachRecipe.java | 9 +++-- .../crafting/recipe/CosmeticRemoveRecipe.java | 9 +++-- .../crafting/recipe/HelmRevealingRecipe.java | 9 +++-- .../common/crafting/recipe/KeepIvyRecipe.java | 9 +++-- .../crafting/recipe/LensDyeingRecipe.java | 8 ++-- .../crafting/recipe/ManaGunClipRecipe.java | 9 +++-- .../crafting/recipe/ManaGunLensRecipe.java | 9 +++-- .../recipe/ManaGunRemoveLensRecipe.java | 9 +++-- .../crafting/recipe/PhantomInkRecipe.java | 9 +++-- .../crafting/recipe/RegenIvyRecipe.java | 9 +++-- .../recipe/SpecialFloatingFlowerRecipe.java | 9 +++-- .../crafting/recipe/SpellClothRecipe.java | 9 +++-- .../recipe/TerraPickTippingRecipe.java | 9 +++-- .../common/entity/EntityBabylonWeapon.java | 5 ++- .../common/entity/EntityCorporeaSpark.java | 5 ++- .../common/entity/EntityDoppleganger.java | 9 +++-- .../common/entity/EntityEnderAirBottle.java | 3 +- .../common/entity/EntityFlameRing.java | 7 ++-- .../common/entity/EntityFlyingCreature.java | 4 +- .../common/entity/EntityMagicLandmine.java | 5 ++- .../common/entity/EntityMagicMissile.java | 3 +- .../common/entity/EntityManaBurst.java | 3 +- .../common/entity/EntityManaStorm.java | 6 ++- .../common/entity/EntityPinkWither.java | 3 +- .../botania/common/entity/EntityPixie.java | 4 +- .../common/entity/EntityPoolMinecart.java | 6 ++- .../common/entity/EntitySignalFlare.java | 6 ++- .../botania/common/entity/EntitySpark.java | 5 ++- .../common/entity/EntityThornChakram.java | 4 +- .../common/entity/EntityThrowableCopy.java | 5 ++- .../common/entity/EntityThrownItem.java | 3 +- .../botania/common/entity/EntityVineBall.java | 3 +- .../botania/common/item/Item16Colors.java | 4 +- .../botania/common/item/ItemAncientWill.java | 4 +- .../botania/common/item/ItemBaubleBox.java | 5 ++- .../common/item/ItemBlackHoleTalisman.java | 11 ++++-- .../botania/common/item/ItemBlackLotus.java | 4 +- .../botania/common/item/ItemBottledMana.java | 7 +++- .../botania/common/item/ItemCacophonium.java | 6 ++- .../common/item/ItemCorporeaSpark.java | 5 ++- .../botania/common/item/ItemCraftPattern.java | 5 ++- .../botania/common/item/ItemCraftingHalo.java | 5 ++- .../botania/common/item/ItemEnderHand.java | 5 ++- .../botania/common/item/ItemFertilizer.java | 2 + .../botania/common/item/ItemFlowerBag.java | 6 ++- .../botania/common/item/ItemGaiaHead.java | 3 ++ .../botania/common/item/ItemGrassHorn.java | 8 +++- .../botania/common/item/ItemGrassSeeds.java | 5 ++- .../botania/common/item/ItemLaputaShard.java | 4 +- .../botania/common/item/ItemLexicon.java | 8 +++- .../botania/common/item/ItemManaCookie.java | 7 +++- .../botania/common/item/ItemManaGun.java | 14 ++++--- .../botania/common/item/ItemManaMirror.java | 2 + .../botania/common/item/ItemManaTablet.java | 3 +- .../vazkii/botania/common/item/ItemMod.java | 5 ++- .../common/item/ItemObedienceStick.java | 3 ++ .../botania/common/item/ItemOpenBucket.java | 5 ++- .../common/item/ItemOvergrowthSeed.java | 3 ++ .../botania/common/item/ItemPinkinator.java | 4 +- .../botania/common/item/ItemPoolMinecart.java | 3 ++ .../botania/common/item/ItemSextant.java | 5 ++- .../botania/common/item/ItemSignalFlare.java | 6 ++- .../botania/common/item/ItemSlingshot.java | 7 +++- .../vazkii/botania/common/item/ItemSpark.java | 3 ++ .../botania/common/item/ItemSparkUpgrade.java | 4 +- .../botania/common/item/ItemSpawnerMover.java | 4 +- .../botania/common/item/ItemSpellCloth.java | 4 +- .../common/item/ItemTemperanceStone.java | 4 +- .../botania/common/item/ItemThornChakram.java | 7 +++- .../botania/common/item/ItemTwigWand.java | 11 ++++-- .../botania/common/item/ItemVineBall.java | 5 ++- .../vazkii/botania/common/item/ItemVirus.java | 4 +- .../botania/common/item/ItemWorldSeed.java | 5 ++- .../block/ItemBlockFloatingSpecialFlower.java | 5 ++- .../common/item/block/ItemBlockMod.java | 5 ++- .../common/item/block/ItemBlockModSlab.java | 3 ++ .../common/item/block/ItemBlockPool.java | 3 +- .../item/block/ItemBlockSpecialFlower.java | 9 +++-- .../item/block/ItemBlockSpecialQuartz.java | 5 ++- .../block/ItemBlockWithMetadataAndName.java | 6 ++- .../common/item/brew/ItemBrewBase.java | 12 ++++-- .../common/item/brew/ItemIncenseStick.java | 3 +- .../botania/common/item/brew/ItemVial.java | 4 +- .../armor/manasteel/ItemManasteelArmor.java | 6 ++- .../armor/manaweave/ItemManaweaveArmor.java | 4 +- .../armor/terrasteel/ItemTerrasteelArmor.java | 4 +- .../item/equipment/bauble/ItemBauble.java | 7 +++- .../equipment/bauble/ItemBaubleCosmetic.java | 4 +- .../equipment/bauble/ItemBloodPendant.java | 3 +- .../equipment/bauble/ItemFlightTiara.java | 3 +- .../item/equipment/bauble/ItemMagnetRing.java | 3 +- .../item/equipment/bauble/ItemManaRing.java | 3 +- .../item/equipment/tool/ItemEnderDagger.java | 5 ++- .../item/equipment/tool/ItemGlassPick.java | 4 +- .../item/equipment/tool/ItemStarSword.java | 4 +- .../item/equipment/tool/ItemThunderSword.java | 4 +- .../equipment/tool/bow/ItemLivingwoodBow.java | 11 ++++-- .../tool/elementium/ItemElementiumShears.java | 5 ++- .../tool/manasteel/ItemManasteelAxe.java | 12 ++++-- .../tool/manasteel/ItemManasteelPick.java | 11 ++++-- .../tool/manasteel/ItemManasteelShears.java | 8 ++-- .../tool/manasteel/ItemManasteelShovel.java | 14 ++++--- .../tool/manasteel/ItemManasteelSword.java | 13 ++++--- .../tool/terrasteel/ItemTerraAxe.java | 5 ++- .../tool/terrasteel/ItemTerraPick.java | 15 ++++--- .../tool/terrasteel/ItemTerraSword.java | 3 +- .../thaumcraft/ItemManaInkwell.java | 3 +- .../botania/common/item/lens/ItemLens.java | 7 +++- .../botania/common/item/material/ItemDye.java | 3 ++ .../item/material/ItemManaResource.java | 11 ++++-- .../common/item/material/ItemPetal.java | 3 ++ .../common/item/material/ItemQuartz.java | 4 +- .../common/item/material/ItemRune.java | 4 +- .../common/item/record/ItemModRecord.java | 6 ++- .../botania/common/item/relic/ItemDice.java | 4 +- .../common/item/relic/ItemFlugelEye.java | 9 ++++- .../common/item/relic/ItemInfiniteFruit.java | 6 ++- .../common/item/relic/ItemKingKey.java | 5 ++- .../botania/common/item/relic/ItemRelic.java | 2 + .../common/item/relic/ItemRelicBauble.java | 2 + .../common/item/rod/ItemCobbleRod.java | 3 ++ .../botania/common/item/rod/ItemDirtRod.java | 3 ++ .../common/item/rod/ItemDiviningRod.java | 4 +- .../common/item/rod/ItemExchangeRod.java | 5 ++- .../botania/common/item/rod/ItemFireRod.java | 3 ++ .../common/item/rod/ItemGravityRod.java | 6 ++- .../common/item/rod/ItemMissileRod.java | 6 ++- .../common/item/rod/ItemRainbowRod.java | 7 +++- .../common/item/rod/ItemSkyDirtRod.java | 5 ++- .../botania/common/item/rod/ItemSmeltRod.java | 5 ++- .../common/item/rod/ItemTerraformRod.java | 5 ++- .../common/item/rod/ItemTornadoRod.java | 9 +++-- .../botania/common/item/rod/ItemWaterRod.java | 3 ++ .../botania/common/lexicon/BLexiconEntry.java | 4 +- .../botania/common/lexicon/WLexiconEntry.java | 4 +- .../common/world/WorldTypeSkyblock.java | 7 +++- 344 files changed, 1603 insertions(+), 582 deletions(-) diff --git a/build.gradle b/build.gradle index a3a3678e9..204859c69 100644 --- a/build.gradle +++ b/build.gradle @@ -11,7 +11,7 @@ buildscript { } } dependencies { - classpath 'net.minecraftforge.gradle:ForgeGradle:2.1-SNAPSHOT' + classpath 'net.minecraftforge.gradle:ForgeGradle:2.2-SNAPSHOT' classpath 'com.matthewprenger:CurseGradle:1.0-SNAPSHOT' } } diff --git a/build.properties b/build.properties index a9aaa8e3c..9952d750f 100644 --- a/build.properties +++ b/build.properties @@ -4,6 +4,6 @@ version=r1.8 dir_output=../Build Output/Botania/ dir_repo=./ mc_version=1.9.4 -forge_version=12.16.1.1909-1.9.4 +forge_version=12.17.0.1909-1.9.4 build_number=306 mod_name=Botania diff --git a/src/api/java/buildcraft/api/core/EnumColor.java b/src/api/java/buildcraft/api/core/EnumColor.java index e93a44be4..14449b303 100644 --- a/src/api/java/buildcraft/api/core/EnumColor.java +++ b/src/api/java/buildcraft/api/core/EnumColor.java @@ -15,6 +15,8 @@ import net.minecraft.util.text.translation.I18n; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; +import javax.annotation.Nonnull; + /** Use minecraft's EnumDyeColor in as many places as possible. */ @Deprecated public enum EnumColor implements IStringSerializable { @@ -111,6 +113,7 @@ public enum EnumColor implements IStringSerializable { return name().replace("_", ".").toLowerCase(Locale.ENGLISH); } + @Nonnull @Override public String getName() { return NAMES[ordinal()]; diff --git a/src/main/java/vazkii/botania/api/BotaniaAPI.java b/src/main/java/vazkii/botania/api/BotaniaAPI.java index 778d91b5a..c1482dbe0 100644 --- a/src/main/java/vazkii/botania/api/BotaniaAPI.java +++ b/src/main/java/vazkii/botania/api/BotaniaAPI.java @@ -2,10 +2,10 @@ * This class was created by . It's distributed as * part of the Botania Mod. Get the Source Code in github: * https://github.com/Vazkii/Botania - * + * * Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php - * + * * File Created @ [Jan 14, 2014, 6:15:28 PM (GMT)] */ package vazkii.botania.api; @@ -32,6 +32,7 @@ import net.minecraft.item.ItemArmor.ArmorMaterial; import net.minecraft.item.ItemStack; import net.minecraft.item.crafting.CraftingManager; import net.minecraft.item.crafting.IRecipe; +import net.minecraft.util.SoundEvent; import net.minecraft.util.text.TextFormatting; import net.minecraftforge.common.util.EnumHelper; import net.minecraftforge.fml.common.Loader; @@ -74,7 +75,7 @@ public final class BotaniaAPI { public static final Map knowledgeTypes = new HashMap<>(); public static final Map brewMap = new LinkedHashMap<>(); - + public static final List disposableBlocks = new ArrayList<>(); public static final List semiDisposableBlocks = new ArrayList<>(); @@ -102,16 +103,24 @@ public final class BotaniaAPI { public static final Set> gravityRodBlacklist = new LinkedHashSet<>(); - public static final ArmorMaterial manasteelArmorMaterial = EnumHelper.addArmorMaterial("MANASTEEL", "manasteel", 16, new int[] { 2, 6, 5, 2 }, 18, SoundEvents.ITEM_ARMOR_EQUIP_IRON); + public static final ArmorMaterial manasteelArmorMaterial = EnumHelper.addEnum(ArmorMaterial.class, "MANASTEEL", + new Class[] { String.class, int.class, int[].class, int.class, SoundEvent.class, float.class }, + "manasteel", 16, new int[] { 2, 6, 5, 2 }, 18, SoundEvents.ITEM_ARMOR_EQUIP_IRON, 1.0F); // todo 1.9.4 toughness public static final ToolMaterial manasteelToolMaterial = EnumHelper.addToolMaterial("MANASTEEL", 3, 300, 6.2F, 2F, 20); - public static final ArmorMaterial elementiumArmorMaterial = EnumHelper.addArmorMaterial("B_ELEMENTIUM", "b_elementium", 18, new int[] { 2, 6, 5, 2 }, 18, SoundEvents.ITEM_ARMOR_EQUIP_IRON); + public static final ArmorMaterial elementiumArmorMaterial = EnumHelper.addEnum(ArmorMaterial.class, "B_ELEMENTIUM", + new Class[] { String.class, int.class, int[].class, int.class, SoundEvent.class, float.class }, + "b_elementium", 18, new int[] { 2, 6, 5, 2 }, 18, SoundEvents.ITEM_ARMOR_EQUIP_IRON, 1.0F); // todo 1.9.4 toughness public static final ToolMaterial elementiumToolMaterial = EnumHelper.addToolMaterial("B_ELEMENTIUM", 3, 720, 6.2F, 2F, 20); - public static final ArmorMaterial terrasteelArmorMaterial = EnumHelper.addArmorMaterial("TERRASTEEL", "terrasteel", 34, new int[] {3, 8, 6, 3}, 26, SoundEvents.ITEM_ARMOR_EQUIP_DIAMOND); + public static final ArmorMaterial terrasteelArmorMaterial = EnumHelper.addEnum(ArmorMaterial.class, "TERRASTEEL", + new Class[] { String.class, int.class, int[].class, int.class, SoundEvent.class, float.class }, + "terrasteel", 34, new int[] {3, 8, 6, 3}, 26, SoundEvents.ITEM_ARMOR_EQUIP_DIAMOND, 1.0F); // todo 1.9.4 toughness public static final ToolMaterial terrasteelToolMaterial = EnumHelper.addToolMaterial("TERRASTEEL", 4, 2300, 9F, 3F, 26); - public static final ArmorMaterial manaweaveArmorMaterial = EnumHelper.addArmorMaterial("MANAWEAVE", "manaweave", 5, new int[] { 1, 2, 2, 1 }, 18, SoundEvents.ITEM_ARMOR_EQUIP_LEATHER); + public static final ArmorMaterial manaweaveArmorMaterial = EnumHelper.addEnum(ArmorMaterial.class, "MANAWEAVE", + new Class[] { String.class, int.class, int[].class, int.class, SoundEvent.class, float.class }, + "manaweave", 5, new int[] { 1, 2, 2, 1 }, 18, SoundEvents.ITEM_ARMOR_EQUIP_LEATHER, 1.0F); // todo 1.9.4 toughness public static final EnumRarity rarityRelic = EnumHelper.addRarity("RELIC", TextFormatting.GOLD, "Relic"); @@ -251,7 +260,7 @@ public final class BotaniaAPI { registerPaintableBlock(Blocks.STAINED_HARDENED_CLAY, BlockColored.COLOR); registerPaintableBlock(Blocks.WOOL, BlockColored.COLOR); registerPaintableBlock(Blocks.CARPET, BlockCarpet.COLOR); - + registerDisposableBlock("dirt"); // Vanilla registerDisposableBlock("sand"); // Vanilla registerDisposableBlock("gravel"); // Vanilla @@ -306,7 +315,7 @@ public final class BotaniaAPI { public static void registerDisposableBlock(String oreDictName) { disposableBlocks.add(oreDictName); } - + /** * Registers a Block as semi disposable using its Ore Dictionary Name. * This means it will not be trashed when sneaking. @@ -314,7 +323,7 @@ public final class BotaniaAPI { public static void registerSemiDisposableBlock(String oreDictName) { semiDisposableBlocks.add(oreDictName); } - + /** * Registers a paintableBlock and returns it. * You must also provide the PropertyEnum that this block uses to express its color @@ -331,7 +340,7 @@ public final class BotaniaAPI { public static void blacklistEntityFromGravityRod(Class entity) { gravityRodBlacklist.add(entity); } - + /** * Checks if the provided Entity is contained in the Blacklist. * Pass in the class for the Entity, e.g. entity.getClass() @@ -339,7 +348,7 @@ public final class BotaniaAPI { public static boolean isEntityBlacklistedFromGravityRod(Class entity) { return gravityRodBlacklist.contains(entity); } - + /** * Blacklists an item from being pulled by the Ring of Magnetization. * Short.MAX_VALUE can be used as the stack's damage for a wildcard. @@ -361,11 +370,11 @@ public final class BotaniaAPI { public static boolean isItemBlacklistedFromMagnet(ItemStack stack) { return isItemBlacklistedFromMagnet(stack, 0); } - + public static boolean isItemBlacklistedFromMagnet(ItemStack stack, int recursion) { if(recursion > 5) return false; - + if(stack.getItemDamage() != Short.MAX_VALUE) { ItemStack copy = new ItemStack(stack.getItem(), 0, Short.MAX_VALUE); boolean general = isItemBlacklistedFromMagnet(copy, recursion + 1); @@ -388,7 +397,7 @@ public final class BotaniaAPI { public static boolean isBlockBlacklistedFromMagnet(Block block, int meta, int recursion) { if(recursion >= 5) return false; - + if(meta != Short.MAX_VALUE) { boolean general = isBlockBlacklistedFromMagnet(block, Short.MAX_VALUE, recursion + 1); if(general) diff --git a/src/main/java/vazkii/botania/api/lexicon/LexiconCategory.java b/src/main/java/vazkii/botania/api/lexicon/LexiconCategory.java index 8d46f8246..88d339381 100644 --- a/src/main/java/vazkii/botania/api/lexicon/LexiconCategory.java +++ b/src/main/java/vazkii/botania/api/lexicon/LexiconCategory.java @@ -12,6 +12,7 @@ package vazkii.botania.api.lexicon; import net.minecraft.util.ResourceLocation; +import javax.annotation.Nonnull; import java.util.ArrayList; import java.util.List; @@ -70,7 +71,7 @@ public class LexiconCategory implements Comparable { } @Override - public int compareTo(LexiconCategory category) { + public int compareTo(@Nonnull LexiconCategory category) { return priority == category.priority ? sortingId - category.sortingId : category.priority - priority; } } diff --git a/src/main/java/vazkii/botania/api/lexicon/LexiconEntry.java b/src/main/java/vazkii/botania/api/lexicon/LexiconEntry.java index 6e2afd1fd..4d973c9ef 100644 --- a/src/main/java/vazkii/botania/api/lexicon/LexiconEntry.java +++ b/src/main/java/vazkii/botania/api/lexicon/LexiconEntry.java @@ -16,6 +16,7 @@ import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; import vazkii.botania.api.BotaniaAPI; +import javax.annotation.Nonnull; import java.util.ArrayList; import java.util.Arrays; import java.util.List; @@ -159,7 +160,7 @@ public class LexiconEntry implements Comparable { } @Override - public int compareTo(LexiconEntry o) { + public int compareTo(@Nonnull LexiconEntry o) { return getNameForSorting().compareTo(o.getNameForSorting()); } diff --git a/src/main/java/vazkii/botania/client/core/handler/BaubleRenderHandler.java b/src/main/java/vazkii/botania/client/core/handler/BaubleRenderHandler.java index 712c12b92..5519ca808 100644 --- a/src/main/java/vazkii/botania/client/core/handler/BaubleRenderHandler.java +++ b/src/main/java/vazkii/botania/client/core/handler/BaubleRenderHandler.java @@ -33,10 +33,12 @@ import vazkii.botania.common.core.handler.ConfigHandler; import vazkii.botania.common.item.ModItems; import vazkii.botania.common.item.equipment.armor.terrasteel.ItemTerrasteelHelm; +import javax.annotation.Nonnull; + public final class BaubleRenderHandler implements LayerRenderer { @Override - public void doRenderLayer(EntityPlayer player, float p_177141_2_, float p_177141_3_, float partialTicks, float p_177141_5_, float p_177141_6_, float p_177141_7_, float scale) { + public void doRenderLayer(@Nonnull EntityPlayer player, float p_177141_2_, float p_177141_3_, float partialTicks, float p_177141_5_, float p_177141_6_, float p_177141_7_, float scale) { if(!ConfigHandler.renderBaubles || player.getActivePotionEffect(MobEffects.INVISIBILITY) != null) return; diff --git a/src/main/java/vazkii/botania/client/core/handler/ColorHandler.java b/src/main/java/vazkii/botania/client/core/handler/ColorHandler.java index d720dc2a0..4483d28d7 100644 --- a/src/main/java/vazkii/botania/client/core/handler/ColorHandler.java +++ b/src/main/java/vazkii/botania/client/core/handler/ColorHandler.java @@ -24,6 +24,7 @@ import vazkii.botania.common.block.tile.TileCamo; import vazkii.botania.common.item.IColorable; import vazkii.botania.common.item.ModItems; +import javax.annotation.Nonnull; import java.awt.*; import java.util.Map; @@ -40,7 +41,7 @@ public final class ColorHandler { blocks.registerBlockColorHandler( new IBlockColor() { @Override - public int colorMultiplier(IBlockState state, IBlockAccess p_186720_2_, BlockPos pos, int tintIndex) { + public int colorMultiplier(@Nonnull IBlockState state, IBlockAccess p_186720_2_, BlockPos pos, int tintIndex) { return state.getValue(BotaniaStateProps.COLOR).getMapColor().colorValue; } }, @@ -50,7 +51,7 @@ public final class ColorHandler { blocks.registerBlockColorHandler( new IBlockColor() { @Override - public int colorMultiplier(IBlockState state, IBlockAccess p_186720_2_, BlockPos pos, int tintIndex) { + public int colorMultiplier(@Nonnull IBlockState state, IBlockAccess p_186720_2_, BlockPos pos, int tintIndex) { if (state.getValue(BotaniaStateProps.POOL_VARIANT) == PoolVariant.FABULOUS) { float time = ClientTickHandler.ticksInGame + ClientTickHandler.partialTicks; return Color.getHSBColor(time * 0.005F, 0.6F, 1F).hashCode(); @@ -66,7 +67,7 @@ public final class ColorHandler { blocks.registerBlockColorHandler( new IBlockColor() { @Override - public int colorMultiplier(IBlockState state, IBlockAccess p_186720_2_, BlockPos pos, int tintIndex) { + public int colorMultiplier(@Nonnull IBlockState state, IBlockAccess p_186720_2_, BlockPos pos, int tintIndex) { if(state.getValue(BotaniaStateProps.SPREADER_VARIANT) != SpreaderVariant.GAIA) return 0xFFFFFF; float time = ClientTickHandler.ticksInGame + ClientTickHandler.partialTicks; @@ -80,7 +81,7 @@ public final class ColorHandler { blocks.registerBlockColorHandler( new IBlockColor() { @Override - public int colorMultiplier(IBlockState state, IBlockAccess world, BlockPos pos, int tintIndex) { + public int colorMultiplier(@Nonnull IBlockState state, IBlockAccess world, BlockPos pos, int tintIndex) { TileEntity tile = world.getTileEntity(pos); if(tile instanceof TileCamo) { TileCamo camo = (TileCamo) tile; @@ -96,7 +97,7 @@ public final class ColorHandler { items.registerItemColorHandler(new IItemColor() { @Override - public int getColorFromItemstack(ItemStack stack, int tintIndex) { + public int getColorFromItemstack(@Nonnull ItemStack stack, int tintIndex) { Item item = stack.getItem(); if (item instanceof IColorable) { return ((IColorable) item).getColorFromItemStack(stack, tintIndex); diff --git a/src/main/java/vazkii/botania/client/core/handler/ContributorFancinessHandler.java b/src/main/java/vazkii/botania/client/core/handler/ContributorFancinessHandler.java index 7cb25f4bf..8d975c5d0 100644 --- a/src/main/java/vazkii/botania/client/core/handler/ContributorFancinessHandler.java +++ b/src/main/java/vazkii/botania/client/core/handler/ContributorFancinessHandler.java @@ -30,6 +30,7 @@ import vazkii.botania.common.block.ModBlocks; import vazkii.botania.common.core.version.VersionChecker; import vazkii.botania.common.item.block.ItemBlockSpecialFlower; +import javax.annotation.Nonnull; import java.io.IOException; import java.io.InputStreamReader; import java.net.URL; @@ -45,7 +46,7 @@ public final class ContributorFancinessHandler implements LayerRenderer= xPosition && par3 >= yPosition && par2 < xPosition + width && par3 < yPosition + height; int k = getHoverState(hovered); diff --git a/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonBack.java b/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonBack.java index a96dc9ece..044a45df9 100644 --- a/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonBack.java +++ b/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonBack.java @@ -16,6 +16,7 @@ import net.minecraft.util.text.translation.I18n; import vazkii.botania.client.core.helper.RenderHelper; import vazkii.botania.client.gui.lexicon.GuiLexicon; +import javax.annotation.Nonnull; import java.util.Collections; import java.util.List; @@ -26,7 +27,7 @@ public class GuiButtonBack extends GuiButtonLexicon { } @Override - public void drawButton(Minecraft par1Minecraft, int par2, int par3) { + public void drawButton(@Nonnull Minecraft par1Minecraft, int par2, int par3) { if(enabled) { hovered = par2 >= xPosition && par3 >= yPosition && par2 < xPosition + width && par3 < yPosition + height; int k = getHoverState(hovered); diff --git a/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonBookmark.java b/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonBookmark.java index a79da6ca7..6ebad086d 100644 --- a/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonBookmark.java +++ b/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonBookmark.java @@ -6,6 +6,7 @@ import net.minecraft.util.text.translation.I18n; import vazkii.botania.client.core.helper.RenderHelper; import vazkii.botania.client.gui.lexicon.GuiLexicon; +import javax.annotation.Nonnull; import java.util.ArrayList; import java.util.List; @@ -19,7 +20,7 @@ public class GuiButtonBookmark extends GuiButtonLexicon { } @Override - public void drawButton(Minecraft mc, int par2, int par3) { + public void drawButton(@Nonnull Minecraft mc, int par2, int par3) { gui.drawBookmark(xPosition, yPosition, displayString, false); hovered = par2 >= xPosition && par3 >= yPosition && par2 < xPosition + width && par3 < yPosition + height; int k = getHoverState(hovered); diff --git a/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonCategory.java b/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonCategory.java index 139217d65..818e1999a 100644 --- a/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonCategory.java +++ b/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonCategory.java @@ -27,6 +27,8 @@ import vazkii.botania.client.gui.lexicon.GuiLexicon; import vazkii.botania.client.lib.LibResources; import vazkii.botania.common.core.handler.ConfigHandler; +import javax.annotation.Nonnull; + public class GuiButtonCategory extends GuiButtonLexicon { private static final ResourceLocation fallbackResource = new ResourceLocation(LibResources.CATEGORY_INDEX); @@ -71,7 +73,7 @@ public class GuiButtonCategory extends GuiButtonLexicon { } @Override - public void drawButton(Minecraft mc, int mx, int my) { + public void drawButton(@Nonnull Minecraft mc, int mx, int my) { boolean inside = mx >= xPosition && my >= yPosition && mx < xPosition + width && my < yPosition + height; if(inside) ticksHovered = Math.min(time, ticksHovered + gui.timeDelta); diff --git a/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonChallengeIcon.java b/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonChallengeIcon.java index f7a7d6b71..62bcfdac5 100644 --- a/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonChallengeIcon.java +++ b/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonChallengeIcon.java @@ -17,6 +17,7 @@ import net.minecraft.util.text.TextFormatting; import net.minecraft.util.text.translation.I18n; import vazkii.botania.client.challenge.Challenge; +import javax.annotation.Nonnull; import java.util.ArrayList; import java.util.List; @@ -30,7 +31,7 @@ public class GuiButtonChallengeIcon extends GuiButtonLexicon { } @Override - public void drawButton(Minecraft par1Minecraft, int par2, int par3) { + public void drawButton(@Nonnull Minecraft par1Minecraft, int par2, int par3) { hovered = par2 >= xPosition && par3 >= yPosition && par2 < xPosition + width && par3 < yPosition + height; int k = getHoverState(hovered); diff --git a/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonChallengeInfo.java b/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonChallengeInfo.java index f78072a7e..28a8ad0df 100644 --- a/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonChallengeInfo.java +++ b/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonChallengeInfo.java @@ -15,6 +15,7 @@ import net.minecraft.util.text.translation.I18n; import vazkii.botania.client.core.helper.RenderHelper; import vazkii.botania.client.gui.lexicon.GuiLexicon; +import javax.annotation.Nonnull; import java.util.ArrayList; import java.util.List; @@ -28,7 +29,7 @@ public class GuiButtonChallengeInfo extends GuiButtonLexicon { } @Override - public void drawButton(Minecraft mc, int par2, int par3) { + public void drawButton(@Nonnull Minecraft mc, int par2, int par3) { gui.drawBookmark(xPosition, yPosition, displayString, false); hovered = par2 >= xPosition && par3 >= yPosition && par2 < xPosition + width && par3 < yPosition + height; int k = getHoverState(hovered); diff --git a/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonChallenges.java b/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonChallenges.java index 2476d2c79..475b77268 100644 --- a/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonChallenges.java +++ b/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonChallenges.java @@ -17,6 +17,7 @@ import net.minecraft.util.text.translation.I18n; import vazkii.botania.client.core.helper.RenderHelper; import vazkii.botania.client.gui.lexicon.GuiLexicon; +import javax.annotation.Nonnull; import java.util.ArrayList; import java.util.List; @@ -27,7 +28,7 @@ public class GuiButtonChallenges extends GuiButtonLexicon { } @Override - public void drawButton(Minecraft par1Minecraft, int par2, int par3) { + public void drawButton(@Nonnull Minecraft par1Minecraft, int par2, int par3) { hovered = par2 >= xPosition && par3 >= yPosition && par2 < xPosition + width && par3 < yPosition + height; int k = getHoverState(hovered); diff --git a/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonDoot.java b/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonDoot.java index 338b1d122..8880af260 100644 --- a/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonDoot.java +++ b/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonDoot.java @@ -19,6 +19,7 @@ import net.minecraft.util.text.TextFormatting; import vazkii.botania.client.core.helper.RenderHelper; import vazkii.botania.common.item.ModItems; +import javax.annotation.Nonnull; import java.util.ArrayList; import java.util.List; @@ -31,7 +32,7 @@ public class GuiButtonDoot extends GuiButtonLexicon { } @Override - public void drawButton(Minecraft par1Minecraft, int par2, int par3) { + public void drawButton(@Nonnull Minecraft par1Minecraft, int par2, int par3) { hovered = par2 >= xPosition && par3 >= yPosition && par2 < xPosition + width && par3 < yPosition + height; int k = getHoverState(hovered); diff --git a/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonHistory.java b/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonHistory.java index bde63829b..dd37d744f 100644 --- a/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonHistory.java +++ b/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonHistory.java @@ -16,6 +16,7 @@ import net.minecraft.util.text.translation.I18n; import vazkii.botania.client.core.helper.RenderHelper; import vazkii.botania.client.gui.lexicon.GuiLexicon; +import javax.annotation.Nonnull; import java.util.ArrayList; import java.util.List; @@ -29,7 +30,7 @@ public class GuiButtonHistory extends GuiButtonLexicon { } @Override - public void drawButton(Minecraft mc, int par2, int par3) { + public void drawButton(@Nonnull Minecraft mc, int par2, int par3) { gui.drawBookmark(xPosition, yPosition, displayString, false); hovered = par2 >= xPosition && par3 >= yPosition && par2 < xPosition + width && par3 < yPosition + height; int k = getHoverState(hovered); diff --git a/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonInvisible.java b/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonInvisible.java index 65a5b4dec..69be381b5 100644 --- a/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonInvisible.java +++ b/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonInvisible.java @@ -24,6 +24,8 @@ import vazkii.botania.client.gui.lexicon.GuiLexiconIndex; import vazkii.botania.client.lib.LibResources; import vazkii.botania.common.lib.LibMisc; +import javax.annotation.Nonnull; + public class GuiButtonInvisible extends GuiButtonLexicon { private static final ResourceLocation dogResource = new ResourceLocation(LibResources.GUI_DOG); @@ -48,7 +50,7 @@ public class GuiButtonInvisible extends GuiButtonLexicon { } @Override - public void drawButton(Minecraft par1Minecraft, int par2, int par3) { + public void drawButton(@Nonnull Minecraft par1Minecraft, int par2, int par3) { if(enableDog) { dogPos += ClientTickHandler.delta * 10; diff --git a/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonNotes.java b/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonNotes.java index 036e173da..ea4625b21 100644 --- a/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonNotes.java +++ b/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonNotes.java @@ -17,6 +17,7 @@ import net.minecraft.util.text.translation.I18n; import vazkii.botania.client.core.helper.RenderHelper; import vazkii.botania.client.gui.lexicon.GuiLexicon; +import javax.annotation.Nonnull; import java.util.ArrayList; import java.util.List; @@ -30,7 +31,7 @@ public class GuiButtonNotes extends GuiButtonLexicon { } @Override - public void drawButton(Minecraft par1Minecraft, int par2, int par3) { + public void drawButton(@Nonnull Minecraft par1Minecraft, int par2, int par3) { hovered = par2 >= xPosition && par3 >= yPosition && par2 < xPosition + width && par3 < yPosition + height; int k = getHoverState(hovered); diff --git a/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonOptions.java b/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonOptions.java index 2f5abee27..39c581389 100644 --- a/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonOptions.java +++ b/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonOptions.java @@ -17,6 +17,7 @@ import net.minecraft.util.text.translation.I18n; import vazkii.botania.client.core.helper.RenderHelper; import vazkii.botania.client.gui.lexicon.GuiLexicon; +import javax.annotation.Nonnull; import java.util.ArrayList; import java.util.List; @@ -27,7 +28,7 @@ public class GuiButtonOptions extends GuiButtonLexicon { } @Override - public void drawButton(Minecraft par1Minecraft, int par2, int par3) { + public void drawButton(@Nonnull Minecraft par1Minecraft, int par2, int par3) { hovered = par2 >= xPosition && par3 >= yPosition && par2 < xPosition + width && par3 < yPosition + height; int k = getHoverState(hovered); diff --git a/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonPage.java b/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonPage.java index a18e2cc5a..bf3dcbc3e 100644 --- a/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonPage.java +++ b/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonPage.java @@ -16,6 +16,7 @@ import net.minecraft.util.text.translation.I18n; import vazkii.botania.client.core.helper.RenderHelper; import vazkii.botania.client.gui.lexicon.GuiLexicon; +import javax.annotation.Nonnull; import java.util.Collections; public class GuiButtonPage extends GuiButtonLexicon { @@ -28,7 +29,7 @@ public class GuiButtonPage extends GuiButtonLexicon { } @Override - public void drawButton(Minecraft par1Minecraft, int par2, int par3) { + public void drawButton(@Nonnull Minecraft par1Minecraft, int par2, int par3) { if(enabled) { hovered = par2 >= xPosition && par3 >= yPosition && par2 < xPosition + width && par3 < yPosition + height; int k = getHoverState(hovered); diff --git a/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonShare.java b/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonShare.java index 2d427d6fc..c4ffa9ac6 100644 --- a/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonShare.java +++ b/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonShare.java @@ -17,6 +17,7 @@ import net.minecraft.util.text.translation.I18n; import vazkii.botania.client.core.helper.RenderHelper; import vazkii.botania.client.gui.lexicon.GuiLexicon; +import javax.annotation.Nonnull; import java.util.Collections; import java.util.List; @@ -27,7 +28,7 @@ public class GuiButtonShare extends GuiButtonLexicon { } @Override - public void drawButton(Minecraft par1Minecraft, int par2, int par3) { + public void drawButton(@Nonnull Minecraft par1Minecraft, int par2, int par3) { hovered = par2 >= xPosition && par3 >= yPosition && par2 < xPosition + width && par3 < yPosition + height; int k = getHoverState(hovered); diff --git a/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonUpdateWarning.java b/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonUpdateWarning.java index a76ce006c..d04097e30 100644 --- a/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonUpdateWarning.java +++ b/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonUpdateWarning.java @@ -19,6 +19,7 @@ import vazkii.botania.client.core.handler.PersistentVariableHelper; import vazkii.botania.client.core.helper.RenderHelper; import vazkii.botania.client.gui.lexicon.GuiLexicon; +import javax.annotation.Nonnull; import java.util.ArrayList; import java.util.List; @@ -29,7 +30,7 @@ public class GuiButtonUpdateWarning extends GuiButtonLexicon { } @Override - public void drawButton(Minecraft par1Minecraft, int par2, int par3) { + public void drawButton(@Nonnull Minecraft par1Minecraft, int par2, int par3) { if(!visible || !enabled) return; diff --git a/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonViewOnline.java b/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonViewOnline.java index 95578bbfb..a26e71bac 100644 --- a/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonViewOnline.java +++ b/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonViewOnline.java @@ -17,6 +17,7 @@ import net.minecraft.util.text.translation.I18n; import vazkii.botania.client.core.helper.RenderHelper; import vazkii.botania.client.gui.lexicon.GuiLexicon; +import javax.annotation.Nonnull; import java.util.Collections; import java.util.List; @@ -27,7 +28,7 @@ public class GuiButtonViewOnline extends GuiButtonLexicon { } @Override - public void drawButton(Minecraft par1Minecraft, int par2, int par3) { + public void drawButton(@Nonnull Minecraft par1Minecraft, int par2, int par3) { hovered = par2 >= xPosition && par3 >= yPosition && par2 < xPosition + width && par3 < yPosition + height; int k = getHoverState(hovered); diff --git a/src/main/java/vazkii/botania/client/model/FloatingFlowerModel.java b/src/main/java/vazkii/botania/client/model/FloatingFlowerModel.java index 8631e8bde..bdda13468 100644 --- a/src/main/java/vazkii/botania/client/model/FloatingFlowerModel.java +++ b/src/main/java/vazkii/botania/client/model/FloatingFlowerModel.java @@ -43,6 +43,7 @@ import vazkii.botania.common.block.ModBlocks; import vazkii.botania.common.item.block.ItemBlockFloatingSpecialFlower; import vazkii.botania.common.item.block.ItemBlockSpecialFlower; +import javax.annotation.Nonnull; import javax.vecmath.Vector3f; import javax.vecmath.Vector4f; import java.util.List; @@ -80,10 +81,11 @@ public class FloatingFlowerModel implements IBakedModel, IResourceManagerReloadL } @Override - public void onResourceManagerReload(IResourceManager resourceManager) { + public void onResourceManagerReload(@Nonnull IResourceManager resourceManager) { CACHE.clear(); } + @Nonnull @Override public List getQuads(IBlockState state, EnumFacing face, long rand) { if(state.getBlock() != ModBlocks.floatingSpecialFlower && state.getBlock() != ModBlocks.floatingFlower) @@ -136,6 +138,7 @@ public class FloatingFlowerModel implements IBakedModel, IResourceManagerReloadL } } + @Nonnull @Override public ItemOverrideList getOverrides() { return itemHandler; @@ -144,7 +147,9 @@ public class FloatingFlowerModel implements IBakedModel, IResourceManagerReloadL @Override public boolean isAmbientOcclusion() { return false; } @Override public boolean isGui3d() { return true; } @Override public boolean isBuiltInRenderer() { return false; } + @Nonnull @Override public TextureAtlasSprite getParticleTexture() { return null; } + @Nonnull @Override public ItemCameraTransforms getItemCameraTransforms() { return ItemCameraTransforms.DEFAULT; } private static class CompositeBakedModel implements IBakedModel { @@ -178,6 +183,7 @@ public class FloatingFlowerModel implements IBakedModel, IResourceManagerReloadL } // Forward all to flower model + @Nonnull @Override public List getQuads(IBlockState state, EnumFacing face, long rand) { return genQuads; @@ -198,22 +204,26 @@ public class FloatingFlowerModel implements IBakedModel, IResourceManagerReloadL return base.isBuiltInRenderer(); } + @Nonnull @Override public TextureAtlasSprite getParticleTexture() { return base.getParticleTexture(); } + @Nonnull @Override public ItemCameraTransforms getItemCameraTransforms() { return base.getItemCameraTransforms(); } + @Nonnull @Override public ItemOverrideList getOverrides() { return ItemOverrideList.NONE; } } private final ItemOverrideList itemHandler = new ItemOverrideList(ImmutableList.of()) { + @Nonnull @Override - public IBakedModel handleItemState(IBakedModel model, ItemStack stack, World world, EntityLivingBase entity) { + public IBakedModel handleItemState(@Nonnull IBakedModel model, ItemStack stack, @Nonnull World world, @Nonnull EntityLivingBase entity) { // Items always have GRASS island IFloatingFlower.IslandType islandType = IFloatingFlower.IslandType.GRASS; String identifier; diff --git a/src/main/java/vazkii/botania/client/model/LexiconModel.java b/src/main/java/vazkii/botania/client/model/LexiconModel.java index 61d90496c..9ff580f1b 100644 --- a/src/main/java/vazkii/botania/client/model/LexiconModel.java +++ b/src/main/java/vazkii/botania/client/model/LexiconModel.java @@ -13,6 +13,7 @@ import net.minecraft.util.EnumFacing; import net.minecraftforge.client.model.IPerspectiveAwareModel; import org.apache.commons.lang3.tuple.Pair; +import javax.annotation.Nonnull; import javax.vecmath.Matrix4f; import java.util.List; @@ -29,11 +30,15 @@ public class LexiconModel implements IPerspectiveAwareModel { return ((IPerspectiveAwareModel) original).handlePerspective(cameraTransformType); } + @Nonnull @Override public List getQuads(IBlockState state, EnumFacing side, long rand) { return ImmutableList.of(); } @Override public boolean isAmbientOcclusion() { return false; } @Override public boolean isGui3d() { return false; } @Override public boolean isBuiltInRenderer() { return false; } + @Nonnull @Override public TextureAtlasSprite getParticleTexture() { return Minecraft.getMinecraft().getTextureMapBlocks().getAtlasSprite("botania:items/lexicon"); } + @Nonnull @Override public ItemCameraTransforms getItemCameraTransforms() { return ItemCameraTransforms.DEFAULT; } + @Nonnull @Override public ItemOverrideList getOverrides() { return ItemOverrideList.NONE; } } diff --git a/src/main/java/vazkii/botania/client/model/PlatformModel.java b/src/main/java/vazkii/botania/client/model/PlatformModel.java index 63e4e259a..d68f3062d 100644 --- a/src/main/java/vazkii/botania/client/model/PlatformModel.java +++ b/src/main/java/vazkii/botania/client/model/PlatformModel.java @@ -32,10 +32,12 @@ import vazkii.botania.common.block.BlockCamo; import vazkii.botania.common.block.ModBlocks; import vazkii.botania.common.block.tile.TileCamo; +import javax.annotation.Nonnull; import java.util.List; public class PlatformModel implements IBakedModel { + @Nonnull @Override public List getQuads(IBlockState state, EnumFacing side, long rand) { if(state.getBlock() != ModBlocks.platform) @@ -91,16 +93,19 @@ public class PlatformModel implements IBakedModel { return false; } + @Nonnull @Override public TextureAtlasSprite getParticleTexture() { return Minecraft.getMinecraft().getTextureMapBlocks().getAtlasSprite("botania:blocks/livingwood0"); } + @Nonnull @Override public ItemCameraTransforms getItemCameraTransforms() { return ItemCameraTransforms.DEFAULT; } + @Nonnull @Override public ItemOverrideList getOverrides() { return ItemOverrideList.NONE; @@ -115,7 +120,7 @@ public class PlatformModel implements IBakedModel { } @Override - public TileEntity getTileEntity(BlockPos pos) { + public TileEntity getTileEntity(@Nonnull BlockPos pos) { /* todo is this actually needed? if so this can't be an iblockaccess anymore IBlockState state = getBlockState(pos); if(state == null || !state.getBlock().hasTileEntity(state)) @@ -133,12 +138,13 @@ public class PlatformModel implements IBakedModel { } @Override - public int getCombinedLight(BlockPos pos, int lightValue) { + public int getCombinedLight(@Nonnull BlockPos pos, int lightValue) { return 15 << 20 | 15 << 4; } + @Nonnull @Override - public IBlockState getBlockState(BlockPos pos) { + public IBlockState getBlockState(@Nonnull BlockPos pos) { IBlockState state = compose.getBlockState(pos); if(state.getBlock() instanceof BlockCamo) { state = ((TileCamo) compose.getTileEntity(pos)).camoState; @@ -147,12 +153,13 @@ public class PlatformModel implements IBakedModel { } @Override - public boolean isAirBlock(BlockPos pos) { + public boolean isAirBlock(@Nonnull BlockPos pos) { return compose.isAirBlock(pos); } + @Nonnull @Override - public Biome getBiomeGenForCoords(BlockPos pos) { + public Biome getBiomeGenForCoords(@Nonnull BlockPos pos) { return compose.getBiomeGenForCoords(pos); } @@ -162,17 +169,18 @@ public class PlatformModel implements IBakedModel { } @Override - public int getStrongPower(BlockPos pos, EnumFacing direction) { + public int getStrongPower(@Nonnull BlockPos pos, @Nonnull EnumFacing direction) { return compose.getStrongPower(pos, direction); } + @Nonnull @Override public WorldType getWorldType() { return compose.getWorldType(); } @Override - public boolean isSideSolid(BlockPos pos, EnumFacing side, boolean _default) { + public boolean isSideSolid(@Nonnull BlockPos pos, @Nonnull EnumFacing side, boolean _default) { return compose.isSideSolid(pos, side, _default); } } diff --git a/src/main/java/vazkii/botania/client/model/SpecialFlowerModel.java b/src/main/java/vazkii/botania/client/model/SpecialFlowerModel.java index 029c9a444..37bc7b774 100644 --- a/src/main/java/vazkii/botania/client/model/SpecialFlowerModel.java +++ b/src/main/java/vazkii/botania/client/model/SpecialFlowerModel.java @@ -48,6 +48,7 @@ import vazkii.botania.api.state.BotaniaStateProps; import vazkii.botania.common.block.ModBlocks; import vazkii.botania.common.item.block.ItemBlockSpecialFlower; +import javax.annotation.Nonnull; import javax.vecmath.Matrix4f; import java.io.IOException; import java.util.Collection; @@ -133,7 +134,7 @@ public class SpecialFlowerModel implements IModelCustomData { public enum Loader implements ICustomModelLoader { INSTANCE { @Override - public void onResourceManagerReload(IResourceManager resourceManager) { + public void onResourceManagerReload(@Nonnull IResourceManager resourceManager) { } @Override @@ -212,6 +213,7 @@ public class SpecialFlowerModel implements IModelCustomData { return model.bake(new SimpleModelState(transforms), DefaultVertexFormats.ITEM, ModelLoader.defaultTextureGetter()); } + @Nonnull @Override public List getQuads(IBlockState state, EnumFacing face, long rand) { if(state.getBlock() != ModBlocks.specialFlower) @@ -224,14 +226,16 @@ public class SpecialFlowerModel implements IModelCustomData { return ret.getQuads(state, face, rand); } + @Nonnull @Override public ItemOverrideList getOverrides() { return itemHandler; } private final ItemOverrideList itemHandler = new ItemOverrideList(ImmutableList.of()) { + @Nonnull @Override - public IBakedModel handleItemState(IBakedModel original, ItemStack stack, World world, EntityLivingBase living) { + public IBakedModel handleItemState(@Nonnull IBakedModel original, ItemStack stack, @Nonnull World world, @Nonnull EntityLivingBase living) { refreshBakedModels(); IBakedModel item = bakedItemModels.get(ItemBlockSpecialFlower.getType(stack)); if(item == null) { @@ -260,12 +264,14 @@ public class SpecialFlowerModel implements IModelCustomData { return baseModel.isBuiltInRenderer(); } + @Nonnull @Override public TextureAtlasSprite getParticleTexture() { refreshBakedModels(); return baseModel.getParticleTexture(); } + @Nonnull @Override public ItemCameraTransforms getItemCameraTransforms() { return baseModel.getItemCameraTransforms(); diff --git a/src/main/java/vazkii/botania/client/model/armor/ModelArmorElementium.java b/src/main/java/vazkii/botania/client/model/armor/ModelArmorElementium.java index 8645a3608..81b1be771 100644 --- a/src/main/java/vazkii/botania/client/model/armor/ModelArmorElementium.java +++ b/src/main/java/vazkii/botania/client/model/armor/ModelArmorElementium.java @@ -18,6 +18,8 @@ import net.minecraft.inventory.EntityEquipmentSlot; import net.minecraft.item.EnumAction; import net.minecraft.util.EnumHandSide; +import javax.annotation.Nonnull; + public class ModelArmorElementium extends ModelBiped { public ModelRenderer helm; @@ -210,7 +212,7 @@ public class ModelArmorElementium extends ModelBiped { } @Override - public void render(Entity entity, float f, float f1, float f2, float f3, float f4, float f5) { + public void render(@Nonnull Entity entity, float f, float f1, float f2, float f3, float f4, float f5) { helm.showModel = slot == EntityEquipmentSlot.HEAD; body.showModel = slot == EntityEquipmentSlot.CHEST; armR.showModel = slot == EntityEquipmentSlot.CHEST; diff --git a/src/main/java/vazkii/botania/client/model/armor/ModelArmorManasteel.java b/src/main/java/vazkii/botania/client/model/armor/ModelArmorManasteel.java index c01443cb1..ca237daf4 100644 --- a/src/main/java/vazkii/botania/client/model/armor/ModelArmorManasteel.java +++ b/src/main/java/vazkii/botania/client/model/armor/ModelArmorManasteel.java @@ -18,6 +18,8 @@ import net.minecraft.inventory.EntityEquipmentSlot; import net.minecraft.item.EnumAction; import net.minecraft.util.EnumHandSide; +import javax.annotation.Nonnull; + public class ModelArmorManasteel extends ModelBiped { @@ -140,7 +142,7 @@ public class ModelArmorManasteel extends ModelBiped { } @Override - public void render(Entity entity, float f, float f1, float f2, float f3, float f4, float f5) { + public void render(@Nonnull Entity entity, float f, float f1, float f2, float f3, float f4, float f5) { helm.showModel = slot == EntityEquipmentSlot.HEAD; body.showModel = slot == EntityEquipmentSlot.CHEST; armR.showModel = slot == EntityEquipmentSlot.CHEST; diff --git a/src/main/java/vazkii/botania/client/model/armor/ModelArmorManaweave.java b/src/main/java/vazkii/botania/client/model/armor/ModelArmorManaweave.java index dbf0424f0..9030d1851 100644 --- a/src/main/java/vazkii/botania/client/model/armor/ModelArmorManaweave.java +++ b/src/main/java/vazkii/botania/client/model/armor/ModelArmorManaweave.java @@ -18,6 +18,8 @@ import net.minecraft.inventory.EntityEquipmentSlot; import net.minecraft.item.EnumAction; import net.minecraft.util.EnumHandSide; +import javax.annotation.Nonnull; + public class ModelArmorManaweave extends ModelBiped { public ModelRenderer helm; @@ -140,7 +142,7 @@ public class ModelArmorManaweave extends ModelBiped { } @Override - public void render(Entity entity, float f, float f1, float f2, float f3, float f4, float f5) { + public void render(@Nonnull Entity entity, float f, float f1, float f2, float f3, float f4, float f5) { helm.showModel = slot == EntityEquipmentSlot.HEAD; body.showModel = slot == EntityEquipmentSlot.CHEST; armR.showModel = slot == EntityEquipmentSlot.CHEST; diff --git a/src/main/java/vazkii/botania/client/model/armor/ModelArmorTerrasteel.java b/src/main/java/vazkii/botania/client/model/armor/ModelArmorTerrasteel.java index fc937b160..44f3a76fb 100644 --- a/src/main/java/vazkii/botania/client/model/armor/ModelArmorTerrasteel.java +++ b/src/main/java/vazkii/botania/client/model/armor/ModelArmorTerrasteel.java @@ -18,6 +18,8 @@ import net.minecraft.inventory.EntityEquipmentSlot; import net.minecraft.item.EnumAction; import net.minecraft.util.EnumHandSide; +import javax.annotation.Nonnull; + public class ModelArmorTerrasteel extends ModelBiped { public ModelRenderer helm; @@ -231,7 +233,7 @@ public class ModelArmorTerrasteel extends ModelBiped { } @Override - public void render(Entity entity, float f, float f1, float f2, float f3, float f4, float f5) { + public void render(@Nonnull Entity entity, float f, float f1, float f2, float f3, float f4, float f5) { helm.showModel = slot == EntityEquipmentSlot.HEAD; body.showModel = slot == EntityEquipmentSlot.CHEST; armr.showModel = slot == EntityEquipmentSlot.CHEST; diff --git a/src/main/java/vazkii/botania/client/render/entity/RenderBabylonWeapon.java b/src/main/java/vazkii/botania/client/render/entity/RenderBabylonWeapon.java index cb3f1eae5..0e6ec4b4e 100644 --- a/src/main/java/vazkii/botania/client/render/entity/RenderBabylonWeapon.java +++ b/src/main/java/vazkii/botania/client/render/entity/RenderBabylonWeapon.java @@ -27,6 +27,7 @@ import vazkii.botania.client.core.helper.ShaderHelper; import vazkii.botania.client.lib.LibResources; import vazkii.botania.common.entity.EntityBabylonWeapon; +import javax.annotation.Nonnull; import java.util.Random; public class RenderBabylonWeapon extends Render { @@ -38,7 +39,7 @@ public class RenderBabylonWeapon extends Render { } @Override - public void doRender(EntityBabylonWeapon weapon, double par2, double par4, double par6, float par8, float par9) { + public void doRender(@Nonnull EntityBabylonWeapon weapon, double par2, double par4, double par6, float par8, float par9) { GlStateManager.pushMatrix(); GlStateManager.translate((float)par2, (float)par4, (float)par6); GlStateManager.rotate(weapon.getRotation(), 0F, 1F, 0F); @@ -104,8 +105,9 @@ public class RenderBabylonWeapon extends Render { GlStateManager.popMatrix(); } + @Nonnull @Override - protected ResourceLocation getEntityTexture(EntityBabylonWeapon p_110775_1_) { + protected ResourceLocation getEntityTexture(@Nonnull EntityBabylonWeapon p_110775_1_) { return null; } diff --git a/src/main/java/vazkii/botania/client/render/entity/RenderDoppleganger.java b/src/main/java/vazkii/botania/client/render/entity/RenderDoppleganger.java index 1c2a9c2e1..72b7bc770 100644 --- a/src/main/java/vazkii/botania/client/render/entity/RenderDoppleganger.java +++ b/src/main/java/vazkii/botania/client/render/entity/RenderDoppleganger.java @@ -21,6 +21,8 @@ import vazkii.botania.client.core.handler.BossBarHandler; import vazkii.botania.client.core.helper.ShaderHelper; import vazkii.botania.common.entity.EntityDoppleganger; +import javax.annotation.Nonnull; + public class RenderDoppleganger extends RenderBiped { public static final float DEFAULT_GRAIN_INTENSITY = 0.05F; @@ -54,7 +56,7 @@ public class RenderDoppleganger extends RenderBiped { } @Override - public void doRender(EntityDoppleganger dopple, double par2, double par4, double par6, float par8, float par9) { + public void doRender(@Nonnull EntityDoppleganger dopple, double par2, double par4, double par6, float par8, float par9) { int invulTime = dopple.getInvulTime(); if(invulTime > 0) { grainIntensity = invulTime > 20 ? 1F : invulTime * 0.05F; @@ -69,8 +71,9 @@ public class RenderDoppleganger extends RenderBiped { ShaderHelper.releaseShader(); } + @Nonnull @Override - protected ResourceLocation getEntityTexture(EntityDoppleganger par1Entity) { + protected ResourceLocation getEntityTexture(@Nonnull EntityDoppleganger par1Entity) { return DefaultPlayerSkin.getDefaultSkinLegacy(); } diff --git a/src/main/java/vazkii/botania/client/render/entity/RenderManaStorm.java b/src/main/java/vazkii/botania/client/render/entity/RenderManaStorm.java index d9fcb9934..f0074b805 100644 --- a/src/main/java/vazkii/botania/client/render/entity/RenderManaStorm.java +++ b/src/main/java/vazkii/botania/client/render/entity/RenderManaStorm.java @@ -17,6 +17,8 @@ import net.minecraft.util.ResourceLocation; import vazkii.botania.client.core.helper.RenderHelper; import vazkii.botania.common.entity.EntityManaStorm; +import javax.annotation.Nonnull; + public class RenderManaStorm extends Render { public RenderManaStorm(RenderManager renderManager) { @@ -24,7 +26,7 @@ public class RenderManaStorm extends Render { } @Override - public void doRender(EntityManaStorm storm, double x, double y, double z, float something, float pticks) { + public void doRender(@Nonnull EntityManaStorm storm, double x, double y, double z, float something, float pticks) { GlStateManager.pushMatrix(); GlStateManager.translate(x, y, z); float maxScale = 1.95F; @@ -35,8 +37,9 @@ public class RenderManaStorm extends Render { GlStateManager.popMatrix(); } + @Nonnull @Override - protected ResourceLocation getEntityTexture(EntityManaStorm p_110775_1_) { + protected ResourceLocation getEntityTexture(@Nonnull EntityManaStorm p_110775_1_) { return null; } diff --git a/src/main/java/vazkii/botania/client/render/entity/RenderPinkWither.java b/src/main/java/vazkii/botania/client/render/entity/RenderPinkWither.java index 5dc0f46e0..da82da2a8 100644 --- a/src/main/java/vazkii/botania/client/render/entity/RenderPinkWither.java +++ b/src/main/java/vazkii/botania/client/render/entity/RenderPinkWither.java @@ -19,6 +19,8 @@ import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; import vazkii.botania.client.lib.LibResources; +import javax.annotation.Nonnull; + public class RenderPinkWither extends RenderWither { private static final ResourceLocation resource = new ResourceLocation(LibResources.MODEL_PINK_WITHER); @@ -27,6 +29,7 @@ public class RenderPinkWither extends RenderWither { super(p_i46130_1_); } + @Nonnull @Override protected ResourceLocation getEntityTexture(EntityWither p_110775_1_) { return resource; diff --git a/src/main/java/vazkii/botania/client/render/entity/RenderPixie.java b/src/main/java/vazkii/botania/client/render/entity/RenderPixie.java index 9d47dc3b5..ea6306d07 100644 --- a/src/main/java/vazkii/botania/client/render/entity/RenderPixie.java +++ b/src/main/java/vazkii/botania/client/render/entity/RenderPixie.java @@ -23,6 +23,8 @@ import vazkii.botania.client.lib.LibResources; import vazkii.botania.client.model.ModelPixie; import vazkii.botania.common.entity.EntityPixie; +import javax.annotation.Nonnull; + public class RenderPixie extends RenderLiving { ShaderCallback callback = shader -> { @@ -41,13 +43,14 @@ public class RenderPixie extends RenderLiving { shadowSize = 0.0F; } + @Nonnull @Override - protected ResourceLocation getEntityTexture(EntityPixie entity) { + protected ResourceLocation getEntityTexture(@Nonnull EntityPixie entity) { return new ResourceLocation(LibResources.MODEL_PIXIE); } @Override - public void doRender(EntityPixie pixie, double par2, double par4, double par6, float par8, float par9) { + public void doRender(@Nonnull EntityPixie pixie, double par2, double par4, double par6, float par8, float par9) { if(pixie.getType() == 1) ShaderHelper.useShader(ShaderHelper.doppleganger, callback); super.doRender(pixie, par2, par4, par6, par8, par9); diff --git a/src/main/java/vazkii/botania/client/render/entity/RenderPoolMinecart.java b/src/main/java/vazkii/botania/client/render/entity/RenderPoolMinecart.java index 2873545e7..e5dceff22 100644 --- a/src/main/java/vazkii/botania/client/render/entity/RenderPoolMinecart.java +++ b/src/main/java/vazkii/botania/client/render/entity/RenderPoolMinecart.java @@ -20,6 +20,8 @@ import vazkii.botania.client.render.tile.RenderTilePool; import vazkii.botania.common.block.tile.mana.TilePool; import vazkii.botania.common.entity.EntityPoolMinecart; +import javax.annotation.Nonnull; + public class RenderPoolMinecart extends RenderMinecart { public RenderPoolMinecart(RenderManager p_i46155_1_) { @@ -27,7 +29,7 @@ public class RenderPoolMinecart extends RenderMinecart { } @Override - protected void renderCartContents(EntityPoolMinecart poolCart, float p_147910_2_, IBlockState state) { + protected void renderCartContents(EntityPoolMinecart poolCart, float p_147910_2_, @Nonnull IBlockState state) { RenderTilePool.forceVariant = PoolVariant.DEFAULT; RenderTilePool.forceManaNumber = poolCart.getMana(); TileEntityRendererDispatcher.instance.getSpecialRendererByClass(TilePool.class).renderTileEntityAt(null, poolCart.posX, poolCart.posY, poolCart.posZ, ClientTickHandler.partialTicks, -1); diff --git a/src/main/java/vazkii/botania/client/render/entity/RenderSnowballStack.java b/src/main/java/vazkii/botania/client/render/entity/RenderSnowballStack.java index cf9bfcb04..e27bbe153 100644 --- a/src/main/java/vazkii/botania/client/render/entity/RenderSnowballStack.java +++ b/src/main/java/vazkii/botania/client/render/entity/RenderSnowballStack.java @@ -16,6 +16,8 @@ import net.minecraft.entity.Entity; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; +import javax.annotation.Nonnull; + // Same as RenderSnowball, but ItemStack sensitive public class RenderSnowballStack extends RenderSnowball { @@ -26,6 +28,7 @@ public class RenderSnowballStack extends RenderSnowball { this.stackGetter = stackGetter; } + @Nonnull @Override public ItemStack getStackToRender(T entity) { return stackGetter.apply(entity); diff --git a/src/main/java/vazkii/botania/client/render/entity/RenderSparkBase.java b/src/main/java/vazkii/botania/client/render/entity/RenderSparkBase.java index 952b4f850..39c8053a9 100644 --- a/src/main/java/vazkii/botania/client/render/entity/RenderSparkBase.java +++ b/src/main/java/vazkii/botania/client/render/entity/RenderSparkBase.java @@ -24,6 +24,7 @@ import org.lwjgl.opengl.GL11; import vazkii.botania.client.core.handler.ClientTickHandler; import vazkii.botania.client.core.handler.MiscellaneousIcons; +import javax.annotation.Nonnull; import java.util.Random; public abstract class RenderSparkBase extends Render { @@ -33,7 +34,7 @@ public abstract class RenderSparkBase extends Render { } @Override - public void doRender(T tEntity, double par2, double par4, double par6, float par8, float par9) { + public void doRender(@Nonnull T tEntity, double par2, double par4, double par6, float par8, float par9) { TextureAtlasSprite iicon = getBaseIcon(tEntity); GlStateManager.pushMatrix(); @@ -95,8 +96,9 @@ public abstract class RenderSparkBase extends Render { // NO-OP } + @Nonnull @Override - protected ResourceLocation getEntityTexture(Entity p_110775_1_) { + protected ResourceLocation getEntityTexture(@Nonnull Entity p_110775_1_) { return TextureMap.LOCATION_BLOCKS_TEXTURE; } diff --git a/src/main/java/vazkii/botania/client/render/entity/RenderThornChakram.java b/src/main/java/vazkii/botania/client/render/entity/RenderThornChakram.java index 5f1f97ba9..4efbfd999 100644 --- a/src/main/java/vazkii/botania/client/render/entity/RenderThornChakram.java +++ b/src/main/java/vazkii/botania/client/render/entity/RenderThornChakram.java @@ -21,6 +21,8 @@ import net.minecraft.util.ResourceLocation; import org.lwjgl.opengl.GL11; import vazkii.botania.common.entity.EntityThornChakram; +import javax.annotation.Nonnull; + // Basically a bit of an extension of RenderSnowball public class RenderThornChakram extends Render { @@ -29,7 +31,7 @@ public class RenderThornChakram extends Render { } @Override - public void doRender(EntityThornChakram c, double p_76986_2_, double p_76986_4_, double p_76986_6_, float p_76986_8_, float p_76986_9_) { + public void doRender(@Nonnull EntityThornChakram c, double p_76986_2_, double p_76986_4_, double p_76986_6_, float p_76986_8_, float p_76986_9_) { boolean fire = c.isFire(); TextureAtlasSprite iicon = null;//ModItems.thornChakram.getIconFromDamage(fire ? 1 : 0); @@ -47,8 +49,9 @@ public class RenderThornChakram extends Render { } } + @Nonnull @Override - protected ResourceLocation getEntityTexture(EntityThornChakram p_110775_1_) { + protected ResourceLocation getEntityTexture(@Nonnull EntityThornChakram p_110775_1_) { return TextureMap.LOCATION_BLOCKS_TEXTURE; } diff --git a/src/main/java/vazkii/botania/client/render/tile/RenderTileAlfPortal.java b/src/main/java/vazkii/botania/client/render/tile/RenderTileAlfPortal.java index 0b39da56a..76ce37640 100644 --- a/src/main/java/vazkii/botania/client/render/tile/RenderTileAlfPortal.java +++ b/src/main/java/vazkii/botania/client/render/tile/RenderTileAlfPortal.java @@ -25,10 +25,12 @@ import vazkii.botania.client.core.handler.MiscellaneousIcons; import vazkii.botania.common.block.ModBlocks; import vazkii.botania.common.block.tile.TileAlfPortal; +import javax.annotation.Nonnull; + public class RenderTileAlfPortal extends TileEntitySpecialRenderer { @Override - public void renderTileEntityAt(TileAlfPortal portal, double d0, double d1, double d2, float f, int digProgress) { + public void renderTileEntityAt(@Nonnull TileAlfPortal portal, double d0, double d1, double d2, float f, int digProgress) { if (!portal.getWorld().isBlockLoaded(portal.getPos(), false) || portal.getWorld().getBlockState(portal.getPos()).getBlock() != ModBlocks.alfPortal) return; diff --git a/src/main/java/vazkii/botania/client/render/tile/RenderTileAltar.java b/src/main/java/vazkii/botania/client/render/tile/RenderTileAltar.java index 80920eb78..8f384ceed 100644 --- a/src/main/java/vazkii/botania/client/render/tile/RenderTileAltar.java +++ b/src/main/java/vazkii/botania/client/render/tile/RenderTileAltar.java @@ -27,10 +27,12 @@ import vazkii.botania.client.core.handler.ClientTickHandler; import vazkii.botania.common.block.ModBlocks; import vazkii.botania.common.block.tile.TileAltar; +import javax.annotation.Nonnull; + public class RenderTileAltar extends TileEntitySpecialRenderer { @Override - public void renderTileEntityAt(TileAltar altar, double d0, double d1, double d2, float pticks, int digProgress) { + public void renderTileEntityAt(@Nonnull TileAltar altar, double d0, double d1, double d2, float pticks, int digProgress) { if(!altar.getWorld().isBlockLoaded(altar.getPos(), false) || altar.getWorld().getBlockState(altar.getPos()).getBlock() != ModBlocks.altar) return; diff --git a/src/main/java/vazkii/botania/client/render/tile/RenderTileAvatar.java b/src/main/java/vazkii/botania/client/render/tile/RenderTileAvatar.java index ba6bd18d0..19577f4c3 100644 --- a/src/main/java/vazkii/botania/client/render/tile/RenderTileAvatar.java +++ b/src/main/java/vazkii/botania/client/render/tile/RenderTileAvatar.java @@ -28,6 +28,8 @@ import vazkii.botania.client.model.ModelAvatar; import vazkii.botania.common.block.ModBlocks; import vazkii.botania.common.block.tile.TileAvatar; +import javax.annotation.Nonnull; + public class RenderTileAvatar extends TileEntitySpecialRenderer { private static final float[] ROTATIONS = new float[] { @@ -38,7 +40,7 @@ public class RenderTileAvatar extends TileEntitySpecialRenderer { private static final ModelAvatar model = new ModelAvatar(); @Override - public void renderTileEntityAt(TileAvatar avatar, double d0, double d1, double d2, float pticks, int digProgress) { + public void renderTileEntityAt(@Nonnull TileAvatar avatar, double d0, double d1, double d2, float pticks, int digProgress) { if (avatar != null) if (!avatar.getWorld().isBlockLoaded(avatar.getPos(), false) || avatar.getWorld().getBlockState(avatar.getPos()).getBlock() != ModBlocks.avatar) diff --git a/src/main/java/vazkii/botania/client/render/tile/RenderTileBellows.java b/src/main/java/vazkii/botania/client/render/tile/RenderTileBellows.java index c7aadb1b2..b1284eb67 100644 --- a/src/main/java/vazkii/botania/client/render/tile/RenderTileBellows.java +++ b/src/main/java/vazkii/botania/client/render/tile/RenderTileBellows.java @@ -19,6 +19,8 @@ import vazkii.botania.client.model.ModelBellows; import vazkii.botania.common.block.ModBlocks; import vazkii.botania.common.block.tile.mana.TileBellows; +import javax.annotation.Nonnull; + public class RenderTileBellows extends TileEntitySpecialRenderer { private static final float[] ROTATIONS = new float[] { @@ -29,7 +31,7 @@ public class RenderTileBellows extends TileEntitySpecialRenderer { private static final ModelBellows model = new ModelBellows(); @Override - public void renderTileEntityAt(TileBellows bellows, double d0, double d1, double d2, float f, int digProgress) { + public void renderTileEntityAt(@Nonnull TileBellows bellows, double d0, double d1, double d2, float f, int digProgress) { if (bellows != null) if (!bellows.getWorld().isBlockLoaded(bellows.getPos(), false) || bellows.getWorld().getBlockState(bellows.getPos()).getBlock() != ModBlocks.bellows) diff --git a/src/main/java/vazkii/botania/client/render/tile/RenderTileBrewery.java b/src/main/java/vazkii/botania/client/render/tile/RenderTileBrewery.java index 29d34c824..8b6a492c4 100644 --- a/src/main/java/vazkii/botania/client/render/tile/RenderTileBrewery.java +++ b/src/main/java/vazkii/botania/client/render/tile/RenderTileBrewery.java @@ -22,6 +22,8 @@ import vazkii.botania.client.lib.LibResources; import vazkii.botania.client.model.ModelBrewery; import vazkii.botania.common.block.tile.TileBrewery; +import javax.annotation.Nonnull; + public class RenderTileBrewery extends TileEntitySpecialRenderer { private static final ResourceLocation texture = new ResourceLocation(LibResources.MODEL_BREWERY); @@ -29,7 +31,7 @@ public class RenderTileBrewery extends TileEntitySpecialRenderer { public TileBrewery brewery; @Override - public void renderTileEntityAt(TileBrewery brewery, double d0, double d1, double d2, float f, int digProgress) { + public void renderTileEntityAt(@Nonnull TileBrewery brewery, double d0, double d1, double d2, float f, int digProgress) { this.brewery = brewery; GlStateManager.pushMatrix(); GlStateManager.enableRescaleNormal(); diff --git a/src/main/java/vazkii/botania/client/render/tile/RenderTileCocoon.java b/src/main/java/vazkii/botania/client/render/tile/RenderTileCocoon.java index d00fa07f2..51b884e39 100644 --- a/src/main/java/vazkii/botania/client/render/tile/RenderTileCocoon.java +++ b/src/main/java/vazkii/botania/client/render/tile/RenderTileCocoon.java @@ -19,10 +19,12 @@ import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; import org.lwjgl.opengl.GL11; import vazkii.botania.common.block.tile.TileCocoon; +import javax.annotation.Nonnull; + public class RenderTileCocoon extends TileEntitySpecialRenderer { @Override - public void renderTileEntityAt(TileCocoon cocoon, double d0, double d1, double d2, float f, int digProgress) { + public void renderTileEntityAt(@Nonnull TileCocoon cocoon, double d0, double d1, double d2, float f, int digProgress) { float rot = 0F; float modval = 60F - (float) cocoon.timePassed / (float) TileCocoon.TOTAL_TIME * 30F; if(cocoon.timePassed % modval < 10) { diff --git a/src/main/java/vazkii/botania/client/render/tile/RenderTileCorporeaCrystalCube.java b/src/main/java/vazkii/botania/client/render/tile/RenderTileCorporeaCrystalCube.java index b49b5dc9b..8057859fd 100644 --- a/src/main/java/vazkii/botania/client/render/tile/RenderTileCorporeaCrystalCube.java +++ b/src/main/java/vazkii/botania/client/render/tile/RenderTileCorporeaCrystalCube.java @@ -43,13 +43,15 @@ import vazkii.botania.client.model.ModelCrystalCube; import vazkii.botania.common.block.tile.corporea.TileCorporeaCrystalCube; import vazkii.botania.common.core.handler.MethodHandles; +import javax.annotation.Nonnull; + public class RenderTileCorporeaCrystalCube extends TileEntitySpecialRenderer { private EntityItem entity = null; private RenderEntityItem itemRenderer = null; @Override - public void renderTileEntityAt(TileCorporeaCrystalCube cube, double d0, double d1, double d2, float f, int digProgress) { + public void renderTileEntityAt(@Nonnull TileCorporeaCrystalCube cube, double d0, double d1, double d2, float f, int digProgress) { ItemStack stack = null; if (cube != null) { if(entity == null) diff --git a/src/main/java/vazkii/botania/client/render/tile/RenderTileCorporeaIndex.java b/src/main/java/vazkii/botania/client/render/tile/RenderTileCorporeaIndex.java index 245c8c536..9de4681a6 100644 --- a/src/main/java/vazkii/botania/client/render/tile/RenderTileCorporeaIndex.java +++ b/src/main/java/vazkii/botania/client/render/tile/RenderTileCorporeaIndex.java @@ -19,6 +19,8 @@ import vazkii.botania.client.core.helper.RenderHelper; import vazkii.botania.client.lib.LibResources; import vazkii.botania.common.block.tile.corporea.TileCorporeaIndex; +import javax.annotation.Nonnull; + public class RenderTileCorporeaIndex extends TileEntitySpecialRenderer { private static final ResourceLocation texture = new ResourceLocation(LibResources.MODEL_CORPOREA_INDEX); @@ -26,7 +28,7 @@ public class RenderTileCorporeaIndex extends TileEntitySpecialRenderer { EntityItem item; @Override - public void renderTileEntityAt(TileEnchanter enchanter, double d0, double d1, double d2, float f, int digProgress) { + public void renderTileEntityAt(@Nonnull TileEnchanter enchanter, double d0, double d1, double d2, float f, int digProgress) { float alphaMod = 0F; if(enchanter.stage == 2) diff --git a/src/main/java/vazkii/botania/client/render/tile/RenderTileFloatingFlower.java b/src/main/java/vazkii/botania/client/render/tile/RenderTileFloatingFlower.java index 0b0295ef6..a00e75634 100644 --- a/src/main/java/vazkii/botania/client/render/tile/RenderTileFloatingFlower.java +++ b/src/main/java/vazkii/botania/client/render/tile/RenderTileFloatingFlower.java @@ -22,12 +22,13 @@ import net.minecraft.tileentity.TileEntity; import vazkii.botania.client.core.handler.ClientTickHandler; import vazkii.botania.client.model.FloatingFlowerModel; +import javax.annotation.Nonnull; import java.util.Random; public class RenderTileFloatingFlower extends TileEntitySpecialRenderer { @Override - public void renderTileEntityAt(TileEntity tile, double d0, double d1, double d2, float t, int digProgress) { + public void renderTileEntityAt(@Nonnull TileEntity tile, double d0, double d1, double d2, float t, int digProgress) { if (tile != null) if (!tile.getWorld().isBlockLoaded(tile.getPos(), false)) return; diff --git a/src/main/java/vazkii/botania/client/render/tile/RenderTileHourglass.java b/src/main/java/vazkii/botania/client/render/tile/RenderTileHourglass.java index 4ded315cc..59ba82aea 100644 --- a/src/main/java/vazkii/botania/client/render/tile/RenderTileHourglass.java +++ b/src/main/java/vazkii/botania/client/render/tile/RenderTileHourglass.java @@ -21,6 +21,7 @@ import vazkii.botania.client.lib.LibResources; import vazkii.botania.client.model.ModelHourglass; import vazkii.botania.common.block.tile.TileHourglass; +import javax.annotation.Nonnull; import java.util.Random; public class RenderTileHourglass extends TileEntitySpecialRenderer { @@ -29,7 +30,7 @@ public class RenderTileHourglass extends TileEntitySpecialRenderer { @@ -30,7 +31,7 @@ public class RenderTileIncensePlate extends TileEntitySpecialRenderer { @Override - public void renderTileEntityAt(TileLightRelay tile, double x, double y, double z, float pticks, int digProgress) { + public void renderTileEntityAt(@Nonnull TileLightRelay tile, double x, double y, double z, float pticks, int digProgress) { if(!tile.getWorld().isBlockLoaded(tile.getPos(), false) || tile.getWorld().getBlockState(tile.getPos()).getBlock() != ModBlocks.lightRelay) return; diff --git a/src/main/java/vazkii/botania/client/render/tile/RenderTilePool.java b/src/main/java/vazkii/botania/client/render/tile/RenderTilePool.java index 0c040adcc..3574af857 100644 --- a/src/main/java/vazkii/botania/client/render/tile/RenderTilePool.java +++ b/src/main/java/vazkii/botania/client/render/tile/RenderTilePool.java @@ -31,6 +31,7 @@ import vazkii.botania.client.core.helper.ShaderHelper; import vazkii.botania.common.block.ModBlocks; import vazkii.botania.common.block.tile.mana.TilePool; +import javax.annotation.Nonnull; import java.awt.*; import java.util.Random; @@ -41,7 +42,7 @@ public class RenderTilePool extends TileEntitySpecialRenderer { public static int forceManaNumber = -1; @Override - public void renderTileEntityAt(TilePool pool, double d0, double d1, double d2, float f, int digProgress) { + public void renderTileEntityAt(@Nonnull TilePool pool, double d0, double d1, double d2, float f, int digProgress) { if(pool != null && (!pool.getWorld().isBlockLoaded(pool.getPos(), false) || pool.getWorld().getBlockState(pool.getPos()).getBlock() != ModBlocks.pool)) return; diff --git a/src/main/java/vazkii/botania/client/render/tile/RenderTilePrism.java b/src/main/java/vazkii/botania/client/render/tile/RenderTilePrism.java index a83817bac..a30fb6c32 100644 --- a/src/main/java/vazkii/botania/client/render/tile/RenderTilePrism.java +++ b/src/main/java/vazkii/botania/client/render/tile/RenderTilePrism.java @@ -20,12 +20,14 @@ import vazkii.botania.api.mana.ILens; import vazkii.botania.client.core.handler.ClientTickHandler; import vazkii.botania.common.block.tile.mana.TilePrism; +import javax.annotation.Nonnull; + //import vazkii.botania.client.render.item.RenderLens; public class RenderTilePrism extends TileEntitySpecialRenderer { @Override - public void renderTileEntityAt(TilePrism prism, double x, double y, double z, float partTicks, int digProgress) { + public void renderTileEntityAt(@Nonnull TilePrism prism, double x, double y, double z, float partTicks, int digProgress) { GlStateManager.pushMatrix(); GlStateManager.translate(x, y, z); float pos = (float) Math.sin((ClientTickHandler.ticksInGame + partTicks) * 0.05F) * 0.5F * (1F - 1F / 16F) - 0.5F; diff --git a/src/main/java/vazkii/botania/client/render/tile/RenderTilePylon.java b/src/main/java/vazkii/botania/client/render/tile/RenderTilePylon.java index 67b20389b..91851f531 100644 --- a/src/main/java/vazkii/botania/client/render/tile/RenderTilePylon.java +++ b/src/main/java/vazkii/botania/client/render/tile/RenderTilePylon.java @@ -30,6 +30,7 @@ import vazkii.botania.common.block.ModBlocks; import vazkii.botania.common.block.tile.TilePylon; import vazkii.botania.common.core.handler.ConfigHandler; +import javax.annotation.Nonnull; import java.util.Random; public class RenderTilePylon extends TileEntitySpecialRenderer { @@ -48,7 +49,7 @@ public class RenderTilePylon extends TileEntitySpecialRenderer { public static boolean pink = false; @Override - public void renderTileEntityAt(TilePylon pylon, double d0, double d1, double d2, float pticks, int digProgress) { + public void renderTileEntityAt(@Nonnull TilePylon pylon, double d0, double d1, double d2, float pticks, int digProgress) { if(!pylon.getWorld().isBlockLoaded(pylon.getPos(), false) || pylon.getWorld().getBlockState(pylon.getPos()).getBlock() != ModBlocks.pylon) return; diff --git a/src/main/java/vazkii/botania/client/render/tile/RenderTileRuneAltar.java b/src/main/java/vazkii/botania/client/render/tile/RenderTileRuneAltar.java index 748d1ca26..c5516cec4 100644 --- a/src/main/java/vazkii/botania/client/render/tile/RenderTileRuneAltar.java +++ b/src/main/java/vazkii/botania/client/render/tile/RenderTileRuneAltar.java @@ -21,12 +21,14 @@ import vazkii.botania.client.core.helper.RenderHelper; import vazkii.botania.client.model.ModelSpinningCubes; import vazkii.botania.common.block.tile.TileRuneAltar; +import javax.annotation.Nonnull; + public class RenderTileRuneAltar extends TileEntitySpecialRenderer { ModelSpinningCubes cubes = new ModelSpinningCubes(); @Override - public void renderTileEntityAt(TileRuneAltar altar, double x, double y, double z, float partticks, int digProgress) { + public void renderTileEntityAt(@Nonnull TileRuneAltar altar, double x, double y, double z, float partticks, int digProgress) { GlStateManager.pushMatrix(); GlStateManager.color(1F, 1F, 1F, 1F); GlStateManager.translate(x, y, z); diff --git a/src/main/java/vazkii/botania/client/render/tile/RenderTileSparkChanger.java b/src/main/java/vazkii/botania/client/render/tile/RenderTileSparkChanger.java index 7b3ed51ab..dce4694cf 100644 --- a/src/main/java/vazkii/botania/client/render/tile/RenderTileSparkChanger.java +++ b/src/main/java/vazkii/botania/client/render/tile/RenderTileSparkChanger.java @@ -18,10 +18,12 @@ import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; import net.minecraft.item.ItemStack; import vazkii.botania.common.block.tile.TileSparkChanger; +import javax.annotation.Nonnull; + public class RenderTileSparkChanger extends TileEntitySpecialRenderer { @Override - public void renderTileEntityAt(TileSparkChanger tileentity, double d0, double d1, double d2, float pticks, int digProgress) { + public void renderTileEntityAt(@Nonnull TileSparkChanger tileentity, double d0, double d1, double d2, float pticks, int digProgress) { GlStateManager.pushMatrix(); GlStateManager.translate(d0, d1, d2); GlStateManager.rotate(90F, 1F, 0F, 0F); diff --git a/src/main/java/vazkii/botania/client/render/tile/RenderTileSpreader.java b/src/main/java/vazkii/botania/client/render/tile/RenderTileSpreader.java index f78da1d77..da7415e0f 100644 --- a/src/main/java/vazkii/botania/client/render/tile/RenderTileSpreader.java +++ b/src/main/java/vazkii/botania/client/render/tile/RenderTileSpreader.java @@ -29,6 +29,7 @@ import vazkii.botania.client.model.ModelSpreader; import vazkii.botania.common.block.ModBlocks; import vazkii.botania.common.block.tile.mana.TileSpreader; +import javax.annotation.Nonnull; import java.awt.*; import java.util.Random; @@ -45,7 +46,7 @@ public class RenderTileSpreader extends TileEntitySpecialRenderer private static final ModelSpreader model = new ModelSpreader(); @Override - public void renderTileEntityAt(TileSpreader spreader, double d0, double d1, double d2, float ticks, int digProgress) { + public void renderTileEntityAt(@Nonnull TileSpreader spreader, double d0, double d1, double d2, float ticks, int digProgress) { if(!spreader.getWorld().isBlockLoaded(spreader.getPos(), false) || spreader.getWorld().getBlockState(spreader.getPos()).getBlock() != ModBlocks.spreader) return; diff --git a/src/main/java/vazkii/botania/client/render/tile/RenderTileStarfield.java b/src/main/java/vazkii/botania/client/render/tile/RenderTileStarfield.java index 9932f00c4..dd9166295 100644 --- a/src/main/java/vazkii/botania/client/render/tile/RenderTileStarfield.java +++ b/src/main/java/vazkii/botania/client/render/tile/RenderTileStarfield.java @@ -21,6 +21,7 @@ import net.minecraft.client.renderer.vertex.DefaultVertexFormats; import net.minecraft.util.ResourceLocation; import vazkii.botania.common.block.tile.TileStarfield; +import javax.annotation.Nonnull; import java.awt.*; import java.nio.FloatBuffer; import java.util.Random; @@ -33,7 +34,7 @@ public class RenderTileStarfield extends TileEntitySpecialRenderer { @Override - public void renderTileEntityAt(TileTerraPlate plate, double d0, double d1, double d2, float f, int digProgress) { + public void renderTileEntityAt(@Nonnull TileTerraPlate plate, double d0, double d1, double d2, float f, int digProgress) { float max = TileTerraPlate.MAX_MANA / 10F; float alphaMod = Math.min(max, plate.getCurrentMana()) / max; GlStateManager.pushMatrix(); diff --git a/src/main/java/vazkii/botania/client/render/tile/RenderTileTeruTeruBozu.java b/src/main/java/vazkii/botania/client/render/tile/RenderTileTeruTeruBozu.java index f0b6423fd..6d21af223 100644 --- a/src/main/java/vazkii/botania/client/render/tile/RenderTileTeruTeruBozu.java +++ b/src/main/java/vazkii/botania/client/render/tile/RenderTileTeruTeruBozu.java @@ -21,6 +21,7 @@ import vazkii.botania.client.model.ModelTeruTeruBozu; import vazkii.botania.common.Botania; import vazkii.botania.common.block.tile.TileTeruTeruBozu; +import javax.annotation.Nonnull; import java.util.Random; public class RenderTileTeruTeruBozu extends TileEntitySpecialRenderer { @@ -30,7 +31,7 @@ public class RenderTileTeruTeruBozu extends TileEntitySpecialRenderer { private static final ResourceLocation texture = new ResourceLocation(LibResources.MODEL_TINY_POTATO); private static final ResourceLocation textureGrayscale = new ResourceLocation(LibResources.MODEL_TINY_POTATO_GS); @@ -48,7 +50,7 @@ public class RenderTileTinyPotato extends TileEntitySpecialRenderer AlfPortalState.values().length) { @@ -63,8 +67,9 @@ public class BlockAlfPortal extends BlockMod implements IWandable, ILexiconable return true; } + @Nonnull @Override - public TileEntity createTileEntity(World world, IBlockState state) { + public TileEntity createTileEntity(@Nonnull World world, @Nonnull IBlockState state) { return new TileAlfPortal(); } @@ -82,7 +87,7 @@ public class BlockAlfPortal extends BlockMod implements IWandable, ILexiconable } @Override - public int getLightValue(IBlockState state, IBlockAccess world, BlockPos pos) { + public int getLightValue(@Nonnull IBlockState state, IBlockAccess world, @Nonnull BlockPos pos) { if(world.getBlockState(pos).getBlock() != this) return world.getBlockState(pos).getLightValue(world, pos); return state.getValue(BotaniaStateProps.ALFPORTAL_STATE) != AlfPortalState.OFF ? 15 : 0; diff --git a/src/main/java/vazkii/botania/common/block/BlockAltGrass.java b/src/main/java/vazkii/botania/common/block/BlockAltGrass.java index 13e9c8ba4..7e3c3a79d 100644 --- a/src/main/java/vazkii/botania/common/block/BlockAltGrass.java +++ b/src/main/java/vazkii/botania/common/block/BlockAltGrass.java @@ -38,6 +38,7 @@ import vazkii.botania.common.item.block.ItemBlockWithMetadataAndName; import vazkii.botania.common.lexicon.LexiconData; import vazkii.botania.common.lib.LibBlockNames; +import javax.annotation.Nonnull; import java.util.List; import java.util.Random; @@ -51,13 +52,14 @@ public class BlockAltGrass extends BlockMod implements ILexiconable { setTickRandomly(true); } + @Nonnull @Override public BlockStateContainer createBlockState() { return new BlockStateContainer(this, BotaniaStateProps.ALTGRASS_VARIANT); } @Override - public boolean isToolEffective(String type, IBlockState state) { + public boolean isToolEffective(String type, @Nonnull IBlockState state) { return type.equals("shovel"); } @@ -66,6 +68,7 @@ public class BlockAltGrass extends BlockMod implements ILexiconable { return state.getValue(BotaniaStateProps.ALTGRASS_VARIANT).ordinal(); } + @Nonnull @Override public IBlockState getStateFromMeta(int meta) { return getDefaultState().withProperty(BotaniaStateProps.ALTGRASS_VARIANT, AltGrassVariant.values()[meta]); @@ -77,7 +80,7 @@ public class BlockAltGrass extends BlockMod implements ILexiconable { } @Override - public void getSubBlocks(Item item, CreativeTabs tab, List list) { + public void getSubBlocks(@Nonnull Item item, CreativeTabs tab, List list) { for(int i = 0; i < 6; i++) list.add(new ItemStack(item, 1, i)); } @@ -102,13 +105,14 @@ public class BlockAltGrass extends BlockMod implements ILexiconable { return Blocks.DIRT.getItemDropped(state, p_149650_2_, p_149650_3_); } + @Nonnull @Override - public ItemStack getPickBlock(IBlockState state, RayTraceResult target, World world, BlockPos pos, EntityPlayer player) { + public ItemStack getPickBlock(@Nonnull IBlockState state, RayTraceResult target, @Nonnull World world, @Nonnull BlockPos pos, EntityPlayer player) { return new ItemStack(this, 1, getMetaFromState(world.getBlockState(pos))); } @Override - public boolean canSustainPlant(IBlockState state, IBlockAccess world, BlockPos pos, EnumFacing direction, IPlantable plantable) { + public boolean canSustainPlant(@Nonnull IBlockState state, @Nonnull IBlockAccess world, BlockPos pos, @Nonnull EnumFacing direction, IPlantable plantable) { EnumPlantType type = plantable.getPlantType(world, pos.down()); return type == EnumPlantType.Plains || type == EnumPlantType.Beach; } diff --git a/src/main/java/vazkii/botania/common/block/BlockAltar.java b/src/main/java/vazkii/botania/common/block/BlockAltar.java index 125009bba..3396c0158 100644 --- a/src/main/java/vazkii/botania/common/block/BlockAltar.java +++ b/src/main/java/vazkii/botania/common/block/BlockAltar.java @@ -50,6 +50,7 @@ import vazkii.botania.common.item.rod.ItemWaterRod; import vazkii.botania.common.lexicon.LexiconData; import vazkii.botania.common.lib.LibBlockNames; +import javax.annotation.Nonnull; import java.util.List; import java.util.Random; @@ -68,11 +69,13 @@ public class BlockAltar extends BlockMod implements ILexiconable { ); } + @Nonnull @Override public AxisAlignedBB getBoundingBox(IBlockState state, IBlockAccess world, BlockPos pos) { return AABB; } + @Nonnull @Override public BlockStateContainer createBlockState() { return new BlockStateContainer(this, BotaniaStateProps.ALTAR_VARIANT); @@ -83,6 +86,7 @@ public class BlockAltar extends BlockMod implements ILexiconable { return state.getValue(BotaniaStateProps.ALTAR_VARIANT).ordinal(); } + @Nonnull @Override public IBlockState getStateFromMeta(int meta) { if (meta < 0 || meta >= AltarVariant.values().length ) { @@ -91,8 +95,9 @@ public class BlockAltar extends BlockMod implements ILexiconable { return getDefaultState().withProperty(BotaniaStateProps.ALTAR_VARIANT, AltarVariant.values()[meta]); } + @Nonnull @Override - public IBlockState getActualState(IBlockState state, IBlockAccess worldIn, BlockPos pos) { + public IBlockState getActualState(@Nonnull IBlockState state, IBlockAccess worldIn, BlockPos pos) { TileEntity te = worldIn.getTileEntity(pos); if (te instanceof TileAltar) { TileAltar altar = ((TileAltar) te); @@ -104,6 +109,7 @@ public class BlockAltar extends BlockMod implements ILexiconable { return state; } + @Nonnull @Override public BlockRenderLayer getBlockLayer() { return BlockRenderLayer.CUTOUT; @@ -115,7 +121,7 @@ public class BlockAltar extends BlockMod implements ILexiconable { } @Override - public void getSubBlocks(Item item, CreativeTabs tab, List list) { + public void getSubBlocks(@Nonnull Item item, CreativeTabs tab, List list) { for(int i = 0; i < 9; i++) list.add(new ItemStack(item, 1, i)); } @@ -130,7 +136,7 @@ public class BlockAltar extends BlockMod implements ILexiconable { } @Override - public int getLightValue(IBlockState state, IBlockAccess world, BlockPos pos) { + public int getLightValue(@Nonnull IBlockState state, IBlockAccess world, @Nonnull BlockPos pos) { if(world.getBlockState(pos).getBlock() != this) return world.getBlockState(pos).getLightValue(world, pos); TileAltar tile = (TileAltar) world.getTileEntity(pos); @@ -260,13 +266,14 @@ public class BlockAltar extends BlockMod implements ILexiconable { return true; } + @Nonnull @Override - public TileEntity createTileEntity(World world, IBlockState state) { + public TileEntity createTileEntity(@Nonnull World world, @Nonnull IBlockState state) { return new TileAltar(); } @Override - public void breakBlock(World par1World, BlockPos pos, IBlockState state) { + public void breakBlock(@Nonnull World par1World, @Nonnull BlockPos pos, @Nonnull IBlockState state) { TileSimpleInventory inv = (TileSimpleInventory) par1World.getTileEntity(pos); if (inv != null) { diff --git a/src/main/java/vazkii/botania/common/block/BlockAvatar.java b/src/main/java/vazkii/botania/common/block/BlockAvatar.java index 84ce2d9d9..7c5deb517 100644 --- a/src/main/java/vazkii/botania/common/block/BlockAvatar.java +++ b/src/main/java/vazkii/botania/common/block/BlockAvatar.java @@ -36,6 +36,7 @@ import vazkii.botania.common.block.tile.TileSimpleInventory; import vazkii.botania.common.lexicon.LexiconData; import vazkii.botania.common.lib.LibBlockNames; +import javax.annotation.Nonnull; import java.util.Random; public class BlockAvatar extends BlockMod implements ILexiconable { @@ -52,6 +53,7 @@ public class BlockAvatar extends BlockMod implements ILexiconable { setDefaultState(blockState.getBaseState().withProperty(BotaniaStateProps.CARDINALS, EnumFacing.NORTH)); } + @Nonnull @Override public AxisAlignedBB getBoundingBox(IBlockState state, IBlockAccess world, BlockPos pos) { if(state.getValue(BotaniaStateProps.CARDINALS).getAxis() == EnumFacing.Axis.X) @@ -59,6 +61,7 @@ public class BlockAvatar extends BlockMod implements ILexiconable { else return Z_AABB; } + @Nonnull @Override public BlockStateContainer createBlockState() { return new BlockStateContainer(this, BotaniaStateProps.CARDINALS); @@ -69,6 +72,7 @@ public class BlockAvatar extends BlockMod implements ILexiconable { return state.getValue(BotaniaStateProps.CARDINALS).getIndex(); } + @Nonnull @Override public IBlockState getStateFromMeta(int meta) { if (meta < 2 || meta > 5) { @@ -98,7 +102,7 @@ public class BlockAvatar extends BlockMod implements ILexiconable { } @Override - public void breakBlock(World par1World, BlockPos pos, IBlockState state) { + public void breakBlock(@Nonnull World par1World, @Nonnull BlockPos pos, @Nonnull IBlockState state) { TileSimpleInventory inv = (TileSimpleInventory) par1World.getTileEntity(pos); if (inv != null) { @@ -150,6 +154,7 @@ public class BlockAvatar extends BlockMod implements ILexiconable { return false; } + @Nonnull @Override public EnumBlockRenderType getRenderType(IBlockState state) { return EnumBlockRenderType.ENTITYBLOCK_ANIMATED; @@ -160,8 +165,9 @@ public class BlockAvatar extends BlockMod implements ILexiconable { return true; } + @Nonnull @Override - public TileEntity createTileEntity(World world, IBlockState state) { + public TileEntity createTileEntity(@Nonnull World world, @Nonnull IBlockState state) { return new TileAvatar(); } diff --git a/src/main/java/vazkii/botania/common/block/BlockBifrost.java b/src/main/java/vazkii/botania/common/block/BlockBifrost.java index 7d2258124..e2827a337 100644 --- a/src/main/java/vazkii/botania/common/block/BlockBifrost.java +++ b/src/main/java/vazkii/botania/common/block/BlockBifrost.java @@ -31,6 +31,7 @@ import vazkii.botania.common.item.ModItems; import vazkii.botania.common.lexicon.LexiconData; import vazkii.botania.common.lib.LibBlockNames; +import javax.annotation.Nonnull; import java.util.Random; public class BlockBifrost extends BlockMod implements ILexiconable { @@ -54,24 +55,26 @@ public class BlockBifrost extends BlockMod implements ILexiconable { return false; } + @Nonnull @Override - public ItemStack getPickBlock(IBlockState state, RayTraceResult target, World world, BlockPos pos, EntityPlayer player) { + public ItemStack getPickBlock(@Nonnull IBlockState state, RayTraceResult target, @Nonnull World world, @Nonnull BlockPos pos, EntityPlayer player) { return new ItemStack(ModItems.rainbowRod); } @Override - public boolean shouldSideBeRendered(IBlockState state, IBlockAccess world, BlockPos pos, EnumFacing side) { + public boolean shouldSideBeRendered(IBlockState state, @Nonnull IBlockAccess world, @Nonnull BlockPos pos, EnumFacing side) { Block block = world.getBlockState(pos.offset(side)).getBlock(); return block != this && super.shouldSideBeRendered(state, world, pos, side); } + @Nonnull @Override public BlockRenderLayer getBlockLayer() { return BlockRenderLayer.TRANSLUCENT; } @Override - public int quantityDropped(IBlockState state, int fortune, Random random) { + public int quantityDropped(IBlockState state, int fortune, @Nonnull Random random) { return 0; } @@ -80,8 +83,9 @@ public class BlockBifrost extends BlockMod implements ILexiconable { return true; } + @Nonnull @Override - public TileEntity createTileEntity(World world, IBlockState state) { + public TileEntity createTileEntity(@Nonnull World world, @Nonnull IBlockState state) { return new TileBifrost(); } diff --git a/src/main/java/vazkii/botania/common/block/BlockBifrostPerm.java b/src/main/java/vazkii/botania/common/block/BlockBifrostPerm.java index a4f28eb2d..4308299b4 100644 --- a/src/main/java/vazkii/botania/common/block/BlockBifrostPerm.java +++ b/src/main/java/vazkii/botania/common/block/BlockBifrostPerm.java @@ -26,6 +26,7 @@ import vazkii.botania.common.Botania; import vazkii.botania.common.lexicon.LexiconData; import vazkii.botania.common.lib.LibBlockNames; +import javax.annotation.Nonnull; import java.util.Random; public class BlockBifrostPerm extends BlockMod implements ILexiconable { @@ -45,7 +46,7 @@ public class BlockBifrostPerm extends BlockMod implements ILexiconable { } @Override - public boolean shouldSideBeRendered(IBlockState state, IBlockAccess world, BlockPos pos, EnumFacing side) { + public boolean shouldSideBeRendered(IBlockState state, @Nonnull IBlockAccess world, @Nonnull BlockPos pos, EnumFacing side) { if (world.getBlockState(pos.offset(side)).getBlock() == this) { return false; } @@ -58,6 +59,7 @@ public class BlockBifrostPerm extends BlockMod implements ILexiconable { Botania.proxy.sparkleFX(world, pos.getX() + Math.random(), pos.getY() + Math.random(), pos.getZ() + Math.random(), (float) Math.random(), (float) Math.random(), (float) Math.random(), 0.45F + 0.2F * (float) Math.random(), 6); } + @Nonnull @Override public BlockRenderLayer getBlockLayer() { return BlockRenderLayer.TRANSLUCENT; diff --git a/src/main/java/vazkii/botania/common/block/BlockCacophonium.java b/src/main/java/vazkii/botania/common/block/BlockCacophonium.java index d86838667..ada81e200 100644 --- a/src/main/java/vazkii/botania/common/block/BlockCacophonium.java +++ b/src/main/java/vazkii/botania/common/block/BlockCacophonium.java @@ -25,6 +25,7 @@ import vazkii.botania.api.state.BotaniaStateProps; import vazkii.botania.common.block.tile.TileCacophonium; import vazkii.botania.common.lib.LibBlockNames; +import javax.annotation.Nonnull; import java.util.ArrayList; import java.util.List; @@ -36,6 +37,7 @@ public class BlockCacophonium extends BlockMod { setDefaultState(blockState.getBaseState().withProperty(BotaniaStateProps.POWERED, false)); } + @Nonnull @Override public BlockStateContainer createBlockState() { return new BlockStateContainer(this, BotaniaStateProps.POWERED); @@ -46,13 +48,14 @@ public class BlockCacophonium extends BlockMod { return state.getValue(BotaniaStateProps.POWERED) ? 8 : 0; } + @Nonnull @Override public IBlockState getStateFromMeta(int meta) { return getDefaultState().withProperty(BotaniaStateProps.POWERED, meta == 8); } @Override - public boolean canSilkHarvest(World world, BlockPos pos, IBlockState state, EntityPlayer player) { + public boolean canSilkHarvest(World world, BlockPos pos, @Nonnull IBlockState state, EntityPlayer player) { return false; } @@ -76,7 +79,7 @@ public class BlockCacophonium extends BlockMod { } @Override - public boolean removedByPlayer(IBlockState state, World world, BlockPos pos, EntityPlayer player, boolean willHarvest) { + public boolean removedByPlayer(@Nonnull IBlockState state, World world, @Nonnull BlockPos pos, @Nonnull EntityPlayer player, boolean willHarvest) { if (willHarvest) { // Copy of super.removedByPlayer but don't set to air yet // This is so getDrops below will have a TE to work with @@ -88,14 +91,15 @@ public class BlockCacophonium extends BlockMod { } @Override - public void harvestBlock(World world, EntityPlayer player, BlockPos pos, IBlockState state, TileEntity te, ItemStack stack) { + public void harvestBlock(@Nonnull World world, EntityPlayer player, @Nonnull BlockPos pos, @Nonnull IBlockState state, TileEntity te, ItemStack stack) { super.harvestBlock(world, player, pos, state, te, stack); // Now delete the block and TE world.setBlockToAir(pos); } + @Nonnull @Override - public List getDrops(IBlockAccess world, BlockPos pos, IBlockState state, int fortune) { + public List getDrops(IBlockAccess world, BlockPos pos, @Nonnull IBlockState state, int fortune) { ArrayList stacks = new ArrayList<>(); TileEntity tile = world.getTileEntity(pos); @@ -114,8 +118,9 @@ public class BlockCacophonium extends BlockMod { return true; } + @Nonnull @Override - public TileEntity createTileEntity(World world, IBlockState state) { + public TileEntity createTileEntity(@Nonnull World world, @Nonnull IBlockState state) { return new TileCacophonium(); } diff --git a/src/main/java/vazkii/botania/common/block/BlockCell.java b/src/main/java/vazkii/botania/common/block/BlockCell.java index 96023f2fa..85a105d1d 100644 --- a/src/main/java/vazkii/botania/common/block/BlockCell.java +++ b/src/main/java/vazkii/botania/common/block/BlockCell.java @@ -25,6 +25,7 @@ import vazkii.botania.common.block.tile.TileCell; import vazkii.botania.common.lexicon.LexiconData; import vazkii.botania.common.lib.LibBlockNames; +import javax.annotation.Nonnull; import java.util.ArrayList; import java.util.List; @@ -35,8 +36,9 @@ public class BlockCell extends BlockMod implements ILexiconable { setSoundType(SoundType.CLOTH); } + @Nonnull @Override - public List getDrops(IBlockAccess world, BlockPos pos, IBlockState state, int fortune) { + public List getDrops(IBlockAccess world, BlockPos pos, @Nonnull IBlockState state, int fortune) { return new ArrayList<>(); } @@ -45,8 +47,9 @@ public class BlockCell extends BlockMod implements ILexiconable { return true; } + @Nonnull @Override - public TileEntity createTileEntity(World world, IBlockState state) { + public TileEntity createTileEntity(@Nonnull World world, @Nonnull IBlockState state) { return new TileCell(); } diff --git a/src/main/java/vazkii/botania/common/block/BlockCocoon.java b/src/main/java/vazkii/botania/common/block/BlockCocoon.java index cb310056f..c9dcf4794 100644 --- a/src/main/java/vazkii/botania/common/block/BlockCocoon.java +++ b/src/main/java/vazkii/botania/common/block/BlockCocoon.java @@ -30,6 +30,7 @@ import vazkii.botania.common.block.tile.TileCocoon; import vazkii.botania.common.lexicon.LexiconData; import vazkii.botania.common.lib.LibBlockNames; +import javax.annotation.Nonnull; import java.util.ArrayList; import java.util.List; @@ -44,6 +45,7 @@ public class BlockCocoon extends BlockMod implements ILexiconable { setSoundType(SoundType.CLOTH); } + @Nonnull @Override public AxisAlignedBB getBoundingBox(IBlockState state, IBlockAccess world, BlockPos pos) { return AABB; @@ -59,6 +61,7 @@ public class BlockCocoon extends BlockMod implements ILexiconable { return false; } + @Nonnull @Override public EnumBlockRenderType getRenderType(IBlockState state) { return EnumBlockRenderType.ENTITYBLOCK_ANIMATED; @@ -76,13 +79,14 @@ public class BlockCocoon extends BlockMod implements ILexiconable { return false; } + @Nonnull @Override - public List getDrops(IBlockAccess world, BlockPos pos, IBlockState state, int fortune) { + public List getDrops(IBlockAccess world, BlockPos pos, @Nonnull IBlockState state, int fortune) { return new ArrayList<>(); } @Override - public boolean canSilkHarvest(World world, BlockPos pos, IBlockState state, EntityPlayer player) { + public boolean canSilkHarvest(World world, BlockPos pos, @Nonnull IBlockState state, EntityPlayer player) { return false; } @@ -91,8 +95,9 @@ public class BlockCocoon extends BlockMod implements ILexiconable { return true; } + @Nonnull @Override - public TileEntity createTileEntity(World world, IBlockState state) { + public TileEntity createTileEntity(@Nonnull World world, @Nonnull IBlockState state) { return new TileCocoon(); } diff --git a/src/main/java/vazkii/botania/common/block/BlockEnchantedSoil.java b/src/main/java/vazkii/botania/common/block/BlockEnchantedSoil.java index 0fd921571..265d62f06 100644 --- a/src/main/java/vazkii/botania/common/block/BlockEnchantedSoil.java +++ b/src/main/java/vazkii/botania/common/block/BlockEnchantedSoil.java @@ -28,6 +28,7 @@ import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.common.lexicon.LexiconData; import vazkii.botania.common.lib.LibBlockNames; +import javax.annotation.Nonnull; import java.util.Random; public class BlockEnchantedSoil extends BlockMod implements ILexiconable { @@ -49,12 +50,12 @@ public class BlockEnchantedSoil extends BlockMod implements ILexiconable { } @Override - public boolean canSustainPlant(IBlockState state, IBlockAccess world, BlockPos pos, EnumFacing direction, IPlantable plantable) { + public boolean canSustainPlant(@Nonnull IBlockState state, @Nonnull IBlockAccess world, BlockPos pos, @Nonnull EnumFacing direction, IPlantable plantable) { return plantable.getPlantType(world, pos.down()) == EnumPlantType.Plains; } @Override - public boolean canSilkHarvest(World world, BlockPos pos, IBlockState state, EntityPlayer player) { + public boolean canSilkHarvest(World world, BlockPos pos, @Nonnull IBlockState state, EntityPlayer player) { return false; } diff --git a/src/main/java/vazkii/botania/common/block/BlockEnderEye.java b/src/main/java/vazkii/botania/common/block/BlockEnderEye.java index 755760ddf..c8badef79 100644 --- a/src/main/java/vazkii/botania/common/block/BlockEnderEye.java +++ b/src/main/java/vazkii/botania/common/block/BlockEnderEye.java @@ -28,6 +28,8 @@ import vazkii.botania.common.block.tile.TileEnderEye; import vazkii.botania.common.lexicon.LexiconData; import vazkii.botania.common.lib.LibBlockNames; +import javax.annotation.Nonnull; + public class BlockEnderEye extends BlockMod implements ILexiconable { protected BlockEnderEye() { @@ -38,11 +40,13 @@ public class BlockEnderEye extends BlockMod implements ILexiconable { setDefaultState(blockState.getBaseState().withProperty(BotaniaStateProps.POWERED, false)); } + @Nonnull @Override public BlockStateContainer createBlockState() { return new BlockStateContainer(this, BotaniaStateProps.POWERED); } + @Nonnull @Override public IBlockState getStateFromMeta(int meta) { return getDefaultState().withProperty(BotaniaStateProps.POWERED, meta == 15); @@ -68,8 +72,9 @@ public class BlockEnderEye extends BlockMod implements ILexiconable { return true; } + @Nonnull @Override - public TileEntity createTileEntity(World world, IBlockState state) { + public TileEntity createTileEntity(@Nonnull World world, @Nonnull IBlockState state) { return new TileEnderEye(); } diff --git a/src/main/java/vazkii/botania/common/block/BlockFakeAir.java b/src/main/java/vazkii/botania/common/block/BlockFakeAir.java index 0b7ccfcb1..a11501f8b 100644 --- a/src/main/java/vazkii/botania/common/block/BlockFakeAir.java +++ b/src/main/java/vazkii/botania/common/block/BlockFakeAir.java @@ -27,6 +27,7 @@ import net.minecraft.world.World; import vazkii.botania.common.block.tile.TileFakeAir; import vazkii.botania.common.lib.LibBlockNames; +import javax.annotation.Nonnull; import java.util.List; import java.util.Random; @@ -39,11 +40,13 @@ public class BlockFakeAir extends BlockMod { setTickRandomly(true); } + @Nonnull @Override public AxisAlignedBB getBoundingBox(IBlockState state, IBlockAccess world, BlockPos pos) { return AABB; } + @Nonnull @Override public EnumBlockRenderType getRenderType(IBlockState state) { return EnumBlockRenderType.INVISIBLE; @@ -108,13 +111,14 @@ public class BlockFakeAir extends BlockMod { return false; } + @Nonnull @Override - public List getDrops(IBlockAccess world, BlockPos pos, IBlockState state, int fortune) { + public List getDrops(IBlockAccess world, BlockPos pos, @Nonnull IBlockState state, int fortune) { return ImmutableList.of(); } @Override - public AxisAlignedBB getCollisionBoundingBox(IBlockState state, World par1World, BlockPos pos) { + public AxisAlignedBB getCollisionBoundingBox(IBlockState state, @Nonnull World par1World, @Nonnull BlockPos pos) { return null; } @@ -128,8 +132,9 @@ public class BlockFakeAir extends BlockMod { return true; } + @Nonnull @Override - public TileEntity createTileEntity(World world, IBlockState state) { + public TileEntity createTileEntity(@Nonnull World world, @Nonnull IBlockState state) { return new TileFakeAir(); } diff --git a/src/main/java/vazkii/botania/common/block/BlockFelPumpkin.java b/src/main/java/vazkii/botania/common/block/BlockFelPumpkin.java index 6c2c9c1f1..58f99808f 100644 --- a/src/main/java/vazkii/botania/common/block/BlockFelPumpkin.java +++ b/src/main/java/vazkii/botania/common/block/BlockFelPumpkin.java @@ -33,6 +33,8 @@ import vazkii.botania.api.state.BotaniaStateProps; import vazkii.botania.common.lexicon.LexiconData; import vazkii.botania.common.lib.LibBlockNames; +import javax.annotation.Nonnull; + public class BlockFelPumpkin extends BlockMod implements ILexiconable { private static final String TAG_FEL_SPAWNED = "Botania-FelSpawned"; @@ -45,6 +47,7 @@ public class BlockFelPumpkin extends BlockMod implements ILexiconable { setDefaultState(blockState.getBaseState().withProperty(BotaniaStateProps.CARDINALS, EnumFacing.SOUTH)); } + @Nonnull @Override public BlockStateContainer createBlockState() { return new BlockStateContainer(this, BotaniaStateProps.CARDINALS); @@ -55,6 +58,7 @@ public class BlockFelPumpkin extends BlockMod implements ILexiconable { return state.getValue(BotaniaStateProps.CARDINALS).getHorizontalIndex(); } + @Nonnull @Override public IBlockState getStateFromMeta(int meta) { return getDefaultState().withProperty(BotaniaStateProps.CARDINALS, EnumFacing.getHorizontal(meta)); diff --git a/src/main/java/vazkii/botania/common/block/BlockFloatingSpecialFlower.java b/src/main/java/vazkii/botania/common/block/BlockFloatingSpecialFlower.java index d557571af..c3dce0dd0 100644 --- a/src/main/java/vazkii/botania/common/block/BlockFloatingSpecialFlower.java +++ b/src/main/java/vazkii/botania/common/block/BlockFloatingSpecialFlower.java @@ -51,6 +51,7 @@ import vazkii.botania.common.item.block.ItemBlockFloatingSpecialFlower; import vazkii.botania.common.item.block.ItemBlockSpecialFlower; import vazkii.botania.common.lib.LibBlockNames; +import javax.annotation.Nonnull; import java.util.ArrayList; import java.util.List; import java.util.Random; @@ -68,13 +69,15 @@ public class BlockFloatingSpecialFlower extends BlockFloatingFlower implements I .withProperty(BotaniaStateProps.COLOR, EnumDyeColor.WHITE)); } + @Nonnull @Override public BlockStateContainer createBlockState() { return new ExtendedBlockState(this, new IProperty[] { BotaniaStateProps.COLOR }, new IUnlistedProperty[] { BotaniaStateProps.SUBTILE_ID, BotaniaStateProps.ISLAND_TYPE }); } + @Nonnull @Override - public IBlockState getExtendedState(IBlockState state, IBlockAccess world, BlockPos pos) { + public IBlockState getExtendedState(@Nonnull IBlockState state, IBlockAccess world, BlockPos pos) { state = super.getExtendedState(state, world, pos); TileEntity te = world.getTileEntity(pos); if (te instanceof TileFloatingSpecialFlower) { @@ -84,7 +87,7 @@ public class BlockFloatingSpecialFlower extends BlockFloatingFlower implements I } @Override - public int getLightValue(IBlockState state, IBlockAccess world, BlockPos pos) { + public int getLightValue(@Nonnull IBlockState state, IBlockAccess world, @Nonnull BlockPos pos) { if(world.getBlockState(pos).getBlock() != this) return world.getBlockState(pos).getLightValue(world, pos); @@ -126,7 +129,7 @@ public class BlockFloatingSpecialFlower extends BlockFloatingFlower implements I } @Override - public void getSubBlocks(Item par1, CreativeTabs par2CreativeTabs, List par3List) { + public void getSubBlocks(@Nonnull Item par1, CreativeTabs par2CreativeTabs, List par3List) { for(String s : BotaniaAPI.subtilesForCreativeMenu) { par3List.add(ItemBlockSpecialFlower.ofType(new ItemStack(par1), s)); if(BotaniaAPI.miniFlowers.containsKey(s)) @@ -134,8 +137,9 @@ public class BlockFloatingSpecialFlower extends BlockFloatingFlower implements I } } + @Nonnull @Override - public ItemStack getPickBlock(IBlockState state, RayTraceResult target, World world, BlockPos pos, EntityPlayer player) { + public ItemStack getPickBlock(@Nonnull IBlockState state, RayTraceResult target, @Nonnull World world, @Nonnull BlockPos pos, EntityPlayer player) { String name = ((TileSpecialFlower) world.getTileEntity(pos)).subTileName; return ItemBlockSpecialFlower.ofType(new ItemStack(state.getBlock()), name); } @@ -146,7 +150,7 @@ public class BlockFloatingSpecialFlower extends BlockFloatingFlower implements I } @Override - public boolean removedByPlayer(IBlockState state, World world, BlockPos pos, EntityPlayer player, boolean willHarvest) { + public boolean removedByPlayer(@Nonnull IBlockState state, World world, @Nonnull BlockPos pos, @Nonnull EntityPlayer player, boolean willHarvest) { if (willHarvest) { // Copy of super.removedByPlayer but don't set to air yet // This is so getDrops below will have a TE to work with @@ -158,14 +162,15 @@ public class BlockFloatingSpecialFlower extends BlockFloatingFlower implements I } @Override - public void harvestBlock(World world, EntityPlayer player, BlockPos pos, IBlockState state, TileEntity te, ItemStack stack) { + public void harvestBlock(@Nonnull World world, EntityPlayer player, @Nonnull BlockPos pos, @Nonnull IBlockState state, TileEntity te, ItemStack stack) { super.harvestBlock(world, player, pos, state, te, stack); // Now delete the block and TE world.setBlockToAir(pos); } + @Nonnull @Override - public List getDrops(IBlockAccess world, BlockPos pos, IBlockState state, int fortune) { + public List getDrops(IBlockAccess world, BlockPos pos, @Nonnull IBlockState state, int fortune) { ArrayList list = new ArrayList<>(); TileEntity tile = world.getTileEntity(pos); @@ -215,8 +220,9 @@ public class BlockFloatingSpecialFlower extends BlockFloatingFlower implements I GameRegistry.register(new ItemBlockFloatingSpecialFlower(this), getRegistryName()); } + @Nonnull @Override - public TileEntity createTileEntity(World world, IBlockState state) { + public TileEntity createTileEntity(@Nonnull World world, @Nonnull IBlockState state) { return new TileFloatingSpecialFlower(); } diff --git a/src/main/java/vazkii/botania/common/block/BlockForestEye.java b/src/main/java/vazkii/botania/common/block/BlockForestEye.java index 7a943fdcf..75f022630 100644 --- a/src/main/java/vazkii/botania/common/block/BlockForestEye.java +++ b/src/main/java/vazkii/botania/common/block/BlockForestEye.java @@ -26,6 +26,8 @@ import vazkii.botania.common.block.tile.TileForestEye; import vazkii.botania.common.lexicon.LexiconData; import vazkii.botania.common.lib.LibBlockNames; +import javax.annotation.Nonnull; + public class BlockForestEye extends BlockMod implements ILexiconable { private static final AxisAlignedBB AABB = new AxisAlignedBB(0.25, 0.25, 0.25, 0.75, 0.75, 0.75); @@ -37,6 +39,7 @@ public class BlockForestEye extends BlockMod implements ILexiconable { setSoundType(SoundType.METAL); } + @Nonnull @Override public AxisAlignedBB getBoundingBox(IBlockState state, IBlockAccess world, BlockPos pos) { return AABB; @@ -68,8 +71,9 @@ public class BlockForestEye extends BlockMod implements ILexiconable { return true; } + @Nonnull @Override - public TileEntity createTileEntity(World world, IBlockState state) { + public TileEntity createTileEntity(@Nonnull World world, @Nonnull IBlockState state) { return new TileForestEye(); } diff --git a/src/main/java/vazkii/botania/common/block/BlockGaiaHead.java b/src/main/java/vazkii/botania/common/block/BlockGaiaHead.java index cdb2ebe47..876dc3ab7 100644 --- a/src/main/java/vazkii/botania/common/block/BlockGaiaHead.java +++ b/src/main/java/vazkii/botania/common/block/BlockGaiaHead.java @@ -28,6 +28,7 @@ import vazkii.botania.common.item.ModItems; import vazkii.botania.common.lib.LibBlockNames; import vazkii.botania.common.lib.LibMisc; +import javax.annotation.Nonnull; import java.util.ArrayList; import java.util.List; import java.util.Random; @@ -40,13 +41,15 @@ public class BlockGaiaHead extends BlockSkull { setHardness(1.0F); } + @Nonnull @Override - public ItemStack getPickBlock(IBlockState state, RayTraceResult target, World world, BlockPos pos, EntityPlayer player) { + public ItemStack getPickBlock(@Nonnull IBlockState state, RayTraceResult target, @Nonnull World world, @Nonnull BlockPos pos, EntityPlayer player) { return new ItemStack(ModItems.gaiaHead); } - @Override - public List getDrops(IBlockAccess p_149749_1_, BlockPos pos, IBlockState state, int fortune) { + @Nonnull + @Override + public List getDrops(@Nonnull IBlockAccess p_149749_1_, @Nonnull BlockPos pos, IBlockState state, int fortune) { ArrayList ret = new ArrayList<>(); if(!state.getValue(NODROP)) { @@ -71,6 +74,7 @@ public class BlockGaiaHead extends BlockSkull { return 0; } + @Nonnull @Override public TileEntity createNewTileEntity(World p_149915_1_, int p_149915_2_) { return new TileGaiaHead(); diff --git a/src/main/java/vazkii/botania/common/block/BlockGhostRail.java b/src/main/java/vazkii/botania/common/block/BlockGhostRail.java index 8dc6e386b..e8ea87f9c 100644 --- a/src/main/java/vazkii/botania/common/block/BlockGhostRail.java +++ b/src/main/java/vazkii/botania/common/block/BlockGhostRail.java @@ -34,6 +34,8 @@ import vazkii.botania.common.lexicon.LexiconData; import vazkii.botania.common.lib.LibBlockNames; import vazkii.botania.common.lib.LibMisc; +import javax.annotation.Nonnull; + public class BlockGhostRail extends BlockRailBase implements ILexiconable { private static final String TAG_FLOAT_TICKS = "Botania_FloatTicks"; @@ -48,6 +50,7 @@ public class BlockGhostRail extends BlockRailBase implements ILexiconable { setDefaultState(blockState.getBaseState().withProperty(BotaniaStateProps.RAIL_DIRECTION, EnumRailDirection.NORTH_SOUTH)); } + @Nonnull @Override public BlockStateContainer createBlockState() { return new BlockStateContainer(this, BotaniaStateProps.RAIL_DIRECTION); @@ -58,6 +61,7 @@ public class BlockGhostRail extends BlockRailBase implements ILexiconable { return state.getValue(BotaniaStateProps.RAIL_DIRECTION).getMetadata(); } + @Nonnull @Override public IBlockState getStateFromMeta(int meta) { return getDefaultState().withProperty(BotaniaStateProps.RAIL_DIRECTION, EnumRailDirection.byMetadata(meta)); @@ -99,6 +103,7 @@ public class BlockGhostRail extends BlockRailBase implements ILexiconable { return LexiconData.ghostRail; } + @Nonnull @Override public IProperty getShapeProperty() { return BlockRailPowered.SHAPE; diff --git a/src/main/java/vazkii/botania/common/block/BlockHourglass.java b/src/main/java/vazkii/botania/common/block/BlockHourglass.java index daf14fc4e..6853e1b2f 100644 --- a/src/main/java/vazkii/botania/common/block/BlockHourglass.java +++ b/src/main/java/vazkii/botania/common/block/BlockHourglass.java @@ -43,6 +43,7 @@ import vazkii.botania.common.item.ModItems; import vazkii.botania.common.lexicon.LexiconData; import vazkii.botania.common.lib.LibBlockNames; +import javax.annotation.Nonnull; import java.util.Random; public class BlockHourglass extends BlockMod implements IManaTrigger, IWandable, IWandHUD, ILexiconable { @@ -58,11 +59,13 @@ public class BlockHourglass extends BlockMod implements IManaTrigger, IWandable, setDefaultState(blockState.getBaseState().withProperty(BotaniaStateProps.POWERED, false)); } + @Nonnull @Override public AxisAlignedBB getBoundingBox(IBlockState state, IBlockAccess world, BlockPos pos) { return AABB; } + @Nonnull @Override public BlockStateContainer createBlockState() { return new BlockStateContainer(this, BotaniaStateProps.POWERED); @@ -73,6 +76,7 @@ public class BlockHourglass extends BlockMod implements IManaTrigger, IWandable, return state.getValue(BotaniaStateProps.POWERED) ? 1 : 0; } + @Nonnull @Override public IBlockState getStateFromMeta(int meta) { return getDefaultState().withProperty(BotaniaStateProps.POWERED, meta == 1); @@ -130,7 +134,7 @@ public class BlockHourglass extends BlockMod implements IManaTrigger, IWandable, } @Override - public void breakBlock(World par1World, BlockPos pos, IBlockState state) { + public void breakBlock(@Nonnull World par1World, @Nonnull BlockPos pos, @Nonnull IBlockState state) { TileSimpleInventory inv = (TileSimpleInventory) par1World.getTileEntity(pos); if (inv != null) { @@ -177,6 +181,7 @@ public class BlockHourglass extends BlockMod implements IManaTrigger, IWandable, return false; } + @Nonnull @Override public EnumBlockRenderType getRenderType(IBlockState state) { return EnumBlockRenderType.ENTITYBLOCK_ANIMATED; @@ -187,8 +192,9 @@ public class BlockHourglass extends BlockMod implements IManaTrigger, IWandable, return true; } + @Nonnull @Override - public TileEntity createTileEntity(World world, IBlockState state) { + public TileEntity createTileEntity(@Nonnull World world, @Nonnull IBlockState state) { return new TileHourglass(); } diff --git a/src/main/java/vazkii/botania/common/block/BlockIncensePlate.java b/src/main/java/vazkii/botania/common/block/BlockIncensePlate.java index 3834f4d81..856e4c57a 100644 --- a/src/main/java/vazkii/botania/common/block/BlockIncensePlate.java +++ b/src/main/java/vazkii/botania/common/block/BlockIncensePlate.java @@ -33,6 +33,8 @@ import vazkii.botania.common.block.tile.TileIncensePlate; import vazkii.botania.common.lexicon.LexiconData; import vazkii.botania.common.lib.LibBlockNames; +import javax.annotation.Nonnull; + public class BlockIncensePlate extends BlockMod implements ILexiconable { private static final AxisAlignedBB X_AABB = new AxisAlignedBB(0.375, 0, 0.125, 0.625, 1/16.0, 0.875); @@ -45,6 +47,7 @@ public class BlockIncensePlate extends BlockMod implements ILexiconable { setDefaultState(blockState.getBaseState().withProperty(BotaniaStateProps.CARDINALS, EnumFacing.SOUTH)); } + @Nonnull @Override public BlockStateContainer createBlockState() { return new BlockStateContainer(this, BotaniaStateProps.CARDINALS); @@ -55,6 +58,7 @@ public class BlockIncensePlate extends BlockMod implements ILexiconable { return state.getValue(BotaniaStateProps.CARDINALS).getIndex(); } + @Nonnull @Override public IBlockState getStateFromMeta(int meta) { if (meta < 2 || meta > 5) { @@ -112,6 +116,7 @@ public class BlockIncensePlate extends BlockMod implements ILexiconable { return ((TileIncensePlate) world.getTileEntity(pos)).comparatorOutput; } + @Nonnull @Override public AxisAlignedBB getBoundingBox(IBlockState state, IBlockAccess world, BlockPos pos) { if(state.getValue(BotaniaStateProps.CARDINALS).getAxis() == EnumFacing.Axis.X) { @@ -136,8 +141,9 @@ public class BlockIncensePlate extends BlockMod implements ILexiconable { return true; } + @Nonnull @Override - public TileEntity createTileEntity(World world, IBlockState state) { + public TileEntity createTileEntity(@Nonnull World world, @Nonnull IBlockState state) { return new TileIncensePlate(); } diff --git a/src/main/java/vazkii/botania/common/block/BlockLightLauncher.java b/src/main/java/vazkii/botania/common/block/BlockLightLauncher.java index efeb374ab..32866f435 100644 --- a/src/main/java/vazkii/botania/common/block/BlockLightLauncher.java +++ b/src/main/java/vazkii/botania/common/block/BlockLightLauncher.java @@ -33,6 +33,7 @@ import vazkii.botania.common.block.tile.TileLightRelay; import vazkii.botania.common.lexicon.LexiconData; import vazkii.botania.common.lib.LibBlockNames; +import javax.annotation.Nonnull; import java.util.ArrayList; import java.util.List; @@ -47,11 +48,13 @@ public class BlockLightLauncher extends BlockMod implements ILexiconable { setDefaultState(blockState.getBaseState().withProperty(BotaniaStateProps.POWERED, false)); } + @Nonnull @Override public AxisAlignedBB getBoundingBox(IBlockState state, IBlockAccess world, BlockPos pos) { return AABB; } + @Nonnull @Override public BlockStateContainer createBlockState() { return new BlockStateContainer(this, BotaniaStateProps.POWERED); @@ -62,6 +65,7 @@ public class BlockLightLauncher extends BlockMod implements ILexiconable { return state.getValue(BotaniaStateProps.POWERED) ? 8 : 0; } + @Nonnull @Override public IBlockState getStateFromMeta(int meta) { return getDefaultState().withProperty(BotaniaStateProps.POWERED, meta == 8); diff --git a/src/main/java/vazkii/botania/common/block/BlockLightRelay.java b/src/main/java/vazkii/botania/common/block/BlockLightRelay.java index b21bee92a..e85a6a224 100644 --- a/src/main/java/vazkii/botania/common/block/BlockLightRelay.java +++ b/src/main/java/vazkii/botania/common/block/BlockLightRelay.java @@ -36,6 +36,7 @@ import vazkii.botania.common.item.block.ItemBlockWithMetadataAndName; import vazkii.botania.common.lexicon.LexiconData; import vazkii.botania.common.lib.LibBlockNames; +import javax.annotation.Nonnull; import java.util.List; import java.util.Random; @@ -48,11 +49,13 @@ public class BlockLightRelay extends BlockMod implements IWandable, ILexiconable setDefaultState(blockState.getBaseState().withProperty(BotaniaStateProps.LUMINIZER_VARIANT, LuminizerVariant.DEFAULT).withProperty(BotaniaStateProps.POWERED, false)); } + @Nonnull @Override public AxisAlignedBB getBoundingBox(IBlockState state, IBlockAccess world, BlockPos pos) { return AABB; } + @Nonnull @Override public BlockStateContainer createBlockState() { return new BlockStateContainer(this, BotaniaStateProps.LUMINIZER_VARIANT, BotaniaStateProps.POWERED); @@ -69,6 +72,7 @@ public class BlockLightRelay extends BlockMod implements IWandable, ILexiconable return meta; } + @Nonnull @Override public IBlockState getStateFromMeta(int meta) { boolean powered = (meta & 8) != 0; @@ -82,7 +86,7 @@ public class BlockLightRelay extends BlockMod implements IWandable, ILexiconable } @Override - public void getSubBlocks(Item item, CreativeTabs tab, List list) { + public void getSubBlocks(@Nonnull Item item, CreativeTabs tab, List list) { for(int i = 0; i < 2; i++) list.add(new ItemStack(item, 1, i)); } @@ -104,7 +108,7 @@ public class BlockLightRelay extends BlockMod implements IWandable, ILexiconable } @Override - public AxisAlignedBB getCollisionBoundingBox(IBlockState state, World p_149668_1_, BlockPos pos) { + public AxisAlignedBB getCollisionBoundingBox(IBlockState state, @Nonnull World p_149668_1_, @Nonnull BlockPos pos) { return null; } @@ -139,6 +143,7 @@ public class BlockLightRelay extends BlockMod implements IWandable, ILexiconable return false; } + @Nonnull @Override public EnumBlockRenderType getRenderType(IBlockState state) { return EnumBlockRenderType.ENTITYBLOCK_ANIMATED; @@ -149,8 +154,9 @@ public class BlockLightRelay extends BlockMod implements IWandable, ILexiconable return true; } + @Nonnull @Override - public TileEntity createTileEntity(World world, IBlockState state) { + public TileEntity createTileEntity(@Nonnull World world, @Nonnull IBlockState state) { return new TileLightRelay(); } diff --git a/src/main/java/vazkii/botania/common/block/BlockLivingrock.java b/src/main/java/vazkii/botania/common/block/BlockLivingrock.java index 4c96cc7c6..5d22668fb 100644 --- a/src/main/java/vazkii/botania/common/block/BlockLivingrock.java +++ b/src/main/java/vazkii/botania/common/block/BlockLivingrock.java @@ -30,6 +30,7 @@ import vazkii.botania.common.item.block.ItemBlockWithMetadataAndName; import vazkii.botania.common.lexicon.LexiconData; import vazkii.botania.common.lib.LibBlockNames; +import javax.annotation.Nonnull; import java.util.List; public class BlockLivingrock extends BlockMod implements ILexiconable { @@ -42,6 +43,7 @@ public class BlockLivingrock extends BlockMod implements ILexiconable { setDefaultState(blockState.getBaseState().withProperty(BotaniaStateProps.LIVINGROCK_VARIANT, LivingRockVariant.DEFAULT)); } + @Nonnull @Override public BlockStateContainer createBlockState() { return new BlockStateContainer(this, BotaniaStateProps.LIVINGROCK_VARIANT); @@ -52,6 +54,7 @@ public class BlockLivingrock extends BlockMod implements ILexiconable { return state.getValue(BotaniaStateProps.LIVINGROCK_VARIANT).ordinal(); } + @Nonnull @Override public IBlockState getStateFromMeta(int meta) { if (meta >= LivingRockVariant.values().length) { @@ -71,13 +74,14 @@ public class BlockLivingrock extends BlockMod implements ILexiconable { } @Override - public void getSubBlocks(Item par1, CreativeTabs par2CreativeTabs, List par3List) { + public void getSubBlocks(@Nonnull Item par1, CreativeTabs par2CreativeTabs, List par3List) { for(int i = 0; i < LivingRockVariant.values().length; i++) par3List.add(new ItemStack(par1, 1, i)); } + @Nonnull @Override - public ItemStack getPickBlock(IBlockState state, RayTraceResult target, World world, BlockPos pos, EntityPlayer player) { + public ItemStack getPickBlock(@Nonnull IBlockState state, RayTraceResult target, @Nonnull World world, @Nonnull BlockPos pos, EntityPlayer player) { return new ItemStack(this, 1, getMetaFromState(state)); } diff --git a/src/main/java/vazkii/botania/common/block/BlockLivingwood.java b/src/main/java/vazkii/botania/common/block/BlockLivingwood.java index b1621987c..a033dd72c 100644 --- a/src/main/java/vazkii/botania/common/block/BlockLivingwood.java +++ b/src/main/java/vazkii/botania/common/block/BlockLivingwood.java @@ -31,6 +31,7 @@ import vazkii.botania.common.item.block.ItemBlockWithMetadataAndName; import vazkii.botania.common.lexicon.LexiconData; import vazkii.botania.common.lib.LibBlockNames; +import javax.annotation.Nonnull; import java.util.List; public class BlockLivingwood extends BlockMod implements ILexiconable { @@ -46,6 +47,7 @@ public class BlockLivingwood extends BlockMod implements ILexiconable { setDefaultState(blockState.getBaseState().withProperty(BotaniaStateProps.LIVINGWOOD_VARIANT, LivingWoodVariant.DEFAULT)); } + @Nonnull @Override public BlockStateContainer createBlockState() { return new BlockStateContainer(this, BotaniaStateProps.LIVINGWOOD_VARIANT); @@ -56,6 +58,7 @@ public class BlockLivingwood extends BlockMod implements ILexiconable { return state.getValue(BotaniaStateProps.LIVINGWOOD_VARIANT).ordinal(); } + @Nonnull @Override public IBlockState getStateFromMeta(int meta) { if (meta >= LivingWoodVariant.values().length) { @@ -75,18 +78,19 @@ public class BlockLivingwood extends BlockMod implements ILexiconable { } @Override - public void getSubBlocks(Item par1, CreativeTabs par2CreativeTabs, List par3List) { + public void getSubBlocks(@Nonnull Item par1, CreativeTabs par2CreativeTabs, List par3List) { for(int i = 0; i < LivingWoodVariant.values().length; i++) par3List.add(new ItemStack(par1, 1, i)); } + @Nonnull @Override - public ItemStack getPickBlock(IBlockState state, RayTraceResult target, World world, BlockPos pos, EntityPlayer player) { + public ItemStack getPickBlock(@Nonnull IBlockState state, RayTraceResult target, @Nonnull World world, @Nonnull BlockPos pos, EntityPlayer player) { return new ItemStack(this, 1, getMetaFromState(state)); } @Override - public int getLightValue(IBlockState state, IBlockAccess world, BlockPos pos) { + public int getLightValue(@Nonnull IBlockState state, IBlockAccess world, @Nonnull BlockPos pos) { if(world.getBlockState(pos).getBlock() != this) return world.getBlockState(pos).getLightValue(world, pos); return state.getValue(BotaniaStateProps.LIVINGWOOD_VARIANT) == LivingWoodVariant.GLIMMERING ? 12 : 0; diff --git a/src/main/java/vazkii/botania/common/block/BlockMod.java b/src/main/java/vazkii/botania/common/block/BlockMod.java index 442e9e876..e3d83c09b 100644 --- a/src/main/java/vazkii/botania/common/block/BlockMod.java +++ b/src/main/java/vazkii/botania/common/block/BlockMod.java @@ -20,6 +20,8 @@ import vazkii.botania.common.item.block.ItemBlockElven; import vazkii.botania.common.item.block.ItemBlockMod; import vazkii.botania.common.lib.LibMisc; +import javax.annotation.Nonnull; + public class BlockMod extends Block { protected int originalLight; @@ -37,6 +39,7 @@ public class BlockMod extends Block { GameRegistry.register(this instanceof IElvenItem ? new ItemBlockElven(this) : new ItemBlockMod(this), getRegistryName()); } + @Nonnull @Override public Block setLightLevel(float p_149715_1_) { originalLight = (int) (p_149715_1_ * 15); diff --git a/src/main/java/vazkii/botania/common/block/BlockModDoubleFlower.java b/src/main/java/vazkii/botania/common/block/BlockModDoubleFlower.java index 0987ae281..bf5073a8c 100644 --- a/src/main/java/vazkii/botania/common/block/BlockModDoubleFlower.java +++ b/src/main/java/vazkii/botania/common/block/BlockModDoubleFlower.java @@ -44,6 +44,7 @@ import vazkii.botania.common.lexicon.LexiconData; import vazkii.botania.common.lib.LibBlockNames; import vazkii.botania.common.lib.LibMisc; +import javax.annotation.Nonnull; import java.util.ArrayList; import java.util.List; import java.util.Random; @@ -66,17 +67,19 @@ public abstract class BlockModDoubleFlower extends BlockDoublePlant implements I setCreativeTab(BotaniaCreativeTab.INSTANCE); } + @Nonnull @Override public abstract BlockStateContainer createBlockState(); @Override public abstract int getMetaFromState(IBlockState state); + @Nonnull @Override public abstract IBlockState getStateFromMeta(int meta); @Override - public Item getItemDropped(IBlockState state, Random rand, int fortune) { + public Item getItemDropped(IBlockState state, @Nonnull Random rand, int fortune) { return null; } @@ -86,12 +89,12 @@ public abstract class BlockModDoubleFlower extends BlockDoublePlant implements I } @Override - public boolean canGrow(World world, BlockPos pos, IBlockState state, boolean fuckifiknow) { + public boolean canGrow(@Nonnull World world, @Nonnull BlockPos pos, IBlockState state, boolean fuckifiknow) { return false; } @Override - public boolean canHarvestBlock(IBlockAccess world, BlockPos pos, EntityPlayer player) { + public boolean canHarvestBlock(IBlockAccess world, @Nonnull BlockPos pos, @Nonnull EntityPlayer player) { return false; } @@ -101,7 +104,7 @@ public abstract class BlockModDoubleFlower extends BlockDoublePlant implements I } @Override - public void onBlockHarvested(World world, BlockPos pos, IBlockState state, EntityPlayer player) { + public void onBlockHarvested(World world, BlockPos pos, IBlockState state, @Nonnull EntityPlayer player) { if(state.getValue(HALF) == BlockDoublePlant.EnumBlockHalf.UPPER) { if(world.getBlockState(pos.down()).getBlock() == this) { if (!player.capabilities.isCreativeMode) { @@ -131,12 +134,13 @@ public abstract class BlockModDoubleFlower extends BlockDoublePlant implements I } @Override - public boolean isShearable(ItemStack item, IBlockAccess world, BlockPos pos) { + public boolean isShearable(ItemStack item, IBlockAccess world, @Nonnull BlockPos pos) { return true; } + @Nonnull @Override - public List onSheared(ItemStack item, IBlockAccess world, BlockPos pos, int fortune) { + public List onSheared(ItemStack item, IBlockAccess world, @Nonnull BlockPos pos, int fortune) { ArrayList ret = new ArrayList<>(); IBlockState state = world.getBlockState(pos); IBlockState stateBelow = world.getBlockState(pos.down()); @@ -152,17 +156,19 @@ public abstract class BlockModDoubleFlower extends BlockDoublePlant implements I return ret; } + @Nonnull @Override - public List getDrops(IBlockAccess world, BlockPos pos, IBlockState state, int fortune) { + public List getDrops(IBlockAccess world, BlockPos pos, @Nonnull IBlockState state, int fortune) { return ImmutableList.of(); } @Override - public void getSubBlocks(Item p_149666_1_, CreativeTabs p_149666_2_, List p_149666_3_) { + public void getSubBlocks(@Nonnull Item p_149666_1_, CreativeTabs p_149666_2_, @Nonnull List p_149666_3_) { for(int i = 0; i < COUNT; ++i) p_149666_3_.add(new ItemStack(p_149666_1_, 1, i)); } + @Nonnull @Override @SideOnly(Side.CLIENT) public Block.EnumOffsetType getOffsetType() @@ -189,8 +195,9 @@ public abstract class BlockModDoubleFlower extends BlockDoublePlant implements I return LexiconData.flowers; } + @Nonnull @Override - public IBlockState getActualState(IBlockState state, IBlockAccess worldIn, BlockPos pos) { + public IBlockState getActualState(IBlockState state, @Nonnull IBlockAccess worldIn, @Nonnull BlockPos pos) { if (state.getValue(HALF) == BlockDoublePlant.EnumBlockHalf.UPPER) { IBlockState iblockstate = worldIn.getBlockState(pos.down()); @@ -203,8 +210,9 @@ public abstract class BlockModDoubleFlower extends BlockDoublePlant implements I return state.withProperty(VARIANT, EnumPlantType.SUNFLOWER).withProperty(FACING, EnumFacing.SOUTH); } + @Nonnull @Override - public ItemStack getPickBlock(IBlockState state, RayTraceResult target, World world, BlockPos pos, EntityPlayer player) { + public ItemStack getPickBlock(@Nonnull IBlockState state, RayTraceResult target, @Nonnull World world, @Nonnull BlockPos pos, EntityPlayer player) { state = state.getBlock().getActualState(state, world, pos); PropertyEnum prop = second ? BotaniaStateProps.DOUBLEFLOWER_VARIANT_2 : BotaniaStateProps.DOUBLEFLOWER_VARIANT_1; return new ItemStack(Item.getItemFromBlock(state.getBlock()), 1, state.getValue(prop).ordinal() - (second ? 8 : 0)); diff --git a/src/main/java/vazkii/botania/common/block/BlockModDoubleFlower1.java b/src/main/java/vazkii/botania/common/block/BlockModDoubleFlower1.java index 2b4b94d2b..17b52f84f 100644 --- a/src/main/java/vazkii/botania/common/block/BlockModDoubleFlower1.java +++ b/src/main/java/vazkii/botania/common/block/BlockModDoubleFlower1.java @@ -7,6 +7,8 @@ import net.minecraft.item.EnumDyeColor; import net.minecraft.util.EnumFacing; import vazkii.botania.api.state.BotaniaStateProps; +import javax.annotation.Nonnull; + // White to Gray public class BlockModDoubleFlower1 extends BlockModDoubleFlower { public BlockModDoubleFlower1() { @@ -18,6 +20,7 @@ public class BlockModDoubleFlower1 extends BlockModDoubleFlower { .withProperty(BotaniaStateProps.DOUBLEFLOWER_VARIANT_1, EnumDyeColor.WHITE)); } + @Nonnull @Override public BlockStateContainer createBlockState() { return new BlockStateContainer(this, FACING, VARIANT, HALF, BotaniaStateProps.DOUBLEFLOWER_VARIANT_1); @@ -32,6 +35,7 @@ public class BlockModDoubleFlower1 extends BlockModDoubleFlower { return meta; } + @Nonnull @Override public IBlockState getStateFromMeta(int meta) { BlockDoublePlant.EnumBlockHalf half = (meta & 8) > 0 ? BlockDoublePlant.EnumBlockHalf.UPPER : BlockDoublePlant.EnumBlockHalf.LOWER; diff --git a/src/main/java/vazkii/botania/common/block/BlockModDoubleFlower2.java b/src/main/java/vazkii/botania/common/block/BlockModDoubleFlower2.java index c824224e6..2b6206e04 100644 --- a/src/main/java/vazkii/botania/common/block/BlockModDoubleFlower2.java +++ b/src/main/java/vazkii/botania/common/block/BlockModDoubleFlower2.java @@ -7,6 +7,8 @@ import net.minecraft.item.EnumDyeColor; import net.minecraft.util.EnumFacing; import vazkii.botania.api.state.BotaniaStateProps; +import javax.annotation.Nonnull; + // Silver to black public class BlockModDoubleFlower2 extends BlockModDoubleFlower { @@ -19,6 +21,7 @@ public class BlockModDoubleFlower2 extends BlockModDoubleFlower { .withProperty(BotaniaStateProps.DOUBLEFLOWER_VARIANT_2, EnumDyeColor.SILVER)); } + @Nonnull @Override public BlockStateContainer createBlockState() { return new BlockStateContainer(this, FACING, VARIANT, HALF, BotaniaStateProps.DOUBLEFLOWER_VARIANT_2); @@ -33,6 +36,7 @@ public class BlockModDoubleFlower2 extends BlockModDoubleFlower { return meta; } + @Nonnull @Override public IBlockState getStateFromMeta(int meta) { BlockDoublePlant.EnumBlockHalf half = (meta & 8) > 0 ? BlockDoublePlant.EnumBlockHalf.UPPER : BlockDoublePlant.EnumBlockHalf.LOWER; diff --git a/src/main/java/vazkii/botania/common/block/BlockModFlower.java b/src/main/java/vazkii/botania/common/block/BlockModFlower.java index 8178c982e..2c1db1c00 100644 --- a/src/main/java/vazkii/botania/common/block/BlockModFlower.java +++ b/src/main/java/vazkii/botania/common/block/BlockModFlower.java @@ -43,6 +43,7 @@ import vazkii.botania.common.lexicon.LexiconData; import vazkii.botania.common.lib.LibBlockNames; import vazkii.botania.common.lib.LibMisc; +import javax.annotation.Nonnull; import java.util.List; import java.util.Random; @@ -71,11 +72,13 @@ public class BlockModFlower extends BlockFlower implements ILexiconable, IPickup GameRegistry.register(new ItemBlockWithMetadataAndName(this), getRegistryName()); } + @Nonnull @Override public AxisAlignedBB getBoundingBox(IBlockState state, IBlockAccess world, BlockPos pos) { return AABB; } + @Nonnull @Override public BlockStateContainer createBlockState() { return new BlockStateContainer(this, getTypeProperty(), BotaniaStateProps.COLOR); @@ -86,6 +89,7 @@ public class BlockModFlower extends BlockFlower implements ILexiconable, IPickup return state.getValue(BotaniaStateProps.COLOR).getMetadata(); } + @Nonnull @Override public IBlockState getStateFromMeta(int meta) { if (meta >= EnumDyeColor.values().length) { @@ -94,11 +98,13 @@ public class BlockModFlower extends BlockFlower implements ILexiconable, IPickup return getDefaultState().withProperty(BotaniaStateProps.COLOR, EnumDyeColor.byMetadata(meta)); } + @Nonnull @Override - public IBlockState getActualState(IBlockState state, IBlockAccess world, BlockPos pos) { + public IBlockState getActualState(@Nonnull IBlockState state, IBlockAccess world, BlockPos pos) { return state.withProperty(type, EnumFlowerType.POPPY); } + @Nonnull @Override public EnumFlowerColor getBlockType() { return EnumFlowerColor.RED; @@ -109,11 +115,12 @@ public class BlockModFlower extends BlockFlower implements ILexiconable, IPickup } @Override - public void getSubBlocks(Item par1, CreativeTabs par2CreativeTabs, List par3List) { + public void getSubBlocks(@Nonnull Item par1, CreativeTabs par2CreativeTabs, @Nonnull List par3List) { for(int i = 0; i < 16; i++) par3List.add(new ItemStack(par1, 1, i)); } + @Nonnull @Override public Block setLightLevel(float p_149715_1_) { originalLight = (int) (p_149715_1_ * 15); @@ -147,17 +154,17 @@ public class BlockModFlower extends BlockFlower implements ILexiconable, IPickup } @Override - public boolean canGrow(World world, BlockPos pos, IBlockState state, boolean fuckifiknow) { + public boolean canGrow(@Nonnull World world, @Nonnull BlockPos pos, @Nonnull IBlockState state, boolean fuckifiknow) { return world.isAirBlock(pos.up()); } @Override - public boolean canUseBonemeal(World world, Random rand, BlockPos pos, IBlockState state) { + public boolean canUseBonemeal(@Nonnull World world, @Nonnull Random rand, @Nonnull BlockPos pos, @Nonnull IBlockState state) { return canGrow(world, pos, state, false); } @Override - public void grow(World world, Random rand, BlockPos pos, IBlockState state) { + public void grow(@Nonnull World world, @Nonnull Random rand, @Nonnull BlockPos pos, @Nonnull IBlockState state) { placeDoubleFlower(world, pos, state.getValue(BotaniaStateProps.COLOR), 1 | 2); } diff --git a/src/main/java/vazkii/botania/common/block/BlockOpenCrate.java b/src/main/java/vazkii/botania/common/block/BlockOpenCrate.java index b33192476..180f0e282 100644 --- a/src/main/java/vazkii/botania/common/block/BlockOpenCrate.java +++ b/src/main/java/vazkii/botania/common/block/BlockOpenCrate.java @@ -44,6 +44,7 @@ import vazkii.botania.common.item.block.ItemBlockWithMetadataAndName; import vazkii.botania.common.lexicon.LexiconData; import vazkii.botania.common.lib.LibBlockNames; +import javax.annotation.Nonnull; import java.util.List; import java.util.Random; @@ -61,6 +62,7 @@ public class BlockOpenCrate extends BlockMod implements ILexiconable, IWandable, random = new Random(); } + @Nonnull @Override public BlockStateContainer createBlockState() { return new BlockStateContainer(this, BotaniaStateProps.CRATE_VARIANT, BotaniaStateProps.CRATE_PATTERN); @@ -71,6 +73,7 @@ public class BlockOpenCrate extends BlockMod implements ILexiconable, IWandable, return state.getValue(BotaniaStateProps.CRATE_VARIANT).ordinal(); } + @Nonnull @Override public IBlockState getStateFromMeta(int meta) { if (meta >= CrateVariant.values().length) { @@ -79,8 +82,9 @@ public class BlockOpenCrate extends BlockMod implements ILexiconable, IWandable, return getDefaultState().withProperty(BotaniaStateProps.CRATE_VARIANT, CrateVariant.values()[meta]); } + @Nonnull @Override - public IBlockState getActualState(IBlockState state, IBlockAccess world, BlockPos pos) { + public IBlockState getActualState(@Nonnull IBlockState state, IBlockAccess world, BlockPos pos) { if (world.getTileEntity(pos) instanceof TileCraftCrate) { TileCraftCrate tile = ((TileCraftCrate) world.getTileEntity(pos)); state = state.withProperty(BotaniaStateProps.CRATE_PATTERN, CratePattern.values()[tile.pattern + 1]); @@ -97,7 +101,7 @@ public class BlockOpenCrate extends BlockMod implements ILexiconable, IWandable, } @Override - public void getSubBlocks(Item par1, CreativeTabs par2CreativeTabs, List par3List) { + public void getSubBlocks(@Nonnull Item par1, CreativeTabs par2CreativeTabs, List par3List) { for(int i = 0; i < CrateVariant.values().length; i++) par3List.add(new ItemStack(par1, 1, i)); } @@ -120,7 +124,7 @@ public class BlockOpenCrate extends BlockMod implements ILexiconable, IWandable, } @Override - public void breakBlock(World par1World, BlockPos pos, IBlockState state) { + public void breakBlock(@Nonnull World par1World, @Nonnull BlockPos pos, @Nonnull IBlockState state) { TileSimpleInventory inv = (TileSimpleInventory) par1World.getTileEntity(pos); if (inv != null) { @@ -162,8 +166,9 @@ public class BlockOpenCrate extends BlockMod implements ILexiconable, IWandable, return true; } + @Nonnull @Override - public TileEntity createTileEntity(World world, IBlockState state) { + public TileEntity createTileEntity(@Nonnull World world, @Nonnull IBlockState state) { return state.getValue(BotaniaStateProps.CRATE_VARIANT) == CrateVariant.OPEN ? new TileOpenCrate() : new TileCraftCrate(); } diff --git a/src/main/java/vazkii/botania/common/block/BlockPistonRelay.java b/src/main/java/vazkii/botania/common/block/BlockPistonRelay.java index 470080636..43f2f85b7 100644 --- a/src/main/java/vazkii/botania/common/block/BlockPistonRelay.java +++ b/src/main/java/vazkii/botania/common/block/BlockPistonRelay.java @@ -46,6 +46,7 @@ import vazkii.botania.api.wand.IWandable; import vazkii.botania.common.lexicon.LexiconData; import vazkii.botania.common.lib.LibBlockNames; +import javax.annotation.Nonnull; import java.util.Collection; import java.util.HashMap; import java.util.HashSet; @@ -76,7 +77,7 @@ public class BlockPistonRelay extends BlockMod implements IWandable, ILexiconabl } @Override - public int quantityDropped(IBlockState state, int fortune, Random random) { + public int quantityDropped(IBlockState state, int fortune, @Nonnull Random random) { return 0; } @@ -86,7 +87,7 @@ public class BlockPistonRelay extends BlockMod implements IWandable, ILexiconabl } @Override - public void breakBlock(World par1World, BlockPos pos, IBlockState state) { + public void breakBlock(@Nonnull World par1World, @Nonnull BlockPos pos, @Nonnull IBlockState state) { if(!par1World.isRemote) mapCoords(par1World.provider.getDimension(), pos, 2); } @@ -156,7 +157,7 @@ public class BlockPistonRelay extends BlockMod implements IWandable, ILexiconabl } @Override - public void readFromNBT(NBTTagCompound nbttagcompound) { + public void readFromNBT(@Nonnull NBTTagCompound nbttagcompound) { ((BlockPistonRelay) (ModBlocks.pistonRelay)).mappedPositions.clear(); Collection tags = nbttagcompound.getKeySet(); @@ -170,8 +171,9 @@ public class BlockPistonRelay extends BlockMod implements IWandable, ILexiconabl } } + @Nonnull @Override - public NBTTagCompound writeToNBT(NBTTagCompound nbttagcompound) { + public NBTTagCompound writeToNBT(@Nonnull NBTTagCompound nbttagcompound) { for(DimWithPos s : ((BlockPistonRelay) (ModBlocks.pistonRelay)).mappedPositions.keySet()) nbttagcompound.setString(s.toString(), ((BlockPistonRelay) (ModBlocks.pistonRelay)).mappedPositions.get(s).toString()); return nbttagcompound; diff --git a/src/main/java/vazkii/botania/common/block/BlockPlatform.java b/src/main/java/vazkii/botania/common/block/BlockPlatform.java index cf7634d1f..402de0c90 100644 --- a/src/main/java/vazkii/botania/common/block/BlockPlatform.java +++ b/src/main/java/vazkii/botania/common/block/BlockPlatform.java @@ -43,6 +43,7 @@ import vazkii.botania.common.item.block.ItemBlockWithMetadataAndName; import vazkii.botania.common.lexicon.LexiconData; import vazkii.botania.common.lib.LibBlockNames; +import javax.annotation.Nonnull; import java.util.List; public class BlockPlatform extends BlockCamo implements ILexiconable, IWandable, IManaCollisionGhost { @@ -59,6 +60,7 @@ public class BlockPlatform extends BlockCamo implements ILexiconable, IWandable, .withProperty(BotaniaStateProps.PLATFORM_VARIANT, PlatformVariant.ABSTRUSE)); } + @Nonnull @Override public BlockStateContainer createBlockState() { return new ExtendedBlockState(this, new IProperty[] { BotaniaStateProps.PLATFORM_VARIANT, }, @@ -70,6 +72,7 @@ public class BlockPlatform extends BlockCamo implements ILexiconable, IWandable, return state.getValue(BotaniaStateProps.PLATFORM_VARIANT).ordinal(); } + @Nonnull @Override public IBlockState getStateFromMeta(int meta) { if (meta > PlatformVariant.values().length) { @@ -78,8 +81,9 @@ public class BlockPlatform extends BlockCamo implements ILexiconable, IWandable, return getDefaultState().withProperty(BotaniaStateProps.PLATFORM_VARIANT, PlatformVariant.values()[meta]); } + @Nonnull @Override - public IBlockState getExtendedState(IBlockState state, IBlockAccess world, BlockPos pos) { + public IBlockState getExtendedState(@Nonnull IBlockState state, IBlockAccess world, BlockPos pos) { state = ((IExtendedBlockState) state).withProperty(BotaniaStateProps.HELD_WORLD, world) .withProperty(BotaniaStateProps.HELD_POS, pos); @@ -92,7 +96,7 @@ public class BlockPlatform extends BlockCamo implements ILexiconable, IWandable, } @Override - public boolean canRenderInLayer(IBlockState state, BlockRenderLayer layer) { + public boolean canRenderInLayer(IBlockState state, @Nonnull BlockRenderLayer layer) { return true; } @@ -108,13 +112,13 @@ public class BlockPlatform extends BlockCamo implements ILexiconable, IWandable, } @Override - public void getSubBlocks(Item par1, CreativeTabs par2CreativeTabs, List par3List) { + public void getSubBlocks(@Nonnull Item par1, CreativeTabs par2CreativeTabs, List par3List) { for(int i = 0; i < PlatformVariant.values().length; i++) par3List.add(new ItemStack(par1, 1, i)); } @Override - public void addCollisionBoxToList(IBlockState state, World par1World, BlockPos pos, AxisAlignedBB par5AxisAlignedBB, List par6List, Entity par7Entity) { + public void addCollisionBoxToList(IBlockState state, @Nonnull World par1World, @Nonnull BlockPos pos, @Nonnull AxisAlignedBB par5AxisAlignedBB, @Nonnull List par6List, Entity par7Entity) { PlatformVariant variant = state.getValue(BotaniaStateProps.PLATFORM_VARIANT); if(variant == PlatformVariant.INFRANGIBLE || variant == PlatformVariant.ABSTRUSE && par7Entity != null && par7Entity.posY > pos.getY() + 0.9 && (!(par7Entity instanceof EntityPlayer) || !par7Entity.isSneaking())) super.addCollisionBoxToList(state, par1World, pos, par5AxisAlignedBB, par6List, par7Entity); @@ -126,8 +130,9 @@ public class BlockPlatform extends BlockCamo implements ILexiconable, IWandable, return variant == PlatformVariant.INFRANGIBLE ? -1F : super.getBlockHardness(state, par1World, pos); } + @Nonnull @Override - public TileEntity createTileEntity(World world, IBlockState state) { + public TileEntity createTileEntity(@Nonnull World world, @Nonnull IBlockState state) { return new TilePlatform(); } diff --git a/src/main/java/vazkii/botania/common/block/BlockPylon.java b/src/main/java/vazkii/botania/common/block/BlockPylon.java index 82cfa82e5..5a8975a82 100644 --- a/src/main/java/vazkii/botania/common/block/BlockPylon.java +++ b/src/main/java/vazkii/botania/common/block/BlockPylon.java @@ -37,6 +37,7 @@ import vazkii.botania.common.item.block.ItemBlockWithMetadataAndName; import vazkii.botania.common.lexicon.LexiconData; import vazkii.botania.common.lib.LibBlockNames; +import javax.annotation.Nonnull; import java.util.List; @Optional.Interface(modid = "Thaumcraft", iface = "thaumcraft.api.crafting.IInfusionStabiliser", striprefs = true) @@ -53,11 +54,13 @@ public class BlockPylon extends BlockMod implements ILexiconable, IInfusionStabi setDefaultState(blockState.getBaseState().withProperty(BotaniaStateProps.PYLON_VARIANT, PylonVariant.MANA)); } + @Nonnull @Override public AxisAlignedBB getBoundingBox(IBlockState state, IBlockAccess world, BlockPos pos) { return AABB; } + @Nonnull @Override public BlockStateContainer createBlockState() { return new BlockStateContainer(this, BotaniaStateProps.PYLON_VARIANT); @@ -68,6 +71,7 @@ public class BlockPylon extends BlockMod implements ILexiconable, IInfusionStabi return state.getValue(BotaniaStateProps.PYLON_VARIANT).ordinal(); } + @Nonnull @Override public IBlockState getStateFromMeta(int meta) { if (meta > PylonVariant.values().length) { @@ -87,7 +91,7 @@ public class BlockPylon extends BlockMod implements ILexiconable, IInfusionStabi } @Override - public void getSubBlocks(Item par1, CreativeTabs par2, List par3) { + public void getSubBlocks(@Nonnull Item par1, CreativeTabs par2, List par3) { for(int i = 0; i < PylonVariant.values().length; i++) par3.add(new ItemStack(par1, 1, i)); } @@ -102,6 +106,7 @@ public class BlockPylon extends BlockMod implements ILexiconable, IInfusionStabi return false; } + @Nonnull @Override public EnumBlockRenderType getRenderType(IBlockState state) { return EnumBlockRenderType.ENTITYBLOCK_ANIMATED; @@ -122,8 +127,9 @@ public class BlockPylon extends BlockMod implements ILexiconable, IInfusionStabi return true; } + @Nonnull @Override - public TileEntity createTileEntity(World world, IBlockState state) { + public TileEntity createTileEntity(@Nonnull World world, @Nonnull IBlockState state) { return new TilePylon(); } diff --git a/src/main/java/vazkii/botania/common/block/BlockRoot.java b/src/main/java/vazkii/botania/common/block/BlockRoot.java index 49a976814..2182b5500 100644 --- a/src/main/java/vazkii/botania/common/block/BlockRoot.java +++ b/src/main/java/vazkii/botania/common/block/BlockRoot.java @@ -25,6 +25,7 @@ import vazkii.botania.common.item.ModItems; import vazkii.botania.common.lexicon.LexiconData; import vazkii.botania.common.lib.LibBlockNames; +import javax.annotation.Nonnull; import java.util.Random; public class BlockRoot extends BlockMod implements ILexiconable { @@ -35,8 +36,9 @@ public class BlockRoot extends BlockMod implements ILexiconable { setSoundType(SoundType.WOOD); } + @Nonnull @Override - public ItemStack getPickBlock(IBlockState state, RayTraceResult target, World world, BlockPos pos, EntityPlayer player) { + public ItemStack getPickBlock(@Nonnull IBlockState state, RayTraceResult target, @Nonnull World world, @Nonnull BlockPos pos, EntityPlayer player) { return new ItemStack(this); } diff --git a/src/main/java/vazkii/botania/common/block/BlockSolidVines.java b/src/main/java/vazkii/botania/common/block/BlockSolidVines.java index 536eb44e9..0c82c362d 100644 --- a/src/main/java/vazkii/botania/common/block/BlockSolidVines.java +++ b/src/main/java/vazkii/botania/common/block/BlockSolidVines.java @@ -29,6 +29,7 @@ import vazkii.botania.common.lexicon.LexiconData; import vazkii.botania.common.lib.LibBlockNames; import vazkii.botania.common.lib.LibMisc; +import javax.annotation.Nonnull; import java.util.Random; public class BlockSolidVines extends BlockVine implements ILexiconable { @@ -47,7 +48,7 @@ public class BlockSolidVines extends BlockVine implements ILexiconable { } @Override - public void updateTick(World p_149674_1_, BlockPos pos, IBlockState state, Random p_149674_5_) { + public void updateTick(World p_149674_1_, @Nonnull BlockPos pos, @Nonnull IBlockState state, @Nonnull Random p_149674_5_) { // NO-OP } @@ -56,8 +57,9 @@ public class BlockSolidVines extends BlockVine implements ILexiconable { return false; } + @Nonnull @Override - public ItemStack getPickBlock(IBlockState state, RayTraceResult target, World world, BlockPos pos, EntityPlayer player) { + public ItemStack getPickBlock(@Nonnull IBlockState state, RayTraceResult target, @Nonnull World world, @Nonnull BlockPos pos, EntityPlayer player) { return new ItemStack(Blocks.VINE); } diff --git a/src/main/java/vazkii/botania/common/block/BlockSparkChanger.java b/src/main/java/vazkii/botania/common/block/BlockSparkChanger.java index beafa1cec..fc368d232 100644 --- a/src/main/java/vazkii/botania/common/block/BlockSparkChanger.java +++ b/src/main/java/vazkii/botania/common/block/BlockSparkChanger.java @@ -35,6 +35,7 @@ import vazkii.botania.common.item.ModItems; import vazkii.botania.common.lexicon.LexiconData; import vazkii.botania.common.lib.LibBlockNames; +import javax.annotation.Nonnull; import java.util.Random; public class BlockSparkChanger extends BlockMod implements ILexiconable { @@ -51,11 +52,13 @@ public class BlockSparkChanger extends BlockMod implements ILexiconable { setDefaultState(blockState.getBaseState().withProperty(BotaniaStateProps.POWERED, true)); } + @Nonnull @Override public AxisAlignedBB getBoundingBox(IBlockState state, IBlockAccess world, BlockPos pos) { return AABB; } + @Nonnull @Override public BlockStateContainer createBlockState() { return new BlockStateContainer(this, BotaniaStateProps.POWERED); @@ -66,6 +69,7 @@ public class BlockSparkChanger extends BlockMod implements ILexiconable { return state.getValue(BotaniaStateProps.POWERED) ? 8 : 0; } + @Nonnull @Override public IBlockState getStateFromMeta(int meta) { return getDefaultState().withProperty(BotaniaStateProps.POWERED, meta == 8); @@ -125,7 +129,7 @@ public class BlockSparkChanger extends BlockMod implements ILexiconable { } @Override - public void breakBlock(World par1World, BlockPos pos, IBlockState state) { + public void breakBlock(@Nonnull World par1World, @Nonnull BlockPos pos, @Nonnull IBlockState state) { TileSimpleInventory inv = (TileSimpleInventory) par1World.getTileEntity(pos); if (inv != null) { @@ -181,8 +185,9 @@ public class BlockSparkChanger extends BlockMod implements ILexiconable { return true; } + @Nonnull @Override - public TileEntity createTileEntity(World world, IBlockState state) { + public TileEntity createTileEntity(@Nonnull World world, @Nonnull IBlockState state) { return new TileSparkChanger(); } diff --git a/src/main/java/vazkii/botania/common/block/BlockSpecialFlower.java b/src/main/java/vazkii/botania/common/block/BlockSpecialFlower.java index d64e8a2e9..8f8dbbff2 100644 --- a/src/main/java/vazkii/botania/common/block/BlockSpecialFlower.java +++ b/src/main/java/vazkii/botania/common/block/BlockSpecialFlower.java @@ -61,6 +61,7 @@ import vazkii.botania.common.item.block.ItemBlockSpecialFlower; import vazkii.botania.common.lib.LibBlockNames; import vazkii.botania.common.lib.LibMisc; +import javax.annotation.Nonnull; import java.util.ArrayList; import java.util.Arrays; import java.util.List; @@ -134,18 +135,21 @@ public class BlockSpecialFlower extends BlockFlower implements ISpecialFlower, I ); } + @Nonnull @Override public AxisAlignedBB getBoundingBox(IBlockState state, IBlockAccess world, BlockPos pos) { return AABB; } + @Nonnull @Override public BlockStateContainer createBlockState() { return new ExtendedBlockState(this, new IProperty[] { getTypeProperty(), BotaniaStateProps.COLOR }, new IUnlistedProperty[] { BotaniaStateProps.SUBTILE_ID } ); } + @Nonnull @Override - public IExtendedBlockState getExtendedState(IBlockState state, IBlockAccess world, BlockPos pos) { + public IExtendedBlockState getExtendedState(@Nonnull IBlockState state, IBlockAccess world, BlockPos pos) { TileEntity te = world.getTileEntity(pos); if (te instanceof TileSpecialFlower && ((TileSpecialFlower) te).getSubTile() != null) { Class clazz = ((TileSpecialFlower) te).getSubTile().getClass(); @@ -161,6 +165,7 @@ public class BlockSpecialFlower extends BlockFlower implements ISpecialFlower, I return state.getValue(BotaniaStateProps.COLOR).getMetadata(); } + @Nonnull @Override public IBlockState getStateFromMeta(int meta) { if (meta > 15) { @@ -170,7 +175,7 @@ public class BlockSpecialFlower extends BlockFlower implements ISpecialFlower, I } @Override - public int getLightValue(IBlockState state, IBlockAccess world, BlockPos pos) { + public int getLightValue(@Nonnull IBlockState state, IBlockAccess world, @Nonnull BlockPos pos) { if(world.getBlockState(pos).getBlock() != this) return world.getBlockState(pos).getLightValue(world, pos); @@ -205,13 +210,14 @@ public class BlockSpecialFlower extends BlockFlower implements ISpecialFlower, I return true; } + @Nonnull @Override public BlockRenderLayer getBlockLayer() { return BlockRenderLayer.CUTOUT; } @Override - public void getSubBlocks(Item par1, CreativeTabs par2CreativeTabs, List par3List) { + public void getSubBlocks(@Nonnull Item par1, CreativeTabs par2CreativeTabs, @Nonnull List par3List) { for(String s : BotaniaAPI.subtilesForCreativeMenu) { par3List.add(ItemBlockSpecialFlower.ofType(s)); if(BotaniaAPI.miniFlowers.containsKey(s)) @@ -219,13 +225,15 @@ public class BlockSpecialFlower extends BlockFlower implements ISpecialFlower, I } } + @Nonnull @Override public EnumFlowerColor getBlockType() { return EnumFlowerColor.RED; } + @Nonnull @Override - public ItemStack getPickBlock(IBlockState state, RayTraceResult target, World world, BlockPos pos, EntityPlayer player) { + public ItemStack getPickBlock(@Nonnull IBlockState state, RayTraceResult target, @Nonnull World world, @Nonnull BlockPos pos, EntityPlayer player) { String name = ((TileSpecialFlower) world.getTileEntity(pos)).subTileName; return ItemBlockSpecialFlower.ofType(name); } @@ -241,7 +249,7 @@ public class BlockSpecialFlower extends BlockFlower implements ISpecialFlower, I } @Override - public boolean removedByPlayer(IBlockState state, World world, BlockPos pos, EntityPlayer player, boolean willHarvest) { + public boolean removedByPlayer(@Nonnull IBlockState state, World world, @Nonnull BlockPos pos, @Nonnull EntityPlayer player, boolean willHarvest) { if (willHarvest) { // Copy of super.removedByPlayer but don't set to air yet // This is so getDrops below will have a TE to work with @@ -253,14 +261,15 @@ public class BlockSpecialFlower extends BlockFlower implements ISpecialFlower, I } @Override - public void harvestBlock(World world, EntityPlayer player, BlockPos pos, IBlockState state, TileEntity te, ItemStack stack) { + public void harvestBlock(@Nonnull World world, EntityPlayer player, @Nonnull BlockPos pos, @Nonnull IBlockState state, TileEntity te, ItemStack stack) { super.harvestBlock(world, player, pos, state, te, stack); // Now delete the block and TE world.setBlockToAir(pos); } + @Nonnull @Override - public List getDrops(IBlockAccess world, BlockPos pos, IBlockState state, int fortune) { + public List getDrops(IBlockAccess world, BlockPos pos, @Nonnull IBlockState state, int fortune) { ArrayList list = new ArrayList<>(); TileEntity tile = world.getTileEntity(pos); @@ -285,8 +294,9 @@ public class BlockSpecialFlower extends BlockFlower implements ISpecialFlower, I return true; } + @Nonnull @Override - public TileEntity createTileEntity(World world, IBlockState state) { + public TileEntity createTileEntity(@Nonnull World world, @Nonnull IBlockState state) { return new TileSpecialFlower(); } diff --git a/src/main/java/vazkii/botania/common/block/BlockStorage.java b/src/main/java/vazkii/botania/common/block/BlockStorage.java index 91cf39c3f..df396f409 100644 --- a/src/main/java/vazkii/botania/common/block/BlockStorage.java +++ b/src/main/java/vazkii/botania/common/block/BlockStorage.java @@ -30,6 +30,7 @@ import vazkii.botania.common.item.block.ItemBlockStorage; import vazkii.botania.common.lexicon.LexiconData; import vazkii.botania.common.lib.LibBlockNames; +import javax.annotation.Nonnull; import java.util.List; public class BlockStorage extends BlockMod implements ILexiconable { @@ -42,6 +43,7 @@ public class BlockStorage extends BlockMod implements ILexiconable { setDefaultState(blockState.getBaseState().withProperty(BotaniaStateProps.STORAGE_VARIANT, StorageVariant.MANASTEEL)); } + @Nonnull @Override public BlockStateContainer createBlockState() { return new BlockStateContainer(this, BotaniaStateProps.STORAGE_VARIANT); @@ -52,6 +54,7 @@ public class BlockStorage extends BlockMod implements ILexiconable { return state.getValue(BotaniaStateProps.STORAGE_VARIANT).ordinal(); } + @Nonnull @Override public IBlockState getStateFromMeta(int meta) { if (meta >= StorageVariant.values().length) { @@ -61,7 +64,7 @@ public class BlockStorage extends BlockMod implements ILexiconable { } @Override - public void getSubBlocks(Item par1, CreativeTabs par2, List par3) { + public void getSubBlocks(@Nonnull Item par1, CreativeTabs par2, List par3) { for(int i = 0; i < StorageVariant.values().length; i++) par3.add(new ItemStack(par1, 1, i)); } diff --git a/src/main/java/vazkii/botania/common/block/BlockTeruTeruBozu.java b/src/main/java/vazkii/botania/common/block/BlockTeruTeruBozu.java index 9d44f711e..fb02e2916 100644 --- a/src/main/java/vazkii/botania/common/block/BlockTeruTeruBozu.java +++ b/src/main/java/vazkii/botania/common/block/BlockTeruTeruBozu.java @@ -32,6 +32,8 @@ import vazkii.botania.common.block.tile.TileTeruTeruBozu; import vazkii.botania.common.lexicon.LexiconData; import vazkii.botania.common.lib.LibBlockNames; +import javax.annotation.Nonnull; + public class BlockTeruTeruBozu extends BlockMod implements ILexiconable { private static final AxisAlignedBB AABB = new AxisAlignedBB(0.25, 0.01, 0.25, 0.75, 0.99, 0.75); @@ -40,6 +42,7 @@ public class BlockTeruTeruBozu extends BlockMod implements ILexiconable { super(Material.CLOTH, LibBlockNames.TERU_TERU_BOZU); } + @Nonnull @Override public AxisAlignedBB getBoundingBox(IBlockState state, IBlockAccess world, BlockPos pos) { return AABB; @@ -113,6 +116,7 @@ public class BlockTeruTeruBozu extends BlockMod implements ILexiconable { return false; } + @Nonnull @Override public EnumBlockRenderType getRenderType(IBlockState state) { return EnumBlockRenderType.ENTITYBLOCK_ANIMATED; @@ -123,8 +127,9 @@ public class BlockTeruTeruBozu extends BlockMod implements ILexiconable { return true; } + @Nonnull @Override - public TileEntity createTileEntity(World world, IBlockState state) { + public TileEntity createTileEntity(@Nonnull World world, @Nonnull IBlockState state) { return new TileTeruTeruBozu(); } diff --git a/src/main/java/vazkii/botania/common/block/BlockTinyPlanet.java b/src/main/java/vazkii/botania/common/block/BlockTinyPlanet.java index 5e2063922..8decb0596 100644 --- a/src/main/java/vazkii/botania/common/block/BlockTinyPlanet.java +++ b/src/main/java/vazkii/botania/common/block/BlockTinyPlanet.java @@ -27,6 +27,8 @@ import vazkii.botania.common.block.tile.TileTinyPlanet; import vazkii.botania.common.lexicon.LexiconData; import vazkii.botania.common.lib.LibBlockNames; +import javax.annotation.Nonnull; + public class BlockTinyPlanet extends BlockMod implements ILexiconable, IManaCollisionGhost { private static final AxisAlignedBB AABB = new AxisAlignedBB(3.0/16, 3.0/16, 3.0/16, 13.0/16, 13.0/16, 13.0/16); @@ -38,6 +40,7 @@ public class BlockTinyPlanet extends BlockMod implements ILexiconable, IManaColl setSoundType(SoundType.STONE); } + @Nonnull @Override public AxisAlignedBB getBoundingBox(IBlockState state, IBlockAccess world, BlockPos pos) { return AABB; @@ -58,8 +61,9 @@ public class BlockTinyPlanet extends BlockMod implements ILexiconable, IManaColl return true; } + @Nonnull @Override - public TileEntity createTileEntity(World world, IBlockState state) { + public TileEntity createTileEntity(@Nonnull World world, @Nonnull IBlockState state) { return new TileTinyPlanet(); } diff --git a/src/main/java/vazkii/botania/common/block/corporea/BlockCorporeaBase.java b/src/main/java/vazkii/botania/common/block/corporea/BlockCorporeaBase.java index 4c24792b8..4f3a7c90b 100644 --- a/src/main/java/vazkii/botania/common/block/corporea/BlockCorporeaBase.java +++ b/src/main/java/vazkii/botania/common/block/corporea/BlockCorporeaBase.java @@ -25,6 +25,7 @@ import vazkii.botania.common.achievement.ModAchievements; import vazkii.botania.common.block.BlockMod; import vazkii.botania.common.block.tile.TileSimpleInventory; +import javax.annotation.Nonnull; import java.util.Random; public abstract class BlockCorporeaBase extends BlockMod implements ICraftAchievement { @@ -36,7 +37,7 @@ public abstract class BlockCorporeaBase extends BlockMod implements ICraftAchiev } @Override - public void breakBlock(World par1World, BlockPos pos, IBlockState state) { + public void breakBlock(@Nonnull World par1World, @Nonnull BlockPos pos, @Nonnull IBlockState state) { TileSimpleInventory inv = (TileSimpleInventory) par1World.getTileEntity(pos); if (inv != null) { diff --git a/src/main/java/vazkii/botania/common/block/corporea/BlockCorporeaCrystalCube.java b/src/main/java/vazkii/botania/common/block/corporea/BlockCorporeaCrystalCube.java index ac7700116..2b11bd696 100644 --- a/src/main/java/vazkii/botania/common/block/corporea/BlockCorporeaCrystalCube.java +++ b/src/main/java/vazkii/botania/common/block/corporea/BlockCorporeaCrystalCube.java @@ -34,6 +34,8 @@ import vazkii.botania.common.block.tile.corporea.TileCorporeaCrystalCube; import vazkii.botania.common.lexicon.LexiconData; import vazkii.botania.common.lib.LibBlockNames; +import javax.annotation.Nonnull; + public class BlockCorporeaCrystalCube extends BlockCorporeaBase implements ILexiconable { private static final AxisAlignedBB AABB = new AxisAlignedBB(3.0/16, 0, 3.0/16, 13.0/16, 1, 13.0/16); @@ -45,6 +47,7 @@ public class BlockCorporeaCrystalCube extends BlockCorporeaBase implements ILexi setDefaultState(((IExtendedBlockState) blockState.getBaseState()).withProperty(Properties.AnimationProperty, null).withProperty(Properties.StaticProperty, true)); } + @Nonnull @Override public BlockStateContainer createBlockState() { return new ExtendedBlockState(this, new IProperty[] { Properties.StaticProperty }, new IUnlistedProperty[] { Properties.AnimationProperty } ); @@ -55,13 +58,15 @@ public class BlockCorporeaCrystalCube extends BlockCorporeaBase implements ILexi return 0; } + @Nonnull @Override public IBlockState getStateFromMeta(int meta) { return getDefaultState(); } + @Nonnull @Override - public IBlockState getActualState(IBlockState state, IBlockAccess world, BlockPos pos) { + public IBlockState getActualState(@Nonnull IBlockState state, IBlockAccess world, BlockPos pos) { return state.withProperty(Properties.StaticProperty, true); } @@ -73,6 +78,7 @@ public class BlockCorporeaCrystalCube extends BlockCorporeaBase implements ILexi } } + @Nonnull @Override public AxisAlignedBB getBoundingBox(IBlockState state, IBlockAccess world, BlockPos pos) { return AABB; @@ -98,8 +104,9 @@ public class BlockCorporeaCrystalCube extends BlockCorporeaBase implements ILexi return false; } + @Nonnull @Override - public TileCorporeaBase createTileEntity(World world, IBlockState state) { + public TileCorporeaBase createTileEntity(@Nonnull World world, @Nonnull IBlockState state) { return new TileCorporeaCrystalCube(); } diff --git a/src/main/java/vazkii/botania/common/block/corporea/BlockCorporeaFunnel.java b/src/main/java/vazkii/botania/common/block/corporea/BlockCorporeaFunnel.java index 015df8ed6..351e50827 100644 --- a/src/main/java/vazkii/botania/common/block/corporea/BlockCorporeaFunnel.java +++ b/src/main/java/vazkii/botania/common/block/corporea/BlockCorporeaFunnel.java @@ -27,6 +27,8 @@ import vazkii.botania.common.block.tile.corporea.TileCorporeaFunnel; import vazkii.botania.common.lexicon.LexiconData; import vazkii.botania.common.lib.LibBlockNames; +import javax.annotation.Nonnull; + public class BlockCorporeaFunnel extends BlockCorporeaBase implements ILexiconable { public BlockCorporeaFunnel() { @@ -36,6 +38,7 @@ public class BlockCorporeaFunnel extends BlockCorporeaBase implements ILexiconab setDefaultState(blockState.getBaseState().withProperty(BotaniaStateProps.POWERED, false)); } + @Nonnull @Override public BlockStateContainer createBlockState() { return new BlockStateContainer(this, BotaniaStateProps.POWERED); @@ -46,6 +49,7 @@ public class BlockCorporeaFunnel extends BlockCorporeaBase implements ILexiconab return state.getValue(BotaniaStateProps.POWERED) ? 8 : 0; } + @Nonnull @Override public IBlockState getStateFromMeta(int meta) { return getDefaultState().withProperty(BotaniaStateProps.POWERED, meta == 8); @@ -63,8 +67,9 @@ public class BlockCorporeaFunnel extends BlockCorporeaBase implements ILexiconab world.setBlockState(pos, state.withProperty(BotaniaStateProps.POWERED, false), 4); } + @Nonnull @Override - public TileCorporeaBase createTileEntity(World world, IBlockState state) { + public TileCorporeaBase createTileEntity(@Nonnull World world, @Nonnull IBlockState state) { return new TileCorporeaFunnel(); } diff --git a/src/main/java/vazkii/botania/common/block/corporea/BlockCorporeaIndex.java b/src/main/java/vazkii/botania/common/block/corporea/BlockCorporeaIndex.java index 72ed009ea..fa81e090a 100644 --- a/src/main/java/vazkii/botania/common/block/corporea/BlockCorporeaIndex.java +++ b/src/main/java/vazkii/botania/common/block/corporea/BlockCorporeaIndex.java @@ -35,6 +35,8 @@ import vazkii.botania.common.block.tile.corporea.TileCorporeaIndex; import vazkii.botania.common.lexicon.LexiconData; import vazkii.botania.common.lib.LibBlockNames; +import javax.annotation.Nonnull; + public class BlockCorporeaIndex extends BlockCorporeaBase implements ILexiconable { public BlockCorporeaIndex() { @@ -53,13 +55,15 @@ public class BlockCorporeaIndex extends BlockCorporeaBase implements ILexiconabl return false; } + @Nonnull @Override public EnumBlockRenderType getRenderType(IBlockState state) { return EnumBlockRenderType.ENTITYBLOCK_ANIMATED; } + @Nonnull @Override - public TileCorporeaBase createTileEntity(World world, IBlockState state) { + public TileCorporeaBase createTileEntity(@Nonnull World world, @Nonnull IBlockState state) { return new TileCorporeaIndex(); } diff --git a/src/main/java/vazkii/botania/common/block/corporea/BlockCorporeaInterceptor.java b/src/main/java/vazkii/botania/common/block/corporea/BlockCorporeaInterceptor.java index 36ce6f65b..4de5a9e5e 100644 --- a/src/main/java/vazkii/botania/common/block/corporea/BlockCorporeaInterceptor.java +++ b/src/main/java/vazkii/botania/common/block/corporea/BlockCorporeaInterceptor.java @@ -28,6 +28,7 @@ import vazkii.botania.common.block.tile.corporea.TileCorporeaInterceptor; import vazkii.botania.common.lexicon.LexiconData; import vazkii.botania.common.lib.LibBlockNames; +import javax.annotation.Nonnull; import java.util.Random; public class BlockCorporeaInterceptor extends BlockCorporeaBase implements ILexiconable { @@ -39,6 +40,7 @@ public class BlockCorporeaInterceptor extends BlockCorporeaBase implements ILexi setDefaultState(blockState.getBaseState().withProperty(BotaniaStateProps.POWERED, false)); } + @Nonnull @Override public BlockStateContainer createBlockState() { return new BlockStateContainer(this, BotaniaStateProps.POWERED); @@ -49,6 +51,7 @@ public class BlockCorporeaInterceptor extends BlockCorporeaBase implements ILexi return state.getValue(BotaniaStateProps.POWERED) ? 1 : 0; } + @Nonnull @Override public IBlockState getStateFromMeta(int meta) { return getDefaultState().withProperty(BotaniaStateProps.POWERED, meta == 1); @@ -74,8 +77,9 @@ public class BlockCorporeaInterceptor extends BlockCorporeaBase implements ILexi return 2; } + @Nonnull @Override - public TileCorporeaBase createTileEntity(World world, IBlockState state) { + public TileCorporeaBase createTileEntity(@Nonnull World world, @Nonnull IBlockState state) { return new TileCorporeaInterceptor(); } diff --git a/src/main/java/vazkii/botania/common/block/corporea/BlockCorporeaRetainer.java b/src/main/java/vazkii/botania/common/block/corporea/BlockCorporeaRetainer.java index c9856e8f3..8ac491e67 100644 --- a/src/main/java/vazkii/botania/common/block/corporea/BlockCorporeaRetainer.java +++ b/src/main/java/vazkii/botania/common/block/corporea/BlockCorporeaRetainer.java @@ -32,6 +32,8 @@ import vazkii.botania.common.block.tile.corporea.TileCorporeaRetainer; import vazkii.botania.common.lexicon.LexiconData; import vazkii.botania.common.lib.LibBlockNames; +import javax.annotation.Nonnull; + public class BlockCorporeaRetainer extends BlockMod implements ILexiconable, ICraftAchievement { public BlockCorporeaRetainer() { @@ -41,6 +43,7 @@ public class BlockCorporeaRetainer extends BlockMod implements ILexiconable, ICr setDefaultState(blockState.getBaseState().withProperty(BotaniaStateProps.POWERED, false)); } + @Nonnull @Override public BlockStateContainer createBlockState() { return new BlockStateContainer(this, BotaniaStateProps.POWERED); @@ -51,6 +54,7 @@ public class BlockCorporeaRetainer extends BlockMod implements ILexiconable, ICr return state.getValue(BotaniaStateProps.POWERED) ? 8 : 0; } + @Nonnull @Override public IBlockState getStateFromMeta(int meta) { return getDefaultState().withProperty(BotaniaStateProps.POWERED, meta == 8); @@ -83,8 +87,9 @@ public class BlockCorporeaRetainer extends BlockMod implements ILexiconable, ICr return true; } + @Nonnull @Override - public TileEntity createTileEntity(World world, IBlockState state) { + public TileEntity createTileEntity(@Nonnull World world, @Nonnull IBlockState state) { return new TileCorporeaRetainer(); } diff --git a/src/main/java/vazkii/botania/common/block/decor/Block18Stone.java b/src/main/java/vazkii/botania/common/block/decor/Block18Stone.java index fce6084bc..e3d0c3286 100644 --- a/src/main/java/vazkii/botania/common/block/decor/Block18Stone.java +++ b/src/main/java/vazkii/botania/common/block/decor/Block18Stone.java @@ -31,6 +31,7 @@ import vazkii.botania.common.item.block.ItemBlockWithMetadataAndName; import vazkii.botania.common.lexicon.LexiconData; import vazkii.botania.common.lib.LibBlockNames; +import javax.annotation.Nonnull; import java.util.List; public class Block18Stone extends BlockMod implements ILexiconable { @@ -43,6 +44,7 @@ public class Block18Stone extends BlockMod implements ILexiconable { setDefaultState(blockState.getBaseState().withProperty(BotaniaStateProps.FUTURESTONE_VARIANT, FutureStoneVariant.ANDESITE)); } + @Nonnull @Override public BlockStateContainer createBlockState() { return new BlockStateContainer(this, BotaniaStateProps.FUTURESTONE_VARIANT); @@ -53,6 +55,7 @@ public class Block18Stone extends BlockMod implements ILexiconable { return state.getValue(BotaniaStateProps.FUTURESTONE_VARIANT).ordinal(); } + @Nonnull @Override public IBlockState getStateFromMeta(int meta) { if (meta >= FutureStoneVariant.values().length) { @@ -62,7 +65,7 @@ public class Block18Stone extends BlockMod implements ILexiconable { } @Override - public void getSubBlocks(Item item, CreativeTabs tab, List list) { + public void getSubBlocks(@Nonnull Item item, CreativeTabs tab, List list) { for(int i = 0; i < 16; i++) list.add(new ItemStack(item, 1, i)); } @@ -77,8 +80,9 @@ public class Block18Stone extends BlockMod implements ILexiconable { GameRegistry.register(new ItemBlockWithMetadataAndName(this), getRegistryName()); } + @Nonnull @Override - public ItemStack getPickBlock(IBlockState state, RayTraceResult target, World world, BlockPos pos, EntityPlayer player) { + public ItemStack getPickBlock(@Nonnull IBlockState state, RayTraceResult target, @Nonnull World world, @Nonnull BlockPos pos, EntityPlayer player) { return new ItemStack(this, 1, getMetaFromState(world.getBlockState(pos))); } diff --git a/src/main/java/vazkii/botania/common/block/decor/BlockBuriedPetals.java b/src/main/java/vazkii/botania/common/block/decor/BlockBuriedPetals.java index d69532f27..73ecac89a 100644 --- a/src/main/java/vazkii/botania/common/block/decor/BlockBuriedPetals.java +++ b/src/main/java/vazkii/botania/common/block/decor/BlockBuriedPetals.java @@ -26,6 +26,7 @@ import vazkii.botania.common.integration.coloredlights.ColoredLightHelper; import vazkii.botania.common.item.ModItems; import vazkii.botania.common.lib.LibBlockNames; +import javax.annotation.Nonnull; import java.util.Random; public class BlockBuriedPetals extends BlockModFlower { @@ -37,6 +38,7 @@ public class BlockBuriedPetals extends BlockModFlower { setLightLevel(0.25F); } + @Nonnull @Override public AxisAlignedBB getBoundingBox(IBlockState state, IBlockAccess world, BlockPos pos) { return AABB; @@ -44,7 +46,7 @@ public class BlockBuriedPetals extends BlockModFlower { @Override @Optional.Method(modid = "easycoloredlights") - public int getLightValue(IBlockState state, IBlockAccess world, BlockPos pos) { + public int getLightValue(@Nonnull IBlockState state, IBlockAccess world, @Nonnull BlockPos pos) { if(world.getBlockState(pos).getBlock() != this) return world.getBlockState(pos).getLightValue(world, pos); return ColoredLightHelper.getPackedColor(world.getBlockState(pos).getValue(BotaniaStateProps.COLOR), originalLight); @@ -77,6 +79,7 @@ public class BlockBuriedPetals extends BlockModFlower { @Override public void registerItemForm() {} + @Nonnull @Override public EnumBlockRenderType getRenderType(IBlockState state) { return EnumBlockRenderType.INVISIBLE; diff --git a/src/main/java/vazkii/botania/common/block/decor/BlockCustomBrick.java b/src/main/java/vazkii/botania/common/block/decor/BlockCustomBrick.java index 5ecab220a..2ea986598 100644 --- a/src/main/java/vazkii/botania/common/block/decor/BlockCustomBrick.java +++ b/src/main/java/vazkii/botania/common/block/decor/BlockCustomBrick.java @@ -31,6 +31,7 @@ import vazkii.botania.common.item.block.ItemBlockWithMetadataAndName; import vazkii.botania.common.lexicon.LexiconData; import vazkii.botania.common.lib.LibBlockNames; +import javax.annotation.Nonnull; import java.util.List; public class BlockCustomBrick extends BlockMod implements ILexiconable { @@ -43,6 +44,7 @@ public class BlockCustomBrick extends BlockMod implements ILexiconable { setDefaultState(blockState.getBaseState().withProperty(BotaniaStateProps.CUSTOMBRICK_VARIANT, CustomBrickVariant.HELLISH_BRICK)); } + @Nonnull @Override public BlockStateContainer createBlockState() { return new BlockStateContainer(this, BotaniaStateProps.CUSTOMBRICK_VARIANT); @@ -53,6 +55,7 @@ public class BlockCustomBrick extends BlockMod implements ILexiconable { return state.getValue(BotaniaStateProps.CUSTOMBRICK_VARIANT).ordinal(); } + @Nonnull @Override public IBlockState getStateFromMeta(int meta) { if (meta >= CustomBrickVariant.values().length) { @@ -72,13 +75,14 @@ public class BlockCustomBrick extends BlockMod implements ILexiconable { } @Override - public void getSubBlocks(Item par1, CreativeTabs par2CreativeTabs, List par3List) { + public void getSubBlocks(@Nonnull Item par1, CreativeTabs par2CreativeTabs, List par3List) { for(int i = 0; i < CustomBrickVariant.values().length; i++) par3List.add(new ItemStack(par1, 1, i)); } + @Nonnull @Override - public ItemStack getPickBlock(IBlockState state, RayTraceResult target, World world, BlockPos pos, EntityPlayer player) { + public ItemStack getPickBlock(@Nonnull IBlockState state, RayTraceResult target, @Nonnull World world, @Nonnull BlockPos pos, EntityPlayer player) { return new ItemStack(this, 1, getMetaFromState(world.getBlockState(pos))); } diff --git a/src/main/java/vazkii/botania/common/block/decor/BlockDirtPath.java b/src/main/java/vazkii/botania/common/block/decor/BlockDirtPath.java index 1a01b2b50..64b843dc5 100644 --- a/src/main/java/vazkii/botania/common/block/decor/BlockDirtPath.java +++ b/src/main/java/vazkii/botania/common/block/decor/BlockDirtPath.java @@ -38,6 +38,7 @@ import vazkii.botania.common.block.BlockMod; import vazkii.botania.common.lexicon.LexiconData; import vazkii.botania.common.lib.LibBlockNames; +import javax.annotation.Nonnull; import java.util.UUID; public class BlockDirtPath extends BlockMod implements ILexiconable { @@ -56,7 +57,7 @@ public class BlockDirtPath extends BlockMod implements ILexiconable { } @Override - public boolean isToolEffective(String type, IBlockState state) { + public boolean isToolEffective(String type, @Nonnull IBlockState state) { return type.equals("shovel"); } @@ -71,6 +72,7 @@ public class BlockDirtPath extends BlockMod implements ILexiconable { } } + @Nonnull @Override public AxisAlignedBB getBoundingBox(IBlockState state, IBlockAccess world, BlockPos pos) { IBlockState stateAbove = world.getBlockState(pos.up()); @@ -81,12 +83,12 @@ public class BlockDirtPath extends BlockMod implements ILexiconable { } @Override - public boolean isSideSolid(IBlockState state, IBlockAccess world, BlockPos pos, EnumFacing side) { + public boolean isSideSolid(IBlockState state, @Nonnull IBlockAccess world, @Nonnull BlockPos pos, EnumFacing side) { return side == EnumFacing.DOWN; } @Override - public AxisAlignedBB getCollisionBoundingBox(IBlockState state, World world, BlockPos pos) { + public AxisAlignedBB getCollisionBoundingBox(IBlockState state, @Nonnull World world, @Nonnull BlockPos pos) { return FULL_BLOCK_AABB; } @@ -101,7 +103,7 @@ public class BlockDirtPath extends BlockMod implements ILexiconable { } @Override - public boolean canSustainPlant(IBlockState state, IBlockAccess world, BlockPos pos, EnumFacing direction, IPlantable plantable) { + public boolean canSustainPlant(@Nonnull IBlockState state, @Nonnull IBlockAccess world, BlockPos pos, @Nonnull EnumFacing direction, IPlantable plantable) { return plantable.getPlantType(world, pos.down()) == EnumPlantType.Plains; } diff --git a/src/main/java/vazkii/botania/common/block/decor/BlockEndStoneBrick.java b/src/main/java/vazkii/botania/common/block/decor/BlockEndStoneBrick.java index 4692f3612..36384413a 100644 --- a/src/main/java/vazkii/botania/common/block/decor/BlockEndStoneBrick.java +++ b/src/main/java/vazkii/botania/common/block/decor/BlockEndStoneBrick.java @@ -31,6 +31,7 @@ import vazkii.botania.common.item.block.ItemBlockWithMetadataAndName; import vazkii.botania.common.lexicon.LexiconData; import vazkii.botania.common.lib.LibBlockNames; +import javax.annotation.Nonnull; import java.util.List; public class BlockEndStoneBrick extends BlockMod implements ILexiconable { @@ -43,6 +44,7 @@ public class BlockEndStoneBrick extends BlockMod implements ILexiconable { setDefaultState(blockState.getBaseState().withProperty(BotaniaStateProps.ENDBRICK_VARIANT, EndBrickVariant.END_STONE_BRICKS)); } + @Nonnull @Override public BlockStateContainer createBlockState() { return new BlockStateContainer(this, BotaniaStateProps.ENDBRICK_VARIANT); @@ -53,6 +55,7 @@ public class BlockEndStoneBrick extends BlockMod implements ILexiconable { return state.getValue(BotaniaStateProps.ENDBRICK_VARIANT).ordinal(); } + @Nonnull @Override public IBlockState getStateFromMeta(int meta) { if (meta >= EndBrickVariant.values().length) { @@ -62,7 +65,7 @@ public class BlockEndStoneBrick extends BlockMod implements ILexiconable { } @Override - public void getSubBlocks(Item item, CreativeTabs tab, List list) { + public void getSubBlocks(@Nonnull Item item, CreativeTabs tab, List list) { for(int i = 0; i < EndBrickVariant.values().length; i++) list.add(new ItemStack(item, 1, i)); } @@ -77,8 +80,9 @@ public class BlockEndStoneBrick extends BlockMod implements ILexiconable { GameRegistry.register(new ItemBlockWithMetadataAndName(this), getRegistryName()); } + @Nonnull @Override - public ItemStack getPickBlock(IBlockState state, RayTraceResult target, World world, BlockPos pos, EntityPlayer player) { + public ItemStack getPickBlock(@Nonnull IBlockState state, RayTraceResult target, @Nonnull World world, @Nonnull BlockPos pos, EntityPlayer player) { return new ItemStack(this, 1, getMetaFromState(world.getBlockState(pos))); } diff --git a/src/main/java/vazkii/botania/common/block/decor/BlockFloatingFlower.java b/src/main/java/vazkii/botania/common/block/decor/BlockFloatingFlower.java index cb0082dce..ce738363f 100644 --- a/src/main/java/vazkii/botania/common/block/decor/BlockFloatingFlower.java +++ b/src/main/java/vazkii/botania/common/block/decor/BlockFloatingFlower.java @@ -61,6 +61,7 @@ import vazkii.botania.common.item.block.ItemBlockWithMetadataAndName; import vazkii.botania.common.lexicon.LexiconData; import vazkii.botania.common.lib.LibBlockNames; +import javax.annotation.Nonnull; import java.util.List; import java.util.Random; @@ -84,16 +85,19 @@ public class BlockFloatingFlower extends BlockMod implements ILexiconable, IInfu .withProperty(BotaniaStateProps.COLOR, EnumDyeColor.WHITE)); } + @Nonnull @Override public AxisAlignedBB getBoundingBox(IBlockState state, IBlockAccess world, BlockPos pos) { return AABB; } + @Nonnull @Override public EnumBlockRenderType getRenderType(IBlockState state) { return EnumBlockRenderType.ENTITYBLOCK_ANIMATED; } + @Nonnull @Override public BlockStateContainer createBlockState() { return new ExtendedBlockState(this, new IProperty[] { BotaniaStateProps.COLOR }, new IUnlistedProperty[] { BotaniaStateProps.ISLAND_TYPE }); @@ -104,6 +108,7 @@ public class BlockFloatingFlower extends BlockMod implements ILexiconable, IInfu return state.getValue(BotaniaStateProps.COLOR).getMetadata(); } + @Nonnull @Override public IBlockState getStateFromMeta(int meta) { if (meta >= EnumDyeColor.values().length) { @@ -112,8 +117,9 @@ public class BlockFloatingFlower extends BlockMod implements ILexiconable, IInfu return getDefaultState().withProperty(BotaniaStateProps.COLOR, EnumDyeColor.byMetadata(meta)); } + @Nonnull @Override - public IBlockState getExtendedState(IBlockState state, IBlockAccess world, BlockPos pos) { + public IBlockState getExtendedState(@Nonnull IBlockState state, IBlockAccess world, BlockPos pos) { state = getActualState(state, world, pos); TileEntity te = world.getTileEntity(pos); if (te instanceof TileFloatingFlower) { @@ -160,7 +166,7 @@ public class BlockFloatingFlower extends BlockMod implements ILexiconable, IInfu @Override @Optional.Method(modid = "easycoloredlights") - public int getLightValue(IBlockState state, IBlockAccess world, BlockPos pos) { + public int getLightValue(@Nonnull IBlockState state, IBlockAccess world, @Nonnull BlockPos pos) { if(world.getBlockState(pos).getBlock() != this) return world.getBlockState(pos).getLightValue(world, pos); return ColoredLightHelper.getPackedColor(world.getBlockState(pos).getValue(BotaniaStateProps.COLOR), originalLight); @@ -183,7 +189,7 @@ public class BlockFloatingFlower extends BlockMod implements ILexiconable, IInfu } @Override - public void getSubBlocks(Item par1, CreativeTabs par2, List par3) { + public void getSubBlocks(@Nonnull Item par1, CreativeTabs par2, List par3) { for(int i = 0; i < 16; i++) par3.add(new ItemStack(par1, 1, i)); } @@ -235,8 +241,9 @@ public class BlockFloatingFlower extends BlockMod implements ILexiconable, IInfu return true; } + @Nonnull @Override - public TileEntity createTileEntity(World world, IBlockState state) { + public TileEntity createTileEntity(@Nonnull World world, @Nonnull IBlockState state) { return new TileFloatingFlower(); } diff --git a/src/main/java/vazkii/botania/common/block/decor/BlockManaBeacon.java b/src/main/java/vazkii/botania/common/block/decor/BlockManaBeacon.java index c6766a540..af71c67c8 100644 --- a/src/main/java/vazkii/botania/common/block/decor/BlockManaBeacon.java +++ b/src/main/java/vazkii/botania/common/block/decor/BlockManaBeacon.java @@ -34,6 +34,7 @@ import vazkii.botania.common.item.block.ItemBlockWithMetaNameAndColor; import vazkii.botania.common.lexicon.LexiconData; import vazkii.botania.common.lib.LibBlockNames; +import javax.annotation.Nonnull; import java.util.List; public class BlockManaBeacon extends BlockMod implements ILexiconable { @@ -48,6 +49,7 @@ public class BlockManaBeacon extends BlockMod implements ILexiconable { setDefaultState(blockState.getBaseState().withProperty(BotaniaStateProps.COLOR, EnumDyeColor.WHITE)); } + @Nonnull @Override public BlockStateContainer createBlockState() { return new BlockStateContainer(this, BotaniaStateProps.COLOR); @@ -58,6 +60,7 @@ public class BlockManaBeacon extends BlockMod implements ILexiconable { return state.getValue(BotaniaStateProps.COLOR).getMetadata(); } + @Nonnull @Override public IBlockState getStateFromMeta(int meta) { if (meta >= EnumDyeColor.values().length) { @@ -66,13 +69,14 @@ public class BlockManaBeacon extends BlockMod implements ILexiconable { return getDefaultState().withProperty(BotaniaStateProps.COLOR, EnumDyeColor.byMetadata(meta)); } + @Nonnull @Override public AxisAlignedBB getBoundingBox(IBlockState state, IBlockAccess world, BlockPos pos) { return AABB; } @Override - public void getSubBlocks(Item par1, CreativeTabs par2CreativeTabs, List par3List) { + public void getSubBlocks(@Nonnull Item par1, CreativeTabs par2CreativeTabs, List par3List) { for(int i = 0; i < 16; i++) par3List.add(new ItemStack(par1, 1, i)); } @@ -107,8 +111,9 @@ public class BlockManaBeacon extends BlockMod implements ILexiconable { return true; } + @Nonnull @Override - public TileEntity createTileEntity(World world, IBlockState state) { + public TileEntity createTileEntity(@Nonnull World world, @Nonnull IBlockState state) { return new TileManaBeacon(); } } diff --git a/src/main/java/vazkii/botania/common/block/decor/BlockManaFlame.java b/src/main/java/vazkii/botania/common/block/decor/BlockManaFlame.java index 8240ada6a..8dbc34b52 100644 --- a/src/main/java/vazkii/botania/common/block/decor/BlockManaFlame.java +++ b/src/main/java/vazkii/botania/common/block/decor/BlockManaFlame.java @@ -36,6 +36,7 @@ import vazkii.botania.common.lexicon.LexiconData; import vazkii.botania.common.lib.LibBlockNames; import vazkii.botania.common.world.WorldTypeSkyblock; +import javax.annotation.Nonnull; import java.util.List; public class BlockManaFlame extends BlockMod implements ILexiconable { @@ -48,6 +49,7 @@ public class BlockManaFlame extends BlockMod implements ILexiconable { setLightLevel(1F); } + @Nonnull @Override public AxisAlignedBB getBoundingBox(IBlockState state, IBlockAccess world, BlockPos pos) { return AABB; @@ -60,12 +62,13 @@ public class BlockManaFlame extends BlockMod implements ILexiconable { @Override @Optional.Method(modid = "easycoloredlights") - public int getLightValue(IBlockState state, IBlockAccess world, BlockPos pos) { + public int getLightValue(@Nonnull IBlockState state, IBlockAccess world, @Nonnull BlockPos pos) { if(world.getBlockState(pos).getBlock() != this) return world.getBlockState(pos).getLightValue(world, pos); return ((TileManaFlame) world.getTileEntity(pos)).getLightColor(); } + @Nonnull @Override public EnumBlockRenderType getRenderType(IBlockState state) { return EnumBlockRenderType.INVISIBLE; @@ -87,7 +90,7 @@ public class BlockManaFlame extends BlockMod implements ILexiconable { } @Override - public AxisAlignedBB getCollisionBoundingBox(IBlockState state, World world, BlockPos pos) { + public AxisAlignedBB getCollisionBoundingBox(IBlockState state, @Nonnull World world, @Nonnull BlockPos pos) { return null; } @@ -106,8 +109,9 @@ public class BlockManaFlame extends BlockMod implements ILexiconable { return false; } + @Nonnull @Override - public List getDrops(IBlockAccess world, BlockPos pos, IBlockState state, int fortune) { + public List getDrops(IBlockAccess world, BlockPos pos, @Nonnull IBlockState state, int fortune) { return ImmutableList.of(); } @@ -116,8 +120,9 @@ public class BlockManaFlame extends BlockMod implements ILexiconable { return true; } + @Nonnull @Override - public TileEntity createTileEntity(World world, IBlockState state) { + public TileEntity createTileEntity(@Nonnull World world, @Nonnull IBlockState state) { return new TileManaFlame(); } diff --git a/src/main/java/vazkii/botania/common/block/decor/BlockManaGlass.java b/src/main/java/vazkii/botania/common/block/decor/BlockManaGlass.java index 4622ba2d6..66cba1f49 100644 --- a/src/main/java/vazkii/botania/common/block/decor/BlockManaGlass.java +++ b/src/main/java/vazkii/botania/common/block/decor/BlockManaGlass.java @@ -27,6 +27,8 @@ import vazkii.botania.common.block.BlockMod; import vazkii.botania.common.lexicon.LexiconData; import vazkii.botania.common.lib.LibBlockNames; +import javax.annotation.Nonnull; + public class BlockManaGlass extends BlockMod implements ILexiconable { public BlockManaGlass() { @@ -46,11 +48,12 @@ public class BlockManaGlass extends BlockMod implements ILexiconable { } @Override - public boolean shouldSideBeRendered(IBlockState state, IBlockAccess world, BlockPos pos, EnumFacing side) { + public boolean shouldSideBeRendered(IBlockState state, @Nonnull IBlockAccess world, @Nonnull BlockPos pos, EnumFacing side) { Block block = world.getBlockState(pos.offset(side)).getBlock(); return block == this ? false : super.shouldSideBeRendered(state, world, pos, side); } + @Nonnull @Override public BlockRenderLayer getBlockLayer() { return BlockRenderLayer.TRANSLUCENT; diff --git a/src/main/java/vazkii/botania/common/block/decor/BlockModMushroom.java b/src/main/java/vazkii/botania/common/block/decor/BlockModMushroom.java index 9f574d2ef..9dd6e974b 100644 --- a/src/main/java/vazkii/botania/common/block/decor/BlockModMushroom.java +++ b/src/main/java/vazkii/botania/common/block/decor/BlockModMushroom.java @@ -44,6 +44,7 @@ import vazkii.botania.common.lexicon.LexiconData; import vazkii.botania.common.lib.LibBlockNames; import vazkii.botania.common.lib.LibMisc; +import javax.annotation.Nonnull; import java.util.List; import java.util.Random; @@ -65,6 +66,7 @@ public class BlockModMushroom extends BlockMushroom implements IInfusionStabilis setDefaultState(blockState.getBaseState().withProperty(BotaniaStateProps.COLOR, EnumDyeColor.WHITE)); } + @Nonnull @Override public BlockStateContainer createBlockState() { return new BlockStateContainer(this, BotaniaStateProps.COLOR); @@ -75,6 +77,7 @@ public class BlockModMushroom extends BlockMushroom implements IInfusionStabilis return state.getValue(BotaniaStateProps.COLOR).getMetadata(); } + @Nonnull @Override public IBlockState getStateFromMeta(int meta) { if (meta >= EnumDyeColor.values().length) { @@ -83,13 +86,14 @@ public class BlockModMushroom extends BlockMushroom implements IInfusionStabilis return getDefaultState().withProperty(BotaniaStateProps.COLOR, EnumDyeColor.byMetadata(meta)); } + @Nonnull @Override public AxisAlignedBB getBoundingBox(IBlockState state, IBlockAccess world, BlockPos pos) { return AABB; } @Override - public void updateTick(World p_149674_1_, BlockPos pos, IBlockState state, Random p_149674_5_) { + public void updateTick(@Nonnull World p_149674_1_, @Nonnull BlockPos pos, IBlockState state, Random p_149674_5_) { // NO-OP, to prevent spreading } @@ -105,11 +109,12 @@ public class BlockModMushroom extends BlockMushroom implements IInfusionStabilis } @Override - public void getSubBlocks(Item par1, CreativeTabs par2CreativeTabs, List par3List) { + public void getSubBlocks(@Nonnull Item par1, CreativeTabs par2CreativeTabs, List par3List) { for(int i = 0; i < 16; i++) par3List.add(new ItemStack(par1, 1, i)); } + @Nonnull @Override public Block setLightLevel(float p_149715_1_) { originalLight = (int) (p_149715_1_ * 15); @@ -118,7 +123,7 @@ public class BlockModMushroom extends BlockMushroom implements IInfusionStabilis @Override @Optional.Method(modid = "easycoloredlights") - public int getLightValue(IBlockState state, IBlockAccess world, BlockPos pos) { + public int getLightValue(@Nonnull IBlockState state, IBlockAccess world, @Nonnull BlockPos pos) { if(world.getBlockState(pos).getBlock() != this) return world.getBlockState(pos).getLightValue(world, pos); diff --git a/src/main/java/vazkii/botania/common/block/decor/BlockPavement.java b/src/main/java/vazkii/botania/common/block/decor/BlockPavement.java index 86c6883af..6b9585866 100644 --- a/src/main/java/vazkii/botania/common/block/decor/BlockPavement.java +++ b/src/main/java/vazkii/botania/common/block/decor/BlockPavement.java @@ -28,6 +28,7 @@ import vazkii.botania.common.block.BlockMod; import vazkii.botania.common.item.block.ItemBlockWithMetadataAndName; import vazkii.botania.common.lib.LibBlockNames; +import javax.annotation.Nonnull; import java.util.List; public class BlockPavement extends BlockMod { @@ -42,6 +43,7 @@ public class BlockPavement extends BlockMod { setDefaultState(blockState.getBaseState().withProperty(BotaniaStateProps.PAVEMENT_COLOR, EnumDyeColor.WHITE)); } + @Nonnull @Override public BlockStateContainer createBlockState() { return new BlockStateContainer(this, BotaniaStateProps.PAVEMENT_COLOR); @@ -60,6 +62,7 @@ public class BlockPavement extends BlockMod { } } + @Nonnull @Override public IBlockState getStateFromMeta(int meta) { if (meta >= TYPES) { @@ -90,13 +93,14 @@ public class BlockPavement extends BlockMod { } @Override - public void getSubBlocks(Item par1, CreativeTabs par2CreativeTabs, List par3List) { + public void getSubBlocks(@Nonnull Item par1, CreativeTabs par2CreativeTabs, List par3List) { for(int i = 0; i < TYPES; i++) par3List.add(new ItemStack(par1, 1, i)); } + @Nonnull @Override - public ItemStack getPickBlock(IBlockState state, RayTraceResult target, World world, BlockPos pos, EntityPlayer player) { + public ItemStack getPickBlock(@Nonnull IBlockState state, RayTraceResult target, @Nonnull World world, @Nonnull BlockPos pos, EntityPlayer player) { return new ItemStack(this, 1, getMetaFromState(world.getBlockState(pos))); } diff --git a/src/main/java/vazkii/botania/common/block/decor/BlockPetalBlock.java b/src/main/java/vazkii/botania/common/block/decor/BlockPetalBlock.java index ca018c830..5a56ab928 100644 --- a/src/main/java/vazkii/botania/common/block/decor/BlockPetalBlock.java +++ b/src/main/java/vazkii/botania/common/block/decor/BlockPetalBlock.java @@ -30,6 +30,7 @@ import vazkii.botania.common.item.block.ItemBlockWithMetaNameAndColor; import vazkii.botania.common.lexicon.LexiconData; import vazkii.botania.common.lib.LibBlockNames; +import javax.annotation.Nonnull; import java.util.List; public class BlockPetalBlock extends BlockMod implements ILexiconable { @@ -41,6 +42,7 @@ public class BlockPetalBlock extends BlockMod implements ILexiconable { setDefaultState(blockState.getBaseState().withProperty(BotaniaStateProps.COLOR, EnumDyeColor.WHITE)); } + @Nonnull @Override public BlockStateContainer createBlockState() { return new BlockStateContainer(this, BotaniaStateProps.COLOR); @@ -51,6 +53,7 @@ public class BlockPetalBlock extends BlockMod implements ILexiconable { return state.getValue(BotaniaStateProps.COLOR).getMetadata(); } + @Nonnull @Override public IBlockState getStateFromMeta(int meta) { if (meta >= EnumDyeColor.values().length) { @@ -60,7 +63,7 @@ public class BlockPetalBlock extends BlockMod implements ILexiconable { } @Override - public void getSubBlocks(Item item, CreativeTabs tab, List list) { + public void getSubBlocks(@Nonnull Item item, CreativeTabs tab, List list) { for(int i = 0; i < 16; i++) list.add(new ItemStack(item, 1, i)); } diff --git a/src/main/java/vazkii/botania/common/block/decor/BlockPrismarine.java b/src/main/java/vazkii/botania/common/block/decor/BlockPrismarine.java index 62d61c465..32edbaab6 100644 --- a/src/main/java/vazkii/botania/common/block/decor/BlockPrismarine.java +++ b/src/main/java/vazkii/botania/common/block/decor/BlockPrismarine.java @@ -31,6 +31,7 @@ import vazkii.botania.common.item.block.ItemBlockWithMetadataAndName; import vazkii.botania.common.lexicon.LexiconData; import vazkii.botania.common.lib.LibBlockNames; +import javax.annotation.Nonnull; import java.util.List; public class BlockPrismarine extends BlockMod implements ILexiconable { @@ -45,6 +46,7 @@ public class BlockPrismarine extends BlockMod implements ILexiconable { setDefaultState(blockState.getBaseState().withProperty(BotaniaStateProps.PRISMARINE_VARIANT, PrismarineVariant.PRISMARINE)); } + @Nonnull @Override public BlockStateContainer createBlockState() { return new BlockStateContainer(this, BotaniaStateProps.PRISMARINE_VARIANT); @@ -55,6 +57,7 @@ public class BlockPrismarine extends BlockMod implements ILexiconable { return state.getValue(BotaniaStateProps.PRISMARINE_VARIANT).ordinal(); } + @Nonnull @Override public IBlockState getStateFromMeta(int meta) { if (meta >= PrismarineVariant.values().length) { @@ -74,13 +77,14 @@ public class BlockPrismarine extends BlockMod implements ILexiconable { } @Override - public void getSubBlocks(Item par1, CreativeTabs par2CreativeTabs, List par3List) { + public void getSubBlocks(@Nonnull Item par1, CreativeTabs par2CreativeTabs, List par3List) { for(int i = 0; i < TYPES; i++) par3List.add(new ItemStack(par1, 1, i)); } + @Nonnull @Override - public ItemStack getPickBlock(IBlockState state, RayTraceResult target, World world, BlockPos pos, EntityPlayer player) { + public ItemStack getPickBlock(@Nonnull IBlockState state, RayTraceResult target, @Nonnull World world, @Nonnull BlockPos pos, EntityPlayer player) { return new ItemStack(this, 1, getMetaFromState(world.getBlockState(pos))); } diff --git a/src/main/java/vazkii/botania/common/block/decor/BlockReeds.java b/src/main/java/vazkii/botania/common/block/decor/BlockReeds.java index 7832d8cc3..15b42bbce 100644 --- a/src/main/java/vazkii/botania/common/block/decor/BlockReeds.java +++ b/src/main/java/vazkii/botania/common/block/decor/BlockReeds.java @@ -32,6 +32,8 @@ import vazkii.botania.common.lexicon.LexiconData; import vazkii.botania.common.lib.LibBlockNames; import vazkii.botania.common.lib.LibMisc; +import javax.annotation.Nonnull; + public class BlockReeds extends BlockRotatedPillar implements ILexiconable { public BlockReeds() { @@ -45,6 +47,7 @@ public class BlockReeds extends BlockRotatedPillar implements ILexiconable { setDefaultState(blockState.getBaseState().withProperty(BotaniaStateProps.AXIS_FACING, EnumFacing.Axis.Y)); } + @Nonnull @Override public BlockStateContainer createBlockState() { return new BlockStateContainer(this, BotaniaStateProps.AXIS_FACING); @@ -60,6 +63,7 @@ public class BlockReeds extends BlockRotatedPillar implements ILexiconable { } } + @Nonnull @Override public IBlockState getStateFromMeta(int meta) { EnumFacing.Axis axis = null; @@ -72,6 +76,7 @@ public class BlockReeds extends BlockRotatedPillar implements ILexiconable { return getDefaultState().withProperty(BotaniaStateProps.AXIS_FACING, axis); } + @Nonnull @Override public IBlockState onBlockPlaced(World worldIn, BlockPos pos, EnumFacing facing, float hitX, float hitY, float hitZ, int meta, EntityLivingBase placer) { return getStateFromMeta(meta).withProperty(BotaniaStateProps.AXIS_FACING, facing.getAxis()); diff --git a/src/main/java/vazkii/botania/common/block/decor/BlockSeaLamp.java b/src/main/java/vazkii/botania/common/block/decor/BlockSeaLamp.java index 6a445f2a7..644031dc9 100644 --- a/src/main/java/vazkii/botania/common/block/decor/BlockSeaLamp.java +++ b/src/main/java/vazkii/botania/common/block/decor/BlockSeaLamp.java @@ -26,6 +26,8 @@ import vazkii.botania.common.integration.coloredlights.ColoredLightHelper; import vazkii.botania.common.lexicon.LexiconData; import vazkii.botania.common.lib.LibBlockNames; +import javax.annotation.Nonnull; + public class BlockSeaLamp extends BlockMod implements ILexiconable { private int coloredLight = -1; @@ -39,7 +41,7 @@ public class BlockSeaLamp extends BlockMod implements ILexiconable { @Override @Optional.Method(modid = "easycoloredlights") - public int getLightValue(IBlockState state, IBlockAccess world, BlockPos pos) { + public int getLightValue(@Nonnull IBlockState state, IBlockAccess world, @Nonnull BlockPos pos) { if(world.getBlockState(pos).getBlock() != this) return world.getBlockState(pos).getLightValue(world, pos); diff --git a/src/main/java/vazkii/botania/common/block/decor/BlockShinyFlower.java b/src/main/java/vazkii/botania/common/block/decor/BlockShinyFlower.java index 9520a9050..d04672e8c 100644 --- a/src/main/java/vazkii/botania/common/block/decor/BlockShinyFlower.java +++ b/src/main/java/vazkii/botania/common/block/decor/BlockShinyFlower.java @@ -27,6 +27,8 @@ import vazkii.botania.common.integration.coloredlights.ColoredLightHelper; import vazkii.botania.common.lexicon.LexiconData; import vazkii.botania.common.lib.LibBlockNames; +import javax.annotation.Nonnull; + @Optional.Interface(modid = "Thaumcraft", iface = "thaumcraft.api.crafting.IInfusionStabiliser", striprefs = true) public class BlockShinyFlower extends BlockModFlower implements IInfusionStabiliser, IHornHarvestable { @@ -37,7 +39,7 @@ public class BlockShinyFlower extends BlockModFlower implements IInfusionStabili @Override @Optional.Method(modid = "easycoloredlights") - public int getLightValue(IBlockState state, IBlockAccess world, BlockPos pos) { + public int getLightValue(@Nonnull IBlockState state, IBlockAccess world, @Nonnull BlockPos pos) { if(world.getBlockState(pos).getBlock() != this) return world.getBlockState(pos).getLightValue(world, pos); @@ -50,7 +52,7 @@ public class BlockShinyFlower extends BlockModFlower implements IInfusionStabili } @Override - public boolean canGrow(World world, BlockPos pos, IBlockState state, boolean fuckifiknow) { + public boolean canGrow(@Nonnull World world, @Nonnull BlockPos pos, @Nonnull IBlockState state, boolean fuckifiknow) { return false; } diff --git a/src/main/java/vazkii/botania/common/block/decor/BlockStarfield.java b/src/main/java/vazkii/botania/common/block/decor/BlockStarfield.java index 2c4f1d038..6df572ab1 100644 --- a/src/main/java/vazkii/botania/common/block/decor/BlockStarfield.java +++ b/src/main/java/vazkii/botania/common/block/decor/BlockStarfield.java @@ -30,6 +30,8 @@ import vazkii.botania.common.block.tile.TileStarfield; import vazkii.botania.common.lexicon.LexiconData; import vazkii.botania.common.lib.LibBlockNames; +import javax.annotation.Nonnull; + public class BlockStarfield extends BlockMod implements ILexiconable { private static final AxisAlignedBB AABB = new AxisAlignedBB(0, 0, 0, 1, 0.25, 1); @@ -42,16 +44,19 @@ public class BlockStarfield extends BlockMod implements ILexiconable { setDefaultState(blockState.getBaseState().withProperty(BotaniaStateProps.POWERED, false)); } + @Nonnull @Override public AxisAlignedBB getBoundingBox(IBlockState state, IBlockAccess world, BlockPos pos) { return AABB; } + @Nonnull @Override public BlockRenderLayer getBlockLayer() { return BlockRenderLayer.CUTOUT_MIPPED; } + @Nonnull @Override public BlockStateContainer createBlockState() { return new BlockStateContainer(this, BotaniaStateProps.POWERED); @@ -62,6 +67,7 @@ public class BlockStarfield extends BlockMod implements ILexiconable { return state.getValue(BotaniaStateProps.POWERED) ? 1 : 0; } + @Nonnull @Override public IBlockState getStateFromMeta(int meta) { return getDefaultState().withProperty(BotaniaStateProps.POWERED, meta == 1); @@ -82,8 +88,9 @@ public class BlockStarfield extends BlockMod implements ILexiconable { return true; } + @Nonnull @Override - public TileEntity createTileEntity(World world, IBlockState state) { + public TileEntity createTileEntity(@Nonnull World world, @Nonnull IBlockState state) { return new TileStarfield(); } diff --git a/src/main/java/vazkii/botania/common/block/decor/BlockTinyPotato.java b/src/main/java/vazkii/botania/common/block/decor/BlockTinyPotato.java index 29b4b2136..b466b8228 100644 --- a/src/main/java/vazkii/botania/common/block/decor/BlockTinyPotato.java +++ b/src/main/java/vazkii/botania/common/block/decor/BlockTinyPotato.java @@ -36,6 +36,7 @@ import vazkii.botania.common.item.block.ItemBlockTinyPotato; import vazkii.botania.common.lexicon.LexiconData; import vazkii.botania.common.lib.LibBlockNames; +import javax.annotation.Nonnull; import java.util.ArrayList; import java.util.List; @@ -51,6 +52,7 @@ public class BlockTinyPotato extends BlockMod implements ILexiconable { ); } + @Nonnull @Override public BlockStateContainer createBlockState() { return new BlockStateContainer(this, BotaniaStateProps.CARDINALS); @@ -68,6 +70,7 @@ public class BlockTinyPotato extends BlockMod implements ILexiconable { } } + @Nonnull @Override public IBlockState getStateFromMeta(int meta) { EnumFacing side = null; @@ -82,6 +85,7 @@ public class BlockTinyPotato extends BlockMod implements ILexiconable { return getDefaultState().withProperty(BotaniaStateProps.CARDINALS, side); } + @Nonnull @Override public AxisAlignedBB getBoundingBox(IBlockState state, IBlockAccess world, BlockPos pos) { return AABB; @@ -110,7 +114,7 @@ public class BlockTinyPotato extends BlockMod implements ILexiconable { } @Override - public boolean removedByPlayer(IBlockState state, World world, BlockPos pos, EntityPlayer player, boolean willHarvest) { + public boolean removedByPlayer(@Nonnull IBlockState state, World world, @Nonnull BlockPos pos, @Nonnull EntityPlayer player, boolean willHarvest) { if (willHarvest) { // Copy of super.removedByPlayer but don't set to air yet // This is so getDrops below will have a TE to work with @@ -122,14 +126,15 @@ public class BlockTinyPotato extends BlockMod implements ILexiconable { } @Override - public void harvestBlock(World world, EntityPlayer player, BlockPos pos, IBlockState state, TileEntity te, ItemStack stack) { + public void harvestBlock(@Nonnull World world, EntityPlayer player, @Nonnull BlockPos pos, @Nonnull IBlockState state, TileEntity te, ItemStack stack) { super.harvestBlock(world, player, pos, state, te, stack); // Now delete the block and TE world.setBlockToAir(pos); } + @Nonnull @Override - public List getDrops(IBlockAccess world, BlockPos pos, IBlockState state, int fortune) { + public List getDrops(IBlockAccess world, BlockPos pos, @Nonnull IBlockState state, int fortune) { ArrayList list = new ArrayList<>(); TileEntity tile = world.getTileEntity(pos); @@ -154,6 +159,7 @@ public class BlockTinyPotato extends BlockMod implements ILexiconable { return false; } + @Nonnull @Override public EnumBlockRenderType getRenderType(IBlockState state) { return EnumBlockRenderType.ENTITYBLOCK_ANIMATED; @@ -164,8 +170,9 @@ public class BlockTinyPotato extends BlockMod implements ILexiconable { return true; } + @Nonnull @Override - public TileEntity createTileEntity(World world, IBlockState state) { + public TileEntity createTileEntity(@Nonnull World world, @Nonnull IBlockState state) { return new TileTinyPotato(); } diff --git a/src/main/java/vazkii/botania/common/block/decor/BlockUnstable.java b/src/main/java/vazkii/botania/common/block/decor/BlockUnstable.java index 4b494d6c6..075693bd8 100644 --- a/src/main/java/vazkii/botania/common/block/decor/BlockUnstable.java +++ b/src/main/java/vazkii/botania/common/block/decor/BlockUnstable.java @@ -37,6 +37,7 @@ import vazkii.botania.common.item.block.ItemBlockWithMetaNameAndColor; import vazkii.botania.common.lexicon.LexiconData; import vazkii.botania.common.lib.LibBlockNames; +import javax.annotation.Nonnull; import java.awt.*; import java.util.List; import java.util.Random; @@ -53,6 +54,7 @@ public class BlockUnstable extends BlockMod implements ILexiconable { setDefaultState(blockState.getBaseState().withProperty(BotaniaStateProps.COLOR, EnumDyeColor.WHITE)); } + @Nonnull @Override public BlockStateContainer createBlockState() { return new BlockStateContainer(this, BotaniaStateProps.COLOR); @@ -63,6 +65,7 @@ public class BlockUnstable extends BlockMod implements ILexiconable { return state.getValue(BotaniaStateProps.COLOR).getMetadata(); } + @Nonnull @Override public IBlockState getStateFromMeta(int meta) { if (meta >= EnumDyeColor.values().length) { @@ -71,13 +74,14 @@ public class BlockUnstable extends BlockMod implements ILexiconable { return getDefaultState().withProperty(BotaniaStateProps.COLOR, EnumDyeColor.byMetadata(meta)); } + @Nonnull @Override public AxisAlignedBB getBoundingBox(IBlockState state, IBlockAccess world, BlockPos pos) { return AABB; } @Override - public void getSubBlocks(Item par1, CreativeTabs par2CreativeTabs, List par3List) { + public void getSubBlocks(@Nonnull Item par1, CreativeTabs par2CreativeTabs, List par3List) { for(int i = 0; i < 16; i++) par3List.add(new ItemStack(par1, 1, i)); } diff --git a/src/main/java/vazkii/botania/common/block/decor/biomestone/BlockBiomeStone.java b/src/main/java/vazkii/botania/common/block/decor/biomestone/BlockBiomeStone.java index 9dfc3fb1a..8c54d3ff8 100644 --- a/src/main/java/vazkii/botania/common/block/decor/biomestone/BlockBiomeStone.java +++ b/src/main/java/vazkii/botania/common/block/decor/biomestone/BlockBiomeStone.java @@ -27,6 +27,7 @@ import vazkii.botania.common.block.BlockMod; import vazkii.botania.common.item.block.ItemBlockWithMetadataAndName; import vazkii.botania.common.lexicon.LexiconData; +import javax.annotation.Nonnull; import java.util.List; public class BlockBiomeStone extends BlockMod implements ILexiconable { @@ -39,7 +40,7 @@ public class BlockBiomeStone extends BlockMod implements ILexiconable { } @Override - public void getSubBlocks(Item item, CreativeTabs tab, List list) { + public void getSubBlocks(@Nonnull Item item, CreativeTabs tab, List list) { for(int i = 0; i < 16; i++) list.add(new ItemStack(item, 1, i)); } @@ -54,8 +55,9 @@ public class BlockBiomeStone extends BlockMod implements ILexiconable { GameRegistry.register(new ItemBlockWithMetadataAndName(this), getRegistryName()); } + @Nonnull @Override - public ItemStack getPickBlock(IBlockState state, RayTraceResult target, World world, BlockPos pos, EntityPlayer player) { + public ItemStack getPickBlock(@Nonnull IBlockState state, RayTraceResult target, @Nonnull World world, @Nonnull BlockPos pos, EntityPlayer player) { return new ItemStack(this, 1, getMetaFromState(world.getBlockState(pos))); } diff --git a/src/main/java/vazkii/botania/common/block/decor/biomestone/BlockBiomeStoneA.java b/src/main/java/vazkii/botania/common/block/decor/biomestone/BlockBiomeStoneA.java index e2a2c021b..a8c054cfe 100644 --- a/src/main/java/vazkii/botania/common/block/decor/biomestone/BlockBiomeStoneA.java +++ b/src/main/java/vazkii/botania/common/block/decor/biomestone/BlockBiomeStoneA.java @@ -16,6 +16,8 @@ import vazkii.botania.api.state.BotaniaStateProps; import vazkii.botania.api.state.enums.BiomeStoneVariant; import vazkii.botania.common.lib.LibBlockNames; +import javax.annotation.Nonnull; + public class BlockBiomeStoneA extends BlockBiomeStone { public BlockBiomeStoneA() { @@ -23,6 +25,7 @@ public class BlockBiomeStoneA extends BlockBiomeStone { setDefaultState(blockState.getBaseState().withProperty(BotaniaStateProps.BIOMESTONE_VARIANT, BiomeStoneVariant.FOREST)); } + @Nonnull @Override public BlockStateContainer createBlockState() { return new BlockStateContainer(this, BotaniaStateProps.BIOMESTONE_VARIANT); @@ -33,6 +36,7 @@ public class BlockBiomeStoneA extends BlockBiomeStone { return state.getValue(BotaniaStateProps.BIOMESTONE_VARIANT).ordinal(); } + @Nonnull @Override public IBlockState getStateFromMeta(int meta) { if (meta >= BiomeStoneVariant.values().length) { diff --git a/src/main/java/vazkii/botania/common/block/decor/biomestone/BlockBiomeStoneB.java b/src/main/java/vazkii/botania/common/block/decor/biomestone/BlockBiomeStoneB.java index f015011ae..5a1a61ca2 100644 --- a/src/main/java/vazkii/botania/common/block/decor/biomestone/BlockBiomeStoneB.java +++ b/src/main/java/vazkii/botania/common/block/decor/biomestone/BlockBiomeStoneB.java @@ -16,6 +16,8 @@ import vazkii.botania.api.state.BotaniaStateProps; import vazkii.botania.api.state.enums.BiomeBrickVariant; import vazkii.botania.common.lib.LibBlockNames; +import javax.annotation.Nonnull; + public class BlockBiomeStoneB extends BlockBiomeStone { public BlockBiomeStoneB() { @@ -23,6 +25,7 @@ public class BlockBiomeStoneB extends BlockBiomeStone { setDefaultState(blockState.getBaseState().withProperty(BotaniaStateProps.BIOMEBRICK_VARIANT, BiomeBrickVariant.FOREST)); } + @Nonnull @Override public BlockStateContainer createBlockState() { return new BlockStateContainer(this, BotaniaStateProps.BIOMEBRICK_VARIANT); @@ -33,6 +36,7 @@ public class BlockBiomeStoneB extends BlockBiomeStone { return state.getValue(BotaniaStateProps.BIOMEBRICK_VARIANT).ordinal(); } + @Nonnull @Override public IBlockState getStateFromMeta(int meta) { if (meta >= BiomeBrickVariant.values().length) { diff --git a/src/main/java/vazkii/botania/common/block/decor/panes/BlockAlfglassPane.java b/src/main/java/vazkii/botania/common/block/decor/panes/BlockAlfglassPane.java index 464b99dd0..6bcd7df75 100644 --- a/src/main/java/vazkii/botania/common/block/decor/panes/BlockAlfglassPane.java +++ b/src/main/java/vazkii/botania/common/block/decor/panes/BlockAlfglassPane.java @@ -13,12 +13,15 @@ package vazkii.botania.common.block.decor.panes; import net.minecraft.util.BlockRenderLayer; import vazkii.botania.common.block.ModBlocks; +import javax.annotation.Nonnull; + public class BlockAlfglassPane extends BlockModPane { public BlockAlfglassPane() { super(ModBlocks.elfGlass); } + @Nonnull @Override public BlockRenderLayer getBlockLayer() { return BlockRenderLayer.TRANSLUCENT; diff --git a/src/main/java/vazkii/botania/common/block/decor/panes/BlockBifrostPane.java b/src/main/java/vazkii/botania/common/block/decor/panes/BlockBifrostPane.java index 3fc04a984..c20a05633 100644 --- a/src/main/java/vazkii/botania/common/block/decor/panes/BlockBifrostPane.java +++ b/src/main/java/vazkii/botania/common/block/decor/panes/BlockBifrostPane.java @@ -13,12 +13,15 @@ package vazkii.botania.common.block.decor.panes; import net.minecraft.util.BlockRenderLayer; import vazkii.botania.common.block.ModBlocks; +import javax.annotation.Nonnull; + public class BlockBifrostPane extends BlockModPane { public BlockBifrostPane() { super(ModBlocks.bifrostPerm); } + @Nonnull @Override public BlockRenderLayer getBlockLayer() { return BlockRenderLayer.TRANSLUCENT; diff --git a/src/main/java/vazkii/botania/common/block/decor/panes/BlockManaglassPane.java b/src/main/java/vazkii/botania/common/block/decor/panes/BlockManaglassPane.java index 4584cb39d..359eb7a45 100644 --- a/src/main/java/vazkii/botania/common/block/decor/panes/BlockManaglassPane.java +++ b/src/main/java/vazkii/botania/common/block/decor/panes/BlockManaglassPane.java @@ -13,12 +13,15 @@ package vazkii.botania.common.block.decor.panes; import net.minecraft.util.BlockRenderLayer; import vazkii.botania.common.block.ModBlocks; +import javax.annotation.Nonnull; + public class BlockManaglassPane extends BlockModPane { public BlockManaglassPane() { super(ModBlocks.manaGlass); } + @Nonnull @Override public BlockRenderLayer getBlockLayer() { return BlockRenderLayer.TRANSLUCENT; diff --git a/src/main/java/vazkii/botania/common/block/decor/panes/BlockModPane.java b/src/main/java/vazkii/botania/common/block/decor/panes/BlockModPane.java index 0aaa5f4a9..da85f97ee 100644 --- a/src/main/java/vazkii/botania/common/block/decor/panes/BlockModPane.java +++ b/src/main/java/vazkii/botania/common/block/decor/panes/BlockModPane.java @@ -24,6 +24,8 @@ import vazkii.botania.common.core.BotaniaCreativeTab; import vazkii.botania.common.item.block.ItemBlockMod; import vazkii.botania.common.lib.LibMisc; +import javax.annotation.Nonnull; + public class BlockModPane extends BlockPane { public BlockModPane(Block source) { @@ -46,7 +48,7 @@ public class BlockModPane extends BlockPane { }*/ @Override - public boolean canPaneConnectTo(IBlockAccess world, BlockPos pos, EnumFacing dir) { + public boolean canPaneConnectTo(IBlockAccess world, BlockPos pos, @Nonnull EnumFacing dir) { Block block = world.getBlockState(pos).getBlock(); return block == ModBlocks.elfGlass || block == ModBlocks.manaGlass || block == ModBlocks.bifrostPerm || super.canPaneConnectTo(world, pos, dir); } diff --git a/src/main/java/vazkii/botania/common/block/decor/quartz/BlockSpecialQuartz.java b/src/main/java/vazkii/botania/common/block/decor/quartz/BlockSpecialQuartz.java index 27e7ac958..06eb83dd7 100644 --- a/src/main/java/vazkii/botania/common/block/decor/quartz/BlockSpecialQuartz.java +++ b/src/main/java/vazkii/botania/common/block/decor/quartz/BlockSpecialQuartz.java @@ -33,6 +33,7 @@ import vazkii.botania.common.block.ModFluffBlocks; import vazkii.botania.common.item.block.ItemBlockSpecialQuartz; import vazkii.botania.common.lexicon.LexiconData; +import javax.annotation.Nonnull; import java.util.List; public class BlockSpecialQuartz extends BlockMod implements ILexiconable { @@ -47,6 +48,7 @@ public class BlockSpecialQuartz extends BlockMod implements ILexiconable { setDefaultState(blockState.getBaseState().withProperty(BotaniaStateProps.QUARTZ_VARIANT, QuartzVariant.NORMAL)); } + @Nonnull @Override public BlockStateContainer createBlockState() { return new BlockStateContainer(this, BotaniaStateProps.QUARTZ_VARIANT); @@ -57,6 +59,7 @@ public class BlockSpecialQuartz extends BlockMod implements ILexiconable { return state.getValue(BotaniaStateProps.QUARTZ_VARIANT).ordinal(); } + @Nonnull @Override public IBlockState getStateFromMeta(int meta) { if (meta >= QuartzVariant.values().length) { @@ -78,6 +81,7 @@ public class BlockSpecialQuartz extends BlockMod implements ILexiconable { }; } + @Nonnull @Override public IBlockState onBlockPlaced(World par1World, BlockPos pos, EnumFacing side, float par6, float par7, float par8, int meta, EntityLivingBase placer) { if (meta == 2) { // Pillar quartz variant @@ -104,13 +108,13 @@ public class BlockSpecialQuartz extends BlockMod implements ILexiconable { } @Override - public ItemStack createStackedBlock(IBlockState state) { + public ItemStack createStackedBlock(@Nonnull IBlockState state) { return new ItemStack(this, 1, damageDropped(state)); } @Override @SideOnly(Side.CLIENT) - public void getSubBlocks(Item item, CreativeTabs tab, List par3List) { + public void getSubBlocks(@Nonnull Item item, CreativeTabs tab, List par3List) { par3List.add(new ItemStack(this, 1, 0)); par3List.add(new ItemStack(this, 1, 1)); par3List.add(new ItemStack(this, 1, 2)); diff --git a/src/main/java/vazkii/botania/common/block/decor/quartz/BlockSpecialQuartzSlab.java b/src/main/java/vazkii/botania/common/block/decor/quartz/BlockSpecialQuartzSlab.java index 04e882d07..90355a763 100644 --- a/src/main/java/vazkii/botania/common/block/decor/quartz/BlockSpecialQuartzSlab.java +++ b/src/main/java/vazkii/botania/common/block/decor/quartz/BlockSpecialQuartzSlab.java @@ -25,6 +25,7 @@ import vazkii.botania.common.block.ModFluffBlocks; import vazkii.botania.common.block.decor.slabs.BlockModSlab; import vazkii.botania.common.lexicon.LexiconData; +import javax.annotation.Nonnull; import java.util.Random; public class BlockSpecialQuartzSlab extends BlockModSlab { @@ -78,8 +79,9 @@ public class BlockSpecialQuartzSlab extends BlockModSlab { return this; } + @Nonnull @Override - public ItemStack getPickBlock(IBlockState state, RayTraceResult target, World world, BlockPos pos, EntityPlayer player) { + public ItemStack getPickBlock(@Nonnull IBlockState state, RayTraceResult target, @Nonnull World world, @Nonnull BlockPos pos, EntityPlayer player) { return new ItemStack(getSingleBlock()); } @@ -89,7 +91,7 @@ public class BlockSpecialQuartzSlab extends BlockModSlab { } @Override - public ItemStack createStackedBlock(IBlockState par1) { + public ItemStack createStackedBlock(@Nonnull IBlockState par1) { return new ItemStack(getSingleBlock()); } diff --git a/src/main/java/vazkii/botania/common/block/decor/slabs/BlockModSlab.java b/src/main/java/vazkii/botania/common/block/decor/slabs/BlockModSlab.java index 6532e0d40..f37f8ec60 100644 --- a/src/main/java/vazkii/botania/common/block/decor/slabs/BlockModSlab.java +++ b/src/main/java/vazkii/botania/common/block/decor/slabs/BlockModSlab.java @@ -22,6 +22,7 @@ import vazkii.botania.common.item.block.ItemBlockModSlab; import vazkii.botania.common.lexicon.LexiconData; import vazkii.botania.common.lib.LibMisc; +import javax.annotation.Nonnull; import java.util.Locale; import java.util.Random; @@ -43,11 +44,13 @@ public abstract class BlockModSlab extends BlockSlab implements ILexiconable { setDefaultState(blockState.getBaseState().withProperty(HALF, EnumBlockHalf.BOTTOM).withProperty(DUMMY, DummyEnum.SINGLETON)); } + @Nonnull @Override public BlockStateContainer createBlockState() { return new BlockStateContainer(this, HALF, getVariantProperty()); } + @Nonnull @Override public IBlockState getStateFromMeta(int meta) { if (doubleSlab) { @@ -70,8 +73,9 @@ public abstract class BlockModSlab extends BlockSlab implements ILexiconable { public abstract BlockSlab getSingleBlock(); + @Nonnull @Override - public ItemStack getPickBlock(IBlockState state, RayTraceResult target, World world, BlockPos pos, EntityPlayer player) { + public ItemStack getPickBlock(@Nonnull IBlockState state, RayTraceResult target, @Nonnull World world, @Nonnull BlockPos pos, EntityPlayer player) { return new ItemStack(getSingleBlock()); } @@ -81,12 +85,12 @@ public abstract class BlockModSlab extends BlockSlab implements ILexiconable { } @Override - public int quantityDropped(IBlockState state, int fortune, Random random) { + public int quantityDropped(IBlockState state, int fortune, @Nonnull Random random) { return super.quantityDropped(state, fortune, random); } @Override - public ItemStack createStackedBlock(IBlockState par1) { + public ItemStack createStackedBlock(@Nonnull IBlockState par1) { return new ItemStack(getSingleBlock()); } @@ -96,6 +100,7 @@ public abstract class BlockModSlab extends BlockSlab implements ILexiconable { GameRegistry.register(new ItemBlockModSlab(this), new ResourceLocation(LibMisc.MOD_ID, name)); } + @Nonnull @Override public String getUnlocalizedName(int i) { return name; @@ -106,13 +111,15 @@ public abstract class BlockModSlab extends BlockSlab implements ILexiconable { return doubleSlab; } + @Nonnull @Override public final IProperty getVariantProperty() { return DUMMY; // Vanilla expects us to store different kinds of slabs into one block ID. Except we don't. We need this dummy property and dummy value to satisfy it. } + @Nonnull @Override - public final Comparable getTypeForItem(ItemStack stack) { + public final Comparable getTypeForItem(@Nonnull ItemStack stack) { return DummyEnum.SINGLETON; } @@ -123,6 +130,7 @@ public abstract class BlockModSlab extends BlockSlab implements ILexiconable { public enum DummyEnum implements IStringSerializable { SINGLETON { + @Nonnull @Override public String getName() { return name().toLowerCase(Locale.ROOT); diff --git a/src/main/java/vazkii/botania/common/block/decor/walls/Block18StoneWall.java b/src/main/java/vazkii/botania/common/block/decor/walls/Block18StoneWall.java index 06a90d1a9..bd74e05cd 100644 --- a/src/main/java/vazkii/botania/common/block/decor/walls/Block18StoneWall.java +++ b/src/main/java/vazkii/botania/common/block/decor/walls/Block18StoneWall.java @@ -28,6 +28,7 @@ import vazkii.botania.common.item.block.ItemBlockWithMetadataAndName; import vazkii.botania.common.lexicon.LexiconData; import vazkii.botania.common.lib.LibMisc; +import javax.annotation.Nonnull; import java.util.List; public class Block18StoneWall extends BlockModWall { @@ -39,6 +40,7 @@ public class Block18StoneWall extends BlockModWall { setDefaultState(blockState.getBaseState().withProperty(BotaniaStateProps.FUTURESTONEWALL_VARIANT, FutureStoneVariant.ANDESITE).withProperty(VARIANT, EnumType.NORMAL)); } + @Nonnull @Override public BlockStateContainer createBlockState() { return new BlockStateContainer(this, VARIANT, UP, NORTH, SOUTH, WEST, EAST, BotaniaStateProps.FUTURESTONEWALL_VARIANT); @@ -49,6 +51,7 @@ public class Block18StoneWall extends BlockModWall { return state.getValue(BotaniaStateProps.FUTURESTONEWALL_VARIANT).ordinal(); } + @Nonnull @Override public IBlockState getStateFromMeta(int meta) { if (meta < 0 || meta > 3) { @@ -64,7 +67,7 @@ public class Block18StoneWall extends BlockModWall { } @Override - public void getSubBlocks(Item item, CreativeTabs tabs, List list) { + public void getSubBlocks(@Nonnull Item item, CreativeTabs tabs, @Nonnull List list) { for(int i = 0; i < 4; i++) list.add(new ItemStack(item, 1, i)); } diff --git a/src/main/java/vazkii/botania/common/block/decor/walls/BlockBiomeStoneWall.java b/src/main/java/vazkii/botania/common/block/decor/walls/BlockBiomeStoneWall.java index 3f85ebb4d..8ac77e3f4 100644 --- a/src/main/java/vazkii/botania/common/block/decor/walls/BlockBiomeStoneWall.java +++ b/src/main/java/vazkii/botania/common/block/decor/walls/BlockBiomeStoneWall.java @@ -28,6 +28,7 @@ import vazkii.botania.common.item.block.ItemBlockWithMetadataAndName; import vazkii.botania.common.lexicon.LexiconData; import vazkii.botania.common.lib.LibMisc; +import javax.annotation.Nonnull; import java.util.List; public class BlockBiomeStoneWall extends BlockModWall { @@ -39,6 +40,7 @@ public class BlockBiomeStoneWall extends BlockModWall { setDefaultState(blockState.getBaseState().withProperty(BotaniaStateProps.BIOMESTONEWALL_VARIANT, BiomeStoneVariant.FOREST_COBBLE).withProperty(VARIANT, EnumType.NORMAL)); } + @Nonnull @Override public BlockStateContainer createBlockState() { return new BlockStateContainer(this, VARIANT, UP, NORTH, SOUTH, WEST, EAST, BotaniaStateProps.BIOMESTONEWALL_VARIANT); @@ -49,6 +51,7 @@ public class BlockBiomeStoneWall extends BlockModWall { return state.getValue(BotaniaStateProps.BIOMESTONEWALL_VARIANT).ordinal() - 8; } + @Nonnull @Override public IBlockState getStateFromMeta(int meta) { if (meta < 0 || meta >= BotaniaStateProps.BIOMESTONEWALL_VARIANT.getAllowedValues().size()) { @@ -64,7 +67,7 @@ public class BlockBiomeStoneWall extends BlockModWall { } @Override - public void getSubBlocks(Item item, CreativeTabs tabs, List list) { + public void getSubBlocks(@Nonnull Item item, CreativeTabs tabs, @Nonnull List list) { for(int i = 0; i < 8; i++) list.add(new ItemStack(item, 1, i)); } diff --git a/src/main/java/vazkii/botania/common/block/decor/walls/BlockModWall.java b/src/main/java/vazkii/botania/common/block/decor/walls/BlockModWall.java index 637f5f578..516f97deb 100644 --- a/src/main/java/vazkii/botania/common/block/decor/walls/BlockModWall.java +++ b/src/main/java/vazkii/botania/common/block/decor/walls/BlockModWall.java @@ -30,6 +30,7 @@ import vazkii.botania.common.item.block.ItemBlockMod; import vazkii.botania.common.lexicon.LexiconData; import vazkii.botania.common.lib.LibMisc; +import javax.annotation.Nonnull; import java.util.List; public abstract class BlockModWall extends BlockWall implements ILexiconable { @@ -51,6 +52,7 @@ public abstract class BlockModWall extends BlockWall implements ILexiconable { setCreativeTab(BotaniaCreativeTab.INSTANCE); } + @Nonnull @Override public IBlockState getActualState(IBlockState state, IBlockAccess world, BlockPos pos) { return super.getActualState(state, world, pos).withProperty(VARIANT, EnumType.NORMAL); @@ -61,6 +63,7 @@ public abstract class BlockModWall extends BlockWall implements ILexiconable { return getMetaFromState(state); } + @Nonnull @Override public BlockStateContainer createBlockState() { return new BlockStateContainer(this, VARIANT, UP, NORTH, SOUTH, WEST, EAST); @@ -71,13 +74,14 @@ public abstract class BlockModWall extends BlockWall implements ILexiconable { return 0; } + @Nonnull @Override public IBlockState getStateFromMeta(int meta) { return getDefaultState(); } @Override - public boolean canPlaceTorchOnTop(IBlockState state, IBlockAccess world, BlockPos pos) { + public boolean canPlaceTorchOnTop(IBlockState state, @Nonnull IBlockAccess world, @Nonnull BlockPos pos) { return true; } @@ -87,7 +91,7 @@ public abstract class BlockModWall extends BlockWall implements ILexiconable { } @Override - public void getSubBlocks(Item item, CreativeTabs tabs, List list) { + public void getSubBlocks(@Nonnull Item item, CreativeTabs tabs, @Nonnull List list) { list.add(new ItemStack(item)); } diff --git a/src/main/java/vazkii/botania/common/block/dispenser/BehaviourFelPumpkin.java b/src/main/java/vazkii/botania/common/block/dispenser/BehaviourFelPumpkin.java index 0036a9b7d..e0d3b804d 100644 --- a/src/main/java/vazkii/botania/common/block/dispenser/BehaviourFelPumpkin.java +++ b/src/main/java/vazkii/botania/common/block/dispenser/BehaviourFelPumpkin.java @@ -10,10 +10,13 @@ import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; import vazkii.botania.common.block.ModBlocks; +import javax.annotation.Nonnull; + // Taken from vanilla pumpkin dispense behaviour public class BehaviourFelPumpkin extends BehaviorDefaultDispenseItem { private boolean field_179241_b = true; + @Nonnull @Override protected ItemStack dispenseStack(IBlockSource source, ItemStack stack) { diff --git a/src/main/java/vazkii/botania/common/block/dispenser/BehaviourPoolMinecart.java b/src/main/java/vazkii/botania/common/block/dispenser/BehaviourPoolMinecart.java index ea51194f6..44b05e7a8 100644 --- a/src/main/java/vazkii/botania/common/block/dispenser/BehaviourPoolMinecart.java +++ b/src/main/java/vazkii/botania/common/block/dispenser/BehaviourPoolMinecart.java @@ -23,8 +23,11 @@ import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; import vazkii.botania.common.entity.EntityPoolMinecart; +import javax.annotation.Nonnull; + public class BehaviourPoolMinecart extends BehaviorDefaultDispenseItem { + @Nonnull @Override public ItemStack dispenseStack(IBlockSource p_82487_1_, ItemStack p_82487_2_) { EnumFacing enumfacing = BlockDispenser.getFacing(p_82487_1_.getBlockMetadata()); diff --git a/src/main/java/vazkii/botania/common/block/dispenser/BehaviourSeeds.java b/src/main/java/vazkii/botania/common/block/dispenser/BehaviourSeeds.java index 8697138d0..7545e67d1 100644 --- a/src/main/java/vazkii/botania/common/block/dispenser/BehaviourSeeds.java +++ b/src/main/java/vazkii/botania/common/block/dispenser/BehaviourSeeds.java @@ -19,6 +19,8 @@ import net.minecraft.util.EnumFacing; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; +import javax.annotation.Nonnull; + public class BehaviourSeeds extends BehaviorDefaultDispenseItem { Block block; @@ -27,6 +29,7 @@ public class BehaviourSeeds extends BehaviorDefaultDispenseItem { this.block = block; } + @Nonnull @Override public ItemStack dispenseStack(IBlockSource par1IBlockSource, ItemStack par2ItemStack) { EnumFacing facing = BlockDispenser.getFacing(par1IBlockSource.getBlockMetadata()); diff --git a/src/main/java/vazkii/botania/common/block/dispenser/BehaviourWand.java b/src/main/java/vazkii/botania/common/block/dispenser/BehaviourWand.java index 4ce0c19be..3adace8f6 100644 --- a/src/main/java/vazkii/botania/common/block/dispenser/BehaviourWand.java +++ b/src/main/java/vazkii/botania/common/block/dispenser/BehaviourWand.java @@ -20,8 +20,11 @@ import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; import vazkii.botania.api.wand.IWandable; +import javax.annotation.Nonnull; + public class BehaviourWand extends BehaviorDefaultDispenseItem { + @Nonnull @Override protected ItemStack dispenseStack(IBlockSource par1IBlockSource, ItemStack par2ItemStack) { EnumFacing facing = BlockDispenser.getFacing(par1IBlockSource.getBlockMetadata()); diff --git a/src/main/java/vazkii/botania/common/block/mana/BlockBellows.java b/src/main/java/vazkii/botania/common/block/mana/BlockBellows.java index 397d77158..7d3b0d0a1 100644 --- a/src/main/java/vazkii/botania/common/block/mana/BlockBellows.java +++ b/src/main/java/vazkii/botania/common/block/mana/BlockBellows.java @@ -34,6 +34,8 @@ import vazkii.botania.common.entity.EntityDoppleganger; import vazkii.botania.common.lexicon.LexiconData; import vazkii.botania.common.lib.LibBlockNames; +import javax.annotation.Nonnull; + public class BlockBellows extends BlockMod implements ILexiconable { private static final AxisAlignedBB AABB = new AxisAlignedBB(0.1875, 0, 0.1875, 1-0.1875, 10.0 / 16, 1-0.1875); @@ -45,6 +47,7 @@ public class BlockBellows extends BlockMod implements ILexiconable { setDefaultState(blockState.getBaseState().withProperty(BotaniaStateProps.CARDINALS, EnumFacing.SOUTH)); } + @Nonnull @Override public BlockStateContainer createBlockState() { return new BlockStateContainer(this, BotaniaStateProps.CARDINALS); @@ -55,6 +58,7 @@ public class BlockBellows extends BlockMod implements ILexiconable { return state.getValue(BotaniaStateProps.CARDINALS).getIndex(); } + @Nonnull @Override public IBlockState getStateFromMeta(int meta) { if (meta < 2 || meta > 5) { @@ -63,6 +67,7 @@ public class BlockBellows extends BlockMod implements ILexiconable { return getDefaultState().withProperty(BotaniaStateProps.CARDINALS, EnumFacing.getFront(meta)); } + @Nonnull @Override public AxisAlignedBB getBoundingBox(IBlockState state, IBlockAccess world, BlockPos pos) { return AABB; @@ -90,6 +95,7 @@ public class BlockBellows extends BlockMod implements ILexiconable { return false; } + @Nonnull @Override public EnumBlockRenderType getRenderType(IBlockState state) { return EnumBlockRenderType.ENTITYBLOCK_ANIMATED; @@ -100,8 +106,9 @@ public class BlockBellows extends BlockMod implements ILexiconable { return true; } + @Nonnull @Override - public TileEntity createTileEntity(World world, IBlockState state) { + public TileEntity createTileEntity(@Nonnull World world, @Nonnull IBlockState state) { return new TileBellows(); } diff --git a/src/main/java/vazkii/botania/common/block/mana/BlockBrewery.java b/src/main/java/vazkii/botania/common/block/mana/BlockBrewery.java index 8b0660b5f..bd7360d73 100644 --- a/src/main/java/vazkii/botania/common/block/mana/BlockBrewery.java +++ b/src/main/java/vazkii/botania/common/block/mana/BlockBrewery.java @@ -38,6 +38,7 @@ import vazkii.botania.common.block.tile.TileSimpleInventory; import vazkii.botania.common.lexicon.LexiconData; import vazkii.botania.common.lib.LibBlockNames; +import javax.annotation.Nonnull; import java.util.Random; public class BlockBrewery extends BlockMod implements ILexiconable, IWandHUD { @@ -54,6 +55,7 @@ public class BlockBrewery extends BlockMod implements ILexiconable, IWandHUD { setDefaultState(blockState.getBaseState().withProperty(BotaniaStateProps.POWERED, false)); } + @Nonnull @Override public BlockStateContainer createBlockState() { return new BlockStateContainer(this, BotaniaStateProps.POWERED); @@ -64,11 +66,13 @@ public class BlockBrewery extends BlockMod implements ILexiconable, IWandHUD { return state.getValue(BotaniaStateProps.POWERED) ? 1 : 0; } + @Nonnull @Override public IBlockState getStateFromMeta(int meta) { return getDefaultState().withProperty(BotaniaStateProps.POWERED, meta == 1); } + @Nonnull @Override public AxisAlignedBB getBoundingBox(IBlockState state, IBlockAccess world, BlockPos pos) { return AABB; @@ -99,7 +103,7 @@ public class BlockBrewery extends BlockMod implements ILexiconable, IWandHUD { } @Override - public void breakBlock(World par1World, BlockPos pos, IBlockState state) { + public void breakBlock(@Nonnull World par1World, @Nonnull BlockPos pos, @Nonnull IBlockState state) { TileSimpleInventory inv = (TileSimpleInventory) par1World.getTileEntity(pos); if (inv != null) { @@ -147,6 +151,7 @@ public class BlockBrewery extends BlockMod implements ILexiconable, IWandHUD { return brew.signal; } + @Nonnull @Override public EnumBlockRenderType getRenderType(IBlockState state) { return EnumBlockRenderType.ENTITYBLOCK_ANIMATED; @@ -167,8 +172,9 @@ public class BlockBrewery extends BlockMod implements ILexiconable, IWandHUD { return true; } + @Nonnull @Override - public TileEntity createTileEntity(World world, IBlockState state) { + public TileEntity createTileEntity(@Nonnull World world, @Nonnull IBlockState state) { return new TileBrewery(); } diff --git a/src/main/java/vazkii/botania/common/block/mana/BlockDistributor.java b/src/main/java/vazkii/botania/common/block/mana/BlockDistributor.java index 61bb50f13..ac0bc76c6 100644 --- a/src/main/java/vazkii/botania/common/block/mana/BlockDistributor.java +++ b/src/main/java/vazkii/botania/common/block/mana/BlockDistributor.java @@ -25,6 +25,8 @@ import vazkii.botania.common.block.tile.mana.TileDistributor; import vazkii.botania.common.lexicon.LexiconData; import vazkii.botania.common.lib.LibBlockNames; +import javax.annotation.Nonnull; + public class BlockDistributor extends BlockMod implements ILexiconable { public BlockDistributor() { @@ -39,8 +41,9 @@ public class BlockDistributor extends BlockMod implements ILexiconable { return true; } + @Nonnull @Override - public TileEntity createTileEntity(World world, IBlockState state) { + public TileEntity createTileEntity(@Nonnull World world, @Nonnull IBlockState state) { return new TileDistributor(); } diff --git a/src/main/java/vazkii/botania/common/block/mana/BlockEnchanter.java b/src/main/java/vazkii/botania/common/block/mana/BlockEnchanter.java index 4fe8cea7e..573bd3513 100644 --- a/src/main/java/vazkii/botania/common/block/mana/BlockEnchanter.java +++ b/src/main/java/vazkii/botania/common/block/mana/BlockEnchanter.java @@ -40,6 +40,7 @@ import vazkii.botania.common.item.ModItems; import vazkii.botania.common.lexicon.LexiconData; import vazkii.botania.common.lib.LibBlockNames; +import javax.annotation.Nonnull; import java.util.Random; public class BlockEnchanter extends BlockMod implements IWandable, ILexiconable, IWandHUD { @@ -55,6 +56,7 @@ public class BlockEnchanter extends BlockMod implements IWandable, ILexiconable, setDefaultState(blockState.getBaseState().withProperty(BotaniaStateProps.ENCHANTER_DIRECTION, EnumFacing.Axis.X)); } + @Nonnull @Override public BlockStateContainer createBlockState() { return new BlockStateContainer(this, BotaniaStateProps.ENCHANTER_DIRECTION); @@ -69,6 +71,7 @@ public class BlockEnchanter extends BlockMod implements IWandable, ILexiconable, } } + @Nonnull @Override public IBlockState getStateFromMeta(int meta) { return getDefaultState().withProperty(BotaniaStateProps.ENCHANTER_DIRECTION, meta == 1 ? EnumFacing.Axis.Z : EnumFacing.Axis.X); @@ -84,8 +87,9 @@ public class BlockEnchanter extends BlockMod implements IWandable, ILexiconable, return true; } + @Nonnull @Override - public TileEntity createTileEntity(World world, IBlockState state) { + public TileEntity createTileEntity(@Nonnull World world, @Nonnull IBlockState state) { return new TileEnchanter(); } @@ -124,7 +128,7 @@ public class BlockEnchanter extends BlockMod implements IWandable, ILexiconable, } @Override - public void breakBlock(World par1World, BlockPos pos, IBlockState state) { + public void breakBlock(@Nonnull World par1World, @Nonnull BlockPos pos, @Nonnull IBlockState state) { TileEnchanter enchanter = (TileEnchanter) par1World.getTileEntity(pos); ItemStack itemstack = enchanter.itemToEnchant; diff --git a/src/main/java/vazkii/botania/common/block/mana/BlockForestDrum.java b/src/main/java/vazkii/botania/common/block/mana/BlockForestDrum.java index 8a5042494..e6474d123 100644 --- a/src/main/java/vazkii/botania/common/block/mana/BlockForestDrum.java +++ b/src/main/java/vazkii/botania/common/block/mana/BlockForestDrum.java @@ -43,6 +43,7 @@ import vazkii.botania.common.item.block.ItemBlockWithMetadataAndName; import vazkii.botania.common.lexicon.LexiconData; import vazkii.botania.common.lib.LibBlockNames; +import javax.annotation.Nonnull; import java.util.ArrayList; import java.util.Collections; import java.util.List; @@ -58,11 +59,13 @@ public class BlockForestDrum extends BlockMod implements IManaTrigger, ILexicona setDefaultState(blockState.getBaseState().withProperty(BotaniaStateProps.DRUM_VARIANT, DrumVariant.WILD)); } + @Nonnull @Override public AxisAlignedBB getBoundingBox(IBlockState state, IBlockAccess world, BlockPos pos) { return AABB; } + @Nonnull @Override public BlockStateContainer createBlockState() { return new BlockStateContainer(this, BotaniaStateProps.DRUM_VARIANT); @@ -73,6 +76,7 @@ public class BlockForestDrum extends BlockMod implements IManaTrigger, ILexicona return state.getValue(BotaniaStateProps.DRUM_VARIANT).ordinal(); } + @Nonnull @Override public IBlockState getStateFromMeta(int meta) { if (meta >= DrumVariant.values().length) { @@ -102,7 +106,7 @@ public class BlockForestDrum extends BlockMod implements IManaTrigger, ILexicona } @Override - public void getSubBlocks(Item item, CreativeTabs tab, List list) { + public void getSubBlocks(@Nonnull Item item, CreativeTabs tab, List list) { for(int i = 0; i < 3; i++) list.add(new ItemStack(item, 1, i)); } diff --git a/src/main/java/vazkii/botania/common/block/mana/BlockManaDetector.java b/src/main/java/vazkii/botania/common/block/mana/BlockManaDetector.java index 3796f7f17..83e5ce4d5 100644 --- a/src/main/java/vazkii/botania/common/block/mana/BlockManaDetector.java +++ b/src/main/java/vazkii/botania/common/block/mana/BlockManaDetector.java @@ -33,6 +33,7 @@ import vazkii.botania.common.block.tile.mana.TileManaDetector; import vazkii.botania.common.lexicon.LexiconData; import vazkii.botania.common.lib.LibBlockNames; +import javax.annotation.Nonnull; import java.util.List; public class BlockManaDetector extends BlockMod implements ILexiconable, IManaCollisionGhost { @@ -45,6 +46,7 @@ public class BlockManaDetector extends BlockMod implements ILexiconable, IManaCo setDefaultState(blockState.getBaseState().withProperty(BotaniaStateProps.POWERED, false)); } + @Nonnull @Override public BlockStateContainer createBlockState() { return new BlockStateContainer(this, BotaniaStateProps.POWERED); @@ -55,6 +57,7 @@ public class BlockManaDetector extends BlockMod implements ILexiconable, IManaCo return state.getValue(BotaniaStateProps.POWERED) ? 1 : 0; } + @Nonnull @Override public IBlockState getStateFromMeta(int meta) { return getDefaultState().withProperty(BotaniaStateProps.POWERED, meta == 1); @@ -71,7 +74,7 @@ public class BlockManaDetector extends BlockMod implements ILexiconable, IManaCo } @Override - public void addCollisionBoxToList(IBlockState state, World par1World, BlockPos pos, AxisAlignedBB par5AxisAlignedBB, List par6List, Entity par7Entity) { + public void addCollisionBoxToList(IBlockState state, @Nonnull World par1World, @Nonnull BlockPos pos, @Nonnull AxisAlignedBB par5AxisAlignedBB, @Nonnull List par6List, Entity par7Entity) { if(par7Entity != null && !(par7Entity instanceof IManaBurst)) super.addCollisionBoxToList(state, par1World, pos, par5AxisAlignedBB, par6List, par7Entity); } @@ -81,8 +84,9 @@ public class BlockManaDetector extends BlockMod implements ILexiconable, IManaCo return true; } + @Nonnull @Override - public TileEntity createTileEntity(World world, IBlockState state) { + public TileEntity createTileEntity(@Nonnull World world, @Nonnull IBlockState state) { return new TileManaDetector(); } diff --git a/src/main/java/vazkii/botania/common/block/mana/BlockManaVoid.java b/src/main/java/vazkii/botania/common/block/mana/BlockManaVoid.java index a7b6b1ff0..034b3a04a 100644 --- a/src/main/java/vazkii/botania/common/block/mana/BlockManaVoid.java +++ b/src/main/java/vazkii/botania/common/block/mana/BlockManaVoid.java @@ -30,6 +30,8 @@ import vazkii.botania.common.block.tile.mana.TileManaVoid; import vazkii.botania.common.lexicon.LexiconData; import vazkii.botania.common.lib.LibBlockNames; +import javax.annotation.Nonnull; + public class BlockManaVoid extends BlockMod implements ILexiconable, IPoolOverlayProvider { public BlockManaVoid() { @@ -44,8 +46,9 @@ public class BlockManaVoid extends BlockMod implements ILexiconable, IPoolOverla return true; } + @Nonnull @Override - public TileEntity createTileEntity(World world, IBlockState state) { + public TileEntity createTileEntity(@Nonnull World world, @Nonnull IBlockState state) { return new TileManaVoid(); } diff --git a/src/main/java/vazkii/botania/common/block/mana/BlockPool.java b/src/main/java/vazkii/botania/common/block/mana/BlockPool.java index 59c11948a..85c085056 100644 --- a/src/main/java/vazkii/botania/common/block/mana/BlockPool.java +++ b/src/main/java/vazkii/botania/common/block/mana/BlockPool.java @@ -49,6 +49,7 @@ import vazkii.botania.common.item.block.ItemBlockPool; import vazkii.botania.common.lexicon.LexiconData; import vazkii.botania.common.lib.LibBlockNames; +import javax.annotation.Nonnull; import java.util.ArrayList; import java.util.List; @@ -69,6 +70,7 @@ public class BlockPool extends BlockMod implements IWandHUD, IWandable, ILexicon BotaniaAPI.blacklistBlockFromMagnet(this, Short.MAX_VALUE); } + @Nonnull @Override public BlockStateContainer createBlockState() { return new BlockStateContainer(this, BotaniaStateProps.POOL_VARIANT, BotaniaStateProps.COLOR); @@ -79,6 +81,7 @@ public class BlockPool extends BlockMod implements IWandHUD, IWandable, ILexicon return state.getValue(BotaniaStateProps.POOL_VARIANT).ordinal(); } + @Nonnull @Override public IBlockState getStateFromMeta(int meta) { if (meta > PoolVariant.values().length) { @@ -87,8 +90,9 @@ public class BlockPool extends BlockMod implements IWandHUD, IWandable, ILexicon return getDefaultState().withProperty(BotaniaStateProps.POOL_VARIANT, PoolVariant.values()[meta]); } + @Nonnull @Override - public IBlockState getActualState(IBlockState state, IBlockAccess world, BlockPos pos) { + public IBlockState getActualState(@Nonnull IBlockState state, IBlockAccess world, BlockPos pos) { TileEntity te = world.getTileEntity(pos); if (te instanceof TilePool) { return state.withProperty(BotaniaStateProps.COLOR, ((TilePool) te).color); @@ -97,6 +101,7 @@ public class BlockPool extends BlockMod implements IWandHUD, IWandable, ILexicon } } + @Nonnull @Override public AxisAlignedBB getBoundingBox(IBlockState state, IBlockAccess world, BlockPos pos) { return AABB; @@ -113,14 +118,15 @@ public class BlockPool extends BlockMod implements IWandHUD, IWandable, ILexicon } @Override - public void breakBlock(World par1World, BlockPos pos, IBlockState state) { + public void breakBlock(@Nonnull World par1World, @Nonnull BlockPos pos, @Nonnull IBlockState state) { TilePool pool = (TilePool) par1World.getTileEntity(pos); lastFragile = pool.fragile; super.breakBlock(par1World, pos, state); } + @Nonnull @Override - public List getDrops(IBlockAccess world, BlockPos pos, IBlockState state, int fortune) { + public List getDrops(IBlockAccess world, BlockPos pos, @Nonnull IBlockState state, int fortune) { ArrayList drops = new ArrayList<>(); if(!lastFragile) @@ -130,7 +136,7 @@ public class BlockPool extends BlockMod implements IWandHUD, IWandable, ILexicon } @Override - public void getSubBlocks(Item par1, CreativeTabs par2, List par3) { + public void getSubBlocks(@Nonnull Item par1, CreativeTabs par2, List par3) { par3.add(new ItemStack(par1, 1, 0)); par3.add(new ItemStack(par1, 1, 2)); par3.add(new ItemStack(par1, 1, 3)); @@ -142,8 +148,9 @@ public class BlockPool extends BlockMod implements IWandHUD, IWandable, ILexicon return true; } + @Nonnull @Override - public TileEntity createTileEntity(World world, IBlockState state) { + public TileEntity createTileEntity(@Nonnull World world, @Nonnull IBlockState state) { return new TilePool(); } @@ -164,7 +171,7 @@ public class BlockPool extends BlockMod implements IWandHUD, IWandable, ILexicon @Override - public void addCollisionBoxToList(IBlockState state, World p_149743_1_, BlockPos pos, AxisAlignedBB entityBox, List boxes, Entity entity) { + public void addCollisionBoxToList(IBlockState state, @Nonnull World p_149743_1_, @Nonnull BlockPos pos, @Nonnull AxisAlignedBB entityBox, @Nonnull List boxes, Entity entity) { addCollisionBoxToList(pos, entityBox, boxes, BOTTOM_AABB); addCollisionBoxToList(pos, entityBox, boxes, NORTH_AABB); addCollisionBoxToList(pos, entityBox, boxes, SOUTH_AABB); @@ -173,7 +180,7 @@ public class BlockPool extends BlockMod implements IWandHUD, IWandable, ILexicon } @Override - public boolean isSideSolid(IBlockState state, IBlockAccess world, BlockPos pos, EnumFacing side) { + public boolean isSideSolid(IBlockState state, @Nonnull IBlockAccess world, @Nonnull BlockPos pos, EnumFacing side) { return side == EnumFacing.DOWN; } @@ -187,6 +194,7 @@ public class BlockPool extends BlockMod implements IWandHUD, IWandable, ILexicon return false; } + @Nonnull @Override public EnumBlockRenderType getRenderType(IBlockState state) { if (state.getValue(BotaniaStateProps.POOL_VARIANT) == PoolVariant.FABULOUS) diff --git a/src/main/java/vazkii/botania/common/block/mana/BlockPrism.java b/src/main/java/vazkii/botania/common/block/mana/BlockPrism.java index 762935891..97c68637a 100644 --- a/src/main/java/vazkii/botania/common/block/mana/BlockPrism.java +++ b/src/main/java/vazkii/botania/common/block/mana/BlockPrism.java @@ -42,6 +42,7 @@ import vazkii.botania.common.block.tile.mana.TilePrism; import vazkii.botania.common.lexicon.LexiconData; import vazkii.botania.common.lib.LibBlockNames; +import javax.annotation.Nonnull; import java.util.Random; public class BlockPrism extends BlockMod implements IManaTrigger, ILexiconable, IManaCollisionGhost { @@ -61,11 +62,13 @@ public class BlockPrism extends BlockMod implements IManaTrigger, ILexiconable, ); } + @Nonnull @Override public AxisAlignedBB getBoundingBox(IBlockState state, IBlockAccess world, BlockPos pos) { return AABB; } + @Nonnull @Override public BlockStateContainer createBlockState() { return new BlockStateContainer(this, BotaniaStateProps.POWERED, BotaniaStateProps.HAS_LENS); @@ -77,12 +80,14 @@ public class BlockPrism extends BlockMod implements IManaTrigger, ILexiconable, + (state.getValue(BotaniaStateProps.HAS_LENS) ? 1 : 0); } + @Nonnull @Override public IBlockState getStateFromMeta(int meta) { return getDefaultState().withProperty(BotaniaStateProps.POWERED, (meta & 8) > 0) .withProperty(BotaniaStateProps.HAS_LENS, (meta & 1) > 0); } + @Nonnull @Override @SideOnly(Side.CLIENT) public BlockRenderLayer getBlockLayer() { @@ -90,7 +95,7 @@ public class BlockPrism extends BlockMod implements IManaTrigger, ILexiconable, } @Override - public AxisAlignedBB getCollisionBoundingBox(IBlockState state, World world, BlockPos pos) { + public AxisAlignedBB getCollisionBoundingBox(IBlockState state, @Nonnull World world, @Nonnull BlockPos pos) { return null; } @@ -147,7 +152,7 @@ public class BlockPrism extends BlockMod implements IManaTrigger, ILexiconable, } @Override - public void breakBlock(World par1World, BlockPos pos, IBlockState state) { + public void breakBlock(@Nonnull World par1World, @Nonnull BlockPos pos, @Nonnull IBlockState state) { TileEntity tile = par1World.getTileEntity(pos); if(!(tile instanceof TileSimpleInventory)) return; @@ -193,8 +198,9 @@ public class BlockPrism extends BlockMod implements IManaTrigger, ILexiconable, return true; } + @Nonnull @Override - public TileEntity createTileEntity(World world, IBlockState state) { + public TileEntity createTileEntity(@Nonnull World world, @Nonnull IBlockState state) { return new TilePrism(); } diff --git a/src/main/java/vazkii/botania/common/block/mana/BlockPump.java b/src/main/java/vazkii/botania/common/block/mana/BlockPump.java index 8ce2624f5..3962d5f4c 100644 --- a/src/main/java/vazkii/botania/common/block/mana/BlockPump.java +++ b/src/main/java/vazkii/botania/common/block/mana/BlockPump.java @@ -35,6 +35,8 @@ import vazkii.botania.common.block.tile.mana.TilePump; import vazkii.botania.common.lexicon.LexiconData; import vazkii.botania.common.lib.LibBlockNames; +import javax.annotation.Nonnull; + public class BlockPump extends BlockMod implements ILexiconable { private static final AxisAlignedBB X_AABB = new AxisAlignedBB(0, 0, 0.25, 1, 0.5, 0.75); @@ -48,6 +50,7 @@ public class BlockPump extends BlockMod implements ILexiconable { setDefaultState(blockState.getBaseState().withProperty(Properties.StaticProperty, true).withProperty(BotaniaStateProps.CARDINALS, EnumFacing.SOUTH)); } + @Nonnull @Override public BlockStateContainer createBlockState() { return new ExtendedBlockState(this, new IProperty[] { BotaniaStateProps.CARDINALS, Properties.StaticProperty }, new IUnlistedProperty[] { Properties.AnimationProperty }); @@ -58,11 +61,13 @@ public class BlockPump extends BlockMod implements ILexiconable { return state.getValue(BotaniaStateProps.CARDINALS).getIndex(); } + @Nonnull @Override - public IBlockState getActualState(IBlockState state, IBlockAccess world, BlockPos pos) { + public IBlockState getActualState(@Nonnull IBlockState state, IBlockAccess world, BlockPos pos) { return state.withProperty(Properties.StaticProperty, true); } + @Nonnull @Override public IBlockState getStateFromMeta(int meta) { if (meta < 2 || meta > 5) { @@ -76,6 +81,7 @@ public class BlockPump extends BlockMod implements ILexiconable { p_149689_1_.setBlockState(pos, state.withProperty(BotaniaStateProps.CARDINALS, p_149689_5_.getHorizontalFacing().getOpposite()), 2); } + @Nonnull @Override public AxisAlignedBB getBoundingBox(IBlockState state, IBlockAccess world, BlockPos pos) { if(state.getValue(BotaniaStateProps.CARDINALS).getAxis() == EnumFacing.Axis.X) { @@ -116,8 +122,9 @@ public class BlockPump extends BlockMod implements ILexiconable { return true; } + @Nonnull @Override - public TileEntity createTileEntity(World world, IBlockState state) { + public TileEntity createTileEntity(@Nonnull World world, @Nonnull IBlockState state) { return new TilePump(); } } diff --git a/src/main/java/vazkii/botania/common/block/mana/BlockRFGenerator.java b/src/main/java/vazkii/botania/common/block/mana/BlockRFGenerator.java index 74953c77e..1231ccf6f 100644 --- a/src/main/java/vazkii/botania/common/block/mana/BlockRFGenerator.java +++ b/src/main/java/vazkii/botania/common/block/mana/BlockRFGenerator.java @@ -27,6 +27,8 @@ import vazkii.botania.common.block.tile.mana.TileRFGenerator; import vazkii.botania.common.lexicon.LexiconData; import vazkii.botania.common.lib.LibBlockNames; +import javax.annotation.Nonnull; + public class BlockRFGenerator extends BlockMod implements ILexiconable { public BlockRFGenerator() { @@ -49,8 +51,9 @@ public class BlockRFGenerator extends BlockMod implements ILexiconable { return true; } + @Nonnull @Override - public TileEntity createTileEntity(World world, IBlockState state) { + public TileEntity createTileEntity(@Nonnull World world, @Nonnull IBlockState state) { return new TileRFGenerator(); } diff --git a/src/main/java/vazkii/botania/common/block/mana/BlockRuneAltar.java b/src/main/java/vazkii/botania/common/block/mana/BlockRuneAltar.java index e479b5023..33f1c6415 100644 --- a/src/main/java/vazkii/botania/common/block/mana/BlockRuneAltar.java +++ b/src/main/java/vazkii/botania/common/block/mana/BlockRuneAltar.java @@ -34,6 +34,7 @@ import vazkii.botania.common.block.tile.TileSimpleInventory; import vazkii.botania.common.lexicon.LexiconData; import vazkii.botania.common.lib.LibBlockNames; +import javax.annotation.Nonnull; import java.util.Random; public class BlockRuneAltar extends BlockMod implements IWandable, ILexiconable { @@ -50,6 +51,7 @@ public class BlockRuneAltar extends BlockMod implements IWandable, ILexiconable BotaniaAPI.blacklistBlockFromMagnet(this, Short.MAX_VALUE); } + @Nonnull @Override public AxisAlignedBB getBoundingBox(IBlockState state, IBlockAccess world, BlockPos pos) { return AABB; @@ -90,7 +92,7 @@ public class BlockRuneAltar extends BlockMod implements IWandable, ILexiconable } @Override - public void breakBlock(World par1World, BlockPos pos, IBlockState state) { + public void breakBlock(@Nonnull World par1World, @Nonnull BlockPos pos, @Nonnull IBlockState state) { TileSimpleInventory inv = (TileSimpleInventory) par1World.getTileEntity(pos); if (inv != null) { @@ -132,8 +134,9 @@ public class BlockRuneAltar extends BlockMod implements IWandable, ILexiconable return true; } + @Nonnull @Override - public TileEntity createTileEntity(World world, IBlockState state) { + public TileEntity createTileEntity(@Nonnull World world, @Nonnull IBlockState state) { return new TileRuneAltar(); } diff --git a/src/main/java/vazkii/botania/common/block/mana/BlockSpawnerClaw.java b/src/main/java/vazkii/botania/common/block/mana/BlockSpawnerClaw.java index e864d025f..02b3a1286 100644 --- a/src/main/java/vazkii/botania/common/block/mana/BlockSpawnerClaw.java +++ b/src/main/java/vazkii/botania/common/block/mana/BlockSpawnerClaw.java @@ -29,6 +29,7 @@ import vazkii.botania.common.block.tile.TileSpawnerClaw; import vazkii.botania.common.lexicon.LexiconData; import vazkii.botania.common.lib.LibBlockNames; +import javax.annotation.Nonnull; import java.util.List; public class BlockSpawnerClaw extends BlockMod implements ILexiconable { @@ -40,13 +41,14 @@ public class BlockSpawnerClaw extends BlockMod implements ILexiconable { setHardness(3.0F); } + @Nonnull @Override public AxisAlignedBB getBoundingBox(IBlockState state, IBlockAccess world, BlockPos pos) { return AABB; } @Override - public void getSubBlocks(Item item, CreativeTabs tab, List list) { + public void getSubBlocks(@Nonnull Item item, CreativeTabs tab, List list) { list.add(new ItemStack(item)); list.add(new ItemStack(Blocks.MOB_SPAWNER)); } @@ -66,8 +68,9 @@ public class BlockSpawnerClaw extends BlockMod implements ILexiconable { return true; } + @Nonnull @Override - public TileEntity createTileEntity(World world, IBlockState state) { + public TileEntity createTileEntity(@Nonnull World world, @Nonnull IBlockState state) { return new TileSpawnerClaw(); } diff --git a/src/main/java/vazkii/botania/common/block/mana/BlockSpreader.java b/src/main/java/vazkii/botania/common/block/mana/BlockSpreader.java index 52a632172..23d87981e 100644 --- a/src/main/java/vazkii/botania/common/block/mana/BlockSpreader.java +++ b/src/main/java/vazkii/botania/common/block/mana/BlockSpreader.java @@ -48,6 +48,7 @@ import vazkii.botania.common.item.block.ItemBlockWithMetaNameAndColor; import vazkii.botania.common.lexicon.LexiconData; import vazkii.botania.common.lib.LibBlockNames; +import javax.annotation.Nonnull; import java.util.List; import java.util.Random; @@ -62,6 +63,7 @@ public class BlockSpreader extends BlockMod implements IWandable, IWandHUD, ILex setDefaultState(blockState.getBaseState().withProperty(BotaniaStateProps.SPREADER_VARIANT, SpreaderVariant.MANA)); } + @Nonnull @Override public BlockStateContainer createBlockState() { return new BlockStateContainer(this, BotaniaStateProps.SPREADER_VARIANT); @@ -72,6 +74,7 @@ public class BlockSpreader extends BlockMod implements IWandable, IWandHUD, ILex return state.getValue(BotaniaStateProps.SPREADER_VARIANT).ordinal(); } + @Nonnull @Override public IBlockState getStateFromMeta(int meta) { if (meta > SpreaderVariant.values().length) { @@ -86,7 +89,7 @@ public class BlockSpreader extends BlockMod implements IWandable, IWandHUD, ILex } @Override - public void getSubBlocks(Item par1, CreativeTabs par2, List par3) { + public void getSubBlocks(@Nonnull Item par1, CreativeTabs par2, List par3) { for(int i = 0; i < 4; i++) par3.add(new ItemStack(par1, 1, i)); } @@ -133,6 +136,7 @@ public class BlockSpreader extends BlockMod implements IWandable, IWandHUD, ILex return false; } + @Nonnull @Override public EnumBlockRenderType getRenderType(IBlockState state) { return EnumBlockRenderType.ENTITYBLOCK_ANIMATED; @@ -184,7 +188,7 @@ public class BlockSpreader extends BlockMod implements IWandable, IWandHUD, ILex } @Override - public void breakBlock(World par1World, BlockPos pos, IBlockState state) { + public void breakBlock(@Nonnull World par1World, @Nonnull BlockPos pos, @Nonnull IBlockState state) { TileEntity tile = par1World.getTileEntity(pos); if(!(tile instanceof TileSpreader)) return; @@ -236,8 +240,9 @@ public class BlockSpreader extends BlockMod implements IWandable, IWandHUD, ILex return true; } + @Nonnull @Override - public TileEntity createTileEntity(World world, IBlockState state) { + public TileEntity createTileEntity(@Nonnull World world, @Nonnull IBlockState state) { return new TileSpreader(); } diff --git a/src/main/java/vazkii/botania/common/block/mana/BlockTerraPlate.java b/src/main/java/vazkii/botania/common/block/mana/BlockTerraPlate.java index c9f73ff63..af7c61eca 100644 --- a/src/main/java/vazkii/botania/common/block/mana/BlockTerraPlate.java +++ b/src/main/java/vazkii/botania/common/block/mana/BlockTerraPlate.java @@ -32,6 +32,8 @@ import vazkii.botania.common.item.ModItems; import vazkii.botania.common.lexicon.LexiconData; import vazkii.botania.common.lib.LibBlockNames; +import javax.annotation.Nonnull; + public class BlockTerraPlate extends BlockMod implements ILexiconable { private static final AxisAlignedBB AABB = new AxisAlignedBB(0, 0, 0, 1, 3.0/16, 1); @@ -44,6 +46,7 @@ public class BlockTerraPlate extends BlockMod implements ILexiconable { BotaniaAPI.blacklistBlockFromMagnet(this, Short.MAX_VALUE); } + @Nonnull @Override public AxisAlignedBB getBoundingBox(IBlockState state, IBlockAccess world, BlockPos pos) { return AABB; @@ -92,8 +95,9 @@ public class BlockTerraPlate extends BlockMod implements ILexiconable { return true; } + @Nonnull @Override - public TileEntity createTileEntity(World world, IBlockState state) { + public TileEntity createTileEntity(@Nonnull World world, @Nonnull IBlockState state) { return new TileTerraPlate(); } diff --git a/src/main/java/vazkii/botania/common/block/mana/BlockTurntable.java b/src/main/java/vazkii/botania/common/block/mana/BlockTurntable.java index 57f220fa1..e78a655b2 100644 --- a/src/main/java/vazkii/botania/common/block/mana/BlockTurntable.java +++ b/src/main/java/vazkii/botania/common/block/mana/BlockTurntable.java @@ -30,6 +30,8 @@ import vazkii.botania.common.block.tile.mana.TileTurntable; import vazkii.botania.common.lexicon.LexiconData; import vazkii.botania.common.lib.LibBlockNames; +import javax.annotation.Nonnull; + public class BlockTurntable extends BlockMod implements IWandable, IWandHUD, ILexiconable { public BlockTurntable() { @@ -43,8 +45,9 @@ public class BlockTurntable extends BlockMod implements IWandable, IWandHUD, ILe return true; } + @Nonnull @Override - public TileEntity createTileEntity(World world, IBlockState state) { + public TileEntity createTileEntity(@Nonnull World world, @Nonnull IBlockState state) { return new TileTurntable(); } diff --git a/src/main/java/vazkii/botania/common/block/string/BlockRedString.java b/src/main/java/vazkii/botania/common/block/string/BlockRedString.java index c8a795a06..e817c2c53 100644 --- a/src/main/java/vazkii/botania/common/block/string/BlockRedString.java +++ b/src/main/java/vazkii/botania/common/block/string/BlockRedString.java @@ -27,6 +27,8 @@ import vazkii.botania.api.state.BotaniaStateProps; import vazkii.botania.common.block.BlockMod; import vazkii.botania.common.lexicon.LexiconData; +import javax.annotation.Nonnull; + public abstract class BlockRedString extends BlockMod implements ILexiconable { public BlockRedString(String name) { @@ -36,6 +38,7 @@ public abstract class BlockRedString extends BlockMod implements ILexiconable { setSoundType(SoundType.STONE); } + @Nonnull @Override public BlockStateContainer createBlockState() { return new BlockStateContainer(this, BotaniaStateProps.FACING); @@ -52,6 +55,7 @@ public abstract class BlockRedString extends BlockMod implements ILexiconable { return state.getValue(BotaniaStateProps.FACING).getIndex(); } + @Nonnull @Override public IBlockState getStateFromMeta(int meta) { return getDefaultState().withProperty(BotaniaStateProps.FACING, EnumFacing.getFront(meta)); diff --git a/src/main/java/vazkii/botania/common/block/string/BlockRedStringComparator.java b/src/main/java/vazkii/botania/common/block/string/BlockRedStringComparator.java index 23c71fc2a..724fb32ac 100644 --- a/src/main/java/vazkii/botania/common/block/string/BlockRedStringComparator.java +++ b/src/main/java/vazkii/botania/common/block/string/BlockRedStringComparator.java @@ -19,6 +19,8 @@ import vazkii.botania.common.block.tile.string.TileRedString; import vazkii.botania.common.block.tile.string.TileRedStringComparator; import vazkii.botania.common.lib.LibBlockNames; +import javax.annotation.Nonnull; + public class BlockRedStringComparator extends BlockRedString { public BlockRedStringComparator() { @@ -36,8 +38,9 @@ public class BlockRedStringComparator extends BlockRedString { return ((TileRedStringComparator) world.getTileEntity(pos)).getComparatorValue(); } + @Nonnull @Override - public TileRedString createTileEntity(World world, IBlockState state) { + public TileRedString createTileEntity(@Nonnull World world, @Nonnull IBlockState state) { return new TileRedStringComparator(); } diff --git a/src/main/java/vazkii/botania/common/block/string/BlockRedStringContainer.java b/src/main/java/vazkii/botania/common/block/string/BlockRedStringContainer.java index 87062e037..c103b95c2 100644 --- a/src/main/java/vazkii/botania/common/block/string/BlockRedStringContainer.java +++ b/src/main/java/vazkii/botania/common/block/string/BlockRedStringContainer.java @@ -18,6 +18,8 @@ import vazkii.botania.common.block.tile.string.TileRedString; import vazkii.botania.common.block.tile.string.TileRedStringContainer; import vazkii.botania.common.lib.LibBlockNames; +import javax.annotation.Nonnull; + public class BlockRedStringContainer extends BlockRedString { public BlockRedStringContainer() { @@ -25,8 +27,9 @@ public class BlockRedStringContainer extends BlockRedString { setDefaultState(blockState.getBaseState().withProperty(BotaniaStateProps.FACING, EnumFacing.DOWN)); } + @Nonnull @Override - public TileRedString createTileEntity(World world, IBlockState state) { + public TileRedString createTileEntity(@Nonnull World world, @Nonnull IBlockState state) { return new TileRedStringContainer(); } diff --git a/src/main/java/vazkii/botania/common/block/string/BlockRedStringDispenser.java b/src/main/java/vazkii/botania/common/block/string/BlockRedStringDispenser.java index a8b4d673f..e6156608f 100644 --- a/src/main/java/vazkii/botania/common/block/string/BlockRedStringDispenser.java +++ b/src/main/java/vazkii/botania/common/block/string/BlockRedStringDispenser.java @@ -21,6 +21,8 @@ import vazkii.botania.common.block.tile.string.TileRedString; import vazkii.botania.common.block.tile.string.TileRedStringDispenser; import vazkii.botania.common.lib.LibBlockNames; +import javax.annotation.Nonnull; + public class BlockRedStringDispenser extends BlockRedString { public BlockRedStringDispenser() { @@ -28,6 +30,7 @@ public class BlockRedStringDispenser extends BlockRedString { setDefaultState(blockState.getBaseState().withProperty(BotaniaStateProps.FACING, EnumFacing.DOWN).withProperty(BotaniaStateProps.POWERED, false)); } + @Nonnull @Override public BlockStateContainer createBlockState() { return new BlockStateContainer(this, BotaniaStateProps.FACING, BotaniaStateProps.POWERED); @@ -44,6 +47,7 @@ public class BlockRedStringDispenser extends BlockRedString { return meta; } + @Nonnull @Override public IBlockState getStateFromMeta(int meta) { boolean powered = (meta & 8) != 0; @@ -64,8 +68,9 @@ public class BlockRedStringDispenser extends BlockRedString { world.setBlockState(pos, state.withProperty(BotaniaStateProps.POWERED, false), 4); } + @Nonnull @Override - public TileRedString createTileEntity(World world, IBlockState meta) { + public TileRedString createTileEntity(@Nonnull World world, @Nonnull IBlockState meta) { return new TileRedStringDispenser(); } diff --git a/src/main/java/vazkii/botania/common/block/string/BlockRedStringFertilizer.java b/src/main/java/vazkii/botania/common/block/string/BlockRedStringFertilizer.java index 71c8425f1..fd75ae5e8 100644 --- a/src/main/java/vazkii/botania/common/block/string/BlockRedStringFertilizer.java +++ b/src/main/java/vazkii/botania/common/block/string/BlockRedStringFertilizer.java @@ -20,6 +20,7 @@ import vazkii.botania.common.block.tile.string.TileRedString; import vazkii.botania.common.block.tile.string.TileRedStringFertilizer; import vazkii.botania.common.lib.LibBlockNames; +import javax.annotation.Nonnull; import java.util.Random; public class BlockRedStringFertilizer extends BlockRedString implements IGrowable { @@ -30,22 +31,23 @@ public class BlockRedStringFertilizer extends BlockRedString implements IGrowabl } @Override - public boolean canGrow(World world, BlockPos pos, IBlockState state, boolean isClient) { + public boolean canGrow(@Nonnull World world, @Nonnull BlockPos pos, @Nonnull IBlockState state, boolean isClient) { return ((TileRedStringFertilizer) world.getTileEntity(pos)).canGrow(world, isClient); } @Override - public boolean canUseBonemeal(World world, Random rand, BlockPos pos, IBlockState state) { + public boolean canUseBonemeal(@Nonnull World world, @Nonnull Random rand, @Nonnull BlockPos pos, @Nonnull IBlockState state) { return ((TileRedStringFertilizer) world.getTileEntity(pos)).canUseBonemeal(world, rand); } @Override - public void grow(World world, Random rand, BlockPos pos, IBlockState state) { + public void grow(@Nonnull World world, @Nonnull Random rand, @Nonnull BlockPos pos, @Nonnull IBlockState state) { ((TileRedStringFertilizer) world.getTileEntity(pos)).grow(world, rand); } + @Nonnull @Override - public TileRedString createTileEntity(World world, IBlockState meta) { + public TileRedString createTileEntity(@Nonnull World world, @Nonnull IBlockState meta) { return new TileRedStringFertilizer(); } } diff --git a/src/main/java/vazkii/botania/common/block/string/BlockRedStringInterceptor.java b/src/main/java/vazkii/botania/common/block/string/BlockRedStringInterceptor.java index 82ae2c818..774f91a05 100644 --- a/src/main/java/vazkii/botania/common/block/string/BlockRedStringInterceptor.java +++ b/src/main/java/vazkii/botania/common/block/string/BlockRedStringInterceptor.java @@ -24,6 +24,7 @@ import vazkii.botania.common.block.tile.string.TileRedString; import vazkii.botania.common.block.tile.string.TileRedStringInterceptor; import vazkii.botania.common.lib.LibBlockNames; +import javax.annotation.Nonnull; import java.util.Random; public class BlockRedStringInterceptor extends BlockRedString { @@ -34,6 +35,7 @@ public class BlockRedStringInterceptor extends BlockRedString { setDefaultState(blockState.getBaseState().withProperty(BotaniaStateProps.FACING, EnumFacing.DOWN).withProperty(BotaniaStateProps.POWERED, false)); } + @Nonnull @Override public BlockStateContainer createBlockState() { return new BlockStateContainer(this, BotaniaStateProps.FACING, BotaniaStateProps.POWERED); @@ -50,6 +52,7 @@ public class BlockRedStringInterceptor extends BlockRedString { return meta; } + @Nonnull @Override public IBlockState getStateFromMeta(int meta) { boolean powered = (meta & 8) != 0; @@ -83,8 +86,9 @@ public class BlockRedStringInterceptor extends BlockRedString { return 2; } + @Nonnull @Override - public TileRedString createTileEntity(World world, IBlockState state) { + public TileRedString createTileEntity(@Nonnull World world, @Nonnull IBlockState state) { return new TileRedStringInterceptor(); } diff --git a/src/main/java/vazkii/botania/common/block/string/BlockRedStringRelay.java b/src/main/java/vazkii/botania/common/block/string/BlockRedStringRelay.java index 5c8b47286..db4626842 100644 --- a/src/main/java/vazkii/botania/common/block/string/BlockRedStringRelay.java +++ b/src/main/java/vazkii/botania/common/block/string/BlockRedStringRelay.java @@ -18,6 +18,8 @@ import vazkii.botania.common.block.tile.string.TileRedString; import vazkii.botania.common.block.tile.string.TileRedStringRelay; import vazkii.botania.common.lib.LibBlockNames; +import javax.annotation.Nonnull; + public class BlockRedStringRelay extends BlockRedString { public BlockRedStringRelay() { @@ -25,8 +27,9 @@ public class BlockRedStringRelay extends BlockRedString { setDefaultState(blockState.getBaseState().withProperty(BotaniaStateProps.FACING, EnumFacing.DOWN)); } + @Nonnull @Override - public TileRedString createTileEntity(World world, IBlockState state) { + public TileRedString createTileEntity(@Nonnull World world, @Nonnull IBlockState state) { return new TileRedStringRelay(); } diff --git a/src/main/java/vazkii/botania/common/block/tile/TileAlfPortal.java b/src/main/java/vazkii/botania/common/block/tile/TileAlfPortal.java index 9f3dda915..69c02698c 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileAlfPortal.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileAlfPortal.java @@ -40,6 +40,7 @@ import vazkii.botania.common.core.handler.ConfigHandler; import vazkii.botania.common.item.ItemLexicon; import vazkii.botania.common.lexicon.LexiconData; +import javax.annotation.Nonnull; import java.util.ArrayList; import java.util.List; @@ -234,6 +235,7 @@ public class TileAlfPortal extends TileMod { ticksSinceLastItem = 0; } + @Nonnull @Override public NBTTagCompound writeToNBT(NBTTagCompound cmp) { NBTTagCompound ret = super.writeToNBT(cmp); @@ -366,6 +368,7 @@ public class TileAlfPortal extends TileMod { return false; } + @Nonnull @Override public AxisAlignedBB getRenderBoundingBox() { return INFINITE_EXTENT_AABB; diff --git a/src/main/java/vazkii/botania/common/block/tile/TileBifrost.java b/src/main/java/vazkii/botania/common/block/tile/TileBifrost.java index aef64dd5f..5937ec5e2 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileBifrost.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileBifrost.java @@ -13,6 +13,8 @@ package vazkii.botania.common.block.tile; import net.minecraft.nbt.NBTTagCompound; import vazkii.botania.common.Botania; +import javax.annotation.Nonnull; + public class TileBifrost extends TileMod { private static final String TAG_TICKS = "ticks"; @@ -29,6 +31,7 @@ public class TileBifrost extends TileMod { Botania.proxy.sparkleFX(worldObj, pos.getX() + Math.random(), pos.getY() + Math.random(), pos.getZ() + Math.random(), (float) Math.random(), (float) Math.random(), (float) Math.random(), 0.45F + 0.2F * (float) Math.random(), 6); } + @Nonnull @Override public NBTTagCompound writeToNBT(NBTTagCompound par1nbtTagCompound) { NBTTagCompound ret = super.writeToNBT(par1nbtTagCompound); diff --git a/src/main/java/vazkii/botania/common/block/tile/TileBrewery.java b/src/main/java/vazkii/botania/common/block/tile/TileBrewery.java index e9a65575b..1190a44bc 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileBrewery.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileBrewery.java @@ -30,6 +30,7 @@ import vazkii.botania.client.core.helper.RenderHelper; import vazkii.botania.common.Botania; import vazkii.botania.common.block.ModBlocks; +import javax.annotation.Nonnull; import java.awt.*; import java.util.List; @@ -191,6 +192,7 @@ public class TileBrewery extends TileSimpleInventory implements IManaReceiver { return 7; } + @Nonnull @Override public AxisAlignedBB getRenderBoundingBox() { return INFINITE_EXTENT_AABB; diff --git a/src/main/java/vazkii/botania/common/block/tile/TileCraftCrate.java b/src/main/java/vazkii/botania/common/block/tile/TileCraftCrate.java index 02090196d..2756e1463 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileCraftCrate.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileCraftCrate.java @@ -22,6 +22,7 @@ import net.minecraft.network.play.server.SPacketUpdateTileEntity; import vazkii.botania.api.internal.VanillaPacketDispatcher; import vazkii.botania.common.item.ModItems; +import javax.annotation.Nonnull; import java.util.List; public class TileCraftCrate extends TileOpenCrate { @@ -122,7 +123,7 @@ public class TileCraftCrate extends TileOpenCrate { InventoryCrafting craft = new InventoryCrafting(new Container() { @Override - public boolean canInteractWith(EntityPlayer p_75145_1_) { + public boolean canInteractWith(@Nonnull EntityPlayer p_75145_1_) { return false; } }, 3, 3); diff --git a/src/main/java/vazkii/botania/common/block/tile/TileEnchanter.java b/src/main/java/vazkii/botania/common/block/tile/TileEnchanter.java index 53e262fb0..5b3eafcdc 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileEnchanter.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileEnchanter.java @@ -46,6 +46,7 @@ import vazkii.botania.client.core.helper.RenderHelper; import vazkii.botania.common.Botania; import vazkii.botania.common.block.ModBlocks; +import javax.annotation.Nonnull; import java.util.ArrayList; import java.util.EnumMap; import java.util.List; @@ -281,6 +282,7 @@ public class TileEnchanter extends TileMod implements ISparkAttachable { } } + @Nonnull @Override public AxisAlignedBB getRenderBoundingBox() { return INFINITE_EXTENT_AABB; diff --git a/src/main/java/vazkii/botania/common/block/tile/TileFakeAir.java b/src/main/java/vazkii/botania/common/block/tile/TileFakeAir.java index 04d9f71af..5d4ef3ee5 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileFakeAir.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileFakeAir.java @@ -15,6 +15,8 @@ import net.minecraft.tileentity.TileEntity; import net.minecraft.util.math.BlockPos; import vazkii.botania.common.block.subtile.functional.SubTileBubbell; +import javax.annotation.Nonnull; + public class TileFakeAir extends TileMod { private static final String TAG_FLOWER_X = "flowerX"; @@ -31,6 +33,7 @@ public class TileFakeAir extends TileMod { return SubTileBubbell.isValidBubbell(worldObj, flowerPos); } + @Nonnull @Override public NBTTagCompound writeToNBT(NBTTagCompound par1nbtTagCompound) { NBTTagCompound ret = super.writeToNBT(par1nbtTagCompound); diff --git a/src/main/java/vazkii/botania/common/block/tile/TileLightRelay.java b/src/main/java/vazkii/botania/common/block/tile/TileLightRelay.java index 7424e74fe..27c8c1b49 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileLightRelay.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileLightRelay.java @@ -36,6 +36,7 @@ import vazkii.botania.common.block.ModBlocks; import vazkii.botania.common.core.helper.MathHelper; import vazkii.botania.common.core.helper.Vector3; +import javax.annotation.Nonnull; import java.awt.*; import java.util.ArrayList; import java.util.List; @@ -265,17 +266,17 @@ public class TileLightRelay extends TileMod implements IWandBindable { } @Override - public boolean attackEntityFrom(DamageSource p_70097_1_, float p_70097_2_) { + public boolean attackEntityFrom(@Nonnull DamageSource p_70097_1_, float p_70097_2_) { return false; } @Override - protected void readEntityFromNBT(NBTTagCompound cmp) { + protected void readEntityFromNBT(@Nonnull NBTTagCompound cmp) { setExit(new BlockPos(cmp.getInteger(TAG_EXIT_X), cmp.getInteger(TAG_EXIT_Y), cmp.getInteger(TAG_EXIT_Z))); } @Override - protected void writeEntityToNBT(NBTTagCompound cmp) { + protected void writeEntityToNBT(@Nonnull NBTTagCompound cmp) { BlockPos exit = getExitPos(); cmp.setInteger(TAG_EXIT_X, exit.getX()); cmp.setInteger(TAG_EXIT_Y, exit.getY()); diff --git a/src/main/java/vazkii/botania/common/block/tile/TileMod.java b/src/main/java/vazkii/botania/common/block/tile/TileMod.java index c204e3d88..ed85fc027 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileMod.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileMod.java @@ -20,13 +20,16 @@ import net.minecraft.util.ITickable; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; +import javax.annotation.Nonnull; + public class TileMod extends TileEntity implements ITickable { @Override - public boolean shouldRefresh(World world, BlockPos pos, IBlockState oldState, IBlockState newState) { + public boolean shouldRefresh(World world, BlockPos pos, @Nonnull IBlockState oldState, @Nonnull IBlockState newState) { return oldState.getBlock() != newState.getBlock(); } + @Nonnull @Override public NBTTagCompound writeToNBT(NBTTagCompound par1nbtTagCompound) { NBTTagCompound ret = super.writeToNBT(par1nbtTagCompound); diff --git a/src/main/java/vazkii/botania/common/block/tile/TileOpenCrate.java b/src/main/java/vazkii/botania/common/block/tile/TileOpenCrate.java index 3c80fc84b..04db2a04b 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileOpenCrate.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileOpenCrate.java @@ -22,10 +22,12 @@ import vazkii.botania.api.state.BotaniaStateProps; import vazkii.botania.common.block.ModBlocks; import vazkii.botania.common.core.handler.MethodHandles; +import javax.annotation.Nonnull; + public class TileOpenCrate extends TileSimpleInventory { @Override - public boolean shouldRefresh(World world, BlockPos pos, IBlockState oldState, IBlockState newState) { + public boolean shouldRefresh(World world, BlockPos pos, @Nonnull IBlockState oldState, @Nonnull IBlockState newState) { if(oldState.getBlock() != newState.getBlock()) return true; if(oldState.getBlock() != ModBlocks.openCrate || newState.getBlock() != ModBlocks.openCrate) diff --git a/src/main/java/vazkii/botania/common/block/tile/TileRuneAltar.java b/src/main/java/vazkii/botania/common/block/tile/TileRuneAltar.java index 96a9ac27b..ebe32ba46 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileRuneAltar.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileRuneAltar.java @@ -34,6 +34,7 @@ import vazkii.botania.common.block.ModBlocks; import vazkii.botania.common.core.helper.Vector3; import vazkii.botania.common.item.ModItems; +import javax.annotation.Nonnull; import java.util.ArrayList; import java.util.List; @@ -291,6 +292,7 @@ public class TileRuneAltar extends TileSimpleInventory implements IManaReceiver return 16; } + @Nonnull @Override public AxisAlignedBB getRenderBoundingBox() { return INFINITE_EXTENT_AABB; diff --git a/src/main/java/vazkii/botania/common/block/tile/TileSimpleInventory.java b/src/main/java/vazkii/botania/common/block/tile/TileSimpleInventory.java index db8a64237..7e59ed407 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileSimpleInventory.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileSimpleInventory.java @@ -18,6 +18,8 @@ import net.minecraftforge.items.CapabilityItemHandler; import net.minecraftforge.items.IItemHandlerModifiable; import net.minecraftforge.items.ItemStackHandler; +import javax.annotation.Nonnull; + public abstract class TileSimpleInventory extends TileMod { protected SimpleItemStackHandler itemHandler = createItemHandler(); @@ -44,13 +46,14 @@ public abstract class TileSimpleInventory extends TileMod { } @Override - public boolean hasCapability(Capability cap, EnumFacing side) { + public boolean hasCapability(@Nonnull Capability cap, @Nonnull EnumFacing side) { return cap == CapabilityItemHandler.ITEM_HANDLER_CAPABILITY || super.hasCapability(cap, side); } + @Nonnull @Override @SuppressWarnings("unchecked") - public T getCapability(Capability cap, EnumFacing side) { + public T getCapability(@Nonnull Capability cap, @Nonnull EnumFacing side) { if(cap == CapabilityItemHandler.ITEM_HANDLER_CAPABILITY) return (T) itemHandler; return super.getCapability(cap, side); diff --git a/src/main/java/vazkii/botania/common/block/tile/corporea/TileCorporeaCrystalCube.java b/src/main/java/vazkii/botania/common/block/tile/corporea/TileCorporeaCrystalCube.java index 1b4e3fdc6..9ef86faf7 100644 --- a/src/main/java/vazkii/botania/common/block/tile/corporea/TileCorporeaCrystalCube.java +++ b/src/main/java/vazkii/botania/common/block/tile/corporea/TileCorporeaCrystalCube.java @@ -28,6 +28,7 @@ import vazkii.botania.api.corporea.ICorporeaRequestor; import vazkii.botania.api.corporea.ICorporeaSpark; import vazkii.botania.api.internal.VanillaPacketDispatcher; +import javax.annotation.Nonnull; import java.util.List; public class TileCorporeaCrystalCube extends TileCorporeaBase implements ICorporeaRequestor { @@ -171,12 +172,13 @@ public class TileCorporeaCrystalCube extends TileCorporeaBase implements ICorpor } @Override - public boolean hasCapability(Capability cap, EnumFacing side) { + public boolean hasCapability(@Nonnull Capability cap, @Nonnull EnumFacing side) { return cap == CapabilityAnimation.ANIMATION_CAPABILITY || super.hasCapability(cap, side); } + @Nonnull @Override - public T getCapability(Capability cap, EnumFacing side) { + public T getCapability(@Nonnull Capability cap, @Nonnull EnumFacing side) { if(cap == CapabilityAnimation.ANIMATION_CAPABILITY) { return CapabilityAnimation.ANIMATION_CAPABILITY.cast(asm); } else return super.getCapability(cap, side); diff --git a/src/main/java/vazkii/botania/common/block/tile/mana/TilePool.java b/src/main/java/vazkii/botania/common/block/tile/mana/TilePool.java index daef39ca4..286b26f47 100644 --- a/src/main/java/vazkii/botania/common/block/tile/mana/TilePool.java +++ b/src/main/java/vazkii/botania/common/block/tile/mana/TilePool.java @@ -60,6 +60,7 @@ import vazkii.botania.common.item.ModItems; import vazkii.botania.common.network.PacketBotaniaEffect; import vazkii.botania.common.network.PacketHandler; +import javax.annotation.Nonnull; import java.awt.*; import java.util.List; @@ -101,7 +102,7 @@ public class TilePool extends TileMod implements IManaPool, IKeyLocked, ISparkAt private boolean sendPacket = false; @Override - public boolean shouldRefresh(World world, BlockPos pos, IBlockState oldState, IBlockState newState) { + public boolean shouldRefresh(World world, BlockPos pos, @Nonnull IBlockState oldState, @Nonnull IBlockState newState) { if(oldState.getBlock() != newState.getBlock()) return true; if(oldState.getBlock() != ModBlocks.pool || newState.getBlock() != ModBlocks.pool) diff --git a/src/main/java/vazkii/botania/common/block/tile/mana/TilePump.java b/src/main/java/vazkii/botania/common/block/tile/mana/TilePump.java index b6723deb3..14b06df4f 100644 --- a/src/main/java/vazkii/botania/common/block/tile/mana/TilePump.java +++ b/src/main/java/vazkii/botania/common/block/tile/mana/TilePump.java @@ -25,6 +25,8 @@ import net.minecraftforge.fml.relauncher.Side; import vazkii.botania.api.internal.VanillaPacketDispatcher; import vazkii.botania.common.block.tile.TileMod; +import javax.annotation.Nonnull; + public class TilePump extends TileMod { private static final String TAG_ACTIVE = "active"; @@ -53,12 +55,13 @@ public class TilePump extends TileMod { } @Override - public boolean hasCapability(Capability cap, EnumFacing side) { + public boolean hasCapability(@Nonnull Capability cap, @Nonnull EnumFacing side) { return cap == CapabilityAnimation.ANIMATION_CAPABILITY || super.hasCapability(cap, side); } + @Nonnull @Override - public T getCapability(Capability cap, EnumFacing side) { + public T getCapability(@Nonnull Capability cap, @Nonnull EnumFacing side) { if (cap == CapabilityAnimation.ANIMATION_CAPABILITY) { return CapabilityAnimation.ANIMATION_CAPABILITY.cast(asm); } diff --git a/src/main/java/vazkii/botania/common/block/tile/mana/TileSpreader.java b/src/main/java/vazkii/botania/common/block/tile/mana/TileSpreader.java index 99337c5e6..d9fdffb38 100644 --- a/src/main/java/vazkii/botania/common/block/tile/mana/TileSpreader.java +++ b/src/main/java/vazkii/botania/common/block/tile/mana/TileSpreader.java @@ -62,6 +62,7 @@ import vazkii.botania.common.core.helper.Vector3; import vazkii.botania.common.entity.EntityManaBurst; import vazkii.botania.common.entity.EntityManaBurst.PositionProperties; +import javax.annotation.Nonnull; import java.util.List; import java.util.UUID; @@ -148,7 +149,7 @@ public class TileSpreader extends TileSimpleInventory implements IManaCollector, boolean invalidTentativeBurst = false; @Override - public boolean shouldRefresh(World world, BlockPos pos, IBlockState oldState, IBlockState newState) { + public boolean shouldRefresh(World world, BlockPos pos, @Nonnull IBlockState oldState, @Nonnull IBlockState newState) { if(oldState.getBlock() != newState.getBlock()) return true; if(oldState.getBlock() != ModBlocks.spreader || newState.getBlock() != ModBlocks.spreader) diff --git a/src/main/java/vazkii/botania/common/block/tile/string/TileRedString.java b/src/main/java/vazkii/botania/common/block/tile/string/TileRedString.java index 2127f0a26..bef529a75 100644 --- a/src/main/java/vazkii/botania/common/block/tile/string/TileRedString.java +++ b/src/main/java/vazkii/botania/common/block/tile/string/TileRedString.java @@ -21,6 +21,8 @@ import vazkii.botania.api.state.BotaniaStateProps; import vazkii.botania.api.wand.ITileBound; import vazkii.botania.common.block.tile.TileMod; +import javax.annotation.Nonnull; + public abstract class TileRedString extends TileMod implements ITileBound { private BlockPos binding; @@ -61,6 +63,7 @@ public abstract class TileRedString extends TileMod implements ITileBound { // NO-OP } + @Nonnull @Override public AxisAlignedBB getRenderBoundingBox() { return INFINITE_EXTENT_AABB; diff --git a/src/main/java/vazkii/botania/common/block/tile/string/TileRedStringContainer.java b/src/main/java/vazkii/botania/common/block/tile/string/TileRedStringContainer.java index 3d379d6d7..eca80dc41 100644 --- a/src/main/java/vazkii/botania/common/block/tile/string/TileRedStringContainer.java +++ b/src/main/java/vazkii/botania/common/block/tile/string/TileRedStringContainer.java @@ -16,6 +16,7 @@ import net.minecraft.util.math.BlockPos; import net.minecraftforge.common.capabilities.Capability; import net.minecraftforge.items.CapabilityItemHandler; +import javax.annotation.Nonnull; import java.util.Arrays; public class TileRedStringContainer extends TileRedString { @@ -29,7 +30,7 @@ public class TileRedStringContainer extends TileRedString { } @Override - public boolean hasCapability(Capability cap, EnumFacing side) { + public boolean hasCapability(@Nonnull Capability cap, @Nonnull EnumFacing side) { if(cap == CapabilityItemHandler.ITEM_HANDLER_CAPABILITY && getTileAtBinding() != null && getTileAtBinding().hasCapability(cap, side)) @@ -37,8 +38,9 @@ public class TileRedStringContainer extends TileRedString { return super.hasCapability(cap, side); } + @Nonnull @Override - public T getCapability(Capability cap, EnumFacing side) { + public T getCapability(@Nonnull Capability cap, @Nonnull EnumFacing side) { if(cap == CapabilityItemHandler.ITEM_HANDLER_CAPABILITY && getTileAtBinding() != null && getTileAtBinding().hasCapability(cap, side)) diff --git a/src/main/java/vazkii/botania/common/brew/potion/PotionClear.java b/src/main/java/vazkii/botania/common/brew/potion/PotionClear.java index f72d6e826..219cf3496 100644 --- a/src/main/java/vazkii/botania/common/brew/potion/PotionClear.java +++ b/src/main/java/vazkii/botania/common/brew/potion/PotionClear.java @@ -16,6 +16,8 @@ import net.minecraft.init.Items; import net.minecraft.item.ItemStack; import vazkii.botania.common.lib.LibPotionNames; +import javax.annotation.Nonnull; + public class PotionClear extends PotionMod { public PotionClear() { @@ -28,7 +30,7 @@ public class PotionClear extends PotionMod { } @Override - public void affectEntity(Entity e, Entity e1, EntityLivingBase e2, int t, double d) { + public void affectEntity(Entity e, Entity e1, @Nonnull EntityLivingBase e2, int t, double d) { e2.curePotionEffects(new ItemStack(Items.MILK_BUCKET)); } diff --git a/src/main/java/vazkii/botania/common/core/BotaniaCreativeTab.java b/src/main/java/vazkii/botania/common/core/BotaniaCreativeTab.java index 2b6d1b98f..4991bba22 100644 --- a/src/main/java/vazkii/botania/common/core/BotaniaCreativeTab.java +++ b/src/main/java/vazkii/botania/common/core/BotaniaCreativeTab.java @@ -23,6 +23,7 @@ import vazkii.botania.common.core.handler.ConfigHandler; import vazkii.botania.common.item.ModItems; import vazkii.botania.common.lib.LibMisc; +import javax.annotation.Nonnull; import java.util.List; public final class BotaniaCreativeTab extends CreativeTabs { @@ -36,6 +37,7 @@ public final class BotaniaCreativeTab extends CreativeTabs { setBackgroundImageName(LibResources.GUI_CREATIVE); } + @Nonnull @Override public ItemStack getIconItemStack() { return new ItemStack(ModItems.lexicon); @@ -52,7 +54,7 @@ public final class BotaniaCreativeTab extends CreativeTabs { } @Override - public void displayAllRelevantItems(List list) { + public void displayAllRelevantItems(@Nonnull List list) { this.list = list; addItem(ModItems.lexicon); diff --git a/src/main/java/vazkii/botania/common/core/command/CommandDownloadLatest.java b/src/main/java/vazkii/botania/common/core/command/CommandDownloadLatest.java index 934a1f9d9..c0b19fa53 100644 --- a/src/main/java/vazkii/botania/common/core/command/CommandDownloadLatest.java +++ b/src/main/java/vazkii/botania/common/core/command/CommandDownloadLatest.java @@ -19,22 +19,26 @@ import net.minecraft.util.text.TextFormatting; import vazkii.botania.common.core.version.ThreadDownloadMod; import vazkii.botania.common.core.version.VersionChecker; +import javax.annotation.Nonnull; + public class CommandDownloadLatest extends CommandBase { private static final boolean ENABLED = true; + @Nonnull @Override public String getCommandName() { return "botania-download-latest"; } + @Nonnull @Override - public String getCommandUsage(ICommandSender var1) { + public String getCommandUsage(@Nonnull ICommandSender var1) { return "/botania-download-latest "; } @Override - public void execute(MinecraftServer server, ICommandSender var1, String[] var2) { + public void execute(@Nonnull MinecraftServer server, @Nonnull ICommandSender var1, @Nonnull String[] var2) { if(!ENABLED) var1.addChatMessage(new TextComponentTranslation("botania.versioning.disabled").setStyle(new Style().setColor(TextFormatting.RED))); diff --git a/src/main/java/vazkii/botania/common/core/command/CommandOpen.java b/src/main/java/vazkii/botania/common/core/command/CommandOpen.java index 9b66ff962..f6ca3a26c 100644 --- a/src/main/java/vazkii/botania/common/core/command/CommandOpen.java +++ b/src/main/java/vazkii/botania/common/core/command/CommandOpen.java @@ -21,20 +21,24 @@ import net.minecraft.util.text.TextFormatting; import vazkii.botania.common.core.helper.PlayerHelper; import vazkii.botania.common.item.ItemLexicon; +import javax.annotation.Nonnull; + public class CommandOpen extends CommandBase { + @Nonnull @Override public String getCommandName() { return "botania-open"; } + @Nonnull @Override - public String getCommandUsage(ICommandSender p_71518_1_) { + public String getCommandUsage(@Nonnull ICommandSender p_71518_1_) { return ""; } @Override - public void execute(MinecraftServer server, ICommandSender sender, String[] args) { + public void execute(@Nonnull MinecraftServer server, @Nonnull ICommandSender sender, @Nonnull String[] args) { if(sender instanceof EntityPlayer) { EntityPlayer player = (EntityPlayer) sender; ItemStack stack = PlayerHelper.getFirstHeldItemClass(player, ItemLexicon.class); diff --git a/src/main/java/vazkii/botania/common/core/command/CommandShare.java b/src/main/java/vazkii/botania/common/core/command/CommandShare.java index 341cd346f..9a5b10846 100644 --- a/src/main/java/vazkii/botania/common/core/command/CommandShare.java +++ b/src/main/java/vazkii/botania/common/core/command/CommandShare.java @@ -17,20 +17,24 @@ import net.minecraft.server.MinecraftServer; import net.minecraft.util.text.ITextComponent; import net.minecraft.util.text.translation.I18n; +import javax.annotation.Nonnull; + public class CommandShare extends CommandBase { + @Nonnull @Override public String getCommandName() { return "botania-share"; } + @Nonnull @Override - public String getCommandUsage(ICommandSender p_71518_1_) { + public String getCommandUsage(@Nonnull ICommandSender p_71518_1_) { return ""; } @Override - public void execute(MinecraftServer server, ICommandSender sender, String[] args) { + public void execute(@Nonnull MinecraftServer server, @Nonnull ICommandSender sender, @Nonnull String[] args) { String json = I18n.translateToLocal("botaniamisc.shareMsg"); json = json.replaceAll("%name%", sender.getName()); json = json.replaceAll("%entry%", args[0]); diff --git a/src/main/java/vazkii/botania/common/core/command/CommandSkyblockSpread.java b/src/main/java/vazkii/botania/common/core/command/CommandSkyblockSpread.java index 3243c24de..89c94229d 100644 --- a/src/main/java/vazkii/botania/common/core/command/CommandSkyblockSpread.java +++ b/src/main/java/vazkii/botania/common/core/command/CommandSkyblockSpread.java @@ -20,15 +20,19 @@ import net.minecraft.util.text.translation.I18n; import vazkii.botania.common.core.helper.MathHelper; import vazkii.botania.common.world.SkyblockWorldEvents; +import javax.annotation.Nonnull; + public class CommandSkyblockSpread extends CommandBase { + @Nonnull @Override public String getCommandName() { return "botania-skyblock-spread"; } + @Nonnull @Override - public String getCommandUsage(ICommandSender p_71518_1_) { + public String getCommandUsage(@Nonnull ICommandSender p_71518_1_) { return " []"; } @@ -38,7 +42,7 @@ public class CommandSkyblockSpread extends CommandBase { } @Override - public void execute(MinecraftServer server, ICommandSender sender, String[] args) throws CommandException { + public void execute(@Nonnull MinecraftServer server, @Nonnull ICommandSender sender, @Nonnull String[] args) throws CommandException { int maxAllowed = 1000000; int minAllowed = 250; int minDist = 100; diff --git a/src/main/java/vazkii/botania/common/core/helper/InventoryHelper.java b/src/main/java/vazkii/botania/common/core/helper/InventoryHelper.java index a1b7270fd..fdf59bdcc 100644 --- a/src/main/java/vazkii/botania/common/core/helper/InventoryHelper.java +++ b/src/main/java/vazkii/botania/common/core/helper/InventoryHelper.java @@ -29,6 +29,7 @@ import net.minecraftforge.items.IItemHandler; import net.minecraftforge.items.VanillaDoubleChestItemHandler; import vazkii.botania.api.corporea.InvWithLocation; +import javax.annotation.Nonnull; import java.util.Arrays; import java.util.Iterator; import java.util.List; @@ -229,7 +230,7 @@ public class InventoryHelper { } @Override - public boolean isItemValidForSlot(int i, ItemStack itemstack) { + public boolean isItemValidForSlot(int i, @Nonnull ItemStack itemstack) { return true; } @@ -248,7 +249,7 @@ public class InventoryHelper { } @Override - public boolean isUseableByPlayer(EntityPlayer entityplayer) { + public boolean isUseableByPlayer(@Nonnull EntityPlayer entityplayer) { return true; } @@ -307,6 +308,7 @@ public class InventoryHelper { return Arrays.asList(inventoryContents); } + @Nonnull @Override public String getName() { return null; @@ -317,6 +319,7 @@ public class InventoryHelper { return false; } + @Nonnull @Override public ITextComponent getDisplayName() { return new TextComponentString(getName()); @@ -326,9 +329,9 @@ public class InventoryHelper { public void markDirty() { } @Override - public void openInventory(EntityPlayer player) { } + public void openInventory(@Nonnull EntityPlayer player) { } @Override - public void closeInventory(EntityPlayer player) { } + public void closeInventory(@Nonnull EntityPlayer player) { } } } diff --git a/src/main/java/vazkii/botania/common/core/loot/BindUuid.java b/src/main/java/vazkii/botania/common/core/loot/BindUuid.java index b1c10835d..5afbfeb31 100644 --- a/src/main/java/vazkii/botania/common/core/loot/BindUuid.java +++ b/src/main/java/vazkii/botania/common/core/loot/BindUuid.java @@ -12,6 +12,7 @@ import vazkii.botania.common.item.ModItems; import vazkii.botania.common.item.relic.ItemRelic; import vazkii.botania.common.lib.LibMisc; +import javax.annotation.Nonnull; import java.util.Random; public class BindUuid extends LootFunction { @@ -20,8 +21,9 @@ public class BindUuid extends LootFunction { super(conditionsIn); } + @Nonnull @Override - public ItemStack apply(ItemStack stack, Random rand, LootContext context) { + public ItemStack apply(@Nonnull ItemStack stack, @Nonnull Random rand, @Nonnull LootContext context) { if (context.getKillerPlayer() != null) { ((ItemRelic) ModItems.dice).bindToUUID(context.getKillerPlayer().getUniqueID(), stack); } @@ -35,10 +37,11 @@ public class BindUuid extends LootFunction { } @Override - public void serialize(JsonObject object, BindUuid functionClazz, JsonSerializationContext serializationContext) {} + public void serialize(@Nonnull JsonObject object, @Nonnull BindUuid functionClazz, @Nonnull JsonSerializationContext serializationContext) {} + @Nonnull @Override - public BindUuid deserialize(JsonObject object, JsonDeserializationContext deserializationContext, LootCondition[] conditionsIn) { + public BindUuid deserialize(@Nonnull JsonObject object, @Nonnull JsonDeserializationContext deserializationContext, @Nonnull LootCondition[] conditionsIn) { return new BindUuid(conditionsIn); } } diff --git a/src/main/java/vazkii/botania/common/core/loot/EnableRelics.java b/src/main/java/vazkii/botania/common/core/loot/EnableRelics.java index 590465737..2dc8b3ba7 100644 --- a/src/main/java/vazkii/botania/common/core/loot/EnableRelics.java +++ b/src/main/java/vazkii/botania/common/core/loot/EnableRelics.java @@ -9,12 +9,13 @@ import net.minecraft.world.storage.loot.conditions.LootCondition; import vazkii.botania.common.core.handler.ConfigHandler; import vazkii.botania.common.lib.LibMisc; +import javax.annotation.Nonnull; import java.util.Random; public class EnableRelics implements LootCondition { @Override - public boolean testCondition(Random rand, LootContext context) { + public boolean testCondition(@Nonnull Random rand, @Nonnull LootContext context) { return ConfigHandler.relicsEnabled; } @@ -24,10 +25,11 @@ public class EnableRelics implements LootCondition { } @Override - public void serialize(JsonObject json, EnableRelics value, JsonSerializationContext context) {} + public void serialize(@Nonnull JsonObject json, @Nonnull EnableRelics value, @Nonnull JsonSerializationContext context) {} + @Nonnull @Override - public EnableRelics deserialize(JsonObject json, JsonDeserializationContext context) { + public EnableRelics deserialize(@Nonnull JsonObject json, @Nonnull JsonDeserializationContext context) { return new EnableRelics(); } } diff --git a/src/main/java/vazkii/botania/common/core/loot/TrueGuardianKiller.java b/src/main/java/vazkii/botania/common/core/loot/TrueGuardianKiller.java index 91bd2f138..6279fc2bb 100644 --- a/src/main/java/vazkii/botania/common/core/loot/TrueGuardianKiller.java +++ b/src/main/java/vazkii/botania/common/core/loot/TrueGuardianKiller.java @@ -9,12 +9,13 @@ import net.minecraft.world.storage.loot.conditions.LootCondition; import vazkii.botania.common.entity.EntityDoppleganger; import vazkii.botania.common.lib.LibMisc; +import javax.annotation.Nonnull; import java.util.Random; public class TrueGuardianKiller implements LootCondition { @Override - public boolean testCondition(Random rand, LootContext context) { + public boolean testCondition(@Nonnull Random rand, @Nonnull LootContext context) { return context.getLootedEntity() instanceof EntityDoppleganger && context.getKillerPlayer() == ((EntityDoppleganger) context.getLootedEntity()).trueKiller; } @@ -25,10 +26,11 @@ public class TrueGuardianKiller implements LootCondition { } @Override - public void serialize(JsonObject json, TrueGuardianKiller value, JsonSerializationContext context) {} + public void serialize(@Nonnull JsonObject json, @Nonnull TrueGuardianKiller value, @Nonnull JsonSerializationContext context) {} + @Nonnull @Override - public TrueGuardianKiller deserialize(JsonObject json, JsonDeserializationContext context) { + public TrueGuardianKiller deserialize(@Nonnull JsonObject json, @Nonnull JsonDeserializationContext context) { return new TrueGuardianKiller(); } } diff --git a/src/main/java/vazkii/botania/common/crafting/recipe/AesirRingRecipe.java b/src/main/java/vazkii/botania/common/crafting/recipe/AesirRingRecipe.java index c4d0ddaa0..d332d4154 100644 --- a/src/main/java/vazkii/botania/common/crafting/recipe/AesirRingRecipe.java +++ b/src/main/java/vazkii/botania/common/crafting/recipe/AesirRingRecipe.java @@ -18,12 +18,13 @@ import net.minecraftforge.common.ForgeHooks; import vazkii.botania.api.item.IRelic; import vazkii.botania.common.item.ModItems; +import javax.annotation.Nonnull; import java.util.UUID; public class AesirRingRecipe implements IRecipe { @Override - public boolean matches(InventoryCrafting var1, World var2) { + public boolean matches(@Nonnull InventoryCrafting var1, @Nonnull World var2) { boolean foundThorRing = false; boolean foundOdinRing = false; boolean foundLokiRing = false; @@ -45,7 +46,7 @@ public class AesirRingRecipe implements IRecipe { } @Override - public ItemStack getCraftingResult(InventoryCrafting var1) { + public ItemStack getCraftingResult(@Nonnull InventoryCrafting var1) { String soulbind = null; UUID soulbindUUID = null; boolean hasUUID = false; @@ -91,8 +92,9 @@ public class AesirRingRecipe implements IRecipe { return null; } + @Nonnull @Override - public ItemStack[] getRemainingItems(InventoryCrafting inv) { + public ItemStack[] getRemainingItems(@Nonnull InventoryCrafting inv) { return ForgeHooks.defaultRecipeGetRemainingItems(inv); } diff --git a/src/main/java/vazkii/botania/common/crafting/recipe/AncientWillRecipe.java b/src/main/java/vazkii/botania/common/crafting/recipe/AncientWillRecipe.java index d947402b7..4164646c2 100644 --- a/src/main/java/vazkii/botania/common/crafting/recipe/AncientWillRecipe.java +++ b/src/main/java/vazkii/botania/common/crafting/recipe/AncientWillRecipe.java @@ -18,10 +18,12 @@ import net.minecraftforge.common.ForgeHooks; import vazkii.botania.api.item.IAncientWillContainer; import vazkii.botania.common.item.ModItems; +import javax.annotation.Nonnull; + public class AncientWillRecipe implements IRecipe { @Override - public boolean matches(InventoryCrafting var1, World var2) { + public boolean matches(@Nonnull InventoryCrafting var1, @Nonnull World var2) { boolean foundWill = false; boolean foundItem = false; @@ -42,7 +44,7 @@ public class AncientWillRecipe implements IRecipe { } @Override - public ItemStack getCraftingResult(InventoryCrafting var1) { + public ItemStack getCraftingResult(@Nonnull InventoryCrafting var1) { ItemStack item = null; int will = -1; @@ -74,8 +76,9 @@ public class AncientWillRecipe implements IRecipe { return null; } + @Nonnull @Override - public ItemStack[] getRemainingItems(InventoryCrafting inv) { + public ItemStack[] getRemainingItems(@Nonnull InventoryCrafting inv) { return ForgeHooks.defaultRecipeGetRemainingItems(inv); } } diff --git a/src/main/java/vazkii/botania/common/crafting/recipe/BlackHoleTalismanExtractRecipe.java b/src/main/java/vazkii/botania/common/crafting/recipe/BlackHoleTalismanExtractRecipe.java index 9f7b01fc7..ef86d804e 100644 --- a/src/main/java/vazkii/botania/common/crafting/recipe/BlackHoleTalismanExtractRecipe.java +++ b/src/main/java/vazkii/botania/common/crafting/recipe/BlackHoleTalismanExtractRecipe.java @@ -19,10 +19,12 @@ import net.minecraftforge.common.ForgeHooks; import vazkii.botania.common.item.ItemBlackHoleTalisman; import vazkii.botania.common.item.ModItems; +import javax.annotation.Nonnull; + public class BlackHoleTalismanExtractRecipe implements IRecipe { @Override - public boolean matches(InventoryCrafting var1, World var2) { + public boolean matches(@Nonnull InventoryCrafting var1, @Nonnull World var2) { boolean foundTalisman = false; for(int i = 0; i < var1.getSizeInventory(); i++) { @@ -38,7 +40,7 @@ public class BlackHoleTalismanExtractRecipe implements IRecipe { } @Override - public ItemStack getCraftingResult(InventoryCrafting var1) { + public ItemStack getCraftingResult(@Nonnull InventoryCrafting var1) { ItemStack talisman = null; for(int i = 0; i < var1.getSizeInventory(); i++) { @@ -67,8 +69,9 @@ public class BlackHoleTalismanExtractRecipe implements IRecipe { return null; } + @Nonnull @Override - public ItemStack[] getRemainingItems(InventoryCrafting inv) { + public ItemStack[] getRemainingItems(@Nonnull InventoryCrafting inv) { return ForgeHooks.defaultRecipeGetRemainingItems(inv); } } diff --git a/src/main/java/vazkii/botania/common/crafting/recipe/CompositeLensRecipe.java b/src/main/java/vazkii/botania/common/crafting/recipe/CompositeLensRecipe.java index 061fecdd5..3b84a0a64 100644 --- a/src/main/java/vazkii/botania/common/crafting/recipe/CompositeLensRecipe.java +++ b/src/main/java/vazkii/botania/common/crafting/recipe/CompositeLensRecipe.java @@ -20,10 +20,12 @@ import vazkii.botania.api.mana.ICompositableLens; import vazkii.botania.common.item.ModItems; import vazkii.botania.common.item.lens.ItemLens; +import javax.annotation.Nonnull; + public class CompositeLensRecipe implements IRecipe { @Override - public boolean matches(InventoryCrafting var1, World var2) { + public boolean matches(@Nonnull InventoryCrafting var1, @Nonnull World var2) { boolean foundLens = false; boolean foundSecondLens = false; boolean foundSlimeball = false; @@ -45,7 +47,7 @@ public class CompositeLensRecipe implements IRecipe { } @Override - public ItemStack getCraftingResult(InventoryCrafting var1) { + public ItemStack getCraftingResult(@Nonnull InventoryCrafting var1) { ItemStack lens = null; ItemStack secondLens = null; @@ -83,8 +85,9 @@ public class CompositeLensRecipe implements IRecipe { return null; } + @Nonnull @Override - public ItemStack[] getRemainingItems(InventoryCrafting inv) { + public ItemStack[] getRemainingItems(@Nonnull InventoryCrafting inv) { return ForgeHooks.defaultRecipeGetRemainingItems(inv); } } \ No newline at end of file diff --git a/src/main/java/vazkii/botania/common/crafting/recipe/CosmeticAttachRecipe.java b/src/main/java/vazkii/botania/common/crafting/recipe/CosmeticAttachRecipe.java index a388e91ca..44a305842 100644 --- a/src/main/java/vazkii/botania/common/crafting/recipe/CosmeticAttachRecipe.java +++ b/src/main/java/vazkii/botania/common/crafting/recipe/CosmeticAttachRecipe.java @@ -18,10 +18,12 @@ import net.minecraftforge.common.ForgeHooks; import vazkii.botania.api.item.ICosmeticAttachable; import vazkii.botania.api.item.ICosmeticBauble; +import javax.annotation.Nonnull; + public class CosmeticAttachRecipe implements IRecipe { @Override - public boolean matches(InventoryCrafting var1, World var2) { + public boolean matches(@Nonnull InventoryCrafting var1, @Nonnull World var2) { boolean foundCosmetic = false; boolean foundAttachable = false; @@ -42,7 +44,7 @@ public class CosmeticAttachRecipe implements IRecipe { } @Override - public ItemStack getCraftingResult(InventoryCrafting var1) { + public ItemStack getCraftingResult(@Nonnull InventoryCrafting var1) { ItemStack cosmeticItem = null; ItemStack attachableItem = null; @@ -74,8 +76,9 @@ public class CosmeticAttachRecipe implements IRecipe { return null; } + @Nonnull @Override - public ItemStack[] getRemainingItems(InventoryCrafting inv) { + public ItemStack[] getRemainingItems(@Nonnull InventoryCrafting inv) { return ForgeHooks.defaultRecipeGetRemainingItems(inv); } } diff --git a/src/main/java/vazkii/botania/common/crafting/recipe/CosmeticRemoveRecipe.java b/src/main/java/vazkii/botania/common/crafting/recipe/CosmeticRemoveRecipe.java index 1ac1b641d..1bc4b2c85 100644 --- a/src/main/java/vazkii/botania/common/crafting/recipe/CosmeticRemoveRecipe.java +++ b/src/main/java/vazkii/botania/common/crafting/recipe/CosmeticRemoveRecipe.java @@ -18,10 +18,12 @@ import net.minecraftforge.common.ForgeHooks; import vazkii.botania.api.item.ICosmeticAttachable; import vazkii.botania.api.item.ICosmeticBauble; +import javax.annotation.Nonnull; + public class CosmeticRemoveRecipe implements IRecipe { @Override - public boolean matches(InventoryCrafting var1, World var2) { + public boolean matches(@Nonnull InventoryCrafting var1, @Nonnull World var2) { boolean foundAttachable = false; for(int i = 0; i < var1.getSizeInventory(); i++) { @@ -37,7 +39,7 @@ public class CosmeticRemoveRecipe implements IRecipe { } @Override - public ItemStack getCraftingResult(InventoryCrafting var1) { + public ItemStack getCraftingResult(@Nonnull InventoryCrafting var1) { ItemStack attachableItem = null; for(int i = 0; i < var1.getSizeInventory(); i++) { @@ -65,8 +67,9 @@ public class CosmeticRemoveRecipe implements IRecipe { return null; } + @Nonnull @Override - public ItemStack[] getRemainingItems(InventoryCrafting inv) { + public ItemStack[] getRemainingItems(@Nonnull InventoryCrafting inv) { return ForgeHooks.defaultRecipeGetRemainingItems(inv); } } diff --git a/src/main/java/vazkii/botania/common/crafting/recipe/HelmRevealingRecipe.java b/src/main/java/vazkii/botania/common/crafting/recipe/HelmRevealingRecipe.java index 76c2b4571..2ec883464 100644 --- a/src/main/java/vazkii/botania/common/crafting/recipe/HelmRevealingRecipe.java +++ b/src/main/java/vazkii/botania/common/crafting/recipe/HelmRevealingRecipe.java @@ -21,10 +21,12 @@ import net.minecraftforge.common.ForgeHooks; import vazkii.botania.common.core.helper.ItemNBTHelper; import vazkii.botania.common.item.ModItems; +import javax.annotation.Nonnull; + public class HelmRevealingRecipe implements IRecipe { @Override - public boolean matches(InventoryCrafting var1, World var2) { + public boolean matches(@Nonnull InventoryCrafting var1, @Nonnull World var2) { Item goggles = Item.REGISTRY.getObject(new ResourceLocation("thaumcraft", "goggles")); if(goggles == null) return false; // NO TC loaded @@ -45,7 +47,7 @@ public class HelmRevealingRecipe implements IRecipe { } @Override - public ItemStack getCraftingResult(InventoryCrafting var1) { + public ItemStack getCraftingResult(@Nonnull InventoryCrafting var1) { ItemStack helm = null; for(int i = 0; i < var1.getSizeInventory(); i++) { @@ -102,8 +104,9 @@ public class HelmRevealingRecipe implements IRecipe { return helmItem == ModItems.manasteelHelm || helmItem == ModItems.terrasteelHelm || helmItem == ModItems.elementiumHelm; } + @Nonnull @Override - public ItemStack[] getRemainingItems(InventoryCrafting inv) { + public ItemStack[] getRemainingItems(@Nonnull InventoryCrafting inv) { return ForgeHooks.defaultRecipeGetRemainingItems(inv); } } \ No newline at end of file diff --git a/src/main/java/vazkii/botania/common/crafting/recipe/KeepIvyRecipe.java b/src/main/java/vazkii/botania/common/crafting/recipe/KeepIvyRecipe.java index 0d81332cf..295660da9 100644 --- a/src/main/java/vazkii/botania/common/crafting/recipe/KeepIvyRecipe.java +++ b/src/main/java/vazkii/botania/common/crafting/recipe/KeepIvyRecipe.java @@ -19,10 +19,12 @@ import vazkii.botania.common.core.helper.ItemNBTHelper; import vazkii.botania.common.item.ItemKeepIvy; import vazkii.botania.common.item.ModItems; +import javax.annotation.Nonnull; + public class KeepIvyRecipe implements IRecipe { @Override - public boolean matches(InventoryCrafting var1, World var2) { + public boolean matches(@Nonnull InventoryCrafting var1, @Nonnull World var2) { boolean foundIvy = false; boolean foundItem = false; @@ -41,7 +43,7 @@ public class KeepIvyRecipe implements IRecipe { } @Override - public ItemStack getCraftingResult(InventoryCrafting var1) { + public ItemStack getCraftingResult(@Nonnull InventoryCrafting var1) { ItemStack item = null; for(int i = 0; i < var1.getSizeInventory(); i++) { @@ -66,8 +68,9 @@ public class KeepIvyRecipe implements IRecipe { return null; } + @Nonnull @Override - public ItemStack[] getRemainingItems(InventoryCrafting inv) { + public ItemStack[] getRemainingItems(@Nonnull InventoryCrafting inv) { return ForgeHooks.defaultRecipeGetRemainingItems(inv); } } diff --git a/src/main/java/vazkii/botania/common/crafting/recipe/LensDyeingRecipe.java b/src/main/java/vazkii/botania/common/crafting/recipe/LensDyeingRecipe.java index d2ff1897f..6ee297ea1 100644 --- a/src/main/java/vazkii/botania/common/crafting/recipe/LensDyeingRecipe.java +++ b/src/main/java/vazkii/botania/common/crafting/recipe/LensDyeingRecipe.java @@ -20,6 +20,7 @@ import vazkii.botania.api.mana.ILens; import vazkii.botania.common.item.lens.ItemLens; import vazkii.botania.common.lib.LibOreDict; +import javax.annotation.Nonnull; import java.util.Arrays; import java.util.List; @@ -28,7 +29,7 @@ public class LensDyeingRecipe implements IRecipe { private static final List DYES = Arrays.asList("dyeWhite", "dyeOrange", "dyeMagenta", "dyeLightBlue", "dyeYellow", "dyeLime", "dyePink", "dyeGray", "dyeLightGray", "dyeCyan", "dyePurple", "dyeBlue", "dyeBrown", "dyeGreen", "dyeRed", "dyeBlack", LibOreDict.MANA_PEARL); @Override - public boolean matches(InventoryCrafting var1, World var2) { + public boolean matches(@Nonnull InventoryCrafting var1, @Nonnull World var2) { boolean foundLens = false; boolean foundDye = false; @@ -51,7 +52,7 @@ public class LensDyeingRecipe implements IRecipe { } @Override - public ItemStack getCraftingResult(InventoryCrafting var1) { + public ItemStack getCraftingResult(@Nonnull InventoryCrafting var1) { ItemStack lens = null; int color = -1; @@ -96,8 +97,9 @@ public class LensDyeingRecipe implements IRecipe { return -1; } + @Nonnull @Override - public ItemStack[] getRemainingItems(InventoryCrafting inv) { + public ItemStack[] getRemainingItems(@Nonnull InventoryCrafting inv) { return ForgeHooks.defaultRecipeGetRemainingItems(inv); } } diff --git a/src/main/java/vazkii/botania/common/crafting/recipe/ManaGunClipRecipe.java b/src/main/java/vazkii/botania/common/crafting/recipe/ManaGunClipRecipe.java index 0cfc90966..15b5d050d 100644 --- a/src/main/java/vazkii/botania/common/crafting/recipe/ManaGunClipRecipe.java +++ b/src/main/java/vazkii/botania/common/crafting/recipe/ManaGunClipRecipe.java @@ -18,10 +18,12 @@ import net.minecraftforge.common.ForgeHooks; import vazkii.botania.common.item.ItemManaGun; import vazkii.botania.common.item.ModItems; +import javax.annotation.Nonnull; + public class ManaGunClipRecipe implements IRecipe { @Override - public boolean matches(InventoryCrafting var1, World var2) { + public boolean matches(@Nonnull InventoryCrafting var1, @Nonnull World var2) { boolean foundGun = false; boolean foundClip = false; @@ -42,7 +44,7 @@ public class ManaGunClipRecipe implements IRecipe { } @Override - public ItemStack getCraftingResult(InventoryCrafting var1) { + public ItemStack getCraftingResult(@Nonnull InventoryCrafting var1) { ItemStack gun = null; for(int i = 0; i < var1.getSizeInventory(); i++) { @@ -72,8 +74,9 @@ public class ManaGunClipRecipe implements IRecipe { return null; } + @Nonnull @Override - public ItemStack[] getRemainingItems(InventoryCrafting inv) { + public ItemStack[] getRemainingItems(@Nonnull InventoryCrafting inv) { return ForgeHooks.defaultRecipeGetRemainingItems(inv); } } diff --git a/src/main/java/vazkii/botania/common/crafting/recipe/ManaGunLensRecipe.java b/src/main/java/vazkii/botania/common/crafting/recipe/ManaGunLensRecipe.java index 82bb9d343..b6722e3d5 100644 --- a/src/main/java/vazkii/botania/common/crafting/recipe/ManaGunLensRecipe.java +++ b/src/main/java/vazkii/botania/common/crafting/recipe/ManaGunLensRecipe.java @@ -19,10 +19,12 @@ import vazkii.botania.api.mana.ILens; import vazkii.botania.api.mana.ILensControl; import vazkii.botania.common.item.ItemManaGun; +import javax.annotation.Nonnull; + public class ManaGunLensRecipe implements IRecipe { @Override - public boolean matches(InventoryCrafting var1, World var2) { + public boolean matches(@Nonnull InventoryCrafting var1, @Nonnull World var2) { boolean foundLens = false; boolean foundGun = false; @@ -46,7 +48,7 @@ public class ManaGunLensRecipe implements IRecipe { } @Override - public ItemStack getCraftingResult(InventoryCrafting var1) { + public ItemStack getCraftingResult(@Nonnull InventoryCrafting var1) { ItemStack lens = null; ItemStack gun = null; @@ -80,8 +82,9 @@ public class ManaGunLensRecipe implements IRecipe { return null; } + @Nonnull @Override - public ItemStack[] getRemainingItems(InventoryCrafting inv) { + public ItemStack[] getRemainingItems(@Nonnull InventoryCrafting inv) { return ForgeHooks.defaultRecipeGetRemainingItems(inv); } } diff --git a/src/main/java/vazkii/botania/common/crafting/recipe/ManaGunRemoveLensRecipe.java b/src/main/java/vazkii/botania/common/crafting/recipe/ManaGunRemoveLensRecipe.java index 6335cc3b2..1730be1e3 100644 --- a/src/main/java/vazkii/botania/common/crafting/recipe/ManaGunRemoveLensRecipe.java +++ b/src/main/java/vazkii/botania/common/crafting/recipe/ManaGunRemoveLensRecipe.java @@ -17,10 +17,12 @@ import net.minecraft.world.World; import net.minecraftforge.common.ForgeHooks; import vazkii.botania.common.item.ItemManaGun; +import javax.annotation.Nonnull; + public class ManaGunRemoveLensRecipe implements IRecipe { @Override - public boolean matches(InventoryCrafting var1, World var2) { + public boolean matches(@Nonnull InventoryCrafting var1, @Nonnull World var2) { boolean foundGun = false; for(int i = 0; i < var1.getSizeInventory(); i++) { @@ -37,7 +39,7 @@ public class ManaGunRemoveLensRecipe implements IRecipe { } @Override - public ItemStack getCraftingResult(InventoryCrafting var1) { + public ItemStack getCraftingResult(@Nonnull InventoryCrafting var1) { ItemStack gun = null; for(int i = 0; i < var1.getSizeInventory(); i++) { @@ -64,8 +66,9 @@ public class ManaGunRemoveLensRecipe implements IRecipe { return null; } + @Nonnull @Override - public ItemStack[] getRemainingItems(InventoryCrafting inv) { + public ItemStack[] getRemainingItems(@Nonnull InventoryCrafting inv) { return ForgeHooks.defaultRecipeGetRemainingItems(inv); } } diff --git a/src/main/java/vazkii/botania/common/crafting/recipe/PhantomInkRecipe.java b/src/main/java/vazkii/botania/common/crafting/recipe/PhantomInkRecipe.java index 18cfd18dd..68c5d8889 100644 --- a/src/main/java/vazkii/botania/common/crafting/recipe/PhantomInkRecipe.java +++ b/src/main/java/vazkii/botania/common/crafting/recipe/PhantomInkRecipe.java @@ -18,10 +18,12 @@ import net.minecraftforge.common.ForgeHooks; import vazkii.botania.api.item.IPhantomInkable; import vazkii.botania.common.item.ModItems; +import javax.annotation.Nonnull; + public class PhantomInkRecipe implements IRecipe { @Override - public boolean matches(InventoryCrafting var1, World var2) { + public boolean matches(@Nonnull InventoryCrafting var1, @Nonnull World var2) { boolean foundInk = false; boolean foundItem = false; @@ -42,7 +44,7 @@ public class PhantomInkRecipe implements IRecipe { } @Override - public ItemStack getCraftingResult(InventoryCrafting var1) { + public ItemStack getCraftingResult(@Nonnull InventoryCrafting var1) { ItemStack item = null; for(int i = 0; i < var1.getSizeInventory(); i++) { @@ -67,8 +69,9 @@ public class PhantomInkRecipe implements IRecipe { return null; } + @Nonnull @Override - public ItemStack[] getRemainingItems(InventoryCrafting inv) { + public ItemStack[] getRemainingItems(@Nonnull InventoryCrafting inv) { return ForgeHooks.defaultRecipeGetRemainingItems(inv); } } diff --git a/src/main/java/vazkii/botania/common/crafting/recipe/RegenIvyRecipe.java b/src/main/java/vazkii/botania/common/crafting/recipe/RegenIvyRecipe.java index 6330d9795..518d85b58 100644 --- a/src/main/java/vazkii/botania/common/crafting/recipe/RegenIvyRecipe.java +++ b/src/main/java/vazkii/botania/common/crafting/recipe/RegenIvyRecipe.java @@ -20,10 +20,12 @@ import vazkii.botania.common.core.helper.ItemNBTHelper; import vazkii.botania.common.item.ItemRegenIvy; import vazkii.botania.common.item.ModItems; +import javax.annotation.Nonnull; + public class RegenIvyRecipe implements IRecipe { @Override - public boolean matches(InventoryCrafting var1, World var2) { + public boolean matches(@Nonnull InventoryCrafting var1, @Nonnull World var2) { ItemStack tool = null; boolean foundIvy = false; int materialsFound = 0; @@ -56,7 +58,7 @@ public class RegenIvyRecipe implements IRecipe { } @Override - public ItemStack getCraftingResult(InventoryCrafting var1) { + public ItemStack getCraftingResult(@Nonnull InventoryCrafting var1) { ItemStack tool = null; for(int i = 0; i < var1.getSizeInventory(); i++) { @@ -83,8 +85,9 @@ public class RegenIvyRecipe implements IRecipe { return null; } + @Nonnull @Override - public ItemStack[] getRemainingItems(InventoryCrafting inv) { + public ItemStack[] getRemainingItems(@Nonnull InventoryCrafting inv) { return ForgeHooks.defaultRecipeGetRemainingItems(inv); } } diff --git a/src/main/java/vazkii/botania/common/crafting/recipe/SpecialFloatingFlowerRecipe.java b/src/main/java/vazkii/botania/common/crafting/recipe/SpecialFloatingFlowerRecipe.java index 17c07a082..57e1265ab 100644 --- a/src/main/java/vazkii/botania/common/crafting/recipe/SpecialFloatingFlowerRecipe.java +++ b/src/main/java/vazkii/botania/common/crafting/recipe/SpecialFloatingFlowerRecipe.java @@ -19,10 +19,12 @@ import net.minecraftforge.common.ForgeHooks; import vazkii.botania.common.block.ModBlocks; import vazkii.botania.common.item.block.ItemBlockSpecialFlower; +import javax.annotation.Nonnull; + public class SpecialFloatingFlowerRecipe implements IRecipe { @Override - public boolean matches(InventoryCrafting var1, World var2) { + public boolean matches(@Nonnull InventoryCrafting var1, @Nonnull World var2) { boolean foundFloatingFlower = false; boolean foundSpecialFlower = false; @@ -43,7 +45,7 @@ public class SpecialFloatingFlowerRecipe implements IRecipe { } @Override - public ItemStack getCraftingResult(InventoryCrafting var1) { + public ItemStack getCraftingResult(@Nonnull InventoryCrafting var1) { ItemStack specialFlower = null; for(int i = 0; i < var1.getSizeInventory(); i++) { @@ -68,8 +70,9 @@ public class SpecialFloatingFlowerRecipe implements IRecipe { return null; } + @Nonnull @Override - public ItemStack[] getRemainingItems(InventoryCrafting inv) { + public ItemStack[] getRemainingItems(@Nonnull InventoryCrafting inv) { return ForgeHooks.defaultRecipeGetRemainingItems(inv); } } diff --git a/src/main/java/vazkii/botania/common/crafting/recipe/SpellClothRecipe.java b/src/main/java/vazkii/botania/common/crafting/recipe/SpellClothRecipe.java index 6318e39d3..71f28a442 100644 --- a/src/main/java/vazkii/botania/common/crafting/recipe/SpellClothRecipe.java +++ b/src/main/java/vazkii/botania/common/crafting/recipe/SpellClothRecipe.java @@ -18,10 +18,12 @@ import net.minecraft.world.World; import net.minecraftforge.common.ForgeHooks; import vazkii.botania.common.item.ModItems; +import javax.annotation.Nonnull; + public class SpellClothRecipe implements IRecipe { @Override - public boolean matches(InventoryCrafting var1, World var2) { + public boolean matches(@Nonnull InventoryCrafting var1, @Nonnull World var2) { boolean foundCloth = false; boolean foundEnchanted = false; @@ -42,7 +44,7 @@ public class SpellClothRecipe implements IRecipe { } @Override - public ItemStack getCraftingResult(InventoryCrafting var1) { + public ItemStack getCraftingResult(@Nonnull InventoryCrafting var1) { ItemStack stackToDisenchant = null; for(int i = 0; i < var1.getSizeInventory(); i++) { ItemStack stack = var1.getStackInSlot(i); @@ -72,8 +74,9 @@ public class SpellClothRecipe implements IRecipe { return null; } + @Nonnull @Override - public ItemStack[] getRemainingItems(InventoryCrafting inv) { + public ItemStack[] getRemainingItems(@Nonnull InventoryCrafting inv) { return ForgeHooks.defaultRecipeGetRemainingItems(inv); } } diff --git a/src/main/java/vazkii/botania/common/crafting/recipe/TerraPickTippingRecipe.java b/src/main/java/vazkii/botania/common/crafting/recipe/TerraPickTippingRecipe.java index 9f37ab337..5eebc1e8e 100644 --- a/src/main/java/vazkii/botania/common/crafting/recipe/TerraPickTippingRecipe.java +++ b/src/main/java/vazkii/botania/common/crafting/recipe/TerraPickTippingRecipe.java @@ -18,10 +18,12 @@ import net.minecraftforge.common.ForgeHooks; import vazkii.botania.common.item.ModItems; import vazkii.botania.common.item.equipment.tool.terrasteel.ItemTerraPick; +import javax.annotation.Nonnull; + public class TerraPickTippingRecipe implements IRecipe { @Override - public boolean matches(InventoryCrafting var1, World var2) { + public boolean matches(@Nonnull InventoryCrafting var1, @Nonnull World var2) { boolean foundTerraPick = false; boolean foundElementiumPick = false; @@ -42,7 +44,7 @@ public class TerraPickTippingRecipe implements IRecipe { } @Override - public ItemStack getCraftingResult(InventoryCrafting var1) { + public ItemStack getCraftingResult(@Nonnull InventoryCrafting var1) { ItemStack terraPick = null; for(int i = 0; i < var1.getSizeInventory(); i++) { @@ -69,8 +71,9 @@ public class TerraPickTippingRecipe implements IRecipe { return null; } + @Nonnull @Override - public ItemStack[] getRemainingItems(InventoryCrafting inv) { + public ItemStack[] getRemainingItems(@Nonnull InventoryCrafting inv) { return ForgeHooks.defaultRecipeGetRemainingItems(inv); } } diff --git a/src/main/java/vazkii/botania/common/entity/EntityBabylonWeapon.java b/src/main/java/vazkii/botania/common/entity/EntityBabylonWeapon.java index 12e5aefee..027f2d300 100644 --- a/src/main/java/vazkii/botania/common/entity/EntityBabylonWeapon.java +++ b/src/main/java/vazkii/botania/common/entity/EntityBabylonWeapon.java @@ -30,6 +30,7 @@ import vazkii.botania.common.item.ModItems; import vazkii.botania.common.item.equipment.tool.ToolCommons; import vazkii.botania.common.item.relic.ItemKingKey; +import javax.annotation.Nonnull; import java.util.List; public class EntityBabylonWeapon extends EntityThrowableCopy { @@ -168,7 +169,7 @@ public class EntityBabylonWeapon extends EntityThrowableCopy { } @Override - public void writeEntityToNBT(NBTTagCompound cmp) { + public void writeEntityToNBT(@Nonnull NBTTagCompound cmp) { super.writeEntityToNBT(cmp); cmp.setBoolean(TAG_CHARGING, isCharging()); cmp.setInteger(TAG_VARIETY, getVariety()); @@ -179,7 +180,7 @@ public class EntityBabylonWeapon extends EntityThrowableCopy { } @Override - public void readEntityFromNBT(NBTTagCompound cmp) { + public void readEntityFromNBT(@Nonnull NBTTagCompound cmp) { super.readEntityFromNBT(cmp); setCharging(cmp.getBoolean(TAG_CHARGING)); setVariety(cmp.getInteger(TAG_VARIETY)); diff --git a/src/main/java/vazkii/botania/common/entity/EntityCorporeaSpark.java b/src/main/java/vazkii/botania/common/entity/EntityCorporeaSpark.java index 00ceb941d..420497254 100644 --- a/src/main/java/vazkii/botania/common/entity/EntityCorporeaSpark.java +++ b/src/main/java/vazkii/botania/common/entity/EntityCorporeaSpark.java @@ -31,6 +31,7 @@ import vazkii.botania.api.corporea.InvWithLocation; import vazkii.botania.common.core.helper.InventoryHelper; import vazkii.botania.common.item.ModItems; +import javax.annotation.Nonnull; import java.util.ArrayList; import java.util.List; @@ -304,14 +305,14 @@ public class EntityCorporeaSpark extends Entity implements ICorporeaSpark { } @Override - protected void readEntityFromNBT(NBTTagCompound cmp) { + protected void readEntityFromNBT(@Nonnull NBTTagCompound cmp) { setMaster(cmp.getBoolean(TAG_MASTER)); setNetwork(EnumDyeColor.byMetadata(cmp.getInteger(TAG_NETWORK))); dataManager.set(INVISIBILITY, cmp.getInteger(TAG_INVIS)); } @Override - protected void writeEntityToNBT(NBTTagCompound cmp) { + protected void writeEntityToNBT(@Nonnull NBTTagCompound cmp) { cmp.setBoolean(TAG_MASTER, isMaster()); cmp.setInteger(TAG_NETWORK, getNetwork().getMetadata()); cmp.setInteger(TAG_INVIS, dataManager.get(INVISIBILITY)); diff --git a/src/main/java/vazkii/botania/common/entity/EntityDoppleganger.java b/src/main/java/vazkii/botania/common/entity/EntityDoppleganger.java index 3532e50d1..462bcd17f 100644 --- a/src/main/java/vazkii/botania/common/entity/EntityDoppleganger.java +++ b/src/main/java/vazkii/botania/common/entity/EntityDoppleganger.java @@ -81,6 +81,7 @@ import vazkii.botania.common.lib.LibMisc; import vazkii.botania.common.network.PacketBotaniaEffect; import vazkii.botania.common.network.PacketHandler; +import javax.annotation.Nonnull; import java.awt.*; import java.util.ArrayList; import java.util.Arrays; @@ -359,7 +360,7 @@ public class EntityDoppleganger extends EntityCreature implements IBotaniaBoss { } @Override - public boolean attackEntityFrom(DamageSource par1DamageSource, float par2) { + public boolean attackEntityFrom(@Nonnull DamageSource par1DamageSource, float par2) { Entity e = par1DamageSource.getEntity(); if((par1DamageSource.damageType.equals("player") || e instanceof EntityPixie) && e != null && isTruePlayer(e) && getInvulTime() == 0) { EntityPlayer player = (EntityPlayer) e; @@ -391,7 +392,7 @@ public class EntityDoppleganger extends EntityCreature implements IBotaniaBoss { } @Override - protected void damageEntity(DamageSource par1DamageSource, float par2) { + protected void damageEntity(@Nonnull DamageSource par1DamageSource, float par2) { super.damageEntity(par1DamageSource, par2); Entity attacker = par1DamageSource.getEntity(); @@ -413,7 +414,7 @@ public class EntityDoppleganger extends EntityCreature implements IBotaniaBoss { } @Override - public void onDeath(DamageSource p_70645_1_) { + public void onDeath(@Nonnull DamageSource p_70645_1_) { super.onDeath(p_70645_1_); EntityLivingBase entitylivingbase = getAttackingEntity(); if(entitylivingbase instanceof EntityPlayer) { @@ -445,7 +446,7 @@ public class EntityDoppleganger extends EntityCreature implements IBotaniaBoss { } @Override - protected void dropLoot(boolean wasRecentlyHit, int lootingModifier, DamageSource source) + protected void dropLoot(boolean wasRecentlyHit, int lootingModifier, @Nonnull DamageSource source) { // Save true killer, they get extra loot if ("player".equals(source.getDamageType()) diff --git a/src/main/java/vazkii/botania/common/entity/EntityEnderAirBottle.java b/src/main/java/vazkii/botania/common/entity/EntityEnderAirBottle.java index 54759b95a..0b6de8310 100644 --- a/src/main/java/vazkii/botania/common/entity/EntityEnderAirBottle.java +++ b/src/main/java/vazkii/botania/common/entity/EntityEnderAirBottle.java @@ -20,6 +20,7 @@ import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.RayTraceResult; import net.minecraft.world.World; +import javax.annotation.Nonnull; import java.util.ArrayList; import java.util.List; @@ -34,7 +35,7 @@ public class EntityEnderAirBottle extends EntityThrowable { } @Override - protected void onImpact(RayTraceResult pos) { + protected void onImpact(@Nonnull RayTraceResult pos) { if(pos.entityHit == null && !worldObj.isRemote) { List coordsList = getCoordsToPut(pos.getBlockPos()); worldObj.playEvent(2002, new BlockPos((int)Math.round(posX), (int)Math.round(posY), (int)Math.round(posZ)), 8); diff --git a/src/main/java/vazkii/botania/common/entity/EntityFlameRing.java b/src/main/java/vazkii/botania/common/entity/EntityFlameRing.java index 6e6fce8ee..8806bbdbc 100644 --- a/src/main/java/vazkii/botania/common/entity/EntityFlameRing.java +++ b/src/main/java/vazkii/botania/common/entity/EntityFlameRing.java @@ -22,6 +22,7 @@ import net.minecraft.world.World; import vazkii.botania.common.Botania; import vazkii.botania.common.core.helper.MathHelper; +import javax.annotation.Nonnull; import java.util.List; @@ -91,19 +92,19 @@ public class EntityFlameRing extends Entity { } @Override - public boolean attackEntityFrom(DamageSource par1DamageSource, float par2) { + public boolean attackEntityFrom(@Nonnull DamageSource par1DamageSource, float par2) { return false; } @Override - protected void readEntityFromNBT(NBTTagCompound var1) { + protected void readEntityFromNBT(@Nonnull NBTTagCompound var1) { // NO-OP } @Override - protected void writeEntityToNBT(NBTTagCompound var1) { + protected void writeEntityToNBT(@Nonnull NBTTagCompound var1) { // NO-OP } } \ No newline at end of file diff --git a/src/main/java/vazkii/botania/common/entity/EntityFlyingCreature.java b/src/main/java/vazkii/botania/common/entity/EntityFlyingCreature.java index fb274dd32..2af233082 100644 --- a/src/main/java/vazkii/botania/common/entity/EntityFlyingCreature.java +++ b/src/main/java/vazkii/botania/common/entity/EntityFlyingCreature.java @@ -17,6 +17,8 @@ import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.MathHelper; import net.minecraft.world.World; +import javax.annotation.Nonnull; + public class EntityFlyingCreature extends EntityAmbientCreature { public EntityFlyingCreature(World par1World) { @@ -29,7 +31,7 @@ public class EntityFlyingCreature extends EntityAmbientCreature { } @Override - protected void updateFallState(double y, boolean onGround, IBlockState state, BlockPos pos) { + protected void updateFallState(double y, boolean onGround, @Nonnull IBlockState state, @Nonnull BlockPos pos) { // NO-OP } diff --git a/src/main/java/vazkii/botania/common/entity/EntityMagicLandmine.java b/src/main/java/vazkii/botania/common/entity/EntityMagicLandmine.java index 00a6c4a4f..3c1eaad46 100644 --- a/src/main/java/vazkii/botania/common/entity/EntityMagicLandmine.java +++ b/src/main/java/vazkii/botania/common/entity/EntityMagicLandmine.java @@ -22,6 +22,7 @@ import net.minecraft.world.World; import vazkii.botania.api.sound.BotaniaSoundEvents; import vazkii.botania.common.Botania; +import javax.annotation.Nonnull; import java.util.List; public class EntityMagicLandmine extends Entity { @@ -78,11 +79,11 @@ public class EntityMagicLandmine extends Entity { } @Override - protected void readEntityFromNBT(NBTTagCompound var1) { + protected void readEntityFromNBT(@Nonnull NBTTagCompound var1) { } @Override - protected void writeEntityToNBT(NBTTagCompound var1) { + protected void writeEntityToNBT(@Nonnull NBTTagCompound var1) { } } diff --git a/src/main/java/vazkii/botania/common/entity/EntityMagicMissile.java b/src/main/java/vazkii/botania/common/entity/EntityMagicMissile.java index 965073c9b..0c9a2a0f7 100644 --- a/src/main/java/vazkii/botania/common/entity/EntityMagicMissile.java +++ b/src/main/java/vazkii/botania/common/entity/EntityMagicMissile.java @@ -32,6 +32,7 @@ import vazkii.botania.common.Botania; import vazkii.botania.common.core.helper.Vector3; import vazkii.botania.common.lib.LibObfuscation; +import javax.annotation.Nonnull; import java.util.List; public class EntityMagicMissile extends EntityThrowable { @@ -185,7 +186,7 @@ public class EntityMagicMissile extends EntityThrowable { } @Override - protected void onImpact(RayTraceResult pos) { + protected void onImpact(@Nonnull RayTraceResult pos) { switch (pos.typeOfHit) { case BLOCK: { Block block = worldObj.getBlockState(pos.getBlockPos()).getBlock(); diff --git a/src/main/java/vazkii/botania/common/entity/EntityManaBurst.java b/src/main/java/vazkii/botania/common/entity/EntityManaBurst.java index 9b31109b7..bb317befe 100644 --- a/src/main/java/vazkii/botania/common/entity/EntityManaBurst.java +++ b/src/main/java/vazkii/botania/common/entity/EntityManaBurst.java @@ -48,6 +48,7 @@ import vazkii.botania.common.core.handler.ConfigHandler; import vazkii.botania.common.core.helper.Vector3; import vazkii.botania.common.item.equipment.bauble.ItemTinyPlanet; +import javax.annotation.Nonnull; import java.awt.*; import java.util.ArrayList; import java.util.HashSet; @@ -377,7 +378,7 @@ public class EntityManaBurst extends EntityThrowable implements IManaBurst { } @Override - protected void onImpact(RayTraceResult rtr) { + protected void onImpact(@Nonnull RayTraceResult rtr) { boolean collided = false; boolean dead = false; diff --git a/src/main/java/vazkii/botania/common/entity/EntityManaStorm.java b/src/main/java/vazkii/botania/common/entity/EntityManaStorm.java index 4343aad6c..9e9586a53 100644 --- a/src/main/java/vazkii/botania/common/entity/EntityManaStorm.java +++ b/src/main/java/vazkii/botania/common/entity/EntityManaStorm.java @@ -18,6 +18,8 @@ import vazkii.botania.common.core.helper.Vector3; import vazkii.botania.common.item.ModItems; import vazkii.botania.common.item.lens.ItemLens; +import javax.annotation.Nonnull; + public class EntityManaStorm extends Entity { private static final String TAG_TIME = "time"; @@ -82,14 +84,14 @@ public class EntityManaStorm extends Entity { } @Override - protected void readEntityFromNBT(NBTTagCompound cmp) { + protected void readEntityFromNBT(@Nonnull NBTTagCompound cmp) { liveTime = cmp.getInteger(TAG_TIME); burstsFired = cmp.getInteger(TAG_BURSTS_FIRED); deathTime = cmp.getInteger(TAG_DEATH_TIME); } @Override - protected void writeEntityToNBT(NBTTagCompound cmp) { + protected void writeEntityToNBT(@Nonnull NBTTagCompound cmp) { cmp.setInteger(TAG_TIME, liveTime); cmp.setInteger(TAG_BURSTS_FIRED, burstsFired); cmp.setInteger(TAG_DEATH_TIME, deathTime); diff --git a/src/main/java/vazkii/botania/common/entity/EntityPinkWither.java b/src/main/java/vazkii/botania/common/entity/EntityPinkWither.java index 9fe9a093f..3e1b721ed 100644 --- a/src/main/java/vazkii/botania/common/entity/EntityPinkWither.java +++ b/src/main/java/vazkii/botania/common/entity/EntityPinkWither.java @@ -23,6 +23,7 @@ import net.minecraft.util.EnumParticleTypes; import net.minecraft.util.math.MathHelper; import net.minecraft.world.World; +import javax.annotation.Nonnull; import java.util.Iterator; public class EntityPinkWither extends EntityWither { @@ -82,7 +83,7 @@ public class EntityPinkWither extends EntityWither { } @Override - public void addTrackingPlayer(EntityPlayerMP player) + public void addTrackingPlayer(@Nonnull EntityPlayerMP player) { // NO-OP } diff --git a/src/main/java/vazkii/botania/common/entity/EntityPixie.java b/src/main/java/vazkii/botania/common/entity/EntityPixie.java index 77088c978..148690dfa 100644 --- a/src/main/java/vazkii/botania/common/entity/EntityPixie.java +++ b/src/main/java/vazkii/botania/common/entity/EntityPixie.java @@ -21,6 +21,8 @@ import net.minecraft.util.DamageSource; import net.minecraft.world.World; import vazkii.botania.common.Botania; +import javax.annotation.Nonnull; + public class EntityPixie extends EntityFlyingCreature { private static final DataParameter TYPE = EntityDataManager.createKey(EntityPixie.class, DataSerializers.VARINT); @@ -100,7 +102,7 @@ public class EntityPixie extends EntityFlyingCreature { } @Override - public boolean attackEntityFrom(DamageSource par1DamageSource, float par2) { + public boolean attackEntityFrom(@Nonnull DamageSource par1DamageSource, float par2) { if(getType() == 0 && par1DamageSource.getEntity() != summoner || getType() == 1 && par1DamageSource.getEntity() instanceof EntityPlayer) return super.attackEntityFrom(par1DamageSource, par2); return false; diff --git a/src/main/java/vazkii/botania/common/entity/EntityPoolMinecart.java b/src/main/java/vazkii/botania/common/entity/EntityPoolMinecart.java index 74c7b343a..117e218f0 100644 --- a/src/main/java/vazkii/botania/common/entity/EntityPoolMinecart.java +++ b/src/main/java/vazkii/botania/common/entity/EntityPoolMinecart.java @@ -34,6 +34,7 @@ import vazkii.botania.common.block.tile.mana.TilePool; import vazkii.botania.common.block.tile.mana.TilePump; import vazkii.botania.common.item.ModItems; +import javax.annotation.Nonnull; import java.awt.*; public class EntityPoolMinecart extends EntityMinecart { @@ -56,16 +57,19 @@ public class EntityPoolMinecart extends EntityMinecart { dataManager.register(MANA, 0); } + @Nonnull @Override public IBlockState getDisplayTile() { return ModBlocks.pool.getDefaultState(); } + @Nonnull @Override public ItemStack getCartItem() { return new ItemStack(ModItems.poolMinecart); } + @Nonnull @Override public EntityMinecart.Type getType() { return Type.RIDEABLE; @@ -163,7 +167,7 @@ public class EntityPoolMinecart extends EntityMinecart { } @Override - protected void writeEntityToNBT(NBTTagCompound p_70014_1_) { + protected void writeEntityToNBT(@Nonnull NBTTagCompound p_70014_1_) { super.writeEntityToNBT(p_70014_1_); p_70014_1_.setInteger(TAG_MANA, getMana()); } diff --git a/src/main/java/vazkii/botania/common/entity/EntitySignalFlare.java b/src/main/java/vazkii/botania/common/entity/EntitySignalFlare.java index 033dc6087..a875df189 100644 --- a/src/main/java/vazkii/botania/common/entity/EntitySignalFlare.java +++ b/src/main/java/vazkii/botania/common/entity/EntitySignalFlare.java @@ -20,6 +20,8 @@ import net.minecraft.network.datasync.EntityDataManager; import net.minecraft.world.World; import vazkii.botania.common.Botania; +import javax.annotation.Nonnull; + public class EntitySignalFlare extends Entity { private static final String COLOR_TAG = "color"; @@ -64,12 +66,12 @@ public class EntitySignalFlare extends Entity { } @Override - protected void readEntityFromNBT(NBTTagCompound nbttagcompound) { + protected void readEntityFromNBT(@Nonnull NBTTagCompound nbttagcompound) { setColor(nbttagcompound.getInteger(COLOR_TAG)); } @Override - protected void writeEntityToNBT(NBTTagCompound nbttagcompound) { + protected void writeEntityToNBT(@Nonnull NBTTagCompound nbttagcompound) { nbttagcompound.setInteger(COLOR_TAG, getColor()); } diff --git a/src/main/java/vazkii/botania/common/entity/EntitySpark.java b/src/main/java/vazkii/botania/common/entity/EntitySpark.java index aa0e6b2db..ee306542d 100644 --- a/src/main/java/vazkii/botania/common/entity/EntitySpark.java +++ b/src/main/java/vazkii/botania/common/entity/EntitySpark.java @@ -34,6 +34,7 @@ import vazkii.botania.common.Botania; import vazkii.botania.common.core.helper.Vector3; import vazkii.botania.common.item.ModItems; +import javax.annotation.Nonnull; import java.awt.*; import java.util.ArrayList; import java.util.Arrays; @@ -300,13 +301,13 @@ public class EntitySpark extends Entity implements ISparkEntity { } @Override - protected void readEntityFromNBT(NBTTagCompound cmp) { + protected void readEntityFromNBT(@Nonnull NBTTagCompound cmp) { setUpgrade(SparkUpgradeType.values()[cmp.getInteger(TAG_UPGRADE)]); dataManager.set(INVISIBILITY, cmp.getInteger(TAG_INVIS)); } @Override - protected void writeEntityToNBT(NBTTagCompound cmp) { + protected void writeEntityToNBT(@Nonnull NBTTagCompound cmp) { cmp.setInteger(TAG_UPGRADE, getUpgrade().ordinal()); cmp.setInteger(TAG_INVIS, dataManager.get(INVISIBILITY)); } diff --git a/src/main/java/vazkii/botania/common/entity/EntityThornChakram.java b/src/main/java/vazkii/botania/common/entity/EntityThornChakram.java index 1d690b4b3..eb9b57e74 100644 --- a/src/main/java/vazkii/botania/common/entity/EntityThornChakram.java +++ b/src/main/java/vazkii/botania/common/entity/EntityThornChakram.java @@ -33,6 +33,8 @@ import vazkii.botania.common.core.helper.MathHelper; import vazkii.botania.common.core.helper.Vector3; import vazkii.botania.common.item.ModItems; +import javax.annotation.Nonnull; + public class EntityThornChakram extends EntityThrowable { private static final DataParameter BOUNCES = EntityDataManager.createKey(EntityThornChakram.class, DataSerializers.VARINT); @@ -113,7 +115,7 @@ public class EntityThornChakram extends EntityThrowable { } @Override - protected void onImpact(RayTraceResult pos) { + protected void onImpact(@Nonnull RayTraceResult pos) { if(noClip) return; diff --git a/src/main/java/vazkii/botania/common/entity/EntityThrowableCopy.java b/src/main/java/vazkii/botania/common/entity/EntityThrowableCopy.java index 962094663..42f1a7d3c 100644 --- a/src/main/java/vazkii/botania/common/entity/EntityThrowableCopy.java +++ b/src/main/java/vazkii/botania/common/entity/EntityThrowableCopy.java @@ -29,6 +29,7 @@ import net.minecraft.world.WorldServer; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; +import javax.annotation.Nonnull; import java.util.List; import java.util.UUID; @@ -337,7 +338,7 @@ public abstract class EntityThrowableCopy extends Entity implements IProjectile /** * (abstract) Protected helper method to write subclass entity data to NBT. */ - public void writeEntityToNBT(NBTTagCompound compound) + public void writeEntityToNBT(@Nonnull NBTTagCompound compound) { compound.setInteger("xTile", this.xTile); compound.setInteger("yTile", this.yTile); @@ -358,7 +359,7 @@ public abstract class EntityThrowableCopy extends Entity implements IProjectile /** * (abstract) Protected helper method to read subclass entity data from NBT. */ - public void readEntityFromNBT(NBTTagCompound compound) + public void readEntityFromNBT(@Nonnull NBTTagCompound compound) { this.xTile = compound.getInteger("xTile"); this.yTile = compound.getInteger("yTile"); diff --git a/src/main/java/vazkii/botania/common/entity/EntityThrownItem.java b/src/main/java/vazkii/botania/common/entity/EntityThrownItem.java index 7561ec312..e99c26e64 100644 --- a/src/main/java/vazkii/botania/common/entity/EntityThrownItem.java +++ b/src/main/java/vazkii/botania/common/entity/EntityThrownItem.java @@ -22,6 +22,7 @@ import net.minecraft.world.World; import vazkii.botania.common.core.handler.MethodHandles; import vazkii.botania.common.core.helper.Vector3; +import javax.annotation.Nonnull; import java.util.List; public class EntityThrownItem extends EntityItem { @@ -46,7 +47,7 @@ public class EntityThrownItem extends EntityItem { } @Override - public boolean isEntityInvulnerable(DamageSource source) { + public boolean isEntityInvulnerable(@Nonnull DamageSource source) { return true; } diff --git a/src/main/java/vazkii/botania/common/entity/EntityVineBall.java b/src/main/java/vazkii/botania/common/entity/EntityVineBall.java index 9390d7a2a..9fe5c392a 100644 --- a/src/main/java/vazkii/botania/common/entity/EntityVineBall.java +++ b/src/main/java/vazkii/botania/common/entity/EntityVineBall.java @@ -29,6 +29,7 @@ import net.minecraft.world.World; import vazkii.botania.common.block.ModBlocks; import vazkii.botania.common.item.ModItems; +import javax.annotation.Nonnull; import java.util.Map; public class EntityVineBall extends EntityThrowable { @@ -53,7 +54,7 @@ public class EntityVineBall extends EntityThrowable { } @Override - protected void onImpact(RayTraceResult var1) { + protected void onImpact(@Nonnull RayTraceResult var1) { if(worldObj.isRemote) { for(int j = 0; j < 16; j++) { diff --git a/src/main/java/vazkii/botania/common/item/Item16Colors.java b/src/main/java/vazkii/botania/common/item/Item16Colors.java index 56c5a665d..1fa3d4ce0 100644 --- a/src/main/java/vazkii/botania/common/item/Item16Colors.java +++ b/src/main/java/vazkii/botania/common/item/Item16Colors.java @@ -15,6 +15,7 @@ import net.minecraft.item.EnumDyeColor; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; +import javax.annotation.Nonnull; import java.util.List; public class Item16Colors extends ItemMod implements IColorable { @@ -33,11 +34,12 @@ public class Item16Colors extends ItemMod implements IColorable { } @Override - public void getSubItems(Item item, CreativeTabs par2CreativeTabs, List par3List) { + public void getSubItems(@Nonnull Item item, CreativeTabs par2CreativeTabs, List par3List) { for(int i = 0; i < 16; i++) par3List.add(new ItemStack(item, 1, i)); } + @Nonnull @Override public String getUnlocalizedName(ItemStack par1ItemStack) { return getUnlocalizedNameLazy(par1ItemStack) + par1ItemStack.getItemDamage(); diff --git a/src/main/java/vazkii/botania/common/item/ItemAncientWill.java b/src/main/java/vazkii/botania/common/item/ItemAncientWill.java index ec8416134..09b57d765 100644 --- a/src/main/java/vazkii/botania/common/item/ItemAncientWill.java +++ b/src/main/java/vazkii/botania/common/item/ItemAncientWill.java @@ -21,6 +21,7 @@ import net.minecraftforge.oredict.RecipeSorter.Category; import vazkii.botania.common.crafting.recipe.AncientWillRecipe; import vazkii.botania.common.lib.LibItemNames; +import javax.annotation.Nonnull; import java.util.List; public class ItemAncientWill extends ItemMod { @@ -37,7 +38,7 @@ public class ItemAncientWill extends ItemMod { } @Override - public void getSubItems(Item item, CreativeTabs tab, List list) { + public void getSubItems(@Nonnull Item item, CreativeTabs tab, List list) { for(int i = 0; i < SUBTYPES; i++) list.add(new ItemStack(item, 1, i)); } @@ -52,6 +53,7 @@ public class ItemAncientWill extends ItemMod { tooltip.add(s.replaceAll("&", "\u00a7")); } + @Nonnull @Override public String getUnlocalizedName(ItemStack par1ItemStack) { return super.getUnlocalizedName(par1ItemStack) + par1ItemStack.getItemDamage(); diff --git a/src/main/java/vazkii/botania/common/item/ItemBaubleBox.java b/src/main/java/vazkii/botania/common/item/ItemBaubleBox.java index 7fa64f914..b9eacf578 100644 --- a/src/main/java/vazkii/botania/common/item/ItemBaubleBox.java +++ b/src/main/java/vazkii/botania/common/item/ItemBaubleBox.java @@ -23,6 +23,8 @@ import vazkii.botania.common.core.helper.ItemNBTHelper; import vazkii.botania.common.lib.LibGuiIDs; import vazkii.botania.common.lib.LibItemNames; +import javax.annotation.Nonnull; + public class ItemBaubleBox extends ItemMod { private static final String TAG_ITEMS = "InvItems"; @@ -33,8 +35,9 @@ public class ItemBaubleBox extends ItemMod { setMaxStackSize(1); } + @Nonnull @Override - public ActionResult onItemRightClick(ItemStack stack, World world, EntityPlayer player, EnumHand hand) { + public ActionResult onItemRightClick(@Nonnull ItemStack stack, World world, EntityPlayer player, EnumHand hand) { player.openGui(Botania.instance, LibGuiIDs.BAUBLE_BOX, world, 0, 0, 0); return ActionResult.newResult(EnumActionResult.SUCCESS, stack); } diff --git a/src/main/java/vazkii/botania/common/item/ItemBlackHoleTalisman.java b/src/main/java/vazkii/botania/common/item/ItemBlackHoleTalisman.java index 510581dc9..9a26ae81b 100644 --- a/src/main/java/vazkii/botania/common/item/ItemBlackHoleTalisman.java +++ b/src/main/java/vazkii/botania/common/item/ItemBlackHoleTalisman.java @@ -44,6 +44,7 @@ import vazkii.botania.common.core.helper.ItemNBTHelper; import vazkii.botania.common.crafting.recipe.BlackHoleTalismanExtractRecipe; import vazkii.botania.common.lib.LibItemNames; +import javax.annotation.Nonnull; import java.util.Arrays; import java.util.List; @@ -62,8 +63,9 @@ public class ItemBlackHoleTalisman extends ItemMod implements IBlockProvider { RecipeSorter.register("botania:blackHoleTalismanExtract", BlackHoleTalismanExtractRecipe.class, Category.SHAPELESS, ""); } + @Nonnull @Override - public ActionResult onItemRightClick(ItemStack par1ItemStack, World par2World, EntityPlayer par3EntityPlayer, EnumHand hand) { + public ActionResult onItemRightClick(@Nonnull ItemStack par1ItemStack, World par2World, EntityPlayer par3EntityPlayer, EnumHand hand) { if(getBlock(par1ItemStack) != Blocks.AIR && par3EntityPlayer.isSneaking()) { int dmg = par1ItemStack.getItemDamage(); par1ItemStack.setItemDamage(~dmg & 1); @@ -74,6 +76,7 @@ public class ItemBlackHoleTalisman extends ItemMod implements IBlockProvider { return ActionResult.newResult(EnumActionResult.PASS, par1ItemStack); } + @Nonnull @Override public EnumActionResult onItemUse(ItemStack par1ItemStack, EntityPlayer par2EntityPlayer, World par3World, BlockPos pos, EnumHand hand, EnumFacing side, float par8, float par9, float par10) { IBlockState state = par3World.getBlockState(pos); @@ -187,8 +190,9 @@ public class ItemBlackHoleTalisman extends ItemMod implements IBlockProvider { } } + @Nonnull @Override - public String getItemStackDisplayName(ItemStack par1ItemStack) { + public String getItemStackDisplayName(@Nonnull ItemStack par1ItemStack) { Block block = getBlock(par1ItemStack); int meta = getBlockMeta(par1ItemStack); ItemStack stack = new ItemStack(block, 1, meta); @@ -196,8 +200,9 @@ public class ItemBlackHoleTalisman extends ItemMod implements IBlockProvider { return super.getItemStackDisplayName(par1ItemStack) + (stack == null || stack.getItem() == null ? "" : " (" + TextFormatting.GREEN + stack.getDisplayName() + TextFormatting.RESET + ")"); } + @Nonnull @Override - public ItemStack getContainerItem(ItemStack itemStack) { + public ItemStack getContainerItem(@Nonnull ItemStack itemStack) { int count = getBlockCount(itemStack); if(count == 0) return null; diff --git a/src/main/java/vazkii/botania/common/item/ItemBlackLotus.java b/src/main/java/vazkii/botania/common/item/ItemBlackLotus.java index 769ad9129..42b3d4834 100644 --- a/src/main/java/vazkii/botania/common/item/ItemBlackLotus.java +++ b/src/main/java/vazkii/botania/common/item/ItemBlackLotus.java @@ -24,6 +24,7 @@ import vazkii.botania.api.sound.BotaniaSoundEvents; import vazkii.botania.common.Botania; import vazkii.botania.common.lib.LibItemNames; +import javax.annotation.Nonnull; import java.util.List; public class ItemBlackLotus extends ItemMod implements IManaDissolvable { @@ -37,7 +38,7 @@ public class ItemBlackLotus extends ItemMod implements IManaDissolvable { } @Override - public void getSubItems(Item item, CreativeTabs tab, List list) { + public void getSubItems(@Nonnull Item item, CreativeTabs tab, List list) { for(int i = 0; i < 2; i++) list.add(new ItemStack(item, 1, i)); } @@ -47,6 +48,7 @@ public class ItemBlackLotus extends ItemMod implements IManaDissolvable { return par1ItemStack.getItemDamage() > 0; } + @Nonnull @Override public String getUnlocalizedName(ItemStack par1ItemStack) { return super.getUnlocalizedName(par1ItemStack) + par1ItemStack.getItemDamage(); diff --git a/src/main/java/vazkii/botania/common/item/ItemBottledMana.java b/src/main/java/vazkii/botania/common/item/ItemBottledMana.java index 61d7627cb..7e6db88f1 100644 --- a/src/main/java/vazkii/botania/common/item/ItemBottledMana.java +++ b/src/main/java/vazkii/botania/common/item/ItemBottledMana.java @@ -37,6 +37,7 @@ import vazkii.botania.common.entity.EntityPixie; import vazkii.botania.common.entity.EntitySignalFlare; import vazkii.botania.common.lib.LibItemNames; +import javax.annotation.Nonnull; import java.util.List; import java.util.Random; @@ -211,14 +212,15 @@ public class ItemBottledMana extends ItemMod { par3List.add(I18n.translateToLocal("botaniamisc.bottleTooltip")); } + @Nonnull @Override - public ActionResult onItemRightClick(ItemStack par1ItemStack, World par2World, EntityPlayer par3EntityPlayer, EnumHand hand) { + public ActionResult onItemRightClick(@Nonnull ItemStack par1ItemStack, World par2World, EntityPlayer par3EntityPlayer, EnumHand hand) { par3EntityPlayer.setActiveHand(hand); return ActionResult.newResult(EnumActionResult.SUCCESS, par1ItemStack); } @Override - public ItemStack onItemUseFinish(ItemStack par1ItemStack, World par2World, EntityLivingBase living) { + public ItemStack onItemUseFinish(@Nonnull ItemStack par1ItemStack, World par2World, EntityLivingBase living) { randomEffect(living, par1ItemStack); par1ItemStack.setItemDamage(par1ItemStack.getItemDamage() + 1); randomSeed(par1ItemStack); @@ -233,6 +235,7 @@ public class ItemBottledMana extends ItemMod { return 20; } + @Nonnull @Override public EnumAction getItemUseAction(ItemStack par1ItemStack) { return EnumAction.DRINK; diff --git a/src/main/java/vazkii/botania/common/item/ItemCacophonium.java b/src/main/java/vazkii/botania/common/item/ItemCacophonium.java index fb2806006..7b5ea9be3 100644 --- a/src/main/java/vazkii/botania/common/item/ItemCacophonium.java +++ b/src/main/java/vazkii/botania/common/item/ItemCacophonium.java @@ -41,6 +41,7 @@ import vazkii.botania.common.core.helper.ItemNBTHelper; import vazkii.botania.common.lib.LibItemNames; import vazkii.botania.common.lib.LibObfuscation; +import javax.annotation.Nonnull; import java.util.List; public class ItemCacophonium extends ItemMod implements ICraftAchievement { @@ -89,6 +90,7 @@ public class ItemCacophonium extends ItemMod implements ICraftAchievement { return false; } + @Nonnull @Override public EnumActionResult onItemUse(ItemStack stack, EntityPlayer player, World world, BlockPos pos, EnumHand hand, EnumFacing side, float xs, float ys, float zs) { boolean can = isDOIT(stack); @@ -120,6 +122,7 @@ public class ItemCacophonium extends ItemMod implements ICraftAchievement { list.add(I18n.translateToLocal(ItemNBTHelper.getString(stack, TAG_SOUND_NAME, ""))); } + @Nonnull @Override public EnumAction getItemUseAction(ItemStack par1ItemStack) { return EnumAction.BLOCK; @@ -130,8 +133,9 @@ public class ItemCacophonium extends ItemMod implements ICraftAchievement { return 72000; } + @Nonnull @Override - public ActionResult onItemRightClick(ItemStack par1ItemStack, World par2World, EntityPlayer par3EntityPlayer, EnumHand hand) { + public ActionResult onItemRightClick(@Nonnull ItemStack par1ItemStack, World par2World, EntityPlayer par3EntityPlayer, EnumHand hand) { if(ItemNBTHelper.getBoolean(par1ItemStack, TAG_HAS_SOUND, false) || isDOIT(par1ItemStack)) par3EntityPlayer.setActiveHand(hand); return ActionResult.newResult(EnumActionResult.SUCCESS, par1ItemStack); diff --git a/src/main/java/vazkii/botania/common/item/ItemCorporeaSpark.java b/src/main/java/vazkii/botania/common/item/ItemCorporeaSpark.java index e49e1026b..ee43f0c29 100644 --- a/src/main/java/vazkii/botania/common/item/ItemCorporeaSpark.java +++ b/src/main/java/vazkii/botania/common/item/ItemCorporeaSpark.java @@ -25,6 +25,7 @@ import vazkii.botania.api.corporea.CorporeaHelper; import vazkii.botania.common.entity.EntityCorporeaSpark; import vazkii.botania.common.lib.LibItemNames; +import javax.annotation.Nonnull; import java.util.List; public class ItemCorporeaSpark extends ItemMod { @@ -35,11 +36,12 @@ public class ItemCorporeaSpark extends ItemMod { } @Override - public void getSubItems(Item item, CreativeTabs tab, List list) { + public void getSubItems(@Nonnull Item item, CreativeTabs tab, List list) { for(int i = 0; i < 2; i++) list.add(new ItemStack(item, 1, i)); } + @Nonnull @Override public EnumActionResult onItemUse(ItemStack stack, EntityPlayer player, World world, BlockPos pos, EnumHand hand, EnumFacing side, float xv, float yv, float zv) { TileEntity tile = world.getTileEntity(pos); @@ -59,6 +61,7 @@ public class ItemCorporeaSpark extends ItemMod { return EnumActionResult.PASS; } + @Nonnull @Override public String getUnlocalizedName(ItemStack par1ItemStack) { return super.getUnlocalizedName(par1ItemStack) + par1ItemStack.getItemDamage(); diff --git a/src/main/java/vazkii/botania/common/item/ItemCraftPattern.java b/src/main/java/vazkii/botania/common/item/ItemCraftPattern.java index a37306976..1a09dc651 100644 --- a/src/main/java/vazkii/botania/common/item/ItemCraftPattern.java +++ b/src/main/java/vazkii/botania/common/item/ItemCraftPattern.java @@ -23,6 +23,7 @@ import net.minecraft.world.World; import vazkii.botania.common.block.tile.TileCraftCrate; import vazkii.botania.common.lib.LibItemNames; +import javax.annotation.Nonnull; import java.util.List; public class ItemCraftPattern extends ItemMod { @@ -33,6 +34,7 @@ public class ItemCraftPattern extends ItemMod { setMaxStackSize(1); } + @Nonnull @Override public EnumActionResult onItemUse(ItemStack stack, EntityPlayer p, World world, BlockPos pos, EnumHand hand, EnumFacing side, float xs, float ys, float zs) { TileEntity tile = world.getTileEntity(pos); @@ -46,11 +48,12 @@ public class ItemCraftPattern extends ItemMod { } @Override - public void getSubItems(Item item, CreativeTabs tab, List list) { + public void getSubItems(@Nonnull Item item, CreativeTabs tab, List list) { for(int i = 0; i < TileCraftCrate.PATTERNS.length; i++) list.add(new ItemStack(item, 1, i)); } + @Nonnull @Override public String getUnlocalizedName(ItemStack par1ItemStack) { return super.getUnlocalizedName(par1ItemStack) + par1ItemStack.getItemDamage(); diff --git a/src/main/java/vazkii/botania/common/item/ItemCraftingHalo.java b/src/main/java/vazkii/botania/common/item/ItemCraftingHalo.java index 1df8331ce..639e60fca 100644 --- a/src/main/java/vazkii/botania/common/item/ItemCraftingHalo.java +++ b/src/main/java/vazkii/botania/common/item/ItemCraftingHalo.java @@ -64,6 +64,8 @@ import vazkii.botania.common.core.helper.Vector3; import vazkii.botania.common.lib.LibGuiIDs; import vazkii.botania.common.lib.LibItemNames; +import javax.annotation.Nonnull; + public class ItemCraftingHalo extends ItemMod implements ICraftAchievement { private static final ResourceLocation glowTexture = new ResourceLocation(LibResources.MISC_GLOW_GREEN); @@ -87,8 +89,9 @@ public class ItemCraftingHalo extends ItemMod implements ICraftAchievement { setMaxStackSize(1); } + @Nonnull @Override - public ActionResult onItemRightClick(ItemStack stack, World world, EntityPlayer player, EnumHand hand) { + public ActionResult onItemRightClick(@Nonnull ItemStack stack, World world, EntityPlayer player, EnumHand hand) { int segment = getSegmentLookedAt(stack, player); ItemStack itemForPos = getItemForSlot(stack, segment); diff --git a/src/main/java/vazkii/botania/common/item/ItemEnderHand.java b/src/main/java/vazkii/botania/common/item/ItemEnderHand.java index 8988b31f3..cbc2c6606 100644 --- a/src/main/java/vazkii/botania/common/item/ItemEnderHand.java +++ b/src/main/java/vazkii/botania/common/item/ItemEnderHand.java @@ -27,6 +27,8 @@ import vazkii.botania.common.core.handler.ConfigHandler; import vazkii.botania.common.item.rod.ItemExchangeRod; import vazkii.botania.common.lib.LibItemNames; +import javax.annotation.Nonnull; + public class ItemEnderHand extends ItemMod implements IManaUsingItem, IBlockProvider { private static final int COST_PROVIDE = 5; @@ -38,8 +40,9 @@ public class ItemEnderHand extends ItemMod implements IManaUsingItem, IBlockProv setMaxStackSize(1); } + @Nonnull @Override - public ActionResult onItemRightClick(ItemStack stack, World world, EntityPlayer player, EnumHand hand) { + public ActionResult onItemRightClick(@Nonnull ItemStack stack, World world, EntityPlayer player, EnumHand hand) { if(ManaItemHandler.requestManaExact(stack, player, COST_SELF, false)) { player.displayGUIChest(player.getInventoryEnderChest()); ManaItemHandler.requestManaExact(stack, player, COST_SELF, true); diff --git a/src/main/java/vazkii/botania/common/item/ItemFertilizer.java b/src/main/java/vazkii/botania/common/item/ItemFertilizer.java index 7212d1368..66a6477b5 100644 --- a/src/main/java/vazkii/botania/common/item/ItemFertilizer.java +++ b/src/main/java/vazkii/botania/common/item/ItemFertilizer.java @@ -23,6 +23,7 @@ import vazkii.botania.common.Botania; import vazkii.botania.common.block.ModBlocks; import vazkii.botania.common.lib.LibItemNames; +import javax.annotation.Nonnull; import java.util.ArrayList; import java.util.List; @@ -32,6 +33,7 @@ public class ItemFertilizer extends ItemMod { super(LibItemNames.FERTILIZER); } + @Nonnull @Override public EnumActionResult onItemUse(ItemStack par1ItemStack, EntityPlayer par2EntityPlayer, World par3World, BlockPos pos, EnumHand hand, EnumFacing side, float par8, float par9, float par10) { final int range = 3; diff --git a/src/main/java/vazkii/botania/common/item/ItemFlowerBag.java b/src/main/java/vazkii/botania/common/item/ItemFlowerBag.java index 8d2680a58..5f5942f23 100644 --- a/src/main/java/vazkii/botania/common/item/ItemFlowerBag.java +++ b/src/main/java/vazkii/botania/common/item/ItemFlowerBag.java @@ -37,6 +37,8 @@ import vazkii.botania.common.core.helper.ItemNBTHelper; import vazkii.botania.common.lib.LibGuiIDs; import vazkii.botania.common.lib.LibItemNames; +import javax.annotation.Nonnull; + public class ItemFlowerBag extends ItemMod { private static final String TAG_ITEMS = "InvItems"; @@ -91,12 +93,14 @@ public class ItemFlowerBag extends ItemMod { } } + @Nonnull @Override - public ActionResult onItemRightClick(ItemStack stack, World world, EntityPlayer player, EnumHand hand) { + public ActionResult onItemRightClick(@Nonnull ItemStack stack, World world, EntityPlayer player, EnumHand hand) { player.openGui(Botania.instance, LibGuiIDs.FLOWER_BAG, world, 0, 0, 0); return ActionResult.newResult(EnumActionResult.SUCCESS, stack); } + @Nonnull @Override public EnumActionResult onItemUse(ItemStack stack, EntityPlayer player, World world, BlockPos pos, EnumHand hand, EnumFacing side, float xs, float ys, float zs) { TileEntity tile = world.getTileEntity(pos); diff --git a/src/main/java/vazkii/botania/common/item/ItemGaiaHead.java b/src/main/java/vazkii/botania/common/item/ItemGaiaHead.java index 9375eba63..57f292cb0 100644 --- a/src/main/java/vazkii/botania/common/item/ItemGaiaHead.java +++ b/src/main/java/vazkii/botania/common/item/ItemGaiaHead.java @@ -27,6 +27,8 @@ import net.minecraft.world.World; import vazkii.botania.common.block.ModBlocks; import vazkii.botania.common.lib.LibItemNames; +import javax.annotation.Nonnull; + public class ItemGaiaHead extends ItemMod { public ItemGaiaHead() { @@ -34,6 +36,7 @@ public class ItemGaiaHead extends ItemMod { } // Copied from vanila skull itemBlock. Relevant edits are indicated. + @Nonnull @Override public EnumActionResult onItemUse(ItemStack stack, EntityPlayer playerIn, World worldIn, BlockPos pos, EnumHand hand, EnumFacing facing, float hitX, float hitY, float hitZ) { if (facing == EnumFacing.DOWN) { diff --git a/src/main/java/vazkii/botania/common/item/ItemGrassHorn.java b/src/main/java/vazkii/botania/common/item/ItemGrassHorn.java index 040c4af56..4bed500cd 100644 --- a/src/main/java/vazkii/botania/common/item/ItemGrassHorn.java +++ b/src/main/java/vazkii/botania/common/item/ItemGrassHorn.java @@ -34,6 +34,7 @@ import vazkii.botania.api.subtile.ISpecialFlower; import vazkii.botania.common.core.handler.ConfigHandler; import vazkii.botania.common.lib.LibItemNames; +import javax.annotation.Nonnull; import java.util.ArrayList; import java.util.Collections; import java.util.List; @@ -50,11 +51,12 @@ public class ItemGrassHorn extends ItemMod { } @Override - public void getSubItems(Item item, CreativeTabs tab, List list) { + public void getSubItems(@Nonnull Item item, CreativeTabs tab, List list) { for(int i = 0; i < SUBTYPES; i++) list.add(new ItemStack(item, 1, i)); } + @Nonnull @Override public String getUnlocalizedName(ItemStack par1ItemStack) { return getUnlocalizedNameLazy(par1ItemStack) + par1ItemStack.getItemDamage(); @@ -64,6 +66,7 @@ public class ItemGrassHorn extends ItemMod { return super.getUnlocalizedName(par1ItemStack); } + @Nonnull @Override public EnumAction getItemUseAction(ItemStack par1ItemStack) { return EnumAction.BOW; @@ -74,8 +77,9 @@ public class ItemGrassHorn extends ItemMod { return 72000; } + @Nonnull @Override - public ActionResult onItemRightClick(ItemStack par1ItemStack, World par2World, EntityPlayer par3EntityPlayer, EnumHand hand) { + public ActionResult onItemRightClick(@Nonnull ItemStack par1ItemStack, World par2World, EntityPlayer par3EntityPlayer, EnumHand hand) { par3EntityPlayer.setActiveHand(hand); return ActionResult.newResult(EnumActionResult.SUCCESS, par1ItemStack); } diff --git a/src/main/java/vazkii/botania/common/item/ItemGrassSeeds.java b/src/main/java/vazkii/botania/common/item/ItemGrassSeeds.java index 791af53b6..a2079b934 100644 --- a/src/main/java/vazkii/botania/common/item/ItemGrassSeeds.java +++ b/src/main/java/vazkii/botania/common/item/ItemGrassSeeds.java @@ -35,6 +35,7 @@ import vazkii.botania.common.Botania; import vazkii.botania.common.block.ModBlocks; import vazkii.botania.common.lib.LibItemNames; +import javax.annotation.Nonnull; import java.util.ArrayList; import java.util.HashMap; import java.util.HashSet; @@ -67,16 +68,18 @@ public class ItemGrassSeeds extends ItemMod implements IFloatingFlowerVariant { } @Override - public void getSubItems(Item par1, CreativeTabs par2, List par3) { + public void getSubItems(@Nonnull Item par1, CreativeTabs par2, List par3) { for(int i = 0; i < SUBTYPES; i++) par3.add(new ItemStack(par1, 1, i)); } + @Nonnull @Override public String getUnlocalizedName(ItemStack stack) { return super.getUnlocalizedName() + stack.getItemDamage(); } + @Nonnull @Override public EnumActionResult onItemUse(ItemStack par1ItemStack, EntityPlayer par2EntityPlayer, World par3World, BlockPos pos, EnumHand hand, EnumFacing side, float par8, float par9, float par10) { IBlockState state = par3World.getBlockState(pos); diff --git a/src/main/java/vazkii/botania/common/item/ItemLaputaShard.java b/src/main/java/vazkii/botania/common/item/ItemLaputaShard.java index 1b89c1c1e..b22634cf4 100644 --- a/src/main/java/vazkii/botania/common/item/ItemLaputaShard.java +++ b/src/main/java/vazkii/botania/common/item/ItemLaputaShard.java @@ -42,6 +42,7 @@ import vazkii.botania.common.core.helper.MathHelper; import vazkii.botania.common.entity.EntityManaBurst; import vazkii.botania.common.lib.LibItemNames; +import javax.annotation.Nonnull; import java.util.List; public class ItemLaputaShard extends ItemMod implements ILensEffect, ITinyPlanetExcempt { @@ -69,7 +70,7 @@ public class ItemLaputaShard extends ItemMod implements ILensEffect, ITinyPlanet } @Override - public void getSubItems(Item item, CreativeTabs tab, List list) { + public void getSubItems(@Nonnull Item item, CreativeTabs tab, List list) { super.getSubItems(item, tab, list); for(int i = 0; i < 4; i++) list.add(new ItemStack(item, 1, (i + 1) * 5 - 1)); @@ -80,6 +81,7 @@ public class ItemLaputaShard extends ItemMod implements ILensEffect, ITinyPlanet list.add(String.format(I18n.translateToLocal("botaniamisc.shardLevel"), I18n.translateToLocal("botania.roman" + (stack.getItemDamage() + 1)))); } + @Nonnull @Override public EnumActionResult onItemUse(ItemStack par1ItemStack, EntityPlayer par2EntityPlayer, World par3World, BlockPos pos, EnumHand hand, EnumFacing side, float par8, float par9, float par10) { if(!par3World.isRemote && pos.getY() < 160 && !par3World.provider.doesWaterVaporize()) { diff --git a/src/main/java/vazkii/botania/common/item/ItemLexicon.java b/src/main/java/vazkii/botania/common/item/ItemLexicon.java index e7cb097c2..51804f14b 100644 --- a/src/main/java/vazkii/botania/common/item/ItemLexicon.java +++ b/src/main/java/vazkii/botania/common/item/ItemLexicon.java @@ -48,6 +48,7 @@ import vazkii.botania.common.lib.LibGuiIDs; import vazkii.botania.common.lib.LibItemNames; import vazkii.botania.common.lib.LibMisc; +import javax.annotation.Nonnull; import java.util.ArrayList; import java.util.List; @@ -63,6 +64,7 @@ public class ItemLexicon extends ItemMod implements ILexicon, IElvenItem { setMaxStackSize(1); } + @Nonnull @Override public EnumActionResult onItemUse(ItemStack par1ItemStack, EntityPlayer par2EntityPlayer, World par3World, BlockPos pos, EnumHand hand, EnumFacing side, float par8, float par9, float par10) { if(par2EntityPlayer.isSneaking()) { @@ -89,7 +91,7 @@ public class ItemLexicon extends ItemMod implements ILexicon, IElvenItem { } @Override - public void getSubItems(Item item, CreativeTabs tab, List list) { + public void getSubItems(@Nonnull Item item, CreativeTabs tab, List list) { list.add(new ItemStack(item)); ItemStack creative = new ItemStack(item); for(String s : BotaniaAPI.knowledgeTypes.keySet()) { @@ -132,8 +134,9 @@ public class ItemLexicon extends ItemMod implements ILexicon, IElvenItem { return build == 0 ? I18n.translateToLocal("botaniamisc.devEdition") : MathHelper.numberToOrdinal(build); } + @Nonnull @Override - public ActionResult onItemRightClick(ItemStack par1ItemStack, World par2World, EntityPlayer par3EntityPlayer, EnumHand hand) { + public ActionResult onItemRightClick(@Nonnull ItemStack par1ItemStack, World par2World, EntityPlayer par3EntityPlayer, EnumHand hand) { String force = getForcedPage(par1ItemStack); if(force != null && !force.isEmpty()) { LexiconEntry entry = getEntryFromForce(par1ItemStack); @@ -182,6 +185,7 @@ public class ItemLexicon extends ItemMod implements ILexicon, IElvenItem { } } + @Nonnull @Override public EnumRarity getRarity(ItemStack par1ItemStack) { return EnumRarity.UNCOMMON; diff --git a/src/main/java/vazkii/botania/common/item/ItemManaCookie.java b/src/main/java/vazkii/botania/common/item/ItemManaCookie.java index 10a5c341b..e58ebc3c9 100644 --- a/src/main/java/vazkii/botania/common/item/ItemManaCookie.java +++ b/src/main/java/vazkii/botania/common/item/ItemManaCookie.java @@ -24,6 +24,8 @@ import vazkii.botania.common.core.BotaniaCreativeTab; import vazkii.botania.common.lib.LibItemNames; import vazkii.botania.common.lib.LibMisc; +import javax.annotation.Nonnull; + public class ItemManaCookie extends ItemFood { public ItemManaCookie() { @@ -35,13 +37,14 @@ public class ItemManaCookie extends ItemFood { } @Override - protected void onFoodEaten(ItemStack p_77849_1_, World p_77849_2_, EntityPlayer p_77849_3_) { + protected void onFoodEaten(ItemStack p_77849_1_, World p_77849_2_, @Nonnull EntityPlayer p_77849_3_) { super.onFoodEaten(p_77849_1_, p_77849_2_, p_77849_3_); p_77849_3_.addStat(ModAchievements.manaCookieEat, 1); } + @Nonnull @Override - public String getUnlocalizedNameInefficiently(ItemStack par1ItemStack) { + public String getUnlocalizedNameInefficiently(@Nonnull ItemStack par1ItemStack) { return super.getUnlocalizedNameInefficiently(par1ItemStack).replaceAll("item.", "item." + LibResources.PREFIX_MOD); } diff --git a/src/main/java/vazkii/botania/common/item/ItemManaGun.java b/src/main/java/vazkii/botania/common/item/ItemManaGun.java index 6dca1910f..8b287880d 100644 --- a/src/main/java/vazkii/botania/common/item/ItemManaGun.java +++ b/src/main/java/vazkii/botania/common/item/ItemManaGun.java @@ -49,6 +49,7 @@ import vazkii.botania.common.crafting.recipe.ManaGunRemoveLensRecipe; import vazkii.botania.common.entity.EntityManaBurst; import vazkii.botania.common.lib.LibItemNames; +import javax.annotation.Nonnull; import java.awt.*; import java.util.List; @@ -75,20 +76,21 @@ public class ItemManaGun extends ItemMod implements IManaUsingItem, IColorable { RecipeSorter.register("botania:manaGunClip", ManaGunClipRecipe.class, Category.SHAPELESS, ""); addPropertyOverride(new ResourceLocation("botania", "clip"), new IItemPropertyGetter() { @Override - public float apply(ItemStack itemStack, World world, EntityLivingBase entityLivingBase) { + public float apply(@Nonnull ItemStack itemStack, World world, EntityLivingBase entityLivingBase) { return hasClip(itemStack) ? 1 : 0; } }); addPropertyOverride(new ResourceLocation("botania", "desu"), new IItemPropertyGetter() { @Override - public float apply(ItemStack itemStack, World world, EntityLivingBase entityLivingBase) { + public float apply(@Nonnull ItemStack itemStack, World world, EntityLivingBase entityLivingBase) { return isSugoiKawaiiDesuNe(itemStack) ? 1 : 0; } }); } + @Nonnull @Override - public ActionResult onItemRightClick(ItemStack par1ItemStack, World par2World, EntityPlayer par3EntityPlayer, EnumHand hand) { + public ActionResult onItemRightClick(@Nonnull ItemStack par1ItemStack, World par2World, EntityPlayer par3EntityPlayer, EnumHand hand) { int effCd = COOLDOWN; PotionEffect effect = par3EntityPlayer.getActivePotionEffect(MobEffects.HASTE); if(effect != null) @@ -165,8 +167,9 @@ public class ItemManaGun extends ItemMod implements IManaUsingItem, IColorable { return getLens(stack) != null; } + @Nonnull @Override - public ItemStack getContainerItem(ItemStack itemStack) { + public ItemStack getContainerItem(@Nonnull ItemStack itemStack) { return getLens(itemStack); } @@ -235,8 +238,9 @@ public class ItemManaGun extends ItemMod implements IManaUsingItem, IColorable { tooltip.add(s.replaceAll("&", "\u00a7")); } + @Nonnull @Override - public String getItemStackDisplayName(ItemStack par1ItemStack) { + public String getItemStackDisplayName(@Nonnull ItemStack par1ItemStack) { ItemStack lens = getLens(par1ItemStack); return super.getItemStackDisplayName(par1ItemStack) + (lens == null ? "" : " (" + TextFormatting.GREEN + lens.getDisplayName() + TextFormatting.RESET + ")"); } diff --git a/src/main/java/vazkii/botania/common/item/ItemManaMirror.java b/src/main/java/vazkii/botania/common/item/ItemManaMirror.java index d0c10132c..eff4c4e84 100644 --- a/src/main/java/vazkii/botania/common/item/ItemManaMirror.java +++ b/src/main/java/vazkii/botania/common/item/ItemManaMirror.java @@ -32,6 +32,7 @@ import vazkii.botania.common.block.tile.mana.TilePool; import vazkii.botania.common.core.helper.ItemNBTHelper; import vazkii.botania.common.lib.LibItemNames; +import javax.annotation.Nonnull; import java.awt.*; public class ItemManaMirror extends ItemMod implements IManaItem, ICoordBoundItem, IManaTooltipDisplay, IColorable { @@ -82,6 +83,7 @@ public class ItemManaMirror extends ItemMod implements IManaItem, ICoordBoundIte } } + @Nonnull @Override public EnumActionResult onItemUse(ItemStack par1ItemStack, EntityPlayer par2EntityPlayer, World par3World, BlockPos pos, EnumHand hand, EnumFacing side, float par8, float par9, float par10) { if(par2EntityPlayer.isSneaking() && !par3World.isRemote) { diff --git a/src/main/java/vazkii/botania/common/item/ItemManaTablet.java b/src/main/java/vazkii/botania/common/item/ItemManaTablet.java index 9994af1e8..067a43db9 100644 --- a/src/main/java/vazkii/botania/common/item/ItemManaTablet.java +++ b/src/main/java/vazkii/botania/common/item/ItemManaTablet.java @@ -23,6 +23,7 @@ import vazkii.botania.api.mana.IManaTooltipDisplay; import vazkii.botania.common.core.helper.ItemNBTHelper; import vazkii.botania.common.lib.LibItemNames; +import javax.annotation.Nonnull; import java.awt.*; import java.util.List; @@ -42,7 +43,7 @@ public class ItemManaTablet extends ItemMod implements IManaItem, ICreativeManaP } @Override - public void getSubItems(Item par1, CreativeTabs par2CreativeTabs, List par3List) { + public void getSubItems(@Nonnull Item par1, CreativeTabs par2CreativeTabs, List par3List) { // Empty tablet par3List.add(new ItemStack(par1, 1)); diff --git a/src/main/java/vazkii/botania/common/item/ItemMod.java b/src/main/java/vazkii/botania/common/item/ItemMod.java index 87d3674c4..5e0018c9d 100644 --- a/src/main/java/vazkii/botania/common/item/ItemMod.java +++ b/src/main/java/vazkii/botania/common/item/ItemMod.java @@ -18,6 +18,8 @@ import vazkii.botania.client.lib.LibResources; import vazkii.botania.common.core.BotaniaCreativeTab; import vazkii.botania.common.lib.LibMisc; +import javax.annotation.Nonnull; + public abstract class ItemMod extends Item { public ItemMod(String name) { @@ -31,8 +33,9 @@ public abstract class ItemMod extends Item { return true; } + @Nonnull @Override - public String getUnlocalizedNameInefficiently(ItemStack par1ItemStack) { + public String getUnlocalizedNameInefficiently(@Nonnull ItemStack par1ItemStack) { return super.getUnlocalizedNameInefficiently(par1ItemStack).replaceAll("item\\.", "item." + LibResources.PREFIX_MOD); } } \ No newline at end of file diff --git a/src/main/java/vazkii/botania/common/item/ItemObedienceStick.java b/src/main/java/vazkii/botania/common/item/ItemObedienceStick.java index 6c7dd602e..09084277a 100644 --- a/src/main/java/vazkii/botania/common/item/ItemObedienceStick.java +++ b/src/main/java/vazkii/botania/common/item/ItemObedienceStick.java @@ -28,6 +28,8 @@ import vazkii.botania.common.core.helper.MathHelper; import vazkii.botania.common.core.helper.Vector3; import vazkii.botania.common.lib.LibItemNames; +import javax.annotation.Nonnull; + public class ItemObedienceStick extends ItemMod { public ItemObedienceStick() { @@ -35,6 +37,7 @@ public class ItemObedienceStick extends ItemMod { setMaxStackSize(1); } + @Nonnull @Override public EnumActionResult onItemUse(ItemStack stack, EntityPlayer player, World world, BlockPos pos, EnumHand hand, EnumFacing side, float xs, float ys, float zs) { TileEntity tileAt = world.getTileEntity(pos); diff --git a/src/main/java/vazkii/botania/common/item/ItemOpenBucket.java b/src/main/java/vazkii/botania/common/item/ItemOpenBucket.java index d92d8bb1c..f14324769 100644 --- a/src/main/java/vazkii/botania/common/item/ItemOpenBucket.java +++ b/src/main/java/vazkii/botania/common/item/ItemOpenBucket.java @@ -22,6 +22,8 @@ import net.minecraft.util.math.RayTraceResult; import net.minecraft.world.World; import vazkii.botania.common.lib.LibItemNames; +import javax.annotation.Nonnull; + public class ItemOpenBucket extends ItemMod { public ItemOpenBucket() { @@ -29,8 +31,9 @@ public class ItemOpenBucket extends ItemMod { setMaxStackSize(1); } + @Nonnull @Override - public ActionResult onItemRightClick(ItemStack par1ItemStack, World par2World, EntityPlayer par3EntityPlayer, EnumHand hand) { + public ActionResult onItemRightClick(@Nonnull ItemStack par1ItemStack, World par2World, EntityPlayer par3EntityPlayer, EnumHand hand) { RayTraceResult RayTraceResult = rayTrace(par2World, par3EntityPlayer, true); if(RayTraceResult == null) diff --git a/src/main/java/vazkii/botania/common/item/ItemOvergrowthSeed.java b/src/main/java/vazkii/botania/common/item/ItemOvergrowthSeed.java index 9d38af0dc..bf1c19d65 100644 --- a/src/main/java/vazkii/botania/common/item/ItemOvergrowthSeed.java +++ b/src/main/java/vazkii/botania/common/item/ItemOvergrowthSeed.java @@ -23,12 +23,15 @@ import net.minecraftforge.oredict.OreDictionary; import vazkii.botania.common.block.ModBlocks; import vazkii.botania.common.lib.LibItemNames; +import javax.annotation.Nonnull; + public class ItemOvergrowthSeed extends ItemMod { public ItemOvergrowthSeed() { super(LibItemNames.OVERGROWTH_SEED); } + @Nonnull @Override public EnumActionResult onItemUse(ItemStack stack, EntityPlayer player, World world, BlockPos pos, EnumHand hand, EnumFacing side, float xs, float ys, float zs) { IBlockState state = world.getBlockState(pos); diff --git a/src/main/java/vazkii/botania/common/item/ItemPinkinator.java b/src/main/java/vazkii/botania/common/item/ItemPinkinator.java index 98266c541..e44ba6cf7 100644 --- a/src/main/java/vazkii/botania/common/item/ItemPinkinator.java +++ b/src/main/java/vazkii/botania/common/item/ItemPinkinator.java @@ -25,6 +25,7 @@ import vazkii.botania.common.achievement.ModAchievements; import vazkii.botania.common.entity.EntityPinkWither; import vazkii.botania.common.lib.LibItemNames; +import javax.annotation.Nonnull; import java.util.List; public class ItemPinkinator extends ItemMod { @@ -35,8 +36,9 @@ public class ItemPinkinator extends ItemMod { setFull3D(); } + @Nonnull @Override - public ActionResult onItemRightClick(ItemStack stack, World world, EntityPlayer player, EnumHand hand) { + public ActionResult onItemRightClick(@Nonnull ItemStack stack, World world, EntityPlayer player, EnumHand hand) { int range = 16; List withers = world.getEntitiesWithinAABB(EntityWither.class, new AxisAlignedBB(player.posX - range, player.posY - range, player.posZ - range, player.posX + range, player.posY + range, player.posZ + range)); for(EntityWither wither : withers) diff --git a/src/main/java/vazkii/botania/common/item/ItemPoolMinecart.java b/src/main/java/vazkii/botania/common/item/ItemPoolMinecart.java index 79b523fe7..f123544ba 100644 --- a/src/main/java/vazkii/botania/common/item/ItemPoolMinecart.java +++ b/src/main/java/vazkii/botania/common/item/ItemPoolMinecart.java @@ -29,6 +29,8 @@ import vazkii.botania.common.achievement.ModAchievements; import vazkii.botania.common.entity.EntityPoolMinecart; import vazkii.botania.common.lib.LibItemNames; +import javax.annotation.Nonnull; + @Optional.Interface(modid = "Railcraft", iface = "mods.railcraft.api.core.items.IMinecartItem", striprefs = true) public class ItemPoolMinecart extends ItemMod implements ICraftAchievement, IMinecartItem { @@ -37,6 +39,7 @@ public class ItemPoolMinecart extends ItemMod implements ICraftAchievement, IMin setMaxStackSize(1); } + @Nonnull @Override public EnumActionResult onItemUse(ItemStack p_77648_1_, EntityPlayer p_77648_2_, World p_77648_3_, BlockPos pos, EnumHand hand, EnumFacing side, float p_77648_8_, float p_77648_9_, float p_77648_10_) { if(BlockRailBase.isRailBlock(p_77648_3_.getBlockState(pos))) { diff --git a/src/main/java/vazkii/botania/common/item/ItemSextant.java b/src/main/java/vazkii/botania/common/item/ItemSextant.java index 131823f6b..654308e1e 100644 --- a/src/main/java/vazkii/botania/common/item/ItemSextant.java +++ b/src/main/java/vazkii/botania/common/item/ItemSextant.java @@ -36,6 +36,7 @@ import vazkii.botania.common.core.helper.Vector3; import vazkii.botania.common.item.equipment.tool.ToolCommons; import vazkii.botania.common.lib.LibItemNames; +import javax.annotation.Nonnull; import java.util.EnumMap; import java.util.Map; @@ -50,6 +51,7 @@ public class ItemSextant extends ItemMod { setMaxStackSize(1); } + @Nonnull @Override public EnumAction getItemUseAction(ItemStack par1ItemStack) { return EnumAction.BOW; @@ -99,8 +101,9 @@ public class ItemSextant extends ItemMod { } } + @Nonnull @Override - public ActionResult onItemRightClick(ItemStack par1ItemStack, World par2World, EntityPlayer par3EntityPlayer, EnumHand hand) { + public ActionResult onItemRightClick(@Nonnull ItemStack par1ItemStack, World par2World, EntityPlayer par3EntityPlayer, EnumHand hand) { Botania.proxy.removeSextantMultiblock(); if(!par3EntityPlayer.isSneaking()) { diff --git a/src/main/java/vazkii/botania/common/item/ItemSignalFlare.java b/src/main/java/vazkii/botania/common/item/ItemSignalFlare.java index 8899568af..d32df0770 100644 --- a/src/main/java/vazkii/botania/common/item/ItemSignalFlare.java +++ b/src/main/java/vazkii/botania/common/item/ItemSignalFlare.java @@ -33,6 +33,7 @@ import vazkii.botania.common.core.helper.ItemNBTHelper; import vazkii.botania.common.entity.EntitySignalFlare; import vazkii.botania.common.lib.LibItemNames; +import javax.annotation.Nonnull; import java.util.List; public class ItemSignalFlare extends ItemMod implements IColorable { @@ -46,8 +47,9 @@ public class ItemSignalFlare extends ItemMod implements IColorable { setMaxDamage(200); } + @Nonnull @Override - public ActionResult onItemRightClick(ItemStack par1ItemStack, World par2World, EntityPlayer par3EntityPlayer, EnumHand hand) { + public ActionResult onItemRightClick(@Nonnull ItemStack par1ItemStack, World par2World, EntityPlayer par3EntityPlayer, EnumHand hand) { if(par1ItemStack.getItemDamage() == 0) { if(par2World.isRemote) par3EntityPlayer.swingArm(hand); @@ -97,7 +99,7 @@ public class ItemSignalFlare extends ItemMod implements IColorable { } @Override - public void getSubItems(Item par1, CreativeTabs par2CreativeTabs, List par3List) { + public void getSubItems(@Nonnull Item par1, CreativeTabs par2CreativeTabs, List par3List) { for(int i = 0; i < 16; i++) par3List.add(forColor(i)); } diff --git a/src/main/java/vazkii/botania/common/item/ItemSlingshot.java b/src/main/java/vazkii/botania/common/item/ItemSlingshot.java index de172706e..e6c957f85 100644 --- a/src/main/java/vazkii/botania/common/item/ItemSlingshot.java +++ b/src/main/java/vazkii/botania/common/item/ItemSlingshot.java @@ -22,6 +22,7 @@ import vazkii.botania.common.core.helper.PlayerHelper; import vazkii.botania.common.entity.EntityVineBall; import vazkii.botania.common.lib.LibItemNames; +import javax.annotation.Nonnull; import java.util.function.Predicate; public class ItemSlingshot extends ItemMod { @@ -58,7 +59,7 @@ public class ItemSlingshot extends ItemMod { } @Override - public ItemStack onItemUseFinish(ItemStack par1ItemStack, World par2World, EntityLivingBase living) { + public ItemStack onItemUseFinish(@Nonnull ItemStack par1ItemStack, World par2World, EntityLivingBase living) { return par1ItemStack; } @@ -67,13 +68,15 @@ public class ItemSlingshot extends ItemMod { return 72000; } + @Nonnull @Override public EnumAction getItemUseAction(ItemStack par1ItemStack) { return EnumAction.BOW; } + @Nonnull @Override - public ActionResult onItemRightClick(ItemStack par1ItemStack, World par2World, EntityPlayer par3EntityPlayer, EnumHand hand) { + public ActionResult onItemRightClick(@Nonnull ItemStack par1ItemStack, World par2World, EntityPlayer par3EntityPlayer, EnumHand hand) { if(par3EntityPlayer.capabilities.isCreativeMode || PlayerHelper.hasAmmo(par3EntityPlayer, AMMO_FUNC)) { par3EntityPlayer.setActiveHand(hand); return ActionResult.newResult(EnumActionResult.SUCCESS, par1ItemStack); diff --git a/src/main/java/vazkii/botania/common/item/ItemSpark.java b/src/main/java/vazkii/botania/common/item/ItemSpark.java index 813fbf613..1c048f1b5 100644 --- a/src/main/java/vazkii/botania/common/item/ItemSpark.java +++ b/src/main/java/vazkii/botania/common/item/ItemSpark.java @@ -28,12 +28,15 @@ import vazkii.botania.common.achievement.ModAchievements; import vazkii.botania.common.entity.EntitySpark; import vazkii.botania.common.lib.LibItemNames; +import javax.annotation.Nonnull; + public class ItemSpark extends ItemMod implements ICraftAchievement, IManaGivingItem { public ItemSpark() { super(LibItemNames.SPARK); } + @Nonnull @Override public EnumActionResult onItemUse(ItemStack stack, EntityPlayer player, World world, BlockPos pos, EnumHand hand, EnumFacing side, float xv, float yv, float zv) { TileEntity tile = world.getTileEntity(pos); diff --git a/src/main/java/vazkii/botania/common/item/ItemSparkUpgrade.java b/src/main/java/vazkii/botania/common/item/ItemSparkUpgrade.java index c93a03362..3bfb71c23 100644 --- a/src/main/java/vazkii/botania/common/item/ItemSparkUpgrade.java +++ b/src/main/java/vazkii/botania/common/item/ItemSparkUpgrade.java @@ -15,6 +15,7 @@ import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import vazkii.botania.common.lib.LibItemNames; +import javax.annotation.Nonnull; import java.util.List; public class ItemSparkUpgrade extends ItemMod { @@ -27,11 +28,12 @@ public class ItemSparkUpgrade extends ItemMod { } @Override - public void getSubItems(Item item, CreativeTabs tab, List list) { + public void getSubItems(@Nonnull Item item, CreativeTabs tab, List list) { for(int i = 0; i < VARIANTS; i++) list.add(new ItemStack(item, 1, i)); } + @Nonnull @Override public String getUnlocalizedName(ItemStack par1ItemStack) { return getUnlocalizedNameLazy(par1ItemStack) + par1ItemStack.getItemDamage(); diff --git a/src/main/java/vazkii/botania/common/item/ItemSpawnerMover.java b/src/main/java/vazkii/botania/common/item/ItemSpawnerMover.java index b36d3ce83..d9721461d 100644 --- a/src/main/java/vazkii/botania/common/item/ItemSpawnerMover.java +++ b/src/main/java/vazkii/botania/common/item/ItemSpawnerMover.java @@ -33,6 +33,7 @@ import vazkii.botania.common.Botania; import vazkii.botania.common.achievement.ModAchievements; import vazkii.botania.common.lib.LibItemNames; +import javax.annotation.Nonnull; import java.util.List; public class ItemSpawnerMover extends ItemMod { @@ -45,7 +46,7 @@ public class ItemSpawnerMover extends ItemMod { setMaxStackSize(1); addPropertyOverride(new ResourceLocation("botania", "full"), new IItemPropertyGetter() { @Override - public float apply(ItemStack stack, World worldIn, EntityLivingBase entityIn) { + public float apply(@Nonnull ItemStack stack, World worldIn, EntityLivingBase entityIn) { return hasData(stack) ? 1 : 0; } }); @@ -97,6 +98,7 @@ public class ItemSpawnerMover extends ItemMod { tag.setInteger(TAG_PLACE_DELAY, tag.getInteger(TAG_PLACE_DELAY) - 1); } + @Nonnull @Override public EnumActionResult onItemUse(ItemStack itemstack, EntityPlayer player, World world, BlockPos pos, EnumHand hand, EnumFacing side, float xOffset, float yOffset, float zOffset) { if(getEntityId(itemstack) == null) { diff --git a/src/main/java/vazkii/botania/common/item/ItemSpellCloth.java b/src/main/java/vazkii/botania/common/item/ItemSpellCloth.java index f15474530..68191bb33 100644 --- a/src/main/java/vazkii/botania/common/item/ItemSpellCloth.java +++ b/src/main/java/vazkii/botania/common/item/ItemSpellCloth.java @@ -19,6 +19,7 @@ import net.minecraftforge.oredict.RecipeSorter.Category; import vazkii.botania.common.crafting.recipe.SpellClothRecipe; import vazkii.botania.common.lib.LibItemNames; +import javax.annotation.Nonnull; import java.awt.*; public class ItemSpellCloth extends ItemMod implements IColorable { @@ -44,8 +45,9 @@ public class ItemSpellCloth extends ItemMod implements IColorable { return true; } + @Nonnull @Override - public ItemStack getContainerItem(ItemStack itemStack) { + public ItemStack getContainerItem(@Nonnull ItemStack itemStack) { ItemStack stack = itemStack.copy(); stack.setItemDamage(stack.getItemDamage() + 1); return stack; diff --git a/src/main/java/vazkii/botania/common/item/ItemTemperanceStone.java b/src/main/java/vazkii/botania/common/item/ItemTemperanceStone.java index afc345428..0ccb83993 100644 --- a/src/main/java/vazkii/botania/common/item/ItemTemperanceStone.java +++ b/src/main/java/vazkii/botania/common/item/ItemTemperanceStone.java @@ -24,6 +24,7 @@ import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; import vazkii.botania.common.lib.LibItemNames; +import javax.annotation.Nonnull; import java.util.List; public class ItemTemperanceStone extends ItemMod { @@ -34,8 +35,9 @@ public class ItemTemperanceStone extends ItemMod { setHasSubtypes(true); } + @Nonnull @Override - public ActionResult onItemRightClick(ItemStack stack, World world, EntityPlayer player, EnumHand hand) { + public ActionResult onItemRightClick(@Nonnull ItemStack stack, World world, EntityPlayer player, EnumHand hand) { int dmg = stack.getItemDamage(); stack.setItemDamage(~dmg & 1); world.playSound(null, player.posX, player.posY, player.posZ, SoundEvents.ENTITY_EXPERIENCE_ORB_PICKUP, SoundCategory.NEUTRAL, 0.3F, 0.1F); diff --git a/src/main/java/vazkii/botania/common/item/ItemThornChakram.java b/src/main/java/vazkii/botania/common/item/ItemThornChakram.java index e56ebc42b..a3930162b 100644 --- a/src/main/java/vazkii/botania/common/item/ItemThornChakram.java +++ b/src/main/java/vazkii/botania/common/item/ItemThornChakram.java @@ -27,6 +27,7 @@ import vazkii.botania.common.achievement.ModAchievements; import vazkii.botania.common.entity.EntityThornChakram; import vazkii.botania.common.lib.LibItemNames; +import javax.annotation.Nonnull; import java.util.List; public class ItemThornChakram extends ItemMod implements ICraftAchievement { @@ -38,18 +39,20 @@ public class ItemThornChakram extends ItemMod implements ICraftAchievement { } @Override - public void getSubItems(Item item, CreativeTabs tab, List list) { + public void getSubItems(@Nonnull Item item, CreativeTabs tab, List list) { for(int i = 0; i < 2; i++) list.add(new ItemStack(item, 1, i)); } + @Nonnull @Override public String getUnlocalizedName(ItemStack stack) { return super.getUnlocalizedName() + stack.getItemDamage(); } + @Nonnull @Override - public ActionResult onItemRightClick(ItemStack stack, World world, EntityPlayer player, EnumHand hand) { + public ActionResult onItemRightClick(@Nonnull ItemStack stack, World world, EntityPlayer player, EnumHand hand) { --stack.stackSize; world.playSound(null, player.posX, player.posY, player.posZ, SoundEvents.ENTITY_ARROW_SHOOT, SoundCategory.NEUTRAL, 0.5F, 0.4F / (itemRand.nextFloat() * 0.4F + 0.8F)); diff --git a/src/main/java/vazkii/botania/common/item/ItemTwigWand.java b/src/main/java/vazkii/botania/common/item/ItemTwigWand.java index 4766a3582..f35e9428d 100644 --- a/src/main/java/vazkii/botania/common/item/ItemTwigWand.java +++ b/src/main/java/vazkii/botania/common/item/ItemTwigWand.java @@ -50,6 +50,7 @@ import vazkii.botania.common.core.helper.ItemNBTHelper; import vazkii.botania.common.core.helper.Vector3; import vazkii.botania.common.lib.LibItemNames; +import javax.annotation.Nonnull; import java.awt.*; import java.util.List; @@ -68,12 +69,13 @@ public class ItemTwigWand extends Item16Colors implements ICoordBoundItem { setMaxStackSize(1); addPropertyOverride(new ResourceLocation("botania", "bindmode"), new IItemPropertyGetter() { @Override - public float apply(ItemStack stack, World worldIn, EntityLivingBase entityIn) { + public float apply(@Nonnull ItemStack stack, World worldIn, EntityLivingBase entityIn) { return getBindMode(stack) ? 1 : 0; } }); } + @Nonnull @Override public EnumActionResult onItemUse(ItemStack par1ItemStack, EntityPlayer par2EntityPlayer, World par3World, BlockPos pos, EnumHand hand, EnumFacing side, float par8, float par9, float par10) { Block block = par3World.getBlockState(pos).getBlock(); @@ -194,8 +196,9 @@ public class ItemTwigWand extends Item16Colors implements ICoordBoundItem { setBoundTile(par1ItemStack, UNBOUND_POS); } + @Nonnull @Override - public ActionResult onItemRightClick(ItemStack stack, World world, EntityPlayer player, EnumHand hand) { + public ActionResult onItemRightClick(@Nonnull ItemStack stack, World world, EntityPlayer player, EnumHand hand) { if(!world.isRemote && player.isSneaking()) { setBindMode(stack, !getBindMode(stack)); world.playSound(null, player.posX, player.posY, player.posZ, BotaniaSoundEvents.ding, SoundCategory.PLAYERS, 0.1F, 1F); @@ -214,11 +217,12 @@ public class ItemTwigWand extends Item16Colors implements ICoordBoundItem { } @Override - public void getSubItems(Item par1, CreativeTabs par2CreativeTabs, List par3List) { + public void getSubItems(@Nonnull Item par1, CreativeTabs par2CreativeTabs, List par3List) { for(int i = 0; i < 16; i++) par3List.add(forColors(i, i)); } + @Nonnull @Override public String getUnlocalizedName(ItemStack par1ItemStack) { return getUnlocalizedNameLazy(par1ItemStack); @@ -229,6 +233,7 @@ public class ItemTwigWand extends Item16Colors implements ICoordBoundItem { list.add(I18n.translateToLocal(getModeString(stack))); } + @Nonnull @Override public EnumRarity getRarity(ItemStack par1ItemStack) { return EnumRarity.RARE; diff --git a/src/main/java/vazkii/botania/common/item/ItemVineBall.java b/src/main/java/vazkii/botania/common/item/ItemVineBall.java index ceafe81c6..3ceec3072 100644 --- a/src/main/java/vazkii/botania/common/item/ItemVineBall.java +++ b/src/main/java/vazkii/botania/common/item/ItemVineBall.java @@ -21,14 +21,17 @@ import net.minecraft.world.World; import vazkii.botania.common.entity.EntityVineBall; import vazkii.botania.common.lib.LibItemNames; +import javax.annotation.Nonnull; + public class ItemVineBall extends ItemMod { public ItemVineBall() { super(LibItemNames.VINE_BALL); } + @Nonnull @Override - public ActionResult onItemRightClick(ItemStack par1ItemStack, World par2World, EntityPlayer par3EntityPlayer, EnumHand hand) { + public ActionResult onItemRightClick(@Nonnull ItemStack par1ItemStack, World par2World, EntityPlayer par3EntityPlayer, EnumHand hand) { if(!par3EntityPlayer.capabilities.isCreativeMode) --par1ItemStack.stackSize; diff --git a/src/main/java/vazkii/botania/common/item/ItemVirus.java b/src/main/java/vazkii/botania/common/item/ItemVirus.java index 77c6f8924..3e4d3cc31 100644 --- a/src/main/java/vazkii/botania/common/item/ItemVirus.java +++ b/src/main/java/vazkii/botania/common/item/ItemVirus.java @@ -37,6 +37,7 @@ import net.minecraftforge.items.IItemHandler; import vazkii.botania.common.lib.LibItemNames; import vazkii.botania.common.lib.LibObfuscation; +import javax.annotation.Nonnull; import java.lang.reflect.InvocationTargetException; import java.lang.reflect.Method; import java.util.List; @@ -110,11 +111,12 @@ public class ItemVirus extends ItemMod { @Override @SideOnly(Side.CLIENT) - public void getSubItems(Item item, CreativeTabs tab, List list) { + public void getSubItems(@Nonnull Item item, CreativeTabs tab, List list) { for(int i = 0; i < SUBTYPES; i++) list.add(new ItemStack(item, 1, i)); } + @Nonnull @Override public String getUnlocalizedName(ItemStack stack) { return super.getUnlocalizedName(stack) + stack.getItemDamage(); diff --git a/src/main/java/vazkii/botania/common/item/ItemWorldSeed.java b/src/main/java/vazkii/botania/common/item/ItemWorldSeed.java index 085df70fa..b6a395c4d 100644 --- a/src/main/java/vazkii/botania/common/item/ItemWorldSeed.java +++ b/src/main/java/vazkii/botania/common/item/ItemWorldSeed.java @@ -23,14 +23,17 @@ import vazkii.botania.common.Botania; import vazkii.botania.common.core.helper.MathHelper; import vazkii.botania.common.lib.LibItemNames; +import javax.annotation.Nonnull; + public class ItemWorldSeed extends ItemMod { public ItemWorldSeed() { super(LibItemNames.WORLD_SEED); } + @Nonnull @Override - public ActionResult onItemRightClick(ItemStack stack, World world, EntityPlayer player, EnumHand hand) { + public ActionResult onItemRightClick(@Nonnull ItemStack stack, World world, EntityPlayer player, EnumHand hand) { BlockPos coords = world.getSpawnPoint(); if(MathHelper.pointDistanceSpace(coords.getX() + 0.5, coords.getY() + 0.5, coords.getZ() + 0.5, player.posX, player.posY, player.posZ) > 24) { diff --git a/src/main/java/vazkii/botania/common/item/block/ItemBlockFloatingSpecialFlower.java b/src/main/java/vazkii/botania/common/item/block/ItemBlockFloatingSpecialFlower.java index dea3a4aa5..56e950c45 100644 --- a/src/main/java/vazkii/botania/common/item/block/ItemBlockFloatingSpecialFlower.java +++ b/src/main/java/vazkii/botania/common/item/block/ItemBlockFloatingSpecialFlower.java @@ -14,14 +14,17 @@ import net.minecraft.block.Block; import net.minecraft.item.ItemStack; import net.minecraft.util.text.translation.I18n; +import javax.annotation.Nonnull; + public class ItemBlockFloatingSpecialFlower extends ItemBlockSpecialFlower { public ItemBlockFloatingSpecialFlower(Block block1) { super(block1); } + @Nonnull @Override - public String getItemStackDisplayName(ItemStack stack) { + public String getItemStackDisplayName(@Nonnull ItemStack stack) { String flowerName = getUnlocalizedName(stack) + ".name"; return String.format(I18n.translateToLocal("botaniamisc.floatingPrefix"), I18n.translateToLocal(flowerName)); } diff --git a/src/main/java/vazkii/botania/common/item/block/ItemBlockMod.java b/src/main/java/vazkii/botania/common/item/block/ItemBlockMod.java index a09cbea2c..bca4aab76 100644 --- a/src/main/java/vazkii/botania/common/item/block/ItemBlockMod.java +++ b/src/main/java/vazkii/botania/common/item/block/ItemBlockMod.java @@ -21,14 +21,17 @@ import vazkii.botania.client.lib.LibResources; import vazkii.botania.common.achievement.ICraftAchievement; import vazkii.botania.common.achievement.IPickupAchievement; +import javax.annotation.Nonnull; + public class ItemBlockMod extends ItemBlock implements IPickupAchievement, ICraftAchievement { public ItemBlockMod(Block block) { super(block); } + @Nonnull @Override - public String getUnlocalizedNameInefficiently(ItemStack par1ItemStack) { + public String getUnlocalizedNameInefficiently(@Nonnull ItemStack par1ItemStack) { return getUnlocalizedNameInefficiently_(par1ItemStack).replaceAll("tile.", "tile." + LibResources.PREFIX_MOD); } diff --git a/src/main/java/vazkii/botania/common/item/block/ItemBlockModSlab.java b/src/main/java/vazkii/botania/common/item/block/ItemBlockModSlab.java index 7cbcbaf30..a8c442b55 100644 --- a/src/main/java/vazkii/botania/common/item/block/ItemBlockModSlab.java +++ b/src/main/java/vazkii/botania/common/item/block/ItemBlockModSlab.java @@ -15,12 +15,15 @@ import net.minecraft.item.ItemSlab; import net.minecraft.item.ItemStack; import vazkii.botania.common.block.decor.slabs.BlockModSlab; +import javax.annotation.Nonnull; + public class ItemBlockModSlab extends ItemSlab { public ItemBlockModSlab(Block par1) { super(par1, ((BlockModSlab)par1).getSingleBlock(), ((BlockModSlab)par1).getFullBlock()); } + @Nonnull @Override public String getUnlocalizedName(ItemStack par1ItemStack) { return block.getUnlocalizedName().replaceAll("tile.", "tile.botania:"); diff --git a/src/main/java/vazkii/botania/common/item/block/ItemBlockPool.java b/src/main/java/vazkii/botania/common/item/block/ItemBlockPool.java index 0bf5fc125..55ec5e51f 100644 --- a/src/main/java/vazkii/botania/common/item/block/ItemBlockPool.java +++ b/src/main/java/vazkii/botania/common/item/block/ItemBlockPool.java @@ -15,6 +15,7 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.util.text.translation.I18n; +import javax.annotation.Nonnull; import java.util.List; public class ItemBlockPool extends ItemBlockWithMetaNameAndColor { @@ -24,7 +25,7 @@ public class ItemBlockPool extends ItemBlockWithMetaNameAndColor { } @Override - public void addInformation(ItemStack par1ItemStack, EntityPlayer par2EntityPlayer, List par3List, boolean par4) { + public void addInformation(@Nonnull ItemStack par1ItemStack, @Nonnull EntityPlayer par2EntityPlayer, @Nonnull List par3List, boolean par4) { if(par1ItemStack.getItemDamage() == 1) for(int i = 0; i < 2; i++) par3List.add(I18n.translateToLocal("botaniamisc.creativePool" + i)); diff --git a/src/main/java/vazkii/botania/common/item/block/ItemBlockSpecialFlower.java b/src/main/java/vazkii/botania/common/item/block/ItemBlockSpecialFlower.java index 8d27b816d..3b1c5e347 100644 --- a/src/main/java/vazkii/botania/common/item/block/ItemBlockSpecialFlower.java +++ b/src/main/java/vazkii/botania/common/item/block/ItemBlockSpecialFlower.java @@ -34,6 +34,7 @@ import vazkii.botania.common.core.helper.ItemNBTHelper; import vazkii.botania.common.lib.LibBlockNames; import vazkii.botania.common.lib.LibMisc; +import javax.annotation.Nonnull; import java.util.List; public class ItemBlockSpecialFlower extends ItemBlockMod implements IRecipeKeyProvider { @@ -44,7 +45,7 @@ public class ItemBlockSpecialFlower extends ItemBlockMod implements IRecipeKeyPr } @Override - public boolean placeBlockAt(ItemStack stack, EntityPlayer player, World world, BlockPos pos, EnumFacing side, float hitX, float hitY, float hitZ, IBlockState newState) { + public boolean placeBlockAt(@Nonnull ItemStack stack, @Nonnull EntityPlayer player, World world, @Nonnull BlockPos pos, EnumFacing side, float hitX, float hitY, float hitZ, @Nonnull IBlockState newState) { boolean placed = super.placeBlockAt(stack, player, world, pos, side, hitX, hitY, hitZ, newState); if(placed) { String type = getType(stack); @@ -62,18 +63,20 @@ public class ItemBlockSpecialFlower extends ItemBlockMod implements IRecipeKeyPr return placed; } + @Nonnull @Override public String getUnlocalizedName(ItemStack stack) { return BotaniaAPI.getSignatureForName(getType(stack)).getUnlocalizedNameForStack(stack); } + @Nonnull @Override - public String getUnlocalizedNameInefficiently(ItemStack par1ItemStack) { + public String getUnlocalizedNameInefficiently(@Nonnull ItemStack par1ItemStack) { return getUnlocalizedNameInefficiently_(par1ItemStack); } @Override - public void addInformation(ItemStack par1ItemStack, EntityPlayer par2EntityPlayer, List par3List, boolean par4) { + public void addInformation(@Nonnull ItemStack par1ItemStack, @Nonnull EntityPlayer par2EntityPlayer, @Nonnull List par3List, boolean par4) { String type = getType(par1ItemStack); SubTileSignature sig = BotaniaAPI.getSignatureForName(type); diff --git a/src/main/java/vazkii/botania/common/item/block/ItemBlockSpecialQuartz.java b/src/main/java/vazkii/botania/common/item/block/ItemBlockSpecialQuartz.java index 16bb3fb18..c062f6045 100644 --- a/src/main/java/vazkii/botania/common/item/block/ItemBlockSpecialQuartz.java +++ b/src/main/java/vazkii/botania/common/item/block/ItemBlockSpecialQuartz.java @@ -15,14 +15,17 @@ import net.minecraft.item.ItemMultiTexture; import net.minecraft.item.ItemStack; import vazkii.botania.common.block.decor.quartz.BlockSpecialQuartz; +import javax.annotation.Nonnull; + public class ItemBlockSpecialQuartz extends ItemMultiTexture { public ItemBlockSpecialQuartz(Block par1) { super(par1, par1, new String[]{ "" }); } + @Nonnull @Override - public String getUnlocalizedName(ItemStack par1ItemStack) { + public String getUnlocalizedName(@Nonnull ItemStack par1ItemStack) { return par1ItemStack.getItemDamage() >= 3 ? "" : ((BlockSpecialQuartz) block).getNames()[par1ItemStack.getItemDamage()]; } } \ No newline at end of file diff --git a/src/main/java/vazkii/botania/common/item/block/ItemBlockWithMetadataAndName.java b/src/main/java/vazkii/botania/common/item/block/ItemBlockWithMetadataAndName.java index fac476911..99bf0a084 100644 --- a/src/main/java/vazkii/botania/common/item/block/ItemBlockWithMetadataAndName.java +++ b/src/main/java/vazkii/botania/common/item/block/ItemBlockWithMetadataAndName.java @@ -21,6 +21,8 @@ import vazkii.botania.client.lib.LibResources; import vazkii.botania.common.achievement.ICraftAchievement; import vazkii.botania.common.achievement.IPickupAchievement; +import javax.annotation.Nonnull; + public class ItemBlockWithMetadataAndName extends ItemBlock implements IPickupAchievement, ICraftAchievement { public ItemBlockWithMetadataAndName(Block par2Block) { @@ -28,11 +30,13 @@ public class ItemBlockWithMetadataAndName extends ItemBlock implements IPickupAc setHasSubtypes(true); } + @Nonnull @Override - public String getUnlocalizedNameInefficiently(ItemStack par1ItemStack) { + public String getUnlocalizedNameInefficiently(@Nonnull ItemStack par1ItemStack) { return super.getUnlocalizedNameInefficiently(par1ItemStack).replaceAll("tile.", "tile." + LibResources.PREFIX_MOD); } + @Nonnull @Override public String getUnlocalizedName(ItemStack par1ItemStack) { return super.getUnlocalizedName(par1ItemStack) + par1ItemStack.getItemDamage(); diff --git a/src/main/java/vazkii/botania/common/item/brew/ItemBrewBase.java b/src/main/java/vazkii/botania/common/item/brew/ItemBrewBase.java index 7696b710a..8223313b1 100644 --- a/src/main/java/vazkii/botania/common/item/brew/ItemBrewBase.java +++ b/src/main/java/vazkii/botania/common/item/brew/ItemBrewBase.java @@ -38,6 +38,7 @@ import vazkii.botania.common.core.helper.ItemNBTHelper; import vazkii.botania.common.item.IColorable; import vazkii.botania.common.item.ItemMod; +import javax.annotation.Nonnull; import java.awt.*; import java.util.List; @@ -69,19 +70,21 @@ public abstract class ItemBrewBase extends ItemMod implements IBrewItem, IPickup return drinkSpeed; } + @Nonnull @Override public EnumAction getItemUseAction(ItemStack p_77661_1_) { return EnumAction.DRINK; } + @Nonnull @Override - public ActionResult onItemRightClick(ItemStack p_77659_1_, World p_77659_2_, EntityPlayer p_77659_3_, EnumHand hand) { + public ActionResult onItemRightClick(@Nonnull ItemStack p_77659_1_, World p_77659_2_, EntityPlayer p_77659_3_, EnumHand hand) { p_77659_3_.setActiveHand(hand); return ActionResult.newResult(EnumActionResult.SUCCESS, p_77659_1_); } @Override - public ItemStack onItemUseFinish(ItemStack stack, World world, EntityLivingBase living) { + public ItemStack onItemUseFinish(@Nonnull ItemStack stack, World world, EntityLivingBase living) { if(!world.isRemote) { for(PotionEffect effect : getBrew(stack).getPotionEffects(stack)) { PotionEffect newEffect = new PotionEffect(effect.getPotion(), effect.getDuration(), effect.getAmplifier(), true, true); @@ -114,7 +117,7 @@ public abstract class ItemBrewBase extends ItemMod implements IBrewItem, IPickup } @Override - public void getSubItems(Item item, CreativeTabs tab, List list) { + public void getSubItems(@Nonnull Item item, CreativeTabs tab, List list) { for(String s : BotaniaAPI.brewMap.keySet()) { ItemStack stack = new ItemStack(item); setBrew(stack, s); @@ -137,8 +140,9 @@ public abstract class ItemBrewBase extends ItemMod implements IBrewItem, IPickup return r << 16 | g << 8 | b; } + @Nonnull @Override - public String getItemStackDisplayName(ItemStack stack) { + public String getItemStackDisplayName(@Nonnull ItemStack stack) { return String.format(I18n.translateToLocal(getUnlocalizedNameInefficiently(stack) + ".name"), I18n.translateToLocal(getBrew(stack).getUnlocalizedName(stack)), TextFormatting.BOLD + "" + getSwigsLeft(stack) + TextFormatting.RESET); } diff --git a/src/main/java/vazkii/botania/common/item/brew/ItemIncenseStick.java b/src/main/java/vazkii/botania/common/item/brew/ItemIncenseStick.java index eeb14f653..117090009 100644 --- a/src/main/java/vazkii/botania/common/item/brew/ItemIncenseStick.java +++ b/src/main/java/vazkii/botania/common/item/brew/ItemIncenseStick.java @@ -28,6 +28,7 @@ import vazkii.botania.common.item.IColorable; import vazkii.botania.common.item.ItemMod; import vazkii.botania.common.lib.LibItemNames; +import javax.annotation.Nonnull; import java.awt.*; import java.util.List; @@ -42,7 +43,7 @@ public class ItemIncenseStick extends ItemMod implements IBrewItem, IBrewContain } @Override - public void getSubItems(Item item, CreativeTabs tab, List list) { + public void getSubItems(@Nonnull Item item, CreativeTabs tab, List list) { super.getSubItems(item, tab, list); for(String s : BotaniaAPI.brewMap.keySet()) { ItemStack brewStack = getItemForBrew(BotaniaAPI.brewMap.get(s), new ItemStack(this)); diff --git a/src/main/java/vazkii/botania/common/item/brew/ItemVial.java b/src/main/java/vazkii/botania/common/item/brew/ItemVial.java index 0c0f4e145..f29f16706 100644 --- a/src/main/java/vazkii/botania/common/item/brew/ItemVial.java +++ b/src/main/java/vazkii/botania/common/item/brew/ItemVial.java @@ -19,6 +19,7 @@ import vazkii.botania.common.item.ItemMod; import vazkii.botania.common.item.ModItems; import vazkii.botania.common.lib.LibItemNames; +import javax.annotation.Nonnull; import java.util.List; public class ItemVial extends ItemMod implements IBrewContainer { @@ -33,11 +34,12 @@ public class ItemVial extends ItemMod implements IBrewContainer { } @Override - public void getSubItems(Item item, CreativeTabs tab, List list) { + public void getSubItems(@Nonnull Item item, CreativeTabs tab, List list) { for(int i = 0; i < 2; i++) list.add(new ItemStack(item, 1, i)); } + @Nonnull @Override public String getUnlocalizedName(ItemStack par1ItemStack) { return super.getUnlocalizedName(par1ItemStack) + par1ItemStack.getItemDamage(); diff --git a/src/main/java/vazkii/botania/common/item/equipment/armor/manasteel/ItemManasteelArmor.java b/src/main/java/vazkii/botania/common/item/equipment/armor/manasteel/ItemManasteelArmor.java index c55bd270a..fb73df1d2 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/armor/manasteel/ItemManasteelArmor.java +++ b/src/main/java/vazkii/botania/common/item/equipment/armor/manasteel/ItemManasteelArmor.java @@ -42,6 +42,7 @@ import vazkii.botania.common.item.ModItems; import vazkii.botania.common.item.equipment.tool.ToolCommons; import vazkii.botania.common.lib.LibMisc; +import javax.annotation.Nonnull; import java.util.EnumMap; import java.util.List; import java.util.Map; @@ -68,8 +69,9 @@ public class ItemManasteelArmor extends ItemArmor implements ISpecialArmor, IMan setUnlocalizedName(name); } + @Nonnull @Override - public String getUnlocalizedNameInefficiently(ItemStack par1ItemStack) { + public String getUnlocalizedNameInefficiently(@Nonnull ItemStack par1ItemStack) { return super.getUnlocalizedNameInefficiently(par1ItemStack).replaceAll("item.", "item." + LibResources.PREFIX_MOD); } @@ -102,6 +104,7 @@ public class ItemManasteelArmor extends ItemArmor implements ISpecialArmor, IMan ToolCommons.damageItem(stack, damage, entity, MANA_PER_DAMAGE); } + @Nonnull @Override public final String getArmorTexture(ItemStack stack, Entity entity, EntityEquipmentSlot slot, String type) { return hasPhantomInk(stack) ? LibResources.MODEL_INVISIBLE_ARMOR : getArmorTextureAfterInk(stack, slot); @@ -111,6 +114,7 @@ public class ItemManasteelArmor extends ItemArmor implements ISpecialArmor, IMan return ConfigHandler.enableArmorModels ? LibResources.MODEL_MANASTEEL_NEW : slot == EntityEquipmentSlot.LEGS ? LibResources.MODEL_MANASTEEL_1 : LibResources.MODEL_MANASTEEL_0; } + @Nonnull @Override @SideOnly(Side.CLIENT) public ModelBiped getArmorModel(EntityLivingBase entityLiving, ItemStack itemStack, EntityEquipmentSlot armorSlot, ModelBiped original) { diff --git a/src/main/java/vazkii/botania/common/item/equipment/armor/manaweave/ItemManaweaveArmor.java b/src/main/java/vazkii/botania/common/item/equipment/armor/manaweave/ItemManaweaveArmor.java index f0c965944..e61d367fa 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/armor/manaweave/ItemManaweaveArmor.java +++ b/src/main/java/vazkii/botania/common/item/equipment/armor/manaweave/ItemManaweaveArmor.java @@ -33,6 +33,7 @@ import vazkii.botania.common.core.handler.ConfigHandler; import vazkii.botania.common.item.ModItems; import vazkii.botania.common.item.equipment.armor.manasteel.ItemManasteelArmor; +import javax.annotation.Nonnull; import java.util.List; public class ItemManaweaveArmor extends ItemManasteelArmor implements ICraftAchievement { @@ -41,7 +42,7 @@ public class ItemManaweaveArmor extends ItemManasteelArmor implements ICraftAchi super(type, name, BotaniaAPI.manaweaveArmorMaterial); addPropertyOverride(new ResourceLocation("botania", "holiday"), new IItemPropertyGetter() { @Override - public float apply(ItemStack stack, World worldIn, EntityLivingBase entityIn) { + public float apply(@Nonnull ItemStack stack, World worldIn, EntityLivingBase entityIn) { return ClientProxy.jingleTheBells ? 1 : 0; } }); @@ -59,6 +60,7 @@ public class ItemManaweaveArmor extends ItemManasteelArmor implements ICraftAchi return ConfigHandler.enableArmorModels ? (ClientProxy.jingleTheBells ? LibResources.MODEL_MANAWEAVE_NEW_HOLIDAY : LibResources.MODEL_MANAWEAVE_NEW) : slot == EntityEquipmentSlot.LEGS ? LibResources.MODEL_MANAWEAVE_1 : LibResources.MODEL_MANAWEAVE_0; } + @Nonnull @Override @SideOnly(Side.CLIENT) public String getUnlocalizedName(ItemStack p_77667_1_) { diff --git a/src/main/java/vazkii/botania/common/item/equipment/armor/terrasteel/ItemTerrasteelArmor.java b/src/main/java/vazkii/botania/common/item/equipment/armor/terrasteel/ItemTerrasteelArmor.java index 283965a0b..7b8fcf35a 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/armor/terrasteel/ItemTerrasteelArmor.java +++ b/src/main/java/vazkii/botania/common/item/equipment/armor/terrasteel/ItemTerrasteelArmor.java @@ -27,6 +27,7 @@ import vazkii.botania.common.core.handler.ConfigHandler; import vazkii.botania.common.item.ModItems; import vazkii.botania.common.item.equipment.armor.manasteel.ItemManasteelArmor; +import javax.annotation.Nonnull; import java.util.List; import java.util.UUID; @@ -53,8 +54,9 @@ public class ItemTerrasteelArmor extends ItemManasteelArmor { return par2ItemStack.getItem() == ModItems.manaResource && par2ItemStack.getItemDamage() == 4 || super.getIsRepairable(par1ItemStack, par2ItemStack); } + @Nonnull @Override - public Multimap getAttributeModifiers(EntityEquipmentSlot slot, ItemStack stack) { + public Multimap getAttributeModifiers(@Nonnull EntityEquipmentSlot slot, ItemStack stack) { Multimap multimap = super.getAttributeModifiers(slot, stack); UUID uuid = new UUID((getUnlocalizedName() + slot.toString()).hashCode(), 0); if (slot == this.armorType) { diff --git a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemBauble.java b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemBauble.java index 7d5e9b343..994718538 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemBauble.java +++ b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemBauble.java @@ -37,6 +37,7 @@ import vazkii.botania.common.core.helper.ItemNBTHelper; import vazkii.botania.common.entity.EntityDoppleganger; import vazkii.botania.common.item.ItemMod; +import javax.annotation.Nonnull; import java.util.List; import java.util.UUID; @@ -54,8 +55,9 @@ public abstract class ItemBauble extends ItemMod implements IBauble, ICosmeticAt setMaxStackSize(1); } + @Nonnull @Override - public ActionResult onItemRightClick(ItemStack par1ItemStack, World par2World, EntityPlayer par3EntityPlayer, EnumHand hand) { + public ActionResult onItemRightClick(@Nonnull ItemStack par1ItemStack, World par2World, EntityPlayer par3EntityPlayer, EnumHand hand) { if(!EntityDoppleganger.isTruePlayer(par3EntityPlayer)) return ActionResult.newResult(EnumActionResult.FAIL, par1ItemStack); @@ -175,8 +177,9 @@ public abstract class ItemBauble extends ItemMod implements IBauble, ICosmeticAt return getContainerItem(stack) != null; } + @Nonnull @Override - public ItemStack getContainerItem(ItemStack itemStack) { + public ItemStack getContainerItem(@Nonnull ItemStack itemStack) { return getCosmeticItem(itemStack); } diff --git a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemBaubleCosmetic.java b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemBaubleCosmetic.java index 339b1a00b..f96346bf3 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemBaubleCosmetic.java +++ b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemBaubleCosmetic.java @@ -37,6 +37,7 @@ import vazkii.botania.common.crafting.recipe.CosmeticAttachRecipe; import vazkii.botania.common.crafting.recipe.CosmeticRemoveRecipe; import vazkii.botania.common.lib.LibItemNames; +import javax.annotation.Nonnull; import java.util.List; public class ItemBaubleCosmetic extends ItemBauble implements ICosmeticBauble { @@ -56,11 +57,12 @@ public class ItemBaubleCosmetic extends ItemBauble implements ICosmeticBauble { } @Override - public void getSubItems(Item item, CreativeTabs tab, List list) { + public void getSubItems(@Nonnull Item item, CreativeTabs tab, List list) { for(int i = 0; i < SUBTYPES; i++) list.add(new ItemStack(item, 1, i)); } + @Nonnull @Override public String getUnlocalizedName(ItemStack par1ItemStack) { return super.getUnlocalizedName(par1ItemStack) + par1ItemStack.getItemDamage(); diff --git a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemBloodPendant.java b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemBloodPendant.java index 930a604ed..981f070f0 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemBloodPendant.java +++ b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemBloodPendant.java @@ -42,6 +42,7 @@ import vazkii.botania.common.core.helper.ItemNBTHelper; import vazkii.botania.common.item.IColorable; import vazkii.botania.common.lib.LibItemNames; +import javax.annotation.Nonnull; import java.awt.*; import java.util.List; @@ -55,7 +56,7 @@ public class ItemBloodPendant extends ItemBauble implements IBrewContainer, IBre } @Override - public void getSubItems(Item item, CreativeTabs tab, List list) { + public void getSubItems(@Nonnull Item item, CreativeTabs tab, List list) { super.getSubItems(item, tab, list); for(String s : BotaniaAPI.brewMap.keySet()) { ItemStack brewStack = getItemForBrew(BotaniaAPI.brewMap.get(s), new ItemStack(this)); diff --git a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemFlightTiara.java b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemFlightTiara.java index 006af4f3e..aea9a6ace 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemFlightTiara.java +++ b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemFlightTiara.java @@ -58,6 +58,7 @@ import vazkii.botania.common.core.helper.Vector3; import vazkii.botania.common.item.ModItems; import vazkii.botania.common.lib.LibItemNames; +import javax.annotation.Nonnull; import javax.xml.bind.annotation.adapters.HexBinaryAdapter; import java.security.MessageDigest; import java.security.NoSuchAlgorithmException; @@ -96,7 +97,7 @@ public class ItemFlightTiara extends ItemBauble implements IManaUsingItem, IBaub } @Override - public void getSubItems(Item item, CreativeTabs tab, List list) { + public void getSubItems(@Nonnull Item item, CreativeTabs tab, List list) { for(int i = 0; i < SUBTYPES + 1; i++) list.add(new ItemStack(item, 1, i)); } diff --git a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemMagnetRing.java b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemMagnetRing.java index 0c1207d7b..e8c57eac5 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemMagnetRing.java +++ b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemMagnetRing.java @@ -36,6 +36,7 @@ import vazkii.botania.common.core.helper.MathHelper; import vazkii.botania.common.core.helper.Vector3; import vazkii.botania.common.lib.LibItemNames; +import javax.annotation.Nonnull; import java.util.Arrays; import java.util.List; @@ -57,7 +58,7 @@ public class ItemMagnetRing extends ItemBauble { this.range = range; addPropertyOverride(new ResourceLocation("botania", "on"), new IItemPropertyGetter() { @Override - public float apply(ItemStack stack, World worldIn, EntityLivingBase entityIn) { + public float apply(@Nonnull ItemStack stack, World worldIn, EntityLivingBase entityIn) { return ItemMagnetRing.getCooldown(stack) <= 0 ? 1 : 0; } }); diff --git a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemManaRing.java b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemManaRing.java index 84a21c19f..e8bbac757 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemManaRing.java +++ b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemManaRing.java @@ -21,6 +21,7 @@ import vazkii.botania.api.mana.IManaTooltipDisplay; import vazkii.botania.common.core.helper.ItemNBTHelper; import vazkii.botania.common.lib.LibItemNames; +import javax.annotation.Nonnull; import java.util.List; public class ItemManaRing extends ItemBauble implements IManaItem, IManaTooltipDisplay { @@ -46,7 +47,7 @@ public class ItemManaRing extends ItemBauble implements IManaItem, IManaTooltipD } @Override - public void getSubItems(Item par1, CreativeTabs par2CreativeTabs, List par3List) { + public void getSubItems(@Nonnull Item par1, CreativeTabs par2CreativeTabs, List par3List) { par3List.add(new ItemStack(par1, 1, 10000)); } diff --git a/src/main/java/vazkii/botania/common/item/equipment/tool/ItemEnderDagger.java b/src/main/java/vazkii/botania/common/item/equipment/tool/ItemEnderDagger.java index 657945793..9cdb32cea 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/tool/ItemEnderDagger.java +++ b/src/main/java/vazkii/botania/common/item/equipment/tool/ItemEnderDagger.java @@ -27,6 +27,7 @@ import vazkii.botania.common.item.IColorable; import vazkii.botania.common.item.equipment.tool.manasteel.ItemManasteelSword; import vazkii.botania.common.lib.LibItemNames; +import javax.annotation.Nonnull; import java.awt.*; public class ItemEnderDagger extends ItemManasteelSword implements IColorable { @@ -45,13 +46,14 @@ public class ItemEnderDagger extends ItemManasteelSword implements IColorable { return Color.HSBtoRGB(0.75F, 1F, 1.5F - (float) Math.min(1F, Math.sin(System.currentTimeMillis() / 100D) * 0.5 + 1.2F)); } + @Nonnull @Override public EnumAction getItemUseAction(ItemStack par1ItemStack) { return EnumAction.NONE; } @Override - public boolean hitEntity(ItemStack par1ItemStack, EntityLivingBase par2EntityLivingBase, EntityLivingBase par3EntityLivingBase) { + public boolean hitEntity(ItemStack par1ItemStack, EntityLivingBase par2EntityLivingBase, @Nonnull EntityLivingBase par3EntityLivingBase) { if(par2EntityLivingBase instanceof EntityEnderman && par3EntityLivingBase instanceof EntityPlayer) par2EntityLivingBase.attackEntityFrom(DamageSource.causePlayerDamage((EntityPlayer) par3EntityLivingBase), 20); par1ItemStack.damageItem(1, par3EntityLivingBase); @@ -68,6 +70,7 @@ public class ItemEnderDagger extends ItemManasteelSword implements IColorable { return false; } + @Nonnull @Override public Multimap getItemAttributeModifiers(EntityEquipmentSlot equipmentSlot) { Multimap multimap = super.getItemAttributeModifiers(equipmentSlot); diff --git a/src/main/java/vazkii/botania/common/item/equipment/tool/ItemGlassPick.java b/src/main/java/vazkii/botania/common/item/equipment/tool/ItemGlassPick.java index 71c347441..7abc350de 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/tool/ItemGlassPick.java +++ b/src/main/java/vazkii/botania/common/item/equipment/tool/ItemGlassPick.java @@ -21,6 +21,8 @@ import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; import vazkii.botania.common.item.equipment.tool.manasteel.ItemManasteelPick; import vazkii.botania.common.lib.LibItemNames; +import javax.annotation.Nonnull; + public class ItemGlassPick extends ItemManasteelPick { private static final int MANA_PER_DAMAGE = 160; @@ -44,7 +46,7 @@ public class ItemGlassPick extends ItemManasteelPick { } @Override - public boolean getIsRepairable(ItemStack par1ItemStack, ItemStack par2ItemStack) { + public boolean getIsRepairable(ItemStack par1ItemStack, @Nonnull ItemStack par2ItemStack) { return par2ItemStack.getItem() == Item.getItemFromBlock(Blocks.GLASS) ? true : super.getIsRepairable(par1ItemStack, par2ItemStack); } diff --git a/src/main/java/vazkii/botania/common/item/equipment/tool/ItemStarSword.java b/src/main/java/vazkii/botania/common/item/equipment/tool/ItemStarSword.java index 996804d6b..431453943 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/tool/ItemStarSword.java +++ b/src/main/java/vazkii/botania/common/item/equipment/tool/ItemStarSword.java @@ -30,6 +30,8 @@ import vazkii.botania.common.item.ModItems; import vazkii.botania.common.item.equipment.tool.manasteel.ItemManasteelSword; import vazkii.botania.common.lib.LibItemNames; +import javax.annotation.Nonnull; + public class ItemStarSword extends ItemManasteelSword implements ICraftAchievement { private static final int MANA_PER_DAMAGE = 120; @@ -85,7 +87,7 @@ public class ItemStarSword extends ItemManasteelSword implements ICraftAchieveme } @Override - public boolean getIsRepairable(ItemStack par1ItemStack, ItemStack par2ItemStack) { + public boolean getIsRepairable(ItemStack par1ItemStack, @Nonnull ItemStack par2ItemStack) { return par2ItemStack.getItem() == ModItems.manaResource && par2ItemStack.getItemDamage() == 4 ? true : super.getIsRepairable(par1ItemStack, par2ItemStack); } diff --git a/src/main/java/vazkii/botania/common/item/equipment/tool/ItemThunderSword.java b/src/main/java/vazkii/botania/common/item/equipment/tool/ItemThunderSword.java index 515840725..59ac91cde 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/tool/ItemThunderSword.java +++ b/src/main/java/vazkii/botania/common/item/equipment/tool/ItemThunderSword.java @@ -33,6 +33,7 @@ import vazkii.botania.common.core.helper.Vector3; import vazkii.botania.common.item.equipment.tool.manasteel.ItemManasteelSword; import vazkii.botania.common.lib.LibItemNames; +import javax.annotation.Nonnull; import java.util.ArrayList; import java.util.List; import java.util.Random; @@ -46,7 +47,7 @@ public class ItemThunderSword extends ItemManasteelSword implements ICraftAchiev } @Override - public boolean hitEntity(ItemStack stack, EntityLivingBase entity, EntityLivingBase attacker) { + public boolean hitEntity(ItemStack stack, EntityLivingBase entity, @Nonnull EntityLivingBase attacker) { if(!(entity instanceof EntityPlayer) && entity != null) { double range = 8; final List alreadyTargetedEntities = new ArrayList<>(); @@ -88,6 +89,7 @@ public class ItemThunderSword extends ItemManasteelSword implements ICraftAchiev return ModAchievements.terrasteelWeaponCraft; } + @Nonnull @Override public Multimap getItemAttributeModifiers(EntityEquipmentSlot equipmentSlot) { Multimap multimap = super.getItemAttributeModifiers(equipmentSlot); diff --git a/src/main/java/vazkii/botania/common/item/equipment/tool/bow/ItemLivingwoodBow.java b/src/main/java/vazkii/botania/common/item/equipment/tool/bow/ItemLivingwoodBow.java index 796755b8d..ad1952b3d 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/tool/bow/ItemLivingwoodBow.java +++ b/src/main/java/vazkii/botania/common/item/equipment/tool/bow/ItemLivingwoodBow.java @@ -43,6 +43,7 @@ import vazkii.botania.common.item.equipment.tool.ToolCommons; import vazkii.botania.common.lib.LibItemNames; import vazkii.botania.common.lib.LibMisc; +import javax.annotation.Nonnull; import java.util.function.Predicate; public class ItemLivingwoodBow extends ItemBow implements IManaUsingItem { @@ -61,7 +62,7 @@ public class ItemLivingwoodBow extends ItemBow implements IManaUsingItem { setMaxDamage(500); addPropertyOverride(new ResourceLocation("minecraft:pull"), new IItemPropertyGetter() { @Override - public float apply(ItemStack stack, World worldIn, EntityLivingBase entityIn) { + public float apply(@Nonnull ItemStack stack, World worldIn, EntityLivingBase entityIn) { if (entityIn == null) { return 0.0F; @@ -75,13 +76,15 @@ public class ItemLivingwoodBow extends ItemBow implements IManaUsingItem { }); } + @Nonnull @Override - public String getUnlocalizedNameInefficiently(ItemStack par1ItemStack) { + public String getUnlocalizedNameInefficiently(@Nonnull ItemStack par1ItemStack) { return super.getUnlocalizedNameInefficiently(par1ItemStack).replaceAll("item.", "item." + LibResources.PREFIX_MOD); } + @Nonnull @Override - public ActionResult onItemRightClick(ItemStack stack, World world, EntityPlayer player, EnumHand hand) { + public ActionResult onItemRightClick(@Nonnull ItemStack stack, @Nonnull World world, EntityPlayer player, @Nonnull EnumHand hand) { // Copy from superclass with our own check boolean flag = canFire(stack, player); ActionResult ret = ForgeEventFactory.onArrowNock(stack, world, player, hand, flag); @@ -99,7 +102,7 @@ public class ItemLivingwoodBow extends ItemBow implements IManaUsingItem { } @Override - public void onPlayerStoppedUsing(ItemStack stack, World world, EntityLivingBase shooter, int useTicks) { + public void onPlayerStoppedUsing(@Nonnull ItemStack stack, @Nonnull World world, EntityLivingBase shooter, int useTicks) { int j = (int) ((getMaxItemUseDuration(stack) - useTicks) * chargeVelocityMultiplier()); if(shooter instanceof EntityPlayer) { diff --git a/src/main/java/vazkii/botania/common/item/equipment/tool/elementium/ItemElementiumShears.java b/src/main/java/vazkii/botania/common/item/equipment/tool/elementium/ItemElementiumShears.java index 42efe0bce..dc111e56a 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/tool/elementium/ItemElementiumShears.java +++ b/src/main/java/vazkii/botania/common/item/equipment/tool/elementium/ItemElementiumShears.java @@ -20,6 +20,7 @@ import vazkii.botania.common.item.equipment.tool.ToolCommons; import vazkii.botania.common.item.equipment.tool.manasteel.ItemManasteelShears; import vazkii.botania.common.lib.LibItemNames; +import javax.annotation.Nonnull; import java.util.List; import java.util.Random; @@ -29,6 +30,7 @@ public class ItemElementiumShears extends ItemManasteelShears { super(LibItemNames.ELEMENTIUM_SHEARS); } + @Nonnull @Override public EnumAction getItemUseAction(ItemStack par1ItemStack) { return EnumAction.BOW; @@ -39,8 +41,9 @@ public class ItemElementiumShears extends ItemManasteelShears { return 72000; } + @Nonnull @Override - public ActionResult onItemRightClick(ItemStack par1ItemStack, World par2World, EntityPlayer player, EnumHand hand) { + public ActionResult onItemRightClick(@Nonnull ItemStack par1ItemStack, World par2World, EntityPlayer player, EnumHand hand) { player.setActiveHand(hand); return ActionResult.newResult(EnumActionResult.SUCCESS, par1ItemStack); } diff --git a/src/main/java/vazkii/botania/common/item/equipment/tool/manasteel/ItemManasteelAxe.java b/src/main/java/vazkii/botania/common/item/equipment/tool/manasteel/ItemManasteelAxe.java index afffaf9be..35b7ec219 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/tool/manasteel/ItemManasteelAxe.java +++ b/src/main/java/vazkii/botania/common/item/equipment/tool/manasteel/ItemManasteelAxe.java @@ -37,6 +37,7 @@ import vazkii.botania.common.item.equipment.tool.ToolCommons; import vazkii.botania.common.lib.LibItemNames; import vazkii.botania.common.lib.LibMisc; +import javax.annotation.Nonnull; import java.util.Set; import java.util.regex.Pattern; @@ -59,24 +60,26 @@ public class ItemManasteelAxe extends ItemTool implements IManaUsingItem, ISorta this.attackSpeed = -3.1f; } + @Nonnull @Override public Set getToolClasses(ItemStack stack) { return ImmutableSet.of("axe"); } + @Nonnull @Override - public String getUnlocalizedNameInefficiently(ItemStack par1ItemStack) { + public String getUnlocalizedNameInefficiently(@Nonnull ItemStack par1ItemStack) { return super.getUnlocalizedNameInefficiently(par1ItemStack).replaceAll("item.", "item." + LibResources.PREFIX_MOD); } @Override - public boolean hitEntity(ItemStack par1ItemStack, EntityLivingBase par2EntityLivingBase, EntityLivingBase par3EntityLivingBase) { + public boolean hitEntity(ItemStack par1ItemStack, EntityLivingBase par2EntityLivingBase, @Nonnull EntityLivingBase par3EntityLivingBase) { ToolCommons.damageItem(par1ItemStack, 1, par3EntityLivingBase, getManaPerDamage()); return true; } @Override - public boolean onBlockDestroyed(ItemStack stack, World world, IBlockState state, BlockPos pos, EntityLivingBase entity) { + public boolean onBlockDestroyed(@Nonnull ItemStack stack, @Nonnull World world, IBlockState state, @Nonnull BlockPos pos, @Nonnull EntityLivingBase entity) { if (state.getBlockHardness(world, pos) != 0F) ToolCommons.damageItem(stack, 1, entity, getManaPerDamage()); @@ -87,6 +90,7 @@ public class ItemManasteelAxe extends ItemTool implements IManaUsingItem, ISorta return MANA_PER_DAMAGE; } + @Nonnull @Override public EnumActionResult onItemUse(ItemStack stack, EntityPlayer player, World world, BlockPos pos, EnumHand hand, EnumFacing side, float sx, float sy, float sz) { for(int i = 0; i < player.inventory.getSizeInventory(); i++) { @@ -112,7 +116,7 @@ public class ItemManasteelAxe extends ItemTool implements IManaUsingItem, ISorta } @Override - public boolean getIsRepairable(ItemStack par1ItemStack, ItemStack par2ItemStack) { + public boolean getIsRepairable(ItemStack par1ItemStack, @Nonnull ItemStack par2ItemStack) { return par2ItemStack.getItem() == ModItems.manaResource && par2ItemStack.getItemDamage() == 0 ? true : super.getIsRepairable(par1ItemStack, par2ItemStack); } diff --git a/src/main/java/vazkii/botania/common/item/equipment/tool/manasteel/ItemManasteelPick.java b/src/main/java/vazkii/botania/common/item/equipment/tool/manasteel/ItemManasteelPick.java index 21a13443e..ddfb395d9 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/tool/manasteel/ItemManasteelPick.java +++ b/src/main/java/vazkii/botania/common/item/equipment/tool/manasteel/ItemManasteelPick.java @@ -36,6 +36,7 @@ import vazkii.botania.common.item.equipment.tool.ToolCommons; import vazkii.botania.common.lib.LibItemNames; import vazkii.botania.common.lib.LibMisc; +import javax.annotation.Nonnull; import java.util.regex.Pattern; public class ItemManasteelPick extends ItemPickaxe implements IManaUsingItem, ISortableTool { @@ -55,25 +56,27 @@ public class ItemManasteelPick extends ItemPickaxe implements IManaUsingItem, IS setUnlocalizedName(name); } + @Nonnull @Override - public String getUnlocalizedNameInefficiently(ItemStack par1ItemStack) { + public String getUnlocalizedNameInefficiently(@Nonnull ItemStack par1ItemStack) { return super.getUnlocalizedNameInefficiently(par1ItemStack).replaceAll("item.", "item." + LibResources.PREFIX_MOD); } @Override - public boolean hitEntity(ItemStack par1ItemStack, EntityLivingBase par2EntityLivingBase, EntityLivingBase par3EntityLivingBase) { + public boolean hitEntity(ItemStack par1ItemStack, EntityLivingBase par2EntityLivingBase, @Nonnull EntityLivingBase par3EntityLivingBase) { ToolCommons.damageItem(par1ItemStack, 1, par3EntityLivingBase, getManaPerDmg()); return true; } @Override - public boolean onBlockDestroyed(ItemStack stack, World world, IBlockState state, BlockPos pos, EntityLivingBase entity) { + public boolean onBlockDestroyed(@Nonnull ItemStack stack, @Nonnull World world, IBlockState state, @Nonnull BlockPos pos, @Nonnull EntityLivingBase entity) { if(state.getBlockHardness(world, pos) != 0F) ToolCommons.damageItem(stack, 1, entity, getManaPerDmg()); return true; } + @Nonnull @Override public EnumActionResult onItemUse(ItemStack stack, EntityPlayer player, World world, BlockPos pos, EnumHand hand, EnumFacing side, float sx, float sy, float sz) { for(int i = 0; i < player.inventory.getSizeInventory(); i++) { @@ -102,7 +105,7 @@ public class ItemManasteelPick extends ItemPickaxe implements IManaUsingItem, IS } @Override - public boolean getIsRepairable(ItemStack par1ItemStack, ItemStack par2ItemStack) { + public boolean getIsRepairable(ItemStack par1ItemStack, @Nonnull ItemStack par2ItemStack) { return par2ItemStack.getItem() == ModItems.manaResource && par2ItemStack.getItemDamage() == 0 ? true : super.getIsRepairable(par1ItemStack, par2ItemStack); } diff --git a/src/main/java/vazkii/botania/common/item/equipment/tool/manasteel/ItemManasteelShears.java b/src/main/java/vazkii/botania/common/item/equipment/tool/manasteel/ItemManasteelShears.java index 82f11bd87..057f62356 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/tool/manasteel/ItemManasteelShears.java +++ b/src/main/java/vazkii/botania/common/item/equipment/tool/manasteel/ItemManasteelShears.java @@ -35,6 +35,7 @@ import vazkii.botania.common.item.equipment.tool.ToolCommons; import vazkii.botania.common.lib.LibItemNames; import vazkii.botania.common.lib.LibMisc; +import javax.annotation.Nonnull; import java.util.List; import java.util.Random; @@ -52,13 +53,14 @@ public class ItemManasteelShears extends ItemShears implements IManaUsingItem { setUnlocalizedName(name); } + @Nonnull @Override - public String getUnlocalizedNameInefficiently(ItemStack par1ItemStack) { + public String getUnlocalizedNameInefficiently(@Nonnull ItemStack par1ItemStack) { return super.getUnlocalizedNameInefficiently(par1ItemStack).replaceAll("item.", "item." + LibResources.PREFIX_MOD); } @Override - public boolean itemInteractionForEntity(ItemStack itemstack, EntityPlayer player, EntityLivingBase entity, EnumHand hand) { + public boolean itemInteractionForEntity(@Nonnull ItemStack itemstack, EntityPlayer player, EntityLivingBase entity, EnumHand hand) { if(entity.worldObj.isRemote) return false; @@ -85,7 +87,7 @@ public class ItemManasteelShears extends ItemShears implements IManaUsingItem { } @Override - public boolean onBlockStartBreak(ItemStack itemstack, BlockPos pos, EntityPlayer player) { + public boolean onBlockStartBreak(@Nonnull ItemStack itemstack, @Nonnull BlockPos pos, EntityPlayer player) { if (player.worldObj.isRemote) return false; diff --git a/src/main/java/vazkii/botania/common/item/equipment/tool/manasteel/ItemManasteelShovel.java b/src/main/java/vazkii/botania/common/item/equipment/tool/manasteel/ItemManasteelShovel.java index c8bfb4a9d..2a565ae3f 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/tool/manasteel/ItemManasteelShovel.java +++ b/src/main/java/vazkii/botania/common/item/equipment/tool/manasteel/ItemManasteelShovel.java @@ -40,6 +40,8 @@ import vazkii.botania.common.item.equipment.tool.ToolCommons; import vazkii.botania.common.lib.LibItemNames; import vazkii.botania.common.lib.LibMisc; +import javax.annotation.Nonnull; + public class ItemManasteelShovel extends ItemSpade implements IManaUsingItem, ISortableTool { private static final int MANA_PER_DAMAGE = 60; @@ -55,27 +57,29 @@ public class ItemManasteelShovel extends ItemSpade implements IManaUsingItem, IS setUnlocalizedName(name); } + @Nonnull @Override - public String getUnlocalizedNameInefficiently(ItemStack par1ItemStack) { + public String getUnlocalizedNameInefficiently(@Nonnull ItemStack par1ItemStack) { return super.getUnlocalizedNameInefficiently(par1ItemStack).replaceAll("item.", "item." + LibResources.PREFIX_MOD); } @Override - public boolean hitEntity(ItemStack par1ItemStack, EntityLivingBase par2EntityLivingBase, EntityLivingBase par3EntityLivingBase) { + public boolean hitEntity(ItemStack par1ItemStack, EntityLivingBase par2EntityLivingBase, @Nonnull EntityLivingBase par3EntityLivingBase) { ToolCommons.damageItem(par1ItemStack, 1, par3EntityLivingBase, MANA_PER_DAMAGE); return true; } @Override - public boolean onBlockDestroyed(ItemStack stack, World world, IBlockState state, BlockPos pos, EntityLivingBase entity) { + public boolean onBlockDestroyed(@Nonnull ItemStack stack, @Nonnull World world, IBlockState state, @Nonnull BlockPos pos, @Nonnull EntityLivingBase entity) { if (state.getBlockHardness(world, pos) != 0F) ToolCommons.damageItem(stack, 1, entity, MANA_PER_DAMAGE); return true; } + @Nonnull @Override - public EnumActionResult onItemUse(ItemStack p_77648_1_, EntityPlayer p_77648_2_, World p_77648_3_, BlockPos pos, EnumHand hand, EnumFacing side, float p_77648_8_, float p_77648_9_, float p_77648_10_) { + public EnumActionResult onItemUse(@Nonnull ItemStack p_77648_1_, EntityPlayer p_77648_2_, @Nonnull World p_77648_3_, BlockPos pos, EnumHand hand, @Nonnull EnumFacing side, float p_77648_8_, float p_77648_9_, float p_77648_10_) { if(!p_77648_2_.canPlayerEdit(pos, side, p_77648_1_)) return EnumActionResult.PASS; else { @@ -114,7 +118,7 @@ public class ItemManasteelShovel extends ItemSpade implements IManaUsingItem, IS } @Override - public boolean getIsRepairable(ItemStack par1ItemStack, ItemStack par2ItemStack) { + public boolean getIsRepairable(ItemStack par1ItemStack, @Nonnull ItemStack par2ItemStack) { return par2ItemStack.getItem() == ModItems.manaResource && par2ItemStack.getItemDamage() == 0 ? true : super.getIsRepairable(par1ItemStack, par2ItemStack); } diff --git a/src/main/java/vazkii/botania/common/item/equipment/tool/manasteel/ItemManasteelSword.java b/src/main/java/vazkii/botania/common/item/equipment/tool/manasteel/ItemManasteelSword.java index a755a6fb5..7760c64a8 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/tool/manasteel/ItemManasteelSword.java +++ b/src/main/java/vazkii/botania/common/item/equipment/tool/manasteel/ItemManasteelSword.java @@ -31,6 +31,8 @@ import vazkii.botania.common.item.equipment.tool.ToolCommons; import vazkii.botania.common.lib.LibItemNames; import vazkii.botania.common.lib.LibMisc; +import javax.annotation.Nonnull; + public class ItemManasteelSword extends ItemSword implements IManaUsingItem { public static final int MANA_PER_DAMAGE = 60; @@ -46,26 +48,27 @@ public class ItemManasteelSword extends ItemSword implements IManaUsingItem { setUnlocalizedName(name); addPropertyOverride(new ResourceLocation("botania", "elucidator"), new IItemPropertyGetter() { @Override - public float apply(ItemStack stack, World worldIn, EntityLivingBase entityIn) { + public float apply(@Nonnull ItemStack stack, World worldIn, EntityLivingBase entityIn) { return "the elucidator".equals(stack.getDisplayName().toLowerCase().trim()) ? 1 : 0; } }); } + @Nonnull @Override - public String getUnlocalizedNameInefficiently(ItemStack par1ItemStack) { + public String getUnlocalizedNameInefficiently(@Nonnull ItemStack par1ItemStack) { return super.getUnlocalizedNameInefficiently(par1ItemStack).replaceAll("item.", "item." + LibResources.PREFIX_MOD); } @Override - public boolean hitEntity(ItemStack par1ItemStack, EntityLivingBase par2EntityLivingBase, EntityLivingBase par3EntityLivingBase) { + public boolean hitEntity(ItemStack par1ItemStack, EntityLivingBase par2EntityLivingBase, @Nonnull EntityLivingBase par3EntityLivingBase) { if(usesMana(par1ItemStack)) ToolCommons.damageItem(par1ItemStack, 1, par3EntityLivingBase, getManaPerDamage()); return true; } @Override - public boolean onBlockDestroyed(ItemStack stack, World world, IBlockState state, BlockPos pos, EntityLivingBase entity) { + public boolean onBlockDestroyed(@Nonnull ItemStack stack, @Nonnull World world, IBlockState state, @Nonnull BlockPos pos, @Nonnull EntityLivingBase entity) { if(usesMana(stack) && state.getBlockHardness(world, pos) != 0F) ToolCommons.damageItem(stack, 1, entity, getManaPerDamage()); @@ -83,7 +86,7 @@ public class ItemManasteelSword extends ItemSword implements IManaUsingItem { } @Override - public boolean getIsRepairable(ItemStack par1ItemStack, ItemStack par2ItemStack) { + public boolean getIsRepairable(ItemStack par1ItemStack, @Nonnull ItemStack par2ItemStack) { return par2ItemStack.getItem() == ModItems.manaResource && par2ItemStack.getItemDamage() == 0 ? true : super.getIsRepairable(par1ItemStack, par2ItemStack); } diff --git a/src/main/java/vazkii/botania/common/item/equipment/tool/terrasteel/ItemTerraAxe.java b/src/main/java/vazkii/botania/common/item/equipment/tool/terrasteel/ItemTerraAxe.java index 7d75ec785..2944fc613 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/tool/terrasteel/ItemTerraAxe.java +++ b/src/main/java/vazkii/botania/common/item/equipment/tool/terrasteel/ItemTerraAxe.java @@ -36,6 +36,7 @@ import vazkii.botania.common.item.relic.ItemLokiRing; import vazkii.botania.common.lib.LibItemNames; import vazkii.botania.common.lib.LibMisc; +import javax.annotation.Nonnull; import java.util.ArrayList; import java.util.HashMap; import java.util.HashSet; @@ -84,7 +85,7 @@ public class ItemTerraAxe extends ItemManasteelAxe implements ISequentialBreaker this.attackSpeed = -3f; addPropertyOverride(new ResourceLocation(LibMisc.MOD_ID, "terraaxe_on"), new IItemPropertyGetter() { @Override - public float apply(ItemStack stack, World world, EntityLivingBase entity) { + public float apply(@Nonnull ItemStack stack, World world, EntityLivingBase entity) { if(entity instanceof EntityPlayer && !shouldBreak(((EntityPlayer) entity))) return 0; return 1; @@ -385,7 +386,7 @@ public class ItemTerraAxe extends ItemManasteelAxe implements ISequentialBreaker } @Override - public int compareTo(SwapCandidate other) { + public int compareTo(@Nonnull SwapCandidate other) { // Aka, a bigger range implies a smaller value, meaning // bigger ranges will be preferred in a min-heap return other.range - range; diff --git a/src/main/java/vazkii/botania/common/item/equipment/tool/terrasteel/ItemTerraPick.java b/src/main/java/vazkii/botania/common/item/equipment/tool/terrasteel/ItemTerraPick.java index 95d08c88a..f158bacfb 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/tool/terrasteel/ItemTerraPick.java +++ b/src/main/java/vazkii/botania/common/item/equipment/tool/terrasteel/ItemTerraPick.java @@ -54,6 +54,7 @@ import vazkii.botania.common.item.relic.ItemLokiRing; import vazkii.botania.common.item.relic.ItemThorRing; import vazkii.botania.common.lib.LibItemNames; +import javax.annotation.Nonnull; import java.awt.*; import java.util.List; @@ -82,20 +83,20 @@ public class ItemTerraPick extends ItemManasteelPick implements IManaItem, ISequ RecipeSorter.register("botania:terraPickTipping", TerraPickTippingRecipe.class, Category.SHAPELESS, ""); addPropertyOverride(new ResourceLocation("botania", "tipped"), new IItemPropertyGetter() { @Override - public float apply(ItemStack itemStack, World world, EntityLivingBase entityLivingBase) { + public float apply(@Nonnull ItemStack itemStack, World world, EntityLivingBase entityLivingBase) { return isTipped(itemStack) ? 1 : 0; } }); addPropertyOverride(new ResourceLocation("botania", "enabled"), new IItemPropertyGetter() { @Override - public float apply(ItemStack itemStack, World world, EntityLivingBase entityLivingBase) { + public float apply(@Nonnull ItemStack itemStack, World world, EntityLivingBase entityLivingBase) { return isEnabled(itemStack) ? 1 : 0; } }); } @Override - public void getSubItems(Item item, CreativeTabs tab, List list) { + public void getSubItems(@Nonnull Item item, CreativeTabs tab, List list) { for(int mana : CREATIVE_MANA) { ItemStack stack = new ItemStack(item); setMana(stack, mana); @@ -112,8 +113,9 @@ public class ItemTerraPick extends ItemManasteelPick implements IManaItem, ISequ par3List.add(TextFormatting.RED + I18n.translateToLocal("botaniamisc.getALife")); } + @Nonnull @Override - public ActionResult onItemRightClick(ItemStack par1ItemStack, World par2World, EntityPlayer par3EntityPlayer, EnumHand hand) { + public ActionResult onItemRightClick(@Nonnull ItemStack par1ItemStack, World par2World, EntityPlayer par3EntityPlayer, EnumHand hand) { getMana(par1ItemStack); int level = getLevel(par1ItemStack); @@ -126,6 +128,7 @@ public class ItemTerraPick extends ItemManasteelPick implements IManaItem, ISequ return ActionResult.newResult(EnumActionResult.SUCCESS, par1ItemStack); } + @Nonnull @Override public EnumActionResult onItemUse(ItemStack stack, EntityPlayer player, World world, BlockPos pos, EnumHand hand, EnumFacing side, float sx, float sy, float sz) { return player.isSneaking() ? super.onItemUse(stack, player, world, pos, hand, side, sx, sy, sz) @@ -289,7 +292,7 @@ public class ItemTerraPick extends ItemManasteelPick implements IManaItem, ISequ } @Override - public boolean getIsRepairable(ItemStack par1ItemStack, ItemStack par2ItemStack) { + public boolean getIsRepairable(ItemStack par1ItemStack, @Nonnull ItemStack par2ItemStack) { return par2ItemStack.getItem() == ModItems.manaResource && par2ItemStack.getItemDamage() == 4 ? true : super.getIsRepairable(par1ItemStack, par2ItemStack); } @@ -299,7 +302,7 @@ public class ItemTerraPick extends ItemManasteelPick implements IManaItem, ISequ } @Override - public boolean shouldCauseReequipAnimation(ItemStack before, ItemStack after, boolean slotChanged) { + public boolean shouldCauseReequipAnimation(ItemStack before, @Nonnull ItemStack after, boolean slotChanged) { return after.getItem() != this || isEnabled(before) != isEnabled(after); } diff --git a/src/main/java/vazkii/botania/common/item/equipment/tool/terrasteel/ItemTerraSword.java b/src/main/java/vazkii/botania/common/item/equipment/tool/terrasteel/ItemTerraSword.java index 26605c313..ba89f3f54 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/tool/terrasteel/ItemTerraSword.java +++ b/src/main/java/vazkii/botania/common/item/equipment/tool/terrasteel/ItemTerraSword.java @@ -39,6 +39,7 @@ import vazkii.botania.common.item.equipment.tool.ToolCommons; import vazkii.botania.common.item.equipment.tool.manasteel.ItemManasteelSword; import vazkii.botania.common.lib.LibItemNames; +import javax.annotation.Nonnull; import java.util.List; public class ItemTerraSword extends ItemManasteelSword implements ILensEffect, ICraftAchievement { @@ -136,7 +137,7 @@ public class ItemTerraSword extends ItemManasteelSword implements ILensEffect, I } @Override - public boolean getIsRepairable(ItemStack par1ItemStack, ItemStack par2ItemStack) { + public boolean getIsRepairable(ItemStack par1ItemStack, @Nonnull ItemStack par2ItemStack) { return par2ItemStack.getItem() == ModItems.manaResource && par2ItemStack.getItemDamage() == 4 ? true : super.getIsRepairable(par1ItemStack, par2ItemStack); } diff --git a/src/main/java/vazkii/botania/common/item/interaction/thaumcraft/ItemManaInkwell.java b/src/main/java/vazkii/botania/common/item/interaction/thaumcraft/ItemManaInkwell.java index 47ea9c972..d0f285d84 100644 --- a/src/main/java/vazkii/botania/common/item/interaction/thaumcraft/ItemManaInkwell.java +++ b/src/main/java/vazkii/botania/common/item/interaction/thaumcraft/ItemManaInkwell.java @@ -22,6 +22,7 @@ import vazkii.botania.common.core.helper.ItemNBTHelper; import vazkii.botania.common.item.ItemMod; import vazkii.botania.common.lib.LibItemNames; +import javax.annotation.Nonnull; import java.util.List; @Optional.Interface(modid = "Thaumcraft", iface = "thaumcraft.api.items.IScribeTools") @@ -41,7 +42,7 @@ public class ItemManaInkwell extends ItemMod implements IManaItem, IScribeTools } @Override - public void getSubItems(Item item, CreativeTabs tab, List list) { + public void getSubItems(@Nonnull Item item, CreativeTabs tab, List list) { list.add(new ItemStack(item, 1, USES)); list.add(new ItemStack(item)); } diff --git a/src/main/java/vazkii/botania/common/item/lens/ItemLens.java b/src/main/java/vazkii/botania/common/item/lens/ItemLens.java index c153b5674..f8c6c7772 100644 --- a/src/main/java/vazkii/botania/common/item/lens/ItemLens.java +++ b/src/main/java/vazkii/botania/common/item/lens/ItemLens.java @@ -37,6 +37,7 @@ import vazkii.botania.common.item.IColorable; import vazkii.botania.common.item.ItemMod; import vazkii.botania.common.lib.LibItemNames; +import javax.annotation.Nonnull; import java.awt.*; import java.util.List; @@ -145,7 +146,7 @@ public class ItemLens extends ItemMod implements ILensControl, ICompositableLens } @Override - public void getSubItems(Item par1, CreativeTabs par2CreativeTabs, List par3List) { + public void getSubItems(@Nonnull Item par1, CreativeTabs par2CreativeTabs, List par3List) { for(int i = 0; i < SUBTYPES; i++) par3List.add(new ItemStack(par1, 1, i)); } @@ -155,6 +156,7 @@ public class ItemLens extends ItemMod implements ILensControl, ICompositableLens return par2 == 0 ? getLensColor(par1ItemStack) : 0xFFFFFF; } + @Nonnull @Override public String getUnlocalizedName(ItemStack par1ItemStack) { return "item." + LibItemNames.LENS_NAMES[Math.min(SUBTYPES - 1, par1ItemStack.getItemDamage())]; @@ -172,8 +174,9 @@ public class ItemLens extends ItemMod implements ILensControl, ICompositableLens return I18n.translateToLocal(stack.getUnlocalizedName().replaceAll("item.", "item.botania:") + ".short"); } + @Nonnull @Override - public String getItemStackDisplayName(ItemStack stack) { + public String getItemStackDisplayName(@Nonnull ItemStack stack) { ItemStack compositeLens = getCompositeLens(stack); if(compositeLens == null) return super.getItemStackDisplayName(stack); diff --git a/src/main/java/vazkii/botania/common/item/material/ItemDye.java b/src/main/java/vazkii/botania/common/item/material/ItemDye.java index 54df837fe..8b55de12d 100644 --- a/src/main/java/vazkii/botania/common/item/material/ItemDye.java +++ b/src/main/java/vazkii/botania/common/item/material/ItemDye.java @@ -29,12 +29,15 @@ import vazkii.botania.api.mana.IManaPool; import vazkii.botania.common.item.Item16Colors; import vazkii.botania.common.lib.LibItemNames; +import javax.annotation.Nonnull; + public class ItemDye extends Item16Colors { public ItemDye() { super(LibItemNames.DYE); } + @Nonnull @Override public EnumActionResult onItemUse(ItemStack par1ItemStack, EntityPlayer par2EntityPlayer, World par3World, BlockPos pos, EnumHand hand, EnumFacing side, float par8, float par9, float par10) { Block block = par3World.getBlockState(pos).getBlock(); diff --git a/src/main/java/vazkii/botania/common/item/material/ItemManaResource.java b/src/main/java/vazkii/botania/common/item/material/ItemManaResource.java index cfefaec3e..369868d4b 100644 --- a/src/main/java/vazkii/botania/common/item/material/ItemManaResource.java +++ b/src/main/java/vazkii/botania/common/item/material/ItemManaResource.java @@ -42,6 +42,7 @@ import vazkii.botania.common.item.IColorable; import vazkii.botania.common.item.ItemMod; import vazkii.botania.common.lib.LibItemNames; +import javax.annotation.Nonnull; import java.awt.*; import java.util.List; @@ -84,6 +85,7 @@ public class ItemManaResource extends ItemMod implements IFlowerComponent, IElve } } + @Nonnull @Override public EnumActionResult onItemUse(ItemStack par1ItemStack, EntityPlayer par2EntityPlayer, World par3World, BlockPos pos, EnumHand hand, EnumFacing side, float par8, float par9, float par10) { if(par1ItemStack.getItemDamage() == 4 || par1ItemStack.getItemDamage() == 14) @@ -98,8 +100,9 @@ public class ItemManaResource extends ItemMod implements IFlowerComponent, IElve return super.onItemUse(par1ItemStack, par2EntityPlayer, par3World, pos, hand, side, par8, par9, par10); } + @Nonnull @Override - public ActionResult onItemRightClick(ItemStack par1ItemStack, World par3World, EntityPlayer par2EntityPlayer, EnumHand hand) { + public ActionResult onItemRightClick(@Nonnull ItemStack par1ItemStack, World par3World, EntityPlayer par2EntityPlayer, EnumHand hand) { if(par1ItemStack.getItemDamage() == 15) { if(!par2EntityPlayer.capabilities.isCreativeMode) --par1ItemStack.stackSize; @@ -120,7 +123,7 @@ public class ItemManaResource extends ItemMod implements IFlowerComponent, IElve @Override @SideOnly(Side.CLIENT) - public void getSubItems(Item par1, CreativeTabs par2CreativeTabs, List par3List) { + public void getSubItems(@Nonnull Item par1, CreativeTabs par2CreativeTabs, List par3List) { for(int i = 0; i < types; i++) if(Botania.gardenOfGlassLoaded || i != 20 && i != 21) par3List.add(new ItemStack(par1, 1, i)); @@ -135,6 +138,7 @@ public class ItemManaResource extends ItemMod implements IFlowerComponent, IElve return 0xFFFFFF; } + @Nonnull @Override public String getUnlocalizedName(ItemStack par1ItemStack) { return "item." + LibItemNames.MANA_RESOURCE_NAMES[Math.min(types - 1, par1ItemStack.getItemDamage())]; @@ -157,8 +161,9 @@ public class ItemManaResource extends ItemMod implements IFlowerComponent, IElve return meta == 7 || meta == 8 || meta == 9; } + @Nonnull @Override - public ItemStack getContainerItem(ItemStack itemStack) { + public ItemStack getContainerItem(@Nonnull ItemStack itemStack) { return itemStack.getItemDamage() == 11 ? itemStack.copy() : null; } diff --git a/src/main/java/vazkii/botania/common/item/material/ItemPetal.java b/src/main/java/vazkii/botania/common/item/material/ItemPetal.java index c1862614d..39fe10c82 100644 --- a/src/main/java/vazkii/botania/common/item/material/ItemPetal.java +++ b/src/main/java/vazkii/botania/common/item/material/ItemPetal.java @@ -28,12 +28,15 @@ import vazkii.botania.common.block.ModBlocks; import vazkii.botania.common.item.Item16Colors; import vazkii.botania.common.lib.LibItemNames; +import javax.annotation.Nonnull; + public class ItemPetal extends Item16Colors implements IFlowerComponent { public ItemPetal() { super(LibItemNames.PETAL); } + @Nonnull @Override public EnumActionResult onItemUse(ItemStack stack, EntityPlayer player, World world, BlockPos pos, EnumHand hand, EnumFacing facing, float hitX, float hitY, float hitZ) { // Copy of ItemBlock.onItemUse diff --git a/src/main/java/vazkii/botania/common/item/material/ItemQuartz.java b/src/main/java/vazkii/botania/common/item/material/ItemQuartz.java index 956585d51..8532f1edb 100644 --- a/src/main/java/vazkii/botania/common/item/material/ItemQuartz.java +++ b/src/main/java/vazkii/botania/common/item/material/ItemQuartz.java @@ -18,6 +18,7 @@ import vazkii.botania.common.core.handler.ConfigHandler; import vazkii.botania.common.item.ItemMod; import vazkii.botania.common.lib.LibItemNames; +import javax.annotation.Nonnull; import java.util.List; public class ItemQuartz extends ItemMod implements IElvenItem { @@ -30,11 +31,12 @@ public class ItemQuartz extends ItemMod implements IElvenItem { } @Override - public void getSubItems(Item item, CreativeTabs tab, List list) { + public void getSubItems(@Nonnull Item item, CreativeTabs tab, List list) { for(int i = ConfigHandler.darkQuartzEnabled ? 0 : 1; i < SUBTYPES; i++) list.add(new ItemStack(item, 1, i)); } + @Nonnull @Override public String getUnlocalizedName(ItemStack par1ItemStack) { return getUnlocalizedNameLazy(par1ItemStack) + par1ItemStack.getItemDamage(); diff --git a/src/main/java/vazkii/botania/common/item/material/ItemRune.java b/src/main/java/vazkii/botania/common/item/material/ItemRune.java index af6a59c0b..a15059c00 100644 --- a/src/main/java/vazkii/botania/common/item/material/ItemRune.java +++ b/src/main/java/vazkii/botania/common/item/material/ItemRune.java @@ -23,6 +23,7 @@ import vazkii.botania.common.achievement.ModAchievements; import vazkii.botania.common.item.ItemMod; import vazkii.botania.common.lib.LibItemNames; +import javax.annotation.Nonnull; import java.util.List; public class ItemRune extends ItemMod implements IFlowerComponent, IPickupAchievement { @@ -33,11 +34,12 @@ public class ItemRune extends ItemMod implements IFlowerComponent, IPickupAchiev } @Override - public void getSubItems(Item par1, CreativeTabs par2CreativeTabs, List par3List) { + public void getSubItems(@Nonnull Item par1, CreativeTabs par2CreativeTabs, List par3List) { for(int i = 0; i < 16; i++) par3List.add(new ItemStack(par1, 1, i)); } + @Nonnull @Override public String getUnlocalizedName(ItemStack par1ItemStack) { return getUnlocalizedNameLazy(par1ItemStack) + par1ItemStack.getItemDamage(); diff --git a/src/main/java/vazkii/botania/common/item/record/ItemModRecord.java b/src/main/java/vazkii/botania/common/item/record/ItemModRecord.java index ce048f17d..fc9bf069c 100644 --- a/src/main/java/vazkii/botania/common/item/record/ItemModRecord.java +++ b/src/main/java/vazkii/botania/common/item/record/ItemModRecord.java @@ -19,6 +19,8 @@ import vazkii.botania.client.lib.LibResources; import vazkii.botania.common.core.BotaniaCreativeTab; import vazkii.botania.common.lib.LibMisc; +import javax.annotation.Nonnull; + public class ItemModRecord extends ItemRecord { private final String file; @@ -31,11 +33,13 @@ public class ItemModRecord extends ItemRecord { file = "botania:music." + record; } + @Nonnull @Override - public String getUnlocalizedNameInefficiently(ItemStack par1ItemStack) { + public String getUnlocalizedNameInefficiently(@Nonnull ItemStack par1ItemStack) { return super.getUnlocalizedNameInefficiently(par1ItemStack).replaceAll("item\\.", "item." + LibResources.PREFIX_MOD); } + @Nonnull @Override public ResourceLocation getRecordResource(String name) { return new ResourceLocation(file); diff --git a/src/main/java/vazkii/botania/common/item/relic/ItemDice.java b/src/main/java/vazkii/botania/common/item/relic/ItemDice.java index a02ba7bb5..edcac7ddb 100644 --- a/src/main/java/vazkii/botania/common/item/relic/ItemDice.java +++ b/src/main/java/vazkii/botania/common/item/relic/ItemDice.java @@ -29,6 +29,7 @@ import vazkii.botania.api.item.IRelic; import vazkii.botania.common.item.ModItems; import vazkii.botania.common.lib.LibItemNames; +import javax.annotation.Nonnull; import java.util.ArrayList; import java.util.List; @@ -51,8 +52,9 @@ public class ItemDice extends ItemRelic { }; } + @Nonnull @Override - public ActionResult onItemRightClick(ItemStack stack, World world, EntityPlayer player, EnumHand hand) { + public ActionResult onItemRightClick(@Nonnull ItemStack stack, World world, EntityPlayer player, EnumHand hand) { if(isRightPlayer(player, stack) && !player.worldObj.isRemote) { int moonPhase = world.provider.getMoonPhase(world.getWorldTime()); int relic = SIDES_FOR_MOON_PHASES[moonPhase]; diff --git a/src/main/java/vazkii/botania/common/item/relic/ItemFlugelEye.java b/src/main/java/vazkii/botania/common/item/relic/ItemFlugelEye.java index 4d4445c35..a38dd754d 100644 --- a/src/main/java/vazkii/botania/common/item/relic/ItemFlugelEye.java +++ b/src/main/java/vazkii/botania/common/item/relic/ItemFlugelEye.java @@ -32,6 +32,8 @@ import vazkii.botania.common.core.helper.ItemNBTHelper; import vazkii.botania.common.core.helper.MathHelper; import vazkii.botania.common.lib.LibItemNames; +import javax.annotation.Nonnull; + public class ItemFlugelEye extends ItemRelic implements ICoordBoundItem, IManaUsingItem { public ItemFlugelEye() { @@ -43,6 +45,7 @@ public class ItemFlugelEye extends ItemRelic implements ICoordBoundItem, IManaUs private static final String TAG_Z = "z"; private static final String TAG_DIMENSION = "dim"; + @Nonnull @Override public EnumActionResult onItemUse(ItemStack stack, EntityPlayer player, World world, BlockPos pos, EnumHand hand, EnumFacing side, float hitX, float hitY, float hitZ) { if(player.isSneaking()) { @@ -74,14 +77,15 @@ public class ItemFlugelEye extends ItemRelic implements ICoordBoundItem, IManaUs Botania.proxy.wispFX(living.worldObj, x, y, z, (float) Math.random(), (float) Math.random(), (float) Math.random(), (float) Math.random() * 0.7F, -0.05F - (float) Math.random() * 0.05F); } + @Nonnull @Override - public ActionResult onItemRightClick(ItemStack par1ItemStack, World par2World, EntityPlayer par3EntityPlayer, EnumHand hand) { + public ActionResult onItemRightClick(@Nonnull ItemStack par1ItemStack, World par2World, EntityPlayer par3EntityPlayer, EnumHand hand) { par3EntityPlayer.setActiveHand(hand); return ActionResult.newResult(EnumActionResult.SUCCESS, par1ItemStack); } @Override - public ItemStack onItemUseFinish(ItemStack stack, World world, EntityLivingBase living) { + public ItemStack onItemUseFinish(@Nonnull ItemStack stack, World world, EntityLivingBase living) { if(!(living instanceof EntityPlayer)) return stack; @@ -119,6 +123,7 @@ public class ItemFlugelEye extends ItemRelic implements ICoordBoundItem, IManaUs return 40; } + @Nonnull @Override public EnumAction getItemUseAction(ItemStack par1ItemStack) { return EnumAction.BLOCK; diff --git a/src/main/java/vazkii/botania/common/item/relic/ItemInfiniteFruit.java b/src/main/java/vazkii/botania/common/item/relic/ItemInfiniteFruit.java index d4042cd99..21c2c041b 100644 --- a/src/main/java/vazkii/botania/common/item/relic/ItemInfiniteFruit.java +++ b/src/main/java/vazkii/botania/common/item/relic/ItemInfiniteFruit.java @@ -24,6 +24,8 @@ import vazkii.botania.api.mana.ManaItemHandler; import vazkii.botania.common.lib.LibItemNames; import vazkii.botania.common.lib.LibObfuscation; +import javax.annotation.Nonnull; + public class ItemInfiniteFruit extends ItemRelic implements IManaUsingItem { public ItemInfiniteFruit() { @@ -35,13 +37,15 @@ public class ItemInfiniteFruit extends ItemRelic implements IManaUsingItem { return 32; } + @Nonnull @Override public EnumAction getItemUseAction(ItemStack p_77661_1_) { return isBoot(p_77661_1_) ? EnumAction.DRINK : EnumAction.EAT; } + @Nonnull @Override - public ActionResult onItemRightClick(ItemStack p_77659_1_, World p_77659_2_, EntityPlayer p_77659_3_, EnumHand hand) { + public ActionResult onItemRightClick(@Nonnull ItemStack p_77659_1_, World p_77659_2_, EntityPlayer p_77659_3_, EnumHand hand) { if(p_77659_3_.canEat(false) && isRightPlayer(p_77659_3_, p_77659_1_)) { p_77659_3_.setActiveHand(hand); return ActionResult.newResult(EnumActionResult.SUCCESS, p_77659_1_); diff --git a/src/main/java/vazkii/botania/common/item/relic/ItemKingKey.java b/src/main/java/vazkii/botania/common/item/relic/ItemKingKey.java index d807be644..055ed51b7 100644 --- a/src/main/java/vazkii/botania/common/item/relic/ItemKingKey.java +++ b/src/main/java/vazkii/botania/common/item/relic/ItemKingKey.java @@ -27,6 +27,7 @@ import vazkii.botania.common.core.helper.Vector3; import vazkii.botania.common.entity.EntityBabylonWeapon; import vazkii.botania.common.lib.LibItemNames; +import javax.annotation.Nonnull; import java.util.Random; public class ItemKingKey extends ItemRelic implements IManaUsingItem { @@ -40,8 +41,9 @@ public class ItemKingKey extends ItemRelic implements IManaUsingItem { super(LibItemNames.KING_KEY); } + @Nonnull @Override - public ActionResult onItemRightClick(ItemStack par1ItemStack, World par2World, EntityPlayer par3EntityPlayer, EnumHand hand) { + public ActionResult onItemRightClick(@Nonnull ItemStack par1ItemStack, World par2World, EntityPlayer par3EntityPlayer, EnumHand hand) { par3EntityPlayer.setActiveHand(hand); setCharging(par1ItemStack, true); return ActionResult.newResult(EnumActionResult.SUCCESS, par1ItemStack); @@ -96,6 +98,7 @@ public class ItemKingKey extends ItemRelic implements IManaUsingItem { } } + @Nonnull @Override public EnumAction getItemUseAction(ItemStack par1ItemStack) { return EnumAction.BOW; diff --git a/src/main/java/vazkii/botania/common/item/relic/ItemRelic.java b/src/main/java/vazkii/botania/common/item/relic/ItemRelic.java index 955783261..043f6d2ee 100644 --- a/src/main/java/vazkii/botania/common/item/relic/ItemRelic.java +++ b/src/main/java/vazkii/botania/common/item/relic/ItemRelic.java @@ -27,6 +27,7 @@ import vazkii.botania.common.core.helper.ItemNBTHelper; import vazkii.botania.common.item.ItemMod; import vazkii.botania.common.item.ModItems; +import javax.annotation.Nonnull; import java.util.List; import java.util.UUID; @@ -178,6 +179,7 @@ public class ItemRelic extends ItemMod implements IRelic { this.achievement = achievement; } + @Nonnull @Override public EnumRarity getRarity(ItemStack p_77613_1_) { return BotaniaAPI.rarityRelic; diff --git a/src/main/java/vazkii/botania/common/item/relic/ItemRelicBauble.java b/src/main/java/vazkii/botania/common/item/relic/ItemRelicBauble.java index 928bf0e10..5239f89a1 100644 --- a/src/main/java/vazkii/botania/common/item/relic/ItemRelicBauble.java +++ b/src/main/java/vazkii/botania/common/item/relic/ItemRelicBauble.java @@ -21,6 +21,7 @@ import vazkii.botania.api.BotaniaAPI; import vazkii.botania.api.item.IRelic; import vazkii.botania.common.item.equipment.bauble.ItemBauble; +import javax.annotation.Nonnull; import java.util.List; import java.util.UUID; @@ -105,6 +106,7 @@ public abstract class ItemRelicBauble extends ItemBauble implements IRelic { this.achievement = achievement; } + @Nonnull @Override public EnumRarity getRarity(ItemStack p_77613_1_) { return BotaniaAPI.rarityRelic; diff --git a/src/main/java/vazkii/botania/common/item/rod/ItemCobbleRod.java b/src/main/java/vazkii/botania/common/item/rod/ItemCobbleRod.java index 472f47149..2d9918262 100644 --- a/src/main/java/vazkii/botania/common/item/rod/ItemCobbleRod.java +++ b/src/main/java/vazkii/botania/common/item/rod/ItemCobbleRod.java @@ -25,6 +25,8 @@ import vazkii.botania.api.mana.ManaItemHandler; import vazkii.botania.common.item.ItemMod; import vazkii.botania.common.lib.LibItemNames; +import javax.annotation.Nonnull; + public class ItemCobbleRod extends ItemMod implements IManaUsingItem, IBlockProvider { static final int COST = 150; @@ -34,6 +36,7 @@ public class ItemCobbleRod extends ItemMod implements IManaUsingItem, IBlockProv setMaxStackSize(1); } + @Nonnull @Override public EnumActionResult onItemUse(ItemStack par1ItemStack, EntityPlayer par2EntityPlayer, World par3World, BlockPos pos, EnumHand hand, EnumFacing side, float par8, float par9, float par10) { return ItemDirtRod.place(par1ItemStack, par2EntityPlayer, par3World, pos, hand, side, par8, par9, par10, Blocks.COBBLESTONE, COST, 0.3F, 0.3F, 0.3F); diff --git a/src/main/java/vazkii/botania/common/item/rod/ItemDirtRod.java b/src/main/java/vazkii/botania/common/item/rod/ItemDirtRod.java index 17e637dd8..329b8f766 100644 --- a/src/main/java/vazkii/botania/common/item/rod/ItemDirtRod.java +++ b/src/main/java/vazkii/botania/common/item/rod/ItemDirtRod.java @@ -32,6 +32,8 @@ import vazkii.botania.common.achievement.ModAchievements; import vazkii.botania.common.item.ItemMod; import vazkii.botania.common.lib.LibItemNames; +import javax.annotation.Nonnull; + public class ItemDirtRod extends ItemMod implements IManaUsingItem, ICraftAchievement, IBlockProvider { static final int COST = 75; @@ -45,6 +47,7 @@ public class ItemDirtRod extends ItemMod implements IManaUsingItem, ICraftAchiev setMaxStackSize(1); } + @Nonnull @Override public EnumActionResult onItemUse(ItemStack par1ItemStack, EntityPlayer par2EntityPlayer, World par3World, BlockPos pos, EnumHand hand, EnumFacing side, float par8, float par9, float par10) { return place(par1ItemStack, par2EntityPlayer, par3World, pos, hand, side, par8, par9, par10, Blocks.DIRT, COST, 0.35F, 0.2F, 0.05F); diff --git a/src/main/java/vazkii/botania/common/item/rod/ItemDiviningRod.java b/src/main/java/vazkii/botania/common/item/rod/ItemDiviningRod.java index 37d50435e..7bb64d6e6 100644 --- a/src/main/java/vazkii/botania/common/item/rod/ItemDiviningRod.java +++ b/src/main/java/vazkii/botania/common/item/rod/ItemDiviningRod.java @@ -34,6 +34,7 @@ import vazkii.botania.common.Botania; import vazkii.botania.common.item.ItemMod; import vazkii.botania.common.lib.LibItemNames; +import javax.annotation.Nonnull; import java.util.Random; public class ItemDiviningRod extends ItemMod implements IManaUsingItem, IAvatarWieldable { @@ -47,8 +48,9 @@ public class ItemDiviningRod extends ItemMod implements IManaUsingItem, IAvatarW setMaxStackSize(1); } + @Nonnull @Override - public ActionResult onItemRightClick(ItemStack stack, World world, EntityPlayer p, EnumHand hand) { + public ActionResult onItemRightClick(@Nonnull ItemStack stack, World world, EntityPlayer p, EnumHand hand) { if(ManaItemHandler.requestManaExactForTool(stack, p, COST, true)) { if(world.isRemote) { int range = IManaProficiencyArmor.Helper.hasProficiency(p) ? 20 : 15; diff --git a/src/main/java/vazkii/botania/common/item/rod/ItemExchangeRod.java b/src/main/java/vazkii/botania/common/item/rod/ItemExchangeRod.java index 714ffe102..11401445f 100644 --- a/src/main/java/vazkii/botania/common/item/rod/ItemExchangeRod.java +++ b/src/main/java/vazkii/botania/common/item/rod/ItemExchangeRod.java @@ -47,6 +47,7 @@ import vazkii.botania.common.core.helper.ItemNBTHelper; import vazkii.botania.common.item.ItemMod; import vazkii.botania.common.lib.LibItemNames; +import javax.annotation.Nonnull; import java.util.ArrayList; import java.util.List; @@ -71,6 +72,7 @@ public class ItemExchangeRod extends ItemMod implements IManaUsingItem, IWirefra MinecraftForge.EVENT_BUS.register(this); } + @Nonnull @Override public EnumActionResult onItemUse(ItemStack par1ItemStack, EntityPlayer par2EntityPlayer, World par3World, BlockPos pos, EnumHand hand, EnumFacing side, float par8, float par9, float par10) { IBlockState wstate = par3World.getBlockState(pos); @@ -341,8 +343,9 @@ public class ItemExchangeRod extends ItemMod implements IManaUsingItem, IWirefra return true; } + @Nonnull @Override - public String getItemStackDisplayName(ItemStack par1ItemStack) { + public String getItemStackDisplayName(@Nonnull ItemStack par1ItemStack) { Block block = getBlock(par1ItemStack); int meta = getBlockMeta(par1ItemStack); return super.getItemStackDisplayName(par1ItemStack) + (block == null ? "" : " (" + TextFormatting.GREEN + new ItemStack(block, 1, meta).getDisplayName() + TextFormatting.RESET + ")"); diff --git a/src/main/java/vazkii/botania/common/item/rod/ItemFireRod.java b/src/main/java/vazkii/botania/common/item/rod/ItemFireRod.java index 22a6d859a..d094f1d25 100644 --- a/src/main/java/vazkii/botania/common/item/rod/ItemFireRod.java +++ b/src/main/java/vazkii/botania/common/item/rod/ItemFireRod.java @@ -32,6 +32,8 @@ import vazkii.botania.common.entity.EntityFlameRing; import vazkii.botania.common.item.ItemMod; import vazkii.botania.common.lib.LibItemNames; +import javax.annotation.Nonnull; + public class ItemFireRod extends ItemMod implements IManaUsingItem, IAvatarWieldable { private static final ResourceLocation avatarOverlay = new ResourceLocation(LibResources.MODEL_AVATAR_FIRE); @@ -44,6 +46,7 @@ public class ItemFireRod extends ItemMod implements IManaUsingItem, IAvatarWield setMaxStackSize(1); } + @Nonnull @Override public EnumActionResult onItemUse(ItemStack par1ItemStack, EntityPlayer player, World par3World, BlockPos pos, EnumHand hand, EnumFacing side, float par8, float par9, float par10) { if(!par3World.isRemote && ManaItemHandler.requestManaExactForTool(par1ItemStack, player, COST, false)) { diff --git a/src/main/java/vazkii/botania/common/item/rod/ItemGravityRod.java b/src/main/java/vazkii/botania/common/item/rod/ItemGravityRod.java index 5dcfc0b6b..d03caedeb 100644 --- a/src/main/java/vazkii/botania/common/item/rod/ItemGravityRod.java +++ b/src/main/java/vazkii/botania/common/item/rod/ItemGravityRod.java @@ -35,6 +35,7 @@ import vazkii.botania.common.item.ItemMod; import vazkii.botania.common.item.ModItems; import vazkii.botania.common.lib.LibItemNames; +import javax.annotation.Nonnull; import java.util.ArrayList; import java.util.List; @@ -54,7 +55,7 @@ public class ItemGravityRod extends ItemMod implements IManaUsingItem { } @Override - public boolean shouldCauseReequipAnimation(ItemStack oldStack, ItemStack newStack, boolean slotChanged) { + public boolean shouldCauseReequipAnimation(ItemStack oldStack, @Nonnull ItemStack newStack, boolean slotChanged) { return newStack.getItem() != this; } @@ -85,8 +86,9 @@ public class ItemGravityRod extends ItemMod implements IManaUsingItem { leftClick(player); } + @Nonnull @Override - public ActionResult onItemRightClick(ItemStack stack, World world, EntityPlayer player, EnumHand hand) { + public ActionResult onItemRightClick(@Nonnull ItemStack stack, World world, EntityPlayer player, EnumHand hand) { int targetID = ItemNBTHelper.getInt(stack, TAG_TARGET, -1); int ticksCooldown = ItemNBTHelper.getInt(stack, TAG_TICKS_COOLDOWN, 0); double length = ItemNBTHelper.getDouble(stack, TAG_DIST, -1); diff --git a/src/main/java/vazkii/botania/common/item/rod/ItemMissileRod.java b/src/main/java/vazkii/botania/common/item/rod/ItemMissileRod.java index b814af160..54b183de7 100644 --- a/src/main/java/vazkii/botania/common/item/rod/ItemMissileRod.java +++ b/src/main/java/vazkii/botania/common/item/rod/ItemMissileRod.java @@ -32,6 +32,8 @@ import vazkii.botania.common.entity.EntityMagicMissile; import vazkii.botania.common.item.ItemMod; import vazkii.botania.common.lib.LibItemNames; +import javax.annotation.Nonnull; + public class ItemMissileRod extends ItemMod implements IManaUsingItem, IAvatarWieldable { private static final ResourceLocation avatarOverlay = new ResourceLocation(LibResources.MODEL_AVATAR_MISSILE); @@ -44,6 +46,7 @@ public class ItemMissileRod extends ItemMod implements IManaUsingItem, IAvatarWi setMaxStackSize(1); } + @Nonnull @Override public EnumAction getItemUseAction(ItemStack par1ItemStack) { return EnumAction.BOW; @@ -85,8 +88,9 @@ public class ItemMissileRod extends ItemMod implements IManaUsingItem, IAvatarWi return false; } + @Nonnull @Override - public ActionResult onItemRightClick(ItemStack par1ItemStack, World par2World, EntityPlayer par3EntityPlayer, EnumHand hand) { + public ActionResult onItemRightClick(@Nonnull ItemStack par1ItemStack, World par2World, EntityPlayer par3EntityPlayer, EnumHand hand) { par3EntityPlayer.setActiveHand(hand); return ActionResult.newResult(EnumActionResult.SUCCESS, par1ItemStack); } diff --git a/src/main/java/vazkii/botania/common/item/rod/ItemRainbowRod.java b/src/main/java/vazkii/botania/common/item/rod/ItemRainbowRod.java index 3d3696ff4..7260b2157 100644 --- a/src/main/java/vazkii/botania/common/item/rod/ItemRainbowRod.java +++ b/src/main/java/vazkii/botania/common/item/rod/ItemRainbowRod.java @@ -40,6 +40,7 @@ import vazkii.botania.common.core.helper.Vector3; import vazkii.botania.common.item.ItemMod; import vazkii.botania.common.lib.LibItemNames; +import javax.annotation.Nonnull; import java.util.List; public class ItemRainbowRod extends ItemMod implements IManaUsingItem, IAvatarWieldable { @@ -55,8 +56,9 @@ public class ItemRainbowRod extends ItemMod implements IManaUsingItem, IAvatarWi setMaxStackSize(1); } + @Nonnull @Override - public ActionResult onItemRightClick(ItemStack par1ItemStack, World par2World, EntityPlayer par3EntityPlayer, EnumHand hand) { + public ActionResult onItemRightClick(@Nonnull ItemStack par1ItemStack, World par2World, EntityPlayer par3EntityPlayer, EnumHand hand) { if(!par2World.isRemote && ManaItemHandler.requestManaExactForTool(par1ItemStack, par3EntityPlayer, MANA_COST, false)) { Block place = ModBlocks.bifrost; Vector3 vector = new Vector3(par3EntityPlayer.getLookVec()).normalize(); @@ -114,8 +116,9 @@ public class ItemRainbowRod extends ItemMod implements IManaUsingItem, IAvatarWi return ActionResult.newResult(EnumActionResult.SUCCESS, par1ItemStack); } + @Nonnull @Override - public ItemStack getContainerItem(ItemStack itemStack) { + public ItemStack getContainerItem(@Nonnull ItemStack itemStack) { return itemStack.copy(); } diff --git a/src/main/java/vazkii/botania/common/item/rod/ItemSkyDirtRod.java b/src/main/java/vazkii/botania/common/item/rod/ItemSkyDirtRod.java index 6b2cf168a..b40c62d2d 100644 --- a/src/main/java/vazkii/botania/common/item/rod/ItemSkyDirtRod.java +++ b/src/main/java/vazkii/botania/common/item/rod/ItemSkyDirtRod.java @@ -27,14 +27,17 @@ import vazkii.botania.common.Botania; import vazkii.botania.common.core.helper.Vector3; import vazkii.botania.common.lib.LibItemNames; +import javax.annotation.Nonnull; + public class ItemSkyDirtRod extends ItemDirtRod { public ItemSkyDirtRod() { super(LibItemNames.SKY_DIRT_ROD); } + @Nonnull @Override - public ActionResult onItemRightClick(ItemStack stack, World world, EntityPlayer player, EnumHand hand) { + public ActionResult onItemRightClick(@Nonnull ItemStack stack, World world, EntityPlayer player, EnumHand hand) { if(!world.isRemote && ManaItemHandler.requestManaExactForTool(stack, player, COST * 2, false)) { Vector3 playerVec = Vector3.fromEntityCenter(player); Vector3 lookVec = new Vector3(player.getLookVec()).multiply(3); diff --git a/src/main/java/vazkii/botania/common/item/rod/ItemSmeltRod.java b/src/main/java/vazkii/botania/common/item/rod/ItemSmeltRod.java index a7dc692a1..b0fdb825c 100644 --- a/src/main/java/vazkii/botania/common/item/rod/ItemSmeltRod.java +++ b/src/main/java/vazkii/botania/common/item/rod/ItemSmeltRod.java @@ -33,6 +33,7 @@ import vazkii.botania.common.item.ItemMod; import vazkii.botania.common.item.equipment.tool.ToolCommons; import vazkii.botania.common.lib.LibItemNames; +import javax.annotation.Nonnull; import java.util.Map; import java.util.WeakHashMap; @@ -49,6 +50,7 @@ public class ItemSmeltRod extends ItemMod implements IManaUsingItem { setMaxStackSize(1); } + @Nonnull @Override public EnumAction getItemUseAction(ItemStack par1ItemStack) { return EnumAction.BOW; @@ -59,8 +61,9 @@ public class ItemSmeltRod extends ItemMod implements IManaUsingItem { return 72000; } + @Nonnull @Override - public ActionResult onItemRightClick(ItemStack par1ItemStack, World par2World, EntityPlayer par3EntityPlayer, EnumHand hand) { + public ActionResult onItemRightClick(@Nonnull ItemStack par1ItemStack, World par2World, EntityPlayer par3EntityPlayer, EnumHand hand) { par3EntityPlayer.setActiveHand(hand); return ActionResult.newResult(EnumActionResult.SUCCESS, par1ItemStack); } diff --git a/src/main/java/vazkii/botania/common/item/rod/ItemTerraformRod.java b/src/main/java/vazkii/botania/common/item/rod/ItemTerraformRod.java index c4c2ddb18..81f689ffb 100644 --- a/src/main/java/vazkii/botania/common/item/rod/ItemTerraformRod.java +++ b/src/main/java/vazkii/botania/common/item/rod/ItemTerraformRod.java @@ -42,6 +42,7 @@ import vazkii.botania.common.achievement.ModAchievements; import vazkii.botania.common.item.ItemMod; import vazkii.botania.common.lib.LibItemNames; +import javax.annotation.Nonnull; import java.util.ArrayList; import java.util.List; @@ -79,6 +80,7 @@ public class ItemTerraformRod extends ItemMod implements IManaUsingItem, IBlockP setMaxStackSize(1); } + @Nonnull @Override public EnumAction getItemUseAction(ItemStack par1ItemStack) { return EnumAction.BOW; @@ -95,8 +97,9 @@ public class ItemTerraformRod extends ItemMod implements IManaUsingItem, IBlockP terraform(stack, living.worldObj, ((EntityPlayer) living)); } + @Nonnull @Override - public ActionResult onItemRightClick(ItemStack par1ItemStack, World par2World, EntityPlayer par3EntityPlayer, EnumHand hand) { + public ActionResult onItemRightClick(@Nonnull ItemStack par1ItemStack, World par2World, EntityPlayer par3EntityPlayer, EnumHand hand) { par3EntityPlayer.setActiveHand(hand); return ActionResult.newResult(EnumActionResult.SUCCESS, par1ItemStack); } diff --git a/src/main/java/vazkii/botania/common/item/rod/ItemTornadoRod.java b/src/main/java/vazkii/botania/common/item/rod/ItemTornadoRod.java index b93c66833..233f429f3 100644 --- a/src/main/java/vazkii/botania/common/item/rod/ItemTornadoRod.java +++ b/src/main/java/vazkii/botania/common/item/rod/ItemTornadoRod.java @@ -38,6 +38,7 @@ import vazkii.botania.common.core.helper.ItemNBTHelper; import vazkii.botania.common.item.ItemMod; import vazkii.botania.common.lib.LibItemNames; +import javax.annotation.Nonnull; import java.util.List; public class ItemTornadoRod extends ItemMod implements IManaUsingItem, IAvatarWieldable { @@ -57,7 +58,7 @@ public class ItemTornadoRod extends ItemMod implements IManaUsingItem, IAvatarWi setMaxStackSize(1); addPropertyOverride(new ResourceLocation("botania", "flying"), new IItemPropertyGetter() { @Override - public float apply(ItemStack itemStack, World world, EntityLivingBase entityLivingBase) { + public float apply(@Nonnull ItemStack itemStack, World world, EntityLivingBase entityLivingBase) { return isFlying(itemStack) ? 1 : 0; } }); @@ -96,8 +97,9 @@ public class ItemTornadoRod extends ItemMod implements IManaUsingItem, IAvatarWi } } + @Nonnull @Override - public ActionResult onItemRightClick(ItemStack par1ItemStack, World par2World, EntityPlayer par3EntityPlayer, EnumHand hand) { + public ActionResult onItemRightClick(@Nonnull ItemStack par1ItemStack, World par2World, EntityPlayer par3EntityPlayer, EnumHand hand) { int meta = par1ItemStack.getItemDamage(); if(meta != 0 || ManaItemHandler.requestManaExactForTool(par1ItemStack, par3EntityPlayer, COST, false)) { par3EntityPlayer.setActiveHand(hand); @@ -111,6 +113,7 @@ public class ItemTornadoRod extends ItemMod implements IManaUsingItem, IAvatarWi return ActionResult.newResult(EnumActionResult.PASS, par1ItemStack); } + @Nonnull @Override public EnumAction getItemUseAction(ItemStack par1ItemStack) { return EnumAction.BOW; @@ -161,7 +164,7 @@ public class ItemTornadoRod extends ItemMod implements IManaUsingItem, IAvatarWi } @Override - public boolean shouldCauseReequipAnimation(ItemStack oldStack, ItemStack newStack, boolean slotChanged) { + public boolean shouldCauseReequipAnimation(ItemStack oldStack, @Nonnull ItemStack newStack, boolean slotChanged) { return newStack.getItem() != this || isFlying(oldStack) != isFlying(newStack); } diff --git a/src/main/java/vazkii/botania/common/item/rod/ItemWaterRod.java b/src/main/java/vazkii/botania/common/item/rod/ItemWaterRod.java index b999b8ee9..97273077a 100644 --- a/src/main/java/vazkii/botania/common/item/rod/ItemWaterRod.java +++ b/src/main/java/vazkii/botania/common/item/rod/ItemWaterRod.java @@ -16,6 +16,8 @@ import vazkii.botania.common.Botania; import vazkii.botania.common.item.ItemMod; import vazkii.botania.common.lib.LibItemNames; +import javax.annotation.Nonnull; + public class ItemWaterRod extends ItemMod implements IManaUsingItem { public static final int COST = 75; @@ -25,6 +27,7 @@ public class ItemWaterRod extends ItemMod implements IManaUsingItem { setMaxStackSize(1); } + @Nonnull @Override public EnumActionResult onItemUse(ItemStack par1ItemStack, EntityPlayer par2EntityPlayer, World par3World, BlockPos pos, EnumHand hand, EnumFacing side, float par8, float par9, float par10) { if(ManaItemHandler.requestManaExactForTool(par1ItemStack, par2EntityPlayer, COST, false) && !par3World.provider.doesWaterVaporize()) { diff --git a/src/main/java/vazkii/botania/common/lexicon/BLexiconEntry.java b/src/main/java/vazkii/botania/common/lexicon/BLexiconEntry.java index ed320fb3b..0cf89b188 100644 --- a/src/main/java/vazkii/botania/common/lexicon/BLexiconEntry.java +++ b/src/main/java/vazkii/botania/common/lexicon/BLexiconEntry.java @@ -16,6 +16,8 @@ import vazkii.botania.api.lexicon.LexiconCategory; import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.api.lexicon.LexiconPage; +import javax.annotation.Nonnull; + public class BLexiconEntry extends LexiconEntry { public BLexiconEntry(String unlocalizedName, LexiconCategory category) { @@ -56,7 +58,7 @@ public class BLexiconEntry extends LexiconEntry { } @Override - public int compareTo(LexiconEntry o) { + public int compareTo(@Nonnull LexiconEntry o) { return o instanceof WLexiconEntry ? 1 : super.compareTo(o); } diff --git a/src/main/java/vazkii/botania/common/lexicon/WLexiconEntry.java b/src/main/java/vazkii/botania/common/lexicon/WLexiconEntry.java index 26d745ec6..07964153a 100644 --- a/src/main/java/vazkii/botania/common/lexicon/WLexiconEntry.java +++ b/src/main/java/vazkii/botania/common/lexicon/WLexiconEntry.java @@ -18,6 +18,8 @@ import vazkii.botania.common.item.ModItems; import vazkii.botania.common.lexicon.page.PageText; import vazkii.botania.common.lib.LibLexicon; +import javax.annotation.Nonnull; + public class WLexiconEntry extends BLexiconEntry { private static final int PAGES = 7; @@ -34,7 +36,7 @@ public class WLexiconEntry extends BLexiconEntry { } @Override - public int compareTo(LexiconEntry o) { + public int compareTo(@Nonnull LexiconEntry o) { return -1; } diff --git a/src/main/java/vazkii/botania/common/world/WorldTypeSkyblock.java b/src/main/java/vazkii/botania/common/world/WorldTypeSkyblock.java index 7634db73e..06968d5df 100644 --- a/src/main/java/vazkii/botania/common/world/WorldTypeSkyblock.java +++ b/src/main/java/vazkii/botania/common/world/WorldTypeSkyblock.java @@ -17,6 +17,8 @@ import net.minecraft.world.WorldType; import net.minecraft.world.chunk.IChunkGenerator; import net.minecraft.world.gen.ChunkProviderFlat; +import javax.annotation.Nonnull; + public class WorldTypeSkyblock extends WorldType { public WorldTypeSkyblock() { @@ -38,7 +40,7 @@ public class WorldTypeSkyblock extends WorldType { } @Override - public int getSpawnFuzz(WorldServer world, MinecraftServer server) { + public int getSpawnFuzz(@Nonnull WorldServer world, MinecraftServer server) { return 2; } @@ -47,8 +49,9 @@ public class WorldTypeSkyblock extends WorldType { return 260f; } + @Nonnull @Override - public IChunkGenerator getChunkGenerator(World world, String generatorOptions) { + public IChunkGenerator getChunkGenerator(@Nonnull World world, String generatorOptions) { return new ChunkProviderFlat(world, world.getSeed(), false, "3;minecraft:air;"); }