Added sapphire gem, changed Ancient Staff stuff to use it, added gems to mineshaft and dungeon chest loot.

src/minecraft/biomesoplenty/api/BlockReferences.java

@@ -131,6 +131,8 @@ public class BlockReferences {
 		tanzaniteBlock (Blocks.amethystOre, 9),
 		apatiteOre (Blocks.amethystOre, 10),
 		apatiteBlock (Blocks.amethystOre, 11),
+		sapphireOre (Blocks.amethystOre, 12),
+		sapphireBlock (Blocks.amethystOre, 13),
 
 		smallBoneSegment (Blocks.bones, 0),
 		mediumBoneSegment (Blocks.bones, 1),

src/minecraft/biomesoplenty/biomes/BiomeGenBeachGravel.java

@@ -1,7 +1,11 @@
 package biomesoplenty.biomes;
 
+import java.util.Random;
+
 import net.minecraft.block.Block;
+import net.minecraft.world.World;
 import net.minecraft.world.biome.BiomeGenBase;
+import biomesoplenty.api.Blocks;
 
 public class BiomeGenBeachGravel extends BiomeGenBase
 {
@@ -16,4 +20,24 @@ public class BiomeGenBeachGravel extends BiomeGenBase
 		theBiomeDecorator.reedsPerChunk = -999;
 		theBiomeDecorator.cactiPerChunk = -999;
 	}
+	
+	@Override
+	public void decorate(World par1World, Random par2Random, int par3, int par4)
+	{
+		super.decorate(par1World, par2Random, par3, par4);
+		int var5 = 12 + par2Random.nextInt(6);
+
+		for (int var6 = 0; var6 < var5; ++var6)
+		{
+			int var7 = par3 + par2Random.nextInt(16);
+			int var8 = par2Random.nextInt(28) + 4;
+			int var9 = par4 + par2Random.nextInt(16);
+			int var10 = par1World.getBlockId(var7, var8, var9);
+
+			if (var10 == Block.stone.blockID)
+			{
+				par1World.setBlock(var7, var8, var9, Blocks.amethystOre.get().blockID, 12, 2);
+			}
+		}
+	}
 }

src/minecraft/biomesoplenty/biomes/BiomeGenBeachOvergrown.java

@@ -3,10 +3,12 @@ package biomesoplenty.biomes;
 import java.util.Random;
 
 import net.minecraft.block.Block;
+import net.minecraft.world.World;
 import net.minecraft.world.biome.BiomeGenBase;
 import net.minecraft.world.gen.feature.WorldGenerator;
 import biomesoplenty.worldgen.WorldGenChaparral2;
 import biomesoplenty.worldgen.WorldGenChaparral3;
+import biomesoplenty.api.Blocks;
 
 public class BiomeGenBeachOvergrown extends BiomeGenBase
 {
@@ -26,6 +28,26 @@ public class BiomeGenBeachOvergrown extends BiomeGenBase
 		theBiomeDecorator.cactiPerChunk = 10;
 		customBiomeDecorator.outbackPerChunk = 7;
 	}
+	
+	@Override
+	public void decorate(World par1World, Random par2Random, int par3, int par4)
+	{
+		super.decorate(par1World, par2Random, par3, par4);
+		int var5 = 12 + par2Random.nextInt(6);
+
+		for (int var6 = 0; var6 < var5; ++var6)
+		{
+			int var7 = par3 + par2Random.nextInt(16);
+			int var8 = par2Random.nextInt(28) + 4;
+			int var9 = par4 + par2Random.nextInt(16);
+			int var10 = par1World.getBlockId(var7, var8, var9);
+
+			if (var10 == Block.stone.blockID)
+			{
+				par1World.setBlock(var7, var8, var9, Blocks.amethystOre.get().blockID, 12, 2);
+			}
+		}
+	}
 
 	/**
 	 * Gets a WorldGen appropriate for this biome.

src/minecraft/biomesoplenty/biomes/BiomeGenCrag.java

@@ -1,7 +1,10 @@
 package biomesoplenty.biomes;
 
+import java.util.Random;
 import java.awt.Color;
 
+import net.minecraft.block.Block;
+import net.minecraft.world.World;
 import net.minecraft.world.biome.BiomeGenBase;
 import biomesoplenty.api.Blocks;
 import biomesoplenty.configuration.BOPConfiguration;
@@ -22,6 +25,26 @@ public class BiomeGenCrag extends BiomeGenBase
 		fillerBlock = (byte)Blocks.cragRock.get().blockID;
 		waterColorMultiplier = 944693;
 	}
+	
+	@Override
+	public void decorate(World par1World, Random par2Random, int par3, int par4)
+	{
+		super.decorate(par1World, par2Random, par3, par4);
+		int var5 = 12 + par2Random.nextInt(6);
+
+		for (int var6 = 0; var6 < var5; ++var6)
+		{
+			int var7 = par3 + par2Random.nextInt(16);
+			int var8 = par2Random.nextInt(28) + 4;
+			int var9 = par4 + par2Random.nextInt(16);
+			int var10 = par1World.getBlockId(var7, var8, var9);
+
+			if (var10 == Block.stone.blockID)
+			{
+				par1World.setBlock(var7, var8, var9, Blocks.amethystOre.get().blockID, 12, 2);
+			}
+		}
+	}
 
 	/**
 	 * takes temperature, returns color

src/minecraft/biomesoplenty/biomes/BiomeGenHotSprings.java

@@ -3,10 +3,12 @@ package biomesoplenty.biomes;
 import java.util.Random;
 
 import net.minecraft.block.Block;
+import net.minecraft.world.World;
 import net.minecraft.world.biome.BiomeGenBase;
 import net.minecraft.world.gen.feature.WorldGenerator;
 import biomesoplenty.worldgen.WorldGenPineTree;
 import biomesoplenty.worldgen.WorldGenTaiga6;
+import biomesoplenty.api.Blocks;
 
 public class BiomeGenHotSprings extends BiomeGenBase
 {
@@ -25,6 +27,26 @@ public class BiomeGenHotSprings extends BiomeGenBase
 		customBiomeDecorator.hotSpringsPerChunk = 25;
 		customBiomeDecorator.lavaLakesPerChunk = 5;
 	}
+	
+	@Override
+	public void decorate(World par1World, Random par2Random, int par3, int par4)
+	{
+		super.decorate(par1World, par2Random, par3, par4);
+		int var5 = 12 + par2Random.nextInt(6);
+
+		for (int var6 = 0; var6 < var5; ++var6)
+		{
+			int var7 = par3 + par2Random.nextInt(16);
+			int var8 = par2Random.nextInt(28) + 4;
+			int var9 = par4 + par2Random.nextInt(16);
+			int var10 = par1World.getBlockId(var7, var8, var9);
+
+			if (var10 == Block.stone.blockID)
+			{
+				par1World.setBlock(var7, var8, var9, Blocks.amethystOre.get().blockID, 12, 2);
+			}
+		}
+	}
 
 	/**
 	 * Gets a WorldGen appropriate for this biome.

src/minecraft/biomesoplenty/biomes/BiomeGenMangrove.java

@@ -46,7 +46,7 @@ public class BiomeGenMangrove extends BiomeGenBase
 
 			if (var10 == Block.stone.blockID)
 			{
-				par1World.setBlock(var7, var8, var9, Blocks.amethystOre.get().blockID, 6, 2);
+				par1World.setBlock(var7, var8, var9, Blocks.amethystOre.get().blockID, 12, 2);
 			}
 		}
 	}

src/minecraft/biomesoplenty/biomes/BiomeGenMarsh.java

@@ -48,7 +48,7 @@ public class BiomeGenMarsh extends BiomeGenBase
 
 			if (var100 == Block.stone.blockID)
 			{
-				par1World.setBlock(var77, var88, var99, Blocks.amethystOre.get().blockID, 10, 2);
+				par1World.setBlock(var77, var88, var99, Blocks.amethystOre.get().blockID, 12, 2);
 			}
 		}
 

src/minecraft/biomesoplenty/biomes/BiomeGenOceanCoral.java

@@ -30,7 +30,7 @@ public class BiomeGenOceanCoral extends BiomeGenBase
 
 			if (var10 == Block.stone.blockID)
 			{
-				par1World.setBlock(var7, var8, var9, Blocks.amethystOre.get().blockID, 6, 2);
+				par1World.setBlock(var7, var8, var9, Blocks.amethystOre.get().blockID, 12, 2);
 			}
 		}
 	}

src/minecraft/biomesoplenty/biomes/BiomeGenOceanKelp.java

@@ -37,7 +37,7 @@ public class BiomeGenOceanKelp extends BiomeGenBase
 
 			if (var10 == Block.stone.blockID)
 			{
-				par1World.setBlock(var7, var8, var9, Blocks.amethystOre.get().blockID, 6, 2);
+				par1World.setBlock(var7, var8, var9, Blocks.amethystOre.get().blockID, 12, 2);
 			}
 		}
 	}

src/minecraft/biomesoplenty/biomes/BiomeGenSacredSprings.java

@@ -58,7 +58,7 @@ public class BiomeGenSacredSprings extends BiomeGenBase
 
 			if (var100 == Block.stone.blockID)
 			{
-				par1World.setBlock(var77, var88, var99, Blocks.amethystOre.get().blockID, 6, 2);
+				par1World.setBlock(var77, var88, var99, Blocks.amethystOre.get().blockID, 12, 2);
 			}
 		}
 

src/minecraft/biomesoplenty/blocks/BlockBOPAmethyst.java

@@ -17,7 +17,7 @@ import biomesoplenty.api.Items;
 
 public class BlockBOPAmethyst extends Block
 {
-	private static final String[] types = new String[] {"amethystore", "amethystblock", "rubyore", "rubyblock", "peridotore", "peridotblock", "topazore", "topazblock", "tanzaniteore", "tanzaniteblock", "apatiteore", "apatiteblock"};
+	private static final String[] types = new String[] {"amethystore", "amethystblock", "rubyore", "rubyblock", "peridotore", "peridotblock", "topazore", "topazblock", "tanzaniteore", "tanzaniteblock", "apatiteore", "apatiteblock", "sapphireore", "sapphireblock"};
 	private Icon[] textures;
 
 	public BlockBOPAmethyst(int par1, Material par2Material)
@@ -115,6 +115,14 @@ public class BlockBOPAmethyst extends Block
 		case 11:
 			hardness = 5.0F;
 			break;
+			
+		case 12:
+			hardness = 3.0F;
+			break;
+
+		case 13:
+			hardness = 5.0F;
+			break;
 		}
 
 		return hardness;
@@ -175,6 +183,14 @@ public class BlockBOPAmethyst extends Block
 		case 11:
 			resistance = 10.0F;
 			break;
+			
+		case 12:
+			resistance = 5.0F;
+			break;
+
+		case 13:
+			resistance = 10.0F;
+			break;
 		}
 
 		return resistance / 5.0F;
@@ -231,6 +247,14 @@ public class BlockBOPAmethyst extends Block
 		{
 			return this.blockID;
 		}
+		if (meta == 12)
+		{
+			return Items.miscItems.get().itemID;
+		}
+		if (meta == 13)
+		{
+			return this.blockID;
+		}
 		
 		return this.blockID;
 	}
@@ -286,6 +310,14 @@ public class BlockBOPAmethyst extends Block
 		{
 			return meta;
 		}
+		if (meta == 12)
+		{
+			return 15;
+		}
+		if (meta == 13)
+		{
+			return meta;
+		}
 		
 		return meta;
 	}
@@ -341,6 +373,14 @@ public class BlockBOPAmethyst extends Block
 		{
 			return quantityDropped(random);
 		}
+		if (meta == 12)
+		{
+			return quantityDroppedWithBonus(fortune, random);
+		}
+		if (meta == 13)
+		{
+			return quantityDropped(random);
+		}
 		
 		return quantityDropped(random);
 	}

src/minecraft/biomesoplenty/configuration/BOPBlocks.java

@@ -99,6 +99,7 @@ public class BOPBlocks {
 		MinecraftForge.setBlockHarvestLevel(Blocks.amethystOre.get(), 6, "pickaxe", 2);
 		MinecraftForge.setBlockHarvestLevel(Blocks.amethystOre.get(), 8, "pickaxe", 2);
 		MinecraftForge.setBlockHarvestLevel(Blocks.amethystOre.get(), 10, "pickaxe", 2);
+		MinecraftForge.setBlockHarvestLevel(Blocks.amethystOre.get(), 12, "pickaxe", 2);
 
 		addGrassPlants();
 
@@ -389,6 +390,8 @@ public class BOPBlocks {
 		LanguageRegistry.addName(new ItemStack(Blocks.amethystOre.get(), 1, 9), "Block of Tanzanite");
 		LanguageRegistry.addName(new ItemStack(Blocks.amethystOre.get(), 1, 10), "Apatite Ore");
 		LanguageRegistry.addName(new ItemStack(Blocks.amethystOre.get(), 1, 11), "Block of Apatite");
+		LanguageRegistry.addName(new ItemStack(Blocks.amethystOre.get(), 1, 12), "Sapphire Ore");
+		LanguageRegistry.addName(new ItemStack(Blocks.amethystOre.get(), 1, 13), "Block of Sapphire");
 		//        LanguageRegistry.addName(Blocks.bambooThatching.get(), "Bamboo Thatching");
 		LanguageRegistry.addName(Blocks.moss.get(), "Moss");
 		LanguageRegistry.addName(new ItemStack(Blocks.foliage.get(),1,0), "Algae");

src/minecraft/biomesoplenty/configuration/BOPCrafting.java

@@ -148,6 +148,7 @@ public class BOPCrafting
 		GameRegistry.addRecipe(new ItemStack(Blocks.amethystOre.get(), 1, 7), new Object[] {"AAA", "AAA", "AAA", 'A', new ItemStack(Items.miscItems.get(), 1, 12)});
 		GameRegistry.addRecipe(new ItemStack(Blocks.amethystOre.get(), 1, 9), new Object[] {"AAA", "AAA", "AAA", 'A', new ItemStack(Items.miscItems.get(), 1, 13)});
 		GameRegistry.addRecipe(new ItemStack(Blocks.amethystOre.get(), 1, 11), new Object[] {"AAA", "AAA", "AAA", 'A', new ItemStack(Items.miscItems.get(), 1, 14)});
+		GameRegistry.addRecipe(new ItemStack(Blocks.amethystOre.get(), 1, 13), new Object[] {"AAA", "AAA", "AAA", 'A', new ItemStack(Items.miscItems.get(), 1, 15)});
 		GameRegistry.addRecipe(new ItemStack(Blocks.ash.get(), 1), new Object[] {"AA", "AA", 'A', new ItemStack(Items.miscItems.get(), 1, 1)});
 		GameRegistry.addRecipe(new ItemStack(Blocks.mudBrick.get(), 1), new Object[] {"MM", "MM", 'M', new ItemStack(Items.miscItems.get(), 1, 0)});
 		GameRegistry.addRecipe(new ItemStack(Blocks.crystal.get(), 1), new Object[] {"CC", "CC", 'C', new ItemStack(Items.miscItems.get(), 1, 4)});
@@ -189,7 +190,7 @@ public class BOPCrafting
 		GameRegistry.addRecipe(new ItemStack(Items.ancientStaff.get(), 1, 0), new Object[] {"T", "P", "H", 'T', new ItemStack(Items.ancientStaff.get(), 1, 3), 'P', new ItemStack(Items.ancientStaff.get(), 1, 2), 'H', new ItemStack(Items.ancientStaff.get(), 1, 1)});
 		GameRegistry.addRecipe(new ItemStack(Items.ancientStaff.get(), 1, 1), new Object[] {"ETE", "EEE", "EAE", 'E', Block.whiteStone, 'T', new ItemStack(Items.miscItems.get(), 1, 13), 'A', new ItemStack(Items.miscItems.get(), 1, 14)});
 		GameRegistry.addRecipe(new ItemStack(Items.ancientStaff.get(), 1, 2), new Object[] {"EPE", "EEE", "ETE", 'E', Block.whiteStone, 'P', new ItemStack(Items.miscItems.get(), 1, 11), 'T', new ItemStack(Items.miscItems.get(), 1, 12)});
-		GameRegistry.addRecipe(new ItemStack(Items.ancientStaff.get(), 1, 3), new Object[] {" N ", "EEE", "ERE", 'E', Block.whiteStone, 'R', new ItemStack(Items.miscItems.get(), 1, 10), 'N', Item.netherStar});
+		GameRegistry.addRecipe(new ItemStack(Items.ancientStaff.get(), 1, 3), new Object[] {" N ", "ESE", "ERE", 'E', Block.whiteStone, 'R', new ItemStack(Items.miscItems.get(), 1, 10), 'S', new ItemStack(Items.miscItems.get(), 1, 15), 'N', Item.netherStar});
 		
 		GameRegistry.addShapelessRecipe(new ItemStack(Items.ancientStaff.get(), 1, 0), new ItemStack(Items.ancientStaff.get(), 1, 4), new ItemStack(Item.netherStar, 1));
 		GameRegistry.addRecipe(new ItemStack(Items.enderporter.get(), 1, 0), new Object[] {"IOI", "OAO", "IOI", 'I', Item.eyeOfEnder, 'O', Block.obsidian, 'A', new ItemStack(Blocks.amethystOre.get(), 1, 1)});
@@ -205,6 +206,12 @@ public class BOPCrafting
 		GameRegistry.addRecipe(new ItemStack(Blocks.bamboo.get(), 8), new Object [] {" #", "# ", Character.valueOf('#'), new ItemStack(Blocks.planks.get(), 1, 10)});
 		GameRegistry.addRecipe(new ItemStack(Blocks.bamboo.get(), 8), new Object [] {"# ", " #", Character.valueOf('#'), new ItemStack(Blocks.planks.get(), 1, 10)});
 		GameRegistry.addShapelessRecipe(new ItemStack(Items.miscItems.get(), 9, 2), new Object[] {new ItemStack(Blocks.amethystOre.get(), 1, 1)});
+		GameRegistry.addShapelessRecipe(new ItemStack(Items.miscItems.get(), 9, 10), new Object[] {new ItemStack(Blocks.amethystOre.get(), 1, 3)});
+		GameRegistry.addShapelessRecipe(new ItemStack(Items.miscItems.get(), 9, 11), new Object[] {new ItemStack(Blocks.amethystOre.get(), 1, 5)});
+		GameRegistry.addShapelessRecipe(new ItemStack(Items.miscItems.get(), 9, 12), new Object[] {new ItemStack(Blocks.amethystOre.get(), 1, 7)});
+		GameRegistry.addShapelessRecipe(new ItemStack(Items.miscItems.get(), 9, 13), new Object[] {new ItemStack(Blocks.amethystOre.get(), 1, 9)});
+		GameRegistry.addShapelessRecipe(new ItemStack(Items.miscItems.get(), 9, 14), new Object[] {new ItemStack(Blocks.amethystOre.get(), 1, 11)});
+		GameRegistry.addShapelessRecipe(new ItemStack(Items.miscItems.get(), 9, 15), new Object[] {new ItemStack(Blocks.amethystOre.get(), 1, 13)});
 
 		//Bone Segments > Bonemeal
 		GameRegistry.addShapelessRecipe(new ItemStack(Item.dyePowder, 3, 15), new Object[] {new ItemStack(Blocks.bones.get(), 1, 0)});

src/minecraft/biomesoplenty/configuration/BOPItems.java

@@ -169,6 +169,7 @@ public class BOPItems {
 		LanguageRegistry.addName(new ItemStack(Items.miscItems.get(), 1, 12), "Topaz");
 		LanguageRegistry.addName(new ItemStack(Items.miscItems.get(), 1, 13), "Tanzanite");
 		LanguageRegistry.addName(new ItemStack(Items.miscItems.get(), 1, 14), "Apatite");
+		LanguageRegistry.addName(new ItemStack(Items.miscItems.get(), 1, 15), "Sapphire");
 
 		LanguageRegistry.addName(Items.pickaxeMud.get(), "Muddy Pickaxe");
 		LanguageRegistry.addName(Items.axeMud.get(), "Muddy Axe");

src/minecraft/biomesoplenty/configuration/BOPVanillaCompat.java

@@ -30,8 +30,20 @@ public class BOPVanillaCompat {
 		village = ChestGenHooks.getInfo(ChestGenHooks.VILLAGE_BLACKSMITH);
 
 		dungeon.addItem(new WeightedRandomChestContent(new ItemStack(Items.bopDisc.get()), 1, 1, 2));
+		dungeon.addItem(new WeightedRandomChestContent(new ItemStack(Items.miscItems.get(), 1, 10), 1, 2, 5));
+		dungeon.addItem(new WeightedRandomChestContent(new ItemStack(Items.miscItems.get(), 1, 11), 1, 2, 5));
+		dungeon.addItem(new WeightedRandomChestContent(new ItemStack(Items.miscItems.get(), 1, 12), 1, 2, 5));
+		dungeon.addItem(new WeightedRandomChestContent(new ItemStack(Items.miscItems.get(), 1, 13), 1, 2, 5));
+		dungeon.addItem(new WeightedRandomChestContent(new ItemStack(Items.miscItems.get(), 1, 14), 1, 2, 5));
+		dungeon.addItem(new WeightedRandomChestContent(new ItemStack(Items.miscItems.get(), 1, 15), 1, 2, 5));
 
 		mineshaft.addItem(new WeightedRandomChestContent(new ItemStack(Items.miscItems.get(), 1, 1), 2, 8, 25));
+		mineshaft.addItem(new WeightedRandomChestContent(new ItemStack(Items.miscItems.get(), 1, 10), 1, 3, 10));
+		mineshaft.addItem(new WeightedRandomChestContent(new ItemStack(Items.miscItems.get(), 1, 11), 1, 3, 10));
+		mineshaft.addItem(new WeightedRandomChestContent(new ItemStack(Items.miscItems.get(), 1, 12), 1, 3, 10));
+		mineshaft.addItem(new WeightedRandomChestContent(new ItemStack(Items.miscItems.get(), 1, 13), 1, 3, 10));
+		mineshaft.addItem(new WeightedRandomChestContent(new ItemStack(Items.miscItems.get(), 1, 14), 1, 3, 10));
+		mineshaft.addItem(new WeightedRandomChestContent(new ItemStack(Items.miscItems.get(), 1, 15), 1, 3, 10));
 		mineshaft.addItem(new WeightedRandomChestContent(new ItemStack(Blocks.plants.get(),1,5), 4, 6, 15));
 
 		strongholdCorridor.addItem(new WeightedRandomChestContent(new ItemStack(Blocks.flowers.get(),1,3), 1, 4, 25));

src/minecraft/biomesoplenty/items/ItemBOP.java

@@ -17,7 +17,7 @@ import cpw.mods.fml.relauncher.SideOnly;
 
 public class ItemBOP extends Item
 {
-	private static String[] items = {"mudbrick", "ash", "amethyst", "poison", "crystalshard", "bluedye", "browndye", "greendye", "whitedye", "blackdye", "ruby", "peridot", "topaz", "tanzanite", "apatite"};
+	private static String[] items = {"mudbrick", "ash", "amethyst", "poison", "crystalshard", "bluedye", "browndye", "greendye", "whitedye", "blackdye", "ruby", "peridot", "topaz", "tanzanite", "apatite", "sapphire"};
 	@SideOnly(Side.CLIENT)
 	private Icon[] textures;
 

src/minecraft/biomesoplenty/items/ItemBOPAmethyst.java

@@ -5,7 +5,7 @@ import net.minecraft.item.ItemStack;
 
 public class ItemBOPAmethyst extends ItemBlock
 {
-	private static final String[] types = new String[] {"amethystore", "amethystblock", "rubyore", "rubyblock", "peridotore", "peridotblock", "topazore", "topazblock", "tanzaniteore", "tanzaniteblock", "apatiteore", "apatiteblock"};
+	private static final String[] types = new String[] {"amethystore", "amethystblock", "rubyore", "rubyblock", "peridotore", "peridotblock", "topazore", "topazblock", "tanzaniteore", "tanzaniteblock", "apatiteore", "apatiteblock", "sapphireore", "sapphireblock"};
 
 	public ItemBOPAmethyst(int par1)
 	{