diff --git a/src/main/java/biomesoplenty/api/biome/BOPBiomes.java b/src/main/java/biomesoplenty/api/biome/BOPBiomes.java index eb71c15a0..012c5250e 100644 --- a/src/main/java/biomesoplenty/api/biome/BOPBiomes.java +++ b/src/main/java/biomesoplenty/api/biome/BOPBiomes.java @@ -35,7 +35,6 @@ public class BOPBiomes public static Optional eucalyptus_forest = Optional.absent(); public static Optional fen = Optional.absent(); public static Optional flower_field = Optional.absent(); - public static Optional frost_forest = Optional.absent(); public static Optional frozen_desert = Optional.absent(); public static Optional fungi_forest = Optional.absent(); public static Optional garden = Optional.absent(); @@ -67,6 +66,7 @@ public class BOPBiomes public static Optional shield = Optional.absent(); public static Optional shrubland = Optional.absent(); public static Optional snowy_coniferous_forest = Optional.absent(); + public static Optional snowy_forest = Optional.absent(); public static Optional steppe = Optional.absent(); public static Optional temperate_rainforest = Optional.absent(); public static Optional tropical_rainforest = Optional.absent(); diff --git a/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenFrostForest.java b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenSnowyForest.java similarity index 86% rename from src/main/java/biomesoplenty/common/biome/overworld/BiomeGenFrostForest.java rename to src/main/java/biomesoplenty/common/biome/overworld/BiomeGenSnowyForest.java index 02f2a33ef..6fca9da13 100644 --- a/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenFrostForest.java +++ b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenSnowyForest.java @@ -21,24 +21,23 @@ import biomesoplenty.common.enums.BOPClimates; import biomesoplenty.common.enums.BOPFlowers; import biomesoplenty.common.enums.BOPGems; import biomesoplenty.common.enums.BOPPlants; +import biomesoplenty.common.enums.BOPTrees; import biomesoplenty.common.world.BOPWorldSettings; import biomesoplenty.common.world.feature.GeneratorFlora; import biomesoplenty.common.world.feature.GeneratorGrass; import biomesoplenty.common.world.feature.GeneratorOreSingle; import biomesoplenty.common.world.feature.tree.GeneratorBasicTree; +import biomesoplenty.common.world.feature.tree.GeneratorBigTree; -public class BiomeGenFrostForest extends BOPBiome +public class BiomeGenSnowyForest extends BOPBiome { - public BiomeGenFrostForest() + public BiomeGenSnowyForest() { // terrain this.terrainSettings.avgHeight(66).heightVariation(6, 21); - this.topBlock = BOPBlocks.grass.getDefaultState().withProperty(BlockBOPGrass.VARIANT, BlockBOPGrass.BOPGrassType.SILTY); - this.fillerBlock = BOPBlocks.dirt.getDefaultState().withProperty(BlockBOPDirt.VARIANT, BlockBOPDirt.BOPDirtType.SILTY); - this.setColor(0xABD6BC); //this.skyColor = 0xCEE0EA; this.setEnableSnow(); @@ -51,7 +50,8 @@ public class BiomeGenFrostForest extends BOPBiome // trees GeneratorWeighted treeGenerator = new GeneratorWeighted(3); this.addGenerator("trees", GeneratorStage.TREE, treeGenerator); - treeGenerator.add("oak", 1, (new GeneratorBasicTree.Builder()).create()); + treeGenerator.add("oak", 3, (new GeneratorBasicTree.Builder()).leaves(BOPTrees.DEAD).create()); + treeGenerator.add("dying_tree", 1, (new GeneratorBigTree.Builder()).minHeight(5).maxHeight(12).foliageHeight(2).leaves(BOPTrees.DEAD).create()); // grasses GeneratorWeighted grassGenerator = new GeneratorWeighted(2.0F); @@ -68,7 +68,6 @@ public class BiomeGenFrostForest extends BOPBiome // flowers GeneratorWeighted flowerGenerator = new GeneratorWeighted(0.3F); this.addGenerator("flowers", GeneratorStage.GRASS, flowerGenerator); - flowerGenerator.add("icy_irises", 1, (new GeneratorFlora.Builder().with(BOPFlowers.ICY_IRIS).create())); flowerGenerator.add("violets", 1, (new GeneratorFlora.Builder().with(BOPFlowers.VIOLET).create())); // gem @@ -80,9 +79,7 @@ public class BiomeGenFrostForest extends BOPBiome public void applySettings(BOPWorldSettings settings) { if (!settings.generateBopGems) {this.removeGenerator("tanzanite");} - - if (!settings.generateBopSoils) {this.topBlock = Blocks.grass.getDefaultState(); this.fillerBlock = Blocks.dirt.getDefaultState();} - + if (!settings.generateBopFoliage) {this.removeGenerator("caveweed"); this.removeGenerator("bushes"); this.removeGenerator("koru"); this.removeGenerator("shrubs"); this.removeGenerator("leaf_piles"); this.removeGenerator("dead_leaf_piles"); this.removeGenerator("clover_patches"); this.removeGenerator("sprouts");} if (!settings.generateBopPlants) {this.removeGenerator("cattail"); this.removeGenerator("double_cattail"); this.removeGenerator("river_cane"); this.removeGenerator("tiny_cacti"); this.removeGenerator("roots"); this.removeGenerator("rafflesia"); this.removeGenerator("desert_sprouts");} @@ -96,13 +93,13 @@ public class BiomeGenFrostForest extends BOPBiome @Override public int getGrassColorAtPos(BlockPos pos) { - return 0xABD6BC; + return 0xBCA165; } @Override public int getFoliageColorAtPos(BlockPos pos) { - return 0xABD6BC; + return 0xBCA165; } /* TODO diff --git a/src/main/java/biomesoplenty/common/biome/vanilla/BiomeExtIcePlains.java b/src/main/java/biomesoplenty/common/biome/vanilla/BiomeExtIcePlains.java index d8fd1fe19..0b20d3ad3 100644 --- a/src/main/java/biomesoplenty/common/biome/vanilla/BiomeExtIcePlains.java +++ b/src/main/java/biomesoplenty/common/biome/vanilla/BiomeExtIcePlains.java @@ -29,6 +29,7 @@ public class BiomeExtIcePlains extends ExtendedBiomeWrapper // flowers GeneratorWeighted flowerGenerator = new GeneratorWeighted(0.1F); this.addGenerator("flowers", GeneratorStage.GRASS, flowerGenerator); + flowerGenerator.add("icy_irises", 1, (new GeneratorFlora.Builder().with(BOPFlowers.ICY_IRIS).create())); flowerGenerator.add("violet", 1, (new GeneratorFlora.Builder().with(BOPFlowers.VIOLET).create())); // gem diff --git a/src/main/java/biomesoplenty/common/init/ModBiomes.java b/src/main/java/biomesoplenty/common/init/ModBiomes.java index f406fe80e..318fd5f82 100644 --- a/src/main/java/biomesoplenty/common/init/ModBiomes.java +++ b/src/main/java/biomesoplenty/common/init/ModBiomes.java @@ -32,7 +32,6 @@ import static biomesoplenty.api.biome.BOPBiomes.extreme_hills_extension; import static biomesoplenty.api.biome.BOPBiomes.fen; import static biomesoplenty.api.biome.BOPBiomes.flower_field; import static biomesoplenty.api.biome.BOPBiomes.forest_extension; -import static biomesoplenty.api.biome.BOPBiomes.frost_forest; import static biomesoplenty.api.biome.BOPBiomes.frozen_desert; import static biomesoplenty.api.biome.BOPBiomes.fungi_forest; import static biomesoplenty.api.biome.BOPBiomes.garden; @@ -74,6 +73,7 @@ import static biomesoplenty.api.biome.BOPBiomes.seasonal_forest; import static biomesoplenty.api.biome.BOPBiomes.shield; import static biomesoplenty.api.biome.BOPBiomes.shrubland; import static biomesoplenty.api.biome.BOPBiomes.snowy_coniferous_forest; +import static biomesoplenty.api.biome.BOPBiomes.snowy_forest; import static biomesoplenty.api.biome.BOPBiomes.steppe; import static biomesoplenty.api.biome.BOPBiomes.swampland_extension; import static biomesoplenty.api.biome.BOPBiomes.taiga_extension; @@ -122,7 +122,6 @@ import biomesoplenty.common.biome.overworld.BiomeGenDeadSwamp; import biomesoplenty.common.biome.overworld.BiomeGenEucalyptusForest; import biomesoplenty.common.biome.overworld.BiomeGenFen; import biomesoplenty.common.biome.overworld.BiomeGenFlowerField; -import biomesoplenty.common.biome.overworld.BiomeGenFrostForest; import biomesoplenty.common.biome.overworld.BiomeGenFungiForest; import biomesoplenty.common.biome.overworld.BiomeGenGarden; import biomesoplenty.common.biome.overworld.BiomeGenGrassland; @@ -156,6 +155,7 @@ import biomesoplenty.common.biome.overworld.BiomeGenSeasonalForest; import biomesoplenty.common.biome.overworld.BiomeGenShield; import biomesoplenty.common.biome.overworld.BiomeGenShrubland; import biomesoplenty.common.biome.overworld.BiomeGenSnowyConiferousForest; +import biomesoplenty.common.biome.overworld.BiomeGenSnowyForest; import biomesoplenty.common.biome.overworld.BiomeGenSteppe; import biomesoplenty.common.biome.overworld.BiomeGenTemperateRainforest; import biomesoplenty.common.biome.overworld.BiomeGenTropicalIsland; @@ -343,7 +343,6 @@ public class ModBiomes implements BOPBiomes.IBiomeRegistry eucalyptus_forest = registerBOPBiome(new BiomeGenEucalyptusForest(), "Eucalyptus Forest"); fen = registerBOPBiome(new BiomeGenFen(), "Fen"); flower_field = registerBOPBiome(new BiomeGenFlowerField(), "Flower Field"); - frost_forest = registerBOPBiome(new BiomeGenFrostForest(), "Frost Forest"); frozen_desert = registerBOPBiome(new BiomeGenColdDesert(BiomeGenColdDesert.ColdDesertType.FROZEN), "Frozen Desert"); fungi_forest = registerBOPBiome(new BiomeGenFungiForest(), "Fungi Forest"); garden = registerBOPBiome(new BiomeGenGarden(), "Garden"); @@ -375,6 +374,7 @@ public class ModBiomes implements BOPBiomes.IBiomeRegistry shield = registerBOPBiome(new BiomeGenShield(), "Shield"); shrubland = registerBOPBiome(new BiomeGenShrubland(), "Shrubland"); snowy_coniferous_forest = registerBOPBiome(new BiomeGenSnowyConiferousForest(), "Snowy Coniferous Forest"); + snowy_forest = registerBOPBiome(new BiomeGenSnowyForest(), "Snowy Forest"); steppe = registerBOPBiome(new BiomeGenSteppe(), "Steppe"); temperate_rainforest = registerBOPBiome(new BiomeGenTemperateRainforest(), "Temperate Rainforest"); tropical_rainforest = registerBOPBiome(new BiomeGenTropicalRainforest(), "Tropical Rainforest"); @@ -447,7 +447,6 @@ public class ModBiomes implements BOPBiomes.IBiomeRegistry registerBiomeToDictionary(BOPBiomes.eucalyptus_forest, Type.FOREST, Type.JUNGLE, Type.LUSH, Type.WET, Type.DENSE); registerBiomeToDictionary(BOPBiomes.fen, Type.SWAMP, Type.FOREST, Type.COLD, Type.DEAD, Type.WET, Type.DENSE); registerBiomeToDictionary(BOPBiomes.flower_field, Type.PLAINS, Type.LUSH); - registerBiomeToDictionary(BOPBiomes.frost_forest, Type.SNOWY, Type.FOREST, Type.COLD, Type.WET, Type.SPARSE); registerBiomeToDictionary(BOPBiomes.frozen_desert, Type.SNOWY, Type.DRY, Type.COLD); registerBiomeToDictionary(BOPBiomes.fungi_forest, Type.FOREST, Type.MUSHROOM, Type.JUNGLE, Type.MAGICAL, Type.LUSH, Type.WET, Type.DENSE); registerBiomeToDictionary(BOPBiomes.garden, Type.PLAINS, Type.LUSH, Type.DENSE); @@ -478,6 +477,7 @@ public class ModBiomes implements BOPBiomes.IBiomeRegistry registerBiomeToDictionary(BOPBiomes.shield, Type.FOREST, Type.COLD, Type.WET, Type.DENSE); registerBiomeToDictionary(BOPBiomes.shrubland, Type.PLAINS, Type.DRY, Type.SPARSE); registerBiomeToDictionary(BOPBiomes.snowy_coniferous_forest, Type.FOREST, Type.CONIFEROUS, Type.SNOWY, Type.COLD, Type.DENSE); + registerBiomeToDictionary(BOPBiomes.snowy_forest, Type.SNOWY, Type.FOREST, Type.COLD, Type.WET, Type.SPARSE); registerBiomeToDictionary(BOPBiomes.steppe, Type.PLAINS, Type.SANDY, Type.HOT, Type.DRY); registerBiomeToDictionary(BOPBiomes.temperate_rainforest, Type.FOREST, Type.LUSH, Type.WET, Type.DENSE); registerBiomeToDictionary(BOPBiomes.tropical_rainforest, Type.JUNGLE, Type.LUSH, Type.HOT, Type.WET, Type.DENSE); diff --git a/src/main/java/biomesoplenty/common/world/layer/GenLayerRiverMixBOP.java b/src/main/java/biomesoplenty/common/world/layer/GenLayerRiverMixBOP.java index dd0e074df..92efa2dd0 100644 --- a/src/main/java/biomesoplenty/common/world/layer/GenLayerRiverMixBOP.java +++ b/src/main/java/biomesoplenty/common/world/layer/GenLayerRiverMixBOP.java @@ -47,7 +47,7 @@ public class GenLayerRiverMixBOP extends BOPGenLayer { if (riverValues[i] == BiomeGenBase.river.biomeID) { - if (biomeIds[i] == BiomeGenBase.icePlains.biomeID || (BOPBiomes.frozen_desert.isPresent() && biomeIds[i] == BOPBiomes.frozen_desert.get().biomeID) || (BOPBiomes.frost_forest.isPresent() && biomeIds[i] == BOPBiomes.frost_forest.get().biomeID) || (BOPBiomes.alps.isPresent() && biomeIds[i] == BOPBiomes.alps.get().biomeID)) + if (biomeIds[i] == BiomeGenBase.icePlains.biomeID || (BOPBiomes.frozen_desert.isPresent() && biomeIds[i] == BOPBiomes.frozen_desert.get().biomeID) || (BOPBiomes.snowy_forest.isPresent() && biomeIds[i] == BOPBiomes.snowy_forest.get().biomeID) || (BOPBiomes.alps.isPresent() && biomeIds[i] == BOPBiomes.alps.get().biomeID)) { out[i] = BiomeGenBase.frozenRiver.biomeID; }