From 80a491cb7d189f5d54e4a0a4490099de61d5540d Mon Sep 17 00:00:00 2001 From: Matt Caughey Date: Mon, 4 Nov 2013 00:24:43 -0500 Subject: [PATCH] Tweaked more biome fog color/thickness stuff --- .../biomesoplenty/biomes/BiomeGenArctic.java | 16 ++++++- .../biomes/BiomeGenBambooForest.java | 16 ++++++- .../biomesoplenty/biomes/BiomeGenBayou.java | 16 ++++++- .../biomes/BiomeGenDeadSwamp.java | 16 ++++++- common/biomesoplenty/biomes/BiomeGenFen.java | 16 ++++++- .../biomes/BiomeGenFrostForest.java | 16 ++++++- .../biomesoplenty/biomes/BiomeGenMarsh.java | 16 ++++++- common/biomesoplenty/biomes/BiomeGenMesa.java | 16 ++++++- .../biomes/BiomeGenQuagmire.java | 16 ++++++- .../biomes/BiomeGenSludgepit.java | 16 ++++++- .../biomes/BiomeGenTemperateRainforest.java | 48 +++++++++++++++++-- .../biomesoplenty/biomes/BiomeGenWetland.java | 16 ++++++- .../biomes/vanilla/BiomeGenSwampNew.java | 16 ++++++- .../worldgen/tree/WorldGenSequoia.java | 2 +- 14 files changed, 226 insertions(+), 16 deletions(-) diff --git a/common/biomesoplenty/biomes/BiomeGenArctic.java b/common/biomesoplenty/biomes/BiomeGenArctic.java index 1291d80ae..61b017354 100644 --- a/common/biomesoplenty/biomes/BiomeGenArctic.java +++ b/common/biomesoplenty/biomes/BiomeGenArctic.java @@ -6,8 +6,9 @@ import net.minecraft.block.Block; import net.minecraft.world.World; import net.minecraft.world.biome.BiomeGenBase; import biomesoplenty.api.Blocks; +import biomesoplenty.interfaces.IBOPFog; -public class BiomeGenArctic extends BiomeGenBase +public class BiomeGenArctic extends BiomeGenBase implements IBOPFog { private BiomeDecoratorBOP customBiomeDecorator; @@ -62,4 +63,17 @@ public class BiomeGenArctic extends BiomeGenBase { return 11903827; } + + @Override + public int getFogColour() + { + return 12638463; + } + + @Override + public float getFogCloseness() + { + // TODO Auto-generated method stub + return 0.4F; + } } diff --git a/common/biomesoplenty/biomes/BiomeGenBambooForest.java b/common/biomesoplenty/biomes/BiomeGenBambooForest.java index 51baf80c9..4b4df0855 100644 --- a/common/biomesoplenty/biomes/BiomeGenBambooForest.java +++ b/common/biomesoplenty/biomes/BiomeGenBambooForest.java @@ -9,9 +9,10 @@ import net.minecraft.world.gen.feature.WorldGenShrub; import net.minecraft.world.gen.feature.WorldGenTallGrass; import net.minecraft.world.gen.feature.WorldGenerator; import biomesoplenty.api.Blocks; +import biomesoplenty.interfaces.IBOPFog; import biomesoplenty.worldgen.tree.WorldGenBambooTree; -public class BiomeGenBambooForest extends BiomeGenBase +public class BiomeGenBambooForest extends BiomeGenBase implements IBOPFog { private BiomeDecoratorBOP customBiomeDecorator; @@ -87,4 +88,17 @@ public class BiomeGenBambooForest extends BiomeGenBase { return 10739795; } + + @Override + public int getFogColour() + { + return 13428852; + } + + @Override + public float getFogCloseness() + { + // TODO Auto-generated method stub + return 0.8F; + } } diff --git a/common/biomesoplenty/biomes/BiomeGenBayou.java b/common/biomesoplenty/biomes/BiomeGenBayou.java index b2e3d3789..9b4d74a24 100644 --- a/common/biomesoplenty/biomes/BiomeGenBayou.java +++ b/common/biomesoplenty/biomes/BiomeGenBayou.java @@ -11,12 +11,13 @@ import net.minecraft.world.biome.SpawnListEntry; import net.minecraft.world.gen.feature.WorldGenerator; import biomesoplenty.api.Blocks; import biomesoplenty.configuration.configfile.BOPConfigurationMisc; +import biomesoplenty.interfaces.IBOPFog; import biomesoplenty.worldgen.WorldGenMoss; import biomesoplenty.worldgen.tree.WorldGenBayou1; import biomesoplenty.worldgen.tree.WorldGenBayou2; import biomesoplenty.worldgen.tree.WorldGenBayou3; -public class BiomeGenBayou extends BiomeGenBase +public class BiomeGenBayou extends BiomeGenBase implements IBOPFog { private BiomeDecoratorBOP customBiomeDecorator; @@ -106,6 +107,19 @@ public class BiomeGenBayou extends BiomeGenBase { return 11591816; } + + @Override + public int getFogColour() + { + return 9482133; + } + + @Override + public float getFogCloseness() + { + // TODO Auto-generated method stub + return 0.6F; + } /** * takes temperature, returns color diff --git a/common/biomesoplenty/biomes/BiomeGenDeadSwamp.java b/common/biomesoplenty/biomes/BiomeGenDeadSwamp.java index 9ded44907..6816fc682 100644 --- a/common/biomesoplenty/biomes/BiomeGenDeadSwamp.java +++ b/common/biomesoplenty/biomes/BiomeGenDeadSwamp.java @@ -10,9 +10,10 @@ import net.minecraft.world.gen.feature.WorldGenTallGrass; import net.minecraft.world.gen.feature.WorldGenerator; import biomesoplenty.api.Blocks; import biomesoplenty.configuration.configfile.BOPConfigurationMisc; +import biomesoplenty.interfaces.IBOPFog; import biomesoplenty.worldgen.tree.WorldGenDeadTree; -public class BiomeGenDeadSwamp extends BiomeGenBase +public class BiomeGenDeadSwamp extends BiomeGenBase implements IBOPFog { private BiomeDecoratorBOP customBiomeDecorator; @@ -92,6 +93,19 @@ public class BiomeGenDeadSwamp extends BiomeGenBase { return 6713420; } + + @Override + public int getFogColour() + { + return 9219993; + } + + @Override + public float getFogCloseness() + { + // TODO Auto-generated method stub + return 0.6F; + } /** * takes temperature, returns color diff --git a/common/biomesoplenty/biomes/BiomeGenFen.java b/common/biomesoplenty/biomes/BiomeGenFen.java index 3643562d3..676c1d607 100644 --- a/common/biomesoplenty/biomes/BiomeGenFen.java +++ b/common/biomesoplenty/biomes/BiomeGenFen.java @@ -10,12 +10,13 @@ import net.minecraft.world.biome.SpawnListEntry; import net.minecraft.world.gen.feature.WorldGenTallGrass; import net.minecraft.world.gen.feature.WorldGenerator; import biomesoplenty.api.Blocks; +import biomesoplenty.interfaces.IBOPFog; import biomesoplenty.worldgen.WorldGenMoss; import biomesoplenty.worldgen.tree.WorldGenDeadTree; import biomesoplenty.worldgen.tree.WorldGenFen1; import biomesoplenty.worldgen.tree.WorldGenFen2; -public class BiomeGenFen extends BiomeGenBase +public class BiomeGenFen extends BiomeGenBase implements IBOPFog { private BiomeDecoratorBOP customBiomeDecorator; @@ -112,4 +113,17 @@ public class BiomeGenFen extends BiomeGenBase { return 13547897; } + + @Override + public int getFogColour() + { + return 12638463; + } + + @Override + public float getFogCloseness() + { + // TODO Auto-generated method stub + return 0.8F; + } } diff --git a/common/biomesoplenty/biomes/BiomeGenFrostForest.java b/common/biomesoplenty/biomes/BiomeGenFrostForest.java index 6d2d42d38..ad388cc15 100644 --- a/common/biomesoplenty/biomes/BiomeGenFrostForest.java +++ b/common/biomesoplenty/biomes/BiomeGenFrostForest.java @@ -9,8 +9,9 @@ import net.minecraft.world.biome.BiomeGenBase; import net.minecraft.world.gen.feature.WorldGenerator; import biomesoplenty.api.Blocks; import biomesoplenty.configuration.configfile.BOPConfigurationMisc; +import biomesoplenty.interfaces.IBOPFog; -public class BiomeGenFrostForest extends BiomeGenBase +public class BiomeGenFrostForest extends BiomeGenBase implements IBOPFog { private BiomeDecoratorBOP customBiomeDecorator; @@ -76,6 +77,19 @@ public class BiomeGenFrostForest extends BiomeGenBase { return 11261628; } + + @Override + public int getFogColour() + { + return 12239814; + } + + @Override + public float getFogCloseness() + { + // TODO Auto-generated method stub + return 0.6F; + } /** * takes temperature, returns color diff --git a/common/biomesoplenty/biomes/BiomeGenMarsh.java b/common/biomesoplenty/biomes/BiomeGenMarsh.java index 6d25b2384..f2d27b45b 100644 --- a/common/biomesoplenty/biomes/BiomeGenMarsh.java +++ b/common/biomesoplenty/biomes/BiomeGenMarsh.java @@ -8,8 +8,9 @@ import net.minecraft.world.World; import net.minecraft.world.biome.BiomeGenBase; import net.minecraft.world.biome.SpawnListEntry; import biomesoplenty.api.Blocks; +import biomesoplenty.interfaces.IBOPFog; -public class BiomeGenMarsh extends BiomeGenBase +public class BiomeGenMarsh extends BiomeGenBase implements IBOPFog { private BiomeDecoratorBOP customBiomeDecorator; @@ -57,4 +58,17 @@ public class BiomeGenMarsh extends BiomeGenBase } } } + + @Override + public int getFogColour() + { + return 12638463; + } + + @Override + public float getFogCloseness() + { + // TODO Auto-generated method stub + return 0.6F; + } } diff --git a/common/biomesoplenty/biomes/BiomeGenMesa.java b/common/biomesoplenty/biomes/BiomeGenMesa.java index fcff96121..cf2d2f51f 100644 --- a/common/biomesoplenty/biomes/BiomeGenMesa.java +++ b/common/biomesoplenty/biomes/BiomeGenMesa.java @@ -10,8 +10,9 @@ import net.minecraft.world.biome.BiomeGenBase; import net.minecraft.world.biome.SpawnListEntry; import biomesoplenty.api.Blocks; import biomesoplenty.configuration.configfile.BOPConfigurationMisc; +import biomesoplenty.interfaces.IBOPFog; -public class BiomeGenMesa extends BiomeGenBase +public class BiomeGenMesa extends BiomeGenBase implements IBOPFog { private BiomeDecoratorBOP customBiomeDecorator; @@ -52,6 +53,19 @@ public class BiomeGenMesa extends BiomeGenBase } } } + + @Override + public int getFogColour() + { + return 14070383; + } + + @Override + public float getFogCloseness() + { + // TODO Auto-generated method stub + return 1.0F; + } /** * takes temperature, returns color diff --git a/common/biomesoplenty/biomes/BiomeGenQuagmire.java b/common/biomesoplenty/biomes/BiomeGenQuagmire.java index 29983d6e4..b34f3a980 100644 --- a/common/biomesoplenty/biomes/BiomeGenQuagmire.java +++ b/common/biomesoplenty/biomes/BiomeGenQuagmire.java @@ -9,9 +9,10 @@ import net.minecraft.world.biome.BiomeGenBase; import net.minecraft.world.gen.feature.WorldGenerator; import biomesoplenty.api.Blocks; import biomesoplenty.configuration.configfile.BOPConfigurationMisc; +import biomesoplenty.interfaces.IBOPFog; import biomesoplenty.worldgen.tree.WorldGenDeadTree; -public class BiomeGenQuagmire extends BiomeGenBase +public class BiomeGenQuagmire extends BiomeGenBase implements IBOPFog { private BiomeDecoratorBOP customBiomeDecorator; @@ -84,6 +85,19 @@ public class BiomeGenQuagmire extends BiomeGenBase { return 10390377; } + + @Override + public int getFogColour() + { + return 13291213; + } + + @Override + public float getFogCloseness() + { + // TODO Auto-generated method stub + return 0.6F; + } /** * takes temperature, returns color diff --git a/common/biomesoplenty/biomes/BiomeGenSludgepit.java b/common/biomesoplenty/biomes/BiomeGenSludgepit.java index c05eca45a..94a96850a 100644 --- a/common/biomesoplenty/biomes/BiomeGenSludgepit.java +++ b/common/biomesoplenty/biomes/BiomeGenSludgepit.java @@ -12,10 +12,11 @@ import net.minecraft.world.gen.feature.WorldGenTallGrass; import net.minecraft.world.gen.feature.WorldGenerator; import biomesoplenty.api.Blocks; import biomesoplenty.configuration.configfile.BOPConfigurationMisc; +import biomesoplenty.interfaces.IBOPFog; import biomesoplenty.worldgen.WorldGenBog1; import biomesoplenty.worldgen.WorldGenBog2; -public class BiomeGenSludgepit extends BiomeGenBase +public class BiomeGenSludgepit extends BiomeGenBase implements IBOPFog { private BiomeDecoratorBOP customBiomeDecorator; @@ -101,6 +102,19 @@ public class BiomeGenSludgepit extends BiomeGenBase { return 9539892; } + + @Override + public int getFogColour() + { + return 10463856; + } + + @Override + public float getFogCloseness() + { + // TODO Auto-generated method stub + return 0.6F; + } /** * takes temperature, returns color diff --git a/common/biomesoplenty/biomes/BiomeGenTemperateRainforest.java b/common/biomesoplenty/biomes/BiomeGenTemperateRainforest.java index 0991c4250..63f12cd4f 100644 --- a/common/biomesoplenty/biomes/BiomeGenTemperateRainforest.java +++ b/common/biomesoplenty/biomes/BiomeGenTemperateRainforest.java @@ -1,5 +1,6 @@ package biomesoplenty.biomes; +import java.awt.Color; import java.util.Random; import net.minecraft.block.Block; @@ -9,12 +10,14 @@ import net.minecraft.world.gen.feature.WorldGenShrub; import net.minecraft.world.gen.feature.WorldGenTallGrass; import net.minecraft.world.gen.feature.WorldGenerator; import biomesoplenty.api.Blocks; +import biomesoplenty.configuration.configfile.BOPConfigurationMisc; +import biomesoplenty.interfaces.IBOPFog; import biomesoplenty.worldgen.WorldGenMoss; +import biomesoplenty.worldgen.tree.WorldGenSequoia; import biomesoplenty.worldgen.tree.WorldGenTemperate; -import biomesoplenty.worldgen.tree.WorldGenThickTree; import biomesoplenty.worldgen.tree.WorldGenWillow; -public class BiomeGenTemperateRainforest extends BiomeGenBase +public class BiomeGenTemperateRainforest extends BiomeGenBase implements IBOPFog { private BiomeDecoratorBOP customBiomeDecorator; @@ -46,7 +49,7 @@ public class BiomeGenTemperateRainforest extends BiomeGenBase public WorldGenerator getRandomWorldGenForTrees(Random par1Random) { //return (WorldGenerator)(par1Random.nextInt(3) == 0 ? new WorldGenGrandFir1() : (par1Random.nextInt(4) == 0 ? new WorldGenAlaskanCedar2() : (par1Random.nextInt(8) == 0 ? new WorldGenAlaskanCedar1() : (par1Random.nextInt(2) == 0 ? new WorldGenShrub(0,0) : new WorldGenGrandFir2())))); - return par1Random.nextInt(10) == 0 ? new WorldGenWillow() : (par1Random.nextInt(6) == 0 ? new WorldGenThickTree(false) : (par1Random.nextInt(2) == 0 ? new WorldGenTemperate(false) : new WorldGenShrub(0, 0))); + return par1Random.nextInt(10) == 0 ? new WorldGenWillow() : (par1Random.nextInt(6) == 0 ? new WorldGenSequoia(false) : (par1Random.nextInt(2) == 0 ? new WorldGenTemperate(false) : new WorldGenShrub(0, 0))); } /** @@ -105,4 +108,43 @@ public class BiomeGenTemperateRainforest extends BiomeGenBase { return 12311907; } + + @Override + public int getFogColour() + { + return 13753294; + } + + @Override + public float getFogCloseness() + { + // TODO Auto-generated method stub + return 0.8F; + } + + /** + * takes temperature, returns color + */ + @Override + public int getSkyColorByTemp(float par1) + { + if (BOPConfigurationMisc.skyColors) + return 11061213; + 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(); + } + } } diff --git a/common/biomesoplenty/biomes/BiomeGenWetland.java b/common/biomesoplenty/biomes/BiomeGenWetland.java index af9729bc0..98f2ccdb4 100644 --- a/common/biomesoplenty/biomes/BiomeGenWetland.java +++ b/common/biomesoplenty/biomes/BiomeGenWetland.java @@ -10,11 +10,12 @@ import net.minecraft.world.biome.SpawnListEntry; import net.minecraft.world.gen.feature.WorldGenTallGrass; import net.minecraft.world.gen.feature.WorldGenerator; import biomesoplenty.api.Blocks; +import biomesoplenty.interfaces.IBOPFog; import biomesoplenty.worldgen.WorldGenMoss; import biomesoplenty.worldgen.tree.WorldGenTaiga5; import biomesoplenty.worldgen.tree.WorldGenWillow; -public class BiomeGenWetland extends BiomeGenBase +public class BiomeGenWetland extends BiomeGenBase implements IBOPFog { private BiomeDecoratorBOP customBiomeDecorator; @@ -119,4 +120,17 @@ public class BiomeGenWetland extends BiomeGenBase { return 5215831; } + + @Override + public int getFogColour() + { + return 6189472; + } + + @Override + public float getFogCloseness() + { + // TODO Auto-generated method stub + return 0.8F; + } } diff --git a/common/biomesoplenty/biomes/vanilla/BiomeGenSwampNew.java b/common/biomesoplenty/biomes/vanilla/BiomeGenSwampNew.java index 9e17627dc..565be7275 100644 --- a/common/biomesoplenty/biomes/vanilla/BiomeGenSwampNew.java +++ b/common/biomesoplenty/biomes/vanilla/BiomeGenSwampNew.java @@ -14,11 +14,12 @@ import net.minecraft.world.gen.feature.WorldGenerator; import biomesoplenty.api.Blocks; import biomesoplenty.biomes.BiomeDecoratorBOP; import biomesoplenty.configuration.configfile.BOPConfigurationMisc; +import biomesoplenty.interfaces.IBOPFog; import biomesoplenty.worldgen.WorldGenLog; import biomesoplenty.worldgen.WorldGenMoss; import biomesoplenty.worldgen.tree.WorldGenWillow; -public class BiomeGenSwampNew extends BiomeGenBase +public class BiomeGenSwampNew extends BiomeGenBase implements IBOPFog { private BiomeDecoratorBOP customBiomeDecorator; @@ -106,6 +107,19 @@ public class BiomeGenSwampNew extends BiomeGenBase return ((ColorizerFoliage.getFoliageColor(var1, var3) & 16711422) + 5115470) / 2; } + @Override + public int getFogColour() + { + return 7246218; + } + + @Override + public float getFogCloseness() + { + // TODO Auto-generated method stub + return 0.4F; + } + /** * takes temperature, returns color */ diff --git a/common/biomesoplenty/worldgen/tree/WorldGenSequoia.java b/common/biomesoplenty/worldgen/tree/WorldGenSequoia.java index 45a7d5b34..3e4bce15c 100644 --- a/common/biomesoplenty/worldgen/tree/WorldGenSequoia.java +++ b/common/biomesoplenty/worldgen/tree/WorldGenSequoia.java @@ -20,7 +20,7 @@ public class WorldGenSequoia extends WorldGenerator int var6 = var2.nextInt(10) + 35; int var7 = var2.nextInt(5) + 10; int var8 = var6 - var7; - int var9 = 3; + int var9 = 4; boolean var10 = true; if (var4 >= 1 && var4 + var6 + 1 <= 256)