From ff71892fcb47ec5d0e39add4377751f23480d5e4 Mon Sep 17 00:00:00 2001 From: Forwolk Date: Sun, 5 Aug 2018 17:51:24 +0300 Subject: [PATCH] Biomes refactoring --- core/src/main/java/mc/core/world/Biome.java | 21 ++++++++++++++----- .../generator/SeedBasedWorldGenerator.java | 4 ++-- 2 files changed, 18 insertions(+), 7 deletions(-) diff --git a/core/src/main/java/mc/core/world/Biome.java b/core/src/main/java/mc/core/world/Biome.java index 71a0fad..6753ad4 100644 --- a/core/src/main/java/mc/core/world/Biome.java +++ b/core/src/main/java/mc/core/world/Biome.java @@ -25,13 +25,24 @@ public enum Biome { DESERT_HILLS(17, "Desert hills", 0xffe4b5), FOREST_HILLS(18, "Forest hills", 0x006400), TAIGA_HILLS(19, "Taiga hills", 0xf0f8ff), - EXTREME_HILLS_EDGE(20, "Extreme hills edge", 0xffffff), + EXTREME_HILLS_ED(20, "Extreme hills edge", 0xffffff), JUNGLE(21, "Jungle", 0xadff2f), JUNGLE_HILLS(22, "Jungle hills", 0xadff2f), - DEEP_OCEAN(23, "Deep ocean", 0x000080), - TUNDRA(24, "Tundra", 0xc0c0c0), - SAVANNA(25, "Savana", 0xcd8513), - SAVANNA_FOREST(26, "Savana forest", 0x8b4513); + JUNGLE_HILLS_2(23, "Jungle hills", 0xadff2f), //WTF? + DEEP_OCEAN(24, "Deep ocean", 0x000080), + STONE_BEACH(25, "Stone beach", 0xffffff), + COLD_BEACH(26, "Cold beach", 0xffffff), + BIRCH_FOREST(27, "Birch forest", 0xffffff), + BIRCH_FOREST_HILLS(28, "Birch forest hills", 0xffffff), + DARK_FOREST(29, "Dark forest", 0xffffff), + COLD_TAIGA(30, "Cold taiga", 0xffffff), + COLD_TAIGA_HILLS(31, "Cold taiga hills", 0xffffff), + MEGA_TAIGA(32, "Mega taiga", 0xffffff), + MEGA_TAIGA_HILLS(33, "Mega taiga hills", 0xffffff), + EXTREME_HILLS_PLUS(34, "Extreme hills plus", 0xffffff), + SAVANNA(35, "Savana", 0xcd8513), + SAVANNA_PLATO(36, "Savana plato", 0x8b4513), + VOID(127, "Void", 0xffffff); @Getter private final int id; diff --git a/generated_world/src/main/java/mc/world/generated_world/generator/SeedBasedWorldGenerator.java b/generated_world/src/main/java/mc/world/generated_world/generator/SeedBasedWorldGenerator.java index f1f63de..e7ffeff 100644 --- a/generated_world/src/main/java/mc/world/generated_world/generator/SeedBasedWorldGenerator.java +++ b/generated_world/src/main/java/mc/world/generated_world/generator/SeedBasedWorldGenerator.java @@ -299,7 +299,7 @@ public class SeedBasedWorldGenerator implements WorldGenerator { if (temperature == Temperature.FROST) { if (wetness == Wetness.DRIEST || wetness == Wetness.DRY) { - return Biome.TUNDRA; + return Biome.COLD_TAIGA; } else { if (height > HILLS_HEIGHT) { return Biome.ICE_MOUNTAINS; @@ -353,7 +353,7 @@ public class SeedBasedWorldGenerator implements WorldGenerator { return Biome.FOREST; } } else { - return Biome.SAVANNA_FOREST; + return Biome.SAVANNA_PLATO; } }