Fix nether render in 1.1 and 1.2

Conflicts:
	src/main/java/org/dynmap/bukkit/DynmapPlugin.java

build.xml

@@ -1,60 +0,0 @@
-<project name="dynmap" default="dist" basedir=".">
-	   <property name="bukkit.jar" location="C:\Users\Bob\Desktop\minecraft_server\bukkit-0.0.1-SNAPSHOT.jar"/>
-	    <property name="minecraft" location="C:\Users\Bob\Desktop\minecraft_server"/>
-	    <property name="plugins" location="${minecraft}/plugins/"/>
-	    <property name="http_root" location="/srv/http/dynmap/"/>
-	<property name="pluginname" value="dynmap"/>
-
-	<property name="src" location="src"/>
-	<property name="bin" location="bin"/>
-	<property name="dist" location="dist"/>
-	
-	<target name="init">
-		<mkdir dir="${bin}"/>
-	</target>
-	
-	<target name="compile" depends="init">
-		<javac srcdir="${src}/main/java" destdir="${bin}" classpath="${bukkit.jar}" debug="on" includeantruntime="false" />
-	</target>
-	
-	<target name="dist" depends="compile">
-		<mkdir dir="${dist}"/>
-		<jar jarfile="${dist}/${pluginname}.jar">
-			<fileset dir="${bin}"/>
-			<fileset file="${src}/main/resources/plugin.yml"/>
-			<fileset file="${src}/main/resources/configuration.txt"/>
-			<fileset file="${src}/main/resources/custom-lightings.txt"/>
-			<fileset file="${src}/main/resources/custom-perspectives.txt"/>
-			<fileset file="${src}/main/resources/custom-shaders.txt"/>
-			<fileset file="${src}/main/resources/lightings.txt"/>
-			<fileset file="${src}/main/resources/models.txt"/>
-			<fileset file="${src}/main/resources/perspectives.txt"/>
-			<fileset file="${src}/main/resources/texture.txt"/>
-			<fileset file="${src}/main/resources/worlds.txt"/>
-			<zipfileset file="${src}/main/resources/colors.txt"/>
-		</jar>
-	</target>
-	
-	<target name="deploy" depends="dist">
-		<copy file="${dist}/${pluginname}.jar" todir="${plugins}"/>
-		<copy todir="${http_root}">
-			<fileset dir="web"/>
-		</copy>
-	</target>
-	
-	<target name="release" depends="dist">
-		<delete file="${pluginname}.zip"/>
-		<zip destfile="${pluginname}.zip">
-			<zipfileset dir="." includes="README.md" fullpath="readme.txt"/>
-			<zipfileset dir="." includes="build.xml"/>
-			<zipfileset dir="${dist}" includes="*.jar"/>
-			<zipfileset dir="${src}" includes="*.java" prefix="src/"/>
-			<zipfileset dir="${web}" includes="**" prefix="web/"/>
-		</zip>
-	</target>
-	
-	<target name="clean">
-		<delete dir="${bin}"/>
-		<delete dir="${dist}"/>
-	</target>
-</project>

build_parameters.xml

@@ -1,6 +0,0 @@
-<project name="dynmap_parameters" basedir=".">
-	<property name="bukkit.jar" location="../../bukkit.jar"/>
-	<property name="minecraft" location="../../"/>
-	<property name="plugins" location="${minecraft}/plugins/"/>
-	<property name="http_root" location="/srv/http/dynmap/"/>
-</project>

colorschemes/default.txt

@@ -1,335 +0,0 @@
-Stone
-1	120	120	120	255	96	96	96	255	60	60	60	255	48	48	48	255
-Grass
-2	117	176	73	255	93	140	58	255	58	88	36	255	46	70	29	255
-Dirt
-3	134	96	67	255	107	76	53	255	67	48	33	255	53	38	26	255
-Cobblestone
-4	115	115	115	255	92	92	92	255	57	57	57	255	46	46	46	255
-Wooden Plank
-5	157	128	79	255	125	102	63	255	78	64	39	255	62	51	31	255
-Sapling
-6	120	120	120	0	96	96	96	0	60	60	60	0	48	48	48	0
-Bedrock
-7	84	84	84	255	67	67	67	255	42	42	42	255	33	33	33	255
-Water
-8	38	92	255	51	30	73	204	51	19	46	127	51	15	36	102	51
-Stationary Water
-9	38	92	255	51	30	73	204	51	19	46	127	51	15	36	102	51
-Lava
-10	255	90	0	255	204	72	0	255	127	45	0	255	102	36	0	255
-Stationary Lava
-11	255	90	0	255	204	72	0	255	127	45	0	255	102	36	0	255
-Sand
-12	218	210	158	255	174	168	126	255	109	105	79	255	87	84	63	255
-Gravel
-13	136	126	126	255	108	100	100	255	68	63	63	255	54	50	50	255
-Gold Ore
-14	143	140	125	255	114	112	100	255	71	70	62	255	57	56	50	255
-Iron Ore
-15	136	130	127	255	108	104	101	255	68	65	63	255	54	52	50	255
-Coal Ore
-16	115	115	115	255	92	92	92	255	57	57	57	255	46	46	46	255
-Wood - Normal
-17 102 81 51 255 125 102 63 255 78 64 39 255 40 32 20 255
-17:0 102 81 51 255 125 102 63 255 78 64 39 255 40 32 20 255
-Wood - Spruce (Red/dark wood)
-17:1 75 44 24 255 125 102 63 255 78 64 39 255 30 18 10 255
-Wood - Birch (light wood)
-17:2 191 191 191 255 125 102 63 255 78 64 39 255 76 76 76 255
-Leaves
-18	60	192	41	100	48	153	32	100	30	96	20	100	24	76	16	100
-Sponge
-19	193	193	65	255	174	174	47	255	97	97	5	255	76	76	20	255
-Glass
-20	255	255	255	64	204	204	204	64	127	127	127	64	102	102	102	64
-Lapis Lazuli Ore
-21	23	68	196	255	18	56	158	255	14	43	122	255	14	43	78	255
-Lapis Lazuli Block
-22	23	68	196	255	18	56	158	255	14	43	122	255	14	43	78	255
-Dispenser
-23	96	96	96	255	76	76	76	255	48	48	48	255	38	38	38	255
-Sandstone
-24	218	210	158	255	174	168	126	255	109	105	79	255	87	84	63	255
-Note Block
-25	125	91	38	255	100	72	30	255	62	45	19	255	50	36	15	255
-Bed
-26	200	20	20	255	160	16	16	255	100	10	10	255	80	8	8	255
-Powered Rail
-27	150	134	102	180	120	107	81	180	75	67	51	180	60	53	40	180
-Detector Rail
-28	150	134	102	180	120	107	81	180	75	67	51	180	60	53	40	180
-Sticky Piston
-29	157	128	79	255	96	96	96	255	78	64	39	255	48	48	48	255
-Cobweb
-30	138	145	145	255	110	115	115	255	69	72	72	255	55	57	57	255
-Tall Grass
-31	97	156	53	255	73	120	38	255	38	68	16	255	26	50	9	255
-Dead Shrubs
-32	75	44	24	255	60	35	19	255	37	22	12	255	30	18	10	255
-Piston
-33	157	128	79	255	96	96	96	255	78	64	39	255	48	48	48	255
-Piston Head
-34	157	128	79	255	96	96	96	255	78	64	39	255	48	48	48	255
-Wool
-35	222	222	222	255	177	177	177	255	111	111	111	255	88	88	88	255
-35:0	222	222	222	255	177	177	177	255	111	111	111	255	88	88	88	255
-Wool - Orange
-35:1	204	111	48	255	162	89	38	255	102	56	24	255	81	44	19	255
-Wool - Magenta
-35:2	166	66	175	255	133	53	140	255	83	33	87	255	66	26	69	255
-Wool - Light Blue
-35:3	91	121	185	255	73	96	147	255	46	61	92	255	36	48	73	255
-Wool - Yellow
-35:4	170	158	24	255	135	126	19	255	85	79	12	255	67	62	10	255
-Wool - Light Green
-35:5	51	165	42	255	41	131	33	255	26	82	21	255	20	65	17	255
-Wool - Pink
-35:6	190	115	135	255	151	92	108	255	95	57	67	255	75	46	53	255
-Wool - Gray
-35:7	58	58	58	255	47	47	47	255	29	29	29	255	23	23	23	255
-Wool - Light Gray
-35:8	138	145	145	255	110	115	115	255	69	72	72	255	55	57	57	255
-Wool - Cyan
-35:9	34	102	131	255	27	81	104	255	17	51	65	255	13	40	52	255
-Wool - Purple
-35:10	113	47	171	255	90	37	136	255	57	24	85	255	45	19	68	255
-Wool - Blue
-35:11	34	44	134	255	27	35	107	255	17	22	67	255	13	18	53	255
-Wool - Brown
-35:12	75	44	24	255	60	35	19	255	37	22	12	255	30	18	10	255
-Wool - Dark Green
-35:13	49	67	21	255	39	53	17	255	24	34	10	255	19	27	8	255
-Wool - Red
-35:14	143	39	36	255	114	31	28	255	71	20	18	255	57	16	14	255
-Wool - Black
-35:15	24	20	20	255	19	16	16	255	12	10	10	255	9	8	8	255
-Yellow Flower
-37	255	255	0	255	204	204	0	255	127	127	0	255	102	102	0	255
-Red Rose
-38	255	0	0	255	204	0	0	255	127	0	0	255	102	0	0	255
-Brown Mushroom
-39	204	153	120	32	145	109	85	32	114	86	67	32	73	64	58	32
-Red Mushroom
-40	255	43	43	32	196	29	38	32	186	105	109	32	124	64	64	32
-Gold Block
-41	232	245	46	255	185	196	36	255	116	122	23	255	92	98	18	255
-Iron Block
-42	191	191	191	255	152	152	152	255	95	95	95	255	76	76	76	255
-Double Stone Slab
-43	200	200	200	255	160	160	160	255	100	100	100	255	80	80	80	255
-43:0	200	200	200	255	160	160	160	255	100	100	100	255	80	80	80	255
-43:6	200	200	200	255	160	160	160	255	100	100	100	255	80	80	80	255
-Double Stone Slab - Sandstone
-43:1	218	210	158	255	174	168	126	255	109	105	79	255	87	84	63	255
-Double Stone Slab - Wood
-43:2	157	128	79	255	125	102	63	255	78	64	39	255	62	51	31	255
-Double Stone Slab - Cobblestone
-43:3	115	115	115	255	92	92	92	255	57	57	57	255	46	46	46	255
-Double Stone Slab - Brick 
-43:4	170	86	62	255	136	68	49	255	85	43	31	255	68	34	24	255
-Double Stone Slab - Stone Brick
-43:5	200	200	200	255	160	160	160	255	100	100	100	255	80	80	80	255
-Stone Slab
-44	200	200	200	255	160	160	160	255	100	100	100	255	80	80	80	255
-44:0	200	200	200	255	160	160	160	255	100	100	100	255	80	80	80	255
-44:6	200	200	200	255	160	160	160	255	100	100	100	255	80	80	80	255
-Stone Slab - Sandstone
-44:1	218	210	158	255	174	168	126	255	109	105	79	255	87	84	63	255
-Stone Slab - Wood
-44:2	157	128	79	255	125	102	63	255	78	64	39	255	62	51	31	255
-Stone Slab - Cobblestone
-44:3	115	115	115	255	92	92	92	255	57	57	57	255	46	46	46	255
-Stone Slab - Brick 
-44:4	170	86	62	255	136	68	49	255	85	43	31	255	68	34	24	255
-Stone Slab - Stone Brick
-44:5	200	200	200	255	160	160	160	255	100	100	100	255	80	80	80	255
-Brick
-45	170	86	62	255	136	68	49	255	85	43	31	255	68	34	24	255
-TNT
-46	160	83	65	255	128	66	52	255	80	41	32	255	64	33	26	255
-Bookshelf
-47	125	91	38	192	100	72	30	192	62	45	19	192	50	36	15	192
-Moss Stone
-48	115	115	115	255	92	92	92	255	57	57	57	255	46	46	46	255
-Obsidian
-49	26	11	43	255	20	8	34	255	13	5	21	255	10	4	17	255
-Torch
-50	159	127	80	255	98	88	20	0	245	220	50	255	196	176	40	0
-Fire
-51	255	170	30	200	204	136	24	200	127	85	15	200	102	68	12	200
-Monster Spawner
-52	0	150	110	196	0	150	130	196	0	150	110	196	0	150	130	196
-Wooden Stair
-53	157	128	79	255	125	102	63	255	78	64	39	255	62	51	31	255
-53:4	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0
-Chest
-54	125	91	38	255	100	72	30	255	62	45	19	255	50	36	15	255
-Redstone Wire
-55	240	30	30	64	160	20	20	64	120	15	15	64	100	12	12	64
-Diamond Ore
-56	129	140	143	255	103	112	114	255	64	70	71	255	51	56	57	255
-Diamond Block
-57	45	166	152	255	36	132	121	255	22	83	76	255	18	66	60	255
-Workbench
-58	114	88	56	255	91	70	44	255	57	44	28	255	45	35	22	255
-Crops
-59	146	192	0	255	116	153	0	255	73	96	0	255	58	76	0	255
-Farmland
-60	95	58	30	255	76	46	24	255	47	29	15	255	38	23	12	255
-Furnace
-61	96	96	96	255	76	76	76	255	48	48	48	255	38	38	38	255
-Burning Furnace
-62	96	96	96	255	76	76	76	255	48	48	48	255	38	38	38	255
-Sign Post
-63	111	91	54	255	88	72	43	255	55	45	27	255	44	36	21	255
-Wooden Door
-64	136	109	67	255	108	87	53	255	68	54	33	255	54	43	26	255
-Ladder
-65	181	140	64	32	144	112	51	32	90	70	32	32	72	56	25	32
-Minecart Tracks
-66	150	134	102	180	120	107	81	180	75	67	51	180	60	53	40	180
-Cobblestone Stairs
-67	115	115	115	255	92	92	92	255	57	57	57	255	46	46	46	255
-Wall Sign
-68	111	91	54	255	88	72	43	255	55	45	27	255	44	36	21	255
-Lever
-69	111	91	54	255	88	72	43	255	55	45	27	255	44	36	21	255
-Stone Pressure Plate
-70	120	120	120	255	96	96	96	255	60	60	60	255	48	48	48	255
-Iron Door
-71	191	191	191	255	152	152	152	255	95	95	95	255	76	76	76	255
-Wooden Pressure Plate
-72	111	91	54	255	88	72	43	255	55	45	27	255	44	36	21	255
-Redstone Ore
-73	131	107	107	255	104	85	85	255	65	53	53	255	52	42	42	255
-Glowing Redstone Ore
-74	131	107	107	255	104	85	85	255	65	53	53	255	52	42	42	255
-Redstone Torch off
-75	159	127	80	255	72	56	25	0	181	140	64	255	144	112	51	0
-Redstone Torch on
-76	159	127	80	255	102	0	0	0	255	0	0	255	204	0	0	0
-Stone Button
-77	120	120	120	255	96	96	96	255	60	60	60	255	48	48	48	255
-Snow
-78	255	255	255	255	204	204	204	255	127	127	127	255	102	102	102	255
-Ice
-79	83	113	163	51	66	90	130	51	41	56	81	51	33	45	65	51
-Snow Block
-80	250	250	250	255	200	200	200	255	125	125	125	255	100	100	100	255
-Cactus
-81	25	120	25	255	20	96	20	255	12	60	12	255	10	48	10	255
-Clay
-82	151	157	169	255	120	125	135	255	75	78	84	255	60	62	67	255
-Sugar Cane
-83	193	234	150	255	154	187	120	255	96	117	75	255	77	93	60	255
-Jukebox
-84	125	91	38	255	100	72	30	255	62	45	19	255	50	36	15	255
-Fence
-85	127	98	49	96	95	72	33	96	48	34	9	96	32	21	21	96
-Pumpkin
-86	255	115	0	200	204	92	0	200	126	57	0	200	102	46	0	200
-Netherrack
-87	166	89	89	255	141	80	62	255	135	15	15	255	96	6	6	255
-Soulsand
-88	133	109	94	255	121	97	82	255	90	70	57	255	79	59	46	255
-Glowstone
-89	249	212	156	255	255	188	94	255	192	143	70	255	122	91	44	255
-Portal
-90	140	0	196	128	120	0	196	128	140	0	196	128	120	0	196	128
-Jack-o-lantern
-91	255	115	0	255	204	92	0	255	126	57	0	255	102	46	0	255
-Cake Block
-92	234	234	234	255	210	210	210	255	203	203	203	255	190	190	190	255
-Redstone Repeater off
-93	159	127	80	255	72	56	25	0	181	140	64	255	144	112	51	0
-Redstone Repeater on
-94	159	127	80	255	102	0	0	0	255	0	0	255	204	0	0	0
-Locked Chest
-95	125	91	38	255	100	72	30	255	62	45	19	255	50	36	15	255
-Trap Door
-96	111	91	54	255	88	72	43	255	55	45	27	255	44	36	21	255
-Stone - Sliverfish
-97	120	120	120	255	96	96	96	255	60	60	60	255	48	48	48	255
-Stone Brick
-98	120	120	120	255	96	96	96	255	60	60	60	255	48	48	48	255
-Huge Brown Mushroom
-99	204	153	120	255	145	109	85	255	114	86	67	255	73	64	58	255
-Huge Red Mushroom
-100	255	43	43	255	196	29	38	255	186	105	109	255	124	64	64	255
-Iron Bars
-101	191	191	191	96	152	152	152	96	95	95	95	96	76	76	76	96
-Glass Pane
-102	255	255	255	64	204	204	204	64	127	127	127	64	102	102	102	64
-Melon
-103	193	193	65	255	174	174	47	255	97	97	5	255	76	76	20	255
-Pumpkin Stem
-104	146	192	0	255	116	153	0	255	73	96	0	255	58	76	0	255
-Melon Stem
-105	146	192	0	255	116	153	0	255	73	96	0	255	58	76	0	255
-Vines
-106	60	192	41	100	48	153	32	100	30	96	20	100	24	76	16	100
-Fence Gate
-107	127	98	49	96	95	72	33	96	48	34	9	96	32	21	21	96
-Brick Stairs
-108	170	86	62	255	136	68	49	255	85	43	31	255	68	34	24	255
-Stone Stairs
-109	120	120	120	255	96	96	96	255	60	60	60	255	48	48	48	255
-Mycelium
-110 110  98 104 255 88  78  83  255 55  49  52  255 44  39  42  255 
-Lilly pad
-111 117	176	73	255	93	140	58	255	58	88	36	255	46	70	29	255
-Nether brick
-112 166	89	89	255	141	80	62	255	135	15	15	255	96	6	6	255
-Nether brick fence
-113 166	89	89	96	141	80	62	96	135	15	15	96	96	6	6	96
-Nether brick stairs
-114 166	89	89	255	141	80	62	255	135	15	15	255	96	6	6	255
-Nether Wart
-115 142 19  21  96  113 15  17  96  71  10  10  96  57  7   8   96
-Enchantment table
-116 88  23  22  255 29  10  16 255  17   7  10  255 15  5   8   255
-Brewing stand
-117 114 114 114 96  91  91  91  96  67  67  67  96  46  46  46  96
-Cauldron
-118 74  74  74  255 59  59  59 255  37  37  37  255 30  30  30  255
-Air portal
-119 26	11	43	255	20	8	34	255	13	5	21	255	10	4	17	255
-Air portal frame
-120 113 133 104 255 90 106  83 255  56  66  52  255 45  54  42  255
-White stone
-121 224 226 169 255 179 180 135 255 112 113 85  255 90  90  66  255
-Dragon Egg
-122	26	11	43	255	20	8	34	255	13	5	21	255	10	4	17	255
-Biome Mapping
-[RAINFOREST]	49	67	21	255	39	54	17	255	25	34	11	255	20	27	8	255
-[SWAMPLAND]	64	128	0	255	51	102	0	255	32	64	0	255	26	51	0	255
-[SEASONAL_FOREST]	51	165	42	255	41	132	34	255	26	83	21	255	20	66	17	255
-[FOREST]	0	128	64	255	0	102	51	255	0	64	32	255	0	51	26	255
-[SAVANNA]	58	58	58	255	46	46	46	255	29	29	29	255	23	23	23	255
-[SHRUBLAND]	170	158	24	255	136	126	19	255	85	79	12	255	68	63	10	255
-[TAIGA]	204	255	102	255	163	204	82	255	102	128	51	255	82	102	41	255
-[DESERT]	255	255	102	255	204	204	82	255	128	128	51	255	102	102	41	255
-[PLAINS]	255	204	102	255	204	163	82	255	128	102	51	255	102	82	41	255
-[ICE_DESERT]	26	33	103	255	21	26	82	255	13	17	52	255	10	13	41	255
-[TUNDRA]	222	222	222	255	178	178	178	255	111	111	111	255	89	89	89	255
-[HELL]	255	0	0	255	204	0	0	255	128	0	0	255	102	0	0	255
-[SKY]	102	204	255	255	82	163	204	255	51	102	128	255	41	82	102	255
-[OCEAN]	0	0	255	255	0	0	204	255	0	0	128	255	0	0	102	255
-[RIVER]	0	128	255	255	0	102	204	255	0	64	128	255	0	51	102	255
-[EXTREME_HILLS]	128	64	0	255	102	51	0	255	64	32	0	255	51	26	0	255
-[FROZEN_OCEAN]	102	255	204	255	82	204	163	255	51	128	102	255	41	102	82	255
-[FROZEN_RIVER]	102	102	255	255	82	82	204	255	51	51	128	255	41	41	102	255
-[ICE_PLAINS]	102	255	255	255	82	204	204	255	51	128	128	255	41	102	102	255
-[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
-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
-[TEMPERATURE-0.0]	38	92	255	255	30	73	204	255	19	46	127	255	15	36	102	255
-[TEMPERATURE-0.5]	91	121	185	255	73	96	147	255	46	61	92	255	36	48	73	255
-[TEMPERATURE-0.8]	51	165	42	255	41	131	33	255	26	82	21	255	20	65	17	255
-[TEMPERATURE-0.9]	170	158	24	255	135	126	19	255	85	79	12	255	67	62	10	255
-[TEMPERATURE-0.95]	204	111	48	255	162	89	38	255	102	56	24	255	81	44	19	255
-[TEMPERATURE-1.0]	143	39	36	255	114	31	28	255	71	20	18	255	57	16	14	255

colorschemes/flames.txt

@@ -1,335 +0,0 @@
-Stone
-1	120	120	120	255	96	96	96	255	60	60	60	255	48	48	48	255
-Grass
-2	60	113	17	255	50	94	14	255	42	79	12	255	50	94	14	255
-Dirt
-3	134	96	67	255	107	76	53	255	67	48	33	255	53	38	26	255
-Cobblestone
-4	115	115	115	255	92	92	92	255	57	57	57	255	46	46	46	255
-Wooden Plank
-5	157	128	79	255	125	102	63	255	78	64	39	255	62	51	31	255
-Sapling
-6	120	120	120	0	96	96	96	0	60	60	60	0	48	48	48	0
-Bedrock
-7	84	84	84	255	67	67	67	255	42	42	42	255	33	33	33	255
-Water
-8	38	92	255	51	30	73	204	51	19	46	127	51	15	36	102	51
-Stationary Water
-9	38	92	255	51	30	73	204	51	19	46	127	51	15	36	102	51
-Lava
-10	255	90	0	255	204	72	0	255	127	45	0	255	102	36	0	255
-Stationary Lava
-11	255	90	0	255	204	72	0	255	127	45	0	255	102	36	0	255
-Sand
-12	218	210	158	255	174	168	126	255	109	105	79	255	87	84	63	255
-Gravel
-13	136	126	126	255	108	100	100	255	68	63	63	255	54	50	50	255
-Gold Ore
-14	143	140	125	255	114	112	100	255	71	70	62	255	57	56	50	255
-Iron Ore
-15	136	130	127	255	108	104	101	255	68	65	63	255	54	52	50	255
-Coal Ore
-16	115	115	115	255	92	92	92	255	57	57	57	255	46	46	46	255
-Wood - Normal
-17 102 81 51 255 125 102 63 255 78 64 39 255 40 32 20 255
-17:0 102 81 51 255 125 102 63 255 78 64 39 255 40 32 20 255
-Wood - Spruce (Red/dark wood)
-17:1 75 44 24 255 125 102 63 255 78 64 39 255 30 18 10 255
-Wood - Birch (light wood)
-17:2 191 191 191 255 125 102 63 255 78 64 39 255 76 76 76 255
-Leaves
-18	27	69	37	180	22	57	31	180	19	48	25	180	22	57	31	180
-Sponge
-19	193	193	65	255	174	174	47	255	97	97	5	255	76	76	20	255
-Glass
-20	255	255	255	64	204	204	204	64	127	127	127	64	102	102	102	64
-Lapis Lazuli Ore
-21	23	68	196	255	18	56	158	255	14	43	122	255	14	43	78	255
-Lapis Lazuli Block
-22	23	68	196	255	18	56	158	255	14	43	122	255	14	43	78	255
-Dispenser
-23	96	96	96	255	76	76	76	255	48	48	48	255	38	38	38	255
-Sandstone
-24	192	178	110	255	160	148	92	255	134	124	77	255	160	148	92	255
-Note Block
-25	125	91	38	255	100	72	30	255	62	45	19	255	50	36	15	255
-Bed
-26	200	20	20	255	160	16	16	255	100	10	10	255	80	8	8	255
-Powered Rail
-27	150	134	102	180	120	107	81	180	75	67	51	180	60	53	40	180
-Detector Rail
-28	150	134	102	180	120	107	81	180	75	67	51	180	60	53	40	180
-Sticky Piston
-29	157	128	79	255	96	96	96	255	78	64	39	255	48	48	48	255
-Cobweb
-30	138	145	145	255	110	115	115	255	69	72	72	255	55	57	57	255
-Tall Grass
-31	97	156	53	255	73	120	38	255	38	68	16	255	26	50	9	255
-Dead Shrubs
-32	75	44	24	255	60	35	19	255	37	22	12	255	30	18	10	255
-Piston
-33	157	128	79	255	96	96	96	255	78	64	39	255	48	48	48	255
-Piston Head
-34	157	128	79	255	96	96	96	255	78	64	39	255	48	48	48	255
-Wool
-35	247	255	239	255	244	251	236	255	204	210	197	255	244	251	236	255
-35:0	247	255	239	255	244	251	236	255	204	210	197	255	244	251	236	255
-Wool - Orange
-35:1	227	128	52	255	224	126	51	255	187	105	42	255	224	126	51	255
-Wool - Magenta
-35:2	185	76	188	255	183	75	186	255	153	63	155	255	183	75	186	255
-Wool - Light Blue
-35:3	102	139	199	255	100	137	196	255	84	114	164	255	100	137	196	255
-Wool - Yellow
-35:4	189	181	26	255	187	178	26	255	156	149	22	255	187	178	26	255
-Wool - Light Green
-35:5	57	189	45	255	56	186	44	255	47	156	37	255	56	186	44	255
-Wool - Pink
-35:6	211	132	145	255	209	130	143	255	174	109	120	255	209	130	143	255
-Wool - Gray
-35:7	65	67	63	255	64	66	62	255	54	55	52	255	64	66	62	255
-Wool - Light Gray
-35:8	154	166	156	255	152	163	154	255	127	137	128	255	152	163	154	255
-Wool - Cyan
-35:9	38	117	141	255	37	115	139	255	31	96	116	255	37	115	139	255
-Wool - Purple
-35:10	126	54	184	255	124	53	181	255	104	44	151	255	124	53	181	255
-Wool - Blue
-35:11	38	51	144	255	37	50	143	255	31	42	119	255	37	50	143	255
-Wool - Brown
-35:12	83	51	26	255	82	50	26	255	69	42	22	255	82	50	26	255
-Wool - Dark Green
-35:13	54	77	22	255	54	76	22	255	45	63	19	255	54	76	22	255
-Wool - Red
-35:14	159	45	38	255	157	44	38	255	131	37	32	255	157	44	38	255
-Wool - Black
-35:15	26	23	22	255	26	23	21	255	22	19	18	255	26	23	21	255
-Yellow Flower
-37	255	255	0	255	204	204	0	255	127	127	0	255	102	102	0	255
-Red Rose
-38	255	0	0	255	204	0	0	255	127	0	0	255	102	0	0	255
-Brown Mushroom
-39	204	153	120	32	145	109	85	32	114	86	67	32	73	64	58	32
-Red Mushroom
-40	255	43	43	32	196	29	38	32	186	105	109	32	124	64	64	32
-Gold Block
-41	232	245	46	255	185	196	36	255	116	122	23	255	92	98	18	255
-Iron Block
-42	191	191	191	255	152	152	152	255	95	95	95	255	76	76	76	255
-Double Stone Slab
-43	200	200	200	255	160	160	160	255	100	100	100	255	80	80	80	255
-43:0	200	200	200	255	160	160	160	255	100	100	100	255	80	80	80	255
-43:6	200	200	200	255	160	160	160	255	100	100	100	255	80	80	80	255
-Double Stone Slab - Sandstone
-43:1	192	178	110	255	160	148	92	255	134	124	77	255	160	148	92	255
-Double Stone Slab - Wood
-43:2	157	128	79	255	125	102	63	255	78	64	39	255	62	51	31	255
-Double Stone Slab - Cobblestone
-43:3	115	115	115	255	92	92	92	255	57	57	57	255	46	46	46	255
-Double Stone Slab - Brick 
-43:4	170	86	62	255	136	68	49	255	85	43	31	255	68	34	24	255
-Double Stone Slab - Stone Brick
-43:5	200	200	200	255	160	160	160	255	100	100	100	255	80	80	80	255
-Stone Slab
-44	200	200	200	255	160	160	160	255	100	100	100	255	80	80	80	255
-44:0	200	200	200	255	160	160	160	255	100	100	100	255	80	80	80	255
-44:6	200	200	200	255	160	160	160	255	100	100	100	255	80	80	80	255
-Stone Slab - Sandstone
-44:1	192	178	110	255	160	148	92	255	134	124	77	255	160	148	92	255
-Stone Slab - Wood
-44:2	157	128	79	255	125	102	63	255	78	64	39	255	62	51	31	255
-Stone Slab - Cobblestone
-44:3	115	115	115	255	92	92	92	255	57	57	57	255	46	46	46	255
-Stone Slab - Brick 
-44:4	170	86	62	255	136	68	49	255	85	43	31	255	68	34	24	255
-Stone Slab - Stone Brick
-44:5	200	200	200	255	160	160	160	255	100	100	100	255	80	80	80	255
-Brick
-45	170	86	62	255	136	68	49	255	85	43	31	255	68	34	24	255
-TNT
-46	160	83	65	255	128	66	52	255	80	41	32	255	64	33	26	255
-Bookshelf
-47	125	91	38	192	100	72	30	192	62	45	19	192	50	36	15	192
-Moss Stone
-48	115	115	115	255	92	92	92	255	57	57	57	255	46	46	46	255
-Obsidian
-49	26	11	43	255	20	8	34	255	13	5	21	255	10	4	17	255
-Torch
-50	159	127	80	255	98	88	20	0	245	220	50	255	196	176	40	0
-Fire
-51	255	170	30	200	204	136	24	200	127	85	15	200	102	68	12	200
-Monster Spawner
-52	0	150	110	196	0	150	130	196	0	150	110	196	0	150	130	196
-Wooden Stair
-53	157	128	79	255	125	102	63	255	78	64	39	255	62	51	31	255
-53:4	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0
-Chest
-54	125	91	38	255	100	72	30	255	62	45	19	255	50	36	15	255
-Redstone Wire
-55	240	30	30	64	160	20	20	64	120	15	15	64	100	12	12	64
-Diamond Ore
-56	129	140	143	255	103	112	114	255	64	70	71	255	51	56	57	255
-Diamond Block
-57	45	166	152	255	36	132	121	255	22	83	76	255	18	66	60	255
-Workbench
-58	114	88	56	255	91	70	44	255	57	44	28	255	45	35	22	255
-Crops
-59	146	192	0	255	116	153	0	255	73	96	0	255	58	76	0	255
-Farmland
-60	95	58	30	255	76	46	24	255	47	29	15	255	38	23	12	255
-Furnace
-61	96	96	96	255	76	76	76	255	48	48	48	255	38	38	38	255
-Burning Furnace
-62	96	96	96	255	76	76	76	255	48	48	48	255	38	38	38	255
-Sign Post
-63	111	91	54	255	88	72	43	255	55	45	27	255	44	36	21	255
-Wooden Door
-64	136	109	67	255	108	87	53	255	68	54	33	255	54	43	26	255
-Ladder
-65	181	140	64	32	144	112	51	32	90	70	32	32	72	56	25	32
-Minecart Tracks
-66	150	134	102	180	120	107	81	180	75	67	51	180	60	53	40	180
-Cobblestone Stairs
-67	115	115	115	255	92	92	92	255	57	57	57	255	46	46	46	255
-Wall Sign
-68	111	91	54	255	88	72	43	255	55	45	27	255	44	36	21	255
-Lever
-69	111	91	54	255	88	72	43	255	55	45	27	255	44	36	21	255
-Stone Pressure Plate
-70	120	120	120	255	96	96	96	255	60	60	60	255	48	48	48	255
-Iron Door
-71	191	191	191	255	152	152	152	255	95	95	95	255	76	76	76	255
-Wooden Pressure Plate
-72	111	91	54	255	88	72	43	255	55	45	27	255	44	36	21	255
-Redstone Ore
-73	131	107	107	255	104	85	85	255	65	53	53	255	52	42	42	255
-Glowing Redstone Ore
-74	131	107	107	255	104	85	85	255	65	53	53	255	52	42	42	255
-Redstone Torch off
-75	159	127	80	255	72	56	25	0	181	140	64	255	144	112	51	0
-Redstone Torch on
-76	159	127	80	255	102	0	0	0	255	0	0	255	204	0	0	0
-Stone Button
-77	120	120	120	255	96	96	96	255	60	60	60	255	48	48	48	255
-Snow
-78	255	255	255	255	204	204	204	255	127	127	127	255	102	102	102	255
-Ice
-79	83	113	163	51	66	90	130	51	41	56	81	51	33	45	65	51
-Snow Block
-80	250	250	250	255	200	200	200	255	125	125	125	255	100	100	100	255
-Cactus
-81	25	120	25	255	20	96	20	255	12	60	12	255	10	48	10	255
-Clay
-82	151	157	169	255	120	125	135	255	75	78	84	255	60	62	67	255
-Sugar Cane
-83	193	234	150	255	154	187	120	255	96	117	75	255	77	93	60	255
-Jukebox
-84	125	91	38	255	100	72	30	255	62	45	19	255	50	36	15	255
-Fence
-85	127	98	49	96	95	72	33	96	48	34	9	96	32	21	21	96
-Pumpkin
-86	255	115	0	200	204	92	0	200	126	57	0	200	102	46	0	200
-Netherrack
-87	166	89	89	255	141	80	62	255	135	15	15	255	96	6	6	255
-Soulsand
-88	133	109	94	255	121	97	82	255	90	70	57	255	79	59	46	255
-Glowstone
-89	249	212	156	255	255	188	94	255	192	143	70	255	122	91	44	255
-Portal
-90	140	0	196	128	120	0	196	128	140	0	196	128	120	0	196	128
-Jack-o-lantern
-91	255	115	0	255	204	92	0	255	126	57	0	255	102	46	0	255
-Cake Block
-92	234	234	234	255	210	210	210	255	203	203	203	255	190	190	190	255
-Redstone Repeater off
-93	159	127	80	255	72	56	25	0	181	140	64	255	144	112	51	0
-Redstone Repeater on
-94	159	127	80	255	102	0	0	0	255	0	0	255	204	0	0	0
-Locked Chest
-95	125	91	38	255	100	72	30	255	62	45	19	255	50	36	15	255
-Trap Door
-96	111	91	54	255	88	72	43	255	55	45	27	255	44	36	21	255
-Stone - Sliverfish
-97	120	120	120	255	96	96	96	255	60	60	60	255	48	48	48	255
-Stone Brick
-98	120	120	120	255	96	96	96	255	60	60	60	255	48	48	48	255
-Huge Brown Mushroom
-99	204	153	120	255	145	109	85	255	114	86	67	255	73	64	58	255
-Huge Red Mushroom
-100	255	43	43	255	196	29	38	255	186	105	109	255	124	64	64	255
-Iron Bars
-101	191	191	191	96	152	152	152	96	95	95	95	96	76	76	76	96
-Glass Pane
-102	255	255	255	64	204	204	204	64	127	127	127	64	102	102	102	64
-Melon
-103	193	193	65	255	174	174	47	255	97	97	5	255	76	76	20	255
-Pumpkin Stem
-104	146	192	0	255	116	153	0	255	73	96	0	255	58	76	0	255
-Melon Stem
-105	146	192	0	255	116	153	0	255	73	96	0	255	58	76	0	255
-Vines
-106	60	192	41	100	48	153	32	100	30	96	20	100	24	76	16	100
-Fence Gate
-107	127	98	49	96	95	72	33	96	48	34	9	96	32	21	21	96
-Brick Stairs
-108	170	86	62	255	136	68	49	255	85	43	31	255	68	34	24	255
-Stone Stairs
-109	120	120	120	255	96	96	96	255	60	60	60	255	48	48	48	255
-Mycelium
-110 110  98 104 255 88  78  83  255 55  49  52  255 44  39  42  255 
-Lilly pad
-111 117	176	73	255	93	140	58	255	58	88	36	255	46	70	29	255
-Nether brick
-112 166	89	89	255	141	80	62	255	135	15	15	255	96	6	6	255
-Nether brick fence
-113 166	89	89	96	141	80	62	96	135	15	15	96	96	6	6	96
-Nether brick stairs
-114 166	89	89	255	141	80	62	255	135	15	15	255	96	6	6	255
-Nether Wart
-115 142 19  21  96  113 15  17  96  71  10  10  96  57  7   8   96
-Enchantment table
-116 88  23  22  255 29  10  16 255  17   7  10  255 15  5   8   255
-Brewing stand
-117 114 114 114 96  91  91  91  96  67  67  67  96  46  46  46  96
-Cauldron
-118 74  74  74  255 59  59  59 255  37  37  37  255 30  30  30  255
-Air portal
-119 26	11	43	255	20	8	34	255	13	5	21	255	10	4	17	255
-Air portal frame
-120 113 133 104 255 90 106  83 255  56  66  52  255 45  54  42  255
-White stone
-121 224 226 169 255 179 180 135 255 112 113 85  255 90  90  66  255
-Dragon Egg
-122	26	11	43	255	20	8	34	255	13	5	21	255	10	4	17	255
-Biome Mapping
-[RAINFOREST]	49	67	21	255	39	54	17	255	25	34	11	255	20	27	8	255
-[SWAMPLAND]	64	128	0	255	51	102	0	255	32	64	0	255	26	51	0	255
-[SEASONAL_FOREST]	51	165	42	255	41	132	34	255	26	83	21	255	20	66	17	255
-[FOREST]	0	128	64	255	0	102	51	255	0	64	32	255	0	51	26	255
-[SAVANNA]	58	58	58	255	46	46	46	255	29	29	29	255	23	23	23	255
-[SHRUBLAND]	170	158	24	255	136	126	19	255	85	79	12	255	68	63	10	255
-[TAIGA]	204	255	102	255	163	204	82	255	102	128	51	255	82	102	41	255
-[DESERT]	255	255	102	255	204	204	82	255	128	128	51	255	102	102	41	255
-[PLAINS]	255	204	102	255	204	163	82	255	128	102	51	255	102	82	41	255
-[ICE_DESERT]	26	33	103	255	21	26	82	255	13	17	52	255	10	13	41	255
-[TUNDRA]	222	222	222	255	178	178	178	255	111	111	111	255	89	89	89	255
-[HELL]	255	0	0	255	204	0	0	255	128	0	0	255	102	0	0	255
-[SKY]	102	204	255	255	82	163	204	255	51	102	128	255	41	82	102	255
-[OCEAN]	0	0	255	255	0	0	204	255	0	0	128	255	0	0	102	255
-[RIVER]	0	128	255	255	0	102	204	255	0	64	128	255	0	51	102	255
-[EXTREME_HILLS]	128	64	0	255	102	51	0	255	64	32	0	255	51	26	0	255
-[FROZEN_OCEAN]	102	255	204	255	82	204	163	255	51	128	102	255	41	102	82	255
-[FROZEN_RIVER]	102	102	255	255	82	82	204	255	51	51	128	255	41	41	102	255
-[ICE_PLAINS]	102	255	255	255	82	204	204	255	51	128	128	255	41	102	102	255
-[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
-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
-[TEMPERATURE-0.0]	38	92	255	255	30	73	204	255	19	46	127	255	15	36	102	255
-[TEMPERATURE-0.5]	91	121	185	255	73	96	147	255	46	61	92	255	36	48	73	255
-[TEMPERATURE-0.8]	51	165	42	255	41	131	33	255	26	82	21	255	20	65	17	255
-[TEMPERATURE-0.9]	170	158	24	255	135	126	19	255	85	79	12	255	67	62	10	255
-[TEMPERATURE-0.95]	204	111	48	255	162	89	38	255	102	56	24	255	81	44	19	255
-[TEMPERATURE-1.0]	143	39	36	255	114	31	28	255	71	20	18	255	57	16	14	255

colorschemes/ovocean.txt

@@ -1,335 +0,0 @@
-Stone
-1	149	145	138	255	125	122	116	255	114	111	105	255	88	85	81	255
-Grass
-2	111	185	79	255	86	158	53	255	65	131	40	255	57	105	21	255
-Dirt
-3	174	133	106	255	152	113	82	255	136	102	74	255	93	73	57	255
-Cobblestone
-4	115	115	115	255	92	92	92	255	57	57	57	255	46	46	46	255
-Wooden Plank
-5	157	128	79	255	125	102	63	255	78	64	39	255	62	51	31	255
-Sappling
-6	120	120	120	0	96	96	96	0	60	60	60	0	48	48	48	0
-Bedrock
-7	84	84	84	255	67	67	67	255	42	42	42	255	33	33	33	255
-Water
-8	47	116	160	80	40	100	138	80	33	92	129	80	26	74	103	80
-Stationary Water
-9	47	116	160	80	40	100	138	80	33	92	129	80	26	74	103	80
-Lava
-10	255	90	0	255	204	72	0	255	127	45	0	255	102	36	0	255
-Stationary Lava
-11	255	90	0	255	204	72	0	255	127	45	0	255	102	36	0	255
-Sand
-12	251	240	193	255	251	223	157	255	237	202	135	255	200	168	107	255
-Gravel
-13	136	126	126	255	108	100	100	255	68	63	63	255	54	50	50	255
-Gold Ore
-14	143	140	125	255	114	112	100	255	71	70	62	255	57	56	50	255
-Iron Ore
-15	136	130	127	255	108	104	101	255	68	65	63	255	54	52	50	255
-Coal Ore
-16	115	115	115	255	92	92	92	255	57	57	57	255	46	46	46	255
-Wood - Normal
-17 102 81 51 255 125 102 63 255 78 64 39 255 40 32 20 255
-17:0 102 81 51 255 125 102 63 255 78 64 39 255 40 32 20 255
-Wood - Spruce (Red/dark wood)
-17:1 75 44 24 255 125 102 63 255 78 64 39 255 30 18 10 255
-Wood - Birch (light wood)
-17:2 191 191 191 255 125 102 63 255 78 64 39 255 76 76 76 255
-Leaves
-18	47	99	32	255	34	86	20	255	24	66	14	255	23	57	13	255
-Sponge
-19	193	193	65	255	174	174	47	255	97	97	5	255	76	76	20	255
-Glass
-20	255	255	255	64	204	204	204	64	127	127	127	64	102	102	102	64
-Lapis Lazuli Ore
-21	23	68	196	255	18	56	158	255	14	43	122	255	14	43	78	255
-Lapis Lazuli Block
-22	23	68	196	255	18	56	158	255	14	43	122	255	14	43	78	255
-Dispenser
-23	96	96	96	255	76	76	76	255	48	48	48	255	38	38	38	255
-Sandstone
-24	251	240	193	255	251	223	157	255	237	202	135	255	200	168	107	255
-Note Block
-25	125	91	38	255	100	72	30	255	62	45	19	255	50	36	15	255
-Bed
-26	200	20	20	255	160	16	16	255	100	10	10	255	80	8	8	255
-Powered Rail
-27	150	134	102	180	120	107	81	180	75	67	51	180	60	53	40	180
-Detector Rail
-28	150	134	102	180	120	107	81	180	75	67	51	180	60	53	40	180
-Sticky Piston
-29	157	128	79	255	125	122	116	255	78	64	39	255	88	85	81	255
-Cobweb
-30	138	145	145	255	110	115	115	255	69	72	72	255	55	57	57	255
-Tall Grass
-31	111	185	79	255	86	158	53	255	65	131	40	255	57	105	21	255
-Dead Shrubs
-32	75	44	24	255	60	35	19	255	37	22	12	255	30	18	10	255
-Piston
-33	157	128	79	255	125	122	116	255	78	64	39	255	88	85	81	255
-Piston Head
-34	157	128	79	255	125	122	116	255	78	64	39	255	88	85	81	255
-Wool
-35	222	222	222	255	177	177	177	255	111	111	111	255	88	88	88	255
-35:0	222	222	222	255	177	177	177	255	111	111	111	255	88	88	88	255
-Wool - Orange
-35:1	204	111	48	255	162	89	38	255	102	56	24	255	81	44	19	255
-Wool - Magenta
-35:2	166	66	175	255	133	53	140	255	83	33	87	255	66	26	69	255
-Wool - Light Blue
-35:3	91	121	185	255	73	96	147	255	46	61	92	255	36	48	73	255
-Wool - Yellow
-35:4	170	158	24	255	135	126	19	255	85	79	12	255	67	62	10	255
-Wool - Light Green
-35:5	51	165	42	255	41	131	33	255	26	82	21	255	20	65	17	255
-Wool - Pink
-35:6	190	115	135	255	151	92	108	255	95	57	67	255	75	46	53	255
-Wool - Gray
-35:7	58	58	58	255	47	47	47	255	29	29	29	255	23	23	23	255
-Wool - Light Gray
-35:8	138	145	145	255	110	115	115	255	69	72	72	255	55	57	57	255
-Wool - Cyan
-35:9	34	102	131	255	27	81	104	255	17	51	65	255	13	40	52	255
-Wool - Purple
-35:10	113	47	171	255	90	37	136	255	57	24	85	255	45	19	68	255
-Wool - Blue
-35:11	34	44	134	255	27	35	107	255	17	22	67	255	13	18	53	255
-Wool - Brown
-35:12	75	44	24	255	60	35	19	255	37	22	12	255	30	18	10	255
-Wool - Dark Green
-35:13	49	67	21	255	39	53	17	255	24	34	10	255	19	27	8	255
-Wool - Red
-35:14	143	39	36	255	114	31	28	255	71	20	18	255	57	16	14	255
-Wool - Black
-35:15	24	20	20	255	19	16	16	255	12	10	10	255	9	8	8	255
-Yellow Flower
-37	255	255	0	255	204	204	0	255	127	127	0	255	102	102	0	255
-Red Rose
-38	255	0	0	255	204	0	0	255	127	0	0	255	102	0	0	255
-Brown Mushroom
-39	204	153	120	32	145	109	85	32	114	86	67	32	73	64	58	32
-Red Mushroom
-40	255	43	43	32	196	29	38	32	186	105	109	32	124	64	64	32
-Gold Block
-41	232	245	46	255	185	196	36	255	116	122	23	255	92	98	18	255
-Iron Block
-42	191	191	191	255	152	152	152	255	95	95	95	255	76	76	76	255
-Double Stone Slab
-43	200	200	200	255	160	160	160	255	100	100	100	255	80	80	80	255
-43:0	200	200	200	255	160	160	160	255	100	100	100	255	80	80	80	255
-43:6	200	200	200	255	160	160	160	255	100	100	100	255	80	80	80	255
-Double Stone Slab - Sandstone
-43:1	218	210	158	255	174	168	126	255	109	105	79	255	87	84	63	255
-Double Stone Slab - Wood
-43:2	157	128	79	255	125	102	63	255	78	64	39	255	62	51	31	255
-Double Stone Slab - Cobblestone
-43:3	115	115	115	255	92	92	92	255	57	57	57	255	46	46	46	255
-Double Stone Slab - Brick 
-43:4	170	86	62	255	136	68	49	255	85	43	31	255	68	34	24	255
-Double Stone Slab - Stone Brick
-43:5	200	200	200	255	160	160	160	255	100	100	100	255	80	80	80	255
-Stone Slab
-44	200	200	200	255	160	160	160	255	100	100	100	255	80	80	80	255
-44:0	200	200	200	255	160	160	160	255	100	100	100	255	80	80	80	255
-44:6	200	200	200	255	160	160	160	255	100	100	100	255	80	80	80	255
-Stone Slab - Sandstone
-44:1	218	210	158	255	174	168	126	255	109	105	79	255	87	84	63	255
-Stone Slab - Wood
-44:2	157	128	79	255	125	102	63	255	78	64	39	255	62	51	31	255
-Stone Slab - Cobblestone
-44:3	115	115	115	255	92	92	92	255	57	57	57	255	46	46	46	255
-Stone Slab - Brick 
-44:4	170	86	62	255	136	68	49	255	85	43	31	255	68	34	24	255
-Stone Slab - Stone Brick
-44:5	200	200	200	255	160	160	160	255	100	100	100	255	80	80	80	255
-Brick
-45	170	86	62	255	136	68	49	255	85	43	31	255	68	34	24	255
-TNT
-46	160	83	65	255	128	66	52	255	80	41	32	255	64	33	26	255
-Bookshelf
-47	125	91	38	192	100	72	30	192	62	45	19	192	50	36	15	192
-Moss Stone
-48	115	115	115	255	92	92	92	255	57	57	57	255	46	46	46	255
-Obsidian
-49	26	11	43	255	20	8	34	255	13	5	21	255	10	4	17	255
-Torch
-50	103	80	45	255	98	88	20	0	255	249	79	255	196	176	40	0
-Fire
-51	255	170	30	200	204	136	24	200	127	85	15	200	102	68	12	200
-Monster Spawner
-52	0	150	110	196	0	150	130	196	0	150	110	196	0	150	130	196
-Wooden Stair
-53	157	128	79	255	125	102	63	255	78	64	39	255	62	51	31	255
-53:4	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0
-Chest
-54	125	91	38	255	100	72	30	255	62	45	19	255	50	36	15	255
-Redstone Wire
-55	240	30	30	64	160	20	20	64	120	15	15	64	100	12	12	64
-Diamond Ore
-56	129	140	143	255	103	112	114	255	64	70	71	255	51	56	57	255
-Diamond Block
-57	45	166	152	255	36	132	121	255	22	83	76	255	18	66	60	255
-Workbench
-58	114	88	56	255	91	70	44	255	57	44	28	255	45	35	22	255
-Crops
-59	146	192	0	255	116	153	0	255	73	96	0	255	58	76	0	255
-Farmland
-60	95	58	30	255	76	46	24	255	47	29	15	255	38	23	12	255
-Furnace
-61	96	96	96	255	76	76	76	255	48	48	48	255	38	38	38	255
-Burning Furnace
-62	96	96	96	255	76	76	76	255	48	48	48	255	38	38	38	255
-Sign Post
-63	111	91	54	255	88	72	43	255	55	45	27	255	44	36	21	255
-Wooden Door
-64	136	109	67	255	108	87	53	255	68	54	33	255	54	43	26	255
-Ladder
-65	181	140	64	32	144	112	51	32	90	70	32	32	72	56	25	32
-Minecart Tracks
-66	150	134	102	180	120	107	81	180	75	67	51	180	60	53	40	180
-Cobblestone Stairs
-67	115	115	115	255	92	92	92	255	57	57	57	255	46	46	46	255
-Wall Sign
-68	111	91	54	255	88	72	43	255	55	45	27	255	44	36	21	255
-Lever
-69	111	91	54	255	88	72	43	255	55	45	27	255	44	36	21	255
-Stone Pressure Plate
-70	120	120	120	255	96	96	96	255	60	60	60	255	48	48	48	255
-Iron Door
-71	191	191	191	255	152	152	152	255	95	95	95	255	76	76	76	255
-Wooden Pressure Plate
-72	111	91	54	255	88	72	43	255	55	45	27	255	44	36	21	255
-Redstone Ore
-73	131	107	107	255	104	85	85	255	65	53	53	255	52	42	42	255
-Glowing Redstone Ore
-74	131	107	107	255	104	85	85	255	65	53	53	255	52	42	42	255
-Redstone Torch off
-75	159	127	80	255	72	56	25	0	181	140	64	255	144	112	51	0
-Redstone Torch on
-76	159	127	80	255	102	0	0	0	255	0	0	255	204	0	0	0
-Stone Button
-77	120	120	120	255	96	96	96	255	60	60	60	255	48	48	48	255
-Snow
-78	255	255	255	255	252	253	253	255	198	220	225	255	129	179	190	255
-Ice
-79	182	211	235	150	164	189	211	150	138	177	211	150	128	165	196	150
-Snow Block
-80	250	250	250	255	200	200	200	255	125	125	125	255	100	100	100	255
-Cactus
-81	25	120	25	255	20	96	20	255	12	60	12	255	10	48	10	255
-Clay
-82	151	157	169	255	120	125	135	255	75	78	84	255	60	62	67	255
-Sugar Cane
-83	193	234	150	255	154	187	120	255	96	117	75	255	77	93	60	255
-Jukebox
-84	125	91	38	255	100	72	30	255	62	45	19	255	50	36	15	255
-Fence
-85	127	98	49	96	95	72	33	96	48	34	9	96	32	21	21	96
-Pumpkin
-86	255	115	0	200	204	92	0	200	126	57	0	200	102	46	0	200
-Netherrack
-87	166	89	89	255	141	80	62	255	135	15	15	255	96	6	6	255
-Soulsand
-88	133	109	94	255	121	97	82	255	90	70	57	255	79	59	46	255
-Glowstone
-89	249	212	156	255	255	188	94	255	192	143	70	255	122	91	44	255
-Portal
-90	140	0	196	128	120	0	196	128	140	0	196	128	120	0	196	128
-Jack-o-lantern
-91	255	115	0	255	204	92	0	255	126	57	0	255	102	46	0	255
-Cake Block
-92	234	234	234	255	210	210	210	255	203	203	203	255	190	190	190	255
-Redstone Repeater off
-93	159	127	80	255	72	56	25	0	181	140	64	255	144	112	51	0
-Redstone Repeater on
-94	159	127	80	255	102	0	0	0	255	0	0	255	204	0	0	0
-Locked Chest
-95	125	91	38	255	100	72	30	255	62	45	19	255	50	36	15	255
-Trap Door
-96	111	91	54	255	88	72	43	255	55	45	27	255	44	36	21	255
-Stone - Sliverfish
-97	120	120	120	255	96	96	96	255	60	60	60	255	48	48	48	255
-Stone Brick
-98	120	120	120	255	96	96	96	255	60	60	60	255	48	48	48	255
-Huge Brown Mushroom
-99	204	153	120	255	145	109	85	255	114	86	67	255	73	64	58	255
-Huge Red Mushroom
-100	255	43	43	255	196	29	38	255	186	105	109	255	124	64	64	255
-Iron Bars
-101	191	191	191	96	152	152	152	96	95	95	95	96	76	76	76	96
-Glass Pane
-102	255	255	255	64	204	204	204	64	127	127	127	64	102	102	102	64
-Melon
-103	193	193	65	255	174	174	47	255	97	97	5	255	76	76	20	255
-Pumpkin Stem
-104	146	192	0	255	116	153	0	255	73	96	0	255	58	76	0	255
-Melon Stem
-105	146	192	0	255	116	153	0	255	73	96	0	255	58	76	0	255
-Vines
-106	60	192	41	100	48	153	32	100	30	96	20	100	24	76	16	100
-Fence Gate
-107	127	98	49	96	95	72	33	96	48	34	9	96	32	21	21	96
-Brick Stairs
-108	170	86	62	255	136	68	49	255	85	43	31	255	68	34	24	255
-Stone Stairs
-109	120	120	120	255	96	96	96	255	60	60	60	255	48	48	48	255
-Mycelium
-110 110  98 104 255 88  78  83  255 55  49  52  255 44  39  42  255 
-Lilly pad
-111 117	176	73	255	93	140	58	255	58	88	36	255	46	70	29	255
-Nether brick
-112 166	89	89	255	141	80	62	255	135	15	15	255	96	6	6	255
-Nether brick fence
-113 166	89	89	96	141	80	62	96	135	15	15	96	96	6	6	96
-Nether brick stairs
-114 166	89	89	255	141	80	62	255	135	15	15	255	96	6	6	255
-Nether Wart
-115 142 19  21  96  113 15  17  96  71  10  10  96  57  7   8   96
-Enchantment table
-116 88  23  22  255 29  10  16 255  17   7  10  255 15  5   8   255
-Brewing stand
-117 114 114 114 96  91  91  91  96  67  67  67  96  46  46  46  96
-Cauldron
-118 74  74  74  255 59  59  59 255  37  37  37  255 30  30  30  255
-Air portal
-119 26	11	43	255	20	8	34	255	13	5	21	255	10	4	17	255
-Air portal frame
-120 113 133 104 255 90 106  83 255  56  66  52  255 45  54  42  255
-White stone
-121 224 226 169 255 179 180 135 255 112 113 85  255 90  90  66  255
-Dragon Egg
-122	26	11	43	255	20	8	34	255	13	5	21	255	10	4	17	255
-Biome Mapping
-[RAINFOREST]	49	67	21	255	39	54	17	255	25	34	11	255	20	27	8	255
-[SWAMPLAND]	64	128	0	255	51	102	0	255	32	64	0	255	26	51	0	255
-[SEASONAL_FOREST]	51	165	42	255	41	132	34	255	26	83	21	255	20	66	17	255
-[FOREST]	0	128	64	255	0	102	51	255	0	64	32	255	0	51	26	255
-[SAVANNA]	58	58	58	255	46	46	46	255	29	29	29	255	23	23	23	255
-[SHRUBLAND]	170	158	24	255	136	126	19	255	85	79	12	255	68	63	10	255
-[TAIGA]	204	255	102	255	163	204	82	255	102	128	51	255	82	102	41	255
-[DESERT]	255	255	102	255	204	204	82	255	128	128	51	255	102	102	41	255
-[PLAINS]	255	204	102	255	204	163	82	255	128	102	51	255	102	82	41	255
-[ICE_DESERT]	26	33	103	255	21	26	82	255	13	17	52	255	10	13	41	255
-[TUNDRA]	222	222	222	255	178	178	178	255	111	111	111	255	89	89	89	255
-[HELL]	255	0	0	255	204	0	0	255	128	0	0	255	102	0	0	255
-[SKY]	102	204	255	255	82	163	204	255	51	102	128	255	41	82	102	255
-[OCEAN]	0	0	255	255	0	0	204	255	0	0	128	255	0	0	102	255
-[RIVER]	0	128	255	255	0	102	204	255	0	64	128	255	0	51	102	255
-[EXTREME_HILLS]	128	64	0	255	102	51	0	255	64	32	0	255	51	26	0	255
-[FROZEN_OCEAN]	102	255	204	255	82	204	163	255	51	128	102	255	41	102	82	255
-[FROZEN_RIVER]	102	102	255	255	82	82	204	255	51	51	128	255	41	41	102	255
-[ICE_PLAINS]	102	255	255	255	82	204	204	255	51	128	128	255	41	102	102	255
-[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
-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
-[TEMPERATURE-0.0]	38	92	255	255	30	73	204	255	19	46	127	255	15	36	102	255
-[TEMPERATURE-0.5]	91	121	185	255	73	96	147	255	46	61	92	255	36	48	73	255
-[TEMPERATURE-0.8]	51	165	42	255	41	131	33	255	26	82	21	255	20	65	17	255
-[TEMPERATURE-0.9]	170	158	24	255	135	126	19	255	85	79	12	255	67	62	10	255
-[TEMPERATURE-0.95]	204	111	48	255	162	89	38	255	102	56	24	255	81	44	19	255
-[TEMPERATURE-1.0]	143	39	36	255	114	31	28	255	71	20	18	255	57	16	14	255

colorschemes/sk89q.txt

@@ -1,186 +0,0 @@
-1	133	129	118	255	111	108	98	255	93	90	82	255	111	108	98	255
-2	60	113	17	255	50	94	14	255	42	79	12	255	50	94	14	255
-3	103	83	51	255	86	69	43	255	72	58	36	255	86	69	43	255
-4	118	112	96	255	98	93	80	255	82	78	67	255	98	93	80	255
-5	109	80	60	255	91	67	50	255	76	56	41	255	91	67	50	255
-7	79	79	82	255	66	66	68	255	55	55	57	255	66	66	68	255
-8	94	170	255	51	82	148	223	51	69	124	186	51	82	148	223	51
-9	94	170	255	51	82	148	223	51	69	124	186	51	82	148	223	51
-10	255	164	41	255	255	164	41	255	212	137	34	255	255	164	41	255
-11	255	164	41	255	255	164	41	255	212	137	34	255	255	164	41	255
-12	192	178	110	255	160	148	92	255	134	124	77	255	160	148	92	255
-13	120	105	79	255	100	87	66	255	84	73	55	255	100	87	66	255
-14	255	181	38	255	255	181	38	255	212	151	31	255	255	181	38	255
-15	231	174	113	255	193	145	94	255	161	121	79	255	193	145	94	255
-16	56	60	70	255	46	50	58	255	39	42	49	255	46	50	58	255
-17	119	97	74	255	99	81	62	255	83	68	52	255	99	81	62	255
-17:0 119	97	74	255	99	81	62	255	83	68	52	255	99	81	62	255
-17:1 75 44 24 255 125 102 63 255 78 64 39 255 30 18 10 255
-17:2 191 191 191 255 125 102 63 255 78 64 39 255 76 76 76 255
-18	27	69	37	180	22	57	31	180	19	48	25	180	22	57	31	180
-19	193	193	65	255	174	174	47	255	97	97	5	255	76	76	20	255
-20	178	217	223	90	148	181	186	90	124	151	155	90	148	181	186	90
-21	23	68	196	255	18	56	158	255	14	43	122	255	14	43	78	255
-22	23	68	196	255	18	56	158	255	14	43	122	255	14	43	78	255
-23	96	96	96	255	76	76	76	255	48	48	48	255	38	38	38	255
-24	192	178	110	255	160	148	92	255	134	124	77	255	160	148	92	255
-25	125	91	38	255	100	72	30	255	62	45	19	255	50	36	15	255
-26	200	20	20	255	160	16	16	255	100	10	10	255	80	8	8	255
-27	150	134	102	180	120	107	81	180	75	67	51	180	60	53	40	180
-28	150	134	102	180	120	107	81	180	75	67	51	180	60	53	40	180
-29	109	80	60	255	111	108	98	255	76	56	41	255	111	108	98	255
-30	138	145	145	255	110	115	115	255	69	72	72	255	55	57	57	255
-31	97	156	53	255	73	120	38	255	38	68	16	255	26	50	9	255
-32	75	44	24	255	60	35	19	255	37	22	12	255	30	18	10	255
-33	109	80	60	255	111	108	98	255	76	56	41	255	111	108	98	255
-34	109	80	60	255	111	108	98	255	76	56	41	255	111	108	98	255
-35	247	255	239	255	244	251	236	255	204	210	197	255	244	251	236	255
-35:0	247	255	239	255	244	251	236	255	204	210	197	255	244	251	236	255
-35:1	227	128	52	255	224	126	51	255	187	105	42	255	224	126	51	255
-35:2	185	76	188	255	183	75	186	255	153	63	155	255	183	75	186	255
-35:3	102	139	199	255	100	137	196	255	84	114	164	255	100	137	196	255
-35:4	189	181	26	255	187	178	26	255	156	149	22	255	187	178	26	255
-35:5	57	189	45	255	56	186	44	255	47	156	37	255	56	186	44	255
-35:6	211	132	145	255	209	130	143	255	174	109	120	255	209	130	143	255
-35:7	65	67	63	255	64	66	62	255	54	55	52	255	64	66	62	255
-35:8	154	166	156	255	152	163	154	255	127	137	128	255	152	163	154	255
-35:9	38	117	141	255	37	115	139	255	31	96	116	255	37	115	139	255
-35:10	126	54	184	255	124	53	181	255	104	44	151	255	124	53	181	255
-35:11	38	51	144	255	37	50	143	255	31	42	119	255	37	50	143	255
-35:12	83	51	26	255	82	50	26	255	69	42	22	255	82	50	26	255
-35:13	54	77	22	255	54	76	22	255	45	63	19	255	54	76	22	255
-35:14	159	45	38	255	157	44	38	255	131	37	32	255	157	44	38	255
-35:15	26	23	22	255	26	23	21	255	22	19	18	255	26	23	21	255
-37	73	108	60	254	61	90	50	254	51	75	42	254	61	90	50	254
-38	84	139	187	254	70	116	155	254	59	97	130	254	70	116	155	254
-39	184	144	0	254	153	119	0	254	128	100	0	254	153	119	0	254
-40	201	17	17	254	168	14	14	254	140	12	12	254	168	14	14	254
-41	247	255	239	255	244	251	236	255	204	210	197	255	244	251	236	255
-42	249	249	249	255	207	207	207	255	173	173	173	255	207	207	207	255
-43	122	112	99	255	101	93	82	255	85	78	69	255	101	93	82	255
-43:0	122	112	99	255	101	93	82	255	85	78	69	255	101	93	82	255
-43:1	192	178	110	255	160	148	92	255	134	124	77	255	160	148	92	255
-43:2	109	80	60	255	91	67	50	255	76	56	41	255	91	67	50	255
-43:3	118	112	96	255	98	93	80	255	82	78	67	255	98	93	80	255
-43:4	170	86	62	255	136	68	49	255	85	43	31	255	68	34	24	255
-43:5	200	200	200	255	160	160	160	255	100	100	100	255	80	80	80	255
-43:6	122	112	99	255	101	93	82	255	85	78	69	255	101	93	82	255
-44	122	112	99	254	101	93	82	254	85	78	69	254	101	93	82	254
-44:0	122	112	99	254	101	93	82	254	85	78	69	254	101	93	82	254
-44:1	192	178	110	255	160	148	92	255	134	124	77	255	160	148	92	255
-44:2	109	80	60	255	91	67	50	255	76	56	41	255	91	67	50	255
-44:3	118	112	96	255	98	93	80	255	82	78	67	255	98	93	80	255
-44:4	170	86	62	255	136	68	49	255	85	43	31	255	68	34	24	255
-44:5	200	200	200	255	160	160	160	255	100	100	100	255	80	80	80	255
-44:6	122	112	99	254	101	93	82	254	85	78	69	254	101	93	82	254
-45	230	103	73	255	192	86	61	255	160	71	50	255	192	86	61	255
-46	255	79	30	255	231	72	27	255	193	60	22	255	231	72	27	255
-47	125	91	38	192	100	72	30	192	62	45	19	192	50	36	15	192
-48	96	108	70	255	80	90	58	255	67	75	49	255	80	90	58	255
-49	83	67	83	255	69	56	69	255	58	47	58	255	69	56	69	255
-50	255	203	58	200	255	203	58	200	212	169	48	200	255	203	58	200
-51	255	170	30	200	255	170	30	200	212	141	25	200	255	170	30	200
-52	255	228	52	255	255	228	52	255	212	190	43	255	255	228	52	255
-53	145	109	80	255	121	91	67	255	101	76	56	255	121	91	67	255
-53:4	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0
-54	165	132	100	255	138	110	84	255	115	92	70	255	138	110	84	255
-55	116	21	21	255	97	18	18	255	81	15	15	255	97	18	18	255
-56	115	230	255	255	105	210	232	255	88	175	194	255	105	210	232	255
-57	164	217	237	255	136	181	198	255	114	151	165	255	136	181	198	255
-58	171	138	99	255	142	115	82	255	118	96	68	255	142	115	82	255
-59	136	152	21	255	114	127	17	255	95	106	14	255	114	127	17	255
-60	123	82	51	255	103	68	43	255	86	57	36	255	103	68	43	255
-61	158	128	73	255	132	106	61	255	110	89	51	255	132	106	61	255
-62	158	128	73	255	132	106	61	255	110	89	51	255	132	106	61	255
-63	60	112	17	255	50	93	14	255	42	78	12	255	50	93	14	255
-64	129	97	69	255	108	81	57	255	90	68	47	255	108	81	57	255
-65	144	128	99	32	120	106	82	32	100	89	69	32	120	106	82	32
-66	113	109	102	180	94	91	85	180	79	76	71	180	94	91	85	180
-67	115	107	93	255	96	89	78	255	80	75	65	255	96	89	78	255
-68	111	91	54	255	88	72	43	255	55	45	27	255	44	36	21	255
-69	111	91	54	255	88	72	43	255	55	45	27	255	44	36	21	255
-70	120	120	120	255	96	96	96	255	60	60	60	255	48	48	48	255
-71	255	255	255	255	229	229	229	255	191	191	191	255	229	229	229	255
-72	111	91	54	255	88	72	43	255	55	45	27	255	44	36	21	255
-73	174	107	107	255	145	89	89	255	121	75	75	255	145	89	89	255
-74	174	107	107	255	145	89	89	255	121	75	75	255	145	89	89	255
-75	255	140	61	254	217	119	52	254	181	99	43	254	217	119	52	254
-76	255	0	0	254	255	0	0	254	212	0	0	254	255	0	0	254
-77	120	120	120	255	96	96	96	255	60	60	60	255	48	48	48	255
-78	237	248	255	254	237	248	255	254	198	207	212	254	237	248	255	254
-79	166	222	255	55	166	222	255	55	139	185	212	55	166	222	255	55
-80	237	248	255	255	237	248	255	255	198	207	212	255	237	248	255	255
-81	116	167	80	255	97	139	67	255	81	116	56	255	97	139	67	255
-82	234	240	255	255	216	221	235	255	180	185	196	255	216	221	235	255
-83	136	167	74	255	114	139	62	255	95	116	52	255	114	139	62	255
-84	116	97	80	255	97	81	67	255	81	68	55	255	97	81	67	255
-85	115	99	63	255	96	82	52	255	80	69	44	255	96	82	52	255
-86	255	115	0	200	204	92	0	200	126	57	0	200	102	46	0	200
-87	166	89	89	255	141	80	62	255	135	15	15	255	96	6	6	255
-88	133	109	94	255	121	97	82	255	90	70	57	255	79	59	46	255
-89	249	212	156	255	255	188	94	255	192	143	70	255	122	91	44	255
-90	140	0	196	128	120	0	196	128	140	0	196	128	120	0	196	128
-91	255	115	0	255	204	92	0	255	126	57	0	255	102	46	0	255
-92	234	234	234	255	210	210	210	255	203	203	203	255	190	190	190	255
-93	159	127	80	255	72	56	25	0	181	140	64	255	144	112	51	0
-94	159	127	80	255	102	0	0	0	255	0	0	255	204	0	0	0
-95	125	91	38	255	100	72	30	255	62	45	19	255	50	36	15	255
-96	111	91	54	255	88	72	43	255	55	45	27	255	44	36	21	255
-97	120	120	120	255	96	96	96	255	60	60	60	255	48	48	48	255
-98	120	120	120	255	96	96	96	255	60	60	60	255	48	48	48	255
-99	204	153	120	255	145	109	85	255	114	86	67	255	73	64	58	255
-100	255	43	43	255	196	29	38	255	186	105	109	255	124	64	64	255
-101	191	191	191	96	152	152	152	96	95	95	95	96	76	76	76	96
-102	255	255	255	64	204	204	204	64	127	127	127	64	102	102	102	64
-103	193	193	65	255	174	174	47	255	97	97	5	255	76	76	20	255
-104	146	192	0	255	116	153	0	255	73	96	0	255	58	76	0	255
-105	146	192	0	255	116	153	0	255	73	96	0	255	58	76	0	255
-106	60	192	41	100	48	153	32	100	30	96	20	100	24	76	16	100
-107	127	98	49	96	95	72	33	96	48	34	9	96	32	21	21	96
-108	170	86	62	255	136	68	49	255	85	43	31	255	68	34	24	255
-109	120	120	120	255	96	96	96	255	60	60	60	255	48	48	48	255
-110 110  98 104 255 88  78  83  255 55  49  52  255 44  39  42  255 
-111 117	176	73	255	93	140	58	255	58	88	36	255	46	70	29	255
-112 166	89	89	255	141	80	62	255	135	15	15	255	96	6	6	255
-113 166	89	89	96	141	80	62	96	135	15	15	96	96	6	6	96
-114 166	89	89	255	141	80	62	255	135	15	15	255	96	6	6	255
-115 142 19  21  96  113 15  17  96  71  10  10  96  57  7   8   96
-116 88  23  22  255 29  10  16 255  17   7  10  255 15  5   8   255
-117 114 114 114 96  91  91  91  96  67  67  67  96  46  46  46  96
-118 74  74  74  255 59  59  59 255  37  37  37  255 30  30  30  255
-119 26	11	43	255	20	8	34	255	13	5	21	255	10	4	17	255
-120 113 133 104 255 90 106  83 255  56  66  52  255 45  54  42  255
-121 224 226 169 255 179 180 135 255 112 113 85  255 90  90  66  255
-122	26	11	43	255	20	8	34	255	13	5	21	255	10	4	17	255
-Biome Mapping
-[RAINFOREST]	49	67	21	255	39	54	17	255	25	34	11	255	20	27	8	255
-[SWAMPLAND]	64	128	0	255	51	102	0	255	32	64	0	255	26	51	0	255
-[SEASONAL_FOREST]	51	165	42	255	41	132	34	255	26	83	21	255	20	66	17	255
-[FOREST]	0	128	64	255	0	102	51	255	0	64	32	255	0	51	26	255
-[SAVANNA]	58	58	58	255	46	46	46	255	29	29	29	255	23	23	23	255
-[SHRUBLAND]	170	158	24	255	136	126	19	255	85	79	12	255	68	63	10	255
-[TAIGA]	204	255	102	255	163	204	82	255	102	128	51	255	82	102	41	255
-[DESERT]	255	255	102	255	204	204	82	255	128	128	51	255	102	102	41	255
-[PLAINS]	255	204	102	255	204	163	82	255	128	102	51	255	102	82	41	255
-[ICE_DESERT]	26	33	103	255	21	26	82	255	13	17	52	255	10	13	41	255
-[TUNDRA]	222	222	222	255	178	178	178	255	111	111	111	255	89	89	89	255
-[HELL]	255	0	0	255	204	0	0	255	128	0	0	255	102	0	0	255
-[SKY]	102	204	255	255	82	163	204	255	51	102	128	255	41	82	102	255
-[OCEAN]	0	0	255	255	0	0	204	255	0	0	128	255	0	0	102	255
-[RIVER]	0	128	255	255	0	102	204	255	0	64	128	255	0	51	102	255
-[EXTREME_HILLS]	128	64	0	255	102	51	0	255	64	32	0	255	51	26	0	255
-[FROZEN_OCEAN]	102	255	204	255	82	204	163	255	51	128	102	255	41	102	82	255
-[FROZEN_RIVER]	102	102	255	255	82	82	204	255	51	51	128	255	41	41	102	255
-[ICE_PLAINS]	102	255	255	255	82	204	204	255	51	128	128	255	41	102	102	255
-[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
-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
-[TEMPERATURE-0.0]	38	92	255	255	30	73	204	255	19	46	127	255	15	36	102	255
-[TEMPERATURE-0.5]	91	121	185	255	73	96	147	255	46	61	92	255	36	48	73	255
-[TEMPERATURE-0.8]	51	165	42	255	41	131	33	255	26	82	21	255	20	65	17	255
-[TEMPERATURE-0.9]	170	158	24	255	135	126	19	255	85	79	12	255	67	62	10	255
-[TEMPERATURE-0.95]	204	111	48	255	162	89	38	255	102	56	24	255	81	44	19	255
-[TEMPERATURE-1.0]	143	39	36	255	114	31	28	255	71	20	18	255	57	16	14	255

pom.xml

@@ -1,73 +1,100 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-  <modelVersion>4.0.0</modelVersion>
-  <groupId>org.dynmap</groupId>
-  <artifactId>dynmap</artifactId>
-  <version>0.25.1</version>
-  <name>dynmap</name>
-    <properties>
-       <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-       <BUILD_NUMBER>dev</BUILD_NUMBER>
-    </properties>
-  <url>http://github.com/webbukkit/dynmap/</url>
-  <issueManagement>
-  	<system>GitHub</system>
-  	<url>https://github.com/webbukkit/dynmap/issues</url>
-  </issueManagement>
-  <build>
-	  <resources>
-		<resource>
-		  <directory>src/main/resources</directory>
-		  <filtering>true</filtering>
-		  <includes>
-			<include>*.yml</include>
-			<include>*.txt</include>
-		  </includes>
-		</resource>
-		<resource>
-		  <directory>src/main/resources</directory>
-		  <filtering>false</filtering>
-		  <excludes>
-			<exclude>*.yml</exclude>
-			<exclude>*.txt</exclude>
-		  </excludes>
-		</resource>
-	  </resources>
-      <plugins>
-          <plugin>
-              <groupId>org.apache.maven.plugins</groupId>
-              <artifactId>maven-compiler-plugin</artifactId>
-              <version>2.0.2</version>
-              <configuration>
-                  <source>1.6</source>
-                  <target>1.6</target>
-              </configuration>
-          </plugin>
-          <plugin>
-          	<groupId>org.apache.maven.plugins</groupId>
-          	<artifactId>maven-shade-plugin</artifactId>
-          	<version>1.5</version>
-          	<executions>
-          		<execution>
-          			<phase>package</phase>
-          			<goals>
-          				<goal>shade</goal>
-          			</goals>
-		            <configuration>
-        		      <artifactSet>
-                		<includes>
-                  		  <include>org.dynmap:dynmap-api:jar:*</include>
-                		</includes>
-              		  </artifactSet>
-            		</configuration>
-          		</execution>
-          	</executions>
-          </plugin>
-          <plugin>
+	<modelVersion>4.0.0</modelVersion>
+	<groupId>org.dynmap</groupId>
+	<artifactId>dynmap</artifactId>
+	<version>0.34</version>
+	<name>dynmap</name>
+	<properties>
+		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+		<BUILD_NUMBER>dev</BUILD_NUMBER>
+	</properties>
+	<url>http://github.com/webbukkit/dynmap/</url>
+	<issueManagement>
+		<system>GitHub</system>
+		<url>https://github.com/webbukkit/dynmap/issues</url>
+	</issueManagement>
+	<build>
+		<resources>
+			<resource>
+				<directory>src/main/resources</directory>
+				<filtering>true</filtering>
+				<includes>
+					<include>*.yml</include>
+					<include>*.txt</include>
+				</includes>
+			</resource>
+			<resource>
+				<directory>src/main/resources</directory>
+				<filtering>false</filtering>
+				<excludes>
+					<exclude>*.yml</exclude>
+					<exclude>*.txt</exclude>
+				</excludes>
+			</resource>
+		</resources>
+		<plugins>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-compiler-plugin</artifactId>
+				<version>2.0.2</version>
+				<configuration>
+					<source>1.6</source>
+					<target>1.6</target>
+				</configuration>
+			</plugin>
+
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-dependency-plugin</artifactId>
+				<version>2.4</version>
+				<executions>
+					<execution>
+						<id>unpack</id>
+						<phase>package</phase>
+						<goals><goal>unpack</goal></goals>
+						<configuration>
+							<artifactItems>
+								<artifactItem>
+									<groupId>org.dynmap</groupId>
+									<artifactId>DynmapCore</artifactId>
+									<version>${project.version}</version>
+									<classifier>bin</classifier>
+									<type>zip</type>
+									<outputDirectory>${project.build.directory}/core</outputDirectory>
+								</artifactItem>
+							</artifactItems>
+						</configuration>
+					</execution>
+				</executions>
+			</plugin>
+			
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-shade-plugin</artifactId>
+				<version>1.5</version>
+				<executions>
+					<execution>
+						<phase>package</phase>
+						<goals>
+							<goal>shade</goal>
+						</goals>
+						<configuration>
+							<artifactSet>
+								<includes>
+									<include>org.dynmap:dynmap-api:jar:*</include>
+									<include>org.dynmap:DynmapCore:jar:*</include>
+								</includes>
+							</artifactSet>
+						</configuration>
+					</execution>
+				</executions>
+			</plugin>
+			<plugin>
 				<artifactId>maven-assembly-plugin</artifactId>
 				<configuration>
-    				<descriptors>
-        				<descriptor>src/main/assembly/package.xml</descriptor>
-    				</descriptors>
+					<descriptors>
+						<descriptor>src/main/assembly/package.xml</descriptor>
+					</descriptors>
 					<!-- Hack for bug in maven-assembly: http://jira.codehaus.org/browse/MASSEMBLY-449 -->
 					<archiverConfig>
 						<fileMode>420</fileMode> <!-- 420(dec) = 644(oct) -->
@@ -76,36 +103,60 @@
 					</archiverConfig>
 				</configuration>
 				<executions>
-   					<execution>
-       					<id>build</id>
-        				<phase>package</phase>
-        				<goals>
-            				<goal>single</goal>
-        				</goals>
-    				</execution>
+					<execution>
+						<id>build</id>
+						<phase>package</phase>
+						<goals>
+							<goal>single</goal>
+						</goals>
+					</execution>
 				</executions>
 			</plugin>
-      </plugins>
-  </build>
-  <dependencies>
-    <dependency>
-      <groupId>com.nijikokun.bukkit</groupId>
-      <artifactId>Permissions</artifactId>
-      <version>[2.5.4,)</version>
-    </dependency>
-  	<dependency>
-  	  <groupId>org.bukkit</groupId>
-  	  <artifactId>bukkit</artifactId>
-  	  <version>[1.0.0-R1-SNAPSHOT,)</version>
-  	  <type>jar</type>
-      <scope>compile</scope>
-  	</dependency>
-  	<dependency>
-  		<groupId>org.dynmap</groupId>
-  		<artifactId>dynmap-api</artifactId>
-  		<version>[0.25,)</version>
-  		<type>jar</type>
-  		<scope>compile</scope>
-  	</dependency>
-  </dependencies>
+		</plugins>
+	</build>
+	<repositories>
+		<repository>
+			<releases>
+			</releases>
+			<snapshots>
+			</snapshots>
+			<id>spout-repo</id>
+			<url>http://repo.spout.org</url>
+		</repository>
+	</repositories>
+	<dependencies>
+		<dependency>
+			<groupId>com.nijikokun.bukkit</groupId>
+			<artifactId>Permissions</artifactId>
+			<version>[2.5.4,)</version>
+		</dependency>
+		<dependency>
+			<groupId>org.bukkit</groupId>
+			<artifactId>bukkit</artifactId>
+			<version>[1.1-R5-SNAPSHOT,1.7)</version>
+			<type>jar</type>
+			<scope>compile</scope>
+		</dependency>
+		<dependency>
+			<groupId>org.dynmap</groupId>
+			<artifactId>dynmap-api</artifactId>
+			<version>${project.version}</version>
+			<type>jar</type>
+			<scope>compile</scope>
+		</dependency>
+
+		<dependency>
+			<groupId>org.dynmap</groupId>
+			<artifactId>DynmapCore</artifactId>
+			<version>${project.version}</version>
+			<type>jar</type>
+			<scope>compile</scope>
+		</dependency>
+		<dependency>
+			<groupId>org.getspout</groupId>
+			<artifactId>spoutpluginapi</artifactId>
+			<version>dev-SNAPSHOT</version>
+			<scope>compile</scope>
+		</dependency>
+	</dependencies>
 </project>

renderdata/bc-models.txt

@@ -1,259 +0,0 @@
-# BuildCraft Block mapping
-# define buildcraft-support: true in configuration.txt to enable
-enabled:buildcraft-support
-# Pipe - set render alg
-linkmap:id=145,linkalg=5,linkid=146,linkid=147,linkid=148,linkid=149,linkid=156,linkid=159,linkid=166
-linkmap:id=146,linkalg=5,linkid=145,linkid=146,linkid=147,linkid=148,linkid=149,linkid=156,linkid=159,linkid=166
-linkmap:id=147,linkalg=5,linkid=145,linkid=146,linkid=147,linkid=148,linkid=149,linkid=156,linkid=159,linkid=166
-linkmap:id=148,linkalg=5,linkid=145,linkid=146,linkid=147,linkid=149,linkid=156,linkid=159,linkid=166
-linkmap:id=149,linkalg=5,linkid=145,linkid=146,linkid=147,linkid=148,linkid=149,linkid=156,linkid=159,linkid=166
-linkmap:id=156,linkalg=5,linkid=145,linkid=146,linkid=147,linkid=148,linkid=149,linkid=159,linkid=166
-linkmap:id=159,linkalg=5,linkid=145,linkid=146,linkid=147,linkid=148,linkid=149,linkid=156,linkid=159,linkid=166
-linkmap:id=166,linkalg=5,linkid=145,linkid=146,linkid=147,linkid=148,linkid=149,linkid=156,linkid=159,linkid=166
-# Frame
-linkmap:id=160,linkalg=5,linkid=160
-# Pipe - (data is faked: 1=north,2=east,4=south,8=west)
-# Pipe - no neighbors
-# Frame
-block:id=145,id=146,id=147,id=148,id=149,id=156,id=159,id=166,id=160,data=0,scale=4
-layer:1,2
-----
--**-
--**-
-----
-# Pipe - just north neighbor
-# Frame
-block:id=145,id=146,id=147,id=148,id=149,id=156,id=159,id=166,id=160,data=1,scale=4
-layer:1,2
--**-
--**-
--**-
-----
-# Pipe - just east neighbor
-# Frame
-block:id=145,id=146,id=147,id=148,id=149,id=156,id=159,id=166,id=160,data=2,scale=4
-rotate:id=145,data=1,rot=90
-# Pipe - just south neighbor
-# Frame
-block:id=145,id=146,id=147,id=148,id=149,id=156,id=159,id=166,id=160,data=4,scale=4
-rotate:id=145,data=1,rot=180
-# Pipe - just south neighbor
-# Frame
-block:id=145,id=146,id=147,id=148,id=149,id=156,id=159,id=166,id=160,data=8,scale=4
-rotate:id=145,data=1,rot=270
-# Pipe - north and east neighbor
-# Frame
-block:id=145,id=146,id=147,id=148,id=149,id=156,id=159,id=166,id=160,data=3,scale=4
-layer:1,2
--**-
--***
--***
-----
-# Pipe - east and south neighbor
-# Frame
-block:id=145,id=146,id=147,id=148,id=149,id=156,id=159,id=166,id=160,data=6,scale=4
-rotate:id=145,data=3,rot=90
-# Pipe - south and west neighbor
-# Frame
-block:id=145,id=146,id=147,id=148,id=149,id=156,id=159,id=166,id=160,data=12,scale=4
-rotate:id=145,data=3,rot=180
-# Pipe - west and north neighbor
-# Frame
-block:id=145,id=146,id=147,id=148,id=149,id=156,id=159,id=166,id=160,data=9,scale=4
-rotate:id=145,data=3,rot=270
-# Pipe - north and south neighbor
-# Frame
-block:id=145,id=146,id=147,id=148,id=149,id=156,id=159,id=166,id=160,data=5,scale=4
-layer:1,2
--**-
--**-
--**-
--**-
-# Pipe - east and west neighbor
-# Frame
-block:id=145,id=146,id=147,id=148,id=149,id=156,id=159,id=166,id=160,data=10,scale=4
-rotate:id=145,data=5,rot=90
-# Pipe - north, east and south neighbor
-# Frame
-block:id=145,id=146,id=147,id=148,id=149,id=156,id=159,id=166,id=160,data=7,scale=4
-layer:1,2
--**-
--***
--***
--**-
-# Pipe - east, south and west neighbor
-# Frame
-block:id=145,id=146,id=147,id=148,id=149,id=156,id=159,id=166,id=160,data=14,scale=4
-rotate:id=145,data=7,rot=90
-# Pipe - south, west and north neighbor
-# Frame
-block:id=145,id=146,id=147,id=148,id=149,id=156,id=159,id=166,id=160,data=13,scale=4
-rotate:id=145,data=7,rot=180
-# Pipe - west, north and east neighbor
-# Frame
-block:id=145,id=146,id=147,id=148,id=149,id=156,id=159,id=166,id=160,data=11,scale=4
-rotate:id=145,data=7,rot=270
-# Pipe - north, south, east, west neightbors
-# Frame
-block:id=145,id=146,id=147,id=148,id=149,id=156,id=159,id=166,id=160,data=15,scale=4
-layer:1,2
--**-
-****
-****
--**-
-# Drill - set render alg
-linkmap:id=151,linkalg=5
-# Drill - (data is faked: 1=north,2=east,4=south,8=west)
-# Drill - no neighbors
-block:id=151,data=0,scale=4
-layer:0,1,2,3
-----
--**-
--**-
-----
-# Drill - just north neighbor
-block:id=151,data=1,scale=4
-layer:0,3
-----
--**-
--**-
-----
-layer:1,2
--**-
--**-
--**-
-----
-# Drill - just east neighbor
-block:id=151,data=2,scale=4
-rotate:id=151,data=1,rot=90
-# Drill - just south neighbor
-block:id=151,data=4,scale=4
-rotate:id=151,data=1,rot=180
-# Drill - just south neighbor
-block:id=151,data=8,scale=4
-rotate:id=151,data=1,rot=270
-# Drill - north and east neighbor
-block:id=151,data=3,scale=4
-layer:0,3
-----
--**-
--**-
-----
-layer:1,2
--**-
--***
--***
-----
-# Drill - east and south neighbor
-block:id=151,data=6,scale=4
-rotate:id=151,data=3,rot=90
-# Drill - south and west neighbor
-block:id=151,data=12,scale=4
-rotate:id=151,data=3,rot=180
-# Drill - west and north neighbor
-block:id=151,data=9,scale=4
-rotate:id=151,data=3,rot=270
-# Drill - north and south neighbor
-block:id=151,data=5,scale=4
-layer:0,3
-----
--**-
--**-
-----
-layer:1,2
--**-
--**-
--**-
--**-
-# Drill - east and west neighbor
-block:id=151,data=10,scale=4
-rotate:id=151,data=5,rot=90
-# Drill - north, east and south neighbor
-block:id=151,data=7,scale=4
-layer:0,3
-----
--**-
--**-
-----
-layer:1,2
--**-
--***
--***
--**-
-# Drill - east, south and west neighbor
-block:id=151,data=14,scale=4
-rotate:id=151,data=7,rot=90
-# Drill - south, west and north neighbor
-block:id=151,data=13,scale=4
-rotate:id=151,data=7,rot=180
-# Drill - west, north and east neighbor
-block:id=151,data=11,scale=4
-rotate:id=151,data=7,rot=270
-# Drill - north, south, east, west neightbors
-block:id=151,data=15,scale=4
-layer:0,3
-----
--**-
--**-
-----
-layer:1,2
--**-
-****
-****
--**-
-# Marker
-block:id=154,data=*,scale=8
-layer:0,1,2,3,4,5,6,7
---------
---------
----**---
---****--
---****--
----**---
---------
---------
-# Engine
-block:id=161,data=*,scale=8
-layer:2,3
-********
-********
-********
-********
-********
-********
-********
-********
-layer:4,5,6,7
---------
---------
---****--
---****--
---****--
---****--
---------
---------
-# Oil, flowing
-block:id=162,data=*,scale=4
-layer:0
-****
-****
-****
-****
-# Oil
-block:id=163,data=*,scale=4
-layer:0,1
-****
-****
-****
-****
-# Tank
-block:id=165,data=*,scale=8
-layer:0,1,2,3,4,5,6,7
---------
--******-
--******-
--******-
--******-
--******-
--******-
---------

renderdata/bc-texture.txt

@@ -1,69 +0,0 @@
-# BuildCraft Block mapping
-# define buildcraft-support: true in configuration.txt to enable
-enabled:buildcraft-support
-# Files
-texturefile:id=blk,filename=buildcraft/block_textures.png,xcount=16,ycount=16
-texturefile:id=wood,filename=buildcraft/base_wood.png,xcount=4,ycount=2
-texturefile:id=iron,filename=buildcraft/base_iron.png,xcount=4,ycount=2
-texturefile:id=stone,filename=buildcraft/base_stone.png,xcount=4,ycount=2
-# WOODEN_PIPE_ID      = 145
-block:id=145,data=*,allfaces=16,txtid=blk,transparency=TRANSPARENT
-# STONE_PIPE_ID       = 146
-block:id=146,data=*,allfaces=29,txtid=blk,transparency=TRANSPARENT
-# IRON_PIPE_ID        = 147
-block:id=147,data=*,allfaces=19,txtid=blk,transparency=TRANSPARENT
-# GOLDEN_PIPE_ID      = 148
-block:id=148,data=*,allfaces=20,txtid=blk,transparency=TRANSPARENT
-# DIAMOND_PIPE_ID     = 149
-block:id=149,data=*,allfaces=21,txtid=blk,transparency=TRANSPARENT
-# MINING_WELL_ID      = 150
-block:id=150,data=2,east=35,top=4036,north=37,south=37,west=38,bottom=38,txtid=blk
-block:id=150,data=3,west=35,top=4036,north=37,south=37,east=38,bottom=38,txtid=blk
-block:id=150,data=4,north=35,top=4036,east=37,west=37,south=38,bottom=38,txtid=blk
-block:id=150,data=5,south=35,top=4036,east=37,west=37,north=38,bottom=38,txtid=blk
-# DRILL_ID            = 151
-block:id=151,data=*,allfaces=32,txtid=blk,transparency=TRANSPARENT
-# AUTO_WORKBENCH_ID   = 152
-block:id=152,data=*,allsides=44,topbottom=4043
-# QUARRY_ID           = 153
-block:id=153,data=2,east=39,top=4040,north=38,south=38,west=38,bottom=38,txtid=blk
-block:id=153,data=3,west=39,top=4040,north=38,south=38,east=38,bottom=38,txtid=blk
-block:id=153,data=4,north=39,top=4040,east=38,west=38,south=38,bottom=38,txtid=blk
-block:id=153,data=5,south=39,top=4040,east=38,west=38,north=38,bottom=38,txtid=blk
-# MARKER_ID           = 154
-block:id=154,data=*,allsides=57,txtid=blk,transparency=TRANSPARENT
-# FILLER_ID           = 155
-block:id=155,data=*,allsides=66,topbottom=4065,txtid=blk
-# OBSIDIAN_PIPE_ID    = 156
-block:id=156,data=*,allfaces=28,txtid=blk,transparency=TRANSPARENT
-# BUILDER_ID          = 157
-block:id=157,data=2,east=55,top=4054,north=3,south=3,west=3,bottom=3,txtid=blk
-block:id=157,data=3,west=55,top=4054,north=3,south=3,east=3,bottom=3,txtid=blk
-block:id=157,data=4,north=55,top=4054,east=3,west=3,south=3,bottom=3,txtid=blk
-block:id=157,data=5,south=55,top=4054,east=3,west=3,north=3,bottom=3,txtid=blk
-# TEMPLATE_ID         = 158
-block:id=158,data=2,east=52,top=4050,north=48,south=48,west=48,bottom=48,txtid=blk
-block:id=158,data=3,west=52,top=4050,north=48,south=48,east=48,bottom=48,txtid=blk
-block:id=158,data=4,north=52,top=4050,east=48,west=48,south=48,bottom=48,txtid=blk
-block:id=158,data=5,south=52,top=4050,east=48,west=48,north=48,bottom=48,txtid=blk
-# COBBLESTONE_PIPE_ID = 159
-block:id=159,data=*,allfaces=17,txtid=blk,transparency=TRANSPARENT
-# FRAME_ID            = 160
-block:id=160,data=*,allfaces=34,txtid=blk,transparency=TRANSPARENT
-# ENGINE_ID           = 161
-block:id=161,data=0,north=8004,east=8005,south=8006,west=8007,top=1,bottom=2,txtid=wood
-block:id=161,data=1,north=8004,east=8005,south=8006,west=8007,top=1,bottom=2,txtid=stone
-block:id=161,data=2,north=8004,east=8005,south=8006,west=8007,top=1,bottom=2,txtid=iron
-# OIL_MOVING_ID       = 162
-block:id=162,data=*,allfaces=223,txtid=blk
-# OIL_STILL_ID        = 163
-block:id=163,data=*,allfaces=223,txtid=blk
-# PUMP_ID             = 164
-block:id=164,data=*,allsides=99,top=4064,bottom=100,txtid=blk
-# TANK_ID             = 165
-block:id=165,data=*,allsides=96,topbottom=98,txtid=blk,transparency=TRANSPARENT
-# GENERIC_PIPE_ID     = 166 : entity data based, so we can't handle it yet: just map to one type (iron)
-block:id=166,data=*,allfaces=18,txtid=blk,transparency=TRANSPARENT
-# REFINERY_ID         = 167 - funky texture mapping - just do tank for now
-block:id=167,data=*,allsides=96,topbottom=98,txtid=blk,transparency=TRANSPARENT
-# DOCKING_STATION_ID  = 168

renderdata/ic2-models.txt

@@ -1,201 +0,0 @@
-# Industrial Craft 2 Texture mapping
-# define ic2-support: true in configuration.txt to enable
-enabled:ic2-support
-# Wire - set render alg
-linkmap:id=228,linkalg=5,linkid=223,linkid=225,linkid=226,linkid=227,linkid=228,linkid=233,linkid=237,linkid=246,linkid=250
-# Wire - (data is faked: 1=north,2=east,4=south,8=west)
-# Wire - no neighbors
-block:id=228,data=0,scale=16
-layer:5,6,7,8,9,10
-----------------
-----------------
-----------------
-----------------
-----------------
------******-----
------******-----
------******-----
------******-----
------******-----
------******-----
-----------------
-----------------
-----------------
-----------------
-----------------
-# Wire - just north neighbor
-block:id=228,data=1,scale=16
-layer:5,6,7,8,9,10
------******-----
------******-----
------******-----
------******-----
------******-----
------******-----
------******-----
------******-----
------******-----
------******-----
------******-----
-----------------
-----------------
-----------------
-----------------
-----------------
-# Wire - just east neighbor
-block:id=228,data=2,scale=16
-rotate:id=228,data=1,rot=90
-# Wire - just south neighbor
-block:id=228,id=113,data=4,scale=16
-rotate:id=228,data=1,rot=180
-# Wire - just south neighbor
-block:id=228,data=8,scale=16
-rotate:id=228,data=1,rot=270
-# Wire - north and east neighbor
-block:id=228,data=3,scale=16
-layer:5,6,7,8,9,10
------******-----
------******-----
------******-----
------******-----
------******-----
------******-----
------***********
------***********
------***********
------***********
------***********
-----------------
-----------------
-----------------
-----------------
-----------------
-# Wire - east and south neighbor
-block:id=228,data=6,scale=16
-rotate:id=228,data=3,rot=90
-# Wire - south and west neighbor
-block:id=228,data=12,scale=16
-rotate:id=228,data=3,rot=180
-# Wire - west and north neighbor
-block:id=228,data=9,scale=16
-rotate:id=228,data=3,rot=270
-# Wire - north and south neighbor
-block:id=228,data=5,scale=16
-layer:5,6,7,8,9,10
------******-----
------******-----
------******-----
------******-----
------******-----
------******-----
------******-----
------******-----
------******-----
------******-----
------******-----
------******-----
------******-----
------******-----
------******-----
------******-----
-# Wire - east and west neighbor
-block:id=228,data=10,scale=16
-rotate:id=228,data=5,rot=90
-# Wire - north, east and south neighbor
-block:id=228,data=7,scale=16
-layer:5,6,7,8,9,10
------******-----
------******-----
------******-----
------******-----
------******-----
------***********
------***********
------***********
------***********
------***********
------***********
------******-----
------******-----
------******-----
------******-----
------******-----
-# Wire - east, south and west neighbor
-block:id=228,data=14,scale=16
-rotate:id=228,data=7,rot=90
-# Wire - south, west and north neighbor
-block:id=228,data=13,scale=16
-rotate:id=228,data=7,rot=180
-# Wire - west, north and east neighbor
-block:id=228,data=11,scale=16
-rotate:id=228,data=7,rot=270
-# Wire - north, south, east, west neightbors
-block:id=228,data=15,scale=16
-layer:5,6,7,8,9,10
------******-----
------******-----
------******-----
------******-----
------******-----
-****************
-****************
-****************
-****************
-****************
-****************
------******-----
------******-----
------******-----
------******-----
------******-----
-# Iron Fence - set render algorithm
-linkmap:id=232,linkalg=1
-# Iron Fence - (data is faked: 1=north,2=east,4=south,8=west)
-# Iron Fence - no neighbors
-block:id=232,data=0,scale=16
-rotate:id=85,data=0,rot=0
-# Iron Fence - just north neighbor
-block:id=232,data=1,scale=16
-rotate:id=85,data=1,rot=0
-# Iron Fence - just east neighbor
-block:id=232,data=2,scale=16
-rotate:id=232,data=1,rot=90
-# Iron Fence - just south neighbor
-block:id=232,data=4,scale=16
-rotate:id=232,data=1,rot=180
-# Iron Fence - just south neighbor
-block:id=232,data=8,scale=16
-rotate:id=232,data=1,rot=270
-# Iron Fence - north and east neighbor
-block:id=232,data=3,scale=16
-rotate:id=85,data=3,rot=0
-# Iron Fence - east and south neighbor
-block:id=232,data=6,scale=16
-rotate:id=232,data=3,rot=90
-# Iron Fence - south and west neighbor
-block:id=232,data=12,scale=16
-rotate:id=85,data=3,rot=180
-# Iron Fence - west and north neighbor
-block:id=232,data=9,scale=16
-rotate:id=85,data=3,rot=270
-# Iron Fence - north and south neighbor
-block:id=232,data=5,scale=16
-rotate:id=85,data=5,rot=0
-# Iron Fence - east and west neighbor
-block:id=232,id=113,data=10,scale=16
-rotate:id=232,data=5,rot=90
-# Iron Fence - north, east and south neighbor
-block:id=232,data=7,scale=16
-rotate:id=85,data=7,rot=0
-# Iron Fence - east, south and west neighbor
-block:id=232,data=14,scale=16
-rotate:id=232,data=7,rot=90
-# Iron Fence - south, west and north neighbor
-block:id=232,data=13,scale=16
-rotate:id=232,data=7,rot=180
-# Iron Fence - west, north and east neighbor
-block:id=232,data=11,scale=16
-rotate:id=232,data=7,rot=270
-# Iron Fence - north, south, east, west neightbors
-block:id=232,data=15,scale=16
-rotate:id=232,data=15,rot=0

renderdata/ic2-texture.txt

@@ -1,197 +0,0 @@
-# Industrial Craft 2 Block mapping
-# define ic2-support: true in configuration.txt to enable
-enabled:ic2-support
-# Files
-texturefile:id=blk0,filename=ic2/sprites/block_0.png,xcount=16,ycount=16
-texturefile:id=cable,filename=ic2/sprites/block_cable.png,xcount=16,ycount=16
-texturefile:id=elec,filename=ic2/sprites/block_electric.png,xcount=16,ycount=16
-texturefile:id=gen,filename=ic2/sprites/block_generator.png,xcount=16,ycount=16
-texturefile:id=mach,filename=ic2/sprites/block_machine.png,xcount=16,ycount=16
-texturefile:id=mach2,filename=ic2/sprites/block_machine2.png,xcount=16,ycount=16
-texturefile:id=pers,filename=ic2/sprites/block_personal.png,xcount=16,ycount=16
-# Blocks
-# blockScaffold=220
-#  data=*
-block:id=220,data=*,allsides=116,topbottom=117,txtid=blk0
-#  data=2
-block:id=220,data=2,allfaces=118,txtid=blk0
-# blockWall=221
-#  data=0
-block:id=221,data=0,allfaces=96,txtid=blk0
-#  data=1
-block:id=221,data=1,allfaces=97,txtid=blk0
-#  data=2
-block:id=221,data=2,allfaces=98,txtid=blk0
-#  data=3
-block:id=221,data=3,allfaces=99,txtid=blk0
-#  data=4
-block:id=221,data=4,allfaces=100,txtid=blk0
-#  data=5
-block:id=221,data=5,allfaces=101,txtid=blk0
-#  data=6
-block:id=221,data=6,allfaces=102,txtid=blk0
-#  data=7
-block:id=221,data=7,allfaces=103,txtid=blk0
-#  data=8
-block:id=221,data=8,allfaces=104,txtid=blk0
-#  data=9
-block:id=221,data=9,allfaces=105,txtid=blk0
-#  data=10
-block:id=221,data=10,allfaces=106,txtid=blk0
-#  data=11
-block:id=221,data=11,allfaces=107,txtid=blk0
-#  data=12
-block:id=221,data=12,allfaces=108,txtid=blk0
-#  data=13
-block:id=221,data=13,allfaces=109,txtid=blk0
-#  data=14
-block:id=221,data=14,allfaces=110,txtid=blk0
-#  data=15
-block:id=221,data=15,allfaces=111,txtid=blk0
-# blockFoam=222
-block:id=222,data=*,allfaces=37
-# blockMachine2=223
-#  data=0
-block:id=223,data=0,top=0,bottom=16,north=32,south=48,east=64,west=80,txtid=mach2
-#  data=1
-block:id=223,data=1,top=1,bottom=17,north=33,south=49,east=65,west=81,txtid=mach2
-# blockMetal=224 
-#  data=0 (copper)
-block:id=224,data=0,allfaces=93,txtid=blk0
-#  data=1 (tin)
-block:id=224,data=1,allfaces=94,txtid=blk0
-#  data=2 (bronze)
-block:id=224,data=2,allfaces=78,txtid=blk0
-#  data=3 (uranium)
-block:id=224,data=3,topbottom=79,allsides=95,txtid=blk0
-# blockPersonal=225
-#  data=0
-block:id=225,data=0,bottom=0,top=16,north=32,south=48,east=64,west=80,txtid=pers
-#  data=1
-block:id=225,data=1,bottom=1,top=17,north=33,south=49,east=65,west=81,txtid=pers
-# blockLuminator=226
-block:id=226,data=*,allfaces=31,txtid=blk0
-# blockElectric=227
-#  data=0
-block:id=227,data=0,bottom=0,top=16,north=32,south=48,east=64,west=80,txtid=elec
-#  data=1
-block:id=227,data=1,bottom=1,top=17,north=33,south=49,east=65,west=81,txtid=elec
-#  data=2
-block:id=227,data=2,bottom=2,top=18,north=34,south=50,east=66,west=82,txtid=elec
-#  data=3
-block:id=227,data=3,bottom=3,top=19,north=35,south=51,east=67,west=83,txtid=elec
-#  data=4
-block:id=227,data=4,bottom=4,top=20,north=36,south=52,east=68,west=84,txtid=elec
-#  data=5
-block:id=227,data=5,bottom=5,top=21,north=37,south=53,east=69,west=85,txtid=elec
-# blockCable=228
-#  data=0
-block:id=228,data=0,allfaces=0,txtid=cable
-#  data=1
-block:id=228,data=1,allfaces=16,txtid=cable
-#  data=2
-block:id=228,data=2,allfaces=32,txtid=cable
-#  data=3
-block:id=228,data=3,allfaces=48,txtid=cable
-#  data=4
-block:id=228,data=4,allfaces=64,txtid=cable
-#  data=5
-block:id=228,data=5,allfaces=80,txtid=cable
-#  data=6
-block:id=228,data=6,allfaces=96,txtid=cable
-#  data=7
-block:id=228,data=7,allfaces=112,txtid=cable
-#  data=8
-block:id=228,data=8,allfaces=128,txtid=cable
-#  data=9
-block:id=228,data=9,allfaces=144,txtid=cable
-#  data=10
-block:id=228,data=10,allfaces=160,txtid=cable
-# blockDoorAlloy=229
-#   data=0-7 (bottom)
-block:id=229,data=0,data=1,data=2,data=3,data=4,data=5,data=6,data=7,allsides=15,topbottom=12,transparency=TRANSPARENT,txtid=blk0
-#   data=8-15 (top)
-block:id=229,data=8,data=9,data=10,data=11,data=12,data=13,data=14,data=15,allsides=14,topbottom=12,transparency=TRANSPARENT,txtid=blk0
-# blockAlloyGlass=230
-block:id=230,data=*,allfaces=13,txtid=blk0,transparency=TRANSPARENT
-# blockAlloy=231
-block:id=231,data=*,allfaces=12,txtid=blk0
-# blockFenceIron=232
-block:id=232,data=*,allfaces=1,txtid=blk0,transparency=TRANSPARENT
-# blockReactorChamber=233
-block:id=233,data=*,bottom=16,top=17,allsides=67,txtid=blk0
-# blockRubber=234
-block:id=234,data=*,allfaces=40,txtid=blk0
-# blockDynamiteRemote=235
-block:id=235,data=*,allsides=56,txtid=blk0
-# blockDynamite=236
-block:id=236,data=*,allsides=57,txtid=blk0
-# blockNuke=237
-block:id=237,data=*,bottom=61,top=62,allsides=63,txtid=blk0
-# ?=238
-# blockITNT=239
-block:id=239,data=*,bottom=58,top=59,allsides=60,txtid=blk0
-# blockHarz=240
-block:id=240,data=*,allfaces=43,txtid=blk0
-# blockRubSapling=241
-block:id=241,data=*,allsides=2038,transparency=TRANSPARENT,txtid=blk0
-# blockRubLeaves=242
-block:id=242,data=*,allfaces=2040,transparency=TRANSPARENT,txtid=blk0
-# blockRubWood=243
-block:id=243,data=*,topbottom=47,allsides=44,txtid=blk0
-# blockMiningTip=244
-block:id=244,data=*,allfaces=36,txtid=blk0
-# blockMiningPipe=245
-block:id=245,data=*,allfaces=35,txtid=blk0
-# blockGenerator=246
-#  data=0
-block:id=246,data=0,bottom=0,top=16,north=32,south=48,east=64,west=80,txtid=gen
-#  data=1
-block:id=246,data=1,bottom=1,top=17,north=33,south=49,east=65,west=81,txtid=gen
-#  data=2
-block:id=246,data=2,bottom=2,top=18,north=34,south=50,east=66,west=82,txtid=gen
-#  data=3
-block:id=246,data=3,bottom=3,top=19,north=35,south=51,east=67,west=83,txtid=gen
-#  data=4
-block:id=246,data=4,bottom=4,top=20,north=36,south=52,east=68,west=84,txtid=gen
-#  data=5
-block:id=246,data=5,bottom=5,top=21,north=37,south=53,east=69,west=85,txtid=gen
-# blockOreUran=247
-block:id=247,data=*,allfaces=34,txtid=blk0
-# blockOreTin=248
-block:id=248,data=*,allfaces=33,txtid=blk0
-# blockOreCopper=249
-block:id=249,data=*,allfaces=32,txtid=blk0
-# blockMachine=250
-#  data=0
-block:id=250,data=0,bottom=0,top=16,north=32,south=48,east=64,west=80,txtid=mach
-#  data=1
-block:id=250,data=1,bottom=1,top=17,north=33,south=49,east=65,west=81,txtid=mach
-#  data=2
-block:id=250,data=2,bottom=2,top=18,north=34,south=50,east=66,west=82,txtid=mach
-#  data=3
-block:id=250,data=3,bottom=3,top=19,north=35,south=51,east=67,west=83,txtid=mach
-#  data=4
-block:id=250,data=4,bottom=4,top=20,north=36,south=52,east=68,west=84,txtid=mach
-#  data=5
-block:id=250,data=5,bottom=5,top=21,north=37,south=53,east=69,west=85,txtid=mach
-#  data=6
-block:id=250,data=6,bottom=6,top=22,north=38,south=54,east=70,west=86,txtid=mach
-#  data=7
-block:id=250,data=7,bottom=7,top=23,north=39,south=55,east=71,west=87,txtid=mach
-#  data=8
-block:id=250,data=8,bottom=8,top=24,north=40,south=56,east=72,west=88,txtid=mach
-#  data=9
-block:id=250,data=9,bottom=9,top=25,north=41,south=57,east=73,west=89,txtid=mach
-#  data=10
-block:id=250,data=10,bottom=10,top=26,north=42,south=58,east=74,west=90,txtid=mach
-#  data=11
-block:id=250,data=11,bottom=11,top=27,north=43,south=59,east=75,west=91,txtid=mach
-#  data=12
-block:id=250,data=12,bottom=12,top=28,north=44,south=60,east=76,west=92,txtid=mach
-#  data=13
-block:id=250,data=13,bottom=13,top=29,north=45,south=61,east=77,west=93,txtid=mach
-#  data=14
-block:id=250,data=14,bottom=14,top=30,north=46,south=62,east=78,west=94,txtid=mach
-#  data=15
-block:id=250,data=15,bottom=15,top=31,north=47,south=63,east=79,west=95,txtid=mach

src/main/assembly/package.xml

@@ -6,40 +6,16 @@
   </formats>
   <fileSets>
     <fileSet>
-      <directory>${project.basedir}</directory>
-      <outputDirectory>/</outputDirectory>
-      <includes>
-        <include>README*</include>
-        <include>LICENSE*</include>
-        <include>NOTICE*</include>
-        <include>CHANGELOG*</include>
-      </includes>
-    </fileSet>
+    	<directory>${project.build.directory}/core</directory>
+    	<outputDirectory>/dynmap</outputDirectory>
+    	<excludes>
+    		<exclude>web/version.js</exclude></excludes></fileSet>
     <fileSet>
-      <directory>${project.basedir}/web/</directory>
-      <outputDirectory>/dynmap/web/</outputDirectory>
-	  <includes>
-		<include>version.js</include>
-	  </includes>
-      <filtered>true</filtered>
-    </fileSet>
-    <fileSet>
-      <directory>${project.basedir}/web</directory>
-      <outputDirectory>/dynmap/web</outputDirectory>
-	  <excludes>
-		<exclude>version.js</exclude>
-	  </excludes>
-    </fileSet>
-    <fileSet>
-      <directory>${project.basedir}/colorschemes</directory>
-      <outputDirectory>/dynmap/colorschemes</outputDirectory>
-    </fileSet>
-    <fileSet>
-    	<directory>${project.basedir}/texturepacks</directory>
-    	<outputDirectory>/dynmap/texturepacks</outputDirectory></fileSet>
-    <fileSet>
-    	<directory>${project.basedir}/renderdata</directory>
-    	<outputDirectory>/dynmap/renderdata</outputDirectory></fileSet>
+    	<directory>${project.build.directory}/core/web</directory>
+    	<outputDirectory>/dynmap/web</outputDirectory>
+    	<includes>
+    		<include>version.js</include></includes>
+    	<filtered>true</filtered></fileSet>
   </fileSets>
   <files>
   	<file>

src/main/java/org/dynmap/AsynchronousQueue.java

@@ -1,157 +0,0 @@
-package org.dynmap;
-
-import java.util.ArrayList;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Set;
-import java.util.concurrent.LinkedBlockingQueue;
-
-public class AsynchronousQueue<T> {
-    private Object lock = new Object();
-    private Thread thread;
-    private LinkedBlockingQueue<T> queue = new LinkedBlockingQueue<T>();
-    private Set<T> set = new HashSet<T>();
-    private Handler<T> handler;
-    private int dequeueTime;
-    private int accelDequeueTime;
-    private int accelDequeueThresh;
-    private int pendingcnt;
-    private int pendinglimit;
-    
-    public AsynchronousQueue(Handler<T> handler, int dequeueTime, int accelDequeueThresh, int accelDequeueTime, int pendinglimit) {
-        this.handler = handler;
-        this.dequeueTime = dequeueTime;
-        this.accelDequeueTime = accelDequeueTime;
-        this.accelDequeueThresh = accelDequeueThresh;
-        this.pendinglimit = pendinglimit;
-    }
-
-    public boolean push(T t) {
-        synchronized (lock) {
-            if (!set.add(t)) {
-                return false;
-            }
-        }
-        queue.offer(t);
-        return true;
-    }
-
-    private T pop() {
-        try {
-            T t = queue.take();
-            synchronized (lock) {
-                set.remove(t);
-            }
-            return t;
-        } catch (InterruptedException ix) {
-            return null;
-        }
-    }
-    
-    public boolean remove(T t) {
-        synchronized (lock) {
-            if (set.remove(t)) {
-                queue.remove(t);
-            	return true;
-            }
-        }
-        return false;
-    }
-
-    public int size() {
-        return set.size();
-    }
-
-    public List<T> popAll() {
-        List<T> s;
-        synchronized(lock) {
-            s = new ArrayList<T>(queue);
-            queue.clear();
-            set.clear();
-        }
-        return s;
-    }
-    
-    public void start() {
-        synchronized (lock) {
-            thread = new Thread(new Runnable() {
-                @Override
-                public void run() {
-                    running();
-                }
-            });
-            thread.start();
-            try {
-                thread.setPriority(Thread.MIN_PRIORITY);
-            } catch (SecurityException e) {
-                Log.info("Failed to set minimum priority for worker thread!");
-            }
-        }
-    }
-
-    public void stop() {
-        synchronized (lock) {
-            if (thread == null)
-                return;
-            Thread oldThread = thread;
-            thread = null;
-
-            Log.info("Stopping map renderer...");
-
-            oldThread.interrupt();
-            try {
-                oldThread.join(1000);
-            } catch (InterruptedException e) {
-                Log.info("Waiting for map renderer to stop is interrupted");
-            }
-        }
-    }
-
-    private void running() {
-        try {
-            while (Thread.currentThread() == thread) {
-            	synchronized(lock) {
-            		while(pendingcnt >= pendinglimit) {
-            			try {
-            				lock.wait(accelDequeueTime);
-            			} catch (InterruptedException ix) {
-            				if(Thread.currentThread() != thread)
-            					return;
-            				throw ix;
-            			}
-            		}
-            	}
-                T t = pop();
-                if (t != null) {
-                	synchronized(lock) {
-                		pendingcnt++;
-                	}
-                    handler.handle(t);
-                }
-                if(set.size() >= accelDequeueThresh)
-                    sleep(accelDequeueTime);
-                else
-                    sleep(dequeueTime);
-            }
-
-        } catch (Exception ex) {
-            Log.severe("Exception on rendering-thread", ex);
-        }
-    }
-
-    private boolean sleep(int time) {
-        try {
-            Thread.sleep(time);
-        } catch (InterruptedException e) {
-            return false;
-        }
-        return true;
-    }
-    
-    public void done(T t) {
-        synchronized (lock) {
-        	if(pendingcnt > 0) pendingcnt--;
-        	lock.notifyAll();
-        }
-    }
-}

src/main/java/org/dynmap/ChatEvent.java

@@ -1,12 +0,0 @@
-package org.dynmap;
-
-public class ChatEvent {
-    public String source;
-    public String name;
-    public String message;
-    public ChatEvent(String source, String name, String message) {
-        this.source = source;
-        this.name = name;
-        this.message = message;
-    }
-}

src/main/java/org/dynmap/Client.java

@@ -1,86 +0,0 @@
-package org.dynmap;
-
-import java.io.IOException;
-import java.io.Writer;
-
-import org.bukkit.ChatColor;
-import org.dynmap.markers.Marker;
-import org.dynmap.markers.MarkerSet;
-import org.json.simple.JSONAware;
-import org.json.simple.JSONStreamAware;
-
-public class Client {
-    public static class Update implements JSONAware, JSONStreamAware {
-        public long timestamp = System.currentTimeMillis();
-
-        @Override
-        public String toJSONString() {
-            return org.dynmap.web.Json.stringifyJson(this);
-        }
-
-        @Override
-        public void writeJSONString(Writer w) throws IOException {
-            // TODO: This isn't the best...
-            w.write(toJSONString());
-        }
-    }
-
-    public static class ChatMessage extends Update {
-        public String type = "chat";
-        public String source;
-        public String playerName;
-        public String message;
-        public String account;
-        public String channel;
-        public ChatMessage(String source, String channel, String playerName, String message, String playeraccount) {
-            this.source = source;
-            this.playerName = ChatColor.stripColor(playerName);
-            this.message = ChatColor.stripColor(message);
-            this.account = playeraccount;
-            this.channel = channel;
-        }
-    }
-
-    public static class PlayerJoinMessage extends Update {
-        public String type = "playerjoin";
-        public String playerName;
-        public String account;
-        public PlayerJoinMessage(String playerName, String playeraccount) {
-            this.playerName = ChatColor.stripColor(playerName);
-            this.account = playeraccount;
-        }
-    }
-
-    public static class PlayerQuitMessage extends Update {
-        public String type = "playerquit";
-        public String playerName;
-        public String account;
-        public PlayerQuitMessage(String playerName, String playeraccount) {
-            this.playerName = ChatColor.stripColor(playerName);
-            this.account = playeraccount;
-        }
-    }
-
-    public static class Tile extends Update {
-        public String type = "tile";
-        public String name;
-
-        public Tile(String name) {
-            this.name = name;
-        }
-    }
-
-    public static class DayNight extends Update {
-        public String type = "daynight";
-        public boolean isday;
-
-        public DayNight(boolean isday) {
-            this.isday = isday;
-        }
-    }
-
-    public static class ComponentMessage extends Update {
-        public String type = "component";
-        /* Each subclass must provide 'ctype' string for component 'type' */
-    }
-}

src/main/java/org/dynmap/ClientComponent.java

@@ -1,67 +0,0 @@
-package org.dynmap;
-
-import static org.dynmap.JSONUtils.a;
-import static org.dynmap.JSONUtils.s;
-
-import java.util.List;
-import java.util.Map;
-
-import org.json.simple.JSONArray;
-import org.json.simple.JSONObject;
-public class ClientComponent extends Component {
-    private boolean disabled;
-    
-    public ClientComponent(final DynmapPlugin plugin, final ConfigurationNode configuration) {
-        super(plugin, configuration);
-        plugin.events.addListener("buildclientconfiguration", new Event.Listener<JSONObject>() {
-            @Override
-            public void triggered(JSONObject root) {
-                if(!disabled)
-                    buildClientConfiguration(root);
-            }
-        });
-    }
-    
-    protected void disableComponent() {
-        disabled = true;
-    }
-    
-    protected void buildClientConfiguration(JSONObject root) {
-        JSONObject o = createClientConfiguration();
-        a(root, "components", o);
-    }
-    
-    protected JSONObject createClientConfiguration() {
-        JSONObject o = convertMap(configuration);
-        o.remove("class");
-        return o;
-    }
-    
-    protected static final JSONObject convertMap(Map<String, ?> m) {
-        JSONObject o = new JSONObject();
-        for(Map.Entry<String, ?> entry : m.entrySet()) {
-            s(o, entry.getKey(), convert(entry.getValue()));
-        }
-        return o;
-    }
-    
-    @SuppressWarnings("unchecked")
-    protected static final JSONArray convertList(List<?> l) {
-        JSONArray o = new JSONArray();
-        for(Object entry : l) {
-            o.add(convert(entry));
-        }
-        return o;
-    }
-    
-    @SuppressWarnings("unchecked")
-    protected static final Object convert(Object o) {
-        if (o instanceof Map<?, ?>) {
-            return convertMap((Map<String, ?>)o);
-        } else if (o instanceof List<?>) {
-            return convertList((List<?>)o);
-        }
-        return o;
-    }
-
-}

src/main/java/org/dynmap/ClientConfigurationComponent.java

@@ -1,59 +0,0 @@
-package org.dynmap;
-
-import static org.dynmap.JSONUtils.a;
-import static org.dynmap.JSONUtils.s;
-
-import org.bukkit.Location;
-import org.dynmap.Event.Listener;
-import org.json.simple.JSONObject;
-
-public class ClientConfigurationComponent extends Component {
-    public ClientConfigurationComponent(final DynmapPlugin plugin, ConfigurationNode configuration) {
-        super(plugin, configuration);
-        plugin.events.<JSONObject>addListener("buildclientconfiguration", new Listener<JSONObject>() {
-            @Override
-            public void triggered(JSONObject t) {
-                ConfigurationNode c = plugin.configuration;
-                s(t, "updaterate", c.getFloat("updaterate", 1.0f));
-                s(t, "showplayerfacesinmenu", c.getBoolean("showplayerfacesinmenu", true));
-                s(t, "joinmessage", c.getString("joinmessage", "%playername% joined"));
-                s(t, "quitmessage", c.getString("quitmessage", "%playername% quit"));
-                s(t, "spammessage", c.getString("spammessage", "You may only chat once every %interval% seconds."));
-                s(t, "webprefix", unescapeString(c.getString("webprefix", "[WEB] ")));
-                s(t, "defaultzoom", c.getInteger("defaultzoom", 0));
-                s(t, "sidebaropened", c.getString("sidebaropened", "false"));
-                s(t, "dynmapversion", plugin.getDescription().getVersion());
-                s(t, "cyrillic", c.getBoolean("cyrillic-support", false));
-                String sn = plugin.getServer().getServerName();
-                if(sn.equals("Unknown Server"))
-                    sn = "Minecraft Dynamic Map";
-                s(t, "title", c.getString("webpage-title", sn));
-                
-                DynmapWorld defaultWorld = null;
-                String defmap = null;
-                for(DynmapWorld world : plugin.mapManager.getWorlds()) {
-                    if (defaultWorld == null) defaultWorld = world;
-                    ConfigurationNode wn = world.configuration;
-                    JSONObject wo = new JSONObject();
-                    s(wo, "name", wn.getString("name"));
-                    s(wo, "title", wn.getString("title"));
-                    Location spawn = world.world.getSpawnLocation();
-                    s(wo, "center/x", wn.getDouble("center/x", spawn.getX()));
-                    s(wo, "center/y", wn.getDouble("center/y", spawn.getY()));
-                    s(wo, "center/z", wn.getDouble("center/z", spawn.getZ()));
-                    s(wo, "bigworld", world.bigworld);
-                    s(wo, "extrazoomout", world.getExtraZoomOutLevels());
-                    a(t, "worlds", wo);
-                    
-                    for(MapType mt : world.maps) {
-                        mt.buildClientConfiguration(wo, world);
-                        if(defmap == null) defmap = mt.getName();
-                    }
-                }
-                s(t, "defaultworld", c.getString("defaultworld", defaultWorld == null ? "world" : defaultWorld.world.getName()));
-                s(t, "defaultmap", c.getString("defaultmap", defmap == null ? "surface" : defmap));
-            }
-        });
-    }
-    
-}

src/main/java/org/dynmap/ClientUpdateComponent.java

@@ -1,119 +0,0 @@
-package org.dynmap;
-
-import static org.dynmap.JSONUtils.a;
-import static org.dynmap.JSONUtils.s;
-
-import java.util.Set;
-
-import org.bukkit.ChatColor;
-import org.bukkit.Chunk;
-import org.bukkit.Location;
-import org.bukkit.World;
-import org.bukkit.block.Block;
-import org.bukkit.entity.Player;
-import org.dynmap.utils.BlockLightLevel;
-import org.json.simple.JSONArray;
-import org.json.simple.JSONObject;
-
-public class ClientUpdateComponent extends Component {
-    private BlockLightLevel bll = new BlockLightLevel();
-    
-    public ClientUpdateComponent(final DynmapPlugin plugin, ConfigurationNode configuration) {
-        super(plugin, configuration);
-        plugin.events.addListener("buildclientupdate", new Event.Listener<ClientUpdateEvent>() {
-            @Override
-            public void triggered(ClientUpdateEvent e) {
-                buildClientUpdate(e);
-            }
-        });
-    }
-    
-    protected void buildClientUpdate(ClientUpdateEvent e) {
-        World world = e.world.world;
-        JSONObject u = e.update;
-        long since = e.timestamp;
-        String worldName = world.getName();
-        int hideifshadow = configuration.getInteger("hideifshadow", 15);
-        int hideifunder = configuration.getInteger("hideifundercover", 15);
-        
-        s(u, "servertime", world.getTime() % 24000);
-        s(u, "hasStorm", world.hasStorm());
-        s(u, "isThundering", world.isThundering());
-
-        s(u, "players", new JSONArray());
-        Player[] players = plugin.playerList.getVisiblePlayers();
-        for(int i=0;i<players.length;i++) {
-            Player p = players[i];
-            Location pl = p.getLocation();
-            JSONObject jp = new JSONObject();
-            boolean hide = false;
-            
-            s(jp, "type", "player");
-            s(jp, "name", ChatColor.stripColor(p.getDisplayName()));
-            s(jp, "account", p.getName());
-            if(hideifshadow < 15) {
-                if(pl.getBlock().getLightLevel() <= hideifshadow)
-                    hide = true;
-            }
-            if(hideifunder < 15) {
-                if(bll.isReady()) { /* If we can get real sky level */
-                    if(bll.getSkyLightLevel(pl.getBlock()) <= hideifunder)
-                        hide = true;
-                }
-                else {
-                    if(pl.getWorld().getHighestBlockYAt(pl) > pl.getBlockY())
-                        hide = true;
-                }
-            }
-            
-            /* Don't leak player location for world not visible on maps, or if sendposition disbaled */
-            DynmapWorld pworld = MapManager.mapman.worldsLookup.get(p.getWorld().getName());
-            /* Fix typo on 'sendpositon' to 'sendposition', keep bad one in case someone used it */
-            if(configuration.getBoolean("sendposition", true) && configuration.getBoolean("sendpositon", true) &&
-                    (pworld != null) && pworld.sendposition && (!hide)) {
-                s(jp, "world", p.getWorld().getName());
-                s(jp, "x", pl.getX());
-                s(jp, "y", pl.getY());
-                s(jp, "z", pl.getZ());
-            }
-            else {
-                s(jp, "world", "-some-other-bogus-world-");
-                s(jp, "x", 0.0);
-                s(jp, "y", 64.0);
-                s(jp, "z", 0.0);
-            }
-            /* Only send health if enabled AND we're on visible world */
-            if (configuration.getBoolean("sendhealth", false) && (pworld != null) && pworld.sendhealth && (!hide)) {
-                s(jp, "health", p.getHealth());
-                s(jp, "armor", Armor.getArmorPoints(p));
-            }
-            else {
-                s(jp, "health", 0);
-                s(jp, "armor", 0);
-            }
-            a(u, "players", jp);
-        }
-        if(configuration.getBoolean("includehiddenplayers", false)) {
-            Set<Player> hidden = plugin.playerList.getHiddenPlayers();
-            for(Player p : hidden) {
-                JSONObject jp = new JSONObject();
-                s(jp, "type", "player");
-                s(jp, "name", ChatColor.stripColor(p.getDisplayName()));
-                s(jp, "account", p.getName());
-                s(jp, "world", "-hidden-player-");
-                s(jp, "x", 0.0);
-                s(jp, "y", 64.0);
-                s(jp, "z", 0.0);
-                s(jp, "health", 0);
-                s(jp, "armor", 0);
-                a(u, "players", jp);
-            }
-        }
-
-        s(u, "updates", new JSONArray());
-        for(Object update : plugin.mapManager.getWorldUpdates(worldName, since)) {
-            a(u, "updates", (Client.Update)update);
-        }
-    }
-
-}

src/main/java/org/dynmap/ClientUpdateEvent.java

@@ -1,15 +0,0 @@
-package org.dynmap;
-
-import org.json.simple.JSONObject;
-
-public class ClientUpdateEvent {
-    public long timestamp;
-    public DynmapWorld world;
-    public JSONObject update;
-    
-    public ClientUpdateEvent(long timestamp, DynmapWorld world, JSONObject update) {
-        this.timestamp = timestamp;
-        this.world = world;
-        this.update = update;
-    }
-}

src/main/java/org/dynmap/Color.java

@@ -1,74 +0,0 @@
-package org.dynmap;
-
-/**
- * Simple replacement for java.awt.Color for dynmap - it's not an invariant, so we don't make millions
- * of them during rendering
- */
-public class Color {
-    /* ARGB value */
-    private int val;
-
-    public static final int TRANSPARENT = 0;
-
-    public Color(int red, int green, int blue, int alpha) {
-        setRGBA(red, green, blue, alpha);
-    }
-    public Color(int red, int green, int blue) {
-        setRGBA(red, green, blue, 0xFF);
-    }
-    public Color() {
-        setTransparent();
-    }
-    public final int getRed() {
-        return (val >> 16) & 0xFF;
-    }
-    public final int getGreen() {
-        return (val >> 8) & 0xFF;
-    }
-    public final int getBlue() {
-        return val & 0xFF;
-    }
-    public final int getAlpha() {
-        return ((val >> 24) & 0xFF);
-    }
-    public final boolean isTransparent() {
-        return ((val & 0xFF000000) == TRANSPARENT);
-    }
-    public final void setTransparent() {
-        val = TRANSPARENT;
-    }
-    public final void setColor(Color c) {
-        val = c.val;
-    }
-    public final void setRGBA(int red, int green, int blue, int alpha) {
-        val = ((alpha & 0xFF) << 24) | ((red & 0xFF) << 16) | ((green & 0xFF) << 8) | (blue & 0xFF);
-    }
-    public final int getARGB() {
-        return val;
-    }
-    public final void setARGB(int c) {
-        val = c;
-    }
-    public final int getComponent(int idx) {
-        return 0xFF & (val >> ((3-idx)*8));
-    }
-    public final void setAlpha(int v) {
-        val = (val & 0x00FFFFFF) | (v << 24);
-    }
-    /**
-     * Scale each color component, based on the corresponding component
-     */
-    public final void blendColor(Color c) {
-        blendColor(c.val);
-    }
-    /**
-     * Scale each color component, based on the corresponding component
-     */
-    public final void blendColor(int argb) {
-        int nval = (((((val >> 24) & 0xFF) * ((argb >> 24) & 0xFF)) / 255) << 24);
-        nval = nval | (((((val >> 16) & 0xFF) * ((argb >> 16) & 0xFF)) / 255) << 16);
-        nval = nval | (((((val >> 8) & 0xFF) * ((argb >> 8) & 0xFF)) / 255) << 8);
-        nval = nval | (((val & 0xFF) * (argb & 0xFF)) / 255);
-        val = nval;
-    }
-}