From 025de27b426fa3f7c56a051ac09cd94af828b16e Mon Sep 17 00:00:00 2001 From: Ellpeck Date: Sat, 28 Nov 2015 19:36:44 +0100 Subject: [PATCH] Added Config Option to disable crafting Lens Of Detonation, because it's pretty deathly and griefy --- .../booklet/page/PageReconstructor.java | 4 +++- .../config/values/ConfigCrafting.java | 1 + .../recipe/ReconstructorRecipeHandler.java | 13 ++++++++++--- 3 files changed, 14 insertions(+), 4 deletions(-) diff --git a/src/main/java/ellpeck/actuallyadditions/booklet/page/PageReconstructor.java b/src/main/java/ellpeck/actuallyadditions/booklet/page/PageReconstructor.java index 4424ced1b..5378aeb21 100644 --- a/src/main/java/ellpeck/actuallyadditions/booklet/page/PageReconstructor.java +++ b/src/main/java/ellpeck/actuallyadditions/booklet/page/PageReconstructor.java @@ -111,7 +111,9 @@ public class PageReconstructor extends BookletPage{ if(this.recipes != null){ ItemStack[] stacks = new ItemStack[this.recipes.length]; for(int i = 0; i < this.recipes.length; i++){ - stacks[i] = this.recipes[i].getFirstOutput(); + if(this.recipes[i] != null){ + stacks[i] = this.recipes[i].getFirstOutput(); + } } return stacks; } diff --git a/src/main/java/ellpeck/actuallyadditions/config/values/ConfigCrafting.java b/src/main/java/ellpeck/actuallyadditions/config/values/ConfigCrafting.java index 306915206..a1fcfccdb 100644 --- a/src/main/java/ellpeck/actuallyadditions/config/values/ConfigCrafting.java +++ b/src/main/java/ellpeck/actuallyadditions/config/values/ConfigCrafting.java @@ -134,6 +134,7 @@ public enum ConfigCrafting{ HORSE_ARMORS("Horse Armor -> Raw Materials (Crusher)", ConfigCategories.OTHER), RECONSTRUCTOR_MISC("Misc. Recipes like Soul Sand (Reconstructor)", ConfigCategories.OTHER), + RECONSTRUCTOR_EXPLOSION_LENS("Lens of Detonation (Reconstructor)", ConfigCategories.OTHER), TELE_STAFF("Tele Staff", ConfigCategories.ITEMS_CRAFTING), CASING("Casing", ConfigCategories.BLOCKS_CRAFTING), diff --git a/src/main/java/ellpeck/actuallyadditions/recipe/ReconstructorRecipeHandler.java b/src/main/java/ellpeck/actuallyadditions/recipe/ReconstructorRecipeHandler.java index 7e0d38445..15cae569c 100644 --- a/src/main/java/ellpeck/actuallyadditions/recipe/ReconstructorRecipeHandler.java +++ b/src/main/java/ellpeck/actuallyadditions/recipe/ReconstructorRecipeHandler.java @@ -67,10 +67,17 @@ public class ReconstructorRecipeHandler{ //Lenses addRecipe("itemLens", "itemColorLens", 5000); recipeColorLens = Util.GetRecipes.lastReconstructorRecipe(); - addRecipe("itemColorLens", "itemExplosionLens", 5000); - recipeExplosionLens = Util.GetRecipes.lastReconstructorRecipe(); - addRecipe("itemExplosionLens", "itemDamageLens", 5000); + + if(ConfigCrafting.RECONSTRUCTOR_EXPLOSION_LENS.isEnabled()){ + addRecipe("itemColorLens", "itemExplosionLens", 5000); + recipeExplosionLens = Util.GetRecipes.lastReconstructorRecipe(); + addRecipe("itemExplosionLens", "itemDamageLens", 5000); + } + else{ + addRecipe("itemColorLens", "itemDamageLens", 5000); + } recipeDamageLens = Util.GetRecipes.lastReconstructorRecipe(); + addRecipe("itemDamageLens", "itemLens", 5000); //Misc