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

Fixed removing beaches from certain biomes

This commit is contained in:
Adubbz 2016-02-09 13:22:04 +11:00
parent c0c6062ded
commit 896e059938
18 changed files with 17 additions and 18 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

@ -36,8 +36,6 @@ public class BiomeGenAlps extends BOPBiome
this.addWeight(BOPClimates.TUNDRA, 3);
this.addWeight(BOPClimates.ICE_CAP, 5);
this.beachBiomeId = this.biomeID;
this.topBlock = Blocks.snow.getDefaultState();
this.fillerBlock = Blocks.snow.getDefaultState();

2
src/main/java/biomesoplenty/common/biome/overworld/BiomeGenBayou.java
View File

@ -60,7 +60,7 @@ public class BiomeGenBayou extends BOPBiome
this.canGenerateRivers = false;
this.canGenerateVillages = false;
this.beachBiomeId = this.biomeID;
this.beachBiomeId = -1;
this.addWeight(BOPClimates.HOT_SWAMP, 10);

2
src/main/java/biomesoplenty/common/biome/overworld/BiomeGenCanyon.java
View File

@ -50,7 +50,7 @@ public class BiomeGenCanyon extends BOPBiome
this.canSpawnInBiome = false;
this.canGenerateVillages = false;
this.beachBiomeId = this.biomeID;
this.beachBiomeId = -1;
this.spawnableCreatureList.clear();

2
src/main/java/biomesoplenty/common/biome/overworld/BiomeGenCrag.java
View File

@ -30,7 +30,7 @@ public class BiomeGenCrag extends BOPBiome
this.canGenerateVillages = false;
this.canGenerateRivers = false;
this.beachBiomeId = this.biomeID;
this.beachBiomeId = -1;
this.addWeight(BOPClimates.COLD_SWAMP, 1);

2
src/main/java/biomesoplenty/common/biome/overworld/BiomeGenDeadSwamp.java
View File

@ -59,7 +59,7 @@ public class BiomeGenDeadSwamp extends BOPBiome
this.canGenerateRivers = false;
this.canGenerateVillages = false;
this.beachBiomeId = this.biomeID;
this.beachBiomeId = -1;
this.addWeight(BOPClimates.COLD_SWAMP, 3);

2
src/main/java/biomesoplenty/common/biome/overworld/BiomeGenFungiForest.java
View File

@ -57,7 +57,7 @@ public class BiomeGenFungiForest extends BOPBiome
this.canSpawnInBiome = false;
this.canGenerateVillages = false;
this.beachBiomeId = this.biomeID;
this.beachBiomeId = -1;
this.addWeight(BOPClimates.TROPICAL, 1);

2
src/main/java/biomesoplenty/common/biome/overworld/BiomeGenLushSwamp.java
View File

@ -64,7 +64,7 @@ public class BiomeGenLushSwamp extends BOPBiome
this.canGenerateRivers = false;
this.canGenerateVillages = false;
this.beachBiomeId = this.biomeID;
this.beachBiomeId = -1;
this.addWeight(BOPClimates.WET_TEMPERATE, 10);

2
src/main/java/biomesoplenty/common/biome/overworld/BiomeGenMarsh.java
View File

@ -56,7 +56,7 @@ public class BiomeGenMarsh extends BOPBiome
this.canGenerateRivers = false;
this.canGenerateVillages = false;
this.beachBiomeId = this.biomeID;
this.beachBiomeId = -1;
this.addWeight(BOPClimates.WET_TEMPERATE, 7);

2
src/main/java/biomesoplenty/common/biome/overworld/BiomeGenMysticGrove.java
View File

@ -59,7 +59,7 @@ public class BiomeGenMysticGrove extends BOPBiome
this.canGenerateVillages = false;
this.canSpawnInBiome = false;
this.beachBiomeId = this.biomeID;
this.beachBiomeId = -1;
this.addWeight(BOPClimates.WET_TEMPERATE, 1);

2
src/main/java/biomesoplenty/common/biome/overworld/BiomeGenOminousWoods.java
View File

@ -69,7 +69,7 @@ public class BiomeGenOminousWoods extends BOPBiome
this.canGenerateVillages = false;
this.canSpawnInBiome = false;
this.beachBiomeId = this.biomeID;
this.beachBiomeId = -1;
this.addWeight(BOPClimates.COLD_SWAMP, 1);

2
src/main/java/biomesoplenty/common/biome/overworld/BiomeGenOvergrownCliffs.java
View File

@ -47,7 +47,7 @@ public class BiomeGenOvergrownCliffs extends BOPBiome
this.addWeight(BOPClimates.TROPICAL, 2);
this.beachBiomeId = this.biomeID;
this.beachBiomeId = -1;
this.spawnableCreatureList.clear();

2
src/main/java/biomesoplenty/common/biome/overworld/BiomeGenQuagmire.java
View File

@ -53,7 +53,7 @@ public class BiomeGenQuagmire extends BOPBiome
this.canGenerateRivers = false;
this.canGenerateVillages = false;
this.beachBiomeId = this.biomeID;
this.beachBiomeId = -1;
this.addWeight(BOPClimates.COLD_SWAMP, 2);

2
src/main/java/biomesoplenty/common/biome/overworld/BiomeGenRainforest.java
View File

@ -47,7 +47,7 @@ public class BiomeGenRainforest extends BOPBiome
this.canGenerateVillages = false;
this.canGenerateRivers = false;
this.beachBiomeId = this.biomeID;
this.beachBiomeId = -1;
this.spawnableMonsterList.add(new SpawnListEntry(EntityOcelot.class, 2, 1, 1));
this.spawnableCreatureList.add(new SpawnListEntry(EntityButterfly.class, 6, 2, 4));

2
src/main/java/biomesoplenty/common/biome/overworld/BiomeGenSacredSprings.java
View File

@ -45,7 +45,7 @@ public class BiomeGenSacredSprings extends BOPBiome
this.canGenerateRivers = false;
this.canGenerateVillages = false;
this.beachBiomeId = this.biomeID;
this.beachBiomeId = -1;
this.addWeight(BOPClimates.TROPICAL, 1);

2
src/main/java/biomesoplenty/common/biome/overworld/BiomeGenWasteland.java
View File

@ -62,7 +62,7 @@ public class BiomeGenWasteland extends BOPBiome
this.canGenerateVillages = false;
this.canSpawnInBiome = false;
this.beachBiomeId = this.biomeID;
this.beachBiomeId = -1;
this.addWeight(BOPClimates.WASTELAND, 50);

2
src/main/java/biomesoplenty/common/biome/overworld/BiomeGenWetland.java
View File

@ -61,7 +61,7 @@ public class BiomeGenWetland extends BOPBiome
this.canGenerateRivers = false;
this.canGenerateVillages = false;
this.beachBiomeId = this.biomeID;
this.beachBiomeId = -1;
this.addWeight(BOPClimates.WET_TEMPERATE, 7);
this.addWeight(BOPClimates.COLD_SWAMP, 5);

1
src/main/java/biomesoplenty/common/init/ModBiomes.java
View File

@ -244,6 +244,7 @@ public class ModBiomes implements BOPBiomes.IBiomeRegistry
registerBiomes();
registerBiomeDictionaryTags();
//After normal biomes to account for adding custom beaches
initExtendedBiomes();
// save the biome ids to the config file (creating it if it doesn't exist)

2
src/main/java/biomesoplenty/common/world/layer/GenLayerShoreBOP.java
View File

@ -76,7 +76,7 @@ public class GenLayerShoreBOP extends BOPGenLayer
if (biome != null && BOPBiomes.REG_INSTANCE.getExtendedBiome(biome) != null)
{
IExtendedBiome extBiome = BOPBiomes.REG_INSTANCE.getExtendedBiome(biome);
setBiomeWithAdjacent(biomeIds, out, x, z, areaWidth, biomeId, extBiome.getBeachId(), OCEANIC_PREDICATE);
setBiomeWithAdjacent(biomeIds, out, x, z, areaWidth, biomeId, extBiome.getBeachId() == -1 ? biomeId : extBiome.getBeachId(), OCEANIC_PREDICATE);
}
else
{