Archived
0

Merge tag 'WG-1' into develop

World Generator Gen1
This commit is contained in:
2018-08-07 21:42:24 +03:00
3 changed files with 103 additions and 158 deletions

View File

@@ -2,6 +2,8 @@ package mc.core.world;
import lombok.Getter;
import java.util.EnumSet;
public enum Biome {
OCEAN(0, "Ocean", 0x0000cd),
PLAINS(1, "Plains", 0x008000),
@@ -23,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;
@@ -38,6 +51,8 @@ public enum Biome {
@Getter
private final int color;
private final static EnumSet<Biome> waterBiomes = EnumSet.of(OCEAN, RIVER, FROZEN_OCEAN, FROZEN_RIVER, DEEP_OCEAN);
Biome(int id, String name, int color) {
this.id = id;
this.name = name;
@@ -47,4 +62,8 @@ public enum Biome {
public static Biome getById(int id) {
return Biome.values()[id];
}
public static boolean isWaterBiome (Biome biome) {
return waterBiomes.contains(biome);
}
}