From ec6aa71163f29d3f83c43da2a4968ed5dc73f3d1 Mon Sep 17 00:00:00 2001 From: NatureFreshMilk Date: Fri, 8 Feb 2019 13:35:56 +0100 Subject: [PATCH] license stuff / mod / quarry overlay --- doc/license.md | 1 + license.txt | 5 ++--- server/go.sum | 1 + server/static/index.html | 1 + server/static/js/main.js | 1 + .../js/overlays/TechnicQuarryOverlay.js | 21 ++++++++++++++++++ server/static/pics/default_tool_mesepick.png | Bin 0 -> 201 bytes 7 files changed, 27 insertions(+), 3 deletions(-) create mode 100644 server/static/js/overlays/TechnicQuarryOverlay.js create mode 100644 server/static/pics/default_tool_mesepick.png diff --git a/doc/license.md b/doc/license.md index 9ad9535..b953c97 100644 --- a/doc/license.md +++ b/doc/license.md @@ -10,6 +10,7 @@ * bubble.png * sam.png * heart.png +* default_tool_mesepick.png ** License: CC BY-SA 3.0 ** Source: [minetest_game](https://github.com/minetest/minetest_game) diff --git a/license.txt b/license.txt index 57c2956..795da89 100644 --- a/license.txt +++ b/license.txt @@ -2,8 +2,7 @@ License of source code ---------------------- The MIT License (MIT) -Copyright (C) 2012-2016 PilzAdam -Copyright (C) 2012-2016 Various Minetest developers and contributors +Copyright (C) 2018-2019 Thomas Rudin Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software @@ -29,7 +28,7 @@ Licenses of media (textures) ---------------------------- Attribution-ShareAlike 3.0 Unported (CC BY-SA 3.0) -Copyright (C) 2016 paramat +Copyright (C) 2019 Thomas Rudin You are free to: Share — copy and redistribute the material in any medium or format. diff --git a/server/go.sum b/server/go.sum index 30ac03a..9f2a5ff 100644 --- a/server/go.sum +++ b/server/go.sum @@ -32,4 +32,5 @@ golang.org/x/image v0.0.0-20190118043309-183bebdce1b2 h1:FNSSV4jv1PrPsiM2iKGpqLP golang.org/x/image v0.0.0-20190118043309-183bebdce1b2/go.mod h1:ux5Hcp/YLpHSI86hEcLt0YII63i6oz57MZXIpbrjZUs= golang.org/x/sys v0.0.0-20180905080454-ebe1bf3edb33 h1:I6FyU15t786LL7oL/hn43zqTuEGr4PN7F4XJ1p4E3Y8= golang.org/x/sys v0.0.0-20180905080454-ebe1bf3edb33/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= +golang.org/x/sys v0.0.0-20190204203706-41f3e6584952 h1:FDfvYgoVsA7TTZSbgiqjAbfPbK47CNHdWl3h/PJtii0= golang.org/x/sys v0.0.0-20190204203706-41f3e6584952/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= diff --git a/server/static/index.html b/server/static/index.html index 2beeba4..5506ccb 100644 --- a/server/static/index.html +++ b/server/static/index.html @@ -41,6 +41,7 @@ + diff --git a/server/static/js/main.js b/server/static/js/main.js index 1159635..88526d6 100644 --- a/server/static/js/main.js +++ b/server/static/js/main.js @@ -37,6 +37,7 @@ api.getConfig().then(function(cfg){ overlays["Digiterms"] = new DigitermOverlay(wsChannel, layerMgr); overlays["Lua Controller"] = new LuacontrollerOverlay(wsChannel, layerMgr); overlays["Technic Anchor"] = new TechnicAnchorOverlay(wsChannel, layerMgr); + overlays["Technic Quarry"] = new TechnicQuarryOverlay(wsChannel, layerMgr); //overlays["Protector"] = new ProtectorOverlay(wsChannel, layerMgr); //Default enabled overlays diff --git a/server/static/js/overlays/TechnicQuarryOverlay.js b/server/static/js/overlays/TechnicQuarryOverlay.js new file mode 100644 index 0000000..b162bea --- /dev/null +++ b/server/static/js/overlays/TechnicQuarryOverlay.js @@ -0,0 +1,21 @@ +'use strict'; + +var TechnicQuarryIcon = L.icon({ + iconUrl: 'pics/default_tool_mesepick.png.png', + + iconSize: [16, 16], + iconAnchor: [8, 8], + popupAnchor: [0, -16] +}); + +var TechnicQuarryOverlay = AbstractIconOverlay.extend({ + initialize: function(wsChannel, layerMgr) { + AbstractIconOverlay.prototype.initialize.call(this, wsChannel, layerMgr, "technicquarry", TechnicQuarryIcon); + }, + + createPopup: function(lcd){ + return "

Owner: " + lcd.attributes.owner + "

" + + "

Dug: " + lcd.attributes.dug + "

" + + "

Enabled: " + lcd.attributes.enabled + "

"; + } +}); diff --git a/server/static/pics/default_tool_mesepick.png b/server/static/pics/default_tool_mesepick.png new file mode 100644 index 0000000000000000000000000000000000000000..1b2e25be507abee3aa67f12533886b98a0579419 GIT binary patch literal 201 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!73?$#)eFPHF4e$wZ1=9PEF<7e#1X{}EcnW{{ z&S0X*|NnpP|NmkC|2sT>CgEu$^#8x%>$i&0PBQzlih_X}7)yfuf*Bm1-ADs+ygXeT zLpZJ{J21F)t~9vzDL`U%jO3|FuYwy4W~eOaxf>}EdM2+&pjVBH=Mkd