diff --git a/src/main/java/vazkii/botania/common/crafting/ModCraftingRecipes.java b/src/main/java/vazkii/botania/common/crafting/ModCraftingRecipes.java index ab1b04352..0e0cd2782 100644 --- a/src/main/java/vazkii/botania/common/crafting/ModCraftingRecipes.java +++ b/src/main/java/vazkii/botania/common/crafting/ModCraftingRecipes.java @@ -530,6 +530,7 @@ public final class ModCraftingRecipes { recipeLensFirework = path("lens_20"); recipeLensFlare = path("lens_21"); recipeLensMessenger = path("lens_22"); + recipeLensTripwire = path("lens_23"); recipeDistributor = ModBlocks.distributor.getRegistryName(); recipeManaVoid = ModBlocks.manaVoid.getRegistryName(); @@ -740,6 +741,7 @@ public final class ModCraftingRecipes { recipeBlazeBlock = gogPath("blazeblock"); recipeCacophonium = ModItems.cacophonium.getRegistryName(); recipesPavement = allOfGroup(ModFluffBlocks.pavement.getRegistryName()); + recipeCellBlock = ModBlocks.cellBlock.getRegistryName(); } diff --git a/src/main/java/vazkii/botania/common/lexicon/page/PageCraftingRecipe.java b/src/main/java/vazkii/botania/common/lexicon/page/PageCraftingRecipe.java index 749c6e08c..8a0d4d4a7 100644 --- a/src/main/java/vazkii/botania/common/lexicon/page/PageCraftingRecipe.java +++ b/src/main/java/vazkii/botania/common/lexicon/page/PageCraftingRecipe.java @@ -39,6 +39,8 @@ import java.util.List; import java.util.Objects; import java.util.stream.Collectors; +import javax.annotation.Resource; + public class PageCraftingRecipe extends PageRecipe { private static final ResourceLocation craftingOverlay = new ResourceLocation(LibResources.GUI_CRAFTING_OVERLAY); @@ -52,6 +54,10 @@ public class PageCraftingRecipe extends PageRecipe { public PageCraftingRecipe(String unlocalizedName, List recipes) { super(unlocalizedName); this.recipes = recipes; + + for(ResourceLocation res : recipes) + if(res == null) + throw new IllegalArgumentException("Null recipes arent allowed"); } public PageCraftingRecipe(String unlocalizedName, ResourceLocation recipe) { @@ -128,6 +134,9 @@ public class PageCraftingRecipe extends PageRecipe { @SideOnly(Side.CLIENT) public void renderCraftingRecipe(IGuiLexiconEntry gui, IRecipe recipe) { + if(recipe == null) + return; + if(recipe instanceof ShapedRecipes || recipe instanceof ShapedOreRecipe) { oreDictRecipe = recipe instanceof ShapedOreRecipe;