diff --git a/src/main/java/biomesoplenty/common/biomes/overworld/BiomeGenAlps.java b/src/main/java/biomesoplenty/common/biomes/overworld/BiomeGenAlps.java index da71fd2d3..7b14ccb9b 100644 --- a/src/main/java/biomesoplenty/common/biomes/overworld/BiomeGenAlps.java +++ b/src/main/java/biomesoplenty/common/biomes/overworld/BiomeGenAlps.java @@ -31,23 +31,25 @@ public class BiomeGenAlps extends BOPBiome } @Override - public void decorate(World world, Random random, int chunkX, int chunkZ) - { - super.decorate(world, random, chunkX, chunkZ); - int var5 = 12 + random.nextInt(6); + public void decorate(World world, Random random, int chunkX, int chunkZ) + { + super.decorate(world, random, chunkX, chunkZ); + int var5 = 12 + random.nextInt(6); - for (int var6 = 0; var6 < var5; ++var6) - { - int x = chunkX + random.nextInt(16); - int y = random.nextInt(28) + 4; - int z = chunkZ + random.nextInt(16); + for (int var6 = 0; var6 < var5; ++var6) + { + int x = chunkX + random.nextInt(16); + int y = random.nextInt(28) + 4; + int z = chunkZ + random.nextInt(16); + + //TODO: getBlock() + Block block = world.getBlock(x, y, z); - Block block = world.getBlock(x, y, z); - - if (block != null && block.isReplaceableOreGen(world, x, y, z, Blocks.stone)) - { - world.setBlock(x, y, z, BOPBlockHelper.get("gemOre"), 8, 2); - } - } - } + if (block != null && block.isReplaceableOreGen(world, x, y, z, Blocks.stone)) + { + //TODO: setBlock() + world.setBlock(x, y, z, Blocks.emerald_ore, 0, 2); + } + } + } } diff --git a/src/main/java/biomesoplenty/common/biomes/overworld/BiomeGenBog.java b/src/main/java/biomesoplenty/common/biomes/overworld/BiomeGenBog.java index fd1a2d969..e3ded0e6e 100644 --- a/src/main/java/biomesoplenty/common/biomes/overworld/BiomeGenBog.java +++ b/src/main/java/biomesoplenty/common/biomes/overworld/BiomeGenBog.java @@ -62,7 +62,6 @@ public class BiomeGenBog extends BOPBiome public void decorate(World world, Random random, int chunkX, int chunkZ) { super.decorate(world, random, chunkX, chunkZ); - int var5 = 12 + random.nextInt(6); for (int var6 = 0; var6 < var5; ++var6) diff --git a/src/main/java/biomesoplenty/common/biomes/overworld/BiomeGenBorealForest.java b/src/main/java/biomesoplenty/common/biomes/overworld/BiomeGenBorealForest.java index 122d14f0f..f11878430 100644 --- a/src/main/java/biomesoplenty/common/biomes/overworld/BiomeGenBorealForest.java +++ b/src/main/java/biomesoplenty/common/biomes/overworld/BiomeGenBorealForest.java @@ -71,7 +71,7 @@ public class BiomeGenBorealForest extends BOPBiome if (block != null && block.isReplaceableOreGen(world, x, y, z, Blocks.stone)) { - world.setBlock(x, y, z, Blocks.emerald_ore, 0, 2); + world.setBlock(x, y, z, BOPBlockHelper.get("gemOre"), 14, 2); } } } diff --git a/src/main/java/biomesoplenty/common/biomes/overworld/BiomeGenBrushland.java b/src/main/java/biomesoplenty/common/biomes/overworld/BiomeGenBrushland.java index 986f98d45..d8f0dda05 100644 --- a/src/main/java/biomesoplenty/common/biomes/overworld/BiomeGenBrushland.java +++ b/src/main/java/biomesoplenty/common/biomes/overworld/BiomeGenBrushland.java @@ -7,7 +7,9 @@ import biomesoplenty.common.world.features.WorldGenBOPTallGrass; import biomesoplenty.common.world.features.trees.WorldGenBrush1; import biomesoplenty.common.world.features.trees.WorldGenBrush2; import biomesoplenty.common.world.features.trees.WorldGenMiniShrub; +import net.minecraft.block.Block; import net.minecraft.init.Blocks; +import net.minecraft.world.World; import net.minecraft.world.gen.feature.WorldGenAbstractTree; import java.util.Random; @@ -49,6 +51,27 @@ public class BiomeGenBrushland extends BOPBiome { return random.nextInt(2) == 0 ? new WorldGenBrush2(Blocks.log, Blocks.leaves, 3, 0, Blocks.grass) : (random.nextInt(5) == 0 ? new WorldGenBrush1() : new WorldGenMiniShrub(Blocks.log, Blocks.leaves, 0, 0, Blocks.grass, Blocks.sand)); } + + @Override + public void decorate(World world, Random random, int chunkX, int chunkZ) + { + super.decorate(world, random, chunkX, chunkZ); + int var5 = 12 + random.nextInt(6); + + for (int var6 = 0; var6 < var5; ++var6) + { + int x = chunkX + random.nextInt(16); + int y = random.nextInt(28) + 4; + int z = chunkZ + random.nextInt(16); + + Block block = world.getBlock(x, y, z); + + if (block != null && block.isReplaceableOreGen(world, x, y, z, Blocks.stone)) + { + world.setBlock(x, y, z, BOPBlockHelper.get("gemOre"), 2, 2); + } + } + } @Override public int getBiomeGrassColor(int p_150558_1_, int p_150558_2_, int p_150558_3_) diff --git a/src/main/java/biomesoplenty/common/biomes/overworld/BiomeGenCanyon.java b/src/main/java/biomesoplenty/common/biomes/overworld/BiomeGenCanyon.java index b487f8c6d..8503609c4 100644 --- a/src/main/java/biomesoplenty/common/biomes/overworld/BiomeGenCanyon.java +++ b/src/main/java/biomesoplenty/common/biomes/overworld/BiomeGenCanyon.java @@ -52,25 +52,27 @@ public class BiomeGenCanyon extends BOPBiome } @Override - public void decorate(World world, Random random, int chunkX, int chunkZ) - { - super.decorate(world, random, chunkX, chunkZ); - int var5 = 12 + random.nextInt(6); + public void decorate(World world, Random random, int chunkX, int chunkZ) + { + super.decorate(world, random, chunkX, chunkZ); + int var5 = 12 + random.nextInt(6); - for (int var6 = 0; var6 < var5; ++var6) - { - int x = chunkX + random.nextInt(16); - int y = random.nextInt(28) + 4; - int z = chunkZ + random.nextInt(16); + for (int var6 = 0; var6 < var5; ++var6) + { + int x = chunkX + random.nextInt(16); + int y = random.nextInt(28) + 4; + int z = chunkZ + random.nextInt(16); + + //TODO: getBlock() + Block block = world.getBlock(x, y, z); - Block block = world.getBlock(x, y, z); - - if (block != null && block.isReplaceableOreGen(world, x, y, z, Blocks.stone)) - { - world.setBlock(x, y, z, BOPBlockHelper.get("gemOre"), 2, 2); - } - } - } + if (block != null && block.isReplaceableOreGen(world, x, y, z, Blocks.stone)) + { + //TODO: setBlock() + world.setBlock(x, y, z, Blocks.emerald_ore, 0, 2); + } + } + } @Override //TODO: getBiomeFoliageColor() diff --git a/src/main/java/biomesoplenty/common/biomes/overworld/BiomeGenConiferousForest.java b/src/main/java/biomesoplenty/common/biomes/overworld/BiomeGenConiferousForest.java index 042f5f414..f6839ba19 100644 --- a/src/main/java/biomesoplenty/common/biomes/overworld/BiomeGenConiferousForest.java +++ b/src/main/java/biomesoplenty/common/biomes/overworld/BiomeGenConiferousForest.java @@ -68,26 +68,24 @@ public class BiomeGenConiferousForest extends BOPBiome new WorldGenBOPTaiga3(BOPBlockHelper.get("logs1"), BOPBlockHelper.get("leaves2"), 3, 1, false, 35, 10, 0)); } - @Override - public void decorate(World world, Random random, int chunkX, int chunkZ) - { - super.decorate(world, random, chunkX, chunkZ); - int var5 = 12 + random.nextInt(6); + @Override + public void decorate(World world, Random random, int chunkX, int chunkZ) + { + super.decorate(world, random, chunkX, chunkZ); + int var5 = 12 + random.nextInt(6); - for (int var6 = 0; var6 < var5; ++var6) - { - int x = chunkX + random.nextInt(16); - int y = random.nextInt(28) + 4; - int z = chunkZ + random.nextInt(16); - - //TODO: getBlock() - Block block = world.getBlock(x, y, z); + for (int var6 = 0; var6 < var5; ++var6) + { + int x = chunkX + random.nextInt(16); + int y = random.nextInt(28) + 4; + int z = chunkZ + random.nextInt(16); - if (block != null && block.isReplaceableOreGen(world, x, y, z, Blocks.stone)) - { - //TODO: setBlock() - world.setBlock(x, y, z, Blocks.emerald_ore, 0, 2); - } - } - } + Block block = world.getBlock(x, y, z); + + if (block != null && block.isReplaceableOreGen(world, x, y, z, Blocks.stone)) + { + world.setBlock(x, y, z, BOPBlockHelper.get("gemOre"), 14, 2); + } + } + } } diff --git a/src/main/java/biomesoplenty/common/biomes/overworld/BiomeGenCrag.java b/src/main/java/biomesoplenty/common/biomes/overworld/BiomeGenCrag.java index 7c1f1f336..ed5db2dab 100644 --- a/src/main/java/biomesoplenty/common/biomes/overworld/BiomeGenCrag.java +++ b/src/main/java/biomesoplenty/common/biomes/overworld/BiomeGenCrag.java @@ -32,27 +32,27 @@ public class BiomeGenCrag extends BOPBiome } @Override - public void decorate(World world, Random random, int chunkX, int chunkZ) - { - super.decorate(world, random, chunkX, chunkZ); - int var5 = 12 + random.nextInt(6); + public void decorate(World world, Random random, int chunkX, int chunkZ) + { + super.decorate(world, random, chunkX, chunkZ); + int var5 = 12 + random.nextInt(6); - for (int i = 0; i < var5; ++i) - { - int x = chunkX + random.nextInt(16); - int y = random.nextInt(28) + 4; - int z = chunkZ + random.nextInt(16); + for (int var6 = 0; var6 < var5; ++var6) + { + int x = chunkX + random.nextInt(16); + int y = random.nextInt(28) + 4; + int z = chunkZ + random.nextInt(16); + + //TODO: getBlock() + Block block = world.getBlock(x, y, z); - //TODO: getBlock() - Block block = world.getBlock(x, y, z); - - if (block != null && block.isReplaceableOreGen(world, x, y, z, Blocks.stone)) - { - //TODO: setBlock() - world.setBlock(x, y, z, BOPBlockHelper.get("gemOre"), 12, 2); - } - } - } + if (block != null && block.isReplaceableOreGen(world, x, y, z, Blocks.stone)) + { + //TODO: setBlock() + world.setBlock(x, y, z, Blocks.emerald_ore, 0, 2); + } + } + } @Override public int getSkyColorByTemp(float par1) diff --git a/src/main/java/biomesoplenty/common/biomes/overworld/BiomeGenDeadForest.java b/src/main/java/biomesoplenty/common/biomes/overworld/BiomeGenDeadForest.java index fd444d8c0..452421c6d 100644 --- a/src/main/java/biomesoplenty/common/biomes/overworld/BiomeGenDeadForest.java +++ b/src/main/java/biomesoplenty/common/biomes/overworld/BiomeGenDeadForest.java @@ -2,7 +2,9 @@ package biomesoplenty.common.biomes.overworld; import java.util.Random; +import net.minecraft.block.Block; import net.minecraft.init.Blocks; +import net.minecraft.world.World; import net.minecraft.world.gen.feature.WorldGenAbstractTree; import biomesoplenty.api.BOPBlockHelper; import biomesoplenty.common.biomes.BOPBiome; @@ -51,6 +53,29 @@ public class BiomeGenDeadForest extends BOPBiome (random.nextInt(4) == 0 ? new WorldGenBOPTaiga2(Blocks.log, Blocks.leaves, 1, 1, false, 9, 9, 1) : new WorldGenOriginalTree(Blocks.log, BOPBlockHelper.get("leaves2"), 0, 0, false, 5, 3, false)); } + + @Override + public void decorate(World world, Random random, int chunkX, int chunkZ) + { + super.decorate(world, random, chunkX, chunkZ); + int var5 = 12 + random.nextInt(6); + + for (int var6 = 0; var6 < var5; ++var6) + { + int x = chunkX + random.nextInt(16); + int y = random.nextInt(28) + 4; + int z = chunkZ + random.nextInt(16); + + //TODO: getBlock() + Block block = world.getBlock(x, y, z); + + if (block != null && block.isReplaceableOreGen(world, x, y, z, Blocks.stone)) + { + //TODO: setBlock() + world.setBlock(x, y, z, BOPBlockHelper.get("gemOre"), 8, 2); + } + } + } @Override public int getBiomeGrassColor(int p_150558_1_, int p_150558_2_, int p_150558_3_) diff --git a/src/main/java/biomesoplenty/common/biomes/overworld/BiomeGenDeciduousForest.java b/src/main/java/biomesoplenty/common/biomes/overworld/BiomeGenDeciduousForest.java index bb9f543b2..b134c26a2 100644 --- a/src/main/java/biomesoplenty/common/biomes/overworld/BiomeGenDeciduousForest.java +++ b/src/main/java/biomesoplenty/common/biomes/overworld/BiomeGenDeciduousForest.java @@ -72,7 +72,7 @@ public class BiomeGenDeciduousForest extends BOPBiome if (block != null && block.isReplaceableOreGen(world, x, y, z, Blocks.stone)) { - world.setBlock(x, y, z, Blocks.emerald_ore, 0, 2); + world.setBlock(x, y, z, BOPBlockHelper.get("gemOre"), 14, 2); } } } diff --git a/src/main/java/biomesoplenty/common/biomes/overworld/BiomeGenFungiForest.java b/src/main/java/biomesoplenty/common/biomes/overworld/BiomeGenFungiForest.java index 2839a9ce7..3479200ae 100644 --- a/src/main/java/biomesoplenty/common/biomes/overworld/BiomeGenFungiForest.java +++ b/src/main/java/biomesoplenty/common/biomes/overworld/BiomeGenFungiForest.java @@ -2,6 +2,7 @@ package biomesoplenty.common.biomes.overworld; import java.util.Random; +import net.minecraft.block.Block; import net.minecraft.entity.passive.EntityMooshroom; import net.minecraft.init.Blocks; import net.minecraft.world.World; @@ -63,20 +64,35 @@ public class BiomeGenFungiForest extends BOPBiome this.bopWorldFeatures.weightedGrassGen.put(new WorldGenBOPDoubleFlora(2), 0.25D); } - @Override - public void decorate(World world, Random random, int chunkX, int chunkZ) - { - super.decorate(world, random, chunkX, chunkZ); + @Override + public void decorate(World world, Random random, int chunkX, int chunkZ) + { + super.decorate(world, random, chunkX, chunkZ); + int var5 = 12 + random.nextInt(6); - for (int i = 0; i < 20; i++) - { - int x = chunkX + random.nextInt(16) + 8; + for (int i = 0; i < var5; ++i) + { + int x = chunkX + random.nextInt(16); + int y = random.nextInt(28) + 4; + int z = chunkZ + random.nextInt(16); + + Block block = world.getBlock(x, y, z); + + if (block != null && block.isReplaceableOreGen(world, x, y, z, Blocks.stone)) + { + world.setBlock(x, y, z, BOPBlockHelper.get("gemOre"), 14, 2); + } + } + + for (int i = 0; i < 20; i++) + { + int x = chunkX + random.nextInt(16) + 8; short y = 58; - int z = chunkZ + random.nextInt(16) + 8; + int z = chunkZ + random.nextInt(16) + 8; - new WorldGenMoss().generate(world, random, x, y, z); - } - } + new WorldGenMoss().generate(world, random, x, y, z); + } + } @Override //TODO: getRandomWorldGenForTrees() diff --git a/src/main/java/biomesoplenty/common/biomes/overworld/BiomeGenGrove.java b/src/main/java/biomesoplenty/common/biomes/overworld/BiomeGenGrove.java index 175b7613a..d716b46be 100644 --- a/src/main/java/biomesoplenty/common/biomes/overworld/BiomeGenGrove.java +++ b/src/main/java/biomesoplenty/common/biomes/overworld/BiomeGenGrove.java @@ -60,28 +60,26 @@ public class BiomeGenGrove extends BOPBiome return random.nextInt(2) == 0 ? new WorldGenMiniShrub(Blocks.log, Blocks.leaves, 0, 0, Blocks.grass, Blocks.sand) : random.nextInt(3) == 0 ? new WorldGenPoplar2() : new WorldGenPoplar(); } - @Override - public void decorate(World world, Random random, int chunkX, int chunkZ) - { - super.decorate(world, random, chunkX, chunkZ); - int var5 = 12 + random.nextInt(6); + @Override + public void decorate(World world, Random random, int chunkX, int chunkZ) + { + super.decorate(world, random, chunkX, chunkZ); + int var5 = 12 + random.nextInt(6); - for (int var6 = 0; var6 < var5; ++var6) - { - int x = chunkX + random.nextInt(16); - int y = random.nextInt(28) + 4; - int z = chunkZ + random.nextInt(16); - - //TODO: getBlock() - Block block = world.getBlock(x, y, z); + for (int var6 = 0; var6 < var5; ++var6) + { + int x = chunkX + random.nextInt(16); + int y = random.nextInt(28) + 4; + int z = chunkZ + random.nextInt(16); - if (block != null && block.isReplaceableOreGen(world, x, y, z, Blocks.stone)) - { - //TODO: setBlock() - world.setBlock(x, y, z, Blocks.emerald_ore, 0, 2); - } - } - } + Block block = world.getBlock(x, y, z); + + if (block != null && block.isReplaceableOreGen(world, x, y, z, Blocks.stone)) + { + world.setBlock(x, y, z, BOPBlockHelper.get("gemOre"), 14, 2); + } + } + } @Override public int getBiomeGrassColor(int x, int y, int z) diff --git a/src/main/java/biomesoplenty/common/biomes/overworld/BiomeGenMapleWoods.java b/src/main/java/biomesoplenty/common/biomes/overworld/BiomeGenMapleWoods.java index d77a71b17..7a836722d 100644 --- a/src/main/java/biomesoplenty/common/biomes/overworld/BiomeGenMapleWoods.java +++ b/src/main/java/biomesoplenty/common/biomes/overworld/BiomeGenMapleWoods.java @@ -50,24 +50,26 @@ public class BiomeGenMapleWoods extends BOPBiome new WorldGenOriginalTree(Blocks.log, BOPBlockHelper.get("leaves3"), 0, 2, false, 5, 3, false); } - @Override - public void decorate(World world, Random random, int chunkX, int chunkZ) - { - super.decorate(world, random, chunkX, chunkZ); - int var5 = 12 + random.nextInt(6); + @Override + public void decorate(World world, Random random, int chunkX, int chunkZ) + { + super.decorate(world, random, chunkX, chunkZ); + int var5 = 12 + random.nextInt(6); - for (int var6 = 0; var6 < var5; ++var6) - { - int x = chunkX + random.nextInt(16); - int y = random.nextInt(28) + 4; - int z = chunkZ + random.nextInt(16); + for (int var6 = 0; var6 < var5; ++var6) + { + int x = chunkX + random.nextInt(16); + int y = random.nextInt(28) + 4; + int z = chunkZ + random.nextInt(16); + + //TODO: getBlock() + Block block = world.getBlock(x, y, z); - Block block = world.getBlock(x, y, z); - - if (block != null && block.isReplaceableOreGen(world, x, y, z, Blocks.stone)) - { - world.setBlock(x, y, z, Blocks.emerald_ore, 0, 2); - } - } - } + if (block != null && block.isReplaceableOreGen(world, x, y, z, Blocks.stone)) + { + //TODO: setBlock() + world.setBlock(x, y, z, BOPBlockHelper.get("gemOre"), 8, 2); + } + } + } } diff --git a/src/main/java/biomesoplenty/common/biomes/overworld/BiomeGenMarsh.java b/src/main/java/biomesoplenty/common/biomes/overworld/BiomeGenMarsh.java index 17a5f336b..91a163bd2 100644 --- a/src/main/java/biomesoplenty/common/biomes/overworld/BiomeGenMarsh.java +++ b/src/main/java/biomesoplenty/common/biomes/overworld/BiomeGenMarsh.java @@ -68,7 +68,7 @@ public class BiomeGenMarsh extends BOPBiome if (block != null && block.isReplaceableOreGen(world, x, y, z, Blocks.stone)) { - world.setBlock(x, y, z, BOPBlockHelper.get("gemOre"), 12, 2); + world.setBlock(x, y, z, BOPBlockHelper.get("gemOre"), 10, 2); } } } diff --git a/src/main/java/biomesoplenty/common/biomes/overworld/BiomeGenMoor.java b/src/main/java/biomesoplenty/common/biomes/overworld/BiomeGenMoor.java index 3e203433c..960318ef8 100644 --- a/src/main/java/biomesoplenty/common/biomes/overworld/BiomeGenMoor.java +++ b/src/main/java/biomesoplenty/common/biomes/overworld/BiomeGenMoor.java @@ -55,7 +55,7 @@ public class BiomeGenMoor extends BOPBiome this.bopWorldFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(BOPBlockHelper.get("foliage"), 11), 0.5D); } - @Override + @Override public void decorate(World world, Random random, int chunkX, int chunkZ) { super.decorate(world, random, chunkX, chunkZ); @@ -73,7 +73,7 @@ public class BiomeGenMoor extends BOPBiome if (block != null && block.isReplaceableOreGen(world, x, y, z, Blocks.stone)) { //TODO: setBlock() - world.setBlock(x, y, z, BOPBlockHelper.get("gemOre"), 10, 2); + world.setBlock(x, y, z, Blocks.emerald_ore, 0, 2); } } } diff --git a/src/main/java/biomesoplenty/common/biomes/overworld/BiomeGenMysticGrove.java b/src/main/java/biomesoplenty/common/biomes/overworld/BiomeGenMysticGrove.java index 8439cdbef..c6e18e572 100644 --- a/src/main/java/biomesoplenty/common/biomes/overworld/BiomeGenMysticGrove.java +++ b/src/main/java/biomesoplenty/common/biomes/overworld/BiomeGenMysticGrove.java @@ -7,8 +7,10 @@ import biomesoplenty.common.world.features.WorldGenBOPFlora; import biomesoplenty.common.world.features.WorldGenBOPTallGrass; import biomesoplenty.common.world.features.trees.WorldGenBOPSwampTree; import biomesoplenty.common.world.features.trees.WorldGenOriginalTree; +import net.minecraft.block.Block; import net.minecraft.entity.monster.EntityWitch; import net.minecraft.init.Blocks; +import net.minecraft.world.World; import net.minecraft.world.gen.feature.WorldGenAbstractTree; import java.util.Random; @@ -74,6 +76,27 @@ public class BiomeGenMysticGrove extends BOPBiome ((random.nextInt(3) == 0 ? this.worldGeneratorBigTree : ((random.nextInt(5) == 0 ? new WorldGenBOPSwampTree(Blocks.log, Blocks.leaves, 0, 0, 8, 6, BOPBlockHelper.get("flowerVine"), -1) : this.worldGeneratorTrees))))); } + + @Override + public void decorate(World world, Random random, int chunkX, int chunkZ) + { + super.decorate(world, random, chunkX, chunkZ); + int var5 = 12 + random.nextInt(6); + + for (int var6 = 0; var6 < var5; ++var6) + { + int x = chunkX + random.nextInt(16); + int y = random.nextInt(28) + 4; + int z = chunkZ + random.nextInt(16); + + Block block = world.getBlock(x, y, z); + + if (block != null && block.isReplaceableOreGen(world, x, y, z, Blocks.stone)) + { + world.setBlock(x, y, z, BOPBlockHelper.get("gemOre"), 6, 2); + } + } + } @Override public int getBiomeGrassColor(int p_150558_1_, int p_150558_2_, int p_150558_3_) diff --git a/src/main/java/biomesoplenty/common/biomes/overworld/BiomeGenOminousWoods.java b/src/main/java/biomesoplenty/common/biomes/overworld/BiomeGenOminousWoods.java index a47399e41..5c17002de 100644 --- a/src/main/java/biomesoplenty/common/biomes/overworld/BiomeGenOminousWoods.java +++ b/src/main/java/biomesoplenty/common/biomes/overworld/BiomeGenOminousWoods.java @@ -2,10 +2,12 @@ package biomesoplenty.common.biomes.overworld; import java.util.Random; +import net.minecraft.block.Block; import net.minecraft.entity.monster.EntityCaveSpider; import net.minecraft.entity.monster.EntityEnderman; import net.minecraft.entity.passive.EntityBat; import net.minecraft.init.Blocks; +import net.minecraft.world.World; import net.minecraft.world.gen.feature.WorldGenAbstractTree; import net.minecraft.world.gen.feature.WorldGenTallGrass; import biomesoplenty.api.BOPBlockHelper; @@ -71,6 +73,27 @@ public class BiomeGenOminousWoods extends BOPBiome { return random.nextInt(2) == 0 ? new WorldGenBOPTaiga2(BOPBlockHelper.get("logs1"), BOPBlockHelper.get("leaves1"), 2, 3, false, 14, 6, 0) : (random.nextInt(6) == 0 ? new WorldGenDeadTree() : new WorldGenBOPSwampTree(BOPBlockHelper.get("logs1"), BOPBlockHelper.get("leaves1"), 2, 3, 5, 4, BOPBlockHelper.get("treeMoss"), -1)); } + + @Override + public void decorate(World world, Random random, int chunkX, int chunkZ) + { + super.decorate(world, random, chunkX, chunkZ); + int var5 = 12 + random.nextInt(6); + + for (int var6 = 0; var6 < var5; ++var6) + { + int x = chunkX + random.nextInt(16); + int y = random.nextInt(28) + 4; + int z = chunkZ + random.nextInt(16); + + Block block = world.getBlock(x, y, z); + + if (block != null && block.isReplaceableOreGen(world, x, y, z, Blocks.stone)) + { + world.setBlock(x, y, z, BOPBlockHelper.get("gemOre"), 10, 2); + } + } + } @Override public int getBiomeGrassColor(int x, int y, int z) diff --git a/src/main/java/biomesoplenty/common/biomes/overworld/BiomeGenRedwoodForest.java b/src/main/java/biomesoplenty/common/biomes/overworld/BiomeGenRedwoodForest.java index 832ec5e74..464ed2306 100644 --- a/src/main/java/biomesoplenty/common/biomes/overworld/BiomeGenRedwoodForest.java +++ b/src/main/java/biomesoplenty/common/biomes/overworld/BiomeGenRedwoodForest.java @@ -58,25 +58,25 @@ public class BiomeGenRedwoodForest extends BOPBiome } @Override - public void decorate(World world, Random random, int chunkX, int chunkZ) - { - super.decorate(world, random, chunkX, chunkZ); - int var5 = 12 + random.nextInt(6); + public void decorate(World world, Random random, int chunkX, int chunkZ) + { + super.decorate(world, random, chunkX, chunkZ); + int var5 = 12 + random.nextInt(6); - for (int var6 = 0; var6 < var5; ++var6) - { - int x = chunkX + random.nextInt(16); - int y = random.nextInt(28) + 4; - int z = chunkZ + random.nextInt(16); + for (int var6 = 0; var6 < var5; ++var6) + { + int x = chunkX + random.nextInt(16); + int y = random.nextInt(28) + 4; + int z = chunkZ + random.nextInt(16); - Block block = world.getBlock(x, y, z); + Block block = world.getBlock(x, y, z); - if (block != null && block.isReplaceableOreGen(world, x, y, z, Blocks.stone)) - { - world.setBlock(x, y, z, Blocks.emerald_ore, 0, 2); - } - } - } + if (block != null && block.isReplaceableOreGen(world, x, y, z, Blocks.stone)) + { + world.setBlock(x, y, z, BOPBlockHelper.get("gemOre"), 14, 2); + } + } + } public void genTerrainBlocks(World p_150573_1_, Random p_150573_2_, Block[] p_150573_3_, byte[] p_150573_4_, int p_150573_5_, int p_150573_6_, double p_150573_7_) { diff --git a/src/main/java/biomesoplenty/common/biomes/overworld/BiomeGenSacredSprings.java b/src/main/java/biomesoplenty/common/biomes/overworld/BiomeGenSacredSprings.java index 9a3eb2d1e..686fd8ba6 100644 --- a/src/main/java/biomesoplenty/common/biomes/overworld/BiomeGenSacredSprings.java +++ b/src/main/java/biomesoplenty/common/biomes/overworld/BiomeGenSacredSprings.java @@ -8,7 +8,9 @@ import biomesoplenty.common.world.features.WorldGenBOPFlora; import biomesoplenty.common.world.features.trees.WorldGenSacredOak; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import net.minecraft.block.Block; import net.minecraft.init.Blocks; +import net.minecraft.world.World; import net.minecraft.world.biome.BiomeGenBase; import net.minecraft.world.gen.feature.WorldGenAbstractTree; import net.minecraft.world.gen.feature.WorldGenShrub; @@ -57,6 +59,27 @@ public class BiomeGenSacredSprings extends BOPBiome return random.nextInt(2) == 0 ? new WorldGenTallGrass(BOPBlockHelper.get("foliage"), 10) : (random.nextInt(4) == 0 ? new WorldGenTallGrass(BOPBlockHelper.get("foliage"), 11) : new WorldGenTallGrass(Blocks.tallgrass, 1)); } + @Override + public void decorate(World world, Random random, int chunkX, int chunkZ) + { + super.decorate(world, random, chunkX, chunkZ); + int var5 = 12 + random.nextInt(6); + + for (int var6 = 0; var6 < var5; ++var6) + { + int x = chunkX + random.nextInt(16); + int y = random.nextInt(28) + 4; + int z = chunkZ + random.nextInt(16); + + Block block = world.getBlock(x, y, z); + + if (block != null && block.isReplaceableOreGen(world, x, y, z, Blocks.stone)) + { + world.setBlock(x, y, z, BOPBlockHelper.get("gemOre"), 6, 2); + } + } + } + @Override public int getBiomeGrassColor(int p_150558_1_, int p_150558_2_, int p_150558_3_) { diff --git a/src/main/java/biomesoplenty/common/biomes/overworld/BiomeGenSeasonalForest.java b/src/main/java/biomesoplenty/common/biomes/overworld/BiomeGenSeasonalForest.java index ff59e0176..77fe0484d 100644 --- a/src/main/java/biomesoplenty/common/biomes/overworld/BiomeGenSeasonalForest.java +++ b/src/main/java/biomesoplenty/common/biomes/overworld/BiomeGenSeasonalForest.java @@ -61,27 +61,25 @@ public class BiomeGenSeasonalForest extends BOPBiome } @Override - public void decorate(World world, Random random, int chunkX, int chunkZ) - { - super.decorate(world, random, chunkX, chunkZ); - int var5 = 12 + random.nextInt(6); + public void decorate(World world, Random random, int chunkX, int chunkZ) + { + super.decorate(world, random, chunkX, chunkZ); + int var5 = 12 + random.nextInt(6); - for (int var6 = 0; var6 < var5; ++var6) - { - int x = chunkX + random.nextInt(16); - int y = random.nextInt(28) + 4; - int z = chunkZ + random.nextInt(16); + for (int var6 = 0; var6 < var5; ++var6) + { + int x = chunkX + random.nextInt(16); + int y = random.nextInt(28) + 4; + int z = chunkZ + random.nextInt(16); - //TODO: getBlock() - Block block = world.getBlock(x, y, z); + Block block = world.getBlock(x, y, z); - if (block != null && block.isReplaceableOreGen(world, x, y, z, Blocks.stone)) - { - //TODO: setBlock() - world.setBlock(x, y, z, Blocks.emerald_ore, 0, 2); - } - } - } + if (block != null && block.isReplaceableOreGen(world, x, y, z, Blocks.stone)) + { + world.setBlock(x, y, z, BOPBlockHelper.get("gemOre"), 14, 2); + } + } + } @Override public int getBiomeFoliageColor(int x, int y, int z) diff --git a/src/main/java/biomesoplenty/common/biomes/overworld/BiomeGenShield.java b/src/main/java/biomesoplenty/common/biomes/overworld/BiomeGenShield.java index 31a3d29b1..718e497f4 100644 --- a/src/main/java/biomesoplenty/common/biomes/overworld/BiomeGenShield.java +++ b/src/main/java/biomesoplenty/common/biomes/overworld/BiomeGenShield.java @@ -6,6 +6,7 @@ import biomesoplenty.common.world.features.WorldGenBOPTallGrass; import biomesoplenty.common.world.features.WorldGenMoss; import biomesoplenty.common.world.features.trees.WorldGenBOPTaiga2; import biomesoplenty.common.world.features.trees.WorldGenPineTree; +import net.minecraft.block.Block; import net.minecraft.init.Blocks; import net.minecraft.world.World; import net.minecraft.world.gen.feature.WorldGenAbstractTree; @@ -56,20 +57,35 @@ public class BiomeGenShield extends BOPBiome new WorldGenBOPTaiga2(Blocks.log, Blocks.leaves, 1, 1, false, 9, 9, 6))); } - @Override - public void decorate(World world, Random random, int chunkX, int chunkZ) - { - super.decorate(world, random, chunkX, chunkZ); + @Override + public void decorate(World world, Random random, int chunkX, int chunkZ) + { + super.decorate(world, random, chunkX, chunkZ); + int var5 = 12 + random.nextInt(6); - for (int i = 0; i < 20; i++) - { - int x = chunkX + random.nextInt(16) + 8; + for (int i = 0; i < var5; ++i) + { + int x = chunkX + random.nextInt(16); + int y = random.nextInt(28) + 4; + int z = chunkZ + random.nextInt(16); + + Block block = world.getBlock(x, y, z); + + if (block != null && block.isReplaceableOreGen(world, x, y, z, Blocks.stone)) + { + world.setBlock(x, y, z, BOPBlockHelper.get("gemOre"), 14, 2); + } + } + + for (int i = 0; i < 20; i++) + { + int x = chunkX + random.nextInt(16) + 8; short y = 58; - int z = chunkZ + random.nextInt(16) + 8; + int z = chunkZ + random.nextInt(16) + 8; - new WorldGenMoss().generate(world, random, x, y, z); - } - } + new WorldGenMoss().generate(world, random, x, y, z); + } + } @Override public int getBiomeGrassColor(int x, int y, int z) diff --git a/src/main/java/biomesoplenty/common/biomes/overworld/BiomeGenSpruceWoods.java b/src/main/java/biomesoplenty/common/biomes/overworld/BiomeGenSpruceWoods.java index 5868cc3fc..15d2e3860 100644 --- a/src/main/java/biomesoplenty/common/biomes/overworld/BiomeGenSpruceWoods.java +++ b/src/main/java/biomesoplenty/common/biomes/overworld/BiomeGenSpruceWoods.java @@ -58,25 +58,23 @@ public class BiomeGenSpruceWoods extends BOPBiome } @Override - public void decorate(World world, Random random, int chunkX, int chunkZ) - { - super.decorate(world, random, chunkX, chunkZ); - int var5 = 12 + random.nextInt(6); + public void decorate(World world, Random random, int chunkX, int chunkZ) + { + super.decorate(world, random, chunkX, chunkZ); + int var5 = 12 + random.nextInt(6); - for (int var6 = 0; var6 < var5; ++var6) - { - int x = chunkX + random.nextInt(16); - int y = random.nextInt(28) + 4; - int z = chunkZ + random.nextInt(16); + for (int var6 = 0; var6 < var5; ++var6) + { + int x = chunkX + random.nextInt(16); + int y = random.nextInt(28) + 4; + int z = chunkZ + random.nextInt(16); - //TODO: getBlock() - Block block = world.getBlock(x, y, z); + Block block = world.getBlock(x, y, z); - if (block != null && block.isReplaceableOreGen(world, x, y, z, Blocks.stone)) - { - //TODO: setBlock() - world.setBlock(x, y, z, Blocks.emerald_ore, 0, 2); - } - } - } + if (block != null && block.isReplaceableOreGen(world, x, y, z, Blocks.stone)) + { + world.setBlock(x, y, z, BOPBlockHelper.get("gemOre"), 14, 2); + } + } + } } diff --git a/src/main/java/biomesoplenty/common/biomes/overworld/BiomeGenTemperateRainforest.java b/src/main/java/biomesoplenty/common/biomes/overworld/BiomeGenTemperateRainforest.java index 89633612a..ac0824100 100644 --- a/src/main/java/biomesoplenty/common/biomes/overworld/BiomeGenTemperateRainforest.java +++ b/src/main/java/biomesoplenty/common/biomes/overworld/BiomeGenTemperateRainforest.java @@ -84,7 +84,7 @@ public class BiomeGenTemperateRainforest extends BOPBiome if (block != null && block.isReplaceableOreGen(world, x, y, z, Blocks.stone)) { //TODO: setBlock() - world.setBlock(x, y, z, Blocks.emerald_ore, 0, 2); + world.setBlock(x, y, z, BOPBlockHelper.get("gemOre"), 14, 2); } } diff --git a/src/main/java/biomesoplenty/common/biomes/overworld/BiomeGenThicket.java b/src/main/java/biomesoplenty/common/biomes/overworld/BiomeGenThicket.java index 0cda49279..6a64cab08 100644 --- a/src/main/java/biomesoplenty/common/biomes/overworld/BiomeGenThicket.java +++ b/src/main/java/biomesoplenty/common/biomes/overworld/BiomeGenThicket.java @@ -3,7 +3,9 @@ package biomesoplenty.common.biomes.overworld; import biomesoplenty.api.BOPBlockHelper; import biomesoplenty.common.biomes.BOPBiome; import biomesoplenty.common.world.features.WorldGenBOPFlora; +import net.minecraft.block.Block; import net.minecraft.init.Blocks; +import net.minecraft.world.World; import net.minecraft.world.gen.feature.WorldGenAbstractTree; import net.minecraft.world.gen.feature.WorldGenShrub; import net.minecraft.world.gen.feature.WorldGenTallGrass; @@ -50,6 +52,27 @@ public class BiomeGenThicket extends BOPBiome return random.nextInt(4) == 0 ? new WorldGenTallGrass(Blocks.tallgrass, 1) : new WorldGenTallGrass(BOPBlockHelper.get("foliage"), 10); } + @Override + public void decorate(World world, Random random, int chunkX, int chunkZ) + { + super.decorate(world, random, chunkX, chunkZ); + int var5 = 12 + random.nextInt(6); + + for (int var6 = 0; var6 < var5; ++var6) + { + int x = chunkX + random.nextInt(16); + int y = random.nextInt(28) + 4; + int z = chunkZ + random.nextInt(16); + + Block block = world.getBlock(x, y, z); + + if (block != null && block.isReplaceableOreGen(world, x, y, z, Blocks.stone)) + { + world.setBlock(x, y, z, BOPBlockHelper.get("gemOre"), 14, 2); + } + } + } + @Override //TODO: getBiomeGrassColor() public int getBiomeGrassColor(int p_150558_1_, int p_150558_2_, int p_150558_3_) diff --git a/src/main/java/biomesoplenty/common/biomes/overworld/BiomeGenWasteland.java b/src/main/java/biomesoplenty/common/biomes/overworld/BiomeGenWasteland.java index 32a949f98..a93a5a08b 100644 --- a/src/main/java/biomesoplenty/common/biomes/overworld/BiomeGenWasteland.java +++ b/src/main/java/biomesoplenty/common/biomes/overworld/BiomeGenWasteland.java @@ -2,6 +2,9 @@ package biomesoplenty.common.biomes.overworld; import java.util.Random; +import net.minecraft.block.Block; +import net.minecraft.init.Blocks; +import net.minecraft.world.World; import net.minecraft.world.gen.feature.WorldGenAbstractTree; import biomesoplenty.api.BOPBlockHelper; import biomesoplenty.common.biomes.BOPBiome; @@ -51,6 +54,27 @@ public class BiomeGenWasteland extends BOPBiome { return new WorldGenDeadTree(); } + + @Override + public void decorate(World world, Random random, int chunkX, int chunkZ) + { + super.decorate(world, random, chunkX, chunkZ); + int var5 = 12 + random.nextInt(6); + + for (int var6 = 0; var6 < var5; ++var6) + { + int x = chunkX + random.nextInt(16); + int y = random.nextInt(28) + 4; + int z = chunkZ + random.nextInt(16); + + Block block = world.getBlock(x, y, z); + + if (block != null && block.isReplaceableOreGen(world, x, y, z, Blocks.stone)) + { + world.setBlock(x, y, z, BOPBlockHelper.get("gemOre"), 10, 2); + } + } + } @Override public int getBiomeGrassColor(int p_150558_1_, int p_150558_2_, int p_150558_3_) diff --git a/src/main/java/biomesoplenty/common/biomes/overworld/BiomeGenWoodland.java b/src/main/java/biomesoplenty/common/biomes/overworld/BiomeGenWoodland.java index 26e6aab44..0e245b993 100644 --- a/src/main/java/biomesoplenty/common/biomes/overworld/BiomeGenWoodland.java +++ b/src/main/java/biomesoplenty/common/biomes/overworld/BiomeGenWoodland.java @@ -55,23 +55,23 @@ public class BiomeGenWoodland extends BOPBiome } @Override - public void decorate(World world, Random random, int chunkX, int chunkZ) - { - super.decorate(world, random, chunkX, chunkZ); - int var5 = 12 + random.nextInt(6); + public void decorate(World world, Random random, int chunkX, int chunkZ) + { + super.decorate(world, random, chunkX, chunkZ); + int var5 = 12 + random.nextInt(6); - for (int var6 = 0; var6 < var5; ++var6) - { - int x = chunkX + random.nextInt(16); - int y = random.nextInt(28) + 4; - int z = chunkZ + random.nextInt(16); + for (int var6 = 0; var6 < var5; ++var6) + { + int x = chunkX + random.nextInt(16); + int y = random.nextInt(28) + 4; + int z = chunkZ + random.nextInt(16); - Block block = world.getBlock(x, y, z); + Block block = world.getBlock(x, y, z); - if (block != null && block.isReplaceableOreGen(world, x, y, z, Blocks.stone)) - { - world.setBlock(x, y, z, Blocks.emerald_ore, 0, 2); - } - } - } + if (block != null && block.isReplaceableOreGen(world, x, y, z, Blocks.stone)) + { + world.setBlock(x, y, z, BOPBlockHelper.get("gemOre"), 14, 2); + } + } + } } diff --git a/src/main/java/biomesoplenty/common/biomes/overworld/sub/BiomeGenAlpsForest.java b/src/main/java/biomesoplenty/common/biomes/overworld/sub/BiomeGenAlpsForest.java index 3f90e51d0..f7a711036 100644 --- a/src/main/java/biomesoplenty/common/biomes/overworld/sub/BiomeGenAlpsForest.java +++ b/src/main/java/biomesoplenty/common/biomes/overworld/sub/BiomeGenAlpsForest.java @@ -51,23 +51,25 @@ public class BiomeGenAlpsForest extends BOPSubBiome } @Override - public void decorate(World world, Random random, int chunkX, int chunkZ) - { - super.decorate(world, random, chunkX, chunkZ); - int var5 = 12 + random.nextInt(6); + public void decorate(World world, Random random, int chunkX, int chunkZ) + { + super.decorate(world, random, chunkX, chunkZ); + int var5 = 12 + random.nextInt(6); - for (int var6 = 0; var6 < var5; ++var6) - { - int x = chunkX + random.nextInt(16); - int y = random.nextInt(28) + 4; - int z = chunkZ + random.nextInt(16); + for (int var6 = 0; var6 < var5; ++var6) + { + int x = chunkX + random.nextInt(16); + int y = random.nextInt(28) + 4; + int z = chunkZ + random.nextInt(16); + + //TODO: getBlock() + Block block = world.getBlock(x, y, z); - Block block = world.getBlock(x, y, z); - - if (block != null && block.isReplaceableOreGen(world, x, y, z, Blocks.stone)) - { - world.setBlock(x, y, z, BOPBlockHelper.get("gemOre"), 8, 2); - } - } - } + if (block != null && block.isReplaceableOreGen(world, x, y, z, Blocks.stone)) + { + //TODO: setBlock() + world.setBlock(x, y, z, Blocks.emerald_ore, 0, 2); + } + } + } } diff --git a/src/main/java/biomesoplenty/common/biomes/overworld/sub/BiomeGenCanyonRavine.java b/src/main/java/biomesoplenty/common/biomes/overworld/sub/BiomeGenCanyonRavine.java index f6ebd4aef..4df4f78c6 100644 --- a/src/main/java/biomesoplenty/common/biomes/overworld/sub/BiomeGenCanyonRavine.java +++ b/src/main/java/biomesoplenty/common/biomes/overworld/sub/BiomeGenCanyonRavine.java @@ -56,25 +56,27 @@ public class BiomeGenCanyonRavine extends BOPSubBiome } @Override - public void decorate(World world, Random random, int chunkX, int chunkZ) - { - super.decorate(world, random, chunkX, chunkZ); - int var5 = 12 + random.nextInt(6); + public void decorate(World world, Random random, int chunkX, int chunkZ) + { + super.decorate(world, random, chunkX, chunkZ); + int var5 = 12 + random.nextInt(6); - for (int var6 = 0; var6 < var5; ++var6) - { - int x = chunkX + random.nextInt(16); - int y = random.nextInt(28) + 4; - int z = chunkZ + random.nextInt(16); + for (int var6 = 0; var6 < var5; ++var6) + { + int x = chunkX + random.nextInt(16); + int y = random.nextInt(28) + 4; + int z = chunkZ + random.nextInt(16); + + //TODO: getBlock() + Block block = world.getBlock(x, y, z); - Block block = world.getBlock(x, y, z); - - if (block != null && block.isReplaceableOreGen(world, x, y, z, Blocks.stone)) - { - world.setBlock(x, y, z, BOPBlockHelper.get("gemOre"), 2, 2); - } - } - } + if (block != null && block.isReplaceableOreGen(world, x, y, z, Blocks.stone)) + { + //TODO: setBlock() + world.setBlock(x, y, z, Blocks.emerald_ore, 0, 2); + } + } + } @Override //TODO: getBiomeFoliageColor() diff --git a/src/main/java/biomesoplenty/common/biomes/overworld/sub/BiomeGenOasis.java b/src/main/java/biomesoplenty/common/biomes/overworld/sub/BiomeGenOasis.java index e22d77a48..27825598c 100644 --- a/src/main/java/biomesoplenty/common/biomes/overworld/sub/BiomeGenOasis.java +++ b/src/main/java/biomesoplenty/common/biomes/overworld/sub/BiomeGenOasis.java @@ -73,7 +73,7 @@ public class BiomeGenOasis extends BOPSubBiome if (block != null && block.isReplaceableOreGen(world, x, y, z, Blocks.stone)) { - world.setBlock(x, y, z, BOPBlockHelper.get("gemOre"), 6, 2); + world.setBlock(x, y, z, BOPBlockHelper.get("gemOre"), 2, 2); } } } diff --git a/src/main/java/biomesoplenty/common/biomes/overworld/sub/BiomeGenTropics.java b/src/main/java/biomesoplenty/common/biomes/overworld/sub/BiomeGenTropics.java index a1e977118..b1606a779 100644 --- a/src/main/java/biomesoplenty/common/biomes/overworld/sub/BiomeGenTropics.java +++ b/src/main/java/biomesoplenty/common/biomes/overworld/sub/BiomeGenTropics.java @@ -94,7 +94,7 @@ public class BiomeGenTropics extends BOPSubBiome if (block != null && block.isReplaceableOreGen(world, x, y, z, Blocks.stone)) { //TODO: setBlock() - world.setBlock(x, y, z, BOPBlockHelper.get("gemOre"), 6, 2); + world.setBlock(x, y, z, BOPBlockHelper.get("gemOre"), 12, 2); } } } diff --git a/src/main/java/biomesoplenty/common/biomes/overworld/sub/BiomeGenVolcano.java b/src/main/java/biomesoplenty/common/biomes/overworld/sub/BiomeGenVolcano.java index 211fa6378..732a1dea1 100644 --- a/src/main/java/biomesoplenty/common/biomes/overworld/sub/BiomeGenVolcano.java +++ b/src/main/java/biomesoplenty/common/biomes/overworld/sub/BiomeGenVolcano.java @@ -1,5 +1,10 @@ package biomesoplenty.common.biomes.overworld.sub; +import java.util.Random; + +import net.minecraft.block.Block; +import net.minecraft.init.Blocks; +import net.minecraft.world.World; import net.minecraft.world.biome.BiomeGenBase.Height; import biomesoplenty.api.BOPBlockHelper; import biomesoplenty.common.biomes.BOPSubBiome; @@ -33,6 +38,29 @@ public class BiomeGenVolcano extends BOPSubBiome this.bopWorldFeatures.setFeature("lavaSpoutsPerChunk", 1); this.bopWorldFeatures.setFeature("generateAsh", true); } + + @Override + public void decorate(World world, Random random, int chunkX, int chunkZ) + { + super.decorate(world, random, chunkX, chunkZ); + int var5 = 12 + random.nextInt(6); + + for (int var6 = 0; var6 < var5; ++var6) + { + int x = chunkX + random.nextInt(16); + int y = random.nextInt(28) + 4; + int z = chunkZ + random.nextInt(16); + + //TODO: getBlock() + Block block = world.getBlock(x, y, z); + + if (block != null && block.isReplaceableOreGen(world, x, y, z, Blocks.stone)) + { + //TODO: setBlock() + world.setBlock(x, y, z, BOPBlockHelper.get("gemOre"), 12, 2); + } + } + } @Override public int getSkyColorByTemp(float par1) diff --git a/src/main/java/biomesoplenty/common/blocks/BlockBOPGems.java b/src/main/java/biomesoplenty/common/blocks/BlockBOPGems.java index babce6b09..054819467 100644 --- a/src/main/java/biomesoplenty/common/blocks/BlockBOPGems.java +++ b/src/main/java/biomesoplenty/common/blocks/BlockBOPGems.java @@ -18,7 +18,7 @@ import biomesoplenty.api.BOPItemHelper; public class BlockBOPGems extends Block { - public static final String[] types = new String[] {"amethystore", "amethystblock", "rubyore", "rubyblock", "peridotore", "peridotblock", "topazore", "topazblock", "tanzaniteore", "tanzaniteblock", "malachiteore", "malachiteblock", "sapphireore", "sapphireblock"}; + public static final String[] types = new String[] {"amethystore", "amethystblock", "rubyore", "rubyblock", "peridotore", "peridotblock", "topazore", "topazblock", "tanzaniteore", "tanzaniteblock", "malachiteore", "malachiteblock", "sapphireore", "sapphireblock", "amberore", "amberblock"}; private IIcon[] textures; public BlockBOPGems() @@ -164,6 +164,14 @@ public class BlockBOPGems extends Block { return meta; } + if (meta == 14) + { + return 6; + } + if (meta == 15) + { + return meta; + } return meta; } diff --git a/src/main/java/biomesoplenty/common/core/BOPCrafting.java b/src/main/java/biomesoplenty/common/core/BOPCrafting.java index 33b1e13b1..32e2e76c7 100644 --- a/src/main/java/biomesoplenty/common/core/BOPCrafting.java +++ b/src/main/java/biomesoplenty/common/core/BOPCrafting.java @@ -163,6 +163,7 @@ public class BOPCrafting GameRegistry.addRecipe(new ItemStack(BOPBlockHelper.get("gemOre"), 1, 9), new Object[] {"AAA", "AAA", "AAA", 'A', new ItemStack(BOPItemHelper.get("gems"), 1, 4)}); GameRegistry.addRecipe(new ItemStack(BOPBlockHelper.get("gemOre"), 1, 11), new Object[] {"AAA", "AAA", "AAA", 'A', new ItemStack(BOPItemHelper.get("gems"), 1, 5)}); GameRegistry.addRecipe(new ItemStack(BOPBlockHelper.get("gemOre"), 1, 13), new Object[] {"AAA", "AAA", "AAA", 'A', new ItemStack(BOPItemHelper.get("gems"), 1, 6)}); + GameRegistry.addRecipe(new ItemStack(BOPBlockHelper.get("gemOre"), 1, 15), new Object[] {"AAA", "AAA", "AAA", 'A', new ItemStack(BOPItemHelper.get("gems"), 1, 7)}); GameRegistry.addRecipe(new ItemStack(BOPBlockHelper.get("ash"), 1), new Object[] {"AA", "AA", 'A', new ItemStack(BOPItemHelper.get("misc"), 1, 1)}); GameRegistry.addRecipe(new ItemStack(BOPBlockHelper.get("mudBricks"), 1), new Object[] {"MM", "MM", 'M', new ItemStack(BOPItemHelper.get("misc"), 1, 0)}); GameRegistry.addRecipe(new ItemStack(BOPItemHelper.get("crystal"), 1), new Object[] {"CC", "CC", 'C', new ItemStack(BOPItemHelper.get("misc"), 1, 4)}); @@ -273,6 +274,7 @@ public class BOPCrafting GameRegistry.addShapelessRecipe(new ItemStack(BOPItemHelper.get("gems"), 9, 4), new Object[] {new ItemStack(BOPBlockHelper.get("gemOre"), 1, 9)}); GameRegistry.addShapelessRecipe(new ItemStack(BOPItemHelper.get("gems"), 9, 5), new Object[] {new ItemStack(BOPBlockHelper.get("gemOre"), 1, 11)}); GameRegistry.addShapelessRecipe(new ItemStack(BOPItemHelper.get("gems"), 9, 6), new Object[] {new ItemStack(BOPBlockHelper.get("gemOre"), 1, 13)}); + GameRegistry.addShapelessRecipe(new ItemStack(BOPItemHelper.get("gems"), 9, 7), new Object[] {new ItemStack(BOPBlockHelper.get("gemOre"), 1, 15)}); //Bone Segments > Bonemeal GameRegistry.addShapelessRecipe(new ItemStack(Items.dye, 3, 15), new Object[] {new ItemStack(BOPBlockHelper.get("bones"), 1, 0)}); @@ -332,6 +334,7 @@ public class BOPCrafting OreDictionary.registerOre("gemTanzanite", new ItemStack(BOPItemHelper.get("gems"), 1, 4)); OreDictionary.registerOre("gemMalachite", new ItemStack(BOPItemHelper.get("gems"), 1, 5)); OreDictionary.registerOre("gemSapphire", new ItemStack(BOPItemHelper.get("gems"), 1, 6)); + OreDictionary.registerOre("gemAmber", new ItemStack(BOPItemHelper.get("gems"), 1, 7)); OreDictionary.registerOre("oreRuby", new ItemStack(BOPBlockHelper.get("gemOre"), 1, 2)); OreDictionary.registerOre("oreTopaz", new ItemStack(BOPBlockHelper.get("gemOre"), 1, 6)); @@ -339,6 +342,7 @@ public class BOPCrafting OreDictionary.registerOre("oreTanzanite", new ItemStack(BOPBlockHelper.get("gemOre"), 1, 8)); OreDictionary.registerOre("oreMalachite", new ItemStack(BOPBlockHelper.get("gemOre"), 1, 10)); OreDictionary.registerOre("oreSapphire", new ItemStack(BOPBlockHelper.get("gemOre"), 1, 12)); + OreDictionary.registerOre("oreAmber", new ItemStack(BOPBlockHelper.get("gemOre"), 1, 14)); OreDictionary.registerOre("treeSapling", new ItemStack(BOPBlockHelper.get("saplings"), 1, OreDictionary.WILDCARD_VALUE)); OreDictionary.registerOre("treeSapling", new ItemStack(BOPBlockHelper.get("colorizedSaplings"), 1, OreDictionary.WILDCARD_VALUE)); diff --git a/src/main/java/biomesoplenty/common/itemblocks/ItemBlockGems.java b/src/main/java/biomesoplenty/common/itemblocks/ItemBlockGems.java index 8e7462cf9..e5a9770ca 100644 --- a/src/main/java/biomesoplenty/common/itemblocks/ItemBlockGems.java +++ b/src/main/java/biomesoplenty/common/itemblocks/ItemBlockGems.java @@ -6,7 +6,7 @@ import net.minecraft.item.ItemStack; public class ItemBlockGems extends ItemBlock { - private static final String[] types = new String[] {"amethystore", "amethystblock", "rubyore", "rubyblock", "peridotore", "peridotblock", "topazore", "topazblock", "tanzaniteore", "tanzaniteblock", "malachiteore", "malachiteblock", "sapphireore", "sapphireblock"}; + private static final String[] types = new String[] {"amethystore", "amethystblock", "rubyore", "rubyblock", "peridotore", "peridotblock", "topazore", "topazblock", "tanzaniteore", "tanzaniteblock", "malachiteore", "malachiteblock", "sapphireore", "sapphireblock", "amberore", "amberblock"}; public ItemBlockGems(Block block) { diff --git a/src/main/java/biomesoplenty/common/items/ItemGems.java b/src/main/java/biomesoplenty/common/items/ItemGems.java index 22bb1a65e..875fcf897 100644 --- a/src/main/java/biomesoplenty/common/items/ItemGems.java +++ b/src/main/java/biomesoplenty/common/items/ItemGems.java @@ -13,7 +13,7 @@ import cpw.mods.fml.relauncher.SideOnly; public class ItemGems extends Item { - private static String[] gems = {"amethyst", "ruby", "peridot", "topaz", "tanzanite", "malachite", "sapphire"}; + private static String[] gems = {"amethyst", "ruby", "peridot", "topaz", "tanzanite", "malachite", "sapphire", "amber"}; @SideOnly(Side.CLIENT) private IIcon[] textures; diff --git a/src/main/resources/assets/biomesoplenty/lang/en_US.lang b/src/main/resources/assets/biomesoplenty/lang/en_US.lang index 95dd862b6..469488f3b 100644 --- a/src/main/resources/assets/biomesoplenty/lang/en_US.lang +++ b/src/main/resources/assets/biomesoplenty/lang/en_US.lang @@ -153,6 +153,8 @@ tile.gemOre.malachiteore.name=Malachite Ore tile.gemOre.malachiteblock.name=Block of Malachite tile.gemOre.sapphireore.name=Sapphire Ore tile.gemOre.sapphireblock.name=Block of Sapphire +tile.gemOre.amberore.name=Amber Ore +tile.gemOre.amberblock.name=Block of Amber tile.moss.name=Moss @@ -333,6 +335,7 @@ item.gems.topaz.name=Topaz item.gems.tanzanite.name=Tanzanite item.gems.malachite.name=Malachite item.gems.sapphire.name=Sapphire +item.gems.amber.name=Amber item.pickaxeMud.name=Muddy Pickaxe item.axeMud.name=Muddy Axe diff --git a/src/main/resources/assets/biomesoplenty/textures/blocks/amberblock.png b/src/main/resources/assets/biomesoplenty/textures/blocks/amberblock.png new file mode 100644 index 000000000..c28d22b13 Binary files /dev/null and b/src/main/resources/assets/biomesoplenty/textures/blocks/amberblock.png differ diff --git a/src/main/resources/assets/biomesoplenty/textures/blocks/amberore.png b/src/main/resources/assets/biomesoplenty/textures/blocks/amberore.png new file mode 100644 index 000000000..57e974812 Binary files /dev/null and b/src/main/resources/assets/biomesoplenty/textures/blocks/amberore.png differ diff --git a/src/main/resources/assets/biomesoplenty/textures/items/amber.png b/src/main/resources/assets/biomesoplenty/textures/items/amber.png new file mode 100644 index 000000000..945b11dc1 Binary files /dev/null and b/src/main/resources/assets/biomesoplenty/textures/items/amber.png differ