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

Merge branch 'master' of https://github.com/BiomesOPlenty/BiomesOPlenty

This commit is contained in:
Adubbz 2014-05-19 10:35:30 +10:00
parent 91593111d2 83ab6c1d35
commit ce8647410f
40 changed files with 598 additions and 273 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
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);
//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);
}
}
}
}

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

36
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);
//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()

42
src/main/java/biomesoplenty/common/biomes/overworld/BiomeGenConiferousForest.java
View File

@ -3,6 +3,7 @@ package biomesoplenty.common.biomes.overworld;
import biomesoplenty.api.BOPBlockHelper;
import biomesoplenty.common.biomes.BOPBiome;
import biomesoplenty.common.world.features.WorldGenBOPDoubleFlora;
import biomesoplenty.common.world.features.WorldGenBOPFlora;
import biomesoplenty.common.world.features.WorldGenBOPTallGrass;
import biomesoplenty.common.world.features.trees.WorldGenBOPTaiga2;
import biomesoplenty.common.world.features.trees.WorldGenBOPTaiga3;
@ -50,6 +51,9 @@ public class BiomeGenConiferousForest extends BOPBiome
this.bopWorldFeatures.setFeature("algaePerChunk", 2);
this.bopWorldFeatures.setFeature("bopGrassPerChunk", 10);
this.bopWorldFeatures.setFeature("bopFlowersPerChunk", 25);
this.bopWorldFeatures.weightedFlowerGen.put(new WorldGenBOPFlora(BOPBlockHelper.get("flowers2"), 5), 15);
this.bopWorldFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(Blocks.tallgrass, 1), 0.5D);
this.bopWorldFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(BOPBlockHelper.get("foliage"), 2), 1D);
@ -68,26 +72,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);
}
}
}
}

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

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

38
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);
//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)

38
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);
//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);
}
}
}
}

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

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

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)

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

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

36
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);
//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);
}
}
}
}

36
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);
//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()

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

63
src/main/java/biomesoplenty/common/biomes/overworld/BiomeGenSpruceWoods.java → src/main/java/biomesoplenty/common/biomes/overworld/sub/BiomeGenSpruceWoods.java
View File

@ -1,35 +1,36 @@
package biomesoplenty.common.biomes.overworld;
package biomesoplenty.common.biomes.overworld.sub;
import java.util.Random;
import biomesoplenty.api.BOPBlockHelper;
import biomesoplenty.common.biomes.BOPBiome;
import biomesoplenty.common.world.features.WorldGenBOPFlora;
import biomesoplenty.common.world.features.WorldGenBOPTallGrass;
import biomesoplenty.common.world.features.trees.WorldGenBOPTaiga2;
import net.minecraft.block.Block;
import net.minecraft.entity.passive.EntityWolf;
import net.minecraft.init.Blocks;
import net.minecraft.world.World;
import net.minecraft.world.gen.feature.WorldGenAbstractTree;
import net.minecraft.world.gen.feature.WorldGenTaiga2;
import biomesoplenty.api.BOPBlockHelper;
import biomesoplenty.common.biomes.BOPSubBiome;
import biomesoplenty.common.world.features.WorldGenBOPTallGrass;
import biomesoplenty.common.world.features.trees.WorldGenBOPTaiga2;
import java.util.Random;
public class BiomeGenSpruceWoods extends BOPBiome
public class BiomeGenSpruceWoods extends BOPSubBiome
{
public BiomeGenSpruceWoods(int id)
{
super(id);
this.zoom = 0.25D;
this.threshold = 0.25D;
this.setColor(6396257);
this.setTemperatureRainfall(0.6F, 0.7F);
this.setTemperatureRainfall(0.7F, 0.8F);
this.spawnableCreatureList.add(new SpawnListEntry(EntityWolf.class, 8, 4, 4));
this.theBiomeDecorator.treesPerChunk = 10;
this.theBiomeDecorator.treesPerChunk = 20;
this.theBiomeDecorator.grassPerChunk = 6;
this.theBiomeDecorator.mushroomsPerChunk = 4;
this.bopWorldFeatures.setFeature("bopFlowersPerChunk", 100);
this.bopWorldFeatures.setFeature("poisonIvyPerChunk", 1);
this.bopWorldFeatures.setFeature("sproutsPerChunk", 3);
this.bopWorldFeatures.setFeature("berryBushesPerChunk", 3);
@ -42,8 +43,6 @@ public class BiomeGenSpruceWoods extends BOPBiome
this.bopWorldFeatures.setFeature("bopGrassPerChunk", 100);
this.bopWorldFeatures.weightedFlowerGen.put(new WorldGenBOPFlora(BOPBlockHelper.get("flowers2"), 5), 15);
this.bopWorldFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(BOPBlockHelper.get("foliage"), 10), 0.5D);
this.bopWorldFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(BOPBlockHelper.get("foliage"), 11), 0.5D);
this.bopWorldFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(Blocks.tallgrass, 1), 1D);
@ -54,29 +53,27 @@ public class BiomeGenSpruceWoods extends BOPBiome
public WorldGenAbstractTree func_150567_a(Random random)
{
return random.nextInt(3) == 0 ? new WorldGenBOPTaiga2(Blocks.log, Blocks.leaves, 1, 1, false, 9, 9, 6) :
new WorldGenTaiga2(false);
(random.nextInt(2) == 0 ? worldGeneratorTrees : new WorldGenTaiga2(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);
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/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;
@ -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)

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

77
src/main/java/biomesoplenty/common/core/BOPBiomes.java
View File

@ -1,6 +1,77 @@
package biomesoplenty.common.core;
import static biomesoplenty.api.content.BOPCBiomes.*;
import static biomesoplenty.api.content.BOPCBiomes.alps;
import static biomesoplenty.api.content.BOPCBiomes.alpsForest;
import static biomesoplenty.api.content.BOPCBiomes.arctic;
import static biomesoplenty.api.content.BOPCBiomes.bambooForest;
import static biomesoplenty.api.content.BOPCBiomes.bayou;
import static biomesoplenty.api.content.BOPCBiomes.bog;
import static biomesoplenty.api.content.BOPCBiomes.boneyard;
import static biomesoplenty.api.content.BOPCBiomes.borealForest;
import static biomesoplenty.api.content.BOPCBiomes.brushland;
import static biomesoplenty.api.content.BOPCBiomes.canyon;
import static biomesoplenty.api.content.BOPCBiomes.canyonRavine;
import static biomesoplenty.api.content.BOPCBiomes.chaparral;
import static biomesoplenty.api.content.BOPCBiomes.cherryBlossomGrove;
import static biomesoplenty.api.content.BOPCBiomes.coniferousForest;
import static biomesoplenty.api.content.BOPCBiomes.corruptedSands;
import static biomesoplenty.api.content.BOPCBiomes.crag;
import static biomesoplenty.api.content.BOPCBiomes.deadForest;
import static biomesoplenty.api.content.BOPCBiomes.deadSwamp;
import static biomesoplenty.api.content.BOPCBiomes.deciduousForest;
import static biomesoplenty.api.content.BOPCBiomes.dryRiver;
import static biomesoplenty.api.content.BOPCBiomes.dunes;
import static biomesoplenty.api.content.BOPCBiomes.fen;
import static biomesoplenty.api.content.BOPCBiomes.flowerField;
import static biomesoplenty.api.content.BOPCBiomes.frostForest;
import static biomesoplenty.api.content.BOPCBiomes.fungiForest;
import static biomesoplenty.api.content.BOPCBiomes.glacier;
import static biomesoplenty.api.content.BOPCBiomes.grassland;
import static biomesoplenty.api.content.BOPCBiomes.grove;
import static biomesoplenty.api.content.BOPCBiomes.heathland;
import static biomesoplenty.api.content.BOPCBiomes.highland;
import static biomesoplenty.api.content.BOPCBiomes.jadeCliffs;
import static biomesoplenty.api.content.BOPCBiomes.lavenderFields;
import static biomesoplenty.api.content.BOPCBiomes.lushDesert;
import static biomesoplenty.api.content.BOPCBiomes.lushRiver;
import static biomesoplenty.api.content.BOPCBiomes.lushSwamp;
import static biomesoplenty.api.content.BOPCBiomes.mapleWoods;
import static biomesoplenty.api.content.BOPCBiomes.marsh;
import static biomesoplenty.api.content.BOPCBiomes.meadow;
import static biomesoplenty.api.content.BOPCBiomes.meadowForest;
import static biomesoplenty.api.content.BOPCBiomes.moor;
import static biomesoplenty.api.content.BOPCBiomes.mountain;
import static biomesoplenty.api.content.BOPCBiomes.mysticGrove;
import static biomesoplenty.api.content.BOPCBiomes.oasis;
import static biomesoplenty.api.content.BOPCBiomes.ominousWoods;
import static biomesoplenty.api.content.BOPCBiomes.originValley;
import static biomesoplenty.api.content.BOPCBiomes.outback;
import static biomesoplenty.api.content.BOPCBiomes.phantasmagoricInferno;
import static biomesoplenty.api.content.BOPCBiomes.prairie;
import static biomesoplenty.api.content.BOPCBiomes.quagmire;
import static biomesoplenty.api.content.BOPCBiomes.rainforest;
import static biomesoplenty.api.content.BOPCBiomes.redwoodForest;
import static biomesoplenty.api.content.BOPCBiomes.sacredSprings;
import static biomesoplenty.api.content.BOPCBiomes.scrubland;
import static biomesoplenty.api.content.BOPCBiomes.seasonalForest;
import static biomesoplenty.api.content.BOPCBiomes.shield;
import static biomesoplenty.api.content.BOPCBiomes.shrubland;
import static biomesoplenty.api.content.BOPCBiomes.silkglades;
import static biomesoplenty.api.content.BOPCBiomes.sludgepit;
import static biomesoplenty.api.content.BOPCBiomes.snowyConiferousForest;
import static biomesoplenty.api.content.BOPCBiomes.spruceWoods;
import static biomesoplenty.api.content.BOPCBiomes.steppe;
import static biomesoplenty.api.content.BOPCBiomes.temperateRainforest;
import static biomesoplenty.api.content.BOPCBiomes.thicket;
import static biomesoplenty.api.content.BOPCBiomes.tropicalRainforest;
import static biomesoplenty.api.content.BOPCBiomes.tropics;
import static biomesoplenty.api.content.BOPCBiomes.tundra;
import static biomesoplenty.api.content.BOPCBiomes.undergarden;
import static biomesoplenty.api.content.BOPCBiomes.visceralHeap;
import static biomesoplenty.api.content.BOPCBiomes.volcano;
import static biomesoplenty.api.content.BOPCBiomes.wasteland;
import static biomesoplenty.api.content.BOPCBiomes.wetland;
import static biomesoplenty.api.content.BOPCBiomes.woodland;
import java.util.ArrayList;
import java.util.List;
@ -68,7 +139,6 @@ import biomesoplenty.common.biomes.overworld.BiomeGenSeasonalForest;
import biomesoplenty.common.biomes.overworld.BiomeGenShield;
import biomesoplenty.common.biomes.overworld.BiomeGenShrubland;
import biomesoplenty.common.biomes.overworld.BiomeGenSludgepit;
import biomesoplenty.common.biomes.overworld.BiomeGenSpruceWoods;
import biomesoplenty.common.biomes.overworld.BiomeGenSteppe;
import biomesoplenty.common.biomes.overworld.BiomeGenTemperateRainforest;
import biomesoplenty.common.biomes.overworld.BiomeGenThicket;
@ -86,6 +156,7 @@ import biomesoplenty.common.biomes.overworld.sub.BiomeGenOasis;
import biomesoplenty.common.biomes.overworld.sub.BiomeGenQuagmire;
import biomesoplenty.common.biomes.overworld.sub.BiomeGenScrubland;
import biomesoplenty.common.biomes.overworld.sub.BiomeGenSilkglades;
import biomesoplenty.common.biomes.overworld.sub.BiomeGenSpruceWoods;
import biomesoplenty.common.biomes.overworld.sub.BiomeGenTropics;
import biomesoplenty.common.biomes.overworld.sub.BiomeGenVolcano;
import biomesoplenty.common.biomes.overworld.tech.BiomeGenDryRiver;
@ -180,7 +251,6 @@ public class BOPBiomes
shield = registerOverworldBiome(BiomeGenShield.class, "Shield", TemperatureType.COOL, 7);
shrubland = registerOverworldBiome(BiomeGenShrubland.class, "Shrubland", TemperatureType.COOL, 10);
sludgepit = registerOverworldBiome(BiomeGenSludgepit.class, "Sludgepit", TemperatureType.WARM, 5);
spruceWoods = registerOverworldBiome(BiomeGenSpruceWoods.class, "Spruce Woods", TemperatureType.WARM, 10);
steppe = registerOverworldBiome(BiomeGenSteppe.class, "Steppe", TemperatureType.HOT, 7);
temperateRainforest = registerOverworldBiome(BiomeGenTemperateRainforest.class, "Temperate Rainforest", TemperatureType.WARM, 10);
thicket = registerOverworldBiome(BiomeGenThicket.class, "Thicket", TemperatureType.COOL, 5);
@ -199,6 +269,7 @@ public class BOPBiomes
meadowForest = registerOverworldSubBiome(BiomeGenMeadowForest.class, "Meadow Forest", 10, meadow.biomeID);
alpsForest = registerOverworldSubBiome(BiomeGenAlpsForest.class, "Alps Forest", 10, alps.biomeID);
canyonRavine = registerOverworldSubBiome(BiomeGenCanyonRavine.class, "Canyon Ravine", 10, canyon.biomeID);
spruceWoods = registerOverworldSubBiome(BiomeGenSpruceWoods.class, "Spruce Woods", 10, BiomeGenBase.forest.biomeID);
//Ocean Biomes
coralReef = registerOverworldSubBiome(BiomeGenCoralReef.class, "Coral Reef", 10, BiomeGenBase.ocean.biomeID);

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

27
src/main/resources/assets/biomesoplenty/lang/it_IT.lang
View File

@ -8,7 +8,7 @@ tile.hardIce.name=Ghiaccio Cristallino
tile.driedDirt.name=Terra Arida
tile.cragRock.name=Roccia Falesia
tile.mudBricks.name=Mattoni di Fango
tile.spectralSoil.name=Terra Spettrale
tile.biomeBlock.name=Essenza di Bioma Grezzo
tile.crystal.name=Cristallo Celestiale
tile.rocks.limestone.name=Calcare
@ -129,12 +129,12 @@ tile.overgrownNetherrack.name=Netherrack Ricoperto di Vegetazione
tile.treeMoss.name=Muschio Parassita
tile.flowerVine.name=Rampicante Fiorente
tile.coral.kelpsingle.name=Alga Kelp
tile.coral.pinkcoral.name=Corallo Rosa
tile.coral.orangecoral.name=Corallo Arancione
tile.coral.bluecoral.name=Corallo Blu
tile.coral.glowcoral.name=Corallo Luminescente
tile.coral.algae.name=Alghe
tile.coral1.kelpsingle.name=Alga Kelp
tile.coral1.pinkcoral.name=Corallo Rosa
tile.coral1.orangecoral.name=Corallo Arancione
tile.coral1.bluecoral.name=Corallo Blu
tile.coral1.glowcoral.name=Corallo Luminescente
tile.coral2.algae.name=Alghe
tile.bopGrass.spectralmoss.name=Muschio Spettrale
tile.bopGrass.smolderinggrass.name=Blocco d'Erba Ardente
@ -153,6 +153,8 @@ tile.gemOre.malachiteore.name=Malachite Grezza
tile.gemOre.malachiteblock.name=Blocco di Malachite
tile.gemOre.sapphireore.name=Zaffiro Grezzo
tile.gemOre.sapphireblock.name=Blocco di Zaffiro
tile.gemOre.amberore.name=Ambra Grezza
tile.gemOre.amberblock.name=Blocco d'Ambra
tile.moss.name=Muschio
@ -174,7 +176,6 @@ tile.bones.bones_large.name=Segmento Grande d'Ossa
tile.grave.name=Lapide
tile.stoneDoubleSlab.mudbrickSlab.name=Lastra di Mattoni di Fango
tile.stoneSingleSlab.mudbrickSlab.name=Lastra di Mattoni di Fango
tile.planks.sacredoakPlank.name=Assi in Legno di Quercia Consacrata
@ -334,6 +335,7 @@ item.gems.topaz.name=Topazio
item.gems.tanzanite.name=Tanzanite
item.gems.malachite.name=Malachite
item.gems.sapphire.name=Zaffiro
item.gems.amber.name=Ambra
item.pickaxeMud.name=Piccone di Fango
item.axeMud.name=Ascia di Fango
@ -389,6 +391,9 @@ item.biomeBook.name=Libro dei Biomi
item.biomeFinder.name=Radar di Biomi
item.biomeEssence.name=Essenza di Bioma
item.poisonBucket.name=Secchio di Veleno
item.honeyBucket.name=Secchio di Miele
tile.poison.name=Liquido Velenoso
tile.springWater.name=Acqua Primaverile
tile.honey.name=Miele
@ -397,6 +402,12 @@ fluid.poison=Liquido Velenoso
fluid.springWater=Acqua Primaverile
fluid.honey=Miele
biomeRadar.target=Obiettivo:
biomeRadar.foundBiome=Bioma trovato!
biomeRadar.scanBiome=Click destro per cercare bioma
enderporter.prevent=Una misteriosa energia non ti permette di usarlo in questo mondo.
phrase.bop.useBOPATGWorldtype=Per generare i nuovi biomi si devono usare i tipi di mondo Biomes O' Plenty oppure ATG. Questo messaggio sarà mostrato una sola volta.
phrase.bop.useBOPWorldtype=Per generare i nuovi biomi si deve usare il tipo di mondo Biomes O' Plenty. Questo messaggio sarà mostrato una sola volta.
phrase.bop.updateAvaliable=Non stai usando l'ultima versione raccomandata di Biomes O' Plenty. L'ultima versione raccomandata è: v%s per Minecraft %s

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