diff --git a/src/main/java/vazkii/botania/common/core/BotaniaCreativeTab.java b/src/main/java/vazkii/botania/common/core/BotaniaCreativeTab.java index e8845eb56..c6bbfc273 100644 --- a/src/main/java/vazkii/botania/common/core/BotaniaCreativeTab.java +++ b/src/main/java/vazkii/botania/common/core/BotaniaCreativeTab.java @@ -370,12 +370,14 @@ public final class BotaniaCreativeTab extends CreativeTabs { addBlock(ModFluffBlocks.biomeStoneSlabs[i]); addBlock(ModFluffBlocks.biomeStoneWall); - addBlock(ModBlocks.endStoneBrick); - addBlock(ModFluffBlocks.endStoneSlab); - addBlock(ModFluffBlocks.endStoneStairs); - addBlock(ModFluffBlocks.enderBrickSlab); - addBlock(ModFluffBlocks.enderBrickStairs); - + if(ConfigHandler.enderStuff19Enabled) { + addBlock(ModBlocks.endStoneBrick); + addBlock(ModFluffBlocks.endStoneSlab); + addBlock(ModFluffBlocks.endStoneStairs); + addBlock(ModFluffBlocks.enderBrickSlab); + addBlock(ModFluffBlocks.enderBrickStairs); + } + addItem(ModItems.cosmetic); } diff --git a/src/main/java/vazkii/botania/common/core/handler/ConfigHandler.java b/src/main/java/vazkii/botania/common/core/handler/ConfigHandler.java index bd00438cf..a91793548 100644 --- a/src/main/java/vazkii/botania/common/core/handler/ConfigHandler.java +++ b/src/main/java/vazkii/botania/common/core/handler/ConfigHandler.java @@ -61,6 +61,7 @@ public final class ConfigHandler { public static boolean relicsEnabled = true; public static boolean stones18Enabled = true; public static boolean ringOfOdinFireResist = true; + public static boolean enderStuff19Enabled = true; public static int flowerQuantity = 2; public static int flowerDensity = 16; @@ -184,6 +185,9 @@ public final class ConfigHandler { desc = "Set this to false to make the Ring of Odin not apply fire resistance. Mostly for people who use Witchery transformations."; ringOfOdinFireResist = loadPropBool("ringOfOdin.fireResist", desc, ringOfOdinFireResist); + desc = "Set this to false to disable the 1.9 Ender features available as recipes. This only disables the recipes and entries. Old ones that are already in the world will stay."; + enderStuff19Enabled = loadPropBool("19enderStuff.enabled", desc, enderStuff19Enabled); + desc = "The quantity of Botania flower patches to generate in the world, defaults to 2, the lower the number the less patches generate."; flowerQuantity = loadPropInt("worldgen.flower.quantity", desc, flowerQuantity); diff --git a/src/main/java/vazkii/botania/common/crafting/ModCraftingRecipes.java b/src/main/java/vazkii/botania/common/crafting/ModCraftingRecipes.java index e65d5e5a2..a27f823a6 100644 --- a/src/main/java/vazkii/botania/common/crafting/ModCraftingRecipes.java +++ b/src/main/java/vazkii/botania/common/crafting/ModCraftingRecipes.java @@ -1606,26 +1606,28 @@ public final class ModCraftingRecipes { recipeCorporeaInterceptor = BotaniaAPI.getLatestAddedRecipe(); // End Stone Brick Recipes - GameRegistry.addRecipe(new ItemStack(ModBlocks.endStoneBrick, 4), - "SS", "SS", - 'S', new ItemStack(Blocks.end_stone)); - recipeEndStoneBricks = BotaniaAPI.getLatestAddedRecipe(); + if(ConfigHandler.enderStuff19Enabled) { + GameRegistry.addRecipe(new ItemStack(ModBlocks.endStoneBrick, 4), + "SS", "SS", + 'S', new ItemStack(Blocks.end_stone)); + recipeEndStoneBricks = BotaniaAPI.getLatestAddedRecipe(); - GameRegistry.addRecipe(new ItemStack(ModBlocks.endStoneBrick, 1, 1), - "S", "S", - 'S', new ItemStack(ModFluffBlocks.endStoneSlab)); - recipeEndStoneChiseledBricks = BotaniaAPI.getLatestAddedRecipe(); + GameRegistry.addRecipe(new ItemStack(ModBlocks.endStoneBrick, 1, 1), + "S", "S", + 'S', new ItemStack(ModFluffBlocks.endStoneSlab)); + recipeEndStoneChiseledBricks = BotaniaAPI.getLatestAddedRecipe(); - GameRegistry.addRecipe(new ItemStack(ModBlocks.endStoneBrick, 4, 2), - " B ", "BPB", " B ", - 'B', new ItemStack(ModBlocks.endStoneBrick), - 'P', new ItemStack(Items.ender_pearl)); - recipeEnderBricks = BotaniaAPI.getLatestAddedRecipe(); + GameRegistry.addRecipe(new ItemStack(ModBlocks.endStoneBrick, 4, 2), + " B ", "BPB", " B ", + 'B', new ItemStack(ModBlocks.endStoneBrick), + 'P', new ItemStack(Items.ender_pearl)); + recipeEnderBricks = BotaniaAPI.getLatestAddedRecipe(); - GameRegistry.addRecipe(new ItemStack(ModBlocks.endStoneBrick, 2, 3), - "B", "B", - 'B', new ItemStack(ModBlocks.endStoneBrick, 1, 2)); - recipePillarEnderBricks = BotaniaAPI.getLatestAddedRecipe(); + GameRegistry.addRecipe(new ItemStack(ModBlocks.endStoneBrick, 2, 3), + "B", "B", + 'B', new ItemStack(ModBlocks.endStoneBrick, 1, 2)); + recipePillarEnderBricks = BotaniaAPI.getLatestAddedRecipe(); + } // Livingwood Bow Recipe addOreDictRecipe(new ItemStack(ModItems.livingwoodBow), diff --git a/src/main/java/vazkii/botania/common/lexicon/LexiconData.java b/src/main/java/vazkii/botania/common/lexicon/LexiconData.java index 7f25c6bce..3e6947358 100644 --- a/src/main/java/vazkii/botania/common/lexicon/LexiconData.java +++ b/src/main/java/vazkii/botania/common/lexicon/LexiconData.java @@ -802,8 +802,10 @@ public final class LexiconData { corporeaInterceptor = new ALexiconEntry(LibLexicon.ENDER_CORPOREA_INTERCEPTOR, categoryEnder); corporeaInterceptor.setLexiconPages(new PageText("0"), new PageText("1"), new PageCraftingRecipe("2", ModCraftingRecipes.recipeCorporeaInterceptor)); - endStoneDecor = new BLexiconEntry(LibLexicon.ENDER_END_STONE_DECOR, categoryEnder); - endStoneDecor.setLexiconPages(new PageText("0"), new PageCraftingRecipe("1", ModCraftingRecipes.recipeEndStoneBricks), new PageCraftingRecipe("2", ModCraftingRecipes.recipeEndStoneChiseledBricks), new PageCraftingRecipe("3", ModCraftingRecipes.recipeEnderBricks), new PageCraftingRecipe("4", ModCraftingRecipes.recipePillarEnderBricks)); + if(ConfigHandler.enderStuff19Enabled) { + endStoneDecor = new BLexiconEntry(LibLexicon.ENDER_END_STONE_DECOR, categoryEnder); + endStoneDecor.setLexiconPages(new PageText("0"), new PageCraftingRecipe("1", ModCraftingRecipes.recipeEndStoneBricks), new PageCraftingRecipe("2", ModCraftingRecipes.recipeEndStoneChiseledBricks), new PageCraftingRecipe("3", ModCraftingRecipes.recipeEnderBricks), new PageCraftingRecipe("4", ModCraftingRecipes.recipePillarEnderBricks)); + } spawnerMover = new ALexiconEntry(LibLexicon.ENDER_SPAWNER_MOVER, categoryEnder); spawnerMover.setLexiconPages(new PageText("0"), new PageCraftingRecipe("1", ModCraftingRecipes.recipeSpawnerMover));