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

Merge branch 'master' of https://github.com/ted80/BiomesOPlenty into liquidsapi

Browse source
This commit is contained in:
Adubbz 2013-05-29 07:10:07 +10:00
commit cf47ff9e3b
17 changed files with 31 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/minecraft/biomesoplenty/biomes/BiomeDecoratorBOP.java
View file

@ -340,6 +340,7 @@ public class BiomeDecoratorBOP extends BiomeDecorator
protected int lavaLakesPerChunk;
protected int netherLavaPerChunk;
protected int hotSpringsPerChunk;
protected int poisonWaterPerChunk;
/** True if decorator should generate surface lava & water */
public boolean generateLakes;
@ -516,6 +517,7 @@ public class BiomeDecoratorBOP extends BiomeDecorator
this.lavaLakesPerChunk = 0;
this.netherLavaPerChunk = 0;
this.hotSpringsPerChunk = 0;
this.poisonWaterPerChunk = 0;
this.quicksandPerChunk = 0;
this.quicksand2PerChunk = 0;
this.crystalsPerChunk = 0;
@ -612,6 +614,14 @@ public class BiomeDecoratorBOP extends BiomeDecorator
var5 = this.chunk_Z + this.randomGenerator.nextInt(16) + 8;
(new WorldGenLakes(Liquids.springWater.get().blockID)).generate(this.currentWorld, this.randomGenerator, var3, var4, var5);
}
for (var2 = 0; var2 < poisonWaterPerChunk; ++var2)
{
var3 = this.chunk_X + this.randomGenerator.nextInt(16) + 8;
var4 = this.randomGenerator.nextInt(this.randomGenerator.nextInt(this.randomGenerator.nextInt(112) + 8) + 8);
var5 = this.chunk_Z + this.randomGenerator.nextInt(16) + 8;
(new WorldGenLakes(Liquids.liquidPoisonFlowing.get().blockID)).generate(this.currentWorld, this.randomGenerator, var3, var4, var5);
}
if (this.generateAsh)
{

1
src/minecraft/biomesoplenty/biomes/BiomeGenAlps.java
View file

@ -24,6 +24,7 @@ public class BiomeGenAlps extends BiomeGenBase
this.customBiomeDecorator.grassPerChunk = -999;
this.customBiomeDecorator.sandPerChunk = -999;
this.customBiomeDecorator.sandPerChunk2 = -999;
this.customBiomeDecorator.hotSpringsPerChunk = 2;
}
/**

1
src/minecraft/biomesoplenty/biomes/BiomeGenBog.java
View file

@ -41,6 +41,7 @@ public class BiomeGenBog extends BiomeGenBase
this.customBiomeDecorator.reedsBOPPerChunk = 8;
this.customBiomeDecorator.blueMilksPerChunk = 1;
this.customBiomeDecorator.waterLakesPerChunk = 6;
this.customBiomeDecorator.poisonWaterPerChunk = 2;
this.customBiomeDecorator.generatePumpkins = false;
}

1
src/minecraft/biomesoplenty/biomes/BiomeGenLushSwamp.java
View file

@ -30,6 +30,7 @@ public class BiomeGenLushSwamp extends BiomeGenBase
this.customBiomeDecorator.waterlilyPerChunk = 3;
this.customBiomeDecorator.hydrangeasPerChunk = 1;
this.customBiomeDecorator.reedsBOPPerChunk = 5;
this.customBiomeDecorator.poisonWaterPerChunk = 2;
this.spawnableMonsterList.add(new SpawnListEntry(EntitySlime.class, 1, 1, 1));
}

1
src/minecraft/biomesoplenty/biomes/BiomeGenMysticGrove.java
View file

@ -37,6 +37,7 @@ public class BiomeGenMysticGrove extends BiomeGenBase
this.customBiomeDecorator.blueMilksPerChunk = 4;
this.customBiomeDecorator.glowshroomsPerChunk = 2;
this.customBiomeDecorator.lilyflowersPerChunk = 3;
this.customBiomeDecorator.hotSpringsPerChunk = 5;
this.waterColorMultiplier = 15349914;
this.spawnableMonsterList.clear();
this.spawnableCreatureList.clear();

1
src/minecraft/biomesoplenty/biomes/BiomeGenOasis.java
View file

@ -33,6 +33,7 @@ public class BiomeGenOasis extends BiomeGenBase
this.customBiomeDecorator.waterLakesPerChunk = 10;
this.customBiomeDecorator.quicksand2PerChunk = 2;
this.customBiomeDecorator.aloePerChunk = 4;
this.customBiomeDecorator.hotSpringsPerChunk = 2;
}
/**

1
src/minecraft/biomesoplenty/biomes/BiomeGenOminousWoods.java
View file

@ -37,6 +37,7 @@ public class BiomeGenOminousWoods extends BiomeGenBase
this.customBiomeDecorator.sandPerChunk2 = -999;
this.customBiomeDecorator.thornsPerChunk = 9;
this.customBiomeDecorator.poisonIvyPerChunk = 3;
this.customBiomeDecorator.poisonWaterPerChunk = 15;
this.waterColorMultiplier = 1973030;
this.spawnableMonsterList.clear();
this.spawnableCreatureList.clear();

16
src/minecraft/biomesoplenty/biomes/BiomeGenPolar.java
View file

@ -2,8 +2,6 @@ package biomesoplenty.biomes;
import java.util.Random;
import biomesoplenty.worldgen.WorldGenIceSheet;
import net.minecraft.block.Block;
import net.minecraft.world.World;
import net.minecraft.world.biome.BiomeGenBase;
@ -25,18 +23,4 @@ public class BiomeGenPolar extends BiomeGenBase
this.customBiomeDecorator.sandPerChunk2 = -999;
this.waterColorMultiplier = 3685739;
}
public void decorate(World par1World, Random par2Random, int par3, int par4)
{
super.decorate(par1World, par2Random, par3, par4);
WorldGenIceSheet var5 = new WorldGenIceSheet();
for (int var6 = 0; var6 < 75; ++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);
}
}
}

5
src/minecraft/biomesoplenty/biomes/BiomeGenPromisedLandForest.java
View file

@ -6,6 +6,7 @@ import java.util.Random;
import cpw.mods.fml.common.Loader;
import biomesoplenty.api.Blocks;
import biomesoplenty.api.Liquids;
import biomesoplenty.configuration.BOPBlocks;
import biomesoplenty.configuration.BOPConfiguration;
import biomesoplenty.worldgen.WorldGenPromisedShrub;
@ -43,7 +44,7 @@ public class BiomeGenPromisedLandForest extends BiomeGenBase
this.customBiomeDecorator.blueMilksPerChunk = 5;
this.customBiomeDecorator.generateLakes = false;
this.customBiomeDecorator.pondsPerChunk = -100;
this.customBiomeDecorator.waterLakesPerChunk = 10;
this.customBiomeDecorator.hotSpringsPerChunk = 10;
this.customBiomeDecorator.crystalsPerChunk = 25;
this.customBiomeDecorator.crystals2PerChunk = 50;
this.spawnableCreatureList.clear();
@ -53,7 +54,7 @@ public class BiomeGenPromisedLandForest extends BiomeGenBase
this.customBiomeDecorator.generatePumpkins = false;
//this.customBiomeDecorator.generateClouds = true;
//this.customBiomeDecorator.generateLakes = false;
this.theWorldGenerator = new WorldGenWaterSpring(Block.waterMoving.blockID, 8);
this.theWorldGenerator = new WorldGenWaterSpring(Liquids.springWaterFlowing.get().blockID, 8);
/*this.spawnableMonsterList.add(new SpawnListEntry(EntityCow.class, 6, 1, 4));
if (Loader.isModLoaded("TwilightForest"))

5
src/minecraft/biomesoplenty/biomes/BiomeGenPromisedLandPlains.java
View file

@ -6,6 +6,7 @@ import java.util.Random;
import cpw.mods.fml.common.Loader;
import biomesoplenty.api.Blocks;
import biomesoplenty.api.Liquids;
import biomesoplenty.configuration.BOPBlocks;
import biomesoplenty.configuration.BOPConfiguration;
import biomesoplenty.worldgen.WorldGenPromisedBush;
@ -41,7 +42,7 @@ public class BiomeGenPromisedLandPlains extends BiomeGenBase
this.customBiomeDecorator.promisedWillowPerChunk = 80;
this.customBiomeDecorator.generateLakes = false;
this.customBiomeDecorator.pondsPerChunk = -100;
this.customBiomeDecorator.waterLakesPerChunk = 6;
this.customBiomeDecorator.hotSpringsPerChunk = 6;
this.customBiomeDecorator.crystalsPerChunk = 25;
this.customBiomeDecorator.crystals2PerChunk = 50;
this.spawnableCreatureList.clear();
@ -51,7 +52,7 @@ public class BiomeGenPromisedLandPlains extends BiomeGenBase
this.customBiomeDecorator.generatePumpkins = false;
//this.customBiomeDecorator.generateClouds = true;
//this.customBiomeDecorator.generateLakes = false;
this.theWorldGenerator = new WorldGenWaterSpring(Block.waterMoving.blockID, 8);
this.theWorldGenerator = new WorldGenWaterSpring(Liquids.springWaterFlowing.get().blockID, 8);
/*if (Loader.isModLoaded("TwilightForest"))
{

5
src/minecraft/biomesoplenty/biomes/BiomeGenPromisedLandSwamp.java
View file

@ -6,6 +6,7 @@ import java.util.Random;
import cpw.mods.fml.common.Loader;
import biomesoplenty.api.Blocks;
import biomesoplenty.api.Liquids;
import biomesoplenty.configuration.BOPBlocks;
import biomesoplenty.configuration.BOPConfiguration;
import biomesoplenty.integration.ThaumcraftIntegration;
@ -44,7 +45,7 @@ public class BiomeGenPromisedLandSwamp extends BiomeGenBase
this.customBiomeDecorator.portobellosPerChunk = 5;
this.customBiomeDecorator.generateLakes = false;
this.customBiomeDecorator.pondsPerChunk = -100;
this.customBiomeDecorator.waterLakesPerChunk = 20;
this.customBiomeDecorator.hotSpringsPerChunk = 20;
this.customBiomeDecorator.crystalsPerChunk = 25;
this.customBiomeDecorator.crystals2PerChunk = 50;
this.spawnableCreatureList.clear();
@ -54,7 +55,7 @@ public class BiomeGenPromisedLandSwamp extends BiomeGenBase
this.customBiomeDecorator.generatePumpkins = false;
//this.customBiomeDecorator.generateClouds = true;
//this.customBiomeDecorator.generateLakes = false;
this.theWorldGenerator = new WorldGenWaterSpring(Block.waterMoving.blockID, 8);
this.theWorldGenerator = new WorldGenWaterSpring(Liquids.springWaterFlowing.get().blockID, 8);
/*this.spawnableMonsterList.add(new SpawnListEntry(EntityPig.class, 4, 1, 4));
if (Loader.isModLoaded("TwilightForest"))

1
src/minecraft/biomesoplenty/biomes/BiomeGenSacredSprings.java
View file

@ -27,6 +27,7 @@ public class BiomeGenSacredSprings extends BiomeGenBase
this.customBiomeDecorator.grassPerChunk = 4;
this.customBiomeDecorator.waterlilyPerChunk = 5;
this.customBiomeDecorator.violetsPerChunk = 1;
this.customBiomeDecorator.hotSpringsPerChunk = 1;
this.customBiomeDecorator.generatePumpkins = false;
this.spawnableMonsterList.add(new SpawnListEntry(EntityJungleSpider.class, 12, 6, 6));
}

1
src/minecraft/biomesoplenty/biomes/BiomeGenSludgepit.java
View file

@ -38,6 +38,7 @@ public class BiomeGenSludgepit extends BiomeGenBase
this.customBiomeDecorator.mudPerChunk2 = 5;
this.customBiomeDecorator.deadBushPerChunk = 5;
this.customBiomeDecorator.algaePerChunk = 2;
this.customBiomeDecorator.poisonWaterPerChunk = 5;
this.spawnableCreatureList.add(new SpawnListEntry(EntitySlime.class, 1, 1, 1));
this.waterColorMultiplier = 11506176;
}

1
src/minecraft/biomesoplenty/biomes/BiomeGenSwampNew.java
View file

@ -33,7 +33,6 @@ public class BiomeGenSwampNew extends BiomeGenBase
this.customBiomeDecorator.waterlilyPerChunk = 4;
this.customBiomeDecorator.mudPerChunk = 9;
this.customBiomeDecorator.mudPerChunk2 = 9;
this.customBiomeDecorator.reedsBOPPerChunk = 10;
this.customBiomeDecorator.portobellosPerChunk = 1;
this.waterColorMultiplier = 14745456;
this.spawnableMonsterList.add(new SpawnListEntry(EntitySlime.class, 1, 1, 1));

1
src/minecraft/biomesoplenty/biomes/BiomeGenWasteland.java
View file

@ -25,6 +25,7 @@ public class BiomeGenWasteland extends BiomeGenBase
this.customBiomeDecorator = (BiomeDecoratorBOP)theBiomeDecorator;
this.customBiomeDecorator.treesPerChunk = 0;
this.customBiomeDecorator.deadGrassPerChunk = 14;
this.customBiomeDecorator.poisonWaterPerChunk = 10;
this.waterColorMultiplier = 15073024;
this.spawnableCreatureList.clear();
this.spawnableWaterCreatureList.clear();

4
src/minecraft/biomesoplenty/configuration/BOPBiomes.java
View file

@ -64,7 +64,7 @@ public class BOPBiomes {
private static void initializeBiomes()
{
Biomes.alps = Optional.of((new BiomeGenAlps(BOPConfiguration.alpsID)).setColor(353825).setBiomeName("Alps").func_76733_a(5159473).setTemperatureRainfall(0.0F, 0.0F).setMinMaxHeight(5.0F, 5.0F));
Biomes.arctic = Optional.of((new BiomeGenArctic(BOPConfiguration.arcticID)).setColor(14090235).setBiomeName("Arctic").setEnableSnow().setTemperatureRainfall(0.05F, 0.0F).setMinMaxHeight(-0.2F, 0.0F));
Biomes.arctic = Optional.of((new BiomeGenArctic(BOPConfiguration.arcticID)).setColor(14090235).setBiomeName("Arctic").setEnableSnow().setTemperatureRainfall(0.05F, 0.0F).setMinMaxHeight(-0.1F, 0.1F));
Biomes.badlands = Optional.of((new BiomeGenBadlands(BOPConfiguration.badlandsID)).setColor(16421912).setBiomeName("Badlands").setTemperatureRainfall(2.0F, 0.0F).setMinMaxHeight(0.3F, 0.9F));
Biomes.bambooForest = Optional.of((new BiomeGenBambooForest(BOPConfiguration.bambooForestID)).setColor(112).setBiomeName("Bamboo Forest").setMinMaxHeight(0.0F, 0.3F).setTemperatureRainfall(1.2F, 0.9F));
Biomes.bayou = Optional.of((new BiomeGenBayou(BOPConfiguration.bayouID)).setColor(522674).setBiomeName("Bayou").func_76733_a(9154376).setMinMaxHeight(-0.3F, 0.2F).setTemperatureRainfall(0.5F, 0.9F));
@ -128,7 +128,7 @@ public class BOPBiomes {
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));
Biomes.pasture = Optional.of((new BiomeGenPasture(BOPConfiguration.pastureID)).setColor(9286496).setBiomeName("Pasture").setTemperatureRainfall(0.8F, 0.4F).setMinMaxHeight(0.1F, 0.1F));
Biomes.polar = Optional.of((new BiomeGenPolar(BOPConfiguration.polarID)).setColor(6316128).setBiomeName("Polar").setMinMaxHeight(-0.5F, 0.0F).setTemperatureRainfall(0.2F, 0.8F));
Biomes.polar = Optional.of((new BiomeGenPolar(BOPConfiguration.polarID)).setColor(6316128).setBiomeName("Polar").setMinMaxHeight(-0.5F, 0.0F).setTemperatureRainfall(0.05F, 0.0F));
Biomes.prairie = Optional.of((new BiomeGenPrairie(BOPConfiguration.prairieID)).setColor(353825).setBiomeName("Prairie").func_76733_a(5159473).setTemperatureRainfall(0.9F, 0.6F).setMinMaxHeight(0.1F, 0.1F));
Biomes.promisedLandForest = Optional.of((new BiomeGenPromisedLandForest(BOPConfiguration.promisedLandForestID)).setColor(112).setBiomeName("Wonderous Woods").setTemperatureRainfall(2.0F, 2.0F).setMinMaxHeight(0.1F, 2.0F));

2
src/minecraft/biomesoplenty/configuration/BOPConfiguration.java
View file

@ -454,7 +454,7 @@ public class BOPConfiguration {
vanillaEnhanced = config.get("Biome Settings", "Enhanced Vanilla Biomes", true).getBoolean(false);
promisedLandDimID = config.get("Dimension Settings", "Promised Land Dimension ID", 20, null).getInt();
addToDefault = config.get("Biome Settings", "Add Biomes To Default World", true).getBoolean(true);
addToDefault = config.get("Biome Settings", "Add Biomes To Default World", false).getBoolean(true);
villageDistance = config.get("Biomes O\' Plenty World Type Settings", "Distance between villages", 32, "In Vanilla it is set to 32").getInt();
if (villageDistance < 8)