From 3bb678258ff570f17ae5487c098f6d86cf80380b Mon Sep 17 00:00:00 2001 From: mezz Date: Wed, 19 Apr 2017 00:52:10 -0700 Subject: [PATCH] Clean up some null annotations --- .../java/binnie/botany/ceramic/BlockCeramic.java | 10 ++++++---- .../binnie/botany/ceramic/BlockStainedGlass.java | 2 +- .../botany/ceramic/brick/BlockCeramicBrick.java | 16 +++++++++------- .../java/binnie/botany/flower/BlockFlower.java | 4 ++-- .../binnie/botany/flower/TileEntityFlower.java | 4 +++- .../java/binnie/core/craftgui/geometry/Area.java | 6 +++--- .../craftgui/minecraft/ContainerCraftGUI.java | 1 - .../core/craftgui/minecraft/WindowInventory.java | 1 - .../core/craftgui/renderer/RenderUtil.java | 4 ++-- .../binnie/core/genetics/VirtualBeeHousing.java | 3 ++- .../binnie/core/genetics/VirtualMothHousing.java | 2 +- .../binnie/core/liquid/ItemFluidContainer.java | 2 +- src/main/java/binnie/core/machines/Machine.java | 1 + .../java/binnie/core/models/AABBModelBaker.java | 2 +- .../java/binnie/core/models/ModelManager.java | 4 +++- .../extrabees/apiary/ComponentBeeModifier.java | 4 +++- .../binnie/extrabees/apiary/IndustrialFrame.java | 4 +++- .../apiary/machine/AlvearyStimulator.java | 6 +++--- .../genetics/effect/BlockEctoplasm.java | 2 -- .../block/BlockETDecorativeLeaves.java | 3 ++- .../extratrees/block/decor/BlockHedge.java | 2 +- .../binnie/extratrees/carpentry/BlockDesign.java | 2 +- .../integration/jei/multifence/package-info.java | 9 +++++++++ .../extratrees/machines/TileEntityNursery.java | 2 +- .../binnie/genetics/gui/bee/package-info.java | 9 +++++++++ .../genetics/gui/butterfly/package-info.java | 9 +++++++++ .../gui/flower/AnalystPageAppearance.java | 3 +++ .../binnie/genetics/gui/flower/package-info.java | 9 +++++++++ .../binnie/genetics/gui/tree/package-info.java | 9 +++++++++ 29 files changed, 97 insertions(+), 38 deletions(-) create mode 100644 src/main/java/binnie/extratrees/integration/jei/multifence/package-info.java create mode 100644 src/main/java/binnie/genetics/gui/bee/package-info.java create mode 100644 src/main/java/binnie/genetics/gui/butterfly/package-info.java create mode 100644 src/main/java/binnie/genetics/gui/flower/package-info.java create mode 100644 src/main/java/binnie/genetics/gui/tree/package-info.java diff --git a/src/main/java/binnie/botany/ceramic/BlockCeramic.java b/src/main/java/binnie/botany/ceramic/BlockCeramic.java index 79df16a3..adeb1cfa 100644 --- a/src/main/java/binnie/botany/ceramic/BlockCeramic.java +++ b/src/main/java/binnie/botany/ceramic/BlockCeramic.java @@ -104,10 +104,12 @@ public class BlockCeramic extends Block implements IColoredBlock, IItemModelRegi @SideOnly(Side.CLIENT) @Override - public int colorMultiplier(IBlockState state, IBlockAccess world, BlockPos pos, int tintIndex) { - TileCeramic ceramic = TileUtil.getTile(world, pos, TileCeramic.class); - if (ceramic != null) { - return ceramic.getColor().getColor(false); + public int colorMultiplier(IBlockState state, @Nullable IBlockAccess world, @Nullable BlockPos pos, int tintIndex) { + if (world != null && pos != null) { + TileCeramic ceramic = TileUtil.getTile(world, pos, TileCeramic.class); + if (ceramic != null) { + return ceramic.getColor().getColor(false); + } } return EnumFlowerColor.get(0).getColor(false); } diff --git a/src/main/java/binnie/botany/ceramic/BlockStainedGlass.java b/src/main/java/binnie/botany/ceramic/BlockStainedGlass.java index 0796005b..537e00d7 100644 --- a/src/main/java/binnie/botany/ceramic/BlockStainedGlass.java +++ b/src/main/java/binnie/botany/ceramic/BlockStainedGlass.java @@ -176,7 +176,7 @@ public class BlockStainedGlass extends Block implements IBlockMetadata, IColored } @Override - public int colorMultiplier(IBlockState state, IBlockAccess worldIn, BlockPos pos, int tintIndex) { + public int colorMultiplier(IBlockState state, @Nullable IBlockAccess worldIn, @Nullable BlockPos pos, int tintIndex) { if (worldIn == null || pos == null) { return 0; } diff --git a/src/main/java/binnie/botany/ceramic/brick/BlockCeramicBrick.java b/src/main/java/binnie/botany/ceramic/brick/BlockCeramicBrick.java index 946bf4f9..e7d5a3c2 100644 --- a/src/main/java/binnie/botany/ceramic/brick/BlockCeramicBrick.java +++ b/src/main/java/binnie/botany/ceramic/brick/BlockCeramicBrick.java @@ -187,13 +187,15 @@ public class BlockCeramicBrick extends Block implements IMultipassBlock 1) ? 50 : 100; new ControlIconDisplay(this, (this.width() - width) / 2, y - ((sections == 1) ? 0 : 0)) { @Override + @SideOnly(Side.CLIENT) public void onRenderForeground(int guiWidth, int guiHeight) { GlStateManager.pushMatrix(); final float scale = width / 16.0f; diff --git a/src/main/java/binnie/genetics/gui/flower/package-info.java b/src/main/java/binnie/genetics/gui/flower/package-info.java new file mode 100644 index 00000000..f4b17aee --- /dev/null +++ b/src/main/java/binnie/genetics/gui/flower/package-info.java @@ -0,0 +1,9 @@ +@ParametersAreNonnullByDefault +@MethodsReturnNonnullByDefault +@FieldsAreNonnullByDefault +package binnie.genetics.gui.flower; + +import binnie.core.util.FieldsAreNonnullByDefault; +import mcp.MethodsReturnNonnullByDefault; + +import javax.annotation.ParametersAreNonnullByDefault; \ No newline at end of file diff --git a/src/main/java/binnie/genetics/gui/tree/package-info.java b/src/main/java/binnie/genetics/gui/tree/package-info.java new file mode 100644 index 00000000..aac2cfd2 --- /dev/null +++ b/src/main/java/binnie/genetics/gui/tree/package-info.java @@ -0,0 +1,9 @@ +@ParametersAreNonnullByDefault +@MethodsReturnNonnullByDefault +@FieldsAreNonnullByDefault +package binnie.genetics.gui.tree; + +import binnie.core.util.FieldsAreNonnullByDefault; +import mcp.MethodsReturnNonnullByDefault; + +import javax.annotation.ParametersAreNonnullByDefault; \ No newline at end of file