From 96fe27e834ca51a58533207feb8b9df768239c23 Mon Sep 17 00:00:00 2001 From: mezz Date: Thu, 13 Jul 2017 23:34:51 -0700 Subject: [PATCH] Cleanup --- src/main/java/binnie/botany/farm/FlowerCrop.java | 4 ++-- src/main/java/binnie/extrabees/alveary/package-info.java | 9 +++++++++ src/main/java/binnie/extrabees/blocks/package-info.java | 9 +++++++++ src/main/java/binnie/extrabees/circuit/package-info.java | 9 +++++++++ .../extrabees/client/gui/AbstractAlvearyContainer.java | 3 +-- .../java/binnie/extrabees/client/gui/package-info.java | 9 +++++++++ src/main/java/binnie/extrabees/client/package-info.java | 9 +++++++++ src/main/java/binnie/extrabees/init/package-info.java | 9 +++++++++ src/main/java/binnie/extrabees/items/package-info.java | 9 +++++++++ .../java/binnie/extrabees/items/types/package-info.java | 9 +++++++++ .../java/binnie/extrabees/utils/config/package-info.java | 9 +++++++++ src/main/java/binnie/extrabees/utils/package-info.java | 8 ++++++++ .../binnie/extratrees/genetics/ETTreeDefinition.java | 4 +++- .../binnie/genetics/machine/indexer/package-info.java | 9 +++++++++ 14 files changed, 104 insertions(+), 5 deletions(-) create mode 100644 src/main/java/binnie/extrabees/alveary/package-info.java create mode 100644 src/main/java/binnie/extrabees/blocks/package-info.java create mode 100644 src/main/java/binnie/extrabees/circuit/package-info.java create mode 100644 src/main/java/binnie/extrabees/client/gui/package-info.java create mode 100644 src/main/java/binnie/extrabees/client/package-info.java create mode 100644 src/main/java/binnie/extrabees/init/package-info.java create mode 100644 src/main/java/binnie/extrabees/items/package-info.java create mode 100644 src/main/java/binnie/extrabees/items/types/package-info.java create mode 100644 src/main/java/binnie/extrabees/utils/config/package-info.java create mode 100644 src/main/java/binnie/extrabees/utils/package-info.java create mode 100644 src/main/java/binnie/genetics/machine/indexer/package-info.java diff --git a/src/main/java/binnie/botany/farm/FlowerCrop.java b/src/main/java/binnie/botany/farm/FlowerCrop.java index 8a046551..7a87b50f 100644 --- a/src/main/java/binnie/botany/farm/FlowerCrop.java +++ b/src/main/java/binnie/botany/farm/FlowerCrop.java @@ -1,7 +1,7 @@ package binnie.botany.farm; import javax.annotation.Nullable; -import java.util.Arrays; +import java.util.Collections; import net.minecraft.item.ItemStack; import net.minecraft.util.NonNullList; @@ -14,7 +14,7 @@ public class FlowerCrop implements ICrop { BlockPos position; public FlowerCrop(BlockPos pos, ItemStack... drops) { - Arrays.stream(drops).forEach(drop -> this.drops.add(drop)); + Collections.addAll(this.drops, drops); position = pos; } diff --git a/src/main/java/binnie/extrabees/alveary/package-info.java b/src/main/java/binnie/extrabees/alveary/package-info.java new file mode 100644 index 00000000..b1d72b98 --- /dev/null +++ b/src/main/java/binnie/extrabees/alveary/package-info.java @@ -0,0 +1,9 @@ +@ParametersAreNonnullByDefault +@MethodsReturnNonnullByDefault +@FieldsAreNonnullByDefault +package binnie.extrabees.alveary; + +import binnie.extrabees.utils.FieldsAreNonnullByDefault; +import mcp.MethodsReturnNonnullByDefault; + +import javax.annotation.ParametersAreNonnullByDefault; \ No newline at end of file diff --git a/src/main/java/binnie/extrabees/blocks/package-info.java b/src/main/java/binnie/extrabees/blocks/package-info.java new file mode 100644 index 00000000..15945370 --- /dev/null +++ b/src/main/java/binnie/extrabees/blocks/package-info.java @@ -0,0 +1,9 @@ +@ParametersAreNonnullByDefault +@MethodsReturnNonnullByDefault +@FieldsAreNonnullByDefault +package binnie.extrabees.blocks; + +import binnie.extrabees.utils.FieldsAreNonnullByDefault; +import mcp.MethodsReturnNonnullByDefault; + +import javax.annotation.ParametersAreNonnullByDefault; \ No newline at end of file diff --git a/src/main/java/binnie/extrabees/circuit/package-info.java b/src/main/java/binnie/extrabees/circuit/package-info.java new file mode 100644 index 00000000..c9a3e8f3 --- /dev/null +++ b/src/main/java/binnie/extrabees/circuit/package-info.java @@ -0,0 +1,9 @@ +@ParametersAreNonnullByDefault +@MethodsReturnNonnullByDefault +@FieldsAreNonnullByDefault +package binnie.extrabees.circuit; + +import binnie.extrabees.utils.FieldsAreNonnullByDefault; +import mcp.MethodsReturnNonnullByDefault; + +import javax.annotation.ParametersAreNonnullByDefault; \ No newline at end of file diff --git a/src/main/java/binnie/extrabees/client/gui/AbstractAlvearyContainer.java b/src/main/java/binnie/extrabees/client/gui/AbstractAlvearyContainer.java index 288fe24d..246f73b3 100644 --- a/src/main/java/binnie/extrabees/client/gui/AbstractAlvearyContainer.java +++ b/src/main/java/binnie/extrabees/client/gui/AbstractAlvearyContainer.java @@ -1,6 +1,5 @@ package binnie.extrabees.client.gui; -import javax.annotation.Nonnull; import java.awt.Dimension; import forestry.core.utils.SlotUtil; @@ -52,7 +51,7 @@ public abstract class AbstractAlvearyContainer extends Container { } @Override - public boolean canInteractWith(@Nonnull EntityPlayer playerIn) { + public boolean canInteractWith(EntityPlayer playerIn) { return true; } diff --git a/src/main/java/binnie/extrabees/client/gui/package-info.java b/src/main/java/binnie/extrabees/client/gui/package-info.java new file mode 100644 index 00000000..a6a93966 --- /dev/null +++ b/src/main/java/binnie/extrabees/client/gui/package-info.java @@ -0,0 +1,9 @@ +@ParametersAreNonnullByDefault +@MethodsReturnNonnullByDefault +@FieldsAreNonnullByDefault +package binnie.extrabees.client.gui; + +import binnie.extrabees.utils.FieldsAreNonnullByDefault; +import mcp.MethodsReturnNonnullByDefault; + +import javax.annotation.ParametersAreNonnullByDefault; \ No newline at end of file diff --git a/src/main/java/binnie/extrabees/client/package-info.java b/src/main/java/binnie/extrabees/client/package-info.java new file mode 100644 index 00000000..fab2a52d --- /dev/null +++ b/src/main/java/binnie/extrabees/client/package-info.java @@ -0,0 +1,9 @@ +@ParametersAreNonnullByDefault +@MethodsReturnNonnullByDefault +@FieldsAreNonnullByDefault +package binnie.extrabees.client; + +import binnie.extrabees.utils.FieldsAreNonnullByDefault; +import mcp.MethodsReturnNonnullByDefault; + +import javax.annotation.ParametersAreNonnullByDefault; \ No newline at end of file diff --git a/src/main/java/binnie/extrabees/init/package-info.java b/src/main/java/binnie/extrabees/init/package-info.java new file mode 100644 index 00000000..13866df6 --- /dev/null +++ b/src/main/java/binnie/extrabees/init/package-info.java @@ -0,0 +1,9 @@ +@ParametersAreNonnullByDefault +@MethodsReturnNonnullByDefault +@FieldsAreNonnullByDefault +package binnie.extrabees.init; + +import binnie.extrabees.utils.FieldsAreNonnullByDefault; +import mcp.MethodsReturnNonnullByDefault; + +import javax.annotation.ParametersAreNonnullByDefault; \ No newline at end of file diff --git a/src/main/java/binnie/extrabees/items/package-info.java b/src/main/java/binnie/extrabees/items/package-info.java new file mode 100644 index 00000000..ab0678ac --- /dev/null +++ b/src/main/java/binnie/extrabees/items/package-info.java @@ -0,0 +1,9 @@ +@ParametersAreNonnullByDefault +@MethodsReturnNonnullByDefault +@FieldsAreNonnullByDefault +package binnie.extrabees.items; + +import binnie.extrabees.utils.FieldsAreNonnullByDefault; +import mcp.MethodsReturnNonnullByDefault; + +import javax.annotation.ParametersAreNonnullByDefault; \ No newline at end of file diff --git a/src/main/java/binnie/extrabees/items/types/package-info.java b/src/main/java/binnie/extrabees/items/types/package-info.java new file mode 100644 index 00000000..d60893ef --- /dev/null +++ b/src/main/java/binnie/extrabees/items/types/package-info.java @@ -0,0 +1,9 @@ +@ParametersAreNonnullByDefault +@MethodsReturnNonnullByDefault +@FieldsAreNonnullByDefault +package binnie.extrabees.items.types; + +import binnie.extrabees.utils.FieldsAreNonnullByDefault; +import mcp.MethodsReturnNonnullByDefault; + +import javax.annotation.ParametersAreNonnullByDefault; \ No newline at end of file diff --git a/src/main/java/binnie/extrabees/utils/config/package-info.java b/src/main/java/binnie/extrabees/utils/config/package-info.java new file mode 100644 index 00000000..47a44906 --- /dev/null +++ b/src/main/java/binnie/extrabees/utils/config/package-info.java @@ -0,0 +1,9 @@ +@ParametersAreNonnullByDefault +@MethodsReturnNonnullByDefault +@FieldsAreNonnullByDefault +package binnie.extrabees.utils.config; + +import binnie.extrabees.utils.FieldsAreNonnullByDefault; +import mcp.MethodsReturnNonnullByDefault; + +import javax.annotation.ParametersAreNonnullByDefault; \ No newline at end of file diff --git a/src/main/java/binnie/extrabees/utils/package-info.java b/src/main/java/binnie/extrabees/utils/package-info.java new file mode 100644 index 00000000..f1f2814d --- /dev/null +++ b/src/main/java/binnie/extrabees/utils/package-info.java @@ -0,0 +1,8 @@ +@ParametersAreNonnullByDefault +@MethodsReturnNonnullByDefault +@FieldsAreNonnullByDefault +package binnie.extrabees.utils; + +import mcp.MethodsReturnNonnullByDefault; + +import javax.annotation.ParametersAreNonnullByDefault; \ No newline at end of file diff --git a/src/main/java/binnie/extratrees/genetics/ETTreeDefinition.java b/src/main/java/binnie/extratrees/genetics/ETTreeDefinition.java index a45eeb22..5acac37f 100644 --- a/src/main/java/binnie/extratrees/genetics/ETTreeDefinition.java +++ b/src/main/java/binnie/extratrees/genetics/ETTreeDefinition.java @@ -79,6 +79,8 @@ import binnie.extratrees.gen.WorldGenTree3; import binnie.extratrees.gen.WorldGenTropical; import binnie.extratrees.gen.WorldGenWalnut; +import javax.annotation.Nullable; + public enum ETTreeDefinition implements IStringSerializable, ITreeDefinition, ITreeGenerator { OrchardApple("malus", "domestica", EnumLeafType.DECIDUOUS, new Color(0x09E67E), new Color(0xFF9CF3), EnumSaplingType.Default, EnumETLog.Apple, new Color(0x7B7A7B)) { @Override @@ -2187,7 +2189,7 @@ public enum ETTreeDefinition implements IStringSerializable, ITreeDefinition, IT } @Override - public boolean setLeaves(ITreeGenome genome, World world, GameProfile owner, BlockPos pos) { + public boolean setLeaves(ITreeGenome genome, World world, @Nullable GameProfile owner, BlockPos pos) { boolean placed = world.setBlockState(pos, PluginArboriculture.getBlocks().leaves.getDefaultState()); if (!placed) { return false; diff --git a/src/main/java/binnie/genetics/machine/indexer/package-info.java b/src/main/java/binnie/genetics/machine/indexer/package-info.java new file mode 100644 index 00000000..c89292af --- /dev/null +++ b/src/main/java/binnie/genetics/machine/indexer/package-info.java @@ -0,0 +1,9 @@ +@ParametersAreNonnullByDefault +@MethodsReturnNonnullByDefault +@FieldsAreNonnullByDefault +package binnie.genetics.machine.indexer; + +import binnie.extrabees.utils.FieldsAreNonnullByDefault; +import mcp.MethodsReturnNonnullByDefault; + +import javax.annotation.ParametersAreNonnullByDefault; \ No newline at end of file