Add lighter slate generating higher, and deepen gen of old slate

src/main/java/steamcraft/common/blocks/BlockLightSlate.java

@@ -0,0 +1,87 @@
+/**
+ * This class was created by BrassGoggledCoders modding team.
+ * This class is available as part of the Steamcraft 2 Mod for Minecraft.
+ *
+ * Steamcraft 2 is open-source and is distributed under the MMPL v1.0 License.
+ * (http://www.mod-buildcraft.com/MMPL-1.0.txt)
+ *
+ * Steamcraft 2 is based on the original Steamcraft Mod created by Proloe.
+ * Steamcraft (c) Proloe 2011
+ * (http://www.minecraftforum.net/topic/251532-181-steamcraft-source-code-releasedmlv054wip/)
+ *
+ */
+package steamcraft.common.blocks;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import net.minecraft.client.renderer.texture.IIconRegister;
+import net.minecraft.creativetab.CreativeTabs;
+import net.minecraft.item.Item;
+import net.minecraft.item.ItemStack;
+import net.minecraft.world.World;
+
+import cpw.mods.fml.relauncher.Side;
+import cpw.mods.fml.relauncher.SideOnly;
+
+import steamcraft.common.init.InitBlocks;
+import steamcraft.common.lib.ModInfo;
+
+/**
+ * @author warlordjones
+ *
+ */
+public class BlockLightSlate extends BlockSlate
+{
+	@Override
+	@SideOnly(Side.CLIENT)
+	public void registerBlockIcons(final IIconRegister ir)
+	{
+		// Raw
+		this.icon[0] = ir.registerIcon(ModInfo.PREFIX + "blockSlateRawLightBlue");
+		this.icon[1] = ir.registerIcon(ModInfo.PREFIX + "blockSlateRawGrey");
+		this.icon[2] = ir.registerIcon(ModInfo.PREFIX + "blockSlateRawLightRed");
+		// Cobble
+		this.icon[3] = ir.registerIcon(ModInfo.PREFIX + "blockSlateCobbleLightBlue");
+		this.icon[4] = ir.registerIcon(ModInfo.PREFIX + "blockSlateCobbleGrey");
+		this.icon[5] = ir.registerIcon(ModInfo.PREFIX + "blockSlateCobbleLightRed");
+		// Brick
+		this.icon[6] = ir.registerIcon(ModInfo.PREFIX + "blockSlateBrickLightBlue");
+		this.icon[7] = ir.registerIcon(ModInfo.PREFIX + "blockSlateBrickGrey");
+		this.icon[8] = ir.registerIcon(ModInfo.PREFIX + "blockSlateBrickLightRed");
+		// Polished
+	}
+
+	@SuppressWarnings({ "rawtypes", "unchecked" })
+	@Override
+	@SideOnly(Side.CLIENT)
+	public void getSubBlocks(final Item item, final CreativeTabs tab, final List l)
+	{
+		for (int var4 = 0; var4 < this.icon.length; ++var4)
+			l.add(new ItemStack(InitBlocks.blockLightSlate, 1, var4));
+	}
+
+	@Override
+	public ArrayList<ItemStack> getDrops(World world, int x, int y, int z, int metadata, int fortune)
+	{
+		ArrayList<ItemStack> drop = new ArrayList<ItemStack>();
+
+		switch (metadata)
+		{
+		case 0:
+			drop.add(new ItemStack(InitBlocks.blockLightSlate, 1, 3));
+			break;
+		case 1:
+			drop.add(new ItemStack(InitBlocks.blockLightSlate, 1, 4));
+			break;
+		case 2:
+			drop.add(new ItemStack(InitBlocks.blockLightSlate, 1, 5));
+			break;
+		default:
+			drop.add(0, new ItemStack(InitBlocks.blockLightSlate, 1, metadata));
+			break;
+		}
+
+		return drop;
+	}
+}

src/main/java/steamcraft/common/blocks/BlockSlate.java

@@ -38,7 +38,7 @@ import steamcraft.common.lib.ModInfo;
  */
 public class BlockSlate extends BaseMetadataBlock
 {
-	private final IIcon[] icon = new IIcon[9];
+	protected final IIcon[] icon = new IIcon[9];
 
 	public BlockSlate()
 	{
@@ -46,7 +46,6 @@ public class BlockSlate extends BaseMetadataBlock
 		this.setHardness(3.0F);
 		this.setResistance(10.0F);
 		this.setStepSound(Block.soundTypeStone);
-		this.setBlockName("blockSlate");
 		this.setCreativeTab(Steamcraft.tabSC2);
 	}
 

src/main/java/steamcraft/common/init/InitBlocks.java

@@ -58,6 +58,7 @@ import steamcraft.common.blocks.BlockInfestedGrass;
 import steamcraft.common.blocks.BlockInvertedCastIronLamp;
 import steamcraft.common.blocks.BlockLamp;
 import steamcraft.common.blocks.BlockLeafPile;
+import steamcraft.common.blocks.BlockLightSlate;
 import steamcraft.common.blocks.BlockMeltingIce;
 import steamcraft.common.blocks.BlockMetal;
 import steamcraft.common.blocks.BlockMossyMetal;
@@ -205,6 +206,9 @@ public class InitBlocks
 	// TODO Meta?
 	public static Block blockSlate, blockRawBlueSlateStairs, blockRawBlackSlateStairs, blockRawRedSlateStairs, blockCobbleBlueSlateStairs,
 			blockCobbleBlackSlateStairs, blockCobbleRedSlateStairs, blockBrickBlueSlateStairs, blockBrickBlackSlateStairs, blockBrickRedSlateStairs;
+	public static Block blockLightSlate, blockRawLightBlueSlateStairs, blockRawGreySlateStairs, blockRawLightRedSlateStairs,
+			blockCobbleLightBlueSlateStairs, blockCobbleGreySlateStairs, blockCobbleLightRedSlateStairs, blockBrickLightBlueSlateStairs,
+			blockBrickGreySlateStairs, blockBrickLightRedSlateStairs;
 
 	public static Block blockStandardSiren, blockStandardSirenOn, blockAllClearSiren, blockAllClearSirenOn, blockIntruderSiren, blockIntruderSirenOn,
 			blockNuclearSiren, blockNuclearSirenOn, blockMotionSensor, blockMotionSensorOn;
@@ -397,6 +401,7 @@ public class InitBlocks
 		// Ores
 		blockCustomOre = new BlockSteamcraftOre().setBlockName("blockSteamcraftOre");
 		blockSlate = new BlockSlate().setBlockName("blockSlate");
+		blockLightSlate = new BlockLightSlate().setBlockName("blockLightSlate");
 
 		blockRawBlueSlateStairs = new BlockCustomStairs(blockSlate, 0).setBlockName("blockRawBlueSlateStairs");
 		registerBlock(blockRawBlueSlateStairs, "BlockRawBlueSlateStairs");
@@ -417,8 +422,28 @@ public class InitBlocks
 		blockBrickRedSlateStairs = new BlockCustomStairs(blockSlate, 8).setBlockName("blockBrickRedSlateStairs");
 		registerBlock(blockBrickRedSlateStairs, "BlockBrickRedSlateStairs");
 
+		blockRawLightBlueSlateStairs = new BlockCustomStairs(blockSlate, 0).setBlockName("blockRawLightBlueSlateStairs");
+		registerBlock(blockRawLightBlueSlateStairs, "BlockRawLightBlueSlateStairs");
+		blockRawGreySlateStairs = new BlockCustomStairs(blockSlate, 1).setBlockName("blockRawGreySlateStairs");
+		registerBlock(blockRawGreySlateStairs, "BlockRawGreySlateStairs");
+		blockRawLightRedSlateStairs = new BlockCustomStairs(blockSlate, 2).setBlockName("blockRawLightRedSlateStairs");
+		registerBlock(blockRawLightRedSlateStairs, "BlockRawLightRedSlateStairs");
+		blockCobbleLightBlueSlateStairs = new BlockCustomStairs(blockSlate, 3).setBlockName("blockCobbleLightBlueSlateStairs");
+		registerBlock(blockCobbleLightBlueSlateStairs, "BlockCobbleLightBlueSlateStairs");
+		blockCobbleGreySlateStairs = new BlockCustomStairs(blockSlate, 4).setBlockName("blockCobbleGreySlateStairs");
+		registerBlock(blockCobbleGreySlateStairs, "BlockCobbleGreySlateStairs");
+		blockCobbleLightRedSlateStairs = new BlockCustomStairs(blockSlate, 5).setBlockName("blockCobbleLightRedSlateStairs");
+		registerBlock(blockCobbleLightRedSlateStairs, "BlockCobbleLightRedSlateStairs");
+		blockBrickLightBlueSlateStairs = new BlockCustomStairs(blockSlate, 6).setBlockName("blockBrickLightBlueSlateStairs");
+		registerBlock(blockBrickLightBlueSlateStairs, "BlockBrickLightBlueSlateStairs");
+		blockBrickGreySlateStairs = new BlockCustomStairs(blockSlate, 7).setBlockName("blockBrickGreySlateStairs");
+		registerBlock(blockBrickGreySlateStairs, "BlockBrickGreySlateStairs");
+		blockBrickLightRedSlateStairs = new BlockCustomStairs(blockSlate, 8).setBlockName("blockBrickLightRedSlateStairs");
+		registerBlock(blockBrickLightRedSlateStairs, "BlockBrickLightRedSlateStairs");
+
 		registerBlock(blockCustomOre, BaseItemBlockWithMetadata.class, "BlockSteamcraftOre", 7);
 		registerBlock(blockSlate, BaseItemBlockWithMetadata.class, "BlockSlate", 9);
+		registerBlock(blockLightSlate, BaseItemBlockWithMetadata.class, "BlockLightSlate", 9);
 
 		// Metals
 		blockMetal = new BlockMetal().setBlockName("blockMetal");

src/main/java/steamcraft/common/worldgen/WorldGenSteamcraft.java

@@ -85,9 +85,12 @@ public class WorldGenSteamcraft implements IWorldGenerator
 
 		if (ConfigWorldGen.slateGenEnabled)
 		{
-			this.generateOre(world, random, chunkX, chunkZ, 1, 40, 70, ConfigWorldGen.slateCluster, InitBlocks.blockSlate, 0, Blocks.stone);
-			this.generateOre(world, random, chunkX, chunkZ, 1, 40, 70, ConfigWorldGen.slateCluster, InitBlocks.blockSlate, 1, Blocks.stone);
-			this.generateOre(world, random, chunkX, chunkZ, 1, 40, 70, ConfigWorldGen.slateCluster, InitBlocks.blockSlate, 2, Blocks.stone);
+			this.generateOre(world, random, chunkX, chunkZ, 1, 10, 40, ConfigWorldGen.slateCluster, InitBlocks.blockSlate, 0, Blocks.stone);
+			this.generateOre(world, random, chunkX, chunkZ, 1, 10, 40, ConfigWorldGen.slateCluster, InitBlocks.blockSlate, 1, Blocks.stone);
+			this.generateOre(world, random, chunkX, chunkZ, 1, 10, 40, ConfigWorldGen.slateCluster, InitBlocks.blockSlate, 2, Blocks.stone);
+			this.generateOre(world, random, chunkX, chunkZ, 1, 40, 70, ConfigWorldGen.slateCluster, InitBlocks.blockLightSlate, 0, Blocks.stone);
+			this.generateOre(world, random, chunkX, chunkZ, 1, 40, 70, ConfigWorldGen.slateCluster, InitBlocks.blockLightSlate, 1, Blocks.stone);
+			this.generateOre(world, random, chunkX, chunkZ, 1, 40, 70, ConfigWorldGen.slateCluster, InitBlocks.blockLightSlate, 2, Blocks.stone);
 		}
 
 		if (ConfigWorldGen.brassTreeGenEnabled)

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

@@ -72,6 +72,24 @@ tile.blockCobbleRedSlateStairs.name=Red Slate Cobblestone Stairs
 tile.blockBrickBlueSlateStairs.name=Blue Slate Brick Stairs
 tile.blockBrickBlackSlateStairs.name=Black Slate Brick Stairs
 tile.blockBrickRedSlateStairs.name=Red Slate Brick Stairs
+tile.blockLightSlate.0.name=Light Blue Slate
+tile.blockLightSlate.1.name=Grey Slate
+tile.blockLightSlate.2.name=Light Red Slate
+tile.blockLightSlate.3.name=Light Blue Slate Cobblestone
+tile.blockLightSlate.4.name=Grey Slate Cobblestone
+tile.blockLightSlate.5.name=Light Red Slate Cobblestone
+tile.blockLightSlate.6.name=Light Blue Slate Bricks
+tile.blockLightSlate.7.name=Grey Slate Bricks
+tile.blockLightSlate.8.name=Light Red Slate Bricks
+tile.blockRawLightBlueSlateStairs.name=Light Blue Slate Raw Stairs
+tile.blockRawGreySlateStairs.name=Grey Slate Raw Stairs
+tile.blockRawLightRedSlateStairs.name=Light Red Slate Raw Stairs
+tile.blockCobbleLightBlueSlateStairs.name=Light Blue Slate Cobblestone Stairs
+tile.blockCobbleGreySlateStairs.name=Grey Slate Cobblestone Stairs
+tile.blockCobbleLightRedSlateStairs.name=Light Red Slate Cobblestone Stairs
+tile.blockBrickLightBlueSlateStairs.name=Light Blue Slate Brick Stairs
+tile.blockBrickGreySlateStairs.name=Grey Slate Brick Stairs
+tile.blockBrickLightRedSlateStairs.name=Light Red Slate Brick Stairs
 tile.blockTimeBomb.name=Time Bomb
 tile.blockFlesh.name=Block of Flesh
 tile.blockCongealedSlime.name=Congealed Slime Block