diff --git a/build.xml b/build.xml
deleted file mode 100644
index 5bf53e8c..00000000
--- a/build.xml
+++ /dev/null
@@ -1,60 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/build_parameters.xml b/build_parameters.xml
deleted file mode 100644
index f274865c..00000000
--- a/build_parameters.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-
-
-
-
-
-
\ No newline at end of file
diff --git a/colorschemes/default.txt b/colorschemes/default.txt
deleted file mode 100644
index f860a2d1..00000000
--- a/colorschemes/default.txt
+++ /dev/null
@@ -1,340 +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
-[BEACH] 255 206 75 255 230 185 68 255 255 206 75 255 179 144 53 255
-[DESERT_HILLS] 255 146 51 255 230 131 46 255 255 146 51 255 179 102 36 255
-[FOREST_HILLS] 0 162 100 255 0 146 90 255 0 162 100 255 0 113 70 255
-[TAIGA_HILLS] 178 212 117 255 160 191 105 255 178 212 117 255 125 148 82 255
-[SMALL_MOUNTAINS] 184 103 33 255 166 93 30 255 184 103 33 255 129 72 23 255
-Rainfall/Temperature Mapping
-[RAINFALL-0.0] 120 120 120 255 96 96 96 255 60 60 60 255 48 48 48 255
-[RAINFALL-1.0] 38 92 255 255 30 73 204 255 19 46 127 255 15 36 102 255
-[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
diff --git a/colorschemes/flames.txt b/colorschemes/flames.txt
deleted file mode 100644
index fe48ffa0..00000000
--- a/colorschemes/flames.txt
+++ /dev/null
@@ -1,340 +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
-[BEACH] 255 206 75 255 230 185 68 255 255 206 75 255 179 144 53 255
-[DESERT_HILLS] 255 146 51 255 230 131 46 255 255 146 51 255 179 102 36 255
-[FOREST_HILLS] 0 162 100 255 0 146 90 255 0 162 100 255 0 113 70 255
-[TAIGA_HILLS] 178 212 117 255 160 191 105 255 178 212 117 255 125 148 82 255
-[SMALL_MOUNTAINS] 184 103 33 255 166 93 30 255 184 103 33 255 129 72 23 255
-Rainfall/Temperature Mapping
-[RAINFALL-0.0] 120 120 120 255 96 96 96 255 60 60 60 255 48 48 48 255
-[RAINFALL-1.0] 38 92 255 255 30 73 204 255 19 46 127 255 15 36 102 255
-[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
diff --git a/colorschemes/ovocean.txt b/colorschemes/ovocean.txt
deleted file mode 100644
index 352a09ed..00000000
--- a/colorschemes/ovocean.txt
+++ /dev/null
@@ -1,340 +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
-[BEACH] 255 206 75 255 230 185 68 255 255 206 75 255 179 144 53 255
-[DESERT_HILLS] 255 146 51 255 230 131 46 255 255 146 51 255 179 102 36 255
-[FOREST_HILLS] 0 162 100 255 0 146 90 255 0 162 100 255 0 113 70 255
-[TAIGA_HILLS] 178 212 117 255 160 191 105 255 178 212 117 255 125 148 82 255
-[SMALL_MOUNTAINS] 184 103 33 255 166 93 30 255 184 103 33 255 129 72 23 255
-Rainfall/Temperature Mapping
-[RAINFALL-0.0] 120 120 120 255 96 96 96 255 60 60 60 255 48 48 48 255
-[RAINFALL-1.0] 38 92 255 255 30 73 204 255 19 46 127 255 15 36 102 255
-[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
diff --git a/colorschemes/sk89q.txt b/colorschemes/sk89q.txt
deleted file mode 100644
index 6e06a041..00000000
--- a/colorschemes/sk89q.txt
+++ /dev/null
@@ -1,191 +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
-[BEACH] 255 206 75 255 230 185 68 255 255 206 75 255 179 144 53 255
-[DESERT_HILLS] 255 146 51 255 230 131 46 255 255 146 51 255 179 102 36 255
-[FOREST_HILLS] 0 162 100 255 0 146 90 255 0 162 100 255 0 113 70 255
-[TAIGA_HILLS] 178 212 117 255 160 191 105 255 178 212 117 255 125 148 82 255
-[SMALL_MOUNTAINS] 184 103 33 255 166 93 30 255 184 103 33 255 129 72 23 255
-Rainfall/Temperature Mapping
-[RAINFALL-0.0] 120 120 120 255 96 96 96 255 60 60 60 255 48 48 48 255
-[RAINFALL-1.0] 38 92 255 255 30 73 204 255 19 46 127 255 15 36 102 255
-[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
diff --git a/pom.xml b/pom.xml
index 5a4ef515..75f43a5f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -43,6 +43,31 @@
+
+ org.apache.maven.plugins
+ maven-dependency-plugin
+ 2.4
+
+
+ unpack
+ package
+ unpack
+
+
+
+ org.dynmap
+ DynmapCore
+ ${project.version}
+ bin
+ zip
+ ${project.build.directory}/core
+
+
+
+
+
+
+
org.apache.maven.plugins
maven-shade-plugin
@@ -57,8 +82,7 @@
org.dynmap:dynmap-api:jar:*
- org.eclipse.jetty:jetty-*:jar:*
- javax.servlet:javax.servlet-api:jar:*
+ org.dynmap:DynmapCore:jar:*
@@ -106,7 +130,7 @@
org.dynmap
dynmap-api
- [0.25,)
+ ${version}
jar
compile
@@ -126,5 +150,12 @@
8.0.1.v20110908
+
+ org.dynmap
+ DynmapCore
+ ${version}
+ jar
+ compile
+
diff --git a/renderdata/bc-models.txt b/renderdata/bc-models.txt
deleted file mode 100644
index e7801c74..00000000
--- a/renderdata/bc-models.txt
+++ /dev/null
@@ -1,257 +0,0 @@
-# BuildCraft Block mapping
-# define buildcraft-support: true in configuration.txt to enable
-enabled:buildcraft-support
-# Variables - can be altered in configuration.txt
-var:bc-autoWorkbench=152,bc-builder=157,bc-dockingStation=168,bc-drill=151
-var:bc-engine=161,bc-filler=155,bc-frame=160,bc-marker=154,bc-miningWell=150
-var:bc-oilMoving=162,bc-oilStill=163,bc-pipe=166,bc-pump=164,bc-quarry=153,bc-refinery=167
-var:bc-tank=165,bc-template=158
-# Pipe - set render alg
-linkmap:id=bc-pipe,linkalg=5,linkid=bc-pipe
-# Frame
-linkmap:id=bc-frame,linkalg=5,linkid=bc-frame
-# Pipe - (data is faked: 1=north,2=east,4=south,8=west)
-# Pipe - no neighbors
-# Frame
-block:id=bc-pipe,id=bc-frame,data=0,scale=4
-layer:1,2
-----
--**-
--**-
-----
-# Pipe - just north neighbor
-# Frame
-block:id=bc-pipe,id=bc-frame,data=1,scale=4
-layer:1,2
--**-
--**-
--**-
-----
-# Pipe - just east neighbor
-# Frame
-block:id=bc-pipe,id=bc-frame,data=2,scale=4
-rotate:id=bc-pipe,data=1,rot=90
-# Pipe - just south neighbor
-# Frame
-block:id=bc-pipe,id=bc-frame,data=4,scale=4
-rotate:id=bc-pipe,data=1,rot=180
-# Pipe - just south neighbor
-# Frame
-block:id=bc-pipe,id=bc-frame,data=8,scale=4
-rotate:id=bc-pipe,data=1,rot=270
-# Pipe - north and east neighbor
-# Frame
-block:id=bc-pipe,id=bc-frame,data=3,scale=4
-layer:1,2
--**-
--***
--***
-----
-# Pipe - east and south neighbor
-# Frame
-block:id=bc-pipe,id=bc-frame,data=6,scale=4
-rotate:id=bc-pipe,data=3,rot=90
-# Pipe - south and west neighbor
-# Frame
-block:id=bc-pipe,id=bc-frame,data=12,scale=4
-rotate:id=bc-pipe,data=3,rot=180
-# Pipe - west and north neighbor
-# Frame
-block:id=bc-pipe,id=bc-frame,data=9,scale=4
-rotate:id=bc-pipe,data=3,rot=270
-# Pipe - north and south neighbor
-# Frame
-block:id=bc-pipe,id=bc-frame,data=5,scale=4
-layer:1,2
--**-
--**-
--**-
--**-
-# Pipe - east and west neighbor
-# Frame
-block:id=bc-pipe,id=bc-frame,data=10,scale=4
-rotate:id=bc-pipe,data=5,rot=90
-# Pipe - north, east and south neighbor
-# Frame
-block:id=bc-pipe,id=bc-frame,data=7,scale=4
-layer:1,2
--**-
--***
--***
--**-
-# Pipe - east, south and west neighbor
-# Frame
-block:id=bc-pipe,id=bc-frame,data=14,scale=4
-rotate:id=bc-pipe,data=7,rot=90
-# Pipe - south, west and north neighbor
-# Frame
-block:id=bc-pipe,id=bc-frame,data=13,scale=4
-rotate:id=bc-pipe,data=7,rot=180
-# Pipe - west, north and east neighbor
-# Frame
-block:id=bc-pipe,id=bc-frame,data=11,scale=4
-rotate:id=bc-pipe,data=7,rot=270
-# Pipe - north, south, east, west neightbors
-# Frame
-block:id=bc-pipe,id=bc-frame,data=15,scale=4
-layer:1,2
--**-
-****
-****
--**-
-# Drill - set render alg
-linkmap:id=bc-drill,linkalg=5
-# Drill - (data is faked: 1=north,2=east,4=south,8=west)
-# Drill - no neighbors
-block:id=bc-drill,data=0,scale=4
-layer:0,1,2,3
-----
--**-
--**-
-----
-# Drill - just north neighbor
-block:id=bc-drill,data=1,scale=4
-layer:0,3
-----
--**-
--**-
-----
-layer:1,2
--**-
--**-
--**-
-----
-# Drill - just east neighbor
-block:id=bc-drill,data=2,scale=4
-rotate:id=bc-drill,data=1,rot=90
-# Drill - just south neighbor
-block:id=bc-drill,data=4,scale=4
-rotate:id=bc-drill,data=1,rot=180
-# Drill - just south neighbor
-block:id=bc-drill,data=8,scale=4
-rotate:id=bc-drill,data=1,rot=270
-# Drill - north and east neighbor
-block:id=bc-drill,data=3,scale=4
-layer:0,3
-----
--**-
--**-
-----
-layer:1,2
--**-
--***
--***
-----
-# Drill - east and south neighbor
-block:id=bc-drill,data=6,scale=4
-rotate:id=bc-drill,data=3,rot=90
-# Drill - south and west neighbor
-block:id=bc-drill,data=12,scale=4
-rotate:id=bc-drill,data=3,rot=180
-# Drill - west and north neighbor
-block:id=bc-drill,data=9,scale=4
-rotate:id=bc-drill,data=3,rot=270
-# Drill - north and south neighbor
-block:id=bc-drill,data=5,scale=4
-layer:0,3
-----
--**-
--**-
-----
-layer:1,2
--**-
--**-
--**-
--**-
-# Drill - east and west neighbor
-block:id=bc-drill,data=10,scale=4
-rotate:id=bc-drill,data=5,rot=90
-# Drill - north, east and south neighbor
-block:id=bc-drill,data=7,scale=4
-layer:0,3
-----
--**-
--**-
-----
-layer:1,2
--**-
--***
--***
--**-
-# Drill - east, south and west neighbor
-block:id=bc-drill,data=14,scale=4
-rotate:id=bc-drill,data=7,rot=90
-# Drill - south, west and north neighbor
-block:id=bc-drill,data=13,scale=4
-rotate:id=bc-drill,data=7,rot=180
-# Drill - west, north and east neighbor
-block:id=bc-drill,data=11,scale=4
-rotate:id=bc-drill,data=7,rot=270
-# Drill - north, south, east, west neightbors
-block:id=bc-drill,data=15,scale=4
-layer:0,3
-----
--**-
--**-
-----
-layer:1,2
--**-
-****
-****
--**-
-# Marker
-block:id=bc-marker,data=*,scale=8
-layer:0,1,2,3,4,5,6,7
---------
---------
----**---
---****--
---****--
----**---
---------
---------
-# Engine
-block:id=bc-engine,data=*,scale=8
-layer:2,3
-********
-********
-********
-********
-********
-********
-********
-********
-layer:4,5,6,7
---------
---------
---****--
---****--
---****--
---****--
---------
---------
-# Oil, flowing
-block:id=bc-oilMoving,data=*,scale=4
-layer:0
-****
-****
-****
-****
-# Oil
-block:id=bc-oilStill,data=*,scale=4
-layer:0,1
-****
-****
-****
-****
-# Tank
-block:id=bc-tank,data=*,scale=8
-layer:0,1,2,3,4,5,6,7
---------
--******-
--******-
--******-
--******-
--******-
--******-
---------
diff --git a/renderdata/bc-texture.txt b/renderdata/bc-texture.txt
deleted file mode 100644
index 599a5d75..00000000
--- a/renderdata/bc-texture.txt
+++ /dev/null
@@ -1,60 +0,0 @@
-# BuildCraft Block mapping
-# define buildcraft-support: true in configuration.txt to enable
-enabled:buildcraft-support
-# Variables - can be altered in configuration.txt
-var:bc-autoWorkbench=152,bc-builder=157,bc-cobblestonePipe=159,bc-dockingStation=168,bc-drill=151
-var:bc-engine=161,bc-filler=155,bc-frame=160,bc-marker=154,bc-miningWell=150
-var:bc-oilMoving=162,bc-oilStill=163,bc-pipe=166,bc-pump=164,bc-quarry=153,bc-refinery=167
-var:bc-tank=165,bc-template=158
-# 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
-# MINING_WELL_ID = 150
-block:id=bc-miningWell,data=2,east=35,top=4036,north=37,south=37,west=38,bottom=38,txtid=blk
-block:id=bc-miningWell,data=3,west=35,top=4036,north=37,south=37,east=38,bottom=38,txtid=blk
-block:id=bc-miningWell,data=4,north=35,top=4036,east=37,west=37,south=38,bottom=38,txtid=blk
-block:id=bc-miningWell,data=5,south=35,top=4036,east=37,west=37,north=38,bottom=38,txtid=blk
-# DRILL_ID = 151
-block:id=bc-drill,data=*,allfaces=32,txtid=blk,transparency=TRANSPARENT
-# AUTO_WORKBENCH_ID = 152
-block:id=bc-autoWorkbench,data=*,allsides=44,topbottom=4043
-# QUARRY_ID = 153
-block:id=bc-quarry,data=2,east=39,top=4040,north=38,south=38,west=38,bottom=38,txtid=blk
-block:id=bc-quarry,data=3,west=39,top=4040,north=38,south=38,east=38,bottom=38,txtid=blk
-block:id=bc-quarry,data=4,north=39,top=4040,east=38,west=38,south=38,bottom=38,txtid=blk
-block:id=bc-quarry,data=5,south=39,top=4040,east=38,west=38,north=38,bottom=38,txtid=blk
-# MARKER_ID = 154
-block:id=bc-marker,data=*,allsides=57,txtid=blk,transparency=TRANSPARENT
-# FILLER_ID = 155
-block:id=bc-filler,data=*,allsides=66,topbottom=4065,txtid=blk
-# BUILDER_ID = 157
-block:id=bc-builder,data=2,east=55,top=4054,north=3,south=3,west=3,bottom=3,txtid=blk
-block:id=bc-builder,data=3,west=55,top=4054,north=3,south=3,east=3,bottom=3,txtid=blk
-block:id=bc-builder,data=4,north=55,top=4054,east=3,west=3,south=3,bottom=3,txtid=blk
-block:id=bc-builder,data=5,south=55,top=4054,east=3,west=3,north=3,bottom=3,txtid=blk
-# TEMPLATE_ID = 158
-block:id=bc-template,data=2,east=52,top=4050,north=48,south=48,west=48,bottom=48,txtid=blk
-block:id=bc-template,data=3,west=52,top=4050,north=48,south=48,east=48,bottom=48,txtid=blk
-block:id=bc-template,data=4,north=52,top=4050,east=48,west=48,south=48,bottom=48,txtid=blk
-block:id=bc-template,data=5,south=52,top=4050,east=48,west=48,north=48,bottom=48,txtid=blk
-# FRAME_ID = 160
-block:id=bc-frame,data=*,allfaces=34,txtid=blk,transparency=TRANSPARENT
-# ENGINE_ID = 161
-block:id=bc-engine,data=0,north=8004,east=8005,south=8006,west=8007,top=1,bottom=2,txtid=wood
-block:id=bc-engine,data=1,north=8004,east=8005,south=8006,west=8007,top=1,bottom=2,txtid=stone
-block:id=bc-engine,data=2,north=8004,east=8005,south=8006,west=8007,top=1,bottom=2,txtid=iron
-# OIL_MOVING_ID = 162
-block:id=bc-oilMoving,data=*,allfaces=223,txtid=blk
-# OIL_STILL_ID = 163
-block:id=bc-oilStill,data=*,allfaces=223,txtid=blk
-# PUMP_ID = 164
-block:id=bc-pump,data=*,allsides=99,top=4064,bottom=100,txtid=blk
-# TANK_ID = 165
-block:id=bc-tank,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=bc-pipe,data=*,allfaces=18,txtid=blk,transparency=TRANSPARENT
-# REFINERY_ID = 167 - funky texture mapping - just do tank for now
-block:id=bc-refinery,data=*,allsides=96,topbottom=98,txtid=blk,transparency=TRANSPARENT
-# DOCKING_STATION_ID = 168
diff --git a/renderdata/ic2-models.txt b/renderdata/ic2-models.txt
deleted file mode 100644
index b7d7ef65..00000000
--- a/renderdata/ic2-models.txt
+++ /dev/null
@@ -1,203 +0,0 @@
-# Industrial Craft 2 Texture mapping
-# define ic2-support: true in configuration.txt to enable
-enabled:ic2-support
-# variables: set in configuration.txt to override
-var: ic2-blockCable=228,ic2-blockFenceIron=232,ic2-blockMachine2=223,ic2-blockPersonal=225,ic2-blockLuminator=226,ic2-blockElectric=227,ic2-blockReactorChamber=233,ic2-blockNuke=237,ic2-blockGenerator=246,ic2blockMachine=250
-# Wire - set render alg
-linkmap:id=ic2-blockCable,linkalg=5,linkid=ic2-blockMachine2,linkid=ic2-blockPersonal,linkid=ic2-blockLuminator,linkid=ic2-blockElectric,linkid=ic2-blockCable,linkid=ic2-blockReactorChamber,linkid=ic2-blockNuke,linkid=ic2-blockGenerator,linkid=ic2blockMachine
-# Wire - (data is faked: 1=north,2=east,4=south,8=west)
-# Wire - no neighbors
-block:id=ic2-blockCable,data=0,scale=16
-layer:5,6,7,8,9,10
-----------------
-----------------
-----------------
-----------------
-----------------
------******-----
------******-----
------******-----
------******-----
------******-----
------******-----
-----------------
-----------------
-----------------
-----------------
-----------------
-# Wire - just north neighbor
-block:id=ic2-blockCable,data=1,scale=16
-layer:5,6,7,8,9,10
------******-----
------******-----
------******-----
------******-----
------******-----
------******-----
------******-----
------******-----
------******-----
------******-----
------******-----
-----------------
-----------------
-----------------
-----------------
-----------------
-# Wire - just east neighbor
-block:id=ic2-blockCable,data=2,scale=16
-rotate:id=ic2-blockCable,data=1,rot=90
-# Wire - just south neighbor
-block:id=ic2-blockCable,id=113,data=4,scale=16
-rotate:id=ic2-blockCable,data=1,rot=180
-# Wire - just south neighbor
-block:id=ic2-blockCable,data=8,scale=16
-rotate:id=ic2-blockCable,data=1,rot=270
-# Wire - north and east neighbor
-block:id=ic2-blockCable,data=3,scale=16
-layer:5,6,7,8,9,10
------******-----
------******-----
------******-----
------******-----
------******-----
------******-----
------***********
------***********
------***********
------***********
------***********
-----------------
-----------------
-----------------
-----------------
-----------------
-# Wire - east and south neighbor
-block:id=ic2-blockCable,data=6,scale=16
-rotate:id=ic2-blockCable,data=3,rot=90
-# Wire - south and west neighbor
-block:id=ic2-blockCable,data=12,scale=16
-rotate:id=ic2-blockCable,data=3,rot=180
-# Wire - west and north neighbor
-block:id=ic2-blockCable,data=9,scale=16
-rotate:id=ic2-blockCable,data=3,rot=270
-# Wire - north and south neighbor
-block:id=ic2-blockCable,data=5,scale=16
-layer:5,6,7,8,9,10
------******-----
------******-----
------******-----
------******-----
------******-----
------******-----
------******-----
------******-----
------******-----
------******-----
------******-----
------******-----
------******-----
------******-----
------******-----
------******-----
-# Wire - east and west neighbor
-block:id=ic2-blockCable,data=10,scale=16
-rotate:id=ic2-blockCable,data=5,rot=90
-# Wire - north, east and south neighbor
-block:id=ic2-blockCable,data=7,scale=16
-layer:5,6,7,8,9,10
------******-----
------******-----
------******-----
------******-----
------******-----
------***********
------***********
------***********
------***********
------***********
------***********
------******-----
------******-----
------******-----
------******-----
------******-----
-# Wire - east, south and west neighbor
-block:id=ic2-blockCable,data=14,scale=16
-rotate:id=ic2-blockCable,data=7,rot=90
-# Wire - south, west and north neighbor
-block:id=ic2-blockCable,data=13,scale=16
-rotate:id=ic2-blockCable,data=7,rot=180
-# Wire - west, north and east neighbor
-block:id=ic2-blockCable,data=11,scale=16
-rotate:id=ic2-blockCable,data=7,rot=270
-# Wire - north, south, east, west neightbors
-block:id=ic2-blockCable,data=15,scale=16
-layer:5,6,7,8,9,10
------******-----
------******-----
------******-----
------******-----
------******-----
-****************
-****************
-****************
-****************
-****************
-****************
------******-----
------******-----
------******-----
------******-----
------******-----
-# Iron Fence - set render algorithm
-linkmap:id=ic2-blockFenceIron,linkalg=1
-# Iron Fence - (data is faked: 1=north,2=east,4=south,8=west)
-# Iron Fence - no neighbors
-block:id=ic2-blockFenceIron,data=0,scale=16
-rotate:id=85,data=0,rot=0
-# Iron Fence - just north neighbor
-block:id=ic2-blockFenceIron,data=1,scale=16
-rotate:id=85,data=1,rot=0
-# Iron Fence - just east neighbor
-block:id=ic2-blockFenceIron,data=2,scale=16
-rotate:id=ic2-blockFenceIron,data=1,rot=90
-# Iron Fence - just south neighbor
-block:id=ic2-blockFenceIron,data=4,scale=16
-rotate:id=ic2-blockFenceIron,data=1,rot=180
-# Iron Fence - just south neighbor
-block:id=ic2-blockFenceIron,data=8,scale=16
-rotate:id=ic2-blockFenceIron,data=1,rot=270
-# Iron Fence - north and east neighbor
-block:id=ic2-blockFenceIron,data=3,scale=16
-rotate:id=85,data=3,rot=0
-# Iron Fence - east and south neighbor
-block:id=ic2-blockFenceIron,data=6,scale=16
-rotate:id=ic2-blockFenceIron,data=3,rot=90
-# Iron Fence - south and west neighbor
-block:id=ic2-blockFenceIron,data=12,scale=16
-rotate:id=85,data=3,rot=180
-# Iron Fence - west and north neighbor
-block:id=ic2-blockFenceIron,data=9,scale=16
-rotate:id=85,data=3,rot=270
-# Iron Fence - north and south neighbor
-block:id=ic2-blockFenceIron,data=5,scale=16
-rotate:id=85,data=5,rot=0
-# Iron Fence - east and west neighbor
-block:id=ic2-blockFenceIron,id=113,data=10,scale=16
-rotate:id=ic2-blockFenceIron,data=5,rot=90
-# Iron Fence - north, east and south neighbor
-block:id=ic2-blockFenceIron,data=7,scale=16
-rotate:id=85,data=7,rot=0
-# Iron Fence - east, south and west neighbor
-block:id=ic2-blockFenceIron,data=14,scale=16
-rotate:id=ic2-blockFenceIron,data=7,rot=90
-# Iron Fence - south, west and north neighbor
-block:id=ic2-blockFenceIron,data=13,scale=16
-rotate:id=ic2-blockFenceIron,data=7,rot=180
-# Iron Fence - west, north and east neighbor
-block:id=ic2-blockFenceIron,data=11,scale=16
-rotate:id=ic2-blockFenceIron,data=7,rot=270
-# Iron Fence - north, south, east, west neightbors
-block:id=ic2-blockFenceIron,data=15,scale=16
-rotate:id=ic2-blockFenceIron,data=15,rot=0
diff --git a/renderdata/ic2-texture.txt b/renderdata/ic2-texture.txt
deleted file mode 100644
index 6cafbcc0..00000000
--- a/renderdata/ic2-texture.txt
+++ /dev/null
@@ -1,203 +0,0 @@
-# Industrial Craft 2 Block mapping
-# define ic2-support: true in configuration.txt to enable
-enabled:ic2-support
-# variables: set in configuration.txt to override
-var:ic2-blockScaffold=220,ic2-blockWall=221,ic2-blockFoam=222,ic2-blockMachine2=223,ic2-blockMetal=224,ic2-blockPersonal=225,ic2-blockLuminator=226,ic2-blockElectric=227
-var:ic2-blockCable=228,ic2-blockDoorAlloy=229,ic2-blockAlloyGlass=230,ic2-blockAlloy=231,ic2-blockFenceIron=232,ic2-blockReactorChamber=233
-var:ic2-blockRubber=234,ic2-blockDynamiteRemote=235,ic2-blockDynamite=236,ic2-blockNuke=237,ic2-blockITNT=239,ic2-blockHarz=240,ic2-blockRubSapling=241
-var:ic2-blockRubLeaves=242,ic2-blockRubWood=243,ic2-blockMiningTip=244,ic2-blockMiningPipe=245,ic2-blockGenerator=246
-var:ic2-blockOreUran=247,ic2-blockOreTin=248,ic2-blockOreCopper=249,ic2-blockMachine=250
-# 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=ic2-blockScaffold,data=*,allsides=116,topbottom=117,txtid=blk0
-# data=2
-block:id=ic2-blockScaffold,data=2,allfaces=118,txtid=blk0
-# blockWall=221
-# data=0
-block:id=ic2-blockWall,data=0,allfaces=96,txtid=blk0
-# data=1
-block:id=ic2-blockWall,data=1,allfaces=97,txtid=blk0
-# data=2
-block:id=ic2-blockWall,data=2,allfaces=98,txtid=blk0
-# data=3
-block:id=ic2-blockWall,data=3,allfaces=99,txtid=blk0
-# data=4
-block:id=ic2-blockWall,data=4,allfaces=100,txtid=blk0
-# data=5
-block:id=ic2-blockWall,data=5,allfaces=101,txtid=blk0
-# data=6
-block:id=ic2-blockWall,data=6,allfaces=102,txtid=blk0
-# data=7
-block:id=ic2-blockWall,data=7,allfaces=103,txtid=blk0
-# data=8
-block:id=ic2-blockWall,data=8,allfaces=104,txtid=blk0
-# data=9
-block:id=ic2-blockWall,data=9,allfaces=105,txtid=blk0
-# data=10
-block:id=ic2-blockWall,data=10,allfaces=106,txtid=blk0
-# data=11
-block:id=ic2-blockWall,data=11,allfaces=107,txtid=blk0
-# data=12
-block:id=ic2-blockWall,data=12,allfaces=108,txtid=blk0
-# data=13
-block:id=ic2-blockWall,data=13,allfaces=109,txtid=blk0
-# data=14
-block:id=ic2-blockWall,data=14,allfaces=110,txtid=blk0
-# data=15
-block:id=ic2-blockWall,data=15,allfaces=111,txtid=blk0
-# blockFoam=222
-block:id=ic2-blockFoam,data=*,allfaces=37
-# blockMachine2=223
-# data=0
-block:id=ic2-blockMachine2,data=0,top=0,bottom=16,north=32,south=48,east=64,west=80,txtid=mach2
-# data=1
-block:id=ic2-blockMachine2,data=1,top=1,bottom=17,north=33,south=49,east=65,west=81,txtid=mach2
-# blockMetal=224
-# data=0 (copper)
-block:id=ic2-blockMetal,data=0,allfaces=93,txtid=blk0
-# data=1 (tin)
-block:id=ic2-blockMetal,data=1,allfaces=94,txtid=blk0
-# data=2 (bronze)
-block:id=ic2-blockMetal,data=2,allfaces=78,txtid=blk0
-# data=3 (uranium)
-block:id=ic2-blockMetal,data=3,topbottom=79,allsides=95,txtid=blk0
-# blockPersonal=225
-# data=0
-block:id=ic2-blockPersonal,data=0,bottom=0,top=16,north=32,south=48,east=64,west=80,txtid=pers
-# data=1
-block:id=ic2-blockPersonal,data=1,bottom=1,top=17,north=33,south=49,east=65,west=81,txtid=pers
-# blockLuminator=226
-block:id=ic2-blockLuminator,data=*,allfaces=31,txtid=blk0
-# blockElectric=227
-# data=0
-block:id=ic2-blockElectric,data=0,bottom=0,top=16,north=32,south=48,east=64,west=80,txtid=elec
-# data=1
-block:id=ic2-blockElectric,data=1,bottom=1,top=17,north=33,south=49,east=65,west=81,txtid=elec
-# data=2
-block:id=ic2-blockElectric,data=2,bottom=2,top=18,north=34,south=50,east=66,west=82,txtid=elec
-# data=3
-block:id=ic2-blockElectric,data=3,bottom=3,top=19,north=35,south=51,east=67,west=83,txtid=elec
-# data=4
-block:id=ic2-blockElectric,data=4,bottom=4,top=20,north=36,south=52,east=68,west=84,txtid=elec
-# data=5
-block:id=ic2-blockElectric,data=5,bottom=5,top=21,north=37,south=53,east=69,west=85,txtid=elec
-# blockCable=228
-# data=0
-block:id=ic2-blockCable,data=0,allfaces=0,txtid=cable
-# data=1
-block:id=ic2-blockCable,data=1,allfaces=16,txtid=cable
-# data=2
-block:id=ic2-blockCable,data=2,allfaces=32,txtid=cable
-# data=3
-block:id=ic2-blockCable,data=3,allfaces=48,txtid=cable
-# data=4
-block:id=ic2-blockCable,data=4,allfaces=64,txtid=cable
-# data=5
-block:id=ic2-blockCable,data=5,allfaces=80,txtid=cable
-# data=6
-block:id=ic2-blockCable,data=6,allfaces=96,txtid=cable
-# data=7
-block:id=ic2-blockCable,data=7,allfaces=112,txtid=cable
-# data=8
-block:id=ic2-blockCable,data=8,allfaces=128,txtid=cable
-# data=9
-block:id=ic2-blockCable,data=9,allfaces=144,txtid=cable
-# data=10
-block:id=ic2-blockCable,data=10,allfaces=160,txtid=cable
-# blockDoorAlloy=229
-# data=0-7 (bottom)
-block:id=ic2-blockDoorAlloy,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=ic2-blockDoorAlloy,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=ic2-blockAlloyGlass,data=*,allfaces=13,txtid=blk0,transparency=TRANSPARENT
-# blockAlloy=231
-block:id=ic2-blockAlloy,data=*,allfaces=12,txtid=blk0
-# blockFenceIron=232
-block:id=ic2-blockFenceIron,data=*,allfaces=1,txtid=blk0,transparency=TRANSPARENT
-# blockReactorChamber=233
-block:id=ic2-blockReactorChamber,data=*,bottom=16,top=17,allsides=67,txtid=blk0
-# blockRubber=234
-block:id=ic2-blockRubber,data=*,allfaces=40,txtid=blk0
-# blockDynamiteRemote=235
-block:id=ic2-blockDynamiteRemote,data=*,allsides=56,txtid=blk0
-# blockDynamite=236
-block:id=ic2-blockDynamite,data=*,allsides=57,txtid=blk0
-# blockNuke=237
-block:id=ic2-blockNuke,data=*,bottom=61,top=62,allsides=63,txtid=blk0
-# ?=238
-# blockITNT=239
-block:id=ic2-blockITNT,data=*,bottom=58,top=59,allsides=60,txtid=blk0
-# blockHarz=240
-block:id=ic2-blockHarz,data=*,allfaces=43,txtid=blk0
-# blockRubSapling=241
-block:id=ic2-blockRubSapling,data=*,allsides=2038,transparency=TRANSPARENT,txtid=blk0
-# blockRubLeaves=242
-block:id=ic2-blockRubLeaves,data=*,allfaces=2040,transparency=TRANSPARENT,txtid=blk0
-# blockRubWood=243
-block:id=ic2-blockRubWood,data=*,topbottom=47,allsides=44,txtid=blk0
-# blockMiningTip=244
-block:id=ic2-blockMiningTip,data=*,allfaces=36,txtid=blk0
-# blockMiningPipe=245
-block:id=ic2-blockMiningPipe,data=*,allfaces=35,txtid=blk0
-# blockGenerator=246
-# data=0
-block:id=ic2-blockGenerator,data=0,bottom=0,top=16,north=32,south=48,east=64,west=80,txtid=gen
-# data=1
-block:id=ic2-blockGenerator,data=1,bottom=1,top=17,north=33,south=49,east=65,west=81,txtid=gen
-# data=2
-block:id=ic2-blockGenerator,data=2,bottom=2,top=18,north=34,south=50,east=66,west=82,txtid=gen
-# data=3
-block:id=ic2-blockGenerator,data=3,bottom=3,top=19,north=35,south=51,east=67,west=83,txtid=gen
-# data=4
-block:id=ic2-blockGenerator,data=4,bottom=4,top=20,north=36,south=52,east=68,west=84,txtid=gen
-# data=5
-block:id=ic2-blockGenerator,data=5,bottom=5,top=21,north=37,south=53,east=69,west=85,txtid=gen
-# blockOreUran=247
-block:id=ic2-blockOreUran,data=*,allfaces=34,txtid=blk0
-# blockOreTin=248
-block:id=ic2-blockOreTin,data=*,allfaces=33,txtid=blk0
-# blockOreCopper=249
-block:id=ic2-blockOreCopper,data=*,allfaces=32,txtid=blk0
-# blockMachine=250
-# data=0
-block:id=ic2-blockMachine,data=0,bottom=0,top=16,north=32,south=48,east=64,west=80,txtid=mach
-# data=1
-block:id=ic2-blockMachine,data=1,bottom=1,top=17,north=33,south=49,east=65,west=81,txtid=mach
-# data=2
-block:id=ic2-blockMachine,data=2,bottom=2,top=18,north=34,south=50,east=66,west=82,txtid=mach
-# data=3
-block:id=ic2-blockMachine,data=3,bottom=3,top=19,north=35,south=51,east=67,west=83,txtid=mach
-# data=4
-block:id=ic2-blockMachine,data=4,bottom=4,top=20,north=36,south=52,east=68,west=84,txtid=mach
-# data=5
-block:id=ic2-blockMachine,data=5,bottom=5,top=21,north=37,south=53,east=69,west=85,txtid=mach
-# data=6
-block:id=ic2-blockMachine,data=6,bottom=6,top=22,north=38,south=54,east=70,west=86,txtid=mach
-# data=7
-block:id=ic2-blockMachine,data=7,bottom=7,top=23,north=39,south=55,east=71,west=87,txtid=mach
-# data=8
-block:id=ic2-blockMachine,data=8,bottom=8,top=24,north=40,south=56,east=72,west=88,txtid=mach
-# data=9
-block:id=ic2-blockMachine,data=9,bottom=9,top=25,north=41,south=57,east=73,west=89,txtid=mach
-# data=10
-block:id=ic2-blockMachine,data=10,bottom=10,top=26,north=42,south=58,east=74,west=90,txtid=mach
-# data=11
-block:id=ic2-blockMachine,data=11,bottom=11,top=27,north=43,south=59,east=75,west=91,txtid=mach
-# data=12
-block:id=ic2-blockMachine,data=12,bottom=12,top=28,north=44,south=60,east=76,west=92,txtid=mach
-# data=13
-block:id=ic2-blockMachine,data=13,bottom=13,top=29,north=45,south=61,east=77,west=93,txtid=mach
-# data=14
-block:id=ic2-blockMachine,data=14,bottom=14,top=30,north=46,south=62,east=78,west=94,txtid=mach
-# data=15
-block:id=ic2-blockMachine,data=15,bottom=15,top=31,north=47,south=63,east=79,west=95,txtid=mach
diff --git a/renderdata/rp2-models.txt b/renderdata/rp2-models.txt
deleted file mode 100644
index b32d424f..00000000
--- a/renderdata/rp2-models.txt
+++ /dev/null
@@ -1,157 +0,0 @@
-# RedPower2 block mapping
-# define redpower2-support: true in configuration.txt to enable
-enabled:redpower2-support
-# Variables - can be altered in configuration.txt
-var:rp2-base-appliance=137,rp2-base-microblock=136
-var:rp2-world-plants=139,rp2-world-ores=140,rp2-world-leaves=141,rp2-world-stone=142,rp2-world-log=143,rp2-world-crops=144,rp2-world-storage=145
-var:rp2-logic-logic=138
-var:rp2-lighting-lampOn=146,rp2-lighting-lampOff=147
-var:rp2-sensor-sensor=148
-var:rp2-array-array=149
-var:rp2-machine-machine=150,rp2-machine-machinePanel=151,rp2-machine-frame=152
-# rp2-world-plants,*
-block:id=rp2-world-plants,data=*,scale=16
-layer:0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15
-*--------------*
--*------------*-
---*----------*--
----*--------*---
-----*------*----
------*----*-----
-------*--*------
--------**-------
--------**-------
-------*--*------
------*----*-----
-----*------*----
----*--------*---
---*----------*--
--*------------*-
-*--------------*
-# Crops
-block:id=rp2-world-crops,data=*,scale=16
-layer:0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15
----*--------*---
----*--------*---
----*--------*---
-****************
----*--------*---
----*--------*---
----*--------*---
----*--------*---
----*--------*---
----*--------*---
----*--------*---
----*--------*---
-****************
----*--------*---
----*--------*---
----*--------*---
-# Logic
-block:id=rp2-logic-logic,data=*,scale=8
-layer:0
-********
-********
-********
-********
-********
-********
-********
-********
-# Array (array.array.id,0)
-# Inv-Array (array.array.id,1)
-# Non-Inv-Array (array.array.id,2)
-block:id=rp2-array-array,data=0,data=1,data=2,scale=16
-layer:0,1
-****************
-****************
-****************
-****************
-****************
-****************
-****************
-****************
-****************
-****************
-****************
-****************
-****************
-****************
-****************
-****************
-layer:2,3
--------**-------
--------**-------
---*----**----*--
--------**-------
--------**-------
--------**-------
--------**-------
-**-----**-----**
-**-----**-----**
--------**-------
--------**-------
--------**-------
--------**-------
---*----**----*--
--------**-------
--------**-------
-layer:4,5,6,7,8,9
-----------------
-----------------
---*----------*--
-----------------
-----------------
-----------------
-----------------
-**------------**
-**------------**
-----------------
-----------------
-----------------
-----------------
---*----------*--
-----------------
-----------------
-layer:10
-----------------
-----------------
---*----------*--
---*----------*--
---*----------*--
---*----------*--
---*----------*--
-***----------***
-***----------***
---*----------*--
---*----------*--
---*----------*--
---*----------*--
---*----------*--
-----------------
-----------------
-layer:11,12
-----------------
-----------------
-----------------
-----------------
-----------------
-----------------
-----------------
-****************
-****************
-----------------
-----------------
-----------------
-----------------
-----------------
-----------------
-----------------
-# Solar panel (machine.machinePanel.id,0)
-block:id=rp2-machine-machinePanel,data=0,scale=4
-layer:0
-****
-****
-****
-****
-
diff --git a/renderdata/rp2-texture.txt b/renderdata/rp2-texture.txt
deleted file mode 100644
index 5ee4cfe4..00000000
--- a/renderdata/rp2-texture.txt
+++ /dev/null
@@ -1,217 +0,0 @@
-# RedPower2 block mapping
-# define redpower2-support: true in configuration.txt to enable
-enabled:redpower2-support
-# Variables - can be altered in configuration.txt
-var:rp2-base-appliance=137,rp2-base-microblock=136
-var:rp2-world-plants=139,rp2-world-ores=140,rp2-world-leaves=141,rp2-world-stone=142,rp2-world-log=143,rp2-world-crops=144,rp2-world-storage=145
-var:rp2-logic-logic=138
-var:rp2-lighting-lampOn=146,rp2-lighting-lampOff=147
-var:rp2-sensor-sensor=148
-var:rp2-array-array=149
-var:rp2-machine-machine=150,rp2-machine-machinePanel=151,rp2-machine-frame=152
-# Files
-texturefile:id=base,filename=redpower2/base1.png,xcount=16,ycount=16
-texturefile:id=world,filename=redpower2/world1.png,xcount=16,ycount=16
-texturefile:id=worlditem,filename=redpower2/worlditems1.png,xcount=16,ycount=16
-texturefile:id=logic,filename=redpower2/logic1.png,xcount=16,ycount=16
-texturefile:id=lighting,filename=redpower2/lighting1.png,xcount=16,ycount=16
-texturefile:id=array,filename=redpower2/array1.png,xcount=16,ycount=16
-texturefile:id=machine,filename=redpower2/machine1.png,xcount=16,ycount=16
-############
-# Blocks from RedPowerCore-2
-############
-# Alloy Furnace (base.appliance.id, 0)
-block:id=rp2-base-appliance,data=0,topbottom=19,north=18,south=18,east=16,west=16,txtid=base
-# Microblocks (base.microblock.id, 0) - can't do this right yet, so just do it as cobblestone...
-block:id=rp2-base-microblock,data=0,allfaces=16
-############
-# Blocks from RedPowerWorld-2
-############
-# Flower (world.plants.id, 0), (world.plants.id,3+)
-block:id=rp2-world-plants,data=0,data=3,data=4,data=5,data=6,data=7,data=8,data=9,data=10,data=11,data=12,data=13,data=14,data=15,allsides=1,txtid=worlditem,transparency=TRANSPARENT
-# Flower (world.plants.id, 1), (world.plants.id, 2)
-block:id=rp2-world-plants,data=1,data=2,allsides=2,txtid=worlditem,transparency=TRANSPARENT
-# Flax (world.crops.id,0)
-block:id=rp2-world-crops,data=0,allsides=64,txtid=world,transparency=TRANSPARENT
-# Flax (world.crops.id,1)
-block:id=rp2-world-crops,data=1,allsides=65,txtid=world,transparency=TRANSPARENT
-# Flax (world.crops.id,2)
-block:id=rp2-world-crops,data=2,allsides=66,txtid=world,transparency=TRANSPARENT
-# Flax (world.crops.id,3)
-block:id=rp2-world-crops,data=3,allsides=67,txtid=world,transparency=TRANSPARENT
-# Flax (world.crops.id,4)
-block:id=rp2-world-crops,data=4,allsides=68,txtid=world,transparency=TRANSPARENT
-# Flax (world.crops.id,5+)
-block:id=rp2-world-crops,data=5,data=6,data=7,data=8,data=9,data=10,data=11,data=12,data13,data=14,data=15,allsides=69,txtid=world,transparency=TRANSPARENT
-# Marble (world.stone.id,0)
-block:id=rp2-world-stone,data=0,allfaces=16,txtid=world
-# Basalt (world.stone.id,1)
-block:id=rp2-world-stone,data=1,allfaces=17,txtid=world
-# Marble bricks (world.stone.id,2)
-block:id=rp2-world-stone,data=2,allfaces=18,txtid=world
-# Basalt cobblestone (world.stone.id,3)
-block:id=rp2-world-stone,data=3,allfaces=19,txtid=world
-# Basalt bricks (world.stone.id,4)
-block:id=rp2-world-stone,data=4,allfaces=20,txtid=world
-# Ruby Ore (world.ores.id,0)
-block:id=rp2-world-ores,data=0,allfaces=32,txtid=world
-# Emerald Ore (world.ores.id,1)
-block:id=rp2-world-ores,data=1,allfaces=33,txtid=world
-# Sapphire Ore (world.ores.id,2)
-block:id=rp2-world-ores,data=2,allfaces=34,txtid=world
-# Silver Ore (world.ores.id,3)
-block:id=rp2-world-ores,data=3,allfaces=35,txtid=world
-# Tin Ore (world.ores.id,4)
-block:id=rp2-world-ores,data=4,allfaces=36,txtid=world
-# Copper Ore (world.ores.id,5)
-block:id=rp2-world-ores,data=5,allfaces=37,txtid=world
-# Tungsten Ore (world.ores.id,6)
-block:id=rp2-world-ores,data=6,allfaces=38,txtid=world
-# Nikolite Ore (world.ores.id,7)
-block:id=rp2-world-ores,data=7,allfaces=39,txtid=world
-# Rubber tree leaves (world.leaves.id,*)
-block:id=rp2-world-leaves,data=*,allfaces=2049,txtid=world
-# Ruby Block (world.storage.id,0)
-block:id=rp2-world-storage,data=0,allfaces=80,txtid=world
-# Emerald Block (world.storage.id,1)
-block:id=rp2-world-storage,data=1,allfaces=81,txtid=world
-# Sapphire Block (world.storage.id,2)
-block:id=rp2-world-storage,data=2,allfaces=82,txtid=world
-# Rubber log (world.log.id,*)
-block:id=rp2-world-log,data=*,allsides=50,topbottom=51,txtid=world
-############
-# Blocks from RedPowerLogic-2
-############
-# Timer (logic.logic.id,0)
-block:id=rp2-logic-logic,data=0,allsides=0,top=8,bottom=0,txtid=logic,transparency=TRANSPARENT
-# Sequencer (logic.logic.id,1)
-block:id=rp2-logic-logic,data=1,allsides=0,top=1,bottom=0,txtid=logic,transparency=TRANSPARENT
-# Latch (logic.logic.id,2)
-block:id=rp2-logic-logic,data=2,allsides=0,top=2,bottom=0,txtid=logic,transparency=TRANSPARENT
-# Nor (logic.logic.id,3)
-block:id=rp2-logic-logic,data=3,allsides=0,top=32,bottom=0,txtid=logic,transparency=TRANSPARENT
-# Or (logic.logic.id,4)
-block:id=rp2-logic-logic,data=4,allsides=0,top=144,bottom=0,txtid=logic,transparency=TRANSPARENT
-# Nand (logic.logic.id,5)
-block:id=rp2-logic-logic,data=5,allsides=0,top=96,bottom=0,txtid=logic,transparency=TRANSPARENT
-# And (logic.logic.id,6)
-block:id=rp2-logic-logic,data=6,allsides=0,top=160,bottom=0,txtid=logic,transparency=TRANSPARENT
-# Xnor (logic.logic.id,7)
-block:id=rp2-logic-logic,data=7,allsides=0,top=20,bottom=0,txtid=logic,transparency=TRANSPARENT
-# Xor (logic.logic.id,8)
-block:id=rp2-logic-logic,data=8,allsides=0,top=24,bottom=0,txtid=logic,transparency=TRANSPARENT
-# Pulse (logic.logic.id,9)
-block:id=rp2-logic-logic,data=9,allsides=0,top=216,bottom=0,txtid=logic,transparency=TRANSPARENT
-# Toggle (logic.logic.id,10)
-block:id=rp2-logic-logic,data=10,allsides=0,top=16,bottom=0,txtid=logic,transparency=TRANSPARENT
-# Not (logic.logic.id,11)
-block:id=rp2-logic-logic,data=11,allsides=0,top=192,bottom=0,txtid=logic,transparency=TRANSPARENT
-# Buffer (logic.logic.id,12)
-block:id=rp2-logic-logic,data=12,allsides=0,top=208,bottom=0,txtid=logic,transparency=TRANSPARENT
-# Mux (logic.logic.id,13)
-block:id=rp2-logic-logic,data=13,allsides=0,top=5,bottom=0,txtid=logic,transparency=TRANSPARENT
-# Counter (logic.logic.id,14)
-block:id=rp2-logic-logic,data=14,allsides=0,top=16,bottom=0,txtid=logic,transparency=TRANSPARENT
-# Repeater (logic.logic.id,15)
-block:id=rp2-logic-logic,data=15,allsides=0,top=188,bottom=0,txtid=logic,transparency=TRANSPARENT
-############
-# Blocks from RedPowerLighting-2
-############
-# White Lamp on
-block:id=rp2-lighting-lampOn,data=0,allfaces=32,txtid=lighting
-# Orange Lamp on
-block:id=rp2-lighting-lampOn,data=1,allfaces=33,txtid=lighting
-# Magenta Lamp on
-block:id=rp2-lighting-lampOn,data=2,allfaces=34,txtid=lighting
-# Light Blue Lamp on
-block:id=rp2-lighting-lampOn,data=3,allfaces=35,txtid=lighting
-# Yellow Lamp on
-block:id=rp2-lighting-lampOn,data=4,allfaces=36,txtid=lighting
-# Lime Lamp on
-block:id=rp2-lighting-lampOn,data=5,allfaces=37,txtid=lighting
-# Pink Lamp on
-block:id=rp2-lighting-lampOn,data=6,allfaces=38,txtid=lighting
-# Gray Lamp on
-block:id=rp2-lighting-lampOn,data=7,allfaces=39,txtid=lighting
-# Light Gray Lamp on
-block:id=rp2-lighting-lampOn,data=8,allfaces=40,txtid=lighting
-# Cyan Lamp on
-block:id=rp2-lighting-lampOn,data=9,allfaces=41,txtid=lighting
-# Purple Lamp on
-block:id=rp2-lighting-lampOn,data=10,allfaces=42,txtid=lighting
-# Blue Lamp on
-block:id=rp2-lighting-lampOn,data=11,allfaces=43,txtid=lighting
-# Brown Lamp on
-block:id=rp2-lighting-lampOn,data=12,allfaces=44,txtid=lighting
-# Green Lamp on
-block:id=rp2-lighting-lampOn,data=13,allfaces=45,txtid=lighting
-# Red Lamp on
-block:id=rp2-lighting-lampOn,data=14,allfaces=46,txtid=lighting
-# Black Lamp on
-block:id=rp2-lighting-lampOn,data=15,allfaces=47,txtid=lighting
-# White Lamp off
-block:id=rp2-lighting-lampOff,data=0,allfaces=16,txtid=lighting
-# Orange Lamp off
-block:id=rp2-lighting-lampOff,data=1,allfaces=17,txtid=lighting
-# Magenta Lamp off
-block:id=rp2-lighting-lampOff,data=2,allfaces=18,txtid=lighting
-# Light Blue Lamp off
-block:id=rp2-lighting-lampOff,data=3,allfaces=19,txtid=lighting
-# Yellow Lamp off
-block:id=rp2-lighting-lampOff,data=4,allfaces=20,txtid=lighting
-# Lime Lamp off
-block:id=rp2-lighting-lampOff,data=5,allfaces=21,txtid=lighting
-# Pink Lamp off
-block:id=rp2-lighting-lampOff,data=6,allfaces=22,txtid=lighting
-# Gray Lamp off
-block:id=rp2-lighting-lampOff,data=7,allfaces=23,txtid=lighting
-# Light Gray Lamp off
-block:id=rp2-lighting-lampOff,data=8,allfaces=24,txtid=lighting
-# Cyan Lamp off
-block:id=rp2-lighting-lampOff,data=9,allfaces=25,txtid=lighting
-# Purple Lamp off
-block:id=rp2-lighting-lampOff,data=10,allfaces=26,txtid=lighting
-# Blue Lamp off
-block:id=rp2-lighting-lampOff,data=11,allfaces=27,txtid=lighting
-# Brown Lamp off
-block:id=rp2-lighting-lampOff,data=12,allfaces=28,txtid=lighting
-# Green Lamp off
-block:id=rp2-lighting-lampOff,data=13,allfaces=29,txtid=lighting
-# Red Lamp off
-block:id=rp2-lighting-lampOff,data=14,allfaces=30,txtid=lighting
-# Black Lamp off
-block:id=rp2-lighting-lampOff,data=15,allfaces=31,txtid=lighting
-############
-# Blocks from RedPowerArray-2
-############
-# Array (array.array.id,0)
-block:id=rp2-array-array,data=0,allsides=0,top=2,bottom=0,txtid=array,transparency=TRANSPARENT
-# Inv-Array (array.array.id,1)
-block:id=rp2-array-array,data=1,allsides=0,top=3,bottom=0,txtid=array,transparency=TRANSPARENT
-# Non-Inv-Array (array.array.id,2)
-block:id=rp2-array-array,data=2,allsides=0,top=5,bottom=0,txtid=array,transparency=TRANSPARENT
-############
-# Blocks from RedPowerMachine-2
-############
-# Deployer (machine.machine.id,0) - no orientation data yet - just face east
-block:id=rp2-machine-machine,data=0,east=53,west=48,top=6055,bottom=4055,north=4056,south=6056,txtid=machine
-# Breaker (machine.machine.id,1) - no orientation data yet - just face east
-block:id=rp2-machine-machine,data=1,east=49,west=58,top=6051,bottom=4051,north=4051,south=6051,txtid=machine
-# Transposer (machine.machine.id,2) - no orientation data yet - just face east
-block:id=rp2-machine-machine,data=2,east=57,west=58,top=6059,bottom=4059,north=4059,south=6059,txtid=machine
-# Filter (machine.machine.id,3) - no orientation data yet - just face east
-block:id=rp2-machine-machine,data=3,east=57,west=58,top=6061,bottom=4061,north=4061,south=6061,txtid=machine
-# Item Detector (machine.machine.id,4) - no orientation data yet - just face east
-block:id=rp2-machine-machine,data=4,east=103,west=102,top=6100,bottom=4101,north=4096,south=6097,txtid=machine
-# Sorter (machine.machine.id,5) - no orientation data yet - just face east
-block:id=rp2-machine-machine,data=5,east=112,west=113,top=6116,bottom=4116,north=4116,south=6116,txtid=machine
-# BatBox (machine.machine.id,6)
-block:id=rp2-machine-machine,data=6,allsides=134,topbottom=128,txtid=machine
-# Retriever (machine.machine.id,8) - no orientation data yet - just face east
-block:id=rp2-machine-machine,data=8,east=125,west=124,top=6123,bottom=4123,north=4123,south=6123,txtid=machine
-# Solar Panel (machine.machinePanel.id,0)
-block:id=rp2-machine-machinePanel,data=0,top=85,bottom=84,allsides=86,txtid=machine
-# Blue Furnace (base.appliance.id, 1) - no orientation data yet - just face east
-block:id=rp2-base-appliance,data=1,east=82,west=80,top=83,bottom=83,north=80,south=80,txtid=machine
-# Buffer (base.appliance.id, 2) - no orientation data yet - just face east
-block:id=rp2-base-appliance,data=2,east=89,west=88,top=6088,bottom=4088,north=4088,south=6088,txtid=machine
diff --git a/src/main/assembly/package.xml b/src/main/assembly/package.xml
index ad84a28f..f2279364 100644
--- a/src/main/assembly/package.xml
+++ b/src/main/assembly/package.xml
@@ -6,40 +6,16 @@
- ${project.basedir}
- /
-
- README*
- LICENSE*
- NOTICE*
- CHANGELOG*
-
-
+ ${project.build.directory}/core
+ /dynmap
+
+ web/version.js
- ${project.basedir}/web/
- /dynmap/web/
-
- version.js
-
- true
-
-
- ${project.basedir}/web
- /dynmap/web
-
- version.js
-
-
-
- ${project.basedir}/colorschemes
- /dynmap/colorschemes
-
-
- ${project.basedir}/texturepacks
- /dynmap/texturepacks
-
- ${project.basedir}/renderdata
- /dynmap/renderdata
+ ${project.build.directory}/core/web
+ /dynmap/web
+
+ version.js
+ true
diff --git a/src/main/java/org/dynmap/AsynchronousQueue.java b/src/main/java/org/dynmap/AsynchronousQueue.java
deleted file mode 100644
index e2d31c4d..00000000
--- a/src/main/java/org/dynmap/AsynchronousQueue.java
+++ /dev/null
@@ -1,161 +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 {
- private Object lock = new Object();
- private Thread thread;
- private LinkedBlockingQueue queue = new LinkedBlockingQueue();
- private Set set = new HashSet();
- private Handler handler;
- private int dequeueTime;
- private int accelDequeueTime;
- private int accelDequeueThresh;
- private int pendingcnt;
- private int pendinglimit;
- private boolean normalprio;
-
- public AsynchronousQueue(Handler handler, int dequeueTime, int accelDequeueThresh, int accelDequeueTime, int pendinglimit, boolean normalprio) {
- this.handler = handler;
- this.dequeueTime = dequeueTime;
- this.accelDequeueTime = accelDequeueTime;
- this.accelDequeueThresh = accelDequeueThresh;
- if(pendinglimit < 1) pendinglimit = 1;
- this.pendinglimit = pendinglimit;
- this.normalprio = normalprio;
- }
-
- 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 popAll() {
- List s;
- synchronized(lock) {
- s = new ArrayList(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 {
- if(!normalprio)
- 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();
- }
- }
-}
diff --git a/src/main/java/org/dynmap/ChatEvent.java b/src/main/java/org/dynmap/ChatEvent.java
deleted file mode 100644
index 99f0a830..00000000
--- a/src/main/java/org/dynmap/ChatEvent.java
+++ /dev/null
@@ -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;
- }
-}
diff --git a/src/main/java/org/dynmap/Client.java b/src/main/java/org/dynmap/Client.java
deleted file mode 100644
index 74b6831b..00000000
--- a/src/main/java/org/dynmap/Client.java
+++ /dev/null
@@ -1,160 +0,0 @@
-package org.dynmap;
-
-import java.io.IOException;
-import java.io.Writer;
-
-import org.json.simple.JSONAware;
-import org.json.simple.JSONStreamAware;
-import org.dynmap.common.DynmapChatColor;
-
-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 = Client.stripColor(playerName);
- this.message = DynmapChatColor.stripColor(message);
- this.account = playeraccount;
- this.channel = channel;
- }
- @Override
- public boolean equals(Object o) {
- if(o instanceof ChatMessage) {
- ChatMessage m = (ChatMessage)o;
- return m.source.equals(source) && m.playerName.equals(playerName) && m.message.equals(message);
- }
- return false;
- }
- @Override
- public int hashCode() {
- return source.hashCode() ^ playerName.hashCode() ^ message.hashCode();
- }
- }
-
- public static class PlayerJoinMessage extends Update {
- public String type = "playerjoin";
- public String playerName;
- public String account;
- public PlayerJoinMessage(String playerName, String playeraccount) {
- this.playerName = Client.stripColor(playerName);
- this.account = playeraccount;
- }
- @Override
- public boolean equals(Object o) {
- if(o instanceof PlayerJoinMessage) {
- PlayerJoinMessage m = (PlayerJoinMessage)o;
- return m.playerName.equals(playerName);
- }
- return false;
- }
- @Override
- public int hashCode() {
- return playerName.hashCode();
- }
- }
-
- public static class PlayerQuitMessage extends Update {
- public String type = "playerquit";
- public String playerName;
- public String account;
- public PlayerQuitMessage(String playerName, String playeraccount) {
- this.playerName = Client.stripColor(playerName);
- this.account = playeraccount;
- }
- @Override
- public boolean equals(Object o) {
- if(o instanceof PlayerQuitMessage) {
- PlayerQuitMessage m = (PlayerQuitMessage)o;
- return m.playerName.equals(playerName);
- }
- return false;
- }
- @Override
- public int hashCode() {
- return playerName.hashCode();
- }
- }
-
- public static class Tile extends Update {
- public String type = "tile";
- public String name;
-
- public Tile(String name) {
- this.name = name;
- }
- @Override
- public boolean equals(Object o) {
- if(o instanceof Tile) {
- Tile m = (Tile)o;
- return m.name.equals(name);
- }
- return false;
- }
- @Override
- public int hashCode() {
- return name.hashCode();
- }
- }
-
- public static class DayNight extends Update {
- public String type = "daynight";
- public boolean isday;
-
- public DayNight(boolean isday) {
- this.isday = isday;
- }
- @Override
- public boolean equals(Object o) {
- if(o instanceof DayNight) {
- return true;
- }
- return false;
- }
- @Override
- public int hashCode() {
- return 12345;
- }
- }
-
- public static class ComponentMessage extends Update {
- public String type = "component";
- /* Each subclass must provide 'ctype' string for component 'type' */
- }
-
- public static String stripColor(String s) {
- s = DynmapChatColor.stripColor(s); /* Strip standard color encoding */
- /* Handle Essentials nickname encoding too */
- int idx = 0;
- while((idx = s.indexOf('&', idx)) >= 0) {
- char c = s.charAt(idx+1); /* Get next character */
- if(c == '&') { /* Another ampersand */
- s = s.substring(0, idx) + s.substring(idx+1);
- }
- else {
- s = s.substring(0, idx) + s.substring(idx+2);
- }
- idx++;
- }
- return s;
- }
-}
diff --git a/src/main/java/org/dynmap/ClientComponent.java b/src/main/java/org/dynmap/ClientComponent.java
deleted file mode 100644
index f27cf284..00000000
--- a/src/main/java/org/dynmap/ClientComponent.java
+++ /dev/null
@@ -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 DynmapCore plugin, final ConfigurationNode configuration) {
- super(plugin, configuration);
- plugin.events.addListener("buildclientconfiguration", new Event.Listener() {
- @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 m) {
- JSONObject o = new JSONObject();
- for(Map.Entry 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)o);
- } else if (o instanceof List) {
- return convertList((List)o);
- }
- return o;
- }
-
-}
diff --git a/src/main/java/org/dynmap/ClientConfigurationComponent.java b/src/main/java/org/dynmap/ClientConfigurationComponent.java
deleted file mode 100644
index ec1d52eb..00000000
--- a/src/main/java/org/dynmap/ClientConfigurationComponent.java
+++ /dev/null
@@ -1,67 +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 DynmapCore core, ConfigurationNode configuration) {
- super(core, configuration);
- core.events.addListener("buildclientconfiguration", new Listener() {
- @Override
- public void triggered(JSONObject t) {
- ConfigurationNode c = core.configuration;
- s(t, "confighash", core.getConfigHashcode());
- 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", core.getDynmapCoreVersion());
- s(t, "cyrillic", c.getBoolean("cyrillic-support", false));
- s(t, "showlayercontrol", c.getString("showlayercontrol", "true"));
- s(t, "grayplayerswhenhidden", c.getBoolean("grayplayerswhenhidden", true));
- String sn = core.getServer().getServerName();
- if(sn.equals("Unknown Server"))
- sn = "Minecraft Dynamic Map";
- s(t, "title", c.getString("webpage-title", sn));
- s(t, "msg-maptypes", c.getString("msg/maptypes", "Map Types"));
- s(t, "msg-players", c.getString("msg/players", "Players"));
-
- DynmapWorld defaultWorld = null;
- String defmap = null;
- for(DynmapWorld world : core.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"));
- DynmapLocation spawn = world.getSpawnLocation();
- s(wo, "center/x", wn.getDouble("center/x", spawn.x));
- s(wo, "center/y", wn.getDouble("center/y", spawn.y));
- s(wo, "center/z", wn.getDouble("center/z", spawn.z));
- 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.getName()));
- s(t, "defaultmap", c.getString("defaultmap", defmap == null ? "surface" : defmap));
- if(c.getString("followmap", null) != null)
- s(t, "followmap", c.getString("followmap"));
- if(c.getInteger("followzoom",-1) >= 0)
- s(t, "followzoom", c.getInteger("followzoom", 0));
- }
- });
- }
-
-}
diff --git a/src/main/java/org/dynmap/ClientUpdateComponent.java b/src/main/java/org/dynmap/ClientUpdateComponent.java
deleted file mode 100644
index ea60abc9..00000000
--- a/src/main/java/org/dynmap/ClientUpdateComponent.java
+++ /dev/null
@@ -1,118 +0,0 @@
-package org.dynmap;
-
-import static org.dynmap.JSONUtils.a;
-import static org.dynmap.JSONUtils.s;
-
-import java.util.List;
-import org.dynmap.common.DynmapPlayer;
-import org.json.simple.JSONArray;
-import org.json.simple.JSONObject;
-
-public class ClientUpdateComponent extends Component {
-
- public ClientUpdateComponent(final DynmapCore plugin, ConfigurationNode configuration) {
- super(plugin, configuration);
- plugin.events.addListener("buildclientupdate", new Event.Listener() {
- @Override
- public void triggered(ClientUpdateEvent e) {
- buildClientUpdate(e);
- }
- });
- }
-
- protected void buildClientUpdate(ClientUpdateEvent e) {
- DynmapWorld world = e.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);
- boolean hideifsneaking = configuration.getBoolean("hideifsneaking", false);
-
- s(u, "confighash", core.getConfigHashcode());
-
- s(u, "servertime", world.getTime() % 24000);
- s(u, "hasStorm", world.hasStorm());
- s(u, "isThundering", world.isThundering());
-
- s(u, "players", new JSONArray());
- List players = core.playerList.getVisiblePlayers();
- for(DynmapPlayer p : players) {
- DynmapLocation pl = p.getLocation();
- DynmapWorld pw = core.getWorld(pl.world);
- if(pw == null)
- continue;
- JSONObject jp = new JSONObject();
- boolean hide = false;
-
- s(jp, "type", "player");
- s(jp, "name", Client.stripColor(p.getDisplayName()));
- s(jp, "account", p.getName());
- if(hideifshadow < 15) {
- if(pw.getLightLevel((int)pl.x, (int)pl.y, (int)pl.z) <= hideifshadow)
- hide = true;
- }
- if(hideifunder < 15) {
- if(pw.canGetSkyLightLevel()) { /* If we can get real sky level */
- if(pw.getSkyLightLevel((int)pl.x, (int)pl.y, (int)pl.z) <= hideifunder)
- hide = true;
- }
- else {
- if(pw.getHighestBlockYAt((int)pl.x, (int)pl.z) > pl.y)
- hide = true;
- }
- }
- if(hideifsneaking && p.isSneaking())
- hide = true;
-
- /* Don't leak player location for world not visible on maps, or if sendposition disbaled */
- DynmapWorld pworld = MapManager.mapman.worldsLookup.get(pl.world);
- /* 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", pl.world);
- s(jp, "x", pl.x);
- s(jp, "y", pl.y);
- s(jp, "z", pl.z);
- }
- 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", p.getArmorPoints());
- }
- else {
- s(jp, "health", 0);
- s(jp, "armor", 0);
- }
- a(u, "players", jp);
- }
- if(configuration.getBoolean("includehiddenplayers", false)) {
- List hidden = core.playerList.getHiddenPlayers();
- for(DynmapPlayer p : hidden) {
- JSONObject jp = new JSONObject();
- s(jp, "type", "player");
- s(jp, "name", Client.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 : core.mapManager.getWorldUpdates(worldName, since)) {
- a(u, "updates", (Client.Update)update);
- }
- }
-
-}
diff --git a/src/main/java/org/dynmap/ClientUpdateEvent.java b/src/main/java/org/dynmap/ClientUpdateEvent.java
deleted file mode 100644
index 5a5274c4..00000000
--- a/src/main/java/org/dynmap/ClientUpdateEvent.java
+++ /dev/null
@@ -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;
- }
-}
diff --git a/src/main/java/org/dynmap/Color.java b/src/main/java/org/dynmap/Color.java
deleted file mode 100644
index 4b0e2221..00000000
--- a/src/main/java/org/dynmap/Color.java
+++ /dev/null
@@ -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;
- }
-}
diff --git a/src/main/java/org/dynmap/ColorScheme.java b/src/main/java/org/dynmap/ColorScheme.java
deleted file mode 100644
index f512bb35..00000000
--- a/src/main/java/org/dynmap/ColorScheme.java
+++ /dev/null
@@ -1,250 +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.common.BiomeMap;
-import org.dynmap.debug.Debug;
-
-public class ColorScheme {
- private static final HashMap cache = new HashMap();
-
- 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;
- if(MapManager.mapman.getHideOres()) {
- for(int i = 0; i < colors.length; i++) {
- int id = MapManager.mapman.getBlockIDAlias(i);
- if(id != i) {
- this.colors[i] = this.colors[id];
- this.datacolors[i] = this.datacolors[id];
- }
- }
- }
- }
-
- private static File getColorSchemeDirectory(DynmapCore core) {
- return new File(core.getDataFolder(), "colorschemes");
- }
-
- public static ColorScheme getScheme(DynmapCore core, String name) {
- if (name == null)
- name = "default";
- ColorScheme scheme = cache.get(name);
- if (scheme == null) {
- scheme = loadScheme(core, name);
- cache.put(name, scheme);
- }
- return scheme;
- }
-
- public static ColorScheme loadScheme(DynmapCore core, String name) {
- File colorSchemeFile = new File(getColorSchemeDirectory(core), name + ".txt");
- Color[][] colors = new Color[256][];
- Color[][][] datacolors = new Color[256][][];
- Color[][] biomecolors = new Color[BiomeMap.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(BiomeMap b : BiomeMap.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();
- }
-}
diff --git a/src/main/java/org/dynmap/Component.java b/src/main/java/org/dynmap/Component.java
deleted file mode 100644
index 0d6a47f6..00000000
--- a/src/main/java/org/dynmap/Component.java
+++ /dev/null
@@ -1,21 +0,0 @@
-package org.dynmap;
-
-public abstract class Component {
- protected DynmapCore core;
- protected ConfigurationNode configuration;
- public Component(DynmapCore core, ConfigurationNode configuration) {
- this.core = core;
- this.configuration = configuration;
- }
-
- public void dispose() {
- }
-
- /* Substitute proper values for escape sequences */
- public static String unescapeString(String v) {
- /* Replace color code &color; */
- v = v.replace("&color;", "\u00A7");
-
- return v;
- }
-}
diff --git a/src/main/java/org/dynmap/ComponentManager.java b/src/main/java/org/dynmap/ComponentManager.java
deleted file mode 100644
index ce737940..00000000
--- a/src/main/java/org/dynmap/ComponentManager.java
+++ /dev/null
@@ -1,47 +0,0 @@
-package org.dynmap;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-
-public class ComponentManager {
- public Set components = new HashSet();
- public Map> componentLookup = new HashMap>();
-
- public void add(Component c) {
- if (components.add(c)) {
- String key = c.getClass().toString();
- List clist = componentLookup.get(key);
- if (clist == null) {
- clist = new ArrayList();
- componentLookup.put(key, clist);
- }
- clist.add(c);
- }
- }
-
- public void remove(Component c) {
- if (components.remove(c)) {
- String key = c.getClass().toString();
- List clist = componentLookup.get(key);
- if (clist != null) {
- clist.remove(c);
- }
- }
- }
-
- public void clear() {
- componentLookup.clear();
- components.clear();
- }
-
- public Iterable getComponents(Class c) {
- List list = componentLookup.get(c.toString());
- if (list == null)
- return new ArrayList();
- return list;
- }
-}
diff --git a/src/main/java/org/dynmap/ConfigurationNode.java b/src/main/java/org/dynmap/ConfigurationNode.java
deleted file mode 100644
index 8a0e89b0..00000000
--- a/src/main/java/org/dynmap/ConfigurationNode.java
+++ /dev/null
@@ -1,426 +0,0 @@
-package org.dynmap;
-
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStreamWriter;
-import java.lang.reflect.Constructor;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-
-import org.yaml.snakeyaml.DumperOptions;
-import org.yaml.snakeyaml.Yaml;
-import org.yaml.snakeyaml.constructor.SafeConstructor;
-import org.yaml.snakeyaml.introspector.Property;
-import org.yaml.snakeyaml.nodes.CollectionNode;
-import org.yaml.snakeyaml.nodes.MappingNode;
-import org.yaml.snakeyaml.nodes.Node;
-import org.yaml.snakeyaml.nodes.NodeTuple;
-import org.yaml.snakeyaml.nodes.SequenceNode;
-import org.yaml.snakeyaml.nodes.Tag;
-import org.yaml.snakeyaml.reader.UnicodeReader;
-import org.yaml.snakeyaml.representer.Represent;
-import org.yaml.snakeyaml.representer.Representer;
-
-public class ConfigurationNode implements Map {
- public Map entries;
- private File f;
- private Yaml yaml;
-
- public ConfigurationNode() {
- entries = new HashMap();
- }
-
- private void initparse() {
- if(yaml == null) {
- DumperOptions options = new DumperOptions();
-
- options.setIndent(4);
- options.setDefaultFlowStyle(DumperOptions.FlowStyle.BLOCK);
-
- yaml = new Yaml(new SafeConstructor(), new EmptyNullRepresenter(), options);
- }
- }
-
- public ConfigurationNode(File f) {
- this.f = f;
- entries = new HashMap();
- }
-
- public ConfigurationNode(Map map) {
- if (map == null) {
- throw new IllegalArgumentException();
- }
- entries = map;
- }
-
- public ConfigurationNode(InputStream in) {
- load(in);
- }
-
- @SuppressWarnings("unchecked")
- public boolean load(InputStream in) {
- initparse();
-
- Object o = yaml.load(new UnicodeReader(in));
- if((o != null) && (o instanceof Map))
- entries = (Map)o;
- return (entries != null);
- }
-
- @SuppressWarnings("unchecked")
- public boolean load() {
- initparse();
-
- FileInputStream fis = null;
- try {
- fis = new FileInputStream(f);
- Object o = yaml.load(new UnicodeReader(fis));
- if((o != null) && (o instanceof Map))
- entries = (Map)o;
- fis.close();
- } catch(IOException iox) {
- Log.severe("Error reading " + f.getPath());
- return false;
- } finally {
- if(fis != null) {
- try { fis.close(); } catch (IOException x) {}
- }
- }
- return (entries != null);
- }
-
- public boolean save() {
- return save(f);
- }
-
- public boolean save(File file) {
- initparse();
-
- FileOutputStream stream = null;
-
- File parent = file.getParentFile();
-
- if (parent != null) {
- parent.mkdirs();
- }
-
- try {
- stream = new FileOutputStream(file);
- OutputStreamWriter writer = new OutputStreamWriter(stream, "UTF-8");
- yaml.dump(entries, writer);
- return true;
- } catch (IOException e) {
- } finally {
- try {
- if (stream != null) {
- stream.close();
- }
- } catch (IOException e) {}
- }
- return false;
- }
-
- @SuppressWarnings("unchecked")
- public Object getObject(String path) {
- if (path.isEmpty())
- return entries;
- int separator = path.indexOf('/');
- if (separator < 0)
- return get(path);
- String localKey = path.substring(0, separator);
- Object subvalue = get(localKey);
- if (subvalue == null)
- return null;
- if (!(subvalue instanceof Map))
- return null;
- Map submap;
- try {
- submap = (Map)subvalue;
- } catch (ClassCastException e) {
- return null;
- }
-
- String subpath = path.substring(separator + 1);
- return new ConfigurationNode(submap).getObject(subpath);
-
- }
-
- public Object getObject(String path, Object def) {
- Object o = getObject(path);
- if (o == null)
- return def;
- return o;
- }
-
- @SuppressWarnings("unchecked")
- public T getGeneric(String path, T def) {
- Object o = getObject(path, def);
- try {
- return (T)o;
- } catch(ClassCastException e) {
- return def;
- }
- }
-
- public int getInteger(String path, int def) {
- return Integer.parseInt(getObject(path, def).toString());
- }
-
- public double getLong(String path, long def) {
- return Long.parseLong(getObject(path, def).toString());
- }
-
- public float getFloat(String path, float def) {
- return Float.parseFloat(getObject(path, def).toString());
- }
-
- public double getDouble(String path, double def) {
- return Double.parseDouble(getObject(path, def).toString());
- }
-
- public boolean getBoolean(String path, boolean def) {
- return Boolean.parseBoolean(getObject(path, def).toString());
- }
-
- public String getString(String path) {
- return getString(path, null);
- }
-
- public List getStrings(String path, List def) {
- Object o = getObject(path);
- if (!(o instanceof List)) {
- return def;
- }
- ArrayList strings = new ArrayList();
- for(Object i : (List)o) {
- strings.add(i.toString());
- }
- return strings;
- }
-
- public String getString(String path, String def) {
- Object o = getObject(path, def);
- if (o == null)
- return null;
- return o.toString();
- }
-
- @SuppressWarnings("unchecked")
- public List getList(String path) {
- try {
- List list = (List)getObject(path, null);
- return list;
- } catch (ClassCastException e) {
- try {
- T o = (T)getObject(path, null);
- if (o == null) {
- return new ArrayList();
- }
- ArrayList al = new ArrayList();
- al.add(o);
- return al;
- } catch (ClassCastException e2) {
- return new ArrayList();
- }
- }
- }
-
- public List> getMapList(String path) {
- return getList(path);
- }
-
- public ConfigurationNode getNode(String path) {
- Map v = null;
- v = getGeneric(path, v);
- if (v == null)
- return null;
- return new ConfigurationNode(v);
- }
-
- @SuppressWarnings("unchecked")
- public List getNodes(String path) {
- List