Overhauled the Bog biome. Changed the Swampwoods to the Sludgepit, and made it the same as the old Bog.

Added placeholders for Ocean sub-biomes.
This commit is contained in:
Matt Caughey 2013-05-24 13:54:27 -04:00
parent 97965c1abc
commit e77aee5360
16 changed files with 465 additions and 219 deletions

View file

@ -30,24 +30,14 @@ Omega Essence: Mined from Omega Essence Ore. Used to turn Origin blocks bac
BIOMES CHANGES:
Arctic: Rename to Snowy Coniferous Forest.
Bayou: Trees in the water.
Bog: More realistic (Based on this picture: http://i.imgur.com/hTBmiKo.jpg).
Canyon: Tweak the tree generation.
Drylands: Change tree generation and grass/foliage color.
Heathland: Change tree generation.
Mangrove: Tweak the tree generation. Change height values.
Snowy Woods: Rename to Snowy Dead Forest.
Tundra: Change current tudra to Arctic. New one more realistic (Based on this picture: http://i.imgur.com/Wg7keZ0.jpg).
---
OVERWORLD BIOMES:
@ -56,18 +46,12 @@ Hot Springs: Geysers, pools of water and lava, and decaying spruce trees.
Timber: Tall, decaying deciduous trees, thorns, and small bushes.
Burning Brush: A smokey forest with burnt trees, smoldering grass, and ash.
---
NETHER BIOMES:
Undergarden: Vines, nether wart, giant/small mushrooms.
Corrupted Sands: Soulsand, bramble, thorns.
Phantasmagoric Inferno: Lots of lavafalls and lava ponds.
Boneyard: Skulls, bones sticking out of the ground, large bone structures, and graves.
---
@ -76,11 +60,7 @@ BEACH BIOMES:
Gravel Beach: A beach covered in gravel.
Lush Beach: A beach with dune grass, and patches of leaves and grass.
Forested Beach: A beach with trees.
Rocky Beach: A beach with jagged rocks.
Overgrown Beach: A beach with small trees and shrubs, dune grass, and patches of medium grass.
---

View file

@ -61,6 +61,10 @@ public class Biomes
public static Optional<? extends BiomeGenBase> netherBone = Optional.absent();
public static Optional<? extends BiomeGenBase> oasis = Optional.absent();
public static Optional<? extends BiomeGenBase> oceanCoral = Optional.absent();
public static Optional<? extends BiomeGenBase> oceanKelp = Optional.absent();
public static Optional<? extends BiomeGenBase> ominousWoods = Optional.absent();
public static Optional<? extends BiomeGenBase> orchard = Optional.absent();
public static Optional<? extends BiomeGenBase> originValley = Optional.absent();
@ -83,9 +87,9 @@ public class Biomes
public static Optional<? extends BiomeGenBase> shield = Optional.absent();
public static Optional<? extends BiomeGenBase> shore = Optional.absent();
public static Optional<? extends BiomeGenBase> shrubland = Optional.absent();
public static Optional<? extends BiomeGenBase> sludgepit = Optional.absent();
public static Optional<? extends BiomeGenBase> spruceWoods = Optional.absent();
public static Optional<? extends BiomeGenBase> steppe = Optional.absent();
public static Optional<? extends BiomeGenBase> swampwoods = Optional.absent();
public static Optional<? extends BiomeGenBase> temperateRainforest = Optional.absent();
public static Optional<? extends BiomeGenBase> thicket = Optional.absent();
public static Optional<? extends BiomeGenBase> tropicalRainforest = Optional.absent();

View file

@ -1,19 +1,19 @@
package biomesoplenty.biomes;
import java.awt.Color;
import java.util.Random;
import biomesoplenty.api.Blocks;
import biomesoplenty.configuration.BOPBlocks;
import biomesoplenty.configuration.BOPConfiguration;
import biomesoplenty.worldgen.WorldGenBog1;
import biomesoplenty.worldgen.WorldGenBog2;
import biomesoplenty.worldgen.WorldGenBogBush;
import biomesoplenty.worldgen.WorldGenCypress1;
import biomesoplenty.worldgen.WorldGenCypress2;
import biomesoplenty.worldgen.WorldGenMarsh;
import net.minecraft.block.Block;
import net.minecraft.entity.monster.EntitySlime;
import net.minecraft.item.ItemStack;
import net.minecraft.world.World;
import net.minecraft.world.biome.BiomeGenBase;
import net.minecraft.world.biome.SpawnListEntry;
import net.minecraft.world.gen.feature.WorldGenShrub;
import net.minecraft.world.gen.feature.WorldGenTallGrass;
import net.minecraft.world.gen.feature.WorldGenerator;
@ -21,48 +21,65 @@ public class BiomeGenBog extends BiomeGenBase
{
private BiomeDecoratorBOP customBiomeDecorator;
@SuppressWarnings("unchecked")
public BiomeGenBog(int par1)
public BiomeGenBog(int par1)
{
super(par1);
this.spawnableCreatureList.clear();
this.spawnableWaterCreatureList.clear();
this.theBiomeDecorator = new BiomeDecoratorBOP(this);
this.customBiomeDecorator = (BiomeDecoratorBOP)theBiomeDecorator;
this.customBiomeDecorator.treesPerChunk = 30;
this.customBiomeDecorator.grassPerChunk = 30;
this.customBiomeDecorator.treesPerChunk = 12;
this.customBiomeDecorator.flowersPerChunk = -999;
this.customBiomeDecorator.sandPerChunk = -999;
this.customBiomeDecorator.grassPerChunk = 5;
this.customBiomeDecorator.bushesPerChunk = 6;
this.customBiomeDecorator.mudPerChunk = 2;
this.customBiomeDecorator.mudPerChunk2 = 2;
this.customBiomeDecorator.sandPerChunk = -999;
this.customBiomeDecorator.sandPerChunk2 = -999;
this.customBiomeDecorator.mudPerChunk = 5;
this.customBiomeDecorator.mudPerChunk2 = 5;
this.customBiomeDecorator.deadBushPerChunk = 5;
this.customBiomeDecorator.algaePerChunk = 2;
this.waterColorMultiplier = 11506176;
this.customBiomeDecorator.waterlilyPerChunk = 4;
this.customBiomeDecorator.reedsBOPPerChunk = 8;
this.customBiomeDecorator.blueMilksPerChunk = 1;
this.customBiomeDecorator.waterLakesPerChunk = 6;
this.customBiomeDecorator.generatePumpkins = false;
}
public void decorate(World par1World, Random par2Random, int par3, int par4)
{
super.decorate(par1World, par2Random, par3, par4);
WorldGenMarsh var5 = new WorldGenMarsh();
for (int var6 = 0; var6 < 10; ++var6)
{
int var7 = par3 + par2Random.nextInt(16) + 8;
byte var8 = 62;
int var9 = par4 + par2Random.nextInt(16) + 8;
var5.generate(par1World, par2Random, var7, var8, var9);
}
}
/**
* Gets a WorldGen appropriate for this biome.
*/
public WorldGenerator getRandomWorldGenForTrees(Random par1Random)
{
return (WorldGenerator)(par1Random.nextInt(3) == 0 ? new WorldGenBog2() : new WorldGenBog1());
return (WorldGenerator)(par1Random.nextInt(3) == 0 ? new WorldGenCypress1(false) : (par1Random.nextInt(6) == 0 ? new WorldGenCypress2(false) : new WorldGenBogBush()));
}
/**
* Gets a WorldGen appropriate for this biome.
*/
public WorldGenerator getRandomWorldGenForGrass(Random par1Random)
{
return par1Random.nextInt(9) == 0 ? new WorldGenTallGrass(Block.tallGrass.blockID, 0) : new WorldGenTallGrass(Blocks.foliage.get().blockID, 2);
return par1Random.nextInt(2) == 0 ? new WorldGenTallGrass(Block.tallGrass.blockID, 1) : new WorldGenTallGrass(Blocks.foliage.get().blockID, 2);
}
/**
* Provides the basic grass color based on the biome temperature and rainfall
*/
public int getBiomeGrassColor()
{
return 7627817;
return 14193503;
}
/**
@ -70,33 +87,6 @@ public class BiomeGenBog extends BiomeGenBase
*/
public int getBiomeFoliageColor()
{
return 9539892;
}
/**
* takes temperature, returns color
*/
public int getSkyColorByTemp(float par1)
{
if (BOPConfiguration.skyColors = true)
{
return 7039816;
}
else
{
par1 /= 3.0F;
if (par1 < -1.0F)
{
par1 = -1.0F;
}
if (par1 > 1.0F)
{
par1 = 1.0F;
}
return Color.getHSBColor(0.62222224F - par1 * 0.05F, 0.5F + par1 * 0.1F, 1.0F).getRGB();
}
return 14345593;
}
}

View file

@ -0,0 +1,16 @@
package biomesoplenty.biomes;
import java.util.Random;
import net.minecraft.block.Block;
import net.minecraft.world.World;
import net.minecraft.world.biome.BiomeGenBase;
public class BiomeGenOceanCoral extends BiomeGenBase
{
public BiomeGenOceanCoral(int par1)
{
super(par1);
this.spawnableCreatureList.clear();
}
}

View file

@ -0,0 +1,16 @@
package biomesoplenty.biomes;
import java.util.Random;
import net.minecraft.block.Block;
import net.minecraft.world.World;
import net.minecraft.world.biome.BiomeGenBase;
public class BiomeGenOceanKelp extends BiomeGenBase
{
public BiomeGenOceanKelp(int par1)
{
super(par1);
this.spawnableCreatureList.clear();
}
}

View file

@ -1,83 +1,69 @@
package biomesoplenty.biomes;
import java.awt.Color;
import java.util.Random;
import biomesoplenty.api.Blocks;
import biomesoplenty.configuration.BOPBlocks;
import biomesoplenty.worldgen.WorldGenCypress;
import biomesoplenty.worldgen.WorldGenMarsh;
import biomesoplenty.configuration.BOPConfiguration;
import biomesoplenty.worldgen.WorldGenBog1;
import biomesoplenty.worldgen.WorldGenBog2;
import net.minecraft.block.Block;
import net.minecraft.entity.monster.EntitySlime;
import net.minecraft.world.World;
import net.minecraft.item.ItemStack;
import net.minecraft.world.biome.BiomeGenBase;
import net.minecraft.world.gen.feature.WorldGenShrub;
import net.minecraft.world.biome.SpawnListEntry;
import net.minecraft.world.gen.feature.WorldGenTallGrass;
import net.minecraft.world.gen.feature.WorldGenerator;
public class BiomeGenSwampwoods extends BiomeGenBase
public class BiomeGenSludgepit extends BiomeGenBase
{
private BiomeDecoratorBOP customBiomeDecorator;
public BiomeGenSwampwoods(int par1)
@SuppressWarnings("unchecked")
public BiomeGenSludgepit(int par1)
{
super(par1);
this.spawnableCreatureList.clear();
this.spawnableWaterCreatureList.clear();
this.theBiomeDecorator = new BiomeDecoratorBOP(this);
this.customBiomeDecorator = (BiomeDecoratorBOP)theBiomeDecorator;
this.customBiomeDecorator.treesPerChunk = 12;
this.customBiomeDecorator.treesPerChunk = 30;
this.customBiomeDecorator.grassPerChunk = 30;
this.customBiomeDecorator.flowersPerChunk = -999;
this.customBiomeDecorator.grassPerChunk = 10;
this.customBiomeDecorator.highGrassPerChunk = 10;
this.customBiomeDecorator.mudPerChunk = 2;
this.customBiomeDecorator.mudPerChunk2 = 2;
this.customBiomeDecorator.sandPerChunk = -999;
this.customBiomeDecorator.sandPerChunk = -999;
this.customBiomeDecorator.sandPerChunk2 = -999;
this.customBiomeDecorator.mudPerChunk = 5;
this.customBiomeDecorator.mudPerChunk2 = 5;
this.customBiomeDecorator.deadBushPerChunk = 5;
this.customBiomeDecorator.algaePerChunk = 2;
this.customBiomeDecorator.waterlilyPerChunk = 4;
this.customBiomeDecorator.reedsBOPPerChunk = 8;
this.customBiomeDecorator.blueMilksPerChunk = 1;
this.customBiomeDecorator.lilyflowersPerChunk = 2;
this.customBiomeDecorator.generatePumpkins = false;
this.spawnableCreatureList.add(new SpawnListEntry(EntitySlime.class, 1, 1, 1));
this.waterColorMultiplier = 11506176;
}
public void decorate(World par1World, Random par2Random, int par3, int par4)
{
super.decorate(par1World, par2Random, par3, par4);
WorldGenMarsh var5 = new WorldGenMarsh();
for (int var6 = 0; var6 < 5; ++var6)
{
int var7 = par3 + par2Random.nextInt(16) + 8;
byte var8 = 62;
int var9 = par4 + par2Random.nextInt(16) + 8;
var5.generate(par1World, par2Random, var7, var8, var9);
}
}
/**
* Gets a WorldGen appropriate for this biome.
*/
public WorldGenerator getRandomWorldGenForTrees(Random par1Random)
{
return (WorldGenerator)(par1Random.nextInt(3) == 0 ? new WorldGenShrub(0,0) : new WorldGenCypress(false));
return (WorldGenerator)(par1Random.nextInt(3) == 0 ? new WorldGenBog2() : new WorldGenBog1());
}
/**
* Gets a WorldGen appropriate for this biome.
*/
public WorldGenerator getRandomWorldGenForGrass(Random par1Random)
{
return par1Random.nextInt(2) == 0 ? new WorldGenTallGrass(Block.tallGrass.blockID, 1) : new WorldGenTallGrass(Blocks.foliage.get().blockID, 2);
return par1Random.nextInt(9) == 0 ? new WorldGenTallGrass(Block.tallGrass.blockID, 0) : new WorldGenTallGrass(Blocks.foliage.get().blockID, 2);
}
/**
* Provides the basic grass color based on the biome temperature and rainfall
*/
public int getBiomeGrassColor()
{
return 1660473;
return 7627817;
}
/**
@ -85,6 +71,33 @@ public class BiomeGenSwampwoods extends BiomeGenBase
*/
public int getBiomeFoliageColor()
{
return 2324303;
return 9539892;
}
/**
* takes temperature, returns color
*/
public int getSkyColorByTemp(float par1)
{
if (BOPConfiguration.skyColors = true)
{
return 7039816;
}
else
{
par1 /= 3.0F;
if (par1 < -1.0F)
{
par1 = -1.0F;
}
if (par1 > 1.0F)
{
par1 = 1.0F;
}
return Color.getHSBColor(0.62222224F - par1 * 0.05F, 0.5F + par1 * 0.1F, 1.0F).getRGB();
}
}
}

View file

@ -73,7 +73,7 @@ public class BOPBiomes {
Biomes.beachOvergrown = Optional.of((new BiomeGenBeachOvergrown(BOPConfiguration.beachOvergrownID)).setColor(16440917).setBiomeName("Overgrown Beach").setTemperatureRainfall(0.8F, 0.4F).setMinMaxHeight(0.0F, 0.1F));
Biomes.birchForest = Optional.of((new BiomeGenBirchForest(BOPConfiguration.birchForestID)).setColor(353825).setBiomeName("Birch Forest").func_76733_a(5159473).setTemperatureRainfall(0.4F, 0.3F));
Biomes.bog = Optional.of((new BiomeGenBog(BOPConfiguration.bogID)).setColor(522674).setBiomeName("Bog").func_76733_a(9154376).setMinMaxHeight(-0.3F, -0.1F).setTemperatureRainfall(0.8F, 0.9F));
Biomes.bog = Optional.of((new BiomeGenBog(BOPConfiguration.bogID)).setColor(522674).setBiomeName("Bog").func_76733_a(9154376).setMinMaxHeight(-0.1F, 0.1F).setTemperatureRainfall(0.8F, 0.9F));
Biomes.borealForest = Optional.of((new BiomeGenBorealForest(BOPConfiguration.borealForestID)).setColor(353825).setBiomeName("Boreal Forest").func_76733_a(5159473).setMinMaxHeight(0.0F, 1.0F).setTemperatureRainfall(0.6F, 0.7F));
Biomes.brushland = Optional.of((new BiomeGenBrushland(BOPConfiguration.brushlandID)).setColor(16421912).setBiomeName("Brushland").setTemperatureRainfall(2.0F, 0.0F).setMinMaxHeight(0.0F, 0.5F));
Biomes.canyon = Optional.of((new BiomeGenCanyon(BOPConfiguration.canyonID)).setColor(9286496).setBiomeName("Canyon").setTemperatureRainfall(0.8F, 0.4F).setMinMaxHeight(3.0F, 5.0F));
@ -118,7 +118,11 @@ public class BOPBiomes {
Biomes.netherBone = Optional.of((new BiomeGenNetherBone(BOPConfiguration.netherBoneID)).setColor(16711680).setBiomeName("Boneyard").setDisableRain().setTemperatureRainfall(2.0F, 0.0F));
Biomes.oasis = Optional.of((new BiomeGenOasis(BOPConfiguration.oasisID)).setColor(16421912).setBiomeName("Oasis").setTemperatureRainfall(2.0F, 2.0F).setMinMaxHeight(0.1F, 0.2F));
Biomes.ominousWoods = Optional.of((new BiomeGenOminousWoods(BOPConfiguration.ominousWoodsID)).setColor(353825).setBiomeName("Ominous Woods").setDisableRain().func_76733_a(5159473).setTemperatureRainfall(0.8F, 0.9F));
Biomes.oceanCoral = Optional.of((new BiomeGenOceanCoral(BOPConfiguration.oceanCoralID)).setColor(10486015).setBiomeName("Coral Reef").setMinMaxHeight(-0.1F, -0.1F).setTemperatureRainfall(0.5F, 0.9F));
Biomes.oceanKelp = Optional.of((new BiomeGenOceanKelp(BOPConfiguration.oceanKelpID)).setColor(10486015).setBiomeName("Kelp Forest").setMinMaxHeight(-0.1F, -0.1F).setTemperatureRainfall(0.5F, 0.9F));
Biomes.ominousWoods = Optional.of((new BiomeGenOminousWoods(BOPConfiguration.ominousWoodsID)).setColor(353825).setBiomeName("Ominous Woods").setDisableRain().func_76733_a(5159473).setTemperatureRainfall(0.8F, 0.9F));
Biomes.orchard = Optional.of((new BiomeGenOrchard(BOPConfiguration.orchardID)).setColor(9286496).setBiomeName("Orchard").setTemperatureRainfall(0.8F, 0.4F));
Biomes.originValley = Optional.of((new BiomeGenOriginValley(BOPConfiguration.originValleyID)).setColor(353825).setBiomeName("Origin Valley").func_76733_a(5159473).setTemperatureRainfall(0.7F, 0.8F).setMinMaxHeight(-0.1F, 0.6F));
Biomes.outback = Optional.of((new BiomeGenOutback(BOPConfiguration.outbackID)).setColor(9286496).setBiomeName("Outback").setTemperatureRainfall(0.8F, 0.0F).setMinMaxHeight(0.1F, 0.1F));
@ -140,9 +144,9 @@ public class BOPBiomes {
Biomes.shield = Optional.of((new BiomeGenShield(BOPConfiguration.shieldID)).setColor(522674).setBiomeName("Shield").func_76733_a(9154376).setMinMaxHeight(-0.2F, 0.4F).setTemperatureRainfall(0.5F, 0.8F));
Biomes.shore = Optional.of((new BiomeGenShore(BOPConfiguration.shoreID)).setColor(9286496).setBiomeName("Shore").setMinMaxHeight(-1.0F, 0.4F).setTemperatureRainfall(0.8F, 0.4F));
Biomes.shrubland = Optional.of((new BiomeGenShrubland(BOPConfiguration.shrublandID)).setColor(9286496).setBiomeName("Shrubland").setMinMaxHeight(0.1F, 0.2F).setTemperatureRainfall(0.6F, 0.0F));
Biomes.spruceWoods = Optional.of((new BiomeGenSpruceWoods(BOPConfiguration.spruceWoodsID)).setColor(353825).setBiomeName("Spruce Woods").func_76733_a(5159473).setTemperatureRainfall(0.6F, 0.7F));
Biomes.sludgepit = Optional.of((new BiomeGenSludgepit(BOPConfiguration.sludgepitID)).setColor(522674).setBiomeName("Sludgepit").func_76733_a(9154376).setMinMaxHeight(-0.3F, -0.1F).setTemperatureRainfall(0.8F, 0.9F));
Biomes.spruceWoods = Optional.of((new BiomeGenSpruceWoods(BOPConfiguration.spruceWoodsID)).setColor(353825).setBiomeName("Spruce Woods").func_76733_a(5159473).setTemperatureRainfall(0.6F, 0.7F));
Biomes.steppe = Optional.of((new BiomeGenSteppe(BOPConfiguration.steppeID)).setColor(9286496).setBiomeName("Steppe").setTemperatureRainfall(2.0F, 0.0F).setMinMaxHeight(0.1F, 0.2F));
Biomes.swampwoods = Optional.of((new BiomeGenSwampwoods(BOPConfiguration.swampwoodsID)).setColor(522674).setBiomeName("Swampwoods").func_76733_a(9154376).setMinMaxHeight(-0.2F, 0.2F).setTemperatureRainfall(0.8F, 0.9F));
Biomes.temperateRainforest = Optional.of((new BiomeGenTemperateRainforest(BOPConfiguration.temperateRainforestID)).setColor(353825).setBiomeName("Temperate Rainforest").func_76733_a(5159473).setTemperatureRainfall(0.7F, 0.8F).setMinMaxHeight(0.2F, 1.2F));
Biomes.thicket = Optional.of((new BiomeGenThicket(BOPConfiguration.thicketID)).setColor(353825).setBiomeName("Thicket").func_76733_a(5159473).setTemperatureRainfall(0.6F, 0.2F).setMinMaxHeight(0.0F, 0.2F));
Biomes.tropicalRainforest = Optional.of((new BiomeGenTropicalRainforest(BOPConfiguration.tropicalRainforestID)).setColor(9286496).setBiomeName("Tropical Rainforest").setTemperatureRainfall(1.2F, 0.9F).setMinMaxHeight(0.3F, 0.7F));
@ -174,7 +178,7 @@ public class BOPBiomes {
BiomeDictionary.registerBiomeType(Biomes.beachOvergrown.get(), Type.BEACH, Type.FOREST);
BiomeDictionary.registerBiomeType(Biomes.birchForest.get(), Type.FOREST);
BiomeDictionary.registerBiomeType(Biomes.bog.get(), Type.SWAMP);
BiomeDictionary.registerBiomeType(Biomes.bog.get(), Type.SWAMP, Type.FOREST);
BiomeDictionary.registerBiomeType(Biomes.borealForest.get(), Type.FOREST);
BiomeDictionary.registerBiomeType(Biomes.brushland.get(), Type.DESERT, Type.FOREST, Type.PLAINS);
BiomeDictionary.registerBiomeType(Biomes.canyon.get(), Type.DESERT, Type.MOUNTAIN, Type.HILLS);
@ -203,7 +207,7 @@ public class BOPBiomes {
BiomeDictionary.registerBiomeType(Biomes.jadeCliffs.get(), Type.FOREST, Type.MOUNTAIN);
BiomeDictionary.registerBiomeType(Biomes.lushDesert.get(), Type.DESERT, Type.PLAINS);
BiomeDictionary.registerBiomeType(Biomes.lushSwamp.get(), Type.SWAMP);
BiomeDictionary.registerBiomeType(Biomes.mangrove.get(), Type.WATER);
BiomeDictionary.registerBiomeType(Biomes.mangrove.get(), Type.WATER, Type.FOREST);
BiomeDictionary.registerBiomeType(Biomes.mapleWoods.get(), Type.FOREST);
BiomeDictionary.registerBiomeType(Biomes.marsh.get(), Type.SWAMP, Type.WATER);
BiomeDictionary.registerBiomeType(Biomes.meadow.get(), Type.FOREST, Type.PLAINS);
@ -219,6 +223,10 @@ public class BOPBiomes {
BiomeDictionary.registerBiomeType(Biomes.netherBone.get(), Type.NETHER, Type.WASTELAND);
BiomeDictionary.registerBiomeType(Biomes.oasis.get(), Type.DESERT, Type.PLAINS);
BiomeDictionary.registerBiomeType(Biomes.oceanCoral.get(), Type.WATER);
BiomeDictionary.registerBiomeType(Biomes.oceanKelp.get(), Type.WATER, Type.FOREST);
BiomeDictionary.registerBiomeType(Biomes.ominousWoods.get(), Type.MAGICAL);
BiomeDictionary.registerBiomeType(Biomes.orchard.get(), Type.FOREST, Type.PLAINS);
BiomeDictionary.registerBiomeType(Biomes.outback.get(), Type.DESERT, Type.PLAINS);
@ -239,9 +247,9 @@ public class BOPBiomes {
BiomeDictionary.registerBiomeType(Biomes.seasonalForest.get(), Type.FOREST);
BiomeDictionary.registerBiomeType(Biomes.shield.get(), Type.FOREST);
BiomeDictionary.registerBiomeType(Biomes.shrubland.get(), Type.PLAINS);
BiomeDictionary.registerBiomeType(Biomes.sludgepit.get(), Type.SWAMP, Type.WASTELAND);
BiomeDictionary.registerBiomeType(Biomes.spruceWoods.get(), Type.FOREST);
BiomeDictionary.registerBiomeType(Biomes.steppe.get(), Type.PLAINS, Type.WASTELAND);
BiomeDictionary.registerBiomeType(Biomes.swampwoods.get(), Type.SWAMP, Type.FOREST);
BiomeDictionary.registerBiomeType(Biomes.temperateRainforest.get(), Type.FOREST, Type.HILLS);
BiomeDictionary.registerBiomeType(Biomes.thicket.get(), Type.PLAINS, Type.FOREST);
BiomeDictionary.registerBiomeType(Biomes.tropicalRainforest.get(), Type.JUNGLE);
@ -314,8 +322,8 @@ public class BOPBiomes {
addSpawnBiome(Biomes.seasonalForest);
addSpawnBiome(Biomes.shield);
addSpawnBiome(Biomes.shrubland);
addSpawnBiome(Biomes.sludgepit);
addSpawnBiome(Biomes.spruceWoods);
addSpawnBiome(Biomes.swampwoods);
addSpawnBiome(Biomes.temperateRainforest);
addSpawnBiome(Biomes.thicket);
addSpawnBiome(Biomes.tropicalRainforest);
@ -387,8 +395,8 @@ public class BOPBiomes {
addVillageBiome(Biomes.seasonalForest, BOPConfiguration.seasonalForestVillage);
addVillageBiome(Biomes.shield, BOPConfiguration.shieldVillage);
addVillageBiome(Biomes.shrubland, BOPConfiguration.shrublandVillage);
addVillageBiome(Biomes.sludgepit, BOPConfiguration.sludgepitVillage);
addVillageBiome(Biomes.spruceWoods, BOPConfiguration.spruceWoodsVillage);
addVillageBiome(Biomes.swampwoods, BOPConfiguration.swampwoodsVillage);
addVillageBiome(Biomes.temperateRainforest, BOPConfiguration.temperateRainforestVillage);
addVillageBiome(Biomes.thicket, BOPConfiguration.thicketVillage);
addVillageBiome(Biomes.tropicalRainforest, BOPConfiguration.tropicalRainforestVillage);
@ -468,9 +476,9 @@ public class BOPBiomes {
addStrongholdBiome(Biomes.seasonalForest);
addStrongholdBiome(Biomes.shield);
addStrongholdBiome(Biomes.shrubland);
addStrongholdBiome(Biomes.sludgepit);
addStrongholdBiome(Biomes.spruceWoods);
addStrongholdBiome(Biomes.steppe);
addStrongholdBiome(Biomes.swampwoods);
addStrongholdBiome(Biomes.temperateRainforest);
addStrongholdBiome(Biomes.thicket);
addStrongholdBiome(Biomes.tropicalRainforest);
@ -676,6 +684,9 @@ public class BOPBiomes {
if (BOPConfiguration.shrublandGen)
registerBiome(Biomes.shrubland);
if (BOPConfiguration.sludgepitGen)
registerBiome(Biomes.sludgepit);
if (BOPConfiguration.spruceWoodsGen)
registerBiome(Biomes.spruceWoods);
@ -683,9 +694,6 @@ public class BOPBiomes {
if (BOPConfiguration.steppeGen)
registerBiome(Biomes.steppe);
if (BOPConfiguration.swampwoodsGen)
registerBiome(Biomes.swampwoods);
if (BOPConfiguration.temperateRainforestGen)
registerBiome(Biomes.temperateRainforest);
@ -974,6 +982,9 @@ public class BOPBiomes {
if (BOPConfiguration.shrublandGen)
addBiomeToWorldTypes(getWorldTypes(), Biomes.shrubland);
if (BOPConfiguration.sludgepitGen)
addBiomeToWorldTypes(getWorldTypes(), Biomes.sludgepit);
if (BOPConfiguration.spruceWoodsGen)
addBiomeToWorldTypes(getWorldTypes(), Biomes.spruceWoods);
@ -981,9 +992,6 @@ public class BOPBiomes {
if (BOPConfiguration.steppeGen)
addBiomeToWorldTypes(getWorldTypes(), Biomes.steppe);
if (BOPConfiguration.swampwoodsGen)
addBiomeToWorldTypes(getWorldTypes(), Biomes.swampwoods);
if (BOPConfiguration.temperateRainforestGen)
addBiomeToWorldTypes(getWorldTypes(), Biomes.temperateRainforest);

View file

@ -54,6 +54,7 @@ public class BOPConfiguration {
public static boolean groveGen;
public static boolean heathlandGen;
public static boolean highlandGen;
public static boolean hotSpringsGen;
public static boolean icyHillsGen;
public static boolean jadeCliffsGen;
public static boolean lushDesertGen;
@ -84,11 +85,12 @@ public class BOPConfiguration {
public static boolean seasonalForestGen;
public static boolean shieldGen;
public static boolean shrublandGen;
public static boolean sludgepitGen;
public static boolean spruceWoodsGen;
public static boolean steppeGen;
public static boolean swampwoodsGen;
public static boolean temperateRainforestGen;
public static boolean thicketGen;
public static boolean timberGen;
public static boolean tropicalRainforestGen;
public static boolean tropicsGen;
public static boolean tundraGen;
@ -262,6 +264,7 @@ public class BOPConfiguration {
public static int groveID;
public static int heathlandID;
public static int highlandID;
public static int hotSpringsID;
public static int icyHillsID;
public static int jadeCliffsID;
public static int lushDesertID;
@ -282,6 +285,10 @@ public class BOPConfiguration {
public static int netherBoneID;
public static int oasisID;
public static int oceanCoralID;
public static int oceanKelpID;
public static int ominousWoodsID;
public static int orchardID;
public static int originValleyID;
@ -305,11 +312,12 @@ public class BOPConfiguration {
public static int shieldID;
public static int shoreID;
public static int shrublandID;
public static int sludgepitID;
public static int spruceWoodsID;
public static int steppeID;
public static int swampwoodsID;
public static int temperateRainforestID;
public static int thicketID;
public static int timberID;
public static int tropicalRainforestID;
public static int tropicsID;
public static int tundraID;
@ -371,6 +379,7 @@ public class BOPConfiguration {
public static boolean groveVillage;
public static boolean heathlandVillage;
public static boolean highlandVillage;
public static boolean hotSpringsVillage;
public static boolean icyHillsVillage;
public static boolean jadeCliffsVillage;
public static boolean lushDesertVillage;
@ -401,11 +410,12 @@ public class BOPConfiguration {
public static boolean seasonalForestVillage;
public static boolean shieldVillage;
public static boolean shrublandVillage;
public static boolean sludgepitVillage;
public static boolean spruceWoodsVillage;
public static boolean steppeVillage;
public static boolean swampwoodsVillage;
public static boolean temperateRainforestVillage;
public static boolean thicketVillage;
public static boolean timberVillage;
public static boolean tropicalRainforestVillage;
public static boolean tropicsVillage;
public static boolean tundraVillage;
@ -477,6 +487,7 @@ public class BOPConfiguration {
groveGen = config.get("Biomes To Generate", "Grove", true).getBoolean(false);
heathlandGen = config.get("Biomes To Generate", "Heathland", true).getBoolean(false);
highlandGen = config.get("Biomes To Generate", "Highland", true).getBoolean(false);
hotSpringsGen = config.get("Biomes To Generate", "HotSprings", true).getBoolean(false);
icyHillsGen = config.get("Biomes To Generate", "IcyHills", true).getBoolean(false);
jadeCliffsGen = config.get("Biomes To Generate", "JadeCliffs", true).getBoolean(false);
lushDesertGen = config.get("Biomes To Generate", "LushDesert", true).getBoolean(false);
@ -507,11 +518,12 @@ public class BOPConfiguration {
seasonalForestGen = config.get("Biomes To Generate", "SeasonalForest", true).getBoolean(false);
shieldGen = config.get("Biomes To Generate", "Shield", true).getBoolean(false);
shrublandGen = config.get("Biomes To Generate", "Shrubland", true).getBoolean(false);
sludgepitGen = config.get("Biomes To Generate", "Swampwoods", true).getBoolean(false);
spruceWoodsGen = config.get("Biomes To Generate", "SpruceWoods", true).getBoolean(false);
steppeGen = config.get("Biomes To Generate", "Steppe", true).getBoolean(false);
swampwoodsGen = config.get("Biomes To Generate", "Swampwoods", true).getBoolean(false);
temperateRainforestGen = config.get("Biomes To Generate", "TemperateRainforest", true).getBoolean(false);
thicketGen = config.get("Biomes To Generate", "Thicket", true).getBoolean(false);
timberGen = config.get("Biomes To Generate", "Timber", true).getBoolean(false);
tropicalRainforestGen = config.get("Biomes To Generate", "TropicalRainforest", true).getBoolean(false);
tropicsGen = config.get("Biomes To Generate", "Tropics", true).getBoolean(false);
tundraGen = config.get("Biomes To Generate", "Tundra", true).getBoolean(false);
@ -561,6 +573,7 @@ public class BOPConfiguration {
groveVillage = config.get("Allow Villages", "Grove", true).getBoolean(false);
heathlandVillage = config.get("Allow Villages", "Heathland", true).getBoolean(false);
highlandVillage = config.get("Allow Villages", "Highland", false).getBoolean(false);
hotSpringsVillage = config.get("Allow Villages", "HotSprings", false).getBoolean(false);
icyHillsVillage = config.get("Allow Villages", "IcyHills", false).getBoolean(false);
jadeCliffsVillage = config.get("Allow Villages", "JadeCliffs", false).getBoolean(false);
lushDesertVillage = config.get("Allow Villages", "LushDesert", true).getBoolean(false);
@ -591,11 +604,12 @@ public class BOPConfiguration {
seasonalForestVillage = config.get("Allow Villages", "SeasonalForest", false).getBoolean(false);
shieldVillage = config.get("Allow Villages", "Shield", true).getBoolean(false);
shrublandVillage = config.get("Allow Villages", "Shrubland", true).getBoolean(false);
sludgepitVillage = config.get("Allow Villages", "Sludgepit", false).getBoolean(false);
spruceWoodsVillage = config.get("Allow Villages", "SpruceWoods", true).getBoolean(false);
steppeVillage = config.get("Allow Villages", "Steppe", true).getBoolean(false);
swampwoodsVillage = config.get("Allow Villages", "Swampwoods", false).getBoolean(false);
temperateRainforestVillage = config.get("Allow Villages", "TemperateRainforest", true).getBoolean(false);
thicketVillage = config.get("Allow Villages", "Thicket", false).getBoolean(false);
timberVillage = config.get("Allow Villages", "Timber", false).getBoolean(false);
tropicalRainforestVillage = config.get("Allow Villages", "TropicalRainforest", true).getBoolean(false);
tropicsVillage = config.get("Allow Villages", "Tropics", false).getBoolean(false);
tundraVillage = config.get("Allow Villages", "Tundra", true).getBoolean(false);
@ -745,6 +759,9 @@ public class BOPConfiguration {
//23-79 ExtraBiomesXL
oceanCoralID = config.get("Biome IDs", "Coral Reef (Ocean) ID", 58).getInt();
oceanKelpID = config.get("Biome IDs", "Kelp Forest (Ocean) ID", 59).getInt();
beachGravelID = config.get("Biome IDs", "Gravel Beach ID", 60).getInt();
beachOvergrownID = config.get("Biome IDs", "Overgrown Beach ID", 61).getInt();
@ -762,75 +779,77 @@ public class BOPConfiguration {
//80-169 Better World Generation 4
alpsID = config.get("Biome IDs", "Alps ID", 172).getInt();
arcticID = config.get("Biome IDs", "Arctic ID", 173).getInt();
badlandsID = config.get("Biome IDs", "Badlands ID", 174).getInt();
bambooForestID = config.get("Biome IDs", "Bamboo Forest ID", 175).getInt();
bayouID = config.get("Biome IDs", "Bayou ID", 176).getInt();
birchForestID = config.get("Biome IDs", "Birch Forest ID", 177).getInt();
bogID = config.get("Biome IDs", "Bog ID", 178).getInt();
borealForestID = config.get("Biome IDs", "Boreal Forest ID", 179).getInt();
brushlandID = config.get("Biome IDs", "Brushland ID", 180).getInt();
canyonID = config.get("Biome IDs", "Canyon ID", 181).getInt();
chaparralID = config.get("Biome IDs", "Chaparral ID", 182).getInt();
cherryBlossomGroveID = config.get("Biome IDs", "Cherry Blossom Grove ID", 183).getInt();
coniferousForestID = config.get("Biome IDs", "Coniferous Forest ID", 184).getInt();
coniferousForestSnowID = config.get("Biome IDs", "Coniferous Forest (Snow) ID", 185).getInt();
cragID = config.get("Biome IDs", "Crag ID", 186).getInt();
deadForestID = config.get("Biome IDs", "Dead Forest ID", 187).getInt();
deadForestSnowID = config.get("Biome IDs", "Dead Forest (Snow) ID", 188).getInt();
deadSwampID = config.get("Biome IDs", "Dead Swamp ID", 189).getInt();
deadlandsID = config.get("Biome IDs", "Deadlands ID", 190).getInt();
deciduousForestID = config.get("Biome IDs", "Deciduous Forest ID", 191).getInt();
dunesID = config.get("Biome IDs", "Dunes ID", 192).getInt();
fenID = config.get("Biome IDs", "Fen ID", 193).getInt();
fieldID = config.get("Biome IDs", "Field ID", 194).getInt();
frostForestID = config.get("Biome IDs", "Frost Forest ID", 195).getInt();
fungiForestID = config.get("Biome IDs", "Fungi Forest ID", 196).getInt();
gardenID = config.get("Biome IDs", "Garden ID", 197).getInt();
glacierID = config.get("Biome IDs", "Glacier ID", 198).getInt();
grasslandID = config.get("Biome IDs", "Grassland ID", 199).getInt();
groveID = config.get("Biome IDs", "Grove ID", 200).getInt();
heathlandID = config.get("Biome IDs", "Heathland ID", 201).getInt();
highlandID = config.get("Biome IDs", "Highland ID", 202).getInt();
icyHillsID = config.get("Biome IDs", "Icy Hills ID", 203).getInt();
jadeCliffsID = config.get("Biome IDs", "Jade Cliffs ID", 204).getInt();
lushDesertID = config.get("Biome IDs", "Lush Desert ID", 205).getInt();
lushSwampID = config.get("Biome IDs", "Lush Swamp ID", 206).getInt();
alpsID = config.get("Biome IDs", "Alps ID", 170).getInt();
arcticID = config.get("Biome IDs", "Arctic ID", 171).getInt();
badlandsID = config.get("Biome IDs", "Badlands ID", 172).getInt();
bambooForestID = config.get("Biome IDs", "Bamboo Forest ID", 173).getInt();
bayouID = config.get("Biome IDs", "Bayou ID", 174).getInt();
birchForestID = config.get("Biome IDs", "Birch Forest ID", 175).getInt();
bogID = config.get("Biome IDs", "Bog ID", 176).getInt();
borealForestID = config.get("Biome IDs", "Boreal Forest ID", 177).getInt();
brushlandID = config.get("Biome IDs", "Brushland ID", 178).getInt();
canyonID = config.get("Biome IDs", "Canyon ID", 179).getInt();
chaparralID = config.get("Biome IDs", "Chaparral ID", 180).getInt();
cherryBlossomGroveID = config.get("Biome IDs", "Cherry Blossom Grove ID", 181).getInt();
coniferousForestID = config.get("Biome IDs", "Coniferous Forest ID", 182).getInt();
coniferousForestSnowID = config.get("Biome IDs", "Coniferous Forest (Snow) ID", 183).getInt();
cragID = config.get("Biome IDs", "Crag ID", 184).getInt();
deadForestID = config.get("Biome IDs", "Dead Forest ID", 185).getInt();
deadForestSnowID = config.get("Biome IDs", "Dead Forest (Snow) ID", 186).getInt();
deadSwampID = config.get("Biome IDs", "Dead Swamp ID", 187).getInt();
deadlandsID = config.get("Biome IDs", "Deadlands ID", 188).getInt();
deciduousForestID = config.get("Biome IDs", "Deciduous Forest ID", 189).getInt();
dunesID = config.get("Biome IDs", "Dunes ID", 190).getInt();
fenID = config.get("Biome IDs", "Fen ID", 191).getInt();
fieldID = config.get("Biome IDs", "Field ID", 192).getInt();
frostForestID = config.get("Biome IDs", "Frost Forest ID", 193).getInt();
fungiForestID = config.get("Biome IDs", "Fungi Forest ID", 194).getInt();
gardenID = config.get("Biome IDs", "Garden ID", 195).getInt();
glacierID = config.get("Biome IDs", "Glacier ID", 196).getInt();
grasslandID = config.get("Biome IDs", "Grassland ID", 197).getInt();
groveID = config.get("Biome IDs", "Grove ID", 198).getInt();
heathlandID = config.get("Biome IDs", "Heathland ID", 199).getInt();
highlandID = config.get("Biome IDs", "Highland ID", 200).getInt();
hotSpringsID = config.get("Biome IDs", "Hot Springs ID", 201).getInt();
icyHillsID = config.get("Biome IDs", "Icy Hills ID", 202).getInt();
jadeCliffsID = config.get("Biome IDs", "Jade Cliffs ID", 203).getInt();
lushDesertID = config.get("Biome IDs", "Lush Desert ID", 204).getInt();
lushSwampID = config.get("Biome IDs", "Lush Swamp ID", 205).getInt();
mangroveID = config.get("Biome IDs", "Mangrove ID", 206).getInt();
//207-209 left for Mo Creatures
mangroveID = config.get("Biome IDs", "Mangrove ID", 210).getInt();
mapleWoodsID = config.get("Biome IDs", "Maple Woods ID", 211).getInt();
marshID = config.get("Biome IDs", "Marsh ID", 212).getInt();
meadowID = config.get("Biome IDs", "Meadow ID", 213).getInt();
mesaID = config.get("Biome IDs", "Mesa ID", 214).getInt();
moorID = config.get("Biome IDs", "Moor ID", 215).getInt();
mountainID = config.get("Biome IDs", "Mountain ID", 216).getInt();
mysticGroveID = config.get("Biome IDs", "Mystic Grove ID", 217).getInt();
oasisID = config.get("Biome IDs", "Oasis ID", 218).getInt();
ominousWoodsID = config.get("Biome IDs", "Ominous Woods ID", 219).getInt();
orchardID = config.get("Biome IDs", "Orchard ID", 220).getInt();
originValleyID = config.get("Biome IDs", "Origin Valley ID", 221).getInt();
outbackID = config.get("Biome IDs", "Outback ID", 222).getInt();
pastureID = config.get("Biome IDs", "Pasture ID", 223).getInt();
polarID = config.get("Biome IDs", "Polar ID", 224).getInt();
prairieID = config.get("Biome IDs", "Prairie ID", 225).getInt();
quagmireID = config.get("Biome IDs", "Quagmire ID", 226).getInt();
rainforestID = config.get("Biome IDs", "Rainforest ID", 227).getInt();
redwoodForestID = config.get("Biome IDs", "Redwood Forest ID", 228).getInt();
sacredSpringsID = config.get("Biome IDs", "Sacred Springs ID", 229).getInt();
savannaID = config.get("Biome IDs", "Savanna ID", 230).getInt();
scrublandID = config.get("Biome IDs", "Scrubland ID", 231).getInt();
seasonalForestID = config.get("Biome IDs", "Seasonal Forest ID", 232).getInt();
shieldID = config.get("Biome IDs", "Shield ID", 233).getInt();
shoreID = config.get("Biome IDs", "Shore ID", 234).getInt();
shrublandID = config.get("Biome IDs", "Shrubland ID", 235).getInt();
mapleWoodsID = config.get("Biome IDs", "Maple Woods ID", 210).getInt();
marshID = config.get("Biome IDs", "Marsh ID", 211).getInt();
meadowID = config.get("Biome IDs", "Meadow ID", 212).getInt();
mesaID = config.get("Biome IDs", "Mesa ID", 213).getInt();
moorID = config.get("Biome IDs", "Moor ID", 214).getInt();
mountainID = config.get("Biome IDs", "Mountain ID", 215).getInt();
mysticGroveID = config.get("Biome IDs", "Mystic Grove ID", 216).getInt();
oasisID = config.get("Biome IDs", "Oasis ID", 217).getInt();
ominousWoodsID = config.get("Biome IDs", "Ominous Woods ID", 218).getInt();
orchardID = config.get("Biome IDs", "Orchard ID", 219).getInt();
originValleyID = config.get("Biome IDs", "Origin Valley ID", 220).getInt();
outbackID = config.get("Biome IDs", "Outback ID", 221).getInt();
pastureID = config.get("Biome IDs", "Pasture ID", 222).getInt();
polarID = config.get("Biome IDs", "Polar ID", 223).getInt();
prairieID = config.get("Biome IDs", "Prairie ID", 224).getInt();
quagmireID = config.get("Biome IDs", "Quagmire ID", 225).getInt();
rainforestID = config.get("Biome IDs", "Rainforest ID", 226).getInt();
redwoodForestID = config.get("Biome IDs", "Redwood Forest ID", 227).getInt();
sacredSpringsID = config.get("Biome IDs", "Sacred Springs ID", 228).getInt();
savannaID = config.get("Biome IDs", "Savanna ID", 229).getInt();
scrublandID = config.get("Biome IDs", "Scrubland ID", 230).getInt();
seasonalForestID = config.get("Biome IDs", "Seasonal Forest ID", 231).getInt();
shieldID = config.get("Biome IDs", "Shield ID", 232).getInt();
shoreID = config.get("Biome IDs", "Shore ID", 233).getInt();
shrublandID = config.get("Biome IDs", "Shrubland ID", 234).getInt();
sludgepitID = config.get("Biome IDs", "Sludgepit ID", 235).getInt();
spruceWoodsID = config.get("Biome IDs", "Spruce Woods ID", 236).getInt();
steppeID = config.get("Biome IDs", "Steppe ID", 237).getInt();
swampwoodsID = config.get("Biome IDs", "Swampwoods ID", 238).getInt();
temperateRainforestID = config.get("Biome IDs", "Temperate Rainforest ID", 239).getInt();
thicketID = config.get("Biome IDs", "Thicket ID", 240).getInt();
temperateRainforestID = config.get("Biome IDs", "Temperate Rainforest ID", 238).getInt();
thicketID = config.get("Biome IDs", "Thicket ID", 239).getInt();
timberID = config.get("Biome IDs", "Timber ID", 240).getInt();
tropicalRainforestID = config.get("Biome IDs", "Tropical Rainforest ID", 241).getInt();
tropicsID = config.get("Biome IDs", "Tropics ID", 242).getInt();
tundraID = config.get("Biome IDs", "Tundra ID", 243).getInt();

View file

@ -21,9 +21,9 @@ public class BWG4Integration
if(Biomes.tropicalRainforest.isPresent()) { DefaultBiomeList.addBiome("BoP: Tropical Rainforest", Biomes.tropicalRainforest.get(), 3); }
if(Biomes.thicket.isPresent()) { DefaultBiomeList.addBiome("BoP: Thicket", Biomes.thicket.get(), 2); }
if(Biomes.temperateRainforest.isPresent()) { DefaultBiomeList.addBiome("BoP: Temperate Rainforest", Biomes.temperateRainforest.get(), 3); }
if(Biomes.swampwoods.isPresent()) { DefaultBiomeList.addBiome("BoP: Swampwoods", Biomes.swampwoods.get(), 3); }
if(Biomes.steppe.isPresent()) { DefaultBiomeList.addBiome("BoP: Steppe", Biomes.steppe.get(), 4); }
if(Biomes.spruceWoods.isPresent()) { DefaultBiomeList.addBiome("BoP: Spruce Woods", Biomes.spruceWoods.get(), 2); }
if(Biomes.sludgepit.isPresent()) { DefaultBiomeList.addBiome("BoP: Sludgepit", Biomes.sludgepit.get(), 3); }
if(Biomes.shrubland.isPresent()) { DefaultBiomeList.addBiome("BoP: Shrubland", Biomes.shrubland.get(), 2); }
if(Biomes.shield.isPresent()) { DefaultBiomeList.addBiome("BoP: Shield", Biomes.shield.get(), 2); }
if(Biomes.seasonalForest.isPresent()) { DefaultBiomeList.addBiome("BoP: Seasonal Forest", Biomes.seasonalForest.get(), 2); }

View file

@ -100,7 +100,7 @@ public class ForestryIntegration
EnumTemperature.normalBiomeIds.add(BOPConfiguration.mysticGroveID);
EnumTemperature.normalBiomeIds.add(BOPConfiguration.ominousWoodsID);
EnumTemperature.normalBiomeIds.add(BOPConfiguration.quagmireID);
EnumTemperature.normalBiomeIds.add(BOPConfiguration.swampwoodsID);
EnumTemperature.normalBiomeIds.add(BOPConfiguration.sludgepitID);
EnumTemperature.normalBiomeIds.add(BOPConfiguration.wetlandID);
EnumTemperature.normalBiomeIds.add(BOPConfiguration.fenID);
EnumTemperature.normalBiomeIds.add(BOPConfiguration.swamplandNewID);
@ -116,7 +116,7 @@ public class ForestryIntegration
EnumHumidity.dampBiomeIds.add(BOPConfiguration.mysticGroveID);
EnumHumidity.dampBiomeIds.add(BOPConfiguration.ominousWoodsID);
EnumHumidity.dampBiomeIds.add(BOPConfiguration.quagmireID);
EnumHumidity.dampBiomeIds.add(BOPConfiguration.swampwoodsID);
EnumHumidity.dampBiomeIds.add(BOPConfiguration.sludgepitID);
EnumHumidity.dampBiomeIds.add(BOPConfiguration.wetlandID);
EnumHumidity.dampBiomeIds.add(BOPConfiguration.fenID);
EnumHumidity.dampBiomeIds.add(BOPConfiguration.swamplandNewID);

View file

@ -258,6 +258,10 @@ public class WorldTypeBOP extends WorldType
{
addNewBiome(Biomes.shrubland);
}
if (BOPConfiguration.sludgepitGen == true)
{
addNewBiome(Biomes.sludgepit);
}
if (BOPConfiguration.spruceWoodsGen == true)
{
addNewBiome(Biomes.spruceWoods);
@ -266,10 +270,6 @@ public class WorldTypeBOP extends WorldType
{
addNewBiome(Biomes.steppe);
}
if (BOPConfiguration.swampwoodsGen == true)
{
addNewBiome(Biomes.swampwoods);
}
if (BOPConfiguration.temperateRainforestGen == true)
{
addNewBiome(Biomes.temperateRainforest);

View file

@ -0,0 +1,41 @@
package biomesoplenty.worldgen;
import java.util.Random;
import net.minecraft.block.Block;
import net.minecraft.world.World;
import net.minecraft.world.gen.feature.WorldGenerator;
public class WorldGenBogBush extends WorldGenerator
{
public boolean generate(World var1, Random var2, int var3, int var4, int var5)
{
while (var1.isAirBlock(var3, var4, var5) && var4 > 2)
{
--var4;
}
int var6 = var1.getBlockId(var3, var4, var5);
if (var6 != Block.grass.blockID)
{
return false;
}
else
{
for (int var7 = -2; var7 <= 2; ++var7)
{
for (int var8 = -2; var8 <= 2; ++var8)
{
if (var1.isAirBlock(var3 + var7, var4 - 1, var5 + var8) && var1.isAirBlock(var3 + var7, var4 - 2, var5 + var8))
{
return false;
}
}
}
this.setBlockAndMetadata(var1, var3, var4 + 1, var5, Block.leaves.blockID, 4);
return true;
}
}
}

View file

@ -9,17 +9,17 @@ import net.minecraft.block.Block;
import net.minecraft.world.World;
import net.minecraft.world.gen.feature.WorldGenerator;
public class WorldGenCypress extends WorldGenerator
public class WorldGenCypress1 extends WorldGenerator
{
public WorldGenCypress(boolean var1)
public WorldGenCypress1(boolean var1)
{
super(var1);
}
public boolean generate(World var1, Random var2, int var3, int var4, int var5)
{
int var6 = var2.nextInt(10) + 15;
int var7 = var2.nextInt(3) + 5;
int var6 = var2.nextInt(5) + 8;
int var7 = var2.nextInt(3) + 2;
int var8 = var6 - var7;
int var9 = 1;
boolean var10 = true;
@ -52,7 +52,7 @@ public class WorldGenCypress extends WorldGenerator
{
var15 = var1.getBlockId(var13, var11, var14);
if (var15 != 0 && var15 != Blocks.leavesColorized.get().blockID)
if (var15 != 0 && var15 != Block.leaves.blockID)
{
var10 = false;
}
@ -98,7 +98,7 @@ public class WorldGenCypress extends WorldGenerator
{
if (var2.nextInt(3) != 0)
{
this.setBlockAndMetadata(var1, var17, var16, var19, Blocks.leavesColorized.get().blockID, 4);
this.setBlockAndMetadata(var1, var17, var16, var19, Block.leaves.blockID, 0);
}
}
}
@ -127,19 +127,19 @@ public class WorldGenCypress extends WorldGenerator
{
var17 = var1.getBlockId(var3, var4 + var16, var5);
if (var17 == 0 || var17 == Blocks.leavesColorized.get().blockID)
if (var17 == 0 || var17 == Block.leaves.blockID)
{
this.setBlockAndMetadata(var1, var3, var4 + var16, var5, Blocks.logs3.get().blockID, 1);
this.setBlockAndMetadata(var1, var3, (var4 + var6), var5, Blocks.logs3.get().blockID, 1);
this.setBlockAndMetadata(var1, var3, (var4 + var6) - 2, var5, Blocks.logs3.get().blockID, 1);
this.setBlockAndMetadata(var1, var3, (var4 + var6) - 1, var5, Blocks.logs3.get().blockID, 1);
this.setBlockAndMetadata(var1, var3, (var4 + var6), var5, Blocks.logs3.get().blockID, 1);
this.setBlockAndMetadata(var1, var3, (var4 + var6) + 1, var5, Blocks.logs3.get().blockID, 1);
this.setBlockAndMetadata(var1, var3 - 1, (var4 + var6) + 1, var5, Blocks.leavesColorized.get().blockID, 4);
this.setBlockAndMetadata(var1, var3 + 1, (var4 + var6) + 1, var5, Blocks.leavesColorized.get().blockID, 4);
this.setBlockAndMetadata(var1, var3, (var4 + var6) + 1, var5 - 1, Blocks.leavesColorized.get().blockID, 4);
this.setBlockAndMetadata(var1, var3, (var4 + var6) + 1, var5 + 1, Blocks.leavesColorized.get().blockID, 4);
this.setBlockAndMetadata(var1, var3, (var4 + var6) + 2, var5, Blocks.leavesColorized.get().blockID, 4);
this.setBlockAndMetadata(var1, var3, var4 + var16, var5, Block.wood.blockID, 0);
this.setBlockAndMetadata(var1, var3, (var4 + var6), var5, Block.wood.blockID, 0);
this.setBlockAndMetadata(var1, var3, (var4 + var6) - 2, var5, Block.wood.blockID, 0);
this.setBlockAndMetadata(var1, var3, (var4 + var6) - 1, var5, Block.wood.blockID, 0);
this.setBlockAndMetadata(var1, var3, (var4 + var6), var5, Block.wood.blockID, 0);
this.setBlockAndMetadata(var1, var3, (var4 + var6) + 1, var5, Block.wood.blockID, 0);
this.setBlockAndMetadata(var1, var3 - 1, (var4 + var6) + 1, var5, Block.leaves.blockID, 0);
this.setBlockAndMetadata(var1, var3 + 1, (var4 + var6) + 1, var5, Block.leaves.blockID, 0);
this.setBlockAndMetadata(var1, var3, (var4 + var6) + 1, var5 - 1, Block.leaves.blockID, 0);
this.setBlockAndMetadata(var1, var3, (var4 + var6) + 1, var5 + 1, Block.leaves.blockID, 0);
this.setBlockAndMetadata(var1, var3, (var4 + var6) + 2, var5, Block.leaves.blockID, 0);
}
}

View file

@ -0,0 +1,159 @@
package biomesoplenty.worldgen;
import java.util.Random;
import biomesoplenty.api.Blocks;
import biomesoplenty.configuration.BOPBlocks;
import net.minecraft.block.Block;
import net.minecraft.world.World;
import net.minecraft.world.gen.feature.WorldGenerator;
public class WorldGenCypress2 extends WorldGenerator
{
public WorldGenCypress2(boolean var1)
{
super(var1);
}
public boolean generate(World var1, Random var2, int var3, int var4, int var5)
{
int var6 = var2.nextInt(4) + 4;
int var7 = 2;
int var8 = var6 - var7;
int var9 = 1;
boolean var10 = true;
if (var4 >= 1 && var4 + var6 + 1 <= 256)
{
int var11;
int var13;
int var15;
int var21;
for (var11 = var4; var11 <= var4 + 1 + var6 && var10; ++var11)
{
boolean var12 = true;
if (var11 - var4 < var7)
{
var21 = 0;
}
else
{
var21 = var9;
}
for (var13 = var3 - var21; var13 <= var3 + var21 && var10; ++var13)
{
for (int var14 = var5 - var21; var14 <= var5 + var21 && var10; ++var14)
{
if (var11 >= 0 && var11 < 256)
{
var15 = var1.getBlockId(var13, var11, var14);
if (var15 != 0 && var15 != Block.leaves.blockID)
{
var10 = false;
}
}
else
{
var10 = false;
}
}
}
}
if (!var10)
{
return false;
}
else
{
var11 = var1.getBlockId(var3, var4 - 1, var5);
if ((var11 == Block.grass.blockID || var11 == Block.dirt.blockID) && var4 < 256 - var6 - 1)
{
var1.setBlock(var3, var4 - 1, var5, Block.dirt.blockID);
var21 = var2.nextInt(2);
var13 = 1;
boolean var22 = false;
int var17;
int var16;
for (var15 = 0; var15 <= var8; ++var15)
{
var16 = var4 + var6 - var15;
for (var17 = var3 - var21; var17 <= var3 + var21; ++var17)
{
int var18 = var17 - var3;
for (int var19 = var5 - var21; var19 <= var5 + var21; ++var19)
{
int var20 = var19 - var5;
if ((Math.abs(var18) != var21 || Math.abs(var20) != var21 || var21 <= 0) && !Block.opaqueCubeLookup[var1.getBlockId(var17, var16, var19)])
{
if (var2.nextInt(3) != 0)
{
this.setBlockAndMetadata(var1, var17, var16, var19, Block.leaves.blockID, 2);
}
}
}
}
if (var21 >= var13)
{
var21 = var22 ? 1 : 0;
var22 = true;
++var13;
if (var13 > var9)
{
var13 = var9;
}
}
else
{
++var21;
}
}
var15 = var2.nextInt(3);
for (var16 = 0; var16 < var6 - var15; ++var16)
{
var17 = var1.getBlockId(var3, var4 + var16, var5);
if (var17 == 0 || var17 == Block.leaves.blockID)
{
this.setBlockAndMetadata(var1, var3, var4 + var16, var5, Block.wood.blockID, 2);
this.setBlockAndMetadata(var1, var3, (var4 + var6), var5, Block.wood.blockID, 2);
this.setBlockAndMetadata(var1, var3, (var4 + var6) - 2, var5, Block.wood.blockID, 2);
this.setBlockAndMetadata(var1, var3, (var4 + var6) - 1, var5, Block.wood.blockID, 2);
this.setBlockAndMetadata(var1, var3, (var4 + var6), var5, Block.wood.blockID, 2);
this.setBlockAndMetadata(var1, var3, (var4 + var6) + 1, var5, Block.wood.blockID, 2);
this.setBlockAndMetadata(var1, var3 - 1, (var4 + var6) + 1, var5, Block.leaves.blockID, 2);
this.setBlockAndMetadata(var1, var3 + 1, (var4 + var6) + 1, var5, Block.leaves.blockID, 2);
this.setBlockAndMetadata(var1, var3, (var4 + var6) + 1, var5 - 1, Block.leaves.blockID, 2);
this.setBlockAndMetadata(var1, var3, (var4 + var6) + 1, var5 + 1, Block.leaves.blockID, 2);
this.setBlockAndMetadata(var1, var3, (var4 + var6) + 2, var5, Block.leaves.blockID, 2);
}
}
return true;
}
else
{
return false;
}
}
}
else
{
return false;
}
}
}

View file

@ -22,7 +22,7 @@ public class BOPMapGenScatteredFeature extends MapGenStructure
private static List biomelist = Arrays.asList(new BiomeGenBase[] {
BiomeGenBase.desert, BiomeGenBase.desertHills, BiomeGenBase.jungle, BiomeGenBase.jungleHills, BiomeGenBase.swampland,
Biomes.badlands.get(), Biomes.dunes.get(), Biomes.oasis.get(), Biomes.desertNew.get(),
Biomes.bayou.get(), Biomes.bog.get(), Biomes.deadSwamp.get(), Biomes.fen.get(), Biomes.swampwoods.get(), Biomes.swamplandNew.get(),
Biomes.bayou.get(), Biomes.bog.get(), Biomes.deadSwamp.get(), Biomes.fen.get(), Biomes.sludgepit.get(), Biomes.swamplandNew.get(),
Biomes.rainforest.get(), Biomes.temperateRainforest.get(), Biomes.tropicalRainforest.get(), Biomes.jungleNew.get()
});

View file

@ -20,7 +20,7 @@ public class BOPStructureScatteredFeatureStart extends StructureStart
biome != Biomes.temperateRainforest.get() && biome != Biomes.tropicalRainforest.get() && biome != Biomes.jungleNew.get())
{
if (biome == BiomeGenBase.swampland || biome == Biomes.bayou.get() || biome == Biomes.bog.get()
|| biome == Biomes.deadSwamp.get() || biome == Biomes.fen.get() || biome == Biomes.swampwoods.get()
|| biome == Biomes.deadSwamp.get() || biome == Biomes.fen.get() || biome == Biomes.sludgepit.get()
|| biome == Biomes.swamplandNew.get())
{
ComponentScatteredFeatureSwampHut componentscatteredfeatureswamphut = new ComponentScatteredFeatureSwampHut(random, x * 16, z * 16);