Upstream/dynmap
1
0
Fork 0
mirror of https://github.com/webbukkit/dynmap.git synced 2024-12-25 18:17:37 +01:00
Code Issues Projects Releases Wiki Activity

Merge pull request #3008 from Kimax89/master

Browse Source 
better map icon logic
This commit is contained in:
mikeprimm 2020-08-16 12:41:27 -05:00 committed by GitHub
commit 1bbe0bea30
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
10 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
DynmapCore/src/main/resources/extracted/web/images/block_nether_flat.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 2.6 KiB

0
DynmapCore/src/main/resources/extracted/web/images/block_nether.png → DynmapCore/src/main/resources/extracted/web/images/block_nether_surface.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 340 B

After

Width:  |  Height:  |  Size: 340 B

BIN
DynmapCore/src/main/resources/extracted/web/images/block_the_end_flat.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 2.0 KiB

0
DynmapCore/src/main/resources/extracted/web/images/block_the_end.png → DynmapCore/src/main/resources/extracted/web/images/block_the_end_surface.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.0 KiB

After

Width:  |  Height:  |  Size: 1.0 KiB

0
DynmapCore/src/main/resources/extracted/web/images/block_biome.png → DynmapCore/src/main/resources/extracted/web/images/block_world_biome.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.1 KiB

After

Width:  |  Height:  |  Size: 1.1 KiB

0
DynmapCore/src/main/resources/extracted/web/images/block_cave.png → DynmapCore/src/main/resources/extracted/web/images/block_world_cave.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 339 B

After

Width:  |  Height:  |  Size: 339 B

0
DynmapCore/src/main/resources/extracted/web/images/block_flat.png → DynmapCore/src/main/resources/extracted/web/images/block_world_flat.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 387 B

After

Width:  |  Height:  |  Size: 387 B

0
DynmapCore/src/main/resources/extracted/web/images/block_surface.png → DynmapCore/src/main/resources/extracted/web/images/block_world_surface.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 342 B

After

Width:  |  Height:  |  Size: 342 B

7
DynmapCore/src/main/resources/extracted/web/js/map.js
View File

@ -278,12 +278,17 @@ DynMap.prototype = {
worldsadded[wname] = true; worldsadded[wname] = true;
} }
var worldName = wname;
if(wname.startsWith('world_')) {
worldName = wname.substring(6);
}
map.element = $('<li/>') map.element = $('<li/>')
.addClass('map item') .addClass('map item')
.append($('<a/>') .append($('<a/>')
.attr({ title: map.options.title, href: '#' }) .attr({ title: map.options.title, href: '#' })
.addClass('maptype') .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) .text(map.options.title)
) )
.click(function() { .click(function() {

4
DynmapCore/src/main/resources/worlds.txt
View File

@ -115,9 +115,9 @@ worlds:
# background: "#300806" # background: "#300806"
# mapzoomin: 1 # mapzoomin: 1
# - class: org.dynmap.hdmap.HDMap # - class: org.dynmap.hdmap.HDMap
# name: nether # name: surface
# title: "Surface" # title: "Surface"
# prefix: nt # prefix: surface
# perspective: iso_SE_30_hires # perspective: iso_SE_30_hires
# shader: stdtexture # shader: stdtexture
# lighting: nethershadows # lighting: nethershadows