Fix some nullable annotation errors

This commit is contained in:
mezz committed 2016-10-07 21:49:54 -07:00
1 parent 649a061b6e
commit a0d355d0aa
4 files changed
+18 -10

No files matched your search

@@ -35,7 +35,7 @@ public class CircuitBoard<T> implements ICircuitBoard {
@Nonnull
private final ICircuit[] circuits;
public CircuitBoard(@Nonnull EnumCircuitBoardType type, @Nonnull ICircuitLayout layout, @Nonnull ICircuit[] circuits) {
public CircuitBoard(@Nonnull EnumCircuitBoardType type, @Nullable ICircuitLayout layout, @Nonnull ICircuit[] circuits) {
this.type = type;
this.layout = layout;
this.circuits = circuits;
@@ -221,7 +221,7 @@ public enum Fluids {
}
@Nullable
public static Fluids getFluidDefinition(FluidStack fluidStack) {
public static Fluids getFluidDefinition(@Nullable FluidStack fluidStack) {
if (fluidStack != null) {
Fluid fluid = fluidStack.getFluid();
if (fluid != null) {
@@ -11,6 +11,7 @@
package forestry.core.render;
import javax.annotation.Nonnull;
import javax.annotation.Nullable;
import net.minecraftforge.fluids.FluidRegistry;
import net.minecraftforge.fluids.FluidStack;
@@ -19,7 +20,7 @@ import net.minecraftforge.fluids.IFluidTank;
public class TankRenderInfo {
public static final TankRenderInfo EMPTY = new TankRenderInfo(new FluidStack(FluidRegistry.WATER, 0), EnumTankLevel.EMPTY);
@Nonnull
@Nullable
private final FluidStack fluidStack;
@Nonnull
private final EnumTankLevel level;
@@ -28,12 +29,12 @@ public class TankRenderInfo {
this(fluidTank.getFluid(), EnumTankLevel.rateTankLevel(fluidTank));
}
public TankRenderInfo(@Nonnull FluidStack fluidStack, @Nonnull EnumTankLevel level) {
public TankRenderInfo(@Nullable FluidStack fluidStack, @Nonnull EnumTankLevel level) {
this.fluidStack = fluidStack;
this.level = level;
}
@Nonnull
@Nullable
public FluidStack getFluidStack() {
return fluidStack;
}
@@ -356,14 +356,21 @@ public class PluginFactory extends BlankForestryPlugin {
'Y', PluginCore.items.sturdyCasing);
// / CHIPSETS
ItemCircuitBoard circuitBoard = PluginCore.items.circuitboards;
RecipeManagers.carpenterManager.addRecipe(20, new FluidStack(FluidRegistry.WATER, 1000), null, ItemCircuitBoard.createCircuitboard(EnumCircuitBoardType.BASIC, null, new ICircuit[]{}),
ItemStack basicCircuitboard = ItemCircuitBoard.createCircuitboard(EnumCircuitBoardType.BASIC, null, new ICircuit[]{});
ItemStack enhancedCircuitboard = ItemCircuitBoard.createCircuitboard(EnumCircuitBoardType.ENHANCED, null, new ICircuit[]{});
ItemStack refinedCircuitboard = ItemCircuitBoard.createCircuitboard(EnumCircuitBoardType.REFINED, null, new ICircuit[]{});
ItemStack intricateCircuitboard = ItemCircuitBoard.createCircuitboard(EnumCircuitBoardType.INTRICATE, null, new ICircuit[]{});
RecipeManagers.carpenterManager.addRecipe(20, new FluidStack(FluidRegistry.WATER, 1000), null, basicCircuitboard,
"R R", "R#R", "R R", '#', "ingotTin", 'R', "dustRedstone");
RecipeManagers.carpenterManager.addRecipe(40, new FluidStack(FluidRegistry.WATER, 1000), null, ItemCircuitBoard.createCircuitboard(EnumCircuitBoardType.ENHANCED, null, new ICircuit[]{}),
RecipeManagers.carpenterManager.addRecipe(40, new FluidStack(FluidRegistry.WATER, 1000), null, enhancedCircuitboard,
"R#R", "R#R", "R#R", '#', "ingotBronze", 'R', "dustRedstone");
RecipeManagers.carpenterManager.addRecipe(80, new FluidStack(FluidRegistry.WATER, 1000), null, ItemCircuitBoard.createCircuitboard(EnumCircuitBoardType.REFINED, null, new ICircuit[]{}),
RecipeManagers.carpenterManager.addRecipe(80, new FluidStack(FluidRegistry.WATER, 1000), null, refinedCircuitboard,
"R#R", "R#R", "R#R", '#', "ingotIron", 'R', "dustRedstone");
RecipeManagers.carpenterManager.addRecipe(80, new FluidStack(FluidRegistry.WATER, 1000), null, ItemCircuitBoard.createCircuitboard(EnumCircuitBoardType.INTRICATE, null, new ICircuit[]{}),
RecipeManagers.carpenterManager.addRecipe(80, new FluidStack(FluidRegistry.WATER, 1000), null, intricateCircuitboard,
"R#R", "R#R", "R#R", '#', "ingotGold", 'R', "dustRedstone");
RecipeManagers.carpenterManager.addRecipe(40, new FluidStack(FluidRegistry.WATER, 1000), null, PluginCore.items.solderingIron.getItemStack(),
" # ", "# #", " B", '#', "ingotIron", 'B', "ingotBronze");