diff --git a/src/main/java/com/terraforged/mod/biome/ModBiomes.java b/src/main/java/com/terraforged/mod/biome/ModBiomes.java index a5503bd..dcbff0d 100644 --- a/src/main/java/com/terraforged/mod/biome/ModBiomes.java +++ b/src/main/java/com/terraforged/mod/biome/ModBiomes.java @@ -39,7 +39,7 @@ public class ModBiomes { private static final ArrayList biomes = new ArrayList<>(); - public static final Biome BRYCE = register(new Bryce()); + /*public static final Biome BRYCE = register(new Bryce()); public static final Biome COLD_STEPPE = register(new ColdSteppe()); public static final Biome ERODED_PINNACLE = register(new StoneForest()); public static final Biome FIR_FOREST = register(new FirForest()); @@ -53,7 +53,7 @@ public class ModBiomes { public static final Biome SNOWY_TAIGA_SCRUB = register(new SnowyTaigaScrub()); public static final Biome STEPPE = register(new Steppe()); public static final Biome TAIGA_SCRUB = register(new TaigaScrub()); - public static final Biome WARM_BEACH = register(new WarmBeach()); + public static final Biome WARM_BEACH = register(new WarmBeach());*/ private static Biome register(BiomeVariant biome) { biomes.add(biome); diff --git a/src/main/java/com/terraforged/mod/biome/map/defaults/DefaultBiomes.java b/src/main/java/com/terraforged/mod/biome/map/defaults/DefaultBiomes.java index fe0935e..092aefe 100644 --- a/src/main/java/com/terraforged/mod/biome/map/defaults/DefaultBiomes.java +++ b/src/main/java/com/terraforged/mod/biome/map/defaults/DefaultBiomes.java @@ -12,9 +12,6 @@ public class DefaultBiomes { if (temperature < 0.25) { return Biomes.SNOWY_BEACH; } - if (temperature > 0.75) { - return ModBiomes.WARM_BEACH; - } return Biomes.BEACH; } @@ -26,17 +23,11 @@ public class DefaultBiomes { } public static Biome defaultLake(float temperature) { - if (temperature < 0.15) { - return ModBiomes.FROZEN_LAKE; - } - return ModBiomes.LAKE; + return Biomes.OCEAN; } public static Biome defaultWetland(float temperature) { - if (temperature < 0.15) { - return ModBiomes.TAIGA_SCRUB; - } - return ModBiomes.MARSHLAND; + return Biomes.SWAMP; } public static Biome defaultOcean(float temperature) { @@ -67,12 +58,6 @@ public class DefaultBiomes { } public static Biome defaultBiome(float temperature) { - if (temperature < 0.3) { - return ModBiomes.TAIGA_SCRUB; - } - if (temperature > 0.7) { - return ModBiomes.SAVANNA_SCRUB; - } return Biomes.PLAINS; } diff --git a/src/main/java/com/terraforged/mod/biome/provider/BiomeHelper.java b/src/main/java/com/terraforged/mod/biome/provider/BiomeHelper.java index 66d1b8c..48d5581 100644 --- a/src/main/java/com/terraforged/mod/biome/provider/BiomeHelper.java +++ b/src/main/java/com/terraforged/mod/biome/provider/BiomeHelper.java @@ -107,8 +107,6 @@ public class BiomeHelper { builder.addLand(BiomeType.TEMPERATE_RAINFOREST, Biomes.PLAINS, 5); builder.addLand(BiomeType.TEMPERATE_FOREST, Biomes.FLOWER_FOREST, 2); builder.addLand(BiomeType.TEMPERATE_FOREST, Biomes.PLAINS, 5); - builder.addLand(BiomeType.TUNDRA, ModBiomes.SNOWY_TAIGA_SCRUB, 2); - builder.addLand(BiomeType.TAIGA, ModBiomes.TAIGA_SCRUB, 2); return builder.build(); } diff --git a/src/main/java/com/terraforged/mod/chunk/TerraSetupFactory.java b/src/main/java/com/terraforged/mod/chunk/TerraSetupFactory.java index c65ba2b..62a0e78 100644 --- a/src/main/java/com/terraforged/mod/chunk/TerraSetupFactory.java +++ b/src/main/java/com/terraforged/mod/chunk/TerraSetupFactory.java @@ -116,19 +116,12 @@ public class TerraSetupFactory { SurfaceManager manager = new SurfaceManager(); manager.replace(Biomes.DEEP_FROZEN_OCEAN, new IcebergsSurface(context, 30, 30)); manager.replace(Biomes.FROZEN_OCEAN, new IcebergsSurface(context, 20, 15)); - manager.append(ModBiomes.BRYCE, new BriceSurface(context.seed)); - manager.append(ModBiomes.ERODED_PINNACLE, new StoneForestSurface(context.seed)); manager.append( new DesertSurface(context), Biomes.DESERT, Biomes.DESERT_HILLS, Biomes.DESERT_LAKES ); - manager.replace( - new SwampSurface(), - Biomes.SWAMP.delegate.get(), - ModBiomes.MARSHLAND - ); manager.append( new ForestSurface(context), Biomes.FOREST, diff --git a/src/main/java/com/terraforged/mod/chunk/test/Test.java b/src/main/java/com/terraforged/mod/chunk/test/Test.java index 80b7061..5047739 100644 --- a/src/main/java/com/terraforged/mod/chunk/test/Test.java +++ b/src/main/java/com/terraforged/mod/chunk/test/Test.java @@ -29,6 +29,7 @@ import com.terraforged.mod.biome.ModBiomes; import com.terraforged.world.terrain.Terrain; import com.terraforged.world.terrain.Terrains; import net.minecraft.world.biome.Biome; +import net.minecraft.world.biome.Biomes; public class Test { @@ -43,6 +44,6 @@ public class Test { } public static Biome getBiome() { - return ModBiomes.ERODED_PINNACLE; + return Biomes.OCEAN; } }