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

Rename a few things to be more consistent

Browse source
This commit is contained in:
Cheeserolls 2015-08-05 18:00:34 +01:00
parent 3585753be9
commit 587ec3fe38
4 changed files with 28 additions and 28 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
src/main/java/biomesoplenty/api/biome/BOPBiomes.java
View file

@ -25,27 +25,27 @@ public class BOPBiomes
public static Optional<BiomeGenBase> canyon = Optional.absent();
public static Optional<BiomeGenBase> chaparral = Optional.absent();
public static Optional<BiomeGenBase> cherry_blossom_grove = Optional.absent();
public static Optional<BiomeGenBase> coldDesert = Optional.absent();
public static Optional<BiomeGenBase> cold_desert = Optional.absent();
public static Optional<BiomeGenBase> coniferous_forest = Optional.absent();
public static Optional<BiomeGenBase> crag = Optional.absent();
public static Optional<BiomeGenBase> deadForest = Optional.absent();
public static Optional<BiomeGenBase> deadSwamp = Optional.absent();
public static Optional<BiomeGenBase> deciduousForest = Optional.absent(); // TODO change to deciduous_forest
public static Optional<BiomeGenBase> eucalyptusForest = Optional.absent(); // TODO change to eucalyptus_forest
public static Optional<BiomeGenBase> dead_forest = Optional.absent();
public static Optional<BiomeGenBase> dead_swamp = Optional.absent();
public static Optional<BiomeGenBase> deciduous_forest = Optional.absent();
public static Optional<BiomeGenBase> eucalyptus_forest = Optional.absent();
public static Optional<BiomeGenBase> fen = Optional.absent();
public static Optional<BiomeGenBase> denseForest = Optional.absent(); // TODO change to dense_forest
public static Optional<BiomeGenBase> flowerField = Optional.absent(); // TODO change to flower_field
public static Optional<BiomeGenBase> dense_forest = Optional.absent();
public static Optional<BiomeGenBase> flower_field = Optional.absent();
public static Optional<BiomeGenBase> frost_forest = Optional.absent();
public static Optional<BiomeGenBase> frozenDesert = Optional.absent();
public static Optional<BiomeGenBase> frozen_desert = Optional.absent();
public static Optional<BiomeGenBase> grassland = Optional.absent();
public static Optional<BiomeGenBase> heathland = Optional.absent();
public static Optional<BiomeGenBase> highland = Optional.absent();
public static Optional<BiomeGenBase> jade_cliffs = Optional.absent();
public static Optional<BiomeGenBase> lavenderFields = Optional.absent();
public static Optional<BiomeGenBase> lavender_fields = Optional.absent();
public static Optional<BiomeGenBase> marsh = Optional.absent();
public static Optional<BiomeGenBase> moor = Optional.absent();
public static Optional<BiomeGenBase> mountain = Optional.absent();
public static Optional<BiomeGenBase> originValley = Optional.absent(); // TODO change to origin_valley
public static Optional<BiomeGenBase> origin_valley = Optional.absent();
public static Optional<BiomeGenBase> outback = Optional.absent();
public static Optional<BiomeGenBase> shrubland = Optional.absent();
public static Optional<BiomeGenBase> steppe = Optional.absent();
@ -56,7 +56,7 @@ public class BOPBiomes
// edge-biomes, sub-biomes and mutated-biomes
public static Optional<BiomeGenBase> glacier = Optional.absent();
public static Optional<BiomeGenBase> mountainFoothills = Optional.absent();
public static Optional<BiomeGenBase> canyonRavine = Optional.absent();
public static Optional<BiomeGenBase> mountain_foothills = Optional.absent();
public static Optional<BiomeGenBase> canyon_ravine = Optional.absent();
}

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

@ -48,7 +48,7 @@ public class BiomeGenDeciduousForest extends BOPBiome
// shrooms
this.addGenerator("toadstools", GeneratorStage.SHROOM,(new GeneratorFlora.Builder()).amountPerChunk(0.2F).with(BlockBOPMushroom.MushroomType.TOADSTOOL).create());
this.addGenerator("milkcaps", GeneratorStage.SHROOM,(new GeneratorFlora.Builder()).amountPerChunk(0.4F).with(BlockBOPMushroom.MushroomType.BLUE_MILK_CAP).create());
this.addGenerator("blue_milk_caps", GeneratorStage.SHROOM,(new GeneratorFlora.Builder()).amountPerChunk(0.4F).with(BlockBOPMushroom.MushroomType.BLUE_MILK_CAP).create());
// other plants
this.addGenerator("bushes", GeneratorStage.FLOWERS, (new GeneratorFlora.Builder()).amountPerChunk(0.8F).with(BOPPlants.BUSH).create());

26
src/main/java/biomesoplenty/common/init/ModBiomes.java
View file

@ -150,27 +150,27 @@ public class ModBiomes
canyon = registerBOPBiome(new BiomeGenCanyon(BiomeGenCanyon.CanyonType.PLATEAU), "Canyon");
chaparral = registerBOPBiome(new BiomeGenChaparral(), "Chaparral");
cherry_blossom_grove = registerBOPBiome(new BiomeGenCherryBlossomGrove(), "Cherry Blossom Grove");
coldDesert = registerBOPBiome(new BiomeGenColdDesert(BiomeGenColdDesert.ColdDesertType.COLD), "Cold Desert");
cold_desert = registerBOPBiome(new BiomeGenColdDesert(BiomeGenColdDesert.ColdDesertType.COLD), "Cold Desert");
coniferous_forest = registerBOPBiome(new BiomeGenConiferousForest(), "Coniferous Forest");
crag = registerBOPBiome(new BiomeGenCrag(), "Crag");
deadForest = registerBOPBiome(new BiomeGenDeadForest(), "Dead Forest");
deadSwamp = registerBOPBiome(new BiomeGenDeadSwamp(), "Dead Swamp");
deciduousForest = registerBOPBiome(new BiomeGenDeciduousForest(), "Deciduous Forest");
eucalyptusForest = registerBOPBiome(new BiomeGenEucalyptusForest(), "Eucalyptus Forest");
dead_forest = registerBOPBiome(new BiomeGenDeadForest(), "Dead Forest");
dead_swamp = registerBOPBiome(new BiomeGenDeadSwamp(), "Dead Swamp");
deciduous_forest = registerBOPBiome(new BiomeGenDeciduousForest(), "Deciduous Forest");
eucalyptus_forest = registerBOPBiome(new BiomeGenEucalyptusForest(), "Eucalyptus Forest");
fen = registerBOPBiome(new BiomeGenFen(), "Fen");
denseForest = registerBOPBiome(new BiomeGenDenseForest(), "Dense Forest");
flowerField = registerBOPBiome(new BiomeGenFlowerField(), "Flower Field");
dense_forest = registerBOPBiome(new BiomeGenDenseForest(), "Dense Forest");
flower_field = registerBOPBiome(new BiomeGenFlowerField(), "Flower Field");
frost_forest = registerBOPBiome(new BiomeGenFrostForest(), "Frost Forest");
frozenDesert = registerBOPBiome(new BiomeGenColdDesert(BiomeGenColdDesert.ColdDesertType.FROZEN), "Frozen Desert");
frozen_desert = registerBOPBiome(new BiomeGenColdDesert(BiomeGenColdDesert.ColdDesertType.FROZEN), "Frozen Desert");
grassland = registerBOPBiome(new BiomeGenGrassland(), "Grassland");
heathland = registerBOPBiome(new BiomeGenHeathland(), "Heathland");
highland = registerBOPBiome(new BiomeGenHighland(), "Highland");
jade_cliffs = registerBOPBiome(new BiomeGenJadeCliffs(), "Jade Cliffs");
lavenderFields = registerBOPBiome(new BiomeGenLavenderFields(), "Lavender Fields");
lavender_fields = registerBOPBiome(new BiomeGenLavenderFields(), "Lavender Fields");
marsh = registerBOPBiome(new BiomeGenMarsh(), "Marsh");
moor = registerBOPBiome(new BiomeGenMoor(), "Moor");
mountain = registerBOPBiome(new BiomeGenMountain(BiomeGenMountain.MountainType.PEAKS), "Mountain");
originValley = registerBOPBiome(new BiomeGenOriginValley(), "Origin Valley");
origin_valley = registerBOPBiome(new BiomeGenOriginValley(), "Origin Valley");
outback = registerBOPBiome(new BiomeGenOutback(), "Outback");
shrubland = registerBOPBiome(new BiomeGenShrubland(), "Shrubland");
steppe = registerBOPBiome(new BiomeGenSteppe(), "Steppe");
@ -181,13 +181,13 @@ public class ModBiomes
// edge-biomes, sub-biomes and mutated-biomes
mountainFoothills = registerBOPBiome(new BiomeGenMountain(BiomeGenMountain.MountainType.FOOTHILLS), "Mountain Foothills");
canyonRavine = registerBOPBiome(new BiomeGenCanyon(BiomeGenCanyon.CanyonType.RAVINE), "Canyon Ravine");
mountain_foothills = registerBOPBiome(new BiomeGenMountain(BiomeGenMountain.MountainType.FOOTHILLS), "Mountain Foothills");
canyon_ravine = registerBOPBiome(new BiomeGenCanyon(BiomeGenCanyon.CanyonType.RAVINE), "Canyon Ravine");
glacier = registerBOPBiome(new BiomeGenGlacier(), "Glacier"); // TODO: implement glacier
setSubBiome(Optional.of(BiomeGenBase.frozenOcean), arctic); // add some arctic regions in frozen oceans
setSubBiome(arctic, glacier);
setSubBiome(canyon, canyonRavine);
setSubBiome(canyon, canyon_ravine);
}

4
src/main/java/biomesoplenty/common/world/layer/GenLayerBiomeEdgeBOP.java
View file

@ -38,10 +38,10 @@ public class GenLayerBiomeEdgeBOP extends BOPGenLayer
int biomeId = parentVals[x + 1 + (y + 1) * (areaWidth + 2)];
// line BOP mountain peaks with BOP mountain foothills
if (this.replaceBiomeEdge(parentVals, out, x, y, areaWidth, biomeId, BOPBiomes.mountain, BOPBiomes.mountainFoothills)) {continue;}
if (this.replaceBiomeEdge(parentVals, out, x, y, areaWidth, biomeId, BOPBiomes.mountain, BOPBiomes.mountain_foothills)) {continue;}
// line BOP canyon with BOP canyon ravine
if (this.replaceBiomeEdge(parentVals, out, x, y, areaWidth, biomeId, BOPBiomes.canyon, BOPBiomes.canyonRavine)) {continue;}
if (this.replaceBiomeEdge(parentVals, out, x, y, areaWidth, biomeId, BOPBiomes.canyon, BOPBiomes.canyon_ravine)) {continue;}
// line extreme hills with extreme hills edge
if (this.replaceBiomeEdgeIfNecessary(parentVals, out, x, y, areaWidth, biomeId, BiomeGenBase.extremeHills.biomeID, BiomeGenBase.extremeHillsEdge.biomeID)) {continue;}