Renamed Ochre Acres to Autumn Hills

This commit is contained in:
Matt Caughey 2013-09-10 08:58:26 -04:00
parent 6fbd956f4f
commit 19e4583983
7 changed files with 91 additions and 30 deletions

View file

@ -12,6 +12,7 @@ public class Biomes
public static Optional<? extends BiomeGenBase> alpsForest = Optional.absent();
public static Optional<? extends BiomeGenBase> alpsBase = Optional.absent();
public static Optional<? extends BiomeGenBase> arctic = Optional.absent();
public static Optional<? extends BiomeGenBase> autumnHills = Optional.absent();
public static Optional<? extends BiomeGenBase> badlands = Optional.absent();
public static Optional<? extends BiomeGenBase> bambooForest = Optional.absent();
public static Optional<? extends BiomeGenBase> bayou = Optional.absent();
@ -73,7 +74,6 @@ public class Biomes
public static Optional<? extends BiomeGenBase> oceanCoral = Optional.absent();
public static Optional<? extends BiomeGenBase> oceanKelp = Optional.absent();
public static Optional<? extends BiomeGenBase> ochreAcres = Optional.absent();
public static Optional<? extends BiomeGenBase> ominousWoods = Optional.absent();
public static Optional<? extends BiomeGenBase> ominousWoodsThick = Optional.absent();
public static Optional<? extends BiomeGenBase> orchard = Optional.absent();

View file

@ -85,6 +85,7 @@ import biomesoplenty.worldgen.WorldGenOutback;
import biomesoplenty.worldgen.WorldGenPit;
import biomesoplenty.worldgen.WorldGenPotatoes;
import biomesoplenty.worldgen.WorldGenPromisedWillow;
import biomesoplenty.worldgen.WorldGenPumpkinAlt;
import biomesoplenty.worldgen.WorldGenQuagmire;
import biomesoplenty.worldgen.WorldGenQuicksand;
import biomesoplenty.worldgen.WorldGenReedBOP;
@ -211,6 +212,7 @@ public class BiomeDecoratorBOP extends BiomeDecorator
protected WorldGenerator crystalGen2;
protected WorldGenerator kelpGen;
protected WorldGenerator graveGen;
protected WorldGenerator pumpkinAltGen;
protected WorldGenerator boneSpineGen;
protected WorldGenerator boneSpine2Gen;
@ -293,6 +295,7 @@ public class BiomeDecoratorBOP extends BiomeDecorator
protected int kelpPerChunk;
protected int kelpThickPerChunk;
protected int gravesPerChunk;
protected int pumpkinsPerChunk;
protected int boneSpinesPerChunk;
protected int boneSpines2PerChunk;
@ -433,6 +436,7 @@ public class BiomeDecoratorBOP extends BiomeDecorator
plantGlowGen = new WorldGenBOPFlowers(Blocks.flowers.get().blockID, 3);
plantDeadGen = new WorldGenBOPFlowers(Blocks.plants.get().blockID, 0);
plantDesertGen = new WorldGenBOPFlowers(Blocks.plants.get().blockID, 1);
pumpkinAltGen = new WorldGenPumpkinAlt(Block.pumpkin.blockID, 0);
thornGen = new WorldGenBOPFlowers(Blocks.plants.get().blockID, 5);
bushGen = new WorldGenBOPBush(Blocks.foliage.get().blockID, 4);
berryBushGen = new WorldGenBOPFlowers(Blocks.foliage.get().blockID, 8);
@ -559,6 +563,7 @@ public class BiomeDecoratorBOP extends BiomeDecorator
kelpPerChunk = 0;
kelpThickPerChunk = 0;
gravesPerChunk = 0;
pumpkinsPerChunk = 0;
generateLakes = true;
generateAsh = false;
generateMycelium = false;
@ -956,6 +961,14 @@ public class BiomeDecoratorBOP extends BiomeDecorator
graveGen.generate(currentWorld, randomGenerator, var3, var4, var5);
}
for (var2 = 0; var2 < pumpkinsPerChunk; ++var2)
{
var3 = chunk_X + randomGenerator.nextInt(16) + 8;
var4 = randomGenerator.nextInt(256);
var5 = chunk_Z + randomGenerator.nextInt(16) + 8;
pumpkinAltGen.generate(currentWorld, randomGenerator, var3, var4, var5);
}
for (var2 = 0; var2 < kelpPerChunk; ++var2)
{
var3 = chunk_X + randomGenerator.nextInt(16);

View file

@ -1,5 +1,6 @@
package biomesoplenty.biomes;
import java.awt.Color;
import java.util.Random;
import net.minecraft.block.Block;
@ -7,23 +8,30 @@ import net.minecraft.world.biome.BiomeGenBase;
import net.minecraft.world.gen.feature.WorldGenTallGrass;
import net.minecraft.world.gen.feature.WorldGenerator;
import biomesoplenty.api.Blocks;
import biomesoplenty.configuration.BOPConfiguration;
import biomesoplenty.worldgen.WorldGenDeadTree;
import biomesoplenty.worldgen.WorldGenDeadTree2;
import biomesoplenty.worldgen.WorldGenTaiga4;
public class BiomeGenOchreAcres extends BiomeGenBase
public class BiomeGenAutumnHills extends BiomeGenBase
{
private BiomeDecoratorBOP customBiomeDecorator;
public BiomeGenOchreAcres(int par1)
public BiomeGenAutumnHills(int par1)
{
super(par1);
theBiomeDecorator = new BiomeDecoratorBOP(this);
customBiomeDecorator = (BiomeDecoratorBOP)theBiomeDecorator;
customBiomeDecorator.treesPerChunk = 4;
customBiomeDecorator.grassPerChunk = 7;
customBiomeDecorator.treesPerChunk = 6;
customBiomeDecorator.grassPerChunk = 13;
customBiomeDecorator.thornsPerChunk = 1;
customBiomeDecorator.purpleFlowersPerChunk = 6;
customBiomeDecorator.flowersPerChunk = -999;
customBiomeDecorator.reedsPerChunk = -999;
customBiomeDecorator.pumpkinsPerChunk = 2;
customBiomeDecorator.bushesPerChunk = 45;
customBiomeDecorator.berryBushesPerChunk = 5;
customBiomeDecorator.sproutsPerChunk = 2;
}
/**
@ -32,7 +40,7 @@ public class BiomeGenOchreAcres extends BiomeGenBase
@Override
public WorldGenerator getRandomWorldGenForGrass(Random par1Random)
{
return par1Random.nextInt(9) == 0 ? new WorldGenTallGrass(Block.tallGrass.blockID, 1) : new WorldGenTallGrass(Blocks.foliage.get().blockID, 2);
return par1Random.nextInt(3) == 0 ? new WorldGenTallGrass(Block.tallGrass.blockID, 1) : new WorldGenTallGrass(Blocks.foliage.get().blockID, 2);
}
/**
@ -41,7 +49,7 @@ public class BiomeGenOchreAcres extends BiomeGenBase
@Override
public WorldGenerator getRandomWorldGenForTrees(Random par1Random)
{
return par1Random.nextInt(3) == 0 ? new WorldGenDeadTree(false) : this.worldGeneratorTrees;
return par1Random.nextInt(9) == 0 ? new WorldGenDeadTree(false) : (par1Random.nextInt(6) == 0 ? new WorldGenTaiga4(false) : this.worldGeneratorTrees);
}
/**

View file

@ -69,6 +69,7 @@ public class BOPBiomes {
Biomes.alpsForest = Optional.of((new BiomeGenAlpsForest(BOPConfiguration.IDs.alpsForestID)).setColor(353825).setBiomeName("Alps Mountainside").func_76733_a(5159473).setTemperatureRainfall(0.0F, 0.5F).setMinMaxHeight(1.0F, 2.0F));
Biomes.alpsBase = Optional.of((new BiomeGenAlpsBase(BOPConfiguration.IDs.alpsBaseID)).setColor(353825).setBiomeName("Alps Forest").func_76733_a(5159473).setTemperatureRainfall(0.5F, 0.4F).setMinMaxHeight(0.2F, 0.5F));
Biomes.arctic = Optional.of((new BiomeGenArctic(BOPConfiguration.IDs.arcticID)).setColor(14090235).setBiomeName("Arctic").setEnableSnow().setTemperatureRainfall(0.05F, 0.5F).setMinMaxHeight(0.2F, 0.2F));
Biomes.autumnHills = Optional.of((new BiomeGenAutumnHills(BOPConfiguration.IDs.autumnHillsID)).setColor(522674).setBiomeName("Autumn Hills").func_76733_a(9154376).setMinMaxHeight(0.5F, 0.8F).setTemperatureRainfall(0.5F, 0.2F));
Biomes.badlands = Optional.of((new BiomeGenBadlands(BOPConfiguration.IDs.badlandsID)).setColor(16421912).setBiomeName("Badlands").setTemperatureRainfall(2.0F, 0.05F).setMinMaxHeight(0.3F, 0.9F));
Biomes.bambooForest = Optional.of((new BiomeGenBambooForest(BOPConfiguration.IDs.bambooForestID)).setColor(112).setBiomeName("Bamboo Forest").setMinMaxHeight(0.2F, 0.4F).setTemperatureRainfall(1.2F, 0.9F));
Biomes.bayou = Optional.of((new BiomeGenBayou(BOPConfiguration.IDs.bayouID)).setColor(522674).setBiomeName("Bayou").func_76733_a(9154376).setMinMaxHeight(0.1F, 0.3F).setTemperatureRainfall(0.5F, 0.9F));
@ -130,7 +131,6 @@ public class BOPBiomes {
Biomes.oceanCoral = Optional.of((new BiomeGenOceanCoral(BOPConfiguration.IDs.oceanCoralID)).setColor(10486015).setBiomeName("Coral Reef").setMinMaxHeight(-0.4F, -0.1F).setTemperatureRainfall(0.5F, 0.9F));
Biomes.oceanKelp = Optional.of((new BiomeGenOceanKelp(BOPConfiguration.IDs.oceanKelpID)).setColor(10486015).setBiomeName("Kelp Forest").setMinMaxHeight(-0.4F, -0.1F).setTemperatureRainfall(0.5F, 0.9F));
Biomes.ochreAcres = Optional.of((new BiomeGenOchreAcres(BOPConfiguration.IDs.ochreAcresID)).setColor(522674).setBiomeName("Ochre Acres").func_76733_a(9154376).setMinMaxHeight(0.5F, 0.8F).setTemperatureRainfall(0.5F, 0.2F));
Biomes.ominousWoods = Optional.of((new BiomeGenOminousWoods(BOPConfiguration.IDs.ominousWoodsID)).setColor(353825).setBiomeName("Ominous Woods").setDisableRain().func_76733_a(5159473).setTemperatureRainfall(0.8F, 0.9F));
Biomes.ominousWoodsThick = Optional.of((new BiomeGenOminousWoodsThick(BOPConfiguration.IDs.ominousWoodsThickID)).setColor(353825).setBiomeName("Thick Ominous Woods").setDisableRain().func_76733_a(5159473).setTemperatureRainfall(0.8F, 0.9F));
Biomes.orchard = Optional.of((new BiomeGenOrchard(BOPConfiguration.IDs.orchardID)).setColor(9286496).setBiomeName("Orchard").setTemperatureRainfall(0.8F, 0.4F));
@ -201,6 +201,7 @@ public class BOPBiomes {
BiomeDictionary.registerBiomeType(Biomes.alpsForest.get(), Type.FROZEN, Type.MOUNTAIN);
BiomeDictionary.registerBiomeType(Biomes.arctic.get(), Type.FROZEN, Type.WASTELAND);
BiomeDictionary.registerBiomeType(Biomes.autumnHills.get(), Type.FOREST, Type.HILLS);
BiomeDictionary.registerBiomeType(Biomes.badlands.get(), Type.DESERT, Type.WASTELAND);
BiomeDictionary.registerBiomeType(Biomes.bambooForest.get(), Type.JUNGLE, Type.FOREST);
BiomeDictionary.registerBiomeType(Biomes.bayou.get(), Type.SWAMP, Type.WATER);
@ -266,7 +267,6 @@ public class BOPBiomes {
BiomeDictionary.registerBiomeType(Biomes.oceanCoral.get(), Type.WATER);
BiomeDictionary.registerBiomeType(Biomes.oceanKelp.get(), Type.WATER, Type.FOREST);
BiomeDictionary.registerBiomeType(Biomes.ochreAcres.get(), Type.FOREST, Type.HILLS);
BiomeDictionary.registerBiomeType(Biomes.ominousWoods.get(), Type.MAGICAL);
BiomeDictionary.registerBiomeType(Biomes.ominousWoodsThick.get(), Type.MAGICAL);
@ -335,6 +335,7 @@ public class BOPBiomes {
{
addSpawnBiome(Biomes.alps);
addSpawnBiome(Biomes.arctic);
addSpawnBiome(Biomes.autumnHills);
addSpawnBiome(Biomes.badlands);
addSpawnBiome(Biomes.bambooForest);
addSpawnBiome(Biomes.bayou);
@ -371,7 +372,6 @@ public class BOPBiomes {
addSpawnBiome(Biomes.moor);
addSpawnBiome(Biomes.mountain);
addSpawnBiome(Biomes.oasis);
addSpawnBiome(Biomes.ochreAcres);
addSpawnBiome(Biomes.outback);
addSpawnBiome(Biomes.pasture);
addSpawnBiome(Biomes.polar);
@ -409,6 +409,7 @@ public class BOPBiomes {
{
addVillageBiome(Biomes.alps, BOPConfiguration.TerrainGen.alpsVillage);
addVillageBiome(Biomes.arctic, BOPConfiguration.TerrainGen.arcticVillage);
addVillageBiome(Biomes.autumnHills, BOPConfiguration.TerrainGen.autumnHillsVillage);
addVillageBiome(Biomes.badlands, BOPConfiguration.TerrainGen.badlandsVillage);
addVillageBiome(Biomes.bambooForest, BOPConfiguration.TerrainGen.bambooForestVillage);
addVillageBiome(Biomes.bayou, BOPConfiguration.TerrainGen.bayouVillage);
@ -446,7 +447,6 @@ public class BOPBiomes {
addVillageBiome(Biomes.moor, BOPConfiguration.TerrainGen.moorVillage);
addVillageBiome(Biomes.mountain, BOPConfiguration.TerrainGen.mountainVillage);
addVillageBiome(Biomes.oasis, BOPConfiguration.TerrainGen.oasisVillage);
addVillageBiome(Biomes.ochreAcres, BOPConfiguration.TerrainGen.ochreAcresVillage);
addVillageBiome(Biomes.orchard, BOPConfiguration.TerrainGen.orchardVillage);
addVillageBiome(Biomes.outback, BOPConfiguration.TerrainGen.outbackVillage);
addVillageBiome(Biomes.overgrownGreens, BOPConfiguration.TerrainGen.overgrownGreensVillage);
@ -486,6 +486,7 @@ public class BOPBiomes {
{
addStrongholdBiome(Biomes.alps);
addStrongholdBiome(Biomes.arctic);
addStrongholdBiome(Biomes.autumnHills);
addStrongholdBiome(Biomes.badlands);
addStrongholdBiome(Biomes.bambooForest);
addStrongholdBiome(Biomes.bayou);
@ -529,7 +530,6 @@ public class BOPBiomes {
addStrongholdBiome(Biomes.mountain);
addStrongholdBiome(Biomes.mysticGrove);
addStrongholdBiome(Biomes.oasis);
addStrongholdBiome(Biomes.ochreAcres);
addStrongholdBiome(Biomes.ominousWoods);
addStrongholdBiome(Biomes.orchard);
addStrongholdBiome(Biomes.outback);
@ -581,6 +581,10 @@ public class BOPBiomes {
if (BOPConfiguration.BiomeGen.arcticGen) {
registerBiome(Biomes.arctic);
}
if (BOPConfiguration.BiomeGen.autumnHillsGen) {
registerBiome(Biomes.autumnHills);
}
if (BOPConfiguration.BiomeGen.badlandsGen) {
registerBiome(Biomes.badlands);
@ -756,10 +760,6 @@ public class BOPBiomes {
if (BOPConfiguration.BiomeGen.oasisGen) {
registerBiome(Biomes.oasis);
}
if (BOPConfiguration.BiomeGen.ochreAcresGen) {
registerBiome(Biomes.ochreAcres);
}
if (BOPConfiguration.BiomeGen.ominousWoodsGen) {
registerBiome(Biomes.ominousWoods);
@ -974,6 +974,10 @@ public class BOPBiomes {
if (BOPConfiguration.BiomeGen.arcticGen) {
addBiomeToWorldTypes(getWorldTypes(), Biomes.arctic);
}
if (BOPConfiguration.BiomeGen.autumnHillsGen) {
addBiomeToWorldTypes(getWorldTypes(), Biomes.autumnHills);
}
if (BOPConfiguration.BiomeGen.badlandsGen) {
addBiomeToWorldTypes(getWorldTypes(), Biomes.badlands);
@ -1146,10 +1150,6 @@ public class BOPBiomes {
if (BOPConfiguration.BiomeGen.oasisGen) {
addBiomeToWorldTypes(getWorldTypes(), Biomes.oasis);
}
if (BOPConfiguration.BiomeGen.ochreAcresGen) {
addBiomeToWorldTypes(getWorldTypes(), Biomes.ochreAcres);
}
if (BOPConfiguration.BiomeGen.ominousWoodsGen) {
addBiomeToWorldTypes(getWorldTypes(), Biomes.ominousWoods);

View file

@ -76,6 +76,7 @@ public class BOPConfiguration
public static boolean alpsGen;
public static boolean arcticGen;
public static boolean autumnHillsGen;
public static boolean badlandsGen;
public static boolean bambooForestGen;
public static boolean bayouGen;
@ -121,7 +122,6 @@ public class BOPConfiguration
public static boolean mysticGroveGen;
public static boolean oasisGen;
public static boolean oceanGen;
public static boolean ochreAcresGen;
public static boolean ominousWoodsGen;
public static boolean orchardGen;
public static boolean originValleyGen;
@ -186,6 +186,7 @@ public class BOPConfiguration
//Biome generation
alpsGen = config.get("Biomes To Generate", "Alps", true).getBoolean(false);
arcticGen = config.get("Biomes To Generate", "Arctic", true).getBoolean(false);
autumnHillsGen = config.get("Biomes To Generate", "AutumnHills", false).getBoolean(false);
badlandsGen = config.get("Biomes To Generate", "Badlands", true).getBoolean(false);
bambooForestGen = config.get("Biomes To Generate", "BambooForest", true).getBoolean(false);
bayouGen = config.get("Biomes To Generate", "Bayou", true).getBoolean(false);
@ -230,7 +231,6 @@ public class BOPConfiguration
// mushroomIslandGen = config.get("Biomes To Generate", "MushroomIsland", true).getBoolean(false);
mysticGroveGen = config.get("Biomes To Generate", "MysticGrove", true).getBoolean(false);
oasisGen = config.get("Biomes To Generate", "Oasis", true).getBoolean(false);
ochreAcresGen = config.get("Biomes To Generate", "OchreAcres", false).getBoolean(false);
ominousWoodsGen = config.get("Biomes To Generate", "OminousWoods", true).getBoolean(false);
orchardGen = config.get("Biomes To Generate", "Orchard", true).getBoolean(false);
originValleyGen = config.get("Biomes To Generate", "OriginValley", true).getBoolean(false);
@ -321,6 +321,7 @@ public class BOPConfiguration
// Village biomes
public static boolean alpsVillage;
public static boolean arcticVillage;
public static boolean autumnHillsVillage;
public static boolean badlandsVillage;
public static boolean bambooForestVillage;
public static boolean bayouVillage;
@ -365,7 +366,6 @@ public class BOPConfiguration
// public static boolean mushroomIslandVillage;
public static boolean mysticGroveVillage;
public static boolean oasisVillage;
public static boolean ochreAcresVillage;
public static boolean ominousWoodsVillage;
public static boolean orchardVillage;
public static boolean originValleyVillage;
@ -434,6 +434,7 @@ public class BOPConfiguration
// Biomes with villages
alpsVillage = config.get("Allow Villages", "Alps", false).getBoolean(false);
arcticVillage = config.get("Allow Villages", "Arctic", true).getBoolean(false);
autumnHillsVillage = config.get("Allow Villages", "AutumnHills", false).getBoolean(false);
badlandsVillage = config.get("Allow Villages", "Badlands", false).getBoolean(false);
bambooForestVillage = config.get("Allow Villages", "BambooForest", false).getBoolean(false);
bayouVillage = config.get("Allow Villages", "Bayou", false).getBoolean(false);
@ -478,7 +479,6 @@ public class BOPConfiguration
// mushroomIslandVillage = config.get("Allow Villages", "MushroomIsland", false).getBoolean(false);
mysticGroveVillage = config.get("Allow Villages", "MysticGrove", false).getBoolean(false);
oasisVillage = config.get("Allow Villages", "Oasis", false).getBoolean(false);
ochreAcresVillage = config.get("Allow Villages", "OchreAcres", false).getBoolean(false);
ominousWoodsVillage = config.get("Allow Villages", "OminousWoods", false).getBoolean(false);
orchardVillage = config.get("Allow Villages", "Orchard", false).getBoolean(false);
originValleyVillage = config.get("Allow Villages", "OriginValley", false).getBoolean(false);
@ -683,6 +683,7 @@ public class BOPConfiguration
public static int alpsForestID;
public static int alpsBaseID;
public static int arcticID;
public static int autumnHillsID;
public static int badlandsID;
public static int bambooForestID;
public static int bayouID;
@ -744,7 +745,6 @@ public class BOPConfiguration
public static int oceanCoralID;
public static int oceanKelpID;
public static int ochreAcresID;
public static int ominousWoodsID;
public static int ominousWoodsThickID;
public static int orchardID;
@ -986,7 +986,7 @@ public class BOPConfiguration
//23-79 ExtraBiomesXL
ochreAcresID = config.get("Biome IDs", "Ochre Acres ID", 33).getInt();
autumnHillsID = config.get("Biome IDs", "Autumn Hills ID", 33).getInt();
overgrownGreensID = config.get("Biome IDs", "Overgrown Greens ID", 34).getInt();
forestHillsNewID = config.get("Biome IDs", "Forest Hills (Sub-Biome) ID", 35).getInt();
taigaHillsNewID = config.get("Biome IDs", "Taiga Hills (Sub-Biome) ID", 36).getInt();

View file

@ -25,6 +25,10 @@ public class WorldTypeBOP extends WorldType
{
addNewBiome(Biomes.arctic);
}
if (BOPConfiguration.BiomeGen.autumnHillsGen == true)
{
addNewBiome(Biomes.autumnHills);
}
if (BOPConfiguration.BiomeGen.badlandsGen == true)
{
addNewBiome(Biomes.badlands);
@ -197,10 +201,6 @@ public class WorldTypeBOP extends WorldType
{
addNewBiome(Biomes.oasis);
}
if (BOPConfiguration.BiomeGen.ochreAcresGen == true)
{
addNewBiome(Biomes.ochreAcres);
}
if (BOPConfiguration.BiomeGen.ominousWoodsGen == true)
{
addNewBiome(Biomes.ominousWoods);

View file

@ -0,0 +1,40 @@
package biomesoplenty.worldgen;
import java.util.Random;
import net.minecraft.block.Block;
import net.minecraft.item.ItemStack;
import net.minecraft.world.World;
import net.minecraft.world.gen.feature.WorldGenerator;
public class WorldGenPumpkinAlt extends WorldGenerator
{
/** The ID of the plant block used in this plant generator. */
private int plantBlockId;
private int plantBlockMeta;
public WorldGenPumpkinAlt(int par1, int meta)
{
plantBlockId = par1;
plantBlockMeta = meta;
}
@Override
public boolean generate(World par1World, Random par2Random, int par3, int par4, int par5)
{
for (int l = 0; l < 64; ++l)
{
int i1 = par3 + par2Random.nextInt(8) - par2Random.nextInt(8);
int j1 = par4 + par2Random.nextInt(4) - par2Random.nextInt(4);
int k1 = par5 + par2Random.nextInt(8) - par2Random.nextInt(8);
if (par1World.isAirBlock(i1, j1, k1) && (!par1World.provider.hasNoSky || j1 < 127) && (par1World.getFullBlockLightValue(i1, j1, k1) >= 8 || par1World.canBlockSeeTheSky(i1, j1, k1))
&& Block.blocksList[plantBlockId].canPlaceBlockOnSide(par1World, i1, j1, k1, 1, new ItemStack(Block.plantRed.blockID, 1, plantBlockMeta)))
{
par1World.setBlock(i1, j1, k1, Block.pumpkin.blockID, par2Random.nextInt(4), 2);
}
}
return true;
}
}