Fix #877 TileStairs NullPointerException

(cherry picked from commit 01245f32c5)

Conflicts:
	src/main/java/forestry/core/gadgets/TileAnalyzer.java

application.properties

@@ -2,4 +2,4 @@ mcversion=1.7.10
 forgeversion=10.13.3.1370-1.7.10
 version_major=3
 version_minor=6
-version_patch=8
+version_patch=11

src/main/java/forestry/arboriculture/gadgets/BlockArbStairs.java

@@ -122,7 +122,7 @@ public class BlockArbStairs extends BlockStairs {
 		TileStairs stairs = getStairTile(world, x, y, z);
 
 		NBTTagCompound nbttagcompound = new NBTTagCompound();
-		if (stairs == null || stairs.getWoodType() == null) {
+		if (stairs == null) {
 			return nbttagcompound;
 		}
 
@@ -141,7 +141,7 @@ public class BlockArbStairs extends BlockStairs {
 	@Override
 	public IIcon getIcon(IBlockAccess world, int x, int y, int z, int side) {
 		TileStairs stairs = getStairTile(world, x, y, z);
-		if (stairs != null && stairs.getWoodType() != null) {
+		if (stairs != null) {
 			return stairs.getWoodType().getPlankIcon();
 		} else {
 			return WoodType.LARCH.getPlankIcon();

src/main/java/forestry/arboriculture/gadgets/TileStairs.java

@@ -10,6 +10,7 @@
  ******************************************************************************/
 package forestry.arboriculture.gadgets;
 
+import javax.annotation.Nonnull;
 import java.io.IOException;
 
 import net.minecraft.nbt.NBTTagCompound;
@@ -25,13 +26,15 @@ import forestry.core.proxy.Proxies;
 
 public class TileStairs extends TileEntity implements IStreamable {
 
-	private WoodType woodType;
+	@Nonnull
+	private WoodType woodType = WoodType.LARCH;
 
+	@Nonnull
 	public WoodType getWoodType() {
 		return this.woodType;
 	}
 
-	public void setWoodType(WoodType woodType) {
+	public void setWoodType(@Nonnull WoodType woodType) {
 		this.woodType = woodType;
 		sendNetworkUpdate();
 	}
@@ -49,10 +52,7 @@ public class TileStairs extends TileEntity implements IStreamable {
 	@Override
 	public void writeToNBT(NBTTagCompound nbttagcompound) {
 		super.writeToNBT(nbttagcompound);
-
-		if (woodType != null) {
-			nbttagcompound.setShort("WT", (short) woodType.ordinal());
-		}
+		nbttagcompound.setShort("WT", (short) woodType.ordinal());
 	}
 
 	/* UPDATING */

src/main/java/forestry/core/gadgets/TileAnalyzer.java

@@ -51,6 +51,8 @@ import forestry.core.network.PacketItemStackDisplay;
 import forestry.core.proxy.Proxies;
 import forestry.core.utils.GeneticsUtil;
 import forestry.core.utils.GuiUtil;
+import forestry.plugins.PluginArboriculture;
+import forestry.plugins.PluginManager;
 
 public class TileAnalyzer extends TilePowered implements ISidedInventory, ILiquidTankContainer, IItemStackDisplay {
 
@@ -159,7 +161,7 @@ public class TileAnalyzer extends TilePowered implements ISidedInventory, ILiqui
 			}
 		}
 
-		// Look for bees in input slots.
+		// Look for specimens in input slots.
 		IInvSlot slot = getInputSlot();
 
 		boolean noInput = (slot == null);
@@ -169,11 +171,19 @@ public class TileAnalyzer extends TilePowered implements ISidedInventory, ILiqui
 		}
 
 		ItemStack inputStack = slot.getStackInSlot();
-		ItemStack ersatz = GeneticsUtil.convertSaplingToGeneticEquivalent(inputStack);
-		if (ersatz != null) {
-			inputStack = ersatz;
+
+		if (PluginManager.Module.ARBORICULTURE.isEnabled() && !PluginArboriculture.treeInterface.isMember(inputStack)) {
+			ItemStack ersatz = GeneticsUtil.convertSaplingToGeneticEquivalent(inputStack);
+			if (ersatz != null) {
+				inputStack = ersatz;
+			}
 		}
+
 		IIndividual individual = AlleleManager.alleleRegistry.getIndividual(inputStack);
+		if (individual == null) {
+			return false;
+		}
+
 		if (!individual.isAnalyzed()) {
 			boolean hasHoney = resourceTank.getFluidAmount() >= HONEY_REQUIRED;
 			setErrorCondition(!hasHoney, EnumErrorCode.NORESOURCE);

src/main/java/forestry/core/inventory/InvTools.java

@@ -1102,12 +1102,14 @@ public abstract class InvTools {
 	}
 
 	public static boolean tryAddStack(IInventory inventory, ItemStack stack, int startSlot, int slots, boolean all, boolean doAdd) {
-		int added = addStack(inventory, stack, startSlot, slots, doAdd);
-		if (all) {
-			return added == stack.stackSize;
-		} else {
-			return added > 0;
+		int added = addStack(inventory, stack, startSlot, slots, false);
+		boolean success = all ? (added == stack.stackSize) : (added > 0);
+
+		if (success	&& doAdd) {
+			addStack(inventory, stack, startSlot, slots, true);
 		}
+
+		return success;
 	}
 
 	public static int addStack(IInventory inventory, ItemStack stack, boolean doAdd) {

src/main/java/forestry/factory/gadgets/TileWorktable.java

@@ -177,11 +177,14 @@ public class TileWorktable extends TileBase implements ICrafterWorktable {
 		ItemStack[] set = InvTools.getStacks(currentRecipe.getMatrix(), SLOT_CRAFTING_1, SLOT_CRAFTING_COUNT);
 		ItemStack[] removed = InvTools.removeSets(this, 1, set, SLOT_INVENTORY_1, SLOT_INVENTORY_COUNT, player, false, true, true);
 
+		if (removed == null) {
+			return false;
+		}
+
 		for (int i = 0; i < removed.length; i++) {
 			craftingInventory.setInventorySlotContents(i, removed[i]);
 		}
-
-		return removed != null;
+		return true;
 	}
 
 	@Override