Add support for new 1.1 biomes (beach, forest hills, desert hills, taiga hills, small mountains)

colorschemes/default.txt

@@ -324,6 +324,11 @@ Biome Mapping
 [ICE_MOUNTAINS]	255	255	255	255	204	204	204	255	128	128	128	255	102	102	102	255
 [MUSHROOM_ISLAND]	255	111	207	255	204	89	166	255	128	56	104	255	102	44	83	255
 [MUSHROOM_SHORE]	255	0	128	255	204	0	102	255	128	0	64	255	102	0	51	255
+[BEACH]	255	206	75	255	230	185	68	255	255	206	75	255	179	144	53	255
+[DESERT_HILLS]	255	146	51	255	230	131	46	255	255	146	51	255	179	102	36	255
+[FOREST_HILLS]	0	162	100	255	0	146	90	255	0	162	100	255	0	113	70	255
+[TAIGA_HILLS]	178	212	117	255	160	191	105	255	178	212	117	255	125	148	82	255
+[SMALL_MOUNTAINS]	184	103	33	255	166	93	30	255	184	103	33	255	129	72	23	255
 Rainfall/Temperature Mapping
 [RAINFALL-0.0]	120	120	120	255	96	96	96	255	60	60	60	255	48	48	48	255
 [RAINFALL-1.0]	38	92	255	255	30	73	204	255	19	46	127	255	15	36	102	255

colorschemes/flames.txt

@@ -324,6 +324,11 @@ Biome Mapping
 [ICE_MOUNTAINS]	255	255	255	255	204	204	204	255	128	128	128	255	102	102	102	255
 [MUSHROOM_ISLAND]	255	111	207	255	204	89	166	255	128	56	104	255	102	44	83	255
 [MUSHROOM_SHORE]	255	0	128	255	204	0	102	255	128	0	64	255	102	0	51	255
+[BEACH]	255	206	75	255	230	185	68	255	255	206	75	255	179	144	53	255
+[DESERT_HILLS]	255	146	51	255	230	131	46	255	255	146	51	255	179	102	36	255
+[FOREST_HILLS]	0	162	100	255	0	146	90	255	0	162	100	255	0	113	70	255
+[TAIGA_HILLS]	178	212	117	255	160	191	105	255	178	212	117	255	125	148	82	255
+[SMALL_MOUNTAINS]	184	103	33	255	166	93	30	255	184	103	33	255	129	72	23	255
 Rainfall/Temperature Mapping
 [RAINFALL-0.0]	120	120	120	255	96	96	96	255	60	60	60	255	48	48	48	255
 [RAINFALL-1.0]	38	92	255	255	30	73	204	255	19	46	127	255	15	36	102	255

colorschemes/ovocean.txt

@@ -324,6 +324,11 @@ Biome Mapping
 [ICE_MOUNTAINS]	255	255	255	255	204	204	204	255	128	128	128	255	102	102	102	255
 [MUSHROOM_ISLAND]	255	111	207	255	204	89	166	255	128	56	104	255	102	44	83	255
 [MUSHROOM_SHORE]	255	0	128	255	204	0	102	255	128	0	64	255	102	0	51	255
+[BEACH]	255	206	75	255	230	185	68	255	255	206	75	255	179	144	53	255
+[DESERT_HILLS]	255	146	51	255	230	131	46	255	255	146	51	255	179	102	36	255
+[FOREST_HILLS]	0	162	100	255	0	146	90	255	0	162	100	255	0	113	70	255
+[TAIGA_HILLS]	178	212	117	255	160	191	105	255	178	212	117	255	125	148	82	255
+[SMALL_MOUNTAINS]	184	103	33	255	166	93	30	255	184	103	33	255	129	72	23	255
 Rainfall/Temperature Mapping
 [RAINFALL-0.0]	120	120	120	255	96	96	96	255	60	60	60	255	48	48	48	255
 [RAINFALL-1.0]	38	92	255	255	30	73	204	255	19	46	127	255	15	36	102	255

colorschemes/sk89q.txt

@@ -175,6 +175,11 @@ Biome Mapping
 [ICE_MOUNTAINS]	255	255	255	255	204	204	204	255	128	128	128	255	102	102	102	255
 [MUSHROOM_ISLAND]	255	111	207	255	204	89	166	255	128	56	104	255	102	44	83	255
 [MUSHROOM_SHORE]	255	0	128	255	204	0	102	255	128	0	64	255	102	0	51	255
+[BEACH]	255	206	75	255	230	185	68	255	255	206	75	255	179	144	53	255
+[DESERT_HILLS]	255	146	51	255	230	131	46	255	255	146	51	255	179	102	36	255
+[FOREST_HILLS]	0	162	100	255	0	146	90	255	0	162	100	255	0	113	70	255
+[TAIGA_HILLS]	178	212	117	255	160	191	105	255	178	212	117	255	125	148	82	255
+[SMALL_MOUNTAINS]	184	103	33	255	166	93	30	255	184	103	33	255	129	72	23	255
 Rainfall/Temperature Mapping
 [RAINFALL-0.0]	120	120	120	255	96	96	96	255	60	60	60	255	48	48	48	255
 [RAINFALL-1.0]	38	92	255	255	30	73	204	255	19	46	127	255	15	36	102	255

pom.xml

@@ -99,7 +99,7 @@
 		<dependency>
 			<groupId>org.bukkit</groupId>
 			<artifactId>bukkit</artifactId>
-			<version>[1.0.0-R1-SNAPSHOT,)</version>
+			<version>[1.1-R1-SNAPSHOT,)</version>
 			<type>jar</type>
 			<scope>compile</scope>
 		</dependency>

src/main/java/org/dynmap/bukkit/NewMapChunkCache.java

@@ -798,5 +798,10 @@ public class NewMapChunkCache implements MapChunkCache {
         biome_to_bmap[Biome.ICE_MOUNTAINS.ordinal()] = BiomeMap.ICE_MOUNTAINS;
         biome_to_bmap[Biome.MUSHROOM_ISLAND.ordinal()] = BiomeMap.MUSHROOM_ISLAND;
         biome_to_bmap[Biome.MUSHROOM_SHORE.ordinal()] = BiomeMap.MUSHROOM_SHORE;
+        biome_to_bmap[Biome.BEACH.ordinal()] = BiomeMap.BEACH;
+        biome_to_bmap[Biome.DESERT_HILLS.ordinal()] = BiomeMap.DESERT_HILLS;
+        biome_to_bmap[Biome.FOREST_HILLS.ordinal()] = BiomeMap.FOREST_HILLS;
+        biome_to_bmap[Biome.TAIGA_HILLS.ordinal()] = BiomeMap.TAIGA_HILLS;
+        biome_to_bmap[Biome.SMALL_MOUNTAINS.ordinal()] = BiomeMap.SMALL_MOUNTAINS;
     }
 }

src/main/java/org/dynmap/common/BiomeMap.java

@@ -23,5 +23,10 @@ public enum BiomeMap {
     ICE_PLAINS,
     ICE_MOUNTAINS,
     MUSHROOM_ISLAND,
-    MUSHROOM_SHORE
+    MUSHROOM_SHORE,
+    BEACH,
+    DESERT_HILLS,
+    FOREST_HILLS,
+    TAIGA_HILLS,
+    SMALL_MOUNTAINS
 }