diff --git a/.gitignore b/.gitignore index a4ae546..8df4ffe 100644 --- a/.gitignore +++ b/.gitignore @@ -184,9 +184,11 @@ Backups/ bundler/ cache/ logs/ -world/ +world/* +!world/serverconfig local/ -dynmap.db +*.db +dynmap/web *.json crash-reports config/awesomedungeon* diff --git a/Jenkinsfile b/Jenkinsfile index 8b9e91c..4923a24 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -42,9 +42,9 @@ pipeline { sshagent(['ce4c701d-098c-4706-8f32-c0af996a7769']) { discordSend description: 'The RSEMCS server will now be rebooting! Checkout the build link for shutdown progress (startup occurs after shutdown and usually takes 1-2 minutes).', footer: '', image: '', link: 'env.BUILD_URL', result: currentBuild.currentResult, scmWebUrl: '', thumbnail: '', title: 'RS Jenkins - ${env.JOB_NAME}: Server is rebooting!', webhookURL: 'https://discord.com/api/webhooks/977367178884046919/LCJ_ngdNG1zo6Ak4CmzzUZbYD92LPUNn_mQO8IhwxoAVmswJo8p950qLFoQUck7LmIkf' pwsh "ssh -o StrictHostKeyChecking=no gamehost@entertainment 'systemctl --user stop rsemcs'" - pwsh "rsync -a --update --filter=':- .gitignore' --exclude=./mods/ --exclude='./config/' --exclude='./world' . gamehost@entertainment:/home/gamehost/mcserver/" - pwsh "rsync -a --update --filter=':- .gitignore' --delete ./mods/ gamehost@entertainment:/home/gamehost/mcserver/mods" - pwsh "rsync -a --update --filter=':- .gitignore' --delete ./config gamehost@entertainment:/home/gamehost/mcserver/config" + pwsh "rsync -a --update --filter=':- .gitignore' --exclude=./mods/ --exclude='./config/' . gamehost@entertainment:/home/gamehost/mcserver/" + pwsh "rsync -a --update --filter=':- .gitignore' --delete ./mods/ gamehost@entertainment:/home/gamehost/mcserver/mods" + pwsh "rsync -a --update --filter=':- .gitignore' --delete ./config gamehost@entertainment:/home/gamehost/mcserver/config" pwsh "ssh gamehost@entertainment 'systemctl --user start rsemcs'" } } diff --git a/dynmap/web/config.js b/dynmap/web/config.js deleted file mode 100644 index a3436f7..0000000 --- a/dynmap/web/config.js +++ /dev/null @@ -1,2 +0,0 @@ -// This file is retired : settings now can be tailored using url section in configuration.txt, when needed -// \ No newline at end of file diff --git a/dynmap/web/css/dynmap_style.css b/dynmap/web/css/dynmap_style.css deleted file mode 100644 index 7831029..0000000 --- a/dynmap/web/css/dynmap_style.css +++ /dev/null @@ -1,1059 +0,0 @@ -/* TILE DEBUGGING */ -/*.leaflet-tile { - margin: -1; - border: 1px solid red; -}*/ - -/******************* - * Attribution placement - */ -.leaflet-control-attribution { - margin-right: 20px !important; -} - -/******************* - * Page setup - */ - -.dynmap .map .tile img, img { - image-rendering: -moz-crisp-edges; - image-rendering: pixelated; - -ms-interpolation-mode: nearest-neighbor; -} - - -/******************* - * fieldset and legend styles - */ - -.dynmap fieldset { - border: none; - border-top: 1px solid rgba(196,196,196,0.4); -} - -.dynmap legend { - padding: 8px 4px; - font-weight: bold; - color: #fff; -} - -.leaflet-control-layers { - background-color: #bbb; -} - -.leaflet-control-layers:hover { - background-color: #bbb; -} - -.leaflet-control-zoom-in { - background-color: #eee; - } - -.leaflet-control-zoom-out { - background-color: #eee; - } - -.leaflet-control-zoom-in:hover { - background-color: #fff; - } - -.leaflet-control-zoom-out:hover { - background-color: #fff; - } - - -/******************* - * Map Setup - */ - -.dynmap > .map { - width: 100%; - height: 100%; - background: transparent; - z-index: 0; -} - -/* Map Controls */ -.gmnoprint{ - margin-top:-75px; - margin-left:-20px; -} - - -/******************* - * Alerts are pretty. - */ - -.alertbox { - position: fixed; - width: 50%; - z-index: 999; - - top: 0; - left: 0; - right: 0; - - text-align: center; - font-size: 16px; - font-weight: bold; - - color: #fff; - background: #c00; - - border-color: #a00; - - margin: auto; - padding: 8px; -} - - -/******************* - * shared rules - */ - -.dynmap .panel ul, .dynmap .panel li { - list-style: none; - - padding: 0; - margin: 0; -} - -.maplist li a, -.playerlist li a { - outline: none; - text-decoration: none; -} - -.alertbox, -.largeclock { - border-style: solid; - border-width: 0px 1px 1px 1px; - - -moz-box-shadow: 0px 2px 4px rgba(0, 0, 0, 0.4); - -webkit-box-shadow: 0px 2px 4px rgba(0, 0, 0, 0.4); - -o-box-shadow: 0px 2px 4px rgba(0, 0, 0, 0.4); - - -moz-border-radius: 0 0 3px 3px; - -webkit-border-radius: 0 0 3px 3px; - -o-border-radius: 0 0 3px 3px; - - box-shadow: 0px 2px 4px rgba(0, 0, 0, 0.4); - border-radius: 0 0 3px 3px; -} - -/******************* - * sidebar panels - */ - -.dynmap .sidebar { - - display: block; - position: absolute; - z-index: 120; - - top: 0px; - right: 0px; - - height: 100%; - - background: rgb(0,0,0); /* FU IE */ - background: rgba(0,0,0,0.6); - color: #fff; - - border-left: 1px solid rgba(0,0,0,0.5); -} - -.dynmap .hitbar { - - display: block; - position: absolute; - z-index: 110; - - top: 0px; - - height: 100%; - width: 16px; - - text-align: center; - - background: url(../images/sidebar_hint.png) rgb(0,0,0); - background: url(../images/sidebar_hint.png) rgba(0,0,0,0.6); - background-repeat: no-repeat; - background-position:center; - - border: 1px solid rgba(0,0,0,0.5); -} - -/* magic and metrics */ - -/* The following only applies to desktops, not to mobile devices */ -@media screen and (min-device-width: 640px) { - .dynmap .sidebar { - -moz-transition: all 0.6s ease-in-out; - -webkit-transition: all 0.6s ease-in-out; - -o-transition: all 0.6s ease-in-out; - transition: all 0.6s ease-in-out; - } - - .dynmap .hitbar { - -moz-transition: all 0.6s ease-in-out; - -webkit-transition: all 0.6s ease-in-out; - -o-transition: all 0.6s ease-in-out; - transition: all 0.6s ease-in-out; - } - - .dynmap .sidebar:hover { - margin-right: 0px; - } - - .dynmap .sidebar < .hitbar:hover { - margin-right: 0px; - } - - .dynmap .sidebar:hover .hitbar { - right: -120px; - } -} - -.dynmap .sidebar.pinned { - margin-right: 0px; -} - -.dynmap .sidebar.pinned .hitbar { - right: -120px; -} - -/* pinning */ - -.dynmap .sidebar .panel > .pin { - position: absolute; - - right: 8px; - top: 7px; - - width: 16px; - height: 16px; - - background-image: url(../images/window_close.png); -} - -.dynmap .sidebar .panel > .pin:hover { - background-image: url(../images/window_pinned_hover.png); -} - -.dynmap .sidebar.pinned .panel > .pin:hover { - background-image: url(../images/window_close_hover.png); -} - -.dynmap .sidebar.pinned .panel > .pin { - background-image: url(../images/window_pinned.png); -} - - -/******************* - * Sidebar clock style - */ -/* -.dynmap .panel .clock { - display: inline-block; - height: 16px; - z-index:50; - - font-weight: bold; - background-repeat: no-repeat; - padding-left: 20px; - margin-left: 8px; -} -*/ -.largeclock.digitalclock { - text-align: center; - font-size: 50px; - font-weight: bold; -} - -.digitalclock { - text-align: center; - font-size: 20px; - font-weight:bold; -} - -.digitalclock.night { - /* background-image: url(../images/clock_night.png); */ - color: #dff; -} - -.digitalclock.day { - /* background-image: url(../images/clock_day.png); */ - color: #fd3; -} - -.digitalclock.night, .digitalclock.day { - -moz-transition: color 8s 8s linear; - -webkit-transition: color 8s 8s linear; - -o-transition: color 8s 8s linear; - transition: color 8s 8s linear; -} - - -/******************* - * Large clock style - */ - -.largeclock { - position: absolute; - top: 0; - left: 0; - right: 0; - border-color: rgba(0,0,0,0.5); - width: 150px; - height: 60px; - background: rgba(0,0,0,0.6); - z-index:50; - - margin: auto; -} - -.timeofday { - background-repeat: no-repeat; -} - -.timeofday.sun { - background-image: url(../images/sun.png); -} - -.timeofday.moon { - background-image: url(../images/moon.png); -} - -.timeofday.digitalclock { - position: relative; - bottom: 25px; -} - -/******************* - * Clock weather style - */ - -.weather { - position: absolute; - top: 5px; - right: 0px; - width: 32px; - height: 32px; - display: block; - background-repeat: no-repeat; -} - -.weather.sunny_day { - background-image: url(../images/weather_sunny_day.png); -} - -.weather.stormy_day { - background-image: url(../images/weather_stormy_day.png); -} -.weather.thunder_day { - background-image: url(../images/weather_thunder_day.png); -} - -.weather.sunny_night { - background-image: url(../images/weather_sunny_night.png); -} - -.weather.stormy_night { - background-image: url(../images/weather_stormy_night.png); -} -.weather.thunder_night { - background-image: url(../images/weather_thunder_night.png); -} - -/******************* - * generic sidebar sublist styling - */ - -.dynmap .panel .subsection { - display: block; - clear: both; - - width: 100%; - line-height: 18px; - margin: 0 0 30px 0; - - border-bottom: 1px solid rgba(128,128,128,0.3); - -} - -.dynmap .sublist .item { - display: block; - float: left; - - height: 18px; - width: 18px; - - padding: 2px; - margin: 5px 2px; - - border-radius: 3px; - -moz-border-radius: 3px; - - background: rgba(32,32,32,0.6); - border: 1px solid rgba(64,64,64,0.6); -} - -.dynmap .sublist .item:hover { - background: rgba(64,64,64,0.6); - border: 1px solid rgba(128,128,128,0.6); -} - -.dynmap .sublist .item.selected { - background: rgba(128,128,128,0.5); - border: 1px solid rgba(255,255,255,0.5); -} - -.dynmap .sublist .item > a { - display: block; - - text-indent: -99999px; - outline: none; -} - -.dynmap .sublist .item > a { - background-repeat: no-repeat; - background-position: center; -} - -/******************* - * player list-specific styles - */ - -.dynmap .playerlist .player { - - display: inline-block; - float: left; - width: 100%; - - padding: 4px 0; - border: 3px solid transparent; -} - -.dynmap .playerlist .player.otherworld { - opacity: 0.5; -} - -.dynmap .playerlist .player:hover { - background: rgba(64,64,64,0.6); -} - -.dynmap .playerlist .player a { - color: #fff; -} - -.dynmap .playerlist .playerIcon img { - width: 16px; - height: 16px; -} - -.dynmap .playerlist .playerIcon > * { - vertical-align: middle; - border: none; -} - -.dynmap .playerlist .playerIcon { - width: 16px; - height: 16px; - - display: block; - float: left; - - margin: 0px 4px 0px 2px; -} - -.dynmap .playerlist .player.following { - background: rgba(128,128,128,0.5); - border: 1px solid rgba(255,255,255,0.5); - - border-radius: 3px; - -moz-border-radius: 3px; - - padding: 6px 2px; - - width: -webkit-calc(100% - 6px); - width: calc(100% - 6px); -} - -.dynmap .playerlist .player:hover .playericon { - background: url(../images/player_follow_off.png) no-repeat; -} - -.dynmap .playerlist .player.following .playericon { - background: url(../images/player_follow_on.gif) no-repeat; -} - -.dynmap .playerlist .player.following .playericon > *, -.dynmap .playerlist .player:hover .playericon > * { - visibility: hidden; -} - -/******************* - * Playerlist Scrolling - */ - -.panel .scrollup { - border: 1px solid rgba(64,64,64,0.6); - background: url(../images/scrollup.png) rgba(32,32,32,0.6); - - margin-bottom: 4px; - - -moz-border-radius: 2px; - -webkit-border-radius: 2px; - -o-border-radius: 2px; - border-radius: 2px; -} - -.panel .scrolldown { - border: 1px solid rgba(64,64,64,0.6); - background: url(../images/scrolldown.png) rgba(32,32,32,0.6); - - margin-top: 4px; - - -moz-border-radius: 2px; - -webkit-border-radius: 2px; - -o-border-radius: 2px; - border-radius: 2px; -} - -.panel .scrollup:hover, .panel .scrolldown:hover { - border: 1px solid rgba(128,128,128,0.6); - background: url(../images/scrollup.png) rgba(64,64,64,0.6); -} - -.panel .scrollup:active, .panel .scrolldown:active { - border: 1px solid rgba(255,255,255,0.5); - background: url(../images/scrollup.png) rgba(128,128,128,0.5); -} - -.panel .scrolldown:hover { - border: 1px solid rgba(128,128,128,0.6); - background: url(../images/scrolldown.png) rgba(64,64,64,0.6); -} - -.panel .scrolldown:active { - border: 1px solid rgba(255,255,255,0.5); - background: url(../images/scrolldown.png) rgba(128,128,128,0.5); -} - -.panel .scrollup, .panel .scrollup:active, .panel .scrollup:hover, -.panel .scrolldown, .panel .scrolldown:active, .panel .scrolldown:hover { - height: 18px; - width: 100%; - - background-repeat: no-repeat; - background-position: center; -} - -.sidebar .list { - overflow:hidden; -} - -.sidebar .content { - min-height: 24px; -} - -/******************* - * players on the map - */ - -/* smooth player movements (contrib from KillahKiwi) */ -.dynmap .playerMarker { - -moz-transition: all 0.6s ease-in-out 0s; - -webkit-transition: all 0.6s ease-in-out 0s; - -o-transition: all 0.6s ease-in-out 0s; - transition: all 0.6s ease-in-out 0s; -} - -.dynmap .playerIcon { - margin-top: -16px; - margin-left: -16px; - width: 32px; - height: 32px; -} - -.dynmap .playerIconSm { - margin-top: -8px; - margin-left: -8px; - width: 16px; - height: 16px; -} - -.dynmap .playerIconLg { - margin-top: -32px; - margin-left: -32px; - width: 64px; - height: 64px; -} - -.dynmap .playerName { - position: absolute; - top: -19px; - left: 18px; - z-index:20; - - white-space: nowrap; - - color: #fff; - background: rgba(0,0,0,0.6); - padding: 2px; - - -moz-border-radius: 3px; - border-radius: 3px; -} - -.dynmap .playerNameSm { - position: absolute; - top: -16px; - left: 10px; - - white-space: nowrap; - - color: #fff; - background: rgba(0,0,0,0.6); - padding: 2px; - - -moz-border-radius: 3px; - border-radius: 3px; -} - -.dynmap .playerNameLg { - position: absolute; - top: -19px; - left: 34px; - z-index:20; - - white-space: nowrap; - - color: #fff; - background: rgba(0,0,0,0.6); - padding: 2px; - - -moz-border-radius: 3px; - border-radius: 3px; -} - -.dynmap .playerNameNoHealth { - top: -7px; -} - -.dynmap .healthContainer { - display: block; - position: absolute; - top: 1px; - left: 18px; - - width: 50px; - - background: rgba(0,0,0,0.6); - padding: 2px; - - -moz-border-radius: 3px; - border-radius: 3px; - - z-index: 21; -} - -.dynmap .healthContainerSm { - display: block; - position: absolute; - top: -2px; - left: 10px; - - width: 50px; - - background: rgba(0,0,0,0.6); - padding: 2px; - - -moz-border-radius: 3px; - border-radius: 3px; -} - -.dynmap .healthContainerLg { - display: block; - position: absolute; - top: 1px; - left: 34px; - - width: 50px; - - background: rgba(0,0,0,0.6); - padding: 2px; - - -moz-border-radius: 3px; - border-radius: 3px; - - z-index: 21; -} - -.dynmap .playerHealth { - height: 7px; - - background: url(../images/heart.png) repeat-x left center; -} - -.dynmap .playerHealthBackground { - height: 7px; - width: 50px; - - background: url(../images/heart_depleted.png) repeat-x left center; -} - -.dynmap .playerArmor { - height: 7px; - - background: url(../images/armor.png) repeat-x left center; -} - -.dynmap .playerArmorBackground { - height: 7px; - width: 50px; - - background: url(../images/armor_depleted.png) repeat-x left center; -} - - -/******************* - * Compass - */ - -.compass, .compass_NE, .compass_SE, .compass_NW, .compass_SW { - display: block; - position: absolute; - z-index: 10; - top: 20px; - right: 32px; - height: 84px; - width: 83px; - background-repeat: no-repeat; -} - -.compass, .compass_SE { - background-image: url(../images/compass.png); -} - -.compass_NE { - background-image: url(../images/compass_NE.png); -} - -.compass_NW { - background-image: url(../images/compass_NW.png); -} - -.compass_SW { - background-image: url(../images/compass_SW.png); -} - -.compass_flat, .compass_N, .compass_E, .compass_W, .compass_S { - top: 10px; - right: 21px; - - height: 105px; - width: 105px; -} - -.compass_flat, .compass_S { - background-image: url(../images/compass_flat.png); -} - -.compass_N { - background-image: url(../images/compass_N.png); -} - -.compass_E { - background-image: url(../images/compass_E.png); -} - -.compass_W { - background-image: url(../images/compass_W.png); -} - -.mobilecompass { - top: 5px; - right: 10px; - height: 42px; - width: 42px; - background-size: cover; -} - -/******************* - * Chat - */ - -.chat { - position: absolute; - bottom: 0px; - left: 32px; - z-index:50; - - border-color: rgba(0,0,0,0.5); - background: rgba(0,0,0,0.6); - - border-style: solid; - border-width: 1px 1px 0px 1px; - - -moz-border-radius: 3px 3px 0px 0px; - -webkit-border-radius: 3px 3px 0px 0px; - -o-border-radius: 3px 3px 0px 0px; - border-radius: 3px 3px 0px 0px; - - margin-left: 10px; -} - -.chatinput { - - width: 608px; - height: 16px; - - outline: none; - color: #fff; - background-color: #000000; - - border: 0px; - background: rgba(0, 0, 0, 0.6); - background-image: url(../images/chat_cursor.png); - background-repeat: no-repeat; - background-position: 1px center; - - margin: 4px; - padding: 1px 1px 1px 15px; -} - -.chatsendbutton { - background-color: #bbb; -} - -.loginbutton { - color: #000; - font-family: sans-serif; - font-size: 11px; - border: 1px solid rgba(128,128,128,0.6); - background-color: #bbb; - border-style: solid; - padding: 2px; - -moz-border-radius: 5px; - border-radius: 5px; - cursor: pointer; - margin: 0; -} - -.messagelist { - color: white; - overflow: hidden; - - width: 622px; - max-height: 6em; - - margin: 4px 4px 0px 4px; - padding: 1px; -} - -.scrollback:hover { - overflow-y: auto !important; -} - - -.messagerow { - position: relative; - max-height: 200px; - - left: 0px; - bottom: 0px; - - color: #fff; - font-weight: bold; -} - -.messageicon { - position: relative; - top: 1px; - left: 0px; -} - -.messagetext { - position: relative; - top: -3px; - left: 0px; -} - -.leaflet-popup { - color: black; -} - -.balloonmessage { - word-wrap: break-word; -} - -/* Marker styles */ -.dynmap .mapMarker .markerName { - display: none; - z-index: 101; -} - -.dynmap .mapMarker:hover .markerName, -.dynmap .mapMarker .markerName-show { - display: block; - position: absolute; - z-index: 16; - - white-space: nowrap; - - color: #fff; - background: rgba(0,0,0,0.6); - padding: 2px 6px; - - -moz-border-radius: 3px; - border-radius: 3px; -} - -.dynmap .mapMarker .markerName16x16 { - top: -12px; - left: 12px; -} - -.dynmap .mapMarker .markerName8x8 { - top: -4px; - left: 6px; -} - -.dynmap .mapMarker .markerName32x32 { - top: -8px; - left: 18px; -} - -.dynmap .mapMarker .markerIcon16x16 { - transform: translate(-50%, -50%); - width: 16px; - height: 16px; -} - -.dynmap .mapMarker .markerIcon8x8 { - transform: translate(-50%, -50%); - width: 8px; - height: 8px; -} - -.dynmap .mapMarker .markerIcon32x32 { - transform: translate(-50%, -50%); - width: 32px; - height: 32px; -} - -.dynmap .mapMarker .markerName_offline_players { - font-style: italic; -} - -.dynmap .coord-control { - color: #000; - - border: 1px solid rgba(128,128,128,0.6); - background-color: #bbb; - border-style: solid; - - padding: 2px; - min-width: 80px; - -moz-border-radius: 5px; - border-radius: 5px; -} - -.dynmap .coord-control-noy { - width: 60px; -} - -.dynmap .coord-control .coord-control-label { - -} - -.dynmap .coord-control .coord-control-value { - font-weight: bold; -} - -.dynmap .dynmap-link { - -moz-border-radius: 7px; - -webkit-border-radius: 7px; - border-radius: 7px; - padding: 2px; - background: rgba(0, 0, 0, 0.25); - } -.dynmap .dynmap-link a { - background-color: rgba(255, 255, 255, 0.75); - } -.dynmap .dynmap-link a { - background-position: 50% 50%; - background-repeat: no-repeat; - display: block; - } -.dynmap .dynmap-link a { - -moz-border-radius: 4px; - -webkit-border-radius: 4px; - border-radius: 4px; - width: 19px; - height: 19px; - } -.dynmap .dynmap-link a:hover { - background-color: #fff; - } -.leaflet-big-buttons .dynmap-link a { - width: 27px; - height: 27px; - } -.dynmap .dynmap-link-button { - background-image: url(images/link.png); - } - -/* Login/register panel */ -.dynmaplogin { - text-align: center; - width: 100%; - font-weight: bold; - color: #FFFFFF; - background: #000000; -} - -table.loginregister { - color: #ffffff; - border: 1px solid rgba(64,64,64,0.6); - background: #bbb; - font-weight: bold; - margin: auto; -} - -td.login { - vertical-align: top; - color: #000000; - background-color: #bbb; - border: 1px solid rgba(64,64,64,0.6); - font-weight: bold; - margin: 2em; - width: 40em; -} - -td.register { - vertical-align: top; - color: #000000; - background-color: #bbb; - border: 1px solid rgba(64,64,64,0.6); - font-weight: bold; - margin: 2em; - width: 40em; -} - -div.statusmessage { - color: #FF0000; - font-weight: bold; - font-size: 24px; - -} - -.logincontainer { - background-color: rgba(0,0,0,0.0); -} - -.pinnedloginbutton { - margin-right: 201px; -} diff --git a/dynmap/web/css/embedded_example.css b/dynmap/web/css/embedded_example.css deleted file mode 100644 index 84ff380..0000000 --- a/dynmap/web/css/embedded_example.css +++ /dev/null @@ -1,15 +0,0 @@ -/* Embedded into website */ - -#mcmap { - width: 100%; - height: 500px; -} - -.dynmap .sidebar { - width: 140px; /* original width 200px */ - margin-right: -143px; /* original margin 203px, sidebar width +2xborder 1px +1px to hide */ -} - -.dynmap .hitbar { - right: 140px; /* width of sidebar */ -} \ No newline at end of file diff --git a/dynmap/web/css/images/layers-2x.png b/dynmap/web/css/images/layers-2x.png deleted file mode 100644 index 200c333..0000000 Binary files a/dynmap/web/css/images/layers-2x.png and /dev/null differ diff --git a/dynmap/web/css/images/layers.png b/dynmap/web/css/images/layers.png deleted file mode 100644 index 1a72e57..0000000 Binary files a/dynmap/web/css/images/layers.png and /dev/null differ diff --git a/dynmap/web/css/images/link.png b/dynmap/web/css/images/link.png deleted file mode 100644 index c4f00cb..0000000 Binary files a/dynmap/web/css/images/link.png and /dev/null differ diff --git a/dynmap/web/css/images/marker-icon-2x.png b/dynmap/web/css/images/marker-icon-2x.png deleted file mode 100644 index 88f9e50..0000000 Binary files a/dynmap/web/css/images/marker-icon-2x.png and /dev/null differ diff --git a/dynmap/web/css/images/marker-icon.png b/dynmap/web/css/images/marker-icon.png deleted file mode 100644 index 950edf2..0000000 Binary files a/dynmap/web/css/images/marker-icon.png and /dev/null differ diff --git a/dynmap/web/css/images/marker-shadow.png b/dynmap/web/css/images/marker-shadow.png deleted file mode 100644 index 9fd2979..0000000 Binary files a/dynmap/web/css/images/marker-shadow.png and /dev/null differ diff --git a/dynmap/web/css/images/marker.png b/dynmap/web/css/images/marker.png deleted file mode 100644 index bef032e..0000000 Binary files a/dynmap/web/css/images/marker.png and /dev/null differ diff --git a/dynmap/web/css/leaflet.css b/dynmap/web/css/leaflet.css deleted file mode 100644 index 411231a..0000000 --- a/dynmap/web/css/leaflet.css +++ /dev/null @@ -1,650 +0,0 @@ -/* required styles */ - -.leaflet-pane, -.leaflet-tile, -.leaflet-marker-icon, -.leaflet-marker-shadow, -.leaflet-tile-container, -.leaflet-pane > svg, -.leaflet-pane > canvas, -.leaflet-zoom-box, -.leaflet-image-layer, -.leaflet-layer { - position: absolute; - left: 0; - top: 0; - } -.leaflet-container { - overflow: hidden; - } -.leaflet-tile, -.leaflet-marker-icon, -.leaflet-marker-shadow { - -webkit-user-select: none; - -moz-user-select: none; - user-select: none; - -webkit-user-drag: none; - } -/* Prevents IE11 from highlighting tiles in blue */ -.leaflet-tile::selection { - background: transparent; -} -/* Safari renders non-retina tile on retina better with this, but Chrome is worse */ -.leaflet-safari .leaflet-tile { - image-rendering: -webkit-optimize-contrast; - } -/* hack that prevents hw layers "stretching" when loading new tiles */ -.leaflet-safari .leaflet-tile-container { - width: 1600px; - height: 1600px; - -webkit-transform-origin: 0 0; - } -.leaflet-marker-icon, -.leaflet-marker-shadow { - display: block; - } -/* .leaflet-container svg: reset svg max-width decleration shipped in Joomla! (joomla.org) 3.x */ -/* .leaflet-container img: map is broken in FF if you have max-width: 100% on tiles */ -.leaflet-container .leaflet-overlay-pane svg { - max-width: none !important; - max-height: none !important; - } -.leaflet-container .leaflet-marker-pane img, -.leaflet-container .leaflet-shadow-pane img, -.leaflet-container .leaflet-tile-pane img, -.leaflet-container img.leaflet-image-layer, -.leaflet-container .leaflet-tile { - max-width: none !important; - max-height: none !important; - width: auto; - padding: 0; - } - -.leaflet-container.leaflet-touch-zoom { - -ms-touch-action: pan-x pan-y; - touch-action: pan-x pan-y; - } -.leaflet-container.leaflet-touch-drag { - -ms-touch-action: pinch-zoom; - /* Fallback for FF which doesn't support pinch-zoom */ - touch-action: none; - touch-action: pinch-zoom; -} -.leaflet-container.leaflet-touch-drag.leaflet-touch-zoom { - -ms-touch-action: none; - touch-action: none; -} -.leaflet-container { - -webkit-tap-highlight-color: transparent; -} -.leaflet-container a { - -webkit-tap-highlight-color: rgba(51, 181, 229, 0.4); -} -.leaflet-tile { - filter: inherit; - visibility: hidden; - } -.leaflet-tile-loaded { - visibility: inherit; - } -.leaflet-zoom-box { - width: 0; - height: 0; - -moz-box-sizing: border-box; - box-sizing: border-box; - z-index: 800; - } -/* workaround for https://bugzilla.mozilla.org/show_bug.cgi?id=888319 */ -.leaflet-overlay-pane svg { - -moz-user-select: none; - } - -.leaflet-pane { z-index: 400; } - -.leaflet-tile-pane { z-index: 200; } -.leaflet-overlay-pane { z-index: 400; } -.leaflet-shadow-pane { z-index: 500; } -.leaflet-marker-pane { z-index: 600; } -.leaflet-tooltip-pane { z-index: 650; } -.leaflet-popup-pane { z-index: 700; } - -.leaflet-map-pane canvas { z-index: 100; } -.leaflet-map-pane svg { z-index: 200; } - -.leaflet-vml-shape { - width: 1px; - height: 1px; - } -.lvml { - behavior: url(#default#VML); - display: inline-block; - position: absolute; - } - - -/* control positioning */ - -.leaflet-control { - position: relative; - z-index: 800; - pointer-events: visiblePainted; /* IE 9-10 doesn't have auto */ - pointer-events: auto; - } -.leaflet-top, -.leaflet-bottom { - position: absolute; - z-index: 1000; - pointer-events: none; - } -.leaflet-top { - top: 0; - } -.leaflet-right { - right: 0; - } -.leaflet-bottom { - bottom: 0; - } -.leaflet-left { - left: 0; - } -.leaflet-control { - float: left; - clear: both; - } -.leaflet-right .leaflet-control { - float: right; - } -.leaflet-top .leaflet-control { - margin-top: 10px; - } -.leaflet-bottom .leaflet-control { - margin-bottom: 10px; - } -.leaflet-left .leaflet-control { - margin-left: 10px; - } -.leaflet-right .leaflet-control { - margin-right: 10px; - } - - -/* zoom and fade animations */ - -.leaflet-fade-anim .leaflet-popup { - opacity: 0; - -webkit-transition: opacity 0.2s linear; - -moz-transition: opacity 0.2s linear; - transition: opacity 0.2s linear; - } -.leaflet-fade-anim .leaflet-map-pane .leaflet-popup { - opacity: 1; - } -.leaflet-zoom-animated { - -webkit-transform-origin: 0 0; - -ms-transform-origin: 0 0; - transform-origin: 0 0; - } - -.leaflet-zoom-anim .leaflet-zoom-animated { - -webkit-transition: -webkit-transform 0.25s cubic-bezier(0,0,0.25,1); - -moz-transition: -moz-transform 0.25s cubic-bezier(0,0,0.25,1); - transition: transform 0.25s cubic-bezier(0,0,0.25,1); - } -.leaflet-zoom-anim .leaflet-tile, -.leaflet-pan-anim .leaflet-tile { - -webkit-transition: none; - -moz-transition: none; - transition: none; - } - -.leaflet-zoom-anim .leaflet-zoom-hide { - visibility: hidden; - } - - -/* cursors */ - -.leaflet-interactive { - cursor: pointer; - } -.leaflet-grab { - cursor: -webkit-grab; - cursor: -moz-grab; - cursor: grab; - } -.leaflet-crosshair, -.leaflet-crosshair .leaflet-interactive { - cursor: crosshair; - } -.leaflet-popup-pane, -.leaflet-control { - cursor: auto; - } -.leaflet-dragging .leaflet-grab, -.leaflet-dragging .leaflet-grab .leaflet-interactive, -.leaflet-dragging .leaflet-marker-draggable { - cursor: move; - cursor: -webkit-grabbing; - cursor: -moz-grabbing; - cursor: grabbing; - } - -/* marker & overlays interactivity */ -.leaflet-marker-icon, -.leaflet-marker-shadow, -.leaflet-image-layer, -.leaflet-pane > svg path, -.leaflet-tile-container { - pointer-events: none; - } - -.leaflet-marker-icon.leaflet-interactive, -.leaflet-image-layer.leaflet-interactive, -.leaflet-pane > svg path.leaflet-interactive, -svg.leaflet-image-layer.leaflet-interactive path { - pointer-events: visiblePainted; /* IE 9-10 doesn't have auto */ - pointer-events: auto; - } - -/* visual tweaks */ - -.leaflet-container { - background: #ddd; - outline: 0; - } -.leaflet-container a { - color: #0078A8; - } -.leaflet-zoom-box { - border: 2px dotted #38f; - background: rgba(255,255,255,0.5); - } - - -/* general typography */ -.leaflet-container { - font: 12px/1.5 "Helvetica Neue", Arial, Helvetica, sans-serif; - font: 0.75rem/1.5 "Helvetica Neue", Arial, Helvetica, sans-serif; - } - - -/* general toolbar styles */ - -.leaflet-bar { - box-shadow: 0 1px 5px rgba(0,0,0,0.65); - border-radius: 4px; - } -.leaflet-bar a, -.leaflet-bar a:hover { - background-color: #fff; - border-bottom: 1px solid #ccc; - width: 26px; - height: 26px; - line-height: 26px; - display: block; - text-align: center; - text-decoration: none; - color: black; - } -.leaflet-bar a, -.leaflet-control-layers-toggle { - background-position: 50% 50%; - background-repeat: no-repeat; - display: block; - } -.leaflet-bar a:hover { - background-color: #f4f4f4; - } -.leaflet-bar a:first-child { - border-top-left-radius: 4px; - border-top-right-radius: 4px; - } -.leaflet-bar a:last-child { - border-bottom-left-radius: 4px; - border-bottom-right-radius: 4px; - border-bottom: none; - } -.leaflet-bar a.leaflet-disabled { - cursor: default; - background-color: #f4f4f4; - color: #bbb; - } - -.leaflet-touch .leaflet-bar a { - width: 30px; - height: 30px; - line-height: 30px; - } -.leaflet-touch .leaflet-bar a:first-child { - border-top-left-radius: 2px; - border-top-right-radius: 2px; - } -.leaflet-touch .leaflet-bar a:last-child { - border-bottom-left-radius: 2px; - border-bottom-right-radius: 2px; - } - -/* zoom control */ - -.leaflet-control-zoom-in, -.leaflet-control-zoom-out { - font: bold 18px 'Lucida Console', Monaco, monospace; - text-indent: 1px; - } - -.leaflet-touch .leaflet-control-zoom-in, .leaflet-touch .leaflet-control-zoom-out { - font-size: 22px; - } - - -/* layers control */ - -.leaflet-control-layers { - box-shadow: 0 1px 5px rgba(0,0,0,0.4); - background: #fff; - border-radius: 5px; - } -.leaflet-control-layers-toggle { - background-image: url(images/layers.png); - width: 36px; - height: 36px; - } -.leaflet-retina .leaflet-control-layers-toggle { - background-image: url(images/layers-2x.png); - background-size: 26px 26px; - } -.leaflet-touch .leaflet-control-layers-toggle { - width: 44px; - height: 44px; - } -.leaflet-control-layers .leaflet-control-layers-list, -.leaflet-control-layers-expanded .leaflet-control-layers-toggle { - display: none; - } -.leaflet-control-layers-expanded .leaflet-control-layers-list { - display: block; - position: relative; - } -.leaflet-control-layers-expanded { - padding: 6px 10px 6px 6px; - color: #333; - background: #fff; - } -.leaflet-control-layers-scrollbar { - overflow-y: scroll; - overflow-x: hidden; - padding-right: 5px; - } -.leaflet-control-layers-selector { - margin-top: 2px; - position: relative; - top: 1px; - } -.leaflet-control-layers label { - display: block; - } -.leaflet-control-layers-separator { - height: 0; - border-top: 1px solid #ddd; - margin: 5px -10px 5px -6px; - } - -/* Default icon URLs */ -.leaflet-default-icon-path { /* used only in path-guessing heuristic, see L.Icon.Default */ - background-image: url(images/marker-icon.png); - } - - -/* attribution and scale controls */ - -.leaflet-container .leaflet-control-attribution { - background: #fff; - background: rgba(255, 255, 255, 0.7); - margin: 0; - } -.leaflet-control-attribution, -.leaflet-control-scale-line { - padding: 0 5px; - color: #333; - } -.leaflet-control-attribution a { - text-decoration: none; - } -.leaflet-control-attribution a:hover { - text-decoration: underline; - } -.leaflet-container .leaflet-control-attribution, -.leaflet-container .leaflet-control-scale { - font-size: 11px; - font-size: 0.69rem; - } -.leaflet-left .leaflet-control-scale { - margin-left: 5px; - } -.leaflet-bottom .leaflet-control-scale { - margin-bottom: 5px; - } -.leaflet-control-scale-line { - border: 2px solid #777; - border-top: none; - line-height: 1.1; - padding: 2px 5px 1px; - font-size: 11px; - font-size: 0.69rem; - white-space: nowrap; - overflow: hidden; - -moz-box-sizing: border-box; - box-sizing: border-box; - - background: #fff; - background: rgba(255, 255, 255, 0.5); - } -.leaflet-control-scale-line:not(:first-child) { - border-top: 2px solid #777; - border-bottom: none; - margin-top: -2px; - } -.leaflet-control-scale-line:not(:first-child):not(:last-child) { - border-bottom: 2px solid #777; - } - -.leaflet-touch .leaflet-control-attribution, -.leaflet-touch .leaflet-control-layers, -.leaflet-touch .leaflet-bar { - box-shadow: none; - } -.leaflet-touch .leaflet-control-layers, -.leaflet-touch .leaflet-bar { - border: 2px solid rgba(0,0,0,0.2); - background-clip: padding-box; - } - - -/* popup */ - -.leaflet-popup { - position: absolute; - text-align: center; - margin-bottom: 20px; - } -.leaflet-popup-content-wrapper { - padding: 1px; - text-align: left; - border-radius: 12px; - } -.leaflet-popup-content { - margin: 13px 19px; - line-height: 1.4; - } -.leaflet-popup-content p { - margin: 18px 0; - } -.leaflet-popup-tip-container { - width: 40px; - height: 20px; - position: absolute; - left: 50%; - margin-left: -20px; - overflow: hidden; - pointer-events: none; - } -.leaflet-popup-tip { - width: 17px; - height: 17px; - padding: 1px; - - margin: -10px auto 0; - pointer-events: auto; - - -webkit-transform: rotate(45deg); - -moz-transform: rotate(45deg); - -ms-transform: rotate(45deg); - transform: rotate(45deg); - } -.leaflet-popup-content-wrapper, -.leaflet-popup-tip { - background: white; - color: #333; - box-shadow: 0 3px 14px rgba(0,0,0,0.4); - } -.leaflet-container a.leaflet-popup-close-button { - position: absolute; - top: 0; - right: 0; - padding: 4px 4px 0 0; - border: none; - text-align: center; - width: 18px; - height: 14px; - font: 16px/14px Tahoma, Verdana, sans-serif; - color: #757575; - text-decoration: none; - background: transparent; - } -.leaflet-container a.leaflet-popup-close-button:hover { - color: #585858; - } -.leaflet-popup-scrolled { - overflow: auto; - border-bottom: 1px solid #ddd; - border-top: 1px solid #ddd; - } - -.leaflet-oldie .leaflet-popup-content-wrapper { - -ms-zoom: 1; - } -.leaflet-oldie .leaflet-popup-tip { - width: 24px; - margin: 0 auto; - - -ms-filter: "progid:DXImageTransform.Microsoft.Matrix(M11=0.70710678, M12=0.70710678, M21=-0.70710678, M22=0.70710678)"; - filter: progid:DXImageTransform.Microsoft.Matrix(M11=0.70710678, M12=0.70710678, M21=-0.70710678, M22=0.70710678); - } -.leaflet-oldie .leaflet-popup-tip-container { - margin-top: -1px; - } - -.leaflet-oldie .leaflet-control-zoom, -.leaflet-oldie .leaflet-control-layers, -.leaflet-oldie .leaflet-popup-content-wrapper, -.leaflet-oldie .leaflet-popup-tip { - border: 1px solid #999; - } - - -/* div icon */ - -.leaflet-div-icon { - background: #fff; - border: 1px solid #666; - } - - -/* Tooltip */ -/* Base styles for the element that has a tooltip */ -.leaflet-tooltip { - position: absolute; - padding: 6px; - background-color: #fff; - border: 1px solid #fff; - border-radius: 3px; - color: #222; - white-space: nowrap; - -webkit-user-select: none; - -moz-user-select: none; - -ms-user-select: none; - user-select: none; - pointer-events: none; - box-shadow: 0 1px 3px rgba(0,0,0,0.4); - } -.leaflet-tooltip.leaflet-interactive { - cursor: pointer; - pointer-events: auto; - } -.leaflet-tooltip-top:before, -.leaflet-tooltip-bottom:before, -.leaflet-tooltip-left:before, -.leaflet-tooltip-right:before { - position: absolute; - pointer-events: none; - border: 6px solid transparent; - background: transparent; - content: ""; - } - -/* Directions */ - -.leaflet-tooltip-bottom { - margin-top: 6px; -} -.leaflet-tooltip-top { - margin-top: -6px; -} -.leaflet-tooltip-bottom:before, -.leaflet-tooltip-top:before { - left: 50%; - margin-left: -6px; - } -.leaflet-tooltip-top:before { - bottom: 0; - margin-bottom: -12px; - border-top-color: #fff; - } -.leaflet-tooltip-bottom:before { - top: 0; - margin-top: -12px; - margin-left: -6px; - border-bottom-color: #fff; - } -.leaflet-tooltip-left { - margin-left: -6px; -} -.leaflet-tooltip-right { - margin-left: 6px; -} -.leaflet-tooltip-left:before, -.leaflet-tooltip-right:before { - top: 50%; - margin-top: -6px; - } -.leaflet-tooltip-left:before { - right: 0; - margin-right: -12px; - border-left-color: #fff; - } -.leaflet-tooltip-right:before { - left: 0; - margin-left: -12px; - border-right-color: #fff; - } - -/* Printing */ - -@media print { - /* Prevent printers from removing background-images of controls. */ - .leaflet-control { - -webkit-print-color-adjust: exact; - color-adjust: exact; - } - } diff --git a/dynmap/web/css/override_example.css b/dynmap/web/css/override_example.css deleted file mode 100644 index 4dec7e2..0000000 --- a/dynmap/web/css/override_example.css +++ /dev/null @@ -1,39 +0,0 @@ -/******************* - * This is the over-ride CSS file. - * - * if you know any CSS you can easily add custom rules to change how DynMap - * looks and behaves under your DynMap installation. - * - * 1. Uncomment the override.css in the index.html. - * 2. Rename this file or create a new override.css. - * 3. Add your own rules (or steal these) to personalize how DynMap looks. - * - * By adding your own rules here, you can then save your changes - * between DynMap updates and they won't get over-written. - */ - - -/* Use the alternate compass image */ - -.compass { - top: 20px; - right: 20px; - - height: 50px; - width: 50px; - - background-image: url(../images/compass_alt.png); -} - -/* These next two keep the DynMap sidebar open... */ - -.dynmap .sidebar { - margin-right: 0px; -} - -/* ...and hide the hitbar along with the sidebar controls */ - -.dynmap .sidebar .hitbar, -.dynmap .sidebar .panel > .pin { - display: none; -} \ No newline at end of file diff --git a/dynmap/web/css/regions.css b/dynmap/web/css/regions.css deleted file mode 100644 index efc6fcb..0000000 --- a/dynmap/web/css/regions.css +++ /dev/null @@ -1,35 +0,0 @@ -.regioninfo > * { - display: block; -} - -.regioninfo > *:empty { - display: none; -} - -.regioninfo .regionname { - font-size: 120%; - font-weight: bold; -} - -.regioninfo .regionflags .regionflag { - display: block; - font-size: 90%; - color: gray; - margin-left: 5px; -} - -.regioninfo .owners:before { - content: "Owners: "; -} - -.regioninfo .members:before { - content: "Members: "; -} - -.regioninfo .regionflags:before { - content: "Flags: "; -} - -.regioninfo .regionpriority:before { - content: "Priority: "; -} \ No newline at end of file diff --git a/dynmap/web/css/standalone.css b/dynmap/web/css/standalone.css deleted file mode 100644 index 8eeee86..0000000 --- a/dynmap/web/css/standalone.css +++ /dev/null @@ -1,41 +0,0 @@ -/* Standalone Document */ - -html { - width: 100%; - height: 100% -} - -body { - height: 100%; - - font-family: sans-serif; - font-size: 11px; - - color: #fff; - background: transparent; - - margin: 0px; - padding: 0px ; -} - -/* Chat Balloons */ - -#content { color: #000; } - -#mcmap { width: 100%; height: 100%;} - -.dynmap { - width: 100%; - height: 100%; - overflow: hidden; - position: absolute; -} - -.dynmap .sidebar { - width: 200px; /* original width 200px */ - margin-right: -203px; /* original margin 203px, sidebar width +2xborder 1px +1px to hide */ -} - -.dynmap .hitbar { - right: 200px; /* width of sidebar */ -} \ No newline at end of file diff --git a/dynmap/web/gettiles.php b/dynmap/web/gettiles.php deleted file mode 100644 index 9b41e58..0000000 --- a/dynmap/web/gettiles.php +++ /dev/null @@ -1,22 +0,0 @@ - -