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

Overhauled biome climates (Merged cold desert/frozen desert with ice cap, redid climate mapping, etc.)

Browse source
This commit is contained in:
Forstride 2016-02-03 21:45:02 -05:00
parent 414b8d4db1
commit 688b8852a4
4 changed files with 19 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/main/java/biomesoplenty/common/biome/overworld/BiomeGenAlps.java
View file

@ -35,7 +35,7 @@ public class BiomeGenAlps extends BOPBiome
this.addWeight(BOPClimates.BOREAL, 3); this.addWeight(BOPClimates.BOREAL, 3);
this.addWeight(BOPClimates.TUNDRA, 5); this.addWeight(BOPClimates.TUNDRA, 5);
this.addWeight(BOPClimates.COLD_DESERT, 5); this.addWeight(BOPClimates.ICE_CAP, 5);
this.topBlock = Blocks.snow.getDefaultState(); this.topBlock = Blocks.snow.getDefaultState();
this.fillerBlock = Blocks.snow.getDefaultState(); this.fillerBlock = Blocks.snow.getDefaultState();

4
src/main/java/biomesoplenty/common/biome/overworld/BiomeGenColdDesert.java
View file

@ -58,14 +58,14 @@ public class BiomeGenColdDesert extends BOPBiome
{ {
this.alternateTopBlock = BOPBlocks.hard_ice.getDefaultState(); this.alternateTopBlock = BOPBlocks.hard_ice.getDefaultState();
this.setTemperatureRainfall(0.0F, 0.0F); this.setTemperatureRainfall(0.0F, 0.0F);
this.addWeight(BOPClimates.FROZEN_DESERT, 10); this.addWeight(BOPClimates.ICE_CAP, 10);
this.setColor(0xB3D7E3); this.setColor(0xB3D7E3);
} }
else else
{ {
this.alternateTopBlock = Blocks.snow.getDefaultState(); this.alternateTopBlock = Blocks.snow.getDefaultState();
this.setTemperatureRainfall(0.2F, 0.0F); this.setTemperatureRainfall(0.2F, 0.0F);
this.addWeight(BOPClimates.COLD_DESERT, 10); this.addWeight(BOPClimates.ICE_CAP, 10);
this.setColor(0xB3AF9B); this.setColor(0xB3AF9B);
} }

2
src/main/java/biomesoplenty/common/biome/overworld/BiomeGenWoodland.java
View file

@ -50,7 +50,7 @@ public class BiomeGenWoodland extends BOPBiome
this.canGenerateVillages = false; this.canGenerateVillages = false;
this.addWeight(BOPClimates.COOL_TEMPERATE, 10); this.addWeight(BOPClimates.WARM_TEMPERATE, 10);
this.spawnableCreatureList.add(new SpawnListEntry(EntitySnail.class, 6, 1, 2)); this.spawnableCreatureList.add(new SpawnListEntry(EntitySnail.class, 6, 1, 2));
this.spawnableCreatureList.add(new SpawnListEntry(EntityButterfly.class, 6, 2, 4)); this.spawnableCreatureList.add(new SpawnListEntry(EntityButterfly.class, 6, 2, 4));

34
src/main/java/biomesoplenty/common/enums/BOPClimates.java
View file

@ -10,12 +10,10 @@ import net.minecraftforge.common.BiomeManager.BiomeType;
public enum BOPClimates { public enum BOPClimates {
ICE_CAP (BiomeType.ICY), ICE_CAP (BiomeType.ICY),
FROZEN_DESERT (BiomeType.ICY),
TUNDRA (BiomeType.ICY), TUNDRA (BiomeType.ICY),
COLD_DESERT (BiomeType.COOL), BOREAL (BiomeType.COOL),
BOREAL (BiomeType.ICY),
COLD_SWAMP (BiomeType.COOL), COLD_SWAMP (BiomeType.COOL),
WET_TEMPERATE (BiomeType.COOL), WET_TEMPERATE (BiomeType.WARM),
DRY_TEMPERATE (BiomeType.WARM), DRY_TEMPERATE (BiomeType.WARM),
COOL_TEMPERATE (BiomeType.COOL), COOL_TEMPERATE (BiomeType.COOL),
WARM_TEMPERATE (BiomeType.WARM), WARM_TEMPERATE (BiomeType.WARM),
@ -66,7 +64,7 @@ public enum BOPClimates {
{ {
case ICE_CAP: case ICE_CAP:
return (layer.nextInt(2)==0) ? this.getRandomLandBiome(layer) : BiomeGenBase.frozenOcean; return (layer.nextInt(2)==0) ? this.getRandomLandBiome(layer) : BiomeGenBase.frozenOcean;
case FROZEN_DESERT: case TUNDRA: case COLD_DESERT: case BOREAL: case TUNDRA: case BOREAL:
return (layer.nextInt(3)!=0) ? (deep ? BiomeGenBase.deepOcean : BiomeGenBase.ocean) : BiomeGenBase.frozenOcean; return (layer.nextInt(3)!=0) ? (deep ? BiomeGenBase.deepOcean : BiomeGenBase.ocean) : BiomeGenBase.frozenOcean;
default: default:
return (deep ? BiomeGenBase.deepOcean : BiomeGenBase.ocean); return (deep ? BiomeGenBase.deepOcean : BiomeGenBase.ocean);
@ -78,20 +76,18 @@ public enum BOPClimates {
// set up vanilla biomes // set up vanilla biomes
BOPClimates.ICE_CAP.addLandBiome(5,BiomeGenBase.icePlains); BOPClimates.ICE_CAP.addLandBiome(5,BiomeGenBase.icePlains);
BOPClimates.FROZEN_DESERT.addLandBiome(5, BiomeGenBase.icePlains);
BOPClimates.TUNDRA.addLandBiome(5, BiomeGenBase.icePlains).addLandBiome(10, BiomeGenBase.coldTaiga); BOPClimates.TUNDRA.addLandBiome(5, BiomeGenBase.icePlains).addLandBiome(10, BiomeGenBase.coldTaiga);
BOPClimates.COLD_DESERT.addLandBiome(5, BiomeGenBase.extremeHills);
BOPClimates.BOREAL.addLandBiome(10, BiomeGenBase.coldTaiga).addLandBiome(2, BiomeGenBase.megaTaiga).addLandBiome(10, BiomeGenBase.extremeHills).addLandBiome(10, BiomeGenBase.taiga); BOPClimates.BOREAL.addLandBiome(10, BiomeGenBase.coldTaiga).addLandBiome(2, BiomeGenBase.megaTaiga).addLandBiome(10, BiomeGenBase.extremeHills).addLandBiome(10, BiomeGenBase.taiga);
BOPClimates.COLD_SWAMP.addLandBiome(3, BiomeGenBase.swampland); BOPClimates.COLD_SWAMP.addLandBiome(3, BiomeGenBase.swampland);
BOPClimates.WET_TEMPERATE.addLandBiome(10, BiomeGenBase.forest).addLandBiome(20, BiomeGenBase.roofedForest); BOPClimates.WET_TEMPERATE.addLandBiome(20, BiomeGenBase.roofedForest);
BOPClimates.DRY_TEMPERATE.addLandBiome(5, BiomeGenBase.plains); BOPClimates.DRY_TEMPERATE.addLandBiome(5, BiomeGenBase.plains);
BOPClimates.COOL_TEMPERATE.addLandBiome(5, BiomeGenBase.taiga).addLandBiome(2, BiomeGenBase.megaTaiga).addLandBiome(10, BiomeGenBase.forest).addLandBiome(20, BiomeGenBase.birchForest); BOPClimates.COOL_TEMPERATE.addLandBiome(5, BiomeGenBase.taiga).addLandBiome(2, BiomeGenBase.megaTaiga).addLandBiome(10, BiomeGenBase.forest).addLandBiome(20, BiomeGenBase.birchForest);
BOPClimates.WARM_TEMPERATE.addLandBiome(20, BiomeGenBase.plains).addLandBiome(5, BiomeGenBase.forest).addLandBiome(5, BiomeGenBase.birchForest); BOPClimates.WARM_TEMPERATE.addLandBiome(20, BiomeGenBase.plains).addLandBiome(5, BiomeGenBase.forest).addLandBiome(5, BiomeGenBase.birchForest);
BOPClimates.HOT_SWAMP.addLandBiome(7, BiomeGenBase.swampland); BOPClimates.HOT_SWAMP.addLandBiome(7, BiomeGenBase.swampland);
BOPClimates.TROPICAL.addLandBiome(10, BiomeGenBase.jungle); BOPClimates.TROPICAL.addLandBiome(10, BiomeGenBase.jungle);
BOPClimates.MEDITERANEAN.addLandBiome(5, BiomeGenBase.plains); BOPClimates.MEDITERANEAN.addLandBiome(5, BiomeGenBase.plains);
BOPClimates.SAVANNA.addLandBiome(20, BiomeGenBase.savanna).addLandBiome(5, BiomeGenBase.mesaPlateau); BOPClimates.SAVANNA.addLandBiome(20, BiomeGenBase.savanna);
BOPClimates.HOT_DESERT.addLandBiome(30, BiomeGenBase.desert).addLandBiome(5, BiomeGenBase.mesaPlateau); BOPClimates.HOT_DESERT.addLandBiome(30, BiomeGenBase.desert).addLandBiome(10, BiomeGenBase.mesaPlateau);
} }
@ -107,15 +103,15 @@ public enum BOPClimates {
// we will contrive to make any combination equally likely, so the overall rarity of each climate is in proportion to the number of times it appears in the array // we will contrive to make any combination equally likely, so the overall rarity of each climate is in proportion to the number of times it appears in the array
private static final BOPClimates[] climateMapping = new BOPClimates[] { private static final BOPClimates[] climateMapping = new BOPClimates[] {
// 0 1 2 3 4 5 6 7 8 9 10 11 // 0 1 2 3 4 5 6 7 8 9 10 11
ICE_CAP, ICE_CAP, ICE_CAP, ICE_CAP, ICE_CAP, ICE_CAP, ICE_CAP, ICE_CAP, ICE_CAP, ICE_CAP, FROZEN_DESERT, FROZEN_DESERT, // 0 TUNDRA, TUNDRA, TUNDRA, ICE_CAP, ICE_CAP, ICE_CAP, ICE_CAP, ICE_CAP, ICE_CAP, ICE_CAP, ICE_CAP, ICE_CAP, // 0
TUNDRA, TUNDRA, TUNDRA, TUNDRA, TUNDRA, TUNDRA, TUNDRA, TUNDRA, TUNDRA, TUNDRA, COLD_DESERT, COLD_DESERT, // 1 BOREAL, BOREAL, BOREAL, TUNDRA, TUNDRA, TUNDRA, TUNDRA, TUNDRA, TUNDRA, ICE_CAP, ICE_CAP, ICE_CAP, // 1
BOREAL, BOREAL, BOREAL, BOREAL, BOREAL, BOREAL, BOREAL, BOREAL, BOREAL, BOREAL, BOREAL, COLD_DESERT, // 2 COLD_SWAMP, COLD_SWAMP, COLD_SWAMP, BOREAL, BOREAL, BOREAL, BOREAL, BOREAL, BOREAL, TUNDRA, TUNDRA, TUNDRA, // 2
COLD_SWAMP, WET_TEMPERATE, WET_TEMPERATE, COOL_TEMPERATE, COOL_TEMPERATE, COOL_TEMPERATE, COOL_TEMPERATE, COOL_TEMPERATE, COOL_TEMPERATE, COOL_TEMPERATE, DRY_TEMPERATE, COLD_DESERT, // 3 COLD_SWAMP, COLD_SWAMP, COLD_SWAMP, WET_TEMPERATE, COOL_TEMPERATE, COOL_TEMPERATE, COOL_TEMPERATE, COOL_TEMPERATE, COOL_TEMPERATE, DRY_TEMPERATE, DRY_TEMPERATE, DRY_TEMPERATE, // 3
COLD_SWAMP, WET_TEMPERATE, WET_TEMPERATE, COOL_TEMPERATE, COOL_TEMPERATE, COOL_TEMPERATE, COOL_TEMPERATE, COOL_TEMPERATE, COOL_TEMPERATE, DRY_TEMPERATE, DRY_TEMPERATE, COLD_DESERT, // 4 COLD_SWAMP, WET_TEMPERATE, WET_TEMPERATE, COOL_TEMPERATE, COOL_TEMPERATE, COOL_TEMPERATE, COOL_TEMPERATE, COOL_TEMPERATE, DRY_TEMPERATE, DRY_TEMPERATE, DRY_TEMPERATE, DRY_TEMPERATE, // 4
COLD_SWAMP, COLD_SWAMP, WET_TEMPERATE, WARM_TEMPERATE, WARM_TEMPERATE, WARM_TEMPERATE, WARM_TEMPERATE, WARM_TEMPERATE, WARM_TEMPERATE, DRY_TEMPERATE, DRY_TEMPERATE, DRY_TEMPERATE, // 5 WET_TEMPERATE, WET_TEMPERATE, WET_TEMPERATE, WARM_TEMPERATE, WARM_TEMPERATE, WARM_TEMPERATE, WARM_TEMPERATE, WARM_TEMPERATE, WARM_TEMPERATE, DRY_TEMPERATE, DRY_TEMPERATE, SAVANNA, // 5
COLD_SWAMP, COLD_SWAMP, WET_TEMPERATE, WARM_TEMPERATE, WARM_TEMPERATE, WARM_TEMPERATE, WARM_TEMPERATE, WARM_TEMPERATE, WARM_TEMPERATE, WARM_TEMPERATE, DRY_TEMPERATE, DRY_TEMPERATE, // 6 HOT_SWAMP, HOT_SWAMP, HOT_SWAMP, WET_TEMPERATE, WARM_TEMPERATE, WARM_TEMPERATE, WARM_TEMPERATE, MEDITERANEAN, MEDITERANEAN, SAVANNA, SAVANNA, HOT_DESERT, // 6
HOT_SWAMP, HOT_SWAMP, TROPICAL, TROPICAL, TROPICAL, MEDITERANEAN, MEDITERANEAN, MEDITERANEAN, MEDITERANEAN, HOT_DESERT, HOT_DESERT, HOT_DESERT, // 7 TROPICAL, TROPICAL, HOT_SWAMP, HOT_SWAMP, WET_TEMPERATE, WARM_TEMPERATE, MEDITERANEAN, MEDITERANEAN, SAVANNA, HOT_DESERT, HOT_DESERT, HOT_DESERT, // 7
HOT_SWAMP, HOT_SWAMP, TROPICAL, TROPICAL, TROPICAL, SAVANNA, SAVANNA, SAVANNA, SAVANNA, HOT_DESERT, HOT_DESERT, HOT_DESERT // 8 TROPICAL, TROPICAL, TROPICAL, HOT_SWAMP, HOT_SWAMP, MEDITERANEAN, MEDITERANEAN, SAVANNA, SAVANNA, HOT_DESERT, HOT_DESERT, HOT_DESERT // 8
}; };
public static int[] getClimateMappingInts() public static int[] getClimateMappingInts()