diff --git a/src/main/java/binnie/extrabees/genetics/effect/package-info.java b/src/main/java/binnie/extrabees/genetics/effect/package-info.java index 9d4d6cb2..668ec733 100644 --- a/src/main/java/binnie/extrabees/genetics/effect/package-info.java +++ b/src/main/java/binnie/extrabees/genetics/effect/package-info.java @@ -3,7 +3,7 @@ @FieldsAreNonnullByDefault package binnie.extrabees.genetics.effect; -import binnie.core.util.FieldsAreNonnullByDefault; +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/genetics/package-info.java b/src/main/java/binnie/extrabees/genetics/package-info.java index 51cfaa7d..41c34367 100644 --- a/src/main/java/binnie/extrabees/genetics/package-info.java +++ b/src/main/java/binnie/extrabees/genetics/package-info.java @@ -3,7 +3,7 @@ @FieldsAreNonnullByDefault package binnie.extrabees.genetics; -import binnie.core.util.FieldsAreNonnullByDefault; +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/proxy/package-info.java b/src/main/java/binnie/extrabees/proxy/package-info.java index 2a953df3..e74acdc9 100644 --- a/src/main/java/binnie/extrabees/proxy/package-info.java +++ b/src/main/java/binnie/extrabees/proxy/package-info.java @@ -3,7 +3,7 @@ @FieldsAreNonnullByDefault package binnie.extrabees.proxy; -import binnie.core.util.FieldsAreNonnullByDefault; +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/FieldsAreNonnullByDefault.java b/src/main/java/binnie/extrabees/utils/FieldsAreNonnullByDefault.java new file mode 100644 index 00000000..28d23b54 --- /dev/null +++ b/src/main/java/binnie/extrabees/utils/FieldsAreNonnullByDefault.java @@ -0,0 +1,16 @@ +package binnie.extrabees.utils; + +import javax.annotation.Nonnull; +import javax.annotation.meta.TypeQualifierDefault; +import java.lang.annotation.ElementType; +import java.lang.annotation.Retention; +import java.lang.annotation.RetentionPolicy; + +/** + * Created by Elec332 on 14-5-2017. + */ +@Nonnull +@TypeQualifierDefault(ElementType.FIELD) +@Retention(RetentionPolicy.RUNTIME) +public @interface FieldsAreNonnullByDefault { +} diff --git a/src/main/java/binnie/extrabees/worldgen/package-info.java b/src/main/java/binnie/extrabees/worldgen/package-info.java index 0061c5bd..a8a3eca2 100644 --- a/src/main/java/binnie/extrabees/worldgen/package-info.java +++ b/src/main/java/binnie/extrabees/worldgen/package-info.java @@ -3,7 +3,7 @@ @FieldsAreNonnullByDefault package binnie.extrabees.worldgen; -import binnie.core.util.FieldsAreNonnullByDefault; +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/genetics/Genetics.java b/src/main/java/binnie/genetics/Genetics.java index 26e0d555..409872fd 100644 --- a/src/main/java/binnie/genetics/Genetics.java +++ b/src/main/java/binnie/genetics/Genetics.java @@ -1,5 +1,6 @@ package binnie.genetics; +import binnie.Binnie; import binnie.Constants; import binnie.core.AbstractMod; import binnie.core.BinnieCore; @@ -8,7 +9,6 @@ import binnie.core.network.BinniePacketHandler; import binnie.core.network.IPacketID; import binnie.core.proxy.IProxyCore; import binnie.genetics.item.ItemBeeDictionary; -import binnie.extrabees.utils.Utils; import binnie.genetics.core.GeneticsGUI; import binnie.genetics.core.GeneticsPacket; import binnie.genetics.item.ItemPunnettSquare; @@ -56,7 +56,7 @@ public class Genetics extends AbstractMod { @Mod.EventHandler public void init(final FMLInitializationEvent evt) { this.init(); - RecipeManagers.carpenterManager.addRecipe(100, Utils.getFluidFromName("water", 2000), ItemStack.EMPTY, new ItemStack(dictionaryBees), "X#X", "YEY", "RDR", '#', Blocks.GLASS_PANE, 'X', Items.GOLD_INGOT, 'Y', "ingotTin", 'R', Items.REDSTONE, 'D', Items.DIAMOND, 'E', Items.EMERALD); + RecipeManagers.carpenterManager.addRecipe(100, Binnie.LIQUID.getFluidStack("water", 2000), ItemStack.EMPTY, new ItemStack(dictionaryBees), "X#X", "YEY", "RDR", '#', Blocks.GLASS_PANE, 'X', Items.GOLD_INGOT, 'Y', "ingotTin", 'R', Items.REDSTONE, 'D', Items.DIAMOND, 'E', Items.EMERALD); } @Mod.EventHandler