Commit Graph
100 Commits
Author SHA1 Message Date
Nicolas F e1728b9e59 genpoi: Also fix missing nbt keys if processes > 1
oopsie
2018-11-26 14:40:52 +01:00
Nicolas F 38bc400b2f genPOI: catch ChunkDoesntExist when processes > 1
Fixes #1480.

No clue how this wasn't an issue before but is an issue now in 1.13,
maybe Minecraft writes more placeholder chunks these days.
2018-11-26 13:03:44 +01:00
Nicolas F cf53208989 genpoi: fix uncaught KeyErrors on some MC data
Apparently TileEntities can just not even exist now, and the same
goes for the player Dimension key. For the latter, I'm not sure
whether the fallback is correct, but it's a guess I suppose.

Hopefully addresses #1480.
2018-11-18 09:29:48 +01:00
Nicolas F 39d9dba814 Merge branch 'whitespaces' of https://github.com/r15ch13/Minecraft-Overviewer into r15ch13-fixes 2018-06-14 13:54:34 +02:00
Nicolas FandGitHub cd9a0d6c68 Merge pull request #1459 from r15ch13/noscript
Use <noscript> to display message when JavaScript is disabled
2018-06-13 19:18:25 +02:00
Nicolas F a129274aa1 Remove broken marker centreing code
Apparently, having an image's origin be in the center is too
advanced of a concept for The Web™. I guess we can't do this then.
2018-05-09 16:22:21 +02:00
Nicolas F 6fbced79bf Fix custom icons not showing up properly
Individual POIs such as player POIs can have their own icon per
POI, so we should respect that.
2018-05-09 15:45:31 +02:00
Nicolas F cf5a14a088 Increase the Overviewer C extension version 2018-05-09 14:36:11 +02:00
Nicolas F ebdc4016d7 world: Don't call sys.exit here, raise something
A world being unsupported may not be a fatal application error in
all instances where this codepath in world.py is used, hence
throwing an exception is more sensible.
2018-05-09 14:25:05 +02:00
Nicolas F 12c12d128f Set the attribution prefix 2018-05-06 17:44:07 +02:00
Nicolas F 05cc9e60e7 Don't collapse marker group control 2018-05-06 17:12:03 +02:00
Nicolas F 23ea1918ea Update leaflet to 1.3.1 2018-05-06 17:11:46 +02:00
Nicolas F ea33ebe2fb Assume 32x32 marker size so they get centred
Maybe expose this as an option to the markers dict later, with
the anchor as an option too.
2018-05-06 16:59:27 +02:00
Nicolas F 614663f601 Show marker group display names 2018-05-06 16:53:32 +02:00
Nicolas FandGitHub cff0dcc187 Merge pull request #1431 from kevinwchang/travis-fix
Update Travis config
2018-02-23 04:47:26 +01:00
Nicolas FandGitHub e847adaa20 Merge pull request #1430 from kevinwchang/no-rgba-jpeg
Convert RGBA to RGB before saving as JPEG
2018-02-23 01:49:49 +01:00
Nicolas F 39d588ae45 docs: various small updates to build instructions
* python26 to python27
* PIL to Pillow
* Requirement on having python2, numpy and pillow for the MSVC build
* Mention -dev package for Pillow/PIL
2017-06-19 22:55:55 +02:00
Nicolas F 21b9e0aa13 docs: Clarify Ubuntu/Debian install instructions
We use HTTPS these days and mentioning python2.6 in 2017 is very
triggering to me.
2017-06-13 16:11:10 +02:00
Nicolas FandGitHub 6043ae958e Merge pull request #1386 from Monkey0x9/patch-1
Change forgotten 1.11 to 1.12
2017-06-11 16:56:53 +02:00
Nicolas F f7973410ea travis: Update MC version 2017-06-09 18:12:05 +02:00
Nicolas F 4b75f7fa63 Merge branch 'snapshot' 2017-06-09 18:08:38 +02:00
Nicolas F 711488e07d textures.py: Fix beds for 1.12
Bed textures are now one unified texture, so some cropping and
fiddling needs to be done.

Bed colours not yet implemented.
2017-06-09 18:06:29 +02:00
Nicolas F 461f8647e0 Update strings to 1.12 2017-06-09 16:28:49 +02:00
Nicolas F 412c8231b7 docs: add a section about how to contribute
This adds a work-in-progress section with a few tips and tricks
about how one should go about contributing to the project. It mostly
focuses on making people familiar with some of the code, and giving
them a few tips along the way on how to work with Git.

A few more contribution examples should be added, and what most
notably is lacking right now is a section about the web output
part. This is due to us currently rewriting it in Leaflet, so any
examples added now would quickly become outdated.
2017-04-18 15:30:51 +02:00
Nicolas F a183553ba5 setup.py: remove workaround for CentOS 5
More like ScentOS because it stinks LOLOLOLOLO
2017-04-10 12:22:05 +02:00
Nicolas F e07e588e59 readme: add API key note, small fixes
We previously stated that a Google Maps API key is not required.
However, this is not true (anymore). I'm still wary of adding
it to the documentation since my hopes is that in the time it would
take me to add this to the docs I could just finish leaflet, but this
is the least we can do to clear up any confusion.

Also switched some URLs to use HTTPS, which closes #1314.

Lastly, fixed a warning about a not long enough title line.
2017-04-10 12:18:14 +02:00
Nicolas F dd96d95b66 settingsValidators: clean up checkBadEscapes
A side-effect of these changes is that \a no longer gets shown as
'\a', but '\0x07'. Some characters, i.e. \n and \t, are still shown
as '\n' and '\t' respectively, so this comes simply down to repr()
behaviour.

However, I do believe it's worth it to get rid of that ugly code
duplication.
2017-03-24 18:29:15 +01:00
Nicolas F 8cf47935e4 Remove unused imports 2017-03-24 17:57:37 +01:00
Nicolas F b7837a9656 docs: update copyright year to 2017 2017-03-24 15:29:22 +01:00
Nicolas F 52afa7f8d2 docs: optimise PNGs
I used zopflipng with 100 iterations on most of them, and advpng
with 300 iterations in zopfli mode on front_page_screenshot.png
2017-03-24 15:26:32 +01:00
Nicolas F 57a1000f4c docs: fix two warnings during docs building
sphinx does not enjoy duplicate link names, and unless your label
is pointing to a header, it needs an explicit name when referenced
too.
2017-03-24 14:53:07 +01:00
Nicolas F 032b8831f9 docs: fix code block in signs.rst 2017-03-24 14:42:16 +01:00
Nicolas F ba5a4bbaed docs: add link to Twitter account to index.rst 2017-03-24 14:40:54 +01:00
Nicolas F f9148b7e2e docs: Change some http:// URLs to https:// 2017-03-24 14:35:05 +01:00
Nicolas F d11c9b5aa2 docs: remove remaining references to CentOS 5 2017-03-24 14:30:22 +01:00
Nicolas F b393489ea9 docs: remove CentOS 5 build instructions
It's EOL in a few days and the instructions only add confusion.
Anyone still using CentOS 5 has bigger issues than not having
documentation on how to build Minecraft-Overviewer.
2017-03-17 17:09:35 +01:00
Nicolas FandGitHub 99b223fb5a Merge pull request #1356 from overviewer/python2
Replace `python` with `python2`
2017-03-17 16:54:25 +01:00
Nicolas F cd0eb2d5c4 genpoi: query fs caps before using FileReplacer
Probably fixes #1271
2017-03-17 14:57:22 +01:00
Nicolas F 94d6772266 rcon: code style fixes 2017-03-16 18:25:55 +01:00
Nicolas F 3551518bbd logger: reduce pillow verbosity
With newer pillow versions, pillow would create debug log lines for
every single PNG images it touches, so that spams the log in
Overviewer's verbose mode quite a bit.
2017-03-16 17:03:06 +01:00
Nicolas F fa1e444890 docs: fix oxipng formatting 2017-03-16 16:44:23 +01:00
Nicolas F d2976625b3 world: remove redundant hashing
This is probably a leftover from the memcached thing. There is no
need to hash a key to be used for hashmap access, as the hashmap
itself hashes it already, and probably with a hash more appropriate
for the situation.
2017-03-16 16:26:10 +01:00
Nicolas F b75755a746 travis: stop testing for 2.6
Broken garbage
2017-03-16 15:53:40 +01:00
Nicolas F 4770af93f7 optimizeimages: add oxipng support 2017-03-16 15:50:02 +01:00
Nicolas F 5c44084332 optimizeimages: code style fixes
Now PEP8 compliant!
2017-03-16 14:58:41 +01:00
Nicolas F f1909e9684 Remove memcached support
Apparently we had memcached support. It was never worth it, and put
a weird md5 hash calculation in the path of regular caching. Seeing
as it was completely undocumented, I doubt anyone has ever used it.
2017-03-16 14:45:19 +01:00
Nicolas F 84b52326dc leaflet: Reimplement coordinate box on bottom left
I'd move the event setup into addTo, but JS is utter garbage and thinks
"this" in a function callback like that should be whatever, not where you
actually define it.
2017-03-13 14:04:37 +01:00
Nicolas F 8e883f47f5 Add support for concrete powder
aheadley is a pleb, and I can call him names in this commit message
because he doesn't look at them anyway lol
2017-03-10 07:35:39 +01:00
Nicolas F d76a22e020 Fix deprecated NumPy API warnings 2017-03-09 17:28:18 +01:00
Nicolas F 13d5fb7642 Add terracotta and concrete blocks
Fixes #1367
2017-03-09 16:51:17 +01:00
Nicolas FandAndrew Chin 7af5375df9 Actually add the high-dpi icons, durr
Oops I forgot
2017-02-19 11:37:02 -05:00
Nicolas FandAndrew Chin 3093a07dc2 Remove old junk in web_assets 2017-02-19 11:36:53 -05:00
Nicolas FandAndrew Chin 843d9ddb00 Carpet-bombing code style fixes 2017-02-19 11:36:46 -05:00
Nicolas FandAndrew Chin 99817f786f Re-implement map compass 2017-02-19 11:36:37 -05:00
Nicolas FandAndrew Chin e0b36fa9e4 Move icon anchor to tip of icons
The spawn and location icons should now have the tip of the icon
image point at the actual location. Previously, the icons were
centred onto it, which was slightly off in the vertical direction.
2017-02-19 11:36:24 -05:00
Nicolas FandAndrew Chin 6426182c1e Add retina size icons for spawn and location
Unfortunately we need to explicitly tell leaflet not to scale them
weirdly but to make them perceptually equivalent to the normal ones,
which means we have hardcoded icon sizes for those two right now.
2017-02-19 11:36:15 -05:00
Nicolas FandAndrew Chin ebfd40c995 Centre map view on spawn marker if left-clicked 2017-02-19 11:35:34 -05:00
Nicolas FandAndrew Chin 9bcf2d5542 Re-implement location marker
Click to centre, right-click to dismiss.
2017-02-19 11:35:24 -05:00
Nicolas FandAndrew Chin 0731ea65cd Re-implement configurable bgcolor 2016-12-10 14:56:18 -05:00
Nicolas FandAndrew Chin 003fc9cb47 Fix errorTileUrl for JPEG tilesets 2016-12-10 14:56:18 -05:00
Nicolas FandAndrew Chin 044c65f922 Get rid of overviewer.gmap, move code into util 2016-12-10 14:56:17 -05:00
Nicolas FandAndrew Chin 2cfa3e8731 Add tset config to leaflet layer, refactor marker
Instead of stuffing specialised values into overviewer.collections,
put a reference to the overviewerConfig tileset entry into the leaflet
layer, so that we can access it from callbacks easily.
2016-12-10 14:56:17 -05:00
Nicolas FandAndrew Chin cfa2a9f39b Re-implement spawn marker
Let's hope this works, any bugs are totally my fault.
2016-12-10 14:56:17 -05:00
Nicolas FandAndrew Chin 64598e9c01 Set errorTileUrl to blank.png
Hopefully this code is correct, I have not tried with a different
"base" variable, but I don't even know what that thing is.
2016-12-10 14:56:17 -05:00
Nicolas FandAndrew Chin 8f44c92821 Replace mentions of Google Maps in documentation 2016-12-10 14:56:17 -05:00
Nicolas FandAndrew Chin c0875a9ceb Add replacement for the location marker 2016-12-10 14:56:17 -05:00
Nicolas FandAndrew Chin 2e07acc422 Add replacement for home marker, add icon_src dir
I added the icon_src dir to textures so that it doesn't get copied
over automatically like web_assets do.
2016-12-10 14:56:17 -05:00
Nicolas FandAndrew Chin 456e88477d Adjust README.rst to remove mentions of GMaps API 2016-12-10 14:56:17 -05:00
Nicolas F 6ea2758c31 optimizeimages: support pngnq-s9
pngnq-s9 is essentially just a more recently dead version of pngnq,
however, due to not being able to specify multiple binary names in
the past, we've not supported it. Refactor the code to allow specifying
multiple binary names, and add pngnq-s9 to it.
2016-12-06 16:11:45 +01:00
Nicolas F c49990f18b genPOI: expose uuid value for filter functions
Fixes #1345.
2016-12-06 15:28:53 +01:00
Nicolas F 54b93754c7 genPOI/docs: Handle new sign id values
Minecraft now uses minecraft:sign as its id for signs, but also uses
Sign for older versions or chunks that have not yet been updated.

Change the genPOI sign wrangling code and the documentation to reflect
this change.

Fixes #1340.
2016-12-06 15:17:39 +01:00
Nicolas F c7d86eca76 Change shebang to python2 instead of python 2016-12-06 15:01:20 +01:00
Nicolas F 79343bcfba Merge branch 'Rycieos-1.11-blocks' 2016-12-06 14:52:11 +01:00
Nicolas FandGitHub 7a0930af63 Merge pull request #1319 from manuelgu/patch-1
Update text for 1.10
2016-08-09 15:25:39 +02:00
Nicolas F a0c23c4a9a Update CONTRIBUTORS.rst information 2016-07-19 23:05:37 +02:00
Nicolas F a4b6651072 Update docs version and copyright year 2016-06-30 09:09:58 +02:00
Nicolas F 917e38fd53 Make command line option docs more complete
Mainly, the genPOI options were finally documented.
2016-06-30 09:07:13 +02:00
Nicolas F 4287fc5f0b Add -q alias for --quiet to genPOI
This brings it in line with the syntax of the main overviewer.py
script.
2016-06-30 09:04:49 +02:00
Nicolas F 0d7731b125 Update client jar version in documentation 2016-06-30 07:57:15 +02:00
Nicolas F 525d19318f Merge Mirculus' inline changes. 2016-02-17 16:41:03 +01:00
Nicolas F 4e77ba8d13 genpoi: Fix GzipFile closing on python 2.6
Fixes #1275
2016-02-13 14:41:09 +01:00
Nicolas F 8f08b3b69f rcon: Throw more helpful exception if proto error
Addresses #1273.
2016-01-30 15:25:45 +01:00
Nicolas F 9fc050cf67 genPOI: Use "with" statement to close gzip files
Previously, the files were not closed after reading or writing;
by using a "with" statement, the file handles will be closed as
soon as they go out of scope.

Possible fix for #1271.
2016-01-30 14:17:16 +01:00
Nicolas F c7f8cfee8c rcon: Wait for buffer to fill
We should wait for the buffer to fill up to 12 bytes instead of
simply assuming it will.

Possible fix for #1273.
2016-01-30 13:58:36 +01:00
Nicolas F 7dcf40fc20 Add region directory to corruption warnings
Fixes issue #1251
2015-10-18 21:33:08 +02:00
Nicolas F b8fb7652b2 More Travis whacking 2015-08-16 00:37:18 +02:00
Nicolas F 48cd0c4aa7 Let's whack travis with a wrench for a bit 2015-08-16 00:30:52 +02:00
Nicolas F 9ae3ac2916 Add mingw-w64 build documentation 2015-08-16 00:17:19 +02:00
Nicolas F a8c71d089d Fix mingw-w64 build
On Windows with mingw-w64, Pillow includes windows.h, and thus
including Imaging.h would result in a name conflict of "TRANSPARENT",
which windows.h #defines but overviewer.h wants to use as enum.

For the record, this used to not be broken back when I initially
fixed Pillow for mingw-w64, so the change got somewhere introduced
between then and now.
2015-08-15 23:50:40 +02:00
Nicolas F. ebc54a59ef Merge pull request #1240 from enaut/docfixesStructureOverlay
Small documentation bug for StructureOverlay.
2015-07-04 01:04:20 +02:00
Nicolas F 0aef9b436c [webassets] Updated jQuery version 2015-05-04 14:59:18 +02:00
Nicolas F b35f848855 [genPOI] Work around utter plebbery 2015-03-08 17:03:43 +01:00
Nicolas F b5ecf8a7f4 [genPOI] Work around JSON signs
lol Mojang
2015-03-07 18:16:32 +01:00
Nicolas F dfe6f08ee9 genPOI: Resolve UUIDs for player spawns too 2014-10-24 13:57:06 +02:00
Nicolas F 3c3db5d909 Add warning if Overviewer is run as root 2014-10-18 17:44:59 +02:00
Nicolas F c0d4fc9bc2 Add rollbacks to tile re-arrangements
Previously, any kind of interruption during tile re-arrangements
would leave the tileset in a half re-arranged state.

This commit makes _increase_depth roll back possible changes it did
during the re-arrangement prior to it being interrupted.

Fixes issue #1166.
2014-10-14 14:21:26 +02:00
Nicolas F 79e60972e9 optimizeimages: Add documentation for jpegoptim 2014-10-10 21:10:07 +02:00
Nicolas F 3a0f334970 optimizeimages: Add jpegoptim interface
Only options that appear to be interesting for us have been exposed,
namely -m and -S.
2014-10-10 20:54:47 +02:00
Nicolas F 16edd622a2 Add documentation for RConObserver 2014-10-06 21:52:21 +02:00
Nicolas F c6830a35db Added RCon Observer
It does the rcons! And the observings!
2014-10-06 21:40:09 +02:00