This commit is contained in:
Adubbz 2014-05-03 09:51:37 +10:00
commit 777b148931
22 changed files with 50 additions and 44 deletions

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, BOPBlockHelper.get("gemOre"), 0, 2);
world.setBlock(x, y, z, Blocks.emerald_ore, 0, 2);
}
}
}

View file

@ -14,7 +14,7 @@ import java.util.Random;
public class BiomeGenCanyon extends BOPBiome
{
private static final Height biomeHeight = new Height(1.5F, 2.0F);
private static final Height biomeHeight = new Height(5.0F, 0.025F);
public BiomeGenCanyon(int id)
{
@ -31,13 +31,13 @@ public class BiomeGenCanyon extends BOPBiome
this.topBlock = BOPBlockHelper.get("hardDirt");
this.fillerBlock = BOPBlockHelper.get("hardDirt");
this.theBiomeDecorator.grassPerChunk = 5;
this.theBiomeDecorator.treesPerChunk = 7;
this.theBiomeDecorator.treesPerChunk = 3;
this.theBiomeDecorator.flowersPerChunk = -999;
this.bopWorldFeatures.setFeature("bromeliadsPerChunk", 2);
this.bopWorldFeatures.setFeature("waterReedsPerChunk", 2);
this.bopWorldFeatures.setFeature("bromeliadsPerChunk", 3);
this.bopWorldFeatures.setFeature("grassSplatterPerChunk", 4);
this.bopWorldFeatures.setFeature("waterReedsPerChunk", 4);
this.bopWorldFeatures.setFeature("generatePumpkins", false);
this.bopWorldFeatures.setFeature("generateCanyon", true);
this.bopWorldFeatures.setFeature("bopGrassPerChunk", 5);
@ -48,7 +48,7 @@ public class BiomeGenCanyon extends BOPBiome
//TODO: getRandomWorldGenForTrees()
public WorldGenAbstractTree func_150567_a(Random random)
{
return random.nextInt(9) == 0 ? new WorldGenPineTree() : new WorldGenBOPShrub(Blocks.log2, Blocks.leaves2, 0, 0, 86, 96, BOPBlockHelper.get("hardDirt"));
return random.nextInt(5) == 0 ? new WorldGenPineTree() : new WorldGenBOPShrub(Blocks.log2, Blocks.leaves2, 0, 0, 64, 256, BOPBlockHelper.get("hardDirt"));
}
@Override

View file

@ -86,7 +86,7 @@ public class BiomeGenConiferousForest extends BOPBiome
if (block != null && block.isReplaceableOreGen(world, x, y, z, Blocks.stone))
{
//TODO: setBlock()
world.setBlock(x, y, z, BOPBlockHelper.get("gemOre"), 0, 2);
world.setBlock(x, y, z, Blocks.emerald_ore, 0, 2);
}
}
}

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, BOPBlockHelper.get("gemOre"), 0, 2);
world.setBlock(x, y, z, Blocks.emerald_ore, 0, 2);
}
}
}

View file

@ -78,7 +78,7 @@ public class BiomeGenGrove extends BOPBiome
if (block != null && block.isReplaceableOreGen(world, x, y, z, Blocks.stone))
{
//TODO: setBlock()
world.setBlock(x, y, z, BOPBlockHelper.get("gemOre"), 0, 2);
world.setBlock(x, y, z, Blocks.emerald_ore, 0, 2);
}
}
}

View file

@ -12,7 +12,7 @@ import java.util.Random;
public class BiomeGenHighland extends BOPBiome
{
private static final Height biomeHeight = new Height(0.5F, 1.0F);
private static final Height biomeHeight = new Height(2.5F, 0.5F);
public BiomeGenHighland(int id)
{
@ -54,7 +54,7 @@ public class BiomeGenHighland extends BOPBiome
if (block != null && block.isReplaceableOreGen(world, x, y, z, Blocks.stone))
{
//TODO: setBlock()
world.setBlock(x, y, z, BOPBlockHelper.get("gemOre"), 0, 2);
world.setBlock(x, y, z, Blocks.emerald_ore, 0, 2);
}
}
}

View file

@ -69,7 +69,7 @@ public class BiomeGenJadeCliffs extends BOPBiome
if (block != null && block.isReplaceableOreGen(world, x, y, z, Blocks.stone))
{
world.setBlock(x, y, z, BOPBlockHelper.get("gemOre"), 0, 2);
world.setBlock(x, y, z, Blocks.emerald_ore, 0, 2);
}
}
}

View file

@ -66,7 +66,7 @@ public class BiomeGenMapleWoods extends BOPBiome
if (block != null && block.isReplaceableOreGen(world, x, y, z, Blocks.stone))
{
world.setBlock(x, y, z, BOPBlockHelper.get("gemOre"), 0, 2);
world.setBlock(x, y, z, Blocks.emerald_ore, 0, 2);
}
}
}

View file

@ -13,7 +13,7 @@ import java.util.Random;
public class BiomeGenMoor extends BOPBiome
{
private static final Height biomeHeight = new Height(0.4F, 0.5F);
private static final Height biomeHeight = new Height(1.5F, 0.025F);
public BiomeGenMoor(int id)
{
@ -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"), 0, 2);
world.setBlock(x, y, z, BOPBlockHelper.get("gemOre"), 10, 2);
}
}
}

View file

@ -14,7 +14,7 @@ import java.util.Random;
public class BiomeGenMountain extends BOPBiome
{
private static final Height biomeHeight = new Height(0.4F, 0.8F);
private static final Height biomeHeight = new Height(2.5F, 0.5F);
public BiomeGenMountain(int id)
{
@ -64,7 +64,7 @@ public class BiomeGenMountain extends BOPBiome
if (block != null && block.isReplaceableOreGen(world, x, y, z, Blocks.stone))
{
world.setBlock(x, y, z, BOPBlockHelper.get("gemOre"), 0, 2);
world.setBlock(x, y, z, Blocks.emerald_ore, 0, 2);
}
}
}

View file

@ -73,7 +73,7 @@ public class BiomeGenRedwoodForest extends BOPBiome
if (block != null && block.isReplaceableOreGen(world, x, y, z, Blocks.stone))
{
world.setBlock(x, y, z, BOPBlockHelper.get("gemOre"), 0, 2);
world.setBlock(x, y, z, Blocks.emerald_ore, 0, 2);
}
}
}

View file

@ -78,7 +78,7 @@ public class BiomeGenSeasonalForest extends BOPBiome
if (block != null && block.isReplaceableOreGen(world, x, y, z, Blocks.stone))
{
//TODO: setBlock()
world.setBlock(x, y, z, BOPBlockHelper.get("gemOre"), 0, 2);
world.setBlock(x, y, z, Blocks.emerald_ore, 0, 2);
}
}
}

View file

@ -75,7 +75,7 @@ public class BiomeGenSpruceWoods extends BOPBiome
if (block != null && block.isReplaceableOreGen(world, x, y, z, Blocks.stone))
{
//TODO: setBlock()
world.setBlock(x, y, z, BOPBlockHelper.get("gemOre"), 0, 2);
world.setBlock(x, y, z, Blocks.emerald_ore, 0, 2);
}
}
}

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, BOPBlockHelper.get("gemOre"), 0, 2);
world.setBlock(x, y, z, Blocks.emerald_ore, 0, 2);
}
}

View file

@ -70,7 +70,7 @@ public class BiomeGenTimber extends BOPBiome
if (block != null && block.isReplaceableOreGen(world, x, y, z, Blocks.stone))
{
world.setBlock(x, y, z, BOPBlockHelper.get("gemOre"), 0, 2);
world.setBlock(x, y, z, Blocks.emerald_ore, 0, 2);
}
}
}

View file

@ -6,7 +6,7 @@ import biomesoplenty.common.configuration.BOPConfigurationMisc;
public class BiomeGenVolcano extends BOPBiome
{
private static final Height biomeHeight = new Height(0.6F, 0.9F);
private static final Height biomeHeight = new Height(5.0F, 0.025F);
public BiomeGenVolcano(int id)
{

View file

@ -70,7 +70,7 @@ public class BiomeGenWoodland extends BOPBiome
if (block != null && block.isReplaceableOreGen(world, x, y, z, Blocks.stone))
{
world.setBlock(x, y, z, BOPBlockHelper.get("gemOre"), 0, 2);
world.setBlock(x, y, z, Blocks.emerald_ore, 0, 2);
}
}
}

View file

@ -103,23 +103,23 @@ public class BOPBiomes
registerBiome(new BiomeEntry(new BiomeGenBrushland(BOPConfigurationIDs.brushlandID).setBiomeName("Brushland"), TemperatureType.HOT, 10));
registerBiome(new BiomeEntry(new BiomeGenCanyon(BOPConfigurationIDs.canyonID).setBiomeName("Canyon"), TemperatureType.HOT, 10));
registerBiome(new BiomeEntry(new BiomeGenChaparral(BOPConfigurationIDs.chaparralID).setBiomeName("Chaparral"), TemperatureType.WARM, 10));
registerBiome(new BiomeEntry(new BiomeGenCherryBlossomGrove(BOPConfigurationIDs.cherryBlossomGroveID).setBiomeName("Cherry Blossom Grove"), TemperatureType.COOL, 5));
registerBiome(new BiomeEntry(new BiomeGenCherryBlossomGrove(BOPConfigurationIDs.cherryBlossomGroveID).setBiomeName("Cherry Blossom Grove"), TemperatureType.COOL, 3));
registerBiome(new BiomeEntry(new BiomeGenConiferousForest(BOPConfigurationIDs.coniferousForestID).setBiomeName("Coniferous Forest"), TemperatureType.WARM, 10));
registerBiome(new BiomeEntry(new BiomeGenConiferousForestSnow(BOPConfigurationIDs.coniferousForestSnowID).setBiomeName("Snowy Coniferous Forest"), TemperatureType.ICY, 10));
registerBiome(new BiomeEntry(new BiomeGenCrag(BOPConfigurationIDs.cragID).setBiomeName("Crag"), TemperatureType.COOL, 5));
registerBiome(new BiomeEntry(new BiomeGenCrag(BOPConfigurationIDs.cragID).setBiomeName("Crag"), TemperatureType.COOL, 3));
registerBiome(new BiomeEntry(new BiomeGenDeadForest(BOPConfigurationIDs.deadForestID).setBiomeName("Dead Forest"), TemperatureType.COOL, 10));
registerBiome(new BiomeEntry(new BiomeGenDeadSwamp(BOPConfigurationIDs.deadSwampID).setBiomeName("Dead Swamp"), TemperatureType.WARM, 10));
registerBiome(new BiomeEntry(new BiomeGenDeciduousForest(BOPConfigurationIDs.deciduousForestID).setBiomeName("Deciduous Forest"), TemperatureType.WARM, 10));
registerBiome(new BiomeEntry(new BiomeGenDunes(BOPConfigurationIDs.dunesID).setBiomeName("Dunes"), TemperatureType.HOT, 10));
registerBiome(new BiomeEntry(new BiomeGenFen(BOPConfigurationIDs.fenID).setBiomeName("Fen"), TemperatureType.WARM, 10));
registerBiome(new BiomeEntry(new BiomeGenFlowerField(BOPConfigurationIDs.flowerFieldID).setBiomeName("Flower Field"), TemperatureType.WARM, 5));
registerBiome(new BiomeEntry(new BiomeGenFlowerField(BOPConfigurationIDs.flowerFieldID).setBiomeName("Flower Field"), TemperatureType.WARM, 3));
registerBiome(new BiomeEntry(new BiomeGenFrostForest(BOPConfigurationIDs.frostForestID).setBiomeName("Frost Forest"), TemperatureType.ICY, 10));
registerBiome(new BiomeEntry(new BiomeGenGrassland(BOPConfigurationIDs.grasslandID).setBiomeName("Grassland"), TemperatureType.COOL, 10));
registerBiome(new BiomeEntry(new BiomeGenGrove(BOPConfigurationIDs.groveID).setBiomeName("Grove"), TemperatureType.COOL, 5));
registerBiome(new BiomeEntry(new BiomeGenHeathland(BOPConfigurationIDs.heathlandID).setBiomeName("Heathland"), TemperatureType.WARM, 10));
registerBiome(new BiomeEntry(new BiomeGenHighland(BOPConfigurationIDs.highlandID).setBiomeName("Highland"), TemperatureType.WARM, 10));
registerBiome(new BiomeEntry(new BiomeGenJadeCliffs(BOPConfigurationIDs.jadeCliffsID).setBiomeName("Jade Cliffs"), TemperatureType.WARM, 5));
registerBiome(new BiomeEntry(new BiomeGenLavenderFields(BOPConfigurationIDs.lavenderFieldsID).setBiomeName("Lavender Fields"), TemperatureType.WARM, 5));
registerBiome(new BiomeEntry(new BiomeGenLavenderFields(BOPConfigurationIDs.lavenderFieldsID).setBiomeName("Lavender Fields"), TemperatureType.WARM, 3));
registerBiome(new BiomeEntry(new BiomeGenLushDesert(BOPConfigurationIDs.lushDesertID).setBiomeName("Lush Desert"), TemperatureType.HOT, 5));
registerBiome(new BiomeEntry(new BiomeGenLushSwamp(BOPConfigurationIDs.lushSwampID).setBiomeName("Lush Swamp"), TemperatureType.WARM, 10));
registerBiome(new BiomeEntry(new BiomeGenMapleWoods(BOPConfigurationIDs.mapleWoodsID).setBiomeName("Maple Woods"), TemperatureType.COOL, 10));
@ -127,15 +127,15 @@ public class BOPBiomes
registerBiome(new BiomeEntry(new BiomeGenMeadow(BOPConfigurationIDs.meadowID).setBiomeName("Meadow"), TemperatureType.COOL, 10));
registerBiome(new BiomeEntry(new BiomeGenMoor(BOPConfigurationIDs.moorID).setBiomeName("Moor"), TemperatureType.COOL, 10));
registerBiome(new BiomeEntry(new BiomeGenMountain(BOPConfigurationIDs.mountainID).setBiomeName("Mountain"), TemperatureType.WARM, 10));
registerBiome(new BiomeEntry(new BiomeGenMysticGrove(BOPConfigurationIDs.mysticGroveID).setBiomeName("Mystic Grove"), TemperatureType.WARM, 2));
registerBiome(new BiomeEntry(new BiomeGenOminousWoods(BOPConfigurationIDs.ominousWoodsID).setBiomeName("Ominous Woods"), TemperatureType.COOL, 2));
registerBiome(new BiomeEntry(new BiomeGenOriginValley(BOPConfigurationIDs.originValleyID).setBiomeName("Origin Valley"), TemperatureType.WARM, 5));
registerBiome(new BiomeEntry(new BiomeGenMysticGrove(BOPConfigurationIDs.mysticGroveID).setBiomeName("Mystic Grove"), TemperatureType.WARM, 3));
registerBiome(new BiomeEntry(new BiomeGenOminousWoods(BOPConfigurationIDs.ominousWoodsID).setBiomeName("Ominous Woods"), TemperatureType.COOL, 3));
registerBiome(new BiomeEntry(new BiomeGenOriginValley(BOPConfigurationIDs.originValleyID).setBiomeName("Origin Valley"), TemperatureType.WARM, 1));
registerBiome(new BiomeEntry(new BiomeGenOutback(BOPConfigurationIDs.outbackID).setBiomeName("Outback"), TemperatureType.HOT, 10));
registerBiome(new BiomeEntry(new BiomeGenPrairie(BOPConfigurationIDs.prairieID).setBiomeName("Prairie"), TemperatureType.WARM, 10));
registerBiome(new BiomeEntry(new BiomeGenQuagmire(BOPConfigurationIDs.quagmireID).setBiomeName("Quagmire"), TemperatureType.WARM, 10));
registerBiome(new BiomeEntry(new BiomeGenRainforest(BOPConfigurationIDs.rainforestID).setBiomeName("Rainforest"), TemperatureType.WARM, 10));
registerBiome(new BiomeEntry(new BiomeGenRainforest(BOPConfigurationIDs.rainforestID).setBiomeName("Rainforest"), TemperatureType.WARM, 5));
registerBiome(new BiomeEntry(new BiomeGenRedwoodForest(BOPConfigurationIDs.redwoodForestID).setBiomeName("Redwood Forest"), TemperatureType.WARM, 10));
registerBiome(new BiomeEntry(new BiomeGenSacredSprings(BOPConfigurationIDs.sacredSpringsID).setBiomeName("Sacred Springs"), TemperatureType.WARM, 5));
registerBiome(new BiomeEntry(new BiomeGenSacredSprings(BOPConfigurationIDs.sacredSpringsID).setBiomeName("Sacred Springs"), TemperatureType.WARM, 3));
registerBiome(new BiomeEntry(new BiomeGenSeasonalForest(BOPConfigurationIDs.seasonalForestID).setBiomeName("Seasonal Forest"), TemperatureType.COOL, 10));
registerBiome(new BiomeEntry(new BiomeGenShield(BOPConfigurationIDs.shieldID).setBiomeName("Shield"), TemperatureType.COOL, 10));
registerBiome(new BiomeEntry(new BiomeGenShrubland(BOPConfigurationIDs.shrublandID).setBiomeName("Shrubland"), TemperatureType.COOL, 10));
@ -143,13 +143,13 @@ public class BOPBiomes
registerBiome(new BiomeEntry(new BiomeGenSludgepit(BOPConfigurationIDs.sludgepitID).setBiomeName("Sludgepit"), TemperatureType.WARM, 10));
registerBiome(new BiomeEntry(new BiomeGenSpruceWoods(BOPConfigurationIDs.spruceWoodsID).setBiomeName("Spruce Woods"), TemperatureType.WARM, 10));
registerBiome(new BiomeEntry(new BiomeGenTemperateRainforest(BOPConfigurationIDs.temperateRainforestID).setBiomeName("Temperate Rainforest"), TemperatureType.WARM, 10));
registerBiome(new BiomeEntry(new BiomeGenThicket(BOPConfigurationIDs.thicketID).setBiomeName("Thicket"), TemperatureType.COOL, 10));
registerBiome(new BiomeEntry(new BiomeGenTimber(BOPConfigurationIDs.timberID).setBiomeName("Timber"), TemperatureType.COOL, 10));
registerBiome(new BiomeEntry(new BiomeGenThicket(BOPConfigurationIDs.thicketID).setBiomeName("Thicket"), TemperatureType.COOL, 5));
registerBiome(new BiomeEntry(new BiomeGenTimber(BOPConfigurationIDs.timberID).setBiomeName("Timber"), TemperatureType.COOL, 5));
registerBiome(new BiomeEntry(new BiomeGenTropicalRainforest(BOPConfigurationIDs.tropicalRainforestID).setBiomeName("Tropical Rainforest"), TemperatureType.HOT, 5));
registerBiome(new BiomeEntry(new BiomeGenTropics(BOPConfigurationIDs.tropicsID).setBiomeName("Tropics"), TemperatureType.HOT, 5));
registerBiome(new BiomeEntry(new BiomeGenTropics(BOPConfigurationIDs.tropicsID).setBiomeName("Tropics"), TemperatureType.HOT, 3));
registerBiome(new BiomeEntry(new BiomeGenTundra(BOPConfigurationIDs.tundraID).setBiomeName("Tundra"), TemperatureType.ICY, 10));
registerBiome(new BiomeEntry(new BiomeGenVolcano(BOPConfigurationIDs.volcanoID).setBiomeName("Volcano"), TemperatureType.HOT, 10));
registerBiome(new BiomeEntry(new BiomeGenWasteland(BOPConfigurationIDs.wastelandID).setBiomeName("Wasteland"), TemperatureType.HOT, 5));
registerBiome(new BiomeEntry(new BiomeGenVolcano(BOPConfigurationIDs.volcanoID).setBiomeName("Volcano"), TemperatureType.HOT, 5));
registerBiome(new BiomeEntry(new BiomeGenWasteland(BOPConfigurationIDs.wastelandID).setBiomeName("Wasteland"), TemperatureType.HOT, 3));
registerBiome(new BiomeEntry(new BiomeGenWetland(BOPConfigurationIDs.wetlandID).setBiomeName("Wetland"), TemperatureType.WARM, 10));
registerBiome(new BiomeEntry(new BiomeGenWoodland(BOPConfigurationIDs.woodlandID).setBiomeName("Woodland"), TemperatureType.WARM, 10));

View file

@ -84,7 +84,7 @@ public class EntityBird extends EntityFlyingCreature
for (int var4 = 0; var4 < var3; ++var4)
{
this.entityDropItem(new ItemStack(Items.feather, 1, 1), 0.0F);
this.entityDropItem(new ItemStack(Items.feather, 1), 0.0F);
}
}

View file

@ -36,7 +36,7 @@ public class WorldGenGrassSplatter extends WorldGeneratorBOP
int var999 = random.nextInt(5);
//TODO: isAirBlock()
if (world.isAirBlock(randX, randY, randZ) && (world.getBlock(randX, randY - 1, randZ) == BOPBlockHelper.get("hardSand") || world.getBlock(randX, randY - 1, randZ) == Blocks.sand || world.getBlock(randX, randY - 1, randZ) == Blocks.stone))
if (world.isAirBlock(randX, randY, randZ) && (world.getBlock(randX, randY - 1, randZ) == BOPBlockHelper.get("hardSand") || world.getBlock(randX, randY - 1, randZ) == BOPBlockHelper.get("hardDirt") || world.getBlock(randX, randY - 1, randZ) == Blocks.sand || world.getBlock(randX, randY - 1, randZ) == Blocks.stone))
{
world.setBlock(randX, randY - 1, randZ, Blocks.grass, 0, 2);

View file

@ -121,6 +121,9 @@ public class WorldGenPalmTree1 extends WorldGenAbstractTree
public void buildBlock(World world, int x, int y, int z, Block block, int meta)
{
world.setBlock(x, y, z, block, meta, 2);
if (world.isAirBlock(x, y, z) || world.getBlock(x, y, z).isLeaves(world, x, y, z))
{
world.setBlock(x, y, z, block, meta, 2);
}
}
}

View file

@ -11,6 +11,7 @@ import biomesoplenty.api.BOPBlockHelper;
public class WorldGenPineTree extends WorldGenAbstractTree
{
public WorldGenPineTree()
{
super(false);
@ -215,7 +216,9 @@ public class WorldGenPineTree extends WorldGenAbstractTree
public void buildBlock(World world, int x, int y, int z, Block block, int meta)
{
//TODO: setBlock()
world.setBlock(x, y, z, block, meta, 2);
if (world.isAirBlock(x, y, z) || world.getBlock(x, y, z).isLeaves(world, x, y, z))
{
world.setBlock(x, y, z, block, meta, 2);
}
}
}