From 79e98278d465128fce80f5172344d79c8ddd0b3f Mon Sep 17 00:00:00 2001
From: Klaus Kirkeby <klauskirkeby@hotmail.com>
Date: Sat, 4 Jul 2020 19:15:52 +0200
Subject: [PATCH] better map icon logic

This changes the way maps should be named in worlds.txt and how the sidebar shows the icons.

Added missing map icons.
---
 .../extracted/web/images/block_nether_flat.png   | Bin 0 -> 2620 bytes
 ...block_nether.png => block_nether_surface.png} | Bin
 .../extracted/web/images/block_the_end_flat.png  | Bin 0 -> 2089 bytes
 ...ock_the_end.png => block_the_end_surface.png} | Bin
 .../{block_biome.png => block_world_biome.png}   | Bin
 .../{block_cave.png => block_world_cave.png}     | Bin
 .../{block_flat.png => block_world_flat.png}     | Bin
 ...block_surface.png => block_world_surface.png} | Bin
 .../src/main/resources/extracted/web/js/map.js   |   7 ++++++-
 DynmapCore/src/main/resources/worlds.txt         |   4 ++--
 10 files changed, 8 insertions(+), 3 deletions(-)
 create mode 100644 DynmapCore/src/main/resources/extracted/web/images/block_nether_flat.png
 rename DynmapCore/src/main/resources/extracted/web/images/{block_nether.png => block_nether_surface.png} (100%)
 create mode 100644 DynmapCore/src/main/resources/extracted/web/images/block_the_end_flat.png
 rename DynmapCore/src/main/resources/extracted/web/images/{block_the_end.png => block_the_end_surface.png} (100%)
 rename DynmapCore/src/main/resources/extracted/web/images/{block_biome.png => block_world_biome.png} (100%)
 rename DynmapCore/src/main/resources/extracted/web/images/{block_cave.png => block_world_cave.png} (100%)
 rename DynmapCore/src/main/resources/extracted/web/images/{block_flat.png => block_world_flat.png} (100%)
 rename DynmapCore/src/main/resources/extracted/web/images/{block_surface.png => block_world_surface.png} (100%)

diff --git a/DynmapCore/src/main/resources/extracted/web/images/block_nether_flat.png b/DynmapCore/src/main/resources/extracted/web/images/block_nether_flat.png
new file mode 100644
index 0000000000000000000000000000000000000000..298cdf95ddbc4910da14c30c050c9e375e911fe5
GIT binary patch
literal 2620
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

literal 0
HcmV?d00001

diff --git a/DynmapCore/src/main/resources/extracted/web/images/block_nether.png b/DynmapCore/src/main/resources/extracted/web/images/block_nether_surface.png
similarity index 100%
rename from DynmapCore/src/main/resources/extracted/web/images/block_nether.png
rename to DynmapCore/src/main/resources/extracted/web/images/block_nether_surface.png
diff --git a/DynmapCore/src/main/resources/extracted/web/images/block_the_end_flat.png b/DynmapCore/src/main/resources/extracted/web/images/block_the_end_flat.png
new file mode 100644
index 0000000000000000000000000000000000000000..574d213bfc3a259328a5ac0b27ef28d143e718dd
GIT binary patch
literal 2089
zcmV+^2-f$BP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV000H?dQ@0+Qek%>
zaB^>EX>4U6ba`-PAZ2)IW&i+q+O1b@k}D?+{Ld+J1P}<sarmst4RZW6AiQ3$-+Q~M
zc*+CTFhX><1UBQJzo+>NA97+%;3P4}Xz>X-WGd*0J)hG$8}?m)*xUJJH;)GdlSk{%
z&p32^ft^2INI~uOv)!boencI)hvWV6Yv$G0aiWeq9lO)tChL18JS|7R)YPpyfBhX2
zz~~Hro(v7|yv04PS^W7HeAB)M401m2zQ^5pevh4bbYH-G^j@&DMeY7G6vjp!5MMA-
zyW<zTe@sKKtlgPEJ&4^V`}}#rZq6=qj<dQFB9Mwk7j>7idl*;&rQfebTnS%BKkX~y
z5-hQSu?{vXu4Y_z1hl6MuDjx<8@p|;A;ds~5?Z20e%r(+%GCU#Ags$xN+6>fFW{+x
zH4igAVsU%kyyt7kfNs0PNOExI@Wz+Ryfgln>)~k5C0*yNJg`Dsv^0${7IW*4Q6R)k
z#gsR``!Y|uu}{Q$FvuHb!2*k|$3<oLp)J38_87-D7<*E~rLGPD5$0wD<2)F!5n^`H
z*+i6_1C9cI3L+=SzJdYAOx>9YZoH2mM`+EBcaqy<iRqY8T0jK*h_sQFE+8uehJI2I
zXsEE~V3;{_V&Tjs`WPa|7*kv|swAI6;uKR#l5#5IB?wEDBqCW#rtDF|ILDk!mYj1b
zn6$uk!P^BRN~u(R4V7!GsY=bYG{~og#x1tgq~%sRb>ETxJ@#a}^xVsE15z4c@Q5P~
z8F`cmtxZ3}<QZq0GV?4C)|A!HthpEFe$Sdy))r%7k4qn{!JN`{;Z`}}#Tgi*;J|oV
z3_#GdIJ4qHpvBzc%w|GTFo8A4i=6HjV_+~0M?BqwyAS4m%bVfwBi`s&%$Y^q|G}JD
z)G2dcd3(cJFMCJvo1m423sdVS3R_|q*x`NKnk^)SRz}sZ%t#gA*JD7zaX-vC5+74`
zbB}^AXO7J_!D=wh2F`oD{Lq(it{)?#ieY8jT^Bo(M%M<msO`G!l#9FDTK4gDZAPw&
z*#k(j1_Tn0TV%37uSb9177A^5s0d0XpP4*`o{QOoF`(-J2&brR+Hr<<z*=-IG1YOV
zYN+L17aiFgw*~s@XR#zYEA&_t0J4Km$Q9-OgqHz|J$_KWsyXP{Rt~g5?kXcg*avQ`
z?O+$NY4{TbEZEINBNA_VIunew&wC9I$~;TWaOTfSmgBS?$F(D#**fy-AZaoMT^;s3
zuY_lJW(A)R?3uLPP%9Q+A2=62&W$iiQQkjNLf$J<)^}xh`qphdBZ3v}q43j1Wlv>X
zfSeDe5PVX>kWD9$hLg;}2eMMS;N$f0s_HmEkoC?`uYQy08zZA6Mb#A|9|!!D8{k(D
zA)m+%PHG`3VUX)tdvIAHCLB-I6Zw3gDea*~q*Sc?xk0*6(^#wwl}MiU1jrNB%W6X2
z){Um9T4^(FpN1+<F8<)U9>y!8qH#iP{tA>-fD{fO44bAlPHZYF><w2kV`Ne-+CR0a
z9Dy2c#CgmcYNn{(pe7YSypyqgRw7N-_!3av^$6>D)ErcHr&(*KCS5^I34aL9JjbY6
zjs2yUGx0zjotiAgrEw`&WN<iB`QV%#Zjxdvpo=u$@`MDuz2P-6I!;n2)Th?G8cyrG
zYJ8wLeydoTr)v4bVmYM^MNqOe<$XwBLySYq4MBtLgecf6&U&-?eo1Rp3sV%*DnlO>
z8(Wj6KGI@n@tgV2Laf}ibc5ui82zw3Vn)_P3^)jE-_X(2{N-VnzBSZ#6Bw+?P*lr0
ztiDIlJi*y+^>%qwucc>1;dV=g_Ojq8tNW0$jXyQ11x>VWbAGKD-)_y9Qd8^AU+jgV
zi%zz6-S=?}%UZ47-6Omo#-$^Pfo;NmQ&jI-^Im<KZqDX0Ziu>H02w@c><xPEFuPjF
zgBAQaI|=gB*8Fk+ysCR2>dn=@GVmT8lq85#dN&)bKCZ6pf2GZQ-61Cajj4zV4zCmE
z#teG@1t)z3^;N2lVgLXD24YJ`L;(K){{a7>y{D4^000SaNLh0L04^f{04^f|c%?sf
z00007bV*G`2jm9?5d#m}H9uwm00Fs4L_t(I%axL`Zqra0M$fgcV>@=-IE9u3BoJx~
zVuKgq1&Y|1nRoyM5-cDw0W&iaGcUoIsz^jAY9Mi4$5HIq&b66Ji)2GN>(T$|m%dLt
zd+~s8qo0*TU|21R<q9QAG+k2U1;x6+v~BAA?#?wK4~OIG@ss;R;}E~^vUPPpJewn|
z7D=2E1`)k&uhzeQ`LWVOwWjSj+`6}i({&-sNs|SZ)gqb%XyvNWuNDc?^}D1ebCT(l
z-Me?Nbq7q1G|K4jT>)gHcQ;+6*)q^Hfpgho5yixLfKnCfYKiUm7($ZAi&}5A3}iSB
z5mLkUd@S2USvtp)Ihtjn)+M9iA-(PHAO4cN&neQdO{~raX`FKWeTKK?p~{>}nP@_z
zz3E|fHW>8Ij?SZHNk&=1kI4}^1-Z&t=K@`~`1<95cotKZG$Iv>APli=7pL1Ho<tO)
zAUjdmzQb~r5QJfKfG#9$Qxc6sbY0QkIqO*pgCZ|!o3b(B!aFz$KGc8Ew1YwKAppbC
z``^AcplJuE+`jRMzfrq`^F9BI+8z84^5*rvc=PI0l`LYUl)QWU`NGG~pYDraQULl!
T)X7>{00000NkvXXu0mjfU>4?Z

literal 0
HcmV?d00001

diff --git a/DynmapCore/src/main/resources/extracted/web/images/block_the_end.png b/DynmapCore/src/main/resources/extracted/web/images/block_the_end_surface.png
similarity index 100%
rename from DynmapCore/src/main/resources/extracted/web/images/block_the_end.png
rename to DynmapCore/src/main/resources/extracted/web/images/block_the_end_surface.png
diff --git a/DynmapCore/src/main/resources/extracted/web/images/block_biome.png b/DynmapCore/src/main/resources/extracted/web/images/block_world_biome.png
similarity index 100%
rename from DynmapCore/src/main/resources/extracted/web/images/block_biome.png
rename to DynmapCore/src/main/resources/extracted/web/images/block_world_biome.png
diff --git a/DynmapCore/src/main/resources/extracted/web/images/block_cave.png b/DynmapCore/src/main/resources/extracted/web/images/block_world_cave.png
similarity index 100%
rename from DynmapCore/src/main/resources/extracted/web/images/block_cave.png
rename to DynmapCore/src/main/resources/extracted/web/images/block_world_cave.png
diff --git a/DynmapCore/src/main/resources/extracted/web/images/block_flat.png b/DynmapCore/src/main/resources/extracted/web/images/block_world_flat.png
similarity index 100%
rename from DynmapCore/src/main/resources/extracted/web/images/block_flat.png
rename to DynmapCore/src/main/resources/extracted/web/images/block_world_flat.png
diff --git a/DynmapCore/src/main/resources/extracted/web/images/block_surface.png b/DynmapCore/src/main/resources/extracted/web/images/block_world_surface.png
similarity index 100%
rename from DynmapCore/src/main/resources/extracted/web/images/block_surface.png
rename to DynmapCore/src/main/resources/extracted/web/images/block_world_surface.png
diff --git a/DynmapCore/src/main/resources/extracted/web/js/map.js b/DynmapCore/src/main/resources/extracted/web/js/map.js
index 9d8ca201..d8b97938 100644
--- a/DynmapCore/src/main/resources/extracted/web/js/map.js
+++ b/DynmapCore/src/main/resources/extracted/web/js/map.js
@@ -278,12 +278,17 @@ DynMap.prototype = {
 					worldsadded[wname] = true;
 				}
 
+				var worldName = wname;
+				if(wname.startsWith('world_')) {
+					worldName = wname.substring(6);
+				}
+
 				map.element = $('<li/>')
 					.addClass('map item')
 					.append($('<a/>')
 							.attr({ title: map.options.title, href: '#' })
 							.addClass('maptype')
-							.css({ backgroundImage: 'url(' + (map.options.icon || ('images/block_' + mapindex + '.png')) + ')' })
+							.css({ backgroundImage: 'url(' + (map.options.icon || ('images/block_' + worldName + '_' + mapindex + '.png')) + ')' })
 							.text(map.options.title)
 					)
 					.click(function() {
diff --git a/DynmapCore/src/main/resources/worlds.txt b/DynmapCore/src/main/resources/worlds.txt
index a4abfc7d..88b0e6b9 100644
--- a/DynmapCore/src/main/resources/worlds.txt
+++ b/DynmapCore/src/main/resources/worlds.txt
@@ -115,9 +115,9 @@ worlds:
   #      background: "#300806"
   #      mapzoomin: 1
   #    - class: org.dynmap.hdmap.HDMap
-  #      name: nether
+  #      name: surface
   #      title: "Surface"
-  #      prefix: nt
+  #      prefix: surface
   #      perspective: iso_SE_30_hires
   #      shader: stdtexture
   #      lighting: nethershadows