From 63aa5d6a58ef1a18d18e5cf5c5d2962ff0b615d1 Mon Sep 17 00:00:00 2001 From: Adubbz Date: Fri, 20 Sep 2013 16:34:16 +1000 Subject: [PATCH] Switched to checking isGenMineableReplaceable rather than for only the Stone blockID --- common/biomesoplenty/biomes/BiomeGenAlps.java | 2 +- common/biomesoplenty/biomes/BiomeGenAlpsBase.java | 2 +- common/biomesoplenty/biomes/BiomeGenAlpsForest.java | 2 +- common/biomesoplenty/biomes/BiomeGenArctic.java | 2 +- common/biomesoplenty/biomes/BiomeGenBadlands.java | 2 +- common/biomesoplenty/biomes/BiomeGenBambooForest.java | 2 +- common/biomesoplenty/biomes/BiomeGenBirchForest.java | 2 +- common/biomesoplenty/biomes/BiomeGenBorealForest.java | 2 +- common/biomesoplenty/biomes/BiomeGenCanyon.java | 2 +- common/biomesoplenty/biomes/BiomeGenCanyonRavine.java | 2 +- common/biomesoplenty/biomes/BiomeGenChaparral.java | 2 +- common/biomesoplenty/biomes/BiomeGenCherryBlossomGrove.java | 2 +- common/biomesoplenty/biomes/BiomeGenConiferousForest.java | 2 +- common/biomesoplenty/biomes/BiomeGenConiferousForestSnow.java | 2 +- common/biomesoplenty/biomes/BiomeGenCrag.java | 2 +- common/biomesoplenty/biomes/BiomeGenDeadForestSnow.java | 2 +- common/biomesoplenty/biomes/BiomeGenDeadSwamp.java | 2 +- common/biomesoplenty/biomes/BiomeGenDeciduousForest.java | 2 +- common/biomesoplenty/biomes/BiomeGenDunes.java | 2 +- common/biomesoplenty/biomes/BiomeGenField.java | 2 +- common/biomesoplenty/biomes/BiomeGenFieldForest.java | 2 +- common/biomesoplenty/biomes/BiomeGenFrostForest.java | 2 +- common/biomesoplenty/biomes/BiomeGenGarden.java | 2 +- common/biomesoplenty/biomes/BiomeGenGlacier.java | 2 +- common/biomesoplenty/biomes/BiomeGenGrassland.java | 2 +- common/biomesoplenty/biomes/BiomeGenGrove.java | 2 +- common/biomesoplenty/biomes/BiomeGenHeathland.java | 2 +- common/biomesoplenty/biomes/BiomeGenHighland.java | 2 +- common/biomesoplenty/biomes/BiomeGenHotSprings.java | 2 +- common/biomesoplenty/biomes/BiomeGenIcyHills.java | 2 +- common/biomesoplenty/biomes/BiomeGenJadeCliffs.java | 2 +- common/biomesoplenty/biomes/BiomeGenLushSwamp.java | 2 +- common/biomesoplenty/biomes/BiomeGenMangrove.java | 2 +- common/biomesoplenty/biomes/BiomeGenMapleWoods.java | 2 +- common/biomesoplenty/biomes/BiomeGenMeadow.java | 2 +- common/biomesoplenty/biomes/BiomeGenMeadowForest.java | 2 +- common/biomesoplenty/biomes/BiomeGenMesa.java | 2 +- common/biomesoplenty/biomes/BiomeGenMoor.java | 2 +- common/biomesoplenty/biomes/BiomeGenMountain.java | 2 +- common/biomesoplenty/biomes/BiomeGenOasis.java | 2 +- common/biomesoplenty/biomes/BiomeGenOrchard.java | 2 +- common/biomesoplenty/biomes/BiomeGenOutback.java | 2 +- common/biomesoplenty/biomes/BiomeGenPasture.java | 2 +- common/biomesoplenty/biomes/BiomeGenPastureMeadow.java | 2 +- common/biomesoplenty/biomes/BiomeGenPastureThin.java | 2 +- common/biomesoplenty/biomes/BiomeGenPolar.java | 2 +- common/biomesoplenty/biomes/BiomeGenPrairie.java | 2 +- common/biomesoplenty/biomes/BiomeGenQuagmire.java | 2 +- common/biomesoplenty/biomes/BiomeGenRainforest.java | 2 +- common/biomesoplenty/biomes/BiomeGenRedwoodForest.java | 2 +- common/biomesoplenty/biomes/BiomeGenSavanna.java | 2 +- common/biomesoplenty/biomes/BiomeGenSavannaPlateau.java | 2 +- common/biomesoplenty/biomes/BiomeGenScrubland.java | 2 +- common/biomesoplenty/biomes/BiomeGenSeasonalForest.java | 2 +- common/biomesoplenty/biomes/BiomeGenSeasonalSpruceForest.java | 2 +- common/biomesoplenty/biomes/BiomeGenShrubland.java | 2 +- common/biomesoplenty/biomes/BiomeGenShrublandForest.java | 2 +- common/biomesoplenty/biomes/BiomeGenSilkglades.java | 2 +- common/biomesoplenty/biomes/BiomeGenSludgepit.java | 2 +- common/biomesoplenty/biomes/BiomeGenSpruceWoods.java | 2 +- common/biomesoplenty/biomes/BiomeGenSteppe.java | 2 +- common/biomesoplenty/biomes/BiomeGenTemperateRainforest.java | 2 +- common/biomesoplenty/biomes/BiomeGenTimber.java | 2 +- common/biomesoplenty/biomes/BiomeGenTimberThin.java | 2 +- common/biomesoplenty/biomes/BiomeGenTropicalRainforest.java | 2 +- common/biomesoplenty/biomes/BiomeGenTropics.java | 2 +- common/biomesoplenty/biomes/BiomeGenTundra.java | 2 +- common/biomesoplenty/biomes/BiomeGenWoodland.java | 2 +- common/biomesoplenty/biomes/ocean/BiomeGenOceanAbyss.java | 2 +- common/biomesoplenty/biomes/ocean/BiomeGenOceanCoral.java | 2 +- common/biomesoplenty/biomes/ocean/BiomeGenOceanKelp.java | 2 +- common/biomesoplenty/biomes/vanilla/BiomeGenForestNew.java | 2 +- common/biomesoplenty/biomes/vanilla/BiomeGenHillsNew.java | 2 +- common/biomesoplenty/biomes/vanilla/BiomeGenPlainsNew.java | 2 +- common/biomesoplenty/biomes/vanilla/BiomeGenTaigaNew.java | 2 +- 75 files changed, 75 insertions(+), 75 deletions(-) diff --git a/common/biomesoplenty/biomes/BiomeGenAlps.java b/common/biomesoplenty/biomes/BiomeGenAlps.java index e27eb2d4d..ac3869088 100644 --- a/common/biomesoplenty/biomes/BiomeGenAlps.java +++ b/common/biomesoplenty/biomes/BiomeGenAlps.java @@ -39,7 +39,7 @@ public class BiomeGenAlps extends BiomeGenBase int var9 = par4 + par2Random.nextInt(16); int var10 = par1World.getBlockId(var7, var8, var9); - if (var10 == Block.stone.blockID) + if (Block.blocksList[var10].isGenMineableReplaceable(par1World, var7, var8, var9, Block.stone.blockID)) { par1World.setBlock(var7, var8, var9, Blocks.amethystOre.get().blockID, 8, 2); } diff --git a/common/biomesoplenty/biomes/BiomeGenAlpsBase.java b/common/biomesoplenty/biomes/BiomeGenAlpsBase.java index e1ef9bd7a..a3bcefdf6 100644 --- a/common/biomesoplenty/biomes/BiomeGenAlpsBase.java +++ b/common/biomesoplenty/biomes/BiomeGenAlpsBase.java @@ -38,7 +38,7 @@ public class BiomeGenAlpsBase extends BiomeGenBase int var9 = par4 + par2Random.nextInt(16); int var10 = par1World.getBlockId(var7, var8, var9); - if (var10 == Block.stone.blockID) + if (Block.blocksList[var10].isGenMineableReplaceable(par1World, var7, var8, var9, Block.stone.blockID)) { par1World.setBlock(var7, var8, var9, Blocks.amethystOre.get().blockID, 8, 2); } diff --git a/common/biomesoplenty/biomes/BiomeGenAlpsForest.java b/common/biomesoplenty/biomes/BiomeGenAlpsForest.java index 812501445..04e85cb75 100644 --- a/common/biomesoplenty/biomes/BiomeGenAlpsForest.java +++ b/common/biomesoplenty/biomes/BiomeGenAlpsForest.java @@ -40,7 +40,7 @@ public class BiomeGenAlpsForest extends BiomeGenBase int var9 = par4 + par2Random.nextInt(16); int var10 = par1World.getBlockId(var7, var8, var9); - if (var10 == Block.stone.blockID) + if (Block.blocksList[var10].isGenMineableReplaceable(par1World, var7, var8, var9, Block.stone.blockID)) { par1World.setBlock(var7, var8, var9, Blocks.amethystOre.get().blockID, 8, 2); } diff --git a/common/biomesoplenty/biomes/BiomeGenArctic.java b/common/biomesoplenty/biomes/BiomeGenArctic.java index 6c33dacd4..d00e05111 100644 --- a/common/biomesoplenty/biomes/BiomeGenArctic.java +++ b/common/biomesoplenty/biomes/BiomeGenArctic.java @@ -37,7 +37,7 @@ public class BiomeGenArctic extends BiomeGenBase int var9 = par4 + par2Random.nextInt(16); int var10 = par1World.getBlockId(var7, var8, var9); - if (var10 == Block.stone.blockID) + if (Block.blocksList[var10].isGenMineableReplaceable(par1World, var7, var8, var9, Block.stone.blockID)) { par1World.setBlock(var7, var8, var9, Blocks.amethystOre.get().blockID, 8, 2); } diff --git a/common/biomesoplenty/biomes/BiomeGenBadlands.java b/common/biomesoplenty/biomes/BiomeGenBadlands.java index bdd150e57..be557e0a7 100644 --- a/common/biomesoplenty/biomes/BiomeGenBadlands.java +++ b/common/biomesoplenty/biomes/BiomeGenBadlands.java @@ -45,7 +45,7 @@ public class BiomeGenBadlands extends BiomeGenBase int var9 = par4 + par2Random.nextInt(16); int var10 = par1World.getBlockId(var7, var8, var9); - if (var10 == Block.stone.blockID) + if (Block.blocksList[var10].isGenMineableReplaceable(par1World, var7, var8, var9, Block.stone.blockID)) { par1World.setBlock(var7, var8, var9, Blocks.amethystOre.get().blockID, 2, 2); } diff --git a/common/biomesoplenty/biomes/BiomeGenBambooForest.java b/common/biomesoplenty/biomes/BiomeGenBambooForest.java index 0d5edad9e..ae9b46c85 100644 --- a/common/biomesoplenty/biomes/BiomeGenBambooForest.java +++ b/common/biomesoplenty/biomes/BiomeGenBambooForest.java @@ -41,7 +41,7 @@ public class BiomeGenBambooForest extends BiomeGenBase int var9 = par4 + par2Random.nextInt(16); int var10 = par1World.getBlockId(var7, var8, var9); - if (var10 == Block.stone.blockID) + if (Block.blocksList[var10].isGenMineableReplaceable(par1World, var7, var8, var9, Block.stone.blockID)) { par1World.setBlock(var7, var8, var9, Blocks.amethystOre.get().blockID, 6, 2); } diff --git a/common/biomesoplenty/biomes/BiomeGenBirchForest.java b/common/biomesoplenty/biomes/BiomeGenBirchForest.java index 5452f98b2..edda9e5c3 100644 --- a/common/biomesoplenty/biomes/BiomeGenBirchForest.java +++ b/common/biomesoplenty/biomes/BiomeGenBirchForest.java @@ -56,7 +56,7 @@ public class BiomeGenBirchForest extends BiomeGenBase int var9 = par4 + par2Random.nextInt(16); int var10 = par1World.getBlockId(var7, var8, var9); - if (var10 == Block.stone.blockID) + if (Block.blocksList[var10].isGenMineableReplaceable(par1World, var7, var8, var9, Block.stone.blockID)) { par1World.setBlock(var7, var8, var9, Block.oreEmerald.blockID, 0, 2); } diff --git a/common/biomesoplenty/biomes/BiomeGenBorealForest.java b/common/biomesoplenty/biomes/BiomeGenBorealForest.java index c67231a3c..576834e41 100644 --- a/common/biomesoplenty/biomes/BiomeGenBorealForest.java +++ b/common/biomesoplenty/biomes/BiomeGenBorealForest.java @@ -61,7 +61,7 @@ public class BiomeGenBorealForest extends BiomeGenBase int var9 = par4 + par2Random.nextInt(16); int var10 = par1World.getBlockId(var7, var8, var9); - if (var10 == Block.stone.blockID) + if (Block.blocksList[var10].isGenMineableReplaceable(par1World, var7, var8, var9, Block.stone.blockID)) { par1World.setBlock(var7, var8, var9, Block.oreEmerald.blockID, 0, 2); } diff --git a/common/biomesoplenty/biomes/BiomeGenCanyon.java b/common/biomesoplenty/biomes/BiomeGenCanyon.java index 95088e632..5587fd7c4 100644 --- a/common/biomesoplenty/biomes/BiomeGenCanyon.java +++ b/common/biomesoplenty/biomes/BiomeGenCanyon.java @@ -52,7 +52,7 @@ public class BiomeGenCanyon extends BiomeGenBase int var9 = par4 + par2Random.nextInt(16); int var10 = par1World.getBlockId(var7, var8, var9); - if (var10 == Block.stone.blockID) + if (Block.blocksList[var10].isGenMineableReplaceable(par1World, var7, var8, var9, Block.stone.blockID)) { par1World.setBlock(var7, var8, var9, Blocks.amethystOre.get().blockID, 2, 2); } diff --git a/common/biomesoplenty/biomes/BiomeGenCanyonRavine.java b/common/biomesoplenty/biomes/BiomeGenCanyonRavine.java index a933cfb15..f9f2800b7 100644 --- a/common/biomesoplenty/biomes/BiomeGenCanyonRavine.java +++ b/common/biomesoplenty/biomes/BiomeGenCanyonRavine.java @@ -52,7 +52,7 @@ public class BiomeGenCanyonRavine extends BiomeGenBase int var9 = par4 + par2Random.nextInt(16); int var10 = par1World.getBlockId(var7, var8, var9); - if (var10 == Block.stone.blockID) + if (Block.blocksList[var10].isGenMineableReplaceable(par1World, var7, var8, var9, Block.stone.blockID)) { par1World.setBlock(var7, var8, var9, Blocks.amethystOre.get().blockID, 2, 2); } diff --git a/common/biomesoplenty/biomes/BiomeGenChaparral.java b/common/biomesoplenty/biomes/BiomeGenChaparral.java index 1c61fa57e..8a3e19011 100644 --- a/common/biomesoplenty/biomes/BiomeGenChaparral.java +++ b/common/biomesoplenty/biomes/BiomeGenChaparral.java @@ -47,7 +47,7 @@ public class BiomeGenChaparral extends BiomeGenBase int var9 = par4 + par2Random.nextInt(16); int var10 = par1World.getBlockId(var7, var8, var9); - if (var10 == Block.stone.blockID) + if (Block.blocksList[var10].isGenMineableReplaceable(par1World, var7, var8, var9, Block.stone.blockID)) { par1World.setBlock(var7, var8, var9, Blocks.amethystOre.get().blockID, 4, 2); } diff --git a/common/biomesoplenty/biomes/BiomeGenCherryBlossomGrove.java b/common/biomesoplenty/biomes/BiomeGenCherryBlossomGrove.java index 8504aa287..8cb4a3e5b 100644 --- a/common/biomesoplenty/biomes/BiomeGenCherryBlossomGrove.java +++ b/common/biomesoplenty/biomes/BiomeGenCherryBlossomGrove.java @@ -50,7 +50,7 @@ public class BiomeGenCherryBlossomGrove extends BiomeGenBase int var9 = par4 + par2Random.nextInt(16); int var10 = par1World.getBlockId(var7, var8, var9); - if (var10 == Block.stone.blockID) + if (Block.blocksList[var10].isGenMineableReplaceable(par1World, var7, var8, var9, Block.stone.blockID)) { par1World.setBlock(var7, var8, var9, Block.oreEmerald.blockID, 0, 2); } diff --git a/common/biomesoplenty/biomes/BiomeGenConiferousForest.java b/common/biomesoplenty/biomes/BiomeGenConiferousForest.java index 347db0440..e1faf11b1 100644 --- a/common/biomesoplenty/biomes/BiomeGenConiferousForest.java +++ b/common/biomesoplenty/biomes/BiomeGenConiferousForest.java @@ -73,7 +73,7 @@ public class BiomeGenConiferousForest extends BiomeGenBase int var9 = par4 + par2Random.nextInt(16); int var10 = par1World.getBlockId(var7, var8, var9); - if (var10 == Block.stone.blockID) + if (Block.blocksList[var10].isGenMineableReplaceable(par1World, var7, var8, var9, Block.stone.blockID)) { par1World.setBlock(var7, var8, var9, Block.oreEmerald.blockID, 0, 2); } diff --git a/common/biomesoplenty/biomes/BiomeGenConiferousForestSnow.java b/common/biomesoplenty/biomes/BiomeGenConiferousForestSnow.java index d976781e0..ec53829b9 100644 --- a/common/biomesoplenty/biomes/BiomeGenConiferousForestSnow.java +++ b/common/biomesoplenty/biomes/BiomeGenConiferousForestSnow.java @@ -41,7 +41,7 @@ public class BiomeGenConiferousForestSnow extends BiomeGenBase int var9 = par4 + par2Random.nextInt(16); int var10 = par1World.getBlockId(var7, var8, var9); - if (var10 == Block.stone.blockID) + if (Block.blocksList[var10].isGenMineableReplaceable(par1World, var7, var8, var9, Block.stone.blockID)) { par1World.setBlock(var7, var8, var9, Blocks.amethystOre.get().blockID, 8, 2); } diff --git a/common/biomesoplenty/biomes/BiomeGenCrag.java b/common/biomesoplenty/biomes/BiomeGenCrag.java index b6761b01f..a194db0d2 100644 --- a/common/biomesoplenty/biomes/BiomeGenCrag.java +++ b/common/biomesoplenty/biomes/BiomeGenCrag.java @@ -39,7 +39,7 @@ public class BiomeGenCrag extends BiomeGenBase int var9 = par4 + par2Random.nextInt(16); int var10 = par1World.getBlockId(var7, var8, var9); - if (var10 == Block.stone.blockID) + if (Block.blocksList[var10].isGenMineableReplaceable(par1World, var7, var8, var9, Block.stone.blockID)) { par1World.setBlock(var7, var8, var9, Blocks.amethystOre.get().blockID, 12, 2); } diff --git a/common/biomesoplenty/biomes/BiomeGenDeadForestSnow.java b/common/biomesoplenty/biomes/BiomeGenDeadForestSnow.java index c60d877fd..385ea6873 100644 --- a/common/biomesoplenty/biomes/BiomeGenDeadForestSnow.java +++ b/common/biomesoplenty/biomes/BiomeGenDeadForestSnow.java @@ -41,7 +41,7 @@ public class BiomeGenDeadForestSnow extends BiomeGenBase int var9 = par4 + par2Random.nextInt(16); int var10 = par1World.getBlockId(var7, var8, var9); - if (var10 == Block.stone.blockID) + if (Block.blocksList[var10].isGenMineableReplaceable(par1World, var7, var8, var9, Block.stone.blockID)) { par1World.setBlock(var7, var8, var9, Blocks.amethystOre.get().blockID, 8, 2); } diff --git a/common/biomesoplenty/biomes/BiomeGenDeadSwamp.java b/common/biomesoplenty/biomes/BiomeGenDeadSwamp.java index 2ac440355..1cc576d92 100644 --- a/common/biomesoplenty/biomes/BiomeGenDeadSwamp.java +++ b/common/biomesoplenty/biomes/BiomeGenDeadSwamp.java @@ -49,7 +49,7 @@ public class BiomeGenDeadSwamp extends BiomeGenBase int var9 = par4 + par2Random.nextInt(16); int var10 = par1World.getBlockId(var7, var8, var9); - if (var10 == Block.stone.blockID) + if (Block.blocksList[var10].isGenMineableReplaceable(par1World, var7, var8, var9, Block.stone.blockID)) { par1World.setBlock(var7, var8, var9, Blocks.amethystOre.get().blockID, 10, 2); } diff --git a/common/biomesoplenty/biomes/BiomeGenDeciduousForest.java b/common/biomesoplenty/biomes/BiomeGenDeciduousForest.java index f140f88b1..770315c9e 100644 --- a/common/biomesoplenty/biomes/BiomeGenDeciduousForest.java +++ b/common/biomesoplenty/biomes/BiomeGenDeciduousForest.java @@ -61,7 +61,7 @@ public class BiomeGenDeciduousForest extends BiomeGenBase int var9 = par4 + par2Random.nextInt(16); int var10 = par1World.getBlockId(var7, var8, var9); - if (var10 == Block.stone.blockID) + if (Block.blocksList[var10].isGenMineableReplaceable(par1World, var7, var8, var9, Block.stone.blockID)) { par1World.setBlock(var7, var8, var9, Block.oreEmerald.blockID, 0, 2); } diff --git a/common/biomesoplenty/biomes/BiomeGenDunes.java b/common/biomesoplenty/biomes/BiomeGenDunes.java index 81d853e4b..a65910e9b 100644 --- a/common/biomesoplenty/biomes/BiomeGenDunes.java +++ b/common/biomesoplenty/biomes/BiomeGenDunes.java @@ -41,7 +41,7 @@ public class BiomeGenDunes extends BiomeGenBase int var9 = par4 + par2Random.nextInt(16); int var10 = par1World.getBlockId(var7, var8, var9); - if (var10 == Block.stone.blockID) + if (Block.blocksList[var10].isGenMineableReplaceable(par1World, var7, var8, var9, Block.stone.blockID)) { par1World.setBlock(var7, var8, var9, Blocks.amethystOre.get().blockID, 2, 2); } diff --git a/common/biomesoplenty/biomes/BiomeGenField.java b/common/biomesoplenty/biomes/BiomeGenField.java index 50f67e841..7e83ecf13 100644 --- a/common/biomesoplenty/biomes/BiomeGenField.java +++ b/common/biomesoplenty/biomes/BiomeGenField.java @@ -41,7 +41,7 @@ public class BiomeGenField extends BiomeGenBase int var9 = par4 + par2Random.nextInt(16); int var10 = par1World.getBlockId(var7, var8, var9); - if (var10 == Block.stone.blockID) + if (Block.blocksList[var10].isGenMineableReplaceable(par1World, var7, var8, var9, Block.stone.blockID)) { par1World.setBlock(var7, var8, var9, Blocks.amethystOre.get().blockID, 4, 2); } diff --git a/common/biomesoplenty/biomes/BiomeGenFieldForest.java b/common/biomesoplenty/biomes/BiomeGenFieldForest.java index 1d151f5e9..973923fea 100644 --- a/common/biomesoplenty/biomes/BiomeGenFieldForest.java +++ b/common/biomesoplenty/biomes/BiomeGenFieldForest.java @@ -52,7 +52,7 @@ public class BiomeGenFieldForest extends BiomeGenBase int var9 = par4 + par2Random.nextInt(16); int var10 = par1World.getBlockId(var7, var8, var9); - if (var10 == Block.stone.blockID) + if (Block.blocksList[var10].isGenMineableReplaceable(par1World, var7, var8, var9, Block.stone.blockID)) { par1World.setBlock(var7, var8, var9, Blocks.amethystOre.get().blockID, 4, 2); } diff --git a/common/biomesoplenty/biomes/BiomeGenFrostForest.java b/common/biomesoplenty/biomes/BiomeGenFrostForest.java index 8cdd8f7a9..422a9a311 100644 --- a/common/biomesoplenty/biomes/BiomeGenFrostForest.java +++ b/common/biomesoplenty/biomes/BiomeGenFrostForest.java @@ -39,7 +39,7 @@ public class BiomeGenFrostForest extends BiomeGenBase int var9 = par4 + par2Random.nextInt(16); int var10 = par1World.getBlockId(var7, var8, var9); - if (var10 == Block.stone.blockID) + if (Block.blocksList[var10].isGenMineableReplaceable(par1World, var7, var8, var9, Block.stone.blockID)) { par1World.setBlock(var7, var8, var9, Blocks.amethystOre.get().blockID, 8, 2); } diff --git a/common/biomesoplenty/biomes/BiomeGenGarden.java b/common/biomesoplenty/biomes/BiomeGenGarden.java index a0b6098be..b497616f0 100644 --- a/common/biomesoplenty/biomes/BiomeGenGarden.java +++ b/common/biomesoplenty/biomes/BiomeGenGarden.java @@ -57,7 +57,7 @@ public class BiomeGenGarden extends BiomeGenBase int var9 = par4 + par2Random.nextInt(16); int var10 = par1World.getBlockId(var7, var8, var9); - if (var10 == Block.stone.blockID) + if (Block.blocksList[var10].isGenMineableReplaceable(par1World, var7, var8, var9, Block.stone.blockID)) { par1World.setBlock(var7, var8, var9, Blocks.amethystOre.get().blockID, 4, 2); } diff --git a/common/biomesoplenty/biomes/BiomeGenGlacier.java b/common/biomesoplenty/biomes/BiomeGenGlacier.java index bd793f78e..0f32418f2 100644 --- a/common/biomesoplenty/biomes/BiomeGenGlacier.java +++ b/common/biomesoplenty/biomes/BiomeGenGlacier.java @@ -39,7 +39,7 @@ public class BiomeGenGlacier extends BiomeGenBase int var9 = par4 + par2Random.nextInt(16); int var10 = par1World.getBlockId(var7, var8, var9); - if (var10 == Block.stone.blockID) + if (Block.blocksList[var10].isGenMineableReplaceable(par1World, var7, var8, var9, Block.stone.blockID)) { par1World.setBlock(var7, var8, var9, Blocks.amethystOre.get().blockID, 8, 2); } diff --git a/common/biomesoplenty/biomes/BiomeGenGrassland.java b/common/biomesoplenty/biomes/BiomeGenGrassland.java index f14b89485..60b502dbf 100644 --- a/common/biomesoplenty/biomes/BiomeGenGrassland.java +++ b/common/biomesoplenty/biomes/BiomeGenGrassland.java @@ -56,7 +56,7 @@ public class BiomeGenGrassland extends BiomeGenBase int var9 = par4 + par2Random.nextInt(16); int var10 = par1World.getBlockId(var7, var8, var9); - if (var10 == Block.stone.blockID) + if (Block.blocksList[var10].isGenMineableReplaceable(par1World, var7, var8, var9, Block.stone.blockID)) { par1World.setBlock(var7, var8, var9, Blocks.amethystOre.get().blockID, 4, 2); } diff --git a/common/biomesoplenty/biomes/BiomeGenGrove.java b/common/biomesoplenty/biomes/BiomeGenGrove.java index 27706c75c..d51e8f2b7 100644 --- a/common/biomesoplenty/biomes/BiomeGenGrove.java +++ b/common/biomesoplenty/biomes/BiomeGenGrove.java @@ -64,7 +64,7 @@ public class BiomeGenGrove extends BiomeGenBase int var9 = par4 + par2Random.nextInt(16); int var10 = par1World.getBlockId(var7, var8, var9); - if (var10 == Block.stone.blockID) + if (Block.blocksList[var10].isGenMineableReplaceable(par1World, var7, var8, var9, Block.stone.blockID)) { par1World.setBlock(var7, var8, var9, Block.oreEmerald.blockID, 0, 2); } diff --git a/common/biomesoplenty/biomes/BiomeGenHeathland.java b/common/biomesoplenty/biomes/BiomeGenHeathland.java index 4fd4fca1a..0012715f3 100644 --- a/common/biomesoplenty/biomes/BiomeGenHeathland.java +++ b/common/biomesoplenty/biomes/BiomeGenHeathland.java @@ -44,7 +44,7 @@ public class BiomeGenHeathland extends BiomeGenBase int var9 = par4 + par2Random.nextInt(16); int var10 = par1World.getBlockId(var7, var8, var9); - if (var10 == Block.stone.blockID) + if (Block.blocksList[var10].isGenMineableReplaceable(par1World, var7, var8, var9, Block.stone.blockID)) { par1World.setBlock(var7, var8, var9, Blocks.amethystOre.get().blockID, 4, 2); } diff --git a/common/biomesoplenty/biomes/BiomeGenHighland.java b/common/biomesoplenty/biomes/BiomeGenHighland.java index 3c4050cbd..575a23b7f 100644 --- a/common/biomesoplenty/biomes/BiomeGenHighland.java +++ b/common/biomesoplenty/biomes/BiomeGenHighland.java @@ -36,7 +36,7 @@ public class BiomeGenHighland extends BiomeGenBase int var9 = par4 + par2Random.nextInt(16); int var10 = par1World.getBlockId(var7, var8, var9); - if (var10 == Block.stone.blockID) + if (Block.blocksList[var10].isGenMineableReplaceable(par1World, var7, var8, var9, Block.stone.blockID)) { par1World.setBlock(var7, var8, var9, Block.oreEmerald.blockID, 0, 2); } diff --git a/common/biomesoplenty/biomes/BiomeGenHotSprings.java b/common/biomesoplenty/biomes/BiomeGenHotSprings.java index e3eaf65c5..af60c6878 100644 --- a/common/biomesoplenty/biomes/BiomeGenHotSprings.java +++ b/common/biomesoplenty/biomes/BiomeGenHotSprings.java @@ -41,7 +41,7 @@ public class BiomeGenHotSprings extends BiomeGenBase int var9 = par4 + par2Random.nextInt(16); int var10 = par1World.getBlockId(var7, var8, var9); - if (var10 == Block.stone.blockID) + if (Block.blocksList[var10].isGenMineableReplaceable(par1World, var7, var8, var9, Block.stone.blockID)) { par1World.setBlock(var7, var8, var9, Blocks.amethystOre.get().blockID, 12, 2); } diff --git a/common/biomesoplenty/biomes/BiomeGenIcyHills.java b/common/biomesoplenty/biomes/BiomeGenIcyHills.java index 6ddb761fe..57c1ad6b3 100644 --- a/common/biomesoplenty/biomes/BiomeGenIcyHills.java +++ b/common/biomesoplenty/biomes/BiomeGenIcyHills.java @@ -45,7 +45,7 @@ public class BiomeGenIcyHills extends BiomeGenBase int var9 = par4 + par2Random.nextInt(16); int var10 = par1World.getBlockId(var7, var8, var9); - if (var10 == Block.stone.blockID) + if (Block.blocksList[var10].isGenMineableReplaceable(par1World, var7, var8, var9, Block.stone.blockID)) { par1World.setBlock(var7, var8, var9, Blocks.amethystOre.get().blockID, 8, 2); } diff --git a/common/biomesoplenty/biomes/BiomeGenJadeCliffs.java b/common/biomesoplenty/biomes/BiomeGenJadeCliffs.java index da6a182c0..70cc71fa3 100644 --- a/common/biomesoplenty/biomes/BiomeGenJadeCliffs.java +++ b/common/biomesoplenty/biomes/BiomeGenJadeCliffs.java @@ -38,7 +38,7 @@ public class BiomeGenJadeCliffs extends BiomeGenBase int var9 = par4 + par2Random.nextInt(16); int var10 = par1World.getBlockId(var7, var8, var9); - if (var10 == Block.stone.blockID) + if (Block.blocksList[var10].isGenMineableReplaceable(par1World, var7, var8, var9, Block.stone.blockID)) { par1World.setBlock(var7, var8, var9, Block.oreEmerald.blockID, 0, 2); } diff --git a/common/biomesoplenty/biomes/BiomeGenLushSwamp.java b/common/biomesoplenty/biomes/BiomeGenLushSwamp.java index 5b4e74d5d..c9d6891fd 100644 --- a/common/biomesoplenty/biomes/BiomeGenLushSwamp.java +++ b/common/biomesoplenty/biomes/BiomeGenLushSwamp.java @@ -48,7 +48,7 @@ public class BiomeGenLushSwamp extends BiomeGenBase int var9 = par4 + par2Random.nextInt(16); int var10 = par1World.getBlockId(var7, var8, var9); - if (var10 == Block.stone.blockID) + if (Block.blocksList[var10].isGenMineableReplaceable(par1World, var7, var8, var9, Block.stone.blockID)) { par1World.setBlock(var7, var8, var9, Blocks.amethystOre.get().blockID, 10, 2); } diff --git a/common/biomesoplenty/biomes/BiomeGenMangrove.java b/common/biomesoplenty/biomes/BiomeGenMangrove.java index b57ccb534..d96e37340 100644 --- a/common/biomesoplenty/biomes/BiomeGenMangrove.java +++ b/common/biomesoplenty/biomes/BiomeGenMangrove.java @@ -44,7 +44,7 @@ public class BiomeGenMangrove extends BiomeGenBase int var9 = par4 + par2Random.nextInt(16); int var10 = par1World.getBlockId(var7, var8, var9); - if (var10 == Block.stone.blockID) + if (Block.blocksList[var10].isGenMineableReplaceable(par1World, var7, var8, var9, Block.stone.blockID)) { par1World.setBlock(var7, var8, var9, Blocks.amethystOre.get().blockID, 12, 2); } diff --git a/common/biomesoplenty/biomes/BiomeGenMapleWoods.java b/common/biomesoplenty/biomes/BiomeGenMapleWoods.java index 6703ef035..c28cb6120 100644 --- a/common/biomesoplenty/biomes/BiomeGenMapleWoods.java +++ b/common/biomesoplenty/biomes/BiomeGenMapleWoods.java @@ -46,7 +46,7 @@ public class BiomeGenMapleWoods extends BiomeGenBase int var9 = par4 + par2Random.nextInt(16); int var10 = par1World.getBlockId(var7, var8, var9); - if (var10 == Block.stone.blockID) + if (Block.blocksList[var10].isGenMineableReplaceable(par1World, var7, var8, var9, Block.stone.blockID)) { par1World.setBlock(var7, var8, var9, Block.oreEmerald.blockID, 0, 2); } diff --git a/common/biomesoplenty/biomes/BiomeGenMeadow.java b/common/biomesoplenty/biomes/BiomeGenMeadow.java index ca53abccd..b44b9d6c2 100644 --- a/common/biomesoplenty/biomes/BiomeGenMeadow.java +++ b/common/biomesoplenty/biomes/BiomeGenMeadow.java @@ -47,7 +47,7 @@ public class BiomeGenMeadow extends BiomeGenBase int var9 = par4 + par2Random.nextInt(16); int var10 = par1World.getBlockId(var7, var8, var9); - if (var10 == Block.stone.blockID) + if (Block.blocksList[var10].isGenMineableReplaceable(par1World, var7, var8, var9, Block.stone.blockID)) { par1World.setBlock(var7, var8, var9, Blocks.amethystOre.get().blockID, 4, 2); } diff --git a/common/biomesoplenty/biomes/BiomeGenMeadowForest.java b/common/biomesoplenty/biomes/BiomeGenMeadowForest.java index 78903bd09..5495506b4 100644 --- a/common/biomesoplenty/biomes/BiomeGenMeadowForest.java +++ b/common/biomesoplenty/biomes/BiomeGenMeadowForest.java @@ -42,7 +42,7 @@ public class BiomeGenMeadowForest extends BiomeGenBase int var9 = par4 + par2Random.nextInt(16); int var10 = par1World.getBlockId(var7, var8, var9); - if (var10 == Block.stone.blockID) + if (Block.blocksList[var10].isGenMineableReplaceable(par1World, var7, var8, var9, Block.stone.blockID)) { par1World.setBlock(var7, var8, var9, Blocks.amethystOre.get().blockID, 4, 2); } diff --git a/common/biomesoplenty/biomes/BiomeGenMesa.java b/common/biomesoplenty/biomes/BiomeGenMesa.java index 96e260c68..aee00d7c3 100644 --- a/common/biomesoplenty/biomes/BiomeGenMesa.java +++ b/common/biomesoplenty/biomes/BiomeGenMesa.java @@ -44,7 +44,7 @@ public class BiomeGenMesa extends BiomeGenBase int var9 = par4 + par2Random.nextInt(16); int var10 = par1World.getBlockId(var7, var8, var9); - if (var10 == Block.stone.blockID) + if (Block.blocksList[var10].isGenMineableReplaceable(par1World, var7, var8, var9, Block.stone.blockID)) { par1World.setBlock(var7, var8, var9, Blocks.amethystOre.get().blockID, 2, 2); } diff --git a/common/biomesoplenty/biomes/BiomeGenMoor.java b/common/biomesoplenty/biomes/BiomeGenMoor.java index e393c9245..826af1750 100644 --- a/common/biomesoplenty/biomes/BiomeGenMoor.java +++ b/common/biomesoplenty/biomes/BiomeGenMoor.java @@ -71,7 +71,7 @@ public class BiomeGenMoor extends BiomeGenBase int var9 = par4 + par2Random.nextInt(16); int var10 = par1World.getBlockId(var7, var8, var9); - if (var10 == Block.stone.blockID) + if (Block.blocksList[var10].isGenMineableReplaceable(par1World, var7, var8, var9, Block.stone.blockID)) { par1World.setBlock(var7, var8, var9, Block.oreEmerald.blockID, 0, 2); } diff --git a/common/biomesoplenty/biomes/BiomeGenMountain.java b/common/biomesoplenty/biomes/BiomeGenMountain.java index cb1ebd662..0fdc58737 100644 --- a/common/biomesoplenty/biomes/BiomeGenMountain.java +++ b/common/biomesoplenty/biomes/BiomeGenMountain.java @@ -52,7 +52,7 @@ public class BiomeGenMountain extends BiomeGenBase int var9 = par4 + par2Random.nextInt(16); int var10 = par1World.getBlockId(var7, var8, var9); - if (var10 == Block.stone.blockID) + if (Block.blocksList[var10].isGenMineableReplaceable(par1World, var7, var8, var9, Block.stone.blockID)) { par1World.setBlock(var7, var8, var9, Block.oreEmerald.blockID, 0, 2); } diff --git a/common/biomesoplenty/biomes/BiomeGenOasis.java b/common/biomesoplenty/biomes/BiomeGenOasis.java index e70803450..5bd969c89 100644 --- a/common/biomesoplenty/biomes/BiomeGenOasis.java +++ b/common/biomesoplenty/biomes/BiomeGenOasis.java @@ -50,7 +50,7 @@ public class BiomeGenOasis extends BiomeGenBase int var9 = par4 + par2Random.nextInt(16); int var10 = par1World.getBlockId(var7, var8, var9); - if (var10 == Block.stone.blockID) + if (Block.blocksList[var10].isGenMineableReplaceable(par1World, var7, var8, var9, Block.stone.blockID)) { par1World.setBlock(var7, var8, var9, Blocks.amethystOre.get().blockID, 6, 2); } diff --git a/common/biomesoplenty/biomes/BiomeGenOrchard.java b/common/biomesoplenty/biomes/BiomeGenOrchard.java index 01c4f8be8..8d9982610 100644 --- a/common/biomesoplenty/biomes/BiomeGenOrchard.java +++ b/common/biomesoplenty/biomes/BiomeGenOrchard.java @@ -46,7 +46,7 @@ public class BiomeGenOrchard extends BiomeGenBase int var9 = par4 + par2Random.nextInt(16); int var10 = par1World.getBlockId(var7, var8, var9); - if (var10 == Block.stone.blockID) + if (Block.blocksList[var10].isGenMineableReplaceable(par1World, var7, var8, var9, Block.stone.blockID)) { par1World.setBlock(var7, var8, var9, Blocks.amethystOre.get().blockID, 4, 2); } diff --git a/common/biomesoplenty/biomes/BiomeGenOutback.java b/common/biomesoplenty/biomes/BiomeGenOutback.java index 103443015..652f473b9 100644 --- a/common/biomesoplenty/biomes/BiomeGenOutback.java +++ b/common/biomesoplenty/biomes/BiomeGenOutback.java @@ -44,7 +44,7 @@ public class BiomeGenOutback extends BiomeGenBase int var9 = par4 + par2Random.nextInt(16); int var10 = par1World.getBlockId(var7, var8, var9); - if (var10 == Block.stone.blockID) + if (Block.blocksList[var10].isGenMineableReplaceable(par1World, var7, var8, var9, Block.stone.blockID)) { par1World.setBlock(var7, var8, var9, Blocks.amethystOre.get().blockID, 2, 2); } diff --git a/common/biomesoplenty/biomes/BiomeGenPasture.java b/common/biomesoplenty/biomes/BiomeGenPasture.java index 83c35ed81..bf2d2a5bd 100644 --- a/common/biomesoplenty/biomes/BiomeGenPasture.java +++ b/common/biomesoplenty/biomes/BiomeGenPasture.java @@ -37,7 +37,7 @@ public class BiomeGenPasture extends BiomeGenBase int var9 = par4 + par2Random.nextInt(16); int var10 = par1World.getBlockId(var7, var8, var9); - if (var10 == Block.stone.blockID) + if (Block.blocksList[var10].isGenMineableReplaceable(par1World, var7, var8, var9, Block.stone.blockID)) { par1World.setBlock(var7, var8, var9, Blocks.amethystOre.get().blockID, 4, 2); } diff --git a/common/biomesoplenty/biomes/BiomeGenPastureMeadow.java b/common/biomesoplenty/biomes/BiomeGenPastureMeadow.java index f5913c20a..2234998ad 100644 --- a/common/biomesoplenty/biomes/BiomeGenPastureMeadow.java +++ b/common/biomesoplenty/biomes/BiomeGenPastureMeadow.java @@ -39,7 +39,7 @@ public class BiomeGenPastureMeadow extends BiomeGenBase int var9 = par4 + par2Random.nextInt(16); int var10 = par1World.getBlockId(var7, var8, var9); - if (var10 == Block.stone.blockID) + if (Block.blocksList[var10].isGenMineableReplaceable(par1World, var7, var8, var9, Block.stone.blockID)) { par1World.setBlock(var7, var8, var9, Blocks.amethystOre.get().blockID, 4, 2); } diff --git a/common/biomesoplenty/biomes/BiomeGenPastureThin.java b/common/biomesoplenty/biomes/BiomeGenPastureThin.java index c5e01932e..f40bdaaa8 100644 --- a/common/biomesoplenty/biomes/BiomeGenPastureThin.java +++ b/common/biomesoplenty/biomes/BiomeGenPastureThin.java @@ -39,7 +39,7 @@ public class BiomeGenPastureThin extends BiomeGenBase int var9 = par4 + par2Random.nextInt(16); int var10 = par1World.getBlockId(var7, var8, var9); - if (var10 == Block.stone.blockID) + if (Block.blocksList[var10].isGenMineableReplaceable(par1World, var7, var8, var9, Block.stone.blockID)) { par1World.setBlock(var7, var8, var9, Blocks.amethystOre.get().blockID, 4, 2); } diff --git a/common/biomesoplenty/biomes/BiomeGenPolar.java b/common/biomesoplenty/biomes/BiomeGenPolar.java index 8091c4cb0..1d2b475dc 100644 --- a/common/biomesoplenty/biomes/BiomeGenPolar.java +++ b/common/biomesoplenty/biomes/BiomeGenPolar.java @@ -38,7 +38,7 @@ public class BiomeGenPolar extends BiomeGenBase int var9 = par4 + par2Random.nextInt(16); int var10 = par1World.getBlockId(var7, var8, var9); - if (var10 == Block.stone.blockID) + if (Block.blocksList[var10].isGenMineableReplaceable(par1World, var7, var8, var9, Block.stone.blockID)) { par1World.setBlock(var7, var8, var9, Blocks.amethystOre.get().blockID, 8, 2); } diff --git a/common/biomesoplenty/biomes/BiomeGenPrairie.java b/common/biomesoplenty/biomes/BiomeGenPrairie.java index 5d847931a..64b895caf 100644 --- a/common/biomesoplenty/biomes/BiomeGenPrairie.java +++ b/common/biomesoplenty/biomes/BiomeGenPrairie.java @@ -43,7 +43,7 @@ public class BiomeGenPrairie extends BiomeGenBase int var9 = par4 + par2Random.nextInt(16); int var10 = par1World.getBlockId(var7, var8, var9); - if (var10 == Block.stone.blockID) + if (Block.blocksList[var10].isGenMineableReplaceable(par1World, var7, var8, var9, Block.stone.blockID)) { par1World.setBlock(var7, var8, var9, Blocks.amethystOre.get().blockID, 4, 2); } diff --git a/common/biomesoplenty/biomes/BiomeGenQuagmire.java b/common/biomesoplenty/biomes/BiomeGenQuagmire.java index b3e0d7d3d..d6caf4217 100644 --- a/common/biomesoplenty/biomes/BiomeGenQuagmire.java +++ b/common/biomesoplenty/biomes/BiomeGenQuagmire.java @@ -46,7 +46,7 @@ public class BiomeGenQuagmire extends BiomeGenBase int var9 = par4 + par2Random.nextInt(16); int var10 = par1World.getBlockId(var7, var8, var9); - if (var10 == Block.stone.blockID) + if (Block.blocksList[var10].isGenMineableReplaceable(par1World, var7, var8, var9, Block.stone.blockID)) { par1World.setBlock(var7, var8, var9, Blocks.amethystOre.get().blockID, 10, 2); } diff --git a/common/biomesoplenty/biomes/BiomeGenRainforest.java b/common/biomesoplenty/biomes/BiomeGenRainforest.java index f94d19d2b..ab191dc84 100644 --- a/common/biomesoplenty/biomes/BiomeGenRainforest.java +++ b/common/biomesoplenty/biomes/BiomeGenRainforest.java @@ -48,7 +48,7 @@ public class BiomeGenRainforest extends BiomeGenBase int var9 = par4 + par2Random.nextInt(16); int var10 = par1World.getBlockId(var7, var8, var9); - if (var10 == Block.stone.blockID) + if (Block.blocksList[var10].isGenMineableReplaceable(par1World, var7, var8, var9, Block.stone.blockID)) { par1World.setBlock(var7, var8, var9, Blocks.amethystOre.get().blockID, 6, 2); } diff --git a/common/biomesoplenty/biomes/BiomeGenRedwoodForest.java b/common/biomesoplenty/biomes/BiomeGenRedwoodForest.java index 68bacbb04..6122ff3d7 100644 --- a/common/biomesoplenty/biomes/BiomeGenRedwoodForest.java +++ b/common/biomesoplenty/biomes/BiomeGenRedwoodForest.java @@ -57,7 +57,7 @@ public class BiomeGenRedwoodForest extends BiomeGenBase int var9 = par4 + par2Random.nextInt(16); int var10 = par1World.getBlockId(var7, var8, var9); - if (var10 == Block.stone.blockID) + if (Block.blocksList[var10].isGenMineableReplaceable(par1World, var7, var8, var9, Block.stone.blockID)) { par1World.setBlock(var7, var8, var9, Block.oreEmerald.blockID, 0, 2); } diff --git a/common/biomesoplenty/biomes/BiomeGenSavanna.java b/common/biomesoplenty/biomes/BiomeGenSavanna.java index e6a080787..aac2b2119 100644 --- a/common/biomesoplenty/biomes/BiomeGenSavanna.java +++ b/common/biomesoplenty/biomes/BiomeGenSavanna.java @@ -42,7 +42,7 @@ public class BiomeGenSavanna extends BiomeGenBase int var9 = par4 + par2Random.nextInt(16); int var10 = par1World.getBlockId(var7, var8, var9); - if (var10 == Block.stone.blockID) + if (Block.blocksList[var10].isGenMineableReplaceable(par1World, var7, var8, var9, Block.stone.blockID)) { par1World.setBlock(var7, var8, var9, Blocks.amethystOre.get().blockID, 2, 2); } diff --git a/common/biomesoplenty/biomes/BiomeGenSavannaPlateau.java b/common/biomesoplenty/biomes/BiomeGenSavannaPlateau.java index 1e4d333b0..f90786d60 100644 --- a/common/biomesoplenty/biomes/BiomeGenSavannaPlateau.java +++ b/common/biomesoplenty/biomes/BiomeGenSavannaPlateau.java @@ -42,7 +42,7 @@ public class BiomeGenSavannaPlateau extends BiomeGenBase int var9 = par4 + par2Random.nextInt(16); int var10 = par1World.getBlockId(var7, var8, var9); - if (var10 == Block.stone.blockID) + if (Block.blocksList[var10].isGenMineableReplaceable(par1World, var7, var8, var9, Block.stone.blockID)) { par1World.setBlock(var7, var8, var9, Blocks.amethystOre.get().blockID, 2, 2); } diff --git a/common/biomesoplenty/biomes/BiomeGenScrubland.java b/common/biomesoplenty/biomes/BiomeGenScrubland.java index c5d28b004..cf04acd50 100644 --- a/common/biomesoplenty/biomes/BiomeGenScrubland.java +++ b/common/biomesoplenty/biomes/BiomeGenScrubland.java @@ -40,7 +40,7 @@ public class BiomeGenScrubland extends BiomeGenBase int var9 = par4 + par2Random.nextInt(16); int var10 = par1World.getBlockId(var7, var8, var9); - if (var10 == Block.stone.blockID) + if (Block.blocksList[var10].isGenMineableReplaceable(par1World, var7, var8, var9, Block.stone.blockID)) { par1World.setBlock(var7, var8, var9, Blocks.amethystOre.get().blockID, 2, 2); } diff --git a/common/biomesoplenty/biomes/BiomeGenSeasonalForest.java b/common/biomesoplenty/biomes/BiomeGenSeasonalForest.java index 19a8efe73..113f5616c 100644 --- a/common/biomesoplenty/biomes/BiomeGenSeasonalForest.java +++ b/common/biomesoplenty/biomes/BiomeGenSeasonalForest.java @@ -65,7 +65,7 @@ public class BiomeGenSeasonalForest extends BiomeGenBase int var9 = par4 + par2Random.nextInt(16); int var10 = par1World.getBlockId(var7, var8, var9); - if (var10 == Block.stone.blockID) + if (Block.blocksList[var10].isGenMineableReplaceable(par1World, var7, var8, var9, Block.stone.blockID)) { par1World.setBlock(var7, var8, var9, Block.oreEmerald.blockID, 0, 2); } diff --git a/common/biomesoplenty/biomes/BiomeGenSeasonalSpruceForest.java b/common/biomesoplenty/biomes/BiomeGenSeasonalSpruceForest.java index df3ef931b..fc5316b19 100644 --- a/common/biomesoplenty/biomes/BiomeGenSeasonalSpruceForest.java +++ b/common/biomesoplenty/biomes/BiomeGenSeasonalSpruceForest.java @@ -65,7 +65,7 @@ public class BiomeGenSeasonalSpruceForest extends BiomeGenBase int var9 = par4 + par2Random.nextInt(16); int var10 = par1World.getBlockId(var7, var8, var9); - if (var10 == Block.stone.blockID) + if (Block.blocksList[var10].isGenMineableReplaceable(par1World, var7, var8, var9, Block.stone.blockID)) { par1World.setBlock(var7, var8, var9, Block.oreEmerald.blockID, 0, 2); } diff --git a/common/biomesoplenty/biomes/BiomeGenShrubland.java b/common/biomesoplenty/biomes/BiomeGenShrubland.java index 5c91e0cb3..745090e71 100644 --- a/common/biomesoplenty/biomes/BiomeGenShrubland.java +++ b/common/biomesoplenty/biomes/BiomeGenShrubland.java @@ -42,7 +42,7 @@ public class BiomeGenShrubland extends BiomeGenBase int var9 = par4 + par2Random.nextInt(16); int var10 = par1World.getBlockId(var7, var8, var9); - if (var10 == Block.stone.blockID) + if (Block.blocksList[var10].isGenMineableReplaceable(par1World, var7, var8, var9, Block.stone.blockID)) { par1World.setBlock(var7, var8, var9, Blocks.amethystOre.get().blockID, 4, 2); } diff --git a/common/biomesoplenty/biomes/BiomeGenShrublandForest.java b/common/biomesoplenty/biomes/BiomeGenShrublandForest.java index c22295dc1..f475dea55 100644 --- a/common/biomesoplenty/biomes/BiomeGenShrublandForest.java +++ b/common/biomesoplenty/biomes/BiomeGenShrublandForest.java @@ -42,7 +42,7 @@ public class BiomeGenShrublandForest extends BiomeGenBase int var9 = par4 + par2Random.nextInt(16); int var10 = par1World.getBlockId(var7, var8, var9); - if (var10 == Block.stone.blockID) + if (Block.blocksList[var10].isGenMineableReplaceable(par1World, var7, var8, var9, Block.stone.blockID)) { par1World.setBlock(var7, var8, var9, Blocks.amethystOre.get().blockID, 4, 2); } diff --git a/common/biomesoplenty/biomes/BiomeGenSilkglades.java b/common/biomesoplenty/biomes/BiomeGenSilkglades.java index ae72a4c67..7f243dc92 100644 --- a/common/biomesoplenty/biomes/BiomeGenSilkglades.java +++ b/common/biomesoplenty/biomes/BiomeGenSilkglades.java @@ -75,7 +75,7 @@ public class BiomeGenSilkglades extends BiomeGenBase int var9 = par4 + par2Random.nextInt(16); int var10 = par1World.getBlockId(var7, var8, var9); - if (var10 == Block.stone.blockID) + if (Block.blocksList[var10].isGenMineableReplaceable(par1World, var7, var8, var9, Block.stone.blockID)) { par1World.setBlock(var7, var8, var9, Blocks.amethystOre.get().blockID, 10, 2); } diff --git a/common/biomesoplenty/biomes/BiomeGenSludgepit.java b/common/biomesoplenty/biomes/BiomeGenSludgepit.java index 01ecc90ef..9740053a6 100644 --- a/common/biomesoplenty/biomes/BiomeGenSludgepit.java +++ b/common/biomesoplenty/biomes/BiomeGenSludgepit.java @@ -54,7 +54,7 @@ public class BiomeGenSludgepit extends BiomeGenBase int var9 = par4 + par2Random.nextInt(16); int var10 = par1World.getBlockId(var7, var8, var9); - if (var10 == Block.stone.blockID) + if (Block.blocksList[var10].isGenMineableReplaceable(par1World, var7, var8, var9, Block.stone.blockID)) { par1World.setBlock(var7, var8, var9, Blocks.amethystOre.get().blockID, 10, 2); } diff --git a/common/biomesoplenty/biomes/BiomeGenSpruceWoods.java b/common/biomesoplenty/biomes/BiomeGenSpruceWoods.java index bdf113111..749cd857a 100644 --- a/common/biomesoplenty/biomes/BiomeGenSpruceWoods.java +++ b/common/biomesoplenty/biomes/BiomeGenSpruceWoods.java @@ -52,7 +52,7 @@ public class BiomeGenSpruceWoods extends BiomeGenBase int var9 = par4 + par2Random.nextInt(16); int var10 = par1World.getBlockId(var7, var8, var9); - if (var10 == Block.stone.blockID) + if (Block.blocksList[var10].isGenMineableReplaceable(par1World, var7, var8, var9, Block.stone.blockID)) { par1World.setBlock(var7, var8, var9, Block.oreEmerald.blockID, 0, 2); } diff --git a/common/biomesoplenty/biomes/BiomeGenSteppe.java b/common/biomesoplenty/biomes/BiomeGenSteppe.java index d225cc8a7..d9a51f362 100644 --- a/common/biomesoplenty/biomes/BiomeGenSteppe.java +++ b/common/biomesoplenty/biomes/BiomeGenSteppe.java @@ -46,7 +46,7 @@ public class BiomeGenSteppe extends BiomeGenBase int var9 = par4 + par2Random.nextInt(16); int var10 = par1World.getBlockId(var7, var8, var9); - if (var10 == Block.stone.blockID) + if (Block.blocksList[var10].isGenMineableReplaceable(par1World, var7, var8, var9, Block.stone.blockID)) { par1World.setBlock(var7, var8, var9, Blocks.amethystOre.get().blockID, 2, 2); } diff --git a/common/biomesoplenty/biomes/BiomeGenTemperateRainforest.java b/common/biomesoplenty/biomes/BiomeGenTemperateRainforest.java index 6b6859a79..0a7c24002 100644 --- a/common/biomesoplenty/biomes/BiomeGenTemperateRainforest.java +++ b/common/biomesoplenty/biomes/BiomeGenTemperateRainforest.java @@ -76,7 +76,7 @@ public class BiomeGenTemperateRainforest extends BiomeGenBase int var9 = par4 + par2Random.nextInt(16); int var10 = par1World.getBlockId(var7, var8, var9); - if (var10 == Block.stone.blockID) + if (Block.blocksList[var10].isGenMineableReplaceable(par1World, var7, var8, var9, Block.stone.blockID)) { par1World.setBlock(var7, var8, var9, Block.oreEmerald.blockID, 0, 2); } diff --git a/common/biomesoplenty/biomes/BiomeGenTimber.java b/common/biomesoplenty/biomes/BiomeGenTimber.java index 73bb1ed1b..8bd9b553e 100644 --- a/common/biomesoplenty/biomes/BiomeGenTimber.java +++ b/common/biomesoplenty/biomes/BiomeGenTimber.java @@ -59,7 +59,7 @@ public class BiomeGenTimber extends BiomeGenBase int var9 = par4 + par2Random.nextInt(16); int var10 = par1World.getBlockId(var7, var8, var9); - if (var10 == Block.stone.blockID) + if (Block.blocksList[var10].isGenMineableReplaceable(par1World, var7, var8, var9, Block.stone.blockID)) { par1World.setBlock(var7, var8, var9, Block.oreEmerald.blockID, 0, 2); } diff --git a/common/biomesoplenty/biomes/BiomeGenTimberThin.java b/common/biomesoplenty/biomes/BiomeGenTimberThin.java index 9200d623c..44ec70000 100644 --- a/common/biomesoplenty/biomes/BiomeGenTimberThin.java +++ b/common/biomesoplenty/biomes/BiomeGenTimberThin.java @@ -59,7 +59,7 @@ public class BiomeGenTimberThin extends BiomeGenBase int var9 = par4 + par2Random.nextInt(16); int var10 = par1World.getBlockId(var7, var8, var9); - if (var10 == Block.stone.blockID) + if (Block.blocksList[var10].isGenMineableReplaceable(par1World, var7, var8, var9, Block.stone.blockID)) { par1World.setBlock(var7, var8, var9, Block.oreEmerald.blockID, 0, 2); } diff --git a/common/biomesoplenty/biomes/BiomeGenTropicalRainforest.java b/common/biomesoplenty/biomes/BiomeGenTropicalRainforest.java index 541fa6358..3d37aaef6 100644 --- a/common/biomesoplenty/biomes/BiomeGenTropicalRainforest.java +++ b/common/biomesoplenty/biomes/BiomeGenTropicalRainforest.java @@ -55,7 +55,7 @@ public class BiomeGenTropicalRainforest extends BiomeGenBase int var9 = par4 + par2Random.nextInt(16); int var10 = par1World.getBlockId(var7, var8, var9); - if (var10 == Block.stone.blockID) + if (Block.blocksList[var10].isGenMineableReplaceable(par1World, var7, var8, var9, Block.stone.blockID)) { par1World.setBlock(var7, var8, var9, Blocks.amethystOre.get().blockID, 6, 2); } diff --git a/common/biomesoplenty/biomes/BiomeGenTropics.java b/common/biomesoplenty/biomes/BiomeGenTropics.java index 061d0c885..324be4b06 100644 --- a/common/biomesoplenty/biomes/BiomeGenTropics.java +++ b/common/biomesoplenty/biomes/BiomeGenTropics.java @@ -50,7 +50,7 @@ public class BiomeGenTropics extends BiomeGenBase int var9 = par4 + par2Random.nextInt(16); int var10 = par1World.getBlockId(var7, var8, var9); - if (var10 == Block.stone.blockID) + if (Block.blocksList[var10].isGenMineableReplaceable(par1World, var7, var8, var9, Block.stone.blockID)) { par1World.setBlock(var7, var8, var9, Blocks.amethystOre.get().blockID, 6, 2); } diff --git a/common/biomesoplenty/biomes/BiomeGenTundra.java b/common/biomesoplenty/biomes/BiomeGenTundra.java index e9314fd41..bdf994325 100644 --- a/common/biomesoplenty/biomes/BiomeGenTundra.java +++ b/common/biomesoplenty/biomes/BiomeGenTundra.java @@ -42,7 +42,7 @@ public class BiomeGenTundra extends BiomeGenBase int var9 = par4 + par2Random.nextInt(16); int var10 = par1World.getBlockId(var7, var8, var9); - if (var10 == Block.stone.blockID) + if (Block.blocksList[var10].isGenMineableReplaceable(par1World, var7, var8, var9, Block.stone.blockID)) { par1World.setBlock(var7, var8, var9, Blocks.amethystOre.get().blockID, 8, 2); } diff --git a/common/biomesoplenty/biomes/BiomeGenWoodland.java b/common/biomesoplenty/biomes/BiomeGenWoodland.java index e42265004..dacc665e8 100644 --- a/common/biomesoplenty/biomes/BiomeGenWoodland.java +++ b/common/biomesoplenty/biomes/BiomeGenWoodland.java @@ -35,7 +35,7 @@ public class BiomeGenWoodland extends BiomeGenBase int var9 = par4 + par2Random.nextInt(16); int var10 = par1World.getBlockId(var7, var8, var9); - if (var10 == Block.stone.blockID) + if (Block.blocksList[var10].isGenMineableReplaceable(par1World, var7, var8, var9, Block.stone.blockID)) { par1World.setBlock(var7, var8, var9, Block.oreEmerald.blockID, 0, 2); } diff --git a/common/biomesoplenty/biomes/ocean/BiomeGenOceanAbyss.java b/common/biomesoplenty/biomes/ocean/BiomeGenOceanAbyss.java index ec5af62d3..f1f740952 100644 --- a/common/biomesoplenty/biomes/ocean/BiomeGenOceanAbyss.java +++ b/common/biomesoplenty/biomes/ocean/BiomeGenOceanAbyss.java @@ -33,7 +33,7 @@ public class BiomeGenOceanAbyss extends BiomeGenBase int var9 = par4 + par2Random.nextInt(16); int var10 = par1World.getBlockId(var7, var8, var9); - if (var10 == Block.stone.blockID) + if (Block.blocksList[var10].isGenMineableReplaceable(par1World, var7, var8, var9, Block.stone.blockID)) { par1World.setBlock(var7, var8, var9, Blocks.amethystOre.get().blockID, 12, 2); } diff --git a/common/biomesoplenty/biomes/ocean/BiomeGenOceanCoral.java b/common/biomesoplenty/biomes/ocean/BiomeGenOceanCoral.java index 758c812f8..7ae73e912 100644 --- a/common/biomesoplenty/biomes/ocean/BiomeGenOceanCoral.java +++ b/common/biomesoplenty/biomes/ocean/BiomeGenOceanCoral.java @@ -36,7 +36,7 @@ public class BiomeGenOceanCoral extends BiomeGenBase int var9 = par4 + par2Random.nextInt(16); int var10 = par1World.getBlockId(var7, var8, var9); - if (var10 == Block.stone.blockID) + if (Block.blocksList[var10].isGenMineableReplaceable(par1World, var7, var8, var9, Block.stone.blockID)) { par1World.setBlock(var7, var8, var9, Blocks.amethystOre.get().blockID, 12, 2); } diff --git a/common/biomesoplenty/biomes/ocean/BiomeGenOceanKelp.java b/common/biomesoplenty/biomes/ocean/BiomeGenOceanKelp.java index b65d9e70b..c6b3a05d7 100644 --- a/common/biomesoplenty/biomes/ocean/BiomeGenOceanKelp.java +++ b/common/biomesoplenty/biomes/ocean/BiomeGenOceanKelp.java @@ -36,7 +36,7 @@ public class BiomeGenOceanKelp extends BiomeGenBase int var9 = par4 + par2Random.nextInt(16); int var10 = par1World.getBlockId(var7, var8, var9); - if (var10 == Block.stone.blockID) + if (Block.blocksList[var10].isGenMineableReplaceable(par1World, var7, var8, var9, Block.stone.blockID)) { par1World.setBlock(var7, var8, var9, Blocks.amethystOre.get().blockID, 12, 2); } diff --git a/common/biomesoplenty/biomes/vanilla/BiomeGenForestNew.java b/common/biomesoplenty/biomes/vanilla/BiomeGenForestNew.java index d231e3b49..f3fdc024b 100644 --- a/common/biomesoplenty/biomes/vanilla/BiomeGenForestNew.java +++ b/common/biomesoplenty/biomes/vanilla/BiomeGenForestNew.java @@ -65,7 +65,7 @@ public class BiomeGenForestNew extends BiomeGenBase int var9 = par4 + par2Random.nextInt(16); int var10 = par1World.getBlockId(var7, var8, var9); - if (var10 == Block.stone.blockID) + if (Block.blocksList[var10].isGenMineableReplaceable(par1World, var7, var8, var9, Block.stone.blockID)) { par1World.setBlock(var7, var8, var9, Block.oreEmerald.blockID, 0, 2); } diff --git a/common/biomesoplenty/biomes/vanilla/BiomeGenHillsNew.java b/common/biomesoplenty/biomes/vanilla/BiomeGenHillsNew.java index 3757cc287..68dd72446 100644 --- a/common/biomesoplenty/biomes/vanilla/BiomeGenHillsNew.java +++ b/common/biomesoplenty/biomes/vanilla/BiomeGenHillsNew.java @@ -50,7 +50,7 @@ public class BiomeGenHillsNew extends BiomeGenBase int var9 = par4 + par2Random.nextInt(16); int var10 = par1World.getBlockId(var7, var8, var9); - if (var10 == Block.stone.blockID) + if (Block.blocksList[var10].isGenMineableReplaceable(par1World, var7, var8, var9, Block.stone.blockID)) { par1World.setBlock(var7, var8, var9, Block.oreEmerald.blockID, 0, 2); } diff --git a/common/biomesoplenty/biomes/vanilla/BiomeGenPlainsNew.java b/common/biomesoplenty/biomes/vanilla/BiomeGenPlainsNew.java index b150e6dd4..9512f99c0 100644 --- a/common/biomesoplenty/biomes/vanilla/BiomeGenPlainsNew.java +++ b/common/biomesoplenty/biomes/vanilla/BiomeGenPlainsNew.java @@ -43,7 +43,7 @@ public class BiomeGenPlainsNew extends BiomeGenBase int var9 = par4 + par2Random.nextInt(16); int var10 = par1World.getBlockId(var7, var8, var9); - if (var10 == Block.stone.blockID) + if (Block.blocksList[var10].isGenMineableReplaceable(par1World, var7, var8, var9, Block.stone.blockID)) { par1World.setBlock(var7, var8, var9, Blocks.amethystOre.get().blockID, 4, 2); } diff --git a/common/biomesoplenty/biomes/vanilla/BiomeGenTaigaNew.java b/common/biomesoplenty/biomes/vanilla/BiomeGenTaigaNew.java index 95fb73900..621d71d44 100644 --- a/common/biomesoplenty/biomes/vanilla/BiomeGenTaigaNew.java +++ b/common/biomesoplenty/biomes/vanilla/BiomeGenTaigaNew.java @@ -53,7 +53,7 @@ public class BiomeGenTaigaNew extends BiomeGenBase int var9 = par4 + par2Random.nextInt(16); int var10 = par1World.getBlockId(var7, var8, var9); - if (var10 == Block.stone.blockID) + if (Block.blocksList[var10].isGenMineableReplaceable(par1World, var7, var8, var9, Block.stone.blockID)) { par1World.setBlock(var7, var8, var9, Blocks.amethystOre.get().blockID, 8, 2); }