 + '.png)
' +
- '' + esc(name) + '
' + (p.title ? '' + esc(p.title) + '
' : '') + '' +
- 'Level ' + esc(p.level || 1) + '' +
- (p.guild ? '[' + esc(p.guildTag) + '] ' + esc(p.guild) + '' : '') +
- (p.rank ? '' + esc(p.rank) + '' : '') + '
' +
- '' +
- '
' +
- 'Playtime' + esc(hours(p.playtime)) + '
' +
- 'Server level' + esc(p.serverLevel || 1) + '
' +
- (p.guildRole ? 'Guild role' + esc(p.guildRole) + '
' : '') + 'Open this map in the SCOPENET launcher to send a teleport request or message, or to invite ' + esc(name) + ' to your guild.
'; - el.querySelector('.close').addEventListener('click', function () { select(null); }); - } - - function select(uuid) { - selected = uuid; - if (embedded) { - window.parent.postMessage(uuid - ? { source: 'scopenet-map', type: 'player', uuid: uuid, name: (players[uuid] || {}).name || '' } - : { source: 'scopenet-map', type: 'deselect' }, '*'); - } else { - render(); - } - } - - function refresh() { - fetch(BASE + 'players.json?t=' + Date.now(), { cache: 'no-store' }) - .then(function (r) { return r.ok ? r.json() : null; }) - .then(function (j) { if (j && j.players) { players = j.players; if (!embedded && selected) render(); } }) - .catch(function () { /* the file appears once the server has written it */ }); - } - - // A click is a press and release in nearly the same place; a drag moves the map. - var down = null; - document.addEventListener('pointerdown', function (e) { down = { x: e.clientX, y: e.clientY, t: Date.now() }; }, true); - document.addEventListener('pointerup', function (e) { - var start = down; - down = null; - if (!start || e.button > 0) return; - if (Math.hypot(e.clientX - start.x, e.clientY - start.y) > 6 || Date.now() - start.t > 700) return; - if (e.target && e.target.closest && e.target.closest('#scopenet-panel')) return; - var uuid = playerAt(e.clientX, e.clientY); - if (uuid) select(uuid); - else if (selected) select(null); - }, true); - - window.addEventListener('message', function (e) { - if (e.source === window.parent && e.data && e.data.source === 'scopenet-launcher' && e.data.type === 'hello') { /* acknowledged */ } - }); - - refresh(); - setInterval(refresh, 10000); - if (embedded) window.parent.postMessage({ source: 'scopenet-map', type: 'ready' }, '*'); - - // Exposed for tests. - window.__scopenet = { uuidFromId: uuidFromId, esc: esc, hours: hours }; -})(); diff --git a/integrations/bluemap/src/main/resources/assets/scopenet/shop.svg b/integrations/bluemap/src/main/resources/assets/scopenet/shop.svg deleted file mode 100644 index 9e1f3f0..0000000 --- a/integrations/bluemap/src/main/resources/assets/scopenet/shop.svg +++ /dev/null @@ -1 +0,0 @@ - diff --git a/integrations/bluemap/src/main/resources/assets/scopenet/spawn.svg b/integrations/bluemap/src/main/resources/assets/scopenet/spawn.svg deleted file mode 100644 index 63c3e83..0000000 --- a/integrations/bluemap/src/main/resources/assets/scopenet/spawn.svg +++ /dev/null @@ -1 +0,0 @@ - diff --git a/integrations/bluemap/src/main/resources/assets/scopenet/warp.svg b/integrations/bluemap/src/main/resources/assets/scopenet/warp.svg deleted file mode 100644 index 3feb25d..0000000 --- a/integrations/bluemap/src/main/resources/assets/scopenet/warp.svg +++ /dev/null @@ -1 +0,0 @@ - diff --git a/integrations/common/src/main/java/net/scopenet/core/map/MapModel.java b/integrations/common/src/main/java/net/scopenet/core/map/MapModel.java index dfdb3fe..935a00e 100644 --- a/integrations/common/src/main/java/net/scopenet/core/map/MapModel.java +++ b/integrations/common/src/main/java/net/scopenet/core/map/MapModel.java @@ -52,7 +52,7 @@ public final class MapModel { return ((int) Math.round((r + m) * 255) << 16) | ((int) Math.round((g + m) * 255) << 8) | (int) Math.round((b + m) * 255); } - /** Which Minecraft dimension a BlueMap map shows, judged from its id and name ("world_nether" -> the nether). */ + /** Which Minecraft dimension a world id or name means ("world_nether" -> the nether). */ public static String dimensionOf(String id, String name) { ListIron <Wolves> [IRN]
1 claimed chunk in this area
");
+ var pin = new MapData.Pin("warp-a", "warp", "Warp: a", "minecraft:overworld", 5, 64, 6,
+ "1 claimed chunk in this area
Warp a
");
+ JsonObject json = MapOverlay.toJson(new MapData(List.of(claim), List.of(pin), List.of()));
+ JsonObject c = json.getAsJsonArray("claims").get(0).getAsJsonObject();
+ assertEquals("#3366cc", c.get("color").getAsString());
+ assertEquals(4, c.getAsJsonArray("outer").size());
+ assertEquals("Iron /warp a