Shift marker persistence off of server thread (lag reduction)

Fix biome temp/humidity on newer biomes
Avoid trap in Spigot for light levels outside max height
2026-03-30 11:08:39 -07:00 · 2015-01-05 23:02:09 -06:00 · 2015-01-03 17:23:40 -06:00 · 2014-12-14 20:49:38 -06:00 · 2014-11-28 11:08:44 -06:00 · 2014-10-13 09:41:14 -05:00
254 changed files with 6495 additions and 22367 deletions
@@ -0,0 +1,201 @@
+Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "[]"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright [yyyy] [name of copyright owner]
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
@@ -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>
@@ -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>
@@ -1,269 +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
-17	102	81	51	255	81	64	40	255	51	40	25	255	40	32	20	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
-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
-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
-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
-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
-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
-Biome Rainforest - Dark Green
-[RAINFOREST]	49	67	21	255	39	53	17	255	24	34	10	255	19	27	8	255
-Biome Swampland - Brown
-[SWAMPLAND]	75	44	24	255	60	35	19	255	37	22	12	255	30	18	10	255
-Biome Seasonal Forest - Light Green
-[SEASONAL_FOREST]	51	165	42	255	41	131	33	255	26	82	21	255	20	65	17	255
-Biome Forest - Light Gray
-[FOREST]	138	145	145	255	110	115	115	255	69	72	72	255	55	57	57	255
-Biome Savanna - Dark Gray
-[SAVANNA]	58	58	58	255	47	47	47	255	29	29	29	255	23	23	23	255
-Biome Shrubland - Yellow
-[SHRUBLAND]	170	158	24	255	135	126	19	255	85	79	12	255	67	62	10	255
-Biome Taiga - Cyan
-[TAIGA]	34	102	131	255	27	81	104	255	17	51	65	255	13	40	52	255
-Biome Desert - Orange
-[DESERT]	204	111	48	255	162	89	38	255	102	56	24	255	81	44	19	255
-Biome Plains - Magenta
-[PLAINS]	166	66	175	255	133	53	140	255	83	33	87	255	66	26	69	255
-Biome Ice Desert - Dark Blue
-[ICE_DESERT]	26	33	103	255	20	26	80	255	13	17	50	255	9	14	40	255
-Biome Tundra - White
-[TUNDRA]	222	222	222	255	177	177	177	255	111	111	111	255	88	88	88	255
-Biome Hell - Pink
-[HELL]	190	115	135	255	151	92	108	255	95	57	67	255	75	46	53	255
-Biome Sky - Blue
-[SKY]	34	44	134	255	27	35	107	255	17	22	67	255	13	18	53	255
-[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
@@ -1,269 +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
-17	102	81	51	255	81	64	40	255	51	40	25	255	40	32	20	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
-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
-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
-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
-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
-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
-Biome Rainforest - Dark Green
-[RAINFOREST]	49	67	21	255	39	53	17	255	24	34	10	255	19	27	8	255
-Biome Swampland - Brown
-[SWAMPLAND]	75	44	24	255	60	35	19	255	37	22	12	255	30	18	10	255
-Biome Seasonal Forest - Light Green
-[SEASONAL_FOREST]	51	165	42	255	41	131	33	255	26	82	21	255	20	65	17	255
-Biome Forest - Light Gray
-[FOREST]	138	145	145	255	110	115	115	255	69	72	72	255	55	57	57	255
-Biome Savanna - Dark Gray
-[SAVANNA]	58	58	58	255	47	47	47	255	29	29	29	255	23	23	23	255
-Biome Shrubland - Yellow
-[SHRUBLAND]	170	158	24	255	135	126	19	255	85	79	12	255	67	62	10	255
-Biome Taiga - Cyan
-[TAIGA]	34	102	131	255	27	81	104	255	17	51	65	255	13	40	52	255
-Biome Desert - Orange
-[DESERT]	204	111	48	255	162	89	38	255	102	56	24	255	81	44	19	255
-Biome Plains - Magenta
-[PLAINS]	166	66	175	255	133	53	140	255	83	33	87	255	66	26	69	255
-Biome Ice Desert - Dark Blue
-[ICE_DESERT]	26	33	103	255	20	26	80	255	13	17	50	255	9	14	40	255
-Biome Tundra - White
-[TUNDRA]	222	222	222	255	177	177	177	255	111	111	111	255	88	88	88	255
-Biome Hell - Pink
-[HELL]	190	115	135	255	151	92	108	255	95	57	67	255	75	46	53	255
-Biome Sky - Blue
-[SKY]	34	44	134	255	27	35	107	255	17	22	67	255	13	18	53	255
-[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
@@ -1,269 +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
-17	102	81	51	255	81	64	40	255	51	40	25	255	40	32	20	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
-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
-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
-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
-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
-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
-Biome Rainforest - Dark Green
-[RAINFOREST]	49	67	21	255	39	53	17	255	24	34	10	255	19	27	8	255
-Biome Swampland - Brown
-[SWAMPLAND]	75	44	24	255	60	35	19	255	37	22	12	255	30	18	10	255
-Biome Seasonal Forest - Light Green
-[SEASONAL_FOREST]	51	165	42	255	41	131	33	255	26	82	21	255	20	65	17	255
-Biome Forest - Light Gray
-[FOREST]	138	145	145	255	110	115	115	255	69	72	72	255	55	57	57	255
-Biome Savanna - Dark Gray
-[SAVANNA]	58	58	58	255	47	47	47	255	29	29	29	255	23	23	23	255
-Biome Shrubland - Yellow
-[SHRUBLAND]	170	158	24	255	135	126	19	255	85	79	12	255	67	62	10	255
-Biome Taiga - Cyan
-[TAIGA]	34	102	131	255	27	81	104	255	17	51	65	255	13	40	52	255
-Biome Desert - Orange
-[DESERT]	204	111	48	255	162	89	38	255	102	56	24	255	81	44	19	255
-Biome Plains - Magenta
-[PLAINS]	166	66	175	255	133	53	140	255	83	33	87	255	66	26	69	255
-Biome Ice Desert - Dark Blue
-[ICE_DESERT]	26	33	103	255	20	26	80	255	13	17	50	255	9	14	40	255
-Biome Tundra - White
-[TUNDRA]	222	222	222	255	177	177	177	255	111	111	111	255	88	88	88	255
-Biome Hell - Pink
-[HELL]	190	115	135	255	151	92	108	255	95	57	67	255	75	46	53	255
-Biome Sky - Blue
-[SKY]	34	44	134	255	27	35	107	255	17	22	67	255	13	18	53	255
-[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
@@ -1,152 +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
-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
-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
-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
-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
-Biome Rainforest - Dark Green
-[RAINFOREST]	49	67	21	255	39	53	17	255	24	34	10	255	19	27	8	255
-Biome Swampland - Brown
-[SWAMPLAND]	75	44	24	255	60	35	19	255	37	22	12	255	30	18	10	255
-Biome Seasonal Forest - Light Green
-[SEASONAL_FOREST]	51	165	42	255	41	131	33	255	26	82	21	255	20	65	17	255
-Biome Forest - Light Gray
-[FOREST]	138	145	145	255	110	115	115	255	69	72	72	255	55	57	57	255
-Biome Savanna - Dark Gray
-[SAVANNA]	58	58	58	255	47	47	47	255	29	29	29	255	23	23	23	255
-Biome Shrubland - Yellow
-[SHRUBLAND]	170	158	24	255	135	126	19	255	85	79	12	255	67	62	10	255
-Biome Taiga - Cyan
-[TAIGA]	34	102	131	255	27	81	104	255	17	51	65	255	13	40	52	255
-Biome Desert - Orange
-[DESERT]	204	111	48	255	162	89	38	255	102	56	24	255	81	44	19	255
-Biome Plains - Magenta
-[PLAINS]	166	66	175	255	133	53	140	255	83	33	87	255	66	26	69	255
-Biome Ice Desert - Dark Blue
-[ICE_DESERT]	26	33	103	255	20	26	80	255	13	17	50	255	9	14	40	255
-Biome Tundra - White
-[TUNDRA]	222	222	222	255	177	177	177	255	111	111	111	255	88	88	88	255
-Biome Hell - Pink
-[HELL]	190	115	135	255	151	92	108	255	95	57	67	255	75	46	53	255
-Biome Sky - Blue
-[SKY]	34	44	134	255	27	35	107	255	17	22	67	255	13	18	53	255
-[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
@@ -1,6 +0,0 @@
-dynmap.render		# Render current chunk
-dynmap.fullrender	# Issue a full render
-dynmap.hide.self	# Hide self from map
-dynmap.hide.others	# Hide others from map
-dynmap.show.self	# Reveal self on map
-dynmap.show.others	# Reveal others on map
@@ -1,59 +1,158 @@
-<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.20</version>
-  <name>dynmap</name>
-    <properties>
-       <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-    </properties>
-  <url>http://github.com/FrozenCow/dynmap/</url>
-  <issueManagement>
-  	<system>GitHub</system>
-  	<url>https://github.com/FrozenCow/dynmap/issues</url>
-  </issueManagement>
-  <build>
-      <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>
-				<artifactId>maven-assembly-plugin</artifactId>
+<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>us.dynmap</groupId>
+	<artifactId>dynmap</artifactId>
+	<name>dynmap</name>
+	<properties>
+		<timestamp>${maven.build.timestamp}</timestamp>
+		<maven.build.timestamp.format>yyyyMMddHHmm</maven.build.timestamp.format>
+		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+		<BUILD_NUMBER>Dev${timestamp}</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>
-    				<descriptors>
-        				<descriptor>src/main/assembly/package.xml</descriptor>
-    				</descriptors>
+					<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>
-       					<id>build</id>
-        				<phase>package</phase>
-        				<goals>
-            				<goal>single</goal>
-        				</goals>
-    				</execution>
+					<execution>
+						<phase>package</phase>
+						<goals>
+							<goal>shade</goal>
+						</goals>
+						<configuration>
+							<artifactSet>
+								<includes>
+									<include>us.dynmap:dynmap-api:jar:*</include>
+									<include>us.dynmap:DynmapCore:jar:*</include>
+								</includes>
+							</artifactSet>
+						</configuration>
+					</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>0.0.1-SNAPSHOT</version>
-  	  <type>jar</type>
-      <scope>compile</scope>
-  	</dependency>
-  </dependencies>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-source-plugin</artifactId>
+				<version>2.2.1</version>
+				<executions>
+					<execution>
+						<id>attach-sources</id>
+						<goals>
+							<goal>jar</goal>
+						</goals>
+					</execution>
+				</executions>
+			</plugin>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-javadoc-plugin</artifactId>
+				<version>2.9.1</version>
+				<executions>
+					<execution>
+						<id>attach-javadocs</id>
+						<goals>
+							<goal>jar</goal>
+						</goals>
+					</execution>
+				</executions>
+			</plugin>
+
+		</plugins>
+	</build>
+	<repositories>
+		<repository>
+			<releases>
+			</releases>
+			<snapshots>
+			</snapshots>
+			<id>dynmap-repo</id>
+			<url>http://repo.mikeprimm.com/</url>
+		</repository>
+	</repositories>
+	<dependencies>
+		<dependency>
+			<groupId>com.nijikokun.bukkit</groupId>
+			<artifactId>Permissions</artifactId>
+			<version>3.1.6</version>
+		</dependency>
+		<dependency>
+			<groupId>org.bukkit</groupId>
+			<artifactId>bukkit</artifactId>
+			<version>1.7.10-R0.1-SNAPSHOT</version>
+		</dependency>
+		<dependency>
+			<groupId>us.dynmap</groupId>
+			<artifactId>dynmap-api</artifactId>
+			<version>${project.version}</version>
+		</dependency>
+
+		<dependency>
+			<groupId>us.dynmap</groupId>
+			<artifactId>DynmapCore</artifactId>
+			<version>${project.version}</version>
+		</dependency>
+		<dependency>
+			<groupId>org.getspout</groupId>
+			<artifactId>spoutpluginapi</artifactId>
+			<version>dev-SNAPSHOT</version>
+			<scope>compile</scope>
+		</dependency>
+		<dependency>
+			<groupId>ru.tehkode</groupId>
+			<artifactId>PermissionsEx</artifactId>
+			<version>1.19.1</version>
+		</dependency>
+		<dependency>
+			<groupId>de.bananaco</groupId>
+			<artifactId>bPermissions</artifactId>
+			<version>2.9.1</version>
+		</dependency>
+		<dependency>
+			<groupId>com.platymuus.bukkit.permissions</groupId>
+			<artifactId>PermissionsBukkit</artifactId>
+			<version>1.6</version>
+		</dependency>
+		<dependency>
+			<groupId>org.anjocaido</groupId>
+			<artifactId>EssentialsGroupManager</artifactId>
+			<version>2.10.1</version>
+		</dependency>
+	</dependencies>
+	<version>2.1-SNAPSHOT</version>
 </project>
@@ -6,33 +6,19 @@
  </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></fileSet>
    <fileSet>
-      <directory>${project.basedir}/web</directory>
-      <outputDirectory>/dynmap/web</outputDirectory>
-    </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.basedir}</directory>
+    	<outputDirectory>/dynmap</outputDirectory>
+    	<includes>
+    		<include>LICENSE</include></includes></fileSet>
  </fileSets>
  <files>
  	<file>
-  		<source>${project.build.directory}/${artifactId}-${version}.jar</source>
-  		<outputDirectory>/</outputDirectory>
-  		<destName>dynmap.jar</destName></file></files>
+  	  <source>${project.build.directory}/${artifactId}-${version}.jar</source>
+  	  <outputDirectory>/</outputDirectory>
+  	  <destName>dynmap.jar</destName>
+	</file>
+  </files>
 </assembly>
@@ -1,36 +0,0 @@
-package org.dynmap;
-
-import org.bukkit.entity.Player;
-import org.bukkit.inventory.ItemStack;
-import org.bukkit.Material;
-
-public class Armor {
-    /**
-     * http://www.minecraftwiki.net/wiki/Item_Durability#Armor_durability
-     * We rely on getArmorContents() to return 4 armor pieces in the order
-     * of: boots, pants, chest, helmet
-     */
-    private static final double armorPoints[] = {1.5, 3.0, 4.0, 1.5};
-
-    public static final int getArmorPoints(Player player) {
-        int currentDurability = 0;
-        int baseDurability = 0;
-        double baseArmorPoints = 0;
-        ItemStack inventory[] = player.getInventory().getArmorContents();
-        for(int i=0;i<inventory.length;i++) {
-            if(inventory[i] == null)
-                continue;
-            Material m = inventory[i].getType();
-            if(m == null)
-                continue;
-            final short maxDurability = m.getMaxDurability();
-            if(maxDurability < 0)
-                continue;
-            final short durability = inventory[i].getDurability();
-            baseDurability += maxDurability;
-            currentDurability += maxDurability - durability;
-            baseArmorPoints += armorPoints[i];
-        }
-        return (int)Math.round(2*baseArmorPoints*currentDurability/baseDurability);
-    }
-}
@@ -1,107 +0,0 @@
-package org.dynmap;
-
-import java.util.HashSet;
-import java.util.LinkedList;
-import java.util.NoSuchElementException;
-import java.util.Set;
-
-public class AsynchronousQueue<T> {
-    private Object lock = new Object();
-    private Thread thread;
-    private LinkedList<T> queue = new LinkedList<T>();
-    private Set<T> set = new HashSet<T>();
-    private Handler<T> handler;
-    private int dequeueTime;
-
-    public AsynchronousQueue(Handler<T> handler, int dequeueTime) {
-        this.handler = handler;
-        this.dequeueTime = dequeueTime;
-    }
-
-    public boolean push(T t) {
-        synchronized (lock) {
-            if (set.add(t)) {
-                queue.addLast(t);
-                return true;
-            }
-            return false;
-        }
-    }
-
-    private T pop() {
-        synchronized (lock) {
-            try {
-                T t = queue.removeFirst();
-                if (!set.remove(t)) {
-                    // This should never happen.
-                }
-                return t;
-            } catch (NoSuchElementException e) {
-                return null;
-            }
-        }
-    }
-
-    public int size() {
-        return set.size();
-    }
-
-    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) {
-                T t = pop();
-                if (t != null) {
-                    handler.handle(t);
-                }
-                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;
-    }
-}
@@ -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;
-    }
-}
@@ -1,80 +0,0 @@
-package org.dynmap;
-
-import java.io.IOException;
-import java.io.Writer;
-
-import org.bukkit.ChatColor;
-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;
-        }
-    }
-
-}
@@ -1,61 +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 {
-
-    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) {
-                buildClientConfiguration(root);
-            }
-        });
-    }
-    
-    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;
-    }
-
-}
@@ -1,51 +0,0 @@
-package org.dynmap;
-
-import static org.dynmap.JSONUtils.a;
-import static org.dynmap.JSONUtils.s;
-
-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.getBoolean("sidebaropened", false));
-                
-                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"));
-                    s(wo, "center/x", wn.getFloat("center/x", 0.0f));
-                    s(wo, "center/y", wn.getFloat("center/y", 64.0f));
-                    s(wo, "center/z", wn.getFloat("center/z", 0.0f));
-                    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));
-            }
-        });
-    }
-    
-}
@@ -1,75 +0,0 @@
-package org.dynmap;
-
-import static org.dynmap.JSONUtils.a;
-import static org.dynmap.JSONUtils.s;
-
-import org.bukkit.ChatColor;
-import org.bukkit.Location;
-import org.bukkit.World;
-import org.bukkit.entity.Player;
-import org.json.simple.JSONArray;
-import org.json.simple.JSONObject;
-
-public class ClientUpdateComponent extends Component {
-    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();
-        
-        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();
-            s(jp, "type", "player");
-            s(jp, "name", ChatColor.stripColor(p.getDisplayName()));
-            s(jp, "account", p.getName());
-            /* Don't leak player location for world not visible on maps, or if sendposition disbaled */
-            DynmapWorld pworld = MapManager.mapman.worldsLookup.get(p.getWorld().getName());
-            if(configuration.getBoolean("sendpositon", true) && (pworld != null) && pworld.sendposition) {
-                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) {
-                s(jp, "health", p.getHealth());
-                s(jp, "armor", Armor.getArmorPoints(p));
-            }
-            else {
-                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);
-        }
-    }
-
-}
@@ -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;
-    }
-}
@@ -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;
-    }
-}
@@ -1,241 +0,0 @@
-package org.dynmap;
-
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileNotFoundException;
-import java.io.InputStream;
-import java.util.HashMap;
-import java.util.Scanner;
-
-import org.dynmap.debug.Debug;
-import org.bukkit.block.Biome;
-
-public class ColorScheme {
-    private static final HashMap<String, ColorScheme> cache = new HashMap<String, ColorScheme>();
-
-    public String name;
-    /* Switch to arrays - faster than map */
-    public final Color[][] colors;    /* [blk-type][step] */
-    public final Color[][][] datacolors; /* [bkt-type][blk-dat][step] */
-    public final Color[][] biomecolors;   /* [Biome.ordinal][step] */
-    public final Color[][] raincolors;  /* [rain * 63][step] */
-    public final Color[][] tempcolors;  /* [temp * 63][step] */
-
-    public ColorScheme(String name, Color[][] colors, Color[][][] datacolors, Color[][] biomecolors, Color[][] raincolors, Color[][] tempcolors) {
-        this.name = name;
-        this.colors = colors;
-        this.datacolors = datacolors;
-        this.biomecolors = biomecolors;
-        this.raincolors = raincolors;
-        this.tempcolors = tempcolors;
-    }
-
-    private static File getColorSchemeDirectory() {
-        return new File(DynmapPlugin.dataDirectory, "colorschemes");
-    }
-
-    public static ColorScheme getScheme(String name) {
-        if (name == null)
-            name = "default";
-        ColorScheme scheme = cache.get(name);
-        if (scheme == null) {
-            scheme = loadScheme(name);
-            cache.put(name, scheme);
-        }
-        return scheme;
-    }
-
-    public static ColorScheme loadScheme(String name) {
-        File colorSchemeFile = new File(getColorSchemeDirectory(), name + ".txt");
-        Color[][] colors = new Color[256][];
-        Color[][][] datacolors = new Color[256][][];
-        Color[][] biomecolors = new Color[Biome.values().length][];
-        Color[][] raincolors = new Color[64][];
-        Color[][] tempcolors = new Color[64][];
-        
-        InputStream stream;
-        try {
-            Debug.debug("Loading colors from '" + colorSchemeFile + "'...");
-            stream = new FileInputStream(colorSchemeFile);
-
-            Scanner scanner = new Scanner(stream);
-            int nc = 0;
-            while (scanner.hasNextLine()) {
-                String line = scanner.nextLine();
-                if (line.startsWith("#") || line.equals("")) {
-                    continue;
-                }
-                /* Make parser less pedantic - tabs or spaces should be fine */
-                String[] split = line.split("[\t ]");
-                int cnt = 0;
-                for(String s: split) { if(s.length() > 0) cnt++; }
-                String[] nsplit = new String[cnt];
-                cnt = 0;
-                for(String s: split) { if(s.length() > 0) { nsplit[cnt] = s; cnt++; } }
-                split = nsplit;
-                if (split.length < 17) {
-                    continue;
-                }
-                Integer id;
-                Integer dat = null;
-                boolean isbiome = false;
-                boolean istemp = false;
-                boolean israin = false;
-                int idx = split[0].indexOf(':');
-                if(idx > 0) {    /* ID:data - data color */
-                    id = new Integer(split[0].substring(0, idx));
-                    dat = new Integer(split[0].substring(idx+1));
-                }
-                else if(split[0].charAt(0) == '[') {    /* Biome color data */
-                    String bio = split[0].substring(1);
-                    idx = bio.indexOf(']');
-                    if(idx >= 0) bio = bio.substring(0, idx);
-                    isbiome = true;
-                    id = -1;
-                    for(Biome b : Biome.values()) {
-                        if(b.toString().equalsIgnoreCase(bio)) {
-                            id = b.ordinal();
-                            break;
-                        }
-                    }
-                    if(id < 0) {    /* Not biome - check for rain or temp */
-                        if(bio.startsWith("RAINFALL-")) {
-                            try {
-                                double v = Double.parseDouble(bio.substring(9));
-                                if((v >= 0) && (v <= 1.00)) {
-                                    id = (int)(v * 63.0);
-                                    israin = true;
-                                }
-                            } catch (NumberFormatException nfx) {
-                            }
-                        }
-                        else if(bio.startsWith("TEMPERATURE-")) {
-                            try {
-                                double v = Double.parseDouble(bio.substring(12));
-                                if((v >= 0) && (v <= 1.00)) {
-                                    id = (int)(v * 63.0);
-                                    istemp = true;
-                                }
-                            } catch (NumberFormatException nfx) {
-                            }
-                        }
-                    }
-                }
-                else {
-                    id = new Integer(split[0]);
-                }
-                Color[] c = new Color[5];
-
-                /* store colors by raycast sequence number */
-                c[0] = new Color(Integer.parseInt(split[1]), Integer.parseInt(split[2]), Integer.parseInt(split[3]), Integer.parseInt(split[4]));
-                c[3] = new Color(Integer.parseInt(split[5]), Integer.parseInt(split[6]), Integer.parseInt(split[7]), Integer.parseInt(split[8]));
-                c[1] = new Color(Integer.parseInt(split[9]), Integer.parseInt(split[10]), Integer.parseInt(split[11]), Integer.parseInt(split[12]));
-                c[2] = new Color(Integer.parseInt(split[13]), Integer.parseInt(split[14]), Integer.parseInt(split[15]), Integer.parseInt(split[16]));
-                /* Blended color - for 'smooth' option on flat map */
-                c[4] = new Color((c[1].getRed()+c[3].getRed())/2, (c[1].getGreen()+c[3].getGreen())/2, (c[1].getBlue()+c[3].getBlue())/2, (c[1].getAlpha()+c[3].getAlpha())/2);
-
-                if(isbiome) {
-                    if(istemp) {
-                        tempcolors[id] = c;
-                    }
-                    else if(israin) {
-                        raincolors[id] = c;
-                    }
-                    else if((id >= 0) && (id < biomecolors.length))
-                        biomecolors[id] = c;
-                }
-                else if(dat != null) {
-                    Color[][] dcolor = datacolors[id];    /* Existing list? */
-                    if(dcolor == null) {
-                        dcolor = new Color[16][];            /* Make 16 index long list */
-                        datacolors[id] = dcolor;
-                    }
-                    if((dat >= 0) && (dat < 16)) {            /* Add color to list */
-                        dcolor[dat] = c;
-                    }
-                    if(dat == 0) {    /* Index zero is base color too */
-                        colors[id] = c;
-                    }
-                }
-                else {
-                    colors[id] = c;
-                }
-                nc += 1;
-            }
-            scanner.close();
-            /* Last, push base color into any open slots in data colors list */
-            for(int k = 0; k < 256; k++) {
-                Color[][] dc = datacolors[k];    /* see if data colors too */
-                if(dc != null) {
-                    Color[] c = colors[k];
-                    for(int i = 0; i < 16; i++) {
-                        if(dc[i] == null)
-                            dc[i] = c;
-                    }
-                }
-            }
-            /* And interpolate any missing rain and temperature colors */
-            interpolateColorTable(tempcolors);
-            interpolateColorTable(raincolors);
-        } catch (RuntimeException e) {
-            Log.severe("Could not load colors '" + name + "' ('" + colorSchemeFile + "').", e);
-            return null;
-        } catch (FileNotFoundException e) {
-            Log.severe("Could not load colors '" + name + "' ('" + colorSchemeFile + "'): File not found.", e);
-        }
-        return new ColorScheme(name, colors, datacolors, biomecolors, raincolors, tempcolors);
-    }
-    
-    public static void interpolateColorTable(Color[][] c) {
-        int idx = -1;
-        for(int k = 0; k < c.length; k++) {
-            if(c[k] == null) { /* Missing? */
-                if((idx >= 0) && (k == (c.length-1))) { /* We're last - so fill forward from last color */
-                    for(int kk = idx+1; kk <= k; kk++) {
-                        c[kk] = c[idx];
-                    }
-                }
-                /* Skip - will backfill when we find next color */
-            }
-            else if(idx == -1) { /* No previous color, just backfill this color */
-                for(int kk = 0; kk < k; kk++) {
-                    c[kk] = c[k];
-                }
-                idx = k;    /* This is now last defined color */
-            }
-            else {  /* Else, interpolate between last idx and this one */
-                int cnt = c[k].length;
-                for(int kk = idx+1; kk < k; kk++) {
-                    double interp = (double)(kk-idx)/(double)(k-idx);
-                    Color[] cc = new Color[cnt];
-                    for(int jj = 0; jj < cnt; jj++) {
-                        cc[jj] = new Color(
-                           (int)((1.0-interp)*c[idx][jj].getRed() + interp*c[k][jj].getRed()),
-                           (int)((1.0-interp)*c[idx][jj].getGreen() + interp*c[k][jj].getGreen()),
-                           (int)((1.0-interp)*c[idx][jj].getBlue() + interp*c[k][jj].getBlue()),
-                           (int)((1.0-interp)*c[idx][jj].getAlpha() + interp*c[k][jj].getAlpha()));
-                    }
-                    c[kk] = cc;
-                }
-                idx = k;
-            }
-        }
-    }
-    public Color[] getRainColor(double rain) {
-        int idx = (int)(rain * 63.0);
-        if((idx >= 0) && (idx < raincolors.length))
-            return raincolors[idx];
-        else
-            return null;
-    }
-    public Color[] getTempColor(double temp) {
-        int idx = (int)(temp * 63.0);
-        if((idx >= 0) && (idx < tempcolors.length))
-            return tempcolors[idx];
-        else
-            return null;
-    }
-    public static void reset() {
-        cache.clear();
-    }
-}
--- a/Show More
+++ b/Show More