From 849f9fc07b0f5eac5d5c9867b253118cb6e6d6a0 Mon Sep 17 00:00:00 2001 From: drcrazy Date: Tue, 5 Sep 2017 18:02:42 +0300 Subject: [PATCH] Fix null IItemstack being converted to air. I hope. Closes #1222 --- .../techreborn/compat/crafttweaker/CTIndustrialGrinder.java | 5 +++-- .../techreborn/compat/crafttweaker/CraftTweakerCompat.java | 3 +++ 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/src/main/java/techreborn/compat/crafttweaker/CTIndustrialGrinder.java b/src/main/java/techreborn/compat/crafttweaker/CTIndustrialGrinder.java index 65b9b4725..28b53af86 100644 --- a/src/main/java/techreborn/compat/crafttweaker/CTIndustrialGrinder.java +++ b/src/main/java/techreborn/compat/crafttweaker/CTIndustrialGrinder.java @@ -46,8 +46,9 @@ public class CTIndustrialGrinder extends CTGeneric { @ZenMethod public static void addRecipe(IItemStack output1, IItemStack output2, IItemStack output3, IItemStack output4, IIngredient input1, IIngredient input2, ILiquidStack fluid, int ticktime, int euTick) { ItemStack oInput1 = (ItemStack) CraftTweakerCompat.toObject(input1); - - ItemStack oInput2 = (ItemStack) CraftTweakerCompat.toObject(input2); + + // There is only one input slot in Industrial Grinder + //ItemStack oInput2 = (ItemStack) CraftTweakerCompat.toObject(input2); FluidStack fluidStack = null; if (fluid != null) { diff --git a/src/main/java/techreborn/compat/crafttweaker/CraftTweakerCompat.java b/src/main/java/techreborn/compat/crafttweaker/CraftTweakerCompat.java index 3149ff919..df4e01fdd 100644 --- a/src/main/java/techreborn/compat/crafttweaker/CraftTweakerCompat.java +++ b/src/main/java/techreborn/compat/crafttweaker/CraftTweakerCompat.java @@ -44,6 +44,9 @@ import static crafttweaker.api.minecraft.CraftTweakerMC.getLiquidStack; public class CraftTweakerCompat implements ICompatModule { public static ItemStack toStack(IItemStack iStack) { + if (iStack == null){ + return null; + } return getItemStack(iStack); }