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

Promised Land tweaks

This commit is contained in:
Matt Caughey 2013-11-09 01:30:41 -05:00
parent 2291f1df5a
commit 20c86af349
7 changed files with 53 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
common/biomesoplenty/biomes/promisedland/BiomeGenPromisedLandForest.java
View File

@ -3,6 +3,7 @@ package biomesoplenty.biomes.promisedland;
import java.awt.Color;
import java.util.Random;
import worldcore.interfaces.IWCFog;
import net.minecraft.block.Block;
import net.minecraft.world.World;
import net.minecraft.world.biome.BiomeGenBase;
@ -15,7 +16,7 @@ import biomesoplenty.worldgen.WorldGenWaterSpring;
import biomesoplenty.worldgen.tree.WorldGenPromisedTree;
import biomesoplenty.worldgen.tree.WorldGenPromisedTree2;
public class BiomeGenPromisedLandForest extends BiomeGenBase
public class BiomeGenPromisedLandForest extends BiomeGenBase implements IWCFog
{
private WorldGenerator theWorldGenerator;
private BiomeDecoratorBOP customBiomeDecorator;
@ -86,6 +87,19 @@ public class BiomeGenPromisedLandForest extends BiomeGenBase
{
return 7925125;
}
@Override
public int getFogColour()
{
return 16765286;
}
@Override
public float getFogCloseness()
{
// TODO Auto-generated method stub
return 1.0F;
}
@Override
public void decorate(World par1World, Random par2Random, int par3, int par4)

16
common/biomesoplenty/biomes/promisedland/BiomeGenPromisedLandPlains.java
View File

@ -3,6 +3,7 @@ package biomesoplenty.biomes.promisedland;
import java.awt.Color;
import java.util.Random;
import worldcore.interfaces.IWCFog;
import net.minecraft.block.Block;
import net.minecraft.world.World;
import net.minecraft.world.biome.BiomeGenBase;
@ -13,7 +14,7 @@ import biomesoplenty.configuration.configfile.BOPConfigurationMisc;
import biomesoplenty.worldgen.WorldGenPromisedBush;
import biomesoplenty.worldgen.WorldGenWaterSpring;
public class BiomeGenPromisedLandPlains extends BiomeGenBase
public class BiomeGenPromisedLandPlains extends BiomeGenBase implements IWCFog
{
private WorldGenerator theWorldGenerator;
private BiomeDecoratorBOP customBiomeDecorator;
@ -81,6 +82,19 @@ public class BiomeGenPromisedLandPlains extends BiomeGenBase
{
return 11266663;
}
@Override
public int getFogColour()
{
return 16765286;
}
@Override
public float getFogCloseness()
{
// TODO Auto-generated method stub
return 1.0F;
}
@Override
public void decorate(World par1World, Random par2Random, int par3, int par4)

16
common/biomesoplenty/biomes/promisedland/BiomeGenPromisedLandSwamp.java
View File

@ -3,6 +3,7 @@ package biomesoplenty.biomes.promisedland;
import java.awt.Color;
import java.util.Random;
import worldcore.interfaces.IWCFog;
import net.minecraft.block.Block;
import net.minecraft.world.World;
import net.minecraft.world.biome.BiomeGenBase;
@ -14,7 +15,7 @@ import biomesoplenty.worldgen.WorldGenWaterSpring;
import biomesoplenty.worldgen.tree.WorldGenPromisedTree;
import biomesoplenty.worldgen.tree.WorldGenPromisedWillowTree;
public class BiomeGenPromisedLandSwamp extends BiomeGenBase
public class BiomeGenPromisedLandSwamp extends BiomeGenBase implements IWCFog
{
private WorldGenerator theWorldGenerator;
private BiomeDecoratorBOP customBiomeDecorator;
@ -86,6 +87,19 @@ public class BiomeGenPromisedLandSwamp extends BiomeGenBase
{
return 4583331;
}
@Override
public int getFogColour()
{
return 16765286;
}
@Override
public float getFogCloseness()
{
// TODO Auto-generated method stub
return 1.0F;
}
@Override
public void decorate(World par1World, Random par2Random, int par3, int par4)

8
common/biomesoplenty/blocks/BlockBOPPlant.java
View File

@ -118,7 +118,7 @@ public class BlockBOPPlant extends BlockFlower implements IShearable
else if (metadata == 3) //Dune Grass
return blockID == Block.sand.blockID;
else if (metadata == 4) //Holy Tall Grass
return blockID == Blocks.holyGrass.get().blockID;
return blockID == Blocks.holyGrass.get().blockID || blockID == Blocks.holyDirt.get().blockID;
else if (metadata == 5)
return blockID == Block.grass.blockID || blockID == Block.dirt.blockID || blockID == Block.slowSand.blockID;
else if (metadata == 6)
@ -135,6 +135,8 @@ public class BlockBOPPlant extends BlockFlower implements IShearable
return blockID == Block.slowSand.blockID;
else if (metadata == 14)
return blockID == Block.waterStill.blockID;
else if (metadata == 15)
return blockID == Block.grass.blockID || blockID == Block.dirt.blockID || blockID == Block.tilledField.blockID || blockID == Blocks.longGrass.get().blockID || blockID == Blocks.holyGrass.get().blockID || blockID == Blocks.holyDirt.get().blockID;
else
return blockID == Block.grass.blockID || blockID == Block.dirt.blockID || blockID == Block.tilledField.blockID || blockID == Blocks.longGrass.get().blockID;
}
@ -143,7 +145,7 @@ public class BlockBOPPlant extends BlockFlower implements IShearable
protected boolean canThisPlantGrowOnThisBlockID(int id)
{
return id == Blocks.driedDirt.get().blockID || id == Block.sand.blockID || id == Blocks.redRock.get().blockID || id == Blocks.holyGrass.get().blockID
|| id == Block.grass.blockID || id == Block.dirt.blockID || id == Block.tilledField.blockID;
|| id == Block.grass.blockID || id == Block.dirt.blockID || id == Block.tilledField.blockID || id == Blocks.holyDirt.get().blockID;
}
@Override
@ -194,7 +196,7 @@ public class BlockBOPPlant extends BlockFlower implements IShearable
return id == Block.waterStill.blockID;
case 15: // Reed
return idRoot == Block.grass.blockID || idRoot == Block.dirt.blockID || idRoot == Block.tilledField.blockID || idRoot == Blocks.longGrass.get().blockID;
return idRoot == Block.grass.blockID || idRoot == Block.dirt.blockID || idRoot == Block.tilledField.blockID || idRoot == Blocks.longGrass.get().blockID || idRoot == Blocks.holyGrass.get().blockID || idRoot == Blocks.holyDirt.get().blockID;
default:
return id == Block.grass.blockID || id == Block.dirt.blockID || id == Block.tilledField.blockID;

2
common/biomesoplenty/configuration/BOPEntities.java
View File

@ -108,7 +108,7 @@ public class BOPEntities {
if (Biomes.promisedLandForest.isPresent() && Biomes.promisedLandSwamp.isPresent() && Biomes.promisedLandPlains.isPresent())
{
EntityRegistry.addSpawn(EntityBird.class, 1, 1, 3, EnumCreatureType.monster, Biomes.promisedLandForest.get(), Biomes.promisedLandSwamp.get(), Biomes.promisedLandPlains.get());
EntityRegistry.addSpawn(EntityBird.class, 10, 3, 5, EnumCreatureType.creature, Biomes.promisedLandForest.get(), Biomes.promisedLandSwamp.get(), Biomes.promisedLandPlains.get());
}
}
}

2
common/biomesoplenty/configuration/configfile/BOPConfigurationMisc.java
View File

@ -57,7 +57,7 @@ public class BOPConfigurationMisc
//Hard-Coded Colors
skyColors = config.get("Hard-Coded Colors", "Enable Sky Colors", true).getBoolean(false);
promisedLandSkyColor = config.get("Hard-Coded Colors", "Promised Land Sky Color", 50175, null).getInt();
promisedLandSkyColor = config.get("Hard-Coded Colors", "Promised Land Sky Color", 5883101, null).getInt();
grassColourSmoothingArea = config.get("Biome Transition Colour Smoothing", "Grass Colour Smoothing Area", 1, "In Vanilla this is 1. Set to 5 for optimal smoothing").getInt();
leavesColourSmoothingArea = config.get("Biome Transition Colour Smoothing", "Leaves Colour Smoothing Area", 1, "In Vanilla this is 1. Set to 5 for optimal smoothing").getInt();

5
common/biomesoplenty/entities/EntityBird.java
View File

@ -69,10 +69,7 @@ public class EntityBird extends EntityFlyingMob
{
axisalignedbb.offset(d4, d5, d6);
if (!this.worldObj.getCollidingBoundingBoxes(this, axisalignedbb).isEmpty()
|| this.isInWater() ?
this.worldObj.getBlockMaterial(MathHelper.floor_double(this.waypointX), MathHelper.floor_double(this.waypointY), MathHelper.floor_double(this.waypointZ)) == Material.water
: this.worldObj.isAnyLiquid(axisalignedbb))
if (!this.worldObj.getCollidingBoundingBoxes(this, axisalignedbb).isEmpty())
{
return false;
}