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

Finished initial updates for biomes. Yay!

This commit is contained in:
Adubbz 2016-03-14 22:41:57 +11:00
parent 435c614893
commit f2998d6182
38 changed files with 106 additions and 142 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/main/java/biomesoplenty/common/biome/overworld/BiomeGenGrassland.java
View File

@ -36,12 +36,11 @@ import net.minecraft.util.math.BlockPos;
public class BiomeGenGrassland extends BOPBiome {
public BiomeGenGrassland() {
super("grassland", new PropsBuilder("Grassland").withGuiColour(0x7FDB7D).withTemperature(0.6F).withRainfall(0.7F));
// terrain
this.terrainSettings.avgHeight(64).heightVariation(6, 25).octaves(0, 1, 2, 2, 1, 0).sidewaysNoise(0.1D);
this.setColor(0x7FDB7D);
this.setTemperatureRainfall(0.6F, 0.7F);
this.terrainSettings.avgHeight(64).heightVariation(6, 25).octaves(0, 1, 2, 2, 1, 0).sidewaysNoise(0.1D);
this.addWeight(BOPClimates.COOL_TEMPERATE, 7);
this.addWeight(BOPClimates.WET_TEMPERATE, 3);

6
src/main/java/biomesoplenty/common/biome/overworld/BiomeGenGravelBeach.java
View File

@ -15,10 +15,10 @@ public class BiomeGenGravelBeach extends BOPBiome
{
public BiomeGenGravelBeach()
{
super("gravel_beach", new PropsBuilder("Gravel Beach").withGuiColour(0x908884));
// terrain
this.terrainSettings.avgHeight(64).heightVariation(3, 4);
this.setColor(0x908884);
this.terrainSettings.avgHeight(64).heightVariation(3, 4);
this.canSpawnInBiome = false;
this.canGenerateVillages = false;

5
src/main/java/biomesoplenty/common/biome/overworld/BiomeGenGrove.java
View File

@ -35,12 +35,11 @@ public class BiomeGenGrove extends BOPBiome
public BiomeGenGrove()
{
super("grove", new PropsBuilder("Grove").withGuiColour(0x517F51).withTemperature(0.55F).withRainfall(0.8F));
// terrain
this.terrainSettings.avgHeight(66).heightVariation(8, 20).octaves(0, 1, 2, 2, 1, 0).sidewaysNoise(0.1D);
this.setColor(0x517F51);
this.setTemperatureRainfall(0.55F, 0.8F);
this.addWeight(BOPClimates.COOL_TEMPERATE, 7);
this.canGenerateVillages = true;

8
src/main/java/biomesoplenty/common/biome/overworld/BiomeGenHeathland.java
View File

@ -40,13 +40,11 @@ public class BiomeGenHeathland extends BOPBiome
{
public BiomeGenHeathland()
{
super("heathland", new PropsBuilder("Heathland").withGuiColour(0xADAE68).withTemperature(0.75F).withRainfall(0.2F));
// terrain
this.terrainSettings.avgHeight(75).heightVariation(7, 10).octaves(0, 1, 2, 2, 1, 0).sidewaysNoise(0.1D);
this.setColor(0xADAE68);
this.setTemperatureRainfall(0.75F, 0.2F);
this.addWeight(BOPClimates.DRY_TEMPERATE, 5);
this.canGenerateVillages = true;

5
src/main/java/biomesoplenty/common/biome/overworld/BiomeGenHighland.java
View File

@ -28,12 +28,11 @@ public class BiomeGenHighland extends BOPBiome
public BiomeGenHighland()
{
super("highland", new PropsBuilder("Highland").withGuiColour(0x7CAD66).withTemperature(0.55F).withRainfall(0.8F));
// terrain
this.terrainSettings.avgHeight(120).heightVariation(25, 25);
this.setColor(0x7CAD66);
this.setTemperatureRainfall(0.55F, 0.8F);
this.canGenerateRivers = false;
this.canGenerateVillages = false;

10
src/main/java/biomesoplenty/common/biome/overworld/BiomeGenKelpForest.java
View File

@ -14,11 +14,13 @@ import biomesoplenty.api.block.BOPBlocks;
import biomesoplenty.api.block.BlockQueries;
import biomesoplenty.common.block.BlockBOPCoral;
import biomesoplenty.common.enums.BOPGems;
import biomesoplenty.common.util.biome.BiomeUtils;
import biomesoplenty.common.util.biome.GeneratorUtils.ScatterYMethod;
import biomesoplenty.common.world.BOPWorldSettings;
import biomesoplenty.common.world.feature.GeneratorColumns;
import biomesoplenty.common.world.feature.GeneratorFlora;
import biomesoplenty.common.world.feature.GeneratorOreSingle;
import net.minecraft.init.Biomes;
import net.minecraft.init.Blocks;
import net.minecraft.world.biome.BiomeGenBase;
@ -26,16 +28,16 @@ public class BiomeGenKelpForest extends BOPBiome
{
public BiomeGenKelpForest()
{
super("kelp_forest", new PropsBuilder("Kelp Forest").withGuiColour(27468));
// terrain
this.terrainSettings.avgHeight(40).heightVariation(5, 5);
this.setColor(27468);
this.terrainSettings.avgHeight(40).heightVariation(5, 5);
this.canSpawnInBiome = false;
this.canGenerateVillages = false;
this.canGenerateRivers = false;
this.beachBiomeId = BiomeGenBase.ocean.biomeID;
this.beachBiomeLocation = BiomeUtils.getLocForBiome(Biomes.ocean);
clearWeights();

6
src/main/java/biomesoplenty/common/biome/overworld/BiomeGenLandOfLakes.java
View File

@ -42,15 +42,15 @@ public class BiomeGenLandOfLakes extends BOPBiome
// TODO: should there be foliage colors / water colors?
public BiomeGenLandOfLakes()
{
{
super("land_of_lakes", new PropsBuilder("Land of Lakes").withGuiColour(0x66A06E).withTemperature(0.5F).withRainfall(0.9F));
// terrain
this.terrainSettings.avgHeight(63).heightVariation(10, 10).octaves(5, 5, 0, 0, 1, 1).sidewaysNoise(0.1D);
this.topBlock = BOPBlocks.grass.getDefaultState().withProperty(BlockBOPGrass.VARIANT, BlockBOPGrass.BOPGrassType.LOAMY);
this.fillerBlock = BOPBlocks.dirt.getDefaultState().withProperty(BlockBOPDirt.VARIANT, BlockBOPDirt.BOPDirtType.LOAMY);
this.seaFloorBlock = BOPBlocks.mud.getDefaultState();
this.setColor(0x66A06E);
this.setTemperatureRainfall(0.5F, 0.9F);
this.canGenerateVillages = false;

7
src/main/java/biomesoplenty/common/biome/overworld/BiomeGenLavenderFields.java
View File

@ -31,11 +31,10 @@ public class BiomeGenLavenderFields extends BOPBiome
{
public BiomeGenLavenderFields()
{
super("lavender_fields", new PropsBuilder("Lavender Fields").withGuiColour(11035852).withTemperature(0.7F).withRainfall(0.7F));
// terrain
this.terrainSettings.avgHeight(64).heightVariation(4, 12);
this.setColor(11035852);
this.setTemperatureRainfall(0.7F, 0.7F);
this.terrainSettings.avgHeight(64).heightVariation(4, 12);
this.canSpawnInBiome = false;
this.canGenerateVillages = false;

6
src/main/java/biomesoplenty/common/biome/overworld/BiomeGenLushDesert.java
View File

@ -39,11 +39,11 @@ public class BiomeGenLushDesert extends BOPBiome
{
public BiomeGenLushDesert()
{
super("lush_desert", new PropsBuilder("Lush Desert").withGuiColour(0x8AA92D).withTemperature(1.2F).withRainfall(0.5F));
// terrain
this.terrainSettings.avgHeight(64).heightVariation(4, 15);
this.setColor(0x8AA92D);
this.setTemperatureRainfall(1.2F, 0.5F);
this.topBlock = Blocks.hardened_clay.getDefaultState();
this.fillerBlock = Blocks.hardened_clay.getDefaultState();

5
src/main/java/biomesoplenty/common/biome/overworld/BiomeGenLushSwamp.java
View File

@ -46,11 +46,10 @@ public class BiomeGenLushSwamp extends BOPBiome
public BiomeGenLushSwamp()
{
super("lush_swamp", new PropsBuilder("Lush Swamp").withGuiColour(0x57AE34).withTemperature(0.7F).withRainfall(1.0F));
// terrain
this.terrainSettings.avgHeight(63).heightVariation(5, 10).octaves(1, 1, 1, 1, 0, 0).sidewaysNoise(0.0F);
this.setColor(0x57AE34);
this.setTemperatureRainfall(0.7F, 1.0F);
this.canGenerateRivers = false;
this.canGenerateVillages = false;

6
src/main/java/biomesoplenty/common/biome/overworld/BiomeGenMapleWoods.java
View File

@ -26,11 +26,11 @@ public class BiomeGenMapleWoods extends BOPBiome
{
public BiomeGenMapleWoods()
{
super("maple_woods", new PropsBuilder("Maple Woods").withGuiColour(0x6AA369).withTemperature(0.25F).withRainfall(0.8F));
// terrain
this.terrainSettings.avgHeight(70).heightVariation(10, 25);
this.setColor(0x6AA369);
this.setTemperatureRainfall(0.25F, 0.8F);
this.addWeight(BOPClimates.BOREAL, 10);
this.canGenerateVillages = false;

6
src/main/java/biomesoplenty/common/biome/overworld/BiomeGenMarsh.java
View File

@ -39,15 +39,15 @@ public class BiomeGenMarsh extends BOPBiome
// TODO: should there be foliage colors / water colors?
public BiomeGenMarsh()
{
{
super("marsh", new PropsBuilder("Marsh").withGuiColour(0x66A06E).withTemperature(0.7F).withRainfall(0.9F));
// terrain
this.terrainSettings.avgHeight(63).heightVariation(5, 2).octaves(5, 5, 0, 0, 1, 1).sidewaysNoise(0.1D);
this.topBlock = BOPBlocks.grass.getDefaultState().withProperty(BlockBOPGrass.VARIANT, BlockBOPGrass.BOPGrassType.LOAMY);
this.fillerBlock = BOPBlocks.dirt.getDefaultState().withProperty(BlockBOPDirt.VARIANT, BlockBOPDirt.BOPDirtType.LOAMY);
this.seaFloorBlock = BOPBlocks.mud.getDefaultState();
this.setColor(0x66A06E);
this.setTemperatureRainfall(0.7F, 0.9F);
this.canSpawnInBiome = false;
this.canGenerateRivers = false;

5
src/main/java/biomesoplenty/common/biome/overworld/BiomeGenMeadow.java
View File

@ -33,12 +33,11 @@ public class BiomeGenMeadow extends BOPBiome
{
public BiomeGenMeadow()
{
super("meadow", new PropsBuilder("Meadow").withGuiColour(0x63B26D).withTemperature(0.45F).withRainfall(0.7F));
// terrain
this.terrainSettings.avgHeight(64).heightVariation(5, 5).octaves(0, 1, 2, 2, 1, 0).sidewaysNoise(0.1D);
this.setColor(0x63B26D);
this.setTemperatureRainfall(0.45F, 0.7F);
this.addWeight(BOPClimates.COOL_TEMPERATE, 3);
this.addWeight(BOPClimates.BOREAL, 7);

8
src/main/java/biomesoplenty/common/biome/overworld/BiomeGenMoor.java
View File

@ -38,13 +38,11 @@ public class BiomeGenMoor extends BOPBiome
public BiomeGenMoor()
{
super("moor", new PropsBuilder("Moor").withGuiColour(0x619365).withTemperature(0.55F).withRainfall(1.0F).withWaterColor(0x588276));
// terrain
this.terrainSettings.avgHeight(88).heightVariation(8, 10).octaves(0, 1, 1, 3, 1, 0);
this.setTemperatureRainfall(0.55F, 1.0F);
this.setColor(0x619365);
this.waterColorMultiplier = 0x588276;
//this.skyColor =0xA0C5D3;
this.topBlock = BOPBlocks.grass.getDefaultState().withProperty(BlockBOPGrass.VARIANT, BlockBOPGrass.BOPGrassType.LOAMY);
this.fillerBlock = BOPBlocks.dirt.getDefaultState().withProperty(BlockBOPDirt.VARIANT, BlockBOPDirt.BOPDirtType.LOAMY);

7
src/main/java/biomesoplenty/common/biome/overworld/BiomeGenMountain.java
View File

@ -32,6 +32,7 @@ import biomesoplenty.common.world.feature.GeneratorSplotches;
import biomesoplenty.common.world.feature.GeneratorWaterside;
import biomesoplenty.common.world.feature.tree.GeneratorBasicTree;
import biomesoplenty.common.world.feature.tree.GeneratorPineTree;
import com.google.common.base.CaseFormat;
import net.minecraft.block.BlockDirt;
import net.minecraft.block.BlockPlanks;
import net.minecraft.block.BlockTallGrass;
@ -57,6 +58,8 @@ public class BiomeGenMountain extends BOPBiome
public BiomeGenMountain(MountainType type)
{
super(type.name().toLowerCase(), new PropsBuilder(CaseFormat.UPPER_UNDERSCORE.to(CaseFormat.UPPER_CAMEL, type.toString())).withGuiColour(0x80A355).withTemperature(0.8F).withRainfall(0.1F));
this.type = type;
this.canSpawnInBiome = false;
@ -76,8 +79,6 @@ public class BiomeGenMountain extends BOPBiome
this.canGenerateRivers = false;
this.canSpawnInBiome = false;
this.canGenerateVillages = false;
this.setColor(0x80A355);
this.setTemperatureRainfall(0.8F, 0.1F);
this.beachBiomeLocation = null;
@ -191,7 +192,7 @@ public class BiomeGenMountain extends BOPBiome
int localX = x & 15;
int localZ = z & 15;
int height = 255;
while (height > 0 && primer.getBlockState(localX, height, localZ).getBlock().getMaterial() == Material.air) {height--;}
while (height > 0 && primer.getBlockState(localX, height, localZ).getMaterial() == Material.air) {height--;}
int peakLine = 140 + (int)(noise * 5);
if (height > peakLine)

7
src/main/java/biomesoplenty/common/biome/overworld/BiomeGenMysticGrove.java
View File

@ -47,13 +47,12 @@ public class BiomeGenMysticGrove extends BOPBiome
public BiomeGenMysticGrove()
{
super("mystic_grove", new PropsBuilder("Mystic Grove").withGuiColour(0x69CFDB).withTemperature(0.6F).withRainfall(0.8F).withWaterColor(0xFF107A));
// terrain
this.terrainSettings.avgHeight(63).heightVariation(5, 25);
this.setColor(0x69CFDB);
this.skyColor = 0x88E8D0;
this.setTemperatureRainfall(0.6F, 0.8F);
this.waterColorMultiplier = 0xFF107A;
this.canGenerateRivers = false;
this.canGenerateVillages = false;

8
src/main/java/biomesoplenty/common/biome/overworld/BiomeGenOasis.java
View File

@ -40,12 +40,10 @@ public class BiomeGenOasis extends BOPBiome
public BiomeGenOasis()
{
super("oasis", new PropsBuilder("Oasis").withGuiColour(7712283).withTemperature(2.0F).withRainfall(0.5F));
// terrain
this.terrainSettings.avgHeight(64).heightVariation(5, 3);
this.setTemperatureRainfall(2.0F, 0.5F);
this.setColor(7712283);
this.terrainSettings.avgHeight(64).heightVariation(5, 3);
this.canSpawnInBiome = false;
this.canGenerateVillages = false;

7
src/main/java/biomesoplenty/common/biome/overworld/BiomeGenOminousWoods.java
View File

@ -41,13 +41,12 @@ public class BiomeGenOminousWoods extends BOPBiome
public BiomeGenOminousWoods()
{
super("ominous_woods", new PropsBuilder("Ominous Woods").withGuiColour(0x3F4151).withTemperature(0.45F).withRainfall(0.6F).withWaterColor(0x1E1B26));
// terrain
this.terrainSettings.avgHeight(70).heightVariation(5, 25);
this.setColor(0x3F4151);
this.skyColor = 0x34333D;
this.setTemperatureRainfall(0.45F, 0.6F);
this.waterColorMultiplier = 0x1E1B26;
this.topBlock = BOPBlocks.grass.getDefaultState().withProperty(BlockBOPGrass.VARIANT, BlockBOPGrass.BOPGrassType.LOAMY);
this.fillerBlock = BOPBlocks.dirt.getDefaultState().withProperty(BlockBOPDirt.VARIANT, BlockBOPDirt.BOPDirtType.LOAMY);

5
src/main/java/biomesoplenty/common/biome/overworld/BiomeGenOrchard.java
View File

@ -26,11 +26,10 @@ public class BiomeGenOrchard extends BOPBiome
{
public BiomeGenOrchard()
{
super("orchard", new PropsBuilder("Orchard").withGuiColour(14024557).withTemperature(0.7F).withRainfall(0.7F));
// terrain
this.terrainSettings.avgHeight(64).heightVariation(4, 15);
this.setColor(14024557);
this.setTemperatureRainfall(0.7F, 0.7F);
this.addWeight(BOPClimates.WARM_TEMPERATE, 3);

6
src/main/java/biomesoplenty/common/biome/overworld/BiomeGenOriginIsland.java
View File

@ -35,11 +35,11 @@ public class BiomeGenOriginIsland extends BOPBiome
{
public BiomeGenOriginIsland()
{
super("origin_island", new PropsBuilder("Origin Island").withGuiColour(10341485).withTemperature(0.6F).withRainfall(0.6F));
// terrain
this.terrainSettings.avgHeight(64).heightVariation(6, 25).sidewaysNoise(0.0D);
this.setColor(10341485);
this.setTemperatureRainfall(0.6F, 0.6F);
this.skyColor = 8441086;
this.canSpawnInBiome = false;

6
src/main/java/biomesoplenty/common/biome/overworld/BiomeGenOutback.java
View File

@ -35,11 +35,11 @@ public class BiomeGenOutback extends BOPBiome
{
public BiomeGenOutback()
{
super("outback", new PropsBuilder("Outback").withGuiColour(0xA57644).withTemperature(1.5F).withRainfall(0.05F));
// terrain
this.terrainSettings.avgHeight(72).heightVariation(8, 10).octaves(0, 1, 2, 1, 0, 2);
this.setTemperatureRainfall(1.5F, 0.05F);
this.setColor(0xA57644);
this.topBlock = Blocks.sand.getDefaultState().withProperty(BlockSand.VARIANT, BlockSand.EnumType.RED_SAND);
this.fillerBlock = Blocks.sand.getDefaultState().withProperty(BlockSand.VARIANT, BlockSand.EnumType.RED_SAND);

5
src/main/java/biomesoplenty/common/biome/overworld/BiomeGenOvergrownCliffs.java
View File

@ -30,11 +30,10 @@ public class BiomeGenOvergrownCliffs extends BOPBiome
{
public BiomeGenOvergrownCliffs()
{
super("overgrown_cliffs", new PropsBuilder("Overgrown Cliffs").withGuiColour(8373350).withTemperature(0.95F).withRainfall(0.75F));
// terrain
this.terrainSettings.avgHeight(70).heightVariation(5, 100).octaves(1, 1, 1, 1, 0, 0).sidewaysNoise(0.0F);
this.setColor(8373350);
this.setTemperatureRainfall(0.95F, 0.75F);
this.canGenerateRivers = false;
this.canSpawnInBiome = false;

5
src/main/java/biomesoplenty/common/biome/overworld/BiomeGenPrairie.java
View File

@ -31,15 +31,14 @@ public class BiomeGenPrairie extends BOPBiome
{
public BiomeGenPrairie()
{
super("prairie", new PropsBuilder("Prairie").withGuiColour(0xC8E580).withTemperature(0.8F).withRainfall(0.3F));
// terrain
this.terrainSettings.avgHeight(64).heightVariation(4, 15);
this.topBlock = BOPBlocks.grass.getDefaultState().withProperty(BlockBOPGrass.VARIANT, BlockBOPGrass.BOPGrassType.SILTY);
this.fillerBlock = BOPBlocks.dirt.getDefaultState().withProperty(BlockBOPDirt.VARIANT, BlockBOPDirt.BOPDirtType.SILTY);
this.setColor(0xC8E580);
this.setTemperatureRainfall(0.8F, 0.3F);
this.addWeight(BOPClimates.WARM_TEMPERATE, 7);
this.canGenerateVillages = true;

7
src/main/java/biomesoplenty/common/biome/overworld/BiomeGenQuagmire.java
View File

@ -36,14 +36,13 @@ public class BiomeGenQuagmire extends BOPBiome
public BiomeGenQuagmire()
{
super("quagmire", new PropsBuilder("Quagmire").withGuiColour(0x503A2B).withTemperature(0.55F).withRainfall(0.9F).withWaterColor(0xCC5100));
// terrain
this.terrainSettings.avgHeight(63).heightVariation(5, 10).octaves(1, 1, 1, 1, 0, 0).sidewaysNoise(0.0F);
this.setColor(0x503A2B);
this.setTemperatureRainfall(0.55F, 0.9F);
this.topBlock = BOPBlocks.mud.getDefaultState();
this.fillerBlock = BOPBlocks.mud.getDefaultState();
this.waterColorMultiplier = 0xCC5100;
//this.skyColor = 0xBDC4BE;
this.seaFloorBlock = BOPBlocks.mud.getDefaultState();

4
src/main/java/biomesoplenty/common/biome/overworld/BiomeGenRainforest.java
View File

@ -29,11 +29,11 @@ public class BiomeGenRainforest extends BOPBiome
{
public BiomeGenRainforest()
{
super("rainforest", new PropsBuilder("Rainforest").withGuiColour(0x14E26F).withTemperature(0.95F).withRainfall(1.2F));
// terrain
this.terrainSettings.avgHeight(80).heightVariation(50, 50).sidewaysNoise(1.5D);
this.setColor(0x14E26F);
this.setTemperatureRainfall(0.95F, 1.2F);
this.addWeight(BOPClimates.TROPICAL, 7);
this.canSpawnInBiome = false;

4
src/main/java/biomesoplenty/common/biome/overworld/BiomeGenSeasonalForest.java
View File

@ -30,11 +30,11 @@ public class BiomeGenSeasonalForest extends BOPBiome
{
public BiomeGenSeasonalForest()
{
super("seasonal_forest", new PropsBuilder("Seasonal Forest").withGuiColour(0xBEC44C).withTemperature(0.4F).withRainfall(0.8F));
// terrain
this.terrainSettings.avgHeight(70).heightVariation(10, 30);
this.setColor(0xBEC44C);
this.setTemperatureRainfall(0.4F, 0.8F);
this.addWeight(BOPClimates.COOL_TEMPERATE, 7);
this.canGenerateVillages = false;

6
src/main/java/biomesoplenty/common/biome/overworld/BiomeGenShield.java
View File

@ -48,13 +48,11 @@ public class BiomeGenShield extends BOPBiome
public BiomeGenShield()
{
super("shield", new PropsBuilder("Shield").withGuiColour(0x647F38).withTemperature(0.3F).withRainfall(0.8F));
// terrain
this.terrainSettings.avgHeight(63).heightVariation(10, 10).sidewaysNoise(0.1D).octaves(1, 4, 3, 1, 1, 0);
this.setColor(0x647F38);
this.setTemperatureRainfall(0.3F, 0.8F);
this.topBlock = Blocks.grass.getDefaultState();
this.usualTopBlock = this.topBlock;
this.alternateTopBlock = Blocks.stone.getDefaultState();

5
src/main/java/biomesoplenty/common/biome/overworld/BiomeGenShrubland.java
View File

@ -34,12 +34,11 @@ public class BiomeGenShrubland extends BOPBiome
public BiomeGenShrubland()
{
super("shrubland", new PropsBuilder("Shrubland").withGuiColour(8168286).withTemperature(0.6F).withRainfall(0.05F));
// terrain
this.terrainSettings.avgHeight(66).heightVariation(8, 15).octaves(0, 1, 2, 2, 1, 0).sidewaysNoise(0.1D);
this.setColor(8168286);
this.setTemperatureRainfall(0.6F, 0.05F);
this.addWeight(BOPClimates.DRY_TEMPERATE, 10);
this.addWeight(BOPClimates.MEDITERANEAN, 7);

7
src/main/java/biomesoplenty/common/biome/overworld/BiomeGenSnowyConiferousForest.java
View File

@ -29,13 +29,10 @@ public class BiomeGenSnowyConiferousForest extends BOPBiome
public BiomeGenSnowyConiferousForest()
{
super("snowy_coniferous_forest", new PropsBuilder("Snowy Coniferous Forest").withGuiColour(0xFFFFFF).withSnowEnabled().withTemperature(-0.25F).withRainfall(0.5F));
// terrain
this.terrainSettings.avgHeight(68).heightVariation(10, 20);
this.setColor(0xFFFFFF);
this.setEnableSnow();
this.setTemperatureRainfall(-0.25F, 0.5F);
this.canGenerateVillages = false;

7
src/main/java/biomesoplenty/common/biome/overworld/BiomeGenSnowyForest.java
View File

@ -32,14 +32,11 @@ public class BiomeGenSnowyForest extends BOPBiome
public BiomeGenSnowyForest()
{
super("snowy_forest", new PropsBuilder("Snowy Forest").withGuiColour(0xABD6BC).withSnowEnabled().withTemperature(-0.25F).withRainfall(0.5F));
// terrain
this.terrainSettings.avgHeight(66).heightVariation(6, 21);
this.setColor(0xABD6BC);
//this.skyColor = 0xCEE0EA;
this.setEnableSnow();
this.setTemperatureRainfall(-0.25F, 0.5F);
this.canGenerateVillages = false;
this.addWeight(BOPClimates.TUNDRA, 7);

7
src/main/java/biomesoplenty/common/biome/overworld/BiomeGenSteppe.java
View File

@ -41,16 +41,15 @@ public class BiomeGenSteppe extends BOPBiome
public BiomeGenSteppe()
{
super("steppe", new PropsBuilder("Steppe").withGuiColour(13413215).withTemperature(0.75F).withRainfall(0.1F));
// terrain
this.topBlock = BOPBlocks.grass.getDefaultState().withProperty(BlockBOPGrass.VARIANT, BlockBOPGrass.BOPGrassType.SANDY);
this.fillerBlock = BOPBlocks.dirt.getDefaultState().withProperty(BlockBOPDirt.VARIANT, BlockBOPDirt.BOPDirtType.SANDY);
this.usualTopBlock = this.topBlock;
this.alternateTopBlock = BOPBlocks.dried_sand.getDefaultState();
this.terrainSettings.avgHeight(70).heightVariation(6, 20).octaves(0, 1, 2, 2, 1, 0).sidewaysNoise(0.1D);
this.setColor(13413215);
this.setTemperatureRainfall(0.75F, 0.1F);
this.terrainSettings.avgHeight(70).heightVariation(6, 20).octaves(0, 1, 2, 2, 1, 0).sidewaysNoise(0.1D);
this.canSpawnInBiome = false;
this.canGenerateVillages = true;

4
src/main/java/biomesoplenty/common/biome/overworld/BiomeGenTemperateRainforest.java
View File

@ -39,13 +39,11 @@ public class BiomeGenTemperateRainforest extends BOPBiome
public BiomeGenTemperateRainforest()
{
super("temperate_rainforest", new PropsBuilder("Temperate Rainforest").withGuiColour(0xBBDD63).withTemperature(0.75F).withRainfall(1.2F));
// terrain
this.terrainSettings.avgHeight(63).heightVariation(10, 35);
this.setColor(0xBBDD63);
this.setTemperatureRainfall(0.75F, 1.2F);
this.canGenerateVillages = false;
this.addWeight(BOPClimates.WET_TEMPERATE, 7);

8
src/main/java/biomesoplenty/common/biome/overworld/BiomeGenTropicalIsland.java
View File

@ -27,12 +27,10 @@ public class BiomeGenTropicalIsland extends BOPBiome
{
public BiomeGenTropicalIsland()
{
super("tropical_island", new PropsBuilder("Tropical Island").withTemperature(1.0F).withRainfall(1.0F).withGuiColour(2211330));
// terrain
this.terrainSettings.avgHeight(70).heightVariation(5, 35).octaves(0, 1, 2, 2, 1, 0).sidewaysNoise(0.0D);
this.setTemperatureRainfall(1.0F, 1.0F);
this.setColor(2211330);
this.terrainSettings.avgHeight(70).heightVariation(5, 35).octaves(0, 1, 2, 2, 1, 0).sidewaysNoise(0.0D);
this.canSpawnInBiome = false;
this.canGenerateVillages = false;

8
src/main/java/biomesoplenty/common/biome/overworld/BiomeGenTropicalRainforest.java
View File

@ -35,15 +35,11 @@ public class BiomeGenTropicalRainforest extends BOPBiome
public BiomeGenTropicalRainforest()
{
super("tropical_rainforest", new PropsBuilder("Tropical Rainforest").withGuiColour(0x88E140).withTemperature(1.2F).withRainfall(1.0F).withWaterColor(0x5DFF00));
// terrain
this.terrainSettings.avgHeight(67).heightVariation(10, 25);
this.setColor(0x88E140);
this.setTemperatureRainfall(1.2F, 1.0F);
//this.skyColor = 0xC8CC5F;
this.waterColorMultiplier = 0x5DFF00;
this.canSpawnInBiome = false;
this.canGenerateVillages = false;

7
src/main/java/biomesoplenty/common/biome/overworld/BiomeGenTundra.java
View File

@ -33,11 +33,10 @@ public class BiomeGenTundra extends BOPBiome
{
public BiomeGenTundra()
{
super("tundra", new PropsBuilder("Tundra").withGuiColour(0xA09456).withTemperature(0.2F).withRainfall(0.5F));
// terrain
this.terrainSettings.avgHeight(64).heightVariation(5, 10).minHeight(59).octaves(2, 2, 1, 0, 1, 1);
this.setColor(0xA09456);
this.setTemperatureRainfall(0.165F, 0.5F); // temperature deliberately borderline between rain and snow
this.terrainSettings.avgHeight(64).heightVariation(5, 10).minHeight(59).octaves(2, 2, 1, 0, 1, 1);
this.addWeight(BOPClimates.TUNDRA, 10);

8
src/main/java/biomesoplenty/common/biome/overworld/BiomeGenVolcanicIsland.java
View File

@ -23,12 +23,10 @@ public class BiomeGenVolcanicIsland extends BOPBiome
{
public BiomeGenVolcanicIsland()
{
super("volcanic_island", new PropsBuilder("Volcanic Island").withGuiColour(6645093).withTemperature(1.2F).withRainfall(0.2F));
// terrain
this.terrainSettings.avgHeight(120).heightVariation(50, 50).octaves(1, 1, 2, 2, 3, 2).sidewaysNoise(0.1D);
this.setTemperatureRainfall(1.2F, 0.0F);
this.setColor(6645093);
this.terrainSettings.avgHeight(120).heightVariation(50, 50).octaves(1, 1, 2, 2, 3, 2).sidewaysNoise(0.1D);
this.topBlock = BOPBlocks.ash_block.getDefaultState();
this.fillerBlock = BOPBlocks.ash_block.getDefaultState();

8
src/main/java/biomesoplenty/common/handler/AchievementEventHandler.java
View File

@ -142,7 +142,7 @@ public class AchievementEventHandler
@SubscribeEvent
public void onItemUsed(PlayerInteractEvent event)
{
if (event.action != Action.LEFT_CLICK_BLOCK)
/* TODO: 1.9 if (event.action != Action.LEFT_CLICK_BLOCK)
{
ItemStack stack = event.entityPlayer.getHeldItem();
Item item = stack != null ? stack.getItem() : null;
@ -153,7 +153,7 @@ public class AchievementEventHandler
{
player.addStat(BOPAchievements.use_enderporter);
}
}
}*/
}
@SubscribeEvent
@ -246,7 +246,7 @@ public class AchievementEventHandler
@SubscribeEvent
public void onPlayerUpdate(LivingUpdateEvent event)
{
if (!event.entity.worldObj.isRemote && event.entity instanceof EntityPlayer)
/* TODO: 1.9 if (!event.entity.worldObj.isRemote && event.entity instanceof EntityPlayer)
{
EntityPlayerMP player = (EntityPlayerMP)event.entity;
@ -263,7 +263,7 @@ public class AchievementEventHandler
this.updateBiomesExplored(player);
}
}
}
}*/
}
private void updateBiomeRadarExplore(EntityPlayerMP player)

10
src/main/java/biomesoplenty/common/init/ModBiomes.java
View File

@ -531,7 +531,7 @@ public class ModBiomes implements BOPBiomes.IBiomeRegistry
}
else //extendedBiome is a wrapper
{
biomeWrapperMap.put(extendedBiome.getBaseBiome().biomeID, extendedBiome);
biomeWrapperMap.put(BiomeGenBase.getIdForBiome(extendedBiome.getBaseBiome()), extendedBiome);
}
return extendedBiome;
@ -547,7 +547,7 @@ public class ModBiomes implements BOPBiomes.IBiomeRegistry
}
else
{
IExtendedBiome wrapper = biomeWrapperMap.get(biome.biomeID);
IExtendedBiome wrapper = biomeWrapperMap.get(BiomeGenBase.getIdForBiome(biome));
//This biome may not have a wrapper
if (wrapper != null)
@ -594,14 +594,14 @@ public class ModBiomes implements BOPBiomes.IBiomeRegistry
private static void setSubBiome(BiomeGenBase parent, BiomeGenBase... subBiomes)
{
Map<Integer, List<Integer>> map = subBiomesMap;
int parentId = parent.biomeID;
int parentId = BiomeGenBase.getIdForBiome(parent);
if (!map.containsKey(parentId))
{
map.put(parentId, new ArrayList<Integer>());
}
for (BiomeGenBase subBiome : subBiomes)
{
map.get(parentId).add(subBiome.biomeID);
map.get(parentId).add(BiomeGenBase.getIdForBiome(subBiome));
}
}
@ -610,7 +610,7 @@ public class ModBiomes implements BOPBiomes.IBiomeRegistry
if (biome.isPresent())
{
totalIslandBiomesWeight += weight;
islandBiomesMap.put(biome.get().biomeID, weight);
islandBiomesMap.put(BiomeGenBase.getIdForBiome(biome.get()), weight);
}
}