Added End Stone Bricks.

src/main/java/vazkii/botania/common/block/ModBlocks.java

@@ -25,6 +25,7 @@ import vazkii.botania.common.block.decor.BlockBuriedPetals;
 import vazkii.botania.common.block.decor.BlockCustomBrick;
 import vazkii.botania.common.block.decor.BlockDirtPath;
 import vazkii.botania.common.block.decor.BlockElfGlass;
+import vazkii.botania.common.block.decor.BlockEndStoneBrick;
 import vazkii.botania.common.block.decor.BlockFloatingFlower;
 import vazkii.botania.common.block.decor.BlockManaBeacon;
 import vazkii.botania.common.block.decor.BlockManaFlame;
@@ -200,6 +201,7 @@ public final class ModBlocks {
 	public static Block petalBlock;
 	public static Block corporeaIndex;
 	public static Block corporeaFunnel;
+	public static Block endStoneBrick;
 
 	public static void init() {
 		flower = new BlockModFlower();
@@ -261,6 +263,7 @@ public final class ModBlocks {
 		petalBlock = new BlockPetalBlock();
 		corporeaIndex = new BlockCorporeaIndex();
 		corporeaFunnel = new BlockCorporeaFunnel();
+		endStoneBrick = new BlockEndStoneBrick();
 		
 		ModFluffBlocks.init();
 

src/main/java/vazkii/botania/common/block/ModFluffBlocks.java

@@ -18,6 +18,7 @@ import vazkii.botania.common.block.decor.quartz.BlockSpecialQuartzSlab;
 import vazkii.botania.common.block.decor.quartz.BlockSpecialQuartzStairs;
 import vazkii.botania.common.block.decor.slabs.BlockBiomeStoneSlab;
 import vazkii.botania.common.block.decor.slabs.BlockDirtPathSlab;
+import vazkii.botania.common.block.decor.slabs.BlockEndStoneSlab;
 import vazkii.botania.common.block.decor.slabs.BlockModSlab;
 import vazkii.botania.common.block.decor.slabs.BlockReedSlab;
 import vazkii.botania.common.block.decor.slabs.BlockThatchSlab;
@@ -35,6 +36,7 @@ import vazkii.botania.common.block.decor.slabs.prismarine.BlockDarkPrismarineSla
 import vazkii.botania.common.block.decor.slabs.prismarine.BlockPrismarineBrickSlab;
 import vazkii.botania.common.block.decor.slabs.prismarine.BlockPrismarineSlab;
 import vazkii.botania.common.block.decor.stairs.BlockBiomeStoneStairs;
+import vazkii.botania.common.block.decor.stairs.BlockEndStoneStairs;
 import vazkii.botania.common.block.decor.stairs.BlockReedStairs;
 import vazkii.botania.common.block.decor.stairs.BlockThatchStairs;
 import vazkii.botania.common.block.decor.stairs.bricks.BlockCustomBrickStairs;
@@ -138,6 +140,10 @@ public final class ModFluffBlocks {
 	public static Block[] biomeStoneStairs = new Block[24];
 	public static Block[] biomeStoneSlabs = new Block[24];
 	public static Block[] biomeStoneFullSlabs = new Block[24];
+	
+	public static Block endStoneSlab;
+	public static Block endStoneSlabFull;
+	public static Block endStoneStairs;
 
 	public static void init() {
 		livingwoodStairs = new BlockLivingwoodStairs();
@@ -231,6 +237,10 @@ public final class ModFluffBlocks {
 			biomeStoneFullSlabs[i] = new BlockBiomeStoneSlab(true, block, meta, i);
 		}
 
+		endStoneSlab = new BlockEndStoneSlab(false);
+		endStoneSlabFull = new BlockEndStoneSlab(true);
+		endStoneStairs = new BlockEndStoneStairs();
+		
 		if(ConfigHandler.darkQuartzEnabled) {
 			((BlockModSlab) darkQuartzSlab).register();
 			((BlockModSlab) darkQuartzSlabFull).register();
@@ -282,6 +292,9 @@ public final class ModFluffBlocks {
 
 		((BlockModSlab) dirtPathSlab).register();
 		((BlockModSlab) dirtPathSlabFull).register();
+		
+		((BlockModSlab) endStoneSlab).register();
+		((BlockModSlab) endStoneSlabFull).register();
 
 		for(int i = 0; i < 24; i++) {
 			((BlockModSlab) biomeStoneSlabs[i]).register();

src/main/java/vazkii/botania/common/block/decor/BlockEndStoneBrick.java

@@ -0,0 +1,91 @@
+/**
+ * This class was created by <Vazkii>. It's distributed as
+ * part of the Botania Mod. Get the Source Code in github:
+ * https://github.com/Vazkii/Botania
+ * 
+ * Botania is Open Source and distributed under the
+ * Botania License: http://botaniamod.net/license.php
+ * 
+ * File Created @ [Feb 16, 2015, 8:17:12 PM (GMT)]
+ */
+package vazkii.botania.common.block.decor;
+
+import java.util.List;
+
+import net.minecraft.block.Block;
+import net.minecraft.block.material.Material;
+import net.minecraft.client.renderer.texture.IIconRegister;
+import net.minecraft.creativetab.CreativeTabs;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.item.Item;
+import net.minecraft.item.ItemStack;
+import net.minecraft.util.IIcon;
+import net.minecraft.util.MovingObjectPosition;
+import net.minecraft.world.World;
+import vazkii.botania.api.lexicon.ILexiconable;
+import vazkii.botania.api.lexicon.LexiconEntry;
+import vazkii.botania.client.core.helper.IconHelper;
+import vazkii.botania.common.block.BlockMod;
+import vazkii.botania.common.item.block.ItemBlockWithMetadataAndName;
+import vazkii.botania.common.lexicon.LexiconData;
+import vazkii.botania.common.lib.LibBlockNames;
+import cpw.mods.fml.common.registry.GameRegistry;
+
+public class BlockEndStoneBrick extends BlockMod implements ILexiconable {
+
+	private static IIcon[] icons = new IIcon[2];
+
+	public BlockEndStoneBrick() {
+		super(Material.rock);
+		setHardness(1.5F);
+		setResistance(10F);
+		setStepSound(soundTypeStone);
+		setBlockName(LibBlockNames.END_STONE_BRICK);
+	}
+
+	@Override
+	public void registerBlockIcons(IIconRegister register) {
+		for(int i = 0; i < 2; i++) {
+			icons[i] = IconHelper.forBlock(register, this, i);
+		}
+	}
+
+	@Override
+	public void getSubBlocks(Item item, CreativeTabs tab, List list) {
+		for(int i = 0; i < 2; i++)
+			list.add(new ItemStack(item, 1, i));
+	}
+
+	@Override
+	public IIcon getIcon(int side, int meta) {
+		return icons[Math.min(icons.length - 1, meta)];
+	}
+
+	@Override
+	protected boolean shouldRegisterInNameSet() {
+		return false;
+	}
+
+	@Override
+	public int damageDropped(int par1) {
+		return par1;
+	}
+
+	@Override
+	public Block setBlockName(String par1Str) {
+		GameRegistry.registerBlock(this, ItemBlockWithMetadataAndName.class, par1Str);
+		return super.setBlockName(par1Str);
+	}
+
+	@Override
+	public ItemStack getPickBlock(MovingObjectPosition target, World world, int x, int y, int z) {
+		int meta = world.getBlockMetadata(x, y, z);
+		return new ItemStack(this, 1, meta);
+	}
+
+	@Override
+	public LexiconEntry getEntry(World world, int x, int y, int z, EntityPlayer player, ItemStack lexicon) {
+		return LexiconData.endStoneDecor;
+	}
+
+}

src/main/java/vazkii/botania/common/block/decor/slabs/BlockEndStoneSlab.java

@@ -0,0 +1,44 @@
+/**
+ * This class was created by <Vazkii>. It's distributed as
+ * part of the Botania Mod. Get the Source Code in github:
+ * https://github.com/Vazkii/Botania
+ * 
+ * Botania is Open Source and distributed under the
+ * Botania License: http://botaniamod.net/license.php
+ * 
+ * File Created @ [Feb 16, 2015, 8:45:00 PM (GMT)]
+ */
+package vazkii.botania.common.block.decor.slabs;
+
+import vazkii.botania.api.lexicon.LexiconEntry;
+import vazkii.botania.common.block.ModBlocks;
+import vazkii.botania.common.block.ModFluffBlocks;
+import vazkii.botania.common.lexicon.LexiconData;
+import net.minecraft.block.Block;
+import net.minecraft.block.BlockSlab;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.item.ItemStack;
+import net.minecraft.world.World;
+
+public class BlockEndStoneSlab extends BlockLivingSlab {
+
+	public BlockEndStoneSlab(boolean full) {
+		super(full, ModBlocks.endStoneBrick, 0);
+	}
+
+	@Override
+	public BlockSlab getFullBlock() {
+		return (BlockSlab) ModFluffBlocks.endStoneSlabFull;
+	}
+
+	@Override
+	public BlockSlab getSingleBlock() {
+		return (BlockSlab) ModFluffBlocks.endStoneSlab;
+	}
+
+	@Override
+	public LexiconEntry getEntry(World world, int x, int y, int z, EntityPlayer player, ItemStack lexicon) {
+		return LexiconData.endStoneDecor;
+	}
+	
+}

src/main/java/vazkii/botania/common/block/decor/stairs/BlockEndStoneStairs.java

@@ -0,0 +1,32 @@
+/**
+ * This class was created by <Vazkii>. It's distributed as
+ * part of the Botania Mod. Get the Source Code in github:
+ * https://github.com/Vazkii/Botania
+ * 
+ * Botania is Open Source and distributed under the
+ * Botania License: http://botaniamod.net/license.php
+ * 
+ * File Created @ [Feb 16, 2015, 8:44:03 PM (GMT)]
+ */
+package vazkii.botania.common.block.decor.stairs;
+
+import vazkii.botania.api.lexicon.LexiconEntry;
+import vazkii.botania.common.block.ModBlocks;
+import vazkii.botania.common.lexicon.LexiconData;
+import net.minecraft.block.Block;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.item.ItemStack;
+import net.minecraft.world.World;
+
+public class BlockEndStoneStairs extends BlockLivingStairs {
+
+	public BlockEndStoneStairs() {
+		super(ModBlocks.endStoneBrick, 0);
+	}
+
+	@Override
+	public LexiconEntry getEntry(World world, int x, int y, int z, EntityPlayer player, ItemStack lexicon) {
+		return LexiconData.endStoneDecor;
+	}
+	
+}

src/main/java/vazkii/botania/common/core/BotaniaCreativeTab.java

@@ -212,6 +212,10 @@ public final class BotaniaCreativeTab extends CreativeTabs {
 		for(int i = 0; i < 24; i++)
 			addBlock(ModFluffBlocks.biomeStoneSlabs[i]);
 
+		addBlock(ModBlocks.endStoneBrick);
+		addBlock(ModFluffBlocks.endStoneSlab);
+		addBlock(ModFluffBlocks.endStoneStairs);
+		
 		addItem(ModItems.glassPick);
 		addItem(ModItems.manasteelPick);
 		addItem(ModItems.manasteelShovel);

src/main/java/vazkii/botania/common/crafting/ModCraftingRecipes.java

@@ -232,6 +232,8 @@ public final class ModCraftingRecipes {
 	public static IRecipe recipeMasterCorporeaSpark;
 	public static IRecipe recipeCorporeaIndex;
 	public static IRecipe recipeCorporeaFunnel;
+	public static IRecipe recipeEndStoneBricks;
+	public static IRecipe recipeEndStoneChiseledBricks;
 
 	public static void init() {
 		// Lexicon Recipe
@@ -1529,6 +1531,17 @@ public final class ModCraftingRecipes {
 		addShapelessOreDictRecipe(new ItemStack(ModBlocks.corporeaFunnel), new ItemStack(Blocks.dropper), new ItemStack(ModItems.corporeaSpark));
 		recipeCorporeaFunnel = BotaniaAPI.getLatestAddedRecipe();
 		
+		// End Stone Brick Recipes
+		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();
+		
 		// Storage Block Recipes
 		addOreDictRecipe(new ItemStack(ModBlocks.storage, 1, 0),
 				"III", "III", "III",
@@ -1576,6 +1589,7 @@ public final class ModCraftingRecipes {
 		addStairsAndSlabs(ModBlocks.customBrick, 1, ModFluffBlocks.soulBrickStairs, ModFluffBlocks.soulBrickSlab);
 		addStairsAndSlabs(ModBlocks.customBrick, 2, ModFluffBlocks.snowBrickStairs, ModFluffBlocks.snowBrickSlab);
 		addStairsAndSlabs(ModBlocks.customBrick, 3, ModFluffBlocks.tileStairs, ModFluffBlocks.tileSlab);
+		addStairsAndSlabs(ModBlocks.endStoneBrick, 0, ModFluffBlocks.endStoneStairs, ModFluffBlocks.endStoneSlab);
 
 		// Biome Stone Recipes
 		for(int i = 0; i < 8; i++) {

src/main/java/vazkii/botania/common/lexicon/LexiconData.java

@@ -173,6 +173,7 @@ public final class LexiconData {
 	public static LexiconEntry corporea;
 	public static LexiconEntry corporeaIndex;
 	public static LexiconEntry corporeaFunnel;
+	public static LexiconEntry endStoneDecor;
 
 	public static LexiconEntry baublesIntro;
 	public static LexiconEntry tinyPlanet;
@@ -670,6 +671,9 @@ public final class LexiconData {
 		corporeaFunnel = new ALexiconEntry(LibLexicon.ENDER_CORPOREA_FUNNEL, categoryEnder);
 		corporeaFunnel.setLexiconPages(new PageText("0"), new PageText("1"), new PageCraftingRecipe("2", ModCraftingRecipes.recipeCorporeaFunnel));
 		
+		endStoneDecor = new BLexiconEntry(LibLexicon.ENDER_END_STONE_DECOR, categoryEnder);
+		endStoneDecor.setLexiconPages(new PageText("0"), new PageCraftingRecipe("1", ModCraftingRecipes.recipeEndStoneBricks), new PageCraftingRecipe("2", ModCraftingRecipes.recipeEndStoneChiseledBricks));
+		
 		// BAUBLES ENTRIES
 		baublesIntro = new BLexiconEntry(LibLexicon.BAUBLE_INTRO, categoryBaubles);
 		baublesIntro.setPriority().setLexiconPages(new PageText("0"), new PageImage("1", LibResources.ENTRY_BAUBLES), new PageText("2"));

src/main/java/vazkii/botania/common/lib/LibBlockNames.java

@@ -74,6 +74,7 @@ public final class LibBlockNames {
 	public static final String PETAL_BLOCK = "petalBlock";
 	public static final String CORPOREA_INDEX = "corporeaIndex";
 	public static final String CORPOREA_FUNNEL = "corporeaFunnel";
+	public static final String END_STONE_BRICK = "endStoneBrick";
 
 	public static final String SUBTILE_PUREDAISY = "puredaisy";
 	public static final String SUBTILE_MANASTAR = "manastar";

src/main/java/vazkii/botania/common/lib/LibLexicon.java

@@ -155,6 +155,7 @@ public final class LibLexicon {
 	public static final String ENDER_CORPOREA = "corporea";
 	public static final String ENDER_CORPOREA_INDEX = "corporeaIndex";
 	public static final String ENDER_CORPOREA_FUNNEL = "corporeaFunnel";
+	public static final String ENDER_END_STONE_DECOR = "endStoneDecor";
 
 	public static final String BAUBLE_INTRO = "bIntro";
 	public static final String BAUBLE_TINY_PLANET = "tinyPlanet";