Black Quartz decor blocks

src/main/java/ellpeck/actuallyadditions/blocks/BlockSlabs.java

@@ -15,7 +15,6 @@ import cpw.mods.fml.relauncher.SideOnly;
 import ellpeck.actuallyadditions.blocks.base.BlockBase;
 import ellpeck.actuallyadditions.blocks.base.ItemBlockBase;
 import net.minecraft.block.Block;
-import net.minecraft.block.material.Material;
 import net.minecraft.client.renderer.texture.IIconRegister;
 import net.minecraft.entity.Entity;
 import net.minecraft.entity.player.EntityPlayer;
@@ -31,12 +30,18 @@ import java.util.List;
 public class BlockSlabs extends BlockBase{
 
     private Block fullBlock;
+    private int meta;
 
-    public BlockSlabs(String name, Block fullBlock){
+    public BlockSlabs(String name, Block fullBlock, int meta){
-        super(Material.rock, name);
+        super(fullBlock.getMaterial(), name);
         this.setHardness(1.5F);
         this.setResistance(10.0F);
         this.fullBlock = fullBlock;
+        this.meta = meta;
+    }
+
+    public BlockSlabs(String name, Block fullBlock){
+        this(name, fullBlock, 0);
     }
 
     @Override
@@ -47,7 +52,7 @@ public class BlockSlabs extends BlockBase{
     @Override
     @SideOnly(Side.CLIENT)
     public IIcon getIcon(int side, int meta){
-        return this.fullBlock.getIcon(0, 0);
+        return this.fullBlock.getIcon(side, this.meta);
     }
 
     @Override

src/main/java/ellpeck/actuallyadditions/blocks/InitBlocks.java

@@ -14,6 +14,7 @@ import ellpeck.actuallyadditions.blocks.base.BlockFluidFlowing;
 import ellpeck.actuallyadditions.blocks.base.BlockPlant;
 import ellpeck.actuallyadditions.blocks.base.BlockStair;
 import ellpeck.actuallyadditions.blocks.base.BlockWallAA;
+import ellpeck.actuallyadditions.blocks.metalists.TheMiscBlocks;
 import ellpeck.actuallyadditions.config.values.ConfigBoolValues;
 import ellpeck.actuallyadditions.util.CompatUtil;
 import ellpeck.actuallyadditions.util.ModUtil;
@@ -111,6 +112,16 @@ public class InitBlocks{
     public static Block blockMiner;
 
     public static Block blockFireworkBox;
+    
+    public static Block blockQuartzWall;
+    public static Block blockQuartzStair;
+    public static Block blockQuartzSlab;
+    public static Block blockChiseledQuartzWall;
+    public static Block blockChiseledQuartzStair;
+    public static Block blockChiseledQuartzSlab;
+    public static Block blockPillarQuartzWall;
+    public static Block blockPillarQuartzStair;
+    public static Block blockPillarQuartzSlab;
 
     public static void init(){
         ModUtil.LOGGER.info("Initializing Blocks...");
@@ -181,6 +192,15 @@ public class InitBlocks{
         blockCoffeeMachine = new BlockCoffeeMachine("blockCoffeeMachine");
         blockPhantomBooster = new BlockPhantomBooster("blockPhantomBooster");
         blockWildPlant = new BlockWildPlant("blockWild");
+        blockQuartzWall = new BlockWallAA("blockQuartzWall", blockMisc, TheMiscBlocks.QUARTZ.ordinal());
+        blockChiseledQuartzWall = new BlockWallAA("blockChiseledQuartzWall", blockMisc, TheMiscBlocks.QUARTZ_CHISELED.ordinal());
+        blockPillarQuartzWall = new BlockWallAA("blockPillarQuartzWall", blockMisc, TheMiscBlocks.QUARTZ_PILLAR.ordinal());
+        blockQuartzStair = new BlockStair(blockMisc, "blockQuartzStair", TheMiscBlocks.QUARTZ.ordinal());
+        blockChiseledQuartzStair = new BlockStair(blockMisc, "blockChiseledQuartzStair", TheMiscBlocks.QUARTZ_CHISELED.ordinal());
+        blockPillarQuartzStair = new BlockStair(blockMisc, "blockPillarQuartzStair", TheMiscBlocks.QUARTZ_PILLAR.ordinal());
+        blockQuartzSlab = new BlockSlabs("blockQuartzSlab", blockMisc, TheMiscBlocks.QUARTZ.ordinal());
+        blockChiseledQuartzSlab = new BlockSlabs("blockChiseledQuartzSlab", blockMisc, TheMiscBlocks.QUARTZ_CHISELED.ordinal());
+        blockPillarQuartzSlab = new BlockSlabs("blockPillarQuartzSlab", blockMisc, TheMiscBlocks.QUARTZ_PILLAR.ordinal());
 
         registerFluids();
     }

src/main/java/ellpeck/actuallyadditions/blocks/base/BlockStair.java

@@ -23,14 +23,18 @@ public class BlockStair extends BlockStairs{
 
     private String name;
 
-    public BlockStair(Block block, String name){
+    public BlockStair(Block block, String name, int meta){
-        super(block, 0);
+        super(block, meta);
         this.name = name;
         this.setLightOpacity(0);
 
         this.register();
     }
 
+    public BlockStair(Block block, String name){
+        this(block, name, 0);
+    }
+
     private void register(){
         this.setBlockName(ModUtil.MOD_ID_LOWER+"."+this.getBaseName());
         GameRegistry.registerBlock(this, this.getItemBlock(), this.getBaseName());

src/main/java/ellpeck/actuallyadditions/blocks/base/BlockWallAA.java

@@ -29,15 +29,21 @@ public class BlockWallAA extends BlockWall {
 
     private String name;
     private Block baseBlock;
+    private int meta;
 
-    public BlockWallAA(String name, Block base){
+    public BlockWallAA(String name, Block base, int meta){
         super(base);
         this.baseBlock = base;
         this.name = name;
+        this.meta = meta;
 
         this.register();
     }
 
+    public BlockWallAA(String name, Block base){
+        this(name, base, 0);
+    }
+
     private void register(){
         this.setBlockName(ModUtil.MOD_ID_LOWER+"."+this.getBaseName());
         GameRegistry.registerBlock(this, this.getItemBlock(), this.getBaseName());
@@ -65,7 +71,7 @@ public class BlockWallAA extends BlockWall {
     @Override
     @SideOnly(Side.CLIENT)
     public IIcon getIcon(int side, int meta){
-        return this.baseBlock.getBlockTextureFromSide(side);
+        return this.baseBlock.getIcon(side, this.meta);
     }
 
     @SuppressWarnings("unchecked")

src/main/java/ellpeck/actuallyadditions/crafting/BlockCrafting.java

@@ -111,6 +111,39 @@ public class BlockCrafting{
             recipeMiner = Util.GetRecipes.lastIRecipe();
         }
 
+        //Quartz
+        GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(InitBlocks.blockQuartzWall, 6),
+                "XXX", "XXX",
+                'X', new ItemStack(InitBlocks.blockMisc, 1, TheMiscBlocks.QUARTZ.ordinal())));
+        GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(InitBlocks.blockQuartzSlab, 6),
+                "XXX",
+                'X', new ItemStack(InitBlocks.blockMisc, 1, TheMiscBlocks.QUARTZ.ordinal())));
+        GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(InitBlocks.blockQuartzStair, 6),
+                "X  ", "XX ", "XXX",
+                'X', new ItemStack(InitBlocks.blockMisc, 1, TheMiscBlocks.QUARTZ.ordinal())));
+
+        //PillarQuartz
+        GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(InitBlocks.blockPillarQuartzWall, 6),
+                "XXX", "XXX",
+                'X', new ItemStack(InitBlocks.blockMisc, 1, TheMiscBlocks.QUARTZ_PILLAR.ordinal())));
+        GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(InitBlocks.blockPillarQuartzSlab, 6),
+                "XXX",
+                'X', new ItemStack(InitBlocks.blockMisc, 1, TheMiscBlocks.QUARTZ_PILLAR.ordinal())));
+        GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(InitBlocks.blockPillarQuartzStair, 6),
+                "X  ", "XX ", "XXX",
+                'X', new ItemStack(InitBlocks.blockMisc, 1, TheMiscBlocks.QUARTZ_PILLAR.ordinal())));
+
+        //ChiseledQuartz
+        GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(InitBlocks.blockChiseledQuartzWall, 6),
+                "XXX", "XXX",
+                'X', new ItemStack(InitBlocks.blockMisc, 1, TheMiscBlocks.QUARTZ_CHISELED.ordinal())));
+        GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(InitBlocks.blockChiseledQuartzSlab, 6),
+                "XXX",
+                'X', new ItemStack(InitBlocks.blockMisc, 1, TheMiscBlocks.QUARTZ_CHISELED.ordinal())));
+        GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(InitBlocks.blockChiseledQuartzStair, 6),
+                "X  ", "XX ", "XXX",
+                'X', new ItemStack(InitBlocks.blockMisc, 1, TheMiscBlocks.QUARTZ_CHISELED.ordinal())));
+
         //White Ethetic Blocks
         GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(InitBlocks.blockTestifiBucksWhiteFence, 6),
                 "XXX", "XXX",

src/main/java/ellpeck/actuallyadditions/creative/CreativeTab.java

@@ -106,6 +106,17 @@ public class CreativeTab extends CreativeTabs{
         add(InitBlocks.blockTestifiBucksWhiteSlab);
         add(InitBlocks.blockTestifiBucksGreenFence);
         add(InitBlocks.blockTestifiBucksWhiteFence);
+
+        add(InitBlocks.blockQuartzWall);
+        add(InitBlocks.blockQuartzStair);
+        add(InitBlocks.blockQuartzSlab);
+        add(InitBlocks.blockChiseledQuartzWall);
+        add(InitBlocks.blockChiseledQuartzStair);
+        add(InitBlocks.blockChiseledQuartzSlab);
+        add(InitBlocks.blockPillarQuartzWall);
+        add(InitBlocks.blockPillarQuartzStair);
+        add(InitBlocks.blockPillarQuartzSlab);
+        
         add(InitBlocks.blockColoredLamp);
         add(InitBlocks.blockLampPowerer);
         add(InitBlocks.blockTreasureChest);

src/main/resources/assets/actuallyadditions/lang/en_US.lang

@@ -128,6 +128,15 @@ tile.actuallyadditions.blockCrystalWhite.name=Enori Crystal Block
 tile.actuallyadditions.blockBookStand.name=Manual Stand
 tile.actuallyadditions.blockMiner.name=Vertical Digger
 tile.actuallyadditions.blockFireworkBox.name=Firework Box
+tile.actuallyadditions.blockQuartzWall.name=Black Quartz Wall
+tile.actuallyadditions.blockQuartzStair.name=Black Quartz Stairs
+tile.actuallyadditions.blockQuartzSlab.name=Black Quartz Slab
+tile.actuallyadditions.blockChiseledQuartzWall.name=Chiseled Black Quartz Wall
+tile.actuallyadditions.blockChiseledQuartzStair.name=Chiseled Black Quartz Stairs
+tile.actuallyadditions.blockChiseledQuartzSlab.name=Chiseled Black Quartz Slab
+tile.actuallyadditions.blockPillarQuartzWall.name=Black Quartz Pillar Wall
+tile.actuallyadditions.blockPillarQuartzStair.name=Black Quartz Pillar Stairs
+tile.actuallyadditions.blockPillarQuartzSlab.name=Black Quartz Pillar Slab
 
 #ESD
 tile.actuallyadditions.blockInputter.name=ESD
@@ -484,7 +493,7 @@ booklet.actuallyadditions.chapter.craftingIngs.text.1=<imp>Actually Additions<r>
 
 booklet.actuallyadditions.chapter.quartz.name=Black Quartz
 booklet.actuallyadditions.chapter.quartz.text.1=<item>Black Quartz<r> is an <imp>Ore<r> that generates in the world <imp>between layer <lowest> and <highest><r>. When broken, it can be <imp>smelted in a furnace<r> or <imp>crushed in a crusher<r> to get broken down into <item>Black Quartz<r>.
-booklet.actuallyadditions.chapter.quartz.text.2=<item>Black Quartz<r> items are used in lots of <imp>Crafting Recipes<r> in <imp>Actually Additions<r>. They are very important for most of the Items and, thus, should be mined when found in the world. They can be crafted into a couple of different <imp>Decorative Blocks<r> shown on the following pages. <n><n><i>Nether Quartz, but deadlier
+booklet.actuallyadditions.chapter.quartz.text.2=<item>Black Quartz<r> items are used in lots of <imp>Crafting Recipes<r> in <imp>Actually Additions<r>. They are very important for most of the Items and, thus, should be mined when found in the world. They can be crafted into a couple of different <imp>Decorative Blocks<r> shown on the following pages. <n>Every variant can also be crafted into <imp>Stairs, Slabs and Walls<r> using the well-known recipes. <n><n><i>Nether Quartz, but deadlier
 
 booklet.actuallyadditions.chapter.cloud.name=Smiley Cloud
 booklet.actuallyadditions.chapter.cloud.text.1=The <item>Smiley Cloud<r> is a magical floating cloud which is getting put to life through the piece of Solidified Experience inside it. It hovers up and down in its place all jolly and fun, and when <imp>right-clicking<r>, you can <imp>give it a name<r>. <n>When giving it certain <imp>special names<r> like <imp>"Ellpeck"<r> or <imp>"AcidBlues"<r>, it will have some special items it carries!