etc/BiomesOPlenty
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Added Amber Ore for forest biomes, tweaked existing ore generation

Browse source
This commit is contained in:
Matt Caughey 2014-05-18 09:54:20 -04:00
parent cc133672ef
commit 50f2076da8
38 changed files with 487 additions and 247 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

34
src/main/java/biomesoplenty/common/biomes/overworld/BiomeGenAlps.java
View file

@ -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);
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))
{
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);
}
}
}
}

1
src/main/java/biomesoplenty/common/biomes/overworld/BiomeGenBog.java
View file

@ -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)

2
src/main/java/biomesoplenty/common/biomes/overworld/BiomeGenBorealForest.java
View file

@ -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);
}
}
}

23
src/main/java/biomesoplenty/common/biomes/overworld/BiomeGenBrushland.java
View file

@ -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;
@ -50,6 +52,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_)
{

34
src/main/java/biomesoplenty/common/biomes/overworld/BiomeGenCanyon.java
View file

@ -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);
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))
{
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()

36
src/main/java/biomesoplenty/common/biomes/overworld/BiomeGenConiferousForest.java
View file

@ -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);
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);
}
}
}
}

36
src/main/java/biomesoplenty/common/biomes/overworld/BiomeGenCrag.java
View file

@ -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)

25
src/main/java/biomesoplenty/common/biomes/overworld/BiomeGenDeadForest.java
View file

@ -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;
@ -52,6 +54,29 @@ public class BiomeGenDeadForest extends BOPBiome
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_)
{

2
src/main/java/biomesoplenty/common/biomes/overworld/BiomeGenDeciduousForest.java
View file

@ -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);
}
}
}

38
src/main/java/biomesoplenty/common/biomes/overworld/BiomeGenFungiForest.java
View file

@ -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()

36
src/main/java/biomesoplenty/common/biomes/overworld/BiomeGenGrove.java
View file

@ -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);
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 getBiomeGrassColor(int x, int y, int z)

36
src/main/java/biomesoplenty/common/biomes/overworld/BiomeGenMapleWoods.java
View file

@ -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);
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))
{
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);
}
}
}
}

2
src/main/java/biomesoplenty/common/biomes/overworld/BiomeGenMarsh.java
View file

@ -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);
}
}
}

4
src/main/java/biomesoplenty/common/biomes/overworld/BiomeGenMoor.java
View file

@ -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);
}
}
}

23
src/main/java/biomesoplenty/common/biomes/overworld/BiomeGenMysticGrove.java
View file

@ -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;
@ -75,6 +77,27 @@ public class BiomeGenMysticGrove extends BOPBiome
((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_)
{

23
src/main/java/biomesoplenty/common/biomes/overworld/BiomeGenOminousWoods.java
View file

@ -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;
@ -72,6 +74,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)
{

32
src/main/java/biomesoplenty/common/biomes/overworld/BiomeGenRedwoodForest.java
View file

@ -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_)
{

23
src/main/java/biomesoplenty/common/biomes/overworld/BiomeGenSacredSprings.java
View file

@ -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_)
{

34
src/main/java/biomesoplenty/common/biomes/overworld/BiomeGenSeasonalForest.java
View file

@ -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)

38
src/main/java/biomesoplenty/common/biomes/overworld/BiomeGenShield.java
View file

@ -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)

34
src/main/java/biomesoplenty/common/biomes/overworld/BiomeGenSpruceWoods.java
View file

@ -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);
}
}
}
}

2
src/main/java/biomesoplenty/common/biomes/overworld/BiomeGenTemperateRainforest.java
View file

@ -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);
}
}

23
src/main/java/biomesoplenty/common/biomes/overworld/BiomeGenThicket.java
View file

@ -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_)

24
src/main/java/biomesoplenty/common/biomes/overworld/BiomeGenWasteland.java
View file

@ -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;
@ -52,6 +55,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_)
{

32
src/main/java/biomesoplenty/common/biomes/overworld/BiomeGenWoodland.java
View file

@ -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);
}
}
}
}

34
src/main/java/biomesoplenty/common/biomes/overworld/sub/BiomeGenAlpsForest.java
View file

@ -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);
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))
{
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);
}
}
}
}

34
src/main/java/biomesoplenty/common/biomes/overworld/sub/BiomeGenCanyonRavine.java
View file

@ -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);
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))
{
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()

2
src/main/java/biomesoplenty/common/biomes/overworld/sub/BiomeGenOasis.java
View file

@ -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);
}
}
}

2
src/main/java/biomesoplenty/common/biomes/overworld/sub/BiomeGenTropics.java
View file

@ -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);
}
}
}

28
src/main/java/biomesoplenty/common/biomes/overworld/sub/BiomeGenVolcano.java
View file

@ -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;
@ -34,6 +39,29 @@ public class BiomeGenVolcano extends BOPSubBiome
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)
{

10
src/main/java/biomesoplenty/common/blocks/BlockBOPGems.java
View file

@ -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;
}

4
src/main/java/biomesoplenty/common/core/BOPCrafting.java
View file

@ -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));

2
src/main/java/biomesoplenty/common/itemblocks/ItemBlockGems.java
View file

@ -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)
{

2
src/main/java/biomesoplenty/common/items/ItemGems.java
View file

@ -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;

3
src/main/resources/assets/biomesoplenty/lang/en_US.lang
View file

@ -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

BIN
src/main/resources/assets/biomesoplenty/textures/blocks/amberblock.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 586 B

BIN
src/main/resources/assets/biomesoplenty/textures/blocks/amberore.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 467 B

BIN
src/main/resources/assets/biomesoplenty/textures/items/amber.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 482 B